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

kubejs/assets/tfg/lang/en_us.json

@@ -528,6 +528,7 @@
   "item.tfg.universal_compost_browns": "Brown Universal Compost",
   "item.tfg.universal_compost_greens": "Green Universal Compost",
   "item.tfg.etching_diamond_tip": "Etching Diamond Tip",
+  "item.tfg.glacian_wool": "Glacian Ram Wool",
   "material.tfg.latex": "Latex",
   "material.tfg.vulcanized_latex": "Vulcanized Latex",
   "material.tfg.fluix": "Fluix",

kubejs/assets/tfg/models/block/machines/hv_aqueous_accumulator.json

@@ -27,7 +27,7 @@
     },
     "recipe_logic_status=waiting": {
       "model": {
-        "parent": "tfg:block/casings/voltage/hv",
+        "parent": "gtceu:block/casings/voltage/hv",
         "textures": {
           "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front_active",
           "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_active_emissive",

kubejs/assets/tfg/models/block/machines/lv_aqueous_accumulator.json

@@ -27,7 +27,7 @@
     },
     "recipe_logic_status=waiting": {
       "model": {
-        "parent": "tfg:block/casings/voltage/lv",
+        "parent": "gtceu:block/casings/voltage/lv",
         "textures": {
           "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front_active",
           "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_active_emissive",

kubejs/assets/tfg/models/item/glacian_wool.json

@@ -0,0 +1,6 @@
+{
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "tfg:item/glacian_wool"
+	}
+}

kubejs/data/tfg/worldgen/placed_feature/venus/terrain/lava_delta.json

@@ -1,35 +1,37 @@
 {
-    "feature": "tfg:venus/terrain/lava_delta",
-    "placement": [
-		{
-			"type": "minecraft:count",
-			"count": 1
-		},
-		{
-			"type": "minecraft:rarity_filter",
-			"chance": 3
-		},
-		{
-			"type": "minecraft:height_range",
-			"height": {
-				"type": "minecraft:uniform",
-				"max_inclusive": {
-					"absolute": 200
-				},
-				"min_inclusive": {
-					"above_bottom": 54
-				}
-			}
-		},
-		{
-			"type": "minecraft:heightmap",
-            "heightmap": "WORLD_SURFACE"
-		},
-		{
-			"type": "minecraft:in_square"
-		},
-        {
-            "type": "minecraft:biome"
+  "feature": "tfg:venus/terrain/lava_delta",
+  "placement": [
+    {
+      "type": "minecraft:noise_based_count",
+      "noise_to_count_ratio": 1,
+      "noise_factor": 1,
+      "noise_offset": 3
+    },
+    {
+      "type": "minecraft:rarity_filter",
+      "chance": 3
+    },
+    {
+      "type": "minecraft:height_range",
+      "height": {
+        "type": "minecraft:uniform",
+        "max_inclusive": {
+          "absolute": 200
+        },
+        "min_inclusive": {
+          "above_bottom": 54
         }
-	]
+      }
+    },
+    {
+      "type": "minecraft:heightmap",
+      "heightmap": "WORLD_SURFACE"
+    },
+    {
+      "type": "minecraft:in_square"
+    },
+    {
+      "type": "minecraft:biome"
+    }
+  ]
 }

kubejs/server_scripts/ad_astra/recipes.js

@@ -269,7 +269,7 @@ const registerAdAstraRecipes = (event) => {
 		.itemInputs(
 			'gtceu:carbon_fiber_mesh',
 			'#forge:aerogels',
-			'tfc:wool'//replace with glacian wool
+			'tfg:glacian_wool'
 		)
 		.itemOutputs('2x tfg:better_space_suit_fabric')
 		.duration(20 * 5)

kubejs/server_scripts/afc/recipes.js

@@ -246,6 +246,21 @@ const registerAFCRecipes = (event) => {
 
 	//#endregion
 
+	//region gt sap processing
+	event.recipes.gtceu.fluid_heater('maple_sap_condense')
+		.inputFluids(Fluid.of('afc:maple_sap', 4000))
+		.outputFluids(Fluid.of('afc:maple_syrup', 100))
+		.duration(20*25)
+		.EUt(GTValues.VA[GTValues.ULV])
+	event.recipes.gtceu.fluid_heater('birch_sap_condense')
+		.inputFluids(Fluid.of('afc:birch_sap', 8000))
+		.outputFluids(Fluid.of('afc:birch_syrup', 100))
+		.duration(20*35)
+		.EUt(GTValues.VA[GTValues.ULV])
+	
+	
+	//endregion
+
 	event.recipes.gtceu.fluid_solidifier('maple_syrup')
 		.inputFluids(Fluid.of('afc:maple_syrup', 100))
 		.itemOutputs('afc:maple_sugar')

kubejs/server_scripts/tfg/recipes.miscellaneous.js

@@ -43,6 +43,13 @@ function registerTFGMiscellaneousRecipes(event) {
 	event.recipes.tfc.pot('tfc:powder/charcoal', Fluid.of('tfg:conifer_pitch', 1000), 1200, 300)
 		.itemOutput('tfg:conifer_rosin')
 		.id('tfg:pot/conifer_pitch_to_rosin')
+		
+	event.recipes.gtceu.fluid_solidifier('tfg:pitch_to_rosin')
+		.inputFluids(Fluid.of('tfg:conifer_pitch', 1000))
+		.itemInputs('tfc:powder/charcoal')
+		.itemOutputs('tfg:conifer_rosin')
+		.duration(20*24)
+		.EUt(GTValues.VA[GTValues.LV])
 
 	// Decorative Vases
 	global.MINECRAFT_DYE_NAMES.forEach(color => {

kubejs/startup_scripts/tfg/items.js

@@ -368,6 +368,7 @@ const registerTFGItems = (event) => {
 	event.create('tfg:elite_power_thruster')
 	
 	event.create('tfg:better_space_suit_fabric')
+	event.create('tfg:glacian_wool')
 	//endregion
 
 	//#region Universal compost items