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	Merge branch 'v5' into features/v5/uuid	2020-05-20 11:27:11 +02:00
build.gradle	No PlotSquared-Core-Core	2020-05-14 15:47:25 +02:00
pom.xml	Don't dump biome array on /ps reload. Gradle also seems to want to change the Core pom.	2020-04-16 11:43:13 +01:00