1
0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-27 10:49:10 +00:00
Files
Geyser/core
onebeastchris d101c010d8 Merge remote-tracking branch 'upstream/master' into feature/configurate
# Conflicts:
#	bootstrap/bungeecord/build.gradle.kts
#	bootstrap/bungeecord/src/main/java/org/geysermc/geyser/platform/bungeecord/GeyserBungeePlugin.java
#	bootstrap/mod/neoforge/build.gradle.kts
#	bootstrap/spigot/build.gradle.kts
#	bootstrap/velocity/build.gradle.kts
#	bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityInjector.java
#	bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlugin.java
#	core/src/main/java/org/geysermc/geyser/GeyserImpl.java
#	core/src/main/java/org/geysermc/geyser/command/CommandRegistry.java
#	core/src/main/java/org/geysermc/geyser/command/defaults/DumpCommand.java
#	core/src/main/java/org/geysermc/geyser/command/defaults/VersionCommand.java
#	core/src/main/java/org/geysermc/geyser/dump/DumpInfo.java
#	core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
#	core/src/main/java/org/geysermc/geyser/network/netty/GeyserServer.java
#	core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java
#	core/src/main/java/org/geysermc/geyser/session/GeyserSessionAdapter.java
#	core/src/main/java/org/geysermc/geyser/skin/SkinManager.java
#	core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockCommandRequestTranslator.java
#	core/src/main/java/org/geysermc/geyser/util/LoginEncryptionUtils.java
#	core/src/main/java/org/geysermc/geyser/util/WebUtils.java
#	gradle/libs.versions.toml
2025-08-26 16:14:45 +02:00
..