Tim203 5ad2510b87 Merge remote-tracking branch 'origin/master' into floodgate-2.0 ... # Conflicts: # connector/src/main/java/org/geysermc/connector/command/defaults/SettingsCommand.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/network/session/cache/WindowCache.java # connector/src/main/java/org/geysermc/connector/utils/LoginEncryptionUtils.java # connector/src/main/java/org/geysermc/connector/utils/StatisticsUtils.java		2021-02-01 12:02:49 +01:00
..
src/main	Merge remote-tracking branch 'origin/master' into floodgate-2.0	2021-02-01 12:02:49 +01:00
pom.xml	Shade in the entire net.kyori package (#1826)	2021-01-11 14:11:21 -05:00