OpenSource/GeyserMC
OpenSource/GeyserMC
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-11-24 07:46:42 +01:00
Code Issues Projects Releases Packages Wiki Activity
GeyserMC/connector
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 Merge remote-tracking branch 'origin/master' into floodgate-2.0 2021-03-10 20:42:37 +01:00
pom.xml Merge remote-tracking branch 'origin/master' into floodgate-2.0 2021-03-10 20:42:37 +01:00