From 3f811adfa308a50835112b12b43ee04154968f8c Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Sat, 2 May 2026 18:40:40 +1200 Subject: [PATCH 01/11] Tungsten Space Age compatibility --- .../assembly-electronics-updates.lua | 4 +- bobassembly/prototypes/assembly-updates.lua | 12 ++-- bobassembly/prototypes/centrifuge-updates.lua | 4 +- .../chemical-mixing-furnace-updates.lua | 8 +-- bobassembly/prototypes/distillery-updates.lua | 4 +- .../prototypes/electric-furnace-updates.lua | 8 +-- .../prototypes/electrolyser-updates.lua | 8 +-- .../prototypes/oil-refinery-updates.lua | 4 +- bobequipment/prototypes/armor-updates.lua | 4 +- bobequipment/prototypes/recipe/updates.lua | 8 +-- boblogistics/prototypes/item/pipes.lua | 2 +- .../prototypes/recipe/pipes-recipe.lua | 6 +- .../recipe/robots-recipe-updates.lua | 4 +- .../recipe/train-recipe-updates.lua | 14 ++--- .../prototypes/repair-pack-updates.lua | 4 +- bobmining/prototypes/areadrill-updates.lua | 8 +-- bobmining/prototypes/axes.lua | 2 +- bobmining/prototypes/drill-updates.lua | 8 +-- bobmining/prototypes/pumpjack-updates.lua | 4 +- bobmining/prototypes/water-miner-updates.lua | 4 +- bobores/control.lua | 2 +- bobores/data.lua | 2 +- bobores/locale/cs/bobores.cfg | 2 +- bobores/locale/de/bobores.cfg | 6 +- bobores/locale/en/bobores.cfg | 6 +- bobores/locale/es-ES/bobores.cfg | 2 +- bobores/locale/fr/bobores.cfg | 2 +- bobores/locale/it/bobores.cfg | 2 +- bobores/locale/ja/bobores.cfg | 2 +- bobores/locale/ko/bobores.cfg | 2 +- bobores/locale/nl/bobores.cfg | 2 +- bobores/locale/pl/bobores.cfg | 2 +- bobores/locale/pt-BR/bobores.cfg | 2 +- bobores/locale/ru/bobores.cfg | 6 +- bobores/locale/th/bobores.cfg | 2 +- bobores/locale/tr/bobores.cfg | 6 +- bobores/locale/uk/bobores.cfg | 2 +- bobores/locale/zh-CN/bobores.cfg | 2 +- bobores/locale/zh-TW/bobores.cfg | 6 +- bobores/migrations/bobores_2.0.0.json | 1 - bobores/prototypes/tungsten-ore.lua | 6 +- bobplates/locale/cs/bobplates.cfg | 6 +- bobplates/locale/de/bobplates.cfg | 6 +- bobplates/locale/en/bobplates.cfg | 6 +- bobplates/locale/es-ES/bobplates.cfg | 6 +- bobplates/locale/fr/bobplates.cfg | 6 +- bobplates/locale/id/bobplates.cfg | 6 +- bobplates/locale/it/bobplates.cfg | 6 +- bobplates/locale/ja/bobplates.cfg | 6 +- bobplates/locale/ko/bobplates.cfg | 6 +- bobplates/locale/nl/bobplates.cfg | 6 +- bobplates/locale/pl/bobplates.cfg | 6 +- bobplates/locale/pt-BR/bobplates.cfg | 6 +- bobplates/locale/pt/bobplates.cfg | 2 +- bobplates/locale/ru/bobplates.cfg | 6 +- bobplates/locale/th/bobplates.cfg | 6 +- bobplates/locale/tr/bobplates.cfg | 6 +- bobplates/locale/uk/bobplates.cfg | 6 +- bobplates/locale/zh-CN/bobplates.cfg | 6 +- bobplates/locale/zh-TW/bobplates.cfg | 6 +- bobplates/migrations/bobplates_2.0.0.json | 6 -- bobplates/migrations/bobplates_2.0.6.json | 8 ++- bobplates/prototypes/item/alloys.lua | 35 +++++++---- bobplates/prototypes/item/plates.lua | 35 +++++++---- bobplates/prototypes/recipe/alloy-recipe.lua | 59 ++++++++----------- .../prototypes/recipe/chemistry-recipe.lua | 2 +- bobplates/prototypes/recipe/parts-recipe.lua | 2 +- bobplates/prototypes/recipe/plates-recipe.lua | 35 +++++------ bobplates/prototypes/technology-updates.lua | 24 +++++++- bobplates/remote.lua | 8 +-- bobpower/prototypes/heat-pipes-updates.lua | 4 +- .../prototypes/recipe/boilers-updates.lua | 4 +- .../recipe/fluid-generator-updates.lua | 4 +- .../recipe/heat-exchangers-updates.lua | 4 +- .../prototypes/recipe/nuclear-updates.lua | 8 +-- .../prototypes/recipe/oil-boilers-updates.lua | 4 +- bobpower/prototypes/recipe/poles-updates.lua | 8 +-- .../recipe/steam-engines-updates.lua | 8 +-- .../recipe/steam-turbines-updates.lua | 8 +-- bobrevamp/prototypes/rocket-parts-updates.lua | 42 +++++++------ .../prototypes/recipe-updates.lua | 14 ++--- bobwarfare/prototypes/armor-updates.lua | 4 +- .../prototypes/recipe/recipe-updates.lua | 38 ++++++------ bobwarfare/prototypes/spidertron-updates.lua | 4 +- bobwarfare/prototypes/train-updates.lua | 4 +- 85 files changed, 347 insertions(+), 320 deletions(-) diff --git a/bobassembly/prototypes/assembly-electronics-updates.lua b/bobassembly/prototypes/assembly-electronics-updates.lua index b159c279c..48c51267f 100644 --- a/bobassembly/prototypes/assembly-electronics-updates.lua +++ b/bobassembly/prototypes/assembly-electronics-updates.lua @@ -41,8 +41,8 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then if data.raw.item["bob-copper-tungsten-alloy"] then bobmods.lib.recipe.replace_ingredient("bob-electronics-machine-3", "iron-plate", "bob-copper-tungsten-alloy") bobmods.lib.tech.add_prerequisite("bob-electronics-machine-3", "bob-tungsten-alloy-processing") - elseif data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-electronics-machine-3", "iron-plate", "bob-tungsten-plate") + elseif data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-electronics-machine-3", "iron-plate", "tungsten-plate") bobmods.lib.tech.add_prerequisite("bob-electronics-machine-3", "bob-tungsten-processing") end diff --git a/bobassembly/prototypes/assembly-updates.lua b/bobassembly/prototypes/assembly-updates.lua index fbdbc183d..6d4b66da6 100644 --- a/bobassembly/prototypes/assembly-updates.lua +++ b/bobassembly/prototypes/assembly-updates.lua @@ -78,8 +78,8 @@ end if data.raw.item["bob-titanium-plate"] then bobmods.lib.recipe.replace_ingredient("bob-assembling-machine-5", "steel-plate", "bob-titanium-plate") bobmods.lib.tech.add_prerequisite("automation-5", "bob-titanium-processing") -elseif data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-assembling-machine-5", "steel-plate", "bob-tungsten-plate") +elseif data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-assembling-machine-5", "steel-plate", "tungsten-plate") bobmods.lib.tech.add_prerequisite("automation-5", "bob-tungsten-processing") end @@ -108,11 +108,11 @@ elseif data.raw.item["bob-titanium-plate"] then bobmods.lib.tech.add_prerequisite("automation-6", "bob-titanium-processing") end -if data.raw.item["bob-tungsten-carbide"] then - bobmods.lib.recipe.replace_ingredient("bob-assembling-machine-6", "iron-plate", "bob-tungsten-carbide") +if data.raw.item["tungsten-carbide"] then + bobmods.lib.recipe.replace_ingredient("bob-assembling-machine-6", "iron-plate", "tungsten-carbide") bobmods.lib.tech.add_prerequisite("automation-6", "bob-tungsten-alloy-processing") -elseif data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-assembling-machine-6", "iron-plate", "bob-tungsten-plate") +elseif data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-assembling-machine-6", "iron-plate", "tungsten-plate") bobmods.lib.tech.add_prerequisite("automation-6", "bob-tungsten-processing") end diff --git a/bobassembly/prototypes/centrifuge-updates.lua b/bobassembly/prototypes/centrifuge-updates.lua index 2a4f926b0..21c9e6f0d 100644 --- a/bobassembly/prototypes/centrifuge-updates.lua +++ b/bobassembly/prototypes/centrifuge-updates.lua @@ -22,8 +22,8 @@ if settings.startup["bobmods-assembly-centrifuge"].value == true then bobmods.lib.tech.add_prerequisite("bob-centrifuge-3", "bob-nitinol-processing") end - if data.raw.item["bob-tungsten-carbide"] then - bobmods.lib.recipe.replace_ingredient("bob-centrifuge-3", "refined-concrete", "bob-tungsten-carbide") + if data.raw.item["tungsten-carbide"] then + bobmods.lib.recipe.replace_ingredient("bob-centrifuge-3", "refined-concrete", "tungsten-carbide") bobmods.lib.tech.add_prerequisite("bob-centrifuge-3", "bob-tungsten-alloy-processing") end diff --git a/bobassembly/prototypes/chemical-mixing-furnace-updates.lua b/bobassembly/prototypes/chemical-mixing-furnace-updates.lua index 79424d76c..9c6bfbb4b 100644 --- a/bobassembly/prototypes/chemical-mixing-furnace-updates.lua +++ b/bobassembly/prototypes/chemical-mixing-furnace-updates.lua @@ -18,8 +18,8 @@ then bobmods.lib.tech.add_prerequisite("bob-multi-purpose-furnace-1", "bob-invar-processing") end - if data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-electric-chemical-mixing-furnace", "stone-brick", "bob-tungsten-plate") + if data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-electric-chemical-mixing-furnace", "stone-brick", "tungsten-plate") bobmods.lib.tech.add_prerequisite("bob-multi-purpose-furnace-1", "bob-tungsten-processing") end @@ -42,11 +42,11 @@ then bobmods.lib.tech.add_prerequisite("bob-multi-purpose-furnace-2", "bob-tungsten-alloy-processing") end - if data.raw.item["bob-tungsten-carbide"] then + if data.raw.item["tungsten-carbide"] then bobmods.lib.recipe.replace_ingredient( "bob-electric-chemical-mixing-furnace-2", "stone-brick", - "bob-tungsten-carbide" + "tungsten-carbide" ) bobmods.lib.tech.add_prerequisite("bob-multi-purpose-furnace-2", "bob-tungsten-alloy-processing") end diff --git a/bobassembly/prototypes/distillery-updates.lua b/bobassembly/prototypes/distillery-updates.lua index a66097a8b..b04ade43a 100644 --- a/bobassembly/prototypes/distillery-updates.lua +++ b/bobassembly/prototypes/distillery-updates.lua @@ -38,8 +38,8 @@ then bobmods.lib.tech.add_prerequisite("bob-distillery-3", "bob-invar-processing") end - if data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-distillery-4", "steel-plate", "bob-tungsten-plate") + if data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-distillery-4", "steel-plate", "tungsten-plate") bobmods.lib.tech.add_prerequisite("bob-distillery-4", "bob-tungsten-processing") end diff --git a/bobassembly/prototypes/electric-furnace-updates.lua b/bobassembly/prototypes/electric-furnace-updates.lua index 580aa7e41..384722000 100644 --- a/bobassembly/prototypes/electric-furnace-updates.lua +++ b/bobassembly/prototypes/electric-furnace-updates.lua @@ -7,8 +7,8 @@ if settings.startup["bobmods-assembly-furnaces"].value == true and data.raw.furn bobmods.lib.tech.add_prerequisite("advanced-material-processing-3", "bob-invar-processing") end - if data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-electric-furnace-2", "stone-brick", "bob-tungsten-plate") + if data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-electric-furnace-2", "stone-brick", "tungsten-plate") bobmods.lib.tech.add_prerequisite("advanced-material-processing-3", "bob-tungsten-processing") end @@ -17,8 +17,8 @@ if settings.startup["bobmods-assembly-furnaces"].value == true and data.raw.furn bobmods.lib.tech.add_prerequisite("advanced-material-processing-4", "bob-tungsten-alloy-processing") end - if data.raw.item["bob-tungsten-carbide"] then - bobmods.lib.recipe.replace_ingredient("bob-electric-furnace-3", "stone-brick", "bob-tungsten-carbide") + if data.raw.item["tungsten-carbide"] then + bobmods.lib.recipe.replace_ingredient("bob-electric-furnace-3", "stone-brick", "tungsten-carbide") bobmods.lib.tech.add_prerequisite("advanced-material-processing-4", "bob-tungsten-alloy-processing") end diff --git a/bobassembly/prototypes/electrolyser-updates.lua b/bobassembly/prototypes/electrolyser-updates.lua index 86aae6c09..109694473 100644 --- a/bobassembly/prototypes/electrolyser-updates.lua +++ b/bobassembly/prototypes/electrolyser-updates.lua @@ -58,8 +58,8 @@ then bobmods.lib.tech.add_prerequisite("bob-electrolyser-4", "bob-titanium-processing") end - if data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-electrolyser-4", "steel-plate", "bob-tungsten-plate") + if data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-electrolyser-4", "steel-plate", "tungsten-plate") bobmods.lib.tech.add_prerequisite("bob-electrolyser-4", "bob-tungsten-processing") end @@ -67,8 +67,8 @@ then bobmods.lib.recipe.replace_ingredient("bob-electrolyser-4", "pipe", "bob-ceramic-pipe") end - if data.raw.item["bob-tungsten-carbide"] then - bobmods.lib.recipe.replace_ingredient("bob-electrolyser-5", "plastic-bar", "bob-tungsten-carbide") + if data.raw.item["tungsten-carbide"] then + bobmods.lib.recipe.replace_ingredient("bob-electrolyser-5", "plastic-bar", "tungsten-carbide") end if data.raw.item["bob-nitinol-alloy"] then diff --git a/bobassembly/prototypes/oil-refinery-updates.lua b/bobassembly/prototypes/oil-refinery-updates.lua index 4dbe59693..bf7e72775 100644 --- a/bobassembly/prototypes/oil-refinery-updates.lua +++ b/bobassembly/prototypes/oil-refinery-updates.lua @@ -77,8 +77,8 @@ if settings.startup["bobmods-assembly-oilrefineries"].value == true then bobmods.lib.recipe.replace_ingredient("bob-oil-refinery-4", "stone-brick", "bob-copper-tungsten-alloy") bobmods.lib.tech.add_prerequisite("oil-processing-4", "bob-tungsten-alloy-processing") else - if data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-oil-refinery-4", "stone-brick", "bob-tungsten-plate") + if data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-oil-refinery-4", "stone-brick", "tungsten-plate") bobmods.lib.tech.add_prerequisite("oil-processing-4", "bob-tungsten-processing") end end diff --git a/bobequipment/prototypes/armor-updates.lua b/bobequipment/prototypes/armor-updates.lua index 31c995eff..692c3a44b 100644 --- a/bobequipment/prototypes/armor-updates.lua +++ b/bobequipment/prototypes/armor-updates.lua @@ -46,8 +46,8 @@ if not mods["bobwarfare"] then bobmods.lib.recipe.replace_ingredient("bob-power-armor-mk4", "plastic-bar", "bob-silicon-nitride") bobmods.lib.tech.add_prerequisite("bob-power-armor-4", "bob-ceramics") end - if data.raw.item["bob-tungsten-carbide"] then - bobmods.lib.recipe.replace_ingredient("bob-power-armor-mk5", "steel-plate", "bob-tungsten-carbide") + if data.raw.item["tungsten-carbide"] then + bobmods.lib.recipe.replace_ingredient("bob-power-armor-mk5", "steel-plate", "tungsten-carbide") bobmods.lib.tech.add_prerequisite("bob-power-armor-5", "bob-tungsten-alloy-processing") end diff --git a/bobequipment/prototypes/recipe/updates.lua b/bobequipment/prototypes/recipe/updates.lua index 01dfddcea..d0d39d9b8 100644 --- a/bobequipment/prototypes/recipe/updates.lua +++ b/bobequipment/prototypes/recipe/updates.lua @@ -565,20 +565,20 @@ if data.raw.fluid["bob-heavy-water"] then bobmods.lib.tech.add_prerequisite("fission-reactor-equipment", "bob-heavy-water-processing") end -if data.raw.item["bob-tungsten-plate"] then +if data.raw.item["tungsten-plate"] then bobmods.lib.recipe.remove_ingredient("bob-fission-reactor-equipment-2", "low-density-structure") bobmods.lib.tech.remove_prerequisite("bob-fission-reactor-equipment-2", "low-density-structure") bobmods.lib.recipe.add_ingredient( "bob-fission-reactor-equipment-2", - { type = "item", name = "bob-tungsten-plate", amount = 250 } + { type = "item", name = "tungsten-plate", amount = 250 } ) bobmods.lib.tech.add_prerequisite("bob-fission-reactor-equipment-2", "bob-tungsten-processing") end -if data.raw.item["bob-tungsten-carbide"] then +if data.raw.item["tungsten-carbide"] then bobmods.lib.recipe.add_ingredient( "bob-fission-reactor-equipment-3", - { type = "item", name = "bob-tungsten-carbide", amount = 80 } + { type = "item", name = "tungsten-carbide", amount = 80 } ) bobmods.lib.tech.add_prerequisite("bob-fission-reactor-equipment-3", "bob-tungsten-alloy-processing") end diff --git a/boblogistics/prototypes/item/pipes.lua b/boblogistics/prototypes/item/pipes.lua index d4180f1bf..16b69bbea 100644 --- a/boblogistics/prototypes/item/pipes.lua +++ b/boblogistics/prototypes/item/pipes.lua @@ -325,7 +325,7 @@ if data.raw.item["bob-titanium-plate"] then }) end -if data.raw.item["bob-tungsten-plate"] then +if data.raw.item["tungsten-plate"] then data:extend({ { type = "item", diff --git a/boblogistics/prototypes/recipe/pipes-recipe.lua b/boblogistics/prototypes/recipe/pipes-recipe.lua index 02bb566b7..741775a7c 100644 --- a/boblogistics/prototypes/recipe/pipes-recipe.lua +++ b/boblogistics/prototypes/recipe/pipes-recipe.lua @@ -184,14 +184,14 @@ if data.raw.item["bob-titanium-plate"] then }) end -if data.raw.item["bob-tungsten-plate"] then +if data.raw.item["tungsten-plate"] then data:extend({ { type = "recipe", name = "bob-tungsten-pipe", enabled = false, ingredients = { - { type = "item", name = "bob-tungsten-plate", amount = 1 }, + { type = "item", name = "tungsten-plate", amount = 1 }, }, results = { { type = "item", name = "bob-tungsten-pipe", amount = 1 } }, }, @@ -202,7 +202,7 @@ if data.raw.item["bob-tungsten-plate"] then enabled = false, ingredients = { { type = "item", name = "bob-tungsten-pipe", amount = 16 }, - { type = "item", name = "bob-tungsten-plate", amount = 5 }, + { type = "item", name = "tungsten-plate", amount = 5 }, }, results = { { type = "item", name = "bob-tungsten-pipe-to-ground", amount = 2 } }, }, diff --git a/boblogistics/prototypes/recipe/robots-recipe-updates.lua b/boblogistics/prototypes/recipe/robots-recipe-updates.lua index 8754aae21..4ea1b890e 100644 --- a/boblogistics/prototypes/recipe/robots-recipe-updates.lua +++ b/boblogistics/prototypes/recipe/robots-recipe-updates.lua @@ -269,10 +269,10 @@ if data.raw.recipe["bob-robot-tool-construction"] then { type = "item", name = "bob-nitinol-bearing", amount = 1 } ) end - if data.raw.item["bob-tungsten-carbide"] then + if data.raw.item["tungsten-carbide"] then bobmods.lib.recipe.add_ingredient( "bob-robot-tool-logistic-4", - { type = "item", name = "bob-tungsten-carbide", amount = 1 } + { type = "item", name = "tungsten-carbide", amount = 1 } ) bobmods.lib.tech.add_prerequisite("bob-robots-3", "bob-tungsten-alloy-processing") end diff --git a/boblogistics/prototypes/recipe/train-recipe-updates.lua b/boblogistics/prototypes/recipe/train-recipe-updates.lua index 581ef6afc..7b8b77e45 100644 --- a/boblogistics/prototypes/recipe/train-recipe-updates.lua +++ b/boblogistics/prototypes/recipe/train-recipe-updates.lua @@ -83,14 +83,14 @@ if settings.startup["bobmods-logistics-trains"].value == true then bobmods.lib.recipe.replace_ingredient("bob-armoured-fluid-wagon-2", "iron-gear-wheel", "bob-titanium-gear-wheel") end - if data.raw.item["bob-tungsten-carbide"] then + if data.raw.item["tungsten-carbide"] then bobmods.lib.tech.add_prerequisite("bob-armoured-railway-2", "bob-tungsten-alloy-processing") bobmods.lib.tech.add_prerequisite("bob-armoured-fluid-wagon-2", "bob-tungsten-alloy-processing") if data.raw.item["bob-silicon-nitride"] then bobmods.lib.recipe.remove_ingredient("bob-armoured-locomotive-2", "steel-plate") bobmods.lib.recipe.add_ingredient( "bob-armoured-locomotive-2", - { type = "item", name = "bob-tungsten-carbide", amount = 15 } + { type = "item", name = "tungsten-carbide", amount = 15 } ) bobmods.lib.recipe.add_ingredient( "bob-armoured-locomotive-2", @@ -100,7 +100,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then bobmods.lib.recipe.remove_ingredient("bob-armoured-cargo-wagon-2", "steel-plate") bobmods.lib.recipe.add_ingredient( "bob-armoured-cargo-wagon-2", - { type = "item", name = "bob-tungsten-carbide", amount = 15 } + { type = "item", name = "tungsten-carbide", amount = 15 } ) bobmods.lib.recipe.add_ingredient( "bob-armoured-cargo-wagon-2", @@ -110,7 +110,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then bobmods.lib.recipe.remove_ingredient("bob-armoured-fluid-wagon-2", "steel-plate") bobmods.lib.recipe.add_ingredient( "bob-armoured-fluid-wagon-2", - { type = "item", name = "bob-tungsten-carbide", amount = 15 } + { type = "item", name = "tungsten-carbide", amount = 15 } ) bobmods.lib.recipe.add_ingredient( "bob-armoured-fluid-wagon-2", @@ -120,9 +120,9 @@ if settings.startup["bobmods-logistics-trains"].value == true then bobmods.lib.tech.add_prerequisite("bob-armoured-railway-2", "bob-ceramics") bobmods.lib.tech.add_prerequisite("bob-armoured-fluid-wagon-2", "bob-ceramics") else - bobmods.lib.recipe.replace_ingredient("bob-armoured-locomotive-2", "steel-plate", "bob-tungsten-carbide") - bobmods.lib.recipe.replace_ingredient("bob-armoured-cargo-wagon-2", "steel-plate", "bob-tungsten-carbide") - bobmods.lib.recipe.replace_ingredient("bob-armoured-fluid-wagon-2", "steel-plate", "bob-tungsten-carbide") + bobmods.lib.recipe.replace_ingredient("bob-armoured-locomotive-2", "steel-plate", "tungsten-carbide") + bobmods.lib.recipe.replace_ingredient("bob-armoured-cargo-wagon-2", "steel-plate", "tungsten-carbide") + bobmods.lib.recipe.replace_ingredient("bob-armoured-fluid-wagon-2", "steel-plate", "tungsten-carbide") end else if data.raw.item["bob-silicon-nitride"] then diff --git a/boblogistics/prototypes/repair-pack-updates.lua b/boblogistics/prototypes/repair-pack-updates.lua index ea996bcac..3818d315f 100644 --- a/boblogistics/prototypes/repair-pack-updates.lua +++ b/boblogistics/prototypes/repair-pack-updates.lua @@ -42,7 +42,7 @@ if data.raw.item["bob-advanced-processing-unit"] then bobmods.lib.tech.add_prerequisite("bob-repair-pack-5", "bob-advanced-processing-unit") end -if data.raw.item["bob-tungsten-carbide"] then - bobmods.lib.recipe.replace_ingredient("bob-repair-pack-5", "steel-plate", "bob-tungsten-carbide") +if data.raw.item["tungsten-carbide"] then + bobmods.lib.recipe.replace_ingredient("bob-repair-pack-5", "steel-plate", "tungsten-carbide") bobmods.lib.tech.add_prerequisite("bob-repair-pack-5", "bob-tungsten-alloy-processing") end diff --git a/bobmining/prototypes/areadrill-updates.lua b/bobmining/prototypes/areadrill-updates.lua index 705a7f3e4..69f78b702 100644 --- a/bobmining/prototypes/areadrill-updates.lua +++ b/bobmining/prototypes/areadrill-updates.lua @@ -31,8 +31,8 @@ if settings.startup["bobmods-mining-areadrills"].value == true then bobmods.lib.recipe.replace_ingredient("bob-area-mining-drill-3", "steel-plate", "bob-titanium-plate") bobmods.lib.tech.add_prerequisite("bob-area-drills-3", "bob-titanium-processing") else - if data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-area-mining-drill-3", "steel-plate", "bob-tungsten-plate") + if data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-area-mining-drill-3", "steel-plate", "tungsten-plate") bobmods.lib.tech.add_prerequisite("bob-area-drills-3", "bob-tungsten-processing") end end @@ -47,8 +47,8 @@ if settings.startup["bobmods-mining-areadrills"].value == true then bobmods.lib.tech.add_prerequisite("bob-area-drills-4", "bob-advanced-processing-unit") end - if data.raw.item["bob-tungsten-carbide"] then - bobmods.lib.recipe.replace_ingredient("bob-area-mining-drill-4", "steel-plate", "bob-tungsten-carbide") + if data.raw.item["tungsten-carbide"] then + bobmods.lib.recipe.replace_ingredient("bob-area-mining-drill-4", "steel-plate", "tungsten-carbide") bobmods.lib.tech.add_prerequisite("bob-area-drills-4", "bob-tungsten-alloy-processing") else if data.raw.item["bob-copper-tungsten-alloy"] then diff --git a/bobmining/prototypes/axes.lua b/bobmining/prototypes/axes.lua index ce516827a..a5b78fdc2 100644 --- a/bobmining/prototypes/axes.lua +++ b/bobmining/prototypes/axes.lua @@ -53,7 +53,7 @@ if settings.startup["bobmods-mining-miningaxes"].value == true then }, }, prerequisites = { "bob-steel-axe-3", "bob-tungsten-processing" }, - research_trigger = { type = "craft-item", item = "bob-tungsten-plate", count = 50 }, + research_trigger = { type = "craft-item", item = "tungsten-plate", count = 50 }, upgrade = true, }, { diff --git a/bobmining/prototypes/drill-updates.lua b/bobmining/prototypes/drill-updates.lua index 4cc56e31e..b9be5a34f 100644 --- a/bobmining/prototypes/drill-updates.lua +++ b/bobmining/prototypes/drill-updates.lua @@ -34,8 +34,8 @@ if settings.startup["bobmods-mining-miningdrills"].value == true then bobmods.lib.recipe.replace_ingredient("bob-mining-drill-3", "steel-plate", "bob-titanium-plate") bobmods.lib.tech.add_prerequisite("bob-drills-4", "bob-titanium-processing") else - if data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-mining-drill-3", "steel-plate", "bob-tungsten-plate") + if data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-mining-drill-3", "steel-plate", "tungsten-plate") bobmods.lib.tech.add_prerequisite("bob-drills-4", "bob-tungsten-processing") end end @@ -50,8 +50,8 @@ if settings.startup["bobmods-mining-miningdrills"].value == true then bobmods.lib.tech.add_prerequisite("bob-drills-5", "bob-advanced-processing-unit") end - if data.raw.item["bob-tungsten-carbide"] then - bobmods.lib.recipe.replace_ingredient("bob-mining-drill-4", "steel-plate", "bob-tungsten-carbide") + if data.raw.item["tungsten-carbide"] then + bobmods.lib.recipe.replace_ingredient("bob-mining-drill-4", "steel-plate", "tungsten-carbide") bobmods.lib.tech.add_prerequisite("bob-drills-5", "bob-tungsten-alloy-processing") else if data.raw.item["bob-copper-tungsten-alloy"] then diff --git a/bobmining/prototypes/pumpjack-updates.lua b/bobmining/prototypes/pumpjack-updates.lua index 1007637d4..beff3b881 100644 --- a/bobmining/prototypes/pumpjack-updates.lua +++ b/bobmining/prototypes/pumpjack-updates.lua @@ -40,8 +40,8 @@ if settings.startup["bobmods-mining-pumpjacks"].value == true then bobmods.lib.recipe.replace_ingredient("bob-pumpjack-2", "steel-plate", "bob-titanium-plate") bobmods.lib.tech.add_prerequisite("bob-pumpjacks-3", "bob-titanium-processing") else - if data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-pumpjack-2", "steel-plate", "bob-tungsten-plate") + if data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-pumpjack-2", "steel-plate", "tungsten-plate") bobmods.lib.tech.add_prerequisite("bob-pumpjacks-3", "bob-tungsten-processing") end end diff --git a/bobmining/prototypes/water-miner-updates.lua b/bobmining/prototypes/water-miner-updates.lua index ed7e1a8fe..90126e958 100644 --- a/bobmining/prototypes/water-miner-updates.lua +++ b/bobmining/prototypes/water-miner-updates.lua @@ -53,8 +53,8 @@ if settings.startup["bobmods-mining-waterminers"].value == true and data.raw["re bobmods.lib.recipe.replace_ingredient("bob-water-miner-4", "steel-plate", "bob-titanium-plate") bobmods.lib.tech.add_prerequisite("bob-water-miner-4", "bob-titanium-processing") else - if data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-water-miner-4", "steel-plate", "bob-tungsten-plate") + if data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-water-miner-4", "steel-plate", "tungsten-plate") bobmods.lib.tech.add_prerequisite("bob-water-miner-4", "bob-tungsten-processing") end end diff --git a/bobores/control.lua b/bobores/control.lua index cf7728cea..a501611a7 100644 --- a/bobores/control.lua +++ b/bobores/control.lua @@ -17,7 +17,7 @@ remote.add_interface("bobores", { regenerate_entity("bob-gold-ore") regenerate_entity("bob-bauxite-ore") regenerate_entity("bob-rutile-ore") - regenerate_entity("bob-tungsten-ore") + regenerate_entity("tungsten-ore") regenerate_entity("bob-nickel-ore") regenerate_entity("bob-cobalt-ore") diff --git a/bobores/data.lua b/bobores/data.lua index f22394c84..d1cf99218 100644 --- a/bobores/data.lua +++ b/bobores/data.lua @@ -101,7 +101,7 @@ end if settings.startup["bobmods-ores-enabletinore"].value == true then bobmods.ores.tin.create_autoplace() end -if settings.startup["bobmods-ores-enabletungstenore"].value == true then +if not mods["space-age"] and settings.startup["bobmods-ores-enabletungstenore"].value == true then bobmods.ores.tungsten.create_autoplace() end if settings.startup["bobmods-ores-enablezincore"].value == true then diff --git a/bobores/locale/cs/bobores.cfg b/bobores/locale/cs/bobores.cfg index f2f9492c3..ea134503e 100644 --- a/bobores/locale/cs/bobores.cfg +++ b/bobores/locale/cs/bobores.cfg @@ -3,7 +3,7 @@ bob-gold-ore=Zlatá ruda bob-lead-ore=Galenit (Olovo) bob-silver-ore=Stříbrná ruda bob-tin-ore=Cínová ruda -bob-tungsten-ore=Wolframová ruda +tungsten-ore=Wolframová ruda bob-zinc-ore=Zinková ruda bob-bauxite-ore=Bauxit (Hliníková ruda) bob-rutile-ore=Rutil (Titanová ruda) diff --git a/bobores/locale/de/bobores.cfg b/bobores/locale/de/bobores.cfg index 0014179cd..c19e476cc 100644 --- a/bobores/locale/de/bobores.cfg +++ b/bobores/locale/de/bobores.cfg @@ -3,7 +3,7 @@ bob-gold-ore=Golderz bob-lead-ore=Galenit (Bleierz) bob-silver-ore=Silbererz bob-tin-ore=Zinnerz -bob-tungsten-ore=Wolframerz +tungsten-ore=Wolframerz bob-zinc-ore=Zinkerz bob-bauxite-ore=Bauxit (Aluminiumerz) bob-rutile-ore=Rutil (Titanerz) @@ -20,7 +20,7 @@ bob-gold-ore=__ENTITY__bob-gold-ore__ bob-lead-ore=__ENTITY__bob-lead-ore__ bob-silver-ore=__ENTITY__bob-silver-ore__ bob-tin-ore=__ENTITY__bob-tin-ore__ -bob-tungsten-ore=__ENTITY__bob-tungsten-ore__ +tungsten-ore=__ENTITY__bob-tungsten-ore__ bob-zinc-ore=__ENTITY__bob-zinc-ore__ bob-bauxite-ore=__ENTITY__bob-bauxite-ore__ bob-rutile-ore=__ENTITY__bob-rutile-ore__ @@ -48,7 +48,7 @@ bob-gold-ore=__ENTITY__bob-gold-ore__ bob-lead-ore=__ENTITY__bob-lead-ore__ bob-silver-ore=__ENTITY__bob-silver-ore__ bob-tin-ore=__ENTITY__bob-tin-ore__ -bob-tungsten-ore=__ENTITY__bob-tungsten-ore__ +tungsten-ore=__ENTITY__bob-tungsten-ore__ bob-zinc-ore=__ENTITY__bob-zinc-ore__ bob-bauxite-ore=__ENTITY__bob-bauxite-ore__ bob-rutile-ore=__ENTITY__bob-rutile-ore__ diff --git a/bobores/locale/en/bobores.cfg b/bobores/locale/en/bobores.cfg index f08960cd1..446aa1a52 100644 --- a/bobores/locale/en/bobores.cfg +++ b/bobores/locale/en/bobores.cfg @@ -3,7 +3,7 @@ bob-gold-ore=Gold ore bob-lead-ore=Galena (Lead ore) bob-silver-ore=Silver ore bob-tin-ore=Tin ore -bob-tungsten-ore=Tungsten ore +tungsten-ore=Tungsten ore bob-zinc-ore=Zinc ore bob-bauxite-ore=Bauxite (Aluminium ore) bob-rutile-ore=Rutile (Titanium ore) @@ -20,7 +20,7 @@ bob-gold-ore=__ENTITY__bob-gold-ore__ bob-lead-ore=__ENTITY__bob-lead-ore__ bob-silver-ore=__ENTITY__bob-silver-ore__ bob-tin-ore=__ENTITY__bob-tin-ore__ -bob-tungsten-ore=__ENTITY__bob-tungsten-ore__ +tungsten-ore=__ENTITY__bob-tungsten-ore__ bob-zinc-ore=__ENTITY__bob-zinc-ore__ bob-bauxite-ore=__ENTITY__bob-bauxite-ore__ bob-rutile-ore=__ENTITY__bob-rutile-ore__ @@ -48,7 +48,7 @@ bob-gold-ore=__ENTITY__bob-gold-ore__ bob-lead-ore=__ENTITY__bob-lead-ore__ bob-silver-ore=__ENTITY__bob-silver-ore__ bob-tin-ore=__ENTITY__bob-tin-ore__ -bob-tungsten-ore=__ENTITY__bob-tungsten-ore__ +tungsten-ore=__ENTITY__bob-tungsten-ore__ bob-zinc-ore=__ENTITY__bob-zinc-ore__ bob-bauxite-ore=__ENTITY__bob-bauxite-ore__ bob-rutile-ore=__ENTITY__bob-rutile-ore__ diff --git a/bobores/locale/es-ES/bobores.cfg b/bobores/locale/es-ES/bobores.cfg index 6dfbcc1f3..a01cb0967 100644 --- a/bobores/locale/es-ES/bobores.cfg +++ b/bobores/locale/es-ES/bobores.cfg @@ -3,7 +3,7 @@ bob-gold-ore=Mena de oro bob-lead-ore=Galena (Mena de plomo) bob-silver-ore=Mena de plata bob-tin-ore=Mena de estaño -bob-tungsten-ore=Mena de tungsteno +tungsten-ore=Mena de tungsteno bob-zinc-ore=Mena de zinc bob-bauxite-ore=Bauxita (Mena de aluminio)ee bob-rutile-ore=Rutilo (Mena de titanio) diff --git a/bobores/locale/fr/bobores.cfg b/bobores/locale/fr/bobores.cfg index 98b788680..150a00906 100644 --- a/bobores/locale/fr/bobores.cfg +++ b/bobores/locale/fr/bobores.cfg @@ -3,7 +3,7 @@ bob-gold-ore=Minerai d'or bob-lead-ore=Galène (Minerai de plomb) bob-silver-ore=Minerai d'argent bob-tin-ore=Cassitérite (Minerai d'étain) -bob-tungsten-ore=Minerai de tungstène +tungsten-ore=Minerai de tungstène bob-zinc-ore=Minerai de zinc bob-bauxite-ore=Bauxite (Minerai d'aluminium) bob-rutile-ore=Rutile (Minerai de titane) diff --git a/bobores/locale/it/bobores.cfg b/bobores/locale/it/bobores.cfg index 496c85ebd..a67feae12 100644 --- a/bobores/locale/it/bobores.cfg +++ b/bobores/locale/it/bobores.cfg @@ -3,7 +3,7 @@ bob-gold-ore=Oro bob-lead-ore=Piombo bob-silver-ore=Argento bob-tin-ore=Stagno -bob-tungsten-ore=Tungsteno +tungsten-ore=Tungsteno bob-zinc-ore=Zinco bob-bauxite-ore=Bauxite (Alluminio) bob-rutile-ore=Rutilo (Titanio) diff --git a/bobores/locale/ja/bobores.cfg b/bobores/locale/ja/bobores.cfg index 5a3178628..cd8fdf3d8 100644 --- a/bobores/locale/ja/bobores.cfg +++ b/bobores/locale/ja/bobores.cfg @@ -3,7 +3,7 @@ bob-gold-ore=金鉱石 bob-lead-ore=鉛鉱石 bob-silver-ore=銀鉱石 bob-tin-ore=錫鉱石 -bob-tungsten-ore=タングステン鉱石 +tungsten-ore=タングステン鉱石 bob-zinc-ore=亜鉛鉱石 bob-bauxite-ore=アルミニウム鉱石 bob-rutile-ore=チタニウム鉱石 diff --git a/bobores/locale/ko/bobores.cfg b/bobores/locale/ko/bobores.cfg index c3869f525..355f92521 100644 --- a/bobores/locale/ko/bobores.cfg +++ b/bobores/locale/ko/bobores.cfg @@ -10,7 +10,7 @@ bob-gold-ore=금 광석 bob-lead-ore=납 광석 bob-silver-ore=은 광석 bob-tin-ore=주석 광석 -bob-tungsten-ore=텅스텐 광석 +tungsten-ore=텅스텐 광석 bob-zinc-ore=아연 광석 bob-bauxite-ore=알루미늄 광석 bob-rutile-ore=티타늄 광석 diff --git a/bobores/locale/nl/bobores.cfg b/bobores/locale/nl/bobores.cfg index 4dba68b4a..90e79bcc0 100644 --- a/bobores/locale/nl/bobores.cfg +++ b/bobores/locale/nl/bobores.cfg @@ -3,7 +3,7 @@ bob-gold-ore=Gouderts bob-lead-ore=Galeniet (Looderts) bob-silver-ore=Zilvererts bob-tin-ore=Tinerts -bob-tungsten-ore=Wolfraamerts +tungsten-ore=Wolfraamerts bob-zinc-ore=Zinkerts bob-bauxite-ore=Bauxiet (Aluminiumerts) bob-rutile-ore=Rutiel (Titaniumerts) diff --git a/bobores/locale/pl/bobores.cfg b/bobores/locale/pl/bobores.cfg index ddf28ee33..9859136aa 100644 --- a/bobores/locale/pl/bobores.cfg +++ b/bobores/locale/pl/bobores.cfg @@ -3,7 +3,7 @@ bob-gold-ore=Ruda złota bob-lead-ore=Galena (Ruda ołowiu) bob-silver-ore=Ruda srebra bob-tin-ore=Ruda cyny -bob-tungsten-ore=Ruda wolframu +tungsten-ore=Ruda wolframu bob-zinc-ore=Ruda cynku bob-bauxite-ore=Boksyt (Ruda aluminium) bob-rutile-ore=Tytanit (Ruda tytanu) diff --git a/bobores/locale/pt-BR/bobores.cfg b/bobores/locale/pt-BR/bobores.cfg index db9df0f39..d53351fc6 100644 --- a/bobores/locale/pt-BR/bobores.cfg +++ b/bobores/locale/pt-BR/bobores.cfg @@ -3,7 +3,7 @@ bob-gold-ore=Minério de ouro bob-lead-ore=Galena (Minério de chumbo) bob-silver-ore=Minério de prata bob-tin-ore=Minério de estanho -bob-tungsten-ore=Minério de tungstênio +tungsten-ore=Minério de tungstênio bob-zinc-ore=Minério de zinco bob-bauxite-ore=Bauxita (Minério de alumínio) bob-rutile-ore=Rutilo (Minério de titânio) diff --git a/bobores/locale/ru/bobores.cfg b/bobores/locale/ru/bobores.cfg index 23525cc5a..99b1c0230 100644 --- a/bobores/locale/ru/bobores.cfg +++ b/bobores/locale/ru/bobores.cfg @@ -3,7 +3,7 @@ bob-gold-ore=Золотая руда bob-lead-ore=Галенит (Свинцовая руда) bob-silver-ore=Серебряная руда bob-tin-ore=Оловянная руда -bob-tungsten-ore=Вольфрамовая руда +tungsten-ore=Вольфрамовая руда bob-zinc-ore=Цинковая руда bob-bauxite-ore=Боксит (Алюминиевая руда) bob-rutile-ore=Рутил (Титановая руда) @@ -20,7 +20,7 @@ bob-gold-ore=__ENTITY__bob-gold-ore__ bob-lead-ore=__ENTITY__bob-lead-ore__ bob-silver-ore=__ENTITY__bob-silver-ore__ bob-tin-ore=__ENTITY__bob-tin-ore__ -bob-tungsten-ore=__ENTITY__bob-tungsten-ore__ +tungsten-ore=__ENTITY__bob-tungsten-ore__ bob-zinc-ore=__ENTITY__bob-zinc-ore__ bob-bauxite-ore=__ENTITY__bob-bauxite-ore__ bob-rutile-ore=__ENTITY__bob-rutile-ore__ @@ -48,7 +48,7 @@ bob-gold-ore=__ENTITY__bob-gold-ore__ bob-lead-ore=__ENTITY__bob-lead-ore__ bob-silver-ore=__ENTITY__bob-silver-ore__ bob-tin-ore=__ENTITY__bob-tin-ore__ -bob-tungsten-ore=__ENTITY__bob-tungsten-ore__ +tungsten-ore=__ENTITY__bob-tungsten-ore__ bob-zinc-ore=__ENTITY__bob-zinc-ore__ bob-bauxite-ore=__ENTITY__bob-bauxite-ore__ bob-rutile-ore=__ENTITY__bob-rutile-ore__ diff --git a/bobores/locale/th/bobores.cfg b/bobores/locale/th/bobores.cfg index 32c7954db..648845a3d 100644 --- a/bobores/locale/th/bobores.cfg +++ b/bobores/locale/th/bobores.cfg @@ -3,7 +3,7 @@ bob-gold-ore=แร่ทองคำ bob-lead-ore=Galena (แร่ตะกั่ว) bob-silver-ore=แร่เงิน bob-tin-ore=แร่ดีบุก -bob-tungsten-ore=แร่ทังสเตน +tungsten-ore=แร่ทังสเตน bob-zinc-ore=แร่สังกะสี bob-bauxite-ore=Bauxite (แร่อะลูมิเนียม) bob-rutile-ore=Rutile (แร่ไททาเนียม) diff --git a/bobores/locale/tr/bobores.cfg b/bobores/locale/tr/bobores.cfg index a31c76c33..b830c3768 100644 --- a/bobores/locale/tr/bobores.cfg +++ b/bobores/locale/tr/bobores.cfg @@ -3,7 +3,7 @@ bob-gold-ore=Altın cevheri bob-lead-ore=Galen (Kurşun cevheri) bob-silver-ore=Gümüş cevheri bob-tin-ore=Kalay cevheri -bob-tungsten-ore=Volfram cevheri +tungsten-ore=Volfram cevheri bob-zinc-ore=Çinko cevheri bob-bauxite-ore=Boksit (Alüminyum cevheri) bob-rutile-ore=Rutil (Titanyum cevheri) @@ -20,7 +20,7 @@ bob-gold-ore=__ENTITY__gold-ore__ bob-lead-ore=__ENTITY__lead-ore__ bob-silver-ore=__ENTITY__silver-ore__ bob-tin-ore=__ENTITY__tin-ore__ -bob-tungsten-ore=__ENTITY__tungsten-ore__ +tungsten-ore=__ENTITY__tungsten-ore__ bob-zinc-ore=__ENTITY__zinc-ore__ bob-bauxite-ore=__ENTITY__bauxite-ore__ bob-rutile-ore=__ENTITY__rutile-ore__ @@ -48,7 +48,7 @@ bob-gold-ore=__ENTITY__gold-ore__ bob-lead-ore=__ENTITY__lead-ore__ bob-silver-ore=__ENTITY__silver-ore__ bob-tin-ore=__ENTITY__tin-ore__ -bob-tungsten-ore=__ENTITY__tungsten-ore__ +tungsten-ore=__ENTITY__tungsten-ore__ bob-zinc-ore=__ENTITY__zinc-ore__ bob-bauxite-ore=__ENTITY__bauxite-ore__ bob-rutile-ore=__ENTITY__rutile-ore__ diff --git a/bobores/locale/uk/bobores.cfg b/bobores/locale/uk/bobores.cfg index 785807459..2dfeb59bd 100644 --- a/bobores/locale/uk/bobores.cfg +++ b/bobores/locale/uk/bobores.cfg @@ -3,7 +3,7 @@ bob-gold-ore=Золота руда bob-lead-ore=Галеніт (Свинцева руда) bob-silver-ore=Срібна руда bob-tin-ore=Олов'яна руда -bob-tungsten-ore=Вольфрамова руда +tungsten-ore=Вольфрамова руда bob-zinc-ore=Цинкова руда bob-bauxite-ore=Боксити (Алюмінієва руда) bob-rutile-ore=Рутил (Титанова руда) diff --git a/bobores/locale/zh-CN/bobores.cfg b/bobores/locale/zh-CN/bobores.cfg index 86bda9194..a1689a9bb 100644 --- a/bobores/locale/zh-CN/bobores.cfg +++ b/bobores/locale/zh-CN/bobores.cfg @@ -3,7 +3,7 @@ bob-gold-ore=金矿 bob-lead-ore=方铅矿 (铅矿) bob-silver-ore=银矿 bob-tin-ore=锡矿 -bob-tungsten-ore=钨矿 +tungsten-ore=钨矿 bob-zinc-ore=锌矿 bob-bauxite-ore=铝土矿 (铝矿) bob-rutile-ore=金红矿 (钛矿) diff --git a/bobores/locale/zh-TW/bobores.cfg b/bobores/locale/zh-TW/bobores.cfg index 11a2c84d1..eefafa6b1 100644 --- a/bobores/locale/zh-TW/bobores.cfg +++ b/bobores/locale/zh-TW/bobores.cfg @@ -3,7 +3,7 @@ bob-gold-ore=金礦 bob-lead-ore=方鉛礦（鉛礦） bob-silver-ore=銀礦 bob-tin-ore=錫礦 -bob-tungsten-ore=鎢礦 +tungsten-ore=鎢礦 bob-zinc-ore=鋅礦 bob-bauxite-ore=鋁土礦（鋁礦） bob-rutile-ore=金紅石（鈦礦） @@ -20,7 +20,7 @@ bob-gold-ore=__ENTITY__bob-gold-ore__ bob-lead-ore=__ENTITY__bob-lead-ore__ bob-silver-ore=__ENTITY__bob-silver-ore__ bob-tin-ore=__ENTITY__bob-tin-ore__ -bob-tungsten-ore=__ENTITY__bob-tungsten-ore__ +tungsten-ore=__ENTITY__bob-tungsten-ore__ bob-zinc-ore=__ENTITY__bob-zinc-ore__ bob-bauxite-ore=__ENTITY__bob-bauxite-ore__ bob-rutile-ore=__ENTITY__bob-rutile-ore__ @@ -48,7 +48,7 @@ bob-gold-ore=__ENTITY__bob-gold-ore__ bob-lead-ore=__ENTITY__bob-lead-ore__ bob-silver-ore=__ENTITY__bob-silver-ore__ bob-tin-ore=__ENTITY__bob-tin-ore__ -bob-tungsten-ore=__ENTITY__bob-tungsten-ore__ +tungsten-ore=__ENTITY__bob-tungsten-ore__ bob-zinc-ore=__ENTITY__bob-zinc-ore__ bob-bauxite-ore=__ENTITY__bob-bauxite-ore__ bob-rutile-ore=__ENTITY__bob-rutile-ore__ diff --git a/bobores/migrations/bobores_2.0.0.json b/bobores/migrations/bobores_2.0.0.json index 6db3b7f86..36d0d9939 100644 --- a/bobores/migrations/bobores_2.0.0.json +++ b/bobores/migrations/bobores_2.0.0.json @@ -23,7 +23,6 @@ ["silver-ore", "bob-silver-ore"], ["thorium-ore", "bob-thorium-ore"], ["tin-ore", "bob-tin-ore"], - ["tungsten-ore", "bob-tungsten-ore"], ["zinc-ore", "bob-zinc-ore"] ], "recipe": diff --git a/bobores/prototypes/tungsten-ore.lua b/bobores/prototypes/tungsten-ore.lua index bf2252b93..b3a8955d8 100644 --- a/bobores/prototypes/tungsten-ore.lua +++ b/bobores/prototypes/tungsten-ore.lua @@ -1,5 +1,5 @@ bobmods.ores.tungsten = { - name = "bob-tungsten-ore", + name = "tungsten-ore", tint = { r = 0.75, g = 0.5, b = 0.25 }, map_color = { r = 0.5, g = 0.0, b = 0.0 }, mining_time = 3, @@ -29,8 +29,8 @@ bobmods.ores.tungsten = { } function bobmods.ores.tungsten.create_autoplace() - data.raw.resource["bob-tungsten-ore"].autoplace = bobmods.lib.resource_autoplace.resource_autoplace_settings({ - name = "bob-tungsten-ore", + data.raw.resource["tungsten-ore"].autoplace = bobmods.lib.resource_autoplace.resource_autoplace_settings({ + name = "tungsten-ore", order = "c", base_density = 8, has_starting_area_placement = false, diff --git a/bobplates/locale/cs/bobplates.cfg b/bobplates/locale/cs/bobplates.cfg index 737c72c90..baef22729 100644 --- a/bobplates/locale/cs/bobplates.cfg +++ b/bobplates/locale/cs/bobplates.cfg @@ -3,7 +3,7 @@ bob-gold-ore=Zlatá ruda bob-lead-ore=Galenit (Olovo) bob-silver-ore=Stříbrná ruda bob-tin-ore=Cínová ruda -bob-tungsten-ore=Wolframová ruda +tungsten-ore=Wolframová ruda bob-zinc-ore=Zinková ruda bob-bauxite-ore=Bauxit (Hliníková ruda) bob-rutile-ore=Rutile (Titanová ruda) @@ -16,7 +16,7 @@ bob-gold-plate=Zlatý plát bob-lead-plate=Olověný plát bob-silver-plate=Stříbrný plát bob-tin-plate=Cínový plát -bob-tungsten-plate=Wolframový plát +tungsten-plate=Wolframový plát bob-zinc-plate=Zinkový plát bob-nickel-plate=Niklový plát bob-aluminium-plate=Hliníkový plát @@ -27,7 +27,7 @@ bob-lithium=Lithium bob-bronze-alloy=Bronzový plát bob-brass-alloy=Mosazový plát bob-copper-tungsten-alloy=Měděno-wolframový plát -bob-tungsten-carbide=Karbid-wolframový plát +tungsten-carbide=Karbid-wolframový plát bob-gunmetal-alloy=Děrovaný plát bob-invar-alloy=Invarový plát bob-nitinol-alloy=Nitinolový plát diff --git a/bobplates/locale/de/bobplates.cfg b/bobplates/locale/de/bobplates.cfg index 7ebe800e3..a541c43bb 100644 --- a/bobplates/locale/de/bobplates.cfg +++ b/bobplates/locale/de/bobplates.cfg @@ -3,7 +3,7 @@ bob-gold-ore=Golderz bob-lead-ore=Galenit (Bleierz) bob-silver-ore=Silbererz bob-tin-ore=Zinnerz -bob-tungsten-ore=Wolframerz +tungsten-ore=Wolframerz bob-zinc-ore=Zinkerz bob-bauxite-ore=Bauxit (Aluminiumerz) bob-rutile-ore=Rutil (Titanerz) @@ -16,7 +16,7 @@ bob-gold-plate=Goldplatte bob-lead-plate=Bleiplatte bob-silver-plate=Silberplatte bob-tin-plate=Zinnplatte -bob-tungsten-plate=Wolframplatte +tungsten-plate=Wolframplatte bob-zinc-plate=Zinkplatte bob-nickel-plate=Nickelplatte bob-aluminium-plate=Aluminiumplatte @@ -28,7 +28,7 @@ bob-lithium=Lithium bob-bronze-alloy=Bronzeplatte bob-brass-alloy=Messingplatte bob-copper-tungsten-alloy=Kupfer-Wolframplatte -bob-tungsten-carbide=Wolframkarbidplatte +tungsten-carbide=Wolframkarbidplatte bob-gunmetal-alloy=Rotguss bob-invar-alloy=Invarplatte bob-nitinol-alloy=Nitinolplatte diff --git a/bobplates/locale/en/bobplates.cfg b/bobplates/locale/en/bobplates.cfg index 59b9a77db..0995389d5 100644 --- a/bobplates/locale/en/bobplates.cfg +++ b/bobplates/locale/en/bobplates.cfg @@ -3,7 +3,7 @@ bob-gold-ore=Gold ore bob-lead-ore=Galena (Lead ore) bob-silver-ore=Silver ore bob-tin-ore=Tin ore -bob-tungsten-ore=Tungsten ore +tungsten-ore=Tungsten ore bob-zinc-ore=Zinc ore bob-bauxite-ore=Bauxite (Aluminium ore) bob-rutile-ore=Rutile (Titanium ore) @@ -16,7 +16,7 @@ bob-gold-plate=Gold plate bob-lead-plate=Lead plate bob-silver-plate=Silver plate bob-tin-plate=Tin plate -bob-tungsten-plate=Tungsten plate +tungsten-plate=Tungsten plate bob-zinc-plate=Zinc plate bob-nickel-plate=Nickel plate bob-aluminium-plate=Aluminium plate @@ -28,7 +28,7 @@ bob-lithium=Lithium bob-bronze-alloy=Bronze plate bob-brass-alloy=Brass plate bob-copper-tungsten-alloy=Copper tungsten plate -bob-tungsten-carbide=Tungsten carbide plate +tungsten-carbide=Tungsten carbide plate bob-gunmetal-alloy=Gunmetal plate bob-invar-alloy=Invar plate bob-nitinol-alloy=Nitinol plate diff --git a/bobplates/locale/es-ES/bobplates.cfg b/bobplates/locale/es-ES/bobplates.cfg index 84e2dd7ee..e628e54e5 100644 --- a/bobplates/locale/es-ES/bobplates.cfg +++ b/bobplates/locale/es-ES/bobplates.cfg @@ -3,7 +3,7 @@ bob-gold-ore=Mena de oro bob-lead-ore=Galena (Mena de plomo) bob-silver-ore=Mena de plata bob-tin-ore=Mena de estaño -bob-tungsten-ore=Mena de tungsteno +tungsten-ore=Mena de tungsteno bob-zinc-ore=Mena de zinc bob-bauxite-ore=Bauxita (Mena de aluminio) bob-rutile-ore=Rutilo (Mena de titanio) @@ -16,7 +16,7 @@ bob-gold-plate=Placa de oro bob-lead-plate=Placa de plomo bob-silver-plate=Placa de plata bob-tin-plate=Placa de estaño -bob-tungsten-plate=Placa de tungsteno +tungsten-plate=Placa de tungsteno bob-zinc-plate=Placa de zinc bob-nickel-plate=Placa de níquel bob-aluminium-plate=Placa de aluminio @@ -27,7 +27,7 @@ bob-lithium=Litio bob-bronze-alloy=Placa de bronce bob-brass-alloy=Placa de latón bob-copper-tungsten-alloy=Placa de cobre de tungsteno -bob-tungsten-carbide=Placa de carburo de tungsteno +tungsten-carbide=Placa de carburo de tungsteno bob-gunmetal-alloy=Placa de bronce de cañón bob-invar-alloy=Placa de invar bob-nitinol-alloy=Placa de nitinol diff --git a/bobplates/locale/fr/bobplates.cfg b/bobplates/locale/fr/bobplates.cfg index 72440b95a..d730ad962 100644 --- a/bobplates/locale/fr/bobplates.cfg +++ b/bobplates/locale/fr/bobplates.cfg @@ -3,7 +3,7 @@ bob-gold-ore=Minerai d'or bob-lead-ore=Galène (Minerai de plomb) bob-silver-ore=Minerai d'argent bob-tin-ore=Cassitérite (Minerai d'étain) -bob-tungsten-ore=Minerai de tungstène +tungsten-ore=Minerai de tungstène bob-zinc-ore=Minerai de zinc bob-bauxite-ore=Bauxite (Minerai d'aluminium) bob-rutile-ore=Rutile (Minerai de titane) @@ -16,7 +16,7 @@ bob-gold-plate=Plaque d'or bob-lead-plate=Plaque de plomb bob-silver-plate=Plaque d'argent bob-tin-plate=Plaque d'étain -bob-tungsten-plate=Plaque de tungstène +tungsten-plate=Plaque de tungstène bob-zinc-plate=Plaque de zinc bob-nickel-plate=Plaque de nickel bob-aluminium-plate=Plaque d'aluminium @@ -27,7 +27,7 @@ bob-lithium=Lithium bob-bronze-alloy=Plaque de bronze bob-brass-alloy=Plaque de laiton bob-copper-tungsten-alloy=Plaque d'alliage cuivre-tungstène -bob-tungsten-carbide=Plaque de carbure de tungstène +tungsten-carbide=Plaque de carbure de tungstène bob-gunmetal-alloy=Plaque d'alliage gunmetal bob-invar-alloy=Plaque d'alliage invar bob-nitinol-alloy=Plaque d'alliage nitinol diff --git a/bobplates/locale/id/bobplates.cfg b/bobplates/locale/id/bobplates.cfg index 60a990ca1..a61ddb0ea 100644 --- a/bobplates/locale/id/bobplates.cfg +++ b/bobplates/locale/id/bobplates.cfg @@ -3,7 +3,7 @@ bob-gold-ore=Bijih emas bob-lead-ore=Galena (bijih timbal) bob-silver-ore=Bijih perak bob-tin-ore=Bijih timah -bob-tungsten-ore=Bijih wolfram +tungsten-ore=Bijih wolfram bob-zinc-ore=Bijih seng bob-bauxite-ore=Bauksit (bijih aluminium) bob-rutile-ore=Rutil (bijih titanium) @@ -16,7 +16,7 @@ bob-gold-plate=Pelat emas bob-lead-plate=Pelat timbal bob-silver-plate=Pelat perak bob-tin-plate=Pelat timah -bob-tungsten-plate=Pelat wolfram +tungsten-plate=Pelat wolfram bob-zinc-plate=Pelat seng bob-nickel-plate=Pelat nikel bob-aluminium-plate=Pelat aluminium @@ -27,7 +27,7 @@ bob-lithium=Litium bob-bronze-alloy=Pelat perunggu bob-brass-alloy=Pelat kuningan bob-copper-tungsten-alloy=Pelat tembaga wolfram -bob-tungsten-carbide=Pelat wolfram karbida +tungsten-carbide=Pelat wolfram karbida bob-gunmetal-alloy=Pelat logam senapan bob-invar-alloy=Pelat invar bob-nitinol-alloy=Pelat nitinol diff --git a/bobplates/locale/it/bobplates.cfg b/bobplates/locale/it/bobplates.cfg index 739b43c6b..3f48e1199 100644 --- a/bobplates/locale/it/bobplates.cfg +++ b/bobplates/locale/it/bobplates.cfg @@ -3,7 +3,7 @@ bob-gold-ore=Oro bob-lead-ore=Piombo bob-silver-ore=Argento bob-tin-ore=Stagno -bob-tungsten-ore=Tungsteno +tungsten-ore=Tungsteno bob-zinc-ore=Zinco bob-bauxite-ore=Bauxite (Alluminio) bob-rutile-ore=Rutilo (Titanio) @@ -16,7 +16,7 @@ bob-gold-plate=Piastra d'oro bob-lead-plate=Piastra di piombo bob-silver-plate=Piastra d'argento bob-tin-plate=Piastra di stagno -bob-tungsten-plate=Piastra di tungsteno +tungsten-plate=Piastra di tungsteno bob-zinc-plate=Piastra di zinco bob-nickel-plate=Piastra di nichel bob-aluminium-plate=Piastra di alluminio @@ -27,7 +27,7 @@ bob-lithium=Litio bob-bronze-alloy=Piastra di bronzo bob-brass-alloy=Piastra di ottone bob-copper-tungsten-alloy=Piastra di lega rame-tungsteno -bob-tungsten-carbide=Piastra di carburo di tungsteno +tungsten-carbide=Piastra di carburo di tungsteno bob-gunmetal-alloy=Piastra di lega bronzo duro bob-invar-alloy=Piastra di lega invar bob-nitinol-alloy=Piastra di lega nitinol diff --git a/bobplates/locale/ja/bobplates.cfg b/bobplates/locale/ja/bobplates.cfg index b6fbcb131..6c76f6fe0 100644 --- a/bobplates/locale/ja/bobplates.cfg +++ b/bobplates/locale/ja/bobplates.cfg @@ -3,7 +3,7 @@ bob-gold-ore=金鉱石 bob-lead-ore=鉛鉱石 bob-silver-ore=銀鉱石 bob-tin-ore=錫鉱石 -bob-tungsten-ore=タングステン鉱石 +tungsten-ore=タングステン鉱石 bob-zinc-ore=亜鉛鉱石 bob-bauxite-ore=アルミニウム鉱石 bob-rutile-ore=チタニウム鉱石 @@ -16,7 +16,7 @@ bob-gold-plate=金プレート bob-lead-plate=鉛プレート bob-silver-plate=銀プレート bob-tin-plate=錫プレート -bob-tungsten-plate=タングステンプレート +tungsten-plate=タングステンプレート bob-zinc-plate=亜鉛プレート bob-nickel-plate=ニッケルプレート bob-aluminium-plate=アルミニウムプレート @@ -27,7 +27,7 @@ bob-lithium=リチウム bob-bronze-alloy=ブロンズプレート bob-brass-alloy=真ちゅうプレート bob-copper-tungsten-alloy=銅タングステンプレート -bob-tungsten-carbide=炭化タングステンプレート +tungsten-carbide=炭化タングステンプレート bob-gunmetal-alloy=ガンメタルプレート bob-invar-alloy=インバープレート bob-nitinol-alloy=ニチノールプレート diff --git a/bobplates/locale/ko/bobplates.cfg b/bobplates/locale/ko/bobplates.cfg index 4f71fbcc3..28706a8a0 100644 --- a/bobplates/locale/ko/bobplates.cfg +++ b/bobplates/locale/ko/bobplates.cfg @@ -10,7 +10,7 @@ bob-gold-ore=금 광석 bob-lead-ore=납 광석 bob-silver-ore=은 광석 bob-tin-ore=주석 광석 -bob-tungsten-ore=텅스텐 광석 +tungsten-ore=텅스텐 광석 bob-zinc-ore=아연 광석 bob-bauxite-ore=알루미늄 광석 bob-rutile-ore=티타늄 광석 @@ -22,7 +22,7 @@ bob-gold-plate=금 판 bob-lead-plate=납 판 bob-silver-plate=은 판 bob-tin-plate=주석 판 -bob-tungsten-plate=텅스텐 판 +tungsten-plate=텅스텐 판 bob-zinc-plate=아연 판 bob-nickel-plate=니켈 판 bob-aluminium-plate=알루미늄 판 @@ -32,7 +32,7 @@ bob-lithium=리튬 bob-bronze-alloy=청동 판 bob-brass-alloy=황동 판 bob-copper-tungsten-alloy=구리-텅스텐 판 -bob-tungsten-carbide=탄화 텅스텐 판 +tungsten-carbide=탄화 텅스텐 판 bob-gunmetal-alloy=포금 판 bob-invar-alloy=인바 판 bob-nitinol-alloy=니티놀 판 diff --git a/bobplates/locale/nl/bobplates.cfg b/bobplates/locale/nl/bobplates.cfg index bc37e4150..fbdfbe654 100644 --- a/bobplates/locale/nl/bobplates.cfg +++ b/bobplates/locale/nl/bobplates.cfg @@ -3,7 +3,7 @@ bob-gold-ore=Gouderts bob-lead-ore=Galeniet (Looderts) bob-silver-ore=Zilvererts bob-tin-ore=Tinerts -bob-tungsten-ore=Wolfraamerts +tungsten-ore=Wolfraamerts bob-zinc-ore=Zinkerts bob-bauxite-ore=Bauxiet (Aluminiumerts) bob-rutile-ore=Rutiel (Titaniumerts) @@ -16,7 +16,7 @@ bob-gold-plate=Gouden plaat bob-lead-plate=Loden plaat bob-silver-plate=Zilveren plaat bob-tin-plate=Tinnen plaat -bob-tungsten-plate=Wolframen plaat +tungsten-plate=Wolframen plaat bob-zinc-plate=Zinken plaat bob-nickel-plate=Nikkel plaat bob-aluminium-plate=Aluminium plaat @@ -27,7 +27,7 @@ bob-lithium=Lithium bob-bronze-alloy=Bronzen plaat bob-brass-alloy=Messing plaat bob-copper-tungsten-alloy=Koper-wolframen plaat -bob-tungsten-carbide=Wolfraamcarbide plaat +tungsten-carbide=Wolfraamcarbide plaat bob-gunmetal-alloy=Rode messing plaat bob-invar-alloy=Invar plaat bob-nitinol-alloy=Nitinol plaat diff --git a/bobplates/locale/pl/bobplates.cfg b/bobplates/locale/pl/bobplates.cfg index 1480252ee..a83467c1a 100644 --- a/bobplates/locale/pl/bobplates.cfg +++ b/bobplates/locale/pl/bobplates.cfg @@ -3,7 +3,7 @@ bob-gold-ore=Ruda złota bob-lead-ore=Galena (Ruda ołowiu) bob-silver-ore=Ruda srebra bob-tin-ore=Ruda cyny -bob-tungsten-ore=Ruda wolframu +tungsten-ore=Ruda wolframu bob-zinc-ore=Ruda cynku bob-bauxite-ore=Boksyt (Rudy aluminium) bob-rutile-ore=Tytanit (Ruda tytanu) @@ -16,7 +16,7 @@ bob-gold-plate=Złota płytka bob-lead-plate=Ołowiana płytka bob-silver-plate=Srebrna płytka bob-tin-plate=Cynowa płytka -bob-tungsten-plate=Wolframowa płytka +tungsten-plate=Wolframowa płytka bob-zinc-plate=Cynkowa płytka bob-nickel-plate=Niklowa płytka bob-aluminium-plate=Aluminiowa płytka @@ -27,7 +27,7 @@ bob-lithium=Lit bob-bronze-alloy=Brązowa płytka bob-brass-alloy=Mosiężna płytka bob-copper-tungsten-alloy=Miedziowo-wolframowa płytka -bob-tungsten-carbide=Wolframowo-karbidowa płytka +tungsten-carbide=Wolframowo-karbidowa płytka bob-gunmetal-alloy=Spiżowa płytka bob-invar-alloy=Inwarowa płytka bob-nitinol-alloy=Nitinolowa płytka diff --git a/bobplates/locale/pt-BR/bobplates.cfg b/bobplates/locale/pt-BR/bobplates.cfg index 6016e8aaf..cd4a8d289 100644 --- a/bobplates/locale/pt-BR/bobplates.cfg +++ b/bobplates/locale/pt-BR/bobplates.cfg @@ -3,7 +3,7 @@ bob-gold-ore=Minério de ouro bob-lead-ore=Galena (Minério de chumbo) bob-silver-ore=Minério de prata bob-tin-ore=Minério de estanho -bob-tungsten-ore=Minério de tungstênio +tungsten-ore=Minério de tungstênio bob-zinc-ore=Minério de zinco bob-bauxite-ore=Bauxita (Minério de alumínio) bob-rutile-ore=Rutilo (Minério de titânio) @@ -16,7 +16,7 @@ bob-gold-plate=Placa de ouro bob-lead-plate=Placa de chumbo bob-silver-plate=Placa de prata bob-tin-plate=Placa de estanho -bob-tungsten-plate=Placa de tungstênio +tungsten-plate=Placa de tungstênio bob-zinc-plate=Placa de zinco bob-nickel-plate=Placa de níquel bob-aluminium-plate=Placa de alumínio @@ -27,7 +27,7 @@ bob-lithium=Lítio bob-bronze-alloy=Placa de bronze bob-brass-alloy=Placa de latão bob-copper-tungsten-alloy=Placa de cobre de tungstênio -bob-tungsten-carbide=Placa de carbeto de tungstênio +tungsten-carbide=Placa de carbeto de tungstênio bob-gunmetal-alloy=Placa de bronze vermelho bob-invar-alloy=Placa de invar bob-nitinol-alloy=Placa de nitinol diff --git a/bobplates/locale/pt/bobplates.cfg b/bobplates/locale/pt/bobplates.cfg index 0ac9675e8..b9eefef6d 100644 --- a/bobplates/locale/pt/bobplates.cfg +++ b/bobplates/locale/pt/bobplates.cfg @@ -3,7 +3,7 @@ bob-gold-ore=Minério de ouro bob-lead-ore=Galena bob-silver-ore=Minério de prata bob-tin-ore=Minério de Tin -bob-tungsten-ore=Minério de tungênia +tungsten-ore=Minério de tungênia bob-bauxite-ore=Bauxite bob-rutile-ore=Rutilo bob-nickel-ore=Minério de níquel diff --git a/bobplates/locale/ru/bobplates.cfg b/bobplates/locale/ru/bobplates.cfg index 10c44100a..38e2e1e82 100644 --- a/bobplates/locale/ru/bobplates.cfg +++ b/bobplates/locale/ru/bobplates.cfg @@ -3,7 +3,7 @@ bob-gold-ore=Золотая руда bob-lead-ore=Галенит (Свинцовая руда) bob-silver-ore=Серебряная руда bob-tin-ore=Оловянная руда -bob-tungsten-ore=Вольфрамовая руда +tungsten-ore=Вольфрамовая руда bob-zinc-ore=Цинковая руда bob-bauxite-ore=Боксит (Алюминиевая руда) bob-rutile-ore=Рутил (Титановая руда) @@ -16,7 +16,7 @@ bob-gold-plate=Золотая пластина bob-lead-plate=Свинцовая пластина bob-silver-plate=Серебряная пластина bob-tin-plate=Оловянная пластина -bob-tungsten-plate=Вольфрамовая пластина +tungsten-plate=Вольфрамовая пластина bob-zinc-plate=Цинковая пластина bob-nickel-plate=Никелевая пластина bob-aluminium-plate=Алюминиевая пластина @@ -28,7 +28,7 @@ bob-lithium=Литий bob-bronze-alloy=Бронзовая пластина bob-brass-alloy=Латунная пластина bob-copper-tungsten-alloy=Медно-вольфрамовая пластина -bob-tungsten-carbide=Пластина из карбида вольфрама +tungsten-carbide=Пластина из карбида вольфрама bob-gunmetal-alloy=Пушечная бронза bob-invar-alloy=Инварная пластина bob-nitinol-alloy=Нитиноловая пластина diff --git a/bobplates/locale/th/bobplates.cfg b/bobplates/locale/th/bobplates.cfg index 325af47d6..21cae5f1b 100644 --- a/bobplates/locale/th/bobplates.cfg +++ b/bobplates/locale/th/bobplates.cfg @@ -3,7 +3,7 @@ bob-gold-ore=แร่ทองคำ bob-lead-ore=Galena (แร่ตะกั่ว) bob-silver-ore=แร่เงิน bob-tin-ore=แร่ดีบุก -bob-tungsten-ore=แร่ทังสเตน +tungsten-ore=แร่ทังสเตน bob-zinc-ore=แร่สังกะสี bob-bauxite-ore=Bauxite (แร่อะลูมิเนียม) bob-rutile-ore=Rutile (แร่ไททาเนียม) @@ -15,7 +15,7 @@ bob-gold-plate=แผ่นทอง bob-lead-plate=แผ่นตะกั่ว bob-silver-plate=แผ่นเงิน bob-tin-plate=แผ่นดีบุก -bob-tungsten-plate=แผ่นทังสเตน +tungsten-plate=แผ่นทังสเตน bob-zinc-plate=แผ่นสังกะสี bob-nickel-plate=แผ่นนิกเกิล bob-aluminium-plate=แผ่นโลหะอะลูมิเนียม @@ -26,7 +26,7 @@ bob-lithium=ลิเธียม bob-bronze-alloy=แผ่นโลหะทองเหลือง bob-brass-alloy=แผ่นทองเหลือง bob-copper-tungsten-alloy=แผ่นโลหะทองแดง-ทังสเตน -bob-tungsten-carbide=แผ่นโลหะทังสเตนคาร์ไบด์ +tungsten-carbide=แผ่นโลหะทังสเตนคาร์ไบด์ bob-gunmetal-alloy=แผ่นโลหะสำหรับอาวุธ bob-invar-alloy=แผ่นโลหะอินวาร์ bob-nitinol-alloy=แผ่นโลหะผสมนิกเกิลไททาเนียม diff --git a/bobplates/locale/tr/bobplates.cfg b/bobplates/locale/tr/bobplates.cfg index 637832f24..0e4d42e74 100644 --- a/bobplates/locale/tr/bobplates.cfg +++ b/bobplates/locale/tr/bobplates.cfg @@ -3,7 +3,7 @@ bob-gold-ore=Altın cevheri bob-lead-ore=Galen (Kurşun cevheri) bob-silver-ore=Gümüş cevheri bob-tin-ore=Kalay cevheri -bob-tungsten-ore=Volfram cevheri +tungsten-ore=Volfram cevheri bob-zinc-ore=Çinko cevheri bob-bauxite-ore=Boksit (Alüminyum cevheri) bob-rutile-ore=Rutil (Titanyum cevheri) @@ -16,7 +16,7 @@ bob-gold-plate=Altın levha bob-lead-plate=Kurşun levha bob-silver-plate=Gümüş levha bob-tin-plate=Kalay levha -bob-tungsten-plate=Volfram levha +tungsten-plate=Volfram levha bob-zinc-plate=Çinko levha bob-nickel-plate=Nikel levha bob-aluminium-plate=Alüminyum levha @@ -27,7 +27,7 @@ bob-lithium=Lityum bob-bronze-alloy=Tunç levha bob-brass-alloy=Pirinç levha bob-copper-tungsten-alloy=Bakır-volfram levha -bob-tungsten-carbide=Volfram karbür levha +tungsten-carbide=Volfram karbür levha bob-gunmetal-alloy=Top metali levha bob-invar-alloy=Invar levha bob-nitinol-alloy=Nitinol levha diff --git a/bobplates/locale/uk/bobplates.cfg b/bobplates/locale/uk/bobplates.cfg index 4b03734ed..6bb7b1ec4 100644 --- a/bobplates/locale/uk/bobplates.cfg +++ b/bobplates/locale/uk/bobplates.cfg @@ -3,7 +3,7 @@ bob-gold-ore=Золота руда bob-lead-ore=Галеніт (Свинцева руда) bob-silver-ore=Срібна руда bob-tin-ore=Олов'яна руда -bob-tungsten-ore=Вольфрамова руда +tungsten-ore=Вольфрамова руда bob-zinc-ore=Цинкова руда bob-bauxite-ore=Боксити (Алюмінієва руда) bob-rutile-ore=Рутил (Титанова руда) @@ -16,7 +16,7 @@ bob-gold-plate=Золота пластина bob-lead-plate=Свинцева пластина bob-silver-plate=Срібний злиток bob-tin-plate=Олов'яна пластина -bob-tungsten-plate=Вольфрамова балка +tungsten-plate=Вольфрамова балка bob-zinc-plate=Цинкова пластина bob-nickel-plate=Нікелевий злиток bob-aluminium-plate=Алюмінієва пластина @@ -27,7 +27,7 @@ bob-lithium=Літій bob-bronze-alloy=Бронзова пластина bob-brass-alloy=Латунна пластина bob-copper-tungsten-alloy=Мідно-вольфрамова балка -bob-tungsten-carbide=Вольфрам-карбітова пластина +tungsten-carbide=Вольфрам-карбітова пластина bob-gunmetal-alloy=Гарматна бронза bob-invar-alloy=Інварний злиток bob-nitinol-alloy=Злиток нітинолу diff --git a/bobplates/locale/zh-CN/bobplates.cfg b/bobplates/locale/zh-CN/bobplates.cfg index 32ac6b79d..378e6aace 100644 --- a/bobplates/locale/zh-CN/bobplates.cfg +++ b/bobplates/locale/zh-CN/bobplates.cfg @@ -3,7 +3,7 @@ bob-gold-ore=金矿 bob-lead-ore=方铅矿（铅矿） bob-silver-ore=银矿 bob-tin-ore=锡矿 -bob-tungsten-ore=钨矿 +tungsten-ore=钨矿 bob-zinc-ore=锌矿 bob-bauxite-ore=铝土矿（铝矿） bob-rutile-ore=金红矿（钛矿） @@ -16,7 +16,7 @@ bob-gold-plate=金板 bob-lead-plate=铅板 bob-silver-plate=银板 bob-tin-plate=锡板 -bob-tungsten-plate=钨板 +tungsten-plate=钨板 bob-zinc-plate=锌板 bob-nickel-plate=镍板 bob-aluminium-plate=铝板 @@ -27,7 +27,7 @@ bob-lithium=锂 bob-bronze-alloy=青铜板 bob-brass-alloy=黄铜板 bob-copper-tungsten-alloy=钨铜合金板 -bob-tungsten-carbide=碳化钨板 +tungsten-carbide=碳化钨板 bob-gunmetal-alloy=炮铜板 bob-invar-alloy=殷钢板 bob-nitinol-alloy=镍钛合金板 diff --git a/bobplates/locale/zh-TW/bobplates.cfg b/bobplates/locale/zh-TW/bobplates.cfg index 2439289d7..c940a4b0a 100644 --- a/bobplates/locale/zh-TW/bobplates.cfg +++ b/bobplates/locale/zh-TW/bobplates.cfg @@ -3,7 +3,7 @@ bob-gold-ore=金礦 bob-lead-ore=方鉛礦（鉛礦） bob-silver-ore=銀礦 bob-tin-ore=錫礦 -bob-tungsten-ore=鎢礦 +tungsten-ore=鎢礦 bob-zinc-ore=鋅礦 bob-bauxite-ore=鋁土礦（鋁礦） bob-rutile-ore=金紅石（鈦礦） @@ -16,7 +16,7 @@ bob-gold-plate=金板 bob-lead-plate=鉛板 bob-silver-plate=銀板 bob-tin-plate=錫板 -bob-tungsten-plate=鎢板 +tungsten-plate=鎢板 bob-zinc-plate=鋅板 bob-nickel-plate=鎳板 bob-aluminium-plate=鋁板 @@ -28,7 +28,7 @@ bob-lithium=鋰 bob-bronze-alloy=青銅板 bob-brass-alloy=黃銅板 bob-copper-tungsten-alloy=銅鎢合金板 -bob-tungsten-carbide=碳化鎢板 +tungsten-carbide=碳化鎢板 bob-gunmetal-alloy=砲金板 bob-invar-alloy=因瓦合金板 bob-nitinol-alloy=記憶合金板 diff --git a/bobplates/migrations/bobplates_2.0.0.json b/bobplates/migrations/bobplates_2.0.0.json index 8fa68a955..92ff1dd39 100644 --- a/bobplates/migrations/bobplates_2.0.0.json +++ b/bobplates/migrations/bobplates_2.0.0.json @@ -186,11 +186,8 @@ ["topaz-3", "bob-topaz-3"], ["topaz-4", "bob-topaz-4"], ["topaz-5", "bob-topaz-5"], - ["tungsten-carbide", "bob-tungsten-carbide"], ["tungsten-gear-wheel", "bob-tungsten-gear-wheel"], - ["tungsten-ore", "bob-tungsten-ore"], ["tungsten-oxide", "bob-tungsten-oxide"], - ["tungsten-plate", "bob-tungsten-plate"], ["tungstic-acid-barrel", "bob-tungstic-acid-barrel"], ["used-up-deuterium-fuel-cell", "bob-depleted-deuterium-fuel-cell"], ["used-up-thorium-fuel-cell", "bob-depleted-thorium-fuel-cell"], @@ -382,11 +379,8 @@ ["topaz-3", "bob-topaz-3"], ["topaz-4", "bob-topaz-4"], ["topaz-5", "bob-topaz-5"], - ["tungsten-carbide", "bob-tungsten-carbide"], - ["tungsten-carbide-2", "bob-tungsten-carbide-2"], ["tungsten-gear-wheel", "bob-tungsten-gear-wheel"], ["tungsten-oxide", "bob-tungsten-oxide"], - ["tungsten-plate", "bob-tungsten-plate"], ["tungstic-acid", "bob-tungstic-acid"], ["void-chlorine", "void-bob-chlorine"], ["void-deuterium", "void-bob-deuterium"], diff --git a/bobplates/migrations/bobplates_2.0.6.json b/bobplates/migrations/bobplates_2.0.6.json index 0bd48cfa3..030cff7c0 100644 --- a/bobplates/migrations/bobplates_2.0.6.json +++ b/bobplates/migrations/bobplates_2.0.6.json @@ -4,7 +4,9 @@ ["bob-carbon", "carbon"], ["bob-lithium", "lithium"], ["bob-lithium-ion-battery", "bob-battery-2"], - ["bob-silver-zinc-battery", "bob-battery-3"] + ["bob-silver-zinc-battery", "bob-battery-3"], + ["bob-tungsten-carbide", "tungsten-carbide"], + ["bob-tungsten-plate", "tungsten-plate"] ], "recipe": [ @@ -15,6 +17,8 @@ ["bob-lithium-ion-battery-recycling", "bob-battery-2-recycling"], ["bob-lithium-recycling", "lithium-recycling"], ["bob-silver-zinc-battery", "bob-battery-3"], - ["bob-silver-zinc-battery-recycling", "bob-battery-3-recycling"] + ["bob-silver-zinc-battery-recycling", "bob-battery-3-recycling"], + ["bob-tungsten-carbide", "tungsten-carbide"], + ["bob-tungsten-plate", "tungsten-plate"] ] } diff --git a/bobplates/prototypes/item/alloys.lua b/bobplates/prototypes/item/alloys.lua index e9b74f519..22177c970 100644 --- a/bobplates/prototypes/item/alloys.lua +++ b/bobplates/prototypes/item/alloys.lua @@ -47,19 +47,6 @@ data:extend({ pick_sound = plate_pick, weight = 2500, }, - { - type = "item", - name = "bob-tungsten-carbide", - icon = "__bobplates__/graphics/icons/plate/tungsten-carbide-plate.png", - icon_size = 64, - subgroup = "bob-alloy", - order = "c-b-d[bob-tungsten-carbide]", - stack_size = 200, - drop_sound = plate_drop_move, - inventory_move_sound = plate_drop_move, - pick_sound = plate_pick, - weight = 1250, - }, { type = "item", name = "bob-gunmetal-alloy", @@ -114,3 +101,25 @@ data:extend({ weight = 2500, }, }) + +if not data.raw.item["tungsten-carbide"] then + data:extend({ + { + type = "item", + name = "tungsten-carbide", + icon = "__bobplates__/graphics/icons/plate/tungsten-carbide-plate.png", + icon_size = 64, + subgroup = "bob-alloy", + order = "c-b-d[tungsten-carbide]", + stack_size = 200, + drop_sound = plate_drop_move, + inventory_move_sound = plate_drop_move, + pick_sound = plate_pick, + weight = 1250, + }, + }) +else + local item = data.raw.item["tungsten-carbide"] + item.subgroup = "bob-alloy" + item.order = "c-b-d[tungsten-carbide]" +end diff --git a/bobplates/prototypes/item/plates.lua b/bobplates/prototypes/item/plates.lua index dacd6e100..1722b941b 100644 --- a/bobplates/prototypes/item/plates.lua +++ b/bobplates/prototypes/item/plates.lua @@ -109,19 +109,6 @@ data:extend({ pick_sound = plate_pick, weight = 500, }, - { - type = "item", - name = "bob-tungsten-plate", - icon = "__bobplates__/graphics/icons/plate/tungsten-plate.png", - icon_size = 32, - subgroup = "bob-material", - order = "c-a-i[bob-tungsten-plate]", - stack_size = 200, - drop_sound = plate_drop_move, - inventory_move_sound = plate_drop_move, - pick_sound = plate_pick, - weight = 2500, - }, { type = "item", name = "bob-silicon-plate", @@ -177,3 +164,25 @@ if not data.raw.item["lithium-plate"] then }, }) end + +if not data.raw.item["tungsten-plate"] then + data:extend({ + { + type = "item", + name = "tungsten-plate", + icon = "__bobplates__/graphics/icons/plate/tungsten-plate.png", + icon_size = 32, + subgroup = "bob-material", + order = "c-a-i[bob-tungsten-plate]", + stack_size = 200, + drop_sound = plate_drop_move, + inventory_move_sound = plate_drop_move, + pick_sound = plate_pick, + weight = 2500, + }, + }) +else + local item = data.raw.item["tungsten-plate"] + item.subgroup = "bob-material" + item.order = "c-a-i[bob-tungsten-plate]" +end diff --git a/bobplates/prototypes/recipe/alloy-recipe.lua b/bobplates/prototypes/recipe/alloy-recipe.lua index 3eb1ef046..bfc0b7276 100644 --- a/bobplates/prototypes/recipe/alloy-recipe.lua +++ b/bobplates/prototypes/recipe/alloy-recipe.lua @@ -50,41 +50,6 @@ data:extend({ allow_decomposition = false, allow_productivity = true, }, - { - type = "recipe", - name = "bob-tungsten-carbide", - enabled = false, - auto_recycle = false, - category = "bob-mixing-furnace", - energy_required = 6.4, - ingredients = { - { type = "item", name = "carbon", amount = 1 }, - { type = "item", name = "bob-tungsten-oxide", amount = 1 }, - }, - results = { - { type = "item", name = "bob-tungsten-carbide", amount = 2 }, - }, - allow_decomposition = false, - allow_productivity = true, - }, - { - type = "recipe", - name = "bob-tungsten-carbide-2", - localised_name = { "item-name.bob-tungsten-carbide" }, - enabled = false, - auto_recycle = false, - category = "bob-mixing-furnace", - energy_required = 12.8, - ingredients = { - { type = "item", name = "carbon", amount = 1 }, - { type = "item", name = "bob-powdered-tungsten", amount = 1 }, - }, - results = { - { type = "item", name = "bob-tungsten-carbide", amount = 2 }, - }, - allow_decomposition = false, - allow_productivity = true, - }, { type = "recipe", name = "bob-gunmetal-alloy", @@ -155,3 +120,27 @@ data:extend({ allow_productivity = true, }, }) + +if not mods["space-age"] then + data:extend({ + { + type = "recipe", + name = "tungsten-carbide", + enabled = false, + auto_recycle = false, + category = "bob-mixing-furnace", + energy_required = 6.4, + ingredients = { + { type = "item", name = "carbon", amount = 1 }, + { type = "item", name = "bob-powdered-tungsten", amount = 1 }, + }, + results = { + { type = "item", name = "tungsten-carbide", amount = 2 }, + }, + allow_decomposition = false, + allow_productivity = true, + }, + }) +else + bobmods.lib.recipe.replace_ingredient("tungsten-carbide", "tungsten-ore", "bob-powdered-tungsten") +end diff --git a/bobplates/prototypes/recipe/chemistry-recipe.lua b/bobplates/prototypes/recipe/chemistry-recipe.lua index fa57d2c56..adc39af04 100644 --- a/bobplates/prototypes/recipe/chemistry-recipe.lua +++ b/bobplates/prototypes/recipe/chemistry-recipe.lua @@ -916,7 +916,7 @@ data:extend({ enabled = false, energy_required = 2, ingredients = { - { type = "item", name = "bob-tungsten-ore", amount = 2 }, + { type = "item", name = "tungsten-ore", amount = 2 }, { type = "fluid", name = "bob-hydrogen-chloride", amount = 50 }, }, results = { diff --git a/bobplates/prototypes/recipe/parts-recipe.lua b/bobplates/prototypes/recipe/parts-recipe.lua index 5c76f0c2f..8755bb79c 100644 --- a/bobplates/prototypes/recipe/parts-recipe.lua +++ b/bobplates/prototypes/recipe/parts-recipe.lua @@ -119,7 +119,7 @@ data:extend({ name = "bob-tungsten-gear-wheel", enabled = false, ingredients = { - { type = "item", name = "bob-tungsten-plate", amount = 2 }, + { type = "item", name = "tungsten-plate", amount = 2 }, }, results = { { type = "item", name = "bob-tungsten-gear-wheel", amount = 1 } }, allow_productivity = true, diff --git a/bobplates/prototypes/recipe/plates-recipe.lua b/bobplates/prototypes/recipe/plates-recipe.lua index d82332cf4..6140e2bb6 100644 --- a/bobplates/prototypes/recipe/plates-recipe.lua +++ b/bobplates/prototypes/recipe/plates-recipe.lua @@ -91,23 +91,6 @@ data:extend({ allow_productivity = true, }, - { - type = "recipe", - name = "bob-tungsten-plate", - enabled = false, - auto_recycle = false, - category = "bob-mixing-furnace", - subgroup = "bob-alloy", - energy_required = 16, - ingredients = { - { type = "item", name = "bob-nickel-plate", amount = 1 }, - { type = "item", name = "bob-powdered-tungsten", amount = 4 }, - }, - results = { { type = "item", name = "bob-tungsten-plate", amount = 5 } }, - allow_decomposition = false, - allow_productivity = true, - }, - { type = "recipe", name = "bob-zinc-plate", @@ -205,6 +188,22 @@ data:extend({ if not mods["space-age"] then data:extend({ + { + type = "recipe", + name = "tungsten-plate", + enabled = false, + auto_recycle = false, + category = "bob-mixing-furnace", + subgroup = "bob-alloy", + energy_required = 16, + ingredients = { + { type = "item", name = "bob-nickel-plate", amount = 1 }, + { type = "item", name = "bob-powdered-tungsten", amount = 4 }, + }, + results = { { type = "item", name = "tungsten-plate", amount = 5 } }, + allow_decomposition = false, + allow_productivity = true, + }, { type = "recipe", name = "lithium-plate", @@ -223,6 +222,8 @@ if not mods["space-age"] then }, }) else + bobmods.lib.recipe.replace_ingredient("tungsten-plate", "tungsten-ore", "bob-powdered-tungsten") + bobmods.lib.recipe.remove_ingredient("lithium", "lithium-brine") bobmods.lib.recipe.add_ingredient("lithium", { type = "item", name = "bob-lithium-chloride", amount = 5 }) end diff --git a/bobplates/prototypes/technology-updates.lua b/bobplates/prototypes/technology-updates.lua index b81346a99..5efc3032a 100644 --- a/bobplates/prototypes/technology-updates.lua +++ b/bobplates/prototypes/technology-updates.lua @@ -77,15 +77,14 @@ bobmods.lib.tech.add_recipe_unlock("bob-titanium-processing", "bob-titanium-plat bobmods.lib.tech.add_recipe_unlock("bob-tungsten-processing", "bob-tungstic-acid") bobmods.lib.tech.add_recipe_unlock("bob-tungsten-processing", "bob-tungsten-oxide") bobmods.lib.tech.add_recipe_unlock("bob-tungsten-processing", "bob-powdered-tungsten") -bobmods.lib.tech.add_recipe_unlock("bob-tungsten-processing", "bob-tungsten-plate") +bobmods.lib.tech.add_recipe_unlock("bob-tungsten-processing", "tungsten-plate") bobmods.lib.tech.add_recipe_unlock("bob-invar-processing", "bob-invar-alloy") bobmods.lib.tech.add_recipe_unlock("bob-nitinol-processing", "bob-nitinol-alloy") bobmods.lib.tech.add_recipe_unlock("bob-tungsten-alloy-processing", "bob-copper-tungsten-alloy") -bobmods.lib.tech.add_recipe_unlock("bob-tungsten-alloy-processing", "bob-tungsten-carbide") -bobmods.lib.tech.add_recipe_unlock("bob-tungsten-alloy-processing", "bob-tungsten-carbide-2") +bobmods.lib.tech.add_recipe_unlock("bob-tungsten-alloy-processing", "tungsten-carbide") bobmods.lib.tech.add_recipe_unlock("bob-cobalt-processing", "bob-cobalt-oxide") bobmods.lib.tech.add_recipe_unlock("bob-cobalt-processing", "bob-cobalt-oxide-from-copper") @@ -196,4 +195,23 @@ end if mods["space-age"] then bobmods.lib.tech.remove_recipe_unlock("tungsten-carbide", "carbon") bobmods.lib.tech.add_recipe_unlock("tungsten-carbide", "bob-carbon-from-acid") + + bobmods.lib.tech.add_science_pack("bob-tungsten-processing", "space-science-pack", 1) + bobmods.lib.tech.add_science_pack("bob-tungsten-processing", "metallurgic-science-pack", 1) + bobmods.lib.tech.add_prerequisite("bob-tungsten-processing", "metallurgic-science-pack") + + bobmods.lib.tech.remove_recipe_unlock("bob-tungsten-processing", "bob-tungstic-acid") + bobmods.lib.tech.remove_recipe_unlock("bob-tungsten-processing", "bob-tungsten-oxide") + bobmods.lib.tech.remove_recipe_unlock("bob-tungsten-processing", "bob-powdered-tungsten") + bobmods.lib.tech.remove_recipe_unlock("bob-tungsten-processing", "tungsten-plate") + + bobmods.lib.tech.add_recipe_unlock("tungsten-carbide", "bob-tungstic-acid") + bobmods.lib.tech.add_recipe_unlock("tungsten-carbide", "bob-tungsten-oxide") + bobmods.lib.tech.add_recipe_unlock("tungsten-carbide", "bob-powdered-tungsten") + + bobmods.lib.tech.add_science_pack("bob-tungsten-alloy-processing", "space-science-pack", 1) + bobmods.lib.tech.add_science_pack("bob-tungsten-alloy-processing", "metallurgic-science-pack", 1) + bobmods.lib.tech.add_prerequisite("bob-tungsten-alloy-processing", "metallurgic-science-pack") + + bobmods.lib.tech.remove_recipe_unlock("bob-tungsten-alloy-processing", "tungsten-carbide") end diff --git a/bobplates/remote.lua b/bobplates/remote.lua index 929423bec..614cd2762 100644 --- a/bobplates/remote.lua +++ b/bobplates/remote.lua @@ -62,16 +62,16 @@ local function milestones_presets() { type = "item", name = "bob-aluminium-plate", quantity = 1000, next = "x10" }, { type = "item", name = "bob-titanium-plate", quantity = 1 }, { type = "item", name = "bob-titanium-plate", quantity = 1000, next = "x10" }, - { type = "item", name = "bob-tungsten-plate", quantity = 1 }, - { type = "item", name = "bob-tungsten-plate", quantity = 1000, next = "x10" }, + { type = "item", name = "tungsten-plate", quantity = 1 }, + { type = "item", name = "tungsten-plate", quantity = 1000, next = "x10" }, { type = "item", name = "bob-bronze-alloy", quantity = 1 }, { type = "item", name = "bob-bronze-alloy", quantity = 1000, next = "x10" }, { type = "item", name = "bob-brass-alloy", quantity = 1 }, { type = "item", name = "bob-brass-alloy", quantity = 1000, next = "x10" }, { type = "item", name = "bob-copper-tungsten-alloy", quantity = 1 }, { type = "item", name = "bob-copper-tungsten-alloy", quantity = 1000, next = "x10" }, - { type = "item", name = "bob-tungsten-carbide", quantity = 1 }, - { type = "item", name = "bob-tungsten-carbide", quantity = 1000, next = "x10" }, + { type = "item", name = "tungsten-carbide", quantity = 1 }, + { type = "item", name = "tungsten-carbide", quantity = 1000, next = "x10" }, { type = "item", name = "bob-gunmetal-alloy", quantity = 1 }, { type = "item", name = "bob-gunmetal-alloy", quantity = 1000, next = "x10" }, { type = "item", name = "bob-invar-alloy", quantity = 1 }, diff --git a/bobpower/prototypes/heat-pipes-updates.lua b/bobpower/prototypes/heat-pipes-updates.lua index b8a790db8..e7713c5ac 100644 --- a/bobpower/prototypes/heat-pipes-updates.lua +++ b/bobpower/prototypes/heat-pipes-updates.lua @@ -34,8 +34,8 @@ then if data.raw.item["bob-titanium-plate"] then bobmods.lib.recipe.replace_ingredient("bob-heat-pipe-3", "steel-plate", "bob-titanium-plate") bobmods.lib.tech.add_prerequisite("bob-heat-pipe-3", "bob-titanium-processing") - elseif data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-heat-pipe-3", "steel-plate", "bob-tungsten-plate") + elseif data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-heat-pipe-3", "steel-plate", "tungsten-plate") bobmods.lib.tech.add_prerequisite("bob-heat-pipe-3", "bob-tungsten-processing") end diff --git a/bobpower/prototypes/recipe/boilers-updates.lua b/bobpower/prototypes/recipe/boilers-updates.lua index 1fe4f67c4..013593d82 100644 --- a/bobpower/prototypes/recipe/boilers-updates.lua +++ b/bobpower/prototypes/recipe/boilers-updates.lua @@ -13,8 +13,8 @@ if settings.startup["bobmods-power-steam"].value == true then bobmods.lib.tech.add_prerequisite("bob-boiler-3", "bob-zinc-processing") end - if data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-boiler-4", "steel-plate", "bob-tungsten-plate") + if data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-boiler-4", "steel-plate", "tungsten-plate") bobmods.lib.tech.add_prerequisite("bob-boiler-4", "bob-tungsten-processing") end diff --git a/bobpower/prototypes/recipe/fluid-generator-updates.lua b/bobpower/prototypes/recipe/fluid-generator-updates.lua index 8d7861442..057961633 100644 --- a/bobpower/prototypes/recipe/fluid-generator-updates.lua +++ b/bobpower/prototypes/recipe/fluid-generator-updates.lua @@ -94,8 +94,8 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then bobmods.lib.recipe.replace_ingredient("bob-fluid-generator-3", "iron-gear-wheel", "bob-steel-gear-wheel") end - if data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-fluid-generator-3", "iron-plate", "bob-tungsten-plate") + if data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-fluid-generator-3", "iron-plate", "tungsten-plate") bobmods.lib.tech.add_prerequisite("bob-fluid-generator-3", "bob-tungsten-processing") end diff --git a/bobpower/prototypes/recipe/heat-exchangers-updates.lua b/bobpower/prototypes/recipe/heat-exchangers-updates.lua index d64ddadbd..832709ad8 100644 --- a/bobpower/prototypes/recipe/heat-exchangers-updates.lua +++ b/bobpower/prototypes/recipe/heat-exchangers-updates.lua @@ -12,8 +12,8 @@ if settings.startup["bobmods-power-steam"].value == true then if data.raw.item["bob-brass-pipe"] then bobmods.lib.recipe.add_ingredient("bob-heat-exchanger-2", { type = "item", name = "bob-brass-pipe", amount = 4 }) end - if data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-heat-exchanger-3", "steel-plate", "bob-tungsten-plate") + if data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-heat-exchanger-3", "steel-plate", "tungsten-plate") bobmods.lib.tech.add_prerequisite("bob-heat-exchanger-3", "bob-tungsten-processing") end if data.raw.item["bob-ceramic-pipe"] then diff --git a/bobpower/prototypes/recipe/nuclear-updates.lua b/bobpower/prototypes/recipe/nuclear-updates.lua index 8b6728bfb..7cb3d8747 100644 --- a/bobpower/prototypes/recipe/nuclear-updates.lua +++ b/bobpower/prototypes/recipe/nuclear-updates.lua @@ -13,8 +13,8 @@ if settings.startup["bobmods-power-nuclear"].value == true then bobmods.lib.tech.add_prerequisite("bob-nuclear-power-2", "bob-zinc-processing") end - if data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-nuclear-reactor-2", "steel-plate", "bob-tungsten-plate") + if data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-nuclear-reactor-2", "steel-plate", "tungsten-plate") bobmods.lib.tech.add_prerequisite("bob-nuclear-power-2", "bob-tungsten-processing") end @@ -32,8 +32,8 @@ if settings.startup["bobmods-power-nuclear"].value == true then bobmods.lib.tech.add_prerequisite("bob-nuclear-power-3", "bob-tungsten-alloy-processing") end - if data.raw.item["bob-tungsten-carbide"] then - bobmods.lib.recipe.replace_ingredient("bob-nuclear-reactor-3", "steel-plate", "bob-tungsten-carbide") + if data.raw.item["tungsten-carbide"] then + bobmods.lib.recipe.replace_ingredient("bob-nuclear-reactor-3", "steel-plate", "tungsten-carbide") bobmods.lib.tech.add_prerequisite("bob-nuclear-power-3", "bob-tungsten-alloy-processing") end diff --git a/bobpower/prototypes/recipe/oil-boilers-updates.lua b/bobpower/prototypes/recipe/oil-boilers-updates.lua index ad171438e..98d2af574 100644 --- a/bobpower/prototypes/recipe/oil-boilers-updates.lua +++ b/bobpower/prototypes/recipe/oil-boilers-updates.lua @@ -13,8 +13,8 @@ if settings.startup["bobmods-power-steam"].value == true then bobmods.lib.tech.add_prerequisite("bob-oil-boiler-2", "bob-zinc-processing") end - if data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-oil-boiler-3", "steel-plate", "bob-tungsten-plate") + if data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-oil-boiler-3", "steel-plate", "tungsten-plate") bobmods.lib.tech.add_prerequisite("bob-oil-boiler-3", "bob-tungsten-processing") end diff --git a/bobpower/prototypes/recipe/poles-updates.lua b/bobpower/prototypes/recipe/poles-updates.lua index a2301795b..ae0462860 100644 --- a/bobpower/prototypes/recipe/poles-updates.lua +++ b/bobpower/prototypes/recipe/poles-updates.lua @@ -23,10 +23,10 @@ if settings.startup["bobmods-power-poles"].value == true then bobmods.lib.recipe.replace_ingredient("bob-substation-3", "steel-plate", "bob-titanium-plate") bobmods.lib.tech.add_prerequisite("bob-electric-pole-3", "bob-titanium-processing") bobmods.lib.tech.add_prerequisite("bob-electric-substation-3", "bob-titanium-processing") - elseif data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-medium-electric-pole-3", "steel-plate", "bob-tungsten-plate") - bobmods.lib.recipe.replace_ingredient("bob-big-electric-pole-3", "steel-plate", "bob-tungsten-plate") - bobmods.lib.recipe.replace_ingredient("bob-substation-3", "steel-plate", "bob-tungsten-plate") + elseif data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-medium-electric-pole-3", "steel-plate", "tungsten-plate") + bobmods.lib.recipe.replace_ingredient("bob-big-electric-pole-3", "steel-plate", "tungsten-plate") + bobmods.lib.recipe.replace_ingredient("bob-substation-3", "steel-plate", "tungsten-plate") bobmods.lib.tech.add_prerequisite("bob-electric-pole-3", "bob-tungsten-processing") bobmods.lib.tech.add_prerequisite("bob-electric-substation-3", "bob-tungsten-processing") end diff --git a/bobpower/prototypes/recipe/steam-engines-updates.lua b/bobpower/prototypes/recipe/steam-engines-updates.lua index 36d227a21..724176fa0 100644 --- a/bobpower/prototypes/recipe/steam-engines-updates.lua +++ b/bobpower/prototypes/recipe/steam-engines-updates.lua @@ -81,8 +81,8 @@ if settings.startup["bobmods-power-steam"].value == true then bobmods.lib.recipe.replace_ingredient("bob-steam-engine-4", "steel-plate", "bob-titanium-plate") bobmods.lib.tech.add_prerequisite("bob-steam-engine-4", "bob-titanium-processing") else - if data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-steam-engine-4", "steel-plate", "bob-tungsten-plate") + if data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-steam-engine-4", "steel-plate", "tungsten-plate") bobmods.lib.tech.add_prerequisite("bob-steam-engine-4", "bob-tungsten-processing") end end @@ -122,8 +122,8 @@ if settings.startup["bobmods-power-steam"].value == true then bobmods.lib.recipe.replace_ingredient("bob-steam-engine-5", "steel-plate", "bob-nitinol-alloy") bobmods.lib.tech.add_prerequisite("bob-steam-engine-5", "bob-nitinol-processing") else - if data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-steam-engine-5", "steel-plate", "bob-tungsten-plate") + if data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-steam-engine-5", "steel-plate", "tungsten-plate") bobmods.lib.tech.add_prerequisite("bob-steam-engine-5", "bob-tungsten-processing") end end diff --git a/bobpower/prototypes/recipe/steam-turbines-updates.lua b/bobpower/prototypes/recipe/steam-turbines-updates.lua index 961d64076..f8f068e1d 100644 --- a/bobpower/prototypes/recipe/steam-turbines-updates.lua +++ b/bobpower/prototypes/recipe/steam-turbines-updates.lua @@ -69,8 +69,8 @@ if settings.startup["bobmods-power-steam"].value == true then bobmods.lib.recipe.replace_ingredient("bob-steam-turbine-2", "steel-plate", "bob-titanium-plate") bobmods.lib.tech.add_prerequisite("bob-steam-turbine-2", "bob-titanium-processing") else - if data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-steam-turbine-2", "steel-plate", "bob-tungsten-plate") + if data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-steam-turbine-2", "steel-plate", "tungsten-plate") bobmods.lib.tech.add_prerequisite("bob-steam-turbine-2", "bob-tungsten-processing") end end @@ -118,8 +118,8 @@ if settings.startup["bobmods-power-steam"].value == true then bobmods.lib.recipe.replace_ingredient("bob-steam-turbine-3", "steel-plate", "bob-nitinol-alloy") bobmods.lib.tech.add_prerequisite("bob-steam-turbine-3", "bob-nitinol-processing") else - if data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-steam-turbine-3", "steel-plate", "bob-tungsten-plate") + if data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-steam-turbine-3", "steel-plate", "tungsten-plate") bobmods.lib.tech.add_prerequisite("bob-steam-turbine-3", "bob-tungsten-processing") end end diff --git a/bobrevamp/prototypes/rocket-parts-updates.lua b/bobrevamp/prototypes/rocket-parts-updates.lua index ee25c5f31..b84eb4a80 100644 --- a/bobrevamp/prototypes/rocket-parts-updates.lua +++ b/bobrevamp/prototypes/rocket-parts-updates.lua @@ -9,14 +9,15 @@ bobmods.lib.recipe.set_ingredient("rocket-silo", { type = "item", name = "electr if data.raw.item["bob-titanium-pipe"] then bobmods.lib.recipe.replace_ingredient("rocket-silo", "pipe", "bob-titanium-pipe") end -if data.raw.item["bob-advanced-processing-unit"] then - bobmods.lib.recipe.replace_ingredient("rocket-silo", "processing-unit", "bob-advanced-processing-unit") - bobmods.lib.recipe.replace_ingredient("rocket-part", "processing-unit", "bob-advanced-processing-unit") - bobmods.lib.recipe.replace_ingredient("cargo-landing-pad", "processing-unit", "bob-advanced-processing-unit") -end -if data.raw.item["bob-nitinol-alloy"] then +if not mods["space-age"] and data.raw.item["bob-nitinol-alloy"] then bobmods.lib.tech.add_prerequisite("rocket-silo", "bob-nitinol-processing") bobmods.lib.recipe.replace_ingredient("rocket-silo", "steel-plate", "bob-nitinol-alloy") +elseif data.raw.item["bob-titanium-plate"] then + bobmods.lib.tech.add_prerequisite("rocket-silo", "bob-titanium-processing") + bobmods.lib.recipe.replace_ingredient("rocket-silo", "steel-plate", "bob-titanium-plate") + bobmods.lib.recipe.replace_ingredient("cargo-landing-pad", "steel-plate", "bob-titanium-plate") + bobmods.lib.recipe.replace_ingredient("space-platform-starter-pack", "steel-plate", "bob-titanium-plate") + bobmods.lib.recipe.replace_ingredient("space-platform-foundation", "steel-plate", "bob-titanium-plate") end bobmods.lib.recipe.add_ingredient("rocket-silo", { type = "item", name = "low-density-structure", amount = 50 }) @@ -24,8 +25,10 @@ bobmods.lib.recipe.add_ingredient("rocket-silo", { type = "item", name = "bob-he bobmods.lib.recipe.add_ingredient("cargo-landing-pad", { type = "item", name = "bob-heat-shield-tile", amount = 100 }) bobmods.lib.recipe.add_ingredient("cargo-landing-pad", { type = "item", name = "electric-engine-unit", amount = 40 }) -if data.raw.item["bob-tungsten-pipe"] then +if not mods["space-age"] and data.raw.item["bob-tungsten-pipe"] then bobmods.lib.recipe.add_ingredient("rocket-part", { type = "item", name = "bob-tungsten-pipe", amount = 30 }) +elseif data.raw.item["bob-titanium-pipe"] then + bobmods.lib.recipe.add_ingredient("rocket-part", { type = "item", name = "bob-titanium-pipe", amount = 10 }) end bobmods.lib.tech.add_prerequisite("rocket-silo", "bob-heat-shield") @@ -34,8 +37,11 @@ if data.raw.item["bob-silicon-nitride"] then bobmods.lib.recipe.replace_ingredient("bob-heat-shield-tile", "steel-plate", "bob-silicon-nitride") bobmods.lib.tech.replace_prerequisite("bob-heat-shield", "steel-processing", "bob-ceramics") end -if data.raw.item["bob-tungsten-carbide"] then - bobmods.lib.recipe.replace_ingredient("bob-heat-shield-tile", "plastic-bar", "bob-tungsten-carbide") +if mods["space-age"] then + bobmods.lib.tech.remove_science_pack("bob-heat-shield", "production-science-pack") + bobmods.lib.tech.remove_prerequisite("bob-heat-shield", "production-science-pack") +elseif data.raw.item["tungsten-carbide"] then + bobmods.lib.recipe.replace_ingredient("bob-heat-shield-tile", "plastic-bar", "tungsten-carbide") bobmods.lib.tech.replace_prerequisite("bob-heat-shield", "plastics", "bob-tungsten-alloy-processing") end @@ -49,13 +55,6 @@ if data.raw.item["bob-aluminium-plate"] then end bobmods.lib.tech.remove_prerequisite("low-density-structure", "advanced-material-processing") -bobmods.lib.tech.remove_prerequisite("rocket-silo", "productivity-module-3") -if data.raw.technology["bob-advanced-processing-unit"] then - bobmods.lib.tech.add_prerequisite("rocket-silo", "bob-advanced-processing-unit") - bobmods.lib.tech.remove_prerequisite("rocket-silo", "processing-unit") - bobmods.lib.tech.remove_prerequisite("rocket-silo", "speed-module-3") -end - if data.raw.recipe["satellite"] then if data.raw.item["bob-rtg"] then bobmods.lib.recipe.set_ingredient("satellite", { type = "item", name = "accumulator", amount = 50 }) @@ -87,12 +86,17 @@ end if mods["quality"] then bobmods.lib.recipe.update_recycling_recipe({ - "low-density-structure", "bob-heat-shield-tile", - "rocket-silo", "cargo-landing-pad", + "low-density-structure", + "rocket-silo", }) - if data.raw.recipe["satellite"] then + if mods["space-age"] then + bobmods.lib.recipe.update_recycling_recipe({ + "space-platform-foundation", + "space-platform-starter-pack", + }) + else bobmods.lib.recipe.update_recycling_recipe("satellite") end end diff --git a/bobvehicleequipment/prototypes/recipe-updates.lua b/bobvehicleequipment/prototypes/recipe-updates.lua index 14bbd1a61..c7ca4db5c 100644 --- a/bobvehicleequipment/prototypes/recipe-updates.lua +++ b/bobvehicleequipment/prototypes/recipe-updates.lua @@ -753,37 +753,37 @@ if data.raw.fluid["bob-heavy-water"] then bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-cell-equipment-2", "bob-heavy-water-processing") end -if data.raw.item["bob-tungsten-plate"] then +if data.raw.item["tungsten-plate"] then bobmods.lib.recipe.remove_ingredient("bob-vehicle-fission-reactor-equipment-3", "low-density-structure") bobmods.lib.recipe.remove_ingredient("bob-vehicle-fission-cell-equipment-3", "low-density-structure") bobmods.lib.tech.remove_prerequisite("bob-vehicle-fission-reactor-equipment-3", "low-density-structure") bobmods.lib.tech.remove_prerequisite("bob-vehicle-fission-cell-equipment-3", "low-density-structure") bobmods.lib.recipe.add_ingredient( "bob-vehicle-fission-reactor-equipment-3", - { type = "item", name = "bob-tungsten-plate", amount = 250 } + { type = "item", name = "tungsten-plate", amount = 250 } ) bobmods.lib.recipe.add_ingredient( "bob-vehicle-fission-cell-equipment-3", - { type = "item", name = "bob-tungsten-plate", amount = 150 } + { type = "item", name = "tungsten-plate", amount = 150 } ) bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-reactor-equipment-3", "bob-tungsten-processing") bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-cell-equipment-3", "bob-tungsten-processing") bobmods.lib.recipe.add_ingredient( "bob-vehicle-big-turret-equipment-2", - { type = "item", name = "bob-tungsten-plate", amount = 50 } + { type = "item", name = "tungsten-plate", amount = 50 } ) bobmods.lib.tech.add_prerequisite("bob-vehicle-big-turret-equipment-2", "bob-tungsten-processing") end -if data.raw.item["bob-tungsten-carbide"] then +if data.raw.item["tungsten-carbide"] then bobmods.lib.recipe.add_ingredient( "bob-vehicle-fission-reactor-equipment-4", - { type = "item", name = "bob-tungsten-carbide", amount = 80 } + { type = "item", name = "tungsten-carbide", amount = 80 } ) bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-reactor-equipment-4", "bob-tungsten-alloy-processing") bobmods.lib.recipe.add_ingredient( "bob-vehicle-fission-cell-equipment-4", - { type = "item", name = "bob-tungsten-carbide", amount = 40 } + { type = "item", name = "tungsten-carbide", amount = 40 } ) bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-cell-equipment-4", "bob-tungsten-alloy-processing") end diff --git a/bobwarfare/prototypes/armor-updates.lua b/bobwarfare/prototypes/armor-updates.lua index b315c1fc6..112d4481f 100644 --- a/bobwarfare/prototypes/armor-updates.lua +++ b/bobwarfare/prototypes/armor-updates.lua @@ -46,7 +46,7 @@ if data.raw.item["bob-silicon-nitride"] then bobmods.lib.tech.add_prerequisite("bob-power-armor-4", "bob-ceramics") end -if data.raw.item["bob-tungsten-carbide"] then +if data.raw.item["tungsten-carbide"] then if data.raw.item["bob-mech-armor-plate"] then bobmods.lib.recipe.remove_ingredient("bob-power-armor-mk5", "steel-plate") bobmods.lib.recipe.add_ingredient( @@ -55,7 +55,7 @@ if data.raw.item["bob-tungsten-carbide"] then ) bobmods.lib.tech.add_prerequisite("bob-power-armor-5", "bob-tankotron") else - bobmods.lib.recipe.replace_ingredient("bob-power-armor-mk5", "steel-plate", "bob-tungsten-carbide") + bobmods.lib.recipe.replace_ingredient("bob-power-armor-mk5", "steel-plate", "tungsten-carbide") bobmods.lib.tech.add_prerequisite("bob-power-armor-5", "bob-tungsten-alloy-processing") end end diff --git a/bobwarfare/prototypes/recipe/recipe-updates.lua b/bobwarfare/prototypes/recipe/recipe-updates.lua index 665d6ea54..ef6a3f65e 100644 --- a/bobwarfare/prototypes/recipe/recipe-updates.lua +++ b/bobwarfare/prototypes/recipe/recipe-updates.lua @@ -42,8 +42,8 @@ if data.raw.item["bob-lead-plate"] then bobmods.lib.recipe.replace_ingredient("bob-shot", "iron-plate", "bob-lead-plate") end -if data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.add_ingredient("bob-plasma-turret-2", { type = "item", name = "bob-tungsten-plate", amount = 50 }) +if data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.add_ingredient("bob-plasma-turret-2", { type = "item", name = "tungsten-plate", amount = 50 }) bobmods.lib.tech.add_prerequisite("bob-plasma-turrets-2", "bob-tungsten-processing") end @@ -215,10 +215,10 @@ if data.raw.item["bob-copper-tungsten-alloy"] then ) end -if data.raw.item["bob-tungsten-carbide"] then - bobmods.lib.recipe.replace_ingredient("bob-tank-3", "steel-plate", "bob-tungsten-carbide") +if data.raw.item["tungsten-carbide"] then + bobmods.lib.recipe.replace_ingredient("bob-tank-3", "steel-plate", "tungsten-carbide") bobmods.lib.tech.add_prerequisite("bob-tanks-3", "bob-tungsten-alloy-processing") - bobmods.lib.recipe.replace_ingredient("bob-artillery-turret-3", "concrete", "bob-tungsten-carbide") + bobmods.lib.recipe.replace_ingredient("bob-artillery-turret-3", "concrete", "tungsten-carbide") bobmods.lib.tech.add_prerequisite("bob-artillery-turret-3", "bob-tungsten-alloy-processing") end @@ -436,10 +436,10 @@ if data.raw.item["bob-alien-blue-alloy"] then bobmods.lib.recipe.replace_ingredient("bob-ap-bullet-projectile", "steel-plate", "bob-alien-blue-alloy") bobmods.lib.recipe.replace_ingredient("bob-shotgun-ap-shell", "steel-plate", "bob-alien-blue-alloy") bobmods.lib.recipe.replace_ingredient("bob-piercing-rocket-warhead", "iron-plate", "bob-alien-blue-alloy") -elseif data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-shotgun-ap-shell", "steel-plate", "bob-tungsten-plate") - bobmods.lib.recipe.replace_ingredient("bob-ap-bullet-projectile", "steel-plate", "bob-tungsten-plate") - bobmods.lib.recipe.replace_ingredient("bob-piercing-rocket-warhead", "steel-plate", "bob-tungsten-plate") +elseif data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-shotgun-ap-shell", "steel-plate", "tungsten-plate") + bobmods.lib.recipe.replace_ingredient("bob-ap-bullet-projectile", "steel-plate", "tungsten-plate") + bobmods.lib.recipe.replace_ingredient("bob-piercing-rocket-warhead", "steel-plate", "tungsten-plate") bobmods.lib.tech.add_prerequisite("bob-piercing-rocket", "bob-tungsten-processing") end @@ -451,8 +451,8 @@ elseif data.raw.item["bob-gold-plate"] then bobmods.lib.recipe.replace_ingredient("bob-electric-bullet-projectile", "steel-plate", "bob-gold-plate") bobmods.lib.recipe.replace_ingredient("bob-shotgun-electric-shell", "copper-plate", "bob-gold-plate") bobmods.lib.recipe.replace_ingredient("bob-electric-rocket-warhead", "copper-plate", "bob-gold-plate") - if data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-electric-rocket-warhead", "steel-plate", "bob-tungsten-plate") + if data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-electric-rocket-warhead", "steel-plate", "tungsten-plate") bobmods.lib.tech.add_prerequisite("bob-electric-rocket", "bob-tungsten-processing") end end @@ -461,8 +461,8 @@ if data.raw.fluid["bob-alien-acid"] then bobmods.lib.recipe.replace_ingredient("bob-acid-bullet-projectile", "sulfuric-acid", "bob-alien-acid") bobmods.lib.recipe.replace_ingredient("bob-shotgun-acid-shell", "sulfuric-acid", "bob-alien-acid") bobmods.lib.recipe.replace_ingredient("bob-acid-rocket-warhead", "sulfuric-acid", "bob-alien-acid") -elseif data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-acid-rocket-warhead", "steel-plate", "bob-tungsten-plate") +elseif data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-acid-rocket-warhead", "steel-plate", "tungsten-plate") bobmods.lib.tech.add_prerequisite("bob-acid-rocket", "bob-tungsten-processing") end @@ -483,8 +483,8 @@ if data.raw.fluid["bob-alien-explosive"] then ) data.raw.recipe["bob-explosive-artillery-shell"].category = "crafting-with-fluid" bobmods.lib.tech.add_prerequisite("bob-explosive-artillery-shells", "bob-alien-yellow-research") -elseif data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-explosive-rocket-warhead", "steel-plate", "bob-tungsten-plate") +elseif data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-explosive-rocket-warhead", "steel-plate", "tungsten-plate") bobmods.lib.tech.add_prerequisite("bob-explosive-rocket", "bob-tungsten-processing") end @@ -501,8 +501,8 @@ if data.raw.fluid["bob-alien-poison"] then bobmods.lib.recipe.replace_ingredient("bob-poison-artillery-shell", "coal", "bob-alien-poison") data.raw.recipe["bob-poison-artillery-shell"].category = "crafting-with-fluid" bobmods.lib.tech.add_prerequisite("bob-poison-artillery-shells", "bob-alien-green-research") -elseif data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-poison-rocket-warhead", "steel-plate", "bob-tungsten-plate") +elseif data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-poison-rocket-warhead", "steel-plate", "tungsten-plate") bobmods.lib.tech.add_prerequisite("bob-poison-rocket", "bob-tungsten-processing") end @@ -535,8 +535,8 @@ if data.raw.fluid["bob-alien-fire"] then bobmods.lib.tech.add_prerequisite("bob-fire-artillery-shells", "bob-alien-red-research") elseif data.raw.fluid["bob-liquid-fuel"] then bobmods.lib.recipe.replace_ingredient("bob-fire-artillery-shell", "light-oil", "bob-liquid-fuel") - if data.raw.item["bob-tungsten-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-flame-rocket-warhead", "steel-plate", "bob-tungsten-plate") + if data.raw.item["tungsten-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-flame-rocket-warhead", "steel-plate", "tungsten-plate") bobmods.lib.tech.add_prerequisite("bob-flame-rocket", "bob-tungsten-processing") end end diff --git a/bobwarfare/prototypes/spidertron-updates.lua b/bobwarfare/prototypes/spidertron-updates.lua index a6ed04e5c..740eee2fc 100644 --- a/bobwarfare/prototypes/spidertron-updates.lua +++ b/bobwarfare/prototypes/spidertron-updates.lua @@ -306,8 +306,8 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then bobmods.lib.recipe.replace_ingredient("bob-mech-leg", "copper-cable", "bob-insulated-cable") end - if data.raw.item["bob-tungsten-carbide"] then - bobmods.lib.recipe.replace_ingredient("bob-mech-armor-plate", "steel-plate", "bob-tungsten-carbide") + if data.raw.item["tungsten-carbide"] then + bobmods.lib.recipe.replace_ingredient("bob-mech-armor-plate", "steel-plate", "tungsten-carbide") bobmods.lib.tech.add_prerequisite("bob-tankotron", "bob-tungsten-alloy-processing") end diff --git a/bobwarfare/prototypes/train-updates.lua b/bobwarfare/prototypes/train-updates.lua index 4d557a827..c62a8f612 100644 --- a/bobwarfare/prototypes/train-updates.lua +++ b/bobwarfare/prototypes/train-updates.lua @@ -31,10 +31,10 @@ elseif data.raw.item["bob-steel-pipe"] then bobmods.lib.recipe.replace_ingredient("bob-artillery-wagon-2", "pipe", "bob-steel-pipe") end -if data.raw.item["bob-tungsten-carbide"] then +if data.raw.item["tungsten-carbide"] then bobmods.lib.recipe.add_ingredient( "bob-artillery-wagon-3", - { type = "item", name = "bob-tungsten-carbide", amount = 10 } + { type = "item", name = "tungsten-carbide", amount = 10 } ) bobmods.lib.tech.add_prerequisite("bob-artillery-wagon-3", "bob-tungsten-alloy-processing") else From f4bfea3a75452e5360ffc1a116eaeccc36da9510 Mon Sep 17 00:00:00 2001 From: StyLuaFormatter Date: Sat, 2 May 2026 06:41:04 +0000 Subject: [PATCH 02/11] Format Code --- bobassembly/prototypes/chemical-mixing-furnace-updates.lua | 6 +----- bobplates/prototypes/technology-updates.lua | 6 +++--- bobrevamp/prototypes/rocket-parts-updates.lua | 2 +- bobwarfare/prototypes/train-updates.lua | 5 +---- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/bobassembly/prototypes/chemical-mixing-furnace-updates.lua b/bobassembly/prototypes/chemical-mixing-furnace-updates.lua index 9c6bfbb4b..4cca20959 100644 --- a/bobassembly/prototypes/chemical-mixing-furnace-updates.lua +++ b/bobassembly/prototypes/chemical-mixing-furnace-updates.lua @@ -43,11 +43,7 @@ then end if data.raw.item["tungsten-carbide"] then - bobmods.lib.recipe.replace_ingredient( - "bob-electric-chemical-mixing-furnace-2", - "stone-brick", - "tungsten-carbide" - ) + bobmods.lib.recipe.replace_ingredient("bob-electric-chemical-mixing-furnace-2", "stone-brick", "tungsten-carbide") bobmods.lib.tech.add_prerequisite("bob-multi-purpose-furnace-2", "bob-tungsten-alloy-processing") end diff --git a/bobplates/prototypes/technology-updates.lua b/bobplates/prototypes/technology-updates.lua index 5efc3032a..f52e18a5a 100644 --- a/bobplates/prototypes/technology-updates.lua +++ b/bobplates/prototypes/technology-updates.lua @@ -195,11 +195,11 @@ end if mods["space-age"] then bobmods.lib.tech.remove_recipe_unlock("tungsten-carbide", "carbon") bobmods.lib.tech.add_recipe_unlock("tungsten-carbide", "bob-carbon-from-acid") - + bobmods.lib.tech.add_science_pack("bob-tungsten-processing", "space-science-pack", 1) bobmods.lib.tech.add_science_pack("bob-tungsten-processing", "metallurgic-science-pack", 1) bobmods.lib.tech.add_prerequisite("bob-tungsten-processing", "metallurgic-science-pack") - + bobmods.lib.tech.remove_recipe_unlock("bob-tungsten-processing", "bob-tungstic-acid") bobmods.lib.tech.remove_recipe_unlock("bob-tungsten-processing", "bob-tungsten-oxide") bobmods.lib.tech.remove_recipe_unlock("bob-tungsten-processing", "bob-powdered-tungsten") @@ -212,6 +212,6 @@ if mods["space-age"] then bobmods.lib.tech.add_science_pack("bob-tungsten-alloy-processing", "space-science-pack", 1) bobmods.lib.tech.add_science_pack("bob-tungsten-alloy-processing", "metallurgic-science-pack", 1) bobmods.lib.tech.add_prerequisite("bob-tungsten-alloy-processing", "metallurgic-science-pack") - + bobmods.lib.tech.remove_recipe_unlock("bob-tungsten-alloy-processing", "tungsten-carbide") end diff --git a/bobrevamp/prototypes/rocket-parts-updates.lua b/bobrevamp/prototypes/rocket-parts-updates.lua index b84eb4a80..f35b96aa4 100644 --- a/bobrevamp/prototypes/rocket-parts-updates.lua +++ b/bobrevamp/prototypes/rocket-parts-updates.lua @@ -95,7 +95,7 @@ if mods["quality"] then bobmods.lib.recipe.update_recycling_recipe({ "space-platform-foundation", "space-platform-starter-pack", - }) + }) else bobmods.lib.recipe.update_recycling_recipe("satellite") end diff --git a/bobwarfare/prototypes/train-updates.lua b/bobwarfare/prototypes/train-updates.lua index c62a8f612..98a5a62bf 100644 --- a/bobwarfare/prototypes/train-updates.lua +++ b/bobwarfare/prototypes/train-updates.lua @@ -32,10 +32,7 @@ elseif data.raw.item["bob-steel-pipe"] then end if data.raw.item["tungsten-carbide"] then - bobmods.lib.recipe.add_ingredient( - "bob-artillery-wagon-3", - { type = "item", name = "tungsten-carbide", amount = 10 } - ) + bobmods.lib.recipe.add_ingredient("bob-artillery-wagon-3", { type = "item", name = "tungsten-carbide", amount = 10 }) bobmods.lib.tech.add_prerequisite("bob-artillery-wagon-3", "bob-tungsten-alloy-processing") else bobmods.lib.recipe.add_ingredient("bob-artillery-wagon-3", { type = "item", name = "steel-plate", amount = 10 }) From 4573f61643e765f1c64882488eb7424ba8c82ca3 Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Sat, 2 May 2026 19:13:13 +1200 Subject: [PATCH 03/11] Update Copper Tungsten recipe --- bobplates/prototypes/recipe/alloy-recipe.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bobplates/prototypes/recipe/alloy-recipe.lua b/bobplates/prototypes/recipe/alloy-recipe.lua index bfc0b7276..624351f8c 100644 --- a/bobplates/prototypes/recipe/alloy-recipe.lua +++ b/bobplates/prototypes/recipe/alloy-recipe.lua @@ -143,4 +143,7 @@ if not mods["space-age"] then }) else bobmods.lib.recipe.replace_ingredient("tungsten-carbide", "tungsten-ore", "bob-powdered-tungsten") + + bobmods.lib.recipe.set_category("bob-copper-tungsten-alloy", "metallurgy") + bobmods.lib.recipe.replace_ingredient("bob-copper-tungsten-alloy", "copper-plate", "molten-copper") end From 18925c51d572262e0bdc3e04580ad197296cbc62 Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Sat, 2 May 2026 19:22:02 +1200 Subject: [PATCH 04/11] Set ore subgroup --- bobores/data-updates.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bobores/data-updates.lua b/bobores/data-updates.lua index 9fadf7b7f..620ed9ca9 100644 --- a/bobores/data-updates.lua +++ b/bobores/data-updates.lua @@ -139,3 +139,9 @@ data.raw.item["stone"].subgroup = "bob-ores" data.raw.item["iron-ore"].subgroup = "bob-ores" data.raw.item["copper-ore"].subgroup = "bob-ores" data.raw.item["uranium-ore"].subgroup = "bob-ores" + +if mods["space-age"] then + data.raw.item["calcite"].subgroup = "bob-ores" + data.raw.item["holmium-ore"].subgroup = "bob-ores" + data.raw.item["tungsten-ore"].subgroup = "bob-ores" +end From 9c100d903e1536626b82b57cb05931bdcac4cff9 Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Sat, 2 May 2026 22:22:50 +1200 Subject: [PATCH 05/11] Update migrations --- bobores/migrations/bobores_2.0.4.json | 14 ++++++++++++++ bobores/migrations/bobores_2.0.4.lua | 12 ++++++++++++ bobplates/migrations/bobplates_2.0.6.json | 4 +++- 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 bobores/migrations/bobores_2.0.4.json create mode 100644 bobores/migrations/bobores_2.0.4.lua diff --git a/bobores/migrations/bobores_2.0.4.json b/bobores/migrations/bobores_2.0.4.json new file mode 100644 index 000000000..ea4c61ad2 --- /dev/null +++ b/bobores/migrations/bobores_2.0.4.json @@ -0,0 +1,14 @@ +{ + "item": + [ + ["bob-tungsten-ore", "tungsten-ore"] + ], + "entity": + [ + ["bob-tungsten-ore", "tungsten-ore"] + ], + "recipe": + [ + ["bob-tungsten-ore-recycling", "tungsten-ore-recycling"] + ] +} diff --git a/bobores/migrations/bobores_2.0.4.lua b/bobores/migrations/bobores_2.0.4.lua new file mode 100644 index 000000000..c0c53a1bb --- /dev/null +++ b/bobores/migrations/bobores_2.0.4.lua @@ -0,0 +1,12 @@ +if script.active_mods["space-age"] then + local surface = game.surfaces["nauvis"] + if surface then + local entities = surface.find_entities_filtered({ + name = { "tungsten-ore" }, + type = "resource", + }) + for _, entity in pairs(entities) do + entity.destroy() + end + end +end diff --git a/bobplates/migrations/bobplates_2.0.6.json b/bobplates/migrations/bobplates_2.0.6.json index 030cff7c0..1eec29fc7 100644 --- a/bobplates/migrations/bobplates_2.0.6.json +++ b/bobplates/migrations/bobplates_2.0.6.json @@ -19,6 +19,8 @@ ["bob-silver-zinc-battery", "bob-battery-3"], ["bob-silver-zinc-battery-recycling", "bob-battery-3-recycling"], ["bob-tungsten-carbide", "tungsten-carbide"], - ["bob-tungsten-plate", "tungsten-plate"] + ["bob-tungsten-carbide-recycling", "tungsten-carbide-recycling"], + ["bob-tungsten-plate", "tungsten-plate"], + ["bob-tungsten-plate-recycling", "tungsten-plate-recycling"] ] } From da68c942dc483e8cc0ddb16c0b9e9a221638c7c8 Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Sat, 2 May 2026 22:27:50 +1200 Subject: [PATCH 06/11] Updating cchangelog --- bobores/changelog.txt | 2 ++ bobplates/changelog.txt | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/bobores/changelog.txt b/bobores/changelog.txt index 4f6e93ed6..486ff2722 100644 --- a/bobores/changelog.txt +++ b/bobores/changelog.txt @@ -1,7 +1,9 @@ --------------------------------------------------------------------------------------------------- Version: 2.0.4 +Date: ??? Changes: - Set item weights #553 + - Combined Bob's Tungsten and Space Age's Tungsten #579 --------------------------------------------------------------------------------------------------- Version: 2.0.3 Date: 15. 01. 2026 diff --git a/bobplates/changelog.txt b/bobplates/changelog.txt index 85e755882..77d3b8ebf 100644 --- a/bobplates/changelog.txt +++ b/bobplates/changelog.txt @@ -13,6 +13,10 @@ Date: ??? - Swapped the order of Lithium-ion batteries and Silver-zinc batteries when Space Age is enabled - Combined Bob's Lithium and Space Age's Lithium - Changed the internal name of Bob's batteries to "bob-battery-2" and "bob-battery-3" + - Tungsten fixes (Space Age) #579 + - Combined Bob's Tungsten and Space Age's Tungsten + - Updated Tungsten carbide and Tungsten plate recipes to use Powdered tungsten instead of Tungsten ore + - Updated Copper tungsten recipe to use Molten copper instead of Copper plate --------------------------------------------------------------------------------------------------- Version: 2.0.5 Date: 15. 01. 2026 From c7ca600ca5a2c2c036b1dd08373cb447f5b2de0c Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Sat, 2 May 2026 22:40:26 +1200 Subject: [PATCH 07/11] Nauvis tungsten autoplace --- bobores/data.lua | 2 +- bobores/prototypes/tungsten-ore.lua | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/bobores/data.lua b/bobores/data.lua index d1cf99218..f22394c84 100644 --- a/bobores/data.lua +++ b/bobores/data.lua @@ -101,7 +101,7 @@ end if settings.startup["bobmods-ores-enabletinore"].value == true then bobmods.ores.tin.create_autoplace() end -if not mods["space-age"] and settings.startup["bobmods-ores-enabletungstenore"].value == true then +if settings.startup["bobmods-ores-enabletungstenore"].value == true then bobmods.ores.tungsten.create_autoplace() end if settings.startup["bobmods-ores-enablezincore"].value == true then diff --git a/bobores/prototypes/tungsten-ore.lua b/bobores/prototypes/tungsten-ore.lua index b3a8955d8..1a34da383 100644 --- a/bobores/prototypes/tungsten-ore.lua +++ b/bobores/prototypes/tungsten-ore.lua @@ -29,12 +29,14 @@ bobmods.ores.tungsten = { } function bobmods.ores.tungsten.create_autoplace() - data.raw.resource["tungsten-ore"].autoplace = bobmods.lib.resource_autoplace.resource_autoplace_settings({ - name = "tungsten-ore", - order = "c", - base_density = 8, - has_starting_area_placement = false, - regular_rq_factor_multiplier = 1, - }) - bobmods.ores.tungsten.enabled = true + if not mods["space-age"] then + data.raw.resource["tungsten-ore"].autoplace = bobmods.lib.resource_autoplace.resource_autoplace_settings({ + name = "tungsten-ore", + order = "c", + base_density = 8, + has_starting_area_placement = false, + regular_rq_factor_multiplier = 1, + }) + bobmods.ores.tungsten.enabled = true + end end From 01b50a4bec7db1a234baea1f8ba2d031424a8eee Mon Sep 17 00:00:00 2001 From: StyLuaFormatter Date: Fri, 8 May 2026 12:08:18 +0000 Subject: [PATCH 08/11] Format Code --- bobvehicleequipment/prototypes/recipe-updates.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bobvehicleequipment/prototypes/recipe-updates.lua b/bobvehicleequipment/prototypes/recipe-updates.lua index 49d26bfd4..110fa789d 100644 --- a/bobvehicleequipment/prototypes/recipe-updates.lua +++ b/bobvehicleequipment/prototypes/recipe-updates.lua @@ -771,7 +771,10 @@ if data.raw.item["bob-titanium-plate"] then end if data.raw.item["bob-silicon-nitride"] then - bobmods.lib.recipe.add_ingredient("bob-vehicle-big-turret-equipment-2", { type = "item", name = "bob-silicon-nitride", amount = 50 }) + bobmods.lib.recipe.add_ingredient( + "bob-vehicle-big-turret-equipment-2", + { type = "item", name = "bob-silicon-nitride", amount = 50 } + ) bobmods.lib.tech.add_prerequisite("bob-vehicle-big-turret-equipment-2", "bob-ceramics") end From 7bd6eaa97f0cba11ff74f651ae3d1a00c51039ca Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Sat, 9 May 2026 00:32:54 +1200 Subject: [PATCH 09/11] Update Heat Shield Tile recipe --- bobrevamp/prototypes/rocket-parts-updates.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bobrevamp/prototypes/rocket-parts-updates.lua b/bobrevamp/prototypes/rocket-parts-updates.lua index f35b96aa4..45c06d3ea 100644 --- a/bobrevamp/prototypes/rocket-parts-updates.lua +++ b/bobrevamp/prototypes/rocket-parts-updates.lua @@ -40,6 +40,10 @@ end if mods["space-age"] then bobmods.lib.tech.remove_science_pack("bob-heat-shield", "production-science-pack") bobmods.lib.tech.remove_prerequisite("bob-heat-shield", "production-science-pack") + if data.raw.item["bob-titanium-plate"] then + bobmods.lib.recipe.replace_ingredient("bob-heat-shield-tile", "plastic-bar", "bob-titanium-plate") + bobmods.lib.tech.replace_prerequisite("bob-heat-shield", "plastics", "bob-titanium-processing") + end elseif data.raw.item["tungsten-carbide"] then bobmods.lib.recipe.replace_ingredient("bob-heat-shield-tile", "plastic-bar", "tungsten-carbide") bobmods.lib.tech.replace_prerequisite("bob-heat-shield", "plastics", "bob-tungsten-alloy-processing") From 42fe23b8b67917d1b227e0627439be01c118cf0c Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Sun, 10 May 2026 11:24:49 +1200 Subject: [PATCH 10/11] Update Heat Shield Tile recipe --- bobrevamp/prototypes/rocket-parts-updates.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bobrevamp/prototypes/rocket-parts-updates.lua b/bobrevamp/prototypes/rocket-parts-updates.lua index 45c06d3ea..3eb61ee1c 100644 --- a/bobrevamp/prototypes/rocket-parts-updates.lua +++ b/bobrevamp/prototypes/rocket-parts-updates.lua @@ -40,9 +40,9 @@ end if mods["space-age"] then bobmods.lib.tech.remove_science_pack("bob-heat-shield", "production-science-pack") bobmods.lib.tech.remove_prerequisite("bob-heat-shield", "production-science-pack") - if data.raw.item["bob-titanium-plate"] then - bobmods.lib.recipe.replace_ingredient("bob-heat-shield-tile", "plastic-bar", "bob-titanium-plate") - bobmods.lib.tech.replace_prerequisite("bob-heat-shield", "plastics", "bob-titanium-processing") + if data.raw.item["bob-invar-alloy"] then + bobmods.lib.recipe.replace_ingredient("bob-heat-shield-tile", "plastic-bar", "bob-invar-alloy") + bobmods.lib.tech.replace_prerequisite("bob-heat-shield", "plastics", "bob-invar-processing") end elseif data.raw.item["tungsten-carbide"] then bobmods.lib.recipe.replace_ingredient("bob-heat-shield-tile", "plastic-bar", "tungsten-carbide") From d08f86b1a68cf5f80fb84e70f1b36ddbb3a418b1 Mon Sep 17 00:00:00 2001 From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> Date: Sun, 10 May 2026 11:30:29 +1200 Subject: [PATCH 11/11] Updating changelog --- bobplates/changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/bobplates/changelog.txt b/bobplates/changelog.txt index 2222ed8da..fa77eb245 100644 --- a/bobplates/changelog.txt +++ b/bobplates/changelog.txt @@ -14,6 +14,7 @@ Date: ??? - Combined Bob's Lithium and Space Age's Lithium - Changed the internal name of Bob's batteries to "bob-battery-2" and "bob-battery-3" - Disallowed Compressed air recipe in space #577 + - Removed Tungsten carbide from Tungsten oxide recipe #579 - Tungsten fixes (Space Age) #579 - Combined Bob's Tungsten and Space Age's Tungsten - Updated Tungsten carbide and Tungsten plate recipes to use Powdered tungsten instead of Tungsten ore