Merge branch 'master' into i18n

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": ""
 }

pom.xml

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>Hadder</groupId>
   <artifactId>Hadder</artifactId>
-  <version>1.3.14</version>
+  <version>1.3.15</version>
   <name>Hadder</name>
   <inceptionYear>2019</inceptionYear>
   <description>Hadder is a multi-purpose Discord bot.</description>
@@ -44,7 +44,7 @@
       <url>https://bigbotnetwork.com/</url>
       <timezone>Europe/Berlin</timezone>
       <properties>
-        <picUrl>https://cdn.discordapp.com/avatars/477141528981012511/a_ba4bd8e5b381874edcd06a68d1acd3aa.gif</picUrl>
+        <picUrl>https://cdn.discordapp.com/avatars/401817301919465482/a_f81bd03e3862de579dec59241714d86d.gif</picUrl>
       </properties>
     </developer>
   </developers>
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>net.dv8tion</groupId>
       <artifactId>JDA</artifactId>
-      <version>4.1.1_157</version>
+      <version>4.1.1_165</version>
     </dependency>
     <dependency>
       <groupId>org.json</groupId>
@@ -91,12 +91,12 @@
     <dependency>
       <groupId>org.kohsuke</groupId>
       <artifactId>github-api</artifactId>
-      <version>1.112</version>
+      <version>1.114</version>
     </dependency>
     <dependency>
       <groupId>com.sedmelluq</groupId>
       <artifactId>lavaplayer</artifactId>
-      <version>1.3.49</version>
+      <version>1.3.50</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>

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;
             }