Merge branch 'dev' into feature/create-6

kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/fishing_nets.json

@@ -2,7 +2,7 @@
 	"name": "Fishing Nets",
 	"icon": "tfg:fishing_net/brass",
 	"category": "tfc:mechanics",
-	"priority": true,
+	"read_by_default": true,
 	"pages": [
 		{
 			"type": "patchouli:spotlight",

kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/anvil_working_guide.json

@@ -2,7 +2,7 @@
     "name": "Anvil Working Guide",
     "icon": "gtceu:red_steel_hammer",
     "category": "tfc:tfg_tips",
-    "read_by_default": false,
+    "read_by_default": true,
     "priority": false,
     "pages":
     [

kubejs/assets/tfg/lang/en_us.json

@@ -2226,6 +2226,10 @@
   "quests.tfg_tips.smoke_meat.subtitle": "Smokey",
   "quests.tfg_tips.smoke_meat.desc": "You can hang up to 8 slices of &aRaw Meat&r on a &bString&r that's placed over a &cLit Campfire&r to smoke it. Keep in mind that the meat &lmust be brined first.&r \nIt may also be &dsalted&r before smoking.",
   "quests.tfg_tips.smoke_meat.task": "A hunk of Smoked Meat",
+  "quests.tfg_tips.bacon.title": "Bacon",
+  "quests.tfg_tips.bacon.subtitle": "Crispy",
+  "quests.tfg_tips.bacon.desc": "&aBacon&r can be made from &bSmoked Pork&r and a pinch of salt giving &d4 times&r the amount of meat!\n\nNote that the pork &lhas to be smoked&r before it can be turned into bacon.",
+  "quests.tfg_tips.bacon.task": "A hunk of Smoked Pork",
   "quests.tfg_tips.cook_meat.title": "Meat Preservation: Cooking",
   "quests.tfg_tips.cook_meat.subtitle": "Pretty obvious in hindsight.",
   "quests.tfg_tips.cook_meat.desc": "Cooking can potentially provide its own preservation traits. You should cook &aMeat&r either in a &bWrought Iron Grill&r or a &bTop Oven!&r\nOther cooking methods may not provide any trait at all or may even give negative traits that lower shelf life.\n\n&3&lTip:&r&o &bWrought Iron Grills&f can be part of the &dOven&f structure.",

kubejs/data/tfg/loot_tables/blocks/piglin_disguise_block.json

@@ -0,0 +1,20 @@
+{
+	"type": "minecraft:block",
+	"pools": [
+		{
+			"name": "loot_pool",
+			"rolls": 1,
+			"entries": [
+				{
+					"type": "minecraft:item",
+					"name": "tfg:piglin_disguise_block"
+				}
+			],
+			"conditions": [
+				{
+					"condition": "minecraft:survives_explosion"
+				}
+			]
+		}
+	]
+}

kubejs/server_scripts/beneath/tags.js

@@ -30,4 +30,6 @@ const registerBeneathItemTags = (event) => {
 
 	event.add('forge:ores', 'beneath:ore/nether_cursecoal')
 	event.add('forge:ores', 'beneath:ore/blackstone_sylvite')
+	
+	event.remove('beneath:sparks_on_sulfur')
 }

kubejs/server_scripts/create_connected/recipes.js

@@ -47,7 +47,7 @@ const registerCreateConnectedRecipes = (event) => {
 	}).id('create_connected:crafting/kinetics/item_silo')
 
 	event.recipes.gtceu.assembler('tfg:create_connected/item_silo')
-		.itemInputs('3x #forge:chests/wooden', '#forge:sheets/wrought_iron', '2x #forge:screws/wrought_iron')
+		.itemInputs('#forge:chests/wooden', '#forge:sheets/wrought_iron', '2x #forge:screws/wrought_iron')
 		.circuit(10)
 		.itemOutputs('create_connected:item_silo')
 		.duration(200)

kubejs/server_scripts/main_server_script.js

@@ -141,6 +141,7 @@ LootJS.modifiers((event) => {
     registerLootrLoots(event)
     registerPrimitiveCreatesLoots(event)
     registerTFCLoots(event)
+    registerTFGLoots(event)
 });
 
 /**

kubejs/server_scripts/tfg/loot_tables.js

@@ -1,7 +1,6 @@
+function registerTFGLoots(event) {
 
-LootJS.modifiers((event) => {
-
-    //Generated Vases Loot
+    //#region Vase Loot
 	global.MINECRAFT_DYE_NAMES.forEach(color => {
         event.addBlockLootModifier(`tfg:decorative_vase/generated/${color}`)
         .removeLoot(Ingredient.all)
@@ -81,4 +80,4 @@ LootJS.modifiers((event) => {
             );
         })
     });
-});
+};