Version 1.0.1 patch 1

LovelySanta · web-flow · commit d6f95b4964c0 · 2021-05-31T17:36:10.000+02:00
diff --git a/angelsaddons-mobility/changelog.txt b/angelsaddons-mobility/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.0.8
+Date: 26.05.2021
+  Bugfixes:
+    - Fixed crash when playing without the angels library (inside angels refining)
+---------------------------------------------------------------------------------------------------
 Version: 0.0.7
 Date: 26.05.2021
   Changes:
diff --git a/angelsaddons-mobility/data-final-fixes.lua b/angelsaddons-mobility/data-final-fixes.lua
@@ -1,3 +1,5 @@
+local funcs = require("prototypes/train-functions")
+
 local wagons = {
   angelsmods.addons.mobility.petrotrain.tier_amount >= 1 and "petro-tank1" or nil,
   angelsmods.addons.mobility.petrotrain.tier_amount >= 2 and "petro-tank1-2" or nil,
@@ -44,4 +46,5 @@ for _, prototype_type in pairs {
     end
   end
 end
-angelsmods.functions.add_speed_local()
+
+funcs.add_speed_locale()
diff --git a/angelsaddons-mobility/info.json b/angelsaddons-mobility/info.json
@@ -1,6 +1,6 @@
 {
   "name": "angelsaddons-mobility",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "factorio_version": "1.1",
   "title": "Angel's Addons - Mass Transit",
   "author": "Arch666Angel, lovely_santa",
diff --git a/angelsaddons-mobility/prototypes/train-functions.lua b/angelsaddons-mobility/prototypes/train-functions.lua
@@ -14,7 +14,7 @@ local function set_type(name)
   return train_type
 end
 
-function angelsmods.functions.add_speed_local()
+local function add_speed_locale()
   local parts = {"cargo-wagon","fluid-wagon","artillery-wagon"}
   for _, part in pairs(parts) do
     for _,train in pairs(data.raw[part]) do
@@ -405,5 +405,6 @@ return {
   generate_train_recipe = generate_train_recipe,
   generate_train_technology = generate_train_technology,
   update_equipment_grid = update_equipment_grid,
-  update_equipment = update_equipment
+  update_equipment = update_equipment,
+  add_speed_locale = add_speed_locale
 }
diff --git a/angelsaddons-storage/changelog.txt b/angelsaddons-storage/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.0.6
+Date: 31.05.2021
+  Bugfixes:
+    - Fixed crash related to typo in hidden dependencies
+---------------------------------------------------------------------------------------------------
 Version: 0.0.5
 Date: 26.05.2021
   Changes:
diff --git a/angelsaddons-storage/info.json b/angelsaddons-storage/info.json
@@ -1,6 +1,6 @@
 {
   "name": "angelsaddons-storage",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "factorio_version": "1.1",
   "title": "Angel's Addons - Storage Options",
   "author": "Arch666Angel",
@@ -9,8 +9,7 @@
   "description": "Adds pressure tanks (extremely large tanks), warehouses and silos.",
   "dependencies": [
     "base >= 1.1.33",
-
-    "(?) angelsfining",
-    "? angelspetrochem >= 0.9.17"
+    "(?) angelsrefining",
+    "? angelspetrochem >= 0.9.19"
   ]
 }
diff --git a/angelsbioprocessing/changelog.txt b/angelsbioprocessing/changelog.txt
@@ -1,4 +1,11 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.7.19
+Date: 31.05.2021
+  Bugfixes:
+    - Fixed biter refugium technology should depend on walls
+    - Fixed crash related to opening another players inventory
+    - Updated resin and rubber accessibility for red/green wires
+---------------------------------------------------------------------------------------------------
 Version: 0.7.18
 Date: 26.05.2021
   Changes:
diff --git a/angelsbioprocessing/control.lua b/angelsbioprocessing/control.lua
@@ -157,8 +157,9 @@ end)
 script.on_event(defines.events.on_player_main_inventory_changed, function(event)
   local player = game.get_player(event.player_index)
   local opened_entity = player.opened
-  if not (opened_entity and opened_entity.valid and opened_entity.object_name ~= 'LuaEquipmentGrid' and
-         (opened_entity.type == "lab" or opened_entity.type == "mining-drill")) then return end
+  if not (opened_entity and opened_entity.valid) then return end
+  if opened_entity.object_name == 'LuaEquipmentGrid' or opened_entity.object_name == 'LuaPlayer' then return end
+  if not (opened_entity.type == "lab" or opened_entity.type == "mining-drill") then return end
 
   local module_inventory = opened_entity.get_module_inventory()
   if not module_inventory then return end
diff --git a/angelsbioprocessing/info.json b/angelsbioprocessing/info.json
@@ -1,16 +1,16 @@
 {
   "name": "angelsbioprocessing",
-  "version": "0.7.18",
+  "version": "0.7.19",
   "factorio_version": "1.1",
   "title": "Angel's Bioprocessing",
   "author": "Arch666Angel",
   "contact": "https://discord.gg/ff5p6KE",
   "homepage": "https://forums.factorio.com/viewforum.php?f=185",
   "description": "Adds ways to recycle and process waste products through biological means and make use of biological processes and farming.",
   "dependencies": [
-    "angelsrefining >= 0.11.20",
-    "angelspetrochem >= 0.9.18",
-    "angelssmelting >= 0.6.15",
+    "angelsrefining >= 0.11.21",
+    "angelspetrochem >= 0.9.19",
+    "angelssmelting >= 0.6.16",
     "? bobenemies >= 0.18.5"
   ]
 }
diff --git a/angelsbioprocessing/prototypes/technology/bio-processing-wood-paper.lua b/angelsbioprocessing/prototypes/technology/bio-processing-wood-paper.lua
@@ -15,6 +15,10 @@ data:extend(
         type = "unlock-recipe",
         recipe = "wood-pellets"
       },
+      {
+        type = "unlock-recipe",
+        recipe = "bio-resin-wood-reprocessing"
+      },
     },
     unit =
     {
@@ -136,10 +140,6 @@ data:extend(
         type = "unlock-recipe",
         recipe = "wood-sawing-1"
       },
-      {
-        type = "unlock-recipe",
-        recipe = "bio-resin-wood-reprocessing"
-      },
       {
         type = "unlock-recipe",
         recipe = "solid-saw"
diff --git a/angelsbioprocessing/prototypes/technology/bio-refugium.lua b/angelsbioprocessing/prototypes/technology/bio-refugium.lua
@@ -332,6 +332,7 @@ data:extend(
         --"bio-refugium-butchery-2",
         "bio-refugium-puffer-2",
         "bio-processing-crystal-splinter-2",
+        "stone-wall"
       },
       effects = {
         {
diff --git a/angelsindustries/changelog.txt b/angelsindustries/changelog.txt
@@ -1,4 +1,13 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.4.13
+Date: 31.05.2021
+  Bugfixes:
+    - Component mode:
+      - Fixed ingredient tier of puffer and biter refugium
+      - Fixed tin plate could not be inserted into the filter inserter recipe
+      - Fixed glass plate could not be inserted into any solar recipe
+      - Fixed bobs recipe for the superiour circuit board was not hidden correctly
+---------------------------------------------------------------------------------------------------
 Version: 0.4.12
 Date: 26.05.2021
   Changes:
diff --git a/angelsindustries/info.json b/angelsindustries/info.json
@@ -1,17 +1,17 @@
 {
   "name": "angelsindustries",
-  "version": "0.4.12",
+  "version": "0.4.13",
   "factorio_version": "1.1",
   "title": "Angel's Industries",
   "author": "Arch666Angel",
   "contact": "https://discord.gg/ff5p6KE",
   "homepage": "https://forums.factorio.com/viewforum.php?f=185",
   "description": "Adds industrial equipment as well as the tools you need to expand and grow your base. Adds extra components [BETA] and a tech [ALPHA] overhaul.",
   "dependencies": [
-    "angelsrefining >= 0.11.20",
-    "angelspetrochem >= 0.9.18",
-    "angelssmelting >= 0.6.15",
-    "angelsbioprocessing >= 0.7.18",
+    "angelsrefining >= 0.11.21",
+    "angelspetrochem >= 0.9.19",
+    "angelssmelting >= 0.6.16",
+    "angelsbioprocessing >= 0.7.19",
     "(?) bobassembly >= 0.18.6",
     "(?) boblogistics >= 1.0.0",
     "(?) bobtech >= 0.18.3",
diff --git a/angelsindustries/locale/en/science.cfg b/angelsindustries/locale/en/science.cfg
@@ -148,7 +148,7 @@ tech-yellow-circuit=Yellow-tier electronics for processing of signals.
 
 tech-specialised-labs=Key technology for automated research.
 tech-specialised-labs-basic=More efficient research practices for basic technology research.
-tech-specialised-labs-advanced=Most advanced research parctices that make use of space science.
+tech-specialised-labs-advanced=Most advanced research practices that make use of space science.
 tech-specialised-labs-basic-exploration=Key technology for exploration research.
 tech-specialised-labs-advanced-exploration=Advanced technology for exploration research.
 tech-specialised-labs-basic-energy=Key technology for energy research.
diff --git a/angelsindustries/prototypes/overrides/components-base-entity-update/components-base-power-update.lua b/angelsindustries/prototypes/overrides/components-base-entity-update/components-base-power-update.lua
@@ -15,7 +15,7 @@ if angelsmods.industries.components then
           {type = "item", name = "block-construction-2", amount = 2},
           {type = "item", name = "block-electronics-2", amount = 2},
           {type = "item", name = "block-energy-2", amount = 3},
-          angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = "angels-plate-glass", amount = 5} or nil,
+          angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = data.raw.item["glass"] and "glass" or "angels-plate-glass", amount = 5} or nil,
         }
       }
     }
diff --git a/angelsindustries/prototypes/overrides/components-base-recipe-update.lua b/angelsindustries/prototypes/overrides/components-base-recipe-update.lua
@@ -5,6 +5,9 @@ if angelsmods.industries.components then
   OV.remove_unlock("military", "submachine-gun")
   OV.add_unlock("angels-components-weapons-basic", "submachine-gun")
 
+  --battery requirements
+  OV.remove_unlock("angels-glass-smelting-2", "angels-coil-glass-fiber")
+  OV.add_unlock("angels-glass-smelting-1", "angels-coil-glass-fiber")
   --battery usage
   --vanilla replacements
   replace_recipe_ing("accumulator","battery-1","battery-2")
diff --git a/angelsindustries/prototypes/overrides/components-block-update.lua b/angelsindustries/prototypes/overrides/components-block-update.lua
@@ -314,6 +314,7 @@ if angelsmods.industries.components then
     OV.add_prereq("advanced-ore-refining-3", "angels-advanced-blocks-1")
     OV.add_prereq("angels-advanced-chemistry-3", "angels-advanced-blocks-1")
     OV.add_prereq("angels-metallurgy-4", "angels-advanced-blocks-1")
+    OV.remove_prereq("bio-refugium-biter-1", "stone-wall")
 
     -----------------------------------------------------------------------------
     -- ADVANCED BLOCKS 2 --------------------------------------------------------
diff --git a/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-inserters-update.lua b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-inserters-update.lua
@@ -15,7 +15,7 @@ if angelsmods.industries.components then
               {type = "item", name = "inserter", amount = 1},
               {type = "item", name = "circuit-grey", amount = 2},
               angelsmods.trigger.smelting_products["tin"].plate and
-                {type = "item", name = "angels-plate-tin", amount = 2} or nil
+                {type = "item", name = data.raw.item["tin-plate"] and "tin-plate" or "angels-plate-tin", amount = 2} or nil
             }
           },
           {
diff --git a/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-power-update.lua b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-power-update.lua
@@ -17,7 +17,7 @@ if angelsmods.industries.components then
               {type = "item", name = "block-construction-3", amount = 1},
               {type = "item", name = "block-electronics-3", amount = 1},
               {type = "item", name = "block-energy-3", amount = 2},
-              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = "angels-plate-glass", amount = 2} or nil,
+              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = data.raw.item["glass"] and "glass" or "angels-plate-glass", amount = 2} or nil,
             }
           },
           --{
@@ -28,7 +28,7 @@ if angelsmods.industries.components then
           --    {type = "item", name = "block-construction-3", amount = 2},
           --    {type = "item", name = "block-electronics-3", amount = 2},
           --    {type = "item", name = "block-energy-3", amount = 3},
-          --    angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = "angels-plate-glass", amount = 5} or nil,
+          --    angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = data.raw.item["glass"] and "glass" or "angels-plate-glass", amount = 5} or nil,
           --  }
           --},
           {
@@ -38,7 +38,7 @@ if angelsmods.industries.components then
               {type = "item", name = "block-construction-3", amount = 3},
               {type = "item", name = "block-electronics-3", amount = 3},
               {type = "item", name = "block-energy-3", amount = 4},
-              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = "angels-plate-glass", amount = 7} or nil,
+              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = data.raw.item["glass"] and "glass" or "angels-plate-glass", amount = 7} or nil,
             }
           },
 
