Alexander Söderberg e90170a384 Merge remote-tracking branch 'origin/v6' into feature/v6/json ... # Conflicts: # Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java # Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java # Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java # Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java # Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitLocalQueue.java # Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEconHandler.java # Core/pom.xml # Core/src/main/java/com/plotsquared/core/PlotAPI.java # Core/src/main/java/com/plotsquared/core/PlotPlatform.java # Core/src/main/java/com/plotsquared/core/PlotSquared.java # Core/src/main/java/com/plotsquared/core/command/Area.java # Core/src/main/java/com/plotsquared/core/command/Auto.java # Core/src/main/java/com/plotsquared/core/command/Claim.java # Core/src/main/java/com/plotsquared/core/command/CmdConfirm.java # Core/src/main/java/com/plotsquared/core/command/Command.java # Core/src/main/java/com/plotsquared/core/command/CommandCaller.java # Core/src/main/java/com/plotsquared/core/command/DebugExec.java # Core/src/main/java/com/plotsquared/core/command/Grant.java # Core/src/main/java/com/plotsquared/core/command/Inbox.java # Core/src/main/java/com/plotsquared/core/command/Load.java # Core/src/main/java/com/plotsquared/core/command/Save.java # Core/src/main/java/com/plotsquared/core/command/Setup.java # Core/src/main/java/com/plotsquared/core/listener/PlotListener.java # Core/src/main/java/com/plotsquared/core/player/ConsolePlayer.java # Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java # Core/src/main/java/com/plotsquared/core/plot/Plot.java # Core/src/main/java/com/plotsquared/core/plot/comment/CommentManager.java # Core/src/main/java/com/plotsquared/core/util/BlockUtil.java # Core/src/main/java/com/plotsquared/core/util/Permissions.java		2020-07-24 17:28:52 +02:00
..
task	Fix small issues	2020-07-22 21:06:23 +02:00
BukkitBlockUtil.java	Fix small issues	2020-07-22 21:06:23 +02:00
BukkitChunkManager.java	Finalize DI stuff	2020-07-14 18:49:40 +02:00
BukkitEconHandler.java	Merge remote-tracking branch 'origin/v6' into feature/v6/json	2020-07-24 17:28:52 +02:00
BukkitInventoryUtil.java	Guice progress	2020-07-10 22:12:37 +02:00
BukkitRegionManager.java	Move shit out of MainUtil into more appropriate classes	2020-07-19 14:23:55 +02:00
BukkitSetupUtils.java	Delombok + import organisation	2020-07-17 17:24:45 +02:00
BukkitUtil.java	Merge remote-tracking branch 'origin/v6' into feature/v6/json	2020-07-24 17:28:52 +02:00
BukkitWorld.java	Delombok + import organisation	2020-07-17 17:24:45 +02:00
ContentMap.java	Some random bukkitutil/worldutil improvements	2020-07-17 23:00:09 +02:00
SetGenCB.java	Finalize DI stuff	2020-07-14 18:49:40 +02:00
UpdateUtility.java	Merge branch 'v6' into feature/v6/platform	2020-07-14 19:05:05 +02:00