GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-29 03:39:22 +00:00
Code Issues Releases Activity
Files
bb20b14e4c71be8c48ece0e4ad960b50066bef2d
Geyser/connector
History
Tim203 bb20b14e4c Merge remote-tracking branch 'fork/floodgate-2.0' into floodgate-2.0 
# Conflicts:
#	common/src/main/java/org/geysermc/floodgate/util/BedrockData.java
#	common/src/main/java/org/geysermc/floodgate/util/EncryptionUtil.java
#	connector/src/main/java/org/geysermc/connector/GeyserConnector.java
#	connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
2020-09-12 15:57:16 +02:00
..
src/main
Merge remote-tracking branch 'fork/floodgate-2.0' into floodgate-2.0
2020-09-12 15:57:16 +02:00
pom.xml
Update to latest MCProtocolLib (#1140)
2020-08-12 16:27:13 -04:00