Alexander Brandes bb0f200429

Merge branch 'v6' into v7

2023-01-23 13:18:28 +01:00

..

entity

chore: Comply with OSSRH licensing guidelines (#3684)

2022-06-15 20:17:17 +02:00

generator

Merge branch 'v6' into v7

2023-01-23 13:18:28 +01:00

inject

chore: Comply with OSSRH licensing guidelines (#3684)

2022-06-15 20:17:17 +02:00

listener

chore: Remove things marked as for removal (#3941)

2023-01-21 16:44:28 +01:00

managers

chore: Update a few deprecations (#3913)

2023-01-13 17:48:13 +01:00

permissions

chore: Comply with OSSRH licensing guidelines (#3684)

2022-06-15 20:17:17 +02:00

placeholder

chore: Comply with OSSRH licensing guidelines (#3684)

2022-06-15 20:17:17 +02:00

player

Resolved conflicts

2023-01-23 13:03:26 +01:00

queue

Merge branch 'v6' into v7

2023-01-17 11:51:39 +00:00

schematic

chore: Remove things marked as for removal (#3941)

2023-01-21 16:44:28 +01:00

util

Merge branch 'v6' into v7

2023-01-17 11:51:39 +00:00

uuid

chore: Comply with OSSRH licensing guidelines (#3684)

2022-06-15 20:17:17 +02:00

BukkitCommand.java

chore: Comply with OSSRH licensing guidelines (#3684)

2022-06-15 20:17:17 +02:00

BukkitPlatform.java

Merge branch 'v6' into v7

2023-01-17 11:51:39 +00:00