diff --git a/example-config.json b/example-config.json
index f787317..e6b8040 100644
--- a/example-config.json
+++ b/example-config.json
@@ -1,11 +1,15 @@
{
- "Owners":
- [],
- "Database":{"IP":"",
+ "Owners": [
+
+
+ ],
+ "Database": {
+ "IP":"",
"Port": 6775,
"DBName": "",
"Username": "",
- "Password": ""},
+ "Password": ""
+ },
"Tokens": {
"BotToken": "",
"Giphy": "",
@@ -13,14 +17,15 @@
"MythicalBotList": "",
"BotsForDiscord": "",
"DiscordBotList": "",
- "DiscordBestBots": "",
"DiscordBoats": "",
"YetAnotherBotList": "",
"DiscordExtremeList": "",
"DiscordBotReviews": "",
"DiscordBots": "",
"BotListSpace": "",
- "DiscordBots2": ""
+ "DiscordBots2": "",
+ "CloudList": "",
+ "Arcane": ""
},
"Clyde": ""
}
diff --git a/pom.xml b/pom.xml
index 804255e..c9e2c4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
4.0.0
Hadder
Hadder
- 1.3.14
+ 1.3.15
Hadder
2019
Hadder is a multi-purpose Discord bot.
@@ -44,7 +44,7 @@
https://bigbotnetwork.com/
Europe/Berlin
- https://cdn.discordapp.com/avatars/477141528981012511/a_ba4bd8e5b381874edcd06a68d1acd3aa.gif
+ https://cdn.discordapp.com/avatars/401817301919465482/a_f81bd03e3862de579dec59241714d86d.gif
@@ -66,7 +66,7 @@
net.dv8tion
JDA
- 4.1.1_157
+ 4.1.1_165
org.json
@@ -91,12 +91,12 @@
org.kohsuke
github-api
- 1.112
+ 1.114
com.sedmelluq
lavaplayer
- 1.3.49
+ 1.3.50
com.fasterxml.jackson.core
diff --git a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java
index 7c6ab93..d5131fc 100644
--- a/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java
@@ -49,8 +49,8 @@ public class LanguageCommand implements Command {
break;
default:
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
- "List",
- "`de`, `en`, `es`, `fr`, `ru`, `tr`, `zh`")
+ "commands.settings.language.error.title", "",
+ "commands.settings.language.error.description", "`de`, `en`, `es`, `fr`, `ru`, `tr`, `zh`")
.build()).queue();
break;
}
diff --git a/src/main/resources/Translations/Translations_de.properties b/src/main/resources/Translations/Translations_de.properties
index 58503a4..6322a4d 100644
--- a/src/main/resources/Translations/Translations_de.properties
+++ b/src/main/resources/Translations/Translations_de.properties
@@ -223,6 +223,13 @@ commands.music.join.error.channel.description = Du befindest dich nicht in einem
commands.music.join.error.permission.title = Keine Berechtigung
commands.music.join.error.permission.description = Ich bin nicht Berechtigt deinem Sprachkanal beizutreten.
commands.music.join.help.description = Tritt deinem Sprachkanal bei.
+commands.music.leave.success.title = Verbindung erfolgreich getrennt
+commands.music.leave.success.description = Ich habe die Verbindung zum Sprachkanal erfolgreich getrennt
+commands.music.leave.error.channel.title = Kein Kanal
+commands.music.leave.error.channel.description = Du musst im selben Sprachkanal wie der Bot sein.
+commands.music.leave.error.connected.tile = Nicht verbunden
+commands.music.leave.error.connected.description = Ich bin derzeit in keinem Sprachkanal auf diesem Server
+commands.music.leave.help.description = Verlässt einen Sprachkanal.
commands.music.play.load.title = %extra% Now loading %extra%
commands.music.play.load.description = Versuche das Lied zu laden...
commands.music.play.success.loading.title = %extra% Jetzt läuft %extra%
diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties
index a68515b..f8253cd 100644
--- a/src/main/resources/Translations/Translations_en.properties
+++ b/src/main/resources/Translations/Translations_en.properties
@@ -325,6 +325,8 @@ commands.owner.blacklist.help.description = Blacklist a user for specific comman
commands.settings.language.success.title = Language set
commands.settings.language.success.description = `%extra%` is your new language now.
+commands.settings.language.error.title = Language not found
+commands.settings.language.error.description = Please choose one of the following language codes: %extra%
commands.settings.language.help.description = Sets the new primary language for a user.
commands.settings.prefix.success.title = Successfully set prefix
commands.settings.prefix.success.description = I successfully set the new prefix for you to `%extra%`.
diff --git a/src/main/resources/Translations/Translations_es.properties b/src/main/resources/Translations/Translations_es.properties
index a68515b..043a3f1 100644
--- a/src/main/resources/Translations/Translations_es.properties
+++ b/src/main/resources/Translations/Translations_es.properties
@@ -223,6 +223,13 @@ commands.music.join.error.channel.description = You aren't in a Voice Channel.
commands.music.join.error.permission.title = No permission
commands.music.join.error.permission.description = I am not allowed to join your voice channel.
commands.music.join.help.description = Joins your voice channel.
+commands.music.leave.success.title = Successfully disconnected
+commands.music.leave.success.description = I successfully disconnected from the Voice Channel
+commands.music.leave.error.channel.title = No channel
+commands.music.leave.error.channel.description = You have to be in the same voice channel as the bot.
+commands.music.leave.error.connected.tile = Not connected
+commands.music.leave.error.connected.description = I'm currently in no Voice Channel on this Guild
+commands.music.leave.help.description = Leaves your voice channel.
commands.music.play.load.title = %extra% Now loading %extra%
commands.music.play.load.description = Trying to load the song...
commands.music.play.success.loading.title = %extra% Now playing %extra%
diff --git a/src/main/resources/Translations/Translations_fr.properties b/src/main/resources/Translations/Translations_fr.properties
index a68515b..043a3f1 100644
--- a/src/main/resources/Translations/Translations_fr.properties
+++ b/src/main/resources/Translations/Translations_fr.properties
@@ -223,6 +223,13 @@ commands.music.join.error.channel.description = You aren't in a Voice Channel.
commands.music.join.error.permission.title = No permission
commands.music.join.error.permission.description = I am not allowed to join your voice channel.
commands.music.join.help.description = Joins your voice channel.
+commands.music.leave.success.title = Successfully disconnected
+commands.music.leave.success.description = I successfully disconnected from the Voice Channel
+commands.music.leave.error.channel.title = No channel
+commands.music.leave.error.channel.description = You have to be in the same voice channel as the bot.
+commands.music.leave.error.connected.tile = Not connected
+commands.music.leave.error.connected.description = I'm currently in no Voice Channel on this Guild
+commands.music.leave.help.description = Leaves your voice channel.
commands.music.play.load.title = %extra% Now loading %extra%
commands.music.play.load.description = Trying to load the song...
commands.music.play.success.loading.title = %extra% Now playing %extra%
diff --git a/src/main/resources/Translations/Translations_ru.properties b/src/main/resources/Translations/Translations_ru.properties
index a68515b..043a3f1 100644
--- a/src/main/resources/Translations/Translations_ru.properties
+++ b/src/main/resources/Translations/Translations_ru.properties
@@ -223,6 +223,13 @@ commands.music.join.error.channel.description = You aren't in a Voice Channel.
commands.music.join.error.permission.title = No permission
commands.music.join.error.permission.description = I am not allowed to join your voice channel.
commands.music.join.help.description = Joins your voice channel.
+commands.music.leave.success.title = Successfully disconnected
+commands.music.leave.success.description = I successfully disconnected from the Voice Channel
+commands.music.leave.error.channel.title = No channel
+commands.music.leave.error.channel.description = You have to be in the same voice channel as the bot.
+commands.music.leave.error.connected.tile = Not connected
+commands.music.leave.error.connected.description = I'm currently in no Voice Channel on this Guild
+commands.music.leave.help.description = Leaves your voice channel.
commands.music.play.load.title = %extra% Now loading %extra%
commands.music.play.load.description = Trying to load the song...
commands.music.play.success.loading.title = %extra% Now playing %extra%
diff --git a/src/main/resources/Translations/Translations_tr.properties b/src/main/resources/Translations/Translations_tr.properties
index a68515b..043a3f1 100644
--- a/src/main/resources/Translations/Translations_tr.properties
+++ b/src/main/resources/Translations/Translations_tr.properties
@@ -223,6 +223,13 @@ commands.music.join.error.channel.description = You aren't in a Voice Channel.
commands.music.join.error.permission.title = No permission
commands.music.join.error.permission.description = I am not allowed to join your voice channel.
commands.music.join.help.description = Joins your voice channel.
+commands.music.leave.success.title = Successfully disconnected
+commands.music.leave.success.description = I successfully disconnected from the Voice Channel
+commands.music.leave.error.channel.title = No channel
+commands.music.leave.error.channel.description = You have to be in the same voice channel as the bot.
+commands.music.leave.error.connected.tile = Not connected
+commands.music.leave.error.connected.description = I'm currently in no Voice Channel on this Guild
+commands.music.leave.help.description = Leaves your voice channel.
commands.music.play.load.title = %extra% Now loading %extra%
commands.music.play.load.description = Trying to load the song...
commands.music.play.success.loading.title = %extra% Now playing %extra%
diff --git a/src/main/resources/Translations/Translations_zh.properties b/src/main/resources/Translations/Translations_zh.properties
index a68515b..043a3f1 100644
--- a/src/main/resources/Translations/Translations_zh.properties
+++ b/src/main/resources/Translations/Translations_zh.properties
@@ -223,6 +223,13 @@ commands.music.join.error.channel.description = You aren't in a Voice Channel.
commands.music.join.error.permission.title = No permission
commands.music.join.error.permission.description = I am not allowed to join your voice channel.
commands.music.join.help.description = Joins your voice channel.
+commands.music.leave.success.title = Successfully disconnected
+commands.music.leave.success.description = I successfully disconnected from the Voice Channel
+commands.music.leave.error.channel.title = No channel
+commands.music.leave.error.channel.description = You have to be in the same voice channel as the bot.
+commands.music.leave.error.connected.tile = Not connected
+commands.music.leave.error.connected.description = I'm currently in no Voice Channel on this Guild
+commands.music.leave.help.description = Leaves your voice channel.
commands.music.play.load.title = %extra% Now loading %extra%
commands.music.play.load.description = Trying to load the song...
commands.music.play.success.loading.title = %extra% Now playing %extra%