dordsor21 ee9b2e8bf8 Just merge the whole thing. Merge branch 'v6' into features/v6/queue-features ... # Conflicts: # Core/src/main/resources/lang/messages_en.json		2020-11-01 18:58:24 +00:00
..
entity	Merge v5 into v6	2020-08-24 14:33:53 +02:00
generator	Format licence headers	2020-10-08 14:02:08 +02:00
inject	Fix the injection	2020-10-09 16:34:59 +01:00
listener	adventure v4.1.0; project now compiles	2020-10-17 21:10:02 +01:00
managers	Format licence headers	2020-10-08 14:02:08 +02:00
permissions	Format licence headers	2020-10-08 14:02:08 +02:00
placeholder	Format licence headers	2020-10-08 14:02:08 +02:00
player	Merge branch 'v5' into v6	2020-09-11 15:44:04 +01:00
queue	Correctly cancel notify tasks and add notifications to commands	2020-10-09 17:24:59 +01:00
schematic	Fix the injection	2020-10-09 16:34:59 +01:00
util	Fix the injection	2020-10-09 16:34:59 +01:00
uuid	Format licence headers	2020-10-08 14:02:08 +02:00
BukkitCommand.java	Format licence headers	2020-10-08 14:02:08 +02:00
BukkitPlatform.java	No need to point if PAPI is not in use	2020-10-08 20:56:33 +02:00