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

kubejs/server_scripts/etched/recipes.js

@@ -13,9 +13,9 @@ const registerEtchedRecipes = (event) => {
         'AAA'
     ], {
         A: '#minecraft:planks',
-        B: '#forge:rings/steel',
-        C: '#forge:plates/steel',
-        D: '#forge:plates/diamond'
+        B: '#forge:rings/wrought_iron',
+        C: '#forge:plates/wrought_iron',
+        D: 'tfg:etching_diamond_tip'
     }).id('etched:etching_table')
 
     // Album Jukebox

kubejs/server_scripts/tfg/recipes.miscellaneous.js

@@ -1010,4 +1010,13 @@ function registerTFGMiscellaneousRecipes(event) {
 			.duration(20)
 			.EUt(8)
 	})
+
+	// Etching Tip
+	event.recipes.tfc.damage_inputs_shapeless_crafting(event.recipes.minecraft.crafting_shapeless('tfg:etching_diamond_tip',[
+		'#forge:tools/hammers',
+		'#tfc:chisels',
+		'minecraft:diamond'
+	]));
+
+	event.replaceInput({ id: "minecraft:jukebox"}, 'minecraft:diamond', 'tfg:etching_diamond_tip');
 }