Commit Graph

884 Commits

Author SHA1 Message Date
pohky 463f843789 Merge pull request #224 from unforgivingmorsecode/patch-5
Update serverlist.json
2016-03-13 07:37:20 +01:00
pohky 61824516a9 Merge pull request #223 from EhsanKia/bttv-update-march12
update bttv emotes
2016-03-13 07:36:36 +01:00
unforgivingmorsecode 8a1e77755e Update serverlist.json 2016-03-12 20:57:35 -06:00
Ehsan Kia 4443d909a9 update bttv emotes 2016-03-12 21:55:28 -05:00
pohky b4114b3115 Update emotefilter.json 2016-03-12 07:32:26 +01:00
pohky 97cb511480 Merge pull request #222 from GarettM/patch-1
Update serverlist.json
2016-03-12 07:30:40 +01:00
GarettM 8b86322434 Update serverlist.json
added

    "Marimonda Gaming": {
      "code": "0b0XbRZUIQGnkit6",
      "description": "Marimonda Gaming Community",
      "icon": null,
      "language": "EN",
      "title": "Marimonda Gaming"
2016-03-11 19:12:14 -05:00
Jiiks 256c2fdad7 Indent 2016-03-11 17:38:55 +02:00
Jiiks a5c27caacf Indent? 2016-03-11 17:38:06 +02:00
Jiiks 4111949cbc Merge branch 'master' of https://github.com/Jiiks/BetterDiscordApp 2016-03-11 17:36:12 +02:00
Jiiks b9c7787465 Disabled customgame and added custom role colour plugin 2016-03-11 17:36:04 +02:00
pohky 9b5f7d7f6b Update emotedata_ffz.json 2016-03-11 10:15:23 +01:00
pohky b654bc2003 Update emotefilter.json 2016-03-10 15:45:54 +01:00
pohky 51076d872e Update serverlist.json
added "Dirty Bomb" server
2016-03-09 21:08:39 +01:00
pohky 8626654559 Update emotedata_ffz.json
added Faux emotes
2016-03-08 22:41:02 +01:00
pohky db548c1a26 Update emotedata_ffz.json 2016-03-08 22:22:31 +01:00
pohky b641c17932 Update emotedata_ffz.json
krait emotes
2016-03-08 22:21:17 +01:00
pohky 321d482b9f Update serverlist.json
removed server "FRENCH" - invalid invite code
2016-03-08 09:08:37 +01:00
pohky a6a2f84a65 Merge pull request #216 from EhsanKia/bttv-update-march7
Weekly bttv db update
2016-03-08 09:05:13 +01:00
Ehsan Kia 91194c204f Weekly bttv db update 2016-03-07 15:20:33 -05:00
pohky 00b72c6436 Update emotedata_ffz.json
fixed KrunsHello
2016-03-07 18:40:07 +01:00
pohky 9b193ef14b Update serverlist.json 2016-03-07 17:45:35 +01:00
pohky 32a1f4a298 Update emotedata_ffz.json
KongouWot new id
2016-03-06 00:48:15 +01:00
pohky d0f8bec1d4 Update serverlist.json
added some requests manually
2016-03-05 06:48:36 +01:00
pohky 8acab48afd Update emote injection
changed the order of the injection to prio sub emotes over bttv and ffz
emotes
2016-03-05 06:19:10 +01:00
pohky 83ad1a6dc9 Update emotedata_ffz.json
Gumi -> kGumi
2016-03-05 05:20:12 +01:00
pohky cdef86f518 Merge pull request #213 from isackender/patch-1
Add server
2016-03-04 15:42:39 +01:00
Isackender ecb1794afe Update serverlist.json 2016-03-04 14:39:59 +01:00
pohky c4f7539a79 Merge pull request #212 from Kwoth/patch-1
Update serverlist.json
2016-03-04 14:18:54 +01:00
Master Kwoth af08e9969b Update serverlist.json 2016-03-04 14:16:26 +01:00
pohky d807811c9d Update serverlist.json 2016-03-04 13:43:09 +01:00
pohky d8776e50be Merge pull request #210 from CactusNugget/patch-2
Update serverlist.json
2016-03-04 13:36:57 +01:00
CactusNugget 267970883c Update serverlist.json 2016-03-04 21:22:05 +11:00
pohky 885920788b Update serverlist.json 2016-03-04 10:41:30 +01:00
pohky 9f4c9a8f42 Update README.md 2016-03-04 06:35:23 +01:00
pohky 87511e089f Updated emotedata_ffz.json 2016-03-03 04:10:11 +01:00
pohky dfc93d7ad5 Updated emotes
removed BabyMage from bttv for usage of the ffz version
added ALittleHead to ffz
2016-03-03 04:06:47 +01:00
pohky 7318f9a208 Update serverlist.json 2016-03-03 01:52:41 +01:00
pohky 25e413ac7d Merge pull request #207 from Nisserino/patch-1
Update serverlist.json
2016-03-03 01:49:08 +01:00
Nisserino c20fd9fc77 Update serverlist.json 2016-03-02 17:44:08 +01:00
pohky 15f9a17d5d Update emotedata_ffz.json
removed WanWan
2016-03-02 05:10:14 +01:00
pohky 302934698b Merge pull request #205 from EhsanKia/bttv-update-feb29
Weekly update of BTTV emote database
2016-02-29 19:39:06 +01:00
Ehsan Kia 83b8b26d36 Weekly update of BTTV emote database 2016-02-29 13:18:15 -05:00
pohky d3bd15c1fe Update emotefilter.json 2016-02-27 05:28:46 +01:00
pohky b7f79b2cd8 Update emotedata_ffz.json 2016-02-26 15:06:11 +01:00
pohky d15fcd1ca9 Update emotedata_ffz.json 2016-02-26 15:03:48 +01:00
pohky 346c68ac61 Update emotedata_ffz.json 2016-02-26 15:01:23 +01:00
pohky cae03de77d Merge pull request #201 from Raygius/patch-5
Update emotedata_ffz.json
2016-02-26 14:58:53 +01:00
Raygius a32e4cfb1f Update emotedata_ffz.json
Updated ID
2016-02-26 05:23:40 +01:00
Jiiks a441072751 Readd emotes 2016-02-25 21:53:43 +02:00