merge

kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/firmalife/irrigation.json

@@ -13,12 +13,14 @@
 			"text": "The sprinkler is made with a $(thing)Copper Plate$()."
 		},
 		{
-			"type": "patchouli:text",
-			"text": "Sprinklers must be connected to a system of pipes that feed it water in order to work. This is done by connecting a series of $(thing)Fluid Pipes$() to them. You can pump fluid into them with a $(thing)Mechanical Pump$()."
+			"title": "Piping",
+			"item": "gtceu:copper_tiny_fluid_pipe",
+			"type": "patchouli:spotlight",
+			"text": "Sprinklers must be connected to a system of pipes that feed it water in order to work. This is done by connecting a series of $(thing)Fluid Pipes$() to them. You can pump water into them with a $(thing)Mechanical Pump$()."
 		},
 		{
 			"type": "patchouli:text",
-			"text": "You can right-click a pipe with a GregTech Frame (such as a $(thing)Copper Frame$()) to make them flush with the wall. You will need a Drum or Fluid Tank attached to each sprinkler in order for them to work."
+			"text": "You can right-click a pipe with a GregTech Frame (such as a $(thing)Copper Frame$()) to make them flush with the wall, or use a Greenhouse Port. You can then attach your sprinkler directly to the pipe! Right-click fluid pipes with a wrench to change their direction, and sneak-right-click them with an $(thing)empty offhand$() to make them one-way."
 		}
 	],
 	"read_by_default": true,

kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/getting_started/finding_ores.json

@@ -58,7 +58,7 @@
     {
       "type": "patchouli:crafting",
       "recipe": "tfchotornot:crafting/tongs/wood",
-      "text": "Careful, the vessel will be hot! Craft $(thing)Wooden Tongs$() with two sticks and a knife and hold them in your off hand to handle the hot vessel safely. (This is a $(thing)Shapeless Recipe$(), you can make it in your inventory crafting grid)"
+      "text": "Careful, the vessel will be hot! Craft $(thing)Wooden Tongs$() with two sticks and a knife and hold them in your off hand to handle the hot vessel safely."
     },
     {
       "type": "patchouli:image",

kubejs/server_scripts/create/tags.js

@@ -79,6 +79,8 @@ const registerCreateBlockTags = (event) => {
 
 	// Disable bulk blasting
 	event.removeAll('create:fan_processing_catalysts/blasting')
+
+	event.add('tfc:forge_invisible_whitelist', 'create:basin')
 }
 
 

kubejs/server_scripts/createdeco/recipes.js

@@ -47,6 +47,7 @@ const registerCreatedecoRecipes = (event) => {
 	event.remove({ id: 'createdeco:industrial_iron_bars' })
 	event.remove({ id: 'createdeco:zinc_bars_overlay' })
 	event.remove({ id: 'createdeco:zinc_bars' })
+	event.remove({ id: 'gtceu:assembler/bricks' })
 	event.remove({ type: 'minecraft:stonecutting', input: '#forge:storage_blocks/tin_alloy' })
 	event.remove({ type: 'minecraft:stonecutting', input: '#forge:storage_blocks/brass' })
 	event.remove({ type: 'minecraft:stonecutting', input: '#forge:storage_blocks/wrought_iron' })
@@ -130,6 +131,14 @@ const registerCreatedecoRecipes = (event) => {
 	const brickTypes = ['blue', 'verdant', 'pearl', 'dean', 'dusk', 'scarlet', 'umber']
 	const powderTypes = ['lapis_lazuli', 'malachite', 'soda_ash', 'limonite', 'charcoal', 'hematite', 'cassiterite']
 
+	event.recipes.gtceu.assembler(`assembler_bricks`)
+			.itemInputs('5x minecraft:brick')
+			.inputFluids(Fluid.of('gtceu:concrete', 144))
+			.itemOutputs(`4x minecraft:bricks`)
+			.duration(50)
+			.circuit(2)
+			.EUt(7)
+
 	brickTypes.forEach(type => {
 		event.remove({ output: `createdeco:${type}_bricks` });
 	});
@@ -295,4 +304,4 @@ const registerCreatedecoRecipes = (event) => {
 	})
 
 	// #endregion
-};
+};

kubejs/server_scripts/firmalife/recipes.js

