GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-29 11:49:16 +00:00
Code Issues Releases Activity
Files
643098e09e3317219e3db65de17a677cc1b980cf
Geyser/bootstrap/spigot
History
Tim203 643098e09e Merge remote-tracking branch 'origin/master' into floodgate-2.0 
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java
#	connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
#	connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockServerSettingsRequestTranslator.java
2021-03-10 20:42:37 +01:00
..
src/main
Merge remote-tracking branch 'origin/master' into floodgate-2.0
2021-03-10 20:42:37 +01:00
pom.xml
Fix several world-related errors on Spigot 1.12 (#1886)
2021-02-03 19:54:12 -05:00