1
0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-19 14:59:27 +00:00
Files
Geyser/bootstrap
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
..