diff --git a/angelsbioprocessing_0.5.9/info.json b/angelsbioprocessing_0.5.9/info.json index 1b96e86..0c294a3 100644 --- a/angelsbioprocessing_0.5.9/info.json +++ b/angelsbioprocessing_0.5.9/info.json @@ -1,7 +1,7 @@ { "name": "angelsbioprocessing", "version": "0.5.9", - "factorio_version": "0.16", + "factorio_version": "0.17", "title": "Angel's Bio Processing [ALPHA UPDATE]", "author": "Arch666Angel", "contact": "", diff --git a/angelsbioprocessing_0.5.9/prototypes/bio-processing-functions.lua b/angelsbioprocessing_0.5.9/prototypes/bio-processing-functions.lua index 6abd551..8fe57c5 100644 --- a/angelsbioprocessing_0.5.9/prototypes/bio-processing-functions.lua +++ b/angelsbioprocessing_0.5.9/prototypes/bio-processing-functions.lua @@ -33,15 +33,15 @@ function angelsmods.functions.modify_trees() --CHECK FOR SINGLE RESULTS if tree.minable.result then --CHECK FOR VANILLA TREES RAW WOOD x 4 - if tree.minable.result == "raw-wood" and tree.minable.count == 4 then - tree.minable = {mining_particle = "wooden-particle", mining_time = 1.5, results = {{type = "item", name = "raw-wood", amount_min = 1, amount_max = 6}}} + if tree.minable.result == "wood" and tree.minable.count == 4 then + tree.minable = {mining_particle = "wooden-particle", mining_time = 1.5, results = {{type = "item", name = "wood", amount_min = 1, amount_max = 6}}} end else --CHECK FOR RESULTS TABLE if tree.minable.results then for k, results in pairs(tree.minable.results) do - --CHECK FOR RESULT RAW-WOOD x 4 - if results.name == "raw-wood" and results.amount == 4 then + --CHECK FOR RESULT WOOD x 4 + if results.name == "wood" and results.amount == 4 then results.amount = nil results.amount_min = 1 results.amount_max = 6 @@ -50,4 +50,4 @@ function angelsmods.functions.modify_trees() end end end -end \ No newline at end of file +end diff --git a/angelsbioprocessing_0.5.9/prototypes/bio-processing-generate.lua b/angelsbioprocessing_0.5.9/prototypes/bio-processing-generate.lua index 2fd35db..14e3418 100644 --- a/angelsbioprocessing_0.5.9/prototypes/bio-processing-generate.lua +++ b/angelsbioprocessing_0.5.9/prototypes/bio-processing-generate.lua @@ -1,4 +1,4 @@ - angelsmods.functions.make_void("raw-wood", "bio") + angelsmods.functions.make_void("wood", "bio") angelsmods.functions.make_void("cellulose-fiber", "bio") angelsmods.functions.make_void("algae-green", "bio") diff --git a/angelsbioprocessing_0.5.9/prototypes/bio-processing-override-bob.lua b/angelsbioprocessing_0.5.9/prototypes/bio-processing-override-bob.lua index d2568cb..76e2f45 100644 --- a/angelsbioprocessing_0.5.9/prototypes/bio-processing-override-bob.lua +++ b/angelsbioprocessing_0.5.9/prototypes/bio-processing-override-bob.lua @@ -8,7 +8,6 @@ data:extend({ name = "alien-pre-artifact-red", icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-red.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-pre", order = "a[alien-pre-artifact-red]", stack_size = 200 @@ -18,7 +17,6 @@ data:extend({ name = "alien-pre-artifact-yellow", icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-yellow.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-pre", order = "b[alien-pre-artifact-yellow]", stack_size = 200 @@ -28,7 +26,6 @@ data:extend({ name = "alien-pre-artifact-orange", icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-orange.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-pre", order = "c[alien-pre-artifact-orange]", stack_size = 200 @@ -38,7 +35,6 @@ data:extend({ name = "alien-pre-artifact-blue", icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-blue.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-pre", order = "d[alien-pre-artifact-blue]", stack_size = 200 @@ -48,7 +44,6 @@ data:extend({ name = "alien-pre-artifact-purple", icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-purple.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-pre", order = "e[alien-pre-artifact-purple]", stack_size = 200 @@ -58,7 +53,6 @@ data:extend({ name = "alien-pre-artifact-green", icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-green.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-pre", order = "f[alien-pre-artifact-green]", stack_size = 200 @@ -68,7 +62,6 @@ data:extend({ name = "alien-pre-artifact-base", icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-base.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-pre", order = "g[alien-pre-artifact-base]", stack_size = 200 @@ -358,4 +351,4 @@ OV.add_unlock("bio-processing-alien", "small-alien-artifact-blue") OV.add_unlock("bio-processing-alien", "small-alien-artifact-purple") OV.add_unlock("bio-processing-alien", "small-alien-artifact-green") OV.add_unlock("bio-processing-alien", "small-alien-artifact") - end \ No newline at end of file + end diff --git a/angelsbioprocessing_0.5.9/prototypes/buildings/aboretum.lua b/angelsbioprocessing_0.5.9/prototypes/buildings/aboretum.lua index ce875d9..8c04e61 100644 --- a/angelsbioprocessing_0.5.9/prototypes/buildings/aboretum.lua +++ b/angelsbioprocessing_0.5.9/prototypes/buildings/aboretum.lua @@ -9,7 +9,6 @@ data:extend( }, }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "bio-processing-buildings-a", order = "e", place_result = "bio-generator-temperate-1", @@ -141,7 +140,6 @@ data:extend( }, }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "bio-processing-buildings-a", order = "e", place_result = "bio-generator-swamp-1", @@ -273,7 +271,6 @@ data:extend( }, }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "bio-processing-buildings-a", order = "e", place_result = "bio-generator-desert-1", @@ -406,7 +403,6 @@ data:extend( }, }, icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "bio-processing-buildings-a", order = "e", place_result = "bio-arboretum-1", diff --git a/angelsbioprocessing_0.5.9/prototypes/buildings/algae-farm.lua b/angelsbioprocessing_0.5.9/prototypes/buildings/algae-farm.lua index 4e8862c..37c4359 100644 --- a/angelsbioprocessing_0.5.9/prototypes/buildings/algae-farm.lua +++ b/angelsbioprocessing_0.5.9/prototypes/buildings/algae-farm.lua @@ -5,7 +5,6 @@ name = "algae-farm", icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "bio-processing-buildings-a", order = "a", place_result = "algae-farm", @@ -112,7 +111,6 @@ name = "algae-farm-2", icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "bio-processing-buildings-a", order = "b", place_result = "algae-farm-2", @@ -216,4 +214,4 @@ pipe_covers = pipecoverspictures() }, } - ) \ No newline at end of file + ) diff --git a/angelsbioprocessing_0.5.9/prototypes/buildings/aliens.lua b/angelsbioprocessing_0.5.9/prototypes/buildings/aliens.lua index d2097d6..55e002c 100644 --- a/angelsbioprocessing_0.5.9/prototypes/buildings/aliens.lua +++ b/angelsbioprocessing_0.5.9/prototypes/buildings/aliens.lua @@ -5,7 +5,6 @@ data:extend( name = "alien-fish-1-raw", icon = "__angelsbioprocessing__/graphics/icons/alien-fish-1.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "raw-resource", capsule_action = { @@ -82,7 +81,6 @@ data:extend( name = "alien-fish-2-raw", icon = "__angelsbioprocessing__/graphics/icons/alien-fish-2.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "raw-resource", capsule_action = { @@ -159,7 +157,6 @@ data:extend( name = "alien-fish-3-raw", icon = "__angelsbioprocessing__/graphics/icons/alien-fish-3.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "raw-resource", capsule_action = { diff --git a/angelsbioprocessing_0.5.9/prototypes/buildings/bio-press.lua b/angelsbioprocessing_0.5.9/prototypes/buildings/bio-press.lua index 8a7a3f7..5d3a854 100644 --- a/angelsbioprocessing_0.5.9/prototypes/buildings/bio-press.lua +++ b/angelsbioprocessing_0.5.9/prototypes/buildings/bio-press.lua @@ -5,7 +5,6 @@ name = "bio-press", icon = "__angelsbioprocessing__/graphics/icons/bio-press.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "bio-processing-buildings-b", order = "a", place_result = "bio-press", @@ -67,4 +66,4 @@ }, }, } - ) \ No newline at end of file + ) diff --git a/angelsbioprocessing_0.5.9/prototypes/buildings/bio-processor.lua b/angelsbioprocessing_0.5.9/prototypes/buildings/bio-processor.lua index b7f2d53..be9c9dd 100644 --- a/angelsbioprocessing_0.5.9/prototypes/buildings/bio-processor.lua +++ b/angelsbioprocessing_0.5.9/prototypes/buildings/bio-processor.lua @@ -5,7 +5,6 @@ name = "bio-processor", icon = "__angelsbioprocessing__/graphics/icons/bio-processor.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "bio-processing-buildings-b", order = "a", place_result = "bio-processor", @@ -73,4 +72,4 @@ }, }, } - ) \ No newline at end of file + ) diff --git a/angelsbioprocessing_0.5.9/prototypes/buildings/butchery.lua b/angelsbioprocessing_0.5.9/prototypes/buildings/butchery.lua index 959ab60..0e0d441 100644 --- a/angelsbioprocessing_0.5.9/prototypes/buildings/butchery.lua +++ b/angelsbioprocessing_0.5.9/prototypes/buildings/butchery.lua @@ -5,7 +5,6 @@ data:extend( name = "bio-butchery", icon = "__angelsbioprocessing__/graphics/icons/bio-butchery.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "bio-processing-buildings-z", order = "a", place_result = "bio-butchery", diff --git a/angelsbioprocessing_0.5.9/prototypes/buildings/composter.lua b/angelsbioprocessing_0.5.9/prototypes/buildings/composter.lua index 6952b9d..fc09f56 100644 --- a/angelsbioprocessing_0.5.9/prototypes/buildings/composter.lua +++ b/angelsbioprocessing_0.5.9/prototypes/buildings/composter.lua @@ -5,7 +5,6 @@ data:extend( name = "composter", icon = "__angelsbioprocessing__/graphics/icons/composter.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "bio-processing-buildings-b", order = "a", place_result = "composter", @@ -86,4 +85,4 @@ data:extend( close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, }, } -) \ No newline at end of file +) diff --git a/angelsbioprocessing_0.5.9/prototypes/buildings/crop-farm.lua b/angelsbioprocessing_0.5.9/prototypes/buildings/crop-farm.lua index 5f96160..a12a0ed 100644 --- a/angelsbioprocessing_0.5.9/prototypes/buildings/crop-farm.lua +++ b/angelsbioprocessing_0.5.9/prototypes/buildings/crop-farm.lua @@ -5,7 +5,6 @@ name = "crop-farm", icon = "__angelsbioprocessing__/graphics/icons/basic-farm.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "bio-processing-buildings-a", order = "e", place_result = "crop-farm", @@ -98,7 +97,6 @@ name = "temperate-farm", icon = "__angelsbioprocessing__/graphics/icons/temperate-farm.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "bio-processing-buildings-a", order = "f", place_result = "temperate-farm", @@ -191,7 +189,6 @@ name = "desert-farm", icon = "__angelsbioprocessing__/graphics/icons/desert-farm.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "bio-processing-buildings-a", order = "g", place_result = "desert-farm", @@ -284,7 +281,6 @@ name = "swamp-farm", icon = "__angelsbioprocessing__/graphics/icons/swamp-farm.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "bio-processing-buildings-a", order = "h", place_result = "swamp-farm", @@ -373,4 +369,4 @@ }, }, } - ) \ No newline at end of file + ) diff --git a/angelsbioprocessing_0.5.9/prototypes/buildings/gardens.lua b/angelsbioprocessing_0.5.9/prototypes/buildings/gardens.lua index 8da98cf..93306d0 100644 --- a/angelsbioprocessing_0.5.9/prototypes/buildings/gardens.lua +++ b/angelsbioprocessing_0.5.9/prototypes/buildings/gardens.lua @@ -5,7 +5,6 @@ data:extend( name = "temperate-garden", icon = "__angelsbioprocessing__/graphics/icons/temperate-garden.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-gardens", order = "a", stack_size = 200 @@ -94,7 +93,6 @@ data:extend( name = "desert-garden", icon = "__angelsbioprocessing__/graphics/icons/desert-garden.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-gardens", order = "b", stack_size = 200 @@ -176,7 +174,6 @@ data:extend( name = "swamp-garden", icon = "__angelsbioprocessing__/graphics/icons/swamp-garden.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-gardens", order = "c", stack_size = 200 diff --git a/angelsbioprocessing_0.5.9/prototypes/buildings/hatchery.lua b/angelsbioprocessing_0.5.9/prototypes/buildings/hatchery.lua index 02d1fc2..aada95a 100644 --- a/angelsbioprocessing_0.5.9/prototypes/buildings/hatchery.lua +++ b/angelsbioprocessing_0.5.9/prototypes/buildings/hatchery.lua @@ -5,7 +5,6 @@ data:extend( name = "bio-hatchery", icon = "__angelsbioprocessing__/graphics/icons/bio-hatchery.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "bio-processing-buildings-z", order = "a", place_result = "bio-hatchery", diff --git a/angelsbioprocessing_0.5.9/prototypes/buildings/nutrient-extractor.lua b/angelsbioprocessing_0.5.9/prototypes/buildings/nutrient-extractor.lua index d3ee12a..5ce7208 100644 --- a/angelsbioprocessing_0.5.9/prototypes/buildings/nutrient-extractor.lua +++ b/angelsbioprocessing_0.5.9/prototypes/buildings/nutrient-extractor.lua @@ -5,7 +5,6 @@ name = "nutrient-extractor", icon = "__angelsbioprocessing__/graphics/icons/nutrient-extractor.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "bio-processing-buildings-b", order = "a", place_result = "nutrient-extractor", @@ -67,4 +66,4 @@ }, }, } - ) \ No newline at end of file + ) diff --git a/angelsbioprocessing_0.5.9/prototypes/buildings/puffer-nest.lua b/angelsbioprocessing_0.5.9/prototypes/buildings/puffer-nest.lua index f518436..a16934b 100644 --- a/angelsbioprocessing_0.5.9/prototypes/buildings/puffer-nest.lua +++ b/angelsbioprocessing_0.5.9/prototypes/buildings/puffer-nest.lua @@ -7,7 +7,6 @@ data:extend( name = "puffer-nest", icon = "__angelsbioprocessing__/graphics/icons/puffer-nest.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-gardens", order = "a", stack_size = 200 diff --git a/angelsbioprocessing_0.5.9/prototypes/buildings/refugium.lua b/angelsbioprocessing_0.5.9/prototypes/buildings/refugium.lua index 08e02aa..4fa8b3e 100644 --- a/angelsbioprocessing_0.5.9/prototypes/buildings/refugium.lua +++ b/angelsbioprocessing_0.5.9/prototypes/buildings/refugium.lua @@ -5,7 +5,6 @@ data:extend( name = "bio-refugium-puffer", icon = "__angelsbioprocessing__/graphics/icons/bio-refugium-puffer.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "bio-processing-buildings-z", order = "a", place_result = "bio-refugium-puffer", @@ -126,7 +125,6 @@ data:extend( name = "bio-refugium-hogger", icon = "__angelsbioprocessing__/graphics/icons/void.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "bio-processing-buildings-z", order = "a", place_result = "bio-refugium-hogger", @@ -204,7 +202,6 @@ data:extend( name = "bio-refugium-fish", icon = "__angelsbioprocessing__/graphics/icons/bio-refugium-fish.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "bio-processing-buildings-z", order = "a", place_result = "bio-refugium-fish", @@ -312,7 +309,6 @@ data:extend( name = "bio-refugium-biter", icon = "__angelsbioprocessing__/graphics/icons/alien-farm.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "bio-processing-buildings-z", order = "a", place_result = "bio-refugium-biter", diff --git a/angelsbioprocessing_0.5.9/prototypes/buildings/seed-extractor.lua b/angelsbioprocessing_0.5.9/prototypes/buildings/seed-extractor.lua index e7fda3f..21f4ba1 100644 --- a/angelsbioprocessing_0.5.9/prototypes/buildings/seed-extractor.lua +++ b/angelsbioprocessing_0.5.9/prototypes/buildings/seed-extractor.lua @@ -5,7 +5,6 @@ data:extend( name = "seed-extractor", icon = "__angelsbioprocessing__/graphics/icons/seed-extractor.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "bio-processing-buildings-b", order = "a", place_result = "seed-extractor", @@ -55,4 +54,4 @@ data:extend( close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 }, }, } -) \ No newline at end of file +) diff --git a/angelsbioprocessing_0.5.9/prototypes/buildings/trees.lua b/angelsbioprocessing_0.5.9/prototypes/buildings/trees.lua index ab6f0c8..d53d4c9 100644 --- a/angelsbioprocessing_0.5.9/prototypes/buildings/trees.lua +++ b/angelsbioprocessing_0.5.9/prototypes/buildings/trees.lua @@ -5,7 +5,6 @@ data:extend( name = "temperate-tree", icon = "__angelsbioprocessing__/graphics/icons/tree-temperate.png", icon_size = 64, - flags = {"goes-to-main-inventory"}, subgroup = "bio-aboretum", order = "a", stack_size = 10 @@ -21,7 +20,7 @@ data:extend( mining_particle = "wooden-particle", mining_time = 1, results = { - {type = "item", name = "raw-wood", amount = 100}, + {type = "item", name = "wood", amount = 100}, {type = "item", name = "temperate-tree", amount = 1}, } }, @@ -76,7 +75,6 @@ data:extend( name = "swamp-tree", icon = "__angelsbioprocessing__/graphics/icons/tree-swamp.png", icon_size = 64, - flags = {"goes-to-main-inventory"}, subgroup = "bio-aboretum", order = "b", stack_size = 10 @@ -92,7 +90,7 @@ data:extend( mining_particle = "wooden-particle", mining_time = 1, results = { - {type = "item", name = "raw-wood", amount = 100}, + {type = "item", name = "wood", amount = 100}, {type = "item", name = "swamp-tree", amount = 1}, } }, @@ -153,7 +151,6 @@ data:extend( name = "desert-tree", icon = "__angelsbioprocessing__/graphics/icons/tree-desert.png", icon_size = 64, - flags = {"goes-to-main-inventory"}, subgroup = "bio-aboretum", order = "b", stack_size = 10 @@ -169,7 +166,7 @@ data:extend( mining_particle = "wooden-particle", mining_time = 1, results = { - {type = "item", name = "raw-wood", amount = 100}, + {type = "item", name = "wood", amount = 100}, {type = "item", name = "desert-tree", amount = 1}, } }, diff --git a/angelsbioprocessing_0.5.9/prototypes/items/bio-processing-algae.lua b/angelsbioprocessing_0.5.9/prototypes/items/bio-processing-algae.lua index a7bedc4..5783abd 100644 --- a/angelsbioprocessing_0.5.9/prototypes/items/bio-processing-algae.lua +++ b/angelsbioprocessing_0.5.9/prototypes/items/bio-processing-algae.lua @@ -6,7 +6,6 @@ data:extend( name = "algae-brown", icon = "__angelsbioprocessing__/graphics/icons/algae-brown.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-brown", order = "a[algae-brown]", stack_size = 200 @@ -16,7 +15,6 @@ data:extend( name = "solid-alginic-acid", icon = "__angelsbioprocessing__/graphics/icons/solid-alginic-acid.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-brown", order = "b[solid-alginic-acid]", stack_size = 200 @@ -27,7 +25,6 @@ data:extend( name = "algae-green", icon = "__angelsbioprocessing__/graphics/icons/algae-green.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-green", order = "a[algae-green]", stack_size = 200 @@ -37,7 +34,6 @@ data:extend( name = "paste-cellulose", icon = "__angelsbioprocessing__/graphics/icons/paste-cellulose.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-green", order = "c[paste-cellulose]", stack_size = 200 @@ -48,7 +44,6 @@ data:extend( name = "algae-blue", icon = "__angelsbioprocessing__/graphics/icons/algae-blue.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-blue", order = "a[algae-blue]", stack_size = 200 @@ -58,7 +53,6 @@ data:extend( name = "blue-cellulose-fiber", icon = "__angelsbioprocessing__/graphics/icons/blue-cellulose-fiber.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-blue", order = "b[blue-cellulose-fiber]", stack_size = 200 @@ -69,7 +63,6 @@ data:extend( name = "algae-red", icon = "__angelsbioprocessing__/graphics/icons/algae-red.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-red", order = "a[algae-red]", stack_size = 200 @@ -79,7 +72,6 @@ data:extend( name = "red-cellulose-fiber", icon = "__angelsbioprocessing__/graphics/icons/red-cellulose-fiber.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-red", order = "b[red-cellulose-fiber]", stack_size = 200 @@ -89,10 +81,9 @@ data:extend( name = "solid-calcium-carbonate", icon = "__angelsbioprocessing__/graphics/icons/solid-calcium-carbonate.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-red", order = "c[solid-calcium-carbonate]", stack_size = 200 }, } -) \ No newline at end of file +) diff --git a/angelsbioprocessing_0.5.9/prototypes/items/bio-processing-alien.lua b/angelsbioprocessing_0.5.9/prototypes/items/bio-processing-alien.lua index 5114989..5092efd 100644 --- a/angelsbioprocessing_0.5.9/prototypes/items/bio-processing-alien.lua +++ b/angelsbioprocessing_0.5.9/prototypes/items/bio-processing-alien.lua @@ -18,7 +18,6 @@ data:extend( name = "alien-bacteria", icon = "__angelsbioprocessing__/graphics/icons/alien-bacteria.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "a[alien-bacteria]", stack_size = 200 @@ -41,7 +40,6 @@ data:extend( name = "petri-dish", icon = "__angelsbioprocessing__/graphics/icons/petri-dish.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "b[petri-dish]", stack_size = 200 @@ -51,7 +49,6 @@ data:extend( name = "substrate-dish", icon = "__angelsbioprocessing__/graphics/icons/substrate-dish.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c[substrate-dish]", stack_size = 200 @@ -61,7 +58,6 @@ data:extend( name = "seeded-dish", icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -71,7 +67,6 @@ data:extend( name = "crystal-seed", icon = "__angelsbioprocessing__/graphics/icons/crystal-seed.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -81,7 +76,6 @@ data:extend( name = "crystal-enhancer", icon = "__angelsbioprocessing__/graphics/icons/crystal-enhancer.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -91,7 +85,6 @@ data:extend( name = "crystal-powder", icon = "__angelsbioprocessing__/graphics/icons/crystal-powder.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -101,7 +94,6 @@ data:extend( name = "crystal-splinter-raw", icon = "__angelsbioprocessing__/graphics/icons/crystal-splinter-raw.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -111,7 +103,6 @@ data:extend( name = "crystal-shard-raw", icon = "__angelsbioprocessing__/graphics/icons/crystal-shard-raw.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -121,7 +112,6 @@ data:extend( name = "crystal-full-raw", icon = "__angelsbioprocessing__/graphics/icons/crystal-full-raw.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -131,7 +121,6 @@ data:extend( name = "crystal-splinter-blue-cut", icon = "__angelsbioprocessing__/graphics/icons/crystal-splinter-blue.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -141,7 +130,6 @@ data:extend( name = "crystal-splinter-red-cut", icon = "__angelsbioprocessing__/graphics/icons/crystal-splinter-red.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -151,7 +139,6 @@ data:extend( name = "crystal-splinter-green-cut", icon = "__angelsbioprocessing__/graphics/icons/crystal-splinter-green.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -161,7 +148,6 @@ data:extend( name = "crystal-shard-blue-cut", icon = "__angelsbioprocessing__/graphics/icons/crystal-shard-blue.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -171,7 +157,6 @@ data:extend( name = "crystal-shard-red-cut", icon = "__angelsbioprocessing__/graphics/icons/crystal-shard-red.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -181,7 +166,6 @@ data:extend( name = "crystal-shard-green-cut", icon = "__angelsbioprocessing__/graphics/icons/crystal-shard-green.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -191,7 +175,6 @@ data:extend( name = "crystal-full-blue-cut", icon = "__angelsbioprocessing__/graphics/icons/crystal-full-blue.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -201,7 +184,6 @@ data:extend( name = "crystal-full-red-cut", icon = "__angelsbioprocessing__/graphics/icons/crystal-full-red.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -211,7 +193,6 @@ data:extend( name = "crystal-full-green-cut", icon = "__angelsbioprocessing__/graphics/icons/crystal-full-green.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -221,7 +202,6 @@ data:extend( name = "crystal-splinter-blue", icon = "__angelsbioprocessing__/graphics/icons/crystal-splinter-blue.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -231,7 +211,6 @@ data:extend( name = "crystal-splinter-red", icon = "__angelsbioprocessing__/graphics/icons/crystal-splinter-red.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -241,7 +220,6 @@ data:extend( name = "crystal-splinter-green", icon = "__angelsbioprocessing__/graphics/icons/crystal-splinter-green.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -251,7 +229,6 @@ data:extend( name = "crystal-shard-blue", icon = "__angelsbioprocessing__/graphics/icons/crystal-shard-blue.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -261,7 +238,6 @@ data:extend( name = "crystal-shard-red", icon = "__angelsbioprocessing__/graphics/icons/crystal-shard-red.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -271,7 +247,6 @@ data:extend( name = "crystal-shard-green", icon = "__angelsbioprocessing__/graphics/icons/crystal-shard-green.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -281,7 +256,6 @@ data:extend( name = "crystal-full-blue", icon = "__angelsbioprocessing__/graphics/icons/crystal-full-blue.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -291,7 +265,6 @@ data:extend( name = "crystal-full-red", icon = "__angelsbioprocessing__/graphics/icons/crystal-full-red.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -301,7 +274,6 @@ data:extend( name = "crystal-full-green", icon = "__angelsbioprocessing__/graphics/icons/crystal-full-green.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -311,7 +283,6 @@ data:extend( name = "crystal-full-harmonic", icon = "__angelsbioprocessing__/graphics/icons/crystal-full-harmonic.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -321,7 +292,6 @@ data:extend( name = "biter-small-egg", icon = "__angelsbioprocessing__/graphics/icons/egg-small.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -331,7 +301,6 @@ data:extend( name = "biter-medium-egg", icon = "__angelsbioprocessing__/graphics/icons/egg-medium.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -341,7 +310,6 @@ data:extend( name = "biter-big-egg", icon = "__angelsbioprocessing__/graphics/icons/egg-large.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -351,7 +319,6 @@ data:extend( name = "biter-small", icon = "__angelsbioprocessing__/graphics/icons/biter-small.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -361,7 +328,6 @@ data:extend( name = "biter-medium", icon = "__angelsbioprocessing__/graphics/icons/biter-medium.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -371,7 +337,6 @@ data:extend( name = "biter-big", icon = "__angelsbioprocessing__/graphics/icons/biter-big.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 @@ -381,7 +346,6 @@ data:extend( name = "crystal-grindstone", icon = "__angelsbioprocessing__/graphics/icons/crystal-grindstone.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "c", stack_size = 200 diff --git a/angelsbioprocessing_0.5.9/prototypes/items/bio-processing-paste.lua b/angelsbioprocessing_0.5.9/prototypes/items/bio-processing-paste.lua index 0266373..584899f 100644 --- a/angelsbioprocessing_0.5.9/prototypes/items/bio-processing-paste.lua +++ b/angelsbioprocessing_0.5.9/prototypes/items/bio-processing-paste.lua @@ -6,7 +6,6 @@ data:extend( name = "paste-cobalt", icon = "__angelsbioprocessing__/graphics/icons/paste-cobalt.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-paste", order = "a[paste-cobalt]", stack_size = 200 @@ -16,7 +15,6 @@ data:extend( name = "paste-copper", icon = "__angelsbioprocessing__/graphics/icons/paste-copper.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-paste", order = "a[paste-copper]", stack_size = 200 @@ -26,7 +24,6 @@ data:extend( name = "paste-gold", icon = "__angelsbioprocessing__/graphics/icons/paste-gold.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-paste", order = "a[paste-gold]", stack_size = 200 @@ -36,7 +33,6 @@ data:extend( name = "paste-iron", icon = "__angelsbioprocessing__/graphics/icons/paste-iron.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-paste", order = "a[paste-iron]", stack_size = 200 @@ -46,7 +42,6 @@ data:extend( name = "paste-silver", icon = "__angelsbioprocessing__/graphics/icons/paste-silver.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-paste", order = "a[paste-silver]", stack_size = 200 @@ -56,7 +51,6 @@ data:extend( name = "paste-titanium", icon = "__angelsbioprocessing__/graphics/icons/paste-titanium.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-paste", order = "a[paste-titanium]", stack_size = 200 @@ -66,7 +60,6 @@ data:extend( name = "paste-tungsten", icon = "__angelsbioprocessing__/graphics/icons/paste-tungsten.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-paste", order = "a[paste-tungsten]", stack_size = 200 @@ -76,10 +69,9 @@ data:extend( name = "paste-zinc", icon = "__angelsbioprocessing__/graphics/icons/paste-zinc.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-paste", order = "a[paste-zinc]", stack_size = 200 }, } -) \ No newline at end of file +) diff --git a/angelsbioprocessing_0.5.9/prototypes/items/bio-processing-wood-paper.lua b/angelsbioprocessing_0.5.9/prototypes/items/bio-processing-wood-paper.lua index ee1d58f..4d92798 100644 --- a/angelsbioprocessing_0.5.9/prototypes/items/bio-processing-wood-paper.lua +++ b/angelsbioprocessing_0.5.9/prototypes/items/bio-processing-wood-paper.lua @@ -5,7 +5,6 @@ data:extend( name = "circuit-wood-fiber-board", icon = "__angelsbioprocessing__/graphics/icons/wood-fiber-board.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-wood", order = "c[circuit-wood-fiber-board]", stack_size = 200, @@ -15,7 +14,6 @@ data:extend( name = "cellulose-fiber", icon = "__angelsbioprocessing__/graphics/icons/cellulose-fiber.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-wood", order = "b[cellulose-fiber]", fuel_category = "chemical", @@ -27,7 +25,6 @@ data:extend( name = "wood-pellets", icon = "__angelsbioprocessing__/graphics/icons/wood-pellets.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-wood", order = "d[wood-pellets]", fuel_category = "chemical", @@ -39,7 +36,6 @@ data:extend( name = "wood-bricks", icon = "__angelsbioprocessing__/graphics/icons/wood-bricks.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-wood", order = "e[wood-bricks]", fuel_category = "chemical", @@ -51,7 +47,6 @@ data:extend( name = "solid-wood-pulp", icon = "__angelsbioprocessing__/graphics/icons/solid-wood-pulp.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-paper", order = "c[circuit-wood-fiber-board]", stack_size = 200, @@ -126,7 +121,6 @@ data:extend( name = "solid-paper", icon = "__angelsbioprocessing__/graphics/icons/solid-paper.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-paper", order = "c[circuit-wood-fiber-board]", stack_size = 200, @@ -136,7 +130,6 @@ data:extend( name = "bio-resin", icon = "__angelsbioprocessing__/graphics/icons/solid-bio-resin.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-aboretum", order = "a", stack_size = 200, @@ -146,7 +139,6 @@ data:extend( name = "bio-plastic", icon = "__angelsbioprocessing__/graphics/icons/solid-bio-plastic.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-aboretum", order = "b", stack_size = 200, @@ -156,7 +148,6 @@ data:extend( name = "bio-rubber", icon = "__angelsbioprocessing__/graphics/icons/solid-bio-rubber.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-aboretum", order = "b", stack_size = 200, @@ -166,7 +157,6 @@ data:extend( name = "tree-seed", icon = "__angelsbioprocessing__/graphics/icons/tree-seed.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-aboretum", order = "b", stack_size = 200, @@ -176,7 +166,6 @@ data:extend( name = "tree-temperate-seed", icon = "__angelsbioprocessing__/graphics/icons/tree-temperate-seed.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-aboretum", order = "b", stack_size = 200, @@ -186,7 +175,6 @@ data:extend( name = "tree-swamp-seed", icon = "__angelsbioprocessing__/graphics/icons/tree-swamp-seed.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-aboretum", order = "b", stack_size = 200, @@ -196,7 +184,6 @@ data:extend( name = "tree-desert-seed", icon = "__angelsbioprocessing__/graphics/icons/tree-desert-seed.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-aboretum", order = "b", stack_size = 200, diff --git a/angelsbioprocessing_0.5.9/prototypes/items/bio-refugium.lua b/angelsbioprocessing_0.5.9/prototypes/items/bio-refugium.lua index 2f39eda..fd6fd56 100644 --- a/angelsbioprocessing_0.5.9/prototypes/items/bio-refugium.lua +++ b/angelsbioprocessing_0.5.9/prototypes/items/bio-refugium.lua @@ -18,7 +18,6 @@ data:extend( name = "bio-puffer-1", icon = "__angelsbioprocessing__/graphics/icons/puffer-1-icon.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-puffer", order = "a", stack_size = 200, @@ -28,7 +27,6 @@ data:extend( name = "bio-puffer-egg-1", icon = "__angelsbioprocessing__/graphics/icons/puffer-1-egg.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-puffer-egg", order = "a", stack_size = 200, @@ -38,7 +36,6 @@ data:extend( name = "bio-puffer-2", icon = "__angelsbioprocessing__/graphics/icons/puffer-2-icon.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-puffer", order = "b", stack_size = 200, @@ -48,7 +45,6 @@ data:extend( name = "bio-puffer-egg-2", icon = "__angelsbioprocessing__/graphics/icons/puffer-2-egg.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-puffer-egg", order = "b", stack_size = 200, @@ -58,7 +54,6 @@ data:extend( name = "bio-puffer-3", icon = "__angelsbioprocessing__/graphics/icons/puffer-3-icon.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-puffer", order = "c", stack_size = 200, @@ -68,7 +63,6 @@ data:extend( name = "bio-puffer-egg-3", icon = "__angelsbioprocessing__/graphics/icons/puffer-3-egg.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-puffer-egg", order = "c", stack_size = 200, @@ -78,7 +72,6 @@ data:extend( name = "bio-puffer-4", icon = "__angelsbioprocessing__/graphics/icons/puffer-4-icon.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-puffer", order = "d", stack_size = 200, @@ -88,7 +81,6 @@ data:extend( name = "bio-puffer-egg-4", icon = "__angelsbioprocessing__/graphics/icons/puffer-4-egg.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-puffer-egg", order = "d", stack_size = 200, @@ -98,7 +90,6 @@ data:extend( name = "bio-puffer-5", icon = "__angelsbioprocessing__/graphics/icons/puffer-5-icon.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-puffer", order = "e", stack_size = 200, @@ -108,7 +99,6 @@ data:extend( name = "bio-puffer-egg-5", icon = "__angelsbioprocessing__/graphics/icons/puffer-5-egg.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-puffer-egg", order = "e", stack_size = 200, @@ -119,7 +109,6 @@ data:extend( name = "bio-hogger-1", icon = "__angelsbioprocessing__/graphics/icons/hogger-1-icon.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-hogger", order = "a", stack_size = 200, @@ -129,7 +118,6 @@ data:extend( name = "bio-hogger-2", icon = "__angelsbioprocessing__/graphics/icons/hogger-2-icon.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-hogger", order = "b", stack_size = 200, @@ -139,7 +127,6 @@ data:extend( name = "bio-hogger-3", icon = "__angelsbioprocessing__/graphics/icons/hogger-3-icon.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-hogger", order = "c", stack_size = 200, @@ -149,7 +136,6 @@ data:extend( name = "bio-hogger-4", icon = "__angelsbioprocessing__/graphics/icons/hogger-4-icon.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-hogger", order = "d", stack_size = 200, @@ -159,7 +145,6 @@ data:extend( name = "bio-hogger-5", icon = "__angelsbioprocessing__/graphics/icons/hogger-5-icon.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-hogger", order = "e", stack_size = 200, @@ -170,7 +155,6 @@ data:extend( name = "bio-raw-meat", icon = "__angelsbioprocessing__/graphics/icons/raw-meat.png", icon_size = 32, - flags = {"goes-to-quickbar"}, subgroup = "bio-puffer-egg", capsule_action = { diff --git a/angelsbioprocessing_0.5.9/prototypes/items/crop-farming-processing.lua b/angelsbioprocessing_0.5.9/prototypes/items/crop-farming-processing.lua index 0386fcb..63b6fdc 100644 --- a/angelsbioprocessing_0.5.9/prototypes/items/crop-farming-processing.lua +++ b/angelsbioprocessing_0.5.9/prototypes/items/crop-farming-processing.lua @@ -6,7 +6,6 @@ data:extend( name = "solid-beans", icon = "__angelsbioprocessing__/graphics/icons/solid-beans.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processor-temperate", order = "a", stack_size = 500 @@ -16,7 +15,6 @@ data:extend( name = "solid-corn", icon = "__angelsbioprocessing__/graphics/icons/solid-corn.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processor-temperate", order = "b", stack_size = 500 @@ -26,7 +24,6 @@ data:extend( name = "solid-leafs", icon = "__angelsbioprocessing__/graphics/icons/solid-leafs.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processor-temperate", order = "c", stack_size = 500 @@ -36,7 +33,6 @@ data:extend( name = "solid-nuts", icon = "__angelsbioprocessing__/graphics/icons/solid-nuts.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processor-temperate", order = "d", stack_size = 500 @@ -46,7 +42,6 @@ data:extend( name = "solid-pips", icon = "__angelsbioprocessing__/graphics/icons/solid-pips.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processor-temperate", order = "e", stack_size = 500 @@ -56,7 +51,6 @@ data:extend( name = "solid-fruit", icon = "__angelsbioprocessing__/graphics/icons/solid-fruit.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processor-temperate", order = "f", stack_size = 500 @@ -105,7 +99,6 @@ data:extend( name = "solid-flour", icon = "__angelsbioprocessing__/graphics/icons/solid-flour.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processor-temperate", order = "g", stack_size = 500 @@ -215,4 +208,4 @@ data:extend( flow_to_energy_ratio = 0.59, }, } -) \ No newline at end of file +) diff --git a/angelsbioprocessing_0.5.9/prototypes/items/crop-farming.lua b/angelsbioprocessing_0.5.9/prototypes/items/crop-farming.lua index e9e40d2..7a0b103 100644 --- a/angelsbioprocessing_0.5.9/prototypes/items/crop-farming.lua +++ b/angelsbioprocessing_0.5.9/prototypes/items/crop-farming.lua @@ -6,7 +6,6 @@ data:extend( name = "solid-compost", icon = "__angelsbioprocessing__/graphics/icons/solid-compost.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-gardens", order = "d", stack_size = 500 @@ -16,7 +15,6 @@ data:extend( name = "solid-soil", icon = "__angelsbioprocessing__/graphics/icons/solid-soil.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-gardens", order = "e", stack_size = 500 @@ -26,7 +24,6 @@ data:extend( name = "solid-fertilizer", icon = "__angelsbioprocessing__/graphics/icons/solid-fertilizer.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-gardens", order = "f", stack_size = 500 @@ -36,7 +33,6 @@ data:extend( name = "token-bio", icon = "__angelsbioprocessing__/graphics/icons/token-bio.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-gardens", order = "g", stack_size = 200, @@ -50,7 +46,6 @@ data:extend( name = "temperate-upgrade", icon = "__angelsbioprocessing__/graphics/icons/temperate-upgrade.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-blocks", order = "a", stack_size = 200 @@ -60,7 +55,6 @@ data:extend( name = "desert-upgrade", icon = "__angelsbioprocessing__/graphics/icons/desert-upgrade.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-blocks", order = "b", stack_size = 200 @@ -70,7 +64,6 @@ data:extend( name = "swamp-upgrade", icon = "__angelsbioprocessing__/graphics/icons/swamp-upgrade.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-blocks", order = "c", stack_size = 200 @@ -81,7 +74,6 @@ data:extend( name = "temperate-1", icon = "__angelsbioprocessing__/graphics/icons/temperate-1.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-temperate", order = "a", stack_size = 500 @@ -91,7 +83,6 @@ data:extend( name = "temperate-1-seed", icon = "__angelsbioprocessing__/graphics/icons/temperate-1-seed.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-temperate", order = "b", stack_size = 500 @@ -101,7 +92,6 @@ data:extend( name = "temperate-2", icon = "__angelsbioprocessing__/graphics/icons/temperate-2.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-temperate", order = "c", stack_size = 500 @@ -111,7 +101,6 @@ data:extend( name = "temperate-2-seed", icon = "__angelsbioprocessing__/graphics/icons/temperate-2-seed.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-temperate", order = "d", stack_size = 500 @@ -121,7 +110,6 @@ data:extend( name = "temperate-3", icon = "__angelsbioprocessing__/graphics/icons/temperate-3.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-temperate", order = "e", stack_size = 500 @@ -131,7 +119,6 @@ data:extend( name = "temperate-3-seed", icon = "__angelsbioprocessing__/graphics/icons/temperate-3-seed.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-temperate", order = "f", stack_size = 500 @@ -141,7 +128,6 @@ data:extend( name = "temperate-3-seed-dormant", icon = "__angelsbioprocessing__/graphics/icons/temperate-3-seed-dormant.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-temperate", order = "f", stack_size = 500 @@ -151,7 +137,6 @@ data:extend( name = "temperate-4", icon = "__angelsbioprocessing__/graphics/icons/temperate-4.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-temperate", order = "g", stack_size = 500 @@ -161,7 +146,6 @@ data:extend( name = "temperate-4-seed", icon = "__angelsbioprocessing__/graphics/icons/temperate-4-seed.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-temperate", order = "h", stack_size = 500 @@ -171,7 +155,6 @@ data:extend( name = "temperate-4-seed-dormant", icon = "__angelsbioprocessing__/graphics/icons/temperate-4-seed-dormant.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-temperate", order = "h", stack_size = 500 @@ -181,7 +164,6 @@ data:extend( name = "temperate-5", icon = "__angelsbioprocessing__/graphics/icons/temperate-5.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-temperate", order = "i", stack_size = 500 @@ -191,7 +173,6 @@ data:extend( name = "temperate-5-seed", icon = "__angelsbioprocessing__/graphics/icons/temperate-5-seed.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-temperate", order = "j", stack_size = 500 @@ -201,7 +182,6 @@ data:extend( name = "temperate-5-seed-dormant", icon = "__angelsbioprocessing__/graphics/icons/temperate-5-seed-dormant.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-temperate", order = "j", stack_size = 500 @@ -212,7 +192,6 @@ data:extend( name = "desert-1", icon = "__angelsbioprocessing__/graphics/icons/desert-1.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-desert", order = "a", stack_size = 500 @@ -222,7 +201,6 @@ data:extend( name = "desert-1-seed", icon = "__angelsbioprocessing__/graphics/icons/desert-1-seed.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-desert", order = "b", stack_size = 500 @@ -232,7 +210,6 @@ data:extend( name = "desert-2", icon = "__angelsbioprocessing__/graphics/icons/desert-2.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-desert", order = "c", stack_size = 500 @@ -242,7 +219,6 @@ data:extend( name = "desert-2-seed", icon = "__angelsbioprocessing__/graphics/icons/desert-2-seed.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-desert", order = "d", stack_size = 500 @@ -252,7 +228,6 @@ data:extend( name = "desert-3", icon = "__angelsbioprocessing__/graphics/icons/desert-3.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-desert", order = "e", stack_size = 500 @@ -262,7 +237,6 @@ data:extend( name = "desert-3-seed", icon = "__angelsbioprocessing__/graphics/icons/desert-3-seed.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-desert", order = "f", stack_size = 500 @@ -272,7 +246,6 @@ data:extend( name = "desert-3-seed-dormant", icon = "__angelsbioprocessing__/graphics/icons/desert-3-seed-dormant.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-desert", order = "f", stack_size = 500 @@ -282,7 +255,6 @@ data:extend( name = "desert-4", icon = "__angelsbioprocessing__/graphics/icons/desert-4.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-desert", order = "g", stack_size = 500 @@ -292,7 +264,6 @@ data:extend( name = "desert-4-seed", icon = "__angelsbioprocessing__/graphics/icons/desert-4-seed.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-desert", order = "h", stack_size = 500 @@ -302,7 +273,6 @@ data:extend( name = "desert-4-seed-dormant", icon = "__angelsbioprocessing__/graphics/icons/desert-4-seed-dormant.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-desert", order = "h", stack_size = 500 @@ -312,7 +282,6 @@ data:extend( name = "desert-5", icon = "__angelsbioprocessing__/graphics/icons/desert-5.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-desert", order = "i", stack_size = 500 @@ -322,7 +291,6 @@ data:extend( name = "desert-5-seed", icon = "__angelsbioprocessing__/graphics/icons/desert-5-seed.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-desert", order = "j", stack_size = 500 @@ -332,7 +300,6 @@ data:extend( name = "desert-5-seed-dormant", icon = "__angelsbioprocessing__/graphics/icons/desert-5-seed-dormant.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-desert", order = "j", stack_size = 500 @@ -343,7 +310,6 @@ data:extend( name = "swamp-1", icon = "__angelsbioprocessing__/graphics/icons/swamp-1.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-swamp", order = "a", stack_size = 500 @@ -353,7 +319,6 @@ data:extend( name = "swamp-1-seed", icon = "__angelsbioprocessing__/graphics/icons/swamp-1-seed.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-swamp", order = "b", stack_size = 500 @@ -363,7 +328,6 @@ data:extend( name = "swamp-2", icon = "__angelsbioprocessing__/graphics/icons/swamp-2.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-swamp", order = "c", stack_size = 500 @@ -373,7 +337,6 @@ data:extend( name = "swamp-2-seed", icon = "__angelsbioprocessing__/graphics/icons/swamp-2-seed.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-swamp", order = "d", stack_size = 500 @@ -383,7 +346,6 @@ data:extend( name = "swamp-3", icon = "__angelsbioprocessing__/graphics/icons/swamp-3.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-swamp", order = "e", stack_size = 500 @@ -393,7 +355,6 @@ data:extend( name = "swamp-3-seed", icon = "__angelsbioprocessing__/graphics/icons/swamp-3-seed.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-swamp", order = "f", stack_size = 500 @@ -403,7 +364,6 @@ data:extend( name = "swamp-3-seed-dormant", icon = "__angelsbioprocessing__/graphics/icons/swamp-3-seed-dormant.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-swamp", order = "f", stack_size = 500 @@ -413,7 +373,6 @@ data:extend( name = "swamp-4", icon = "__angelsbioprocessing__/graphics/icons/swamp-4.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-swamp", order = "g", stack_size = 500 @@ -423,7 +382,6 @@ data:extend( name = "swamp-4-seed", icon = "__angelsbioprocessing__/graphics/icons/swamp-4-seed.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-swamp", order = "h", stack_size = 500 @@ -433,7 +391,6 @@ data:extend( name = "swamp-4-seed-dormant", icon = "__angelsbioprocessing__/graphics/icons/swamp-4-seed-dormant.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-swamp", order = "h", stack_size = 500 @@ -443,7 +400,6 @@ data:extend( name = "swamp-5", icon = "__angelsbioprocessing__/graphics/icons/swamp-5.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-swamp", order = "i", stack_size = 500 @@ -453,7 +409,6 @@ data:extend( name = "swamp-5-seed", icon = "__angelsbioprocessing__/graphics/icons/swamp-5-seed.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-swamp", order = "j", stack_size = 500 @@ -463,7 +418,6 @@ data:extend( name = "swamp-5-seed-dormant", icon = "__angelsbioprocessing__/graphics/icons/swamp-5-seed-dormant.png", icon_size = 32, - flags = {"goes-to-main-inventory"}, subgroup = "farming-swamp", order = "j", stack_size = 500 diff --git a/angelsbioprocessing_0.5.9/prototypes/recipes/bio-processing-wood-paper.lua b/angelsbioprocessing_0.5.9/prototypes/recipes/bio-processing-wood-paper.lua index f31b4fc..009e737 100644 --- a/angelsbioprocessing_0.5.9/prototypes/recipes/bio-processing-wood-paper.lua +++ b/angelsbioprocessing_0.5.9/prototypes/recipes/bio-processing-wood-paper.lua @@ -8,7 +8,7 @@ data:extend( enabled = "false", energy_required = 2, ingredients ={ - {type="item", name="raw-wood", amount=1}, + {type="item", name="wood", amount=1}, }, results= { @@ -518,11 +518,11 @@ data:extend( }, results= { - {type="item", name="raw-wood", amount=26}, + {type="item", name="wood", amount=26}, }, icons = { { - icon = "__base__/graphics/icons/raw-wood.png", + icon = "__base__/graphics/icons/wood.png", }, { icon = "__angelspetrochem__/graphics/icons/num_1.png", @@ -553,11 +553,11 @@ data:extend( }, results= { - {type="item", name="raw-wood", amount=35}, + {type="item", name="wood", amount=35}, }, icons = { { - icon = "__base__/graphics/icons/raw-wood.png", + icon = "__base__/graphics/icons/wood.png", }, { icon = "__angelspetrochem__/graphics/icons/num_2.png", @@ -588,11 +588,11 @@ data:extend( }, results= { - {type="item", name="raw-wood", amount=52}, + {type="item", name="wood", amount=52}, }, icons = { { - icon = "__base__/graphics/icons/raw-wood.png", + icon = "__base__/graphics/icons/wood.png", }, { icon = "__angelspetrochem__/graphics/icons/num_3.png", @@ -716,7 +716,7 @@ data:extend( results= { {type="item", name="bio-resin", amount=2}, - {type="item", name="raw-wood", amount=10}, + {type="item", name="wood", amount=10}, }, icons = { { @@ -752,7 +752,7 @@ data:extend( results= { {type="item", name="bio-resin", amount=4}, - {type="item", name="raw-wood", amount=10}, + {type="item", name="wood", amount=10}, }, icons = { { @@ -921,7 +921,7 @@ data:extend( results= { {type="item", name="bio-plastic", amount=2}, - {type="item", name="raw-wood", amount=10}, + {type="item", name="wood", amount=10}, }, icons = { { @@ -957,7 +957,7 @@ data:extend( results= { {type="item", name="bio-plastic", amount=4}, - {type="item", name="raw-wood", amount=10}, + {type="item", name="wood", amount=10}, }, icons = { { @@ -1126,7 +1126,7 @@ data:extend( results= { {type="item", name="bio-rubber", amount=2}, - {type="item", name="raw-wood", amount=10}, + {type="item", name="wood", amount=10}, }, icons = { { @@ -1162,7 +1162,7 @@ data:extend( results= { {type="item", name="bio-rubber", amount=4}, - {type="item", name="raw-wood", amount=10}, + {type="item", name="wood", amount=10}, }, icons = { { diff --git a/angelsbioprocessing_0.5.9/prototypes/technology/bio-processing-technology.lua b/angelsbioprocessing_0.5.9/prototypes/technology/bio-processing-technology.lua index 8bf9787..b57d31c 100644 --- a/angelsbioprocessing_0.5.9/prototypes/technology/bio-processing-technology.lua +++ b/angelsbioprocessing_0.5.9/prototypes/technology/bio-processing-technology.lua @@ -41,7 +41,7 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, + {"automation-science-pack", 1}, }, time = 30 }, @@ -83,7 +83,7 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, + {"automation-science-pack", 1}, }, time = 30 }, @@ -122,8 +122,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1} + {"automation-science-pack", 1}, + {"logistic-science-pack", 1} }, time = 30 }, @@ -161,9 +161,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 30 }, @@ -193,7 +193,7 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, + {"automation-science-pack", 1}, }, time = 30 }, @@ -223,7 +223,7 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, + {"automation-science-pack", 1}, }, time = 30 }, @@ -249,8 +249,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -300,7 +300,7 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, + {"automation-science-pack", 1}, }, time = 30 }, @@ -334,8 +334,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -369,9 +369,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 30 }, @@ -410,8 +410,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -441,9 +441,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 30 }, @@ -477,9 +477,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 30 }, @@ -518,8 +518,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -549,9 +549,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 30 }, @@ -585,9 +585,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 30 }, @@ -626,8 +626,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -657,9 +657,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 30 }, @@ -693,9 +693,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 30 }, @@ -730,7 +730,7 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, + {"automation-science-pack", 1}, }, time = 30 }, @@ -769,8 +769,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -812,9 +812,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 30 }, @@ -864,7 +864,7 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, + {"automation-science-pack", 1}, }, time = 30 }, @@ -906,7 +906,7 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, + {"automation-science-pack", 1}, }, time = 30 }, @@ -988,7 +988,7 @@ data:extend( { count = 32, ingredients = { - {"science-pack-1", 4}, + {"automation-science-pack", 4}, {"token-bio", 1}, }, time = 30 @@ -1027,8 +1027,8 @@ data:extend( { count = 64, ingredients = { - {"science-pack-1", 4}, - {"science-pack-2", 4}, + {"automation-science-pack", 4}, + {"logistic-science-pack", 4}, {"token-bio", 1}, }, time = 30 @@ -1111,7 +1111,7 @@ data:extend( { count = 32, ingredients = { - {"science-pack-1", 4}, + {"automation-science-pack", 4}, {"token-bio", 1}, }, time = 30 @@ -1150,8 +1150,8 @@ data:extend( { count = 64, ingredients = { - {"science-pack-1", 4}, - {"science-pack-2", 4}, + {"automation-science-pack", 4}, + {"logistic-science-pack", 4}, {"token-bio", 1}, }, time = 30 @@ -1234,7 +1234,7 @@ data:extend( { count = 32, ingredients = { - {"science-pack-1", 4}, + {"automation-science-pack", 4}, {"token-bio", 1}, }, time = 30 @@ -1273,8 +1273,8 @@ data:extend( { count = 64, ingredients = { - {"science-pack-1", 4}, - {"science-pack-2", 4}, + {"automation-science-pack", 4}, + {"logistic-science-pack", 4}, {"token-bio", 1}, }, time = 30 @@ -1341,8 +1341,8 @@ data:extend( { count = 40, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -1392,8 +1392,8 @@ data:extend( { count = 40, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -1439,8 +1439,8 @@ data:extend( { count = 40, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -1482,8 +1482,8 @@ data:extend( { count = 40, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, }, time = 30 }, @@ -1513,9 +1513,9 @@ data:extend( { count = 40, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 30 }, @@ -1634,8 +1634,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1} + {"automation-science-pack", 1}, + {"logistic-science-pack", 1} }, time = 30 }, @@ -1723,8 +1723,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1} + {"automation-science-pack", 1}, + {"logistic-science-pack", 1} }, time = 30 }, @@ -1774,8 +1774,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1} + {"automation-science-pack", 1}, + {"logistic-science-pack", 1} }, time = 30 }, @@ -1829,8 +1829,8 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1} + {"automation-science-pack", 1}, + {"logistic-science-pack", 1} }, time = 30 }, @@ -1892,9 +1892,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 30 }, @@ -1960,9 +1960,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 30 }, @@ -2024,9 +2024,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 30 }, @@ -2088,9 +2088,9 @@ data:extend( { count = 50, ingredients = { - {"science-pack-1", 1}, - {"science-pack-2", 1}, - {"science-pack-3", 1}, + {"automation-science-pack", 1}, + {"logistic-science-pack", 1}, + {"chemical-science-pack", 1}, }, time = 30 },