diff --git a/config/defaultoptions/keybindings.txt b/config/defaultoptions/keybindings.txt index f0523281e..a170c108b 100644 --- a/config/defaultoptions/keybindings.txt +++ b/config/defaultoptions/keybindings.txt @@ -78,7 +78,7 @@ key_key.astikorcarts.desc:key.keyboard.r:NONE key_key.curios.open.desc:key.keyboard.unknown:NONE key_create.keyinfo.toolmenu:key.keyboard.left.alt:NONE key_create.keyinfo.toolbelt:key.keyboard.left.alt:NONE -key_key.toolbelt.open:key.keyboard.unknown:NONE +key_key.toolbelt.open:key.keyboard.x:NONE key_key.toolbelt.slot:key.keyboard.unknown:NONE key_gui.xaero_switch_waypoint_set:key.keyboard.unknown:NONE key_gui.xaero_instant_waypoint:key.keyboard.unknown:NONE @@ -121,7 +121,8 @@ key_key.ftbchunks.map:key.keyboard.unknown:NONE key_key.ftbchunks.claim_manager:key.keyboard.unknown:NONE key_key.ad_astra.toggle_suit_flight:key.keyboard.h:NONE key_key.ad_astra.open_radio:key.keyboard.r:NONE -key_key.wan_ancient_beasts.special_ability:key.keyboard.x:NONE +key_key.wan_ancient_beasts.special_ability:key.keyboard.c:NONE key_key.saveToolbarActivator:key.keyboard.unknown:NONE key_key.loadToolbarActivator:key.keyboard.unknown:NONE -key_key.tacz.crawl.desc:key.keyboard.x:NONE \ No newline at end of file +key_key.tacz.crawl.desc:key.keyboard.c:NONE +key_key.prone:key.keyboard.c:NONE diff --git a/config/ftbquests/quests/chapters/questsmetallurgy.snbt b/config/ftbquests/quests/chapters/questsmetallurgy.snbt index 61a20311b..2fefe32ca 100644 --- a/config/ftbquests/quests/chapters/questsmetallurgy.snbt +++ b/config/ftbquests/quests/chapters/questsmetallurgy.snbt @@ -51,7 +51,7 @@ id: "19CF6D922179DFF9" linked_quest: "11C45DBB20ED7647" shape: "heart" - x: 9.0d + x: 8.5d y: -34.0d } { @@ -1302,6 +1302,21 @@ x: 18.5d y: -24.0d } + { + dependencies: ["174DA15847665CF8"] + description: ["{quests.metal_age.toolbelt.desc}"] + id: "1DEC710C3570D5D0" + shape: "heart" + subtitle: "{quests.metal_age.toolbelt.subtitle}" + tasks: [{ + id: "0233F2A323C9FF6F" + item: "toolbelt:belt" + type: "item" + }] + title: "{quests.metal_age.toolbelt.title}" + x: 9.5d + y: -34.0d + } ] subtitle: ["{quests.metal_age.subtitle}"] title: "{quests.metal_age}" diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index f84b7a487..ee01e4260 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -1359,7 +1359,7 @@ "material.tfg.americium_241": "Americium 241", "material.tfg.californium_252": "Californium 252", "material.tfg.neptunium_237": "Neptunium 237", - "material.tfg.tbu_waste": "Thorium Breeder Waste", + "material.tfg.tbu_waste": "Thorium-Uranium Breeder Waste", "material.tfg.mixed_radioactive_fluid": "Mixed Radioactive Fluid", "material.tfg.degraded_solvent_stream": "Degraded Solvent Stream", "material.tfg.boron_enriched_coolant": "Boron Enriched Coolant", @@ -3556,6 +3556,9 @@ "quests.metal_age.wrought_iron_anvil.title": "T3 Anvil: Wrought Iron", "quests.metal_age.wrought_iron_anvil.subtitle": "Waterwheels, Windmills and more Greate", "quests.metal_age.wrought_iron_anvil.desc": "With the Wrought Iron Anvil you'll be able to work Wrought Iron Ingots into different items such as Sheets, Tool heads, etc.\n\nWrought Iron tools and armor isn't much of an improvement over Bronze, but it has far more durability.\n\nCreating the next anvil is going to be a significant step up in difficulty, so this is a good point to settle down and explore some of the other things this modpack has to offer.", + "quests.metal_age.toolbelt.title": "Toolbelt", + "quests.metal_age.toolbelt.subtitle": "Free up your inventory!", + "quests.metal_age.toolbelt.desc": "Put one of these in your &6Belt Slot&r and you'll free up a whole row of your inventory!\n\nYou can swap tools at any time by pressing the &aSwap Tool&r (default: X) keybind to open a radial menu.", "quests.metal_age.coke_oven.title": "Coke Oven", "quests.metal_age.coke_oven.subtitle": "Finally, No More Charcoal Piles", "quests.metal_age.coke_oven.desc.1": "The Coke Oven is your first GregTech multiblock! It allows you to automatically create Charcoal and other powerful combustibles. The Coke Oven will burn one Log into one Charcoal and 250mb of Creosote, which is an important chemical used in wood treating and as an early fuel.\n\nIf you craft the main Coke Oven block and press the JEI 'Uses' key on it (defaults to \"U\"), you'll find the tab called \"Multiblock Info\", which shows you how to build the Coke Oven in the world.\n\nYou can also just place the Controller block in the world, and interact with it while sneaking to create a Hologram of blocks missing.", @@ -4218,7 +4221,7 @@ "quests.stone_age.soup_time.desc": "By crafting a pot and some bowls out of clay, you'll be able to create soups!\n\nSoups are one of the first and easiest ways to create more complex meals. Unlike eating plain ingredients, these contain much more saturation and let you consume multiple nutrients at once!", "quests.stone_age.meals.title": "Meals", "quests.stone_age.meals.subtitle": "GET IN MAH BELLEH!", - "quests.stone_age.meals.desc": "These are just some of the basic meals you can create. Soups, salads, and sandwiches are your go-tos for easy high saturation combined meals, while pizzas are the only food that can contain every type of nutrient at once.", + "quests.stone_age.meals.desc": "These are just some of the basic meals you can create. Soups, salads, and sandwiches are your go-tos for easy high saturation combined meals.", "quests.stone_age.meals.tasks.1": "Any regular Sandwich", "quests.stone_age.meals.tasks.2": "Any regular Jam Sandwich", "quests.stone_age.garlic_bread.title": "Garlic Bread...?", diff --git a/kubejs/assets/tfg/lang/fr_fr.json b/kubejs/assets/tfg/lang/fr_fr.json index b489989b6..49830c29e 100644 --- a/kubejs/assets/tfg/lang/fr_fr.json +++ b/kubejs/assets/tfg/lang/fr_fr.json @@ -3127,7 +3127,7 @@ "quests.stone_age.soup_time.desc": "By crafting a pot and some bowls out of clay, you'll be able to create soups!\n\nSoups are one of the first and easiest ways to create more complex meals. Unlike eating plain ingredients, these contain much more saturation and let you consume multiple nutrients at once!", "quests.stone_age.meals.title": "Meals", "quests.stone_age.meals.subtitle": "GET IN MAH BELLEH!", - "quests.stone_age.meals.desc": "These are just some of the basic meals you can create. Soups, salads, and sandwiches are your go-tos for easy high saturation combined meals, while pizzas are the only food that can contain every type of nutrient at once.", + "quests.stone_age.meals.desc": "These are just some of the basic meals you can create. Soups, salads, and sandwiches are your go-tos for easy high saturation combined meals.", "quests.stone_age.meals.tasks.1": "Any regular Sandwich", "quests.stone_age.meals.tasks.2": "Any regular Jam Sandwich", "quests.stone_age.garlic_bread.title": "Garlic Bread...?", diff --git a/kubejs/assets/tfg/lang/pt_br.json b/kubejs/assets/tfg/lang/pt_br.json index 99ddccf2c..cde311ad7 100644 --- a/kubejs/assets/tfg/lang/pt_br.json +++ b/kubejs/assets/tfg/lang/pt_br.json @@ -2061,7 +2061,7 @@ "quests.stone_age.soup_time.desc": "Ao criar um pote e algumas tigelas de argila, você poderá preparar sopas!\n\nAs sopas são uma das primeiras e mais simples formas de criar refeições mais complexas. Diferente de comer os ingredientes crus, elas têm muito mais saturação e permitem consumir vários nutrientes de uma vez só!", "quests.stone_age.meals.title": "Refeições", "quests.stone_age.meals.subtitle": "ENTRA NO MEU BUCHO!", - "quests.stone_age.meals.desc": "Estas são apenas algumas das refeições básicas que você pode preparar. Sopas, saladas e sanduíches são boas opções para refeições combinadas com alta saturação, enquanto pizzas são o único alimento que pode conter todos os tipos de nutrientes ao mesmo tempo.", + "quests.stone_age.meals.desc": "Estas são apenas algumas das refeições básicas que você pode preparar. Sopas, saladas e sanduíches são boas opções para refeições combinadas com alta saturação.", "quests.stone_age.meals.tasks.1": "Qualquer Sanduíche comum", "quests.stone_age.meals.tasks.2": "Qualquer Sanduíche com Geleia", "quests.stone_age.garlic_bread.title": "Pão de Alho...?",