Merge remote-tracking branch 'upstream/main'

Co-authored-by: Simon Brodtmann <github@accounts.brodtmann.info>
Co-authored-by: MAGGen <maggen@noreply.example.org>
Reviewed-on: Slondo/Bio_Industries_2#1
Co-authored-by: odnols <gusbra21@outlook.com>
Co-committed-by: odnols <gusbra21@outlook.com>

Bio_Industries_2/locale/en/entity-name.cfg

@@ -14,7 +14,6 @@ bi-bio-reactor=Bio-reactor
 bi-cokery=Cokery
 bi-stone-crusher=Stone crusher
 
-
 ## Power
 bi-bio-accumulator=Huge accumulator
 bi-bio-boiler=Bio-boiler
@@ -23,12 +22,10 @@ bi-large-substation=Huge substation
 bi-solar-boiler=Solar power plant & boiler
 bi-solar-mat=Musk floor
 
-
 ## Weaponry
 bi-bio-cannon=Prototype artillery
 bi-dart-turret=Dart turret
 
-
 ## Rail stuff
 bi-power-to-rail-pole=Powered rails connector
 bi-rail-power=Powered rails
@@ -41,6 +38,29 @@ bi-half-diagonal-rail-wood=Wooden rails
 rail-remnants-wood-bridge=Remnants of a wooden rail bridge
 rail-remnants-wood=Remnants of wooden rails
 
+# Entity remnants names
+bi-bio-cannon-remnants=Remnants of prototype artillery
+bi-arboretum-area-remnant=Remnants of terraformer
+bi-bio-accumulator-remnant=Remnants of huge accumulator
+bi-bio-farm-remnant=Remnants of bio farm
+bi-bio-garden-huge-remnant=Remnants of huge bio garden
+bi-bio-garden-large-remnant=Resto de large bio garden
+bi-bio-garden-remnant=Remnants of bio garden
+bi-bio-greenhouse-remnant=Remnants of bio nursery
+bi-bio-reactor-remnant=Remnants of bio-reactor
+bi-bio-solar-farm-remnant=Remnants of solar farm
+bi-cokery-remnant=Remnants of cokery
+bi-dart-turret-remnant=Remnants of dart turret
+bi-large-substation-remnant=Remnants of huge substation
+bi-solar-boiler-remnant=Remnants of solar power plant & boiler
+bi-stone-crusher-remnant=Remnants of stone crusher
+bi-wood-pipe-remnant=Remnants of wood pipe
+bi-wooden-chest-giga-remnant=Remnants of huge wooden chest
+bi-wooden-chest-huge-remnant=Remnants of huge large chest
+bi-wooden-chest-large-remnant=Remnants of medium wooden chest
+bi-wooden-fence-remnant=Remnants of wooden fence
+bi-wooden-pole-big-remnant=Remnants of big wooden pole
+bi-wooden-pole-huge-remnant=Remnants of huge wooden pole
 
 ## Miscallenous wooden products
 bi-wood-pipe-to-ground=Wood pipe to ground

Bio_Industries_2/locale/en/recipe-description.cfg

@@ -116,7 +116,7 @@ bi-crushed-stone_IR=Excess __ITEM__concrete__ in all variations can be recycled
 
 
 #~ bi-power-to-rail-pole=Connect your power rail to the power grid
-#~ bi-production-science-pack=Use more, but cheaper wooden rails to make production science packs!
+bi-production-science-pack=Use more, but cheaper wooden rails to make production science packs!
 #~ bi-rail-power=Rail that also conducts electricity (connect to power grid using "power to rail" connector)
 #~ bi-rail-wood-bridge=Rail that can bridge water\nNote: You can't walk on this!
 #~ bi-rail-wood-to-concrete=Upgrade wooden rails to default rails

Bio_Industries_2/locale/en/recipe-name.cfg

@@ -12,7 +12,6 @@ bob-fertiliser=__ITEM__fertilizer__
 # Added for 0.18.32/1.1.2
 bi-fertilizer-fluid=Liquid __ITEM__fertilizer__
 
-
 bi-arboretum-r1=Plant trees
 bi-arboretum-r2=Change terrain with __ITEM__fertilizer__
 bi-arboretum-r3=Change terrain with __ITEM__bi-adv-fertilizer__
@@ -59,7 +58,6 @@ bi-logs-2=Improved __ITEM__wood__ production with __ITEM__bi-ash__
 bi-logs-3=Advanced __ITEM__wood__ production with __ITEM__fertilizer__
 bi-logs-4=Super __ITEM__wood__ production with __ITEM__bi-adv-fertilizer__
 
-
 ## Resources
 bi-cellulose-1=Basic __ITEM__bi-cellulose__ production
 bi-cellulose-2=Advanced __ITEM__bi-cellulose__ production
@@ -96,6 +94,8 @@ bi-sulfur=Bio-__ITEM__sulfur__
 bi-plastic-1=__ITEM__plastic-bar__ from __ITEM__wood__
 bi-plastic-2=__ITEM__plastic-bar__ from __ITEM__bi-cellulose__
 
+## Research
+bi-production-science-pack=Production science pack
 
 ## Disassemble
 bi-burner-inserter-disassemble=Disassemble __ENTITY__burner-inserter__
@@ -104,7 +104,6 @@ bi-long-handed-inserter-disassemble=Disassemble __ENTITY__long-handed-inserter__
 bi-steel-furnace-disassemble=Disassemble __ENTITY__steel-furnace__
 bi-stone-furnace-disassemble=Disassemble __ENTITY__stone-furnace__
 
-
 ## Compatibility with other mods
 ## angelsrefining
 bi-mineralized-sulfuric-waste=Mineralized water

Bio_Industries_2/locale/pt-BR/entity-name.cfg

@@ -14,7 +14,6 @@ bi-bio-reactor=Biorreator
 bi-cokery=Coqueria
 bi-stone-crusher=Triturador de pedras
 
-
 ## Power
 bi-bio-accumulator=Acumulador imenso
 bi-bio-boiler=Biocaldeira
@@ -23,12 +22,10 @@ bi-large-substation=Subestação imensa
 bi-solar-boiler=Usina solar com caldeira
 bi-solar-mat=Chão Musk
 
-
 ## Weaponry
 bi-bio-cannon=Protótipo de artilharia
 bi-dart-turret=Torre de dardos
 
-
 ## Rail stuff
 bi-power-to-rail-pole=Conector de trilho elétrico
 bi-rail-power=Trilho elétrico
@@ -41,6 +38,29 @@ bi-half-diagonal-rail-wood=Trilho de madeira
 rail-remnants-wood-bridge=Restos de ponte ferroviária de madeira
 rail-remnants-wood=Restos de triho de madeira
 
+# Entity remnants names
+bi-bio-cannon-remnants=Restos de protótipo de artilharia
+bi-arboretum-area-remnant=Restos de terraformador
+bi-bio-accumulator-remnant=Restos de acumulador imenso
+bi-bio-farm-remnant=Restos de fazenda biológica
+bi-bio-garden-huge-remnant=Restos de jardim biológico imenso
+bi-bio-garden-large-remnant=Resto de jardim biológico grande
+bi-bio-garden-remnant=Restos de jardim biológico
+bi-bio-greenhouse-remnant=Restos de viveiro biológico
+bi-bio-reactor-remnant=Restos de biorreator
+bi-bio-solar-farm-remnant=Restos de fazenda solar
+bi-cokery-remnant=Restos de coqueria
+bi-dart-turret-remnant=Restos de torre de dardos
+bi-large-substation-remnant=Restos de substação imensa
+bi-solar-boiler-remnant=Restos de usina solar com caldeira
+bi-stone-crusher-remnant=Restos de triturador de pedras
+bi-wood-pipe-remnant=Restos de cano de madeira
+bi-wooden-chest-giga-remnant=Restos de baú de madeira imenso
+bi-wooden-chest-huge-remnant=Restos de baú de madeira grande
+bi-wooden-chest-large-remnant=Restos de baú de madeira médio
+bi-wooden-fence-remnant=Restos de cerca de madeira
+bi-wooden-pole-big-remnant=Restos de poste de madeira grande
+bi-wooden-pole-huge-remnant=Restos de poste de madeira imenso
 
 ## Miscallenous wooden products
 bi-wood-pipe-to-ground=Cano de madeira subterrâneo

Bio_Industries_2/locale/pt-BR/recipe-description.cfg

@@ -116,7 +116,7 @@ bi-crushed-stone_IR=O excesso de __ITEM__concrete__ e todas as suas variantes po
 
 
 #~ bi-power-to-rail-pole=Conecte seu trilho elétrico à rede elétrica
-#~ bi-production-science-pack=Utiliza mais trilhos de madeira (mais baratos), para fazer pacotes científicos de produção!
+bi-production-science-pack=Utilize mais trilhos de madeira (mais baratos), para fazer pacotes científicos de produção!
 #~ bi-rail-power=Trilho que também conduz eletricidade (conecte-o à rede elétrica utilizando o conector "energia para trilho")
 #~ bi-rail-wood-bridge=Trilho que pode atravessar a água\nObservação: Você não pode andar sobre ele!
 #~ bi-rail-wood-to-concrete=Atualizar trilhos de madeira para trilhos normais

