Commit graph

60 commits

Author SHA1 Message Date
Skidder
f6f6c17f6f New translations Translations_en.properties (English)
New English translation
2019-12-28 15:50:37 +01:00
Skidder
d5890dff43 New translations Translations_en.properties (English)
New English translation
2019-12-28 15:40:31 +01:00
Skidder
79d1607f40 New translations Translations_en.properties (English)
New English translation
2019-12-28 15:31:05 +01:00
Skidder
78ce7607bd New translations Translations_en.properties (English)
New English translation
2019-12-27 03:00:54 +01:00
Skidder
a54a55baa5 New translations Translations_en.properties (English)
New English translation
2019-12-26 23:50:28 +01:00
Skidder
6bfb153179 New translations Translations_en.properties (English)
New English translation
2019-12-26 23:40:31 +01:00
Skidder
67a768d7c2 New translations Translations_en.properties (English)
New English translation
2019-12-26 23:30:57 +01:00
GregTCLTK
5ce89ae72e
Translation fix 2019-12-26 22:33:41 +01:00
GregTCLTK
8d3001adcf
Edit Rules command #253 2019-12-26 21:46:13 +01:00
GregTCLTK
409088c721
EventWaiter 2019-12-26 17:44:38 +01:00
Skidder
6895e66cc0
Merge pull request #249 from BigBotNetwork/greg-dev
Custom error message
2019-12-25 00:54:34 +01:00
GregTCLTK
c1fdacd46d
Custom error message for #245 2019-12-25 00:39:14 +01:00
Skidder
1c272f9066 New translations Translations_en.properties (English)
New English translation
2019-12-25 00:33:18 +01:00
Skidder
ec4ad872a1 New translations Translations_en.properties (English)
New English translation
2019-12-25 00:20:31 +01:00
Skidder
9e08cc4a0b New translations Translations_en.properties (English)
New English translation
2019-12-25 00:10:33 +01:00
Skidder
e59f5fcc13 New translations Translations_en.properties (English)
New English translation
2019-12-23 16:32:58 +01:00
Skidder
758fee0a57 New translations Translations_en.properties (English)
New English translation
2019-12-23 14:20:44 +01:00
Skidder
d9a67f8682 New translations Translations_en.properties (English)
New English translation
2019-12-23 14:00:51 +01:00
Skidder
9496307009 New translations Translations_en.properties (English)
New English translation
2019-12-22 21:31:17 +01:00
Skidder
667bc275df New translations Translations_en.properties (English)
New English translation
2019-12-22 21:20:37 +01:00
Skidder
60cc08daf8 New translations Translations_en.properties (English)
New English translation
2019-12-22 21:10:44 +01:00
Skidder
78511f9b3e New translations Translations_en.properties (English)
New English translation
2019-12-22 21:00:40 +01:00
Skidder
8d2bb6162e New translations Translations_en.properties (English)
New English translation
2019-12-22 20:40:40 +01:00
Skidder
49c5e8688b New translations Translations_en.properties (English)
New English translation
2019-12-22 20:30:42 +01:00
Skidder
6f5ca7248b New translations Translations_en.properties (English)
New English translation
2019-12-22 19:50:35 +01:00
Skidder
0471d4fa1b New translations Translations_en.properties (English)
New English translation
2019-12-22 19:31:02 +01:00
Skidder
54d109226a New translations Translations_en.properties (English)
New English translation
2019-12-22 12:50:38 +01:00
Skidder
395738c060
Merge pull request #230 from BigBotNetwork/greg-dev
Merged!
2019-12-21 18:14:55 +01:00
GregTCLTK
81dedc87d7
New permission system
!!!
2019-12-21 17:44:34 +01:00
GregTCLTK
7a9c2172d8
Nothing special 2019-12-21 16:32:21 +01:00
GregTCLTK
d6e78b6a45
Prefix 2019-12-20 13:11:28 +01:00
GregTCLTK
5be162fd1a
Clyde i18n 2019-12-20 13:06:30 +01:00
GregTCLTK
ab6edbf20c
Guild Leave error msg 2019-12-18 18:17:18 +01:00
GregTCLTK
9ba00c81cf
Merge remote-tracking branch 'origin/greg-dev' into greg-dev 2019-12-18 17:45:43 +01:00
Skidder
eeefdb79dc New translations Translations_en.properties (English)
New English translation
2019-12-18 17:41:14 +01:00
GregTCLTK
47be983996
... 2019-12-18 17:40:45 +01:00
Skidder
27eae71762
Merge branch 'master' into i18n 2019-12-18 17:35:57 +01:00
Skidder
cc297ed9ca New translations Translations_en.properties (English)
New English translation
2019-12-18 17:30:52 +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
Skidder
61856be41d New translations Translations_en.properties (English)
New English translation
2019-12-14 13:10:38 +01:00
GregTCLTK
f8e438d295
Clear All 2019-12-14 13:03:01 +01:00
GregTCLTK
5009937fe2
Clear Command improvements 2019-12-14 11:55:14 +01:00
Skidder
7d1f032937 New translations Translations_en.properties (English)
New English translation
2019-12-13 13:50:41 +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
Skidder
49864cece8
Revert "Translation" 2019-12-12 21:27:43 +01:00
Skidder
7c27defa4f New translations Translations_en.properties (English)
New English translation
2019-12-12 20:55:24 +01:00
Skidder
c8903642f6 New translations Translations_en.properties (English)
New English translation
2019-12-11 20:20:52 +01:00
GregTCLTK
6bb0a77db6
Music part 1 2019-12-11 20:08:08 +01:00