I think I got language merger to work (#2243)

* update pakku for core

* Update moldraw.yaml

* kaolinite moment

* adjust flintlock to wrought iron to see how it goes

* tweak flintlock damage

* Update CHANGELOG.md

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* I think I did the language merger right

* fix ja_jp

* fixes betterend block in enderman overhaul

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
This commit is contained in:
GameStar 2025-11-18 22:18:28 -06:00 committed by GitHub
parent 9dd6f60527
commit 533191318c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 31 additions and 191 deletions

View file

@ -1,85 +1,5 @@
{
"__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
"block.betterend.aeridium": "Aeridium",
"block.betterend.amaranita_stem": "Amaranita Stem",
"block.betterend.amber_grass": "Amber Grass",
"block.betterend.amber_root_wild": "Wild Amber Shoots",
"block.betterend.amber_root_dead": "Dead Amber Shoots",
"block.betterend.amber_root": "Amber Shoots",
"block.betterend.aurant_polypore": "Aurant Polypore",
"block.betterend.blooming_cooksonia": "Blooming Cooksonia",
"block.betterend.blossom_berry": "Blossom Berry",
"block.betterend.blossom_berry_wild": "Wild Blossom Berry",
"block.betterend.blossom_berry_dead": "Dead Blossom Berry",
"block.betterend.bolux_mushroom": "Bolux Mushroom Colony",
"block.betterend.bolux_mushroom_wild": "Wild Bolux Mushroom Colony",
"block.betterend.bolux_mushroom_dead": "Dead Bolux Mushroom Colony",
"block.betterend.bushy_grass": "Novagrass",
"block.betterend.bulb_moss": "Bulb Moss",
"block.betterend.cave_bush": "Carmine Lamella",
"block.betterend.cave_bush_fallen": "Small Carmine Lamella",
"block.betterend.cave_grass": "Vermilligma",
"block.betterend.cave_pumpkin": "Bulbkin",
"block.betterend.cave_pumpkin_wild": "Wild Bulbkin Stem",
"block.betterend.cave_pumpkin_dead": "Dead Bulbkin Stem",
"block.betterend.cave_pumpkin_plant": "Bulbkin Stem",
"block.betterend.charnia_cyan": "Cyan Charnia",
"block.betterend.charnia_green": "Green Charnia",
"block.betterend.charnia_light_blue": "Teal Charnia",
"block.betterend.charnia_orange": "Orange Charnia",
"block.betterend.charnia_purple": "Purple Charnia",
"block.betterend.charnia_red": "Red Charnia",
"block.betterend.chorus_grass": "Chorus Grass",
"block.betterend.chorus_lily": "Chorus Lily",
"block.betterend.chorus_mushroom": "Chalmie Mushroom Colony",
"block.betterend.chorus_mushroom_wild": "Wild Chalmie Mushroom Colony",
"block.betterend.chorus_mushroom_dead": "Dead Chalmie Mushroom Colony",
"block.betterend.clawfern": "Clawfern",
"block.betterend.crystal_grass": "Crystal Grass",
"block.betterend.end_lily": "Deimos Lily",
"block.betterend.end_lily_seed": "Deimos Lily Sprout",
"block.betterend.end_lotus_flower": "Phobos Lotus Flower",
"block.betterend.end_lotus_leaf": "Phobos Lotus Leaf",
"block.betterend.end_lotus_stem": "Phobos Lotus Stem",
"block.betterend.end_lotus_seed": "Phobos Lotus Sprout",
"block.betterend.filalux_wings": "Filalux Wings",
"block.betterend.flamaea": "Flamaea Mushroom",
"block.betterend.flammalix": "Flammalix Mushroom",
"block.betterend.fracturn": "Fracturn",
"block.betterend.glacian_hymenophore": "Glacian Hymenophore",
"block.betterend.globulagus": "Globulagus",
"block.betterend.hydralux": "Hydralux",
"block.betterend.hydralux_sapling": "Hydralux Sprout",
"block.betterend.inflexia": "Inflexia",
"block.betterend.lacugrove": "Lacugrove Algae",
"block.betterend.lamellarium": "Lamellarium",
"block.betterend.lanceleaf": "Lanceleaf",
"block.betterend.lanceleaf_small": "Lanceleaf Dagger",
"block.betterend.large_amaranita_mushroom": "Large Amaranita Mushroom",
"block.betterend.lucernia_leaves": "Lucernia Lamella",
"block.betterend.lucernia_leaves_fallen": "Small Lucernia Lamella",
"block.betterend.lucernia_outer_leaves": "Lucernia Hyphae",
"block.betterend.lutebus": "Lutebus",
"block.betterend.magnula": "Magnula",
"block.betterend.nightshade_moss": "Nox Moss",
"block.betterend.orango": "Orango",
"block.betterend.pond_anemone": "Anemone",
"block.betterend.purple_polypore": "Purple Polypore",
"block.betterend.rubinea": "Rubinea",
"block.betterend.ruscus": "Ruscus Grass",
"block.betterend.salteago": "Salteago",
"block.betterend.selagine": "Selagine",
"block.betterend.shadow_berry": "Nox Berries",
"block.betterend.shadow_berry_wild": "Wild Nox Berries",
"block.betterend.shadow_berry_dead": "Dead Nox Berries",
"block.betterend.small_amaranita_mushroom": "Small Amaranita Mushroom",
"block.betterend.twisted_moss": "Twisted Moss",
"block.betterend.twisted_umbrella_moss": "Twisted Umbrella Moss",
"block.betterend.twisted_umbrella_moss_tall": "Twisted Umbrella Moss",
"block.betterend.twisted_vine": "Twisted Vine",
"block.betterend.umbrella_moss": "Umbrella Moss",
"block.betterend.umbrella_moss_tall": "Umbrella Moss",
"block.betterend.vaiolush_fern": "Vaiolush Fern",
"entity.endermanoverhaul.nether_wastes_enderman": "Deep Cave Enderman",
"entity.endermanoverhaul.dark_oak_enderman": "Ashen Enderman",
"entity.endermanoverhaul.mushroom_fields_enderman": "Mushroom Enderman",

View file

@ -1,85 +1,5 @@
{
"__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
"block.betterend.aeridium": "Aeridium",
"block.betterend.amaranita_stem": "Amaranita Stem",
"block.betterend.amber_grass": "Amber Grass",
"block.betterend.amber_root_wild": "Wild Amber Shoots",
"block.betterend.amber_root_dead": "Dead Amber Shoots",
"block.betterend.amber_root": "Amber Shoots",
"block.betterend.aurant_polypore": "Aurant Polypore",
"block.betterend.blooming_cooksonia": "Blooming Cooksonia",
"block.betterend.blossom_berry": "Blossom Berry",
"block.betterend.blossom_berry_wild": "Wild Blossom Berry",
"block.betterend.blossom_berry_dead": "Dead Blossom Berry",
"block.betterend.bolux_mushroom": "Bolux Mushroom Colony",
"block.betterend.bolux_mushroom_wild": "Wild Bolux Mushroom Colony",
"block.betterend.bolux_mushroom_dead": "Dead Bolux Mushroom Colony",
"block.betterend.bushy_grass": "Novagrass",
"block.betterend.bulb_moss": "Bulb Moss",
"block.betterend.cave_bush": "Carmine Lamella",
"block.betterend.cave_bush_fallen": "Small Carmine Lamella",
"block.betterend.cave_grass": "Vermilligma",
"block.betterend.cave_pumpkin": "Bulbkin",
"block.betterend.cave_pumpkin_wild": "Wild Bulbkin Stem",
"block.betterend.cave_pumpkin_dead": "Dead Bulbkin Stem",
"block.betterend.cave_pumpkin_plant": "Bulbkin Stem",
"block.betterend.charnia_cyan": "Cyan Charnia",
"block.betterend.charnia_green": "Green Charnia",
"block.betterend.charnia_light_blue": "Teal Charnia",
"block.betterend.charnia_orange": "Orange Charnia",
"block.betterend.charnia_purple": "Purple Charnia",
"block.betterend.charnia_red": "Red Charnia",
"block.betterend.chorus_grass": "Chorus Grass",
"block.betterend.chorus_lily": "Chorus Lily",
"block.betterend.chorus_mushroom": "Chalmie Mushroom Colony",
"block.betterend.chorus_mushroom_wild": "Wild Chalmie Mushroom Colony",
"block.betterend.chorus_mushroom_dead": "Dead Chalmie Mushroom Colony",
"block.betterend.clawfern": "Clawfern",
"block.betterend.crystal_grass": "Crystal Grass",
"block.betterend.end_lily": "Deimos Lily",
"block.betterend.end_lily_seed": "Deimos Lily Sprout",
"block.betterend.end_lotus_flower": "Phobos Lotus Flower",
"block.betterend.end_lotus_leaf": "Phobos Lotus Leaf",
"block.betterend.end_lotus_stem": "Phobos Lotus Stem",
"block.betterend.end_lotus_seed": "Phobos Lotus Sprout",
"block.betterend.filalux_wings": "Filalux Wings",
"block.betterend.flamaea": "Flamaea Mushroom",
"block.betterend.flammalix": "Flammalix Mushroom",
"block.betterend.fracturn": "Fracturn",
"block.betterend.glacian_hymenophore": "Glacian Hymenophore",
"block.betterend.globulagus": "Globulagus",
"block.betterend.hydralux": "Hydralux",
"block.betterend.hydralux_sapling": "Hydralux Sprout",
"block.betterend.inflexia": "Inflexia",
"block.betterend.lacugrove": "Lacugrove Algae",
"block.betterend.lamellarium": "Lamellarium",
"block.betterend.lanceleaf": "Lanceleaf",
"block.betterend.lanceleaf_small": "Lanceleaf Dagger",
"block.betterend.large_amaranita_mushroom": "Large Amaranita Mushroom",
"block.betterend.lucernia_leaves": "Lucernia Lamella",
"block.betterend.lucernia_leaves_fallen": "Small Lucernia Lamella",
"block.betterend.lucernia_outer_leaves": "Lucernia Hyphae",
"block.betterend.lutebus": "Lutebus",
"block.betterend.magnula": "Magnula",
"block.betterend.nightshade_moss": "Nox Moss",
"block.betterend.orango": "Orango",
"block.betterend.pond_anemone": "Anemone",
"block.betterend.purple_polypore": "Purple Polypore",
"block.betterend.rubinea": "Rubinea",
"block.betterend.ruscus": "Ruscus Grass",
"block.betterend.salteago": "Salteago",
"block.betterend.selagine": "Selagine",
"block.betterend.shadow_berry": "Nox Berries",
"block.betterend.shadow_berry_wild": "Wild Nox Berries",
"block.betterend.shadow_berry_dead": "Dead Nox Berries",
"block.betterend.small_amaranita_mushroom": "Small Amaranita Mushroom",
"block.betterend.twisted_moss": "Twisted Moss",
"block.betterend.twisted_umbrella_moss": "Twisted Umbrella Moss",
"block.betterend.twisted_umbrella_moss_tall": "Twisted Umbrella Moss",
"block.betterend.twisted_vine": "Twisted Vine",
"block.betterend.umbrella_moss": "Umbrella Moss",
"block.betterend.umbrella_moss_tall": "Umbrella Moss",
"block.betterend.vaiolush_fern": "Vaiolush Fern",
"entity.endermanoverhaul.nether_wastes_enderman": "Deep Cave Enderman",
"entity.endermanoverhaul.dark_oak_enderman": "Ashen Enderman",
"entity.endermanoverhaul.mushroom_fields_enderman": "Mushroom Enderman",

View file

@ -1,13 +1,13 @@
{
"__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
"entity.primitive_creatures.tfc": "カオリンクレイズ",
"entity.primitive_creatures.golem_2": "グラファイトグレイズ",
"entity.primitive_creatures.iloger_4": "伏兵",
"entity.primitive_creatures.wiloger": "猛獣使い",
"entity.primitive_creatures.iloger_2": "薬草師",
"entity.primitive_creatures.iloger_1": "野人",
"entity.primitive_creatures.piloger_9": "蛮族",
"entity.primitive_creatures.nahida": "ハントマスター",
"entity.primitive_creatures.tfc": "Kaolin Klayze",
"entity.primitive_creatures.golem_2": "Graphite Glayze",
"entity.primitive_creatures.iloger_4": "Ambusher",
"entity.primitive_creatures.wiloger": "Beast Tamer",
"entity.primitive_creatures.iloger_2": "Herbalist",
"entity.primitive_creatures.iloger_1": "Forager",
"entity.primitive_creatures.piloger_9": "Warrior",
"entity.primitive_creatures.nahida": "Huntmaster",
"item.primitive_creatures.tfc_spawn_egg": "Kaolin Klayze Spawn Egg",
"item.primitive_creatures.golem_2_spawn_egg": "Graphite Glayze Spawn Egg",
"item.primitive_creatures.iloger_4_spawn_egg": "Ambusher Spawn Egg",

View file

@ -1,13 +1,13 @@
{
"__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
"entity.primitive_creatures.tfc": "Kaolin Klayze",
"entity.primitive_creatures.golem_2": "Graphite Glayze",
"entity.primitive_creatures.iloger_4": "Ambusher",
"entity.primitive_creatures.wiloger": "Beast Tamer",
"entity.primitive_creatures.iloger_2": "Herbalist",
"entity.primitive_creatures.iloger_1": "Forager",
"entity.primitive_creatures.piloger_9": "Warrior",
"entity.primitive_creatures.nahida": "Huntmaster",
"entity.primitive_creatures.tfc": "カオリンクレイズ",
"entity.primitive_creatures.golem_2": "グラファイトグレイズ",
"entity.primitive_creatures.iloger_4": "伏兵",
"entity.primitive_creatures.wiloger": "猛獣使い",
"entity.primitive_creatures.iloger_2": "薬草師",
"entity.primitive_creatures.iloger_1": "野人",
"entity.primitive_creatures.piloger_9": "蛮族",
"entity.primitive_creatures.nahida": "ハントマスター",
"item.primitive_creatures.tfc_spawn_egg": "カオリンクレイズのスポーンエッグ",
"item.primitive_creatures.golem_2_spawn_egg": "グラファイトグレイズのスポーンエッグ",
"item.primitive_creatures.iloger_4_spawn_egg": "伏兵のスポーンエッグ",

View file

@ -1145,6 +1145,11 @@
"material.tfg.triglyceride_oil": "Triglyceride Oil",
"material.tfg.cholesterol": "Cholesterol",
"material.tfg.butyric_acid": "Butyric Acid",
"material.tfg.citric_acid": "Citric Acid",
"material.tfg.sodium_dihydrogen_citrate": "Sodium Dihydrogen Citrate",
"material.tfg.light_stock": "Light Stock",
"material.tfg.rich_stock": "Rich Stock",
"material.tfg.brown_gravy": "Brown Gravy",
"material.tfg.zircon": "Zircon",
"material.tfg.silicon_tetrachloride": "Silicon Tetrachloride",
"material.tfg.zirconium_tetrachloride": "Zirconium Tetrachloride",
@ -1152,11 +1157,6 @@
"material.tfg.zirconium_bromide": "Zirconium(IV) Bromide",
"material.tfg.zirconium_diboride": "Zirconium Diboride",
"material.tfg.boron_carbide": "Boron Carbide",
"material.tfg.citric_acid": "Citric Acid",
"material.tfg.sodium_dihydrogen_citrate": "Sodium Dihydrogen Citrate",
"material.tfg.light_stock": "Light Stock",
"material.tfg.rich_stock": "Rich Stock",
"material.tfg.brown_gravy": "Brown Gravy",
"ore_vein.tfg.deep_sheldonite": "Cooperite & Bornite",
"ore_vein.tfg.deep_garnet_amethyst": "Amethyst & Garnet",
"ore_vein.tfg.deep_garnet_opal": "Opal & Garnet",
@ -1483,12 +1483,6 @@
"tfg.tooltip.component.refrigerant_pellet": "Can be used as an input in the Fission Reactor to cool it down, requires a Material Holder",
"tfg.tooltip.component.nuclear_turbine_1": "§eBase Production:§r 4096 EU/t",
"tfg.tooltip.component.nuclear_turbine_2": "Each Rotor Holder above §5EV§r §7adds§r 10% efficiency and multiplies EU/t by 2.",
"tfg.tooltip.fake_nutrition_info_listener": "§7§oHold (Shift) for Nutrition Info",
"tfg.tooltip.fake_nutrition_info": "§7Nutrition:",
"tfg.tooltip.cheese_slice_microplastics": "§b- Microplastics: 1.9",
"tfg.gui.menu.field_guide_splash_text": "Tip: Read the field guide!!!",
"tfg.gui.menu.ram_usage": "RAM:",
"tfg.gui.menu.fps_count": "FPS:",
"tfg.gui.refrigerator.unify_dates.enabled": "Expiration Date Unification is: §aOn",
"tfg.gui.refrigerator.unify_dates.disabled": "Expiration Date Unification is: §cOff",
"tfg.machine.food_refrigerator_power_usage": "§7Consumes§r %s EU/t §7while active to keep your food fresh.§r",
@ -1496,6 +1490,12 @@
"tfg.gui.rnr_plow.width": "Path Width: %d Blocks",
"tfg.gui.rnr_plow.empty_crushed_base_course": "§cMissing Crushed Base Course!!",
"tfg.tooltip.progenitor_cells.mob": "Animal culture: ",
"tfg.tooltip.fake_nutrition_info_listener": "§7§oHold (Shift) for Nutrition Info",
"tfg.tooltip.fake_nutrition_info": "§7Nutrition:",
"tfg.tooltip.cheese_slice_microplastics": "§b- Microplastics: 1.9",
"tfg.gui.menu.field_guide_splash_text": "Tip: Read the field guide!!!",
"tfg.gui.menu.ram_usage": "RAM:",
"tfg.gui.menu.fps_count": "FPS:",
"tfc.jei.flint_knapping": "Flint Knapping",
"tfc.jei.straw_knapping": "Straw Knapping",
"tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.black": "Dyeing",

View file

@ -1050,16 +1050,16 @@
"tfg.tooltip.wraptor_wool": "§7Colhido das penas de um Distráptor",
"tfg.tooltip.wraptor_sugar": "§7Não pense muito a respeito disso",
"tfg.tooltip.obsolete.depreciated": "§cObsoleto, não pode mais ser criado",
"tfg.gui.rnr_plow.random_mode": "Aleatorizar Materiais",
"tfg.gui.rnr_plow.width": "Largura do Caminho: %d Blocos",
"tfg.gui.rnr_plow.empty_crushed_base_course": "§cFalta Camada Base Triturada!!",
"tfg.tooltip.progenitor_cells.mob": "Cultura animal: ",
"tfg.tooltip.fake_nutrition_info_listener": "§7§oSegure (Shift) para informações nutricionais",
"tfg.tooltip.fake_nutrition_info": "§7Nutrição:",
"tfg.tooltip.cheese_slice_microplastics": "§b- Microplásticos: 1.9",
"tfg.gui.menu.field_guide_splash_text": "Dica: Leia o guia de campo!!!",
"tfg.gui.menu.ram_usage": "RAM:",
"tfg.gui.menu.fps_count": "FPS:",
"tfg.gui.rnr_plow.random_mode": "Aleatorizar Materiais",
"tfg.gui.rnr_plow.width": "Largura do Caminho: %d Blocos",
"tfg.gui.rnr_plow.empty_crushed_base_course": "§cFalta Camada Base Triturada!!",
"tfg.tooltip.progenitor_cells.mob": "Cultura animal: ",
"tfc.jei.flint_knapping": "Talhar Sílex",
"tfc.jei.straw_knapping": "Trançar Palha",
"tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.black": "Tingindo",