556 files changed, 1414 insertions, 2062 deletions

diff --git a/src/main/resources/assets/taiga/blockstates/abyssum_block.json b/src/main/resources/assets/taiga/blockstates/abyssum_block.json
new file mode 100644
index 0000000..71f6fb3
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/abyssum_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/abyssum" 
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/abyssum_ore.json b/src/main/resources/assets/taiga/blockstates/abyssum_ore.json
new file mode 100644
index 0000000..2adad92
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/abyssum_ore.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/abyssum"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/adamant_block.json b/src/main/resources/assets/taiga/blockstates/adamant_block.json
new file mode 100644
index 0000000..870d312
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/adamant_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/adamant"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/adamantite_block.json b/src/main/resources/assets/taiga/blockstates/adamantite_block.json
deleted file mode 100644
index c15ef35..0000000
--- a/src/main/resources/assets/taiga/blockstates/adamantite_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:adamantite_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/adamantite_ore.json b/src/main/resources/assets/taiga/blockstates/adamantite_ore.json
deleted file mode 100644
index aeed854..0000000
--- a/src/main/resources/assets/taiga/blockstates/adamantite_ore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:adamantite_ore"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/aegisalt_block.json b/src/main/resources/assets/taiga/blockstates/aegisalt_block.json
deleted file mode 100644
index 5bda85d..0000000
--- a/src/main/resources/assets/taiga/blockstates/aegisalt_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:aegisalt_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/arcanite_block.json b/src/main/resources/assets/taiga/blockstates/arcanite_block.json
deleted file mode 100644
index 11b765a..0000000
--- a/src/main/resources/assets/taiga/blockstates/arcanite_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:arcanite_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/arcanite_ore.json b/src/main/resources/assets/taiga/blockstates/arcanite_ore.json
deleted file mode 100644
index ed63a02..0000000
--- a/src/main/resources/assets/taiga/blockstates/arcanite_ore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:arcanite_ore"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/astrium_block.json b/src/main/resources/assets/taiga/blockstates/astrium_block.json
index 09049d8..c0783c1 100644
--- a/src/main/resources/assets/taiga/blockstates/astrium_block.json
+++ b/src/main/resources/assets/taiga/blockstates/astrium_block.json
@@ -1,7 +1,18 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/astrium"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": {
-      "model": "taiga:astrium_block"
-    }
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/aurorium_block.json b/src/main/resources/assets/taiga/blockstates/aurorium_block.json
new file mode 100644
index 0000000..576858c
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/aurorium_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/aurorium"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/aurorium_ore.json b/src/main/resources/assets/taiga/blockstates/aurorium_ore.json
new file mode 100644
index 0000000..02c9113
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/aurorium_ore.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/aurorium"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/basalt.json b/src/main/resources/assets/taiga/blockstates/basalt.json
deleted file mode 100644
index 4aa78ef..0000000
--- a/src/main/resources/assets/taiga/blockstates/basalt.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:basalt"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/basalt_block.json b/src/main/resources/assets/taiga/blockstates/basalt_block.json
new file mode 100644
index 0000000..c4e762f
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/basalt_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/basalt"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/bismuth_block.json b/src/main/resources/assets/taiga/blockstates/bismuth_block.json
deleted file mode 100644
index a55f859..0000000
--- a/src/main/resources/assets/taiga/blockstates/bismuth_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:bismuth_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/bismuth_ore.json b/src/main/resources/assets/taiga/blockstates/bismuth_ore.json
deleted file mode 100644
index 40e3b5e..0000000
--- a/src/main/resources/assets/taiga/blockstates/bismuth_ore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:bismuth_ore"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/bysmuid_block.json b/src/main/resources/assets/taiga/blockstates/bysmuid_block.json
deleted file mode 100644
index a542d20..0000000
--- a/src/main/resources/assets/taiga/blockstates/bysmuid_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:bysmuid_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/cryptogen_block.json b/src/main/resources/assets/taiga/blockstates/cryptogen_block.json
deleted file mode 100644
index ddc3c2d..0000000
--- a/src/main/resources/assets/taiga/blockstates/cryptogen_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:cryptogen_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/duranite_block.json b/src/main/resources/assets/taiga/blockstates/duranite_block.json
new file mode 100644
index 0000000..7759fdf
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/duranite_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/duranite"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/duranite_ore.json b/src/main/resources/assets/taiga/blockstates/duranite_ore.json
new file mode 100644
index 0000000..a004354
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/duranite_ore.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/duranite"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/dyonite_block.json b/src/main/resources/assets/taiga/blockstates/dyonite_block.json
index e2e94ac..0039b6a 100644
--- a/src/main/resources/assets/taiga/blockstates/dyonite_block.json
+++ b/src/main/resources/assets/taiga/blockstates/dyonite_block.json
@@ -1,7 +1,18 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/dyonite"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": {
-      "model": "taiga:dyonite_block"
-    }
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/eezo_block.json b/src/main/resources/assets/taiga/blockstates/eezo_block.json
new file mode 100644
index 0000000..126074d
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/eezo_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/eezo"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/eezo_ore.json b/src/main/resources/assets/taiga/blockstates/eezo_ore.json
new file mode 100644
index 0000000..75b7aed
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/eezo_ore.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/eezo"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/eternite_block.json b/src/main/resources/assets/taiga/blockstates/eternite_block.json
deleted file mode 100644
index a175f8f..0000000
--- a/src/main/resources/assets/taiga/blockstates/eternite_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:eternite_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/eternite_ore.json b/src/main/resources/assets/taiga/blockstates/eternite_ore.json
deleted file mode 100644
index 0a44944..0000000
--- a/src/main/resources/assets/taiga/blockstates/eternite_ore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:eternite_ore"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/fluid_block.json b/src/main/resources/assets/taiga/blockstates/fluid_block.json
index fb06fc9..b135075 100644
--- a/src/main/resources/assets/taiga/blockstates/fluid_block.json
+++ b/src/main/resources/assets/taiga/blockstates/fluid_block.json
@@ -4,276 +4,241 @@
     "model": "forge:fluid"
   },
   "variants": {
-    "arcanite": [
+    "triberium_fluid": [
       {
         "custom": {
-          "fluid": "arcanite"
+          "fluid": "triberium_fluid"
         }
       }
     ],
-    "tiberium": [
+    "meteorite_fluid": [
       {
         "custom": {
-          "fluid": "tiberium"
+          "fluid": "meteorite_fluid"
         }
       }
     ],
-    "prometheum": [
+    "basalt_fluid": [
       {
         "custom": {
-          "fluid": "prometheum"
+          "fluid": "basalt_fluid"
         }
       }
     ],
-    "rubium": [
+    "tiberium_fluid": [
       {
         "custom": {
-          "fluid": "rubium"
+          "fluid": "tiberium_fluid"
         }
       }
     ],
-    "violium": [
+    "aurorium_fluid": [
       {
         "custom": {
-          "fluid": "violium"
+          "fluid": "aurorium_fluid"
         }
       }
     ],
-    "bismuth": [
+    "prometheum_fluid": [
       {
         "custom": {
-          "fluid": "bismuth"
+          "fluid": "prometheum_fluid"
         }
       }
     ],
-    "karmesine": [
+    "duranite_fluid": [
       {
         "custom": {
-          "fluid": "karmesine"
+          "fluid": "duranite_fluid"
         }
       }
     ],
-    "mindorite": [
+    "valyrium_fluid": [
       {
         "custom": {
-          "fluid": "mindorite"
+          "fluid": "valyrium_fluid"
         }
       }
     ],
-    "titanite": [
+    "vibranium_fluid": [
       {
         "custom": {
-          "fluid": "titanite"
+          "fluid": "vibranium_fluid"
         }
       }
     ],
-    "meteorite": [
+    "karmesine_fluid": [
       {
         "custom": {
-          "fluid": "meteorite"
+          "fluid": "karmesine_fluid"
         }
       }
     ],
-    "adamantite": [
+    "palladium_fluid": [
       {
         "custom": {
-          "fluid": "adamantite"
+          "fluid": "palladium_fluid"
         }
       }
     ],
-    "vibranium": [
+    "uru_fluid": [
       {
         "custom": {
-          "fluid": "vibranium"
+          "fluid": "uru_fluid"
         }
       }
     ],
-    "ignitite": [
+    "osram_fluid": [
       {
         "custom": {
-          "fluid": "ignitite"
+          "fluid": "osram_fluid"
         }
       }
     ],
-    "palladium": [
+    "abyssum_fluid": [
       {
         "custom": {
-          "fluid": "palladium"
+          "fluid": "abyssum_fluid"
         }
       }
     ],
-    "eternite": [
+    "eezo_fluid": [
       {
         "custom": {
-          "fluid": "eternite"
+          "fluid": "eezo_fluid"
         }
       }
     ],
-    "mythril": [
+    "tiberiumX_fluid": [
       {
         "custom": {
-          "fluid": "mythril"
+          "fluid": "tiberiumX_fluid"
         }
       }
     ],
-    "astrium": [
+    "fractum_fluid": [
       {
         "custom": {
-          "fluid": "astrium"
+          "fluid": "fractum_fluid"
         }
       }
     ],
-    "nitronite": [
+    "violium_fluid": [
       {
         "custom": {
-          "fluid": "nitronite"
+          "fluid": "violium_fluid"
         }
       }
     ],
-    "proxideum": [
+    "proxii_fluid": [
       {
         "custom": {
-          "fluid": "proxideum"
+          "fluid": "proxii_fluid"
         }
       }
     ],
-    "noctunyx": [
+    "tritonite_fluid": [
       {
         "custom": {
-          "fluid": "noctunyx"
+          "fluid": "tritonite_fluid"
         }
       }
     ],
-    "imperomite": [
+    "ignitz_fluid": [
       {
         "custom": {
-          "fluid": "imperomite"
+          "fluid": "ignitz_fluid"
         }
       }
     ],
-    "cryptogen": [
+    "imperomite_fluid": [
       {
         "custom": {
-          "fluid": "cryptogen"
+          "fluid": "imperomite_fluid"
         }
       }
     ],
-    "fractoryte": [
+    "solarium_fluid": [
       {
         "custom": {
-          "fluid": "fractoryte"
+          "fluid": "solarium_fluid"
         }
       }
     ],
-    "seismodium": [
+    "nihilite_fluid": [
       {
         "custom": {
-          "fluid": "seismodium"
+          "fluid": "nihilite_fluid"
         }
       }
     ],
-    "terramite": [
+    "adamant_fluid": [
       {
         "custom": {
-          "fluid": "terramite"
+          "fluid": "adamant_fluid"
         }
       }
     ],
-    "lumixyl": [
+    "dyonite_fluid": [
       {
         "custom": {
-          "fluid": "lumixyl"
+          "fluid": "dyonite_fluid"
         }
       }
     ],
-    "solarium": [
+    "nucleum_fluid": [
       {
         "custom": {
-          "fluid": "solarium"
+          "fluid": "nucleum_fluid"
         }
       }
     ],
-    "dyonite": [
+    "lumix_fluid": [
       {
         "custom": {
-          "fluid": "dyonite"
+          "fluid": "lumix_fluid"
         }
       }
     ],
-    "ultranite": [
+    "seismum_fluid": [
       {
         "custom": {
-          "fluid": "ultranite"
+          "fluid": "seismum_fluid"
         }
       }
     ],
-    "nucleum": [
+    "astrium_fluid": [
       {
         "custom": {
-          "fluid": "nucleum"
+          "fluid": "astrium_fluid"
         }
       }
     ],
-    "aegisalt": [
+    "niob_fluid": [
       {
         "custom": {
-          "fluid": "aegisalt"
+          "fluid": "niob_fluid"
         }
       }
     ],
-    "bysmuid": [
+    "yrdeen_fluid": [
       {
         "custom": {
-          "fluid": "bysmuid"
+          "fluid": "yrdeen_fluid"
         }
       }
     ],
-    "radiant_enderium": [
+    "iox_fluid": [
       {
         "custom": {
-          "fluid": "radiant_enderium"
+          "fluid": "iox_fluid"
         }
       }
     ],
-    "glimming_enderium": [
+    "obsidiorite_fluid": [
       {
         "custom": {
-          "fluid": "glimming_enderium"
-        }
-      }
-    ],
-    "energy_enderium": [
-      {
-        "custom": {
-          "fluid": "energy_enderium"
-        }
-      }
-    ],
-    "glimmercoal_fluid": [
-      {
-        "custom": {
-          "fluid": "glimmercoal_fluid"
-        }
-      }
-    ],
-    "nitro_fluid": [
-      {
-        "custom": {
-          "fluid": "nitro_fluid"
-        }
-      }
-    ],
-    "anthracite_fluid": [
-      {
-        "custom": {
-          "fluid": "anthracite_fluid"
-        }
-      }
-    ],
-    "spectrum_fluid": [
-      {
-        "custom": {
-          "fluid": "spectrum_fluid"
+          "fluid": "obsidiorite_fluid"
         }
       }
     ]
diff --git a/src/main/resources/assets/taiga/blockstates/fractoryte_block.json b/src/main/resources/assets/taiga/blockstates/fractoryte_block.json
deleted file mode 100644
index 2c8cd91..0000000
--- a/src/main/resources/assets/taiga/blockstates/fractoryte_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:fractoryte_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/fractum_block.json b/src/main/resources/assets/taiga/blockstates/fractum_block.json
new file mode 100644
index 0000000..1bc30d4
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/fractum_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/fractum"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/ignitite_block.json b/src/main/resources/assets/taiga/blockstates/ignitite_block.json
deleted file mode 100644
index 05f3557..0000000
--- a/src/main/resources/assets/taiga/blockstates/ignitite_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:ignitite_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/ignitite_ore.json b/src/main/resources/assets/taiga/blockstates/ignitite_ore.json
deleted file mode 100644
index 8368a87..0000000
--- a/src/main/resources/assets/taiga/blockstates/ignitite_ore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:ignitite_ore"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/ignitz_block.json b/src/main/resources/assets/taiga/blockstates/ignitz_block.json
new file mode 100644
index 0000000..d23cb65
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/ignitz_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/ignitz"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/imperomite_block.json b/src/main/resources/assets/taiga/blockstates/imperomite_block.json
index 8aa54df..2bf4f14 100644
--- a/src/main/resources/assets/taiga/blockstates/imperomite_block.json
+++ b/src/main/resources/assets/taiga/blockstates/imperomite_block.json
@@ -1,7 +1,18 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/imperomite"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": {
-      "model": "taiga:imperomite_block"
-    }
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/iox_block.json b/src/main/resources/assets/taiga/blockstates/iox_block.json
new file mode 100644
index 0000000..d5ca26a
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/iox_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/iox"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/karmesine_block.json b/src/main/resources/assets/taiga/blockstates/karmesine_block.json
index 97b3302..c82dba9 100644
--- a/src/main/resources/assets/taiga/blockstates/karmesine_block.json
+++ b/src/main/resources/assets/taiga/blockstates/karmesine_block.json
@@ -1,7 +1,18 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/karmesine"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": {
-      "model": "taiga:karmesine_block"
-    }
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/karmesine_ore.json b/src/main/resources/assets/taiga/blockstates/karmesine_ore.json
index 31184ff..c38813c 100644
--- a/src/main/resources/assets/taiga/blockstates/karmesine_ore.json
+++ b/src/main/resources/assets/taiga/blockstates/karmesine_ore.json
@@ -1,7 +1,18 @@
 {
-    "variants": {
-        "normal": {
-            "model": "taiga:karmesine_ore"
-        }
-    }
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/karmesine"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/karmesineandensite_ore.json b/src/main/resources/assets/taiga/blockstates/karmesineandensite_ore.json
new file mode 100644
index 0000000..bd66801
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/karmesineandensite_ore.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/karmesineandensite"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/karmesinediorite_ore.json b/src/main/resources/assets/taiga/blockstates/karmesinediorite_ore.json
new file mode 100644
index 0000000..07ba243
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/karmesinediorite_ore.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/karmesinediorite"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/karmesinegranite_ore.json b/src/main/resources/assets/taiga/blockstates/karmesinegranite_ore.json
new file mode 100644
index 0000000..534c33e
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/karmesinegranite_ore.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/karmesinegranite"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/lignite_ore.json b/src/main/resources/assets/taiga/blockstates/lignite_ore.json
deleted file mode 100644
index 0eb941e..0000000
--- a/src/main/resources/assets/taiga/blockstates/lignite_ore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:lignite_ore"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/lumix_block.json b/src/main/resources/assets/taiga/blockstates/lumix_block.json
new file mode 100644
index 0000000..d806b54
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/lumix_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/lumix"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/lumixyl_block.json b/src/main/resources/assets/taiga/blockstates/lumixyl_block.json
deleted file mode 100644
index 7a12aac..0000000
--- a/src/main/resources/assets/taiga/blockstates/lumixyl_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:lumixyl_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/meteorite_block.json b/src/main/resources/assets/taiga/blockstates/meteorite_block.json
index b6166b7..786bb60 100644
--- a/src/main/resources/assets/taiga/blockstates/meteorite_block.json
+++ b/src/main/resources/assets/taiga/blockstates/meteorite_block.json
@@ -1,7 +1,18 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/meteorite"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": {
-      "model": "taiga:meteorite_block"
-    }
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/meteorite_ore.json b/src/main/resources/assets/taiga/blockstates/meteorite_ore.json
deleted file mode 100644
index d84f51b..0000000
--- a/src/main/resources/assets/taiga/blockstates/meteorite_ore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:meteorite_ore"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/meteoritecobble_block.json b/src/main/resources/assets/taiga/blockstates/meteoritecobble_block.json
new file mode 100644
index 0000000..eff3144
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/meteoritecobble_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/meteoritecobble"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/mindorite_block.json b/src/main/resources/assets/taiga/blockstates/mindorite_block.json
deleted file mode 100644
index 52a9a32..0000000
--- a/src/main/resources/assets/taiga/blockstates/mindorite_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:mindorite_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/mindorite_ore.json b/src/main/resources/assets/taiga/blockstates/mindorite_ore.json
deleted file mode 100644
index 7780d42..0000000
--- a/src/main/resources/assets/taiga/blockstates/mindorite_ore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:mindorite_ore"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/mythril_block.json b/src/main/resources/assets/taiga/blockstates/mythril_block.json
deleted file mode 100644
index 53dde45..0000000
--- a/src/main/resources/assets/taiga/blockstates/mythril_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:mythril_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/mythril_ore.json b/src/main/resources/assets/taiga/blockstates/mythril_ore.json
deleted file mode 100644
index 2a2d020..0000000
--- a/src/main/resources/assets/taiga/blockstates/mythril_ore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:mythril_ore"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/nihilite_block.json b/src/main/resources/assets/taiga/blockstates/nihilite_block.json
new file mode 100644
index 0000000..7a8a386
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/nihilite_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/nihilite"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/niob_block.json b/src/main/resources/assets/taiga/blockstates/niob_block.json
new file mode 100644
index 0000000..b28fa4f
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/niob_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/niob"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/nitronite_block.json b/src/main/resources/assets/taiga/blockstates/nitronite_block.json
deleted file mode 100644
index 74113cd..0000000
--- a/src/main/resources/assets/taiga/blockstates/nitronite_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:nitronite_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/noctunyx_block.json b/src/main/resources/assets/taiga/blockstates/noctunyx_block.json
deleted file mode 100644
index 4a8f4b7..0000000
--- a/src/main/resources/assets/taiga/blockstates/noctunyx_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:noctunyx_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/nucleum_block.json b/src/main/resources/assets/taiga/blockstates/nucleum_block.json
index 2082110..b7c6bed 100644
--- a/src/main/resources/assets/taiga/blockstates/nucleum_block.json
+++ b/src/main/resources/assets/taiga/blockstates/nucleum_block.json
@@ -1,7 +1,18 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/nucleum"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": {
-      "model": "taiga:nucleum_block"
-    }
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/obsidiorite_block.json b/src/main/resources/assets/taiga/blockstates/obsidiorite_block.json
new file mode 100644
index 0000000..2dffc7d
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/obsidiorite_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/obsidiorite"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/obsidioritecobble_block.json b/src/main/resources/assets/taiga/blockstates/obsidioritecobble_block.json
new file mode 100644
index 0000000..53e133f
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/obsidioritecobble_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/obsidioritecobble"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/osram_block.json b/src/main/resources/assets/taiga/blockstates/osram_block.json
new file mode 100644
index 0000000..e5c69e6
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/osram_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/osram"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/osram_ore.json b/src/main/resources/assets/taiga/blockstates/osram_ore.json
new file mode 100644
index 0000000..b2ad55d
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/osram_ore.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/osram"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/palladium_block.json b/src/main/resources/assets/taiga/blockstates/palladium_block.json
index 601d4ab..ad302fe 100644
--- a/src/main/resources/assets/taiga/blockstates/palladium_block.json
+++ b/src/main/resources/assets/taiga/blockstates/palladium_block.json
@@ -1,7 +1,18 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/palladium"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": {
-      "model": "taiga:palladium_block"
-    }
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/palladium_ore.json b/src/main/resources/assets/taiga/blockstates/palladium_ore.json
index 78e862b..c35b9e4 100644
--- a/src/main/resources/assets/taiga/blockstates/palladium_ore.json
+++ b/src/main/resources/assets/taiga/blockstates/palladium_ore.json
@@ -1,7 +1,18 @@
 {
-    "variants": {
-        "normal": {
-            "model": "taiga:palladium_ore"
-        }
-    }
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/palladium"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/prometheum_block.json b/src/main/resources/assets/taiga/blockstates/prometheum_block.json
index af31aa8..3ce7fbb 100644
--- a/src/main/resources/assets/taiga/blockstates/prometheum_block.json
+++ b/src/main/resources/assets/taiga/blockstates/prometheum_block.json
@@ -1,7 +1,18 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/prometheum"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": {
-      "model": "taiga:prometheum_block"
-    }
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/prometheum_ore.json b/src/main/resources/assets/taiga/blockstates/prometheum_ore.json
index ff3de0d..4f13232 100644
--- a/src/main/resources/assets/taiga/blockstates/prometheum_ore.json
+++ b/src/main/resources/assets/taiga/blockstates/prometheum_ore.json
@@ -1,7 +1,18 @@
 {
-    "variants": {
-        "normal": {
-            "model": "taiga:prometheum_ore"
-        }
-    }
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/prometheum"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/proxideum_block.json b/src/main/resources/assets/taiga/blockstates/proxideum_block.json
deleted file mode 100644
index 9e0c38b..0000000
--- a/src/main/resources/assets/taiga/blockstates/proxideum_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:proxideum_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/proxii_block.json b/src/main/resources/assets/taiga/blockstates/proxii_block.json
new file mode 100644
index 0000000..f0f94bc
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/proxii_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/proxii"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/rotten_ground.json b/src/main/resources/assets/taiga/blockstates/rotten_ground.json
deleted file mode 100644
index 39e72bf..0000000
--- a/src/main/resources/assets/taiga/blockstates/rotten_ground.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:rotten_ground"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/rubium_block.json b/src/main/resources/assets/taiga/blockstates/rubium_block.json
deleted file mode 100644
index 2e491ef..0000000
--- a/src/main/resources/assets/taiga/blockstates/rubium_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:rubium_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/rubium_ore.json b/src/main/resources/assets/taiga/blockstates/rubium_ore.json
deleted file mode 100644
index 82b330e..0000000
--- a/src/main/resources/assets/taiga/blockstates/rubium_ore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:rubium_ore"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/seismodium_block.json b/src/main/resources/assets/taiga/blockstates/seismodium_block.json
deleted file mode 100644
index 19fa838..0000000
--- a/src/main/resources/assets/taiga/blockstates/seismodium_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:seismodium_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/seismum_block.json b/src/main/resources/assets/taiga/blockstates/seismum_block.json
new file mode 100644
index 0000000..ab10664
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/seismum_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/seismum"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/slaggold_ore.json b/src/main/resources/assets/taiga/blockstates/slaggold_ore.json
deleted file mode 100644
index 5e5c317..0000000
--- a/src/main/resources/assets/taiga/blockstates/slaggold_ore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:slaggold_ore"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/slagiron_ore.json b/src/main/resources/assets/taiga/blockstates/slagiron_ore.json
deleted file mode 100644
index a45629e..0000000
--- a/src/main/resources/assets/taiga/blockstates/slagiron_ore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:slagiron_ore"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/solarium_block.json b/src/main/resources/assets/taiga/blockstates/solarium_block.json
index 9d52d5a..730c52b 100644
--- a/src/main/resources/assets/taiga/blockstates/solarium_block.json
+++ b/src/main/resources/assets/taiga/blockstates/solarium_block.json
@@ -1,7 +1,18 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/solarium"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": {
-      "model": "taiga:solarium_block"
-    }
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/terramite_block.json b/src/main/resources/assets/taiga/blockstates/terramite_block.json
deleted file mode 100644
index 55bac8a..0000000
--- a/src/main/resources/assets/taiga/blockstates/terramite_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:terramite_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/tiberium_block.json b/src/main/resources/assets/taiga/blockstates/tiberium_block.json
index 95f8be5..8de7043 100644
--- a/src/main/resources/assets/taiga/blockstates/tiberium_block.json
+++ b/src/main/resources/assets/taiga/blockstates/tiberium_block.json
@@ -1,7 +1,18 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/tiberium"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": {
-      "model": "taiga:tiberium_block"
-    }
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/tiberium_ore.json b/src/main/resources/assets/taiga/blockstates/tiberium_ore.json
index fba6296..618929b 100644
--- a/src/main/resources/assets/taiga/blockstates/tiberium_ore.json
+++ b/src/main/resources/assets/taiga/blockstates/tiberium_ore.json
@@ -1,7 +1,18 @@
 {
-    "variants": {
-        "normal": {
-            "model": "taiga:tiberium_ore"
-        }
-    }
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/tiberium"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/titanite_block.json b/src/main/resources/assets/taiga/blockstates/titanite_block.json
deleted file mode 100644
index 5bde804..0000000
--- a/src/main/resources/assets/taiga/blockstates/titanite_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:titanite_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/titanite_ore.json b/src/main/resources/assets/taiga/blockstates/titanite_ore.json
deleted file mode 100644
index ab7f988..0000000
--- a/src/main/resources/assets/taiga/blockstates/titanite_ore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:titanite_ore"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/triberium_block.json b/src/main/resources/assets/taiga/blockstates/triberium_block.json
new file mode 100644
index 0000000..a4fbb33
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/triberium_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/triberium"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/tritonite_block.json b/src/main/resources/assets/taiga/blockstates/tritonite_block.json
new file mode 100644
index 0000000..a10ab3c
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/tritonite_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/tritonite"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/ultranite_block.json b/src/main/resources/assets/taiga/blockstates/ultranite_block.json
deleted file mode 100644
index b3368d9..0000000
--- a/src/main/resources/assets/taiga/blockstates/ultranite_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:ultranite_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/uru_block.json b/src/main/resources/assets/taiga/blockstates/uru_block.json
new file mode 100644
index 0000000..31363cf
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/uru_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/uru"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/uru_ore.json b/src/main/resources/assets/taiga/blockstates/uru_ore.json
new file mode 100644
index 0000000..089fd9a
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/uru_ore.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/uru"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/valyrium_block.json b/src/main/resources/assets/taiga/blockstates/valyrium_block.json
new file mode 100644
index 0000000..f7e5fda
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/valyrium_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/valyrium"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/valyrium_ore.json b/src/main/resources/assets/taiga/blockstates/valyrium_ore.json
new file mode 100644
index 0000000..bcc0804
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/valyrium_ore.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/valyrium"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/vibranium_block.json b/src/main/resources/assets/taiga/blockstates/vibranium_block.json
index 75cf810..c35e154 100644
--- a/src/main/resources/assets/taiga/blockstates/vibranium_block.json
+++ b/src/main/resources/assets/taiga/blockstates/vibranium_block.json
@@ -1,7 +1,18 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/vibranium"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": {
-      "model": "taiga:vibranium_block"
-    }
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/vibranium_ore.json b/src/main/resources/assets/taiga/blockstates/vibranium_ore.json
index aa1be1a..2852ccf 100644
--- a/src/main/resources/assets/taiga/blockstates/vibranium_ore.json
+++ b/src/main/resources/assets/taiga/blockstates/vibranium_ore.json
@@ -1,7 +1,18 @@
 {
-    "variants": {
-        "normal": {
-            "model": "taiga:vibranium_ore"
-        }
-    }
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/vibranium"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/violium_block.json b/src/main/resources/assets/taiga/blockstates/violium_block.json
index d5c1232..2eb5a1e 100644
--- a/src/main/resources/assets/taiga/blockstates/violium_block.json
+++ b/src/main/resources/assets/taiga/blockstates/violium_block.json
@@ -1,7 +1,18 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/violium"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": {
-      "model": "taiga:violium_block"
-    }
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/violium_ore.json b/src/main/resources/assets/taiga/blockstates/violium_ore.json
deleted file mode 100644
index afd18f6..0000000
--- a/src/main/resources/assets/taiga/blockstates/violium_ore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:violium_ore"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/yrdeen_block.json b/src/main/resources/assets/taiga/blockstates/yrdeen_block.json
new file mode 100644
index 0000000..70cf16c
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/yrdeen_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/yrdeen"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/lang/de_DE.lang b/src/main/resources/assets/taiga/lang/de_DE.lang
index 8592d85..cd5a982 100644
--- a/src/main/resources/assets/taiga/lang/de_DE.lang
+++ b/src/main/resources/assets/taiga/lang/de_DE.lang
@@ -13,7 +13,6 @@ tile.mindorite_ore.name=Mindoriterz
 tile.mythril_ore.name=Mythrilerz
 tile.palladium_ore.name=Palladiumerz
 tile.prometheum_ore.name=Prometheumerz
-tile.rotten_ground.name=Verrottete Erde
 tile.slagiron_ore.name=Unreines Eisenerz
 tile.slaggold_ore.name=Unreines Golderz
 tile.tiberium_ore.name=Tiberiumerz
diff --git a/src/main/resources/assets/taiga/lang/en_US.lang b/src/main/resources/assets/taiga/lang/en_US.lang
index 68f57d9..669205d 100644
--- a/src/main/resources/assets/taiga/lang/en_US.lang
+++ b/src/main/resources/assets/taiga/lang/en_US.lang
@@ -13,7 +13,6 @@ tile.mindorite_ore.name=Mindorite Ore
 tile.mythril_ore.name=Mythril Ore
 tile.palladium_ore.name=Palladium Ore
 tile.prometheum_ore.name=Prometheum Ore
-tile.rotten_ground.name=Rotten Ground
 tile.slagiron_ore.name=Slagiron Ore
 tile.slaggold_ore.name=Slaggold Ore
 tile.tiberium_ore.name=Tiberium Ore
@@ -229,13 +228,13 @@ modifier.garishly.desc=§oIt's so hot.§r\Thei actually drop fiery stuff.
 modifier.glimmer.name=Glimmer
 modifier.glimmer.desc=§oDarkness? Not for me!§r\Sometimes you get night vision.
 modifier.haunted.name=Haunted
-modifier.haunted.desc=§oHit 'em to get 'em crazy!'§r\Fucking mad cow desease.
+modifier.haunted.desc=§oHit 'em to get 'em crazy!'§r\This is mad cow desease.
 modifier.heroic.name=Heroic
 modifier.heroic.desc=§oUntil you'll die.§r\At the end, you grow stronger.
 modifier.hollow.name=Hollow
 modifier.hollow.desc=§oBraindead!§r\Brain smash!
 modifier.instable.name=Unstable
-modifier.instable.desc=§oWhat the fuck?§r\Seriously, this is unstable!
+modifier.instable.desc=§oWhat the heck?§r\Seriously, this is unstable!
 modifier.naturebound.name=Naturebound
 modifier.naturebound.desc=§oYou are one with your surrounding!§r\Repairs in name of the nature.
 modifier.pulverizing.name=Pulverizing
@@ -253,7 +252,7 @@ modifier.uncertain.desc=§oSome kind of risky to use.§r\At least it's not unsta
 modifier.reviving.name=Reviving
 modifier.reviving.desc=§oPlease kill it already!§r\Zombies!?
 modifier.melting.name=Melting
-modifier.melting.desc=§oSo fucking hot!§r\Burrrrrrn!
+modifier.melting.desc=§oSo damn hot!§r\Burrrrrrn!
 
 
 item.glimmercoal.name=Glimmercoal
diff --git a/src/main/resources/assets/taiga/lang/zh_CN.lang b/src/main/resources/assets/taiga/lang/zh_CN.lang
index caafa17..ac01580 100644
--- a/src/main/resources/assets/taiga/lang/zh_CN.lang
+++ b/src/main/resources/assets/taiga/lang/zh_CN.lang
@@ -13,7 +13,6 @@ tile.mindorite_ore.name=曼德瑞特矿石
 tile.mythril_ore.name=秘银矿石
 tile.palladium_ore.name=钯矿石
 tile.prometheum_ore.name=幻金矿石
-tile.rotten_ground.name=腐烂泥土
 tile.slagiron_ore.name=富渣铁矿石
 tile.slaggold_ore.name=富渣金矿石
 tile.tiberium_ore.name=泰伯利亚矿石
diff --git a/src/main/resources/assets/taiga/models/block/adamantite_block.json b/src/main/resources/assets/taiga/models/block/adamantite_block.json
deleted file mode 100644
index 6b5c73a..0000000
--- a/src/main/resources/assets/taiga/models/block/adamantite_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/adamantite_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/adamantite_ore.json b/src/main/resources/assets/taiga/models/block/adamantite_ore.json
deleted file mode 100644
index 4f02568..0000000
--- a/src/main/resources/assets/taiga/models/block/adamantite_ore.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "taiga:blocks/adamantite_ore"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/block/aegisalt_block.json b/src/main/resources/assets/taiga/models/block/aegisalt_block.json
deleted file mode 100644
index 3ac607c..0000000
--- a/src/main/resources/assets/taiga/models/block/aegisalt_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/aegisalt_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/arcanite_block.json b/src/main/resources/assets/taiga/models/block/arcanite_block.json
deleted file mode 100644
index 106061f..0000000
--- a/src/main/resources/assets/taiga/models/block/arcanite_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/arcanite_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/arcanite_ore.json b/src/main/resources/assets/taiga/models/block/arcanite_ore.json
deleted file mode 100644
index 286d1be..0000000
--- a/src/main/resources/assets/taiga/models/block/arcanite_ore.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "taiga:blocks/arcanite_ore"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/block/astrite_ore.json b/src/main/resources/assets/taiga/models/block/astrite_ore.json
deleted file mode 100644
index 89b1556..0000000
--- a/src/main/resources/assets/taiga/models/block/astrite_ore.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/astrium_ore"
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/block/astrium_block.json b/src/main/resources/assets/taiga/models/block/astrium_block.json
deleted file mode 100644
index 4917949..0000000
--- a/src/main/resources/assets/taiga/models/block/astrium_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/astrium_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/basalt.json b/src/main/resources/assets/taiga/models/block/basalt.json
deleted file mode 100644
index 128f047..0000000
--- a/src/main/resources/assets/taiga/models/block/basalt.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "taiga:blocks/basalt"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/block/bismuth_block.json b/src/main/resources/assets/taiga/models/block/bismuth_block.json
deleted file mode 100644
index 011c27d..0000000
--- a/src/main/resources/assets/taiga/models/block/bismuth_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/bismuth_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/bismuth_ore.json b/src/main/resources/assets/taiga/models/block/bismuth_ore.json
deleted file mode 100644
index d5af860..0000000
--- a/src/main/resources/assets/taiga/models/block/bismuth_ore.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "taiga:blocks/bismuth_ore"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/block/bysmuid_block.json b/src/main/resources/assets/taiga/models/block/bysmuid_block.json
deleted file mode 100644
index e85f044..0000000
--- a/src/main/resources/assets/taiga/models/block/bysmuid_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/bysmuid_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/cryptogen_block.json b/src/main/resources/assets/taiga/models/block/cryptogen_block.json
deleted file mode 100644
index fdf7771..0000000
--- a/src/main/resources/assets/taiga/models/block/cryptogen_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/cryptogen_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/dyonite_block.json b/src/main/resources/assets/taiga/models/block/dyonite_block.json
deleted file mode 100644
index b1729c7..0000000
--- a/src/main/resources/assets/taiga/models/block/dyonite_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/dyonite_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/eternite_block.json b/src/main/resources/assets/taiga/models/block/eternite_block.json
deleted file mode 100644
index f67c965..0000000
--- a/src/main/resources/assets/taiga/models/block/eternite_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/eternite_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/eternite_ore.json b/src/main/resources/assets/taiga/models/block/eternite_ore.json
deleted file mode 100644
index cb3b272..0000000
--- a/src/main/resources/assets/taiga/models/block/eternite_ore.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "taiga:blocks/eternite_ore"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/block/fractoryte_block.json b/src/main/resources/assets/taiga/models/block/fractoryte_block.json
deleted file mode 100644
index fa58562..0000000
--- a/src/main/resources/assets/taiga/models/block/fractoryte_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/fractoryte_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/ignitite_block.json b/src/main/resources/assets/taiga/models/block/ignitite_block.json
deleted file mode 100644
index c77b427..0000000
--- a/src/main/resources/assets/taiga/models/block/ignitite_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/ignitite_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/ignitite_ore.json b/src/main/resources/assets/taiga/models/block/ignitite_ore.json
deleted file mode 100644
index 5eed757..0000000
--- a/src/main/resources/assets/taiga/models/block/ignitite_ore.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "taiga:blocks/ignitite_ore"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/block/imperomite_block.json b/src/main/resources/assets/taiga/models/block/imperomite_block.json
deleted file mode 100644
index 65e7b3d..0000000
--- a/src/main/resources/assets/taiga/models/block/imperomite_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/imperomite_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/karmesine_block.json b/src/main/resources/assets/taiga/models/block/karmesine_block.json
deleted file mode 100644
index a00d7cc..0000000
--- a/src/main/resources/assets/taiga/models/block/karmesine_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/karmesine_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/karmesine_ore.json b/src/main/resources/assets/taiga/models/block/karmesine_ore.json
deleted file mode 100644
index dec99e9..0000000
--- a/src/main/resources/assets/taiga/models/block/karmesine_ore.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "taiga:blocks/karmesine_ore"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/block/lignite_ore.json b/src/main/resources/assets/taiga/models/block/lignite_ore.json
deleted file mode 100644
index 1b2164f..0000000
--- a/src/main/resources/assets/taiga/models/block/lignite_ore.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "taiga:blocks/lignite_ore"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/block/lumixyl_block.json b/src/main/resources/assets/taiga/models/block/lumixyl_block.json
deleted file mode 100644
index 34996ad..0000000
--- a/src/main/resources/assets/taiga/models/block/lumixyl_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/lumixyl_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/meteorite_block.json b/src/main/resources/assets/taiga/models/block/meteorite_block.json
deleted file mode 100644
index 5407364..0000000
--- a/src/main/resources/assets/taiga/models/block/meteorite_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/meteorite_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/meteorite_ore.json b/src/main/resources/assets/taiga/models/block/meteorite_ore.json
deleted file mode 100644
index b6581f5..0000000
--- a/src/main/resources/assets/taiga/models/block/meteorite_ore.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "taiga:blocks/meteorite_ore"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/block/mindorite_block.json b/src/main/resources/assets/taiga/models/block/mindorite_block.json
deleted file mode 100644
index ee99479..0000000
--- a/src/main/resources/assets/taiga/models/block/mindorite_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/mindorite_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/mindorite_ore.json b/src/main/resources/assets/taiga/models/block/mindorite_ore.json
deleted file mode 100644
index 20445ee..0000000
--- a/src/main/resources/assets/taiga/models/block/mindorite_ore.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "taiga:blocks/mindorite_ore"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/block/mythril_block.json b/src/main/resources/assets/taiga/models/block/mythril_block.json
deleted file mode 100644
index 014cb8f..0000000
--- a/src/main/resources/assets/taiga/models/block/mythril_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/mythril_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/mythril_ore.json b/src/main/resources/assets/taiga/models/block/mythril_ore.json
deleted file mode 100644
index 9fe182e..0000000
--- a/src/main/resources/assets/taiga/models/block/mythril_ore.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "taiga:blocks/mythril_ore"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/block/nitronite_block.json b/src/main/resources/assets/taiga/models/block/nitronite_block.json
deleted file mode 100644
index 9661f68..0000000
--- a/src/main/resources/assets/taiga/models/block/nitronite_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/nitronite_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/noctunyx_block.json b/src/main/resources/assets/taiga/models/block/noctunyx_block.json
deleted file mode 100644
index ee87b81..0000000
--- a/src/main/resources/assets/taiga/models/block/noctunyx_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/noctunyx_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/nucleum_block.json b/src/main/resources/assets/taiga/models/block/nucleum_block.json
deleted file mode 100644
index 7029719..0000000
--- a/src/main/resources/assets/taiga/models/block/nucleum_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/nucleum_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/palladium_block.json b/src/main/resources/assets/taiga/models/block/palladium_block.json
deleted file mode 100644
index 5bdd65a..0000000
--- a/src/main/resources/assets/taiga/models/block/palladium_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/palladium_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/palladium_ore.json b/src/main/resources/assets/taiga/models/block/palladium_ore.json
deleted file mode 100644
index 1d7b5f0..0000000
--- a/src/main/resources/assets/taiga/models/block/palladium_ore.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "taiga:blocks/palladium_ore"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/block/prometheum_block.json b/src/main/resources/assets/taiga/models/block/prometheum_block.json
deleted file mode 100644
index af720f0..0000000
--- a/src/main/resources/assets/taiga/models/block/prometheum_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/prometheum_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/prometheum_ore.json b/src/main/resources/assets/taiga/models/block/prometheum_ore.json
deleted file mode 100644
index 4733fc6..0000000
--- a/src/main/resources/assets/taiga/models/block/prometheum_ore.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "taiga:blocks/prometheum_ore"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/block/proxideum_block.json b/src/main/resources/assets/taiga/models/block/proxideum_block.json
deleted file mode 100644
index 1bda055..0000000
--- a/src/main/resources/assets/taiga/models/block/proxideum_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/proxideum_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/rotten_ground.json b/src/main/resources/assets/taiga/models/block/rotten_ground.json
deleted file mode 100644
index c4a03e0..0000000
--- a/src/main/resources/assets/taiga/models/block/rotten_ground.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "taiga:blocks/rotten_ground"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/block/rubium_block.json b/src/main/resources/assets/taiga/models/block/rubium_block.json
deleted file mode 100644
index 7c09795..0000000
--- a/src/main/resources/assets/taiga/models/block/rubium_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/rubium_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/rubium_ore.json b/src/main/resources/assets/taiga/models/block/rubium_ore.json
deleted file mode 100644
index ca6893c..0000000
--- a/src/main/resources/assets/taiga/models/block/rubium_ore.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "taiga:blocks/rubium_ore"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/block/seismodium_block.json b/src/main/resources/assets/taiga/models/block/seismodium_block.json
deleted file mode 100644
index 21eba8c..0000000
--- a/src/main/resources/assets/taiga/models/block/seismodium_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/seismodium_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/slaggold_ore.json b/src/main/resources/assets/taiga/models/block/slaggold_ore.json
deleted file mode 100644
index 96a53ad..0000000
--- a/src/main/resources/assets/taiga/models/block/slaggold_ore.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "taiga:blocks/slaggold_ore"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/block/slagiron_ore.json b/src/main/resources/assets/taiga/models/block/slagiron_ore.json
deleted file mode 100644
index d7d31c0..0000000
--- a/src/main/resources/assets/taiga/models/block/slagiron_ore.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "taiga:blocks/slagiron_ore"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/block/solarium_block.json b/src/main/resources/assets/taiga/models/block/solarium_block.json
deleted file mode 100644
index 324858f..0000000
--- a/src/main/resources/assets/taiga/models/block/solarium_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/solarium_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/terramite_block.json b/src/main/resources/assets/taiga/models/block/terramite_block.json
deleted file mode 100644
index baca263..0000000
--- a/src/main/resources/assets/taiga/models/block/terramite_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/terramite_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/tiberium_block.json b/src/main/resources/assets/taiga/models/block/tiberium_block.json
deleted file mode 100644
index 91f83fa..0000000
--- a/src/main/resources/assets/taiga/models/block/tiberium_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/tiberium_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/tiberium_ore.json b/src/main/resources/assets/taiga/models/block/tiberium_ore.json
deleted file mode 100644
index 2d9e06a..0000000
--- a/src/main/resources/assets/taiga/models/block/tiberium_ore.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "taiga:blocks/tiberium_ore"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/block/titanite_block.json b/src/main/resources/assets/taiga/models/block/titanite_block.json
deleted file mode 100644
index 98ac398..0000000
--- a/src/main/resources/assets/taiga/models/block/titanite_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/titanite_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/titanite_ore.json b/src/main/resources/assets/taiga/models/block/titanite_ore.json
deleted file mode 100644
index 16acda7..0000000
--- a/src/main/resources/assets/taiga/models/block/titanite_ore.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "taiga:blocks/titanite_ore"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/block/ultranite_block.json b/src/main/resources/assets/taiga/models/block/ultranite_block.json
deleted file mode 100644
index afafb91..0000000
--- a/src/main/resources/assets/taiga/models/block/ultranite_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/ultranite_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/vibranium_block.json b/src/main/resources/assets/taiga/models/block/vibranium_block.json
deleted file mode 100644
index 14267d7..0000000
--- a/src/main/resources/assets/taiga/models/block/vibranium_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/vibranium_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/vibranium_ore.json b/src/main/resources/assets/taiga/models/block/vibranium_ore.json
deleted file mode 100644
index c7c0e92..0000000
--- a/src/main/resources/assets/taiga/models/block/vibranium_ore.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "taiga:blocks/vibranium_ore"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/block/violium_block.json b/src/main/resources/assets/taiga/models/block/violium_block.json
deleted file mode 100644
index 337d815..0000000
--- a/src/main/resources/assets/taiga/models/block/violium_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "taiga:blocks/violium_block"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/block/violium_ore.json b/src/main/resources/assets/taiga/models/block/violium_ore.json
deleted file mode 100644
index 789a090..0000000
--- a/src/main/resources/assets/taiga/models/block/violium_ore.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "taiga:blocks/violium_ore"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/glimmercoal.json b/src/main/resources/assets/taiga/models/item/abyssum_dust.json
index a59ef2f..abfb2f8 100644
--- a/src/main/resources/assets/taiga/models/item/glimmercoal.json
+++ b/src/main/resources/assets/taiga/models/item/abyssum_dust.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/glimmercoal"
+    "layer0": "taiga:items/dust/abyssum"
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/glimmer_pearl.json b/src/main/resources/assets/taiga/models/item/abyssum_ingot.json
index af88a36..46fcd7e 100644
--- a/src/main/resources/assets/taiga/models/item/glimmer_pearl.json
+++ b/src/main/resources/assets/taiga/models/item/abyssum_ingot.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/glimmer_pearl"
+    "layer0": "taiga:items/ingot/abyssum" 
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/abyssum_nugget.json b/src/main/resources/assets/taiga/models/item/abyssum_nugget.json
new file mode 100644
index 0000000..f89b7d3
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/abyssum_nugget.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/nugget/abyssum"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/nitro_brick.json b/src/main/resources/assets/taiga/models/item/adamant_dust.json
index 1c40cca..734ec51 100644
--- a/src/main/resources/assets/taiga/models/item/nitro_brick.json
+++ b/src/main/resources/assets/taiga/models/item/adamant_dust.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/nitro_brick"
+    "layer0": "taiga:items/dust/adamant"
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/energy_pearl.json b/src/main/resources/assets/taiga/models/item/adamant_ingot.json
index b058ac0..8799d26 100644
--- a/src/main/resources/assets/taiga/models/item/energy_pearl.json
+++ b/src/main/resources/assets/taiga/models/item/adamant_ingot.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/energy_pearl"
+    "layer0": "taiga:items/ingot/adamant"
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/adamant_nugget.json b/src/main/resources/assets/taiga/models/item/adamant_nugget.json
new file mode 100644
index 0000000..e00ce56
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/adamant_nugget.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/nugget/adamant"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/adamantite_block.json b/src/main/resources/assets/taiga/models/item/adamantite_block.json
deleted file mode 100644
index e9179c6..0000000
--- a/src/main/resources/assets/taiga/models/item/adamantite_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/adamantite_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/adamantite_ingot.json b/src/main/resources/assets/taiga/models/item/adamantite_ingot.json
deleted file mode 100644
index 9d51e98..0000000
--- a/src/main/resources/assets/taiga/models/item/adamantite_ingot.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "item/generated",
-	"textures": {
-		"layer0": "taiga:items/tic/adamantite_ingot"
-	}
-}
diff --git a/src/main/resources/assets/taiga/models/item/adamantite_ore.json b/src/main/resources/assets/taiga/models/item/adamantite_ore.json
deleted file mode 100644
index 4a76672..0000000
--- a/src/main/resources/assets/taiga/models/item/adamantite_ore.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "taiga:block/adamantite_ore",
-    "display": {
-        "thirdperson": {
-            "rotation": [ 10, -45, 170 ],
-            "translation": [ 0, 1.5, -2.75 ],
-            "scale": [ 0.375, 0.375, 0.375 ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/aegisalt_block.json b/src/main/resources/assets/taiga/models/item/aegisalt_block.json
deleted file mode 100644
index 5480b19..0000000
--- a/src/main/resources/assets/taiga/models/item/aegisalt_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/aegisalt_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/aegisalt_ingot.json b/src/main/resources/assets/taiga/models/item/aegisalt_ingot.json
deleted file mode 100644
index 508be6b..0000000
--- a/src/main/resources/assets/taiga/models/item/aegisalt_ingot.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/tic/aegisalt_ingot"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/arcanite_block.json b/src/main/resources/assets/taiga/models/item/arcanite_block.json
deleted file mode 100644
index 2a0f81a..0000000
--- a/src/main/resources/assets/taiga/models/item/arcanite_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/arcanite_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/arcanite_ingot.json b/src/main/resources/assets/taiga/models/item/arcanite_ingot.json
deleted file mode 100644
index 84961de..0000000
--- a/src/main/resources/assets/taiga/models/item/arcanite_ingot.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "item/generated",
-	"textures": {
-		"layer0": "taiga:items/tic/arcanite_ingot"
-	}
-}
diff --git a/src/main/resources/assets/taiga/models/item/arcanite_ore.json b/src/main/resources/assets/taiga/models/item/arcanite_ore.json
deleted file mode 100644
index b01b08a..0000000
--- a/src/main/resources/assets/taiga/models/item/arcanite_ore.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "taiga:block/arcanite_ore",
-    "display": {
-        "thirdperson": {
-            "rotation": [ 10, -45, 170 ],
-            "translation": [ 0, 1.5, -2.75 ],
-            "scale": [ 0.375, 0.375, 0.375 ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/astrium_block.json b/src/main/resources/assets/taiga/models/item/astrium_block.json
deleted file mode 100644
index d89d10d..0000000
--- a/src/main/resources/assets/taiga/models/item/astrium_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/astrium_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/astrium_dust.json b/src/main/resources/assets/taiga/models/item/astrium_dust.json
new file mode 100644
index 0000000..80405b4
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/astrium_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/astrium"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/astrium_ingot.json b/src/main/resources/assets/taiga/models/item/astrium_ingot.json
index 7f0d113..ec80257 100644
--- a/src/main/resources/assets/taiga/models/item/astrium_ingot.json
+++ b/src/main/resources/assets/taiga/models/item/astrium_ingot.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/tic/astrium_ingot"
+    "layer0": "taiga:items/ingot/astrium"
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/astrium_nugget.json b/src/main/resources/assets/taiga/models/item/astrium_nugget.json
index 63a0130..6f79201 100644
--- a/src/main/resources/assets/taiga/models/item/astrium_nugget.json
+++ b/src/main/resources/assets/taiga/models/item/astrium_nugget.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/astrium_nugget"
+    "layer0": "taiga:items/nugget/astrium"
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/aurorium_dust.json b/src/main/resources/assets/taiga/models/item/aurorium_dust.json
new file mode 100644
index 0000000..eaae4a3
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/aurorium_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/aurorium"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/aurorium_ingot.json b/src/main/resources/assets/taiga/models/item/aurorium_ingot.json
new file mode 100644
index 0000000..cb4b63e
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/aurorium_ingot.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/aurorium"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/bismuth_nugget.json b/src/main/resources/assets/taiga/models/item/aurorium_nugget.json
index c3f4fdc..2945f14 100644
--- a/src/main/resources/assets/taiga/models/item/bismuth_nugget.json
+++ b/src/main/resources/assets/taiga/models/item/aurorium_nugget.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/bismuth_nugget"
+    "layer0": "taiga:items/nugget/aurorium"
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/basalt.json b/src/main/resources/assets/taiga/models/item/basalt.json
deleted file mode 100644
index 664d2e9..0000000
--- a/src/main/resources/assets/taiga/models/item/basalt.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "taiga:block/basalt",
-    "display": {
-        "thirdperson": {
-            "rotation": [ 10, -45, 170 ],
-            "translation": [ 0, 1.5, -2.75 ],
-            "scale": [ 0.375, 0.375, 0.375 ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/basalt_dust.json b/src/main/resources/assets/taiga/models/item/basalt_dust.json
new file mode 100644
index 0000000..d87141c
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/basalt_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/basalt"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/basalt_ingot.json b/src/main/resources/assets/taiga/models/item/basalt_ingot.json
new file mode 100644
index 0000000..74e9ed6
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/basalt_ingot.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/basalt"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/basalt_nugget.json b/src/main/resources/assets/taiga/models/item/basalt_nugget.json
new file mode 100644
index 0000000..a8034c4
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/basalt_nugget.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/nugget/basalt"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/bismuth_block.json b/src/main/resources/assets/taiga/models/item/bismuth_block.json
deleted file mode 100644
index dc94827..0000000
--- a/src/main/resources/assets/taiga/models/item/bismuth_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/bismuth_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/bismuth_ingot.json b/src/main/resources/assets/taiga/models/item/bismuth_ingot.json
deleted file mode 100644
index 6aaf99e..0000000
--- a/src/main/resources/assets/taiga/models/item/bismuth_ingot.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "item/generated",
-	"textures": {
-		"layer0": "taiga:items/tic/bismuth_ingot"
-	}
-}
diff --git a/src/main/resources/assets/taiga/models/item/bismuth_ore.json b/src/main/resources/assets/taiga/models/item/bismuth_ore.json
deleted file mode 100644
index e0df8ef..0000000
--- a/src/main/resources/assets/taiga/models/item/bismuth_ore.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "taiga:block/bismuth_ore",
-    "display": {
-        "thirdperson": {
-            "rotation": [ 10, -45, 170 ],
-            "translation": [ 0, 1.5, -2.75 ],
-            "scale": [ 0.375, 0.375, 0.375 ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/bysmuid_block.json b/src/main/resources/assets/taiga/models/item/bysmuid_block.json
deleted file mode 100644
index 99088d3..0000000
--- a/src/main/resources/assets/taiga/models/item/bysmuid_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/bysmuid_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/bysmuid_ingot.json b/src/main/resources/assets/taiga/models/item/bysmuid_ingot.json
deleted file mode 100644
index 1ddab02..0000000
--- a/src/main/resources/assets/taiga/models/item/bysmuid_ingot.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/tic/bysmuid_ingot"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/cryptogen_block.json b/src/main/resources/assets/taiga/models/item/cryptogen_block.json
deleted file mode 100644
index 944e57e..0000000
--- a/src/main/resources/assets/taiga/models/item/cryptogen_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/cryptogen_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/cryptogen_ingot.json b/src/main/resources/assets/taiga/models/item/cryptogen_ingot.json
deleted file mode 100644
index 61228bf..0000000
--- a/src/main/resources/assets/taiga/models/item/cryptogen_ingot.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/tic/cryptogen_ingot"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/cryptogen_nugget.json b/src/main/resources/assets/taiga/models/item/cryptogen_nugget.json
deleted file mode 100644
index 3809976..0000000
--- a/src/main/resources/assets/taiga/models/item/cryptogen_nugget.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/cryptogen_nugget"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/duranite_dust.json b/src/main/resources/assets/taiga/models/item/duranite_dust.json
new file mode 100644
index 0000000..231d8b6
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/duranite_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/duranite"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/duranite_ingot.json b/src/main/resources/assets/taiga/models/item/duranite_ingot.json
new file mode 100644
index 0000000..1ea1dc8
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/duranite_ingot.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/duranite"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/bysmuid_nugget.json b/src/main/resources/assets/taiga/models/item/duranite_nugget.json
index 9b6c96c..fcc66cb 100644
--- a/src/main/resources/assets/taiga/models/item/bysmuid_nugget.json
+++ b/src/main/resources/assets/taiga/models/item/duranite_nugget.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/bysmuid_nugget"
+    "layer0": "taiga:items/nugget/duranite"
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/dyonite_block.json b/src/main/resources/assets/taiga/models/item/dyonite_block.json
deleted file mode 100644
index 0e265a1..0000000
--- a/src/main/resources/assets/taiga/models/item/dyonite_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/dyonite_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/dyonite_dust.json b/src/main/resources/assets/taiga/models/item/dyonite_dust.json
new file mode 100644
index 0000000..83fe62c
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/dyonite_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/dyonite"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/dyonite_ingot.json b/src/main/resources/assets/taiga/models/item/dyonite_ingot.json
index 9477420..360070d 100644
--- a/src/main/resources/assets/taiga/models/item/dyonite_ingot.json
+++ b/src/main/resources/assets/taiga/models/item/dyonite_ingot.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/tic/dyonite_ingot"
+    "layer0": "taiga:items/ingot/dyonite"
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/dyonite_nugget.json b/src/main/resources/assets/taiga/models/item/dyonite_nugget.json
index 1ca813f..d39df64 100644
--- a/src/main/resources/assets/taiga/models/item/dyonite_nugget.json
+++ b/src/main/resources/assets/taiga/models/item/dyonite_nugget.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/dyonite_nugget"
+    "layer0": "taiga:items/nugget/dyonite"
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/eezo_dust.json b/src/main/resources/assets/taiga/models/item/eezo_dust.json
new file mode 100644
index 0000000..a455eb0
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/eezo_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/eezo"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/eezo_ingot.json b/src/main/resources/assets/taiga/models/item/eezo_ingot.json
new file mode 100644
index 0000000..69c2eaa
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/eezo_ingot.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/eezo"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/eezo_nugget.json b/src/main/resources/assets/taiga/models/item/eezo_nugget.json
new file mode 100644
index 0000000..5e1f1a5
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/eezo_nugget.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/nugget/eezo"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/eternite_block.json b/src/main/resources/assets/taiga/models/item/eternite_block.json
deleted file mode 100644
index dfcc402..0000000
--- a/src/main/resources/assets/taiga/models/item/eternite_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/eternite_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/eternite_ingot.json b/src/main/resources/assets/taiga/models/item/eternite_ingot.json
deleted file mode 100644
index a825ab8..0000000
--- a/src/main/resources/assets/taiga/models/item/eternite_ingot.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "item/generated",
-	"textures": {
-		"layer0": "taiga:items/tic/eternite_ingot"
-	}
-}
diff --git a/src/main/resources/assets/taiga/models/item/eternite_nugget.json b/src/main/resources/assets/taiga/models/item/eternite_nugget.json
deleted file mode 100644
index 4f94d69..0000000
--- a/src/main/resources/assets/taiga/models/item/eternite_nugget.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/eternite_nugget"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/eternite_ore.json b/src/main/resources/assets/taiga/models/item/eternite_ore.json
deleted file mode 100644
index a5459df..0000000
--- a/src/main/resources/assets/taiga/models/item/eternite_ore.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "taiga:block/eternite_ore",
-    "display": {
-        "thirdperson": {
-            "rotation": [ 10, -45, 170 ],
-            "translation": [ 0, 1.5, -2.75 ],
-            "scale": [ 0.375, 0.375, 0.375 ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/fractoryte_block.json b/src/main/resources/assets/taiga/models/item/fractoryte_block.json
deleted file mode 100644
index 4e7f7dd..0000000
--- a/src/main/resources/assets/taiga/models/item/fractoryte_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/fractoryte_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/fractoryte_ingot.json b/src/main/resources/assets/taiga/models/item/fractoryte_ingot.json
deleted file mode 100644
index 434b54c..0000000
--- a/src/main/resources/assets/taiga/models/item/fractoryte_ingot.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/tic/fractoryte_ingot"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/fractoryte_nugget.json b/src/main/resources/assets/taiga/models/item/fractoryte_nugget.json
deleted file mode 100644
index 40f5a6a..0000000
--- a/src/main/resources/assets/taiga/models/item/fractoryte_nugget.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/fractoryte_nugget"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/fractum_dust.json b/src/main/resources/assets/taiga/models/item/fractum_dust.json
new file mode 100644
index 0000000..5cf75be
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/fractum_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/fractum"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/fractum_ingot.json b/src/main/resources/assets/taiga/models/item/fractum_ingot.json
new file mode 100644
index 0000000..83acabd
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/fractum_ingot.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/fractum"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/fractum_nugget.json b/src/main/resources/assets/taiga/models/item/fractum_nugget.json
new file mode 100644
index 0000000..40ad420
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/fractum_nugget.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/nugget/fractum"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/fuel_brick.json b/src/main/resources/assets/taiga/models/item/fuel_brick.json
deleted file mode 100644
index 59f0a97..0000000
--- a/src/main/resources/assets/taiga/models/item/fuel_brick.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "taiga:items/fuel_brick"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/glimmerstone_dust.json b/src/main/resources/assets/taiga/models/item/glimmerstone_dust.json
deleted file mode 100644
index ed00c38..0000000
--- a/src/main/resources/assets/taiga/models/item/glimmerstone_dust.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/glimmerstone_dust"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/ignitite_block.json b/src/main/resources/assets/taiga/models/item/ignitite_block.json
deleted file mode 100644
index 8a95e4b..0000000
--- a/src/main/resources/assets/taiga/models/item/ignitite_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/ignitite_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/ignitite_ingot.json b/src/main/resources/assets/taiga/models/item/ignitite_ingot.json
deleted file mode 100644
index 012f4fa..0000000
--- a/src/main/resources/assets/taiga/models/item/ignitite_ingot.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "item/generated",
-	"textures": {
-		"layer0": "taiga:items/tic/ignitite_ingot"
-	}
-}
diff --git a/src/main/resources/assets/taiga/models/item/ignitite_nugget.json b/src/main/resources/assets/taiga/models/item/ignitite_nugget.json
deleted file mode 100644
index 114115a..0000000
--- a/src/main/resources/assets/taiga/models/item/ignitite_nugget.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/ignitite_nugget"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/ignitite_ore.json b/src/main/resources/assets/taiga/models/item/ignitite_ore.json
deleted file mode 100644
index 3ebe3d6..0000000
--- a/src/main/resources/assets/taiga/models/item/ignitite_ore.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "taiga:block/ignitite_ore",
-    "display": {
-        "thirdperson": {
-            "rotation": [ 10, -45, 170 ],
-            "translation": [ 0, 1.5, -2.75 ],
-            "scale": [ 0.375, 0.375, 0.375 ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/ignitz_dust.json b/src/main/resources/assets/taiga/models/item/ignitz_dust.json
new file mode 100644
index 0000000..f5e0782
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/ignitz_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/ignitz"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/ignitz_ingot.json b/src/main/resources/assets/taiga/models/item/ignitz_ingot.json
new file mode 100644
index 0000000..73303cb
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/ignitz_ingot.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/ignitz"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/ignitz_nugget.json b/src/main/resources/assets/taiga/models/item/ignitz_nugget.json
new file mode 100644
index 0000000..b8de1da
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/ignitz_nugget.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/nugget/ignitz"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/imperomite_block.json b/src/main/resources/assets/taiga/models/item/imperomite_block.json
deleted file mode 100644
index aae9a25..0000000
--- a/src/main/resources/assets/taiga/models/item/imperomite_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/imperomite_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/imperomite_dust.json b/src/main/resources/assets/taiga/models/item/imperomite_dust.json
new file mode 100644
index 0000000..bc46805
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/imperomite_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/imperomite"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/imperomite_ingot.json b/src/main/resources/assets/taiga/models/item/imperomite_ingot.json
index ac1b3ec..fbbc620 100644
--- a/src/main/resources/assets/taiga/models/item/imperomite_ingot.json
+++ b/src/main/resources/assets/taiga/models/item/imperomite_ingot.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/tic/imperomite_ingot"
+    "layer0": "taiga:items/ingot/imperomite"
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/imperomite_nugget.json b/src/main/resources/assets/taiga/models/item/imperomite_nugget.json
index e2694cd..c953496 100644
--- a/src/main/resources/assets/taiga/models/item/imperomite_nugget.json
+++ b/src/main/resources/assets/taiga/models/item/imperomite_nugget.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/imperomite_nugget"
+    "layer0": "taiga:items/nugget/imperomite"
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/lignite2.json b/src/main/resources/assets/taiga/models/item/iox_dust.json
index 5a2d713..042089b 100644
--- a/src/main/resources/assets/taiga/models/item/lignite2.json
+++ b/src/main/resources/assets/taiga/models/item/iox_dust.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/lignite"
+    "layer0": "taiga:items/dust/iox"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/iox_ingot.json b/src/main/resources/assets/taiga/models/item/iox_ingot.json
new file mode 100644
index 0000000..7c3b031
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/iox_ingot.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/iox"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/iox_nugget.json b/src/main/resources/assets/taiga/models/item/iox_nugget.json
new file mode 100644
index 0000000..cbe1f62
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/iox_nugget.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/nugget/iox"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/iron_nugget.json b/src/main/resources/assets/taiga/models/item/iron_nugget.json
index 1e57190..2722100 100644
--- a/src/main/resources/assets/taiga/models/item/iron_nugget.json
+++ b/src/main/resources/assets/taiga/models/item/iron_nugget.json
@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "taiga:items/iron_nugget"
-        }
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/nugget/iron"
+  }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/karmesine_block.json b/src/main/resources/assets/taiga/models/item/karmesine_block.json
deleted file mode 100644
index b26ef09..0000000
--- a/src/main/resources/assets/taiga/models/item/karmesine_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/karmesine_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/karmesine_dust.json b/src/main/resources/assets/taiga/models/item/karmesine_dust.json
new file mode 100644
index 0000000..dae2a47
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/karmesine_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/karmesine"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/karmesine_ingot.json b/src/main/resources/assets/taiga/models/item/karmesine_ingot.json
index 140f91c..e824e5f 100644
--- a/src/main/resources/assets/taiga/models/item/karmesine_ingot.json
+++ b/src/main/resources/assets/taiga/models/item/karmesine_ingot.json
@@ -1,6 +1,6 @@
 {
-	"parent": "item/generated",
-	"textures": {
-		"layer0": "taiga:items/tic/karmesine_ingot"
-	}
-}
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/karmesine"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/karmesine_nugget.json b/src/main/resources/assets/taiga/models/item/karmesine_nugget.json
index 7777013..e3f6569 100644
--- a/src/main/resources/assets/taiga/models/item/karmesine_nugget.json
+++ b/src/main/resources/assets/taiga/models/item/karmesine_nugget.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/karmesine_nugget"
+    "layer0": "taiga:items/nugget/karmesine"
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/karmesine_ore.json b/src/main/resources/assets/taiga/models/item/karmesine_ore.json
deleted file mode 100644
index dd7fb2a..0000000
--- a/src/main/resources/assets/taiga/models/item/karmesine_ore.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "taiga:block/karmesine_ore",
-    "display": {
-        "thirdperson": {
-            "rotation": [ 10, -45, 170 ],
-            "translation": [ 0, 1.5, -2.75 ],
-            "scale": [ 0.375, 0.375, 0.375 ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/lignite.json b/src/main/resources/assets/taiga/models/item/lignite.json
deleted file mode 100644
index 209272f..0000000
--- a/src/main/resources/assets/taiga/models/item/lignite.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "taiga:items/lignite"
-        }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/lignite_ore.json b/src/main/resources/assets/taiga/models/item/lignite_ore.json
deleted file mode 100644
index 27ad4cc..0000000
--- a/src/main/resources/assets/taiga/models/item/lignite_ore.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "taiga:block/lignite_ore",
-    "display": {
-        "thirdperson": {
-            "rotation": [ 10, -45, 170 ],
-            "translation": [ 0, 1.5, -2.75 ],
-            "scale": [ 0.375, 0.375, 0.375 ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/luminar_dust.json b/src/main/resources/assets/taiga/models/item/luminar_dust.json
deleted file mode 100644
index c34c3aa..0000000
--- a/src/main/resources/assets/taiga/models/item/luminar_dust.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/luminar_dust"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/lumix_dust.json b/src/main/resources/assets/taiga/models/item/lumix_dust.json
new file mode 100644
index 0000000..d1ad3ab
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/lumix_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/lumix"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/lumix_ingot.json b/src/main/resources/assets/taiga/models/item/lumix_ingot.json
new file mode 100644
index 0000000..142665e
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/lumix_ingot.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/lumix"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/lumix_nugget.json b/src/main/resources/assets/taiga/models/item/lumix_nugget.json
new file mode 100644
index 0000000..475b1b3
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/lumix_nugget.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/nugget/lumix"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/lumixyl_block.json b/src/main/resources/assets/taiga/models/item/lumixyl_block.json
deleted file mode 100644
index 844be06..0000000
--- a/src/main/resources/assets/taiga/models/item/lumixyl_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/lumixyl_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/lumixyl_ingot.json b/src/main/resources/assets/taiga/models/item/lumixyl_ingot.json
deleted file mode 100644
index 4f1860d..0000000
--- a/src/main/resources/assets/taiga/models/item/lumixyl_ingot.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/tic/lumixyl_ingot"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/lumixyl_nugget.json b/src/main/resources/assets/taiga/models/item/lumixyl_nugget.json
deleted file mode 100644
index f4bf1cf..0000000
--- a/src/main/resources/assets/taiga/models/item/lumixyl_nugget.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/lumixyl_nugget"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/meteorite_block.json b/src/main/resources/assets/taiga/models/item/meteorite_block.json
deleted file mode 100644
index 8c679ec..0000000
--- a/src/main/resources/assets/taiga/models/item/meteorite_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/meteorite_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/meteorite_dust.json b/src/main/resources/assets/taiga/models/item/meteorite_dust.json
new file mode 100644
index 0000000..b75203b
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/meteorite_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/meteorite"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/meteorite_ingot.json b/src/main/resources/assets/taiga/models/item/meteorite_ingot.json
index f5d2c65..5cb7e80 100644
--- a/src/main/resources/assets/taiga/models/item/meteorite_ingot.json
+++ b/src/main/resources/assets/taiga/models/item/meteorite_ingot.json
@@ -1,6 +1,6 @@
 {
-	"parent": "item/generated",
-	"textures": {
-		"layer0": "taiga:items/tic/meteorite_ingot"
-	}
-}
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/meteorite"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/meteorite_nugget.json b/src/main/resources/assets/taiga/models/item/meteorite_nugget.json
index 2216ae2..9266051 100644
--- a/src/main/resources/assets/taiga/models/item/meteorite_nugget.json
+++ b/src/main/resources/assets/taiga/models/item/meteorite_nugget.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/meteorite_nugget"
+    "layer0": "taiga:items/nugget/meteorite"
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/meteorite_ore.json b/src/main/resources/assets/taiga/models/item/meteorite_ore.json
deleted file mode 100644
index 17ad724..0000000
--- a/src/main/resources/assets/taiga/models/item/meteorite_ore.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "taiga:block/meteorite_ore",
-    "display": {
-        "thirdperson": {
-            "rotation": [ 10, -45, 170 ],
-            "translation": [ 0, 1.5, -2.75 ],
-            "scale": [ 0.375, 0.375, 0.375 ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/mindorite_block.json b/src/main/resources/assets/taiga/models/item/mindorite_block.json
deleted file mode 100644
index 94a9dea..0000000
--- a/src/main/resources/assets/taiga/models/item/mindorite_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/mindorite_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/mindorite_ingot.json b/src/main/resources/assets/taiga/models/item/mindorite_ingot.json
deleted file mode 100644
index c23d6cd..0000000
--- a/src/main/resources/assets/taiga/models/item/mindorite_ingot.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "item/generated",
-	"textures": {
-		"layer0": "taiga:items/tic/mindorite_ingot"
-	}
-}
diff --git a/src/main/resources/assets/taiga/models/item/mindorite_nugget.json b/src/main/resources/assets/taiga/models/item/mindorite_nugget.json
deleted file mode 100644
index 9d3ff77..0000000
--- a/src/main/resources/assets/taiga/models/item/mindorite_nugget.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/mindorite_nugget"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/mindorite_ore.json b/src/main/resources/assets/taiga/models/item/mindorite_ore.json
deleted file mode 100644
index 69e15e8..0000000
--- a/src/main/resources/assets/taiga/models/item/mindorite_ore.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "taiga:block/mindorite_ore",
-    "display": {
-        "thirdperson": {
-            "rotation": [ 10, -45, 170 ],
-            "translation": [ 0, 1.5, -2.75 ],
-            "scale": [ 0.375, 0.375, 0.375 ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/mythril_block.json b/src/main/resources/assets/taiga/models/item/mythril_block.json
deleted file mode 100644
index 174bfa3..0000000
--- a/src/main/resources/assets/taiga/models/item/mythril_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/mythril_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/mythril_ingot.json b/src/main/resources/assets/taiga/models/item/mythril_ingot.json
deleted file mode 100644
index 8b2d9f8..0000000
--- a/src/main/resources/assets/taiga/models/item/mythril_ingot.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "item/generated",
-	"textures": {
-		"layer0": "taiga:items/tic/mythril_ingot"
-	}
-}
diff --git a/src/main/resources/assets/taiga/models/item/mythril_nugget.json b/src/main/resources/assets/taiga/models/item/mythril_nugget.json
deleted file mode 100644
index f2a449b..0000000
--- a/src/main/resources/assets/taiga/models/item/mythril_nugget.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/mythril_nugget"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/mythril_ore.json b/src/main/resources/assets/taiga/models/item/mythril_ore.json
deleted file mode 100644
index 28b1cd4..0000000
--- a/src/main/resources/assets/taiga/models/item/mythril_ore.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "taiga:block/mythril_ore",
-    "display": {
-        "thirdperson": {
-            "rotation": [ 10, -45, 170 ],
-            "translation": [ 0, 1.5, -2.75 ],
-            "scale": [ 0.375, 0.375, 0.375 ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/nihilite_dust.json b/src/main/resources/assets/taiga/models/item/nihilite_dust.json
new file mode 100644
index 0000000..9a69b25
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/nihilite_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/nihilite"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/nihilite_ingot.json b/src/main/resources/assets/taiga/models/item/nihilite_ingot.json
new file mode 100644
index 0000000..d207db6
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/nihilite_ingot.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/nihilite"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/nihilite_nugget.json b/src/main/resources/assets/taiga/models/item/nihilite_nugget.json
new file mode 100644
index 0000000..a6a123c
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/nihilite_nugget.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/nugget/nihilite"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/niob_dust.json b/src/main/resources/assets/taiga/models/item/niob_dust.json
new file mode 100644
index 0000000..5e6be07
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/niob_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/niob"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/niob_ingot.json b/src/main/resources/assets/taiga/models/item/niob_ingot.json
new file mode 100644
index 0000000..f2f41d1
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/niob_ingot.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/niob"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/niob_nugget.json b/src/main/resources/assets/taiga/models/item/niob_nugget.json
new file mode 100644
index 0000000..b9e4670
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/niob_nugget.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/nugget/niob"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/nitronite_block.json b/src/main/resources/assets/taiga/models/item/nitronite_block.json
deleted file mode 100644
index 8ffdf79..0000000
--- a/src/main/resources/assets/taiga/models/item/nitronite_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/nitronite_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/nitronite_ingot.json b/src/main/resources/assets/taiga/models/item/nitronite_ingot.json
deleted file mode 100644
index faa44e2..0000000
--- a/src/main/resources/assets/taiga/models/item/nitronite_ingot.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/tic/nitronite_ingot"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/nitronite_nugget.json b/src/main/resources/assets/taiga/models/item/nitronite_nugget.json
deleted file mode 100644
index 07b2965..0000000
--- a/src/main/resources/assets/taiga/models/item/nitronite_nugget.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/nitronite_nugget"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/noctunyx_block.json b/src/main/resources/assets/taiga/models/item/noctunyx_block.json
deleted file mode 100644
index fb4f3fd..0000000
--- a/src/main/resources/assets/taiga/models/item/noctunyx_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/noctunyx_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/noctunyx_ingot.json b/src/main/resources/assets/taiga/models/item/noctunyx_ingot.json
deleted file mode 100644
index 80db035..0000000
--- a/src/main/resources/assets/taiga/models/item/noctunyx_ingot.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/tic/noctunyx_ingot"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/noctunyx_nugget.json b/src/main/resources/assets/taiga/models/item/noctunyx_nugget.json
deleted file mode 100644
index 48e7092..0000000
--- a/src/main/resources/assets/taiga/models/item/noctunyx_nugget.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/noctunyx_nugget"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/nucleum_block.json b/src/main/resources/assets/taiga/models/item/nucleum_block.json
deleted file mode 100644
index e626f98..0000000
--- a/src/main/resources/assets/taiga/models/item/nucleum_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/nucleum_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/nucleum_dust.json b/src/main/resources/assets/taiga/models/item/nucleum_dust.json
new file mode 100644
index 0000000..e22c116
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/nucleum_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/nucleum"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/nucleum_ingot.json b/src/main/resources/assets/taiga/models/item/nucleum_ingot.json
index c885daa..469b9c7 100644
--- a/src/main/resources/assets/taiga/models/item/nucleum_ingot.json
+++ b/src/main/resources/assets/taiga/models/item/nucleum_ingot.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/tic/nucleum_ingot"
+    "layer0": "taiga:items/ingot/nucleum"
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/nucleum_nugget.json b/src/main/resources/assets/taiga/models/item/nucleum_nugget.json
index b92f0b0..3a5a192 100644
--- a/src/main/resources/assets/taiga/models/item/nucleum_nugget.json
+++ b/src/main/resources/assets/taiga/models/item/nucleum_nugget.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/nucleum_nugget"
+    "layer0": "taiga:items/nugget/nucleum"
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/arcanite_nugget.json b/src/main/resources/assets/taiga/models/item/obsidiorite_dust.json
index 45e1bcd..80bfcf3 100644
--- a/src/main/resources/assets/taiga/models/item/arcanite_nugget.json
+++ b/src/main/resources/assets/taiga/models/item/obsidiorite_dust.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/arcanite_nugget"
+    "layer0": "taiga:items/dust/obsidiorite"
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/obsidiorite_ingot.json b/src/main/resources/assets/taiga/models/item/obsidiorite_ingot.json
new file mode 100644
index 0000000..678aff1
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/obsidiorite_ingot.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/obsidiorite"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/adamantite_nugget.json b/src/main/resources/assets/taiga/models/item/obsidiorite_nugget.json
index 2f54707..4e2769f 100644
--- a/src/main/resources/assets/taiga/models/item/adamantite_nugget.json
+++ b/src/main/resources/assets/taiga/models/item/obsidiorite_nugget.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/adamantite_nugget"
+    "layer0": "taiga:items/nugget/obsidiorite"
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/osram_dust.json b/src/main/resources/assets/taiga/models/item/osram_dust.json
new file mode 100644
index 0000000..8564a98
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/osram_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/osram"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/osram_ingot.json b/src/main/resources/assets/taiga/models/item/osram_ingot.json
new file mode 100644
index 0000000..5a56e2c
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/osram_ingot.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/osram"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/osram_nugget.json b/src/main/resources/assets/taiga/models/item/osram_nugget.json
new file mode 100644
index 0000000..77cc104
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/osram_nugget.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/nugget/osram"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/palladium_block.json b/src/main/resources/assets/taiga/models/item/palladium_block.json
deleted file mode 100644
index 3615103..0000000
--- a/src/main/resources/assets/taiga/models/item/palladium_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/palladium_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/palladium_dust.json b/src/main/resources/assets/taiga/models/item/palladium_dust.json
new file mode 100644
index 0000000..d5f21eb
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/palladium_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/palladium"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/palladium_ingot.json b/src/main/resources/assets/taiga/models/item/palladium_ingot.json
index c671234..f922329 100644
--- a/src/main/resources/assets/taiga/models/item/palladium_ingot.json
+++ b/src/main/resources/assets/taiga/models/item/palladium_ingot.json
@@ -1,6 +1,6 @@
 {
-	"parent": "item/generated",
-	"textures": {
-		"layer0": "taiga:items/tic/palladium_ingot"
-	}
-}
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/palladium"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/palladium_nugget.json b/src/main/resources/assets/taiga/models/item/palladium_nugget.json
index 215f4a5..305211f 100644
--- a/src/main/resources/assets/taiga/models/item/palladium_nugget.json
+++ b/src/main/resources/assets/taiga/models/item/palladium_nugget.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/palladium_nugget"
+    "layer0": "taiga:items/nugget/palladium"
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/palladium_ore.json b/src/main/resources/assets/taiga/models/item/palladium_ore.json
deleted file mode 100644
index ae04cb2..0000000
--- a/src/main/resources/assets/taiga/models/item/palladium_ore.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "taiga:block/palladium_ore",
-    "display": {
-        "thirdperson": {
-            "rotation": [ 10, -45, 170 ],
-            "translation": [ 0, 1.5, -2.75 ],
-            "scale": [ 0.375, 0.375, 0.375 ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/prometheum_block.json b/src/main/resources/assets/taiga/models/item/prometheum_block.json
deleted file mode 100644
index 4ee46a8..0000000
--- a/src/main/resources/assets/taiga/models/item/prometheum_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/prometheum_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/prometheum_dust.json b/src/main/resources/assets/taiga/models/item/prometheum_dust.json
new file mode 100644
index 0000000..8094a39
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/prometheum_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/prometheum"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/prometheum_ingot.json b/src/main/resources/assets/taiga/models/item/prometheum_ingot.json
index 8471608..5a0b9d4 100644
--- a/src/main/resources/assets/taiga/models/item/prometheum_ingot.json
+++ b/src/main/resources/assets/taiga/models/item/prometheum_ingot.json
@@ -1,6 +1,6 @@
 {
-	"parent": "item/generated",
-	"textures": {
-		"layer0": "taiga:items/tic/prometheum_ingot"
-	}
-}
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/prometheum"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/prometheum_nugget.json b/src/main/resources/assets/taiga/models/item/prometheum_nugget.json
index babd346..581db2f 100644
--- a/src/main/resources/assets/taiga/models/item/prometheum_nugget.json
+++ b/src/main/resources/assets/taiga/models/item/prometheum_nugget.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/prometheum_nugget"
+    "layer0": "taiga:items/nugget/prometheum"
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/prometheum_ore.json b/src/main/resources/assets/taiga/models/item/prometheum_ore.json
deleted file mode 100644
index 7987d25..0000000
--- a/src/main/resources/assets/taiga/models/item/prometheum_ore.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "taiga:block/prometheum_ore",
-    "display": {
-        "thirdperson": {
-            "rotation": [ 10, -45, 170 ],
-            "translation": [ 0, 1.5, -2.75 ],
-            "scale": [ 0.375, 0.375, 0.375 ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/proxideum_block.json b/src/main/resources/assets/taiga/models/item/proxideum_block.json
deleted file mode 100644
index 5ceab96..0000000
--- a/src/main/resources/assets/taiga/models/item/proxideum_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/proxideum_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/proxideum_ingot.json b/src/main/resources/assets/taiga/models/item/proxideum_ingot.json
deleted file mode 100644
index b55dcfa..0000000
--- a/src/main/resources/assets/taiga/models/item/proxideum_ingot.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/tic/proxideum_ingot"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/proxideum_nugget.json b/src/main/resources/assets/taiga/models/item/proxideum_nugget.json
deleted file mode 100644
index 87d9ece..0000000
--- a/src/main/resources/assets/taiga/models/item/proxideum_nugget.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/proxideum_nugget"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/proxii_dust.json b/src/main/resources/assets/taiga/models/item/proxii_dust.json
new file mode 100644
index 0000000..cbbf8aa
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/proxii_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/proxii"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/proxii_ingot.json b/src/main/resources/assets/taiga/models/item/proxii_ingot.json
new file mode 100644
index 0000000..3c3faa7
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/proxii_ingot.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/proxii"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/proxii_nugget.json b/src/main/resources/assets/taiga/models/item/proxii_nugget.json
new file mode 100644
index 0000000..e23c880
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/proxii_nugget.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/nugget/proxii"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/radiant_pearl.json b/src/main/resources/assets/taiga/models/item/radiant_pearl.json
deleted file mode 100644
index 6051361..0000000
--- a/src/main/resources/assets/taiga/models/item/radiant_pearl.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/radiant_pearl"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/rotten_ground.json b/src/main/resources/assets/taiga/models/item/rotten_ground.json
deleted file mode 100644
index caba235..0000000
--- a/src/main/resources/assets/taiga/models/item/rotten_ground.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "taiga:block/rotten_ground",
-    "display": {
-        "thirdperson": {
-            "rotation": [ 10, -45, 170 ],
-            "translation": [ 0, 1.5, -2.75 ],
-            "scale": [ 0.375, 0.375, 0.375 ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/rubium_block.json b/src/main/resources/assets/taiga/models/item/rubium_block.json
deleted file mode 100644
index 29b897d..0000000
--- a/src/main/resources/assets/taiga/models/item/rubium_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/rubium_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/rubium_ingot.json b/src/main/resources/assets/taiga/models/item/rubium_ingot.json
deleted file mode 100644
index 6a15be0..0000000
--- a/src/main/resources/assets/taiga/models/item/rubium_ingot.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "item/generated",
-	"textures": {
-		"layer0": "taiga:items/tic/rubium_ingot"
-	}
-}
diff --git a/src/main/resources/assets/taiga/models/item/rubium_nugget.json b/src/main/resources/assets/taiga/models/item/rubium_nugget.json
deleted file mode 100644
index cad9445..0000000
--- a/src/main/resources/assets/taiga/models/item/rubium_nugget.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/rubium_nugget"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/rubium_ore.json b/src/main/resources/assets/taiga/models/item/rubium_ore.json
deleted file mode 100644
index 41d040e..0000000
--- a/src/main/resources/assets/taiga/models/item/rubium_ore.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "taiga:block/rubium_ore",
-    "display": {
-        "thirdperson": {
-            "rotation": [ 10, -45, 170 ],
-            "translation": [ 0, 1.5, -2.75 ],
-            "scale": [ 0.375, 0.375, 0.375 ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/seismodium_block.json b/src/main/resources/assets/taiga/models/item/seismodium_block.json
deleted file mode 100644
index a4a5e5c..0000000
--- a/src/main/resources/assets/taiga/models/item/seismodium_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/seismodium_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/seismodium_ingot.json b/src/main/resources/assets/taiga/models/item/seismodium_ingot.json
deleted file mode 100644
index dc2fd45..0000000
--- a/src/main/resources/assets/taiga/models/item/seismodium_ingot.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/tic/seismodium_ingot"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/seismodium_nugget.json b/src/main/resources/assets/taiga/models/item/seismodium_nugget.json
deleted file mode 100644
index 5762b21..0000000
--- a/src/main/resources/assets/taiga/models/item/seismodium_nugget.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/seismodium_nugget"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/seismum_dust.json b/src/main/resources/assets/taiga/models/item/seismum_dust.json
new file mode 100644
index 0000000..755435e
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/seismum_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/seismum"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/seismum_ingot.json b/src/main/resources/assets/taiga/models/item/seismum_ingot.json
new file mode 100644
index 0000000..87c40ee
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/seismum_ingot.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/seismum"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/seismum_nugget.json b/src/main/resources/assets/taiga/models/item/seismum_nugget.json
new file mode 100644
index 0000000..a78ec32
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/seismum_nugget.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/nugget/seismum"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/slaggold_ingot.json b/src/main/resources/assets/taiga/models/item/slaggold_ingot.json
deleted file mode 100644
index 84098e1..0000000
--- a/src/main/resources/assets/taiga/models/item/slaggold_ingot.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "taiga:items/slaggold_ingot"
-        }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/slaggold_ore.json b/src/main/resources/assets/taiga/models/item/slaggold_ore.json
deleted file mode 100644
index 8ccd6d5..0000000
--- a/src/main/resources/assets/taiga/models/item/slaggold_ore.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "taiga:block/slaggold_ore",
-    "display": {
-        "thirdperson": {
-            "rotation": [ 10, -45, 170 ],
-            "translation": [ 0, 1.5, -2.75 ],
-            "scale": [ 0.375, 0.375, 0.375 ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/slagiron_ingot.json b/src/main/resources/assets/taiga/models/item/slagiron_ingot.json
deleted file mode 100644
index 7d8c90c..0000000
--- a/src/main/resources/assets/taiga/models/item/slagiron_ingot.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "taiga:items/slagiron_ingot"
-        }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/slagiron_ore.json b/src/main/resources/assets/taiga/models/item/slagiron_ore.json
deleted file mode 100644
index f6b8d18..0000000
--- a/src/main/resources/assets/taiga/models/item/slagiron_ore.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "taiga:block/slagiron_ore",
-    "display": {
-        "thirdperson": {
-            "rotation": [ 10, -45, 170 ],
-            "translation": [ 0, 1.5, -2.75 ],
-            "scale": [ 0.375, 0.375, 0.375 ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/solarium_block.json b/src/main/resources/assets/taiga/models/item/solarium_block.json
deleted file mode 100644
index bb7cbb2..0000000
--- a/src/main/resources/assets/taiga/models/item/solarium_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/solarium_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/solarium_dust.json b/src/main/resources/assets/taiga/models/item/solarium_dust.json
new file mode 100644
index 0000000..7ec4254
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/solarium_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/solarium"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/solarium_ingot.json b/src/main/resources/assets/taiga/models/item/solarium_ingot.json
index 0bfae24..40369b9 100644
--- a/src/main/resources/assets/taiga/models/item/solarium_ingot.json
+++ b/src/main/resources/assets/taiga/models/item/solarium_ingot.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/tic/solarium_ingot"
+    "layer0": "taiga:items/ingot/solarium"
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/solarium_nugget.json b/src/main/resources/assets/taiga/models/item/solarium_nugget.json
index 5d41019..dc1578f 100644
--- a/src/main/resources/assets/taiga/models/item/solarium_nugget.json
+++ b/src/main/resources/assets/taiga/models/item/solarium_nugget.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/solarium_nugget"
+    "layer0": "taiga:items/nugget/solarium"
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/spectrum_dust.json b/src/main/resources/assets/taiga/models/item/spectrum_dust.json
deleted file mode 100644
index 772fb80..0000000
--- a/src/main/resources/assets/taiga/models/item/spectrum_dust.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/spectrum_dust"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/terramite_block.json b/src/main/resources/assets/taiga/models/item/terramite_block.json
deleted file mode 100644
index ed5335f..0000000
--- a/src/main/resources/assets/taiga/models/item/terramite_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/terramite_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/terramite_ingot.json b/src/main/resources/assets/taiga/models/item/terramite_ingot.json
deleted file mode 100644
index eb61789..0000000
--- a/src/main/resources/assets/taiga/models/item/terramite_ingot.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/tic/terramite_ingot"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/terramite_nugget.json b/src/main/resources/assets/taiga/models/item/terramite_nugget.json
deleted file mode 100644
index 34f165d..0000000
--- a/src/main/resources/assets/taiga/models/item/terramite_nugget.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/terramite_nugget"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/tiberium_block.json b/src/main/resources/assets/taiga/models/item/tiberium_block.json
deleted file mode 100644
index 8b8f049..0000000
--- a/src/main/resources/assets/taiga/models/item/tiberium_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/tiberium_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/tiberium_dust.json b/src/main/resources/assets/taiga/models/item/tiberium_dust.json
new file mode 100644
index 0000000..e92eedb
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/tiberium_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/tiberium"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/tiberium_ingot.json b/src/main/resources/assets/taiga/models/item/tiberium_ingot.json
index 9c8c804..6c080d6 100644
--- a/src/main/resources/assets/taiga/models/item/tiberium_ingot.json
+++ b/src/main/resources/assets/taiga/models/item/tiberium_ingot.json
@@ -1,6 +1,6 @@
 {
-	"parent": "item/generated",
-	"textures": {
-		"layer0": "taiga:items/tic/tiberium_ingot"
-	}
-}
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/tiberium"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/tiberium_nugget.json b/src/main/resources/assets/taiga/models/item/tiberium_nugget.json
index cfc4ef2..0389288 100644
--- a/src/main/resources/assets/taiga/models/item/tiberium_nugget.json
+++ b/src/main/resources/assets/taiga/models/item/tiberium_nugget.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/tiberium_nugget"
+    "layer0": "taiga:items/nugget/tiberium"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/tiberium_ore.json b/src/main/resources/assets/taiga/models/item/tiberium_ore.json
deleted file mode 100644
index bf90e8e..0000000
--- a/src/main/resources/assets/taiga/models/item/tiberium_ore.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "taiga:block/tiberium_ore",
-    "display": {
-        "thirdperson": {
-            "rotation": [ 10, -45, 170 ],
-            "translation": [ 0, 1.5, -2.75 ],
-            "scale": [ 0.375, 0.375, 0.375 ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/tiberium_shard_instable.json b/src/main/resources/assets/taiga/models/item/tiberium_shard_instable.json
deleted file mode 100644
index f884ae4..0000000
--- a/src/main/resources/assets/taiga/models/item/tiberium_shard_instable.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/tiberium_shard_instable"
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/titanite_block.json b/src/main/resources/assets/taiga/models/item/titanite_block.json
deleted file mode 100644
index 766c218..0000000
--- a/src/main/resources/assets/taiga/models/item/titanite_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/titanite_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/titanite_ingot.json b/src/main/resources/assets/taiga/models/item/titanite_ingot.json
deleted file mode 100644
index 4328198..0000000
--- a/src/main/resources/assets/taiga/models/item/titanite_ingot.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"parent": "item/generated",
-	"textures": {
-		"layer0": "taiga:items/tic/titanite_ingot"
-	}
-}
diff --git a/src/main/resources/assets/taiga/models/item/titanite_nugget.json b/src/main/resources/assets/taiga/models/item/titanite_nugget.json
deleted file mode 100644
index cad6a9f..0000000
--- a/src/main/resources/assets/taiga/models/item/titanite_nugget.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/titanite_nugget"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/titanite_ore.json b/src/main/resources/assets/taiga/models/item/titanite_ore.json
deleted file mode 100644
index 54f0903..0000000
--- a/src/main/resources/assets/taiga/models/item/titanite_ore.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "taiga:block/titanite_ore",
-    "display": {
-        "thirdperson": {
-            "rotation": [ 10, -45, 170 ],
-            "translation": [ 0, 1.5, -2.75 ],
-            "scale": [ 0.375, 0.375, 0.375 ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/triberium_dust.json b/src/main/resources/assets/taiga/models/item/triberium_dust.json
new file mode 100644
index 0000000..de4783f
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/triberium_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/triberium"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/triberium_ingot.json b/src/main/resources/assets/taiga/models/item/triberium_ingot.json
new file mode 100644
index 0000000..19840ae
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/triberium_ingot.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/triberium"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/aegisalt_nugget.json b/src/main/resources/assets/taiga/models/item/triberium_nugget.json
index c749a51..3a27a36 100644
--- a/src/main/resources/assets/taiga/models/item/aegisalt_nugget.json
+++ b/src/main/resources/assets/taiga/models/item/triberium_nugget.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/aegisalt_nugget"
+    "layer0": "taiga:items/nugget/triberium"
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/tritonite_dust.json b/src/main/resources/assets/taiga/models/item/tritonite_dust.json
new file mode 100644
index 0000000..2c9b771
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/tritonite_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/tritonite"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/tritonite_ingot.json b/src/main/resources/assets/taiga/models/item/tritonite_ingot.json
new file mode 100644
index 0000000..faf13c7
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/tritonite_ingot.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/tritonite"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/anthracite_dust.json b/src/main/resources/assets/taiga/models/item/tritonite_nugget.json
index afac53d..9bac344 100644
--- a/src/main/resources/assets/taiga/models/item/anthracite_dust.json
+++ b/src/main/resources/assets/taiga/models/item/tritonite_nugget.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/anthracite_dust"
+    "layer0": "taiga:items/nugget/tritonite"
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/ultranite_block.json b/src/main/resources/assets/taiga/models/item/ultranite_block.json
deleted file mode 100644
index f7a19ee..0000000
--- a/src/main/resources/assets/taiga/models/item/ultranite_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/ultranite_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/ultranite_ingot.json b/src/main/resources/assets/taiga/models/item/ultranite_ingot.json
deleted file mode 100644
index 66881f2..0000000
--- a/src/main/resources/assets/taiga/models/item/ultranite_ingot.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/tic/ultranite_ingot"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/ultranite_nugget.json b/src/main/resources/assets/taiga/models/item/ultranite_nugget.json
deleted file mode 100644
index 4c6fe0c..0000000
--- a/src/main/resources/assets/taiga/models/item/ultranite_nugget.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "taiga:items/ultranite_nugget"
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/lignite3.json b/src/main/resources/assets/taiga/models/item/uru_dust.json
index 5a2d713..b96271b 100644
--- a/src/main/resources/assets/taiga/models/item/lignite3.json
+++ b/src/main/resources/assets/taiga/models/item/uru_dust.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/lignite"
+    "layer0": "taiga:items/dust/uru"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/uru_ingot.json b/src/main/resources/assets/taiga/models/item/uru_ingot.json
new file mode 100644
index 0000000..237c329
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/uru_ingot.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/uru"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/uru_nugget.json b/src/main/resources/assets/taiga/models/item/uru_nugget.json
new file mode 100644
index 0000000..114d4c1
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/uru_nugget.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/nugget/uru"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/valyrium_dust.json b/src/main/resources/assets/taiga/models/item/valyrium_dust.json
new file mode 100644
index 0000000..c059535
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/valyrium_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/valyrium"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/valyrium_ingot.json b/src/main/resources/assets/taiga/models/item/valyrium_ingot.json
new file mode 100644
index 0000000..c68e188
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/valyrium_ingot.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/valyrium"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/valyrium_nugget.json b/src/main/resources/assets/taiga/models/item/valyrium_nugget.json
new file mode 100644
index 0000000..68b9762
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/valyrium_nugget.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/nugget/valyrium"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/vibranium_block.json b/src/main/resources/assets/taiga/models/item/vibranium_block.json
deleted file mode 100644
index ae004f6..0000000
--- a/src/main/resources/assets/taiga/models/item/vibranium_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/vibranium_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/vibranium_dust.json b/src/main/resources/assets/taiga/models/item/vibranium_dust.json
new file mode 100644
index 0000000..60588e7
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/vibranium_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/vibranium"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/vibranium_ingot.json b/src/main/resources/assets/taiga/models/item/vibranium_ingot.json
index 0120e95..7705d25 100644
--- a/src/main/resources/assets/taiga/models/item/vibranium_ingot.json
+++ b/src/main/resources/assets/taiga/models/item/vibranium_ingot.json
@@ -1,6 +1,6 @@
 {
-	"parent": "item/generated",
-	"textures": {
-		"layer0": "taiga:items/tic/vibranium_ingot"
-	}
-}
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/vibranium"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/vibranium_nugget.json b/src/main/resources/assets/taiga/models/item/vibranium_nugget.json
index 2487e58..06b7505 100644
--- a/src/main/resources/assets/taiga/models/item/vibranium_nugget.json
+++ b/src/main/resources/assets/taiga/models/item/vibranium_nugget.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/vibranium_nugget"
+    "layer0": "taiga:items/nugget/vibranium"
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/vibranium_ore.json b/src/main/resources/assets/taiga/models/item/vibranium_ore.json
deleted file mode 100644
index 93befcb..0000000
--- a/src/main/resources/assets/taiga/models/item/vibranium_ore.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "taiga:block/vibranium_ore",
-    "display": {
-        "thirdperson": {
-            "rotation": [ 10, -45, 170 ],
-            "translation": [ 0, 1.5, -2.75 ],
-            "scale": [ 0.375, 0.375, 0.375 ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/violium_block.json b/src/main/resources/assets/taiga/models/item/violium_block.json
deleted file mode 100644
index ad6cde8..0000000
--- a/src/main/resources/assets/taiga/models/item/violium_block.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "parent": "taiga:block/violium_block",
-  "display": {
-    "thirdperson": {
-      "rotation": [
-        10,
-        -45,
-        170
-      ],
-      "translation": [
-        0,
-        1.5,
-        -2.75
-      ],
-      "scale": [
-        0.375,
-        0.375,
-        0.375
-      ]
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/models/item/violium_dust.json b/src/main/resources/assets/taiga/models/item/violium_dust.json
new file mode 100644
index 0000000..cd86552
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/violium_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/violium"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/violium_ingot.json b/src/main/resources/assets/taiga/models/item/violium_ingot.json
index bd7d129..da3ea31 100644
--- a/src/main/resources/assets/taiga/models/item/violium_ingot.json
+++ b/src/main/resources/assets/taiga/models/item/violium_ingot.json
@@ -1,6 +1,6 @@
 {
-	"parent": "item/generated",
-	"textures": {
-		"layer0": "taiga:items/tic/violium_ingot"
-	}
-}
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/violium"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/violium_nugget.json b/src/main/resources/assets/taiga/models/item/violium_nugget.json
index 462c71d..dbff815 100644
--- a/src/main/resources/assets/taiga/models/item/violium_nugget.json
+++ b/src/main/resources/assets/taiga/models/item/violium_nugget.json
@@ -1,6 +1,6 @@
 {
   "parent": "item/generated",
   "textures": {
-    "layer0": "taiga:items/violium_nugget"
+    "layer0": "taiga:items/nugget/violium"
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/violium_ore.json b/src/main/resources/assets/taiga/models/item/violium_ore.json
deleted file mode 100644
index 627b3e2..0000000
--- a/src/main/resources/assets/taiga/models/item/violium_ore.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "parent": "taiga:block/violium_ore",
-    "display": {
-        "thirdperson": {
-            "rotation": [ 10, -45, 170 ],
-            "translation": [ 0, 1.5, -2.75 ],
-            "scale": [ 0.375, 0.375, 0.375 ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/yrdeen_dust.json b/src/main/resources/assets/taiga/models/item/yrdeen_dust.json
new file mode 100644
index 0000000..4af2f8a
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/yrdeen_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/yrdeen"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/yrdeen_ingot.json b/src/main/resources/assets/taiga/models/item/yrdeen_ingot.json
new file mode 100644
index 0000000..6ee0ae1
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/yrdeen_ingot.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/yrdeen"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/yrdeen_nugget.json b/src/main/resources/assets/taiga/models/item/yrdeen_nugget.json
new file mode 100644
index 0000000..926e9dd
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/yrdeen_nugget.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/nugget/yrdeen"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/textures/a1.json b/src/main/resources/assets/taiga/textures/a1.json
new file mode 100644
index 0000000..3110aa1
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/a1.json
@@ -0,0 +1,4 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/textures/a2.json b/src/main/resources/assets/taiga/textures/a2.json
new file mode 100644
index 0000000..5e3963c
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/a2.json
@@ -0,0 +1,2 @@
+}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/textures/blocks/arcanite_ore.png b/src/main/resources/assets/taiga/textures/blocks/arcanite_ore.png
deleted file mode 100644
index c0ccaa8..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/arcanite_ore.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/bismuth_ore.png b/src/main/resources/assets/taiga/textures/blocks/bismuth_ore.png
deleted file mode 100644
index f25e468..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/bismuth_ore.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/block/abyssum.png b/src/main/resources/assets/taiga/textures/blocks/block/abyssum.png
new file mode 100644
index 0000000..61af1b0
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/blocks/block/abyssum.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/adamantite_block.png b/src/main/resources/assets/taiga/textures/blocks/block/adamant.png
index f67fec9..02a1600 100644
--- a/src/main/resources/assets/taiga/textures/blocks/adamantite_block.png
+++ b/src/main/resources/assets/taiga/textures/blocks/block/adamant.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/astrium_block.png b/src/main/resources/assets/taiga/textures/blocks/block/astrium.png
index 9081516..41fc303 100644
--- a/src/main/resources/assets/taiga/textures/blocks/astrium_block.png
+++ b/src/main/resources/assets/taiga/textures/blocks/block/astrium.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/bismuth_block.png b/src/main/resources/assets/taiga/textures/blocks/block/aurorium.png
index 52bed7a..c01a0a6 100644
--- a/src/main/resources/assets/taiga/textures/blocks/bismuth_block.png
+++ b/src/main/resources/assets/taiga/textures/blocks/block/aurorium.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/basalt.png b/src/main/resources/assets/taiga/textures/blocks/block/basalt.png
index 9c99a1d..89b1bc0 100644
--- a/src/main/resources/assets/taiga/textures/blocks/basalt.png
+++ b/src/main/resources/assets/taiga/textures/blocks/block/basalt.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/vibranium_block.png b/src/main/resources/assets/taiga/textures/blocks/block/duranite.png
index 71e61c1..33ebb6f 100644
--- a/src/main/resources/assets/taiga/textures/blocks/vibranium_block.png
+++ b/src/main/resources/assets/taiga/textures/blocks/block/duranite.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/dyonite.png b/src/main/resources/assets/taiga/textures/blocks/block/dyonite.png
index 1f0d20a..8c62c2c 100644
--- a/src/main/resources/assets/taiga/textures/blocks/materials/dyonite.png
+++ b/src/main/resources/assets/taiga/textures/blocks/block/dyonite.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/meteorite_block.png b/src/main/resources/assets/taiga/textures/blocks/block/eezo.png
index 291df0d..31f6995 100644
--- a/src/main/resources/assets/taiga/textures/blocks/meteorite_block.png
+++ b/src/main/resources/assets/taiga/textures/blocks/block/eezo.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/fractoryte_block.png b/src/main/resources/assets/taiga/textures/blocks/block/fractum.png
index 72a39cb..1385cb2 100644
--- a/src/main/resources/assets/taiga/textures/blocks/fractoryte_block.png
+++ b/src/main/resources/assets/taiga/textures/blocks/block/fractum.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/ignitite_block.png b/src/main/resources/assets/taiga/textures/blocks/block/ignitz.png
index 367e093..6b6b469 100644
--- a/src/main/resources/assets/taiga/textures/blocks/ignitite_block.png
+++ b/src/main/resources/assets/taiga/textures/blocks/block/ignitz.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/imperomite.png b/src/main/resources/assets/taiga/textures/blocks/block/imperomite.png
index 9bd120b..eec6810 100644
--- a/src/main/resources/assets/taiga/textures/blocks/materials/imperomite.png
+++ b/src/main/resources/assets/taiga/textures/blocks/block/imperomite.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/seismodium_block.png b/src/main/resources/assets/taiga/textures/blocks/block/iox.png
index 32f7eba..b83e533 100644
--- a/src/main/resources/assets/taiga/textures/blocks/seismodium_block.png
+++ b/src/main/resources/assets/taiga/textures/blocks/block/iox.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/karmesine_block.png b/src/main/resources/assets/taiga/textures/blocks/block/karmesine.png
index aba4464..aa4fbaf 100644
--- a/src/main/resources/assets/taiga/textures/blocks/karmesine_block.png
+++ b/src/main/resources/assets/taiga/textures/blocks/block/karmesine.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/lumixyl_block.png b/src/main/resources/assets/taiga/textures/blocks/block/lumix.png
index a3f39a2..9fabbf5 100644
--- a/src/main/resources/assets/taiga/textures/blocks/lumixyl_block.png
+++ b/src/main/resources/assets/taiga/textures/blocks/block/lumix.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/block/meteorite.png b/src/main/resources/assets/taiga/textures/blocks/block/meteorite.png
new file mode 100644
index 0000000..9fa9f7c
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/blocks/block/meteorite.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/block/meteoritecobble.png b/src/main/resources/assets/taiga/textures/blocks/block/meteoritecobble.png
new file mode 100644
index 0000000..52bd818
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/blocks/block/meteoritecobble.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/block/nihilite.png b/src/main/resources/assets/taiga/textures/blocks/block/nihilite.png
new file mode 100644
index 0000000..7ac79e9
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/blocks/block/nihilite.png
diff --git a/src/main/resources/assets/taiga/textures/items/violium_nugget.png b/src/main/resources/assets/taiga/textures/blocks/block/niob.png
index 94b9b32..237de66 100644
--- a/src/main/resources/assets/taiga/textures/items/violium_nugget.png
+++ b/src/main/resources/assets/taiga/textures/blocks/block/niob.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/aegisalt_block.png b/src/main/resources/assets/taiga/textures/blocks/block/nucleum.png
index 2a06673..e1e7a94 100644
--- a/src/main/resources/assets/taiga/textures/blocks/aegisalt_block.png
+++ b/src/main/resources/assets/taiga/textures/blocks/block/nucleum.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/eternite_block.png b/src/main/resources/assets/taiga/textures/blocks/block/obsidiorite.png
index 816cb59..e7cbd1f 100644
--- a/src/main/resources/assets/taiga/textures/blocks/eternite_block.png
+++ b/src/main/resources/assets/taiga/textures/blocks/block/obsidiorite.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/block/obsidioritecobble.png b/src/main/resources/assets/taiga/textures/blocks/block/obsidioritecobble.png
new file mode 100644
index 0000000..30bc10d
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/blocks/block/obsidioritecobble.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/block/osram.png b/src/main/resources/assets/taiga/textures/blocks/block/osram.png
new file mode 100644
index 0000000..f5b694e
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/blocks/block/osram.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/palladium_block.png b/src/main/resources/assets/taiga/textures/blocks/block/palladium.png
index 7ea420d..7c133ac 100644
--- a/src/main/resources/assets/taiga/textures/blocks/palladium_block.png
+++ b/src/main/resources/assets/taiga/textures/blocks/block/palladium.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/prometheum_block.png b/src/main/resources/assets/taiga/textures/blocks/block/prometheum.png
index aad5be2..6927ed4 100644
--- a/src/main/resources/assets/taiga/textures/blocks/prometheum_block.png
+++ b/src/main/resources/assets/taiga/textures/blocks/block/prometheum.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/block/proxii.png b/src/main/resources/assets/taiga/textures/blocks/block/proxii.png
new file mode 100644
index 0000000..97bb2bb
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/blocks/block/proxii.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/mindorite_block.png b/src/main/resources/assets/taiga/textures/blocks/block/seismum.png
index 55f2dcd..3230362 100644
--- a/src/main/resources/assets/taiga/textures/blocks/mindorite_block.png
+++ b/src/main/resources/assets/taiga/textures/blocks/block/seismum.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/block/solarium.png b/src/main/resources/assets/taiga/textures/blocks/block/solarium.png
new file mode 100644
index 0000000..c817270
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/blocks/block/solarium.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/tiberium_block.png b/src/main/resources/assets/taiga/textures/blocks/block/tiberium.png
index 1869eaf..694f605 100644
--- a/src/main/resources/assets/taiga/textures/blocks/tiberium_block.png
+++ b/src/main/resources/assets/taiga/textures/blocks/block/tiberium.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/block/triberium.png b/src/main/resources/assets/taiga/textures/blocks/block/triberium.png
new file mode 100644
index 0000000..e72e2ad
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/blocks/block/triberium.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/imperomite_block.png b/src/main/resources/assets/taiga/textures/blocks/block/tritonite.png
index 8117b3e..20a8aca 100644
--- a/src/main/resources/assets/taiga/textures/blocks/imperomite_block.png
+++ b/src/main/resources/assets/taiga/textures/blocks/block/tritonite.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/ardite_rust.png b/src/main/resources/assets/taiga/textures/blocks/block/uru.png
index bb0c6ea..1c5539c 100644
--- a/src/main/resources/assets/taiga/textures/blocks/materials/ardite_rust.png
+++ b/src/main/resources/assets/taiga/textures/blocks/block/uru.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/nucleum_block.png b/src/main/resources/assets/taiga/textures/blocks/block/valyrium.png
index 83b9373..c77036e 100644
--- a/src/main/resources/assets/taiga/textures/blocks/nucleum_block.png
+++ b/src/main/resources/assets/taiga/textures/blocks/block/valyrium.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/cryptogen_block.png b/src/main/resources/assets/taiga/textures/blocks/block/vibranium.png
index 8cbab02..a4c81f1 100644
--- a/src/main/resources/assets/taiga/textures/blocks/cryptogen_block.png
+++ b/src/main/resources/assets/taiga/textures/blocks/block/vibranium.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/violium_block.png b/src/main/resources/assets/taiga/textures/blocks/block/violium.png
index ef5d02c..e47d8bd 100644
--- a/src/main/resources/assets/taiga/textures/blocks/violium_block.png
+++ b/src/main/resources/assets/taiga/textures/blocks/block/violium.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/ignitite_ore.png b/src/main/resources/assets/taiga/textures/blocks/block/yrdeen.png
index 52340ce..ebc8e17 100644
--- a/src/main/resources/assets/taiga/textures/blocks/ignitite_ore.png
+++ b/src/main/resources/assets/taiga/textures/blocks/block/yrdeen.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/bysmuid_block.png b/src/main/resources/assets/taiga/textures/blocks/bysmuid_block.png
deleted file mode 100644
index 97f51ac..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/bysmuid_block.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/dyonite_block.png b/src/main/resources/assets/taiga/textures/blocks/dyonite_block.png
deleted file mode 100644
index f2da30d..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/dyonite_block.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/eternite_ore.png b/src/main/resources/assets/taiga/textures/blocks/eternite_ore.png
deleted file mode 100644
index e670b09..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/eternite_ore.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/glimmerstone_block.png b/src/main/resources/assets/taiga/textures/blocks/glimmerstone_block.png
deleted file mode 100644
index 2130671..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/glimmerstone_block.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/karmesine_ore.png b/src/main/resources/assets/taiga/textures/blocks/karmesine_ore.png
deleted file mode 100644
index a2231d3..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/karmesine_ore.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/lignite_ore.png b/src/main/resources/assets/taiga/textures/blocks/lignite_ore.png
deleted file mode 100644
index b29c12c..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/lignite_ore.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/luminar_block.png b/src/main/resources/assets/taiga/textures/blocks/luminar_block.png
deleted file mode 100644
index 4de3538..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/luminar_block.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/adamantite.png b/src/main/resources/assets/taiga/textures/blocks/materials/adamantite.png
deleted file mode 100644
index 819d422..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/materials/adamantite.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/arcanite.png b/src/main/resources/assets/taiga/textures/blocks/materials/arcanite.png
deleted file mode 100644
index 38be3fb..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/materials/arcanite.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/bismuth.png b/src/main/resources/assets/taiga/textures/blocks/materials/bismuth.png
deleted file mode 100644
index d924fc4..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/materials/bismuth.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/bysmuid.png b/src/main/resources/assets/taiga/textures/blocks/materials/bysmuid.png
deleted file mode 100644
index c34d608..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/materials/bysmuid.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/meteorite.png b/src/main/resources/assets/taiga/textures/blocks/materials/meteorite.png
deleted file mode 100644
index 1ee5646..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/materials/meteorite.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/proxideum.png b/src/main/resources/assets/taiga/textures/blocks/materials/proxideum.png
deleted file mode 100644
index 329228b..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/materials/proxideum.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/meteorite_ore.png b/src/main/resources/assets/taiga/textures/blocks/meteorite_ore.png
deleted file mode 100644
index c7ea152..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/meteorite_ore.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/mindorite_ore.png b/src/main/resources/assets/taiga/textures/blocks/mindorite_ore.png
deleted file mode 100644
index 83257cc..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/mindorite_ore.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/mythril_ore.png b/src/main/resources/assets/taiga/textures/blocks/mythril_ore.png
deleted file mode 100644
index 4e5d8ac..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/mythril_ore.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/nitronite_block.png b/src/main/resources/assets/taiga/textures/blocks/nitronite_block.png
deleted file mode 100644
index bb1f7b6..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/nitronite_block.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/noctunyx_block.png b/src/main/resources/assets/taiga/textures/blocks/noctunyx_block.png
deleted file mode 100644
index cbd7271..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/noctunyx_block.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/proxideum_block.png b/src/main/resources/assets/taiga/textures/blocks/ore/abyssum.png
index a305bae..ca66cd5 100644
--- a/src/main/resources/assets/taiga/textures/blocks/proxideum_block.png
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/abyssum.png
diff --git a/src/main/resources/assets/taiga/textures/items/bismuth_nugget.png b/src/main/resources/assets/taiga/textures/blocks/ore/aurorium.png
index 5b88594..317e11b 100644
--- a/src/main/resources/assets/taiga/textures/items/bismuth_nugget.png
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/aurorium.png
diff --git a/src/main/resources/assets/taiga/textures/items/vibranium_nugget.png b/src/main/resources/assets/taiga/textures/blocks/ore/duranite.png
index dacf662..1a42364 100644
--- a/src/main/resources/assets/taiga/textures/items/vibranium_nugget.png
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/duranite.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/eezo.png b/src/main/resources/assets/taiga/textures/blocks/ore/eezo.png
new file mode 100644
index 0000000..6de223a
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/eezo.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png b/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png
new file mode 100644
index 0000000..7e4d7c2
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/karmesineandensite.png b/src/main/resources/assets/taiga/textures/blocks/ore/karmesineandensite.png
new file mode 100644
index 0000000..7e4d7c2
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/karmesineandensite.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/karmesinediorite.png b/src/main/resources/assets/taiga/textures/blocks/ore/karmesinediorite.png
new file mode 100644
index 0000000..4f14e7a
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/karmesinediorite.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/solarium_block.png b/src/main/resources/assets/taiga/textures/blocks/ore/karmesinegranite.png
index 34466a9..9b42d38 100644
--- a/src/main/resources/assets/taiga/textures/blocks/solarium_block.png
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/karmesinegranite.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/osram.png b/src/main/resources/assets/taiga/textures/blocks/ore/osram.png
new file mode 100644
index 0000000..904c9a5
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/osram.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/palladium.png b/src/main/resources/assets/taiga/textures/blocks/ore/palladium.png
new file mode 100644
index 0000000..b389832
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/palladium.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/prometheum.png b/src/main/resources/assets/taiga/textures/blocks/ore/prometheum.png
index affe950..7e18f41 100644
--- a/src/main/resources/assets/taiga/textures/blocks/materials/prometheum.png
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/prometheum.png
diff --git a/src/main/resources/assets/taiga/textures/items/lumixyl_nugget.png b/src/main/resources/assets/taiga/textures/blocks/ore/tiberium.png
index d28101d..54fde77 100644
--- a/src/main/resources/assets/taiga/textures/items/lumixyl_nugget.png
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/tiberium.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/uru.png b/src/main/resources/assets/taiga/textures/blocks/ore/uru.png
new file mode 100644
index 0000000..bc108a4
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/uru.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/nucleum.png b/src/main/resources/assets/taiga/textures/blocks/ore/valyrium.png
index 7a0eb1c..a2ef123 100644
--- a/src/main/resources/assets/taiga/textures/blocks/materials/nucleum.png
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/valyrium.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/vibranium.png b/src/main/resources/assets/taiga/textures/blocks/ore/vibranium.png
new file mode 100644
index 0000000..7f57ab8
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/vibranium.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/palladium_ore.png b/src/main/resources/assets/taiga/textures/blocks/palladium_ore.png
deleted file mode 100644
index f40aafc..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/palladium_ore.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/prometheum_ore.png b/src/main/resources/assets/taiga/textures/blocks/prometheum_ore.png
deleted file mode 100644
index 7d4b3c7..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/prometheum_ore.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/rotten_ground.png b/src/main/resources/assets/taiga/textures/blocks/rotten_ground.png
deleted file mode 100644
index 10be0ab..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/rotten_ground.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/rubium_block.png b/src/main/resources/assets/taiga/textures/blocks/rubium_block.png
deleted file mode 100644
index 2caaf9c..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/rubium_block.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/rubium_ore.png b/src/main/resources/assets/taiga/textures/blocks/rubium_ore.png
deleted file mode 100644
index a2c1cb9..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/rubium_ore.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/slaggold_ore.png b/src/main/resources/assets/taiga/textures/blocks/slaggold_ore.png
deleted file mode 100644
index a2cbd94..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/slaggold_ore.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/slagiron_ore.png b/src/main/resources/assets/taiga/textures/blocks/slagiron_ore.png
deleted file mode 100644
index c3f9d53..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/slagiron_ore.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/terramite_block.png b/src/main/resources/assets/taiga/textures/blocks/terramite_block.png
deleted file mode 100644
index f3307b4..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/terramite_block.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/tiberium_ore.png b/src/main/resources/assets/taiga/textures/blocks/tiberium_ore.png
deleted file mode 100644
index ca7d295..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/tiberium_ore.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/titanite_block.png b/src/main/resources/assets/taiga/textures/blocks/titanite_block.png
deleted file mode 100644
index 4b05462..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/titanite_block.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/titanite_ore.png b/src/main/resources/assets/taiga/textures/blocks/titanite_ore.png
deleted file mode 100644
index 9348e24..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/titanite_ore.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/vibranium_ore.png b/src/main/resources/assets/taiga/textures/blocks/vibranium_ore.png
deleted file mode 100644
index 166649a..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/vibranium_ore.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/violium_ore.png b/src/main/resources/assets/taiga/textures/blocks/violium_ore.png
deleted file mode 100644
index cb0b06d..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/violium_ore.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/items.bat b/src/main/resources/assets/taiga/textures/items.bat
new file mode 100644
index 0000000..db7999e
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items.bat
@@ -0,0 +1,11 @@
+@echo off
+Setlocal EnableDelayedExpansion
+for %%f in (.) do (
+set WERT=%%~nf
+)
+for %%A in (*.png) do (
+type a1.json > %%~nA_!WERT!.json
+echo !WERT!/%%~nA^" >> %%~nA_!WERT!.json
+type a2.json >> %%~nA_!WERT!.json
+)
+pause
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/textures/items/anthracite_dust.png b/src/main/resources/assets/taiga/textures/items/anthracite_dust.png
deleted file mode 100644
index c8530cf..0000000
--- a/src/main/resources/assets/taiga/textures/items/anthracite_dust.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/items/bysmuid_nugget.png b/src/main/resources/assets/taiga/textures/items/bysmuid_nugget.png
deleted file mode 100644
index 3155328..0000000
--- a/src/main/resources/assets/taiga/textures/items/bysmuid_nugget.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/items/cryptogen_nugget.png b/src/main/resources/assets/taiga/textures/items/dust/abyssum.png
index 4a80b4e..392f230 100644
--- a/src/main/resources/assets/taiga/textures/items/cryptogen_nugget.png
+++ b/src/main/resources/assets/taiga/textures/items/dust/abyssum.png
diff --git a/src/main/resources/assets/taiga/textures/items/dust/adamant.png b/src/main/resources/assets/taiga/textures/items/dust/adamant.png
new file mode 100644
index 0000000..904cc17
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/dust/adamant.png
diff --git a/src/main/resources/assets/taiga/textures/items/astrium_nugget.png b/src/main/resources/assets/taiga/textures/items/dust/astrium.png
index 7530a16..e81f6be 100644
--- a/src/main/resources/assets/taiga/textures/items/astrium_nugget.png
+++ b/src/main/resources/assets/taiga/textures/items/dust/astrium.png
diff --git a/src/main/resources/assets/taiga/textures/items/dust/aurorium.png b/src/main/resources/assets/taiga/textures/items/dust/aurorium.png
new file mode 100644
index 0000000..d83edc1
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/dust/aurorium.png
diff --git a/src/main/resources/assets/taiga/textures/items/dust/basalt.png b/src/main/resources/assets/taiga/textures/items/dust/basalt.png
new file mode 100644
index 0000000..cd8f8da
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/dust/basalt.png
diff --git a/src/main/resources/assets/taiga/textures/items/dust/duranite.png b/src/main/resources/assets/taiga/textures/items/dust/duranite.png
new file mode 100644
index 0000000..2b7ebd2
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/dust/duranite.png
diff --git a/src/main/resources/assets/taiga/textures/items/dust/dyonite.png b/src/main/resources/assets/taiga/textures/items/dust/dyonite.png
new file mode 100644
index 0000000..53c28a4
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/dust/dyonite.png
diff --git a/src/main/resources/assets/taiga/textures/items/aegisalt_nugget.png b/src/main/resources/assets/taiga/textures/items/dust/eezo.png
index 843a699..4087a5a 100644
--- a/src/main/resources/assets/taiga/textures/items/aegisalt_nugget.png
+++ b/src/main/resources/assets/taiga/textures/items/dust/eezo.png
diff --git a/src/main/resources/assets/taiga/textures/items/terramite_nugget.png b/src/main/resources/assets/taiga/textures/items/dust/fractum.png
index 5f104d5..03ba9bf 100644
--- a/src/main/resources/assets/taiga/textures/items/terramite_nugget.png
+++ b/src/main/resources/assets/taiga/textures/items/dust/fractum.png
diff --git a/src/main/resources/assets/taiga/textures/items/dust/ignitz.png b/src/main/resources/assets/taiga/textures/items/dust/ignitz.png
new file mode 100644
index 0000000..ae09fc4
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/dust/ignitz.png
diff --git a/src/main/resources/assets/taiga/textures/items/dust/imperomite.png b/src/main/resources/assets/taiga/textures/items/dust/imperomite.png
new file mode 100644
index 0000000..cea52ca
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/dust/imperomite.png
diff --git a/src/main/resources/assets/taiga/textures/items/dust/iox.png b/src/main/resources/assets/taiga/textures/items/dust/iox.png
new file mode 100644
index 0000000..ae6f496
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/dust/iox.png
diff --git a/src/main/resources/assets/taiga/textures/items/dust/karmesine.png b/src/main/resources/assets/taiga/textures/items/dust/karmesine.png
new file mode 100644
index 0000000..6a1b958
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/dust/karmesine.png
diff --git a/src/main/resources/assets/taiga/textures/items/dust/lumix.png b/src/main/resources/assets/taiga/textures/items/dust/lumix.png
new file mode 100644
index 0000000..fa9f300
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/dust/lumix.png
diff --git a/src/main/resources/assets/taiga/textures/items/imperomite_nugget.png b/src/main/resources/assets/taiga/textures/items/dust/meteorite.png
index c3ab768..a11fb4e 100644
--- a/src/main/resources/assets/taiga/textures/items/imperomite_nugget.png
+++ b/src/main/resources/assets/taiga/textures/items/dust/meteorite.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/noctunyx.png b/src/main/resources/assets/taiga/textures/items/dust/nihilite.png
index 76a8cda..3577059 100644
--- a/src/main/resources/assets/taiga/textures/blocks/materials/noctunyx.png
+++ b/src/main/resources/assets/taiga/textures/items/dust/nihilite.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/ultranite_block.png b/src/main/resources/assets/taiga/textures/items/dust/niob.png
index 6ae2fbb..d84b6b9 100644
--- a/src/main/resources/assets/taiga/textures/blocks/ultranite_block.png
+++ b/src/main/resources/assets/taiga/textures/items/dust/niob.png
diff --git a/src/main/resources/assets/taiga/textures/items/tic/eternite_ingot.png b/src/main/resources/assets/taiga/textures/items/dust/nucleum.png
index f7f091a..4d64390 100644
--- a/src/main/resources/assets/taiga/textures/items/tic/eternite_ingot.png
+++ b/src/main/resources/assets/taiga/textures/items/dust/nucleum.png
diff --git a/src/main/resources/assets/taiga/textures/items/dust/obsidiorite.png b/src/main/resources/assets/taiga/textures/items/dust/obsidiorite.png
new file mode 100644
index 0000000..e23f882
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/dust/obsidiorite.png
diff --git a/src/main/resources/assets/taiga/textures/items/dust/osram.png b/src/main/resources/assets/taiga/textures/items/dust/osram.png
new file mode 100644
index 0000000..7f1a8c8
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/dust/osram.png
diff --git a/src/main/resources/assets/taiga/textures/items/dust/palladium.png b/src/main/resources/assets/taiga/textures/items/dust/palladium.png
new file mode 100644
index 0000000..ed999d7
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/dust/palladium.png
diff --git a/src/main/resources/assets/taiga/textures/items/prometheum_nugget.png b/src/main/resources/assets/taiga/textures/items/dust/prometheum.png
index 9e1616a..b3784ff 100644
--- a/src/main/resources/assets/taiga/textures/items/prometheum_nugget.png
+++ b/src/main/resources/assets/taiga/textures/items/dust/prometheum.png
diff --git a/src/main/resources/assets/taiga/textures/items/dust/proxii.png b/src/main/resources/assets/taiga/textures/items/dust/proxii.png
new file mode 100644
index 0000000..fd71c0c
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/dust/proxii.png
diff --git a/src/main/resources/assets/taiga/textures/items/arcanite_nugget.png b/src/main/resources/assets/taiga/textures/items/dust/seismum.png
index 4d9e89c..26ece65 100644
--- a/src/main/resources/assets/taiga/textures/items/arcanite_nugget.png
+++ b/src/main/resources/assets/taiga/textures/items/dust/seismum.png
diff --git a/src/main/resources/assets/taiga/textures/items/dust/solarium.png b/src/main/resources/assets/taiga/textures/items/dust/solarium.png
new file mode 100644
index 0000000..caa1904
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/dust/solarium.png
diff --git a/src/main/resources/assets/taiga/textures/items/tic/titanite_ingot.png b/src/main/resources/assets/taiga/textures/items/dust/tiberium.png
index d85c02c..e5ba3d8 100644
--- a/src/main/resources/assets/taiga/textures/items/tic/titanite_ingot.png
+++ b/src/main/resources/assets/taiga/textures/items/dust/tiberium.png
diff --git a/src/main/resources/assets/taiga/textures/items/proxideum_nugget.png b/src/main/resources/assets/taiga/textures/items/dust/tritonite.png
index db9febc..16f6c77 100644
--- a/src/main/resources/assets/taiga/textures/items/proxideum_nugget.png
+++ b/src/main/resources/assets/taiga/textures/items/dust/tritonite.png
diff --git a/src/main/resources/assets/taiga/textures/items/tiberium_nugget.png b/src/main/resources/assets/taiga/textures/items/dust/uru.png
index 92d3cbf..de3f26b 100644
--- a/src/main/resources/assets/taiga/textures/items/tiberium_nugget.png
+++ b/src/main/resources/assets/taiga/textures/items/dust/uru.png
diff --git a/src/main/resources/assets/taiga/textures/items/dust/valyrium.png b/src/main/resources/assets/taiga/textures/items/dust/valyrium.png
new file mode 100644
index 0000000..06a8a79
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/dust/valyrium.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/mythril_block.png b/src/main/resources/assets/taiga/textures/items/dust/vibranium.png
index fc7f9dd..192550f 100644
--- a/src/main/resources/assets/taiga/textures/blocks/mythril_block.png
+++ b/src/main/resources/assets/taiga/textures/items/dust/vibranium.png
diff --git a/src/main/resources/assets/taiga/textures/items/dust/violium.png b/src/main/resources/assets/taiga/textures/items/dust/violium.png
new file mode 100644
index 0000000..6eaee38
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/dust/violium.png
diff --git a/src/main/resources/assets/taiga/textures/items/dust/yrdeen.png b/src/main/resources/assets/taiga/textures/items/dust/yrdeen.png
new file mode 100644
index 0000000..79cf0fb
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/dust/yrdeen.png
diff --git a/src/main/resources/assets/taiga/textures/items/energy_pearl.png b/src/main/resources/assets/taiga/textures/items/energy_pearl.png
deleted file mode 100644
index 770521f..0000000
--- a/src/main/resources/assets/taiga/textures/items/energy_pearl.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/items/glimmer_pearl.png b/src/main/resources/assets/taiga/textures/items/glimmer_pearl.png
deleted file mode 100644
index 58e0bb9..0000000
--- a/src/main/resources/assets/taiga/textures/items/glimmer_pearl.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/items/glimmercoal.png b/src/main/resources/assets/taiga/textures/items/glimmercoal.png
deleted file mode 100644
index 9c5d844..0000000
--- a/src/main/resources/assets/taiga/textures/items/glimmercoal.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/items/glimmerstone_dust.png b/src/main/resources/assets/taiga/textures/items/glimmerstone_dust.png
deleted file mode 100644
index 19d2135..0000000
--- a/src/main/resources/assets/taiga/textures/items/glimmerstone_dust.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/items/tic/mindorite_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/abyssum.png
index d7a59f6..bc38832 100644
--- a/src/main/resources/assets/taiga/textures/items/tic/mindorite_ingot.png
+++ b/src/main/resources/assets/taiga/textures/items/ingot/abyssum.png
diff --git a/src/main/resources/assets/taiga/textures/items/tic/adamantite_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/adamant.png
index fdca4b4..fdca4b4 100644
--- a/src/main/resources/assets/taiga/textures/items/tic/adamantite_ingot.png
+++ b/src/main/resources/assets/taiga/textures/items/ingot/adamant.png
diff --git a/src/main/resources/assets/taiga/textures/items/ingot/astrium.png b/src/main/resources/assets/taiga/textures/items/ingot/astrium.png
new file mode 100644
index 0000000..0117982
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/ingot/astrium.png
diff --git a/src/main/resources/assets/taiga/textures/items/tic/rubium_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/aurorium.png
index b9711f5..b9711f5 100644
--- a/src/main/resources/assets/taiga/textures/items/tic/rubium_ingot.png
+++ b/src/main/resources/assets/taiga/textures/items/ingot/aurorium.png
diff --git a/src/main/resources/assets/taiga/textures/items/tic/nucleum_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/basalt.png
index 9c1da98..29f6648 100644
--- a/src/main/resources/assets/taiga/textures/items/tic/nucleum_ingot.png
+++ b/src/main/resources/assets/taiga/textures/items/ingot/basalt.png
diff --git a/src/main/resources/assets/taiga/textures/items/tic/aegisalt_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/duranite.png
index e2e6976..0541848 100644
--- a/src/main/resources/assets/taiga/textures/items/tic/aegisalt_ingot.png
+++ b/src/main/resources/assets/taiga/textures/items/ingot/duranite.png
diff --git a/src/main/resources/assets/taiga/textures/items/tic/nitronite_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/dyonite.png
index dd3561a..969dd47 100644
--- a/src/main/resources/assets/taiga/textures/items/tic/nitronite_ingot.png
+++ b/src/main/resources/assets/taiga/textures/items/ingot/dyonite.png
diff --git a/src/main/resources/assets/taiga/textures/items/ingot/eezo.png b/src/main/resources/assets/taiga/textures/items/ingot/eezo.png
new file mode 100644
index 0000000..66c19af
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/ingot/eezo.png
diff --git a/src/main/resources/assets/taiga/textures/items/tic/fractoryte_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/fractum.png
index 7eb6f2b..9249927 100644
--- a/src/main/resources/assets/taiga/textures/items/tic/fractoryte_ingot.png
+++ b/src/main/resources/assets/taiga/textures/items/ingot/fractum.png
diff --git a/src/main/resources/assets/taiga/textures/items/ingot/ignitz.png b/src/main/resources/assets/taiga/textures/items/ingot/ignitz.png
new file mode 100644
index 0000000..0aba031
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/ingot/ignitz.png
diff --git a/src/main/resources/assets/taiga/textures/items/meteorite_nugget.png b/src/main/resources/assets/taiga/textures/items/ingot/imperomite.png
index 7c93ca3..d15b636 100644
--- a/src/main/resources/assets/taiga/textures/items/meteorite_nugget.png
+++ b/src/main/resources/assets/taiga/textures/items/ingot/imperomite.png
diff --git a/src/main/resources/assets/taiga/textures/items/tic/ignitite_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/iox.png
index 7fbbcad..30c66b7 100644
--- a/src/main/resources/assets/taiga/textures/items/tic/ignitite_ingot.png
+++ b/src/main/resources/assets/taiga/textures/items/ingot/iox.png
diff --git a/src/main/resources/assets/taiga/textures/items/tic/karmesine_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/karmesine.png
index e5ca86c..94f0dd2 100644
--- a/src/main/resources/assets/taiga/textures/items/tic/karmesine_ingot.png
+++ b/src/main/resources/assets/taiga/textures/items/ingot/karmesine.png
diff --git a/src/main/resources/assets/taiga/textures/items/ingot/lumix.png b/src/main/resources/assets/taiga/textures/items/ingot/lumix.png
new file mode 100644
index 0000000..84b90c0
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/ingot/lumix.png
diff --git a/src/main/resources/assets/taiga/textures/items/ingot/meteorite.png b/src/main/resources/assets/taiga/textures/items/ingot/meteorite.png
new file mode 100644
index 0000000..f0b5f92
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/ingot/meteorite.png
diff --git a/src/main/resources/assets/taiga/textures/items/tic/noctunyx_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/nihilite.png
index 10eadb3..0d2b7cf 100644
--- a/src/main/resources/assets/taiga/textures/items/tic/noctunyx_ingot.png
+++ b/src/main/resources/assets/taiga/textures/items/ingot/nihilite.png
diff --git a/src/main/resources/assets/taiga/textures/items/ingot/niob.png b/src/main/resources/assets/taiga/textures/items/ingot/niob.png
new file mode 100644
index 0000000..071feef
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/ingot/niob.png
diff --git a/src/main/resources/assets/taiga/textures/items/ingot/nucleum.png b/src/main/resources/assets/taiga/textures/items/ingot/nucleum.png
new file mode 100644
index 0000000..c248342
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/ingot/nucleum.png
diff --git a/src/main/resources/assets/taiga/textures/items/ingot/obsidiorite.png b/src/main/resources/assets/taiga/textures/items/ingot/obsidiorite.png
new file mode 100644
index 0000000..cb11557
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/ingot/obsidiorite.png
diff --git a/src/main/resources/assets/taiga/textures/items/ingot/osram.png b/src/main/resources/assets/taiga/textures/items/ingot/osram.png
new file mode 100644
index 0000000..1ed548d
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/ingot/osram.png
diff --git a/src/main/resources/assets/taiga/textures/items/tic/palladium_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/palladium.png
index b1b399e..6814b9c 100644
--- a/src/main/resources/assets/taiga/textures/items/tic/palladium_ingot.png
+++ b/src/main/resources/assets/taiga/textures/items/ingot/palladium.png
diff --git a/src/main/resources/assets/taiga/textures/items/ingot/prometheum.png b/src/main/resources/assets/taiga/textures/items/ingot/prometheum.png
new file mode 100644
index 0000000..381a23c
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/ingot/prometheum.png
diff --git a/src/main/resources/assets/taiga/textures/items/ingot/proxii.png b/src/main/resources/assets/taiga/textures/items/ingot/proxii.png
new file mode 100644
index 0000000..16668ce
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/ingot/proxii.png
diff --git a/src/main/resources/assets/taiga/textures/items/ingot/seismum.png b/src/main/resources/assets/taiga/textures/items/ingot/seismum.png
new file mode 100644
index 0000000..63f5ea3
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/ingot/seismum.png
diff --git a/src/main/resources/assets/taiga/textures/items/tic/dyonite_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/solarium.png
index e13556f..1a02d3a 100644
--- a/src/main/resources/assets/taiga/textures/items/tic/dyonite_ingot.png
+++ b/src/main/resources/assets/taiga/textures/items/ingot/solarium.png
diff --git a/src/main/resources/assets/taiga/textures/items/tic/tiberium_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/tiberium.png
index 817d28e..fb6395d 100644
--- a/src/main/resources/assets/taiga/textures/items/tic/tiberium_ingot.png
+++ b/src/main/resources/assets/taiga/textures/items/ingot/tiberium.png
diff --git a/src/main/resources/assets/taiga/textures/items/ingot/tritonite.png b/src/main/resources/assets/taiga/textures/items/ingot/tritonite.png
new file mode 100644
index 0000000..6fdc676
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/ingot/tritonite.png
diff --git a/src/main/resources/assets/taiga/textures/items/ingot/uru.png b/src/main/resources/assets/taiga/textures/items/ingot/uru.png
new file mode 100644
index 0000000..25b6c2c
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/ingot/uru.png
diff --git a/src/main/resources/assets/taiga/textures/items/ingot/valyrium.png b/src/main/resources/assets/taiga/textures/items/ingot/valyrium.png
new file mode 100644
index 0000000..ad2bc73
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/ingot/valyrium.png
diff --git a/src/main/resources/assets/taiga/textures/items/ingot/vibranium.png b/src/main/resources/assets/taiga/textures/items/ingot/vibranium.png
new file mode 100644
index 0000000..b83419a
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/ingot/vibranium.png
diff --git a/src/main/resources/assets/taiga/textures/items/tic/mythril_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/violium.png
index 3351cda..13b6fec 100644
--- a/src/main/resources/assets/taiga/textures/items/tic/mythril_ingot.png
+++ b/src/main/resources/assets/taiga/textures/items/ingot/violium.png
diff --git a/src/main/resources/assets/taiga/textures/items/tic/cryptogen_ingot.png b/src/main/resources/assets/taiga/textures/items/ingot/yrdeen.png
index 69177ba..8e29a70 100644
--- a/src/main/resources/assets/taiga/textures/items/tic/cryptogen_ingot.png
+++ b/src/main/resources/assets/taiga/textures/items/ingot/yrdeen.png
diff --git a/src/main/resources/assets/taiga/textures/items/iron_nugget.png b/src/main/resources/assets/taiga/textures/items/iron_nugget.png
deleted file mode 100644
index 4bd25a3..0000000
--- a/src/main/resources/assets/taiga/textures/items/iron_nugget.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/items/lignite.png b/src/main/resources/assets/taiga/textures/items/lignite.png
deleted file mode 100644
index c352803..0000000
--- a/src/main/resources/assets/taiga/textures/items/lignite.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/items/luminar_dust.png b/src/main/resources/assets/taiga/textures/items/luminar_dust.png
deleted file mode 100644
index 572fbe3..0000000
--- a/src/main/resources/assets/taiga/textures/items/luminar_dust.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/items/tic/terramite_ingot.png b/src/main/resources/assets/taiga/textures/items/nugget/abyssum.png
index 42e83dd..133553f 100644
--- a/src/main/resources/assets/taiga/textures/items/tic/terramite_ingot.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/abyssum.png
diff --git a/src/main/resources/assets/taiga/textures/items/fuel_brick.png b/src/main/resources/assets/taiga/textures/items/nugget/adamant.png
index f53955a..d080603 100644
--- a/src/main/resources/assets/taiga/textures/items/fuel_brick.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/adamant.png
diff --git a/src/main/resources/assets/taiga/textures/items/tic/astrium_ingot.png b/src/main/resources/assets/taiga/textures/items/nugget/astrium.png
index 302ab18..8d1b139 100644
--- a/src/main/resources/assets/taiga/textures/items/tic/astrium_ingot.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/astrium.png
diff --git a/src/main/resources/assets/taiga/textures/items/rubium_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/aurorium.png
index 581a8c9..f25db9f 100644
--- a/src/main/resources/assets/taiga/textures/items/rubium_nugget.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/aurorium.png
diff --git a/src/main/resources/assets/taiga/textures/items/adamantite_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/basalt.png
index f2026fb..b968cc0 100644
--- a/src/main/resources/assets/taiga/textures/items/adamantite_nugget.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/basalt.png
diff --git a/src/main/resources/assets/taiga/textures/items/nitro_brick.png b/src/main/resources/assets/taiga/textures/items/nugget/duranite.png
index 3607cf8..1bb1f18 100644
--- a/src/main/resources/assets/taiga/textures/items/nitro_brick.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/duranite.png
diff --git a/src/main/resources/assets/taiga/textures/items/nitronite_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/dyonite.png
index fd49fd6..4427277 100644
--- a/src/main/resources/assets/taiga/textures/items/nitronite_nugget.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/dyonite.png
diff --git a/src/main/resources/assets/taiga/textures/items/nucleum_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/eezo.png
index ca0a9f2..6a29abb 100644
--- a/src/main/resources/assets/taiga/textures/items/nucleum_nugget.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/eezo.png
diff --git a/src/main/resources/assets/taiga/textures/items/tic/seismodium_ingot.png b/src/main/resources/assets/taiga/textures/items/nugget/fractum.png
index de629c5..e0ef678 100644
--- a/src/main/resources/assets/taiga/textures/items/tic/seismodium_ingot.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/fractum.png
diff --git a/src/main/resources/assets/taiga/textures/items/ignitite_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/ignitz.png
index 02342fa..9fdda1d 100644
--- a/src/main/resources/assets/taiga/textures/items/ignitite_nugget.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/ignitz.png
diff --git a/src/main/resources/assets/taiga/textures/items/tic/meteorite_ingot.png b/src/main/resources/assets/taiga/textures/items/nugget/imperomite.png
index 32c3080..3193727 100644
--- a/src/main/resources/assets/taiga/textures/items/tic/meteorite_ingot.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/imperomite.png
diff --git a/src/main/resources/assets/taiga/textures/items/eternite_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/iox.png
index f2bf4c8..891ea07 100644
--- a/src/main/resources/assets/taiga/textures/items/eternite_nugget.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/iox.png
diff --git a/src/main/resources/assets/taiga/textures/items/nugget/iron.png b/src/main/resources/assets/taiga/textures/items/nugget/iron.png
new file mode 100644
index 0000000..25fe20f
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/nugget/iron.png
diff --git a/src/main/resources/assets/taiga/textures/items/karmesine_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/karmesine.png
index 8e03a40..7f8cb49 100644
--- a/src/main/resources/assets/taiga/textures/items/karmesine_nugget.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/karmesine.png
diff --git a/src/main/resources/assets/taiga/textures/items/dyonite_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/lumix.png
index e52886b..310311b 100644
--- a/src/main/resources/assets/taiga/textures/items/dyonite_nugget.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/lumix.png
diff --git a/src/main/resources/assets/taiga/textures/items/tic/imperomite_ingot.png b/src/main/resources/assets/taiga/textures/items/nugget/meteorite.png
index 83ddca3..123a5b1 100644
--- a/src/main/resources/assets/taiga/textures/items/tic/imperomite_ingot.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/meteorite.png
diff --git a/src/main/resources/assets/taiga/textures/items/noctunyx_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/nihilite.png
index ee18c7c..cabac86 100644
--- a/src/main/resources/assets/taiga/textures/items/noctunyx_nugget.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/nihilite.png
diff --git a/src/main/resources/assets/taiga/textures/items/ultranite_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/niob.png
index ea8d744..3699e38 100644
--- a/src/main/resources/assets/taiga/textures/items/ultranite_nugget.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/niob.png
diff --git a/src/main/resources/assets/taiga/textures/items/tic/ultranite_ingot.png b/src/main/resources/assets/taiga/textures/items/nugget/nucleum.png
index 1d0393d..33d3c80 100644
--- a/src/main/resources/assets/taiga/textures/items/tic/ultranite_ingot.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/nucleum.png
diff --git a/src/main/resources/assets/taiga/textures/items/nugget/obsidiorite.png b/src/main/resources/assets/taiga/textures/items/nugget/obsidiorite.png
new file mode 100644
index 0000000..51d6819
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/nugget/obsidiorite.png
diff --git a/src/main/resources/assets/taiga/textures/items/nugget/osram.png b/src/main/resources/assets/taiga/textures/items/nugget/osram.png
new file mode 100644
index 0000000..526714c
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/nugget/osram.png
diff --git a/src/main/resources/assets/taiga/textures/items/palladium_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/palladium.png
index 2a52d02..b6e25e5 100644
--- a/src/main/resources/assets/taiga/textures/items/palladium_nugget.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/palladium.png
diff --git a/src/main/resources/assets/taiga/textures/items/tic/prometheum_ingot.png b/src/main/resources/assets/taiga/textures/items/nugget/prometheum.png
index 6fbc057..dd33f3f 100644
--- a/src/main/resources/assets/taiga/textures/items/tic/prometheum_ingot.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/prometheum.png
diff --git a/src/main/resources/assets/taiga/textures/items/tic/proxideum_ingot.png b/src/main/resources/assets/taiga/textures/items/nugget/proxii.png
index b2797b5..f596d0f 100644
--- a/src/main/resources/assets/taiga/textures/items/tic/proxideum_ingot.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/proxii.png
diff --git a/src/main/resources/assets/taiga/textures/items/seismodium_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/seismum.png
index 47c5928..cda5085 100644
--- a/src/main/resources/assets/taiga/textures/items/seismodium_nugget.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/seismum.png
diff --git a/src/main/resources/assets/taiga/textures/items/solarium_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/solarium.png
index 3e5a1e2..02c5695 100644
--- a/src/main/resources/assets/taiga/textures/items/solarium_nugget.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/solarium.png
diff --git a/src/main/resources/assets/taiga/textures/items/titanite_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/tiberium.png
index c64de88..8f64822 100644
--- a/src/main/resources/assets/taiga/textures/items/titanite_nugget.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/tiberium.png
diff --git a/src/main/resources/assets/taiga/textures/items/fractoryte_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/tritonite.png
index 6a86606..54afb45 100644
--- a/src/main/resources/assets/taiga/textures/items/fractoryte_nugget.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/tritonite.png
diff --git a/src/main/resources/assets/taiga/textures/items/tic/vibranium_ingot.png b/src/main/resources/assets/taiga/textures/items/nugget/uru.png
index 63c9c05..e75924b 100644
--- a/src/main/resources/assets/taiga/textures/items/tic/vibranium_ingot.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/uru.png
diff --git a/src/main/resources/assets/taiga/textures/items/nugget/valyrium.png b/src/main/resources/assets/taiga/textures/items/nugget/valyrium.png
new file mode 100644
index 0000000..da0fe74
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/nugget/valyrium.png
diff --git a/src/main/resources/assets/taiga/textures/items/mythril_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/vibranium.png
index 7e0fa53..e460a1e 100644
--- a/src/main/resources/assets/taiga/textures/items/mythril_nugget.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/vibranium.png
diff --git a/src/main/resources/assets/taiga/textures/items/tic/violium_ingot.png b/src/main/resources/assets/taiga/textures/items/nugget/violium.png
index b1dab28..bc42bd6 100644
--- a/src/main/resources/assets/taiga/textures/items/tic/violium_ingot.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/violium.png
diff --git a/src/main/resources/assets/taiga/textures/items/mindorite_nugget.png b/src/main/resources/assets/taiga/textures/items/nugget/yrdeen.png
index 9bd7930..5a1a1ff 100644
--- a/src/main/resources/assets/taiga/textures/items/mindorite_nugget.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/yrdeen.png
diff --git a/src/main/resources/assets/taiga/textures/items/slaggold_ingot.png b/src/main/resources/assets/taiga/textures/items/slaggold_ingot.png
deleted file mode 100644
index f1dfcf4..0000000
--- a/src/main/resources/assets/taiga/textures/items/slaggold_ingot.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/items/slagiron_ingot.png b/src/main/resources/assets/taiga/textures/items/slagiron_ingot.png
deleted file mode 100644
index 2b70a7e..0000000
--- a/src/main/resources/assets/taiga/textures/items/slagiron_ingot.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/items/spectrum_dust.png b/src/main/resources/assets/taiga/textures/items/spectrum_dust.png
deleted file mode 100644
index 4097fbc..0000000
--- a/src/main/resources/assets/taiga/textures/items/spectrum_dust.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/items/tiberium_shard_instable.png b/src/main/resources/assets/taiga/textures/items/tiberium_shard_instable.png
deleted file mode 100644
index 7bb8d12..0000000
--- a/src/main/resources/assets/taiga/textures/items/tiberium_shard_instable.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/items/tic/arcanite_ingot.png b/src/main/resources/assets/taiga/textures/items/tic/arcanite_ingot.png
deleted file mode 100644
index 3125946..0000000
--- a/src/main/resources/assets/taiga/textures/items/tic/arcanite_ingot.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/items/tic/bismuth_ingot.png b/src/main/resources/assets/taiga/textures/items/tic/bismuth_ingot.png
deleted file mode 100644
index d885294..0000000
--- a/src/main/resources/assets/taiga/textures/items/tic/bismuth_ingot.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/items/tic/bysmuid_ingot.png b/src/main/resources/assets/taiga/textures/items/tic/bysmuid_ingot.png
deleted file mode 100644
index f884b0c..0000000
--- a/src/main/resources/assets/taiga/textures/items/tic/bysmuid_ingot.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/items/tic/lumixyl_ingot.png b/src/main/resources/assets/taiga/textures/items/tic/lumixyl_ingot.png
deleted file mode 100644
index 9f7e64d..0000000
--- a/src/main/resources/assets/taiga/textures/items/tic/lumixyl_ingot.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/items/tic/solarium_ingot.png b/src/main/resources/assets/taiga/textures/items/tic/solarium_ingot.png
deleted file mode 100644
index a1593e3..0000000
--- a/src/main/resources/assets/taiga/textures/items/tic/solarium_ingot.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/items/radiant_pearl.png b/src/main/resources/assets/taiga/textures/materials/adamant.png
index c2bbd34..84927ea 100644
--- a/src/main/resources/assets/taiga/textures/items/radiant_pearl.png
+++ b/src/main/resources/assets/taiga/textures/materials/adamant.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/adamantite_ore.png b/src/main/resources/assets/taiga/textures/materials/duranite.png
index eef2f58..c6f1d32 100644
--- a/src/main/resources/assets/taiga/textures/blocks/adamantite_ore.png
+++ b/src/main/resources/assets/taiga/textures/materials/duranite.png
diff --git a/src/main/resources/assets/taiga/textures/materials/imperomite.png b/src/main/resources/assets/taiga/textures/materials/imperomite.png
new file mode 100644
index 0000000..0666b40
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/materials/imperomite.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/arcanite_block.png b/src/main/resources/assets/taiga/textures/materials/nucleum.png
index 922eff5..c6f1d32 100644
--- a/src/main/resources/assets/taiga/textures/blocks/arcanite_block.png
+++ b/src/main/resources/assets/taiga/textures/materials/nucleum.png
diff --git a/src/main/resources/assets/taiga/textures/materials/osram.png b/src/main/resources/assets/taiga/textures/materials/osram.png
new file mode 100644
index 0000000..ff53232
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/materials/osram.png
diff --git a/src/main/resources/assets/taiga/textures/materials/palladium.png b/src/main/resources/assets/taiga/textures/materials/palladium.png
new file mode 100644
index 0000000..c6f1d32
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/materials/palladium.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/solarium.png b/src/main/resources/assets/taiga/textures/materials/solarium.png
index 0927f8c..f25c67c 100644
--- a/src/main/resources/assets/taiga/textures/blocks/materials/solarium.png
+++ b/src/main/resources/assets/taiga/textures/materials/solarium.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/materials/tiberium.png b/src/main/resources/assets/taiga/textures/materials/tiberium.png
index 83c08e7..2fc50e7 100644
--- a/src/main/resources/assets/taiga/textures/blocks/materials/tiberium.png
+++ b/src/main/resources/assets/taiga/textures/materials/tiberium.png
diff --git a/src/main/resources/assets/taiga/textures/materials/tiberiumx.png b/src/main/resources/assets/taiga/textures/materials/tiberiumx.png
new file mode 100644
index 0000000..c984ab5
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/materials/tiberiumx.png
diff --git a/src/main/resources/assets/taiga/textures/materials/tritonite.png b/src/main/resources/assets/taiga/textures/materials/tritonite.png
new file mode 100644
index 0000000..225b826
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/materials/tritonite.png
diff --git a/src/main/resources/assets/taiga/textures/materials/uru.png b/src/main/resources/assets/taiga/textures/materials/uru.png
new file mode 100644
index 0000000..4501a35
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/materials/uru.png
diff --git a/src/main/resources/assets/taiga/textures/materials/valyrium.png b/src/main/resources/assets/taiga/textures/materials/valyrium.png
new file mode 100644
index 0000000..0c9fa17
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/materials/valyrium.png
diff --git a/src/main/resources/assets/taiga/textures/materials/vibranium.png b/src/main/resources/assets/taiga/textures/materials/vibranium.png
new file mode 100644
index 0000000..225b826
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/materials/vibranium.png
diff --git a/src/main/resources/materials.txt b/src/main/resources/materials.txt
deleted file mode 100644
index 4ad7361..0000000
--- a/src/main/resources/materials.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-arcanite
-tiberium
-prometheum
-rubium
-violium
-bismuth
-karmesine
-mindorite
-titanite
-meteorite
-adamantite
-vibranium
-ignitite
-palladium
-eternite
-mythril
-imperomite
-fractoryte
-noctunyx
-nitronite
-cryptogen
-seismodium
-aegisalt
-ultranite
-bysmuid
-nucleum
-lumixyl
-dyonite
-terramite
-solarium
-astrium
-proxideum
\ No newline at end of file