Hax
|
deb59caad2
|
what
|
2019-12-18 18:05:14 +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 |
|
GregTCLTK
|
200454e3fa
|
Owner Commands translation
|
2019-12-13 13:05:30 +01:00 |
|
GregTCLTK
|
a72ed14cc5
|
Remove
|
2019-11-20 07:52:05 -08:00 |
|
GregTCLTK
|
c95b8d6c54
|
Very nice improvements
|
2019-11-17 01:32:33 +01:00 |
|
Hax
|
e3a5344fde
|
Auto stash before merge of "hax-dev" and "origin/master"
|
2019-11-16 22:46:41 +01:00 |
|
GregTCLTK
|
da3e81d02a
|
Not needed
|
2019-11-05 17:09:08 +01:00 |
|
Hax
|
a5951c47ea
|
Hello, i changed everything and it works
Changed Stuff:
Command System
Database Connection
Config Reader
Command Event
Please sub to bbn Pog
|
2019-11-03 20:31:50 +01:00 |
|
Hax
|
fd97d7a20f
|
Edited Help Command
|
2019-10-31 17:17:58 +01:00 |
|
Hax
|
5611d0dede
|
Edited Command System, added Help Command
|
2019-10-31 17:17:35 +01:00 |
|