diff --git a/Dockerfile b/Dockerfile index 45140c09..47ba3259 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,7 +48,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \ --var version=${MC_SERVER_RUNNER_VERSION} --var app=mc-server-runner --file {{.app}} \ --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz -ARG MC_HELPER_VERSION=1.48.4 +ARG MC_HELPER_VERSION=1.48.5 ARG MC_HELPER_BASE_URL=${GITHUB_BASEURL}/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION} # used for cache busting local copy of mc-image-helper ARG MC_HELPER_REV=1 diff --git a/scripts/start-deployModrinth b/scripts/start-deployModrinth index f22ff42f..b79a1bfa 100644 --- a/scripts/start-deployModrinth +++ b/scripts/start-deployModrinth @@ -14,6 +14,7 @@ resultsFile=/data/.install-modrinth.env : "${MODRINTH_FORCE_INCLUDE_FILES=}" : "${MODRINTH_OVERRIDES_EXCLUSIONS=}" : "${MODRINTH_DEFAULT_EXCLUDE_INCLUDES=/image/modrinth-exclude-include.json}" +: "${MODRINTH_FORCE_MODLOADER_REINSTALL:=${FORCE_MODLOADER_REINSTALL:-false}}" if [[ ! $MODRINTH_MODPACK ]]; then logError "MODRINTH_MODPACK must be set when using TYPE/MODPACK_PLATFORM/MOD_PLATFORM of MODRINTH" @@ -33,6 +34,9 @@ args=( if [[ $MODRINTH_IGNORE_MISSING_FILES ]]; then args+=(--ignore-missing-files "$MODRINTH_IGNORE_MISSING_FILES") fi +if isTrue "${MODRINTH_FORCE_MODLOADER_REINSTALL}"; then + args+=(--force-modloader-reinstall) +fi case "${VERSION^^}" in LATEST)