TF-PlotSquared/Core
Alexander Söderberg a882555d1b
Merge branch 'v5' into features/v5/uuid
# Conflicts:
#	Bukkit/build.gradle
#	Core/src/main/java/com/plotsquared/core/PlotSquared.java
#	Core/src/main/java/com/plotsquared/core/command/ListCmd.java
#	Core/src/main/java/com/plotsquared/core/command/Visit.java
2020-05-24 19:00:21 +02:00
..
src Merge branch 'v5' into features/v5/uuid 2020-05-24 19:00:21 +02:00
build.gradle Fix up the plot area nightmare 2020-05-22 22:04:46 +02:00
pom.xml Shade r-tree into the bukkit module 2020-05-22 22:04:46 +02:00