Merge remote-tracking branch 'upstream/dev' into dev

Author: BlueBoat29

CHANGELOG.md

@@ -1,8 +1,15 @@
 # Changelog
 
 ## Unreleased
-### Important note
+### Changes
+### Bug fixes
+### Translation updates
+
+## [0.11.18] - 23-01-2026
+### Important notes
+If you missed it, 0.11.17 was a Beta version with other important breaking changes. Be sure to [read it](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/releases/tag/0.11.17) as well!
 - OC has been fixed on the Pisciculture Fishery and Hydroponics Facility. You will have to break and replace the machine for the fix to take effect.
+- The Saltpeter chemical reactor recipe is now on circuit 2, to avoid a conflict with Nitrous Oxide (#2826) @Pyritie
 ### Breaking changes we forgot to write last time
 - Water wheels now *require* flowing water to work correctly. So you can't just put them in a lake, but you can make little flows off the side of it or use aqueducts and those should work. Other than that, they should have their same stress numbers as before.
 #### Stone dusts and other rock-related changes
@@ -19,6 +26,8 @@
 - The food meter's saturation level is now indicated by a gold outline instead of a red one, so it's less difficult to see (#2812) @TreyR9
 - Changed some of the colors of Greate things to make the different tiers more visually distinct @Pyritie
 - Buffed ore washing and ore maceration recipes so at least they aren't so awful compared to Greate's methods @Pyritie
+- Added TFG's crops to the field guide's Wild Crops entry @Petr211071
+- You can now drink concrete @Pyritie
 ### Bug fixes
 - Fixed a config bug causing waves to deposit shells etc with 100% chance. @Mqrius
 - Fixed a bug preventing the Pisciculture Fishery and Hydroponics Facility from overclocking. @Redeix
@@ -29,6 +38,8 @@
 - Fixed the Ad Astra airlock not counting as a cleanroom door (#2808) @thederpysockdude123
 - Removed some leftover rock dust centrifuge recipes (#2804) @thederpysockdude123
 - Fixed some mars plants self-destructing @Pyritie
+- Fixed mossy cobblestone not collapsing @Pyritie
+- Fixed welding not preserving forging bonuses (#2827) @Pyritie
 ### Translation updates
 - Spanish @NikoNeko17
 - Russian @Petr211071

config/crash_assistant/modlist.json

@@ -452,6 +452,13 @@
     "curseForgeHash": 3915242941,
     "modrinthHash": "338704cdf6623ad96983e72e81e8a9d97e8b28d8"
   },
+  "createstockbridge-1.20-0.1.5.jar": {
+    "jarName": "createstockbridge-1.20-0.1.5.jar",
+    "modId": "createstockbridge",
+    "version": "0.1.5",
+    "curseForgeHash": 3147522607,
+    "modrinthHash": "0fa15f11788e3bc3a812fc597ade17af33888952"
+  },
   "CreativeCore_FORGE_v2.12.32_mc1.20.1.jar": {
     "jarName": "CreativeCore_FORGE_v2.12.32_mc1.20.1.jar",
     "modId": "creativecore",
@@ -718,12 +725,12 @@
     "curseForgeHash": 1064675696,
     "modrinthHash": "1ef101b4c5991cc239d9b56a95500e3b404228f7"
   },
-  "ftb-teams-forge-2001.3.1.jar": {
-    "jarName": "ftb-teams-forge-2001.3.1.jar",
+  "ftb-teams-forge-2001.3.2.jar": {
+    "jarName": "ftb-teams-forge-2001.3.2.jar",
     "modId": "ftbteams",
-    "version": "2001.3.1",
-    "curseForgeHash": 1240744296,
-    "modrinthHash": "c2af94e0b86631cb75daa8de2377ff72527651ca"
+    "version": "2001.3.2",
+    "curseForgeHash": 816412664,
+    "modrinthHash": "c49023f5d471aa1ba7fc624d2565fe9e82b7117e"
   },
   "ftb-xmod-compat-forge-2.1.3.jar": {
     "jarName": "ftb-xmod-compat-forge-2.1.3.jar",
@@ -1017,12 +1024,12 @@
     "curseForgeHash": 544928077,
     "modrinthHash": "24e6611df470afd957eafd16c43890b7214e3da9"
   },
-  "modernfix-forge-5.25.2+mc1.20.1.jar": {
-    "jarName": "modernfix-forge-5.25.2+mc1.20.1.jar",
+  "modernfix-forge-5.26.1+mc1.20.1.jar": {
+    "jarName": "modernfix-forge-5.26.1+mc1.20.1.jar",
     "modId": "modernfix",
-    "version": "5.25.2+mc1.20.1",
-    "curseForgeHash": 3074548209,
-    "modrinthHash": "4069534174e618393f0c14d9dc61ac27a04bb992"
+    "version": "5.26.1+mc1.20.1",
+    "curseForgeHash": 424935770,
+    "modrinthHash": "fa0163b33e911b69af61fee8a3920820e7c617a0"
   },
   "ModernUI-Forge-1.20.1-3.12.0.1-universal.jar": {
     "jarName": "ModernUI-Forge-1.20.1-3.12.0.1-universal.jar",
@@ -1122,12 +1129,12 @@
     "curseForgeHash": 3233971835,
     "modrinthHash": "cc0332d3bbf7824b673abc59e231f1f5aafc6420"
   },
-  "particle_core-0.2.6+1.20.1+forge.jar": {
-    "jarName": "particle_core-0.2.6+1.20.1+forge.jar",
+  "particle_core-0.3.1+1.20.1+forge.jar": {
+    "jarName": "particle_core-0.3.1+1.20.1+forge.jar",
     "modId": "particle_core",
-    "version": "0.2.6+1.20.1+forge",
-    "curseForgeHash": 4189650687,
-    "modrinthHash": "91f302ab9b85016aeb3a9a0e85b80650a1d2e984"
+    "version": "0.3.1+1.20.1+forge",
+    "curseForgeHash": 4077743380,
+    "modrinthHash": "935a8c19cc7a72364fdfe494d9ddbd599f01588d"
   },
   "particular-1.20.1-Forge-1.2.7.jar": {
     "jarName": "particular-1.20.1-Forge-1.2.7.jar",
@@ -1367,12 +1374,12 @@
     "curseForgeHash": 218830698,
     "modrinthHash": "7d4f578a42c9b880744ea6058a495847aac9e4c3"
   },
-  "tacz-tweaks-2.11.2-all.jar": {
-    "jarName": "tacz-tweaks-2.11.2-all.jar",
+  "tacz-tweaks-2.12.1-all.jar": {
+    "jarName": "tacz-tweaks-2.12.1-all.jar",
     "modId": "tacztweaks",
-    "version": "2.11.2",
-    "curseForgeHash": 2376197194,
-    "modrinthHash": "889c0885b6388fc7966b956a5df4efbb1c758965"
+    "version": "2.12.1",
+    "curseForgeHash": 769672337,
+    "modrinthHash": "92c9981e2e2f2edecab25ee48c5bade7a14298a8"
   },
   "taczammoquery-1.20.1-1.0.0.jar": {
     "jarName": "taczammoquery-1.20.1-1.0.0.jar",
@@ -1395,12 +1402,12 @@
     "curseForgeHash": 2679626739,
     "modrinthHash": "ea725f5bed9662aa22d4ec089a009bd52fb82275"
   },
-  "TerraFirmaGreg-Core-Modern-0.8.17.jar": {
-    "jarName": "TerraFirmaGreg-Core-Modern-0.8.17.jar",
+  "TerraFirmaGreg-Core-Modern-0.8.18.jar": {
+    "jarName": "TerraFirmaGreg-Core-Modern-0.8.18.jar",
     "modId": "tfg",
-    "version": "0.8.17",
-    "curseForgeHash": 2296143699,
-    "modrinthHash": "8a92b1d2a0a88eb0d7ffdfcdab93b0fb31e2e312"
+    "version": "0.8.18",
+    "curseForgeHash": 3264017794,
+    "modrinthHash": "b4f98b976aa7096b6ec0a6bd291fb16415dfeb3a"
   },
   "tfc_gurman-1.3.0.jar": {
     "jarName": "tfc_gurman-1.3.0.jar",
@@ -1626,6 +1633,13 @@
     "curseForgeHash": 2333549546,
     "modrinthHash": "7298a59e383d2327e2acc49d8f1b132cedb8860b"
   },
+  "wakes-1.20.1-Forge-1.0.9.jar": {
+    "jarName": "wakes-1.20.1-Forge-1.0.9.jar",
+    "modId": "wakes",
+    "version": "1.0.9",
+    "curseForgeHash": 650217522,
+    "modrinthHash": "4e2f19e3c2d36968630f66b370ad0ab984aa5b25"
+  },
   "waterflasks-3.0.10.jar": {
     "jarName": "waterflasks-3.0.10.jar",
     "modId": "waterflasks",

config/ftbquests/quests/chapters/queststfc_tips.snbt

@@ -1185,7 +1185,7 @@
 				Count: 1
 				ForgeCaps: {
 					"tfc:food": {
-						creationDate: 53316000L
+						creationDate: -9223372036854775808L
 						traits: [ ]
 					}
 				}

kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/beneath/curious_blocks.json

@@ -14,7 +14,7 @@
 			"text": "Hellbricks are a building block that are also used for the Hellforge."
 		},
 		{
-			"type": "patchouli:showcase",
+			"type": "patchouli:spotlight",
 			"item": "beneath:ancient_altar",
 			"text": "The Pyroxenite Pedestal can be used to display items you want to show off!"
 		},

kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/ore_basics.json

@@ -4,6 +4,7 @@
     "category": "tfc:tfg_ores",
     "priority": true,
     "sortnum": 0,
+    "read_by_default": true,
     "pages": [
         {
             "type": "patchouli:text",