Commit graph

566 commits

Author SHA1 Message Date
Skidder
087535e120 New translations en.json (German) 2019-12-06 11:11:06 -08:00
Skidder
aa21dd536a Update Crowdin configuration file 2019-12-06 11:10:57 -08:00
GregTCLTK
32dfcb0269
Crowdin test 2019-12-06 20:09:39 +01:00
GregTCLTK
4c42a56518
.de --> .com in the code of conduct 2019-12-06 20:00:50 +01:00
GregTCLTK
d75fea75a0
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2019-12-06 17:38:33 +01:00
GregTCLTK
4982196fb1
Role Mention fix 2019-12-06 17:38:23 +01:00
Skidder
72f843f757
Update README.md 2019-12-05 21:23:42 +01:00
Skidder
5720399e49
Update README.md 2019-12-05 21:23:03 +01:00
Skidder
0ff9e02cad Update Crowdin configuration file 2019-12-05 12:15:59 -08:00
Skidder
15c8457ee2
Create en_us.json 2019-12-05 21:14:47 +01:00
Skidder
ed3f29032c
Merge pull request #155 from BigBotNetwork/greg-dev
Greg dev
2019-12-05 07:58:29 -08:00
GregTCLTK
0575c5d879
Fix 2019-12-05 16:53:20 +01:00
GregTCLTK
0ee3fb990a
Redme update 2019-12-05 16:52:19 +01:00
GregTCLTK
e05e06c6af
Finish the about command 2019-12-05 16:49:54 +01:00
GregTCLTK
615af65253
About Command 2019-12-05 16:42:49 +01:00
GregTCLTK
8fda2b3f42
Region change improvement 2019-12-05 16:19:36 +01:00
GregTCLTK
78ebf15b40
Removed wrong MANIFEST 2019-12-05 16:19:25 +01:00
Skidder
a91d4100af
Merge pull request #154 from BigBotNetwork/greg-dev
Greg dev
2019-12-04 11:45:52 -08:00
GregTCLTK
0123c6d936
Finish region changer 2019-12-04 20:45:00 +01:00
GregTCLTK
f2238c4453
Success messages 2019-12-04 20:04:05 +01:00
GregTCLTK
abd6fe83e9
Adding the regions 2019-12-04 17:49:55 +01:00
GregTCLTK
6e1718c46e
Region change command 2019-12-04 17:36:43 +01:00
GregTCLTK
fb6ec11292
3 lines to 1 line 2019-12-04 16:36:54 +01:00
GregTCLTK
5507616956
version update 2019-12-03 20:49:56 +01:00
Skidder
7ae3e297b3
Merge pull request #152 from BigBotNetwork/greg-dev
NSFW commands
2019-12-03 11:44:59 -08:00
GregTCLTK
805eb78c25
Update and add new NSF commands 2.0 2019-12-03 20:14:04 +01:00
GregTCLTK
292a1d5c79
Update and add new NSFW commands 2019-12-03 20:02:22 +01:00
GregTCLTK
dfab050799
.dockerignore 2019-12-03 19:48:44 +01:00
GregTCLTK
c3d22e87d8
BDSM Command 2019-12-03 19:44:31 +01:00
Skidder
b149dd8353
Merge pull request #151 from BigBotNetwork/greg-dev
Greg dev
2019-12-03 09:56:08 -08:00
GregTCLTK
74c450a371
docs folder 2019-12-03 18:18:11 +01:00
Skidder
d15cae08ac
Merge pull request #150 from BigBotNetwork/master
Merge
2019-12-03 09:15:27 -08:00
Skidder
a0d61b6277
Merge pull request #149 from BigBotNetwork/greg-dev
Not a nice fix
2019-12-03 09:14:58 -08:00
GregTCLTK
74c5f32eb6
Not a nice fix 2019-12-03 18:14:28 +01:00
Skidder
ccefa1147c
Merge pull request #148 from BigBotNetwork/greg-dev
I hate this listener
2019-12-03 08:56:27 -08:00
GregTCLTK
57d75c0c06
I hate this listener 2019-12-03 17:55:56 +01:00
Skidder
53b5d685cc
Merge pull request #147 from BigBotNetwork/greg-dev
rage rage rage
2019-12-03 08:28:53 -08:00
GregTCLTK
8ffd4eb67a
rage rage rage 2019-12-03 17:28:27 +01:00
Skidder
bbc6b7c108
Merge pull request #146 from BigBotNetwork/greg-dev
Maybe this will fix everything
2019-12-03 08:14:59 -08:00
GregTCLTK
974b6c8307
Maybe this will fix everything 2019-12-03 17:14:19 +01:00
Skidder
98b7074ef0
Merge pull request #145 from BigBotNetwork/greg-dev
:(
2019-12-03 08:07:37 -08:00
GregTCLTK
c7cd9a4f26
:( 2019-12-03 17:07:12 +01:00
Skidder
a66b1595d6
Merge pull request #144 from BigBotNetwork/greg-dev
Debug
2019-12-03 07:56:41 -08:00
GregTCLTK
d84ec3a39f
Debug 2019-12-03 16:55:47 +01:00
Skidder
b41d360b15
Merge pull request #143 from BigBotNetwork/greg-dev
Greg dev
2019-12-03 07:05:39 -08:00
GregTCLTK
4ff97389c5
Rules Command Deploy failed 2019-12-03 16:05:17 +01:00
Skidder
c2ddae3e34
Merge pull request #142 from BigBotNetwork/dependabot/maven/greg-dev/net.dv8tion-JDA-4.0.0_70
Bump JDA from 4.0.0_69 to 4.0.0_70
2019-12-03 07:03:13 -08:00
dependabot-preview[bot]
9acd3f5708
Bump JDA from 4.0.0_69 to 4.0.0_70
Bumps JDA from 4.0.0_69 to 4.0.0_70.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-03 13:48:05 +00:00
Skidder
ad33b957fb
Merge pull request #141 from BigBotNetwork/revert-139-revert-137-greg-dev
Revert "Revert "Rules with custom emotes""
2019-12-02 22:02:42 -08:00
Skidder
baea86549c
Revert "Revert "Rules with custom emotes"" 2019-12-03 07:02:06 +01:00