greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

Merge branch 'master' into i18n

Browse source
This commit is contained in:
Skidder 2020-06-23 18:03:12 +02:00 • committed by GitHub
commit 2642970bea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
example-config.json
View file

@ -1,11 +1,15 @@
{ {
"Owners": "Owners": [
[],
"Database":{"IP":"",
],
"Database": {
"IP":"",
"Port": 6775, "Port": 6775,
"DBName": "", "DBName": "",
"Username": "", "Username": "",
"Password": ""}, "Password": ""
},
"Tokens": { "Tokens": {
"BotToken": "", "BotToken": "",
"Giphy": "", "Giphy": "",
@ -13,14 +17,15 @@
"MythicalBotList": "", "MythicalBotList": "",
"BotsForDiscord": "", "BotsForDiscord": "",
"DiscordBotList": "", "DiscordBotList": "",
"DiscordBestBots": "",
"DiscordBoats": "", "DiscordBoats": "",
"YetAnotherBotList": "", "YetAnotherBotList": "",
"DiscordExtremeList": "", "DiscordExtremeList": "",
"DiscordBotReviews": "", "DiscordBotReviews": "",
"DiscordBots": "", "DiscordBots": "",
"BotListSpace": "", "BotListSpace": "",
"DiscordBots2": "" "DiscordBots2": "",
"CloudList": "",
"Arcane": ""
}, },
"Clyde": "" "Clyde": ""
} }

10
pom.xml
View file

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

4
src/main/java/com/bbn/hadder/commands/settings/LanguageCommand.java
View file

@ -49,8 +49,8 @@ public class LanguageCommand implements Command {
break; break;
default: default:
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
"List", "commands.settings.language.error.title", "",
"`de`, `en`, `es`, `fr`, `ru`, `tr`, `zh`") "commands.settings.language.error.description", "`de`, `en`, `es`, `fr`, `ru`, `tr`, `zh`")
.build()).queue(); .build()).queue();
break; break;
} }