Geyser/common
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/java/org/geysermc Merge remote-tracking branch 'fork/floodgate-2.0' into floodgate-2.0 2020-09-12 15:57:16 +02:00
pom.xml Change version number to 1.1.0 2020-08-11 19:10:48 +01:00