update to upstream

resources/contenttweaker/lang/en_us.lang

@@ -2135,7 +2135,7 @@ fluid.high_particulate_steam=High Particulate Steam
 fluid.fluid_crystal_matrix=Fluid Crystal Matrix
 fluid.sweet_cherry_liquor=Sweet Cherry Liquor
 fluid.sweet_herby_cherry_liquor=Sweet Herby Cherry Liquor
-fluid.berserker_steel=Molten Berserker Steel
+fluid.berserker_steel=Molten Dragonslayer Steel
 fluid.stormlight=Stormlight
 fluid.pulsating_starlight=Pulsating Starlight
 fluid.brightsteel_alloy=Molten Brightsteel Alloy
@@ -2169,9 +2169,9 @@ item.contenttweaker.apothecary_stone.name=Apothecary Stone
 item.contenttweaker.infused_apothecary_stone.name=Infused Apothecary Stone
 item.contenttweaker.puzzle_solution_apothecaryprisonkey.name=Puzzle Solution: Apothecary Prison Key
 item.contenttweaker.dragon_will_fragment.name=Dragon Will Fragment
-item.contenttweaker.whispering_heart_of_hearts.name=Whispering Heart of Hearts
+item.contenttweaker.whispering_heart_of_hearts.name=Whispering Heart of the Dark Dragon
 item.contenttweaker.soul_of_the_dragonslayer.name=Soul of the Dragonslayer
-item.contenttweaker.berserker_steel_ingot.name=Berserker Steel Ingot
+item.contenttweaker.berserker_steel_ingot.name=Dragonslayer Steel Ingot
 item.contenttweaker.superfocused_plate_mythic.name=Superfocused Plate of Mythic Matter
 item.contenttweaker.puzzle_solution_dragonslayer.name=Puzzle Solution: Dragonslyer
 item.contenttweaker.dread_crown.name=Dread Crown
@@ -2515,7 +2515,7 @@ item.contenttweaker.35x35_area_of_grass.name=35 X 35 Area of Grass
 item.contenttweaker.roof_can_be_placed_7_blocks_away.name=Roof can be Placed 9 Blocks Above the Arena
 item.contenttweaker.fission_automation.name=Fission Automation
 item.contenttweaker.draconic_upgrades_locations.name=Draconic Upgrades Locations
-item.contenttweaker.berserker_forge_loop.name=Berserker Forge Loop
+item.contenttweaker.berserker_forge_loop.name=Dragonslayer Forge Loop
 item.contenttweaker.duplicating_enchants.name=Duplicating Enchants
 item.contenttweaker.cut_shyrelands_garnet.name=Cut Shyrelands Garnet
 item.contenttweaker.eye_of_gallifrey.name=Eye of Gallifrey
@@ -3155,7 +3155,7 @@ item.contenttweaker.alchemically_hyperactive_crystal.name=Alchemically Hyperacti
 item.contenttweaker.dark_matter_scattering_element.name=Dark Matter Scattering Element
 item.contenttweaker.fractal_metal_clump.name=Fractal Metal Clump
 item.contenttweaker.fractal_metal_plate.name=Fractal Metal Plate
-item.contenttweaker.trinity_nugget.name=Trinity Nugget
+item.contenttweaker.trinity_nugget.name=Trinity Fragments
 item.contenttweaker.echo_warren_bar.name=Echo Warren Bar
 item.contenttweaker.galaxy_superconductor.name=Galaxy Superconductor
 item.contenttweaker.fractallite_focus_lens.name=Fractallite Focus Lens
@@ -3303,16 +3303,16 @@ chat.contenttweaker.wormhole_generator.offline=Wormhole Generator offline
 fluid.whispering_starlight_of_redemption=Redeemed Whispering Starlight
 fluid.meteoric_draconic_matter=Meteoric Draconic Matter
 fluid.void_ichor=Void Ichor
-item.contenttweaker.stone_of_the_resurrected_shard.name=Stone of the Resurrected Shard
-item.contenttweaker.trinuum_catalyst.name=Trinuum Catalyst
-item.contenttweaker.infinitely_wishful_catalyst.name=Infinitely Wishful Catalyst
-item.contenttweaker.carpeted_allure.name=Carpeted Allure
-item.contenttweaker.meatballium_reinforced_casing.name=Meatballium Reinforced Casing
-item.contenttweaker.radiant_meatballium_reinforced_casing.name=Radiant Meatballium Reinforced Casing
-item.contenttweaker.cursed_meatballium_reinforced_casing.name=Cursed Meatballium Reinforced Casing
-item.contenttweaker.defined_draconium_block.name=Defined Draconium Block
-item.contenttweaker.stone_of_the_fallen_tower.name=Stone of the Fallen Tower
-item.contenttweaker.void_ichorium_ore.name=Void Ichorium Ore
+tile.contenttweaker.stone_of_the_resurrected_shard.name=Stone of the Resurrected Shard
+tile.contenttweaker.trinuum_catalyst.name=Trinuum Catalyst
+tile.contenttweaker.infinitely_wishful_catalyst.name=Infinitely Wishful Catalyst
+tile.contenttweaker.carpeted_allure.name=Carpeted Allure
+tile.contenttweaker.meatballium_reinforced_casing.name=Meatballium Reinforced Casing
+tile.contenttweaker.radiant_meatballium_reinforced_casing.name=Radiant Meatballium Reinforced Casing
+tile.contenttweaker.cursed_meatballium_reinforced_casing.name=Cursed Meatballium Reinforced Casing
+tile.contenttweaker.defined_draconium_block.name=Defined Draconium Block
+tile.contenttweaker.stone_of_the_fallen_tower.name=Stone of the Fallen Tower
+tile.contenttweaker.void_ichorium_ore.name=Void Ichorium Ore
 item.contenttweaker.recursive_paper_dunerider.name=Recursive Paper: Dunerider
 item.contenttweaker.shyre_rider_callstone.name=Shyre Rider Callstone
 item.contenttweaker.hunter_mobs.name=Hunter Mobs
@@ -3346,6 +3346,8 @@ item.contenttweaker.hyperchitinous_fabrial.name=Hyperchitinous Fabrial
 item.contenttweaker.divine_stellar_fabrial.name=Divine Stellar Fabrial
 item.contenttweaker.ichor_taint_condensate.name=Ichor Taint Condensate
 item.contenttweaker.pearlescent_fabrial.name=Pearlescent Fabrial
+tile.contenttweaker.void_ichorium_ore.name=Void Ichorium Ore
+tile.contenttweaker.defined_draconium_block.name=Defined Draconium Block