Tim203 36419e5931 Merge remote-tracking branch 'origin/master' into floodgate-2.0 ... # 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		2020-10-30 01:25:52 +01:00
..
bungeecord	Merge remote-tracking branch 'origin/master' into floodgate-2.0	2020-10-30 01:25:52 +01:00
spigot	Merge remote-tracking branch 'origin/master' into floodgate-2.0	2020-10-30 01:25:52 +01:00
sponge	Remove 'geyser' from parameters when executing a command under Spigot, Bungeecord, Sponge, Velocity (#1266)	2020-09-28 23:49:46 -04:00
standalone	GUI Improvements (#1462)	2020-10-27 18:40:00 -04:00
velocity	Introduce CommandSender.getLocale() (#1431)	2020-10-29 18:30:52 -04:00
pom.xml	Change version number to 1.1.0	2020-08-11 19:10:48 +01:00