diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 39b77620f..2657e5895 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -99,6 +99,7 @@ import mekanism.client.render.tileentity.RenderObsidianTNT; import mekanism.client.render.tileentity.RenderPersonalChest; import mekanism.client.render.tileentity.RenderPressurizedReactionChamber; import mekanism.client.render.tileentity.RenderRotaryCondensentrator; +import mekanism.client.render.tileentity.RenderSecurityDesk; import mekanism.client.render.tileentity.RenderSeismicVibrator; import mekanism.client.render.tileentity.RenderSolarNeutronActivator; import mekanism.client.render.tileentity.RenderTeleporter; @@ -314,7 +315,7 @@ public class ClientProxy extends CommonProxy GameRegistry.registerTileEntity(TileEntityResistiveHeater.class, "ResistiveHeater"); ClientRegistry.registerTileEntity(TileEntityBoilerCasing.class, "BoilerCasing", new RenderThermoelectricBoiler()); ClientRegistry.registerTileEntity(TileEntityBoilerValve.class, "BoilerValve", new RenderThermoelectricBoiler()); - GameRegistry.registerTileEntity(TileEntitySecurityDesk.class, "SecurityDesk"); + ClientRegistry.registerTileEntity(TileEntitySecurityDesk.class, "SecurityDesk", new RenderSecurityDesk()); } @Override diff --git a/src/main/java/mekanism/client/model/ModelSecurityDesk.java b/src/main/java/mekanism/client/model/ModelSecurityDesk.java new file mode 100644 index 000000000..ca1c4ad76 --- /dev/null +++ b/src/main/java/mekanism/client/model/ModelSecurityDesk.java @@ -0,0 +1,117 @@ +package mekanism.client.model; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class ModelSecurityDesk extends ModelBase +{ + ModelRenderer deskTop; + ModelRenderer port; + ModelRenderer deskBase; + ModelRenderer led; + ModelRenderer monitorBack; + ModelRenderer keyboard; + ModelRenderer monitor; + ModelRenderer standNeck; + ModelRenderer standBase; + ModelRenderer deskMiddle; + ModelRenderer monitorScreen; + + public ModelSecurityDesk() + { + textureWidth = 128; + textureHeight = 64; + + deskTop = new ModelRenderer(this, 0, 0); + deskTop.addBox(0F, 0F, 0F, 16, 7, 16); + deskTop.setRotationPoint(-8F, 11F, -8F); + deskTop.setTextureSize(128, 64); + deskTop.mirror = true; + setRotation(deskTop, 0F, 0F, 0F); + port = new ModelRenderer(this, 64, 0); + port.addBox(0F, 0F, 0F, 8, 8, 1); + port.setRotationPoint(-4F, 12F, 7.01F); + port.setTextureSize(128, 64); + port.mirror = true; + setRotation(port, 0F, 0F, 0F); + deskBase = new ModelRenderer(this, 0, 38); + deskBase.addBox(0F, 0F, 0F, 16, 5, 16); + deskBase.setRotationPoint(-8F, 19F, -8F); + deskBase.setTextureSize(128, 64); + deskBase.mirror = true; + setRotation(deskBase, 0F, 0F, 0F); + led = new ModelRenderer(this, 0, 0); + led.addBox(12F, 4.5F, -1.5F, 1, 1, 1); + led.setRotationPoint(-7F, 5F, 4F); + led.setTextureSize(128, 64); + led.mirror = true; + setRotation(led, -0.4712389F, 0F, 0F); + monitorBack = new ModelRenderer(this, 82, 0); + monitorBack.addBox(1F, -3F, 0F, 12, 6, 1); + monitorBack.setRotationPoint(-7F, 5F, 4F); + monitorBack.setTextureSize(128, 64); + monitorBack.mirror = true; + setRotation(monitorBack, -0.4712389F, 0F, 0F); + keyboard = new ModelRenderer(this, 64, 27); + keyboard.addBox(0F, 0F, 0F, 10, 1, 5); + keyboard.setRotationPoint(-5F, 10.5F, -6F); + keyboard.setTextureSize(128, 64); + keyboard.mirror = true; + setRotation(keyboard, 0.0872665F, 0F, 0F); + monitor = new ModelRenderer(this, 64, 10); + monitor.addBox(0F, -5F, -2F, 14, 10, 2); + monitor.setRotationPoint(-7F, 5F, 4F); + monitor.setTextureSize(128, 64); + monitor.mirror = true; + setRotation(monitor, -0.4712389F, 0F, 0F); + standNeck = new ModelRenderer(this, 96, 7); + standNeck.addBox(0F, -7F, -1F, 2, 7, 1); + standNeck.setRotationPoint(-1F, 10F, 6F); + standNeck.setTextureSize(128, 64); + standNeck.mirror = true; + setRotation(standNeck, 0.0698132F, 0F, 0F); + standBase = new ModelRenderer(this, 64, 22); + standBase.addBox(0F, 0F, -4F, 8, 1, 4); + standBase.setRotationPoint(-4F, 10F, 6F); + standBase.setTextureSize(128, 64); + standBase.mirror = true; + setRotation(standBase, 0.1047198F, 0F, 0F); + deskMiddle = new ModelRenderer(this, 0, 23); + deskMiddle.addBox(0F, 0F, 0F, 14, 1, 14); + deskMiddle.setRotationPoint(-7F, 18F, -7F); + deskMiddle.setTextureSize(128, 64); + deskMiddle.mirror = true; + setRotation(deskMiddle, 0F, 0F, 0F); + monitorScreen = new ModelRenderer(this, 64, 33); + monitorScreen.addBox(0.5F, -4.5F, -2.01F, 13, 9, 2); + monitorScreen.setRotationPoint(-7F, 5F, 4F); + monitorScreen.setTextureSize(128, 64); + monitorScreen.mirror = true; + setRotation(monitorScreen, -0.4712389F, 0F, 0F); + } + + public void render(float size) + { + deskTop.render(size); + port.render(size); + deskBase.render(size); + led.render(size); + monitorBack.render(size); + keyboard.render(size); + monitor.render(size); + standNeck.render(size); + standBase.render(size); + deskMiddle.render(size); + monitorScreen.render(size); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) + { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } +} diff --git a/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java b/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java index 92b665ac6..5a7278685 100644 --- a/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java @@ -1,9 +1,14 @@ package mekanism.client.render.block; import mekanism.client.ClientProxy; +import mekanism.client.model.ModelSecurityDesk; import mekanism.client.render.MekanismRenderer; import mekanism.common.MekanismBlocks; +import mekanism.common.block.BlockBasic.BasicType; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; @@ -16,23 +21,37 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class BasicRenderingHandler implements ISimpleBlockRenderingHandler { + public ModelSecurityDesk securityDesk = new ModelSecurityDesk(); + @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { GL11.glPushMatrix(); GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); - if(block == MekanismBlocks.BasicBlock || block == MekanismBlocks.BasicBlock2) + BasicType type = BasicType.get(block, metadata); + + if(type != null) { - if(block == MekanismBlocks.BasicBlock && metadata == 10) + if(type == BasicType.STRUCTURAL_GLASS) { MekanismRenderer.blendOn(); } - GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); - MekanismRenderer.renderItem(renderer, metadata, block); + if(type != BasicType.SECURITY_DESK) + { + GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); + MekanismRenderer.renderItem(renderer, metadata, block); + } + else { + GL11.glRotatef(180, 1.0F, 0.0F, 0.0F); + GL11.glScalef(0.8F, 0.8F, 0.8F); + GL11.glTranslatef(0.0F, -0.8F, 0.0F); + Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SecurityDesk.png")); + securityDesk.render(0.0625F); + } - if(block == MekanismBlocks.BasicBlock && metadata == 10) + if(type == BasicType.STRUCTURAL_GLASS) { MekanismRenderer.blendOff(); } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSecurityDesk.java b/src/main/java/mekanism/client/render/tileentity/RenderSecurityDesk.java new file mode 100644 index 000000000..08f1e551a --- /dev/null +++ b/src/main/java/mekanism/client/render/tileentity/RenderSecurityDesk.java @@ -0,0 +1,45 @@ +package mekanism.client.render.tileentity; + +import mekanism.client.model.ModelSecurityDesk; +import mekanism.common.tile.TileEntitySecurityDesk; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class RenderSecurityDesk extends TileEntitySpecialRenderer +{ + private ModelSecurityDesk model = new ModelSecurityDesk(); + + @Override + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) + { + renderAModelAt((TileEntitySecurityDesk)tileEntity, x, y, z, partialTick); + } + + private void renderAModelAt(TileEntitySecurityDesk tileEntity, double x, double y, double z, float partialTick) + { + GL11.glPushMatrix(); + GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); + + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SecurityDesk.png")); + + switch(tileEntity.facing) + { + case 2: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; + case 3: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; + case 4: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; + case 5: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; + } + + GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + model.render(0.0625F); + GL11.glPopMatrix(); + } +} diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 53a04d7ce..bcbcb39f2 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -863,6 +863,19 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon } } } + + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int meta) + { + TileEntity tileEntity = world.getTileEntity(x, y, z); + + if(tileEntity instanceof IBoundingBlock) + { + ((IBoundingBlock)tileEntity).onBreak(); + } + + super.breakBlock(world, x, y, z, block, meta); + } @Override public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) @@ -1034,7 +1047,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon @Override public boolean shouldRenderBlock(IBlockAccess world, int x, int y, int z, int meta) { - return true; + return BasicType.get(this, world.getBlockMetadata(x, y, z)) != BasicType.SECURITY_DESK; } public static enum BasicType diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index 472840265..1e8ad4229 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -232,12 +232,20 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt @Override public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) { - boolean place = super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata); - - if(place) + boolean place = true; + + BasicType type = BasicType.get(stack); + + if(type == BasicType.SECURITY_DESK) + { + if(y+1 > 255 || !world.getBlock(x, y+1, z).isReplaceable(world, x, y+1, z)) + { + place = false; + } + } + + if(place && super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata)) { - BasicType type = BasicType.get(stack); - if(type == BasicType.BIN && stack.stackTagCompound != null) { TileEntityBin tileEntity = (TileEntityBin)world.getTileEntity(x, y, z); diff --git a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java index 2180b4445..17e1d5fcc 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java +++ b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java @@ -7,6 +7,7 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; +import mekanism.common.base.IBoundingBlock; import mekanism.common.frequency.Frequency; import mekanism.common.frequency.FrequencyManager; import mekanism.common.security.IOwnerItem; @@ -16,8 +17,9 @@ import mekanism.common.security.SecurityFrequency; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; -public class TileEntitySecurityDesk extends TileEntityContainerBlock +public class TileEntitySecurityDesk extends TileEntityContainerBlock implements IBoundingBlock { public String owner; @@ -274,4 +276,28 @@ public class TileEntitySecurityDesk extends TileEntityContainerBlock } } } + + @Override + public void onPlace() + { + MekanismUtils.makeBoundingBlock(worldObj, Coord4D.get(this).getFromSide(ForgeDirection.UP), Coord4D.get(this)); + } + + @Override + public void onBreak() + { + worldObj.setBlockToAir(xCoord, yCoord+1, zCoord); + worldObj.setBlockToAir(xCoord, yCoord, zCoord); + } + + @Override + public Frequency getFrequency(FrequencyManager manager) + { + if(manager == Mekanism.securityFrequencies) + { + return frequency; + } + + return null; + } } diff --git a/src/main/resources/assets/mekanism/gui/GuiAdvancedMachine.png b/src/main/resources/assets/mekanism/gui/GuiAdvancedMachine.png index cacea2e3d..612c487f0 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiAdvancedMachine.png and b/src/main/resources/assets/mekanism/gui/GuiAdvancedMachine.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiBioGenerator.png b/src/main/resources/assets/mekanism/gui/GuiBioGenerator.png index 20c89ae69..1c29f8f67 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiBioGenerator.png and b/src/main/resources/assets/mekanism/gui/GuiBioGenerator.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiChemicalCrystallizer.png b/src/main/resources/assets/mekanism/gui/GuiChemicalCrystallizer.png index 73d93bc45..4d735ec80 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiChemicalCrystallizer.png and b/src/main/resources/assets/mekanism/gui/GuiChemicalCrystallizer.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiChemicalDissolutionChamber.png b/src/main/resources/assets/mekanism/gui/GuiChemicalDissolutionChamber.png index 7f14a7fe7..4ca3ef2a8 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiChemicalDissolutionChamber.png and b/src/main/resources/assets/mekanism/gui/GuiChemicalDissolutionChamber.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiChemicalInfuser.png b/src/main/resources/assets/mekanism/gui/GuiChemicalInfuser.png index 8e8fed47d..61388f0e5 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiChemicalInfuser.png and b/src/main/resources/assets/mekanism/gui/GuiChemicalInfuser.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiChemicalOxidizer.png b/src/main/resources/assets/mekanism/gui/GuiChemicalOxidizer.png index 7f14a7fe7..df97a3f64 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiChemicalOxidizer.png and b/src/main/resources/assets/mekanism/gui/GuiChemicalOxidizer.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiChemicalWasher.png b/src/main/resources/assets/mekanism/gui/GuiChemicalWasher.png index 77507901f..8a3bb3b4e 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiChemicalWasher.png and b/src/main/resources/assets/mekanism/gui/GuiChemicalWasher.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiConfiguration.png b/src/main/resources/assets/mekanism/gui/GuiConfiguration.png index 3b8bf864f..bff82cf05 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiConfiguration.png and b/src/main/resources/assets/mekanism/gui/GuiConfiguration.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiDictionary.png b/src/main/resources/assets/mekanism/gui/GuiDictionary.png index 5c8d64c25..05fdc0e53 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiDictionary.png and b/src/main/resources/assets/mekanism/gui/GuiDictionary.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiDigitalMiner.png b/src/main/resources/assets/mekanism/gui/GuiDigitalMiner.png index b4d34c3be..5b52b3a26 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiDigitalMiner.png and b/src/main/resources/assets/mekanism/gui/GuiDigitalMiner.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiDigitalMinerConfig.png b/src/main/resources/assets/mekanism/gui/GuiDigitalMinerConfig.png index eadb5f8f1..0051bf133 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiDigitalMinerConfig.png and b/src/main/resources/assets/mekanism/gui/GuiDigitalMinerConfig.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiDynamicTank.png b/src/main/resources/assets/mekanism/gui/GuiDynamicTank.png index 2bfc215e9..261aced9e 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiDynamicTank.png and b/src/main/resources/assets/mekanism/gui/GuiDynamicTank.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiElectricChest.png b/src/main/resources/assets/mekanism/gui/GuiElectricChest.png new file mode 100644 index 000000000..f3ae944e5 Binary files /dev/null and b/src/main/resources/assets/mekanism/gui/GuiElectricChest.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiElectricPump.png b/src/main/resources/assets/mekanism/gui/GuiElectricPump.png index e7aac4b6f..db141a983 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiElectricPump.png and b/src/main/resources/assets/mekanism/gui/GuiElectricPump.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiElectrolyticSeparator.png b/src/main/resources/assets/mekanism/gui/GuiElectrolyticSeparator.png index b1d574e72..e40ff5d97 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiElectrolyticSeparator.png and b/src/main/resources/assets/mekanism/gui/GuiElectrolyticSeparator.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiFilterSelect.png b/src/main/resources/assets/mekanism/gui/GuiFilterSelect.png index fca5d0c72..fbb97bd8a 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiFilterSelect.png and b/src/main/resources/assets/mekanism/gui/GuiFilterSelect.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiGasTank.png b/src/main/resources/assets/mekanism/gui/GuiGasTank.png index 40a5d8134..eaa7bee77 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiGasTank.png and b/src/main/resources/assets/mekanism/gui/GuiGasTank.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiInductionMatrix.png b/src/main/resources/assets/mekanism/gui/GuiInductionMatrix.png index 630ae0803..3c6dcb151 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiInductionMatrix.png and b/src/main/resources/assets/mekanism/gui/GuiInductionMatrix.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiLogisticalSorter.png b/src/main/resources/assets/mekanism/gui/GuiLogisticalSorter.png index 229a91541..42220f9c8 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiLogisticalSorter.png and b/src/main/resources/assets/mekanism/gui/GuiLogisticalSorter.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiMItemStackFilter.png b/src/main/resources/assets/mekanism/gui/GuiMItemStackFilter.png index f848a31e6..a91038f04 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiMItemStackFilter.png and b/src/main/resources/assets/mekanism/gui/GuiMItemStackFilter.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiMMaterialFilter.png b/src/main/resources/assets/mekanism/gui/GuiMMaterialFilter.png index 4da67ab33..9c6a9d25f 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiMMaterialFilter.png and b/src/main/resources/assets/mekanism/gui/GuiMMaterialFilter.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiMModIDFilter.png b/src/main/resources/assets/mekanism/gui/GuiMModIDFilter.png index bca31627a..979eecf5d 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiMModIDFilter.png and b/src/main/resources/assets/mekanism/gui/GuiMModIDFilter.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiMOreDictFilter.png b/src/main/resources/assets/mekanism/gui/GuiMOreDictFilter.png index 7827f2681..d87107b2f 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiMOreDictFilter.png and b/src/main/resources/assets/mekanism/gui/GuiMOreDictFilter.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiMatrixStats.png b/src/main/resources/assets/mekanism/gui/GuiMatrixStats.png new file mode 100644 index 000000000..28a914702 Binary files /dev/null and b/src/main/resources/assets/mekanism/gui/GuiMatrixStats.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiMetallurgicInfuser.png b/src/main/resources/assets/mekanism/gui/GuiMetallurgicInfuser.png index 0b5079604..a8d748691 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiMetallurgicInfuser.png and b/src/main/resources/assets/mekanism/gui/GuiMetallurgicInfuser.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiPortableTeleporter.png b/src/main/resources/assets/mekanism/gui/GuiPortableTeleporter.png index 6db1c29f9..8d13876e8 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiPortableTeleporter.png and b/src/main/resources/assets/mekanism/gui/GuiPortableTeleporter.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiResistiveHeater.png b/src/main/resources/assets/mekanism/gui/GuiResistiveHeater.png index 67588cf77..fdba427ab 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiResistiveHeater.png and b/src/main/resources/assets/mekanism/gui/GuiResistiveHeater.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiRobitMain.png b/src/main/resources/assets/mekanism/gui/GuiRobitMain.png index a01146df7..b5cf7d562 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiRobitMain.png and b/src/main/resources/assets/mekanism/gui/GuiRobitMain.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiRotaryCondensentrator.png b/src/main/resources/assets/mekanism/gui/GuiRotaryCondensentrator.png index 49cbe9aa7..de03b987c 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiRotaryCondensentrator.png and b/src/main/resources/assets/mekanism/gui/GuiRotaryCondensentrator.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiSeismicVibrator.png b/src/main/resources/assets/mekanism/gui/GuiSeismicVibrator.png index 9d7922849..5ed16ba60 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiSeismicVibrator.png and b/src/main/resources/assets/mekanism/gui/GuiSeismicVibrator.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiSolarEvaporationController.png b/src/main/resources/assets/mekanism/gui/GuiSolarEvaporationController.png new file mode 100644 index 000000000..9ccb4e23a Binary files /dev/null and b/src/main/resources/assets/mekanism/gui/GuiSolarEvaporationController.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiSolarGenerator.png b/src/main/resources/assets/mekanism/gui/GuiSolarGenerator.png index a8e5ea46d..b4707635a 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiSolarGenerator.png and b/src/main/resources/assets/mekanism/gui/GuiSolarGenerator.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiTItemStackFilter.png b/src/main/resources/assets/mekanism/gui/GuiTItemStackFilter.png index 86da97d14..a5b02a0b2 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiTItemStackFilter.png and b/src/main/resources/assets/mekanism/gui/GuiTItemStackFilter.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiTMaterialFilter.png b/src/main/resources/assets/mekanism/gui/GuiTMaterialFilter.png index cb85ee817..d0e80cfbc 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiTMaterialFilter.png and b/src/main/resources/assets/mekanism/gui/GuiTMaterialFilter.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiTModIDFilter.png b/src/main/resources/assets/mekanism/gui/GuiTModIDFilter.png index 723e36df7..6c6c2188d 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiTModIDFilter.png and b/src/main/resources/assets/mekanism/gui/GuiTModIDFilter.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiTOreDictFilter.png b/src/main/resources/assets/mekanism/gui/GuiTOreDictFilter.png index 723e36df7..9e047b30a 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiTOreDictFilter.png and b/src/main/resources/assets/mekanism/gui/GuiTOreDictFilter.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiTeleporter.png b/src/main/resources/assets/mekanism/gui/GuiTeleporter.png index 1c32f08b0..c2731f41d 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiTeleporter.png and b/src/main/resources/assets/mekanism/gui/GuiTeleporter.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiThermalEvaporationController.png b/src/main/resources/assets/mekanism/gui/GuiThermalEvaporationController.png index 197b26b14..ad817831f 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiThermalEvaporationController.png and b/src/main/resources/assets/mekanism/gui/GuiThermalEvaporationController.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiTransporterConfig.png b/src/main/resources/assets/mekanism/gui/GuiTransporterConfig.png index 985281233..19e7d9c82 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiTransporterConfig.png and b/src/main/resources/assets/mekanism/gui/GuiTransporterConfig.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiUpgradeManagement.png b/src/main/resources/assets/mekanism/gui/GuiUpgradeManagement.png index 3a899bdfa..35aee32c4 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiUpgradeManagement.png and b/src/main/resources/assets/mekanism/gui/GuiUpgradeManagement.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiWindTurbine.png b/src/main/resources/assets/mekanism/gui/GuiWindTurbine.png index 8706425af..30d8bf347 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiWindTurbine.png and b/src/main/resources/assets/mekanism/gui/GuiWindTurbine.png differ diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiContainerEditMode.png b/src/main/resources/assets/mekanism/gui/elements/GuiContainerEditMode.png index 1a040aead..702356e6c 100644 Binary files a/src/main/resources/assets/mekanism/gui/elements/GuiContainerEditMode.png and b/src/main/resources/assets/mekanism/gui/elements/GuiContainerEditMode.png differ diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiEnergyInfo.png b/src/main/resources/assets/mekanism/gui/elements/GuiEnergyInfo.png index 561fb6d60..851574e4d 100644 Binary files a/src/main/resources/assets/mekanism/gui/elements/GuiEnergyInfo.png and b/src/main/resources/assets/mekanism/gui/elements/GuiEnergyInfo.png differ diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiEnergyTab.png b/src/main/resources/assets/mekanism/gui/elements/GuiEnergyTab.png index 2893b0927..3415c1d39 100644 Binary files a/src/main/resources/assets/mekanism/gui/elements/GuiEnergyTab.png and b/src/main/resources/assets/mekanism/gui/elements/GuiEnergyTab.png differ diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiFluidsTab.png b/src/main/resources/assets/mekanism/gui/elements/GuiFluidsTab.png index d8104fda2..fd8c91ca4 100644 Binary files a/src/main/resources/assets/mekanism/gui/elements/GuiFluidsTab.png and b/src/main/resources/assets/mekanism/gui/elements/GuiFluidsTab.png differ diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiFuelTab.png b/src/main/resources/assets/mekanism/gui/elements/GuiFuelTab.png index 98fdc81b3..a193120cd 100644 Binary files a/src/main/resources/assets/mekanism/gui/elements/GuiFuelTab.png and b/src/main/resources/assets/mekanism/gui/elements/GuiFuelTab.png differ diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiGasesTab.png b/src/main/resources/assets/mekanism/gui/elements/GuiGasesTab.png index 09f62b719..31f22cfa6 100644 Binary files a/src/main/resources/assets/mekanism/gui/elements/GuiGasesTab.png and b/src/main/resources/assets/mekanism/gui/elements/GuiGasesTab.png differ diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiHeatTab.png b/src/main/resources/assets/mekanism/gui/elements/GuiHeatTab.png index eaeb1fb30..b96df52a3 100644 Binary files a/src/main/resources/assets/mekanism/gui/elements/GuiHeatTab.png and b/src/main/resources/assets/mekanism/gui/elements/GuiHeatTab.png differ diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiItemsTab.png b/src/main/resources/assets/mekanism/gui/elements/GuiItemsTab.png index e427834bc..861c0a0ea 100644 Binary files a/src/main/resources/assets/mekanism/gui/elements/GuiItemsTab.png and b/src/main/resources/assets/mekanism/gui/elements/GuiItemsTab.png differ diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiPowerBar.png b/src/main/resources/assets/mekanism/gui/elements/GuiPowerBar.png index f4e9da5ea..c539e7a9e 100644 Binary files a/src/main/resources/assets/mekanism/gui/elements/GuiPowerBar.png and b/src/main/resources/assets/mekanism/gui/elements/GuiPowerBar.png differ diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiProgress.png b/src/main/resources/assets/mekanism/gui/elements/GuiProgress.png index 3cef60021..f1250aca4 100644 Binary files a/src/main/resources/assets/mekanism/gui/elements/GuiProgress.png and b/src/main/resources/assets/mekanism/gui/elements/GuiProgress.png differ diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiRateBar.png b/src/main/resources/assets/mekanism/gui/elements/GuiRateBar.png index 1bd5c511f..dbdea0130 100644 Binary files a/src/main/resources/assets/mekanism/gui/elements/GuiRateBar.png and b/src/main/resources/assets/mekanism/gui/elements/GuiRateBar.png differ diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiRecipeType.png b/src/main/resources/assets/mekanism/gui/elements/GuiRecipeType.png index 510d16fee..3655afbd4 100644 Binary files a/src/main/resources/assets/mekanism/gui/elements/GuiRecipeType.png and b/src/main/resources/assets/mekanism/gui/elements/GuiRecipeType.png differ diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiSlot.png b/src/main/resources/assets/mekanism/gui/elements/GuiSlot.png index a8121bb15..4c395c5f5 100644 Binary files a/src/main/resources/assets/mekanism/gui/elements/GuiSlot.png and b/src/main/resources/assets/mekanism/gui/elements/GuiSlot.png differ diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiSortingTab.png b/src/main/resources/assets/mekanism/gui/elements/GuiSortingTab.png index e2efb2ef3..538d5b4f6 100644 Binary files a/src/main/resources/assets/mekanism/gui/elements/GuiSortingTab.png and b/src/main/resources/assets/mekanism/gui/elements/GuiSortingTab.png differ diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiUpgradeManagement.png b/src/main/resources/assets/mekanism/gui/elements/GuiUpgradeManagement.png new file mode 100644 index 000000000..6fecb7bb7 Binary files /dev/null and b/src/main/resources/assets/mekanism/gui/elements/GuiUpgradeManagement.png differ diff --git a/src/main/resources/assets/mekanism/gui/factory/GuiAdvancedFactory.png b/src/main/resources/assets/mekanism/gui/factory/GuiAdvancedFactory.png index bdd2baafd..43deb51df 100644 Binary files a/src/main/resources/assets/mekanism/gui/factory/GuiAdvancedFactory.png and b/src/main/resources/assets/mekanism/gui/factory/GuiAdvancedFactory.png differ diff --git a/src/main/resources/assets/mekanism/gui/factory/GuiBasicFactory.png b/src/main/resources/assets/mekanism/gui/factory/GuiBasicFactory.png index fa93a83bf..b876b292e 100644 Binary files a/src/main/resources/assets/mekanism/gui/factory/GuiBasicFactory.png and b/src/main/resources/assets/mekanism/gui/factory/GuiBasicFactory.png differ diff --git a/src/main/resources/assets/mekanism/gui/factory/GuiEliteFactory.png b/src/main/resources/assets/mekanism/gui/factory/GuiEliteFactory.png index affbb3385..2e502daa6 100644 Binary files a/src/main/resources/assets/mekanism/gui/factory/GuiEliteFactory.png and b/src/main/resources/assets/mekanism/gui/factory/GuiEliteFactory.png differ diff --git a/src/main/resources/assets/mekanism/gui/nei/GuiChemicalCrystallizer.png b/src/main/resources/assets/mekanism/gui/nei/GuiChemicalCrystallizer.png index 10f170ece..cead4ce32 100644 Binary files a/src/main/resources/assets/mekanism/gui/nei/GuiChemicalCrystallizer.png and b/src/main/resources/assets/mekanism/gui/nei/GuiChemicalCrystallizer.png differ diff --git a/src/main/resources/assets/mekanism/gui/nei/GuiChemicalDissolutionChamber.png b/src/main/resources/assets/mekanism/gui/nei/GuiChemicalDissolutionChamber.png index 4608ce945..1e703be47 100644 Binary files a/src/main/resources/assets/mekanism/gui/nei/GuiChemicalDissolutionChamber.png and b/src/main/resources/assets/mekanism/gui/nei/GuiChemicalDissolutionChamber.png differ diff --git a/src/main/resources/assets/mekanism/gui/nei/GuiChemicalInfuser.png b/src/main/resources/assets/mekanism/gui/nei/GuiChemicalInfuser.png index 7f6713a99..30b356997 100644 Binary files a/src/main/resources/assets/mekanism/gui/nei/GuiChemicalInfuser.png and b/src/main/resources/assets/mekanism/gui/nei/GuiChemicalInfuser.png differ diff --git a/src/main/resources/assets/mekanism/gui/nei/GuiChemicalWasher.png b/src/main/resources/assets/mekanism/gui/nei/GuiChemicalWasher.png index c32e6088c..32c9e1b4a 100644 Binary files a/src/main/resources/assets/mekanism/gui/nei/GuiChemicalWasher.png and b/src/main/resources/assets/mekanism/gui/nei/GuiChemicalWasher.png differ diff --git a/src/main/resources/assets/mekanism/gui/nei/GuiRotaryCondensentrator.png b/src/main/resources/assets/mekanism/gui/nei/GuiRotaryCondensentrator.png index 95c24cae2..23ac403f0 100644 Binary files a/src/main/resources/assets/mekanism/gui/nei/GuiRotaryCondensentrator.png and b/src/main/resources/assets/mekanism/gui/nei/GuiRotaryCondensentrator.png differ diff --git a/src/main/resources/assets/mekanism/gui/nei/GuiSalinationController.png b/src/main/resources/assets/mekanism/gui/nei/GuiSalinationController.png new file mode 100644 index 000000000..1b3cddc61 Binary files /dev/null and b/src/main/resources/assets/mekanism/gui/nei/GuiSalinationController.png differ diff --git a/src/main/resources/assets/mekanism/gui/nei/GuiSolarEvaporationController.png b/src/main/resources/assets/mekanism/gui/nei/GuiSolarEvaporationController.png new file mode 100644 index 000000000..a7f20569a Binary files /dev/null and b/src/main/resources/assets/mekanism/gui/nei/GuiSolarEvaporationController.png differ diff --git a/src/main/resources/assets/mekanism/gui/nei/GuiSolarNeutronActivator.png b/src/main/resources/assets/mekanism/gui/nei/GuiSolarNeutronActivator.png index af61bb896..2491ee1aa 100644 Binary files a/src/main/resources/assets/mekanism/gui/nei/GuiSolarNeutronActivator.png and b/src/main/resources/assets/mekanism/gui/nei/GuiSolarNeutronActivator.png differ diff --git a/src/main/resources/assets/mekanism/render/PersonalChest.png b/src/main/resources/assets/mekanism/render/PersonalChest.png index ccd10a649..3a258ec96 100644 Binary files a/src/main/resources/assets/mekanism/render/PersonalChest.png and b/src/main/resources/assets/mekanism/render/PersonalChest.png differ diff --git a/src/main/resources/assets/mekanism/render/SecurityDesk.png b/src/main/resources/assets/mekanism/render/SecurityDesk.png new file mode 100644 index 000000000..8dbcd403d Binary files /dev/null and b/src/main/resources/assets/mekanism/render/SecurityDesk.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BronzeBlock.png b/src/main/resources/assets/mekanism/textures/blocks/BronzeBlock.png index edc72e637..1c5c59c4b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BronzeBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/BronzeBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/CardboardBoxSide.png b/src/main/resources/assets/mekanism/textures/blocks/CardboardBoxSide.png index 77455b951..3f13b5bc5 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/CardboardBoxSide.png and b/src/main/resources/assets/mekanism/textures/blocks/CardboardBoxSide.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/CardboardBoxSideStorage.png b/src/main/resources/assets/mekanism/textures/blocks/CardboardBoxSideStorage.png index 57e8b4cef..1b274c57b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/CardboardBoxSideStorage.png and b/src/main/resources/assets/mekanism/textures/blocks/CardboardBoxSideStorage.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/CardboardBoxTop.png b/src/main/resources/assets/mekanism/textures/blocks/CardboardBoxTop.png index 4e7e6e6b6..869115782 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/CardboardBoxTop.png and b/src/main/resources/assets/mekanism/textures/blocks/CardboardBoxTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/CoalBlock.png b/src/main/resources/assets/mekanism/textures/blocks/CoalBlock.png index 69bb8eb12..297e93a15 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/CoalBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/CoalBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/CopperBlock.png b/src/main/resources/assets/mekanism/textures/blocks/CopperBlock.png index 069f48d32..a00120301 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/CopperBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/CopperBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/CopperBlock_alt.png b/src/main/resources/assets/mekanism/textures/blocks/CopperBlock_alt.png new file mode 100644 index 000000000..0da5ea2d0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/CopperBlock_alt.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/CopperOre.png b/src/main/resources/assets/mekanism/textures/blocks/CopperOre.png index c49ac6a65..78fc61e05 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/CopperOre.png and b/src/main/resources/assets/mekanism/textures/blocks/CopperOre.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/DynamicGlass.png b/src/main/resources/assets/mekanism/textures/blocks/DynamicGlass.png new file mode 100644 index 000000000..ef433d55c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/DynamicGlass.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/DynamicTank.png b/src/main/resources/assets/mekanism/textures/blocks/DynamicTank.png new file mode 100644 index 000000000..e6b2a90ec Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/DynamicTank.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/DynamicValve.png b/src/main/resources/assets/mekanism/textures/blocks/DynamicValve.png new file mode 100644 index 000000000..87bb9aec2 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/DynamicValve.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/GlowPlasticBlock.png b/src/main/resources/assets/mekanism/textures/blocks/GlowPlasticBlock.png old mode 100755 new mode 100644 index 94aac7ed1..c0466e0f7 Binary files a/src/main/resources/assets/mekanism/textures/blocks/GlowPlasticBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/GlowPlasticBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/OsmiumBlock.png b/src/main/resources/assets/mekanism/textures/blocks/OsmiumBlock.png index bab6ea716..8d9079f85 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/OsmiumBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/OsmiumBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/OsmiumOre.png b/src/main/resources/assets/mekanism/textures/blocks/OsmiumOre.png index f34b65ccf..000da2834 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/OsmiumOre.png and b/src/main/resources/assets/mekanism/textures/blocks/OsmiumOre.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/PlasticBlock.png b/src/main/resources/assets/mekanism/textures/blocks/PlasticBlock.png old mode 100755 new mode 100644 index 4697f350f..d069e12ba Binary files a/src/main/resources/assets/mekanism/textures/blocks/PlasticBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/PlasticBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/PlasticFence.png b/src/main/resources/assets/mekanism/textures/blocks/PlasticFence.png old mode 100755 new mode 100644 index b339997f5..98eb5cba8 Binary files a/src/main/resources/assets/mekanism/textures/blocks/PlasticFence.png and b/src/main/resources/assets/mekanism/textures/blocks/PlasticFence.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/PressureDisperser.png b/src/main/resources/assets/mekanism/textures/blocks/PressureDisperser.png index 52cbb4190..76cc38c33 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/PressureDisperser.png and b/src/main/resources/assets/mekanism/textures/blocks/PressureDisperser.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/RefinedGlowstone.png b/src/main/resources/assets/mekanism/textures/blocks/RefinedGlowstone.png index 3e0f657d9..5f6c6fbfa 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/RefinedGlowstone.png and b/src/main/resources/assets/mekanism/textures/blocks/RefinedGlowstone.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/RefinedObsidian.png b/src/main/resources/assets/mekanism/textures/blocks/RefinedObsidian.png index 6bdd7e21b..c83db38f8 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/RefinedObsidian.png and b/src/main/resources/assets/mekanism/textures/blocks/RefinedObsidian.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/RefinedObsidian_alt.png b/src/main/resources/assets/mekanism/textures/blocks/RefinedObsidian_alt.png new file mode 100644 index 000000000..48e4a9002 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/RefinedObsidian_alt.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ReinforcedPlasticBlock.png b/src/main/resources/assets/mekanism/textures/blocks/ReinforcedPlasticBlock.png old mode 100755 new mode 100644 index 1cf648c8c..6b1ca30b0 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ReinforcedPlasticBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/ReinforcedPlasticBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/RoadPlasticBlock.png b/src/main/resources/assets/mekanism/textures/blocks/RoadPlasticBlock.png old mode 100755 new mode 100644 index 3e2207a71..db41e5bd9 Binary files a/src/main/resources/assets/mekanism/textures/blocks/RoadPlasticBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/RoadPlasticBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/RoadPlasticBlock_Alt.png b/src/main/resources/assets/mekanism/textures/blocks/RoadPlasticBlock_Alt.png new file mode 100644 index 000000000..5193be0c4 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/RoadPlasticBlock_Alt.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexSide.png b/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexSide.png index 61b18bac1..21396b781 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexSide.png and b/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexSide.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexSide_Dark.png b/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexSide_Dark.png new file mode 100644 index 000000000..2a088fb2a Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexSide_Dark.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexTop.png b/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexTop.png index 5b0da1193..066f25a46 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexTop.png and b/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexTop_Dark.png b/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexTop_Dark.png new file mode 100644 index 000000000..0bf571573 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexTop_Dark.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/SalinationBlock.png b/src/main/resources/assets/mekanism/textures/blocks/SalinationBlock.png new file mode 100644 index 000000000..7023484ed Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/SalinationBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/SalinationController.png b/src/main/resources/assets/mekanism/textures/blocks/SalinationController.png new file mode 100644 index 000000000..b0d3b7707 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/SalinationController.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png b/src/main/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png new file mode 100644 index 000000000..aee804efd Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png.mcmeta new file mode 100644 index 000000000..efc331201 --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 10 + } +} diff --git a/src/main/resources/assets/mekanism/textures/blocks/SalinationValve.png b/src/main/resources/assets/mekanism/textures/blocks/SalinationValve.png new file mode 100644 index 000000000..3fd06552d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/SalinationValve.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/SlickPlasticBlock.png b/src/main/resources/assets/mekanism/textures/blocks/SlickPlasticBlock.png old mode 100755 new mode 100644 index 5ae84ba41..0dc7e1d78 Binary files a/src/main/resources/assets/mekanism/textures/blocks/SlickPlasticBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/SlickPlasticBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/SteelBlock.png b/src/main/resources/assets/mekanism/textures/blocks/SteelBlock.png index 0c5f6332d..efa22b797 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/SteelBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/SteelBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/SteelBlock_Oxidized.png b/src/main/resources/assets/mekanism/textures/blocks/SteelBlock_Oxidized.png new file mode 100644 index 000000000..06621f301 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/SteelBlock_Oxidized.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/SteelCasing.png b/src/main/resources/assets/mekanism/textures/blocks/SteelCasing.png index 9e8131df4..c06aba640 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/SteelCasing.png and b/src/main/resources/assets/mekanism/textures/blocks/SteelCasing.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/SteelCasing_Alt.png b/src/main/resources/assets/mekanism/textures/blocks/SteelCasing_Alt.png new file mode 100644 index 000000000..6989eda9f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/SteelCasing_Alt.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/SteelCasing_Alt1.png b/src/main/resources/assets/mekanism/textures/blocks/SteelCasing_Alt1.png new file mode 100644 index 000000000..462446505 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/SteelCasing_Alt1.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/SteelCasing_Alt2.png b/src/main/resources/assets/mekanism/textures/blocks/SteelCasing_Alt2.png new file mode 100644 index 000000000..764f6e32e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/SteelCasing_Alt2.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/SteelCasing_alt3.png b/src/main/resources/assets/mekanism/textures/blocks/SteelCasing_alt3.png new file mode 100644 index 000000000..1865e7010 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/SteelCasing_alt3.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/Teleporter.png b/src/main/resources/assets/mekanism/textures/blocks/Teleporter.png new file mode 100644 index 000000000..46b046fff Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/Teleporter.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/TeleporterFrame.png b/src/main/resources/assets/mekanism/textures/blocks/TeleporterFrame.png new file mode 100644 index 000000000..702e2a971 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/TeleporterFrame.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/TeleporterFront.png b/src/main/resources/assets/mekanism/textures/blocks/TeleporterFront.png new file mode 100644 index 000000000..66e5f8391 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/TeleporterFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/TinBlock.png b/src/main/resources/assets/mekanism/textures/blocks/TinBlock.png index 6fb0c94b5..9f448166b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/TinBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/TinBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/TinOre.png b/src/main/resources/assets/mekanism/textures/blocks/TinOre.png index b8c1c40c8..9afcb4e8f 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/TinOre.png and b/src/main/resources/assets/mekanism/textures/blocks/TinOre.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/TurbineRod.png b/src/main/resources/assets/mekanism/textures/blocks/TurbineRod.png index d9dace097..6aa673b21 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/TurbineRod.png and b/src/main/resources/assets/mekanism/textures/blocks/TurbineRod.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedBack.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedBack.png new file mode 100644 index 000000000..ccb600467 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedBackOn.png new file mode 100644 index 000000000..2d6754afb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedFront.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedFront.png index 1d37f514c..01c437258 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedFront.png and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedFrontOn.png index a776eab8b..c7b409b9b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedLeft.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedLeft.png new file mode 100644 index 000000000..c8c18fbea Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedLeftOn.png new file mode 100644 index 000000000..8c5afa156 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedRight.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedRight.png new file mode 100644 index 000000000..c8c18fbea Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedRightOn.png new file mode 100644 index 000000000..8c5afa156 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedSide.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedSide.png deleted file mode 100644 index 55fd07f98..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedSide.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedTop.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedTop.png index aa394fd75..fd9404728 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedTop.png and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedTopOn.png index 3cd450e72..21f4fd68a 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedTopOn.png and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicBack.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicBack.png new file mode 100644 index 000000000..0d03afc27 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicBackOn.png new file mode 100644 index 000000000..15afb0c15 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicBottom.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicBottom.png new file mode 100644 index 000000000..68212fedd Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicFront.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicFront.png index 19b8520b7..376899adf 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicFront.png and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicFrontOn.png index 32642dd8e..ac0facd55 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicLeft.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicLeft.png new file mode 100644 index 000000000..0d56015a3 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicLeftOn.png new file mode 100644 index 000000000..03befa252 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicRight.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicRight.png new file mode 100644 index 000000000..c6e3ba0ad Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicRightOn.png new file mode 100644 index 000000000..5bf26472b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicSide.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicSide.png deleted file mode 100644 index 4ee5cf6b6..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicSide.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicTop.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicTop.png index dc5a1fffd..cb06e8fc8 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicTop.png and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicTopOn.png index f10595555..8edd5ed56 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicTopOn.png and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBottom.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBottom.png new file mode 100644 index 000000000..4efe93153 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteBack.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteBack.png new file mode 100644 index 000000000..5bd02d7f9 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteBackOn.png new file mode 100644 index 000000000..098168d61 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteBottom.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteBottom.png new file mode 100644 index 000000000..d8ea11aae Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteFront.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteFront.png index 318ddd90d..522bffcad 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteFront.png and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteFrontOn.png index 9425e35f7..a35622c66 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteLeft.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteLeft.png new file mode 100644 index 000000000..b16df590f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteLeftOn.png new file mode 100644 index 000000000..21c4620b2 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteRight.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteRight.png new file mode 100644 index 000000000..365f0282f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteRightOn.png new file mode 100644 index 000000000..eb4dda1aa Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteSide.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteSide.png deleted file mode 100644 index 5faafe1a9..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteSide.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteTop.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteTop.png index b0ae8d075..865418013 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteTop.png and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteTopOn.png index 9ae7fe5bb..2c1872785 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteTopOn.png and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinFront.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinFront.png new file mode 100644 index 000000000..b5cd970de Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinFrontOn.png new file mode 100644 index 000000000..2b0954a4b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinSide.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinSide.png new file mode 100644 index 000000000..efae5e87b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinSide.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinSideOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinSideOn.png new file mode 100644 index 000000000..74ad4c7c2 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinSideOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinTop.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinTop.png new file mode 100644 index 000000000..e2e169c64 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinTopOn.png new file mode 100644 index 000000000..336856eb4 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateBack.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateBack.png new file mode 100644 index 000000000..15de08102 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateBackOn.png new file mode 100644 index 000000000..710762e9c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateBottom.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateBottom.png new file mode 100644 index 000000000..9e60da107 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateFront.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateFront.png index 76e4f5f23..d8159e9a9 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateFront.png and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateFrontOn.png index 1a2584411..6ea785b1c 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateLeft.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateLeft.png new file mode 100644 index 000000000..7aff84f02 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateLeftOn.png new file mode 100644 index 000000000..b3145ad9b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateRight.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateRight.png new file mode 100644 index 000000000..8ad8c32c9 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateRightOn.png new file mode 100644 index 000000000..fb80dadd4 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateSide.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateSide.png deleted file mode 100644 index 19b58516f..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateSide.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateTop.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateTop.png index 8c1b3c8eb..e8407488f 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateTop.png and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateTopOn.png index c24e0bc35..7d30ada21 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateTopOn.png and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberBack.png b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberBack.png new file mode 100644 index 000000000..c1384cfdf Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberBackOn.png new file mode 100644 index 000000000..43ddfdde2 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberBottom.png b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberBottom.png new file mode 100644 index 000000000..b0d6a0785 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberFront.png b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberFront.png index 2b3866889..1f9c64cc8 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberFront.png and b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberFrontOn.png index ad6cfc582..7e48f708d 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberLeft.png b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberLeft.png new file mode 100644 index 000000000..8e5622b69 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberLeftOn.png new file mode 100644 index 000000000..f27a1fc2d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberRight.png b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberRight.png new file mode 100644 index 000000000..7c6fb4f16 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberRightOn.png new file mode 100644 index 000000000..7faf82984 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberTop.png b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberTop.png new file mode 100644 index 000000000..adcdb406d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberTopOn.png new file mode 100644 index 000000000..1f1cca056 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerBack.png b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerBack.png new file mode 100644 index 000000000..90acd0d53 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerBack_alt.png b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerBack_alt.png new file mode 100644 index 000000000..408ea8bbe Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerBack_alt.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerBottom.png b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerBottom.png new file mode 100644 index 000000000..6c7dd2f79 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerFront.png b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerFront.png index 6c5f0ea73..d2796d325 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerFront.png and b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerLeft.png b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerLeft.png new file mode 100644 index 000000000..72e256b56 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerRight.png b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerRight.png new file mode 100644 index 000000000..a2a584b11 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerTop.png b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerTop.png new file mode 100644 index 000000000..647b2369a Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherBack.png b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherBack.png new file mode 100644 index 000000000..0b09c353c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherBackOn.png new file mode 100644 index 000000000..52614740b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFront.png b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFront.png index 2c2e6ac84..228cd7b66 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFront.png and b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFrontOn.png index c00dee83c..83899b29b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFrontOn.png.mcmeta index 24f9c2fae..1a6cca1a1 100644 --- a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFrontOn.png.mcmeta +++ b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFrontOn.png.mcmeta @@ -1,5 +1,25 @@ { "animation": { - "frametime": 1 + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 10, + 7, + 4, + 1, + 0, + 0 + ] } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherLeft.png b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherLeft.png new file mode 100644 index 000000000..fbf95c891 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherLeftOn.png new file mode 100644 index 000000000..26ee67e97 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherLeftOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherLeftOn.png.mcmeta new file mode 100644 index 000000000..1a6cca1a1 --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherLeftOn.png.mcmeta @@ -0,0 +1,25 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 10, + 7, + 4, + 1, + 0, + 0 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherRight.png b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherRight.png new file mode 100644 index 000000000..783ce363d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherRightOn.png new file mode 100644 index 000000000..2f93956d4 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherRightOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherRightOn.png.mcmeta new file mode 100644 index 000000000..1a6cca1a1 --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherRightOn.png.mcmeta @@ -0,0 +1,25 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 10, + 7, + 4, + 1, + 0, + 0 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherTop.png b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherTop.png new file mode 100644 index 000000000..df9e53700 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherTopOn.png new file mode 100644 index 000000000..d5001a8b3 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerCasing-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerCasing-ctm.png index 352d7b87b..3c320e931 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerCasing-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerCasing-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerCasing.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerCasing.png index a341a84e9..22813942f 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerCasing.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerCasing.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerValve-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerValve-ctm.png index 51847a899..0e87bfe6b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerValve-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerValve-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerValve.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerValve.png index f60ee83dd..36887dcdd 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerValve.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerValve.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicGlass-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicGlass-ctm.png new file mode 100644 index 000000000..eff82ab17 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicGlass-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicGlass.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicGlass.png new file mode 100644 index 000000000..ef433d55c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicGlass.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicTank-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicTank-ctm.png index af7e4bd8c..c48db523d 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicTank-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicTank-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicTank.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicTank.png index ca24627d3..e6b2a90ec 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicTank.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicTank.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicValve-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicValve-ctm.png index 4a0a66be7..b95385a31 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicValve-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicValve-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicValve.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicValve.png index b053a882c..87bb9aec2 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicValve.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicValve.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ElectromagneticCoil-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ElectromagneticCoil-ctm.png index 47ce61b38..173bbd33a 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ElectromagneticCoil-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ElectromagneticCoil-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ElectromagneticCoil.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ElectromagneticCoil.png index 891d9d03d..4bbdd474c 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ElectromagneticCoil.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ElectromagneticCoil.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCasing-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCasing-ctm.png index 186329393..c1340397b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCasing-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCasing-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCasing.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCasing.png index 0c77c3352..63e00e420 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCasing.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCasing.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellAdvanced-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellAdvanced-ctm.png index a0e1e680c..d373f107c 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellAdvanced-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellAdvanced-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellAdvanced.png index 08fc0f970..fc6df4d0a 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellAdvanced.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellBasic-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellBasic-ctm.png index 478fc81e8..622304ac0 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellBasic-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellBasic-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellBasic.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellBasic.png index bf4768016..7f791ad37 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellBasic.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellElite-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellElite-ctm.png index fd7c9bfd7..69a386b4d 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellElite-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellElite-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellElite.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellElite.png index bd200172f..d3c9bf197 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellElite.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellUltimate-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellUltimate-ctm.png index 2bcd2cca0..ecf471073 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellUltimate-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellUltimate-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellUltimate.png index 0c94b1765..f40e8809b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellUltimate.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellUltimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortInput-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortInput-ctm.png index 95bde973d..baed4d2b3 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortInput-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortInput-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortInput.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortInput.png index 33d963e11..0bf461e7a 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortInput.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortInput.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortOutput-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortOutput-ctm.png index a4a60289d..5fd63b20b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortOutput-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortOutput-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortOutput.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortOutput.png index ec37dfbca..6fcd4e85a 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortOutput.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortOutput.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderAdvanced-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderAdvanced-ctm.png index a12f4de73..7dafbec5d 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderAdvanced-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderAdvanced-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderAdvanced.png index 5efc46f89..933486817 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderAdvanced.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderBasic-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderBasic-ctm.png index 4b9941e52..7d2dccfee 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderBasic-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderBasic-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderBasic.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderBasic.png index ff67ea7d3..071c3210b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderBasic.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderElite-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderElite-ctm.png index ca5964252..40f7c4400 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderElite-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderElite-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderElite.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderElite.png index 24809cb5b..cdb676869 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderElite.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderUltimate-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderUltimate-ctm.png index 73716350e..8b72a1718 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderUltimate-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderUltimate-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderUltimate.png index 10ba4afda..c637d6d44 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderUltimate.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderUltimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOff-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOff-ctm.png index 88d2e4769..2b0a07139 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOff-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOff-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOff-ctm_Alt.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOff-ctm_Alt.png new file mode 100644 index 000000000..4c7fd5d53 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOff-ctm_Alt.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOff.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOff.png index 2aa4295d1..853e63053 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOff.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOff.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn-ctm.png index e628b87f7..06e6ac08d 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn-ctm_Alt.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn-ctm_Alt.png new file mode 100644 index 000000000..2e3f80eaa Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn-ctm_Alt.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn.png index 21274e180..955a0feac 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn_Alt.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn_Alt.png new file mode 100644 index 000000000..64591b932 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn_Alt.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorFrame-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorFrame-ctm.png index ae572cfda..b20bf91c0 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorFrame-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorFrame-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorFrame.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorFrame.png index aa259c269..e297510bc 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorFrame.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorFrame.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorGlass-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorGlass-ctm.png index cd001c80c..1c15e5fe6 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorGlass-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorGlass-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorGlass.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorGlass.png index 5f1c34c34..41cbacb46 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorGlass.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorGlass.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLaserFocus-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLaserFocus-ctm.png index c709af2d5..ae69bdd3b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLaserFocus-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLaserFocus-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLaserFocus.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLaserFocus.png index 588343a8d..d999e8f6e 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLaserFocus.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLaserFocus.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLogicAdapter-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLogicAdapter-ctm.png index aba84ffe8..967b527f7 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLogicAdapter-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLogicAdapter-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLogicAdapter.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLogicAdapter.png index d230f9811..1ed63f580 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLogicAdapter.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLogicAdapter.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorNeutronCapture-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorNeutronCapture-ctm.png index a6bdb0556..db6450a23 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorNeutronCapture-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorNeutronCapture-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorNeutronCapture.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorNeutronCapture.png index addde92a3..5236dc6fe 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorNeutronCapture.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorNeutronCapture.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort-ctm.png index dd24a1ce3..128faeb3e 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort.png index cc6294ea3..373b8c12a 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/StructuralGlass-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/StructuralGlass-ctm.png index 2af4a6fdc..eff82ab17 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/StructuralGlass-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/StructuralGlass-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/StructuralGlass.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/StructuralGlass.png index 938ca1ee7..ef433d55c 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/StructuralGlass.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/StructuralGlass.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElement-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElement-ctm.png index bf1b62c73..eac413c4a 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElement-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElement-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElement-ctmOn.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElement-ctmOn.png new file mode 100644 index 000000000..4a24dd788 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElement-ctmOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElement.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElement.png index 1c629e326..0831aa3a4 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElement.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElement.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElementOn.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElementOn.png new file mode 100644 index 000000000..2fe59941b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElementOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/Teleporter-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/Teleporter-ctm.png index a566d58bd..365fac6f4 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/Teleporter-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/Teleporter-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/Teleporter.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/Teleporter.png index df6735bd6..f5d08dd55 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/Teleporter.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/Teleporter.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TeleporterFrame-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/TeleporterFrame-ctm.png index 32ccddb08..2eada217b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/TeleporterFrame-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/TeleporterFrame-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TeleporterFrame.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/TeleporterFrame.png index f9a21f566..fac94b34c 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/TeleporterFrame.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/TeleporterFrame.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationBlock-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationBlock-ctm.png index 91611254d..957773472 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationBlock-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationBlock-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationBlock.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationBlock.png index a878432cc..f6d3ed137 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationController-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationController-ctm.png index 656d7b08e..c6b92e3ac 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationController-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationController-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationController.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationController.png index fe0d60a55..131a9d895 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationController.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationController.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationControllerOn-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationControllerOn-ctm.png index dcac3a98a..a3a1c8a38 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationControllerOn-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationControllerOn-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationControllerOn.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationControllerOn.png index c37aea836..618b975c3 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationControllerOn.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationControllerOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationValve-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationValve-ctm.png index 63d14d953..3d13b7f14 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationValve-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationValve-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationValve.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationValve.png index b4a22621a..f1157d106 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationValve.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationValve.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing-ctm.png index 58a8410be..f9da48d96 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing.png index be7474646..06215c275 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve-ctm.png index 53999ae47..406b2a822 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve.png index f7f956737..09d1ae1a8 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent-ctm.png index 358dee714..241d8645a 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent.png index e522259ef..664a34cc9 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterBack.png b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterBack.png new file mode 100644 index 000000000..379977b21 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterBackOn.png new file mode 100644 index 000000000..90e8ebf3c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterBottom.png b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterBottom.png new file mode 100644 index 000000000..d11f241b5 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterBottomOn.png b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterBottomOn.png new file mode 100644 index 000000000..19bfac300 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterBottomOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFront.png b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFront.png index 187823574..634e80810 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFront.png and b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFrontOn.png index 43daa3fc4..ac958981e 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFrontOn.png.mcmeta index 24f9c2fae..9521044fa 100644 --- a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFrontOn.png.mcmeta +++ b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFrontOn.png.mcmeta @@ -1,5 +1,17 @@ { "animation": { - "frametime": 1 + "frametime": 2, + "frames": [ + 0, + 1, + 3, + 4, + 6, + 5, + 2, + 3, + 1, + 2 + ] } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterLeft.png b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterLeft.png new file mode 100644 index 000000000..0e61f010b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterLeftOn.png new file mode 100644 index 000000000..a8cf0d7d9 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterRight.png b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterRight.png new file mode 100644 index 000000000..0bf673d2b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterRightOn.png new file mode 100644 index 000000000..e43f5f548 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterTop.png b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterTop.png new file mode 100644 index 000000000..7a9cf711e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterTopOn.png new file mode 100644 index 000000000..0091f9a0f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberBack.png b/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberBack.png new file mode 100644 index 000000000..497569ae0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberFront.png b/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberFront.png index 52399c73c..1fcb331b0 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberFront.png and b/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberLeft.png b/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberLeft.png new file mode 100644 index 000000000..2d3c33fd4 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberRight.png b/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberRight.png new file mode 100644 index 000000000..07f57751c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberTop.png b/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberTop.png new file mode 100644 index 000000000..1db9426c6 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryBottom.png old mode 100755 new mode 100644 index 18e2eb83d..5e75b07d0 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryBottom.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactorySide.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactorySide.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryTop.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryBack.png new file mode 100644 index 000000000..1c1781b82 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryBackOn.png new file mode 100644 index 000000000..5b948574d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFront.png old mode 100755 new mode 100644 index 3d06798ae..4cb1136ba Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFront.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFrontOn.png old mode 100755 new mode 100644 index e443d0a7e..db1a5b9b4 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFrontOn.png.mcmeta old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryLeft.png new file mode 100644 index 000000000..0688d4320 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryLeftOn.png new file mode 100644 index 000000000..69ce87a37 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryRight.png new file mode 100644 index 000000000..b02e0ab96 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryRightOn.png new file mode 100644 index 000000000..3e164fee0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryTop.png new file mode 100644 index 000000000..a5202047d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryTopOn.png new file mode 100644 index 000000000..af7954833 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryBack.png new file mode 100644 index 000000000..a7367b519 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryBackOn.png new file mode 100644 index 000000000..4fd1bcf5a Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFront.png old mode 100755 new mode 100644 index 69f099854..d11930ac7 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFront.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFrontOn.png old mode 100755 new mode 100644 index 3020df978..c82c39841 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFrontOn.png.mcmeta old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryLeft.png new file mode 100644 index 000000000..7133b36aa Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryLeftOn.png new file mode 100644 index 000000000..953f07aa9 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryRight.png new file mode 100644 index 000000000..2b0eabfd0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryRightOn.png new file mode 100644 index 000000000..e83f1a7e1 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryTop.png new file mode 100644 index 000000000..408502297 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryTopOn.png new file mode 100644 index 000000000..82186ede8 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryBack.png new file mode 100644 index 000000000..bf0fdc41c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryBackOn.png new file mode 100644 index 000000000..c3cf8eb8d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFront.png old mode 100755 new mode 100644 index 351e82048..4025cd6a6 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFront.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFrontOn.png old mode 100755 new mode 100644 index 657b6229b..3cbd3b35d Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFrontOn.png.mcmeta old mode 100755 new mode 100644 index 24f9c2fae..1a6cca1a1 --- a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFrontOn.png.mcmeta +++ b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFrontOn.png.mcmeta @@ -1,5 +1,25 @@ { "animation": { - "frametime": 1 + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 10, + 7, + 4, + 1, + 0, + 0 + ] } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryLeft.png new file mode 100644 index 000000000..4c6adcf88 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryLeftOn.png new file mode 100644 index 000000000..3ed6e4094 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryLeftOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryLeftOn.png.mcmeta new file mode 100644 index 000000000..1a6cca1a1 --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryLeftOn.png.mcmeta @@ -0,0 +1,25 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 10, + 7, + 4, + 1, + 0, + 0 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryRight.png new file mode 100644 index 000000000..15c65911f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryRightOn.png new file mode 100644 index 000000000..55d7c64ee Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryRightOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryRightOn.png.mcmeta new file mode 100644 index 000000000..1a6cca1a1 --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryRightOn.png.mcmeta @@ -0,0 +1,25 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 10, + 7, + 4, + 1, + 0, + 0 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryTop.png new file mode 100644 index 000000000..2402cf1a6 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryTopOn.png new file mode 100644 index 000000000..789f27e58 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryBack.png new file mode 100644 index 000000000..fc1287abb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryBackOn.png new file mode 100644 index 000000000..eb09555d0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryFront.png old mode 100755 new mode 100644 index 7407ed96b..c0dca5ad3 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryFront.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryFrontOn.png old mode 100755 new mode 100644 index a20afd93e..4ce0599aa Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryLeft.png new file mode 100644 index 000000000..0456f2b19 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryLeftOn.png new file mode 100644 index 000000000..778ef33ca Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryRight.png new file mode 100644 index 000000000..dade2ec6a Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryRightOn.png new file mode 100644 index 000000000..e796902fb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryTop.png new file mode 100644 index 000000000..3f1dde5d0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryTopOn.png new file mode 100644 index 000000000..489098b78 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryBack.png new file mode 100644 index 000000000..be9726255 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryBackOn.png new file mode 100644 index 000000000..3ff955db2 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryBottom.png new file mode 100644 index 000000000..5b83ac09f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryFront.png new file mode 100644 index 000000000..25ce72df5 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryFrontOn.png new file mode 100644 index 000000000..a5476b612 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryLeft.png new file mode 100644 index 000000000..61b1d7a0d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryLeftOn.png new file mode 100644 index 000000000..03df32446 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryRight.png new file mode 100644 index 000000000..515c883f6 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryRightOn.png new file mode 100644 index 000000000..6f871a706 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryTop.png new file mode 100644 index 000000000..9f04b0b0f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryTopOn.png new file mode 100644 index 000000000..6f7cbd02a Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryBack.png new file mode 100644 index 000000000..5983b66a2 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryBackOn.png new file mode 100644 index 000000000..ed8a8438f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryFront.png old mode 100755 new mode 100644 index 25224391c..c8a726411 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryFront.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryFrontOn.png old mode 100755 new mode 100644 index 1f292d2bd..8e34732b3 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryLeft.png new file mode 100644 index 000000000..8f08b1999 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryLeftOn.png new file mode 100644 index 000000000..9ef9e847b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryRight.png new file mode 100644 index 000000000..0c162ff5e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryRightOn.png new file mode 100644 index 000000000..83ff48c4f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryTop.png new file mode 100644 index 000000000..df549383c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryTopOn.png new file mode 100644 index 000000000..92e9014bd Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryBack.png new file mode 100644 index 000000000..eaaa0afc1 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryBackOn.png new file mode 100644 index 000000000..20d26dc02 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryFront.png old mode 100755 new mode 100644 index c89e79777..c48a5af2c Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryFront.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryFrontOn.png old mode 100755 new mode 100644 index 642303697..8739a94e0 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryLeft.png new file mode 100644 index 000000000..b9e2a0eea Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryLeftOn.png new file mode 100644 index 000000000..64615556c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryRight.png new file mode 100644 index 000000000..03f9ff2bc Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryRightOn.png new file mode 100644 index 000000000..9fa82c0d1 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryTop.png new file mode 100644 index 000000000..57b7cbd39 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryTopOn.png new file mode 100644 index 000000000..2ab44a59c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryBack.png new file mode 100644 index 000000000..32aa039cc Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryBackOn.png new file mode 100644 index 000000000..864b081c5 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFront.png old mode 100755 new mode 100644 index 4b9ec711a..1aa2b828a Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFront.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFrontOn.png old mode 100755 new mode 100644 index f537a6512..7d5402378 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFrontOn.png.mcmeta old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryLeft.png new file mode 100644 index 000000000..03871d142 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryLeftOn.png new file mode 100644 index 000000000..fbb4dda78 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryRight.png new file mode 100644 index 000000000..3530d118d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryRightOn.png new file mode 100644 index 000000000..9c69ea1e9 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryTop.png new file mode 100644 index 000000000..b6c582b76 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryTopOn.png new file mode 100644 index 000000000..515c3effd Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryBottom.png old mode 100755 new mode 100644 index cdf498a6d..5e75b07d0 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryBottom.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactorySide.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactorySide.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryTop.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryBack.png new file mode 100644 index 000000000..fdd782204 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryBackOn.png new file mode 100644 index 000000000..2dd75fbea Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFront.png old mode 100755 new mode 100644 index 70de7f6f7..417d6ae5d Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFront.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFrontOn.png old mode 100755 new mode 100644 index b37141091..96fbe1520 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFrontOn.png.mcmeta old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryLeft.png new file mode 100644 index 000000000..cbb946b73 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryLeftOn.png new file mode 100644 index 000000000..e938a93da Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryRight.png new file mode 100644 index 000000000..773e79e96 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryRightOn.png new file mode 100644 index 000000000..1fe335ebd Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryTop.png new file mode 100644 index 000000000..88cc06aef Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryTopOn.png new file mode 100644 index 000000000..4ec82faef Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryBack.png new file mode 100644 index 000000000..757cc7c6d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryBackOn.png new file mode 100644 index 000000000..4599ecae2 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFront.png old mode 100755 new mode 100644 index dd777354b..13049268a Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFront.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFrontOn.png old mode 100755 new mode 100644 index a8a266e98..ce420b655 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFrontOn.png.mcmeta old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryLeft.png new file mode 100644 index 000000000..de0295891 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryLeftOn.png new file mode 100644 index 000000000..727999114 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryRight.png new file mode 100644 index 000000000..8a3e26ddb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryRightOn.png new file mode 100644 index 000000000..a0671c12e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryTop.png new file mode 100644 index 000000000..2a6a8a04b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryTopOn.png new file mode 100644 index 000000000..5051451a4 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryBack.png new file mode 100644 index 000000000..6b16e65bb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryBackOn.png new file mode 100644 index 000000000..24a1c552b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFront.png old mode 100755 new mode 100644 index da5872802..78fe9ed21 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFront.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFrontOn.png old mode 100755 new mode 100644 index b26f7930f..4e7e7a2f1 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFrontOn.png.mcmeta old mode 100755 new mode 100644 index 24f9c2fae..1a6cca1a1 --- a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFrontOn.png.mcmeta +++ b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFrontOn.png.mcmeta @@ -1,5 +1,25 @@ { "animation": { - "frametime": 1 + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 10, + 7, + 4, + 1, + 0, + 0 + ] } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryLeft.png new file mode 100644 index 000000000..e318b7ce8 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryLeftOn.png new file mode 100644 index 000000000..1277ae928 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryLeftOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryLeftOn.png.mcmeta new file mode 100644 index 000000000..1a6cca1a1 --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryLeftOn.png.mcmeta @@ -0,0 +1,25 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 10, + 7, + 4, + 1, + 0, + 0 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryRight.png new file mode 100644 index 000000000..633ffb727 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryRightOn.png new file mode 100644 index 000000000..efe053ac1 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryRightOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryRightOn.png.mcmeta new file mode 100644 index 000000000..1a6cca1a1 --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryRightOn.png.mcmeta @@ -0,0 +1,25 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 10, + 7, + 4, + 1, + 0, + 0 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryTop.png new file mode 100644 index 000000000..f0ec6afa3 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryTopOn.png new file mode 100644 index 000000000..1ed032c25 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryBack.png new file mode 100644 index 000000000..600d535f4 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryBackOn.png new file mode 100644 index 000000000..81dfcd81c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryFront.png old mode 100755 new mode 100644 index 3c4dbe028..b65ca5ecb Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryFront.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryFrontOn.png old mode 100755 new mode 100644 index 930698a8e..952cf76d0 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryLeft.png new file mode 100644 index 000000000..a96baa566 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryLeftOn.png new file mode 100644 index 000000000..b5874a258 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryRight.png new file mode 100644 index 000000000..66d460e80 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryRightOn.png new file mode 100644 index 000000000..b22146e8f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryTop.png new file mode 100644 index 000000000..3fd2d0f4f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryTopOn.png new file mode 100644 index 000000000..5af24e0d4 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryBack.png new file mode 100644 index 000000000..cdc26a1b1 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryBackOn.png new file mode 100644 index 000000000..41489c143 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryBottom.png new file mode 100644 index 000000000..90b8520fc Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryFront.png new file mode 100644 index 000000000..fe77845fa Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryFrontOn.png new file mode 100644 index 000000000..4b7889031 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryLeft.png new file mode 100644 index 000000000..4e38bd3dd Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryLeftOn.png new file mode 100644 index 000000000..21daebf3e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryRight.png new file mode 100644 index 000000000..dfe0c0bfa Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryRightOn.png new file mode 100644 index 000000000..f5ed9f3ba Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryTop.png new file mode 100644 index 000000000..d6859dc7d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryTopOn.png new file mode 100644 index 000000000..b7e81c79d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryBack.png new file mode 100644 index 000000000..8d6741a58 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryBackOn.png new file mode 100644 index 000000000..d00dbd62e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryBottom.png new file mode 100644 index 000000000..4a1079806 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryFront.png old mode 100755 new mode 100644 index f46a5d9c2..0e05757b1 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryFront.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryFrontOn.png old mode 100755 new mode 100644 index d10ad9a12..dbf628bc3 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryLeft.png new file mode 100644 index 000000000..7c1635164 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryLeftOn.png new file mode 100644 index 000000000..9287374e6 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryRight.png new file mode 100644 index 000000000..53f47ef79 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryRightOn.png new file mode 100644 index 000000000..0920121f3 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryTop.png new file mode 100644 index 000000000..cb2a18605 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryTopOn.png new file mode 100644 index 000000000..561d76b92 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryBack.png new file mode 100644 index 000000000..bd2b058ed Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryBackOn.png new file mode 100644 index 000000000..39e5a0908 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryFront.png old mode 100755 new mode 100644 index 2f22aab93..fc4c1a5ad Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryFront.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryFrontOn.png old mode 100755 new mode 100644 index e9b8168cb..7a7238487 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryLeft.png new file mode 100644 index 000000000..dad7361bf Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryLeftOn.png new file mode 100644 index 000000000..4d15a0f89 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryRight.png new file mode 100644 index 000000000..dd2c9645b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryRightOn.png new file mode 100644 index 000000000..4bd383294 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryTop.png new file mode 100644 index 000000000..e474812a1 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryTopOn.png new file mode 100644 index 000000000..78c6795d0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryBack.png new file mode 100644 index 000000000..84e064fb3 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryBackOn.png new file mode 100644 index 000000000..b90a2b5d3 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFront.png old mode 100755 new mode 100644 index c6cd7e238..ffd049709 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFront.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFrontOn.png old mode 100755 new mode 100644 index aedfacc76..35ce245a8 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFrontOn.png.mcmeta old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryLeft.png new file mode 100644 index 000000000..8137ff34d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryLeftOn.png new file mode 100644 index 000000000..48a083fcc Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryRight.png new file mode 100644 index 000000000..c2276bb2c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryRightOn.png new file mode 100644 index 000000000..f888fa57f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryTop.png new file mode 100644 index 000000000..95b9a7bb6 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryTopOn.png new file mode 100644 index 000000000..c2385d08f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryBottom.png old mode 100755 new mode 100644 index 491eda5ec..5e75b07d0 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryBottom.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactorySide.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactorySide.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryTop.png old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryBack.png new file mode 100644 index 000000000..ad5b42e92 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryBackOn.png new file mode 100644 index 000000000..dd1517e1f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFront.png old mode 100755 new mode 100644 index 01fadc417..dc105a83b Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFront.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFrontOn.png old mode 100755 new mode 100644 index 9940312a1..058e483bb Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFrontOn.png.mcmeta old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryLeft.png new file mode 100644 index 000000000..352b9f648 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryLeftOn.png new file mode 100644 index 000000000..176b43459 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryRight.png new file mode 100644 index 000000000..61601fd49 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryRightOn.png new file mode 100644 index 000000000..0245d32a1 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryTop.png new file mode 100644 index 000000000..4ecafc799 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryTopOn.png new file mode 100644 index 000000000..8914dd001 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryBack.png new file mode 100644 index 000000000..362a6bb0e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryBackOn.png new file mode 100644 index 000000000..86d08910b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFront.png old mode 100755 new mode 100644 index 23dc2f5f8..c0747008e Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFront.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFrontOn.png old mode 100755 new mode 100644 index 393782231..88e66499c Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFrontOn.png.mcmeta old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryLeft.png new file mode 100644 index 000000000..89b9afd2e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryLeftOn.png new file mode 100644 index 000000000..81b14b09d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryRight.png new file mode 100644 index 000000000..1bf559129 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryRightOn.png new file mode 100644 index 000000000..4b21aabad Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryTop.png new file mode 100644 index 000000000..d444e147e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryTopOn.png new file mode 100644 index 000000000..e887d101d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryBack.png new file mode 100644 index 000000000..c2bb8ff7e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryBackOn.png new file mode 100644 index 000000000..ebf8057ec Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFront.png old mode 100755 new mode 100644 index f7aec3730..dcada5c61 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFront.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFrontOn.png old mode 100755 new mode 100644 index d8d39e221..601753b4d Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFrontOn.png.mcmeta old mode 100755 new mode 100644 index 24f9c2fae..1a6cca1a1 --- a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFrontOn.png.mcmeta +++ b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFrontOn.png.mcmeta @@ -1,5 +1,25 @@ { "animation": { - "frametime": 1 + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 10, + 7, + 4, + 1, + 0, + 0 + ] } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryLeft.png new file mode 100644 index 000000000..0a125e738 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryLeftOn.png new file mode 100644 index 000000000..1f96e3e3b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryLeftOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryLeftOn.png.mcmeta new file mode 100644 index 000000000..1a6cca1a1 --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryLeftOn.png.mcmeta @@ -0,0 +1,25 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 10, + 7, + 4, + 1, + 0, + 0 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryRight.png new file mode 100644 index 000000000..6f9a6af84 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryRightOn.png new file mode 100644 index 000000000..733bbab69 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryRightOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryRightOn.png.mcmeta new file mode 100644 index 000000000..1a6cca1a1 --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryRightOn.png.mcmeta @@ -0,0 +1,25 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 10, + 7, + 4, + 1, + 0, + 0 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryTop.png new file mode 100644 index 000000000..e989c1109 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryTopOn.png new file mode 100644 index 000000000..92065865d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryBack.png new file mode 100644 index 000000000..36e2685e9 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryBackOn.png new file mode 100644 index 000000000..b05e68876 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryFront.png old mode 100755 new mode 100644 index fcce7ffd4..cc6862231 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryFront.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryFrontOn.png old mode 100755 new mode 100644 index 949f65acd..abdc774f1 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryLeft.png new file mode 100644 index 000000000..dcf1c5bed Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryLeftOn.png new file mode 100644 index 000000000..e148591e4 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryRight.png new file mode 100644 index 000000000..277099a35 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryRightOn.png new file mode 100644 index 000000000..8b53f1479 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryTop.png new file mode 100644 index 000000000..4ed9e8bb9 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryTopOn.png new file mode 100644 index 000000000..848934d6a Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryBack.png new file mode 100644 index 000000000..68e9dbddb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryBackOn.png new file mode 100644 index 000000000..e61123ceb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryFront.png new file mode 100644 index 000000000..68631438a Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryFrontOn.png new file mode 100644 index 000000000..43603331e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryLeft.png new file mode 100644 index 000000000..980fb263b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryLeftOn.png new file mode 100644 index 000000000..874ac9020 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryRight.png new file mode 100644 index 000000000..126a658b9 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryRightOn.png new file mode 100644 index 000000000..fc5167429 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryTop.png new file mode 100644 index 000000000..567883b07 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryTopOn.png new file mode 100644 index 000000000..9a140950d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryBack.png new file mode 100644 index 000000000..171f36fe4 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryBackOn.png new file mode 100644 index 000000000..6a6d9ea6a Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryFront.png old mode 100755 new mode 100644 index c9318fc7a..01ad9a198 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryFront.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryFrontOn.png old mode 100755 new mode 100644 index 14b8620e3..c4d1b48f9 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryLeft.png new file mode 100644 index 000000000..480468466 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryLeftOn.png new file mode 100644 index 000000000..80675327e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryRight.png new file mode 100644 index 000000000..92043ce27 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryRightOn.png new file mode 100644 index 000000000..f7a5739fa Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryTop.png new file mode 100644 index 000000000..b153fbd9b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryTopOn.png new file mode 100644 index 000000000..4c97664ea Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryBack.png new file mode 100644 index 000000000..12f36c044 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryBackOn.png new file mode 100644 index 000000000..ce7304ecb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryFront.png old mode 100755 new mode 100644 index a398bed5d..4f707c429 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryFront.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryFrontOn.png old mode 100755 new mode 100644 index 699dfba9f..770505067 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryLeft.png new file mode 100644 index 000000000..b0ca863f2 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryLeftOn.png new file mode 100644 index 000000000..28d1f63fc Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryRight.png new file mode 100644 index 000000000..6275341ce Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryRightOn.png new file mode 100644 index 000000000..0be95632e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryTop.png new file mode 100644 index 000000000..89022eb38 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryTopOn.png new file mode 100644 index 000000000..fa2ffe7a0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryBack.png new file mode 100644 index 000000000..626e3a7de Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryBackOn.png new file mode 100644 index 000000000..3c35deced Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFront.png old mode 100755 new mode 100644 index 79a3e269c..3946c1147 Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFront.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFrontOn.png old mode 100755 new mode 100644 index ce0f626c2..b21eb883c Binary files a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFrontOn.png.mcmeta old mode 100755 new mode 100644 diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryLeft.png new file mode 100644 index 000000000..b58ddb09d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryLeftOn.png new file mode 100644 index 000000000..8ec168e0d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryRight.png new file mode 100644 index 000000000..ad0362eaa Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryRightOn.png new file mode 100644 index 000000000..c746b33bb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryTop.png new file mode 100644 index 000000000..0e40eb9f0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryTopOn.png new file mode 100644 index 000000000..b21f7003c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorBack.png b/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorBack.png new file mode 100644 index 000000000..3e773c5ff Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorBottom.png b/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorBottom.png new file mode 100644 index 000000000..09c3ae6e5 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorFront.png b/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorFront.png new file mode 100644 index 000000000..bcd24ccbc Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorLeft.png b/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorLeft.png new file mode 100644 index 000000000..d9153af6e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorRight.png b/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorRight.png new file mode 100644 index 000000000..4da4a8e2d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorTop.png b/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorTop.png new file mode 100644 index 000000000..963221376 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorTop.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 new file mode 100644 index 000000000..cc7b6cddb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/HeatTransmitter.png 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 new file mode 100644 index 000000000..73906f050 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporter.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterAdvanced.png index 76a3eb935..fc151f0e8 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterAdvanced.png and b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterBasic.png index 21ce6ed93..0db4a2a15 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterBasic.png and b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterElite.png index cf860b4f9..ca7f61796 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterElite.png and b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterGlass.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterGlass.png index 6889a646a..7d24d36fb 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterGlass.png and b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterGlass.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 new file mode 100644 index 000000000..4d4e0a510 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontal.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontalAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontalAdvanced.png index 679ae9974..22045422c 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontalAdvanced.png and b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontalAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontalBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontalBasic.png index 7013df76c..e8fcee048 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontalBasic.png and b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontalBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontalElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontalElite.png index 9f7fcec55..1f74a36fe 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontalElite.png and b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontalElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontalGlass.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontalGlass.png index e6d483f36..c34ea126b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontalGlass.png and b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontalGlass.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontalUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontalUltimate.png index 01b31961a..ae18668ae 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontalUltimate.png and b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontalUltimate.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 new file mode 100644 index 000000000..d63d60bbd Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterSide.png 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 new file mode 100644 index 000000000..a942f82ca Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterSide_HAFX_Oct-28-232850-2015_Conflict.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterUltimate.png index f64daddbc..b1e10324f 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterUltimate.png and b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterUltimate.png 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 new file mode 100644 index 000000000..fc05d6958 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVertical.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVerticalAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVerticalAdvanced.png index 2ecca65e7..0fce09d26 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVerticalAdvanced.png and b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVerticalAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVerticalBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVerticalBasic.png index 9d9ec8423..595864edb 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVerticalBasic.png and b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVerticalBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVerticalElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVerticalElite.png index 728b952fb..67c36a060 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVerticalElite.png and b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVerticalElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVerticalGlass.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVerticalGlass.png index 6d2f8254d..90ea0180b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVerticalGlass.png and b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVerticalGlass.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVerticalUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVerticalUltimate.png index 5feaafabc..33c0bd564 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVerticalUltimate.png and b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVerticalUltimate.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 new file mode 100644 index 000000000..ffc141b97 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeAdvanced_HAFX_Oct-28-232851-2015_Conflict.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 new file mode 100644 index 000000000..fa9415ea7 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeBasic_HAFX_Oct-28-232851-2015_Conflict.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 new file mode 100644 index 000000000..13f991f07 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeElite_HAFX_Oct-28-232852-2015_Conflict.png 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 new file mode 100644 index 000000000..bab0e8bee Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeHorizontal.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeHorizontalAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeHorizontalAdvanced.png index a95859b50..dca02bb7c 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeHorizontalAdvanced.png and b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeHorizontalAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeHorizontalBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeHorizontalBasic.png index 78b0d9f7c..40f25cfa0 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeHorizontalBasic.png and b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeHorizontalBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeHorizontalElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeHorizontalElite.png index 9e4f9f475..8c48c35f4 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeHorizontalElite.png and b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeHorizontalElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeHorizontalUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeHorizontalUltimate.png index cb9bcb551..f4a3a859e 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeHorizontalUltimate.png and b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeHorizontalUltimate.png 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 new file mode 100644 index 000000000..7a953c1fb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeSide.png 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 new file mode 100644 index 000000000..846f3d8cd Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeSide_HAFX_Oct-28-232851-2015_Conflict.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 new file mode 100644 index 000000000..61754ff9a Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeUltimate_HAFX_Oct-28-232853-2015_Conflict.png 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 new file mode 100644 index 000000000..7b532bed7 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeVertical.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeVerticalAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeVerticalAdvanced.png index b6ee819dc..532fb32be 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeVerticalAdvanced.png and b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeVerticalAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeVerticalBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeVerticalBasic.png index ba6f1bc37..c7d020dec 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeVerticalBasic.png and b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeVerticalBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeVerticalElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeVerticalElite.png index 3771aebbf..00dde5ef1 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeVerticalElite.png and b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeVerticalElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeVerticalUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeVerticalUltimate.png index 3c016befe..0aadda73b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeVerticalUltimate.png and b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeVerticalUltimate.png 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 new file mode 100644 index 000000000..ae840c2af Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTube.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeAdvanced.png index f3af5a846..1a11715a4 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeAdvanced.png and b/src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeBasic.png index b6eceb157..8bf698c9b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeBasic.png and b/src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeElite.png index 0c72971f5..5fc1b2b8b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeElite.png and b/src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeUltimate.png index 5b5ef0451..6c5a8b3b1 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeUltimate.png and b/src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeUltimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/RestrictiveTransporterSide.png b/src/main/resources/assets/mekanism/textures/blocks/models/RestrictiveTransporterSide.png new file mode 100644 index 000000000..862823301 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/RestrictiveTransporterSide.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 new file mode 100644 index 000000000..63d245278 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontal.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontalAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontalAdvanced.png index 477f51ab2..b4f392dbf 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontalAdvanced.png and b/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontalAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontalBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontalBasic.png index 3a0393837..89a8395de 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontalBasic.png and b/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontalBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontalElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontalElite.png index 5e88732bf..b5e295308 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontalElite.png and b/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontalElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontalUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontalUltimate.png index e7b36364a..edf1ca6a2 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontalUltimate.png and b/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontalUltimate.png 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 new file mode 100644 index 000000000..3f9cd51f0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVertical.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVerticalAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVerticalAdvanced.png index a0bbf662a..b5c540838 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVerticalAdvanced.png and b/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVerticalAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVerticalBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVerticalBasic.png index 4b0b0c131..96a66c139 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVerticalBasic.png and b/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVerticalBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVerticalElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVerticalElite.png index be049af01..9e6943228 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVerticalElite.png and b/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVerticalElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVerticalUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVerticalUltimate.png index 24352b084..e27fd30ee 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVerticalUltimate.png and b/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVerticalUltimate.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 new file mode 100644 index 000000000..a6debc302 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/TransmitterSideSmall.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorBack.png b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorBack.png index c00b014d8..d213a8f32 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorBack.png and b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorBottom.png b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorBottom.png new file mode 100644 index 000000000..a17136032 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorFront.png b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorFront.png index 54b7378ce..b2524d847 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorFront.png and b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorLeft.png b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorLeft.png index 7331844d7..871e5b9d4 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorLeft.png and b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorRight.png b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorRight.png index 7331844d7..4ac3ef054 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorRight.png and b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorSide.png b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorSide.png deleted file mode 100644 index 0e8e8c16a..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorSide.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorTop.png b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorTop.png new file mode 100644 index 000000000..b5bb7e66e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorBack.png b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorBack.png new file mode 100644 index 000000000..3c5105deb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorBackOn.png new file mode 100644 index 000000000..19377ad57 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorBottom.png b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorBottom.png new file mode 100644 index 000000000..69b57d9dd Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFront.png b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFront.png index 2f52c4143..c953b8b63 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFront.png and b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFrontOn.png index b99d00592..a95e69bad 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorLeft.png b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorLeft.png new file mode 100644 index 000000000..dc7909bb2 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorLeftOn.png new file mode 100644 index 000000000..90dbfa03d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorRight.png b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorRight.png new file mode 100644 index 000000000..6b4df53ba Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorRightOn.png new file mode 100644 index 000000000..391b509df Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorTop.png b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorTop.png new file mode 100644 index 000000000..4193ef106 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorTopOn.png new file mode 100644 index 000000000..4ad673dd7 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayAqua.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayAqua.png new file mode 100644 index 000000000..7e9aac3d6 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayAqua.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBlack.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBlack.png new file mode 100644 index 000000000..e7727360f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBlack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrightGreen.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrightGreen.png new file mode 100644 index 000000000..6925b85aa Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrightGreen.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrightPink.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrightPink.png new file mode 100644 index 000000000..7588349f3 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrightPink.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrown.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrown.png new file mode 100644 index 000000000..a346b1d41 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrown.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkAqua.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkAqua.png new file mode 100644 index 000000000..54b025962 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkAqua.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkBlue.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkBlue.png new file mode 100644 index 000000000..8cce9d4b9 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkBlue.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkGreen.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkGreen.png new file mode 100644 index 000000000..ff58d83d8 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkGreen.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkGrey.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkGrey.png new file mode 100644 index 000000000..1836d4f26 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkGrey.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkRed.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkRed.png new file mode 100644 index 000000000..82fc0ec94 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkRed.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayGrey.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayGrey.png new file mode 100644 index 000000000..1567e0dfa Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayGrey.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayIndigo.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayIndigo.png new file mode 100644 index 000000000..474a79490 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayIndigo.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayOrange.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayOrange.png new file mode 100644 index 000000000..f45c3d738 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayOrange.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayPink.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayPink.png new file mode 100644 index 000000000..75eb19c5e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayPink.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayPurple.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayPurple.png new file mode 100644 index 000000000..10bf8b883 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayPurple.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayRed.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayRed.png new file mode 100644 index 000000000..5d5c84332 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayRed.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayWhite.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayWhite.png new file mode 100644 index 000000000..044809b2c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayWhite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayYellow.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayYellow.png new file mode 100644 index 000000000..414ce4827 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayYellow.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillBack.png b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillBack.png new file mode 100644 index 000000000..545c0cc6c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillBackOn.png new file mode 100644 index 000000000..261988fe5 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillBackOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillBackOn.png.mcmeta new file mode 100644 index 000000000..4ac3fbebb --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillBackOn.png.mcmeta @@ -0,0 +1,10 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillBottom.png b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillBottom.png new file mode 100644 index 000000000..91740af27 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillFront.png b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillFront.png index bf970210c..7e1993c0e 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillFront.png and b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillFrontOn.png index a3b6dff12..22385253f 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillLeft.png b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillLeft.png new file mode 100644 index 000000000..7a4f69a17 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillLeftOn.png new file mode 100644 index 000000000..b546f7a8a Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillLeftOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillLeftOn.png.mcmeta new file mode 100644 index 000000000..24f9c2fae --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillLeftOn.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillRight.png b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillRight.png new file mode 100644 index 000000000..27ba87217 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillRightOn.png new file mode 100644 index 000000000..dd441ac27 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillRightOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillRightOn.png.mcmeta new file mode 100644 index 000000000..4ac3fbebb --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillRightOn.png.mcmeta @@ -0,0 +1,10 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillTop.png b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillTop.png new file mode 100644 index 000000000..3b23724a3 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillTopOn.png new file mode 100644 index 000000000..136f3b4a4 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillTopOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillTopOn.png.mcmeta new file mode 100644 index 000000000..99a1d4967 --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillTopOn.png.mcmeta @@ -0,0 +1,11 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberBack.png b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberBack.png new file mode 100644 index 000000000..5386df502 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberBackOn.png new file mode 100644 index 000000000..ad3eaee27 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberBottom.png b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberBottom.png new file mode 100644 index 000000000..f79899dbb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberFront.png b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberFront.png index ce5b7f36b..6d919e940 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberFront.png and b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberFrontOn.png index 4e074459b..ab546308b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberLeft.png b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberLeft.png new file mode 100644 index 000000000..905051282 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberLeftOn.png new file mode 100644 index 000000000..119b55aba Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberRight.png b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberRight.png new file mode 100644 index 000000000..6491c41f3 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberRightOn.png new file mode 100644 index 000000000..02bdbd032 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberTop.png b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberTop.png new file mode 100644 index 000000000..fa5628750 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberTopOn.png new file mode 100644 index 000000000..a85ee3e8a Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/AdvancedControlCircuit.png b/src/main/resources/assets/mekanism/textures/items/AdvancedControlCircuit.png index d9aedf653..db575ea2e 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/AdvancedControlCircuit.png and b/src/main/resources/assets/mekanism/textures/items/AdvancedControlCircuit.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/AdvancedFactoryInstaller.png b/src/main/resources/assets/mekanism/textures/items/AdvancedFactoryInstaller.png index 27a40e995..4920bd792 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/AdvancedFactoryInstaller.png and b/src/main/resources/assets/mekanism/textures/items/AdvancedFactoryInstaller.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/AtomicAlloy.png b/src/main/resources/assets/mekanism/textures/items/AtomicAlloy.png index 6a9daad49..ad65e1b5f 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/AtomicAlloy.png and b/src/main/resources/assets/mekanism/textures/items/AtomicAlloy.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/BasicControlCircuit.png b/src/main/resources/assets/mekanism/textures/items/BasicControlCircuit.png index 781448bdb..8fd67b58b 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/BasicControlCircuit.png and b/src/main/resources/assets/mekanism/textures/items/BasicControlCircuit.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/BasicFactoryInstaller.png b/src/main/resources/assets/mekanism/textures/items/BasicFactoryInstaller.png index 66954141a..800376d4f 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/BasicFactoryInstaller.png and b/src/main/resources/assets/mekanism/textures/items/BasicFactoryInstaller.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/BioFuel.png b/src/main/resources/assets/mekanism/textures/items/BioFuel.png index d8ed495eb..c5f7b8264 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/BioFuel.png and b/src/main/resources/assets/mekanism/textures/items/BioFuel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/BronzeAxe.png b/src/main/resources/assets/mekanism/textures/items/BronzeAxe.png index f21740c69..1ac7fce51 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/BronzeAxe.png and b/src/main/resources/assets/mekanism/textures/items/BronzeAxe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/BronzeBoots.png b/src/main/resources/assets/mekanism/textures/items/BronzeBoots.png index d7f8b97c9..ede734e82 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/BronzeBoots.png and b/src/main/resources/assets/mekanism/textures/items/BronzeBoots.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/BronzeChestplate.png b/src/main/resources/assets/mekanism/textures/items/BronzeChestplate.png index 13cdafa67..d9bff9325 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/BronzeChestplate.png and b/src/main/resources/assets/mekanism/textures/items/BronzeChestplate.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/BronzeHelmet.png b/src/main/resources/assets/mekanism/textures/items/BronzeHelmet.png index 150053edc..9749faf7d 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/BronzeHelmet.png and b/src/main/resources/assets/mekanism/textures/items/BronzeHelmet.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/BronzeHoe.png b/src/main/resources/assets/mekanism/textures/items/BronzeHoe.png index f8b60673e..b89068a0a 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/BronzeHoe.png and b/src/main/resources/assets/mekanism/textures/items/BronzeHoe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/BronzeIngot.png b/src/main/resources/assets/mekanism/textures/items/BronzeIngot.png index 220bff74a..6e2545df3 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/BronzeIngot.png and b/src/main/resources/assets/mekanism/textures/items/BronzeIngot.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/BronzeLeggings.png b/src/main/resources/assets/mekanism/textures/items/BronzeLeggings.png index 958849dcc..2ac8b853b 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/BronzeLeggings.png and b/src/main/resources/assets/mekanism/textures/items/BronzeLeggings.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/BronzePaxel.png b/src/main/resources/assets/mekanism/textures/items/BronzePaxel.png index 39e5cc216..03b5b5bd5 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/BronzePaxel.png and b/src/main/resources/assets/mekanism/textures/items/BronzePaxel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/BronzePickaxe.png b/src/main/resources/assets/mekanism/textures/items/BronzePickaxe.png index 025d09fec..cc931f124 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/BronzePickaxe.png and b/src/main/resources/assets/mekanism/textures/items/BronzePickaxe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/BronzeShovel.png b/src/main/resources/assets/mekanism/textures/items/BronzeShovel.png index d368cccb7..e1c361e88 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/BronzeShovel.png and b/src/main/resources/assets/mekanism/textures/items/BronzeShovel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/BronzeSword.png b/src/main/resources/assets/mekanism/textures/items/BronzeSword.png index fd37539ec..6ad9ae74c 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/BronzeSword.png and b/src/main/resources/assets/mekanism/textures/items/BronzeSword.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/CompressedCarbon.png b/src/main/resources/assets/mekanism/textures/items/CompressedCarbon.png index b26af0d26..36644b5d4 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/CompressedCarbon.png and b/src/main/resources/assets/mekanism/textures/items/CompressedCarbon.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/CompressedDiamond.png b/src/main/resources/assets/mekanism/textures/items/CompressedDiamond.png index d8274fef2..9d2e009b9 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/CompressedDiamond.png and b/src/main/resources/assets/mekanism/textures/items/CompressedDiamond.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/CompressedObsidian.png b/src/main/resources/assets/mekanism/textures/items/CompressedObsidian.png index 90d4e97eb..3e18a2245 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/CompressedObsidian.png and b/src/main/resources/assets/mekanism/textures/items/CompressedObsidian.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/CompressedRedstone.png b/src/main/resources/assets/mekanism/textures/items/CompressedRedstone.png index f2f640b5e..246cec43d 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/CompressedRedstone.png and b/src/main/resources/assets/mekanism/textures/items/CompressedRedstone.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ConfigurationCard.png b/src/main/resources/assets/mekanism/textures/items/ConfigurationCard.png index 5370ea6e9..40999e7d0 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ConfigurationCard.png and b/src/main/resources/assets/mekanism/textures/items/ConfigurationCard.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/Configurator.png b/src/main/resources/assets/mekanism/textures/items/Configurator.png index 66029cdf4..60fdb013c 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/Configurator.png and b/src/main/resources/assets/mekanism/textures/items/Configurator.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/Configurator_Alt.png b/src/main/resources/assets/mekanism/textures/items/Configurator_Alt.png new file mode 100644 index 000000000..36c7ef1d6 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/items/Configurator_Alt.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/CopperClump.png b/src/main/resources/assets/mekanism/textures/items/CopperClump.png index 91b62056a..c8fad5ce9 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/CopperClump.png and b/src/main/resources/assets/mekanism/textures/items/CopperClump.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/CopperCrystal.png b/src/main/resources/assets/mekanism/textures/items/CopperCrystal.png index e67b3c7bc..8a6b56d32 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/CopperCrystal.png and b/src/main/resources/assets/mekanism/textures/items/CopperCrystal.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/CopperDust.png b/src/main/resources/assets/mekanism/textures/items/CopperDust.png index 45c19c1ee..c5ccdb1d8 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/CopperDust.png and b/src/main/resources/assets/mekanism/textures/items/CopperDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/CopperIngot.png b/src/main/resources/assets/mekanism/textures/items/CopperIngot.png index a482c4d99..da7e582b6 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/CopperIngot.png and b/src/main/resources/assets/mekanism/textures/items/CopperIngot.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/CopperShard.png b/src/main/resources/assets/mekanism/textures/items/CopperShard.png index b49199961..3a04c3873 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/CopperShard.png and b/src/main/resources/assets/mekanism/textures/items/CopperShard.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/CraftingFormula.png b/src/main/resources/assets/mekanism/textures/items/CraftingFormula.png index 779e0d2e0..4efcc4894 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/CraftingFormula.png and b/src/main/resources/assets/mekanism/textures/items/CraftingFormula.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/CraftingFormulaEncoded.png b/src/main/resources/assets/mekanism/textures/items/CraftingFormulaEncoded.png index ca802ce64..86f96ea02 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/CraftingFormulaEncoded.png and b/src/main/resources/assets/mekanism/textures/items/CraftingFormulaEncoded.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/CraftingFormulaInvalid.png b/src/main/resources/assets/mekanism/textures/items/CraftingFormulaInvalid.png index ae37f53d8..1f38d119a 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/CraftingFormulaInvalid.png and b/src/main/resources/assets/mekanism/textures/items/CraftingFormulaInvalid.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/DiamondDust.png b/src/main/resources/assets/mekanism/textures/items/DiamondDust.png index 03d90195b..c845810bb 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/DiamondDust.png and b/src/main/resources/assets/mekanism/textures/items/DiamondDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/DiamondPaxel.png b/src/main/resources/assets/mekanism/textures/items/DiamondPaxel.png index 1fb848dcd..7131d0c39 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/DiamondPaxel.png and b/src/main/resources/assets/mekanism/textures/items/DiamondPaxel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/Dictionary.png b/src/main/resources/assets/mekanism/textures/items/Dictionary.png index 3b4a09c35..fc398d4d3 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/Dictionary.png and b/src/main/resources/assets/mekanism/textures/items/Dictionary.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/DirtyCopperDust.png b/src/main/resources/assets/mekanism/textures/items/DirtyCopperDust.png index ad4f6c10c..3199f30c2 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/DirtyCopperDust.png and b/src/main/resources/assets/mekanism/textures/items/DirtyCopperDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/DirtyGoldDust.png b/src/main/resources/assets/mekanism/textures/items/DirtyGoldDust.png index 061b236b3..373c20b99 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/DirtyGoldDust.png and b/src/main/resources/assets/mekanism/textures/items/DirtyGoldDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/DirtyIronDust.png b/src/main/resources/assets/mekanism/textures/items/DirtyIronDust.png index debc9df53..9e1631efc 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/DirtyIronDust.png and b/src/main/resources/assets/mekanism/textures/items/DirtyIronDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/DirtyLeadDust.png b/src/main/resources/assets/mekanism/textures/items/DirtyLeadDust.png index 40e31ce1c..8cdfb1065 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/DirtyLeadDust.png and b/src/main/resources/assets/mekanism/textures/items/DirtyLeadDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/DirtyObsidianDust.png b/src/main/resources/assets/mekanism/textures/items/DirtyObsidianDust.png new file mode 100644 index 000000000..79018e1a9 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/items/DirtyObsidianDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/DirtyOsmiumDust.png b/src/main/resources/assets/mekanism/textures/items/DirtyOsmiumDust.png index e44fb488f..8e7885fd7 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/DirtyOsmiumDust.png and b/src/main/resources/assets/mekanism/textures/items/DirtyOsmiumDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/DirtySilverDust.png b/src/main/resources/assets/mekanism/textures/items/DirtySilverDust.png index e129be66e..2e14ad099 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/DirtySilverDust.png and b/src/main/resources/assets/mekanism/textures/items/DirtySilverDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/DirtyTinDust.png b/src/main/resources/assets/mekanism/textures/items/DirtyTinDust.png index 85ee2f06e..f01fbee4d 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/DirtyTinDust.png and b/src/main/resources/assets/mekanism/textures/items/DirtyTinDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ElectricBow.png b/src/main/resources/assets/mekanism/textures/items/ElectricBow.png index 65b364811..7374cd148 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ElectricBow.png and b/src/main/resources/assets/mekanism/textures/items/ElectricBow.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ElectrolyticCore.png b/src/main/resources/assets/mekanism/textures/items/ElectrolyticCore.png index e3f75462e..e2a47b18e 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ElectrolyticCore.png and b/src/main/resources/assets/mekanism/textures/items/ElectrolyticCore.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/EliteControlCircuit.png b/src/main/resources/assets/mekanism/textures/items/EliteControlCircuit.png index 720c16464..02943787c 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/EliteControlCircuit.png and b/src/main/resources/assets/mekanism/textures/items/EliteControlCircuit.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/EliteFactoryInstaller.png b/src/main/resources/assets/mekanism/textures/items/EliteFactoryInstaller.png index 0ba1b50ad..ea0f39edf 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/EliteFactoryInstaller.png and b/src/main/resources/assets/mekanism/textures/items/EliteFactoryInstaller.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/EnergyTablet.png b/src/main/resources/assets/mekanism/textures/items/EnergyTablet.png index 4f47026d7..63a934e3c 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/EnergyTablet.png and b/src/main/resources/assets/mekanism/textures/items/EnergyTablet.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/EnergyTablet_Alt.png b/src/main/resources/assets/mekanism/textures/items/EnergyTablet_Alt.png new file mode 100644 index 000000000..db29cd8a5 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/items/EnergyTablet_Alt.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/EnergyUpgrade.png b/src/main/resources/assets/mekanism/textures/items/EnergyUpgrade.png index f1f8acdb5..52ff6e697 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/EnergyUpgrade.png and b/src/main/resources/assets/mekanism/textures/items/EnergyUpgrade.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/EnergyUpgrade_Alt.png b/src/main/resources/assets/mekanism/textures/items/EnergyUpgrade_Alt.png new file mode 100644 index 000000000..5ef8e2bf0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/items/EnergyUpgrade_Alt.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/EnrichedAlloy.png b/src/main/resources/assets/mekanism/textures/items/EnrichedAlloy.png index 1503625dd..64eb59522 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/EnrichedAlloy.png and b/src/main/resources/assets/mekanism/textures/items/EnrichedAlloy.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/EnrichedIron.png b/src/main/resources/assets/mekanism/textures/items/EnrichedIron.png index 528b9f69b..183478312 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/EnrichedIron.png and b/src/main/resources/assets/mekanism/textures/items/EnrichedIron.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/EnrichedIron_alt.png b/src/main/resources/assets/mekanism/textures/items/EnrichedIron_alt.png new file mode 100644 index 000000000..162b843b7 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/items/EnrichedIron_alt.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/FilterUpgrade.png b/src/main/resources/assets/mekanism/textures/items/FilterUpgrade.png index 74f69f181..28b8a83b3 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/FilterUpgrade.png and b/src/main/resources/assets/mekanism/textures/items/FilterUpgrade.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/FilterUpgrade_Alt1.png b/src/main/resources/assets/mekanism/textures/items/FilterUpgrade_Alt1.png new file mode 100644 index 000000000..b0b7cff73 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/items/FilterUpgrade_Alt1.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GasUpgrade.png b/src/main/resources/assets/mekanism/textures/items/GasUpgrade.png index be83d4918..0df142dd6 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GasUpgrade.png and b/src/main/resources/assets/mekanism/textures/items/GasUpgrade.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GaugeDropper.png b/src/main/resources/assets/mekanism/textures/items/GaugeDropper.png index ba0f4e422..dc074d776 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GaugeDropper.png and b/src/main/resources/assets/mekanism/textures/items/GaugeDropper.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GlowstoneAxe.png b/src/main/resources/assets/mekanism/textures/items/GlowstoneAxe.png index 9a7ec8623..4bcfe4d8a 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GlowstoneAxe.png and b/src/main/resources/assets/mekanism/textures/items/GlowstoneAxe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GlowstoneBoots.png b/src/main/resources/assets/mekanism/textures/items/GlowstoneBoots.png index 6531cf573..5eb2ec711 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GlowstoneBoots.png and b/src/main/resources/assets/mekanism/textures/items/GlowstoneBoots.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GlowstoneChestplate.png b/src/main/resources/assets/mekanism/textures/items/GlowstoneChestplate.png index 9166800c5..1ab7b7b6d 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GlowstoneChestplate.png and b/src/main/resources/assets/mekanism/textures/items/GlowstoneChestplate.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GlowstoneHelmet.png b/src/main/resources/assets/mekanism/textures/items/GlowstoneHelmet.png index a61d441ff..1050dfcd5 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GlowstoneHelmet.png and b/src/main/resources/assets/mekanism/textures/items/GlowstoneHelmet.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GlowstoneHoe.png b/src/main/resources/assets/mekanism/textures/items/GlowstoneHoe.png index cadc8920c..c205faab9 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GlowstoneHoe.png and b/src/main/resources/assets/mekanism/textures/items/GlowstoneHoe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GlowstoneIngot.png b/src/main/resources/assets/mekanism/textures/items/GlowstoneIngot.png index fa901456c..fdd05ef6c 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GlowstoneIngot.png and b/src/main/resources/assets/mekanism/textures/items/GlowstoneIngot.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GlowstoneLeggings.png b/src/main/resources/assets/mekanism/textures/items/GlowstoneLeggings.png index 1033c017e..695f0e5c6 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GlowstoneLeggings.png and b/src/main/resources/assets/mekanism/textures/items/GlowstoneLeggings.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GlowstonePaxel.png b/src/main/resources/assets/mekanism/textures/items/GlowstonePaxel.png index aa80ef86d..ca3bd644e 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GlowstonePaxel.png and b/src/main/resources/assets/mekanism/textures/items/GlowstonePaxel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GlowstonePickaxe.png b/src/main/resources/assets/mekanism/textures/items/GlowstonePickaxe.png index 95415a552..3329811d0 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GlowstonePickaxe.png and b/src/main/resources/assets/mekanism/textures/items/GlowstonePickaxe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GlowstoneShovel.png b/src/main/resources/assets/mekanism/textures/items/GlowstoneShovel.png index b20c25e84..5dec303e5 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GlowstoneShovel.png and b/src/main/resources/assets/mekanism/textures/items/GlowstoneShovel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GlowstoneSword.png b/src/main/resources/assets/mekanism/textures/items/GlowstoneSword.png index b22d64022..4b96a767b 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GlowstoneSword.png and b/src/main/resources/assets/mekanism/textures/items/GlowstoneSword.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GoldClump.png b/src/main/resources/assets/mekanism/textures/items/GoldClump.png index 636c9f207..7ddec43ff 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GoldClump.png and b/src/main/resources/assets/mekanism/textures/items/GoldClump.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GoldCrystal.png b/src/main/resources/assets/mekanism/textures/items/GoldCrystal.png index 3e5e2a1ee..8b6c49c85 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GoldCrystal.png and b/src/main/resources/assets/mekanism/textures/items/GoldCrystal.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GoldDust.png b/src/main/resources/assets/mekanism/textures/items/GoldDust.png index 60ad8d122..d4a3dd740 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GoldDust.png and b/src/main/resources/assets/mekanism/textures/items/GoldDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GoldPaxel.png b/src/main/resources/assets/mekanism/textures/items/GoldPaxel.png index 032f86691..a602973dc 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GoldPaxel.png and b/src/main/resources/assets/mekanism/textures/items/GoldPaxel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GoldShard.png b/src/main/resources/assets/mekanism/textures/items/GoldShard.png index 46e009774..9a5727727 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GoldShard.png and b/src/main/resources/assets/mekanism/textures/items/GoldShard.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/HDPEPellet.png b/src/main/resources/assets/mekanism/textures/items/HDPEPellet.png index 126c0ff88..368fc7bbe 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/HDPEPellet.png and b/src/main/resources/assets/mekanism/textures/items/HDPEPellet.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/HDPERod.png b/src/main/resources/assets/mekanism/textures/items/HDPERod.png index 59957229c..fd919c2b3 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/HDPERod.png and b/src/main/resources/assets/mekanism/textures/items/HDPERod.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/HDPESheet.png b/src/main/resources/assets/mekanism/textures/items/HDPESheet.png index fba24d766..8122679f1 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/HDPESheet.png and b/src/main/resources/assets/mekanism/textures/items/HDPESheet.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/Hohlraum.png b/src/main/resources/assets/mekanism/textures/items/Hohlraum.png index 954b503dc..c2f00487b 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/Hohlraum.png and b/src/main/resources/assets/mekanism/textures/items/Hohlraum.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/IronClump.png b/src/main/resources/assets/mekanism/textures/items/IronClump.png index d8cc35291..7a4808821 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/IronClump.png and b/src/main/resources/assets/mekanism/textures/items/IronClump.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/IronCrystal.png b/src/main/resources/assets/mekanism/textures/items/IronCrystal.png index b5c54634b..93ee21180 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/IronCrystal.png and b/src/main/resources/assets/mekanism/textures/items/IronCrystal.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/IronDust.png b/src/main/resources/assets/mekanism/textures/items/IronDust.png index 51067a44c..cf594c7df 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/IronDust.png and b/src/main/resources/assets/mekanism/textures/items/IronDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/IronPaxel.png b/src/main/resources/assets/mekanism/textures/items/IronPaxel.png index 53eac923d..63aee7b85 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/IronPaxel.png and b/src/main/resources/assets/mekanism/textures/items/IronPaxel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/IronShard.png b/src/main/resources/assets/mekanism/textures/items/IronShard.png index 0b0d5853e..417778eb8 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/IronShard.png and b/src/main/resources/assets/mekanism/textures/items/IronShard.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliAxe.png b/src/main/resources/assets/mekanism/textures/items/LazuliAxe.png index 2ed32ff19..61d69be57 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LazuliAxe.png and b/src/main/resources/assets/mekanism/textures/items/LazuliAxe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliBoots.png b/src/main/resources/assets/mekanism/textures/items/LazuliBoots.png index 95bbaf300..4048738e3 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LazuliBoots.png and b/src/main/resources/assets/mekanism/textures/items/LazuliBoots.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliChestplate.png b/src/main/resources/assets/mekanism/textures/items/LazuliChestplate.png index 85042a408..0ea8b9bcc 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LazuliChestplate.png and b/src/main/resources/assets/mekanism/textures/items/LazuliChestplate.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliHelmet.png b/src/main/resources/assets/mekanism/textures/items/LazuliHelmet.png index 1cfbf231f..2d619d802 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LazuliHelmet.png and b/src/main/resources/assets/mekanism/textures/items/LazuliHelmet.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliHoe.png b/src/main/resources/assets/mekanism/textures/items/LazuliHoe.png index 20c8e0e8f..cb36b363e 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LazuliHoe.png and b/src/main/resources/assets/mekanism/textures/items/LazuliHoe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliLeggings.png b/src/main/resources/assets/mekanism/textures/items/LazuliLeggings.png index 945f33376..8640b2f00 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LazuliLeggings.png and b/src/main/resources/assets/mekanism/textures/items/LazuliLeggings.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliPaxel.png b/src/main/resources/assets/mekanism/textures/items/LazuliPaxel.png index 993189079..912f45497 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LazuliPaxel.png and b/src/main/resources/assets/mekanism/textures/items/LazuliPaxel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliPickaxe.png b/src/main/resources/assets/mekanism/textures/items/LazuliPickaxe.png index 10d7311a1..e4764f0d2 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LazuliPickaxe.png and b/src/main/resources/assets/mekanism/textures/items/LazuliPickaxe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliShovel.png b/src/main/resources/assets/mekanism/textures/items/LazuliShovel.png index 3c2fc7a6f..a9afb2908 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LazuliShovel.png and b/src/main/resources/assets/mekanism/textures/items/LazuliShovel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliSword.png b/src/main/resources/assets/mekanism/textures/items/LazuliSword.png index 78246d88c..3a66d0bc0 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LazuliSword.png and b/src/main/resources/assets/mekanism/textures/items/LazuliSword.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LeadClump.png b/src/main/resources/assets/mekanism/textures/items/LeadClump.png index 77ac97add..7d3e6b98c 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LeadClump.png and b/src/main/resources/assets/mekanism/textures/items/LeadClump.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LeadCrystal.png b/src/main/resources/assets/mekanism/textures/items/LeadCrystal.png index 07491ca90..b4eec10e0 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LeadCrystal.png and b/src/main/resources/assets/mekanism/textures/items/LeadCrystal.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LeadDust.png b/src/main/resources/assets/mekanism/textures/items/LeadDust.png index ec2eaec0b..65ad2bc5d 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LeadDust.png and b/src/main/resources/assets/mekanism/textures/items/LeadDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LeadShard.png b/src/main/resources/assets/mekanism/textures/items/LeadShard.png index 5f9d1e060..7e1ee4363 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LeadShard.png and b/src/main/resources/assets/mekanism/textures/items/LeadShard.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LithiumBucket.png b/src/main/resources/assets/mekanism/textures/items/LithiumBucket.png index e26131341..aee996593 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LithiumBucket.png and b/src/main/resources/assets/mekanism/textures/items/LithiumBucket.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LithiumDust.png b/src/main/resources/assets/mekanism/textures/items/LithiumDust.png index 41778ab61..54f23ed19 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LithiumDust.png and b/src/main/resources/assets/mekanism/textures/items/LithiumDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/MufflingUpgrade.png b/src/main/resources/assets/mekanism/textures/items/MufflingUpgrade.png index f3a5037d0..9e8e31f96 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/MufflingUpgrade.png and b/src/main/resources/assets/mekanism/textures/items/MufflingUpgrade.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/NetworkReader.png b/src/main/resources/assets/mekanism/textures/items/NetworkReader.png index 0ddc0aceb..673f8e8d6 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/NetworkReader.png and b/src/main/resources/assets/mekanism/textures/items/NetworkReader.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianAxe.png b/src/main/resources/assets/mekanism/textures/items/ObsidianAxe.png index 57e45fc01..c95e059b8 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ObsidianAxe.png and b/src/main/resources/assets/mekanism/textures/items/ObsidianAxe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianBoots.png b/src/main/resources/assets/mekanism/textures/items/ObsidianBoots.png index fdcab2f7a..6ecee92f0 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ObsidianBoots.png and b/src/main/resources/assets/mekanism/textures/items/ObsidianBoots.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianChestplate.png b/src/main/resources/assets/mekanism/textures/items/ObsidianChestplate.png index 2daa7e181..ab318e64c 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ObsidianChestplate.png and b/src/main/resources/assets/mekanism/textures/items/ObsidianChestplate.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianClump.png b/src/main/resources/assets/mekanism/textures/items/ObsidianClump.png new file mode 100644 index 000000000..5690541f4 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/items/ObsidianClump.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianCrystal.png b/src/main/resources/assets/mekanism/textures/items/ObsidianCrystal.png new file mode 100644 index 000000000..20769df74 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/items/ObsidianCrystal.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianDust.png b/src/main/resources/assets/mekanism/textures/items/ObsidianDust.png index 5ce8e60ea..385f447c9 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ObsidianDust.png and b/src/main/resources/assets/mekanism/textures/items/ObsidianDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianHelmet.png b/src/main/resources/assets/mekanism/textures/items/ObsidianHelmet.png index c5d29f0b0..d34c7b59b 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ObsidianHelmet.png and b/src/main/resources/assets/mekanism/textures/items/ObsidianHelmet.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianHoe.png b/src/main/resources/assets/mekanism/textures/items/ObsidianHoe.png index ab25f754d..1b8c9cddd 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ObsidianHoe.png and b/src/main/resources/assets/mekanism/textures/items/ObsidianHoe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianIngot.png b/src/main/resources/assets/mekanism/textures/items/ObsidianIngot.png index 7d7d476f0..1359f78cc 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ObsidianIngot.png and b/src/main/resources/assets/mekanism/textures/items/ObsidianIngot.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianLeggings.png b/src/main/resources/assets/mekanism/textures/items/ObsidianLeggings.png index 1807a4103..0c39a45e1 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ObsidianLeggings.png and b/src/main/resources/assets/mekanism/textures/items/ObsidianLeggings.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianPaxel.png b/src/main/resources/assets/mekanism/textures/items/ObsidianPaxel.png index 38ad7a67b..837549b5e 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ObsidianPaxel.png and b/src/main/resources/assets/mekanism/textures/items/ObsidianPaxel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianPickaxe.png b/src/main/resources/assets/mekanism/textures/items/ObsidianPickaxe.png index 9c3055c61..0395a6548 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ObsidianPickaxe.png and b/src/main/resources/assets/mekanism/textures/items/ObsidianPickaxe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianShard.png b/src/main/resources/assets/mekanism/textures/items/ObsidianShard.png new file mode 100644 index 000000000..759c87202 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/items/ObsidianShard.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianShovel.png b/src/main/resources/assets/mekanism/textures/items/ObsidianShovel.png index 38c952ee1..9c09bfdb2 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ObsidianShovel.png and b/src/main/resources/assets/mekanism/textures/items/ObsidianShovel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianSword.png b/src/main/resources/assets/mekanism/textures/items/ObsidianSword.png index 756e8c400..fb12fe8d0 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ObsidianSword.png and b/src/main/resources/assets/mekanism/textures/items/ObsidianSword.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumAxe.png b/src/main/resources/assets/mekanism/textures/items/OsmiumAxe.png index 6b3214311..ca0b577c5 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumAxe.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumAxe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumBoots.png b/src/main/resources/assets/mekanism/textures/items/OsmiumBoots.png index 6b5710130..ef321b779 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumBoots.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumBoots.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumChestplate.png b/src/main/resources/assets/mekanism/textures/items/OsmiumChestplate.png index f8e968a4f..f85cc5ad6 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumChestplate.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumChestplate.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumClump.png b/src/main/resources/assets/mekanism/textures/items/OsmiumClump.png index 31af05694..33f2b0a3d 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumClump.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumClump.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumCrystal.png b/src/main/resources/assets/mekanism/textures/items/OsmiumCrystal.png index 9d9262264..a5bd18ac9 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumCrystal.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumCrystal.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumDust.png b/src/main/resources/assets/mekanism/textures/items/OsmiumDust.png index 415ae11a3..54f4d4fa7 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumDust.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumHelmet.png b/src/main/resources/assets/mekanism/textures/items/OsmiumHelmet.png index 071b856d1..18c1177c0 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumHelmet.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumHelmet.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumHoe.png b/src/main/resources/assets/mekanism/textures/items/OsmiumHoe.png index bc5521495..a905163f7 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumHoe.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumHoe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumIngot.png b/src/main/resources/assets/mekanism/textures/items/OsmiumIngot.png index cb15a91c7..48cb32ebb 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumIngot.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumIngot.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumLeggings.png b/src/main/resources/assets/mekanism/textures/items/OsmiumLeggings.png index 7ded5f26a..18e6b2ab2 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumLeggings.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumLeggings.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumPaxel.png b/src/main/resources/assets/mekanism/textures/items/OsmiumPaxel.png index 0e70ec6bd..fb2ac4be1 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumPaxel.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumPaxel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumPickaxe.png b/src/main/resources/assets/mekanism/textures/items/OsmiumPickaxe.png index 4d5786261..b9fb39e4f 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumPickaxe.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumPickaxe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumShard.png b/src/main/resources/assets/mekanism/textures/items/OsmiumShard.png index 6a8fb65a5..ec07600e5 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumShard.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumShard.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumShovel.png b/src/main/resources/assets/mekanism/textures/items/OsmiumShovel.png index 340371aba..ea1624d48 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumShovel.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumShovel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumSword.png b/src/main/resources/assets/mekanism/textures/items/OsmiumSword.png index 9d8f26155..54aeb4d35 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumSword.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumSword.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/PortableTeleporter.png b/src/main/resources/assets/mekanism/textures/items/PortableTeleporter.png index 466d1bb8d..0dfc5eaa5 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/PortableTeleporter.png and b/src/main/resources/assets/mekanism/textures/items/PortableTeleporter.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/RefinedObsidianDust.png b/src/main/resources/assets/mekanism/textures/items/RefinedObsidianDust.png index c907bc0f6..fe9a2e635 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/RefinedObsidianDust.png and b/src/main/resources/assets/mekanism/textures/items/RefinedObsidianDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ReinforcedAlloy.png b/src/main/resources/assets/mekanism/textures/items/ReinforcedAlloy.png index 6330d71aa..93cb28826 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ReinforcedAlloy.png and b/src/main/resources/assets/mekanism/textures/items/ReinforcedAlloy.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/Salt.png b/src/main/resources/assets/mekanism/textures/items/Salt.png index 6e0e4a7d1..75fda32ed 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/Salt.png and b/src/main/resources/assets/mekanism/textures/items/Salt.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/Sawdust.png b/src/main/resources/assets/mekanism/textures/items/Sawdust.png index f2759218c..dcac1843c 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/Sawdust.png and b/src/main/resources/assets/mekanism/textures/items/Sawdust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SeismicReader.png b/src/main/resources/assets/mekanism/textures/items/SeismicReader.png index 115b8d472..355754405 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SeismicReader.png and b/src/main/resources/assets/mekanism/textures/items/SeismicReader.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SilverClump.png b/src/main/resources/assets/mekanism/textures/items/SilverClump.png index 083e672dc..7ddaef287 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SilverClump.png and b/src/main/resources/assets/mekanism/textures/items/SilverClump.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SilverCrystal.png b/src/main/resources/assets/mekanism/textures/items/SilverCrystal.png index 993aa0ab5..5806c0ba2 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SilverCrystal.png and b/src/main/resources/assets/mekanism/textures/items/SilverCrystal.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SilverDust.png b/src/main/resources/assets/mekanism/textures/items/SilverDust.png index 7fa85e284..11a1ffab6 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SilverDust.png and b/src/main/resources/assets/mekanism/textures/items/SilverDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SilverShard.png b/src/main/resources/assets/mekanism/textures/items/SilverShard.png index 5d065ff32..c60a32bca 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SilverShard.png and b/src/main/resources/assets/mekanism/textures/items/SilverShard.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SolarPanel.png b/src/main/resources/assets/mekanism/textures/items/SolarPanel.png index 1c31873e2..91884dcb0 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SolarPanel.png and b/src/main/resources/assets/mekanism/textures/items/SolarPanel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SolarPanel_Alt.png b/src/main/resources/assets/mekanism/textures/items/SolarPanel_Alt.png new file mode 100644 index 000000000..b795f9ccf Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/items/SolarPanel_Alt.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SolarPanel_Alt2.png b/src/main/resources/assets/mekanism/textures/items/SolarPanel_Alt2.png new file mode 100644 index 000000000..b190b840d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/items/SolarPanel_Alt2.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SpeedUpgrade.png b/src/main/resources/assets/mekanism/textures/items/SpeedUpgrade.png index c79774f89..153d53cf9 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SpeedUpgrade.png and b/src/main/resources/assets/mekanism/textures/items/SpeedUpgrade.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SteelAxe.png b/src/main/resources/assets/mekanism/textures/items/SteelAxe.png index 9fe7dfa58..f24686fab 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SteelAxe.png and b/src/main/resources/assets/mekanism/textures/items/SteelAxe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SteelBoots.png b/src/main/resources/assets/mekanism/textures/items/SteelBoots.png index 82640e749..9234f1487 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SteelBoots.png and b/src/main/resources/assets/mekanism/textures/items/SteelBoots.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SteelChestplate.png b/src/main/resources/assets/mekanism/textures/items/SteelChestplate.png index 8f79824cd..ab0be11f3 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SteelChestplate.png and b/src/main/resources/assets/mekanism/textures/items/SteelChestplate.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SteelDust.png b/src/main/resources/assets/mekanism/textures/items/SteelDust.png index cdac9358a..01675de41 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SteelDust.png and b/src/main/resources/assets/mekanism/textures/items/SteelDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SteelHelmet.png b/src/main/resources/assets/mekanism/textures/items/SteelHelmet.png index a0412d573..4172b706b 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SteelHelmet.png and b/src/main/resources/assets/mekanism/textures/items/SteelHelmet.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SteelHoe.png b/src/main/resources/assets/mekanism/textures/items/SteelHoe.png index de0c9b43c..018fe9245 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SteelHoe.png and b/src/main/resources/assets/mekanism/textures/items/SteelHoe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SteelIngot.png b/src/main/resources/assets/mekanism/textures/items/SteelIngot.png index b29341edc..e4bed3321 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SteelIngot.png and b/src/main/resources/assets/mekanism/textures/items/SteelIngot.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SteelLeggings.png b/src/main/resources/assets/mekanism/textures/items/SteelLeggings.png index b4781df9a..272611613 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SteelLeggings.png and b/src/main/resources/assets/mekanism/textures/items/SteelLeggings.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SteelPaxel.png b/src/main/resources/assets/mekanism/textures/items/SteelPaxel.png index 1e0f0c4fe..d22951209 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SteelPaxel.png and b/src/main/resources/assets/mekanism/textures/items/SteelPaxel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SteelPickaxe.png b/src/main/resources/assets/mekanism/textures/items/SteelPickaxe.png index 096f170b0..9b96bbdda 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SteelPickaxe.png and b/src/main/resources/assets/mekanism/textures/items/SteelPickaxe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SteelShovel.png b/src/main/resources/assets/mekanism/textures/items/SteelShovel.png index 779c78201..fcb9c93d4 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SteelShovel.png and b/src/main/resources/assets/mekanism/textures/items/SteelShovel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SteelSword.png b/src/main/resources/assets/mekanism/textures/items/SteelSword.png index 3ea9f6961..ee892b377 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SteelSword.png and b/src/main/resources/assets/mekanism/textures/items/SteelSword.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/StonePaxel.png b/src/main/resources/assets/mekanism/textures/items/StonePaxel.png index daeb99288..b82cdaa0d 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/StonePaxel.png and b/src/main/resources/assets/mekanism/textures/items/StonePaxel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/StorageTank.png b/src/main/resources/assets/mekanism/textures/items/StorageTank.png deleted file mode 100644 index fe996df43..000000000 Binary files a/src/main/resources/assets/mekanism/textures/items/StorageTank.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/items/Substrate.png b/src/main/resources/assets/mekanism/textures/items/Substrate.png index 44074f562..d95ae1913 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/Substrate.png and b/src/main/resources/assets/mekanism/textures/items/Substrate.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/Substrate_Alt.png b/src/main/resources/assets/mekanism/textures/items/Substrate_Alt.png new file mode 100644 index 000000000..80b0b17bb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/items/Substrate_Alt.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SulfurDust.png b/src/main/resources/assets/mekanism/textures/items/SulfurDust.png index 05e229616..12e6db275 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SulfurDust.png and b/src/main/resources/assets/mekanism/textures/items/SulfurDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/TeleportationCore.png b/src/main/resources/assets/mekanism/textures/items/TeleportationCore.png index 0cc31d66a..21df5c884 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/TeleportationCore.png and b/src/main/resources/assets/mekanism/textures/items/TeleportationCore.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/TinClump.png b/src/main/resources/assets/mekanism/textures/items/TinClump.png index 33b66866b..dc5de63ef 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/TinClump.png and b/src/main/resources/assets/mekanism/textures/items/TinClump.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/TinCrystal.png b/src/main/resources/assets/mekanism/textures/items/TinCrystal.png index 80cc2bc51..6a469e963 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/TinCrystal.png and b/src/main/resources/assets/mekanism/textures/items/TinCrystal.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/TinDust.png b/src/main/resources/assets/mekanism/textures/items/TinDust.png index 56708f508..db7131ffe 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/TinDust.png and b/src/main/resources/assets/mekanism/textures/items/TinDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/TinIngot.png b/src/main/resources/assets/mekanism/textures/items/TinIngot.png index 44e1ecb66..1fbe33954 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/TinIngot.png and b/src/main/resources/assets/mekanism/textures/items/TinIngot.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/TinShard.png b/src/main/resources/assets/mekanism/textures/items/TinShard.png index 5e7e766d6..aef971100 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/TinShard.png and b/src/main/resources/assets/mekanism/textures/items/TinShard.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/TurbineBlade.png b/src/main/resources/assets/mekanism/textures/items/TurbineBlade.png index 9abdd384d..8d1b57b74 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/TurbineBlade.png and b/src/main/resources/assets/mekanism/textures/items/TurbineBlade.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/UltimateControlCircuit.png b/src/main/resources/assets/mekanism/textures/items/UltimateControlCircuit.png index a5a552092..3f7c39b38 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/UltimateControlCircuit.png and b/src/main/resources/assets/mekanism/textures/items/UltimateControlCircuit.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/UltimateControlCircuit_Alt.png b/src/main/resources/assets/mekanism/textures/items/UltimateControlCircuit_Alt.png new file mode 100644 index 000000000..fe2cac10a Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/items/UltimateControlCircuit_Alt.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/WalkieTalkieOff.png b/src/main/resources/assets/mekanism/textures/items/WalkieTalkieOff.png index ec5acf2d3..86567c214 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/WalkieTalkieOff.png and b/src/main/resources/assets/mekanism/textures/items/WalkieTalkieOff.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch1.png b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch1.png index b43344e64..df7df3c40 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch1.png and b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch1.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch2.png b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch2.png index c6eb01434..3f33ff28a 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch2.png and b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch2.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch3.png b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch3.png index c2caf91be..d907aec10 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch3.png and b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch3.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch4.png b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch4.png index 52f9f36c1..c436a7ca0 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch4.png and b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch4.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch5.png b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch5.png index b719948aa..e945bd339 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch5.png and b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch5.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch6.png b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch6.png index 6bb036b3b..e066490f7 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch6.png and b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch6.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch7.png b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch7.png index 87d9a0c20..2808e0951 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch7.png and b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch7.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch8.png b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch8.png index f1118da87..be6d00d2b 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch8.png and b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch8.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch9.png b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch9.png index 3b7becf73..fa0bcd9e8 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch9.png and b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch9.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/WoodPaxel.png b/src/main/resources/assets/mekanism/textures/items/WoodPaxel.png index 3e318f108..52349d7b3 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/WoodPaxel.png and b/src/main/resources/assets/mekanism/textures/items/WoodPaxel.png differ