some fixes

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## [0.6.9]
+## [0.7.0]
 ### Changes
 - The option to disable coordinates and some information has been re-enabled because firmaCiv has finally introduced items for tracking latitude and longitude, which is intended for determining one's own location. You can still view your coordinates through the mini-map, but this functionality will be disabled in the future when Antique Atlas and Game Stages are added.
 - BetterF3 has been slightly configured.
@@ -20,6 +20,8 @@
 - Fixed oil output from tfc dirt -> biomass recipe (what??)
 - GTCEu bolts now can be used in FirmaCiv boats (Fix for new FirmaCiv ver).
 # Wip for now (required for update)
+- Colorizing of Create valves (in TFC barrels).
+- Colorizing of Create seats (in TFC barrels).
 - Added assembler recipes for a lot of TFC recipes.
 - Added assembler recipes for a lot of FirmaCiv items.
 - Vanilla glass bottles has been replaced with TFC bottles.

config/ftbquests/quests/chapters/primitive_age.snbt

@@ -4145,7 +4145,10 @@
 			y: -5.0d
 		}
 		{
-			dependencies: ["34ABDCB5BA778DE4"]
+			dependencies: [
+				"0A6AADCDD2A635EC"
+				"147911B5CA3A7DD8"
+			]
 			id: "314212B496B2D3C3"
 			tasks: [{
 				id: "2E70F72F0CE2CF36"
@@ -4192,8 +4195,8 @@
 				item: "minecraft:white_wool"
 				type: "item"
 			}]
-			x: 9.0d
-			y: -5.0d
+			x: 8.0d
+			y: -4.0d
 		}
 		{
 			dependencies: [
@@ -4349,21 +4352,6 @@
 			x: 9.0d
 			y: -9.5d
 		}
-		{
-			dependencies: [
-				"6BC4DB9BEE8E6640"
-				"6E24ECF6CEE950D1"
-			]
-			id: "34ABDCB5BA778DE4"
-			tasks: [{
-				count: 16L
-				id: "2579EAFE552BA628"
-				item: "minecraft:string"
-				type: "item"
-			}]
-			x: 12.0d
-			y: -3.0d
-		}
 		{
 			dependencies: ["4E37B4C1A68FFE59"]
 			id: "23E44778FCDE781A"
@@ -4527,11 +4515,11 @@
 					type: "item"
 				}
 			]
