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

kubejs/assets/tfg/textures/block/casings/test_casing.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "ldlib": {
+    "connection": "tfg:block/casings/test_casing_ctm"
+  }
+}

kubejs/server_scripts/tfg/food/tags.food.js

@@ -175,7 +175,8 @@ function registerTFGFoodItemTags(event) {
 	const cheeses = [
 		'#firmalife:foods/cheeses',
 		'tfg:food/slice_of_cheese',
-		'firmalife:food/shredded_cheese'
+		'firmalife:food/shredded_cheese',
+		'#tfc_gurman:foods/brinza'
 	];
 	cheeses.forEach(item => {
 		event.add('tfg:foods/cheeses', item);

kubejs/startup_scripts/computer_craft/constants.js

@@ -17,5 +17,5 @@ global.COMPUTER_CRAFT_DISCS = [
     '{Color:8349260}',
     '{Color:5744206}',
     '{Color:13388876}',
-    '{Color:1118481}',
+    '{Color:1118481}'
 ]

kubejs/startup_scripts/tfc/constants.js

@@ -836,7 +836,7 @@ global.TFC_CLAY_TO_UNFIRED_MOLD_RECIPE_COMPONENTS = /** @type {const} */ ([
     { input: "5x minecraft:clay_ball", output: "10x rnr:unfired_roof_tile", name: "roof_tile" },
     { input: "5x minecraft:clay_ball", output: "firmalife:oven_top", name: "oven_top" },
     { input: "5x minecraft:clay_ball", output: "firmalife:oven_chimney", name: "oven_chimney" },
-    { input: "5x minecraft:clay_ball", output: "firmalife:oven_bottom", name: "oven_bottom" },
+    { input: "5x minecraft:clay_ball", output: "firmalife:oven_bottom", name: "oven_bottom" }
 ]);
 
 global.TFC_FIRE_CLAY_TO_UNFIRED_MOLD_RECIPE_COMPONENTS = /** @type {const} */ ([

kubejs/startup_scripts/tfg/blocks.casings.js

@@ -116,6 +116,10 @@ function registerTFGCasingBlocks(event) {
 		.tagBlock('gtceu:mineable/pickaxe_or_wrench')
 		.mapColor('color_brown')
 
+	event.create('tfg:casings/test_casing')
+		.soundType('copper')
+		.hardness(5)
+		.resistance(6)
+		.tagBoth('c:hidden_from_recipe_viewers')
 
-	
 }

kubejs/startup_scripts/tfg/items.food.js

@@ -358,7 +358,7 @@ function registerTFGFoodItems(event) {
 		.texture('tfg:item/food/cooked_beer_battered_cheese_curds')
 		.food(food => food.hunger(3).saturation(2))
 		.tag('tfc:foods')
-		.tag('tfc:foods/usable_in_burgers');
+		.tag('tfg:foods/usable_in_burgers');
 
 	// French Fries
 	event.create('tfg:food/raw_fries')
@@ -372,7 +372,7 @@ function registerTFGFoodItems(event) {
 		.texture('tfg:item/food/cooked_fries')
 		.food(food => food.hunger(3).saturation(2))
 		.tag('tfc:foods')
-		.tag('tfc:foods/usable_in_burgers');
+		.tag('tfg:foods/usable_in_burgers');
 
 	// Poutine
 	event.create('tfg:food/poutine')