diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index 6da20682ed1..aeddf5a2efb 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -223,8 +223,8 @@ item.tconstruct.Materials.CopperIngot.name=Copper Ingot item.tconstruct.Materials.TinIngot.name=Tin Ingot item.tconstruct.Materials.AluminumIngot.name=Aluminum Ingot item.tconstruct.Materials.RawAluminum.name=Raw Aluminum -item.tconstruct.Materials.BronzeIngot.name=Tinker's Alloy Ingot -item.tconstruct.Materials.AluBrassIngot.name=Tinker's Alloy Ingot +item.tconstruct.Materials.BronzeIngot.name=Bronze Ingot +item.tconstruct.Materials.AluBrassIngot.name=Aluminum Brass Ingot item.tconstruct.Materials.AlumiteIngot.name=Alumite Ingot item.tconstruct.Materials.SteelIngot.name=Steel Ingot item.tconstruct.Materials.BlueSlimeCrystal.name=Slime Crystal @@ -234,14 +234,14 @@ item.tconstruct.Materials.CopperNugget.name=Copper Nugget item.tconstruct.Materials.TinNugget.name=Tin Nugget item.tconstruct.Materials.AluminumNugget.name=Aluminum Nugget item.tconstruct.Materials.EssenceCrystal.name=Fake Essence Crystal -item.tconstruct.Materials.AluBrassNugget.name=Tinker's Alloy Nugget +item.tconstruct.Materials.AluBrassNugget.name=Aluminum Brass Nugget item.tconstruct.Materials.SilkyCloth.name=Silky Cloth item.tconstruct.Materials.SilkyJewel.name=Silky Jewel item.tconstruct.Materials.ObsidianNugget.name=Obsidian Nugget item.tconstruct.Materials.CobaltNugget.name=Cobalt Nugget item.tconstruct.Materials.ArditeNugget.name=Ardite Nugget item.tconstruct.Materials.ManyullynNugget.name=Manyullyn Nugget -item.tconstruct.Materials.BronzeNugget.name=Tinker's Alloy Nugget +item.tconstruct.Materials.BronzeNugget.name=Bronze Nugget item.tconstruct.Materials.AlumiteNugget.name=Alumite Nugget item.tconstruct.Materials.SteelNugget.name=Steel Nugget item.tconstruct.Materials.PigIronIngot.name=Pig Iron Ingot @@ -302,10 +302,10 @@ StorageMetals.Cobalt.name=Block of Cobalt StorageMetals.Ardite.name=Block of Ardite StorageMetals.Manyullyn.name=Block of Manyullyn StorageMetals.Copper.name=Block of Copper -StorageMetals.Bronze.name=Block of Tinker's Alloy +StorageMetals.Bronze.name=Block of Bronze StorageMetals.Tin.name=Block of Tin StorageMetals.Aluminum.name=Block of Aluminum -StorageMetals.AlBrass.name=Block of Tinker's Alloy +StorageMetals.AlBrass.name=Block of Aluminum Brass StorageMetals.Alumite.name=Block of Alumite StorageMetals.Steel.name=Block of Steel StorageMetals.Ender.name=Block of Solid Ender @@ -406,8 +406,8 @@ item.tconstruct.bucket.Tin.name=Molten Tin Bucket item.tconstruct.bucket.Aluminum.name=Molten Aluminum Bucket item.tconstruct.bucket.Cobalt.name=Molten Cobalt Bucket item.tconstruct.bucket.Ardite.name=Molten Ardite Bucket -item.tconstruct.bucket.Bronze.name=Molten Tinker's Alloy Bucket -item.tconstruct.bucket.AluBrass.name=Molten Tinker's Alloy Bucket +item.tconstruct.bucket.Bronze.name=Molten Bronze Bucket +item.tconstruct.bucket.AluBrass.name=Molten Aluminum Brass Bucket item.tconstruct.bucket.Manyullyn.name=Molten Manyullyn Bucket item.tconstruct.bucket.Alumite.name=Molten Alumite Bucket item.tconstruct.bucket.Obsidian.name=Molten Obsidian Bucket @@ -437,8 +437,8 @@ tile.metal.molten.tin.name=Liquid Tin tile.metal.molten.aluminum.name=Molten Aluminum tile.metal.molten.cobalt.name=Molten Cobalt tile.metal.molten.ardite.name=Molten Ardite -tile.metal.molten.bronze.name=Molten Tinker's Alloy -tile.metal.molten.alubrass.name=Molten Tinker's Alloy +tile.metal.molten.bronze.name=Molten Bronze +tile.metal.molten.alubrass.name=Molten Aluminum Brass tile.metal.molten.manyullyn.name=Molten Manyullyn tile.metal.molten.alumite.name=Molten Alumite tile.metal.molten.obsidian.name=Molten Obsidian @@ -463,8 +463,8 @@ LiquidMetal.Tin.name=Liquid Tin LiquidMetal.Aluminum.name=Molten Aluminum LiquidMetal.Cobalt.name=Molten Cobalt LiquidMetal.Ardite.name=Molten Ardite -LiquidMetal.Bronze.name=Molten Tinker's Alloy -LiquidMetal.AluBrass.name=Molten Tinker's Alloy +LiquidMetal.Bronze.name=Molten Bronze +LiquidMetal.AluBrass.name=Molten Aluminum Brass LiquidMetal.Manyullyn.name=Molten Manyullyn LiquidMetal.Alumite.name=Molten Alumite LiquidMetal.Obsidian.name=Molten Obsidian @@ -523,7 +523,7 @@ parttype.cobalt=Cobalt parttype.ardite=Ardite parttype.manyullyn=Manyullyn parttype.copper=Copper -parttype.bronze=Tinker's Alloy +parttype.bronze=Bronze parttype.alumite=Alumite parttype.steel=Steel parttype.blueslime=Slime @@ -564,8 +564,8 @@ fluid.tin.molten=Molten Tin fluid.aluminum.molten=Molten Aluminum fluid.cobalt.molten=Molten Cobalt fluid.ardite.molten=Molten Ardite -fluid.bronze.molten=Molten Tinker's Alloy -fluid.aluminumbrass.molten=Molten Tinker's Alloy +fluid.bronze.molten=Molten Bronze +fluid.aluminumbrass.molten=Molten Aluminum Brass fluid.manyullyn.molten=Molten Manyullyn fluid.alumite.molten=Molten Alumite fluid.obsidian.molten=Molten Obsidian diff --git a/resources/assets/tinker/manuals/materials.xml b/resources/assets/tinker/manuals/materials.xml index 4d6a28187de..7cfb46c0f1a 100644 --- a/resources/assets/tinker/manuals/materials.xml +++ b/resources/assets/tinker/manuals/materials.xml @@ -661,7 +661,7 @@ Class: Ranged Projectile Launcher -Tinker's Alloy +Bronze bronzeaxe A common alloy. It's a bit better than iron. - Requires the Smeltery diff --git a/resources/assets/tinker/manuals/smeltery.xml b/resources/assets/tinker/manuals/smeltery.xml index ae79e74613d..6137ea9ce20 100644 --- a/resources/assets/tinker/manuals/smeltery.xml +++ b/resources/assets/tinker/manuals/smeltery.xml @@ -116,11 +116,11 @@ Other liquid removal objects will work, but are frowned upon. An example picture Alloys are made when two or more metals are mixed in precise proportions. Currently known alloys are: - Tinker's Alloy, made from Copper(3) and Tin(1) + Bronze, made from Copper(3) and Tin(1) bronzeingot - Tinker's Alloy, made from Aluminum(3) and Copper(1) + Aluminum Brass, made from Aluminum(3) and Copper(1) alubrassingot