diff --git a/config/ftbquests/quests/chapters/lv__low_voltage.snbt b/config/ftbquests/quests/chapters/lv__low_voltage.snbt index b7bee86da..1a2f4635e 100644 --- a/config/ftbquests/quests/chapters/lv__low_voltage.snbt +++ b/config/ftbquests/quests/chapters/lv__low_voltage.snbt @@ -1308,13 +1308,7 @@ } { dependencies: ["22510C5F2386B453"] - description: [ - "{quests.steam_age.alternator.desc.1}" - "{@pagebreak}" - "{quests.steam_age.alternator.desc.2}" - "" - "{image:tfg:textures/quests/alternator_multiblock.png width:100 height:100 align:center}" - ] + description: ["{quests.steam_age.alternator.desc.1}"] id: "2DC24661CAD557B0" optional: true subtitle: "{quests.steam_age.alternator.subtitle}" diff --git a/config/ftbquests/quests/chapters/ore_processing.snbt b/config/ftbquests/quests/chapters/ore_processing.snbt index 2941f44cf..aff277eb7 100644 --- a/config/ftbquests/quests/chapters/ore_processing.snbt +++ b/config/ftbquests/quests/chapters/ore_processing.snbt @@ -22,25 +22,18 @@ id: "5D09BEE61210DF02" size: 1.5d subtitle: "{quests.ore_proc.native_ore.subtitle}" - tasks: [ - { - id: "047DA2872D107BA0" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - "ftbfiltersystem:filter": "or(item_tag(tfc:ore_pieces))" - } + tasks: [{ + id: "047DA2872D107BA0" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item_tag(tfc:ore_pieces))" } - optional_task: true - title: "{quests.ore_proc.native_ore.task}" - type: "item" } - { - id: "2D0D9226FDB3CAC9" - type: "checkmark" - } - ] + title: "{quests.ore_proc.native_ore.task}" + type: "item" + }] title: "{quests.ore_proc.native_ore.title}" x: 0.5d y: -8.5d diff --git a/config/ftbquests/quests/chapters/questssteam_age.snbt b/config/ftbquests/quests/chapters/questssteam_age.snbt index 586e1a5a1..015d12d47 100644 --- a/config/ftbquests/quests/chapters/questssteam_age.snbt +++ b/config/ftbquests/quests/chapters/questssteam_age.snbt @@ -23,10 +23,8 @@ { id: "23A27702FF816291" linked_quest: "6903C72A254A7B08" - shape: "octagon" - size: 2.0d - x: -13.5d - y: 14.5d + x: -14.5d + y: 6.0d } { id: "1F1E7097C015BE33" @@ -726,7 +724,8 @@ dependencies: ["46FA9DD4755A5548"] description: ["{quests.steam_age.extractor.desc}"] id: "1DF4DBE41BB0B6FD" - shape: "square" + optional: true + shape: "heart" size: 1.0d subtitle: "{quests.steam_age.extractor.subtitle}" tasks: [{ @@ -1161,7 +1160,7 @@ type: "item" }] title: "{quests.steam_age.vacuum_chamber.title}" - x: -13.5d + x: -14.5d y: 12.0d } { @@ -1578,7 +1577,7 @@ dependencies: ["49896161B31DB7B4"] description: [ "There is currently a bug with the Mechanical Mixer where some recipes want an actual Programmed Circuit item." - "For the time being, you can craft these out of Sticks." + "For the time being, you can craft these with a Stick and a Wrench." "" "This will be fixed whenever we're able to update Greate to the latest version, which requires Create 6, which requires other Create addons to be updated... hopefully that should be soon." ] diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index 228a39cb5..e33e2790d 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -1116,9 +1116,10 @@ } { dependencies: [ - "1DF4DBE41BB0B6FD" "4891E995D3EC2BD1" + "5F3063C539C9CBBF" ] + dependency_requirement: "one_completed" description: ["{quests.tfg_tips.create_rubber_ingot.desc}"] id: "6903C72A254A7B08" shape: "gear" diff --git a/kubejs/assets/create/lang/en_us.json b/kubejs/assets/create/lang/en_us.json index a45af984a..9c17fa677 100644 --- a/kubejs/assets/create/lang/en_us.json +++ b/kubejs/assets/create/lang/en_us.json @@ -1,5 +1,6 @@ { "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.", + "block.create.netherite_backtank": "Blue Steel Backtank", "block.create.dark_oak_window": "Hickory Window", "block.create.dark_oak_window_pane": "Hickory Window Pane", "block.create.andesite_bars": "Metal Bars", @@ -68,7 +69,6 @@ "block.create.small_granite_brick_wall": "Small Chert Brick Wall", "block.create.layered_granite": "Layered Chert", "block.create.granite_pillar": "Chert Pillar", - "block.create.netherite_backtank": "Blue Steel Backtank", "item.create.netherite_diving_helmet.tooltip.summary": "Together with a _Blue Steel Backtank_, this can protect you from _extreme heat_. To be effective, _Legs and Feet_ have to be covered in a _Blue Steel Diving Equipment_, too.", "item.create.netherite_backtank": "Blue Steel Backtank", "item.create.netherite_diving_helmet": "Blue Steel Diving Helmet", @@ -89,4 +89,4 @@ "create.ponder.brass_funnel.text_1": "Metal Funnels can only ever extract single items.", "create.ponder.cogwheel_casing.text_1": "Brass or Metal Casing can be used to decorate Cogwheels", "create.ponder.shaft_casing.text_1": "Brass or Metal Casing can be used to decorate Shafts" -} +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 2ed03e10f..a5ea52d7b 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -62,6 +62,8 @@ "material.gtceu.ostrum": "Ostrum", "material.gtceu.calorite": "Calorite", "material.gtceu.etrium": "Etrium", + "material.gtceu.rocket_alloy_t1": "Colored Rocket Alloy", + "material.gtceu.vitrified_asbestos": "Vitrified Asbestos", "metaitem.dust.tooltip.purify": "Drop in Water to get Clean Dust", "metaitem.crushed.tooltip.purify": "Drop in Water to get Purified Ore", "item.gtceu.tool.behavior.silk_ice": "Silk Harvests Packed Ice", diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/firmalife/irrigation.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/firmalife/irrigation.json index 82d01a01d..721b9b125 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/firmalife/irrigation.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/firmalife/irrigation.json @@ -13,12 +13,14 @@ "text": "The sprinkler is made with a $(thing)Copper Plate$()." }, { - "type": "patchouli:text", - "text": "Sprinklers must be connected to a system of pipes that feed it water in order to work. This is done by connecting a series of $(thing)Fluid Pipes$() to them. You can pump fluid into them with a $(thing)Mechanical Pump$()." + "title": "Piping", + "item": "gtceu:copper_tiny_fluid_pipe", + "type": "patchouli:spotlight", + "text": "Sprinklers must be connected to a system of pipes that feed it water in order to work. This is done by connecting a series of $(thing)Fluid Pipes$() to them. You can pump water into them with a $(thing)Mechanical Pump$()." }, { "type": "patchouli:text", - "text": "You can right-click a pipe with a GregTech Frame (such as a $(thing)Copper Frame$()) to make them flush with the wall. You will need a Drum or Fluid Tank attached to each sprinkler in order for them to work." + "text": "You can right-click a pipe with a GregTech Frame (such as a $(thing)Copper Frame$()) to make them flush with the wall, or use a Greenhouse Port. You can then attach your sprinkler directly to the pipe! Right-click fluid pipes with a wrench to change their direction, and sneak-right-click them with an $(thing)empty offhand$() to make them one-way." } ], "read_by_default": true, diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index c612af621..5bc6a96ec 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -11,9 +11,14 @@ "biome.tfg.nether/gneiss_caves": "Deep Caves", "biome.tfg.nether/granite_caves": "Deep Caves", "biome.tfg.nether/schist_caves": "Deep Caves", - "biome.tfg.moon/lunar_basalt_maria": "Lunar Maria", - "biome.tfg.moon/lunar_diorite_delta": "Lunar Delta", - "biome.tfg.moon/lunar_gabbro_uplift": "Lunar Uplift", + "biome.tfg.moon/lunar_asurine_dense": "Certus Fields", + "biome.tfg.moon/lunar_asurine_sparse": "Asurine Fields", + "biome.tfg.moon/lunar_chorus_dense": "Chorus Thicket", + "biome.tfg.moon/lunar_chorus_sparse": "Chorus Forest", + "biome.tfg.moon/lunar_corals_dense": "Lunar Reef", + "biome.tfg.moon/lunar_corals_sparse": "Lunar Maria", + "biome.tfg.moon/lunar_lights_dense": "Lightbloom Star Gazers", + "biome.tfg.moon/lunar_lights_sparse": "Lightbloom Scrubland", "biome.tfg.moon/lunar_plains": "Lunar Plains", "block.tfg.decorative_vase.black": "Black Decorative Vase", "block.tfg.decorative_vase.gray": "Gray Decorative Vase", @@ -131,17 +136,25 @@ "block.tfg.loose.deepslate": "Loose Migmatite Rock", "block.tfg.loose.dripstone": "Loose Travertine Rock", "block.tfg.rock.hardened_moon_stone": "Hardened Anorthosite", + "block.tfg.spike.moon_stone_spike": "Anorthosite Spike", "block.tfg.loose.moon_stone": "Loose Anorthosite Rock", "block.tfg.rock.hardened_moon_deepslate": "Hardened Norite", + "block.tfg.spike.moon_deepslate_spike": "Norite Spike", "block.tfg.loose.moon_deepslate": "Loose Norite Rock", "block.tfg.rock.hardened_mars_stone": "Hardened Argillite", + "block.tfg.spike.mars_stone_spike": "Argillite Spike", "block.tfg.loose.mars_stone": "Loose Argillite Rock", "block.tfg.rock.hardened_venus_stone": "Hardened Trachyte", + "block.tfg.spike.venus_stone_spike": "Trachyte Spike", "block.tfg.loose.venus_stone": "Loose Trachyte Rock", "block.tfg.rock.hardened_mercury_stone": "Hardened Komatiite", + "block.tfg.spike.mercury_stone_spike": "Komatiite Spike", "block.tfg.loose.mercury_stone": "Loose Komatiite Rock", "block.tfg.rock.hardened_glacio_stone": "Hardened Phonolite", + "block.tfg.spike.glacio_stone_spike": "Phonolite Spike", "block.tfg.loose.glacio_stone": "Loose Phonolite Rock", + "block.tfg.rock.hardened_permafrost": "Hardened Permafrost", + "block.tfg.spike.permafrost_spike": "Permafrost Spike", "block.tfg.loose.permafrost": "Permafrost Chunk", "block.tfg.lunar_roots": "Lunar Lightblooms", "block.tfg.lunar_sprouts": "Lunar Lightgrass", @@ -193,6 +206,7 @@ "item.tfg.latex_soaked_gloves": "Latex-Soaked Gloves", "item.tfg.spade_head_extruder_mold": "Extruder Mold (Spade Head)", "item.tfg.unfired_chalk": "Unfired Chalk Stick", + "item.tfg.armor_stand_arms": "Armor Stand with Arms", "item.tfg.brick.deepslate": "Migmatite Brick", "item.tfg.loose.moon_stone": "Loose Anorthosite", "item.tfg.brick.moon_stone": "Anorthosite Brick", @@ -568,12 +582,14 @@ "quests.development.hull_zpm.desc": "This is the &9Wetware&r Circuit line.\n\nIt will be the biggest automation challenge to face in this modpack. Best of luck.", "quests.gregtech_energy": "Gregtech Energy", "quests.gregtech_energy.subtitle": "So how does all of that work?", + "quests.gregtech_energy.start.title": "Let's do some explaining", + "quests.gregtech_energy.start.desc": "We know that &5GregTech&r isn’t the easiest mod to get into — especially when it comes to the &cenergy system&r. That’s why we’ll take our time in this chapter to explain as much as we can.\n\nSome things here might not make full sense until later in your progression, so &adon’t stress yourself&r. Just try to understand what you can for now, and feel free to &dcome back to this chapter&r whenever you have questions.\n\nWe’ve split this chapter into &efour categories&r, each one covering a topic related to the &6GregTech Energy System&r. We’ll provide as many examples as possible to help you understand how it all works.", + "quests.gregtech_energy.start.task": "Welcome aboard", "quests.gregtech_energy.TEST.title": "", "quests.gregtech_energy.TEST.subtitle": "", "quests.gregtech_energy.TEST.desc.1": "", "quests.gregtech_energy.TEST.desc.2": "", "quests.gregtech_energy.TEST.desc.3": "", - "quests.gregtech_energy.TEST.desc.4": "", "quests.gregtech_energy.TEST.task": "", "quests.gregtech_energy.TEST.desc": "", "quests.high_voltage": "&6HV&r - High Voltage", @@ -1050,6 +1066,9 @@ "quests.medium_voltage.mv_ram.title": "Download more RAM", "quests.medium_voltage.mv_ram.subtitle": "That's from the Dark Punk you know?", "quests.medium_voltage.mv_ram.desc": "&aRandom Access Memory&r is required for many Circuits.", + "quests.medium_voltage.lsb.title": "Getting very steamy", + "quests.medium_voltage.lsb.subtitle": "If you have unlimited fuel, it can still be good", + "quests.medium_voltage.lsb.desc": "If you're &lstill&r running off the &3Large Bronze Boiler&r, you may want to upgrade to the &3Large Steel Boiler&r.\n\nIt's slightly more efficient than the &3LBB&r, and produces &d900 EU/t worth of Steam&r.\n\nWe'd recommend you try other power options at this point.", "quests.metal_age": "Metallurgy Age", "quests.metal_age.subtitle": "Your First Technological Advancements.", "quests.metal_age.weld_bronze_ingots.title": "Welding Bronze",