diff --git a/kubejs/data/tfc/tags/blocks/can_collapse.json b/kubejs/data/tfc/tags/blocks/can_collapse.json
deleted file mode 100644
index 704583787..000000000
--- a/kubejs/data/tfc/tags/blocks/can_collapse.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "values": [
-    "#forge:tfc_stonetype_ore"
-  ]
-}
\ No newline at end of file
diff --git a/kubejs/data/tfc/tags/blocks/can_start_collapse.json b/kubejs/data/tfc/tags/blocks/can_start_collapse.json
deleted file mode 100644
index 704583787..000000000
--- a/kubejs/data/tfc/tags/blocks/can_start_collapse.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "values": [
-    "#forge:tfc_stonetype_ore"
-  ]
-}
\ No newline at end of file
diff --git a/kubejs/data/tfc/tags/blocks/can_trigger_collapse.json b/kubejs/data/tfc/tags/blocks/can_trigger_collapse.json
deleted file mode 100644
index 704583787..000000000
--- a/kubejs/data/tfc/tags/blocks/can_trigger_collapse.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "values": [
-    "#forge:tfc_stonetype_ore"
-  ]
-}
\ No newline at end of file
diff --git a/kubejs/data/tfc/tags/blocks/monster_spawns_on.json b/kubejs/data/tfc/tags/blocks/monster_spawns_on.json
deleted file mode 100644
index 704583787..000000000
--- a/kubejs/data/tfc/tags/blocks/monster_spawns_on.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "values": [
-    "#forge:tfc_stonetype_ore"
-  ]
-}
\ No newline at end of file
diff --git a/kubejs/data/tfc/tags/blocks/prospectable.json b/kubejs/data/tfc/tags/blocks/prospectable.json
deleted file mode 100644
index 704583787..000000000
--- a/kubejs/data/tfc/tags/blocks/prospectable.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "values": [
-    "#forge:tfc_stonetype_ore"
-  ]
-}
\ No newline at end of file
diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js
index a826fb125..c79cf4177 100644
--- a/kubejs/server_scripts/gregtech/recipes.js
+++ b/kubejs/server_scripts/gregtech/recipes.js
@@ -29,6 +29,50 @@ const registerGTRecipes = (event) => {
         1399
     )
 
+    // Pump Deck
+    event.shaped('gtceu:pump_deck', [
+        'ABA', 
+        'CDE'  
+    ], {
+        A: '#forge:screws/wrought_iron',
+        B: 'gtceu:treated_wood_planks',  
+        C: '#forge:tools/hammers',
+        D: '#tfc:rock_slabs',
+        E: '#forge:tools/screwdrivers'
+    }).id('gtceu:shaped/pump_deck')
+
+    // Pump Hatch
+    event.shaped('gtceu:pump_hatch', [
+        'ABC', 
+        'DED',
+        'FBF'  
+    ], {
+        A: '#forge:screws/wrought_iron',
+        B: '#forge:rings/wrought_iron',
+        C: '#forge:tools/screwdrivers',
+        D: 'gtceu:treated_wood_planks',
+        E: 'gtceu:wood_large_fluid_pipe',
+        F: '#tfc:rock_slabs'
+
+    }).id('gtceu:shaped/pump_hatch')
+
+    // Primitive Pump
+    event.shaped('gtceu:primitive_pump', [
+        'ABC', 
+        'DEF',
+        'GHG'  
+    ], {
+        A: '#forge:rings/wrought_iron',
+        B: 'gtceu:wood_normal_fluid_pipe',
+        C: '#forge:screws/wrought_iron',
+        D: '#forge:rotors/wrought_iron',
+        E: 'gtceu:treated_wood_planks',
+        F: '#forge:tools/screwdrivers',
+        G: '#tfc:rock_slabs',
+        H: 'gtceu:wood_large_fluid_pipe'
+
+    }).id('gtceu:shaped/primitive_pump')
+
     // Coke Oven
     event.shaped('gtceu:coke_oven', [
         'ABA', 
diff --git a/kubejs/server_scripts/mainServerScript.js b/kubejs/server_scripts/mainServerScript.js
index 387d7f984..76c65aad6 100644
--- a/kubejs/server_scripts/mainServerScript.js
+++ b/kubejs/server_scripts/mainServerScript.js
@@ -12,7 +12,7 @@ ServerEvents.highPriorityData(event => {
  * Здесь регистрируются тэги для блоков.
  */
 ServerEvents.tags('block', event => {
-    
+    registerTFCBlocksTags(event)
 })
 
 /**
@@ -20,7 +20,7 @@ ServerEvents.tags('block', event => {
  */
 ServerEvents.tags('item', event => {
     registerCreateTags(event)
-    registerTFCTags(event)
+    registerTFCItemsTags(event)
 })
 
 /**
diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js
index 0478a2c3a..5d7c8edb3 100644
--- a/kubejs/server_scripts/tfc/tags.js
+++ b/kubejs/server_scripts/tfc/tags.js
@@ -1,6 +1,6 @@
 // priority: 0
 
-const registerTFCTags = (event) => {
+const registerTFCItemsTags = (event) => {
     removeAllTagsItems.forEach(item => {
         event.removeAllTagsFrom(item)
     })
@@ -24,4 +24,20 @@ const registerTFCTags = (event) => {
     event.add('forge:ingots/double/black_steel', 'tfc:metal/double_ingot/black_steel')
     event.add('forge:ingots/double/blue_steel', 'tfc:metal/double_ingot/blue_steel')
     event.add('forge:ingots/double/red_steel', 'tfc:metal/double_ingot/red_steel')
+
+    event.add('tfc:can_collapse', '#forge:tfc_stonetype_ore')
+    event.add('tfc:can_start_collapse', '#forge:tfc_stonetype_ore')
+    event.add('tfc:can_trigger_collapse', '#forge:tfc_stonetype_ore')
+    event.add('tfc:monster_spawns_on', '#forge:tfc_stonetype_ore')
+    event.add('tfc:prospectable', '#forge:tfc_stonetype_ore')
+
+    global.allTFCStoneTypeNames.forEach(stoneTypeName => {
+        global.slabTypes.forEach(slabType => {
+            event.add(`tfc:rock_slabs`, `tfc:rock/${slabType}/${stoneTypeName}_slab`)
+        })
+    })
+}
+
+const registerTFCBlocksTags = (event) => {
+    
 }
\ No newline at end of file
diff --git a/kubejs/startup_scripts/constants.js b/kubejs/startup_scripts/constants.js
index 9211d6291..2cf0e3dc3 100644
--- a/kubejs/startup_scripts/constants.js
+++ b/kubejs/startup_scripts/constants.js
@@ -47,4 +47,14 @@ global.allTFCStoneTypeNamesOnlyDups = [
     'diorite',
     'andesite',
     'granite'
+];
+
+global.slabTypes = [
+    'raw',
+    'smooth',
+    'bricks',
+    'cobble',
+    'mossy_bricks',
+    'mossy_cobble',
+    'cracked_bricks'
 ];
\ No newline at end of file
diff --git a/mods/terrafirmagreg-1.20.1-0.0.9.jar b/mods/terrafirmagreg-1.20.1-0.0.11.jar
similarity index 86%
rename from mods/terrafirmagreg-1.20.1-0.0.9.jar
rename to mods/terrafirmagreg-1.20.1-0.0.11.jar
index 66ae1ec12..28c4510a7 100644
Binary files a/mods/terrafirmagreg-1.20.1-0.0.9.jar and b/mods/terrafirmagreg-1.20.1-0.0.11.jar differ