Merge branch '0.5.0' into 143-integration-computercraft

kubejs/client_scripts/main_client_script.js

@@ -1,6 +1,6 @@
 // priority: 1
 
-REIEvents.hide('item', event => {
+JEIEvents.hideItems(event => {
     hideMinecraftStuff(event)
     hideTFCStuff(event)
     hideFirmaLifeStuff(event)
@@ -15,21 +15,16 @@ REIEvents.hide('item', event => {
     hideChiselAndBitsStuff(event)
 })
 
-REIEvents.groupEntries(event => {
-    groupGTCEUStuff(event)
-    groupTFCStuff(event)
-})
-
-REIEvents.removeCategories(event => {
+JEIEvents.removeCategories(event => {
     registerMinecraftCategories(event)
     registerGTCEUCategories(event)
     registerMoreRedCategories(event)
 })
 
-REIEvents.hide('fluid', event => {
+JEIEvents.hideFluids(event => {
     hideTFCFluids(event)
     hideFirmaLifeFluids(event)
 
     hideCreateFluids(event)
     hideCreateAdditionsFluids(event)
-})
+})

kubejs/client_scripts/mods/gtceu.js

@@ -7,6 +7,7 @@ const hideGTCEUStuff = (event) => {
 }
 
 const groupGTCEUStuff = (event) => {
+
     event.groupItemsByTag('tfg:rei_groups/dusts/pure', 'Pure Dusts', 'forge:pure_dusts')
     event.groupItemsByTag('tfg:rei_groups/dusts/impure', 'Impure Dusts', 'forge:impure_dusts')
     event.groupItemsByTag('tfg:rei_groups/dusts', 'Dusts', 'forge:dusts')
@@ -43,6 +44,7 @@ const groupGTCEUStuff = (event) => {
     event.groupItemsByTag('tfg:rei_groups/blocks/raw', 'Raw Material Blocks', 'forge:raw_blocks')
     event.groupItemsByTag('tfg:rei_groups/blocks/material_blocks', 'Material Blocks', 'forge:material_blocks')
     event.groupItemsByTag('tfg:rei_groups/blocks/frame', 'Frames', 'forge:frame_blocks')
+    
 
     event.groupItemsByTag('tfg:rei_groups/sword_heads', 'Sword Heads', 'forge:sword_heads')
     event.groupItemsByTag('tfg:rei_groups/butchery_knife_heads', 'Butchery Knife Heads', 'forge:butchery_knife_heads')
@@ -109,24 +111,32 @@ const groupGTCEUStuff = (event) => {
     event.groupItemsByTag('tfg:rei_groups/restrictive_pipes/large', 'Large Resctrictive Pipes', 'forge:restrictive_pipes/large')
     event.groupItemsByTag('tfg:rei_groups/restrictive_pipes/huge', 'Huge Resctrictive Pipes', 'forge:restrictive_pipes/huge')
 
-    event.groupItems("tfg:rei_groups/electric_furnace", "Electric Furnace", [/gtceu:.*_electric_furnace/,]);
-    event.groupItems("tfg:rei_groups/alloy_smelter", "Alloy Smelter", [/gtceu:.*_alloy_smelter/,]);
+
+    
+    event.groupItems("tfg:rei_groups/boiler", "Boiler", [/gtceu:.*_boiler/]);
+    event.groupItems("tfg:rei_groups/diode", "Diode", [/gtceu:(?!.*smd).*_diode/]);
+    event.groupItems("tfg:rei_groups/furnace", "Furnace", [/gtceu:(?!.*arc|.*blast).*_furnace/,]);
     event.groupItems("tfg:rei_groups/arc_furnace", "Arc Furnace", [/gtceu:.*_arc_furnace/,]);
-    event.groupItems("tfg:rei_groups/assembler", "Assembler", [/gtceu:.*_assembler/,]);
+    event.groupItems("tfg:rei_groups/centrifuge", "Centrifuge", [/gtceu:.(?!.*thermal).*_centrifuge/,]);
+    event.groupItems("tfg:rei_groups/thermal_centrifuge", "Thermal Centrifuge", [/gtceu:.*_thermal_centrifuge/,]);
+    event.groupItems("tfg:rei_groups/cutter", "Cutter", [/gtceu:(?!.*wire).*_cutter/,]);
+    event.groupItems("tfg:rei_groups/extruder", "Extruder", [/gtceu:.*_extruder(?!.*_mold)/,]);
+    event.groupItems("tfg:rei_groups/mixer", "Mixer", [/gtceu:(?!.*kinetic).*_mixer/,]);
+    event.groupItems("tfg:rei_groups/kinetic_mixer", "Kinetic Mixer", [/gtceu:.*_kinetic_mixer/,]);
+    event.groupItems("tfg:rei_groups/pump", "Pump", [/gtceu:(?!.*electric).*_pump/,]);
+    event.groupItems("tfg:rei_groups/alloy_smelter", "Alloy Smelter", [/gtceu:.*_alloy_smelter/,]);
+    event.groupItems("tfg:rei_groups/assembler", "Assembler", [/gtceu:.*_assembler$/,]);
     event.groupItems("tfg:rei_groups/autoclave", "Autoclave", [/gtceu:.*_autoclave/,]);
     event.groupItems("tfg:rei_groups/bender", "Bender", [/gtceu:.*_bender/,]);
     event.groupItems("tfg:rei_groups/brewery", "Brewery", [/gtceu:.*_brewery/,]);
     event.groupItems("tfg:rei_groups/canner", "Canner", [/gtceu:.*_canner/,]);
-    event.groupItems("tfg:rei_groups/centrifuge", "Centrifuge", [/gtceu:.*_centrifuge/,]);
     event.groupItems("tfg:rei_groups/chemical_bath", "Chemical Bath", [/gtceu:.*_chemical_bath/,]);
     event.groupItems("tfg:rei_groups/chemical_reactor", "Сhemical Reactor", [/gtceu:.*_chemical_reactor/,]);
     event.groupItems("tfg:rei_groups/compressor", "Compressor", [/gtceu:.*_compressor/,]);
-    event.groupItems("tfg:rei_groups/cutter", "Cutter", [/gtceu:.*_cutter/,]);
     event.groupItems("tfg:rei_groups/distillery", "Distillery", [/gtceu:.*_distillery/,]);
     event.groupItems("tfg:rei_groups/electrolyzer", "Electrolyzer", [/gtceu:.*_electrolyzer/,]);
     event.groupItems("tfg:rei_groups/electromagnetic_separator", "Electromagnetic Separator", [/gtceu:.*_electromagnetic_separator/,]);
     event.groupItems("tfg:rei_groups/extractor", "Extractor", [/gtceu:.*_extractor/,]);
-    event.groupItems("tfg:rei_groups/extruder", "Extruder", [/gtceu:.*_extruder/,]);
     event.groupItems("tfg:rei_groups/fermenter", "Fermenter", [/gtceu:.*_fermenter/,]);
     event.groupItems("tfg:rei_groups/laser_engraver", "Laser Engraver", [/gtceu:.*_laser_engraver/,]);
     event.groupItems("tfg:rei_groups/sifter", "Sifter", [/gtceu:.*_sifter/,]);
@@ -140,7 +150,6 @@ const groupGTCEUStuff = (event) => {
     event.groupItems("tfg:rei_groups/polarizer", "Polarizer", [/gtceu:.*_polarizer/,]);
     event.groupItems("tfg:rei_groups/packer", "Packer", [/gtceu:.*_packer/,]);
     event.groupItems("tfg:rei_groups/ore_washer", "Ore Washer", [/gtceu:.*_ore_washer/,]);
-    event.groupItems("tfg:rei_groups/mixer", "Mixer", [/gtceu:.*_mixer/,]);
     event.groupItems("tfg:rei_groups/lathe", "Lathe", [/gtceu:.*_lathe/,]);
     event.groupItems("tfg:rei_groups/forming_press", "Forming Press", [/gtceu:.*_forming_press/,]);
     event.groupItems("tfg:rei_groups/forge_hammer", "Forge Hammer", [/gtceu:.*_forge_hammer/,]);
@@ -152,21 +161,30 @@ const groupGTCEUStuff = (event) => {
     event.groupItems("tfg:rei_groups/super_tank", "Super Tankt", [/gtceu:.*_tank/,]);
     event.groupItems("tfg:rei_groups/crate", "Crate", [/gtceu:.*_crate/,]);
     event.groupItems("tfg:rei_groups/drum", "Drum", [/gtceu:.*_drum/,]);
-    event.groupItems("tfg:rei_groups/input_bus", "Input Bus", [/gtceu:.*_input_bus/,]);
-    event.groupItems("tfg:rei_groups/output_bus", "Output Bus", [/gtceu:.*_output_bus/,]);
-    event.groupItems("tfg:rei_groups/input_hatch", "Input Hatch", [/gtceu:.*_input_hatch/,]);
-    event.groupItems("tfg:rei_groups/output_hatch", "Output Hatch", [/gtceu:.*_output_hatch/,]);
-    event.groupItems("tfg:rei_groups/muffler_hatch", "Muffler Hatch", [/gtceu:.*_muffler_hatch/,]);
-    event.groupItems("tfg:rei_groups/energy_input_hatch", "Energy Input Hatch", [/gtceu:.*_energy_input_hatch/,]);
-    event.groupItems("tfg:rei_groups/energy_output_hatch", "Energy Output Hatch", [/gtceu:.*_energy_output_hatch/,]);
+    event.groupItems("tfg:rei_groups/input_bus", "Input Bus", [/gtceu:.*_input_bus$/,]);
+    event.groupItems("tfg:rei_groups/output_bus", "Output Bus", [/gtceu:.*_output_bus$/,]);
+    event.groupItems("tfg:rei_groups/input_hatch", "Input Hatch", [/gtceu:.(?!.*energy).*_input_hatch$/,]);
+    event.groupItems("tfg:rei_groups/output_hatch", "Output Hatch", [/gtceu:.(?!.*energy).*_output_hatch$/,]);
+    event.groupItems("tfg:rei_groups/input_hatch_4x", "Input Hatch 4x", [/gtceu:.(?!.*energy).*_input_hatch_4x/,]);
+    event.groupItems("tfg:rei_groups/output_hatch_4x", "Output Hatch 4x", [/gtceu:.(?!.*energy).*_output_hatch_4x/,]);
+    event.groupItems("tfg:rei_groups/input_hatch_9x", "Input Hatch 9x", [/gtceu:.(?!.*energy).*_input_hatch_9x/,]);
+    event.groupItems("tfg:rei_groups/output_hatch_9x", "Output Hatch 9x", [/gtceu:.(?!.*energy).*_output_hatch_9x/,]);
+    event.groupItems("tfg:rei_groups/muffler_hatch", "Muffler Hatch", [/gtceu:.*_muffler_hatch$/,]);
+    event.groupItems("tfg:rei_groups/energy_input_hatch", "Energy Input Hatch", [/gtceu:.*_energy_input_hatch$/,]);
+    event.groupItems("tfg:rei_groups/energy_output_hatch", "Energy Output Hatch", [/gtceu:.*_energy_output_hatch$/,]);
+    event.groupItems("tfg:rei_groups/energy_input_hatch_4a", "Energy Input Hatch 4a", [/gtceu:.*_energy_input_hatch_4a/,]);
+    event.groupItems("tfg:rei_groups/energy_output_hatch_4a", "Energy Output Hatch 4a", [/gtceu:.*_energy_output_hatch_4a/,]);
+    event.groupItems("tfg:rei_groups/energy_input_hatch_16a", "Energy Input Hatch 16a", [/gtceu:.*_energy_input_hatch_16a/,]);
+    event.groupItems("tfg:rei_groups/energy_output_hatch_16a", "Energy Output Hatch 16a", [/gtceu:.*_energy_output_hatch_16a/,]);
     event.groupItems("tfg:rei_groups/item_passthrough_hatch", "Item Passthrough Hatch", [/gtceu:.*_item_passthrough_hatch/,]);
     event.groupItems("tfg:rei_groups/fluid_passthrough_hatch", "Fluid Passthrough Hatch", [/gtceu:.*_fluid_passthrough_hatch/,]);
-    event.groupItems("tfg:rei_groups/diode", "diode", [/gtceu:.*_diode/,]);
+    event.groupItems("tfg:rei_groups/substation_input_hatch_64a", "Substation Input Hatch 64a", [/gtceu:.*substation_input_hatch_64a/,]);
+    event.groupItems("tfg:rei_groups/substation_output_hatch_64a", "Substation Output Hatch 64a", [/gtceu:.*_substation_output_hatch_64a/,]);
     event.groupItems("tfg:rei_groups/block_breaker", "Block Breaker", [/gtceu:.*_block_breaker/,]);
-    event.groupItems("tfg:rei_groups/pump", "Pump", [/gtceu:.*_pump/,]);
     event.groupItems("tfg:rei_groups/fisher", "Fisher", [/gtceu:.*_fisher/,]);
     event.groupItems("tfg:rei_groups/rotor_holder", "Rotor Holder", [/gtceu:.*_rotor_holder/,]);
     event.groupItems("tfg:rei_groups/miner", "Miner", [/gtceu:.*_miner/,]);
+    event.groupItems('tfg:rei_groups/firebox_casing', 'Firebox Casing', [/gtceu:.*_firebox_casing/]);
     event.groupItems("tfg:rei_groups/256a_laser_target_hatch", "256a Laser Target Hatch", [/gtceu:.*_256a_laser_target_hatch/,]);
     event.groupItems("tfg:rei_groups/256a_laser_source_hatch", "256a Laser Source Hatch", [/gtceu:.*_256a_laser_source_hatch/,]);
     event.groupItems("tfg:rei_groups/1024a_laser_target_hatch", "1024a Laser Target Hatch", [/gtceu:.*_1024a_laser_target_hatch/,]);
@@ -188,12 +206,14 @@ const groupGTCEUStuff = (event) => {
     event.groupItems("tfg:rei_groups/electric_gear_box_8a", "Electric Gear Box 8a", [/gtceu:.*_electric_gear_box_8a/,]);
     event.groupItems("tfg:rei_groups/electric_gear_box_16a", "Electric Gear Box 16a", [/gtceu:.*_electric_gear_box_16a/,]);
     event.groupItems("tfg:rei_groups/electric_gear_box_32a", "Electric Gear Box 32a", [/gtceu:.*electric_gear_box_32a/,]);
-    event.groupItems("tfg:rei_groups/kinetic_output_box", "kinetic Output Box", [/gtceu:.*_kinetic_output_box/,]);
-    event.groupItems("tfg:rei_groups/kinetic_input_box", "kinetic Input Box", [/gtceu:.*_kinetic_input_box/,]);
+    event.groupItems("tfg:rei_groups/kinetic_output_box", "Kinetic Output Box", [/gtceu:.*_kinetic_output_box/,]);
+    event.groupItems("tfg:rei_groups/kinetic_input_box", "Kinetic Input Box", [/gtceu:.*_kinetic_input_box/,]);
+    event.groupItems("tfg:rei_groups/parallel_hatch", "Parallel Hatch", [/gtceu:.*_parallel_hatch/,]);
+    event.groupItems("tfg:rei_groups/oxygen_spreader", "Oxygen Spreader", [/gcyr:.*oxygen_spreader/,]);
 
     event.groupItems("tfg:rei_groups/casting_mold", "Casting Mold", [/gtceu:.*_casting_mold/,]);
     event.groupItems("tfg:rei_groups/head_mold", "Head Mold", [/gtceu:.*_head_mold/,]);
-    event.groupItems("tfg:rei_groups/extruder_mold", "Extruder_mold", [/gtceu:.*_extruder_mold/,]);
+    event.groupItems("tfg:rei_groups/extruder_mold", "Extruder Mold", [/gtceu:.*_extruder_mold/,]);
     event.groupItems("tfg:rei_groups/electric_motor", "Electric Motor", [/gtceu:.*_electric_motor/,]);
     event.groupItems("tfg:rei_groups/fluid_regulator", "Fluid Regulator", [/gtceu:.*_fluid_regulator/,]);
     event.groupItems("tfg:rei_groups/conveyor_module", "Conveyor Module", [/gtceu:.*_conveyor_module/,]);
@@ -204,6 +224,15 @@ const groupGTCEUStuff = (event) => {
     event.groupItems("tfg:rei_groups/emitter", "Emitter", [/gtceu:.*_emitter/,]);
     event.groupItems("tfg:rei_groups/sensor", "Sensor", [/gtceu:.*_sensor/,]);
     event.groupItems("tfg:rei_groups/solar_panel", "Solar Panel", [/gtceu:.*_solar_panel/,]);
+    event.groupItems("tfg:rei_groups/credit", "Сredit", [/gtceu:.*_credit/,]);
+    
+    event.groupItems('tfg:rei_groups/coil_block', 'Coil Block', [/gtceu:.*_coil_block/]);
+    event.groupItems('tfg:rei_groups/machine_casing', 'Machine Casing', [/gtceu:.*_machine_casing/]);
+    event.groupItems('tfg:rei_groups/hermetic_casing', 'Hermetic Casin', [/gtceu:.*_hermetic_casing/]);
+    event.groupItems('tfg:rei_groups/pipe_casing', 'Pipe Casing', [/gtceu:.*_pipe_casing/]);
+    event.groupItems('tfg:rei_groups/gearbox', 'Gearbox', [/gtceu:.*_gearbox/]);
+    event.groupItems('tfg:rei_groups/turbine_casing', 'Turbine Casing', [/gtceu:.*_turbine_casing/]);
+    event.groupItems('tfg:rei_groups/firebox_casing', 'Firebox Casing', [/gtceu:.*_firebox_casing/]);
 
     event.groupItems('tfg:rei_groups/buckets', 'Buckets', [/gtceu:.*_bucket/]);
 }

kubejs/data/tfg/worldgen/configured_feature/vein/deep_magnetite.json

@@ -1,7 +1,7 @@
 {
   "type": "tfc:cluster_vein",
   "config": {
-    "rarity": 235,
+    "rarity": 205,
     "density": 0.3,
     "min_y": -64,
     "max_y": 30,

kubejs/data/tfg/worldgen/configured_feature/vein/deep_naquadah.json

@@ -1,7 +1,7 @@
 {
   "type": "tfc:cluster_vein",
   "config": {
-    "rarity": 380,
+    "rarity": 310,
     "density": 0.25,
     "min_y": -64,
     "max_y": -20,

kubejs/data/tfg/worldgen/configured_feature/vein/normal_beryllium.json

@@ -25,7 +25,11 @@
           },
           {
             "block": "gtceu:rhyolite_emerald_ore",
-            "weight": 65
+            "weight": 50
+          },
+          {
+            "block": "gtceu:rhyolite_thorium_ore",
+            "weight": 15
           }
         ]
       },
@@ -40,7 +44,11 @@
           },
           {
             "block": "gtceu:basalt_emerald_ore",
-            "weight": 65
+            "weight": 50
+          },
+          {
+            "block": "gtceu:basalt_thorium_ore",
+            "weight": 15
           }
         ]
       },
@@ -55,7 +63,11 @@
           },
           {
             "block": "gtceu:andesite_emerald_ore",
-            "weight": 65
+            "weight": 50
+          },
+          {
+            "block": "gtceu:andesite_thorium_ore",
+            "weight": 15
           }
         ]
       },
@@ -70,7 +82,11 @@
           },
           {
             "block": "gtceu:dacite_emerald_ore",
-            "weight": 65
+            "weight": 50
+          },
+          {
+            "block": "gtceu:dacite_thorium_ore",
+            "weight": 15
           }
         ]
       }

kubejs/data/tfg/worldgen/configured_feature/vein/normal_garnierite.json

@@ -15,7 +15,7 @@
         "with": [
           {
             "block": "gtceu:gabbro_garnierite_ore",
-            "weight": 40
+            "weight": 30
           },
           {
             "block": "gtceu:gabbro_nickel_ore",
@@ -27,7 +27,11 @@
           },
           {
             "block": "gtceu:gabbro_pentlandite_ore",
-            "weight": 30
+            "weight": 25
+          },
+          {
+            "block": "gtceu:gabbro_cobalt_ore",
+            "weight": 15
           }
         ]
       }

kubejs/data/tfg/worldgen/configured_feature/vein/normal_lubricant.json

@@ -15,11 +15,11 @@
         "with": [
           {
             "block": "gtceu:granite_soapstone_ore",
-            "weight": 35
+            "weight": 30
           },
           {
             "block": "gtceu:granite_talc_ore",
-            "weight": 25
+            "weight": 20
           },
           {
             "block": "gtceu:granite_glauconite_sand_ore",
@@ -28,6 +28,10 @@
           {
             "block": "gtceu:granite_pentlandite_ore",
             "weight": 15
+          },
+          {
+            "block": "gtceu:granite_trona_ore",
+            "weight": 10
           }
         ]
       },
@@ -38,11 +42,11 @@
         "with": [
           {
             "block": "gtceu:diorite_soapstone_ore",
-            "weight": 35
+            "weight": 30
           },
           {
             "block": "gtceu:diorite_talc_ore",
-            "weight": 25
+            "weight": 20
           },
           {
             "block": "gtceu:diorite_glauconite_sand_ore",
@@ -51,6 +55,10 @@
           {
             "block": "gtceu:diorite_pentlandite_ore",
             "weight": 15
+          },
+          {
+            "block": "gtceu:diorite_trona_ore",
+            "weight": 10
           }
         ]
       },
@@ -61,11 +69,11 @@
         "with": [
           {
             "block": "gtceu:gabbro_soapstone_ore",
-            "weight": 35
+            "weight": 30
           },
           {
             "block": "gtceu:gabbro_talc_ore",
-            "weight": 25
+            "weight": 20
           },
           {
             "block": "gtceu:gabbro_glauconite_sand_ore",
@@ -74,6 +82,10 @@
           {
             "block": "gtceu:gabbro_pentlandite_ore",
             "weight": 15
+          },
+          {
+            "block": "gtceu:gabbro_trona_ore",
+            "weight": 10
           }
         ]
       }

kubejs/data/tfg/worldgen/configured_feature/vein/normal_oilsands.json

@@ -0,0 +1,90 @@
+{
+  "type": "tfc:cluster_vein",
+  "config": {
+    "rarity": 170,
+    "density": 0.3,
+    "min_y": 20,
+    "max_y": 70,
+    "size": 55,
+    "random_name": "normal_oilsands",
+    "blocks": [
+      {
+        "replace": [
+          "tfc:rock/raw/shale"
+        ],
+        "with": [
+          {
+            "block": "gtceu:shale_oilsands_ore",
+            "weight": 100
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/claystone"
+        ],
+        "with": [
+          {
+            "block": "gtceu:claystone_oilsands_ore",
+            "weight": 100
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/limestone"
+        ],
+        "with": [
+          {
+            "block": "gtceu:limestone_oilsands_ore",
+            "weight": 100
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/conglomerate"
+        ],
+        "with": [
+          {
+            "block": "gtceu:conglomerate_oilsands_ore",
+            "weight": 100
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/dolomite"
+        ],
+        "with": [
+          {
+            "block": "gtceu:dolomite_oilsands_ore",
+            "weight": 100
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/chert"
+        ],
+        "with": [
+          {
+            "block": "gtceu:chert_oilsands_ore",
+            "weight": 100
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/chalk"
+        ],
+        "with": [
+          {
+            "block": "gtceu:chalk_oilsands_ore",
+            "weight": 100
+          }
+        ]
+      }
+    ]
+  }
+}

kubejs/data/tfg/worldgen/configured_feature/vein/normal_olivine.json

@@ -18,7 +18,7 @@
             "weight": 35
           },
           {
-            "block": "gtceu:rhyolite_magnetite_ore",
+            "block": "gtceu:rhyolite_magnesite_ore",
             "weight": 25
           },
           {
@@ -41,7 +41,7 @@
             "weight": 35
           },
           {
-            "block": "gtceu:basalt_magnetite_ore",
+            "block": "gtceu:basalt_magnesite_ore",
             "weight": 25
           },
           {
@@ -64,7 +64,7 @@
             "weight": 35
           },
           {
-            "block": "gtceu:andesite_magnetite_ore",
+            "block": "gtceu:andesite_magnesite_ore",
             "weight": 25
           },
           {
@@ -87,7 +87,7 @@
             "weight": 35
           },
           {
-            "block": "gtceu:dacite_magnetite_ore",
+            "block": "gtceu:dacite_magnesite_ore",
             "weight": 25
           },
           {
@@ -110,7 +110,7 @@
             "weight": 35
           },
           {
-            "block": "gtceu:granite_magnetite_ore",
+            "block": "gtceu:granite_magnesite_ore",
             "weight": 25
           },
           {
@@ -133,7 +133,7 @@
             "weight": 35
           },
           {
-            "block": "gtceu:diorite_magnetite_ore",
+            "block": "gtceu:diorite_magnesite_ore",
             "weight": 25
           },
           {
@@ -156,7 +156,7 @@
             "weight": 35
           },
           {
-            "block": "gtceu:gabbro_magnetite_ore",
+            "block": "gtceu:gabbro_magnesite_ore",
             "weight": 25
           },
           {

kubejs/data/tfg/worldgen/configured_feature/vein/normal_spodumene.json

@@ -0,0 +1,221 @@
+{
+  "type": "tfc:disc_vein",
+  "config": {
+    "rarity": 180,
+    "density": 0.375,
+    "min_y": 20,
+    "max_y": 60,
+    "size": 35,
+    "height": 6,
+    "random_name": "normal_spodumene",
+    "blocks": [
+      {
+        "replace": [
+          "tfc:rock/raw/granite"
+        ],
+        "with": [
+          {
+            "block": "gtceu:granite_rock_salt_ore",
+            "weight": 20
+          },
+          {
+            "block": "gtceu:granite_salt_ore",
+            "weight": 30
+          },
+          {
+            "block": "gtceu:granite_lepidolite_ore",
+            "weight": 15
+          },
+          {
+            "block": "gtceu:granite_spodumene_ore",
+            "weight": 35
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/diorite"
+        ],
+        "with": [
+          {
+            "block": "gtceu:diorite_rock_salt_ore",
+            "weight": 20
+          },
+          {
+            "block": "gtceu:diorite_salt_ore",
+            "weight": 30
+          },
+          {
+            "block": "gtceu:diorite_lepidolite_ore",
+            "weight": 15
+          },
+          {
+            "block": "gtceu:diorite_spodumene_ore",
+            "weight": 35
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/gabbro"
+        ],
+        "with": [
+          {
+            "block": "gtceu:gabbro_rock_salt_ore",
+            "weight": 20
+          },
+          {
+            "block": "gtceu:gabbro_salt_ore",
+            "weight": 30
+          },
+          {
+            "block": "gtceu:gabbro_lepidolite_ore",
+            "weight": 15
+          },
+          {
+            "block": "gtceu:gabbro_spodumene_ore",
+            "weight": 35
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/quartzite"
+        ],
+        "with": [
+          {
+            "block": "gtceu:quartzite_rock_salt_ore",
+            "weight": 20
+          },
+          {
+            "block": "gtceu:quartzite_salt_ore",
+            "weight": 30
+          },
+          {
+            "block": "gtceu:quartzite_lepidolite_ore",
+            "weight": 15
+          },
+          {
+            "block": "gtceu:quartzite_spodumene_ore",
+            "weight": 35
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/slate"
+        ],
+        "with": [
+          {
+            "block": "gtceu:slate_rock_salt_ore",
+            "weight": 20
+          },
+          {
+            "block": "gtceu:slate_salt_ore",
+            "weight": 30
+          },
+          {
+            "block": "gtceu:slate_lepidolite_ore",
+            "weight": 15
+          },
+          {
+            "block": "gtceu:slate_spodumene_ore",
+            "weight": 35
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/phyllite"
+        ],
+        "with": [
+          {
+            "block": "gtceu:phyllite_rock_salt_ore",
+            "weight": 20
+          },
+          {
+            "block": "gtceu:phyllite_salt_ore",
+            "weight": 30
+          },
+          {
+            "block": "gtceu:phyllite_lepidolite_ore",
+            "weight": 15
+          },
+          {
+            "block": "gtceu:phyllite_spodumene_ore",
+            "weight": 35
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/schist"
+        ],
+        "with": [
+          {
+            "block": "gtceu:schist_rock_salt_ore",
+            "weight": 20
+          },
+          {
+            "block": "gtceu:schist_salt_ore",
+            "weight": 30
+          },
+          {
+            "block": "gtceu:schist_lepidolite_ore",
+            "weight": 15
+          },
+          {
+            "block": "gtceu:schist_spodumene_ore",
+            "weight": 35
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/gneiss"
+        ],
+        "with": [
+          {
+            "block": "gtceu:gneiss_rock_salt_ore",
+            "weight": 20
+          },
+          {
+            "block": "gtceu:gneiss_salt_ore",
+            "weight": 30
+          },
+          {
+            "block": "gtceu:gneiss_lepidolite_ore",
+            "weight": 15
+          },
+          {
+            "block": "gtceu:gneiss_spodumene_ore",
+            "weight": 35
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/marble"
+        ],
+        "with": [
+          {
+            "block": "gtceu:marble_rock_salt_ore",
+            "weight": 20
+          },
+          {
+            "block": "gtceu:marble_salt_ore",
+            "weight": 30
+          },
+          {
+            "block": "gtceu:marble_lepidolite_ore",
+            "weight": 15
+          },
+          {
+            "block": "gtceu:marble_spodumene_ore",
+            "weight": 35
+          }
+        ]
+      }
+    ]
+  }
+}

kubejs/data/tfg/worldgen/configured_feature/vein/surface_copper.json

@@ -15,7 +15,7 @@
         "with": [
           {
             "block": "gtceu:rhyolite_chalcopyrite_ore",
-            "weight": 70
+            "weight": 55
           },
           {
             "block": "gtceu:rhyolite_zeolite_ore",
@@ -24,6 +24,10 @@
           {
             "block": "gtceu:rhyolite_cassiterite_ore",
             "weight": 5
+          },
+          {
+            "block": "gtceu:rhyolite_realgar_ore",
+            "weight": 15
           }
         ]
       },
@@ -34,7 +38,7 @@
         "with": [
           {
             "block": "gtceu:basalt_chalcopyrite_ore",
-            "weight": 70
+            "weight": 55
           },
           {
             "block": "gtceu:basalt_zeolite_ore",
@@ -43,6 +47,10 @@
           {
             "block": "gtceu:basalt_cassiterite_ore",
             "weight": 5
+          },
+          {
+            "block": "gtceu:basalt_realgar_ore",
+            "weight": 15
           }
         ]
       },
@@ -53,7 +61,7 @@
         "with": [
           {
             "block": "gtceu:andesite_chalcopyrite_ore",
-            "weight": 70
+            "weight": 55
           },
           {
             "block": "gtceu:andesite_zeolite_ore",
@@ -62,6 +70,10 @@
           {
             "block": "gtceu:andesite_cassiterite_ore",
             "weight": 5
+          },
+          {
+            "block": "gtceu:andesite_realgar_ore",
+            "weight": 15
           }
         ]
       },
@@ -72,7 +84,7 @@
         "with": [
           {
             "block": "gtceu:dacite_chalcopyrite_ore",
-            "weight": 70
+            "weight": 55
           },
           {
             "block": "gtceu:dacite_zeolite_ore",
@@ -81,6 +93,10 @@
           {
             "block": "gtceu:dacite_cassiterite_ore",
             "weight": 5
+          },
+          {
+            "block": "gtceu:dacite_realgar_ore",
+            "weight": 15
           }
         ]
       }

kubejs/data/tfg/worldgen/placed_feature/vein/normal_oilsands.json

@@ -0,0 +1,4 @@
+{
+  "feature": "tfg:vein/normal_oilsands",
+  "placement": []
+}

kubejs/data/tfg/worldgen/placed_feature/vein/normal_spodumene.json

@@ -0,0 +1,4 @@
+{
+  "feature": "tfg:vein/normal_spodumene",
+  "placement": []
+}

kubejs/server_scripts/ae2/recipes.js

@@ -190,7 +190,7 @@ const registerAE2Recipes = (event) => {
         'FEF'
     ], {
         A: 'ae2:wireless_receiver',
-        B: 'ae2:crafting_terminal',
+        B: 'ae2:terminal',
         C: 'ae2:engineering_processor',
         D: '#forge:circuits/hv',
         E: 'gtceu:hv_lithium_battery',

kubejs/server_scripts/ae2wtlib/recipes.js

@@ -13,7 +13,7 @@ const registerAE2WTLibRecipes = (event) => {
     // Wireless Pattern Terminal
     event.recipes.gtceu.assembler('ae2wtlib:wireless_pattern_encoding_terminal')
         .itemInputs(
-            '2x ae2:dense_energy_cell',
+            '2x gtceu:hv_lithium_battery',
             'ae2:wireless_terminal',
             'ae2:pattern_encoding_terminal',
             '2x gtceu:luv_sensor',
@@ -27,7 +27,7 @@ const registerAE2WTLibRecipes = (event) => {
     // Pattern Access Terminal
     event.recipes.gtceu.assembler('ae2wtlib:wireless_pattern_access_terminal')
         .itemInputs(
-            '2x ae2:dense_energy_cell',
+            '2x gtceu:hv_lithium_battery',
             'ae2:wireless_terminal',
             'ae2:pattern_access_terminal',
             '2x gtceu:luv_sensor',

kubejs/server_scripts/chisel_and_bits/recipes.js

@@ -101,7 +101,6 @@ const registerChiselAndBitsRecipes = (event) => {
         C: '#forge:smooth_stone_slab'
     }).id('tfg:chiselsandbits/shaped/pattern_scanner')
 
-
     // Удалятель герметика
     event.shaped('chiselsandbits:wrench', [
         ' AB', 

kubejs/server_scripts/create/recipes.js

@@ -44,8 +44,8 @@ const registerCreateRecipes = (event) => {
         { id: 'create:crafting/kinetics/track_signal' },
         { id: 'create:crafting/kinetics/track_observer' },
         { id: 'create:crafting/kinetics/controls' },
-        { id: 'create:crafting/kinetics/content_observer' },
-        { id: 'create:crafting/kinetics/stockpile_switch' },
+        { id: 'create:crafting/logistics/content_observer' },
+        { id: 'create:crafting/logistics/stockpile_switch' },
         { id: 'create:crafting/logistics/display_link' },
         { id: 'create:crafting/kinetics/nixie_tube' },
         { id: 'create:crafting/logistics/redstone_link' },
@@ -90,6 +90,9 @@ const registerCreateRecipes = (event) => {
         { id: 'create:crafting/kinetics/red_seat' },
         { id: 'create:crafting/kinetics/black_seat' },
         { id: 'create:compat/ae2/mixing/fluix_crystal' },
+        { id: 'create:sequenced_assembly/precision_mechanism' },
+        { id: 'create:crafting/logistics/content_observer' },
+        { id: 'create:milling/bone' },
     ], mod: 'create' })
 
     // Пушка для постройки схематик
@@ -188,7 +191,7 @@ const registerCreateRecipes = (event) => {
     event.recipes.createMechanicalCrafting('2x create:crushing_wheel', [
         ' AAA ',
         'AABAA',
-        'ABCBC',
+        'ABCBA',
         'AABAA',
         ' AAA '
     ], {
@@ -685,12 +688,12 @@ const registerCreateRecipes = (event) => {
     ], {
         A: '#forge:chests/wooden',
         B: '#forge:sheets/wrought_iron',
-        C: '#forge:screw/wrought_iron',
+        C: '#forge:screw/steel',
         D: '#forge:tools/screwdrivers'
     }).id('tfg:create/shaped/item_vault')
 
     event.recipes.gtceu.assembler('tfg:create/item_vault')             
-        .itemInputs('3x #forge:chests/wooden', '#forge:sheets/wrought_iron', '2x #forge:screw/wrought_iron')
+        .itemInputs('3x #forge:chests/wooden', '#forge:sheets/wrought_iron', '2x #forge:screw/steel')
         .circuit(3)
         .itemOutputs('create:item_vault')
         .duration(200)
@@ -1068,6 +1071,22 @@ const registerCreateRecipes = (event) => {
         .duration(100)
         .EUt(4)
 
+    // Ремень
+    event.recipes.tfc.knapping('create:belt_connector', 'tfc:leather', [
+        " XXX ",
+        " XXX ",
+        " XXX ",
+        " XXX ",
+        " XXX ",
+    ]).ingredient('#tfc:leather_knapping').id('tfg:create/shaped/belt_connector')
+
+    event.recipes.gtceu.assembler('tfg:create/belt_connector')             
+        .itemInputs('minecraft:leather')
+        .circuit(2)
+        .itemOutputs('create:belt_connector')
+        .duration(25)
+        .EUt(16)
+        
     //#region Покраска ручек от люка
 
     event.recipes.gtceu.chemical_bath(`create/valve_handle_decolor`)             
@@ -1120,4 +1139,6 @@ const registerCreateRecipes = (event) => {
                 .duration(300)
                 .EUt(4)
     })
+
+    //#endregion
 }

kubejs/server_scripts/create/tags.js

@@ -13,3 +13,8 @@ const registerCreateItemTags = (event) => {
         if (dye != 'white') event.add('tfg:colored_seats', `create:${dye}_seat`)
     })
 }
+
+const registerCreateFluidTags = (event) => {
+    event.add('create:bottomless/allow', 'tfc:fresh_water')
+    event.add('create:bottomless/allow', 'tfc:salt_water')
+}

kubejs/server_scripts/gregtech/loot.js

@@ -8,9 +8,9 @@ const registerGTCEULoots = (event) => {
                 event.addBlockLootModifier(`gtceu:${stoneType}_${material}_ore`)
                     .removeLoot(Ingredient.all)
                     .addWeightedLoot([
-                        Item.of(`gtceu:rich_raw_${material}`).withChance(20),
-                        Item.of(`gtceu:raw_${material}`).withChance(60),
-                        Item.of(`gtceu:poor_raw_${material}`).withChance(20)
+                        Item.of(`#forge:rich_raw_materials/${material}`).withChance(0.2),
+                        Item.of(`#forge:raw_materials/${material}`).withChance(0.6),
+                        Item.of(`#forge:poor_raw_materials/${material}`).withChance(0.2)
                     ]);
             }
         })

kubejs/server_scripts/gregtech/recipes.js

@@ -1,6 +1,8 @@
 // priority: 0
 
 const $MaterialFlags = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags')
+const $TFGMaterialFlags = Java.loadClass('su.terrafirmagreg.core.compat.gtceu.TFGMaterialFlags')
+const $ToolHelper = Java.loadClass('com.gregtechceu.gtceu.api.item.tool.ToolHelper')
 
 const registerGTCEURecipes = (event) => {
     
@@ -962,6 +964,95 @@ const registerGTCEURecipes = (event) => {
 
     //#endregion
 
+    //#region Выход: Стальные машины
+
+    // Экстрактор
+    event.shaped('gtceu:hp_steam_extractor', [
+        'BEB',
+        'CAC',
+        'DBD'
+    ], {
+        A: 'gtceu:steel_brick_casing',
+        B: '#forge:fluid_pipes/small/tin_alloy',
+        C: '#forge:plates/steel',
+        D: '#forge:plates/wrought_iron',
+        E: '#forge:glass_panes'
+    }).id('gtceu:shaped/steam_extractor_steel')
+
+    // Дробитель
+    event.shaped('gtceu:hp_steam_macerator', [
+        'CCC',
+        'BAB',
+        'DDD'
+    ], {
+        A: 'gtceu:steel_brick_casing',
+        B: '#forge:fluid_pipes/small/tin_alloy',
+        C: '#forge:plates/steel',
+        D: '#forge:plates/wrought_iron'
+    }).id('gtceu:shaped/steam_macerator_steel')
+
+    // Компрессор
+    event.shaped('gtceu:hp_steam_compressor', [
+        'BCB',
+        'DAD',
+        'BBB'
+    ], {
+        A: 'gtceu:steel_brick_casing',
+        B: '#forge:fluid_pipes/small/tin_alloy',
+        C: '#forge:plates/steel',
+        D: '#forge:plates/wrought_iron'
+    }).id('gtceu:shaped/steam_compressor_steel')
+
+    // Молот
+    event.shaped('gtceu:hp_steam_forge_hammer', [
+        'DDD',
+        'BAB',
+        'CCC'
+    ], {
+        A: 'gtceu:steel_brick_casing',
+        B: '#forge:fluid_pipes/small/tin_alloy',
+        C: '#forge:plates/steel',
+        D: '#forge:plates/wrought_iron'
+    }).id('gtceu:shaped/steam_hammer_steel')
+
+    // Печь
+    event.shaped('gtceu:hp_steam_furnace', [
+        'BCB',
+        'DAD',
+        'BCB'
+    ], {
+        A: 'gtceu:steel_brick_casing',
+        B: '#forge:fluid_pipes/small/tin_alloy',
+        C: '#forge:plates/steel',
+        D: '#forge:plates/wrought_iron'
+    }).id('gtceu:shaped/steam_furnace_steel')
+
+    // Сплавщик
+    event.shaped('gtceu:hp_steam_alloy_smelter', [
+        'DCD',
+        'DAD',
+        'DBD'
+    ], {
+        A: 'gtceu:steel_brick_casing',
+        B: '#forge:fluid_pipes/small/tin_alloy',
+        C: '#forge:plates/steel',
+        D: '#forge:plates/wrought_iron'
+    }).id('gtceu:shaped/steam_alloy_smelter_steel')
+
+    // Блоко-ломатель
+    event.shaped('gtceu:hp_steam_rock_crusher', [
+        'DCD',
+        'BAB',
+        'DDD'
+    ], {
+        A: 'gtceu:steel_brick_casing',
+        B: '#forge:fluid_pipes/small/tin_alloy',
+        C: '#forge:plates/steel',
+        D: '#forge:plates/wrought_iron'
+    }).id('gtceu:shaped/steam_rock_breaker_steel')
+
+    //#endregion
+
     // Удаление рецептов связанных с Primitive Blast Furnace
     event.remove({id: 'gtceu:arc_furnace/arc_primitive_blast_furnace'})
     event.remove({id: 'gtceu:macerator/macerate_primitive_blast_furnace'})
@@ -1169,6 +1260,26 @@ const registerGTCEURecipes = (event) => {
     //#region Рецепты, которые итерируются по всем материалам
 
     GTRegistries.MATERIALS.forEach(material => {
+        
+        //#region Рецепты инструментов
+        
+        if (material.hasFlag($TFGMaterialFlags.HAS_TFC_TOOL)) {
+            global.GTCEU_ANVIL_TOOL_TYPES.forEach(toolType => {
+                let toolStack = $ToolHelper.get(toolType, material)
+    
+                event.recipes.tfc.advanced_shaped_crafting(TFC.itemStackProvider.of(toolStack).copyForgingBonus(), [
+                    'A',
+                    'B'
+                ], {
+                    A: `gtceu:${material}_${toolType.name}_head`,
+                    B: '#forge:rods/wooden'
+                }, 0, 0).id(`gtceu:shaped/${toolType.name}_${material}`)
+    
+            })
+        }
+    
+        //#endregion
+
         if (material.hasProperty(PropertyKey.ORE)) 
         {
             // Бедная сырая руда -> Дробленная руда + Дробленная руда (30%)
@@ -1187,8 +1298,16 @@ const registerGTCEURecipes = (event) => {
                 .id(`tfg:crushing/${material}_crushed_ore_from_rich_raw_ore`)
 
             // Грязная пыль -> Пыль (90%)
-            event.recipes.createSplashing(Item.of(`gtceu:${material}_dust`).withChance(0.9), `gtceu:${material}_impure_dust`)
-                .id(`tfg:splashing/${material}_dust`)
+            event.recipes.createSplashing(Item.of(`#forge:dusts/${material}`).withChance(0.9), `gtceu:${material}_impure_dust`)
+                .id(`tfg:splashing/${material}_dust_from_impure`)
+
+            // Очищенная пыль -> Пыль (90%)
+            event.recipes.createSplashing(Item.of(`#forge:dusts/${material}`).withChance(0.9), `gtceu:${material}_pure_dust`)
+                .id(`tfg:splashing/${material}_dust_from_pure`)
+
+            // Дробленная руда -> Очищенная руда (90%)
+            event.recipes.createSplashing(Item.of(`#forge:purified_ores/${material}`).withChance(0.9), `gtceu:${material}_crushed_ore`)
+                .id(`tfg:splashing/${material}_purified_ore`)
 
             // Грязная пыль -> Пыль
             event.custom({
@@ -1203,7 +1322,37 @@ const registerGTCEURecipes = (event) => {
                     }
                 ],
                 result: Item.of(`#forge:dusts/${material}`).toJson()
-            }).id(`tfg:ae_transform/${material}_dust`)
+            }).id(`tfg:ae_transform/${material}_dust_from_impure`)
+
+            // Очищенная пыль -> Пыль
+            event.custom({
+                type: "ae2:transform",
+                circumstance: {
+                    type: "fluid",
+                    tag: "minecraft:water"
+                },
+                ingredients: [
+                    {
+                        item: `gtceu:${material}_pure_dust`
+                    }
+                ],
+                result: Item.of(`#forge:dusts/${material}`).toJson()
+            }).id(`tfg:ae_transform/${material}_dust_from_pure`)
+
+            // Дробленная руда -> Очищенная руда
+            event.custom({
+                type: "ae2:transform",
+                circumstance: {
+                    type: "fluid",
+                    tag: "minecraft:water"
+                },
+                ingredients: [
+                    {
+                        item: `gtceu:${material}_crushed_ore`
+                    }
+                ],
+                result: Item.of(`#forge:purified_ores/${material}`).toJson()
+            }).id(`tfg:ae_transform/${material}_purified_ore`)
         }
 
         if (material.hasFlag($MaterialFlags.GENERATE_PLATE) && material != 'wood') 

kubejs/server_scripts/main_server_script.js

@@ -36,6 +36,7 @@ ServerEvents.tags('block', event => {
  */
 ServerEvents.tags('fluid', event => {
     registerTFCFluidTags(event)
+    registerCreateFluidTags(event)
 })
 
 /**
@@ -102,13 +103,6 @@ ServerEvents.recipes(event => {
     registerChiselAndBitsRecipes(event)
 })
 
-/**
- * Событие регистрации рудных жил.
- */
-GTCEuServerEvents.oreVeins(event => {
-    event.removeAll()
-})
-
 /**
  * Событие регистрации лут-тейблов.
  */
@@ -116,28 +110,9 @@ LootJS.modifiers((event) => {
     registerGTCEULoots(event)
 });
 
-//#endregion
-
-/*
-
-// 
-event.shaped('', [
-    'AAA',
-    'AAA',
-    'AAA' 
-], {
-    A: '',
-    B: '',
-    C: '',
-    D: '',
-    E: '',
-    F: '',
-    G: '',
-}).id('tfg:create/shaped/')
-
-//
-event.shapeless('', [
-    
-]).id('tfg:create/shapeless/')
-
-*/
+/**
+ * Событие регистрации рудных жил.
+ */
+GTCEuServerEvents.oreVeins(event => {
+    event.removeAll()
+})

kubejs/server_scripts/minecraft/recipes.js

@@ -2573,6 +2573,16 @@ const registerMinecraftRecipes = (event) => {
 
     //#endregion
 
+    //#region Выход: Незер бревна
+
+    event.remove({ id: 'minecraft:stripped_crimson_stem_via_vanilla_stripping' })
+    event.remove({ id: 'minecraft:stripped_crimson_hyphae_via_vanilla_stripping' })
+
+    event.remove({ id: 'minecraft:stripped_warped_stem_via_vanilla_stripping' })
+    event.remove({ id: 'minecraft:stripped_warped_hyphae_via_vanilla_stripping' })
+
+    //#endregion
+
     //#region Исправление дерьма с медью (Однажды разраб GTCEu вспомнит, лучше бы забыл)
 
     event.smelting('tfc:metal/ingot/copper', 'minecraft:raw_copper')

kubejs/server_scripts/tfc/recipes.js

@@ -206,23 +206,31 @@ const registerTFCRecipes = (event) => {
             // Стержень -> Кольцо
             // Возможно, когда нибудь, когда они пригодятся
 
+            // Длинный стержень -> Металл
+            event.recipes.tfc.heating(`gtceu:${metal}_long_rod`, metalSpecs.melt_temp)
+                .resultFluid(Fluid.of(metalSpecs.output_fluid, 144))
+                .id(`tfc:heating/metal/${metal}_long_rod`)
+
+            // Стержни -> Длинный стержень
+            event.recipes.tfc.welding(`gtceu:${metal}_long_rod`, `#forge:rods/${metal}`, `#forge:rods/${metal}`)
+                .tier(metalSpecs.tier)
+                .id(`tfc:anvil/${metal}_long_rod`)
+
             // Болт -> Металл
             event.recipes.tfc.heating(`gtceu:${metal}_bolt`, metalSpecs.melt_temp)
                 .resultFluid(Fluid.of(metalSpecs.output_fluid, 36))
                 .id(`tfc:heating/metal/${metal}_bolt`)
 
+            // Стержень -> Болт
             event.recipes.tfc.anvil(`2x gtceu:${metal}_bolt`, `#forge:rods/${metal}`, ['punch_last', 'draw_second_last', 'draw_third_last'])
                 .tier(metalSpecs.tier)
                 .id(`tfc:anvil/${metal}_bolt`)
 
-            // Стержень -> Болт
-
             // Винт -> Металл
             event.recipes.tfc.heating(`gtceu:${metal}_screw`, metalSpecs.melt_temp)
                 .resultFluid(Fluid.of(metalSpecs.output_fluid, 72))
                 .id(`tfc:heating/metal/${metal}_screw`)
 
-
             // Стержень -> Винт
             event.recipes.tfc.anvil(`gtceu:${metal}_screw`, `#forge:rods/${metal}`, ['punch_last', 'punch_second_last', 'shrink_third_last'])
                 .tier(metalSpecs.tier)
@@ -618,6 +626,48 @@ const registerTFCRecipes = (event) => {
 
             //#endregion
 
+            //#region Молот шахтера
+
+            // Декрафт инструмента в жидкость
+            event.recipes.tfc.heating(`gtceu:${metal}_mining_hammer`, metalSpecs.melt_temp)
+                .resultFluid(Fluid.of(metalSpecs.output_fluid, 288))
+                .useDurability(true)
+                .id(`tfc:heating/metal/${metal}_mining_hammer`)
+
+            // Крафт оголовья
+            event.recipes.tfc.anvil(`gtceu:${metal}_mining_hammer_head`, `#forge:double_ingots/${metal}`, ['punch_last', 'shrink_not_last'])
+                .tier(metalSpecs.tier)
+                .bonus(true)
+                .id(`tfc:anvil/${metal}_mining_hammer_head`)
+
+            // Декрафт оголовья в жидкость
+            event.recipes.tfc.heating(`gtceu:${metal}_mining_hammer_head`, metalSpecs.melt_temp)
+                .resultFluid(Fluid.of(metalSpecs.output_fluid, 288))
+                .id(`tfc:heating/metal/${metal}_mining_hammer_head`)
+
+            //#endregion
+
+            //#region Большая лопата
+            
+            // Декрафт инструмента в жидкость
+            event.recipes.tfc.heating(`gtceu:${metal}_spade`, metalSpecs.melt_temp)
+                .resultFluid(Fluid.of(metalSpecs.output_fluid, 288))
+                .useDurability(true)
+                .id(`tfc:heating/metal/${metal}_spade`)
+
+            // Крафт оголовья
+            event.recipes.tfc.anvil(`gtceu:${metal}_spade_head`, `#forge:double_ingots/${metal}`, ['punch_last', 'hit_not_last'])
+                .tier(metalSpecs.tier)
+                .bonus(true)
+                .id(`tfc:anvil/${metal}_spade_head`)
+
+            // Декрафт оголовья в жидкость
+            event.recipes.tfc.heating(`gtceu:${metal}_spade_head`, metalSpecs.melt_temp)
+                .resultFluid(Fluid.of(metalSpecs.output_fluid, 288))
+                .id(`tfc:heating/metal/${metal}_spade_head`)
+
+            //#endregion
+
             //#region Ножницы 
 
             // Сварка оголовий

kubejs/server_scripts/tfc/tags.js

@@ -317,6 +317,8 @@ const registerTFCPlacedFeatures = (event) => {
     event.add('tfc:in_biome/veins', 'tfg:vein/normal_gold')
     event.add('tfc:in_biome/veins', 'tfg:vein/normal_graphite')
     event.add('tfc:in_biome/veins', 'tfg:vein/normal_hematite')
+    event.add('tfc:in_biome/veins', 'tfg:vein/normal_spodumene')
+    event.add('tfc:in_biome/veins', 'tfg:vein/normal_oil_sands')
     event.add('tfc:in_biome/veins', 'tfg:vein/normal_lapis')
     event.add('tfc:in_biome/veins', 'tfg:vein/normal_limonite')
     event.add('tfc:in_biome/veins', 'tfg:vein/normal_lubricant')

kubejs/startup_scripts/create/constants.js

@@ -464,5 +464,9 @@ global.CREATE_DISABLED_ITEMS = [
     'create:wooden_bracket', 
     'create:blaze_burner',
     'create:sand_paper',
-    'create:red_sand_paper'
+    'create:red_sand_paper',
+    'create:empty_blaze_burner',
+    'create:minecart_contraption',
+    'create:furnace_minecart_contraption',
+    'create:chest_minecart_contraption'
 ];

kubejs/startup_scripts/gtceu/constants.js

@@ -42,4 +42,27 @@ global.GTCEU_DISABLED_ITEMS = [
     'gtceu:rubber_log', 
     'gtceu:rubber_leaves', 
     'gtceu:rubber_planks',
+];
+
+global.GTCEU_ANVIL_TOOL_TYPES = [
+    GTToolType.SWORD,
+    GTToolType.PICKAXE,
+    GTToolType.SHOVEL,
+    GTToolType.AXE,
+    GTToolType.HOE,
+    GTToolType.MINING_HAMMER,
+    GTToolType.SPADE,
+    GTToolType.SAW,
+    GTToolType.HARD_HAMMER,
+    // GTToolType.SOFT_MALLET,
+    // GTToolType.WRENCH,
+    GTToolType.FILE,
+    // GTToolType.CROWBAR,
+    // GTToolType.SCREWDRIVER,
+    // GTToolType.MORTAR,
+    // GTToolType.WIRE_CUTTER,
+    GTToolType.SCYTHE,
+    GTToolType.KNIFE,
+    GTToolType.BUTCHERY_KNIFE,
+    // GTToolType.PLUNGER
 ];

kubejs/startup_scripts/sophisticated_backpacks/constants.js

@@ -20,6 +20,7 @@ global.SOPHISTICATED_BACKPACKS_DISABLED_ITEMS = [
     'sophisticatedbackpacks:advanced_compacting_upgrade',
     'sophisticatedbackpacks:compacting_upgrade',
     'sophisticatedbackpacks:advanced_feeding_upgrade',
-    'sophisticatedbackpacks:feeding_upgrade'
+    'sophisticatedbackpacks:feeding_upgrade',
+    'sophisticatedbackpacks:anvil_upgrade'
 ];