Skip to content

Commit 548bea7

Browse files
authored
Add CF_EXCLUDE_ALL_MODS (#3793)
1 parent 06836b9 commit 548bea7

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
4949
--var version=${MC_SERVER_RUNNER_VERSION} --var app=mc-server-runner --file {{.app}} \
5050
--from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
5151

52-
ARG MC_HELPER_VERSION=1.50.8
52+
ARG MC_HELPER_VERSION=1.51.1
5353
ARG MC_HELPER_BASE_URL=${GITHUB_BASEURL}/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION}
5454
# used for cache busting local copy of mc-image-helper
5555
ARG MC_HELPER_REV=1

docs/types-and-platforms/mod-platforms/auto-curseforge.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,9 +240,9 @@ If you wish to use an unpublished modpack zip, set the container path to the fil
240240

241241
## Exclude client mods
242242

243-
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:
243+
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:
244244

245-
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.
245+
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`
246246

247247
!!! note
248248
`CF_FORCE_INCLUDE_MODS` will not download additional mods.

scripts/start-deployAutoCF

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ set -eu
1414
: "${CF_IGNORE_MISSING_FILES:=}"
1515
: "${CF_EXCLUDE_INCLUDE_FILE=/image/cf-exclude-include.json}"
1616
: "${CF_EXCLUDE_MODS:=}"
17+
: "${CF_EXCLUDE_ALL_MODS:=}"
1718
: "${CF_FORCE_INCLUDE_MODS:=}"
1819
: "${CF_SET_LEVEL_FROM:=}" # --set-level-from
1920
: "${CF_OVERRIDES_SKIP_EXISTING:=false}" # --overrides-skip-existing
@@ -64,10 +65,11 @@ setArg --overrides-exclusions CF_OVERRIDES_EXCLUSIONS
6465
setArg --ignore-missing-files CF_IGNORE_MISSING_FILES
6566
setArg --api-cache-default-ttl CF_API_CACHE_DEFAULT_TTL
6667
setArg --exclude-mods CF_EXCLUDE_MODS
68+
setArg --exclude-all-mods CF_EXCLUDE_ALL_MODS
6769
setArg --force-include-mods CF_FORCE_INCLUDE_MODS
6870
setArg --exclude-include-file CF_EXCLUDE_INCLUDE_FILE
69-
setArg --downloads-repo CF_DOWNLOADS_REPO
7071
setArg --mod-loader-version CF_MOD_LOADER_VERSION
72+
setArg --downloads-repo CF_DOWNLOADS_REPO
7173

7274
if ! mc-image-helper install-curseforge "${args[@]}"; then
7375
logError "Failed to auto-install CurseForge modpack"

0 commit comments

Comments
 (0)