diff --git a/Dockerfile b/Dockerfile index 36545d20..16c93371 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,7 +49,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.50.8 +ARG MC_HELPER_VERSION=1.51.1 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/docs/types-and-platforms/mod-platforms/auto-curseforge.md b/docs/types-and-platforms/mod-platforms/auto-curseforge.md index 2f2b2cbb..39ccb9e5 100644 --- a/docs/types-and-platforms/mod-platforms/auto-curseforge.md +++ b/docs/types-and-platforms/mod-platforms/auto-curseforge.md @@ -240,9 +240,9 @@ If you wish to use an unpublished modpack zip, set the container path to the fil ## Exclude client mods -Quite often there are mods that need to be excluded, such as ones that did not properly declare as a client mod via the file's game versions. Similarly, there are some mods that are incorrectly tagged as client only. The following describes two options to exclude/include mods: +Quite often there are mods that need to be excluded, such as ones that did not properly declare as a client mod via the file's game versions. Similarly, there are some mods that are incorrectly tagged as client only. The following describes some options to exclude/include mods: -Mods can be excluded by passing a comma or space delimited list of **project** slugs or IDs via `CF_EXCLUDE_MODS`. Similarly, there are some mods that are incorrectly tagged as client only. For those, pass the **project** slugs or IDs via `CF_FORCE_INCLUDE_MODS`. These lists will be combined with the content of the exclude/include file, if given. +Mods can be excluded by passing a comma or space delimited list of **project** slugs or IDs via `CF_EXCLUDE_MODS`. Similarly, there are some mods that are incorrectly tagged as client only. For those, pass the **project** slugs or IDs via `CF_FORCE_INCLUDE_MODS`. These lists will be combined with the content of the exclude/include file, if given. Alternatively, all mods can be excluded by setting `CF_EXCLUDE_ALL_MODS` to `true` !!! note `CF_FORCE_INCLUDE_MODS` will not download additional mods. diff --git a/scripts/start-deployAutoCF b/scripts/start-deployAutoCF index 4154a656..b7701b7b 100644 --- a/scripts/start-deployAutoCF +++ b/scripts/start-deployAutoCF @@ -14,6 +14,7 @@ set -eu : "${CF_IGNORE_MISSING_FILES:=}" : "${CF_EXCLUDE_INCLUDE_FILE=/image/cf-exclude-include.json}" : "${CF_EXCLUDE_MODS:=}" +: "${CF_EXCLUDE_ALL_MODS:=}" : "${CF_FORCE_INCLUDE_MODS:=}" : "${CF_SET_LEVEL_FROM:=}" # --set-level-from : "${CF_OVERRIDES_SKIP_EXISTING:=false}" # --overrides-skip-existing @@ -64,10 +65,11 @@ setArg --overrides-exclusions CF_OVERRIDES_EXCLUSIONS setArg --ignore-missing-files CF_IGNORE_MISSING_FILES setArg --api-cache-default-ttl CF_API_CACHE_DEFAULT_TTL setArg --exclude-mods CF_EXCLUDE_MODS +setArg --exclude-all-mods CF_EXCLUDE_ALL_MODS setArg --force-include-mods CF_FORCE_INCLUDE_MODS setArg --exclude-include-file CF_EXCLUDE_INCLUDE_FILE -setArg --downloads-repo CF_DOWNLOADS_REPO setArg --mod-loader-version CF_MOD_LOADER_VERSION +setArg --downloads-repo CF_DOWNLOADS_REPO if ! mc-image-helper install-curseforge "${args[@]}"; then logError "Failed to auto-install CurseForge modpack"