dordsor21 b8b3e1e72a Merge branch 'v6' into feature/v6/pipeline-queue ... # Conflicts: # Bukkit/build.gradle # Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java		2020-07-24 18:18:42 +01:00
..
src	Merge branch 'v6' into feature/v6/pipeline-queue	2020-07-24 18:18:42 +01:00
build.gradle	Fix dependencies	2020-07-23 15:03:57 +02:00
pom.xml	Merge branch 'v6' into feature/v6/pipeline-queue	2020-07-24 12:21:40 +01:00