Merge remote-tracking branch 'origin/main'

# Conflicts: # src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e # src/generated/resources/data/create/tags/blocks/casing.json # src/generated/resources/data/create/tags/blocks/fan_transparent.json # src/generated/resources/data/create/tags/blocks/safe_nbt.json # src/generated/resources/data/create/tags/blocks/wrench_pickup.json # src/generated/resources/data/create/tags/items/casing.json # src/generated/resources/data/create/tags/items/contraption_controlled.json # src/generated/resources/data/create/tags/items/create_ingots.json # src/generated/resources/data/forge/tags/blocks/concrete.json # src/generated/resources/data/forge/tags/blocks/factory_floor.json # src/generated/resources/data/forge/tags/blocks/rebar_concrete.json # src/generated/resources/data/forge/tags/blocks/storage_blocks.json # src/generated/resources/data/forge/tags/blocks/storage_blocks/aluminum.json # src/generated/resources/data/forge/tags/blocks/storage_blocks/cast_iron.json # src/generated/resources/data/forge/tags/blocks/storage_blocks/steel.json # src/generated/resources/data/forge/tags/items/buckets/diesel.json # src/generated/resources/data/forge/tags/items/buckets/gasoline.json # src/generated/resources/data/forge/tags/items/buckets/kerosene.json # src/generated/resources/data/forge/tags/items/buckets/napalm.json # src/generated/resources/data/forge/tags/items/buckets/naphtha.json # src/generated/resources/data/forge/tags/items/buckets/plastic.json # src/generated/resources/data/forge/tags/items/concrete.json # src/generated/resources/data/forge/tags/items/dusts/coal_coke.json # src/generated/resources/data/forge/tags/items/factory_floor.json # src/generated/resources/data/forge/tags/items/ingots/aluminum.json # src/generated/resources/data/forge/tags/items/ingots/cast_iron.json # src/generated/resources/data/forge/tags/items/ingots/steel.json # src/generated/resources/data/forge/tags/items/rebar_concrete.json # src/generated/resources/data/forge/tags/items/storage_blocks.json # src/generated/resources/data/forge/tags/items/storage_blocks/aluminum.json # src/generated/resources/data/forge/tags/items/storage_blocks/cast_iron.json # src/generated/resources/data/forge/tags/items/storage_blocks/steel.json # src/generated/resources/data/minecraft/tags/blocks/azalea_root_replaceable.json # src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json # src/generated/resources/data/minecraft/tags/blocks/climbable.json # src/generated/resources/data/minecraft/tags/blocks/doors.json # src/generated/resources/data/minecraft/tags/blocks/dripstone_replaceable_blocks.json # src/generated/resources/data/minecraft/tags/blocks/lush_ground_replaceable.json # src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json # src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json # src/generated/resources/data/minecraft/tags/blocks/moss_replaceable.json # src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json # src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json # src/generated/resources/data/minecraft/tags/blocks/needs_stone_tool.json # src/generated/resources/data/minecraft/tags/blocks/slabs.json # src/generated/resources/data/minecraft/tags/blocks/stairs.json # src/generated/resources/data/minecraft/tags/blocks/walls.json # src/generated/resources/data/minecraft/tags/blocks/wooden_doors.json # src/generated/resources/data/minecraft/tags/items/doors.json # src/generated/resources/data/minecraft/tags/items/slabs.json # src/generated/resources/data/minecraft/tags/items/stairs.json # src/generated/resources/data/minecraft/tags/items/walls.json # src/generated/resources/data/quark/tags/blocks/non_double_door.json # src/main/resources/data/createindustry/recipes/coking/test_coking.json # src/main/resources/data/createindustry/recipes/coking/test_coking_aaaaa.json # src/main/resources/data/createindustry/recipes/distillation/naphtha.json # src/main/resources/data/createindustry/recipes/industrial_blasting/test_blast.json # src/main/resources/data/createindustry/recipes/industrial_blasting/test_blasting_aaaaa.json
2023-10-29 09:29:34 +01:00
parent 088da50702 bc70d270b7
commit 36cf52aa6c
7 changed files with 171 additions and 2 deletions
--- a/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e
+++ b/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e
@@ -1,2 +1,2 @@
-// 1.19.2	2023-10-28T23:43:34.6950741	Create: The Factory Must Grow's lang merger
-43b115bf54cb42493e329667e1ba2f20f7a4a23b assets/createindustry/lang/en_us.json
+// 1.19.2	2023-10-27T21:47:47.1044045	Create: The Factory Must Grow's lang merger
+95a719fd28dbeb2111aaa82df44727ab8847bb27 assets/tfmg/lang/en_us.json
--- a/src/main/resources/data/createindustry/recipes/casting/test_caasting.json
+++ b/src/main/resources/data/createindustry/recipes/casting/test_caasting.json
@@ -0,0 +1,22 @@
+{
+  "type": "createindustry:casting",
+  "ingredients": [
+    {
+      "fluid": "createindustry:heavy_oil",
+      "amount": 1
+    }
+  ],
+  "processingTime": 300,
+  "results": [
+    {
+      "count": 1,
+      "item": "createindustry:steel_ingot"
+    }
+  ,
+    {
+      "count": 1,
+      "item": "createindustry:steel_block"
+    }
+
+  ]
+}
--- a/src/main/resources/data/createindustry/recipes/casting/test_casting.json
+++ b/src/main/resources/data/createindustry/recipes/casting/test_casting.json
@@ -0,0 +1,22 @@
+{
+  "type": "createindustry:casting",
+  "ingredients": [
+    {
+      "fluid": "createindustry:gasoline",
+      "amount": 1
+    }
+  ],
+  "processingTime": 200,
+  "results": [
+    {
+      "count": 1,
+      "item": "createindustry:aluminum_ingot"
+    }
+  ,
+    {
+      "count": 1,
+      "item": "createindustry:aluminum_block"
+    }
+
+  ]
+}
--- a/src/main/resources/data/createindustry/recipes/distillation/heavy_oil.json
+++ b/src/main/resources/data/createindustry/recipes/distillation/heavy_oil.json
@@ -0,0 +1,35 @@
+{
+  "type": "createindustry:distillation",
+  "ingredients": [
+
+    {
+      "fluid": "createindustry:heavy_oil",
+      "nbt": {},
+      "amount": 90
+    }
+  ],
+  "results": [
+    {
+      "fluid": "createindustry:diesel",
+      "amount": 30
+    },
+    {
+      "fluid": "createindustry:lubrication_oil",
+      "amount": 30
+    },
+    {
+      "fluid": "createindustry:lubrication_oil",
+      "amount": 30
+    },
+    {
+      "item": "createindustry:steel_ingot"
+
+    },
+    {
+      "item": "minecraft:air"
+
+    }
+  ]
+
+
+}
--- a/src/main/resources/data/createindustry/recipes/fractional_distillation/heavy_oil.json
+++ b/src/main/resources/data/createindustry/recipes/fractional_distillation/heavy_oil.json
@@ -0,0 +1,39 @@
+{
+  "type": "createindustry:advanced_distillation",
+  "ingredients": [
+
+    {
+      "fluid": "createindustry:heavy_oil",
+      "nbt": {},
+      "amount": 90
+    }
+  ],
+  "results": [
+    {
+      "fluid": "createindustry:diesel",
+      "amount": 30
+    },
+    {
+      "fluid": "createindustry:lubrication_oil",
+      "amount": 30
+    },
+    {
+      "fluid": "createindustry:lubrication_oil",
+      "amount": 30
+    },
+    {
+      "fluid": "createindustry:lubrication_oil",
+      "amount": 30
+    },
+    {
+      "fluid": "createindustry:lubrication_oil",
+      "amount": 30
+    },
+    {
+      "fluid": "createindustry:lubrication_oil",
+      "amount": 30
+    }
+  ]
+
+
+}
--- a/src/main/resources/data/createindustry/recipes/fractional_distillation/naphtha.json
+++ b/src/main/resources/data/createindustry/recipes/fractional_distillation/naphtha.json
@@ -0,0 +1,32 @@
+{
+  "type": "createindustry:advanced_distillation",
+  "ingredients": [
+
+    {
+      "fluid": "createindustry:naphtha",
+      "nbt": {},
+      "amount": 9
+    }
+  ],
+  "results": [
+    {
+      "fluid": "createindustry:propylene",
+      "amount": 3
+    },
+    {
+      "fluid": "createindustry:ethylene",
+      "amount": 3
+    },
+    {
+      "fluid": "createindustry:ethylene",
+      "amount": 3
+    }
+  ,
+    {
+      "fluid": "createindustry:ethylene",
+      "amount": 3
+    }
+  ]
+
+
+}
--- a/src/main/resources/data/createindustry/recipes/fractional_distillation/sussy.json
+++ b/src/main/resources/data/createindustry/recipes/fractional_distillation/sussy.json
@@ -0,0 +1,19 @@
+{
+  "type": "createindustry:advanced_distillation",
+  "ingredients": [
+
+    {
+      "fluid": "createindustry:diesel",
+      "nbt": {},
+      "amount": 5
+    }
+  ],
+  "results": [
+    {
+      "fluid": "createindustry:propylene",
+      "amount": 3
+    }
+  ]
+
+
+}