GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-30 04:09:21 +00:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/master' into floodgate-2.0

Browse Source 
# Conflicts:
#	common/src/main/java/org/geysermc/common/window/CustomFormWindow.java
#	common/src/main/java/org/geysermc/common/window/SimpleFormWindow.java
#	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/utils/LoginEncryptionUtils.java
#	connector/src/main/java/org/geysermc/connector/utils/SettingsUtils.java
This commit is contained in:
Tim203
2020-10-30 01:25:52 +01:00
parent dc8fb46428 e0f5deb329
commit 36419e5931
109 changed files with 2559 additions and 804 deletions
Download Patch File Download Diff File Expand all files Collapse all files