1
0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-22 16:29:25 +00:00
Files
Geyser/bootstrap/standalone
onebeastchris d748d826d1 Merge remote-tracking branch 'upstream/master' into feature/configurate
# Conflicts:
#	core/src/main/java/org/geysermc/geyser/GeyserImpl.java
#	core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java
#	core/src/main/java/org/geysermc/geyser/skin/FloodgateSkinUploader.java
#	core/src/main/java/org/geysermc/geyser/util/WebUtils.java
2025-11-03 14:40:38 +01:00
..