From e35c34040d07e02f418a9e2434dc7bea55f62810 Mon Sep 17 00:00:00 2001
From: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
Date: Mon, 16 Jun 2025 13:03:14 -0300
Subject: [PATCH] Migmatite conflict fix (#1153)

* Migmatite conflict fixe

Tbh I can hardly call this a good fix, but tbh with Stonecutter coming back this might even be meaningless

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

* Update Migmatite

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

* Update recipes.rocks.js

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>

---------

Signed-off-by: Jean Roberto de Souza <81846511+JeanRdSz@users.noreply.github.com>
---
 kubejs/server_scripts/minecraft/recipes.js | 1 +
 kubejs/server_scripts/tfg/recipes.rocks.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js
index 55a34243c..57cdf234f 100644
--- a/kubejs/server_scripts/minecraft/recipes.js
+++ b/kubejs/server_scripts/minecraft/recipes.js
@@ -1028,4 +1028,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/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
+}