@@ -50,7 +50,7 @@ if angelsmods.industries.components then
               {type = "item", name = "block-construction-4", amount = 1},
               {type = "item", name = "block-electronics-4", amount = 1},
               {type = "item", name = "block-energy-4", amount = 2},
-              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = "angels-plate-glass", amount = 2} or nil,
+              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = data.raw.item["glass"] and "glass" or "angels-plate-glass", amount = 2} or nil,
             }
           },
           {
@@ -61,7 +61,7 @@ if angelsmods.industries.components then
               {type = "item", name = "block-construction-4", amount = 2},
               {type = "item", name = "block-electronics-4", amount = 2},
               {type = "item", name = "block-energy-4", amount = 3},
-              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = "angels-plate-glass", amount = 5} or nil,
+              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = data.raw.item["glass"] and "glass" or "angels-plate-glass", amount = 5} or nil,
             }
           },
           {
@@ -72,7 +72,7 @@ if angelsmods.industries.components then
               {type = "item", name = "block-construction-4", amount = 3},
               {type = "item", name = "block-electronics-4", amount = 3},
               {type = "item", name = "block-energy-4", amount = 4},
-              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = "angels-plate-glass", amount = 7} or nil,
+              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = data.raw.item["glass"] and "glass" or "angels-plate-glass", amount = 7} or nil,
             }
           },
 
