From 33816293cdfe5cceb3d73b50c38644f436cc7aca Mon Sep 17 00:00:00 2001 From: fireph <443370+fireph@users.noreply.github.com> Date: Wed, 18 Jun 2025 17:22:40 -0700 Subject: [PATCH 1/3] Add docs for new Modrinth projects file support --- docs/mods-and-plugins/modrinth.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/mods-and-plugins/modrinth.md b/docs/mods-and-plugins/modrinth.md index e4bd787e21f..bc6768af258 100644 --- a/docs/mods-and-plugins/modrinth.md +++ b/docs/mods-and-plugins/modrinth.md @@ -12,6 +12,8 @@ Also, a specific version (or release type) can be declared adding a colon and then the version id, version number/name, or release type after the project slug. The version ID or number can be found in the 'Metadata' section. Valid release types are `release`, `beta`, `alpha`. To select a datapack from a Modrinth project, prefix the entry with "datapack:". When running a vanilla server, this is optional since only datapacks will be available for vanilla servers to select. + + You can also reference a file containing project entries by prefixing the file path with `@`. The file should contain one project reference per line, supports `#` comments, and ignores empty lines. | Description | Example projects entry | |---------------------------------|-------------------------------------------------------| @@ -21,6 +23,16 @@ | Latest version using project ID | `P7dR8mSH` | | Latest version of datapack | `datapack:terralith` | | Specific version of datapack | `datapack:terralith:2.5.5` | + | File with project references | `@/path/to/modrinth-mods.txt` | + + Example file content (`modrinth-mods.txt`): + ``` + fabric-api + # This is a comment + cloth-config + # Another comment + datapack:terralith + ``` ## Extra options From 60c0ed5aba502b60433c58830cd11c5cfbb1b062 Mon Sep 17 00:00:00 2001 From: fireph <443370+fireph@users.noreply.github.com> Date: Wed, 18 Jun 2025 17:32:33 -0700 Subject: [PATCH 2/3] matched the docs more closely to curseforge ones --- docs/mods-and-plugins/modrinth.md | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/docs/mods-and-plugins/modrinth.md b/docs/mods-and-plugins/modrinth.md index bc6768af258..648f3e1e767 100644 --- a/docs/mods-and-plugins/modrinth.md +++ b/docs/mods-and-plugins/modrinth.md @@ -13,7 +13,7 @@ To select a datapack from a Modrinth project, prefix the entry with "datapack:". When running a vanilla server, this is optional since only datapacks will be available for vanilla servers to select. - You can also reference a file containing project entries by prefixing the file path with `@`. The file should contain one project reference per line, supports `#` comments, and ignores empty lines. + You can also reference a file containing project entries by prefixing the **container path** path with `@`. | Description | Example projects entry | |---------------------------------|-------------------------------------------------------| @@ -23,16 +23,24 @@ | Latest version using project ID | `P7dR8mSH` | | Latest version of datapack | `datapack:terralith` | | Specific version of datapack | `datapack:terralith:2.5.5` | - | File with project references | `@/path/to/modrinth-mods.txt` | + | Projects Listing File | `@/path/to/modrinth-mods.txt` | - Example file content (`modrinth-mods.txt`): - ``` - fabric-api - # This is a comment - cloth-config - # Another comment - datapack:terralith - ``` +!!! info "More about listing files" + + Each line in the listing file is processed as one of the references above; however, blank lines and comments that start with `#` are ignored. + + Make sure to place the listing file in a mounted directory/volume or declare an appropriate mount for it. + + For example, `MODRINTH_PROJECTS` can be set to "@/extras/modrinth-mods.txt", assuming "/extras" has been added to `volumes` section, where the container file `/extras/modrinth-mods.txt` contains + + ```text + # This comment is ignored + fabric-api + + # This and previous blank line are ignore + cloth-config + datapack:terralith + ``` ## Extra options From 36fa729c57bd5bfea3fa46ec94422ed4ed1cd409 Mon Sep 17 00:00:00 2001 From: fireph <443370+fireph@users.noreply.github.com> Date: Sat, 21 Jun 2025 17:54:18 -0700 Subject: [PATCH 3/3] Bump mc-image-helper version to 1.45.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index de811dd22fd..96fd185c44c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,7 +48,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.43.1 +ARG MC_HELPER_VERSION=1.45.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