Commit Graph

884 Commits

Author SHA1 Message Date
Andrew Filip d6b0a5994b Updated serverlist.json 2016-02-02 14:59:41 -08:00
Jiiks df542fe3c9 Merge pull request #166 from EhsanKia/bttv-update-jan30
weekly BTTV database update (January 30)
2016-02-02 02:14:27 +02:00
Jiiks e70ab32780 Add missing } 2016-02-02 02:10:06 +02:00
Jiiks 7a693d33b6 Merge pull request #167 from RinkuTalks/patch-2
Update serverlist.json
2016-02-02 02:08:46 +02:00
Jiiks 10c97ad59e Merge pull request #165 from unforgivingmorsecode/patch-4
Update serverlist.json
2016-02-02 02:08:38 +02:00
Jiiks c82d38fd97 Merge pull request #164 from FlashDeviant/patch-1
Update serverlist.json
2016-02-02 02:08:32 +02:00
Jiiks 4b885483d3 Merge pull request #163 from thefiz/patch-1
Update serverlist.json
2016-02-02 02:08:24 +02:00
Jiiks 88a75f5c2b Merge pull request #160 from wedidntnamethisatall/patch-1
Update serverlist.json
2016-02-02 02:08:15 +02:00
Jiiks 09b75c984c Merge pull request #159 from unforgivingmorsecode/patch-3
Update serverlist.json
2016-02-02 02:08:00 +02:00
Jiiks 288b401b26 Merge pull request #162 from AraHaan/patch-1
Updated the Installer
2016-02-02 01:10:27 +02:00
Ehsan Kia 37e4c725b5 Another quick update 2016-02-01 07:09:56 -05:00
AraHaan 9d1a2f1302 Got PTB installing finally working yay. 2016-01-31 21:23:10 -06:00
RinkuTalks efeb191da2 Update serverlist.json 2016-01-31 09:37:48 -08:00
Ehsan Kia 5a4f6b447c weekly BTTV database update (January 30) 2016-01-30 00:58:40 -05:00
unforgivingmorsecode 6086040aa8 Update serverlist.json 2016-01-29 13:23:51 -06:00
Flash Deviant e74cd1da3e Update serverlist.json
Added The Deviant Network server to the list
2016-01-28 22:54:24 +00:00
AraHaan 3c0f1e8b3d Forgot to remove the Break
Forgot to remove the Break in the DiscordPTB part of the Task Terminator so that it would terminate all 3 instances of DiscordPTB.exe and yes it is normal for this.
2016-01-28 16:39:37 -06:00
thefiz 6a8dace6f6 Update serverlist.json
Added Server
2016-01-28 03:17:28 -05:00
AraHaan 1bf8127ebe Update README.md 2016-01-28 01:32:45 -06:00
AraHaan e913998453 Update App.manifest 2016-01-28 01:30:25 -06:00
AraHaan c4b855d7c5 Updated Installer stuff. 2016-01-28 01:26:47 -06:00
AraHaan 6a0df69964 Updated the Installer and some other files. 2016-01-28 01:26:43 -06:00
AraHaan c9711b6763 Update README.md 2016-01-28 01:14:25 -06:00
Jiiks b1478b2dc1 Url fi 2016-01-27 09:31:56 +02:00
Jiiks aeabee9c25 Remove autojoin and add disclaimer 2016-01-27 09:30:57 +02:00
wedidntnamethisatall d79b85f66d Update serverlist.json 2016-01-26 18:47:58 -08:00
unforgivingmorsecode 58b7a1e9c0 Update serverlist.json 2016-01-26 20:37:01 -06:00
pohky f5b5d2a7cc Merge pull request #158 from SomecallmeSarge/patch-1
Update serverlist.json
2016-01-27 00:21:01 +01:00
SomecallmeSarge 74ec2be036 Update serverlist.json 2016-01-26 14:08:47 -05:00
pohky 5623a604d5 Merge pull request #156 from OitoYuuki/patch-1
Add my Undertale RP server please
2016-01-26 03:31:04 +01:00
OitoYuuki 2ea87a7f40 Add my Undertale RP server
IDK if that's fine. Also, I have no idea if what I edited is good or not, haven't gotten into JavaScript yet and had to copy-paste some of that.
2016-01-25 17:08:31 -05:00
pohky 69e6abdccf Merge pull request #155 from unforgivingmorsecode/patch-2
Update serverlist.json
2016-01-25 08:47:16 +01:00
unforgivingmorsecode 7d347488f7 Update serverlist.json 2016-01-24 23:44:59 -06:00
Jiiks 40345b7cdd Remove autojoin due to limits 2016-01-24 17:59:06 +02:00
pohky 5e2ef11cc9 Merge pull request #151 from Sosolol261/master
Added "Anime Discord" to the server list
2016-01-24 04:44:50 +01:00
pohky 562ffc9db5 Update emotefilter.json 2016-01-24 04:33:23 +01:00
Sosolol261 9e51a142ff Added "Anime Discord" to list 2016-01-24 12:31:50 +09:00
Sosolol261 70b9af44a3 Added "Anime Discord" to list 2016-01-24 12:29:18 +09:00
pohky b7e68d1f6b Fix for latest Discord Update 2016-01-24 04:16:40 +01:00
pohky 90f1c5dbac Merge pull request #150 from 3Dymensional/patch-2
Update serverlist.json
2016-01-23 23:29:29 +01:00
3Dymensional b380552e76 Update serverlist.json 2016-01-23 12:29:25 -06:00
pohky 1c14050ecf Merge pull request #147 from 3Dymensional/patch-1
Update serverlist.json
2016-01-22 07:42:54 +01:00
pohky aa68763979 Merge pull request #148 from EhsanKia/bttv-update-jan22
Updated BTTV db (360 new emotes)
2016-01-22 07:41:22 +01:00
Ehsan Kia 79803ac4cf Updated BTTV db (360 new emotes) 2016-01-22 00:34:55 -05:00
3Dymensional a1a80033da Update serverlist.json 2016-01-21 22:06:57 -06:00
pohky b18d0a413d Merge pull request #146 from cyan28/master
added NerdChat to serverlist
2016-01-20 01:02:25 +01:00
Cy Timothy Johnson 14a3824792 added NerdChat to serverlist 2016-01-19 12:52:20 -06:00
pohky f240c1f59e Merge pull request #135 from EhsanKia/bttv-db-update
Remade BTTV emote database with all shared emotes
2016-01-18 22:10:09 +01:00
Ehsan Kia 259a21975d Moved updated BTTV db to the data folder 2016-01-18 15:14:42 -05:00
Ehsan Kia cd3004d669 Merge remote-tracking branch 'upstream/master' into bttv-db-update
# Conflicts:
#	emotedata_bttv.json
2016-01-18 15:13:45 -05:00