NorbiPeti b95b9092f5 Merge branch 'master' into dev ... Conflicts: src/main/java/buttondevteam/discordplugin/DiscordPlayer.java src/main/java/buttondevteam/discordplugin/DiscordPlugin.java src/main/java/buttondevteam/discordplugin/commands/ConnectCommand.java src/main/java/buttondevteam/discordplugin/commands/UserinfoCommand.java src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java src/main/java/buttondevteam/discordplugin/listeners/MCListener.java src/main/java/buttondevteam/discordplugin/mccommands/AcceptMCCommand.java		2017-04-02 02:06:00 +02:00
..
java/buttondevteam/discordplugin	Merge branch 'master' into dev	2017-04-02 02:06:00 +02:00
resources	Why haven't I commited this	2016-10-30 23:10:02 +01:00