Alexander Söderberg 21ad9a36c8 Merge branch 'v6' into feature/v6/platform ... # Conflicts: # Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java # Core/src/main/java/com/plotsquared/core/PlotSquared.java # Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java # Core/src/main/java/com/plotsquared/core/location/Location.java		2020-07-10 18:37:18 +02:00
..
src/main	Merge branch 'v6' into feature/v6/platform	2020-07-10 18:37:18 +02:00
build.gradle	Fixes PS-65	2020-07-08 12:21:31 +02:00
pom.xml	update bukkit pom	2020-07-09 22:33:01 +01:00