dordsor21 3e84f3b3a4 Merge branch 'v6' into feature/v6/pipeline-queue ...

# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
#	Core/src/main/java/com/plotsquared/core/plot/Plot.java
#	Core/src/main/java/com/plotsquared/core/util/WorldUtil.java

2020-07-18 15:27:52 +01:00

..

src/main

Merge branch 'v6' into feature/v6/pipeline-queue

2020-07-18 15:27:52 +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