Commit graph

151 commits

Author SHA1 Message Date
GregTCLTK
12d8e33034
:^) 2019-12-18 17:24:37 +01:00
Hax
d3f96e874f Merge branch 'hax-dev' into greg-dev
# Conflicts:
#	src/main/java/com/bbn/hadder/Hadder.java
#	src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java
#	src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java
#	src/main/java/com/bbn/hadder/commands/music/JoinCommand.java
#	src/main/java/com/bbn/hadder/commands/music/LeaveCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/AnalCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/BDSMCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/BlowjobCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/BoobsCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/CumCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/EroticCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/FeetCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/FingeringCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/LickingCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/PornCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/PussyCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/RandomPornCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/SoloCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/SpankCommand.java
#	src/main/java/com/bbn/hadder/commands/nsfw/TransCommand.java
#	src/main/java/com/bbn/hadder/commands/owner/EvalCommand.java
#	src/main/java/com/bbn/hadder/commands/owner/GuildLeaveCommand.java
#	src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java
#	src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java
#	src/main/java/com/bbn/hadder/utils/MessageEditor.java
#	src/main/resources/Translations/Translations_en.properties
2019-12-18 17:15:28 +01:00
Hax
5ee5f31860 Bruh moment 2019-12-14 15:40:46 +01:00
GregTCLTK
f8e438d295
Clear All 2019-12-14 13:03:01 +01:00
GregTCLTK
fe3c0aee77
Rules Command fix 2019-12-14 12:06:46 +01:00
GregTCLTK
5009937fe2
Clear Command improvements 2019-12-14 11:55:14 +01:00
Hax
805ac1975e Added StarBoard 2019-12-13 20:20:01 +01:00
GregTCLTK
93e93f8f05
Translate Settings 2019-12-13 13:32:04 +01:00
GregTCLTK
200454e3fa
Owner Commands translation 2019-12-13 13:05:30 +01:00
GregTCLTK
507630b17f
NSFW Command Translation 2019-12-12 20:47:04 +01:00
GregTCLTK
b2f7347072
Music Command Translation 2019-12-12 20:46:57 +01:00
GregTCLTK
6bb0a77db6
Music part 1 2019-12-11 20:08:08 +01:00
GregTCLTK
6649f0b092
Translation for Role and Rules command 2019-12-11 19:43:08 +01:00
GregTCLTK
d2fb3a96ff
🤔 2019-12-11 19:25:38 +01:00
GregTCLTK
38dfca5767
More translation improvements 2019-12-11 18:29:56 +01:00
GregTCLTK
5b039ee532
Translation improvements 2019-12-11 17:58:32 +01:00
GregTCLTK
46bb510997
%extra%
Not by the GottBot
2019-12-11 17:34:52 +01:00
GregTCLTK
b641f8a6b1
Forgot one 2019-12-10 20:19:25 +01:00
GregTCLTK
c18338dcf1
Second part of i18n integration 2019-12-10 20:03:37 +01:00
GregTCLTK
4adf6a8eb9
First part of i18n integration 2019-12-10 19:07:11 +01:00
GregTCLTK
0ba08856f1
Finish language command 2019-12-10 17:00:38 +01:00
GregTCLTK
8d61183657
Join Command Fix 2019-12-10 16:40:33 +01:00
GregTCLTK
1104a40315
Rules Command Mentioned Role fix
#185
2019-12-10 16:35:37 +01:00
GregTCLTK
c593004c7d
Shorter code dfsf 2019-12-09 17:07:34 +01:00
GregTCLTK
5e6a84b583
Remove unused imports 2019-12-09 08:02:10 +01:00
GregTCLTK
fc0a3d9cc1
Error message 2019-12-09 07:53:51 +01:00
Skidder
bcc5125dcf
Merge pull request #180 from BigBotNetwork/master
Hax -> Greg
2019-12-08 21:50:17 +01:00
Hax
910289d938 Hello my friend. I'm a fix 2019-12-08 21:36:12 +01:00
GregTCLTK
ab752205e0
Help Command improvement 2019-12-08 01:40:09 +01:00
GregTCLTK
5e5b486269
Clear Command improvement 2019-12-07 23:13:09 +01:00
GregTCLTK
27443316be
Join Command more error messages 2019-12-07 20:00:27 +01:00
GregTCLTK
562f520dfa
Language command 2019-12-07 12:09:53 +01:00
GregTCLTK
6c6d6df094
Translation files 2019-12-07 01:53:22 +01:00
GregTCLTK
4982196fb1
Role Mention fix 2019-12-06 17:38:23 +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
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
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
c3d22e87d8
BDSM Command 2019-12-03 19:44:31 +01:00
GregTCLTK
f838793e19
Rules Command improvement 2019-12-02 19:31:15 +01:00
GregTCLTK
e7e55e44ba
Rules Command feature 2019-12-02 18:38:43 +01:00
GregTCLTK
8bea23f41b
4 more improvements 2019-12-02 09:11:15 +01:00
GregTCLTK
67faa70aaf
More code improvements 2019-12-02 08:56:36 +01:00
GregTCLTK
d53068dd50
Code improvements 2019-12-02 08:47:48 +01:00