Commit Graph

378 Commits

Author SHA1 Message Date
pohky c7be04cfc2 Update emotefilter.json 2016-04-03 05:26:02 +02:00
pohky 3ffa686b47 Update emotefilter.json 2016-04-03 04:53:56 +02:00
pohky de2acfd6d9 Update emotedata_ffz.json 2016-04-03 04:40:58 +02:00
pohky 342c3e07ca Update emotefilter.json 2016-04-03 04:31:39 +02:00
pohky 025b634bf2 Update emotedata_ffz.json 2016-04-03 04:07:33 +02:00
pohky 1d1c816696 Update emotedata_ffz.json
rename POI to POIPOI
2016-04-03 03:29:59 +02:00
pohky 8d083ccc5c Update emotefilter.json 2016-04-02 22:51:13 +02:00
Raygius 6ba126de6e Update emotefilter.json 2016-04-02 20:41:41 +02:00
Raygius f479f636b5 Update emotefilter.json 2016-04-02 19:56:19 +02:00
pohky a88d6c9ee8 Update emotefilter.json 2016-04-02 19:21:03 +02:00
pohky d7f936321e Update emotedata_ffz.json
changed OhMy
2016-04-02 18:58:43 +02:00
pohky a1283bf4f6 Update emotefilter.json 2016-04-02 18:50:02 +02:00
pohky 730d9e04e9 Update emotefilter.json 2016-04-02 18:46:22 +02:00
pohky ba0d089c13 Update emotefilter.json 2016-04-02 18:39:09 +02:00
pohky 20a50d39a8 Updated emotedata_ffz.json 2016-04-02 18:24:27 +02:00
pohky be39955f2d Update emotefilter.json 2016-04-02 17:17:11 +02:00
pohky 31b0a7c783 Update emotedata_ffz.json
removed FeelsWeirdMan
2016-04-02 16:50:51 +02:00
Jiiks c6990352db Added Bella and Jaxx 2016-04-02 14:51:02 +03:00
pohky af8519f7fe Update emotedata_ffz.json
id corrections
2016-04-02 11:08:12 +02:00
pohky a31a329f10 Update emotedata_ffz.json 2016-04-02 10:39:12 +02:00
pohky 8f73d0ad10 Update emotefilter.json 2016-04-02 06:36:22 +02:00
pohky 90767d8fb5 Update emotefilter.json 2016-04-02 06:04:39 +02:00
Treble Sketch 51b0e0e5a3 Corrected the missing commas
Whoops, sorry about that ^^"
2016-04-02 14:26:35 +10:30
pohky b9e1b71c0f Update emotefilter.json 2016-04-02 03:14:36 +02:00
pohky dfa344756a Update emotedata_ffz.json
removed Yappa and KKona
2016-04-02 03:06:01 +02:00
pohky f576d5b816 Update emotefilter.json 2016-04-02 03:01:23 +02:00
pohky ae10fffecd Update emotefilter.json 2016-04-02 03:00:50 +02:00
Ehsan Kia cbc93dd6ae bttv database update 2016-04-01 20:57:01 -04:00
pohky df7e780ca1 Update emotefilter.json 2016-04-01 22:48:23 +02:00
pohky 9f3ad4b976 Update emotefilter.json 2016-04-01 18:40:36 +02:00
Jiiks 24d0fe5c56 Merge pull request #254 from ILM126/patch-2
Updated "Team Fortress 2" Server Code
2016-04-01 19:20:55 +03:00
pohky bd3979b7d3 Update ffz emotedata
remove FeelsGoodMan
2016-04-01 17:50:09 +02:00
Treble Sketch b8ab889d97 Updated "Team Fortress 2" Server Code
I guessed that the link submitted was a temp one XD
I think this is the permanent one for the server, I found it on a /r/TF2 [url=https://www.reddit.com/r/tf2/comments/4b51e5/introducing_the_official_rtf2_discord_server_and/]thread[/url]. So I'm sure that it is authentic.
2016-04-02 01:25:16 +10:30
Treble Sketch 67ffca5e5b Added "Space Enthusiasts" and "Unreal Gaming"
Both code are for infinite invites, but a few code I found in the list are not infinite and already expired.
I own "Space Enthusiasts", but a friend of mine owns "Unreal Gaming".
2016-04-02 01:17:14 +10:30
pohky e37f909fc2 Update emotedata_ffz.json
added uppercase emotes back
2016-04-01 01:33:33 +02:00
pohky 893440ae0a Update emotedata_ffz.json 2016-03-31 18:27:44 +02:00
pohky 35f0efa0e0 Update emotedata_ffz.json 2016-03-31 18:21:00 +02:00
pohky 6cb89d93d6 Updated emotedata_ffz.json 2016-03-31 18:02:08 +02:00
pohky 4af669789c Update emotedata_ffz.json 2016-03-31 17:39:42 +02:00
pohky e8e30469e7 Merge pull request #249 from Eonfow/patch-2
update emotedata_ffz.json
2016-03-31 17:29:02 +02:00
AraHaan 3e78699c4f Added Division and fixed the spacing/tabbing on some other servers. 2016-03-31 05:08:54 -05:00
Bruno de Moura Ribeiro 3d24701139 update emotedata_ffz.json
New emotes
2016-03-31 03:22:15 -03:00
pohky 66e30fd54e Update emotedata_ffz.json
added Bwendin's emotes
2016-03-31 03:34:41 +02:00
Jiiks 4ec4daedbc Merge pull request #247 from xiaolii/patch-1
adding leagueconnect to public server list
2016-03-30 19:48:52 +03:00
Jiiks 3f5f9fb0ad Merge pull request #246 from FierceFrankie/patch-1
Update serverlist.json
2016-03-30 19:48:40 +03:00
Jiiks aeae9529aa Merge pull request #245 from MissKiri/patch-2
Update serverlist.json
2016-03-30 19:48:27 +03:00
pohky fc52d3dd6c Update emotedata_ffz,json
added grayyl's emotes
2016-03-30 14:24:22 +02:00
xiaolii f55d1a27ef adding leagueconnect to public server list 2016-03-30 05:48:29 +02:00
Jiiks 2e914032ed 0.2.7 updater 2016-03-30 04:09:10 +03:00
Jiiks 3f61dc0928 Twitch emotedata 2016-03-30 04:08:18 +03:00
FierceFrankie 88729d94ce Update serverlist.json
Added my server.
2016-03-28 11:43:05 -06:00
MissKiri 504224f4fa Update serverlist.json 2016-03-28 10:30:47 -07:00
Jiiks 35ff38638c Fixed missing " and } 2016-03-28 12:21:57 +03:00
Jiiks 0d9728b26f Added server 2016-03-28 12:19:54 +03:00
Jiiks a8fb3b73d2 Merge pull request #241 from GarettM/patch-3
Update serverlist.json
2016-03-28 12:15:57 +03:00
Jiiks 5a7ec4f0f8 Merge pull request #234 from Forcellrus/patch-1
Added World of Tanks server
2016-03-28 12:12:53 +03:00
Jiiks a1c868fe6c Merge pull request #237 from MissKiri/patch-1
Added Kiri's Bubble
2016-03-28 12:12:32 +03:00
Ehsan Kia a8f8106d41 BTTV emote db update 2016-03-27 10:25:24 -04:00
Garett c479e59966 Update serverlist.json
previous owned server marimonda no longer exists, added new server
2016-03-25 13:32:18 -04:00
MissKiri fa37d4515a Update serverlist.json 2016-03-24 07:19:25 -07:00
MissKiri 821c5444c0 Update serverlist.json 2016-03-24 07:18:37 -07:00
MissKiri feaef6224d Update serverlist.json 2016-03-23 14:45:10 -07:00
Forcellrus 633135aee7 Update serverlist.json 2016-03-21 19:24:30 +01:00
Forcellrus 21058ab993 Added World of Tanks server 2016-03-21 19:17:53 +01:00
pohky 3770edc13a Merge pull request #230 from keyphact/patch-1
Updated serverlist.json
2016-03-20 16:53:53 +01:00
Ehsan Kia d2fd44a406 Update bttv emote database 2016-03-20 10:23:02 -04:00
KeyPhact Moon cdf7b262ed Updated serverlist.json
Added in server for PSO2.
2016-03-20 00:58:01 +00:00
pohky caf0ae0f35 Update emotedata_ffz.json 2016-03-15 11:05:26 +01:00
pohky 76c9b62ba9 Update serverlist.json
requests from
-HK-LooKAqui
GarettM
sadozin
2016-03-14 03:33:48 +01:00
pohky 463f843789 Merge pull request #224 from unforgivingmorsecode/patch-5
Update serverlist.json
2016-03-13 07:37:20 +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
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
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
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 83ad1a6dc9 Update emotedata_ffz.json
Gumi -> kGumi
2016-03-05 05:20:12 +01:00
Isackender ecb1794afe Update serverlist.json 2016-03-04 14:39:59 +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
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 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
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
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
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
Jiiks 496d984c2a Reload 2016-02-25 21:52:03 +02:00
Jiiks c441936005 Reload 2016-02-25 21:51:48 +02:00
Jiiks 362a5e3d40 Revert 2016-02-25 21:48:08 +02:00
Jiiks 486f98d1e9 Remove newline 2016-02-25 21:47:00 +02:00
Jiiks 712c1655d9 Revert "Remove newline"
This reverts commit 9336247180.
2016-02-25 21:45:34 +02:00
Jiiks 9336247180 Remove newline 2016-02-25 21:13:51 +02:00
TopBunk 943986954e Added some FFZ emotes
Emotes: AkaneHappy, AkaneKappa, AkaneMmm, AkaneOh, AkanePuppy, AkaneShy, AyakaLewd, KayoJi
2016-02-25 03:18:20 -06:00
Ehsan Kia 1795c5e6cb Updated BTTV emote database 2016-02-20 17:52:10 -05:00
Jiiks ef265b8962 Fix id 2016-02-18 08:32:54 +02:00
Ehsan Kia e17709dcb8 Added 657 new shared emotes 2016-02-14 00:39:59 -05:00
pohky 4cab5e6067 Update emotedata_ffz.json 2016-02-13 05:45:43 +01:00
pohky 3106504ef4 Update emotefilter.json 2016-02-13 05:37:36 +01:00
Jiiks bcf4867474 Merge pull request #175 from SydneyAoi/patch-1
Update serverlist.json
2016-02-10 07:02:18 +02:00
Jiiks 5b5cacc0f3 Merge pull request #174 from lecomonad/patch-3
Add Kancolle server to serverlist.json
2016-02-10 07:01:58 +02:00
Jiiks 3c843ada58 Merge pull request #171 from cosmicsalad/patch-1
Updated serverlist.json
2016-02-10 07:01:45 +02:00
Jiiks d439923678 Update updater latest version 2016-02-10 04:35:05 +02:00
pohky c926443540 Merge pull request #177 from EhsanKia/bttv-update-feb7
Updated BTTV emote database
2016-02-08 07:42:13 +01:00
Jiiks 9694e11137 Add twitch sub data 2016-02-08 00:43:30 +02:00
Jiiks e9f1af2530 Add twitch emotes to github 2016-02-08 00:39:03 +02:00
Ehsan Kia 1a4e5398d6 Updated BTTV emote database 2016-02-07 06:35:40 -05:00
SydneyAoi 90fbaa4885 Update serverlist.json 2016-02-05 14:05:04 -07:00
lecomonad 8bcbb5ec8f Add Kancolle server to serverlist.json 2016-02-05 10:25:33 -05:00
pohky 670ccf603c Updated emotedata_ffz.json
added Breefree
2016-02-05 03:23:45 +01:00
Andrew Filip 86b1059406 Updated serverlist.json - Fifa desc 2016-02-02 15:59:23 -08:00
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
Ehsan Kia 37e4c725b5 Another quick update 2016-02-01 07:09:56 -05: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
thefiz 6a8dace6f6 Update serverlist.json
Added Server
2016-01-28 03:17:28 -05: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
SomecallmeSarge 74ec2be036 Update serverlist.json 2016-01-26 14:08:47 -05: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
unforgivingmorsecode 7d347488f7 Update serverlist.json 2016-01-24 23:44:59 -06: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
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
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
Cy Timothy Johnson 14a3824792 added NerdChat to serverlist 2016-01-19 12:52:20 -06:00
Ehsan Kia 259a21975d Moved updated BTTV db to the data folder 2016-01-18 15:14:42 -05:00
Hostail b1516f301a Update serverlist.json 2016-01-18 16:38:51 +01:00
Blitzcronk a96bbb64f6 Update serverlist.json 2016-01-18 03:01:06 +00:00
Kaeloron 791f2b4dda Update serverlist.json 2016-01-17 14:24:05 +01:00
pohky b6f655ceeb Emote request Raygius 2016-01-17 00:05:06 +01:00
Jiiks ee671c5540 Fixed missing , 2016-01-15 01:51:02 +02:00
Jiiks 3d4a5a8beb Merge pull request #134 from zetterburn/patch-1
Update serverlist.json
2016-01-14 00:49:10 +02:00
Jiiks a9c73c721a Dafuq and sync 2016-01-12 03:54:37 +02:00
zetterburn 773da182a1 Update serverlist.json
Add server for Rivals of Aether (At bottom of list)
2016-01-08 19:27:20 -05:00
Jiiks a892cb5784 Dafuq and sync 2016-01-09 02:15:02 +02:00
Jiiks 1b23fd15f8 Mario 2016-01-04 06:52:36 +02:00
Jiiks c856a344cc Sync 2016-01-03 04:46:40 +02:00
Jiiks 355d264311 https://github.com/Jiiks/BetterDiscordApp/pull/120 2016-01-01 03:27:28 +02:00
Jiiks e5393d8a93 Fix , : 2016-01-01 01:02:15 +02:00
Jiiks 8ad112b77d Fixed emote ids 2016-01-01 00:59:09 +02:00
Jiiks 65b651c9ec Added Fighting 2015-12-30 00:15:23 +02:00
Jiiks 54043d0926 Added Dream 2015-12-29 20:32:02 +02:00
Jiiks ba50e4c433 Added Demo 2015-12-25 13:48:48 +02:00
Jiiks 60bd3ee16c https://github.com/Jiiks/BetterDiscordApp/pull/114 2015-12-24 11:51:15 +02:00
Jiiks 0d23d72198 Up to date files 2015-12-23 22:02:55 +02:00
Jiiks 54bc94bb07 Latest version 2015-12-18 17:46:22 +02:00
Jiiks fcb189b9c1 Organize repo for 0.2.5
All data files should be under data folder
2015-12-18 17:40:26 +02:00