From 60f42defbb658fd3cd382785b68b37b57c6d15d1 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 27 Jan 2023 08:16:33 -0600 Subject: [PATCH 1/3] Fix handling of CF modpack overrides when files before directories --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a82c2feab3e..86a1cb25c07 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.16 +ARG MC_HELPER_VERSION=1.24.17 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 61d76985548f92114f7a6d3b25c55763765b8c1e Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 27 Jan 2023 08:18:10 -0600 Subject: [PATCH 2/3] Fixed typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9360048bd20..3ba3e64c9c6 100644 --- a/README.md +++ b/README.md @@ -672,7 +672,7 @@ A mod's project ID can be obtained from the right hand side of the project page: If needing to iterate on the options above, set `CF_FORCE_SYNCHRONIZE` to "true" to ensure the exclude/includes are re-evaluated. -> **NOTE:** these options are provided to empower you get your server up and running quickly. Please help out by reporting an issue with the respective mod project. Ideally mod developers should [use correct registrations for one-sided client mods](https://docs.minecraftforge.net/en/latest/concepts/sides/#writing-one-sided-mods). Understandably, those code changes may be non-trivial, so mod authors can also add "Client" to the game versions when publishing. +> **NOTE:** these options are provided to empower you to get your server up and running quickly. Please help out by reporting an issue with the respective mod project. Ideally mod developers should [use correct registrations for one-sided client mods](https://docs.minecraftforge.net/en/latest/concepts/sides/#writing-one-sided-mods). Understandably, those code changes may be non-trivial, so mod authors can also add "Client" to the game versions when publishing. Some modpacks come with world/save data via a worlds file and/or the overrides provided with the modpack. Either approach can be selected to set the `LEVEL` to the resulting saves directory by setting `CF_SET_LEVEL_FROM` to either: - `WORLD_FILE` From 802f35f710f7d70fb77c5e98aad4de38bf5e43fd Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 27 Jan 2023 08:21:01 -0600 Subject: [PATCH 3/3] Trim file examples --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3ba3e64c9c6..b55d0b82a0e 100644 --- a/README.md +++ b/README.md @@ -650,15 +650,15 @@ The following shows where to get the URL to the specific file and also shows whe The following examples all refer to version 1.0.7 of ATM8: ``` --e TYPE=AUTO_CURSEFORGE -e CF_PAGE_URL=https://www.curseforge.com/minecraft/modpacks/all-the-mods-8/files/4248390 +-e CF_PAGE_URL=https://www.curseforge.com/minecraft/modpacks/all-the-mods-8/files/4248390 ``` ``` --e TYPE=AUTO_CURSEFORGE -e CF_SLUG=all-the-mods-8 -e CF_FILE_ID=4248390 +-e CF_SLUG=all-the-mods-8 -e CF_FILE_ID=4248390 ``` ``` --e TYPE=AUTO_CURSEFORGE -e CF_SLUG=all-the-mods-8 -e CF_FILENAME_MATCHER=1.0.7 +-e CF_SLUG=all-the-mods-8 -e CF_FILENAME_MATCHER=1.0.7 ``` 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: