GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2026-01-06 15:41:50 +00:00
Code Issues Releases Activity
Files
cd13e03730e9bcddd9634844562e3e785419db13
Geyser/connector
History
Tim203 cd13e03730 Merge remote-tracking branch 'origin/master' into floodgate-2.0 
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
#	connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockNetworkStackLatencyTranslator.java
#	connector/src/main/java/org/geysermc/connector/network/translators/java/JavaJoinGameTranslator.java
#	connector/src/main/java/org/geysermc/connector/utils/SettingsUtils.java
2020-12-15 22:06:59 +01:00
..
src
Merge remote-tracking branch 'origin/master' into floodgate-2.0
2020-12-15 22:06:59 +01:00
pom.xml
Merge remote-tracking branch 'origin/master' into floodgate-2.0
2020-12-15 22:06:59 +01:00