1661 files changed, 4618 insertions, 2173 deletions

diff --git a/build.gradle b/build.gradle
index 991191f..dfbc004 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,7 +56,7 @@ plugins {
     id "net.minecraftforge.gradle.forge" version "2.0.2"
 }
 */
-version = "1.4.2.8a"
+version = "1.4.2.9a"
 group= "lance5057.tDefense" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "tinkersdefense"
 
diff --git a/src/main/java/lance5057/tDefense/Reference.java b/src/main/java/lance5057/tDefense/Reference.java
index 2908cf5..83c7a0a 100644
--- a/src/main/java/lance5057/tDefense/Reference.java
+++ b/src/main/java/lance5057/tDefense/Reference.java
@@ -4,7 +4,7 @@ public class Reference
 {
 
 	public static final String	MOD_ID		= "tinkerscompendium";
-	public static final String	VERSION		= "1.4.2.8a";
+	public static final String	VERSION		= "1.4.2.9a";
 	public static final String	MOD_NAME	= "Tinkers' Compendium";
 
 }
diff --git a/src/main/java/lance5057/tDefense/TinkersDefense.java b/src/main/java/lance5057/tDefense/TinkersDefense.java
index e39b439..06833d1 100644
--- a/src/main/java/lance5057/tDefense/TinkersDefense.java
+++ b/src/main/java/lance5057/tDefense/TinkersDefense.java
@@ -20,7 +20,7 @@ import scala.reflect.internal.Trees.Modifiers;
 import slimeknights.mantle.client.CreativeTab;
 
 
-@Mod(modid = Reference.MOD_ID, version = Reference.VERSION, name = Reference.MOD_NAME, dependencies = "required-after:tconstruct")
+@Mod(modid = Reference.MOD_ID, version = Reference.VERSION, name = Reference.MOD_NAME, dependencies = "required-after: tconstruct")
 public class TinkersDefense {
 
 	private static int modGuiIndex = 0;
@@ -62,8 +62,9 @@ public class TinkersDefense {
 		
 		holiday = new HolidayBase();
 		
-		mats = new TDMaterials();
+		
 		parts = new TDParts();
+		mats = new TDMaterials();
 		tools = new TDTools();
 		events = new TDEvents();
 		traits = new TDTraits();
@@ -71,8 +72,11 @@ public class TinkersDefense {
 		
 		//core.preInit(e);
 		holiday.preInit(e);
-		mats.preInit(e);
+		
+		
+		
 		parts.preInit(e);
+		mats.preInit(e);
 		tools.preInit(e);
 		traits.preInit();
 		events.preInit();
@@ -86,9 +90,12 @@ public class TinkersDefense {
 		NetworkRegistry.INSTANCE.registerGuiHandler(this, proxy);
 		//core.init(e);
 		holiday.init(e);
-		mats.init(e);
+		
+		
+		
 		parts.init(e);
-		tools.init(e);
+		mats.init(e);
+		tools.init(e); 
 		traits.init();
 		events.init();
 		proxy.init();
@@ -100,8 +107,11 @@ public class TinkersDefense {
 
 	@Mod.EventHandler
 	public void postInit(FMLPostInitializationEvent e) {
-		mats.postInit(e);
+		
+		
+		
 		parts.postInit(e);
+		mats.postInit(e);
 		tools.postInit(e);
 		traits.postInit();
 		events.postInit();
diff --git a/src/main/java/lance5057/tDefense/armor/events/ArmorBaseEvents.java b/src/main/java/lance5057/tDefense/armor/events/ArmorBaseEvents.java
index 4f00ee9..fe25f81 100644
--- a/src/main/java/lance5057/tDefense/armor/events/ArmorBaseEvents.java
+++ b/src/main/java/lance5057/tDefense/armor/events/ArmorBaseEvents.java
@@ -1,6 +1,6 @@
 package lance5057.tDefense.armor.events;
 
-import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableList; 
 
 import lance5057.tDefense.core.tools.bases.ArmorCore;
 import net.minecraft.nbt.NBTTagCompound;
diff --git a/src/main/java/lance5057/tDefense/core/blocks/ArmorStationBlock.java b/src/main/java/lance5057/tDefense/core/blocks/ArmorStationBlock.java
index 71abf9f..b7d61ab 100644
--- a/src/main/java/lance5057/tDefense/core/blocks/ArmorStationBlock.java
+++ b/src/main/java/lance5057/tDefense/core/blocks/ArmorStationBlock.java
@@ -25,6 +25,8 @@ public class ArmorStationBlock extends BlockTable implements ITinkerStationBlock
 
     public ArmorStationBlock() {
         super(Material.WOOD);
+        this.setUnlocalizedName("armorstation");
+        this.setRegistryName("armorstation");
         this.setCreativeTab(TinkerRegistry.tabGeneral);
         this.setSoundType(SoundType.WOOD);
         this.setResistance(5f);
diff --git a/src/main/java/lance5057/tDefense/core/gui/ArmorStationContainer.java b/src/main/java/lance5057/tDefense/core/gui/ArmorStationContainer.java
index c0b7016..2216ed1 100644
--- a/src/main/java/lance5057/tDefense/core/gui/ArmorStationContainer.java
+++ b/src/main/java/lance5057/tDefense/core/gui/ArmorStationContainer.java
@@ -1,6 +1,353 @@
 package lance5057.tDefense.core.gui;
 
-public class ArmorStationContainer
-{
+import java.util.List;
+import java.util.Set;
 
-}
+import lance5057.tDefense.core.library.ArmorBuilder;
+import lance5057.tDefense.core.library.TDRegistry;
+import lance5057.tDefense.core.network.ArmorStationSelectionPacket;
+import lance5057.tDefense.core.tileentities.ArmorStationTile;
+import lance5057.tDefense.core.tools.bases.ArmorBase;
+import lance5057.tDefense.core.tools.bases.ArmorCore;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.NonNullList;
+import net.minecraft.util.StringUtils;
+import net.minecraft.world.WorldServer;
+import slimeknights.mantle.inventory.BaseContainer;
+import slimeknights.mantle.util.ItemStackList;
+import slimeknights.tconstruct.TConstruct;
+import slimeknights.tconstruct.common.Sounds;
+import slimeknights.tconstruct.common.TinkerNetwork;
+import slimeknights.tconstruct.library.Util;
+import slimeknights.tconstruct.library.events.TinkerCraftingEvent;
+import slimeknights.tconstruct.library.modifiers.TinkerGuiException;
+import slimeknights.tconstruct.library.tinkering.IModifyable;
+import slimeknights.tconstruct.library.tinkering.IRepairable;
+import slimeknights.tconstruct.library.tinkering.PartMaterialType;
+import slimeknights.tconstruct.library.utils.TagUtil;
+import slimeknights.tconstruct.library.utils.ToolBuilder;
+import slimeknights.tconstruct.tools.common.client.GuiToolStation;
+import slimeknights.tconstruct.tools.common.inventory.ContainerTinkerStation;
+import slimeknights.tconstruct.tools.common.inventory.SlotToolStationIn;
+import slimeknights.tconstruct.tools.common.network.ToolStationSelectionPacket;
+import slimeknights.tconstruct.tools.common.network.ToolStationTextPacket;
+
+// also tool forge
+public class ArmorStationContainer extends ContainerTinkerStation<ArmorStationTile> {
+
+  private final EntityPlayer player;
+  protected ArmorStationSlotOut out;
+  protected ArmorCore selectedTool; // needed for newly opened containers to sync
+  protected int activeSlots;
+  public String toolName;
+
+  public ArmorStationContainer(InventoryPlayer playerInventory, ArmorStationTile tile) {
+    super(tile);
+
+    // input slots
+    int i;
+    for(i = 0; i < tile.getSizeInventory(); i++) {
+      addSlotToContainer(new SlotToolStationIn(tile, i, 0, 0, this));
+    }
+
+    // output slot
+    out = new ArmorStationSlotOut(i, 124, 38, this);
+    addSlotToContainer(out);
+    this.addPlayerInventory(playerInventory, 8, 84 + 8);
+    onCraftMatrixChanged(null);
+
+    this.player = playerInventory.player;
+  }
+
+  public ItemStack getResult() {
+    return out.getStack();
+  }
+
+  @Override
+  protected void syncNewContainer(EntityPlayerMP player) {
+    this.activeSlots = tile.getSizeInventory();
+    TinkerNetwork.sendTo(new ToolStationSelectionPacket(null, tile.getSizeInventory()), player);
+  }
+
+  @Override
+  protected void syncWithOtherContainer(BaseContainer<ArmorStationTile> otherContainer, EntityPlayerMP player) {
+    this.syncWithOtherContainer((ArmorStationContainer) otherContainer, player);
+  }
+ 
+  protected void syncWithOtherContainer(ArmorStationContainer otherContainer, EntityPlayerMP player) {
+    // set same selection as other container
+    this.setToolSelection(otherContainer.selectedTool, otherContainer.activeSlots);
+    this.setToolName(otherContainer.toolName);
+    // also send the data to the player 
+    TinkerNetwork.sendTo(new ArmorStationSelectionPacket(otherContainer.selectedTool, otherContainer.activeSlots), player);
+    if(otherContainer.toolName != null && !otherContainer.toolName.isEmpty()) { 
+      TinkerNetwork.sendTo(new ToolStationTextPacket(otherContainer.toolName), player);
+    }
+  }
+
+  public void setToolSelection(ArmorCore selectedTool2, int activeSlots) {
+    if(activeSlots > tile.getSizeInventory()) {
+      activeSlots = tile.getSizeInventory();
+    }
+
+    this.activeSlots = activeSlots;
+    this.selectedTool = selectedTool2;
+
+    for(int i = 0; i < tile.getSizeInventory(); i++) {
+      Slot slot = inventorySlots.get(i);
+      // set part info for the slot
+      if(slot instanceof SlotToolStationIn) {
+        SlotToolStationIn slotToolPart = (SlotToolStationIn) slot;
+
+        slotToolPart.setRestriction(null);
+
+        // deactivate not needed slots
+        if(i >= activeSlots) {
+          slotToolPart.deactivate();
+        }
+        // activate the other slots and set toolpart if possible
+        else {
+          slotToolPart.activate();
+          if(selectedTool2 != null) {
+            List<PartMaterialType> pmts = selectedTool2.getToolBuildComponents();
+            if(i < pmts.size()) {
+              slotToolPart.setRestriction(pmts.get(i));
+            }
+          }
+        }
+
+        if(world.isRemote) {
+          slotToolPart.updateIcon();
+        }
+      }
+    }
+  }
+
+  public void setToolName(String name) {
+    this.toolName = name;
+
+    if(world.isRemote) {
+      GuiScreen screen = Minecraft.getMinecraft().currentScreen;
+      if(screen instanceof GuiToolStation) {
+        ((GuiToolStation) screen).textField.setText(name);
+      }
+    }
+
+    onCraftMatrixChanged(tile);
+    if(out.getHasStack()) {
+      if(name != null && !name.isEmpty()) {
+        out.inventory.getStackInSlot(0).setStackDisplayName(name);
+      }
+      else {
+        out.inventory.getStackInSlot(0).clearCustomName();
+      }
+    }
+  }
+
+  // update crafting - called whenever the content of an input slot changes
+  @Override
+  public void onCraftMatrixChanged(IInventory inventoryIn) {
+    // reset gui state
+    updateGUI();
+    try {
+      ItemStack result;
+      // 1. try repairing
+      result = repairTool(false);
+      // 2. try swapping tool parts
+      if(result.isEmpty()) {
+        result = replaceToolParts(false);
+      }
+      // 3. try modifying
+      if(result.isEmpty()) {
+        result = modifyTool(false);
+      }
+      // 4. try renaming
+      if(result.isEmpty()) {
+        result = renameTool();
+      }
+      // 5. try building a new tool
+      if(result.isEmpty()) {
+        result = buildTool();
+      }
+
+      out.inventory.setInventorySlotContents(0, result);
+      updateGUI();
+    } catch(TinkerGuiException e) {
+      // error ;(
+      out.inventory.setInventorySlotContents(0, ItemStack.EMPTY);
+      this.error(e.getMessage());
+    }
+    // sync output with other open containers on the server
+    if(!this.world.isRemote) {
+      WorldServer server = (WorldServer) this.world;
+      for(EntityPlayer player : server.playerEntities) {
+        if(player.openContainer != this && player.openContainer instanceof ArmorStationContainer && this.sameGui((ArmorStationContainer) player.openContainer)) {
+          ((ArmorStationContainer) player.openContainer).out.inventory.setInventorySlotContents(0, out.getStack());
+        }
+      }
+    }
+  }
+
+  // Called when the crafting result is taken out of its slot
+  public void onResultTaken(EntityPlayer playerIn, ItemStack stack) {
+    boolean resultTaken = false;
+
+    try {
+      resultTaken = !repairTool(true).isEmpty() ||
+                    !replaceToolParts(true).isEmpty() ||
+                    !modifyTool(true).isEmpty() ||
+                    !renameTool().isEmpty();
+    } catch(TinkerGuiException e) {
+      // no error updating needed
+      e.printStackTrace();
+    }
+
+    if(resultTaken) {
+      updateSlotsAfterToolAction();
+    }
+    else {
+      // calculate the result again (serverside)
+      try {
+        ItemStack tool = buildTool();
+
+        // we built a tool
+        if(!tool.isEmpty()) {
+          // remove 1 of each in the slots
+          // it's guaranteed that each slot that has an item has used exactly 1 item to build the tool
+          for(int i = 0; i < tile.getSizeInventory(); i++) {
+            tile.decrStackSize(i, 1);
+          }
+
+          setToolName("");
+        }
+      } catch(TinkerGuiException e) {
+        // no error updating needed
+        e.printStackTrace();
+      }
+    }
+    onCraftMatrixChanged(null);
+
+    this.playCraftSound(playerIn);
+  }
+
+  protected void playCraftSound(EntityPlayer player) {
+    Sounds.playSoundForAll(player, Sounds.saw, 0.8f, 0.8f + 0.4f * TConstruct.random.nextFloat());
+  }
+
+  private ItemStack repairTool(boolean remove) {
+    ItemStack repairable = getToolStack();
+
+    // modifying possible?
+    if(repairable.isEmpty() || !(repairable.getItem() instanceof IRepairable)) {
+      return ItemStack.EMPTY;
+    }
+
+    return ToolBuilder.tryRepairTool(getInputs(), repairable, remove);
+  }
+
+  private ItemStack replaceToolParts(boolean remove) throws TinkerGuiException {
+    ItemStack tool = getToolStack();
+
+    if(tool.isEmpty() || !(tool.getItem() instanceof ArmorBase)) {
+      return ItemStack.EMPTY;
+    }
+
+    NonNullList<ItemStack> inputs = getInputs();
+    ItemStack result = ToolBuilder.tryReplaceToolParts(tool, inputs, remove);
+    if(!result.isEmpty()) {
+      TinkerCraftingEvent.ToolPartReplaceEvent.fireEvent(result, player, inputs);
+    }
+    return result;
+  }
+
+  private ItemStack modifyTool(boolean remove) throws TinkerGuiException {
+    ItemStack modifyable = getToolStack();
+
+    // modifying possible?
+    if(modifyable.isEmpty() || !(modifyable.getItem() instanceof IModifyable)) {
+      return ItemStack.EMPTY;
+    }
+
+    ItemStack result = ToolBuilder.tryModifyTool(getInputs(), modifyable, remove);
+    if(!result.isEmpty()) {
+      TinkerCraftingEvent.ToolModifyEvent.fireEvent(result, player, modifyable.copy());
+    }
+    return result;
+  }
+
+  private ItemStack renameTool() throws TinkerGuiException {
+    ItemStack tool = getToolStack();
+
+    // modifying possible?
+    if(tool.isEmpty() ||
+       !(tool.getItem() instanceof ArmorBase) ||
+       StringUtils.isNullOrEmpty(toolName) ||
+       tool.getDisplayName().equals(toolName)) {
+      return ItemStack.EMPTY;
+    }
+
+    ItemStack result = tool.copy();
+    if(TagUtil.getNoRenameFlag(result)) {
+      throw new TinkerGuiException(Util.translate("gui.error.no_rename"));
+    }
+
+    result.setStackDisplayName(toolName);
+
+    return result;
+  }
+
+  private ItemStack buildTool() throws TinkerGuiException {
+    NonNullList<ItemStack> input = ItemStackList.withSize(tile.getSizeInventory());
+    for(int i = 0; i < input.size(); i++) {
+      input.set(i, tile.getStackInSlot(i));
+    }
+
+    ItemStack result = ArmorBuilder.tryBuildArmor(input, toolName, getBuildableTools());
+    if(!result.isEmpty()) {
+      TinkerCraftingEvent.ToolCraftingEvent.fireEvent(result, player, input);
+    }
+    return result;
+  }
+
+  protected Set<ArmorCore> getBuildableTools() {
+    return TDRegistry.getArmorStationCrafting();
+  }
+
+  private ItemStack getToolStack() {
+    return inventorySlots.get(0).getStack();
+  }
+
+  /**
+   * Removes the tool in the input slot and fixes all stacks that have stacksize 0 after being used up.
+   */
+  private void updateSlotsAfterToolAction() {
+// perfect, items already got removed but we still have to clean up 0-stacks and remove the tool
+    tile.setInventorySlotContents(0, ItemStack.EMPTY); // slot where the tool was
+    for(int i = 1; i < tile.getSizeInventory(); i++) {
+      if(!tile.getStackInSlot(i).isEmpty() && tile.getStackInSlot(i).getCount() == 0) {
+        tile.setInventorySlotContents(i, ItemStack.EMPTY);
+      }
+    }
+  }
+
+  private NonNullList<ItemStack> getInputs() {
+    NonNullList<ItemStack> input = NonNullList.withSize(tile.getSizeInventory() - 1, ItemStack.EMPTY);
+    for(int i = 1; i < tile.getSizeInventory(); i++) {
+      input.set(i - 1, tile.getStackInSlot(i));
+    }
+
+    return input;
+  }
+
+  @Override
+  public boolean canMergeSlot(ItemStack stack, Slot slot) {
+    return slot != out && super.canMergeSlot(stack, slot);
+  }
+}
\ No newline at end of file
diff --git a/src/main/java/lance5057/tDefense/core/gui/ArmorStationGui.java b/src/main/java/lance5057/tDefense/core/gui/ArmorStationGui.java
index 8bcea9c..0de5ced 100644
--- a/src/main/java/lance5057/tDefense/core/gui/ArmorStationGui.java
+++ b/src/main/java/lance5057/tDefense/core/gui/ArmorStationGui.java
@@ -9,10 +9,13 @@ import org.lwjgl.util.Point;
 
 import com.google.common.collect.Lists;
 
+import lance5057.tDefense.core.library.ArmorBuildGuiInfo;
+import lance5057.tDefense.core.library.TDClientRegistry;
+import lance5057.tDefense.core.library.TDRegistry;
+import lance5057.tDefense.core.network.ArmorStationSelectionPacket;
+import lance5057.tDefense.core.tileentities.ArmorStationTile;
+import lance5057.tDefense.core.tools.bases.ArmorBase;
 import lance5057.tDefense.core.tools.bases.ArmorCore;
-import lance5057.tDefense.util.ArmorBuildGuiInfo;
-import lance5057.tDefense.util.TDClientRegistry;
-import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.RenderHelper;
@@ -31,32 +34,21 @@ import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import slimeknights.mantle.client.gui.GuiElement;
 import slimeknights.mantle.client.gui.GuiElementScalable;
-import slimeknights.mantle.client.gui.GuiModule;
 import slimeknights.tconstruct.common.TinkerNetwork;
 import slimeknights.tconstruct.library.TinkerRegistry;
-import slimeknights.tconstruct.library.TinkerRegistryClient;
 import slimeknights.tconstruct.library.Util;
 import slimeknights.tconstruct.library.client.Icons;
-import slimeknights.tconstruct.library.client.ToolBuildGuiInfo;
 import slimeknights.tconstruct.library.modifiers.IModifier;
 import slimeknights.tconstruct.library.modifiers.ModifierNBT;
 import slimeknights.tconstruct.library.tinkering.IModifyable;
 import slimeknights.tconstruct.library.tinkering.IToolStationDisplay;
 import slimeknights.tconstruct.library.tinkering.PartMaterialType;
-import slimeknights.tconstruct.library.tinkering.TinkersItem;
 import slimeknights.tconstruct.library.tools.IToolPart;
-import slimeknights.tconstruct.library.tools.ToolCore;
 import slimeknights.tconstruct.library.utils.TagUtil;
-import slimeknights.tconstruct.tools.common.client.GuiButtonRepair;
 import slimeknights.tconstruct.tools.common.client.GuiTinkerStation;
-import slimeknights.tconstruct.tools.common.client.module.GuiButtonsToolStation;
 import slimeknights.tconstruct.tools.common.client.module.GuiInfoPanel;
-import slimeknights.tconstruct.tools.common.inventory.ContainerTinkerStation;
-import slimeknights.tconstruct.tools.common.inventory.ContainerToolStation;
 import slimeknights.tconstruct.tools.common.inventory.SlotToolStationIn;
-import slimeknights.tconstruct.tools.common.network.ToolStationSelectionPacket;
 import slimeknights.tconstruct.tools.common.network.ToolStationTextPacket;
-import slimeknights.tconstruct.tools.common.tileentity.TileToolStation;
 
 @SideOnly(Side.CLIENT)
 public class ArmorStationGui extends GuiTinkerStation {
@@ -99,8 +91,8 @@ public class ArmorStationGui extends GuiTinkerStation {
 
   public ArmorBuildGuiInfo currentInfo = ArmorStationGuiButtonRepair.info;
 
-  public ArmorStationGui(InventoryPlayer playerInv, World world, BlockPos pos, TileToolStation tile) {
-    super(world, pos, (ContainerTinkerStation) tile.createContainer(playerInv, world, pos));
+  public ArmorStationGui(InventoryPlayer playerInv, World world, BlockPos pos, ArmorStationTile armorStationTile) {
+    super(world, pos, (ArmorStationContainer) armorStationTile.createContainer(playerInv, world, pos));
 
     buttons = new ArmorStationGuiButtons(this, inventorySlots);
     this.addModule(buttons);
@@ -152,32 +144,32 @@ public class ArmorStationGui extends GuiTinkerStation {
     Keyboard.enableRepeatEvents(false);
   }
 
-  public Set<ToolCore> getBuildableItems() {
-    return TinkerRegistry.getToolStationCrafting();
+  public Set<ArmorCore> getBuildableItems() {
+    return TDRegistry.getArmorStationCrafting();
   }
 
   public void onToolSelection(ArmorBuildGuiInfo data) {
     activeSlots = Math.min(data.positions.size(), Table_slot_count);
     currentInfo = data;
 
-    ToolCore tool = null;
+    ArmorCore tool = null;
 
-    if(data.armor.getItem() instanceof ToolCore) {
-      tool = (ToolCore) data.armor.getItem();
+    if(data.armor.getItem() instanceof ArmorCore) {
+      tool = (ArmorCore) data.armor.getItem();
     }
 
-    ((ContainerToolStation) inventorySlots).setToolSelection(tool, activeSlots);
+    ((ArmorStationContainer) inventorySlots).setToolSelection(tool, activeSlots);
     // update the server (and others)
-    TinkerNetwork.sendToServer(new ToolStationSelectionPacket(tool, activeSlots));
+    TinkerNetwork.sendToServer(new ArmorStationSelectionPacket(tool, activeSlots));
     updateGUI();
   }
 
-  public void onToolSelectionPacket(ToolStationSelectionPacket packet) {
-    ArmorBuildGuiInfo info = TDClientRegistry.getArmorBuildInfoForArmor(packet.tool);
+  public void onToolSelectionPacket(ArmorStationSelectionPacket armorStationSelectionPacket) {
+    ArmorBuildGuiInfo info = TDClientRegistry.getArmorBuildInfoForArmor(armorStationSelectionPacket.armor);
     if(info == null) {
       info = ArmorStationGuiButtonRepair.info;
     }
-    activeSlots = packet.activeSlots;
+    activeSlots = armorStationSelectionPacket.activeSlots;
     currentInfo = info;
 
     buttons.setSelectedButtonByTool(currentInfo.armor);
@@ -218,7 +210,7 @@ public class ArmorStationGui extends GuiTinkerStation {
   @Override
   public void updateDisplay() {
     // tool info of existing or tool to build
-    ContainerToolStation container = (ContainerToolStation) inventorySlots;
+	  ArmorStationContainer container = (ArmorStationContainer) inventorySlots;
     ItemStack toolStack = container.getResult();
     if(toolStack.isEmpty()) {
       toolStack = inventorySlots.getSlot(0).getStack();
@@ -282,7 +274,7 @@ public class ArmorStationGui extends GuiTinkerStation {
     // tool build info
     else {
       ArmorCore tool = (ArmorCore) currentInfo.armor.getItem();
-      toolInfo.setCaption(tool.getLocalizedToolName());
+      toolInfo.setCaption(tool.getLocalizedToolName()); 
       toolInfo.setText(tool.getLocalizedDescription());
 
       // Components
@@ -338,7 +330,7 @@ public class ArmorStationGui extends GuiTinkerStation {
 
       textField.textboxKeyTyped(typedChar, keyCode);
       TinkerNetwork.sendToServer(new ToolStationTextPacket(textField.getText()));
-      ((ContainerToolStation) container).setToolName(textField.getText());
+      ((ArmorStationContainer) container).setToolName(textField.getText());
     }
   }
 
@@ -434,7 +426,7 @@ public class ArmorStationGui extends GuiTinkerStation {
     if(currentInfo == ArmorStationGuiButtonRepair.info) {
       drawRepairSlotIcons();
     }
-    else if(currentInfo.armor.getItem() instanceof TinkersItem) {
+    else if(currentInfo.armor.getItem() instanceof ArmorBase) {
       for(int i = 0; i < activeSlots; i++) {
         Slot slot = inventorySlots.getSlot(i);
         if(!(slot instanceof SlotToolStationIn)) {
@@ -555,7 +547,7 @@ public class ArmorStationGui extends GuiTinkerStation {
     buttons.metal();
 
     beamL = BeamLeft.shift(0, BeamLeft.h);
-    beamR = BeamRight.shift(0, BeamRight.h);
+    beamR = BeamRight.shift(0, BeamRight.h); 
     beamC = BeamCenter.shift(0, BeamCenter.h);
   }
 
diff --git a/src/main/java/lance5057/tDefense/core/gui/ArmorStationGuiButtonRepair.java b/src/main/java/lance5057/tDefense/core/gui/ArmorStationGuiButtonRepair.java
index dba33e8..1dddfa8 100644
--- a/src/main/java/lance5057/tDefense/core/gui/ArmorStationGuiButtonRepair.java
+++ b/src/main/java/lance5057/tDefense/core/gui/ArmorStationGuiButtonRepair.java
@@ -1,6 +1,6 @@
 package lance5057.tDefense.core.gui;
 
-import lance5057.tDefense.util.ArmorBuildGuiInfo;
+import lance5057.tDefense.core.library.ArmorBuildGuiInfo;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.text.translation.I18n;
 import slimeknights.tconstruct.library.client.Icons;
diff --git a/src/main/java/lance5057/tDefense/core/gui/ArmorStationGuiButtons.java b/src/main/java/lance5057/tDefense/core/gui/ArmorStationGuiButtons.java
index d89b002..2e047b4 100644
--- a/src/main/java/lance5057/tDefense/core/gui/ArmorStationGuiButtons.java
+++ b/src/main/java/lance5057/tDefense/core/gui/ArmorStationGuiButtons.java
@@ -2,16 +2,14 @@ package lance5057.tDefense.core.gui;
 
 import java.io.IOException;
 
-import lance5057.tDefense.util.ArmorBuildGuiInfo;
-import lance5057.tDefense.util.TDClientRegistry;
+import lance5057.tDefense.core.library.ArmorBuildGuiInfo;
+import lance5057.tDefense.core.library.TDClientRegistry;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.inventory.Container;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import slimeknights.tconstruct.library.client.Icons;
-import slimeknights.tconstruct.library.client.ToolBuildGuiInfo;
 import slimeknights.tconstruct.tools.common.client.GuiButtonItem;
-import slimeknights.tconstruct.tools.common.client.GuiToolStation;
 import slimeknights.tconstruct.tools.common.client.module.GuiSideButtons;
 
 public class ArmorStationGuiButtons extends GuiSideButtons {
@@ -19,7 +17,7 @@ public class ArmorStationGuiButtons extends GuiSideButtons {
   protected final ArmorStationGui parent;
 
   public ArmorStationGuiButtons(ArmorStationGui parent, Container container) {
-    super(parent, container, GuiToolStation.Column_Count);
+    super(parent, container, ArmorStationGui.Column_Count);
 
     this.parent = parent;
   }
@@ -65,8 +63,8 @@ public class ArmorStationGuiButtons extends GuiSideButtons {
     for(Object o : buttonList) {
       if(o instanceof GuiButtonItem) {
         @SuppressWarnings("unchecked")
-        GuiButtonItem<ToolBuildGuiInfo> btn = (GuiButtonItem<ToolBuildGuiInfo>) o;
-        btn.pressed = ItemStack.areItemStacksEqual(btn.data.tool, stack);
+        GuiButtonItem<ArmorBuildGuiInfo> btn = (GuiButtonItem<ArmorBuildGuiInfo>) o;
+        btn.pressed = ItemStack.areItemStacksEqual(btn.data.armor, stack);
       }
     }
   }
diff --git a/src/main/java/lance5057/tDefense/core/gui/ArmorStationSlotOut.java b/src/main/java/lance5057/tDefense/core/gui/ArmorStationSlotOut.java
new file mode 100644
index 0000000..b3187a4
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/core/gui/ArmorStationSlotOut.java
@@ -0,0 +1,36 @@
+package lance5057.tDefense.core.gui;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.InventoryCraftResult;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.common.FMLCommonHandler;
+import slimeknights.tconstruct.tools.common.inventory.ContainerToolStation;
+
+import javax.annotation.Nonnull;
+
+public class ArmorStationSlotOut extends Slot {
+
+  public ArmorStationContainer parent;
+
+  public ArmorStationSlotOut(int index, int xPosition, int yPosition, ArmorStationContainer container) {
+    super(new InventoryCraftResult(), index, xPosition, yPosition);
+
+    this.parent = container;
+  }
+
+  @Override
+  public boolean isItemValid(ItemStack stack) {
+    return false;
+  }
+
+  @Nonnull
+  @Override
+  public ItemStack onTake(EntityPlayer playerIn, @Nonnull ItemStack stack) {
+    FMLCommonHandler.instance().firePlayerCraftingEvent(playerIn, stack, parent.getTile());
+    parent.onResultTaken(playerIn, stack);
+    stack.onCrafting(playerIn.getEntityWorld(), playerIn, 1);
+
+    return super.onTake(playerIn, stack);
+  }
+}
\ No newline at end of file
diff --git a/src/main/java/lance5057/tDefense/util/ArmorBuildGuiInfo.java b/src/main/java/lance5057/tDefense/core/library/ArmorBuildGuiInfo.java
index a72b9ab..cf9f522 100644
--- a/src/main/java/lance5057/tDefense/util/ArmorBuildGuiInfo.java
+++ b/src/main/java/lance5057/tDefense/core/library/ArmorBuildGuiInfo.java
@@ -1,4 +1,4 @@
-package lance5057.tDefense.util;
+package lance5057.tDefense.core.library;
 
 import java.util.List;
 
diff --git a/src/main/java/lance5057/tDefense/util/ArmorBuilder.java b/src/main/java/lance5057/tDefense/core/library/ArmorBuilder.java
index 94014a6..2edb3fe 100644
--- a/src/main/java/lance5057/tDefense/util/ArmorBuilder.java
+++ b/src/main/java/lance5057/tDefense/core/library/ArmorBuilder.java
@@ -1,4 +1,4 @@
-package lance5057.tDefense.util;
+package lance5057.tDefense.core.library;
 
 import java.util.Collection;
 import java.util.List;
@@ -37,7 +37,6 @@ import slimeknights.tconstruct.library.tinkering.MaterialItem;
 import slimeknights.tconstruct.library.tinkering.PartMaterialType;
 import slimeknights.tconstruct.library.tools.IToolPart;
 import slimeknights.tconstruct.library.tools.Pattern;
-import slimeknights.tconstruct.library.tools.ToolCore;
 import slimeknights.tconstruct.library.traits.AbstractTrait;
 import slimeknights.tconstruct.library.traits.ITrait;
 import slimeknights.tconstruct.library.utils.ListUtil;
@@ -54,7 +53,7 @@ public final class ArmorBuilder {
 
   @Nonnull
   public static ItemStack tryBuildTool(NonNullList<ItemStack> stacks, String name) {
-    return tryBuildArmor(stacks, name, TDRegistry.getArmor());
+    return tryBuildArmor(stacks, name, TDRegistry.getArmor()); 
   }
 
   /**
@@ -87,10 +86,10 @@ public final class ArmorBuilder {
     input = ItemStackList.of(stacks);
 
     for(Item item : possibleTools) {
-      if(!(item instanceof ToolCore)) {
+      if(!(item instanceof ArmorCore)) {
         continue;
       }
-      ItemStack output = ((ToolCore) item).buildItemFromStacks(input);
+      ItemStack output = ((ArmorCore) item).buildItemFromStacks(input);
       if(!output.isEmpty()) {
         // name the item
         if(name != null && !name.isEmpty()) {
diff --git a/src/main/java/lance5057/tDefense/util/ArmorEvent.java b/src/main/java/lance5057/tDefense/core/library/ArmorEvent.java
index d83a930..c1e98f7 100644
--- a/src/main/java/lance5057/tDefense/util/ArmorEvent.java
+++ b/src/main/java/lance5057/tDefense/core/library/ArmorEvent.java
@@ -1,4 +1,4 @@
-package lance5057.tDefense.util;
+package lance5057.tDefense.core.library;
 
 import com.google.common.collect.ImmutableList;
 
diff --git a/src/main/java/lance5057/tDefense/util/ArmorNBT.java b/src/main/java/lance5057/tDefense/core/library/ArmorNBT.java
index 28455ff..cac62ae 100644
--- a/src/main/java/lance5057/tDefense/util/ArmorNBT.java
+++ b/src/main/java/lance5057/tDefense/core/library/ArmorNBT.java
@@ -1,9 +1,10 @@
-package lance5057.tDefense.util;
+package lance5057.tDefense.core.library;
 
-import lance5057.tDefense.core.materials.ArmorMaterialStats;
+import lance5057.tDefense.core.materials.stats.ArmorMaterialStats;
 import net.minecraft.nbt.NBTTagCompound;
 import slimeknights.tconstruct.library.materials.ExtraMaterialStats;
 import slimeknights.tconstruct.library.materials.HandleMaterialStats;
+import slimeknights.tconstruct.library.tools.ToolNBT;
 import slimeknights.tconstruct.library.utils.Tags;
 
 public class ArmorNBT {
@@ -12,7 +13,6 @@ public class ArmorNBT {
   public int armorRating;
   public int armorToughness;
   public int modifiers; // free modifiers
-
   private final NBTTagCompound parent;
 
   public ArmorNBT() {
@@ -65,27 +65,27 @@ public class ArmorNBT {
 
   /** Calculate in handles. call this last! */
   public ArmorNBT handle(HandleMaterialStats... handles) {
-    // (Average Head Durability + Average Extra Durability) * Average Handle Modifier + Average Handle Durability
+	    // (Average Head Durability + Average Extra Durability) * Average Handle Modifier + Average Handle Durability
 
-    int dur = 0;
-    float modifier = 0f;
-    for(HandleMaterialStats handle : handles) {
-      if(handle != null) {
-        dur += handle.durability;
-        modifier += handle.modifier;
-      }
-    }
+	    int dur = 0;
+	    float modifier = 0f;
+	    for(HandleMaterialStats handle : handles) {
+	      if(handle != null) {
+	        dur += handle.durability;
+	        modifier += handle.modifier;
+	      }
+	    }
 
-    modifier /= (float) handles.length;
-    this.durability = Math.round((float) this.durability * modifier);
+	    modifier /= (float) handles.length;
+	    this.durability = Math.round((float) this.durability * modifier);
 
-    // add in handle durability change
-    this.durability += Math.round((float) dur / (float) handles.length);
+	    // add in handle durability change
+	    this.durability += Math.round((float) dur / (float) handles.length);
 
-    this.durability = Math.max(1, this.durability);
+	    this.durability = Math.max(1, this.durability);
 
-    return this;
-  }
+	    return this;
+	  }
 
   public void read(NBTTagCompound tag) {
     durability = tag.getInteger(Tags.DURABILITY);
diff --git a/src/main/java/lance5057/tDefense/core/library/ArmorPart.java b/src/main/java/lance5057/tDefense/core/library/ArmorPart.java
new file mode 100644
index 0000000..24f8c86
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/core/library/ArmorPart.java
@@ -0,0 +1,258 @@
+package lance5057.tDefense.core.library;
+
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.util.ITooltipFlag;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.NonNullList;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraft.util.text.translation.I18n;
+import net.minecraft.world.World;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+import slimeknights.mantle.util.LocUtils;
+import slimeknights.tconstruct.common.ClientProxy;
+import slimeknights.tconstruct.common.config.Config;
+import slimeknights.tconstruct.library.TinkerRegistry;
+import slimeknights.tconstruct.library.Util;
+import slimeknights.tconstruct.library.materials.IMaterialStats;
+import slimeknights.tconstruct.library.materials.Material;
+import slimeknights.tconstruct.library.tinkering.MaterialItem;
+import slimeknights.tconstruct.library.tinkering.PartMaterialType;
+import slimeknights.tconstruct.library.tools.IToolPart;
+import slimeknights.tconstruct.library.tools.ToolCore;
+import slimeknights.tconstruct.library.traits.ITrait;
+import slimeknights.tconstruct.library.utils.TagUtil;
+import slimeknights.tconstruct.library.utils.Tags;
+
+public class ArmorPart extends MaterialItem implements IToolPart {
+
+  protected int cost;
+
+  public ArmorPart(int cost) {
+    this.setCreativeTab(TinkerRegistry.tabParts);
+    this.cost = cost;
+  }
+
+  @Override
+  public int getCost() {
+    return cost;
+  }
+
+  @Override
+  public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> subItems) {
+    if(this.isInCreativeTab(tab)) {
+      for(Material mat : TinkerRegistry.getAllMaterials()) {
+        // check if the material makes sense for this item (is it usable to build stuff?)
+        if(canUseMaterial(mat)) {
+          subItems.add(getItemstackWithMaterial(mat));
+          if(!Config.listAllMaterials) {
+            break;
+          }
+        }
+      }
+    }
+  }
+
+  @Override
+  public boolean canUseMaterial(Material mat) {
+    for(ToolCore tool : TinkerRegistry.getTools()) {
+      for(PartMaterialType pmt : tool.getRequiredComponents()) {
+        if(pmt.isValid(this, mat)) {
+          return true;
+        }
+      }
+    }
+
+    return false;
+  }
+
+  @SideOnly(Side.CLIENT)
+  @Override
+  public void addInformation(ItemStack stack, @Nullable World worldIn, List<String> tooltip, ITooltipFlag flagIn) {
+    Material material = getMaterial(stack);
+
+    // Material traits/info
+    boolean shift = Util.isShiftKeyDown();
+
+    if(!checkMissingMaterialTooltip(stack, tooltip)) {
+      tooltip.addAll(getTooltipTraitInfo(material));
+    }
+
+    // Stats
+    if(Config.extraTooltips) {
+      if(!shift) {
+        // info tooltip for detailed and component info
+        tooltip.add("");
+        tooltip.add(Util.translate("tooltip.tool.holdShift"));
+      }
+      else {
+        tooltip.addAll(getTooltipStatsInfo(material));
+      }
+    }
+
+    tooltip.addAll(getAddedByInfo(material));
+  }
+
+  public List<String> getTooltipTraitInfo(Material material) {
+    // We build a map with Stat -> Traits mappings that allows us to group or not group depending on what's available
+    Map<String, List<ITrait>> mapping = Maps.newConcurrentMap();
+
+    // go through all stats of the material, and check if they have a use, build the map from them
+    for(IMaterialStats stat : material.getAllStats()) {
+      if(hasUseForStat(stat.getIdentifier())) {
+        List<ITrait> traits = material.getAllTraitsForStats(stat.getIdentifier());
+        if(!traits.isEmpty()) {
+          boolean unified = false;
+          for(Map.Entry<String, List<ITrait>> entry : mapping.entrySet()) {
+            // group together if identical
+            if(entry.getValue().equals(traits)) {
+              mapping.put(entry.getKey() + ", " + stat.getLocalizedName(), entry.getValue());
+              mapping.remove(entry.getKey());
+              unified = true;
+              break;
+            }
+          }
+
+          if(!unified) {
+            mapping.put(stat.getLocalizedName(), traits);
+          }
+        }
+      }
+    }
+
+    List<String> tooltips = Lists.newLinkedList();
+    boolean withType = mapping.size() > 1;
+
+    // convert the entries into tooltips
+    for(Map.Entry<String, List<ITrait>> entry : mapping.entrySet()) {
+      // add the traits in "Stattype: Trait1, Trait2,..." style
+      StringBuilder sb = new StringBuilder();
+      if(withType) {
+        sb.append(TextFormatting.ITALIC.toString());
+        sb.append(entry.getKey());
+        sb.append(": ");
+        sb.append(TextFormatting.RESET.toString());
+      }
+      sb.append(material.getTextColor());
+      List<ITrait> traits = entry.getValue();
+      if(!traits.isEmpty()) {
+        ListIterator<ITrait> iter = traits.listIterator();
+
+        sb.append(iter.next().getLocalizedName());
+        while(iter.hasNext()) {
+          sb.append(", ").append(iter.next().getLocalizedName());
+        }
+
+        tooltips.add(sb.toString());
+      }
+    }
+
+    return tooltips;
+  }
+
+  public List<String> getTooltipStatsInfo(Material material) {
+    ImmutableList.Builder<String> builder = ImmutableList.builder();
+
+    for(IMaterialStats stat : material.getAllStats()) {
+      if(hasUseForStat(stat.getIdentifier())) {
+        List<String> text = stat.getLocalizedInfo();
+        if(!text.isEmpty()) {
+          builder.add("");
+          builder.add(TextFormatting.WHITE.toString() + TextFormatting.UNDERLINE + stat.getLocalizedName());
+          builder.addAll(stat.getLocalizedInfo());
+        }
+      }
+    }
+
+    return builder.build();
+  }
+
+  public List<String> getAddedByInfo(Material material) {
+    ImmutableList.Builder<String> builder = ImmutableList.builder();
+    if(TinkerRegistry.getTrace(material) != null) {
+      String materialInfo = I18n.translateToLocalFormatted("tooltip.part.material_added_by",
+                                                           TinkerRegistry.getTrace(material).getName());
+      builder.add("");
+      builder.add(materialInfo);
+    }
+    return builder.build();
+  }
+
+  @Nonnull
+  @Override
+  public String getItemStackDisplayName(@Nonnull ItemStack stack) {
+    Material material = getMaterial(stack);
+
+    String locString = getUnlocalizedName() + "." + material.getIdentifier();
+
+    // custom name?
+    if(I18n.canTranslate(locString)) {
+      return Util.translate(locString);
+    }
+
+    // no, create the default name combo
+    return material.getLocalizedItemName(super.getItemStackDisplayName(stack));
+  }
+
+  @Nonnull
+  @SideOnly(Side.CLIENT)
+  @Override
+  public FontRenderer getFontRenderer(ItemStack stack) {
+    return ClientProxy.fontRenderer;
+  }
+
+  @Override
+  public boolean hasUseForStat(String stat) {
+    for(ToolCore tool : TinkerRegistry.getTools()) {
+      for(PartMaterialType pmt : tool.getRequiredComponents()) {
+        if(pmt.isValidItem(this) && pmt.usesStat(stat)) {
+          return true;
+        }
+      }
+    }
+
+    return false;
+  }
+
+  public boolean checkMissingMaterialTooltip(ItemStack stack, List<String> tooltip) {
+    return checkMissingMaterialTooltip(stack, tooltip, null);
+  }
+
+  public boolean checkMissingMaterialTooltip(ItemStack stack, List<String> tooltip, String statIdentifier) {
+    Material material = getMaterial(stack);
+
+    if(material == Material.UNKNOWN) {
+      NBTTagCompound tag = TagUtil.getTagSafe(stack);
+      String materialID = tag.getString(Tags.PART_MATERIAL);
+
+      String error;
+      if(!materialID.isEmpty()) {
+        error = I18n.translateToLocalFormatted("tooltip.part.missing_material", materialID);
+      }
+      else {
+        error = I18n.translateToLocal("tooltip.part.missing_info");
+      }
+      tooltip.addAll(LocUtils.getTooltips(error));
+      return true;
+    }
+    else if(statIdentifier != null && material.getStats(statIdentifier) == null) {
+      tooltip.addAll(LocUtils.getTooltips(Util.translateFormatted("tooltip.part.missing_stats", material.getLocalizedName(), statIdentifier)));
+      return true;
+    }
+
+    return false;
+  }
+}
\ No newline at end of file
diff --git a/src/main/java/lance5057/tDefense/core/library/ArmorTags.java b/src/main/java/lance5057/tDefense/core/library/ArmorTags.java
new file mode 100644
index 0000000..c9cff2f
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/core/library/ArmorTags.java
@@ -0,0 +1,8 @@
+package lance5057.tDefense.core.library;
+
+public final class ArmorTags
+{
+	/** The stored dynamic texture location for this piece of armor */
+	  public static final String DynTex = "DynTex";
+	  public static final String TexLoc = "TexLoc";
+}
diff --git a/src/main/java/lance5057/tDefense/core/library/ArmorTextureBuilder.java b/src/main/java/lance5057/tDefense/core/library/ArmorTextureBuilder.java
new file mode 100644
index 0000000..7dee0b0
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/core/library/ArmorTextureBuilder.java
@@ -0,0 +1,94 @@
+package lance5057.tDefense.core.library;
+
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import java.util.ArrayList;
+import java.util.List;
+
+import lance5057.tDefense.Reference;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.DynamicTexture;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+import slimeknights.tconstruct.library.client.MaterialRenderInfo;
+import slimeknights.tconstruct.library.materials.Material;
+
+@SideOnly(Side.CLIENT)
+public class ArmorTextureBuilder
+{
+	@SideOnly(Side.CLIENT)
+	public static ResourceLocation createArmorTexture(String type, String[] parts, List<Material> materials)
+	{
+		List<BufferedImage> looseTex = new ArrayList<BufferedImage>();
+
+		TextureMap map = Minecraft.getMinecraft().getTextureMapBlocks();
+
+		for (int i = 0; i < materials.size(); i++)
+		{
+			BufferedImage bi = null;
+			if (materials.get(i).renderInfo instanceof MaterialRenderInfo.Default)
+			{
+				MaterialRenderInfo.Default render = (MaterialRenderInfo.Default)materials.get(i).renderInfo;
+				TextureAtlasSprite tex = map.getTextureExtry(String.format("tinkerscompendium:armor/%s/_%s_%s", type, type, parts[i]));
+				bi = new BufferedImage(tex.getIconWidth(), tex.getIconHeight(), BufferedImage.TYPE_4BYTE_ABGR);
+				
+				Graphics2D g2d = bi.createGraphics();
+				int vert = render.getVertexColor();
+				Color c = new Color(vert);
+				g2d.drawImage(createBufferedImage(tex), 0, 0, null);
+				g2d.setPaint(c);  
+				g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, 0.9f));
+				g2d.fillRect(0, 0, tex.getIconWidth(), tex.getIconHeight());
+				
+				g2d.dispose(); 
+				
+			} else
+			{
+				String s = String.format("tinkerscompendium:armor/%s/_%s_%s_%s", type, type, parts[i], materials.get(i).identifier);
+				bi = createBufferedImage(map.getTextureExtry(s));
+			}
+
+			if (bi != null)
+				looseTex.add(bi);
+		}
+
+		if (looseTex.size() != 0)
+		{
+			BufferedImage fullTex = new BufferedImage(looseTex.get(0).getWidth(), looseTex.get(0).getHeight(), BufferedImage.TYPE_4BYTE_ABGR);
+			Graphics2D g2d = fullTex.createGraphics();
+
+			for (BufferedImage tex : looseTex)
+				g2d.drawImage(tex, 0, 0, null);
+			g2d.dispose();
+
+			return Minecraft.getMinecraft().getTextureManager().getDynamicTextureLocation(Reference.MOD_ID, new DynamicTexture(fullTex));
+		}
+		return null;
+	}
+
+	@SideOnly(Side.CLIENT)
+	private static BufferedImage createBufferedImage(TextureAtlasSprite sprite)
+	{
+		if (sprite != null)
+		{
+			int w = sprite.getIconWidth();
+			int h = sprite.getIconHeight();
+			int count = sprite.getFrameCount();
+
+			BufferedImage buff = new BufferedImage(w, h * count, BufferedImage.TYPE_4BYTE_ABGR);
+
+			for (int i = 0; i < count; i++)
+			{
+				buff.setRGB(0, i * h, w, h, sprite.getFrameTextureData(i)[0], 0, w);
+			}
+
+			return buff;
+		}
+		return null;
+	}
+}
diff --git a/src/main/java/lance5057/tDefense/util/BlocksBase.java b/src/main/java/lance5057/tDefense/core/library/BlocksBase.java
index d6b576a..98e07f1 100644
--- a/src/main/java/lance5057/tDefense/util/BlocksBase.java
+++ b/src/main/java/lance5057/tDefense/core/library/BlocksBase.java
@@ -1,4 +1,4 @@
-package lance5057.tDefense.util;
+package lance5057.tDefense.core.library;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/lance5057/tDefense/core/library/CustomArmorTextureCreator.java b/src/main/java/lance5057/tDefense/core/library/CustomArmorTextureCreator.java
new file mode 100644
index 0000000..67c9661
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/core/library/CustomArmorTextureCreator.java
@@ -0,0 +1,304 @@
+package lance5057.tDefense.core.library;
+
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.resources.IResourceManagerReloadListener;
+import net.minecraft.item.Item;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.client.event.TextureStitchEvent;
+import net.minecraftforge.client.model.IModel;
+import net.minecraftforge.client.model.ModelLoaderRegistry;
+import net.minecraftforge.fml.common.eventhandler.EventPriority;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+
+import org.apache.logging.log4j.Logger;
+
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+import javax.annotation.Nonnull;
+
+import slimeknights.tconstruct.library.TinkerRegistry;
+import slimeknights.tconstruct.library.Util;
+import slimeknights.tconstruct.library.client.MaterialRenderInfo;
+import slimeknights.tconstruct.library.client.material.MaterialRenderInfoLoader;
+import slimeknights.tconstruct.library.client.model.IPatternOffset;
+import slimeknights.tconstruct.library.client.model.MaterialModelLoader;
+import slimeknights.tconstruct.library.client.texture.CastTexture;
+import slimeknights.tconstruct.library.client.texture.GuiOutlineTexture;
+import slimeknights.tconstruct.library.client.texture.PatternTexture;
+import slimeknights.tconstruct.library.client.texture.TextureColoredTexture;
+import slimeknights.tconstruct.library.client.texture.TinkerTexture;
+import slimeknights.tconstruct.library.materials.Material;
+import slimeknights.tconstruct.library.materials.MaterialGUI;
+import slimeknights.tconstruct.library.tools.IToolPart;
+import slimeknights.tconstruct.library.tools.Pattern;
+
+/**
+ * Textures registered with this creator will get a texture created/loaded for each material.
+ */
+public class CustomArmorTextureCreator implements IResourceManagerReloadListener {
+
+  public static final CustomArmorTextureCreator INSTANCE = new CustomArmorTextureCreator();
+
+  private static Logger log = Util.getLogger("ArmorTextureGen");
+
+  /**
+   * Holds all sprites built from the base-texture used as the key.
+   */
+  public static Map<String, Map<String, TextureAtlasSprite>> sprites = Maps.newHashMap();
+
+  private static Set<ResourceLocation> baseTextures = Sets.newHashSet();
+
+  //private static Map<ResourceLocation, Set<IToolPart>> texturePartMapping = Maps.newHashMap();
+
+  public static void registerTextures(Collection<ResourceLocation> textures) {
+    baseTextures.addAll(textures);
+  }
+
+  public static void registerTexture(ResourceLocation texture) {
+    baseTextures.add(texture);
+  }
+
+//  public static void registerTextureForPart(ResourceLocation texture, IToolPart toolPart) {
+//    if(!texturePartMapping.containsKey(texture)) {
+//      texturePartMapping.put(texture, Sets.newHashSet());
+//    }
+//    texturePartMapping.get(texture).add(toolPart);
+//    registerTexture(texture);
+//  }
+
+  // set these to the pattern/cast model to generate part-textures for them
+//  public static ResourceLocation patternModelLocation;
+//  public static ResourceLocation castModelLocation;
+//  public static String patternLocString;
+//  public static String castLocString;
+
+  public static final Material guiMaterial;
+
+  private int createdTextures;
+
+  // low since other event-handlers might want to register textures beforehand
+  @SubscribeEvent(priority = EventPriority.LOW)
+  public void createCustomTextures(TextureStitchEvent.Pre event) {
+    // get the material info at this point, to override hardcoded material rendering with resources
+    MaterialRenderInfoLoader.INSTANCE.onResourceManagerReload(Minecraft.getMinecraft().getResourceManager());
+
+    createdTextures = 0;
+    // create textures for each material where needed
+    createMaterialTextures(event.getMap());
+
+    // add stencil and cast textures for all used toolparts
+    //createPatterntextures(event.getMap());
+
+    log.debug("Generated " + createdTextures + " Textures for Materials");
+  }
+
+  private void createMaterialTextures(TextureMap map) {
+    // Create textures for toolparts and tools - Textures that need 1 per material
+    for(ResourceLocation baseTexture : baseTextures) {
+      // exclude missingno :I
+      if(baseTexture.toString().equals("minecraft:missingno")) {
+        continue;
+      }
+
+      //Set<IToolPart> parts = texturePartMapping.get(baseTexture);
+
+      Map<String, TextureAtlasSprite> builtSprites = Maps.newHashMap();
+      Collection<Material> mats = TinkerRegistry.getAllMaterials();
+      for(Material material : mats) {
+        boolean usable;
+//        if(parts == null || material instanceof MaterialGUI) {
+//          usable = true;
+//        }
+//        else {
+//          usable = false;
+//          for(IToolPart toolPart : parts) {
+//            usable |= toolPart.canUseMaterialForRendering(material);
+//          }
+//        }
+
+//        if(usable) {
+          TextureAtlasSprite sprite = createTexture(material, baseTexture, map);
+          if(sprite != null) {
+            builtSprites.put(material.identifier, sprite);
+          }
+        }
+//      }
+//
+//      if(belongsToToolPart(baseTexture)) {
+//        TextureAtlasSprite sprite = createTexture(guiMaterial, baseTexture, map);
+//        if(sprite != null) {
+//          builtSprites.put(guiMaterial.identifier, sprite);
+//        }
+//      }
+
+      sprites.put(baseTexture.toString(), builtSprites);
+    }
+  }
+
+  private TextureAtlasSprite createTexture(Material material, ResourceLocation baseTexture, TextureMap map) {
+    String location = baseTexture.toString() + "_" + material.identifier;
+    TextureAtlasSprite sprite;
+
+    if(exists(location)) {
+      sprite = map.registerSprite(new ResourceLocation(location));
+    }
+    else {
+      // material does not need a special generated texture
+      if(material.renderInfo == null) {
+        return null;
+      }
+
+      // different base texture?
+      if(material.renderInfo.getTextureSuffix() != null) {
+        String loc2 = baseTexture.toString() + "_" + material.renderInfo.getTextureSuffix();
+        TextureAtlasSprite base2 = map.getTextureExtry(loc2);
+        // can we manually load it?
+        if(base2 == null && exists(loc2)) {
+          base2 = TinkerTexture.loadManually(new ResourceLocation(loc2));
+          // save in the map so it's getting reused by the others and is available
+          map.setTextureEntry(base2);
+        }
+        if(base2 != null) {
+          baseTexture = new ResourceLocation(base2.getIconName());
+        }
+      }
+
+      sprite = material.renderInfo.getTexture(baseTexture, location);
+      createdTextures++;
+    }
+
+    // stitch new textures
+    if(sprite != null && material.renderInfo.isStitched()) {
+      map.setTextureEntry(sprite);
+    }
+    return sprite;
+  }
+
+//  private void createPatterntextures(TextureMap map) {
+//    // create Pattern textures
+//    if(patternModelLocation != null) {
+//      patternLocString = createPatternTexturesFor(map, patternModelLocation, TinkerRegistry.getPatternItems(), PatternTexture.class);
+//    }
+//    // create cast textures
+//    if(castModelLocation != null) {
+//      castLocString = createPatternTexturesFor(map, castModelLocation, TinkerRegistry.getCastItems(), CastTexture.class);
+//    }
+//  }
+
+//  public String createPatternTexturesFor(TextureMap map, ResourceLocation baseTextureLoc, Iterable<Item> items, Class<? extends TextureColoredTexture> clazz) {
+//    Constructor<? extends TextureColoredTexture> constructor;
+//    String baseTextureString;
+//    ResourceLocation patternLocation;
+//    try {
+//      constructor = clazz.getConstructor(ResourceLocation.class, ResourceLocation.class, String.class);
+//      IModel patternModel = ModelLoaderRegistry.getModel(baseTextureLoc);
+//      patternLocation = patternModel.getTextures().iterator().next();
+//      baseTextureString = patternLocation.toString();
+//    } catch(Exception e) {
+//      log.error(e);
+//      return null;
+//    }
+//
+//    for(Item item : items) {
+//      try {
+//        // get id
+//        String identifier = Pattern.getTextureIdentifier(item);
+//        String partPatternLocation = baseTextureString + identifier;
+//        TextureAtlasSprite partPatternTexture;
+//        if(exists(partPatternLocation)) {
+//          partPatternTexture = map.registerSprite(new ResourceLocation(partPatternLocation));
+//          map.setTextureEntry(partPatternTexture);
+//        }
+//        else {
+//          ResourceLocation modelLocation = item.getRegistryName();
+//          IModel partModel = ModelLoaderRegistry.getModel(new ResourceLocation(modelLocation.getResourceDomain(),
+//                                                                               "item/parts/" + modelLocation
+//                                                                                   .getResourcePath()
+//                                                                               + MaterialModelLoader.EXTENSION));
+//          ResourceLocation partTexture = partModel.getTextures().iterator().next();
+//
+//          if(partModel != ModelLoaderRegistry.getMissingModel()) {
+//            partPatternTexture = constructor.newInstance(partTexture, patternLocation, partPatternLocation);
+//            if(partModel instanceof IPatternOffset) {
+//              IPatternOffset offset = (IPatternOffset) partModel;
+//              ((TextureColoredTexture) partPatternTexture).setOffset(offset.getXOffset(), offset.getYOffset());
+//            }
+//            map.setTextureEntry(partPatternTexture);
+//          }
+//        }
+//      } catch(Exception e) {
+//        log.error(e);
+//      }
+//    }
+//
+//    return baseTextureString;
+//  }
+
+  public static boolean exists(String res) {
+    try {
+      ResourceLocation loc = new ResourceLocation(res);
+      loc = new ResourceLocation(loc.getResourceDomain(), "textures/" + loc.getResourcePath() + ".png");
+      Minecraft.getMinecraft().getResourceManager().getAllResources(loc);
+      return true;
+    } catch(IOException e) {
+      return false;
+    }
+  }
+
+  @Override
+  public void onResourceManagerReload(@Nonnull IResourceManager resourceManager) {
+    // clear cache
+    baseTextures.clear();
+    for(Map map : sprites.values()) {
+      // safety in case there are some references lying around
+      map.clear();
+    }
+    sprites.clear();
+  }
+
+  public static boolean belongsToToolPart(ResourceLocation location) {
+    for(IToolPart toolpart : TinkerRegistry.getToolParts()) {
+      if(!(toolpart instanceof Item)) {
+        continue; // WHY?!
+      }
+      try {
+        Optional<ResourceLocation> storedResourceLocation = MaterialModelLoader.getToolPartModelLocation(toolpart);
+        if(storedResourceLocation.isPresent()) {
+          ResourceLocation stored = storedResourceLocation.get();
+          ResourceLocation modelLocation = new ResourceLocation(stored.getResourceDomain(), "item/" + stored.getResourcePath());
+          IModel partModel = ModelLoaderRegistry.getModel(modelLocation);
+
+          // the actual texture of the part
+          ResourceLocation baseTexture = partModel.getTextures().iterator().next();
+          if(baseTexture.toString().equals(location.toString())) {
+            return true;
+          }
+        }
+      } catch(Exception e) {
+        return false;
+      }
+    }
+    return false;
+  }
+
+  static {
+    guiMaterial = new MaterialGUI("_internal_gui");
+    guiMaterial.setRenderInfo(new MaterialRenderInfo.AbstractMaterialRenderInfo() {
+      @Override
+      public TextureAtlasSprite getTexture(ResourceLocation baseTexture, String location) {
+        return new GuiOutlineTexture(baseTexture, location);
+      }
+    });
+  }
+}
\ No newline at end of file
diff --git a/src/main/java/lance5057/tDefense/util/ItemsBase.java b/src/main/java/lance5057/tDefense/core/library/ItemsBase.java
index 3e1064b..ce802fd 100644
--- a/src/main/java/lance5057/tDefense/util/ItemsBase.java
+++ b/src/main/java/lance5057/tDefense/core/library/ItemsBase.java
@@ -1,4 +1,4 @@
-package lance5057.tDefense.util;
+package lance5057.tDefense.core.library;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/lance5057/tDefense/util/MetaItem.java b/src/main/java/lance5057/tDefense/core/library/MetaItem.java
index 1064da6..cc75e17 100644
--- a/src/main/java/lance5057/tDefense/util/MetaItem.java
+++ b/src/main/java/lance5057/tDefense/core/library/MetaItem.java
@@ -1,4 +1,4 @@
-package lance5057.tDefense.util;
+package lance5057.tDefense.core.library;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
diff --git a/src/main/java/lance5057/tDefense/util/ModuleBase.java b/src/main/java/lance5057/tDefense/core/library/ModuleBase.java
index b17d76a..9e8a506 100644
--- a/src/main/java/lance5057/tDefense/util/ModuleBase.java
+++ b/src/main/java/lance5057/tDefense/core/library/ModuleBase.java
@@ -1,4 +1,4 @@
-package lance5057.tDefense.util;
+package lance5057.tDefense.core.library;
 
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
diff --git a/src/main/java/lance5057/tDefense/core/library/RegEvents.java b/src/main/java/lance5057/tDefense/core/library/RegEvents.java
new file mode 100644
index 0000000..0c9f942
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/core/library/RegEvents.java
@@ -0,0 +1,5 @@
+package lance5057.tDefense.core.library;
+
+public class RegEvents {
+	
+}
diff --git a/src/main/java/lance5057/tDefense/util/TDClientRegistry.java b/src/main/java/lance5057/tDefense/core/library/TDClientRegistry.java
index 8fd47a1..7e0a482 100644
--- a/src/main/java/lance5057/tDefense/util/TDClientRegistry.java
+++ b/src/main/java/lance5057/tDefense/core/library/TDClientRegistry.java
@@ -1,17 +1,15 @@
-package lance5057.tDefense.util;
+package lance5057.tDefense.core.library;
+
+import java.util.Map;
+
+import org.apache.logging.log4j.Logger;
 
 import com.google.common.collect.Maps;
 
 import net.minecraft.item.Item;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-
-import org.apache.logging.log4j.Logger;
-
-import java.util.Map;
-
 import slimeknights.tconstruct.library.Util;
-import slimeknights.tconstruct.library.client.ToolBuildGuiInfo;
 import slimeknights.tconstruct.library.client.texture.AbstractColoredTexture;
 
 @SideOnly(Side.CLIENT)
diff --git a/src/main/java/lance5057/tDefense/util/TDMatHelper.java b/src/main/java/lance5057/tDefense/core/library/TDMatHelper.java
index 2a42541..d0cfa54 100644
--- a/src/main/java/lance5057/tDefense/util/TDMatHelper.java
+++ b/src/main/java/lance5057/tDefense/core/library/TDMatHelper.java
@@ -1,12 +1,13 @@
-package lance5057.tDefense.util;
+package lance5057.tDefense.core.library;
 
 import javax.annotation.Nullable;
 
-import lance5057.tDefense.core.materials.ArmorMaterialStats.ChestMaterialStats;
-import lance5057.tDefense.core.materials.ArmorMaterialStats.FeetMaterialStats;
-import lance5057.tDefense.core.materials.ArmorMaterialStats.HelmMaterialStats;
-import lance5057.tDefense.core.materials.ArmorMaterialStats.LegsMaterialStats;
-import lance5057.tDefense.core.materials.ShieldMaterialStats;
+import lance5057.tDefense.core.materials.stats.ChestMaterialStats;
+import lance5057.tDefense.core.materials.stats.FabricMaterialStats;
+import lance5057.tDefense.core.materials.stats.FeetMaterialStats;
+import lance5057.tDefense.core.materials.stats.HelmMaterialStats;
+import lance5057.tDefense.core.materials.stats.LegsMaterialStats;
+import lance5057.tDefense.core.materials.stats.ShieldMaterialStats;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import slimeknights.tconstruct.library.fluid.FluidMolten;
@@ -38,6 +39,7 @@ public class TDMatHelper
 	public ChestMaterialStats 		chest;
 	public LegsMaterialStats 		legs;
 	public FeetMaterialStats 		boots;
+	public FabricMaterialStats 		cloth;
 
 	public ItemStack	gem;
 	public ItemStack	ingot;
@@ -46,6 +48,7 @@ public class TDMatHelper
 	public ItemStack	grain;
 
 	public boolean createMat = true;
+	public boolean createParts = true;
 
 	public TDMatHelper(String n, int c, FluidMolten f, boolean doMat)
 	{
@@ -57,25 +60,30 @@ public class TDMatHelper
 
 	public TDMatHelper(String n, int c, boolean doMat)
 	{
-		init(n, c, null, false, doMat);
+		init(n, c, null, false, doMat, true);
 	}
 
 	public TDMatHelper(String n, int c, boolean o, boolean doMat)
 	{
-		init(n, c, null, o, doMat);
+		init(n, c, null, o, doMat, true);
 	}
 
 	public TDMatHelper(String n, int c, @Nullable FluidMolten f, boolean o, boolean doMat)
 	{
-		init(n, c, f, o, doMat);
+		init(n, c, f, o, doMat, true);
+	}
+	
+	public TDMatHelper(String n, int c, @Nullable FluidMolten f, boolean o, boolean doMat, boolean doParts)
+	{
+		init(n, c, f, o, doMat, doParts);
 	}
 
 	public TDMatHelper(String n, int c)
 	{
-		init(n, c, null, false, true);
+		init(n, c, null, false, true, true);
 	}
 
-	private void init(String n, int c, @Nullable FluidMolten f, boolean o, boolean doMat)
+	private void init(String n, int c, @Nullable FluidMolten f, boolean o, boolean doMat, boolean doParts)
 	{
 		name = n;
 		color = c;
@@ -83,6 +91,7 @@ public class TDMatHelper
 
 		isGem = o;
 		createMat = doMat;
+		createParts = doParts;
 	}
 
 	public TDMatHelper setHead(HeadMaterialStats h)
@@ -156,6 +165,12 @@ public class TDMatHelper
 		boots = h;
 		return this;
 	}
+	
+	public TDMatHelper setCloth(FabricMaterialStats h)
+	{
+		cloth = h;
+		return this;
+	}
 
 	public TDMatHelper setGem(Item i)
 	{
diff --git a/src/main/java/lance5057/tDefense/util/TDModelLoader.java b/src/main/java/lance5057/tDefense/core/library/TDModelLoader.java
index 5ecdacf..fd57081 100644
--- a/src/main/java/lance5057/tDefense/util/TDModelLoader.java
+++ b/src/main/java/lance5057/tDefense/core/library/TDModelLoader.java
@@ -1,4 +1,4 @@
-package lance5057.tDefense.util;
+package lance5057.tDefense.core.library;
 
 import java.io.IOException;
 import java.util.List;
@@ -39,7 +39,7 @@ public class TDModelLoader implements ICustomModelLoader {
   public static String EXTENSION = ".td";
 
   // used to create only actually needed textures in the texturegenerator instead of ALL materials for all parts
-  private static final Map<ResourceLocation, ArmorCore> modelItemMap = Maps.newHashMap();
+  private static final Map<ResourceLocation, ArmorCore> modelItemMap = Maps.newHashMap(); 
 
   public static void addPartMapping(ResourceLocation resourceLocation, ArmorCore tool) {
     modelItemMap.put(resourceLocation, tool);
diff --git a/src/main/java/lance5057/tDefense/util/TDModelRegistar.java b/src/main/java/lance5057/tDefense/core/library/TDModelRegistar.java
index ad628b0..8043307 100644
--- a/src/main/java/lance5057/tDefense/util/TDModelRegistar.java
+++ b/src/main/java/lance5057/tDefense/core/library/TDModelRegistar.java
@@ -1,4 +1,4 @@
-package lance5057.tDefense.util;
+package lance5057.tDefense.core.library;
 
 import javax.annotation.Nonnull;
 
@@ -10,8 +10,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.model.ModelLoader;
 import slimeknights.tconstruct.TConstruct;
-import slimeknights.tconstruct.library.client.model.ToolModelLoader;
-import slimeknights.tconstruct.library.tools.ToolCore;
 
 public class TDModelRegistar {
 	public static ResourceLocation registerToolModel(ArmorCore armor) {
@@ -19,7 +17,7 @@ public class TDModelRegistar {
 			return null;
 		}
 		ResourceLocation itemLocation = armor.getRegistryName();
-		String path = "tools/" + itemLocation.getResourcePath() + ToolModelLoader.EXTENSION;
+		String path = "tools/" + itemLocation.getResourcePath() + TDModelLoader.EXTENSION;
 
 		ResourceLocation location = new ResourceLocation(itemLocation.getResourceDomain(), path);
 		TDModelLoader.addPartMapping(location, armor);
@@ -31,9 +29,9 @@ public class TDModelRegistar {
 	 * Manual registration of a tool model. You probably shouldn't be using this.
 	 */
 	public static ResourceLocation registerToolModel(Item item, final ResourceLocation location) {
-		if (!location.getResourcePath().endsWith(ToolModelLoader.EXTENSION)) {
+		if (!location.getResourcePath().endsWith(TDModelLoader.EXTENSION)) {
 			TConstruct.log.error("The material-model " + location.toString() + " does not end with '"
-					+ ToolModelLoader.EXTENSION + "' and will therefore not be loaded by the custom model loader!");
+					+ TDModelLoader.EXTENSION + "' and will therefore not be loaded by the custom model loader!");
 		}
 
 		return registerIt(item, location);
@@ -45,7 +43,7 @@ public class TDModelRegistar {
 		// a model to render an Itemstack
 		// we use an ItemMeshDefinition because it allows us to do it no matter what
 		// metadata we use
-		ModelLoader.setCustomMeshDefinition(item, new ItemMeshDefinition() {
+		ModelLoader.setCustomMeshDefinition(item, new ItemMeshDefinition() { 
 			@Nonnull
 			@Override
 			public ModelResourceLocation getModelLocation(@Nonnull ItemStack stack) {
diff --git a/src/main/java/lance5057/tDefense/util/TDRegistry.java b/src/main/java/lance5057/tDefense/core/library/TDRegistry.java
index 87fed5b..74b4cba 100644
--- a/src/main/java/lance5057/tDefense/util/TDRegistry.java
+++ b/src/main/java/lance5057/tDefense/core/library/TDRegistry.java
@@ -1,24 +1,28 @@
-package lance5057.tDefense.util;
+package lance5057.tDefense.core.library;
 
+import java.util.List;
 import java.util.Set;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
+import akka.japi.Pair;
 import gnu.trove.set.hash.TLinkedHashSet;
 import lance5057.tDefense.core.tools.bases.ArmorCore;
+import net.minecraft.item.Item;
 import slimeknights.tconstruct.library.TinkerRegistry;
 import slimeknights.tconstruct.library.tinkering.PartMaterialType;
 import slimeknights.tconstruct.library.tools.IToolPart;
-import slimeknights.tconstruct.library.tools.ToolCore;
 
 public class TDRegistry {
 	private static final Set<ArmorCore> armor = new TLinkedHashSet<>();
 	  private static final Set<IToolPart> armorParts = new TLinkedHashSet<>();
 	  private static final Set<ArmorCore> armorStationCrafting = Sets.newLinkedHashSet();
 	  private static final Set<ArmorCore> armorForgeCrafting = Sets.newLinkedHashSet();
+	  public static List<Pair<Item, ArmorPart>> armorPartPatterns = Lists.newLinkedList();
 	  
-	  public static void registerTool(ArmorCore tool) {
+	  public static void registerTool(ArmorCore tool) { 
 		  armor.add(tool);
 
 		    for(PartMaterialType pmt : tool.getRequiredComponents()) {
diff --git a/src/main/java/lance5057/tDefense/util/TDToolHelper.java b/src/main/java/lance5057/tDefense/core/library/TDToolHelper.java
index d5b6e6e..f0ce30f 100644
--- a/src/main/java/lance5057/tDefense/util/TDToolHelper.java
+++ b/src/main/java/lance5057/tDefense/core/library/TDToolHelper.java
@@ -1,18 +1,18 @@
-package lance5057.tDefense.util;
+package lance5057.tDefense.core.library;
 
+import lance5057.tDefense.core.tools.bases.ArmorCore;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.ItemTool;
 import net.minecraft.nbt.NBTTagList;
 import slimeknights.tconstruct.library.TinkerRegistry;
 import slimeknights.tconstruct.library.materials.Material;
-import slimeknights.tconstruct.library.tools.ToolCore;
 import slimeknights.tconstruct.library.utils.TagUtil;
 
 public class TDToolHelper {
 
 	public static boolean checkIfMetal(ItemStack item) {
 		
-		if(item.getItem() instanceof ToolCore)
+		if(item.getItem() instanceof ArmorCore)
 		{
 			NBTTagList list = TagUtil.getBaseMaterialsTagList(item);
 	
diff --git a/src/main/java/lance5057/tDefense/core/materials/TDMaterials.java b/src/main/java/lance5057/tDefense/core/materials/TDMaterials.java
index 47afb76..f66e916 100644
--- a/src/main/java/lance5057/tDefense/core/materials/TDMaterials.java
+++ b/src/main/java/lance5057/tDefense/core/materials/TDMaterials.java
@@ -5,6 +5,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -15,7 +16,15 @@ import gnu.trove.set.hash.THashSet;
 import lance5057.tDefense.Reference;
 import lance5057.tDefense.TinkersDefense;
 import lance5057.tDefense.core.items.TDOreDictItem;
-import lance5057.tDefense.util.TDMatHelper;
+import lance5057.tDefense.core.library.TDMatHelper;
+import lance5057.tDefense.core.materials.stats.ArmorMaterialStats;
+import lance5057.tDefense.core.materials.stats.BaubleMaterialStats;
+import lance5057.tDefense.core.materials.stats.ChestMaterialStats;
+import lance5057.tDefense.core.materials.stats.FabricMaterialStats;
+import lance5057.tDefense.core.materials.stats.FeetMaterialStats;
+import lance5057.tDefense.core.materials.stats.HelmMaterialStats;
+import lance5057.tDefense.core.materials.stats.LegsMaterialStats;
+import lance5057.tDefense.core.materials.stats.ShieldMaterialStats;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.init.Blocks;
@@ -46,8 +55,8 @@ import slimeknights.tconstruct.library.materials.ExtraMaterialStats;
 import slimeknights.tconstruct.library.materials.HandleMaterialStats;
 import slimeknights.tconstruct.library.materials.HeadMaterialStats;
 import slimeknights.tconstruct.library.materials.Material;
-//import slimeknights.tconstruct.library.materials.Material;
 import slimeknights.tconstruct.library.materials.MaterialTypes;
+import slimeknights.tconstruct.library.tools.IToolPart;
 import slimeknights.tconstruct.library.utils.HarvestLevels;
 import slimeknights.tconstruct.shared.TinkerCommons;
 import slimeknights.tconstruct.shared.TinkerFluids;
@@ -55,239 +64,245 @@ import slimeknights.tconstruct.smeltery.block.BlockMolten;
 import slimeknights.tconstruct.tools.TinkerMaterials;
 
 @Mod.EventBusSubscriber(modid = Reference.MOD_ID)
-public class TDMaterials {
+public class TDMaterials
+{
 
 	// public static final List<Material> materials = Lists.newArrayList();
 	ArmorMaterialStats ams = new ArmorMaterialStats(0, 0, 0, 0, "");
 
-	String SHIELD = ShieldMaterialStats.TYPE;
-	String HELM = ArmorMaterialStats.HelmMaterialStats.TYPE;
-	String CHEST = ArmorMaterialStats.ChestMaterialStats.TYPE;
-	String LEGS = ArmorMaterialStats.LegsMaterialStats.TYPE;
-	String BOOTS = ArmorMaterialStats.FeetMaterialStats.TYPE;
-	String BAUBLE = BaubleMaterialStats.TYPE;
-
-	public static final Map<String, Material> materials = new THashMap<>();
-	public static final Map<String, MaterialIntegration> materialIntegrations = new THashMap<>();
-	public static final Collection<String> deferredMaterials = new THashSet<>();
-
-	public static final Map<String, Integer> colors = new THashMap();
-	public static final Map<String, FluidMolten> fluids = new THashMap();
-
-	public static Material black;
-	public static Material red;
-	public static Material green;
-	public static Material brown;
-	public static Material blue;
-	public static Material purple;
-	public static Material cyan;
-	public static Material lightgray;
-	public static Material gray;
-	public static Material pink;
-	public static Material lime;
-	public static Material yellow;
-	public static Material lightblue;
-	public static Material magenta;
-	public static Material orange;
-	public static Material white;
-
-	public static FluidMolten fluidVile = fluids.put("vile",
-			(FluidMolten) new FluidMolten("vile", 0x111111).setTemperature(0));
-	public static FluidMolten fluidVibrant = fluids.put("vibrant", new FluidMolten("vibrant", 0x76ff00));
-	public static FluidMolten fluidSlush = fluids.put("slush",
-			(FluidMolten) new FluidMolten("slush", 0xbfefff).setTemperature(0));
-	public static FluidMolten fluidQuartz = fluids.put("quartz",
-			(FluidMolten) new FluidMolten("quartz", 0xdddddd).setTemperature(75));
-	public static FluidMolten fluidChorusJuice = fluids.put("chorusjuice", new FluidMolten("chorusjuice", 0xd982ff));
-	public static FluidMolten fluidDragonsBreath = fluids.put("dragonsbreath",
-			new FluidMolten("dragonsbreath", 0x7f00b7));
+	String	SHIELD	= ShieldMaterialStats.TYPE;
+	String	HELM	= HelmMaterialStats.TYPE;
+	String	CHEST	= ChestMaterialStats.TYPE;
+	String	LEGS	= LegsMaterialStats.TYPE;
+	String	BOOTS	= FeetMaterialStats.TYPE;
+	String	BAUBLE	= BaubleMaterialStats.TYPE;
+
+	public static final Map<String, Material>				materials				= new THashMap<>();
+	public static final Map<String, MaterialIntegration>	materialIntegrations	= new THashMap<>();
+	public static final Collection<String>					deferredMaterials		= new THashSet<>();
+
+	public static final Map<String, Integer>		colors	= new THashMap();
+	public static final Map<String, FluidMolten>	fluids	= new THashMap();
+
+	public static Material	black;
+	public static Material	red;
+	public static Material	green;
+	public static Material	brown;
+	public static Material	blue;
+	public static Material	purple;
+	public static Material	cyan;
+	public static Material	lightgray;
+	public static Material	gray;
+	public static Material	pink;
+	public static Material	lime;
+	public static Material	yellow;
+	public static Material	lightblue;
+	public static Material	magenta;
+	public static Material	orange;
+	public static Material	white;
+
+	public static FluidMolten	fluidVile			= fluids.put("vile", (FluidMolten) new FluidMolten("vile", 0x111111).setTemperature(0));
+	public static FluidMolten	fluidVibrant		= fluids.put("vibrant", new FluidMolten("vibrant", 0x76ff00));
+	public static FluidMolten	fluidSlush			= fluids.put("slush", (FluidMolten) new FluidMolten("slush", 0xbfefff).setTemperature(0));
+	public static FluidMolten	fluidQuartz			= fluids.put("quartz", (FluidMolten) new FluidMolten("quartz", 0xdddddd).setTemperature(75));
+	public static FluidMolten	fluidChorusJuice	= fluids.put("chorusjuice", new FluidMolten("chorusjuice", 0xd982ff));
+	public static FluidMolten	fluidDragonsBreath	= fluids.put("dragonsbreath", new FluidMolten("dragonsbreath", 0x7f00b7));
 
 	List<TDMatHelper> materials_master = new ArrayList<>();
 
 	// Base
 	List<TDMatHelper> materials_base = new ArrayList<>(Arrays.asList(
-			new TDMatHelper("aeonsteel", 0xa470e0, fluids.put("aeonsteel", new FluidMolten("aeonsteel", 0xa470e0)),
-					true).setHead(new HeadMaterialStats(500, 15.00f, 4.0f, HarvestLevels.COBALT))
-							.setHandle(new HandleMaterialStats(1.1f, 0)).setExtra(new ExtraMaterialStats(50))
-							.setShield(new ShieldMaterialStats(500 / 4, 85))
-							.setBow(new BowMaterialStats(0.75f, 1.0f, 2.5f))
-							.setHelm(ams.new HelmMaterialStats(500, 2, 2, 0f))
-							.setChest(ams.new ChestMaterialStats(500, 6, 3, 0f))
-							.setLegs(ams.new LegsMaterialStats(500, 5, 3, 0f))
-							.setBoots(ams.new FeetMaterialStats(500, 3, 2, 0f)),
-			new TDMatHelper("queensgold", 0xdcff00, fluids.put("queensgold", new FluidMolten("queensgold", 0xdcff00)),
-					true).setHead(new HeadMaterialStats(70, 3.00f, 3.00f, HarvestLevels.IRON))
-							.setHandle(new HandleMaterialStats(1.05f, -45)).setExtra(new ExtraMaterialStats(20))
-							.setShield(new ShieldMaterialStats(70 / 4, 57))
-							.setBow(new BowMaterialStats(1.1f, 1.0f, 0.5f))
-							.setHelm(ams.new HelmMaterialStats(70, 2, 1, 20f))
-							.setChest(ams.new ChestMaterialStats(70, 6, 2, 30f))
-							.setLegs(ams.new LegsMaterialStats(70, 5, 2, 20f))
-							.setBoots(ams.new FeetMaterialStats(70, 2, 1, 15f)),
-			new TDMatHelper("dogbearium", 0x6d3300, fluids.put("dogbearium", new FluidMolten("dogbearium", 0x6d3300)),
-					true).setHead(new HeadMaterialStats(150, 5.00f, 9.00f, HarvestLevels.DIAMOND))
-							.setHandle(new HandleMaterialStats(0.85f, 75)).setExtra(new ExtraMaterialStats(75))
-							.setShield(new ShieldMaterialStats(150 / 4, 75))
-							.setBow(new BowMaterialStats(0.1f, 0.5f, 5.5f))
-							.setHelm(ams.new HelmMaterialStats(150, 3, 3, -60f))
-							.setChest(ams.new ChestMaterialStats(150, 8, 4, -60f))
-							.setLegs(ams.new LegsMaterialStats(150, 6, 4, -60f))
-							.setBoots(ams.new FeetMaterialStats(150, 3, 3, -60f)),
-			new TDMatHelper("sinisterium", 0x210000,
-					fluids.put("sinisterium", new FluidMolten("sinisterium", 0x210000)), true)
-							.setHead(new HeadMaterialStats(224, 5.00f, 5.00f, HarvestLevels.DIAMOND))
-							.setHandle(new HandleMaterialStats(0.75f, 99)).setExtra(new ExtraMaterialStats(99))
-							.setShield(new ShieldMaterialStats(224 / 4, 55))
-							.setBow(new BowMaterialStats(2.1f, 1.6f, 7.2f))
-							.setHelm(ams.new HelmMaterialStats(224, 2, 0, 9.5f))
-							.setChest(ams.new ChestMaterialStats(224, 6, 0, 10.5f))
-							.setLegs(ams.new LegsMaterialStats(224, 5, 0, 10.0f))
-							.setBoots(ams.new FeetMaterialStats(224, 2, 0, 9.5f)),
-			new TDMatHelper("nihilite", 0x000021, fluids.put("nihilite", new FluidMolten("nihilite", 0x000021)), true)
-					.setHead(new HeadMaterialStats(400, 9.7f, 7.1f, HarvestLevels.COBALT))
-					.setHandle(new HandleMaterialStats(0.9f, 70)).setExtra(new ExtraMaterialStats(74))
-					.setShield(new ShieldMaterialStats(400 / 4, 95)).setBow(new BowMaterialStats(0.9f, 1.7f, -1f))
-					.setHelm(ams.new HelmMaterialStats(400, 2, 0, 19))
-					.setChest(ams.new ChestMaterialStats(400, 5, 0, 15))
-					.setLegs(ams.new LegsMaterialStats(400, 4, 0, 15))
-					.setBoots(ams.new FeetMaterialStats(400, 2, 0, 19)),
-			new TDMatHelper("orichalcum", 0xffc700, fluids.put("orichalcum", new FluidMolten("orichalcum", 0xffc700)),
-					true).setHead(new HeadMaterialStats(180, 5.3f, 6.23f, HarvestLevels.OBSIDIAN))
-							.setHandle(new HandleMaterialStats(1.1f, 25)).setExtra(new ExtraMaterialStats(35))
-							.setShield(new ShieldMaterialStats(180 / 4, 70))
-							.setBow(new BowMaterialStats(1.9f, 1.9f, 2.3f))
-							.setHelm(ams.new HelmMaterialStats(180, 2, 2, 20.5f))
-							.setChest(ams.new ChestMaterialStats(180, 6, 3, 20.5f))
-							.setLegs(ams.new LegsMaterialStats(180, 5, 3, 20.5f))
-							.setBoots(ams.new FeetMaterialStats(180, 2, 3, 20.5f)),
-			new TDMatHelper("pandorium", 0x7f6a00, fluids.put("pandorium", new FluidMolten("pandorium", 0x7f6a00)),
-					true).setHead(new HeadMaterialStats(999, 10.2f, 8.72f, HarvestLevels.OBSIDIAN))
-							.setHandle(new HandleMaterialStats(0.4f, 999)).setExtra(new ExtraMaterialStats(99))
-							.setShield(new ShieldMaterialStats(999 / 4, 100)).setBow(new BowMaterialStats(3f, 0.9f, 9f))
-							.setHelm(ams.new HelmMaterialStats(999, 3, 3, -70.0f))
-							.setChest(ams.new ChestMaterialStats(999, 8, 4, -70.0f))
-							.setLegs(ams.new LegsMaterialStats(999, 6, 4, -70.0f))
-							.setBoots(ams.new FeetMaterialStats(999, 3, 3, -70.0f)),
-			new TDMatHelper("rosegold", 0xff9b84, fluids.put("rosegold", new FluidMolten("rosegold", 0xff9b84)), true)
-					.setHead(new HeadMaterialStats(99, 4f, 1f, HarvestLevels.STONE))
-					.setHandle(new HandleMaterialStats(1.5f, -90)).setExtra(new ExtraMaterialStats(-90))
-					.setShield(new ShieldMaterialStats(99 / 4, 24)).setBow(new BowMaterialStats(0.1f, 0.1f, -2f))
-					.setHelm(ams.new HelmMaterialStats(99, 1, 0, 23.0f))
-					.setChest(ams.new ChestMaterialStats(99, 4, 0, 23.0f))
-					.setLegs(ams.new LegsMaterialStats(99, 3, 0, 23.0f))
-					.setBoots(ams.new FeetMaterialStats(99, 1, 0, 23.0f)),
-			new TDMatHelper("platinum", 0xe8e8e8, fluids.put("platinum", new FluidMolten("platinum", 0xe8e8e8)), true)
-					.setHead(new HeadMaterialStats(99, 3.7f, 4f, HarvestLevels.IRON))
-					.setHandle(new HandleMaterialStats(1.5f, -90)).setExtra(new ExtraMaterialStats(-90))
-					.setShield(new ShieldMaterialStats(99 / 4, 14)).setBow(new BowMaterialStats(0.1f, 0.1f, -2f))
-					.setHelm(ams.new HelmMaterialStats(99, 1, 1, 19.0f))
-					.setChest(ams.new ChestMaterialStats(99, 4, 1, 19.0f))
-					.setLegs(ams.new LegsMaterialStats(99, 3, 1, 19.0f))
-					.setBoots(ams.new FeetMaterialStats(99, 1, 1, 19.0f)),
-			new TDMatHelper("brass", 0xdbb332, fluids.put("brass", new FluidMolten("brass", 0xdbb332)), true)
-					.setHead(new HeadMaterialStats(380, 5f, 3f, HarvestLevels.IRON))
-					.setHandle(new HandleMaterialStats(0.85f, 90)).setExtra(new ExtraMaterialStats(75))
-					.setShield(new ShieldMaterialStats(380 / 4, 50)).setBow(new BowMaterialStats(0.1f, 0.5f, -1f))
-					.setHelm(ams.new HelmMaterialStats(380, 2, 1, 4.5f))
-					.setChest(ams.new ChestMaterialStats(380, 3, 2, 4.5f))
-					.setLegs(ams.new LegsMaterialStats(380, 2, 2, 4.5f))
-					.setBoots(ams.new FeetMaterialStats(380, 2, 2, 4.5f)),
-			new TDMatHelper("silver", 0x9e9e9e, new FluidMolten("silver", 0x9e9e9e), false),
-			new TDMatHelper("gold", 0xfff428, TinkerFluids.gold, true).setIngot(Items.GOLD_INGOT)
-					.setNugget(Items.GOLD_NUGGET).setHead(new HeadMaterialStats(100, 1f, 1f, HarvestLevels.STONE))
-					.setHandle(new HandleMaterialStats(0.25f, 10)).setExtra(new ExtraMaterialStats(25))
-					.setShield(new ShieldMaterialStats(100 / 4, 14)).setBow(new BowMaterialStats(0.2f, 0.4f, -1f))
-					.setHelm(ams.new HelmMaterialStats(100, 1, 0, 33f))
-					.setChest(ams.new ChestMaterialStats(100, 4, 0, 33f))
-					.setLegs(ams.new LegsMaterialStats(100, 3, 0, 33f))
-					.setBoots(ams.new FeetMaterialStats(100, 1, 0, 33f)),
-			new TDMatHelper("valyriansteel", 0xe2d9e2,
-					fluids.put("valyriansteel", new FluidMolten("valyriansteel", 0xe2d9e2)), true)
-							.setHead(new HeadMaterialStats(610, 7f, 7f, HarvestLevels.OBSIDIAN))
-							.setHandle(new HandleMaterialStats(0.9f, 180)).setExtra(new ExtraMaterialStats(125))
-							.setShield(new ShieldMaterialStats(610 / 4, 85))
-							.setBow(new BowMaterialStats(1.6f, 1.5f, 3f))
-							.setHelm(ams.new HelmMaterialStats(610, 3, 3, 0))
-							.setChest(ams.new ChestMaterialStats(610, 7, 4, 0))
-							.setLegs(ams.new LegsMaterialStats(610, 6, 2, 0))
-							.setBoots(ams.new FeetMaterialStats(610, 3, 3, 0)),
-			new TDMatHelper("froststeel", 0xc6dcff, fluids.put("froststeel", new FluidMolten("froststeel", 0xc6dcff)),
-					true).setHead(new HeadMaterialStats(610, 7f, 7f, HarvestLevels.OBSIDIAN))
-							.setHandle(new HandleMaterialStats(1.1f, 110)).setExtra(new ExtraMaterialStats(125))
-							.setShield(new ShieldMaterialStats(610 / 4, 85))
-							.setBow(new BowMaterialStats(1.6f, 1.5f, 3f))
-							.setHelm(ams.new HelmMaterialStats(610, 2, 2, 0))
-							.setChest(ams.new ChestMaterialStats(610, 6, 3, 0))
-							.setLegs(ams.new LegsMaterialStats(610, 5, 2, 0))
-							.setBoots(ams.new FeetMaterialStats(610, 3, 1, 0)),
-			new TDMatHelper("pureardite", 0xff4300, fluids.put("pureardite", new FluidMolten("pureardite", 0xff4300)),
-					true).setHead(new HeadMaterialStats(1200, 3.5f, 3.6f, HarvestLevels.COBALT))
-							.setHandle(new HandleMaterialStats(1.4f, -200)).setExtra(new ExtraMaterialStats(450))
-							.setShield(new ShieldMaterialStats(1200 / 4, 33))
-							.setBow(new BowMaterialStats(0.45f, 0.8f, 1f)),
-			new TDMatHelper("purecobalt", 0x547eff, fluids.put("purecobalt", new FluidMolten("purecobalt", 0x547eff)),
-					true).setHead(new HeadMaterialStats(780, 13f, 4.1f, HarvestLevels.COBALT))
-							.setHandle(new HandleMaterialStats(1.4f, 100)).setExtra(new ExtraMaterialStats(300))
-							.setShield(new ShieldMaterialStats(780 / 4, 33))
-							.setBow(new BowMaterialStats(0.3f, 1.3f, 3f)),
-			new TDMatHelper("puremanyullyn", 0xd044ff,
-					fluids.put("puremanyullyn", new FluidMolten("puremanyullyn", 0xd044ff)), true)
-							.setHead(new HeadMaterialStats(820, 7.02f, 9.1f, HarvestLevels.COBALT))
-							.setHandle(new HandleMaterialStats(0.5f, 350)).setExtra(new ExtraMaterialStats(350))
-							.setShield(new ShieldMaterialStats(820 / 4, 33))
-							.setBow(new BowMaterialStats(0.65f, 1.2f, 4f)),
-			new TDMatHelper("glass", 0xffffff, TinkerFluids.glass, true)
-					.setHead(new HeadMaterialStats(6, 4f, 7f, HarvestLevels.STONE))
-					.setHandle(new HandleMaterialStats(0.1f, -45)).setExtra(new ExtraMaterialStats(-45))
-					.setShield(new ShieldMaterialStats(6 / 4, 33)).setBow(new BowMaterialStats(0.1f, 0.1f, -2f)),
-			new TDMatHelper("ice", 0xdcff00, false),
-			new TDMatHelper("purifiedgold", 0xffe242,
-					fluids.put("purifiedgold", new FluidMolten("purifiedgold", 0xffe242)), true),
-			new TDMatHelper("purifiedsilver", 0xefefef,
-					fluids.put("purifiedsilver", new FluidMolten("purifiedsilver", 0xefefef)), true)));
+		new TDMatHelper("aeonsteel", 0xa470e0, fluids.put("aeonsteel", new FluidMolten("aeonsteel", 0xa470e0)), true).setHead(new HeadMaterialStats(500, 15.00f, 4.0f, HarvestLevels.COBALT))
+				.setHandle(new HandleMaterialStats(1.1f, 0))
+				.setExtra(new ExtraMaterialStats(50))
+				.setShield(new ShieldMaterialStats(500 / 4, 85))
+				.setBow(new BowMaterialStats(0.75f, 1.0f, 2.5f))
+				.setHelm(new HelmMaterialStats(500, 2, 2, 0f))
+				.setChest(new ChestMaterialStats(500, 6, 3, 0f))
+				.setLegs(new LegsMaterialStats(500, 5, 3, 0f))
+				.setBoots(new FeetMaterialStats(500, 3, 2, 0f)),
+		new TDMatHelper("queensgold", 0xdcff00, fluids.put("queensgold", new FluidMolten("queensgold", 0xdcff00)), true).setHead(new HeadMaterialStats(70, 3.00f, 3.00f, HarvestLevels.IRON))
+				.setHandle(new HandleMaterialStats(1.05f, -45))
+				.setExtra(new ExtraMaterialStats(20))
+				.setShield(new ShieldMaterialStats(70 / 4, 57))
+				.setBow(new BowMaterialStats(1.1f, 1.0f, 0.5f))
+				.setHelm(new HelmMaterialStats(70, 2, 1, 20f))
+				.setChest(new ChestMaterialStats(70, 6, 2, 30f))
+				.setLegs(new LegsMaterialStats(70, 5, 2, 20f))
+				.setBoots(new FeetMaterialStats(70, 2, 1, 15f)),
+		new TDMatHelper("dogbearium", 0x6d3300, fluids.put("dogbearium", new FluidMolten("dogbearium", 0x6d3300)), true).setHead(new HeadMaterialStats(150, 5.00f, 9.00f, HarvestLevels.DIAMOND))
+				.setHandle(new HandleMaterialStats(0.85f, 75))
+				.setExtra(new ExtraMaterialStats(75))
+				.setShield(new ShieldMaterialStats(150 / 4, 75))
+				.setBow(new BowMaterialStats(0.1f, 0.5f, 5.5f))
+				.setHelm(new HelmMaterialStats(150, 3, 3, -60f))
+				.setChest(new ChestMaterialStats(150, 8, 4, -60f))
+				.setLegs(new LegsMaterialStats(150, 6, 4, -60f))
+				.setBoots(new FeetMaterialStats(150, 3, 3, -60f)),
+		new TDMatHelper("sinisterium", 0x210000, fluids.put("sinisterium", new FluidMolten("sinisterium", 0x210000)), true).setHead(new HeadMaterialStats(224, 5.00f, 5.00f, HarvestLevels.DIAMOND))
+				.setHandle(new HandleMaterialStats(0.75f, 99))
+				.setExtra(new ExtraMaterialStats(99))
+				.setShield(new ShieldMaterialStats(224 / 4, 55))
+				.setBow(new BowMaterialStats(2.1f, 1.6f, 7.2f))
+				.setHelm(new HelmMaterialStats(224, 2, 0, 9.5f))
+				.setChest(new ChestMaterialStats(224, 6, 0, 10.5f))
+				.setLegs(new LegsMaterialStats(224, 5, 0, 10.0f))
+				.setBoots(new FeetMaterialStats(224, 2, 0, 9.5f)),
+		new TDMatHelper("nihilite", 0x000021, fluids.put("nihilite", new FluidMolten("nihilite", 0x000021)), true).setHead(new HeadMaterialStats(400, 9.7f, 7.1f, HarvestLevels.COBALT))
+				.setHandle(new HandleMaterialStats(0.9f, 70))
+				.setExtra(new ExtraMaterialStats(74))
+				.setShield(new ShieldMaterialStats(400 / 4, 95))
+				.setBow(new BowMaterialStats(0.9f, 1.7f, -1f))
+				.setHelm(new HelmMaterialStats(400, 2, 0, 19))
+				.setChest(new ChestMaterialStats(400, 5, 0, 15))
+				.setLegs(new LegsMaterialStats(400, 4, 0, 15))
+				.setBoots(new FeetMaterialStats(400, 2, 0, 19)),
+		new TDMatHelper("orichalcum", 0xffc700, fluids.put("orichalcum", new FluidMolten("orichalcum", 0xffc700)), true).setHead(new HeadMaterialStats(180, 5.3f, 6.23f, HarvestLevels.OBSIDIAN))
+				.setHandle(new HandleMaterialStats(1.1f, 25))
+				.setExtra(new ExtraMaterialStats(35))
+				.setShield(new ShieldMaterialStats(180 / 4, 70))
+				.setBow(new BowMaterialStats(1.9f, 1.9f, 2.3f))
+				.setHelm(new HelmMaterialStats(180, 2, 2, 20.5f))
+				.setChest(new ChestMaterialStats(180, 6, 3, 20.5f))
+				.setLegs(new LegsMaterialStats(180, 5, 3, 20.5f))
+				.setBoots(new FeetMaterialStats(180, 2, 3, 20.5f)),
+		new TDMatHelper("pandorium", 0x7f6a00, fluids.put("pandorium", new FluidMolten("pandorium", 0x7f6a00)), true).setHead(new HeadMaterialStats(999, 10.2f, 8.72f, HarvestLevels.OBSIDIAN))
+				.setHandle(new HandleMaterialStats(0.4f, 999))
+				.setExtra(new ExtraMaterialStats(99))
+				.setShield(new ShieldMaterialStats(999 / 4, 100))
+				.setBow(new BowMaterialStats(3f, 0.9f, 9f))
+				.setHelm(new HelmMaterialStats(999, 3, 3, -70.0f))
+				.setChest(new ChestMaterialStats(999, 8, 4, -70.0f))
+				.setLegs(new LegsMaterialStats(999, 6, 4, -70.0f))
+				.setBoots(new FeetMaterialStats(999, 3, 3, -70.0f)),
+		new TDMatHelper("rosegold", 0xff9b84, fluids.put("rosegold", new FluidMolten("rosegold", 0xff9b84)), true).setHead(new HeadMaterialStats(99, 4f, 1f, HarvestLevels.STONE))
+				.setHandle(new HandleMaterialStats(1.5f, -90))
+				.setExtra(new ExtraMaterialStats(-90))
+				.setShield(new ShieldMaterialStats(99 / 4, 24))
+				.setBow(new BowMaterialStats(0.1f, 0.1f, -2f))
+				.setHelm(new HelmMaterialStats(99, 1, 0, 23.0f))
+				.setChest(new ChestMaterialStats(99, 4, 0, 23.0f))
+				.setLegs(new LegsMaterialStats(99, 3, 0, 23.0f))
+				.setBoots(new FeetMaterialStats(99, 1, 0, 23.0f)),
+		new TDMatHelper("platinum", 0xe8e8e8, fluids.put("platinum", new FluidMolten("platinum", 0xe8e8e8)), true).setHead(new HeadMaterialStats(99, 3.7f, 4f, HarvestLevels.IRON))
+				.setHandle(new HandleMaterialStats(1.5f, -90))
+				.setExtra(new ExtraMaterialStats(-90))
+				.setShield(new ShieldMaterialStats(99 / 4, 14))
+				.setBow(new BowMaterialStats(0.1f, 0.1f, -2f))
+				.setHelm(new HelmMaterialStats(99, 1, 1, 19.0f))
+				.setChest(new ChestMaterialStats(99, 4, 1, 19.0f))
+				.setLegs(new LegsMaterialStats(99, 3, 1, 19.0f))
+				.setBoots(new FeetMaterialStats(99, 1, 1, 19.0f)),
+		new TDMatHelper("brass", 0xdbb332, fluids.put("brass", new FluidMolten("brass", 0xdbb332)), true).setHead(new HeadMaterialStats(380, 5f, 3f, HarvestLevels.IRON))
+				.setHandle(new HandleMaterialStats(0.85f, 90))
+				.setExtra(new ExtraMaterialStats(75))
+				.setShield(new ShieldMaterialStats(380 / 4, 50))
+				.setBow(new BowMaterialStats(0.1f, 0.5f, -1f))
+				.setHelm(new HelmMaterialStats(380, 2, 1, 4.5f))
+				.setChest(new ChestMaterialStats(380, 3, 2, 4.5f))
+				.setLegs(new LegsMaterialStats(380, 2, 2, 4.5f))
+				.setBoots(new FeetMaterialStats(380, 2, 2, 4.5f)),
+		new TDMatHelper("silver", 0x9e9e9e, new FluidMolten("silver", 0x9e9e9e), false),
+		new TDMatHelper("gold", 0xfff428, TinkerFluids.gold, true).setIngot(Items.GOLD_INGOT)
+				.setNugget(Items.GOLD_NUGGET)
+				.setHead(new HeadMaterialStats(100, 1f, 1f, HarvestLevels.STONE))
+				.setHandle(new HandleMaterialStats(0.25f, 10))
+				.setExtra(new ExtraMaterialStats(25))
+				.setShield(new ShieldMaterialStats(100 / 4, 14))
+				.setBow(new BowMaterialStats(0.2f, 0.4f, -1f))
+				.setHelm(new HelmMaterialStats(100, 1, 0, 33f))
+				.setChest(new ChestMaterialStats(100, 4, 0, 33f))
+				.setLegs(new LegsMaterialStats(100, 3, 0, 33f))
+				.setBoots(new FeetMaterialStats(100, 1, 0, 33f)),
+		new TDMatHelper("valyriansteel", 0xe2d9e2, fluids.put("valyriansteel", new FluidMolten("valyriansteel", 0xe2d9e2)), true).setHead(new HeadMaterialStats(610, 7f, 7f, HarvestLevels.OBSIDIAN))
+				.setHandle(new HandleMaterialStats(0.9f, 180))
+				.setExtra(new ExtraMaterialStats(125))
+				.setShield(new ShieldMaterialStats(610 / 4, 85))
+				.setBow(new BowMaterialStats(1.6f, 1.5f, 3f))
+				.setHelm(new HelmMaterialStats(610, 3, 3, 0))
+				.setChest(new ChestMaterialStats(610, 7, 4, 0))
+				.setLegs(new LegsMaterialStats(610, 6, 2, 0))
+				.setBoots(new FeetMaterialStats(610, 3, 3, 0)),
+		new TDMatHelper("froststeel", 0xc6dcff, fluids.put("froststeel", new FluidMolten("froststeel", 0xc6dcff)), true).setHead(new HeadMaterialStats(610, 7f, 7f, HarvestLevels.OBSIDIAN))
+				.setHandle(new HandleMaterialStats(1.1f, 110))
+				.setExtra(new ExtraMaterialStats(125))
+				.setShield(new ShieldMaterialStats(610 / 4, 85))
+				.setBow(new BowMaterialStats(1.6f, 1.5f, 3f))
+				.setHelm(new HelmMaterialStats(610, 2, 2, 0))
+				.setChest(new ChestMaterialStats(610, 6, 3, 0))
+				.setLegs(new LegsMaterialStats(610, 5, 2, 0))
+				.setBoots(new FeetMaterialStats(610, 3, 1, 0)),
+		new TDMatHelper("pureardite", 0xff4300, fluids.put("pureardite", new FluidMolten("pureardite", 0xff4300)), true).setHead(new HeadMaterialStats(1200, 3.5f, 3.6f, HarvestLevels.COBALT))
+				.setHandle(new HandleMaterialStats(1.4f, -200))
+				.setExtra(new ExtraMaterialStats(450))
+				.setShield(new ShieldMaterialStats(1200 / 4, 33))
+				.setBow(new BowMaterialStats(0.45f, 0.8f, 1f)),
+		new TDMatHelper("purecobalt", 0x547eff, fluids.put("purecobalt", new FluidMolten("purecobalt", 0x547eff)), true).setHead(new HeadMaterialStats(780, 13f, 4.1f, HarvestLevels.COBALT))
+				.setHandle(new HandleMaterialStats(1.4f, 100))
+				.setExtra(new ExtraMaterialStats(300))
+				.setShield(new ShieldMaterialStats(780 / 4, 33))
+				.setBow(new BowMaterialStats(0.3f, 1.3f, 3f)),
+		new TDMatHelper("puremanyullyn", 0xd044ff, fluids.put("puremanyullyn", new FluidMolten("puremanyullyn", 0xd044ff)), true).setHead(new HeadMaterialStats(820, 7.02f, 9.1f, HarvestLevels.COBALT))
+				.setHandle(new HandleMaterialStats(0.5f, 350))
+				.setExtra(new ExtraMaterialStats(350))
+				.setShield(new ShieldMaterialStats(820 / 4, 33))
+				.setBow(new BowMaterialStats(0.65f, 1.2f, 4f)),
+		new TDMatHelper("glass", 0xffffff, TinkerFluids.glass, true).setHead(new HeadMaterialStats(6, 4f, 7f, HarvestLevels.STONE))
+				.setHandle(new HandleMaterialStats(0.1f, -45))
+				.setExtra(new ExtraMaterialStats(-45))
+				.setShield(new ShieldMaterialStats(6 / 4, 33))
+				.setBow(new BowMaterialStats(0.1f, 0.1f, -2f)),
+		new TDMatHelper("ice", 0xdcff00, false),
+		new TDMatHelper("purifiedgold", 0xffe242, fluids.put("purifiedgold", new FluidMolten("purifiedgold", 0xffe242)), true),
+		new TDMatHelper("purifiedsilver", 0xefefef, fluids.put("purifiedsilver", new FluidMolten("purifiedsilver", 0xefefef)), true)));
+	//
+	// new TDMatHelper("white cloth", 0xDDDDDD, null, true, true,
+	// false).setGem(new ItemStack(Blocks.WOOL, 0, 1)).setCloth(new
+	// ClothMaterialStats(100, 0, 0, 25)),
+	// new TDMatHelper("orange cloth", 0xDB7D3E, null, true, true,
+	// false).setGem(new ItemStack(Blocks.WOOL, 0, 1)).setCloth(new
+	// ClothMaterialStats(100, 0, 0, 25))
 
 	// Jokes
-	List<TDMatHelper> materials_joke = new ArrayList<>(Arrays.asList(
-			new TDMatHelper("cheese", 0xffe900, fluids.put("cheese", new FluidMolten("cheese", 0xffe900)), true),
-			new TDMatHelper("bread", 0x89732a), new TDMatHelper("melon", 0xff77a4)));
+	List<TDMatHelper> materials_joke = new ArrayList<>(Arrays.asList(new TDMatHelper("cheese", 0xffe900, fluids.put("cheese", new FluidMolten("cheese", 0xffe900)), true),
+		new TDMatHelper("bread", 0x89732a),
+		new TDMatHelper("melon", 0xff77a4)));
 
 	// Holiday
-	List<TDMatHelper> materials_xmas = new ArrayList<>(
-			Arrays.asList(new TDMatHelper("redcandy", 0xff0000).setNugget(TinkersDefense.holiday.item_redmintcane),
-					new TDMatHelper("greencandy", 0x00ff00).setNugget(TinkersDefense.holiday.item_greenmintcane)));
+	List<TDMatHelper> materials_xmas = new ArrayList<>(Arrays.asList(new TDMatHelper("redcandy", 0xff0000).setNugget(TinkersDefense.holiday.item_redmintcane),
+		new TDMatHelper("greencandy", 0x00ff00).setNugget(TinkersDefense.holiday.item_greenmintcane)));
 
 	// Gems
 	List<TDMatHelper> materials_gems = new ArrayList<>(Arrays.asList(new TDMatHelper("sapphire", 0x6e00ff),
-			new TDMatHelper("ruby", 0xff0061, true, true),
-			new TDMatHelper("emerald", 0x16cc4f, true, true).setGem(Items.EMERALD),
-			new TDMatHelper("diamond", 0x96ecf2, true, true).setGem(Items.DIAMOND),
-			new TDMatHelper("starsapphire", 0x6e00ff, true, true), new TDMatHelper("starruby", 0xff0061, true, true),
-			new TDMatHelper("citrine", 0xffe877, true, true), new TDMatHelper("ghasttear", 0xe8fbff, true, true),
-			new TDMatHelper("quartz", 0xede8e8, true, true), new TDMatHelper("glowstonecrystal", 0xfff956, true, true),
-			new TDMatHelper("enderpearl", 0x2bad3a, true, true), new TDMatHelper("amethyst", 0xb436e2, true, true),
-			new TDMatHelper("lapis", 0x4349bc, true, true).setGem(new ItemStack(Items.DYE, 1, 4)),
-			new TDMatHelper("topaz", 0xffc551, true, true), new TDMatHelper("garnet", 0x9e1c1c, true, true),
-			new TDMatHelper("opal", 0xe2e2e2, true, true), new TDMatHelper("tanzanite", 0x8860e5, true, true),
-			new TDMatHelper("amber", 0xdba827, true, true)));
+		new TDMatHelper("ruby", 0xff0061, true, true),
+		new TDMatHelper("emerald", 0x16cc4f, true, true).setGem(Items.EMERALD),
+		new TDMatHelper("diamond", 0x96ecf2, true, true).setGem(Items.DIAMOND),
+		new TDMatHelper("starsapphire", 0x6e00ff, true, true),
+		new TDMatHelper("starruby", 0xff0061, true, true),
+		new TDMatHelper("citrine", 0xffe877, true, true),
+		new TDMatHelper("ghasttear", 0xe8fbff, true, true),
+		new TDMatHelper("quartz", 0xede8e8, true, true),
+		new TDMatHelper("glowstonecrystal", 0xfff956, true, true),
+		new TDMatHelper("enderpearl", 0x2bad3a, true, true),
+		new TDMatHelper("amethyst", 0xb436e2, true, true),
+		new TDMatHelper("lapis", 0x4349bc, true, true).setGem(new ItemStack(Items.DYE, 1, 4)),
+		new TDMatHelper("topaz", 0xffc551, true, true),
+		new TDMatHelper("garnet", 0x9e1c1c, true, true),
+		new TDMatHelper("opal", 0xe2e2e2, true, true),
+		new TDMatHelper("tanzanite", 0x8860e5, true, true),
+		new TDMatHelper("amber", 0xdba827, true, true)));
 
 	// Cornucopia
-	List<TDMatHelper> materials_cornucopia = new ArrayList<>(Arrays.asList(
-			new TDMatHelper("gallite", 0x198c09, fluids.put("gallite", new FluidMolten("gallite", 0x198c09)), true),
-			new TDMatHelper("sundrop", 0xfff987, fluids.put("sundrop", new FluidMolten("sundrop", 0xfff987)), true),
-			new TDMatHelper("voidite", 0x450059, fluids.put("voidite", new FluidMolten("voidite", 0x450059)), true),
-			new TDMatHelper("solarium", 0xffff31, fluids.put("solarium", new FluidMolten("solarium", 0xffff31)), true),
-			new TDMatHelper("dragonsteel", 0x55914d,
-					fluids.put("dragonsteel", new FluidMolten("dragonsteel", 0x55914d)), true),
-			new TDMatHelper("blacksteel", 0x383838, fluids.put("blacksteel", new FluidMolten("blacksteel", 0x383838)),
-					true),
-			new TDMatHelper("abyssalium", 0x000633, fluids.put("abyssalium", new FluidMolten("abyssalium", 0x000633)),
-					true),
-			new TDMatHelper("depthsilver", 0x646782,
-					fluids.put("depthsilver", new FluidMolten("depthsilver", 0x646782)), true),
-			new TDMatHelper("moonsilver", 0x777777, fluids.put("moonsilver", new FluidMolten("moonsilver", 0x777777)),
-					true),
-			new TDMatHelper("novagold", 0xffc300, fluids.put("novagold", new FluidMolten("novagold", 0xffc300)),
-					true)));
+	List<TDMatHelper> materials_cornucopia = new ArrayList<>(Arrays.asList(new TDMatHelper("gallite", 0x198c09, fluids.put("gallite", new FluidMolten("gallite", 0x198c09)), true),
+		new TDMatHelper("sundrop", 0xfff987, fluids.put("sundrop", new FluidMolten("sundrop", 0xfff987)), true),
+		new TDMatHelper("voidite", 0x450059, fluids.put("voidite", new FluidMolten("voidite", 0x450059)), true),
+		new TDMatHelper("solarium", 0xffff31, fluids.put("solarium", new FluidMolten("solarium", 0xffff31)), true),
+		new TDMatHelper("dragonsteel", 0x55914d, fluids.put("dragonsteel", new FluidMolten("dragonsteel", 0x55914d)), true),
+		new TDMatHelper("blacksteel", 0x383838, fluids.put("blacksteel", new FluidMolten("blacksteel", 0x383838)), true),
+		new TDMatHelper("abyssalium", 0x000633, fluids.put("abyssalium", new FluidMolten("abyssalium", 0x000633)), true),
+		new TDMatHelper("depthsilver", 0x646782, fluids.put("depthsilver", new FluidMolten("depthsilver", 0x646782)), true),
+		new TDMatHelper("moonsilver", 0x777777, fluids.put("moonsilver", new FluidMolten("moonsilver", 0x777777)), true),
+		new TDMatHelper("novagold", 0xffc300, fluids.put("novagold", new FluidMolten("novagold", 0xffc300)), true)));
 	// // Blood Magic
 	// List<String> materials_bm = new ArrayList<>(
 	// Arrays.asList("blankslate", "reinforcedslate", "imbued", "demonic",
@@ -302,11 +317,11 @@ public class TDMaterials {
 	// List<String> materials_pam = new
 	// ArrayList<>(Arrays.asList("hardenedleather"));
 
-	public static TDOreDictItem ingot;
-	public static TDOreDictItem dust;
-	public static TDOreDictItem nugget;
-	public static TDOreDictItem grain;
-	public static TDOreDictItem gem;
+	public static TDOreDictItem	ingot;
+	public static TDOreDictItem	dust;
+	public static TDOreDictItem	nugget;
+	public static TDOreDictItem	grain;
+	public static TDOreDictItem	gem;
 
 	// public static final AbstractTrait axelover = new TraitAxeLover();
 	// public static final AbstractTrait dulling = new TraitDulling();
@@ -314,39 +329,46 @@ public class TDMaterials {
 	// public static final AbstractTrait barbed = new TraitBarbed();
 	// public static final AbstractTrait dogtoy = new TraitDogToy();
 
-	static ArrayList<Item> itemList = new ArrayList<Item>();
-	static ArrayList<Block> blockList = new ArrayList<Block>();
+	static ArrayList<Item>	itemList	= new ArrayList<Item>();
+	static ArrayList<Block>	blockList	= new ArrayList<Block>();
 
-	private static Material mat(String name, int color) {
+	private static Material mat(String name, int color)
+	{
 		Material mat = new Material(name, color);
 		// materials.add(mat);
 		return mat;
 	}
 
-	List<String> getMatNames(List<TDMatHelper> mats) {
+	List<String> getMatNames(List<TDMatHelper> mats)
+	{
 		List<String> r = new ArrayList<String>();
 
-		for (TDMatHelper m : mats) {
+		for (TDMatHelper m : mats)
+		{
 			r.add(m.name);
 		}
 
 		return r;
 	}
 
-	List<Integer> getMatColors(List<TDMatHelper> mats) {
+	List<Integer> getMatColors(List<TDMatHelper> mats)
+	{
 		List<Integer> r = new ArrayList<Integer>();
 
-		for (TDMatHelper m : mats) {
+		for (TDMatHelper m : mats)
+		{
 			r.add(m.color);
 		}
 
 		return r;
 	}
 
-	List<FluidMolten> getMatFluids(List<TDMatHelper> mats) {
+	List<FluidMolten> getMatFluids(List<TDMatHelper> mats)
+	{
 		List<FluidMolten> r = new ArrayList<FluidMolten>();
 
-		for (TDMatHelper m : mats) {
+		for (TDMatHelper m : mats)
+		{
 			r.add(m.fluid);
 		}
 
@@ -354,18 +376,19 @@ public class TDMaterials {
 	}
 
 	@Subscribe
-	public void preInit(FMLPreInitializationEvent event) {
+	public void preInit(FMLPreInitializationEvent event)
+	{
 
 		if (TinkersDefense.config.materials.enableBaseMaterials)
 			this.materials_master.addAll(materials_base);
-//		if (TinkersDefense.config.materials.enableJokeMaterials)
-//			this.materials_master.addAll(this.materials_joke);
-//		if (TinkersDefense.config.materials.enableHolidayMaterials)
-//			this.materials_master.addAll(materials_xmas);
-//		if (TinkersDefense.config.materials.enableGemMaterials)
-//			this.materials_master.addAll(materials_gems);
-//		if (TinkersDefense.config.materials.enableCornucopiaMaterials)
-//			this.materials_master.addAll(materials_cornucopia);
+		// if (TinkersDefense.config.materials.enableJokeMaterials)
+		// this.materials_master.addAll(this.materials_joke);
+		// if (TinkersDefense.config.materials.enableHolidayMaterials)
+		// this.materials_master.addAll(materials_xmas);
+		// if (TinkersDefense.config.materials.enableGemMaterials)
+		// this.materials_master.addAll(materials_gems);
+		// if (TinkersDefense.config.materials.enableCornucopiaMaterials)
+		// this.materials_master.addAll(materials_cornucopia);
 		// if (TinkersDefense.config.materials.enableTwilightForestMaterials)
 		// this.materials_master.addAll(materials_tf);
 		// if (TinkersDefense.config.materials.enableBloodMagicMaterials)
@@ -373,281 +396,283 @@ public class TDMaterials {
 		// if (TinkersDefense.config.materials.enableHarvestCraftMaterials)
 		// this.materials_master.addAll(materials_pam);
 
-		nugget = new TDOreDictItem("nugget", getMatNames(materials_master), getMatColors(materials_master));
-		dust = new TDOreDictItem("dust", getMatNames(materials_master), getMatColors(materials_master));
-		grain = new TDOreDictItem("grain", getMatNames(materials_master), getMatColors(materials_master));
-
-		List<TDMatHelper> gemMaster = new ArrayList<TDMatHelper>();
-		List<TDMatHelper> ingotMaster = new ArrayList<TDMatHelper>();
-
-		for (TDMatHelper i : materials_master) {
-			if (i.isGem)
-				gemMaster.add(i);
-			else
-				ingotMaster.add(i);
-		}
-
-		gem = new TDOreDictItem("gem", getMatNames(gemMaster), getMatColors(gemMaster));
-		ingot = new TDOreDictItem("ingot", getMatNames(ingotMaster), getMatColors(ingotMaster));
-
-		registerClothMaterials();
-
 		Material.UNKNOWN.addStats(new ShieldMaterialStats(35, 33));
-		Material.UNKNOWN.addStats(ams.new HelmMaterialStats(35, 1, 0, 0));
-		Material.UNKNOWN.addStats(ams.new ChestMaterialStats(35, 1, 0, 0));
-		Material.UNKNOWN.addStats(ams.new LegsMaterialStats(35, 1, 0, 0));
-		Material.UNKNOWN.addStats(ams.new FeetMaterialStats(35, 1, 0, 0));
-		Material.UNKNOWN.addStats(ams.new ClothMaterialStats(35, 0, 0, 0));
+		Material.UNKNOWN.addStats(new HelmMaterialStats(35, 1, 0, 0));
+		Material.UNKNOWN.addStats(new ChestMaterialStats(35, 1, 0, 0));
+		Material.UNKNOWN.addStats(new LegsMaterialStats(35, 1, 0, 0));
+		Material.UNKNOWN.addStats(new FeetMaterialStats(35, 1, 0, 0));
+		Material.UNKNOWN.addStats(new FabricMaterialStats(35, 0, 0, 0));
 		Material.UNKNOWN.addStats(new BaubleMaterialStats(35));
 
-		TinkerRegistry.addMaterialStats(this.white, ams.new ClothMaterialStats(100, 10, 0, 25));
-		TinkerRegistry.addMaterialStats(this.black, ams.new ClothMaterialStats(100, 10, 0, 25));
-		TinkerRegistry.addMaterialStats(this.blue, ams.new ClothMaterialStats(100, 10, 0, 25));
-		TinkerRegistry.addMaterialStats(this.brown, ams.new ClothMaterialStats(100, 10, 0, 25));
-		TinkerRegistry.addMaterialStats(this.cyan, ams.new ClothMaterialStats(100, 10, 0, 25));
-		TinkerRegistry.addMaterialStats(this.gray, ams.new ClothMaterialStats(100, 10, 0, 25));
-		TinkerRegistry.addMaterialStats(this.green, ams.new ClothMaterialStats(100, 10, 0, 25));
-		TinkerRegistry.addMaterialStats(this.lightblue, ams.new ClothMaterialStats(100, 10, 0, 25));
-		TinkerRegistry.addMaterialStats(this.lightgray, ams.new ClothMaterialStats(100, 10, 0, 25));
-		TinkerRegistry.addMaterialStats(this.lime, ams.new ClothMaterialStats(100, 10, 0, 25));
-		TinkerRegistry.addMaterialStats(this.magenta, ams.new ClothMaterialStats(100, 10, 0, 25));
-		TinkerRegistry.addMaterialStats(this.orange, ams.new ClothMaterialStats(100, 10, 0, 25));
-		TinkerRegistry.addMaterialStats(this.pink, ams.new ClothMaterialStats(100, 10, 0, 25));
-		TinkerRegistry.addMaterialStats(this.purple, ams.new ClothMaterialStats(100, 10, 0, 25));
-		TinkerRegistry.addMaterialStats(this.red, ams.new ClothMaterialStats(100, 10, 0, 25));
-		TinkerRegistry.addMaterialStats(this.yellow, ams.new ClothMaterialStats(100, 10, 0, 25));
+		registerClothMaterials();
 
 		TinkerRegistry.addMaterialStats(TinkerMaterials.wood, new ShieldMaterialStats(35, 25));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.wood, ams.new HelmMaterialStats(35, 1, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.wood, ams.new ChestMaterialStats(35, 3, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.wood, ams.new LegsMaterialStats(35, 2, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.wood, ams.new FeetMaterialStats(35, 1, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.wood, new HelmMaterialStats(35, 1, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.wood, new ChestMaterialStats(35, 3, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.wood, new LegsMaterialStats(35, 2, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.wood, new FeetMaterialStats(35, 1, 0, 0));
 		// TinkerMaterials.wood.addTrait(axelover, SHIELD);
 
 		TinkerRegistry.addMaterialStats(TinkerMaterials.stone, new ShieldMaterialStats(120, 30));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.stone, ams.new HelmMaterialStats(120, 2, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.stone, ams.new ChestMaterialStats(120, 4, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.stone, ams.new LegsMaterialStats(120, 3, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.stone, ams.new FeetMaterialStats(120, 2, 0, 0));
-		//TinkerRegistry.addMaterialTrait(TinkerMaterials.stone, dulling, SHIELD);
+		TinkerRegistry.addMaterialStats(TinkerMaterials.stone, new HelmMaterialStats(120, 2, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.stone, new ChestMaterialStats(120, 4, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.stone, new LegsMaterialStats(120, 3, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.stone, new FeetMaterialStats(120, 2, 0, 0));
+		// TinkerRegistry.addMaterialTrait(TinkerMaterials.stone, dulling,
+		// SHIELD);
 		// TinkerMaterials.stone.addTrait(dulling, SHIELD);
 
 		TinkerRegistry.addMaterialStats(TinkerMaterials.flint, new ShieldMaterialStats(150, 30));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.flint, ams.new HelmMaterialStats(150, 2, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.flint, ams.new ChestMaterialStats(150, 4, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.flint, ams.new LegsMaterialStats(150, 3, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.flint, ams.new FeetMaterialStats(150, 2, 0, 0));
-		// TinkerRegistry.addMaterialTrait(TinkerMaterials.flint, firestarter,
+		TinkerRegistry.addMaterialStats(TinkerMaterials.flint, new HelmMaterialStats(150, 2, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.flint, new ChestMaterialStats(150, 4, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.flint, new LegsMaterialStats(150, 3, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.flint, new FeetMaterialStats(150, 2, 0, 0));
+		// TinkerRegistry.addMaterialTrait(TinkerMaterials.flint,
+		// firestarter,
 		// SHIELD);
 
 		TinkerRegistry.addMaterialStats(TinkerMaterials.cactus, new ShieldMaterialStats(210, 25));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.cactus, ams.new HelmMaterialStats(210, 1, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.cactus, ams.new ChestMaterialStats(210, 3, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.cactus, ams.new LegsMaterialStats(210, 2, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.cactus, ams.new FeetMaterialStats(210, 1, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.cactus, new HelmMaterialStats(210, 1, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.cactus, new ChestMaterialStats(210, 3, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.cactus, new LegsMaterialStats(210, 2, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.cactus, new FeetMaterialStats(210, 1, 0, 0));
 		// TinkerRegistry.addMaterialTrait(TinkerMaterials.cactus, barbed,
 		// SHIELD);
 
 		TinkerRegistry.addMaterialStats(TinkerMaterials.bone, new ShieldMaterialStats(200, 40));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.bone, ams.new HelmMaterialStats(200, 2, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.bone, ams.new ChestMaterialStats(200, 4, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.bone, ams.new LegsMaterialStats(200, 4, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.bone, ams.new FeetMaterialStats(200, 2, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.bone, new HelmMaterialStats(200, 2, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.bone, new ChestMaterialStats(200, 4, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.bone, new LegsMaterialStats(200, 4, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.bone, new FeetMaterialStats(200, 2, 0, 0));
 		// TinkerRegistry.addMaterialTrait(TinkerMaterials.bone, dogtoy,
 		// SHIELD);
 
 		TinkerRegistry.addMaterialStats(TinkerMaterials.obsidian, new ShieldMaterialStats(139, 50));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.obsidian, ams.new HelmMaterialStats(139, 2, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.obsidian, ams.new ChestMaterialStats(139, 6, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.obsidian, ams.new LegsMaterialStats(139, 5, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.obsidian, ams.new FeetMaterialStats(139, 2, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.obsidian, new HelmMaterialStats(139, 2, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.obsidian, new ChestMaterialStats(139, 6, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.obsidian, new LegsMaterialStats(139, 5, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.obsidian, new FeetMaterialStats(139, 2, 0, 0));
 
 		TinkerRegistry.addMaterialStats(TinkerMaterials.prismarine, new ShieldMaterialStats(430, 45));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.prismarine, ams.new HelmMaterialStats(430, 2, 0, 2.5f));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.prismarine, ams.new ChestMaterialStats(430, 5, 0, 3.5f));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.prismarine, ams.new LegsMaterialStats(430, 5, 0, 3.0f));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.prismarine, ams.new FeetMaterialStats(430, 2, 0, 2.5f));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.prismarine, new HelmMaterialStats(430, 2, 0, 2.5f));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.prismarine, new ChestMaterialStats(430, 5, 0, 3.5f));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.prismarine, new LegsMaterialStats(430, 5, 0, 3.0f));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.prismarine, new FeetMaterialStats(430, 2, 0, 2.5f));
 
 		TinkerRegistry.addMaterialStats(TinkerMaterials.endstone, new ShieldMaterialStats(420, 50));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.endstone, ams.new HelmMaterialStats(420, 3, 1, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.endstone, ams.new ChestMaterialStats(420, 6, 1, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.endstone, ams.new LegsMaterialStats(420, 5, 1, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.endstone, ams.new FeetMaterialStats(420, 3, 1, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.endstone, new HelmMaterialStats(420, 3, 1, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.endstone, new ChestMaterialStats(420, 6, 1, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.endstone, new LegsMaterialStats(420, 5, 1, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.endstone, new FeetMaterialStats(420, 3, 1, 0));
 
 		TinkerRegistry.addMaterialStats(TinkerMaterials.paper, new ShieldMaterialStats(12, 10));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.paper, ams.new HelmMaterialStats(12, 1, 0, 4));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.paper, ams.new ChestMaterialStats(12, 2, 0, 5.5f));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.paper, ams.new LegsMaterialStats(12, 1, 0, 5));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.paper, ams.new FeetMaterialStats(12, 1, 0, 4));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.paper, new HelmMaterialStats(12, 1, 0, 4));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.paper, new ChestMaterialStats(12, 2, 0, 5.5f));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.paper, new LegsMaterialStats(12, 1, 0, 5));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.paper, new FeetMaterialStats(12, 1, 0, 4));
 
 		TinkerRegistry.addMaterialStats(TinkerMaterials.sponge, new ShieldMaterialStats(550, 20));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.sponge, ams.new HelmMaterialStats(550, 1, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.sponge, ams.new ChestMaterialStats(550, 2, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.sponge, ams.new LegsMaterialStats(550, 2, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.sponge, ams.new FeetMaterialStats(550, 1, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.sponge, new HelmMaterialStats(550, 1, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.sponge, new ChestMaterialStats(550, 2, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.sponge, new LegsMaterialStats(550, 2, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.sponge, new FeetMaterialStats(550, 1, 0, 0));
+		// TinkerRegistry.addMaterialStats(TinkerMaterials.sponge, new
+		// FabricMaterialStats(550, 0, 0, 0));
 
 		TinkerRegistry.addMaterialStats(TinkerMaterials.firewood, new ShieldMaterialStats(550, 25));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.firewood, ams.new HelmMaterialStats(550, 1, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.firewood, ams.new ChestMaterialStats(550, 3, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.firewood, ams.new LegsMaterialStats(550, 2, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.firewood, ams.new FeetMaterialStats(550, 1, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.firewood, new HelmMaterialStats(550, 1, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.firewood, new ChestMaterialStats(550, 3, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.firewood, new LegsMaterialStats(550, 2, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.firewood, new FeetMaterialStats(550, 1, 0, 0));
 
 		// Slime
 		TinkerRegistry.addMaterialStats(TinkerMaterials.slime, new ShieldMaterialStats(1000, 5));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.slime, ams.new HelmMaterialStats(1000, 1, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.slime, ams.new ChestMaterialStats(1000, 2, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.slime, ams.new LegsMaterialStats(1000, 2, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.slime, ams.new FeetMaterialStats(1000, 1, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.slime, new HelmMaterialStats(1000, 1, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.slime, new ChestMaterialStats(1000, 2, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.slime, new LegsMaterialStats(1000, 2, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.slime, new FeetMaterialStats(1000, 1, 0, 0));
 
 		TinkerRegistry.addMaterialStats(TinkerMaterials.blueslime, new ShieldMaterialStats(780, 7));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.blueslime, ams.new HelmMaterialStats(780, 1, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.blueslime, ams.new ChestMaterialStats(780, 2, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.blueslime, ams.new LegsMaterialStats(780, 2, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.blueslime, ams.new FeetMaterialStats(780, 1, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.blueslime, new HelmMaterialStats(780, 1, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.blueslime, new ChestMaterialStats(780, 2, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.blueslime, new LegsMaterialStats(780, 2, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.blueslime, new FeetMaterialStats(780, 1, 0, 0));
 
 		TinkerRegistry.addMaterialStats(TinkerMaterials.knightslime, new ShieldMaterialStats(850, 27));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.knightslime, ams.new HelmMaterialStats(850, 2, 1, 1.5f));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.knightslime, ams.new ChestMaterialStats(850, 6, 1, 2.5f));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.knightslime, ams.new LegsMaterialStats(850, 5, 1, 2.0f));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.knightslime, ams.new FeetMaterialStats(850, 2, 1, 1.5f));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.knightslime, new HelmMaterialStats(850, 2, 1, 1.5f));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.knightslime, new ChestMaterialStats(850, 6, 1, 2.5f));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.knightslime, new LegsMaterialStats(850, 5, 1, 2.0f));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.knightslime, new FeetMaterialStats(850, 2, 1, 1.5f));
 
 		TinkerRegistry.addMaterialStats(TinkerMaterials.magmaslime, new ShieldMaterialStats(600, 6));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.magmaslime, ams.new HelmMaterialStats(600, 1, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.magmaslime, ams.new ChestMaterialStats(600, 2, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.magmaslime, ams.new LegsMaterialStats(600, 2, 0, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.magmaslime, ams.new FeetMaterialStats(600, 1, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.magmaslime, new HelmMaterialStats(600, 1, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.magmaslime, new ChestMaterialStats(600, 2, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.magmaslime, new LegsMaterialStats(600, 2, 0, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.magmaslime, new FeetMaterialStats(600, 1, 0, 0));
 
 		// Nether
 		TinkerRegistry.addMaterialStats(TinkerMaterials.netherrack, new ShieldMaterialStats(270, 20));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.netherrack, ams.new HelmMaterialStats(270, 1, 0, -12));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.netherrack, ams.new ChestMaterialStats(270, 3, 0, -12));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.netherrack, ams.new LegsMaterialStats(270, 2, 0, -12));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.netherrack, ams.new FeetMaterialStats(270, 1, 0, -12));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.netherrack, new HelmMaterialStats(270, 1, 0, -12));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.netherrack, new ChestMaterialStats(270, 3, 0, -12));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.netherrack, new LegsMaterialStats(270, 2, 0, -12));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.netherrack, new FeetMaterialStats(270, 1, 0, -12));
 
 		TinkerRegistry.addMaterialStats(TinkerMaterials.cobalt, new ShieldMaterialStats(780, 55));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.cobalt, ams.new HelmMaterialStats(780, 3, 0, 5));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.cobalt, ams.new ChestMaterialStats(780, 7, 0, 5));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.cobalt, ams.new LegsMaterialStats(780, 5, 0, 5));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.cobalt, ams.new FeetMaterialStats(780, 3, 0, 5));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.cobalt, new HelmMaterialStats(780, 3, 0, 5));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.cobalt, new ChestMaterialStats(780, 7, 0, 5));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.cobalt, new LegsMaterialStats(780, 5, 0, 5));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.cobalt, new FeetMaterialStats(780, 3, 0, 5));
 
 		TinkerRegistry.addMaterialStats(TinkerMaterials.ardite, new ShieldMaterialStats(990, 75));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.ardite, ams.new HelmMaterialStats(990, 3, 3, -100));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.ardite, ams.new ChestMaterialStats(990, 8, 4, -100));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.ardite, ams.new LegsMaterialStats(990, 6, 4, -100));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.ardite, ams.new FeetMaterialStats(990, 3, 3, -100));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.ardite, new HelmMaterialStats(990, 3, 3, -100));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.ardite, new ChestMaterialStats(990, 8, 4, -100));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.ardite, new LegsMaterialStats(990, 6, 4, -100));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.ardite, new FeetMaterialStats(990, 3, 3, -100));
 
 		TinkerRegistry.addMaterialStats(TinkerMaterials.manyullyn, new ShieldMaterialStats(820, 60));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.manyullyn, ams.new HelmMaterialStats(820, 3, 2, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.manyullyn, ams.new ChestMaterialStats(820, 8, 2, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.manyullyn, ams.new LegsMaterialStats(820, 6, 2, 0));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.manyullyn, ams.new FeetMaterialStats(820, 3, 2, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.manyullyn, new HelmMaterialStats(820, 3, 2, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.manyullyn, new ChestMaterialStats(820, 8, 2, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.manyullyn, new LegsMaterialStats(820, 6, 2, 0));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.manyullyn, new FeetMaterialStats(820, 3, 2, 0));
 
 		// Metals
 		TinkerRegistry.addMaterialStats(TinkerMaterials.iron, new ShieldMaterialStats(204, 50));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.iron, ams.new HelmMaterialStats(204, 2, 0, -4));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.iron, ams.new ChestMaterialStats(204, 6, 0, -5));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.iron, ams.new LegsMaterialStats(204, 5, 0, -4));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.iron, ams.new FeetMaterialStats(204, 2, 0, -3));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.iron, new HelmMaterialStats(204, 2, 0, -4));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.iron, new ChestMaterialStats(204, 6, 0, -5));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.iron, new LegsMaterialStats(204, 5, 0, -4));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.iron, new FeetMaterialStats(204, 2, 0, -3));
 
 		TinkerRegistry.addMaterialStats(TinkerMaterials.pigiron, new ShieldMaterialStats(380, 52));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.pigiron, ams.new HelmMaterialStats(380, 2, 0, 0.5f));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.pigiron, ams.new ChestMaterialStats(380, 6, 0, 1.5f));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.pigiron, ams.new LegsMaterialStats(380, 5, 0, 1));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.pigiron, ams.new FeetMaterialStats(380, 2, 0, 0.5f));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.pigiron, new HelmMaterialStats(380, 2, 0, 0.5f));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.pigiron, new ChestMaterialStats(380, 6, 0, 1.5f));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.pigiron, new LegsMaterialStats(380, 5, 0, 1));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.pigiron, new FeetMaterialStats(380, 2, 0, 0.5f));
 
 		// Mod Integration
 		TinkerRegistry.addMaterialStats(TinkerMaterials.copper, new ShieldMaterialStats(210, 34));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.copper, ams.new HelmMaterialStats(210, 1, 0, 3));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.copper, ams.new ChestMaterialStats(210, 4, 0, 3));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.copper, ams.new LegsMaterialStats(210, 3, 0, 3));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.copper, ams.new FeetMaterialStats(210, 1, 0, 3));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.copper, new HelmMaterialStats(210, 1, 0, 3));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.copper, new ChestMaterialStats(210, 4, 0, 3));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.copper, new LegsMaterialStats(210, 3, 0, 3));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.copper, new FeetMaterialStats(210, 1, 0, 3));
 
 		TinkerRegistry.addMaterialStats(TinkerMaterials.bronze, new ShieldMaterialStats(430, 50));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.bronze, ams.new HelmMaterialStats(430, 2, 0, 0.5f));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.bronze, ams.new ChestMaterialStats(430, 6, 0, 0.5f));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.bronze, ams.new LegsMaterialStats(430, 5, 0, 0.5f));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.bronze, ams.new FeetMaterialStats(430, 2, 0, 0.5f));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.bronze, new HelmMaterialStats(430, 2, 0, 0.5f));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.bronze, new ChestMaterialStats(430, 6, 0, 0.5f));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.bronze, new LegsMaterialStats(430, 5, 0, 0.5f));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.bronze, new FeetMaterialStats(430, 2, 0, 0.5f));
 
 		TinkerRegistry.addMaterialStats(TinkerMaterials.lead, new ShieldMaterialStats(334, 42));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.lead, ams.new HelmMaterialStats(334, 1, 0, -20));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.lead, ams.new ChestMaterialStats(334, 5, 0, -20));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.lead, ams.new LegsMaterialStats(334, 4, 0, -20));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.lead, ams.new FeetMaterialStats(334, 1, 0, -20));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.lead, new HelmMaterialStats(334, 1, 0, -20));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.lead, new ChestMaterialStats(334, 5, 0, -20));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.lead, new LegsMaterialStats(334, 4, 0, -20));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.lead, new FeetMaterialStats(334, 1, 0, -20));
 
 		TinkerRegistry.addMaterialStats(TinkerMaterials.silver, new ShieldMaterialStats(250, 33));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.silver, ams.new HelmMaterialStats(250, 1, 0, 1.5f));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.silver, ams.new ChestMaterialStats(250, 3, 0, 1.5f));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.silver, ams.new LegsMaterialStats(250, 2, 0, 1.5f));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.silver, ams.new FeetMaterialStats(250, 1, 0, 1.5f));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.silver, new HelmMaterialStats(250, 1, 0, 1.5f));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.silver, new ChestMaterialStats(250, 3, 0, 1.5f));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.silver, new LegsMaterialStats(250, 2, 0, 1.5f));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.silver, new FeetMaterialStats(250, 1, 0, 1.5f));
 
 		TinkerRegistry.addMaterialStats(TinkerMaterials.electrum, new ShieldMaterialStats(50, 22));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.electrum, ams.new HelmMaterialStats(50, 1, 0, 2.5f));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.electrum, ams.new ChestMaterialStats(50, 3, 0, 2.5f));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.electrum, ams.new LegsMaterialStats(50, 2, 0, 2.5f));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.electrum, ams.new FeetMaterialStats(50, 1, 0, 2.5f));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.electrum, new HelmMaterialStats(50, 1, 0, 2.5f));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.electrum, new ChestMaterialStats(50, 3, 0, 2.5f));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.electrum, new LegsMaterialStats(50, 2, 0, 2.5f));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.electrum, new FeetMaterialStats(50, 1, 0, 2.5f));
 
 		TinkerRegistry.addMaterialStats(TinkerMaterials.steel, new ShieldMaterialStats(540, 55));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.steel, ams.new HelmMaterialStats(540, 3, 1, -12));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.steel, ams.new ChestMaterialStats(540, 7, 1, -12));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.steel, ams.new LegsMaterialStats(540, 6, 1, -12));
-		TinkerRegistry.addMaterialStats(TinkerMaterials.steel, ams.new FeetMaterialStats(540, 3, 1, -12));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.steel, new HelmMaterialStats(540, 3, 1, -12));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.steel, new ChestMaterialStats(540, 7, 1, -12));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.steel, new LegsMaterialStats(540, 6, 1, -12));
+		TinkerRegistry.addMaterialStats(TinkerMaterials.steel, new FeetMaterialStats(540, 3, 1, -12));
 
-		for (String s : fluids.keySet()) {
+		for (String s : fluids.keySet())
+		{
 			createFluid(s, fluids.get(s));
 			FluidRegistry.registerFluid(fluids.get(s));
 			FluidRegistry.addBucketForFluid(fluids.get(s));
 
 		}
 
-		for (TDMatHelper m : materials_master) {
-			Material test = TinkerRegistry.getMaterial(m.name);
-			if (m.createMat && test.getIdentifier() == "unknown"
-					&& !TinkersDefense.config.materials.isBlacklisted(m.name))
-				createMaterial(m);
-		}
+		
 
 		// TAIGA TEST
-		// Collection<Material> mats = TinkerRegistry.getAllMaterials();
-		for (Material m : TinkerRegistry.getAllMaterials()) {
-			if (!m.hasStats(SHIELD)) {
-				if (m.hasStats(MaterialTypes.HEAD)) {
+		Collection<Material> mats = TinkerRegistry.getAllMaterials();
+		for (Material m : TinkerRegistry.getAllMaterials())
+		{
+			if (!m.hasStats(SHIELD))
+			{
+				if (m.hasStats(MaterialTypes.HEAD))
+				{
 					int dur = ((HeadMaterialStats) m.getStats(MaterialTypes.HEAD)).durability;
 					m.addStats(new ShieldMaterialStats(dur, 33));
+					m.addStats(new HelmMaterialStats(dur, 1, 0, 0));
+					m.addStats(new ChestMaterialStats(dur, 1, 0, 0));
+					m.addStats(new LegsMaterialStats(dur, 1, 0, 0));
+					m.addStats(new FeetMaterialStats(dur, 1, 0, 0));
+					// m.addStats(new ClothMaterialStats(dur, 1, 0, 0));
 				}
 			}
 		}
 
+		// Collection<Material> mats = TinkerRegistry.getAllMaterials();
+		// mats.isEmpty();
+		//
+		// Set<IToolPart> parts = TinkerRegistry.getToolParts();
+		// parts.size();
 	}
 
-	void createMaterial(TDMatHelper tdmat) {
+	void createMaterial(TDMatHelper tdmat)
+	{
 		Material mat = new Material(tdmat.name, tdmat.color);
 
-		if (tdmat.isGem) {
-			if (tdmat.gem == null) {
-				mat.addItem("gem" + tdmat.name.substring(0, 1).toUpperCase() + tdmat.name.substring(1));
-				mat.addItem(gem.getItembyName(tdmat.name), 1, Material.VALUE_Ingot);
+		if (tdmat.isGem)
+		{
+			if (tdmat.gem == null)
+			{
+				if (tdmat.createParts)
+				{
+					mat.addItem("gem" + tdmat.name.substring(0, 1).toUpperCase() + tdmat.name.substring(1));
+					mat.addItem(gem.getItembyName(tdmat.name), 1, Material.VALUE_Ingot);
+				}
 			} else
 				mat.addItem(tdmat.gem, 1, Material.VALUE_Ingot);
-		} else {
-			if (tdmat.ingot == null) {
-				mat.addItem("ingot" + tdmat.name.substring(0, 1).toUpperCase() + tdmat.name.substring(1));
-				mat.addItem(ingot.getItembyName(tdmat.name), 1, Material.VALUE_Ingot);
+		} else
+		{
+			if (tdmat.ingot == null)
+			{
+				if (tdmat.createParts)
+				{
+					mat.addItem("ingot" + tdmat.name.substring(0, 1).toUpperCase() + tdmat.name.substring(1));
+					mat.addItem(ingot.getItembyName(tdmat.name), 1, Material.VALUE_Ingot);
+				}
 			} else
 				mat.addItem(tdmat.ingot, 1, Material.VALUE_Ingot);
 		}
-		if (tdmat.nugget == null) {
-			mat.addItem("nugget" + tdmat.name.substring(0, 1).toUpperCase() + tdmat.name.substring(1));
-			mat.addItem(nugget.getItembyName(tdmat.name), 1, Material.VALUE_Nugget);
+		if (tdmat.nugget == null)
+		{
+			if (tdmat.createParts)
+			{
+				mat.addItem("nugget" + tdmat.name.substring(0, 1).toUpperCase() + tdmat.name.substring(1));
+				mat.addItem(nugget.getItembyName(tdmat.name), 1, Material.VALUE_Nugget);
+			}
 		} else
 			mat.addItem(tdmat.nugget, 1, Material.VALUE_Nugget);
-		if (tdmat.dust == null) {
-			mat.addItem("dust" + tdmat.name.substring(0, 1).toUpperCase() + tdmat.name.substring(1));
-			mat.addItem(nugget.getItembyName(tdmat.name), 1, Material.VALUE_Ingot);
+		if (tdmat.dust == null)
+		{
+			if (tdmat.createParts)
+			{
+				mat.addItem("dust" + tdmat.name.substring(0, 1).toUpperCase() + tdmat.name.substring(1));
+				mat.addItem(nugget.getItembyName(tdmat.name), 1, Material.VALUE_Ingot);
+			}
 		} else
 			mat.addItem(tdmat.nugget, 1, Material.VALUE_Ingot);
-		if (tdmat.grain == null) {
-			mat.addItem("grain" + tdmat.name.substring(0, 1).toUpperCase() + tdmat.name.substring(1));
-			mat.addItem(nugget.getItembyName(tdmat.name), 1, Material.VALUE_Ingot / 4);
+		if (tdmat.grain == null)
+		{
+			if (tdmat.createParts)
+			{
+				mat.addItem("grain" + tdmat.name.substring(0, 1).toUpperCase() + tdmat.name.substring(1));
+				mat.addItem(nugget.getItembyName(tdmat.name), 1, Material.VALUE_Ingot / 4);
+			}
 		} else
 			mat.addItem(tdmat.grain, 1, Material.VALUE_Nugget / 4);
 
@@ -681,21 +706,16 @@ public class TDMaterials {
 			TinkerRegistry.integrate(new MaterialIntegration(mat).toolforge()).preInit();
 	}
 
-	void setStats(Material m, TDMatHelper tdm) {
+	void setStats(Material m, TDMatHelper tdm)
+	{
 		if (tdm.head != null)
 			TinkerRegistry.addMaterialStats(m, tdm.head);
-		else
-			TinkerRegistry.addMaterialStats(m, new HeadMaterialStats(0, 0, 0, 0));
 
 		if (tdm.handle != null)
 			TinkerRegistry.addMaterialStats(m, tdm.handle);
-		else
-			TinkerRegistry.addMaterialStats(m, new HandleMaterialStats(0, 0));
 
 		if (tdm.extra != null)
 			TinkerRegistry.addMaterialStats(m, tdm.extra);
-		else
-			TinkerRegistry.addMaterialStats(m, new ExtraMaterialStats(0));
 
 		if (tdm.bow != null)
 			TinkerRegistry.addMaterialStats(m, tdm.bow);
@@ -720,40 +740,60 @@ public class TDMaterials {
 
 		if (tdm.boots != null)
 			TinkerRegistry.addMaterialStats(m, tdm.boots);
+
+		if (tdm.cloth != null)
+			TinkerRegistry.addMaterialStats(m, tdm.cloth);
 	}
 
-	public void registerItems(final RegistryEvent.Register<Item> event) {
+	public void registerItems(final RegistryEvent.Register<Item> event)
+	{
 		final IForgeRegistry registry = event.getRegistry();
 
+		nugget = new TDOreDictItem("nugget", getMatNames(materials_master), getMatColors(materials_master));
+		dust = new TDOreDictItem("dust", getMatNames(materials_master), getMatColors(materials_master));
+		grain = new TDOreDictItem("grain", getMatNames(materials_master), getMatColors(materials_master));
+
+		List<TDMatHelper> gemMaster = new ArrayList<TDMatHelper>();
+		List<TDMatHelper> ingotMaster = new ArrayList<TDMatHelper>();
+
+		for (TDMatHelper i : materials_master)
+		{
+			if (i.isGem)
+				gemMaster.add(i);
+			else
+				ingotMaster.add(i);
+		}
+
+		gem = new TDOreDictItem("gem", getMatNames(gemMaster), getMatColors(gemMaster));
+		ingot = new TDOreDictItem("ingot", getMatNames(ingotMaster), getMatColors(ingotMaster));
 		registry.register(ingot);
 		registry.register(dust);
 		registry.register(nugget);
 		registry.register(grain);
 		registry.register(gem);
+		
+		for (TDMatHelper m : materials_master)
+		{
+			Material test = TinkerRegistry.getMaterial(m.name);
+			if (m.createMat && test.getIdentifier() == "unknown" && !TinkersDefense.config.materials.isBlacklisted(m.name))
+				createMaterial(m);
+		}
 	}
 
 	@Subscribe
-	public void init(FMLInitializationEvent event) {
+	public void init(FMLInitializationEvent event)
+	{
+
 		for (int i = 0; i < ingot.mats.size(); i++)
-			OreDictionary.registerOre(
-					"ingot" + ingot.mats.get(i).substring(0, 1).toUpperCase() + ingot.mats.get(i).substring(1),
-					new ItemStack(ingot, 1, i));
+			OreDictionary.registerOre("ingot" + ingot.mats.get(i).substring(0, 1).toUpperCase() + ingot.mats.get(i).substring(1), new ItemStack(ingot, 1, i));
 		for (int i = 0; i < nugget.mats.size(); i++)
-			OreDictionary.registerOre(
-					"nugget" + nugget.mats.get(i).substring(0, 1).toUpperCase() + nugget.mats.get(i).substring(1),
-					new ItemStack(nugget, 1, i));
+			OreDictionary.registerOre("nugget" + nugget.mats.get(i).substring(0, 1).toUpperCase() + nugget.mats.get(i).substring(1), new ItemStack(nugget, 1, i));
 		for (int i = 0; i < dust.mats.size(); i++)
-			OreDictionary.registerOre(
-					"dust" + dust.mats.get(i).substring(0, 1).toUpperCase() + dust.mats.get(i).substring(1),
-					new ItemStack(dust, 1, i));
+			OreDictionary.registerOre("dust" + dust.mats.get(i).substring(0, 1).toUpperCase() + dust.mats.get(i).substring(1), new ItemStack(dust, 1, i));
 		for (int i = 0; i < grain.mats.size(); i++)
-			OreDictionary.registerOre(
-					"grain" + grain.mats.get(i).substring(0, 1).toUpperCase() + grain.mats.get(i).substring(1),
-					new ItemStack(grain, 1, i));
+			OreDictionary.registerOre("grain" + grain.mats.get(i).substring(0, 1).toUpperCase() + grain.mats.get(i).substring(1), new ItemStack(grain, 1, i));
 		for (int i = 0; i < gem.mats.size(); i++)
-			OreDictionary.registerOre(
-					"gem" + gem.mats.get(i).substring(0, 1).toUpperCase() + gem.mats.get(i).substring(1),
-					new ItemStack(gem, 1, i));
+			OreDictionary.registerOre("gem" + gem.mats.get(i).substring(0, 1).toUpperCase() + gem.mats.get(i).substring(1), new ItemStack(gem, 1, i));
 
 		TinkerRegistry.registerMelting(Items.CHORUS_FRUIT, fluids.get("chorusjuice"), Material.VALUE_Nugget);
 		TinkerRegistry.registerMelting(Items.DRAGON_BREATH, fluids.get("dragonsbreath"), Material.VALUE_Ingot);
@@ -765,112 +805,109 @@ public class TDMaterials {
 		TinkerRegistry.registerMelting(Blocks.QUARTZ_BLOCK, fluids.get("quartz"), Material.VALUE_Ingot * 4);
 		TinkerRegistry.registerMelting(Items.QUARTZ, fluids.get("quartz"), Material.VALUE_Ingot);
 
-		TinkerRegistry.registerTableCasting(new ItemStack(Items.QUARTZ, 1, 0), ItemStack.EMPTY,
-				(Fluid) fluids.get("quartz"), Material.VALUE_Ingot);
-
-		TinkerRegistry.registerBasinCasting(new ItemStack(Blocks.QUARTZ_BLOCK, 1, 0), ItemStack.EMPTY,
-				(Fluid) fluids.get("quartz"), Material.VALUE_Ingot * 4);
-		TinkerRegistry.registerBasinCasting(new ItemStack(Blocks.ICE, 1, 0), ItemStack.EMPTY,
-				(Fluid) fluids.get("slush"), Material.VALUE_Ingot);
-
-		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("aeonsteel"), 4),
-				new FluidStack(fluids.get("chorusjuice"), 1), new FluidStack(TinkerFluids.cobalt, 3));
-		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("queensgold"), 2), new FluidStack(TinkerFluids.gold, 1),
-				new FluidStack(TinkerFluids.knightslime, 1));
-		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("dogbearium"), 4),
-				new FluidStack(TinkerFluids.ardite, 1), new FluidStack(fluids.get("dragonsbreath"), 3));
-		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("sinisterium"), 6),
-				new FluidStack(TinkerFluids.blood, 1), new FluidStack(fluids.get("vile"), 2),
-				new FluidStack(TinkerFluids.iron, 4));
-		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("nihilite"), 3), new FluidStack(TinkerFluids.cobalt, 1),
-				new FluidStack(fluids.get("vile"), 2));
+		TinkerRegistry.registerTableCasting(new ItemStack(Items.QUARTZ, 1, 0), ItemStack.EMPTY, (Fluid) fluids.get("quartz"), Material.VALUE_Ingot);
+
+		TinkerRegistry.registerBasinCasting(new ItemStack(Blocks.QUARTZ_BLOCK, 1, 0), ItemStack.EMPTY, (Fluid) fluids.get("quartz"), Material.VALUE_Ingot * 4);
+		TinkerRegistry.registerBasinCasting(new ItemStack(Blocks.ICE, 1, 0), ItemStack.EMPTY, (Fluid) fluids.get("slush"), Material.VALUE_Ingot);
+
+		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("aeonsteel"), 4), new FluidStack(fluids.get("chorusjuice"), 1), new FluidStack(TinkerFluids.cobalt, 3));
+		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("queensgold"), 2), new FluidStack(TinkerFluids.gold, 1), new FluidStack(TinkerFluids.knightslime, 1));
+		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("dogbearium"), 4), new FluidStack(TinkerFluids.ardite, 1), new FluidStack(fluids.get("dragonsbreath"), 3));
+		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("sinisterium"), 6), new FluidStack(TinkerFluids.blood, 1), new FluidStack(fluids.get("vile"), 2), new FluidStack(TinkerFluids.iron, 4));
+		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("nihilite"), 3), new FluidStack(TinkerFluids.cobalt, 1), new FluidStack(fluids.get("vile"), 2));
 		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("orichalcum"), 6),
-				new FluidStack(TinkerFluids.bronze, 4), new FluidStack(fluids.get("vibrant"), 2),
-				new FluidStack(TinkerFluids.gold, 1));
-		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("pandorium"), 3), new FluidStack(TinkerFluids.ardite, 1),
-				new FluidStack(fluids.get("vibrant"), 2));
-		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("rosegold"), 4), new FluidStack(TinkerFluids.gold, 1),
-				new FluidStack(TinkerFluids.copper, 3));
-		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("brass"), 3), new FluidStack(TinkerFluids.copper, 2),
-				new FluidStack(TinkerFluids.zinc, 2));
+			new FluidStack(TinkerFluids.bronze, 4),
+			new FluidStack(fluids.get("vibrant"), 2),
+			new FluidStack(TinkerFluids.gold, 1));
+		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("pandorium"), 3), new FluidStack(TinkerFluids.ardite, 1), new FluidStack(fluids.get("vibrant"), 2));
+		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("rosegold"), 4), new FluidStack(TinkerFluids.gold, 1), new FluidStack(TinkerFluids.copper, 3));
+		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("brass"), 3), new FluidStack(TinkerFluids.copper, 2), new FluidStack(TinkerFluids.zinc, 2));
 		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("valyriansteel"), 4),
-				new FluidStack(TinkerFluids.steel, 2), new FluidStack(TinkerFluids.obsidian, 2),
-				new FluidStack(fluids.get("dragonsbreath"), 1));
-		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("froststeel"), 4), new FluidStack(TinkerFluids.steel, 2),
-				new FluidStack(TinkerFluids.cobalt, 2), new FluidStack(fluids.get("slush"), 1));
+			new FluidStack(TinkerFluids.steel, 2),
+			new FluidStack(TinkerFluids.obsidian, 2),
+			new FluidStack(fluids.get("dragonsbreath"), 1));
+		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("froststeel"), 4),
+			new FluidStack(TinkerFluids.steel, 2),
+			new FluidStack(TinkerFluids.cobalt, 2),
+			new FluidStack(fluids.get("slush"), 1));
 		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("pureardite"), 1),
-				new FluidStack(TinkerFluids.ardite, 1), new FluidStack(fluids.get("dragonsbreath"), 2),
-				new FluidStack(TinkerFluids.blood, 2), new FluidStack(fluids.get("purifiedgold"), 2));
+			new FluidStack(TinkerFluids.ardite, 1),
+			new FluidStack(fluids.get("dragonsbreath"), 2),
+			new FluidStack(TinkerFluids.blood, 2),
+			new FluidStack(fluids.get("purifiedgold"), 2));
 		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("purecobalt"), 1),
-				new FluidStack(TinkerFluids.cobalt, 1), new FluidStack(fluids.get("dragonsbreath"), 2),
-				new FluidStack(fluids.get("slush"), 2), new FluidStack(fluids.get("purifiedsilver"), 2));
-		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("puremanyullyn"), 2),
-				new FluidStack(fluids.get("pureardite"), 1), new FluidStack(fluids.get("purecobalt"), 1));
+			new FluidStack(TinkerFluids.cobalt, 1),
+			new FluidStack(fluids.get("dragonsbreath"), 2),
+			new FluidStack(fluids.get("slush"), 2),
+			new FluidStack(fluids.get("purifiedsilver"), 2));
+		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("puremanyullyn"), 2), new FluidStack(fluids.get("pureardite"), 1), new FluidStack(fluids.get("purecobalt"), 1));
 		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("purifiedgold"), 1),
-				new FluidStack(TinkerFluids.gold, 1), new FluidStack(fluids.get("quartz"), 8),
-				new FluidStack(TinkerFluids.glass, 2), new FluidStack(TinkerFluids.purpleSlime, 2));
+			new FluidStack(TinkerFluids.gold, 1),
+			new FluidStack(fluids.get("quartz"), 8),
+			new FluidStack(TinkerFluids.glass, 2),
+			new FluidStack(TinkerFluids.purpleSlime, 2));
 		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("purifiedsilver"), 1),
-				new FluidStack(TinkerFluids.silver, 1), new FluidStack(fluids.get("quartz"), 8),
-				new FluidStack(TinkerFluids.glass, 2), new FluidStack(TinkerFluids.purpleSlime, 2));
-		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("solarium"), 1), new FluidStack(TinkerFluids.steel, 1),
-				new FluidStack(fluids.get("sundrop"), 1));
-		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("dragonsteel"), 1),
-				new FluidStack(TinkerFluids.steel, 1), new FluidStack(fluids.get("gallite"), 1));
-		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("blacksteel"), 1), new FluidStack(TinkerFluids.steel, 1),
-				new FluidStack(fluids.get("voidite"), 1));
-		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("abyssalium"), 1),
-				new FluidStack(fluids.get("voidite"), 1), new FluidStack(fluids.get("sundrop"), 1));
-		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("depthsilver"), 1),
-				new FluidStack(TinkerFluids.silver, 1), new FluidStack(fluids.get("abyssalium"), 1));
-		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("moonsilver"), 1),
-				new FluidStack(TinkerFluids.silver, 1), new FluidStack(fluids.get("voidite"), 1));
-		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("novagold"), 1), new FluidStack(TinkerFluids.gold, 1),
-				new FluidStack(fluids.get("sundrop"), 1));
+			new FluidStack(TinkerFluids.silver, 1),
+			new FluidStack(fluids.get("quartz"), 8),
+			new FluidStack(TinkerFluids.glass, 2),
+			new FluidStack(TinkerFluids.purpleSlime, 2));
+		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("solarium"), 1), new FluidStack(TinkerFluids.steel, 1), new FluidStack(fluids.get("sundrop"), 1));
+		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("dragonsteel"), 1), new FluidStack(TinkerFluids.steel, 1), new FluidStack(fluids.get("gallite"), 1));
+		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("blacksteel"), 1), new FluidStack(TinkerFluids.steel, 1), new FluidStack(fluids.get("voidite"), 1));
+		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("abyssalium"), 1), new FluidStack(fluids.get("voidite"), 1), new FluidStack(fluids.get("sundrop"), 1));
+		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("depthsilver"), 1), new FluidStack(TinkerFluids.silver, 1), new FluidStack(fluids.get("abyssalium"), 1));
+		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("moonsilver"), 1), new FluidStack(TinkerFluids.silver, 1), new FluidStack(fluids.get("voidite"), 1));
+		TinkerRegistry.registerAlloy(new FluidStack(fluids.get("novagold"), 1), new FluidStack(TinkerFluids.gold, 1), new FluidStack(fluids.get("sundrop"), 1));
 
 	}
 
 	@Subscribe
-	public void postInit(FMLPostInitializationEvent event) {
+	public void postInit(FMLPostInitializationEvent event)
+	{
 
 	}
 
 	@SideOnly(Side.CLIENT)
 	@SubscribeEvent
-	public static void registerModels(ModelRegistryEvent event) {
-		for (int i = 0; i < dust.mats.size(); i++) {
-			ModelLoader.setCustomModelResourceLocation(dust, i,
-					new ModelResourceLocation(Reference.MOD_ID + ":dust", "inventory"));
+	public static void registerModels(ModelRegistryEvent event)
+	{
+		for (int i = 0; i < dust.mats.size(); i++)
+		{
+			ModelLoader.setCustomModelResourceLocation(dust, i, new ModelResourceLocation(Reference.MOD_ID + ":dust", "inventory"));
 		}
 
-		for (int i = 0; i < ingot.mats.size(); i++) {
-			ModelLoader.setCustomModelResourceLocation(ingot, i,
-					new ModelResourceLocation(Reference.MOD_ID + ":ingot", "inventory"));
+		for (int i = 0; i < ingot.mats.size(); i++)
+		{
+			ModelLoader.setCustomModelResourceLocation(ingot, i, new ModelResourceLocation(Reference.MOD_ID + ":ingot", "inventory"));
 		}
 
-		for (int i = 0; i < gem.mats.size(); i++) {
-			ModelLoader.setCustomModelResourceLocation(gem, i,
-					new ModelResourceLocation(Reference.MOD_ID + ":gem", "inventory"));
+		for (int i = 0; i < gem.mats.size(); i++)
+		{
+			ModelLoader.setCustomModelResourceLocation(gem, i, new ModelResourceLocation(Reference.MOD_ID + ":gem", "inventory"));
 		}
 
-		for (int i = 0; i < nugget.mats.size(); i++) {
-			ModelLoader.setCustomModelResourceLocation(nugget, i,
-					new ModelResourceLocation(Reference.MOD_ID + ":nugget", "inventory"));
+		for (int i = 0; i < nugget.mats.size(); i++)
+		{
+			ModelLoader.setCustomModelResourceLocation(nugget, i, new ModelResourceLocation(Reference.MOD_ID + ":nugget", "inventory"));
 		}
 
-		for (int i = 0; i < grain.mats.size(); i++) {
-			ModelLoader.setCustomModelResourceLocation(grain, i,
-					new ModelResourceLocation(Reference.MOD_ID + ":grain", "inventory"));
+		for (int i = 0; i < grain.mats.size(); i++)
+		{
+			ModelLoader.setCustomModelResourceLocation(grain, i, new ModelResourceLocation(Reference.MOD_ID + ":grain", "inventory"));
 		}
 	}
 
 	@SubscribeEvent
-	public static void registerBlocks(final RegistryEvent.Register<Block> event) {
-		for (Block i : blockList) {
+	public static void registerBlocks(final RegistryEvent.Register<Block> event)
+	{
+		for (Block i : blockList)
+		{
 			event.getRegistry().register(i);
 		}
 	}
 
-	static void createFluid(String name, FluidMolten fluid) {
+	static void createFluid(String name, FluidMolten fluid)
+	{
 		FluidRegistry.registerFluid(fluid);
 
 		BlockMolten block = new BlockMolten(fluid);
@@ -886,23 +923,40 @@ public class TDMaterials {
 		FluidRegistry.addBucketForFluid(fluid);
 	}
 
-	private void registerClothMaterials() {
-		black = new Material("blackCloth", 0x191616);
-		red = new Material("redCloth", 0x963430);
-		green = new Material("greeCloth", 0x35461B);
-		brown = new Material("brownCloth", 0x4F321F);
-		blue = new Material("blueCloth", 0x2E388D);
-		purple = new Material("purpleCloth", 0x7E3DB5);
-		cyan = new Material("cyanCloth", 0x2E6E89);
-		lightgray = new Material("lightgrayCloth", 0x9AA1A1);
-		gray = new Material("grayCloth", 0x404040);
-		pink = new Material("pinkCloth", 0xD08499);
-		lime = new Material("limeCloth", 0x41AE38);
-		yellow = new Material("yellowCloth", 0xB1A627);
-		lightblue = new Material("lightblueCloth", 0x6B8AC9);
-		magenta = new Material("magentaCloth", 0xB350BC);
-		orange = new Material("orangeCloth", 0xDB7D3E);
-		white = new Material("whiteCloth", 0xDDDDDD);
+	private void registerClothMaterials()
+	{
+		black = new Material("blackCloth", 0x191616).setCraftable(true).setCastable(false);
+		;
+		red = new Material("redCloth", 0x963430).setCraftable(true).setCastable(false);
+		;
+		green = new Material("greeCloth", 0x35461B).setCraftable(true).setCastable(false);
+		;
+		brown = new Material("brownCloth", 0x4F321F).setCraftable(true).setCastable(false);
+		;
+		blue = new Material("blueCloth", 0x2E388D).setCraftable(true).setCastable(false);
+		;
+		purple = new Material("purpleCloth", 0x7E3DB5).setCraftable(true).setCastable(false);
+		;
+		cyan = new Material("cyanCloth", 0x2E6E89).setCraftable(true).setCastable(false);
+		;
+		lightgray = new Material("lightgrayCloth", 0x9AA1A1).setCraftable(true).setCastable(false);
+		;
+		gray = new Material("grayCloth", 0x404040).setCraftable(true).setCastable(false);
+		;
+		pink = new Material("pinkCloth", 0xD08499).setCraftable(true).setCastable(false);
+		;
+		lime = new Material("limeCloth", 0x41AE38).setCraftable(true).setCastable(false);
+		;
+		yellow = new Material("yellowCloth", 0xB1A627).setCraftable(true).setCastable(false);
+		;
+		lightblue = new Material("lightblueCloth", 0x6B8AC9).setCraftable(true).setCastable(false);
+		;
+		magenta = new Material("magentaCloth", 0xB350BC).setCraftable(true).setCastable(false);
+		;
+		orange = new Material("orangeCloth", 0xDB7D3E).setCraftable(true).setCastable(false);
+		;
+		white = new Material("whiteCloth", 0xDDDDDD).setCraftable(true).setCastable(false);
+		;
 
 		// Material.UNKNOWN.addStats(new MaterialCloth(100));
 		black.addItem(new ItemStack(Blocks.WOOL, 1, 15), 1, Material.VALUE_Ingot);
@@ -939,22 +993,54 @@ public class TDMaterials {
 		orange.setRepresentativeItem(new ItemStack(Blocks.WOOL, 1, 1));
 		white.setRepresentativeItem(new ItemStack(Blocks.WOOL, 1, 0));
 
-		// TinkerRegistry.addMaterial(black);
-		// TinkerRegistry.addMaterial(red);
-		// TinkerRegistry.addMaterial(green);
-		// TinkerRegistry.addMaterial(brown);
-		// TinkerRegistry.addMaterial(blue);
-		// TinkerRegistry.addMaterial(purple);
-		// TinkerRegistry.addMaterial(cyan);
-		// TinkerRegistry.addMaterial(lightgray);
-		// TinkerRegistry.addMaterial(gray);
-		// TinkerRegistry.addMaterial(pink);
-		// TinkerRegistry.addMaterial(lime);
-		// TinkerRegistry.addMaterial(yellow);
-		// TinkerRegistry.addMaterial(lightblue);
-		// TinkerRegistry.addMaterial(magenta);
-		// TinkerRegistry.addMaterial(orange);
-		// TinkerRegistry.addMaterial(white);
+		TinkerRegistry.addMaterialStats(this.white, new FabricMaterialStats(100, 10, 0, 25));
+		TinkerRegistry.addMaterialStats(this.black, new FabricMaterialStats(100, 10, 0, 25));
+		TinkerRegistry.addMaterialStats(this.blue, new FabricMaterialStats(100, 10, 0, 25));
+		TinkerRegistry.addMaterialStats(this.brown, new FabricMaterialStats(100, 10, 0, 25));
+		TinkerRegistry.addMaterialStats(this.cyan, new FabricMaterialStats(100, 10, 0, 25));
+		TinkerRegistry.addMaterialStats(this.gray, new FabricMaterialStats(100, 10, 0, 25));
+		TinkerRegistry.addMaterialStats(this.green, new FabricMaterialStats(100, 10, 0, 25));
+		TinkerRegistry.addMaterialStats(this.lightblue, new FabricMaterialStats(100, 10, 0, 25));
+		TinkerRegistry.addMaterialStats(this.lightgray, new FabricMaterialStats(100, 10, 0, 25));
+		TinkerRegistry.addMaterialStats(this.lime, new FabricMaterialStats(100, 10, 0, 25));
+		TinkerRegistry.addMaterialStats(this.magenta, new FabricMaterialStats(100, 10, 0, 25));
+		TinkerRegistry.addMaterialStats(this.orange, new FabricMaterialStats(100, 10, 0, 25));
+		TinkerRegistry.addMaterialStats(this.pink, new FabricMaterialStats(100, 10, 0, 25));
+		TinkerRegistry.addMaterialStats(this.purple, new FabricMaterialStats(100, 10, 0, 25));
+		TinkerRegistry.addMaterialStats(this.red, new FabricMaterialStats(100, 10, 0, 25));
+		TinkerRegistry.addMaterialStats(this.yellow, new FabricMaterialStats(100, 10, 0, 25));
+
+		// TinkerRegistry.addMaterialStats(this.white, new
+		// ExtraMaterialStats(5));
+		// TinkerRegistry.addMaterialStats(this.black, new
+		// ExtraMaterialStats(5));
+		// TinkerRegistry.addMaterialStats(this.blue, new
+		// ExtraMaterialStats(5));
+		// TinkerRegistry.addMaterialStats(this.brown, new
+		// ExtraMaterialStats(5));
+		// TinkerRegistry.addMaterialStats(this.cyan, new
+		// ExtraMaterialStats(5));
+		// TinkerRegistry.addMaterialStats(this.gray, new
+		// ExtraMaterialStats(5));
+		// TinkerRegistry.addMaterialStats(this.green, new
+		// ExtraMaterialStats(5));
+		// TinkerRegistry.addMaterialStats(this.lightblue, new
+		// ExtraMaterialStats(5));
+		// TinkerRegistry.addMaterialStats(this.lightgray, new
+		// ExtraMaterialStats(5));
+		// TinkerRegistry.addMaterialStats(this.lime, new
+		// ExtraMaterialStats(5));
+		// TinkerRegistry.addMaterialStats(this.magenta, new
+		// ExtraMaterialStats(5));
+		// TinkerRegistry.addMaterialStats(this.orange, new
+		// ExtraMaterialStats(5));
+		// TinkerRegistry.addMaterialStats(this.pink, new
+		// ExtraMaterialStats(5));
+		// TinkerRegistry.addMaterialStats(this.purple, new
+		// ExtraMaterialStats(5));
+		// TinkerRegistry.addMaterialStats(this.red, new ExtraMaterialStats(5));
+		// TinkerRegistry.addMaterialStats(this.yellow, new
+		// ExtraMaterialStats(5));
 
 		materials.put("white", white);
 		materials.put("orange", orange);
@@ -1009,14 +1095,18 @@ public class TDMaterials {
 	}
 
 	// PlusTIC to the rescue
-	public static void integrate(Map<String, Material> materials, Map<String, MaterialIntegration> materialIntegrations,
-			Collection<String> excludedMaterials) {
-		materials.forEach((k, v) -> {
-			if (!materialIntegrations.containsKey(k) && !excludedMaterials.contains(k)) {
+	public static void integrate(Map<String, Material> materials, Map<String, MaterialIntegration> materialIntegrations, Collection<String> excludedMaterials)
+	{
+		materials.forEach((k, v) ->
+		{
+			if (!materialIntegrations.containsKey(k) && !excludedMaterials.contains(k))
+			{
 				MaterialIntegration mi;
-				if (v.getFluid() != null && v.getFluid() != TinkerFluids.emerald) {
+				if (v.getFluid() != null && v.getFluid() != TinkerFluids.emerald)
+				{
 					mi = new MaterialIntegration(v, v.getFluid(), StringUtils.capitalize(k)).toolforge();
-				} else {
+				} else
+				{
 					mi = new MaterialIntegration(v);
 				}
 				mi.integrate();
diff --git a/src/main/java/lance5057/tDefense/core/materials/TDTraits.java b/src/main/java/lance5057/tDefense/core/materials/TDTraits.java
index 1ed655c..9ab8007 100644
--- a/src/main/java/lance5057/tDefense/core/materials/TDTraits.java
+++ b/src/main/java/lance5057/tDefense/core/materials/TDTraits.java
@@ -1,9 +1,9 @@
 package lance5057.tDefense.core.materials;
 
-import lance5057.tDefense.core.materials.ArmorMaterialStats.ChestMaterialStats;
-import lance5057.tDefense.core.materials.ArmorMaterialStats.FeetMaterialStats;
-import lance5057.tDefense.core.materials.ArmorMaterialStats.HelmMaterialStats;
-import lance5057.tDefense.core.materials.ArmorMaterialStats.LegsMaterialStats;
+import lance5057.tDefense.core.materials.stats.ChestMaterialStats;
+import lance5057.tDefense.core.materials.stats.FeetMaterialStats;
+import lance5057.tDefense.core.materials.stats.HelmMaterialStats;
+import lance5057.tDefense.core.materials.stats.LegsMaterialStats;
 import lance5057.tDefense.core.materials.traits.armor.TraitDamageSourceAlteration;
 import lance5057.tDefense.core.materials.traits.armor.TraitPhotosynthetic;
 import lance5057.tDefense.core.materials.traits.armor.TraitReduceKnockback;
diff --git a/src/main/java/lance5057/tDefense/core/materials/ArmorMaterialStats.java b/src/main/java/lance5057/tDefense/core/materials/stats/ArmorMaterialStats.java
index 031384f..da48d32 100644
--- a/src/main/java/lance5057/tDefense/core/materials/ArmorMaterialStats.java
+++ b/src/main/java/lance5057/tDefense/core/materials/stats/ArmorMaterialStats.java
@@ -1,4 +1,4 @@
-package lance5057.tDefense.core.materials;
+package lance5057.tDefense.core.materials.stats;
 
 import java.util.List;
 
@@ -75,7 +75,7 @@ public class ArmorMaterialStats extends AbstractMaterialStats {
 
 	@Override
 	public List<String> getLocalizedDesc() {
-		List<String> info = Lists.newArrayList();
+		List<String> info = Lists.newArrayList();	
 
 		info.add(Util.translate(LOC_DurabilityDesc));
 		info.add(Util.translate(LOC_ArmorRatingDesc));
@@ -84,49 +84,4 @@ public class ArmorMaterialStats extends AbstractMaterialStats {
 
 		return info;
 	}
-
-	public class HelmMaterialStats extends ArmorMaterialStats {
-		public final static String TYPE = "helm";
-
-		public HelmMaterialStats(int durability, int rating, int toughness, float potency) {
-			super(durability, rating, toughness,potency, TYPE);
-		}
-
-	}
-
-	public class ChestMaterialStats extends ArmorMaterialStats {
-		public final static String TYPE = "chest";
-
-		public ChestMaterialStats(int durability, int rating, int toughness, float potency) {
-			super(durability, rating, toughness,potency, TYPE);
-		}
-
-	}
-
-	public class LegsMaterialStats extends ArmorMaterialStats {
-		public final static String TYPE = "legs";
-
-		public LegsMaterialStats(int durability, int rating, int toughness, float potency) {
-			super(durability, rating, toughness,potency, TYPE);
-		}
-
-	}
-
-	public class FeetMaterialStats extends ArmorMaterialStats {
-		public final static String TYPE = "feet";
-
-		public FeetMaterialStats(int durability, int rating, int toughness, float potency) {
-			super(durability, rating, toughness,potency, TYPE);
-		}
-
-	}
-	
-	public class ClothMaterialStats extends ArmorMaterialStats {
-		public final static String TYPE = "cloth";
-
-		public ClothMaterialStats(int durability, int rating, int toughness, float potency) {
-			super(durability, rating, toughness,potency, TYPE);
-		}
-
-	}
 }
diff --git a/src/main/java/lance5057/tDefense/core/materials/BaubleMaterialStats.java b/src/main/java/lance5057/tDefense/core/materials/stats/BaubleMaterialStats.java
index aa28dc1..b99022f 100644
--- a/src/main/java/lance5057/tDefense/core/materials/BaubleMaterialStats.java
+++ b/src/main/java/lance5057/tDefense/core/materials/stats/BaubleMaterialStats.java
@@ -1,4 +1,4 @@
-package lance5057.tDefense.core.materials;
+package lance5057.tDefense.core.materials.stats;
 
 import java.util.List;
 
diff --git a/src/main/java/lance5057/tDefense/core/materials/stats/ChestMaterialStats.java b/src/main/java/lance5057/tDefense/core/materials/stats/ChestMaterialStats.java
new file mode 100644
index 0000000..689f742
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/core/materials/stats/ChestMaterialStats.java
@@ -0,0 +1,10 @@
+package lance5057.tDefense.core.materials.stats;
+
+public class ChestMaterialStats extends ArmorMaterialStats {
+	public final static String TYPE = "chest";
+
+	public ChestMaterialStats(int durability, int rating, int toughness, float potency) {
+		super(durability, rating, toughness,potency, TYPE);
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/java/lance5057/tDefense/core/materials/stats/FabricMaterialStats.java b/src/main/java/lance5057/tDefense/core/materials/stats/FabricMaterialStats.java
new file mode 100644
index 0000000..c80c61d
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/core/materials/stats/FabricMaterialStats.java
@@ -0,0 +1,10 @@
+package lance5057.tDefense.core.materials.stats;
+
+public class FabricMaterialStats extends ArmorMaterialStats {
+	public final static String TYPE = "fabric";
+
+	public FabricMaterialStats(int durability, int rating, int toughness, float potency) {
+		super(durability, rating, toughness,potency, TYPE);
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/java/lance5057/tDefense/core/materials/stats/FeetMaterialStats.java b/src/main/java/lance5057/tDefense/core/materials/stats/FeetMaterialStats.java
new file mode 100644
index 0000000..1afe1dd
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/core/materials/stats/FeetMaterialStats.java
@@ -0,0 +1,10 @@
+package lance5057.tDefense.core.materials.stats;
+
+public class FeetMaterialStats extends ArmorMaterialStats {
+	public final static String TYPE = "feet";
+
+	public FeetMaterialStats(int durability, int rating, int toughness, float potency) {
+		super(durability, rating, toughness,potency, TYPE);
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/java/lance5057/tDefense/core/materials/stats/HelmMaterialStats.java b/src/main/java/lance5057/tDefense/core/materials/stats/HelmMaterialStats.java
new file mode 100644
index 0000000..2bd8526
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/core/materials/stats/HelmMaterialStats.java
@@ -0,0 +1,10 @@
+package lance5057.tDefense.core.materials.stats;
+
+public class HelmMaterialStats extends ArmorMaterialStats {
+		public final static String TYPE = "helm";
+
+		public HelmMaterialStats(int durability, int rating, int toughness, float potency) {
+			super(durability, rating, toughness,potency, TYPE);
+		}
+
+	}
\ No newline at end of file
diff --git a/src/main/java/lance5057/tDefense/core/materials/stats/LegsMaterialStats.java b/src/main/java/lance5057/tDefense/core/materials/stats/LegsMaterialStats.java
new file mode 100644
index 0000000..911a610
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/core/materials/stats/LegsMaterialStats.java
@@ -0,0 +1,10 @@
+package lance5057.tDefense.core.materials.stats;
+
+public class LegsMaterialStats extends ArmorMaterialStats {
+	public final static String TYPE = "legs";
+
+	public LegsMaterialStats(int durability, int rating, int toughness, float potency) {
+		super(durability, rating, toughness,potency, TYPE);
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/java/lance5057/tDefense/core/materials/ShieldMaterialStats.java b/src/main/java/lance5057/tDefense/core/materials/stats/ShieldMaterialStats.java
index bad520d..664777b 100644
--- a/src/main/java/lance5057/tDefense/core/materials/ShieldMaterialStats.java
+++ b/src/main/java/lance5057/tDefense/core/materials/stats/ShieldMaterialStats.java
@@ -1,4 +1,4 @@
-package lance5057.tDefense.core.materials;
+package lance5057.tDefense.core.materials.stats;
 
 import java.util.List;
 
diff --git a/src/main/java/lance5057/tDefense/core/materials/traits/armor/TraitDamageSourceAlteration.java b/src/main/java/lance5057/tDefense/core/materials/traits/armor/TraitDamageSourceAlteration.java
index e40fdff..e17b112 100644
--- a/src/main/java/lance5057/tDefense/core/materials/traits/armor/TraitDamageSourceAlteration.java
+++ b/src/main/java/lance5057/tDefense/core/materials/traits/armor/TraitDamageSourceAlteration.java
@@ -1,6 +1,7 @@
 package lance5057.tDefense.core.materials.traits.armor;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import lance5057.tDefense.core.materials.traits.AbstractTDTrait;
@@ -10,7 +11,6 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.DamageSource;
 import net.minecraftforge.event.entity.living.LivingHurtEvent;
-import scala.actors.threadpool.Arrays;
 import slimeknights.tconstruct.library.traits.AbstractTrait;
 
 public class TraitDamageSourceAlteration extends AbstractTDTrait {
diff --git a/src/main/java/lance5057/tDefense/core/materials/traits/armor/TraitReduceKnockback.java b/src/main/java/lance5057/tDefense/core/materials/traits/armor/TraitReduceKnockback.java
index f20b4fc..d0f08f8 100644
--- a/src/main/java/lance5057/tDefense/core/materials/traits/armor/TraitReduceKnockback.java
+++ b/src/main/java/lance5057/tDefense/core/materials/traits/armor/TraitReduceKnockback.java
@@ -1,6 +1,7 @@
 package lance5057.tDefense.core.materials.traits.armor;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 
@@ -14,7 +15,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import scala.actors.threadpool.Arrays;
 import slimeknights.tconstruct.library.traits.AbstractTrait;
 
 public class TraitReduceKnockback extends AbstractTrait {
diff --git a/src/main/java/lance5057/tDefense/core/materials/traits/shields/TraitFirestarter.java b/src/main/java/lance5057/tDefense/core/materials/traits/shields/TraitFirestarter.java
index 310b07e..feb59a6 100644
--- a/src/main/java/lance5057/tDefense/core/materials/traits/shields/TraitFirestarter.java
+++ b/src/main/java/lance5057/tDefense/core/materials/traits/shields/TraitFirestarter.java
@@ -2,7 +2,7 @@ package lance5057.tDefense.core.materials.traits.shields;
 
 import java.util.Optional;
 
-import lance5057.tDefense.util.TDToolHelper;
+import lance5057.tDefense.core.library.TDToolHelper;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.EntityLivingBase;
diff --git a/src/main/java/lance5057/tDefense/core/network/ArmorNetwork.java b/src/main/java/lance5057/tDefense/core/network/ArmorNetwork.java
new file mode 100644
index 0000000..8aadb48
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/core/network/ArmorNetwork.java
@@ -0,0 +1,5 @@
+package lance5057.tDefense.core.network;
+
+public class ArmorNetwork
+{
+}
diff --git a/src/main/java/lance5057/tDefense/core/network/ArmorStationSelectionPacket.java b/src/main/java/lance5057/tDefense/core/network/ArmorStationSelectionPacket.java
new file mode 100644
index 0000000..e76d1df
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/core/network/ArmorStationSelectionPacket.java
@@ -0,0 +1,90 @@
+package lance5057.tDefense.core.network;
+
+import io.netty.buffer.ByteBuf;
+import lance5057.tDefense.core.gui.ArmorStationContainer;
+import lance5057.tDefense.core.gui.ArmorStationGui;
+import lance5057.tDefense.core.tools.bases.ArmorCore;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.inventory.Container;
+import net.minecraft.item.Item;
+import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.world.WorldServer;
+import slimeknights.mantle.inventory.BaseContainer;
+import slimeknights.mantle.network.AbstractPacketThreadsafe;
+import slimeknights.tconstruct.common.TinkerNetwork;
+
+public class ArmorStationSelectionPacket extends AbstractPacketThreadsafe {
+
+  public ArmorCore armor;
+  public int activeSlots;
+
+  public ArmorStationSelectionPacket() {
+  }
+ 
+  public ArmorStationSelectionPacket(ArmorCore tool, int activeSlots) {
+    this.armor = tool;
+    this.activeSlots = activeSlots;
+  }
+
+  @Override
+  public void handleClientSafe(NetHandlerPlayClient netHandler) {
+    Container container = Minecraft.getMinecraft().player.openContainer;
+    if(container instanceof ArmorStationContainer) {
+      ((ArmorStationContainer) container).setToolSelection(armor, activeSlots);
+      if(Minecraft.getMinecraft().currentScreen instanceof ArmorStationGui) {
+        ((ArmorStationGui) Minecraft.getMinecraft().currentScreen).onToolSelectionPacket(this);
+      }
+    }
+  }
+
+  @Override
+  public void handleServerSafe(NetHandlerPlayServer netHandler) {
+    Container container = netHandler.player.openContainer;
+    if(container instanceof ArmorStationContainer) {
+      ((ArmorStationContainer) container).setToolSelection(armor, activeSlots);
+
+      // find all people who also have the same gui open and update them too
+      WorldServer server = netHandler.player.getServerWorld();
+      for(EntityPlayer player : server.playerEntities) {
+        if(player == netHandler.player) {
+          continue;
+        }
+        if(player.openContainer instanceof ArmorStationContainer) {
+          if(((BaseContainer) container).sameGui((BaseContainer) player.openContainer)) {
+            ((ArmorStationContainer) player.openContainer).setToolSelection(armor, activeSlots);
+            // same gui, send him an update
+            TinkerNetwork.sendTo(this, (EntityPlayerMP) player);
+          }
+        }
+      }
+    }
+  }
+
+  @Override
+  public void fromBytes(ByteBuf buf) {
+    int id = buf.readShort();
+    if(id > -1) {
+      Item item = Item.getItemById(id);
+      if(item instanceof ArmorCore) {
+        armor = (ArmorCore) item;
+      }
+    }
+
+    activeSlots = buf.readInt();
+  }
+
+  @Override
+  public void toBytes(ByteBuf buf) {
+    if(armor == null) {
+      buf.writeShort(-1);
+    }
+    else {
+      buf.writeShort(Item.getIdFromItem(armor));
+    }
+
+    buf.writeInt(activeSlots);
+  }
+}
\ No newline at end of file
diff --git a/src/main/java/lance5057/tDefense/core/parts/TDParts.java b/src/main/java/lance5057/tDefense/core/parts/TDParts.java
index af0d8f4..c0fff8f 100644
--- a/src/main/java/lance5057/tDefense/core/parts/TDParts.java
+++ b/src/main/java/lance5057/tDefense/core/parts/TDParts.java
@@ -1,12 +1,19 @@
 package lance5057.tDefense.core.parts;
 
 import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.tuple.Pair;
+
+import com.google.common.collect.Lists;
 
 import lance5057.tDefense.Reference;
 import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.util.ModuleBase;
+import lance5057.tDefense.core.library.ArmorPart;
+import lance5057.tDefense.core.library.ModuleBase;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
@@ -16,53 +23,62 @@ import net.minecraftforge.registries.IForgeRegistry;
 import slimeknights.tconstruct.library.TinkerRegistry;
 import slimeknights.tconstruct.library.materials.Material;
 import slimeknights.tconstruct.library.tinkering.PartMaterialType;
+import slimeknights.tconstruct.library.tools.IToolPart;
 import slimeknights.tconstruct.library.tools.Pattern;
+import slimeknights.tconstruct.library.tools.ToolCore;
 import slimeknights.tconstruct.library.tools.ToolPart;
 import slimeknights.tconstruct.tools.TinkerTools;
 
 @Mod.EventBusSubscriber(modid = Reference.MOD_ID)
-public class TDParts extends ModuleBase {
-	public static PartMaterialType ShieldMat;
-
-	public static PartMaterialType ArmorplateMat;
-	public static PartMaterialType ChainmailMat;
-	public static PartMaterialType RivetMat;
-	public static PartMaterialType ClaspMat;
-	public static PartMaterialType ClothMat;
-
-	public static ToolPart armorPlate;
-	public static ToolPart chainmail;
-	public static ToolPart cloth;
-	public static ToolPart rivets;
-	public static ToolPart clasp;
-
-	public static ToolPart ringShank;
-	public static ToolPart setting;
-	public static ToolPart wire;
-	public static ToolPart filigree;
-	
-	public static ToolPart armor_hoodCloth;
+public class TDParts extends ModuleBase
+{
+	private static final List<IToolPart> toolParts = new ArrayList<>();
+	static List<Pair<Item, ToolPart>> toolPartPatterns = Lists.newLinkedList();
+	static List<Pair<Item, ArmorPart>> armorPartPatterns = Lists.newLinkedList();
+	// public static PartMaterialType ShieldMat;
+
+	// public static PartMaterialType ArmorplateMat;
+	// public static PartMaterialType ChainmailMat;
+	// public static PartMaterialType RivetMat;
+	// public static PartMaterialType ClaspMat;
+	// public static PartMaterialType ClothMat;
+
+	public static ToolPart	armorPlate;
+	public static ArmorPart	chainmail;
+	public static ArmorPart	fabric;
+	public static ToolPart	rivets;
+	public static ToolPart	clasp;
+
+	public static ToolPart	ringShank;
+	public static ToolPart	setting;
+	public static ToolPart	wire;
+	public static ToolPart	filigree;
+
+	// public static ToolPart armor_hoodCloth;
 
 	protected static ArrayList<Item> itemList = new ArrayList<Item>();
 
 	@Override
-	public void preInit(FMLPreInitializationEvent e) {
+	public void preInit(FMLPreInitializationEvent e)
+	{
 
 	}
 
 	@Override
-	public void init(FMLInitializationEvent e) {
+	public void init(FMLInitializationEvent e)
+	{
 		
 	}
 
 	@Override
-	public void postInit(FMLPostInitializationEvent e) {
+	public void postInit(FMLPostInitializationEvent e)
+	{
 		// TODO Auto-generated method stub
-
+		
 	}
 
-	public void registerItems(final RegistryEvent.Register<Item> event) {
-
+	public void registerItems(final RegistryEvent.Register<Item> event)
+	{
 		final IForgeRegistry registry = event.getRegistry();
 
 		armorPlate = regToolPart(Material.VALUE_Ingot * 4, "armor_plate", event);
@@ -73,39 +89,130 @@ public class TDParts extends ModuleBase {
 		// TinkerRegistry.registerStencilTableCrafting(Pattern.setTagForPart(new
 		// ItemStack(TinkerTools.pattern), armorPlate));
 		//
-		chainmail = regToolPart(Material.VALUE_Ingot * 3, "chainmail", event);
-		cloth = regToolPart(Material.VALUE_Ingot * 3, "cloth", event);
+		chainmail = regArmorPart(Material.VALUE_Ingot * 3, "chainmail", event);
+
+		fabric = regArmorPart(Material.VALUE_Ingot * 3, "fabric", event);
+
 		rivets = regToolPart(Material.VALUE_Ingot * 1, "rivets", event);
 		clasp = regToolPart(Material.VALUE_Ingot * 1, "clasp", event);
-
-		ringShank = regToolPart(Material.VALUE_Ingot * 2, "ringShank", event);
-		setting = regToolPart(Material.VALUE_Ingot * 1, "setting", event);
-		wire = regToolPart(Material.VALUE_Ingot * 1, "wire", event);
+//
+//		ringShank = regToolPart(Material.VALUE_Ingot * 2, "ringShank", event);
+//		setting = regToolPart(Material.VALUE_Ingot * 1, "setting", event);
+//		wire = regToolPart(Material.VALUE_Ingot * 1, "wire", event);
 		filigree = regToolPart(Material.VALUE_Ingot * 1, "filigree", event);
-		
-		//ShieldMat = new PartMaterialType(TDParts.armorPlate, ShieldMaterialStats.TYPE);
 
-//		ArmorplateMat = new PartMaterialType(armorPlate, MaterialArmor.TYPE);
-//		ChainmailMat = new PartMaterialType(chainmail, MaterialArmor.TYPE);
-//		RivetMat = new PartMaterialType(rivets, MaterialTypes.EXTRA);
-//		ClaspMat = new PartMaterialType(clasp, MaterialTypes.EXTRA);
-//		ClothMat = new PartMaterialType(cloth, MaterialCloth.TYPE);
+		// ShieldMat = new PartMaterialType(TDParts.armorPlate,
+		// ShieldMaterialStats.TYPE);
+
+		// ArmorplateMat = new PartMaterialType(armorPlate, MaterialArmor.TYPE);
+		// ChainmailMat = new PartMaterialType(chainmail, MaterialArmor.TYPE);
+		// RivetMat = new PartMaterialType(rivets, MaterialTypes.EXTRA);
+		// ClaspMat = new PartMaterialType(clasp, MaterialTypes.EXTRA);
+		// ClothMat = new PartMaterialType(cloth, MaterialCloth.TYPE);
 
-		//registry.registerAll((Item[]) itemList.toArray());
+		// registry.registerAll((Item[]) itemList.toArray());
+
+		// armor_hoodCloth = regToolPart(Material.VALUE_Ingot * 1,
+		// "armor_hood_cloth", event);
+		for(Pair<Item, ToolPart> toolPartPattern : toolPartPatterns) {
+		      registerStencil(toolPartPattern.getLeft(), toolPartPattern.getRight());
+		    }
+		
+		for(Pair<Item, ArmorPart> toolPartPattern : armorPartPatterns) {
+		      registerStencil(toolPartPattern.getLeft(), toolPartPattern.getRight());
+		    }
 		
-		armor_hoodCloth = regToolPart(Material.VALUE_Ingot * 1, "armor_hood_cloth", event);
+//		for (final IToolPart part : toolParts)
+//		{
+//			for (final ToolCore tool : TDTools.tools)
+//			{
+//				for (final PartMaterialType pmt : tool.getRequiredComponents())
+//				{
+//					if (pmt.getPossibleParts().contains(part))
+//					{
+//						TinkerRegistry.registerStencilTableCrafting(Pattern.setTagForPart(new ItemStack(TinkerTools.pattern), (Item) part));
+//					}
+//				}
+//			}
+//			
+//			for (final ArmorCore armor : TDTools.armors)
+//			{
+//				for (final PartMaterialType pmt : armor.getRequiredComponents())
+//				{
+//					if (pmt.getPossibleParts().contains(part))
+//					{
+//						TinkerRegistry.registerStencilTableCrafting(Pattern.setTagForPart(new ItemStack(TinkerTools.pattern), (Item) part));
+//					}
+//				}
+//			}
+//		}
 	}
 
-	private static ToolPart regToolPart(int castVolume, String name, RegistryEvent.Register<Item> event) {
+	private static ToolPart regToolPart(int castVolume, String name, RegistryEvent.Register<Item> event)
+	{
 		ToolPart part = new ToolPart(castVolume);
-		part.setUnlocalizedName(name).setRegistryName("tinkersdefense:" + name);
+		part.setUnlocalizedName(name).setRegistryName(new ResourceLocation(Reference.MOD_ID,name));
 		event.getRegistry().register(part);
-		TinkerRegistry.registerStencilTableCrafting(Pattern.setTagForPart(new ItemStack(TinkerTools.pattern), part));
+		
+		if(TinkerTools.pattern != null) {
+		      toolPartPatterns.add(Pair.of(TinkerTools.pattern, part));
+		    }
+		
+		TinkerRegistry.registerToolPart(part);
 		TinkersDefense.proxy.registerPartModel(part);
+		TinkerRegistry.registerStencilTableCrafting(Pattern.setTagForPart(new ItemStack(TinkerTools.pattern), (Item) part));
+
 		// TinkerRegistry.registerTableCasting(output, cast, fluid, amount);
+		toolParts.add(part);
 		itemList.add(part);
+
+		return part;
+	}
+
+	private void registerStencil(Item pattern, ToolPart toolPart) {
+	    for(ToolCore toolCore : TinkerRegistry.getTools()) {
+	      for(PartMaterialType partMaterialType : toolCore.getRequiredComponents()) {
+	        if(partMaterialType.getPossibleParts().contains(toolPart)) {
+	          ItemStack stencil = new ItemStack(pattern);
+	          Pattern.setTagForPart(stencil, toolPart);
+	          TinkerRegistry.registerStencilTableCrafting(stencil);
+	          return;
+	        }
+	      }
+	    }
+	  }
+	
+	private static ArmorPart regArmorPart(int castVolume, String name, RegistryEvent.Register<Item> event)
+	{
+		ArmorPart part = new ArmorPart(castVolume);
+		part.setUnlocalizedName(name).setRegistryName(new ResourceLocation(Reference.MOD_ID,name));
+		event.getRegistry().register(part);
+		
+		if(TinkerTools.pattern != null) {
+		      armorPartPatterns.add(Pair.of(TinkerTools.pattern, part));
+		    }
 		
+		TinkerRegistry.registerToolPart(part);
+		TinkersDefense.proxy.registerArmorPartModel(part);
+		TinkerRegistry.registerStencilTableCrafting(Pattern.setTagForPart(new ItemStack(TinkerTools.pattern), (Item) part));
+
+		// TinkerRegistry.registerTableCasting(output, cast, fluid, amount);
+		toolParts.add(part);
+		itemList.add(part);
+
 		return part;
 	}
 
+	private void registerStencil(Item pattern, ArmorPart toolPart) {
+	    for(ToolCore toolCore : TinkerRegistry.getTools()) {
+	      for(PartMaterialType partMaterialType : toolCore.getRequiredComponents()) {
+	        if(partMaterialType.getPossibleParts().contains(toolPart)) {
+	          ItemStack stencil = new ItemStack(pattern);
+	          Pattern.setTagForPart(stencil, toolPart);
+	          TinkerRegistry.registerStencilTableCrafting(stencil);
+	          return;
+	        }
+	      }
+	    }
+	  }
 }
diff --git a/src/main/java/lance5057/tDefense/core/tileentities/ArmorStationTile.java b/src/main/java/lance5057/tDefense/core/tileentities/ArmorStationTile.java
index e2d3654..901a772 100644
--- a/src/main/java/lance5057/tDefense/core/tileentities/ArmorStationTile.java
+++ b/src/main/java/lance5057/tDefense/core/tileentities/ArmorStationTile.java
@@ -1,29 +1,83 @@
 package lance5057.tDefense.core.tileentities;
 
+import lance5057.tDefense.core.gui.ArmorStationContainer;
 import lance5057.tDefense.core.gui.ArmorStationGui;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockPane;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import net.minecraftforge.common.property.IExtendedBlockState;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import slimeknights.tconstruct.tools.common.tileentity.TileToolStation;
 
-public class ArmorStationTile extends TileToolStation {
+import slimeknights.mantle.common.IInventoryGui;
+import slimeknights.tconstruct.library.client.ToolBuildGuiInfo;
+import slimeknights.tconstruct.shared.block.BlockTable;
+import slimeknights.tconstruct.shared.block.PropertyTableItem;
+import slimeknights.tconstruct.shared.inventory.ConfigurableInvWrapperCapability;
+import slimeknights.tconstruct.shared.tileentity.TileTable;
+import slimeknights.tconstruct.tools.common.client.GuiButtonRepair;
+import slimeknights.tconstruct.tools.common.client.GuiToolStation;
+import slimeknights.tconstruct.tools.common.inventory.ContainerToolStation;
 
-    public ArmorStationTile() {
-        inventoryTitle = "armorstation.name";
-    }
+public class ArmorStationTile extends TileTable implements IInventoryGui {
 
-    @Override
-    @SideOnly(Side.CLIENT)
-    public GuiContainer createGui(InventoryPlayer inventoryPlayer, World world, BlockPos pos) {
-        return new ArmorStationGui(inventoryPlayer, world, pos, this);
-    }
+  public ArmorStationTile() {
+    super("gui.toolstation.name", 6);
+    this.itemHandler = new ConfigurableInvWrapperCapability(this, false, false); 
+  }
+
+  @Override
+  public Container createContainer(InventoryPlayer inventoryplayer, World world, BlockPos pos) {
+    return new ArmorStationContainer(inventoryplayer, this); 
+  }
+
+  @Override
+  @SideOnly(Side.CLIENT)
+  public GuiContainer createGui(InventoryPlayer inventoryplayer, World world, BlockPos pos) {
+    return new ArmorStationGui(inventoryplayer, world, pos, this);
+  }
+
+  @Override
+  protected IExtendedBlockState setInventoryDisplay(IExtendedBlockState state) {
+    PropertyTableItem.TableItems toDisplay = new PropertyTableItem.TableItems();
 
-    @Override
-    public Container createContainer(InventoryPlayer inventoryPlayer, World world, BlockPos pos) {
-        return new ArmorStationContainer(inventoryPlayer, this, false);
+    ToolBuildGuiInfo info = GuiButtonRepair.info;
+    /* Disabled for now
+    // todo: evaluate this again
+    if(Minecraft.getMinecraft().currentScreen instanceof GuiToolStation) {
+      info = ((GuiToolStation) Minecraft.getMinecraft().currentScreen).currentInfo;
+    }*/
+    float s = 0.46875f;
+
+    for(int i = 0; i < info.positions.size(); i++) {
+      ItemStack stackInSlot = getStackInSlot(i);
+      PropertyTableItem.TableItem item = getTableItem(stackInSlot, this.getWorld(), null);
+      if(item != null) {
+        item.x = (33 - info.positions.get(i).getX()) / 61f;
+        item.z = (42 - info.positions.get(i).getY()) / 61f;
+        item.s *= s;
+
+        if(i == 0 || info != GuiButtonRepair.info) {
+          item.s *= 1.3f;
+        }
+
+        // correct itemblock because scaling
+        if(stackInSlot.getItem() instanceof ItemBlock && !(Block.getBlockFromItem(stackInSlot.getItem())  instanceof BlockPane)) {
+          item.y = -(1f - item.s) / 2f;
+        }
+
+        //item.s *= 2/5f;
+        toDisplay.items.add(item);
+      }
     }
+
+    // add inventory if needed
+    return state.withProperty(BlockTable.INVENTORY, toDisplay);
+  }
 }
\ No newline at end of file
diff --git a/src/main/java/lance5057/tDefense/core/tools/TDTools.java b/src/main/java/lance5057/tDefense/core/tools/TDTools.java
index bfa650c..b93e92b 100644
--- a/src/main/java/lance5057/tDefense/core/tools/TDTools.java
+++ b/src/main/java/lance5057/tDefense/core/tools/TDTools.java
@@ -1,11 +1,17 @@
 package lance5057.tDefense.core.tools;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import com.google.common.eventbus.Subscribe;
 
 import lance5057.tDefense.Reference;
 import lance5057.tDefense.TinkersDefense;
+import lance5057.tDefense.core.blocks.ArmorStationBlock;
+import lance5057.tDefense.core.library.CustomArmorTextureCreator;
+import lance5057.tDefense.core.library.TDRegistry;
+import lance5057.tDefense.core.network.ArmorStationSelectionPacket;
+import lance5057.tDefense.core.tileentities.ArmorStationTile;
 import lance5057.tDefense.core.tools.armor.cloth.TinkersHood;
 import lance5057.tDefense.core.tools.armor.cloth.TinkersRobe;
 import lance5057.tDefense.core.tools.armor.cloth.TinkersShawl;
@@ -21,11 +27,10 @@ import lance5057.tDefense.core.tools.basic.RoundShield;
 import lance5057.tDefense.core.tools.basic.Shears;
 import lance5057.tDefense.core.tools.basic.TowerShield;
 import lance5057.tDefense.core.tools.basic.Zweihander;
-import lance5057.tDefense.core.tools.baubles.Amulet;
-import lance5057.tDefense.core.tools.baubles.Ring;
 import lance5057.tDefense.core.tools.baubles.Sheathe;
-import lance5057.tDefense.util.TDRegistry;
+import net.minecraft.block.Block;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.RegistryEvent;
@@ -33,45 +38,54 @@ import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.registries.IForgeRegistry;
+import slimeknights.tconstruct.common.TinkerNetwork;
 import slimeknights.tconstruct.library.TinkerRegistry;
 import slimeknights.tconstruct.library.client.CustomTextureCreator;
 import slimeknights.tconstruct.library.tools.ToolCore;
 
 @Mod.EventBusSubscriber(modid = Reference.MOD_ID)
-//@Pulse(id = TDTools.PulseId, description = "All the tools and everything related to it.")
-public class TDTools {
-
+// @Pulse(id = TDTools.PulseId, description = "All the tools and everything
+// related to it.")
+public class TDTools
+{
+	public static final List<ToolCore> tools = new ArrayList<>();
+	public static final List<ArmorCore> armors = new ArrayList<>();
 	TDToolEvents events = new TDToolEvents();
 
-	// Tools
-	public static ToolCore roundshield;
-	public static ToolCore heatershield;
-	public static ToolCore towershield;
-	public static ToolCore zweihander;
-	public static ToolCore shears;
-	public static ToolCore fishingRod;
-	
-	public static ArmorCore hood;
-	public static ArmorCore shawl;
-	public static ArmorCore robe;
-	public static ArmorCore shoes;
-
-	public static ArmorCore coif;
-	public static ArmorCore hauberk;
-	public static ArmorCore chausses;
-	//public static ToolCore boots;
-
-	public static ArmorCore helm;
-	public static ArmorCore breastplate;
-	public static ArmorCore grieves;
-	public static ArmorCore sabatons;
-	
-	//baubles
-	public static ToolCore sheathe;
-	public static ToolCore ring;
-	public static ToolCore amulet;
+	public static ArmorStationBlock station;
 	
+	public static Item stationItem;
+
+	// Tools
+	public static ToolCore	roundshield;
+	public static ToolCore	heatershield;
+	public static ToolCore	towershield;
+	public static ToolCore	zweihander;
+	public static ToolCore	shears;
+	public static ToolCore	fishingRod;
+
+	public static ArmorCore	hood;
+	public static ArmorCore	shawl;
+	public static ArmorCore	robe;
+	public static ArmorCore	shoes;
+
+	public static ArmorCore	coif;
+	public static ArmorCore	hauberk;
+	public static ArmorCore	chausses;
+	// public static ToolCore boots;
+
+	public static ArmorCore	helm;
+	public static ArmorCore	breastplate;
+	public static ArmorCore	grieves;
+	public static ArmorCore	sabatons;
+
+	// baubles
+	public static ToolCore	sheathe;
+//	public static ToolCore	ring;
+//	public static ToolCore	amulet;
+
 	static ArrayList<Item> itemList = new ArrayList<Item>();
 
 	// Tool Parts
@@ -88,42 +102,46 @@ public class TDTools {
 
 	// PRE-INITIALIZATION
 	@Subscribe
-	public void preInit(FMLPreInitializationEvent event) {
+	public void preInit(FMLPreInitializationEvent event)
+	{
 	}
 
-	private void regTools() {
+	private void regTools()
+	{
 
 	}
-	
+
 	public void registerItems(final RegistryEvent.Register<Item> event)
 	{
 		
+		stationItem = new ItemBlock(station).setUnlocalizedName("stationitem").setRegistryName("stationitem");
+
 		roundshield = new RoundShield();
 		heatershield = new HeaterShield();
 		towershield = new TowerShield();
 		zweihander = new Zweihander();
 		shears = new Shears();
 		fishingRod = new FishingRod();
- 
+
 		hood = new TinkersHood();
 		shawl = new TinkersShawl();
 		robe = new TinkersRobe();
 		shoes = new TinkersShoes();
-		
-//		coif = new TinkersCoif();
-//		hauberk = new TinkersHauberk();
-//		chausses = new TinkersChausses();
-		//boots = new TinkersBoots();
-		
+
+		// coif = new TinkersCoif();
+		// hauberk = new TinkersHauberk();
+		// chausses = new TinkersChausses();
+		// boots = new TinkersBoots();
+
 		helm = new TinkersHelm();
 		breastplate = new TinkersBreastplate();
 		grieves = new TinkersGrieves();
 		sabatons = new TinkersSabatons();
-		
+
 		sheathe = new Sheathe();
-		ring = new Ring();
-		amulet = new Amulet();
-		
+//		ring = new Ring();
+//		amulet = new Amulet();
+
 		regTool(roundshield, "roundshield", event);
 		regTool(heatershield, "heatershield", event);
 		regTool(towershield, "towershield", event);
@@ -132,72 +150,118 @@ public class TDTools {
 		regTool(fishingRod, "fishingRod", event);
 
 		regArmor(hood, "hood", event);
+		CustomArmorTextureCreator.registerTexture(new ResourceLocation(Reference.MOD_ID, "armor/hood/_hood_cloth"));
+		CustomArmorTextureCreator.registerTexture(new ResourceLocation(Reference.MOD_ID, "armor/hood/_hood_trim"));
+		CustomArmorTextureCreator.registerTexture(new ResourceLocation(Reference.MOD_ID, "armor/hood/_hood_metal"));
+
 		regArmor(shawl, "shawl", event);
-		regArmor(robe, "robe", event);
-		regArmor(shoes, "shoes", event);
+		CustomArmorTextureCreator.registerTexture(new ResourceLocation(Reference.MOD_ID, "armor/shawl/_shawl_cloth"));
+		CustomArmorTextureCreator.registerTexture(new ResourceLocation(Reference.MOD_ID, "armor/shawl/_shawl_trim"));
+		CustomArmorTextureCreator.registerTexture(new ResourceLocation(Reference.MOD_ID, "armor/shawl/_shawl_metal"));
 		
-		//regTool(boots, "boots", event);
+		regArmor(robe, "robe", event);
+		CustomArmorTextureCreator.registerTexture(new ResourceLocation(Reference.MOD_ID, "armor/robe/_robe_cloth"));
+		CustomArmorTextureCreator.registerTexture(new ResourceLocation(Reference.MOD_ID, "armor/robe/_robe_trim"));
+		CustomArmorTextureCreator.registerTexture(new ResourceLocation(Reference.MOD_ID, "armor/robe/_robe_metal"));
 		
+		regArmor(shoes, "shoes", event);
+		CustomArmorTextureCreator.registerTexture(new ResourceLocation(Reference.MOD_ID, "armor/shoes/_shoes_cloth"));
+		CustomArmorTextureCreator.registerTexture(new ResourceLocation(Reference.MOD_ID, "armor/shoes/_shoes_trim"));
+		CustomArmorTextureCreator.registerTexture(new ResourceLocation(Reference.MOD_ID, "armor/shoes/_shoes_metal"));
+		CustomArmorTextureCreator.registerTexture(new ResourceLocation(Reference.MOD_ID, "armor/shoes/_shoes_string"));
+
+		// regTool(boots, "boots", event);
+
 		regArmor(helm, "helm", event);
+		CustomArmorTextureCreator.registerTexture(new ResourceLocation(Reference.MOD_ID, "armor/helm/_helm_chain"));
+		CustomArmorTextureCreator.registerTexture(new ResourceLocation(Reference.MOD_ID, "armor/helm/_helm_plate"));
+		CustomArmorTextureCreator.registerTexture(new ResourceLocation(Reference.MOD_ID, "armor/helm/_helm_top"));
+		CustomArmorTextureCreator.registerTexture(new ResourceLocation(Reference.MOD_ID, "armor/helm/_helm_visor"));
+		
 		regArmor(breastplate, "breastplate", event);
+		CustomArmorTextureCreator.registerTexture(new ResourceLocation(Reference.MOD_ID, "armor/breastplate/_breastplate_chain"));
+		CustomArmorTextureCreator.registerTexture(new ResourceLocation(Reference.MOD_ID, "armor/breastplate/_breastplate_plate"));
+		CustomArmorTextureCreator.registerTexture(new ResourceLocation(Reference.MOD_ID, "armor/breastplate/_breastplate_smallplate"));
+		CustomArmorTextureCreator.registerTexture(new ResourceLocation(Reference.MOD_ID, "armor/breastplate/_breastplate_trim"));
+		
 		regArmor(grieves, "grieves", event);
 		regArmor(sabatons, "sabatons", event);
-	
-//		CustomTextureCreator.registerTexture(new ResourceLocation("tinkersdefense", "items/battleaxe/_halbard_accessory"));
 
-		CustomTextureCreator.registerTexture(new ResourceLocation("tinkersdefense", "armor/helm/_helm_chain"));
-		CustomTextureCreator.registerTexture(new ResourceLocation("tinkersdefense", "armor/helm/_helm_plate"));
-		CustomTextureCreator.registerTexture(new ResourceLocation("tinkersdefense", "armor/helm/_helm_top"));
-		CustomTextureCreator.registerTexture(new ResourceLocation("tinkersdefense", "armor/helm/_helm_visor"));
-//		
-		regTool(sheathe, "sheathe", event);
-		regTool(ring, "ring", event);
-		regTool(amulet, "amulet", event);
+		// CustomTextureCreator.registerTexture(new
+		// ResourceLocation("tinkersdefense",
+		// "items/battleaxe/_halbard_accessory"));
+
 		
+		//
+		regTool(sheathe, "sheathe", event);
+//		regTool(ring, "ring", event);
+//		regTool(amulet, "amulet", event);
+
 		final IForgeRegistry registry = event.getRegistry();
-		for (Item i : itemList) {
+		for (Item i : itemList)
+		{
 			registry.register(i);
 		}
+		
+		registry.register(stationItem);
 	}
 
-	private static void regTool(ToolCore tool, String name, RegistryEvent.Register<Item> event) {
-		tool.setRegistryName(new ResourceLocation("tinkersdefense:" + name));
+	public void registerBlocks(final RegistryEvent.Register<Block> event)
+	{
+		IForgeRegistry<Block> registry = event.getRegistry();
+
+		station = new ArmorStationBlock();
+		
+		registry.register(station);
+
+		GameRegistry.registerTileEntity(ArmorStationTile.class, "armorstationtile");
+
+	}
+
+	private static void regTool(ToolCore tool, String name, RegistryEvent.Register<Item> event)
+	{
+		tool.setRegistryName(new ResourceLocation(Reference.MOD_ID,name));
 		event.getRegistry().register(tool);
 		TinkerRegistry.registerTool(tool);
 		TinkersDefense.proxy.registerToolModel(tool);
-		//itemList.add(tool);
-	} 
+		tools.add(tool);
+	}
 
-	private static void regArmor(ArmorCore armor, String name, RegistryEvent.Register<Item> event) {
-		armor.setRegistryName(new ResourceLocation("tinkersdefense:" + name));
+	private static void regArmor(ArmorCore armor, String name, RegistryEvent.Register<Item> event)
+	{
+		armor.setRegistryName(new ResourceLocation(Reference.MOD_ID,name));
 		event.getRegistry().register(armor);
 		TDRegistry.registerTool(armor);
 		TinkersDefense.proxy.registerArmorModel(armor);
-		//itemList.add(tool);
-	} 
-	
-	private void registerModifiers() {
+		armors.add(armor); 
+	}
+
+	private void registerModifiers()
+	{
 
 	}
 
 	// INITIALIZATION
 	@Subscribe
-	public void init(FMLInitializationEvent event) {
+	public void init(FMLInitializationEvent event)
+	{
 		// register items
-				
 
-				// register blocks
+		// register blocks
 
-				// register entities
+		// register entities
 
-				// proxy.preInit();
+		// proxy.preInit();
 		regToolBuilding();
 		regRecipies();
 
 		// proxy.init();
+		
+		TinkerNetwork.instance.registerPacket(ArmorStationSelectionPacket.class);
 	}
 
-	private void regToolBuilding() {
+	private void regToolBuilding()
+	{
 		TinkerRegistry.registerToolCrafting(roundshield);
 		TinkerRegistry.registerToolForgeCrafting(heatershield);
 		TinkerRegistry.registerToolForgeCrafting(towershield);
@@ -209,28 +273,29 @@ public class TDTools {
 		TDRegistry.registerArmorCrafting(shawl);
 		TDRegistry.registerArmorCrafting(robe);
 		TDRegistry.registerArmorCrafting(shoes);
-		
-		//TinkerRegistry.registerToolCrafting(boots);
-		
-		TDRegistry.registerArmorForgeCrafting(helm);
+
+		// TinkerRegistry.registerToolCrafting(boots);
+
+		TDRegistry.registerArmorCrafting(helm);
 		TDRegistry.registerArmorForgeCrafting(breastplate);
 		TDRegistry.registerArmorForgeCrafting(grieves);
 		TDRegistry.registerArmorForgeCrafting(sabatons);
-		
+
 		TinkerRegistry.registerToolCrafting(sheathe);
-		TinkerRegistry.registerToolCrafting(ring);
-		TinkerRegistry.registerToolCrafting(amulet);
+//		TinkerRegistry.registerToolCrafting(ring);
+//		TinkerRegistry.registerToolCrafting(amulet);
 	}
 
-	private void regRecipies() {
+	private void regRecipies()
+	{
 
 	}
 
 	// POST-INITIALIZATION
 	@Subscribe
-	public void postInit(FMLPostInitializationEvent event) {
+	public void postInit(FMLPostInitializationEvent event)
+	{
 		// proxy.postInit();
-		
 
 		MinecraftForge.EVENT_BUS.register(events);
 
diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersHood.java b/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersHood.java
index 482055b..a5f576a 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersHood.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersHood.java
@@ -1,15 +1,18 @@
 package lance5057.tDefense.core.tools.armor.cloth;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import lance5057.tDefense.core.materials.ArmorMaterialStats.ClothMaterialStats;
-import lance5057.tDefense.core.materials.ArmorMaterialStats.HelmMaterialStats;
+import lance5057.tDefense.core.library.ArmorNBT;
+import lance5057.tDefense.core.library.ArmorTags;
+import lance5057.tDefense.core.library.ArmorTextureBuilder;
+import lance5057.tDefense.core.materials.stats.ArmorMaterialStats;
+import lance5057.tDefense.core.materials.stats.FabricMaterialStats;
 import lance5057.tDefense.core.parts.TDParts;
-import lance5057.tDefense.core.tools.armor.renderers.ArmorRenderer;
 import lance5057.tDefense.core.tools.armor.renderers.cloth.ModelTinkersHood;
 import lance5057.tDefense.core.tools.bases.ArmorCore;
-import lance5057.tDefense.util.ArmorNBT;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.model.ModelBiped;
+import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -17,83 +20,131 @@ import net.minecraft.inventory.EntityEquipmentSlot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.DamageSource;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
+import slimeknights.tconstruct.library.materials.ExtraMaterialStats;
 import slimeknights.tconstruct.library.materials.Material;
+import slimeknights.tconstruct.library.materials.MaterialTypes;
 import slimeknights.tconstruct.library.tinkering.PartMaterialType;
+import slimeknights.tconstruct.library.utils.TagUtil;
 
-public class TinkersHood extends ArmorCore {
+public class TinkersHood extends ArmorCore
+{
 	int induceDamage = 0;
 
-	public TinkersHood() {
-		super(EntityEquipmentSlot.HEAD, new PartMaterialType(TDParts.cloth, ClothMaterialStats.TYPE),
-				new PartMaterialType(TDParts.cloth, ClothMaterialStats.TYPE), PartMaterialType.extra(TDParts.rivets));
+	public TinkersHood()
+	{
+		super(EntityEquipmentSlot.HEAD, new PartMaterialType(TDParts.fabric, FabricMaterialStats.TYPE), new PartMaterialType(TDParts.fabric, FabricMaterialStats.TYPE), PartMaterialType
+				.extra(TDParts.rivets));
 		setUnlocalizedName("tinkerhood");
 	}
 
 	@Override
-	public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5) {
+	public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5)
+	{
 		super.onUpdate(stack, world, entity, par4, par5);
 
 	}
 
 	@SideOnly(Side.CLIENT)
 	@Override
-	public List<String> getArmorTexture(ItemStack stack) {
-		List<String> textures = new ArrayList();
-		textures.add("textures/armor/hood/_hood_cloth.png");
-		textures.add("textures/armor/hood/_hood_trim.png");
-		textures.add("textures/armor/hood/_hood_metal.png");
+	public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, EntityEquipmentSlot armorSlot, ModelBiped _default)
+	{
+		return new ModelTinkersHood(itemStack);
+	}
 
-		return textures;
+	@Override
+	public NBTTagCompound buildTag(List<Material> materials)
+	{
+		ArmorNBT data = buildDefaultTag(materials);
+		return data.get();
 	}
 
-	@SideOnly(Side.CLIENT)
 	@Override
-	public ArmorRenderer getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack) {
-		return new ModelTinkersHood(itemStack);
+	public EntityEquipmentSlot getArmorSlot(ItemStack stack, EntityEquipmentSlot armorType)
+	{
+		return EntityEquipmentSlot.HEAD;
 	}
 
 	@Override
-	public NBTTagCompound buildTag(List<Material> materials) {
-		ArmorNBT data = buildDefaultArmorTag(materials, HelmMaterialStats.TYPE);
-		return data.get();
+	protected ArmorNBT buildDefaultTag(List<Material> materials)
+	{
+		ArmorNBT data = new ArmorNBT();
+
+		if (materials.size() >= 2)
+		{
+			ArmorMaterialStats handle = materials.get(0).getStatsOrUnknown(FabricMaterialStats.TYPE);
+			ArmorMaterialStats head = materials.get(1).getStatsOrUnknown(FabricMaterialStats.TYPE);
+			// start with head
+			data.head(head, handle);
+
+			// add in accessoires if present
+			if (materials.size() >= 3)
+			{
+				ExtraMaterialStats binding = materials.get(2).getStatsOrUnknown(MaterialTypes.EXTRA);
+				data.extra(binding);
+			}
+
+			// calculate handle impact
+			// data.head(handle);
+		}
+
+		// 3 free modifiers
+		data.modifiers = DEFAULT_MODIFIERS;
+
+		return data;
 	}
 
 	@Override
-	public EntityEquipmentSlot getArmorSlot(ItemStack stack, EntityEquipmentSlot armorType) {
-		return EntityEquipmentSlot.HEAD;
+	@SideOnly(Side.CLIENT)
+	public NBTTagCompound setupTexture(List<Material> materials)
+	{
+		NBTTagCompound base = new NBTTagCompound();
+
+		ResourceLocation rc = ArmorTextureBuilder.createArmorTexture("hood", new String[] { "cloth", "trim", "metal" }, materials);
+
+		if (rc != null)
+		{
+			base.setString(ArmorTags.TexLoc, rc.toString());
+			return base;
+		}
+		return null;
 	}
 
 	@Override
-	public void getTooltipDetailed(ItemStack stack, List<String> tooltips) {
+	public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot)
+	{
 		// TODO Auto-generated method stub
-		
+		return null;
 	}
 
 	@Override
-	public void getTooltipComponents(ItemStack stack, List<String> tooltips) {
+	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot)
+	{
 		// TODO Auto-generated method stub
-		
+		return 0;
 	}
 
 	@Override
-	public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage,
-			int slot) {
+	public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot)
+	{
 		// TODO Auto-generated method stub
-		return null;
+
 	}
 
 	@Override
-	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) {
+	public float damagePotential()
+	{
 		// TODO Auto-generated method stub
 		return 0;
 	}
 
 	@Override
-	public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {
+	public double attackSpeed()
+	{
 		// TODO Auto-generated method stub
-		
+		return 0;
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersRobe.java b/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersRobe.java
index 6703fd6..37e9b6e 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersRobe.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersRobe.java
@@ -3,25 +3,35 @@ package lance5057.tDefense.core.tools.armor.cloth;
 import java.util.ArrayList;
 import java.util.List;
 
-import lance5057.tDefense.core.materials.ArmorMaterialStats.ClothMaterialStats;
-import lance5057.tDefense.core.materials.ArmorMaterialStats.LegsMaterialStats;
+import lance5057.tDefense.core.library.ArmorNBT;
+import lance5057.tDefense.core.library.ArmorTags;
+import lance5057.tDefense.core.library.ArmorTextureBuilder;
+import lance5057.tDefense.core.materials.stats.ArmorMaterialStats;
+import lance5057.tDefense.core.materials.stats.FabricMaterialStats;
+import lance5057.tDefense.core.materials.stats.LegsMaterialStats;
 import lance5057.tDefense.core.parts.TDParts;
 import lance5057.tDefense.core.tools.armor.renderers.ArmorRenderer;
 import lance5057.tDefense.core.tools.armor.renderers.cloth.ModelTinkersRobe;
 import lance5057.tDefense.core.tools.bases.ArmorCore;
-import lance5057.tDefense.util.ArmorNBT;
+import net.minecraft.client.model.ModelBiped;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.EntityEquipmentSlot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
 import net.minecraft.util.DamageSource;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
+import net.minecraftforge.common.ISpecialArmor.ArmorProperties;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
+import slimeknights.tconstruct.library.materials.ExtraMaterialStats;
 import slimeknights.tconstruct.library.materials.Material;
+import slimeknights.tconstruct.library.materials.MaterialTypes;
 import slimeknights.tconstruct.library.tinkering.PartMaterialType;
+import slimeknights.tconstruct.library.utils.TagUtil;
 
 public class TinkersRobe extends ArmorCore
 {
@@ -30,11 +40,13 @@ public class TinkersRobe extends ArmorCore
 
 	public TinkersRobe()
 	{
-	    super(EntityEquipmentSlot.CHEST,new PartMaterialType(TDParts.cloth, ClothMaterialStats.TYPE),
-	    	new PartMaterialType(TDParts.cloth, ClothMaterialStats.TYPE),
+	    super(EntityEquipmentSlot.LEGS,new PartMaterialType(TDParts.fabric, FabricMaterialStats.TYPE),
+	    	new PartMaterialType(TDParts.fabric, FabricMaterialStats.TYPE),
 	    	PartMaterialType.extra(TDParts.clasp));
 		setUnlocalizedName("tinkerrobe");
 	}
+	
+	
 
 	@Override
 	public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5)
@@ -43,27 +55,32 @@ public class TinkersRobe extends ArmorCore
 
 	}
 
-	@SideOnly(Side.CLIENT)
 	@Override
-	public List<String> getArmorTexture(ItemStack stack) {
-		List<String> textures = new ArrayList();
-		textures.add("textures/armor/robe/_robe_cloth.png");
-		textures.add("textures/armor/robe/_robe_trim.png");
-		textures.add("textures/armor/robe/_robe_metal.png");
+	@SideOnly(Side.CLIENT)
+	public NBTTagCompound setupTexture(List<Material> materials)
+	{
+		NBTTagCompound base = new NBTTagCompound();
 
-		return textures;
-	}
+		ResourceLocation rc = ArmorTextureBuilder.createArmorTexture("robe", new String[] { "cloth", "trim", "metal" }, materials);
 
+		if (rc != null)
+		{
+			base.setString(ArmorTags.TexLoc, rc.toString());
+			return base;
+		}
+		return null;
+	}
+	
 	@SideOnly(Side.CLIENT)
 	@Override
-	public ArmorRenderer getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack)
+	public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, EntityEquipmentSlot armorSlot, ModelBiped _default)
 	{
 		return new ModelTinkersRobe(itemStack);
 	}
 
 	@Override
 	public NBTTagCompound buildTag(List<Material> materials) {
-		ArmorNBT data = buildDefaultArmorTag(materials, LegsMaterialStats.TYPE);
+		ArmorNBT data = buildDefaultTag(materials);
 	    return data.get();
 	}
 	
@@ -71,35 +88,68 @@ public class TinkersRobe extends ArmorCore
 	public EntityEquipmentSlot getArmorSlot(ItemStack stack, EntityEquipmentSlot armorType) {
 		return EntityEquipmentSlot.LEGS;
 	}
+	
+	@Override
+	protected ArmorNBT buildDefaultTag(List<Material> materials)
+	{
+		ArmorNBT data = new ArmorNBT();
+
+		if (materials.size() >= 2)
+		{
+			ArmorMaterialStats handle = materials.get(0).getStatsOrUnknown(FabricMaterialStats.TYPE);
+			ArmorMaterialStats head = materials.get(1).getStatsOrUnknown(FabricMaterialStats.TYPE);
+			// start with head
+			data.head(head, handle);
+
+			// add in accessoires if present
+			if (materials.size() >= 3)
+			{
+				ExtraMaterialStats binding = materials.get(2).getStatsOrUnknown(MaterialTypes.EXTRA);
+				data.extra(binding);
+			}
+
+			// calculate handle impact
+			//data.head(handle);
+		}
+
+		// 3 free modifiers
+		data.modifiers = DEFAULT_MODIFIERS;
+
+		return data;
+	}
 
 	@Override
-	public void getTooltipDetailed(ItemStack stack, List<String> tooltips) {
+	public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot)
+	{
 		// TODO Auto-generated method stub
-		
+		return null;
 	}
 
 	@Override
-	public void getTooltipComponents(ItemStack stack, List<String> tooltips) {
+	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot)
+	{
 		// TODO Auto-generated method stub
-		
+		return 0;
 	}
 
 	@Override
-	public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage,
-			int slot) {
+	public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot)
+	{
 		// TODO Auto-generated method stub
-		return null;
+		
 	}
 
 	@Override
-	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) {
+	public float damagePotential()
+	{
 		// TODO Auto-generated method stub
 		return 0;
 	}
 
 	@Override
-	public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {
+	public double attackSpeed()
+	{
 		// TODO Auto-generated method stub
-		
+		return 0;
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersShawl.java b/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersShawl.java
index 825d5e4..eb1e1b6 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersShawl.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersShawl.java
@@ -3,13 +3,16 @@ package lance5057.tDefense.core.tools.armor.cloth;
 import java.util.ArrayList;
 import java.util.List;
 
-import lance5057.tDefense.core.materials.ArmorMaterialStats.ChestMaterialStats;
-import lance5057.tDefense.core.materials.ArmorMaterialStats.ClothMaterialStats;
+import lance5057.tDefense.core.library.ArmorNBT;
+import lance5057.tDefense.core.library.ArmorTags;
+import lance5057.tDefense.core.library.ArmorTextureBuilder;
+import lance5057.tDefense.core.materials.stats.ArmorMaterialStats;
+import lance5057.tDefense.core.materials.stats.ChestMaterialStats;
+import lance5057.tDefense.core.materials.stats.FabricMaterialStats;
 import lance5057.tDefense.core.parts.TDParts;
 import lance5057.tDefense.core.tools.armor.renderers.ArmorRenderer;
 import lance5057.tDefense.core.tools.armor.renderers.cloth.ModelTinkersShawl;
 import lance5057.tDefense.core.tools.bases.ArmorCore;
-import lance5057.tDefense.util.ArmorNBT;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -17,12 +20,18 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.EntityEquipmentSlot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
 import net.minecraft.util.DamageSource;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
+import net.minecraftforge.common.ISpecialArmor.ArmorProperties;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
+import slimeknights.tconstruct.library.materials.ExtraMaterialStats;
 import slimeknights.tconstruct.library.materials.Material;
+import slimeknights.tconstruct.library.materials.MaterialTypes;
 import slimeknights.tconstruct.library.tinkering.PartMaterialType;
+import slimeknights.tconstruct.library.utils.TagUtil;
 
 public class TinkersShawl extends ArmorCore
 {
@@ -30,7 +39,7 @@ public class TinkersShawl extends ArmorCore
 
 	public TinkersShawl()
 	{
-		super(EntityEquipmentSlot.LEGS,new PartMaterialType(TDParts.cloth, ClothMaterialStats.TYPE), new PartMaterialType(TDParts.cloth, ClothMaterialStats.TYPE), PartMaterialType.extra(TDParts.armorPlate));
+		super(EntityEquipmentSlot.CHEST,new PartMaterialType(TDParts.fabric, FabricMaterialStats.TYPE), new PartMaterialType(TDParts.fabric, FabricMaterialStats.TYPE), PartMaterialType.extra(TDParts.armorPlate));
 		setUnlocalizedName("tinkershawl");
 	}
 
@@ -41,27 +50,32 @@ public class TinkersShawl extends ArmorCore
 
 	}
 
-	@SideOnly(Side.CLIENT)
 	@Override
-	public List<String> getArmorTexture(ItemStack stack) {
-		List<String> textures = new ArrayList();
-		textures.add("textures/armor/shawl/_shawl_cloth.png");
-		textures.add("textures/armor/shawl/_shawl_trim.png");
-		textures.add("textures/armor/shawl/_shawl_metal.png");
+	@SideOnly(Side.CLIENT)
+	public NBTTagCompound setupTexture(List<Material> materials)
+	{
+		NBTTagCompound base = new NBTTagCompound();
+
+		ResourceLocation rc = ArmorTextureBuilder.createArmorTexture("shawl", new String[] { "cloth", "trim", "metal" }, materials);
 
-		return textures;
+		if (rc != null)
+		{
+			base.setString(ArmorTags.TexLoc, rc.toString());
+			return base;
+		}
+		return null;
 	}
 
 	@SideOnly(Side.CLIENT)
 	@Override
-	public ArmorRenderer getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack)
+	public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, EntityEquipmentSlot armorSlot, ModelBiped _default)
 	{
 		return new ModelTinkersShawl(itemStack);
 	}
 
 	@Override
 	public NBTTagCompound buildTag(List<Material> materials) {
-		ArmorNBT data = buildDefaultArmorTag(materials, ChestMaterialStats.TYPE);
+		ArmorNBT data = buildDefaultTag(materials);
 	    return data.get();
 	}
 	
@@ -71,33 +85,64 @@ public class TinkersShawl extends ArmorCore
 	}
 
 	@Override
-	public void getTooltipDetailed(ItemStack stack, List<String> tooltips) {
+	public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage,
+			int slot) {
 		// TODO Auto-generated method stub
-		
+		return null;
 	}
 
 	@Override
-	public void getTooltipComponents(ItemStack stack, List<String> tooltips) {
+	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) {
 		// TODO Auto-generated method stub
-		
+		return 0;
 	}
 
 	@Override
-	public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage,
-			int slot) {
+	public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {
 		// TODO Auto-generated method stub
-		return null;
+		
 	}
 
 	@Override
-	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) {
+	public float damagePotential()
+	{
 		// TODO Auto-generated method stub
 		return 0;
 	}
 
 	@Override
-	public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {
+	public double attackSpeed()
+	{
 		// TODO Auto-generated method stub
-		
+		return 0;
+	}
+	
+	@Override
+	protected ArmorNBT buildDefaultTag(List<Material> materials)
+	{
+		ArmorNBT data = new ArmorNBT();
+
+		if (materials.size() >= 2)
+		{
+			ArmorMaterialStats handle = materials.get(0).getStatsOrUnknown(FabricMaterialStats.TYPE);
+			ArmorMaterialStats head = materials.get(1).getStatsOrUnknown(FabricMaterialStats.TYPE);
+			// start with head
+			data.head(head, handle);
+
+			// add in accessoires if present
+			if (materials.size() >= 3)
+			{
+				ExtraMaterialStats binding = materials.get(2).getStatsOrUnknown(MaterialTypes.EXTRA);
+				data.extra(binding);
+			}
+
+			// calculate handle impact
+			//data.head(handle);
+		}
+
+		// 3 free modifiers
+		data.modifiers = DEFAULT_MODIFIERS;
+
+		return data;
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersShoes.java b/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersShoes.java
index c7c8606..0c3c85d 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersShoes.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/cloth/TinkersShoes.java
@@ -1,15 +1,16 @@
 package lance5057.tDefense.core.tools.armor.cloth;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import lance5057.tDefense.core.materials.ArmorMaterialStats.ClothMaterialStats;
-import lance5057.tDefense.core.materials.ArmorMaterialStats.FeetMaterialStats;
+import lance5057.tDefense.core.library.ArmorNBT;
+import lance5057.tDefense.core.library.ArmorTags;
+import lance5057.tDefense.core.library.ArmorTextureBuilder;
+import lance5057.tDefense.core.materials.stats.ArmorMaterialStats;
+import lance5057.tDefense.core.materials.stats.FabricMaterialStats;
 import lance5057.tDefense.core.parts.TDParts;
 import lance5057.tDefense.core.tools.armor.renderers.ArmorRenderer;
 import lance5057.tDefense.core.tools.armor.renderers.cloth.ModelTinkersShoes;
 import lance5057.tDefense.core.tools.bases.ArmorCore;
-import lance5057.tDefense.util.ArmorNBT;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -17,12 +18,17 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.EntityEquipmentSlot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
 import net.minecraft.util.DamageSource;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
+import slimeknights.tconstruct.library.materials.ExtraMaterialStats;
 import slimeknights.tconstruct.library.materials.Material;
+import slimeknights.tconstruct.library.materials.MaterialTypes;
 import slimeknights.tconstruct.library.tinkering.PartMaterialType;
+import slimeknights.tconstruct.library.utils.TagUtil;
 import slimeknights.tconstruct.tools.TinkerTools;
 
 public class TinkersShoes extends ArmorCore
@@ -32,9 +38,9 @@ public class TinkersShoes extends ArmorCore
 
 	public TinkersShoes()
 	{
-	    super(EntityEquipmentSlot.FEET,new PartMaterialType(TDParts.cloth, ClothMaterialStats.TYPE),
+	    super(EntityEquipmentSlot.FEET,new PartMaterialType(TDParts.fabric, FabricMaterialStats.TYPE),
 	    	PartMaterialType.extra(TDParts.rivets),
-	    	new PartMaterialType(TDParts.cloth, ClothMaterialStats.TYPE),
+	    	new PartMaterialType(TDParts.fabric, FabricMaterialStats.TYPE),
 	    	PartMaterialType.bowstring(TinkerTools.bowString));
 		setUnlocalizedName("tinkershoes");
 	}
@@ -46,27 +52,32 @@ public class TinkersShoes extends ArmorCore
 
 	}
 
-	@SideOnly(Side.CLIENT)
 	@Override
-	public List<String> getArmorTexture(ItemStack stack) {
-		List<String> textures = new ArrayList();
-		textures.add("textures/armor/shoes/_shoes_cloth.png");
-		textures.add("textures/armor/shoes/_shoes_trim.png");
-		textures.add("textures/armor/shoes/_shoes_metal.png");
+	@SideOnly(Side.CLIENT)
+	public NBTTagCompound setupTexture(List<Material> materials)
+	{
+		NBTTagCompound base = new NBTTagCompound();
+
+		ResourceLocation rc = ArmorTextureBuilder.createArmorTexture("shoes", new String[] { "cloth", "trim", "metal", "string" }, materials);
 
-		return textures;
+		if (rc != null)
+		{
+			base.setString(ArmorTags.TexLoc, rc.toString());
+			return base;
+		}
+		return null;
 	}
 
 	@SideOnly(Side.CLIENT)
 	@Override
-	public ArmorRenderer getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack)
+	public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, EntityEquipmentSlot armorSlot, ModelBiped _default)
 	{
 		return new ModelTinkersShoes(itemStack);
 	}
 
 	@Override
 	public NBTTagCompound buildTag(List<Material> materials) {
-		ArmorNBT data = buildDefaultArmorTag(materials, FeetMaterialStats.TYPE);
+		ArmorNBT data = buildDefaultTag(materials);
 	    return data.get();
 	}
 	
@@ -76,33 +87,64 @@ public class TinkersShoes extends ArmorCore
 	}
 
 	@Override
-	public void getTooltipDetailed(ItemStack stack, List<String> tooltips) {
+	public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage,
+			int slot) {
 		// TODO Auto-generated method stub
-		
+		return null;
 	}
 
 	@Override
-	public void getTooltipComponents(ItemStack stack, List<String> tooltips) {
+	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) {
 		// TODO Auto-generated method stub
-		
+		return 0;
 	}
 
 	@Override
-	public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage,
-			int slot) {
+	public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {
 		// TODO Auto-generated method stub
-		return null;
+		
 	}
 
 	@Override
-	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) {
+	public float damagePotential()
+	{
 		// TODO Auto-generated method stub
 		return 0;
 	}
 
 	@Override
-	public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {
+	public double attackSpeed()
+	{
 		// TODO Auto-generated method stub
-		
+		return 0;
+	}
+	
+	@Override
+	protected ArmorNBT buildDefaultTag(List<Material> materials)
+	{
+		ArmorNBT data = new ArmorNBT();
+
+		if (materials.size() >= 2)
+		{
+			ArmorMaterialStats handle = materials.get(0).getStatsOrUnknown(FabricMaterialStats.TYPE);
+			ArmorMaterialStats head = materials.get(1).getStatsOrUnknown(FabricMaterialStats.TYPE);
+			// start with head
+			data.head(head, handle);
+
+			// add in accessoires if present
+			if (materials.size() >= 3)
+			{
+				ExtraMaterialStats binding = materials.get(2).getStatsOrUnknown(MaterialTypes.EXTRA);
+				data.extra(binding);
+			}
+
+			// calculate handle impact
+			//data.head(handle);
+		}
+
+		// 3 free modifiers
+		data.modifiers = DEFAULT_MODIFIERS;
+
+		return data;
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersBreastplate.java b/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersBreastplate.java
index a7df0f0..b64d130 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersBreastplate.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersBreastplate.java
@@ -1,91 +1,132 @@
 package lance5057.tDefense.core.tools.armor.heavy;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import lance5057.tDefense.core.materials.ArmorMaterialStats.ChestMaterialStats;
+import lance5057.tDefense.core.library.ArmorNBT;
+import lance5057.tDefense.core.materials.stats.ArmorMaterialStats;
+import lance5057.tDefense.core.materials.stats.ChestMaterialStats;
+import lance5057.tDefense.core.materials.stats.FabricMaterialStats;
 import lance5057.tDefense.core.parts.TDParts;
-import lance5057.tDefense.core.tools.armor.renderers.ArmorRenderer;
 import lance5057.tDefense.core.tools.armor.renderers.heavy.ModelTinkersBreastplate;
 import lance5057.tDefense.core.tools.bases.ArmorCore;
-import lance5057.tDefense.util.ArmorNBT;
 import net.minecraft.client.model.ModelBiped;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.EntityEquipmentSlot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
 import net.minecraft.util.DamageSource;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
+import slimeknights.tconstruct.library.materials.ExtraMaterialStats;
 import slimeknights.tconstruct.library.materials.Material;
+import slimeknights.tconstruct.library.materials.MaterialTypes;
 import slimeknights.tconstruct.library.tinkering.PartMaterialType;
+import slimeknights.tconstruct.library.utils.TagUtil;
 import slimeknights.tconstruct.tools.TinkerTools;
 
-public class TinkersBreastplate extends ArmorCore {
-	public TinkersBreastplate() {
-		super(EntityEquipmentSlot.CHEST, new PartMaterialType(TinkerTools.largePlate, ChestMaterialStats.TYPE),
-				new PartMaterialType(TDParts.armorPlate, ChestMaterialStats.TYPE),
-				PartMaterialType.handle(TDParts.filigree), PartMaterialType.extra(TDParts.chainmail));
+public class TinkersBreastplate extends ArmorCore
+{
+	public TinkersBreastplate()
+	{
+		super(EntityEquipmentSlot.CHEST, new PartMaterialType(TinkerTools.largePlate, ChestMaterialStats.TYPE), new PartMaterialType(TDParts.armorPlate, ChestMaterialStats.TYPE), PartMaterialType
+				.handle(TDParts.filigree), PartMaterialType.extra(TDParts.chainmail));
 		setUnlocalizedName("tinkersbreastplate");
 	}
 
 	@SideOnly(Side.CLIENT)
 	@Override
-	public List<String> getArmorTexture(ItemStack stack) {
-		List<String> textures = new ArrayList();
-		textures.add("textures/armor/breastplate/_breastplate_plate.png");
-		textures.add("textures/armor/breastplate/_breastplate_smallplate.png");
-		textures.add("textures/armor/breastplate/_breastplate_trim.png");
-		textures.add("textures/armor/breastplate/_breastplate_chain.png");
-		return textures;
+	public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type)
+	{
+		String texture;
+		NBTTagList t = TagUtil.getBaseMaterialsTagList(stack);
+		texture = "textures/armor/breastplate/_breastplate_plate_" + t.getStringTagAt(0);
+		return texture;
 	}
 
 	@SideOnly(Side.CLIENT)
 	@Override
-	public ArmorRenderer getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack) {
+	public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, EntityEquipmentSlot armorSlot, ModelBiped _default)
+	{
 		return new ModelTinkersBreastplate(itemStack);
 	}
 
 	@Override
-	public NBTTagCompound buildTag(List<Material> materials) {
-		ArmorNBT data = buildDefaultArmorTag(materials, ChestMaterialStats.TYPE);
+	public NBTTagCompound buildTag(List<Material> materials)
+	{
+		ArmorNBT data = buildDefaultTag(materials);
 		return data.get();
 	}
 
 	@Override
-	public EntityEquipmentSlot getArmorSlot(ItemStack stack, EntityEquipmentSlot armorType) {
+	public EntityEquipmentSlot getArmorSlot(ItemStack stack, EntityEquipmentSlot armorType)
+	{
 		return EntityEquipmentSlot.CHEST;
 	}
 
 	@Override
-	public void getTooltipDetailed(ItemStack stack, List<String> tooltips) {
+	public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot)
+	{
 		// TODO Auto-generated method stub
-		
+		return null;
 	}
 
 	@Override
-	public void getTooltipComponents(ItemStack stack, List<String> tooltips) {
+	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot)
+	{
 		// TODO Auto-generated method stub
-		
+		return 0;
 	}
 
 	@Override
-	public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage,
-			int slot) {
+	public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot)
+	{
 		// TODO Auto-generated method stub
-		return null;
+
 	}
 
 	@Override
-	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) {
+	public float damagePotential()
+	{
 		// TODO Auto-generated method stub
 		return 0;
 	}
 
 	@Override
-	public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {
+	public double attackSpeed()
+	{
 		// TODO Auto-generated method stub
-		
+		return 0;
+	}
+
+	@Override
+	protected ArmorNBT buildDefaultTag(List<Material> materials)
+	{
+		ArmorNBT data = new ArmorNBT();
+
+		if (materials.size() >= 2)
+		{
+			ArmorMaterialStats handle = materials.get(0).getStatsOrUnknown(FabricMaterialStats.TYPE);
+			ArmorMaterialStats head = materials.get(1).getStatsOrUnknown(FabricMaterialStats.TYPE);
+			// start with head
+			data.head(head);
+
+			// add in accessoires if present
+			if (materials.size() >= 3)
+			{
+				ExtraMaterialStats binding = materials.get(2).getStatsOrUnknown(MaterialTypes.EXTRA);
+				data.extra(binding);
+			}
+
+			// calculate handle impact
+			data.head(handle);
+		}
+
+		// 3 free modifiers
+		data.modifiers = DEFAULT_MODIFIERS;
+
+		return data;
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersGrieves.java b/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersGrieves.java
index ccefbf7..88047a1 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersGrieves.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersGrieves.java
@@ -1,26 +1,31 @@
 package lance5057.tDefense.core.tools.armor.heavy;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import lance5057.tDefense.core.materials.ArmorMaterialStats.ClothMaterialStats;
-import lance5057.tDefense.core.materials.ArmorMaterialStats.LegsMaterialStats;
+import lance5057.tDefense.core.library.ArmorNBT;
+import lance5057.tDefense.core.materials.stats.ArmorMaterialStats;
+import lance5057.tDefense.core.materials.stats.FabricMaterialStats;
+import lance5057.tDefense.core.materials.stats.LegsMaterialStats;
 import lance5057.tDefense.core.parts.TDParts;
 import lance5057.tDefense.core.tools.armor.renderers.ArmorRenderer;
 import lance5057.tDefense.core.tools.armor.renderers.heavy.ModelTinkersGrieves;
 import lance5057.tDefense.core.tools.bases.ArmorCore;
-import lance5057.tDefense.util.ArmorNBT;
 import net.minecraft.client.model.ModelBiped;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.EntityEquipmentSlot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
 import net.minecraft.util.DamageSource;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
+import slimeknights.tconstruct.library.materials.ExtraMaterialStats;
 import slimeknights.tconstruct.library.materials.Material;
+import slimeknights.tconstruct.library.materials.MaterialTypes;
 import slimeknights.tconstruct.library.tinkering.PartMaterialType;
+import slimeknights.tconstruct.library.utils.TagUtil;
 
 public class TinkersGrieves extends ArmorCore
 {
@@ -29,32 +34,29 @@ public class TinkersGrieves extends ArmorCore
 		super(EntityEquipmentSlot.LEGS,new PartMaterialType(TDParts.armorPlate, LegsMaterialStats.TYPE), 
 			new PartMaterialType(TDParts.chainmail, LegsMaterialStats.TYPE),
 				PartMaterialType.handle(TDParts.filigree),
-				new PartMaterialType(TDParts.cloth, ClothMaterialStats.TYPE));
+				new PartMaterialType(TDParts.fabric, FabricMaterialStats.TYPE));
 		setUnlocalizedName("tinkersgrieves");
 	}
 
 	@SideOnly(Side.CLIENT)
 	@Override
-	public List<String> getArmorTexture(ItemStack stack)
-	{
-		List<String> textures = new ArrayList();
-		textures.add("textures/armor/grieves/_grieves_plate.png");
-		textures.add("textures/armor/grieves/_grieves_chain.png");
-		textures.add("textures/armor/grieves/_grieves_trim.png");
-		textures.add("textures/armor/grieves/_grieves_cloth.png");
-		return textures;
+	public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type) {
+		String texture;
+		NBTTagList t = TagUtil.getBaseMaterialsTagList(stack);
+		texture = "textures/armor/grieves/_grieves_plate_" + t.getStringTagAt(0);
+		return texture;
 	}
 
 	@SideOnly(Side.CLIENT)
 	@Override
-	public ArmorRenderer getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack)
+	public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, EntityEquipmentSlot armorSlot, ModelBiped _default)
 	{
 		return new ModelTinkersGrieves(itemStack);
 	}
 	
 	@Override
 	public NBTTagCompound buildTag(List<Material> materials) {
-		ArmorNBT data = buildDefaultArmorTag(materials, LegsMaterialStats.TYPE);
+		ArmorNBT data = buildDefaultTag(materials);
 	    return data.get();
 	}
 	
@@ -64,33 +66,64 @@ public class TinkersGrieves extends ArmorCore
 	}
 
 	@Override
-	public void getTooltipDetailed(ItemStack stack, List<String> tooltips) {
+	public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage,
+			int slot) {
 		// TODO Auto-generated method stub
-		
+		return null;
 	}
 
 	@Override
-	public void getTooltipComponents(ItemStack stack, List<String> tooltips) {
+	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) {
 		// TODO Auto-generated method stub
-		
+		return 0;
 	}
 
 	@Override
-	public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage,
-			int slot) {
+	public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {
 		// TODO Auto-generated method stub
-		return null;
+		
 	}
 
 	@Override
-	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) {
+	public float damagePotential()
+	{
 		// TODO Auto-generated method stub
 		return 0;
 	}
 
 	@Override
-	public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {
+	public double attackSpeed()
+	{
 		// TODO Auto-generated method stub
-		
+		return 0;
+	}
+	
+	@Override
+	protected ArmorNBT buildDefaultTag(List<Material> materials)
+	{
+		ArmorNBT data = new ArmorNBT();
+
+		if (materials.size() >= 2)
+		{
+			ArmorMaterialStats handle = materials.get(0).getStatsOrUnknown(FabricMaterialStats.TYPE);
+			ArmorMaterialStats head = materials.get(1).getStatsOrUnknown(FabricMaterialStats.TYPE);
+			// start with head
+			data.head(head);
+
+			// add in accessoires if present
+			if (materials.size() >= 3)
+			{
+				ExtraMaterialStats binding = materials.get(2).getStatsOrUnknown(MaterialTypes.EXTRA);
+				data.extra(binding);
+			}
+
+			// calculate handle impact
+			data.head(handle);
+		}
+
+		// 3 free modifiers
+		data.modifiers = DEFAULT_MODIFIERS;
+
+		return data;
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersHelm.java b/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersHelm.java
index 3b1973d..37fc148 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersHelm.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersHelm.java
@@ -3,12 +3,18 @@ package lance5057.tDefense.core.tools.armor.heavy;
 import java.util.ArrayList;
 import java.util.List;
 
-import lance5057.tDefense.core.materials.ArmorMaterialStats.HelmMaterialStats;
+import lance5057.tDefense.core.library.ArmorNBT;
+import lance5057.tDefense.core.library.ArmorTags;
+import lance5057.tDefense.core.library.ArmorTextureBuilder;
+import lance5057.tDefense.core.materials.stats.ArmorMaterialStats;
+import lance5057.tDefense.core.materials.stats.FabricMaterialStats;
+import lance5057.tDefense.core.materials.stats.HelmMaterialStats;
 import lance5057.tDefense.core.parts.TDParts;
 import lance5057.tDefense.core.tools.armor.renderers.ArmorRenderer;
 import lance5057.tDefense.core.tools.armor.renderers.heavy.ModelTinkersHelm;
 import lance5057.tDefense.core.tools.bases.ArmorCore;
-import lance5057.tDefense.util.ArmorNBT;
+import net.minecraft.client.model.ModelBiped;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.EntityEquipmentSlot;
@@ -16,42 +22,54 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.util.DamageSource;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
+import slimeknights.tconstruct.library.materials.ExtraMaterialStats;
 import slimeknights.tconstruct.library.materials.Material;
+import slimeknights.tconstruct.library.materials.MaterialTypes;
 import slimeknights.tconstruct.library.tinkering.PartMaterialType;
 import slimeknights.tconstruct.library.utils.TagUtil;
+import slimeknights.tconstruct.library.utils.TinkerUtil;
 import slimeknights.tconstruct.tools.TinkerTools;
 
-public class TinkersHelm extends ArmorCore {
+public class TinkersHelm extends ArmorCore { 
 	public TinkersHelm() {
 		super(EntityEquipmentSlot.HEAD,new PartMaterialType(TinkerTools.panHead, HelmMaterialStats.TYPE),
 				new PartMaterialType(TDParts.armorPlate, HelmMaterialStats.TYPE),
-				PartMaterialType.handle(TDParts.filigree), PartMaterialType.extra(TDParts.chainmail));
+				PartMaterialType.handle(TDParts.filigree), PartMaterialType.extra(TDParts.rivets));
 		setUnlocalizedName("tinkershelm");
 	}
+	
 
+	
 	@SideOnly(Side.CLIENT)
 	@Override
-	public List<String> getArmorTexture(ItemStack stack) {
-		List<String> textures = new ArrayList();
-		NBTTagList t = TagUtil.getBaseMaterialsTagList(stack);
-		textures.add("textures/armor/helm/_helm_top_" + t.getStringTagAt(0));
-		textures.add("textures/armor/helm/_helm_plate_" + t.getStringTagAt(1));
-		textures.add("textures/armor/helm/_helm_visor_" + t.getStringTagAt(2));
-		textures.add("textures/armor/helm/_helm_chain_" + t.getStringTagAt(3));
-		return textures;
+	public NBTTagCompound setupTexture(List<Material> materials)
+	{
+		NBTTagCompound base = new NBTTagCompound();
+
+		ResourceLocation rc = ArmorTextureBuilder.createArmorTexture("helm", new String[] { "top", "plate", "visor", "chain" }, materials);
+
+		if (rc != null)
+		{
+			base.setString(ArmorTags.TexLoc, rc.toString());
+			return base;
+		}
+		return null;
 	}
 
+
 	@SideOnly(Side.CLIENT)
 	@Override
-	public ArmorRenderer getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack) {
+	public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, EntityEquipmentSlot armorSlot, ModelBiped _default)
+	{
 		return new ModelTinkersHelm(itemStack);
 	}
 
 	@Override
 	public NBTTagCompound buildTag(List<Material> materials) {
-		ArmorNBT data = buildDefaultArmorTag(materials, HelmMaterialStats.TYPE);
+		ArmorNBT data = buildDefaultTag(materials);
 		return data.get();
 	}
 
@@ -61,33 +79,64 @@ public class TinkersHelm extends ArmorCore {
 	}
 
 	@Override
-	public void getTooltipDetailed(ItemStack stack, List<String> tooltips) {
+	public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage,
+			int slot) {
 		// TODO Auto-generated method stub
-		
+		return null;
 	}
 
 	@Override
-	public void getTooltipComponents(ItemStack stack, List<String> tooltips) {
+	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) {
 		// TODO Auto-generated method stub
-		
+		return 0;
 	}
 
 	@Override
-	public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage,
-			int slot) {
+	public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {
 		// TODO Auto-generated method stub
-		return null;
+		
 	}
 
 	@Override
-	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) {
+	public float damagePotential()
+	{
 		// TODO Auto-generated method stub
 		return 0;
 	}
 
 	@Override
-	public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {
+	public double attackSpeed()
+	{
 		// TODO Auto-generated method stub
-		
+		return 0;
+	}
+	
+	@Override
+	protected ArmorNBT buildDefaultTag(List<Material> materials)
+	{
+		ArmorNBT data = new ArmorNBT();
+
+		if (materials.size() >= 2)
+		{
+			ArmorMaterialStats handle = materials.get(0).getStatsOrUnknown(FabricMaterialStats.TYPE);
+			ArmorMaterialStats head = materials.get(1).getStatsOrUnknown(FabricMaterialStats.TYPE);
+			// start with head
+			data.head(head);
+
+			// add in accessoires if present
+			if (materials.size() >= 3)
+			{
+				ExtraMaterialStats binding = materials.get(2).getStatsOrUnknown(MaterialTypes.EXTRA);
+				data.extra(binding);
+			}
+
+			// calculate handle impact
+			data.head(handle);
+		}
+
+		// 3 free modifiers
+		data.modifiers = DEFAULT_MODIFIERS;
+
+		return data;
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersSabatons.java b/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersSabatons.java
index 7172492..331dda6 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersSabatons.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/heavy/TinkersSabatons.java
@@ -1,56 +1,60 @@
 package lance5057.tDefense.core.tools.armor.heavy;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import lance5057.tDefense.core.materials.ArmorMaterialStats.ClothMaterialStats;
-import lance5057.tDefense.core.materials.ArmorMaterialStats.FeetMaterialStats;
+import lance5057.tDefense.core.library.ArmorNBT;
+import lance5057.tDefense.core.materials.stats.ArmorMaterialStats;
+import lance5057.tDefense.core.materials.stats.FabricMaterialStats;
+import lance5057.tDefense.core.materials.stats.FeetMaterialStats;
 import lance5057.tDefense.core.parts.TDParts;
 import lance5057.tDefense.core.tools.armor.renderers.ArmorRenderer;
 import lance5057.tDefense.core.tools.armor.renderers.heavy.ModelTinkersSabatons;
 import lance5057.tDefense.core.tools.bases.ArmorCore;
-import lance5057.tDefense.util.ArmorNBT;
 import net.minecraft.client.model.ModelBiped;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.EntityEquipmentSlot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
 import net.minecraft.util.DamageSource;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
+import slimeknights.tconstruct.library.materials.ExtraMaterialStats;
 import slimeknights.tconstruct.library.materials.Material;
+import slimeknights.tconstruct.library.materials.MaterialTypes;
 import slimeknights.tconstruct.library.tinkering.PartMaterialType;
+import slimeknights.tconstruct.library.utils.TagUtil;
 
 public class TinkersSabatons extends ArmorCore {
 	public TinkersSabatons() {
 		super(EntityEquipmentSlot.FEET,new PartMaterialType(TDParts.armorPlate, FeetMaterialStats.TYPE),
 				new PartMaterialType(TDParts.armorPlate, FeetMaterialStats.TYPE),
 				PartMaterialType.handle(TDParts.filigree),
-				new PartMaterialType(TDParts.cloth, ClothMaterialStats.TYPE));
+				new PartMaterialType(TDParts.fabric, FabricMaterialStats.TYPE));
 		setUnlocalizedName("tinkerssabatons");
 	}
 
 	@SideOnly(Side.CLIENT)
 	@Override
-	public List<String> getArmorTexture(ItemStack stack) {
-		List<String> textures = new ArrayList();
-		textures.add("textures/armor/sabatons/_sabatons_plates.png");
-		textures.add("textures/armor/sabatons/_sabatons_caps.png");
-		textures.add("textures/armor/sabatons/_sabatons_trim.png");
-		textures.add("textures/armor/sabatons/_sabatons_soles.png");
-		return textures;
+	public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type) {
+		String texture;
+		NBTTagList t = TagUtil.getBaseMaterialsTagList(stack);
+		texture = "textures/armor/sabatons/_sabatons_plate_" + t.getStringTagAt(0);
+		return texture;
 	}
 
 	@SideOnly(Side.CLIENT)
 	@Override
-	public ArmorRenderer getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack) {
+	public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, EntityEquipmentSlot armorSlot, ModelBiped _default)
+	{
 		return new ModelTinkersSabatons(itemStack);
 	}
 
 	@Override
 	public NBTTagCompound buildTag(List<Material> materials) {
-		ArmorNBT data = buildDefaultArmorTag(materials, FeetMaterialStats.TYPE);
+		ArmorNBT data = buildDefaultTag(materials);
 		return data.get();
 	}
 
@@ -60,33 +64,64 @@ public class TinkersSabatons extends ArmorCore {
 	}
 
 	@Override
-	public void getTooltipDetailed(ItemStack stack, List<String> tooltips) {
+	public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage,
+			int slot) {
 		// TODO Auto-generated method stub
-		
+		return null;
 	}
 
 	@Override
-	public void getTooltipComponents(ItemStack stack, List<String> tooltips) {
+	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) {
 		// TODO Auto-generated method stub
-		
+		return 0;
 	}
 
 	@Override
-	public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage,
-			int slot) {
+	public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {
 		// TODO Auto-generated method stub
-		return null;
+		
 	}
 
 	@Override
-	public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) {
+	public float damagePotential()
+	{
 		// TODO Auto-generated method stub
 		return 0;
 	}
 
 	@Override
-	public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {
+	public double attackSpeed()
+	{
 		// TODO Auto-generated method stub
-		
+		return 0;
+	}
+	
+	@Override
+	protected ArmorNBT buildDefaultTag(List<Material> materials)
+	{
+		ArmorNBT data = new ArmorNBT();
+
+		if (materials.size() >= 2)
+		{
+			ArmorMaterialStats handle = materials.get(0).getStatsOrUnknown(FabricMaterialStats.TYPE);
+			ArmorMaterialStats head = materials.get(1).getStatsOrUnknown(FabricMaterialStats.TYPE);
+			// start with head
+			data.head(head);
+
+			// add in accessoires if present
+			if (materials.size() >= 3)
+			{
+				ExtraMaterialStats binding = materials.get(2).getStatsOrUnknown(MaterialTypes.EXTRA);
+				data.extra(binding);
+			}
+
+			// calculate handle impact
+			data.head(handle);
+		}
+
+		// 3 free modifiers
+		data.modifiers = DEFAULT_MODIFIERS;
+
+		return data;
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/renderers/cloth/ModelTinkersHood.java b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/cloth/ModelTinkersHood.java
index 54b2c6d..b5cf2c2 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/renderers/cloth/ModelTinkersHood.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/cloth/ModelTinkersHood.java
@@ -15,10 +15,10 @@ public class ModelTinkersHood extends ArmorRenderer {
     public ModelRenderer ScarfNeck;
 
     public ModelTinkersHood(ItemStack stack) {
-    	super(0.25f, 0, 96, 64, stack);
+    	super(0.25f, 0, 96, 96, stack);
         this.textureWidth = 96;
-        this.textureHeight = 64;
-        
+        this.textureHeight = 96;
+       
         this.Flop_1 = new ModelRenderer(this, 77, 9);
         this.Flop_1.setRotationPoint(0.0F, 0.0F, 0.0F);
         this.Flop_1.addBox(-2.0F, -6.8F, -0.1F, 4, 4, 5, 0.5F);
diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/renderers/cloth/ModelTinkersRobe.java b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/cloth/ModelTinkersRobe.java
index e5f179a..bdf11c6 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/renderers/cloth/ModelTinkersRobe.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/cloth/ModelTinkersRobe.java
@@ -21,9 +21,9 @@ public class ModelTinkersRobe extends ArmorRenderer {
     public ModelRenderer LeftFrontL;
 
     public ModelTinkersRobe(ItemStack stack) {
-    	super(0.25f, 0, 96, 64, stack);
+    	super(0.25f, 0, 96, 96, stack);
         this.textureWidth = 96;
-        this.textureHeight = 64;
+        this.textureHeight = 96;
         
         this.BeltStraight = new ModelRenderer(this, 66, 24);
         this.BeltStraight.setRotationPoint(0.0F, 10.0F, 0.0F);
diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/renderers/cloth/ModelTinkersShawl.java b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/cloth/ModelTinkersShawl.java
index 1dc721f..b2f8f6c 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/renderers/cloth/ModelTinkersShawl.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/cloth/ModelTinkersShawl.java
@@ -17,9 +17,9 @@ public class ModelTinkersShawl extends ArmorRenderer {
     public ModelRenderer ShawlRightTrimLong;
 
     public ModelTinkersShawl(ItemStack stack) {
-    	super(0.25f, 0, 96, 64, stack);
+    	super(0.25f, 0, 96, 96, stack);
         this.textureWidth = 96;
-        this.textureHeight = 64;
+        this.textureHeight = 96;
 
         this.TrimNeck = new ModelRenderer(this, 68, 49);
         this.TrimNeck.setRotationPoint(0.0F, 0.0F, 0.0F);
diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/renderers/heavy/ModelTinkersHelm.java b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/heavy/ModelTinkersHelm.java
index 937bcc4..c74e4af 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/renderers/heavy/ModelTinkersHelm.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/heavy/ModelTinkersHelm.java
@@ -15,9 +15,9 @@ public class ModelTinkersHelm extends ArmorRenderer {
     public ModelRenderer MouthGuard;
 
     public ModelTinkersHelm(ItemStack stack) {
-    	super(0.25f, 0, 96, 64, stack);
+    	super(0.25f, 0, 96, 96, stack);
         this.textureWidth = 96;
-        this.textureHeight = 64;
+        this.textureHeight = 96;
         
         this.MouthGuard = new ModelRenderer(this, 64, 32);
         this.MouthGuard.setRotationPoint(0.0F, 0.0F, 0.0F);
diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/renderers/layers/LayerTDArmor.java b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/layers/LayerTDArmor.java
index 14c3fc1..d45d64b 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/renderers/layers/LayerTDArmor.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/layers/LayerTDArmor.java
@@ -1,6 +1,6 @@
 package lance5057.tDefense.core.tools.armor.renderers.layers;
 
-import java.util.List;
+import java.util.List; 
 import java.util.Map;
 
 import com.google.common.collect.Maps;
diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/renderers/layers/LayerTDBipedArmor.java b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/layers/LayerTDBipedArmor.java
index 890ba1f..2ba5720 100644
--- a/src/main/java/lance5057/tDefense/core/tools/armor/renderers/layers/LayerTDBipedArmor.java
+++ b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/layers/LayerTDBipedArmor.java
@@ -1,6 +1,6 @@
 package lance5057.tDefense.core.tools.armor.renderers.layers;
 
-import java.util.List;
+import java.util.List; 
 
 import lance5057.tDefense.core.tools.bases.ArmorCore;
 import net.minecraft.client.model.ModelBiped;
@@ -59,8 +59,8 @@ public class LayerTDBipedArmor extends LayerTDArmor<ModelBiped> {
 		if (entity instanceof EntityPlayer) {
 			EntityPlayer p = (EntityPlayer) entity;
 			ItemStack armor = p.inventory.armorItemInSlot(slot.getIndex());
-			List<String> l = ((ArmorCore)armor.getItem()).getArmorTexture(armor);
-			return l;
+			//List<String> l = ((ArmorCore)armor.getItem()).getArmorTexture(armor);
+			//return l;
 		}
 		return null;
 	}
diff --git a/src/main/java/lance5057/tDefense/core/tools/armor/renderers/shaders/ArmorShader.java b/src/main/java/lance5057/tDefense/core/tools/armor/renderers/shaders/ArmorShader.java
deleted file mode 100644
index 5a1e803..0000000
--- a/src/main/java/lance5057/tDefense/core/tools/armor/renderers/shaders/ArmorShader.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package lance5057.tDefense.core.tools.armor.renderers.shaders;
-
-import static org.lwjgl.opengl.GL11.GL_BLEND;
-import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA;
-import static org.lwjgl.opengl.GL11.GL_QUADS;
-import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA;
-import static org.lwjgl.opengl.GL11.glBegin;
-import static org.lwjgl.opengl.GL11.glBlendFunc;
-import static org.lwjgl.opengl.GL11.glColor3d;
-import static org.lwjgl.opengl.GL11.glColor4f;
-import static org.lwjgl.opengl.GL11.glEnable;
-import static org.lwjgl.opengl.GL11.glEnd;
-import static org.lwjgl.opengl.GL11.glTexCoord2f;
-
-import java.awt.Color;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.imageio.ImageIO;
-
-import lance5057.tDefense.util.Color16Util;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.resources.IResourceManager;
-import net.minecraft.util.ResourceLocation;
-import slimeknights.tconstruct.library.client.MaterialRenderInfo;
-import slimeknights.tconstruct.library.client.texture.TextureColoredTexture;
-
-public class ArmorShader {
-
-	public static BufferedImage colorize(ResourceLocation r1, int color) {
-		IResourceManager manager = Minecraft.getMinecraft().getResourceManager();
-		try {
-			BufferedImage buff = ImageIO.read(manager.getResource(r1).getInputStream());
-			BufferedImage tint = new BufferedImage(buff.getWidth(), buff.getHeight(), BufferedImage.TYPE_INT_ARGB);
-
-			Graphics2D graphics = tint.createGraphics();
-
-			graphics.setPaint(new Color(color));
-			graphics.fillRect(0, 0, tint.getWidth(), tint.getHeight());
-			graphics.dispose();
-
-			return multiply(buff, tint);
-
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	public static void metalTexture(ResourceLocation r1, ResourceLocation r2, int color) {
-		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-		Minecraft.getMinecraft().getTextureManager().bindTexture(r1);
-
-		int[] colors = Color16Util.hexToRGB(Integer.toHexString(color));
-		// glColor3d((float) colors[0] / 255, (float) colors[1] / 255, (float)
-		// colors[2] / 255);
-
-		Minecraft.getMinecraft().getTextureManager().bindTexture(r1);
-		glColor4f((float) colors[0] / 255, (float) colors[1] / 255, (float) colors[2] / 255, 1.0f);
-		glBegin(GL_QUADS);
-		glTexCoord2f(0.0f, 0.0f);
-		glTexCoord2f(1.0f, 0.0f);
-		glTexCoord2f(1.0f, 1.0f);
-		glTexCoord2f(0.0f, 1.0f);
-		glEnd();
-
-		Minecraft.getMinecraft().getTextureManager().bindTexture(r2);
-		glColor4f((float) colors[0] / 255, (float) colors[1] / 255, (float) colors[2] / 255, 1.0f);
-		glBegin(GL_QUADS);
-		glTexCoord2f(0.0f, 0.0f);
-		glTexCoord2f(1.0f, 0.0f);
-		glTexCoord2f(1.0f, 1.0f);
-		glTexCoord2f(0.0f, 1.0f);
-		glEnd();
-	}
-
-	public static BufferedImage blockTexture(TextureColoredTexture sprite) {
-
-		List<ResourceLocation> l = (List<ResourceLocation>) sprite.getDependencies();
-		String s = l.get(1).toString();
-
-		IResourceManager manager = Minecraft.getMinecraft().getResourceManager();
-		if (s.contains("minecraft:")) {
-			s = s.substring(s.indexOf(":") + 1);
-			s = "textures/" + s + ".png";
-		} else {
-			s = l.get(1).getResourceDomain() + ":textures/" + l.get(1).getResourcePath() + ".png";
-		}
-		try {
-			BufferedImage buff = ImageIO.read(manager.getResource(l.get(0)).getInputStream());
-			BufferedImage buff2 = ImageIO.read(manager.getResource(new ResourceLocation(s)).getInputStream());
-
-			return multiply(buff, buff2);
-		} catch (IOException e) {
-			Logger.getAnonymousLogger().log(Level.SEVERE, "Somethings Fucky - TinkersDefense:ArmorShader - Line 107");
-		}
-		return null;
-
-	}
-
-	public static void selectRenderer(BufferedImage b, MaterialRenderInfo info, ResourceLocation r1) {
-
-		Graphics g = b.getGraphics();
-
-		if (info instanceof MaterialRenderInfo.MetalTextured)
-			metalTexture(r1, r1, ((MaterialRenderInfo.MetalTextured) info).color);
-		else if (info instanceof MaterialRenderInfo.Metal)
-			g.drawImage(colorize(r1, ((MaterialRenderInfo.Metal) info).color), 0, 0, null);
-		else if (info instanceof MaterialRenderInfo.MultiColor)
-			g.drawImage(colorize(r1, ((MaterialRenderInfo.MultiColor) info).getVertexColor()), 0, 0, null);
-		else if (info instanceof MaterialRenderInfo.InverseMultiColor)
-			g.drawImage(colorize(r1, ((MaterialRenderInfo.InverseMultiColor) info).getVertexColor()), 0, 0, null);
-		else if (info instanceof MaterialRenderInfo.BlockTexture)
-			g.drawImage(
-					blockTexture((TextureColoredTexture) ((MaterialRenderInfo.BlockTexture) info).getTexture(r1, "")),
-					0, 0, null);
-		else
-			g.drawImage(colorize(r1, ((MaterialRenderInfo.Default) info).color), 0, 0, null);
-		
-		g.dispose();
-
-	}
-
-	public static BufferedImage multiply(BufferedImage buff, BufferedImage buff2) {
-		BufferedImage buffImg = new BufferedImage(buff.getWidth(), buff.getHeight(), BufferedImage.TYPE_INT_ARGB);
-
-		for (int i = 0; i < buff.getWidth(); i++)
-			for (int j = 0; j < buff.getHeight(); j++) {
-				Color c1 = new Color(buff.getRGB(i, j), true);
-				int x = i % buff2.getWidth();
-				int y = j % buff2.getHeight();
-				Color c2 = new Color(buff2.getRGB(x, y), true);
-				float r, g, b, a;
-				Color out;
-
-				// multiply here
-				r = (((float) c1.getRed()) / 255) * (((float) c2.getRed()) / 255);
-				g = (((float) c1.getGreen()) / 255) * (((float) c2.getGreen()) / 255);
-				b = (((float) c1.getBlue()) / 255) * (((float) c2.getBlue()) / 255);
-
-				// transparency always comes from the first buffer
-				int a2 = c1.getAlpha();
-				a = ((float) c1.getAlpha()) / 255;
-
-				out = new Color(r, g, b, a);
-				buffImg.setRGB(i, j, out.getRGB());
-			}
-
-		return buffImg;
-	}
-	
-	public static BufferedImage Invert(BufferedImage buff) {
-		BufferedImage buffImg = new BufferedImage(buff.getWidth(), buff.getHeight(), BufferedImage.TYPE_INT_ARGB);
-
-		for (int i = 0; i < buff.getWidth(); i++)
-			for (int j = 0; j < buff.getHeight(); j++) {
-				Color c1 = new Color(buff.getRGB(i, j), true);
-				float r, g, b, a;
-				Color out;
-
-				// invert here
-				r = Math.abs((((float) c1.getRed()) / 255) - 1.0f);
-				g = Math.abs((((float) c1.getGreen()) / 255) - 1.0f);
-				b = Math.abs((((float) c1.getBlue()) / 255) - 1.0f);
-
-				// transparency always comes from the first buffer
-				int a2 = c1.getAlpha();
-				a = ((float) c1.getAlpha()) / 255;
-
-				out = new Color(r, g, b, a);
-				buffImg.setRGB(i, j, out.getRGB());
-			}
-
-		return buffImg;
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/core/tools/bases/ArmorBase.java b/src/main/java/lance5057/tDefense/core/tools/bases/ArmorBase.java
index 4c3d876..e6c86d0 100644
--- a/src/main/java/lance5057/tDefense/core/tools/bases/ArmorBase.java
+++ b/src/main/java/lance5057/tDefense/core/tools/bases/ArmorBase.java
@@ -15,8 +15,10 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Sets;
 
 import gnu.trove.set.hash.THashSet;
-import lance5057.tDefense.util.ArmorBuilder;
-import lance5057.tDefense.util.ArmorEvent;
+import jline.internal.Log;
+import lance5057.tDefense.core.library.ArmorBuilder;
+import lance5057.tDefense.core.library.ArmorEvent;
+import lance5057.tDefense.core.library.ArmorTags;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.entity.Entity;
@@ -58,459 +60,543 @@ import slimeknights.tconstruct.library.utils.ToolBuilder;
 import slimeknights.tconstruct.library.utils.ToolHelper;
 import slimeknights.tconstruct.library.utils.TooltipBuilder;
 
-public abstract class ArmorBase extends ItemArmor implements ITinkerable, IModifyable, IRepairable, ISpecialArmor{
+public abstract class ArmorBase extends ItemArmor implements ITinkerable, IModifyable, IRepairable, ISpecialArmor
+{
 	protected final PartMaterialType[] requiredComponents;
-	  // used to classify what the thing can do
-	  protected final Set<Category> categories = new THashSet<>();
-
-	  public ArmorBase(EntityEquipmentSlot slot, PartMaterialType... requiredComponents) {
-		  super(ItemArmor.ArmorMaterial.LEATHER, 0, slot);
-	    this.requiredComponents = requiredComponents;
-
-	    this.setMaxStackSize(1);
-	    //this.setHasSubtypes(true);
-	  }
-
-	  /* Tool Information */
-	  public List<PartMaterialType> getRequiredComponents() {
-	    return ImmutableList.copyOf(requiredComponents);
-	  }
-
-	  public List<PartMaterialType> getToolBuildComponents() {
-	    return getRequiredComponents();
-	  }
-
-	  protected void addCategory(Category... categories) {
-	    Collections.addAll(this.categories, categories);
-	  }
-
-	  public boolean hasCategory(Category category) {
-	    return categories.contains(category);
-	  }
-
-	  protected Category[] getCategories() {
-	    Category[] out = new Category[categories.size()];
-	    int i = 0;
-	    for(Category category : categories) {
-	      out[i++] = category;
-	    }
-
-	    return out;
-	  }
-
-	  /* INDESTRUCTIBLE */
-
-	  @Override
-	  public boolean hasCustomEntity(ItemStack stack) {
-	    return true;
-	  }
-
-	  @Nonnull
-	  @Override
-	  public Entity createEntity(World world, Entity location, ItemStack itemstack) {
-	    EntityItem entity = new IndestructibleEntityItem(world, location.posX, location.posY, location.posZ, itemstack);
-	    if(location instanceof EntityItem) {
-	      // workaround for private access on that field >_>
-	      NBTTagCompound tag = new NBTTagCompound();
-	      location.writeToNBT(tag);
-	      entity.setPickupDelay(tag.getShort("PickupDelay"));
-	    }
-	    entity.motionX = location.motionX;
-	    entity.motionY = location.motionY;
-	    entity.motionZ = location.motionZ;
-	    return entity;
-	  }
-
-	  /* Building the Item */
-	  public boolean validComponent(int slot, ItemStack stack) {
-	    if(slot > requiredComponents.length || slot < 0) {
-	      return false;
-	    }
-
-	    return requiredComponents[slot].isValid(stack);
-	  }
-
-	  /**
-	   * Builds an Itemstack of this tool with the given materials, if applicable.
-	   *
-	   * @param stacks Items to build with. Have to be in the correct order and have exact length. No nulls!
-	   * @return The built item or null if invalid input.
-	   */
-	  @Nonnull
-	  public ItemStack buildItemFromStacks(NonNullList<ItemStack> stacks) {
-	    long itemCount = stacks.stream().filter(stack -> !stack.isEmpty()).count();
-	    List<Material> materials = new ArrayList<>(stacks.size());
-
-	    if(itemCount != requiredComponents.length) {
-	      return ItemStack.EMPTY;
-	    }
-
-	    // not a valid part arrangement for this tool
-	    for(int i = 0; i < itemCount; i++) {
-	      if(!validComponent(i, stacks.get(i))) {
-	        return ItemStack.EMPTY;
-	      }
-
-	      materials.add(TinkerUtil.getMaterialFromStack(stacks.get(i)));
-	    }
-
-	    return buildItem(materials);
-	  }
-
-	  /**
-	   * Builds an Itemstack of this tool with the given materials.
-	   *
-	   * @param materials Materials to build with. Have to be in the correct order. No nulls!
-	   * @return The built item or null if invalid input.
-	   */
-	  @Nonnull
-	  public ItemStack buildItem(List<Material> materials) {
-	    ItemStack tool = new ItemStack(this);
-	    tool.setTagCompound(buildItemNBT(materials));
-
-	    return tool;
-	  }
-
-	  /**
-	   * Builds the NBT for a new tinker item with the given data.
-	   *
-	   * @param materials Materials to build with. Have to be in the correct order. No nulls!
-	   * @return The built nbt
-	   */
-	  public NBTTagCompound buildItemNBT(List<Material> materials) {
-	    NBTTagCompound basetag = new NBTTagCompound();
-	    NBTTagCompound toolTag = buildTag(materials);
-	    NBTTagCompound dataTag = buildData(materials);
-
-	    basetag.setTag(Tags.BASE_DATA, dataTag);
-	    basetag.setTag(Tags.TOOL_DATA, toolTag);
-	    // copy of the original tool data
-	    basetag.setTag(Tags.TOOL_DATA_ORIG, toolTag.copy());
-
-	    // save categories on the tool
-	    TagUtil.setCategories(basetag, getCategories());
-
-	    // add traits
-	    addMaterialTraits(basetag, materials);
-
-	    // fire toolbuilding event
-	    ArmorEvent.OnItemBuilding.fireEvent(basetag, ImmutableList.copyOf(materials), this);
-
-	    return basetag;
-	  }
-
-	  /**
-	   * Creates an NBT Tag with the materials that were used to build the item.
-	   */
-	  private NBTTagCompound buildData(List<Material> materials) {
-	    NBTTagCompound base = new NBTTagCompound();
-	    NBTTagList materialList = new NBTTagList();
-
-	    for(Material material : materials) {
-	      materialList.appendTag(new NBTTagString(material.identifier));
-	    }
-
-	    // pre-type base-modifier list
-	    NBTTagList modifierList = new NBTTagList();
-	    // we cannot set the type directly, but it gets typed by adding a tag, so we add and remove one
-	    modifierList.appendTag(new NBTTagString());
-	    modifierList.removeTag(0);
-
-	    base.setTag(Tags.BASE_MATERIALS, materialList);
-	    base.setTag(Tags.BASE_MODIFIERS, modifierList);
-
-	    return base;
-	  }
-
-	  /**
-	   * Builds an unusable tool that only has the rendering info
-	   */
-	  @Nonnull
-	  public ItemStack buildItemForRendering(List<Material> materials) {
-	    ItemStack tool = new ItemStack(this);
-	    NBTTagCompound base = new NBTTagCompound();
-	    base.setTag(Tags.BASE_DATA, buildData(materials));
-	    tool.setTagCompound(base);
-
-	    return tool;
-	  }
-
-	  @Nonnull
-	  public ItemStack buildItemForRenderingInGui() {
-	    List<Material> materials = IntStream.range(0, getRequiredComponents().size())
-	                                        .mapToObj(this::getMaterialForPartForGuiRendering)
-	                                        .collect(Collectors.toList());
-
-	    return buildItemForRendering(materials);
-	  }
-
-	  @SideOnly(Side.CLIENT)
-	  public Material getMaterialForPartForGuiRendering(int index) {
-	    return ClientProxy.RenderMaterials[index % ClientProxy.RenderMaterials.length];
-	  }
-
-	  public abstract NBTTagCompound buildTag(List<Material> materials);
-
-	  /** Checks whether an Item built from materials has only valid materials. Uses the standard NBT to determine materials. */
-	  public boolean hasValidMaterials(ItemStack stack) {
-	    // checks if the materials used support all stats needed
-	    NBTTagList list = TagUtil.getBaseMaterialsTagList(stack);
-	    List<Material> materials = TinkerUtil.getMaterialsFromTagList(list);
-
-	    // something went wrooooong
-	    if(materials.size() != requiredComponents.length) {
-	      return false;
-	    }
-
-	    // check if all materials used have the stats needed
-	    for(int i = 0; i < materials.size(); i++) {
-	      Material material = materials.get(i);
-	      PartMaterialType required = requiredComponents[i];
-	      if(!required.isValidMaterial(material)) {
-	        return false;
-	      }
-	    }
-
-	    return true;
-	  }
-
-	  public void addMaterialTraits(NBTTagCompound root, List<Material> materials) {
-	    int size = requiredComponents.length;
-	    // safety
-	    if(materials.size() < size) {
-	      size = materials.size();
-	    }
-	    // add corresponding traits per material usage
-	    for(int i = 0; i < size; i++) {
-	      PartMaterialType required = requiredComponents[i];
-	      Material material = materials.get(i);
-	      for(ITrait trait : required.getApplicableTraitsForMaterial(material)) {
-	        ToolBuilder.addTrait(root, trait, material.materialTextColor);
-	      }
-	    }
-	  }
-
-	  /* Repairing */
-
-	  /** Returns indices of the parts that are used for repairing */
-	  public int[] getRepairParts() {
-	    return new int[] { 1 }; // index 1 usually is the head. 0 is handle.
-	  }
-
-	  public float getRepairModifierForPart(int index) {
-	    return 1f;
-	  }
-
-	  @Nonnull
-	  @Override
-	  public ItemStack repair(ItemStack repairable, NonNullList<ItemStack> repairItems) {
-	    if(repairable.getItemDamage() == 0 && !ToolHelper.isBroken(repairable)) {
-	      // undamaged and not broken - no need to repair
-	      return ItemStack.EMPTY;
-	    }
-
-	    // we assume the first required part exclusively determines repair material
-	    List<Material> materials = TinkerUtil.getMaterialsFromTagList(TagUtil.getBaseMaterialsTagList(repairable));
-	    if(materials.isEmpty()) {
-	      return ItemStack.EMPTY;
-	    }
-
-	    // ensure the items only contain valid items
-	    NonNullList<ItemStack> items = Util.deepCopyFixedNonNullList(repairItems);
-	    boolean foundMatch = false;
-	    for(int index : getRepairParts()) {
-	      Material material = materials.get(index);
-
-	      if(repairCustom(material, items) > 0) {
-	        foundMatch = true;
-	      }
-
-	      Optional<RecipeMatch.Match> match = material.matches(items);
-
-	      // not a single match -> nothing to repair with
-	      if(!match.isPresent()) {
-	        continue;
-	      }
-	      foundMatch = true;
-
-	      while((match = material.matches(items)).isPresent()) {
-	        RecipeMatch.removeMatch(items, match.get());
-	      }
-	    }
-
-	    if(!foundMatch) {
-	      return ItemStack.EMPTY;
-	    }
-
-	    // check if all items were used
-	    for(int i = 0; i < repairItems.size(); i++) {
-	      // was non-null and did not get modified (stacksize changed or null now, usually)
-	      if(!repairItems.get(i).isEmpty() && ItemStack.areItemStacksEqual(repairItems.get(i), items.get(i))) {
-	        // found an item that was not touched
-	        return ItemStack.EMPTY;
-	      }
-	    }
-
-	    // now do it all over again with the real items, to actually repair \o/
-	    ItemStack item = repairable.copy();
-
-	    while(item.getItemDamage() > 0) {
-	      int amount = calculateRepairAmount(materials, repairItems);
-
-	      // nothing to repair with, we're therefore done
-	      if(amount <= 0) {
-	        break;
-	      }
-
-	      ToolHelper.repairTool(item, calculateRepair(item, amount));
-	      // save that we repaired it :I
-	      NBTTagCompound tag = TagUtil.getExtraTag(item);
-	      tag.setInteger(Tags.REPAIR_COUNT, tag.getInteger(Tags.REPAIR_COUNT) + 1);
-	      TagUtil.setExtraTag(item, tag);
-	    }
-
-	    return item;
-	  }
-
-	  /** Allows for custom repair items. Remove used items from the array. */
-	  protected int repairCustom(Material material, NonNullList<ItemStack> repairItems) {
-	    return 0;
-	  }
-
-	  protected int calculateRepairAmount(List<Material> materials, NonNullList<ItemStack> repairItems) {
-	    Set<Material> materialsMatched = Sets.newHashSet();
-	    float durability = 0f;
-	    // try to match each material once
-	    for(int index : getRepairParts()) {
-	      Material material = materials.get(index);
-
-	      if(materialsMatched.contains(material)) {
-	        continue;
-	      }
-
-	      // custom repairing
-	      durability += repairCustom(material, repairItems) * getRepairModifierForPart(index);
-
-	      Optional<RecipeMatch.Match> matchOptional = material.matches(repairItems);
-	      if(matchOptional.isPresent()) {
-	        RecipeMatch.Match match = matchOptional.get();
-	        HeadMaterialStats stats = material.getStats(MaterialTypes.HEAD);
-	        if(stats != null) {
-	          materialsMatched.add(material);
-	          durability += ((float) stats.durability * (float) match.amount * getRepairModifierForPart(index)) / 144f;
-	          RecipeMatch.removeMatch(repairItems, match);
-	        }
-	      }
-	    }
-
-	    durability *= 1f + ((float) materialsMatched.size() - 1) / 9f;
-
-	    return (int) durability;
-	  }
-
-	  protected int calculateRepair(ItemStack tool, int amount) {
-	    float origDur = TagUtil.getOriginalToolStats(tool).durability;
-	    float actualDur = ToolHelper.getDurabilityStat(tool);
-
-	    // calculate in modifiers that change the total durability of a tool, like diamond
-	    // they should not punish the player with higher repair costs
-	    float durabilityFactor = actualDur / origDur;
-	    float increase = amount * Math.min(10f, durabilityFactor);
-
-	    increase = Math.max(increase, actualDur / 64f);
-	    //increase = Math.max(50, increase);
-
-	    int modifiersUsed = TagUtil.getBaseModifiersUsed(tool.getTagCompound());
-	    float mods = 1.0f;
-	    if(modifiersUsed == 1) {
-	      mods = 0.95f;
-	    }
-	    else if(modifiersUsed == 2) {
-	      mods = 0.9f;
-	    }
-	    else if(modifiersUsed >= 3) {
-	      mods = 0.85f;
-	    }
-
-	    increase *= mods;
-
-	    NBTTagCompound tag = TagUtil.getExtraTag(tool);
-	    int repair = tag.getInteger(Tags.REPAIR_COUNT);
-	    float repairDimishingReturns = (100 - repair / 2) / 100f;
-	    if(repairDimishingReturns < 0.5f) {
-	      repairDimishingReturns = 0.5f;
-	    }
-	    increase *= repairDimishingReturns;
-
-	    return (int) Math.ceil(increase);
-	  }
-
-	  /* Information */
-
-	  @Override
-	  @SideOnly(Side.CLIENT)
-	  public void addInformation(ItemStack stack, @Nullable World worldIn, List<String> tooltip, ITooltipFlag flagIn) {
-	    boolean shift = Util.isShiftKeyDown();
-	    boolean ctrl = Util.isCtrlKeyDown();
-	    // modifiers
-	    if(!shift && !ctrl) {
-	      getTooltip(stack, tooltip);
-
-	      tooltip.add("");
-	      // info tooltip for detailed and componend info
-	      tooltip.add(Util.translate("tooltip.tool.holdShift"));
-	      tooltip.add(Util.translate("tooltip.tool.holdCtrl"));
-
-//	      if(worldIn != null) {
-//	        tooltip.add(TextFormatting.BLUE +
-//	                    I18n.translateToLocalFormatted("attribute.modifier.plus.0",
-//	                                                   Util.df.format(ToolHelper.getActualDamage(stack, Minecraft.getMinecraft().player)),
-//	                                                   I18n.translateToLocal("attribute.name.generic.attackDamage")));
-//	      }
-	    }
-	    // detailed data
-	    else if(Config.extraTooltips && shift) {
-	      getTooltipDetailed(stack, tooltip);
-	    }
-	    // component data
-	    else if(Config.extraTooltips && ctrl) {
-	      getTooltipComponents(stack, tooltip);
-	    }
-	  }
-
-	  @Override
-	  public void getTooltip(ItemStack stack, List<String> tooltips) {
-	    // Default tooltip: modifiers
-	    TooltipBuilder.addModifierTooltips(stack, tooltips);
-	  }
-
-	  @Nonnull
-	  @Override
-	  public EnumRarity getRarity(ItemStack stack) {
-	    // prevents enchanted items to have a different name color
-	    return EnumRarity.COMMON;
-	  }
-
-	  @Override
-	  public boolean isBookEnchantable(ItemStack stack, ItemStack book) {
-	    return false;
-	  }
-
-	  /* NBT loading */
-
-	  @Override
-	  public boolean updateItemStackNBT(NBTTagCompound nbt) {
-	    // when the itemstack is loaded from NBT we recalculate all the data
-	    if(nbt.hasKey(Tags.BASE_DATA)) {
-	      try {
-	        ArmorBuilder.rebuildArmor(nbt, this);
-	      }
-	      catch(TinkerGuiException e) {
-	        // nothing to do
-	      }
-	    }
-
-	    // return value shouldn't matter since it's never checked
-	    return true;
-	  }
+	// used to classify what the thing can do
+	protected final Set<Category> categories = new THashSet<>();
+
+	public ArmorBase(EntityEquipmentSlot slot, PartMaterialType... requiredComponents)
+	{
+		super(ItemArmor.ArmorMaterial.LEATHER, 0, slot);
+		this.requiredComponents = requiredComponents;
+
+		this.setMaxStackSize(1);
+		// this.setHasSubtypes(true);
+	}
+
+	/* Tool Information */
+	public List<PartMaterialType> getRequiredComponents()
+	{
+		return ImmutableList.copyOf(requiredComponents);
+	}
+
+	public List<PartMaterialType> getToolBuildComponents()
+	{
+		return getRequiredComponents();
+	}
+
+	protected void addCategory(Category... categories)
+	{
+		Collections.addAll(this.categories, categories);
+	}
+
+	public boolean hasCategory(Category category)
+	{
+		return categories.contains(category);
+	}
+
+	protected Category[] getCategories()
+	{
+		Category[] out = new Category[categories.size()];
+		int i = 0;
+		for (Category category : categories)
+		{
+			out[i++] = category;
+		}
+
+		return out;
+	}
+
+	/* INDESTRUCTIBLE */
+
+	@Override
+	public boolean hasCustomEntity(ItemStack stack)
+	{
+		return true;
+	}
+
+	@Nonnull
+	@Override
+	public Entity createEntity(World world, Entity location, ItemStack itemstack)
+	{
+		EntityItem entity = new IndestructibleEntityItem(world, location.posX, location.posY, location.posZ, itemstack);
+		if (location instanceof EntityItem)
+		{
+			// workaround for private access on that field >_>
+			NBTTagCompound tag = new NBTTagCompound();
+			location.writeToNBT(tag);
+			entity.setPickupDelay(tag.getShort("PickupDelay"));
+		}
+		entity.motionX = location.motionX;
+		entity.motionY = location.motionY;
+		entity.motionZ = location.motionZ;
+		return entity;
+	}
+
+	/* Building the Item */
+	public boolean validComponent(int slot, ItemStack stack)
+	{
+		if (slot > requiredComponents.length || slot < 0)
+		{
+			return false;
+		}
+
+		return requiredComponents[slot].isValid(stack);
+	}
+
+	/**
+	 * Builds an Itemstack of this tool with the given materials, if applicable.
+	 *
+	 * @param stacks
+	 *            Items to build with. Have to be in the correct order and have
+	 *            exact length. No nulls!
+	 * @return The built item or null if invalid input.
+	 */
+	@Nonnull
+	public ItemStack buildItemFromStacks(NonNullList<ItemStack> stacks)
+	{
+		long itemCount = stacks.stream().filter(stack -> !stack.isEmpty()).count();
+		List<Material> materials = new ArrayList<>(stacks.size());
+
+		if (itemCount != requiredComponents.length)
+		{
+			return ItemStack.EMPTY;
+		}
+
+		// not a valid part arrangement for this tool
+		for (int i = 0; i < itemCount; i++)
+		{
+			if (!validComponent(i, stacks.get(i)))
+			{
+				return ItemStack.EMPTY;
+			}
+
+			materials.add(TinkerUtil.getMaterialFromStack(stacks.get(i)));
+		}
+
+		return buildItem(materials);
+	}
+
+	/**
+	 * Builds an Itemstack of this tool with the given materials.
+	 *
+	 * @param materials
+	 *            Materials to build with. Have to be in the correct order. No
+	 *            nulls!
+	 * @return The built item or null if invalid input.
+	 */
+	@Nonnull
+	public ItemStack buildItem(List<Material> materials)
+	{
+		ItemStack tool = new ItemStack(this);
+		tool.setTagCompound(buildItemNBT(materials));
+
+		return tool;
+	}
+
+	/**
+	 * Builds the NBT for a new tinker item with the given data.
+	 *
+	 * @param materials
+	 *            Materials to build with. Have to be in the correct order. No
+	 *            nulls!
+	 * @return The built nbt
+	 */
+	public NBTTagCompound buildItemNBT(List<Material> materials)
+	{
+		NBTTagCompound basetag = new NBTTagCompound();
+		NBTTagCompound toolTag = buildTag(materials);
+		NBTTagCompound dataTag = buildData(materials);
+
+		basetag.setTag(Tags.BASE_DATA, dataTag);
+		basetag.setTag(Tags.TOOL_DATA, toolTag);
+		// copy of the original tool data
+		basetag.setTag(Tags.TOOL_DATA_ORIG, toolTag.copy());
+		// save categories on the tool
+		TagUtil.setCategories(basetag, getCategories());
+
+		// add traits
+		addMaterialTraits(basetag, materials);
+
+		// fire toolbuilding event
+		ArmorEvent.OnItemBuilding.fireEvent(basetag, ImmutableList.copyOf(materials), this);
+
+		return basetag;
+	}
+
+
+
+	@SideOnly(Side.CLIENT)
+	public NBTTagCompound setupTexture(List<Material> materials)
+	{
+		return null;
+	}
+
+	/**
+	 * Creates an NBT Tag with the materials that were used to build the item.
+	 */
+	private NBTTagCompound buildData(List<Material> materials)
+	{
+		NBTTagCompound base = new NBTTagCompound();
+		NBTTagList materialList = new NBTTagList();
+
+		for (Material material : materials)
+		{
+			materialList.appendTag(new NBTTagString(material.identifier));
+		}
+
+		// pre-type base-modifier list
+		NBTTagList modifierList = new NBTTagList();
+		// we cannot set the type directly, but it gets typed by adding a tag,
+		// so we add and remove one
+		modifierList.appendTag(new NBTTagString());
+		modifierList.removeTag(0);
+
+		base.setTag(Tags.BASE_MATERIALS, materialList);
+		base.setTag(Tags.BASE_MODIFIERS, modifierList);
+
+		return base;
+	}
+
+	/**
+	 * Builds an unusable tool that only has the rendering info
+	 */
+	@Nonnull
+	public ItemStack buildItemForRendering(List<Material> materials)
+	{
+		ItemStack tool = new ItemStack(this);
+		NBTTagCompound base = new NBTTagCompound();
+		base.setTag(Tags.BASE_DATA, buildData(materials));
+		tool.setTagCompound(base);
+
+		return tool;
+	}
+
+	@Nonnull
+	public ItemStack buildItemForRenderingInGui()
+	{
+		List<Material> materials = IntStream.range(0, getRequiredComponents().size()).mapToObj(this::getMaterialForPartForGuiRendering).collect(Collectors.toList());
+
+		return buildItemForRendering(materials);
+	}
+
+	@SideOnly(Side.CLIENT)
+	public Material getMaterialForPartForGuiRendering(int index)
+	{
+		return ClientProxy.RenderMaterials[index % ClientProxy.RenderMaterials.length];
+	}
+
+	public abstract NBTTagCompound buildTag(List<Material> materials);
+
+	/**
+	 * Checks whether an Item built from materials has only valid materials.
+	 * Uses the standard NBT to determine materials.
+	 */
+	public boolean hasValidMaterials(ItemStack stack)
+	{
+		// checks if the materials used support all stats needed
+		NBTTagList list = TagUtil.getBaseMaterialsTagList(stack);
+		List<Material> materials = TinkerUtil.getMaterialsFromTagList(list);
+
+		// something went wrooooong
+		if (materials.size() != requiredComponents.length)
+		{
+			return false;
+		}
+
+		// check if all materials used have the stats needed
+		for (int i = 0; i < materials.size(); i++)
+		{
+			Material material = materials.get(i);
+			PartMaterialType required = requiredComponents[i];
+			if (!required.isValidMaterial(material))
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	public void addMaterialTraits(NBTTagCompound root, List<Material> materials)
+	{
+		int size = requiredComponents.length;
+		// safety
+		if (materials.size() < size)
+		{
+			size = materials.size();
+		}
+		// add corresponding traits per material usage
+		for (int i = 0; i < size; i++)
+		{
+			PartMaterialType required = requiredComponents[i];
+			Material material = materials.get(i);
+			for (ITrait trait : required.getApplicableTraitsForMaterial(material))
+			{
+				ToolBuilder.addTrait(root, trait, material.materialTextColor);
+			}
+		}
+	}
+
+	/* Repairing */
+
+	/** Returns indices of the parts that are used for repairing */
+	public int[] getRepairParts()
+	{
+		return new int[] { 1 }; // index 1 usually is the head. 0 is handle.
+	}
+
+	public float getRepairModifierForPart(int index)
+	{
+		return 1f;
+	}
+
+	@Nonnull
+	@Override
+	public ItemStack repair(ItemStack repairable, NonNullList<ItemStack> repairItems)
+	{
+		if (repairable.getItemDamage() == 0 && !ToolHelper.isBroken(repairable))
+		{
+			// undamaged and not broken - no need to repair
+			return ItemStack.EMPTY;
+		}
+
+		// we assume the first required part exclusively determines repair
+		// material
+		List<Material> materials = TinkerUtil.getMaterialsFromTagList(TagUtil.getBaseMaterialsTagList(repairable));
+		if (materials.isEmpty())
+		{
+			return ItemStack.EMPTY;
+		}
+
+		// ensure the items only contain valid items
+		NonNullList<ItemStack> items = Util.deepCopyFixedNonNullList(repairItems);
+		boolean foundMatch = false;
+		for (int index : getRepairParts())
+		{
+			Material material = materials.get(index);
+
+			if (repairCustom(material, items) > 0)
+			{
+				foundMatch = true;
+			}
+
+			Optional<RecipeMatch.Match> match = material.matches(items);
+
+			// not a single match -> nothing to repair with
+			if (!match.isPresent())
+			{
+				continue;
+			}
+			foundMatch = true;
+
+			while ((match = material.matches(items)).isPresent())
+			{
+				RecipeMatch.removeMatch(items, match.get());
+			}
+		}
+
+		if (!foundMatch)
+		{
+			return ItemStack.EMPTY;
+		}
+
+		// check if all items were used
+		for (int i = 0; i < repairItems.size(); i++)
+		{
+			// was non-null and did not get modified (stacksize changed or null
+			// now, usually)
+			if (!repairItems.get(i).isEmpty() && ItemStack.areItemStacksEqual(repairItems.get(i), items.get(i)))
+			{
+				// found an item that was not touched
+				return ItemStack.EMPTY;
+			}
+		}
+
+		// now do it all over again with the real items, to actually repair \o/
+		ItemStack item = repairable.copy();
+
+		while (item.getItemDamage() > 0)
+		{
+			int amount = calculateRepairAmount(materials, repairItems);
+
+			// nothing to repair with, we're therefore done
+			if (amount <= 0)
+			{
+				break;
+			}
+
+			ToolHelper.repairTool(item, calculateRepair(item, amount));
+			// save that we repaired it :I
+			NBTTagCompound tag = TagUtil.getExtraTag(item);
+			tag.setInteger(Tags.REPAIR_COUNT, tag.getInteger(Tags.REPAIR_COUNT) + 1);
+			TagUtil.setExtraTag(item, tag);
+		}
+
+		return item;
+	}
+
+	/** Allows for custom repair items. Remove used items from the array. */
+	protected int repairCustom(Material material, NonNullList<ItemStack> repairItems)
+	{
+		return 0;
+	}
+
+	protected int calculateRepairAmount(List<Material> materials, NonNullList<ItemStack> repairItems)
+	{
+		Set<Material> materialsMatched = Sets.newHashSet();
+		float durability = 0f;
+		// try to match each material once
+		for (int index : getRepairParts())
+		{
+			Material material = materials.get(index);
+
+			if (materialsMatched.contains(material))
+			{
+				continue;
+			}
+
+			// custom repairing
+			durability += repairCustom(material, repairItems) * getRepairModifierForPart(index);
+
+			Optional<RecipeMatch.Match> matchOptional = material.matches(repairItems);
+			if (matchOptional.isPresent())
+			{
+				RecipeMatch.Match match = matchOptional.get();
+				HeadMaterialStats stats = material.getStats(MaterialTypes.HEAD);
+				if (stats != null)
+				{
+					materialsMatched.add(material);
+					durability += ((float) stats.durability * (float) match.amount * getRepairModifierForPart(index)) / 144f;
+					RecipeMatch.removeMatch(repairItems, match);
+				}
+			}
+		}
+
+		durability *= 1f + ((float) materialsMatched.size() - 1) / 9f;
+
+		return (int) durability;
+	}
+
+	protected int calculateRepair(ItemStack tool, int amount)
+	{
+		float origDur = TagUtil.getOriginalToolStats(tool).durability;
+		float actualDur = ToolHelper.getDurabilityStat(tool);
+
+		// calculate in modifiers that change the total durability of a tool,
+		// like diamond
+		// they should not punish the player with higher repair costs
+		float durabilityFactor = actualDur / origDur;
+		float increase = amount * Math.min(10f, durabilityFactor);
+
+		increase = Math.max(increase, actualDur / 64f);
+		// increase = Math.max(50, increase);
+
+		int modifiersUsed = TagUtil.getBaseModifiersUsed(tool.getTagCompound());
+		float mods = 1.0f;
+		if (modifiersUsed == 1)
+		{
+			mods = 0.95f;
+		} else if (modifiersUsed == 2)
+		{
+			mods = 0.9f;
+		} else if (modifiersUsed >= 3)
+		{
+			mods = 0.85f;
+		}
+
+		increase *= mods;
+
+		NBTTagCompound tag = TagUtil.getExtraTag(tool);
+		int repair = tag.getInteger(Tags.REPAIR_COUNT);
+		float repairDimishingReturns = (100 - repair / 2) / 100f;
+		if (repairDimishingReturns < 0.5f)
+		{
+			repairDimishingReturns = 0.5f;
+		}
+		increase *= repairDimishingReturns;
+
+		return (int) Math.ceil(increase);
+	}
+
+	/* Information */
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void addInformation(ItemStack stack, @Nullable World worldIn, List<String> tooltip, ITooltipFlag flagIn)
+	{
+		boolean shift = Util.isShiftKeyDown();
+		boolean ctrl = Util.isCtrlKeyDown();
+		// modifiers
+		if (!shift && !ctrl)
+		{
+			getTooltip(stack, tooltip);
+
+			tooltip.add("");
+			// info tooltip for detailed and componend info
+			tooltip.add(Util.translate("tooltip.tool.holdShift"));
+			tooltip.add(Util.translate("tooltip.tool.holdCtrl"));
+
+			// if(worldIn != null) {
+			// tooltip.add(TextFormatting.BLUE +
+			// I18n.translateToLocalFormatted("attribute.modifier.plus.0",
+			// Util.df.format(ToolHelper.getActualDamage(stack,
+			// Minecraft.getMinecraft().player)),
+			// I18n.translateToLocal("attribute.name.generic.attackDamage")));
+			// }
+		}
+		// detailed data
+		else if (Config.extraTooltips && shift)
+		{
+			getTooltipDetailed(stack, tooltip);
+		}
+		// component data
+		else if (Config.extraTooltips && ctrl)
+		{
+			getTooltipComponents(stack, tooltip);
+		}
+	}
+
+	@Override
+	public void getTooltip(ItemStack stack, List<String> tooltips)
+	{
+		// Default tooltip: modifiers
+		TooltipBuilder.addModifierTooltips(stack, tooltips);
+	}
+
+	@Nonnull
+	@Override
+	public EnumRarity getRarity(ItemStack stack)
+	{
+		// prevents enchanted items to have a different name color
+		return EnumRarity.COMMON;
+	}
+
+	@Override
+	public boolean isBookEnchantable(ItemStack stack, ItemStack book)
+	{
+		return false;
+	}
+
+	/* NBT loading */
+
+	@Override
+	public boolean updateItemStackNBT(NBTTagCompound nbt)
+	{
+		// when the itemstack is loaded from NBT we recalculate all the data
+		if (nbt.hasKey(Tags.BASE_DATA))
+		{
+			try
+			{
+				ArmorBuilder.rebuildArmor(nbt, this);
+			} catch (TinkerGuiException e)
+			{
+				// nothing to do
+			}
+		}
+
+		// return value shouldn't matter since it's never checked
+		return true;
+	}
 }
diff --git a/src/main/java/lance5057/tDefense/core/tools/bases/ArmorCore.java b/src/main/java/lance5057/tDefense/core/tools/bases/ArmorCore.java
index 44ca576..1355b97 100644
--- a/src/main/java/lance5057/tDefense/core/tools/bases/ArmorCore.java
+++ b/src/main/java/lance5057/tDefense/core/tools/bases/ArmorCore.java
@@ -1,179 +1,867 @@
 package lance5057.tDefense.core.tools.bases;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
 
-import lance5057.tDefense.core.materials.ArmorMaterialStats;
+import lance5057.tDefense.core.library.ArmorNBT;
+import lance5057.tDefense.core.library.ArmorTags;
 import lance5057.tDefense.core.tools.armor.renderers.ArmorRenderer;
-import lance5057.tDefense.util.ArmorNBT;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.attributes.AttributeModifier;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.EntityEquipmentSlot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.NonNullList;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.text.TextFormatting;
+import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
+import slimeknights.mantle.util.RecipeMatch;
+import slimeknights.tconstruct.common.ClientProxy;
+import slimeknights.tconstruct.common.config.Config;
+import slimeknights.tconstruct.library.TinkerRegistry;
 import slimeknights.tconstruct.library.Util;
-import slimeknights.tconstruct.library.materials.ExtraMaterialStats;
-import slimeknights.tconstruct.library.materials.HandleMaterialStats;
+import slimeknights.tconstruct.library.materials.HeadMaterialStats;
 import slimeknights.tconstruct.library.materials.IMaterialStats;
 import slimeknights.tconstruct.library.materials.Material;
 import slimeknights.tconstruct.library.materials.MaterialTypes;
+import slimeknights.tconstruct.library.modifiers.IModifier;
+import slimeknights.tconstruct.library.modifiers.ModifierNBT;
 import slimeknights.tconstruct.library.tinkering.Category;
+import slimeknights.tconstruct.library.tinkering.IToolStationDisplay;
 import slimeknights.tconstruct.library.tinkering.PartMaterialType;
+import slimeknights.tconstruct.library.tools.DualToolHarvestUtils;
+import slimeknights.tconstruct.library.tools.IAoeTool;
 import slimeknights.tconstruct.library.tools.IToolPart;
 import slimeknights.tconstruct.library.traits.ITrait;
 import slimeknights.tconstruct.library.utils.TagUtil;
 import slimeknights.tconstruct.library.utils.TinkerUtil;
 import slimeknights.tconstruct.library.utils.ToolHelper;
 import slimeknights.tconstruct.library.utils.TooltipBuilder;
+import slimeknights.tconstruct.tools.TinkerMaterials;
+import slimeknights.tconstruct.tools.TinkerTools;
+import slimeknights.tconstruct.tools.traits.InfiTool;
 
-public abstract class ArmorCore extends ArmorBase {
-	public ArmorCore(EntityEquipmentSlot slot, PartMaterialType... requiredComponents) {
+/**
+ * Intermediate abstraction layer for all tools/melee weapons. This class has
+ * all the callbacks for blocks and enemies so tools and weapons can share
+ * behaviour.
+ */
+public abstract class ArmorCore extends ArmorBase implements IToolStationDisplay
+{
+
+	public final static int		DEFAULT_MODIFIERS		= 3;
+	public static final String	TAG_SWITCHED_HAND_HAX	= "SwitchedHand";
+
+	public ArmorCore(EntityEquipmentSlot slot, PartMaterialType... requiredComponents)
+	{
 		super(slot, requiredComponents);
+
+		this.setCreativeTab(TinkerRegistry.tabTools);
+		this.setNoRepair(); // >_>
+
+		// TinkerRegistry.registerTool(this);
+		addCategory(Category.TOOL);
 	}
 
-	protected String getHarvestType() {
-		return null;
+	@Override
+	public int getMaxDamage(ItemStack stack)
+	{
+		return ToolHelper.getDurabilityStat(stack);
+	}
+
+	@Override
+	public void setDamage(ItemStack stack, int damage)
+	{
+		int max = getMaxDamage(stack);
+		super.setDamage(stack, Math.min(max, damage));
+
+		if (getDamage(stack) == max)
+		{
+			ToolHelper.breakTool(stack, null);
+		}
+	}
+
+	@Override
+	public boolean isDamageable()
+	{
+		return true;
+	}
+
+	@Override
+	public boolean showDurabilityBar(ItemStack stack)
+	{
+		return super.showDurabilityBar(stack) && !ToolHelper.isBroken(stack);
+	}
+
+	/* Tool and Weapon specific properties */
+
+	/**
+	 * Multiplier applied to the actual mining speed of the tool Internally a
+	 * hammer and pick have the same speed, but a hammer is 2/3 slower
+	 */
+	public float miningSpeedModifier()
+	{
+		return 1f;
+	}
+
+	/** Multiplier for damage from materials. Should be fixed per tool. */
+	public abstract float damagePotential();
+
+	/**
+	 * A fixed damage value where the calculations start to apply dimishing
+	 * returns. Basically if you'd hit more than that damage with this tool, the
+	 * damage is gradually reduced depending on how much the cutoff is exceeded.
+	 */
+	public float damageCutoff()
+	{
+		return 15.0f; // in general this should be sufficient and only needs
+						// increasing if it's a stronger weapon
+		// fun fact: diamond sword with sharpness V has 15 damage
+	}
+
+	/**
+	 * Allows you set the base attack speed, can be changed by modifiers.
+	 * Equivalent to the vanilla attack speed. 4 is equal to any standard item.
+	 * Value has to be greater than zero.
+	 */
+	public abstract double attackSpeed();
+
+	/**
+	 * Knockback modifier. Basically this takes the vanilla knockback on hit and
+	 * modifies it by this factor.
+	 */
+	public float knockback()
+	{
+		return 1.0f;
+	}
+
+	/**
+	 * Actually deal damage to the entity we hit. Can be overridden for special
+	 * behaviour
+	 *
+	 * @return True if the entity was hit. Usually the return value of
+	 *         {@link Entity#attackEntityFrom(DamageSource, float)}
+	 */
+	public boolean dealDamage(ItemStack stack, EntityLivingBase player, Entity entity, float damage)
+	{
+		if (player instanceof EntityPlayer)
+		{
+			return entity.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) player), damage);
+		}
+		return entity.attackEntityFrom(DamageSource.causeMobDamage(player), damage);
+	}
+
+	protected boolean readyForSpecialAttack(EntityLivingBase player)
+	{
+		return player instanceof EntityPlayer && ((EntityPlayer) player).getCooledAttackStrength(0.5f) > 0.9f;
+	}
+
+	/**
+	 * Called when an entity is getting damaged with the tool. Reduce the tools
+	 * durability accordingly player can be null!
+	 */
+	public void reduceDurabilityOnHit(ItemStack stack, EntityPlayer player, float damage)
+	{
+		damage = Math.max(1f, damage / 10f);
+		if (!hasCategory(Category.WEAPON))
+		{
+			damage *= 2;
+		}
+		ToolHelper.damageTool(stack, (int) damage, player);
+	}
+
+	// @Override
+	// public float getStrVsBlock(ItemStack stack, IBlockState state) {
+	// if(isEffective(state) || ToolHelper.isToolEffective(stack, state)) {
+	// return ToolHelper.calcDigSpeed(stack, state);
+	// }
+	// return super.getStrVsBlock(stack, state);
+	// }
+
+	public boolean isEffective(IBlockState state)
+	{
+		return false;
+	}
+
+	@Override
+	public boolean canHarvestBlock(@Nonnull IBlockState state, ItemStack stack)
+	{
+		return isEffective(state);
+	}
+
+	@Override
+	public boolean onBlockStartBreak(ItemStack itemstack, BlockPos pos, EntityPlayer player)
+	{
+		if (!ToolHelper.isBroken(itemstack) && this instanceof IAoeTool && ((IAoeTool) this).isAoeHarvestTool())
+		{
+			for (BlockPos extraPos : ((IAoeTool) this).getAOEBlocks(itemstack, player.getEntityWorld(), player, pos))
+			{
+				breakExtraBlock(itemstack, player.getEntityWorld(), player, extraPos, pos);
+			}
+		}
+
+		// this is a really dumb hack.
+		// Basically when something with silktouch harvests a block from the
+		// offhand
+		// the game can't detect that. so we have to switch around the items in
+		// the hands for the break call
+		// it's switched back in onBlockDestroyed
+		if (DualToolHarvestUtils.shouldUseOffhand(player, pos, player.getHeldItemMainhand()))
+		{
+			ItemStack off = player.getHeldItemOffhand();
+			switchItemsInHands(player);
+			// remember, off is in the mainhand now
+			NBTTagCompound tag = TagUtil.getTagSafe(off);
+			tag.setLong(TAG_SWITCHED_HAND_HAX, player.getEntityWorld().getTotalWorldTime());
+			off.setTagCompound(tag);
+		}
+
+		return breakBlock(itemstack, pos, player);
+	}
+
+	/**
+	 * Called to break the base block, return false to perform no breaking
+	 * 
+	 * @param itemstack
+	 *            Tool ItemStack
+	 * @param pos
+	 *            Current position
+	 * @param player
+	 *            Player instance
+	 * @return true if the normal block break code should be skipped
+	 */
+	protected boolean breakBlock(ItemStack itemstack, BlockPos pos, EntityPlayer player)
+	{
+		return super.onBlockStartBreak(itemstack, pos, player);
+	}
+
+	/**
+	 * Called when an AOE block is broken by the tool. Use to oveerride the
+	 * block breaking logic
+	 * 
+	 * @param tool
+	 *            Tool ItemStack
+	 * @param world
+	 *            World instance
+	 * @param player
+	 *            Player instance
+	 * @param pos
+	 *            Current position
+	 * @param refPos
+	 *            Base position
+	 */
+	protected void breakExtraBlock(ItemStack tool, World world, EntityPlayer player, BlockPos pos, BlockPos refPos)
+	{
+		ToolHelper.breakExtraBlock(tool, world, player, pos, refPos);
+	}
+
+	// @Override
+	// public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player,
+	// Entity entity) {
+	// return ToolHelper.attackEntity(stack, this, player, entity);
+	// }
+
+	@Override
+	public boolean onEntitySwing(EntityLivingBase entityLiving, ItemStack stack)
+	{
+		/*
+		 * if(attackSpeed() > 0) { int speed = Math.min(5, attackSpeed());
+		 * ToolHelper.swingItem(speed, entityLiving); return true; }
+		 */
+		return super.onEntitySwing(entityLiving, stack);
+	}
+
+	@Override
+	public boolean hitEntity(ItemStack stack, EntityLivingBase target, EntityLivingBase attacker)
+	{
+		float speed = ToolHelper.getActualAttackSpeed(stack);
+		int time = Math.round(20f / speed);
+		if (time < target.hurtResistantTime / 2)
+		{
+			target.hurtResistantTime = (target.hurtResistantTime + time) / 2;
+			target.hurtTime = (target.hurtTime + time) / 2;
+		}
+		return super.hitEntity(stack, target, attacker);
 	}
 
+	@Nonnull
 	@Override
-	public abstract NBTTagCompound buildTag(List<slimeknights.tconstruct.library.materials.Material> materials);
+	public Multimap<String, AttributeModifier> getAttributeModifiers(@Nonnull EntityEquipmentSlot slot, ItemStack stack)
+	{
+		Multimap<String, AttributeModifier> multimap = super.getAttributeModifiers(slot, stack);
+
+		if (slot == EntityEquipmentSlot.MAINHAND && !ToolHelper.isBroken(stack))
+		{
+			multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", ToolHelper.getActualAttack(stack), 0));
+			multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", ToolHelper.getActualAttackSpeed(stack) - 4d, 0));
+		}
+
+		NBTTagList traitsTagList = TagUtil.getTraitsTagList(stack);
+		for (int i = 0; i < traitsTagList.tagCount(); i++)
+		{
+			ITrait trait = TinkerRegistry.getTrait(traitsTagList.getStringTagAt(i));
+			if (trait != null)
+			{
+				trait.getAttributeModifiers(slot, stack, multimap);
+			}
+		}
 
-	public int getArmorDisplay(ItemStack stack) {
-		return TagUtil.getToolStats(stack).get().getInteger("ArmorRating");
+		return multimap;
+	}
+
+	@Override
+	public List<String> getInformation(ItemStack stack)
+	{
+		return getInformation(stack, true);
+	}
+
+	@Override
+	public void getTooltip(ItemStack stack, List<String> tooltips)
+	{
+		if (ToolHelper.isBroken(stack))
+		{
+			tooltips.add("" + TextFormatting.DARK_RED + TextFormatting.BOLD + getBrokenTooltip(stack));
+		}
+		super.getTooltip(stack, tooltips);
+	}
+
+	protected String getBrokenTooltip(ItemStack itemStack)
+	{
+		return Util.translate(TooltipBuilder.LOC_Broken);
+	}
+
+	@Override
+	public void getTooltipDetailed(ItemStack stack, List<String> tooltips)
+	{
+		tooltips.addAll(getInformation(stack, false));
+	}
+
+	public List<String> getInformation(ItemStack stack, boolean detailed)
+	{
+		TooltipBuilder info = new TooltipBuilder(stack);
+
+		info.addDurability(!detailed);
+		if (hasCategory(Category.HARVEST))
+		{
+			info.addHarvestLevel();
+			info.addMiningSpeed();
+		}
+		if (hasCategory(Category.LAUNCHER))
+		{
+			info.addDrawSpeed();
+			info.addRange();
+			info.addProjectileBonusDamage();
+		}
+		info.addAttack();
+
+		if (ToolHelper.getFreeModifiers(stack) > 0)
+		{
+			info.addFreeModifiers();
+		}
+
+		if (detailed)
+		{
+			info.addModifierInfo();
+		}
+
+		return info.getTooltip();
+	}
+
+	@Override
+	public void getTooltipComponents(ItemStack stack, List<String> tooltips)
+	{
+		List<Material> materials = TinkerUtil.getMaterialsFromTagList(TagUtil.getBaseMaterialsTagList(stack));
+		List<PartMaterialType> component = getRequiredComponents();
+
+		if (materials.size() < component.size())
+		{
+			return;
+		}
+
+		for (int i = 0; i < component.size(); i++)
+		{
+			PartMaterialType pmt = component.get(i);
+			Material material = materials.get(i);
+
+			// get (one possible) toolpart used to craft the thing
+			Iterator<IToolPart> partIter = pmt.getPossibleParts().iterator();
+			if (!partIter.hasNext())
+			{
+				continue;
+			}
+
+			IToolPart part = partIter.next();
+			ItemStack partStack = part.getItemstackWithMaterial(material);
+			if (partStack != null)
+			{
+				// we have the part, add it
+				tooltips.add(material.getTextColor() + TextFormatting.UNDERLINE + partStack.getDisplayName());
+
+				Set<ITrait> usedTraits = Sets.newHashSet();
+				// find out which stats and traits it contributes and add it to
+				// the tooltip
+				for (IMaterialStats stats : material.getAllStats())
+				{
+					if (pmt.usesStat(stats.getIdentifier()))
+					{
+						tooltips.addAll(stats.getLocalizedInfo());
+						for (ITrait trait : pmt.getApplicableTraitsForMaterial(material))
+						{
+							if (!usedTraits.contains(trait))
+							{
+								tooltips.add(material.getTextColor() + trait.getLocalizedName());
+								usedTraits.add(trait);
+							}
+						}
+					}
+				}
+				tooltips.add("");
+			}
+		}
+	}
+
+	@Nonnull
+	@SideOnly(Side.CLIENT)
+	@Override
+	public FontRenderer getFontRenderer(ItemStack stack)
+	{
+		return ClientProxy.fontRenderer;
 	}
 
 	@SideOnly(Side.CLIENT)
-	public abstract List<String> getArmorTexture(ItemStack stack);
+	@Override
+	public boolean hasEffect(ItemStack stack)
+	{
+		return TagUtil.hasEnchantEffect(stack);
+	}
+
+	@Nonnull
+	@Override
+	public String getItemStackDisplayName(@Nonnull ItemStack stack)
+	{
+		// if the tool is not named we use the repair tools for a prefix like
+		// thing
+		List<Material> materials = TinkerUtil.getMaterialsFromTagList(TagUtil.getBaseMaterialsTagList(stack));
+		// we save all the ones for the name in a set so we don't have the same
+		// material in it twice
+		Set<Material> nameMaterials = Sets.newLinkedHashSet();
+
+		for (int index : getRepairParts())
+		{
+			if (index < materials.size())
+			{
+				nameMaterials.add(materials.get(index));
+			}
+		}
+
+		return Material.getCombinedItemName(super.getItemStackDisplayName(stack), nameMaterials);
+	}
+
+	// Creative tab items
+	@Override
+	public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> subItems)
+	{
+		if (this.isInCreativeTab(tab))
+		{
+			addDefaultSubItems(subItems);
+		}
+	}
+
+	protected void addDefaultSubItems(List<ItemStack> subItems, Material... fixedMaterials)
+	{
+		for (Material head : TinkerRegistry.getAllMaterials())
+		{
+			List<Material> mats = new ArrayList<>(requiredComponents.length);
+
+			for (int i = 0; i < requiredComponents.length; i++)
+			{
+				if (fixedMaterials.length > i && fixedMaterials[i] != null && requiredComponents[i].isValidMaterial(fixedMaterials[i]))
+				{
+					mats.add(fixedMaterials[i]);
+				} else
+				{
+					// todo: check for applicability with stats
+					mats.add(head);
+				}
+			}
+
+			ItemStack tool = buildItem(mats);
+			// only valid ones
+			if (hasValidMaterials(tool))
+			{
+				subItems.add(tool);
+				if (!Config.listAllMaterials)
+				{
+					break;
+				}
+			}
+		}
+	}
+
+	protected void addInfiTool(List<ItemStack> subItems, String name)
+	{
+		ItemStack tool = getInfiTool(name);
+		if (hasValidMaterials(tool))
+		{
+			subItems.add(tool);
+		}
+	}
+
+	protected ItemStack getInfiTool(String name)
+	{
+		// The InfiHarvester!
+		List<Material> materials = ImmutableList.of(TinkerMaterials.slime, TinkerMaterials.cobalt, TinkerMaterials.ardite, TinkerMaterials.ardite);
+		materials = materials.subList(0, requiredComponents.length);
+		ItemStack tool = buildItem(materials);
+		tool.setStackDisplayName(name);
+		InfiTool.INSTANCE.apply(tool);
+
+		return tool;
+	}
+
+	@Override
+	public int getHarvestLevel(ItemStack stack, String toolClass, @Nullable EntityPlayer player, @Nullable IBlockState blockState)
+	{
+		if (ToolHelper.isBroken(stack))
+		{
+			return -1;
+		}
+
+		if (this.getToolClasses(stack).contains(toolClass))
+		{
+			// will return 0 if the tag has no info anyway
+			return ToolHelper.getHarvestLevelStat(stack);
+		}
+
+		return super.getHarvestLevel(stack, toolClass, player, blockState);
+	}
+
+	@Override
+	public Set<String> getToolClasses(ItemStack stack)
+	{
+		// no classes if broken
+		if (ToolHelper.isBroken(stack))
+		{
+			return Collections.emptySet();
+		}
+		return super.getToolClasses(stack);
+	}
+
+	/**
+	 * A simple string identifier for the tool, used for identification in
+	 * texture generation etc.
+	 */
+	public String getIdentifier()
+	{
+		return getRegistryName().getResourcePath();
+	}
+
+	/** The tools name completely without material information */
+	@Override
+	public String getLocalizedToolName()
+	{
+		return Util.translate(getUnlocalizedName() + ".name");
+	}
+
+	/** The tools name with the given material. e.g. "Wooden Pickaxe" */
+	public String getLocalizedToolName(Material material)
+	{
+		return material.getLocalizedItemName(getLocalizedToolName());
+	}
+
+	/** Returns info about the Tool. Displayed in the tool stations etc. */
+	public String getLocalizedDescription()
+	{
+		return Util.translate(getUnlocalizedName() + ".desc");
+	}
+
+	@Override
+	protected int repairCustom(Material material, NonNullList<ItemStack> repairItems)
+	{
+		Optional<RecipeMatch.Match> matchOptional = RecipeMatch.of(TinkerTools.sharpeningKit).matches(repairItems);
+		if (!matchOptional.isPresent())
+		{
+			return 0;
+		}
+
+		RecipeMatch.Match match = matchOptional.get();
+		for (ItemStack stacks : match.stacks)
+		{
+			// invalid material?
+			if (TinkerTools.sharpeningKit.getMaterial(stacks) != material)
+			{
+				return 0;
+			}
+		}
+
+		RecipeMatch.removeMatch(repairItems, match);
+		HeadMaterialStats stats = material.getStats(MaterialTypes.HEAD);
+		float durability = stats.durability * match.amount * TinkerTools.sharpeningKit.getCost();
+		durability /= Material.VALUE_Ingot;
+		return (int) (durability);
+	}
+
+	/* Additional Trait callbacks */
+
+	@Override
+	public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected)
+	{
+		super.onUpdate(stack, worldIn, entityIn, itemSlot, isSelected);
+
+		onUpdateTraits(stack, worldIn, entityIn, itemSlot, isSelected);
+	}
+
+	protected void onUpdateTraits(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected)
+	{
+		if (!isSelected && entityIn instanceof EntityPlayer && ((EntityPlayer) entityIn).getHeldItemOffhand() == stack)
+		{
+			isSelected = true;
+		}
+		NBTTagList list = TagUtil.getTraitsTagList(stack);
+		for (int i = 0; i < list.tagCount(); i++)
+		{
+			ITrait trait = TinkerRegistry.getTrait(list.getStringTagAt(i));
+			if (trait != null)
+			{
+				trait.onUpdate(stack, worldIn, entityIn, itemSlot, isSelected);
+			}
+		}
+	}
+
+	@Override
+	public boolean onBlockDestroyed(ItemStack stack, World worldIn, IBlockState state, BlockPos pos, EntityLivingBase entityLiving)
+	{
+		// move item back into offhand. See onBlockBreakStart
+		if (stack != null && entityLiving != null && stack.hasTagCompound())
+		{
+			NBTTagCompound tag = stack.getTagCompound();
+			assert tag != null;
+			if (tag.getLong(TAG_SWITCHED_HAND_HAX) == entityLiving.getEntityWorld().getTotalWorldTime())
+			{
+				tag.removeTag(TAG_SWITCHED_HAND_HAX);
+				stack.setTagCompound(tag);
+
+				switchItemsInHands(entityLiving);
+			}
+		}
+		if (ToolHelper.isBroken(stack))
+		{
+			return false;
+		}
+
+		boolean effective = isEffective(state) || ToolHelper.isToolEffective(stack, worldIn.getBlockState(pos));
+		int damage = effective ? 1 : 2;
+
+		afterBlockBreak(stack, worldIn, state, pos, entityLiving, damage, effective);
+
+		return hasCategory(Category.TOOL);
+	}
+
+	protected void switchItemsInHands(EntityLivingBase entityLiving)
+	{
+		ItemStack main = entityLiving.getHeldItemMainhand();
+		ItemStack off = entityLiving.getHeldItemOffhand();
+		entityLiving.setHeldItem(EnumHand.OFF_HAND, main);
+		entityLiving.setHeldItem(EnumHand.MAIN_HAND, off);
+	}
+
+	public void afterBlockBreak(ItemStack stack, World world, IBlockState state, BlockPos pos, EntityLivingBase player, int damage, boolean wasEffective)
+	{
+		NBTTagList list = TagUtil.getTraitsTagList(stack);
+		for (int i = 0; i < list.tagCount(); i++)
+		{
+			ITrait trait = TinkerRegistry.getTrait(list.getStringTagAt(i));
+			if (trait != null)
+			{
+				trait.afterBlockBreak(stack, world, state, pos, player, wasEffective);
+			}
+		}
+
+		ToolHelper.damageTool(stack, damage, player);
+	}
+
+	// elevate to public
+	@Override
+	public RayTraceResult rayTrace(@Nonnull World worldIn, @Nonnull EntityPlayer playerIn, boolean useLiquids)
+	{
+		return super.rayTrace(worldIn, playerIn, useLiquids);
+	}
+
+	protected void preventSlowDown(Entity entityIn, float originalSpeed)
+	{
+		TinkerTools.proxy.preventPlayerSlowdown(entityIn, originalSpeed, this);
+	}
+
+	@Override
+	public boolean shouldCauseBlockBreakReset(ItemStack oldStack, ItemStack newStack)
+	{
+		return shouldCauseReequipAnimation(oldStack, newStack, false);
+	}
 
 	@SideOnly(Side.CLIENT)
-	@Nullable
-    public abstract ArmorRenderer getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack);
-
-	public ArmorNBT buildDefaultArmorTag(List<Material> materials, String type) {
-		ArmorNBT data = new ArmorNBT();
-
-		if (materials.size() >= 2) {
-			HandleMaterialStats handle = materials.get(0).getStatsOrUnknown(MaterialTypes.HANDLE);
-			ArmorMaterialStats head = materials.get(1).getStatsOrUnknown(type);
-			// start with head
-			data.head(head);
-
-			// add in accessories if present
-			if (materials.size() >= 3) {
-				ExtraMaterialStats binding = materials.get(2).getStatsOrUnknown(MaterialTypes.EXTRA);
-				data.extra(binding);
+	@Override
+	public boolean shouldCauseReequipAnimation(ItemStack oldStack, @Nonnull ItemStack newStack, boolean slotChanged)
+	{
+		if (TagUtil.getResetFlag(newStack))
+		{
+			TagUtil.setResetFlag(newStack, false);
+			return true;
+		}
+		if (oldStack == newStack)
+		{
+			return false;
+		}
+		if (slotChanged)
+		{
+			return true;
+		}
+
+		if (oldStack.hasEffect() != newStack.hasEffect())
+		{
+			return true;
+		}
+
+		Multimap<String, AttributeModifier> attributesNew = newStack.getAttributeModifiers(EntityEquipmentSlot.MAINHAND);
+		Multimap<String, AttributeModifier> attributesOld = oldStack.getAttributeModifiers(EntityEquipmentSlot.MAINHAND);
+
+		if (attributesNew.size() != attributesOld.size())
+		{
+			return true;
+		}
+		for (String key : attributesOld.keySet())
+		{
+			if (!attributesNew.containsKey(key))
+			{
+				return true;
+			}
+			Iterator<AttributeModifier> iter1 = attributesNew.get(key).iterator();
+			Iterator<AttributeModifier> iter2 = attributesOld.get(key).iterator();
+			while (iter1.hasNext() && iter2.hasNext())
+			{
+				if (!iter1.next().equals(iter2.next()))
+				{
+					return true;
+				}
 			}
+		}
+
+		if (oldStack.getItem() == newStack.getItem() && newStack.getItem() instanceof ArmorCore)
+		{
+			return !isEqualTinkersItem(oldStack, newStack);
+		}
+		return !ItemStack.areItemStacksEqual(oldStack, newStack);
+	}
+
+	/**
+	 * Builds a default tool from: 1. Handle 2. Head 3. Accessoire (if present)
+	 */
+	protected ArmorNBT buildDefaultTag(List<Material> materials)
+	{
+		return null;
+		
+	}
+
+	public static boolean isEqualTinkersItem(ItemStack item1, ItemStack item2)
+	{
+		if (item1 == null || item2 == null || item1.getItem() != item2.getItem())
+		{
+			return false;
+		}
+		if (!(item1.getItem() instanceof ArmorCore))
+		{
+			return false;
+		}
+
+		NBTTagCompound tag1 = TagUtil.getTagSafe(item1);
+		NBTTagCompound tag2 = TagUtil.getTagSafe(item2);
+
+		NBTTagList mods1 = TagUtil.getModifiersTagList(tag1);
+		NBTTagList mods2 = TagUtil.getModifiersTagList(tag2);
 
-			// calculate handle impact
-			data.handle(handle);
+		if (mods1.tagCount() != mods1.tagCount())
+		{
+			return false;
 		}
 
-		// 3 free modifiers
-		data.modifiers = 5;
+		// check modifiers
+		for (int i = 0; i < mods1.tagCount(); i++)
+		{
+			NBTTagCompound tag = mods1.getCompoundTagAt(i);
+			ModifierNBT data = ModifierNBT.readTag(tag);
+			IModifier modifier = TinkerRegistry.getModifier(data.identifier);
+			if (modifier != null && !modifier.equalModifier(tag, mods2.getCompoundTagAt(i)))
+			{
+				return false;
+			}
+		}
+
+		return TagUtil.getBaseMaterialsTagList(tag1).equals(TagUtil.getBaseMaterialsTagList(tag2)) && // materials
+																										// used
+				TagUtil.getBaseModifiersUsed(tag1) == TagUtil.getBaseModifiersUsed(tag2) && // number
+																							// of
+																							// free
+																							// modifiers
+																							// used
+				TagUtil.getOriginalToolStats(tag1).equals(TagUtil.getOriginalToolStats(tag2)); // unmodified
+																								// base
+																								// stats
+	}
+
+	public EntityEquipmentSlot getArmorSlot(ItemStack stack, EntityEquipmentSlot armorType)
+	{
+		return null;
+	}
 
-		return data;
+	@SideOnly(Side.CLIENT)
+	public ArmorRenderer getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack)
+	{
+		return null;
 	}
 	
 	@Override
-	public boolean isValidArmor(ItemStack stack, EntityEquipmentSlot armorType, Entity entity)
-    {
-        return armorType == getArmorSlot(stack, armorType);
-    }
-	
-	public abstract EntityEquipmentSlot getArmorSlot(ItemStack stack, EntityEquipmentSlot armorType);
+	public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type)
+	{
+		String s = TagUtil.getTagSafe(TagUtil.getTagSafe(stack), ArmorTags.DynTex).getString(ArmorTags.TexLoc);
+		if((s == "" || s == null) || !checkForTexture(s))
+		{
+			NBTTagCompound texTag = setupTexture(TinkerUtil.getMaterialsFromTagList(TagUtil.getBaseMaterialsTagList(stack)));
+			if (texTag != null)
+				TagUtil.getTagSafe(stack).setTag(ArmorTags.DynTex, texTag);
+			NBTTagCompound n = TagUtil.getTagSafe(TagUtil.getTagSafe(stack), ArmorTags.DynTex);
+			s = n.getString(ArmorTags.TexLoc);
+		}
+		return s;
+	}
 	
-	@Override
-	  public void getTooltip(ItemStack stack, List<String> tooltips) {
-	    if(ToolHelper.isBroken(stack)) {
-	      tooltips.add("" + TextFormatting.DARK_RED + TextFormatting.BOLD + getBrokenTooltip(stack));
-	    }
-	    super.getTooltip(stack, tooltips);
-	  }
-
-	  protected String getBrokenTooltip(ItemStack itemStack) {
-	    return Util.translate(TooltipBuilder.LOC_Broken);
-	  }
-
-	  @Override
-	  public void getTooltipDetailed(ItemStack stack, List<String> tooltips) {
-	    tooltips.addAll(getInformation(stack, false));
-	  }
-	  
-	  public List<String> getInformation(ItemStack stack, boolean detailed) {
-		    TooltipBuilder info = new TooltipBuilder(stack);
-
-		    info.addDurability(!detailed);
-		    if(hasCategory(Category.HARVEST)) {
-		      info.addHarvestLevel();
-		      info.addMiningSpeed();
-		    }
-		    if(hasCategory(Category.LAUNCHER)) {
-		      info.addDrawSpeed();
-		      info.addRange();
-		      info.addProjectileBonusDamage();
-		    }
-		    info.addAttack();
-
-		    if(ToolHelper.getFreeModifiers(stack) > 0) {
-		      info.addFreeModifiers();
-		    }
-
-		    if(detailed) {
-		      info.addModifierInfo();
-		    }
-
-		    return info.getTooltip();
-		  }
-	  
-	  @Override
-	  public void getTooltipComponents(ItemStack stack, List<String> tooltips) {
-	    List<Material> materials = TinkerUtil.getMaterialsFromTagList(TagUtil.getBaseMaterialsTagList(stack));
-	    List<PartMaterialType> component = getRequiredComponents();
-
-	    if(materials.size() < component.size()) {
-	      return;
-	    }
-
-	    for(int i = 0; i < component.size(); i++) {
-	      PartMaterialType pmt = component.get(i);
-	      Material material = materials.get(i);
-
-	      // get (one possible) toolpart used to craft the thing
-	      Iterator<IToolPart> partIter = pmt.getPossibleParts().iterator();
-	      if(!partIter.hasNext()) {
-	        continue;
-	      }
-
-	      IToolPart part = partIter.next();
-	      ItemStack partStack = part.getItemstackWithMaterial(material);
-	      if(partStack != null) {
-	        // we have the part, add it
-	        tooltips.add(material.getTextColor() + TextFormatting.UNDERLINE + partStack.getDisplayName());
-
-	        Set<ITrait> usedTraits = Sets.newHashSet();
-	        // find out which stats and traits it contributes and add it to the tooltip
-	        for(IMaterialStats stats : material.getAllStats()) {
-	          if(pmt.usesStat(stats.getIdentifier())) {
-	            tooltips.addAll(stats.getLocalizedInfo());
-	            for(ITrait trait : pmt.getApplicableTraitsForMaterial(material)) {
-	              if(!usedTraits.contains(trait)) {
-	                tooltips.add(material.getTextColor() + trait.getLocalizedName());
-	                usedTraits.add(trait);
-	              }
-	            }
-	          }
-	        }
-	        tooltips.add("");
-	      }
-	    }
-	  }
-
-}
+	private boolean checkForTexture(String s)
+	{
+		if(Minecraft.getMinecraft().getTextureManager().getTexture(new ResourceLocation(s)) != null)
+			return true;
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/lance5057/tDefense/core/tools/basic/HeaterShield.java b/src/main/java/lance5057/tDefense/core/tools/basic/HeaterShield.java
index f70dca9..e3f9253 100644
--- a/src/main/java/lance5057/tDefense/core/tools/basic/HeaterShield.java
+++ b/src/main/java/lance5057/tDefense/core/tools/basic/HeaterShield.java
@@ -1,6 +1,6 @@
 package lance5057.tDefense.core.tools.basic;
 
-import lance5057.tDefense.core.materials.ShieldMaterialStats;
+import lance5057.tDefense.core.materials.stats.ShieldMaterialStats;
 import lance5057.tDefense.core.parts.TDParts;
 import lance5057.tDefense.core.tools.bases.Shield;
 import slimeknights.tconstruct.library.tinkering.PartMaterialType;
diff --git a/src/main/java/lance5057/tDefense/core/tools/basic/RoundShield.java b/src/main/java/lance5057/tDefense/core/tools/basic/RoundShield.java
index ff4388a..ddfd7f4 100644
--- a/src/main/java/lance5057/tDefense/core/tools/basic/RoundShield.java
+++ b/src/main/java/lance5057/tDefense/core/tools/basic/RoundShield.java
@@ -1,6 +1,6 @@
 package lance5057.tDefense.core.tools.basic;
 
-import lance5057.tDefense.core.materials.ShieldMaterialStats;
+import lance5057.tDefense.core.materials.stats.ShieldMaterialStats;
 import lance5057.tDefense.core.parts.TDParts;
 import lance5057.tDefense.core.tools.bases.Shield;
 import slimeknights.tconstruct.library.tinkering.PartMaterialType;
diff --git a/src/main/java/lance5057/tDefense/core/tools/basic/TowerShield.java b/src/main/java/lance5057/tDefense/core/tools/basic/TowerShield.java
index ebaf791..d5bd9e8 100644
--- a/src/main/java/lance5057/tDefense/core/tools/basic/TowerShield.java
+++ b/src/main/java/lance5057/tDefense/core/tools/basic/TowerShield.java
@@ -1,6 +1,6 @@
 package lance5057.tDefense.core.tools.basic;
 
-import lance5057.tDefense.core.materials.ShieldMaterialStats;
+import lance5057.tDefense.core.materials.stats.ShieldMaterialStats;
 import lance5057.tDefense.core.parts.TDParts;
 import lance5057.tDefense.core.tools.bases.Shield;
 import slimeknights.tconstruct.library.tinkering.PartMaterialType;
diff --git a/src/main/java/lance5057/tDefense/core/tools/baubles/Sheathe.java b/src/main/java/lance5057/tDefense/core/tools/baubles/Sheathe.java
index f6f2c3b..8c84171 100644
--- a/src/main/java/lance5057/tDefense/core/tools/baubles/Sheathe.java
+++ b/src/main/java/lance5057/tDefense/core/tools/baubles/Sheathe.java
@@ -2,6 +2,8 @@ package lance5057.tDefense.core.tools.baubles;
 
 import baubles.api.BaubleType;
 import lance5057.tDefense.Reference;
+import lance5057.tDefense.core.materials.stats.FabricMaterialStats;
+import lance5057.tDefense.core.parts.TDParts;
 import lance5057.tDefense.core.tools.bases.BaubleTool;
 import lance5057.tDefense.proxy.ClientProxy;
 import net.minecraft.client.Minecraft;
@@ -16,8 +18,9 @@ public class Sheathe extends BaubleTool {
 	private static final ResourceLocation texture = new ResourceLocation(Reference.MOD_ID, "textures/model/sheathe.png");
 
 	public Sheathe(PartMaterialType... requiredComponents) {
-		super(PartMaterialType.head(TinkerTools.largePlate), PartMaterialType.handle(TinkerTools.toolRod),
-				PartMaterialType.bowstring(TinkerTools.bowString));
+		super(PartMaterialType.head(TDParts.armorPlate), PartMaterialType.handle(TDParts.clasp),
+			new PartMaterialType(TDParts.fabric, FabricMaterialStats.TYPE),
+			PartMaterialType.extra(TDParts.filigree));
 
 	}
 
diff --git a/src/main/java/lance5057/tDefense/holiday/HolidayBase.java b/src/main/java/lance5057/tDefense/holiday/HolidayBase.java
index 80cb4e0..4700f6b 100644
--- a/src/main/java/lance5057/tDefense/holiday/HolidayBase.java
+++ b/src/main/java/lance5057/tDefense/holiday/HolidayBase.java
@@ -3,7 +3,7 @@ package lance5057.tDefense.holiday;
 import java.util.Calendar;
 
 import lance5057.tDefense.Reference;
-import lance5057.tDefense.util.ModuleBase;
+import lance5057.tDefense.core.library.ModuleBase;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemFood;
diff --git a/src/main/java/lance5057/tDefense/holiday/xmas/XmasBase.java b/src/main/java/lance5057/tDefense/holiday/xmas/XmasBase.java
index 5ce4017..3c3f43d 100644
--- a/src/main/java/lance5057/tDefense/holiday/xmas/XmasBase.java
+++ b/src/main/java/lance5057/tDefense/holiday/xmas/XmasBase.java
@@ -1,9 +1,9 @@
 package lance5057.tDefense.holiday.xmas;
 
 import lance5057.tDefense.TinkersDefense;
+import lance5057.tDefense.core.library.ItemsBase;
+import lance5057.tDefense.core.library.ModuleBase;
 import lance5057.tDefense.holiday.xmas.gumdropslime.GumDropSlime;
-import lance5057.tDefense.util.ItemsBase;
-import lance5057.tDefense.util.ModuleBase;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
diff --git a/src/main/java/lance5057/tDefense/holiday/xmas/XmasItems.java b/src/main/java/lance5057/tDefense/holiday/xmas/XmasItems.java
index 0df5a97..789e18e 100644
--- a/src/main/java/lance5057/tDefense/holiday/xmas/XmasItems.java
+++ b/src/main/java/lance5057/tDefense/holiday/xmas/XmasItems.java
@@ -1,7 +1,7 @@
 package lance5057.tDefense.holiday.xmas;
 
-import lance5057.tDefense.util.ItemsBase;
-import lance5057.tDefense.util.MetaItem;
+import lance5057.tDefense.core.library.ItemsBase;
+import lance5057.tDefense.core.library.MetaItem;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
diff --git a/src/main/java/lance5057/tDefense/proxy/ClientProxy.java b/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
index 5b697ae..94cc8a5 100644
--- a/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
+++ b/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
@@ -10,17 +10,19 @@ import lance5057.tDefense.Reference;
 import lance5057.tDefense.TD_Commands;
 import lance5057.tDefense.TinkersDefense;
 import lance5057.tDefense.core.items.TDOreDictItem;
+import lance5057.tDefense.core.library.ArmorBuildGuiInfo;
+import lance5057.tDefense.core.library.ArmorPart;
+import lance5057.tDefense.core.library.CustomArmorTextureCreator;
+import lance5057.tDefense.core.library.TDClientRegistry;
+import lance5057.tDefense.core.library.TDModelLoader;
+import lance5057.tDefense.core.library.TDModelRegistar;
 import lance5057.tDefense.core.materials.TDMaterials;
-import lance5057.tDefense.core.parts.TDParts;
 import lance5057.tDefense.core.renderers.BaubleRenderer;
 import lance5057.tDefense.core.renderers.SheatheModel;
 import lance5057.tDefense.core.tools.TDTools;
 import lance5057.tDefense.core.tools.armor.renderers.layers.LayerTDBipedArmor;
 import lance5057.tDefense.core.tools.bases.ArmorCore;
 import lance5057.tDefense.renderers.deserializers.AlphaColorTextureDeserializer;
-import lance5057.tDefense.util.ArmorBuildGuiInfo;
-import lance5057.tDefense.util.TDClientRegistry;
-import lance5057.tDefense.util.TDModelRegistar;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
@@ -36,11 +38,14 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.ClientCommandHandler;
 import net.minecraftforge.client.model.ModelLoader;
+import net.minecraftforge.client.model.ModelLoaderRegistry;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fml.common.Mod;
 import slimeknights.tconstruct.common.ModelRegisterUtil;
 import slimeknights.tconstruct.library.TinkerRegistry;
 import slimeknights.tconstruct.library.TinkerRegistryClient;
+import slimeknights.tconstruct.library.client.CustomTextureCreator;
 import slimeknights.tconstruct.library.client.ToolBuildGuiInfo;
 import slimeknights.tconstruct.library.client.material.MaterialRenderInfoLoader;
 import slimeknights.tconstruct.library.materials.Material;
@@ -54,6 +59,8 @@ public class ClientProxy extends CommonProxy {
 	// ModifierSoulHandler SoulHandler;
 
 	// public static ModelTinkersTabard sheath;
+	
+	private static final TDModelLoader loader = new TDModelLoader();
 
 	ToolBuildGuiInfo roundshieldGUI;
 	ToolBuildGuiInfo heatershieldGUI;
@@ -79,20 +86,18 @@ public class ClientProxy extends CommonProxy {
 	ArmorBuildGuiInfo sabatonsGUI;
 
 	ToolBuildGuiInfo sheatheGUI;
-	ToolBuildGuiInfo ringGUI;
-	ToolBuildGuiInfo amuletGUI;
+//	ToolBuildGuiInfo ringGUI;
+//	ToolBuildGuiInfo amuletGUI;
 
 	public static SheatheModel sheathe;
 
 	@Override
 	public void preInit() {
 		ClientCommandHandler.instance.registerCommand(new TD_Commands());
-
+		ModelLoaderRegistry.registerLoader(loader);
 		MaterialRenderInfoLoader.addRenderInfo("alpha_color", AlphaColorTextureDeserializer.class);
 		
-		//register all armor textures into tinkers
-		//CustomTextureCreator.registerTexture(new ResourceLocation(Reference.MOD_ID, "armor/hood/_hood_cloth"));
-
+		MinecraftForge.EVENT_BUS.register(CustomArmorTextureCreator.INSTANCE);
 	}
 
 	@Override
@@ -101,11 +106,11 @@ public class ClientProxy extends CommonProxy {
 		RenderPlayer render;
 		render = skinMap.get("default");
 		render.addLayer(new BaubleRenderer());
-		render.addLayer(new LayerTDBipedArmor(render));
+		//render.addLayer(new LayerTDBipedArmor(render));
 
 		render = skinMap.get("slim");
 		render.addLayer(new BaubleRenderer());
-		render.addLayer(new LayerTDBipedArmor(render));
+		//render.addLayer(new LayerTDBipedArmor(render));
 
 		createToolGuis();
 		setToolGuis();
@@ -154,6 +159,11 @@ public class ClientProxy extends CommonProxy {
 	public void registerPartModel(ToolPart part) {
 		ModelRegisterUtil.registerPartModel(part);
 	}
+	
+	@Override
+	public void registerArmorPartModel(ArmorPart part) { 
+		ModelRegisterUtil.registerPartModel(part);
+	}
 
 	@Override
 	public void registerMatColor(Material mat, int color) {
@@ -181,8 +191,8 @@ public class ClientProxy extends CommonProxy {
 		sabatonsGUI = new ArmorBuildGuiInfo(TDTools.sabatons);
 
 		sheatheGUI = new ToolBuildGuiInfo(TDTools.sheathe);
-		ringGUI = new ToolBuildGuiInfo(TDTools.ring);
-		amuletGUI = new ToolBuildGuiInfo(TDTools.amulet);
+//		ringGUI = new ToolBuildGuiInfo(TDTools.ring);
+//		amuletGUI = new ToolBuildGuiInfo(TDTools.amulet);
 
 	}
 
@@ -231,9 +241,9 @@ public class ClientProxy extends CommonProxy {
 		shearsGUI.addSlotPosition(43, 33 + 8);
 		shearsGUI.addSlotPosition(34, 51 + 8);
 
-		ringGUI.addSlotPosition(34, 15 + 8);
-		ringGUI.addSlotPosition(43, 33 + 8);
-		ringGUI.addSlotPosition(34, 51 + 8);
+//		ringGUI.addSlotPosition(34, 15 + 8);
+//		ringGUI.addSlotPosition(43, 33 + 8);
+//		ringGUI.addSlotPosition(34, 51 + 8);
 		
 		breastplateGUI.addSlotPosition(34, 15 + 8);
 		breastplateGUI.addSlotPosition(43, 33 + 8);
@@ -262,26 +272,27 @@ public class ClientProxy extends CommonProxy {
 		//TinkerRegistryClient.addToolBuilding(bootsGUI);
 
 		TinkerRegistryClient.addToolBuilding(sheatheGUI);
-		TinkerRegistryClient.addToolBuilding(ringGUI);
-		TinkerRegistryClient.addToolBuilding(amuletGUI);
-		
+//		TinkerRegistryClient.addToolBuilding(ringGUI);
+//		TinkerRegistryClient.addToolBuilding(amuletGUI);
+//		
 		TDClientRegistry.addArmorBuilding(helmGUI);
 		TDClientRegistry.addArmorBuilding(breastplateGUI);
 		TDClientRegistry.addArmorBuilding(grievesGUI);
 		TDClientRegistry.addArmorBuilding(sabatonsGUI);
 	}
 
-	public void registerPartModels() {
-		ModelRegisterUtil.registerPartModel(TDParts.armorPlate);
-		ModelRegisterUtil.registerPartModel(TDParts.chainmail);
-		ModelRegisterUtil.registerPartModel(TDParts.clasp);
-		ModelRegisterUtil.registerPartModel(TDParts.cloth);
-		ModelRegisterUtil.registerPartModel(TDParts.filigree);
-		ModelRegisterUtil.registerPartModel(TDParts.ringShank);
-		ModelRegisterUtil.registerPartModel(TDParts.rivets);
-		ModelRegisterUtil.registerPartModel(TDParts.setting);
-		ModelRegisterUtil.registerPartModel(TDParts.wire);
-	}
+//	@Override
+//	public void registerPartModel(ToolPart part) {
+//		ModelRegisterUtil.registerPartModel(TDParts.armorPlate);
+//		ModelRegisterUtil.registerPartModel(TDParts.chainmail);
+//		ModelRegisterUtil.registerPartModel(TDParts.clasp);
+//		ModelRegisterUtil.registerPartModel(TDParts.cloth);
+//		ModelRegisterUtil.registerPartModel(TDParts.filigree);
+//		ModelRegisterUtil.registerPartModel(TDParts.ringShank);
+//		ModelRegisterUtil.registerPartModel(TDParts.rivets);
+//		ModelRegisterUtil.registerPartModel(TDParts.setting);
+//		ModelRegisterUtil.registerPartModel(TDParts.wire);
+//	}
 
 	@Override
 	public void reloadRenderers() {
@@ -376,16 +387,16 @@ public class ClientProxy extends CommonProxy {
 		sheatheGUI.addSlotPosition(34, 15);
 		sheatheGUI.addSlotPosition(34, 33);
 		sheatheGUI.addSlotPosition(34, 51);
-
-		ringGUI.positions.clear();
-		ringGUI.addSlotPosition(34, 15);
-		ringGUI.addSlotPosition(34, 33);
-		ringGUI.addSlotPosition(34, 51);
-
-		amuletGUI.positions.clear();
-		amuletGUI.addSlotPosition(34, 15);
-		amuletGUI.addSlotPosition(34, 33);
-		amuletGUI.addSlotPosition(34, 51);
+//
+//		ringGUI.positions.clear();
+//		ringGUI.addSlotPosition(34, 15);
+//		ringGUI.addSlotPosition(34, 33);
+//		ringGUI.addSlotPosition(34, 51);
+//
+//		amuletGUI.positions.clear();
+//		amuletGUI.addSlotPosition(34, 15);
+//		amuletGUI.addSlotPosition(34, 33);
+//		amuletGUI.addSlotPosition(34, 51);
 	}
 
 	void createToolModels() {
diff --git a/src/main/java/lance5057/tDefense/proxy/CommonProxy.java b/src/main/java/lance5057/tDefense/proxy/CommonProxy.java
index dde7d7a..7f3e988 100644
--- a/src/main/java/lance5057/tDefense/proxy/CommonProxy.java
+++ b/src/main/java/lance5057/tDefense/proxy/CommonProxy.java
@@ -2,6 +2,7 @@ package lance5057.tDefense.proxy;
 
 import lance5057.tDefense.Reference;
 import lance5057.tDefense.TinkersDefense;
+import lance5057.tDefense.core.library.ArmorPart;
 import lance5057.tDefense.core.tools.bases.ArmorCore;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
@@ -93,9 +94,22 @@ public class CommonProxy implements IGuiHandler {
 
 	@SubscribeEvent
 	public static void registerItems(RegistryEvent.Register<Item> event) {
-		TinkersDefense.mats.registerItems(event);
+		
+		
 		TinkersDefense.parts.registerItems(event);
+		TinkersDefense.mats.registerItems(event);
 		TinkersDefense.tools.registerItems(event);
 		TinkersDefense.holiday.registerItems(event);
 	}
+	
+	@SubscribeEvent
+	public static void registerBlocks(RegistryEvent.Register<Block> event) {
+		TinkersDefense.tools.registerBlocks(event);
+	}
+
+	public void registerArmorPartModel(ArmorPart part)
+	{
+		// TODO Auto-generated method stub
+		
+	}
 }
diff --git a/src/main/java/lance5057/tDefense/util/RegEvents.java b/src/main/java/lance5057/tDefense/util/RegEvents.java
deleted file mode 100644
index 35df69e..0000000
--- a/src/main/java/lance5057/tDefense/util/RegEvents.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package lance5057.tDefense.util;
-
-public class RegEvents {
-	
-}
diff --git a/src/main/resources/assets/tinkersdefense/blockstates/fluid_block.json b/src/main/resources/assets/tinkerscompendium/blockstates/fluid_block.json
index a6a3b4e..a6a3b4e 100644
--- a/src/main/resources/assets/tinkersdefense/blockstates/fluid_block.json
+++ b/src/main/resources/assets/tinkerscompendium/blockstates/fluid_block.json
diff --git a/src/main/resources/assets/tinkersdefense/blockstates/metalblock.json b/src/main/resources/assets/tinkerscompendium/blockstates/metalblock.json
index cc02bb0..5d8d5c1 100644
--- a/src/main/resources/assets/tinkersdefense/blockstates/metalblock.json
+++ b/src/main/resources/assets/tinkerscompendium/blockstates/metalblock.json
@@ -1,6 +1,6 @@
 {
     "variants": {
-        "type=aeonsteel": { "model":"tinkersdefense:blocks/aeonsteelblock" },
+        "type=aeonsteel": { "model":"tinkerscompendium:blocks/aeonsteelblock" },
         "type=queensgold": { "model":"tutorial:block_properties_black" }
 		"type=dogbearium": { "model":"tutorial:block_properties_black" }
     }
diff --git a/src/main/resources/assets/tinkersdefense/blockstates/redcandyblock.json b/src/main/resources/assets/tinkerscompendium/blockstates/redcandyblock.json
index f2cd467..b22a32b 100644
--- a/src/main/resources/assets/tinkersdefense/blockstates/redcandyblock.json
+++ b/src/main/resources/assets/tinkerscompendium/blockstates/redcandyblock.json
@@ -4,7 +4,7 @@
         "transform": "forge:default-block",
         "model": "cube_all",
         "textures": {
-            "all": "tinkersdefense:blocks/redmintblock",
+            "all": "tinkerscompendium:blocks/redmintblock",
             "particle": "#all"
         }
     }
diff --git a/src/main/resources/assets/tinkersdefense/lang/en_US.lang b/src/main/resources/assets/tinkerscompendium/lang/en_US.lang
index 9ed2a43..9ed2a43 100644
--- a/src/main/resources/assets/tinkersdefense/lang/en_US.lang
+++ b/src/main/resources/assets/tinkerscompendium/lang/en_US.lang
diff --git a/src/main/resources/assets/tinkersdefense/lang/fr_FR.lang b/src/main/resources/assets/tinkerscompendium/lang/fr_FR.lang
index 1142e8f..1142e8f 100644
--- a/src/main/resources/assets/tinkersdefense/lang/fr_FR.lang
+++ b/src/main/resources/assets/tinkerscompendium/lang/fr_FR.lang
diff --git a/src/main/resources/assets/tinkersdefense/lang/ru_RU.lang b/src/main/resources/assets/tinkerscompendium/lang/ru_RU.lang
index 5e1afa1..5e1afa1 100644
--- a/src/main/resources/assets/tinkersdefense/lang/ru_RU.lang
+++ b/src/main/resources/assets/tinkerscompendium/lang/ru_RU.lang
diff --git a/src/main/resources/assets/tinkerscompendium/materials/aeonsteel.json b/src/main/resources/assets/tinkerscompendium/materials/aeonsteel.json
new file mode 100644
index 0000000..f7e85cb
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/materials/aeonsteel.json
@@ -0,0 +1,6 @@
+{
+    "type": "colored",
+    "parameters": {
+        "color": "a470e0"
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/tinkersdefense/materials/amber.json b/src/main/resources/assets/tinkerscompendium/materials/amber.json
index 811dc05..d4b4c24 100644
--- a/src/main/resources/assets/tinkersdefense/materials/amber.json
+++ b/src/main/resources/assets/tinkerscompendium/materials/amber.json
@@ -1,7 +1,7 @@
 {
     "type": "metal_textured",
     "parameters": {
-        "texture": "tinkersdefense:materials/opal",
+        "texture": "tinkerscompendium:materials/opal",
         "color": "dba827",
         "shinyness": 0.6,
         "brightness": 0.4,
diff --git a/src/main/resources/assets/tinkersdefense/materials/amethyst.json b/src/main/resources/assets/tinkerscompendium/materials/amethyst.json
index b92d2c1..c624cd9 100644
--- a/src/main/resources/assets/tinkersdefense/materials/amethyst.json
+++ b/src/main/resources/assets/tinkerscompendium/materials/amethyst.json
@@ -1,7 +1,7 @@
 {
     "type": "metal_textured",
     "parameters": {
-        "texture": "tinkersdefense:materials/facetedgem",
+        "texture": "tinkerscompendium:materials/facetedgem",
         "color": "b436e2",
         "shinyness": 0.6,
         "brightness": 0.4,
diff --git a/src/main/resources/assets/tinkerscompendium/materials/cheese.json b/src/main/resources/assets/tinkerscompendium/materials/cheese.json
new file mode 100644
index 0000000..ccf2cbe
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/materials/cheese.json
@@ -0,0 +1,6 @@
+{
+    "type": "block",
+    "parameters": {
+        "texture": "tinkerscompendium:materials/cheese"
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/tinkersdefense/materials/citrine.json b/src/main/resources/assets/tinkerscompendium/materials/citrine.json
index ee6d378..11f51cf 100644
--- a/src/main/resources/assets/tinkersdefense/materials/citrine.json
+++ b/src/main/resources/assets/tinkerscompendium/materials/citrine.json
@@ -1,7 +1,7 @@
 {
     "type": "metal_textured",
     "parameters": {
-        "texture": "tinkersdefense:materials/facetedgem",
+        "texture": "tinkerscompendium:materials/facetedgem",
         "color": "ffe877",
         "shinyness": 0.6,
         "brightness": 0.4,
diff --git a/src/main/resources/assets/tinkersdefense/materials/diamond.json b/src/main/resources/assets/tinkerscompendium/materials/diamond.json
index 59545d6..59545d6 100644
--- a/src/main/resources/assets/tinkersdefense/materials/diamond.json
+++ b/src/main/resources/assets/tinkerscompendium/materials/diamond.json
diff --git a/src/main/resources/assets/tinkersdefense/materials/emerald.json b/src/main/resources/assets/tinkerscompendium/materials/emerald.json
index d72f1ea..d72f1ea 100644
--- a/src/main/resources/assets/tinkersdefense/materials/emerald.json
+++ b/src/main/resources/assets/tinkerscompendium/materials/emerald.json
diff --git a/src/main/resources/assets/tinkerscompendium/materials/enderpearl.json b/src/main/resources/assets/tinkerscompendium/materials/enderpearl.json
new file mode 100644
index 0000000..55a13d3
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/materials/enderpearl.json
@@ -0,0 +1,6 @@
+{
+    "type": "block",
+    "parameters": {
+        "texture": "tinkerscompendium:materials/ender_pearl"
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/tinkerscompendium/materials/gallite.json b/src/main/resources/assets/tinkerscompendium/materials/gallite.json
new file mode 100644
index 0000000..3dcef6a
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/materials/gallite.json
@@ -0,0 +1,6 @@
+{
+    "type": "block",
+    "parameters": {
+        "texture": "tinkerscompendium:materials/gall"
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/tinkersdefense/materials/garnet.json b/src/main/resources/assets/tinkerscompendium/materials/garnet.json
index 142faca..84d372c 100644
--- a/src/main/resources/assets/tinkersdefense/materials/garnet.json
+++ b/src/main/resources/assets/tinkerscompendium/materials/garnet.json
@@ -1,7 +1,7 @@
 {
     "type": "metal_textured",
     "parameters": {
-        "texture": "tinkersdefense:materials/facetedgem",
+        "texture": "tinkerscompendium:materials/facetedgem",
         "color": "9e1c1c",
         "shinyness": 0.6,
         "brightness": 0.4,
diff --git a/src/main/resources/assets/tinkersdefense/materials/ghasttear.json b/src/main/resources/assets/tinkerscompendium/materials/ghasttear.json
index c63d9f3..c63d9f3 100644
--- a/src/main/resources/assets/tinkersdefense/materials/ghasttear.json
+++ b/src/main/resources/assets/tinkerscompendium/materials/ghasttear.json
diff --git a/src/main/resources/assets/tinkersdefense/materials/glass.json b/src/main/resources/assets/tinkerscompendium/materials/glass.json
index 21cc94a..21cc94a 100644
--- a/src/main/resources/assets/tinkersdefense/materials/glass.json
+++ b/src/main/resources/assets/tinkerscompendium/materials/glass.json
diff --git a/src/main/resources/assets/tinkersdefense/materials/glowstone.json b/src/main/resources/assets/tinkerscompendium/materials/glowstone.json
index 9abfcda..9abfcda 100644
--- a/src/main/resources/assets/tinkersdefense/materials/glowstone.json
+++ b/src/main/resources/assets/tinkerscompendium/materials/glowstone.json
diff --git a/src/main/resources/assets/tinkerscompendium/materials/greencandy.json b/src/main/resources/assets/tinkerscompendium/materials/greencandy.json
new file mode 100644
index 0000000..0a9cedd
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/materials/greencandy.json
@@ -0,0 +1,6 @@
+{
+    "type": "block",
+    "parameters": {
+        "texture": "tinkerscompendium:materials/greencandy"
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/tinkersdefense/materials/lapis.json b/src/main/resources/assets/tinkerscompendium/materials/lapis.json
index 70a86d5..70a86d5 100644
--- a/src/main/resources/assets/tinkersdefense/materials/lapis.json
+++ b/src/main/resources/assets/tinkerscompendium/materials/lapis.json
diff --git a/src/main/resources/assets/tinkerscompendium/materials/opal.json b/src/main/resources/assets/tinkerscompendium/materials/opal.json
new file mode 100644
index 0000000..a146b17
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/materials/opal.json
@@ -0,0 +1,6 @@
+{
+    "type": "block",
+    "parameters": {
+        "texture": "tinkerscompendium:materials/opal"
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/tinkersdefense/materials/quartz.json b/src/main/resources/assets/tinkerscompendium/materials/quartz.json
index 817ad2c..817ad2c 100644
--- a/src/main/resources/assets/tinkersdefense/materials/quartz.json
+++ b/src/main/resources/assets/tinkerscompendium/materials/quartz.json
diff --git a/src/main/resources/assets/tinkerscompendium/materials/redcandy.json b/src/main/resources/assets/tinkerscompendium/materials/redcandy.json
new file mode 100644
index 0000000..9a8b350
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/materials/redcandy.json
@@ -0,0 +1,6 @@
+{
+    "type": "block",
+    "parameters": {
+        "texture": "tinkerscompendium:materials/redcandy"
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/tinkersdefense/materials/ruby.json b/src/main/resources/assets/tinkerscompendium/materials/ruby.json
index 90f6a4f..90bbab7 100644
--- a/src/main/resources/assets/tinkersdefense/materials/ruby.json
+++ b/src/main/resources/assets/tinkerscompendium/materials/ruby.json
@@ -1,7 +1,7 @@
 {
     "type": "metal_textured",
     "parameters": {
-        "texture": "tinkersdefense:materials/facetedgem",
+        "texture": "tinkerscompendium:materials/facetedgem",
         "color": "ff0061",
         "shinyness": 0.6,
         "brightness": 0.4,
diff --git a/src/main/resources/assets/tinkersdefense/materials/sapphire.json b/src/main/resources/assets/tinkerscompendium/materials/sapphire.json
index a4cf3ac..44c9dae 100644
--- a/src/main/resources/assets/tinkersdefense/materials/sapphire.json
+++ b/src/main/resources/assets/tinkerscompendium/materials/sapphire.json
@@ -1,7 +1,7 @@
 {
     "type": "metal_textured",
     "parameters": {
-        "texture": "tinkersdefense:materials/facetedgem",
+        "texture": "tinkerscompendium:materials/facetedgem",
         "color": "6e00ff",
         "shinyness": 0.6,
         "brightness": 0.4,
diff --git a/src/main/resources/assets/tinkersdefense/materials/starruby.json b/src/main/resources/assets/tinkerscompendium/materials/starruby.json
index d83fdbc..05f0570 100644
--- a/src/main/resources/assets/tinkersdefense/materials/starruby.json
+++ b/src/main/resources/assets/tinkerscompendium/materials/starruby.json
@@ -1,7 +1,7 @@
 {
     "type": "metal_textured",
     "parameters": {
-        "texture": "tinkersdefense:materials/stargem",
+        "texture": "tinkerscompendium:materials/stargem",
         "color": "b00063",
         "shinyness": 0.6,
         "brightness": 0.4,
diff --git a/src/main/resources/assets/tinkersdefense/materials/starsapphire.json b/src/main/resources/assets/tinkerscompendium/materials/starsapphire.json
index 1dd9441..94e2cea 100644
--- a/src/main/resources/assets/tinkersdefense/materials/starsapphire.json
+++ b/src/main/resources/assets/tinkerscompendium/materials/starsapphire.json
@@ -1,7 +1,7 @@
 {
     "type": "metal_textured",
     "parameters": {
-        "texture": "tinkersdefense:materials/stargem",
+        "texture": "tinkerscompendium:materials/stargem",
         "color": "7a629e",
         "shinyness": 0.6,
         "brightness": 0.4,
diff --git a/src/main/resources/assets/tinkerscompendium/materials/sundrop.json b/src/main/resources/assets/tinkerscompendium/materials/sundrop.json
new file mode 100644
index 0000000..c0040a0
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/materials/sundrop.json
@@ -0,0 +1,6 @@
+{
+    "type": "block",
+    "parameters": {
+        "texture": "tinkerscompendium:materials/sun"
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/tinkersdefense/materials/tanzanite.json b/src/main/resources/assets/tinkerscompendium/materials/tanzanite.json
index d7679d3..306798e 100644
--- a/src/main/resources/assets/tinkersdefense/materials/tanzanite.json
+++ b/src/main/resources/assets/tinkerscompendium/materials/tanzanite.json
@@ -1,7 +1,7 @@
 {
     "type": "metal_textured",
     "parameters": {
-        "texture": "tinkersdefense:materials/facetedgem",
+        "texture": "tinkerscompendium:materials/facetedgem",
         "color": "8860e5",
         "shinyness": 0.6,
         "brightness": 0.4,
diff --git a/src/main/resources/assets/tinkersdefense/materials/topaz.json b/src/main/resources/assets/tinkerscompendium/materials/topaz.json
index 8f474d3..15094e3 100644
--- a/src/main/resources/assets/tinkersdefense/materials/topaz.json
+++ b/src/main/resources/assets/tinkerscompendium/materials/topaz.json
@@ -1,7 +1,7 @@
 {
     "type": "metal_textured",
     "parameters": {
-        "texture": "tinkersdefense:materials/facetedgem",
+        "texture": "tinkerscompendium:materials/facetedgem",
         "color": "ffc551",
         "shinyness": 0.6,
         "brightness": 0.4,
diff --git a/src/main/resources/assets/tinkerscompendium/materials/voidite.json b/src/main/resources/assets/tinkerscompendium/materials/voidite.json
new file mode 100644
index 0000000..432f37c
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/materials/voidite.json
@@ -0,0 +1,6 @@
+{
+    "type": "block",
+    "parameters": {
+        "texture": "tinkerscompendium:materials/moon"
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/tinkerscompendium/models/block/aeonsteelblock.json b/src/main/resources/assets/tinkerscompendium/models/block/aeonsteelblock.json
new file mode 100644
index 0000000..35686c5
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/models/block/aeonsteelblock.json
@@ -0,0 +1,6 @@
+{
+    "parent":"block/cube_all",
+    "textures": {
+        "all": "tinkerscompendium:blocks/aeonsteelblock"
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/tinkersdefense/models/item/dust.json b/src/main/resources/assets/tinkerscompendium/models/item/dust.json
index ca4941b..0e02e4b 100644
--- a/src/main/resources/assets/tinkersdefense/models/item/dust.json
+++ b/src/main/resources/assets/tinkerscompendium/models/item/dust.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "tinkersdefense:items/dust"
+        "layer0": "tinkerscompendium:items/dust"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/tinkersdefense/models/item/gem.json b/src/main/resources/assets/tinkerscompendium/models/item/gem.json
index 8bbe97d..01f7d5a 100644
--- a/src/main/resources/assets/tinkersdefense/models/item/gem.json
+++ b/src/main/resources/assets/tinkerscompendium/models/item/gem.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "tinkersdefense:items/gem"
+        "layer0": "tinkerscompendium:items/gem"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/tinkersdefense/models/item/gingerbread.json b/src/main/resources/assets/tinkerscompendium/models/item/gingerbread.json
index a483363..faee566 100644
--- a/src/main/resources/assets/tinkersdefense/models/item/gingerbread.json
+++ b/src/main/resources/assets/tinkerscompendium/models/item/gingerbread.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "tinkersdefense:items/gingerbread"
+        "layer0": "tinkerscompendium:items/gingerbread"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/tinkersdefense/models/item/grain.json b/src/main/resources/assets/tinkerscompendium/models/item/grain.json
index e57d798..62c26fb 100644
--- a/src/main/resources/assets/tinkersdefense/models/item/grain.json
+++ b/src/main/resources/assets/tinkerscompendium/models/item/grain.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "tinkersdefense:items/grain"
+        "layer0": "tinkerscompendium:items/grain"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/tinkerscompendium/models/item/greenmintcane.json b/src/main/resources/assets/tinkerscompendium/models/item/greenmintcane.json
new file mode 100644
index 0000000..6b84bcf
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/models/item/greenmintcane.json
@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "tinkerscompendium:items/greenmintcane"
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/tinkersdefense/models/item/ingot.json b/src/main/resources/assets/tinkerscompendium/models/item/ingot.json
index 52c638f..e67310e 100644
--- a/src/main/resources/assets/tinkersdefense/models/item/ingot.json
+++ b/src/main/resources/assets/tinkerscompendium/models/item/ingot.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "tinkersdefense:items/ingot"
+        "layer0": "tinkerscompendium:items/ingot"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/tinkersdefense/models/item/nugget.json b/src/main/resources/assets/tinkerscompendium/models/item/nugget.json
index f0efd2e..3ca3399 100644
--- a/src/main/resources/assets/tinkersdefense/models/item/nugget.json
+++ b/src/main/resources/assets/tinkerscompendium/models/item/nugget.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "tinkersdefense:items/nugget"
+        "layer0": "tinkerscompendium:items/nugget"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/tinkerscompendium/models/item/parts/armor_plate.tmat.json b/src/main/resources/assets/tinkerscompendium/models/item/parts/armor_plate.tmat.json
new file mode 100644
index 0000000..6362ff5
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/models/item/parts/armor_plate.tmat.json
@@ -0,0 +1,5 @@
+{
+    "textures": {
+        "layer0": "tinkerscompendium:items/_armorplate"
+    }
+}
diff --git a/src/main/resources/assets/tinkerscompendium/models/item/parts/chainmail.tmat.json b/src/main/resources/assets/tinkerscompendium/models/item/parts/chainmail.tmat.json
new file mode 100644
index 0000000..c4aa32f
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/models/item/parts/chainmail.tmat.json
@@ -0,0 +1,5 @@
+{
+    "textures": {
+        "layer0": "tinkerscompendium:items/_chainmail"
+    }
+}
diff --git a/src/main/resources/assets/tinkerscompendium/models/item/parts/clasp.tmat.json b/src/main/resources/assets/tinkerscompendium/models/item/parts/clasp.tmat.json
new file mode 100644
index 0000000..b0cd8d1
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/models/item/parts/clasp.tmat.json
@@ -0,0 +1,5 @@
+{
+    "textures": {
+        "layer0": "tinkerscompendium:items/_clasp"
+    }
+}
diff --git a/src/main/resources/assets/tinkerscompendium/models/item/parts/fabric.tmat.json b/src/main/resources/assets/tinkerscompendium/models/item/parts/fabric.tmat.json
new file mode 100644
index 0000000..127a212
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/models/item/parts/fabric.tmat.json
@@ -0,0 +1,5 @@
+{
+    "textures": {
+        "layer0": "tinkerscompendium:items/_cloth"
+    }
+}
diff --git a/src/main/resources/assets/tinkerscompendium/models/item/parts/filigree.tmat.json b/src/main/resources/assets/tinkerscompendium/models/item/parts/filigree.tmat.json
new file mode 100644
index 0000000..bcf784a
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/models/item/parts/filigree.tmat.json
@@ -0,0 +1,5 @@
+{
+    "textures": {
+        "layer0": "tinkerscompendium:items/_filigree"
+    }
+}
diff --git a/src/main/resources/assets/tinkerscompendium/models/item/parts/ringshank.tmat.json b/src/main/resources/assets/tinkerscompendium/models/item/parts/ringshank.tmat.json
new file mode 100644
index 0000000..c419de3
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/models/item/parts/ringshank.tmat.json
@@ -0,0 +1,5 @@
+{
+    "textures": {
+        "layer0": "tinkerscompendium:items/_ringshank"
+    }
+}
diff --git a/src/main/resources/assets/tinkerscompendium/models/item/parts/rivets.tmat.json b/src/main/resources/assets/tinkerscompendium/models/item/parts/rivets.tmat.json
new file mode 100644
index 0000000..59195da
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/models/item/parts/rivets.tmat.json
@@ -0,0 +1,5 @@
+{
+    "textures": {
+        "layer0": "tinkerscompendium:items/_rivets"
+    }
+}
diff --git a/src/main/resources/assets/tinkerscompendium/models/item/parts/setting.tmat.json b/src/main/resources/assets/tinkerscompendium/models/item/parts/setting.tmat.json
new file mode 100644
index 0000000..18ca28b
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/models/item/parts/setting.tmat.json
@@ -0,0 +1,5 @@
+{
+    "textures": {
+        "layer0": "tinkerscompendium:items/_setting"
+    }
+}
diff --git a/src/main/resources/assets/tinkerscompendium/models/item/parts/wire.tmat.json b/src/main/resources/assets/tinkerscompendium/models/item/parts/wire.tmat.json
new file mode 100644
index 0000000..7b75c59
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/models/item/parts/wire.tmat.json
@@ -0,0 +1,5 @@
+{
+    "textures": {
+        "layer0": "tinkerscompendium:items/_wire"
+    }
+}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/redmintcane.json b/src/main/resources/assets/tinkerscompendium/models/item/redmintcane.json
index faa54f8..19940f9 100644
--- a/src/main/resources/assets/tinkersdefense/models/item/redmintcane.json
+++ b/src/main/resources/assets/tinkerscompendium/models/item/redmintcane.json
@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "tinkersdefense:items/redmintcane"
+        "layer0": "tinkerscompendium:items/redmintcane"
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/tinkerscompendium/models/item/tools/amulet.tcon.json b/src/main/resources/assets/tinkerscompendium/models/item/tools/amulet.tcon.json
new file mode 100644
index 0000000..f40e8c7
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/models/item/tools/amulet.tcon.json
@@ -0,0 +1,8 @@
+{
+    "textures": {
+        "layer0": "tinkerscompendium:items/baubles/amulet/_setting",
+        "layer1": "tinkerscompendium:items/baubles/amulet/_chain",
+		"layer2": "tinkerscompendium:items/baubles/amulet/_clasp",
+		"broken1": "tinkerscompendium:items/baubles/amulet/_broken"
+    }
+}
diff --git a/src/main/resources/assets/tinkerscompendium/models/item/tools/breastplate.td.json b/src/main/resources/assets/tinkerscompendium/models/item/tools/breastplate.td.json
new file mode 100644
index 0000000..c2022a7
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/models/item/tools/breastplate.td.json
@@ -0,0 +1,9 @@
+{
+    "textures": {
+        "layer0": "tinkerscompendium:items/armor/breastplate/_plate",
+        "layer1": "tinkerscompendium:items/armor/breastplate/_smallplate",
+		"layer2": "tinkerscompendium:items/armor/breastplate/_trim",
+		"layer3": "tinkerscompendium:items/armor/breastplate/_chain",
+		"broken1": "tinkerscompendium:items/armor/breastplate/_plate"
+    }
+}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/fishingrod.tcon.json b/src/main/resources/assets/tinkerscompendium/models/item/tools/fishingrod.tcon.json
index fe11a40..d701207 100644
--- a/src/main/resources/assets/tinkersdefense/models/item/tools/fishingrod.tcon.json
+++ b/src/main/resources/assets/tinkerscompendium/models/item/tools/fishingrod.tcon.json
@@ -1,9 +1,9 @@
 {
     "textures": {
-        "layer0": "tinkersdefense:items/fishingrod/_rod",
-        "layer1": "tinkersdefense:items/fishingrod/_string",
-		"layer2": "tinkersdefense:items/fishingrod/_hook",
-		"broken1": "tinkersdefense:items/fishingrod/_rod"
+        "layer0": "tinkerscompendium:items/fishingrod/_rod",
+        "layer1": "tinkerscompendium:items/fishingrod/_string",
+		"layer2": "tinkerscompendium:items/fishingrod/_hook",
+		"broken1": "tinkerscompendium:items/fishingrod/_rod"
     },
     "display": {
         "thirdperson_righthand": {
diff --git a/src/main/resources/assets/tinkerscompendium/models/item/tools/grieves.td.json b/src/main/resources/assets/tinkerscompendium/models/item/tools/grieves.td.json
new file mode 100644
index 0000000..b765650
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/models/item/tools/grieves.td.json
@@ -0,0 +1,9 @@
+{
+    "textures": {
+        "layer0": "tinkerscompendium:items/armor/grieves/_plate",
+        "layer1": "tinkerscompendium:items/armor/grieves/_trim",
+		"layer2": "tinkerscompendium:items/armor/grieves/_chain",
+		"layer3": "tinkerscompendium:items/armor/grieves/_cloth",
+		"broken1": "tinkerscompendium:items/armor/grieves/_plate"
+    }
+}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/heatershield.tcon.json b/src/main/resources/assets/tinkerscompendium/models/item/tools/heatershield.tcon.json
index aab5211..e6bf84c 100644
--- a/src/main/resources/assets/tinkersdefense/models/item/tools/heatershield.tcon.json
+++ b/src/main/resources/assets/tinkerscompendium/models/item/tools/heatershield.tcon.json
@@ -1,10 +1,10 @@
 {
     "textures": {
-        "layer0": "tinkersdefense:items/heatershield/edge",
-        "layer1": "tinkersdefense:items/heatershield/plate",
-		"layer2": "tinkersdefense:items/heatershield/face",
-		"layer3": "tinkersdefense:items/heatershield/binding",
-		"broken1": "tinkersdefense:items/heatershield/plate_broken"
+        "layer0": "tinkerscompendium:items/heatershield/edge",
+        "layer1": "tinkerscompendium:items/heatershield/plate",
+		"layer2": "tinkerscompendium:items/heatershield/face",
+		"layer3": "tinkerscompendium:items/heatershield/binding",
+		"broken1": "tinkerscompendium:items/heatershield/plate_broken"
     },
     "display": {
         "thirdperson_righthand": {
diff --git a/src/main/resources/assets/tinkerscompendium/models/item/tools/helm.td.json b/src/main/resources/assets/tinkerscompendium/models/item/tools/helm.td.json
new file mode 100644
index 0000000..4e93dc6
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/models/item/tools/helm.td.json
@@ -0,0 +1,9 @@
+{
+    "textures": {
+        "layer0": "tinkerscompendium:items/armor/helm/_top",
+        "layer1": "tinkerscompendium:items/armor/helm/_plate",
+		"layer2": "tinkerscompendium:items/armor/helm/_visor",
+		"layer3": "tinkerscompendium:items/armor/helm/_chain",
+		"broken1": "tinkerscompendium:items/armor/helm/_plate"
+    }
+}
diff --git a/src/main/resources/assets/tinkerscompendium/models/item/tools/hood.td.json b/src/main/resources/assets/tinkerscompendium/models/item/tools/hood.td.json
new file mode 100644
index 0000000..d7de468
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/models/item/tools/hood.td.json
@@ -0,0 +1,35 @@
+{
+    "textures": {
+        "layer0": "tinkerscompendium:items/armor/hood/_cloth",
+        "layer1": "tinkerscompendium:items/armor/hood/_trim",
+		"layer2": "tinkerscompendium:items/armor/hood/_rivet",
+		"broken1": "tinkerscompendium:items/armor/hood/_cloth"
+    },
+    "display": {
+        "thirdperson_righthand": {
+            "rotation": [ 0, 90, 45 ],
+            "translation": [ 0, 4, 0 ],
+            "scale": [ 1, 1, 1 ]
+        },
+        "thirdperson_lefthand": {
+            "rotation": [ 0, 90, 45 ],
+            "translation": [ 0, 4, 0 ],
+            "scale": [ 1, 1, 1 ]
+        },
+        "firstperson_righthand": {
+            "rotation": [ 0, 90, 45 ],
+            "translation": [ 0, 4, 0 ],
+            "scale": [ 1, 1, 1 ]
+        },
+        "firstperson_lefthand": {
+            "rotation": [ 0, 90, 45 ],
+            "translation": [ 0, 4, 0 ],
+            "scale": [ 1, 1, 1 ]
+        },
+        "fixed": {
+            "rotation": [ 0, 180, 0 ],
+            "translation": [ -2, 4, -5],
+            "scale":[ 0.5, 0.5, 0.5]
+        }
+	}
+}
diff --git a/src/main/resources/assets/tinkerscompendium/models/item/tools/ring.tcon.json b/src/main/resources/assets/tinkerscompendium/models/item/tools/ring.tcon.json
new file mode 100644
index 0000000..7e70a24
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/models/item/tools/ring.tcon.json
@@ -0,0 +1,8 @@
+{
+    "textures": {
+        "layer0": "tinkerscompendium:items/baubles/ring/_band",
+        "layer1": "tinkerscompendium:items/baubles/ring/_filigree",
+		"layer2": "tinkerscompendium:items/baubles/ring/_setting",
+		"broken1": "tinkerscompendium:items/baubles/ring/_broken"
+    }
+}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/hood.tcon.json b/src/main/resources/assets/tinkerscompendium/models/item/tools/robe.td.json
index 3cec161..685c934 100644
--- a/src/main/resources/assets/tinkersdefense/models/item/tools/hood.tcon.json
+++ b/src/main/resources/assets/tinkerscompendium/models/item/tools/robe.td.json
@@ -1,9 +1,9 @@
 {
     "textures": {
-        "layer0": "tinkersdefense:items/armor/hood/_cloth",
-        "layer1": "tinkersdefense:items/armor/hood/_trim",
-		"layer2": "tinkersdefense:items/armor/hood/_rivet",
-		"broken1": "tinkersdefense:items/armor/hood/_cloth"
+        "layer0": "tinkerscompendium:items/armor/robe/_cloth",
+        "layer1": "tinkerscompendium:items/armor/robe/_trim",
+		"layer2": "tinkerscompendium:items/armor/robe/_plate",
+		"broken1": "tinkerscompendium:items/armor/robe/_cloth"
     },
     "display": {
         "thirdperson_righthand": {
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/roundshield.tcon.json b/src/main/resources/assets/tinkerscompendium/models/item/tools/roundshield.tcon.json
index 0c9f702..429ebb0 100644
--- a/src/main/resources/assets/tinkersdefense/models/item/tools/roundshield.tcon.json
+++ b/src/main/resources/assets/tinkerscompendium/models/item/tools/roundshield.tcon.json
@@ -1,9 +1,9 @@
 {
     "textures": {
-        "layer0": "tinkersdefense:items/shield/edge",
-        "layer1": "tinkersdefense:items/shield/face",
-		"layer2": "tinkersdefense:items/shield/boss",
-		"broken1": "tinkersdefense:items/shield/face_broken"
+        "layer0": "tinkerscompendium:items/shield/edge",
+        "layer1": "tinkerscompendium:items/shield/face",
+		"layer2": "tinkerscompendium:items/shield/boss",
+		"broken1": "tinkerscompendium:items/shield/face_broken"
     },
     "display": {
         "thirdperson_righthand": {
diff --git a/src/main/resources/assets/tinkerscompendium/models/item/tools/sabatons.td.json b/src/main/resources/assets/tinkerscompendium/models/item/tools/sabatons.td.json
new file mode 100644
index 0000000..a25a9ad
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/models/item/tools/sabatons.td.json
@@ -0,0 +1,9 @@
+{
+    "textures": {
+        "layer0": "tinkerscompendium:items/armor/sabatons/_plates",
+        "layer1": "tinkerscompendium:items/armor/sabatons/_trim",
+		"layer2": "tinkerscompendium:items/armor/sabatons/_caps",
+		"layer3": "tinkerscompendium:items/armor/sabatons/_soles",
+		"broken1": "tinkerscompendium:items/armor/sabatons/_plates"
+    }
+}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/shawl.tcon.json b/src/main/resources/assets/tinkerscompendium/models/item/tools/shawl.td.json
index e8b242e..4c89a49 100644
--- a/src/main/resources/assets/tinkersdefense/models/item/tools/shawl.tcon.json
+++ b/src/main/resources/assets/tinkerscompendium/models/item/tools/shawl.td.json
@@ -1,9 +1,9 @@
 {
     "textures": {
-        "layer0": "tinkersdefense:items/armor/shawl/_cloth",
-        "layer1": "tinkersdefense:items/armor/shawl/_trim",
-		"layer2": "tinkersdefense:items/armor/shawl/_clasp",
-		"broken1": "tinkersdefense:items/armor/shawl/_cloth"
+        "layer0": "tinkerscompendium:items/armor/shawl/_cloth",
+        "layer1": "tinkerscompendium:items/armor/shawl/_trim",
+		"layer2": "tinkerscompendium:items/armor/shawl/_clasp",
+		"broken1": "tinkerscompendium:items/armor/shawl/_cloth"
     },
     "display": {
         "thirdperson_righthand": {
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/shears.tcon.json b/src/main/resources/assets/tinkerscompendium/models/item/tools/shears.tcon.json
index 5a03b6d..84c5de1 100644
--- a/src/main/resources/assets/tinkersdefense/models/item/tools/shears.tcon.json
+++ b/src/main/resources/assets/tinkerscompendium/models/item/tools/shears.tcon.json
@@ -1,9 +1,9 @@
 {
     "textures": {
-        "layer0": "tinkersdefense:items/shears/_top",
-        "layer1": "tinkersdefense:items/shears/_bottom",
-		"layer2": "tinkersdefense:items/shears/_binding",
-		"broken1": "tinkersdefense:items/shears/_broken"
+        "layer0": "tinkerscompendium:items/shears/_top",
+        "layer1": "tinkerscompendium:items/shears/_bottom",
+		"layer2": "tinkerscompendium:items/shears/_binding",
+		"broken1": "tinkerscompendium:items/shears/_broken"
     },
     "display": {
         "thirdperson_righthand": {
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/robe.tcon.json b/src/main/resources/assets/tinkerscompendium/models/item/tools/shoes.td.json
index b8b24d6..b276161 100644
--- a/src/main/resources/assets/tinkersdefense/models/item/tools/robe.tcon.json
+++ b/src/main/resources/assets/tinkerscompendium/models/item/tools/shoes.td.json
@@ -1,9 +1,9 @@
 {
     "textures": {
-        "layer0": "tinkersdefense:items/armor/robe/_cloth",
-        "layer1": "tinkersdefense:items/armor/robe/_trim",
-		"layer2": "tinkersdefense:items/armor/robe/_plate",
-		"broken1": "tinkersdefense:items/armor/robe/_cloth"
+        "layer0": "tinkerscompendium:items/armor/shoes/_cloth",
+        "layer1": "tinkerscompendium:items/armor/shoes/_sole",
+		"layer2": "tinkerscompendium:items/armor/shoes/_clasp",
+		"broken1": "tinkerscompendium:items/armor/shoes/_cloth"
     },
     "display": {
         "thirdperson_righthand": {
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/towershield.tcon.json b/src/main/resources/assets/tinkerscompendium/models/item/tools/towershield.tcon.json
index 1b485ec..5866861 100644
--- a/src/main/resources/assets/tinkersdefense/models/item/tools/towershield.tcon.json
+++ b/src/main/resources/assets/tinkerscompendium/models/item/tools/towershield.tcon.json
@@ -1,10 +1,10 @@
 {
     "textures": {
-        "layer0": "tinkersdefense:items/towershield/edge",
-        "layer1": "tinkersdefense:items/towershield/plate",
-		"layer2": "tinkersdefense:items/towershield/face",
-		"layer3": "tinkersdefense:items/towershield/binding",
-		"broken1": "tinkersdefense:items/towershield/plate_broken"
+        "layer0": "tinkerscompendium:items/towershield/edge",
+        "layer1": "tinkerscompendium:items/towershield/plate",
+		"layer2": "tinkerscompendium:items/towershield/face",
+		"layer3": "tinkerscompendium:items/towershield/binding",
+		"broken1": "tinkerscompendium:items/towershield/plate_broken"
     },
     "display": {
         "thirdperson_righthand": {
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/zweihander.tcon.json b/src/main/resources/assets/tinkerscompendium/models/item/tools/zweihander.tcon.json
index 32cec80..f9b4214 100644
--- a/src/main/resources/assets/tinkersdefense/models/item/tools/zweihander.tcon.json
+++ b/src/main/resources/assets/tinkerscompendium/models/item/tools/zweihander.tcon.json
@@ -1,10 +1,10 @@
 {
     "textures": {
-        "layer0": "tinkersdefense:items/zweihander/blade",
-        "layer1": "tinkersdefense:items/zweihander/core",
-		"layer2": "tinkersdefense:items/zweihander/guard",
-		"layer3": "tinkersdefense:items/zweihander/handle",
-		"broken1": "tinkersdefense:items/zweihander/broken"
+        "layer0": "tinkerscompendium:items/zweihander/blade",
+        "layer1": "tinkerscompendium:items/zweihander/core",
+		"layer2": "tinkerscompendium:items/zweihander/guard",
+		"layer3": "tinkerscompendium:items/zweihander/handle",
+		"broken1": "tinkerscompendium:items/zweihander/broken"
     },
     "display": {
         "thirdperson_righthand": {
diff --git a/src/main/resources/assets/tinkersdefense/models/sheathe_1.png b/src/main/resources/assets/tinkerscompendium/models/sheathe_1.png
index 87cf001..87cf001 100644
--- a/src/main/resources/assets/tinkersdefense/models/sheathe_1.png
+++ b/src/main/resources/assets/tinkerscompendium/models/sheathe_1.png
diff --git a/src/main/resources/assets/tinkersdefense/sounds.json b/src/main/resources/assets/tinkerscompendium/sounds.json
index 3169a0e..3169a0e 100644
--- a/src/main/resources/assets/tinkersdefense/sounds.json
+++ b/src/main/resources/assets/tinkerscompendium/sounds.json
diff --git a/src/main/resources/assets/tinkersdefense/sounds/hookshotChain.ogg b/src/main/resources/assets/tinkerscompendium/sounds/hookshotChain.ogg
index cd86241..cd86241 100644
--- a/src/main/resources/assets/tinkersdefense/sounds/hookshotChain.ogg
+++ b/src/main/resources/assets/tinkerscompendium/sounds/hookshotChain.ogg
diff --git a/src/main/resources/assets/tinkersdefense/text/souls/loadSouls.txt b/src/main/resources/assets/tinkerscompendium/text/souls/loadSouls.txt
index e66cc54..e66cc54 100644
--- a/src/main/resources/assets/tinkersdefense/text/souls/loadSouls.txt
+++ b/src/main/resources/assets/tinkerscompendium/text/souls/loadSouls.txt
diff --git a/src/main/resources/assets/tinkersdefense/text/souls/steve_enUS.txt b/src/main/resources/assets/tinkerscompendium/text/souls/steve_enUS.txt
index c2bba0a..c2bba0a 100644
--- a/src/main/resources/assets/tinkersdefense/text/souls/steve_enUS.txt
+++ b/src/main/resources/assets/tinkerscompendium/text/souls/steve_enUS.txt
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/ChainArmor.png b/src/main/resources/assets/tinkerscompendium/textures/armor/ChainArmor.png
index 1c2f0ba..1c2f0ba 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/ChainArmor.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/ChainArmor.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/ClothArmor.png b/src/main/resources/assets/tinkerscompendium/textures/armor/ClothArmor.png
index 2b68876..2b68876 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/ClothArmor.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/ClothArmor.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Mask/_mask_face.png b/src/main/resources/assets/tinkerscompendium/textures/armor/Mask/_mask_face.png
index 6d4dc90..6d4dc90 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Mask/_mask_face.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/Mask/_mask_face.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/sheath/ModelBiped-texturemap.png b/src/main/resources/assets/tinkerscompendium/textures/armor/Sheath/ModelBiped-texturemap.png
index ed1e42f..ed1e42f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/sheath/ModelBiped-texturemap.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/Sheath/ModelBiped-texturemap.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Sheath/Sheath.png b/src/main/resources/assets/tinkerscompendium/textures/armor/Sheath/Sheath.png
index c0c4ab5..c0c4ab5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Sheath/Sheath.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/Sheath/Sheath.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Sheath/_sheath_base.png b/src/main/resources/assets/tinkerscompendium/textures/armor/Sheath/_sheath_base.png
index 99a87aa..99a87aa 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Sheath/_sheath_base.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/Sheath/_sheath_base.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Sheath/_sheath_belt.png b/src/main/resources/assets/tinkerscompendium/textures/armor/Sheath/_sheath_belt.png
index fc62430..fc62430 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Sheath/_sheath_belt.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/Sheath/_sheath_belt.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Sheath/_sheath_clasp.png b/src/main/resources/assets/tinkerscompendium/textures/armor/Sheath/_sheath_clasp.png
index 23ad079..23ad079 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Sheath/_sheath_clasp.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/Sheath/_sheath_clasp.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Sheath/_sheath_filigree.png b/src/main/resources/assets/tinkerscompendium/textures/armor/Sheath/_sheath_filigree.png
index 6125d03..6125d03 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Sheath/_sheath_filigree.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/Sheath/_sheath_filigree.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/sheath/chain.png b/src/main/resources/assets/tinkerscompendium/textures/armor/Sheath/chain.png
index 9005ea0..9005ea0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/sheath/chain.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/Sheath/chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/sheath/plate.png b/src/main/resources/assets/tinkerscompendium/textures/armor/Sheath/plate.png
index da6f5e6..da6f5e6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/sheath/plate.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/Sheath/plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/TinkersBreastPlate.png b/src/main/resources/assets/tinkerscompendium/textures/armor/TinkersBreastPlate.png
index 5b9243a..5b9243a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/TinkersBreastPlate.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/TinkersBreastPlate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/TinkersGrieves.png b/src/main/resources/assets/tinkerscompendium/textures/armor/TinkersGrieves.png
index 13ee483..13ee483 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/TinkersGrieves.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/TinkersGrieves.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/TinkersHelm.png b/src/main/resources/assets/tinkerscompendium/textures/armor/TinkersHelm.png
index b152dcc..b152dcc 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/TinkersHelm.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/TinkersHelm.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/TinkersSabatons.png b/src/main/resources/assets/tinkerscompendium/textures/armor/TinkersSabatons.png
index 9110d38..9110d38 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/TinkersSabatons.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/TinkersSabatons.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/boots/_boots_chain.png b/src/main/resources/assets/tinkerscompendium/textures/armor/boots/_boots_chain.png
index efeceac..efeceac 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/boots/_boots_chain.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/boots/_boots_chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/boots/_boots_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/armor/boots/_boots_cloth.png
index 396f51d..396f51d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/boots/_boots_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/boots/_boots_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/boots/_boots_rivet.png b/src/main/resources/assets/tinkerscompendium/textures/armor/boots/_boots_rivet.png
index b2bcf16..b2bcf16 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/boots/_boots_rivet.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/boots/_boots_rivet.png
diff --git a/src/main/resources/assets/tinkerscompendium/textures/armor/breastplate/_breastplate_chain.png b/src/main/resources/assets/tinkerscompendium/textures/armor/breastplate/_breastplate_chain.png
new file mode 100644
index 0000000..3374881
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/breastplate/_breastplate_chain.png
diff --git a/src/main/resources/assets/tinkerscompendium/textures/armor/breastplate/_breastplate_plate.png b/src/main/resources/assets/tinkerscompendium/textures/armor/breastplate/_breastplate_plate.png
new file mode 100644
index 0000000..6ca5bfa
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/breastplate/_breastplate_plate.png
diff --git a/src/main/resources/assets/tinkerscompendium/textures/armor/breastplate/_breastplate_smallplate.png b/src/main/resources/assets/tinkerscompendium/textures/armor/breastplate/_breastplate_smallplate.png
new file mode 100644
index 0000000..5c23295
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/breastplate/_breastplate_smallplate.png
diff --git a/src/main/resources/assets/tinkerscompendium/textures/armor/breastplate/_breastplate_trim.png b/src/main/resources/assets/tinkerscompendium/textures/armor/breastplate/_breastplate_trim.png
new file mode 100644
index 0000000..a2e6342
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/breastplate/_breastplate_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/blastprotection_breastplate_effect.png b/src/main/resources/assets/tinkerscompendium/textures/armor/breastplate/blastprotection_breastplate_effect.png
index 81ee0c7..81ee0c7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/blastprotection_breastplate_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/breastplate/blastprotection_breastplate_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/fireprotection_breastplate_effect.png b/src/main/resources/assets/tinkerscompendium/textures/armor/breastplate/fireprotection_breastplate_effect.png
index b82b26c..b82b26c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/fireprotection_breastplate_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/breastplate/fireprotection_breastplate_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/healthboost_breastplate_effect.png b/src/main/resources/assets/tinkerscompendium/textures/armor/breastplate/healthboost_breastplate_effect.png
index b19c99a..b19c99a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/healthboost_breastplate_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/breastplate/healthboost_breastplate_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/projprotection_breastplate_effect.png b/src/main/resources/assets/tinkerscompendium/textures/armor/breastplate/projprotection_breastplate_effect.png
index 0beb1d3..0beb1d3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/projprotection_breastplate_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/breastplate/projprotection_breastplate_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/protection_breastplate_effect.png b/src/main/resources/assets/tinkerscompendium/textures/armor/breastplate/protection_breastplate_effect.png
index d0bba88..d0bba88 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/protection_breastplate_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/breastplate/protection_breastplate_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/runicshielding_breastplate_effect.png b/src/main/resources/assets/tinkerscompendium/textures/armor/breastplate/runicshielding_breastplate_effect.png
index b13c9df..b13c9df 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/breastplate/runicshielding_breastplate_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/breastplate/runicshielding_breastplate_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/Layer #1.png b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/Layer #1.png
index d568856..d568856 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/Layer #1.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/Layer #1.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/ModelBiped-texturemap.png b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/ModelBiped-texturemap.png
index 10fabe1..10fabe1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/ModelBiped-texturemap.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/ModelBiped-texturemap.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_blastprotection_chausses.png b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/_blastprotection_chausses.png
index 3ade1b1..3ade1b1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_blastprotection_chausses.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/_blastprotection_chausses.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_chausses_chain.png b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/_chausses_chain.png
index f76fd91..f76fd91 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_chausses_chain.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/_chausses_chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_chausses_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/_chausses_cloth.png
index 830764a..830764a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_chausses_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/_chausses_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_chausses_plate.png b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/_chausses_plate.png
index 5ec5387..5ec5387 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_chausses_plate.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/_chausses_plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_fireprotection_chausses.png b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/_fireprotection_chausses.png
index 6091ecf..6091ecf 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_fireprotection_chausses.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/_fireprotection_chausses.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_highstep_chausses.png b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/_highstep_chausses.png
index 62683b5..62683b5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_highstep_chausses.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/_highstep_chausses.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_jumpboost_chausses.png b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/_jumpboost_chausses.png
index b8f21cc..b8f21cc 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_jumpboost_chausses.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/_jumpboost_chausses.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_projprotection_chausses.png b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/_projprotection_chausses.png
index 424e871..424e871 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_projprotection_chausses.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/_projprotection_chausses.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_protection_chausses.png b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/_protection_chausses.png
index dfcd923..dfcd923 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_protection_chausses.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/_protection_chausses.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_speed_chausses.png b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/_speed_chausses.png
index b964283..b964283 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/_speed_chausses.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/_speed_chausses.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/chain.png b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/chain.png
index 836dae3..836dae3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/chain.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/char.png b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/char.png
index e925635..e925635 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/char.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/char.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/plate.png b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/plate.png
index 93240b6..93240b6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/chausses/plate.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/chausses/plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/coif/ModelTinkersCoif-texturemap.png b/src/main/resources/assets/tinkerscompendium/textures/armor/coif/ModelTinkersCoif-texturemap.png
index fdc07c6..fdc07c6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/coif/ModelTinkersCoif-texturemap.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/coif/ModelTinkersCoif-texturemap.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/coif/_coif_chain.png b/src/main/resources/assets/tinkerscompendium/textures/armor/coif/_coif_chain.png
index 9ec4270..9ec4270 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/coif/_coif_chain.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/coif/_coif_chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/coif/_coif_circlet.png b/src/main/resources/assets/tinkerscompendium/textures/armor/coif/_coif_circlet.png
index bc5f885..bc5f885 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/coif/_coif_circlet.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/coif/_coif_circlet.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/coif/_coif_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/armor/coif/_coif_cloth.png
index 2460044..2460044 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/coif/_coif_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/coif/_coif_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/coif/char.png b/src/main/resources/assets/tinkerscompendium/textures/armor/coif/char.png
index 1092828..1092828 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/coif/char.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/coif/char.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/ModelTinkersGauntlet-texturemap.png b/src/main/resources/assets/tinkerscompendium/textures/armor/gauntlets/ModelTinkersGauntlet-texturemap.png
index d000b19..d000b19 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/ModelTinkersGauntlet-texturemap.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/gauntlets/ModelTinkersGauntlet-texturemap.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/TinkersGauntlets-texturemap.png b/src/main/resources/assets/tinkerscompendium/textures/armor/gauntlets/TinkersGauntlets-texturemap.png
index 203321e..203321e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/TinkersGauntlets-texturemap.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/gauntlets/TinkersGauntlets-texturemap.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/_gauntlet_plate.png b/src/main/resources/assets/tinkerscompendium/textures/armor/gauntlets/_gauntlet_plate.png
index 3cc8b40..3cc8b40 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/_gauntlet_plate.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/gauntlets/_gauntlet_plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/_gauntlet_rivet copy.png b/src/main/resources/assets/tinkerscompendium/textures/armor/gauntlets/_gauntlet_rivet copy.png
index 3dde8d5..3dde8d5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/_gauntlet_rivet copy.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/gauntlets/_gauntlet_rivet copy.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/_gauntlet_rivet.png b/src/main/resources/assets/tinkerscompendium/textures/armor/gauntlets/_gauntlet_rivet.png
index 4b8aa13..4b8aa13 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/_gauntlet_rivet.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/gauntlets/_gauntlet_rivet.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/_gauntlet_trim.png b/src/main/resources/assets/tinkerscompendium/textures/armor/gauntlets/_gauntlet_trim.png
index cc8ed06..cc8ed06 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/_gauntlet_trim.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/gauntlets/_gauntlet_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/_gauntlets.png b/src/main/resources/assets/tinkerscompendium/textures/armor/gauntlets/_gauntlets.png
index e943aa6..e943aa6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/_gauntlets.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/gauntlets/_gauntlets.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/char.png b/src/main/resources/assets/tinkerscompendium/textures/armor/gauntlets/char.png
index e925635..e925635 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/char.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/gauntlets/char.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/icons/_mitten_plate.png b/src/main/resources/assets/tinkerscompendium/textures/armor/gauntlets/icons/_mitten_plate.png
index 7587b21..7587b21 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/icons/_mitten_plate.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/gauntlets/icons/_mitten_plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/icons/_mitten_rivet.png b/src/main/resources/assets/tinkerscompendium/textures/armor/gauntlets/icons/_mitten_rivet.png
index d8b2681..d8b2681 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/icons/_mitten_rivet.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/gauntlets/icons/_mitten_rivet.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/icons/_mitten_trim.png b/src/main/resources/assets/tinkerscompendium/textures/armor/gauntlets/icons/_mitten_trim.png
index 9e06185..9e06185 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/gauntlets/icons/_mitten_trim.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/gauntlets/icons/_mitten_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/TinkerHelm-texturemap.png b/src/main/resources/assets/tinkerscompendium/textures/armor/grieves/TinkerHelm-texturemap.png
index 1e86e72..1e86e72 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/TinkerHelm-texturemap.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/grieves/TinkerHelm-texturemap.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/grieves/TinkersGrieves-texturemap.png b/src/main/resources/assets/tinkerscompendium/textures/armor/grieves/TinkersGrieves-texturemap.png
index 3563a64..3563a64 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/grieves/TinkersGrieves-texturemap.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/grieves/TinkersGrieves-texturemap.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/grieves/TinkersSabatons-texturemap.png b/src/main/resources/assets/tinkerscompendium/textures/armor/grieves/TinkersSabatons-texturemap.png
index 23d2fc9..23d2fc9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/grieves/TinkersSabatons-texturemap.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/grieves/TinkersSabatons-texturemap.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_chain.png b/src/main/resources/assets/tinkerscompendium/textures/armor/grieves/_grieves_chain.png
index 7a9dcfe..7a9dcfe 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_chain.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/grieves/_grieves_chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_grieves_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/armor/grieves/_grieves_cloth.png
index 1a17566..1a17566 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/grieves/_grieves_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/grieves/_grieves_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_plate.png b/src/main/resources/assets/tinkerscompendium/textures/armor/grieves/_grieves_plate.png
index 540ed4a..540ed4a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_plate.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/grieves/_grieves_plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_trim.png b/src/main/resources/assets/tinkerscompendium/textures/armor/grieves/_grieves_trim.png
index 6d55841..6d55841 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_trim.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/grieves/_grieves_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/grieves/char.png b/src/main/resources/assets/tinkerscompendium/textures/armor/grieves/char.png
index e925635..e925635 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/grieves/char.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/grieves/char.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/hauberk/Pasted Layer.png b/src/main/resources/assets/tinkerscompendium/textures/armor/hauberk/Pasted Layer.png
index e925635..e925635 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/hauberk/Pasted Layer.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/hauberk/Pasted Layer.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/hauberk/TinkersHauberk-texturemap.png b/src/main/resources/assets/tinkerscompendium/textures/armor/hauberk/TinkersHauberk-texturemap.png
index 1c552b0..1c552b0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/hauberk/TinkersHauberk-texturemap.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/hauberk/TinkersHauberk-texturemap.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/hauberk/_hauberk_chain.png b/src/main/resources/assets/tinkerscompendium/textures/armor/hauberk/_hauberk_chain.png
index 12e04a2..12e04a2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/hauberk/_hauberk_chain.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/hauberk/_hauberk_chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/hauberk/_hauberk_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/armor/hauberk/_hauberk_cloth.png
index 898ac30..898ac30 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/hauberk/_hauberk_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/hauberk/_hauberk_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/hauberk/_hauberk_plate.png b/src/main/resources/assets/tinkerscompendium/textures/armor/hauberk/_hauberk_plate.png
index 5e74978..5e74978 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/hauberk/_hauberk_plate.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/hauberk/_hauberk_plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/helm/TinkerHelm-texturemap.png b/src/main/resources/assets/tinkerscompendium/textures/armor/helm/TinkerHelm-texturemap.png
index 7d727a1..7d727a1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/helm/TinkerHelm-texturemap.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/helm/TinkerHelm-texturemap.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_chain.png b/src/main/resources/assets/tinkerscompendium/textures/armor/helm/_helm_chain.png
index 38b7dd9..38b7dd9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_chain.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/helm/_helm_chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/helm/_helm_plate.png b/src/main/resources/assets/tinkerscompendium/textures/armor/helm/_helm_plate.png
index f8ee03f..f8ee03f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/helm/_helm_plate.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/helm/_helm_plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_top.png b/src/main/resources/assets/tinkerscompendium/textures/armor/helm/_helm_top.png
index 2b7bac6..2b7bac6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_top.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/helm/_helm_top.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_visor.png b/src/main/resources/assets/tinkerscompendium/textures/armor/helm/_helm_visor.png
index a3db328..a3db328 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_visor.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/helm/_helm_visor.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/helm/char.png b/src/main/resources/assets/tinkerscompendium/textures/armor/helm/char.png
index e925635..e925635 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/helm/char.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/helm/char.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/hood/ModelBiped-texturemap.png b/src/main/resources/assets/tinkerscompendium/textures/armor/hood/ModelBiped-texturemap.png
index 3603195..3603195 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/hood/ModelBiped-texturemap.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/hood/ModelBiped-texturemap.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/hood/TinkersHood-texturemap.png b/src/main/resources/assets/tinkerscompendium/textures/armor/hood/TinkersHood-texturemap.png
index 1686549..1686549 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/hood/TinkersHood-texturemap.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/hood/TinkersHood-texturemap.png
diff --git a/src/main/resources/assets/tinkerscompendium/textures/armor/hood/_hood_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/armor/hood/_hood_cloth.png
new file mode 100644
index 0000000..810ac2e
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/hood/_hood_cloth.png
diff --git a/src/main/resources/assets/tinkerscompendium/textures/armor/hood/_hood_metal.png b/src/main/resources/assets/tinkerscompendium/textures/armor/hood/_hood_metal.png
new file mode 100644
index 0000000..2652241
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/hood/_hood_metal.png
diff --git a/src/main/resources/assets/tinkerscompendium/textures/armor/hood/_hood_trim.png b/src/main/resources/assets/tinkerscompendium/textures/armor/hood/_hood_trim.png
new file mode 100644
index 0000000..3d2a6cd
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/hood/_hood_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/hood/char.png b/src/main/resources/assets/tinkerscompendium/textures/armor/hood/char.png
index 91194ea..91194ea 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/hood/char.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/hood/char.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/hood/divination_hood_effect.png b/src/main/resources/assets/tinkerscompendium/textures/armor/hood/divination_hood_effect.png
index 0537b2d..0537b2d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/hood/divination_hood_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/hood/divination_hood_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/hood/elementiumcore_alt.png b/src/main/resources/assets/tinkerscompendium/textures/armor/hood/elementiumcore_alt.png
index 5efed93..5efed93 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/hood/elementiumcore_alt.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/hood/elementiumcore_alt.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/hood/elementiumcore_hood_effect.png b/src/main/resources/assets/tinkerscompendium/textures/armor/hood/elementiumcore_hood_effect.png
index 734f006..734f006 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/hood/elementiumcore_hood_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/hood/elementiumcore_hood_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/hood/manaembroidery_hood_effect.png b/src/main/resources/assets/tinkerscompendium/textures/armor/hood/manaembroidery_hood_effect.png
index 33f6e8f..33f6e8f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/hood/manaembroidery_hood_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/hood/manaembroidery_hood_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/hood/revealing_hood_effect.png b/src/main/resources/assets/tinkerscompendium/textures/armor/hood/revealing_hood_effect.png
index 4a4596e..4a4596e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/hood/revealing_hood_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/hood/revealing_hood_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/hood/visembroidery_hood_effect.png b/src/main/resources/assets/tinkerscompendium/textures/armor/hood/visembroidery_hood_effect.png
index e4201b2..e4201b2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/hood/visembroidery_hood_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/hood/visembroidery_hood_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/hood/visembroidery_shawl_effect.png b/src/main/resources/assets/tinkerscompendium/textures/armor/hood/visembroidery_shawl_effect.png
index a32c765..a32c765 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/hood/visembroidery_shawl_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/hood/visembroidery_shawl_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/robe/ModelBiped-texturemap.png b/src/main/resources/assets/tinkerscompendium/textures/armor/robe/ModelBiped-texturemap.png
index f3aec4e..f3aec4e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/robe/ModelBiped-texturemap.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/robe/ModelBiped-texturemap.png
diff --git a/src/main/resources/assets/tinkerscompendium/textures/armor/robe/_robe_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/armor/robe/_robe_cloth.png
new file mode 100644
index 0000000..3a2d5d3
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/robe/_robe_cloth.png
diff --git a/src/main/resources/assets/tinkerscompendium/textures/armor/robe/_robe_metal.png b/src/main/resources/assets/tinkerscompendium/textures/armor/robe/_robe_metal.png
new file mode 100644
index 0000000..56c69f4
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/robe/_robe_metal.png
diff --git a/src/main/resources/assets/tinkerscompendium/textures/armor/robe/_robe_trim.png b/src/main/resources/assets/tinkerscompendium/textures/armor/robe/_robe_trim.png
new file mode 100644
index 0000000..7dca84d
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/robe/_robe_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/robe/char.png b/src/main/resources/assets/tinkerscompendium/textures/armor/robe/char.png
index e925635..e925635 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/robe/char.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/robe/char.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/robe/elementiumcore_robe_effect.png b/src/main/resources/assets/tinkerscompendium/textures/armor/robe/elementiumcore_robe_effect.png
index 5f9e4c0..5f9e4c0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/robe/elementiumcore_robe_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/robe/elementiumcore_robe_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/robe/manaembroidery_robe_effect.png b/src/main/resources/assets/tinkerscompendium/textures/armor/robe/manaembroidery_robe_effect.png
index 2e1f118..2e1f118 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/robe/manaembroidery_robe_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/robe/manaembroidery_robe_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/robe/manaembroidery_shoes_effect.png b/src/main/resources/assets/tinkerscompendium/textures/armor/robe/manaembroidery_shoes_effect.png
index ac276df..ac276df 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/robe/manaembroidery_shoes_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/robe/manaembroidery_shoes_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/robe/visembroidery_robe_effect.png b/src/main/resources/assets/tinkerscompendium/textures/armor/robe/visembroidery_robe_effect.png
index a9c22b0..a9c22b0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/robe/visembroidery_robe_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/robe/visembroidery_robe_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/robe/visembroidery_shawl_effect.png b/src/main/resources/assets/tinkerscompendium/textures/armor/robe/visembroidery_shawl_effect.png
index a32c765..a32c765 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/robe/visembroidery_shawl_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/robe/visembroidery_shawl_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/sabatons/TinkersSabatons-texturemap.png b/src/main/resources/assets/tinkerscompendium/textures/armor/sabatons/TinkersSabatons-texturemap.png
index a9ce514..a9ce514 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/sabatons/TinkersSabatons-texturemap.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/sabatons/TinkersSabatons-texturemap.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Sabatons/_sabatons_caps.png b/src/main/resources/assets/tinkerscompendium/textures/armor/sabatons/_sabatons_caps.png
index 5bb5a0f..5bb5a0f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Sabatons/_sabatons_caps.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/sabatons/_sabatons_caps.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Sabatons/_sabatons_plates.png b/src/main/resources/assets/tinkerscompendium/textures/armor/sabatons/_sabatons_plates.png
index 4072c56..4072c56 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Sabatons/_sabatons_plates.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/sabatons/_sabatons_plates.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Sabatons/_sabatons_soles.png b/src/main/resources/assets/tinkerscompendium/textures/armor/sabatons/_sabatons_soles.png
index fbf6e71..fbf6e71 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Sabatons/_sabatons_soles.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/sabatons/_sabatons_soles.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Sabatons/_sabatons_trim.png b/src/main/resources/assets/tinkerscompendium/textures/armor/sabatons/_sabatons_trim.png
index 6eeb772..6eeb772 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Sabatons/_sabatons_trim.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/sabatons/_sabatons_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/ModelBiped-texturemap.png b/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/ModelBiped-texturemap.png
index 3603195..3603195 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/ModelBiped-texturemap.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/ModelBiped-texturemap.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/TinkersHood-texturemap.png b/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/TinkersHood-texturemap.png
index 0775bce..0775bce 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/TinkersHood-texturemap.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/TinkersHood-texturemap.png
diff --git a/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/_shawl_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/_shawl_cloth.png
new file mode 100644
index 0000000..5d16d61
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/_shawl_cloth.png
diff --git a/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/_shawl_metal.png b/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/_shawl_metal.png
new file mode 100644
index 0000000..52f7beb
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/_shawl_metal.png
diff --git a/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/_shawl_trim.png b/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/_shawl_trim.png
new file mode 100644
index 0000000..24c0702
--- /dev/null
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/_shawl_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/char.png b/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/char.png
index e925635..e925635 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/char.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/char.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/elementiumcore_shawl_effect.png b/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/elementiumcore_shawl_effect.png
index 10bb44f..10bb44f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/elementiumcore_shawl_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/elementiumcore_shawl_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/manaembroidery_shawl_effect.png b/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/manaembroidery_shawl_effect.png
index ac276df..ac276df 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/manaembroidery_shawl_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/manaembroidery_shawl_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/manaembroidery_shoes_effect.png b/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/manaembroidery_shoes_effect.png
index ac276df..ac276df 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/manaembroidery_shoes_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/manaembroidery_shoes_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/revealing_hood_effect.png b/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/revealing_hood_effect.png
index 4a4596e..4a4596e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/revealing_hood_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/revealing_hood_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/visembroidery_hood_effect.png b/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/visembroidery_hood_effect.png
index e4201b2..e4201b2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/visembroidery_hood_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/visembroidery_hood_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/visembroidery_robe_effect.png b/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/visembroidery_robe_effect.png
index 36f2794..36f2794 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/visembroidery_robe_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/visembroidery_robe_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/visembroidery_shawl_effect.png b/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/visembroidery_shawl_effect.png
index a32c765..a32c765 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/visembroidery_shawl_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/shawl/visembroidery_shawl_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shoes/ModelBiped-texturemap.png b/src/main/resources/assets/tinkerscompendium/textures/armor/shoes/ModelBiped-texturemap.png
index f3aec4e..f3aec4e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shoes/ModelBiped-texturemap.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/shoes/ModelBiped-texturemap.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shoes/ModelTinkersShoes-texturemap.png b/src/main/resources/assets/tinkerscompendium/textures/armor/shoes/ModelTinkersShoes-texturemap.png
index d021e81..d021e81 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shoes/ModelTinkersShoes-texturemap.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/shoes/ModelTinkersShoes-texturemap.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shoes/_shoes_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/armor/shoes/_shoes_cloth.png
index 50ba071..50ba071 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shoes/_shoes_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/shoes/_shoes_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shoes/_shoes_metal.png b/src/main/resources/assets/tinkerscompendium/textures/armor/shoes/_shoes_metal.png
index b067ebf..b067ebf 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shoes/_shoes_metal.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/shoes/_shoes_metal.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shoes/_shoes_string.png b/src/main/resources/assets/tinkerscompendium/textures/armor/shoes/_shoes_string.png
index e421fab..e421fab 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shoes/_shoes_string.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/shoes/_shoes_string.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shoes/_shoes_trim.png b/src/main/resources/assets/tinkerscompendium/textures/armor/shoes/_shoes_trim.png
index 962cac9..962cac9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shoes/_shoes_trim.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/shoes/_shoes_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shoes/char.png b/src/main/resources/assets/tinkerscompendium/textures/armor/shoes/char.png
index 1eb9c0b..1eb9c0b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shoes/char.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/shoes/char.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shoes/elementiumcore_shoes_effect.png b/src/main/resources/assets/tinkerscompendium/textures/armor/shoes/elementiumcore_shoes_effect.png
index fbc0da2..fbc0da2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shoes/elementiumcore_shoes_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/shoes/elementiumcore_shoes_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shoes/manaembroidery_shoes_effect.png b/src/main/resources/assets/tinkerscompendium/textures/armor/shoes/manaembroidery_shoes_effect.png
index 96d9f8b..96d9f8b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shoes/manaembroidery_shoes_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/shoes/manaembroidery_shoes_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shoes/visembroidery_shoes_effect.png b/src/main/resources/assets/tinkerscompendium/textures/armor/shoes/visembroidery_shoes_effect.png
index a58ced7..a58ced7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shoes/visembroidery_shoes_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/shoes/visembroidery_shoes_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/tabard/_tabard_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/armor/tabard/_tabard_cloth.png
index 00dafd0..00dafd0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/tabard/_tabard_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/tabard/_tabard_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/tabard/_tabard_filigree.png b/src/main/resources/assets/tinkerscompendium/textures/armor/tabard/_tabard_filigree.png
index 33426a5..33426a5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/tabard/_tabard_filigree.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/tabard/_tabard_filigree.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/tabard/_tabard_trim.png b/src/main/resources/assets/tinkerscompendium/textures/armor/tabard/_tabard_trim.png
index 7824a4d..7824a4d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/armor/tabard/_tabard_trim.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/armor/tabard/_tabard_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blank.png b/src/main/resources/assets/tinkerscompendium/textures/blank.png
index bdee823..bdee823 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blank.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blank.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/AeonSteelBlock.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/AeonSteelBlock.png
index c18030c..c18030c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/AeonSteelBlock.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/AeonSteelBlock.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/ArmorAnvil.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/ArmorAnvil.png
index 1849a26..1849a26 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/ArmorAnvil.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/ArmorAnvil.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/CrestMount.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/CrestMount.png
index 61d6936..61d6936 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/CrestMount.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/CrestMount.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/DogbeariumBlock.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/DogbeariumBlock.png
index 462809c..462809c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/DogbeariumBlock.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/DogbeariumBlock.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/Item_CrestMount.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/Item_CrestMount.png
index b3dcc6e..b3dcc6e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/Item_CrestMount.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/Item_CrestMount.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/JewelersBench.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/JewelersBench.png
index 043b7fa..043b7fa 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/JewelersBench.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/JewelersBench.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/QueensGoldBlock.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/QueensGoldBlock.png
index 8b091e2..8b091e2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/QueensGoldBlock.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/QueensGoldBlock.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/WIP.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/WIP.png
index b8f9acc..b8f9acc 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/WIP.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/WIP.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/alumitebar.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/alumitebar.png
index d6684d6..d6684d6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/alumitebar.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/alumitebar.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/amberore.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/amberore.png
index 447f367..447f367 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/amberore.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/amberore.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/amethystore.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/amethystore.png
index 7c15170..7c15170 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/amethystore.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/amethystore.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/arditebars.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/arditebars.png
index 4f2ffee..4f2ffee 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/arditebars.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/arditebars.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/bronzebars.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/bronzebars.png
index 0e94ccf..0e94ccf 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/bronzebars.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/bronzebars.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/chain2.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/chain2.png
index 4b27f4d..4b27f4d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/chain2.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/chain2.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/cobaltbars.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/cobaltbars.png
index f183168..f183168 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/cobaltbars.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/cobaltbars.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/copperbars.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/copperbars.png
index 376e14d..376e14d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/copperbars.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/copperbars.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/fluids/molten_metal.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/fluids/molten_metal.png
index 441ff72..441ff72 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/fluids/molten_metal.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/fluids/molten_metal.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/fluids/molten_metal.png.mcmeta b/src/main/resources/assets/tinkerscompendium/textures/blocks/fluids/molten_metal.png.mcmeta
index 7ceb363..7ceb363 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/fluids/molten_metal.png.mcmeta
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/fluids/molten_metal.png.mcmeta
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/fluids/molten_metal_flow.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/fluids/molten_metal_flow.png
index 0826d00..0826d00 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/fluids/molten_metal_flow.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/fluids/molten_metal_flow.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/fluids/molten_metal_flow.png.mcmeta b/src/main/resources/assets/tinkerscompendium/textures/blocks/fluids/molten_metal_flow.png.mcmeta
index 8e55e43..8e55e43 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/fluids/molten_metal_flow.png.mcmeta
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/fluids/molten_metal_flow.png.mcmeta
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/glowstonecrumbs.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/glowstonecrumbs.png
index a0cc2de..a0cc2de 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/glowstonecrumbs.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/glowstonecrumbs.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/greenmintblock.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/greenmintblock.png
index c77c5cd..c77c5cd 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/greenmintblock.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/greenmintblock.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/item_armoranvil.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/item_armoranvil.png
index 1ad8f1d..1ad8f1d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/item_armoranvil.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/item_armoranvil.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/manullynbar.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/manullynbar.png
index cb5e7f6..cb5e7f6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/manullynbar.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/manullynbar.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_Aeonsteel.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_Aeonsteel.png
index 9fbe94b..9fbe94b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_Aeonsteel.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_Aeonsteel.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_Aeonsteel.png.mcmeta b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_Aeonsteel.png.mcmeta
index 0486765..0486765 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_Aeonsteel.png.mcmeta
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_Aeonsteel.png.mcmeta
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_Aeonsteel_flow.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_Aeonsteel_flow.png
index 8e3f30c..8e3f30c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_Aeonsteel_flow.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_Aeonsteel_flow.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_Aeonsteel_flow.png.mcmeta b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_Aeonsteel_flow.png.mcmeta
index 8e55e43..8e55e43 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_Aeonsteel_flow.png.mcmeta
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_Aeonsteel_flow.png.mcmeta
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_Dogbearium.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_Dogbearium.png
index e8fd8f2..e8fd8f2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_Dogbearium.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_Dogbearium.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_Dogbearium.png.mcmeta b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_Dogbearium.png.mcmeta
index 0486765..0486765 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_Dogbearium.png.mcmeta
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_Dogbearium.png.mcmeta
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_Dogbearium_flow.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_Dogbearium_flow.png
index b7d3593..b7d3593 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_Dogbearium_flow.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_Dogbearium_flow.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_Dogbearium_flow.png.mcmeta b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_Dogbearium_flow.png.mcmeta
index 8e55e43..8e55e43 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_Dogbearium_flow.png.mcmeta
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_Dogbearium_flow.png.mcmeta
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_GreenMint.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_GreenMint.png
index c26756b..c26756b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_GreenMint.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_GreenMint.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_GreenMint.png.mcmeta b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_GreenMint.png.mcmeta
index 0486765..0486765 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_GreenMint.png.mcmeta
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_GreenMint.png.mcmeta
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_GreenMint_flow.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_GreenMint_flow.png
index 407baf3..407baf3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_GreenMint_flow.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_GreenMint_flow.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_GreenMint_flow.png.mcmeta b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_GreenMint_flow.png.mcmeta
index 8e55e43..8e55e43 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_GreenMint_flow.png.mcmeta
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_GreenMint_flow.png.mcmeta
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_QueensGold.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_QueensGold.png
index 934642d..934642d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_QueensGold.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_QueensGold.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_QueensGold.png.mcmeta b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_QueensGold.png.mcmeta
index 0486765..0486765 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_QueensGold.png.mcmeta
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_QueensGold.png.mcmeta
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_QueensGold_flow.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_QueensGold_flow.png
index 4067d8e..4067d8e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_QueensGold_flow.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_QueensGold_flow.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_QueensGold_flow.png.mcmeta b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_QueensGold_flow.png.mcmeta
index 8e55e43..8e55e43 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_QueensGold_flow.png.mcmeta
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_QueensGold_flow.png.mcmeta
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_RedMint.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_RedMint.png
index 2b809d5..2b809d5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_RedMint.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_RedMint.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_RedMint.png.mcmeta b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_RedMint.png.mcmeta
index 0486765..0486765 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_RedMint.png.mcmeta
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_RedMint.png.mcmeta
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_RedMint_flow.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_RedMint_flow.png
index e2c5cf1..e2c5cf1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_RedMint_flow.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_RedMint_flow.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_RedMint_flow.png.mcmeta b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_RedMint_flow.png.mcmeta
index 8e55e43..8e55e43 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/molten_RedMint_flow.png.mcmeta
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/molten_RedMint_flow.png.mcmeta
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/obsidianbars.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/obsidianbars.png
index 483bc59..483bc59 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/obsidianbars.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/obsidianbars.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/pigironbars.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/pigironbars.png
index e8999fd..e8999fd 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/pigironbars.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/pigironbars.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/redmintblock.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/redmintblock.png
index f87176b..f87176b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/redmintblock.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/redmintblock.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/rubyore.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/rubyore.png
index 98358d5..98358d5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/rubyore.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/rubyore.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/sapphireore.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/sapphireore.png
index 312b06f..312b06f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/sapphireore.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/sapphireore.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/steelbar.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/steelbar.png
index 01bc950..01bc950 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/steelbar.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/steelbar.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/unstableice.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/unstableice.png
index da6c0f6..da6c0f6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/unstableice.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/unstableice.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/unstableice.png.mcmeta b/src/main/resources/assets/tinkerscompendium/textures/blocks/unstableice.png.mcmeta
index 0645f48..0645f48 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/unstableice.png.mcmeta
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/unstableice.png.mcmeta
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/unstableobsidian.png b/src/main/resources/assets/tinkerscompendium/textures/blocks/unstableobsidian.png
index bd77aa5..bd77aa5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/unstableobsidian.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/unstableobsidian.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/unstableobsidian.png.mcmeta b/src/main/resources/assets/tinkerscompendium/textures/blocks/unstableobsidian.png.mcmeta
index 7ceb363..7ceb363 100644
--- a/src/main/resources/assets/tinkersdefense/textures/blocks/unstableobsidian.png.mcmeta
+++ b/src/main/resources/assets/tinkerscompendium/textures/blocks/unstableobsidian.png.mcmeta
diff --git a/src/main/resources/assets/tinkersdefense/textures/entity/ballhead.png b/src/main/resources/assets/tinkerscompendium/textures/entity/ballhead.png
index 4f82118..4f82118 100644
--- a/src/main/resources/assets/tinkersdefense/textures/entity/ballhead.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/entity/ballhead.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/entity/chain.png b/src/main/resources/assets/tinkerscompendium/textures/entity/chain.png
index 8e42de5..8e42de5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/entity/chain.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/entity/chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/entity/clawhead.png b/src/main/resources/assets/tinkerscompendium/textures/entity/clawhead.png
index d7ef058..d7ef058 100644
--- a/src/main/resources/assets/tinkersdefense/textures/entity/clawhead.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/entity/clawhead.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/entity/drillhead.png b/src/main/resources/assets/tinkerscompendium/textures/entity/drillhead.png
index 1ccb087..1ccb087 100644
--- a/src/main/resources/assets/tinkersdefense/textures/entity/drillhead.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/entity/drillhead.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/entity/spikehead.png b/src/main/resources/assets/tinkerscompendium/textures/entity/spikehead.png
index de966d9..de966d9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/entity/spikehead.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/entity/spikehead.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/entity/swordhead.png b/src/main/resources/assets/tinkerscompendium/textures/entity/swordhead.png
index 22a49b7..22a49b7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/entity/swordhead.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/entity/swordhead.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/guard.png b/src/main/resources/assets/tinkerscompendium/textures/guard.png
index 142e3a6..142e3a6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/guard.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/guard.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/gui/axe.png b/src/main/resources/assets/tinkerscompendium/textures/gui/axe.png
index 2add961..2add961 100644
--- a/src/main/resources/assets/tinkersdefense/textures/gui/axe.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/gui/axe.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/gui/battleaxe_accessories.png b/src/main/resources/assets/tinkerscompendium/textures/gui/battleaxe_accessories.png
index 6ccd970..6ccd970 100644
--- a/src/main/resources/assets/tinkersdefense/textures/gui/battleaxe_accessories.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/gui/battleaxe_accessories.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/gui/battleaxe_extras.png b/src/main/resources/assets/tinkerscompendium/textures/gui/battleaxe_extras.png
index f95fb73..f95fb73 100644
--- a/src/main/resources/assets/tinkersdefense/textures/gui/battleaxe_extras.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/gui/battleaxe_extras.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/gui/battleaxe_heads.png b/src/main/resources/assets/tinkerscompendium/textures/gui/battleaxe_heads.png
index 5301262..5301262 100644
--- a/src/main/resources/assets/tinkersdefense/textures/gui/battleaxe_heads.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/gui/battleaxe_heads.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/gui/broadsword.png b/src/main/resources/assets/tinkerscompendium/textures/gui/broadsword.png
index 4fe6ff1..4fe6ff1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/gui/broadsword.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/gui/broadsword.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/gui/crest_mount.png b/src/main/resources/assets/tinkerscompendium/textures/gui/crest_mount.png
index cd83ab5..cd83ab5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/gui/crest_mount.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/gui/crest_mount.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/gui/finishinganvil.png b/src/main/resources/assets/tinkerscompendium/textures/gui/finishinganvil.png
index 64ab3dd..64ab3dd 100644
--- a/src/main/resources/assets/tinkersdefense/textures/gui/finishinganvil.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/gui/finishinganvil.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/gui/guide.png b/src/main/resources/assets/tinkerscompendium/textures/gui/guide.png
index 2da8032..2da8032 100644
--- a/src/main/resources/assets/tinkersdefense/textures/gui/guide.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/gui/guide.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/gui/guide2.png b/src/main/resources/assets/tinkerscompendium/textures/gui/guide2.png
index cb1980e..cb1980e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/gui/guide2.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/gui/guide2.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/gui/heatershield.png b/src/main/resources/assets/tinkerscompendium/textures/gui/heatershield.png
index 4bfa8c3..4bfa8c3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/gui/heatershield.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/gui/heatershield.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/gui/straps_helm.png b/src/main/resources/assets/tinkerscompendium/textures/gui/straps_helm.png
index 40f0768..40f0768 100644
--- a/src/main/resources/assets/tinkersdefense/textures/gui/straps_helm.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/gui/straps_helm.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/AeonSteelIngot.png b/src/main/resources/assets/tinkerscompendium/textures/items/AeonSteelIngot.png
index 950ef67..950ef67 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/AeonSteelIngot.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/AeonSteelIngot.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/DogbeariumIngot.png b/src/main/resources/assets/tinkerscompendium/textures/items/DogbeariumIngot.png
index f24049a..f24049a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/DogbeariumIngot.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/DogbeariumIngot.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/Icon.png b/src/main/resources/assets/tinkerscompendium/textures/items/Icon.png
index fb2fe5c..fb2fe5c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/Icon.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/Icon.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/QueensGoldIngot.png b/src/main/resources/assets/tinkerscompendium/textures/items/QueensGoldIngot.png
index ccd3054..ccd3054 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/QueensGoldIngot.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/QueensGoldIngot.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/_armorplate.png b/src/main/resources/assets/tinkerscompendium/textures/items/_armorplate.png
index dc3ed27..dc3ed27 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/_armorplate.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/_armorplate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/_chainmail.png b/src/main/resources/assets/tinkerscompendium/textures/items/_chainmail.png
index 551c9b7..551c9b7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/_chainmail.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/_chainmail.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/_clasp.png b/src/main/resources/assets/tinkerscompendium/textures/items/_clasp.png
index 747ee3e..747ee3e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/_clasp.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/_clasp.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/items/_cloth.png
index 2e0f570..2e0f570 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/_filigree.png b/src/main/resources/assets/tinkerscompendium/textures/items/_filigree.png
index 19a08ad..19a08ad 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/_filigree.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/_filigree.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/_ringshank.png b/src/main/resources/assets/tinkerscompendium/textures/items/_ringshank.png
index cad310e..cad310e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/_ringshank.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/_ringshank.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/_rivets.png b/src/main/resources/assets/tinkerscompendium/textures/items/_rivets.png
index 13735ec..13735ec 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/_rivets.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/_rivets.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/_setting.png b/src/main/resources/assets/tinkerscompendium/textures/items/_setting.png
index bfea8e3..bfea8e3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/_setting.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/_setting.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/_wire.png b/src/main/resources/assets/tinkerscompendium/textures/items/_wire.png
index e008ea1..e008ea1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/_wire.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/_wire.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/boots/_boots_chain.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/boots/_boots_chain.png
index 2315c6f..2315c6f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/boots/_boots_chain.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/boots/_boots_chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/boots/_boots_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/boots/_boots_cloth.png
index 40cc82a..40cc82a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/boots/_boots_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/boots/_boots_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/boots/_boots_rivet.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/boots/_boots_rivet.png
index 1883d37..1883d37 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/boots/_boots_rivet.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/boots/_boots_rivet.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_chain.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/breastplate/_chain.png
index 5b242c1..5b242c1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_chain.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/breastplate/_chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_plate.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/breastplate/_plate.png
index 624403e..624403e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_plate.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/breastplate/_plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_smallplate.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/breastplate/_smallplate.png
index 9d8aa6b..9d8aa6b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_smallplate.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/breastplate/_smallplate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_trim.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/breastplate/_trim.png
index 5eea928..5eea928 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/_trim.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/breastplate/_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/blastprotection_breastplate_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/breastplate/blastprotection_breastplate_effect.png
index 062bf61..062bf61 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/blastprotection_breastplate_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/breastplate/blastprotection_breastplate_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/fireprotection_breastplate_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/breastplate/fireprotection_breastplate_effect.png
index f45cb6f..f45cb6f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/fireprotection_breastplate_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/breastplate/fireprotection_breastplate_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/projprotection_breastplate_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/breastplate/projprotection_breastplate_effect.png
index 4fb0442..4fb0442 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/projprotection_breastplate_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/breastplate/projprotection_breastplate_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/protection_breastplate_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/breastplate/protection_breastplate_effect.png
index 9667d71..9667d71 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/breastplate/protection_breastplate_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/breastplate/protection_breastplate_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/chausses/_chausses_chain.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/chausses/_chausses_chain.png
index ec2c137..ec2c137 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/chausses/_chausses_chain.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/chausses/_chausses_chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/chausses/_chausses_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/chausses/_chausses_cloth.png
index 5eee054..5eee054 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/chausses/_chausses_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/chausses/_chausses_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/chausses/_chausses_plate.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/chausses/_chausses_plate.png
index 77c4a0c..77c4a0c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/chausses/_chausses_plate.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/chausses/_chausses_plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/coif/_coif_chain.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/coif/_coif_chain.png
index 250ea54..250ea54 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/coif/_coif_chain.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/coif/_coif_chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/coif/_coif_circlet.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/coif/_coif_circlet.png
index d1aa716..d1aa716 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/coif/_coif_circlet.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/coif/_coif_circlet.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/coif/_coif_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/coif/_coif_cloth.png
index 35ee80f..35ee80f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/coif/_coif_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/coif/_coif_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/coif/rebreather_coif_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/coif/rebreather_coif_effect.png
index bf253bf..bf253bf 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/coif/rebreather_coif_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/coif/rebreather_coif_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/coif/revealing_coif_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/coif/revealing_coif_effect.png
index e502cf4..e502cf4 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/coif/revealing_coif_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/coif/revealing_coif_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/gauntlets/_gauntlet_plate.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/gauntlets/_gauntlet_plate.png
index 748c7b9..748c7b9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/gauntlets/_gauntlet_plate.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/gauntlets/_gauntlet_plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/gauntlets/_gauntlet_rivet.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/gauntlets/_gauntlet_rivet.png
index 46e68d4..46e68d4 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/gauntlets/_gauntlet_rivet.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/gauntlets/_gauntlet_rivet.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/gauntlets/_gauntlet_trim.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/gauntlets/_gauntlet_trim.png
index 2cae42c..2cae42c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/gauntlets/_gauntlet_trim.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/gauntlets/_gauntlet_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/gauntlets/_guantlet_rivet.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/gauntlets/_guantlet_rivet.png
index 00f2fce..00f2fce 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/gauntlets/_guantlet_rivet.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/gauntlets/_guantlet_rivet.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/gauntlets/_guantlet_trim.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/gauntlets/_guantlet_trim.png
index e455443..e455443 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/gauntlets/_guantlet_trim.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/gauntlets/_guantlet_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_chain.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/grieves/_chain.png
index 8f7789a..8f7789a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_chain.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/grieves/_chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/grieves/_cloth.png
index 32985ad..32985ad 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/grieves/_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_plate.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/grieves/_plate.png
index 2bc04d2..2bc04d2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_plate.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/grieves/_plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_trim.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/grieves/_trim.png
index f24bcf8..f24bcf8 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/grieves/_trim.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/grieves/_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/hauberk/_hauberk_chain.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/hauberk/_hauberk_chain.png
index 91dac92..91dac92 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/hauberk/_hauberk_chain.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/hauberk/_hauberk_chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/hauberk/_hauberk_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/hauberk/_hauberk_cloth.png
index eaa4529..eaa4529 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/hauberk/_hauberk_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/hauberk/_hauberk_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/hauberk/_hauberk_plate.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/hauberk/_hauberk_plate.png
index 3bbf73e..3bbf73e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/hauberk/_hauberk_plate.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/hauberk/_hauberk_plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_chain.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/helm/_chain.png
index 13b051f..13b051f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_chain.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/helm/_chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_plate.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/helm/_plate.png
index a20421c..a20421c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_plate.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/helm/_plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_top.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/helm/_top.png
index 061027c..061027c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_top.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/helm/_top.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_visor.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/helm/_visor.png
index 6b89cd0..6b89cd0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/_visor.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/helm/_visor.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/rebreather_helm_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/helm/rebreather_helm_effect.png
index bf253bf..bf253bf 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/rebreather_helm_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/helm/rebreather_helm_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/revealing_helm_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/helm/revealing_helm_effect.png
index b7eb4e5..b7eb4e5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/helm/revealing_helm_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/helm/revealing_helm_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/hood/TinkersHood-texturemap.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/hood/TinkersHood-texturemap.png
index 0775bce..0775bce 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/hood/TinkersHood-texturemap.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/hood/TinkersHood-texturemap.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/hood/_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/hood/_cloth.png
index 17e9ba8..17e9ba8 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/hood/_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/hood/_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/hood/_rivet.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/hood/_rivet.png
index fa36c37..fa36c37 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/hood/_rivet.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/hood/_rivet.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/hood/_trim.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/hood/_trim.png
index 1c61bf0..1c61bf0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/hood/_trim.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/hood/_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/hood/model_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/hood/model_cloth.png
index fb9ef80..fb9ef80 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/hood/model_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/hood/model_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/hood/model_trim.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/hood/model_trim.png
index 2949796..2949796 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/hood/model_trim.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/hood/model_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/hood/rebreather_helm_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/hood/rebreather_helm_effect.png
index bf253bf..bf253bf 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/hood/rebreather_helm_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/hood/rebreather_helm_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/hood/rebreather_hood_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/hood/rebreather_hood_effect.png
index dbea83d..dbea83d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/hood/rebreather_hood_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/hood/rebreather_hood_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/hood/revealing_hood_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/hood/revealing_hood_effect.png
index 689c9c9..689c9c9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/hood/revealing_hood_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/hood/revealing_hood_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/hood/vis_hood_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/hood/vis_hood_effect.png
index f0e40e6..f0e40e6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/hood/vis_hood_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/hood/vis_hood_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/hood/visembroidery_hood_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/hood/visembroidery_hood_effect.png
index f0e40e6..f0e40e6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/hood/visembroidery_hood_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/hood/visembroidery_hood_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/robe/_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/robe/_cloth.png
index 0a6a661..0a6a661 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/robe/_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/robe/_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/robe/_plate.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/robe/_plate.png
index 7c33840..7c33840 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/robe/_plate.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/robe/_plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/robe/_trim.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/robe/_trim.png
index 3919c8e..3919c8e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/robe/_trim.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/robe/_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/robe/vis_robe_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/robe/vis_robe_effect.png
index c7f7c01..c7f7c01 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/robe/vis_robe_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/robe/vis_robe_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/robe/visembroidery_robe_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/robe/visembroidery_robe_effect.png
index c7f7c01..c7f7c01 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/robe/visembroidery_robe_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/robe/visembroidery_robe_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_caps.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/sabatons/_caps.png
index 8225f2f..8225f2f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_caps.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/sabatons/_caps.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_plates.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/sabatons/_plates.png
index a841231..a841231 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_plates.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/sabatons/_plates.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_soles.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/sabatons/_soles.png
index 4bf2a87..4bf2a87 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_soles.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/sabatons/_soles.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_trim.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/sabatons/_trim.png
index 54ac3e9..54ac3e9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/_trim.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/sabatons/_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/blastprotection_sabatons_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/sabatons/blastprotection_sabatons_effect.png
index 60a2638..60a2638 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/blastprotection_sabatons_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/sabatons/blastprotection_sabatons_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/depthstrider_sabatons_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/sabatons/depthstrider_sabatons_effect.png
index 4ce2437..4ce2437 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/depthstrider_sabatons_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/sabatons/depthstrider_sabatons_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/featherfall_sabatons_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/sabatons/featherfall_sabatons_effect.png
index 5e9f2f1..5e9f2f1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/featherfall_sabatons_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/sabatons/featherfall_sabatons_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/fireprotection_sabatons_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/sabatons/fireprotection_sabatons_effect.png
index db5a7f0..db5a7f0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/fireprotection_sabatons_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/sabatons/fireprotection_sabatons_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/firewalk_sabatons_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/sabatons/firewalk_sabatons_effect.png
index ce914a7..ce914a7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/firewalk_sabatons_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/sabatons/firewalk_sabatons_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/frostwalk_sabatons_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/sabatons/frostwalk_sabatons_effect.png
index 8a85b87..8a85b87 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/frostwalk_sabatons_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/sabatons/frostwalk_sabatons_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/glowstep_sabatons_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/sabatons/glowstep_sabatons_effect.png
index b7ab1cb..b7ab1cb 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/glowstep_sabatons_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/sabatons/glowstep_sabatons_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/projprotection_sabatons_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/sabatons/projprotection_sabatons_effect.png
index a563a2c..a563a2c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/projprotection_sabatons_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/sabatons/projprotection_sabatons_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/protection_sabatons_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/sabatons/protection_sabatons_effect.png
index 60a4577..60a4577 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/sabatons/protection_sabatons_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/sabatons/protection_sabatons_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/shawl/_clasp.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/shawl/_clasp.png
index 5e4bc9b..5e4bc9b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/shawl/_clasp.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/shawl/_clasp.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/shawl/_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/shawl/_cloth.png
index ad0d542..ad0d542 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/shawl/_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/shawl/_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/shawl/_trim.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/shawl/_trim.png
index fe5529e..fe5529e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/shawl/_trim.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/shawl/_trim.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/shawl/vis_shawl_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/shawl/vis_shawl_effect.png
index 1b141c3..1b141c3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/shawl/vis_shawl_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/shawl/vis_shawl_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/shawl/visembroidery_shawl_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/shawl/visembroidery_shawl_effect.png
index 3dd7490..3dd7490 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/shawl/visembroidery_shawl_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/shawl/visembroidery_shawl_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/shoes/_broken.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/shoes/_broken.png
index 9df5a27..9df5a27 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/shoes/_broken.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/shoes/_broken.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/shoes/_clasp.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/shoes/_clasp.png
index d2b5efc..d2b5efc 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/shoes/_clasp.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/shoes/_clasp.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/shoes/_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/shoes/_cloth.png
index 622477f..622477f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/shoes/_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/shoes/_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/shoes/_sole.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/shoes/_sole.png
index 05b1871..05b1871 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/shoes/_sole.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/shoes/_sole.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/shoes/vis_shoes_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/shoes/vis_shoes_effect.png
index 902b94c..902b94c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/shoes/vis_shoes_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/shoes/vis_shoes_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/armor/shoes/visembroidery_shoes_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/armor/shoes/visembroidery_shoes_effect.png
index 902b94c..902b94c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/armor/shoes/visembroidery_shoes_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/armor/shoes/visembroidery_shoes_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/arrow/_broad_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/arrow/_broad_head.png
index 7092457..7092457 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/arrow/_broad_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/arrow/_broad_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/arrow/_bulbous_handle.png b/src/main/resources/assets/tinkerscompendium/textures/items/arrow/_bulbous_handle.png
index e57806a..e57806a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/arrow/_bulbous_handle.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/arrow/_bulbous_handle.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/arrow/_elven_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/arrow/_elven_head.png
index a385b2b..a385b2b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/arrow/_elven_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/arrow/_elven_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/arrow/_horned_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/arrow/_horned_head.png
index 826c28f..826c28f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/arrow/_horned_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/arrow/_horned_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/arrow/_magic_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/arrow/_magic_accessory.png
index 1074391..1074391 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/arrow/_magic_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/arrow/_magic_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/arrow/_matted_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/arrow/_matted_accessory.png
index 16d32ea..16d32ea 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/arrow/_matted_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/arrow/_matted_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/arrow/_natural_handle.png b/src/main/resources/assets/tinkerscompendium/textures/items/arrow/_natural_handle.png
index 2b6d97b..2b6d97b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/arrow/_natural_handle.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/arrow/_natural_handle.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/arrow/_pixie_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/arrow/_pixie_accessory.png
index 8a623a2..8a623a2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/arrow/_pixie_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/arrow/_pixie_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/arrow/_small_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/arrow/_small_accessory.png
index 7ad5305..7ad5305 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/arrow/_small_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/arrow/_small_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/arrow/_trident_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/arrow/_trident_head.png
index f12a514..f12a514 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/arrow/_trident_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/arrow/_trident_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/arrow/_winged_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/arrow/_winged_head.png
index 5f4877e..5f4877e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/arrow/_winged_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/arrow/_winged_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_bearded_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_bearded_head.png
index 615fbc6..615fbc6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_bearded_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_bearded_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_broad_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_broad_head.png
index a0541e5..a0541e5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_broad_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_broad_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_long_handle.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_long_handle.png
index 858ef5c..858ef5c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_long_handle.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_long_handle.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_longornate_handle.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_longornate_handle.png
index 4837363..4837363 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_longornate_handle.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_longornate_handle.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5angmallen_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5angmallen_head.png
index b4408df..b4408df 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5angmallen_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5angmallen_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5brass_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5brass_head.png
index 2870b45..2870b45 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5brass_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5brass_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5bronze_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5bronze_head.png
index ef982db..ef982db 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5bronze_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5bronze_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5copper_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5copper_head.png
index cd0130d..cd0130d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5copper_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5copper_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5crowngold_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5crowngold_head.png
index 0121ca5..0121ca5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5crowngold_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5crowngold_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5cupronickel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5cupronickel_head.png
index da63d3c..da63d3c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5cupronickel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5cupronickel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5damascussteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5damascussteel_head.png
index 8e9ecba..8e9ecba 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5damascussteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5damascussteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5diamond_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5diamond_head.png
index 99a5454..99a5454 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5diamond_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5diamond_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5electrum_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5electrum_head.png
index a860db9..a860db9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5electrum_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5electrum_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5fungalsteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5fungalsteel_head.png
index 158d0cb..158d0cb 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5fungalsteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5fungalsteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5gold_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5gold_head.png
index 14fb22e..14fb22e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5gold_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5gold_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5heavysteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5heavysteel_head.png
index 54e0c9b..54e0c9b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5heavysteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5heavysteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5hepatizon_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5hepatizon_head.png
index 03a1240..03a1240 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5hepatizon_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5hepatizon_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5ignatius_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5ignatius_head.png
index 071038e..071038e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5ignatius_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5ignatius_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5iron_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5iron_head.png
index c7e2d6a..c7e2d6a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5iron_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5iron_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5lead_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5lead_head.png
index dd480d5..dd480d5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5lead_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5lead_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5manganese_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5manganese_head.png
index 969a6af..969a6af 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5manganese_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5manganese_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5manganesesteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5manganesesteel_head.png
index 9af699a..9af699a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5manganesesteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5manganesesteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5molybdochalkos_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5molybdochalkos_head.png
index 7ce8637..7ce8637 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5molybdochalkos_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5molybdochalkos_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5monel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5monel_head.png
index 39d9f30..39d9f30 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5monel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5monel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5nickel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5nickel_head.png
index 9f0122f..9f0122f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5nickel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5nickel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5nickelsteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5nickelsteel_head.png
index 466af23..466af23 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5nickelsteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5nickelsteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5pewter_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5pewter_head.png
index 3731a4c..3731a4c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5pewter_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5pewter_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5platinum_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5platinum_head.png
index 07205c1..07205c1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5platinum_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5platinum_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5rosegold_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5rosegold_head.png
index f772883..f772883 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5rosegold_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5rosegold_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5silver_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5silver_head.png
index 578e052..578e052 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5silver_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5silver_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5tin_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5tin_head.png
index 256f3d5..256f3d5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5tin_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5tin_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5whitegold_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5whitegold_head.png
index 5a201c5..5a201c5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5whitegold_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5whitegold_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5zinc_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5zinc_head.png
index b58dc98..b58dc98 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_m5zinc_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_m5zinc_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_minecraft_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_minecraft_head.png
index f7bfdd1..f7bfdd1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_minecraft_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_minecraft_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_offset_handle.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_offset_handle.png
index ff7f803..ff7f803 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_offset_handle.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_offset_handle.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_offsetlong_handle.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_offsetlong_handle.png
index 73bcda0..73bcda0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_offsetlong_handle.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_offsetlong_handle.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_offsetlongornate_handle.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_offsetlongornate_handle.png
index a4324a7..a4324a7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_offsetlongornate_handle.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_offsetlongornate_handle.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_offsetornate_handle.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_offsetornate_handle.png
index ed92a42..ed92a42 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_offsetornate_handle.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_offsetornate_handle.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_ornate_handle.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_ornate_handle.png
index 99dcf3a..99dcf3a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_ornate_handle.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_ornate_handle.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/axe/_thin_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_thin_head.png
index 1dde691..1dde691 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/axe/_thin_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/axe/_thin_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_halbard_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_halbard_accessory.png
index ab4bc13..ab4bc13 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_halbard_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_halbard_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_halbard_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_halbard_extra.png
index 71698d3..71698d3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_halbard_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_halbard_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_halbard_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_halbard_head.png
index b418425..b418425 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_halbard_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_halbard_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_knob_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_knob_extra.png
index 5ba8aa1..5ba8aa1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_knob_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_knob_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5angmallen_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5angmallen_accessory.png
index 23bc2aa..23bc2aa 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5angmallen_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5angmallen_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5angmallen_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5angmallen_extra.png
index 0f78315..0f78315 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5angmallen_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5angmallen_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5angmallen_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5angmallen_head.png
index d945837..d945837 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5angmallen_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5angmallen_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5brassA_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5brassA_head.png
index cf14055..cf14055 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5brassA_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5brassA_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5brass_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5brass_accessory.png
index fb6ec00..fb6ec00 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5brass_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5brass_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5brass_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5brass_extra.png
index 3d413b1..3d413b1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5brass_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5brass_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5brass_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5brass_head.png
index 9bdaa52..9bdaa52 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5brass_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5brass_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5bronzeA_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5bronzeA_head.png
index ca2087b..ca2087b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5bronzeA_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5bronzeA_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5bronze_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5bronze_accessory.png
index ffb61c5..ffb61c5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5bronze_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5bronze_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5bronze_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5bronze_extra.png
index c7f8194..c7f8194 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5bronze_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5bronze_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5bronze_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5bronze_head.png
index c4162d0..c4162d0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5bronze_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5bronze_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5copperA_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5copperA_head.png
index 4b18cd0..4b18cd0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5copperA_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5copperA_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5copper_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5copper_accessory.png
index 2660345..2660345 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5copper_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5copper_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5copper_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5copper_extra.png
index c62272f..c62272f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5copper_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5copper_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5copper_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5copper_head.png
index abd59cf..abd59cf 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5copper_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5copper_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5crowngoldA_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5crowngoldA_head.png
index b48afcb..b48afcb 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5crowngoldA_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5crowngoldA_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5crowngold_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5crowngold_accessory.png
index 838548f..838548f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5crowngold_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5crowngold_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5crowngold_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5crowngold_extra.png
index 9530b19..9530b19 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5crowngold_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5crowngold_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5crowngold_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5crowngold_head.png
index 92f94bf..92f94bf 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5crowngold_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5crowngold_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5cupronickelA_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5cupronickelA_head.png
index 6407119..6407119 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5cupronickelA_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5cupronickelA_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5cupronickel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5cupronickel_accessory.png
index b7c4a1d..b7c4a1d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5cupronickel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5cupronickel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5cupronickel_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5cupronickel_extra.png
index 1770f56..1770f56 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5cupronickel_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5cupronickel_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5cupronickel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5cupronickel_head.png
index ed2e172..ed2e172 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5cupronickel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5cupronickel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5damascussteelA_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5damascussteelA_head.png
index 123ec31..123ec31 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5damascussteelA_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5damascussteelA_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5damascussteel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5damascussteel_accessory.png
index 2f25702..2f25702 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5damascussteel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5damascussteel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5damascussteel_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5damascussteel_extra.png
index f0e293c..f0e293c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5damascussteel_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5damascussteel_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5damascussteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5damascussteel_head.png
index 7afa2c6..7afa2c6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5damascussteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5damascussteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5diamond_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5diamond_accessory.png
index d685f7b..d685f7b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5diamond_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5diamond_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5diamond_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5diamond_extra.png
index 569ac52..569ac52 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5diamond_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5diamond_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5diamond_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5diamond_head.png
index 6939c3e..6939c3e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5diamond_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5diamond_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5electrumA_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5electrumA_head.png
index 13da1b2..13da1b2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5electrumA_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5electrumA_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5electrum_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5electrum_accessory.png
index f3ac79f..f3ac79f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5electrum_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5electrum_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5electrum_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5electrum_extra.png
index 2bbed7e..2bbed7e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5electrum_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5electrum_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5electrum_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5electrum_head.png
index ef2d57e..ef2d57e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5electrum_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5electrum_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5fungalsteel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5fungalsteel_accessory.png
index c55269d..c55269d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5fungalsteel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5fungalsteel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5fungalsteel_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5fungalsteel_extra.png
index 12003c2..12003c2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5fungalsteel_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5fungalsteel_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5fungalsteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5fungalsteel_head.png
index ac326e7..ac326e7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5fungalsteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5fungalsteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5goldA_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5goldA_head.png
index 49623b5..49623b5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5goldA_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5goldA_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5gold_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5gold_accessory.png
index 310c368..310c368 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5gold_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5gold_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5gold_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5gold_extra.png
index d5f0921..d5f0921 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5gold_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5gold_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5gold_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5gold_head.png
index ff1462d..ff1462d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5gold_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5gold_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5heavysteel_accessory copy.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5heavysteel_accessory copy.png
index 930ba98..930ba98 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5heavysteel_accessory copy.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5heavysteel_accessory copy.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5heavysteel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5heavysteel_accessory.png
index 9624d2c..9624d2c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5heavysteel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5heavysteel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5heavysteel_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5heavysteel_extra.png
index 7bccc0a..7bccc0a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5heavysteel_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5heavysteel_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5heavysteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5heavysteel_head.png
index f0326db..f0326db 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5heavysteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5heavysteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5hepatizonA_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5hepatizonA_head.png
index 2ab7b63..2ab7b63 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5hepatizonA_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5hepatizonA_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5hepatizon_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5hepatizon_accessory.png
index c87a7f1..c87a7f1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5hepatizon_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5hepatizon_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5hepatizon_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5hepatizon_extra.png
index 2653e65..2653e65 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5hepatizon_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5hepatizon_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5hepatizon_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5hepatizon_head.png
index 02a5faa..02a5faa 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5hepatizon_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5hepatizon_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5ignatius_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5ignatius_accessory.png
index 23d1365..23d1365 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5ignatius_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5ignatius_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5ignatius_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5ignatius_extra.png
index b5e243f..b5e243f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5ignatius_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5ignatius_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5ignatius_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5ignatius_head.png
index 556fcd9..556fcd9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5ignatius_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5ignatius_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5ironA_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5ironA_head.png
index a7216df..a7216df 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5ironA_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5ironA_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5iron_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5iron_accessory.png
index 2d3f43f..2d3f43f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5iron_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5iron_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5iron_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5iron_extra.png
index 5495d3e..5495d3e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5iron_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5iron_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5iron_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5iron_head.png
index 440738c..440738c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5iron_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5iron_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5leadA_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5leadA_head.png
index d5f9fef..d5f9fef 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5leadA_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5leadA_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5lead_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5lead_accessory.png
index 7725415..7725415 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5lead_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5lead_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5lead_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5lead_extra.png
index 8fae5cb..8fae5cb 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5lead_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5lead_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5lead_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5lead_head.png
index 5e0b235..5e0b235 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5lead_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5lead_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5manganeseA_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5manganeseA_head.png
index 3f31825..3f31825 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5manganeseA_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5manganeseA_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5manganese_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5manganese_accessory.png
index ff8f1b4..ff8f1b4 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5manganese_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5manganese_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5manganese_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5manganese_extra.png
index 5362bec..5362bec 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5manganese_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5manganese_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5manganese_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5manganese_head.png
index d8c4d2b..d8c4d2b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5manganese_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5manganese_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5manganesesteelA_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5manganesesteelA_head.png
index 1677945..1677945 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5manganesesteelA_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5manganesesteelA_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5manganesesteel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5manganesesteel_accessory.png
index fcc111b..fcc111b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5manganesesteel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5manganesesteel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5manganesesteel_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5manganesesteel_extra.png
index 26add21..26add21 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5manganesesteel_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5manganesesteel_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5manganesesteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5manganesesteel_head.png
index f390c73..f390c73 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5manganesesteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5manganesesteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5molybdochalkosA_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5molybdochalkosA_head.png
index a014b14..a014b14 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5molybdochalkosA_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5molybdochalkosA_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5molybdochalkos_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5molybdochalkos_accessory.png
index 475be80..475be80 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5molybdochalkos_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5molybdochalkos_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5molybdochalkos_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5molybdochalkos_extra.png
index f34d1ac..f34d1ac 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5molybdochalkos_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5molybdochalkos_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5molybdochalkos_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5molybdochalkos_head.png
index 21bfd78..21bfd78 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5molybdochalkos_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5molybdochalkos_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5monelA_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5monelA_head.png
index 73dc722..73dc722 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5monelA_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5monelA_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5monel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5monel_accessory.png
index 98023ab..98023ab 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5monel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5monel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5monel_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5monel_extra.png
index e4121a4..e4121a4 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5monel_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5monel_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5monel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5monel_head.png
index a9e1293..a9e1293 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5monel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5monel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5nickelA_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5nickelA_head.png
index 4d04fd4..4d04fd4 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5nickelA_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5nickelA_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5nickel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5nickel_accessory.png
index 987486b..987486b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5nickel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5nickel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5nickel_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5nickel_extra.png
index 88d296a..88d296a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5nickel_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5nickel_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5nickel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5nickel_head.png
index b50b559..b50b559 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5nickel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5nickel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5nickelsteelA_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5nickelsteelA_head.png
index 0d22acb..0d22acb 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5nickelsteelA_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5nickelsteelA_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5nickelsteel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5nickelsteel_accessory.png
index a7f7800..a7f7800 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5nickelsteel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5nickelsteel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5nickelsteel_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5nickelsteel_extra.png
index 8f5b564..8f5b564 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5nickelsteel_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5nickelsteel_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5nickelsteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5nickelsteel_head.png
index bd46489..bd46489 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5nickelsteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5nickelsteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5pewterA_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5pewterA_head.png
index a88aa8d..a88aa8d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5pewterA_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5pewterA_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5pewter_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5pewter_accessory.png
index 0d65094..0d65094 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5pewter_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5pewter_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5pewter_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5pewter_extra.png
index e898785..e898785 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5pewter_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5pewter_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5pewter_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5pewter_head.png
index d12c565..d12c565 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5pewter_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5pewter_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5platinumA_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5platinumA_head.png
index 3b0f2da..3b0f2da 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5platinumA_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5platinumA_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5platinum_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5platinum_accessory.png
index 5294a9f..5294a9f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5platinum_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5platinum_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5platinum_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5platinum_extra.png
index 07e6b0f..07e6b0f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5platinum_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5platinum_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5platinum_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5platinum_head.png
index 0e3d358..0e3d358 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5platinum_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5platinum_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5rosegoldA_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5rosegoldA_head.png
index 5d0ef2b..5d0ef2b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5rosegoldA_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5rosegoldA_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5rosegold_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5rosegold_accessory.png
index 45adfdd..45adfdd 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5rosegold_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5rosegold_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5rosegold_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5rosegold_extra.png
index dd6086c..dd6086c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5rosegold_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5rosegold_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5rosegold_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5rosegold_head.png
index 697acb7..697acb7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5rosegold_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5rosegold_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5silverA_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5silverA_head.png
index a8977b0..a8977b0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5silverA_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5silverA_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5silver_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5silver_accessory.png
index b690aec..b690aec 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5silver_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5silver_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5silver_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5silver_extra.png
index c19517c..c19517c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5silver_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5silver_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5silver_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5silver_head.png
index 832a0c4..832a0c4 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5silver_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5silver_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5tinA_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5tinA_head.png
index 68b10ba..68b10ba 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5tinA_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5tinA_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5tin_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5tin_accessory.png
index 98e4ab8..98e4ab8 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5tin_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5tin_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5tin_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5tin_extra.png
index 6969f57..6969f57 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5tin_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5tin_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5tin_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5tin_head.png
index f4ea8f7..f4ea8f7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5tin_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5tin_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5whitegold_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5whitegold_accessory.png
index 906f4f3..906f4f3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5whitegold_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5whitegold_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5whitegold_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5whitegold_extra.png
index afbec69..afbec69 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5whitegold_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5whitegold_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5whitegold_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5whitegold_head.png
index 4166358..4166358 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5whitegold_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5whitegold_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5zincA_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5zincA_head.png
index ea67ae8..ea67ae8 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5zincA_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5zincA_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5zinc_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5zinc_accessory.png
index 4c765c6..4c765c6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5zinc_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5zinc_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5zinc_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5zinc_extra.png
index b9cc746..b9cc746 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5zinc_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5zinc_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5zinc_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5zinc_head.png
index 8885b69..8885b69 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_m5zinc_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_m5zinc_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_magic_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_magic_accessory.png
index 02b185a..02b185a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_magic_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_magic_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_magic_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_magic_extra.png
index 088928e..088928e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_magic_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_magic_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_magic_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_magic_head.png
index a4ed4c2..a4ed4c2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_magic_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_magic_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_ornate_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_ornate_extra.png
index 6de9fce..6de9fce 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_ornate_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_ornate_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_scythe_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_scythe_accessory.png
index cdec773..cdec773 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_scythe_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_scythe_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_scythe_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_scythe_head.png
index 7207169..7207169 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battleaxe/_scythe_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battleaxe/_scythe_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battlesign/_X_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battlesign/_X_head.png
index 03c6adc..03c6adc 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battlesign/_X_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battlesign/_X_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battlesign/_arrow_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battlesign/_arrow_head.png
index e2dfbcf..e2dfbcf 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battlesign/_arrow_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battlesign/_arrow_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battlesign/_caution_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battlesign/_caution_head.png
index adac492..adac492 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battlesign/_caution_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battlesign/_caution_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battlesign/_noentry_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battlesign/_noentry_head.png
index eb7637f..eb7637f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battlesign/_noentry_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battlesign/_noentry_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battlesign/_railroad_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battlesign/_railroad_head.png
index 589c7e7..589c7e7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battlesign/_railroad_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battlesign/_railroad_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battlesign/_small_handle.png b/src/main/resources/assets/tinkerscompendium/textures/items/battlesign/_small_handle.png
index 30353ea..30353ea 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battlesign/_small_handle.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battlesign/_small_handle.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battlesign/_smalllong_handle.png b/src/main/resources/assets/tinkerscompendium/textures/items/battlesign/_smalllong_handle.png
index 3140296..3140296 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battlesign/_smalllong_handle.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battlesign/_smalllong_handle.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/battlesign/_stop_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/battlesign/_stop_head.png
index b67996a..b67996a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/battlesign/_stop_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/battlesign/_stop_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/baubles/amulet/_broken.png b/src/main/resources/assets/tinkerscompendium/textures/items/baubles/amulet/_broken.png
index ed68a34..ed68a34 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/baubles/amulet/_broken.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/baubles/amulet/_broken.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/baubles/amulet/_chain.png b/src/main/resources/assets/tinkerscompendium/textures/items/baubles/amulet/_chain.png
index 6600445..6600445 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/baubles/amulet/_chain.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/baubles/amulet/_chain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/baubles/amulet/_clasp.png b/src/main/resources/assets/tinkerscompendium/textures/items/baubles/amulet/_clasp.png
index 10d458e..10d458e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/baubles/amulet/_clasp.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/baubles/amulet/_clasp.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/baubles/amulet/_setting.png b/src/main/resources/assets/tinkerscompendium/textures/items/baubles/amulet/_setting.png
index 26c229a..26c229a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/baubles/amulet/_setting.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/baubles/amulet/_setting.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/baubles/ring/_band.png b/src/main/resources/assets/tinkerscompendium/textures/items/baubles/ring/_band.png
index abbefee..abbefee 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/baubles/ring/_band.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/baubles/ring/_band.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/baubles/ring/_broken.png b/src/main/resources/assets/tinkerscompendium/textures/items/baubles/ring/_broken.png
index 8ac9892..8ac9892 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/baubles/ring/_broken.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/baubles/ring/_broken.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/baubles/ring/_filigree.png b/src/main/resources/assets/tinkerscompendium/textures/items/baubles/ring/_filigree.png
index baf551b..baf551b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/baubles/ring/_filigree.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/baubles/ring/_filigree.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/baubles/ring/_setting.png b/src/main/resources/assets/tinkerscompendium/textures/items/baubles/ring/_setting.png
index 9cb179c..9cb179c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/baubles/ring/_setting.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/baubles/ring/_setting.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/black_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/items/black_cloth.png
index 31a7cc8..31a7cc8 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/black_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/black_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/blue_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/items/blue_cloth.png
index edb02ff..edb02ff 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/blue_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/blue_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/bolt/_bolt_fletching.png b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/_bolt_fletching.png
index bb013bd..bb013bd 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/bolt/_bolt_fletching.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/_bolt_fletching.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/bolt/_bolt_head - Kopie.png b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/_bolt_head - Kopie.png
index 80dea98..80dea98 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/bolt/_bolt_head - Kopie.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/_bolt_head - Kopie.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/bolt/_bolt_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/_bolt_head.png
index aaac6cc..aaac6cc 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/bolt/_bolt_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/_bolt_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/bolt/_bolt_shaft.png b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/_bolt_shaft.png
index 6923796..6923796 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/bolt/_bolt_shaft.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/_bolt_shaft.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/bolt/_m5fungalsteel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/_m5fungalsteel_accessory.png
index 696eaa7..696eaa7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/bolt/_m5fungalsteel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/_m5fungalsteel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/bolt/_m5fungalsteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/_m5fungalsteel_head.png
index f24cb4d..f24cb4d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/bolt/_m5fungalsteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/_m5fungalsteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/bolt/bolt.xcf b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/bolt.xcf
index db441e7..db441e7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/bolt/bolt.xcf
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/bolt.xcf
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/bolt/complete.xcf b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/complete.xcf
index e38e096..e38e096 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/bolt/complete.xcf
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/complete.xcf
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/bolt/diamond_bolt_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/diamond_bolt_effect.png
index b9b340a..b9b340a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/bolt/diamond_bolt_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/diamond_bolt_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/bolt/emerald_bolt_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/emerald_bolt_effect.png
index 1fcca36..1fcca36 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/bolt/emerald_bolt_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/emerald_bolt_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/bolt/lapis_bolt_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/lapis_bolt_effect.png
index 703b698..703b698 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/bolt/lapis_bolt_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/lapis_bolt_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/bolt/lava_bolt_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/lava_bolt_effect.png
index cd04cca..cd04cca 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/bolt/lava_bolt_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/lava_bolt_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/bolt/moss_bolt_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/moss_bolt_effect.png
index 9a69cf1..9a69cf1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/bolt/moss_bolt_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/moss_bolt_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/bolt/necrotic_bolt_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/necrotic_bolt_effect.png
index fedf387..fedf387 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/bolt/necrotic_bolt_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/necrotic_bolt_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/bolt/piston_bolt_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/piston_bolt_effect.png
index d448f53..d448f53 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/bolt/piston_bolt_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/piston_bolt_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/bolt/quartz_bolt_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/quartz_bolt_effect.png
index 0017174..0017174 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/bolt/quartz_bolt_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/quartz_bolt_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/bolt/reinforced_bolt_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/reinforced_bolt_effect.png
index dfd1310..dfd1310 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/bolt/reinforced_bolt_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/reinforced_bolt_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/bolt/silk_bolt_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/silk_bolt_effect.png
index 05cb4b2..05cb4b2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/bolt/silk_bolt_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/silk_bolt_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/bolt/smite_bolt_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/smite_bolt_effect.png
index 2e93179..2e93179 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/bolt/smite_bolt_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/smite_bolt_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/bolt/spider_bolt_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/spider_bolt_effect.png
index b9b5d1f..b9b5d1f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/bolt/spider_bolt_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/bolt/spider_bolt_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_basket_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_basket_accessory.png
index 3c042f2..3c042f2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_basket_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_basket_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_big_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_big_head.png
index 1109894..1109894 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_big_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_big_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_bigbase_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_bigbase_head.png
index 9ce018a..9ce018a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_bigbase_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_bigbase_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_bulbous_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_bulbous_accessory.png
index fc236d9..fc236d9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_bulbous_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_bulbous_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_curved_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_curved_accessory.png
index 55fc53f..55fc53f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_curved_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_curved_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_dull_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_dull_head.png
index 545f8b2..545f8b2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_dull_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_dull_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_elusive_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_elusive_accessory.png
index 673fffc..673fffc 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_elusive_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_elusive_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_elusive_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_elusive_head.png
index 4048da2..4048da2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_elusive_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_elusive_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_extended_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_extended_accessory.png
index 2c3be59..2c3be59 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_extended_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_extended_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_falchion_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_falchion_head.png
index 9ce018a..9ce018a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_falchion_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_falchion_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_flat_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_flat_head.png
index 03213e8..03213e8 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_flat_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_flat_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_forked_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_forked_accessory.png
index 48e36bd..48e36bd 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_forked_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_forked_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_glass_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_glass_head.png
index ee57700..ee57700 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_glass_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_glass_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_hourglass_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_hourglass_head.png
index 736d687..736d687 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_hourglass_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_hourglass_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_lamenting_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_lamenting_accessory.png
index 8d8862b..8d8862b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_lamenting_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_lamenting_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_legendary_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_legendary_accessory.png
index e938412..e938412 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_legendary_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_legendary_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5angmallen_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5angmallen_accessory.png
index 3ba9f5a..3ba9f5a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5angmallen_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5angmallen_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5angmallen_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5angmallen_head.png
index 09d2da0..09d2da0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5angmallen_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5angmallen_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5brass_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5brass_accessory.png
index 10f4128..10f4128 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5brass_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5brass_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5brass_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5brass_head.png
index 2b9afe5..2b9afe5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5brass_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5brass_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5bronze_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5bronze_accessory.png
index 4f14b58..4f14b58 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5bronze_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5bronze_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5bronze_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5bronze_head.png
index fe0d7b5..fe0d7b5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5bronze_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5bronze_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5copper_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5copper_accessory.png
index 55d2739..55d2739 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5copper_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5copper_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5copper_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5copper_head.png
index 2bcfcc6..2bcfcc6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5copper_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5copper_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5crowngold_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5crowngold_accessory.png
index b2ea200..b2ea200 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5crowngold_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5crowngold_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5crowngold_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5crowngold_head.png
index 6d53ed6..6d53ed6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5crowngold_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5crowngold_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5cupronickel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5cupronickel_accessory.png
index ef623b1..ef623b1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5cupronickel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5cupronickel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5cupronickel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5cupronickel_head.png
index 9287640..9287640 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5cupronickel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5cupronickel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5damascussteel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5damascussteel_accessory.png
index 2553f3e..2553f3e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5damascussteel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5damascussteel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5damascussteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5damascussteel_head.png
index f4a8cd8..f4a8cd8 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5damascussteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5damascussteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5electrum_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5electrum_accessory.png
index 5970131..5970131 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5electrum_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5electrum_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5electrum_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5electrum_head.png
index b44762a..b44762a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5electrum_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5electrum_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5gold_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5gold_accessory.png
index e11cf3c..e11cf3c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5gold_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5gold_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5gold_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5gold_head.png
index 0ecb827..0ecb827 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5gold_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5gold_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5heavysteel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5heavysteel_accessory.png
index 2ac3c9f..2ac3c9f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5heavysteel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5heavysteel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5heavysteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5heavysteel_head.png
index 306b803..306b803 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5heavysteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5heavysteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5hepatizon_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5hepatizon_accessory.png
index 5dcc159..5dcc159 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5hepatizon_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5hepatizon_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5hepatizon_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5hepatizon_head.png
index 0d77289..0d77289 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5hepatizon_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5hepatizon_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5ignatius_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5ignatius_accessory.png
index 7cba97c..7cba97c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5ignatius_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5ignatius_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5ignatius_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5ignatius_head.png
index 63c2541..63c2541 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5ignatius_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5ignatius_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5iron_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5iron_accessory.png
index 5ecfbb8..5ecfbb8 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5iron_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5iron_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5iron_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5iron_head.png
index f1404df..f1404df 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5iron_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5iron_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5lead_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5lead_accessory.png
index 3e0c077..3e0c077 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5lead_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5lead_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5lead_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5lead_head.png
index 3d0f9bf..3d0f9bf 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5lead_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5lead_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5manganese_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5manganese_accessory.png
index 0003d41..0003d41 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5manganese_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5manganese_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5manganese_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5manganese_head.png
index 79a6a61..79a6a61 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5manganese_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5manganese_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5manganesesteel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5manganesesteel_accessory.png
index 66c4973..66c4973 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5manganesesteel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5manganesesteel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5manganesesteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5manganesesteel_head.png
index de48373..de48373 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5manganesesteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5manganesesteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5molybdochalkos_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5molybdochalkos_accessory.png
index 7b461c9..7b461c9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5molybdochalkos_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5molybdochalkos_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5molybdochalkos_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5molybdochalkos_head.png
index 3989fc3..3989fc3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5molybdochalkos_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5molybdochalkos_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5monel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5monel_accessory.png
index 2b3ee0b..2b3ee0b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5monel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5monel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5monel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5monel_head.png
index f678ecd..f678ecd 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5monel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5monel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5nickel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5nickel_accessory.png
index 7f83db6..7f83db6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5nickel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5nickel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5nickel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5nickel_head.png
index 24f4c2d..24f4c2d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5nickel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5nickel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5nickelsteel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5nickelsteel_accessory.png
index bc79150..bc79150 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5nickelsteel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5nickelsteel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5nickelsteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5nickelsteel_head.png
index e948dc5..e948dc5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5nickelsteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5nickelsteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5pewter_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5pewter_accessory.png
index 8a97278..8a97278 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5pewter_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5pewter_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5pewter_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5pewter_head.png
index d82b1dc..d82b1dc 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5pewter_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5pewter_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5platinum_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5platinum_accessory.png
index b389849..b389849 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5platinum_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5platinum_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5platinum_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5platinum_head.png
index bd2b263..bd2b263 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5platinum_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5platinum_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5rosegold_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5rosegold_accessory.png
index b6ce861..b6ce861 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5rosegold_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5rosegold_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5rosegold_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5rosegold_head.png
index 866dda8..866dda8 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5rosegold_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5rosegold_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5silver_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5silver_accessory.png
index 2b9159a..2b9159a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5silver_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5silver_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5silver_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5silver_head.png
index 78d53b4..78d53b4 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5silver_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5silver_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5tin_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5tin_accessory.png
index bc055e9..bc055e9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5tin_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5tin_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5tin_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5tin_head.png
index 18bb48d..18bb48d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5tin_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5tin_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5whitegold_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5whitegold_accessory.png
index 74d23a6..74d23a6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5whitegold_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5whitegold_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5whitegold_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5whitegold_head.png
index 1e28648..1e28648 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5whitegold_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5whitegold_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5zinc_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5zinc_accessory.png
index 085cb5a..085cb5a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5zinc_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5zinc_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5zinc_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5zinc_head.png
index 48cd6e9..48cd6e9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_m5zinc_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_m5zinc_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_mace_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_mace_head.png
index e146418..e146418 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_mace_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_mace_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_no_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_no_accessory.png
index 4238d3d..4238d3d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_no_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_no_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_nofuller_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_nofuller_head.png
index 3e924fd..3e924fd 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_nofuller_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_nofuller_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_ornate_handle.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_ornate_handle.png
index d16c215..d16c215 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_ornate_handle.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_ornate_handle.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_pixie_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_pixie_accessory.png
index 687d5a0..687d5a0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_pixie_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_pixie_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_plumed_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_plumed_head.png
index f71b454..f71b454 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_plumed_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_plumed_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_queens_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_queens_accessory.png
index 96472d6..96472d6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_queens_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_queens_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_repulsive_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_repulsive_accessory.png
index 9b63b3b..9b63b3b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_repulsive_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_repulsive_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_repulsive_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_repulsive_head.png
index 44f250a..44f250a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_repulsive_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_repulsive_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_segmented_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_segmented_head.png
index 00ce35f..00ce35f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_segmented_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_segmented_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_short_handle.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_short_handle.png
index 5baa752..5baa752 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_short_handle.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_short_handle.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_spiked_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_spiked_head.png
index 66e78ae..66e78ae 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_spiked_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_spiked_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_square_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_square_accessory.png
index 1efccb9..1efccb9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_square_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_square_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_straight_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_straight_accessory.png
index 7282cae..7282cae 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_straight_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_straight_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_sun_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_sun_accessory.png
index c78a57e..c78a57e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_sun_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_sun_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_tapered_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_tapered_head.png
index 8722ff0..8722ff0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_tapered_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_tapered_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_thick_handle.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_thick_handle.png
index ed27612..ed27612 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_thick_handle.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_thick_handle.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_widebase_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_widebase_head.png
index e467493..e467493 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/broadsword/_widebase_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/broadsword/_widebase_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/brown_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/items/brown_cloth.png
index f0ff3c7..f0ff3c7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/brown_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/brown_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/_chisel_handle.png b/src/main/resources/assets/tinkerscompendium/textures/items/chisel/_chisel_handle.png
index 526973b..526973b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/_chisel_handle.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/chisel/_chisel_handle.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/_chisel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/chisel/_chisel_head.png
index 927362d..927362d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/_chisel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/chisel/_chisel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/_chisel_head_broken.png b/src/main/resources/assets/tinkerscompendium/textures/items/chisel/_chisel_head_broken.png
index 6f750cc..6f750cc 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/_chisel_head_broken.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/chisel/_chisel_head_broken.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/_handle_wide.png b/src/main/resources/assets/tinkerscompendium/textures/items/chisel/_handle_wide.png
index 2961458..2961458 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/_handle_wide.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/chisel/_handle_wide.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/chisel/_head_long.png b/src/main/resources/assets/tinkerscompendium/textures/items/chisel/_head_long.png
index 0c32f41..0c32f41 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/chisel/_head_long.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/chisel/_head_long.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_extra_doubleedge.png b/src/main/resources/assets/tinkerscompendium/textures/items/cleaver/_extra_doubleedge.png
index 60af9c3..60af9c3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_extra_doubleedge.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/cleaver/_extra_doubleedge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_fancy_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/cleaver/_fancy_accessory.png
index 6615106..6615106 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_fancy_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/cleaver/_fancy_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_head_doubleedge.png b/src/main/resources/assets/tinkerscompendium/textures/items/cleaver/_head_doubleedge.png
index 648df0f..648df0f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/cleaver/_head_doubleedge.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/cleaver/_head_doubleedge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_accessory_basket.png b/src/main/resources/assets/tinkerscompendium/textures/items/cutlass/_accessory_basket.png
index acb765b..acb765b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_accessory_basket.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/cutlass/_accessory_basket.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_accessory_small.png b/src/main/resources/assets/tinkerscompendium/textures/items/cutlass/_accessory_small.png
index 5950960..5950960 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_accessory_small.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/cutlass/_accessory_small.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_head_machete.png b/src/main/resources/assets/tinkerscompendium/textures/items/cutlass/_head_machete.png
index 8bd27e1..8bd27e1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_head_machete.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/cutlass/_head_machete.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_head_saber.png b/src/main/resources/assets/tinkerscompendium/textures/items/cutlass/_head_saber.png
index dbb6ead..dbb6ead 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/cutlass/_head_saber.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/cutlass/_head_saber.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/cyan_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/items/cyan_cloth.png
index 5915f64..5915f64 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/cyan_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/cyan_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/_accessory_big.png b/src/main/resources/assets/tinkerscompendium/textures/items/dagger/_accessory_big.png
index a7f3fdc..a7f3fdc 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/_accessory_big.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/dagger/_accessory_big.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/_accessory_bulbous.png b/src/main/resources/assets/tinkerscompendium/textures/items/dagger/_accessory_bulbous.png
index d625ce1..d625ce1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/_accessory_bulbous.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/dagger/_accessory_bulbous.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/_accessory_small.png b/src/main/resources/assets/tinkerscompendium/textures/items/dagger/_accessory_small.png
index 5ded49a..5ded49a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/_accessory_small.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/dagger/_accessory_small.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/_accessory_wide.png b/src/main/resources/assets/tinkerscompendium/textures/items/dagger/_accessory_wide.png
index c6306c1..c6306c1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/_accessory_wide.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/dagger/_accessory_wide.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/_head_bulbous.png b/src/main/resources/assets/tinkerscompendium/textures/items/dagger/_head_bulbous.png
index b5ace80..b5ace80 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/_head_bulbous.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/dagger/_head_bulbous.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/_head_stiletto.png b/src/main/resources/assets/tinkerscompendium/textures/items/dagger/_head_stiletto.png
index 7623ee6..7623ee6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/_head_stiletto.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/dagger/_head_stiletto.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dagger/_head_wide.png b/src/main/resources/assets/tinkerscompendium/textures/items/dagger/_head_wide.png
index 97be92d..97be92d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/dagger/_head_wide.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/dagger/_head_wide.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dust.png b/src/main/resources/assets/tinkerscompendium/textures/items/dust.png
index 520028e..520028e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/dust.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/dust.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_grip_wrapping.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_grip_wrapping.png
index aa4ac59..aa4ac59 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_grip_wrapping.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_grip_wrapping.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_handle_grip.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_handle_grip.png
index 988abb1..988abb1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_handle_grip.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_handle_grip.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_head_round.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_head_round.png
index 1c60435..1c60435 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_head_round.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_head_round.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_head_snow.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_head_snow.png
index 719478a..719478a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_head_snow.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_head_snow.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5angmallen_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5angmallen_accessory.png
index e7ab41c..e7ab41c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5angmallen_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5angmallen_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5angmallen_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5angmallen_extra.png
index 563982c..563982c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5angmallen_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5angmallen_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5angmallen_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5angmallen_head.png
index 416723d..416723d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5angmallen_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5angmallen_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5brass_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5brass_accessory.png
index 3355df7..3355df7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5brass_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5brass_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5brass_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5brass_extra.png
index e90d305..e90d305 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5brass_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5brass_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5brass_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5brass_head.png
index 202a2f2..202a2f2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5brass_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5brass_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5bronze_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5bronze_extra.png
index 847bd35..847bd35 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5bronze_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5bronze_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5bronze_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5bronze_head.png
index c6ec1ca..c6ec1ca 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5bronze_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5bronze_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5copper_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5copper_extra.png
index adf8f29..adf8f29 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5copper_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5copper_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5copper_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5copper_head.png
index f1a74e2..f1a74e2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5copper_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5copper_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5crowngold_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5crowngold_extra.png
index 3c94c12..3c94c12 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5crowngold_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5crowngold_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5crowngold_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5crowngold_head.png
index f429b36..f429b36 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5crowngold_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5crowngold_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5cupronickel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5cupronickel_accessory.png
index 79c3101..79c3101 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5cupronickel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5cupronickel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5cupronickel_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5cupronickel_extra.png
index 154cf06..154cf06 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5cupronickel_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5cupronickel_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5cupronickel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5cupronickel_head.png
index b2ef54b..b2ef54b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5cupronickel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5cupronickel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5damascussteel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5damascussteel_accessory.png
index 6edc10c..6edc10c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5damascussteel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5damascussteel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5damascussteel_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5damascussteel_extra.png
index 859e6af..859e6af 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5damascussteel_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5damascussteel_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5damascussteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5damascussteel_head.png
index bc102c9..bc102c9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5damascussteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5damascussteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5electrum_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5electrum_accessory.png
index a5c0372..a5c0372 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5electrum_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5electrum_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5electrum_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5electrum_extra.png
index 3fa282d..3fa282d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5electrum_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5electrum_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5electrum_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5electrum_head.png
index 113f148..113f148 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5electrum_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5electrum_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5fungalsteel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5fungalsteel_accessory.png
index 903ca8e..903ca8e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5fungalsteel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5fungalsteel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5fungalsteel_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5fungalsteel_extra.png
index f0ab074..f0ab074 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5fungalsteel_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5fungalsteel_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5fungalsteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5fungalsteel_head.png
index f62b8f6..f62b8f6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5fungalsteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5fungalsteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5gold_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5gold_extra.png
index 420417a..420417a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5gold_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5gold_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5gold_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5gold_head.png
index 2334335..2334335 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5gold_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5gold_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5heavysteel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5heavysteel_accessory.png
index 1ca0968..1ca0968 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5heavysteel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5heavysteel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5heavysteel_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5heavysteel_extra.png
index c09bd7e..c09bd7e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5heavysteel_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5heavysteel_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5heavysteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5heavysteel_head.png
index 257c927..257c927 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5heavysteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5heavysteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5hepatizon_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5hepatizon_accessory.png
index 1d353cd..1d353cd 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5hepatizon_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5hepatizon_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5hepatizon_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5hepatizon_extra.png
index 39a23dd..39a23dd 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5hepatizon_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5hepatizon_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5hepatizon_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5hepatizon_head.png
index 3f53cfb..3f53cfb 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5hepatizon_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5hepatizon_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5ignatius_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5ignatius_accessory.png
index 722080b..722080b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5ignatius_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5ignatius_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5ignatius_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5ignatius_extra.png
index d952087..d952087 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5ignatius_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5ignatius_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5ignatius_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5ignatius_head.png
index a034b33..a034b33 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5ignatius_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5ignatius_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5iron_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5iron_accessory.png
index 7017391..7017391 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5iron_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5iron_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5iron_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5iron_extra.png
index 2043d2e..2043d2e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5iron_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5iron_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5iron_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5iron_head.png
index d8c656a..d8c656a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5iron_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5iron_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5lead_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5lead_extra.png
index cf9d734..cf9d734 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5lead_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5lead_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5lead_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5lead_head.png
index 7f0835e..7f0835e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5lead_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5lead_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5manganese_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5manganese_accessory.png
index e445c3f..e445c3f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5manganese_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5manganese_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5manganese_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5manganese_extra.png
index 78ec1f3..78ec1f3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5manganese_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5manganese_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5manganese_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5manganese_head.png
index 374a218..374a218 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5manganese_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5manganese_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5manganesesteel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5manganesesteel_accessory.png
index a282517..a282517 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5manganesesteel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5manganesesteel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5manganesesteel_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5manganesesteel_extra.png
index f36fec3..f36fec3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5manganesesteel_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5manganesesteel_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5manganesesteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5manganesesteel_head.png
index 3afbf3f..3afbf3f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5manganesesteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5manganesesteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5molybdochalkos_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5molybdochalkos_accessory.png
index cd60bf4..cd60bf4 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5molybdochalkos_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5molybdochalkos_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5molybdochalkos_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5molybdochalkos_extra.png
index 39a23dd..39a23dd 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5molybdochalkos_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5molybdochalkos_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5molybdochalkos_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5molybdochalkos_head.png
index d2ccbaa..d2ccbaa 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5molybdochalkos_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5molybdochalkos_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5monel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5monel_accessory.png
index 88495e4..88495e4 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5monel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5monel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5monel_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5monel_extra.png
index bd617a2..bd617a2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5monel_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5monel_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5monel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5monel_head.png
index d06c60e..d06c60e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5monel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5monel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5nickel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5nickel_accessory.png
index c280487..c280487 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5nickel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5nickel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5nickel_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5nickel_extra.png
index f4fcf7f..f4fcf7f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5nickel_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5nickel_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5nickel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5nickel_head.png
index c5f0fe7..c5f0fe7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5nickel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5nickel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5nickelsteel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5nickelsteel_accessory.png
index 9c8953e..9c8953e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5nickelsteel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5nickelsteel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5nickelsteel_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5nickelsteel_extra.png
index 38ffacf..38ffacf 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5nickelsteel_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5nickelsteel_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5nickelsteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5nickelsteel_head.png
index c390a0b..c390a0b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5nickelsteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5nickelsteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5pewter_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5pewter_accessory.png
index e42a39c..e42a39c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5pewter_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5pewter_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5pewter_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5pewter_extra.png
index 6779f15..6779f15 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5pewter_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5pewter_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5pewter_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5pewter_head.png
index 6e821c8..6e821c8 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5pewter_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5pewter_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5platinum_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5platinum_accessory.png
index 841ee41..841ee41 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5platinum_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5platinum_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5platinum_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5platinum_extra.png
index 5cd5c2c..5cd5c2c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5platinum_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5platinum_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5platinum_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5platinum_head.png
index c988a7a..c988a7a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5platinum_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5platinum_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5rosegold_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5rosegold_accessory.png
index 800db1b..800db1b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5rosegold_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5rosegold_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5rosegold_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5rosegold_extra.png
index 3fa282d..3fa282d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5rosegold_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5rosegold_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5rosegold_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5rosegold_head.png
index bfad36d..bfad36d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5rosegold_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5rosegold_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5silver_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5silver_accessory.png
index a339fe1..a339fe1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5silver_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5silver_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5silver_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5silver_extra.png
index 5cd5c2c..5cd5c2c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5silver_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5silver_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5silver_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5silver_head.png
index 552f0ff..552f0ff 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5silver_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5silver_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5tin_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5tin_extra.png
index 3ff189a..3ff189a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5tin_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5tin_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5tin_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5tin_head.png
index e861d97..e861d97 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5tin_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5tin_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5whitegold_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5whitegold_accessory.png
index 524fe2b..524fe2b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5whitegold_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5whitegold_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5whitegold_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5whitegold_extra.png
index 862a10a..862a10a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5whitegold_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5whitegold_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5whitegold_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5whitegold_head.png
index 9a34b99..9a34b99 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5whitegold_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5whitegold_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5zinc_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5zinc_accessory.png
index 2a1799a..2a1799a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5zinc_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5zinc_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5zinc_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5zinc_extra.png
index 26d2b4f..26d2b4f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5zinc_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5zinc_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5zinc_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5zinc_head.png
index 9666e1d..9666e1d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/excavator/_m5zinc_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/excavator/_m5zinc_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/fishingrod/_hook.png b/src/main/resources/assets/tinkerscompendium/textures/items/fishingrod/_hook.png
index 50cc224..50cc224 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/fishingrod/_hook.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/fishingrod/_hook.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/fishingrod/_rod.png b/src/main/resources/assets/tinkerscompendium/textures/items/fishingrod/_rod.png
index ea5d20d..ea5d20d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/fishingrod/_rod.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/fishingrod/_rod.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/fishingrod/_string.png b/src/main/resources/assets/tinkerscompendium/textures/items/fishingrod/_string.png
index 36638cd..36638cd 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/fishingrod/_string.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/fishingrod/_string.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/_frypan_handle.png b/src/main/resources/assets/tinkerscompendium/textures/items/frypan/_frypan_handle.png
index 247e549..247e549 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/_frypan_handle.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/frypan/_frypan_handle.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/_frypan_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/frypan/_frypan_head.png
index da951a9..da951a9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/_frypan_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/frypan/_frypan_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/_frypan_head_broken.png b/src/main/resources/assets/tinkerscompendium/textures/items/frypan/_frypan_head_broken.png
index 4b7ad58..4b7ad58 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/_frypan_head_broken.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/frypan/_frypan_head_broken.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/_handle_grip.png b/src/main/resources/assets/tinkerscompendium/textures/items/frypan/_handle_grip.png
index fb2188a..fb2188a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/_handle_grip.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/frypan/_handle_grip.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/_handle_loop.png b/src/main/resources/assets/tinkerscompendium/textures/items/frypan/_handle_loop.png
index 641f01e..641f01e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/_handle_loop.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/frypan/_handle_loop.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/_head_handles.png b/src/main/resources/assets/tinkerscompendium/textures/items/frypan/_head_handles.png
index c217081..c217081 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/_head_handles.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/frypan/_head_handles.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/frypan/_head_small.png b/src/main/resources/assets/tinkerscompendium/textures/items/frypan/_head_small.png
index 9c5e662..9c5e662 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/frypan/_head_small.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/frypan/_head_small.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/gem.png b/src/main/resources/assets/tinkerscompendium/textures/items/gem.png
index 7beed0e..7beed0e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/gem.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/gem.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/gingerbread.png b/src/main/resources/assets/tinkerscompendium/textures/items/gingerbread.png
index 7f05b67..7f05b67 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/gingerbread.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/gingerbread.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/grain.png b/src/main/resources/assets/tinkerscompendium/textures/items/grain.png
index 6999cfd..6999cfd 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/grain.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/grain.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/green_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/items/green_cloth.png
index b61e7de..b61e7de 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/green_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/green_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/greenmintcane.png b/src/main/resources/assets/tinkerscompendium/textures/items/greenmintcane.png
index 754f6fe..754f6fe 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/greenmintcane.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/greenmintcane.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/greenmintingot.png b/src/main/resources/assets/tinkerscompendium/textures/items/greenmintingot.png
index c624ee6..c624ee6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/greenmintingot.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/greenmintingot.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/grey_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/items/grey_cloth.png
index 734e7eb..734e7eb 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/grey_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/grey_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_accessory_spiked.png b/src/main/resources/assets/tinkerscompendium/textures/items/hammer/_accessory_spiked.png
index aeee725..aeee725 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_accessory_spiked.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/hammer/_accessory_spiked.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_accessory_taper.png b/src/main/resources/assets/tinkerscompendium/textures/items/hammer/_accessory_taper.png
index 74fe2ea..74fe2ea 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_accessory_taper.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/hammer/_accessory_taper.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_extra_spiked.png b/src/main/resources/assets/tinkerscompendium/textures/items/hammer/_extra_spiked.png
index bf39cbc..bf39cbc 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_extra_spiked.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/hammer/_extra_spiked.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_extra_taper.png b/src/main/resources/assets/tinkerscompendium/textures/items/hammer/_extra_taper.png
index 8d647c6..8d647c6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_extra_taper.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/hammer/_extra_taper.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_handle_thin.png b/src/main/resources/assets/tinkerscompendium/textures/items/hammer/_handle_thin.png
index dc41e69..dc41e69 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_handle_thin.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/hammer/_handle_thin.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_head_defined.png b/src/main/resources/assets/tinkerscompendium/textures/items/hammer/_head_defined.png
index 07b4758..07b4758 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_head_defined.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/hammer/_head_defined.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_head_lowprofile.png b/src/main/resources/assets/tinkerscompendium/textures/items/hammer/_head_lowprofile.png
index 0508124..0508124 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_head_lowprofile.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/hammer/_head_lowprofile.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_head_spiked.png b/src/main/resources/assets/tinkerscompendium/textures/items/hammer/_head_spiked.png
index 76d1c77..76d1c77 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/hammer/_head_spiked.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/hammer/_head_spiked.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_angel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_angel_accessory.png
index faa4249..faa4249 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_angel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_angel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_arrow_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_arrow_accessory.png
index 286c249..286c249 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_arrow_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_arrow_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_bar_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_bar_accessory.png
index 6e98c81..6e98c81 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_bar_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_bar_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_checker_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_checker_accessory.png
index 1e07e28..1e07e28 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_checker_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_checker_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_creeper_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_creeper_accessory.png
index 36c7b66..36c7b66 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_creeper_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_creeper_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_cross_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_cross_accessory.png
index 0f50826..0f50826 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_cross_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_cross_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_demon_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_demon_accessory.png
index ae977ae..ae977ae 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_demon_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_demon_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_demon_handle.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_demon_handle.png
index 638365a..638365a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_demon_handle.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_demon_handle.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_ender_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_ender_accessory.png
index 055cf9c..055cf9c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_ender_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_ender_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_enforced_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_enforced_extra.png
index d617d1c..d617d1c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_enforced_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_enforced_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_fancy_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_fancy_extra.png
index 2c700c4..2c700c4 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_fancy_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_fancy_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_fancy_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_fancy_head.png
index 5455d91..5455d91 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_fancy_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_fancy_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_glass_plate.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_glass_plate.png
index df356d0..df356d0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_glass_plate.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_glass_plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_heart_handle.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_heart_handle.png
index 27d6ae3..27d6ae3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_heart_handle.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_heart_handle.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_hell_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_hell_extra.png
index d5f8ed4..d5f8ed4 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_hell_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_hell_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_horbar_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_horbar_head.png
index 4175fac..4175fac 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_horbar_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_horbar_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_horstripe_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_horstripe_head.png
index f06ae5c..f06ae5c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_horstripe_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_horstripe_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_love_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_love_extra.png
index d2a7168..d2a7168 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_love_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_love_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_pig_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_pig_extra.png
index 4e52d91..4e52d91 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_pig_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_pig_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_queen_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_queen_extra.png
index 193a9fb..193a9fb 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_queen_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_queen_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_reinforced_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_reinforced_extra.png
index ac67e66..ac67e66 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_reinforced_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_reinforced_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_edge.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_shield_edge.png
index 41a2a63..41a2a63 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_edge.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_shield_edge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_shield_extra.png
index 01666c2..01666c2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_shield_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_shield_head.png
index a2c7402..a2c7402 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_shield_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_plate.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_shield_plate.png
index f688376..f688376 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_plate.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_shield_plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_plate_broken.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_shield_plate_broken.png
index 4169e2b..4169e2b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_plate_broken.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_shield_plate_broken.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_skeleton_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_skeleton_head.png
index e23e4ff..e23e4ff 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_skeleton_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_skeleton_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_skull_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_skull_extra.png
index e01d7eb..e01d7eb 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_skull_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_skull_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_slime_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_slime_extra.png
index f146eb8..f146eb8 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_slime_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_slime_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_small_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_small_extra.png
index 9df4e09..9df4e09 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_small_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_small_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_spider_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_spider_extra.png
index e987416..e987416 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_spider_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_spider_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_square_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_square_head.png
index 4be2b26..4be2b26 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_square_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_square_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_squared_handle.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_squared_handle.png
index e5a6304..e5a6304 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_squared_handle.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_squared_handle.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_stripe_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_stripe_head.png
index e45695b..e45695b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_stripe_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_stripe_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_test_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_test_head.png
index 607aae7..607aae7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_test_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_test_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_tri_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_tri_extra.png
index 91a1cdf..91a1cdf 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_tri_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_tri_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_triangle_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_triangle_head.png
index e676e44..e676e44 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_triangle_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_triangle_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_wide_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_wide_extra.png
index 528ed50..528ed50 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_wide_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_wide_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_wolf_extra.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_wolf_extra.png
index 5f641f1..5f641f1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_wolf_extra.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/_wolf_extra.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/binding.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/binding.png
index 01666c2..01666c2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/binding.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/binding.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/black_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/black_blades_shield_effect.png
index 5e62c62..5e62c62 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/black_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/black_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/black_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/black_feathers_shield_effect.png
index e7bcc96..e7bcc96 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/black_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/black_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/black_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/black_gluttony_shield_effect.png
index 9e93446..9e93446 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/black_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/black_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/black_legends_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/black_legends_shield_effect.png
index 57e63a4..57e63a4 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/black_legends_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/black_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/black_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/black_light_shield_effect.png
index 5bac571..5bac571 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/black_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/black_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/black_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/black_mirrors_shield_effect.png
index dce3c4b..dce3c4b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/black_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/black_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/black_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/black_pitch_shield_effect.png
index 5f2c27b..5f2c27b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/black_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/black_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/black_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/black_retribution_shield_effect.png
index 6f5995b..6f5995b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/black_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/black_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/black_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/black_sanguisaga_shield_effect.png
index a3223c0..a3223c0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/black_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/black_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/black_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/black_thorns_shield_effect.png
index e2673cd..e2673cd 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/black_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/black_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/black_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/black_wind_shield_effect.png
index 6ec1f4a..6ec1f4a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/black_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/black_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/blue_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/blue_blades_shield_effect.png
index ce4ac04..ce4ac04 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/blue_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/blue_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/blue_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/blue_feathers_shield_effect.png
index ae17bb9..ae17bb9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/blue_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/blue_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/blue_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/blue_gluttony_shield_effect.png
index ce4a505..ce4a505 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/blue_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/blue_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/blue_legends_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/blue_legends_shield_effect.png
index 68d54bc..68d54bc 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/blue_legends_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/blue_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/blue_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/blue_light_shield_effect.png
index 7048cc1..7048cc1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/blue_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/blue_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/blue_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/blue_mirrors_shield_effect.png
index 0c00dd2..0c00dd2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/blue_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/blue_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/blue_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/blue_pitch_shield_effect.png
index 8b14d6c..8b14d6c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/blue_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/blue_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/blue_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/blue_retribution_shield_effect.png
index 4dd67ff..4dd67ff 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/blue_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/blue_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/blue_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/blue_sanguisaga_shield_effect.png
index 8cba2a0..8cba2a0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/blue_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/blue_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/blue_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/blue_thorns_shield_effect.png
index 7e61447..7e61447 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/blue_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/blue_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/blue_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/blue_wind_shield_effect.png
index 1645a18..1645a18 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/blue_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/blue_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/brown_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/brown_blades_shield_effect.png
index 3c5fc2b..3c5fc2b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/brown_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/brown_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/brown_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/brown_feathers_shield_effect.png
index 7117481..7117481 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/brown_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/brown_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/brown_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/brown_gluttony_shield_effect.png
index 2792246..2792246 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/brown_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/brown_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/brown_legends_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/brown_legends_shield_effect.png
index 8445167..8445167 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/brown_legends_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/brown_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/brown_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/brown_light_shield_effect.png
index 7013a6d..7013a6d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/brown_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/brown_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/brown_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/brown_mirrors_shield_effect.png
index f6e2477..f6e2477 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/brown_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/brown_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/brown_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/brown_pitch_shield_effect.png
index 2490d61..2490d61 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/brown_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/brown_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/brown_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/brown_retribution_shield_effect.png
index a725b31..a725b31 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/brown_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/brown_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/brown_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/brown_sanguisaga_shield_effect.png
index e160ae0..e160ae0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/brown_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/brown_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/brown_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/brown_thorns_shield_effect.png
index f5f9467..f5f9467 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/brown_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/brown_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/brown_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/brown_wind_shield_effect.png
index a9f1025..a9f1025 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/brown_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/brown_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/cyan_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/cyan_blades_shield_effect.png
index 427ac29..427ac29 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/cyan_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/cyan_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/cyan_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/cyan_feathers_shield_effect.png
index 99fdb6b..99fdb6b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/cyan_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/cyan_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/cyan_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/cyan_gluttony_shield_effect.png
index 92ec4a8..92ec4a8 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/cyan_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/cyan_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/cyan_legends_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/cyan_legends_shield_effect.png
index 263b348..263b348 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/cyan_legends_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/cyan_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/cyan_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/cyan_light_shield_effect.png
index 50ebdef..50ebdef 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/cyan_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/cyan_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/cyan_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/cyan_mirrors_shield_effect.png
index 934479f..934479f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/cyan_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/cyan_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/cyan_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/cyan_pitch_shield_effect.png
index b334e7f..b334e7f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/cyan_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/cyan_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/cyan_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/cyan_retribution_shield_effect.png
index 563bf6c..563bf6c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/cyan_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/cyan_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/cyan_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/cyan_sanguisaga_shield_effect.png
index 938d6ff..938d6ff 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/cyan_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/cyan_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/cyan_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/cyan_thorns_shield_effect.png
index a508ca3..a508ca3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/cyan_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/cyan_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/cyan_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/cyan_wind_shield_effect.png
index dce3384..dce3384 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/cyan_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/cyan_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/diamond_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/diamond_shield_effect.png
index dd223df..dd223df 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/diamond_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/diamond_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/edge.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/edge.png
index 41a2a63..41a2a63 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/edge.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/edge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/emerald_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/emerald_shield_effect.png
index 9a2e3c7..9a2e3c7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/emerald_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/emerald_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/face.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/face.png
index a2c7402..a2c7402 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/face.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/face.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/gray_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/gray_blades_shield_effect.png
index 43d037c..43d037c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/gray_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/gray_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/gray_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/gray_feathers_shield_effect.png
index 9141f9d..9141f9d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/gray_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/gray_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/gray_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/gray_gluttony_shield_effect.png
index 4788c50..4788c50 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/gray_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/gray_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/gray_legends_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/gray_legends_shield_effect.png
index 4a5c5b5..4a5c5b5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/gray_legends_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/gray_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/gray_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/gray_light_shield_effect.png
index 462de16..462de16 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/gray_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/gray_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/gray_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/gray_mirrors_shield_effect.png
index f5b30c2..f5b30c2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/gray_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/gray_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/gray_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/gray_pitch_shield_effect.png
index 7dd75f8..7dd75f8 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/gray_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/gray_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/gray_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/gray_retribution_shield_effect.png
index 02ec89c..02ec89c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/gray_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/gray_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/gray_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/gray_sanguisaga_shield_effect.png
index 8119d33..8119d33 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/gray_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/gray_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/gray_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/gray_thorns_shield_effect.png
index 19892e2..19892e2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/gray_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/gray_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/gray_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/gray_wind_shield_effect.png
index 9d767a5..9d767a5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/gray_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/gray_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/green_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/green_blades_shield_effect.png
index dec2c2f..dec2c2f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/green_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/green_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/green_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/green_feathers_shield_effect.png
index aa21252..aa21252 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/green_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/green_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/green_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/green_gluttony_shield_effect.png
index fce4cb3..fce4cb3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/green_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/green_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/green_legends_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/green_legends_shield_effect.png
index 2aa3207..2aa3207 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/green_legends_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/green_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/green_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/green_light_shield_effect.png
index 7bb6198..7bb6198 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/green_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/green_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/green_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/green_mirrors_shield_effect.png
index b001827..b001827 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/green_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/green_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/green_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/green_pitch_shield_effect.png
index 3f54461..3f54461 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/green_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/green_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/green_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/green_retribution_shield_effect.png
index 68013c0..68013c0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/green_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/green_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/green_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/green_sanguisaga_shield_effect.png
index ca820ed..ca820ed 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/green_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/green_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/green_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/green_thorns_shield_effect.png
index 803f0c9..803f0c9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/green_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/green_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/green_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/green_wind_shield_effect.png
index 8a34c03..8a34c03 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/green_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/green_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightblue_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightblue_blades_shield_effect.png
index dc0e4d8..dc0e4d8 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightblue_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightblue_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightblue_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightblue_feathers_shield_effect.png
index f4bfb24..f4bfb24 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightblue_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightblue_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightblue_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightblue_gluttony_shield_effect.png
index df3de67..df3de67 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightblue_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightblue_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightblue_legends_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightblue_legends_shield_effect.png
index b492596..b492596 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightblue_legends_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightblue_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightblue_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightblue_light_shield_effect.png
index 8ec7afe..8ec7afe 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightblue_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightblue_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightblue_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightblue_mirrors_shield_effect.png
index 4dfdde6..4dfdde6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightblue_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightblue_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightblue_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightblue_pitch_shield_effect.png
index 5596a58..5596a58 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightblue_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightblue_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightblue_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightblue_retribution_shield_effect.png
index fb7b40c..fb7b40c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightblue_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightblue_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightblue_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightblue_sanguisaga_shield_effect.png
index 201e44b..201e44b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightblue_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightblue_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightblue_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightblue_thorns_shield_effect.png
index cbc1a23..cbc1a23 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightblue_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightblue_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightblue_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightblue_wind_shield_effect.png
index fe768fc..fe768fc 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightblue_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightblue_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightgray_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightgray_blades_shield_effect.png
index dfec847..dfec847 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightgray_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightgray_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightgray_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightgray_feathers_shield_effect.png
index 60ea362..60ea362 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightgray_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightgray_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightgray_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightgray_gluttony_shield_effect.png
index f064d31..f064d31 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightgray_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightgray_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightgray_legends_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightgray_legends_shield_effect.png
index faa2bd4..faa2bd4 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightgray_legends_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightgray_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightgray_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightgray_light_shield_effect.png
index cd82829..cd82829 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightgray_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightgray_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightgray_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightgray_mirrors_shield_effect.png
index 373c64f..373c64f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightgray_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightgray_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightgray_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightgray_pitch_shield_effect.png
index 924aae9..924aae9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightgray_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightgray_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightgray_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightgray_retribution_shield_effect.png
index ce097ce..ce097ce 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightgray_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightgray_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightgray_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightgray_sanguisaga_shield_effect.png
index c0194ca..c0194ca 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightgray_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightgray_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightgray_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightgray_thorns_shield_effect.png
index 6ed8ae9..6ed8ae9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightgray_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightgray_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightgray_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightgray_wind_shield_effect.png
index 37fd864..37fd864 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lightgray_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lightgray_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lime_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lime_blades_shield_effect.png
index 8f8af6c..8f8af6c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lime_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lime_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lime_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lime_feathers_shield_effect.png
index 8522fee..8522fee 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lime_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lime_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lime_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lime_gluttony_shield_effect.png
index f1cd789..f1cd789 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lime_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lime_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lime_legends_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lime_legends_shield_effect.png
index 3c8834a..3c8834a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lime_legends_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lime_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lime_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lime_light_shield_effect.png
index 175ca3a..175ca3a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lime_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lime_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lime_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lime_mirrors_shield_effect.png
index c2c978f..c2c978f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lime_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lime_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lime_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lime_pitch_shield_effect.png
index 2d93b4c..2d93b4c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lime_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lime_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lime_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lime_retribution_shield_effect.png
index e954a37..e954a37 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lime_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lime_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lime_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lime_sanguisaga_shield_effect.png
index b6ba930..b6ba930 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lime_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lime_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lime_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lime_thorns_shield_effect.png
index 3cd608a..3cd608a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lime_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lime_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lime_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lime_wind_shield_effect.png
index 3bd8a61..3bd8a61 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/lime_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/lime_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/magenta_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/magenta_blades_shield_effect.png
index 16a4b0f..16a4b0f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/magenta_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/magenta_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/magenta_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/magenta_feathers_shield_effect.png
index 17e9c84..17e9c84 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/magenta_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/magenta_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/magenta_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/magenta_gluttony_shield_effect.png
index 46fec55..46fec55 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/magenta_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/magenta_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/magenta_legends_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/magenta_legends_shield_effect.png
index f89f3c7..f89f3c7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/magenta_legends_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/magenta_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/magenta_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/magenta_light_shield_effect.png
index 3c4e567..3c4e567 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/magenta_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/magenta_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/magenta_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/magenta_mirrors_shield_effect.png
index 542c366..542c366 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/magenta_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/magenta_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/magenta_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/magenta_pitch_shield_effect.png
index c1b8613..c1b8613 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/magenta_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/magenta_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/magenta_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/magenta_retribution_shield_effect.png
index 6b11b13..6b11b13 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/magenta_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/magenta_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/magenta_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/magenta_sanguisaga_shield_effect.png
index fe73417..fe73417 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/magenta_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/magenta_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/magenta_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/magenta_thorns_shield_effect.png
index 99799b4..99799b4 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/magenta_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/magenta_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/magenta_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/magenta_wind_shield_effect.png
index 36610ce..36610ce 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/magenta_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/magenta_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/manacore_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/manacore_shield_effect.png
index 00424e9..00424e9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/manacore_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/manacore_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/orange_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/orange_blades_shield_effect.png
index 92a9b2d..92a9b2d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/orange_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/orange_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/orange_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/orange_feathers_shield_effect.png
index 405d894..405d894 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/orange_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/orange_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/orange_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/orange_gluttony_shield_effect.png
index 71bbbcb..71bbbcb 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/orange_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/orange_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/orange_legends_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/orange_legends_shield_effect.png
index 861ef64..861ef64 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/orange_legends_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/orange_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/orange_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/orange_light_shield_effect.png
index da57730..da57730 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/orange_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/orange_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/orange_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/orange_mirrors_shield_effect.png
index dd06aba..dd06aba 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/orange_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/orange_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/orange_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/orange_pitch_shield_effect.png
index ceae879..ceae879 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/orange_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/orange_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/orange_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/orange_retribution_shield_effect.png
index 21f8b14..21f8b14 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/orange_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/orange_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/orange_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/orange_sanguisaga_shield_effect.png
index b449da5..b449da5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/orange_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/orange_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/orange_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/orange_thorns_shield_effect.png
index 253ebf9..253ebf9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/orange_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/orange_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/orange_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/orange_wind_shield_effect.png
index 6b6218a..6b6218a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/orange_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/orange_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/pink_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/pink_blades_shield_effect.png
index 2ac23a6..2ac23a6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/pink_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/pink_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/pink_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/pink_feathers_shield_effect.png
index 76deca9..76deca9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/pink_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/pink_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/pink_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/pink_gluttony_shield_effect.png
index def5442..def5442 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/pink_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/pink_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/pink_legends_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/pink_legends_shield_effect.png
index 9a3c419..9a3c419 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/pink_legends_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/pink_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/pink_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/pink_light_shield_effect.png
index 13c01ba..13c01ba 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/pink_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/pink_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/pink_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/pink_mirrors_shield_effect.png
index 9aa9262..9aa9262 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/pink_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/pink_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/pink_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/pink_pitch_shield_effect.png
index 2ca003d..2ca003d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/pink_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/pink_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/pink_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/pink_retribution_shield_effect.png
index cfbabf8..cfbabf8 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/pink_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/pink_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/pink_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/pink_sanguisaga_shield_effect.png
index 23b0f0a..23b0f0a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/pink_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/pink_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/pink_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/pink_thorns_shield_effect.png
index b04d673..b04d673 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/pink_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/pink_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/pink_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/pink_wind_shield_effect.png
index b22f6a5..b22f6a5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/pink_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/pink_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/plate.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/plate.png
index f688376..f688376 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/plate.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/plate_broken.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/plate_broken.png
index 4169e2b..4169e2b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/plate_broken.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/plate_broken.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/purple_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/purple_blades_shield_effect.png
index 2975674..2975674 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/purple_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/purple_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/purple_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/purple_feathers_shield_effect.png
index 119534c..119534c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/purple_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/purple_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/purple_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/purple_gluttony_shield_effect.png
index 76c9133..76c9133 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/purple_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/purple_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/purple_legends_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/purple_legends_shield_effect.png
index 577babe..577babe 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/purple_legends_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/purple_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/purple_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/purple_light_shield_effect.png
index 7b410c5..7b410c5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/purple_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/purple_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/purple_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/purple_mirrors_shield_effect.png
index 1eeb318..1eeb318 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/purple_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/purple_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/purple_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/purple_pitch_shield_effect.png
index 64d75fa..64d75fa 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/purple_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/purple_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/purple_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/purple_retribution_shield_effect.png
index b1b526f..b1b526f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/purple_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/purple_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/purple_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/purple_sanguisaga_shield_effect.png
index 73c6e6e..73c6e6e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/purple_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/purple_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/purple_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/purple_thorns_shield_effect.png
index 4b04cd7..4b04cd7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/purple_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/purple_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/purple_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/purple_wind_shield_effect.png
index 00cecd0..00cecd0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/purple_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/purple_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/red_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/red_blades_shield_effect.png
index b1103bf..b1103bf 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/red_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/red_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/red_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/red_feathers_shield_effect.png
index f617444..f617444 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/red_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/red_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/red_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/red_gluttony_shield_effect.png
index 75608d4..75608d4 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/red_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/red_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/red_legends_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/red_legends_shield_effect.png
index 20096b2..20096b2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/red_legends_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/red_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/red_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/red_light_shield_effect.png
index 5ab3f4d..5ab3f4d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/red_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/red_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/red_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/red_mirrors_shield_effect.png
index feb2e03..feb2e03 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/red_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/red_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/red_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/red_pitch_shield_effect.png
index 15f4da6..15f4da6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/red_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/red_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/red_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/red_retribution_shield_effect.png
index 8e15209..8e15209 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/red_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/red_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/red_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/red_sanguisaga_shield_effect.png
index 3bc7a3f..3bc7a3f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/red_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/red_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/red_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/red_thorns_shield_effect.png
index 6681bcd..6681bcd 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/red_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/red_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/red_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/red_wind_shield_effect.png
index 07976e2..07976e2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/red_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/red_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/scabbing_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/scabbing_shield_effect.png
index 60dca37..60dca37 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/scabbing_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/scabbing_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/white_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/white_blades_shield_effect.png
index a356a93..a356a93 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/white_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/white_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/white_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/white_feathers_shield_effect.png
index 14fcfe0..14fcfe0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/white_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/white_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/white_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/white_gluttony_shield_effect.png
index 153e9f9..153e9f9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/white_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/white_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/white_legends_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/white_legends_shield_effect.png
index 7bbe21d..7bbe21d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/white_legends_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/white_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/white_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/white_light_shield_effect.png
index cb4f120..cb4f120 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/white_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/white_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/white_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/white_mirrors_shield_effect.png
index ae0f6ea..ae0f6ea 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/white_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/white_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/white_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/white_pitch_shield_effect.png
index 6236642..6236642 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/white_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/white_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/white_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/white_retribution_shield_effect.png
index 05c3cad..05c3cad 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/white_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/white_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/white_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/white_sanguisaga_shield_effect.png
index 61a78ee..61a78ee 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/white_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/white_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/white_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/white_thorns_shield_effect.png
index 8c91bf1..8c91bf1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/white_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/white_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/white_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/white_wind_shield_effect.png
index eb63cb7..eb63cb7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/white_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/white_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/yellow_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/yellow_blades_shield_effect.png
index f8674cb..f8674cb 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/yellow_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/yellow_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/yellow_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/yellow_feathers_shield_effect.png
index 96bd9c5..96bd9c5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/yellow_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/yellow_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/yellow_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/yellow_gluttony_shield_effect.png
index bf5920a..bf5920a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/yellow_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/yellow_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/yellow_legends_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/yellow_legends_shield_effect.png
index dcb90d1..dcb90d1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/yellow_legends_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/yellow_legends_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/yellow_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/yellow_light_shield_effect.png
index 2a9b326..2a9b326 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/yellow_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/yellow_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/yellow_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/yellow_mirrors_shield_effect.png
index 48fb6c8..48fb6c8 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/yellow_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/yellow_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/yellow_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/yellow_pitch_shield_effect.png
index 4c3d378..4c3d378 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/yellow_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/yellow_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/yellow_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/yellow_retribution_shield_effect.png
index ab5a628..ab5a628 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/yellow_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/yellow_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/yellow_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/yellow_sanguisaga_shield_effect.png
index 05c77b3..05c77b3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/yellow_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/yellow_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/yellow_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/yellow_thorns_shield_effect.png
index 15e7aa4..15e7aa4 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/yellow_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/yellow_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/yellow_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/yellow_wind_shield_effect.png
index d422bf2..d422bf2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/yellow_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/heatershield/yellow_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/ingot.png b/src/main/resources/assets/tinkerscompendium/textures/items/ingot.png
index 9b1779e..9b1779e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/ingot.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/ingot.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_ancientrelic.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_ancientrelic.png
index e20e391..e20e391 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_ancientrelic.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_ancientrelic.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_bindingwrap.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_bindingwrap.png
index 76ab45b..76ab45b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_bindingwrap.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_bindingwrap.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_bloodybandages.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_bloodybandages.png
index 935c227..935c227 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_bloodybandages.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_bloodybandages.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_canister.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_canister.png
index b81cf93..b81cf93 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_canister.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_canister.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_corpseIvy.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_corpseIvy.png
index c423756..c423756 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_corpseIvy.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_corpseIvy.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_corpseIvyGraft.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_corpseIvyGraft.png
index fe24808..fe24808 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_corpseIvyGraft.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_corpseIvyGraft.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_crestblades.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestblades.png
index 2a55645..2a55645 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_crestblades.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestblades.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_crestfeathers.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestfeathers.png
index 22c8e10..22c8e10 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_crestfeathers.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestfeathers.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_crestgluttony.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestgluttony.png
index f19401a..f19401a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_crestgluttony.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestgluttony.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_crestlegends.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestlegends.png
index 3dd3d51..3dd3d51 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_crestlegends.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestlegends.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_crestlight.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestlight.png
index 3ef810a..3ef810a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_crestlight.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestlight.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_crestmirrors.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestmirrors.png
index 5984886..5984886 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_crestmirrors.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestmirrors.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_crestofblades.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestofblades.png
index 2a55645..2a55645 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_crestofblades.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestofblades.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_crestoffeathers.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestoffeathers.png
index 22c8e10..22c8e10 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_crestoffeathers.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestoffeathers.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_crestofgluttony.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestofgluttony.png
index f19401a..f19401a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_crestofgluttony.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestofgluttony.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_crestoflight.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestoflight.png
index 3ef810a..3ef810a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_crestoflight.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestoflight.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_crestofmirrors.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestofmirrors.png
index 5984886..5984886 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_crestofmirrors.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestofmirrors.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_crestofpitch.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestofpitch.png
index 1f67ccd..1f67ccd 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_crestofpitch.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestofpitch.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_crestofretribution.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestofretribution.png
index b9f99e0..b9f99e0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_crestofretribution.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestofretribution.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_crestofsanguisaga.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestofsanguisaga.png
index 028daba..028daba 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_crestofsanguisaga.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestofsanguisaga.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_crestofthorns.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestofthorns.png
index fb07a32..fb07a32 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_crestofthorns.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestofthorns.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_crestofwinds.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestofwinds.png
index f622230..f622230 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_crestofwinds.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestofwinds.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_crestpaper.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestpaper.png
index 217de28..217de28 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_crestpaper.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestpaper.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_crestpitch.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestpitch.png
index 1f67ccd..1f67ccd 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_crestpitch.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestpitch.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_crestretribution.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestretribution.png
index b9f99e0..b9f99e0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_crestretribution.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestretribution.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_crestsanguisuga.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestsanguisuga.png
index 028daba..028daba 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_crestsanguisuga.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestsanguisuga.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_crestthorns.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestthorns.png
index fb07a32..fb07a32 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_crestthorns.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestthorns.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_crestwinds.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestwinds.png
index f622230..f622230 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_crestwinds.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_crestwinds.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_elementiumcore.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_elementiumcore.png
index 9575143..9575143 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_elementiumcore.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_elementiumcore.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_emptycanister.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_emptycanister.png
index caec77e..caec77e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_emptycanister.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_emptycanister.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_featherfall.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_featherfall.png
index fbc264a..fbc264a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_featherfall.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_featherfall.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_firewalker.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_firewalker.png
index 9461d75..9461d75 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_firewalker.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_firewalker.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_flippers.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_flippers.png
index 05b1162..05b1162 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_flippers.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_flippers.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_frostwalker.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_frostwalker.png
index efa45ad..efa45ad 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_frostwalker.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_frostwalker.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_glowstep.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_glowstep.png
index 4b958e1..4b958e1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_glowstep.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_glowstep.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_manacore.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_manacore.png
index 4780a42..4780a42 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_manacore.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_manacore.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_nightvisiongoggles.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_nightvisiongoggles.png
index 91cd206..91cd206 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_nightvisiongoggles.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_nightvisiongoggles.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_rainbowgem.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_rainbowgem.png
index be6e1bc..be6e1bc 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_rainbowgem.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_rainbowgem.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_rainbowgem.png.mcmeta b/src/main/resources/assets/tinkerscompendium/textures/items/item_rainbowgem.png.mcmeta
index 4a650b1..4a650b1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_rainbowgem.png.mcmeta
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_rainbowgem.png.mcmeta
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_rebreather.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_rebreather.png
index d9c31c9..d9c31c9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_rebreather.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_rebreather.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_soulstone.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_soulstone.png
index 87b56cb..87b56cb 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_soulstone.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_soulstone.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_soulstone.png.mcmeta b/src/main/resources/assets/tinkerscompendium/textures/items/item_soulstone.png.mcmeta
index c7c8e3f..c7c8e3f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_soulstone.png.mcmeta
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_soulstone.png.mcmeta
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_terraCore.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_terraCore.png
index 61bd8c2..61bd8c2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_terraCore.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_terraCore.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/item_textbook.png b/src/main/resources/assets/tinkerscompendium/textures/items/item_textbook.png
index 4d8670e..4d8670e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/item_textbook.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/item_textbook.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lightblue_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/items/lightblue_cloth.png
index 39a92b7..39a92b7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/lightblue_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/lightblue_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lime_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/items/lime_cloth.png
index 9205a18..9205a18 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/lime_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/lime_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/_accessory_queensguard.png b/src/main/resources/assets/tinkerscompendium/textures/items/longsword/_accessory_queensguard.png
index baed6ef..baed6ef 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/_accessory_queensguard.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/longsword/_accessory_queensguard.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/_accessory_straigh.png b/src/main/resources/assets/tinkerscompendium/textures/items/longsword/_accessory_straigh.png
index 159464a..159464a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/_accessory_straigh.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/longsword/_accessory_straigh.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/_blade_katana.png b/src/main/resources/assets/tinkerscompendium/textures/items/longsword/_blade_katana.png
index a5db9cb..a5db9cb 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/_blade_katana.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/longsword/_blade_katana.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/longsword/_blade_razor.png b/src/main/resources/assets/tinkerscompendium/textures/items/longsword/_blade_razor.png
index 0626fef..0626fef 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/longsword/_blade_razor.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/longsword/_blade_razor.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_extra_wrap.png b/src/main/resources/assets/tinkerscompendium/textures/items/lumberaxe/_extra_wrap.png
index fd7b01f..fd7b01f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_extra_wrap.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/lumberaxe/_extra_wrap.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_handle_thin.png b/src/main/resources/assets/tinkerscompendium/textures/items/lumberaxe/_handle_thin.png
index 139c46b..139c46b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_handle_thin.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/lumberaxe/_handle_thin.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_head_magic.png b/src/main/resources/assets/tinkerscompendium/textures/items/lumberaxe/_head_magic.png
index ed1c07f..ed1c07f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_head_magic.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/lumberaxe/_head_magic.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_head_scythe.png b/src/main/resources/assets/tinkerscompendium/textures/items/lumberaxe/_head_scythe.png
index 04170b3..04170b3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_head_scythe.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/lumberaxe/_head_scythe.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_head_wide.png b/src/main/resources/assets/tinkerscompendium/textures/items/lumberaxe/_head_wide.png
index 850d5e3..850d5e3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/lumberaxe/_head_wide.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/lumberaxe/_head_wide.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/magenta_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/items/magenta_cloth.png
index d1c99d3..d1c99d3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/magenta_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/magenta_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_accessory_straight.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_accessory_straight.png
index 7dc0389..7dc0389 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_accessory_straight.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_accessory_straight.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_head_bearded.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_head_bearded.png
index 78fd97e..78fd97e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_head_bearded.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_head_bearded.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_head_magic.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_head_magic.png
index fbd0b68..fbd0b68 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_head_magic.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_head_magic.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_head_scythe.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_head_scythe.png
index a35dfac..a35dfac 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_head_scythe.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_head_scythe.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_head_wide.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_head_wide.png
index 9cabb2a..9cabb2a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_head_wide.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_head_wide.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5angmallen_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5angmallen_accessory.png
index 35c6c42..35c6c42 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5angmallen_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5angmallen_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5angmallen_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5angmallen_head.png
index 9917a0d..9917a0d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5angmallen_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5angmallen_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5brass_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5brass_accessory.png
index bf42596..bf42596 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5brass_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5brass_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5brass_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5brass_head.png
index 57fc9f1..57fc9f1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5brass_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5brass_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5bronze_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5bronze_accessory.png
index 8f9a653..8f9a653 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5bronze_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5bronze_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5copper_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5copper_accessory.png
index a48e222..a48e222 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5copper_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5copper_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5copper_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5copper_head.png
index c57336a..c57336a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5copper_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5copper_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5crowngold_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5crowngold_accessory.png
index e9d87f0..e9d87f0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5crowngold_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5crowngold_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5cupronickel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5cupronickel_accessory.png
index 3a0ef96..3a0ef96 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5cupronickel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5cupronickel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5cupronickel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5cupronickel_head.png
index 2cc92d8..2cc92d8 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5cupronickel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5cupronickel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5damascussteel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5damascussteel_accessory.png
index a7a6f67..a7a6f67 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5damascussteel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5damascussteel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5damascussteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5damascussteel_head.png
index 2ca7aee..2ca7aee 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5damascussteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5damascussteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5diamond_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5diamond_accessory.png
index 374fe7b..374fe7b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5diamond_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5diamond_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5diamond_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5diamond_head.png
index 2cd8cac..2cd8cac 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5diamond_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5diamond_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5electrum_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5electrum_accessory.png
index 0a0caff..0a0caff 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5electrum_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5electrum_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5electrum_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5electrum_head.png
index 6d3784a..6d3784a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5electrum_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5electrum_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5fungalsteel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5fungalsteel_accessory.png
index b232c9d..b232c9d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5fungalsteel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5fungalsteel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5gold_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5gold_accessory.png
index d221331..d221331 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5gold_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5gold_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5gold_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5gold_head.png
index 5da2f75..5da2f75 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5gold_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5gold_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5heavysteel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5heavysteel_accessory.png
index 5ba19a7..5ba19a7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5heavysteel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5heavysteel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5heavysteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5heavysteel_head.png
index 0b1a938..0b1a938 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5heavysteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5heavysteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5hepatizon_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5hepatizon_accessory.png
index 0140260..0140260 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5hepatizon_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5hepatizon_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5ignatius_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5ignatius_accessory.png
index 088f721..088f721 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5ignatius_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5ignatius_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5ignatius_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5ignatius_head.png
index abf1cff..abf1cff 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5ignatius_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5ignatius_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5iron_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5iron_accessory.png
index 69e63d7..69e63d7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5iron_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5iron_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5iron_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5iron_head.png
index 729168c..729168c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5iron_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5iron_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5manganese_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5manganese_accessory.png
index 1599b48..1599b48 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5manganese_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5manganese_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5manganese_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5manganese_head.png
index 231a371..231a371 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5manganese_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5manganese_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5manganesesteel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5manganesesteel_accessory.png
index 82f8299..82f8299 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5manganesesteel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5manganesesteel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5manganesesteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5manganesesteel_head.png
index a4ae699..a4ae699 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5manganesesteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5manganesesteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5molybdochalkos_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5molybdochalkos_accessory.png
index ae5b1ad..ae5b1ad 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5molybdochalkos_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5molybdochalkos_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5molybdochalkos_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5molybdochalkos_head.png
index c6ab72d..c6ab72d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5molybdochalkos_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5molybdochalkos_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5monel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5monel_accessory.png
index 3977d11..3977d11 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5monel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5monel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5monel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5monel_head.png
index c6ca1da..c6ca1da 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5monel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5monel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5nickel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5nickel_accessory.png
index 368a4d2..368a4d2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5nickel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5nickel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5nickel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5nickel_head.png
index 6694ce2..6694ce2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5nickel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5nickel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5nickelsteel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5nickelsteel_accessory.png
index d5b1e42..d5b1e42 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5nickelsteel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5nickelsteel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5nickelsteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5nickelsteel_head.png
index 3341d22..3341d22 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5nickelsteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5nickelsteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5pewter_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5pewter_accessory.png
index a124f1b..a124f1b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5pewter_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5pewter_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5pewter_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5pewter_head.png
index 0f3f9ad..0f3f9ad 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5pewter_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5pewter_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5platinum_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5platinum_accessory.png
index 73c64bf..73c64bf 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5platinum_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5platinum_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5platinum_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5platinum_head.png
index b7147f8..b7147f8 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5platinum_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5platinum_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5rosegold_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5rosegold_accessory.png
index 56e3dde..56e3dde 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5rosegold_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5rosegold_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5rosegold_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5rosegold_head.png
index b4bf578..b4bf578 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5rosegold_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5rosegold_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5silver_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5silver_accessory.png
index 1f1c69e..1f1c69e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5silver_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5silver_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5silver_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5silver_head.png
index 3f569b9..3f569b9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5silver_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5silver_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5tin_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5tin_accessory.png
index 3870a85..3870a85 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5tin_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5tin_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5tin_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5tin_head.png
index 605b4f3..605b4f3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5tin_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5tin_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5whitegold_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5whitegold_accessory.png
index 395c33b..395c33b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5whitegold_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5whitegold_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5whitegold_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5whitegold_head.png
index e2cde36..e2cde36 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5whitegold_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5whitegold_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5zinc_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5zinc_accessory.png
index 24a461d..24a461d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5zinc_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5zinc_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5zinc_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5zinc_head.png
index 70da897..70da897 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_m5zinc_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_m5zinc_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_mattock_back.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_mattock_back.png
index 093f3f0..093f3f0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_mattock_back.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_mattock_back.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_mattock_handle.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_mattock_handle.png
index a899cd2..a899cd2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_mattock_handle.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_mattock_handle.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_mattock_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_mattock_head.png
index e5a5d91..e5a5d91 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_mattock_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_mattock_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_mattock_head_broken.png b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_mattock_head_broken.png
index 4558a2f..4558a2f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/mattock/_mattock_head_broken.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/mattock/_mattock_head_broken.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/nugget.png b/src/main/resources/assets/tinkerscompendium/textures/items/nugget.png
index 864112f..864112f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/nugget.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/nugget.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/orange_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/items/orange_cloth.png
index ab5bc99..ab5bc99 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/orange_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/orange_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_accessory_wrap.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_accessory_wrap.png
index 7469bae..7469bae 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_accessory_wrap.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_accessory_wrap.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_handle_ornate.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_handle_ornate.png
index 7011881..7011881 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_handle_ornate.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_handle_ornate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_handle_ornate_offset.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_handle_ornate_offset.png
index 8bf84a6..8bf84a6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_handle_ornate_offset.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_handle_ornate_offset.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_head_fancy.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_head_fancy.png
index 2ca9f94..2ca9f94 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_head_fancy.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_head_fancy.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_head_single.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_head_single.png
index 8f2c8d1..8f2c8d1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_head_single.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_head_single.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_head_sledgeback.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_head_sledgeback.png
index e51a337..e51a337 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_head_sledgeback.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_head_sledgeback.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_head_small.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_head_small.png
index d4f8021..d4f8021 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_head_small.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_head_small.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_head_straight.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_head_straight.png
index d5718ff..d5718ff 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_head_straight.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_head_straight.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5angmallen_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5angmallen_accessory.png
index 8f97f5a..8f97f5a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5angmallen_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5angmallen_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5angmallen_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5angmallen_head.png
index 9d7dea5..9d7dea5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5angmallen_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5angmallen_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5brass_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5brass_accessory.png
index 33f22fd..33f22fd 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5brass_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5brass_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5brass_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5brass_head.png
index 8fd483e..8fd483e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5brass_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5brass_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5bronze_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5bronze_accessory.png
index 5cdb306..5cdb306 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5bronze_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5bronze_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5bronze_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5bronze_head.png
index 7b8c31c..7b8c31c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5bronze_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5bronze_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5copper_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5copper_accessory.png
index ca657dd..ca657dd 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5copper_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5copper_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5copper_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5copper_head.png
index ae61936..ae61936 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5copper_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5copper_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5crowngold_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5crowngold_accessory.png
index de918a0..de918a0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5crowngold_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5crowngold_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5crowngold_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5crowngold_head.png
index 855a7b0..855a7b0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5crowngold_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5crowngold_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5cupronickel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5cupronickel_accessory.png
index fd41d0d..fd41d0d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5cupronickel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5cupronickel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5cupronickel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5cupronickel_head.png
index 0d94568..0d94568 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5cupronickel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5cupronickel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5damascussteel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5damascussteel_accessory.png
index cba6141..cba6141 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5damascussteel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5damascussteel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5damascussteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5damascussteel_head.png
index 1edcdb7..1edcdb7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5damascussteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5damascussteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5electrum_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5electrum_accessory.png
index 6be1a54..6be1a54 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5electrum_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5electrum_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5electrum_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5electrum_head.png
index 0820d77..0820d77 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5electrum_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5electrum_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5fungalsteel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5fungalsteel_accessory.png
index da8a9ee..da8a9ee 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5fungalsteel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5fungalsteel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5fungalsteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5fungalsteel_head.png
index c1dd2a3..c1dd2a3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5fungalsteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5fungalsteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5gold_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5gold_accessory.png
index 648a926..648a926 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5gold_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5gold_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5gold_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5gold_head.png
index 686f3df..686f3df 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5gold_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5gold_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5heavysteel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5heavysteel_accessory.png
index fd3f449..fd3f449 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5heavysteel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5heavysteel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5heavysteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5heavysteel_head.png
index 407fa53..407fa53 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5heavysteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5heavysteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5hepatizon_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5hepatizon_accessory.png
index 9ebf654..9ebf654 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5hepatizon_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5hepatizon_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5hepatizon_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5hepatizon_head.png
index 0573d1b..0573d1b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5hepatizon_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5hepatizon_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5ignatius_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5ignatius_accessory.png
index 2695ceb..2695ceb 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5ignatius_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5ignatius_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5ignatius_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5ignatius_head.png
index 26fbb08..26fbb08 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5ignatius_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5ignatius_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5iron_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5iron_accessory.png
index 90e41fb..90e41fb 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5iron_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5iron_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5iron_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5iron_head.png
index e457932..e457932 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5iron_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5iron_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5lead_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5lead_accessory.png
index 7a57f57..7a57f57 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5lead_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5lead_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5lead_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5lead_head.png
index 494aeed..494aeed 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5lead_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5lead_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5manganese_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5manganese_accessory.png
index c90a2da..c90a2da 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5manganese_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5manganese_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5manganese_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5manganese_head.png
index 276660a..276660a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5manganese_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5manganese_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5manganesesteel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5manganesesteel_accessory.png
index c2e8872..c2e8872 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5manganesesteel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5manganesesteel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5manganesesteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5manganesesteel_head.png
index 7d7b3b5..7d7b3b5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5manganesesteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5manganesesteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5molybdochalkos_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5molybdochalkos_accessory.png
index aff510a..aff510a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5molybdochalkos_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5molybdochalkos_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5molybdochalkos_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5molybdochalkos_head.png
index cd7ba4d..cd7ba4d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5molybdochalkos_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5molybdochalkos_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5monel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5monel_accessory.png
index 0bc777c..0bc777c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5monel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5monel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5monel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5monel_head.png
index 1c7ef83..1c7ef83 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5monel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5monel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5nickel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5nickel_accessory.png
index aaeb58e..aaeb58e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5nickel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5nickel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5nickel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5nickel_head.png
index 14361be..14361be 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5nickel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5nickel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5nickelsteel_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5nickelsteel_accessory.png
index c6f4993..c6f4993 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5nickelsteel_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5nickelsteel_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5nickelsteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5nickelsteel_head.png
index 19b15ee..19b15ee 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5nickelsteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5nickelsteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5pewter_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5pewter_accessory.png
index d2ffd75..d2ffd75 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5pewter_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5pewter_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5pewter_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5pewter_head.png
index c00610b..c00610b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5pewter_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5pewter_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5platinum_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5platinum_accessory.png
index 2afa1e5..2afa1e5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5platinum_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5platinum_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5platinum_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5platinum_head.png
index eea1977..eea1977 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5platinum_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5platinum_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5rosegold_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5rosegold_accessory.png
index 6b40bb7..6b40bb7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5rosegold_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5rosegold_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5rosegold_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5rosegold_head.png
index 022cbcd..022cbcd 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5rosegold_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5rosegold_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5silver_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5silver_accessory.png
index a1de24a..a1de24a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5silver_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5silver_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5silver_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5silver_head.png
index 7aca509..7aca509 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5silver_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5silver_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5tin_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5tin_accessory.png
index df0945f..df0945f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5tin_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5tin_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5tin_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5tin_head.png
index 4f458a4..4f458a4 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5tin_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5tin_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5whitegold_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5whitegold_accessory.png
index ac0cc4a..ac0cc4a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5whitegold_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5whitegold_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5whitegold_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5whitegold_head.png
index 74b2d5d..74b2d5d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5whitegold_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5whitegold_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5zinc_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5zinc_accessory.png
index d2b5ea4..d2b5ea4 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5zinc_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5zinc_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5zinc_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5zinc_head.png
index cbf7358..cbf7358 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_m5zinc_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_m5zinc_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_pickaxe_accessory (1).png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_pickaxe_accessory (1).png
index 42a5614..42a5614 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_pickaxe_accessory (1).png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_pickaxe_accessory (1).png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_pickaxe_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_pickaxe_accessory.png
index 9ff9139..9ff9139 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_pickaxe_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_pickaxe_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_pickaxe_handle.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_pickaxe_handle.png
index ddd33af..ddd33af 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_pickaxe_handle.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_pickaxe_handle.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_pickaxe_handle_offset.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_pickaxe_handle_offset.png
index f211e13..f211e13 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_pickaxe_handle_offset.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_pickaxe_handle_offset.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_pickaxe_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_pickaxe_head.png
index 7ee7156..7ee7156 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_pickaxe_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_pickaxe_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_pickaxe_head_broken.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_pickaxe_head_broken.png
index 687a362..687a362 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_pickaxe_head_broken.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_pickaxe_head_broken.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_pointed_accessory.png b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_pointed_accessory.png
index 5376ead..5376ead 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pickaxe/_pointed_accessory.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pickaxe/_pointed_accessory.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/pink_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/items/pink_cloth.png
index 11aa863..11aa863 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/pink_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/pink_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/purple_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/items/purple_cloth.png
index ca02bdd..ca02bdd 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/purple_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/purple_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/_accessory_queensguard.png b/src/main/resources/assets/tinkerscompendium/textures/items/rapier/_accessory_queensguard.png
index 223b716..223b716 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/_accessory_queensguard.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/rapier/_accessory_queensguard.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/_accessory_wide.png b/src/main/resources/assets/tinkerscompendium/textures/items/rapier/_accessory_wide.png
index 88567a6..88567a6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/_accessory_wide.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/rapier/_accessory_wide.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/_head_safety.png b/src/main/resources/assets/tinkerscompendium/textures/items/rapier/_head_safety.png
index fbf27e1..fbf27e1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/_head_safety.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/rapier/_head_safety.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/_head_sai.png b/src/main/resources/assets/tinkerscompendium/textures/items/rapier/_head_sai.png
index a2d0aa1..a2d0aa1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/_head_sai.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/rapier/_head_sai.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/rapier/_head_taper.png b/src/main/resources/assets/tinkerscompendium/textures/items/rapier/_head_taper.png
index 06461f7..06461f7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/rapier/_head_taper.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/rapier/_head_taper.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/red_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/items/red_cloth.png
index 37958f0..37958f0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/red_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/red_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/redmintcane.png b/src/main/resources/assets/tinkerscompendium/textures/items/redmintcane.png
index 3ad10e0..3ad10e0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/redmintcane.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/redmintcane.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/redmintingot.png b/src/main/resources/assets/tinkerscompendium/textures/items/redmintingot.png
index b7ab824..b7ab824 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/redmintingot.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/redmintingot.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/_accessory_bulbous.png b/src/main/resources/assets/tinkerscompendium/textures/items/scythe/_accessory_bulbous.png
index 70c9210..70c9210 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/_accessory_bulbous.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/scythe/_accessory_bulbous.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/_accessory_teeth.png b/src/main/resources/assets/tinkerscompendium/textures/items/scythe/_accessory_teeth.png
index 8401d41..8401d41 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/_accessory_teeth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/scythe/_accessory_teeth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/_accessory_wideblade.png b/src/main/resources/assets/tinkerscompendium/textures/items/scythe/_accessory_wideblade.png
index bcf9e6b..bcf9e6b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/_accessory_wideblade.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/scythe/_accessory_wideblade.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/_handle_straight.png b/src/main/resources/assets/tinkerscompendium/textures/items/scythe/_handle_straight.png
index 1a0de00..1a0de00 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/_handle_straight.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/scythe/_handle_straight.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/scythe/_head_long.png b/src/main/resources/assets/tinkerscompendium/textures/items/scythe/_head_long.png
index e6e6dfa..e6e6dfa 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/scythe/_head_long.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/scythe/_head_long.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shears/_binding.png b/src/main/resources/assets/tinkerscompendium/textures/items/shears/_binding.png
index c83bc70..c83bc70 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shears/_binding.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shears/_binding.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shears/_bottom.png b/src/main/resources/assets/tinkerscompendium/textures/items/shears/_bottom.png
index bb558bf..bb558bf 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shears/_bottom.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shears/_bottom.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shears/_broken.png b/src/main/resources/assets/tinkerscompendium/textures/items/shears/_broken.png
index 1c33216..1c33216 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shears/_broken.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shears/_broken.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shears/_top.png b/src/main/resources/assets/tinkerscompendium/textures/items/shears/_top.png
index 021b69a..021b69a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shears/_top.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shears/_top.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shears/item_rainbowgem.png b/src/main/resources/assets/tinkerscompendium/textures/items/shears/item_rainbowgem.png
index 1012835..1012835 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shears/item_rainbowgem.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shears/item_rainbowgem.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shears/lapis_shears_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shears/lapis_shears_effect.png
index 1d53857..1d53857 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shears/lapis_shears_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shears/lapis_shears_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shears/rainbow_shears_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shears/rainbow_shears_effect.png
index 1012835..1012835 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shears/rainbow_shears_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shears/rainbow_shears_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shears/rainbow_shears_effect.png.mcmeta b/src/main/resources/assets/tinkerscompendium/textures/items/shears/rainbow_shears_effect.png.mcmeta
index 4a650b1..4a650b1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shears/rainbow_shears_effect.png.mcmeta
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shears/rainbow_shears_effect.png.mcmeta
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/aeonsteel_shield_boss.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/aeonsteel_shield_boss.png
index 8ae1f0e..8ae1f0e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/aeonsteel_shield_boss.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/aeonsteel_shield_boss.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/aeonsteel_shield_edge.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/aeonsteel_shield_edge.png
index a244a96..a244a96 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/aeonsteel_shield_edge.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/aeonsteel_shield_edge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/alumite_shield_boss.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/alumite_shield_boss.png
index 0f3a71a..0f3a71a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/alumite_shield_boss.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/alumite_shield_boss.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/alumite_shield_edge.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/alumite_shield_edge.png
index d359096..d359096 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/alumite_shield_edge.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/alumite_shield_edge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/alumite_shield_face.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/alumite_shield_face.png
index 9982253..9982253 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/alumite_shield_face.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/alumite_shield_face.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/ardite_shield_boss.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/ardite_shield_boss.png
index 8d5cdb1..8d5cdb1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/ardite_shield_boss.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/ardite_shield_boss.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/ardite_shield_shield.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/ardite_shield_shield.png
index 1db11c1..1db11c1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/ardite_shield_shield.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/ardite_shield_shield.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/beheading_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/beheading_shield_effect.png
index 5b58489..5b58489 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/beheading_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/beheading_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/black_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/black_blades_shield_effect.png
index d40242f..d40242f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/black_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/black_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/black_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/black_feathers_shield_effect.png
index 8d6a764..8d6a764 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/black_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/black_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/black_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/black_gluttony_shield_effect.png
index 262a09e..262a09e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/black_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/black_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/black_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/black_light_shield_effect.png
index d01fe4a..d01fe4a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/black_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/black_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/black_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/black_mirrors_shield_effect.png
index b1beea5..b1beea5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/black_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/black_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/black_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/black_pitch_shield_effect.png
index 0b90c15..0b90c15 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/black_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/black_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/black_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/black_retribution_shield_effect.png
index 4d8cdd1..4d8cdd1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/black_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/black_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/black_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/black_sanguisaga_shield_effect.png
index ef6067b..ef6067b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/black_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/black_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/black_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/black_thorns_shield_effect.png
index 65aed6c..65aed6c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/black_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/black_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/black_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/black_wind_shield_effect.png
index d782240..d782240 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/black_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/black_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/blue_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/blue_blades_shield_effect.png
index 997f343..997f343 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/blue_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/blue_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/blue_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/blue_feathers_shield_effect.png
index 40d7629..40d7629 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/blue_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/blue_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/blue_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/blue_gluttony_shield_effect.png
index 3d94725..3d94725 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/blue_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/blue_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/blue_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/blue_light_shield_effect.png
index 78be6fc..78be6fc 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/blue_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/blue_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/blue_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/blue_mirrors_shield_effect.png
index 563ed7b..563ed7b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/blue_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/blue_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/blue_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/blue_pitch_shield_effect.png
index e4b3739..e4b3739 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/blue_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/blue_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/blue_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/blue_retribution_shield_effect.png
index f13e5ba..f13e5ba 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/blue_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/blue_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/blue_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/blue_sanguisaga_shield_effect.png
index 12d3203..12d3203 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/blue_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/blue_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/blue_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/blue_thorns_shield_effect.png
index b2814f0..b2814f0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/blue_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/blue_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/blue_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/blue_wind_shield_effect.png
index e4afcd2..e4afcd2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/blue_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/blue_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/blueslime_shield_boss.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/blueslime_shield_boss.png
index f4e204d..f4e204d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/blueslime_shield_boss.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/blueslime_shield_boss.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/blueslime_shield_edge.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/blueslime_shield_edge.png
index ea39ba8..ea39ba8 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/blueslime_shield_edge.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/blueslime_shield_edge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/blueslime_shield_face.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/blueslime_shield_face.png
index 084cfd1..084cfd1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/blueslime_shield_face.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/blueslime_shield_face.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/bone_shield_boss.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/bone_shield_boss.png
index 51f848c..51f848c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/bone_shield_boss.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/bone_shield_boss.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/bone_shield_edge.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/bone_shield_edge.png
index 9a7b2c4..9a7b2c4 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/bone_shield_edge.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/bone_shield_edge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/boss.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/boss.png
index d9dc41b..d9dc41b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/boss.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/boss.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/bronze_shield_boss.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/bronze_shield_boss.png
index 723a489..723a489 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/bronze_shield_boss.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/bronze_shield_boss.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/bronze_shield_edge.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/bronze_shield_edge.png
index 3551d8c..3551d8c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/bronze_shield_edge.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/bronze_shield_edge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/brown_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/brown_blades_shield_effect.png
index 5467ea7..5467ea7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/brown_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/brown_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/brown_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/brown_feathers_shield_effect.png
index 28ea96e..28ea96e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/brown_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/brown_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/brown_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/brown_gluttony_shield_effect.png
index 2fa5cac..2fa5cac 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/brown_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/brown_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/brown_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/brown_light_shield_effect.png
index ed9d801..ed9d801 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/brown_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/brown_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/brown_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/brown_mirrors_shield_effect.png
index 03ed6dc..03ed6dc 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/brown_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/brown_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/brown_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/brown_pitch_shield_effect.png
index c81109e..c81109e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/brown_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/brown_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/brown_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/brown_retribution_shield_effect.png
index 1b5c207..1b5c207 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/brown_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/brown_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/brown_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/brown_sanguisaga_shield_effect.png
index e975e2e..e975e2e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/brown_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/brown_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/brown_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/brown_thorns_shield_effect.png
index 4b81189..4b81189 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/brown_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/brown_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/brown_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/brown_wind_shield_effect.png
index d03cc7e..d03cc7e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/brown_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/brown_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/cactus_shield_boss.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/cactus_shield_boss.png
index 3f42899..3f42899 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/cactus_shield_boss.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/cactus_shield_boss.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/cactus_shield_edge.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/cactus_shield_edge.png
index 1fc1b5e..1fc1b5e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/cactus_shield_edge.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/cactus_shield_edge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/cobalt_shield_boss.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/cobalt_shield_boss.png
index 858f96f..858f96f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/cobalt_shield_boss.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/cobalt_shield_boss.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/cobalt_shield_edge.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/cobalt_shield_edge.png
index 0871efb..0871efb 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/cobalt_shield_edge.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/cobalt_shield_edge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/copper_shield_boss.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/copper_shield_boss.png
index 51c42de..51c42de 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/copper_shield_boss.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/copper_shield_boss.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/copper_shield_edge.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/copper_shield_edge.png
index 131f870..131f870 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/copper_shield_edge.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/copper_shield_edge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/cyan_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/cyan_blades_shield_effect.png
index d02976a..d02976a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/cyan_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/cyan_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/cyan_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/cyan_feathers_shield_effect.png
index 0913f90..0913f90 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/cyan_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/cyan_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/cyan_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/cyan_gluttony_shield_effect.png
index 337c789..337c789 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/cyan_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/cyan_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/cyan_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/cyan_light_shield_effect.png
index 19c9fd9..19c9fd9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/cyan_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/cyan_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/cyan_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/cyan_mirrors_shield_effect.png
index 3549f42..3549f42 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/cyan_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/cyan_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/cyan_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/cyan_pitch_shield_effect.png
index e3b6fd7..e3b6fd7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/cyan_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/cyan_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/cyan_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/cyan_retribution_shield_effect.png
index 445e29d..445e29d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/cyan_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/cyan_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/cyan_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/cyan_sanguisaga_shield_effect.png
index 7c645c3..7c645c3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/cyan_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/cyan_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/cyan_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/cyan_thorns_shield_effect.png
index a313f63..a313f63 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/cyan_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/cyan_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/cyan_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/cyan_wind_shield_effect.png
index ea6393b..ea6393b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/cyan_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/cyan_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/diamond_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/diamond_shield_effect.png
index 91950f5..91950f5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/diamond_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/diamond_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/dogbearium_shield_boss.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/dogbearium_shield_boss.png
index 4434fd3..4434fd3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/dogbearium_shield_boss.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/dogbearium_shield_boss.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/dogbearium_shield_edge.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/dogbearium_shield_edge.png
index bd27fd5..bd27fd5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/dogbearium_shield_edge.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/dogbearium_shield_edge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/edge.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/edge.png
index e5922c5..e5922c5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/edge.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/edge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/emerald_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/emerald_shield_effect.png
index b292e91..b292e91 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/emerald_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/emerald_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/face.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/face.png
index 7a55c4f..7a55c4f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/face.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/face.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/face_broken.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/face_broken.png
index f506b2c..f506b2c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/face_broken.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/face_broken.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/flint_shield_boss.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/flint_shield_boss.png
index e2b3de4..e2b3de4 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/flint_shield_boss.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/flint_shield_boss.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/flint_shield_edge.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/flint_shield_edge.png
index 541f5e1..541f5e1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/flint_shield_edge.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/flint_shield_edge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/flux_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/flux_shield_effect.png
index f2b5305..f2b5305 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/flux_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/flux_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/gray_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/gray_blades_shield_effect.png
index 97929e9..97929e9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/gray_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/gray_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/gray_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/gray_feathers_shield_effect.png
index c1ee2a5..c1ee2a5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/gray_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/gray_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/gray_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/gray_gluttony_shield_effect.png
index 652f789..652f789 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/gray_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/gray_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/gray_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/gray_light_shield_effect.png
index 7d83a19..7d83a19 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/gray_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/gray_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/gray_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/gray_mirrors_shield_effect.png
index 427716c..427716c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/gray_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/gray_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/gray_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/gray_pitch_shield_effect.png
index e3ec66c..e3ec66c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/gray_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/gray_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/gray_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/gray_retribution_shield_effect.png
index 78b792c..78b792c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/gray_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/gray_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/gray_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/gray_sanguisaga_shield_effect.png
index d5bf3bb..d5bf3bb 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/gray_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/gray_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/gray_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/gray_thorns_shield_effect.png
index 595877e..595877e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/gray_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/gray_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/gray_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/gray_wind_shield_effect.png
index 93e4f8f..93e4f8f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/gray_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/gray_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/green_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/green_blades_shield_effect.png
index c0257cf..c0257cf 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/green_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/green_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/green_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/green_feathers_shield_effect.png
index 5c67538..5c67538 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/green_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/green_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/green_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/green_gluttony_shield_effect.png
index 6d4892a..6d4892a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/green_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/green_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/green_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/green_light_shield_effect.png
index 1c2cb39..1c2cb39 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/green_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/green_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/green_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/green_mirrors_shield_effect.png
index e298d66..e298d66 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/green_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/green_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/green_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/green_pitch_shield_effect.png
index 11efa61..11efa61 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/green_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/green_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/green_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/green_retribution_shield_effect.png
index 929ff29..929ff29 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/green_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/green_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/green_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/green_sanguisaga_shield_effect.png
index dfc0efc..dfc0efc 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/green_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/green_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/green_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/green_thorns_shield_effect.png
index b5bbc92..b5bbc92 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/green_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/green_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/green_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/green_wind_shield_effect.png
index ffc3cb9..ffc3cb9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/green_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/green_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightblue_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightblue_blades_shield_effect.png
index 1627381..1627381 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightblue_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightblue_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightblue_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightblue_feathers_shield_effect.png
index 435fc51..435fc51 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightblue_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightblue_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightblue_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightblue_gluttony_shield_effect.png
index fad504c..fad504c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightblue_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightblue_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightblue_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightblue_light_shield_effect.png
index cc601bc..cc601bc 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightblue_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightblue_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightblue_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightblue_mirrors_shield_effect.png
index fe1285d..fe1285d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightblue_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightblue_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightblue_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightblue_pitch_shield_effect.png
index ece1205..ece1205 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightblue_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightblue_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightblue_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightblue_retribution_shield_effect.png
index 9378a84..9378a84 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightblue_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightblue_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightblue_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightblue_sanguisaga_shield_effect.png
index 0069e28..0069e28 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightblue_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightblue_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightblue_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightblue_thorns_shield_effect.png
index 590b9c5..590b9c5 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightblue_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightblue_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightblue_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightblue_wind_shield_effect.png
index 47be5ac..47be5ac 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightblue_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightblue_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightgray_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightgray_blades_shield_effect.png
index a585c20..a585c20 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightgray_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightgray_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightgray_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightgray_feathers_shield_effect.png
index 3693d91..3693d91 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightgray_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightgray_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightgray_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightgray_gluttony_shield_effect.png
index 2b2ad0d..2b2ad0d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightgray_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightgray_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightgray_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightgray_light_shield_effect.png
index 282c123..282c123 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightgray_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightgray_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightgray_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightgray_mirrors_shield_effect.png
index ebb349d..ebb349d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightgray_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightgray_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightgray_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightgray_pitch_shield_effect.png
index 53c2559..53c2559 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightgray_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightgray_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightgray_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightgray_retribution_shield_effect.png
index 850ce00..850ce00 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightgray_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightgray_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightgray_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightgray_sanguisaga_shield_effect.png
index 5296d59..5296d59 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightgray_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightgray_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightgray_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightgray_thorns_shield_effect.png
index dd46475..dd46475 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightgray_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightgray_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightgray_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightgray_wind_shield_effect.png
index f93ad57..f93ad57 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lightgray_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lightgray_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lime_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lime_blades_shield_effect.png
index c77ef47..c77ef47 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lime_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lime_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lime_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lime_feathers_shield_effect.png
index 404c35c..404c35c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lime_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lime_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lime_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lime_gluttony_shield_effect.png
index 54681e7..54681e7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lime_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lime_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lime_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lime_light_shield_effect.png
index 187f7db..187f7db 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lime_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lime_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lime_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lime_mirrors_shield_effect.png
index 0996af9..0996af9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lime_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lime_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lime_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lime_pitch_shield_effect.png
index eec21f6..eec21f6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lime_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lime_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lime_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lime_retribution_shield_effect.png
index be3a0b2..be3a0b2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lime_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lime_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lime_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lime_sanguisaga_shield_effect.png
index 4e94018..4e94018 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lime_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lime_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lime_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lime_thorns_shield_effect.png
index 7efe6b6..7efe6b6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lime_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lime_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/lime_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lime_wind_shield_effect.png
index 4e6c9e0..4e6c9e0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/lime_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/lime_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/magenta_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/magenta_blades_shield_effect.png
index a5cc704..a5cc704 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/magenta_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/magenta_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/magenta_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/magenta_feathers_shield_effect.png
index 03ba26b..03ba26b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/magenta_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/magenta_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/magenta_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/magenta_gluttony_shield_effect.png
index 2535012..2535012 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/magenta_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/magenta_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/magenta_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/magenta_light_shield_effect.png
index a1c58da..a1c58da 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/magenta_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/magenta_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/magenta_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/magenta_mirrors_shield_effect.png
index 4cb344d..4cb344d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/magenta_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/magenta_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/magenta_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/magenta_pitch_shield_effect.png
index 941220b..941220b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/magenta_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/magenta_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/magenta_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/magenta_retribution_shield_effect.png
index af255cb..af255cb 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/magenta_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/magenta_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/magenta_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/magenta_sanguisaga_shield_effect.png
index 7597bc0..7597bc0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/magenta_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/magenta_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/magenta_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/magenta_thorns_shield_effect.png
index eb0e157..eb0e157 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/magenta_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/magenta_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/magenta_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/magenta_wind_shield_effect.png
index 3b37561..3b37561 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/magenta_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/magenta_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/manacore_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/manacore_shield_effect.png
index 1ba0307..1ba0307 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/manacore_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/manacore_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/manyullyn_shield_boss.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/manyullyn_shield_boss.png
index ad4de8d..ad4de8d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/manyullyn_shield_boss.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/manyullyn_shield_boss.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/manyullyn_shield_edge.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/manyullyn_shield_edge.png
index 9bd5887..9bd5887 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/manyullyn_shield_edge.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/manyullyn_shield_edge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/moss_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/moss_shield_effect.png
index 1641d23..1641d23 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/moss_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/moss_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/netherrack_shield_boss.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/netherrack_shield_boss.png
index 14fcee8..14fcee8 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/netherrack_shield_boss.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/netherrack_shield_boss.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/netherrack_shield_edge.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/netherrack_shield_edge.png
index 16989ed..16989ed 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/netherrack_shield_edge.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/netherrack_shield_edge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/obsidian_shield_boss.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/obsidian_shield_boss.png
index 2cf28a3..2cf28a3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/obsidian_shield_boss.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/obsidian_shield_boss.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/obsidian_shield_edge.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/obsidian_shield_edge.png
index dc1c106..dc1c106 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/obsidian_shield_edge.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/obsidian_shield_edge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/orange_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/orange_blades_shield_effect.png
index 1ba0689..1ba0689 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/orange_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/orange_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/orange_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/orange_feathers_shield_effect.png
index 9f3e324..9f3e324 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/orange_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/orange_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/orange_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/orange_gluttony_shield_effect.png
index 51c3b84..51c3b84 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/orange_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/orange_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/orange_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/orange_light_shield_effect.png
index 4146d3e..4146d3e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/orange_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/orange_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/orange_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/orange_mirrors_shield_effect.png
index 6d8ac8c..6d8ac8c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/orange_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/orange_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/orange_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/orange_pitch_shield_effect.png
index 0f4e1cb..0f4e1cb 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/orange_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/orange_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/orange_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/orange_retribution_shield_effect.png
index 35eb175..35eb175 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/orange_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/orange_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/orange_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/orange_sanguisaga_shield_effect.png
index 2031e21..2031e21 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/orange_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/orange_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/orange_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/orange_thorns_shield_effect.png
index 1ce2cef..1ce2cef 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/orange_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/orange_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/orange_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/orange_wind_shield_effect.png
index 1a7089a..1a7089a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/orange_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/orange_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/paper_shield_boss.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/paper_shield_boss.png
index c986e26..c986e26 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/paper_shield_boss.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/paper_shield_boss.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/paper_shield_edge.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/paper_shield_edge.png
index aa0a0e6..aa0a0e6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/paper_shield_edge.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/paper_shield_edge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/pigiron_shield_boss.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/pigiron_shield_boss.png
index cb177fa..cb177fa 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/pigiron_shield_boss.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/pigiron_shield_boss.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/pigiron_shield_edge.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/pigiron_shield_edge.png
index afa4b02..afa4b02 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/pigiron_shield_edge.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/pigiron_shield_edge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/pink_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/pink_blades_shield_effect.png
index e8f49b2..e8f49b2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/pink_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/pink_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/pink_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/pink_feathers_shield_effect.png
index c917004..c917004 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/pink_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/pink_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/pink_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/pink_gluttony_shield_effect.png
index d409ece..d409ece 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/pink_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/pink_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/pink_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/pink_light_shield_effect.png
index e0f8ce0..e0f8ce0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/pink_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/pink_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/pink_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/pink_mirrors_shield_effect.png
index d225ddd..d225ddd 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/pink_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/pink_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/pink_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/pink_pitch_shield_effect.png
index de7a6a2..de7a6a2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/pink_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/pink_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/pink_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/pink_retribution_shield_effect.png
index ce5d3e3..ce5d3e3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/pink_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/pink_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/pink_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/pink_sanguisaga_shield_effect.png
index 382d675..382d675 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/pink_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/pink_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/pink_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/pink_thorns_shield_effect.png
index 7d18a4f..7d18a4f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/pink_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/pink_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/pink_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/pink_wind_shield_effect.png
index 4debb48..4debb48 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/pink_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/pink_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/piston_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/piston_shield_effect.png
index bb64e1d..bb64e1d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/piston_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/piston_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/purple_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/purple_blades_shield_effect.png
index 05336b2..05336b2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/purple_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/purple_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/purple_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/purple_feathers_shield_effect.png
index 4516da7..4516da7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/purple_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/purple_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/purple_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/purple_gluttony_shield_effect.png
index 6d73cb7..6d73cb7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/purple_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/purple_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/purple_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/purple_light_shield_effect.png
index 0f351c6..0f351c6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/purple_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/purple_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/purple_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/purple_mirrors_shield_effect.png
index ea4a9fa..ea4a9fa 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/purple_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/purple_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/purple_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/purple_pitch_shield_effect.png
index 1edf921..1edf921 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/purple_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/purple_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/purple_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/purple_retribution_shield_effect.png
index a10c6e7..a10c6e7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/purple_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/purple_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/purple_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/purple_sanguisaga_shield_effect.png
index 9e57b1f..9e57b1f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/purple_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/purple_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/purple_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/purple_thorns_shield_effect.png
index d057b29..d057b29 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/purple_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/purple_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/purple_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/purple_wind_shield_effect.png
index cfc5dfb..cfc5dfb 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/purple_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/purple_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/quartz_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/quartz_shield_effect.png
index b4c9981..b4c9981 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/quartz_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/quartz_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/queensgold_shield_boss.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/queensgold_shield_boss.png
index 4052ddb..4052ddb 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/queensgold_shield_boss.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/queensgold_shield_boss.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/queensgold_shield_edge.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/queensgold_shield_edge.png
index 948f699..948f699 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/queensgold_shield_edge.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/queensgold_shield_edge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/red_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/red_blades_shield_effect.png
index 4fd09dd..4fd09dd 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/red_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/red_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/red_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/red_feathers_shield_effect.png
index e6ca41f..e6ca41f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/red_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/red_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/red_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/red_gluttony_shield_effect.png
index 9de5a63..9de5a63 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/red_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/red_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/red_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/red_light_shield_effect.png
index cf1fd63..cf1fd63 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/red_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/red_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/red_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/red_mirrors_shield_effect.png
index 333072f..333072f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/red_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/red_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/red_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/red_pitch_shield_effect.png
index 120d4d7..120d4d7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/red_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/red_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/red_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/red_retribution_shield_effect.png
index f177b0d..f177b0d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/red_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/red_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/red_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/red_sanguisaga_shield_effect.png
index 5c175f7..5c175f7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/red_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/red_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/red_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/red_thorns_shield_effect.png
index 1978d86..1978d86 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/red_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/red_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/red_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/red_wind_shield_effect.png
index fcd4de0..fcd4de0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/red_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/red_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/reinforced_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/reinforced_shield_effect.png
index 973ee52..973ee52 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/reinforced_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/reinforced_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/scabbing_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/scabbing_shield_effect.png
index 60dca37..60dca37 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/scabbing_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/scabbing_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/slime_shield_boss.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/slime_shield_boss.png
index a3e231a..a3e231a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/slime_shield_boss.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/slime_shield_boss.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/slime_shield_edge.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/slime_shield_edge.png
index 891760b..891760b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/slime_shield_edge.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/slime_shield_edge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/steel_shield_boss.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/steel_shield_boss.png
index 02ee488..02ee488 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/steel_shield_boss.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/steel_shield_boss.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/steel_shield_edge.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/steel_shield_edge.png
index 79bdcaa..79bdcaa 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/steel_shield_edge.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/steel_shield_edge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/stone_shield_boss.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/stone_shield_boss.png
index 39209c0..39209c0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/stone_shield_boss.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/stone_shield_boss.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/stone_shield_edge.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/stone_shield_edge.png
index f15da9d..f15da9d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/stone_shield_edge.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/stone_shield_edge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/thaumium_shield_boss.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/thaumium_shield_boss.png
index c423014..c423014 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/thaumium_shield_boss.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/thaumium_shield_boss.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/thaumium_shield_edge.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/thaumium_shield_edge.png
index a8627ac..a8627ac 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/thaumium_shield_edge.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/thaumium_shield_edge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/white_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/white_blades_shield_effect.png
index dc9c58c..dc9c58c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/white_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/white_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/white_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/white_feathers_shield_effect.png
index d01bcf2..d01bcf2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/white_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/white_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/white_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/white_gluttony_shield_effect.png
index 4eb7525..4eb7525 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/white_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/white_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/white_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/white_light_shield_effect.png
index 39d65af..39d65af 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/white_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/white_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/white_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/white_mirrors_shield_effect.png
index 7e077de..7e077de 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/white_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/white_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/white_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/white_pitch_shield_effect.png
index d4dffa7..d4dffa7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/white_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/white_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/white_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/white_retribution_shield_effect.png
index 1ce5c3d..1ce5c3d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/white_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/white_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/white_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/white_sanguisaga_shield_effect.png
index 457076b..457076b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/white_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/white_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/white_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/white_thorns_shield_effect.png
index e9b1d83..e9b1d83 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/white_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/white_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/white_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/white_wind_shield_effect.png
index 6080024..6080024 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/white_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/white_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/wood_shield_boss.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/wood_shield_boss.png
index 9626ddd..9626ddd 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/wood_shield_boss.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/wood_shield_boss.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/wood_shield_edge.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/wood_shield_edge.png
index 6464b86..6464b86 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/wood_shield_edge.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/wood_shield_edge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/wood_shield_face.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/wood_shield_face.png
index 96ab1c9..96ab1c9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/wood_shield_face.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/wood_shield_face.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/wood_shield_face_broken.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/wood_shield_face_broken.png
index 188228a..188228a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/wood_shield_face_broken.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/wood_shield_face_broken.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/yellow_blades_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/yellow_blades_shield_effect.png
index 21c7667..21c7667 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/yellow_blades_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/yellow_blades_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/yellow_feathers_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/yellow_feathers_shield_effect.png
index ca4eb84..ca4eb84 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/yellow_feathers_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/yellow_feathers_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/yellow_gluttony_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/yellow_gluttony_shield_effect.png
index eb9c6e9..eb9c6e9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/yellow_gluttony_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/yellow_gluttony_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/yellow_light_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/yellow_light_shield_effect.png
index 6e8d79c..6e8d79c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/yellow_light_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/yellow_light_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/yellow_mirrors_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/yellow_mirrors_shield_effect.png
index 317547f..317547f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/yellow_mirrors_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/yellow_mirrors_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/yellow_pitch_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/yellow_pitch_shield_effect.png
index 47acf97..47acf97 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/yellow_pitch_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/yellow_pitch_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/yellow_retribution_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/yellow_retribution_shield_effect.png
index d29f712..d29f712 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/yellow_retribution_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/yellow_retribution_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/yellow_sanguisaga_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/yellow_sanguisaga_shield_effect.png
index b640fa4..b640fa4 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/yellow_sanguisaga_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/yellow_sanguisaga_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/yellow_thorns_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/yellow_thorns_shield_effect.png
index 4e1623b..4e1623b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/yellow_thorns_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/yellow_thorns_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shield/yellow_wind_shield_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/shield/yellow_wind_shield_effect.png
index 85fd1d3..85fd1d3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shield/yellow_wind_shield_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shield/yellow_wind_shield_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_handle_knight.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_handle_knight.png
index 4e412c7..4e412c7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_handle_knight.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_handle_knight.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_head_square.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_head_square.png
index af75491..af75491 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_head_square.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_head_square.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5angmallen_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5angmallen_head.png
index f80bb6d..f80bb6d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5angmallen_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5angmallen_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5brass_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5brass_head.png
index 4c8b1b7..4c8b1b7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5brass_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5brass_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5bronze_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5bronze_head.png
index b6eab67..b6eab67 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5bronze_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5bronze_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5copper_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5copper_head.png
index 1d926c7..1d926c7 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5copper_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5copper_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5crowngold_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5crowngold_head.png
index 29d0a08..29d0a08 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5crowngold_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5crowngold_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5cupronickel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5cupronickel_head.png
index 4a88a4e..4a88a4e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5cupronickel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5cupronickel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5damascussteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5damascussteel_head.png
index 08f1296..08f1296 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5damascussteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5damascussteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5electrum_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5electrum_head.png
index 2247dc8..2247dc8 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5electrum_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5electrum_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5fungalsteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5fungalsteel_head.png
index f2a0cb0..f2a0cb0 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5fungalsteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5fungalsteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5gold_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5gold_head.png
index b05ff64..b05ff64 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5gold_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5gold_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5heavysteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5heavysteel_head.png
index 88bca0c..88bca0c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5heavysteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5heavysteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5hepatizon_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5hepatizon_head.png
index a487826..a487826 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5hepatizon_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5hepatizon_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5ignatius_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5ignatius_head.png
index 2682ef3..2682ef3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5ignatius_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5ignatius_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5iron_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5iron_head.png
index f6b2592..f6b2592 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5iron_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5iron_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5manganese_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5manganese_head.png
index bb9b207..bb9b207 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5manganese_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5manganese_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5manganesesteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5manganesesteel_head.png
index 3ccc250..3ccc250 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5manganesesteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5manganesesteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5molybdochalkos_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5molybdochalkos_head.png
index d720f1e..d720f1e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5molybdochalkos_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5molybdochalkos_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5monel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5monel_head.png
index 21514ca..21514ca 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5monel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5monel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5nickel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5nickel_head.png
index 6023ceb..6023ceb 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5nickel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5nickel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5nickelsteel_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5nickelsteel_head.png
index 54056f1..54056f1 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5nickelsteel_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5nickelsteel_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5pewter_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5pewter_head.png
index 2cdf6d2..2cdf6d2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5pewter_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5pewter_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5platinum_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5platinum_head.png
index 07ea278..07ea278 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5platinum_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5platinum_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5rosegold_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5rosegold_head.png
index 414d67e..414d67e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5rosegold_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5rosegold_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5silver_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5silver_head.png
index b423551..b423551 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5silver_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5silver_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5tin_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5tin_head.png
index b9401f8..b9401f8 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5tin_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5tin_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5whitegold_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5whitegold_head.png
index 0b803fd..0b803fd 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5whitegold_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5whitegold_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5zinc_head.png b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5zinc_head.png
index 4677c94..4677c94 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/shovel/_m5zinc_head.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/shovel/_m5zinc_head.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/silver_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/items/silver_cloth.png
index e05790d..e05790d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/silver_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/silver_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/tdbook.png b/src/main/resources/assets/tinkerscompendium/textures/items/tdbook.png
index aa083aa..aa083aa 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/tdbook.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/tdbook.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/towershield/binding.png b/src/main/resources/assets/tinkerscompendium/textures/items/towershield/binding.png
index 512924c..512924c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/towershield/binding.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/towershield/binding.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/towershield/edge.png b/src/main/resources/assets/tinkerscompendium/textures/items/towershield/edge.png
index 8be92b4..8be92b4 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/towershield/edge.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/towershield/edge.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/towershield/face.png b/src/main/resources/assets/tinkerscompendium/textures/items/towershield/face.png
index 4ba3dc9..4ba3dc9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/towershield/face.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/towershield/face.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/towershield/plate.png b/src/main/resources/assets/tinkerscompendium/textures/items/towershield/plate.png
index bd69638..bd69638 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/towershield/plate.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/towershield/plate.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/towershield/plate_broken.png b/src/main/resources/assets/tinkerscompendium/textures/items/towershield/plate_broken.png
index 39aa048..39aa048 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/towershield/plate_broken.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/towershield/plate_broken.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/white_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/items/white_cloth.png
index 2e0f570..2e0f570 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/white_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/white_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/yellow_cloth.png b/src/main/resources/assets/tinkerscompendium/textures/items/yellow_cloth.png
index 5bb5a9a..5bb5a9a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/yellow_cloth.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/yellow_cloth.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/beheading_zweihander_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/beheading_zweihander_effect.png
index 64d883e..64d883e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/beheading_zweihander_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/beheading_zweihander_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/blade.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/blade.png
index 05ee7ad..05ee7ad 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/blade.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/blade.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/blaze_zweihander_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/blaze_zweihander_effect.png
index 8563571..8563571 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/blaze_zweihander_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/blaze_zweihander_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/bloodoath_zweihander_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/bloodoath_zweihander_effect.png
index f2d35ef..f2d35ef 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/bloodoath_zweihander_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/bloodoath_zweihander_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/bloodoath_zweihander_effect.png.mcmeta b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/bloodoath_zweihander_effect.png.mcmeta
index 191c85a..191c85a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/bloodoath_zweihander_effect.png.mcmeta
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/bloodoath_zweihander_effect.png.mcmeta
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/broken.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/broken.png
index 00b5fdc..00b5fdc 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/broken.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/broken.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/core.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/core.png
index 9106565..9106565 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/core.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/core.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/corpseivy_zweihander_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/corpseivy_zweihander_effect.png
index e77311c..e77311c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/corpseivy_zweihander_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/corpseivy_zweihander_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/diamond_zweihander_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/diamond_zweihander_effect.png
index 795efe6..795efe6 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/diamond_zweihander_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/diamond_zweihander_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/emerald_zweihander_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/emerald_zweihander_effect.png
index 8164a71..8164a71 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/emerald_zweihander_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/emerald_zweihander_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/flux_zweihander_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/flux_zweihander_effect.png
index 804447e..804447e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/flux_zweihander_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/flux_zweihander_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_blade.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/greenmint_zweihander_blade.png
index 3e2ec7b..3e2ec7b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_blade.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/greenmint_zweihander_blade.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_core.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/greenmint_zweihander_core.png
index 7ce220b..7ce220b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_core.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/greenmint_zweihander_core.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_guard.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/greenmint_zweihander_guard.png
index 6e1980f..6e1980f 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_guard.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/greenmint_zweihander_guard.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_handle.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/greenmint_zweihander_handle.png
index ecbe5f3..ecbe5f3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_handle.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/greenmint_zweihander_handle.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/guard.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/guard.png
index 70bf386..70bf386 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/guard.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/guard.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/handle.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/handle.png
index edf805d..edf805d 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/handle.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/handle.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/lapis_zweihander_effect (1).png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/lapis_zweihander_effect (1).png
index cfe6390..cfe6390 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/lapis_zweihander_effect (1).png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/lapis_zweihander_effect (1).png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/lapis_zweihander_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/lapis_zweihander_effect.png
index cfe6390..cfe6390 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/lapis_zweihander_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/lapis_zweihander_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/lava_zweihander_effect (1).png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/lava_zweihander_effect (1).png
index 454f57a..454f57a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/lava_zweihander_effect (1).png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/lava_zweihander_effect (1).png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/lava_zweihander_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/lava_zweihander_effect.png
index 454f57a..454f57a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/lava_zweihander_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/lava_zweihander_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/manacore_zweihander_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/manacore_zweihander_effect.png
index e0e79c9..e0e79c9 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/manacore_zweihander_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/manacore_zweihander_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/moss_zweihander_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/moss_zweihander_effect.png
index 9cd743a..9cd743a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/moss_zweihander_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/moss_zweihander_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/necrotic_zweihander_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/necrotic_zweihander_effect.png
index 5f81bf4..5f81bf4 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/necrotic_zweihander_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/necrotic_zweihander_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/piston_zweihander_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/piston_zweihander_effect.png
index dc9af5a..dc9af5a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/piston_zweihander_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/piston_zweihander_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/quartz_zweihander_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/quartz_zweihander_effect.png
index 8cc7817..8cc7817 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/quartz_zweihander_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/quartz_zweihander_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_blade.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/redmint_zweihander_blade.png
index edc328a..edc328a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_blade.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/redmint_zweihander_blade.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_core.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/redmint_zweihander_core.png
index 98b5f54..98b5f54 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_core.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/redmint_zweihander_core.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_guard.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/redmint_zweihander_guard.png
index c0beeb3..c0beeb3 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_guard.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/redmint_zweihander_guard.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_handle.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/redmint_zweihander_handle.png
index 5e999d8..5e999d8 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_handle.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/redmint_zweihander_handle.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redstone_zweihander_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/redstone_zweihander_effect.png
index 4a601eb..4a601eb 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redstone_zweihander_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/redstone_zweihander_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/reinforced_zweihander_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/reinforced_zweihander_effect.png
index bb66d4e..bb66d4e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/reinforced_zweihander_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/reinforced_zweihander_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/scabbing_zweihander_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/scabbing_zweihander_effect.png
index 7e0551a..7e0551a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/scabbing_zweihander_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/scabbing_zweihander_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/silk_zweihander_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/silk_zweihander_effect.png
index 92c910a..92c910a 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/silk_zweihander_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/silk_zweihander_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/smite_zweihander_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/smite_zweihander_effect.png
index 830c2df..830c2df 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/smite_zweihander_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/smite_zweihander_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/spider_zweihander_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/spider_zweihander_effect.png
index df3bf8e..df3bf8e 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/spider_zweihander_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/spider_zweihander_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/terracore_zweihander_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/terracore_zweihander_effect.png
index ebb74c2..ebb74c2 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/terracore_zweihander_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/terracore_zweihander_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/textbook_zweihander_effect.png b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/textbook_zweihander_effect.png
index d65cae8..d65cae8 100644
--- a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/textbook_zweihander_effect.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/items/zweihander/textbook_zweihander_effect.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/materials/cheese.png b/src/main/resources/assets/tinkerscompendium/textures/materials/cheese.png
index 84b4b66..84b4b66 100644
--- a/src/main/resources/assets/tinkersdefense/textures/materials/cheese.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/materials/cheese.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/materials/ender_pearl.png b/src/main/resources/assets/tinkerscompendium/textures/materials/ender_pearl.png
index b88747b..b88747b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/materials/ender_pearl.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/materials/ender_pearl.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/materials/facetedgem.png b/src/main/resources/assets/tinkerscompendium/textures/materials/facetedgem.png
index 2935594..2935594 100644
--- a/src/main/resources/assets/tinkersdefense/textures/materials/facetedgem.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/materials/facetedgem.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/materials/gall.png b/src/main/resources/assets/tinkerscompendium/textures/materials/gall.png
index ce93f64..ce93f64 100644
--- a/src/main/resources/assets/tinkersdefense/textures/materials/gall.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/materials/gall.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/materials/greencandy.png b/src/main/resources/assets/tinkerscompendium/textures/materials/greencandy.png
index 450e2e8..450e2e8 100644
--- a/src/main/resources/assets/tinkersdefense/textures/materials/greencandy.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/materials/greencandy.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/materials/moon.png b/src/main/resources/assets/tinkerscompendium/textures/materials/moon.png
index 02c07aa..02c07aa 100644
--- a/src/main/resources/assets/tinkersdefense/textures/materials/moon.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/materials/moon.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/materials/opal.png b/src/main/resources/assets/tinkerscompendium/textures/materials/opal.png
index 1f71770..1f71770 100644
--- a/src/main/resources/assets/tinkersdefense/textures/materials/opal.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/materials/opal.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/materials/redcandy.png b/src/main/resources/assets/tinkerscompendium/textures/materials/redcandy.png
index 7b2a24c..7b2a24c 100644
--- a/src/main/resources/assets/tinkersdefense/textures/materials/redcandy.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/materials/redcandy.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/materials/stargem.png b/src/main/resources/assets/tinkerscompendium/textures/materials/stargem.png
index f98e536..f98e536 100644
--- a/src/main/resources/assets/tinkersdefense/textures/materials/stargem.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/materials/stargem.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/materials/starruby.png b/src/main/resources/assets/tinkerscompendium/textures/materials/starruby.png
index ec8191b..ec8191b 100644
--- a/src/main/resources/assets/tinkersdefense/textures/materials/starruby.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/materials/starruby.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/materials/starsapphire.png b/src/main/resources/assets/tinkerscompendium/textures/materials/starsapphire.png
index 9a924eb..9a924eb 100644
--- a/src/main/resources/assets/tinkersdefense/textures/materials/starsapphire.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/materials/starsapphire.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/materials/sun.png b/src/main/resources/assets/tinkerscompendium/textures/materials/sun.png
index f0ec240..f0ec240 100644
--- a/src/main/resources/assets/tinkersdefense/textures/materials/sun.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/materials/sun.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/model/sheathe.png b/src/main/resources/assets/tinkerscompendium/textures/model/sheathe.png
index 9bb3952..9bb3952 100644
--- a/src/main/resources/assets/tinkersdefense/textures/model/sheathe.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/model/sheathe.png
diff --git a/src/main/resources/assets/tinkersdefense/textures/skin/horse/horse_witherskeleton.png b/src/main/resources/assets/tinkerscompendium/textures/skin/horse/horse_witherskeleton.png
index 9d66e56..9d66e56 100644
--- a/src/main/resources/assets/tinkersdefense/textures/skin/horse/horse_witherskeleton.png
+++ b/src/main/resources/assets/tinkerscompendium/textures/skin/horse/horse_witherskeleton.png
diff --git a/src/main/resources/assets/tinkersdefense/materials/cheese.json b/src/main/resources/assets/tinkersdefense/materials/cheese.json
deleted file mode 100644
index 36aad31..0000000
--- a/src/main/resources/assets/tinkersdefense/materials/cheese.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "type": "block",
-    "parameters": {
-        "texture": "tinkersdefense:materials/cheese"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/tinkersdefense/materials/enderpearl.json b/src/main/resources/assets/tinkersdefense/materials/enderpearl.json
deleted file mode 100644
index bbc84ba..0000000
--- a/src/main/resources/assets/tinkersdefense/materials/enderpearl.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "type": "block",
-    "parameters": {
-        "texture": "tinkersdefense:materials/ender_pearl"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/tinkersdefense/materials/gallite.json b/src/main/resources/assets/tinkersdefense/materials/gallite.json
deleted file mode 100644
index 7418efc..0000000
--- a/src/main/resources/assets/tinkersdefense/materials/gallite.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "type": "block",
-    "parameters": {
-        "texture": "tinkersdefense:materials/gall"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/tinkersdefense/materials/greencandy.json b/src/main/resources/assets/tinkersdefense/materials/greencandy.json
deleted file mode 100644
index 5c3f699..0000000
--- a/src/main/resources/assets/tinkersdefense/materials/greencandy.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "type": "block",
-    "parameters": {
-        "texture": "tinkersdefense:materials/greencandy"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/tinkersdefense/materials/opal.json b/src/main/resources/assets/tinkersdefense/materials/opal.json
deleted file mode 100644
index dbef40b..0000000
--- a/src/main/resources/assets/tinkersdefense/materials/opal.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "type": "block",
-    "parameters": {
-        "texture": "tinkersdefense:materials/opal"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/tinkersdefense/materials/redcandy.json b/src/main/resources/assets/tinkersdefense/materials/redcandy.json
deleted file mode 100644
index 8f71374..0000000
--- a/src/main/resources/assets/tinkersdefense/materials/redcandy.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "type": "block",
-    "parameters": {
-        "texture": "tinkersdefense:materials/redcandy"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/tinkersdefense/materials/sundrop.json b/src/main/resources/assets/tinkersdefense/materials/sundrop.json
deleted file mode 100644
index ecb8609..0000000
--- a/src/main/resources/assets/tinkersdefense/materials/sundrop.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "type": "block",
-    "parameters": {
-        "texture": "tinkersdefense:materials/sun"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/tinkersdefense/materials/voidite.json b/src/main/resources/assets/tinkersdefense/materials/voidite.json
deleted file mode 100644
index 7272c95..0000000
--- a/src/main/resources/assets/tinkersdefense/materials/voidite.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "type": "block",
-    "parameters": {
-        "texture": "tinkersdefense:materials/moon"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/tinkersdefense/models/block/aeonsteelblock.json b/src/main/resources/assets/tinkersdefense/models/block/aeonsteelblock.json
deleted file mode 100644
index 46c122e..0000000
--- a/src/main/resources/assets/tinkersdefense/models/block/aeonsteelblock.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent":"block/cube_all",
-    "textures": {
-        "all": "tinkersdefense:blocks/aeonsteelblock"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/tinkersdefense/models/item/greenmintcane.json b/src/main/resources/assets/tinkersdefense/models/item/greenmintcane.json
deleted file mode 100644
index a908179..0000000
--- a/src/main/resources/assets/tinkersdefense/models/item/greenmintcane.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "tinkersdefense:items/greenmintcane"
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/tinkersdefense/models/item/parts/armor_hood_cloth.tmat.json b/src/main/resources/assets/tinkersdefense/models/item/parts/armor_hood_cloth.tmat.json
deleted file mode 100644
index 0959514..0000000
--- a/src/main/resources/assets/tinkersdefense/models/item/parts/armor_hood_cloth.tmat.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "textures": {
-        "layer0": "tinkersdefense:armor/hood/_hood_cloth"
-    }
-}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/parts/armor_plate.tmat.json b/src/main/resources/assets/tinkersdefense/models/item/parts/armor_plate.tmat.json
deleted file mode 100644
index 68cbc91..0000000
--- a/src/main/resources/assets/tinkersdefense/models/item/parts/armor_plate.tmat.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "textures": {
-        "layer0": "tinkersdefense:items/_armorplate"
-    }
-}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/parts/chainmail.tmat.json b/src/main/resources/assets/tinkersdefense/models/item/parts/chainmail.tmat.json
deleted file mode 100644
index 635fd15..0000000
--- a/src/main/resources/assets/tinkersdefense/models/item/parts/chainmail.tmat.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "textures": {
-        "layer0": "tinkersdefense:items/_chainmail"
-    }
-}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/parts/clasp.tmat.json b/src/main/resources/assets/tinkersdefense/models/item/parts/clasp.tmat.json
deleted file mode 100644
index 43a7e56..0000000
--- a/src/main/resources/assets/tinkersdefense/models/item/parts/clasp.tmat.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "textures": {
-        "layer0": "tinkersdefense:items/_clasp"
-    }
-}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/parts/cloth.tmat.json b/src/main/resources/assets/tinkersdefense/models/item/parts/cloth.tmat.json
deleted file mode 100644
index 2482927..0000000
--- a/src/main/resources/assets/tinkersdefense/models/item/parts/cloth.tmat.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "textures": {
-        "layer0": "tinkersdefense:items/_cloth"
-    }
-}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/parts/filigree.tmat.json b/src/main/resources/assets/tinkersdefense/models/item/parts/filigree.tmat.json
deleted file mode 100644
index 4fef267..0000000
--- a/src/main/resources/assets/tinkersdefense/models/item/parts/filigree.tmat.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "textures": {
-        "layer0": "tinkersdefense:items/_filigree"
-    }
-}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/parts/ringshank.tmat.json b/src/main/resources/assets/tinkersdefense/models/item/parts/ringshank.tmat.json
deleted file mode 100644
index a4f5e94..0000000
--- a/src/main/resources/assets/tinkersdefense/models/item/parts/ringshank.tmat.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "textures": {
-        "layer0": "tinkersdefense:items/_ringshank"
-    }
-}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/parts/rivets.tmat.json b/src/main/resources/assets/tinkersdefense/models/item/parts/rivets.tmat.json
deleted file mode 100644
index 9f924c1..0000000
--- a/src/main/resources/assets/tinkersdefense/models/item/parts/rivets.tmat.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "textures": {
-        "layer0": "tinkersdefense:items/_rivets"
-    }
-}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/parts/setting.tmat.json b/src/main/resources/assets/tinkersdefense/models/item/parts/setting.tmat.json
deleted file mode 100644
index 9267712..0000000
--- a/src/main/resources/assets/tinkersdefense/models/item/parts/setting.tmat.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "textures": {
-        "layer0": "tinkersdefense:items/_setting"
-    }
-}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/parts/wire.tmat.json b/src/main/resources/assets/tinkersdefense/models/item/parts/wire.tmat.json
deleted file mode 100644
index 34ba698..0000000
--- a/src/main/resources/assets/tinkersdefense/models/item/parts/wire.tmat.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "textures": {
-        "layer0": "tinkersdefense:items/_wire"
-    }
-}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/amulet.tcon.json b/src/main/resources/assets/tinkersdefense/models/item/tools/amulet.tcon.json
deleted file mode 100644
index 9a3c781..0000000
--- a/src/main/resources/assets/tinkersdefense/models/item/tools/amulet.tcon.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "textures": {
-        "layer0": "tinkersdefense:items/baubles/amulet/_setting",
-        "layer1": "tinkersdefense:items/baubles/amulet/_chain",
-		"layer2": "tinkersdefense:items/baubles/amulet/_clasp",
-		"broken1": "tinkersdefense:items/baubles/amulet/_broken"
-    }
-}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/breastplate.tcon.json b/src/main/resources/assets/tinkersdefense/models/item/tools/breastplate.tcon.json
deleted file mode 100644
index 027bed7..0000000
--- a/src/main/resources/assets/tinkersdefense/models/item/tools/breastplate.tcon.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "textures": {
-        "layer0": "tinkersdefense:items/armor/breastplate/_plate",
-        "layer1": "tinkersdefense:items/armor/breastplate/_smallplate",
-		"layer2": "tinkersdefense:items/armor/breastplate/_trim",
-		"layer3": "tinkersdefense:items/armor/breastplate/_chain",
-		"broken1": "tinkersdefense:items/armor/breastplate/_plate"
-    }
-}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/grieves.tcon.json b/src/main/resources/assets/tinkersdefense/models/item/tools/grieves.tcon.json
deleted file mode 100644
index d89ec36..0000000
--- a/src/main/resources/assets/tinkersdefense/models/item/tools/grieves.tcon.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "textures": {
-        "layer0": "tinkersdefense:items/armor/grieves/_plate",
-        "layer1": "tinkersdefense:items/armor/grieves/_trim",
-		"layer2": "tinkersdefense:items/armor/grieves/_chain",
-		"layer3": "tinkersdefense:items/armor/grieves/_cloth",
-		"broken1": "tinkersdefense:items/armor/grieves/_plate"
-    }
-}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/helm.tcon.json b/src/main/resources/assets/tinkersdefense/models/item/tools/helm.tcon.json
deleted file mode 100644
index 94fc15e..0000000
--- a/src/main/resources/assets/tinkersdefense/models/item/tools/helm.tcon.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "textures": {
-        "layer0": "tinkersdefense:items/armor/helm/_top",
-        "layer1": "tinkersdefense:items/armor/helm/_plate",
-		"layer2": "tinkersdefense:items/armor/helm/_visor",
-		"layer3": "tinkersdefense:items/armor/helm/_chain",
-		"broken1": "tinkersdefense:items/armor/helm/_plate"
-    }
-}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/ring.tcon.json b/src/main/resources/assets/tinkersdefense/models/item/tools/ring.tcon.json
deleted file mode 100644
index 309352c..0000000
--- a/src/main/resources/assets/tinkersdefense/models/item/tools/ring.tcon.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "textures": {
-        "layer0": "tinkersdefense:items/baubles/ring/_band",
-        "layer1": "tinkersdefense:items/baubles/ring/_filigree",
-		"layer2": "tinkersdefense:items/baubles/ring/_setting",
-		"broken1": "tinkersdefense:items/baubles/ring/_broken"
-    }
-}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/sabatons.tcon.json b/src/main/resources/assets/tinkersdefense/models/item/tools/sabatons.tcon.json
deleted file mode 100644
index 8d9c486..0000000
--- a/src/main/resources/assets/tinkersdefense/models/item/tools/sabatons.tcon.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "textures": {
-        "layer0": "tinkersdefense:items/armor/sabatons/_plates",
-        "layer1": "tinkersdefense:items/armor/sabatons/_trim",
-		"layer2": "tinkersdefense:items/armor/sabatons/_caps",
-		"layer3": "tinkersdefense:items/armor/sabatons/_soles",
-		"broken1": "tinkersdefense:items/armor/sabatons/_plates"
-    }
-}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/shoes.tcon.json b/src/main/resources/assets/tinkersdefense/models/item/tools/shoes.tcon.json
deleted file mode 100644
index 4a295de..0000000
--- a/src/main/resources/assets/tinkersdefense/models/item/tools/shoes.tcon.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "textures": {
-        "layer0": "tinkersdefense:items/armor/shoes/_cloth",
-        "layer1": "tinkersdefense:items/armor/shoes/_sole",
-		"layer2": "tinkersdefense:items/armor/shoes/_clasp",
-		"broken1": "tinkersdefense:items/armor/shoes/_cloth"
-    },
-    "display": {
-        "thirdperson_righthand": {
-            "rotation": [ 0, 90, 45 ],
-            "translation": [ 0, 8, 0 ],
-            "scale": [ 1.5, 1.5, 1 ]
-        },
-        "thirdperson_lefthand": {
-            "rotation": [ 0, 90, 45 ],
-            "translation": [ 0, 8, 0 ],
-            "scale": [ 1.5, 1.5, 1 ]
-        },
-        "firstperson_righthand": {
-            "rotation": [ 0, 90, 45 ],
-            "translation": [ 0, 8, 0 ],
-            "scale": [ 1.5, 1.5, 1 ]
-        },
-        "firstperson_lefthand": {
-            "rotation": [ 0, 90, 45 ],
-            "translation": [ 0, 8, 0 ],
-            "scale": [ 1.5, 1.5, 1 ]
-        },
-        "fixed": {
-            "rotation": [ 0, 180, 0 ],
-            "translation": [ -2, 4, -5],
-            "scale":[ 0.5, 0.5, 0.5]
-        }
-	}
-}
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_chain.png b/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_chain.png
deleted file mode 100644
index 1ab5a40..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_chain.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_plate.png b/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_plate.png
deleted file mode 100644
index f8a3b83..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_plate.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_smallplate.png b/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_smallplate.png
deleted file mode 100644
index 814db78..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_smallplate.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_trim.png b/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_trim.png
deleted file mode 100644
index 94f63b7..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_trim.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_cloth.png b/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_cloth.png
deleted file mode 100644
index 4460911..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_cloth.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_metal.png b/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_metal.png
deleted file mode 100644
index 4582a72..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_metal.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_trim.png b/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_trim.png
deleted file mode 100644
index 59e886e..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/hood/_hood_trim.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/robe/_robe_cloth.png b/src/main/resources/assets/tinkersdefense/textures/armor/robe/_robe_cloth.png
deleted file mode 100644
index c832434..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/robe/_robe_cloth.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/robe/_robe_metal.png b/src/main/resources/assets/tinkersdefense/textures/armor/robe/_robe_metal.png
deleted file mode 100644
index 7311009..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/robe/_robe_metal.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/robe/_robe_trim.png b/src/main/resources/assets/tinkersdefense/textures/armor/robe/_robe_trim.png
deleted file mode 100644
index 02319e1..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/robe/_robe_trim.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/robe/_shawl_cloth.png b/src/main/resources/assets/tinkersdefense/textures/armor/robe/_shawl_cloth.png
deleted file mode 100644
index 7838450..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/robe/_shawl_cloth.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/robe/_shawl_metal.png b/src/main/resources/assets/tinkersdefense/textures/armor/robe/_shawl_metal.png
deleted file mode 100644
index e9980aa..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/robe/_shawl_metal.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/robe/_shawl_trim.png b/src/main/resources/assets/tinkersdefense/textures/armor/robe/_shawl_trim.png
deleted file mode 100644
index 08474e9..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/robe/_shawl_trim.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_shawl_cloth.png b/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_shawl_cloth.png
deleted file mode 100644
index 1ba3f9f..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_shawl_cloth.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_shawl_metal.png b/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_shawl_metal.png
deleted file mode 100644
index 911a4dd..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_shawl_metal.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_shawl_trim.png b/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_shawl_trim.png
deleted file mode 100644
index de54095..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shawl/_shawl_trim.png
+++ /dev/null
diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/shoes/_shoes_sole.png b/src/main/resources/assets/tinkersdefense/textures/armor/shoes/_shoes_sole.png
deleted file mode 100644
index b118095..0000000
--- a/src/main/resources/assets/tinkersdefense/textures/armor/shoes/_shoes_sole.png
+++ /dev/null