1
0
mirror of https://github.com/GeyserMC/Geyser.git synced 2026-01-06 15:41:50 +00:00

Merge remote-tracking branch 'origin/floodgate-2.0' into feature/1.17

# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java
This commit is contained in:
Tim203
2021-06-06 01:16:57 +02:00
84 changed files with 2747 additions and 1868 deletions

View File

@@ -3,7 +3,7 @@ name: ${outputName}-Spigot
author: ${project.organization.name}
website: ${project.organization.url}
version: ${project.version}
softdepend: ["ViaVersion"]
softdepend: ["ViaVersion", "floodgate"]
api-version: 1.13
commands:
geyser: