Version 1.1.1 Patch 2 (#785)

README.md

@@ -6,7 +6,7 @@
 - IV. [Angel's Metallurgy Smelting](https://forums.factorio.com/viewtopic.php?f=185&t=33566)
 - V. [Angel's Bio Processing](https://forums.factorio.com/viewtopic.php?f=185&t=25469)
 - VI. [Angel's Industries](https://forums.factorio.com/viewtopic.php?f=185&t=58585)
-- VII. Angel's Exploration (Beta)
+- VII. Angel's Exploration (Alpha)
 - VIII. [Angel's Add-ons](https://forums.factorio.com/viewtopic.php?f=185&t=30962)
     - VIII.I. Storage Options
         - [Warehouses](https://forums.factorio.com/viewtopic.php?p=396867#p396867)
@@ -65,7 +65,7 @@ This mod has some new overhaul settings:
 - Component Overhaul (Beta): All the complex machinery does not come out of the blue, add complex chains to create advanced intermediate products for your buildings. There is also an optional setting that will give you the building ingredients back instead of the building itself (without losses), because all these complex machinery is not so trivial to remove efficiently.
 - Technology Overhaul (Alpha): Instead of science packs, use different science analyzers and datacores to research new innovative way to grow your factory.
 
-### VII. Angel's Exploration (Beta)
+### VII. Angel's Exploration (Alpha)
 The alien life forms do not like you as much as you may like them. Add different tiers of biters and new weapons to counter these creatures.
 
 ### VIII. [Angel's Add-ons](https://forums.factorio.com/viewtopic.php?f=185&t=30962)

angelsaddons-mobility/changelog.txt

@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.0.10
+Date: 06.06.2022
+  Bugfixes:
+    - Fixed crash when the localised_description is a hardcoded string (771)
+---------------------------------------------------------------------------------------------------
 Version: 0.0.9
 Date: 10.08.2021
   Features:

angelsaddons-mobility/info.json

@@ -1,6 +1,6 @@
 {
   "name": "angelsaddons-mobility",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "factorio_version": "1.1",
   "title": "Angel's Addons - Mass Transit",
   "author": "Arch666Angel, lovely_santa",

angelsaddons-mobility/prototypes/train-functions.lua

@@ -20,7 +20,10 @@ local function add_speed_locale()
     for _,train in pairs(data.raw[part]) do
       if train then
         if train.localised_description then --add to table
-          --table.insert(train.localised_description,"\n") --ensure new line at start?
+          if type(train.localised_description) == 'string' then
+            train.localised_description = {"", train.localised_description}
+          end
+          table.insert(train.localised_description,"\n") --ensure new line at start
           table.insert(train.localised_description,{"speed-text.speed-cap", train.max_speed*216})
         else-- add new table
           train.localised_description={"speed-text.speed-cap", math.floor(train.max_speed*216*100)/100}--rounded tile/tick converted to km/h

angelsaddons-storage/changelog.txt

@@ -1,9 +1,17 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.0.9
+Date: 06.06.2022
+  Bugfixes:
+    - Fixed technology cost of logistics silos when playing with bobtech
+    - Fixed technology cost of logistics warehouses when playing with bobtech
+    - Added missing setting localisation
+    - Fixed active / passive provider warehouse descriptions
+---------------------------------------------------------------------------------------------------
 Version: 0.0.8
 Date: 19.12.2021
   Bugfixes:
-    - Fixed technology cost of logistics silos when not playing with bobslogisitcs
-    - Fixed technology cost of logistics warehouses when not playing with bobslogisitcs
+    - Fixed technology cost of logistics silos when not playing with bobslogistics
+    - Fixed technology cost of logistics warehouses when not playing with bobslogistics
 ---------------------------------------------------------------------------------------------------
 Version: 0.0.7
 Date: 10.08.2021

angelsaddons-storage/info.json

@@ -1,6 +1,6 @@
 {
   "name": "angelsaddons-storage",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "factorio_version": "1.1",
   "title": "Angel's Addons - Storage Options",
   "author": "Arch666Angel",

angelsaddons-storage/locale/en/storage.cfg

@@ -65,6 +65,7 @@ angels-enable-silos=Enable Angel's silos
 angels-enable-oresilos=Enable Angel's ore themed silos
 angels-enable-warehouses=Enable Angel's warehouses
 angels-enable-pressure-tank=Enable pressure fluid tanks
+angels-enable-inline-tank=Enable small inline tanks
 
 [mod-setting-description]
 angels-enable-storage-icon-scaling=Icons on silos and warehouses scale to size of the silos and warehouses, instead of being small.
@@ -93,8 +94,8 @@ silo-requester=Requests specified items from the logistic network.
 silo-storage=Long-term storage for the logistic network.
 silo-buffer=Requests specified items to be available for personal logistics and automated construction.
 
-angels-warehouse-passive-provider=Sends its content to the logistic network.
-angels-warehouse-active-provider=Makes its content available to the logistic network.
+angels-warehouse-active-provider=Sends its content to the logistic network.
+angels-warehouse-passive-provider=Makes its content available to the logistic network.
 angels-warehouse-storage=Long-term storage for the logistic network.
 angels-warehouse-requester=Requests specified items from the logistic network.
 angels-warehouse-buffer=Requests specified items to be available for personal logistics and automated construction.

angelsaddons-storage/prototypes/overrides/silos.lua

@@ -69,11 +69,17 @@ if angelsmods.industries then
 end
 
 --OVERRIDE FOR BOBS
---LOGISTICS
 if angelsmods.addons.storage.silos then
+  --LOGISTICS
   if mods["boblogistics"] then
   else
     table.insert(data.raw.technology["logistic-silos"].unit.ingredients,
       {type = "item", name = "utility-science-pack", amount = 1})
   end
+
+  --TECHNOLOGY
+  if mods["bobtech"] then
+    table.insert(data.raw.technology["logistic-silos"].unit.ingredients,
+      {type = "item", name = "advanced-logistic-science-pack", amount = 1})
+  end
 end

angelsaddons-storage/prototypes/overrides/warehouses.lua

@@ -23,4 +23,10 @@ if angelsmods.addons.storage.warehouses then
       {type = "item", name = "utility-science-pack", amount = 1})
   end
 
+  --TECHNOLOGY
+  if mods["bobtech"] then
+    table.insert(data.raw.technology["angels-logistic-warehouses"].unit.ingredients,
+      {type = "item", name = "advanced-logistic-science-pack", amount = 1})
+  end
+
 end

angelsbioprocessing/changelog.txt

@@ -1,4 +1,14 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.7.22
+Date: 06.06.2022
+  Changes:
+    - Moved Garden cultivation recipe unlock to a new technology Garden processing 3 #783
+      This recipe exists in case gardens of a particular type do not spawn
+      It is not for duplication of Gardens / Alien plant-life samples
+  Bugfixes:
+    - Polluted fish water from fish breeding was not being included in fluid production graphs #750
+    - Fixed Alien plant life sample recipes in expensive mode were bypassing Alienated fertilizer #783
+---------------------------------------------------------------------------------------------------
 Version: 0.7.21
 Date: 19.12.2021
   Changes:

angelsbioprocessing/data.lua

@@ -19,6 +19,7 @@ if bobmods and bobmods.enemies and data.raw.item["small-alien-artifact-blue"] th
   angelsmods.triggers.artifacts["purple"] = true
   angelsmods.triggers.artifacts["green"] = true
   angelsmods.triggers.artifacts["base"] = true -- pink
+  bobmods.enemies.small_alien_artifacts = true
 end
 --BIO PASTES
 angelsmods.triggers.bio_pastes = angelsmods.triggers.bio_pastes or {}

angelsbioprocessing/info.json

@@ -1,6 +1,6 @@
 {
   "name": "angelsbioprocessing",
-  "version": "0.7.21",
+  "version": "0.7.22",
   "factorio_version": "1.1",
   "title": "Angel's Bioprocessing",
   "author": "Arch666Angel",

angelsbioprocessing/locale/en/bio-processing.cfg

@@ -495,12 +495,12 @@ hogger-breeding-5=EE hogger breeding
 
 fish-keeping-0=Factorian fish petting
 fish-keeping-1=Levac fish petting
-fish-keeping-2=Durflurp jellyfish petting
+fish-keeping-2=Dorflurp jellyfish petting
 fish-keeping-3=Santa ray petting
 
 fish-breeding-0=Factorian fish breeding
 fish-breeding-1=Levac fish breeding
-fish-breeding-2=Durflurp jellyfish breeding
+fish-breeding-2=Dorflurp jellyfish breeding
 fish-breeding-3=Santa ray breeding
 
 biter-small-eggsperiment=Small biter eggsperiment

angelsbioprocessing/prototypes/bio-processing-override.lua

@@ -88,7 +88,7 @@ else
   if bobmods and bobmods.plates then
     OV.patch_recipes(
       {
-        {name = "algae-brown-burning", results = {{"!!"},{name = "lithium-chloride", amount = 1, type = "item"}}}
+        {name = "algae-brown-burning", results = {{"!!"},{name = "solid-lithium", amount = 1, type = "item"}}}
       }
     )
   else

angelsbioprocessing/prototypes/recipes/bio-refugium-fish.lua

@@ -167,7 +167,7 @@ data:extend(
       },
       results = {
         {type = "item", name = "raw-fish", amount_min = 2, amount_max = 4, catalyst_amount = 2},
-        {type = "fluid", name = "liquid-polluted-fish-atmosphere", amount = 100, catalyst_amount = 100}
+        {type = "fluid", name = "liquid-polluted-fish-atmosphere", amount = 100}
         --{type="fluid", name="water-yellow-waste", amount=20},
       },
       icons = {
@@ -198,7 +198,7 @@ data:extend(
       },
       results = {
         {type = "item", name = "alien-fish-1-raw", amount_min = 5, amount_max = 10, catalyst_amount = 2},
-        {type = "fluid", name = "liquid-polluted-fish-atmosphere", amount = 100, catalyst_amount = 100}
+        {type = "fluid", name = "liquid-polluted-fish-atmosphere", amount = 100}
       },
       icons = {
         {
@@ -226,7 +226,7 @@ data:extend(
       },
       results = {
         {type = "item", name = "alien-fish-2-raw", amount_min = 5, amount_max = 10, catalyst_amount = 2},
-        {type = "fluid", name = "liquid-polluted-fish-atmosphere", amount = 100, catalyst_amount = 100}
+        {type = "fluid", name = "liquid-polluted-fish-atmosphere", amount = 100}
       },
       icons = {
         {
@@ -254,7 +254,7 @@ data:extend(
       },
       results = {
         {type = "item", name = "alien-fish-3-raw", amount_min = 5, amount_max = 10, catalyst_amount = 2},
-        {type = "fluid", name = "liquid-polluted-fish-atmosphere", amount = 100, catalyst_amount = 100}
+        {type = "fluid", name = "liquid-polluted-fish-atmosphere", amount = 100}
       },
       icons = {
         {

angelsbioprocessing/prototypes/recipes/crop-farming-gardens.lua

@@ -9,39 +9,19 @@ data:extend(
       name = "temperate-garden-cultivating-a",
       category = "seed-extractor",
       subgroup = "farming-temperate-seed",
-      normal =
+      enabled = false,
+      energy_required = 300,
+      ingredients =
       {
-        enabled = false,
-        energy_required = 300,
-        ingredients =
-        {
-          {type = "item", name = "temperate-garden", amount = 1}
-        },
-        results =
-        {
-          {type = "item", name = "token-bio", amount = 32}
-        },
-        main_product = "token-bio",
-        always_show_products = true,
-        show_amount_in_title = false,
+        {type = "item", name = "temperate-garden", amount = 1}
       },
-      expensive =
+      results =
       {
-        enabled = false,
-        energy_required = 300,
-        ingredients =
-        {
-          {type = "item", name = "temperate-garden", amount = 1}
-        },
-        results =
-        {
-          {type = "item", name = "token-bio", amount = 1, probability = 1 / (2 * intermediatemulti)},
-          {type = "item", name = "temperate-garden", amount = 1, catalyst_amount = 1}
-        },
-        main_product = "token-bio",
-        always_show_products = true,
-        show_amount_in_title = false,
+        {type = "item", name = "token-bio", amount = 32}
       },
+      main_product = "token-bio",
+      always_show_products = true,
+      show_amount_in_title = false,
       icons =
       {
         {
@@ -202,39 +182,19 @@ data:extend(
       name = "desert-garden-cultivating-a",
       category = "seed-extractor",
       subgroup = "farming-desert-seed",
-      normal =
+      enabled = false,
+      energy_required = 300,
+      ingredients =
       {
-        enabled = false,
-        energy_required = 300,
-        ingredients =
-        {
-          {type = "item", name = "desert-garden", amount = 1}
-        },
-        results =
-        {
-          {type = "item", name = "token-bio", amount = 32}
-        },
-        main_product = "token-bio",
-        always_show_products = true,
-        show_amount_in_title = false,
+        {type = "item", name = "desert-garden", amount = 1}
       },
-      expensive =
+      results =
       {
-        enabled = false,
-        energy_required = 300,
-        ingredients =
-        {
-          {type = "item", name = "desert-garden", amount = 1}
-        },
-        results =
-        {
-          {type = "item", name = "token-bio", amount = 1, probability = 1 / (2 * intermediatemulti)},
-          {type = "item", name = "desert-garden", amount = 1, catalyst_amount = 1}
-        },
-        main_product = "token-bio",
-        always_show_products = true,
-        show_amount_in_title = false,
+        {type = "item", name = "token-bio", amount = 32}
       },
+      main_product = "token-bio",
+      always_show_products = true,
+      show_amount_in_title = false,
       icons =
       {
         {
@@ -395,39 +355,19 @@ data:extend(
       name = "swamp-garden-cultivating-a",
       category = "seed-extractor",
       subgroup = "farming-swamp-seed",
-      normal =
+      enabled = false,
+      energy_required = 300,
+      ingredients =
       {
-        enabled = false,
-        energy_required = 300,
-        ingredients =
-        {
-          {type = "item", name = "swamp-garden", amount = 1}
-        },
-        results =
-        {
-          {type = "item", name = "token-bio", amount = 32}
-        },
-        main_product = "token-bio",
-        always_show_products = true,
-        show_amount_in_title = false,
+        {type = "item", name = "swamp-garden", amount = 1}
       },
-      expensive =
+      results =
       {
-        enabled = false,
-        energy_required = 300,
-        ingredients =
-        {
-          {type = "item", name = "swamp-garden", amount = 1}
-        },
-        results =
-        {
-          {type = "item", name = "token-bio", amount = 1, probability = 1 / (2 * intermediatemulti)},
-          {type = "item", name = "swamp-garden", amount = 1, catalyst_amount = 1}
-        },
-        main_product = "token-bio",
-        always_show_products = true,
-        show_amount_in_title = false,
+        {type = "item", name = "token-bio", amount = 32}
       },
+      main_product = "token-bio",
+      always_show_products = true,
+      show_amount_in_title = false,
       icons =
       {
         {