dordsor21 914429ab4f Merge branch 'v6' into features/v6/queue-features ... # Conflicts: # Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.java # Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotManager.java # Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java		2020-10-09 15:23:09 +01:00
..
src/main	Merge branch 'v6' into features/v6/queue-features	2020-10-09 15:23:09 +01:00
build.gradle.kts	Fix log4j	2020-10-08 14:33:48 +02:00