Bio_Industries_2/locale/pt-BR/recipe-name.cfg

@@ -12,7 +12,6 @@ bob-fertiliser=__ITEM__fertilizer__
 # Added for 0.18.32/1.1.2
 bi-fertilizer-fluid=__ITEM__fertilizer__ líquido
 
-
 bi-arboretum-r1=Cultivo de árvores
 bi-arboretum-r2=Terraformar utilizando __ITEM__fertilizer__
 bi-arboretum-r3=Terraformar utilizando __ITEM__bi-adv-fertilizer__
@@ -59,7 +58,6 @@ bi-logs-2=Produção melhorada de __ITEM__wood__ utilizando __ITEM__bi-ash__
 bi-logs-3=Produção avançada de __ITEM__wood__ utilizando __ITEM__fertilizer__
 bi-logs-4=Superprodução de __ITEM__wood__ utilizando __ITEM__bi-adv-fertilizer__
 
-
 ## Resources
 bi-cellulose-1=Produção básica de __ITEM__bi-cellulose__
 bi-cellulose-2=Produção avançada de __ITEM__bi-cellulose__
@@ -96,6 +94,8 @@ bi-sulfur=Bio-__ITEM__sulfur__
 bi-plastic-1=__ITEM__plastic-bar__ de __ITEM__wood__
 bi-plastic-2=__ITEM__plastic-bar__ de __ITEM__bi-cellulose__
 
+## Research
+bi-production-science-pack=Pacote científico de produção
 
 ## Disassemble
 bi-burner-inserter-disassemble=Desmantelamento de __ENTITY__burner-inserter__
@@ -104,7 +104,6 @@ bi-long-handed-inserter-disassemble=Desmantelamento de __ENTITY__long-handed-ins
 bi-steel-furnace-disassemble=Desmantelamento de __ENTITY__steel-furnace__
 bi-stone-furnace-disassemble=Desmantelamento de __ENTITY__stone-furnace__
 
-
 ## Compatibility with other mods
 ## angelsrefining
 bi-mineralized-sulfuric-waste=Água mineralizada

Bio_Industries_2/prototypes/Bio_Garden/entities.lua

@@ -1,16 +1,11 @@
 local BioInd = require('common')('Bio_Industries_2')
+local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 local ICONPATH_E = BioInd.modRoot .. "/graphics/icons/entity/"
 local ENTITYPATH_BIO = BioInd.modRoot .. "/graphics/entities/"
 local REMNANTSPATH = BioInd.modRoot .. "/graphics/entities/remnants/"
 
 require("util")
 
