diff --git a/src/main/resources/assets/mekanism/render/FluidTank.png b/src/main/resources/assets/mekanism/render/FluidTank.png old mode 100755 new mode 100644 index b1dc430e9..1a44fa00b Binary files a/src/main/resources/assets/mekanism/render/FluidTank.png and b/src/main/resources/assets/mekanism/render/FluidTank.png differ diff --git a/src/main/resources/assets/mekanism/render/FluidTankOn.png b/src/main/resources/assets/mekanism/render/FluidTankOn.png index e3d6c514c..a7cc9c2a3 100644 Binary files a/src/main/resources/assets/mekanism/render/FluidTankOn.png and b/src/main/resources/assets/mekanism/render/FluidTankOn.png differ diff --git a/src/main/resources/assets/mekanism/render/LaserAmplifier.png b/src/main/resources/assets/mekanism/render/LaserAmplifier.png index 144354396..5be9e22b2 100644 Binary files a/src/main/resources/assets/mekanism/render/LaserAmplifier.png and b/src/main/resources/assets/mekanism/render/LaserAmplifier.png differ diff --git a/src/main/resources/assets/mekanism/render/LaserTractorBeam.png b/src/main/resources/assets/mekanism/render/LaserTractorBeam.png index 92350a98d..6afd07f26 100644 Binary files a/src/main/resources/assets/mekanism/render/LaserTractorBeam.png and b/src/main/resources/assets/mekanism/render/LaserTractorBeam.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/DiversionTransporter.png b/src/main/resources/assets/mekanism/textures/blocks/models/DiversionTransporter.png index 670c90605..0d3cdb7f5 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/DiversionTransporter.png and b/src/main/resources/assets/mekanism/textures/blocks/models/DiversionTransporter.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/DiversionTransporterHorizontal.png b/src/main/resources/assets/mekanism/textures/blocks/models/DiversionTransporterHorizontal.png index fa6c14c75..44d15cf18 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/DiversionTransporterHorizontal.png and b/src/main/resources/assets/mekanism/textures/blocks/models/DiversionTransporterHorizontal.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/DiversionTransporterVertical.png b/src/main/resources/assets/mekanism/textures/blocks/models/DiversionTransporterVertical.png index 972ff77df..d443bd607 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/DiversionTransporterVertical.png and b/src/main/resources/assets/mekanism/textures/blocks/models/DiversionTransporterVertical.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/HeatTransmitter.png b/src/main/resources/assets/mekanism/textures/blocks/models/HeatTransmitter.png deleted file mode 100644 index cc7b6cddb..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/HeatTransmitter.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporter.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporter.png deleted file mode 100644 index 73906f050..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporter.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterGlassColored.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterGlassColored.png index f96b610e9..e51f87be5 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterGlassColored.png and b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterGlassColored.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontal.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontal.png deleted file mode 100644 index 4d4e0a510..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontal.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontalGlassColored.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontalGlassColored.png index 47b5bf555..1f1621cc5 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontalGlassColored.png and b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontalGlassColored.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterSide.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterSide.png deleted file mode 100644 index d63d60bbd..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterSide.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterSide_HAFX_Oct-28-232850-2015_Conflict.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterSide_HAFX_Oct-28-232850-2015_Conflict.png deleted file mode 100644 index a942f82ca..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterSide_HAFX_Oct-28-232850-2015_Conflict.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVertical.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVertical.png deleted file mode 100644 index fc05d6958..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVertical.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVerticalGlassColored.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVerticalGlassColored.png index 02192743b..28fa7ec77 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVerticalGlassColored.png and b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVerticalGlassColored.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeAdvanced.png index 6df474e5c..ffc141b97 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeAdvanced.png and b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeAdvanced_HAFX_Oct-28-232851-2015_Conflict.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeAdvanced_HAFX_Oct-28-232851-2015_Conflict.png deleted file mode 100644 index ffc141b97..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeAdvanced_HAFX_Oct-28-232851-2015_Conflict.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeBasic.png index c60cb4bd2..fa9415ea7 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeBasic.png and b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeBasic_HAFX_Oct-28-232851-2015_Conflict.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeBasic_HAFX_Oct-28-232851-2015_Conflict.png deleted file mode 100644 index fa9415ea7..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeBasic_HAFX_Oct-28-232851-2015_Conflict.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeElite.png index 2a6d91f0e..13f991f07 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeElite.png and b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeElite_HAFX_Oct-28-232852-2015_Conflict.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeElite_HAFX_Oct-28-232852-2015_Conflict.png deleted file mode 100644 index 13f991f07..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeElite_HAFX_Oct-28-232852-2015_Conflict.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeHorizontal.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeHorizontal.png deleted file mode 100644 index bab0e8bee..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeHorizontal.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeSide.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeSide.png deleted file mode 100644 index 7a953c1fb..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeSide.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeSide_HAFX_Oct-28-232851-2015_Conflict.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeSide_HAFX_Oct-28-232851-2015_Conflict.png deleted file mode 100644 index 846f3d8cd..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeSide_HAFX_Oct-28-232851-2015_Conflict.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeUltimate.png index d3081b5a3..61754ff9a 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeUltimate.png and b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeUltimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeUltimate_HAFX_Oct-28-232853-2015_Conflict.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeUltimate_HAFX_Oct-28-232853-2015_Conflict.png deleted file mode 100644 index 61754ff9a..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeUltimate_HAFX_Oct-28-232853-2015_Conflict.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeVertical.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeVertical.png deleted file mode 100644 index 7b532bed7..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeVertical.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTube.png b/src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTube.png deleted file mode 100644 index ae840c2af..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTube.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/RestrictiveTransporter.png b/src/main/resources/assets/mekanism/textures/blocks/models/RestrictiveTransporter.png index dc50423eb..8994bb6dd 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/RestrictiveTransporter.png and b/src/main/resources/assets/mekanism/textures/blocks/models/RestrictiveTransporter.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/RestrictiveTransporterHorizontal.png b/src/main/resources/assets/mekanism/textures/blocks/models/RestrictiveTransporterHorizontal.png index 536021b19..a130fcf71 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/RestrictiveTransporterHorizontal.png and b/src/main/resources/assets/mekanism/textures/blocks/models/RestrictiveTransporterHorizontal.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/RestrictiveTransporterVertical.png b/src/main/resources/assets/mekanism/textures/blocks/models/RestrictiveTransporterVertical.png index 2badef84e..9647b90ea 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/RestrictiveTransporterVertical.png and b/src/main/resources/assets/mekanism/textures/blocks/models/RestrictiveTransporterVertical.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontal.png b/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontal.png deleted file mode 100644 index 63d245278..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontal.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVertical.png b/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVertical.png deleted file mode 100644 index 3f9cd51f0..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVertical.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorAdvanced.png index a9b5da27f..273395e66 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorAdvanced.png and b/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorBasic.png index 357fa8a9f..82f227b72 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorBasic.png and b/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorElite.png index cbc8656a9..f84259065 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorElite.png and b/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorUltimate.png index b6d1157e7..58d9b1761 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorUltimate.png and b/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorUltimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/TransmitterSideSmall.png b/src/main/resources/assets/mekanism/textures/blocks/models/TransmitterSideSmall.png deleted file mode 100644 index a6debc302..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/TransmitterSideSmall.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/UniversalCableAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/UniversalCableAdvanced.png index 6a5287e15..2ceb8a748 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/UniversalCableAdvanced.png and b/src/main/resources/assets/mekanism/textures/blocks/models/UniversalCableAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/UniversalCableBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/UniversalCableBasic.png index 0c4c23a16..a987ea0be 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/UniversalCableBasic.png and b/src/main/resources/assets/mekanism/textures/blocks/models/UniversalCableBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/UniversalCableElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/UniversalCableElite.png index e78f47756..2c8d7f89a 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/UniversalCableElite.png and b/src/main/resources/assets/mekanism/textures/blocks/models/UniversalCableElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/UniversalCableUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/UniversalCableUltimate.png index ad77389c4..0966eb006 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/UniversalCableUltimate.png and b/src/main/resources/assets/mekanism/textures/blocks/models/UniversalCableUltimate.png differ