Merge branch 'dev' into feature/create-6

.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

.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

.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

.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

.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

.github/dependabot.yml

@@ -11,7 +11,7 @@ updates:
     schedule:
       interval: "weekly"
     labels:
-      - "1. Type: Dependencies"
+      - "Type: Dependencies"
     groups:
       dependencies:
         applies-to: version-updates

.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
+      # - name: 📁 Rename artifact modrinth
-        run: |
+      #   run: |
-          cd ./build/modrinth/
+      #     cd ./build/modrinth/
-          mv *.mrpack $(basename -s .mrpack *.mrpack)-modrinth.mrpack
+      #     mv *.mrpack $(basename -s .mrpack *.mrpack)-modrinth.mrpack
 
-      - name: 🚀 Upload artifact modrinth
+      # - name: 🚀 Upload artifact modrinth
-        uses: actions/upload-artifact@v4.6.2
+      #   uses: actions/upload-artifact@v4.6.2
-        with:
+      #   with:
-          name: ${{ needs.info.outputs.project_full_name }}-modrinth
+      #     name: ${{ needs.info.outputs.project_full_name }}-modrinth
-          path: ./build/modrinth/${{ needs.info.outputs.project_full_name }}-modrinth.mrpack
+      #     path: ./build/modrinth/${{ needs.info.outputs.project_full_name }}-modrinth.mrpack
-          if-no-files-found: warn
+      #     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
+          # if [ ! -f ${{ needs.info.outputs.project_full_name }}-modrinth.mrpack ]; then
-            echo '::error::No value found for artifact `modrinth.mrpack`.' && exit 1
+          #   echo '::error::No value found for artifact `modrinth.mrpack`.' && exit 1
-          fi
+          # 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 }}
 

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)
+## [0.9.7] - 17.05.2025
-- Added recipes for stainless steel greenhouse parts (Pyritie)
+### Changes
-- More field guide updates (Oosyrag)
+- Fixed Crash Sprinkler.
-- Added assembler recipes for more Create and Greate items (Pyritie)
+- Undated the carryon config file to include the arborafirmacraft chests in the whitelist. @NobleWasTaken
-- 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)
+## [0.9.6] - 16.05.2025
-- Fixed some recycling recipes to prevent dupes (Pyritie)
+### Changes
-- Added a circuit to the assembler hopper recipe (Pyritie)
+- Changed wooden tongs recipe from shapeless to shaped. @Oosyrag
-- Fixed chiseling non-tfc blocks so it returns two slabs instead of one (Pyritie)
+- Added crafting recipe for tin jar lids. @Oosyrag
-- Fixed being able to use tree taps on placed logs (Pyritie)
+- 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
-- Fixed tooltips on the uncolored small vessel and AFC wooden supports (Pyritie)
+- Greenhouse ports and sprinklers now work directly with gregtech pipes. @Thomasx0
-- Fixed assembler clay recipes so they output the correct amount (Pyritie)
+- Added recipes for stainless steel greenhouse parts. @Pyritie
-- Quest fixes/tweaks (Pyritie)
+- More field guide updates. @Oosyrag
-- Added aluminium, stainless steel, and titanium millstones (Pyritie)
+- Added assembler recipes for more Create and Greate items. @Pyritie
-- Fixed fishing nets behavior. (Redeix)
+- Blaze burners, alternators, steam engines, and steam multiblock inputs/outputs are now much cheaper. @Pyritie
-- Added item to summon armor stands with arms. (Redeix)
+- Firmaciv sails can now use any fabric instead of just wool. @Pyritie
-- Added recipes for extracting/ forming magma blocks. (Redeix)
+- Fixed some recycling recipes to prevent dupes. @Pyritie
-- Nerfed steel support recipe output. (Redeix)
+- 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

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 = []
 

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
 		}

config/ftbquests/quests/chapters/lv__low_voltage.snbt

