diff --git a/config/ftbquests/quests/chapters/questsstoneage.snbt b/config/ftbquests/quests/chapters/questsstoneage.snbt index 8945bdddc..339a05078 100644 --- a/config/ftbquests/quests/chapters/questsstoneage.snbt +++ b/config/ftbquests/quests/chapters/questsstoneage.snbt @@ -32,14 +32,36 @@ } ] order_index: 0 - quest_links: [{ - id: "409385C6F6640BEA" - linked_quest: "427814F6E9386772" - shape: "gear" - size: 4.0d - x: 4.0d - y: 0.0d - }] + quest_links: [ + { + id: "409385C6F6640BEA" + linked_quest: "427814F6E9386772" + shape: "gear" + size: 4.0d + x: 4.0d + y: 0.0d + } + { + id: "66FB69B8381F5A01" + linked_quest: "67F40A90844EC0FC" + x: 8.0d + y: 2.0d + } + { + id: "78C8274E7CA78B12" + linked_quest: "509C064AA92FD78F" + shape: "heart" + x: 1.0d + y: 16.0d + } + { + id: "5E38676D9AD5336C" + linked_quest: "21C58B2541BFA2EE" + shape: "heart" + x: -1.5d + y: 16.0d + } + ] quests: [ { dependencies: ["427814F6E9386772"] diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index 01852da68..0690970a7 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -262,6 +262,7 @@ guide_page: "tfc:field_guide tfc:firmalife/beekeeping" icon: "firmalife:beeswax" id: "1071B804483BB882" + shape: "circle" subtitle: "{quests.tfg_tips.beekeeping.subtitle}" tasks: [{ id: "07A6195AEE51DAB7" @@ -627,6 +628,7 @@ guide_page: "tfc:field_guide tfc:mechanics/decay" icon: "minecraft:clock" id: "4047EE998BC4CD03" + shape: "circle" subtitle: "{quests.tfg_tips.preservation.subtitle}" tasks: [{ id: "29CDDE027CC8B84A" @@ -1239,6 +1241,7 @@ guide_page: "tfc:field_guide tfc:firmalife/greenhouse" icon: "firmalife:large_planter" id: "07FBA022050DA24A" + shape: "circle" subtitle: "{quests.tfg_tips.greenhouse.subtitle}" tasks: [{ id: "63D7E5FDBE2B66D5" @@ -1588,6 +1591,7 @@ } } id: "28333A7852497C4D" + shape: "circle" subtitle: "{quests.tfg_tips.status_effects.subtitle}" tasks: [{ id: "1F96808948B568A2" @@ -1757,7 +1761,9 @@ { dependencies: ["4AA0EBFBA5D8788C"] description: ["{quests.tfg_tips.beneath_prep.desc}"] + icon: "create:clipboard" id: "4A8910950F638BB5" + shape: "circle" subtitle: "{quests.tfg_tips.beneath_prep.subtitle}" tasks: [{ id: "2E029DE0398319F2" @@ -1859,6 +1865,7 @@ } } id: "098739E441CF565D" + shape: "circle" subtitle: "{quests.tfg_tips.beneath_clothes.subtitle}" tasks: [{ id: "70EF47E8FD504806" @@ -1887,7 +1894,9 @@ { dependencies: ["70DA01DFDAE54224"] description: ["{quests.tfg_tips.fuck_go_back.desc}"] + icon: "minecraft:ladder" id: "4FD6D93811DADCE4" + shape: "circle" subtitle: "{quests.tfg_tips.fuck_go_back.subtitle}" tasks: [{ id: "6D482B9189A97E0F" diff --git a/config/ftbquests/quests/chapters/tips__tools.snbt b/config/ftbquests/quests/chapters/tips__tools.snbt index 5f6ce1a06..ad66df862 100644 --- a/config/ftbquests/quests/chapters/tips__tools.snbt +++ b/config/ftbquests/quests/chapters/tips__tools.snbt @@ -2502,10 +2502,14 @@ y: 1.0d } { - dependencies: ["7FA5B6354A49C396"] + dependencies: [ + "7FA5B6354A49C396" + "560B17BFBE8D477D" + ] description: ["{quests.tfg_tips.first_sacks.desc}"] guide_page: "tfc:field_guide tfc:sns/leather_sack" id: "509C064AA92FD78F" + optional: true subtitle: "{quests.tfg_tips.first_sacks.subtitle}" tasks: [ { @@ -2581,6 +2585,7 @@ description: ["{quests.tfg_tips.special_sacks.desc}"] guide_page: "tfc:field_guide tfc:sns/ore_sack" id: "21C58B2541BFA2EE" + optional: true shape: "heart" subtitle: "{quests.tfg_tips.special_sacks.subtitle}" tasks: [ @@ -2643,10 +2648,14 @@ y: 5.0d } { - dependencies: ["7FA5B6354A49C396"] + dependencies: [ + "7FA5B6354A49C396" + "015E7A116CCD3191" + ] description: ["{quests.tfg_tips.straw_basket.desc}"] guide_page: "tfc:field_guide tfc:sns/straw_basket" id: "67F40A90844EC0FC" + optional: true subtitle: "{quests.tfg_tips.straw_basket.subtitle}" tasks: [{ id: "542549225517097C" diff --git a/kubejs/startup_scripts/gtceu/material_modification.js b/kubejs/startup_scripts/gtceu/material_modification.js index 4efcece0b..8ad3e3213 100644 --- a/kubejs/startup_scripts/gtceu/material_modification.js +++ b/kubejs/startup_scripts/gtceu/material_modification.js @@ -355,6 +355,7 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.BlackSteel.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(6.5, 4.5, 1228, 3, metalTooling).build()); // Cast iron tools don't make sense but gregtech shits itself if they're missing, // so I'm just giving them terrible terrible stats + GTMaterials.Iron.getProperties().removeProperty(PropertyKey.TOOL) GTMaterials.Iron.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(2.5, 1.0, 20, 2, [GTToolType.PICKAXE]).build()); // Hide netherite too GTMaterials.Netherite.getProperty(PropertyKey.TOOL).removeTypes(metalTooling);