Commit graph

9 commits

Author SHA1 Message Date
GregTCLTK
a806d96bb0
#337 2020-01-21 08:13:12 +01:00
GregTCLTK
607d633d7f
Rename event to e 2020-01-20 18:37:05 +01:00
GregTCLTK
238f238cd7
Some Help command stuff 2019-12-30 19:00:45 +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
93e93f8f05
Translate Settings 2019-12-13 13:32:04 +01:00
GregTCLTK
0ba08856f1
Finish language command 2019-12-10 17:00:38 +01:00
GregTCLTK
ab752205e0
Help Command improvement 2019-12-08 01:40:09 +01:00
GregTCLTK
562f520dfa
Language command 2019-12-07 12:09:53 +01:00