Commit graph

11 commits

Author SHA1 Message Date
GregTCLTK
238f238cd7
Some Help command stuff 2019-12-30 19:00:45 +01:00
GregTCLTK
9820dd0352
Revert "EventWaiter"
This reverts commit 409088c721.
2019-12-26 22:17:28 +01:00
GregTCLTK
409088c721
EventWaiter 2019-12-26 17:44:38 +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
4adf6a8eb9
First part of i18n integration 2019-12-10 19:07:11 +01:00
GregTCLTK
ab752205e0
Help Command improvement 2019-12-08 01:40:09 +01:00
GregTCLTK
6c6d6df094
Translation files 2019-12-07 01:53:22 +01:00
GregTCLTK
133ef8791c
I would call it "better code" 2019-11-30 12:42:50 +01:00
GregTCLTK
e602cd4283
Args fix 2019-11-24 21:31:17 +01:00
GregTCLTK
399aade130
Better code 2019-11-23 02:54:07 -08:00
Renamed from src/main/java/com/bbn/hadder/commands/misc/ScreenshareCommand.java (Browse further)