lightcordwarez
/
BetterDiscordApp-v1
mirror of https://github.com/jiiks/betterdiscordapp.git
1
0
Fork 0
Code Issues Releases Wiki Activity
1,669 Commits 10 Branches 32 Tags 86 MiB
Commit Graph

635 Commits

Author SHA1 Message Date
DeathStrikeV 36d68836d4 Updated emotes 2017-03-10 18:35:03 +00:00
DeathStrikeV 3e89697b4f Updated emotes 2017-03-06 20:42:16 +00:00
DeathStrikeV b78666140a Updated emotes 2017-03-04 00:45:09 +00:00
DeathStrikeV 52e8bc512d Merge pull request #12 from Jiiks/master 
Merge updates
 2017-03-03 18:56:09 +00:00
DeathStrikeV bb50c6f48e Updated emotes 2017-03-03 18:54:54 +00:00
Alexei Stukov 319e6db4fc Remove excess comma 2017-03-03 15:43:44 +02:00
Violetnred2 5c52b3b987 Update emotefilter.json 
blacklist some LoL champion names plus assorted words
 2017-03-03 13:58:09 +02:00
Alexei Stukov a64dfa8bf0 missing comma 2017-02-28 10:41:33 +02:00
Alexei Stukov f35e867358 Merge branch 'master' into patch-2 2017-02-28 10:40:59 +02:00
David b200229b26 Update emotefilter.json 2017-02-27 16:55:51 -05:00
David 6a86149b63 Blacklist emotes 2017-02-26 22:09:22 -05:00
DeathStrikeV b6833d2962 Merge branch 'master' of github.com:DeathStrikeV/BetterDiscordApp 2017-02-26 22:37:30 +00:00
DeathStrikeV a976753b93 Updated emotes 2017-02-26 22:36:45 +00:00
Zerthox e0885c6d6a Add Technical 2017-02-24 13:47:14 +01:00
Jiiks 23724784e2 Merge pull request #447 from DeathStrikeV/master 
More updated emotes =D
 2017-02-23 19:41:53 +02:00
DeathStrikeV e26b1db0c4 Updated emotes 2017-02-22 00:41:28 +00:00
DeathStrikeV c687da23fe Updated emotes 2017-02-18 00:15:26 +00:00
DeathStrikeV e509f16648 Updated emotes 2017-02-17 00:32:43 +00:00
DeathStrikeV 1919061656 Updated emotes 2017-02-15 18:47:13 +00:00
jjtcm d6aabd89ae Add "Profi" to emotefilter 2017-02-13 18:45:55 +01:00
DeathStrikeV 406ced863f Updated emotes 2017-02-12 22:51:38 +00:00
DeathStrikeV 1d9e4753be Merge branch 'master' of github.com:DeathStrikeV/BetterDiscordApp 2017-02-12 21:20:19 +00:00
DeathStrikeV aad61c5281 Updated emotes 2017-02-12 21:05:22 +00:00
DeathStrikeV 3543b57f53 Updated emotes 2017-02-12 15:29:04 +00:00
Jiiks 01cfee0ebd Fixed indent 2017-02-12 16:10:12 +02:00
DeathStrikeV c811e2a064 Added "Seriously" to emotesfilter 2017-02-12 09:25:43 +00:00
Jiiks f7fa19dcf8 Conflict merge 
https://github.com/Jiiks/BetterDiscordApp/pull/424
 2017-02-10 15:52:14 +02:00
Jiiks 44073ed15d Conflict merge 
https://github.com/Jiiks/BetterDiscordApp/pull/433
 2017-02-10 15:50:16 +02:00
Jiiks 031c64271a Conflict merge 
https://github.com/Jiiks/BetterDiscordApp/pull/420
 2017-02-10 15:48:56 +02:00
Jiiks 79d9c6f00c Conflict merge 
https://github.com/Jiiks/BetterDiscordApp/pull/432
 2017-02-10 15:46:12 +02:00
Jiiks 391b6a2085 Merge pull request #426 from Zerthox/patch-5 
Add Spooky, Spaghetti, Rucksack, Rein, Moin to emotefilter
 2017-02-10 15:42:18 +02:00
Jiiks e8e52cf7c6 Merge pull request #442 from brodycas3/master 
Add Minecraft to emote filter
 2017-02-10 14:52:12 +02:00
Jiiks de617fed27 Merge pull request #434 from DeathStrikeV/master 
Updated emotes
 2017-01-31 21:38:50 +02:00