-			x: 13.5d
-			y: -9.5d
+			x: 14.0d
+			y: -6.5d
 		}
 		{
-			dependencies: ["314212B496B2D3C3"]
+			dependencies: ["665BC6BB76CE0EA3"]
 			id: "6F848650CAF10E9A"
 			tasks: [{
 				id: "4A9AB33FDB17322A"
@@ -4545,17 +4533,17 @@
 				title: "Any #minecraft:beds"
 				type: "item"
 			}]
-			x: 12.0d
-			y: -9.5d
+			x: 8.0d
+			y: -5.5d
 		}
 		{
 			dependencies: [
 				"6BC4DB9BEE8E6640"
-				"34ABDCB5BA778DE4"
 				"3D889F02ABAFEB85"
 			]
 			dependency_requirement: "one_completed"
 			id: "5D0B6CA6E0EB320B"
+			size: 1.5d
 			tasks: [
 				{
 					id: "786C737E1798C9E5"
@@ -4671,7 +4659,6 @@
 		{
 			dependencies: [
 				"42FD437930CA74C7"
-				"34ABDCB5BA778DE4"
 				"6BC4DB9BEE8E6640"
 			]
 			dependency_requirement: "one_completed"
@@ -4693,7 +4680,6 @@
 		{
 			dependencies: [
 				"42FD437930CA74C7"
-				"34ABDCB5BA778DE4"
 				"6BC4DB9BEE8E6640"
 			]
 			dependency_requirement: "one_completed"
@@ -4742,6 +4728,19 @@
 			x: 19.0d
 			y: -5.0d
 		}
+		{
+			dependencies: ["76EF4D00586A8B74"]
+			hide_dependency_lines: true
+			id: "0A6AADCDD2A635EC"
+			subtitle: "Kill the spiders!"
+			tasks: [{
+				id: "6218E98E7B9F86B6"
+				item: "minecraft:string"
+				type: "item"
+			}]
+			x: 12.0d
+			y: -9.5d
+		}
 	]
 	title: "Primitive Age"
 }

kubejs/server_scripts/minecraft/recipes.js

@@ -2414,29 +2414,6 @@ const registerMinecraftRecipes = (event) => {
 
     //#endregion
 
-    //#region Выход: Бетон
-
-    /*
-    global.MINECRAFT_DYE_NAMES.forEach(dye => {
-        
-        event.recipes.gtceu.chemical_bath(`${dye}_powder_to_${dye}_concrete`)             
-            .itemInputs(`minecraft:${dye}_concrete_powder`)
-            .inputFluids(Fluid.of('minecraft:water', 144))
-            .itemOutputs(`minecraft:${dye}_concrete`)
-            .duration(100)
-            .EUt(4)
-
-        if (dye != "white")
-            event.recipes.gtceu.chemical_bath(`${dye}_concrete`)             
-                .itemInputs(`minecraft:white_concrete`)
-                .inputFluids(Fluid.of(`gtceu:${dye}_dye`, 72))
-                .itemOutputs(`minecraft:${dye}_concrete`)
-                .duration(300)
-                .EUt(4)
-    })*/
-
-    //#endregion
-
     //#region Выход: Шерсть
 
     event.recipes.gtceu.assembler('wool_from_string')             
@@ -2446,52 +2423,30 @@ const registerMinecraftRecipes = (event) => {
         .duration(100)
         .EUt(4)
 
-    /*
+    
     global.MINECRAFT_DYE_NAMES.forEach(dye => {
-        
         event.remove({ id: `minecraft:dye_${dye}_wool` })
-
-        if (dye != 'white')
-        {
-            event.shapeless(`minecraft:${dye}_wool`, [
-                'minecraft:white_wool',
-                `#forge:dyes/${dye}`
-            ]).id(`tfg:create/shapeless/${dye}_wool`)
-
-            event.recipes.gtceu.chemical_bath(`${dye}_wool`)             
-                .itemInputs(`minecraft:white_wool`)
-                .inputFluids(Fluid.of(`gtceu:${dye}_dye`, 72))
-                .itemOutputs(`minecraft:${dye}_wool`)
-                .duration(300)
-                .EUt(4)
-        }
-            
-    })*/
+    })
 
     //#endregion
 
     //#region Выход: Ковры
 
-    /*
+    
     global.MINECRAFT_DYE_NAMES.forEach(dye => {
         
         event.remove({ id: `minecraft:dye_${dye}_carpet` })
 
         if (dye != 'white')
         {
-            event.shapeless(`minecraft:${dye}_carpet`, [
-                'minecraft:white_carpet',
-                `#forge:dyes/${dye}`
-            ]).id(`tfg:create/shapeless/${dye}_carpet`)
-
-            event.recipes.gtceu.chemical_bath(`${dye}_carpet`)             
+            event.recipes.gtceu.chemical_bath(`tfg:${dye}_carpet`)             
                 .itemInputs(`minecraft:white_carpet`)
                 .inputFluids(Fluid.of(`gtceu:${dye}_dye`, 72))
                 .itemOutputs(`minecraft:${dye}_carpet`)
                 .duration(300)
                 .EUt(4)
         }
-    })*/
+    })
 
     //#endregion
 
@@ -2505,7 +2460,7 @@ const registerMinecraftRecipes = (event) => {
         .EUt(4)
 
     global.MINECRAFT_DYE_NAMES.forEach(dye => {
-        event.remove({ id: `minecraft:dye_${dye}_bed` })
+        event.remove({ id: `minecraft:${dye}_bed` })
 
         if (dye != "white")
             event.recipes.gtceu.chemical_bath(`${dye}_bed`)