Commit graph

1281 commits

Author SHA1 Message Date
Skidder
ef24b5fbec
Merge pull request #327 from BigBotNetwork/hax-dev
Hax dev
2020-01-17 12:57:27 +01:00
Hax
054d967b70 Vom Bra muss der Benzer 2020-01-16 21:00:54 +01:00
Hax
e2bd886eb9 Merge branch 'master' into hax-dev 2020-01-16 20:59:42 +01:00
GregTCLTK
d07e8deefd
Not needed 2020-01-16 19:51:18 +01:00
GregTCLTK
26d712dcbd
Remove a line lol 2020-01-16 19:50:13 +01:00
GregTCLTK
c95896e9bf
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2020-01-16 19:44:18 +01:00
Skidder
490d0d0a67
Merge pull request #326 from BigBotNetwork/dependabot/maven/greg-dev/net.dv8tion-JDA-4.1.0_99
Bump JDA from 4.1.0_97 to 4.1.0_99
2020-01-16 19:43:44 +01:00
GregTCLTK
82135650fe
Bye WakaTime :( 2020-01-16 19:10:20 +01:00
GregTCLTK
04a965c3b9
Translation 2020-01-16 18:32:18 +01:00
dependabot-preview[bot]
910adbca11
Bump JDA from 4.1.0_97 to 4.1.0_99
Bumps JDA from 4.1.0_97 to 4.1.0_99.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-16 13:30:38 +00:00
GregTCLTK
69761c6428
Some wakatime stuff 2020-01-15 20:54:29 +01:00
GregTCLTK
0973651870
Authorization stuff 2020-01-15 20:43:21 +01:00
GregTCLTK
13155d68fb
Some music stuff :( 2020-01-15 20:26:52 +01:00
GregTCLTK
c13e5249d1
More error messages 2020-01-15 19:48:30 +01:00
GregTCLTK
4725f4a123
TODO Gh command 2020-01-15 18:18:06 +01:00
GregTCLTK
294372941e
lol wakatime command 2020-01-15 18:10:19 +01:00
Skidder
b6b0ba7e77
Merge pull request #324 from BigBotNetwork/i18n
New Crowdin translations
2020-01-15 10:11:06 +01:00
Skidder
aad650f31a New translations Translations_en.properties (Chinese Simplified)
New Chinese Simplified translation
2020-01-14 21:01:23 +01:00
Skidder
c84fdc3f4a New translations Translations_en.properties (Turkish)
New Turkish translation
2020-01-14 21:01:21 +01:00
Skidder
31fcd95da8 New translations Translations_en.properties (Russian)
New Russian translation
2020-01-14 21:01:20 +01:00
Skidder
10ab3d75d1 New translations Translations_en.properties (French)
New French translation
2020-01-14 21:01:18 +01:00
Skidder
c36911206f New translations Translations_en.properties (Spanish)
New Spanish translation
2020-01-14 21:01:16 +01:00
Skidder
7795782912 New translations Translations_en.properties (English)
New English translation
2020-01-14 21:01:15 +01:00
Skidder
1b234138f9 New translations Translations_en.properties (German)
New German translation
2020-01-14 21:01:14 +01:00
Skidder
c799669d7d
Better error message in the rules command
Add some better error message in the rules command
2020-01-14 20:55:34 +01:00
GregTCLTK
391ef46195
Better error message in the rules command 2020-01-14 18:49:04 +01:00
Skidder
efdcd8367a
Finally update JDA version
Finally update JDA version
2020-01-14 18:42:51 +01:00
Skidder
09421955e9
Merge pull request #320 from BigBotNetwork/dependabot/maven/greg-dev/net.dv8tion-JDA-4.1.0_97
Bump JDA from 4.1.0_95 to 4.1.0_97
2020-01-14 18:41:33 +01:00
dependabot-preview[bot]
067b5b3a4d
Bump JDA from 4.1.0_95 to 4.1.0_97
Bumps JDA from 4.1.0_95 to 4.1.0_97.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-14 13:37:05 +00:00
Skidder
a9eed621fd
Update README.md 2020-01-13 20:40:04 +01:00
Skidder
b39bd971cc
Update README.md 2020-01-13 20:35:24 +01:00
Skidder
ff02659975
Merge pull request #318 from BigBotNetwork/i18n
New Crowdin translations
2020-01-13 20:02:21 +01:00
Skidder
8d82d737a4
Merge pull request #319 from BigBotNetwork/greg-dev
Greg dev
2020-01-13 19:35:43 +01:00
GregTCLTK
8c6d068770
stuff 2020-01-13 19:35:16 +01:00
Skidder
3ffadfcafa New translations Translations_en.properties (German)
New German translation
2020-01-13 17:00:35 +01:00
Skidder
5ee7157e9a New translations Translations_en.properties (German)
New German translation
2020-01-13 16:50:42 +01:00
Skidder
c8833f5bb9 New translations Translations_en.properties (German)
New German translation
2020-01-13 16:40:46 +01:00
GregTCLTK
0a7176a758
Update JDA version 2020-01-13 08:59:45 +01:00
Skidder
c98592047d
Merge pull request #317 from BigBotNetwork/master
-
2020-01-13 08:40:12 +01:00
Skidder
2eb0772e68
Merge pull request #316 from BigBotNetwork/i18n
New Crowdin translations
2020-01-13 08:37:59 +01:00
GregTCLTK
e4aad8b597
Not needed stuff 2020-01-12 01:08:38 +01:00
Skidder
67f440e357 New translations Translations_en.properties (Chinese Simplified)
New Chinese Simplified translation
2020-01-11 19:11:08 +01:00
Skidder
ad47502c73 New translations Translations_en.properties (Turkish)
New Turkish translation
2020-01-11 19:11:07 +01:00
Skidder
d7d118b1e2 New translations Translations_en.properties (Russian)
New Russian translation
2020-01-11 19:11:05 +01:00
Skidder
f232803c73 New translations Translations_en.properties (French)
New French translation
2020-01-11 19:11:04 +01:00
Skidder
7f5dda93fc New translations Translations_en.properties (Spanish)
New Spanish translation
2020-01-11 19:11:03 +01:00
Skidder
0b20165986 New translations Translations_en.properties (English)
New English translation
2020-01-11 19:11:01 +01:00
Skidder
9067f4ebab New translations Translations_en.properties (German)
New German translation
2020-01-11 19:11:00 +01:00
Skidder
2e663bc932
Merge pull request #315 from BigBotNetwork/greg-dev
Some stuff yk
2020-01-11 19:02:35 +01:00
GregTCLTK
3c39c70f43
Remove 2020-01-11 18:26:36 +01:00