From 3529de6be100021529c487a74b04932eec159bfe Mon Sep 17 00:00:00 2001
From: TomPlop <tomdidome@gmail.com>
Date: Sat, 19 Jul 2025 14:59:04 -0400
Subject: [PATCH] Fix #1373 and #1380 (#1385)

* Update quests and lang

* Changelog

* changelog

* fix conflict

* changelog

* Fix quest and add smooth stone
---
 CHANGELOG.md                                  |  2 ++
 .../quests/chapters/hv__high_voltage.snbt     | 21 ++++++++++++-------
 kubejs/server_scripts/tfc/recipes.stone.js    | 12 +++++++++++
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 900b9f32d..fbf6e7f20 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,8 @@
 - Fixed flintlock not being craftable before LV (#1353) @Redeix
 - Fixed the field guide not working for chinese players (#1356) @Pyritie
 - Fixed glass blocks dropping with gem saw (#1367) @BlueBoat29
+- Fixed Hv Quest TNT #1373 @TomPlop
+- Fixed Smooth Stone #1380 @TomPlop
 
 ## [0.10.0] - 13.07.2025
 - [!WARNING] If you're upgrading your world from 0.9 to 0.10, please read the upgrade guide [here](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/wiki/%5BEN%5D-Upgrading-from-0.9-to-0.10). We do not recommend using Alpha versions for progression, but if you do, please make frequent backups!
diff --git a/config/ftbquests/quests/chapters/hv__high_voltage.snbt b/config/ftbquests/quests/chapters/hv__high_voltage.snbt
index 87fc37ee4..4c9502ab8 100644
--- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt
+++ b/config/ftbquests/quests/chapters/hv__high_voltage.snbt
@@ -620,24 +620,31 @@
 				"{quests.high_voltage.tnt.desc.1}"
 				"{@pagebreak}"
 				"{quests.high_voltage.tnt.desc.2}"
+				"{@pagebreak}"
+				"{quests.high_voltage.tnt.desc.3}"
 			]
 			icon: "minecraft:tnt"
 			id: "2B7B214EDE0B45A2"
 			size: 1.0d
 			tasks: [
-				{
-					id: "1CB85F57BA45252D"
-					item: "gtceu:gelled_toluene"
-					type: "item"
-				}
 				{
 					id: "04BF6A36E965C348"
 					item: "minecraft:tnt"
 					type: "item"
 				}
 				{
-					id: "6DC25EED8E91BEC2"
-					item: "gtceu:toluene_bucket"
+					id: "162CDC2567F6D6A8"
+					item: "gtceu:industrial_tnt"
+					type: "item"
+				}
+				{
+					id: "4CFB597542DD0194"
+					item: "gtceu:dynamite"
+					type: "item"
+				}
+				{
+					id: "0BF4703D1DBAA5B7"
+					item: "gtceu:powderbarrel"
 					type: "item"
 				}
 			]
diff --git a/kubejs/server_scripts/tfc/recipes.stone.js b/kubejs/server_scripts/tfc/recipes.stone.js
index f27234e47..9daea62bf 100644
--- a/kubejs/server_scripts/tfc/recipes.stone.js
+++ b/kubejs/server_scripts/tfc/recipes.stone.js
@@ -283,6 +283,18 @@ function registerTFCStoneRecipes(event) {
 
 		//#endregion
 
+		//#region Укрепленный камень
+
+		event.recipes.gtceu.assembler(`smooth_${stone}`)
+			.itemInputs(`8x tfc:rock/raw/${stone}`)
+			.circuit(2)
+			.inputFluids(Fluid.of('gtceu:concrete', 72))
+			.itemOutputs(`8x tfc:rock/smooth/${stone}`)
+			.duration(250)
+			.EUt(8)
+
+		//#endregion
+
 		//#region Акведук
 
 		event.recipes.gtceu.assembler(`aqueduct_${stone}`)