@@ -84,7 +84,7 @@ if angelsmods.industries.components then
               {type = "item", name = "block-construction-5", amount = 1},
               {type = "item", name = "block-electronics-5", amount = 1},
               {type = "item", name = "block-energy-5", amount = 2},
-              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = "angels-plate-glass", amount = 2} or nil,
+              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = data.raw.item["glass"] and "glass" or "angels-plate-glass", amount = 2} or nil,
             }
           },
           {
@@ -95,7 +95,7 @@ if angelsmods.industries.components then
               {type = "item", name = "block-construction-5", amount = 2},
               {type = "item", name = "block-electronics-5", amount = 2},
               {type = "item", name = "block-energy-5", amount = 3},
-              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = "angels-plate-glass", amount = 5} or nil,
+              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = data.raw.item["glass"] and "glass" or "angels-plate-glass", amount = 5} or nil,
             }
           },
           {
@@ -106,7 +106,7 @@ if angelsmods.industries.components then
               {type = "item", name = "block-construction-5", amount = 3},
               {type = "item", name = "block-electronics-5", amount = 3},
               {type = "item", name = "block-energy-5", amount = 4},
-              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = "angels-plate-glass", amount = 7} or nil,
+              angelsmods.trigger.smelting_products["glass"].plate and {type = "item", name = data.raw.item["glass"] and "glass" or "angels-plate-glass", amount = 7} or nil,
             }
           }
         }
