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 |
|
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 |