diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bd9433bc0..9e43e7c56 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -407,7 +407,7 @@ jobs: - name: 🚀 Create release id: release - uses: softprops/action-gh-release@v2.2.2 + uses: softprops/action-gh-release@v2.3.2 with: name: ${{ needs.info.outputs.project_version }} tag_name: ${{ needs.info.outputs.project_version }} diff --git a/CHANGELOG.md b/CHANGELOG.md index ca77157fe..1c8217a36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,19 @@ # Changelog + ## [Unreleased] ### New features +### Bug fixes +- Fixed double ingots not having a temperature (#1165) @Pyritie +- Removed a few recipes that had unobtainable create-related materials @Pyritie +- Fixed the color of placed zinc ingots and plated blocks to match the material @Pyritie +### Changes +- Changed pineapple yarn recipe from assembler to wiremill & coiling machine, like the other strings (#1162) @Pyritie +- Lowered durability of wooden tongs @Pyritie +- Streamlined the Metallurgy Age quest chapter a bit @Pyritie +- Mushroom blocks now drop way less mushroom @Pyritie + +## [0.9.11] - 13.06.2025 +### New features - Added back the vanilla stonecutter @Pyritie - Added our own recipes for crafting GregTech facades - 3 cast iron plates for 8 facades, or 3 titanium plates for 32 facades (#1145) @BlueBoat29 - Added create conductor recipes (#1144) @JeanRdSz diff --git a/config/ftbquests/quests/chapters/ore_processing.snbt b/config/ftbquests/quests/chapters/ore_processing.snbt index 75f89f6bc..8beaa52b5 100644 --- a/config/ftbquests/quests/chapters/ore_processing.snbt +++ b/config/ftbquests/quests/chapters/ore_processing.snbt @@ -48,6 +48,16 @@ ] dependency_requirement: "one_completed" description: ["{quests.ore_proc.crushed_ores.desc}"] + icon: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:crushed_copper_ore" + } id: "28419A1010EEE93A" subtitle: "{quests.ore_proc.crushed_ores.subtitle}" tasks: [ @@ -223,6 +233,7 @@ description: ["{quests.ore_proc.mercury.desc}"] id: "68AC3E2C9093FCFE" optional: true + shape: "heart" subtitle: "{quests.ore_proc.mercury.subtitle}" tasks: [ { @@ -273,6 +284,7 @@ description: ["{quests.ore_proc.sodium_ores.desc}"] id: "0502E478E27D4B73" optional: true + shape: "heart" subtitle: "{quests.ore_proc.sodium_ores.subtitle}" tasks: [ { @@ -303,26 +315,29 @@ ] dependency_requirement: "one_completed" description: ["{quests.ore_proc.purified_ores.desc}"] + icon: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "create:crushed_raw_copper" + } id: "544EA7FF98FDCFB7" subtitle: "{quests.ore_proc.purified_ores.subtitle}" - tasks: [ - { - id: "4C6F60AC9C803D7B" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - "ftbfiltersystem:filter": "or(item_tag(forge:purified_ores))" - } + tasks: [{ + id: "4C6F60AC9C803D7B" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item_tag(forge:purified_ores))" } - optional_task: true - type: "item" } - { - id: "3C194AEB554DA4CA" - type: "checkmark" - } - ] + type: "item" + }] title: "{quests.ore_proc.purified_ores.title}" x: 0.5d y: -0.5d @@ -340,12 +355,6 @@ optional_task: true type: "item" } - { - id: "0373F4E380F2A0BC" - item: "gtceu:indium_concentrate_bucket" - optional_task: true - type: "item" - } { id: "246799A19B9A47B6" item: { @@ -368,8 +377,15 @@ type: "item" } { - id: "52FCA464BD827E37" - type: "checkmark" + id: "475C90F0EA16C2F9" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "only_one(item(gtceu:indium_concentrate_bucket)nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"gtceu:indium_concentrate\"}}))" + } + } + type: "item" } ] title: "{quests.ore_proc.indium.title}" @@ -627,25 +643,30 @@ ] dependency_requirement: "one_completed" description: ["{quests.ore_proc.dust_processed.desc}"] - id: "22C1D541452D4AD4" - subtitle: "{quests.ore_proc.dust_processed.subtitle}" - tasks: [ - { - id: "3EA3BABECE52085B" - item: { - Count: 1 - id: "ftbfiltersystem:smart_filter" - tag: { - "ftbfiltersystem:filter": "or(item_tag(forge:dusts))" - } + icon: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L } - type: "item" } - { - id: "1A1B2762EFD6C6B0" - type: "checkmark" + id: "gtceu:copper_dust" + } + id: "22C1D541452D4AD4" + size: 1.5d + subtitle: "{quests.ore_proc.dust_processed.subtitle}" + tasks: [{ + id: "3EA3BABECE52085B" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item_tag(forge:dusts))" + } } - ] + type: "item" + }] title: "{quests.ore_proc.dust_processed.title}" x: 0.5d y: 3.5d diff --git a/config/ftbquests/quests/chapters/questsmetallurgy.snbt b/config/ftbquests/quests/chapters/questsmetallurgy.snbt index 377b568d0..fa48fa874 100644 --- a/config/ftbquests/quests/chapters/questsmetallurgy.snbt +++ b/config/ftbquests/quests/chapters/questsmetallurgy.snbt @@ -31,10 +31,21 @@ y: -34.0d } { + icon: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "tfc:metal/lamp/blue_steel" + } id: "227B6C88FFE99435" linked_quest: "4EBABACAB444244D" + shape: "heart" x: 16.5d - y: -23.0d + y: -24.5d } { id: "19CF6D922179DFF9" @@ -58,7 +69,7 @@ }] title: "{quests.metal_age.this_is_a_bucket.title}" x: 13.5d - y: -24.5d + y: -26.0d } { dependencies: ["56CA2EB7812529C5"] @@ -82,7 +93,7 @@ ] title: "{quests.metal_age.redblu_buckets.title}" x: 16.5d - y: -24.5d + y: -26.0d } { dependencies: ["7E0239E9CC73F09F"] @@ -98,11 +109,11 @@ weak_nbt_match: true }] title: "{quests.metal_age.black_steel_anvil.title}" - x: 27.5d - y: -24.5d + x: 26.5d + y: -26.0d } { - dependencies: ["4310B619B57276ED"] + dependencies: ["5996A3A0D475B8A6"] description: ["{quests.metal_age.steel_anvil.desc}"] id: "04DE7C58F20B535A" shape: "octagon" @@ -115,11 +126,11 @@ weak_nbt_match: true }] title: "{quests.metal_age.steel_anvil.title}" - x: 27.5d + x: 26.5d y: -32.0d } { - dependencies: ["358571B6E692F198"] + dependencies: ["0A92F5C4BB6AF972"] description: ["{quests.metal_age.wrought_iron_anvil.desc}"] id: "174DA15847665CF8" shape: "octagon" @@ -263,29 +274,10 @@ y: -32.0d } { - dependencies: [ - "0A92F5C4BB6AF972" - "021D3DEEB15A3D17" - ] - dependency_requirement: "one_completed" - description: ["{quests.metal_age.weld_wrought_iron_ingots.desc}"] - id: "358571B6E692F198" - subtitle: "{quests.metal_age.weld_wrought_iron_ingots.subtitle}" - tasks: [{ - id: "05AD17F66DFE3C56" - item: "gtceu:wrought_iron_double_ingot" - type: "item" - weak_nbt_match: true - }] - title: "{quests.metal_age.weld_wrought_iron_ingots.title}" - x: 7.0d - y: -32.0d - } - { - dependencies: ["48A8E3210B2BAE1C"] description: ["{quests.metal_age.bellows.desc}"] hide_dependency_lines: true id: "021D3DEEB15A3D17" + shape: "rsquare" subtitle: "{quests.metal_age.bellows.subtitle}" tasks: [{ id: "588EB07E980386F9" @@ -297,31 +289,12 @@ y: -34.0d } { - dependencies: ["5996A3A0D475B8A6"] - dependency_requirement: "one_completed" - description: ["{quests.metal_age.weld_steel_ingots.desc}"] - id: "4310B619B57276ED" - subtitle: "{quests.metal_age.weld_steel_ingots.subtitle}" - tasks: [{ - id: "0EDB1D851E198274" - item: "gtceu:steel_double_ingot" - type: "item" - weak_nbt_match: true - }] - title: "{quests.metal_age.weld_steel_ingots.title}" - x: 25.5d - y: -32.0d - } - { - dependencies: [ - "061116CF508D54F6" - "68B7D07D57A103BE" - ] + dependencies: ["5A936E9BCF30AA3D"] dependency_requirement: "one_completed" description: ["{quests.metal_age.kaolin_clay.desc}"] id: "72F1C122FC26229C" shape: "octagon" - size: 3.0d + size: 2.0d subtitle: "{quests.metal_age.kaolin_clay.subtitle}" tasks: [{ id: "673D38EB62FFD65F" @@ -339,8 +312,8 @@ weak_nbt_match: true }] title: "{quests.metal_age.kaolin_clay.title}" - x: 13.5d - y: -36.0d + x: 14.0d + y: -33.0d } { dependencies: ["5A936E9BCF30AA3D"] @@ -349,25 +322,24 @@ icon: "tfc:ore/graphite/gabbro" id: "53E1383F12EC6765" optional: true + shape: "diamond" subtitle: "{quests.metal_age.overworld_graphite.subtitle}" tasks: [{ id: "25A552657AFA7BC2" type: "checkmark" }] title: "{quests.metal_age.overworld_graphite.title}" - x: 13.0d + x: 11.0d y: -30.5d } { - dependencies: [ - "53E1383F12EC6765" - "2DB82986FE176CD7" - ] + dependencies: ["5A936E9BCF30AA3D"] dependency_requirement: "one_completed" description: ["{quests.metal_age.graphite.desc}"] + icon: "tfc:powder/graphite" id: "31CE13462759950C" shape: "octagon" - size: 3.0d + size: 2.0d subtitle: "{quests.metal_age.graphite.subtitle}" tasks: [{ id: "6B0C9D862BFD27BC" @@ -382,14 +354,13 @@ type: "item" }] title: "{quests.metal_age.graphite.title}" - x: 13.5d - y: -28.5d + x: 14.0d + y: -31.0d } { dependencies: [ "72F1C122FC26229C" "31CE13462759950C" - "5A936E9BCF30AA3D" ] description: ["{quests.metal_age.fire_clay.desc}"] id: "2C76EE197C14B0DC" @@ -403,7 +374,7 @@ weak_nbt_match: true }] title: "{quests.metal_age.fire_clay.title}" - x: 17.5d + x: 17.0d y: -32.0d } { @@ -466,6 +437,7 @@ description: ["{quests.metal_age.beneath_kaolin.desc}"] id: "061116CF508D54F6" optional: true + shape: "diamond" subtitle: "{quests.metal_age.beneath_kaolin.subtitle}" tasks: [ { @@ -492,7 +464,7 @@ } ] title: "{quests.metal_age.beneath_kaolin.title}" - x: 14.0d + x: 12.0d y: -33.5d } { @@ -596,7 +568,7 @@ } ] title: "{quests.metal_age.fire_clay_products.title}" - x: 17.5d + x: 17.0d y: -34.0d } { @@ -666,12 +638,14 @@ }] title: "{quests.metal_age.red_blu.title}" x: 24.0d - y: -24.5d + y: -26.0d } { dependencies: ["56CA2EB7812529C5"] description: ["{quests.metal_age.red_steel_flask.desc}"] id: "30D49878F3CEB08A" + optional: true + shape: "heart" subtitle: "{quests.metal_age.red_steel_flask.subtitle}" tasks: [{ id: "7394672B4D19B0B2" @@ -680,7 +654,7 @@ }] title: "{quests.metal_age.red_steel_flask.title}" x: 16.5d - y: -26.0d + y: -27.5d } { dependencies: [ @@ -706,7 +680,7 @@ }] title: "{quests.metal_age.redblu_anvil.title}" x: 18.5d - y: -24.5d + y: -26.0d } { dependencies: ["3C173357029AB649"] @@ -750,13 +724,15 @@ type: "checkmark" }] title: "{quests.metal_age.fire_clay_ingredients.title}" - x: 13.5d + x: 11.5d y: -32.0d } { dependencies: ["5A936E9BCF30AA3D"] description: ["{quests.metal_age.beneath_graphite.desc}"] id: "2DB82986FE176CD7" + optional: true + shape: "diamond" subtitle: "{quests.metal_age.beneath_graphite.subtitle}" tasks: [ { @@ -776,7 +752,7 @@ } ] title: "{quests.metal_age.beneath_graphite.title}" - x: 14.0d + x: 12.0d y: -30.5d } { @@ -784,6 +760,8 @@ description: ["{quests.metal_age.overworld_kaolin.desc}"] icon: "tfc:plant/tree_fern" id: "68B7D07D57A103BE" + optional: true + shape: "diamond" subtitle: "{quests.metal_age.overworld_kaolin.subtitle}" tasks: [{ id: "14DF5B1544AB9BA9" @@ -791,7 +769,7 @@ type: "checkmark" }] title: "{quests.metal_age.overworld_kaolin.title}" - x: 13.0d + x: 11.0d y: -33.5d } { @@ -813,8 +791,8 @@ weak_nbt_match: true }] title: "{quests.metal_age.blast_furnace_fuel.title}" - x: 23.5d - y: -30.0d + x: 20.5d + y: -32.0d } { dependencies: ["04DE7C58F20B535A"] @@ -828,8 +806,8 @@ type: "checkmark" }] title: "{quests.metal_age.steel_goodies.title}" - x: 29.5d - y: -30.0d + x: 26.5d + y: -34.0d } { dependencies: ["52DAF93E2F3D688A"] @@ -845,8 +823,8 @@ type: "checkmark" }] title: "{quests.metal_age.black_steel_goodies.title}" - x: 25.5d - y: -22.5d + x: 26.5d + y: -23.5d } { dependencies: [ @@ -854,6 +832,16 @@ "04DE7C58F20B535A" ] description: ["{quests.metal_age.highcarb_black_steel.desc}"] + icon: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "tfc:metal/ingot/black_steel" + } id: "7E0239E9CC73F09F" subtitle: "{quests.metal_age.highcarb_black_steel.subtitle}" tasks: [ @@ -887,12 +875,22 @@ } ] title: "{quests.metal_age.highcarb_black_steel.title}" - x: 27.5d + x: 26.5d y: -30.0d } { dependencies: ["5996A3A0D475B8A6"] description: ["{quests.metal_age.weak_steel.desc}"] + icon: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "tfc:metal/ingot/weak_steel" + } id: "1CE0FF455668C145" subtitle: "{quests.metal_age.weak_steel.subtitle}" tasks: [ @@ -900,53 +898,60 @@ id: "543388DB123E7328" item: { Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(gtceu:nickel_ingot)item(gtceu:nickel_dust))" } - id: "gtceu:nickel_ingot" } + title: "{quests.metal_age.weak_steel.task1}" type: "item" + weak_nbt_match: true } { count: 2L id: "7F829BA244BC77D5" item: { - Count: 2 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(gtceu:steel_ingot)item(gtceu:steel_dust))" } - id: "gtceu:steel_ingot" } + title: "{quests.metal_age.weak_steel.task2}" type: "item" + weak_nbt_match: true } { id: "3271DD5653C52CAB" item: { Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(gtceu:black_bronze_ingot)item(gtceu:black_bronze_dust))" } - id: "gtceu:black_bronze_ingot" } + title: "{quests.metal_age.weak_steel.task3}" type: "item" + weak_nbt_match: true } ] title: "{quests.metal_age.weak_steel.title}" - x: 25.5d + x: 23.5d y: -30.0d } { dependencies: ["27FF92982A24BC4E"] description: ["{quests.metal_age.highcarb_red_steel.desc}"] + icon: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "tfc:metal/ingot/red_steel" + } id: "5088768AAA28FCBA" subtitle: "{quests.metal_age.highcarb_red_steel.subtitle}" tasks: [ @@ -981,11 +986,21 @@ ] title: "{quests.metal_age.highcarb_red_steel.title}" x: 20.5d - y: -25.5d + y: -27.0d } { dependencies: ["5792DDAA82895E67"] description: ["{quests.metal_age.weak_red_steel.desc}"] + icon: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "tfc:metal/ingot/weak_red_steel" + } id: "27FF92982A24BC4E" subtitle: "{quests.metal_age.weak_red_steel.subtitle}" tasks: [ @@ -993,68 +1008,70 @@ id: "2A22B3EA8DC577CE" item: { Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(create:brass_ingot)item(gtceu:brass_dust))" } - id: "create:brass_ingot" } + title: "{quests.metal_age.weak_red_steel.brass}" type: "item" } { count: 2L id: "2F0648CE3D1723DF" item: { - Count: 2 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(gtceu:steel_ingot)item(gtceu:steel_dust))" } - id: "gtceu:steel_ingot" } + title: "{quests.metal_age.weak_red_steel.steel}" type: "item" } { id: "47F346E1C0F41655" item: { Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(gtceu:rose_gold_ingot)item(gtceu:rose_gold_dust))" } - id: "gtceu:rose_gold_ingot" } + title: "{quests.metal_age.weak_red_steel.rose_gold}" type: "item" } { count: 4L id: "21434FAAA69D5BE0" item: { - Count: 4 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(tfc:metal/ingot/black_steel)item(gtceu:black_steel_dust))" } - id: "tfc:metal/ingot/black_steel" } + title: "{quests.metal_age.weak_red_steel.black_steel}" type: "item" } ] title: "{quests.metal_age.weak_red_steel.title}" x: 22.0d - y: -25.5d + y: -27.0d } { dependencies: ["5792DDAA82895E67"] description: ["{quests.metal_age.weak_blu_steel.desc}"] + icon: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "tfc:metal/ingot/weak_blue_steel" + } id: "64F8A358EC3FEF45" subtitle: "{quests.metal_age.weak_blu_steel.subtitle}" tasks: [ @@ -1062,68 +1079,70 @@ count: 2L id: "5331A323780B4B11" item: { - Count: 2 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(gtceu:steel_ingot)item(gtceu:steel_dust))" } - id: "gtceu:steel_ingot" } + title: "{quests.metal_age.weak_blue_steel.steel}" type: "item" } { count: 4L id: "2809FD951B82C54F" item: { - Count: 4 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(tfc:metal/ingot/black_steel)item(gtceu:black_steel_dust))" } - id: "tfc:metal/ingot/black_steel" } + title: "{quests.metal_age.weak_blue_steel.black_steel}" type: "item" } { id: "401EC1A9FBC759B8" item: { Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(gtceu:bismuth_bronze_ingot)item(gtceu:bismuth_bronze_dust))" } - id: "gtceu:bismuth_bronze_ingot" } + title: "{quests.metal_age.weak_blue_steel.bismuth_bronze}" type: "item" } { id: "7350ECE723ABE8F4" item: { Count: 1 - ForgeCaps: { - "tfc:item_heat": { - heat: 0.0f - ticks: 0L - } + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "or(item(gtceu:sterling_silver_ingot)item(gtceu:sterling_silver_dust))" } - id: "gtceu:sterling_silver_ingot" } + title: "{quests.metal_age.weak_blue_steel.sterling_silver}" type: "item" } ] title: "{quests.metal_age.weak_blu_steel.title}" x: 22.0d - y: -23.5d + y: -25.0d } { dependencies: ["64F8A358EC3FEF45"] description: ["{quests.metal_age.highcarb_blu_steel.desc}"] + icon: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "tfc:metal/ingot/blue_steel" + } id: "6D04BAC5B215F90F" subtitle: "{quests.metal_age.highcarb_blu_steel.subtitle}" tasks: [ @@ -1158,7 +1177,7 @@ ] title: "{quests.metal_age.highcarb_blu_steel.title}" x: 20.5d - y: -23.5d + y: -25.0d } { dependencies: ["3C173357029AB649"] diff --git a/config/ftbquests/quests/chapters/questsstoneage.snbt b/config/ftbquests/quests/chapters/questsstoneage.snbt index eee6df727..bc76b880a 100644 --- a/config/ftbquests/quests/chapters/questsstoneage.snbt +++ b/config/ftbquests/quests/chapters/questsstoneage.snbt @@ -684,6 +684,7 @@ tasks: [{ id: "5A6EF9EBF232601C" item: "gtceu:copper_double_ingot" + match_nbt: false type: "item" weak_nbt_match: true }] diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index a325d9661..2e0ca4253 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -1602,12 +1602,26 @@ ] dependency_requirement: "one_completed" description: ["{quests.tfg_tips.passive_preservation.desc}"] + disable_toast: true + icon: { + Count: 1 + ForgeCaps: { + Parent: { + heat: 0.0f + ticks: 0L + } + } + id: "tfc:ceramic/vessel" + tag: { } + } id: "13F7066858E923FF" subtitle: "{quests.tfg_tips.passive_preservation.subtitle}" tasks: [{ - id: "54AAB9886964A160" - title: "{quests.tasktype.checkmark}" - type: "checkmark" + dimension: "minecraft:overworld" + icon: "gtceu:overworld_marker" + id: "5BAF5F5343C3E42A" + title: "{quests.stone_age.temperature.task}" + type: "dimension" }] title: "{quests.tfg_tips.passive_preservation.title}" x: 6.5d @@ -2236,10 +2250,7 @@ y: 9.5d } { - dependencies: [ - "2D959136A5FC5F46" - "56CA2EB7812529C5" - ] + dependencies: ["2D959136A5FC5F46"] description: ["{quests.tfg_tips.lamps.desc}"] id: "037CDA933FBE2CBE" subtitle: "{quests.tfg_tips.lamps.subtitle}" @@ -2277,8 +2288,8 @@ } ] title: "{quests.tfg_tips.lamps.title}" - x: -5.0d - y: 11.0d + x: -5.5d + y: 11.5d } { dependencies: [ @@ -2286,6 +2297,16 @@ "56CA2EB7812529C5" ] description: ["{quests.tfg_tips.lava_lamp.desc}"] + icon: { + Count: 1 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "tfc:metal/lamp/blue_steel" + } id: "4EBABACAB444244D" optional: true shape: "heart" @@ -2312,8 +2333,8 @@ } ] title: "{quests.tfg_tips.lava_lamp.title}" - x: -5.0d - y: 12.5d + x: -5.5d + y: 13.0d } { dependencies: ["037CDA933FBE2CBE"] @@ -2333,8 +2354,8 @@ type: "item" }] title: "{quests.tfg_tips.creosote.title}" - x: -6.0d - y: 12.0d + x: -6.5d + y: 12.5d } { dependencies: ["037CDA933FBE2CBE"] @@ -2354,8 +2375,8 @@ type: "item" }] title: "{quests.tfg_tips.olive_oil.title}" - x: -4.0d - y: 12.0d + x: -4.5d + y: 12.5d } { dependencies: ["2D959136A5FC5F46"] @@ -3462,8 +3483,8 @@ type: "item" }] title: "{quests.tfg_tips.tallow.title}" - x: -6.5d - y: 11.0d + x: -7.0d + y: 11.5d } { dependencies: ["150B7C5CD152E1BA"] @@ -5376,6 +5397,26 @@ x: 7.5d y: -18.0d } + { + dependencies: ["037CDA933FBE2CBE"] + description: ["{quests.tfg_tips.glowstone_lamp.desc}"] + id: "61F58B402F1AE40B" + subtitle: "{quests.tfg_tips.glowstone_lamp.subtitle}" + tasks: [{ + id: "71D52011F8BE66F0" + item: { + Count: 1 + id: "ftbfiltersystem:smart_filter" + tag: { + "ftbfiltersystem:filter": "only_one(item(gtceu:glowstone_bucket)nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"gtceu:glowstone\"}}))" + } + } + type: "item" + }] + title: "{quests.tfg_tips.glowstone_lamp.title}" + x: -6.5d + y: 10.5d + } ] subtitle: ["{quests.tfg_tips.subtitle}"] title: "{quests.tfg_tips}" diff --git a/config/tfchotornot-common.toml b/config/tfchotornot-common.toml index ed10d7c44..e6e95be29 100644 --- a/config/tfchotornot-common.toml +++ b/config/tfchotornot-common.toml @@ -31,7 +31,7 @@ itemDamageTimeInterval = 60 #Durability for wooden tongs. #Range: > 0 - woodenTongsDurability = 250 + woodenTongsDurability = 100 #Durability for potholders. #Range: > 0 potholderDurability = 600 diff --git a/kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_front.png b/kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_front.png index 0f45a3e2d..066106e8f 100644 Binary files a/kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_front.png and b/kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_front.png differ diff --git a/kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_front_active.png b/kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_front_active.png new file mode 100644 index 000000000..84cacba20 Binary files /dev/null and b/kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_front_active.png differ diff --git a/kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_front_active.png.mcmeta b/kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_front_active.png.mcmeta new file mode 100644 index 000000000..92cc62352 --- /dev/null +++ b/kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_front_active.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_front_active_emissive.png b/kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_front_active_emissive.png new file mode 100644 index 000000000..d32a71c7a Binary files /dev/null and b/kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_front_active_emissive.png differ diff --git a/kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_front_active_emissive.png.mcmeta b/kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_front_active_emissive.png.mcmeta new file mode 100644 index 000000000..92cc62352 --- /dev/null +++ b/kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_front_active_emissive.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfc/textures/block/metal/block/zinc.png b/kubejs/assets/tfc/textures/block/metal/block/zinc.png new file mode 100644 index 000000000..2cb121e5a Binary files /dev/null and b/kubejs/assets/tfc/textures/block/metal/block/zinc.png differ diff --git a/kubejs/assets/tfc/textures/block/metal/smooth/zinc.png b/kubejs/assets/tfc/textures/block/metal/smooth/zinc.png new file mode 100644 index 000000000..422b0e6b3 Binary files /dev/null and b/kubejs/assets/tfc/textures/block/metal/smooth/zinc.png differ diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 6cc892d3e..9d072c9fe 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -176,10 +176,10 @@ "block.tfg.mv_food_oven": "§bAdvanced Electric Oven§r", "block.tfg.hv_food_oven": "§6Advanced Electric Oven II§r", "block.tfg.ev_food_oven": "§5Advanced Electric Oven III§r", - "block.tfg.lv_food_refrigerator": "Basic Refrigerator", - "block.tfg.mv_food_refrigerator": "§bAdvanced Refrigerator", - "block.tfg.hv_food_refrigerator": "§6Advanced Refrigerator II§r", - "block.tfg.ev_food_refrigerator": "§5Advanced Refrigerator III§r", + "block.tfg.lv_food_refrigerator": "Basic Refrigerator", + "block.tfg.mv_food_refrigerator": "§bAdvanced Refrigerator", + "block.tfg.hv_food_refrigerator": "§6Advanced Refrigerator II§r", + "block.tfg.ev_food_refrigerator": "§5Advanced Refrigerator III§r", "item.tfg.antipoison_pill": "Antipoison Pill", "item.tfg.haste_pill": "Haste Pill", "item.tfg.night_vision_pill": "Night Vision Pill", @@ -1229,9 +1229,6 @@ "quests.metal_age.mining.title": "Mining in the Metallurgy Age", "quests.metal_age.mining.subtitle": "ROCK AND STONE!", "quests.metal_age.mining.desc": "Extracting valuable resources from the ground is a major part of this modpack, and the Metallurgy Age is no exception! You will consume a &llot&r of metal to progress, and one way to mine a lot of it at once is with a Mining Hammer! This is a tool that can mine blocks in a 3x3x1 area at the cost of a slower mining speed. You can also hold sneak to break single blocks at a time.", - "quests.metal_age.weld_wrought_iron_ingots.title": "Welding Wrought Iron", - "quests.metal_age.weld_wrought_iron_ingots.subtitle": "CLANG CLANG CLANG", - "quests.metal_age.weld_wrought_iron_ingots.desc": "Obtain at least 14 Ingots of Wrought Iron, then weld them together in a Bronze Anvil. Careful you don't melt your Wrought Iron, otherwise it will turn back into Cast Iron and you'll have to run it through the Bloomery again!", "quests.metal_age.bellows.title": "Bellows", "quests.metal_age.bellows.subtitle": "Higher temperatures can be reached, at a small price.", "quests.metal_age.bellows.desc": "The Bellows is a device that can force extra air into a fire or forge in front of it, allowing the heat produced by the fuel inside to reach higher temperatures than usual, at the cost of fuel duration.\n\nThese higher temperatures are required to fire pottery with charcoal or melt certain metals.\n\nCoal and Coke can also reach higher temperatures without it.", @@ -1290,9 +1287,6 @@ "quests.metal_age.blast_furnace.title": "Blast Furnace", "quests.metal_age.blast_furnace.subtitle": "Then I started Blastin'", "quests.metal_age.blast_furnace.desc": "The Blast Furnace is a multiblock structure that allows you to create Pig Iron. Placing a combination of Iron, Flux and fuel (see the adjacent quest) inside the Blast Furnace produces Pig Iron, which can be worked into Steel.\n\nIn order for the Blast Furnace to reach its required high temperatures, it will need its own Bellows, used to force air through a Tuyere which you place inside the blast furnace.\n\nThe Field Guide contains an entry on how the Blast Furnace works and how to build one.", - "quests.metal_age.weld_steel_ingots.title": "Welding Steel", - "quests.metal_age.weld_steel_ingots.subtitle": "Again?", - "quests.metal_age.weld_steel_ingots.desc": "You know the drill by this point. Create 14 Steel Ingots, then weld them to get 7 Double Steel Ingots. We'll stop reminding you about this now.\n\nDid you know that the Helve Hammer can also process your pig iron into steel?", "quests.metal_age.steel_anvil.title": "T4 Anvil: Steel", "quests.metal_age.steel_anvil.subtitle": "A huge leap from wrought iron", "quests.metal_age.steel_anvil.desc": "With the Steel Anvil, you'll be able to work Steel Ingots into different forms.\n\nSteel tools and equipment have a significant boost over their bronze and wrought iron counterparts, so they're worth making if your existing ones are about to break. You'll be needing to create a lot of alloys soon, so some new mining equipment would be a wise investment.", @@ -1302,6 +1296,9 @@ "quests.metal_age.weak_steel.title": "Weak Steel Ingredients", "quests.metal_age.weak_steel.subtitle": "Hope you like math", "quests.metal_age.weak_steel.desc": "Weak Steel is one part of the necessary metals to create Black Steel. You can alloy it with 2 parts Steel, 1 part Nickel and 1 part Black Bronze.\n\nYou can check the liquid weak steel's recipe for more precise alloying percentage rates.", + "quests.metal_age.weak_steel.task1": "1 Part Nickel", + "quests.metal_age.weak_steel.task2": "2 Parts Steel", + "quests.metal_age.weak_steel.task3": "1 Part Black Bronze", "quests.metal_age.highcarb_black_steel.title": "Black Steel Ingredients", "quests.metal_age.highcarb_black_steel.subtitle": "Conservation of matter does not apply", "quests.metal_age.highcarb_black_steel.desc": "The final two anvils are made out of complex alloys that will require a lot of metal to be created. Weak Steel and Pig Iron can be welded to create High Carbon Black Steel, which can then be worked on an anvil into Black Steel.", @@ -1317,15 +1314,23 @@ "quests.metal_age.weak_red_steel.title": "Weak Red Steel Ingredients", "quests.metal_age.weak_red_steel.subtitle": "This is getting a little ridiculous", "quests.metal_age.weak_red_steel.desc": "Like before, Weak Red Steel is the first step of Red Steel's creation. Its alloy is made from 4 parts Black Steel, 2 parts Steel, 1 part Brass, and 1 part Rose Gold.\n\nYou can check the liquid Weak Red Steel's recipe for more precise alloying percentage rates.", + "quests.metal_age.weak_red_steel.steel": "2 Parts Steel", + "quests.metal_age.weak_red_steel.black_steel": "4 Parts Black Steel", + "quests.metal_age.weak_red_steel.brass": "1 Part Brass", + "quests.metal_age.weak_red_steel.rose_gold": "1 Part Rose Gold", "quests.metal_age.weak_blu_steel.title": "Weak Blue Steel Ingredients", "quests.metal_age.weak_blu_steel.subtitle": "This is getting out of hand.", - "quests.metal_age.weak_blu_steel.desc": "Like before, Weak Blue Steel is the first step of Blue Steel's creation. Its alloy is made from 4 parts Black Steel, 2 parts Steel, 1 part Bismuth Bronze, and 1 part Sterling Silver.\n\bYou can check the liquid Weak Blue Steel's recipe for more precise alloying percentage rates.", + "quests.metal_age.weak_blu_steel.desc": "Like before, Weak Blue Steel is the first step of Blue Steel's creation. Its alloy is made from 4 parts Black Steel, 2 parts Steel, 1 part Bismuth Bronze, and 1 part Sterling Silver.\n\nYou can check the liquid Weak Blue Steel's recipe for more precise alloying percentage rates.", + "quests.metal_age.weak_blue_steel.steel": "2 Parts Steel", + "quests.metal_age.weak_blue_steel.black_steel": "4 Parts Black Steel", + "quests.metal_age.weak_blue_steel.sterling_silver": "1 Part Sterling Silver", + "quests.metal_age.weak_blue_steel.bismuth_bronze": "1 Part Bismuth Bronze", "quests.metal_age.highcarb_red_steel.title": "Red Steel Ingredients", "quests.metal_age.highcarb_red_steel.subtitle": "Could deleting matter like this power a nuclear bomb?", "quests.metal_age.highcarb_red_steel.desc": "Red Steel first starts as High Carbon Red Steel, which is made by welding Weak Red Steel and Black Steel. It needs to be worked on the Anvil to turn it into Red Steel", "quests.metal_age.highcarb_blu_steel.title": "Blue Steel Ingredients", "quests.metal_age.highcarb_blu_steel.subtitle": "Lavoisier is rolling in his grave", - "quests.metal_age.highcarb_blu_steel.desc": "Blue Steel first starts as High Carbon Blue Steel, whcih is made by welding Weak Blue Steel and Black Steel. It needs to be worked on the Anvil to turn it into Blue Steel", + "quests.metal_age.highcarb_blu_steel.desc": "Blue Steel first starts as High Carbon Blue Steel, which is made by welding Weak Blue Steel and Black Steel. It needs to be worked on the Anvil to turn it into Blue Steel", "quests.metal_age.redblu_anvil.title": "T6 Anvil: Red or Blue Steel", "quests.metal_age.redblu_anvil.subtitle": "It's over", "quests.metal_age.redblu_anvil.desc": "The final tier of Anvil! With the Tier 6 Anvil you'll be able to work both Red and Blue Steel Ingots into different items.\n\nThis marks the end of TerraFirmaCraft's progression. Now it's time to finish the Industrial Age and create your very first Low Voltage circuitry.", @@ -1552,7 +1557,7 @@ "quests.steam_age.centrifuge.desc": "Ore processing will always be an important part of this modpack, and this machine is another (optional) part of that. By following a different route of ore processing steps (check the Ore Processing Diagram tab in JEI), you can use this centrifuge to get some bonus byproducts out of your ores! The next upgrade to your ores won't be until the LV Thermal Centrifuge, so whether or not this is a worthwhile investment is up to you.", "quests.steam_age.steam_engine.title": "Steam Engine", "quests.steam_age.steam_engine.subtitle": "Time for some real steam power", - "quests.steam_age.steam_engine.desc": "Water wheels and windmills not cutting it any more? It wouldn't be a steam age without a proper steam engine! Each steam engine can output a whole 512 SU, giving you much more power to play with.\n\nBlaze Burners can be crafted without leaving your house, and you can use a Mechanical Arm to automatically feed them solid fuel, or liquid fuel in a bucket. Coal Gems and Coke can also be used to superheat them.", + "quests.steam_age.steam_engine.desc": "Water wheels and windmills not cutting it any more? It wouldn't be a steam age without a proper steam engine! Each steam engine can output a whole 256 SU, giving you much more power to play with.\n\nBlaze Burners can be crafted without leaving your house, and you can use a Mechanical Arm to automatically feed them solid fuel, or liquid fuel in a bucket (such as creosote). Coal Gems, Anthracite, and Coke can also be used to superheat them.", "quests.steam_age.deployers.title": "Deployers", "quests.steam_age.deployers.subtitle": "Primitive Assembly Line", "quests.steam_age.deployers.desc": "While you could use a single deployer for the rest your time in this chapter, we &3really&r don't recommend it. Setting up a line of deployers along a belt will save heaps of time and sanity, and it's not like you'll be wasting materials either, because you can always reuse them to upgrade your tree farm later.\n\nThese will also make electron tubes significantly cheaper!", diff --git a/kubejs/data/minecraft/loot_tables/blocks/brown_mushroom_block.json b/kubejs/data/minecraft/loot_tables/blocks/brown_mushroom_block.json index 08eeb81be..9cdc4f0c2 100644 --- a/kubejs/data/minecraft/loot_tables/blocks/brown_mushroom_block.json +++ b/kubejs/data/minecraft/loot_tables/blocks/brown_mushroom_block.json @@ -7,12 +7,16 @@ "entries": [ { "type": "minecraft:item", - "name": "minecraft:brown_mushroom_block" + "name": "minecraft:brown_mushroom" } ], "conditions": [ { "condition": "minecraft:survives_explosion" + }, + { + "condition": "minecraft:random_chance", + "chance": 0.25 } ] } diff --git a/kubejs/data/minecraft/loot_tables/blocks/red_mushroom_block.json b/kubejs/data/minecraft/loot_tables/blocks/red_mushroom_block.json index 9b2379355..b60ac514a 100644 --- a/kubejs/data/minecraft/loot_tables/blocks/red_mushroom_block.json +++ b/kubejs/data/minecraft/loot_tables/blocks/red_mushroom_block.json @@ -7,12 +7,16 @@ "entries": [ { "type": "minecraft:item", - "name": "minecraft:red_mushroom_block" + "name": "minecraft:red_mushroom" } ], "conditions": [ { "condition": "minecraft:survives_explosion" + }, + { + "condition": "minecraft:random_chance", + "chance": 0.25 } ] } diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 684b6ff15..995c04cf4 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -42,6 +42,7 @@ const registerCreateRecipes = (event) => { }) event.remove({ type: 'minecraft:stonecutting', input: 'create:andesite_alloy' }) + event.remove({ type: 'minecraft:stonecutting', input: 'create:rose_quartz' }) // Train Station event.shapeless('2x create:track_station', [ diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index 195b9745d..a9adeb1a3 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -95,16 +95,8 @@ const registerFirmaLifeRecipes = (event) => { .duration(50) .EUt(2) - // Pineapple Fiber - event.recipes.gtceu.assembler(`tfg:firmalife/pineapple_fiber`) - .itemInputs('firmalife:food/pineapple') - .circuit(1) - .itemOutputs('firmalife:pineapple_fiber') - .duration(50) - .EUt(7) - // Pineapple Yarn - event.recipes.gtceu.assembler(`tfg:firmalife/pineapple_yarn`) + event.recipes.gtceu.wiremill(`tfg:firmalife/pineapple_yarn`) .itemInputs('firmalife:pineapple_fiber') .circuit(1) .itemOutputs('8x firmalife:pineapple_yarn') diff --git a/kubejs/server_scripts/greate/recipes.removes.js b/kubejs/server_scripts/greate/recipes.removes.js index 8771d171b..22b279f2b 100644 --- a/kubejs/server_scripts/greate/recipes.removes.js +++ b/kubejs/server_scripts/greate/recipes.removes.js @@ -27,6 +27,7 @@ function removeGreateRecipes(event) { event.remove({ id: 'greate:shaped/titanium_mechanical_saw' }) event.remove({ id: 'greate:splashing/dough' }) + event.remove({ id: 'gtceu:electrolyzer/decomposition_electrolyzing_chromatic_compound' }) event.remove({ mod: 'greate', type: 'create:deploying' }); event.remove({ mod: 'greate', type: 'create:sequenced_assembly' }); diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index f4ab5a5d1..52a6197e4 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -139,7 +139,7 @@ function registerGTCEUMetalRecipes(event) { let matAmount = TagPrefix.block.getMaterialAmount(material) / GTValues.M; - if (!plateStack.isEmpty()) { + if (!plateStack.isEmpty() && !ingotStack.hasTag('c:hidden_from_recipe_viewers')) { event.custom({ type: "createaddition:rolling", @@ -149,7 +149,6 @@ function registerGTCEUMetalRecipes(event) { }).id(`tfg:rolling/${material.getName()}_plate`) if (!blockStack.isEmpty() && GTMaterials.Stone != material) { - // 9х Слиток -> Блок event.recipes.createCompacting(blockStack, ingotStack.withCount(matAmount)) .heated() @@ -158,7 +157,6 @@ function registerGTCEUMetalRecipes(event) { } else { if (!blockStack.isEmpty()) { - // Блок из гемов -> 9 Пластин event.recipes.createCutting(plateStack.withCount(matAmount).withChance(0.65), blockStack) .id(`tfg:cutting/${material.getName()}_plate`) @@ -192,7 +190,7 @@ function registerGTCEUMetalRecipes(event) { const foilItem = ChemicalHelper.get(TagPrefix.foil, material, 4) const plateItem = ChemicalHelper.get(TagPrefix.plate, material, 1) - if (plateItem != null && foilItem != null) { + if (plateItem != null && foilItem != null && !plateItem.hasTag('c:hidden_from_recipe_viewers')) { event.custom({ type: "createaddition:rolling", input: plateItem, diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 55a34243c..8a092f74c 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -997,6 +997,18 @@ const registerMinecraftRecipes = (event) => { event.shapeless('4x minecraft:brown_mushroom', ['minecraft:brown_mushroom_block', '#forge:tools/knives']) .id('tfg:shapeless/cut_brown_mushroom_block') + event.recipes.gtceu.compressor('tfg:red_mushroom') + .itemInputs('4x minecraft:red_mushroom') + .itemOutputs('minecraft:red_mushroom_block') + .duration(20) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.compressor('tfg:brown_mushroom') + .itemInputs('4x minecraft:brown_mushroom') + .itemOutputs('minecraft:brown_mushroom_block') + .duration(20) + .EUt(GTValues.VA[GTValues.ULV]) + event.recipes.gtceu.chemical_bath('tfg:red_mushroom_to_shroomlight') .itemInputs('minecraft:red_mushroom_block') .inputFluids(Fluid.of('gtceu:glowstone', 144)) @@ -1028,4 +1040,5 @@ const registerMinecraftRecipes = (event) => { }).id('tfg:shaped/stonecutter'); event.stonecutting('minecraft:smooth_quartz', 'minecraft:quartz_block') + event.stonecutting('create:cut_deepslate', 'minecraft:polished_deepslate') } diff --git a/kubejs/server_scripts/minecraft/tags.js b/kubejs/server_scripts/minecraft/tags.js index 6363b026b..fd12509f2 100644 --- a/kubejs/server_scripts/minecraft/tags.js +++ b/kubejs/server_scripts/minecraft/tags.js @@ -56,6 +56,7 @@ const registerMinecraftItemTags = (event) => { event.remove('forge:gems', 'minecraft:charcoal') event.remove('forge:gems', 'minecraft:coal') + event.remove('forge:gems', 'minecraft:flint') event.add('tfc:compost_greens_high', 'minecraft:red_mushroom_block') event.add('tfc:compost_greens_high', 'minecraft:brown_mushroom_block') diff --git a/kubejs/server_scripts/tfc/data.js b/kubejs/server_scripts/tfc/data.js index e49817b46..f0ba390a5 100644 --- a/kubejs/server_scripts/tfc/data.js +++ b/kubejs/server_scripts/tfc/data.js @@ -69,6 +69,7 @@ const registerTFCHeats = (event) => { makeItemHeatByTagPrefix(TagPrefix.rodLong, material, tfcProperty, 1.429) makeItemHeatByTagPrefix(TagPrefix.ingot, material, tfcProperty, 1.429) + makeItemHeatByTagPrefix(TFGTagPrefix.ingotDouble, material, tfcProperty, 2.875) makeItemHeatByTagPrefix(TagPrefix.rawOre, material, tfcProperty, 1.429) makeItemHeatByTagPrefix(TFGTagPrefix.richRawOre, material, tfcProperty, 1.429) diff --git a/kubejs/server_scripts/tfc/recipes.materials.js b/kubejs/server_scripts/tfc/recipes.materials.js index a105e1203..80f4d9112 100644 --- a/kubejs/server_scripts/tfc/recipes.materials.js +++ b/kubejs/server_scripts/tfc/recipes.materials.js @@ -1114,6 +1114,15 @@ function registerTFCMaterialsRecipes(event) { let tongPartStack = Item.of(`tfchotornot:tong_part/${material.getName()}`) if (!tongsStack.isEmpty() && !tongPartStack.isEmpty()) { + event.shaped(tongsStack, [ + 'AA', + 'BC' + ], { + A: tongPartStack, + B: '#forge:bolts', + C: '#forge:tools/hammers' + }).id(`tfchotornot:crafting/tongs/${material.getName()}`) + // Ручка щипцов event.recipes.tfc.heating(tongPartStack, tfcProperty.getMeltTemp()) .resultFluid(Fluid.of(outputMaterial.getFluid(), 144)) diff --git a/kubejs/server_scripts/tfclunchbox/recipes.js b/kubejs/server_scripts/tfclunchbox/recipes.js index 0654a12b2..badc96045 100644 --- a/kubejs/server_scripts/tfclunchbox/recipes.js +++ b/kubejs/server_scripts/tfclunchbox/recipes.js @@ -47,13 +47,13 @@ function registerTFCLunchBoxRecipes(event) { event.recipes.gtceu.canner('tfclunchbox:fill_capsule_with_ice') .itemInputs('tfclunchbox:universal_capsule') .inputFluids(Fluid.of('gtceu:ice', 45 * 144)) - .itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:500}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled'))) + .itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:1000}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled'))) .duration(100) .EUt(GTValues.VA[GTValues.LV]) event.recipes.gtceu.canner('tfclunchbox:fill_capsule_with_ice_solid') .itemInputs('tfclunchbox:universal_capsule', '5x minecraft:packed_ice') - .itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:500}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled'))) + .itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:1000}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled'))) .duration(100) .EUt(GTValues.VA[GTValues.LV]) } diff --git a/kubejs/server_scripts/tfg/recipes.rocks.js b/kubejs/server_scripts/tfg/recipes.rocks.js index d8fce61c8..90a2eb47f 100644 --- a/kubejs/server_scripts/tfg/recipes.rocks.js +++ b/kubejs/server_scripts/tfg/recipes.rocks.js @@ -287,4 +287,4 @@ function registerTFGRockRecipes(event) { .EUt(GTValues.VA[GTValues.LV]) }) //#endregion -} \ No newline at end of file +} diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index 14ef74306..371ee10f7 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -293,6 +293,10 @@ function registerVintageImprovementsRecipes(event) { forEachMaterial(material => { + const ingotItem = ChemicalHelper.get(TagPrefix.ingot, material, 1); + if (ingotItem == null || ingotItem.hasTag('c:hidden_from_recipe_viewers')) + return; + // #region Coiling if (material.hasFlag(MaterialFlags.GENERATE_ROD) && material.hasFlag(MaterialFlags.GENERATE_SPRING_SMALL)) { @@ -627,6 +631,13 @@ function registerVintageImprovementsRecipes(event) { processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER }).id(`tfg:vi/coiling/phantom_thread`) + event.custom({ + type: 'vintageimprovements:coiling', + ingredients: [{ item: 'firmalife:pineapple_fiber' }], + results: [{ item: 'firmalife:pineapple_yarn', count: 8 }], + processingTime: 100 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER + }).id(`tfg:vi/coiling/pineapple_yarn`) + event.custom({ type: 'vintageimprovements:coiling', ingredients: [ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Polycaprolactam, 1)], diff --git a/kubejs/startup_scripts/ae2/tag_prefixes.js b/kubejs/startup_scripts/ae2/tag_prefixes.js index 2c03f700b..31a6e4325 100644 --- a/kubejs/startup_scripts/ae2/tag_prefixes.js +++ b/kubejs/startup_scripts/ae2/tag_prefixes.js @@ -1,15 +1,15 @@ // priority: 0 const registerAE2TagPrefixes = (event) => { - const $AE_BLOCKS = Java.loadClass('appeng.core.definitions.AEBlocks'); const $AE_ITEMS = Java.loadClass('appeng.core.definitions.AEItems'); const Fluix = GTCEuAPI.materialManager.getMaterial('tfg:fluix') - TagPrefix.block.setIgnored(Fluix, $AE_BLOCKS.FLUIX_BLOCK); + // Blocks have to be handled in java because ae2 is weird + TagPrefix.dust.setIgnored(Fluix, $AE_ITEMS.FLUIX_DUST); TagPrefix.gem.setIgnored(Fluix, $AE_ITEMS.FLUIX_CRYSTAL); -; + TagPrefix.dust.setIgnored(GTMaterials.CertusQuartz, $AE_ITEMS.CERTUS_QUARTZ_DUST); TagPrefix.gem.setIgnored(GTMaterials.CertusQuartz, $AE_ITEMS.CERTUS_QUARTZ_CRYSTAL); diff --git a/kubejs/startup_scripts/create/constants.js b/kubejs/startup_scripts/create/constants.js index c78f93e53..b534cfb44 100644 --- a/kubejs/startup_scripts/create/constants.js +++ b/kubejs/startup_scripts/create/constants.js @@ -188,9 +188,6 @@ global.CREATE_DISABLED_ITEMS = [ // Blocks 'create:andesite_alloy_block', 'create:experience_block', - 'create:rose_quartz_block', - 'create:rose_quartz_tiles', - 'create:small_rose_quartz_tiles', // Other 'create:honey_bucket', @@ -205,7 +202,6 @@ global.CREATE_DISABLED_ITEMS = [ 'create:blaze_cake_base', 'create:sturdy_sheet', 'create:polished_rose_quartz', - 'create:rose_quartz', 'create:cinder_flour', 'create:dough', 'create:bar_of_chocolate', diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index 089d4e92f..08433c05d 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -280,7 +280,7 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.IronMagnetic.setMaterialARGB(0x503d32) GTMaterials.IronMagnetic.setMaterialSecondaryARGB(0x131212) GTMaterials.Zinc.setMaterialARGB(0xd6ffdc) - GTMaterials.Zinc.setMaterialSecondaryARGB(0x213b3f) + GTMaterials.Zinc.setMaterialSecondaryARGB(0xA3BE9E) GTMaterials.Graphite.setMaterialARGB(0x889BA8) GTMaterials.Graphite.setMaterialSecondaryARGB(0x30383E) GTMaterials.Amethyst.setMaterialARGB(0xCC9EF0) diff --git a/pakku-lock.json b/pakku-lock.json index 981c19957..3ba80dea1 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -2616,7 +2616,7 @@ { "pakku_id": "SG15bUHPcW2KqNGd", "type": "MOD", - "side": "CLIENT", + "side": "BOTH", "slug": { "curseforge": "detected-setblock-be-gone" }, @@ -6714,6 +6714,7 @@ "id": { "curseforge": "585406" }, + "export": false, "files": [ { "type": "curseforge", @@ -7953,7 +7954,7 @@ "files": [ { "type": "curseforge", - "file_name": "tfclunchbox-1.20.1-1.0.0.10.jar", + "file_name": "tfclunchbox-1.20.1-1.0.0.14.jar", "mc_versions": [ "1.20.1" ], @@ -7962,18 +7963,16 @@ "forge" ], "release_type": "beta", - "url": "https://edge.forgecdn.net/files/6633/524/tfclunchbox-1.20.1-1.0.0.10.jar", - "id": "6633524", + "url": "https://edge.forgecdn.net/files/6646/846/tfclunchbox-1.20.1-1.0.0.14.jar", + "id": "6646846", "parent_id": "1283445", "hashes": { - "sha1": "0b3dd4ed090848d136fc15586f5fb8212f1f19b0", - "md5": "c8835a37c829f86448b87601ac58cf9b" + "sha1": "de4051c4345290b9d99f2d26090ad466f112b3ec", + "md5": "ada6f65d0fc9785a34b9deb76c53e882" }, - "required_dependencies": [ - "302973" - ], - "size": 93079, - "date_published": "2025-06-09T15:46:48.850Z" + "required_dependencies": [], + "size": 95828, + "date_published": "2025-06-13T12:54:20.803Z" } ] }, @@ -8382,7 +8381,7 @@ "files": [ { "type": "curseforge", - "file_name": "TerraFirmaGreg-Core-Modern-0.6.7.jar", + "file_name": "TerraFirmaGreg-Core-Modern-0.6.8.jar", "mc_versions": [ "1.20.1" ], @@ -8391,19 +8390,19 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6613/427/TerraFirmaGreg-Core-Modern-0.6.7.jar", - "id": "6613427", + "url": "https://edge.forgecdn.net/files/6641/343/TerraFirmaGreg-Core-Modern-0.6.8.jar", + "id": "6641343", "parent_id": "513402", "hashes": { - "sha1": "76662e65565207a7682cafd39ef068e4c0a98516", - "md5": "7c41c1ca1a8a9edf0e9fb72bdf5ebf44" + "sha1": "989c76bb022dd8fdc0363c6ff9bdaa1665ff6571", + "md5": "ada07963205a8b7089d6b9664c833286" }, "required_dependencies": [ - "302973", - "890405" + "890405", + "302973" ], - "size": 297697, - "date_published": "2025-06-04T11:47:57.083Z" + "size": 297767, + "date_published": "2025-06-11T20:08:19.890Z" } ] }, diff --git a/pakku.json b/pakku.json index d6425913f..f3b69e9b5 100644 --- a/pakku.json +++ b/pakku.json @@ -1,6 +1,6 @@ { "name": "TerraFirmaGreg-Modern", - "version": "0.9.10", + "version": "0.9.11", "description": "An innovative modpack that contains GregTech and TerraFirmaCraft on 1.20.x.", "author": "Exception, Xikaro", "overrides": [