diff -Nurd orig/angelsbioprocessing_0.4.1/info.json patched/angelsbioprocessing_0.4.1/info.json --- orig/angelsbioprocessing_0.4.1/info.json 2017-07-15 16:20:28.000000000 +0200 +++ patched/angelsbioprocessing_0.4.1/info.json 2017-12-15 18:30:38.593348467 +0100 @@ -1,7 +1,7 @@ { "name": "angelsbioprocessing", "version": "0.4.1", - "factorio_version": "0.15", + "factorio_version": "0.16", "title": "Angel's Bio Processing", "author": "Arch666Angel", "contact": "", diff -Nurd orig/angelsbioprocessing_0.4.1/prototypes/buildings/algae-farm.lua patched/angelsbioprocessing_0.4.1/prototypes/buildings/algae-farm.lua --- orig/angelsbioprocessing_0.4.1/prototypes/buildings/algae-farm.lua 2016-10-04 00:12:08.000000000 +0200 +++ patched/angelsbioprocessing_0.4.1/prototypes/buildings/algae-farm.lua 2017-12-15 20:23:28.970311316 +0100 @@ -4,6 +4,7 @@ type = "item", name = "algae-farm", icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png", + icon_size = 32, flags = {"goes-to-quickbar"}, subgroup = "bio-processing-buildings", order = "a[algae-farm]", @@ -14,6 +15,7 @@ type = "assembling-machine", name = "algae-farm", icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png", + icon_size = 32, flags = {"placeable-neutral","player-creation"}, minable = {mining_time = 1, result = "algae-farm"}, max_health = 300, @@ -109,6 +111,7 @@ type = "item", name = "algae-farm-2", icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png", + icon_size = 32, flags = {"goes-to-quickbar"}, subgroup = "bio-processing-buildings", order = "a[algae-farm-2]", @@ -119,6 +122,7 @@ type = "assembling-machine", name = "algae-farm-2", icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png", + icon_size = 32, flags = {"placeable-neutral","player-creation"}, minable = {mining_time = 1, result = "algae-farm-2"}, max_health = 300, @@ -212,4 +216,4 @@ pipe_covers = pipecoverspictures() }, } - ) \ No newline at end of file + ) diff -Nurd orig/angelsbioprocessing_0.4.1/prototypes/items/bio-processing-algae-blue.lua patched/angelsbioprocessing_0.4.1/prototypes/items/bio-processing-algae-blue.lua --- orig/angelsbioprocessing_0.4.1/prototypes/items/bio-processing-algae-blue.lua 2017-01-30 01:47:08.000000000 +0100 +++ patched/angelsbioprocessing_0.4.1/prototypes/items/bio-processing-algae-blue.lua 2017-12-15 21:39:16.386077458 +0100 @@ -4,6 +4,7 @@ type = "item", 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]", @@ -13,10 +14,11 @@ type = "item", 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 }, } -) \ No newline at end of file +) diff -Nurd orig/angelsbioprocessing_0.4.1/prototypes/items/bio-processing-algae-brown.lua patched/angelsbioprocessing_0.4.1/prototypes/items/bio-processing-algae-brown.lua --- orig/angelsbioprocessing_0.4.1/prototypes/items/bio-processing-algae-brown.lua 2017-02-01 20:03:36.000000000 +0100 +++ patched/angelsbioprocessing_0.4.1/prototypes/items/bio-processing-algae-brown.lua 2017-12-15 21:39:34.482213760 +0100 @@ -4,6 +4,7 @@ type = "item", 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]", @@ -13,6 +14,7 @@ type = "item", 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]", @@ -22,10 +24,11 @@ type = "item", name = "circuit-wood-fiber-board", icon = "__angelsbioprocessing__/graphics/icons/wood-fiber-board.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-brown", order = "c[circuit-wood-fiber-board]", stack_size = 200, }, } -) \ No newline at end of file +) diff -Nurd orig/angelsbioprocessing_0.4.1/prototypes/items/bio-processing-algae-green.lua patched/angelsbioprocessing_0.4.1/prototypes/items/bio-processing-algae-green.lua --- orig/angelsbioprocessing_0.4.1/prototypes/items/bio-processing-algae-green.lua 2017-04-26 13:14:02.000000000 +0200 +++ patched/angelsbioprocessing_0.4.1/prototypes/items/bio-processing-algae-green.lua 2017-12-15 21:40:03.110430652 +0100 @@ -4,6 +4,7 @@ type = "item", 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]", @@ -13,6 +14,7 @@ type = "item", name = "cellulose-fiber", icon = "__angelsbioprocessing__/graphics/icons/cellulose-fiber.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-green", order = "b[cellulose-fiber]", @@ -24,6 +26,7 @@ type = "item", 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]", @@ -33,6 +36,7 @@ type = "item", name = "wood-pellets", icon = "__angelsbioprocessing__/graphics/icons/wood-pellets.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-green", order = "d[wood-pellets]", @@ -44,6 +48,7 @@ type = "item", name = "wood-bricks", icon = "__angelsbioprocessing__/graphics/icons/wood-bricks.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-green", order = "e[wood-bricks]", @@ -52,4 +57,4 @@ stack_size = 200 }, } -) \ No newline at end of file +) diff -Nurd orig/angelsbioprocessing_0.4.1/prototypes/items/bio-processing-algae-red.lua patched/angelsbioprocessing_0.4.1/prototypes/items/bio-processing-algae-red.lua --- orig/angelsbioprocessing_0.4.1/prototypes/items/bio-processing-algae-red.lua 2017-02-03 16:11:10.000000000 +0100 +++ patched/angelsbioprocessing_0.4.1/prototypes/items/bio-processing-algae-red.lua 2017-12-15 21:40:19.642556555 +0100 @@ -4,6 +4,7 @@ type = "item", 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]", @@ -13,6 +14,7 @@ type = "item", 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]", @@ -22,10 +24,11 @@ type = "item", 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 -Nurd orig/angelsbioprocessing_0.4.1/prototypes/items/bio-processing-alien.lua patched/angelsbioprocessing_0.4.1/prototypes/items/bio-processing-alien.lua --- orig/angelsbioprocessing_0.4.1/prototypes/items/bio-processing-alien.lua 2017-05-03 21:09:18.000000000 +0200 +++ patched/angelsbioprocessing_0.4.1/prototypes/items/bio-processing-alien.lua 2017-12-15 21:44:13.548381642 +0100 @@ -9,6 +9,7 @@ base_color = {r=0.572, g=0.392, b=0.894}, flow_color = {r=0.572, g=0.392, b=0.894}, icon = "__angelsbioprocessing__/graphics/icons/alien-spores.png", + icon_size = 32, pressure_to_speed_ratio = 0.4, flow_to_energy_ratio = 0.59, }, @@ -16,6 +17,7 @@ type = "item", 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]", @@ -30,6 +32,7 @@ base_color = {r=0.572, g=0.392, b=0.894}, flow_color = {r=0.572, g=0.392, b=0.894}, icon = "__angelsbioprocessing__/graphics/icons/alien-goo.png", + icon_size = 32, pressure_to_speed_ratio = 0.4, flow_to_energy_ratio = 0.59, }, @@ -37,6 +40,7 @@ type = "item", 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]", @@ -46,6 +50,7 @@ type = "item", 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]", @@ -55,6 +60,7 @@ type = "item", name = "alien-pre-artifact", icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-intermediate", order = "d[bio-processing-alien-intermediate]", @@ -65,6 +71,7 @@ type = "item", 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]", @@ -74,6 +81,7 @@ type = "item", 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]", @@ -83,6 +91,7 @@ type = "item", 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]", @@ -92,6 +101,7 @@ type = "item", 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]", @@ -101,6 +111,7 @@ type = "item", 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]", @@ -110,6 +121,7 @@ type = "item", 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]", @@ -119,6 +131,7 @@ type = "item", 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]", @@ -129,6 +142,7 @@ type = "item", name = "small-alien-artifact-red", icon = "__angelsbioprocessing__/graphics/icons/small-alien-artifact-red.png", + icon_size = 32, flags = { "goes-to-main-inventory" }, subgroup = "bio-processing-alien-small", order = "a[alien-artifact]-b[red]-a[small]", @@ -139,6 +153,7 @@ type = "item", name = "small-alien-artifact-yellow", icon = "__angelsbioprocessing__/graphics/icons/small-alien-artifact-yellow.png", + icon_size = 32, flags = { "goes-to-main-inventory" }, subgroup = "bio-processing-alien-small", order = "b[alien-artifact]-d[yellow]-a[small]", @@ -149,6 +164,7 @@ type = "item", name = "small-alien-artifact-orange", icon = "__angelsbioprocessing__/graphics/icons/small-alien-artifact-orange.png", + icon_size = 32, flags = { "goes-to-main-inventory" }, subgroup = "bio-processing-alien-small", order = "c[alien-artifact]-c[orange]-a[small]", @@ -159,6 +175,7 @@ type = "item", name = "small-alien-artifact-blue", icon = "__angelsbioprocessing__/graphics/icons/small-alien-artifact-blue.png", + icon_size = 32, flags = { "goes-to-main-inventory" }, subgroup = "bio-processing-alien-small", order = "d[alien-artifact]-f[blue]-a[small]", @@ -169,6 +186,7 @@ type = "item", name = "small-alien-artifact-purple", icon = "__angelsbioprocessing__/graphics/icons/small-alien-artifact-purple.png", + icon_size = 32, flags = { "goes-to-main-inventory" }, subgroup = "bio-processing-alien-small", order = "e[alien-artifact]-g[purple]-a[small]", @@ -179,6 +197,7 @@ type = "item", name = "small-alien-artifact-green", icon = "__angelsbioprocessing__/graphics/icons/small-alien-artifact-green.png", + icon_size = 32, flags = { "goes-to-main-inventory" }, subgroup = "bio-processing-alien-small", order = "f[alien-artifact]-e[green]-a[small]", @@ -189,6 +208,7 @@ type = "item", name = "small-alien-artifact", icon = "__angelsbioprocessing__/graphics/icons/small-alien-artifact.png", + icon_size = 32, flags = { "goes-to-main-inventory" }, subgroup = "bio-processing-alien-small", order = "g[alien-artifact]-a[pink]-a[small]", @@ -200,6 +220,7 @@ type = "item", name = "alien-artifact-red", icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-red.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-big", order = "a[alien-artifact-red]", @@ -210,6 +231,7 @@ type = "item", name = "alien-artifact-yellow", icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-yellow.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-big", order = "b[alien-artifact-yellow]", @@ -220,6 +242,7 @@ type = "item", name = "alien-artifact-orange", icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-orange.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-big", order = "c[alien-artifact-orange]", @@ -230,6 +253,7 @@ type = "item", name = "alien-artifact-blue", icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-blue.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-big", order = "d[alien-artifact-blue]", @@ -240,6 +264,7 @@ type = "item", name = "alien-artifact-purple", icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-purple.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-big", order = "e[alien-artifact-purple]", @@ -250,6 +275,7 @@ type = "item", name = "alien-artifact-green", icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-green.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-big", order = "f[alien-artifact-green]", @@ -260,6 +286,7 @@ type = "item", name = "alien-artifact", icon = "__angelsbioprocessing__/graphics/icons/alien-artifact.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "bio-processing-alien-big", order = "g[alien-artifact]", @@ -267,4 +294,4 @@ default_request_amount = 10 }, } -) \ No newline at end of file +) diff -Nurd orig/angelsbioprocessing_0.4.1/prototypes/items/bio-processing-paste.lua patched/angelsbioprocessing_0.4.1/prototypes/items/bio-processing-paste.lua --- orig/angelsbioprocessing_0.4.1/prototypes/items/bio-processing-paste.lua 2017-01-30 01:51:18.000000000 +0100 +++ patched/angelsbioprocessing_0.4.1/prototypes/items/bio-processing-paste.lua 2017-12-15 21:41:46.479225238 +0100 @@ -5,6 +5,7 @@ type = "item", 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]", @@ -14,6 +15,7 @@ type = "item", 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]", @@ -23,6 +25,7 @@ type = "item", 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]", @@ -32,6 +35,7 @@ type = "item", 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]", @@ -41,6 +45,7 @@ type = "item", 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]", @@ -50,6 +55,7 @@ type = "item", 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]", @@ -59,6 +65,7 @@ type = "item", 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]", @@ -68,10 +75,11 @@ type = "item", 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 -Nurd orig/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-algae-blue.lua patched/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-algae-blue.lua --- orig/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-algae-blue.lua 2017-05-03 21:10:52.000000000 +0200 +++ patched/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-algae-blue.lua 2017-12-15 21:42:08.331395277 +0100 @@ -16,6 +16,7 @@ {type="item", name="algae-blue", amount=40}, }, icon = "__angelsbioprocessing__/graphics/icons/algae-blue.png", + icon_size = 32, order = "a [algae-blue]", }, { @@ -33,6 +34,7 @@ {type="item", name="blue-cellulose-fiber", amount=5}, }, icon = "__angelsbioprocessing__/graphics/icons/blue-cellulose-fiber.png", + icon_size = 32, order = "b [blue-fiber-algae]", }, { @@ -50,6 +52,7 @@ {type="fluid", name="gas-ammonia", amount=100}, }, icon = "__angelspetrochem__/graphics/icons/gas-ammonia.png", + icon_size = 32, order = "c [gas-ammonia-from-blue-fiber]", }, } diff -Nurd orig/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-algae-brown.lua patched/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-algae-brown.lua --- orig/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-algae-brown.lua 2017-05-03 21:11:04.000000000 +0200 +++ patched/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-algae-brown.lua 2017-12-15 21:42:17.347465639 +0100 @@ -69,6 +69,7 @@ type = "recipe", name = "circuit-wood-fiber-board", icon = "__angelsbioprocessing__/graphics/icons/wood-fiber-board.png", + icon_size = 32, category = "advanced-crafting", subgroup = "bio-processing-brown", enabled = "false", @@ -84,4 +85,4 @@ order = "c[circuit-wood-fiber-board]", }, } -) \ No newline at end of file +) diff -Nurd orig/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-algae-green.lua patched/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-algae-green.lua --- orig/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-algae-green.lua 2017-05-03 21:11:26.000000000 +0200 +++ patched/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-algae-green.lua 2017-12-15 21:42:35.335606337 +0100 @@ -16,6 +16,7 @@ {type="item", name="algae-green", amount=40}, }, icon = "__angelsbioprocessing__/graphics/icons/algae-green.png", + icon_size = 32, order = "a [algae-farming]", }, { @@ -33,6 +34,7 @@ {type="item", name="cellulose-fiber", amount=5}, }, icon = "__angelsbioprocessing__/graphics/icons/cellulose-fiber-algae.png", + icon_size = 32, order = "b [cellulose-fiber-algae]", }, { @@ -50,6 +52,7 @@ {type="item", name="cellulose-fiber", amount=4}, }, icon = "__angelsbioprocessing__/graphics/icons/cellulose-fiber-raw-wood.png", + icon_size = 32, order = "c [cellulose-fiber-raw-wood]", }, { @@ -68,6 +71,7 @@ {type="item", name="paste-cellulose", amount=10}, }, icon = "__angelsbioprocessing__/graphics/icons/paste-cellulose.png", + icon_size = 32, order = "d [paste-from-sodium-hydroxide]", }, { @@ -86,6 +90,7 @@ {type="item", name="paste-cellulose", amount=10}, }, icon = "__angelsbioprocessing__/graphics/icons/paste-cellulose.png", + icon_size = 32, order = "e [paste-from-gas-chlor-methane]", }, { @@ -104,6 +109,7 @@ {type="item", name="wood", amount=5}, }, icon = "__angelsbioprocessing__/graphics/icons/wood-cellulose.png", + icon_size = 32, order = "f [wood-from-cellulose]", }, { @@ -121,6 +127,7 @@ {type="item", name="wood-pellets", amount=2}, }, icon = "__angelsbioprocessing__/graphics/icons/wood-pellets.png", + icon_size = 32, order = "h [wood-pellets]", }, { @@ -138,6 +145,7 @@ {type="item", name="wood-bricks", amount=4}, }, icon = "__angelsbioprocessing__/graphics/icons/wood-bricks.png", + icon_size = 32, order = "i [wood-bricks]", }, { @@ -155,6 +163,7 @@ {type="fluid", name="gas-carbon-dioxide", amount=70}, }, icon = "__angelspetrochem__/graphics/icons/gas-carbon-dioxide.png", + icon_size = 32, order = "j [gas-carbon-dioxide-from-wood]", }, { @@ -172,7 +181,8 @@ {type="fluid", name="gas-methanol", amount=100}, }, icon = "__angelspetrochem__/graphics/icons/gas-methanol.png", + icon_size = 32, order = "k [gas-methanol-from-wood]", }, } -) \ No newline at end of file +) diff -Nurd orig/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-algae-red.lua patched/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-algae-red.lua --- orig/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-algae-red.lua 2017-05-03 21:11:38.000000000 +0200 +++ patched/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-algae-red.lua 2017-12-15 21:42:48.807711992 +0100 @@ -16,6 +16,7 @@ {type="item", name="algae-red", amount=40}, }, icon = "__angelsbioprocessing__/graphics/icons/algae-red.png", + icon_size = 32, order = "a [algae-red]", }, { @@ -33,6 +34,7 @@ {type="item", name="red-cellulose-fiber", amount=5}, }, icon = "__angelsbioprocessing__/graphics/icons/red-cellulose-fiber.png", + icon_size = 32, order = "b [red-fiber-algae]", }, { @@ -50,7 +52,8 @@ {type="item", name="solid-calcium-carbonate", amount=5}, }, icon = "__angelsbioprocessing__/graphics/icons/solid-calcium-carbonate.png", + icon_size = 32, order = "c [solid-calcium-carbonate]", }, } -) \ No newline at end of file +) diff -Nurd orig/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-alien.lua patched/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-alien.lua --- orig/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-alien.lua 2017-05-03 21:12:04.000000000 +0200 +++ patched/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-alien.lua 2017-12-15 22:36:50.713880543 +0100 @@ -17,6 +17,7 @@ {type="fluid", name="alien-spores", amount=50}, }, icon = "__angelsbioprocessing__/graphics/icons/alien-spores.png", + icon_size = 32, order = "a [alien-air-filtering]", }, { @@ -36,6 +37,7 @@ {type="item", name="alien-bacteria", amount=1}, }, icon = "__angelsbioprocessing__/graphics/icons/alien-bacteria.png", + icon_size = 32, order = "b [alien-bacteria]", }, { @@ -53,6 +55,7 @@ {type="fluid", name="alien-goo", amount=10}, }, icon = "__angelsbioprocessing__/graphics/icons/alien-goo.png", + icon_size = 32, order = "c [alien-goo-artifact]", }, { @@ -70,6 +73,7 @@ {type="fluid", name="alien-goo", amount=10}, }, icon = "__angelsbioprocessing__/graphics/icons/alien-goo.png", + icon_size = 32, order = "d [alien-goo]", }, { @@ -86,6 +90,7 @@ {type="item", name="petri-dish", amount=2}, }, icon = "__angelsbioprocessing__/graphics/icons/petri-dish.png", + icon_size = 32, order = "e [petri-dish]", }, { @@ -105,6 +110,7 @@ {type="item", name="substrate-dish", amount=3}, }, icon = "__angelsbioprocessing__/graphics/icons/substrate-dish.png", + icon_size = 32, order = "f [substrate-dish]", }, { @@ -123,6 +129,7 @@ {type="item", name="alien-pre-artifact", amount=3}, }, icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact.png", + icon_size = 32, order = "g [alien-pre-artifact]", }, --PRE ARTIFACTS @@ -143,6 +150,7 @@ {type="item", name="alien-pre-artifact-red", amount=1}, }, icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-red.png", + icon_size = 32, order = "a [alien-pre-artifact-red]", }, { @@ -162,6 +170,7 @@ {type="item", name="alien-pre-artifact-yellow", amount=1}, }, icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-yellow.png", + icon_size = 32, order = "b [alien-pre-artifact-yellow]", }, { @@ -181,6 +190,7 @@ {type="item", name="alien-pre-artifact-orange", amount=1}, }, icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-orange.png", + icon_size = 32, order = "c [alien-pre-artifact-orange]", }, { @@ -200,6 +210,7 @@ {type="item", name="alien-pre-artifact-blue", amount=1}, }, icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-blue.png", + icon_size = 32, order = "d [alien-pre-artifact-blue]", }, { @@ -219,6 +230,7 @@ {type="item", name="alien-pre-artifact-purple", amount=1}, }, icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-purple.png", + icon_size = 32, order = "e [alien-pre-artifact-purple]", }, { @@ -238,6 +250,7 @@ {type="item", name="alien-pre-artifact-green", amount=1}, }, icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-green.png", + icon_size = 32, order = "f [alien-pre-artifact-green]", }, { @@ -256,6 +269,7 @@ {type="item", name="alien-pre-artifact-base", amount=1}, }, icon = "__angelsbioprocessing__/graphics/icons/alien-pre-artifact-base.png", + icon_size = 32, order = "g [alien-pre-artifact-base]", }, --SMALL @@ -274,6 +288,7 @@ {type="item", name="small-alien-artifact-red", amount=5}, }, icon = "__angelsbioprocessing__/graphics/icons/small-alien-artifact-red.png", + icon_size = 32, order = "a [small-alien-artifact-red]", }, { @@ -291,6 +306,7 @@ {type="item", name="small-alien-artifact-yellow", amount=5}, }, icon = "__angelsbioprocessing__/graphics/icons/small-alien-artifact-yellow.png", + icon_size = 32, order = "b [small-alien-artifact-yellow]", }, { @@ -308,6 +324,7 @@ {type="item", name="small-alien-artifact-orange", amount=5}, }, icon = "__angelsbioprocessing__/graphics/icons/small-alien-artifact-orange.png", + icon_size = 32, order = "c [small-alien-artifact-orange]", }, { @@ -325,6 +342,7 @@ {type="item", name="small-alien-artifact-blue", amount=5}, }, icon = "__angelsbioprocessing__/graphics/icons/small-alien-artifact-blue.png", + icon_size = 32, order = "d [small-alien-artifact-blue]", }, { @@ -342,6 +360,7 @@ {type="item", name="small-alien-artifact-purple", amount=5}, }, icon = "__angelsbioprocessing__/graphics/icons/small-alien-artifact-purple.png", + icon_size = 32, order = "e [small-alien-artifact-purple]", }, { @@ -359,6 +378,7 @@ {type="item", name="small-alien-artifact-green", amount=5}, }, icon = "__angelsbioprocessing__/graphics/icons/small-alien-artifact-green.png", + icon_size = 32, order = "f [small-alien-artifact-green]", }, { @@ -376,6 +396,7 @@ {type="item", name="small-alien-artifact", amount=5}, }, icon = "__angelsbioprocessing__/graphics/icons/small-alien-artifact.png", + icon_size = 32, order = "g [small-alien-artifact]", }, --BIG @@ -394,6 +415,7 @@ {type="item", name="alien-artifact-red", amount=1}, }, icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-red.png", + icon_size = 32, order = "a [alien-artifact-red]", }, { @@ -411,6 +433,7 @@ {type="item", name="alien-artifact-yellow", amount=1}, }, icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-yellow.png", + icon_size = 32, order = "b [alien-artifact-yellow]", }, { @@ -428,6 +451,7 @@ {type="item", name="alien-artifact-orange", amount=1}, }, icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-orange.png", + icon_size = 32, order = "c [alien-artifact-orange]", }, { @@ -445,6 +469,7 @@ {type="item", name="alien-artifact-blue", amount=1}, }, icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-blue.png", + icon_size = 32, order = "d [alien-artifact-blue]", }, { @@ -462,6 +487,7 @@ {type="item", name="alien-artifact-purple", amount=1}, }, icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-purple.png", + icon_size = 32, order = "e [alien-artifact-purple]", }, { @@ -479,6 +505,7 @@ {type="item", name="alien-artifact-green", amount=1}, }, icon = "__angelsbioprocessing__/graphics/icons/alien-artifact-green.png", + icon_size = 32, order = "f [alien-artifact-green]", }, { @@ -496,7 +523,8 @@ {type="item", name="alien-artifact", amount=1}, }, icon = "__angelsbioprocessing__/graphics/icons/alien-artifact.png", + icon_size = 32, order = "g [alien-artifact]", }, } - ) \ No newline at end of file + ) diff -Nurd orig/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-entity-bob.lua patched/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-entity-bob.lua --- orig/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-entity-bob.lua 2017-03-19 03:07:50.000000000 +0100 +++ patched/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-entity-bob.lua 2017-12-15 22:37:56.686490926 +0100 @@ -14,6 +14,7 @@ }, result= "algae-farm", icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png", + icon_size = 32, }, { type = "recipe", @@ -29,6 +30,7 @@ }, result= "algae-farm-2", icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png", + icon_size = 32, }, } - ) \ No newline at end of file + ) diff -Nurd orig/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-entity.lua patched/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-entity.lua --- orig/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-entity.lua 2017-03-19 03:07:36.000000000 +0100 +++ patched/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-entity.lua 2017-12-15 22:38:35.602850118 +0100 @@ -11,6 +11,7 @@ }, result= "algae-farm", icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png", + icon_size = 32, }, { type = "recipe", @@ -22,6 +23,7 @@ }, result= "algae-farm-2", icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png", + icon_size = 32, }, } - ) \ No newline at end of file + ) diff -Nurd orig/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-paste.lua patched/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-paste.lua --- orig/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-paste.lua 2017-03-19 03:29:46.000000000 +0100 +++ patched/angelsbioprocessing_0.4.1/prototypes/recipes/bio-processing-paste.lua 2017-12-15 22:38:47.922963697 +0100 @@ -17,6 +17,7 @@ {type="item", name="paste-copper", amount=5}, }, icon = "__angelsbioprocessing__/graphics/icons/paste-copper.png", + icon_size = 32, order = "a [paste-copper]", }, { @@ -35,6 +36,7 @@ {type="item", name="paste-gold", amount=5}, }, icon = "__angelsbioprocessing__/graphics/icons/paste-gold.png", + icon_size = 32, order = "b [paste-gold]", }, { @@ -53,6 +55,7 @@ {type="item", name="paste-tungsten", amount=5}, }, icon = "__angelsbioprocessing__/graphics/icons/paste-tungsten.png", + icon_size = 32, order = "c [paste-tungsten]", }, { @@ -71,6 +74,7 @@ {type="item", name="paste-cobalt", amount=5}, }, icon = "__angelsbioprocessing__/graphics/icons/paste-cobalt.png", + icon_size = 32, order = "d [paste-cobalt]", }, { @@ -89,6 +93,7 @@ {type="item", name="paste-titanium", amount=5}, }, icon = "__angelsbioprocessing__/graphics/icons/paste-titanium.png", + icon_size = 32, order = "e [paste-titanium]", }, { @@ -107,6 +112,7 @@ {type="item", name="paste-zinc", amount=5}, }, icon = "__angelsbioprocessing__/graphics/icons/paste-zinc.png", + icon_size = 32, order = "f [paste-zinc]", }, { @@ -125,6 +131,7 @@ {type="item", name="paste-iron", amount=5}, }, icon = "__angelsbioprocessing__/graphics/icons/paste-iron.png", + icon_size = 32, order = "g [paste-iron]", }, { @@ -143,7 +150,8 @@ {type="item", name="paste-silver", amount=5}, }, icon = "__angelsbioprocessing__/graphics/icons/paste-silver.png", + icon_size = 32, order = "h [paste-silver]", }, } - ) \ No newline at end of file + ) diff -Nurd "orig/A Sea Block Config_0.1.2/info.json" "patched/A Sea Block Config_0.1.2/info.json" --- "orig/A Sea Block Config_0.1.2/info.json" 2017-07-12 20:03:52.000000000 +0200 +++ "patched/A Sea Block Config_0.1.2/info.json" 2017-12-16 01:08:59.943230477 +0100 @@ -1,7 +1,7 @@ { "name": "A Sea Block Config", "version": "0.1.2", - "factorio_version": "0.15", + "factorio_version": "0.16", "title": "A Sea Block Config", "author": "Trainwreck", "description": "Sets SeaBlock preferred settings in other mods.", diff -Nurd orig/data-raw-prototypes_0.3.1/info.json patched/data-raw-prototypes_0.3.1/info.json --- orig/data-raw-prototypes_0.3.1/info.json 2017-05-06 23:47:26.000000000 +0200 +++ patched/data-raw-prototypes_0.3.1/info.json 2017-12-15 18:30:38.601348558 +0100 @@ -4,8 +4,8 @@ "title": "Data Raw Prototypes", "author": "Earendel", "dependencies": [ - "base >= 0.14.0" + "base >= 0.16.0" ], "description": "A modding utility to access raw prototype data from data.raw within control.lua. Prototypes are only loaded as required, cached to the save game for as long as the mods state is unchanged, and the cache is shared across all mods. To use: remote.call(\"data-raw\", \"prototype\", \"car\", \"tank\"). See readme for more details.", - "factorio_version": "0.15" + "factorio_version": "0.16" } diff -Nurd orig/ght-bluebuild_0.1.10/control.lua patched/ght-bluebuild_0.1.10/control.lua --- orig/ght-bluebuild_0.1.10/control.lua 2017-07-14 07:51:57.000000000 +0200 +++ patched/ght-bluebuild_0.1.10/control.lua 2017-12-25 13:25:39.309860899 +0100 @@ -595,7 +595,8 @@ tool = tool or get_tool(player) - local character_speed = player.character and (1 + player.character_mining_speed_modifier) or 1 + local character_speed = 1 + pcall(function() character_speed = player.character and (1 + player.character_mining_speed_modifier) or 1; end) local tool_speed = tool.prototype.speed return 1 + math.floor(mineable.mining_time / (character_speed * .01 * (tool_speed - mineable.hardness))), tool_speed, mineable.hardness @@ -768,8 +769,8 @@ return ok, (not ok) and "inventory-full" end - script.raise_event(defines.events.on_preplayer_mined_item, { - name = defines.events.on_preplayer_mined_item, + script.raise_event(defines.events.on_pre_player_mined_item, { + name = defines.events.on_pre_player_mined_item, tick = tick, player_index = index, entity = entity, @@ -791,6 +792,7 @@ -- is machine crafting if is_crafting_machine[entity.type] and entity.is_crafting() then + log("crafting machine: " .. entity.name) local ingredients = entity.recipe.ingredients if not atomic_insert(player_main, ingredients) then clear = false diff -Nurd orig/ght-bluebuild_0.1.10/info.json patched/ght-bluebuild_0.1.10/info.json --- orig/ght-bluebuild_0.1.10/info.json 2017-07-14 07:51:57.000000000 +0200 +++ patched/ght-bluebuild_0.1.10/info.json 2017-12-15 18:30:38.585348375 +0100 @@ -4,8 +4,8 @@ "title": "Bluebuild rewritten", "author": "gheift, based on Mylon's", "description": "Allows automatic blueprint building and deconstruction without bots. Once a blueprint is placed, nearby entities will be auto-placed as long as you have the objects in your inventory and are standing still. Once items are marked for deconstruction, they will be auto-removed and put into your inventory as long as you are standing still. Deconstruction speed is based on the mining time and the currently used tool. Press SHIFT+K to toggle building, press SHIFT+L to toggle deconstruction.", - "factorio_version": "0.15", + "factorio_version": "0.16", "dependencies": [ - "base >= 0.15.11" + "base >= 0.16" ] } diff -Nurd orig/JsonExtractor_0.1.5/info.json patched/JsonExtractor_0.1.5/info.json --- orig/JsonExtractor_0.1.5/info.json 2017-04-04 22:10:58.000000000 +0200 +++ patched/JsonExtractor_0.1.5/info.json 2017-12-15 18:30:38.593348467 +0100 @@ -1,7 +1,7 @@ { "name": "JsonExtractor", "version": "0.1.5", - "factorio_version": "0.14", + "factorio_version": "0.16", "title": "Json Extractor", "author": "Xyfi", "contact": "a.botteram@gmail.com", diff -Nurd orig/ScienceCostTweaker_0.15.5/info.json patched/ScienceCostTweaker_0.15.5/info.json --- orig/ScienceCostTweaker_0.15.5/info.json 2017-06-03 21:11:54.000000000 +0200 +++ patched/ScienceCostTweaker_0.15.5/info.json 2017-12-15 18:30:38.517347604 +0100 @@ -1,7 +1,7 @@ { "name": "ScienceCostTweaker", "version": "0.15.5", - "factorio_version":"0.15", + "factorio_version": "0.16", "title": "ScienceCostTweaker Mod", "author": "UberWaffe", "dependencies": ["base >= 0.15.0", "? boblibrary >= 0.15.0", "? bobelectronics >= 0.15.0", "? bobplates >= 0.15.0", "? bobtech >= 0.15.0", "? UberTweaks >= 0.0.1", "? peacemod"], diff -Nurd orig/ScienceCostTweaker_0.15.5/tweaks/newIntermediates/newintermediates.lua patched/ScienceCostTweaker_0.15.5/tweaks/newIntermediates/newintermediates.lua --- orig/ScienceCostTweaker_0.15.5/tweaks/newIntermediates/newintermediates.lua 2017-05-08 07:38:08.000000000 +0200 +++ patched/ScienceCostTweaker_0.15.5/tweaks/newIntermediates/newintermediates.lua 2017-12-15 21:33:38.959680506 +0100 @@ -9,6 +9,7 @@ order = "aaa-a", inventory_order = "c-a", icon = "__base__/graphics/item-group/fluids.png", + icon_size = 32, }, { @@ -80,6 +81,7 @@ type = "item", name = "sct-waste-ironcopper", icon = "__ScienceCostTweaker__/graphics/icons/sct-waste-ironcopper.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-byproducts", order = "a[mixedewaste]", @@ -89,6 +91,7 @@ type = "item", name = "sct-waste-copperonly", icon = "__ScienceCostTweaker__/graphics/icons/sct-waste-copperonly.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-byproducts", order = "a[copperwaste]", @@ -106,6 +109,7 @@ category = "crafting-with-fluid", ingredients = {{"sct-waste-ironcopper", 2}}, icon = "__ScienceCostTweaker__/graphics/icons/sct-waste-ironcopper.png", + icon_size = 32, subgroup = "sct-byproducts", order = "a[waste-process-basic]", results = @@ -129,6 +133,7 @@ category = "crafting-with-fluid", ingredients = {{"sct-waste-copperonly", 2}}, icon = "__ScienceCostTweaker__/graphics/icons/sct-waste-copperonly.png", + icon_size = 32, subgroup = "sct-byproducts", order = "a[waste-process-copper]", results = @@ -147,6 +152,7 @@ type = "item", name = "sct-t1-ironcore", icon = "__ScienceCostTweaker__/graphics/icons/iron-core.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-1", order = "b[t1-ironcore]", @@ -157,6 +163,7 @@ type = "item", name = "sct-t1-magnet-coils", icon = "__ScienceCostTweaker__/graphics/icons/magnet-coils.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-1", order = "b[t1-magnet-coils]", @@ -169,6 +176,7 @@ type = "item", name = "sct-t2-reaction-nodes", icon = "__ScienceCostTweaker__/graphics/icons/reaction-nodes.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-2", order = "b[t2-reaction-nodes]", @@ -179,6 +187,7 @@ type = "item", name = "sct-t2-instruments", icon = "__ScienceCostTweaker__/graphics/icons/instruments.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-2", order = "b[t2-instruments]", @@ -189,6 +198,7 @@ type = "item", name = "sct-t2-microcircuits", icon = "__ScienceCostTweaker__/graphics/icons/microcircuits.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-2", order = "b[t2-microcircuits]", @@ -199,6 +209,7 @@ type = "item", name = "sct-t2-micro-wafer", icon = "__ScienceCostTweaker__/graphics/icons/micro-wafer.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-2", order = "b[t2-micro-wafer]", @@ -209,6 +220,7 @@ type = "item", name = "sct-t2-wafer-stamp", icon = "__ScienceCostTweaker__/graphics/icons/wafer-stamp.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-2", order = "b[t2-wafer-stamp]", @@ -221,6 +233,7 @@ type = "item", name = "sct-t3-flash-fuel", icon = "__ScienceCostTweaker__/graphics/icons/flash-fuel.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-3", order = "b[a]", @@ -231,6 +244,7 @@ type = "item", name = "sct-t3-laser-foci", icon = "__ScienceCostTweaker__/graphics/icons/laser-foci.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-3", order = "b[b]", @@ -241,6 +255,7 @@ type = "item", name = "sct-t3-laser-emitter", icon = "__ScienceCostTweaker__/graphics/icons/laser-emitter.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-3", order = "b[c]", @@ -251,6 +266,7 @@ type = "item", name = "sct-t3-femto-lasers", icon = "__ScienceCostTweaker__/graphics/icons/femto-lasers.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-3", order = "b[d]", @@ -261,6 +277,7 @@ type = "item", name = "sct-t3-atomic-sensors", icon = "__ScienceCostTweaker__/graphics/icons/atomic-sensors.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-3", order = "b[e]", @@ -273,6 +290,7 @@ type = "item", name = "sct-mil-subplating", icon = "__ScienceCostTweaker__/graphics/icons/sct-mil-subplating.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-mil", order = "b[a]", @@ -282,6 +300,7 @@ type = "item", name = "sct-mil-plating", icon = "__ScienceCostTweaker__/graphics/icons/sct-mil-plating.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-mil", order = "b[b]", @@ -291,6 +310,7 @@ type = "item", name = "sct-mil-circuit1", icon = "__ScienceCostTweaker__/graphics/icons/military_analysis_1.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-mil", order = "b[c]", @@ -300,6 +320,7 @@ type = "item", name = "sct-mil-circuit2", icon = "__ScienceCostTweaker__/graphics/icons/military_analysis_2.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-mil", order = "b[d]", @@ -309,6 +330,7 @@ type = "item", name = "sct-mil-circuit3", icon = "__ScienceCostTweaker__/graphics/icons/military_analysis_3.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-mil", order = "b[e]", @@ -321,6 +343,7 @@ type = "item", name = "sct-prod-biosilicate", icon = "__ScienceCostTweaker__/graphics/icons/sct-prod-biosilicate.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-prod", order = "b[biosilicate]", @@ -331,6 +354,7 @@ type = "item", name = "sct-prod-baked-biopaste", icon = "__ScienceCostTweaker__/graphics/icons/sct-prod-baked-biopaste.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-prod", order = "b[biopaste]", @@ -341,6 +365,7 @@ type = "item", name = "sct-prod-bioprocessor", icon = "__ScienceCostTweaker__/graphics/icons/bioprocessor.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-prod", order = "b[bioprocessor]", @@ -351,6 +376,7 @@ type = "item", name = "sct-prod-overclocker", icon = "__ScienceCostTweaker__/graphics/icons/overclocker.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-prod", order = "b[overclocker]", @@ -365,6 +391,7 @@ type = "item", name = "sct-htech-capbank", icon = "__ScienceCostTweaker__/graphics/icons/sct-htech-capbank.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-hightech", order = "b[capbank]", @@ -376,6 +403,7 @@ type = "item", name = "sct-htech-injector", icon = "__ScienceCostTweaker__/graphics/icons/sct-htech-injector.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-hightech", order = "b[injector]", @@ -387,6 +415,7 @@ type = "item", name = "sct-htech-thermalstore", icon = "__ScienceCostTweaker__/graphics/icons/sct-htech-thermalstore.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-hightech", order = "b[thermalstore]", @@ -398,6 +427,7 @@ type = "item", name = "sct-htech-thermalstore-heated", icon = "__ScienceCostTweaker__/graphics/icons/sct-htech-thermalstore-heated.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-hightech", order = "b[thermalstore-heated]", @@ -409,6 +439,7 @@ type = "item", name = "sct-htech-random", icon = "__ScienceCostTweaker__/graphics/icons/sct-htech-random.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-hightech", order = "b[random]", @@ -421,6 +452,7 @@ type = "item", name = "sct-bm4-plating", icon = "__ScienceCostTweaker__/graphics/icons/sct-bm4-part2a.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-hightech", order = "f[bm4-plating]", @@ -432,6 +464,7 @@ type = "item", name = "sct-bm4-part3b", icon = "__ScienceCostTweaker__/graphics/icons/sct-bm4-part1c.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-hightech", order = "f[bm4-part3b]", @@ -443,6 +476,7 @@ type = "item", name = "sct-bm4-part3c", icon = "__ScienceCostTweaker__/graphics/icons/sct-bm4-part2a.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-hightech", order = "f[bm4-part3c]", @@ -454,6 +488,7 @@ type = "item", name = "sct-bm4-part3d", icon = "__ScienceCostTweaker__/graphics/icons/sct-bm4-part2b.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-hightech", order = "f[bm4-part3d]", @@ -465,6 +500,7 @@ type = "item", name = "sct-bm4-part4a", icon = "__ScienceCostTweaker__/graphics/icons/sct-bm4-part2a.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-hightech", order = "f[bm4-part4a]", @@ -476,6 +512,7 @@ type = "item", name = "sct-bm4-part4b", icon = "__ScienceCostTweaker__/graphics/icons/sct-bm4-part2a.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-hightech", order = "f[bm4-part4b]", @@ -487,6 +524,7 @@ type = "item", name = "sct-bm4-part4c", icon = "__ScienceCostTweaker__/graphics/icons/sct-bm4-part2a.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-hightech", order = "f[bm4-part4c]", @@ -498,6 +536,7 @@ type = "item", name = "sct-bm4-part4d", icon = "__ScienceCostTweaker__/graphics/icons/sct-bm4-part2a.png", + icon_size = 32, flags = {"goes-to-main-inventory"}, subgroup = "sct-sciencepack-hightech", order = "f[bm4-part4d]", diff -Nurd orig/ScienceCostTweaker_0.15.5/tweaks/newIntermediates/newlabs.lua patched/ScienceCostTweaker_0.15.5/tweaks/newIntermediates/newlabs.lua --- orig/ScienceCostTweaker_0.15.5/tweaks/newIntermediates/newlabs.lua 2017-06-04 09:18:46.000000000 +0200 +++ patched/ScienceCostTweaker_0.15.5/tweaks/newIntermediates/newlabs.lua 2017-12-15 21:34:30.136022562 +0100 @@ -6,6 +6,7 @@ type = "item", name = "sct-lab-2", icon = "__ScienceCostTweaker__/graphics/sct-lab-2/icon.png", + icon_size = 32, flags = {"goes-to-quickbar"}, subgroup = "sct-labs", order = "b[lab2]", @@ -16,6 +17,7 @@ type = "lab", name = "sct-lab-2", icon = "__ScienceCostTweaker__/graphics/sct-lab-2/icon.png", + icon_size = 32, flags = {"placeable-player", "player-creation"}, minable = {mining_time = 1, result = "sct-lab-2"}, max_health = 200, @@ -92,6 +94,7 @@ type = "item", name = "sct-lab-3", icon = "__ScienceCostTweaker__/graphics/sct-lab-3/icon.png", + icon_size = 32, flags = {"goes-to-quickbar"}, subgroup = "sct-labs", order = "c[lab3]", @@ -102,6 +105,7 @@ type = "lab", name = "sct-lab-3", icon = "__ScienceCostTweaker__/graphics/sct-lab-3/icon.png", + icon_size = 32, flags = {"placeable-player", "player-creation"}, minable = {mining_time = 1, result = "sct-lab-3"}, max_health = 250, @@ -181,6 +185,7 @@ type = "item", name = "sct-lab-4", icon = "__ScienceCostTweaker__/graphics/sct-lab-4/icon.png", + icon_size = 32, flags = {"goes-to-quickbar"}, subgroup = "sct-labs", order = "d[lab4]", @@ -191,6 +196,7 @@ type = "lab", name = "sct-lab-4", icon = "__ScienceCostTweaker__/graphics/sct-lab-4/icon.png", + icon_size = 32, flags = {"placeable-player", "player-creation"}, minable = {mining_time = 1, result = "sct-lab-4"}, max_health = 300, @@ -276,6 +282,7 @@ type = "item", name = "sct-lab-1", icon = "__ScienceCostTweaker__/graphics/sct-lab-1/icon.png", + icon_size = 32, flags = {"goes-to-quickbar"}, subgroup = "production-machine", order = "g[sct-lab-1]", @@ -286,6 +293,7 @@ type = "lab", name = "sct-lab-1", icon = "__ScienceCostTweaker__/graphics/sct-lab-1/icon.png", + icon_size = 32, flags = {"placeable-player", "player-creation"}, minable = {mining_time = 1, result = "sct-lab-1"}, max_health = 150, @@ -364,7 +372,10 @@ data.raw["item"]["lab"].order = "a[lab1]" data.raw["item"]["lab"].icon = "__ScienceCostTweaker__/graphics/sct-lab-1/icon.png" +data.raw["item"]["lab"].icon_size = 32 + data.raw["lab"]["lab"].icon = "__ScienceCostTweaker__/graphics/sct-lab-1/icon.png" +data.raw["lab"]["lab"].icon_size = 32 data.raw["lab"]["lab"].collision_box = {{-1.2, -1.2}, {1.2, 1.2}} data.raw["lab"]["lab"].selection_box = {{-1.5, -1.5}, {1.5, 1.5}} data.raw["lab"]["lab"].on_animation = @@ -408,4 +419,4 @@ -- Tier 3, enabled by Advanced Electronics research (which is also enables science pack 3) table.insert(data.raw.technology["advanced-electronics"].effects,{type = "unlock-recipe", recipe = "sct-lab-3"}) -- Tier 4, enabled by Advanced Electronics 2 research (which is also enables high tech science pack) -table.insert(data.raw.technology["advanced-electronics-2"].effects,{type = "unlock-recipe", recipe = "sct-lab-4"}) \ No newline at end of file +table.insert(data.raw.technology["advanced-electronics-2"].effects,{type = "unlock-recipe", recipe = "sct-lab-4"}) diff -Nurd orig/ScienceCostTweaker_0.15.5/tweaks/vanilla/0_initial.lua patched/ScienceCostTweaker_0.15.5/tweaks/vanilla/0_initial.lua --- orig/ScienceCostTweaker_0.15.5/tweaks/vanilla/0_initial.lua 2017-05-05 17:18:46.000000000 +0200 +++ patched/ScienceCostTweaker_0.15.5/tweaks/vanilla/0_initial.lua 2017-12-15 21:31:35.922900255 +0100 @@ -153,6 +153,7 @@ name = "sct-t3-flash-fuel", category = "chemistry", icon = "__ScienceCostTweaker__/graphics/icons/flash-fuel.png", + icon_size = 32, subgroup = "sct-sciencepack-3", order = "b[flashfuel]", enabled = "false", @@ -174,6 +175,7 @@ name = "sct-t3-laser-foci", category = "crafting", icon = "__ScienceCostTweaker__/graphics/icons/laser-foci.png", + icon_size = 32, subgroup = "sct-sciencepack-3", order = "b[laserfoci]", enabled = "false", @@ -194,6 +196,7 @@ type = "recipe", name = "sct-t3-laser-emitter", icon = "__ScienceCostTweaker__/graphics/icons/laser-emitter.png", + icon_size = 32, subgroup = "sct-sciencepack-3", order = "b[laseremitter]", category = "crafting", @@ -217,6 +220,7 @@ name = "sct-t3-femto-lasers", category = "crafting-with-fluid", icon = "__ScienceCostTweaker__/graphics/icons/femto-lasers.png", + icon_size = 32, subgroup = "sct-sciencepack-3", order = "b[femtolasers]", enabled = "false", @@ -239,6 +243,7 @@ name = "sct-t3-atomic-sensors", category = "crafting-with-fluid", icon = "__ScienceCostTweaker__/graphics/icons/atomic-sensors.png", + icon_size = 32, order = "b[atomicsensors]", subgroup = "sct-sciencepack-3", enabled = "false", @@ -263,6 +268,7 @@ type = "recipe", name = "sct-mil-subplating", icon = "__ScienceCostTweaker__/graphics/icons/sct-mil-subplating.png", + icon_size = 32, category = "crafting", subgroup = "sct-sciencepack-mil", order = "b[subplating]", @@ -283,6 +289,7 @@ type = "recipe", name = "sct-mil-plating", icon = "__ScienceCostTweaker__/graphics/icons/sct-mil-plating.png", + icon_size = 32, category = "advanced-crafting", subgroup = "sct-sciencepack-mil", order = "b[plating]", @@ -305,6 +312,7 @@ type = "recipe", name = "sct-mil-circuit1", icon = "__ScienceCostTweaker__/graphics/icons/military_analysis_1.png", + icon_size = 32, category = "crafting", subgroup = "sct-sciencepack-mil", order = "b[circuit1]", @@ -326,6 +334,7 @@ type = "recipe", name = "sct-mil-circuit2", icon = "__ScienceCostTweaker__/graphics/icons/military_analysis_2.png", + icon_size = 32, category = "crafting", subgroup = "sct-sciencepack-mil", order = "b[circuit2]", @@ -348,6 +357,7 @@ name = "sct-mil-circuit3", category = "advanced-crafting", icon = "__ScienceCostTweaker__/graphics/icons/military_analysis_3.png", + icon_size = 32, subgroup = "sct-sciencepack-mil", order = "b[circuit3]", enabled = "false", @@ -375,6 +385,7 @@ name = "sct-prod-biosilicate", category = "chemistry", icon = "__ScienceCostTweaker__/graphics/icons/sct-prod-biosilicate.png", + icon_size = 32, subgroup = "sct-sciencepack-prod", order = "b[biosillicate]", enabled = "false", @@ -410,6 +421,7 @@ name = "sct-prod-bioprocessor", category = "advanced-crafting", icon = "__ScienceCostTweaker__/graphics/icons/bioprocessor.png", + icon_size = 32, subgroup = "sct-sciencepack-prod", order = "b[bioprocessor]", enabled = "false", @@ -431,6 +443,7 @@ name = "sct-prod-overclocker", category = "crafting-with-fluid", icon = "__ScienceCostTweaker__/graphics/icons/overclocker.png", + icon_size = 32, subgroup = "sct-sciencepack-prod", order = "b[overclocker]", enabled = "false", @@ -459,6 +472,7 @@ name = "sct-htech-capbank", category = "crafting-with-fluid", icon = "__ScienceCostTweaker__/graphics/icons/sct-htech-capbank.png", + icon_size = 32, subgroup = "sct-sciencepack-hightech", order = "b[capbank]", enabled = "false", @@ -481,6 +495,7 @@ name = "sct-htech-injector", category = "crafting-with-fluid", icon = "__ScienceCostTweaker__/graphics/icons/sct-htech-injector.png", + icon_size = 32, subgroup = "sct-sciencepack-hightech", order = "b[capbank]", enabled = "false", @@ -504,6 +519,7 @@ name = "sct-htech-thermalstore", category = "advanced-crafting", icon = "__ScienceCostTweaker__/graphics/icons/sct-htech-thermalstore.png", + icon_size = 32, subgroup = "sct-sciencepack-hightech", order = "b[thermalstore]", enabled = "false", @@ -536,6 +552,7 @@ name = "sct-htech-random", category = "advanced-crafting", icon = "__ScienceCostTweaker__/graphics/icons/sct-htech-random.png", + icon_size = 32, subgroup = "sct-sciencepack-hightech", order = "b[random]", enabled = "false", diff -Nurd orig/SeaBlock_0.1.10/control.lua patched/SeaBlock_0.1.10/control.lua --- orig/SeaBlock_0.1.10/control.lua 2017-10-14 14:54:38.000000000 +0200 +++ patched/SeaBlock_0.1.10/control.lua 2017-12-16 13:06:02.678184866 +0100 @@ -124,11 +124,11 @@ local rby = e.area.right_bottom.y local size = startingsizes[surface.map_gen_settings.starting_area] local coarsesize = size[5] + 32 - if ltx * ltx + lty * lty > coarsesize * coarsesize then return end + --if ltx * ltx + lty * lty > coarsesize * coarsesize then return end - local ground = 'grass' + local ground = 'grass-1' if game.item_prototypes['landfill-dirt'] then - ground = 'dirt' + ground = 'dirt-1' end local ndx = size[1] local pdx = size[2] @@ -138,7 +138,7 @@ local tiles = {} for y = lty - 1, rby do for x = ltx - 1, rbx do - if x * x + y * y < startingsq then + --if x * x + y * y < startingsq then local existing = surface.get_tile(x,y).name if existing == 'dirt-dark' then w = "water" @@ -164,7 +164,7 @@ end end table.insert(tiles, {name = w, position = {x, y}}) - end + --end end end surface.set_tiles(tiles) diff -Nurd orig/SeaBlock_0.1.10/data.lua patched/SeaBlock_0.1.10/data.lua --- orig/SeaBlock_0.1.10/data.lua 2017-06-11 21:49:02.000000000 +0200 +++ patched/SeaBlock_0.1.10/data.lua 2017-12-16 12:50:08.345486948 +0100 @@ -4,9 +4,12 @@ table.insert(data.raw.player.player.crafting_categories, "crafting-handonly") for _,v in pairs(data.raw.tile) do - v.autoplace = nil + --v.autoplace = nil + if v.autoplace then +-- v.autoplace.peaks = {} + end end - +--[[ data.raw.tile['sand'].autoplace = { peaks = {{ influence = 0.1 @@ -21,7 +24,7 @@ starting_area_weight_max_range = 0 }} } - +]] local function worm_everywhere(distance) local ret = { sharpness = 1, @@ -52,9 +55,9 @@ return ret end -data.raw.turret['small-worm-turret'].autoplace = worm_everywhere(1) -data.raw.turret['medium-worm-turret'].autoplace = worm_everywhere(5) -data.raw.turret['big-worm-turret'].autoplace = worm_everywhere(11) +--data.raw.turret['small-worm-turret'].autoplace = worm_everywhere(1) +--data.raw.turret['medium-worm-turret'].autoplace = worm_everywhere(5) +--data.raw.turret['big-worm-turret'].autoplace = worm_everywhere(11) -- Build land for worms local autoplace = { @@ -91,12 +94,12 @@ if data.raw.item['landfill-dirt'] then ground = 'dirt' end -data.raw.tile[ground].autoplace = autoplace +--data.raw.tile[ground].autoplace = autoplace -- Shallow water around worm islands autoplace = table.deepcopy(autoplace) autoplace.peaks[4].influence = -1 -data.raw.tile['water'].autoplace = autoplace +--data.raw.tile['water'].autoplace = autoplace -- Use dirt-dark as marker for where shallow water should be in starting zone autoplace = table.deepcopy(autoplace) @@ -107,7 +110,7 @@ starting_area_weight_max_range = 0.01 } autoplace.peaks[4].influence = -0.3 -data.raw.tile['dirt-dark'].autoplace = autoplace +--data.raw.tile['dirt-dark'].autoplace = autoplace --[[ autoplace = data.raw.tile['water'].autoplace diff -Nurd orig/SeaBlock_0.1.10/data-updates.lua patched/SeaBlock_0.1.10/data-updates.lua --- orig/SeaBlock_0.1.10/data-updates.lua 2017-11-18 11:29:46.000000000 +0100 +++ patched/SeaBlock_0.1.10/data-updates.lua 2017-12-26 17:07:25.370853989 +0100 @@ -71,6 +71,23 @@ -- No wood for electric poles, use wood bricks instead data.raw.recipe['small-electric-pole'].ingredients = {{ "wood-bricks", 1 }, { "copper-cable", 2}} +-- No wood for wooden rails (Bio_Industries), use wood bricks instead +local function recipe_no_raw_wood(recipe) + local ingredients = recipe.normal.ingredients + ingredients["wood-bricks"] = ingredients["raw_wood"] + ingredients["raw_wood"] = nil + ingredients = recipe.expensive.ingredients + if ingredients then + ingredients["wood-bricks"] = ingredients["raw_wood"] + ingredients["raw_wood"] = nil + end +end + +if data.raw.recipe['bi-rail-wood'] then + recipe_no_raw_wood(data.raw.recipe['bi-rail-wood']) + recipe_no_raw_wood(data.raw.recipe['bi-rail-wood-bridge']) +end + -- Will need a lot of landfill data.raw.recipe['landfill'].ingredients = {{ "stone-crushed", 10 }} for k,v in pairs(data.raw.item) do @@ -88,28 +105,58 @@ data.raw['assembling-machine']['algae-farm'].crafting_speed = 1 data.raw['assembling-machine']['algae-farm'].energy_usage = "120kW" --- Increase output from nodule->slag slurry conversion, so washing plants are --- competitive with electrolyzers for slag slurry production. --- The dirt water electrolyzation recipe produces 10 slag-slurry worth of slag every 2 seconds. 5 per second. --- When using washing plants, the default recipes take 50 seconds to produce --- enough nodules to make 50 slag-slurry. 1 per second. --- So divide input amount of nodules by 5 to make ratio equal. --- Previous versions of sea block gave washing a 20% advantage. This was chosen before washing --- plants MK2 were available, and was a bit high. MK2 washing plants should not be better than MK4 electrolyzers. -lib.findname(data.raw.recipe['nodule-dissolution'].ingredients, 'solid-nodule').amount = 2 -- was 10 - -- Enable nodule-dissolution recipe -if data.raw.recipe['nodule-dissolution'] and - lib.findtechunlock('nodule-dissolution') == nil and - data.raw.technology['nodule-processing'] then - table.insert(data.raw.technology['nodule-processing'].effects, {type = "unlock-recipe", recipe = "nodule-dissolution"}) +if data.raw.recipe['nodule-dissolution'] then + -- Increase output from nodule->slag slurry conversion, so washing plants are + -- competitive with electrolyzers for slag slurry production. + -- The dirt water electrolyzation recipe produces 10 slag-slurry worth of slag every 2 seconds. 5 per second. + -- When using washing plants, the default recipes take 50 seconds to produce + -- enough nodules to make 50 slag-slurry. 1 per second. + -- So divide input amount of nodules by 5 to make ratio equal. + -- Previous versions of sea block gave washing a 20% advantage. This was chosen before washing + -- plants MK2 were available, and was a bit high. MK2 washing plants should not be better than MK4 electrolyzers. + lib.findname(data.raw.recipe['nodule-dissolution'].ingredients, 'solid-nodule').amount = 2 -- was 10 + + if lib.findtechunlock('nodule-dissolution') == nil and + data.raw.technology['nodule-processing'] then + table.insert(data.raw.technology['nodule-processing'].effects, {type = "unlock-recipe", recipe = "nodule-dissolution"}) + end end +-- Lower crystallizers and Filtration units to tire 1 ingredients +local buildingmulti = angelsmods.marathon.buildingmulti +data.raw.recipe['crystallizer'].normal.ingredients = { + {'steel-plate', 10}, + {'basic-circuit-board', 5}, + {'steel-pipe', 5}, + {'stone-brick', 10}, +} +data.raw.recipe['crystallizer'].expensive.ingredients = { + {'steel-plate', 2 * buildingmulti}, + {'basic-circuit-board', 5 * buildingmulti}, + {'steel-pipe', 8 * buildingmulti}, + {'stone-brick', 5 * buildingmulti}, +} +data.raw.recipe['filtration-unit'].normal.ingredients = { + {'steel-plate', 10}, + {'basic-circuit-board', 5}, + {'steel-pipe', 5}, + {'stone-brick', 10}, +} +data.raw.recipe['filtration-unit'].expensive.ingredients = { + {'steel-plate', 2 * buildingmulti}, + {'basic-circuit-board', 5 * buildingmulti}, + {'steel-pipe', 8 * buildingmulti}, + {'stone-brick', 5 * buildingmulti}, +} + -- Reduce sulfuric acid requirements for slag slurry production lib.findname(data.raw.recipe['slag-processing-dissolution'].ingredients, 'sulfuric-acid').amount = 12 lib.findname(data.raw.recipe['stone-crushed-dissolution'].ingredients, 'sulfuric-acid').amount = 12 -lib.findname(data.raw.recipe['nodule-dissolution'].ingredients, 'sulfuric-acid').amount = 12 - +if data.raw.recipe['nodule-dissolution'] then + lib.findname(data.raw.recipe['nodule-dissolution'].ingredients, 'sulfuric-acid').amount = 12 +end + -- Angels sludge crystalization usually gives normal smeltable ores. This would be far too easy, -- so change recipes to give the weird ores that need extra processing steps. for i = 1,6 do @@ -280,7 +327,13 @@ -- No resource placement for k,v in pairs(data.raw.resource) do - v.autoplace = nil + --v.autoplace = nil + if v.autoplace then + v.autoplace.richness_base = 0 + v.autoplace.richness_multiplier = 0 + v.autoplace.richness_multiplier_distance_bonus = 0 + v.autoplace.starting_area_amount = 0 + end end -- No spawners for k,v in pairs(data.raw["unit-spawner"]) do @@ -295,13 +348,13 @@ for k,v in pairs(data.raw["simple-entity"]) do v.autoplace = nil end - +--[[ local controls = data.raw['autoplace-control'] for k,v in pairs(controls) do if k ~= "enemy-base" then controls[k] = nil end end - +]] -- SpaceMod temp updates require "SpaceMod-updates" diff -Nurd orig/SeaBlock_0.1.10/info.json patched/SeaBlock_0.1.10/info.json --- orig/SeaBlock_0.1.10/info.json 2017-11-02 12:51:08.000000000 +0100 +++ patched/SeaBlock_0.1.10/info.json 2017-12-16 01:09:19.855389320 +0100 @@ -1,7 +1,7 @@ { "name": "SeaBlock", "version": "0.1.10", - "factorio_version": "0.15", + "factorio_version": "0.16", "title": "Sea Block", "author": "Trainwreck", "homepage": "https://forums.factorio.com/viewtopic.php?t=43759", diff -Nurd orig/SeaBlockMetaPack_0.15.0/info.json patched/SeaBlockMetaPack_0.15.0/info.json --- orig/SeaBlockMetaPack_0.15.0/info.json 2017-11-04 11:41:22.000000000 +0100 +++ patched/SeaBlockMetaPack_0.15.0/info.json 2017-12-15 18:30:38.517347604 +0100 @@ -1,7 +1,7 @@ { "name": "SeaBlockMetaPack", "version": "0.15.0", - "factorio_version": "0.15", + "factorio_version": "0.16", "title": "Sea Block Pack", "author": "Trainwreck", "homepage": "https://forums.factorio.com/viewtopic.php?t=43759",