@@ -79,6 +79,7 @@ const registerFirmaLifeRecipes = (event) => {
 		.itemInputs('tfc:jar_lid')
 		.outputFluids(Fluid.of('gtceu:tin', 9))
 		.duration(50)
+		.category(GTRecipeCategories.EXTRACTOR_RECYCLING)
 		.EUt(2)
 
 	event.recipes.gtceu.fluid_solidifier(`firmalife:firmalife/stainless_steel_jar_lid`)

kubejs/server_scripts/framed_blocks/recipes.js

@@ -81,32 +81,6 @@ const registerFramedBlocksRecipes = (event) => {
 	}).id('framedblocks:framing_saw/framed_pressure_plate')
 	//#endregion
 
-	//#region Framed Obsidian Pressure Plate
-	event.shaped('framedblocks:framed_obsidian_pressure_plate', [
-		'AA',
-		'BB'
-	], {
-		A: '#forge:plates/obsidian',
-		B: 'framedblocks:framed_cube'
-	}).id('framedblocks:framed_obsidian_pressure_plate')
-
-	event.custom({
-		type: "framedblocks:frame",
-		additives: [
-			{
-				count: 1,
-				ingredient: {
-					tag: "forge:plates/obsidian"
-				}
-			}
-		],
-		material: 1536,
-		result: {
-			item: "framedblocks:framed_obsidian_pressure_plate"
-		}
-	}).id('framedblocks:framing_saw/framed_obsidian_pressure_plate')
-	//#endregion
-
 	//#region Framed Gold Pressure Plate
 	event.shaped('framedblocks:framed_gold_pressure_plate', [
 		'AA',

kubejs/server_scripts/gregtech/utility.js

@@ -164,12 +164,12 @@ function generatePlatedBlockRecipe(event, material) {
 		.EUt(GTValues.VA[GTValues.LV])
 }
 
-const $MRM = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.IMaterialRegistryManager')
+//const $MRM = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.IMaterialRegistryManager')
 
 function forEachMaterial(iterator) {
-	if (GTMaterialRegistry.getPhase() === $MRM.Phase.CLOSED || GTMaterialRegistry.getPhase() === $MRM.Phase.FROZEN) {
+	//if (GTMaterialRegistry.getPhase() === $MRM.Phase.CLOSED || GTMaterialRegistry.getPhase() === $MRM.Phase.FROZEN) {
 		GTMaterialRegistry.getRegisteredMaterials().forEach(material => {
 			iterator(material)
 		})
-	}
+	//}
 }

kubejs/server_scripts/hotornot/recipes.js

@@ -1,5 +1,14 @@
 // priority: 0
 
 const registerHotOrNotRecipes = (event) => {
-    
+
+    event.shaped('tfchotornot:tongs/wood', [
+		'AB ',
+		'B  ',
+		'   '
+	], {
+		A: '#forge:tools/knives',
+		B: '#forge:rods/wooden'
+	}).id('tfchotornot:crafting/tongs/wood')
+
 }

kubejs/server_scripts/tfc/recipes.js

@@ -324,4 +324,13 @@ const registerTFCRecipes = (event) => {
 			.circuit(6)
 			.EUt(GTValues.VA[GTValues.ULV])
 	});
+
+	// Jar lids
+
+	event.shapeless('8x tfc:jar_lid', [
+		'gtceu:tin_ingot',
+		'#forge:tools/hammers',
+		'#forge:tools/saws'
+	]).id('tfc:shapeless/jar_lid')
+
 }

kubejs/server_scripts/tfg/tags.js

@@ -262,6 +262,15 @@ const registerTFGBlockTags = (event) => {
 	event.add('tfc:rock/hardened', 'tfg:rock/hardened_dripstone')
 
 	// #endregion
+
+	// #region Space blocks (TODO: undo these when merging space into dev!)
+
+	event.add('c:hidden_from_recipe_viewers', 'tfg:lunar_roots')
+	event.add('c:hidden_from_recipe_viewers', 'tfg:lunar_sprouts')
+	event.add('c:hidden_from_recipe_viewers', 'tfg:lunar_chorus_plant')
+	event.add('c:hidden_from_recipe_viewers', 'tfg:lunar_chorus_flower')
+
+	// #endregion
 }
 
 const registerTFGFluidTags = (event) => {

kubejs/startup_scripts/framedblocks/constants.js

@@ -2,5 +2,6 @@
 
 global.FRAMEDBLOCKS_DISABLED_ITEMS = [
     'framedblocks:framed_soul_torch',
-    'framedblocks:framed_torch'
+    'framedblocks:framed_torch',
+    'framedblocks:framed_obsidian_pressure_plate'
 ];