From 3dc76150974dfb4239c7f5f50d7c871f231f6f67 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Mon, 19 Jun 2023 11:49:22 -0500 Subject: [PATCH] auto_cf: allow explicit inclusions to override default exclusions Also - removed carry-on from default exclusions --- Dockerfile | 2 +- files/cf-exclude-include.json | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a1d2b1904ab..2dbf8aa4807 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.32.2 +ARG MC_HELPER_VERSION=1.32.3 ARG MC_HELPER_BASE_URL=https://github.com/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/files/cf-exclude-include.json b/files/cf-exclude-include.json index 3ed8f6d11f9..9b96058756f 100644 --- a/files/cf-exclude-include.json +++ b/files/cf-exclude-include.json @@ -4,7 +4,6 @@ "armor-toughness-bar", "biomeinfo", "block-drops-jei-addon", - "carry-on", "cherished-worlds", "controlling", "ctm",