Aust1n46 94aa22d89a Merge branch 'master' into build-system ...

# Conflicts:
#	src/main/java/mineverse/Aust1n46/chat/MineverseChat.java
#	src/main/java/mineverse/Aust1n46/chat/listeners/ChatListener.java
#	src/main/java/mineverse/Aust1n46/chat/listeners/CommandListener.java
#	src/main/java/mineverse/Aust1n46/chat/utilities/Format.java
#	src/main/resources/config.yml
#	src/main/resources/example_config_always_up_to_date!.yml
#	src/main/resources/plugin.yml
#	src/mineverse/Aust1n46/chat/channel/ChatChannel.java
#	src/mineverse/Aust1n46/chat/command/VentureCommandExecutor.java
#	src/mineverse/Aust1n46/chat/command/chat/Chatreload.java

2021-07-29 16:11:37 -04:00

..

listeners

Merge branch 'master' into build-system

2021-07-29 16:11:37 -04:00

utilities

Build System

2021-06-21 11:54:04 -04:00