DeathStrikeV 59c931191b Updated emotes 2017-01-31 19:16:17 +00:00
Zerthox ca3859d343 Add Moin 2017-01-31 12:04:23 +01:00
brodycas3 30df5f6158 Update emotefilter.json 2017-01-29 21:23:46 -05:00
DeathStrikeV f15b0dee3d Updated emotes 2017-01-29 22:52:57 +00:00
Jiiks 513fb57621 Removed garbage 2017-01-28 03:48:36 +02:00
DeathStrikeV dc18638567 Updated emotes 2017-01-28 00:05:11 +00:00
DeathStrikeV c74e9c1030 Updated emotes 2017-01-23 00:58:07 +00:00
DeathStrikeV 6768b064f7 Updated emotes 2017-01-19 19:23:26 +00:00
Ehsan Kia 71124e0129 Fully update BTTV emotes, removing 6000 404'd emotes and adding around 14k new ones. 2017-01-18 21:18:31 -08:00
DeathStrikeV 5120488766 Updated emotes 2017-01-13 21:37:19 +00:00
DeathStrikeV 8e9ebaa853 Updated emotes 2017-01-13 02:04:51 +00:00
DeathStrikeV a6f53183c1 Updated emotes 2017-01-09 21:49:20 +00:00
DeathStrikeV 5e23ad66af Updated emotes 2017-01-06 17:28:44 +00:00
DeathStrikeV 788d20e452 Updated emotes 2017-01-06 12:42:32 +00:00
DeathStrikeV 032b69d564 Updated emotes 2017-01-05 13:20:22 +00:00
DeathStrikeV 01a55116b0 Updated emotes 2017-01-05 13:17:20 +00:00
DeathStrikeV 31603634ce Updated emotes 2017-01-05 03:37:23 +00:00
DeathStrikeV f2d4680698 Updated emotes 2017-01-02 22:12:25 +00:00
Zerthox b4bc6ff109 Add Dirk 2016-12-31 20:24:44 +01:00
DeathStrikeV e21c1dc28a Updated emotes 2016-12-31 10:54:51 +00:00
DeathStrikeV bebf352bd0 Updated emotes 2016-12-29 23:29:16 +00:00
DeathStrikeV 1111b98767 Updated emotes 2016-12-24 11:09:20 +00:00
DeathStrikeV ffb456c466 Updated emotes 2016-12-22 23:21:20 +00:00
DeathStrikeV 68247caf66 Updated emotes 2016-12-20 07:38:43 +00:00
Zerthox c65b760ca1 Add Spooky, Spaghetti, Rucksack, Rein 2016-12-19 19:18:31 +01:00
DeathStrikeV 8e4b5f6ee0 Updated emotes 2016-12-17 22:10:30 +00:00
DeathStrikeV 6e08a4b1ed Updated emotes 2016-12-17 12:26:26 +00:00
DeathStrikeV 0b26620901 Updated emotes 2016-12-17 08:23:40 +00:00
DeathStrikeV d4c8f04331 Merge pull request #9 from Jiiks/master 
Update to latest
 2016-12-17 07:23:23 +00:00
DeathStrikeV 67f0257cb4 Updated emotes 2016-12-17 07:20:25 +00:00
pohky a2de68ec1f Update emotefilter.json 
Added Bella
 2016-12-16 23:22:19 +01:00
DeathStrikeV 93115073e9 Updated emotes 2016-12-13 23:11:30 +00:00
DeathStrikeV 19f5f9f7a5 Updated emotes 2016-12-13 08:27:48 +00:00
Jiiks 131eab393d Merge pull request #418 from Zerthox/patch-3 
Added Meow, Hartz, Brille, Affe, Baby, YOUTUBE to emote filter
 2016-12-12 22:44:18 +02:00
DeathStrikeV 42898de340 Updated emotes 2016-12-12 20:33:40 +00:00
Zerthox 65fda6f4e7 Added YOUTUBE 2016-12-12 20:01:55 +01:00
Zerthox e15af62927 Added Baby 2016-12-12 19:58:18 +01:00
DeathStrikeV d2a7c6734a Updated emotes 2016-12-10 07:39:51 +00:00
Zerthox 1b9eb941d2 Added Affe 2016-12-09 20:59:12 +01:00
Zerthox 59263be1b5 Added Brille 2016-12-09 20:35:32 +01:00
DeathStrikeV df2b647750 Updated emotes 2016-12-08 05:01:16 +00:00
DeathStrikeV 4e0a23ec03 Updated emotes 2016-12-07 01:39:00 +00:00
DeathStrikeV beae2087a8 Updated emotes 2016-12-06 19:49:43 +00:00
DeathStrikeV 31a1fcfc46 Updated emotes 2016-12-05 11:13:33 +00:00
DeathStrikeV 37731b9fa7 Merge branch 'master' of github.com:DeathStrikeV/BetterDiscordApp 2016-12-02 21:38:41 +00:00
DeathStrikeV 2d8120fc1e Updated emotes 2016-12-02 21:38:09 +00:00
DeathStrikeV bd0e1b135e Merge pull request #8 from Jiiks/master 
Update to latest
 2016-12-02 10:23:05 +00:00
