Commit graph

80 commits

Author SHA1 Message Date
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
GregTCLTK
6649f0b092
Translation for Role and Rules command 2019-12-11 19:43:08 +01:00
GregTCLTK
38dfca5767
More translation improvements 2019-12-11 18:29:56 +01:00
GregTCLTK
5b039ee532
Translation improvements 2019-12-11 17:58:32 +01:00
GregTCLTK
46bb510997
%extra%
Not by the GottBot
2019-12-11 17:34:52 +01:00
Skidder
69bce8cbdb New translations Translations_en.properties (English)
[ci skip] New English translation
2019-12-10 20:29:07 +01:00
Skidder
e7e3a415d5
Merge branch 'master' into greg-dev 2019-12-10 20:27:15 +01:00
GregTCLTK
c18338dcf1
Second part of i18n integration 2019-12-10 20:03:37 +01:00
GregTCLTK
4adf6a8eb9
First part of i18n integration 2019-12-10 19:07:11 +01:00
Skidder
1302ee2dca New translations Translations_en.properties (English)
[ci skip] New English translation
2019-12-10 17:45:12 +01:00
GregTCLTK
ec5c7520dc
Move files again
Just for better structure
2019-12-10 17:42:55 +01:00
Renamed from src/main/resources/Translations_en.properties (Browse further)