diff --git a/Dockerfile b/Dockerfile index 4e4ba188..a653d743 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.22.12 +ARG MC_HELPER_VERSION=1.23.1 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/docs/start-script-flow.drawio.png b/docs/start-script-flow.drawio.png index 01608e76..b2f0e89e 100644 Binary files a/docs/start-script-flow.drawio.png and b/docs/start-script-flow.drawio.png differ diff --git a/examples/.gitignore b/examples/.gitignore index a67cdf21..da60e23c 100644 --- a/examples/.gitignore +++ b/examples/.gitignore @@ -1,2 +1,2 @@ -/data/ +data/ modpacks/ \ No newline at end of file diff --git a/examples/modrinth-paper/docker-compose.yml b/examples/modrinth-paper/docker-compose.yml new file mode 100644 index 00000000..84d4e96b --- /dev/null +++ b/examples/modrinth-paper/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3" + +services: + mc: + image: ${IMAGE_TO_TEST:-itzg/minecraft-server} + environment: + EULA: "true" + TYPE: PAPER + VERSION: 1.19.3 + MODRINTH_PROJECTS: "coreprotect" + MODRINTH_ALLOWED_VERSION_TYPE: "release" + volumes: + - ./data:/data diff --git a/scripts/start-setupModpack b/scripts/start-setupModpack index 127a337a..bbba2043 100755 --- a/scripts/start-setupModpack +++ b/scripts/start-setupModpack @@ -272,7 +272,7 @@ function modrinthProjects() { : "${MODRINTH_DOWNLOAD_OPTIONAL_DEPENDENCIES:=true}" : "${MODRINTH_ALLOWED_VERSION_TYPE:=release}" - if [[ $MODRINTH_PROJECTS ]] && isFamily HYBRID FORGE FABRIC; then + if [[ $MODRINTH_PROJECTS ]] && isFamily HYBRID FORGE FABRIC SPIGOT; then if isFamily HYBRID FORGE; then loader=forge else