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

Merge Greg's branch into the master branch #244

Merged
greg6775 merged 23 commits from greg-dev into master 2019-12-23 16:22:53 +01:00
Conversation 0 Commits 23 Files changed 15 +2 -2
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b1f82ae79d - Show all commits

2
src/main/java/com/bbn/hadder/commands/moderation/StarBoardCommand.java
View file

@ -14,7 +14,7 @@ public class StarBoardCommand implements Command {
event.getChannel().sendMessage( event.getChannel().sendMessage(
event.getMessageEditor().getMessage( event.getMessageEditor().getMessage(
MessageEditor.MessageType.INFO, MessageEditor.MessageType.INFO,
"commands.moderation.starboard.successchannel","") "commands.moderation.starboard.success.title","")
.build()) .build())
.queue(); .queue();
} else { } else {

2
src/main/resources/Translations/Translations_en.properties
View file

@ -162,7 +162,7 @@ commands.moderation.rules.emote.error.equal.description = The 1st and 2nd emote
commands.moderation.rules.emoji.decline.description = The first emote has been successfully set. Please send me now the decline emote. commands.moderation.rules.emoji.decline.description = The first emote has been successfully set. Please send me now the decline emote.
commands.moderation.rules.emoji.error.description = The given emote can't be used. commands.moderation.rules.emoji.error.description = The given emote can't be used.
commands.moderation.rules.help.description = Setup the rules on your Discord server commands.moderation.rules.help.description = Setup the rules on your Discord server
commands.moderation.starboard.successchannel=Successfully set the Channel\! commands.moderation.starboard.success.title = Successfully set the Channel\!
commands.music.join.success.title = Successfully connected commands.music.join.success.title = Successfully connected
commands.music.join.success.description = I successfully connected to %extra%. commands.music.join.success.description = I successfully connected to %extra%.