Tim203 4229db0a2f Merge remote-tracking branch 'origin/server-inventory' into floodgate-2.0 ...

# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java

2021-03-10 20:46:50 +01:00

..

src/main

Merge remote-tracking branch 'origin/server-inventory' into floodgate-2.0

2021-03-10 20:46:50 +01:00

pom.xml

Fix several world-related errors on Spigot 1.12 (#1886)

2021-02-03 19:54:12 -05:00