Commit Graph

1350 Commits

Author SHA1 Message Date
DeathStrikeV e592126078 Updated emotes 2016-11-19 14:40:30 +00:00
DeathStrikeV 35de874ced Updated emotes 2016-11-18 02:00:28 +00:00
DeathStrikeV cdc95aef68 Updated emotes 2016-11-16 23:17:58 +00:00
DeathStrikeV 08cc4c5bc3 Updated emotes 2016-11-16 01:35:32 +00:00
DeathStrikeV 5c514efa96 Updated emotes 2016-11-16 01:31:48 +00:00
DeathStrikeV a9bc977764 Updated emotes 2016-11-16 00:12:44 +00:00
DeathStrikeV 2fa3e7a4b5 Updated emotes 2016-11-15 21:06:06 +00:00
DeathStrikeV 9b4f5f4366 Updated emotes 2016-11-15 07:57:48 +00:00
DeathStrikeV 2b55554af1 Updated emotes 2016-11-14 22:33:50 +00:00
DeathStrikeV 5aff38bf39 Updated emotes 2016-11-13 22:36:49 +00:00
Jiiks 53d4989a79 Merge pull request #415 from DeathStrikeV/master
More FFZ Emotes
2016-11-13 06:35:58 +02:00
Jiiks d23d331463 Merge pull request #414 from Zerthox/patch-2
Added "Snorlax" (Broken)
2016-11-13 06:35:47 +02:00
DeathStrikeV 020b1b8d4e Updated emotes 2016-11-12 18:07:45 +00:00
DeathStrikeV e251a03914 Merge pull request #7 from Jiiks/master
Pull latest updates
2016-11-11 19:14:50 +00:00
DeathStrikeV 1faac18e8d Updated emotes 2016-11-11 19:14:13 +00:00
DeathStrikeV a23878fd0b Updated emotes 2016-11-11 07:29:05 +00:00
Zerthox 56773ae55f Added "Snorlax" (Broken) 2016-11-10 19:22:07 +01:00
Jiiks dd28c89236 Merge pull request #413 from TakosThings/patch-1
Add "Bomb" to filter
2016-11-10 15:48:17 +02:00
DeathStrikeV 14331ddee5 Merge branch 'master' of github.com:DeathStrikeV/BetterDiscordApp 2016-11-10 07:29:45 +00:00
DeathStrikeV b1a06a519f Updated emotes 2016-11-10 07:28:27 +00:00
TakosThings cc1938b14b Add "Bomb" to filter 2016-11-10 04:35:26 +10:30
Jiiks c4e0cc15c9 Merge pull request #406 from Leeo97one/patch-1
Electron installer fix
2016-11-09 10:41:31 +02:00
Jiiks 6651b5ac3f Merge pull request #410 from DeathStrikeV/master
More FFZ Emotes
2016-11-09 05:30:45 +02:00
DeathStrikeV faa7b30df5 Merge pull request #6 from Jiiks/master
Update to latest changes
2016-11-08 19:53:25 +00:00
DeathStrikeV 9a638e7eb3 Updated emotes 2016-11-08 19:38:07 +00:00
DeathStrikeV 06770ca1af Merge branch 'master' of github.com:DeathStrikeV/BetterDiscordApp 2016-11-08 07:31:08 +00:00
DeathStrikeV 337a79efbb Updated emotes 2016-11-08 07:29:51 +00:00
Jiiks fd3dab39de Merge pull request #409 from Zerthox/patch-1
Added "Nein" and "Pokeball" to emote filter
2016-11-07 22:32:01 +02:00
Zerthox 84092e1c6f Add "Nein" and "Pokeball" 2016-11-07 21:17:28 +01:00
Jiiks 77addb5b03 Merge pull request #408 from DeathStrikeV/master
More emotes - Pull at your own leisure
2016-11-07 22:09:54 +02:00
DeathStrikeV 68e56d9ea8 Merge pull request #5 from Jiiks/master
Pull latest changes
2016-11-07 19:24:08 +00:00
Jiiks 71b0077fc0 Formatting 2016-11-07 20:46:14 +02:00
DeathStrikeV 2e64e4c47b Updated emotes 2016-11-06 23:46:21 +00:00
Léo c4f4ac41e8 Electron installer fix
Fix the index.js file path in the Electron installer.
2016-11-06 12:03:29 +01:00
Jiiks 07f38008d8 Merge pull request #405 from EhsanKia/bttv-update-nov5
Bttv update nov5
2016-11-06 09:54:24 +02:00
Ehsan Kia 5c70075ca0 Merge branch 'master' of github.com:Jiiks/BetterDiscordApp into bttv-update-nov5
# Conflicts:
#	data/emotedata_ffz.json
2016-11-06 00:48:42 -07:00
Jiiks e09fb169ae Merge pull request #404 from DeathStrikeV/master
More emote updates GG
2016-11-06 08:32:50 +02:00
Ehsan Kia dc48d88d59 Update BTTV emote db 2016-11-05 16:27:00 -07:00
Ehsan Kia 227547d7e7 Remove ImTriggered from FFZ 2016-11-05 16:24:35 -07:00
DeathStrikeV 00da2ef58c Updated emotes 2016-11-05 22:35:26 +00:00
DeathStrikeV 195e8a9b77 Updated emotes 2016-11-05 12:11:29 +00:00
DeathStrikeV 7cb778f884 Updated emotes 2016-11-05 01:56:58 +00:00
DeathStrikeV 289abee257 Updated emotes 2016-11-05 00:07:28 +00:00
DeathStrikeV 2c49e52f90 Merge branch 'master' of github.com:DeathStrikeV/BetterDiscordApp 2016-11-04 22:43:53 +00:00
DeathStrikeV 07968430e3 Updated emotes 2016-11-04 22:43:27 +00:00
Alex e10b78dc9b Merge pull request #4 from Jiiks/master
Updates
2016-11-04 22:42:10 +00:00
Jiiks a1f9f29198 Changed info arrow colour 2016-11-04 07:11:52 +02:00
Jiiks 0b614022ad Final logger format maybe 2016-11-04 07:11:22 +02:00
Jiiks 821a9f8749 Reformatted logger again 2016-11-04 07:03:39 +02:00
Jiiks 1bb83de279 Reformatted logs 2016-11-04 06:51:56 +02:00