bukkit/src
DerFrZocker 0988647e06
Merge branch 'master' of https://hub.spigotmc.org/stash/scm/~derfrzocker/bukkit into enums-to-registers
 Conflicts:
	src/main/java/org/bukkit/Material.java
	src/main/java/org/bukkit/Sound.java
	src/main/java/org/bukkit/block/Biome.java
	src/main/java/org/bukkit/potion/PotionEffectType.java
	src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java
2021-12-04 16:25:31 +01:00
..
main Merge branch 'master' of https://hub.spigotmc.org/stash/scm/~derfrzocker/bukkit into enums-to-registers 2021-12-04 16:25:31 +01:00
test/java/org/bukkit Convert Material enum, midpoint push, it compiles and runs 2021-11-16 21:16:23 +01:00