dordsor21 d2443f6de8 Merge branch 'v6' into feature/v6/pipeline-queue ... # Conflicts: # Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java # Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitRegionManager.java # Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java # Core/src/main/java/com/plotsquared/core/generator/SquarePlotManager.java # Core/src/main/java/com/plotsquared/core/plot/Plot.java # Core/src/main/java/com/plotsquared/core/plot/PlotArea.java # Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotManager.java # Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java		2020-07-19 14:29:08 +01:00
..
src/main	Merge branch 'v6' into feature/v6/pipeline-queue	2020-07-19 14:29:08 +01:00
build.gradle	Add wna block setting, use WorldEdit worlds rather than Strings.	2020-07-17 14:38:50 +01:00
pom.xml	Merge branch 'v6' into feature/v6/platform	2020-07-14 19:05:05 +02:00