Alexander Söderberg 20e9d13f60 Merge branch 'v6' into feature/v6/json ... # Conflicts: # Core/src/main/java/com/plotsquared/core/util/MainUtil.java # Core/src/main/java/com/plotsquared/core/util/OperationUtil.java		2020-07-21 13:13:10 +02:00
..
entity	Merge branch 'v6' into feature/v6/json	2020-07-19 14:32:31 +02:00
generator	Merge branch 'v6' into feature/v6/json	2020-07-21 13:13:10 +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-19 14:32:31 +02:00
managers	Delombok + import organisation	2020-07-17 17:24:45 +02:00
placeholder	Bring back PAPI placeholders and raw colour formatting	2020-07-21 13:05:40 +02:00
player	Merge branch 'v6' into feature/v6/json	2020-07-17 23:05:45 +02:00
queue	Merge branch 'v6' into feature/v6/json	2020-07-21 13:13:10 +02:00
schematic	Delombok + import organisation	2020-07-17 17:24:45 +02:00
util	Bring back PAPI placeholders and raw colour formatting	2020-07-21 13:05:40 +02:00
uuid	Merge branch 'v6' into feature/v6/json	2020-07-19 14:32:31 +02:00
BukkitCommand.java	Some random bukkitutil/worldutil improvements	2020-07-17 23:00:09 +02:00
BukkitPlatform.java	Bring back PAPI placeholders and raw colour formatting	2020-07-21 13:05:40 +02:00