Commit graph

1146 commits

Author SHA1 Message Date
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
Hax
57b76642d1 Merge remote-tracking branch 'origin/greg-dev' into hax-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
f0c5d94391 New translations Translations_en.properties (German)
New German translation
2019-12-28 00:00:32 +01:00
Skidder
8f3cfb4d7d New translations Translations_en.properties (German)
New German translation
2019-12-27 23:50:29 +01:00
Skidder
db5e8f10c2 New translations Translations_en.properties (German)
New German translation
2019-12-27 23:40:31 +01:00
Skidder
77468a9574 New translations Translations_en.properties (German)
New German translation
2019-12-27 23:20:28 +01:00
Skidder
672e23b84d New translations Translations_en.properties (German)
New German translation
2019-12-27 23:00:27 +01:00
Skidder
2d71e87849 New translations Translations_en.properties (German)
New German translation
2019-12-27 17:03:57 +01:00
Skidder
240e5d3e69 New translations Translations_en.properties (German)
New German translation
2019-12-27 16:50:28 +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
Skidder
328c19a53b
Merge pull request #267 from BigBotNetwork/greg-dev
Merged!
2019-12-27 14:36:26 +01: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
Skidder
6e0f853773 New translations Translations_en.properties (Chinese Simplified)
New Chinese Simplified translation
2019-12-27 03:01:01 +01:00
Skidder
40d92b47bc New translations Translations_en.properties (Turkish)
New Turkish translation
2019-12-27 03:00:59 +01:00
Skidder
c6429f2e2f New translations Translations_en.properties (Russian)
New Russian translation
2019-12-27 03:00:58 +01:00
Skidder
9be36aee38 New translations Translations_en.properties (French)
New French translation
2019-12-27 03:00:57 +01:00
Skidder
2c19a2d8c7 New translations Translations_en.properties (Spanish)
New Spanish translation
2019-12-27 03:00:55 +01:00
Skidder
78ce7607bd New translations Translations_en.properties (English)
New English translation
2019-12-27 03:00:54 +01:00