Alexander Söderberg 3a1b56494a Merge branch 'v6' into feature/v6/json ... # Conflicts: # Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java # Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java # Core/src/main/java/com/plotsquared/core/command/Claim.java # Core/src/main/java/com/plotsquared/core/command/Condense.java # Core/src/main/java/com/plotsquared/core/plot/comment/CommentManager.java # Core/src/main/java/com/plotsquared/core/util/task/AutoClaimFinishTask.java # Core/src/main/java/com/plotsquared/core/util/task/ObjectTaskRunnable.java # Core/src/main/java/com/plotsquared/core/util/task/TaskManager.java		2020-07-17 17:58:14 +02:00
..
entity	Delombok + import organisation	2020-07-17 17:24:45 +02:00
generator	Delombok + import organisation	2020-07-17 17:24:45 +02:00
inject	Merge branch 'v6' into feature/v6/json	2020-07-17 17:58:14 +02:00
listener	Merge branch 'v6' into feature/v6/json	2020-07-17 17:58:14 +02:00
managers	Delombok + import organisation	2020-07-17 17:24:45 +02:00
placeholder	Merge branch 'v6' into feature/v6/platform	2020-07-10 18:37:18 +02:00
player	Delombok + import organisation	2020-07-17 17:24:45 +02:00
queue	Begin work on the task system	2020-07-17 17:53:30 +02:00
schematic	Delombok + import organisation	2020-07-17 17:24:45 +02:00
util	Merge branch 'v6' into feature/v6/json	2020-07-17 17:58:14 +02:00
uuid	Delombok + import organisation	2020-07-17 17:24:45 +02:00
BukkitCommand.java	Provide no suggestions instead of player names for commands	2020-06-11 01:01:00 +02:00
BukkitPlatform.java	Merge branch 'v6' into feature/v6/json	2020-07-17 17:58:14 +02:00