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
..
src/main	Merge remote-tracking branch 'refs/remotes/upstream/master' into feature/1.21.4	2024-12-05 18:51:22 +08:00
build.gradle.kts	Gradle: avoid cross-configuration and enable configuration-on-demand (#5012)	2024-09-03 00:54:50 -04:00