Commit Graph

839 Commits

Author SHA1 Message Date
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
pohky fc1a4fbfb7 Merge pull request #145 from Hostail/update-serverlist.json
Update serverlist.json
2016-01-18 20:29:59 +01:00
Hostail b1516f301a Update serverlist.json 2016-01-18 16:38:51 +01:00
pohky acb722c934 Merge pull request #144 from Blitzcronk/patch-1
Update serverlist.json
2016-01-18 11:33:38 +01:00
Blitzcronk a96bbb64f6 Update serverlist.json 2016-01-18 03:01:06 +00:00
pohky dc9fba64ec Merge pull request #143 from Kaeloron/patch-2
Update serverlist.json
2016-01-17 15:34:32 +01:00
Kaeloron 791f2b4dda Update serverlist.json 2016-01-17 14:24:05 +01:00
pohky 92339a2e22 Update README.md 2016-01-17 13:03:53 +01:00
Jiiks e80c617bc2 Move stuff to misc, remove unsused files add .dev. to ignore 2016-01-17 01:16:11 +02:00
Jiiks 4702ce7f38 Update serverlist link 2016-01-17 01:09:40 +02:00
Jiiks 5e40663761 0.2.3 and 0.2.4 EOL 2016-01-17 01:08:52 +02:00
Jiiks fe66b1ba65 Merge branch 'master' of https://github.com/Jiiks/BetterDiscordApp 2016-01-17 01:05:35 +02:00
Jiiks f8007f77fd 0.2.3 and 0.2.4 EOL 2016-01-17 01:05:29 +02:00
pohky b6f655ceeb Emote request Raygius 2016-01-17 00:05:06 +01:00
pohky cc5f1e6e36 Emote request Raygius 2016-01-17 00:00:37 +01:00
pohky 7028868c57 Merge pull request #137 from pohky/master
update emotes
2016-01-16 21:52:10 +01:00
Jiiks ee671c5540 Fixed missing , 2016-01-15 01:51:02 +02:00
Ehsan Kia 98c3620388 Updated database (400 new emotes since 5 days ago) 2016-01-14 00:01:00 -05:00
Jiiks 5d63b812b3 a5923eb8ab 2016-01-14 00:53:18 +02:00
Jiiks b5ef38a5cb Merge pull request #139 from Kaeloron/patch-1
Update to serverlist.json
2016-01-14 00:50:11 +02:00
Jiiks a5923eb8ab Merge pull request #138 from megamit/master
Fix for random doubling of public server button
2016-01-14 00:50:01 +02:00
Jiiks 81e03e5a79 Merge pull request #136 from eBunny/patch-2
Blade Symphony link update
2016-01-14 00:49:21 +02:00
Jiiks 3d4a5a8beb Merge pull request #134 from zetterburn/patch-1
Update serverlist.json
2016-01-14 00:49:10 +02:00
Kaeloron c09a06dbde Update to serverlist.json
Added our Rainbow 6: Siege Community discord server to the list.
2016-01-13 15:18:28 +01:00
Jiiks ebb9c7e0e6 Fix match issue some people are having 2016-01-13 10:59:56 +02:00
Mitchell 2e9e46ae90 Fix for random doubling of public server button 2016-01-12 11:43:35 +00:00
Jiiks a9c73c721a Dafuq and sync 2016-01-12 03:54:37 +02:00
pohky a2fce66f54 update 2016-01-11 07:09:38 +01:00
Ehsan Kia c3b74660c9 Another pass with a bigger dictionary and list of common names 2016-01-10 23:26:51 -05:00
pohky 666c317ffa update emote_data 2016-01-11 04:27:39 +01:00
eBunny bb78fc192a Blade Symphony link update
Updated the invite code for Blade Symphony, since the old one seemed to have some problems.
2016-01-10 23:30:15 +01:00
Jiiks 26ae69ed77 Bot icon bug fix 2016-01-10 11:38:27 +02:00
Jiiks a1cc5218ed Bug fix 2016-01-10 11:36:16 +02:00
Ehsan Kia b33dc0c536 Removed all words below 7 characters that looked common 2016-01-09 23:16:31 -05:00
Ehsan Kia ca4bacd805 Removed even more common words 2016-01-09 22:57:07 -05:00
Ehsan Kia 9cc0aab965 Remade BTTV emote database with all shared emotes 2016-01-09 22:35:50 -05: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 3dc9cd04ea Merge pull request #132 from pohky/master
compact mode fix
2016-01-09 02:12:31 +02:00
Jiiks fd4c4af3a2 Merge pull request #131 from ayydriel/patch-2
Ayydriel server
2016-01-09 02:12:23 +02:00
Jiiks 645ae53b04 Merge pull request #128 from ianiD/patch-1
Add the Gamedev group
2016-01-09 02:12:14 +02:00
Jiiks 2ec87e29db Merge pull request #129 from alexismartin/patch-1
Update emotefilter.json
2016-01-09 02:11:20 +02:00
pohky 45d3ec2cc0 compact mode fix 2016-01-08 16:33:43 +01:00
ayydriel 7d516b74f0 Ayydriel's d&c
:D
2016-01-07 17:37:35 -05:00
Jiiks ffd67dce4f Bugifx 2016-01-07 17:48:59 +02:00
Jiiks 87c49a61bd Bot icons 2016-01-07 11:19:46 +02:00