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

Merge branch 'v6' into feature/v6/platform

2020-07-10 18:37:18 +02:00

build.gradle

Replace the R-tree library with PRTree. Fix SquirrelID shading issues. Bump the version to 5.12.0

2020-05-25 15:13:31 +02:00

pom.xml

Add more documentation to the settings.yml

2020-05-27 22:20:13 +02:00