Commit graph

1021 commits

Author SHA1 Message Date
Skidder
d528716b5b
Merge pull request #282 from BigBotNetwork/greg-dev
Merged!
2019-12-30 19:30:31 +01:00
GregTCLTK
ff64355163
A new help command :) 2019-12-30 19:30:18 +01:00
GregTCLTK
19f7bc920d
Help command improvements 2019-12-30 19:27:28 +01:00
GregTCLTK
bf5f86f022
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2019-12-30 19:00:50 +01:00
GregTCLTK
238f238cd7
Some Help command stuff 2019-12-30 19:00:45 +01:00
Skidder
ed5d625d7d
Merge pull request #278 from BigBotNetwork/dependabot/maven/greg-dev/net.dv8tion-JDA-4.1.0_88
Bump JDA from 4.1.0_87 to 4.1.0_88
2019-12-30 14:21:24 +01:00
dependabot-preview[bot]
14abfb442b
Bump JDA from 4.1.0_87 to 4.1.0_88
Bumps JDA from 4.1.0_87 to 4.1.0_88.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-30 13:21:13 +00:00
GregTCLTK
9d0f60fe56
Didn't work lul 2019-12-30 13:50:01 +01:00
GregTCLTK
5059e7b165 Continue later 2019-12-30 03:47:01 +01:00
GregTCLTK
29dd178715 CONTINUE WORK LATER!!! 2019-12-30 03:46:43 +01:00
GregTCLTK
4dd6b05bd0
I think it was duplicated 2019-12-30 00:06:01 +01:00
GregTCLTK
3311bcd428
Remove unused import 2019-12-30 00:03:00 +01:00
GregTCLTK
aa435eac9a
Codacy issue fix 2019-12-28 21:53:27 +01:00
Skidder
f0de290dc6
Merge pull request #277 from BigBotNetwork/greg-dev
Merged!
2019-12-28 21:42:41 +01:00
GregTCLTK
551bb13cbc
Some fixes 2019-12-28 21:42:06 +01:00
Skidder
9d34f839e8 New translations Translations_en.properties (German)
New German translation
2019-12-28 19:10:29 +01:00
Skidder
abca391493
Merge pull request #273 from BigBotNetwork/master
Merged!
2019-12-28 18:52:35 +01:00
Skidder
c0aa638537
Merge pull request #272 from BigBotNetwork/i18n
New Crowdin translations
2019-12-28 18:52:20 +01:00
Skidder
e49bddd10c New translations Translations_en.properties (Chinese Simplified)
New Chinese Simplified translation
2019-12-28 18:51:34 +01:00
Skidder
3604b0d8d8 New translations Translations_en.properties (Turkish)
New Turkish translation
2019-12-28 18:51:33 +01:00
Skidder
4fbd8556f3 New translations Translations_en.properties (Russian)
New Russian translation
2019-12-28 18:51:32 +01:00
Skidder
644b68b367 New translations Translations_en.properties (French)
New French translation
2019-12-28 18:51:30 +01:00
Skidder
d228b1075a New translations Translations_en.properties (Spanish)
New Spanish translation
2019-12-28 18:51:29 +01:00
Skidder
bd1414ee2d New translations Translations_en.properties (German)
New German translation
2019-12-28 18:51:27 +01:00
Skidder
0efbc1a10f
Merge pull request #263 from BigBotNetwork/i18n
New Crowdin translations
2019-12-28 18:42:18 +01:00
Skidder
c53c3f43c3
Merge branch 'master' into i18n 2019-12-28 18:42:04 +01:00
Skidder
1ac1bc2013 New translations Translations_en.properties (German)
New German translation
2019-12-28 18:40:31 +01:00
Skidder
f6f6c17f6f New translations Translations_en.properties (English)
New English translation
2019-12-28 15:50:37 +01:00
Skidder
3ab5ee8471 New translations Translations_en.properties (German)
New German translation
2019-12-28 15:50:36 +01:00
Skidder
d5890dff43 New translations Translations_en.properties (English)
New English translation
2019-12-28 15:40:31 +01:00
Skidder
285c85fb57 New translations Translations_en.properties (Chinese Simplified)
New Chinese Simplified translation
2019-12-28 15:31:11 +01:00
Skidder
facc052cdd New translations Translations_en.properties (Turkish)
New Turkish translation
2019-12-28 15:31:10 +01:00
Skidder
0185759ab0 New translations Translations_en.properties (Russian)
New Russian translation
2019-12-28 15:31:09 +01:00
Skidder
f1350e78e6 New translations Translations_en.properties (French)
New French translation
2019-12-28 15:31:08 +01:00
Skidder
933ddb5363 New translations Translations_en.properties (Spanish)
New Spanish translation
2019-12-28 15:31:06 +01:00
Skidder
79d1607f40 New translations Translations_en.properties (English)
New English translation
2019-12-28 15:31:05 +01:00
Skidder
e9e1473610 New translations Translations_en.properties (German)
New German translation
2019-12-28 15:31:04 +01:00
Skidder
afdbd74165
Merge pull request #271 from BigBotNetwork/greg-dev
Merged!
2019-12-28 15:27:05 +01:00
GregTCLTK
50a2fa99bc
Voice Leave Listener 2019-12-28 15:26:37 +01:00
GregTCLTK
50163ca1b0
Bug fixes and improvements 2019-12-28 15:22:03 +01:00
GregTCLTK
1eb970fca4
Skip and Stop Command 2019-12-28 15:11:24 +01:00
GregTCLTK
25b88c1005
Queue Command 2019-12-28 14:52:52 +01:00
GregTCLTK
d76bd5f338
Playlist loaded 2019-12-28 14:52:41 +01:00
GregTCLTK
8d19b9ae07
Info Command 2019-12-28 14:14:45 +01:00
GregTCLTK
bf5d3c8364
Unused imports 2019-12-28 13:50:52 +01:00
Skidder
ec11cf7035
Merge pull request #270 from BigBotNetwork/hax-dev
Merged!
2019-12-28 13:25:17 +01:00
Hax
c3aaa9a238 Ez fix 2019-12-28 13:24:39 +01:00
Hax
1c75ed6255 Merge remote-tracking branch 'origin/hax-dev' into hax-dev 2019-12-28 13:13:14 +01:00
Hax
c0d39f3624 Auto stash before merge of "hax-dev" and "origin/greg-dev" 2019-12-28 13:13:03 +01:00
Skidder
a155cc0d96
Merge pull request #269 from BigBotNetwork/greg-dev
Greg dev
2019-12-28 13:12:47 +01:00