Aust1n46 93a405ccbd Merge remote-tracking branch 'origin/localization'
Conflicts:
	MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java
	MineverseChat/mineverse/Aust1n46/chat/command/chat/Channel.java
	MineverseChat/mineverse/Aust1n46/chat/command/chat/Chlist.java
	MineverseChat/mineverse/Aust1n46/chat/command/chat/Kickchannel.java
	MineverseChat/mineverse/Aust1n46/chat/command/chat/Kickchannelall.java
	MineverseChat/mineverse/Aust1n46/chat/command/chat/Leave.java
	MineverseChat/mineverse/Aust1n46/chat/command/chat/Removemessage.java
	MineverseChat/mineverse/Aust1n46/chat/command/chat/Setchannel.java
	MineverseChat/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java
	MineverseChat/mineverse/Aust1n46/chat/command/message/Ignore.java
	MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java
	MineverseChat/mineverse/Aust1n46/chat/listeners/CommandListener.java
2020-03-20 06:53:02 -04:00
..
2016-08-29 15:23:36 -04:00
2016-08-29 15:23:36 -04:00
2016-08-29 15:23:36 -04:00