1
0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-28 03:09:08 +00:00
Files
Geyser/core
onebeastchris 9f05f1ef9e Merge remote-tracking branch 'upstream/master' into feature/custom-entities-api
# Conflicts:
#	core/src/main/java/org/geysermc/geyser/entity/type/BoatEntity.java
#	core/src/main/java/org/geysermc/geyser/entity/type/Entity.java
#	core/src/main/java/org/geysermc/geyser/entity/type/living/animal/horse/AbstractHorseEntity.java
#	core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/entity/player/input/BedrockPlayerAuthInputTranslator.java
2025-12-16 15:15:25 +01:00
..