diff --git a/machines/cable_former.lua b/machines/cable_former.lua index 919a0f4..4674e4f 100644 --- a/machines/cable_former.lua +++ b/machines/cable_former.lua @@ -25,8 +25,7 @@ industrialtest.internal.unpackTableInto(industrialtest.CableFormer,{ "industrialtest_machine_block.png", "industrialtest_machine_block.png", "industrialtest_machine_block.png", - "industrialtest_machine_block.png^industrialtest_cable_former_front.png", - "industrialtest_machine_block.png" + "industrialtest_machine_block.png^industrialtest_cable_former_front.png" }, requiresWrench=true, active={ @@ -36,8 +35,7 @@ industrialtest.internal.unpackTableInto(industrialtest.CableFormer,{ "industrialtest_machine_block.png", "industrialtest_machine_block.png", "industrialtest_machine_block.png", - "industrialtest_machine_block.png^industrialtest_cable_former_front_active.png", - "industrialtest_machine_block.png" + "industrialtest_machine_block.png^industrialtest_cable_former_front_active.png" } }, capacity=1400, diff --git a/machines/canning_machine.lua b/machines/canning_machine.lua index d8f2fa4..54cefe9 100644 --- a/machines/canning_machine.lua +++ b/machines/canning_machine.lua @@ -25,8 +25,7 @@ industrialtest.internal.unpackTableInto(industrialtest.CanningMachine,{ "industrialtest_machine_block.png", "industrialtest_machine_block.png", "industrialtest_machine_block.png", - "industrialtest_machine_block.png^industrialtest_canning_machine_front.png", - "industrialtest_machine_block.png" + "industrialtest_machine_block.png^industrialtest_canning_machine_front.png" }, sounds="metal", facedir=true, @@ -50,8 +49,7 @@ industrialtest.internal.unpackTableInto(industrialtest.CanningMachine,{ "industrialtest_machine_block.png", "industrialtest_machine_block.png", "industrialtest_machine_block.png", - "industrialtest_machine_block.png^industrialtest_canning_machine_front_active.png", - "industrialtest_machine_block.png" + "industrialtest_machine_block.png^industrialtest_canning_machine_front_active.png" } }, capacity=industrialtest.api.lvPowerFlow*2, diff --git a/machines/compressor.lua b/machines/compressor.lua index 5711b0d..3cbbb64 100644 --- a/machines/compressor.lua +++ b/machines/compressor.lua @@ -25,8 +25,7 @@ industrialtest.internal.unpackTableInto(industrialtest.Compressor,{ "industrialtest_machine_block.png", "industrialtest_machine_block.png", "industrialtest_machine_block.png", - "industrialtest_machine_block.png^industrialtest_compressor_front.png", - "industrialtest_machine_block.png" + "industrialtest_machine_block.png^industrialtest_compressor_front.png" }, requiresWrench=true, active={ @@ -36,8 +35,7 @@ industrialtest.internal.unpackTableInto(industrialtest.Compressor,{ "industrialtest_machine_block.png", "industrialtest_machine_block.png", "industrialtest_machine_block.png", - "industrialtest_machine_block.png^industrialtest_compressor_front_active.png", - "industrialtest_machine_block.png" + "industrialtest_machine_block.png^industrialtest_compressor_front_active.png" } }, capacity=1400, diff --git a/machines/electric_furnace.lua b/machines/electric_furnace.lua index 12f6191..51de5a9 100644 --- a/machines/electric_furnace.lua +++ b/machines/electric_furnace.lua @@ -25,8 +25,7 @@ industrialtest.internal.unpackTableInto(industrialtest.ElectricFurnace,{ "industrialtest_machine_block.png", "industrialtest_machine_block.png", "industrialtest_machine_block.png", - "industrialtest_machine_block.png^industrialtest_electric_furnace_front.png", - "industrialtest_machine_block.png" + "industrialtest_machine_block.png^industrialtest_electric_furnace_front.png" }, active={ tiles={ @@ -35,8 +34,7 @@ industrialtest.internal.unpackTableInto(industrialtest.ElectricFurnace,{ "industrialtest_machine_block.png", "industrialtest_machine_block.png", "industrialtest_machine_block.png", - "industrialtest_machine_block.png^industrialtest_electric_furnace_front_active.png", - "industrialtest_machine_block.png" + "industrialtest_machine_block.png^industrialtest_electric_furnace_front_active.png" } }, capacity=416, diff --git a/machines/extractor.lua b/machines/extractor.lua index acffb25..6fdee30 100644 --- a/machines/extractor.lua +++ b/machines/extractor.lua @@ -25,8 +25,7 @@ industrialtest.internal.unpackTableInto(industrialtest.Extractor,{ "industrialtest_machine_block.png", "industrialtest_machine_block.png", "industrialtest_machine_block.png", - "industrialtest_machine_block.png^industrialtest_extractor_front.png", - "industrialtest_machine_block.png" + "industrialtest_machine_block.png^industrialtest_extractor_front.png" }, requiresWrench=true, active={ @@ -36,8 +35,7 @@ industrialtest.internal.unpackTableInto(industrialtest.Extractor,{ "industrialtest_machine_block.png", "industrialtest_machine_block.png", "industrialtest_machine_block.png", - "industrialtest_machine_block.png^industrialtest_extractor_front_active.png", - "industrialtest_machine_block.png" + "industrialtest_machine_block.png^industrialtest_extractor_front_active.png" } }, capacity=1000, diff --git a/machines/generator.lua b/machines/generator.lua index 51e57d9..71d4a47 100644 --- a/machines/generator.lua +++ b/machines/generator.lua @@ -25,8 +25,7 @@ industrialtest.internal.unpackTableInto(industrialtest.Generator,{ "industrialtest_machine_block.png", "industrialtest_machine_block.png", "industrialtest_machine_block.png", - "industrialtest_machine_block.png^industrialtest_iron_furnace_front.png", - "industrialtest_machine_block.png" + "industrialtest_machine_block.png^industrialtest_iron_furnace_front.png" }, sounds="metal", facedir=true, @@ -41,8 +40,7 @@ industrialtest.internal.unpackTableInto(industrialtest.Generator,{ "industrialtest_machine_block.png", "industrialtest_machine_block.png", "industrialtest_machine_block.png", - "industrialtest_machine_block.png^industrialtest_iron_furnace_front_active.png", - "industrialtest_machine_block.png" + "industrialtest_machine_block.png^industrialtest_iron_furnace_front_active.png" }, lightSource=8 }, diff --git a/machines/iron_furnace.lua b/machines/iron_furnace.lua index 5b133d1..23e1d5e 100644 --- a/machines/iron_furnace.lua +++ b/machines/iron_furnace.lua @@ -25,8 +25,7 @@ industrialtest.internal.unpackTableInto(industrialtest.IronFurnace,{ "industrialtest_machine_block.png", "industrialtest_machine_block.png", "industrialtest_machine_block.png", - "industrialtest_machine_block.png^industrialtest_iron_furnace_front.png", - "industrialtest_machine_block.png" + "industrialtest_machine_block.png^industrialtest_iron_furnace_front.png" }, active={ tiles={ @@ -35,8 +34,7 @@ industrialtest.internal.unpackTableInto(industrialtest.IronFurnace,{ "industrialtest_machine_block.png", "industrialtest_machine_block.png", "industrialtest_machine_block.png", - "industrialtest_machine_block.png^industrialtest_iron_furnace_front_active.png", - "industrialtest_machine_block.png" + "industrialtest_machine_block.png^industrialtest_iron_furnace_front_active.png" }, lightSource=8 }, diff --git a/machines/macerator.lua b/machines/macerator.lua index 70828c0..76124ef 100644 --- a/machines/macerator.lua +++ b/machines/macerator.lua @@ -25,8 +25,7 @@ industrialtest.internal.unpackTableInto(industrialtest.Macerator,{ "industrialtest_machine_block.png", "industrialtest_machine_block.png", "industrialtest_machine_block.png", - "industrialtest_machine_block.png^industrialtest_macerator_front.png", - "industrialtest_machine_block.png" + "industrialtest_machine_block.png^industrialtest_macerator_front.png" }, requiresWrench=true, active={ @@ -36,8 +35,7 @@ industrialtest.internal.unpackTableInto(industrialtest.Macerator,{ "industrialtest_machine_block.png", "industrialtest_machine_block.png", "industrialtest_machine_block.png", - "industrialtest_machine_block.png^industrialtest_macerator_front_active.png", - "industrialtest_machine_block.png" + "industrialtest_machine_block.png^industrialtest_macerator_front_active.png" } }, capacity=1200, diff --git a/machines/mass_fabricator.lua b/machines/mass_fabricator.lua index c5bb7a2..6da6c84 100644 --- a/machines/mass_fabricator.lua +++ b/machines/mass_fabricator.lua @@ -25,8 +25,7 @@ industrialtest.internal.unpackTableInto(industrialtest.MassFabricator,{ "industrialtest_advanced_machine_block.png", "industrialtest_advanced_machine_block.png", "industrialtest_advanced_machine_block.png", - "industrialtest_advanced_machine_block.png^industrialtest_mass_fabricator_front.png", - "industrialtest_advanced_machine_block.png" + "industrialtest_advanced_machine_block.png^industrialtest_mass_fabricator_front.png" }, requiresWrench=true, active={ @@ -36,8 +35,7 @@ industrialtest.internal.unpackTableInto(industrialtest.MassFabricator,{ "industrialtest_advanced_machine_block.png", "industrialtest_advanced_machine_block.png", "industrialtest_advanced_machine_block.png", - "industrialtest_advanced_machine_block.png^industrialtest_mass_fabricator_front_active.png", - "industrialtest_advanced_machine_block.png" + "industrialtest_advanced_machine_block.png^industrialtest_mass_fabricator_front_active.png" } }, capacity=100000, diff --git a/machines/recycler.lua b/machines/recycler.lua index 3c7650e..6c9999e 100644 --- a/machines/recycler.lua +++ b/machines/recycler.lua @@ -25,8 +25,7 @@ industrialtest.internal.unpackTableInto(industrialtest.Recycler,{ "industrialtest_machine_block.png", "industrialtest_machine_block.png", "industrialtest_machine_block.png", - "industrialtest_machine_block.png^industrialtest_recycler_front.png", - "industrialtest_machine_block.png" + "industrialtest_machine_block.png^industrialtest_recycler_front.png" }, requiresWrench=true, active={ @@ -36,8 +35,7 @@ industrialtest.internal.unpackTableInto(industrialtest.Recycler,{ "industrialtest_machine_block.png", "industrialtest_machine_block.png", "industrialtest_machine_block.png", - "industrialtest_machine_block.png^industrialtest_recycler_front_active.png", - "industrialtest_machine_block.png" + "industrialtest_machine_block.png^industrialtest_recycler_front_active.png" } }, capacity=80,