-local crafting_speed_quality_multiplier = mods["quality"] and {
-  uncommon = 0.83,
-  rare = 0.66,
-  epic = 0.50,
-  legendary = 0.16
-} or nil
 
 --- Bio Garden
 data:extend({
@@ -50,13 +45,13 @@ data:extend({
 						filename = ENTITYPATH_BIO .. "bio_garden/bio_garden_anim_trees.png",
 						width = 256, height = 320,
 						frame_count = 20, line_length = 5,
-            animation_speed = 0.15, scale = 0.5, shift = { 0, -0.75 }
+						animation_speed = 0.15, scale = 0.5, shift = {0, -0.75}
 					},
 					{
 						filename = ENTITYPATH_BIO .. "bio_garden/bio_garden_shadow.png",
 						width = 384, height = 320,
 						frame_count = 1, repeat_count = 20,    -- repeat to match
-            draw_as_shadow = true, scale = 0.5, shift = { 1, -0.75 }
+						draw_as_shadow = true, scale = 0.5, shift = {1, -0.75}
 					}
 				}
 			}
@@ -73,7 +68,6 @@ data:extend({
         source_inventory_size = 1,
         result_inventory_size = 1,
         crafting_speed = 1.0,
-    crafting_speed_quality_multiplier = crafting_speed_quality_multiplier,
         energy_source = {
             type = "electric",
             usage_priority = "secondary-input",
@@ -96,22 +90,23 @@ data:extend({
 	{
 	  type = "corpse",
 	  name = "bi-bio-garden-remnant",
-    localised_name = { "entity-name.bi-bio-garden-remnant" },
+	  localised_name = {"entity-name.bi-bio-garden-remnant"},
 	  icon = "__base__/graphics/icons/remnants.png",
 	  icon_size = 64,
 	  icon_mipmaps = 4,
 	  BI_add_icon = true,
-    flags = { "placeable-neutral", "building-direction-8-way", "not-on-map" },
+	  flags = {"placeable-neutral", "building-direction-8-way", "not-on-map"},
 	  subgroup = "remnants",
 	  order = "z-z-z",
-    selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } },
+	  selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
 	  tile_width = 3,
 	  tile_height = 3,
 	  selectable_in_game = false,
 	  time_before_removed = 60 * 60 * 15, -- 15 minutes
 	  final_render_layer = "remnants",
 	  remove_on_tile_placement = false,
-    animation = {
+	  animation =
+	  {
 		{
 		  filename = REMNANTSPATH .. "bio_garden_remnant.png",
 		  line_length = 1,
@@ -119,14 +114,15 @@ data:extend({
 		  height = 320,
 		  frame_count = 1,
 		  direction_count = 1,
-        shift = { 0, -0.75 },
+		  shift = {0, -0.75},
 		  scale = 0.5
 		}
 	  }
 	},
 		
 	
-  ---- Bio Garden Large
+	
+---- Bio Garden Large
     {
         type = "assembling-machine",
         name = "bi-bio-garden-large",
@@ -143,8 +139,8 @@ data:extend({
 		fast_replaceable_group = "bi-bio-garden-large",
         max_health = 1200,
         corpse = "bi-bio-garden-large-remnant",
-    collision_box = { { -4.3, -4.3 }, { 4.3, 4.3 } },
+		collision_box = {{-4.3, -4.3}, {4.3, 4.3}},
-    selection_box = { { -4.5, -4.5 }, { 4.5, 4.5 } },
+		selection_box = {{-4.5, -4.5}, {4.5, 4.5}},
 		scale_entity_info_icon = true,
 		fluid_boxes = {
 			{
@@ -171,14 +167,14 @@ data:extend({
 						width = 640,
 						height = 704,
 						scale = 0.5,
-            shift = { 0, -0.5 },
+						shift = {0, -0.5},
 					},
 					{
 						filename = ENTITYPATH_BIO .. "bio_garden/bio_garden_large_shadow.png",
 					  width = 704,
 					  height = 640,
 					  scale = 0.5,
-            shift = { 0.5, 0 },
+					  shift = {0.5, 0},
 					  draw_as_shadow = true,
 					}
 				}
@@ -186,7 +182,7 @@ data:extend({
 			
 				working_visualisations = {
 				{
-          light = { intensity = 1.2, size = 20 },
+					light = {intensity = 1.2, size = 20 },
 					draw_as_light = true,
 					effect = "flicker",
 					constant_speed = true,
@@ -196,7 +192,7 @@ data:extend({
 					width = 640,
 					height = 640,
 					scale = 0.5,
-            shift = { 0, 0 },
+					shift = {0, 0},
 					},
 				},
 			},
@@ -213,7 +209,6 @@ data:extend({
         source_inventory_size = 1,
         result_inventory_size = 1,
         crafting_speed = 4.0,
-    crafting_speed_quality_multiplier = crafting_speed_quality_multiplier,
         energy_source = {
             type = "electric",
             usage_priority = "secondary-input",
@@ -236,22 +231,23 @@ data:extend({
 	{
   type = "corpse",
   name = "bi-bio-garden-large-remnant",
-    localised_name = { "entity-name.bi-bio-garden-large-remnant" },
+  localised_name = {"entity-name.bi-bio-garden-large-remnant"},
   icon = "__base__/graphics/icons/remnants.png",
   icon_size = 64,
   icon_mipmaps = 4,
   BI_add_icon = true,
-    flags = { "placeable-neutral", "building-direction-8-way", "not-on-map" },
+  flags = {"placeable-neutral", "building-direction-8-way", "not-on-map"},
   subgroup = "remnants",
   order = "z-z-z",
-    selection_box = { { -4.5, -4.5 }, { 4.5, 4.5 } },
+  selection_box = {{-4.5, -4.5}, {4.5, 4.5}},
   tile_width = 9,
   tile_height = 9,
   selectable_in_game = false,
   time_before_removed = 60 * 60 * 15, -- 15 minutes
   final_render_layer = "remnants",
   remove_on_tile_placement = false,
-    animation = {
+  animation =
+  {
     {
       filename = REMNANTSPATH .. "bio_garden_large_remnant.png",
       line_length = 1,
@@ -259,12 +255,12 @@ data:extend({
       height = 704,
       frame_count = 1,
       direction_count = 1,
-        shift = { 0, -0.5 },
+      shift = {0, -0.5},
       scale = 0.5
     }
   }
-  },
+},
-  ---- Bio Garden Huge
+---- Bio Garden Huge
     {
         type = "assembling-machine",
         name = "bi-bio-garden-huge",
@@ -281,8 +277,8 @@ data:extend({
 		fast_replaceable_group = "bi-bio-garden-huge",
         max_health = 2000,
         corpse = "bi-bio-garden-huge-remnant",
-    collision_box = { { -13.3, -13.3 }, { 13.3, 13.3 } },
+		collision_box = {{-13.3, -13.3}, {13.3, 13.3}},
-    selection_box = { { -13.5, -13.5 }, { 13.5, 13.5 } },
+		selection_box = {{-13.5, -13.5}, {13.5, 13.5}},
 		scale_entity_info_icon = true,
 		  fluid_boxes = {
 			{
@@ -311,7 +307,7 @@ data:extend({
 					  line_length = 1,
 					  repeat_count = 8,
 					  animation_speed = 1,
-            shift = { 0, -0.5 },
+					  shift = {0, -0.5},
 					},
 					{
 						filename = ENTITYPATH_BIO .. "bio_garden/bio_garden_huge_shadow.png",
@@ -322,7 +318,7 @@ data:extend({
 						  line_length = 1,
 						  repeat_count = 8,
 						  animation_speed = 1,
-            shift = { 14, -0.5 },
+						  shift = {14, -0.5},
 						  draw_as_shadow = true,
 					},
 				},
@@ -343,7 +339,7 @@ data:extend({
 					  line_length = 8,
 					  repeat_count = 1,
 					  animation_speed = 1,
-                shift = { -4.5, -4.5 },
+					  shift = {-4.5, -4.5},
 				  },
 				  {
 					filename = ENTITYPATH_BIO .. "bio_garden/bio_garden_huge_turbine_anim.png",
@@ -354,7 +350,7 @@ data:extend({
 					  line_length = 8,
 					  repeat_count = 1,
 					  animation_speed = 1,
-                shift = { 4.5, 4.5 },
+					  shift = {4.5, 4.5},
 				  },
 				  {
 					filename = ENTITYPATH_BIO .. "bio_garden/bio_garden_huge_turbine_anim.png",
@@ -365,7 +361,7 @@ data:extend({
 					  line_length = 8,
 					  repeat_count = 1,
 					  animation_speed = 1,
-                shift = { 4.5, -4.5 },
+					  shift = {4.5, -4.5},
 				  },
 				  {
 					filename = ENTITYPATH_BIO .. "bio_garden/bio_garden_huge_turbine_anim.png",
@@ -376,7 +372,7 @@ data:extend({
 					  line_length = 8,
 					  repeat_count = 1,
 					  animation_speed = 1,
-                shift = { -4.5, 4.5 },
+					  shift = {-4.5, 4.5},
 				  },
 				},
 			  },
@@ -395,7 +391,6 @@ data:extend({
         source_inventory_size = 1,
         result_inventory_size = 1,
         crafting_speed = 16,
-    crafting_speed_quality_multiplier = crafting_speed_quality_multiplier,
         energy_source = {
             type = "electric",
             usage_priority = "secondary-input",
@@ -415,25 +410,26 @@ data:extend({
     },
 	---- corpse
 	
-  {
+{
   type = "corpse",
   name = "bi-bio-garden-huge-remnant",
-    localised_name = { "entity-name.bi-bio-garden-huge-remnant" },
+  localised_name = {"entity-name.bi-bio-garden-huge-remnant"},
   icon = "__base__/graphics/icons/remnants.png",
   icon_size = 64,
   icon_mipmaps = 4,
   BI_add_icon = true,
-    flags = { "placeable-neutral", "building-direction-8-way", "not-on-map" },
+  flags = {"placeable-neutral", "building-direction-8-way", "not-on-map"},
   subgroup = "remnants",
   order = "z-z-z",
-    selection_box = { { -13.5, -13.5 }, { 13.5, 13.5 } },
+  selection_box = {{-13.5, -13.5}, {13.5, 13.5}},
   tile_width = 27,
   tile_height = 27,
   selectable_in_game = false,
   time_before_removed = 60 * 60 * 15, -- 15 minutes
   final_render_layer = "remnants",
   remove_on_tile_placement = false,
-    animation = {
+  animation =
+  {
     {
       filename = REMNANTSPATH .. "bio_garden_huge_remnant.png",
       line_length = 1,
@@ -441,9 +437,9 @@ data:extend({
       height = 928,
       frame_count = 1,
       direction_count = 1,
-        shift = { 0, -0.5 },
+      shift = {0, -0.5},
-      }
     }
   }
+}
 	
 })