bukkit/src/main/java
DerFrZocker 9e0c7ad5ad
Merge branch 'master' into enums-to-registers
# Conflicts:
#	src/main/java/org/bukkit/Material.java
#	src/main/java/org/bukkit/Registry.java
#	src/main/java/org/bukkit/Sound.java
#	src/main/java/org/bukkit/block/Biome.java
#	src/main/java/org/bukkit/entity/EntityType.java
2023-04-28 18:02:44 +02:00
..
org/bukkit Merge branch 'master' into enums-to-registers 2023-04-28 18:02:44 +02:00