From be937b1dd37e9874f90c2ccc174f4e322b3ced41 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Wed, 11 Jan 2023 22:46:09 -0600
Subject: [PATCH 1/3] Correct AUTO_CURSEFORGE to also include library mods

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5e1c22634e7..11e6ba9e646 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,7 +46,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
   --var version=0.1.1 --var app=maven-metadata-release --file {{.app}} \
   --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
-ARG MC_HELPER_VERSION=1.24.3
+ARG MC_HELPER_VERSION=1.24.4
 ARG MC_HELPER_BASE_URL=https://github.com/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION}
 RUN curl -fsSL ${MC_HELPER_BASE_URL}/mc-image-helper-${MC_HELPER_VERSION}.tgz \
   | tar -C /usr/share -zxf - \

From bea5c8ee95013c7d770d4000f78fe87aaef31d87 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Thu, 12 Jan 2023 08:29:11 -0600
Subject: [PATCH 2/3] For AUTO_CURSEFORGE add ability to exclude specific mods

---
 Dockerfile                                         | 2 +-
 README.md                                          | 2 ++
 scripts/start-configuration                        | 2 +-
 scripts/{start-autoDeployCF => start-deployAutoCF} | 9 +++++++++
 4 files changed, 13 insertions(+), 2 deletions(-)
 rename scripts/{start-autoDeployCF => start-deployAutoCF} (79%)

diff --git a/Dockerfile b/Dockerfile
index 11e6ba9e646..1f09639a6c6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,7 +46,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
   --var version=0.1.1 --var app=maven-metadata-release --file {{.app}} \
   --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
 
-ARG MC_HELPER_VERSION=1.24.4
+ARG MC_HELPER_VERSION=1.24.5
 ARG MC_HELPER_BASE_URL=https://github.com/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION}
 RUN curl -fsSL ${MC_HELPER_BASE_URL}/mc-image-helper-${MC_HELPER_VERSION}.tgz \
   | tar -C /usr/share -zxf - \
diff --git a/README.md b/README.md
index e5596de9a06..a940efe96b7 100644
--- a/README.md
+++ b/README.md
@@ -650,6 +650,8 @@ The following two examples both refer to version 1.0.7 of ATM8:
 -e TYPE=AUTO_CURSEFORGE -e CF_SLUG=all-the-mods-8 -e CF_FILENAME_MATCHER=1.0.7
 ```
 
+If 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, then they can be excluded by passing a comma or space delimited list of project IDs via `CF_EXLUDE_MODS`
+
 ### Old approach
 
 Enable this server mode by adding `-e TYPE=CURSEFORGE` to your command-line,
diff --git a/scripts/start-configuration b/scripts/start-configuration
index d23ef2f64ba..cbb4326991a 100755
--- a/scripts/start-configuration
+++ b/scripts/start-configuration
@@ -197,7 +197,7 @@ case "${TYPE^^}" in
   ;;
 
   AUTO_CURSEFORGE)
-    exec "${SCRIPTS:-/}start-autoDeployCF" "$@"
+    exec "${SCRIPTS:-/}start-deployAutoCF" "$@"
     ;;
 
   VANILLA)
diff --git a/scripts/start-autoDeployCF b/scripts/start-deployAutoCF
similarity index 79%
rename from scripts/start-autoDeployCF
rename to scripts/start-deployAutoCF
index fcdfb4dd384..5e803903709 100644
--- a/scripts/start-autoDeployCF
+++ b/scripts/start-deployAutoCF
@@ -29,6 +29,15 @@ if [[ $CF_FILENAME_MATCHER ]]; then
   args+=(--filename-matcher="$CF_FILENAME_MATCHER")
 fi
 
+defaultModExcludes=(
+  363363 # extreme-sound-muffler
+  448233 # entityculling
+  574856 # rubidium
+  309927 # curios
+  )
+: "${CF_EXLUDE_MODS:=${defaultModExcludes[@]}}"
+args+=(--exclude-mods="$CF_EXLUDE_MODS")
+
 if ! mc-image-helper install-curseforge "${args[@]}"; then
     log "ERROR failed to auto-install CurseForge modpack"
     exit 1

From 57cda2957e623e62607eb780f04e49c4faebc9ae Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Thu, 12 Jan 2023 08:37:29 -0600
Subject: [PATCH 3/3] Don't exclude curios

---
 scripts/start-deployAutoCF | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/start-deployAutoCF b/scripts/start-deployAutoCF
index 5e803903709..4887881c7e4 100644
--- a/scripts/start-deployAutoCF
+++ b/scripts/start-deployAutoCF
@@ -33,7 +33,6 @@ defaultModExcludes=(
   363363 # extreme-sound-muffler
   448233 # entityculling
   574856 # rubidium
-  309927 # curios
   )
 : "${CF_EXLUDE_MODS:=${defaultModExcludes[@]}}"
 args+=(--exclude-mods="$CF_EXLUDE_MODS")