DeathStrikeV e40b9fe82c Updated emotes 2016-12-02 09:54:24 +00:00
DeathStrikeV bb5744dfe9 Updated emotes 2016-11-29 21:36:09 +00:00
DeathStrikeV 5bf2597030 Updated emotes 2016-11-28 23:38:15 +00:00
DeathStrikeV ade5cbc446 Updated emotes 2016-11-28 13:45:55 +00:00
DeathStrikeV 35ca5f6339 Updated emotes 2016-11-28 07:03:14 +00:00
DeathStrikeV 97c259f1c4 Updated emotes 2016-11-27 20:48:51 +00:00
DeathStrikeV 8eedc29d71 Updated emotes 2016-11-27 12:33:46 +00:00
DeathStrikeV 3975eabca0 Updated emotes 2016-11-27 11:10:46 +00:00
DeathStrikeV 1b99b6289a Updated emotes 2016-11-25 07:36:15 +00:00
DeathStrikeV 0b9fb52800 Updated emotes 2016-11-25 06:34:40 +00:00
DeathStrikeV f1a0f11257 Updated emotes 2016-11-24 09:55:07 +00:00
DeathStrikeV dea323a0b8 Updated emotes 2016-11-23 07:30:50 +00:00
Zerthox c0bd71fe7d Added Meow & Hartz 2016-11-21 19:57:26 +01:00
DeathStrikeV 85093234fa Updated emotes 2016-11-20 09:44:32 +00:00
DeathStrikeV 13e21fb052 Updated emotes 2016-11-19 19:56:18 +00:00
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
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
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
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
Zerthox 84092e1c6f Add "Nein" and "Pokeball" 2016-11-07 21:17:28 +01:00
DeathStrikeV 68e56d9ea8 Merge pull request #5 from Jiiks/master 
Pull latest changes
 2016-11-07 19:24:08 +00:00
DeathStrikeV 2e64e4c47b Updated emotes 2016-11-06 23:46:21 +00: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
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 07968430e3 Updated emotes 2016-11-04 22:43:27 +00:00
DeathStrikeV e1470dab3e Updated emotes 2016-11-04 00:06:53 +00:00
DeathStrikeV ab0e948fe4 Updated emotes 2016-11-03 20:43:07 +00:00
Alex 66c24f246a Merge pull request #3 from Jiiks/master 
Updating to latest
 2016-11-02 21:28:33 +00:00
DeathStrikeV 27b1978515 Updated emotes 2016-11-02 21:22:04 +00:00
Jiiks c3443b5725 added Okie 2016-11-02 07:38:03 +02:00
DeathStrikeV 5e466e79fd Updated emotes 2016-11-01 08:07:46 +00:00
Jiiks 4f549676bc Merge pull request #392 from DeathStrikeV/master 
FFZ Emote Update
 2016-11-01 05:50:31 +02:00
DeathStrikeV 3d381b7ca1 Updated emotes 2016-10-30 21:56:27 +00:00
DeathStrikeV 469cb2a2da Updated emotes 2016-10-29 21:09:50 +01:00
DeathStrikeV 8b57885002 Updated emotes 2016-10-29 00:36:56 +01:00
DeathStrikeV 3429d6c8ca Updated emotes 2016-10-28 07:58:50 +01:00
DeathStrikeV a80d16fbd8 Updated emotes 2016-10-20 08:07:38 +01:00
Ehsan Kia 2db776f93a Updated BTTV emote database 2016-10-16 19:01:11 -07:00
DeathStrikeV e330ff197d Updated emotes 2016-10-16 19:52:23 +01:00
DeathStrikeV b002ae6130 Updated emotes 2016-10-11 09:41:09 +01:00
DeathStrikeV 5c27d91fde Updated emotes 2016-10-09 22:02:09 +01:00
DeathStrikeV 5f94a8b155 Updated emotes 2016-10-08 17:13:27 +01:00
DeathStrikeV f18f353501 Updated emotes 2016-10-08 16:33:12 +01:00
DeathStrikeV 0e2bf5b1c4 Updated emotes 2016-10-07 20:05:05 +01:00
DeathStrikeV ea34f260df Updated emotes 2016-10-07 20:02:43 +01:00
DeathStrikeV 56f590dbf4 Updated emotes 2016-10-07 19:37:07 +01:00