mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-02-20 00:29:34 +01:00
bb21abb110
# Conflicts: # Bukkit/build.gradle # Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java # Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerPlotTrustedEvent.java # Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java # Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Clear.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Grant.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Relight.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java # Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java