mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-02-20 16:49:35 +01:00
94925323e8
# Conflicts: # Bukkit/src/main/java/com/plotsquared/bukkit/generator/BlockStatePopulator.java # Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java # Bukkit/src/main/java/com/plotsquared/bukkit/generator/DelegatePlotGenerator.java # Core/src/main/java/com/plotsquared/core/generator/HybridGen.java # Core/src/main/java/com/plotsquared/core/generator/IndependentPlotGenerator.java # Core/src/main/java/com/plotsquared/core/generator/SingleWorldGenerator.java # Core/src/main/java/com/plotsquared/core/location/Location.java # Core/src/main/java/com/plotsquared/core/location/UncheckedWorldLocation.java # Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java # Core/src/main/java/com/plotsquared/core/queue/ZeroedDelegateScopedQueueCoordinator.java # Core/src/main/java/com/plotsquared/core/util/ChunkManager.java