PlotSquared/Core/src/main
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
..
java/com/plotsquared/core Merge branch 'v5' into features/v5/uuid 2020-05-20 11:27:11 +02:00
resources Reformated and update French translation 2020-05-12 17:29:32 +02:00