Merge branch 'master' into java8-multiarch

# Conflicts:
#	start-minecraftFinalSetup
This commit is contained in:
Geoff Bourne
2021-02-27 20:52:36 -06:00
12 changed files with 64 additions and 71 deletions

View File

@@ -54,7 +54,6 @@ if [[ $RCON_PASSWORD_FILE ]]; then
log ""
fi
export SERVER_PROPERTIES=/data/server.properties
export VERSIONS_JSON=https://launchermeta.mojang.com/mc/game/version_manifest.json
case "X$VERSION" in