onebeastchris abf14e6ef9 Merge remote-tracking branch 'refs/remotes/upstream/master' into feature/1.21.4 ... # Conflicts: # core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java # core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java # gradle/libs.versions.toml		2024-12-05 18:51:22 +08:00
..
wrapper	Update to loom 1.7-SNAPSHOT, update gradle wrapper (#4820)	2024-07-06 20:47:49 +02:00
libs.versions.toml	Merge remote-tracking branch 'refs/remotes/upstream/master' into feature/1.21.4	2024-12-05 18:51:22 +08:00