Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

.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 '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/
@@ -425,13 +438,13 @@ 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
         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:

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) => {

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) => {