From 319582ae226b603c81fc186301978c44b5a0f6b6 Mon Sep 17 00:00:00 2001 From: LB Date: Fri, 28 Aug 2026 23:34:50 -0400 Subject: [PATCH] Stop figura exclude from matching configurable jars (#4261) --- Dockerfile | 2 +- docs/types-and-platforms/mod-platforms/modrinth-modpacks.md | 4 ++-- files/modrinth-exclude-include.json | 5 +---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index d7bff3d4..5f3232c7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -57,7 +57,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \ --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz # renovate: datasource=github-releases packageName=itzg/mc-image-helper versioning=loose -ARG MC_HELPER_VERSION=1.66.1 +ARG MC_HELPER_VERSION=1.67.0 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/modrinth-modpacks.md b/docs/types-and-platforms/mod-platforms/modrinth-modpacks.md index 53b04d39..59ad4fd8 100644 --- a/docs/types-and-platforms/mod-platforms/modrinth-modpacks.md +++ b/docs/types-and-platforms/mod-platforms/modrinth-modpacks.md @@ -50,7 +50,7 @@ Some mods, such as [MCInstance Loader](https://modrinth.com/mod/mcinstance-loade ## Excluding files -To exclude client mods that are incorrectly declared by the modpack as server-compatible, set `MODRINTH_EXCLUDE_FILES` to a comma or newline delimited list of partial file names to exclude. You may need to set `MODRINTH_FORCE_SYNCHRONIZE` to "true" while iterating on a compatible set of mods to use. +To exclude client mods that are incorrectly declared by the modpack as server-compatible, set `MODRINTH_EXCLUDE_FILES` to a comma or newline delimited list of file name matchers. Each entry is a case-insensitive substring of the file path, or a regular expression if surrounded with `/` (same convention as [`CF_FILENAME_MATCHER`](auto-curseforge.md#pinning-modpack-and-mod-loader-versions)). You may need to set `MODRINTH_FORCE_SYNCHRONIZE` to "true" while iterating on a compatible set of mods to use. !!! example @@ -64,7 +64,7 @@ To exclude client mods that are incorrectly declared by the modpack as server-co ## Force-include files -To force include client mods, set `MODRINTH_FORCE_INCLUDE_FILES` to a comma or newline delimited list of partial file names. You may need to set `MODRINTH_FORCE_SYNCHRONIZE` to "true" while iterating on a compatible set of mods to use. +To force include client mods, set `MODRINTH_FORCE_INCLUDE_FILES` to a comma or newline delimited list of file name matchers using the same substring or `/regex/` rules as `MODRINTH_EXCLUDE_FILES`. You may need to set `MODRINTH_FORCE_SYNCHRONIZE` to "true" while iterating on a compatible set of mods to use. !!! example diff --git a/files/modrinth-exclude-include.json b/files/modrinth-exclude-include.json index 79e3ef91..3c3753e7 100644 --- a/files/modrinth-exclude-include.json +++ b/files/modrinth-exclude-include.json @@ -49,7 +49,7 @@ "fast-ip-ping", "fastquit", "feytweaks", - "figura", + "/(^|/)figura-/", "ForgeConfigScreens", "GeckoLibIrisCompat", "gpumemleakfix", @@ -110,9 +110,6 @@ "cobbleverse": { "excludes": [ "cloth-config" - ], - "forceIncludes": [ - "configurable" ] } }