izebra_projects/Rixa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	.idea/workspace.xml
#	src/main/java/me/savvy/rixa/modules/twitter/TwitterModule.java
This commit is contained in:
Venal
2017-07-11 23:27:32 -04:00
parent 28055867e1 860251c46f
commit d86e8f2cdd
14 changed files with 796 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/me/savvy/rixa/Rixa.java
View File

@@ -4,6 +4,7 @@ import lombok.Getter;
import lombok.Setter;
import me.savvy.rixa.commands.admin.BatchMoveCommand;
import me.savvy.rixa.commands.admin.ConfigCommand;
import me.savvy.rixa.commands.admin.InviteCommand;
import me.savvy.rixa.commands.general.*;
import me.savvy.rixa.commands.handlers.CommandExec;
import me.savvy.rixa.commands.handlers.CommandHandler;
@@ -97,7 +98,7 @@ public class Rixa {
new InfoCommand(), new ServerInfoCommand(), new HelpCommand(),
new DeleteMessagesCommand(), new PingCommand(), new PurgeMessagesCommand(),
new BatchMoveCommand(), new MuteCommand(), new MusicCommand(),
new ConfigCommand(), new UrbanDictionaryCommand(), /*new InviteCommand()*/});
new ConfigCommand(), new UrbanDictionaryCommand(), new YoutubeCommand()});
register(new React[] {new HelpReaction(), new ConfigReaction()});
data = new Data(DataType.SQL);
}