Alexander Söderberg 8eb903ad72 Merge branch 'v5' into v6 ... # Conflicts: # Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java		2020-07-14 19:18:08 +02:00
..
chat	Lazy fix for FancyMessage 1.16	2020-07-04 20:25:49 +02:00
entity	Merge branch 'v6' into feature/v6/platform	2020-07-14 19:05:05 +02:00
generator	Finalize DI stuff	2020-07-14 18:49:40 +02:00
inject	Manually resolve a bunch of merge issues	2020-07-14 19:10:52 +02:00
listener	Merge branch 'v5' into v6	2020-07-14 19:18:08 +02:00
managers	Finalize DI stuff	2020-07-14 18:49:40 +02:00
placeholder	Merge branch 'v6' into feature/v6/platform	2020-07-10 18:37:18 +02:00
player	Finalize DI stuff	2020-07-14 18:49:40 +02:00
queue	Merge branch 'v5' into v6	2020-07-14 19:18:08 +02:00
schematic	Finalize DI stuff	2020-07-14 18:49:40 +02:00
util	Manually resolve a bunch of merge issues	2020-07-14 19:10:52 +02:00
uuid	Merge branch 'v6' into feature/v6/platform	2020-07-14 19:05:05 +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 'v5' into v6	2020-07-14 19:18:08 +02:00