From 3ab0b48f98c7caa569c265a25701cb36fcf140da Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 8 Jun 2020 13:17:19 +0000 Subject: [PATCH 01/11] Bump JDA from 4.1.1_157 to 4.1.1_160 Bumps JDA from 4.1.1_157 to 4.1.1_160. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 804255e..880978d 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_157 + 4.1.1_160 org.json From 4b61c771c5aea350380c3cf2d30122cd9c28e991 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 9 Jun 2020 13:16:17 +0000 Subject: [PATCH 02/11] Bump github-api from 1.112 to 1.113 Bumps [github-api](https://github.com/hub4j/github-api) from 1.112 to 1.113. - [Release notes](https://github.com/hub4j/github-api/releases) - [Changelog](https://github.com/hub4j/github-api/blob/master/CHANGELOG.md) - [Commits](https://github.com/hub4j/github-api/compare/github-api-1.112...github-api-1.113) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 880978d..c545fc1 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,7 @@ org.kohsuke github-api - 1.112 + 1.113 com.sedmelluq From f7a03f2c10c2eb743591226d7217431e3b7b8734 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 9 Jun 2020 13:16:37 +0000 Subject: [PATCH 03/11] Bump JDA from 4.1.1_160 to 4.1.1_161 Bumps JDA from 4.1.1_160 to 4.1.1_161. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 880978d..ab77a94 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_160 + 4.1.1_161 org.json From 48a64510e9d39fa14701cb732b721bd47ab52aff Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 10 Jun 2020 13:16:39 +0000 Subject: [PATCH 04/11] Bump JDA from 4.1.1_161 to 4.1.1_162 Bumps JDA from 4.1.1_161 to 4.1.1_162. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b57fa36..5351a7f 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_161 + 4.1.1_162 org.json From 4c258a0b87dcd0f3c7c62a27dc4c47b3d2bc06c2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 11 Jun 2020 13:15:55 +0000 Subject: [PATCH 05/11] Bump github-api from 1.113 to 1.114 Bumps [github-api](https://github.com/hub4j/github-api) from 1.113 to 1.114. - [Release notes](https://github.com/hub4j/github-api/releases) - [Changelog](https://github.com/hub4j/github-api/blob/master/CHANGELOG.md) - [Commits](https://github.com/hub4j/github-api/compare/github-api-1.113...github-api-1.114) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5351a7f..8dfa1b8 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,7 @@ org.kohsuke github-api - 1.113 + 1.114 com.sedmelluq From ab2be550836852f4c746e6a5890c700e4e3e559d Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 13 Jun 2020 16:54:23 +0200 Subject: [PATCH 06/11] Version bump --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8dfa1b8..5a22a75 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. From 67a5fa291c76d114596e65eb05620d90f48dc1d0 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 13 Jun 2020 16:55:37 +0200 Subject: [PATCH 07/11] Update old picture --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5a22a75..bc20ab1 100644 --- a/pom.xml +++ b/pom.xml @@ -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 From 36eaa61008f93036d0117e5962846bf3c8923c67 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 13 Jun 2020 17:00:28 +0200 Subject: [PATCH 08/11] Updated example config --- example-config.json | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) 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": "" } From 72c2cd51a44964ed925bc4ab10f81a10ca937073 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 15 Jun 2020 13:16:44 +0000 Subject: [PATCH 09/11] Bump JDA from 4.1.1_162 to 4.1.1_165 Bumps JDA from 4.1.1_162 to 4.1.1_165. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bc20ab1..fec2462 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_162 + 4.1.1_165 org.json From bd322f6680f27c42e1cdec1db45b586ea375b363 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 18 Jun 2020 13:16:28 +0000 Subject: [PATCH 10/11] Bump lavaplayer from 1.3.49 to 1.3.50 Bumps lavaplayer from 1.3.49 to 1.3.50. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fec2462..c9e2c4e 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ com.sedmelluq lavaplayer - 1.3.49 + 1.3.50 com.fasterxml.jackson.core From b279a94a6db708a1168567007edcb73a05da08c0 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 20 Jun 2020 16:41:47 +0200 Subject: [PATCH 11/11] Fix missing translation strings --- .../com/bbn/hadder/commands/settings/LanguageCommand.java | 4 ++-- src/main/resources/Translations/Translations_en.properties | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) 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_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%`.