Fix beacons

248k_2/bk_sprites.lua

@@ -1,5 +1,5 @@
 local function sprite(name)
-    return '__248k__/ressources/booktorio/bk_sprite_'..name
+    return '__248k_2__/ressources/booktorio/bk_sprite_'..name
 end
 
 data:extend(
@@ -31,7 +31,7 @@ data:extend(
 	{
 		type     = "sprite",
 		name     = "bk_sprite_4",		
-		filename = '__248k__/ressources/fusion/fu_fusor/fu_fusor_entity_animation.png',
+		filename = '__248k_2__/ressources/fusion/fu_fusor/fu_fusor_entity_animation.png',
 		width    = 512*2,
 		height   = 512*2,
 		scale    = 0.4
@@ -39,7 +39,7 @@ data:extend(
 	{
 		type     = "sprite",
 		name     = "bk_sprite_5",		
-		filename = '__248k__/ressources/fusion/fu_boiler/fu_boiler_entity_animation.png',
+		filename = '__248k_2__/ressources/fusion/fu_boiler/fu_boiler_entity_animation.png',
 		width    = 512,
 		height   = 512,
 		scale    = 0.7

248k_2/data.lua

@@ -122,7 +122,7 @@ data:extend({
     {
         type = "sprite",
         name = "sprite_248kmainbutton",
-        filename = "__248k__/ressources/groups/gr_group_icon.png",
+        filename = "__248k_2__/ressources/groups/gr_group_icon.png",
         priority = "extra-high",
         width = 64,
         height = 64,

248k_2/prototypes/248k_elements.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/elements/'..name
+    return '__248k_2__/ressources/elements/'..name
 end
 
 data:extend({

248k_2/prototypes/248k_fluids.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fluids/'..name
+    return '__248k_2__/ressources/fluids/'..name
 end
 
 local function burner_power()

248k_2/prototypes/248k_subgroups.lua

@@ -1,5 +1,5 @@
 local function sprite(name)
-    return '__248k__/ressources/groups/'..name
+    return '__248k_2__/ressources/groups/'..name
 end
 
 data:extend({

248k_2/prototypes/248k_techs.lua

@@ -1,6 +1,6 @@
 --local functions
 local function sprite(name)
-    return '__248k__/ressources/techs/'..name
+    return '__248k_2__/ressources/techs/'..name
 end
 --techs
 data:extend({
@@ -385,7 +385,7 @@ data:extend({
     {
         name = 'el_kerosene_tech',
         type = 'technology',
-        icon = '__248k__/ressources/techs/el_kerosene_tech.png',
+        icon = '__248k_2__/ressources/techs/el_kerosene_tech.png',
         icon_size = 128,
         prerequisites = {'el_ALK_tech'},
         effects = {

248k_2/prototypes/electronic/el_aluminum.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/electronic/el_aluminum/el_aluminum_'..name
+    return '__248k_2__/ressources/electronic/el_aluminum/el_aluminum_'..name
 end
 --ore
 data:extend({

248k_2/prototypes/electronic/el_ammo.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/electronic/el_ammo/el_ammo_'..name
+    return '__248k_2__/ressources/electronic/el_ammo/el_ammo_'..name
 end
 
 --item

248k_2/prototypes/electronic/el_arc_furnace.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/electronic/el_arc_furnace/el_arc_furnace_'..name
+    return '__248k_2__/ressources/electronic/el_arc_furnace/el_arc_furnace_'..name
 end
 
 --item
@@ -58,55 +58,50 @@ data:extend({
       energy_usage = '400kW',
       fluid_boxes = {
           {
-            
+
-            base_area = 1,
+            volume = 200,
-            height = 2,
             base_level = 1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "output", position = {0, -4}},
+              {flow_direction = "output", direction = defines.direction.north, position = {0, -3}},
-            },
-            production_type = "output"
-          },
-          { 
-            
-            base_area = 1,
-            height = 2,
-            base_level = 1,
-            pipe_covers = pipecoverspictures(),
-            pipe_picture = grey_south_pipe_picture,
-            pipe_connections =
-            {
-              {type = "output", position = {-4, 0}}
-            },
-            production_type = "output"
-          },
-          { 
-            
-            base_area = 1,
-            height = 2,
-            base_level = 1,
-            pipe_covers = pipecoverspictures(),
-            pipe_picture = grey_south_pipe_picture,
-            pipe_connections =
-            {
-              {type = "output", position = {4, 0}},
-              --{type = "output", position = {2, -2.5}}
             },
             production_type = "output"
           },
           {
-            
+
-            base_area = 1,
+            volume = 200,
-            height = 2,
             base_level = 1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "output", position = {0, 4}},
+              {flow_direction = "output", direction = defines.direction.west, position = {-3, 0}}
+            },
+            production_type = "output"
+          },
+          {
+
+            volume = 200,
+            base_level = 1,
+            pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
+            pipe_connections =
+            {
+              {flow_direction = "output", direction = defines.direction.east, position = {3, 0}},
+            },
+            production_type = "output"
+          },
+          {
+
+            volume = 200,
+            base_level = 1,
+            pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
+            pipe_connections =
+            {
+              {flow_direction = "output", direction = defines.direction.south, position = {0, 3}},
             },
             production_type = "output"
           },
@@ -150,25 +145,4 @@ data:extend({
         apparent_volume = 0.1,
       },
   },
-})
+})
-
---{
---    production_type = "input",
-    --pipe_picture = assembler2pipepictures(),
-    --pipe_covers = pipecoverspictures(),
---    base_area = 10,
---    base_level = -1,
---    pipe_connections = {
---        { type="input", position = {-2, -2,5} },
---        { type="input", position = {2, -2.5} },
---    },
---  },
---  {
---    production_type = "output",
-    --pipe_picture = assembler2pipepictures(),
-    --pipe_covers = pipecoverspictures(),
---    base_area = 10,
---    base_level = 1,
---    pipe_connections = {{ type="output", position = {2, 2.5} }},
---  },
---  off_when_no_fluid_recipe = true

248k_2/prototypes/electronic/el_burner.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/electronic/el_burner/el_burner_'..name
+    return '__248k_2__/ressources/electronic/el_burner/el_burner_'..name
 end
 
 local function burner_output()
@@ -73,7 +73,7 @@ data:extend({
             fuel_inventory_size = 3,
             burnt_inventory_size = 3,
             effectivity = 0.95,
-            emissions_per_minute = 20,
+            emissions_per_minute = { pollution = 20 },
             fuel_categories = {"chemical", "charged_fuel"},
             smoke = {
                 {
@@ -131,7 +131,7 @@ data:extend({
             type = 'electric',
             usage_priority = 'primary-output',
             input_flow_limit = '0W',
-            emissions_per_minute = 20,
+            emissions_per_minute = { pollution = 20 },
         },
         max_power_output = burner_output(),
         maximum_temperature = 40,
@@ -139,8 +139,8 @@ data:extend({
         burns_fluid = true,
         fluid_usage_per_tick = 1,
         fluid_box = {
-            base_area = 1,
+
-            height = 2,
+            volume = 200,
             base_level = -1,
             filter = 'el_desulfurized_kerosene',
             pipe_covers = pipecoverspictures(),
@@ -149,10 +149,10 @@ data:extend({
             maximum_temperature = 40,
             production_type = 'input-output', 
             pipe_connections = {
-                {type = "input-output", position = {2, 0}},  
+                {flow_direction = "input-output", direction = defines.direction.east, position = {1, 0}},
-                {type = "input-output", position = {-2, 0}},  
+                {flow_direction = "input-output", direction = defines.direction.west, position = {-1, 0}},
-                {type = "input-output", position = {0, 2}},  
+                {flow_direction = "input-output", direction = defines.direction.south, position = {0, 1}},
-                {type = "input-output", position = {0, -2}},  
+                {flow_direction = "input-output", direction = defines.direction.north, position = {0, -1}},
             },
         },
         fluid_input = {

248k_2/prototypes/electronic/el_caster.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/electronic/el_caster/el_caster_'..name
+    return '__248k_2__/ressources/electronic/el_caster/el_caster_'..name
 end
 
 --item
@@ -59,55 +59,50 @@ data:extend({
       energy_usage = '100kW',
       fluid_boxes = {
           {
-            
+
-            base_area = 1,
+            volume = 200,
-            height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "input", position = {0, -4}},
+              {flow_direction = "input", direction = defines.direction.north, position = {0, -3}},
-            },
-            production_type = "input"
-          },
-          { 
-            
-            base_area = 1,
-            height = 2,
-            base_level = -1,
-            pipe_covers = pipecoverspictures(),
-            pipe_picture = grey_south_pipe_picture,
-            pipe_connections =
-            {
-              {type = "input", position = {-4, 0}}
-            },
-            production_type = "input"
-          },
-          { 
-            
-            base_area = 1,
-            height = 2,
-            base_level = -1,
-            pipe_covers = pipecoverspictures(),
-            pipe_picture = grey_south_pipe_picture,
-            pipe_connections =
-            {
-              {type = "input", position = {4, 0}},
-              --{type = "output", position = {2, -2.5}}
             },
             production_type = "input"
           },
           {
-            
+
-            base_area = 1,
+            volume = 200,
-            height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "input", position = {0, 4}},
+              {flow_direction = "input", direction = defines.direction.west, position = {-3, 0}}
+            },
+            production_type = "input"
+          },
+          {
+
+            volume = 200,
+            base_level = -1,
+            pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
+            pipe_connections =
+            {
+              {flow_direction = "input", direction = defines.direction.east, position = {3, 0}},
+            },
+            production_type = "input"
+          },
+          {
+
+            volume = 200,
+            base_level = -1,
+            pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
+            pipe_connections =
+            {
+              {flow_direction = "input", direction = defines.direction.south, position = {0, 3}},
             },
             production_type = "input"
           },
@@ -144,25 +139,4 @@ data:extend({
         apparent_volume = 0.1,
       },
   },
-})
+})
-
---{
---    production_type = "input",
-    --pipe_picture = assembler2pipepictures(),
-    --pipe_covers = pipecoverspictures(),
---    base_area = 10,
---    base_level = -1,
---    pipe_connections = {
---        { type="input", position = {-2, -2,5} },
---        { type="input", position = {2, -2.5} },
---    },
---  },
---  {
---    production_type = "output",
-    --pipe_picture = assembler2pipepictures(),
-    --pipe_covers = pipecoverspictures(),
---    base_area = 10,
---    base_level = 1,
---    pipe_connections = {{ type="output", position = {2, 2.5} }},
---  },
---  off_when_no_fluid_recipe = true

248k_2/prototypes/electronic/el_charger.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/electronic/el_charger/el_charger_'..name
+    return '__248k_2__/ressources/electronic/el_charger/el_charger_'..name
 end
 
 --item
@@ -27,7 +27,6 @@ data:extend({
   --prototype
   {
       name = 'el_charger_entity',
-      --type = 'furnace',
       type = 'assembling-machine',
       icon = sprite('icon.png'),
       icon_size = 64,
@@ -42,10 +41,7 @@ data:extend({
           result = 'el_charger_item',
       },
       crafting_categories = {'el_charger_category'},
-      --result_inventory_size = 1,
-      --source_inventory_size = 1,
       crafting_speed = 1,
-      --fixed_recipe = 'el_water_pressure_recipe',
       energy_source = {
           type = 'electric',
           usage_priority = 'secondary-input',
@@ -54,58 +50,53 @@ data:extend({
       fluid_boxes = {
         {
           
-          base_area = 20,
+          volume = 4000,
           filter = 'water',
-          height = 2,
           base_level = -1,
           pipe_covers = pipecoverspictures(),
           pipe_picture = grey_south_pipe_picture,
           pipe_connections =
           {
-            {type = "input", position = {0, -4}},
+            {flow_direction = "input", direction = defines.direction.north, position = {0, -3}},
           },
           production_type = "input"
         },
-        { 
+        {
-          
+
-          base_area = 20,
+          volume = 4000,
-          height = 2,
           filter = 'fu_oxygen',
           base_level = 1,
           pipe_covers = pipecoverspictures(),
           pipe_picture = grey_south_pipe_picture,
           pipe_connections =
           {
-            {type = "output", position = {-4, 0}}
+            {flow_direction = "output", direction = defines.direction.west, position = {-3, 0}}
-          },
-          production_type = "output"
-        },
-        { 
-          
-          base_area = 20,
-          height = 2,
-          filter = 'fu_hydrogen',
-          base_level = 1,
-          pipe_covers = pipecoverspictures(),
-          pipe_picture = grey_south_pipe_picture,
-          pipe_connections =
-          {
-            {type = "output", position = {4, 0}},
-            --{type = "output", position = {2, -2.5}}
           },
           production_type = "output"
         },
         {
-          
+
-          base_area = 20,
+          volume = 4000,
-          height = 2,
           filter = 'fu_hydrogen',
           base_level = 1,
           pipe_covers = pipecoverspictures(),
           pipe_picture = grey_south_pipe_picture,
           pipe_connections =
           {
-            {type = "output", position = {0, 4}},
+            {flow_direction = "output", direction = defines.direction.east, position = {3, 0}},
+          },
+          production_type = "output"
+        },
+        {
+
+          volume = 4000,
+          filter = 'fu_hydrogen',
+          base_level = 1,
+          pipe_covers = pipecoverspictures(),
+          pipe_picture = grey_south_pipe_picture,
+          pipe_connections =
+          {
+            {flow_direction = "output", direction = defines.direction.south, position = {0, 3}},
           },
           production_type = "output"
         },
@@ -149,25 +140,4 @@ data:extend({
         apparent_volume = 0.1,
       },
   },
-})
+})
-
---{
---    production_type = "input",
-    --pipe_picture = assembler2pipepictures(),
-    --pipe_covers = pipecoverspictures(),
---    base_area = 10,
---    base_level = -1,
---    pipe_connections = {
---        { type="input", position = {-2, -2,5} },
---        { type="input", position = {2, -2.5} },
---    },
---  },
---  {
---    production_type = "output",
-    --pipe_picture = assembler2pipepictures(),
-    --pipe_covers = pipecoverspictures(),
---    base_area = 10,
---    base_level = 1,
---    pipe_connections = {{ type="output", position = {2, 2.5} }},
---  },
---  off_when_no_fluid_recipe = true

248k_2/prototypes/electronic/el_diesel_train.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/electronic/el_diesel_train/el_diesel_train_'..name
+    return '__248k_2__/ressources/electronic/el_diesel_train/el_diesel_train_'..name
 end
 
 --item
@@ -64,7 +64,7 @@ data:extend({
             fuel_category = 'el_train_fuel',
             fuel_inventory_size = 3,
             effectitvity = 1,
-            emissions_per_minute = 20,
+            emissions_per_minute = { pollution = 20 },
             smoke = {
                 {
                     name = "train-smoke",

248k_2/prototypes/electronic/el_energy_crystal.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/electronic/el_energy_crystal/el_energy_crystal_'..name
+    return '__248k_2__/ressources/electronic/el_energy_crystal/el_energy_crystal_'..name
 end
 
 throw_projectile =

248k_2/prototypes/electronic/el_grower.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-  return '__248k__/ressources/electronic/el_grower/el_grower_'..name
+  return '__248k_2__/ressources/electronic/el_grower/el_grower_'..name
 end
 
 --item
@@ -59,51 +59,50 @@ data:extend({
     energy_usage = '200kW',
     fluid_boxes = {
         {
-          base_area = 1,
+
-          height = 2,
+          volume = 200,
           base_level = -1,
           pipe_covers = pipecoverspictures(),
           pipe_picture = south_basic_pipe_picture,
           pipe_connections =
           {
-            {type = "input", position = {0, -3}},
+            {flow_direction = "input", direction = defines.direction.north, position = {0, -2}},
-          },
-          production_type = "input"
-        },
-        { 
-          base_area = 1,
-          height = 2,
-          base_level = -1,
-          pipe_covers = pipecoverspictures(),
-          pipe_picture = south_basic_pipe_picture,
-          pipe_connections =
-          {
-            {type = "input", position = {-3, 0}}
-          },
-          production_type = "input"
-        },
-        { 
-          base_area = 1,
-          height = 2,
-          base_level = -1,
-          pipe_covers = pipecoverspictures(),
-          pipe_picture = south_basic_pipe_picture,
-          pipe_connections =
-          {
-            {type = "input", position = {3, 0}},
-            --{type = "output", position = {2, -2.5}}
           },
           production_type = "input"
         },
         {
-          base_area = 1,
+
-          height = 2,
+          volume = 200,
           base_level = -1,
           pipe_covers = pipecoverspictures(),
           pipe_picture = south_basic_pipe_picture,
           pipe_connections =
           {
-            {type = "input", position = {0, 3}},
+            {flow_direction = "input", direction = defines.direction.west, position = {-2, 0}}
+          },
+          production_type = "input"
+        },
+        {
+
+          volume = 200,
+          base_level = -1,
+          pipe_covers = pipecoverspictures(),
+          pipe_picture = south_basic_pipe_picture,
+          pipe_connections =
+          {
+            {flow_direction = "input", direction = defines.direction.east, position = {2, 0}},
+          },
+          production_type = "input"
+        },
+        {
+
+          volume = 200,
+          base_level = -1,
+          pipe_covers = pipecoverspictures(),
+          pipe_picture = south_basic_pipe_picture,
+          pipe_connections =
+          {
+            {flow_direction = "input", direction = defines.direction.south, position = {0, 2}},
           },
           production_type = "input"
         },

248k_2/prototypes/electronic/el_ki/el_ki_beacon.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/electronic/el_ki/el_ki_beacon/el_ki_beacon_'..name
+    return '__248k_2__/ressources/electronic/el_ki/el_ki_beacon/el_ki_beacon_'..name
 end
 
 local function config_blueprintable(name,int)
@@ -81,11 +81,12 @@ data:extend({
             input_flow_limit = '400MW',
         },
         energy_usage = '0.4MW',
-        module_specification = {
+        module_slots = 2,
-            module_slots = 2,
+        icons_positioning = {{
-            module_info_icon_shift = {0, 0.5},
+            inventory_index = defines.inventory.beacon_modules,
-            module_info_multi_row_initial_height_modifier = -0.3,
+            shift = {0, 0.5},
-        },
+            multi_row_initial_height_modifier = -0.3,
+        }},
         supply_area_distance = config('supply_area'),
         radius_visualisation_picture =
 		{
@@ -146,11 +147,12 @@ data:extend({
             input_flow_limit = '400MW',
         },
         energy_usage = '4MW',
-        module_specification = {
+        module_slots = 6,
-            module_slots = 6,
+        icons_positioning = {{
-            module_info_icon_shift = {0, 0.5},
+            inventory_index = defines.inventory.beacon_modules,
-            module_info_multi_row_initial_height_modifier = -0.3,
+            shift = {0, 0.5},
-        },
+            multi_row_initial_height_modifier = -0.3,
+        }},
         supply_area_distance = config('supply_area_2'),
         radius_visualisation_picture =
 		{
@@ -211,11 +213,12 @@ data:extend({
             input_flow_limit = '400MW',
         },
         energy_usage = '40MW',
-        module_specification = {
+        module_slots = 18,
-            module_slots = 18,
+        icons_positioning = {{
-            module_info_icon_shift = {0, 0.5},
+            inventory_index = defines.inventory.beacon_modules,
-            module_info_multi_row_initial_height_modifier = -0.3,
+            shift = {0, 0.5},
-        },
+            multi_row_initial_height_modifier = -0.3,
+        }},
         supply_area_distance = config('supply_area_3'),
         radius_visualisation_picture =
 		{

248k_2/prototypes/electronic/el_ki/el_ki_core.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/electronic/el_ki/el_ki_core/el_ki_core_'..name
+    return '__248k_2__/ressources/electronic/el_ki/el_ki_core/el_ki_core_'..name
 end
 
 local function core_input(core_number)
@@ -100,53 +100,53 @@ data:extend({
         fluid_boxes = {
             {
                 filter = 'el_ki_cpu_fluid',
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
                 pipe_picture = grey_south_long_north_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {0.5, -3.5}},
+                  {flow_direction = "input", direction = defines.direction.north, position = {0.5, -2.5}},
                 },
                 production_type = "input"
             },
             {
                 filter = 'el_ki_cpu_fluid',
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
                 pipe_picture = grey_south_long_north_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {-0.5, -3.5}},
+                  {flow_direction = "input", direction = defines.direction.north, position = {-0.5, -2.5}},
                 },
                 production_type = "input"
             },
             {
                 filter = 'el_ki_memory_fluid',
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
                 pipe_picture = grey_south_long_north_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {0.5, 3.5}},
+                  {flow_direction = "input", direction = defines.direction.south, position = {0.5, 2.5}},
                 },
                 production_type = "input"
             },
             {
                 filter = 'el_ki_memory_fluid',
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
                 pipe_picture = grey_south_long_north_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {-0.5, 3.5}},
+                  {flow_direction = "input", direction = defines.direction.south, position = {-0.5, 2.5}},
                 },
                 production_type = "input"
             },
@@ -194,12 +194,12 @@ data:extend({
         energy_usage = '1W',
         supply_area_distance = 0,
         allowed_effects = allowed_modules, 
-        module_specification =
+        module_slots = 2,
-        {
+        icons_positioning = {{
-            module_slots = 2,
+            inventory_index = defines.inventory.beacon_modules,
-            module_info_icon_shift = {0, 0.5},
+            shift = {0, 0.5},
-            module_info_multi_row_initial_height_modifier = -0.3
+            multi_row_initial_height_modifier = -0.3,
-        },
+        }},
     },
     --slave container
     {
@@ -243,79 +243,79 @@ data:extend({
         fluid_boxes = {
             {
                 filter = 'el_ki_cpu_fluid',
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
                 pipe_picture = grey_south_long_north_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {0.5, -3.5}},
+                  {flow_direction = "input", direction = defines.direction.north, position = {0.5, -2.5}},
                 },
                 production_type = "input"
             },
             {
                 filter = 'el_ki_cpu_fluid',
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
                 pipe_picture = grey_south_long_north_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {-0.5, -3.5}},
+                  {flow_direction = "input", direction = defines.direction.north, position = {-0.5, -2.5}},
                 },
                 production_type = "input"
             },
             {
                 filter = 'el_ki_memory_fluid',
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
                 pipe_picture = grey_south_long_north_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {0.5, 3.5}},
+                  {flow_direction = "input", direction = defines.direction.south, position = {0.5, 2.5}},
                 },
                 production_type = "input"
             },
             {
                 filter = 'el_ki_memory_fluid',
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
                 pipe_picture = grey_south_long_north_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {-0.5, 3.5}},
+                  {flow_direction = "input", direction = defines.direction.south, position = {-0.5, 2.5}},
                 },
                 production_type = "input"
             },
             {
                 filter = 'fi_ki_circuit_fluid',
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
                 pipe_picture = grey_south_long_north_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {3.5, 0.5}},
+                  {flow_direction = "input", direction = defines.direction.east, position = {2.5, 0.5}},
                 },
                 production_type = "input"
             },
             {
                 filter = 'fi_ki_circuit_fluid',
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
                 pipe_picture = grey_south_long_north_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {3.5, -0.5}},
+                  {flow_direction = "input", direction = defines.direction.east, position = {2.5, -0.5}},
                 },
                 production_type = "input"
             }
@@ -363,12 +363,12 @@ data:extend({
         energy_usage = '1W',
         supply_area_distance = 0,
         allowed_effects = allowed_modules, 
-        module_specification =
+        module_slots = 2,
-        {
+        icons_positioning = {{
-            module_slots = 2,
+            inventory_index = defines.inventory.beacon_modules,
-            module_info_icon_shift = {0, 0.5},
+            shift = {0, 0.5},
-            module_info_multi_row_initial_height_modifier = -0.3
+            multi_row_initial_height_modifier = -0.3,
-        },
+        }},
     },
     --slave container
     {
@@ -412,105 +412,105 @@ data:extend({
         fluid_boxes = {
             {
                 filter = 'el_ki_cpu_fluid',
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
                 pipe_picture = grey_south_long_north_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {0.5, -3.5}},
+                  {flow_direction = "input", direction = defines.direction.north, position = {0.5, -2.5}},
                 },
                 production_type = "input"
             },
             {
                 filter = 'el_ki_cpu_fluid',
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
                 pipe_picture = grey_south_long_north_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {-0.5, -3.5}},
+                  {flow_direction = "input", direction = defines.direction.north, position = {-0.5, -2.5}},
                 },
                 production_type = "input"
             },
             {
                 filter = 'el_ki_memory_fluid',
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
                 pipe_picture = grey_south_long_north_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {0.5, 3.5}},
+                  {flow_direction = "input", direction = defines.direction.south, position = {0.5, 2.5}},
                 },
                 production_type = "input"
             },
             {
                 filter = 'el_ki_memory_fluid',
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
                 pipe_picture = grey_south_long_north_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {-0.5, 3.5}},
+                  {flow_direction = "input", direction = defines.direction.south, position = {-0.5, 2.5}},
                 },
                 production_type = "input"
             },
             {
                 filter = 'fi_ki_circuit_fluid',
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
                 pipe_picture = grey_south_long_north_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {3.5, 0.5}},
+                  {flow_direction = "input", direction = defines.direction.east, position = {2.5, 0.5}},
                 },
                 production_type = "input"
             },
             {
                 filter = 'fi_ki_circuit_fluid',
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
                 pipe_picture = grey_south_long_north_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {3.5, -0.5}},
+                  {flow_direction = "input", direction = defines.direction.east, position = {2.5, -0.5}},
                 },
                 production_type = "input"
             },
             {
                 filter = 'fu_ki_circuit_fluid',
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
                 pipe_picture = grey_south_long_north_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {-3.5, 0.5}},
+                  {flow_direction = "input", direction = defines.direction.west, position = {-2.5, 0.5}},
                 },
                 production_type = "input"
             },
             {
                 filter = 'fu_ki_circuit_fluid',
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
                 pipe_picture = grey_south_long_north_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {-3.5, -0.5}},
+                  {flow_direction = "input", direction = defines.direction.west, position = {-2.5, -0.5}},
                 },
                 production_type = "input"
             }
@@ -558,12 +558,12 @@ data:extend({
         energy_usage = '1W',
         supply_area_distance = 0,
         allowed_effects = allowed_modules, 
-        module_specification =
+        module_slots = 2,
-        {
+        icons_positioning = {{
-            module_slots = 2,
+            inventory_index = defines.inventory.beacon_modules,
-            module_info_icon_shift = {0, 0.5},
+            shift = {0, 0.5},
-            module_info_multi_row_initial_height_modifier = -0.3
+            multi_row_initial_height_modifier = -0.3,
-        },
+        }},
     },
     --slave container
     {

248k_2/prototypes/electronic/el_ki/el_ki_cpu.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/electronic/el_ki/el_ki_cpu/el_ki_cpu_'..name
+    return '__248k_2__/ressources/electronic/el_ki/el_ki_cpu/el_ki_cpu_'..name
 end
 
 --item
@@ -53,14 +53,14 @@ data:extend({
         fluid_boxes = {
             {
               filter = 'el_ki_cpu_fluid',
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
               pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
-                {type = "output", position = {0, 2}},
+                {flow_direction = "output", direction = defines.direction.east, position = {0, 1}},
               },
               production_type = "output"
             },

248k_2/prototypes/electronic/el_ki/el_ki_linker.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/electronic/el_ki/el_ki_linker/el_ki_'..name
+    return '__248k_2__/ressources/electronic/el_ki/el_ki_linker/el_ki_'..name
 end
 
 data:extend({
@@ -43,7 +43,8 @@ data:extend({
         stack_size = 1,
         icon_size = 64,
         icon = sprite('selection_tool.png'),
-        flags = {"hidden","mod-openable","only-in-cursor"},
+        flags = {"mod-openable","only-in-cursor"},
+        hidden = true,
         selection_color = {r=0.79, g=0.4, b=0, a=0.5 },
         selection_mode = {"any-entity"},
         selection_cursor_box_type = "entity",
@@ -56,7 +57,7 @@ data:extend({
     {
 		type     = "sprite",
 		name     = "el_ki_not_operable_icon",		
-		filename = "__248k__/ressources/electronic/el_ki/el_ki_linker/el_ki_not_operable_icon.png",
+		filename = "__248k_2__/ressources/electronic/el_ki/el_ki_linker/el_ki_not_operable_icon.png",
 		width    = 64,
 		height   = 64,
 		scale    = 1

248k_2/prototypes/electronic/el_ki/el_ki_memory.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/electronic/el_ki/el_ki_memory/el_ki_memory_'..name
+    return '__248k_2__/ressources/electronic/el_ki/el_ki_memory/el_ki_memory_'..name
 end
 
 --item
@@ -53,14 +53,14 @@ data:extend({
         fluid_boxes = {
             {
               filter = 'el_ki_memory_fluid',
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
               pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
-                {type = "output", position = {0, 2}},
+                {flow_direction = "output", direction = defines.direction.east, position = {0, 1}},
               },
               production_type = "output"
             },

248k_2/prototypes/electronic/el_ki/fi_ki_circuit.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/electronic/el_ki/fi_ki_circuit/fi_ki_circuit_'..name
+    return '__248k_2__/ressources/electronic/el_ki/fi_ki_circuit/fi_ki_circuit_'..name
 end
 
 --item
@@ -53,14 +53,14 @@ data:extend({
         fluid_boxes = {
             {
               filter = 'fi_ki_circuit_fluid',
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
               pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
-                {type = "output", position = {0, 2}},
+                {flow_direction = "output", direction = defines.direction.east, position = {0, 1}},
               },
               production_type = "output"
             },

248k_2/prototypes/electronic/el_ki/fu_ki_circuit.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/electronic/el_ki/fu_ki_circuit/fu_ki_circuit_'..name
+    return '__248k_2__/ressources/electronic/el_ki/fu_ki_circuit/fu_ki_circuit_'..name
 end
 
 --item
@@ -53,14 +53,14 @@ data:extend({
         fluid_boxes = {
             {
               filter = 'fu_ki_circuit_fluid',
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
               pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
-                {type = "output", position = {0, 2}},
+                {flow_direction = "output", direction = defines.direction.east, position = {0, 1}},
               },
               production_type = "output"
             },

248k_2/prototypes/electronic/el_lithium.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/electronic/el_lithium/el_lithium_'..name
+    return '__248k_2__/ressources/electronic/el_lithium/el_lithium_'..name
 end
 --ore
 data:extend({

248k_2/prototypes/electronic/el_materials.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/electronic/el_materials/el_materials_'..name
+    return '__248k_2__/ressources/electronic/el_materials/el_materials_'..name
 end
 
 --item

248k_2/prototypes/electronic/el_pressurizer.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/electronic/el_pressurizer/el_pressurizer_'..name
+    return '__248k_2__/ressources/electronic/el_pressurizer/el_pressurizer_'..name
 end
 
 --item
@@ -48,60 +48,59 @@ data:extend({
           type = 'electric',
           usage_priority = 'secondary-input',
           input_flow_limit = '60kW',
-          emissions_per_minute = 25,
+          emissions_per_minute = { pollution = 25 },
       },
       energy_usage = '40kW',
       fluid_boxes = {
           {
             filter = 'water',
-            base_area = 1,
+
-            height = 2,
+            volume = 200,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "input", position = {0, -2}},
+              {flow_direction = "input", direction = defines.direction.north, position = {0, -1}},
             },
             production_type = "input"
           },
           { 
             filter = 'steam',
-            base_area = 1,
+
-            height = 2,
+            volume = 200,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "input", position = {-2, 0}}
+              {flow_direction = "input", direction = defines.direction.west, position = {-1, 0}}
             },
             production_type = "input"
           },
           { 
             filter = 'el_pressurized_water',
-            base_area = 1,
+
-            height = 2,
+            volume = 200,
             base_level = 1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "output", position = {2, 0}},
+              {flow_direction = "output", direction = defines.direction.east, position = {1, 0}},
-              --{type = "output", position = {2, -2.5}}
             },
             production_type = "output"
           },
           {
             filter = 'water',
-            base_area = 1,
+
-            height = 2,
+            volume = 200,
             base_level = 1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "output", position = {0, 2}},
+              {flow_direction = "output", direction = defines.direction.south, position = {0, 1}},
             },
             production_type = "output"
           },
@@ -147,25 +146,4 @@ data:extend({
         apparent_volume = 0.05,
       },
   },
-})
+})
-
---{
---    production_type = "input",
-    --pipe_picture = assembler2pipepictures(),
-    --pipe_covers = pipecoverspictures(),
---    base_area = 10,
---    base_level = -1,
---    pipe_connections = {
---        { type="input", position = {-2, -2,5} },
---        { type="input", position = {2, -2.5} },
---    },
---  },
---  {
---    production_type = "output",
-    --pipe_picture = assembler2pipepictures(),
-    --pipe_covers = pipecoverspictures(),
---    base_area = 10,
---    base_level = 1,
---    pipe_connections = {{ type="output", position = {2, 2.5} }},
---  },
---  off_when_no_fluid_recipe = true

248k_2/prototypes/electronic/el_purifier.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/electronic/el_purifier/el_purifier_'..name
+    return '__248k_2__/ressources/electronic/el_purifier/el_purifier_'..name
 end
 
 --item
@@ -60,54 +60,53 @@ data:extend({
       fluid_boxes = {
           {
             filter = 'water',
-            base_area = 1,
+
-            height = 2,
+            volume = 200,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "input", position = {0, -4}},
+              {flow_direction = "input", direction = defines.direction.north, position = {0, -3}},
             },
             production_type = "input"
           },
           { 
             filter = 'water',
-            base_area = 1,
+
-            height = 2,
+            volume = 200,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "input", position = {-4, 0}}
+              {flow_direction = "input", direction = defines.direction.west, position = {-3, 0}}
             },
             production_type = "input"
           },
           { 
             filter = 'el_dirty_water',
-            base_area = 1,
+
-            height = 2,
+            volume = 200,
             base_level = 1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "output", position = {4, 0}},
+              {flow_direction = "output", direction = defines.direction.east, position = {3, 0}},
-              --{type = "output", position = {2, -2.5}}
             },
             production_type = "output"
           },
           {
             filter = 'el_dirty_water',
-            base_area = 1,
+
-            height = 2,
+            volume = 200,
             base_level = 1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "output", position = {0, 4}},
+              {flow_direction = "output", direction = defines.direction.south, position = {0, 3}},
             },
             production_type = "output"
           },
@@ -144,25 +143,4 @@ data:extend({
         apparent_volume = 0.1,
       },
   },
-})
+})
-
---{
---    production_type = "input",
-    --pipe_picture = assembler2pipepictures(),
-    --pipe_covers = pipecoverspictures(),
---    base_area = 10,
---    base_level = -1,
---    pipe_connections = {
---        { type="input", position = {-2, -2,5} },
---        { type="input", position = {2, -2.5} },
---    },
---  },
---  {
---    production_type = "output",
-    --pipe_picture = assembler2pipepictures(),
-    --pipe_covers = pipecoverspictures(),
---    base_area = 10,
---    base_level = 1,
---    pipe_connections = {{ type="output", position = {2, 2.5} }},
---  },
---  off_when_no_fluid_recipe = true

248k_2/prototypes/electronic/el_solar.lua

@@ -4,20 +4,20 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/electronic/el_solar/el_solar_'..name
+    return '__248k_2__/ressources/electronic/el_solar/el_solar_'..name
 end
 
 local function solar_output()
     if config("power_output") == "80kW (normal)" then
-        return "80KW"
+        return "80kW"
     end
 
     if config("power_output") == "100kW (high)" then
-        return "100KW"
+        return "100kW"
     end
 
     if config("power_output") == "160kW (very high)" then
-        return "160KW"
+        return "160kW"
     end
     
     return "80kW"

248k_2/prototypes/electronic/el_tank.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/electronic/el_tank/el_tank_'..name
+    return '__248k_2__/ressources/electronic/el_tank/el_tank_'..name
 end
 
 local tank_color = {r=1.7,g=1.7,b=1.7}
@@ -87,24 +87,23 @@ data:extend({
         },
         flow_length_in_ticks = 1,
         fluid_box = {
-            base_area = 5000,
+            volume = 500000,
-            height = 1,
             base_level = 0,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "input-output", position = {-4, 1}},
+              {flow_direction = "input-output", direction = defines.direction.west, position = {-3, 1}},
-              {type = "input-output", position = {-4, -1}},
+              {flow_direction = "input-output", direction = defines.direction.west, position = {-3, -1}},
 
-              {type = "input-output", position = {4, 1}},
+              {flow_direction = "input-output", direction = defines.direction.east, position = {3, 1}},
-              {type = "input-output", position = {4, -1}},
+              {flow_direction = "input-output", direction = defines.direction.east, position = {3, -1}},
 
-              {type = "input-output", position = {1, 4}},
+              {flow_direction = "input-output", direction = defines.direction.south, position = {1, 3}},
-              {type = "input-output", position = {1, -4}},
+              {flow_direction = "input-output", direction = defines.direction.south, position = {-1, 3}},
 
-              {type = "input-output", position = {-1, 4}},
+              {flow_direction = "input-output", direction = defines.direction.north, position = {1, -3}},
-              {type = "input-output", position = {-1, -4}}
+              {flow_direction = "input-output", direction = defines.direction.north, position = {-1, -3}}
             },
             production_type = "input-output"
         },

248k_2/prototypes/electronic/el_train_equipment.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/electronic/el_train_equipment/el_train_equipment_'..name
+    return '__248k_2__/ressources/electronic/el_train_equipment/el_train_equipment_'..name
 end
 
 --item

248k_2/prototypes/electronic/el_train_fuel.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/electronic/el_train_fuel/el_train_fuel_'..name
+    return '__248k_2__/ressources/electronic/el_train_fuel/el_train_fuel_'..name
 end
 
 --item

248k_2/prototypes/electronic/el_water_generator.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/electronic/el_water_generator/el_water_generator_'..name
+    return '__248k_2__/ressources/electronic/el_water_generator/el_water_generator_'..name
 end
 
 local function water_output()
@@ -62,8 +62,8 @@ data:extend({
         max_power_output = water_output(),
         effectivity = 0.9,
         fluid_box = {
-            base_area = 1,
+
-            height = 2,
+            volume = 200,
             base_level = -1,
             filter = 'el_pressurized_water',
             minimum_temperature = 0,
@@ -72,8 +72,8 @@ data:extend({
             pipe_covers = pipecoverspictures(),
             pipe_picture = south_basic_pipe_picture,
             pipe_connections = {
-                {type = "input-output", position = {2, 0}},  
+                {flow_direction = "input-output", direction = defines.direction.east, position = {1, 0}},
-                {type = "input-output", position = {-2, 0}},  
+                {flow_direction = "input-output", direction = defines.direction.west, position = {-1, 0}},
             },
         },
         fluid_input = {

248k_2/prototypes/fission/fi_castor.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fission/fi_castor/fi_castor_'..name
+    return '__248k_2__/ressources/fission/fi_castor/fi_castor_'..name
 end
 
 --item

248k_2/prototypes/fission/fi_compound_machine.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fission/fi_compound_machine/fi_compound_machine_'..name
+    return '__248k_2__/ressources/fission/fi_compound_machine/fi_compound_machine_'..name
 end
 
 --item
@@ -58,55 +58,50 @@ data:extend({
       energy_usage = '400kW',
       fluid_boxes = {
           {
-            
+
-            base_area = 1,
+            volume = 200,
-            height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "input", position = {0, -4}},
+              {flow_direction = "input", direction = defines.direction.north, position = {0, -3}},
-            },
-            production_type = "input"
-          },
-          { 
-            
-            base_area = 1,
-            height = 2,
-            base_level = -1,
-            pipe_covers = pipecoverspictures(),
-            pipe_picture = grey_south_pipe_picture,
-            pipe_connections =
-            {
-              {type = "input", position = {-4, 0}}
-            },
-            production_type = "input"
-          },
-          { 
-            
-            base_area = 1,
-            height = 2,
-            base_level = -1,
-            pipe_covers = pipecoverspictures(),
-            pipe_picture = grey_south_pipe_picture,
-            pipe_connections =
-            {
-              {type = "input", position = {4, 0}},
-              --{type = "output", position = {2, -2.5}}
             },
             production_type = "input"
           },
           {
-            
+
-            base_area = 1,
+            volume = 200,
-            height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "input", position = {0, 4}},
+              {flow_direction = "input", direction = defines.direction.west, position = {-3, 0}}
+            },
+            production_type = "input"
+          },
+          {
+
+            volume = 200,
+            base_level = -1,
+            pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
+            pipe_connections =
+            {
+              {flow_direction = "input", direction = defines.direction.east, position = {3, 0}},
+            },
+            production_type = "input"
+          },
+          {
+
+            volume = 200,
+            base_level = -1,
+            pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
+            pipe_connections =
+            {
+              {flow_direction = "input", direction = defines.direction.south, position = {0, 3}},
             },
             production_type = "input"
           },
@@ -143,25 +138,4 @@ data:extend({
         apparent_volume = 0.3,
       },
   },
-})
+})
-
---{
---    production_type = "input",
-    --pipe_picture = assembler2pipepictures(),
-    --pipe_covers = pipecoverspictures(),
---    base_area = 10,
---    base_level = -1,
---    pipe_connections = {
---        { type="input", position = {-2, -2,5} },
---        { type="input", position = {2, -2.5} },
---    },
---  },
---  {
---    production_type = "output",
-    --pipe_picture = assembler2pipepictures(),
-    --pipe_covers = pipecoverspictures(),
---    base_area = 10,
---    base_level = 1,
---    pipe_connections = {{ type="output", position = {2, 2.5} }},
---  },
---  off_when_no_fluid_recipe = true

248k_2/prototypes/fission/fi_compound_material.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fission/fi_compound_material/fi_compound_material_'..name
+    return '__248k_2__/ressources/fission/fi_compound_material/fi_compound_material_'..name
 end
 
 --item

248k_2/prototypes/fission/fi_crafter.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fission/fi_crafter/fi_crafter_'..name
+    return '__248k_2__/ressources/fission/fi_crafter/fi_crafter_'..name
 end
 
 --item
@@ -49,8 +49,8 @@ data:extend({
             fuel_inventory_size = 3,
             burnt_inventory_size = 3,
             effectivity = 0.35,
-            emissions_per_minute = 20,
+            emissions_per_minute = { pollution = 20 },
-            fuel_category = 'fi_basic_fuel'
+            fuel_categories = {'fi_basic_fuel'}
         },
         energy_usage = '200kW',
         allowed_effects = {"speed", "productivity", "consumption", "pollution"},

248k_2/prototypes/fission/fi_crushed.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fission/fi_crushed/fi_crushed_'..name
+    return '__248k_2__/ressources/fission/fi_crushed/fi_crushed_'..name
 end
 
 --item

248k_2/prototypes/fission/fi_crusher.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fission/fi_crusher/fi_crusher_'..name
+    return '__248k_2__/ressources/fission/fi_crusher/fi_crusher_'..name
 end
 
 --item

248k_2/prototypes/fission/fi_energy_crystal.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fission/fi_energy_crystal/fi_energy_crystal_'..name
+    return '__248k_2__/ressources/fission/fi_energy_crystal/fi_energy_crystal_'..name
 end
 
 --item

248k_2/prototypes/fission/fi_equipment.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fission/fi_equipment/fi_equipment_'..name
+    return '__248k_2__/ressources/fission/fi_equipment/fi_equipment_'..name
 end
 
 --item

248k_2/prototypes/fission/fi_fiberer.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fission/fi_fiberer/fi_fiberer_'..name
+    return '__248k_2__/ressources/fission/fi_fiberer/fi_fiberer_'..name
 end
 
 --item

248k_2/prototypes/fission/fi_fuel.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fission/fi_fuel/fi_fuel_'..name
+    return '__248k_2__/ressources/fission/fi_fuel/fi_fuel_'..name
 end
 
 --item

248k_2/prototypes/fission/fi_materials.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fission/fi_materials/fi_materials_'..name
+    return '__248k_2__/ressources/fission/fi_materials/fi_materials_'..name
 end
 
 --item

248k_2/prototypes/fission/fi_miner.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fission/fi_miner/fi_miner_'..name
+    return '__248k_2__/ressources/fission/fi_miner/fi_miner_'..name
 end
 
 --item
@@ -45,8 +45,8 @@ data:extend({
             fuel_inventory_size = 3,
             burnt_inventory_size = 3,
             effectivity = 0.35,
-            emissions_per_minute = 75,
+            emissions_per_minute = { pollution = 75 },
-            fuel_category = 'fi_basic_fuel'
+            fuel_categories = {'fi_basic_fuel'}
         },
         energy_usage = '4MW',
         mining_speed = 4.5,

248k_2/prototypes/fission/fi_modules.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fission/fi_modules/fi_modules_'..name
+    return '__248k_2__/ressources/fission/fi_modules/fi_modules_'..name
 end
 
 local limitation_list = {

248k_2/prototypes/fission/fi_refinery.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fission/fi_refinery/fi_refinery_'..name
+    return '__248k_2__/ressources/fission/fi_refinery/fi_refinery_'..name
 end
 
 --item
@@ -45,7 +45,7 @@ data:extend({
         energy_source = {
             type = 'electric',
             usage_priority = 'secondary-input',
-            emissions_per_minute = 20,
+            emissions_per_minute = { pollution = 20 },
             --input_flow_limit = '4MW',
         },
         energy_usage = '1MW',
@@ -60,101 +60,101 @@ data:extend({
 
         fluid_boxes = {
             {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = -1,
               pipe_covers = pipecoverspictures(),
               pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
-                {type = "input", position = {1, 4}},
+                {flow_direction = "input", direction = defines.direction.south, position = {1, 3}},
               },
               production_type = "input"
             },
             {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = -1,
               pipe_covers = pipecoverspictures(),
               pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
-                {type = "input", position = {-1, 4}},
+                {flow_direction = "input", direction = defines.direction.south, position = {-1, 3}},
               },
               production_type = "input"
             },
 
             {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
               pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
-                {type = "output", position = {1, -4}},
+                {flow_direction = "output", direction = defines.direction.north, position = {1, -3}},
               },
               production_type = "output"
             },
             {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
               pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
-                {type = "output", position = {-1, -4}},
+                {flow_direction = "output", direction = defines.direction.north, position = {-1, -3}},
               },
               production_type = "output"
             },
 
             {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = -1,
               pipe_covers = pipecoverspictures(),
               pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
-                {type = "input", position = {-4, -1}},
+                {flow_direction = "input", direction = defines.direction.west, position = {-3, -1}},
               },
               production_type = "input"
             },
             {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = -1,
               pipe_covers = pipecoverspictures(),
               pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
-                {type = "input", position = {-4, 1}},
+                {flow_direction = "input", direction = defines.direction.west, position = {-3, 1}},
               },
               production_type = "input"
             },
 
             {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
               pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
-                {type = "output", position = {4, 1}},
+                {flow_direction = "output", direction = defines.direction.east, position = {3, 1}},
               },
               production_type = "output"
             },
             {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
               pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
-                {type = "output", position = {4, -1}},
+                {flow_direction = "output", direction = defines.direction.east, position = {3, -1}},
               },
               production_type = "output"
             },

248k_2/prototypes/fission/fi_robo.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fission/fi_robo/fi_robo_'..name
+    return '__248k_2__/ressources/fission/fi_robo/fi_robo_'..name
 end
 
 --item
@@ -138,7 +138,7 @@ data:extend({
         },
 		circuit_connector_sprites = {
             led_red = {
-                filename = "__248k__/ressources/64x64_empty.png",
+                filename = "__248k_2__/ressources/64x64_empty.png",
                 width = 64,
                 height = 64,
                 shift = {0, 0},
@@ -146,7 +146,7 @@ data:extend({
                 size = 1
             },
             led_green = {
-                filename = "__248k__/ressources/64x64_empty.png",
+                filename = "__248k_2__/ressources/64x64_empty.png",
                 width = 64,
                 height = 64,
                 shift = {0, 0},
@@ -154,7 +154,7 @@ data:extend({
                 size = 1
             },
             led_blue = {
-                filename = "__248k__/ressources/64x64_empty.png",
+                filename = "__248k_2__/ressources/64x64_empty.png",
                 width = 64,
                 height = 64,
                 shift = {0, 0},
@@ -162,7 +162,7 @@ data:extend({
                 size = 1
             },
             led_light = {
-                filename = "__248k__/ressources/64x64_empty.png",
+                filename = "__248k_2__/ressources/64x64_empty.png",
                 width = 64,
                 height = 64,
                 shift = {0, 0},

248k_2/prototypes/fission/fi_solid_reactor.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fission/fi_solid_reactor/fi_solid_reactor_'..name
+    return '__248k_2__/ressources/fission/fi_solid_reactor/fi_solid_reactor_'..name
 end
 
 --item

248k_2/prototypes/fusion/fu_activator.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fusion/fu_activator/fu_activator_'..name
+    return '__248k_2__/ressources/fusion/fu_activator/fu_activator_'..name
 end
 
 --item
@@ -58,51 +58,51 @@ data:extend({
         }, 
         --fluids
         fluid_boxes = {
-            { 
+            {
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
                 pipe_picture = south_basic_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {-2, 0}}
+                  {flow_direction = "input", direction = defines.direction.west, position = {-1, 0}}
                 },
                 production_type = "input"
             },
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 100,
               base_level = -1,
               pipe_covers = pipecoverspictures(),
               pipe_picture = south_basic_pipe_picture,
               pipe_connections =
               {
-                {type = "input", position = {0, 2}}
+                {flow_direction = "input", direction = defines.direction.south, position = {0, 1}}
               },
               production_type = "input"
             },
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 100,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
               pipe_picture = south_basic_pipe_picture,
               pipe_connections =
               {
-                {type = "output", position = {2, 0}},
+                {flow_direction = "output", direction = defines.direction.east, position = {1, 0}},
               },
               production_type = "output"
             },
             {
-              base_area = 1,
+
-              height = 2,
+              volume = 100,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
              pipe_picture = south_basic_pipe_picture,
               pipe_connections =
               {
-                {type = "output", position = {0, -2}},
+                {flow_direction = "output", direction = defines.direction.north, position = {0, -1}},
               },
               production_type = "output"
             },

248k_2/prototypes/fusion/fu_boiler.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fusion/fu_boiler/fu_boiler_'..name
+    return '__248k_2__/ressources/fusion/fu_boiler/fu_boiler_'..name
 end
 
 --item
@@ -66,37 +66,37 @@ data:extend({
         fluid_boxes = {
             { 
               filter = 'water',
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = -1,
               pipe_covers = pipecoverspictures(),
               pipe_connections =
               {
-                {type = "input", position = {-2.5, -0.5}}
+                {flow_direction = "input", direction = defines.direction.west, position = {-1.5, -0.5}}
               },
               production_type = "input"
             },
             { 
               filter = 'fu_hydrogen',
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
               pipe_connections =
               {
-                {type = "output", position = {2.5, -0.5}},
+                {flow_direction = "output", direction = defines.direction.east, position = {1.5, -0.5}},
               },
               production_type = "output"
             },
             {
               filter = 'fu_oxygen',
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
               pipe_connections =
               {
-                {type = "output", position = {0.5, 2.5}},
+                {flow_direction = "output", direction = defines.direction.south, position = {0.5, 1.5}},
               },
               production_type = "output"
             },

248k_2/prototypes/fusion/fu_burner.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fusion/fu_burner/fu_burner_'..name
+    return '__248k_2__/ressources/fusion/fu_burner/fu_burner_'..name
 end
 
 --item
@@ -57,30 +57,28 @@ data:extend({
             module_slots = 4
         },
     crafting_speed = 1,
-    energy_usage = '500KW',
+    energy_usage = '500kW',
     fluid_boxes = {
         {
-            base_area = 1,
+
-            height = 2,
+            volume = 200,
             base_level = -1,
             production_type = 'input', 
             pipe_covers = pipecoverspictures(),
             pipe_picture = south_basic_pipe_picture,
             pipe_connections = {
-                {type = "input", position = {2, 0}},  
+                {flow_direction = "input", direction = defines.direction.east, position = {1, 0}},
-                --{type = "output", position = {-2, 0}},  
             },
         },
         {
-            base_area = 1,
+
-            height = 2,
+            volume = 200,
             base_level = 1,
             production_type = 'output', 
             pipe_covers = pipecoverspictures(),
             pipe_picture = south_basic_pipe_picture,
             pipe_connections = {
-                {type = "output", position = {-2, 0}},  
+                {flow_direction = "output", direction = defines.direction.west, position = {-1, 0}},
-                --{type = "output", position = {-2, 0}},  
             },
         }
     },

248k_2/prototypes/fusion/fu_exchanger.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fusion/fu_exchanger/fu_exchanger_'..name
+    return '__248k_2__/ressources/fusion/fu_exchanger/fu_exchanger_'..name
 end
 
 --item
@@ -56,51 +56,51 @@ data:extend({
         }, 
         --fluids
         fluid_boxes = {
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = -1,
               pipe_covers = pipecoverspictures(),
               pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
-                {type = "input", position = {-2.5, -0.5}}
+                {flow_direction = "input", direction = defines.direction.west, position = {-1.5, -0.5}}
               },
               production_type = "input"
             },
-            { 
+            {
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
                 pipe_picture = grey_south_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {-2.5, 1.5}}
+                  {flow_direction = "input", direction = defines.direction.west, position = {-1.5, 1.5}}
                 },
                 production_type = "input"
               },
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
               pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
-                {type = "output", position = {2.5, -0.5}},
+                {flow_direction = "output", direction = defines.direction.east, position = {1.5, -0.5}},
               },
               production_type = "output"
             },
             {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
               pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
-                {type = "output", position = {2.5, 1.5}},
+                {flow_direction = "output", direction = defines.direction.east, position = {1.5, 1.5}},
               },
               production_type = "output"
             },

248k_2/prototypes/fusion/fu_fusor.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fusion/fu_fusor/fu_fusor_'..name
+    return '__248k_2__/ressources/fusion/fu_fusor/fu_fusor_'..name
 end
 
 --item
@@ -68,24 +68,24 @@ data:extend({
         --fluid
         fluid_boxes = {
             {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = -1,
               pipe_covers = pipecoverspictures(),
               pipe_connections =
               {
-                {type = "input", position = {-1.5, -3}},
+                {flow_direction = "input", direction = defines.direction.north, position = {-1.5, -2}},
               },
               production_type = "input"
             },
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = -1,
               pipe_covers = pipecoverspictures(),
               pipe_connections =
               {
-                {type = "input", position = {1.5, -3}}
+                {flow_direction = "input", direction = defines.direction.north, position = {1.5, -2}}
               },
               production_type = "input"
             },

248k_2/prototypes/fusion/fu_ingot.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fusion/fu_ingot/fu_ingot_'..name
+    return '__248k_2__/ressources/fusion/fu_ingot/fu_ingot_'..name
 end
 
 --item
@@ -59,55 +59,50 @@ data:extend({
       }, 
       fluid_boxes = {
           {
-            
+
-            base_area = 1,
+            volume = 200,
-            height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "input", position = {0, -4}},
+              {flow_direction = "input", direction = defines.direction.north, position = {0, -3}},
-            },
-            production_type = "input"
-          },
-          { 
-            
-            base_area = 1,
-            height = 2,
-            base_level = -1,
-            pipe_covers = pipecoverspictures(),
-            pipe_picture = grey_south_pipe_picture,
-            pipe_connections =
-            {
-              {type = "input", position = {-4, 0}}
-            },
-            production_type = "input"
-          },
-          { 
-            
-            base_area = 1,
-            height = 2,
-            base_level = -1,
-            pipe_covers = pipecoverspictures(),
-            pipe_picture = grey_south_pipe_picture,
-            pipe_connections =
-            {
-              {type = "input", position = {4, 0}},
-              --{type = "output", position = {2, -2.5}}
             },
             production_type = "input"
           },
           {
-            
+
-            base_area = 1,
+            volume = 200,
-            height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "input", position = {0, 4}},
+              {flow_direction = "input", direction = defines.direction.west, position = {-3, 0}}
+            },
+            production_type = "input"
+          },
+          {
+
+            volume = 200,
+            base_level = -1,
+            pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
+            pipe_connections =
+            {
+              {flow_direction = "input", direction = defines.direction.east, position = {3, 0}},
+            },
+            production_type = "input"
+          },
+          {
+
+            volume = 200,
+            base_level = -1,
+            pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
+            pipe_connections =
+            {
+              {flow_direction = "input", direction = defines.direction.south, position = {0, 3}},
             },
             production_type = "input"
           },
@@ -118,10 +113,8 @@ data:extend({
         size = {512,512},
         scale = 0.54,
         line_length = 1,
-        --lines_per_file = 2,
         frame_count = 1,
-        --animation_speed = 0.2,
+        shift = {0,-0.3}
-        shift = {0,-0.3} 
       },
       working_visualisations = {
         {
@@ -159,8 +152,8 @@ data:extend({
 --    base_area = 10,
 --    base_level = -1,
 --    pipe_connections = {
---        { type="input", position = {-2, -2,5} },
+--        { flow_direction="input", direction = defines.direction.north, position = {-2, -2,5} },
---        { type="input", position = {2, -2.5} },
+--        { flow_direction="input", direction = defines.direction.north, position = {2, -2.5} },
 --    },
 --  },
 --  {
@@ -169,6 +162,6 @@ data:extend({
     --pipe_covers = pipecoverspictures(),
 --    base_area = 10,
 --    base_level = 1,
---    pipe_connections = {{ type="output", position = {2, 2.5} }},
+--    pipe_connections = {{ flow_direction="output", direction = defines.direction.north, position = {2, 2.5} }},
 --  },
 --  off_when_no_fluid_recipe = true

248k_2/prototypes/fusion/fu_lab.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fusion/fu_lab/fu_lab_'..name..".png"
+    return '__248k_2__/ressources/fusion/fu_lab/fu_lab_'..name..".png"
 end
 
 --item

248k_2/prototypes/fusion/fu_laser.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fusion/fu_laser/fu_laser_'..name
+    return '__248k_2__/ressources/fusion/fu_laser/fu_laser_'..name
 end
 
 --item
@@ -59,55 +59,50 @@ data:extend({
       energy_usage = '60MW',
       fluid_boxes = {
           {
-            
+
-            base_area = 1,
+            volume = 200,
-            height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "input", position = {0, -4}},
+              {flow_direction = "input", direction = defines.direction.north, position = {0, -3}},
             },
             production_type = "input"
           },
-          { 
+          {
-            
+
-            base_area = 1,
+            volume = 200,
-            height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "input", position = {-4, 0}}
+              {flow_direction = "input", direction = defines.direction.west, position = {-3, 0}}
             },
             production_type = "input"
           },
-          { 
+          {
-            
+
-            base_area = 1,
+            volume = 200,
-            height = 2,
             base_level = 1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "output", position = {4, 0}},
+              {flow_direction = "output", direction = defines.direction.east, position = {3, 0}},
-              --{type = "output", position = {2, -2.5}}
             },
             production_type = "output"
           },
           {
-            
+
-            base_area = 1,
+            volume = 200,
-            height = 2,
             base_level = 1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "output", position = {0, 4}},
+              {flow_direction = "output", direction = defines.direction.south, position = {0, 3}},
             },
             production_type = "output"
           },
@@ -159,8 +154,8 @@ data:extend({
 --    base_area = 10,
 --    base_level = -1,
 --    pipe_connections = {
---        { type="input", position = {-2, -2,5} },
+--        { flow_direction="input", direction = defines.direction.north, position = {-2, -2,5} },
---        { type="input", position = {2, -2.5} },
+--        { flow_direction="input", direction = defines.direction.north, position = {2, -2.5} },
 --    },
 --  },
 --  {
@@ -169,6 +164,6 @@ data:extend({
     --pipe_covers = pipecoverspictures(),
 --    base_area = 10,
 --    base_level = 1,
---    pipe_connections = {{ type="output", position = {2, 2.5} }},
+--    pipe_connections = {{ flow_direction="output", direction = defines.direction.north, position = {2, 2.5} }},
 --  },
 --  off_when_no_fluid_recipe = true

248k_2/prototypes/fusion/fu_lead.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fusion/fu_lead/fu_lead_'..name
+    return '__248k_2__/ressources/fusion/fu_lead/fu_lead_'..name
 end
 --ore
 data:extend({

248k_2/prototypes/fusion/fu_magnet.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fusion/fu_magnet/fu_magnet_'..name
+    return '__248k_2__/ressources/fusion/fu_magnet/fu_magnet_'..name
 end
 
 --item
@@ -59,55 +59,50 @@ data:extend({
       }, 
       fluid_boxes = {
           {
-            
+
-            base_area = 1,
+            volume = 200,
-            height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "input", position = {0, -4}},
+              {flow_direction = "input", direction = defines.direction.north, position = {0, -3}},
             },
             production_type = "input"
           },
-          { 
+          {
-            
+
-            base_area = 1,
+            volume = 200,
-            height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "input", position = {-4, 0}}
+              {flow_direction = "input", direction = defines.direction.west, position = {-3, 0}}
             },
             production_type = "input"
           },
-          { 
+          {
-            
+
-            base_area = 1,
+            volume = 200,
-            height = 2,
             base_level = 1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "output", position = {4, 0}},
+              {flow_direction = "output", direction = defines.direction.east, position = {3, 0}},
-              --{type = "output", position = {2, -2.5}}
             },
             production_type = "output"
           },
           {
-            
+
-            base_area = 1,
+            volume = 200,
-            height = 2,
             base_level = 1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "output", position = {0, 4}},
+              {flow_direction = "output", direction = defines.direction.south, position = {0, 3}},
             },
             production_type = "output"
           },
@@ -151,25 +146,4 @@ data:extend({
         apparent_volume = 0.3,
       },
   },
-})
+})
-
---{
---    production_type = "input",
-    --pipe_picture = assembler2pipepictures(),
-    --pipe_covers = pipecoverspictures(),
---    base_area = 10,
---    base_level = -1,
---    pipe_connections = {
---        { type="input", position = {-2, -2,5} },
---        { type="input", position = {2, -2.5} },
---    },
---  },
---  {
---    production_type = "output",
-    --pipe_picture = assembler2pipepictures(),
-    --pipe_covers = pipecoverspictures(),
---    base_area = 10,
---    base_level = 1,
---    pipe_connections = {{ type="output", position = {2, 2.5} }},
---  },
---  off_when_no_fluid_recipe = true

248k_2/prototypes/fusion/fu_materials.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fusion/fu_materials/fu_materials_'..name
+    return '__248k_2__/ressources/fusion/fu_materials/fu_materials_'..name
 end
 
 --item

248k_2/prototypes/fusion/fu_miner.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fusion/fu_miner/fu_miner_'..name
+    return '__248k_2__/ressources/fusion/fu_miner/fu_miner_'..name
 end
 
 --item
@@ -43,7 +43,6 @@ data:extend({
       icon_size = 64,
       flags = {"player-creation","placeable-neutral"},
       max_health = 300,
-      fixed_recipe = '',
       corpse = 'big-remnants',
       collision_box = {{-5.4,-5.4},{5.4,5.4}},
       selection_box = {{-5.5,-5.5},{5.5,5.5}},
@@ -62,8 +61,8 @@ data:extend({
         type = "burner",
         fuel_inventory_size = 1,
         effectivity = 1,
-        emissions_per_minute = 20,
+        emissions_per_minute = { pollution = 20 },
-        fuel_category = "fu_miner_fuel_category",
+        fuel_categories = {"fu_miner_fuel_category"},
         smoke = {
             {
                 name = "smoke",
@@ -117,7 +116,7 @@ miner2.icons = {
       icon = miner2.icon
   },
   {
-      icon = "__248k__/ressources/icons/fi_upgrade.png"
+      icon = "__248k_2__/ressources/icons/fi_upgrade.png"
   }
 }
 miner2.icon = nil
@@ -132,7 +131,7 @@ miner3.icons = {
       icon = miner3.icon
   },
   {
-      icon = "__248k__/ressources/icons/fu_upgrade.png"
+      icon = "__248k_2__/ressources/icons/fu_upgrade.png"
   }
 }
 miner3.icon = nil
@@ -148,7 +147,7 @@ miner4.icons = {
       icon = miner4.icon
   },
   {
-      icon = "__248k__/ressources/icons/gr_upgrade.png"
+      icon = "__248k_2__/ressources/icons/gr_upgrade.png"
   }
 }
 miner4.icon = nil
@@ -164,7 +163,7 @@ miner2_item.icons = {
       icon = miner2_item.icon
   },
   {
-      icon = "__248k__/ressources/icons/fi_upgrade.png"
+      icon = "__248k_2__/ressources/icons/fi_upgrade.png"
   }
 }
 miner2_item.icon = nil
@@ -177,7 +176,7 @@ miner3_item.icons = {
       icon = miner3_item.icon
   },
   {
-      icon = "__248k__/ressources/icons/fu_upgrade.png"
+      icon = "__248k_2__/ressources/icons/fu_upgrade.png"
   }
 }
 miner3_item.icon = nil
@@ -192,7 +191,7 @@ miner4_item.icons = {
       icon = miner4_item.icon
   },
   {
-      icon = "__248k__/ressources/icons/gr_upgrade.png"
+      icon = "__248k_2__/ressources/icons/gr_upgrade.png"
   }
 }
 miner4_item.icon = nil

248k_2/prototypes/fusion/fu_plasma.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fusion/fu_plasma/fu_plasma_'..name
+    return '__248k_2__/ressources/fusion/fu_plasma/fu_plasma_'..name
 end
 
 --item
@@ -59,55 +59,50 @@ data:extend({
       }, 
       fluid_boxes = {
           {
-            
+
-            base_area = 1,
+            volume = 200,
-            height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "input", position = {0, -4}},
+              {flow_direction = "input", direction = defines.direction.north, position = {0, -3}},
             },
             production_type = "input"
           },
-          { 
+          {
-            
+
-            base_area = 1,
+            volume = 200,
-            height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "input", position = {-4, 0}}
+              {flow_direction = "input", direction = defines.direction.west, position = {-3, 0}}
             },
             production_type = "input"
           },
-          { 
+          {
-            
+
-            base_area = 1,
+            volume = 200,
-            height = 2,
             base_level = 1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "output", position = {4, 0}},
+              {flow_direction = "output", direction = defines.direction.east, position = {3, 0}},
-              --{type = "output", position = {2, -2.5}}
             },
             production_type = "output"
           },
           {
-            
+
-            base_area = 1,
+            volume = 200,
-            height = 2,
             base_level = 1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "output", position = {0, 4}},
+              {flow_direction = "output", direction = defines.direction.south, position = {0, 3}},
             },
             production_type = "output"
           },
@@ -159,8 +154,8 @@ data:extend({
 --    base_area = 10,
 --    base_level = -1,
 --    pipe_connections = {
---        { type="input", position = {-2, -2,5} },
+--        { flow_direction="input", direction = defines.direction.north, position = {-2, -2,5} },
---        { type="input", position = {2, -2.5} },
+--        { flow_direction="input", direction = defines.direction.north, position = {2, -2.5} },
 --    },
 --  },
 --  {
@@ -169,6 +164,6 @@ data:extend({
     --pipe_covers = pipecoverspictures(),
 --    base_area = 10,
 --    base_level = 1,
---    pipe_connections = {{ type="output", position = {2, 2.5} }},
+--    pipe_connections = {{ flow_direction="output", direction = defines.direction.north, position = {2, 2.5} }},
 --  },
 --  off_when_no_fluid_recipe = true

248k_2/prototypes/fusion/fu_reactor.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fusion/fu_reactor/fu_reactor_'..name
+    return '__248k_2__/ressources/fusion/fu_reactor/fu_reactor_'..name
 end
 
 --item
@@ -62,51 +62,51 @@ data:extend({
         fluid_boxes = {
           { 
             filter = "fu_lead_fluid_cold",
-            base_area = 1,
+
-            height = 2,
+            volume = 200,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "input", position = {2, 7}}
+              {flow_direction = "input", direction = defines.direction.south, position = {2, 6}}
             },
             production_type = "input"
           },
           {
-            base_area = 1,
+
-            height = 2,
+            volume = 200,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "input", position = {-2, -7}},
+              {flow_direction = "input", direction = defines.direction.north, position = {-2, -6}},
             },
             production_type = "input"
           },
-          { 
+          {
-            base_area = 1,
+
-            height = 2,
+            volume = 200,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "input", position = {2, -7}}
+              {flow_direction = "input", direction = defines.direction.north, position = {2, -6}}
             },
             production_type = "input"
           },
           { 
             filter = "fu_lead_fluid_hot",
-            base_area = 1,
+
-            height = 2,
+            volume = 200,
             base_level = 1,
             pipe_covers = pipecoverspictures(),
             pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
-              {type = "output", position = {-2, 7}}
+              {flow_direction = "output", direction = defines.direction.south, position = {-2, 6}}
             },
             production_type = "output"
           }
@@ -177,51 +177,51 @@ data:extend({
       fluid_boxes = {
         { 
           filter = "fu_lead_fluid_cold",
-          base_area = 1,
+
-          height = 2,
+          volume = 200,
           base_level = -1,
           pipe_covers = pipecoverspictures(),
           pipe_picture = grey_south_pipe_picture,
           pipe_connections =
           {
-            {type = "input", position = {2, 7}}
+            {flow_direction = "input", direction = defines.direction.south, position = {2, 6}}
           },
           production_type = "input"
         },
         {
-          base_area = 1,
+
-          height = 2,
+          volume = 200,
           base_level = -1,
           pipe_covers = pipecoverspictures(),
           pipe_picture = grey_south_pipe_picture,
           pipe_connections =
           {
-            {type = "input", position = {-2, -7}},
+            {flow_direction = "input", direction = defines.direction.north, position = {-2, -6}},
           },
           production_type = "input"
         },
-        { 
+        {
-          base_area = 1,
+
-          height = 2,
+          volume = 200,
           base_level = -1,
           pipe_covers = pipecoverspictures(),
           pipe_picture = grey_south_pipe_picture,
           pipe_connections =
           {
-            {type = "input", position = {2, -7}}
+            {flow_direction = "input", direction = defines.direction.north, position = {2, -6}}
           },
           production_type = "input"
         },
         { 
           filter = "fu_lead_fluid_hot",
-          base_area = 1,
+
-          height = 2,
+          volume = 200,
           base_level = 1,
           pipe_covers = pipecoverspictures(),
           pipe_picture = grey_south_pipe_picture,
           pipe_connections =
           {
-            {type = "output", position = {-2, 7}}
+            {flow_direction = "output", direction = defines.direction.south, position = {-2, 6}}
           },
           production_type = "output"
         }

248k_2/prototypes/fusion/fu_robo.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fusion/fu_robo/fu_robo_'..name
+    return '__248k_2__/ressources/fusion/fu_robo/fu_robo_'..name
 end
 
 --item

248k_2/prototypes/fusion/fu_space_probe.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fusion/fu_space_probe/fu_space_probe_'..name
+    return '__248k_2__/ressources/fusion/fu_space_probe/fu_space_probe_'..name
 end
 
 --item
@@ -17,7 +17,7 @@ data:extend({
         icon_size = 64,
         stack_size = 1,
         subgroup = 'fu_item_subgroup_d',
-        rocket_launch_product = {'fu_space_probe_data_card_1_item',10},
+        rocket_launch_products = {{type="item", name="fu_space_probe_data_card_1_item", amount=10}},
         order = 'd-a',
     },
     {
@@ -27,7 +27,7 @@ data:extend({
         icon_size = 64,
         stack_size = 1,
         subgroup = 'fu_item_subgroup_d',
-        rocket_launch_product = {'fu_space_probe_data_card_3_item',10},
+        rocket_launch_products = {{type="item", name="fu_space_probe_data_card_3_item", amount=10}},
         order = 'd-b',
     },
     {
@@ -37,7 +37,7 @@ data:extend({
         icon_size = 64,
         stack_size = 1,
         subgroup = 'fu_item_subgroup_d',
-        rocket_launch_product = {'fu_space_probe_ore_item',100},
+        rocket_launch_products = {{type="item", name="fu_space_probe_ore_item", amount=100}},
         order = 'd-c',
     },
     --data cards

248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_caster.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fusion/fu_star_engine/fu_star_engine_caster/fu_star_engine_caster_'..name
+    return '__248k_2__/ressources/fusion/fu_star_engine/fu_star_engine_caster/fu_star_engine_caster_'..name
 end
 
 --item
@@ -56,47 +56,47 @@ data:extend({
         }, 
         --fluids
         fluid_boxes = {
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = -1,
               pipe_covers = pipecoverspictures(),
               pipe_connections =
               {
-                {type = "input", position = {-2.5, -0.5}}
+                {flow_direction = "input", direction = defines.direction.west, position = {-1.5, -0.5}}
               },
               production_type = "input"
             },
-            { 
+            {
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
                 pipe_connections =
                 {
-                  {type = "input", position = {-2.5, 1.5}}
+                  {flow_direction = "input", direction = defines.direction.west, position = {-1.5, 1.5}}
                 },
                 production_type = "input"
               },
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
               pipe_connections =
               {
-                {type = "output", position = {2.5, -0.5}},
+                {flow_direction = "output", direction = defines.direction.east, position = {1.5, -0.5}},
               },
               production_type = "output"
             },
             {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
               pipe_connections =
               {
-                {type = "output", position = {2.5, 1.5}},
+                {flow_direction = "output", direction = defines.direction.east, position = {1.5, 1.5}},
               },
               production_type = "output"
             },

248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_cooler.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fusion/fu_star_engine/fu_star_engine_cooler/fu_star_engine_cooler_'..name
+    return '__248k_2__/ressources/fusion/fu_star_engine/fu_star_engine_cooler/fu_star_engine_cooler_'..name
 end
 
 --item
@@ -50,87 +50,87 @@ data:extend({
         energy_usage = '0.5GW',
         --fluids
         fluid_boxes = {
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = -1,
               pipe_covers = pipecoverspictures(),
               pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
-                {type = "input", position = {-2, -9.5}}
+                {flow_direction = "input", direction = defines.direction.north, position = {-2, -8.5}}
               },
               production_type = "input"
             },
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = -1,
               pipe_covers = pipecoverspictures(),
               pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
-                {type = "input", position = {2, -9.5}}
+                {flow_direction = "input", direction = defines.direction.north, position = {2, -8.5}}
               },
               production_type = "input"
             },
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
               pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
-                {type = "output", position = {0, 9.5}},
+                {flow_direction = "output", direction = defines.direction.south, position = {0, 8.5}},
               },
               production_type = "output"
             },
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
               pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
-                {type = "output", position = {-2, 9.5}},
+                {flow_direction = "output", direction = defines.direction.south, position = {-2, 8.5}},
               },
               production_type = "output"
             },
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
               pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
-                {type = "output", position = {2, 9.5}},
+                {flow_direction = "output", direction = defines.direction.south, position = {2, 8.5}},
               },
               production_type = "output"
             },
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
               pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
-                {type = "output", position = {-4, 9.5}},
+                {flow_direction = "output", direction = defines.direction.south, position = {-4, 8.5}},
               },
               production_type = "output"
             },
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
               pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
-                {type = "output", position = {4, 9.5}},
+                {flow_direction = "output", direction = defines.direction.south, position = {4, 8.5}},
               },
               production_type = "output"
             },

248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_cooler_up.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fusion/fu_star_engine/fu_star_engine_cooler_up/fu_star_engine_cooler_up_'..name
+    return '__248k_2__/ressources/fusion/fu_star_engine/fu_star_engine_cooler_up/fu_star_engine_cooler_up_'..name
 end
 
 --item
@@ -50,80 +50,80 @@ data:extend({
         energy_usage = '0.5GW',
         --fluids
         fluid_boxes = {
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = -1,
               
               pipe_connections =
               {
-                {type = "input", position = {-2, 9.5}}
+                {flow_direction = "input", direction = defines.direction.south, position = {-2, 8.5}}
               },
               production_type = "input"
             },
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = -1,
               
               pipe_connections =
               {
-                {type = "input", position = {2, 9.5}}
+                {flow_direction = "input", direction = defines.direction.south, position = {2, 8.5}}
               },
               production_type = "input"
             },
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               
               pipe_connections =
               {
-                {type = "output", position = {0, -9.5}},
+                {flow_direction = "output", direction = defines.direction.north, position = {0, -8.5}},
               },
               production_type = "output"
             },
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               
               pipe_connections =
               {
-                {type = "output", position = {-2, -9.5}},
+                {flow_direction = "output", direction = defines.direction.north, position = {-2, -8.5}},
               },
               production_type = "output"
             },
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               
               pipe_connections =
               {
-                {type = "output", position = {2, -9.5}},
+                {flow_direction = "output", direction = defines.direction.north, position = {2, -8.5}},
               },
               production_type = "output"
             },
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               
               pipe_connections =
               {
-                {type = "output", position = {-4, -9.5}},
+                {flow_direction = "output", direction = defines.direction.north, position = {-4, -8.5}},
               },
               production_type = "output"
             },
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               
               pipe_connections =
               {
-                {type = "output", position = {4, -9.5}},
+                {flow_direction = "output", direction = defines.direction.north, position = {4, -8.5}},
               },
               production_type = "output"
             },

248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_core.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fusion/fu_star_engine/fu_star_engine_core/fu_star_engine_core_'..name
+    return '__248k_2__/ressources/fusion/fu_star_engine/fu_star_engine_core/fu_star_engine_core_'..name
 end
 
 --item
@@ -52,87 +52,87 @@ data:extend({
         fluid_boxes = {
             --in
             --right
-            { 
+            {
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = -1,
                 pipe_connections =
                 {
-                  {type = "input", position = {-9, 3}}
+                  {flow_direction = "input", direction = defines.direction.west, position = {-8, 3}}
                 },
                 production_type = "input"
             },
-            { 
+            {
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = -1,
                 pipe_connections =
                 {
-                  {type = "input", position = {-9, 1}}
+                  {flow_direction = "input", direction = defines.direction.west, position = {-8, 1}}
                 },
                 production_type = "input"
             },
             --left
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = -1,
               pipe_connections =
               {
-                {type = "input", position = {9, 3}}
+                {flow_direction = "input", direction = defines.direction.east, position = {8, 3}}
               },
               production_type = "input"
           },
-          { 
+          {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = -1,
               pipe_connections =
               {
-                {type = "input", position = {9, 1}}
+                {flow_direction = "input", direction = defines.direction.east, position = {8, 1}}
               },
               production_type = "input"
           },
             --out
             --up
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               pipe_connections =
               {
-                {type = "output", position = {-2, -5}},
+                {flow_direction = "output", direction = defines.direction.north, position = {-2, -4}},
               },
               production_type = "output"
             },
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               pipe_connections =
               {
-                {type = "output", position = {2, -5}},
+                {flow_direction = "output", direction = defines.direction.north, position = {2, -4}},
               },
               production_type = "output"
             },
             --down
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               pipe_connections =
               {
-                {type = "output", position = {-2, 9}},
+                {flow_direction = "output", direction = defines.direction.south, position = {-2, 8}},
               },
               production_type = "output"
             },
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               pipe_connections =
               {
-                {type = "output", position = {2, 9}},
+                {flow_direction = "output", direction = defines.direction.south, position = {2, 8}},
               },
               production_type = "output"
             },

248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_heater.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fusion/fu_star_engine/fu_star_engine_heater/fu_star_engine_heater_'..name
+    return '__248k_2__/ressources/fusion/fu_star_engine/fu_star_engine_heater/fu_star_engine_heater_'..name
 end
 
 --item
@@ -50,58 +50,58 @@ data:extend({
         energy_usage = '0.7GW',
         --fluids
         fluid_boxes = {
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = -1,
               
               pipe_connections =
               {
-                {type = "input", position = {9, 0}}
+                {flow_direction = "input", direction = defines.direction.east, position = {8, 0}}
               },
               production_type = "input"
             },
-            { 
+            {
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = -1,
                 
                 pipe_connections =
                 {
-                  {type = "input", position = {9, 2}}
+                  {flow_direction = "input", direction = defines.direction.east, position = {8, 2}}
                 },
                 production_type = "input"
             },
-            { 
+            {
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = -1,
                 
                 pipe_connections =
                 {
-                  {type = "input", position = {9, -2}}
+                  {flow_direction = "input", direction = defines.direction.east, position = {8, -2}}
                 },
                 production_type = "input"
             },
-            { 
+            {
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = 1,
                 
                 pipe_connections =
                 {
-                  {type = "output", position = {-11, -1}},
+                  {flow_direction = "output", direction = defines.direction.west, position = {-10, -1}},
                 },
                 production_type = "output"
             },
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               
               pipe_connections =
               {
-                {type = "output", position = {-11, 1}},
+                {flow_direction = "output", direction = defines.direction.west, position = {-10, 1}},
               },
               production_type = "output"
             },

248k_2/prototypes/fusion/fu_star_engine/fu_star_engine_heater_left.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fusion/fu_star_engine/fu_star_engine_heater_left/fu_star_engine_heater_left_'..name
+    return '__248k_2__/ressources/fusion/fu_star_engine/fu_star_engine_heater_left/fu_star_engine_heater_left_'..name
 end
 
 --item
@@ -50,58 +50,58 @@ data:extend({
           energy_usage = '0.7GW',
         --fluids
         fluid_boxes = {
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = -1,
               
               pipe_connections =
               {
-                {type = "input", position = {-9, 0}}
+                {flow_direction = "input", direction = defines.direction.west, position = {-8, 0}}
               },
               production_type = "input"
             },
-            { 
+            {
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = -1,
                 
                 pipe_connections =
                 {
-                  {type = "input", position = {-9, 2}}
+                  {flow_direction = "input", direction = defines.direction.west, position = {-8, 2}}
                 },
                 production_type = "input"
             },
-            { 
+            {
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = -1,
                 
                 pipe_connections =
                 {
-                  {type = "input", position = {-9, -2}}
+                  {flow_direction = "input", direction = defines.direction.west, position = {-8, -2}}
                 },
                 production_type = "input"
             },
-            { 
+            {
-                base_area = 1,
+
-                height = 2,
+                volume = 200,
                 base_level = 1,
                 
                 pipe_connections =
                 {
-                  {type = "output", position = {11, -1}},
+                  {flow_direction = "output", direction = defines.direction.east, position = {10, -1}},
                 },
                 production_type = "output"
             },
-            { 
+            {
-              base_area = 1,
+
-              height = 2,
+              volume = 200,
               base_level = 1,
               
               pipe_connections =
               {
-                {type = "output", position = {11, 1}},
+                {flow_direction = "output", direction = defines.direction.east, position = {10, 1}},
               },
               production_type = "output"
             },

248k_2/prototypes/fusion/fu_turbine.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/fusion/fu_turbine/fu_turbine_'..name
+    return '__248k_2__/ressources/fusion/fu_turbine/fu_turbine_'..name
 end
 
 --item
@@ -50,17 +50,17 @@ data:extend({
       max_power_output = "200MW",
       fluid_box = {
         filter = "fu_hot_steam",
-        base_area = 1,
+
-        height = 2,
+        volume = 200,
         base_level = -1,
         pipe_covers = pipecoverspictures(),
         pipe_picture = grey_south_pipe_picture,
         pipe_connections =
         {
-          {type = "input-output", position = {-4, 0}},
+          {flow_direction = "input-output", direction = defines.direction.west, position = {-3, 0}},
-          {type = "input-output", position = {4, 0}},
+          {flow_direction = "input-output", direction = defines.direction.east, position = {3, 0}},
-          {type = "input-output", position = {0, 4}},
+          {flow_direction = "input-output", direction = defines.direction.south, position = {0, 3}},
-          {type = "input-output", position = {0, -4}}
+          {flow_direction = "input-output", direction = defines.direction.north, position = {0, -3}}
         },
         production_type = "input-output"
       },

248k_2/prototypes/gr_recipes.lua

@@ -3,63 +3,59 @@ data:extend({
     {
         name = 'gr_crafter_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         ingredients = {
-            {'fi_crafter_item',2},
+            {type="item", name="fi_crafter_item", amount=2},
-            {'fu_materials_KFK',100},
+            {type="item", name="fu_materials_KFK", amount=100},
-            {'fu_materials_magnet',10},
+            {type="item", name="fu_materials_magnet", amount=10},
-            {'gr_materials_fusion_cell_item',1},
+            {type="item", name="gr_materials_fusion_cell_item", amount=1},
-            {'gr_materials_circuit',10}
+            {type="item", name="gr_materials_circuit", amount=10}
         },
-        result = 'gr_crafter_item',
+        results = {{type="item", name='gr_crafter_item', amount=1}},
-        result_count = 1,
         energy_required = 6,
     },
     {
         name = 'gr_materials_fusion_cell_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'fi_crafting_category',
         ingredients = {
-            {'fu_space_probe_up_matter_item',1},
+            {type="item", name="fu_space_probe_up_matter_item", amount=1},
-            {'fu_tech_sign_item',40},
+            {type="item", name="fu_tech_sign_item", amount=40},
-            {'fusion-reactor-equipment',1}
+            {type="item", name="fusion-reactor-equipment", amount=1}
         },
-        result = 'gr_materials_fusion_cell_item',
+        results = {{type="item", name='gr_materials_fusion_cell_item', amount=1}},
-        result_count = 1,
         energy_required = 35,
     },
     {
         name = 'gr_materials_stack_down_item_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         ingredients = {
-            {'fu_space_probe_down_matter_item',2},
+            {type="item", name="fu_space_probe_down_matter_item", amount=2},
-            {'low-density-structure',10},
+            {type="item", name="low-density-structure", amount=10},
-            {'fu_space_probe_data_card_3_item',1},
+            {type="item", name="fu_space_probe_data_card_3_item", amount=1},
         },
-        result = 'gr_materials_stack_down_item',
+        results = {{type="item", name='gr_materials_stack_down_item', amount=1}},
-        result_count = 1,
         energy_required = 10,
     },
     {
         name = 'gr_materials_stack_up_item_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         ingredients = {
-            {'fu_space_probe_up_matter_item',2},
+            {type="item", name="fu_space_probe_up_matter_item", amount=2},
-            {'low-density-structure',10},
+            {type="item", name="low-density-structure", amount=10},
-            {'fu_space_probe_data_card_3_item',1},
+            {type="item", name="fu_space_probe_data_card_3_item", amount=1},
         },
-        result = 'gr_materials_stack_up_item',
+        results = {{type="item", name='gr_materials_stack_up_item', amount=1}},
-        result_count = 1,
         energy_required = 10,
     },
     {
         name = 'gr_wheel_recipe',
         type = 'recipe',
         category = 'crafting-with-fluid',
-        enabled = 'false',
+        enabled = false,
         subgroup = 'fu_star_engine_subgroup_e',
         ingredients = {
             {type="fluid", name="fu_iron", amount=500},
@@ -67,14 +63,13 @@ data:extend({
         results = {
             {type="item", name="iron-gear-wheel", amount=500},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
         name = 'gr_steel_recipe',
         type = 'recipe',
         category = 'crafting-with-fluid',
-        enabled = 'false',
+        enabled = false,
         subgroup = 'fu_star_engine_subgroup_e',
         ingredients = {
             {type="fluid", name="fu_iron", amount=500},
@@ -82,14 +77,13 @@ data:extend({
         results = {
             {type="item", name="steel-plate", amount=500},
         },
-        result_count = 1,
         energy_required = 6,
     },
     --train
     {
         name = 'gr_magnet_train_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         ingredients = {
             {type="item", name="gr_materials_fusion_cell_item", amount=4},
             {type="item", name="fu_materials_KFK", amount=100},
@@ -100,13 +94,12 @@ data:extend({
         results = {
             {type="item", name="gr_magnet_train_item", amount=1},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
         name = 'gr_magnet_wagon_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         ingredients = {
             {type="item", name="gr_materials_fusion_cell_item", amount=2},
             {type="item", name="fu_materials_KFK", amount=100},
@@ -117,13 +110,12 @@ data:extend({
         results = {
             {type="item", name="gr_magnet_wagon_item", amount=1},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
         name = 'gr_magnet_tanker_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         ingredients = {
             {type="item", name="gr_materials_fusion_cell_item", amount=2},
             {type="item", name="fu_materials_KFK", amount=100},
@@ -134,13 +126,12 @@ data:extend({
         results = {
             {type="item", name="gr_magnet_tanker_item", amount=1},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
         name = 'gr_magnet_train_pre_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         ingredients = {
             {type="item", name="fu_materials_KFK", amount=100},
             {type="item", name="fu_materials_TIM", amount=100},
@@ -151,13 +142,12 @@ data:extend({
         results = {
             {type="item", name="gr_magnet_train_pre_item", amount=1},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
         name = 'gr_magnet_wagon_pre_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         ingredients = {
             {type="item", name="fu_materials_KFK", amount=100},
             {type="item", name="fu_materials_TIM", amount=100},
@@ -168,13 +158,12 @@ data:extend({
         results = {
             {type="item", name="gr_magnet_wagon_pre_item", amount=1},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
         name = 'gr_magnet_tanker_pre_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         ingredients = {
             {type="item", name="fu_materials_KFK", amount=100},
             {type="item", name="fu_materials_TIM", amount=100},
@@ -185,7 +174,6 @@ data:extend({
         results = {
             {type="item", name="gr_magnet_tanker_pre_item", amount=1},
         },
-        result_count = 1,
         energy_required = 6,
     },
     --kovarex for matter 
@@ -193,7 +181,7 @@ data:extend({
         name = 'gr_kovarex_recipe',
         type = 'recipe',
         category = 'centrifuging',
-        enabled = 'false',
+        enabled = false,
         main_product = 'fu_space_probe_up_matter_item',
         ingredients = {
             {type="item", name="fu_space_probe_down_matter_item", amount=10}
@@ -202,7 +190,6 @@ data:extend({
             {type="item", name="fu_space_probe_down_matter_item", amount=9},
             {type="item", name="fu_space_probe_up_matter_item", amount=1}
         },
-        result_count = 1,
         energy_required = 100,
         always_show_made_in = true
     },
@@ -210,7 +197,7 @@ data:extend({
         name = 'gr_kovarex_2_recipe',
         type = 'recipe',
         category = 'centrifuging',
-        enabled = 'false',
+        enabled = false,
         main_product = 'fu_space_probe_down_matter_item',
         ingredients = {
             {type="item", name="fu_space_probe_up_matter_item", amount=10}
@@ -219,7 +206,6 @@ data:extend({
             {type="item", name="fu_space_probe_up_matter_item", amount=9},
             {type="item", name="fu_space_probe_down_matter_item", amount=1}
         },
-        result_count = 1,
         energy_required = 100,
         always_show_made_in = true
     },
@@ -227,104 +213,98 @@ data:extend({
     {
         name = 'gr_charger_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         main_product = 'gr_charger_item',
         ingredients = {
-            {'low-density-structure',100},
+            {type="item", name="low-density-structure", amount=100},
-            {'fu_materials_KFK',100},
+            {type="item", name="fu_materials_KFK", amount=100},
-            {'gr_materials_magnet',100},
+            {type="item", name="gr_materials_magnet", amount=100},
-            {'fu_tech_sign_item',1000},
+            {type="item", name="fu_tech_sign_item", amount=1000},
-            {'concrete',500},
+            {type="item", name="concrete", amount=500},
-            {'lab',10},
+            {type="item", name="lab", amount=10},
-            {'gr_materials_circuit',100}
+            {type="item", name="gr_materials_circuit", amount=100}
         },
         results = {
             {type="item", name="gr_charger_item", amount=1}
         },
-        result_count = 1,
         energy_required = 5
     },
     {
         name = 'gr_stabilizer_recipe',
         type = 'recipe',
         category = 'gr_charger_category',
-        enabled = 'false',
+        enabled = false,
         main_product = 'gr_materials_stabilizer_item',
         ingredients = {
-            {'gr_materials_crushed_exotic_item',1},
+            {type="item", name="gr_materials_crushed_exotic_item", amount=1},
-            {'fu_materials_energy_crystal',10},
+            {type="item", name="fu_materials_energy_crystal", amount=10},
-            {'fu_tech_sign_item',10},
+            {type="item", name="fu_tech_sign_item", amount=10},
         },
         results = {
             {type="item", name="gr_materials_stabilizer_item", amount=4}
         },
-        result_count = 1,
         energy_required = 4,
         always_show_made_in = true
     },
     {
         name = 'gr_crushed_exotic_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'fi_crushing',
         ingredients = {
-            {'fu_space_probe_ore_item',1},
+            {type="item", name="fu_space_probe_ore_item", amount=1},
         },
-        result = 'gr_materials_crushed_exotic_item',
+        results = {{type="item", name='gr_materials_crushed_exotic_item', amount=2}},
-        result_count = 2,
         energy_required = 2,
         always_show_made_in = true
     },
     {
         name = 'gr_black_hole_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         ingredients = {
-            {'fu_star_engine_core_item',1},
+            {type="item", name="fu_star_engine_core_item", amount=1},
-            {'fu_star_engine_heater_left_item',1},
+            {type="item", name="fu_star_engine_heater_left_item", amount=1},
-            {'fu_star_engine_heater_item',1},
+            {type="item", name="fu_star_engine_heater_item", amount=1},
-            {'fu_star_engine_cooler_up_item',1},
+            {type="item", name="fu_star_engine_cooler_up_item", amount=1},
-            {'fu_star_engine_cooler_item',1},
+            {type="item", name="fu_star_engine_cooler_item", amount=1},
-            {'gr_materials_stack_up_item',40},
+            {type="item", name="gr_materials_stack_up_item", amount=40},
-            {'gr_materials_stack_down_item',40},
+            {type="item", name="gr_materials_stack_down_item", amount=40},
-            {'gr_materials_magnet',100},
+            {type="item", name="gr_materials_magnet", amount=100},
         },
-        result = 'gr_black_hole_item',
+        results = {{type="item", name='gr_black_hole_item', amount=1}},
-        result_count = 1,
         energy_required = 200,
     },
     {
         name = 'gr_white_hole_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         ingredients = {
-            {'fu_star_engine_core_item',1},
+            {type="item", name="fu_star_engine_core_item", amount=1},
-            {'fu_star_engine_heater_left_item',1},
+            {type="item", name="fu_star_engine_heater_left_item", amount=1},
-            {'fu_star_engine_heater_item',1},
+            {type="item", name="fu_star_engine_heater_item", amount=1},
-            {'fu_star_engine_cooler_up_item',1},
+            {type="item", name="fu_star_engine_cooler_up_item", amount=1},
-            {'fu_star_engine_cooler_item',1},
+            {type="item", name="fu_star_engine_cooler_item", amount=1},
-            {'gr_materials_stack_up_item',40},
+            {type="item", name="gr_materials_stack_up_item", amount=40},
-            {'gr_materials_stack_down_item',40},
+            {type="item", name="gr_materials_stack_down_item", amount=40},
-            {'gr_materials_magnet',100},
+            {type="item", name="gr_materials_magnet", amount=100},
         },
-        result = 'gr_white_hole_item',
+        results = {{type="item", name='gr_white_hole_item', amount=1}},
-        result_count = 1,
         energy_required = 200,
     },
     {
         name = 'gr_lab_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         ingredients = {
-            {'gr_materials_stack_up_item',10},
+            {type="item", name="gr_materials_stack_up_item", amount=10},
-            {'gr_materials_stack_down_item',10},
+            {type="item", name="gr_materials_stack_down_item", amount=10},
-            {'lab',40},
+            {type="item", name="lab", amount=40},
-            {'fu_materials_KFK',100},
+            {type="item", name="fu_materials_KFK", amount=100},
-            {'fu_materials_TIM',100},
+            {type="item", name="fu_materials_TIM", amount=100},
-            {'gr_materials_magnet',100},
+            {type="item", name="gr_materials_magnet", amount=100},
         },
-        result = 'gr_lab_item',
+        results = {{type="item", name='gr_lab_item', amount=1}},
-        result_count = 1,
         energy_required = 20,
     },
     --endgame
@@ -332,27 +312,25 @@ data:extend({
     {
         name = 'gr_red_data_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'automation-science-pack',100},
+            {type="item", name="automation-science-pack", amount=100},
-            {'gr_materials_data_item',1}
+            {type="item", name="gr_materials_data_item", amount=1}
         },
-        result = 'gr_materials_red_data_item',
+        results = {{type="item", name='gr_materials_red_data_item', amount=1}},
-        result_count = 1,
         energy_required = 10,
         always_show_made_in = true
     },
     {
         name = 'gr_red_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'gr_materials_red_data_item',36},
+            {type="item", name="gr_materials_red_data_item", amount=36},
         },
-        result = 'gr_materials_red_item',
+        results = {{type="item", name='gr_materials_red_item', amount=1}},
-        result_count = 1,
         energy_required = 100,
         always_show_made_in = true
     },
@@ -361,28 +339,26 @@ data:extend({
     {
         name = 'gr_green_data_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'logistic-science-pack',100},
+            {type="item", name="logistic-science-pack", amount=100},
-            {'gr_materials_data_item',1}
+            {type="item", name="gr_materials_data_item", amount=1}
         },
-        result = 'gr_materials_green_data_item',
+        results = {{type="item", name='gr_materials_green_data_item', amount=1}},
-        result_count = 1,
         energy_required = 10,
         always_show_made_in = true
     },
     {
         name = 'gr_green_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'gr_materials_green_data_item',72},
+            {type="item", name="gr_materials_green_data_item", amount=72},
-            {'gr_materials_red_item',2}
+            {type="item", name="gr_materials_red_item", amount=2}
         },
-        result = 'gr_materials_green_item',
+        results = {{type="item", name='gr_materials_green_item', amount=1}},
-        result_count = 1,
         energy_required = 100,
         always_show_made_in = true
     },
@@ -391,28 +367,26 @@ data:extend({
     {
         name = 'gr_blue_data_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'chemical-science-pack',100},
+            {type="item", name="chemical-science-pack", amount=100},
-            {'gr_materials_data_item',1}
+            {type="item", name="gr_materials_data_item", amount=1}
         },
-        result = 'gr_materials_blue_data_item',
+        results = {{type="item", name='gr_materials_blue_data_item', amount=1}},
-        result_count = 1,
         energy_required = 10,
         always_show_made_in = true
     },
     {
         name = 'gr_blue_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'gr_materials_blue_data_item',155},
+            {type="item", name="gr_materials_blue_data_item", amount=155},
-            {'gr_materials_green_item',2}
+            {type="item", name="gr_materials_green_item", amount=2}
         },
-        result = 'gr_materials_blue_item',
+        results = {{type="item", name='gr_materials_blue_item', amount=1}},
-        result_count = 1,
         energy_required = 100,
         always_show_made_in = true
     },
@@ -421,28 +395,26 @@ data:extend({
     {
         name = 'gr_purple_data_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'production-science-pack',100},
+            {type="item", name="production-science-pack", amount=100},
-            {'gr_materials_data_item',1}
+            {type="item", name="gr_materials_data_item", amount=1}
         },
-        result = 'gr_materials_purple_data_item',
+        results = {{type="item", name='gr_materials_purple_data_item', amount=1}},
-        result_count = 1,
         energy_required = 10,
         always_show_made_in = true
     },
     {
         name = 'gr_purple_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'gr_materials_purple_data_item',310},
+            {type="item", name="gr_materials_purple_data_item", amount=310},
-            {'gr_materials_blue_item',2}
+            {type="item", name="gr_materials_blue_item", amount=2}
         },
-        result = 'gr_materials_purple_item',
+        results = {{type="item", name='gr_materials_purple_item', amount=1}},
-        result_count = 1,
         energy_required = 100,
         always_show_made_in = true
     },
@@ -451,28 +423,26 @@ data:extend({
     {
         name = 'gr_yellow_data_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'utility-science-pack',100},
+            {type="item", name="utility-science-pack", amount=100},
-            {'gr_materials_data_item',1}
+            {type="item", name="gr_materials_data_item", amount=1}
         },
-        result = 'gr_materials_yellow_data_item',
+        results = {{type="item", name='gr_materials_yellow_data_item', amount=1}},
-        result_count = 1,
         energy_required = 10,
         always_show_made_in = true
     },
     {
         name = 'gr_yellow_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'gr_materials_yellow_data_item',620},
+            {type="item", name="gr_materials_yellow_data_item", amount=620},
-            {'gr_materials_purple_item',2}
+            {type="item", name="gr_materials_purple_item", amount=2}
         },
-        result = 'gr_materials_yellow_item',
+        results = {{type="item", name='gr_materials_yellow_item', amount=1}},
-        result_count = 1,
         energy_required = 100,
         always_show_made_in = true
     },
@@ -482,28 +452,26 @@ data:extend({
     {
         name = 'gr_grey_data_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'space-science-pack',100},
+            {type="item", name="space-science-pack", amount=100},
-            {'gr_materials_data_item',1}
+            {type="item", name="gr_materials_data_item", amount=1}
         },
-        result = 'gr_materials_grey_data_item',
+        results = {{type="item", name='gr_materials_grey_data_item', amount=1}},
-        result_count = 1,
         energy_required = 10,
         always_show_made_in = true
     },
     {
         name = 'gr_grey_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'gr_materials_grey_data_item',1240},
+            {type="item", name="gr_materials_grey_data_item", amount=1240},
-            {'gr_materials_yellow_item',2}
+            {type="item", name="gr_materials_yellow_item", amount=2}
         },
-        result = 'gr_materials_grey_item',
+        results = {{type="item", name='gr_materials_grey_item', amount=1}},
-        result_count = 1,
         energy_required = 100,
         always_show_made_in = true
     },
@@ -512,28 +480,26 @@ data:extend({
     {
         name = 'gr_white_data_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'fu_space_probe_science_item',100},
+            {type="item", name="fu_space_probe_science_item", amount=100},
-            {'gr_materials_data_item',1}
+            {type="item", name="gr_materials_data_item", amount=1}
         },
-        result = 'gr_materials_white_data_item',
+        results = {{type="item", name='gr_materials_white_data_item', amount=1}},
-        result_count = 1,
         energy_required = 10,
         always_show_made_in = true
     },
     {
         name = 'gr_white_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'gr_materials_white_data_item',2480},
+            {type="item", name="gr_materials_white_data_item", amount=2480},
-            {'gr_materials_grey_item',2}
+            {type="item", name="gr_materials_grey_item", amount=2}
         },
-        result = 'gr_materials_white_item',
+        results = {{type="item", name='gr_materials_white_item', amount=1}},
-        result_count = 1,
         energy_required = 100,
         always_show_made_in = true
     },
@@ -547,31 +513,29 @@ data:extend({
     {
         name = 'gr_data_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'gr_materials_crushed_exotic_item',1},
+            {type="item", name="gr_materials_crushed_exotic_item", amount=1},
-            {'gr_materials_stabilizer_item',1},
+            {type="item", name="gr_materials_stabilizer_item", amount=1},
-            {'gr_materials_circuit',20},
+            {type="item", name="gr_materials_circuit", amount=20},
-            {'fi_modules_base_item',10}
+            {type="item", name="fi_modules_base_item", amount=10}
         },
-        result = 'gr_materials_data_item',
+        results = {{type="item", name='gr_materials_data_item', amount=1}},
-        result_count = 1,
         energy_required = 10,
         always_show_made_in = true
     },
     {
         name = 'gr_stacked_data_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'fu_fusor_crafting_category',
         ingredients = {
-            {'gr_materials_data_item',3},
+            {type="item", name="gr_materials_data_item", amount=3},
-            {'gr_materials_stack_up_item',1},
+            {type="item", name="gr_materials_stack_up_item", amount=1},
-            {'gr_materials_stack_down_item',1}
+            {type="item", name="gr_materials_stack_down_item", amount=1}
         },
-        result = 'gr_materials_stacked_data_item',
+        results = {{type="item", name='gr_materials_stacked_data_item', amount=1}},
-        result_count = 1,
         energy_required = 10,
         always_show_made_in = true
     },
@@ -579,131 +543,122 @@ data:extend({
     {
         name = 'gr_red_pack_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'gr_charger_category',
         ingredients = {
-            {'automation-science-pack',100},
+            {type="item", name="automation-science-pack", amount=100},
-            {'gr_materials_stacked_data_item',1}
+            {type="item", name="gr_materials_stacked_data_item", amount=1}
         },
-        result = 'gr_materials_red_pack_item',
+        results = {{type="item", name='gr_materials_red_pack_item', amount=100}},
-        result_count = 100,
         energy_required = 10,
         always_show_made_in = true
     },
     {
         name = 'gr_green_pack_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'gr_charger_category',
         ingredients = {
-            {'logistic-science-pack',100},
+            {type="item", name="logistic-science-pack", amount=100},
-            {'gr_materials_stacked_data_item',1}
+            {type="item", name="gr_materials_stacked_data_item", amount=1}
         },
-        result = 'gr_materials_green_pack_item',
+        results = {{type="item", name='gr_materials_green_pack_item', amount=100}},
-        result_count = 100,
         energy_required = 10,
         always_show_made_in = true
     },
     {
         name = 'gr_blue_pack_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'gr_charger_category',
         ingredients = {
-            {'chemical-science-pack',100},
+            {type="item", name="chemical-science-pack", amount=100},
-            {'gr_materials_stacked_data_item',1}
+            {type="item", name="gr_materials_stacked_data_item", amount=1}
         },
-        result = 'gr_materials_blue_pack_item',
+        results = {{type="item", name='gr_materials_blue_pack_item', amount=100}},
-        result_count = 100,
         energy_required = 10,
         always_show_made_in = true
     },
     {
         name = 'gr_purple_pack_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'gr_charger_category',
         ingredients = {
-            {'production-science-pack',100},
+            {type="item", name="production-science-pack", amount=100},
-            {'gr_materials_stacked_data_item',1}
+            {type="item", name="gr_materials_stacked_data_item", amount=1}
         },
-        result = 'gr_materials_purple_pack_item',
+        results = {{type="item", name='gr_materials_purple_pack_item', amount=100}},
-        result_count = 100,
         energy_required = 10,
         always_show_made_in = true
     },
     {
         name = 'gr_yellow_pack_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'gr_charger_category',
         ingredients = {
-            {'utility-science-pack',100},
+            {type="item", name="utility-science-pack", amount=100},
-            {'gr_materials_stacked_data_item',1}
+            {type="item", name="gr_materials_stacked_data_item", amount=1}
         },
-        result = 'gr_materials_yellow_pack_item',
+        results = {{type="item", name='gr_materials_yellow_pack_item', amount=100}},
-        result_count = 100,
         energy_required = 10,
         always_show_made_in = true
     },
     {
         name = 'gr_grey_pack_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'gr_charger_category',
         ingredients = {
-            {'space-science-pack',100},
+            {type="item", name="space-science-pack", amount=100},
-            {'gr_materials_stacked_data_item',1}
+            {type="item", name="gr_materials_stacked_data_item", amount=1}
         },
-        result = 'gr_materials_grey_pack_item',
+        results = {{type="item", name='gr_materials_grey_pack_item', amount=100}},
-        result_count = 100,
         energy_required = 10,
         always_show_made_in = true
     },
     {
         name = 'gr_white_pack_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'gr_charger_category',
         ingredients = {
-            {'fu_space_probe_science_item',100},
+            {type="item", name="fu_space_probe_science_item", amount=100},
-            {'gr_materials_stacked_data_item',1}
+            {type="item", name="gr_materials_stacked_data_item", amount=1}
         },
-        result = 'gr_materials_white_pack_item',
+        results = {{type="item", name='gr_materials_white_pack_item', amount=100}},
-        result_count = 100,
         energy_required = 10,
         always_show_made_in = true
     },
     {
         name = 'gr_materials_charge_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         ingredients = {
-            {'fu_space_probe_science_item',100},
+            {type="item", name="fu_space_probe_science_item", amount=100},
-            {'low-density-structure',40},
+            {type="item", name="low-density-structure", amount=40},
-            {'gr_materials_fusion_cell_item',10},
+            {type="item", name="gr_materials_fusion_cell_item", amount=10},
-            {'discharge-defense-equipment',10}
+            {type="item", name="discharge-defense-equipment", amount=10}
         },
-        result = 'gr_materials_charge_item',
+        results = {{type="item", name='gr_materials_charge_item', amount=1}},
-        result_count = 1,
         energy_required = 10,
     },
     {
         name = 'gr_materials_charge_remote_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         ingredients = {
-            {'gr_materials_fusion_cell_item',1}
+            {type="item", name="gr_materials_fusion_cell_item", amount=1}
         },
-        result = 'gr_materials_charge_remote',
+        results = {{type="item", name='gr_materials_charge_remote', amount=1}},
-        result_count = 1,
         energy_required = 10,
     },
 
     {
         name = 'gr_circuit_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'crafting-with-fluid',
         main_product = 'gr_materials_circuit',
         ingredients = {
@@ -722,7 +677,7 @@ data:extend({
     {
         name = 'gr_gold_wire_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         ingredients = {
             {type="item", name="fi_materials_gold", amount=1},
         },
@@ -735,7 +690,7 @@ data:extend({
     {
         name = 'gr_pcb_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'chemistry',
         ingredients = {
             {type="fluid", name="petroleum-gas", amount=30},
@@ -754,7 +709,7 @@ data:extend({
     {
         name = 'gr_magnet_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'fu_magnet_category',
         main_product = 'gr_materials_magnet',
         ingredients = {
@@ -773,7 +728,7 @@ data:extend({
     {
         name = 'gr_plasma_cube_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'fu_plasma_category',
         main_product = 'gr_materials_plasma_cube',
         ingredients = {

248k_2/prototypes/gravitation/gr_black_hole.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/gravitation/gr_black_hole/gr_black_hole_'..name
+    return '__248k_2__/ressources/gravitation/gr_black_hole/gr_black_hole_'..name
 end
 
 --item

248k_2/prototypes/gravitation/gr_charger.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/gravitation/gr_charger/gr_charger_'..name
+    return '__248k_2__/ressources/gravitation/gr_charger/gr_charger_'..name
 end
 
 --item

248k_2/prototypes/gravitation/gr_cooker.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/gravitation/gr_cooker/gr_cooker_'..name
+    return '__248k_2__/ressources/gravitation/gr_cooker/gr_cooker_'..name
 end
 
 --item
@@ -52,47 +52,46 @@ data:extend({
       energy_usage = '4MW',
       fluid_boxes = {
           {
-            base_area = 1,
+
-            height = 2,
+            volume = 200,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
             pipe_connections =
             {
-              {type = "input", position = {0, -3}},
+              {flow_direction = "input", direction = defines.direction.north, position = {0, -2}},
-            },
-            production_type = "input"
-          },
-          { 
-            base_area = 1,
-            height = 2,
-            base_level = -1,
-            pipe_covers = pipecoverspictures(),
-            pipe_connections =
-            {
-              {type = "input", position = {-3, 0}}
-            },
-            production_type = "input"
-          },
-          { 
-            base_area = 1,
-            height = 2,
-            base_level = -1,
-            pipe_covers = pipecoverspictures(),
-            pipe_connections =
-            {
-              {type = "input", position = {3, 0}},
-              --{type = "output", position = {2, -2.5}}
             },
             production_type = "input"
           },
           {
-            base_area = 1,
+
-            height = 2,
+            volume = 200,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
             pipe_connections =
             {
-              {type = "input", position = {0, 3}},
+              {flow_direction = "input", direction = defines.direction.west, position = {-2, 0}}
+            },
+            production_type = "input"
+          },
+          {
+
+            volume = 200,
+            base_level = -1,
+            pipe_covers = pipecoverspictures(),
+            pipe_connections =
+            {
+              {flow_direction = "input", direction = defines.direction.east, position = {2, 0}},
+            },
+            production_type = "input"
+          },
+          {
+
+            volume = 200,
+            base_level = -1,
+            pipe_covers = pipecoverspictures(),
+            pipe_connections =
+            {
+              {flow_direction = "input", direction = defines.direction.south, position = {0, 2}},
             },
             production_type = "input"
           },

248k_2/prototypes/gravitation/gr_crafter.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/gravitation/gr_crafter/gr_crafter_'..name
+    return '__248k_2__/ressources/gravitation/gr_crafter/gr_crafter_'..name
 end
 
 --item

248k_2/prototypes/gravitation/gr_lab.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/gravitation/gr_lab/gr_lab_'..name
+    return '__248k_2__/ressources/gravitation/gr_lab/gr_lab_'..name
 end
 
 --item

248k_2/prototypes/gravitation/gr_materials.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/gravitation/gr_materials/gr_materials_'..name
+    return '__248k_2__/ressources/gravitation/gr_materials/gr_materials_'..name
 end
 
 --item

248k_2/prototypes/gravitation/gr_train.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/gravitation/gr_magnet_train/gr_magnet_train_'..name
+    return '__248k_2__/ressources/gravitation/gr_magnet_train/gr_magnet_train_'..name
 end
 
 --item
@@ -419,7 +419,7 @@ data:extend({
             fuel_inventory_size = 3,
             burnt_inventory_size = 3,
             effectivity = 0.001,
-            emissions_per_minute = 10,
+            emissions_per_minute = { pollution = 10 },
         },
         --light
         front_light = {

248k_2/prototypes/gravitation/gr_white_hole.lua

@@ -4,7 +4,7 @@ local function config(name)
 end
 
 local function sprite(name)
-    return '__248k__/ressources/gravitation/gr_white_hole/gr_white_hole_'..name
+    return '__248k_2__/ressources/gravitation/gr_white_hole/gr_white_hole_'..name
 end
 
 --item

248k_2/prototypes/grenades.lua

@@ -1,5 +1,5 @@
 local function sprite(name)
-    return '__248k__/ressources/grenade/'..name
+    return '__248k_2__/ressources/grenade/'..name
 end
 
 local el_explosion = table.deepcopy(data.raw['explosion']['grenade-explosion'])

248k_2/prototypes/pipe_covers.lua

@@ -1,5 +1,5 @@
 local function sprite(name)
-    return "__248k__/ressources/pipe_covers/"..name..".png"
+    return "__248k_2__/ressources/pipe_covers/"..name..".png"
 end
 
 empty_sprite = {

248k_2/scripts/SE/data-final-fixes.lua

@@ -7,25 +7,25 @@ table.insert(data.raw.lab["gr_lab_entity"].inputs, "se-deep-space-science-pack-1
 table.insert(data.raw.lab["gr_lab_entity"].inputs, "se-material-science-pack-2")
 table.insert(data.raw.lab["gr_lab_entity"].inputs, "se-rocket-science-pack")
 --se-energy-science-pack-1
-table.insert(data.raw.technology["fu_energy_tech"].unit.ingredients, {"se-energy-science-pack-1", 1})
+table.insert(data.raw.technology["fu_energy_tech"].unit.ingredients, {type="item", name="se-energy-science-pack-1", amount=1})
-table.insert(data.raw.technology["fu_reactor_tech"].unit.ingredients, {"se-energy-science-pack-1", 1})
+table.insert(data.raw.technology["fu_reactor_tech"].unit.ingredients, {type="item", name="se-energy-science-pack-1", amount=1})
-table.insert(data.raw.technology["fu_tokamak_tech"].unit.ingredients, {"se-energy-science-pack-2", 1})
+table.insert(data.raw.technology["fu_tokamak_tech"].unit.ingredients, {type="item", name="se-energy-science-pack-2", amount=1})
-table.insert(data.raw.technology["fu_star_engine_tech"].unit.ingredients, {"se-energy-science-pack-3", 1})
+table.insert(data.raw.technology["fu_star_engine_tech"].unit.ingredients, {type="item", name="se-energy-science-pack-3", amount=1})
 --se-energy-material-pack-1
-table.insert(data.raw.technology["fu_star_engine_copper_tech"].unit.ingredients, {"se-material-science-pack-1", 1})
+table.insert(data.raw.technology["fu_star_engine_copper_tech"].unit.ingredients, {type="item", name="se-material-science-pack-1", amount=1})
-table.insert(data.raw.technology["fu_star_engine_iron_tech"].unit.ingredients, {"se-material-science-pack-1", 1})
+table.insert(data.raw.technology["fu_star_engine_iron_tech"].unit.ingredients, {type="item", name="se-material-science-pack-1", amount=1})
-table.insert(data.raw.technology["fu_star_engine_sulfur_tech"].unit.ingredients, {"se-material-science-pack-1", 1})
+table.insert(data.raw.technology["fu_star_engine_sulfur_tech"].unit.ingredients, {type="item", name="se-material-science-pack-1", amount=1})
 --ki
-table.insert(data.raw.technology["fu_ki_plus_1_tech"].unit.ingredients, {"se-deep-space-science-pack-2", 1})
+table.insert(data.raw.technology["fu_ki_plus_1_tech"].unit.ingredients, {type="item", name="se-deep-space-science-pack-2", amount=1})
-table.insert(data.raw.technology["fu_ki_plus_2_tech"].unit.ingredients, {"se-deep-space-science-pack-4", 1})
+table.insert(data.raw.technology["fu_ki_plus_2_tech"].unit.ingredients, {type="item", name="se-deep-space-science-pack-4", amount=1})
-table.insert(data.raw.technology["el_ki_sup_2_tech"].unit.ingredients, {"se-energy-science-pack-1", 1})
+table.insert(data.raw.technology["el_ki_sup_2_tech"].unit.ingredients, {type="item", name="se-energy-science-pack-1", amount=1})
-table.insert(data.raw.technology["el_ki_sup_3_tech"].unit.ingredients, {"se-energy-science-pack-2", 1})
+table.insert(data.raw.technology["el_ki_sup_3_tech"].unit.ingredients, {type="item", name="se-energy-science-pack-2", amount=1})
-table.insert(data.raw.technology["el_ki_sup_4_tech"].unit.ingredients, {"se-energy-science-pack-3", 1})
+table.insert(data.raw.technology["el_ki_sup_4_tech"].unit.ingredients, {type="item", name="se-energy-science-pack-3", amount=1})
 
 --modules
-table.insert(data.raw.technology["fi_modules_4_tech"].unit.ingredients, {"se-deep-space-science-pack-2", 1})
+table.insert(data.raw.technology["fi_modules_4_tech"].unit.ingredients, {type="item", name="se-deep-space-science-pack-2", amount=1})
-table.insert(data.raw.technology["fi_modules_5_tech"].unit.ingredients, {"se-deep-space-science-pack-3", 1})
+table.insert(data.raw.technology["fi_modules_5_tech"].unit.ingredients, {type="item", name="se-deep-space-science-pack-3", amount=1})
-table.insert(data.raw.technology["fi_modules_6_tech"].unit.ingredients, {"se-deep-space-science-pack-4", 1})
+table.insert(data.raw.technology["fi_modules_6_tech"].unit.ingredients, {type="item", name="se-deep-space-science-pack-4", amount=1})
 
 
 data.raw.technology["gr_stage_tech"].prerequisites = {

248k_2/scripts/clean_up.lua

@@ -17,11 +17,11 @@ local clean_up_list = {
 local function clean_up(clean_up_list)
     for i,v in ipairs(clean_up_list) do
         if data.raw.item[v] then
-            data.raw.item[v].flags = { "hidden" }
+            data.raw.item[v].hidden = true
         end
 
         if data.raw["item-with-tags"][v] then
-            data.raw["item-with-tags"][v].flags = { "hidden" }
+            data.raw["item-with-tags"][v].hidden = true
         end
     end
 end

248k_2/scripts/electronic/el_burner.lua

@@ -1,31 +1,25 @@
 function make_burner_recipe(item)
     if string.find(item, "dummy") then return end -- fix for ElectricTrains crash
     local blank = {
-        name = 'fu_burn_oxygen_recipe',
+        name = "fu_burn_"..item.."_recipe",
         type = 'recipe',
         category = 'fu_burner_category',
-        icon = '__248k__/ressources/elements/fu_oxygen.png',
+        icon = '__248k_2__/ressources/elements/fu_oxygen.png',
         icon_size = 64,
         enabled = true,
         hidden = true,
         ingredients = {
-            {type="item", name="blank", amount=1},
+            {type="item", name=item, amount=1},
         },
         results = {},
-        result_count = 1,
         energy_required = 0.1,
         always_show_made_in = true,
         subgroup = 'fu_item_subgroup_f',
     }
-    blank["name"] = "fu_burn_"..item.."_recipe"
+    if data.raw.item[item].icon then
-    blank["ingredients"] = {
-        {item,1}
-    }
-    if data.raw.item[item].icon then 
         blank["icon"] = data.raw.item[item].icon
         blank["icon_size"] = data.raw.item[item].icon_size
     end
-    --table.insert(data.raw.recipe, base)
     data:extend({blank})
 end
 

248k_2/scripts/gravitation/gr_make_white_hole_recipes.lua

@@ -1,36 +1,28 @@
 function gr_make_white_hole_recipe(item)
-    local blank = {
+    data:extend({
-        name = 'blank',
+        {
-        type = 'recipe',
+            name = "gr_white_hole_cycle_" .. item .. "_recipe",
-        enabled = 'true',
+            type = 'recipe',
-        hidden = 'true',
+            enabled = true,
-        allow_as_intermediate = 'false',
+            hidden = true,
-        category = 'gr_white_hole_category',
+            allow_as_intermediate = false,
-        ingredients = {
+            category = 'gr_white_hole_category',
-            {'blank',1}
+            ingredients = {
-        },
+                { type = "item", name = item, amount = 1 }
-        result = 'blank',
+            },
-        result_count = 2,
+            results = { { type = "item", name = item, amount = 2 } },
-        energy_required = 10,
+            energy_required = 10,
-    }
+        }
-    blank["name"] = "gr_white_hole_cycle_"..item.."_recipe"
+    })
-    blank["ingredients"] = {
-        {item,1}
-    }
-    blank["result"] = item
-
-    --table.insert(data.raw.recipe, base)
-    data:extend({blank})
 end
 
 function gr_white_hole_recipe_generator()
     local items = data.raw.item
-    for i,v in pairs(items) do
+    for i, v in pairs(items) do
         if tonumber(data.raw.item[i].stack_size) > 1 then
             gr_make_white_hole_recipe(data.raw.item[i].name)
         end
     end
 end
 
-
+gr_white_hole_recipe_generator()
-gr_white_hole_recipe_generator()

248k_2/scripts/ind2/data-final-fixes.lua

@@ -1,5 +1,5 @@
 local function sprite(name)
-    return '__248k__/ressources/techs/'..name
+    return '__248k_2__/ressources/techs/'..name
 end
 
 data.raw["assembling-machine"]["oil-refinery"].fixed_recipe = nil
@@ -29,7 +29,7 @@ data:extend({
         name = 'gr_stainless_steel_recipe',
         type = 'recipe',
         category = 'crafting-with-fluid',
-        enabled = 'false',
+        enabled = false,
         subgroup = 'fu_star_engine_subgroup_e',
         ingredients = {
             {type="fluid", name="fu_iron", amount=500},
@@ -37,14 +37,13 @@ data:extend({
         results = {
             {type="item", name="stainless-ingot", amount=500},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
         name = 'gr_invar_recipe',
         type = 'recipe',
         category = 'crafting-with-fluid',
-        enabled = 'false',
+        enabled = false,
         subgroup = 'fu_star_engine_subgroup_e',
         ingredients = {
             {type="fluid", name="fu_iron", amount=500},
@@ -52,14 +51,13 @@ data:extend({
         results = {
             {type="item", name="invar-ingot", amount=500},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
         name = 'gr_nickel_recipe',
         type = 'recipe',
         category = 'crafting-with-fluid',
-        enabled = 'false',
+        enabled = false,
         subgroup = 'fu_star_engine_subgroup_e',
         ingredients = {
             {type="fluid", name="fu_iron", amount=500},
@@ -67,14 +65,13 @@ data:extend({
         results = {
             {type="item", name="cupronickel-ingot", amount=500},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
         name = 'gr_chrome_recipe',
         type = 'recipe',
         category = 'crafting-with-fluid',
-        enabled = 'false',
+        enabled = false,
         subgroup = 'fu_star_engine_subgroup_e',
         ingredients = {
             {type="fluid", name="fu_iron", amount=500},
@@ -82,14 +79,13 @@ data:extend({
         results = {
             {type="item", name="chromium-ingot", amount=500},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
         name = 'gr_gold_recipe',
         type = 'recipe',
         category = 'crafting-with-fluid',
-        enabled = 'false',
+        enabled = false,
         subgroup = 'fu_star_engine_subgroup_e',
         ingredients = {
             {type="fluid", name="fu_iron", amount=500},
@@ -97,14 +93,13 @@ data:extend({
         results = {
             {type="item", name="gold-ingot", amount=500},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {
         name = 'gr_tellerium_recipe',
         type = 'recipe',
         category = 'crafting-with-fluid',
-        enabled = 'false',
+        enabled = false,
         subgroup = 'fu_star_engine_subgroup_e',
         ingredients = {
             {type="fluid", name="fu_iron", amount=500},
@@ -112,7 +107,6 @@ data:extend({
         results = {
             {type="item", name="tellurium-ingot", amount=500},
         },
-        result_count = 1,
         energy_required = 6,
     },
     {

248k_2/scripts/informatron/inf_sprites.lua

@@ -1,12 +1,12 @@
 local function sprite(name)
-    return '__248k__/ressources/booktorio/bk_sprite_'..name
+    return '__248k_2__/ressources/booktorio/bk_sprite_'..name
 end
 -- style_name, filename, width, height -- style_name MUST be a completely unique name
 informatron_make_image("inf_248k_image_1", sprite('1.png'), 1245, 1122) 
 informatron_make_image("inf_248k_image_2", sprite('2.png'), 1044, 826)
 informatron_make_image("inf_248k_image_3", sprite('3.png'), 988, 696)
-informatron_make_image("inf_248k_image_4", '__248k__/ressources/fusion/fu_fusor/fu_fusor_entity_animation.png', 512*2, 512*2)
+informatron_make_image("inf_248k_image_4", '__248k_2__/ressources/fusion/fu_fusor/fu_fusor_entity_animation.png', 512*2, 512*2)
-informatron_make_image("inf_248k_image_5", '__248k__/ressources/fusion/fu_boiler/fu_boiler_entity_animation.png', 512, 512)
+informatron_make_image("inf_248k_image_5", '__248k_2__/ressources/fusion/fu_boiler/fu_boiler_entity_animation.png', 512, 512)
 informatron_make_image("inf_248k_image_6", sprite('6.png'), 1080, 1080)
 informatron_make_image("inf_248k_image_7", sprite('7.png'), 1292, 627)
 

248k_2/scripts/krastorio2/data-final-fixes.lua

@@ -11,11 +11,10 @@ data:extend({
         always_show_made_in = true,
         ingredients =
         {
-            {"fi_crushed_lithium_item", 10},
+            {type="item", name="fi_crushed_lithium_item", amount=10},
             {type="fluid", name="mineral-water", amount=100}
         },
-        result = "lithium-chloride",
+        results = {{type="item", name="lithium-chloride", amount=10}},
-        result_count = 10,
         category = "chemistry"
     },
     {
@@ -23,7 +22,7 @@ data:extend({
         type = 'recipe',
         category = 'el_charger_category',
         main_product = 'hydrogen',
-        enabled = 'false',
+        enabled = false,
         ingredients = {
             {type="item", name="fi_materials_gold", amount=1},
             {type="fluid", name="water", amount=150},
@@ -33,7 +32,6 @@ data:extend({
             {type="fluid", name="oxygen", amount=50},
             {type="item", name="fi_materials_gold", amount=1, probability=0.25},
         },
-        result_count = 1,
         energy_required = 5,
         subgroup = 'fu_item_subgroup_e',
         order = 'a-a',
@@ -44,7 +42,7 @@ data:extend({
         type = 'recipe',
         category = 'el_charger_category',
         main_product = 'hydrogen',
-        enabled = 'false',
+        enabled = false,
         ingredients = {
             {type="item", name="fi_materials_gold", amount=1},
             {type="fluid", name="water", amount=300},
@@ -54,7 +52,6 @@ data:extend({
             {type="fluid", name="oxygen", amount=100},
             {type="item", name="fi_materials_gold", amount=1, probability=0.55},
         },
-        result_count = 1,
         energy_required = 5,
         subgroup = 'fu_item_subgroup_e',
         order = 'a-a',
@@ -65,7 +62,7 @@ data:extend({
         type = 'recipe',
         category = 'el_charger_category',
         main_product = 'hydrogen',
-        enabled = 'false',
+        enabled = false,
         ingredients = {
             {type="item", name="fi_materials_gold", amount=1},
             {type="fluid", name="water", amount=650},
@@ -75,7 +72,6 @@ data:extend({
             {type="fluid", name="oxygen", amount=150},
             {type="item", name="fi_materials_gold", amount=1, probability=0.85},
         },
-        result_count = 1,
         energy_required = 5,
         subgroup = 'fu_item_subgroup_e',
         order = 'a-a',
@@ -86,14 +82,13 @@ data:extend({
         type = 'recipe',
         category = 'el_charger_category',
         main_product = 'hydrogen',
-        enabled = 'false',
+        enabled = false,
         ingredients = {
             {type="fluid", name="water", amount=1100},
         },
         results = {
             {type="fluid", name="hydrogen", amount=1000},
         },
-        result_count = 1,
         energy_required = 5,
         subgroup = 'fu_item_subgroup_e',
         order = 'a-a',
@@ -111,7 +106,6 @@ data:extend({
         results = {
             {type="fluid", name="hydrogen", amount=1000, temperature=40},
         },
-        result_count = 1,
         energy_required = 1,
         subgroup = 'fu_item_subgroup_e',
         order = 'a-a',
@@ -130,7 +124,6 @@ data:extend({
             {type="fluid", name="hydrogen", amount=100, temperature=40},
             {type="fluid", name="oxygen", amount=50, temperature=40}
         },
-        result_count = 1,
         energy_required = 1,
         subgroup = 'fu_item_subgroup_e',
         order = 'a-a',
@@ -149,7 +142,6 @@ data:extend({
             {type="fluid", name="hydrogen", amount=200, temperature=40},
             {type="fluid", name="oxygen", amount=100, temperature=40}
         },
-        result_count = 1,
         energy_required = 1,
         subgroup = 'fu_item_subgroup_e',
         order = 'a-a',
@@ -168,7 +160,6 @@ data:extend({
             {type="fluid", name="hydrogen", amount=500, temperature=40},
             {type="fluid", name="oxygen", amount=150, temperature=40},
         },
-        result_count = 1,
         energy_required = 1,
         subgroup = 'fu_item_subgroup_e',
         order = 'a-a',
@@ -188,7 +179,6 @@ data:extend({
             {type="fluid", name="fu_deuterium", amount=10},
             {type="fluid", name="fu_tritium", amount=1}
         },
-        result_count = '0.5',
         energy_required = 100,
         always_show_made_in = true,
     },
@@ -197,7 +187,7 @@ data:extend({
         type = 'recipe',
         category = 'fu_exchanger_crafting_category',
         main_product = 'steam',
-        enabled = 'false',
+        enabled = false,
         ingredients = {
             {type="fluid", name="fu_lead_fluid_hot", amount=50},
             {type="fluid", name="water", amount=1000/2},
@@ -206,7 +196,6 @@ data:extend({
             {type="fluid", name="fu_lead_fluid_cold", amount=50},
             {type="fluid", name="steam", amount=1000/2, temperature=415},
         },
-        result_count = 1,
         energy_required = 1,
         subgroup = 'fu_item_subgroup_e',
         order = 'b-a',
@@ -217,7 +206,7 @@ data:extend({
         type = 'recipe',
         category = 'fu_exchanger_crafting_category',
         main_product = 'steam',
-        enabled = 'false',
+        enabled = false,
         ingredients = {
             {type="fluid", name="fu_lead_fluid_hot", amount=100},
             {type="fluid", name="water", amount=1000/4},
@@ -226,7 +215,6 @@ data:extend({
             {type="fluid", name="fu_lead_fluid_cold", amount=100},
             {type="fluid", name="steam", amount=1000/4, temperature=975},
         },
-        result_count = 1,
         energy_required = 1,
         subgroup = 'fu_item_subgroup_e',
         order = 'b-a',
@@ -236,7 +224,7 @@ data:extend({
         name = 'fu_star_engine_cooler_7_recipe',
         type = 'recipe',
         category = 'fu_star_engine_cooler_crafting_category',
-        enabled = 'false',
+        enabled = false,
         subgroup = 'fu_star_engine_subgroup_c',
         ingredients = {
             {type="fluid", name="fu_iron_heated", amount=500},
@@ -244,7 +232,6 @@ data:extend({
         results = {
             {type="fluid", name="matter", amount=500},
         },
-        result_count = 1,
         energy_required = 1,
     },
     {
@@ -252,14 +239,13 @@ data:extend({
         type = 'recipe',
         category = 'chemistry',
         main_product = 'fu_deuterium',
-        enabled = 'false',
+        enabled = false,
         ingredients = {
             {type="fluid", name="heavy-water", amount=10},
         },
         results = {
             {type="fluid", name="fu_deuterium", amount=4},
         },
-        result_count = 1,
         energy_required = 10,
         always_show_made_in = true,
     },
@@ -268,21 +254,20 @@ data:extend({
         type = 'recipe',
         category = 'chemistry',
         main_product = 'fu_tritium',
-        enabled = 'false',
+        enabled = false,
         ingredients = {
             {type="item", name="tritium", amount=1},
         },
         results = {
             {type="fluid", name="fu_tritium", amount=10},
         },
-        result_count = 1,
         energy_required = 10,
         always_show_made_in = true,
     },
     {
         name = 'fu_ki_core_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'crafting',
         ingredients = {
             {type="item", name="steel-plate", amount=100},
@@ -295,20 +280,18 @@ data:extend({
             {type="item", name="fu_exchanger_item", amount=10},
             {type="item", name="fu_tech_sign_item", amount=100},
             {type="item", name="fu_boiler_item", amount=10},
-            --{type="item", name="fu_burner_item", amount=10},
         },
         results = {
             {type="item", name="fu_ki_core_item", amount=1},
         },
-        result_count = 1,
         energy_required = 60,
     },
     {
         name = 'el_water_pressure_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'el_special_fluid',
-        icon = '__248k__/ressources/fluids/el_pressurized_water.png',
+        icon = '__248k_2__/ressources/fluids/el_pressurized_water.png',
         icon_size = 64,
         main_product = 'el_pressurized_water',
         ingredients = {
@@ -324,7 +307,7 @@ data:extend({
     {
         name = 'el_ceramic_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'crafting-with-fluid',
         ingredients = {
             {type="fluid", name="steam", amount=10},
@@ -363,34 +346,11 @@ data.raw.recipe["fi_crack_acid_gas_recipe"].ingredients = {
 
 --techs
 table.insert(data.raw.technology["kr-lithium-processing"].effects, {type ="unlock-recipe", recipe ="fi_lithium_to_k2"})
---table.insert(data.raw.technology["kr-matter-processing"].effects, {type ="unlock-recipe", recipe ="fu_star_engine_cooler_7_recipe"})
 if (not mods["RealisticFusionPower"]) then
     table.insert(data.raw.technology["kr-fusion-energy"].effects, {type ="unlock-recipe", recipe ="fu_activator_4_recipe"})
     table.insert(data.raw.technology["kr-fusion-energy"].effects, {type ="unlock-recipe", recipe ="fu_activator_3_recipe"})
 end
 
---[[
-table.insert(data.raw.technology["gr_stage_tech"].unit.ingredients, {"fu_space_probe_science_item", 1})
-table.insert(data.raw.technology["gr_train_tech"].unit.ingredients, {"fu_space_probe_science_item", 1})
-table.insert(data.raw.technology["gr_train_plus_tech"].unit.ingredients, {"fu_space_probe_science_item", 1})
-table.insert(data.raw.technology["gr_star_engine_1_tech"].unit.ingredients, {"fu_space_probe_science_item", 1})
-table.insert(data.raw.technology["gr_star_engine_2_tech"].unit.ingredients, {"fu_space_probe_science_item", 1})
-table.insert(data.raw.technology["gr_crafter_tech"].unit.ingredients, {"fu_space_probe_science_item", 1})
-table.insert(data.raw.technology["gr_materials_tech"].unit.ingredients, {"fu_space_probe_science_item", 1})
-table.insert(data.raw.technology["gr_compact_fusion_tech"].unit.ingredients, {"fu_space_probe_science_item", 1})
-table.insert(data.raw.technology["gr_charger_tech"].unit.ingredients, {"fu_space_probe_science_item", 1})
-table.insert(data.raw.technology["gr_kovarex_tech"].unit.ingredients, {"fu_space_probe_science_item", 1})
-table.insert(data.raw.technology["gr_black_hole_tech"].unit.ingredients, {"fu_space_probe_science_item", 1})
-table.insert(data.raw.technology["fi_modules_4_tech"].unit.ingredients, {"fu_space_probe_science_item", 1})
-table.insert(data.raw.technology["fi_modules_5_tech"].unit.ingredients, {"fu_space_probe_science_item", 1})
-table.insert(data.raw.technology["fi_modules_6_tech"].unit.ingredients, {"fu_space_probe_science_item", 1})
-
-table.insert(data.raw.technology["fu_ki_plus_1_tech"].unit.ingredients, {"fi_ki_science", 1})
-table.insert(data.raw.technology["fu_ki_plus_1_tech"].unit.ingredients, {"fu_ki_science", 1})
-table.insert(data.raw.technology["fu_ki_plus_2_tech"].unit.ingredients, {"fi_ki_science", 1})
-table.insert(data.raw.technology["fu_ki_plus_2_tech"].unit.ingredients, {"fu_ki_science", 1})
---]]
-
 table.insert(data.raw["generator-equipment"]["fi_train_equipment_generator_item"].categories,"vehicle-equipment")
 
 if (config("krastorio_endgame")) then
@@ -408,4 +368,4 @@ table.insert(data.raw.lab['biusart-lab'].inputs, 'fu_space_probe_science_item')
 table.insert(data.raw.lab['biusart-lab'].inputs, 'fi_ki_science')
 table.insert(data.raw.lab['biusart-lab'].inputs, 'fu_ki_science')
 
-data.raw.tool["fu_space_probe_science_item"].icon = "__248k__/ressources/fusion/fu_space_probe/fu_space_probe_science_item_krastorio.png"
+data.raw.tool["fu_space_probe_science_item"].icon = "__248k_2__/ressources/fusion/fu_space_probe/fu_space_probe_science_item_krastorio.png"

248k_2/scripts/krastorio2/overhaul.lua

@@ -71,14 +71,6 @@ local function remove_tech_card(tech, card)
         return
     end
 
-    --in data.raw
-    --[[
-    ingredients = {
-        {'automation-science-pack',1},
-        {'logistic-science-pack',1},
-    }
-    ]]
-
     for i,v in ipairs(data.raw.technology[tech].unit.ingredients) do
         for j,w in ipairs(v) do
             if w == card then
@@ -248,48 +240,46 @@ end
 --[BUILDINGS]
 
 building_table = {
-    {"kr-electrolysis-plant",           "el_materials_ALK", 10},
+    {type="item", name="kr-electrolysis-plant",           "el_materials_ALK", amount=10},
-    {"kr-filtration-plant",             "el_materials_ALK", 10},
+    {type="item", name="kr-filtration-plant",             "el_materials_ALK", amount=10},
-    --{"kr-electrolysis-plant",           "el_materials_ALK", 10},
+    {type="item", name="kr-fluid-burner",                 "el_materials_ALK", amount=2},
-    --{"kr-electrolysis-plant",           "el_materials_ALK", 10},
+    {type="item", name="kr-atmospheric-condensor",        "el_materials_ALK", amount=6},
-    {"kr-fluid-burner",                 "el_materials_ALK", 2},
+    {type="item", name="el_solar_recipe",                   "solar-panel", amount=2},
-    {"kr-atmospheric-condensor",        "el_materials_ALK", 6},
+    {type="item", name="solar-panel",                     "el_materials_ALK", amount=6},
-    {"el_solar_recipe",                   "solar-panel", 2},
+    {type="item", name="kr-advanced-solar-panel",         "el_solar_item", amount=1},
-    {"solar-panel",                     "el_materials_ALK", 6},
+    {type="item", name="kr-advanced-solar-panel",         "fi_materials_GFK", amount=2},
-    {"kr-advanced-solar-panel",         "el_solar_item", 1},
+    {type="item", name="kr-fuel-refinery",                "el_materials_ALK", amount=4},
-    {"kr-advanced-solar-panel",         "fi_materials_GFK", 2},
+    {type="item", name="kr-gas-power-station",            "el_materials_ALK", amount=10},
-    {"kr-fuel-refinery",                "el_materials_ALK", 4},
-    {"kr-gas-power-station",            "el_materials_ALK", 10},
 
-    {"buisart-lab",                     "fi_materials_NFK", 10},
+    {type="item", name="buisart-lab",                     "fi_materials_NFK", amount=10},
-    {"kr-electric-mining-drill-mk2",    "fi_materials_GFK", 6},
+    {type="item", name="kr-electric-mining-drill-mk2",    "fi_materials_GFK", amount=6},
-    {"kr-research-server",              "fi_materials_NFK", 8},
+    {type="item", name="kr-research-server",              "fi_materials_NFK", amount=8},
-    {"kr-research-server",              "fi_materials_GFK", 8},
+    {type="item", name="kr-research-server",              "fi_materials_GFK", amount=8},
-    {"kr-air-purifier",                 "fi_materials_NFK", 4},
+    {type="item", name="kr-air-purifier",                 "fi_materials_NFK", amount=4},
-    {"kr-bio-lab",                      "fi_materials_NFK", 20},
+    {type="item", name="kr-bio-lab",                      "fi_materials_NFK", amount=20},
-    {"kr-atmospheric-condensor",        "fi_materials_GFK", 4},
+    {type="item", name="kr-atmospheric-condensor",        "fi_materials_GFK", amount=4},
-    {"kr-fusion-reactor",               "fu_tech_sign_item",200},
+    {type="item", name="kr-fusion-reactor",               "fu_tech_sign_item", amount=200},
-    {"fu_tokamak_reactor_recipe",         "kr-fusion-reactor",1},
+    {type="item", name="fu_tokamak_reactor_recipe",         "kr-fusion-reactor", amount=1},
-    {"kr-advanced-steam-turbine",       "fu_materials_KFK", 10},
+    {type="item", name="kr-advanced-steam-turbine",       "fu_materials_KFK", amount=10},
     --logistics
-    {"kr-fast-loader",                  "el_materials_ALK", 4},
+    {type="item", name="kr-fast-loader",                  "el_materials_ALK", amount=4},
-    {"kr-express-loader",               "fi_materials_GFK", 4},
+    {type="item", name="kr-express-loader",               "fi_materials_GFK", amount=4},
-    {"kr-advanced-transport-belt",      "fu_materials_KFK", 1},
+    {type="item", name="kr-advanced-transport-belt",      "fu_materials_KFK", amount=1},
-    {"kr-advanced-splitter",            "fu_materials_KFK", 3},
+    {type="item", name="kr-advanced-splitter",            "fu_materials_KFK", amount=3},
-    {"kr-advanced-loader",              "fu_materials_KFK", 4},
+    {type="item", name="kr-advanced-loader",              "fu_materials_KFK", amount=4},
-    {"kr-advanced-underground-belt",    "fu_materials_KFK", 8},
+    {type="item", name="kr-advanced-underground-belt",    "fu_materials_KFK", amount=8},
 
-    {"kr-advanced-assembling-machine",  "fu_materials_KFK", 6},
+    {type="item", name="kr-advanced-assembling-machine",  "fu_materials_KFK", amount=6},
-    {"kr-advanced-furnace",             "fu_materials_KFK", 6},
+    {type="item", name="kr-advanced-furnace",             "fu_materials_KFK", amount=6},
-    {"kr-advanced-chemical-plant",      "fu_materials_KFK", 6},
+    {type="item", name="kr-advanced-chemical-plant",      "fu_materials_KFK", amount=6},
-    {"kr-matter-plant",                 "fu_materials_KFK", 12},
+    {type="item", name="kr-matter-plant",                 "fu_materials_KFK", amount=12},
-    {"kr-matter-assembler",             "fu_materials_KFK", 8},
+    {type="item", name="kr-matter-assembler",             "fu_materials_KFK", amount=8},
-    {"kr-stabilizer-charging-station",  "fu_materials_KFK", 6},
+    {type="item", name="kr-stabilizer-charging-station",  "fu_materials_KFK", amount=6},
-    {"kr-large-roboport",               "fi_robo_port_item", 1},
+    {type="item", name="kr-large-roboport",               "fi_robo_port_item", amount=1},
-    {"kr-antimatter-reactor",           "fu_tokamak_reactor_item", 1},
+    {type="item", name="kr-antimatter-reactor",           "fu_tokamak_reactor_item", amount=1},
-    {"kr-intergalactic-transceiver",    "fu_tokamak_reactor_item", 1},
+    {type="item", name="kr-intergalactic-transceiver",    "fu_tokamak_reactor_item", amount=1},
-    {"kr-intergalactic-transceiver",    "gr_materials_magnet", 100},
+    {type="item", name="kr-intergalactic-transceiver",    "gr_materials_magnet", amount=100},
-    {"kr-intergalactic-transceiver",    "gr_materials_fusion_cell_item", 10},
+    {type="item", name="kr-intergalactic-transceiver",    "gr_materials_fusion_cell_item", amount=10},
 
 
 }
@@ -297,33 +287,33 @@ building_table = {
 --[ITEMS]
 
 item_table = {
-    {"productivity-module-2",   "fi_modules_core_item", 1},
+    {type="item", name="productivity-module-2",   "fi_modules_core_item", amount=1},
-    {"productivity-module-3",   "fi_modules_core_item", 3},
+    {type="item", name="productivity-module-3",   "fi_modules_core_item", amount=3},
-    {"speed-module-2",          "fi_modules_core_item", 1},
+    {type="item", name="speed-module-2",          "fi_modules_core_item", amount=1},
-    {"speed-module-3",          "fi_modules_core_item", 3},
+    {type="item", name="speed-module-3",          "fi_modules_core_item", amount=3},
-    {"effectivity-module-2",    "fi_modules_core_item", 1},
+    {type="item", name="effectivity-module-2",    "fi_modules_core_item", amount=1},
-    {"effectivity-module-3",    "fi_modules_core_item", 3},
+    {type="item", name="effectivity-module-3",    "fi_modules_core_item", amount=3},
-    {"ai-core",                 "fu_materials_energy_crystal", 1},
+    {type="item", name="ai-core",                 "fu_materials_energy_crystal", amount=1},
-    {"fusion-reactor-equipment","fu_materials_energy_crystal", 25},
+    {type="item", name="fusion-reactor-equipment","fu_materials_energy_crystal", amount=25},
-    {"imersium-plate",          "fi_crushed_crystal_item", 4},
+    {type="item", name="imersium-plate",          "fi_crushed_crystal_item", amount=4},
-    {"lithium-sulfur-battery",  "el_lithium_battery", 1},
+    {type="item", name="lithium-sulfur-battery",  "el_lithium_battery", amount=1},
-    {"empty-dt-fuel",           "fu_materials_KFK", 2},
+    {type="item", name="empty-dt-fuel",           "fu_materials_KFK", amount=2},
-    {"fu_empty_container_recipe","empty-dt-fuel", 1},
+    {type="item", name="fu_empty_container_recipe","empty-dt-fuel", amount=1},
-    {"energy-control-unit",     "fu_materials_energy_crystal", 1},
+    {type="item", name="energy-control-unit",     "fu_materials_energy_crystal", amount=1},
-    {"matter-stabilizer",       "fu_materials_empty_container", 1},
+    {type="item", name="matter-stabilizer",       "fu_materials_empty_container", amount=1},
 
     --military
-    {"energy-shield-equipment", "el_energy_crystal_item", 5},
+    {type="item", name="energy-shield-equipment", "el_energy_crystal_item", amount=5},
-    {"energy-shield-mk2-equipment","fi_energy_crystal_item", 5},
+    {type="item", name="energy-shield-mk2-equipment","fi_energy_crystal_item", amount=5},
-    {"energy-shield-mk3-equipment","fu_materials_energy_crystal", 5},
+    {type="item", name="energy-shield-mk3-equipment","fu_materials_energy_crystal", amount=5},
-    {"battery-equipment",       "el_lithium_battery", 1},
+    {type="item", name="battery-equipment",       "el_lithium_battery", amount=1},
 
     --science
-    {"chemical-science-pack",        "el_energy_crystal_item",3},
+    {type="item", name="chemical-science-pack",        "el_energy_crystal_item", amount=3},
-    {"production-science-pack",      "fi_materials_titan",  1},
+    {type="item", name="production-science-pack",      "fi_materials_titan", amount=1},
-    {"utility-science-pack",         "fi_materials_neodym", 1},
+    {type="item", name="utility-science-pack",         "fi_materials_neodym", amount=1},
-    {"matter-tech-card",             "fu_tech_sign_item", 5},
+    {type="item", name="matter-tech-card",             "fu_tech_sign_item", amount=5},
-    {"singularity-tech-card",        "gr_materials_magnet", 1},
+    {type="item", name="singularity-tech-card",        "gr_materials_magnet", amount=1},
 }
 
 --[TECH]
@@ -397,8 +387,6 @@ tech_table = {
 --[ADD TECH CARDS]
 
 add_card_table = {
-    --{"el_purifier_tech",            "space-science-pack"},
-    
 }
 
 --[REMOVE TECH CARDS]
@@ -441,7 +429,7 @@ data:extend({
     {
         name = 'fi_arc_glass_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'el_arc_furnace_category',
         ingredients = {
             {type="item", name="glass", amount=3},
@@ -460,14 +448,13 @@ data:extend({
         type = 'recipe',
         category = 'chemistry',
         main_product = 'fu_tritium',
-        enabled = 'false',
+        enabled = false,
         ingredients = {
             {type="item", name="tritium", amount=1},
         },
         results = {
             {type="fluid", name="fu_tritium", amount=3},
         },
-        result_count = 1,
         energy_required = 1,
         always_show_made_in = true,
     },
@@ -476,7 +463,7 @@ data:extend({
         type = 'recipe',
         category = 'chemistry',
         main_product = 'fu_deuterium',
-        enabled = 'false',
+        enabled = false,
         ingredients = {
             {type="fluid", name="heavy-water", amount=10},
             {type="item", name="improved-pollution-filter", amount=1},
@@ -484,7 +471,6 @@ data:extend({
         results = {
             {type="fluid", name="fu_deuterium", amount=3},
         },
-        result_count = 1,
         energy_required = 10,
         always_show_made_in = true,
     },
@@ -492,7 +478,7 @@ data:extend({
         name = 'fu_star_engine_cooler_7_recipe',
         type = 'recipe',
         category = 'fu_star_engine_cooler_crafting_category',
-        enabled = 'false',
+        enabled = false,
         subgroup = 'fu_star_engine_subgroup_c',
         ingredients = {
             {type="fluid", name="fu_iron_heated", amount=500},
@@ -500,7 +486,6 @@ data:extend({
         results = {
             {type="fluid", name="matter", amount=100},
         },
-        result_count = 1,
         energy_required = 1,
     },
 })
@@ -530,14 +515,14 @@ add_cards_to_tree(del_doubles(walk_techs("kr-singularity-tech-card", break_con))
 if mods["RealisticFusionPower"] then
     
     data.raw.recipe["fu_tokamak_reactor_recipe"].ingredients = {
-        {'fu_materials_magnet',200},
+        {type="item", name="fu_materials_magnet", amount=200},
-        {'fu_materials_TIM',400},
+        {type="item", name="fu_materials_TIM", amount=400},
-        {'fu_materials_KFK',400},
+        {type="item", name="fu_materials_KFK", amount=400},
-        {'concrete',500},
+        {type="item", name="concrete", amount=500},
-        {'fu_materials_energy_crystal',200},
+        {type="item", name="fu_materials_energy_crystal", amount=200},
-        {'pump',80},
+        {type="item", name="pump", amount=80},
-        {'processing-unit',500},
+        {type="item", name="processing-unit", amount=500},
-        {'fu_tech_sign_item',2000},
+        {type="item", name="fu_tech_sign_item", amount=2000},
     }
 
     data.raw.recipe["fu_empty_container_recipe"].ingredients = {

248k_2/scripts/legacy_icons.lua

@@ -1,5 +1,5 @@
 if settings.startup['legacy_icons'].value then
-    data.raw.item["fi_materials_gold"].icon = "__248k__/ressources/legacy_icons/fi_materials_gold.png"
+    data.raw.item["fi_materials_gold"].icon = "__248k_2__/ressources/legacy_icons/fi_materials_gold.png"
-    data.raw.item["fi_materials_titan"].icon = "__248k__/ressources/legacy_icons/fi_materials_titan.png"
+    data.raw.item["fi_materials_titan"].icon = "__248k_2__/ressources/legacy_icons/fi_materials_titan.png"
-    data.raw.item["fi_materials_neodym"].icon = "__248k__/ressources/legacy_icons/fi_materials_neodym.png"
+    data.raw.item["fi_materials_neodym"].icon = "__248k_2__/ressources/legacy_icons/fi_materials_neodym.png"
 end

248k_2/scripts/menu_simulation.lua

@@ -26,7 +26,7 @@ main_menu_simulations.spider_ponds = nil
 data.raw["utility-constants"]["default"].main_menu_simulations.menu_248k_1 =
 {
   checkboard = false,
-  save = "__248k__/ressources/menu_simulation/248k_menu_1.zip",
+  save = "__248k_2__/ressources/menu_simulation/248k_menu_1.zip",
   length = 60*25,
   init = [[
     local logo = game.surfaces.nauvis.find_entities_filtered{name = "factorio-logo-22tiles", limit = 1}[1]  
@@ -40,7 +40,7 @@ data.raw["utility-constants"]["default"].main_menu_simulations.menu_248k_1 =
 data.raw["utility-constants"]["default"].main_menu_simulations.menu_248k_2 =
 {
   checkboard = false,
-  save = "__248k__/ressources/menu_simulation/248k_menu_2.zip",
+  save = "__248k_2__/ressources/menu_simulation/248k_menu_2.zip",
   length = 60*25,
   init = [[
     local logo = game.surfaces.nauvis.find_entities_filtered{name = "factorio-logo-11tiles", limit = 1}[1]  
@@ -53,7 +53,7 @@ data.raw["utility-constants"]["default"].main_menu_simulations.menu_248k_2 =
 data.raw["utility-constants"]["default"].main_menu_simulations.menu_248k_3 =
 {
   checkboard = false,
-  save = "__248k__/ressources/menu_simulation/248k_menu_3.zip",
+  save = "__248k_2__/ressources/menu_simulation/248k_menu_3.zip",
   length = 60*25,
   init = [[
     local logo = game.surfaces.nauvis.find_entities_filtered{name = "factorio-logo-16tiles", limit = 1}[1]  
@@ -67,7 +67,7 @@ data.raw["utility-constants"]["default"].main_menu_simulations.menu_248k_3 =
 data.raw["utility-constants"]["default"].main_menu_simulations.menu_248k_6 =
 {
   checkboard = false,
-  save = "__248k__/ressources/menu_simulation/248k_menu_6.zip",
+  save = "__248k_2__/ressources/menu_simulation/248k_menu_6.zip",
   length = 60*25,
   init = [[
     local logo = game.surfaces.nauvis.find_entities_filtered{name = "crash-site-spaceship", limit = 1}[1]  

248k_2/scripts/overhaul.lua

@@ -62,58 +62,58 @@ end
 --[BUILDINGS]
 
 building_table = {
-    {"assembling-machine-2",    "el_materials_ALK", 3},
+    {type="item", name="assembling-machine-2",    "el_materials_ALK", amount=3},
     --
-    --{"fast-inserter",           "el_aluminum_item", 2},
+    --{type="item", name="fast-inserter",           "el_aluminum_item", amount=2},
-    --{"long-handed-inserter",    "el_aluminum_item", 2},
+    --{type="item", name="long-handed-inserter",    "el_aluminum_item", amount=2},
     --
-    {"engine-unit",             "el_materials_ALK", 3},
+    {type="item", name="engine-unit",             "el_materials_ALK", amount=3},
-    {"fast-transport-belt",     "el_materials_ALK", 1},
+    {type="item", name="fast-transport-belt",     "el_materials_ALK", amount=1},
-    {"fast-splitter",           "el_materials_ALK", 3},
+    {type="item", name="fast-splitter",           "el_materials_ALK", amount=3},
-    {"fast-underground-belt",   "el_materials_ALK", 8},
+    {type="item", name="fast-underground-belt",   "el_materials_ALK", amount=8},
-    {"chemical-plant",          "el_materials_ALK", 6},
+    {type="item", name="chemical-plant",          "el_materials_ALK", amount=6},
-    {"oil-refinery",            "el_materials_ALK", 6},
+    {type="item", name="oil-refinery",            "el_materials_ALK", amount=6},
-    {"medium-electric-pole",    "el_materials_ALK", 2},
+    {type="item", name="medium-electric-pole",    "el_materials_ALK", amount=2},
-    {"big-electric-pole",       "el_materials_ALK", 4},
+    {type="item", name="big-electric-pole",       "el_materials_ALK", amount=4},
 
-    {"stack-inserter",          "el_energy_crystal_item", 2},
+    {type="item", name="stack-inserter",          "el_energy_crystal_item", amount=2},
 
-    {"express-splitter",        "fi_materials_GFK", 3},
+    {type="item", name="express-splitter",        "fi_materials_GFK", amount=3},
-    {"express-transport-belt",  "fi_materials_GFK", 1},
+    {type="item", name="express-transport-belt",  "fi_materials_GFK", amount=1},
-    {"express-underground-belt","fi_materials_GFK", 8},
+    {type="item", name="express-underground-belt","fi_materials_GFK", amount=8},
-    {"electric-furnace",        "fi_materials_GFK", 4},
+    {type="item", name="electric-furnace",        "fi_materials_GFK", amount=4},
-    {"centrifuge",              "fi_materials_GFK", 20},
+    {type="item", name="centrifuge",              "fi_materials_GFK", amount=20},
-    {"steam-turbine",           "fi_materials_GFK", 15},
+    {type="item", name="steam-turbine",           "fi_materials_GFK", amount=15},
-    {"heat-exchanger",          "fi_materials_GFK", 10},
+    {type="item", name="heat-exchanger",          "fi_materials_GFK", amount=10},
-    {"heat-pipe",               "fi_materials_titan",1},
+    {type="item", name="heat-pipe",               "fi_materials_titan", amount=1},
 
-    --{"rocket-silo",             "fu_materials_KFK", 40},
+    --{type="item", name="rocket-silo",             "fu_materials_KFK", amount=40},
 
-    {"beacon",                  "fi_materials_titan",   8},
+    {type="item", name="beacon",                  "fi_materials_titan", amount=8},
-    {"substation",              "fi_materials_titan",   4},
+    {type="item", name="substation",              "fi_materials_titan", amount=4},
-    {"assembling-machine-3",    "fi_materials_titan",   4},
+    {type="item", name="assembling-machine-3",    "fi_materials_titan", amount=4},
 }
 
 --[ITEMS]
 
 item_table = {
-    {"advanced-circuit",        "el_materials_ceramic", 2},
+    {type="item", name="advanced-circuit",        "el_materials_ceramic", amount=2},
-    {"processing-unit",         "fi_materials_gold",    3},
+    {type="item", name="processing-unit",         "fi_materials_gold", amount=3},
-    {"electric-engine-unit",    "fi_materials_gold",    3},
+    {type="item", name="electric-engine-unit",    "fi_materials_gold", amount=3},
-    {"flying-robot-frame",      "fi_materials_neodym",  6},
+    {type="item", name="flying-robot-frame",      "fi_materials_neodym", amount=6},
-    {"productivity-module-2",   "fi_modules_core_item", 1},
+    {type="item", name="productivity-module-2",   "fi_modules_core_item", amount=1},
-    {"productivity-module-3",   "fi_modules_core_item", 3},
+    {type="item", name="productivity-module-3",   "fi_modules_core_item", amount=3},
-    {"speed-module-2",          "fi_modules_core_item", 1},
+    {type="item", name="speed-module-2",          "fi_modules_core_item", amount=1},
-    {"speed-module-3",          "fi_modules_core_item", 3},
+    {type="item", name="speed-module-3",          "fi_modules_core_item", amount=3},
-    {"effectivity-module-2",    "fi_modules_core_item", 1},
+    {type="item", name="effectivity-module-2",    "fi_modules_core_item", amount=1},
-    {"effectivity-module-3",    "fi_modules_core_item", 3},
+    {type="item", name="effectivity-module-3",    "fi_modules_core_item", amount=3},
-    --{"satellite",               "fu_materials_KFK",     10},
+    --{type="item", name="satellite",               "fu_materials_KFK", amount=10},
 
-    --{"automation-science-pack",    "fi_modules_core_item",  3},
+    --{type="item", name="automation-science-pack",    "fi_modules_core_item", amount=3},
-    --{"logistic-science-pack",      "fi_modules_core_item",  3},
+    --{type="item", name="logistic-science-pack",      "fi_modules_core_item", amount=3},
-    {"chemical-science-pack",        "el_energy_crystal_item",2},
+    {type="item", name="chemical-science-pack",        "el_energy_crystal_item", amount=2},
-    {"production-science-pack",      "fi_materials_titan",  3},
+    {type="item", name="production-science-pack",      "fi_materials_titan", amount=3},
-    {"utility-science-pack",         "fi_materials_neodym", 3},
+    {type="item", name="utility-science-pack",         "fi_materials_neodym", amount=3},
     
 }
 
@@ -183,7 +183,7 @@ add_to_techs(change_table_index(tech_table, tech_structure))
 -- if no space exploration mod
 if not mods["space-exploration"] then
     -- rocket silo and satellite
-    add_to_recipes(change_table_index({{"rocket-silo", "fu_materials_KFK", 40}, {"satellite", "fu_materials_KFK", 10}}, recipe_structure))
+    add_to_recipes(change_table_index({{type="item", name="rocket-silo", "fu_materials_KFK", 40}, {"satellite", "fu_materials_KFK", amount=10}}, recipe_structure))
     add_to_techs(change_table_index({{"rocket-silo", "fu_KFK_tech"}}, tech_structure))
 end
 

248k_2/scripts/realisticreactors/overhaul.lua

@@ -61,14 +61,6 @@ local function remove_tech_card(tech, card)
         return
     end
 
-    --in data.raw
-    --[[
-    ingredients = {
-        {'automation-science-pack',1},
-        {'logistic-science-pack',1},
-    }
-    ]]
-
     for i,v in ipairs(data.raw.technology[tech].unit.ingredients) do
         for j,w in ipairs(v) do
             if w == card then
@@ -140,16 +132,14 @@ end
 --[BUILDINGS]
 
 building_table = {
-    --{"kr-electrolysis-plant",           "el_materials_ALK", 10},
-
 }
 
 --[ITEMS]
 
 item_table = {
-    {"fi_train_equipment_generator_recipe",   "fi_tech_fuel", 10},
+    {type="item", name="fi_train_equipment_generator_recipe",   "fi_tech_fuel", amount=10},
-    {"fi_equipment_player_reactor_recipe",    "fi_tech_fuel", 10},
+    {type="item", name="fi_equipment_player_reactor_recipe",    "fi_tech_fuel", amount=10},
-    {"fu_tech_sign_recipe",                   "fi_tech_fuel", 1},
+    {type="item", name="fu_tech_sign_recipe",                   "fi_tech_fuel", amount=1},
     
 }
 
@@ -167,21 +157,16 @@ tech_table = {
 --[ADD TECH CARDS]
 
 add_card_table = {
-    --{"el_purifier_tech",            "space-science-pack"},
-    
 }
 
 --[REMOVE TECH CARDS]
 
 remove_card_table = {
-    --{"el_purifier_tech",            "logistic-science-pack"},
-    
 }
 
 --[REMOVE PREREQUISITES]
 
 pre_tech_table = {
-    --{"nuclear-power",            "effectivity-module-2"},
     {"nuclear-power",            "uranium-processing"},
     {"fi_energy_tech",           "nuclear-power"},
     {"fi_solid_reactor_tech",    "fi_refining_tech"},
@@ -234,18 +219,18 @@ table.insert(data.raw.technology["nuclear-power"].effects, {
 })
 
 data.raw.recipe["realistic-reactor"].ingredients = {
-    {"fi_solid_reactor_item", 1}, {"fi_tech_fuel", 20}, {"heat-pipe", 20}
+    {type="item", name="fi_solid_reactor_item", 1}, {"fi_tech_fuel", 20}, {"heat-pipe", amount=20}
 }
 
 data.raw.recipe["breeder-reactor"].ingredients = {
-    {"fi_solid_reactor_item", 1}, {"fi_tech_fuel", 40}, {"heat-pipe", 20}, {"productivity-module-3", 3}
+    {type="item", name="fi_solid_reactor_item", 1}, {"fi_tech_fuel", 40}, {"heat-pipe", 20}, {"productivity-module-3", amount=3}
 }
 
 data:extend({
     {
         name = 'fi_test_fuel',
         type = 'item',
-        icon = '__248k__/ressources/fission/fi_fuel/fi_fuel_test_item.png',
+        icon = '__248k_2__/ressources/fission/fi_fuel/fi_fuel_test_item.png',
         icon_size = 64,
         stack_size = 20,
         subgroup = 'fi_item_subgroup_b',
@@ -258,7 +243,7 @@ data:extend({
     {
         name = 'fi_test_used_fuel',
         type = 'item',
-        icon = '__248k__/ressources/fission/fi_fuel/fi_fuel_test_used_item.png',
+        icon = '__248k_2__/ressources/fission/fi_fuel/fi_fuel_test_used_item.png',
         icon_size = 64,
         stack_size = 100,
         subgroup = 'fi_item_subgroup_b',
@@ -267,7 +252,7 @@ data:extend({
     {
         name = 'fi_tech_fuel',
         type = 'item',
-        icon = '__248k__/ressources/fission/fi_fuel/fi_fuel_tech_item.png',
+        icon = '__248k_2__/ressources/fission/fi_fuel/fi_fuel_tech_item.png',
         icon_size = 64,
         stack_size = 100,
         subgroup = 'fi_item_subgroup_b',
@@ -276,42 +261,39 @@ data:extend({
     {
         name = 'fi_test_fuel_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'crafting',
         ingredients = {
-            {'uranium-238',2},
+            {type="item", name="uranium-238", amount=2},
-            {'el_materials_ALK',5},
+            {type="item", name="el_materials_ALK", amount=5},
         },
-        result = 'fi_test_fuel',
+        results = {{type="item", name='fi_test_fuel', amount=1}},
-        result_count = 1,
         energy_required = 2,
         order = 'b-b',
     },
     {
         name = 'fi_tech_fuel_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'crafting',
         ingredients = {
-            {'fi_test_used_fuel', 1},
+            {type="item", name="fi_test_used_fuel", amount=1},
-            {'chemical-science-pack', 2},
+            {type="item", name="chemical-science-pack", amount=2},
-            {'uranium-238', 2},
+            {type="item", name="uranium-238", amount=2},
         },
-        result = 'fi_tech_fuel',
+        results = {{type="item", name='fi_tech_fuel', amount=1}},
-        result_count = 1,
         energy_required = 1,
         order = 'b-b',
     },
     {
         name = 'fi_use_tech_fuel_recipe',
         type = 'recipe',
-        enabled = 'false',
+        enabled = false,
         category = 'fi_test_fuel_crafting_category',
         ingredients = {
-            {'fi_test_fuel', 1}
+            {type="item", name="fi_test_fuel", amount=1}
         },
-        result = 'fi_test_used_fuel',
+        results = {{type="item", name='fi_test_used_fuel', amount=1}},
-        result_count = 1,
         energy_required = 5,
         order = 'b-b',
         hidden = true,
@@ -319,7 +301,7 @@ data:extend({
     {
         name = 'fi_solid_reactor_tech',
         type = 'technology',
-        icon = '__248k__/ressources/techs/fi_solid_reactor_tech.png',
+        icon = '__248k_2__/ressources/techs/fi_solid_reactor_tech.png',
         icon_size = 128,
         prerequisites = {'fi_energy_tech','fi_refining_tech'},
         effects = {
@@ -339,8 +321,8 @@ data:extend({
         unit = {
             count = '500',
             ingredients = {
-                {'chemical-science-pack',1},
+                {type="item", name="chemical-science-pack", amount=1},
-                {'automation-science-pack',1},
+                {type="item", name="automation-science-pack", amount=1},
                 {'logistic-science-pack',1,},
             },
             time = 30,
@@ -349,7 +331,7 @@ data:extend({
     {
         name = 'fi_solid_reactor_entity',
         type = 'assembling-machine',
-        icon = '__248k__/ressources/fission/fi_solid_reactor/fi_solid_reactor_entity_icon.png',
+        icon = '__248k_2__/ressources/fission/fi_solid_reactor/fi_solid_reactor_entity_icon.png',
         icon_size = 64,
         flags = {"player-creation","placeable-neutral"},
         max_health = 300,
@@ -359,7 +341,7 @@ data:extend({
         map_color = {r=0, g=0, b=1, a=1},
         minable = {
             mining_time = 1,
-            result = 'fi_solid_reactor_item',
+            results = {{type="item", name='fi_solid_reactor_item', amount=1}},
         },
         fixed_recipe = 'fi_use_tech_fuel_recipe',
         crafting_categories = {"fi_test_fuel_crafting_category"},
@@ -369,7 +351,7 @@ data:extend({
         },
         energy_usage = "1W",
         animation = {
-            filename = '__248k__/ressources/fission/fi_solid_reactor/fi_solid_reactor_entity_animation.png',
+            filename = '__248k_2__/ressources/fission/fi_solid_reactor/fi_solid_reactor_entity_animation.png',
             width = 960,
             height = 960,
             shift = {0, 0},
@@ -378,7 +360,7 @@ data:extend({
           working_visualisations = {
             {
                 animation = {
-                    filename = '__248k__/ressources/fission/fi_solid_reactor/fi_solid_reactor_entity_animation_2.png',
+                    filename = '__248k_2__/ressources/fission/fi_solid_reactor/fi_solid_reactor_entity_animation_2.png',
                     width = 960,
                     height = 960,
                     shift = {0, 0},

248k_2/scripts/science_overhaul.lua

@@ -3,7 +3,7 @@
 --===================================================================================================================
 
 local function sprite(name)
-    return '__248k__/ressources/science/'..name..'.png'
+    return '__248k_2__/ressources/science/'..name..'.png'
 end
 
 local function retexture_science(table_in)

248k_2/scripts/umr/data.lua

@@ -2,7 +2,7 @@ data:extend({
     {
         name = 'fu_fusor_tech',
         type = 'technology',
-        icon = '__248k__/ressources/techs/fu_fusor_tech.png',
+        icon = '__248k_2__/ressources/techs/fu_fusor_tech.png',
         icon_size = 128,
         prerequisites = {
             'fu_magnet_tech','fu_basic_elements_tech'
@@ -60,13 +60,12 @@ data:extend({
         name = 'fu_fusion_card_3_recipe',
         type = 'recipe',
         category = 'fu_fusor_crafting_category',
-        enabled = 'false',
+        enabled = false,
         ingredients = {
             {type="fluid", name="fu_lithium_6", amount=100},
             {type="fluid", name="fu_helium_3", amount=100},
         },
-        result = 'fu_materials_fusion_card',
+        results = {{type="item", name='fu_materials_fusion_card', amount=100}},
-        result_count = 100,
         energy_required = 100,
         always_show_made_in = true,
     },
@@ -74,13 +73,12 @@ data:extend({
         name = 'fu_fusion_card_6_recipe',
         type = 'recipe',
         category = 'fu_fusor_crafting_category',
-        enabled = 'false',
+        enabled = false,
         ingredients = {
             {type="fluid", name="fu_deuterium", amount=100},
             {type="fluid", name="fu_helium_3", amount=100},
         },
-        result = 'fu_materials_fusion_card',
+        results = {{type="item", name='fu_materials_fusion_card', amount=20}},
-        result_count = 20,
         energy_required = 100,
         always_show_made_in = true,
     },