Commit graph

895 commits

Author SHA1 Message Date
Skidder
a155cc0d96
Merge pull request #269 from BigBotNetwork/greg-dev
Greg dev
2019-12-28 13:12:47 +01:00
GregTCLTK
6e73bcb554
fdsg 2019-12-28 13:12:10 +01:00
GregTCLTK
14387062bd Fix later 2019-12-28 02:48:32 +01:00
GregTCLTK
e79450e605
Fix for all joo 2019-12-28 01:22:19 +01:00
GregTCLTK
e16ac8095f
Register Voice Leave Listener 2019-12-28 01:15:16 +01:00
GregTCLTK
851d61dea5
Voice Leave Listener first part 2019-12-28 01:15:04 +01:00
GregTCLTK
0e7c0b941f
Stop Command fix 2019-12-28 01:14:54 +01:00
Skidder
fa957c6ba5
Merge pull request #268 from BigBotNetwork/dependabot/maven/greg-dev/net.dv8tion-JDA-4.1.0_87
Bump JDA from 4.1.0_86 to 4.1.0_87
2019-12-27 14:53:18 +01:00
dependabot-preview[bot]
e6a0ac250a
Bump JDA from 4.1.0_86 to 4.1.0_87
Bumps JDA from 4.1.0_86 to 4.1.0_87.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-27 13:36:44 +00:00
GregTCLTK
2f72f5e7b8
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2019-12-27 14:34:28 +01:00
GregTCLTK
10c9722598
New meme API #260 2019-12-27 14:34:22 +01:00
GregTCLTK
c89834af75 Fixing #265 2019-12-27 02:55:56 +01:00
GregTCLTK
692a47f118
Perm bug fix 2019-12-26 23:27:49 +01:00
GregTCLTK
06e30e9276
Bug fix 2019-12-26 23:23:52 +01:00
GregTCLTK
c4c78a96a7
Avatar fix 2019-12-26 23:01:58 +01:00
Skidder
84489d22ef
Merge pull request #258 from BigBotNetwork/master
Merged!
2019-12-26 22:45:26 +01:00
Skidder
eda0ae4c0e
Merge pull request #251 from BigBotNetwork/i18n
New Crowdin translations
2019-12-26 22:44:58 +01:00
Skidder
6fe655f830
Merge pull request #257 from BigBotNetwork/greg-dev
Merged!
2019-12-26 22:42:42 +01:00
GregTCLTK
4d5b830a13
Language fix 2019-12-26 22:42:17 +01:00
Skidder
164a0efbfe New translations Translations_en.properties (Chinese Simplified)
New Chinese Simplified translation
2019-12-26 22:41:10 +01:00
Skidder
de4232e11e New translations Translations_en.properties (Turkish)
New Turkish translation
2019-12-26 22:41:08 +01:00
Skidder
60197e3959 New translations Translations_en.properties (Russian)
New Russian translation
2019-12-26 22:41:07 +01:00
Skidder
ff9bc202a7 New translations Translations_en.properties (French)
New French translation
2019-12-26 22:41:06 +01:00
Skidder
e7b88863d1 New translations Translations_en.properties (Spanish)
New Spanish translation
2019-12-26 22:41:04 +01:00
Skidder
e47b792177 New translations Translations_en.properties (English)
New English translation
2019-12-26 22:41:03 +01:00
Skidder
1c1ba347cf New translations Translations_en.properties (German)
New German translation
2019-12-26 22:41:02 +01:00
Skidder
313c0c36c5
Merge pull request #255 from BigBotNetwork/dependabot/maven/greg-dev/net.dv8tion-JDA-4.1.0_86
Bump JDA from 4.1.0_84 to 4.1.0_86
2019-12-26 22:39:47 +01:00
Skidder
4bbb27b79b
Merge pull request #256 from BigBotNetwork/greg-dev
Merged!
2019-12-26 22:34:52 +01:00
GregTCLTK
8d26f6969c
Event Waiter 2019-12-26 22:34:14 +01:00
GregTCLTK
5ce89ae72e
Translation fix 2019-12-26 22:33:41 +01:00
GregTCLTK
9820dd0352
Revert "EventWaiter"
This reverts commit 409088c721.
2019-12-26 22:17:28 +01:00
GregTCLTK
8d3001adcf
Edit Rules command #253 2019-12-26 21:46:13 +01:00
GregTCLTK
967985c80e
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2019-12-26 17:44:58 +01:00
GregTCLTK
a8d1dc1606
Begin with the Edit Rules Command 2019-12-26 17:44:52 +01:00
GregTCLTK
409088c721
EventWaiter 2019-12-26 17:44:38 +01:00
GregTCLTK
0d621717df
EditRules Command 2019-12-26 17:43:40 +01:00
dependabot-preview[bot]
6ad176f789
Bump JDA from 4.1.0_84 to 4.1.0_86
Bumps JDA from 4.1.0_84 to 4.1.0_86.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-26 13:48:17 +00:00
GregTCLTK
dfa8578f8f
GH issue label 2019-12-26 14:18:29 +01:00
Skidder
827e5e16ad
Merge pull request #252 from BigBotNetwork/dependabot/maven/greg-dev/net.dv8tion-JDA-4.1.0_84
Bump JDA from 4.1.0_81 to 4.1.0_84
2019-12-25 15:24:55 +01:00
dependabot-preview[bot]
07ba3dabbc
Bump JDA from 4.1.0_81 to 4.1.0_84
Bumps JDA from 4.1.0_81 to 4.1.0_84.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-25 13:48:35 +00:00
GregTCLTK
1223e98552
Code improvements 2019-12-25 11:45:52 +01:00
Skidder
bc25e0644e New translations Translations_en.properties (Chinese Simplified)
New Chinese Simplified translation
2019-12-25 01:01:07 +01:00
Skidder
acf15f0d99 New translations Translations_en.properties (Turkish)
New Turkish translation
2019-12-25 01:01:06 +01:00
Skidder
91507db519 New translations Translations_en.properties (Russian)
New Russian translation
2019-12-25 01:01:05 +01:00
Skidder
e540c2cd02 New translations Translations_en.properties (French)
New French translation
2019-12-25 01:01:03 +01:00
Skidder
61a724a226 New translations Translations_en.properties (Spanish)
New Spanish translation
2019-12-25 01:01:02 +01:00
Skidder
3cfae8eaf9 New translations Translations_en.properties (German)
New German translation
2019-12-25 01:01:00 +01:00
Skidder
cb719f01ae
Merge pull request #250 from BigBotNetwork/master
Merged!
2019-12-25 00:56:02 +01:00
Skidder
6895e66cc0
Merge pull request #249 from BigBotNetwork/greg-dev
Custom error message
2019-12-25 00:54:34 +01:00
Skidder
1f17ff6ec3
Merge pull request #248 from BigBotNetwork/i18n
New Crowdin translations
2019-12-25 00:54:07 +01:00