Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

2025-08-27 20:22:30 +01:00
parent e8473e3d0e 312ea3baf1
commit a9fd06bf11
15 changed files with 1 additions and 1 deletions
--- a/kubejs/data/tfg/structures/norse/baseline/norse_burial_base.nbt
+++ b/kubejs/data/tfg/structures/norse/baseline/norse_burial_base.nbt
--- a/kubejs/data/tfg/structures/norse/baseline/norse_farmhouse_base.nbt
+++ b/kubejs/data/tfg/structures/norse/baseline/norse_farmhouse_base.nbt
--- a/kubejs/data/tfg/structures/norse/baseline/norse_farmhousebig_base.nbt
+++ b/kubejs/data/tfg/structures/norse/baseline/norse_farmhousebig_base.nbt
--- a/kubejs/data/tfg/structures/norse/baseline/norse_longhouse_base.nbt
+++ b/kubejs/data/tfg/structures/norse/baseline/norse_longhouse_base.nbt
--- a/kubejs/data/tfg/structures/norse/baseline/norse_mosshouse_base.nbt
+++ b/kubejs/data/tfg/structures/norse/baseline/norse_mosshouse_base.nbt
--- a/kubejs/data/tfg/structures/norse/baseline/norse_smithy_base.nbt
+++ b/kubejs/data/tfg/structures/norse/baseline/norse_smithy_base.nbt
--- a/kubejs/data/tfg/structures/norse/burned/norse_mosshouse_burn.nbt
+++ b/kubejs/data/tfg/structures/norse/burned/norse_mosshouse_burn.nbt
--- a/kubejs/data/tfg/structures/norse/burned/norse_smithy_burn.nbt
+++ b/kubejs/data/tfg/structures/norse/burned/norse_smithy_burn.nbt
--- a/kubejs/data/tfg/structures/norse/ruins/norse_burial_ruin.nbt
+++ b/kubejs/data/tfg/structures/norse/ruins/norse_burial_ruin.nbt
--- a/kubejs/data/tfg/structures/norse/ruins/norse_farmhouse_ruin.nbt
+++ b/kubejs/data/tfg/structures/norse/ruins/norse_farmhouse_ruin.nbt
--- a/kubejs/data/tfg/structures/norse/ruins/norse_farmhousebig_ruin.nbt
+++ b/kubejs/data/tfg/structures/norse/ruins/norse_farmhousebig_ruin.nbt
--- a/kubejs/data/tfg/structures/norse/ruins/norse_longhouse_ruin.nbt
+++ b/kubejs/data/tfg/structures/norse/ruins/norse_longhouse_ruin.nbt
--- a/kubejs/data/tfg/structures/norse/ruins/norse_mosshouse_ruin.nbt
+++ b/kubejs/data/tfg/structures/norse/ruins/norse_mosshouse_ruin.nbt
--- a/kubejs/data/tfg/structures/norse/ruins/norse_smithy_ruin.nbt
+++ b/kubejs/data/tfg/structures/norse/ruins/norse_smithy_ruin.nbt
--- a/kubejs/server_scripts/sacksnstuff/recipes.js
+++ b/kubejs/server_scripts/sacksnstuff/recipes.js
@@ -176,7 +176,7 @@ const registerSNSRecipes = (event) => {
 		], {
 			A: '#forge:rope',
 			B: '#forge:string',
-			C: '#forge:tools/knifes'
+			C: '#forge:tools/knives'
 			
 		}).id('sns:shaped/reinforced_fiber_rope')