update to upstream
This commit is contained in:
@@ -7,4 +7,6 @@ tile.JadeOre.name= Ascended Jade Ore
|
||||
tile.JadeBlock.name= Ascended Jade Block
|
||||
tile.SapphireBlock.name= Ascended Sapphire Block
|
||||
tile.AmethystBlock.name= Ascended Amethyst Block
|
||||
entity.aoa3.cyclops.name=Monoclops
|
||||
entity.aoa3.cyclops.name=Monoclops
|
||||
item.RockbasherSword.name=Raw Iron Greatblade
|
||||
item.HolySword.name=Holylight Sword
|
||||
@@ -8,5 +8,7 @@ tile.JadeBlock.name=[飞升]翡翠块
|
||||
tile.SapphireBlock.name=[飞升]蓝宝石块
|
||||
tile.AmethystBlock.name=[飞升]紫晶块
|
||||
entity.aoa3.cyclops.name=单眼巨人
|
||||
item.RockbasherSword.name=粗铁大剑
|
||||
item.HolySword.name=圣光之剑
|
||||
|
||||
tile.LunarOrb.name=月牙宝珠
|
||||
@@ -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,15 +3346,11 @@ 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 Names Fix
|
||||
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.void_ichorium_ore.name=Void Ichorium Ore
|
||||
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
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -2135,7 +2135,7 @@ fluid.high_particulate_steam=高微粒蒸汽
|
||||
fluid.fluid_crystal_matrix=液态水晶矩阵
|
||||
fluid.sweet_cherry_liquor=樱桃甜酒
|
||||
fluid.sweet_herby_cherry_liquor=樱桃甜药酒
|
||||
fluid.berserker_steel=熔融狂战钢
|
||||
fluid.berserker_steel=熔融龙屠钢
|
||||
fluid.stormlight=飓光
|
||||
fluid.pulsating_starlight=脉冲星光
|
||||
fluid.brightsteel_alloy=熔融星钢合金
|
||||
@@ -2171,7 +2171,7 @@ item.contenttweaker.puzzle_solution_apothecaryprisonkey.name=谜题答案:药
|
||||
item.contenttweaker.dragon_will_fragment.name=龙之意志碎片
|
||||
item.contenttweaker.whispering_heart_of_hearts.name=低语心中之心
|
||||
item.contenttweaker.soul_of_the_dragonslayer.name=屠龙者之魂
|
||||
item.contenttweaker.berserker_steel_ingot.name=狂战钢锭
|
||||
item.contenttweaker.berserker_steel_ingot.name=龙屠钢锭
|
||||
item.contenttweaker.superfocused_plate_mythic.name=超聚焦神话物质板
|
||||
item.contenttweaker.puzzle_solution_dragonslayer.name=谜题答案:屠龙者
|
||||
item.contenttweaker.dread_crown.name=悚怖王冠
|
||||
@@ -2515,7 +2515,7 @@ item.contenttweaker.35x35_area_of_grass.name=35x35的平整区域
|
||||
item.contenttweaker.roof_can_be_placed_7_blocks_away.name=底面之上6格区域内不能有其他方块
|
||||
item.contenttweaker.fission_automation.name=裂变自动化
|
||||
item.contenttweaker.draconic_upgrades_locations.name=龙之进化升级生成地点
|
||||
item.contenttweaker.berserker_forge_loop.name=狂战熔炉循环
|
||||
item.contenttweaker.berserker_forge_loop.name=屠龙者熔炉循环
|
||||
item.contenttweaker.duplicating_enchants.name=复制附魔书
|
||||
item.contenttweaker.cut_shyrelands_garnet.name=切割塞尔瑞石榴石
|
||||
item.contenttweaker.eye_of_gallifrey.name=伽里弗雷之眼
|
||||
@@ -3155,7 +3155,7 @@ item.contenttweaker.alchemically_hyperactive_crystal.name=炼金超活性水晶
|
||||
item.contenttweaker.dark_matter_scattering_element.name=暗物质散射元件
|
||||
item.contenttweaker.fractal_metal_clump.name=分形金属碎块
|
||||
item.contenttweaker.fractal_metal_plate.name=分形金属板
|
||||
item.contenttweaker.trinity_nugget.name=三一粒
|
||||
item.contenttweaker.trinity_nugget.name=三一碎片
|
||||
item.contenttweaker.echo_warren_bar.name=回响迷道条
|
||||
item.contenttweaker.galaxy_superconductor.name=银河超导体
|
||||
item.contenttweaker.fractallite_focus_lens.name=分形聚焦透镜
|
||||
@@ -3303,16 +3303,16 @@ chat.contenttweaker.wormhole_generator.offline=虫洞生成器离线
|
||||
fluid.whispering_starlight_of_redemption=救赎低语星能液
|
||||
fluid.meteoric_draconic_matter=陨星龙质
|
||||
fluid.void_ichor=虚空灵液
|
||||
item.contenttweaker.stone_of_the_resurrected_shard.name=更生碎片之石
|
||||
item.contenttweaker.trinuum_catalyst.name=三一素催化器
|
||||
item.contenttweaker.infinitely_wishful_catalyst.name=无尽之愿催化器
|
||||
item.contenttweaker.carpeted_allure.name=绒毯诱饵
|
||||
item.contenttweaker.meatballium_reinforced_casing.name=肉丸素强化外壳
|
||||
item.contenttweaker.radiant_meatballium_reinforced_casing.name=光辉肉丸素强化外壳
|
||||
item.contenttweaker.cursed_meatballium_reinforced_casing.name=诅咒肉丸素强化外壳
|
||||
item.contenttweaker.defined_draconium_block.name=定义龙块
|
||||
item.contenttweaker.stone_of_the_fallen_tower.name=坠星之石
|
||||
item.contenttweaker.void_ichorium_ore.name=虚空灵液素矿石
|
||||
tile.contenttweaker.stone_of_the_resurrected_shard.name=更生碎片之石
|
||||
tile.contenttweaker.trinuum_catalyst.name=三一素催化器
|
||||
tile.contenttweaker.infinitely_wishful_catalyst.name=无尽之愿催化器
|
||||
tile.contenttweaker.carpeted_allure.name=绒毯诱饵
|
||||
tile.contenttweaker.meatballium_reinforced_casing.name=肉丸素强化外壳
|
||||
tile.contenttweaker.radiant_meatballium_reinforced_casing.name=光辉肉丸素强化外壳
|
||||
tile.contenttweaker.cursed_meatballium_reinforced_casing.name=诅咒肉丸素强化外壳
|
||||
tile.contenttweaker.defined_draconium_block.name=定义龙块
|
||||
tile.contenttweaker.stone_of_the_fallen_tower.name=坠星之石
|
||||
tile.contenttweaker.void_ichorium_ore.name=虚空灵液素矿石
|
||||
item.contenttweaker.recursive_paper_dunerider.name=递归之卷:沙丘骑兵
|
||||
item.contenttweaker.shyre_rider_callstone.name=塞尔瑞骑手召唤石
|
||||
item.contenttweaker.hunter_mobs.name=狩猎生物
|
||||
@@ -3346,17 +3346,9 @@ item.contenttweaker.hyperchitinous_fabrial.name=超壳质法器
|
||||
item.contenttweaker.divine_stellar_fabrial.name=神圣恒星法器
|
||||
item.contenttweaker.ichor_taint_condensate.name=灵液腐化聚合物
|
||||
item.contenttweaker.pearlescent_fabrial.name=璀璨法器
|
||||
#Tile Names Fix
|
||||
tile.contenttweaker.stone_of_the_resurrected_shard.name=更生碎片之石
|
||||
tile.contenttweaker.trinuum_catalyst.name=三一素催化器
|
||||
tile.contenttweaker.infinitely_wishful_catalyst.name=无尽之愿催化器
|
||||
tile.contenttweaker.carpeted_allure.name=绒毯诱饵
|
||||
tile.contenttweaker.meatballium_reinforced_casing.name=肉丸素强化外壳
|
||||
tile.contenttweaker.radiant_meatballium_reinforced_casing.name=光辉肉丸素强化外壳
|
||||
tile.contenttweaker.cursed_meatballium_reinforced_casing.name=诅咒肉丸素强化外壳
|
||||
tile.contenttweaker.defined_draconium_block.name=定义龙块
|
||||
tile.contenttweaker.stone_of_the_fallen_tower.name=坠星之石
|
||||
tile.contenttweaker.void_ichorium_ore.name=虚空灵液素矿石
|
||||
tile.contenttweaker.defined_draconium_block.name=定义龙块
|
||||
|
||||
# Custom Materials
|
||||
base.material.demonic_steel=恶魔钢
|
||||
base.material.corrosive_steel=腐蚀钢
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
item.magicbees.beecomb.otherworldly.name=Otherworldly Comb
|
||||
magicbees.effectslowspeed=Time Warp
|
||||
magicbees.allele.flowersbotania=Botania Flowers
|
||||
magicbees.allele.flowersbotania=Botania Flowers
|
||||
item.magicbees.beecomb.te_lux.name=Lux Comb
|
||||
item.magicbees.beecomb.te_destabilized.name=Destabilized Comb
|
||||
item.magicbees.beecomb.te_endearing.name=Endearing Comb
|
||||
flowerProvider.flowersBookshelf=Bookshelves
|
||||
@@ -1,3 +1,7 @@
|
||||
item.magicbees.beecomb.otherworldly.name=异域蜂窝
|
||||
magicbees.effectslowspeed=时光扭曲
|
||||
magicbees.allele.flowersbotania=植魔花
|
||||
magicbees.allele.flowersbotania=植魔花
|
||||
item.magicbees.beecomb.te_lux.name=流明蜂窝
|
||||
item.magicbees.beecomb.te_destabilized.name=不稳定蜂窝
|
||||
item.magicbees.beecomb.te_endearing.name=可爱蜂窝
|
||||
flowerProvider.flowersBookshelf=书架
|
||||
@@ -13,8 +13,8 @@ modularmachinery.arc_reactor=电弧反应堆
|
||||
modularmachinery.auto_astral_altar=自动星辉祭坛
|
||||
modularmachinery.baphomet_altar=巴弗灭祭坛
|
||||
modularmachinery.bastion_of_flesh=血肉堡垒
|
||||
modularmachinery.berserker_crucible=狂战坩埚
|
||||
modularmachinery.berserker_forge=狂战熔炉
|
||||
modularmachinery.berserker_crucible=屠龙者坩埚
|
||||
modularmachinery.berserker_forge=屠龙者熔炉
|
||||
modularmachinery.bloodmaster_crucible=血主坩埚
|
||||
modularmachinery.blood_god_altar=血神祭坛
|
||||
modularmachinery.blood_god_altar_network=暗秘血神祭坛
|
||||
@@ -231,4 +231,11 @@ modularmachinery.mythic_processor_rock_crusher=神话处理器:碎石机
|
||||
modularmachinery.radiant_meatballium_radiation_scrubber=光辉肉丸素辐射洗涤器
|
||||
modularmachinery.relic_of_the_fallen_tower=坠星遗物
|
||||
modularmachinery.uncorrupted_library=无垢图书馆
|
||||
modularmachinery.vibrating_flux_crucible=谐振福鲁伊克斯坩埚
|
||||
modularmachinery.vibrating_flux_crucible=谐振福鲁伊克斯坩埚
|
||||
modularmachinery.fiery_enmesher=Fiery Enmesher
|
||||
modularmachinery.hostile_computing_unit=敌对演算单元
|
||||
modularmachinery.innerved_essenceifier=Innerved Essenceifier
|
||||
modularmachinery.mythic_processor_centrifuge=神话处理器:离心机
|
||||
modularmachinery.phasing_still_pot=相位蒸馏釜
|
||||
modularmachinery.resonance_dissolver=Resonance Dissolver
|
||||
modularmachinery.warren_extractor_silkyjewel=迷道提取器:精致珠宝
|
||||
@@ -0,0 +1 @@
|
||||
tile.railcraft.ore.magic.name=Firestone Ore
|
||||
@@ -0,0 +1 @@
|
||||
tile.railcraft.ore.magic.name=火石矿石
|
||||
Reference in New Issue
Block a user