Merge branch 'dev' into dev

Signed-off-by: Pyritie <pyritie@gmail.com>

kubejs/server_scripts/tfg/recipes.miscellaneous.js

@@ -372,4 +372,10 @@ function registerTFGMiscellaneousRecipes(event) {
             'minecraft:phantom_membrane',
             'tfc:spindle'
         ]).id('tfg:shapeless/phantom_thread'))
+  
+	// Universal Circuit
+	global.UNIVERSAL_CIRCUIT_TIERS.forEach(tier => {
+		event.shapeless(Item.of(`tfg:${tier}_universal_circuit`, 1),  [Ingredient.of([`#gtceu:circuits/${tier}`]).subtract([`tfg:${tier}_universal_circuit`])]
+			).id(`universal_circuits_${tier}`);
+	});
 }

kubejs/server_scripts/tfg/tags.js

@@ -119,6 +119,16 @@ const registerTFGItemTags = (event) => {
 		event.add('immersive_aircraft:upgrades', `tfg:${value}`);
 	})
 
+	// #endregion
+
+	// Universal Circuits
+
+		global.UNIVERSAL_CIRCUIT_TIERS.forEach(tier => {
+			event.add(`gtceu:circuits/${tier}`, `tfg:${tier}_universal_circuit`);
+			})
+
+	// #endregion
+
 	// #region 0.7.19 -> 0.9 conversion
 
 	event.add('c:hidden_from_recipe_viewers', 'treetap:tap')