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
..
java/com/plotsquared/bukkit	Merge branch 'v6' into feature/v6/pipeline-queue	2020-07-24 12:21:40 +01:00
resources	Remove access to PlotSquared#IMP and rename IPlotMain to PlotPlatform, then rename PlotSquared#imp() to PlotSquared#platform()	2020-07-07 12:56:43 +02:00