Alexander Söderberg f82a111518 Merge branch 'v5' into features/v5/uuid ...

# Conflicts:
#	Bukkit/pom.xml
#	Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java

2020-05-20 11:27:11 +02:00

..

src/main

Merge branch 'v5' into features/v5/uuid

2020-05-20 11:27:11 +02:00

build.gradle

Progress

2020-05-17 17:26:48 +02:00

pom.xml

Fix a bunch of minor issues

2020-05-20 00:31:59 +02:00