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
..
JoinCommand.java	Merge branch 'hax-dev' into greg-dev	2019-12-18 17:15:28 +01:00
LeaveCommand.java	Merge branch 'hax-dev' into greg-dev	2019-12-18 17:15:28 +01:00