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

config/ftbquests/quests/chapters/hv__high_voltage.snbt

@@ -1619,6 +1619,7 @@
 				{
 					id: "5B94BB35A8480214"
 					item: "greate:titanium_cogwheel"
+					optional_task: true
 					type: "item"
 				}
 				{
@@ -1629,6 +1630,7 @@
 				{
 					id: "2E602B31550041B9"
 					item: "greate:titanium_shaft"
+					optional_task: true
 					type: "item"
 				}
 			]

config/ftbquests/quests/chapters/lv__low_voltage.snbt

@@ -1623,6 +1623,7 @@
 				{
 					id: "1483488F0E301BCC"
 					item: "greate:aluminium_cogwheel"
+					optional_task: true
 					type: "item"
 				}
 				{
@@ -1633,6 +1634,7 @@
 				{
 					id: "32C96E141753187B"
 					item: "greate:aluminium_shaft"
+					optional_task: true
 					type: "item"
 				}
 			]
@@ -1700,6 +1702,7 @@
 				{
 					id: "34153032225B76BB"
 					item: "gtceu:light_fuel_bucket"
+					optional_task: true
 					type: "item"
 				}
 				{

config/ftbquests/quests/chapters/mv__medium_voltage.snbt

@@ -1221,7 +1221,7 @@
 					Count: 1
 					id: "ftbfiltersystem:smart_filter"
 					tag: {
-						"ftbfiltersystem:filter": "or(item(gtceu:aluminium_quadruple_fluid_pipe)item(gtceu:blue_steel_quadruple_fluid_pipe)item(gtceu:steel_quadruple_fluid_pipe))"
+						"ftbfiltersystem:filter": "or(item_tag(forge:quadruple_fluid_pipes)item_tag(forge:nonuple_fluid_pipes))"
 					}
 				}
 				title: "Multiple Channel Potin Pipes, please"
@@ -1636,6 +1636,7 @@
 				{
 					id: "53919EE5BCCA618A"
 					item: "greate:stainless_steel_cogwheel"
+					optional_task: true
 					type: "item"
 				}
 				{
@@ -1646,6 +1647,7 @@
 				{
 					id: "6DF7F28AABF6785F"
 					item: "greate:stainless_steel_shaft"
+					optional_task: true
 					type: "item"
 				}
 			]

config/ftbquests/quests/chapters/questssteam_age.snbt

@@ -378,11 +378,13 @@
 				{
 					id: "23DE370285589CB4"
 					item: "greate:steel_shaft"
+					optional_task: true
 					type: "item"
 				}
 				{
 					id: "4FDD99090C920E21"
 					item: "greate:steel_cogwheel"
+					optional_task: true
 					type: "item"
 				}
 				{

kubejs/server_scripts/tfc/recipes.js

@@ -241,4 +241,52 @@ const registerTFCRecipes = (event) => {
 		.itemOutputs('tfc:wrought_iron_grill')
 		.duration(60)
 		.EUt(8)
+
+	//Jigabit's stupid acetic acid to vinegar conversion
+
+		event.recipes.gtceu.mixer('vinegar_from_acetic_acid')
+        		.inputFluids(
+                            Fluid.of('minecraft:water', 950),
+                            Fluid.of('gtceu:acetic_acid', 50)
+                )
+        		.outputFluids(
+                			Fluid.of('tfc:vinegar', 1000)
+                )
+			    .circuit(1)
+        		.duration(30)
+        		.EUt(GTValues.VA[GTValues.MV])
+
+       event.recipes.gtceu.distillery('acetic_acid_from_vinegar')
+               		.inputFluids(
+                                   Fluid.of('tfc:vinegar', 1000)
+                       )
+               		.outputFluids(
+                       			Fluid.of('gtceu:acetic_acid', 50)
+                       )
+                    .circuit(1)
+               		.duration(50)
+               		.EUt(GTValues.VA[GTValues.MV])
+
+       event.recipes.gtceu.distillery('water_from_vinegar')
+               		.inputFluids(
+                                   Fluid.of('tfc:vinegar', 1000)
+                       )
+               		.outputFluids(
+                       			Fluid.of('minecraft:water', 950)
+                       )
+                    .circuit(2)
+               		.duration(50)
+               		.EUt(GTValues.VA[GTValues.MV])
+        	
+       event.recipes.gtceu.distillation_tower('vinegar_distillation')
+               		.inputFluids(
+                                   Fluid.of('tfc:vinegar', 1000)
+                       )
+               		.outputFluids(
+                       			Fluid.of('gtceu:acetic_acid', 50),
+                       			Fluid.of('minecraft:water', 950)
+                       )
+               		.duration(80)
+               		.EUt(GTValues.VA[GTValues.MV])
+	
 }

kubejs/startup_scripts/tfg/items.food.js

@@ -444,7 +444,8 @@ function registerTFGFoodItems(event) {
 	event.create('tfg:food/oatmeal')
 		.translationKey('item.tfg.food.oatmeal')
 		.texture('tfg:item/food/oatmeal')
-		.food(food => food.hunger(8).saturation(8));
+		.food(food => food.hunger(8).saturation(8))
+	    .tag('tfc:foods');
 
 	// Instant Mac
 	event.create('tfg:food/raw_instant_mac')
@@ -453,7 +454,8 @@ function registerTFGFoodItems(event) {
 		.food(food => food.hunger(2).saturation(2)
 			.eaten(ctx => {
 				ctx.player.give('create:cardboard')
-			}));
+			}))
+	    .tag('tfc:foods');
 
 	event.create('tfg:food/cooked_instant_mac')
 		.translationKey('item.tfg.food.cooked_instant_mac')
@@ -461,7 +463,8 @@ function registerTFGFoodItems(event) {
 		.food(food => food.hunger(4).saturation(4)
 			.eaten(ctx => {
 				ctx.player.give('create:cardboard')
-			}));
+			}))
+	    .tag('tfc:foods');
 
 	//#region Spices