diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml index 2bfbada55..43e6835ea 100644 --- a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml +++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml @@ -1,7 +1,9 @@ name: "Bug report" description: "Report a bug where something is not working as expected, which does not crash the game." title: "[๐Ÿ›]: " -labels: [ "1. Type: Bug", "2. Status: Unverified" ] +labels: [ "Status: Backlog" ] +projects: ["TerraFirmaGreg-Team/10"] +type: "Bug" body: - type: checkboxes diff --git a/.github/ISSUE_TEMPLATE/CRASH_REPORT.yml b/.github/ISSUE_TEMPLATE/CRASH_REPORT.yml index f542fd5fd..ee0f20405 100644 --- a/.github/ISSUE_TEMPLATE/CRASH_REPORT.yml +++ b/.github/ISSUE_TEMPLATE/CRASH_REPORT.yml @@ -1,7 +1,9 @@ name: "Crash Report" description: "Report a bug that crashes the game or prevents startup." title: "[๐Ÿ’ฅ]: " -labels: [ "1. Type: Crash", "2. Status: Unverified" ] +labels: [ "Status: Backlog" ] +projects: ["TerraFirmaGreg-Team/10"] +type: "Crash" body: - type: checkboxes diff --git a/.github/ISSUE_TEMPLATE/ENHANCEMENT.yml b/.github/ISSUE_TEMPLATE/ENHANCEMENT.yml index f17ed37a5..a1ff6bc8a 100644 --- a/.github/ISSUE_TEMPLATE/ENHANCEMENT.yml +++ b/.github/ISSUE_TEMPLATE/ENHANCEMENT.yml @@ -1,7 +1,9 @@ name: "Enhancement" description: "Provide supporting details for a feature in development" title: "[๐Ÿชก]: " -labels: [ "1. Type: Enhancement" ] +labels: [ "Status: Backlog" ] +projects: ["TerraFirmaGreg-Team/10"] +type: "Enhancement" body: - type: checkboxes diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml index 7a35bf3c2..a81d4cbec 100644 --- a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml +++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml @@ -1,7 +1,9 @@ name: "Feature request" description: "Request a new feature or a change to an existing one." title: "[๐Ÿชถ]: " -labels: [ "1. Type: Feature" ] +labels: [ "Status: Backlog" ] +projects: ["TerraFirmaGreg-Team/10"] +type: "Feature" body: - type: checkboxes diff --git a/.github/ISSUE_TEMPLATE/QUESTION.yml b/.github/ISSUE_TEMPLATE/QUESTION.yml index a7a56aee6..80db9b202 100644 --- a/.github/ISSUE_TEMPLATE/QUESTION.yml +++ b/.github/ISSUE_TEMPLATE/QUESTION.yml @@ -1,7 +1,8 @@ name: "Ask a Question" description: "Ask a question regarding this project." title: "[โ“]: " -labels: [ "1. Type: Question" ] +labels: [ "Status: Backlog" ] +type: "Question" body: - type: checkboxes diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ff9c78233..223ed0f22 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -11,7 +11,7 @@ updates: schedule: interval: "weekly" labels: - - "1. Type: Dependencies" + - "Type: Dependencies" groups: dependencies: applies-to: version-updates diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ad306d0ce..5a8c83564 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -247,17 +247,17 @@ jobs: path: ./build/curseforge/${{ needs.info.outputs.project_full_name }}-curseforge.zip if-no-files-found: error - - name: ๐Ÿ“ Rename artifact modrinth - run: | - cd ./build/modrinth/ - mv *.mrpack $(basename -s .mrpack *.mrpack)-modrinth.mrpack + # - name: ๐Ÿ“ Rename artifact modrinth + # run: | + # cd ./build/modrinth/ + # mv *.mrpack $(basename -s .mrpack *.mrpack)-modrinth.mrpack - - name: ๐Ÿš€ Upload artifact modrinth - uses: actions/upload-artifact@v4.6.2 - with: - name: ${{ needs.info.outputs.project_full_name }}-modrinth - path: ./build/modrinth/${{ needs.info.outputs.project_full_name }}-modrinth.mrpack - if-no-files-found: warn + # - name: ๐Ÿš€ Upload artifact modrinth + # uses: actions/upload-artifact@v4.6.2 + # with: + # name: ${{ needs.info.outputs.project_full_name }}-modrinth + # path: ./build/modrinth/${{ needs.info.outputs.project_full_name }}-modrinth.mrpack + # if-no-files-found: warn build-server: name: ๐Ÿ“ฆ Build Server @@ -376,9 +376,9 @@ jobs: if [ ! -f ${{ needs.info.outputs.project_full_name }}-curseforge.zip ]; then echo '::error::No value found for artifact `curseforge.zip`.' && exit 1 fi - if [ ! -f ${{ needs.info.outputs.project_full_name }}-modrinth.mrpack ]; then - echo '::error::No value found for artifact `modrinth.mrpack`.' && exit 1 - fi + # if [ ! -f ${{ needs.info.outputs.project_full_name }}-modrinth.mrpack ]; then + # echo '::error::No value found for artifact `modrinth.mrpack`.' && exit 1 + # fi if [ ! -f ${{ needs.info.outputs.project_full_name }}-serverpack.zip ]; then echo '::error::No value found for artifact `serverpack.zip`.' && exit 1 fi @@ -387,10 +387,10 @@ jobs: fi echo "โœ”๏ธ All artifacts found" - - name: ๐Ÿšซ ะกlose fixed in dev + - name: ๐Ÿšซ ะกlose label "Done" uses: Xikaro/close-issues-based-on-label@master env: - LABEL: "2. Status: In Dev" + LABEL: "Status: Done" COMMENT: In ${{ needs.info.outputs.project_version }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 904dcac3b..2bfbe9dc4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,25 +1,40 @@ # Changelog + ## [Unreleased] ### Changes -- Rebalanced the Large Boilers so now they consume WAY less fuel, so lava is no longer basically mandatory - see [here](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/pull/977) for the full math (Oosyrag) -- Greenhouse ports and sprinklers now work directly with gregtech pipes (Thomasx0) -- Added recipes for stainless steel greenhouse parts (Pyritie) -- More field guide updates (Oosyrag) -- Added assembler recipes for more Create and Greate items (Pyritie) -- Blaze burners, alternators, steam engines, and steam multiblock inputs/outputs are now much cheaper (Pyritie) -- Firmaciv sails can now use any fabric instead of just wool (Pyritie) -- Fixed some recycling recipes to prevent dupes (Pyritie) -- Added a circuit to the assembler hopper recipe (Pyritie) -- Fixed chiseling non-tfc blocks so it returns two slabs instead of one (Pyritie) -- Fixed being able to use tree taps on placed logs (Pyritie) -- Fixed tooltips on the uncolored small vessel and AFC wooden supports (Pyritie) -- Fixed assembler clay recipes so they output the correct amount (Pyritie) -- Quest fixes/tweaks (Pyritie) -- Added aluminium, stainless steel, and titanium millstones (Pyritie) -- Fixed fishing nets behavior. (Redeix) -- Added item to summon armor stands with arms. (Redeix) -- Added recipes for extracting/ forming magma blocks. (Redeix) -- Nerfed steel support recipe output. (Redeix) + +## [0.9.7] - 17.05.2025 +### Changes +- Fixed Crash Sprinkler. +- Undated the carryon config file to include the arborafirmacraft chests in the whitelist. @NobleWasTaken + +## [0.9.6] - 16.05.2025 +### Changes +- Changed wooden tongs recipe from shapeless to shaped. @Oosyrag +- Added crafting recipe for tin jar lids. @Oosyrag +- Rebalanced the Large Boilers so now they consume WAY less fuel, so lava is no longer basically mandatory - see #977 for the full math. @Oosyrag +- Greenhouse ports and sprinklers now work directly with gregtech pipes. @Thomasx0 +- Added recipes for stainless steel greenhouse parts. @Pyritie +- More field guide updates. @Oosyrag +- Added assembler recipes for more Create and Greate items. @Pyritie +- Blaze burners, alternators, steam engines, and steam multiblock inputs/outputs are now much cheaper. @Pyritie +- Firmaciv sails can now use any fabric instead of just wool. @Pyritie +- Fixed some recycling recipes to prevent dupes. @Pyritie +- Added a circuit to the assembler hopper recipe. @Pyritie +- Fixed chiseling non-tfc blocks so it returns two slabs instead of one. @Pyritie +- Fixed being able to use tree taps on placed logs. @Pyritie +- Fixed tooltips on the uncolored small vessel and AFC wooden supports. @Pyritie +- Fixed assembler clay recipes so they output the correct amount. @Pyritie +- Quest fixes/tweaks. @Pyritie +- Added aluminium, stainless steel, and titanium millstones. @Pyritie +- Fixed fishing nets behavior. @Redeix +- Added item to summon armor stands with arms. @Redeix +- Added recipes for extracting/ forming magma blocks. @Redeix +- Nerfed steel support recipe output. @Redeix +- Fixed assembler recipe conflict with regular vanilla bricks and Create Deco's colored bricks. @TomPlop +- Fixed not being able to use a charcoal forge with a basin. @Pyritie +- Removed programmed circuit from the salt water electrolysis recipe. @SverhRazum-Nah +- Added wrought iron alternatives for early game cast iron recipes, like wooden crates. @ZackH01 ## [0.9.5] - 08.05.2025 ### Changes diff --git a/config/carryon-common.toml b/config/carryon-common.toml index d34082042..32adb1159 100644 --- a/config/carryon-common.toml +++ b/config/carryon-common.toml @@ -59,7 +59,7 @@ #Entities that CAN be picked up (useWhitelistEntities must be true) allowedEntities = ["tfc:turkey", "tfc:dog", "tfc:isopod", "tfc:lobster", "tfc:frog", "tfc:penguin", "tfc:turtle", "tfc:horseshoe_crab", "tfc:crayfish", "tfc:grouse", "tfc:pheasant", "tfc:peafowl", "tfc:rat", "tfc:cat", "tfc:chicken", "tfc:duck", "tfc:quail", "tfc:rabbit"] #Blocks that CAN be picked up (useWhitelistBlocks must be true) - allowedBlocks = ["framedblocks:framed_chest", "tfc:wood/chest/*", "tfc:wood/trapped_chest/*", "#forge:chests/wooden"] + allowedBlocks = ["framedblocks:framed_chest", "tfc:wood/chest/*", "tfc:wood/trapped_chest/*", "afc:wood/chest/*", "afc:wood/trapped_chest/*", "#forge:chests/wooden"] #Entities that CAN have other entities stacked on top of them (useWhitelistStacking must be true) allowedStacking = [] diff --git a/config/forgivingworld.json b/config/forgivingworld.json index 26056c231..4156561c1 100644 --- a/config/forgivingworld.json +++ b/config/forgivingworld.json @@ -31,7 +31,7 @@ "teleporttype": "AIR", "teleport_to_y": 125 }, - "belowy": -58, + "belowy": -57, "slowfallticks": 1200 }, { @@ -39,7 +39,7 @@ "to": "minecraft:overworld", "teleporttype": { "teleporttype": "CAVE", - "teleport_to_y": -58 + "teleport_to_y": -56 }, "abovey": 118 } 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 ea4d63a42..f62dfb0f3 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: [{ @@ -1166,7 +1165,7 @@ type: "item" }] title: "{quests.steam_age.vacuum_chamber.title}" - x: -13.5d + x: -14.5d y: 12.0d } { @@ -1583,7 +1582,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 778449168..8e4624446 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/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/tfc/patchouli_books/field_guide/en_us/entries/getting_started/finding_ores.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/getting_started/finding_ores.json index 8b6fabe05..1fd784c67 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/getting_started/finding_ores.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/getting_started/finding_ores.json @@ -58,7 +58,7 @@ { "type": "patchouli:crafting", "recipe": "tfchotornot:crafting/tongs/wood", - "text": "Careful, the vessel will be hot! Craft $(thing)Wooden Tongs$() with two sticks and a knife and hold them in your off hand to handle the hot vessel safely. (This is a $(thing)Shapeless Recipe$(), you can make it in your inventory crafting grid)" + "text": "Careful, the vessel will be hot! Craft $(thing)Wooden Tongs$() with two sticks and a knife and hold them in your off hand to handle the hot vessel safely." }, { "type": "patchouli:image", diff --git a/kubejs/server_scripts/create/tags.js b/kubejs/server_scripts/create/tags.js index 8946b655f..71fa54f9e 100644 --- a/kubejs/server_scripts/create/tags.js +++ b/kubejs/server_scripts/create/tags.js @@ -79,6 +79,8 @@ const registerCreateBlockTags = (event) => { // Disable bulk blasting event.removeAll('create:fan_processing_catalysts/blasting') + + event.add('tfc:forge_invisible_whitelist', 'create:basin') } diff --git a/kubejs/server_scripts/createdeco/recipes.js b/kubejs/server_scripts/createdeco/recipes.js index f6c4091d8..d25688cb3 100644 --- a/kubejs/server_scripts/createdeco/recipes.js +++ b/kubejs/server_scripts/createdeco/recipes.js @@ -47,6 +47,7 @@ const registerCreatedecoRecipes = (event) => { event.remove({ id: 'createdeco:industrial_iron_bars' }) event.remove({ id: 'createdeco:zinc_bars_overlay' }) event.remove({ id: 'createdeco:zinc_bars' }) + event.remove({ id: 'gtceu:assembler/bricks' }) event.remove({ type: 'minecraft:stonecutting', input: '#forge:storage_blocks/tin_alloy' }) event.remove({ type: 'minecraft:stonecutting', input: '#forge:storage_blocks/brass' }) event.remove({ type: 'minecraft:stonecutting', input: '#forge:storage_blocks/wrought_iron' }) @@ -130,6 +131,14 @@ const registerCreatedecoRecipes = (event) => { const brickTypes = ['blue', 'verdant', 'pearl', 'dean', 'dusk', 'scarlet', 'umber'] const powderTypes = ['lapis_lazuli', 'malachite', 'soda_ash', 'limonite', 'charcoal', 'hematite', 'cassiterite'] + event.recipes.gtceu.assembler(`assembler_bricks`) + .itemInputs('5x minecraft:brick') + .inputFluids(Fluid.of('gtceu:concrete', 144)) + .itemOutputs(`4x minecraft:bricks`) + .duration(50) + .circuit(2) + .EUt(7) + brickTypes.forEach(type => { event.remove({ output: `createdeco:${type}_bricks` }); }); @@ -295,4 +304,4 @@ const registerCreatedecoRecipes = (event) => { }) // #endregion -}; \ No newline at end of file +}; diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index 58ed444e8..694169ff2 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -79,6 +79,7 @@ const registerFirmaLifeRecipes = (event) => { .itemInputs('tfc:jar_lid') .outputFluids(Fluid.of('gtceu:tin', 9)) .duration(50) + .category(GTRecipeCategories.EXTRACTOR_RECYCLING) .EUt(2) event.recipes.gtceu.fluid_solidifier(`firmalife:firmalife/stainless_steel_jar_lid`) diff --git a/kubejs/server_scripts/framed_blocks/recipes.js b/kubejs/server_scripts/framed_blocks/recipes.js index 6667bce79..86a2674bf 100644 --- a/kubejs/server_scripts/framed_blocks/recipes.js +++ b/kubejs/server_scripts/framed_blocks/recipes.js @@ -81,32 +81,6 @@ const registerFramedBlocksRecipes = (event) => { }).id('framedblocks:framing_saw/framed_pressure_plate') //#endregion - //#region Framed Obsidian Pressure Plate - event.shaped('framedblocks:framed_obsidian_pressure_plate', [ - 'AA', - 'BB' - ], { - A: '#forge:plates/obsidian', - B: 'framedblocks:framed_cube' - }).id('framedblocks:framed_obsidian_pressure_plate') - - event.custom({ - type: "framedblocks:frame", - additives: [ - { - count: 1, - ingredient: { - tag: "forge:plates/obsidian" - } - } - ], - material: 1536, - result: { - item: "framedblocks:framed_obsidian_pressure_plate" - } - }).id('framedblocks:framing_saw/framed_obsidian_pressure_plate') - //#endregion - //#region Framed Gold Pressure Plate event.shaped('framedblocks:framed_gold_pressure_plate', [ 'AA', diff --git a/kubejs/server_scripts/gregtech/utility.js b/kubejs/server_scripts/gregtech/utility.js index 02d74b307..e0dfc26d0 100644 --- a/kubejs/server_scripts/gregtech/utility.js +++ b/kubejs/server_scripts/gregtech/utility.js @@ -164,12 +164,12 @@ function generatePlatedBlockRecipe(event, material) { .EUt(GTValues.VA[GTValues.LV]) } -const $MRM = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.IMaterialRegistryManager') +//const $MRM = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.IMaterialRegistryManager') function forEachMaterial(iterator) { - if (GTMaterialRegistry.getPhase() === $MRM.Phase.CLOSED || GTMaterialRegistry.getPhase() === $MRM.Phase.FROZEN) { + //if (GTMaterialRegistry.getPhase() === $MRM.Phase.CLOSED || GTMaterialRegistry.getPhase() === $MRM.Phase.FROZEN) { GTMaterialRegistry.getRegisteredMaterials().forEach(material => { iterator(material) }) - } + //} } \ No newline at end of file diff --git a/kubejs/server_scripts/hotornot/recipes.js b/kubejs/server_scripts/hotornot/recipes.js index 5ceac71f8..9db1a3a67 100644 --- a/kubejs/server_scripts/hotornot/recipes.js +++ b/kubejs/server_scripts/hotornot/recipes.js @@ -1,5 +1,14 @@ // priority: 0 const registerHotOrNotRecipes = (event) => { - + + event.shaped('tfchotornot:tongs/wood', [ + 'AB ', + 'B ', + ' ' + ], { + A: '#forge:tools/knives', + B: '#forge:rods/wooden' + }).id('tfchotornot:crafting/tongs/wood') + } \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 5f2c122ac..123b5d7ef 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -324,4 +324,13 @@ const registerTFCRecipes = (event) => { .circuit(6) .EUt(GTValues.VA[GTValues.ULV]) }); + + // Jar lids + + event.shapeless('8x tfc:jar_lid', [ + 'gtceu:tin_ingot', + '#forge:tools/hammers', + '#forge:tools/saws' + ]).id('tfc:shapeless/jar_lid') + } diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index dbc3e1bdf..5b9625fee 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -262,6 +262,15 @@ const registerTFGBlockTags = (event) => { event.add('tfc:rock/hardened', 'tfg:rock/hardened_dripstone') // #endregion + + // #region Space blocks (TODO: undo these when merging space into dev!) + + event.add('c:hidden_from_recipe_viewers', 'tfg:lunar_roots') + event.add('c:hidden_from_recipe_viewers', 'tfg:lunar_sprouts') + event.add('c:hidden_from_recipe_viewers', 'tfg:lunar_chorus_plant') + event.add('c:hidden_from_recipe_viewers', 'tfg:lunar_chorus_flower') + + // #endregion } const registerTFGFluidTags = (event) => { diff --git a/kubejs/startup_scripts/framedblocks/constants.js b/kubejs/startup_scripts/framedblocks/constants.js index e84b9f059..4145d093b 100644 --- a/kubejs/startup_scripts/framedblocks/constants.js +++ b/kubejs/startup_scripts/framedblocks/constants.js @@ -2,5 +2,6 @@ global.FRAMEDBLOCKS_DISABLED_ITEMS = [ 'framedblocks:framed_soul_torch', - 'framedblocks:framed_torch' + 'framedblocks:framed_torch', + 'framedblocks:framed_obsidian_pressure_plate' ]; \ No newline at end of file diff --git a/mods b/mods index cd3a3c4d3..e47fce871 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit cd3a3c4d3df0e8a77bae8586d8ff9483331233d8 +Subproject commit e47fce87111ce4cf2fcf425d6d04127d0ac25204 diff --git a/pakku.json b/pakku.json index 749b24ba2..7755d7b50 100644 --- a/pakku.json +++ b/pakku.json @@ -1,6 +1,6 @@ { "name": "TerraFirmaGreg-Modern", - "version": "0.9.5", + "version": "0.9.7", "description": "An innovative modpack that contains GregTech and TerraFirmaCraft on 1.20.x.", "author": "Exception, Xikaro", "overrides": [