diff --git a/angelsindustries/prototypes/overrides/components-bobs-recipe-update.lua b/angelsindustries/prototypes/overrides/components-bobs-recipe-update.lua
@@ -54,6 +54,7 @@ if angelsmods.industries.components then
   -----------------------------------------------------------------------------
   if mods["bobelectronics"] then
     OV.disable_recipe("wooden-board-paper")
+    OV.disable_recipe("superior-circuit-board")
   end
   -----------------------------------------------------------------------------
   -- BOB REVAMP ---------------------------------------------------------------
diff --git a/angelsindustries/prototypes/technology/logistics-technology.lua b/angelsindustries/prototypes/technology/logistics-technology.lua
@@ -323,11 +323,3 @@ data:extend(
     -- },
   }
 )
-
--- move circuit wires to electronics
-local OV = angelsmods.functions.OV
-for _, recipe_name in pairs({"green-wire", "red-wire"}) do
-  OV.remove_unlock("circuit-network", recipe_name)
-  OV.add_unlock("electronics", recipe_name)
-end
-OV.execute()
diff --git a/angelspetrochem/changelog.txt b/angelspetrochem/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.9.19
+Date: 31.05.2021
+  Bugfixes:
+    - Changed prerequisites of plastic before advanced electronics technology
+---------------------------------------------------------------------------------------------------
 Version: 0.9.18
 Date: 26.05.2021
   Changes:
