From 7ead0d43f581714269fcd4080398eb3ded96f2f3 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Mon, 5 Jan 2026 17:45:41 +0500 Subject: [PATCH 1/4] Update build.yml --- .github/workflows/build.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7e3648d1d..87e29e53a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -391,11 +391,24 @@ jobs: mv -vf .pakku/multimc-overrides ./build/multimc + # Delete mods with export: false from ./mods directory + echo "Checking for mods with export: false..." + if [ -f "./pakku.json" ]; then + # Extract mod slugs with export: false and delete corresponding jar files + for mod in $(jq -r '.dependencies | to_entries[] | select(.value.export == false) | .key' ./pakku.json); do + echo "Looking for mod: $mod" + find ./mods -name "${mod}*.jar" -type f -delete 2>/dev/null && echo "Deleted $mod jar files" || echo "No $mod jar files found" + done + else + echo "pakku.json not found, skipping export:false mod removal" + fi + cp -rf ./build/.cache/curseforge/overrides ./build/multimc/.minecraft cp -vf ./build/.cache/curseforge/manifest.json ./build/multimc/flame/manifest.json cp -vf ./config/fancymenu/assets/icons/icon128x128.png ./build/multimc/.minecraft/icon.png + cp -rf ./mods ./build/multimc/.minecraft/ cd ./build/multimc/ @@ -431,7 +444,7 @@ jobs: uses: actions/upload-artifact@v6.0.0 with: name: ${{ needs.info.outputs.project_full_name }}-docker - path: ./.github/docker/${{ needs.info.outputs.project_full_name }}-docker.yml + path: ./build/docker/${{ needs.info.outputs.project_full_name }}-docker.yml if-no-files-found: error release-github: From e7890a1ea538e380709c58033516de22aa6a7395 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Mon, 5 Jan 2026 18:02:31 +0500 Subject: [PATCH 2/4] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 87e29e53a..297973ca3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -438,7 +438,7 @@ jobs: mv -vf .pakku/docker-overrides ./build/docker cd ./build/docker/ - mv *.yml $(basename -s .yml *.yml)-docker.yml + mv docker-compose.yml "${{ needs.info.outputs.project_full_name }}-docker.yml" - name: 🚀 Upload Docker Artifact uses: actions/upload-artifact@v6.0.0 From 90775f0855ece868aef834ebb2a31e39d4ecbc5b Mon Sep 17 00:00:00 2001 From: Xikaro Date: Mon, 5 Jan 2026 18:10:49 +0500 Subject: [PATCH 3/4] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 297973ca3..1f8183581 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -395,7 +395,7 @@ jobs: echo "Checking for mods with export: false..." if [ -f "./pakku.json" ]; then # Extract mod slugs with export: false and delete corresponding jar files - for mod in $(jq -r '.dependencies | to_entries[] | select(.value.export == false) | .key' ./pakku.json); do + for mod in $(jq -r 'to_entries[] | select(.value.export == false) | .key' ./pakku.json); do echo "Looking for mod: $mod" find ./mods -name "${mod}*.jar" -type f -delete 2>/dev/null && echo "Deleted $mod jar files" || echo "No $mod jar files found" done From c17679c64d69d5c5abf2f2b0dada53b6f700b23c Mon Sep 17 00:00:00 2001 From: thederpysockdude123 Date: Mon, 5 Jan 2026 06:38:04 -0700 Subject: [PATCH 4/4] Add ad astra metal blocks to domum ornamentum blocks whitelist (#2627) * Update tags.js Signed-off-by: thederpysockdude123 * added Ad Astra metal blocks to domum ornamentum blocks whitelist Signed-off-by: thederpysockdude123 * gave the Ad Astra metal blocks a block tag Signed-off-by: thederpysockdude123 * Update tags.js Signed-off-by: thederpysockdude123 * dw about that Signed-off-by: thederpysockdude123 * removed some s's so KubeJS behaves Signed-off-by: thederpysockdude123 * removed some s's so KubeJS behaves Signed-off-by: thederpysockdude123 * added Ad Astra metal blocks to domum ornamentum blocks whitelist (fr this time) Signed-off-by: thederpysockdude123 --------- Signed-off-by: thederpysockdude123 --- kubejs/server_scripts/ad_astra/tags.js | 15 +++++++++++++++ kubejs/server_scripts/domum_ornamentum/tags.js | 7 +++++++ 2 files changed, 22 insertions(+) diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index a705ac40f..681fe511a 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -107,6 +107,21 @@ const registerAdAstraBlockTags = (event) => { event.add('minecraft:logs_that_burn', wood.stripped_log) } }) + const DECO_BLOCKS = [ 'iron', 'steel', 'desh', 'calorite', 'ostrum' ]; + DECO_BLOCKS.forEach(block => { + event.add(`tfg:ad_astra_${block}_block`, `ad_astra:${block}_factory_block`) + event.add(`tfg:ad_astra_${block}_block`, `ad_astra:${block}_plating`) + event.add(`tfg:ad_astra_${block}_block`, `ad_astra:${block}_panel`) + event.add(`tfg:ad_astra_${block}_block`, `ad_astra:${block}_pillar`) + event.add(`tfg:ad_astra_${block}_block`, `ad_astra:${block}_plateblock`) + event.add(`tfg:ad_astra_${block}_block`, `ad_astra:encased_${block}_block`) + }) + + event.add('tfg:ad_astra_etrium_block', 'ad_astra:etrium_factory_block') + event.add('tfg:ad_astra_etrium_block', 'ad_astra:encased_etrium_block') + event.add('tfg:ad_astra_etrium_block', 'ad_astra:etrium_plateblock') + event.add('tfg:ad_astra_etrium_block', 'ad_astra:etrium_panel') + event.add('tfg:ad_astra_etrium_block', 'ad_astra:etrium_block') } const registerAdAstraBiomeTags = (event) => { diff --git a/kubejs/server_scripts/domum_ornamentum/tags.js b/kubejs/server_scripts/domum_ornamentum/tags.js index 9d793dc97..04b05cd50 100644 --- a/kubejs/server_scripts/domum_ornamentum/tags.js +++ b/kubejs/server_scripts/domum_ornamentum/tags.js @@ -152,6 +152,13 @@ function registerDomumOrnamentumBlockTags(event) { "createdeco:corner_pearl_bricks", "createdeco:cracked_pearl_bricks", "createdeco:mossy_pearl_bricks", + //Ad Astra blocks + "#tfg:ad_astra_iron_block", + "#tfg:ad_astra_etrium_block", + "#tfg:ad_astra_steel_block", + "#tfg:ad_astra_desh_block", + "#tfg:ad_astra_ostrum_block", + "#tfg:ad_astra_calorite_block", ]; materials.forEach((material) => {