diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json
new file mode 100644
index 00000000..dba422d1
--- /dev/null
+++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json
@@ -0,0 +1,15 @@
+{
+  "values": [
+    "naturesaura:ancient_bark",
+    "naturesaura:ancient_log",
+    "naturesaura:ancient_planks",
+    "naturesaura:ancient_slab",
+    "naturesaura:ancient_stairs",
+    "naturesaura:auto_crafter",
+    "naturesaura:flower_generator",
+    "naturesaura:nether_wart_mushroom",
+    "naturesaura:oak_generator",
+    "naturesaura:offering_table",
+    "naturesaura:wood_stand"
+  ]
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
new file mode 100644
index 00000000..347917f8
--- /dev/null
+++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
@@ -0,0 +1,49 @@
+{
+  "values": [
+    "naturesaura:animal_container",
+    "naturesaura:animal_generator",
+    "naturesaura:animal_spawner",
+    "naturesaura:aura_detector",
+    "naturesaura:aura_timer",
+    "naturesaura:blast_furnace_booster",
+    "naturesaura:chorus_generator",
+    "naturesaura:chunk_loader",
+    "naturesaura:conversion_catalyst",
+    "naturesaura:crushing_catalyst",
+    "naturesaura:depth_ingot_block",
+    "naturesaura:ender_crate",
+    "naturesaura:field_creator",
+    "naturesaura:firework_generator",
+    "naturesaura:furnace_heater",
+    "naturesaura:generator_limit_remover",
+    "naturesaura:gold_brick",
+    "naturesaura:gold_nether_brick",
+    "naturesaura:grated_chute",
+    "naturesaura:hopper_upgrade",
+    "naturesaura:infused_brick",
+    "naturesaura:infused_brick_slab",
+    "naturesaura:infused_brick_stairs",
+    "naturesaura:infused_iron_block",
+    "naturesaura:infused_slab",
+    "naturesaura:infused_stairs",
+    "naturesaura:infused_stone",
+    "naturesaura:item_distributor",
+    "naturesaura:lower_limiter",
+    "naturesaura:moss_generator",
+    "naturesaura:nature_altar",
+    "naturesaura:nether_grass",
+    "naturesaura:pickup_stopper",
+    "naturesaura:placer",
+    "naturesaura:potion_generator",
+    "naturesaura:powder_placer",
+    "naturesaura:projectile_generator",
+    "naturesaura:rf_converter",
+    "naturesaura:sky_ingot_block",
+    "naturesaura:snow_creator",
+    "naturesaura:spawn_lamp",
+    "naturesaura:spring",
+    "naturesaura:tainted_gold_block",
+    "naturesaura:time_changer",
+    "naturesaura:weather_changer"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/ModBlocks.java b/src/main/java/de/ellpeck/naturesaura/blocks/ModBlocks.java
index 615c1352..218165a1 100644
--- a/src/main/java/de/ellpeck/naturesaura/blocks/ModBlocks.java
+++ b/src/main/java/de/ellpeck/naturesaura/blocks/ModBlocks.java
@@ -28,6 +28,7 @@ public final class ModBlocks {
     public static Block AURA_DETECTOR;
     public static Block CONVERSION_CATALYST;
     public static Block CRUSHING_CATALYST;
+    public static Block DEPTH_INGOT_BLOCK;
     public static Block FLOWER_GENERATOR;
     public static Block PLACER;
     public static Block HOPPER_UPGRADE;
@@ -45,6 +46,7 @@ public final class ModBlocks {
     public static Block GOLD_BRICK;
     public static Block GOLD_NETHER_BRICK;
     public static Block RF_CONVERTER;
+    public static Block SKY_INGOT_BLOCK;
     public static Block MOSS_GENERATOR;
     public static Block TIME_CHANGER;
     public static Block GENERATOR_LIMIT_REMOVER;
diff --git a/src/main/java/de/ellpeck/naturesaura/data/BlockTagProvider.java b/src/main/java/de/ellpeck/naturesaura/data/BlockTagProvider.java
index 12e77f4d..04eeb321 100644
--- a/src/main/java/de/ellpeck/naturesaura/data/BlockTagProvider.java
+++ b/src/main/java/de/ellpeck/naturesaura/data/BlockTagProvider.java
@@ -44,15 +44,22 @@ public class BlockTagProvider extends BlockTagsProvider {
         this.tag(BlockTagProvider.ALTAR_GOLD_BRICK).add(ModBlocks.GOLD_BRICK, ModBlocks.GOLD_NETHER_BRICK);
         this.tag(BlockTagProvider.ALTAR_FANCY_BRICK).add(Blocks.RED_NETHER_BRICKS, Blocks.CHISELED_STONE_BRICKS);
 
-        // sort these so that they don't change the json every time we run data (because it's a set)
-        ModRegistry.ALL_ITEMS.stream().sorted(Comparator.comparing(IModItem::getBaseName)).filter(i -> i instanceof Block).map(i -> (Block) i).forEach(b -> {
-            // TODO figure out what to do about materials for mineability
-            /*var material = b.defaultBlockState().getMaterial();
-            if (material == Material.STONE || material == Material.METAL) {
-                this.tag(BlockTags.MINEABLE_WITH_PICKAXE).add(b);
-            } else if (material == Material.WOOD) {
-                this.tag(BlockTags.MINEABLE_WITH_AXE).add(b);
-            }*/
-        });
+        this.tag(BlockTags.MINEABLE_WITH_PICKAXE).add(ModBlocks.ANIMAL_CONTAINER, ModBlocks.ANIMAL_GENERATOR,
+                ModBlocks.ANIMAL_SPAWNER, ModBlocks.AURA_DETECTOR, ModBlocks.AURA_TIMER, ModBlocks.BLAST_FURNACE_BOOSTER,
+                ModBlocks.CHORUS_GENERATOR, ModBlocks.CHUNK_LOADER, ModBlocks.CONVERSION_CATALYST, ModBlocks.CRUSHING_CATALYST,
+                ModBlocks.DEPTH_INGOT_BLOCK, ModBlocks.ENDER_CRATE, ModBlocks.FIELD_CREATOR, ModBlocks.FIREWORK_GENERATOR,
+                ModBlocks.FURNACE_HEATER, ModBlocks.GENERATOR_LIMIT_REMOVER, ModBlocks.GOLD_BRICK, ModBlocks.GOLD_NETHER_BRICK,
+                ModBlocks.GRATED_CHUTE, ModBlocks.HOPPER_UPGRADE, ModBlocks.INFUSED_BRICK, ModBlocks.INFUSED_BRICK_SLAB,
+                ModBlocks.INFUSED_BRICK_STAIRS, ModBlocks.INFUSED_IRON_BLOCK, ModBlocks.INFUSED_SLAB, ModBlocks.INFUSED_STAIRS,
+                ModBlocks.INFUSED_STONE, ModBlocks.ITEM_DISTRIBUTOR, ModBlocks.LOWER_LIMITER, ModBlocks.MOSS_GENERATOR,
+                ModBlocks.NATURE_ALTAR, ModBlocks.NETHER_GRASS, ModBlocks.PICKUP_STOPPER, ModBlocks.PLACER, ModBlocks.POTION_GENERATOR,
+                ModBlocks.POWDER_PLACER, ModBlocks.PROJECTILE_GENERATOR, ModBlocks.RF_CONVERTER, ModBlocks.SKY_INGOT_BLOCK,
+                ModBlocks.SNOW_CREATOR, ModBlocks.SPAWN_LAMP, ModBlocks.SPRING, ModBlocks.TAINTED_GOLD_BLOCK,
+                ModBlocks.TIME_CHANGER, ModBlocks.WEATHER_CHANGER);
+
+        this.tag(BlockTags.MINEABLE_WITH_AXE).add(ModBlocks.ANCIENT_BARK, ModBlocks.ANCIENT_LOG,
+                ModBlocks.ANCIENT_PLANKS, ModBlocks.ANCIENT_SLAB, ModBlocks.ANCIENT_STAIRS,
+                ModBlocks.AUTO_CRAFTER, ModBlocks.FLOWER_GENERATOR, ModBlocks.NETHER_WART_MUSHROOM,
+                ModBlocks.OAK_GENERATOR, ModBlocks.OFFERING_TABLE, ModBlocks.WOOD_STAND);
     }
 }