From cc31e49b6cae329f33ac0e90d1d172099dd59a75 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 27 Dec 2025 00:23:12 +0000 Subject: [PATCH] langs, and cleanup propylene --- kubejs/assets/species/lang/en_us.json | 9 ++++++++- kubejs/assets/tfg/lang/en_us.json | 11 +++++------ kubejs/assets/tfg/lang/ja_jp.json | 5 ++--- kubejs/assets/tfg/lang/ru_ru.json | 1 - kubejs/assets/tfg/lang/uk_ua.json | 1 - kubejs/assets/tfg/lang/zh_cn.json | 1 - kubejs/startup_scripts/tfg/materials.power_rework.js | 8 -------- 7 files changed, 15 insertions(+), 21 deletions(-) diff --git a/kubejs/assets/species/lang/en_us.json b/kubejs/assets/species/lang/en_us.json index 55599bd88..535a349cf 100644 --- a/kubejs/assets/species/lang/en_us.json +++ b/kubejs/assets/species/lang/en_us.json @@ -10,5 +10,12 @@ "subtitles.item.species.wicked_swapper.throw": "Swapper Pearl flies", "subtitles.item.species.wicked_swapper.fail": "Swapper Pearl drops", "subtitles.item.species.wicked_swapper.teleport": "Swapper Pearl swaps", - "advancements.species.wicked_mask_wither.description": "Disguise yourself as a Wither using a Disguise Kit" + "advancements.species.wicked_mask_wither.description": "Disguise yourself as a Wither using a Disguise Kit", + "item.species.trooper_spawn_egg": "Sulfie Spawn Egg", + "entity.species.trooper": "Sulfie", + "subtitles.entity.species.trooper.death": "Sulfie dies", + "subtitles.entity.species.trooper.hurt": "Sulfie hurts", + "subtitles.entity.species.trooper.step": "Sulfie trots", + "subtitles.entity.species.trooper.uproot": "Sulfie uproots", + "subtitles.entity.species.trooper.plant": "Sulfie plants" } \ No newline at end of file diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 91e424993..f69caba0a 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -1084,9 +1084,9 @@ "item.tfg.rough_endoplasmic_reticula": "Rough Endoplasmic Reticula", "item.tfg.alpha_keratin": "α-Keratin", "item.tfg.progenitor_cells": "Progenitor Cells", - "item.tfg.catalyser_pt_re_zsm": "Catalyser Pt-Re ZSM-5", - "item.tfg.used_catalyser": "Used Catalyser Pt-Re ZSM-5", - "item.tfg.loaded_resin": "Re-Loaded Resin", + "item.tfg.catalyser_pt_re_zsm": "Platinum-Rhenium ZSM-5 Catalyzer", + "item.tfg.used_catalyser": "Used Platinum-Rhenium ZSM-5 Catalyzer", + "item.tfg.loaded_resin": "Rhenium-Loaded Resin", "item.tfg.rod_mold": "Fire Rod Mold", "item.tfg.small_gear_mold": "Fire Small Gear Mold", "item.tfg.nugget_mold": "Nugget Mold", @@ -1246,11 +1246,10 @@ "material.tfg.tin_chloride": "Stannous Chloride", "material.tfg.cyclohexanone": "Cyclohexanone", "material.tfg.cyclohex_diperoxide": "1,1-Cyclohexanediyl Dihydroperoxide", - "material.tfg.aciditic_waste": "Aciditic Waste", - "material.tfg.propylene": "Propylene", + "material.tfg.aciditic_waste": "Acidic Epoxy Waste", "material.tfg.tpaoh": "Tetrapropylammonium Hydroxide", "material.tfg.sodium_silicate": "Sodium Silicate", - "material.tfg.metal_rich_solution": "Metal Rich Solution", + "material.tfg.metal_rich_solution": "Leachate Metal-Rich Solution", "material.tfg.crude_mixed_gas": "Crude Mixed Gas", "material.tfg.zsm5_gel": "ZSM-5 Gel", "material.tfg.leachate": "Rhenium Leachate", diff --git a/kubejs/assets/tfg/lang/ja_jp.json b/kubejs/assets/tfg/lang/ja_jp.json index 09cf1c870..af7177e25 100644 --- a/kubejs/assets/tfg/lang/ja_jp.json +++ b/kubejs/assets/tfg/lang/ja_jp.json @@ -1203,11 +1203,10 @@ "material.tfg.tin_chloride": "Stannous Chloride", "material.tfg.cyclohexanone": "Cyclohexanone", "material.tfg.cyclohex_diperoxide": "1,1-Cyclohexanediyl Dihydroperoxide", - "material.tfg.aciditic_waste": "Aciditic Waste", - "material.tfg.propylene": "Propylene", + "material.tfg.aciditic_waste": "Acidic Epoxy Waste", "material.tfg.tpaoh": "Tetrapropylammonium Hydroxide", "material.tfg.sodium_silicate": "Sodium Silicate", - "material.tfg.metal_rich_solution": "Metal Rich Solution", + "material.tfg.metal_rich_solution": "Leachate Metal-Rich Solution", "material.tfg.crude_mixed_gas": "Crude Mixed Gas", "material.tfg.zsm5_gel": "ZSM-5 Gel", "material.tfg.leachate": "Rhenium Leachate", diff --git a/kubejs/assets/tfg/lang/ru_ru.json b/kubejs/assets/tfg/lang/ru_ru.json index b5a005630..862d4b3a7 100644 --- a/kubejs/assets/tfg/lang/ru_ru.json +++ b/kubejs/assets/tfg/lang/ru_ru.json @@ -1202,7 +1202,6 @@ "material.tfg.cyclohexanone": "Циклогексанон", "material.tfg.cyclohex_diperoxide": "1,1-Циклогександиил дигидропероксид", "material.tfg.aciditic_waste": "Кислотные отходы", - "material.tfg.propylene": "Пропилен", "material.tfg.tpaoh": "Гидроксид тетрапропиламмония", "material.tfg.sodium_silicate": "Силикат натрия", "material.tfg.metal_rich_solution": "Богатый металлами раствор", diff --git a/kubejs/assets/tfg/lang/uk_ua.json b/kubejs/assets/tfg/lang/uk_ua.json index 9d5ca901b..7879150f4 100644 --- a/kubejs/assets/tfg/lang/uk_ua.json +++ b/kubejs/assets/tfg/lang/uk_ua.json @@ -1247,7 +1247,6 @@ "material.tfg.cyclohexanone": "Циклогексанон", "material.tfg.cyclohex_diperoxide": "1,1-Циклогександиїл дігідропероксид", "material.tfg.aciditic_waste": "Кислотні відходи", - "material.tfg.propylene": "Пропілен", "material.tfg.tpaoh": "Гідроксид тетрапропіламонію", "material.tfg.sodium_silicate": "Натрій силікат", "material.tfg.metal_rich_solution": "Металонасичений розчин", diff --git a/kubejs/assets/tfg/lang/zh_cn.json b/kubejs/assets/tfg/lang/zh_cn.json index f25dde829..2a5d1be24 100644 --- a/kubejs/assets/tfg/lang/zh_cn.json +++ b/kubejs/assets/tfg/lang/zh_cn.json @@ -1341,7 +1341,6 @@ "material.tfg.cyclohexanone": "环己酮", "material.tfg.cyclohex_diperoxide": "1,1-环己烷二基二氢过氧化物", "material.tfg.aciditic_waste": "酸性废料", - "material.tfg.propylene": "丙烯", "material.tfg.tpaoh": "四丙基氢氧化铵", "material.tfg.sodium_silicate": "硅酸钠", "material.tfg.metal_rich_solution": "富金属溶液", diff --git a/kubejs/startup_scripts/tfg/materials.power_rework.js b/kubejs/startup_scripts/tfg/materials.power_rework.js index 30e215278..07ada788b 100644 --- a/kubejs/startup_scripts/tfg/materials.power_rework.js +++ b/kubejs/startup_scripts/tfg/materials.power_rework.js @@ -54,14 +54,6 @@ const registerTFGPowerReworkMaterials = (event) => { //#region Materials for BTX - // Propylene - event.create('tfg:propylene') - .gas(new GTFluidBuilder().state(GTFluidState.GAS).temperature(350)) - .components('3x carbon', '6x hydrogen') - .flags(GTMaterialFlags.DISABLE_DECOMPOSITION) - .color(0xffb347) - .secondaryColor(0xffe0b2) - // Crude Mixed Gas event.create('tfg:crude_mixed_gas') .gas(new GTFluidBuilder().state(GTFluidState.GAS).temperature(500))