Merge branch 'Frozen'

.github/workflows/factoriotest-pr.yml

@@ -4,15 +4,17 @@ on:
   pull_request_target:
     branches:
     - master
+    - Frozen
 
 permissions:
   contents: read
 
 jobs:
   test-pull-request:
     name: PR
-    uses: pyanodon/pyanodontests/.github/workflows/pytest.yml@v1
+    uses: pyanodon/pyanodontests/.github/workflows/pytest.yml@v1.5.0
     with:
       repository: ${{ github.repository }}
       ref: ${{ github.event.pull_request.head.sha }}
+      test_branch: ${{ github.head_ref || github.ref_name }}
     secrets: inherit

.github/workflows/factoriotest-push.yml

@@ -4,15 +4,17 @@ on:
   push:
     branches:
     - master
+    - Frozen
 
 permissions:
   contents: read
 
 jobs:
   test-push:
     name: Push
-    uses: pyanodon/pyanodontests/.github/workflows/pytest.yml@v1
+    uses: pyanodon/pyanodontests/.github/workflows/pytest.yml@v1.5.0
     with:
       repository: ${{ github.repository }}
       ref: ${{ github.sha }}
+      test_branch: ${{ github.head_ref || github.ref_name }}
     secrets: inherit

cached-configs/pycoalprocessing+pyindustry.lua

@@ -1,11 +1,11 @@
 
 science_pack_order("automation-science-pack","001-000028")
 science_pack_order("logistic-science-pack","002-000065")
-science_pack_order("military-science-pack","003-000112")
+science_pack_order("military-science-pack","003-000072")
 science_pack_order("chemical-science-pack","003-000112")
-science_pack_order("utility-science-pack","005-000151")
-science_pack_order("production-science-pack","004-000137")
-science_pack_order("space-science-pack","006-000165")
+science_pack_order("utility-science-pack","005-000146")
+science_pack_order("production-science-pack","004-000135")
+science_pack_order("space-science-pack","006-000160")
 fix_tech("physical-projectile-damage-1",{order="000007",prerequisites={"military"},unit={count=275,ingredients={{amount=1,name="automation-science-pack",type="item"}},time=30}})
 fix_tech("physical-projectile-damage-2",{order="000008",prerequisites={"physical-projectile-damage-1","logistic-science-pack"},unit={count=90,ingredients={{amount=2,name="automation-science-pack",type="item"},{amount=1,name="logistic-science-pack",type="item"}},time=60}})
 fix_tech("weapon-shooting-speed-1",{order="000007",prerequisites={"military"},unit={count=275,ingredients={{amount=1,name="automation-science-pack",type="item"}},time=30}})

changelog.txt

@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 2.0.17
+Date: 2024-7-7
+  Changes:
+    - Added nuclear fuel to the list of things that cant be voided when pyalternative energy is active
+---------------------------------------------------------------------------------------------------
 Version: 2.0.16
 Date: 2024-6-27
   Changes:

info.json

@@ -1,6 +1,6 @@
 {
   "name": "pyindustry",
-  "version": "2.0.16",
+  "version": "2.0.17",
   "factorio_version": "1.1",
   "title": "Pyanodons Industry",
   "author": "Pyanodon, Nexela, Kingarthur, notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple",

prototypes/void-recipes/item-void.lua

@@ -64,7 +64,7 @@ end
 
 for _, type in pairs(groups) do
     for _, item in pairs(data.raw[type]) do
-        if not item.not_voidable and not (item.fuel_value and (item.fuel_category == "chemical" or item.fuel_category == "biomass")) and not fluid_barrels[item.name] and string.match(item.name, "rocket%-fuel") == nil then
+        if not item.not_voidable and not (item.fuel_value and (item.fuel_category == "chemical" or item.fuel_category == "biomass" or item.fuel_category == "nuke")) and not fluid_barrels[item.name] and string.match(item.name, "rocket%-fuel") == nil then
             --item_count = item_count + 1
             local name = item.name .. "-pyvoid"