diff --git a/config/ftbquests/quests/chapters/create_logistics.snbt b/config/ftbquests/quests/chapters/create_logistics.snbt index f3f9eda38..01cf9c075 100644 --- a/config/ftbquests/quests/chapters/create_logistics.snbt +++ b/config/ftbquests/quests/chapters/create_logistics.snbt @@ -43,7 +43,6 @@ "{quests.create_logistics.packager.desc.2}" ] id: "09D5BD00E3308E76" - optional: true size: 2.0d subtitle: "{quests.create_logistics.packager.subtitle}" tasks: [{ @@ -79,7 +78,6 @@ ] id: "43B4236DB93BC425" min_required_dependencies: 1 - optional: true subtitle: "{quests.create_logistics.frogport.subtitle}" tasks: [{ id: "795EBF0807564441" @@ -142,7 +140,6 @@ description: ["{quests.create_logistics.rose_quartz_lens.desc}"] icon: "greate:rose_quartz_lens" id: "7C4807A247AF36A1" - optional: true shape: "octagon" size: 2.0d subtitle: "{quests.create_logistics.rose_quartz_lens.subtitle}" @@ -167,7 +164,6 @@ description: ["{quests.create_logistics.rose_quartz.desc}"] icon: "gtceu:overworld_marker" id: "3137824EEA1E4D9B" - optional: true subtitle: "{quests.create_logistics.rose_quartz.subtitle}" tasks: [{ id: "2764C09EC03449D6" @@ -222,7 +218,6 @@ dependency_requirement: "one_completed" description: ["{quests.create_logistics.stock_link.desc}"] id: "76490E046A44BCC3" - optional: true size: 2.0d subtitle: "{quests.create_logistics.stock_link.subtitle}" tasks: [{ @@ -248,7 +243,6 @@ "{quests.create_logistics.stock_ticker.desc.3}" ] id: "341E2F290344BEEE" - optional: true shape: "gear" size: 3.0d subtitle: "{quests.create_logistics.stock_ticker.subtitle}" @@ -296,7 +290,6 @@ "{quests.create_logistics.factory_gauge.desc.4}" ] id: "2262F1FD4EAB777F" - optional: true shape: "gear" size: 3.0d subtitle: "{quests.create_logistics.factory_gauge.subtitle}" diff --git a/config/ftbquests/quests/chapters/questsmetallurgy.snbt b/config/ftbquests/quests/chapters/questsmetallurgy.snbt index 93b921e93..21590a857 100644 --- a/config/ftbquests/quests/chapters/questsmetallurgy.snbt +++ b/config/ftbquests/quests/chapters/questsmetallurgy.snbt @@ -63,9 +63,24 @@ { id: "5B4E347985A66970" linked_quest: "21C58B2541BFA2EE" - x: -1.5d + shape: "heart" + x: -2.0d y: -32.0d } + { + id: "70D405A6CF1B048B" + linked_quest: "7178843BCD50A012" + shape: "heart" + x: 0.5d + y: -34.5d + } + { + id: "588868A203BF7599" + linked_quest: "4CD3F04793CE47A2" + shape: "diamond" + x: -2.0d + y: -34.5d + } ] quests: [ { @@ -452,7 +467,7 @@ type: "item" }] title: "{quests.metal_age.mining.title}" - x: 0.0d + x: -0.5d y: -32.0d } { @@ -720,7 +735,7 @@ }] title: "{quests.metal_age.bronze_goodies.title}" x: 2.0d - y: -34.0d + y: -34.5d } { dependencies: ["174DA15847665CF8"] @@ -1258,8 +1273,8 @@ } ] title: "{quests.metal_age.copper_diving.title}" - x: 0.0d - y: -34.0d + x: -0.5d + y: -33.5d } { dependencies: ["72B3EA6588E18CCC"] diff --git a/config/ftbquests/quests/chapters/questssteam_age.snbt b/config/ftbquests/quests/chapters/questssteam_age.snbt index 02e619aed..7447e9716 100644 --- a/config/ftbquests/quests/chapters/questssteam_age.snbt +++ b/config/ftbquests/quests/chapters/questssteam_age.snbt @@ -1999,6 +1999,32 @@ x: -14.5d y: 8.5d } + { + description: [ + "{quests.steam_age.cobalt_brass.desc.1}" + "{@pagebreak}" + "{quests.steam_age.cobalt_brass.desc.2}" + ] + id: "4DF2E10B96454D8E" + subtitle: "{quests.steam_age.cobalt_brass.subtitle}" + tasks: [{ + id: "644B4BBA4F85648E" + item: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:cobalt_brass_ingot" + } + type: "item" + }] + title: "{quests.steam_age.cobalt_brass.title}" + x: -15.5d + y: 13.5d + } ] subtitle: ["{quests.steam_age.subtitle}"] title: "{quests.steam_age}" diff --git a/config/ftbquests/quests/chapters/questsstoneage.snbt b/config/ftbquests/quests/chapters/questsstoneage.snbt index 339a05078..00364f25a 100644 --- a/config/ftbquests/quests/chapters/questsstoneage.snbt +++ b/config/ftbquests/quests/chapters/questsstoneage.snbt @@ -51,15 +51,8 @@ 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 + x: 0.0d + y: 12.5d } ] quests: [ diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index 0690970a7..fbd8a86f7 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -1437,7 +1437,11 @@ y: 11.0d } { - dependencies: ["1766C916084261AA"] + dependencies: [ + "1766C916084261AA" + "4C444814F1C7B600" + ] + dependency_requirement: "one_completed" description: ["{quests.tfg_tips.unrefined_paper.desc}"] guide_page: "tfc:field_guide tfc:mechanics/papermaking" id: "4CD3F04793CE47A2" diff --git a/config/ftbquests/quests/chapters/tips__tools.snbt b/config/ftbquests/quests/chapters/tips__tools.snbt index b8b0ed605..6aed25787 100644 --- a/config/ftbquests/quests/chapters/tips__tools.snbt +++ b/config/ftbquests/quests/chapters/tips__tools.snbt @@ -424,7 +424,12 @@ y: 3.0d } { - dependencies: ["7FA5B6354A49C396"] + dependencies: [ + "7FA5B6354A49C396" + "3C173357029AB649" + "4CD3F04793CE47A2" + ] + dependency_requirement: "one_completed" description: ["{quests.tfg_tips.backpack_materials.desc}"] id: "7178843BCD50A012" size: 1.0d @@ -2509,7 +2514,6 @@ 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: [ { @@ -2580,12 +2584,12 @@ dependencies: [ "509C064AA92FD78F" "234B68E86F72C29E" + "4CD3F04793CE47A2" ] dependency_requirement: "one_completed" 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: [ @@ -2655,7 +2659,6 @@ 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/assets/greate/textures/block/andesite_alloy/saw.png b/kubejs/assets/greate/textures/block/andesite_alloy/saw.png new file mode 100644 index 000000000..817968a48 Binary files /dev/null and b/kubejs/assets/greate/textures/block/andesite_alloy/saw.png differ diff --git a/kubejs/assets/greate/textures/block/andesite_alloy/saw.png.mcmeta b/kubejs/assets/greate/textures/block/andesite_alloy/saw.png.mcmeta new file mode 100644 index 000000000..a328ca58d --- /dev/null +++ b/kubejs/assets/greate/textures/block/andesite_alloy/saw.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": false, + "frametime": 1 + } +} diff --git a/kubejs/assets/greate/textures/block/andesite_alloy/saw_reversed.png b/kubejs/assets/greate/textures/block/andesite_alloy/saw_reversed.png new file mode 100644 index 000000000..446db22eb Binary files /dev/null and b/kubejs/assets/greate/textures/block/andesite_alloy/saw_reversed.png differ diff --git a/kubejs/assets/greate/textures/block/andesite_alloy/saw_reversed.png.mcmeta b/kubejs/assets/greate/textures/block/andesite_alloy/saw_reversed.png.mcmeta new file mode 100644 index 000000000..a328ca58d --- /dev/null +++ b/kubejs/assets/greate/textures/block/andesite_alloy/saw_reversed.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": false, + "frametime": 1 + } +} diff --git a/kubejs/assets/greate/textures/block/andesite_alloy/static_saw.png b/kubejs/assets/greate/textures/block/andesite_alloy/static_saw.png new file mode 100644 index 000000000..ff2a7a43c Binary files /dev/null and b/kubejs/assets/greate/textures/block/andesite_alloy/static_saw.png differ