diff --git a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt index 383cb978e..4563ffe8a 100644 --- a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt +++ b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt @@ -1577,7 +1577,7 @@ subtitle: "{quests.extreme_voltage.ostrum_linear.subtitle}" tasks: [{ id: "130FE3E2CE8735F8" - item: "gtceu:ostrum_linear_accelerator" + item: "tfg:ostrum_linear_accelerator" type: "item" }] x: 20.0d diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 75e37e8d1..4bd56737f 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -13,7 +13,7 @@ "block.gtceu.evaporation_tower": "Evaporation Tower", "block.gtceu.ostrum_harvester": "Ostrum Harvester", "block.gtceu.moon_dust_harvester": "Moon Dust Harvester", - "block.gtceu.ostrum_linear_accelerator": "Ostrum Linear Accelerator", + "block.tfg.ostrum_linear_accelerator": "Ostrum Linear Accelerator", "block.gtceu.coal_liquefaction_tower": "Coal Liquefaction Tower", "block.gtceu.ulv_super_tank": "Basic Super Tank", "block.gtceu.ulv_super_chest": "Basic Super Chest", @@ -63,6 +63,8 @@ "gtceu.tooltip.machine.nuclear_fuel_factory_2": "§7Processes raw radioactive material into fissile fuel.§r", "gtceu.tooltip.machine.steam_bloomery_1": "§7Upgrade your Bloomery with the power of Steam!§r", "gtceu.tooltip.machine.steam_bloomery_2": "§7Processes Iron-bearing Dusts or Ingots into Raw Iron Blooms.\nFueling it with Coke or Anthracite will double the output.\nCan process up to 8 recipes at once, which changes how much Steam is required.§r", + "gtceu.tooltip.machine.coal_liquefaction_tower_1": "§7Carbon Smoothie Maker§r", + "gtceu.tooltip.machine.coal_liquefaction_tower_2": "§7Extracts gas fuels from carbonic solids and creosote§r", "item.gtceu.tiny_wood_dust": "Tiny Pile of Softwood Pulp", "item.gtceu.small_wood_dust": "Small Pile of Softwood Pulp", "item.gtceu.wood_dust": "Softwood Pulp", diff --git a/kubejs/assets/gtceu/lang/ja_jp.json b/kubejs/assets/gtceu/lang/ja_jp.json index 76710365f..b9a7bb645 100644 --- a/kubejs/assets/gtceu/lang/ja_jp.json +++ b/kubejs/assets/gtceu/lang/ja_jp.json @@ -13,7 +13,7 @@ "block.gtceu.evaporation_tower": "蒸発塔", "block.gtceu.ostrum_harvester": "オストラムハーベスター", "block.gtceu.moon_dust_harvester": "ムーンハーベスター", - "block.gtceu.ostrum_linear_accelerator": "オストラムリニアアクセラレーター", + "block.tfg.ostrum_linear_accelerator": "オストラムリニアアクセラレーター", "block.gtceu.ulv_super_tank": "基本型スーパータンク", "block.gtceu.ulv_super_chest": "基本型スーパーチェスト", "block.gtceu.ulv_hermetic_casing": "基本気密外装", diff --git a/kubejs/assets/gtceu/lang/ru_ru.json b/kubejs/assets/gtceu/lang/ru_ru.json index 454e2cfd3..5d0ce4987 100644 --- a/kubejs/assets/gtceu/lang/ru_ru.json +++ b/kubejs/assets/gtceu/lang/ru_ru.json @@ -13,7 +13,7 @@ "block.gtceu.evaporation_tower": "Evaporation Tower", "block.gtceu.ostrum_harvester": "Ostrum Harvester", "block.gtceu.moon_dust_harvester": "Moon Dust Harvester", - "block.gtceu.ostrum_linear_accelerator": "Ostrum Linear Accelerator", + "block.tfg.ostrum_linear_accelerator": "Ostrum Linear Accelerator", "block.gtceu.ulv_super_tank": "Basic Super Tank", "block.gtceu.ulv_super_chest": "Basic Super Chest", "block.gtceu.ulv_hermetic_casing": "Basic Hermetic Casing", diff --git a/kubejs/assets/gtceu/lang/uk_ua.json b/kubejs/assets/gtceu/lang/uk_ua.json index d38506694..a5feb29cb 100644 --- a/kubejs/assets/gtceu/lang/uk_ua.json +++ b/kubejs/assets/gtceu/lang/uk_ua.json @@ -13,7 +13,7 @@ "block.gtceu.evaporation_tower": "Випарна камера", "block.gtceu.ostrum_harvester": "Збирач Острому", "block.gtceu.moon_dust_harvester": "Збирач Місячного Пилу", - "block.gtceu.ostrum_linear_accelerator": "Лінійний Прискорювач з Оструму", + "block.tfg.ostrum_linear_accelerator": "Лінійний Прискорювач з Оструму", "block.gtceu.ulv_super_tank": "Базовий супер резервувар", "block.gtceu.ulv_super_chest": "Базова супер скриня", "block.gtceu.ulv_hermetic_casing": "Базова герметична оболонка", diff --git a/kubejs/assets/gtceu/lang/zh_cn.json b/kubejs/assets/gtceu/lang/zh_cn.json index ce2013ff2..3394f3270 100644 --- a/kubejs/assets/gtceu/lang/zh_cn.json +++ b/kubejs/assets/gtceu/lang/zh_cn.json @@ -13,7 +13,8 @@ "block.gtceu.evaporation_tower": "蒸发塔", "block.gtceu.ostrum_harvester": "紫金采集器", "block.gtceu.moon_dust_harvester": "月壤采集器", - "block.gtceu.ostrum_linear_accelerator": "紫金线性加速器", + "block.gtceu.coal_liquefaction_tower": "煤炭液化塔", + "block.tfg.ostrum_linear_accelerator": "紫金线性加速器", "block.gtceu.ulv_super_tank": "基础超级缸", "block.gtceu.ulv_super_chest": "基础超级箱", "block.gtceu.ulv_hermetic_casing": "基础密封机械方块", @@ -49,6 +50,7 @@ "gtceu.ostrum_linear_accelerator": "紫金线性加速器", "gtceu.bioreactor": "生物反应器", "gtceu.growth_chamber": "生长室", + "gtceu.coal_liquefaction_tower": "煤炭液化", "gtceu.tooltip.machine.moon_dust_harvester_1": "§7地外真空吸尘器§r", "gtceu.tooltip.machine.moon_dust_harvester_2": "§7根据所处生物群系无限采集风化土粉尘。§r", "gtceu.tooltip.machine.ostrum_harvester_1": "§7合法异星香料采集车§r", @@ -128,12 +130,14 @@ "material.gtceu.damascus_steel": "猪灵钢", "material.gtceu.air": "地球空气", "material.gtceu.liquid_air": "液态地球空气", + "material.gtceu.fish_oil": "脂酸盐", "material.gtceu.cooperite": "硫铂矿", "material.gtceu.armalcolite": "阿姆阿尔柯尔矿", "material.gtceu.desh": "戴斯", "material.gtceu.ostrum": "紫金", "material.gtceu.calorite": "耐热金属", "material.gtceu.etrium": "埃忒恩", + "material.gtceu.tarkianite": "塔基安石", "material.gtceu.aluminium_silicate": "硅酸铝", "material.gtceu.rocket_alloy_t1": "R型铝钢火箭合金", "material.gtceu.rocket_alloy_t2": "ASM 4914 钛合金火箭合金", diff --git a/kubejs/assets/tfc/lang/zh_cn.json b/kubejs/assets/tfc/lang/zh_cn.json index 598c85aec..0ac583e1e 100644 --- a/kubejs/assets/tfc/lang/zh_cn.json +++ b/kubejs/assets/tfc/lang/zh_cn.json @@ -12,6 +12,7 @@ "item.tfc.jute_net": "粗麻布网", "item.tfc.dirty_jute_net": "脏粗麻布网", "item.tfc.powder.salt": "食盐", + "item.tfc.blubber": "动物脂肪", "tfc.jei.raw_hide_knapping": "剥制生皮", "metal.tfg.redstone": "红石", "metal.tfg.red_alloy": "红色合金", diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index bea57b8bb..14b27bc2f 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -1157,6 +1157,12 @@ "material.tfg.zirconium_bromide": "Zirconium(IV) Bromide", "material.tfg.zirconium_diboride": "Zirconium Diboride", "material.tfg.boron_carbide": "Boron Carbide", + "material.tfg.syngas": "Syngas", + "material.tfg.raw_aromatic_mix": "Raw Aromatic Mix", + "material.tfg.aromatic_feedstock": "Aromatic Feedstock", + "material.tfg.reformed_aromatic_feedstock": "Reformed Aromatic Feedstock", + "material.tfg.reformate_gas": "Reformate Gas", + "material.tfg.cracker_off_gas": "Cracked Off-Gas", "ore_vein.tfg.deep_sheldonite": "Cooperite & Bornite", "ore_vein.tfg.deep_garnet_amethyst": "Amethyst & Garnet", "ore_vein.tfg.deep_garnet_opal": "Opal & Garnet", @@ -1459,7 +1465,7 @@ "tfg.tooltip.machine.one_energy_hatch": "Accepts exactly §6One§r Energy Hatch", "tfg.tooltip.machine.two_energy_hatches": "Accepts up to §6Two§r Energy Hatches", "tfg.tooltip.machine.subtick": "This machine supports §2Subticking§r!", - "tfg.tooltip.machine.coil_energy_discount": "Every coil after §6Cupronickel§7 reduces energy usage by §r10%§7.§r", + "tfg.tooltip.machine.coil_energy_discount": "Every coil after §6Cupronickel§r reduces energy usage by §r10%§7.§r", "tfg.tooltip.machine.bioreactor_1": "§7Chemistry meets Biology§r", "tfg.tooltip.machine.bioreactor_2": "§7Combines organic and inorganic ingredients to produce synthetic biological products.§r", "tfg.tooltip.machine.growth_chamber_1": "§7Growing new life§r", diff --git a/kubejs/assets/tfg/lang/ja_jp.json b/kubejs/assets/tfg/lang/ja_jp.json index c141dfe89..1966130dc 100644 --- a/kubejs/assets/tfg/lang/ja_jp.json +++ b/kubejs/assets/tfg/lang/ja_jp.json @@ -1909,7 +1909,7 @@ "quests.extreme_voltage.ev_superconductor.subtitle": "超高電圧・高電流両対応", "quests.extreme_voltage.ev_superconductor.desc": "&eウラン&rの処理を進めたら、&5三白金ウランワイヤー&rを作ってみてもいいでしょう。\n\nこの超伝導ケーブルはより多くのアンペアを流せるため、基地全体でエネルギーを効率よく送電でき、&6原子力蒸気タービン&rからの出力を損失なく各機械へ届けることができます。", "quests.extreme_voltage.uraninite_dust.subtitle": "膨大な数の棒", - "quests.extreme_voltage.uraninite_dust.desc": "&eウラン燃料棒&rを作るには大量の&e閃ウラン鉱&rを掘り出すことが必要で、1本あたりおよそ&c240個&rほど使います。そのため、後で不足しないよう早めに採掘を始めておくことをおすすめします。\n\n火星には最大規模の鉱脈が存在するため、一つの鉱脈から大量に確保することができます。\n\nゲームを進めると、&6Ostrum_Linear_Accelerator&rを使って瀝青ウラン鉱や閃ウラン鉱を&無限&rに生産できるようになります。詳しい説明は先のクエストで確認できます。", + "quests.extreme_voltage.uraninite_dust.desc": "&eウラン燃料棒&rを作るには大量の&e閃ウラン鉱&rを掘り出すことが必要で、1本あたりおよそ&c240個&rほど使います。そのため、後で不足しないよう早めに採掘を始めておくことをおすすめします。\n\n火星には最大規模の鉱脈が存在するため、一つの鉱脈から大量に確保することができます。\n\nゲームを進めると、&6Ostrum Linear Accelerator&rを使って瀝青ウラン鉱や閃ウラン鉱を&無限&rに生産できるようになります。詳しい説明は先のクエストで確認できます。", "quests.extreme_voltage.uranium_line.title": "ウランライン", "quests.extreme_voltage.uranium_line.subtitle": "新しい処理ライン", "quests.extreme_voltage.uranium_line.desc": "&eウラン&rと、その同位体である&eウラン235&rを処理するには、専用の小規模な処理ラインを用意する必要があります。\n\n安心して下さい、フッ素は&ループ可能&rなので、必要なものは&e閃ウラン鉱の粉&rだけです。\n\nこのラインは地球でも組めますが、閃ウラン鉱の大半は火星で採掘することになるため、火星で稼働させた方が便利な場合もあります。", diff --git a/kubejs/assets/tfg/lang/ru_ru.json b/kubejs/assets/tfg/lang/ru_ru.json index 9b2e84244..8bb890f33 100644 --- a/kubejs/assets/tfg/lang/ru_ru.json +++ b/kubejs/assets/tfg/lang/ru_ru.json @@ -695,8 +695,8 @@ "item.tfg.phantom_thread": "Фантомная нить", "item.tfg.polycaprolactam_fabric": "Поликапролактамовая ткань", "item.tfg.polycaprolactam_string": "Поликапролактамовая нить", - "item.tfg.space_suit_fabric": "Space Suit Fabric", - "item.tfg.vitrified_pearl": "Vitrified Ender Pearl", + "item.tfg.space_suit_fabric": "Ткань скафандра", + "item.tfg.vitrified_pearl": "Остеклованный эндер-жемчуг", "item.tfg.fishing_net.wood": "Рыболовная сеть (Дерево)", "item.tfg.fishing_net.brass": "Рыболовная сеть (Латунь)", "item.tfg.fishing_net.rose_gold": "Рыболовная сеть (Розовое золото)", @@ -713,28 +713,28 @@ "item.tfg.unfired_chalk": "Необожженная палочка мела", "item.tfg.armor_stand_arms": "Стойка для брони с руками", "item.tfg.flint_club_head": "Навершие булавы (Кремень)", - "item.tfg.unfinished_electron_tube": "Unfinished Electron Tube", - "item.tfg.unfinished_vacuum_tube": "Unfinished Vacuum Tube", - "item.tfg.unfinished_basic_electronic_circuit": "Unfinished Basic Electronic Circuit", - "item.tfg.unfinished_good_electronic_circuit": "Unfinished Good Electronic Circuit", - "item.tfg.unfinished_inscriber_accumulation_press": "Unfinished Inscriber Accumulation Press", + "item.tfg.unfinished_electron_tube": "Незаконченная электронная лампа", + "item.tfg.unfinished_vacuum_tube": "Незаконченная электровакуумная лампа", + "item.tfg.unfinished_basic_electronic_circuit": "Незаконченная обычная микросхема", + "item.tfg.unfinished_good_electronic_circuit": "Незаконченная хорошая электронная микросхема", + "item.tfg.unfinished_inscriber_accumulation_press": "Незаконченный аккумулирующий пресс", "item.tfg.brick.deepslate": "Мигматитовый кирпич", "item.tfg.brick.dripstone": "Травертиновый кирпич", "item.tfg.loose.moon_stone": "Камешек анортозита", "item.tfg.brick.moon_stone": "Анортозитовый кирпич", - "item.tfg.loose.moon_deepslate": "Loose Norite", - "item.tfg.brick.moon_deepslate": "Norite Brick", - "item.tfg.loose.mars_stone": "Loose Argillite", + "item.tfg.loose.moon_deepslate": "Камешек норита", + "item.tfg.brick.moon_deepslate": "Норитовый кирпич", + "item.tfg.loose.mars_stone": "Камешек аргиллита", "item.tfg.brick.mars_stone": "Аргиллитовый кирпич", - "item.tfg.loose.venus_stone": "Loose Trachyte", + "item.tfg.loose.venus_stone": "Камушек трахита", "item.tfg.brick.venus_stone": "Трахитовый кирпич", - "item.tfg.loose.mercury_stone": "Loose Komatiite", + "item.tfg.loose.mercury_stone": "Камушек коматиита", "item.tfg.brick.mercury_stone": "Коматиитовый кирпич", - "item.tfg.loose.glacio_stone": "Loose Phonolite", + "item.tfg.loose.glacio_stone": "Камушек фонолита", "item.tfg.brick.glacio_stone": "Фонолитовый кирпич", "item.tfg.loose.permafrost": "Permafrost Chunk", "item.tfg.brick.permafrost": "Кирпич вечной мерзлоты", - "item.tfg.loose.red_granite": "Loose Red Granite", + "item.tfg.loose.red_granite": "Камушек красного гранита", "item.tfg.brick.red_granite": "Кирпич красного гранита", "item.tfg.terra_firma_greg": "TerraFirmaGreg", "item.tfg.scaffolding_frame": "Обшивка строительных лесов", @@ -765,7 +765,7 @@ "item.tfg.zpm_universal_circuit": "Универсальная схема ZPM", "item.tfg.uv_universal_circuit": "Универсальная схема UV", "item.tfg.uhv_universal_circuit": "Универсальная схема UHV", - "item.tfg.chipboard_composite": "ДСП", + "item.tfg.chipboard_composite": "Древесная стружка", "item.tfg.piglin_disguise": "Маскировка Пиглина", "item.tfg.trowel": "Мастерок", "item.tfg.foil_pack": "Фольгированный пакет", @@ -810,43 +810,43 @@ "item.tfg.food.freeze_dried.melon_slice": "Лиофилизированный ломтик арбуза", "item.tfg.food.freeze_dried.fig": "Лиофилизированный инжир", "item.tfg.food.freeze_dried.pineapple": "Лиофилизированный ананас", - "item.tfg.food.freeze_dried.blossom_berry": "Freeze Dried Blossom Berry", - "item.tfg.food.freeze_dried.shadow_berry": "Freeze Dried Nox Berry", - "item.tfg.food.freeze_dried.cave_pumpkin": "Freeze Dried Bulbkin Chunks", + "item.tfg.food.freeze_dried.blossom_berry": "Лиофилизированная цветущая ягода", + "item.tfg.food.freeze_dried.shadow_berry": "Лиофилизированная нокс-ягода", + "item.tfg.food.freeze_dried.cave_pumpkin": "Лиофилизированная лукыквенная мякоть", "item.tfg.food.calorie_paste": "Калорийная паста", "item.tfg.food.meal_bag": "Лиофилизированное мясо", "item.tfg.food.ice_soup": "Ледяной суп", - "item.tfg.food.raw_glacian_mutton": "Raw Glacian Mutton", - "item.tfg.food.cooked_glacian_mutton": "Cooked Glacian Mutton", - "item.tfg.spawn_egg.glacian_ram": "Glacian Spawn Egg", - "item.tfg.food.raw_sniffer_beef": "Raw Sniffer Beef", - "item.tfg.food.cooked_sniffer_beef": "Cooked Sniffer Beef", - "item.tfg.spawn_egg.sniffer": "Sniffer Spawn Egg", - "item.tfg.food.raw_wraptor": "Raw Wraptor", - "item.tfg.food.cooked_wraptor": "Cooked Wraptor", - "item.tfg.food.raw_springling_collar": "Raw Springling Collar", - "item.tfg.food.cooked_springling_collar": "Cooked Springling Collar", - "item.tfg.food.raw_walker_steak": "Raw Walker Steak", - "item.tfg.food.cooked_walker_steak": "Cooked Walker Steak", - "item.tfg.food.raw_glider_wings": "Raw Glider Wings", - "item.tfg.food.cooked_glider_wings": "Cooked Glider Wings", - "item.tfg.food.raw_whole_soarer": "Raw Whole Soarer", - "item.tfg.food.cooked_whole_soarer": "Cooked Whole Soarer", - "item.tfg.food.raw_crusher_meat": "Raw Crusher Meat", - "item.tfg.food.cooked_crusher_meat": "Cooked Crusher Meat", - "item.tfg.food.raw_goober_meat": "Raw Goober Meat", - "item.tfg.food.cooked_goober_meat": "Cooked Goober Meat", - "item.tfg.food.raw_long_pig_filet": "Raw Long Pig Filet", - "item.tfg.food.cooked_long_pig_filet": "Cooked Long Pig Filet", - "item.tfg.food.raw_surfer_steak": "Raw Surfer Steak", - "item.tfg.food.cooked_surfer_steak": "Cooked Surfer Steak", - "item.tfg.food.raw_stackatick_chunks": "Raw Stackatick Chunks", - "item.tfg.food.raw_stickastackatick": "Raw Stick'a'Stackatick", - "item.tfg.food.cooked_stickastackatick": "Cooked Stick'a'Stackatick", - "item.tfg.food.raw_cruncher_ribs": "Raw Cruncher Ribs", - "item.tfg.food.cooked_cruncher_ribs": "Cooked Cruncher Ribs", - "item.tfg.food.raw_dino_nugget": "Prepared Dinosaur Nugget", - "item.tfg.food.cooked_dino_nugget": "Beer Battered Dinosaur Nugget", + "item.tfg.food.raw_glacian_mutton": "Сырая гласианская баранина", + "item.tfg.food.cooked_glacian_mutton": "Приготовленная гласианская баранина", + "item.tfg.spawn_egg.glacian_ram": "Яйцо призыва гласианского барана", + "item.tfg.food.raw_sniffer_beef": "Сырое мясо нюхача", + "item.tfg.food.cooked_sniffer_beef": "Приготовленное мясо нюхача", + "item.tfg.spawn_egg.sniffer": "Яйцо призыва нюхача", + "item.tfg.food.raw_wraptor": "Сырое мясо ираптора", + "item.tfg.food.cooked_wraptor": "Приготовленное мясо ираптора", + "item.tfg.food.raw_springling_collar": "Сырая шейка долгошея", + "item.tfg.food.cooked_springling_collar": "Приготовленная шейка долгошея", + "item.tfg.food.raw_walker_steak": "Сырое мясо ходуна", + "item.tfg.food.cooked_walker_steak": "Приготовленное мясо ходуна", + "item.tfg.food.raw_glider_wings": "Сырые крылышки глайдера", + "item.tfg.food.cooked_glider_wings": "Приготовленные крылышки глайдера", + "item.tfg.food.raw_whole_soarer": "Сырое крылышки пархателя", + "item.tfg.food.cooked_whole_soarer": "Приготовленное крылышки пархателя", + "item.tfg.food.raw_crusher_meat": "Сырое мясо крушителя", + "item.tfg.food.cooked_crusher_meat": "Приготовленное мясо крушителя", + "item.tfg.food.raw_goober_meat": "Сырое мясо слюпика", + "item.tfg.food.cooked_goober_meat": "Приготовленное мясо слюпика", + "item.tfg.food.raw_long_pig_filet": "Сырая человечина", + "item.tfg.food.cooked_long_pig_filet": "Приготовленная человечина", + "item.tfg.food.raw_surfer_steak": "Сырой стейк из сёрфера", + "item.tfg.food.cooked_surfer_steak": "Приготовленный стейк из сёрфера", + "item.tfg.food.raw_stackatick_chunks": "Сырое мясо жука-перевозчика", + "item.tfg.food.raw_stickastackatick": "Сырой жук-перевозчик на палочке", + "item.tfg.food.cooked_stickastackatick": "Приготовленный жук-перевозчик на палочке", + "item.tfg.food.raw_cruncher_ribs": "Сырые ребрышки кусача", + "item.tfg.food.cooked_cruncher_ribs": "Приготовленное ребрышки кусача", + "item.tfg.food.raw_dino_nugget": "Сырые наггетсы из динозавра", + "item.tfg.food.cooked_dino_nugget": "Приготовленные наггетсы из динозавра в пивном кляре", "item.tfg.roasted_sunflower_seeds": "Обжаренные семена подсолнуха", "item.tfg.sunflower_seeds": "Семена подсолнуха", "item.tfg.sunflower_product": "Шляпка подсолнуха", @@ -859,106 +859,106 @@ "item.tfg.large_bullet_casing": "Большая гильза", "item.tfg.shell_bullet_casing": "Дробовая гильза", "item.tfg.nitrocellulose": "Нитроцеллюлоза", - "item.tfg.aes_wool": "Alkaline Earth Silicate Wool", - "item.tfg.aes_compressed_wool": "Compressed Alkaline Earth Silicate Wool", - "item.tfg.aes_insulation_sheet": "Sheet of Alkaline Earth Silicate Insulation", - "item.tfg.aes_insulation_roll": "Roll of Alkaline Earth Silicate Insulation", - "item.tfg.rocket_cone_t2": "Improved Rocket Nose Cone", - "item.tfg.rocket_fin_t2": "Improved Rocket Fin", - "item.tfg.cryo_fluix_pearl": "Cryogenized Fluix Pearl", + "item.tfg.aes_wool": "Щелочноземельная силикатная шерсть", + "item.tfg.aes_compressed_wool": "Плотная щелочноземельная силикатная шерсть", + "item.tfg.aes_insulation_sheet": "Щелочноземельная силикатная шерстяная пластина", + "item.tfg.aes_insulation_roll": "Рулон щелочноземельных силикатных шерстяных пластин", + "item.tfg.rocket_cone_t2": "Улучшенный ракетный обтекатель", + "item.tfg.rocket_fin_t2": "Улучшенный ракетный стабилизатор", + "item.tfg.cryo_fluix_pearl": "Криогенный флюисовый жемчуг", "item.tfg.marker.earth_orbit": "Орбита Земли", "item.tfg.marker.moon_orbit": "Орбита Луны", "item.tfg.marker.mars_orbit": "Орбита Марса", "item.tfg.marker.venus_orbit": "Орбита Венеры", "item.tfg.marker.mercury_orbit": "Орбита Меркурия", "item.tfg.marker.glacio_orbit": "Орбита Европы", - "item.tfg.railgun_ammo_shell": "Railgun Ammo Shell", - "item.tfg.sulfur_fumes_bucket": "Sulfur Fumes Bucket", + "item.tfg.railgun_ammo_shell": "Гильза снаряда рельсотрона", + "item.tfg.sulfur_fumes_bucket": "Ведро (Пары серы)", "item.tfg.super_heated_slurry_bucket": "Super Heated Slurry Bucket", - "item.tfg.cryogenized_fluix_bucket": "Cryogenized Fluix Bucket", - "item.tfg.fluix_bucket": "Liquid Fluix Bucket", - "item.tfg.latex_bucket": "Latex Bucket", - "item.tfg.vulcanized_latex_bucket": "Vulcanized Latex Bucket", - "item.tfg.conifer_pitch_bucket": "Conifer Pitch Bucket", - "item.tfg.compressed_nitrox_bucket": "Nitrox Bucket", - "item.tfg.compressed_heliox_bucket": "Heliox Bucket", - "item.tfg.compressed_heliox_3_bucket": "Heliox-3 Bucket", - "item.tfg.compressed_trimix_bucket": "50/30/20 Trimix Bucket", - "item.tfg.compressed_trimix_3_bucket": "50/30/20 Trimix-3 Bucket", - "item.tfg.semiheavy_ammoniacal_water_bucket": "Semiheavy Ammoniacal Water Bucket", + "item.tfg.cryogenized_fluix_bucket": "Ведро (Криогенный флюис)", + "item.tfg.fluix_bucket": "Ведро (Флюис)", + "item.tfg.latex_bucket": "Ведро (Латекс)", + "item.tfg.vulcanized_latex_bucket": "Ведро (Вулканизированный латекс)", + "item.tfg.conifer_pitch_bucket": "Ведро (Хвойная смола)", + "item.tfg.compressed_nitrox_bucket": "Ведро (Нитрокс)", + "item.tfg.compressed_heliox_bucket": "Ведро (Гелиокс)", + "item.tfg.compressed_heliox_3_bucket": "Ведро (Гелиокс-3)", + "item.tfg.compressed_trimix_bucket": "Ведро (50/30/20 Тримикс)", + "item.tfg.compressed_trimix_3_bucket": "Ведро (50/30/20 Тримикс-3)", + "item.tfg.semiheavy_ammoniacal_water_bucket": "Ведро (Полутяжелая аммиачная вода)", "item.tfg.harvest_basket": "Лукошко", "item.tfg.aluminium_harvest_basket": "Лукошко (Алюминий)", "item.tfg.wood.lumber.aeronos": "Доска из конусообразного гриба", "item.tfg.wood.lumber.strophar": "Доска из строфарового гриба", "item.tfg.wood.lumber.glacian": "Доска из гласивника", - "item.tfg.twigs.aeronos": "Aeronos Twig", - "item.tfg.twigs.strophar": "Strophar Twig", - "item.tfg.twigs.glacian": "Glacian Twig", - "item.tfg.twigs.alphacene": "Alphacene Twig", - "item.tfg.crimsene_gem": "Crimsene Rosin", - "item.tfg.warpane_gem": "Warpane Rosin", - "item.tfg.glacian_wool": "Glacian Wool", - "item.tfg.sniffer_wool": "Mineral Rich Tufts", - "item.tfg.sniffer_egg": "Sniffer Egg", - "item.tfg.wraptor_wool": "Mineral Rich Down Feathers", - "item.tfg.wraptor_egg": "Wraptor Egg", - "item.tfg.wraptor_sugar": "Wraptor Sugar", - "item.tfg.aes_polyurethane": "Bio-AES Reinforced R-Polyurethane Foam", - "item.tfg.mli_shielding": "Multi-Layer Insulated Shielding", - "item.tfg.rocket_cone_t3": "Advanced Rocket Nose Cone", - "item.tfg.rocket_fin_t3": "Advanced Rocket Fin", - "item.tfg.elite_power_thruster": "§aElite Power Thruster", - "item.tfg.silica_aerogel": "Silica Aerogel", - "item.tfg.better_space_suit_fabric": "Adaptive Space Suit Fabric", - "item.tfg.universal_compost_browns": "Brown Universal Compost", - "item.tfg.universal_compost_greens": "Green Universal Compost", - "item.tfg.etching_diamond_tip": "Etching Diamond Tip", + "item.tfg.twigs.aeronos": "Веточка конусообразного гриба", + "item.tfg.twigs.strophar": "Веточка строфарового гриба", + "item.tfg.twigs.glacian": "Веточка гласивника", + "item.tfg.twigs.alphacene": "Веточка альфаценового гриба", + "item.tfg.crimsene_gem": "Багряная смола", + "item.tfg.warpane_gem": "Искаженная смола", + "item.tfg.glacian_wool": "Гласианская шерсть", + "item.tfg.sniffer_wool": "Богатая минералами шерсть нюхача", + "item.tfg.sniffer_egg": "Яйцо нюхача", + "item.tfg.wraptor_wool": "Богатые минералами перья ираптора", + "item.tfg.wraptor_egg": "Яйцо ираптора", + "item.tfg.wraptor_sugar": "Сахар ираптора", + "item.tfg.aes_polyurethane": "Био-ЩЗС укрепленный R-полиуретановый пенопласт", + "item.tfg.mli_shielding": "Многослойное изоляционное покрытие", + "item.tfg.rocket_cone_t3": "Продвинутый ракетный обтекатель", + "item.tfg.rocket_fin_t3": "Продвинутый ракетный стабилизатор", + "item.tfg.elite_power_thruster": "§aПродвинутый силовой двигатель", + "item.tfg.silica_aerogel": "Силикатный аэрогель", + "item.tfg.better_space_suit_fabric": "Пластичная ткань скафандра", + "item.tfg.universal_compost_browns": "Коричневый универсальный компост", + "item.tfg.universal_compost_greens": "Зеленый универсальный компост", + "item.tfg.etching_diamond_tip": "Гравировочная алмазная игла", "item.tfg.spade_head_extruder_mold": "Форма экструдера (Оголовье заступа)", - "item.tfg.mining_hammer_head_extruder_mold": "Extruder Mold (Mining Hammer Head)", - "item.tfg.sword_head_extruder_mold": "Extruder Mold (Sword Head)", - "item.tfg.pickaxe_head_extruder_mold": "Extruder Mold (Pickaxe Head)", - "item.tfg.shovel_head_extruder_mold": "Extruder Mold (Shovel Head)", - "item.tfg.axe_head_extruder_mold": "Extruder Mold (Axe Head)", - "item.tfg.hoe_head_extruder_mold": "Extruder Mold (Hoe Head)", - "item.tfg.scythe_head_extruder_mold": "Extruder Mold (Sycthe Head)", - "item.tfg.file_head_extruder_mold": "Extruder Mold (File Head)", - "item.tfg.hammer_head_extruder_mold": "Extruder Mold (Hammer Head)", - "item.tfg.saw_head_extruder_mold": "Extruder Mold (Saw Head)", - "item.tfg.knife_head_extruder_mold": "Extruder Mold (Knife Head)", - "item.tfg.butchery_knife_head_extruder_mold": "Extruder Mold (Butchery Knife Head)", - "item.tfg.propick_head_extruder_mold": "Extruder Mold (Prospector's Pick Head)", - "item.tfg.javelin_head_extruder_mold": "Extruder Mold (Javelin Head)", - "item.tfg.chisel_head_extruder_mold": "Extruder Mold (Chisel Head)", - "item.tfg.mace_head_extruder_mold": "Extruder Mold (Mace Head)", - "item.tfg.mattock_head_extruder_mold": "Extruder Mold (Mattock Head)", - "item.tfg.fish_hook_extruder_mold": "Extruder Mold (Fish Hook)", - "item.tfg.whisk_extruder_mold": "Extruder Mold (Whisk)", - "item.tfg.screwdriver_tip_extruder_mold": "Extruder Mold (Screwdriver Tip)", - "item.tfg.wrench_tip_extruder_mold": "Extruder Mold (Wrench Tip)", - "item.tfg.wire_cutter_head_extruder_mold": "Extruder Mold (Wire Cutter Head)", - "item.tfg.small_casing_extruder_mold": "Extruder Mold (Small Bullet Casing)", - "item.tfg.shell_casing_extruder_mold": "Extruder Mold (Shell Bullet Casing)", - "item.tfg.large_casing_extruder_mold": "Extruder Mold (Large Bullet Casing)", + "item.tfg.mining_hammer_head_extruder_mold": "Форма экструдера (Огловье шахтерского молота)", + "item.tfg.sword_head_extruder_mold": "Форма экструдера (Оголовье меча)", + "item.tfg.pickaxe_head_extruder_mold": "Форма экструдера (Оголовье кирки)", + "item.tfg.shovel_head_extruder_mold": "Форма экструдера (Оголовье лопаты)", + "item.tfg.axe_head_extruder_mold": "Форма экструдера (Оголовье топора)", + "item.tfg.hoe_head_extruder_mold": "Форма экструдера (Оголовье мотыги)", + "item.tfg.scythe_head_extruder_mold": "Форма экструдера (Оголовье косы)", + "item.tfg.file_head_extruder_mold": "Форма экструдера (Оголовье напильника)", + "item.tfg.hammer_head_extruder_mold": "Форма экструдера (Оголовье молота)", + "item.tfg.saw_head_extruder_mold": "Форма экструдера (Оголовье пилы)", + "item.tfg.knife_head_extruder_mold": "Форма экструдера (Оголовье ножа)", + "item.tfg.butchery_knife_head_extruder_mold": "Форма экструдера (Оголовье тесака)", + "item.tfg.propick_head_extruder_mold": "Форма экструдера (Головка геологического молотка)", + "item.tfg.javelin_head_extruder_mold": "Форма экструдера (Наконечник копья)", + "item.tfg.chisel_head_extruder_mold": "Форма экструдера (Головка зубила)", + "item.tfg.mace_head_extruder_mold": "Форма экструдера (Навершие булавы)", + "item.tfg.mattock_head_extruder_mold": "Форма экструдера (Оголовье кайла)", + "item.tfg.fish_hook_extruder_mold": "Форма экструдера (Крючок)", + "item.tfg.whisk_extruder_mold": "Форма экструдера (Венчик)", + "item.tfg.screwdriver_tip_extruder_mold": "Форма экструдера (Наконечник отвертки)", + "item.tfg.wrench_tip_extruder_mold": "Форма экструдера (Торцевая головка ключа)", + "item.tfg.wire_cutter_head_extruder_mold": "Форма экструдера (Насадка кусачек)", + "item.tfg.small_casing_extruder_mold": "Форма экструдера (Маленькая гильза)", + "item.tfg.shell_casing_extruder_mold": "Форма экструдера (Дробовая гильза)", + "item.tfg.large_casing_extruder_mold": "Форма экструдера (Большая гильза)", "item.tfg.photo_cell_t1": "Обычная фотоэлектрическая ячейка", "item.tfg.electric_extendo_grip": "Electric Extendo Grip", - "item.tfg.treated_chipboard_composite": "Treated Chipboard Composite", - "item.tfg.high_density_treated_fiberboard": "Medium Density Treated Fiberboard", - "item.tfg.flax_seeds": "Flax Seeds", - "item.tfg.flax_product": "Flax Stems", - "item.tfg.flax_bundle": "Flax Bundle", - "item.tfg.flax_line": "Flax Line Fibers", - "item.tfg.flax_tow": "Flax Tow Fibers", - "item.tfg.flax_waste": "Scraped Flax", - "item.tfg.bundled_scraped_flax": "Bundled Scraped Flax", - "item.tfg.linen_thread": "Linen Thread", - "item.tfg.linen_cloth": "Linen Cloth", - "item.tfg.uv_led": "§dUltraviolet §fLED", - "item.tfg.smd_uv_led": "§fSMD §dUltraviolet §fLED", - "item.tfg.empty_dna_syringe": "Empty Syringe", - "item.tfg.filled_dna_syringe": "Filled Syringe", - "item.tfg.dirty_dna_syringe": "Dirty Syringe", - "item.tfg.clean_dna_syringe": "Clean Syringe", - "item.tfg.stainless_steel_needle": "Stainless Steel Needle", + "item.tfg.treated_chipboard_composite": "Обработанный ДСП", + "item.tfg.high_density_treated_fiberboard": "ДСП", + "item.tfg.flax_seeds": "Семена льна", + "item.tfg.flax_product": "Льняной стебель", + "item.tfg.flax_bundle": "Связка льна", + "item.tfg.flax_line": "Волокна льна", + "item.tfg.flax_tow": "Kьняные очёски", + "item.tfg.flax_waste": "Костра льна", + "item.tfg.bundled_scraped_flax": "Связка костры льна", + "item.tfg.linen_thread": "Льные нитки", + "item.tfg.linen_cloth": "Льняная ткань", + "item.tfg.uv_led": "§dУльтрафиолетовый §fСИД", + "item.tfg.smd_uv_led": "§fSMD §dУльтрафиолетовый §fСИД", + "item.tfg.empty_dna_syringe": "Пустой шприц", + "item.tfg.filled_dna_syringe": "Заполненный шприц", + "item.tfg.dirty_dna_syringe": "Грязный шприц", + "item.tfg.clean_dna_syringe": "Чистый шприц", + "item.tfg.stainless_steel_needle": "Игла из нержавеющей стали", "item.tfg.empty_rod": "Empty Fissile Fuel Rod", "item.tfg.thorium_rod": "Thorium Fuel Rod", "item.tfg.uranium_rod": "Uranium Fuel Rod", @@ -988,27 +988,27 @@ "item.tfg.vial.filled": "Флакон (%s)", "item.tfg.lab_equipment": "Лабораторное оборудование", "item.tfg.dirty_lab_equipment": "Грязное лабораторное оборудование", - "item.tfg.wireless_card": "Interplanetary Wireless Card", - "item.tfg.wet_magenta_chalk": "Wet Magenta Chalk", - "item.tfg.wet_pink_chalk": "Wet Pink Chalk", - "item.tfg.wet_green_chalk": "Wet Green Chalk", - "item.tfg.wet_lime_chalk": "Wet Lime Chalk", - "item.tfg.wet_light_gray_chalk": "Wet Light Gray Chalk", - "item.tfg.wet_yellow_chalk": "Wet Yellow Chalk", - "item.tfg.wet_black_chalk": "Wet Black Chalk", - "item.tfg.wet_light_blue_chalk": "Wet Light Blue Chalk", - "item.tfg.wet_brown_chalk": "Wet Brown Chalk", - "item.tfg.wet_cyan_chalk": "Wet Cyan Chalk", - "item.tfg.wet_orange_chalk": "Wet Orange Chalk", - "item.tfg.wet_red_chalk": "Wet Red Chalk", - "item.tfg.wet_gray_chalk": "Wet Gray Chalk", - "item.tfg.wet_white_chalk": "Wet White Chalk", - "item.tfg.wet_blue_chalk": "Wet Blue Chalk", - "item.tfg.wet_purple_chalk": "Wet Purple Chalk", - "item.tfg.lamp_casting_mold": "Lamp Casting Mold", - "item.tfg.trapdoor_casting_mold": "Trapdoor Casting Mold", - "item.tfg.chain_casting_mold": "Chain Casting Mold", - "item.tfg.bell_casting_mold": "Bell Casting Mold", + "item.tfg.wireless_card": "Межпланетная беспроводная карта", + "item.tfg.wet_magenta_chalk": "Мокрый пурпурный мелок", + "item.tfg.wet_pink_chalk": "Мокрый розовый мелок", + "item.tfg.wet_green_chalk": "Мокрый зеленый мелок", + "item.tfg.wet_lime_chalk": "Мокрый лаймовый мелок", + "item.tfg.wet_light_gray_chalk": "Мокрый светло-серый мелок", + "item.tfg.wet_yellow_chalk": "Мокрый жёлтый мелок", + "item.tfg.wet_black_chalk": "Мокрый черный мелок", + "item.tfg.wet_light_blue_chalk": "Мокрый голубой мелок", + "item.tfg.wet_brown_chalk": "Мокрый коричневый мелок", + "item.tfg.wet_cyan_chalk": "Мокрый бирюзовый мелок", + "item.tfg.wet_orange_chalk": "Мокрый оранжевый мелок", + "item.tfg.wet_red_chalk": "Мокрый красный мелок", + "item.tfg.wet_gray_chalk": "Мокрый серый мелок", + "item.tfg.wet_white_chalk": "Мокрый белый мелок", + "item.tfg.wet_blue_chalk": "Мокрый синий мелок", + "item.tfg.wet_purple_chalk": "Мокрый фиолетовый мелок", + "item.tfg.lamp_casting_mold": "Отливная форма (Фонарь)", + "item.tfg.trapdoor_casting_mold": "Отливная форма (Люк)", + "item.tfg.chain_casting_mold": "Отливная форма (Цепь)", + "item.tfg.bell_casting_mold": "Отливная форма (Колокол)", "material.tfg.latex": "Латекс", "material.tfg.vulcanized_latex": "Вулканический латекс", "material.tfg.fluix": "Флакс", diff --git a/kubejs/assets/tfg/lang/uk_ua.json b/kubejs/assets/tfg/lang/uk_ua.json index 7f352b458..248b8b4b0 100644 --- a/kubejs/assets/tfg/lang/uk_ua.json +++ b/kubejs/assets/tfg/lang/uk_ua.json @@ -1448,7 +1448,7 @@ "tfg.tooltip.machine.one_energy_hatch": "Приймає рівно §6Один§r енергетичний люк", "tfg.tooltip.machine.two_energy_hatches": "Приймає до §6Двох§r енергетичних люків", "tfg.tooltip.machine.subtick": "Ця машина підтримує §2Підтакт§r!", - "tfg.tooltip.machine.coil_energy_discount": "Кожна котушка після §6Мельхіору§7 зменшує споживання енергії на §r10%§7.§r", + "tfg.tooltip.machine.coil_energy_discount": "Кожна котушка після §6Мельхіору§r зменшує споживання енергії на §r10%§7.§r", "tfg.tooltip.machine.bioreactor_1": "§7Хімія зустрічається з Біологією§r", "tfg.tooltip.machine.bioreactor_2": "§7Поєднує органічні та неорганічні інгредієнти для отримання синтетичних біологічних продуктів.§r", "tfg.tooltip.machine.growth_chamber_1": "§7Вирощування нового життя§r", diff --git a/kubejs/assets/tfg/lang/zh_cn.json b/kubejs/assets/tfg/lang/zh_cn.json index e5e88cc7c..3658b1b1c 100644 --- a/kubejs/assets/tfg/lang/zh_cn.json +++ b/kubejs/assets/tfg/lang/zh_cn.json @@ -1479,10 +1479,14 @@ "tfg.emi.ore_veins.rock_types": "存在于岩石类型：", "tfg.emi.ore_veins.rarity": "稀有度：%d", "tfg.emi.ore_veins.density": "密度：%d", - "tfg.emi.ore_veins.y_ranges": "深度：%d 至 %d", + "tfg.emi.ore_veins.y_ranges": "Y轴高度：%d 至 %d", "tfg.emi.ore_veins.size": "尺寸：%d", "tfg.emi.ore_veins.height": "高度：%d", "tfg.emi.ore_veins.radius": "半径：%d", + "ore_vein.tfg.rose_quartz": "玫瑰石英", + "ore_vein.tfg.rose_quartz.emi.0": "生成于海拔较低", + "ore_vein.tfg.rose_quartz.emi.1": "且气候低于-10°C的", + "ore_vein.tfg.rose_quartz.emi.2": "生物群系中。", "emi.category.tfg.ore_vein_info": "矿脉信息", "tfg.emi.liquid_bb_burn_time": "耗时：%s秒", "tfg.emi.liquid_bb_superheat": "§l过热", @@ -1542,7 +1546,7 @@ "tfg.tooltip.machine.one_energy_hatch": "只允许有且仅有§61个§f能源仓", "tfg.tooltip.machine.two_energy_hatches": "允许有最多§62个§r能源仓", "tfg.tooltip.machine.subtick": "这台机器支持§2子刻机制§r！", - "tfg.tooltip.machine.coil_energy_discount": "使用§6白铜§7后的每个线圈等级可以减少§f10%§7的能源消耗。", + "tfg.tooltip.machine.coil_energy_discount": "使用§6白铜§r后的每个线圈等级可以减少§f10%§7的能源消耗。", "tfg.tooltip.machine.bioreactor_1": "§7化学与生物学的交汇§r", "tfg.tooltip.machine.bioreactor_2": "§7通过融合有机与无机成分制造合成生物制品§r", "tfg.tooltip.machine.growth_chamber_1": "§7孕育新生§r", @@ -2569,6 +2573,8 @@ "quests.high_voltage.final_dust.title": "无限尘埃", "quests.high_voltage.final_dust.subtitle": "终于！无限资源！", "quests.high_voltage.final_dust.desc": "这是在解锁&e金星&r上更高级的加工设施前，你能在&7月球&r上获取的所有&c无限资源&r。\n\n有了这些资源，你将拥有持续推进&d格雷科技&r进程所需的一切——尤其是维护月球基地&a正常运作&r的必需品。\n\n这些资源对以下用途至关重要：\n• 制作&dAE2组件&r\n• 生产&c无限&r供应的&6轨道炮弹药&r\n\n被动自动化现在就在你触手可及之处——迈步向前，让它成为现实！", + "quests.high_voltage.titanium_greate.title": "钛级格雷机械", + "quests.high_voltage.titanium_greate.desc": "这是在 TFG 中可达成的最终等级格雷机械。若说它有何“极限”之处——那便是极致的可选性（完全不做也行）。", "quests.low_voltage": "&7LV&r - 低压", "quests.low_voltage.subtitle": "驯服电力，开启你的格雷科技之旅", "quests.low_voltage.lv_machine_hull.title": "你的第二个机器外壳", @@ -2600,7 +2606,7 @@ "quests.low_voltage.link_chapter.title": "给我解释一下能量", "quests.low_voltage.link_chapter.subtitle": "有一整章关于能量的内容", "quests.low_voltage.link_chapter.desc": "点击此处查看章节", - "quests.low_voltage.link_chapter.task": "阅读它", + "quests.low_voltage.link_chapter.task": "我读完了", "quests.low_voltage.lv_combuston_gen.title": "内燃发电机", "quests.low_voltage.lv_combuston_gen.subtitle": "它会轰隆作响并产生能量", "quests.low_voltage.lv_combuston_gen.desc": "&7LV内燃发电机&r的制作成本可能略高于其他发电机，但其燃料蕴含极高能量。这使得它更便于携带——当需要为远离基地的发电机供能时，一桶&2生物柴油&r即可传输大量电力。\n\n与其他&7LV发电机&r一样，它可产生&a32EU/t&r的能量。", @@ -2802,7 +2808,7 @@ "quests.low_voltage.mold_plate.desc": "别再用&6合金炉&r浪费时间了。你将需要大量&6橡胶片&r，后续阶段还会用它处理其他类型的塑料制品。\n\n或许你认为能用压模器制作橡胶片，但&6流体固化机&r功能多样，而压模器在&bMV&r阶段前几乎没用。", "quests.low_voltage.cupronickel_ingot.title": "白铜锭", "quests.low_voltage.cupronickel_ingot.subtitle": "它是一种合金", - "quests.low_voltage.cupronickel_ingot.desc": "&7格雷科技进阶的一大核心在于获取新材料，这些材料将用于升级机器和解锁高级组件。&r\n\n你将接触的第一种合金是&b白铜&r——这仅是漫长征程的起点。\n该材料用于升级&6电力高炉&r，乃是工业发展不可或缺的关键步骤。\n\n幸运的是，这第一步相当简单：基础的&7LV合金炉&r即可胜任。\n因此即便配方显示需要&b128个白铜&r也无需担忧——实际操作比看起来容易得多！&r\n\n后续阶段的合金制备将日趋复杂，趁简单的时候好好享受吧！", + "quests.low_voltage.cupronickel_ingot.desc": "格雷科技进阶的一大核心在于获取新材料，这些材料将用于升级机器和解锁高级组件。\n\n你即将接触的其中一种材料是&b白铜&r——这仅是漫长征程的起点。\n该材料用于建造你的第一座&6电力高炉&r，乃是工业发展不可或缺的关键步骤。\n\n幸运的是，这第一步相当简单：一台&7合金炉&r即可胜任。\n因此即便配方显示需要&b128个白铜&r也无需担忧——实际操作比看起来容易得多！&r\n\n后续阶段的合金制备将日趋复杂，趁简单的时候好好享受吧！", "quests.low_voltage.cupronickel_coil.title": "白铜线圈", "quests.low_voltage.cupronickel_coil.subtitle": "宝宝的第一个加热线圈", "quests.low_voltage.cupronickel_coil.desc": "准备&a128份白铜&r、&a32份青铜&r与&a16份锡合金&r，用于制造初代电力高炉所需的加热线圈。\n\n这仍不到整座电力高炉原材料成本的一半（！）。你还需要准备约各一组的殷钢与钢材，请尽快投入采矿作业。\n\n白铜线圈能使电力高炉处理最高&d1800K&r的配方（未计入电压增益）。这个温度在我们看来相当炙热。\n\n&6线圈详解教程位于&l格雷科技能源&r&6标签页——前往查阅以了解更多！&r", @@ -2831,6 +2837,12 @@ "quests.low_voltage.mv_hull.subtitle": "进展相当顺利，只剩7个了！", "quests.low_voltage.mv_hull.desc1": "干得漂亮！你现在已经有了&bMV机器外壳&r、第一块&bMV电路&r和第一台&6电路组装机&r。\n\n这正是&6格雷科技&r的精髓所在——每个阶段你都将运用全新的&6材料&r与&6化工产品&r来制造新一代&6机器&r。接下来你将体验&5酣畅淋漓的创造乐趣&r，我们都有点羡慕了！", "quests.low_voltage.mv_hull.desc2": "在深入&bMV&r阶段之前请记住，若不想过度依赖格雷科技，在&6TFG&r整合包中你可以运用&6机械动力&r来强化基础设施。铝制传动杆与齿轮的应力容量是钢制的四倍，装配后所有机器都能更快地运转！", + "quests.low_voltage.aluminium_greate.title": "铝级格雷机械", + "quests.low_voltage.aluminium_greate.subtitle": "也被称为“中应力”阶段", + "quests.low_voltage.aluminium_greate.desc": "距上次升级已有一段时日，现在你终于解锁了全新等级的格雷机械齿轮与传动轴。与之前一样，铝质部件的应力容量达到了钢质的&b四倍&r。\n\n继续推进格雷机械系列内容完全属于可选流程——我们更建议你转向格雷科技主线发展。但若你希望继续沿用原有设备，本次升级将帮助你&b理顺&r部分旧装置的杂乱布局。\n\n你可以通过&e蒸汽引擎&r进一步提升整体应力规模，或利用&9Create Additions&r的&e电动马达&r将EU电能转化为SU应力单位。", + "quests.low_voltage.oil.title": "提前发现石油了？", + "quests.low_voltage.oil.subtitle": "致LV阶段的卷王", + "quests.low_voltage.oil.desc": "若你在旅途中发现任何油砂矿或（沙漠中的）石油喷口，其实在LV阶段便可稍加利用。\n\n你可将其转化为重燃油用于锅炉，或更佳——用它生产少量&b聚乙烯&r！\n\n相关细节虽在MV章节，但此刻你已可用聚乙烯制造数种物品，例如成本更低的机器外壳与二极管。", "quests.medium_voltage": "&bMV&r - 中压", "quests.medium_voltage.subtitle": "进军石油化工，精炼电子技术", "quests.medium_voltage.mv_machine_hull.title": "欢迎来到MV！", @@ -2842,7 +2854,7 @@ "quests.medium_voltage.mv_miner.title": "自动采矿", "quests.medium_voltage.mv_miner.subtitle": "所以你自己挖矿挖烦了？", "quests.medium_voltage.mv_miner.desc.1": "当这位&r好心的帮手被放置在矿脉上方时能替你采集矿石。\n\n矿机下方的垂直范围无限，水平范围显示在提示信息中。\n\n&bMV&r型号可能不足以覆盖整个矿脉范围，但&6HV&r型号可以做到，因此建议你暂时等待后续型号。本任务只需获得&e任意一种&r型号即可完成。", - "quests.medium_voltage.mv_miner.desc.2": "你将需要&9电力&r。&a充电电池&r或许能应急，但容易耗尽电力，操作起来不太方便。\n\n我们首推使用装有某种燃料的&3桶&r&7（若使用蒸汽则行不通！）&r配合&3发电机&r使用。\n\n将桶放置在发电机上方，用&5软槌&r右键即可自动将燃料输入发电机。", + "quests.medium_voltage.mv_miner.desc.2": "你将需要&9电力&r。&a充电电池&r或许能应急，但容易耗尽电力，操作起来不太方便。\n\n我们首推使用装有某种燃料的&3桶&r&7（若使用蒸汽则行不通！）&r配合&3发电机&r使用。\n\n将桶放置在发电机上方，用&5软槌&r或&5螺丝刀&r右键即可自动将燃料输入发电机。", "quests.medium_voltage.mv_miner.desc.3": "&c注意：&r不要忘记对矿脉所有&d9个区块进行区块加载&r&7（打开地图，按住Ctrl+左键点击申领区块，申领后启用强制加载）&r。\n\n&9提示：&r你可以选择使用&3ME箱子&r、&3背包&r或&3格雷板条箱&r作为输出容器，便于将矿石运回基地。顺带一提，&3ME箱子&r可直接通过EU供电。", "quests.medium_voltage.mv_miner.task": "任何采矿机", "quests.medium_voltage.mv_component.title": "MV组件", @@ -3075,6 +3087,9 @@ "quests.medium_voltage.lsb.title": "蒸汽腾腾", "quests.medium_voltage.lsb.subtitle": "若你拥有无限燃料，这仍是可行方案", "quests.medium_voltage.lsb.desc": "若你&l仍在&r使用&3大型青铜锅炉&r，建议升级至&3大型钢锅炉&r。\n\n它的效率比&3大型青铜锅炉&r略高，可产生&d1800mB/t的蒸汽&r。\n\n现阶段我们建议你尝试其他发电方案。", + "quests.medium_voltage.stainless_greate.title": "不锈钢级格雷机械", + "quests.medium_voltage.stainless_greate.subtitle": "高应力", + "quests.medium_voltage.stainless_greate.desc": "本任务仅用于告知：格雷机械在此阶段迎来了又一次升级。\n\n你可能会发现新一代粉碎轮颇为实用——它们不仅能像HV研磨机一样提供全额副产物，还可同时处理多个物品！", "quests.metal_age": "冶金时代", "quests.metal_age.subtitle": "你的第一次技术进步。", "quests.metal_age.weld_bronze_ingots.title": "焊接青铜", @@ -3510,7 +3525,7 @@ "quests.steam_age.basic_millstone.desc": "&3石磨&r是手推磨的自动化版本。你可以把任何你想粉碎的东西从顶部扔进去，然后右键单击取出粉碎后的物品。如果你直接把它连接到动物曲柄上，它会相当慢，但你可以使用齿轮比来提高它的速度。\n\n请注意：产出物仅会出现在第一个槽位。其余槽位属于格雷科技机制的一部分，在&6HV&r阶段前都无需关注。", "quests.steam_age.horse_crank.title": "你的第一个动力源", "quests.steam_age.horse_crank.subtitle": "让你的牲畜付租金", - "quests.steam_age.horse_crank.desc.1": "&3动物曲柄&r 是你第一个可获得的机械动力源。要使用它，将曲柄放在一个 7x7 清理区域的中心，并用拴绳将动物拴在上面。不同的动物会提供不同数量的动力，而下面的方块会增加输出动力的速度。多个曲柄的区域可以重叠。\n\n你可能需要手持第二根拴绳来拴住动物。", + "quests.steam_age.horse_crank.desc.1": "&3动物曲柄&r 是你第一个可获得的机械动力源。要使用它，将曲柄放在一个7x7清空区域的中心，并用拴绳将动物拴在上面。不同的动物会提供不同数量的动力，而下面的方块会增加输出动力的速度。多个曲柄的区域可以重叠。\n\n你可能需要手持第二根拴绳来拴住动物。", "quests.steam_age.horse_crank.desc.2": "&3小型动物 (4 SU):&r\n狼, 狗, 猪, 绵羊, 山羊, 羊驼\n\n&3中型动物 (6 SU):&r\n牛, 驴\n\n&3大型动物 (8 SU):&r\n马, 骡, 麝牛, 牦牛", "quests.steam_age.poor_paths.title": "劣质路面", "quests.steam_age.poor_paths.subtitle": "这只是土", @@ -3575,7 +3590,7 @@ "quests.steam_age.fluid_pipes.desc.2": "&a提醒：&r1秒=20游戏刻……前提是服务器没有卡顿。\n\n&d注意：&r 已启用格雷科技6风格的管道。这意味着放置管道时，它们仅会连接到其放置时所对准的方块。需要使用扳手点击管道以打开更多连接。\n\n你也可以在潜行状态下使用扳手右键点击来禁用特定侧的输入。这有助于防止回流（液体向非预期方向流动）。", "quests.steam_age.fluid_drums.title": "高效流体存储", "quests.steam_age.fluid_drums.subtitle": "木桶恐怕无法盛放熔融的钢水。", - "quests.steam_age.fluid_drums.desc.1": "&6TFG&r整合包引入了&4数量庞大&r的流体，容易让人应接不暇，因此你可能在寻找存储它们的方法。\n\n来认识一下……&a储液桶&r！它们拥有巨大的内部容量，任何&a储液桶&r在被破坏拾取后都会&d保留其中的流体&r。使用软木槌右键点击，可将其中的流体排入下方放置的其他容器中。", + "quests.steam_age.fluid_drums.desc.1": "&6TFG&r整合包引入了&4数量庞大&r的流体，容易让人应接不暇，因此你可能在寻找存储它们的方法。\n\n来认识一下……&a储液桶&r！它们拥有巨大的内部容量，任何&a储液桶&r在被破坏拾取后都会&d保留其中的流体&r。使用软木槌或螺丝刀右键点击，可将其中的流体排入下方放置的其他容器中。", "quests.steam_age.fluid_drums.desc.2": "&l&3背景知识：&r&o这些储液桶实际上移植自格雷科技6。", "quests.steam_age.boilers.title": "蒸汽锅炉", "quests.steam_age.boilers.subtitle": "便携式蒸汽室", @@ -3687,7 +3702,7 @@ "quests.steam_age.lathe.desc": "&3砂带磨床&r能自动将一个锭加工成两根杆，将单个螺栓变成螺丝，并能抛光宝石及执行其他加工作业。若你需要大量杆与螺丝（而你也确实会需要），这台机器将是一项明智的投资。", "quests.steam_age.steel_saw.title": "钢动力锯", "quests.steam_age.steel_saw.subtitle": "切石机和LV切割机合的二合一！", - "quests.steam_age.steel_saw.desc": "这台设备是基础动力锯的升级版，不仅能处理木材，还可执行部分金属加工配方，例如将金属杆制成四枚螺栓，或将方块切割成板材。这些配方均需使用流体介质，现阶段仅需用水即可。\n\n若先将橡胶末在合金炉中铸成块状，再利用此设备进行切割，还能以更低成本制作橡胶片。", + "quests.steam_age.steel_saw.desc": "这台设备是基础动力锯的升级版，不仅能处理木材，还可执行部分金属加工配方，例如将金属杆制成四枚螺栓，或将方块切割成板材。这些配方均需使用流体介质，现阶段仅需用水即可。\n\n若先将橡胶末在合金炉中铸成块状，再利用此设备进行切割，还能以更低成本制作橡胶片。\n\n未曾炼制过钴黄铜？你有两种选择：其一，可在坩埚中使用任何能熔化为硅酸铝的材料进行合金冶炼；其二，可利用搅拌机，配合从矿石处理中获得的铝粉进行制作。", "quests.steam_age.rolling_mill.title": "轧机", "quests.steam_age.rolling_mill.subtitle": "LV卷板机的另一半", "quests.steam_age.rolling_mill.desc.1": "在蒸汽时代所有可制造的机器中，&3轧机&r堪称最实用的设备之一，原因很简单：它能将单个金属锭直接轧制成单个板材。更值得一提的是，它制作薄板的成本比手工合成更低，实为附赠优势！", @@ -3893,7 +3908,7 @@ "quests.stone_age.create_forge.title": "木炭炉", "quests.stone_age.create_forge.subtitle": "顺带一提，织物不存在。", "quests.stone_age.create_forge.desc": "木炭炉是一种先进的工作站，可用于将材料加热至高温。其加热速度相比坑窑显著更快，且温度控制更为精准。\n\n制作锻炉至少需要7块木炭和5个岩石类方块（如天然岩石或圆石）。\n木炭炉的燃料仅可使用木炭、煤炭或焦炭，不可使用原木。\n\n具体制作方法请查阅《野外指南》中关于木炭坑和木炭炉的详细图文教程。", - "quests.stone_age.rock_anvil.title": "石头砧", + "quests.stone_age.rock_anvil.title": "石砧", "quests.stone_age.rock_anvil.subtitle": "其使用寿命较为有限", "quests.stone_age.rock_anvil.desc": "砧是早期金属加工的基础。要制作真正的金属砧，你需要使用前一级别的砧进行金属锭的焊接操作。由于铜属于最初阶的金属，你必须通过岩石砧台来完成铜锭的焊接——只需用锤子右键单击天然火成岩即可制作石砧。需要注意的是，石砧的功能极为有限，仅能进行焊接操作。若要实现金属的塑形锻造，你仍需升级至对应的金属砧。", "quests.stone_age.quern.title": "手推磨和磨盘", @@ -3910,7 +3925,7 @@ "quests.stone_age.clean_dust.desc": "最终，将含杂粉或精炼粉投入水中浸泡数秒即可完成清洗，获得最终形态的纯净矿粉。此时的产出价值已堪比整块金属锭，所有付出都是值得的！", "quests.stone_age.flux.title": "助焊石", "quests.stone_age.flux.subtitle": "它基本上是金属胶水", - "quests.stone_age.flux.desc": "助熔剂是一种主要用于金属加工中将东西焊接在一起的物品，尽管它也有一些其他用途。\n某些类型的岩石，如白垩、石灰石和大理石，可以被粉碎制成助熔剂，各种海洋动物的壳也可以。", + "quests.stone_age.flux.desc": "助焊剂是一种主要用于焊接金属的物品，尽管它也有一些别的用途。\n某些类型的岩石，如白垩、石灰石和大理石，可以被粉碎制成助焊剂，各种海洋动物的壳也可以。", "quests.stone_age.weld_copper_ingots.title": "焊接铜锭", "quests.stone_age.weld_copper_ingots.subtitle": "离铜砧如此之近", "quests.stone_age.weld_copper_ingots.desc": "点燃木炭炉并投入至少2块铜锭。密切关注铜锭加热时的状态提示——当显示\"可加工\"时仍需等待，直至达到\"可焊接\"状态（即将达到熔点的临界阶段）。\n\n一旦达到可焊接温度，请立即用副手持木钳将其快速夹取至石台界面，同时添加少量助焊剂。最后潜行状态下右键点击砧台，趁热将两块铜锭焊接为一体。可使用水或雪快速冷却新制成的双锭。", diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index 2bf5401c8..39fb0427b 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -19,70 +19,76 @@ const registerTooltips = (event) => { text.add(1, Text.translate('tfg.tooltip.blaze_burner')) }) event.addAdvanced(['tfg:electric_greenhouse'], (item, advanced, text) => { - text.add(1, Text.translate('tfg.tooltip.machine.electric_greenhouse_1')), - text.add(2, Text.translate('tfg.tooltip.machine.electric_greenhouse_2')), - text.add(3, Text.translate('tfg.tooltip.machine.perfect_overclock')), - text.add(4, Text.translate('tfg.tooltip.machine.two_energy_hatches')), - text.add(5, Text.translate('tfg.tooltip.machine.customize_interior')) + text.add(1, Text.translate('tfg.tooltip.machine.electric_greenhouse_1')); + text.add(2, Text.translate('tfg.tooltip.machine.electric_greenhouse_2')); + text.add(3, Text.translate('tfg.tooltip.machine.perfect_overclock')); + text.add(4, Text.translate('tfg.tooltip.machine.two_energy_hatches')); + text.add(5, Text.translate('tfg.tooltip.machine.customize_interior')); }) event.addAdvanced(['tfg:growth_chamber'], (item, advanced, text) => { - text.add(1, Text.translate('tfg.tooltip.machine.growth_chamber_1')), - text.add(2, Text.translate('tfg.tooltip.machine.growth_chamber_2')), - text.add(5, Text.translate('tfg.tooltip.machine.two_energy_hatches')) + text.add(1, Text.translate('tfg.tooltip.machine.growth_chamber_1')); + text.add(2, Text.translate('tfg.tooltip.machine.growth_chamber_2')); + text.add(3, Text.translate('tfg.tooltip.machine.two_energy_hatches')); }) event.addAdvanced(['tfg:evaporation_tower'], (item, advanced, text) => { - text.add(1, Text.translate('tfg.tooltip.machine.evaporation_tower_1')), - text.add(2, Text.translate('tfg.tooltip.machine.evaporation_tower_2')), - text.add(3, Text.translate('tfg.tooltip.machine.two_energy_hatches')) + text.add(1, Text.translate('tfg.tooltip.machine.evaporation_tower_1')); + text.add(2, Text.translate('tfg.tooltip.machine.evaporation_tower_2')); + text.add(3, Text.translate('tfg.tooltip.machine.two_energy_hatches')); }) event.addAdvanced(['tfg:bioreactor'], (item, advanced, text) => { - text.add(1, Text.translate('tfg.tooltip.machine.bioreactor_1')), - text.add(2, Text.translate('tfg.tooltip.machine.bioreactor_2')), - text.add(3, Text.translate('tfg.tooltip.machine.two_energy_hatches')) + text.add(1, Text.translate('tfg.tooltip.machine.bioreactor_1')); + text.add(2, Text.translate('tfg.tooltip.machine.bioreactor_2')); + text.add(3, Text.translate('tfg.tooltip.machine.two_energy_hatches')); }) event.addAdvanced(['tfg:cooling_tower'], (item, advanced, text) => { - text.add(1, Text.translate('tfg.tooltip.machine.cooling_tower_1')), - text.add(2, Text.translate('tfg.tooltip.machine.cooling_tower_2')), - text.add(3, Text.translate('tfg.tooltip.machine.perfect_overclock')), - text.add(4, Text.translate('tfg.tooltip.machine.subtick')), - text.add(5, Text.translate('tfg.tooltip.machine.one_energy_hatch')) + text.add(1, Text.translate('tfg.tooltip.machine.cooling_tower_1')); + text.add(2, Text.translate('tfg.tooltip.machine.cooling_tower_2')); + text.add(3, Text.translate('tfg.tooltip.machine.perfect_overclock')); + text.add(4, Text.translate('tfg.tooltip.machine.subtick')); + text.add(5, Text.translate('tfg.tooltip.machine.one_energy_hatch')); }) event.addAdvanced(['gtceu:moon_dust_harvester'], (item, advanced, text) => { - text.add(1, Text.translate('gtceu.tooltip.machine.moon_dust_harvester_1')), - text.add(2, Text.translate('gtceu.tooltip.machine.moon_dust_harvester_2')), - text.add(3, Text.translate('tfg.tooltip.machine.coil_energy_discount')), - text.add(4, Text.translate('tfg.tooltip.machine.two_energy_hatches')) + text.add(1, Text.translate('gtceu.tooltip.machine.moon_dust_harvester_1')); + text.add(2, Text.translate('gtceu.tooltip.machine.moon_dust_harvester_2')); + text.add(3, Text.translate('tfg.tooltip.machine.coil_energy_discount')); + text.add(4, Text.translate('tfg.tooltip.machine.two_energy_hatches')); }) event.addAdvanced(['gtceu:ostrum_harvester'], (item, advanced, text) => { - text.add(1, Text.translate('gtceu.tooltip.machine.ostrum_harvester_1')), - text.add(2, Text.translate('gtceu.tooltip.machine.ostrum_harvester_2')), - text.add(3, Text.translate('tfg.tooltip.machine.coil_energy_discount')), - text.add(4, Text.translate('tfg.tooltip.machine.two_energy_hatches')) + text.add(1, Text.translate('gtceu.tooltip.machine.ostrum_harvester_1')); + text.add(2, Text.translate('gtceu.tooltip.machine.ostrum_harvester_2')); + text.add(3, Text.translate('tfg.tooltip.machine.coil_energy_discount')); + text.add(4, Text.translate('tfg.tooltip.machine.two_energy_hatches')); }) - event.addAdvanced(['gtceu:ostrum_linear_accelerator'], (item, advanced, text) => { - text.add(1, Text.translate('gtceu.tooltip.machine.ostrum_linear_accelerator_1')), - text.add(2, Text.translate('gtceu.tooltip.machine.ostrum_linear_accelerator_2')), - text.add(3, Text.translate('tfg.tooltip.machine.two_energy_hatches')) + event.addAdvanced(['tfg:ostrum_linear_accelerator'], (item, advanced, text) => { + text.add(1, Text.translate('gtceu.tooltip.machine.ostrum_linear_accelerator_1')); + text.add(2, Text.translate('gtceu.tooltip.machine.ostrum_linear_accelerator_2')); + text.add(3, Text.translate('tfg.tooltip.machine.two_energy_hatches')); }) event.addAdvanced(['gtceu:heat_exchanger'], (item, advanced, text) => { - text.add(1, Text.translate('gtceu.tooltip.machine.heat_exchanger_1')), - text.add(2, Text.translate('gtceu.tooltip.machine.heat_exchanger_2')), - text.add(3, Text.translate('tfg.tooltip.machine.perfect_overclock')), - text.add(4, Text.translate('tfg.tooltip.machine.subtick')), - text.add(5, Text.translate('tfg.tooltip.machine.one_energy_hatch')) + text.add(1, Text.translate('gtceu.tooltip.machine.heat_exchanger_1')); + text.add(2, Text.translate('gtceu.tooltip.machine.heat_exchanger_2')); + text.add(3, Text.translate('tfg.tooltip.machine.perfect_overclock')); + text.add(4, Text.translate('tfg.tooltip.machine.subtick')); + text.add(5, Text.translate('tfg.tooltip.machine.one_energy_hatch')); }) event.addAdvanced(['gtceu:nuclear_fuel_factory'], (item, advanced, text) => { - text.add(1, Text.translate('gtceu.tooltip.machine.nuclear_fuel_factory_1')), - text.add(2, Text.translate('gtceu.tooltip.machine.nuclear_fuel_factory_2')), - text.add(3, Text.translate('tfg.tooltip.machine.one_energy_hatch')) + text.add(1, Text.translate('gtceu.tooltip.machine.nuclear_fuel_factory_1')); + text.add(2, Text.translate('gtceu.tooltip.machine.nuclear_fuel_factory_2')); + text.add(3, Text.translate('tfg.tooltip.machine.one_energy_hatch')); }) event.addAdvanced(['gtceu:steam_bloomery'], (item, advanced, text) => { - text.add(1, Text.translate('gtceu.tooltip.machine.steam_bloomery_1')), - text.add(2, Text.translate('gtceu.tooltip.machine.steam_bloomery_2')) + text.add(1, Text.translate('gtceu.tooltip.machine.steam_bloomery_1')); + text.add(2, Text.translate('gtceu.tooltip.machine.steam_bloomery_2')); }) event.addAdvanced(['gtceu:large_chemical_reactor'], (item, advanced, text) => { - text.add(1, Text.translate('tfg.tooltip.machine.perfect_overclock')), - text.add(2, Text.translate('tfg.tooltip.machine.subtick')) + text.add(1, Text.translate('tfg.tooltip.machine.perfect_overclock')); + text.add(2, Text.translate('tfg.tooltip.machine.subtick')); + }) + event.addAdvanced(['gtceu:coal_liquefaction_tower'], (item, advanced, text) => { + text.add(1, Text.translate('gtceu.tooltip.machine.coal_liquefaction_tower_1')); + text.add(2, Text.translate('gtceu.tooltip.machine.coal_liquefaction_tower_2')); + text.add(3, Text.translate('tfg.tooltip.machine.coil_energy_discount')); + text.add(4, Text.translate('tfg.tooltip.machine.two_energy_hatches')); }) // Insulation diff --git a/kubejs/server_scripts/tfg/recipes.converting.js b/kubejs/server_scripts/tfg/recipes.converting.js index b4258f30c..bb415f91a 100644 --- a/kubejs/server_scripts/tfg/recipes.converting.js +++ b/kubejs/server_scripts/tfg/recipes.converting.js @@ -7,4 +7,6 @@ function registerTFGConvertingRecipes(event) { event.shapeless('vintageimprovements:belt_grinder', 'vintageimprovements:lathe') + + event.shapeless('tfg:ostrum_linear_accelerator', 'gtceu:ostrum_linear_accelerator') } \ No newline at end of file diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index 855fb2722..d995a8d57 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -447,60 +447,6 @@ const registerGTCEuMachines = (event) => { 'gtceu:block/casings/gcym/nonconducting_casing', 'gtceu:block/multiblock/distillation_tower') - // Extraterrestrial Ore Fabricator - - event.create('ostrum_linear_accelerator', 'multiblock') - .rotationState(RotationState.NON_Y_AXIS) - .recipeType('dummy_recipe') - .recipeModifiers([GTRecipeModifiers.PARALLEL_HATCH, GTRecipeModifiers.OC_NON_PERFECT, GTRecipeModifiers.BATCH_MODE]) - .appearanceBlock(() => Block.getBlock('tfg:casings/machine_casing_mars')) - .pattern(definition => FactoryBlockPattern.start() - .aisle('AAAAAAAAA', 'AAAAAAAAA', 'AAAAAAAAA', ' ', ' ' ) - .aisle('BAAAAAAAA', 'B#######D', 'BBBBBBBAA', ' BCCCB ', ' BBBBB ' ) - .aisle('AAAAAAAAA', 'A#######D', 'BB###BBAA', ' C###C ', ' BHHHB ' ) - .aisle('BEBEBEAAA', 'BEBEBEA#D', 'BBBBBBBAA', ' BCCCB ', ' BBBBB ' ) - .aisle('A AFA', 'A AXA', 'AAAAAAAFA', ' ', ' ' ) - .where('X', Predicates.controller(Predicates.blocks(definition.get()))) - .where('A', Predicates.blocks('tfg:casings/machine_casing_mars') - .or(Predicates.abilities(PartAbility.INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(2))) - .where('B', Predicates.blocks('tfg:casings/machine_casing_ostrum_carbon')) - .where('C', Predicates.blocks('tfg:casings/machine_casing_vacuum_engine_intake')) - .where('D', Predicates.blocks('gtceu:heat_vent')) - .where('E', Predicates.blocks('tfg:casings/machine_casing_mars') - .or(Predicates.abilities(PartAbility.IMPORT_FLUIDS).setMaxGlobalLimited(6)) - .or(Predicates.abilities(PartAbility.IMPORT_ITEMS).setMaxGlobalLimited(6))) - .where('F', Predicates.blocks('tfg:casings/machine_casing_mars') - .or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1))) - .where('H', Predicates.blocks('tfg:casings/machine_casing_mars') - .or(Predicates.abilities(PartAbility.EXPORT_ITEMS)) - .or(Predicates.abilities(PartAbility.EXPORT_FLUIDS))) - .where('#', Predicates.air()) - .where(' ', Predicates.any()) - .build() - ) - .shapeInfo(controller => MultiblockShapeInfo.builder() - .aisle('KKAAAAAAA', 'AAAAAAAAA', 'AAAAAAAAA', ' ', ' ' ) - .aisle('BAAAAAAAA', 'B D', 'BBBBBBBAA', ' BCCCB ', ' BBBBB ' ) - .aisle('AAAAAAAAA', 'A D', 'BB BBAA', ' C C ', ' BIAHB ' ) - .aisle('BEBEBEAAA', 'BEBFBEA#D', 'BBBBBBBAA', ' BCCCB ', ' BBBBB ' ) - .aisle('A AMA', 'A AXA', 'AAAAAAAAA', ' ', ' ' ) - .where('X', controller, Direction.SOUTH) - .where('A', Block.getBlock('tfg:casings/machine_casing_mars')) - .where('B', Block.getBlock('tfg:casings/machine_casing_ostrum_carbon')) - .where('C', Block.getBlock('tfg:casings/machine_casing_vacuum_engine_intake')) - .where('D', Block.getBlock('gtceu:heat_vent')) - .where('E', GTMachines.FLUID_IMPORT_HATCH[GTValues.EV], Direction.SOUTH) - .where('F', GTMachines.ITEM_IMPORT_BUS[GTValues.EV], Direction.SOUTH) - .where('H', GTMachines.ITEM_EXPORT_BUS[GTValues.EV], Direction.UP) - .where('I', GTMachines.FLUID_EXPORT_HATCH[GTValues.EV], Direction.UP) - .where('M', GTMachines.AUTO_MAINTENANCE_HATCH, Direction.SOUTH) - .where('K', GTMachines.ENERGY_INPUT_HATCH[GTValues.HV], Direction.NORTH) - .where(' ', Block.getBlock('minecraft:air')) - .build() - ) - .workableCasingModel( - 'tfg:block/casings/machine_casing_mars', - 'gtceu:block/machines/thermal_centrifuge') //#region Power Rework @@ -517,7 +463,6 @@ const registerGTCEuMachines = (event) => { .aisle('CCC', ' Y ', ' E ', 'E#E', 'EEE', 'BMB') .aisle('CXC', 'D D', 'D D', 'DED', 'DED', 'BBB' ) .where('X', Predicates.controller(Predicates.blocks(definition.get()))) - .where('A', Predicates.blocks('gtceu:secure_maceration_casing')) .where('B', Predicates.blocks('gtceu:solid_machine_casing').setMinGlobalLimited(4) .or(Predicates.abilities(PartAbility.IMPORT_FLUIDS).setPreviewCount(2)) .or(Predicates.abilities(PartAbility.IMPORT_ITEMS).setPreviewCount(1))) diff --git a/kubejs/startup_scripts/gtceu/recipe_types.js b/kubejs/startup_scripts/gtceu/recipe_types.js index 7f345b855..39c361169 100644 --- a/kubejs/startup_scripts/gtceu/recipe_types.js +++ b/kubejs/startup_scripts/gtceu/recipe_types.js @@ -69,20 +69,12 @@ const registerGTCEuRecipeTypes = (event) => { .setProgressBar(GuiTextures.PROGRESS_BAR_GAS_COLLECTOR, FillDirection.LEFT_TO_RIGHT) .setSound(GTSoundEntries.TURBINE) - event.create('dummy_recipe') - .category('dumme_recipe') - .setEUIO('in') - .setMaxIOSize(1, 3, 3, 3) - .setSlotOverlay(false, false, GuiTextures.EXTRACTOR_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_EXTRACT, FillDirection.LEFT_TO_RIGHT) - .setSound(GTSoundEntries.BATH) - event.create('coal_liquefaction_tower') .category('coal_liquefaction_tower') .setEUIO('in') .setMaxIOSize(2, 0, 3, 3) .setSlotOverlay(false, false, GuiTextures.HEATING_OVERLAY_1) - .setProgressBar(GuiTextures.PROGRESS_BAR_DISTILLATION_TOWER, FillDirection.LEFT_TO_RIGHT) + .setProgressBar(GuiTextures.PROGRESS_BAR_ARC_FURNACE, FillDirection.LEFT_TO_RIGHT) .setSound(GTSoundEntries.COMBUSTION) } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/blocks.js b/kubejs/startup_scripts/tfg/blocks.js index a0cc2148c..9728673e9 100644 --- a/kubejs/startup_scripts/tfg/blocks.js +++ b/kubejs/startup_scripts/tfg/blocks.js @@ -7,6 +7,11 @@ const registerTFGBlocks = (event) => { registerTFGSupportBlocks(event) registerTFGAqueductBlocks(event) registerTFGCrops(event) + + event.create('gtceu:ostrum_linear_accelerator') + .tagBlock('gtceu:mineable/pickaxe_or_wrench') + .requiresTool(false) + .textureAll('tfg:item/deprecated') event.create('tfg:titanium_exhaust_vent', 'tfg:active_particle_emitter') .textureAll('tfg:block/titanium_exhaust_vent') diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index 604dc83df..b3cf42ebb 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -433,10 +433,6 @@ const registerTFGMaterials = (event) => { .components('2x sodium','1x tungsten', '4x oxygen') .color('0xdcf6f7') - event.create('tfg:tungstate') - .components('2x hydrogen', '12x tungsten', '42x oxygen') - .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - event.create('tfg:ammonium_tungstate') .dust() .flags(GTMaterialFlags.DISABLE_MATERIAL_RECIPES, GTMaterialFlags.DISABLE_DECOMPOSITION) @@ -448,7 +444,7 @@ const registerTFGMaterials = (event) => { .gem() .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) .iconSet(GTMaterialIconSet.FLINT) - .components('10x ammonia', '1x tfg:tungstate', '4x water') + .components('10x ammonia', '4x water', '2x hydrogen', '12x tungsten', '42x oxygen') .color('0xaabdf0') event.create('tfg:tungsten_oxide')