Merge branch 'master' into java8-multiarch

# Conflicts:
#	start-minecraftFinalSetup
This commit is contained in:
Geoff Bourne committed 2021-02-27 20:52:36 -06:00
commit 871ecd4d9d
12 files changed
+64 -71

No files matched your search

-1
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