Alexander Söderberg 090bd69be5 Merge branch 'v6' into feature/v6/json ... # Conflicts: # Bukkit/src/main/java/com/plotsquared/bukkit/chat/FancyMessage.java		2020-07-08 15:22:02 +02:00
..
src	Merge branch 'v6' into feature/v6/json	2020-07-08 15:22:02 +02:00
build.gradle	Component progress. The plugin is **very** broken right now.	2020-07-05 13:41:40 +02:00
pom.xml	Add more documentation to the settings.yml	2020-05-27 22:20:13 +02:00