diff --git a/angelspetrochem/info.json b/angelspetrochem/info.json
@@ -1,14 +1,14 @@
 {
   "name": "angelspetrochem",
-  "version": "0.9.18",
+  "version": "0.9.19",
   "factorio_version": "1.1",
   "title": "Angel's Petrochemical Processing",
   "author": "Arch666Angel",
   "contact": "https://discord.gg/ff5p6KE",
   "homepage": "https://forums.factorio.com/viewforum.php?f=185",
   "description": "Angel's Petrochemical processing changes Oil processing and adds Gas processing, as well as a more complex web of chemical production. Includes overrides and tie-ins to Bob's technologies and recipes. Dependencies: Angel's Refining",
   "dependencies": [
-    "angelsrefining >= 0.11.20",
+    "angelsrefining >= 0.11.21",
     "? bobplates >= 0.18.8",
     "? bobassembly >= 0.18.5",
     "? bobrevamp >= 0.18.5"
diff --git a/angelspetrochem/prototypes/global-override/bobplates.lua b/angelspetrochem/prototypes/global-override/bobplates.lua
@@ -285,6 +285,7 @@ if mods["bobplates"] then
     {
       {
         name = "bob-rubber",
+        enabled = false,
         ingredients = {
           {"!!"},
           {type = "item", name = "resin", amount = 3}
@@ -319,6 +320,16 @@ if mods["bobplates"] then
   -- bob electronics
   move_item("insulated-cable", "petrochem-solids", "a[petrochem-solids]-c[rubber]-b")
   OV.patch_recipes({{name = "insulated-cable", subgroup = "petrochem-solids-2", order = "b[rubber]-c[cable]-c"}})
+
+  
+  if mods["bobelectronics"] then --check if it exists first
+    OV.remove_unlock("electronics", "insulated-cable")
+    OV.add_unlock("circuit-network", "insulated-cable")
+    OV.add_unlock("circuit-network", "bob-rubber")
+    if mods["angelsbioprocessing"] then
+      OV.add_prereq("circuit-network", "bio-wood-processing")
+    end
+  end
 end
 
 -------------------------------------------------------------------------------
diff --git a/angelspetrochem/prototypes/override/bobplates.lua b/angelspetrochem/prototypes/override/bobplates.lua
@@ -96,6 +96,7 @@ if mods["bobplates"] then
   --fuel oil balancing
   data.raw.recipe["enriched-fuel-from-liquid-fuel"].ingredients = {{type = "fluid", name = "liquid-fuel", amount = 100}} --up from 20
 end
+
 -------------------------------------------------------------------------------
 -- TECH TREE CLEANUP ----------------------------------------------------------
 -------------------------------------------------------------------------------
diff --git a/angelspetrochem/prototypes/technology/petrochem-solids.lua b/angelspetrochem/prototypes/technology/petrochem-solids.lua
diff --git a/angelsrefining/changelog.txt b/angelsrefining/changelog.txt
diff --git a/angelsrefining/info.json b/angelsrefining/info.json
diff --git a/angelsrefining/prototypes/angels-functions.lua b/angelsrefining/prototypes/angels-functions.lua
diff --git a/angelsrefining/prototypes/recipe-builder-fallbacks.lua b/angelsrefining/prototypes/recipe-builder-fallbacks.lua
diff --git a/angelssmelting/changelog.txt b/angelssmelting/changelog.txt
diff --git a/angelssmelting/data-updates.lua b/angelssmelting/data-updates.lua
diff --git a/angelssmelting/info.json b/angelssmelting/info.json
diff --git a/angelssmelting/prototypes/override/smelting-override-gold.lua b/angelssmelting/prototypes/override/smelting-override-gold.lua
diff --git a/angelssmelting/prototypes/override/smelting-override-silver.lua b/angelssmelting/prototypes/override/smelting-override-silver.lua
diff --git a/angelssmelting/prototypes/technology/smelting-glass.lua b/angelssmelting/prototypes/technology/smelting-glass.lua

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "angelsaddons-mobility",`
`3`		`- "version": "0.0.7",`
	`3`	`+ "version": "0.0.8",`
`4`	`4`	`"factorio_version": "1.1",`
`5`	`5`	`"title": "Angel's Addons - Mass Transit",`
`6`	`6`	`"author": "Arch666Angel, lovely_santa",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "angelsaddons-storage",`
`3`		`- "version": "0.0.5",`
	`3`	`+ "version": "0.0.6",`
`4`	`4`	`"factorio_version": "1.1",`
`5`	`5`	`"title": "Angel's Addons - Storage Options",`
`6`	`6`	`"author": "Arch666Angel",`
`@@ -9,8 +9,7 @@`
`9`	`9`	`"description": "Adds pressure tanks (extremely large tanks), warehouses and silos.",`
`10`	`10`	`"dependencies": [`
`11`	`11`	`"base >= 1.1.33",`
`12`		`-`
`13`		`- "(?) angelsfining",`
`14`		`- "? angelspetrochem >= 0.9.17"`
	`12`	`+ "(?) angelsrefining",`
	`13`	`+ "? angelspetrochem >= 0.9.19"`
`15`	`14`	`]`
`16`	`15`	`}`