Commit graph

530 commits

Author SHA1 Message Date
Skidder
7a0dbba1af Update Crowdin configuration file 2019-12-06 11:45:56 -08:00
Skidder
7f4aee3c0e
Merge pull request #160 from BigBotNetwork/master
Du kek
2019-12-06 11:44:23 -08:00
Skidder
16fd22c3ca
Merge pull request #159 from BigBotNetwork/greg-dev
Test String
2019-12-06 11:43:51 -08:00
GregTCLTK
3cff015ce1
Test string 2.0 2019-12-06 20:42:46 +01:00
GregTCLTK
2f0918fc88
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2019-12-06 20:21:22 +01:00
Skidder
1ed0f9644c
Merge pull request #158 from BigBotNetwork/master
Crowdin stuff
2019-12-06 11:21:12 -08:00
Skidder
5e75358229
Merge branch 'greg-dev' into master 2019-12-06 11:21:01 -08:00
Skidder
58a0f8bfe6 Update Crowdin configuration file 2019-12-06 11:18:42 -08:00
GregTCLTK
539d6003b1
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2019-12-06 20:15:21 +01:00
Skidder
65512e7146
Merge pull request #157 from BigBotNetwork/l10n_greg-dev
New Crowdin translations
2019-12-06 11:15:11 -08:00
GregTCLTK
83b89e28b6
Merge remote-tracking branch 'origin/l10n_greg-dev' into greg-dev 2019-12-06 20:14:53 +01:00
Skidder
78d67fccd8 New translations en.json (German) 2019-12-06 11:14:04 -08:00
Skidder
05c31dd884 New translations en.json (French) 2019-12-06 11:11:09 -08:00
Skidder
a3e19b1098 New translations en.json (Spanish) 2019-12-06 11:11:08 -08:00
Skidder
77a4ee819e New translations en.json (English) 2019-12-06 11:11:07 -08:00
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