@@ -1308,13 +1308,7 @@
 		}
 		{
 			dependencies: ["22510C5F2386B453"]
-			description: [
+			description: ["{quests.steam_age.alternator.desc.1}"]
-				"{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}"
-			]
 			id: "2DC24661CAD557B0"
 			optional: true
 			subtitle: "{quests.steam_age.alternator.subtitle}"

config/ftbquests/quests/chapters/ore_processing.snbt

@@ -22,25 +22,18 @@
 			id: "5D09BEE61210DF02"
 			size: 1.5d
 			subtitle: "{quests.ore_proc.native_ore.subtitle}"
-			tasks: [
+			tasks: [{
-				{
+				id: "047DA2872D107BA0"
-					id: "047DA2872D107BA0"
+				item: {
-					item: {
+					Count: 1
-						Count: 1
+					id: "ftbfiltersystem:smart_filter"
-						id: "ftbfiltersystem:smart_filter"
+					tag: {
-						tag: {
+						"ftbfiltersystem:filter": "or(item_tag(tfc:ore_pieces))"
-							"ftbfiltersystem:filter": "or(item_tag(tfc:ore_pieces))"
-						}
 					}
-					optional_task: true
-					title: "{quests.ore_proc.native_ore.task}"
-					type: "item"
 				}
-				{
+				title: "{quests.ore_proc.native_ore.task}"
-					id: "2D0D9226FDB3CAC9"
+				type: "item"
-					type: "checkmark"
+			}]
-				}
-			]
 			title: "{quests.ore_proc.native_ore.title}"
 			x: 0.5d
 			y: -8.5d

config/ftbquests/quests/chapters/questssteam_age.snbt

@@ -23,10 +23,8 @@
 		{
 			id: "23A27702FF816291"
 			linked_quest: "6903C72A254A7B08"
-			shape: "octagon"
+			x: -14.5d
-			size: 2.0d
+			y: 6.0d
-			x: -13.5d
-			y: 14.5d
 		}
 		{
 			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: [{
@@ -1161,7 +1160,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.vacuum_chamber.title}"
-			x: -13.5d
+			x: -14.5d
 			y: 12.0d
 		}
 		{
@@ -1578,7 +1577,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."
 			]

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"

kubejs/assets/create/lang/en_us.json

@@ -1,5 +1,6 @@
 {
   "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
+  "block.create.netherite_backtank": "Blue Steel Backtank",
   "block.create.dark_oak_window": "Hickory Window",
   "block.create.dark_oak_window_pane": "Hickory Window Pane",
   "block.create.andesite_bars": "Metal Bars",
@@ -68,7 +69,6 @@
   "block.create.small_granite_brick_wall": "Small Chert Brick Wall",
   "block.create.layered_granite": "Layered Chert",
   "block.create.granite_pillar": "Chert Pillar",
-  "block.create.netherite_backtank": "Blue Steel Backtank",
   "item.create.netherite_diving_helmet.tooltip.summary": "Together with a _Blue Steel Backtank_, this can protect you from _extreme heat_. To be effective, _Legs and Feet_ have to be covered in a _Blue Steel Diving Equipment_, too.",
   "item.create.netherite_backtank": "Blue Steel Backtank",
   "item.create.netherite_diving_helmet": "Blue Steel Diving Helmet",
@@ -89,4 +89,4 @@
   "create.ponder.brass_funnel.text_1": "Metal Funnels can only ever extract single items.",
   "create.ponder.cogwheel_casing.text_1": "Brass or Metal Casing can be used to decorate Cogwheels",
   "create.ponder.shaft_casing.text_1": "Brass or Metal Casing can be used to decorate Shafts"
-}
+}

kubejs/assets/gtceu/lang/en_us.json

@@ -62,6 +62,8 @@
   "material.gtceu.ostrum": "Ostrum",
   "material.gtceu.calorite": "Calorite",
   "material.gtceu.etrium": "Etrium",
+  "material.gtceu.rocket_alloy_t1": "Colored Rocket Alloy",
+  "material.gtceu.vitrified_asbestos": "Vitrified Asbestos",
   "metaitem.dust.tooltip.purify": "Drop in Water to get Clean Dust",
   "metaitem.crushed.tooltip.purify": "Drop in Water to get Purified Ore",
   "item.gtceu.tool.behavior.silk_ice": "Silk Harvests Packed Ice",

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",
+			"title": "Piping",
-			"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$()."
+			"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,

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",

kubejs/assets/tfg/lang/en_us.json

@@ -11,9 +11,14 @@
   "biome.tfg.nether/gneiss_caves": "Deep Caves",
   "biome.tfg.nether/granite_caves": "Deep Caves",
   "biome.tfg.nether/schist_caves": "Deep Caves",
-  "biome.tfg.moon/lunar_basalt_maria": "Lunar Maria",
+  "biome.tfg.moon/lunar_asurine_dense": "Certus Fields",
-  "biome.tfg.moon/lunar_diorite_delta": "Lunar Delta",
+  "biome.tfg.moon/lunar_asurine_sparse": "Asurine Fields",
-  "biome.tfg.moon/lunar_gabbro_uplift": "Lunar Uplift",
+  "biome.tfg.moon/lunar_chorus_dense": "Chorus Thicket",
+  "biome.tfg.moon/lunar_chorus_sparse": "Chorus Forest",
+  "biome.tfg.moon/lunar_corals_dense": "Lunar Reef",
+  "biome.tfg.moon/lunar_corals_sparse": "Lunar Maria",
+  "biome.tfg.moon/lunar_lights_dense": "Lightbloom Star Gazers",
+  "biome.tfg.moon/lunar_lights_sparse": "Lightbloom Scrubland",
   "biome.tfg.moon/lunar_plains": "Lunar Plains",
   "block.tfg.decorative_vase.black": "Black Decorative Vase",
   "block.tfg.decorative_vase.gray": "Gray Decorative Vase",
@@ -131,17 +136,25 @@
   "block.tfg.loose.deepslate": "Loose Migmatite Rock",
   "block.tfg.loose.dripstone": "Loose Travertine Rock",
   "block.tfg.rock.hardened_moon_stone": "Hardened Anorthosite",
+  "block.tfg.spike.moon_stone_spike": "Anorthosite Spike",
   "block.tfg.loose.moon_stone": "Loose Anorthosite Rock",
   "block.tfg.rock.hardened_moon_deepslate": "Hardened Norite",
+  "block.tfg.spike.moon_deepslate_spike": "Norite Spike",
   "block.tfg.loose.moon_deepslate": "Loose Norite Rock",
   "block.tfg.rock.hardened_mars_stone": "Hardened Argillite",
+  "block.tfg.spike.mars_stone_spike": "Argillite Spike",
   "block.tfg.loose.mars_stone": "Loose Argillite Rock",
   "block.tfg.rock.hardened_venus_stone": "Hardened Trachyte",
+  "block.tfg.spike.venus_stone_spike": "Trachyte Spike",
   "block.tfg.loose.venus_stone": "Loose Trachyte Rock",
   "block.tfg.rock.hardened_mercury_stone": "Hardened Komatiite",
+  "block.tfg.spike.mercury_stone_spike": "Komatiite Spike",
   "block.tfg.loose.mercury_stone": "Loose Komatiite Rock",
   "block.tfg.rock.hardened_glacio_stone": "Hardened Phonolite",
+  "block.tfg.spike.glacio_stone_spike": "Phonolite Spike",
   "block.tfg.loose.glacio_stone": "Loose Phonolite Rock",
+  "block.tfg.rock.hardened_permafrost": "Hardened Permafrost",
+  "block.tfg.spike.permafrost_spike": "Permafrost Spike",
   "block.tfg.loose.permafrost": "Permafrost Chunk",
   "block.tfg.lunar_roots": "Lunar Lightblooms",
   "block.tfg.lunar_sprouts": "Lunar Lightgrass",
@@ -193,6 +206,7 @@
   "item.tfg.latex_soaked_gloves": "Latex-Soaked Gloves",
   "item.tfg.spade_head_extruder_mold": "Extruder Mold (Spade Head)",
   "item.tfg.unfired_chalk": "Unfired Chalk Stick",
+  "item.tfg.armor_stand_arms": "Armor Stand with Arms",
   "item.tfg.brick.deepslate": "Migmatite Brick",
   "item.tfg.loose.moon_stone": "Loose Anorthosite",
   "item.tfg.brick.moon_stone": "Anorthosite Brick",
@@ -568,12 +582,14 @@
   "quests.development.hull_zpm.desc": "This is the &9Wetware&r Circuit line.\n\nIt will be the biggest automation challenge to face in this modpack. Best of luck.",
   "quests.gregtech_energy": "Gregtech Energy",
   "quests.gregtech_energy.subtitle": "So how does all of that work?",
+  "quests.gregtech_energy.start.title": "Let's do some explaining",
+  "quests.gregtech_energy.start.desc": "We know that &5GregTech&r isn’t the easiest mod to get into — especially when it comes to the &cenergy system&r. That’s why we’ll take our time in this chapter to explain as much as we can.\n\nSome things here might not make full sense until later in your progression, so &adon’t stress yourself&r. Just try to understand what you can for now, and feel free to &dcome back to this chapter&r whenever you have questions.\n\nWe’ve split this chapter into &efour categories&r, each one covering a topic related to the &6GregTech Energy System&r. We’ll provide as many examples as possible to help you understand how it all works.",
+  "quests.gregtech_energy.start.task": "Welcome aboard",
   "quests.gregtech_energy.TEST.title": "",
   "quests.gregtech_energy.TEST.subtitle": "",
   "quests.gregtech_energy.TEST.desc.1": "",
   "quests.gregtech_energy.TEST.desc.2": "",
   "quests.gregtech_energy.TEST.desc.3": "",
-  "quests.gregtech_energy.TEST.desc.4": "",
   "quests.gregtech_energy.TEST.task": "",
   "quests.gregtech_energy.TEST.desc": "",
   "quests.high_voltage": "&6HV&r - High Voltage",
@@ -1050,6 +1066,9 @@
   "quests.medium_voltage.mv_ram.title": "Download more RAM",
   "quests.medium_voltage.mv_ram.subtitle": "That's from the Dark Punk you know?",
   "quests.medium_voltage.mv_ram.desc": "&aRandom Access Memory&r is required for many Circuits.",
+  "quests.medium_voltage.lsb.title": "Getting very steamy",
+  "quests.medium_voltage.lsb.subtitle": "If you have unlimited fuel, it can still be good",
+  "quests.medium_voltage.lsb.desc": "If you're &lstill&r running off the &3Large Bronze Boiler&r, you may want to upgrade to the &3Large Steel Boiler&r.\n\nIt's slightly more efficient than the &3LBB&r, and produces &d900 EU/t worth of Steam&r.\n\nWe'd recommend you try other power options at this point.",
   "quests.metal_age": "Metallurgy Age",
   "quests.metal_age.subtitle": "Your First Technological Advancements.",
   "quests.metal_age.weld_bronze_ingots.title": "Welding Bronze",

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')
 }
 
 

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
-};
+};

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`)

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',

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)
 		})
-	}
+	//}
 }

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')
+
 }

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')
+
 }

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) => {

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'
 ];

mods

@@ -1 +1 @@
-Subproject commit cd3a3c4d3df0e8a77bae8586d8ff9483331233d8
+Subproject commit e47fce87111ce4cf2fcf425d6d04127d0ac25204

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": [