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
..
AgeableStats.java	Remove extra line from HEADER	2020-04-16 05:05:58 +02:00
ArmorStandStats.java	Remove extra line from HEADER	2020-04-16 05:05:58 +02:00
EntityBaseStats.java	Remove extra line from HEADER	2020-04-16 05:05:58 +02:00
EntityWrapper.java	Delombok + import organisation	2020-07-17 17:24:45 +02:00
HorseStats.java	Remove extra line from HEADER	2020-04-16 05:05:58 +02:00
LivingEntityStats.java	Remove extra line from HEADER	2020-04-16 05:05:58 +02:00
ReplicatingEntityWrapper.java	Add PlotRangeIterator for the many places where it'll be used. All one of them, in fact. This was not a waste of time. I am very happy I did this. This was worthwhile. Yup.	2020-07-18 16:19:12 +02:00
TameableStats.java	Remove extra line from HEADER	2020-04-16 05:05:58 +02:00
TeleportEntityWrapper.java	Add PlotRangeIterator for the many places where it'll be used. All one of them, in fact. This was not a waste of time. I am very happy I did this. This was worthwhile. Yup.	2020-07-18 16:19:12 +02:00