dordsor21 e53c53bb4a Merge branch 'v6' into feature/v6/pipeline-queue ... # Conflicts: # Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java # Bukkit/src/main/java/com/plotsquared/bukkit/inject/BukkitModule.java # Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java # Core/src/main/java/com/plotsquared/core/queue/BasicLocalBlockQueue.java		2020-07-24 12:21:40 +01:00
..
src/main	Merge branch 'v6' into feature/v6/pipeline-queue	2020-07-24 12:21:40 +01:00
build.gradle	Merge branch 'v6' into feature/v6/pipeline-queue	2020-07-24 12:21:40 +01:00
pom.xml	Fix some issues I caused with Guice	2020-07-24 12:18:36 +01:00