Alexander Söderberg ed3eedd238 Merge branch 'v6' into feature/v6/json ... # Conflicts: # Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java # Core/src/main/java/com/plotsquared/core/PlotSquared.java # Core/src/main/java/com/plotsquared/core/command/Add.java # Core/src/main/java/com/plotsquared/core/command/Auto.java # Core/src/main/java/com/plotsquared/core/command/Buy.java # Core/src/main/java/com/plotsquared/core/command/Template.java # Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java # Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java # Core/src/main/java/com/plotsquared/core/listener/PlotListener.java # Core/src/main/java/com/plotsquared/core/location/Location.java # Core/src/main/java/com/plotsquared/core/plot/Plot.java # Core/src/main/java/com/plotsquared/core/plot/PlotArea.java # Core/src/main/java/com/plotsquared/core/plot/PlotCluster.java # Core/src/main/java/com/plotsquared/core/plot/PlotId.java # Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java # Core/src/main/java/com/plotsquared/core/plot/flag/implementations/KeepFlag.java # Core/src/main/java/com/plotsquared/core/util/MainUtil.java # Core/src/main/java/com/plotsquared/core/util/PlayerManager.java # Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java # Core/src/main/java/com/plotsquared/core/util/query/PlotQuery.java # Core/src/main/java/com/plotsquared/core/util/query/SearchPlotProvider.java		2020-07-19 14:32:31 +02:00
..
BungeePermsUUIDService.java	Delombok + import organisation	2020-07-17 17:24:45 +02:00
EssentialsUUIDService.java	Delombok + import organisation	2020-07-17 17:24:45 +02:00
LuckPermsUUIDService.java	Delombok + import organisation	2020-07-17 17:24:45 +02:00
OfflinePlayerUUIDService.java	Delombok + import organisation	2020-07-17 17:24:45 +02:00
PaperUUIDService.java	Delombok + import organisation	2020-07-17 17:24:45 +02:00
SQLiteUUIDService.java	Move shit out of MainUtil into more appropriate classes	2020-07-19 14:23:55 +02:00
SquirrelIdUUIDService.java	Delombok + import organisation	2020-07-17 17:24:45 +02:00