From 1b2aee283e51e4a1a070b220b33ee3c3b98542df Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 19 Mar 2016 22:03:17 -0400 Subject: [PATCH 01/62] Work on security framework --- .../client/gui/GuiFormulaicAssemblicator.java | 1 + .../gui/element/GuiRedstoneControl.java | 3 + .../client/gui/element/GuiSecurityTab.java | 107 +++++++++ src/main/java/mekanism/common/HashList.java | 16 +- src/main/java/mekanism/common/Mekanism.java | 3 + .../java/mekanism/common/PacketHandler.java | 4 +- .../mekanism/common/base/ITileComponent.java | 2 + .../common/network/PacketSecurityMode.java | 67 ++++++ .../mekanism/common/security/ISecurity.java | 106 +++++++++ .../common/security/ISecurityItem.java | 15 ++ .../common/security/SecurityFrequency.java | 111 +++++++++ .../common/tile/TileEntityBasicBlock.java | 11 + .../tile/TileEntityQuantumEntangloporter.java | 5 - .../common/tile/TileEntityTeleporter.java | 5 - .../tile/component/TileComponentConfig.java | 3 + .../tile/component/TileComponentEjector.java | 3 + .../tile/component/TileComponentSecurity.java | 220 ++++++++++++++++++ .../tile/component/TileComponentUpgrade.java | 3 + .../assets/mekanism/gui/GuiSecurityDesk.png | Bin 0 -> 10487 bytes .../mekanism/gui/elements/GuiSecurityTab.png | Bin 0 -> 4794 bytes .../resources/assets/mekanism/lang/en_US.lang | 1 + 21 files changed, 667 insertions(+), 19 deletions(-) create mode 100644 src/main/java/mekanism/client/gui/element/GuiSecurityTab.java create mode 100644 src/main/java/mekanism/common/network/PacketSecurityMode.java create mode 100644 src/main/java/mekanism/common/security/ISecurity.java create mode 100644 src/main/java/mekanism/common/security/ISecurityItem.java create mode 100644 src/main/java/mekanism/common/security/SecurityFrequency.java create mode 100644 src/main/java/mekanism/common/tile/component/TileComponentSecurity.java create mode 100644 src/main/resources/assets/mekanism/gui/GuiSecurityDesk.png create mode 100644 src/main/resources/assets/mekanism/gui/elements/GuiSecurityTab.png diff --git a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java index c6ffa935f..6d06c1fe5 100644 --- a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java +++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java @@ -199,6 +199,7 @@ public class GuiFormulaicAssemblicator extends GuiMekanism GL11.glPushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); MekanismRenderer.blendOn(); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.4F); itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), stack, guiWidth + slot.xDisplayPosition, guiHeight + slot.yDisplayPosition); MekanismRenderer.blendOff(); GL11.glDisable(GL11.GL_LIGHTING); diff --git a/src/main/java/mekanism/client/gui/element/GuiRedstoneControl.java b/src/main/java/mekanism/client/gui/element/GuiRedstoneControl.java index 8f1018b11..02ae61822 100644 --- a/src/main/java/mekanism/client/gui/element/GuiRedstoneControl.java +++ b/src/main/java/mekanism/client/gui/element/GuiRedstoneControl.java @@ -12,7 +12,10 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +@SideOnly(Side.CLIENT) public class GuiRedstoneControl extends GuiElement { TileEntity tileEntity; diff --git a/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java b/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java new file mode 100644 index 000000000..bb7893610 --- /dev/null +++ b/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java @@ -0,0 +1,107 @@ +package mekanism.client.gui.element; + +import mekanism.api.Coord4D; +import mekanism.api.EnumColor; +import mekanism.api.util.ListUtils; +import mekanism.client.gui.IGuiWrapper; +import mekanism.client.sound.SoundHandler; +import mekanism.common.Mekanism; +import mekanism.common.network.PacketSecurityMode.SecurityModeMessage; +import mekanism.common.security.ISecurity; +import mekanism.common.security.ISecurity.SecurityMode; +import mekanism.common.util.LangUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; +import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiSecurityTab extends GuiElement +{ + TileEntity tileEntity; + + public GuiSecurityTab(IGuiWrapper gui, TileEntity tile, ResourceLocation def) + { + super(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, "GuiSecurityTab.png"), gui, def); + + tileEntity = tile; + } + + @Override + public Rectangle4i getBounds(int guiWidth, int guiHeight) + { + return new Rectangle4i(guiWidth + 176, guiHeight + 32, 26, 26); + } + + @Override + public void renderBackground(int xAxis, int yAxis, int guiWidth, int guiHeight) + { + mc.renderEngine.bindTexture(RESOURCE); + + guiObj.drawTexturedRect(guiWidth + 176, guiHeight + 32, 0, 0, 26, 26); + + ISecurity tile = (ISecurity)tileEntity; + int renderX = 26 + (18*tile.getSecurity().getMode().ordinal()); + + if(tile.getSecurity().getOwner() != null && tile.getSecurity().getOwner().equals(mc.thePlayer.getCommandSenderName())) + { + if(xAxis >= 179 && xAxis <= 197 && yAxis >= 36 && yAxis <= 54) + { + guiObj.drawTexturedRect(guiWidth + 179, guiHeight + 36, renderX, 0, 18, 18); + } + else { + guiObj.drawTexturedRect(guiWidth + 179, guiHeight + 36, renderX, 18, 18, 18); + } + } + else { + guiObj.drawTexturedRect(guiWidth + 179, guiHeight + 36, renderX, 36, 18, 18); + } + + mc.renderEngine.bindTexture(defaultLocation); + } + + @Override + public void renderForeground(int xAxis, int yAxis) + { + mc.renderEngine.bindTexture(RESOURCE); + + ISecurity control = (ISecurity)tileEntity; + + if(xAxis >= 179 && xAxis <= 197 && yAxis >= 36 && yAxis <= 54) + { + String securityText = EnumColor.GREY + LangUtils.localize("gui.security") + ": " + control.getSecurity().getMode().getDisplay(); + String ownerText = ISecurity.getOwnerDisplay(mc.thePlayer.getCommandSenderName(), control.getSecurity().getOwner()); + + displayTooltips(ListUtils.asList(securityText, ownerText), xAxis, yAxis); + } + + mc.renderEngine.bindTexture(defaultLocation); + } + + @Override + public void preMouseClicked(int xAxis, int yAxis, int button) {} + + @Override + public void mouseClicked(int xAxis, int yAxis, int button) + { + ISecurity control = (ISecurity)tileEntity; + + if(button == 0) + { + if(control.getSecurity().getOwner() != null && mc.thePlayer.getCommandSenderName().equals(control.getSecurity().getOwner())) + { + if(xAxis >= 179 && xAxis <= 197 && yAxis >= 36 && yAxis <= 54) + { + SecurityMode current = control.getSecurity().getMode(); + int ordinalToSet = current.ordinal() < (SecurityMode.values().length-1) ? current.ordinal()+1 : 0; + + SoundHandler.playSound("gui.button.press"); + Mekanism.packetHandler.sendToServer(new SecurityModeMessage(Coord4D.get(tileEntity), SecurityMode.values()[ordinalToSet])); + } + } + } + } +} diff --git a/src/main/java/mekanism/common/HashList.java b/src/main/java/mekanism/common/HashList.java index 2d932f4ce..5d1ed660b 100644 --- a/src/main/java/mekanism/common/HashList.java +++ b/src/main/java/mekanism/common/HashList.java @@ -91,17 +91,17 @@ public class HashList implements Iterable return list.size(); } - public void swap( int source, int target ) + public void swap(int source, int target) { - // Make sure both source and target ar legal values - if( source == target ) return; - if( source < 0 || target < 0 ) return; - if( source >= list.size() || target >= list.size() ) return; + // Make sure both source and target are legal values + if(source == target) return; + if(source < 0 || target < 0) return; + if(source >= list.size() || target >= list.size()) return; // Perform swap - T temp = list.get( source ); - list.set( source, list.get( target ) ); - list.set( target, temp ); + T temp = list.get(source); + list.set(source, list.get( target)); + list.set(target, temp); } @Override diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index da863a21e..bff0f0c32 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -73,6 +73,7 @@ import mekanism.common.recipe.ShapelessMekanismRecipe; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.machines.SmeltingRecipe; import mekanism.common.recipe.outputs.ItemStackOutput; +import mekanism.common.security.SecurityFrequency; import mekanism.common.tile.TileEntityAdvancedBoundingBlock; import mekanism.common.tile.TileEntityBoundingBlock; import mekanism.common.tile.TileEntityCardboardBox; @@ -183,6 +184,8 @@ public class Mekanism public static FrequencyManager publicEntangloporters = new FrequencyManager(InventoryFrequency.class, "Entangloporter"); public static Map privateEntangloporters = new HashMap(); + public static FrequencyManager securityFrequencies = new FrequencyManager(SecurityFrequency.class, "Security"); + /** Mekanism creative tab */ public static CreativeTabMekanism tabMekanism = new CreativeTabMekanism(); diff --git a/src/main/java/mekanism/common/PacketHandler.java b/src/main/java/mekanism/common/PacketHandler.java index 03e85ab3b..08c32f438 100644 --- a/src/main/java/mekanism/common/PacketHandler.java +++ b/src/main/java/mekanism/common/PacketHandler.java @@ -55,6 +55,8 @@ import mekanism.common.network.PacketRobit; import mekanism.common.network.PacketRobit.RobitMessage; import mekanism.common.network.PacketScubaTankData; import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage; +import mekanism.common.network.PacketSecurityMode; +import mekanism.common.network.PacketSecurityMode.SecurityModeMessage; import mekanism.common.network.PacketSimpleGui; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.network.PacketTileEntity; @@ -102,7 +104,7 @@ public class PacketHandler netHandler.registerMessage(PacketDataRequest.class, DataRequestMessage.class, 7, Side.SERVER); netHandler.registerMessage(PacketOredictionificatorGui.class, OredictionificatorGuiMessage.class, 8, Side.CLIENT); netHandler.registerMessage(PacketOredictionificatorGui.class, OredictionificatorGuiMessage.class, 8, Side.SERVER); - //EMPTY SLOT 9 + netHandler.registerMessage(PacketSecurityMode.class, SecurityModeMessage.class, 9, Side.SERVER); netHandler.registerMessage(PacketPortableTeleporter.class, PortableTeleporterMessage.class, 10, Side.CLIENT); netHandler.registerMessage(PacketPortableTeleporter.class, PortableTeleporterMessage.class, 10, Side.SERVER); netHandler.registerMessage(PacketRemoveUpgrade.class, RemoveUpgradeMessage.class, 11, Side.SERVER); diff --git a/src/main/java/mekanism/common/base/ITileComponent.java b/src/main/java/mekanism/common/base/ITileComponent.java index d69119553..d14126ade 100644 --- a/src/main/java/mekanism/common/base/ITileComponent.java +++ b/src/main/java/mekanism/common/base/ITileComponent.java @@ -17,4 +17,6 @@ public interface ITileComponent public void write(NBTTagCompound nbtTags); public void write(ArrayList data); + + public void invalidate(); } diff --git a/src/main/java/mekanism/common/network/PacketSecurityMode.java b/src/main/java/mekanism/common/network/PacketSecurityMode.java new file mode 100644 index 000000000..3cbc4b3da --- /dev/null +++ b/src/main/java/mekanism/common/network/PacketSecurityMode.java @@ -0,0 +1,67 @@ +package mekanism.common.network; + +import io.netty.buffer.ByteBuf; +import mekanism.api.Coord4D; +import mekanism.common.PacketHandler; +import mekanism.common.network.PacketSecurityMode.SecurityModeMessage; +import mekanism.common.security.ISecurity; +import mekanism.common.security.ISecurity.SecurityMode; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; + +public class PacketSecurityMode implements IMessageHandler +{ + @Override + public IMessage onMessage(SecurityModeMessage message, MessageContext context) + { + EntityPlayer player = PacketHandler.getPlayer(context); + TileEntity tileEntity = message.coord4D.getTileEntity(player.worldObj); + + if(tileEntity instanceof ISecurity) + { + String owner = ((ISecurity)tileEntity).getSecurity().getOwner(); + + if(owner != null && player.getCommandSenderName().equals(owner)) + { + ((ISecurity)tileEntity).getSecurity().setMode(message.value); + } + } + + return null; + } + + public static class SecurityModeMessage implements IMessage + { + public Coord4D coord4D; + public SecurityMode value; + + public SecurityModeMessage() {} + + public SecurityModeMessage(Coord4D coord, SecurityMode control) + { + coord4D = coord; + value = control; + } + + @Override + public void toBytes(ByteBuf dataStream) + { + dataStream.writeInt(coord4D.xCoord); + dataStream.writeInt(coord4D.yCoord); + dataStream.writeInt(coord4D.zCoord); + dataStream.writeInt(coord4D.dimensionId); + + dataStream.writeInt(value.ordinal()); + } + + @Override + public void fromBytes(ByteBuf dataStream) + { + coord4D = Coord4D.read(dataStream); + value = SecurityMode.values()[dataStream.readInt()]; + } + } +} diff --git a/src/main/java/mekanism/common/security/ISecurity.java b/src/main/java/mekanism/common/security/ISecurity.java new file mode 100644 index 000000000..1704a6557 --- /dev/null +++ b/src/main/java/mekanism/common/security/ISecurity.java @@ -0,0 +1,106 @@ +package mekanism.common.security; + +import mekanism.api.EnumColor; +import mekanism.common.Mekanism; +import mekanism.common.frequency.Frequency; +import mekanism.common.tile.component.TileComponentSecurity; +import mekanism.common.util.LangUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + +public interface ISecurity +{ + public TileComponentSecurity getSecurity(); + + public enum SecurityMode + { + PUBLIC(EnumColor.BRIGHT_GREEN + "security.public"), + PRIVATE(EnumColor.RED + "security.private"), + TRUSTED(EnumColor.ORANGE + "security.trusted"); + + private String display; + private EnumColor color; + + public String getDisplay() + { + return color + LangUtils.localize(display); + } + + private SecurityMode(String s) + { + display = s; + } + } + + public static boolean canAccess(EntityPlayer player, ItemStack stack) + { + if(stack == null || !(stack.getItem() instanceof ISecurityItem)) + { + return true; + } + + ISecurityItem security = (ISecurityItem)stack.getItem(); + + return canAccess(security.getSecurity(stack), player.getCommandSenderName(), security.getOwner(stack)); + } + + public static boolean canAccess(EntityPlayer player, TileEntity tile) + { + if(tile == null || !(tile instanceof ISecurity)) + { + return true; + } + + ISecurity security = (ISecurity)tile; + + return canAccess(security.getSecurity().getMode(), player.getCommandSenderName(), security.getSecurity().getOwner()); + } + + public static boolean canAccess(SecurityMode mode, String username, String owner) + { + if(owner == null || username.equals(owner)) + { + return true; + } + + if(mode == SecurityMode.PUBLIC) + { + return true; + } + else if(mode == SecurityMode.TRUSTED) + { + SecurityFrequency freq = getFrequency(owner); + + if(freq == null || freq.trusted.contains(username)) + { + return true; + } + } + + return false; + } + + public static SecurityFrequency getFrequency(String owner) + { + for(Frequency f : Mekanism.securityFrequencies.getFrequencies()) + { + if(f instanceof SecurityFrequency && f.owner.equals(owner)) + { + return (SecurityFrequency)f; + } + } + + return null; + } + + public static String getOwnerDisplay(String user, String owner) + { + if(owner == null) + { + return EnumColor.RED + LangUtils.localize("gui.noOwner"); + } + + return EnumColor.GREY + LangUtils.localize("gui.owner") + ": " + (user.equals(owner) ? EnumColor.BRIGHT_GREEN : EnumColor.RED) + owner; + } +} diff --git a/src/main/java/mekanism/common/security/ISecurityItem.java b/src/main/java/mekanism/common/security/ISecurityItem.java new file mode 100644 index 000000000..413cf2e6a --- /dev/null +++ b/src/main/java/mekanism/common/security/ISecurityItem.java @@ -0,0 +1,15 @@ +package mekanism.common.security; + +import mekanism.common.security.ISecurity.SecurityMode; +import net.minecraft.item.ItemStack; + +public interface ISecurityItem +{ + public String getOwner(ItemStack stack); + + public void setOwner(ItemStack stack, String owner); + + public SecurityMode getSecurity(ItemStack stack); + + public void setSecurity(ItemStack stack, SecurityMode mode); +} diff --git a/src/main/java/mekanism/common/security/SecurityFrequency.java b/src/main/java/mekanism/common/security/SecurityFrequency.java new file mode 100644 index 000000000..d028ade24 --- /dev/null +++ b/src/main/java/mekanism/common/security/SecurityFrequency.java @@ -0,0 +1,111 @@ +package mekanism.common.security; + +import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; + +import mekanism.common.HashList; +import mekanism.common.PacketHandler; +import mekanism.common.frequency.Frequency; +import mekanism.common.security.ISecurity.SecurityMode; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.NBTTagString; +import net.minecraftforge.common.util.Constants.NBT; + +public class SecurityFrequency extends Frequency +{ + public boolean override; + + public HashList trusted = new HashList(); + + public SecurityMode securityMode = SecurityMode.PUBLIC; + + public SecurityFrequency(String o) + { + super("Security", o); + } + + public SecurityFrequency(NBTTagCompound nbtTags) + { + super(nbtTags); + } + + public SecurityFrequency(ByteBuf dataStream) + { + super(dataStream); + } + + @Override + public void write(NBTTagCompound nbtTags) + { + super.write(nbtTags); + + nbtTags.setBoolean("override", override); + nbtTags.setInteger("securityMode", securityMode.ordinal()); + + if(!trusted.isEmpty()) + { + NBTTagList trustedList = new NBTTagList(); + + for(String s : trusted) + { + trustedList.appendTag(new NBTTagString(s)); + } + + nbtTags.setTag("trusted", trustedList); + } + } + + @Override + protected void read(NBTTagCompound nbtTags) + { + super.read(nbtTags); + + override = nbtTags.getBoolean("override"); + securityMode = SecurityMode.values()[nbtTags.getInteger("securityMode")]; + + if(nbtTags.hasKey("trusted")) + { + NBTTagList trustedList = nbtTags.getTagList("trusted", NBT.TAG_STRING); + + for(int i = 0; i < trustedList.tagCount(); i++) + { + trusted.add(trustedList.getStringTagAt(i)); + } + } + } + + @Override + public void write(ArrayList data) + { + super.write(data); + + data.add(override); + data.add(securityMode.ordinal()); + + data.add(trusted.size()); + + for(String s : trusted) + { + data.add(trusted); + } + } + + @Override + protected void read(ByteBuf dataStream) + { + super.read(dataStream); + + override = dataStream.readBoolean(); + securityMode = SecurityMode.values()[dataStream.readInt()]; + + trusted.clear(); + int size = dataStream.readInt(); + + for(int i = 0; i < size; i++) + { + trusted.add(PacketHandler.readString(dataStream)); + } + } +} diff --git a/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java b/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java index 454d23d24..19d45b1f0 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java @@ -137,6 +137,17 @@ public abstract class TileEntityBasicBlock extends TileEntity implements IWrench return data; } + + @Override + public void invalidate() + { + super.invalidate(); + + for(ITileComponent component : components) + { + component.invalidate(); + } + } @Override public void validate() diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index 8cec6ce40..07e6ce3ac 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -192,11 +192,6 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp public void setFrequency(String name, boolean publicFreq) { - if(name.equals(frequency)) - { - return; - } - FrequencyManager manager = getManager(new InventoryFrequency(name, null).setPublic(publicFreq)); manager.deactivate(Coord4D.get(this)); diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index 9460e8ca2..25117e502 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -165,11 +165,6 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo public void setFrequency(String name, boolean publicFreq) { - if(name.equals(frequency)) - { - return; - } - FrequencyManager manager = getManager(new Frequency(name, null).setPublic(publicFreq)); manager.deactivate(Coord4D.get(this)); diff --git a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java index 9a359b920..b074c2675 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java @@ -216,6 +216,9 @@ public class TileComponentConfig implements ITileComponent } } + @Override + public void invalidate() {} + public boolean isEjecting(TransmissionType type) { return ejecting.get(type.ordinal()); diff --git a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java index c239d29f0..305534e6f 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java @@ -374,6 +374,9 @@ public class TileComponentEjector implements ITileComponent } } + @Override + public void invalidate() {} + private boolean getEjecting(TransmissionType type) { return ((ISideConfiguration)tileEntity).getConfig().isEjecting(type); diff --git a/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java b/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java new file mode 100644 index 000000000..c7a39147f --- /dev/null +++ b/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java @@ -0,0 +1,220 @@ +package mekanism.common.tile.component; + +import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; + +import mekanism.api.Coord4D; +import mekanism.common.Mekanism; +import mekanism.common.PacketHandler; +import mekanism.common.base.ITileComponent; +import mekanism.common.frequency.Frequency; +import mekanism.common.frequency.FrequencyManager; +import mekanism.common.security.ISecurity.SecurityMode; +import mekanism.common.security.SecurityFrequency; +import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.util.MekanismUtils; +import net.minecraft.nbt.NBTTagCompound; + +public class TileComponentSecurity implements ITileComponent +{ + /** TileEntity implementing this component. */ + public TileEntityContainerBlock tileEntity; + + private String owner; + + private SecurityMode securityMode = SecurityMode.PUBLIC; + + private SecurityFrequency frequency; + + public TileComponentSecurity(TileEntityContainerBlock tile) + { + tileEntity = tile; + + tile.components.add(this); + } + + public String getOwner() + { + return owner; + } + + public void setOwner(String o) + { + frequency = null; + owner = o; + } + + public SecurityMode getMode() + { + return securityMode; + } + + public void setMode(SecurityMode mode) + { + securityMode = mode; + } + + public FrequencyManager getManager(Frequency freq) + { + if(owner == null || freq == null) + { + return null; + } + + return Mekanism.securityFrequencies; + } + + public void setFrequency(String owner) + { + FrequencyManager manager = Mekanism.securityFrequencies; + manager.deactivate(Coord4D.get(tileEntity)); + + for(Frequency freq : manager.getFrequencies()) + { + if(freq.owner.equals(owner)) + { + frequency = (SecurityFrequency)freq; + frequency.activeCoords.add(Coord4D.get(tileEntity)); + + return; + } + } + + Frequency freq = new SecurityFrequency(owner).setPublic(true); + freq.activeCoords.add(Coord4D.get(tileEntity)); + manager.addFrequency(freq); + frequency = (SecurityFrequency)freq; + + MekanismUtils.saveChunk(tileEntity); + tileEntity.markDirty(); + } + + @Override + public void tick() + { + if(!tileEntity.getWorldObj().isRemote) + { + if(frequency == null && owner != null) + { + setFrequency(owner); + } + + FrequencyManager manager = getManager(frequency); + + if(manager != null) + { + if(frequency != null && !frequency.valid) + { + frequency = (SecurityFrequency)manager.validateFrequency(owner, Coord4D.get(tileEntity), frequency); + } + + if(frequency != null) + { + frequency = (SecurityFrequency)manager.update(owner, Coord4D.get(tileEntity), frequency); + } + } + else { + frequency = null; + } + } + } + + @Override + public void read(NBTTagCompound nbtTags) + { + securityMode = SecurityMode.values()[nbtTags.getInteger("securityMode")]; + + if(nbtTags.hasKey("owner")) + { + owner = nbtTags.getString("owner"); + } + + if(nbtTags.hasKey("frequency")) + { + frequency = new SecurityFrequency(nbtTags.getCompoundTag("frequency")); + frequency.valid = false; + } + } + + @Override + public void read(ByteBuf dataStream) + { + securityMode = SecurityMode.values()[dataStream.readInt()]; + + if(dataStream.readBoolean()) + { + owner = PacketHandler.readString(dataStream); + } + else { + owner = null; + } + + if(dataStream.readBoolean()) + { + frequency = new SecurityFrequency(dataStream); + } + else { + frequency = null; + } + } + + @Override + public void write(NBTTagCompound nbtTags) + { + nbtTags.setInteger("securityMode", securityMode.ordinal()); + + if(owner != null) + { + nbtTags.setString("owner", owner); + } + + if(frequency != null) + { + NBTTagCompound frequencyTag = new NBTTagCompound(); + frequency.write(frequencyTag); + nbtTags.setTag("frequency", frequencyTag); + } + } + + @Override + public void write(ArrayList data) + { + data.add(securityMode.ordinal()); + + if(owner != null) + { + data.add(true); + data.add(owner); + } + else { + data.add(false); + } + + if(frequency != null) + { + data.add(true); + frequency.write(data); + } + else { + data.add(false); + } + } + + @Override + public void invalidate() + { + if(!tileEntity.getWorldObj().isRemote) + { + if(frequency != null) + { + FrequencyManager manager = getManager(frequency); + + if(manager != null) + { + manager.deactivate(Coord4D.get(tileEntity)); + } + } + } + } +} diff --git a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java index 94f1662de..71f10d3fb 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java @@ -226,4 +226,7 @@ public class TileComponentUpgrade implements ITileComponent { Upgrade.saveMap(upgrades, nbtTags); } + + @Override + public void invalidate() {} } diff --git a/src/main/resources/assets/mekanism/gui/GuiSecurityDesk.png b/src/main/resources/assets/mekanism/gui/GuiSecurityDesk.png new file mode 100644 index 0000000000000000000000000000000000000000..72dd35c6152f7a310cf7b8df4553769e4488212b GIT binary patch literal 10487 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 rtr)<6#eX9F=Y; Date: Mon, 21 Mar 2016 08:15:49 -0400 Subject: [PATCH 02/62] Added security desk --- .../java/mekanism/client/ClientProxy.java | 5 + .../client/gui/GuiQuantumEntangloporter.java | 2 - .../mekanism/client/gui/GuiSecurityDesk.java | 375 ++++++++++++++++++ .../client/gui/element/GuiSecurityTab.java | 3 +- .../java/mekanism/common/CommonProxy.java | 5 + .../mekanism/common/block/BlockBasic.java | 21 +- .../container/ContainerSecurityDesk.java | 124 ++++++ .../mekanism/common/item/ItemBlockBasic.java | 1 + .../mekanism/common/security/ISecurity.java | 76 ---- .../common/security/ISecurityItem.java | 2 + .../common/security/SecurityFrequency.java | 15 +- .../common/tile/TileEntitySecurityDesk.java | 259 ++++++++++++ .../mekanism/common/util/SecurityUtils.java | 96 +++++ .../assets/mekanism/gui/GuiSecurityDesk.png | Bin 10487 -> 10603 bytes .../resources/assets/mekanism/lang/en_US.lang | 13 + 15 files changed, 913 insertions(+), 84 deletions(-) create mode 100644 src/main/java/mekanism/client/gui/GuiSecurityDesk.java create mode 100644 src/main/java/mekanism/common/inventory/container/ContainerSecurityDesk.java create mode 100644 src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java create mode 100644 src/main/java/mekanism/common/util/SecurityUtils.java diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 0cc0e382f..4255d1657 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -53,6 +53,7 @@ import mekanism.client.gui.GuiRobitMain; import mekanism.client.gui.GuiRobitRepair; import mekanism.client.gui.GuiRobitSmelting; import mekanism.client.gui.GuiRotaryCondensentrator; +import mekanism.client.gui.GuiSecurityDesk; import mekanism.client.gui.GuiSeismicReader; import mekanism.client.gui.GuiSeismicVibrator; import mekanism.client.gui.GuiSideConfiguration; @@ -173,6 +174,7 @@ import mekanism.common.tile.TileEntityPurificationChamber; import mekanism.common.tile.TileEntityQuantumEntangloporter; import mekanism.common.tile.TileEntityResistiveHeater; import mekanism.common.tile.TileEntityRotaryCondensentrator; +import mekanism.common.tile.TileEntitySecurityDesk; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.tile.TileEntitySolarNeutronActivator; import mekanism.common.tile.TileEntityStructuralGlass; @@ -345,6 +347,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"); } @Override @@ -533,6 +536,8 @@ public class ClientProxy extends CommonProxy return new GuiBoilerStats(player.inventory, (TileEntityBoilerCasing)tileEntity); case 56: return new GuiFormulaicAssemblicator(player.inventory, (TileEntityFormulaicAssemblicator)tileEntity); + case 57: + return new GuiSecurityDesk(player.inventory, (TileEntitySecurityDesk)tileEntity); } return null; diff --git a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java index e6a1a9d47..ced64de7b 100644 --- a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java @@ -48,8 +48,6 @@ public class GuiQuantumEntangloporter extends GuiMekanism public GuiButton setButton; public GuiButton deleteButton; - public GuiButton teleportButton; - public GuiScrollList scrollList; public GuiTextField frequencyField; diff --git a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java new file mode 100644 index 000000000..268bdd64c --- /dev/null +++ b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java @@ -0,0 +1,375 @@ +package mekanism.client.gui; + +import java.util.ArrayList; +import java.util.List; + +import mekanism.api.Coord4D; +import mekanism.api.EnumColor; +import mekanism.client.gui.element.GuiScrollList; +import mekanism.client.sound.SoundHandler; +import mekanism.common.Mekanism; +import mekanism.common.inventory.container.ContainerSecurityDesk; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurity.SecurityMode; +import mekanism.common.tile.TileEntitySecurityDesk; +import mekanism.common.util.LangUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import mekanism.common.util.SecurityUtils; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiTextField; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.input.Keyboard; +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiSecurityDesk extends GuiMekanism +{ +public static int MAX_LENGTH = 24; + + public ResourceLocation resource; + + public TileEntitySecurityDesk tileEntity; + + public EntityPlayer entityPlayer; + + public GuiButton removeButton; + + public GuiScrollList scrollList; + + public GuiTextField trustedField; + + public GuiSecurityDesk(InventoryPlayer inventory, TileEntitySecurityDesk tentity) + { + super(tentity, new ContainerSecurityDesk(inventory, tentity)); + tileEntity = tentity; + resource = MekanismUtils.getResource(ResourceType.GUI, "GuiSecurityDesk.png"); + + guiElements.add(scrollList = new GuiScrollList(this, resource, 14, 14, 120, 4)); + + ySize+=64; + } + + @Override + public void initGui() + { + super.initGui(); + + int guiWidth = (width - xSize) / 2; + int guiHeight = (height - ySize) / 2; + + buttonList.clear(); + + removeButton = new GuiButton(0, guiWidth + 13, guiHeight + 116, 122, 20, LangUtils.localize("gui.remove")); + + trustedField = new GuiTextField(fontRendererObj, guiWidth + 35, guiHeight + 68, 86, 11); + trustedField.setMaxStringLength(MAX_LENGTH); + trustedField.setEnableBackgroundDrawing(false); + + updateButtons(); + + buttonList.add(removeButton); + } + + public void addTrusted(String trusted) + { + if(trusted.isEmpty()) + { + return; + } + + ArrayList data = new ArrayList(); + data.add(0); + data.add(trusted); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + } + + public void updateButtons() + { + if(tileEntity.owner == null) + { + return; + } + + List text = new ArrayList(); + + if(tileEntity.frequency != null) + { + for(String s : tileEntity.frequency.trusted) + { + text.add(s); + } + } + + scrollList.setText(text); + + if(scrollList.hasSelection()) + { + removeButton.enabled = true; + } + else { + removeButton.enabled = false; + } + } + + @Override + public void updateScreen() + { + super.updateScreen(); + + updateButtons(); + + trustedField.updateCursorCounter(); + } + + @Override + public void mouseClicked(int mouseX, int mouseY, int button) + { + super.mouseClicked(mouseX, mouseY, button); + + updateButtons(); + + trustedField.mouseClicked(mouseX, mouseY, button); + + if(button == 0) + { + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + if(tileEntity.frequency != null && tileEntity.owner != null && tileEntity.owner.equals(mc.thePlayer.getCommandSenderName())) + { + if(xAxis >= 123 && xAxis <= 134 && yAxis >= 68 && yAxis <= 79) + { + addTrusted(trustedField.getText()); + trustedField.setText(""); + SoundHandler.playSound("gui.button.press"); + } + + ArrayList data = new ArrayList(); + + if(xAxis >= 146 && xAxis <= 162 && yAxis >= 59 && yAxis <= 75) + { + data.add(2); + } + + if(tileEntity.frequency.securityMode != SecurityMode.PUBLIC) + { + if(xAxis >= 13 && xAxis <= 53 && yAxis >= 113 && yAxis <= 129) + { + data.add(3); + data.add(0); + } + } + + if(tileEntity.frequency.securityMode != SecurityMode.PRIVATE) + { + if(xAxis >= 54 && xAxis <= 94 && yAxis >= 113 && yAxis <= 129) + { + data.add(3); + data.add(1); + } + } + + if(tileEntity.frequency.securityMode != SecurityMode.TRUSTED) + { + if(xAxis >= 95 && xAxis <= 135 && yAxis >= 113 && yAxis <= 129) + { + data.add(3); + data.add(2); + } + } + + if(!data.isEmpty()) + { + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + } + } + } + } + + @Override + public void keyTyped(char c, int i) + { + if(!trustedField.isFocused() || i == Keyboard.KEY_ESCAPE) + { + super.keyTyped(c, i); + } + + if(i == Keyboard.KEY_RETURN) + { + if(trustedField.isFocused()) + { + addTrusted(trustedField.getText()); + trustedField.setText(""); + } + } + + if(Character.isDigit(c) || Character.isLetter(c) || i == Keyboard.KEY_BACK || i == Keyboard.KEY_DELETE || i == Keyboard.KEY_LEFT || i == Keyboard.KEY_RIGHT) + { + trustedField.textboxKeyTyped(c, i); + } + + updateButtons(); + } + + @Override + protected void actionPerformed(GuiButton guibutton) + { + super.actionPerformed(guibutton); + + if(guibutton.id == 0) + { + int selection = scrollList.getSelection(); + + if(tileEntity.frequency != null && selection != -1) + { + if(tileEntity != null) + { + ArrayList data = new ArrayList(); + data.add(1); + data.add(tileEntity.frequency.trusted.get(selection)); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + } + + scrollList.selected = -1; + } + } + + updateButtons(); + } + + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) + { + int xAxis = (mouseX-(width-xSize)/2); + int yAxis = (mouseY-(height-ySize)/2); + + String ownerText = SecurityUtils.getOwnerDisplay(mc.thePlayer.getCommandSenderName(), tileEntity.owner); + fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 4, 0x404040); + fontRendererObj.drawString(ownerText, (xSize - 7) - fontRendererObj.getStringWidth(ownerText), (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.trustedPlayers"), 13, 57, 0x404040); + + String security = EnumColor.GREY + LangUtils.localize("gui.security") + ": " + tileEntity.frequency.securityMode.getDisplay(); + fontRendererObj.drawString(security, 13, 103, 0x404040); + + renderScaledText(LangUtils.localize("gui.add") + ":", 13, 67, 0x404040, 20); + + if(tileEntity.frequency != null && xAxis >= 146 && xAxis <= 162 && yAxis >= 59 && yAxis <= 75) + { + displayTooltip(LangUtils.localize("gui.securityOverride") + ": " + LangUtils.transOnOff(tileEntity.frequency.override), xAxis, yAxis); + } + + if(xAxis >= 13 && xAxis <= 53 && yAxis >= 113 && yAxis <= 129) + { + displayTooltip(LangUtils.localize("gui.publicMode"), xAxis, yAxis); + } + + if(xAxis >= 54 && xAxis <= 94 && yAxis >= 113 && yAxis <= 129) + { + displayTooltip(LangUtils.localize("gui.privateMode"), xAxis, yAxis); + } + + if(xAxis >= 95 && xAxis <= 135 && yAxis >= 113 && yAxis <= 129) + { + displayTooltip(LangUtils.localize("gui.trustedMode"), xAxis, yAxis); + } + + super.drawGuiContainerForegroundLayer(mouseX, mouseY); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) + { + mc.renderEngine.bindTexture(resource); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + int guiWidth = (width-xSize)/2; + int guiHeight = (height-ySize)/2; + drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); + + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + if(tileEntity.frequency != null && tileEntity.owner != null && mc.thePlayer.getCommandSenderName().equals(tileEntity.owner)) + { + drawTexturedModalRect(guiWidth + 145, guiHeight + 78, xSize + (tileEntity.frequency.override ? 0 : 6), 22, 6, 6); + + if(xAxis >= 146 && xAxis <= 162 && yAxis >= 59 && yAxis <= 75) + { + drawTexturedModalRect(guiWidth + 146, guiHeight + 59, xSize + 12, 0, 16, 16); + } + else { + drawTexturedModalRect(guiWidth + 146, guiHeight + 59, xSize + 12, 16, 16, 16); + } + + if(tileEntity.frequency.securityMode != SecurityMode.PUBLIC) + { + if(xAxis >= 13 && xAxis <= 53 && yAxis >= 113 && yAxis <= 129) + { + drawTexturedModalRect(guiWidth + 13, guiHeight + 113, xSize, 48, 40, 16); + } + else { + drawTexturedModalRect(guiWidth + 13, guiHeight + 113, xSize, 64, 40, 16); + } + } + else { + drawTexturedModalRect(guiWidth + 13, guiHeight + 113, xSize, 80, 40, 16); + } + + if(tileEntity.frequency.securityMode != SecurityMode.PRIVATE) + { + if(xAxis >= 54 && xAxis <= 94 && yAxis >= 113 && yAxis <= 129) + { + drawTexturedModalRect(guiWidth + 54, guiHeight + 113, xSize + 40, 48, 40, 16); + } + else { + drawTexturedModalRect(guiWidth + 54, guiHeight + 113, xSize + 40, 64, 40, 16); + } + } + else { + drawTexturedModalRect(guiWidth + 54, guiHeight + 113, xSize + 40, 80, 40, 16); + } + + if(tileEntity.frequency.securityMode != SecurityMode.TRUSTED) + { + if(xAxis >= 95 && xAxis <= 135 && yAxis >= 113 && yAxis <= 129) + { + drawTexturedModalRect(guiWidth + 95, guiHeight + 113, xSize, 96, 40, 16); + } + else { + drawTexturedModalRect(guiWidth + 95, guiHeight + 113, xSize, 112, 40, 16); + } + } + else { + drawTexturedModalRect(guiWidth + 95, guiHeight + 113, xSize, 128, 40, 16); + } + } + else { + drawTexturedModalRect(guiWidth + 145, guiHeight + 78, xSize, 28, 6, 6); + drawTexturedModalRect(guiWidth + 146, guiHeight + 59, xSize + 12, 32, 16, 16); + drawTexturedModalRect(guiWidth + 13, guiHeight + 113, xSize, 80, 40, 16); + drawTexturedModalRect(guiWidth + 54, guiHeight + 113, xSize + 40, 80, 40, 16); + drawTexturedModalRect(guiWidth + 95, guiHeight + 113, xSize, 128, 40, 16); + } + + if(xAxis >= 123 && xAxis <= 134 && yAxis >= 68 && yAxis <= 79) + { + drawTexturedModalRect(guiWidth + 123, guiHeight + 68, xSize, 0, 11, 11); + } + else { + drawTexturedModalRect(guiWidth + 123, guiHeight + 68, xSize, 11, 11, 11); + } + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); + + trustedField.drawTextBox(); + } +} diff --git a/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java b/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java index bb7893610..2bc0aaab9 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java @@ -12,6 +12,7 @@ import mekanism.common.security.ISecurity.SecurityMode; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import mekanism.common.util.SecurityUtils; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import codechicken.lib.vec.Rectangle4i; @@ -73,7 +74,7 @@ public class GuiSecurityTab extends GuiElement if(xAxis >= 179 && xAxis <= 197 && yAxis >= 36 && yAxis <= 54) { String securityText = EnumColor.GREY + LangUtils.localize("gui.security") + ": " + control.getSecurity().getMode().getDisplay(); - String ownerText = ISecurity.getOwnerDisplay(mc.thePlayer.getCommandSenderName(), control.getSecurity().getOwner()); + String ownerText = SecurityUtils.getOwnerDisplay(mc.thePlayer.getCommandSenderName(), control.getSecurity().getOwner()); displayTooltips(ListUtils.asList(securityText, ownerText), xAxis, yAxis); } diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 1715ab418..8565297f7 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -51,6 +51,7 @@ import mekanism.common.inventory.container.ContainerRobitMain; import mekanism.common.inventory.container.ContainerRobitRepair; import mekanism.common.inventory.container.ContainerRobitSmelting; import mekanism.common.inventory.container.ContainerRotaryCondensentrator; +import mekanism.common.inventory.container.ContainerSecurityDesk; import mekanism.common.inventory.container.ContainerSeismicVibrator; import mekanism.common.inventory.container.ContainerSolarNeutronActivator; import mekanism.common.inventory.container.ContainerTeleporter; @@ -110,6 +111,7 @@ import mekanism.common.tile.TileEntityPurificationChamber; import mekanism.common.tile.TileEntityQuantumEntangloporter; import mekanism.common.tile.TileEntityResistiveHeater; import mekanism.common.tile.TileEntityRotaryCondensentrator; +import mekanism.common.tile.TileEntitySecurityDesk; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.tile.TileEntitySolarNeutronActivator; import mekanism.common.tile.TileEntityStructuralGlass; @@ -204,6 +206,7 @@ public class CommonProxy implements IGuiProvider GameRegistry.registerTileEntity(TileEntityResistiveHeater.class, "ResistiveHeater"); GameRegistry.registerTileEntity(TileEntityBoilerCasing.class, "BoilerCasing"); GameRegistry.registerTileEntity(TileEntityBoilerValve.class, "BoilerValve"); + GameRegistry.registerTileEntity(TileEntitySecurityDesk.class, "SecurityDesk"); } public void handleTeleporterUpdate(PortableTeleporterMessage message) {} @@ -554,6 +557,8 @@ public class CommonProxy implements IGuiProvider return new ContainerNull(player, (TileEntityContainerBlock)tileEntity); case 56: return new ContainerFormulaicAssemblicator(player.inventory, (TileEntityFormulaicAssemblicator)tileEntity); + case 57: + return new ContainerSecurityDesk(player.inventory, (TileEntitySecurityDesk)tileEntity); } return null; diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index eec036bd8..071db7534 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -34,6 +34,7 @@ import mekanism.common.tile.TileEntityInductionCell; import mekanism.common.tile.TileEntityInductionPort; import mekanism.common.tile.TileEntityInductionProvider; import mekanism.common.tile.TileEntityPressureDisperser; +import mekanism.common.tile.TileEntitySecurityDesk; import mekanism.common.tile.TileEntityStructuralGlass; import mekanism.common.tile.TileEntitySuperheatingElement; import mekanism.common.tile.TileEntityThermalEvaporationBlock; @@ -94,6 +95,7 @@ import cpw.mods.fml.relauncher.SideOnly; * 1:6: Pressure Disperser * 1:7: Boiler Casing * 1:8: Boiler Valve + * 1:9: Security Desk * @author AidanBrady * */ @@ -240,6 +242,8 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon icons[7][0] = ctms[7][0].mainTextureData.icon; icons[8][0] = ctms[8][0].mainTextureData.icon; + icons[9][0] = register.registerIcon(ICON_BASE); + break; } } @@ -477,6 +481,14 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon return true; } } + else if(tile instanceof TileEntitySecurityDesk) + { + if(!entityplayer.isSneaking()) + { + entityplayer.openGui(Mekanism.instance, 57, world, x, y, z); + return true; + } + } else if(tile instanceof TileEntityBin) { TileEntityBin bin = (TileEntityBin)world.getTileEntity(x, y, z); @@ -795,6 +807,11 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon tileEntity.setFacing((short)change); tileEntity.redstone = world.isBlockIndirectlyGettingPowered(x, y, z); + + if(tileEntity instanceof TileEntitySecurityDesk) + { + ((TileEntitySecurityDesk)tileEntity).owner = entityliving.getCommandSenderName(); + } if(tileEntity instanceof IBoundingBlock) { @@ -1021,13 +1038,13 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon SUPERHEATING_ELEMENT(BasicBlock.BASIC_BLOCK_2, 5, "SuperheatingElement", TileEntitySuperheatingElement.class, true), PRESSURE_DISPERSER(BasicBlock.BASIC_BLOCK_2, 6, "PressureDisperser", TileEntityPressureDisperser.class, true), BOILER_CASING(BasicBlock.BASIC_BLOCK_2, 7, "BoilerCasing", TileEntityBoilerCasing.class, true), - BOILER_VALVE(BasicBlock.BASIC_BLOCK_2, 8, "BoilerValve", TileEntityBoilerValve.class, true); + BOILER_VALVE(BasicBlock.BASIC_BLOCK_2, 8, "BoilerValve", TileEntityBoilerValve.class, true), + SECURITY_DESK(BasicBlock.BASIC_BLOCK_2, 9, "SecurityDesk", TileEntitySecurityDesk.class, true); public BasicBlock typeBlock; public int meta; public String name; public Class tileEntityClass; - public boolean isElectric; public boolean hasDescription; private BasicType(BasicBlock block, int i, String s, Class tileClass, boolean hasDesc) diff --git a/src/main/java/mekanism/common/inventory/container/ContainerSecurityDesk.java b/src/main/java/mekanism/common/inventory/container/ContainerSecurityDesk.java new file mode 100644 index 000000000..289a34f6c --- /dev/null +++ b/src/main/java/mekanism/common/inventory/container/ContainerSecurityDesk.java @@ -0,0 +1,124 @@ +package mekanism.common.inventory.container; + +import mekanism.common.security.ISecurityItem; +import mekanism.common.tile.TileEntitySecurityDesk; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class ContainerSecurityDesk extends Container +{ + private TileEntitySecurityDesk tileEntity; + + public ContainerSecurityDesk(InventoryPlayer inventory, TileEntitySecurityDesk tentity) + { + tileEntity = tentity; + + addSlotToContainer(new Slot(tentity, 0, 146, 18)); + addSlotToContainer(new Slot(tentity, 1, 146, 97)); + + int slotY; + + for(slotY = 0; slotY < 3; slotY++) + { + for(int slotX = 0; slotX < 9; slotX++) + { + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 148 + slotY * 18)); + } + } + + for(slotY = 0; slotY < 9; slotY++) + { + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 206)); + } + + tileEntity.open(inventory.player); + tileEntity.openInventory(); + } + + @Override + public void onContainerClosed(EntityPlayer entityplayer) + { + super.onContainerClosed(entityplayer); + + tileEntity.close(entityplayer); + tileEntity.closeInventory(); + } + + @Override + public boolean canInteractWith(EntityPlayer entityplayer) + { + return tileEntity.isUseableByPlayer(entityplayer); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int slotID) + { + ItemStack stack = null; + Slot currentSlot = (Slot)inventorySlots.get(slotID); + + if(currentSlot != null && currentSlot.getHasStack()) + { + ItemStack slotStack = currentSlot.getStack(); + stack = slotStack.copy(); + + if(slotStack.getItem() instanceof ISecurityItem && ((ISecurityItem)slotStack.getItem()).hasSecurity(slotStack)) + { + if(slotID != 0 && slotID != 1) + { + if(!mergeItemStack(slotStack, 1, 2, false)) + { + return null; + } + } + else { + if(!mergeItemStack(slotStack, 29, inventorySlots.size(), false)) + { + return null; + } + } + } + else { + if(slotID >= 2 && slotID <= 28) + { + if(!mergeItemStack(slotStack, 29, inventorySlots.size(), false)) + { + return null; + } + } + else if(slotID > 28) + { + if(!mergeItemStack(slotStack, 2, 28, false)) + { + return null; + } + } + else { + if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) + { + return null; + } + } + } + + if(slotStack.stackSize == 0) + { + currentSlot.putStack((ItemStack)null); + } + else { + currentSlot.onSlotChanged(); + } + + if(slotStack.stackSize == stack.stackSize) + { + return null; + } + + currentSlot.onPickupFromSlot(player, slotStack); + } + + return stack; + } +} diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index 103ed3e1e..472840265 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -65,6 +65,7 @@ import cpw.mods.fml.relauncher.SideOnly; * 1:6: Pressure Disperser * 1:7: Boiler Casing * 1:8: Boiler Valve + * 1:9: Security Desk * @author AidanBrady * */ diff --git a/src/main/java/mekanism/common/security/ISecurity.java b/src/main/java/mekanism/common/security/ISecurity.java index 1704a6557..16fa0727f 100644 --- a/src/main/java/mekanism/common/security/ISecurity.java +++ b/src/main/java/mekanism/common/security/ISecurity.java @@ -1,13 +1,8 @@ package mekanism.common.security; import mekanism.api.EnumColor; -import mekanism.common.Mekanism; -import mekanism.common.frequency.Frequency; import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.LangUtils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; public interface ISecurity { @@ -32,75 +27,4 @@ public interface ISecurity display = s; } } - - public static boolean canAccess(EntityPlayer player, ItemStack stack) - { - if(stack == null || !(stack.getItem() instanceof ISecurityItem)) - { - return true; - } - - ISecurityItem security = (ISecurityItem)stack.getItem(); - - return canAccess(security.getSecurity(stack), player.getCommandSenderName(), security.getOwner(stack)); - } - - public static boolean canAccess(EntityPlayer player, TileEntity tile) - { - if(tile == null || !(tile instanceof ISecurity)) - { - return true; - } - - ISecurity security = (ISecurity)tile; - - return canAccess(security.getSecurity().getMode(), player.getCommandSenderName(), security.getSecurity().getOwner()); - } - - public static boolean canAccess(SecurityMode mode, String username, String owner) - { - if(owner == null || username.equals(owner)) - { - return true; - } - - if(mode == SecurityMode.PUBLIC) - { - return true; - } - else if(mode == SecurityMode.TRUSTED) - { - SecurityFrequency freq = getFrequency(owner); - - if(freq == null || freq.trusted.contains(username)) - { - return true; - } - } - - return false; - } - - public static SecurityFrequency getFrequency(String owner) - { - for(Frequency f : Mekanism.securityFrequencies.getFrequencies()) - { - if(f instanceof SecurityFrequency && f.owner.equals(owner)) - { - return (SecurityFrequency)f; - } - } - - return null; - } - - public static String getOwnerDisplay(String user, String owner) - { - if(owner == null) - { - return EnumColor.RED + LangUtils.localize("gui.noOwner"); - } - - return EnumColor.GREY + LangUtils.localize("gui.owner") + ": " + (user.equals(owner) ? EnumColor.BRIGHT_GREEN : EnumColor.RED) + owner; - } } diff --git a/src/main/java/mekanism/common/security/ISecurityItem.java b/src/main/java/mekanism/common/security/ISecurityItem.java index 413cf2e6a..6fa80955a 100644 --- a/src/main/java/mekanism/common/security/ISecurityItem.java +++ b/src/main/java/mekanism/common/security/ISecurityItem.java @@ -12,4 +12,6 @@ public interface ISecurityItem public SecurityMode getSecurity(ItemStack stack); public void setSecurity(ItemStack stack, SecurityMode mode); + + public boolean hasSecurity(ItemStack stack); } diff --git a/src/main/java/mekanism/common/security/SecurityFrequency.java b/src/main/java/mekanism/common/security/SecurityFrequency.java index d028ade24..b7cf395ee 100644 --- a/src/main/java/mekanism/common/security/SecurityFrequency.java +++ b/src/main/java/mekanism/common/security/SecurityFrequency.java @@ -17,13 +17,16 @@ public class SecurityFrequency extends Frequency { public boolean override; - public HashList trusted = new HashList(); + public HashList trusted; - public SecurityMode securityMode = SecurityMode.PUBLIC; + public SecurityMode securityMode; public SecurityFrequency(String o) { super("Security", o); + + trusted = new HashList(); + securityMode = SecurityMode.PUBLIC; } public SecurityFrequency(NBTTagCompound nbtTags) @@ -62,6 +65,9 @@ public class SecurityFrequency extends Frequency { super.read(nbtTags); + trusted = new HashList(); + securityMode = SecurityMode.PUBLIC; + override = nbtTags.getBoolean("override"); securityMode = SecurityMode.values()[nbtTags.getInteger("securityMode")]; @@ -88,7 +94,7 @@ public class SecurityFrequency extends Frequency for(String s : trusted) { - data.add(trusted); + data.add(s); } } @@ -97,6 +103,9 @@ public class SecurityFrequency extends Frequency { super.read(dataStream); + trusted = new HashList(); + securityMode = SecurityMode.PUBLIC; + override = dataStream.readBoolean(); securityMode = SecurityMode.values()[dataStream.readInt()]; diff --git a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java new file mode 100644 index 000000000..c6b7a83cb --- /dev/null +++ b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java @@ -0,0 +1,259 @@ +package mekanism.common.tile; + +import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; + +import mekanism.api.Coord4D; +import mekanism.common.Mekanism; +import mekanism.common.PacketHandler; +import mekanism.common.frequency.Frequency; +import mekanism.common.frequency.FrequencyManager; +import mekanism.common.security.ISecurity.SecurityMode; +import mekanism.common.security.ISecurityItem; +import mekanism.common.security.SecurityFrequency; +import mekanism.common.util.MekanismUtils; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +public class TileEntitySecurityDesk extends TileEntityContainerBlock +{ + public String owner; + + public SecurityFrequency frequency; + + public TileEntitySecurityDesk() + { + super("SecurityDesk"); + + inventory = new ItemStack[2]; + } + + @Override + public void onUpdate() + { + if(!worldObj.isRemote) + { + if(owner != null && frequency != null) + { + if(inventory[0] != null && inventory[0].getItem() instanceof ISecurityItem) + { + ISecurityItem item = (ISecurityItem)inventory[0].getItem(); + + if(item.hasSecurity(inventory[0])) + { + item.setOwner(inventory[0], null); + item.setSecurity(inventory[0], SecurityMode.PUBLIC); + } + } + + if(inventory[1] != null && inventory[1].getItem() instanceof ISecurityItem) + { + ISecurityItem item = (ISecurityItem)inventory[1].getItem(); + + if(item.hasSecurity(inventory[1])) + { + item.setOwner(inventory[1], owner); + item.setSecurity(inventory[1], frequency.securityMode); + } + } + } + + if(frequency == null && owner != null) + { + setFrequency(owner); + } + + FrequencyManager manager = getManager(frequency); + + if(manager != null) + { + if(frequency != null && !frequency.valid) + { + frequency = (SecurityFrequency)manager.validateFrequency(owner, Coord4D.get(this), frequency); + } + + if(frequency != null) + { + frequency = (SecurityFrequency)manager.update(owner, Coord4D.get(this), frequency); + } + } + else { + frequency = null; + } + } + } + + public FrequencyManager getManager(Frequency freq) + { + if(owner == null || freq == null) + { + return null; + } + + return Mekanism.securityFrequencies; + } + + public void setFrequency(String owner) + { + FrequencyManager manager = Mekanism.securityFrequencies; + manager.deactivate(Coord4D.get(this)); + + for(Frequency freq : manager.getFrequencies()) + { + if(freq.owner.equals(owner)) + { + frequency = (SecurityFrequency)freq; + frequency.activeCoords.add(Coord4D.get(this)); + + return; + } + } + + Frequency freq = new SecurityFrequency(owner).setPublic(true); + freq.activeCoords.add(Coord4D.get(this)); + manager.addFrequency(freq); + frequency = (SecurityFrequency)freq; + + MekanismUtils.saveChunk(this); + markDirty(); + } + + @Override + public void handlePacketData(ByteBuf dataStream) + { + if(!worldObj.isRemote) + { + int type = dataStream.readInt(); + + if(type == 0) + { + if(frequency != null) + { + frequency.trusted.add(PacketHandler.readString(dataStream)); + } + } + else if(type == 1) + { + if(frequency != null) + { + frequency.trusted.remove(PacketHandler.readString(dataStream)); + } + } + else if(type == 2) + { + if(frequency != null) + { + frequency.override = !frequency.override; + } + } + else if(type == 3) + { + if(frequency != null) + { + frequency.securityMode = SecurityMode.values()[dataStream.readInt()]; + } + } + + MekanismUtils.saveChunk(this); + + return; + } + + super.handlePacketData(dataStream); + + if(dataStream.readBoolean()) + { + owner = PacketHandler.readString(dataStream); + } + else { + owner = null; + } + + if(dataStream.readBoolean()) + { + frequency = new SecurityFrequency(dataStream); + } + else { + frequency = null; + } + } + + @Override + public void readFromNBT(NBTTagCompound nbtTags) + { + super.readFromNBT(nbtTags); + + if(nbtTags.hasKey("owner")) + { + owner = nbtTags.getString("owner"); + } + + if(nbtTags.hasKey("frequency")) + { + frequency = new SecurityFrequency(nbtTags.getCompoundTag("frequency")); + frequency.valid = false; + } + } + + @Override + public void writeToNBT(NBTTagCompound nbtTags) + { + super.writeToNBT(nbtTags); + + if(owner != null) + { + nbtTags.setString("owner", owner); + } + + if(frequency != null) + { + NBTTagCompound frequencyTag = new NBTTagCompound(); + frequency.write(frequencyTag); + nbtTags.setTag("frequency", frequencyTag); + } + } + + @Override + public ArrayList getNetworkedData(ArrayList data) + { + super.getNetworkedData(data); + + if(owner != null) + { + data.add(true); + data.add(owner); + } + else { + data.add(false); + } + + if(frequency != null) + { + data.add(true); + frequency.write(data); + } + else { + data.add(false); + } + + return data; + } + + @Override + public void invalidate() + { + if(!worldObj.isRemote) + { + if(frequency != null) + { + FrequencyManager manager = getManager(frequency); + + if(manager != null) + { + manager.deactivate(Coord4D.get(this)); + } + } + } + } +} diff --git a/src/main/java/mekanism/common/util/SecurityUtils.java b/src/main/java/mekanism/common/util/SecurityUtils.java new file mode 100644 index 000000000..2ae6d131c --- /dev/null +++ b/src/main/java/mekanism/common/util/SecurityUtils.java @@ -0,0 +1,96 @@ +package mekanism.common.util; + +import mekanism.api.EnumColor; +import mekanism.common.Mekanism; +import mekanism.common.frequency.Frequency; +import mekanism.common.security.ISecurity; +import mekanism.common.security.ISecurity.SecurityMode; +import mekanism.common.security.ISecurityItem; +import mekanism.common.security.SecurityFrequency; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + +public final class SecurityUtils +{ + public static boolean canAccess(EntityPlayer player, ItemStack stack) + { + if(stack == null || !(stack.getItem() instanceof ISecurityItem)) + { + return true; + } + + ISecurityItem security = (ISecurityItem)stack.getItem(); + + return canAccess(security.getSecurity(stack), player.getCommandSenderName(), security.getOwner(stack)); + } + + public static boolean canAccess(EntityPlayer player, TileEntity tile) + { + if(tile == null || !(tile instanceof ISecurity)) + { + return true; + } + + ISecurity security = (ISecurity)tile; + + return canAccess(security.getSecurity().getMode(), player.getCommandSenderName(), security.getSecurity().getOwner()); + } + + public static boolean canAccess(SecurityMode mode, String username, String owner) + { + if(owner == null || username.equals(owner)) + { + return true; + } + + SecurityFrequency freq = getFrequency(owner); + + if(freq == null) + { + return true; + } + + if(freq.override) + { + mode = freq.securityMode; + } + + if(mode == SecurityMode.PUBLIC) + { + return true; + } + else if(mode == SecurityMode.TRUSTED) + { + if(freq.trusted.contains(username)) + { + return true; + } + } + + return false; + } + + public static SecurityFrequency getFrequency(String owner) + { + for(Frequency f : Mekanism.securityFrequencies.getFrequencies()) + { + if(f instanceof SecurityFrequency && f.owner.equals(owner)) + { + return (SecurityFrequency)f; + } + } + + return null; + } + + public static String getOwnerDisplay(String user, String owner) + { + if(owner == null) + { + return EnumColor.RED + LangUtils.localize("gui.noOwner"); + } + + return EnumColor.GREY + LangUtils.localize("gui.owner") + ": " + (user.equals(owner) ? EnumColor.BRIGHT_GREEN : EnumColor.RED) + owner; + } +} diff --git a/src/main/resources/assets/mekanism/gui/GuiSecurityDesk.png b/src/main/resources/assets/mekanism/gui/GuiSecurityDesk.png index 72dd35c6152f7a310cf7b8df4553769e4488212b..1c20e25ba61edd68afe5cc4b225c8a61e9d176cf 100644 GIT binary patch delta 8960 zcmb`LS5#Bcx9)dBkbn@HN+*HP6r?FgC-f>Hponx(Y0{+E9Xdz}ib|7?AgD-}PUs*? z5fCiY(2La2%Z>l@aPPR|KHM?R*$?||uQk6pzq!|M&HX#8hGlXvke5YERms>7vTgy! zTWEM^1t0IN2iPg!zN%du-yw3fD%2LPS>Q9=QT^(YlMZ}-%<5IrHG0t+cIms0Q0;tM zNmrpan=0ZZPCO}6^s3e`N2&?;C0`#?2yi*sYD2Zm?Fgzp>adM~spkEfoo~U5{*x1R z`%QrxzbDcfrg#SS!O1kw{x^q@2hwhMZe+?92p9eAE0RM)EzzP69aH8vt^}DbeRPs3 z@|no|YM@`@(rNEaRZTMz7|SJk^JawNk3_DJbNq+4>sXFBJ2o&bu95Fg(wDDW+O!oZp zVo8jyCcV=+e#U!CaM0&n&voLv;*pA@kbWj^5*ASk%=!D;*sX z4;p+v$^;#hQJTG9Z<#&vG8$En9_{HVi-jXjH(kBkzx}>j`7=K5M#bZm>nb9V184gY z(iX&WP*mgHz4zeV(OoYU8Z@ud3yY32 zRS)>$@8;XJmpn+IzTAa_*^A1^IQ7pX2it#QLmn3vCp6fWzBNx2aISuQ*RJr@uaI2Y zt#OXUh;isjBMOd}N)EZ0htcM>9n@Dm#6_)4pYO4B4P>dX4Pi%~mm{-VmAv;cEmo7h zLF{=a2DbPP^}ghBap4x0t#Vcea*51DZ*J@mC#4?dcQfUxy**pNx^<6qi<_jG%!d}a zv$`<$9!G~d1`8=cgj_NLwTUP=(&mufjtH2aXCj7KRNXgex%t+~u8+awug4hX%EeIR zUk2+=t9$3E6mVGl@=B2GiSXUOOrgU?`b96=4op7W zf3BVUnXaNz3Q~7Fx~`E~F^m1AS3e{VRM^d>{pNq^{uP>Bl#)b3gw4sLZ4y$wT>pWeD zDvgC?@ba;DJM1vgFuQ^%MtmE{Sz0cPdam>a@<`M#a3lpjXR#5G!WAv|vYm^kH@1&v zJsp9n;>>UMq?7WPjgayE`{&I`0k!FJw*##Pgb-EU&G=+3>CPy z)*BJVG1*RO{d_PHrkXlv!@=bu!?nxBxeO?;Nv!-)nx<{}IJGy-2A)li9a(s>KPVgt zW_wSie^qE~<0N~G4PvL0{4Q0 zoM6dzvRGQD-|}ND#OM6;k&=YVf#B|j8|UPs`19MW$z#7{!}=VA)f28_`zT|Q-EY%= zfr@cpOaq?A*5rHJ+yjIE>Tej)o-W0eRM={|9J$ZI^_=ajiW0z$!h!ds|LgSQ(}RHa zHuz3JpbhQV7K{Sm=St+Zw2X4rgM1l`)2XFVA*if44}e-TF#?!=`ZLAS1Z3`cItT4L zq)UU@vUMv@{E~Q!#)WvKf5j2<&ea{NvOl*4R@+s*fbYNMzzebXCxI>c@h74o1wVUD z<%eJRa!`Yy>UJ(g+rk zxg&BQE~boVY{lLhgX5S8c&I~68wgSl-pQCUHn9SOt36;+`Z}iB?7GR916VjPOY*fH zL~y@h>Z32YLf+)r-e)#KceIK}*6Rud=~OKDmc?deq&>*)+0Y`3vDy6 zaFxa+YH@N?pWA2dmQIb500%ZdIqfn6dY=r-h~2W28Fb#&=)3pHG}C|m;_5|yD=E_+ z{{t}Q8V45F#E_~tei7K%5mEm>6ZG8)ERi`HwJH+Ju!rpiLxrf*DI$JNvA;=A|FU+| z@bYFs5(1x`2sfo^)UbMZ1J~&wOFhv{25@-oTF0NP{j3bopEi{kkv!`hbjw{SAiFP6 zkm4YJ%hkW^{k%R%EG=E_tjFiK9DJK4AVHZZe4Sw0QxhevZEcnxFALnl+@hGz2l_3H z54g0lL=xI%A$)7T0ue!~kVlCyW{8wbmT9;O5Ouy9Y!wfi+#6U4Hn9+snjz<5A^gY> zajrT3h%tL;Xly+k5z-Gw?Q#~J)zRa*kuNw2cOUh*P~~VnqkC$yMvq1VIGOw>V99~_ zl<(}b;ueVwUzR!#s$U{6{W-7*{NY&Z*9x@tz-sv{E@BjHm`LSB(U=gURn|=?UGne) z%K&r(gB(5YT36IG&{=FL94T_eJ=+L+Xa}7*vA65!hP%1$+c4zhhdw*AEjyj1RS%J( zQU`XXkRNg%!iB6d&&Zdjkow^H_NH8$4d3yvX+iPreBt;#lcx1+Mjut7E`(1v?fdGu z1X%mvcrWR579MC(zmU;JgS*gO9)~Nk-s(PIcf3_mT8pdGIZdMP^1-{7$3>JOqVrP5#_yy3z+PU1lnfSor zFdn$Vy2WcaHQaq=3~yxZy37=K&C!jzaPxI(3?j$NqW*y9s9&ViEQr_erU1b#`0BUY z*TpY#7he+Mfr`OuTqm3?TN579t}%St&r4Kb^`w<0MbfUmm4MrM7F7p`YrjbMuu_ctGM9lS5tLfrE)XL zb|S1jitg4eM@Qj9E_&I-e6l3Vd9fQ%QyK|Rau(*S0H>B@*0|v7r@dt}P61^XWsZ9> z@YU#Bu?ugR^nI2I??b!*i;0dn19~i1|A<+M=)pK9y>>M_&>s$sTN!(6e#~9$njsmhzMD^0HZ<#>1fS02 zJjul+R?}E^pVmfg{iYm_&`Ei0Y^M%V=~BSjUFvBkx9L^*J_!*L)aF_#HN!r<4iPW= z`NaF6KsQmD3_KL|(^4abv!{eJ97<_Vm=bkxaciu8dN4UP!1Jk=ot*?DWsgK2AloVy zZ*^ywE!Jna^&o>kq;yhhS245c;*;i*5G2s(p}<5lXQH7lqozizNI+MM|aKR7j#q7^DombE=An5B%xZ zQ2qk^sh~Yk>s5X6P}y!Zr4NE(9{#Rot&o6x*H-?}8=882Pb04mV}xt|0eooLVERbY zwL{^y-#{ES>$AJE+HXdDY7QY1LiKe zj>?OhENm_6vuViPBjgt$@KlaEP4Y+j3XK@H+#FRuL8!p5G+u4nZ4h z+Y>tOf9oMzF1WOaTyHJcROZ2&1sme#F5VX0I~4to+b0P_&M?vKLS8BCgO7R0?X>0i z9*=+?d^kpv`6I2a!iZW}nL;t^3^{V)z=IHt%3Wso)x3FEQ3fz^6BChwiPrbQX~|v< z-DeG3UDg?5x4g1E>m_>T2XY<|8czqu1=o{i{x!)GM_~@V)YCai;+H;=bV+M6+~fRQ zlhyp+kA}h~lG3x%jjPKaEnH!NCoctT@oja^|HdBu%g=<794$kr1!MN+1Gj8qC1>6) ztI9PESPWhcg@;>nV&3*ds#)*8!wk;wLMeJv-TE?1~J zJ*V01`PD>&c=nE9nh3M=}tu%HQR_4Zn zyrbOf!W6vQ9#yOTc~+k@DtNcwz+qunmo;~&sFW6HTP8}yBL$HwWGf2aI$sFfe_x6F zv-*b?@Qz6?pVyI>qDtsVsmMF}iO_!Ya_*=1+|a;#IEJ+yP2Up+C zQ>sL3_k1}_{<}`rU>7dwcie?-7ydiOic2U26@7gD=~>4qP_fbtM@_ajA`p-?Lfnu| zl`qIrEXFw@!>srsPLG>h#rhPD;ESa_R7P({1{)l;);h0Kyiu)Tf9q=A@GCMXx14AP z10JR}YGBU%k}pMiOw(FX-!E0d$(iF461*4AYbS}t8+syv{-tKT~RmOI&t0L-GH8KjPP65$R-NwrC ze>m0DvTmb?E_?|hH4i2L*PX0$i3i*^$R0Qvg7jFyaFKKZ+X`Urv)^AC76=UaB5lDu zEW~*S@sHrq1TC;_bE5gQk7kv+CinNvdzTkROiq`8S^3UY6g@Vy6;(c)h>pLRCCbnj z#@>$%esr6OQkhsV^uVutFs6Ppjz2eck?`x^C+1C^jm`8+)r^D6Y8Pt2*7os-9np8% z$~3w@o0SHj|0NFZ@_FKl zDuG0L*TG%?-Sy}(HNuzG5%BE9-+MbUxeFfrLnMW4sp9F8T==5x)&)rDi8%w(<_?J zFgf1u?6$A=Dn8@!+eKhs_6`m9sChl9KD_1_gj&~7SPB}&A%LcKV|ZxfgLQo)hNze+ zA%$s3M)ZvAi>n$T@eA3U@-{{$XY)T+>$#sHvctz7ujN%zQ7xIUu$H_NS(A0uGI}L4 zRr5ghRo^wxXOzu3<{kd)GEZb=rxXVAvzc2yBDXK(T8+td-g~*IilT%B)gQM- zUexN0+~Jb#TWr0<6;E6IR-^OaCjQbA$aBqo2ww|wPBr$QbPUc0)%tAJFY)Ln`tOEU zKEG*oBnG96@c$YCP+!X4%)-4KJy4^NTc;q5B}44iM1S}_9ja;%=3r9|^58TN*KhO7 z)p;S3$S2%=*OxUxiY8a7N$ct-Qb%aTh_~=V{b{O;rsZI%M`k-`wOg11mOCP}C7JJ9 zONGINfv?%WCC8KduRPmfKa$@`ntTZ?SMR4v#0AP`i=XT`w1n*uqiBBY4S^pS#D!qC1`9fCHO(5U)eJ=msdtqD7c0(cD&j`m7qBG9@lCrY2 zj)$*!4s$9ET~AT@*{4*`mNY1=iI?;%xu$<}Tief#@b{)rFMHbi+w=JUK3VwZItTGb>OfbEZRfME zL8qb^pC9Dv%yMVR4Zylt=w($XGnYrgtEYjyAv=>j7kk)cdhxn9=^HL4@maCsCVt2r z{XB78R3ovTrpoI_da#AzgF9RxyUqpv!S5oI#${I7MZL}>v2v&Hb03_dQEn5&fuZVc zkyY5bR;bal!5o97H97v|hyOVtNd!?x@AtQE@#zi~A&Q3WWr&@g@UeoV*=@0&W`Em= z)6E74bAPd+1@XgW4kjXWaR?$LI{oM);(|Gk%T%+)ghw|=oodiIh|N09pm5>#k)IgL z2v4_nd)dtRj)|6C3x`)}qpRz!?Av6A6o@s_71KRGbA4W#1Di6T{I-Jo z-?%eV=zfs1g#DT)gEb~6#4p*wGGMD9X6q<5@!433kuO;caP?- znw40HDl|X;6z31#|3<6$e<*KUf7;VQr4_v#|Q*=Mh-$o%B7&GpLL8_+1?kEsPryd0%xAmC2JDm zMr{c?J^qGSQt<23pl)cq5Pu3J`3{^SMZ3V&>ZvPRM{z0>+p^?G1=q~(n+X$6CV;#{@xd;@>5*oYegmuN1`f zk@Xc4*rr}pQ5o3MaC&aH9P&-TkY+e!(D;`K+uLhvT3l#AUnb0HP6Gp89QoRktZpgh z$3A~TAWRwb-AiN*?-p!5h~0|g+k4+;XNS%#CTG`uFLA4biS>^(zNk$_GagW0;$2C7 z2B_ObOx@4yz6LgaB@)ohs!;B=na}q|`GU6+zeV%*v5OsL*B2GDiYOLuei3CTq;MC# zBj3Kj#od#UUXrndFD!PV_&10?2s)1@C6qHSM4lc?Mn|A1|4MvR#RS=Mo{M8lmElMj z7d->d`);l7Z$=8rw3Tb7r#Ytn7v&}h%FwY+fr(x~GZ9YgjRe>+AEO2X3vY0DliTc; zj^-))$1hRv<=-YMlop-pe`p*|0)tMbyh7gGcqWR!sPJ`*&_#?O&*dPr4w-fBEHMpEReOiWZxS& zrRvr3^6_BV>&!dn^rwdX@sk`p>qPVai-rAz=Puz_|K>hD<;I%1GrwAg5j5I{)~Zi-Jn4|KOn87LPG=2<0>F<%% zI?m5GfYjVp4}Tr$WG0a=Ru+E=(nWy6p0<`310mWb)MO4X7HS4{`y$}FrbA#)xtH(OUX6>)taempM$cV!vCVhs`j-BA< zLbA;|U+CyM+vjuC_Y;ZW2%8CEnxU~zSBb@Y#7rFZGu^92;*Y>Ea z;pqA4mP_%xDHZQ-;!bTIBscU%l1V5bYU39zz!o%p98Mq*`10s9fFi6T*^5Cui&oai z;_7n*ek_af{wE{**Twr5Qm=nO2dP1EtyJ1H=3x52=-ziC8p)2QXuX`V5Fm+`pz%UY z?E`W=%60huUB6&$ifQlth~huXm3^auL{}Nd<=vm33ohFWhi{Rf8jAZ5R6F&Bas7kp z1TNE$=bc`FBa!Xaa**dQB5u<*m)?7ZNne?9VE-^3fnS`Yy#KifM+5%A2P)aH$;BI~ z2Ql+5tkzzjDed%gsc$)$uws#s6^SJgw&l^0p&rGwj{Zwc+{VdlJ-N%bSVsPlI?u%` zRs9vl>J$dAv&`{6PbTW`uK%es`gp(G*3zlTeI`tq zu%rBb^;ew-(Sn|efZB_XHHU9qWol@%r&uesx-A~akH%V>OL;9BNV*y_hN@w#ZEf2| z0uDB9$SKMKXkKrfXfF<<_8 zkohg)rtOKJ*`3Mzs#(nEmp?V@{M@YbTX#|o(R>b|fd&eHP9bR5!6qKZSuHl@%Nt7- zQJAL@@&?_yi6n9D8}R8E*N(O*sU{&Sv|nS~sCE_G1jqL7%>DLn&Q3;gUje0msdf}X zkY}Fj6o5jkPyh-1%xXR@#sfj?EGw^QAiAgCFjViOh_0*mLu|IwZ~Z!kG81}g)c9&s@9wEK?pUckv0#s6_r$v1SV&?kH^&*=L^u9LEpD* zmQT2_7K6msD?`2`vuq;n8aWTAZL0n(JJ@W-ZoqGfiP>CJ2s#i=Ow2q*Q znp@G9JRaQ{Ub`{+Zb7qTMluvSl_F8*BvbQOM%aH`W~2ZAVjUOTwPWLhyI}#;13|ZIBJz<+c`qN zmkS%FvqCVUG8LM$iMN)Q=(8seNFjQ~KYRIlNgJkCl%vaj)o;SofN67Lw!-B{7^MgNd&?`PXAcUG$}i<$x!2L_$4JQ z;=j4#e=Yb=7KhvSz?A{ z3~77nrXESU&^M%*=3t3WRCB1|1;S9*pA~Q2*(mB{*UnCli}j(e**ZxpU z2^m)I#OAWrAEG3O{Om9r@-Nk!#5>Oo^&tOm(f@~L@PAVD|8EvCD#+X? DCL9we delta 8856 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 Date: Mon, 21 Mar 2016 13:30:59 -0400 Subject: [PATCH 03/62] Polished security desk interface and machine interaction. Need to start integrating now, so far only complete in metallurgic infuser --- .../client/gui/GuiMetallurgicInfuser.java | 2 + .../mekanism/client/gui/GuiSecurityDesk.java | 30 ++++--- .../client/gui/element/GuiSecurityTab.java | 33 +++++-- .../mekanism/common/block/BlockBasic.java | 12 ++- .../mekanism/common/block/BlockMachine.java | 27 +++++- .../common/item/ItemBlockMachine.java | 85 +++++++++++++++++- .../common/network/PacketSecurityMode.java | 10 +-- .../common/security/ISecurityItem.java | 2 +- .../{ISecurity.java => ISecurityTile.java} | 11 +-- .../common/security/SecurityFrequency.java | 2 +- .../tile/TileEntityMetallurgicInfuser.java | 13 ++- .../common/tile/TileEntitySecurityDesk.java | 2 +- .../tile/component/TileComponentSecurity.java | 7 +- .../mekanism/common/util/RecipeUtils.java | 17 ++++ .../mekanism/common/util/SecurityUtils.java | 90 ++++++++++++++++++- .../resources/assets/mekanism/lang/en_US.lang | 9 +- 16 files changed, 308 insertions(+), 44 deletions(-) rename src/main/java/mekanism/common/security/{ISecurity.java => ISecurityTile.java} (63%) diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java index 8b092966f..072c76765 100644 --- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -12,6 +12,7 @@ import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; @@ -46,6 +47,7 @@ public class GuiMetallurgicInfuser extends GuiMekanism guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"))); guiElements.add(new GuiUpgradeTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"))); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"))); guiElements.add(new GuiSideConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"))); guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"))); guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"), 164, 15)); diff --git a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java index 268bdd64c..aa140b86e 100644 --- a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java +++ b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java @@ -1,6 +1,7 @@ package mekanism.client.gui; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import mekanism.api.Coord4D; @@ -10,12 +11,11 @@ import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerSecurityDesk; import mekanism.common.network.PacketTileEntity.TileEntityMessage; -import mekanism.common.security.ISecurity.SecurityMode; +import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.tile.TileEntitySecurityDesk; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; -import mekanism.common.util.SecurityUtils; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; @@ -31,7 +31,7 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiSecurityDesk extends GuiMekanism { -public static int MAX_LENGTH = 24; + public static int MAX_LENGTH = 24; public ResourceLocation resource; @@ -44,6 +44,8 @@ public static int MAX_LENGTH = 24; public GuiScrollList scrollList; public GuiTextField trustedField; + + public static final List SPECIAL_CHARS = Arrays.asList('-', '|'); public GuiSecurityDesk(InventoryPlayer inventory, TileEntitySecurityDesk tentity) { @@ -66,9 +68,9 @@ public static int MAX_LENGTH = 24; buttonList.clear(); - removeButton = new GuiButton(0, guiWidth + 13, guiHeight + 116, 122, 20, LangUtils.localize("gui.remove")); + removeButton = new GuiButton(0, guiWidth + 13, guiHeight + 81, 122, 20, LangUtils.localize("gui.remove")); - trustedField = new GuiTextField(fontRendererObj, guiWidth + 35, guiHeight + 68, 86, 11); + trustedField = new GuiTextField(fontRendererObj, guiWidth + 35, guiHeight + 69, 86, 11); trustedField.setMaxStringLength(MAX_LENGTH); trustedField.setEnableBackgroundDrawing(false); @@ -211,7 +213,7 @@ public static int MAX_LENGTH = 24; } } - if(Character.isDigit(c) || Character.isLetter(c) || i == Keyboard.KEY_BACK || i == Keyboard.KEY_DELETE || i == Keyboard.KEY_LEFT || i == Keyboard.KEY_RIGHT) + if(SPECIAL_CHARS.contains(c) || Character.isDigit(c) || Character.isLetter(c) || i == Keyboard.KEY_BACK || i == Keyboard.KEY_DELETE || i == Keyboard.KEY_LEFT || i == Keyboard.KEY_RIGHT) { trustedField.textboxKeyTyped(c, i); } @@ -252,16 +254,24 @@ public static int MAX_LENGTH = 24; int xAxis = (mouseX-(width-xSize)/2); int yAxis = (mouseY-(height-ySize)/2); - String ownerText = SecurityUtils.getOwnerDisplay(mc.thePlayer.getCommandSenderName(), tileEntity.owner); + String ownerText = EnumColor.RED + tileEntity.owner != null ? (LangUtils.localize("gui.owner") + ": " + tileEntity.owner) : LangUtils.localize("gui.noOwner"); fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 4, 0x404040); fontRendererObj.drawString(ownerText, (xSize - 7) - fontRendererObj.getStringWidth(ownerText), (ySize - 96) + 2, 0x404040); fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); - fontRendererObj.drawString(LangUtils.localize("gui.trustedPlayers"), 13, 57, 0x404040); - String security = EnumColor.GREY + LangUtils.localize("gui.security") + ": " + tileEntity.frequency.securityMode.getDisplay(); + String trusted = LangUtils.localize("gui.trustedPlayers"); + fontRendererObj.drawString(trusted, 74-(fontRendererObj.getStringWidth(trusted)/2), 57, 0x787878); + + String security = EnumColor.RED + LangUtils.localize("gui.securityOffline"); + + if(tileEntity.frequency != null) + { + security = LangUtils.localize("gui.security") + ": " + tileEntity.frequency.securityMode.getDisplay(); + } + fontRendererObj.drawString(security, 13, 103, 0x404040); - renderScaledText(LangUtils.localize("gui.add") + ":", 13, 67, 0x404040, 20); + renderScaledText(LangUtils.localize("gui.add") + ":", 13, 70, 0x404040, 20); if(tileEntity.frequency != null && xAxis >= 146 && xAxis <= 162 && yAxis >= 59 && yAxis <= 75) { diff --git a/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java b/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java index 2bc0aaab9..585d0b805 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java @@ -7,8 +7,8 @@ import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.network.PacketSecurityMode.SecurityModeMessage; -import mekanism.common.security.ISecurity; -import mekanism.common.security.ISecurity.SecurityMode; +import mekanism.common.security.ISecurityTile; +import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -44,10 +44,18 @@ public class GuiSecurityTab extends GuiElement guiObj.drawTexturedRect(guiWidth + 176, guiHeight + 32, 0, 0, 26, 26); - ISecurity tile = (ISecurity)tileEntity; - int renderX = 26 + (18*tile.getSecurity().getMode().ordinal()); + ISecurityTile tile = (ISecurityTile)tileEntity; + SecurityMode mode = tile.getSecurity().getMode(); + + if(tile.getSecurity().getFrequency() != null && tile.getSecurity().getFrequency().override) + { + mode = tile.getSecurity().getFrequency().securityMode; + } + + int renderX = 26 + (18*mode.ordinal()); - if(tile.getSecurity().getOwner() != null && tile.getSecurity().getOwner().equals(mc.thePlayer.getCommandSenderName())) + if(tile.getSecurity().getOwner() != null && tile.getSecurity().getOwner().equals(mc.thePlayer.getCommandSenderName()) && + (tile.getSecurity().getFrequency() == null || !tile.getSecurity().getFrequency().override)) { if(xAxis >= 179 && xAxis <= 197 && yAxis >= 36 && yAxis <= 54) { @@ -69,14 +77,21 @@ public class GuiSecurityTab extends GuiElement { mc.renderEngine.bindTexture(RESOURCE); - ISecurity control = (ISecurity)tileEntity; + ISecurityTile control = (ISecurityTile)tileEntity; if(xAxis >= 179 && xAxis <= 197 && yAxis >= 36 && yAxis <= 54) { - String securityText = EnumColor.GREY + LangUtils.localize("gui.security") + ": " + control.getSecurity().getMode().getDisplay(); + String securityText = EnumColor.GREY + LangUtils.localize("gui.security") + ": " + SecurityUtils.getSecurityDisplay((TileEntity)control); String ownerText = SecurityUtils.getOwnerDisplay(mc.thePlayer.getCommandSenderName(), control.getSecurity().getOwner()); + String overrideText = EnumColor.RED + "(" + LangUtils.localize("gui.overridden") + ")"; - displayTooltips(ListUtils.asList(securityText, ownerText), xAxis, yAxis); + if(SecurityUtils.isOverridden((TileEntity)control)) + { + displayTooltips(ListUtils.asList(securityText, ownerText, overrideText), xAxis, yAxis); + } + else { + displayTooltips(ListUtils.asList(securityText, ownerText), xAxis, yAxis); + } } mc.renderEngine.bindTexture(defaultLocation); @@ -88,7 +103,7 @@ public class GuiSecurityTab extends GuiElement @Override public void mouseClicked(int xAxis, int yAxis, int button) { - ISecurity control = (ISecurity)tileEntity; + ISecurityTile control = (ISecurityTile)tileEntity; if(button == 0) { diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 071db7534..379bf95f2 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -42,6 +42,7 @@ import mekanism.common.tile.TileEntityThermalEvaporationController; import mekanism.common.tile.TileEntityThermalEvaporationValve; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -483,9 +484,18 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon } else if(tile instanceof TileEntitySecurityDesk) { + String owner = ((TileEntitySecurityDesk)tile).owner; + if(!entityplayer.isSneaking()) { - entityplayer.openGui(Mekanism.instance, 57, world, x, y, z); + if(owner == null || entityplayer.getCommandSenderName().equals(owner)) + { + entityplayer.openGui(Mekanism.instance, 57, world, x, y, z); + } + else { + SecurityUtils.displayNoAccess(entityplayer); + } + return true; } } diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 7c963f87c..6cce3d492 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -43,6 +43,9 @@ import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage; import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.recipe.ShapedMekanismRecipe; +import mekanism.common.security.ISecurityTile; +import mekanism.common.security.ISecurityTile.SecurityMode; +import mekanism.common.security.ISecurityItem; import mekanism.common.tile.TileEntityAdvancedFactory; import mekanism.common.tile.TileEntityAmbientAccumulator; import mekanism.common.tile.TileEntityBasicBlock; @@ -85,6 +88,7 @@ import mekanism.common.tile.TileEntitySolarNeutronActivator; import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -578,7 +582,14 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo { if(entityplayer.isSneaking() && MachineType.get(blockType, metadata) != MachineType.ELECTRIC_CHEST) { - dismantleBlock(world, x, y, z, false); + if(SecurityUtils.canAccess(entityplayer, tileEntity)) + { + dismantleBlock(world, x, y, z, false); + } + else { + SecurityUtils.displayNoAccess(entityplayer); + } + return true; } @@ -753,8 +764,15 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo @Override public float getBlockHardness(World world, int x, int y, int z) { + TileEntity tile = world.getTileEntity(x, y, z); + if(MachineType.get(blockType, world.getBlockMetadata(x, y, z)) != MachineType.ELECTRIC_CHEST) { + if(tile instanceof ISecurityTile) + { + return SecurityUtils.getSecurity((ISecurityTile)tile) == SecurityMode.PUBLIC ? blockHardness : -1; + } + return blockHardness; } else { @@ -955,6 +973,13 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo ITierItem tierItem = (ITierItem)itemStack.getItem(); tierItem.setBaseTier(itemStack, ((TileEntityFluidTank)tileEntity).tier.getBaseTier()); } + + if(tileEntity instanceof ISecurityTile) + { + ISecurityItem securityItem = (ISecurityItem)itemStack.getItem(); + securityItem.setOwner(itemStack, ((ISecurityTile)tileEntity).getSecurity().getOwner()); + securityItem.setSecurity(itemStack, ((ISecurityTile)tileEntity).getSecurity().getMode()); + } if(tileEntity instanceof IUpgradeTile) { diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index bc72e0ae6..5d989536a 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -34,6 +34,9 @@ import mekanism.common.integration.IC2ItemManager; import mekanism.common.inventory.InventoryElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestMessage; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; +import mekanism.common.security.ISecurityItem; +import mekanism.common.security.ISecurityTile; +import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.tile.TileEntityElectricChest; @@ -41,6 +44,7 @@ import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.settings.GameSettings; @@ -116,7 +120,7 @@ import cpw.mods.fml.relauncher.SideOnly; @InterfaceList({ @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") }) -public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, IFactory, ISustainedInventory, ISustainedTank, IElectricChest, IEnergyContainerItem, IFluidContainerItem, ITierItem +public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, IFactory, ISustainedInventory, ISustainedTank, IElectricChest, IEnergyContainerItem, IFluidContainerItem, ITierItem, ISecurityItem { public Block metaBlock; @@ -193,6 +197,17 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } else if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.modeSwitchKey)) { + if(hasSecurity(itemstack)) + { + list.add(SecurityUtils.getOwnerDisplay(entityplayer.getCommandSenderName(), getOwner(itemstack))); + list.add(EnumColor.GREY + LangUtils.localize("gui.security") + ": " + SecurityUtils.getSecurityDisplay(itemstack)); + + if(SecurityUtils.isOverridden(itemstack)) + { + list.add(EnumColor.RED + "(" + LangUtils.localize("gui.overridden") + ")"); + } + } + if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) { list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.recipeType") + ": " + EnumColor.GREY + RecipeType.values()[getRecipeType(itemstack)].getLocalizedName()); @@ -301,6 +316,18 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec tile.fluidTank.setCapacity(tile.tier.storage); } + if(tileEntity instanceof ISecurityTile) + { + ISecurityTile security = (ISecurityTile)tileEntity; + security.getSecurity().setOwner(getOwner(stack)); + security.getSecurity().setMode(getSecurity(stack)); + + if(getOwner(stack) == null) + { + security.getSecurity().setOwner(player.getCommandSenderName()); + } + } + if(tileEntity instanceof IUpgradeTile) { if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("upgrades")) @@ -1019,4 +1046,60 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec itemstack.stackTagCompound.setInteger("tier", tier.ordinal()); } + + @Override + public String getOwner(ItemStack stack) + { + if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("owner")) + { + return stack.stackTagCompound.getString("owner"); + } + + return null; + } + + @Override + public void setOwner(ItemStack stack, String owner) + { + if(stack.stackTagCompound == null) + { + stack.setTagCompound(new NBTTagCompound()); + } + + if(owner == null || owner.isEmpty()) + { + stack.stackTagCompound.removeTag("owner"); + return; + } + + stack.stackTagCompound.setString("owner", owner); + } + + @Override + public SecurityMode getSecurity(ItemStack stack) + { + if(stack.stackTagCompound == null) + { + return SecurityMode.PUBLIC; + } + + return SecurityMode.values()[stack.stackTagCompound.getInteger("security")]; + } + + @Override + public void setSecurity(ItemStack stack, SecurityMode mode) + { + if(stack.stackTagCompound == null) + { + stack.setTagCompound(new NBTTagCompound()); + } + + stack.stackTagCompound.setInteger("security", mode.ordinal()); + } + + @Override + public boolean hasSecurity(ItemStack stack) + { + return true; + } } diff --git a/src/main/java/mekanism/common/network/PacketSecurityMode.java b/src/main/java/mekanism/common/network/PacketSecurityMode.java index 3cbc4b3da..43944a606 100644 --- a/src/main/java/mekanism/common/network/PacketSecurityMode.java +++ b/src/main/java/mekanism/common/network/PacketSecurityMode.java @@ -4,8 +4,8 @@ import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.common.PacketHandler; import mekanism.common.network.PacketSecurityMode.SecurityModeMessage; -import mekanism.common.security.ISecurity; -import mekanism.common.security.ISecurity.SecurityMode; +import mekanism.common.security.ISecurityTile; +import mekanism.common.security.ISecurityTile.SecurityMode; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; @@ -20,13 +20,13 @@ public class PacketSecurityMode implements IMessageHandler Date: Mon, 21 Mar 2016 16:53:29 -0400 Subject: [PATCH 04/62] Start integrating security into all machinery. This is a very rough implementation, there's gonna be a lot of balance and corrections to make before release --- .../java/mekanism/api/MekanismConfig.java | 1 - .../java/mekanism/client/ClientProxy.java | 60 +--- .../gui/GuiAdvancedElectricMachine.java | 2 + .../mekanism/client/gui/GuiChanceMachine.java | 2 + .../client/gui/GuiChemicalCrystallizer.java | 2 + .../gui/GuiChemicalDissolutionChamber.java | 2 + .../client/gui/GuiChemicalInfuser.java | 2 + .../client/gui/GuiChemicalOxidizer.java | 2 + .../client/gui/GuiChemicalWasher.java | 2 + .../mekanism/client/gui/GuiDigitalMiner.java | 2 + .../mekanism/client/gui/GuiElectricChest.java | 186 ---------- .../client/gui/GuiElectricMachine.java | 2 + .../mekanism/client/gui/GuiElectricPump.java | 2 + .../client/gui/GuiEntangledBlock.java | 130 ------- .../java/mekanism/client/gui/GuiFactory.java | 2 + .../client/gui/GuiFluidicPlenisher.java | 2 + .../client/gui/GuiFormulaicAssemblicator.java | 2 + .../client/gui/GuiLaserAmplifier.java | 2 + .../client/gui/GuiLaserTractorBeam.java | 3 + .../client/gui/GuiLogisticalSorter.java | 2 + .../client/gui/GuiOredictionificator.java | 4 + src/main/java/mekanism/client/gui/GuiPRC.java | 2 + .../mekanism/client/gui/GuiPasswordEnter.java | 191 ---------- .../client/gui/GuiPasswordModify.java | 222 ------------ .../mekanism/client/gui/GuiPersonalChest.java | 70 ++++ .../client/gui/GuiQuantumEntangloporter.java | 9 +- .../client/gui/GuiResistiveHeater.java | 2 + .../client/gui/GuiRotaryCondensentrator.java | 2 + .../client/gui/GuiSeismicVibrator.java | 2 + .../client/gui/GuiSolarNeutronActivator.java | 2 + .../mekanism/client/gui/GuiTeleporter.java | 6 +- .../render/item/ItemRenderingHandler.java | 8 +- ...ricChest.java => RenderPersonalChest.java} | 10 +- .../java/mekanism/common/CommonProxy.java | 11 +- src/main/java/mekanism/common/Mekanism.java | 2 +- .../java/mekanism/common/PacketHandler.java | 8 +- .../mekanism/common/base/IElectricChest.java | 53 --- .../mekanism/common/block/BlockMachine.java | 221 +++++------- ...Chest.java => InventoryPersonalChest.java} | 10 +- ...Chest.java => ContainerPersonalChest.java} | 61 +--- .../inventory/slot/SlotElectricChest.java | 37 -- .../inventory/slot/SlotPersonalChest.java | 20 ++ .../common/item/ItemBlockMachine.java | 329 +++++------------- .../common/item/ItemConfigurator.java | 43 ++- .../common/network/PacketConfigSync.java | 2 - .../common/network/PacketElectricChest.java | 312 ----------------- .../common/network/PacketPersonalChest.java | 177 ++++++++++ .../tile/TileEntityOredictionificator.java | 2 +- ...hest.java => TileEntityPersonalChest.java} | 105 ++---- .../tile/TileEntityQuantumEntangloporter.java | 60 ++-- .../common/tile/TileEntitySecurityDesk.java | 13 +- .../common/tile/TileEntityTeleporter.java | 86 +++-- .../mekanism/common/util/MekanismUtils.java | 16 +- .../mekanism/common/util/SecurityUtils.java | 7 +- .../assets/mekanism/gui/GuiElectricChest.png | Bin 5477 -> 0 bytes .../assets/mekanism/gui/GuiPersonalChest.png | Bin 0 -> 3833 bytes .../resources/assets/mekanism/lang/en_US.lang | 7 +- .../{ElectricChest.png => PersonalChest.png} | Bin 58 files changed, 700 insertions(+), 1822 deletions(-) delete mode 100644 src/main/java/mekanism/client/gui/GuiElectricChest.java delete mode 100644 src/main/java/mekanism/client/gui/GuiEntangledBlock.java delete mode 100644 src/main/java/mekanism/client/gui/GuiPasswordEnter.java delete mode 100644 src/main/java/mekanism/client/gui/GuiPasswordModify.java create mode 100644 src/main/java/mekanism/client/gui/GuiPersonalChest.java rename src/main/java/mekanism/client/render/tileentity/{RenderElectricChest.java => RenderPersonalChest.java} (82%) delete mode 100644 src/main/java/mekanism/common/base/IElectricChest.java rename src/main/java/mekanism/common/inventory/{InventoryElectricChest.java => InventoryPersonalChest.java} (88%) rename src/main/java/mekanism/common/inventory/container/{ContainerElectricChest.java => ContainerPersonalChest.java} (64%) delete mode 100644 src/main/java/mekanism/common/inventory/slot/SlotElectricChest.java create mode 100644 src/main/java/mekanism/common/inventory/slot/SlotPersonalChest.java delete mode 100644 src/main/java/mekanism/common/network/PacketElectricChest.java create mode 100644 src/main/java/mekanism/common/network/PacketPersonalChest.java rename src/main/java/mekanism/common/tile/{TileEntityElectricChest.java => TileEntityPersonalChest.java} (50%) delete mode 100644 src/main/resources/assets/mekanism/gui/GuiElectricChest.png create mode 100644 src/main/resources/assets/mekanism/gui/GuiPersonalChest.png rename src/main/resources/assets/mekanism/render/{ElectricChest.png => PersonalChest.png} (100%) diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index dae1fc598..b3125f1d2 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -17,7 +17,6 @@ public class MekanismConfig public static boolean voiceServerEnabled = true; public static boolean cardboardSpawners = true; public static boolean enableWorldRegeneration = true; - public static boolean creativeOverrideElectricChest = true; public static boolean spawnBabySkeletons = true; public static int obsidianTNTBlastRadius = 12; public static int osmiumPerChunk = 12; diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 4255d1657..39b77620f 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -22,7 +22,6 @@ import mekanism.client.gui.GuiCrusher; import mekanism.client.gui.GuiDictionary; import mekanism.client.gui.GuiDigitalMiner; import mekanism.client.gui.GuiDynamicTank; -import mekanism.client.gui.GuiElectricChest; import mekanism.client.gui.GuiElectricPump; import mekanism.client.gui.GuiElectrolyticSeparator; import mekanism.client.gui.GuiEnergizedSmelter; @@ -41,8 +40,7 @@ import mekanism.client.gui.GuiMetallurgicInfuser; import mekanism.client.gui.GuiOredictionificator; import mekanism.client.gui.GuiOsmiumCompressor; import mekanism.client.gui.GuiPRC; -import mekanism.client.gui.GuiPasswordEnter; -import mekanism.client.gui.GuiPasswordModify; +import mekanism.client.gui.GuiPersonalChest; import mekanism.client.gui.GuiPrecisionSawmill; import mekanism.client.gui.GuiPurificationChamber; import mekanism.client.gui.GuiQuantumEntangloporter; @@ -86,7 +84,6 @@ import mekanism.client.render.tileentity.RenderChemicalWasher; import mekanism.client.render.tileentity.RenderConfigurableMachine; import mekanism.client.render.tileentity.RenderDigitalMiner; import mekanism.client.render.tileentity.RenderDynamicTank; -import mekanism.client.render.tileentity.RenderElectricChest; import mekanism.client.render.tileentity.RenderElectricPump; import mekanism.client.render.tileentity.RenderElectrolyticSeparator; import mekanism.client.render.tileentity.RenderEnergyCube; @@ -99,6 +96,7 @@ import mekanism.client.render.tileentity.RenderLaserTractorBeam; import mekanism.client.render.tileentity.RenderLogisticalSorter; import mekanism.client.render.tileentity.RenderMetallurgicInfuser; 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.RenderSeismicVibrator; @@ -110,7 +108,6 @@ import mekanism.common.CommonProxy; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; -import mekanism.common.base.IElectricChest; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.BlockMachine.MachineType; @@ -119,7 +116,7 @@ import mekanism.common.entity.EntityBalloon; import mekanism.common.entity.EntityFlame; import mekanism.common.entity.EntityObsidianTNT; import mekanism.common.entity.EntityRobit; -import mekanism.common.inventory.InventoryElectricChest; +import mekanism.common.inventory.InventoryPersonalChest; import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.item.ItemSeismicReader; import mekanism.common.multiblock.MultiblockManager; @@ -142,7 +139,6 @@ import mekanism.common.tile.TileEntityCrusher; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.tile.TileEntityDynamicValve; -import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.tile.TileEntityElectricMachine; import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.tile.TileEntityElectrolyticSeparator; @@ -169,6 +165,7 @@ import mekanism.common.tile.TileEntityObsidianTNT; import mekanism.common.tile.TileEntityOredictionificator; import mekanism.common.tile.TileEntityOsmiumCompressor; import mekanism.common.tile.TileEntityPRC; +import mekanism.common.tile.TileEntityPersonalChest; import mekanism.common.tile.TileEntityPrecisionSawmill; import mekanism.common.tile.TileEntityPurificationChamber; import mekanism.common.tile.TileEntityQuantumEntangloporter; @@ -240,58 +237,28 @@ public class ClientProxy extends CommonProxy } @Override - public void openElectricChest(EntityPlayer entityplayer, int id, int windowId, boolean isBlock, int x, int y, int z) + public void openPersonalChest(EntityPlayer entityplayer, int id, int windowId, boolean isBlock, int x, int y, int z) { - TileEntityElectricChest tileEntity = (TileEntityElectricChest)entityplayer.worldObj.getTileEntity(x, y, z); + TileEntityPersonalChest tileEntity = (TileEntityPersonalChest)entityplayer.worldObj.getTileEntity(x, y, z); if(id == 0) { if(isBlock) { - FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiElectricChest(entityplayer.inventory, tileEntity)); + FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiPersonalChest(entityplayer.inventory, tileEntity)); entityplayer.openContainer.windowId = windowId; } else { ItemStack stack = entityplayer.getCurrentEquippedItem(); - if(stack != null && stack.getItem() instanceof IElectricChest && MachineType.get(stack) == MachineType.ELECTRIC_CHEST) + if(MachineType.get(stack) == MachineType.PERSONAL_CHEST) { - InventoryElectricChest inventory = new InventoryElectricChest(entityplayer); - FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiElectricChest(entityplayer.inventory, inventory)); + InventoryPersonalChest inventory = new InventoryPersonalChest(entityplayer); + FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiPersonalChest(entityplayer.inventory, inventory)); entityplayer.openContainer.windowId = windowId; } } } - else if(id == 1) - { - if(isBlock) - { - FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiPasswordEnter(tileEntity)); - } - else { - ItemStack stack = entityplayer.getCurrentEquippedItem(); - - if(stack != null && stack.getItem() instanceof IElectricChest && MachineType.get(stack) == MachineType.ELECTRIC_CHEST) - { - FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiPasswordEnter(stack)); - } - } - } - else if(id == 2) - { - if(isBlock) - { - FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiPasswordModify(tileEntity)); - } - else { - ItemStack stack = entityplayer.getCurrentEquippedItem(); - - if(stack != null && stack.getItem() instanceof IElectricChest && MachineType.get(stack) == MachineType.ELECTRIC_CHEST) - { - FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiPasswordModify(stack)); - } - } - } } @Override @@ -311,7 +278,7 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityGasTank.class, "GasTank", new RenderGasTank()); ClientRegistry.registerTileEntity(TileEntityEnergyCube.class, "EnergyCube", new RenderEnergyCube()); ClientRegistry.registerTileEntity(TileEntityElectricPump.class, "ElectricPump", new RenderElectricPump()); - ClientRegistry.registerTileEntity(TileEntityElectricChest.class, "ElectricChest", new RenderElectricChest()); + ClientRegistry.registerTileEntity(TileEntityPersonalChest.class, "ElectricChest", new RenderPersonalChest()); //TODO rename ClientRegistry.registerTileEntity(TileEntityDynamicTank.class, "DynamicTank", new RenderDynamicTank()); ClientRegistry.registerTileEntity(TileEntityDynamicValve.class, "DynamicValve", new RenderDynamicTank()); ClientRegistry.registerTileEntity(TileEntityChargepad.class, "Chargepad", new RenderChargepad()); @@ -446,10 +413,7 @@ public class ClientProxy extends CommonProxy return new GuiElectricPump(player.inventory, (TileEntityElectricPump)tileEntity); case 18: return new GuiDynamicTank(player.inventory, (TileEntityDynamicTank)tileEntity); - case 19: - return new GuiPasswordEnter((TileEntityElectricChest)tileEntity); - case 20: - return new GuiPasswordModify((TileEntityElectricChest)tileEntity); + //EMPTY 19, 20 case 21: EntityRobit robit = (EntityRobit)world.getEntityByID(x); diff --git a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java index 2d61169c5..c66857b35 100644 --- a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java @@ -11,6 +11,7 @@ import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; @@ -41,6 +42,7 @@ public class GuiAdvancedElectricMachine extends GuiMekanism guiElements.add(new GuiRedstoneControl(this, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiUpgradeTab(this, tileEntity, tileEntity.guiLocation)); + guiElements.add(new GuiSecurityTab(this, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiSideConfigurationTab(this, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiPowerBar(this, tileEntity, tileEntity.guiLocation, 164, 15)); diff --git a/src/main/java/mekanism/client/gui/GuiChanceMachine.java b/src/main/java/mekanism/client/gui/GuiChanceMachine.java index 856a2f770..d2cf784b5 100644 --- a/src/main/java/mekanism/client/gui/GuiChanceMachine.java +++ b/src/main/java/mekanism/client/gui/GuiChanceMachine.java @@ -10,6 +10,7 @@ import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; @@ -39,6 +40,7 @@ public class GuiChanceMachine extends GuiMekanism guiElements.add(new GuiRedstoneControl(this, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiUpgradeTab(this, tileEntity, tileEntity.guiLocation)); + guiElements.add(new GuiSecurityTab(this, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiSideConfigurationTab(this, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiPowerBar(this, tileEntity, tileEntity.guiLocation, 164, 15)); diff --git a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java index 5e8ca3ff3..cc1da4df8 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java @@ -17,6 +17,7 @@ import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; @@ -59,6 +60,7 @@ public class GuiChemicalCrystallizer extends GuiMekanism super(tentity, new ContainerChemicalCrystallizer(inventory, tentity)); tileEntity = tentity; + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png"))); guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png"))); guiElements.add(new GuiUpgradeTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png"))); guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png"), 160, 23)); diff --git a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java index 3fe93088f..a57a0ce17 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java @@ -7,6 +7,7 @@ import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiProgress; @@ -39,6 +40,7 @@ public class GuiChemicalDissolutionChamber extends GuiMekanism super(tentity, new ContainerChemicalDissolutionChamber(inventory, tentity)); tileEntity = tentity; + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalDissolutionChamber.png"))); guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalDissolutionChamber.png"))); guiElements.add(new GuiUpgradeTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalDissolutionChamber.png"))); guiElements.add(new GuiEnergyInfo(new IInfoHandler() { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java index a85f03024..b64e82884 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java @@ -13,6 +13,7 @@ import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -39,6 +40,7 @@ public class GuiChemicalInfuser extends GuiMekanism super(tentity, new ContainerChemicalInfuser(inventory, tentity)); tileEntity = tentity; + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"))); guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"))); guiElements.add(new GuiUpgradeTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"))); guiElements.add(new GuiEnergyInfo(new IInfoHandler() { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java index ec43d1aba..24a2c9715 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java @@ -13,6 +13,7 @@ import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -39,6 +40,7 @@ public class GuiChemicalOxidizer extends GuiMekanism super(tentity, new ContainerChemicalOxidizer(inventory, tentity)); tileEntity = tentity; + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"))); guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"))); guiElements.add(new GuiUpgradeTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"))); guiElements.add(new GuiEnergyInfo(new IInfoHandler() { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java index a83dff1c8..01b90d539 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java @@ -17,6 +17,7 @@ import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -44,6 +45,7 @@ public class GuiChemicalWasher extends GuiMekanism super(tentity, new ContainerChemicalWasher(inventory, tentity)); tileEntity = tentity; + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalWasher.png"))); guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalWasher.png"))); guiElements.add(new GuiUpgradeTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalWasher.png"))); guiElements.add(new GuiBucketIO(this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalWasher.png"))); diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java index c60070eb0..d823730a6 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -10,6 +10,7 @@ import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -51,6 +52,7 @@ public class GuiDigitalMiner extends GuiMekanism tileEntity = tentity; guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiDigitalMiner.png"))); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiDigitalMiner.png"))); guiElements.add(new GuiUpgradeTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiDigitalMiner.png"))); guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiDigitalMiner.png"), 163, 23)); guiElements.add(new GuiVisualsTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiDigitalMiner.png"))); diff --git a/src/main/java/mekanism/client/gui/GuiElectricChest.java b/src/main/java/mekanism/client/gui/GuiElectricChest.java deleted file mode 100644 index 35b9c96b1..000000000 --- a/src/main/java/mekanism/client/gui/GuiElectricChest.java +++ /dev/null @@ -1,186 +0,0 @@ -package mekanism.client.gui; - -import mekanism.api.Coord4D; -import mekanism.api.EnumColor; -import mekanism.api.energy.IEnergizedItem; -import mekanism.client.sound.SoundHandler; -import mekanism.common.Mekanism; -import mekanism.common.base.IElectricChest; -import mekanism.common.inventory.container.ContainerElectricChest; -import mekanism.common.network.PacketElectricChest.ElectricChestMessage; -import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; -import mekanism.common.tile.TileEntityElectricChest; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class GuiElectricChest extends GuiMekanism -{ - public TileEntityElectricChest tileEntity; - public IInventory itemInventory; - public boolean isBlock; - - public GuiElectricChest(InventoryPlayer inventory, TileEntityElectricChest tentity) - { - super(tentity, new ContainerElectricChest(inventory, tentity, null, true)); - - xSize+=26; - ySize+=64; - tileEntity = tentity; - isBlock = true; - } - - public GuiElectricChest(InventoryPlayer inventory, IInventory inv) - { - super(new ContainerElectricChest(inventory, null, inv, false)); - - xSize+=26; - ySize+=64; - itemInventory = inv; - isBlock = false; - } - - @Override - public void initGui() - { - super.initGui(); - - int guiWidth = (width - xSize) / 2; - int guiHeight = (height - ySize) / 2; - - buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 93, guiHeight + 4, 76, 20, LangUtils.localize("gui.electricChest.editPassword"))); - } - - @Override - protected void actionPerformed(GuiButton guibutton) - { - if(guibutton.id == 0) - { - if(isBlock) - { - mc.thePlayer.openGui(Mekanism.instance, 20, mc.theWorld, tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord); - } - else { - FMLClientHandler.instance().displayGuiScreen(mc.thePlayer, new GuiPasswordModify(mc.thePlayer.getCurrentEquippedItem())); - } - } - } - - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) - { - int xAxis = (mouseX - (width - xSize) / 2); - int yAxis = (mouseY - (height - ySize) / 2); - - fontRendererObj.drawString(LangUtils.localize("tile.MachineBlock.ElectricChest.name"), 8, 6, 0x404040); - fontRendererObj.drawString(getLocked() ? EnumColor.DARK_RED + "Locked" : EnumColor.BRIGHT_GREEN + "Unlocked", 97, 137, 0x404040); - fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); - - if(xAxis >= 180 && xAxis <= 184 && yAxis >= 32 && yAxis <= 84) - { - drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(getEnergy()), xAxis, yAxis); - } - - super.drawGuiContainerForegroundLayer(mouseX, mouseY); - } - - @Override - protected void mouseClicked(int mouseX, int mouseY, int button) - { - super.mouseClicked(mouseX, mouseY, button); - - if(button == 0) - { - int xAxis = (mouseX - (width - xSize) / 2); - int yAxis = (mouseY - (height - ySize) / 2); - - if(xAxis >= 179 && xAxis <= 197 && yAxis >= 88 && yAxis <= 106) - { - SoundHandler.playSound("gui.button.press"); - - if(isBlock) - { - Mekanism.packetHandler.sendToServer(new ElectricChestMessage(ElectricChestPacketType.LOCK, !getLocked(), true, 0, 0, null, Coord4D.get(tileEntity))); - } - else { - Mekanism.packetHandler.sendToServer(new ElectricChestMessage(ElectricChestPacketType.LOCK, !getLocked(), false, 0, 0, null, null)); - - ItemStack stack = mc.thePlayer.getCurrentEquippedItem(); - ((IElectricChest)stack.getItem()).setLocked(stack, !getLocked()); - } - } - } - } - - @Override - protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) - { - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiElectricChest.png")); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - int guiWidth = (width - xSize) / 2; - int guiHeight = (height - ySize) / 2; - drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); - - int xAxis = (mouseX - (width - xSize) / 2); - int yAxis = (mouseY - (height - ySize) / 2); - - if(xAxis >= 179 && xAxis <= 197 && yAxis >= 88 && yAxis <= 106) - { - drawTexturedModalRect(guiWidth + 179, guiHeight + 88, 176 + 26, 52, 18, 18); - } - else { - drawTexturedModalRect(guiWidth + 179, guiHeight + 88, 176 + 26, 70, 18, 18); - } - - int displayInt = getScale(); - drawTexturedModalRect(guiWidth + 180, guiHeight + 32 + 52 - displayInt, 176 + 26, 52 - displayInt, 4, displayInt); - } - - public boolean getLocked() - { - if(isBlock) - { - return tileEntity.locked; - } - else { - ItemStack stack = mc.thePlayer.getCurrentEquippedItem(); - return ((IElectricChest)stack.getItem()).getLocked(stack); - } - } - - public int getScale() - { - if(isBlock) - { - return tileEntity.getScaledEnergyLevel(52); - } - else { - ItemStack stack = mc.thePlayer.getCurrentEquippedItem(); - return (int)(((IEnergizedItem)stack.getItem()).getEnergy(stack)*52 / ((IEnergizedItem)stack.getItem()).getMaxEnergy(stack)); - } - } - - public double getEnergy() - { - if(isBlock) - { - return tileEntity.getEnergy(); - } - else { - ItemStack stack = mc.thePlayer.getCurrentEquippedItem(); - return ((IEnergizedItem)stack.getItem()).getEnergy(stack); - } - } -} diff --git a/src/main/java/mekanism/client/gui/GuiElectricMachine.java b/src/main/java/mekanism/client/gui/GuiElectricMachine.java index 238e274b9..66dd6e8b4 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiElectricMachine.java @@ -10,6 +10,7 @@ import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; @@ -39,6 +40,7 @@ public class GuiElectricMachine extends GuiMekanism guiElements.add(new GuiRedstoneControl(this, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiUpgradeTab(this, tileEntity, tileEntity.guiLocation)); + guiElements.add(new GuiSecurityTab(this, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiSideConfigurationTab(this, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiPowerBar(this, tileEntity, tileEntity.guiLocation, 164, 15)); diff --git a/src/main/java/mekanism/client/gui/GuiElectricPump.java b/src/main/java/mekanism/client/gui/GuiElectricPump.java index c77452f5b..adc345534 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricPump.java +++ b/src/main/java/mekanism/client/gui/GuiElectricPump.java @@ -10,6 +10,7 @@ import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -59,6 +60,7 @@ public class GuiElectricPump extends GuiMekanism return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, guiLocation)); + guiElements.add(new GuiSecurityTab(this, tileEntity, guiLocation)); guiElements.add(new GuiRedstoneControl(this, tileEntity, guiLocation)); guiElements.add(new GuiUpgradeTab(this, tileEntity, guiLocation)); } diff --git a/src/main/java/mekanism/client/gui/GuiEntangledBlock.java b/src/main/java/mekanism/client/gui/GuiEntangledBlock.java deleted file mode 100644 index 81db28151..000000000 --- a/src/main/java/mekanism/client/gui/GuiEntangledBlock.java +++ /dev/null @@ -1,130 +0,0 @@ -package mekanism.client.gui; - -import java.util.ArrayList; - -import mekanism.api.Coord4D; -import mekanism.common.Mekanism; -import mekanism.common.inventory.container.ContainerNull; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; -import mekanism.common.tile.TileEntityQuantumEntangloporter; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.gui.GuiTextField; -import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.input.Keyboard; -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class GuiEntangledBlock extends GuiMekanism -{ - public TileEntityQuantumEntangloporter tileEntity; - - public GuiTextField frequencyField; - - public boolean isCreative; - - public GuiEntangledBlock(InventoryPlayer inventory, TileEntityQuantumEntangloporter tentity) - { - super(tentity, new ContainerNull(inventory.player, tentity)); - tileEntity = tentity; - isCreative = inventory.player.capabilities.isCreativeMode; - } - - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) - { - fontRendererObj.drawString(tileEntity.getInventoryName(), 55, 6, 0x404040); - fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); - - super.drawGuiContainerForegroundLayer(mouseX, mouseY); - } - - @Override - protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) - { - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png")); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - int guiWidth = (width - xSize) / 2; - int guiHeight = (height - ySize) / 2; - drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); - - super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); - - frequencyField.drawTextBox(); - } - - @Override - public void updateScreen() - { - super.updateScreen(); - - frequencyField.updateCursorCounter(); - } - - @Override - public void mouseClicked(int mouseX, int mouseY, int button) - { - super.mouseClicked(mouseX, mouseY, button); - - frequencyField.mouseClicked(mouseX, mouseY, button); - } - - @Override - public void keyTyped(char c, int i) - { - if(!frequencyField.isFocused() || i == Keyboard.KEY_ESCAPE) - { - super.keyTyped(c, i); - } - - if(i == Keyboard.KEY_RETURN) - { - if(frequencyField.isFocused()) - { - setFrequency(); - } - } - - frequencyField.textboxKeyTyped(c, i); - } - - private void setFrequency() - { - if(!frequencyField.getText().isEmpty()) - { - String toUse; - - toUse = frequencyField.getText(); - - ArrayList data = new ArrayList(); - data.add(0); - data.add(toUse); - - if(!toUse.startsWith("creative.") || isCreative) - { - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); - } - - frequencyField.setText(""); - } - } - - @Override - public void initGui() - { - super.initGui(); - - int guiWidth = (width - xSize) / 2; - int guiHeight = (height - ySize) / 2; - - String prevFreq = frequencyField != null ? frequencyField.getText() : ""; - - frequencyField = new GuiTextField(fontRendererObj, guiWidth + 75, guiHeight + 55, 96, 11); - frequencyField.setText(prevFreq); - } -} diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index 09455277f..a8f7967c0 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -9,6 +9,7 @@ import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiRecipeType; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSortingTab; import mekanism.client.gui.element.GuiTransporterConfigTab; @@ -47,6 +48,7 @@ public class GuiFactory extends GuiMekanism ySize += 11; guiElements.add(new GuiRedstoneControl(this, tileEntity, tileEntity.tier.guiLocation)); + guiElements.add(new GuiSecurityTab(this, tileEntity, tileEntity.tier.guiLocation)); guiElements.add(new GuiUpgradeTab(this, tileEntity, tileEntity.tier.guiLocation)); guiElements.add(new GuiRecipeType(this, tileEntity, tileEntity.tier.guiLocation)); guiElements.add(new GuiSideConfigurationTab(this, tileEntity, tileEntity.tier.guiLocation)); diff --git a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java index dd79025d9..ced3e4ed5 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java +++ b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java @@ -10,6 +10,7 @@ import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -59,6 +60,7 @@ public class GuiFluidicPlenisher extends GuiMekanism return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, guiLocation)); + guiElements.add(new GuiSecurityTab(this, tileEntity, guiLocation)); guiElements.add(new GuiRedstoneControl(this, tileEntity, guiLocation)); guiElements.add(new GuiUpgradeTab(this, tileEntity, guiLocation)); } diff --git a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java index 6d06c1fe5..3bf3c1b9c 100644 --- a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java +++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java @@ -9,6 +9,7 @@ import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; @@ -42,6 +43,7 @@ public class GuiFormulaicAssemblicator extends GuiMekanism { super(tentity, new ContainerFormulaicAssemblicator(inventory, tentity)); tileEntity = tentity; + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"))); guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"))); guiElements.add(new GuiSideConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"))); guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"))); diff --git a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java index 6e088943b..5b95535d6 100644 --- a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java +++ b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java @@ -8,6 +8,7 @@ import mekanism.client.gui.element.GuiGauge.Type; import mekanism.client.gui.element.GuiNumberGauge; import mekanism.client.gui.element.GuiNumberGauge.INumberInfoHandler; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.render.MekanismRenderer; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerLaserAmplifier; @@ -66,6 +67,7 @@ public class GuiLaserAmplifier extends GuiMekanism return LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(level); } }, Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 6, 10)); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiDetectionTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); } diff --git a/src/main/java/mekanism/client/gui/GuiLaserTractorBeam.java b/src/main/java/mekanism/client/gui/GuiLaserTractorBeam.java index d1cc2b705..1f5641b62 100644 --- a/src/main/java/mekanism/client/gui/GuiLaserTractorBeam.java +++ b/src/main/java/mekanism/client/gui/GuiLaserTractorBeam.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.common.inventory.container.ContainerLaserTractorBeam; import mekanism.common.tile.TileEntityLaserTractorBeam; import mekanism.common.util.LangUtils; @@ -17,6 +18,8 @@ public class GuiLaserTractorBeam extends GuiMekanism { super(tentity, new ContainerLaserTractorBeam(inventory, tentity)); tileEntity = tentity; + + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFullInv.png"))); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java index 22487318d..a16f508bd 100644 --- a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java +++ b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java @@ -10,6 +10,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; @@ -92,6 +93,7 @@ public class GuiLogisticalSorter extends GuiMekanism // Add common Mekanism gui elements guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiLogisticalSorter.png"))); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiLogisticalSorter.png"))); } public int getScroll() diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificator.java b/src/main/java/mekanism/client/gui/GuiOredictionificator.java index 6118d27cf..ccd659c88 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificator.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificator.java @@ -9,6 +9,8 @@ import mekanism.api.EnumColor; import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.render.MekanismRenderer; @@ -50,6 +52,8 @@ public class GuiOredictionificator extends GuiMekanism super(tentity, new ContainerOredictionificator(inventory, tentity)); tileEntity = tentity; + guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiOredictionificator.png"))); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiOredictionificator.png"))); guiElements.add(new GuiProgress(new IProgressInfoHandler() { @Override diff --git a/src/main/java/mekanism/client/gui/GuiPRC.java b/src/main/java/mekanism/client/gui/GuiPRC.java index 0862c96d6..0f951adc3 100644 --- a/src/main/java/mekanism/client/gui/GuiPRC.java +++ b/src/main/java/mekanism/client/gui/GuiPRC.java @@ -16,6 +16,7 @@ import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; @@ -46,6 +47,7 @@ public class GuiPRC extends GuiMekanism tileEntity = tentity; guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiSideConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiUpgradeTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); diff --git a/src/main/java/mekanism/client/gui/GuiPasswordEnter.java b/src/main/java/mekanism/client/gui/GuiPasswordEnter.java deleted file mode 100644 index e07b1651e..000000000 --- a/src/main/java/mekanism/client/gui/GuiPasswordEnter.java +++ /dev/null @@ -1,191 +0,0 @@ -package mekanism.client.gui; - -import mekanism.api.Coord4D; -import mekanism.api.EnumColor; -import mekanism.api.energy.IEnergizedItem; -import mekanism.client.sound.SoundHandler; -import mekanism.common.Mekanism; -import mekanism.common.base.IElectricChest; -import mekanism.common.network.PacketElectricChest.ElectricChestMessage; -import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; -import mekanism.common.tile.TileEntityElectricChest; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.gui.GuiTextField; -import net.minecraft.item.ItemStack; - -import org.lwjgl.input.Keyboard; -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class GuiPasswordEnter extends GuiScreen -{ - public int xSize = 176; - public int ySize = 95; - - public TileEntityElectricChest tileEntity; - - public ItemStack itemStack; - - public boolean isBlock; - - public GuiTextField passwordField; - - public String displayText = EnumColor.BRIGHT_GREEN + LangUtils.localize("gui.password.enterPassword"); - - public int ticker = 0; - - public GuiPasswordEnter(TileEntityElectricChest tileentity) - { - isBlock = true; - tileEntity = tileentity; - } - - public GuiPasswordEnter(ItemStack itemstack) - { - isBlock = false; - itemStack = itemstack; - } - - @Override - protected void mouseClicked(int mouseX, int mouseY, int button) - { - super.mouseClicked(mouseX, mouseY, button); - passwordField.mouseClicked(mouseX, mouseY, button); - } - - @Override - public void initGui() - { - super.initGui(); - - int guiWidth = (width - xSize) / 2; - int guiHeight = (height - ySize) / 2; - - buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 55, guiHeight + 68, 60, 20, LangUtils.localize("gui.open"))); - - passwordField = new GuiTextField(fontRendererObj, guiWidth + 45, guiHeight + 50, 80, 12); - passwordField.setMaxStringLength(12); - passwordField.setFocused(true); - } - - @Override - public void keyTyped(char c, int i) - { - super.keyTyped(c, i); - - if(i == Keyboard.KEY_RETURN) - { - tryOpen(); - } - - passwordField.textboxKeyTyped(c, i); - } - - @Override - public boolean doesGuiPauseGame() - { - return false; - } - - @Override - public void updateScreen() - { - passwordField.updateCursorCounter(); - - if(ticker > 0) - { - ticker--; - } - else { - displayText = EnumColor.BRIGHT_GREEN + LangUtils.localize("gui.password.enterPassword"); - } - } - - @Override - protected void actionPerformed(GuiButton guibutton) - { - if(guibutton.id == 0) - { - tryOpen(); - } - } - - public void tryOpen() - { - if(passwordField.getText() == null || passwordField.getText() == "") - { - displayText = EnumColor.DARK_RED + LangUtils.localize("gui.password.fieldsEmpty"); - SoundHandler.playSound("mekanism:etc.Error"); - ticker = 30; - } - else if(!getPassword().equals(passwordField.getText())) - { - displayText = EnumColor.DARK_RED + LangUtils.localize("gui.password.invalid"); - passwordField.setText(""); - SoundHandler.playSound("mekanism:etc.Error"); - ticker = 30; - } - else { - if(isBlock) - { - tileEntity.setEnergy(tileEntity.getEnergy() - 100); - Mekanism.packetHandler.sendToServer(new ElectricChestMessage(ElectricChestPacketType.SERVER_OPEN, true, true, 0, 0, null, Coord4D.get(tileEntity))); - } - else { - ((IEnergizedItem)itemStack.getItem()).setEnergy(itemStack, ((IEnergizedItem)itemStack.getItem()).getEnergy(itemStack) - 100); - Mekanism.packetHandler.sendToServer(new ElectricChestMessage(ElectricChestPacketType.SERVER_OPEN, true, false, 0, 0, null, null)); - } - - SoundHandler.playSound("mekanism:etc.Success"); - } - } - - public String getPassword() - { - if(isBlock) - { - return tileEntity.password; - } - else { - return ((IElectricChest)itemStack.getItem()).getPassword(itemStack); - } - } - - @Override - public void drawScreen(int mouseX, int mouseY, float partialTick) - { - drawDefaultBackground(); - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiPasswordEnter.png")); - - int guiWidth = (width - xSize) / 2; - int guiHeight = (height - ySize) / 2; - - drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); - String actualPass = passwordField.getText(); - String censored = new String(new char[actualPass.length()]).replace("\0", "*"); - passwordField.setText(censored); - passwordField.drawTextBox(); - passwordField.setText(actualPass); - - super.drawScreen(mouseX, mouseY, partialTick); - - fontRendererObj.drawString(LangUtils.localize("gui.password"), guiWidth + 64, guiHeight + 5, 0x404040); - fontRendererObj.drawString("Enter:", guiWidth + 45, guiHeight + 40, 0x404040); - fontRendererObj.drawString(displayText, guiWidth + 37, guiHeight + 19, 0x404040); - - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glEnable(GL11.GL_DEPTH_TEST); - } -} diff --git a/src/main/java/mekanism/client/gui/GuiPasswordModify.java b/src/main/java/mekanism/client/gui/GuiPasswordModify.java deleted file mode 100644 index a30af375f..000000000 --- a/src/main/java/mekanism/client/gui/GuiPasswordModify.java +++ /dev/null @@ -1,222 +0,0 @@ -package mekanism.client.gui; - -import mekanism.api.Coord4D; -import mekanism.api.EnumColor; -import mekanism.common.Mekanism; -import mekanism.common.base.IElectricChest; -import mekanism.common.network.PacketElectricChest.ElectricChestMessage; -import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; -import mekanism.common.tile.TileEntityElectricChest; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.gui.GuiTextField; -import net.minecraft.item.ItemStack; - -import org.lwjgl.input.Keyboard; -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class GuiPasswordModify extends GuiScreen -{ - public int xSize = 176; - public int ySize = 95; - - public TileEntityElectricChest tileEntity; - - public ItemStack itemStack; - - public boolean isBlock; - - public GuiTextField newPasswordField; - - public GuiTextField confirmPasswordField; - - public String displayText = EnumColor.BRIGHT_GREEN + LangUtils.localize("gui.password.setPassword"); - - public int ticker = 0; - - public GuiPasswordModify(TileEntityElectricChest tileentity) - { - isBlock = true; - tileEntity = tileentity; - } - - public GuiPasswordModify(ItemStack itemstack) - { - isBlock = false; - itemStack = itemstack; - } - - @Override - public void initGui() - { - super.initGui(); - - int guiWidth = (width - xSize) / 2; - int guiHeight = (height - ySize) / 2; - - buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 55, guiHeight + 68, 60, 20, LangUtils.localize("gui.confirm"))); - - newPasswordField = new GuiTextField(fontRendererObj, guiWidth + 60, guiHeight + 34, 80, 12); - newPasswordField.setMaxStringLength(12); - newPasswordField.setFocused(true); - - confirmPasswordField = new GuiTextField(fontRendererObj, guiWidth + 60, guiHeight + 51, 80, 12); - confirmPasswordField.setMaxStringLength(12); - confirmPasswordField.setFocused(false); - } - - @Override - protected void mouseClicked(int mouseX, int mouseY, int button) - { - super.mouseClicked(mouseX, mouseY, button); - newPasswordField.mouseClicked(mouseX, mouseY, button); - confirmPasswordField.mouseClicked(mouseX, mouseY, button); - } - - @Override - public void keyTyped(char c, int i) - { - super.keyTyped(c, i); - - if(i == Keyboard.KEY_TAB) - { - if(!newPasswordField.isFocused() && !confirmPasswordField.isFocused()) - { - newPasswordField.setFocused(true); - return; - } - else if(newPasswordField.isFocused() && confirmPasswordField.isFocused()) - { - newPasswordField.setFocused(true); - confirmPasswordField.setFocused(false); - return; - } - else { - newPasswordField.setFocused(!newPasswordField.isFocused()); - confirmPasswordField.setFocused(!confirmPasswordField.isFocused()); - return; - } - } - else if(i == Keyboard.KEY_RETURN) - { - tryModify(); - } - - newPasswordField.textboxKeyTyped(c, i); - confirmPasswordField.textboxKeyTyped(c, i); - } - - @Override - public boolean doesGuiPauseGame() - { - return false; - } - - @Override - public void updateScreen() - { - newPasswordField.updateCursorCounter(); - - if(ticker > 0) - { - ticker--; - } - else { - displayText = EnumColor.BRIGHT_GREEN + LangUtils.localize("gui.password.setPassword"); - } - } - - @Override - protected void actionPerformed(GuiButton guibutton) - { - if(guibutton.id == 0) - { - tryModify(); - } - } - - public void tryModify() - { - if(newPasswordField.getText() == null || newPasswordField.getText().equals("") || confirmPasswordField.getText() == null || confirmPasswordField.getText().equals("")) - { - displayText = EnumColor.DARK_RED + LangUtils.localize("gui.password.fieldsEmpty"); - ticker = 30; - } - else if(!newPasswordField.getText().equals(confirmPasswordField.getText())) - { - displayText = EnumColor.DARK_RED + LangUtils.localize("gui.password.notMatching"); - ticker = 30; - } - else if(confirmPasswordField.getText().equals(getPassword())) - { - displayText = EnumColor.DARK_RED + LangUtils.localize("gui.password.identical"); - ticker = 30; - } - else { - if(isBlock) - { - Mekanism.packetHandler.sendToServer(new ElectricChestMessage(ElectricChestPacketType.PASSWORD, true, false, 0, 0, confirmPasswordField.getText(), Coord4D.get(tileEntity))); - Mekanism.packetHandler.sendToServer(new ElectricChestMessage(ElectricChestPacketType.SERVER_OPEN, false, true, 0, 0, null, Coord4D.get(tileEntity))); - } - else { - ((IElectricChest)itemStack.getItem()).setPassword(itemStack, confirmPasswordField.getText()); - Mekanism.packetHandler.sendToServer(new ElectricChestMessage(ElectricChestPacketType.PASSWORD, false, false, 0, 0, confirmPasswordField.getText(), null)); - Mekanism.packetHandler.sendToServer(new ElectricChestMessage(ElectricChestPacketType.SERVER_OPEN, false, false, 0, 0, null, null)); - } - } - } - - public String getPassword() - { - if(isBlock) - { - return tileEntity.password; - } - else { - return ((IElectricChest)itemStack.getItem()).getPassword(itemStack); - } - } - - @Override - public void drawScreen(int mouseX, int mouseY, float partialTick) - { - drawDefaultBackground(); - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiPasswordModify.png")); - - int guiWidth = (width - xSize) / 2; - int guiHeight = (height - ySize) / 2; - - drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); - - super.drawScreen(mouseX, mouseY, partialTick); - - fontRendererObj.drawString(LangUtils.localize("gui.password"), guiWidth + 64, guiHeight + 5, 0x404040); - fontRendererObj.drawString(displayText, guiWidth + 37, guiHeight + 19, 0x404040); - fontRendererObj.drawString("Enter:", guiWidth + 27, guiHeight + 37, 0x404040); - fontRendererObj.drawString("Repeat:", guiWidth + 21, guiHeight + 54, 0x404040); - String actualPass = newPasswordField.getText(); - String censored = new String(new char[actualPass.length()]).replace("\0", "*"); - newPasswordField.setText(censored); - newPasswordField.drawTextBox(); - newPasswordField.setText(actualPass); - actualPass = confirmPasswordField.getText(); - censored = new String(new char[actualPass.length()]).replace("\0", "*"); - confirmPasswordField.setText(censored); - confirmPasswordField.drawTextBox(); - confirmPasswordField.setText(actualPass); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glEnable(GL11.GL_DEPTH_TEST); - } -} diff --git a/src/main/java/mekanism/client/gui/GuiPersonalChest.java b/src/main/java/mekanism/client/gui/GuiPersonalChest.java new file mode 100644 index 000000000..393446ed3 --- /dev/null +++ b/src/main/java/mekanism/client/gui/GuiPersonalChest.java @@ -0,0 +1,70 @@ +package mekanism.client.gui; + +import mekanism.client.gui.element.GuiSecurityTab; +import mekanism.common.inventory.container.ContainerPersonalChest; +import mekanism.common.tile.TileEntityPersonalChest; +import mekanism.common.util.LangUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.IInventory; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiPersonalChest extends GuiMekanism +{ + public TileEntityPersonalChest tileEntity; + public IInventory itemInventory; + public boolean isBlock; + + public GuiPersonalChest(InventoryPlayer inventory, TileEntityPersonalChest tentity) + { + super(tentity, new ContainerPersonalChest(inventory, tentity, null, true)); + + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiPersonalChest.png"))); + + xSize+=26; + ySize+=64; + tileEntity = tentity; + isBlock = true; + } + + public GuiPersonalChest(InventoryPlayer inventory, IInventory inv) + { + super(new ContainerPersonalChest(inventory, null, inv, false)); + + xSize+=26; + ySize+=64; + itemInventory = inv; + isBlock = false; + } + + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) + { + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + fontRendererObj.drawString(LangUtils.localize("tile.MachineBlock.PersonalChest.name"), 8, 6, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + + super.drawGuiContainerForegroundLayer(mouseX, mouseY); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) + { + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiPersonalChest.png")); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + int guiWidth = (width - xSize) / 2; + int guiHeight = (height - ySize) / 2; + drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); + + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + } +} diff --git a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java index ced64de7b..b128b8894 100644 --- a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java @@ -6,6 +6,7 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.gui.element.GuiScrollList; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiTransporterConfigTab; import mekanism.client.sound.SoundHandler; @@ -61,6 +62,7 @@ public class GuiQuantumEntangloporter extends GuiMekanism resource = MekanismUtils.getResource(ResourceType.GUI, "GuiTeleporter.png"); guiElements.add(scrollList = new GuiScrollList(this, resource, 28, 37, 120, 4)); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTeleporter.png"))); guiElements.add(new GuiSideConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTeleporter.png"))); guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTeleporter.png"))); @@ -122,7 +124,7 @@ public class GuiQuantumEntangloporter extends GuiMekanism public void updateButtons() { - if(tileEntity.owner == null) + if(tileEntity.getSecurity().getOwner() == null) { return; } @@ -167,7 +169,7 @@ public class GuiQuantumEntangloporter extends GuiMekanism setButton.enabled = false; } - if(tileEntity.owner.equals(freq.owner)) + if(tileEntity.getSecurity().getOwner().equals(freq.owner)) { deleteButton.enabled = true; } @@ -298,8 +300,7 @@ public class GuiQuantumEntangloporter extends GuiMekanism int yAxis = (mouseY-(height-ySize)/2); fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 4, 0x404040); - fontRendererObj.drawString(LangUtils.localize("gui.owner") + ": " + (tileEntity.owner != null ? tileEntity.owner : LangUtils.localize("gui.none")), 8, (ySize-96)+4, 0x404040); - + fontRendererObj.drawString(LangUtils.localize("gui.freq") + ":", 32, 81, 0x404040); fontRendererObj.drawString(LangUtils.localize("gui.security") + ":", 32, 91, 0x404040); diff --git a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java index a7b5720d8..9b21baf9f 100644 --- a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java +++ b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java @@ -12,6 +12,7 @@ import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiHeatInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -46,6 +47,7 @@ public class GuiResistiveHeater extends GuiMekanism guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"), 164, 15)); guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"), 14, 34).with(SlotOverlay.POWER)); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"))); guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"))); guiElements.add(new GuiEnergyInfo(new IInfoHandler() { @Override diff --git a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java index 981b4b66c..02d6614fe 100644 --- a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java @@ -17,6 +17,7 @@ import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -47,6 +48,7 @@ public class GuiRotaryCondensentrator extends GuiMekanism super(tentity, new ContainerRotaryCondensentrator(inventory, tentity)); tileEntity = tentity; + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png"))); guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png"))); guiElements.add(new GuiUpgradeTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png"))); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png"), 4, 24).with(SlotOverlay.PLUS)); diff --git a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java index cc813c4cf..41870e3b4 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java @@ -8,6 +8,7 @@ import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -33,6 +34,7 @@ public class GuiSeismicVibrator extends GuiMekanism super(tentity, new ContainerSeismicVibrator(inventory, tentity)); tileEntity = tentity; + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiSeismicVibrator.png"))); guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiSeismicVibrator.png"))); guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiSeismicVibrator.png"), 164, 15)); guiElements.add(new GuiEnergyInfo(new IInfoHandler() { diff --git a/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java b/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java index 8dff192fc..7861888bf 100644 --- a/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java +++ b/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java @@ -8,6 +8,7 @@ import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -33,6 +34,7 @@ public class GuiSolarNeutronActivator extends GuiMekanism super(tentity, new ContainerSolarNeutronActivator(inventory, tentity)); tileEntity = tentity; + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 4, 55).with(SlotOverlay.MINUS)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 154, 55).with(SlotOverlay.PLUS)); diff --git a/src/main/java/mekanism/client/gui/GuiTeleporter.java b/src/main/java/mekanism/client/gui/GuiTeleporter.java index e40ac8acb..e92168463 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -7,7 +7,9 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; +import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiScrollList; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -75,6 +77,8 @@ public class GuiTeleporter extends GuiMekanism tileEntity = tentity; resource = MekanismUtils.getResource(ResourceType.GUI, "GuiTeleporter.png"); + guiElements.add(new GuiRedstoneControl(this, tileEntity, resource)); + guiElements.add(new GuiSecurityTab(this, tileEntity, resource)); guiElements.add(new GuiPowerBar(this, new IPowerInfoHandler() { @Override public String getTooltip() @@ -463,7 +467,7 @@ public class GuiTeleporter extends GuiMekanism private String getOwner() { - return tileEntity != null ? tileEntity.owner : entityPlayer.getCommandSenderName(); + return tileEntity != null ? tileEntity.getSecurity().getOwner() : entityPlayer.getCommandSenderName(); } private byte getStatus() diff --git a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java index 04dac937a..d0537633b 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -76,7 +76,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemRenderingHandler implements IItemRenderer { public ModelRobit robit = new ModelRobit(); - public ModelChest electricChest = new ModelChest(); + public ModelChest personalChest = new ModelChest(); public ModelEnergyCube energyCube = new ModelEnergyCube(); public ModelEnergyCore energyCore = new ModelEnergyCore(); public ModelGasTank gasTank = new ModelGasTank(); @@ -325,7 +325,7 @@ public class ItemRenderingHandler implements IItemRenderer MekanismRenderer.glowOff(); } } - else if(MachineType.get(item) == MachineType.ELECTRIC_CHEST) + else if(MachineType.get(item) == MachineType.PERSONAL_CHEST) { GL11.glPushMatrix(); ItemBlockMachine chest = (ItemBlockMachine)item.getItem(); @@ -335,9 +335,9 @@ public class ItemRenderingHandler implements IItemRenderer GL11.glTranslatef(0, 1.0F, 1.0F); GL11.glScalef(1.0F, -1F, -1F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectricChest.png")); + Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PersonalChest.png")); - electricChest.renderAll(); + personalChest.renderAll(); GL11.glPopMatrix(); } else if(item.getItem() instanceof ItemRobit) diff --git a/src/main/java/mekanism/client/render/tileentity/RenderElectricChest.java b/src/main/java/mekanism/client/render/tileentity/RenderPersonalChest.java similarity index 82% rename from src/main/java/mekanism/client/render/tileentity/RenderElectricChest.java rename to src/main/java/mekanism/client/render/tileentity/RenderPersonalChest.java index 6cc21badb..4da18412d 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderElectricChest.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderPersonalChest.java @@ -1,6 +1,6 @@ package mekanism.client.render.tileentity; -import mekanism.common.tile.TileEntityElectricChest; +import mekanism.common.tile.TileEntityPersonalChest; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.model.ModelChest; @@ -13,22 +13,22 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class RenderElectricChest extends TileEntitySpecialRenderer +public class RenderPersonalChest extends TileEntitySpecialRenderer { private ModelChest model = new ModelChest(); @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) { - renderAModelAt((TileEntityElectricChest)tileEntity, x, y, z, partialTick); + renderAModelAt((TileEntityPersonalChest)tileEntity, x, y, z, partialTick); } - private void renderAModelAt(TileEntityElectricChest tileEntity, double x, double y, double z, float partialTick) + private void renderAModelAt(TileEntityPersonalChest tileEntity, double x, double y, double z, float partialTick) { GL11.glPushMatrix(); GL11.glTranslatef((float)x, (float)y + 1.0F, (float)z); GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectricChest.png")); + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PersonalChest.png")); switch(tileEntity.facing) { diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 8565297f7..f1a0ed2bf 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -79,7 +79,6 @@ import mekanism.common.tile.TileEntityCrusher; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.tile.TileEntityDynamicValve; -import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.tile.TileEntityElectricMachine; import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.tile.TileEntityElectrolyticSeparator; @@ -106,6 +105,7 @@ import mekanism.common.tile.TileEntityObsidianTNT; import mekanism.common.tile.TileEntityOredictionificator; import mekanism.common.tile.TileEntityOsmiumCompressor; import mekanism.common.tile.TileEntityPRC; +import mekanism.common.tile.TileEntityPersonalChest; import mekanism.common.tile.TileEntityPrecisionSawmill; import mekanism.common.tile.TileEntityPurificationChamber; import mekanism.common.tile.TileEntityQuantumEntangloporter; @@ -169,7 +169,7 @@ public class CommonProxy implements IGuiProvider GameRegistry.registerTileEntity(TileEntityGasTank.class, "GasTank"); GameRegistry.registerTileEntity(TileEntityEnergyCube.class, "EnergyCube"); GameRegistry.registerTileEntity(TileEntityElectricPump.class, "ElectricPump"); - GameRegistry.registerTileEntity(TileEntityElectricChest.class, "ElectricChest"); + GameRegistry.registerTileEntity(TileEntityPersonalChest.class, "ElectricChest"); //TODO rename GameRegistry.registerTileEntity(TileEntityDynamicTank.class, "DynamicTank"); GameRegistry.registerTileEntity(TileEntityDynamicValve.class, "DynamicValve"); GameRegistry.registerTileEntity(TileEntityChargepad.class, "Chargepad"); @@ -212,16 +212,16 @@ public class CommonProxy implements IGuiProvider public void handleTeleporterUpdate(PortableTeleporterMessage message) {} /** - * Handles an ELECTRIC_CHEST_CLIENT_OPEN packet via the proxy, not handled on the server-side. + * Handles an PERSONAL_CHEST_CLIENT_OPEN packet via the proxy, not handled on the server-side. * @param entityplayer - player the packet was sent from - * @param id - the electric chest gui ID to open + * @param id - the gui ID to open * @param windowId - the container-specific window ID * @param isBlock - if the chest is a block * @param x - x coordinate * @param y - y coordinate * @param z - z coordinate */ - public void openElectricChest(EntityPlayer entityplayer, int id, int windowId, boolean isBlock, int x, int y, int z) {} + public void openPersonalChest(EntityPlayer entityplayer, int id, int windowId, boolean isBlock, int x, int y, int z) {} /** * Register and load client-only render information. @@ -250,7 +250,6 @@ public class CommonProxy implements IGuiProvider general.voiceServerEnabled = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "VoiceServerEnabled", true).getBoolean(); general.cardboardSpawners = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AllowSpawnerBoxPickup", true).getBoolean(); general.enableWorldRegeneration = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnableWorldRegeneration", false).getBoolean(); - general.creativeOverrideElectricChest = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "CreativeOverrideElectricChest", true).getBoolean(); general.spawnBabySkeletons = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "SpawnBabySkeletons", true).getBoolean(); general.obsidianTNTDelay = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ObsidianTNTDelay", 100).getInt(); general.obsidianTNTBlastRadius = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ObsidianTNTBlastRadius", 12).getInt(); diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index bff0f0c32..7a592d5c4 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -352,7 +352,7 @@ public class Mekanism MachineType.ELECTRIC_PUMP.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 12), new Object[] { " B ", "ECE", "OOO", Character.valueOf('B'), Items.bucket, Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('C'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('O'), "ingotOsmium" })); - MachineType.ELECTRIC_CHEST.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 13), new Object[] { + MachineType.PERSONAL_CHEST.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 13), new Object[] { "SGS", "CcC", "SSS", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), Blocks.chest, Character.valueOf('c'), MekanismUtils.getControlCircuit(BaseTier.BASIC) })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 4, 9), new Object[] { diff --git a/src/main/java/mekanism/common/PacketHandler.java b/src/main/java/mekanism/common/PacketHandler.java index 08c32f438..e4d2ae12d 100644 --- a/src/main/java/mekanism/common/PacketHandler.java +++ b/src/main/java/mekanism/common/PacketHandler.java @@ -27,8 +27,8 @@ import mekanism.common.network.PacketEditFilter; import mekanism.common.network.PacketEditFilter.EditFilterMessage; import mekanism.common.network.PacketElectricBowState; import mekanism.common.network.PacketElectricBowState.ElectricBowStateMessage; -import mekanism.common.network.PacketElectricChest; -import mekanism.common.network.PacketElectricChest.ElectricChestMessage; +import mekanism.common.network.PacketPersonalChest; +import mekanism.common.network.PacketPersonalChest.PersonalChestMessage; import mekanism.common.network.PacketFlamethrowerData; import mekanism.common.network.PacketFlamethrowerData.FlamethrowerDataMessage; import mekanism.common.network.PacketJetpackData; @@ -94,8 +94,8 @@ public class PacketHandler { netHandler.registerMessage(PacketRobit.class, RobitMessage.class, 0, Side.SERVER); netHandler.registerMessage(PacketTransmitterUpdate.class, TransmitterUpdateMessage.class, 1, Side.CLIENT); - netHandler.registerMessage(PacketElectricChest.class, ElectricChestMessage.class, 2, Side.CLIENT); - netHandler.registerMessage(PacketElectricChest.class, ElectricChestMessage.class, 2, Side.SERVER); + netHandler.registerMessage(PacketPersonalChest.class, PersonalChestMessage.class, 2, Side.CLIENT); + netHandler.registerMessage(PacketPersonalChest.class, PersonalChestMessage.class, 2, Side.SERVER); netHandler.registerMessage(PacketElectricBowState.class, ElectricBowStateMessage.class, 3, Side.SERVER); netHandler.registerMessage(PacketConfiguratorState.class, ConfiguratorStateMessage.class, 4, Side.SERVER); netHandler.registerMessage(PacketTileEntity.class, TileEntityMessage.class, 5, Side.CLIENT); diff --git a/src/main/java/mekanism/common/base/IElectricChest.java b/src/main/java/mekanism/common/base/IElectricChest.java deleted file mode 100644 index f1861fb52..000000000 --- a/src/main/java/mekanism/common/base/IElectricChest.java +++ /dev/null @@ -1,53 +0,0 @@ -package mekanism.common.base; - -import net.minecraft.item.ItemStack; - -/** - * Internal interface used for managing Electric Chests. - * @author aidancbrady - * - */ -public interface IElectricChest -{ - /** - * Sets the 'authenticated' value of this electric chest to a new value. - * @param itemStack - electric chest ItemStack - * @param auth - new value - */ - public void setAuthenticated(ItemStack itemStack, boolean auth); - - /** - * Retrieves the 'authenticated' value of this electric chest. - * @param itemStack - electric chest ItemStack - * @return authenticated value - */ - public boolean getAuthenticated(ItemStack itemStack); - - /** - * Sets the 'password' value of this electric chest to a new value. - * @param itemStack - electric chest ItemStack - * @param pass - new value - */ - public void setPassword(ItemStack itemStack, String pass); - - /** - * Retrieves the 'password' value of this electric chest. - * @param itemStack - electric chest ItemStack - * @return authenticated value - */ - public String getPassword(ItemStack itemStack); - - /** - * Sets the 'locked' value of this electric chest to a new value. - * @param itemStack - electric chest ItemStack - * @param locked - new value - */ - public void setLocked(ItemStack itemStack, boolean locked); - - /** - * Retrieves the 'locked' value of this electric chest. - * @param itemStack - electric chest ItemStack - * @return authenticated value - */ - public boolean getLocked(ItemStack itemStack); -} diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 6cce3d492..dfb6a5923 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -8,7 +8,6 @@ import java.util.List; import java.util.Random; import mekanism.api.Coord4D; -import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.client; import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.machines; @@ -26,7 +25,6 @@ import mekanism.common.Tier.FluidTankTier; import mekanism.common.base.IActiveState; import mekanism.common.base.IBlockCTM; import mekanism.common.base.IBoundingBlock; -import mekanism.common.base.IElectricChest; import mekanism.common.base.IFactory; import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.IRedstoneControl; @@ -38,14 +36,12 @@ import mekanism.common.base.ISustainedTank; import mekanism.common.base.ITierItem; import mekanism.common.base.IUpgradeTile; import mekanism.common.item.ItemBlockMachine; -import mekanism.common.network.PacketElectricChest.ElectricChestMessage; -import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage; import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.recipe.ShapedMekanismRecipe; +import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; import mekanism.common.security.ISecurityTile.SecurityMode; -import mekanism.common.security.ISecurityItem; import mekanism.common.tile.TileEntityAdvancedFactory; import mekanism.common.tile.TileEntityAmbientAccumulator; import mekanism.common.tile.TileEntityBasicBlock; @@ -60,7 +56,6 @@ import mekanism.common.tile.TileEntityCombiner; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.tile.TileEntityCrusher; import mekanism.common.tile.TileEntityDigitalMiner; -import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.tile.TileEntityElectrolyticSeparator; import mekanism.common.tile.TileEntityEliteFactory; @@ -78,6 +73,7 @@ import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.tile.TileEntityOredictionificator; import mekanism.common.tile.TileEntityOsmiumCompressor; import mekanism.common.tile.TileEntityPRC; +import mekanism.common.tile.TileEntityPersonalChest; import mekanism.common.tile.TileEntityPrecisionSawmill; import mekanism.common.tile.TileEntityPurificationChamber; import mekanism.common.tile.TileEntityQuantumEntangloporter; @@ -105,7 +101,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; @@ -314,16 +309,6 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo } } } - else if(tileEntity instanceof TileEntityTeleporter) - { - TileEntityTeleporter teleporter = (TileEntityTeleporter)tileEntity; - teleporter.owner = entityliving.getCommandSenderName(); - } - else if(tileEntity instanceof TileEntityQuantumEntangloporter) - { - TileEntityQuantumEntangloporter entangloporter = (TileEntityQuantumEntangloporter)tileEntity; - entangloporter.owner = entityliving.getCommandSenderName(); - } tileEntity.setFacing((short)change); tileEntity.redstone = world.isBlockIndirectlyGettingPowered(x, y, z); @@ -580,45 +565,46 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo if(MekanismUtils.hasUsableWrench(entityplayer, x, y, z)) { - if(entityplayer.isSneaking() && MachineType.get(blockType, metadata) != MachineType.ELECTRIC_CHEST) + if(SecurityUtils.canAccess(entityplayer, tileEntity)) { - if(SecurityUtils.canAccess(entityplayer, tileEntity)) + if(entityplayer.isSneaking()) { dismantleBlock(world, x, y, z, false); + + return true; } - else { - SecurityUtils.displayNoAccess(entityplayer); - } - - return true; - } - - if(MekanismUtils.isBCWrench(tool)) - { - ((IToolWrench)tool).wrenchUsed(entityplayer, x, y, z); - } - - int change = ForgeDirection.ROTATION_MATRIX[ForgeDirection.UP.ordinal()][tileEntity.facing]; - - if(tileEntity instanceof TileEntityLogisticalSorter) - { - if(!((TileEntityLogisticalSorter)tileEntity).hasInventory()) + + if(MekanismUtils.isBCWrench(tool)) { - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) + ((IToolWrench)tool).wrenchUsed(entityplayer, x, y, z); + } + + int change = ForgeDirection.ROTATION_MATRIX[ForgeDirection.UP.ordinal()][tileEntity.facing]; + + if(tileEntity instanceof TileEntityLogisticalSorter) + { + if(!((TileEntityLogisticalSorter)tileEntity).hasInventory()) { - TileEntity tile = Coord4D.get(tileEntity).getFromSide(dir).getTileEntity(world); - - if(tile instanceof IInventory) + for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - change = dir.getOpposite().ordinal(); - break; + TileEntity tile = Coord4D.get(tileEntity).getFromSide(dir).getTileEntity(world); + + if(tile instanceof IInventory) + { + change = dir.getOpposite().ordinal(); + break; + } } } } + + tileEntity.setFacing((short)change); + world.notifyBlocksOfNeighborChange(x, y, z, this); } - - tileEntity.setFacing((short)change); - world.notifyBlocksOfNeighborChange(x, y, z, this); + else { + SecurityUtils.displayNoAccess(entityplayer); + } + return true; } } @@ -629,91 +615,78 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo switch(type) { - case ELECTRIC_CHEST: - TileEntityElectricChest electricChest = (TileEntityElectricChest)tileEntity; - - if(!(entityplayer.isSneaking() || world.isSideSolid(x, y + 1, z, ForgeDirection.DOWN))) + case PERSONAL_CHEST: + if(!entityplayer.isSneaking() && !world.isSideSolid(x, y + 1, z, ForgeDirection.DOWN)) { - if(electricChest.canAccess() || MekanismUtils.isOp((EntityPlayerMP)entityplayer)) + TileEntityPersonalChest chest = (TileEntityPersonalChest)tileEntity; + + if(SecurityUtils.canAccess(entityplayer, tileEntity)) { - MekanismUtils.openElectricChestGui((EntityPlayerMP)entityplayer, electricChest, null, true); - } - else if(!electricChest.authenticated) - { - Mekanism.packetHandler.sendTo(new ElectricChestMessage(ElectricChestPacketType.CLIENT_OPEN, true, false, 2, 0, null, Coord4D.get(electricChest)), (EntityPlayerMP)entityplayer); - } + MekanismUtils.openPersonalChestGui((EntityPlayerMP)entityplayer, chest, null, true); + } else { - Mekanism.packetHandler.sendTo(new ElectricChestMessage(ElectricChestPacketType.CLIENT_OPEN, true, false, 1, 0, null, Coord4D.get(electricChest)), (EntityPlayerMP)entityplayer); + SecurityUtils.displayNoAccess(entityplayer); } - + return true; } - break; - case FLUID_TANK: - if(entityplayer.getCurrentEquippedItem() != null && FluidContainerRegistry.isContainer(entityplayer.getCurrentEquippedItem())) - { - if(manageInventory(entityplayer, (TileEntityFluidTank)tileEntity)) - { - entityplayer.inventory.markDirty(); - return true; - } - } - else { - entityplayer.openGui(Mekanism.instance, type.guiId, world, x, y, z); - } - return true; + break; + case FLUID_TANK: + if(!entityplayer.isSneaking()) + { + if(SecurityUtils.canAccess(entityplayer, tileEntity)) + { + if(entityplayer.getCurrentEquippedItem() != null && FluidContainerRegistry.isContainer(entityplayer.getCurrentEquippedItem())) + { + if(manageInventory(entityplayer, (TileEntityFluidTank)tileEntity)) + { + entityplayer.inventory.markDirty(); + return true; + } + } + else { + entityplayer.openGui(Mekanism.instance, type.guiId, world, x, y, z); + } + } + else { + SecurityUtils.displayNoAccess(entityplayer); + } + + return true; + } + + break; case LOGISTICAL_SORTER: - LogisticalSorterGuiMessage.openServerGui(SorterGuiPacket.SERVER, 0, world, (EntityPlayerMP)entityplayer, Coord4D.get(tileEntity), -1); - return true; - case TELEPORTER: if(!entityplayer.isSneaking()) { - TileEntityTeleporter teleporter = (TileEntityTeleporter)tileEntity; - - if(teleporter.owner == null) + if(SecurityUtils.canAccess(entityplayer, tileEntity)) { - teleporter.owner = entityplayer.getCommandSenderName(); - } - - if(teleporter.owner.equals(entityplayer.getCommandSenderName()) || MekanismUtils.isOp((EntityPlayerMP)entityplayer)) - { - entityplayer.openGui(Mekanism.instance, type.guiId, world, x, y, z); + LogisticalSorterGuiMessage.openServerGui(SorterGuiPacket.SERVER, 0, world, (EntityPlayerMP)entityplayer, Coord4D.get(tileEntity), -1); } else { - entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("gui.teleporter.noAccess"))); - } - - return true; - } - case QUANTUM_ENTANGLOPORTER: - if(!entityplayer.isSneaking()) - { - TileEntityQuantumEntangloporter teleporter = (TileEntityQuantumEntangloporter)tileEntity; - - if(teleporter.owner == null) - { - teleporter.owner = entityplayer.getCommandSenderName(); - } - - if(teleporter.owner.equals(entityplayer.getCommandSenderName()) || MekanismUtils.isOp((EntityPlayerMP)entityplayer)) - { - entityplayer.openGui(Mekanism.instance, type.guiId, world, x, y, z); - } - else { - entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("gui.entangloporter.noAccess"))); + SecurityUtils.displayNoAccess(entityplayer); } return true; } + + break; default: if(!entityplayer.isSneaking() && type.guiId != -1) { - entityplayer.openGui(Mekanism.instance, type.guiId, world, x, y, z); + if(SecurityUtils.canAccess(entityplayer, tileEntity)) + { + entityplayer.openGui(Mekanism.instance, type.guiId, world, x, y, z); + } + else { + SecurityUtils.displayNoAccess(entityplayer); + } + return true; } - return false; + break; } } @@ -766,31 +739,23 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo { TileEntity tile = world.getTileEntity(x, y, z); - if(MachineType.get(blockType, world.getBlockMetadata(x, y, z)) != MachineType.ELECTRIC_CHEST) + if(tile instanceof ISecurityTile) { - if(tile instanceof ISecurityTile) - { - return SecurityUtils.getSecurity((ISecurityTile)tile) == SecurityMode.PUBLIC ? blockHardness : -1; - } - - return blockHardness; - } - else { - TileEntityElectricChest tileEntity = (TileEntityElectricChest)world.getTileEntity(x, y, z); - return tileEntity.canAccess() ? 3.5F : -1; + return SecurityUtils.getSecurity((ISecurityTile)tile) == SecurityMode.PUBLIC ? blockHardness : -1; } + + return blockHardness; } @Override public float getExplosionResistance(Entity entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { - if(MachineType.get(blockType, world.getBlockMetadata(x, y, z)) != MachineType.ELECTRIC_CHEST) + if(MachineType.get(blockType, world.getBlockMetadata(x, y, z)) != MachineType.PERSONAL_CHEST) { return blockResistance; } else { - TileEntityElectricChest tileEntity = (TileEntityElectricChest)world.getTileEntity(x, y, z); - return tileEntity.canAccess() ? 3.5F : -1; + return -1; } } @@ -1027,14 +992,6 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo } } - if(tileEntity instanceof TileEntityElectricChest) - { - IElectricChest electricChest = (IElectricChest)itemStack.getItem(); - electricChest.setAuthenticated(itemStack, ((TileEntityElectricChest)tileEntity).authenticated); - electricChest.setLocked(itemStack, ((TileEntityElectricChest)tileEntity).locked); - electricChest.setPassword(itemStack, ((TileEntityElectricChest)tileEntity).password); - } - if(tileEntity instanceof TileEntityFactory) { IFactory factoryItem = (IFactory)itemStack.getItem(); @@ -1133,7 +1090,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo switch(type) { case CHARGEPAD: - case ELECTRIC_CHEST: + case PERSONAL_CHEST: return false; case FLUID_TANK: return side == ForgeDirection.UP || side == ForgeDirection.DOWN; @@ -1179,7 +1136,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo ENERGIZED_SMELTER(MachineBlock.MACHINE_BLOCK_1, 10, "EnergizedSmelter", 16, TileEntityEnergizedSmelter.class, true, false, true), TELEPORTER(MachineBlock.MACHINE_BLOCK_1, 11, "Teleporter", 13, TileEntityTeleporter.class, true, false, false), ELECTRIC_PUMP(MachineBlock.MACHINE_BLOCK_1, 12, "ElectricPump", 17, TileEntityElectricPump.class, true, true, false), - ELECTRIC_CHEST(MachineBlock.MACHINE_BLOCK_1, 13, "ElectricChest", -1, TileEntityElectricChest.class, true, true, false), + PERSONAL_CHEST(MachineBlock.MACHINE_BLOCK_1, 13, "PersonalChest", -1, TileEntityPersonalChest.class, false, true, false), CHARGEPAD(MachineBlock.MACHINE_BLOCK_1, 14, "Chargepad", -1, TileEntityChargepad.class, true, true, false), LOGISTICAL_SORTER(MachineBlock.MACHINE_BLOCK_1, 15, "LogisticalSorter", -1, TileEntityLogisticalSorter.class, false, true, false), ROTARY_CONDENSENTRATOR(MachineBlock.MACHINE_BLOCK_2, 0, "RotaryCondensentrator", 7, TileEntityRotaryCondensentrator.class, true, true, false), @@ -1328,8 +1285,6 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo return 12500; case ELECTRIC_PUMP: return usage.electricPumpUsage; - case ELECTRIC_CHEST: - return 30; case CHARGEPAD: return 25; case LOGISTICAL_SORTER: diff --git a/src/main/java/mekanism/common/inventory/InventoryElectricChest.java b/src/main/java/mekanism/common/inventory/InventoryPersonalChest.java similarity index 88% rename from src/main/java/mekanism/common/inventory/InventoryElectricChest.java rename to src/main/java/mekanism/common/inventory/InventoryPersonalChest.java index 817c8530a..8f669a191 100644 --- a/src/main/java/mekanism/common/inventory/InventoryElectricChest.java +++ b/src/main/java/mekanism/common/inventory/InventoryPersonalChest.java @@ -7,24 +7,24 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -public class InventoryElectricChest extends InventoryBasic +public class InventoryPersonalChest extends InventoryBasic { public EntityPlayer entityPlayer; public ItemStack itemStack; public boolean reading; - public InventoryElectricChest(EntityPlayer player) + public InventoryPersonalChest(EntityPlayer player) { - super("Electric Chest", false, 55); + super("PersonalChest", false, 55); entityPlayer = player; read(); } - public InventoryElectricChest(ItemStack stack) + public InventoryPersonalChest(ItemStack stack) { - super("Electric Chest", false, 55); + super("PersonalChest", false, 55); itemStack = stack; read(); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectricChest.java b/src/main/java/mekanism/common/inventory/container/ContainerPersonalChest.java similarity index 64% rename from src/main/java/mekanism/common/inventory/container/ContainerElectricChest.java rename to src/main/java/mekanism/common/inventory/container/ContainerPersonalChest.java index 21651d283..6bf6161d6 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectricChest.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerPersonalChest.java @@ -1,12 +1,9 @@ package mekanism.common.inventory.container; import invtweaks.api.container.ChestContainer; -import mekanism.common.base.IElectricChest; import mekanism.common.block.BlockMachine.MachineType; -import mekanism.common.inventory.slot.SlotElectricChest; -import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; -import mekanism.common.tile.TileEntityElectricChest; -import mekanism.common.util.ChargeUtils; +import mekanism.common.inventory.slot.SlotPersonalChest; +import mekanism.common.tile.TileEntityPersonalChest; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -15,13 +12,13 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; @ChestContainer(isLargeChest=true) -public class ContainerElectricChest extends Container +public class ContainerPersonalChest extends Container { - private TileEntityElectricChest tileEntity; + private TileEntityPersonalChest tileEntity; private IInventory itemInventory; private boolean isBlock; - public ContainerElectricChest(InventoryPlayer inventory, TileEntityElectricChest tentity, IInventory inv, boolean b) + public ContainerPersonalChest(InventoryPlayer inventory, TileEntityPersonalChest tentity, IInventory inv, boolean b) { tileEntity = tentity; itemInventory = inv; @@ -40,25 +37,23 @@ public class ContainerElectricChest extends Container { for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new SlotElectricChest(getInv(), slotX + slotY * 9, 8 + slotX * 18, 26 + slotY * 18)); + addSlotToContainer(new SlotPersonalChest(getInv(), slotX + slotY * 9, 8 + slotX * 18, 26 + slotY * 18)); } } - addSlotToContainer(new SlotDischarge(getInv(), 54, 180, 11)); - int slotX; for(slotX = 0; slotX < 3; ++slotX) { for(int slotY = 0; slotY < 9; ++slotY) { - addSlotToContainer(new SlotElectricChest(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 148 + slotX * 18)); + addSlotToContainer(new SlotPersonalChest(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 148 + slotX * 18)); } } for(slotX = 0; slotX < 9; ++slotX) { - addSlotToContainer(new SlotElectricChest(inventory, slotX, 8 + slotX * 18, 206)); + addSlotToContainer(new SlotPersonalChest(inventory, slotX, 8 + slotX * 18, 206)); } } @@ -110,36 +105,17 @@ public class ContainerElectricChest extends Container ItemStack slotStack = currentSlot.getStack(); stack = slotStack.copy(); - if(ChargeUtils.canBeDischarged(slotStack)) + if(slotID < 54) { - if(slotID != 54) - { - if(!mergeItemStack(slotStack, 54, 55, false)) - { - return null; - } - } - else if(slotID == 54) - { - if(!mergeItemStack(slotStack, 55, inventorySlots.size(), true)) - { - return null; - } - } - } - else { - if(slotID < 54) - { - if(!mergeItemStack(slotStack, 55, inventorySlots.size(), true)) - { - return null; - } - } - else if(!mergeItemStack(slotStack, 0, 54, false)) + if(!mergeItemStack(slotStack, 54, inventorySlots.size(), true)) { return null; } } + else if(!mergeItemStack(slotStack, 0, 54, false)) + { + return null; + } if(slotStack.stackSize == 0) { @@ -166,14 +142,11 @@ public class ContainerElectricChest extends Container if(modifier == 2 && destSlot >= 0 && destSlot < 9) { ItemStack itemStack = player.inventory.getStackInSlot(destSlot); - if(itemStack != null && itemStack.getItem() instanceof IElectricChest) + + if(MachineType.get(itemStack) == MachineType.PERSONAL_CHEST) { - if(MachineType.get(itemStack) == MachineType.ELECTRIC_CHEST) - { - return null; - } + return null; } - } return super.slotClick(slotNumber, destSlot, modifier, player); diff --git a/src/main/java/mekanism/common/inventory/slot/SlotElectricChest.java b/src/main/java/mekanism/common/inventory/slot/SlotElectricChest.java deleted file mode 100644 index 3e9dccb56..000000000 --- a/src/main/java/mekanism/common/inventory/slot/SlotElectricChest.java +++ /dev/null @@ -1,37 +0,0 @@ -package mekanism.common.inventory.slot; - -import mekanism.common.base.IElectricChest; -import mekanism.common.block.BlockMachine.MachineType; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - -public class SlotElectricChest extends Slot -{ - public SlotElectricChest(IInventory inventory, int index, int x, int y) - { - super(inventory, index, x, y); - } - - @Override - public boolean canTakeStack(EntityPlayer player) - { - ItemStack itemstack = inventory.getStackInSlot(getSlotIndex()); - - if(itemstack == null) - { - return true; - } - - if(itemstack.getItem() instanceof IElectricChest) - { - if(MachineType.get(itemstack) == MachineType.ELECTRIC_CHEST) - { - return false; - } - } - - return true; - } -} diff --git a/src/main/java/mekanism/common/inventory/slot/SlotPersonalChest.java b/src/main/java/mekanism/common/inventory/slot/SlotPersonalChest.java new file mode 100644 index 000000000..665008122 --- /dev/null +++ b/src/main/java/mekanism/common/inventory/slot/SlotPersonalChest.java @@ -0,0 +1,20 @@ +package mekanism.common.inventory.slot; + +import mekanism.common.block.BlockMachine.MachineType; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; + +public class SlotPersonalChest extends Slot +{ + public SlotPersonalChest(IInventory inventory, int index, int x, int y) + { + super(inventory, index, x, y); + } + + @Override + public boolean canTakeStack(EntityPlayer player) + { + return MachineType.get(inventory.getStackInSlot(getSlotIndex())) != MachineType.PERSONAL_CHEST; + } +} diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 5d989536a..6c6c386f8 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -1,7 +1,5 @@ package mekanism.common.item; -import ic2.api.item.ElectricItem; -import ic2.api.item.IElectricItem; import ic2.api.item.IElectricItemManager; import ic2.api.item.ISpecialElectricItem; @@ -11,15 +9,12 @@ import java.util.Map; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.general; -import mekanism.api.energy.EnergizedItemManager; import mekanism.api.energy.IEnergizedItem; import mekanism.client.MekKeyHandler; import mekanism.client.MekanismKeyHandler; -import mekanism.common.Mekanism; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.FluidTankTier; import mekanism.common.Upgrade; -import mekanism.common.base.IElectricChest; import mekanism.common.base.IFactory; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.IRedstoneControl.RedstoneControl; @@ -31,15 +26,12 @@ import mekanism.common.base.ITierItem; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.integration.IC2ItemManager; -import mekanism.common.inventory.InventoryElectricChest; -import mekanism.common.network.PacketElectricChest.ElectricChestMessage; -import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; +import mekanism.common.inventory.InventoryPersonalChest; import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityElectricBlock; -import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.util.LangUtils; @@ -48,11 +40,8 @@ import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.settings.GameSettings; -import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -120,7 +109,7 @@ import cpw.mods.fml.relauncher.SideOnly; @InterfaceList({ @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") }) -public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, IFactory, ISustainedInventory, ISustainedTank, IElectricChest, IEnergyContainerItem, IFluidContainerItem, ITierItem, ISecurityItem +public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, IFactory, ISustainedInventory, ISustainedTank, IEnergyContainerItem, IFluidContainerItem, ITierItem, ISecurityItem { public Block metaBlock; @@ -212,12 +201,6 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.recipeType") + ": " + EnumColor.GREY + RecipeType.values()[getRecipeType(itemstack)].getLocalizedName()); } - - if(type == MachineType.ELECTRIC_CHEST) - { - list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.auth") + ": " + EnumColor.GREY + LangUtils.transYesNo(getAuthenticated(itemstack))); - list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.locked") + ": " + EnumColor.GREY + LangUtils.transYesNo(getLocked(itemstack))); - } if(type == MachineType.FLUID_TANK) { @@ -380,13 +363,6 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } } - if(tileEntity instanceof TileEntityElectricChest) - { - ((TileEntityElectricChest)tileEntity).authenticated = getAuthenticated(stack); - ((TileEntityElectricChest)tileEntity).locked = getLocked(stack); - ((TileEntityElectricChest)tileEntity).password = getPassword(stack); - } - if(tileEntity instanceof ISustainedInventory) { ((ISustainedInventory)tileEntity).setInventory(getInventory(stack)); @@ -431,68 +407,6 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec return 0; } - @Override - public void onUpdate(ItemStack itemstack, World world, Entity entity, int i, boolean flag) - { - MachineType type = MachineType.get(itemstack); - - if(type == MachineType.ELECTRIC_CHEST) - { - if(world != null && !world.isRemote) - { - InventoryElectricChest inv = new InventoryElectricChest(itemstack); - - if(inv.getStackInSlot(54) != null && getEnergy(itemstack) < getMaxEnergy(itemstack)) - { - if(inv.getStackInSlot(54).getItem() instanceof IEnergizedItem) - { - setEnergy(itemstack, getEnergy(itemstack) + EnergizedItemManager.discharge(inv.getStackInSlot(54), getMaxEnergy(itemstack) - getEnergy(itemstack))); - } - else if(MekanismUtils.useIC2() && inv.getStackInSlot(54).getItem() instanceof IElectricItem) - { - IElectricItem item = (IElectricItem)inv.getStackInSlot(54).getItem(); - - if(item.canProvideEnergy(inv.getStackInSlot(54))) - { - double gain = ElectricItem.manager.discharge(inv.getStackInSlot(54), (int)((getMaxEnergy(itemstack) - getEnergy(itemstack))* general.TO_IC2), 3, false, true, false)* general.FROM_IC2; - setEnergy(itemstack, getEnergy(itemstack) + gain); - } - } - else if(MekanismUtils.useRF() && inv.getStackInSlot(54).getItem() instanceof IEnergyContainerItem) - { - ItemStack itemStack = inv.getStackInSlot(54); - IEnergyContainerItem item = (IEnergyContainerItem)inv.getStackInSlot(54).getItem(); - - int itemEnergy = (int)Math.round(Math.min(Math.sqrt(item.getMaxEnergyStored(itemStack)), item.getEnergyStored(itemStack))); - int toTransfer = (int)Math.round(Math.min(itemEnergy, ((getMaxEnergy(itemstack) - getEnergy(itemstack))* general.TO_TE))); - - setEnergy(itemstack, getEnergy(itemstack) + (item.extractEnergy(itemStack, toTransfer, false)* general.FROM_TE)); - } - else if(inv.getStackInSlot(54).getItem() == Items.redstone && getEnergy(itemstack)+ general.ENERGY_PER_REDSTONE <= getMaxEnergy(itemstack)) - { - setEnergy(itemstack, getEnergy(itemstack) + general.ENERGY_PER_REDSTONE); - inv.getStackInSlot(54).stackSize--; - - if(inv.getStackInSlot(54).stackSize <= 0) - { - inv.setInventorySlotContents(54, null); - } - } - - inv.write(); - } - } - } - } - - @Override - public boolean onEntityItemUpdate(EntityItem entityItem) - { - onUpdate(entityItem.getEntityItem(), null, entityItem, 0, false); - - return false; - } - public boolean tryPlaceContainedLiquid(World world, ItemStack itemstack, int x, int y, int z) { if(getFluidStack(itemstack) == null || !getFluidStack(itemstack).getFluid().canBePlacedInWorld()) @@ -536,101 +450,103 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { MachineType type = MachineType.get(itemstack); - if(MachineType.get(itemstack) == MachineType.ELECTRIC_CHEST) + if(MachineType.get(itemstack) == MachineType.PERSONAL_CHEST) { if(!world.isRemote) { - if(!getAuthenticated(itemstack)) + if(SecurityUtils.canAccess(entityplayer, itemstack)) { - Mekanism.packetHandler.sendTo(new ElectricChestMessage(ElectricChestPacketType.CLIENT_OPEN, false, false, 2, 0, null, null), (EntityPlayerMP)entityplayer); - } - else if(getLocked(itemstack) && getEnergy(itemstack) > 0) - { - Mekanism.packetHandler.sendTo(new ElectricChestMessage(ElectricChestPacketType.CLIENT_OPEN, false, false, 1, 0, null, null), (EntityPlayerMP)entityplayer); + InventoryPersonalChest inventory = new InventoryPersonalChest(entityplayer); + MekanismUtils.openPersonalChestGui((EntityPlayerMP)entityplayer, null, inventory, false); } else { - InventoryElectricChest inventory = new InventoryElectricChest(entityplayer); - MekanismUtils.openElectricChestGui((EntityPlayerMP)entityplayer, null, inventory, false); + SecurityUtils.displayNoAccess(entityplayer); } } } else if(type == MachineType.FLUID_TANK && getBucketMode(itemstack)) { - MovingObjectPosition pos = getMovingObjectPositionFromPlayer(world, entityplayer, !entityplayer.isSneaking()); - - if(pos == null) - { - return itemstack; - } - else { - if(pos.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) - { - Coord4D coord = new Coord4D(pos.blockX, pos.blockY, pos.blockZ, world.provider.dimensionId); + if(SecurityUtils.canAccess(entityplayer, itemstack)) + { + MovingObjectPosition pos = getMovingObjectPositionFromPlayer(world, entityplayer, !entityplayer.isSneaking()); + + if(pos == null) + { + return itemstack; + } + else { + if(pos.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) + { + Coord4D coord = new Coord4D(pos.blockX, pos.blockY, pos.blockZ, world.provider.dimensionId); + + if(!world.canMineBlock(entityplayer, coord.xCoord, coord.yCoord, coord.zCoord)) + { + return itemstack; + } + + if(!entityplayer.isSneaking()) + { + if(!entityplayer.canPlayerEdit(coord.xCoord, coord.yCoord, coord.zCoord, pos.sideHit, itemstack)) + { + return itemstack; + } + + FluidStack fluid = MekanismUtils.getFluid(world, coord, false); + + if(fluid != null && (getFluidStack(itemstack) == null || getFluidStack(itemstack).isFluidEqual(fluid))) + { + int needed = getCapacity(itemstack)-(getFluidStack(itemstack) != null ? getFluidStack(itemstack).amount : 0); + + if(fluid.amount > needed) + { + return itemstack; + } + + if(getFluidStack(itemstack) == null) + { + setFluidStack(fluid, itemstack); + } + else { + FluidStack newStack = getFluidStack(itemstack); + newStack.amount += fluid.amount; + setFluidStack(newStack, itemstack); + } + + world.setBlockToAir(coord.xCoord, coord.yCoord, coord.zCoord); + } + } + else { + FluidStack stored = getFluidStack(itemstack); + + if(stored == null || stored.amount < FluidContainerRegistry.BUCKET_VOLUME) + { + return itemstack; + } + + Coord4D trans = coord.getFromSide(ForgeDirection.getOrientation(pos.sideHit)); - if(!world.canMineBlock(entityplayer, coord.xCoord, coord.yCoord, coord.zCoord)) - { - return itemstack; - } + if(!entityplayer.canPlayerEdit(trans.xCoord, trans.yCoord, trans.zCoord, pos.sideHit, itemstack)) + { + return itemstack; + } - if(!entityplayer.isSneaking()) - { - if(!entityplayer.canPlayerEdit(coord.xCoord, coord.yCoord, coord.zCoord, pos.sideHit, itemstack)) - { - return itemstack; - } - - FluidStack fluid = MekanismUtils.getFluid(world, coord, false); - - if(fluid != null && (getFluidStack(itemstack) == null || getFluidStack(itemstack).isFluidEqual(fluid))) - { - int needed = getCapacity(itemstack)-(getFluidStack(itemstack) != null ? getFluidStack(itemstack).amount : 0); - - if(fluid.amount > needed) - { - return itemstack; - } - - if(getFluidStack(itemstack) == null) - { - setFluidStack(fluid, itemstack); - } - else { - FluidStack newStack = getFluidStack(itemstack); - newStack.amount += fluid.amount; - setFluidStack(newStack, itemstack); - } - - world.setBlockToAir(coord.xCoord, coord.yCoord, coord.zCoord); - } - } - else { - FluidStack stored = getFluidStack(itemstack); - - if(stored == null || stored.amount < FluidContainerRegistry.BUCKET_VOLUME) - { - return itemstack; - } - - Coord4D trans = coord.getFromSide(ForgeDirection.getOrientation(pos.sideHit)); - - if(!entityplayer.canPlayerEdit(trans.xCoord, trans.yCoord, trans.zCoord, pos.sideHit, itemstack)) - { - return itemstack; - } - - if(tryPlaceContainedLiquid(world, itemstack, trans.xCoord, trans.yCoord, trans.zCoord) && !entityplayer.capabilities.isCreativeMode) - { - FluidStack newStack = stored.copy(); - newStack.amount -= FluidContainerRegistry.BUCKET_VOLUME; - - setFluidStack(newStack.amount > 0 ? newStack : null, itemstack); - } - } - } - - return itemstack; - } + if(tryPlaceContainedLiquid(world, itemstack, trans.xCoord, trans.yCoord, trans.zCoord) && !entityplayer.capabilities.isCreativeMode) + { + FluidStack newStack = stored.copy(); + newStack.amount -= FluidContainerRegistry.BUCKET_VOLUME; + + setFluidStack(newStack.amount > 0 ? newStack : null, itemstack); + } + } + } + + return itemstack; + } + } } + else { + SecurityUtils.displayNoAccess(entityplayer); + } return itemstack; } @@ -746,72 +662,6 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec return type == MachineType.ELECTRIC_PUMP || type == MachineType.FLUID_TANK || type == MachineType.FLUIDIC_PLENISHER; } - - @Override - public void setAuthenticated(ItemStack itemStack, boolean auth) - { - if(itemStack.stackTagCompound == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.stackTagCompound.setBoolean("authenticated", auth); - } - - @Override - public boolean getAuthenticated(ItemStack itemStack) - { - if(itemStack.stackTagCompound == null) - { - return false; - } - - return itemStack.stackTagCompound.getBoolean("authenticated"); - } - - @Override - public void setPassword(ItemStack itemStack, String pass) - { - if(itemStack.stackTagCompound == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.stackTagCompound.setString("password", pass); - } - - @Override - public String getPassword(ItemStack itemStack) - { - if(itemStack.stackTagCompound == null) - { - return ""; - } - - return itemStack.stackTagCompound.getString("password"); - } - - @Override - public void setLocked(ItemStack itemStack, boolean locked) - { - if(itemStack.stackTagCompound == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.stackTagCompound.setBoolean("locked", locked); - } - - @Override - public boolean getLocked(ItemStack itemStack) - { - if(itemStack.stackTagCompound == null) - { - return false; - } - - return itemStack.stackTagCompound.getBoolean("locked"); - } public void setBucketMode(ItemStack itemStack, boolean bucketMode) { @@ -1100,6 +950,13 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec @Override public boolean hasSecurity(ItemStack stack) { - return true; + MachineType type = MachineType.get(stack); + + if(type != MachineType.LASER) + { + return true; + } + + return false; } } diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index b70a0c5fa..23a9e6367 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -17,9 +17,9 @@ import mekanism.common.base.ISideConfiguration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityContainerBlock; -import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -77,20 +77,27 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool { SideData data = config.getConfig().getOutput(getState(stack).getTransmission(), side, config.getOrientation()); player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + getViewModeText(getState(stack).getTransmission()) + ": " + data.color + data.localize() + " (" + data.color.getName() + ")")); + return true; } else { if(getEnergy(stack) >= ENERGY_PER_CONFIGURE) { - setEnergy(stack, getEnergy(stack) - ENERGY_PER_CONFIGURE); - MekanismUtils.incrementOutput(config, getState(stack).getTransmission(), MekanismUtils.getBaseOrientation(side, config.getOrientation())); - SideData data = config.getConfig().getOutput(getState(stack).getTransmission(), side, config.getOrientation()); - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + getToggleModeText(getState(stack).getTransmission()) + ": " + data.color + data.localize() + " (" + data.color.getName() + ")")); - - if(config instanceof TileEntityBasicBlock) + if(SecurityUtils.canAccess(player, tile)) { - TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)config; - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity))); + setEnergy(stack, getEnergy(stack) - ENERGY_PER_CONFIGURE); + MekanismUtils.incrementOutput(config, getState(stack).getTransmission(), MekanismUtils.getBaseOrientation(side, config.getOrientation())); + SideData data = config.getConfig().getOutput(getState(stack).getTransmission(), side, config.getOrientation()); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + getToggleModeText(getState(stack).getTransmission()) + ": " + data.color + data.localize() + " (" + data.color.getName() + ")")); + + if(config instanceof TileEntityBasicBlock) + { + TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)config; + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity))); + } + } + else { + SecurityUtils.displayNoAccess(player); } return true; @@ -101,12 +108,20 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool { IConfigurable config = (IConfigurable)tile; - if(player.isSneaking()) + if(SecurityUtils.canAccess(player, tile)) { - return config.onSneakRightClick(player, side); + if(player.isSneaking()) + { + return config.onSneakRightClick(player, side); + } + else { + return config.onRightClick(player, side); + } } else { - return config.onRightClick(player, side); + SecurityUtils.displayNoAccess(player); + + return true; } } } @@ -116,7 +131,7 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool { IInventory inv = (IInventory)tile; - if(!(inv instanceof TileEntityElectricChest) || (((TileEntityElectricChest)inv).canAccess())) + if(SecurityUtils.canAccess(player, tile)) { for(int i = 0; i < inv.getSizeInventory(); i++) { @@ -165,7 +180,7 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool return true; } else { - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.configurator.unauth"))); + SecurityUtils.displayNoAccess(player); return true; } } diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index d1ac7fc69..a6cbed45d 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -34,7 +34,6 @@ public class PacketConfigSync implements IMessageHandler -{ - @Override - public IMessage onMessage(ElectricChestMessage message, MessageContext context) - { - EntityPlayer player = PacketHandler.getPlayer(context); - - if(message.packetType == ElectricChestPacketType.SERVER_OPEN) - { - try { - if(message.isBlock) - { - TileEntityElectricChest tileEntity = (TileEntityElectricChest)message.coord4D.getTileEntity(player.worldObj); - - if(message.useEnergy) - { - tileEntity.setEnergy(tileEntity.getEnergy() - 100); - } - - MekanismUtils.openElectricChestGui((EntityPlayerMP)player, tileEntity, null, true); - } - else { - ItemStack stack = player.getCurrentEquippedItem(); - - if(stack != null && stack.getItem() instanceof IElectricChest && MachineType.get(stack) == MachineType.ELECTRIC_CHEST) - { - if(message.useEnergy) - { - ((IEnergizedItem)stack.getItem()).setEnergy(stack, ((IEnergizedItem)stack.getItem()).getEnergy(stack) - 100); - } - - InventoryElectricChest inventory = new InventoryElectricChest(player); - MekanismUtils.openElectricChestGui((EntityPlayerMP)player, null, inventory, false); - } - } - } catch(Exception e) { - Mekanism.logger.error("Error while handling electric chest open packet."); - e.printStackTrace(); - } - } - else if(message.packetType == ElectricChestPacketType.CLIENT_OPEN) - { - try { - int x = message.coord4D != null ? message.coord4D.xCoord : 0; - int y = message.coord4D != null ? message.coord4D.yCoord : 0; - int z = message.coord4D != null ? message.coord4D.zCoord : 0; - - Mekanism.proxy.openElectricChest(player, message.guiType, message.windowId, message.isBlock, x, y, z); - } catch(Exception e) { - Mekanism.logger.error("Error while handling electric chest open packet."); - e.printStackTrace(); - } - } - else if(message.packetType == ElectricChestPacketType.PASSWORD) - { - try { - if(message.isBlock) - { - TileEntityElectricChest tileEntity = (TileEntityElectricChest)message.coord4D.getTileEntity(player.worldObj); - tileEntity.password = message.password; - tileEntity.authenticated = true; - } - else { - ItemStack stack = player.getCurrentEquippedItem(); - - if(stack != null && stack.getItem() instanceof IElectricChest && MachineType.get(stack) == MachineType.ELECTRIC_CHEST) - { - ((IElectricChest)stack.getItem()).setPassword(stack, message.password); - ((IElectricChest)stack.getItem()).setAuthenticated(stack, true); - } - } - } catch(Exception e) { - Mekanism.logger.error("Error while handling electric chest password packet."); - e.printStackTrace(); - } - } - else if(message.packetType == ElectricChestPacketType.LOCK) - { - try { - if(message.isBlock) - { - TileEntityElectricChest tileEntity = (TileEntityElectricChest)message.coord4D.getTileEntity(player.worldObj); - tileEntity.locked = message.locked; - player.worldObj.notifyBlocksOfNeighborChange(message.coord4D.xCoord, message.coord4D.yCoord, message.coord4D.zCoord, tileEntity.getBlockType()); - } - else { - ItemStack stack = player.getCurrentEquippedItem(); - - if(stack != null && stack.getItem() instanceof IElectricChest && MachineType.get(stack) == MachineType.ELECTRIC_CHEST) - { - ((IElectricChest)stack.getItem()).setLocked(stack, message.locked); - } - } - } catch(Exception e) { - Mekanism.logger.error("Error while handling electric chest password packet."); - e.printStackTrace(); - } - } - - return null; - } - - public static class ElectricChestMessage implements IMessage - { - public ElectricChestPacketType packetType; - - public boolean isBlock; - - public boolean locked; - - public String password; - - public int guiType; - public int windowId; - - public boolean useEnergy; - - public Coord4D coord4D; - - public ElectricChestMessage() {} - - //This is a really messy implementation... - public ElectricChestMessage(ElectricChestPacketType type, boolean b1, boolean b2, int i1, int i2, String s1, Coord4D c1) - { - packetType = type; - - switch(packetType) - { - case LOCK: - locked = b1; - isBlock = b2; - - if(isBlock) - { - coord4D = c1; - } - - break; - case PASSWORD: - password = s1; - isBlock = b1; - - if(isBlock) - { - coord4D = c1; - } - - break; - case CLIENT_OPEN: - guiType = i1; - windowId = i2; - isBlock = b1; - - if(isBlock) - { - coord4D = c1; - } - - break; - case SERVER_OPEN: - useEnergy = b1; - isBlock = b2; - - if(isBlock) - { - coord4D = c1; - } - - break; - } - } - - @Override - public void toBytes(ByteBuf dataStream) - { - dataStream.writeInt(packetType.ordinal()); - - switch(packetType) - { - case LOCK: - dataStream.writeBoolean(locked); - dataStream.writeBoolean(isBlock); - - if(isBlock) - { - dataStream.writeInt(coord4D.xCoord); - dataStream.writeInt(coord4D.yCoord); - dataStream.writeInt(coord4D.zCoord); - dataStream.writeInt(coord4D.dimensionId); - } - - break; - case PASSWORD: - PacketHandler.writeString(dataStream, password); - dataStream.writeBoolean(isBlock); - - if(isBlock) - { - dataStream.writeInt(coord4D.xCoord); - dataStream.writeInt(coord4D.yCoord); - dataStream.writeInt(coord4D.zCoord); - dataStream.writeInt(coord4D.dimensionId); - } - - break; - case CLIENT_OPEN: - dataStream.writeInt(guiType); - dataStream.writeInt(windowId); - dataStream.writeBoolean(isBlock); - - if(isBlock) - { - dataStream.writeInt(coord4D.xCoord); - dataStream.writeInt(coord4D.yCoord); - dataStream.writeInt(coord4D.zCoord); - dataStream.writeInt(coord4D.dimensionId); - } - - break; - case SERVER_OPEN: - dataStream.writeBoolean(useEnergy); - dataStream.writeBoolean(isBlock); - - if(isBlock) - { - dataStream.writeInt(coord4D.xCoord); - dataStream.writeInt(coord4D.yCoord); - dataStream.writeInt(coord4D.zCoord); - dataStream.writeInt(coord4D.dimensionId); - } - - break; - } - } - - @Override - public void fromBytes(ByteBuf dataStream) - { - packetType = ElectricChestPacketType.values()[dataStream.readInt()]; - - if(packetType == ElectricChestPacketType.SERVER_OPEN) - { - useEnergy = dataStream.readBoolean(); - isBlock = dataStream.readBoolean(); - - if(isBlock) - { - coord4D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); - } - } - else if(packetType == ElectricChestPacketType.CLIENT_OPEN) - { - guiType = dataStream.readInt(); - windowId = dataStream.readInt(); - isBlock = dataStream.readBoolean(); - - if(isBlock) - { - coord4D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); - } - } - else if(packetType == ElectricChestPacketType.PASSWORD) - { - password = PacketHandler.readString(dataStream); - isBlock = dataStream.readBoolean(); - - if(isBlock) - { - coord4D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); - } - } - else if(packetType == ElectricChestPacketType.LOCK) - { - locked = dataStream.readBoolean(); - isBlock = dataStream.readBoolean(); - - if(isBlock) - { - coord4D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); - } - } - } - } - - public static enum ElectricChestPacketType - { - LOCK, - PASSWORD, - CLIENT_OPEN, - SERVER_OPEN - } -} diff --git a/src/main/java/mekanism/common/network/PacketPersonalChest.java b/src/main/java/mekanism/common/network/PacketPersonalChest.java new file mode 100644 index 000000000..e75b01862 --- /dev/null +++ b/src/main/java/mekanism/common/network/PacketPersonalChest.java @@ -0,0 +1,177 @@ +package mekanism.common.network; + +import io.netty.buffer.ByteBuf; +import mekanism.api.Coord4D; +import mekanism.common.Mekanism; +import mekanism.common.PacketHandler; +import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.inventory.InventoryPersonalChest; +import mekanism.common.network.PacketPersonalChest.PersonalChestMessage; +import mekanism.common.tile.TileEntityPersonalChest; +import mekanism.common.util.MekanismUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; + +public class PacketPersonalChest implements IMessageHandler +{ + @Override + public IMessage onMessage(PersonalChestMessage message, MessageContext context) + { + EntityPlayer player = PacketHandler.getPlayer(context); + + if(message.packetType == PersonalChestPacketType.SERVER_OPEN) + { + try { + if(message.isBlock) + { + TileEntityPersonalChest tileEntity = (TileEntityPersonalChest)message.coord4D.getTileEntity(player.worldObj); + MekanismUtils.openPersonalChestGui((EntityPlayerMP)player, tileEntity, null, true); + } + else { + ItemStack stack = player.getCurrentEquippedItem(); + + if(MachineType.get(stack) == MachineType.PERSONAL_CHEST) + { + InventoryPersonalChest inventory = new InventoryPersonalChest(player); + MekanismUtils.openPersonalChestGui((EntityPlayerMP)player, null, inventory, false); + } + } + } catch(Exception e) { + Mekanism.logger.error("Error while handling electric chest open packet."); + e.printStackTrace(); + } + } + else if(message.packetType == PersonalChestPacketType.CLIENT_OPEN) + { + try { + int x = message.coord4D != null ? message.coord4D.xCoord : 0; + int y = message.coord4D != null ? message.coord4D.yCoord : 0; + int z = message.coord4D != null ? message.coord4D.zCoord : 0; + + Mekanism.proxy.openPersonalChest(player, message.guiType, message.windowId, message.isBlock, x, y, z); + } catch(Exception e) { + Mekanism.logger.error("Error while handling electric chest open packet."); + e.printStackTrace(); + } + } + + return null; + } + + public static class PersonalChestMessage implements IMessage + { + public PersonalChestPacketType packetType; + + public boolean isBlock; + + public int guiType; + public int windowId; + + public Coord4D coord4D; + + public PersonalChestMessage() {} + + //This is a really messy implementation... + public PersonalChestMessage(PersonalChestPacketType type, boolean b1, int i1, int i2, Coord4D c1) + { + packetType = type; + + switch(packetType) + { + case CLIENT_OPEN: + guiType = i1; + windowId = i2; + isBlock = b1; + + if(isBlock) + { + coord4D = c1; + } + + break; + case SERVER_OPEN: + isBlock = b1; + + if(isBlock) + { + coord4D = c1; + } + + break; + } + } + + @Override + public void toBytes(ByteBuf dataStream) + { + dataStream.writeInt(packetType.ordinal()); + + switch(packetType) + { + case CLIENT_OPEN: + dataStream.writeInt(guiType); + dataStream.writeInt(windowId); + dataStream.writeBoolean(isBlock); + + if(isBlock) + { + dataStream.writeInt(coord4D.xCoord); + dataStream.writeInt(coord4D.yCoord); + dataStream.writeInt(coord4D.zCoord); + dataStream.writeInt(coord4D.dimensionId); + } + + break; + case SERVER_OPEN: + dataStream.writeBoolean(isBlock); + + if(isBlock) + { + dataStream.writeInt(coord4D.xCoord); + dataStream.writeInt(coord4D.yCoord); + dataStream.writeInt(coord4D.zCoord); + dataStream.writeInt(coord4D.dimensionId); + } + + break; + } + } + + @Override + public void fromBytes(ByteBuf dataStream) + { + packetType = PersonalChestPacketType.values()[dataStream.readInt()]; + + if(packetType == PersonalChestPacketType.SERVER_OPEN) + { + isBlock = dataStream.readBoolean(); + + if(isBlock) + { + coord4D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); + } + } + else if(packetType == PersonalChestPacketType.CLIENT_OPEN) + { + guiType = dataStream.readInt(); + windowId = dataStream.readInt(); + isBlock = dataStream.readBoolean(); + + if(isBlock) + { + coord4D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); + } + } + } + } + + public static enum PersonalChestPacketType + { + CLIENT_OPEN, + SERVER_OPEN + } +} diff --git a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java index 181d98173..da3ef11aa 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java +++ b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java @@ -62,7 +62,7 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple didProcess = false; - if(inventory[0] != null && getValidName(inventory[0]) != null) + if(MekanismUtils.canFunction(this) && inventory[0] != null && getValidName(inventory[0]) != null) { ItemStack result = getResult(inventory[0]); diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricChest.java b/src/main/java/mekanism/common/tile/TileEntityPersonalChest.java similarity index 50% rename from src/main/java/mekanism/common/tile/TileEntityElectricChest.java rename to src/main/java/mekanism/common/tile/TileEntityPersonalChest.java index e46163f5f..8314c6885 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricChest.java +++ b/src/main/java/mekanism/common/tile/TileEntityPersonalChest.java @@ -1,41 +1,33 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - -import java.util.ArrayList; - -import mekanism.common.PacketHandler; -import mekanism.common.util.ChargeUtils; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.SecurityUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -public class TileEntityElectricChest extends TileEntityElectricBlock +public class TileEntityPersonalChest extends TileEntityContainerBlock implements ISecurityTile { public static int[] INV; - public String password = ""; - - public boolean authenticated = false; - - public boolean locked = false; - public float lidAngle; public float prevLidAngle; + + public TileComponentSecurity securityComponent; - public TileEntityElectricChest() + public TileEntityPersonalChest() { - super("ElectricChest", 12000); - inventory = new ItemStack[55]; + super("PersonalChest"); + inventory = new ItemStack[54]; + + securityComponent = new TileComponentSecurity(this); } @Override public void onUpdate() { - super.onUpdate(); - prevLidAngle = lidAngle; float increment = 0.1F; @@ -73,73 +65,18 @@ public class TileEntityElectricChest extends TileEntityElectricBlock lidAngle = 0.0F; } } - - ChargeUtils.discharge(54, this); - } - - @Override - public void readFromNBT(NBTTagCompound nbtTags) - { - super.readFromNBT(nbtTags); - - authenticated = nbtTags.getBoolean("authenticated"); - locked = nbtTags.getBoolean("locked"); - password = nbtTags.getString("password"); - } - - @Override - public void writeToNBT(NBTTagCompound nbtTags) - { - super.writeToNBT(nbtTags); - - nbtTags.setBoolean("authenticated", authenticated); - nbtTags.setBoolean("locked", locked); - nbtTags.setString("password", password); - } - - @Override - public void handlePacketData(ByteBuf dataStream) - { - super.handlePacketData(dataStream); - - authenticated = dataStream.readBoolean(); - locked = dataStream.readBoolean(); - password = PacketHandler.readString(dataStream); - } - - @Override - public ArrayList getNetworkedData(ArrayList data) - { - super.getNetworkedData(data); - - data.add(authenticated); - data.add(locked); - data.add(password); - - return data; - } - - public boolean canAccess() - { - return authenticated && (getEnergy() == 0 || !locked); } @Override public boolean isItemValidForSlot(int slotID, ItemStack itemstack) { - if(slotID == 54) - { - return ChargeUtils.canBeDischarged(itemstack); - } - else { - return true; - } + return true; } @Override public int[] getAccessibleSlotsFromSide(int side) { - if(side == 0 || !canAccess()) + if(side == 0 || SecurityUtils.getSecurity(this) != SecurityMode.PUBLIC) { return InventoryUtils.EMPTY; } @@ -161,19 +98,13 @@ public class TileEntityElectricChest extends TileEntityElectricBlock @Override public boolean canExtractItem(int slotID, ItemStack itemstack, int side) { - if(slotID == 54) - { - return ChargeUtils.canBeOutputted(itemstack, false); - } - else { - return true; - } + return true; } @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return false; + return SecurityUtils.canAccess(entityPlayer, this); } @Override @@ -181,4 +112,10 @@ public class TileEntityElectricChest extends TileEntityElectricBlock { return side != 0 && side != 1; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index 07e6ce3ac..eede3b520 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -23,8 +23,10 @@ import mekanism.common.frequency.Frequency; import mekanism.common.frequency.FrequencyManager; import mekanism.common.frequency.IFrequencyHandler; import mekanism.common.integration.IComputerIntegration; +import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.CableUtils; import mekanism.common.util.HeatUtils; import mekanism.common.util.InventoryUtils; @@ -39,10 +41,8 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock implements ISideConfiguration, ITankManager, IFluidHandler, IFrequencyHandler, IGasHandler, IHeatTransfer, ITubeConnection, IComputerIntegration +public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock implements ISideConfiguration, ITankManager, IFluidHandler, IFrequencyHandler, IGasHandler, IHeatTransfer, ITubeConnection, IComputerIntegration, ISecurityTile { - public String owner; - public InventoryFrequency frequency; public double heatToAbsorb = 0; @@ -57,6 +57,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp public TileComponentEjector ejectorComponent; public TileComponentConfig configComponent; + public TileComponentSecurity securityComponent; public TileEntityQuantumEntangloporter() { @@ -85,6 +86,8 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(2)); ejectorComponent.setOutputData(TransmissionType.FLUID, configComponent.getOutputs(TransmissionType.FLUID).get(2)); ejectorComponent.setOutputData(TransmissionType.GAS, configComponent.getOutputs(TransmissionType.GAS).get(2)); + + securityComponent = new TileComponentSecurity(this); } @Override @@ -112,13 +115,13 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp { if(frequency != null && !frequency.valid) { - frequency = (InventoryFrequency)manager.validateFrequency(owner, Coord4D.get(this), frequency); + frequency = (InventoryFrequency)manager.validateFrequency(getSecurity().getOwner(), Coord4D.get(this), frequency); markDirty(); } if(frequency != null) { - frequency = (InventoryFrequency)manager.update(owner, Coord4D.get(this), frequency); + frequency = (InventoryFrequency)manager.update(getSecurity().getOwner(), Coord4D.get(this), frequency); if(frequency == null) { @@ -169,7 +172,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp public FrequencyManager getManager(Frequency freq) { - if(owner == null || freq == null) + if(getSecurity().getOwner() == null || freq == null) { return null; } @@ -179,14 +182,14 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp return Mekanism.publicEntangloporters; } else { - if(!Mekanism.privateEntangloporters.containsKey(owner)) + if(!Mekanism.privateEntangloporters.containsKey(getSecurity().getOwner())) { - FrequencyManager manager = new FrequencyManager(InventoryFrequency.class, owner); - Mekanism.privateEntangloporters.put(owner, manager); + FrequencyManager manager = new FrequencyManager(InventoryFrequency.class, getSecurity().getOwner()); + Mekanism.privateEntangloporters.put(getSecurity().getOwner(), manager); manager.createOrLoad(worldObj); } - return Mekanism.privateEntangloporters.get(owner); + return Mekanism.privateEntangloporters.get(getSecurity().getOwner()); } } @@ -206,7 +209,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } } - Frequency freq = new InventoryFrequency(name, owner).setPublic(publicFreq); + Frequency freq = new InventoryFrequency(name, getSecurity().getOwner()).setPublic(publicFreq); freq.activeCoords.add(Coord4D.get(this)); manager.addFrequency(freq); frequency = (InventoryFrequency)freq; @@ -220,11 +223,6 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp { super.readFromNBT(nbtTags); - if(nbtTags.hasKey("owner")) - { - owner = nbtTags.getString("owner"); - } - if(nbtTags.hasKey("frequency")) { frequency = new InventoryFrequency(nbtTags.getCompoundTag("frequency")); @@ -237,11 +235,6 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp { super.writeToNBT(nbtTags); - if(owner != null) - { - nbtTags.setString("owner", owner); - } - if(frequency != null) { NBTTagCompound frequencyTag = new NBTTagCompound(); @@ -273,7 +266,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp if(manager != null) { - manager.remove(freq, owner); + manager.remove(freq, getSecurity().getOwner()); } } @@ -285,14 +278,6 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp lastTransferLoss = dataStream.readDouble(); lastEnvironmentLoss = dataStream.readDouble(); - if(dataStream.readBoolean()) - { - owner = PacketHandler.readString(dataStream); - } - else { - owner = null; - } - if(dataStream.readBoolean()) { frequency = new InventoryFrequency(dataStream); @@ -327,15 +312,6 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp data.add(lastTransferLoss); data.add(lastEnvironmentLoss); - if(owner != null) - { - data.add(true); - data.add(owner); - } - else { - data.add(false); - } - if(frequency != null) { data.add(true); @@ -667,6 +643,12 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp { return ejectorComponent; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } @Override public boolean canTubeConnect(ForgeDirection side) diff --git a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java index cc5d88445..88c17590e 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java +++ b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java @@ -9,8 +9,8 @@ import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.frequency.Frequency; import mekanism.common.frequency.FrequencyManager; -import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.security.ISecurityItem; +import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.security.SecurityFrequency; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; @@ -40,10 +40,13 @@ public class TileEntitySecurityDesk extends TileEntityContainerBlock { ISecurityItem item = (ISecurityItem)inventory[0].getItem(); - if(item.hasSecurity(inventory[0])) + if(item.hasSecurity(inventory[0]) && item.getOwner(inventory[0]) != null) { - item.setOwner(inventory[0], null); - item.setSecurity(inventory[0], SecurityMode.PUBLIC); + if(item.getOwner(inventory[0]).equals(owner)) + { + item.setOwner(inventory[0], null); + item.setSecurity(inventory[0], SecurityMode.PUBLIC); + } } } @@ -51,7 +54,7 @@ public class TileEntitySecurityDesk extends TileEntityContainerBlock { ISecurityItem item = (ISecurityItem)inventory[1].getItem(); - if(item.hasSecurity(inventory[1])) + if(item.hasSecurity(inventory[1]) && item.getOwner(inventory[1]) == null) { item.setOwner(inventory[1], owner); item.setSecurity(inventory[1], frequency.securityMode); diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index 25117e502..a78a05950 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -13,6 +13,7 @@ import mekanism.api.Coord4D; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.PacketHandler; +import mekanism.common.base.IRedstoneControl; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.chunkloading.IChunkLoader; import mekanism.common.frequency.Frequency; @@ -21,6 +22,8 @@ import mekanism.common.frequency.IFrequencyHandler; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketPortalFX.PortalFXMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.Entity; @@ -44,7 +47,7 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class TileEntityTeleporter extends TileEntityElectricBlock implements IComputerIntegration, IChunkLoader, IFrequencyHandler +public class TileEntityTeleporter extends TileEntityElectricBlock implements IComputerIntegration, IChunkLoader, IFrequencyHandler, IRedstoneControl, ISecurityTile { private MinecraftServer server = MinecraftServer.getServer(); @@ -58,8 +61,6 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo public boolean prevShouldRender; - public String owner; - public Frequency frequency; public List publicCache = new ArrayList(); @@ -69,11 +70,17 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo /** This teleporter's current status. */ public byte status = 0; + + public RedstoneControl controlType = RedstoneControl.DISABLED; + + public TileComponentSecurity securityComponent; public TileEntityTeleporter() { super("Teleporter", MachineType.TELEPORTER.baseEnergy); inventory = new ItemStack[1]; + + securityComponent = new TileComponentSecurity(this); } @Override @@ -108,12 +115,12 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo { if(frequency != null && !frequency.valid) { - frequency = manager.validateFrequency(owner, Coord4D.get(this), frequency); + frequency = manager.validateFrequency(getSecurity().getOwner(), Coord4D.get(this), frequency); } if(frequency != null) { - frequency = manager.update(owner, Coord4D.get(this), frequency); + frequency = manager.update(getSecurity().getOwner(), Coord4D.get(this), frequency); } } else { @@ -122,7 +129,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo status = canTeleport(); - if(status == 1 && teleDelay == 0) + if(MekanismUtils.canFunction(this) && status == 1 && teleDelay == 0) { teleport(); } @@ -179,7 +186,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo } } - Frequency freq = new Frequency(name, owner).setPublic(publicFreq); + Frequency freq = new Frequency(name, getSecurity().getOwner()).setPublic(publicFreq); freq.activeCoords.add(Coord4D.get(this)); manager.addFrequency(freq); frequency = freq; @@ -189,7 +196,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo public FrequencyManager getManager(Frequency freq) { - if(owner == null || freq == null) + if(getSecurity().getOwner() == null || freq == null) { return null; } @@ -199,14 +206,14 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo return Mekanism.publicTeleporters; } else { - if(!Mekanism.privateTeleporters.containsKey(owner)) + if(!Mekanism.privateTeleporters.containsKey(getSecurity().getOwner())) { - FrequencyManager manager = new FrequencyManager(Frequency.class, owner); - Mekanism.privateTeleporters.put(owner, manager); + FrequencyManager manager = new FrequencyManager(Frequency.class, getSecurity().getOwner()); + Mekanism.privateTeleporters.put(getSecurity().getOwner(), manager); manager.createOrLoad(worldObj); } - return Mekanism.privateTeleporters.get(owner); + return Mekanism.privateTeleporters.get(getSecurity().getOwner()); } } @@ -538,10 +545,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo { super.readFromNBT(nbtTags); - if(nbtTags.hasKey("owner")) - { - owner = nbtTags.getString("owner"); - } + controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")]; if(nbtTags.hasKey("frequency")) { @@ -555,10 +559,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo { super.writeToNBT(nbtTags); - if(owner != null) - { - nbtTags.setString("owner", owner); - } + nbtTags.setInteger("controlType", controlType.ordinal()); if(frequency != null) { @@ -591,7 +592,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo if(manager != null) { - manager.remove(freq, owner); + manager.remove(freq, getSecurity().getOwner()); } } @@ -600,14 +601,6 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo super.handlePacketData(dataStream); - if(dataStream.readBoolean()) - { - owner = PacketHandler.readString(dataStream); - } - else { - owner = null; - } - if(dataStream.readBoolean()) { frequency = new Frequency(dataStream); @@ -618,6 +611,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo status = dataStream.readByte(); shouldRender = dataStream.readBoolean(); + controlType = RedstoneControl.values()[dataStream.readInt()]; publicCache.clear(); privateCache.clear(); @@ -642,15 +636,6 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo { super.getNetworkedData(data); - if(owner != null) - { - data.add(true); - data.add(owner); - } - else { - data.add(false); - } - if(frequency != null) { data.add(true); @@ -662,6 +647,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo data.add(status); data.add(shouldRender); + data.add(controlType.ordinal()); data.add(Mekanism.publicTeleporters.getFrequencies().size()); @@ -757,4 +743,28 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo chunkTicket = null; } } + + @Override + public RedstoneControl getControlType() + { + return controlType; + } + + @Override + public void setControlType(RedstoneControl type) + { + controlType = type; + } + + @Override + public boolean canPulse() + { + return false; + } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 3a659b18b..51f8c2c76 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -48,16 +48,16 @@ import mekanism.common.base.IModule; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IUpgradeTile; -import mekanism.common.inventory.container.ContainerElectricChest; +import mekanism.common.inventory.container.ContainerPersonalChest; import mekanism.common.item.ItemBlockBasic; import mekanism.common.item.ItemBlockEnergyCube; import mekanism.common.item.ItemBlockGasTank; import mekanism.common.item.ItemBlockMachine; -import mekanism.common.network.PacketElectricChest.ElectricChestMessage; -import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; +import mekanism.common.network.PacketPersonalChest.PersonalChestMessage; +import mekanism.common.network.PacketPersonalChest.PersonalChestPacketType; import mekanism.common.tile.TileEntityAdvancedBoundingBlock; import mekanism.common.tile.TileEntityBoundingBlock; -import mekanism.common.tile.TileEntityElectricChest; +import mekanism.common.tile.TileEntityPersonalChest; import net.minecraft.block.Block; import net.minecraft.client.gui.FontRenderer; import net.minecraft.entity.player.EntityPlayer; @@ -953,7 +953,7 @@ public final class MekanismUtils * @param inventory - IInventory of the item, if it's not a block * @param isBlock - whether or not this electric chest is in it's block form */ - public static void openElectricChestGui(EntityPlayerMP player, TileEntityElectricChest tileEntity, IInventory inventory, boolean isBlock) + public static void openPersonalChestGui(EntityPlayerMP player, TileEntityPersonalChest tileEntity, IInventory inventory, boolean isBlock) { player.getNextWindowId(); player.closeContainer(); @@ -961,13 +961,13 @@ public final class MekanismUtils if(isBlock) { - Mekanism.packetHandler.sendTo(new ElectricChestMessage(ElectricChestPacketType.CLIENT_OPEN, true, false, 0, id, null, Coord4D.get(tileEntity)), player); + Mekanism.packetHandler.sendTo(new PersonalChestMessage(PersonalChestPacketType.CLIENT_OPEN, true, 0, id, Coord4D.get(tileEntity)), player); } else { - Mekanism.packetHandler.sendTo(new ElectricChestMessage(ElectricChestPacketType.CLIENT_OPEN, false, false, 0, id, null, null), player); + Mekanism.packetHandler.sendTo(new PersonalChestMessage(PersonalChestPacketType.CLIENT_OPEN, false, 0, id, null), player); } - player.openContainer = new ContainerElectricChest(player.inventory, tileEntity, inventory, isBlock); + player.openContainer = new ContainerPersonalChest(player.inventory, tileEntity, inventory, isBlock); player.openContainer.windowId = id; player.openContainer.addCraftingToCrafters(player); } diff --git a/src/main/java/mekanism/common/util/SecurityUtils.java b/src/main/java/mekanism/common/util/SecurityUtils.java index 42e532fa3..a657b68ee 100644 --- a/src/main/java/mekanism/common/util/SecurityUtils.java +++ b/src/main/java/mekanism/common/util/SecurityUtils.java @@ -8,6 +8,7 @@ import mekanism.common.security.ISecurityTile; import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.security.SecurityFrequency; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; @@ -16,7 +17,7 @@ public final class SecurityUtils { public static boolean canAccess(EntityPlayer player, ItemStack stack) { - if(stack == null || !(stack.getItem() instanceof ISecurityItem)) + if((!player.worldObj.isRemote && MekanismUtils.isOp((EntityPlayerMP)player)) || stack == null || !(stack.getItem() instanceof ISecurityItem)) { return true; } @@ -28,7 +29,7 @@ public final class SecurityUtils public static boolean canAccess(EntityPlayer player, TileEntity tile) { - if(tile == null || !(tile instanceof ISecurityTile)) + if((!player.worldObj.isRemote && MekanismUtils.isOp((EntityPlayerMP)player)) || tile == null || !(tile instanceof ISecurityTile)) { return true; } @@ -38,7 +39,7 @@ public final class SecurityUtils return canAccess(security.getSecurity().getMode(), player.getCommandSenderName(), security.getSecurity().getOwner()); } - public static boolean canAccess(SecurityMode mode, String username, String owner) + private static boolean canAccess(SecurityMode mode, String username, String owner) { if(owner == null || username.equals(owner)) { diff --git a/src/main/resources/assets/mekanism/gui/GuiElectricChest.png b/src/main/resources/assets/mekanism/gui/GuiElectricChest.png deleted file mode 100644 index 8dbd466ab82cfdb4ac232e0f3e53924b18329f45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5477 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 Gx%d}RW?;Mk literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 12d52f2c5..576e632b1 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -127,7 +127,7 @@ tile.MachineBlock.PurificationChamber.name=Purification Chamber tile.MachineBlock.EnergizedSmelter.name=Energized Smelter tile.MachineBlock.Teleporter.name=Teleporter tile.MachineBlock.ElectricPump.name=Electric Pump -tile.MachineBlock.ElectricChest.name=Electric Chest +tile.MachineBlock.PersonalChest.name=Personal Chest tile.MachineBlock.Chargepad.name=Chargepad tile.MachineBlock.LogisticalSorter.name=Logistical Sorter tile.MachineBlock.DigitalMiner.name=Digital Miner @@ -641,8 +641,6 @@ gui.logisticalSorter.default=Default gui.logisticalSorter.auto=Auto gui.logisticalSorter.roundRobin=Round-robin -gui.electricChest.editPassword=Edit Password - gui.teleporter.notReady=Not ready gui.teleporter.ready=Ready gui.teleporter.noFrame=No frame @@ -687,7 +685,6 @@ tooltip.configurator.pumpReset=Reset Electric Pump calculation tooltip.configurator.toggleDiverter=Diverter mode changed to tooltip.configurator.toggleMode=%s behavior bumped to tooltip.configurator.viewMode=Current %s behavior -tooltip.configurator.unauth=This chest is locked tooltip.configurator.noLink=No link tooltip.configurator.linkMsg=Bound to tooltip.configurator.dim=dimension @@ -803,7 +800,7 @@ tooltip.PurificationChamber=An advanced machine capable of processing ores into tooltip.EnergizedSmelter=A simple machine that serves as a Mekanism-based furnace that runs off of energy. tooltip.Teleporter=A machine capable of teleporting players to various locations defined by another teleporter. tooltip.ElectricPump=An advanced, upgradeable pump, capable of extracting any type of fluid. -tooltip.ElectricChest=A portable, 54-slot chest that uses energy to lock itself from others by means of password protection. +tooltip.PersonalChest=A 54-slot chest that can be opened anywhere- even from your own inventory. tooltip.Chargepad=A universal chargepad that can charge any energized item from any mod. tooltip.LogisticalSorter=A filter-based, advanced sorting machine that can auto-eject specified items out of and into adjacent inventories and Logistical Transporters. tooltip.RotaryCondensentrator=A machine capable of converting gasses into their fluid form and vice versa. diff --git a/src/main/resources/assets/mekanism/render/ElectricChest.png b/src/main/resources/assets/mekanism/render/PersonalChest.png similarity index 100% rename from src/main/resources/assets/mekanism/render/ElectricChest.png rename to src/main/resources/assets/mekanism/render/PersonalChest.png From a18da2ad27d2374fc10070405d48f3fd2ee8ed04 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Mon, 21 Mar 2016 18:25:27 -0400 Subject: [PATCH 05/62] Integrate security into more machines --- .../client/gui/GuiElectrolyticSeparator.java | 2 + .../mekanism/client/gui/GuiFluidTank.java | 2 + .../mekanism/client/gui/GuiPersonalChest.java | 13 +-- .../client/gui/element/GuiSecurityTab.java | 106 +++++++++++++++--- src/main/java/mekanism/common/Mekanism.java | 3 + .../common/base/IAdvancedBoundingBlock.java | 3 +- .../mekanism/common/block/BlockBounding.java | 11 ++ .../common/item/ItemBlockMachine.java | 13 ++- .../common/network/PacketSecurityMode.java | 61 ++++++++-- .../common/tile/TileEntityBasicMachine.java | 13 ++- .../tile/TileEntityChemicalCrystallizer.java | 15 ++- .../TileEntityChemicalDissolutionChamber.java | 11 +- .../tile/TileEntityChemicalInfuser.java | 11 +- .../tile/TileEntityChemicalOxidizer.java | 11 +- .../common/tile/TileEntityChemicalWasher.java | 11 +- .../common/tile/TileEntityDigitalMiner.java | 8 ++ .../common/tile/TileEntityElectricPump.java | 11 +- .../tile/TileEntityElectrolyticSeparator.java | 11 +- .../common/tile/TileEntityFactory.java | 13 ++- .../common/tile/TileEntityFluidTank.java | 12 +- .../TileEntityFormulaicAssemblicator.java | 13 ++- .../common/tile/TileEntityLaserAmplifier.java | 12 +- .../tile/TileEntityLaserTractorBeam.java | 12 +- .../tile/TileEntityLogisticalSorter.java | 12 +- .../tile/TileEntityOredictionificator.java | 12 +- .../tile/TileEntityRotaryCondensentrator.java | 11 +- .../tile/TileEntitySeismicVibrator.java | 12 +- .../tile/TileEntitySolarNeutronActivator.java | 12 +- .../mekanism/common/util/SecurityUtils.java | 9 +- 29 files changed, 385 insertions(+), 61 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java index 9a1d259b5..c8cdd63c2 100755 --- a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java @@ -18,6 +18,7 @@ import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -82,6 +83,7 @@ public class GuiElectrolyticSeparator extends GuiMekanism } }, GuiGauge.Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 100, 18)); guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 164, 15)); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"))); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 25, 34)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 58, 51)); diff --git a/src/main/java/mekanism/client/gui/GuiFluidTank.java b/src/main/java/mekanism/client/gui/GuiFluidTank.java index 171ec58a6..c453d9848 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidTank.java +++ b/src/main/java/mekanism/client/gui/GuiFluidTank.java @@ -3,6 +3,7 @@ package mekanism.client.gui; import mekanism.client.gui.element.GuiContainerEditMode; import mekanism.client.gui.element.GuiFluidGauge; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -29,6 +30,7 @@ public class GuiFluidTank extends GuiMekanism super(tentity, new ContainerFluidTank(inventory, tentity)); tileEntity = tentity; guiElements.add(new GuiContainerEditMode(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() { @Override diff --git a/src/main/java/mekanism/client/gui/GuiPersonalChest.java b/src/main/java/mekanism/client/gui/GuiPersonalChest.java index 393446ed3..6c51d68e2 100644 --- a/src/main/java/mekanism/client/gui/GuiPersonalChest.java +++ b/src/main/java/mekanism/client/gui/GuiPersonalChest.java @@ -18,19 +18,16 @@ import cpw.mods.fml.relauncher.SideOnly; public class GuiPersonalChest extends GuiMekanism { public TileEntityPersonalChest tileEntity; - public IInventory itemInventory; - public boolean isBlock; public GuiPersonalChest(InventoryPlayer inventory, TileEntityPersonalChest tentity) { super(tentity, new ContainerPersonalChest(inventory, tentity, null, true)); - - guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiPersonalChest.png"))); xSize+=26; ySize+=64; tileEntity = tentity; - isBlock = true; + + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiPersonalChest.png"))); } public GuiPersonalChest(InventoryPlayer inventory, IInventory inv) @@ -39,8 +36,8 @@ public class GuiPersonalChest extends GuiMekanism xSize+=26; ySize+=64; - itemInventory = inv; - isBlock = false; + + guiElements.add(new GuiSecurityTab(this, MekanismUtils.getResource(ResourceType.GUI, "GuiPersonalChest.png"))); } @Override @@ -66,5 +63,7 @@ public class GuiPersonalChest extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } } diff --git a/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java b/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java index 585d0b805..c287d5c71 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java @@ -7,12 +7,15 @@ import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.network.PacketSecurityMode.SecurityModeMessage; +import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; import mekanism.common.security.ISecurityTile.SecurityMode; +import mekanism.common.security.SecurityFrequency; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.SecurityUtils; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import codechicken.lib.vec.Rectangle4i; @@ -22,7 +25,9 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiSecurityTab extends GuiElement { - TileEntity tileEntity; + public boolean isItem; + + public TileEntity tileEntity; public GuiSecurityTab(IGuiWrapper gui, TileEntity tile, ResourceLocation def) { @@ -31,6 +36,13 @@ public class GuiSecurityTab extends GuiElement tileEntity = tile; } + public GuiSecurityTab(IGuiWrapper gui, ResourceLocation def) + { + super(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, "GuiSecurityTab.png"), gui, def); + + isItem = true; + } + @Override public Rectangle4i getBounds(int guiWidth, int guiHeight) { @@ -44,18 +56,18 @@ public class GuiSecurityTab extends GuiElement guiObj.drawTexturedRect(guiWidth + 176, guiHeight + 32, 0, 0, 26, 26); - ISecurityTile tile = (ISecurityTile)tileEntity; - SecurityMode mode = tile.getSecurity().getMode(); + SecurityMode mode = getSecurity(); + SecurityFrequency freq = getFrequency(); - if(tile.getSecurity().getFrequency() != null && tile.getSecurity().getFrequency().override) + if(freq != null && freq.override) { - mode = tile.getSecurity().getFrequency().securityMode; + mode = freq.securityMode; } int renderX = 26 + (18*mode.ordinal()); - if(tile.getSecurity().getOwner() != null && tile.getSecurity().getOwner().equals(mc.thePlayer.getCommandSenderName()) && - (tile.getSecurity().getFrequency() == null || !tile.getSecurity().getFrequency().override)) + if(getOwner() != null && getOwner().equals(mc.thePlayer.getCommandSenderName()) && + (getFrequency() == null || !getFrequency().override)) { if(xAxis >= 179 && xAxis <= 197 && yAxis >= 36 && yAxis <= 54) { @@ -77,15 +89,14 @@ public class GuiSecurityTab extends GuiElement { mc.renderEngine.bindTexture(RESOURCE); - ISecurityTile control = (ISecurityTile)tileEntity; - if(xAxis >= 179 && xAxis <= 197 && yAxis >= 36 && yAxis <= 54) { - String securityText = EnumColor.GREY + LangUtils.localize("gui.security") + ": " + SecurityUtils.getSecurityDisplay((TileEntity)control); - String ownerText = SecurityUtils.getOwnerDisplay(mc.thePlayer.getCommandSenderName(), control.getSecurity().getOwner()); + String securityDisplay = isItem ? SecurityUtils.getSecurityDisplay(getItem()) : SecurityUtils.getSecurityDisplay(tileEntity); + String securityText = EnumColor.GREY + LangUtils.localize("gui.security") + ": " + securityDisplay; + String ownerText = SecurityUtils.getOwnerDisplay(mc.thePlayer.getCommandSenderName(), getOwner()); String overrideText = EnumColor.RED + "(" + LangUtils.localize("gui.overridden") + ")"; - if(SecurityUtils.isOverridden((TileEntity)control)) + if(isItem ? SecurityUtils.isOverridden(getItem()) : SecurityUtils.isOverridden(tileEntity)) { displayTooltips(ListUtils.asList(securityText, ownerText, overrideText), xAxis, yAxis); } @@ -96,6 +107,62 @@ public class GuiSecurityTab extends GuiElement mc.renderEngine.bindTexture(defaultLocation); } + + private SecurityFrequency getFrequency() + { + if(isItem) + { + if(getItem() == null || !(getItem().getItem() instanceof ISecurityItem)) + { + mc.thePlayer.closeScreen(); + return null; + } + + return SecurityUtils.getFrequency(getOwner()); + } + else { + return ((ISecurityTile)tileEntity).getSecurity().getFrequency(); + } + } + + private SecurityMode getSecurity() + { + if(isItem) + { + if(getItem() == null || !(getItem().getItem() instanceof ISecurityItem)) + { + mc.thePlayer.closeScreen(); + return SecurityMode.PUBLIC; + } + + return ((ISecurityItem)getItem().getItem()).getSecurity(getItem()); + } + else { + return ((ISecurityTile)tileEntity).getSecurity().getMode(); + } + } + + private String getOwner() + { + if(isItem) + { + if(getItem() == null || !(getItem().getItem() instanceof ISecurityItem)) + { + mc.thePlayer.closeScreen(); + return null; + } + + return ((ISecurityItem)getItem().getItem()).getOwner(getItem()); + } + else { + return ((ISecurityTile)tileEntity).getSecurity().getOwner(); + } + } + + private ItemStack getItem() + { + return mc.thePlayer.getCurrentEquippedItem(); + } @Override public void preMouseClicked(int xAxis, int yAxis, int button) {} @@ -103,19 +170,24 @@ public class GuiSecurityTab extends GuiElement @Override public void mouseClicked(int xAxis, int yAxis, int button) { - ISecurityTile control = (ISecurityTile)tileEntity; - if(button == 0) { - if(control.getSecurity().getOwner() != null && mc.thePlayer.getCommandSenderName().equals(control.getSecurity().getOwner())) + if(getOwner() != null && mc.thePlayer.getCommandSenderName().equals(getOwner())) { if(xAxis >= 179 && xAxis <= 197 && yAxis >= 36 && yAxis <= 54) { - SecurityMode current = control.getSecurity().getMode(); + SecurityMode current = getSecurity(); int ordinalToSet = current.ordinal() < (SecurityMode.values().length-1) ? current.ordinal()+1 : 0; SoundHandler.playSound("gui.button.press"); - Mekanism.packetHandler.sendToServer(new SecurityModeMessage(Coord4D.get(tileEntity), SecurityMode.values()[ordinalToSet])); + + if(isItem) + { + Mekanism.packetHandler.sendToServer(new SecurityModeMessage(SecurityMode.values()[ordinalToSet])); + } + else { + Mekanism.packetHandler.sendToServer(new SecurityModeMessage(Coord4D.get(tileEntity), SecurityMode.values()[ordinalToSet])); + } } } } diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 7a592d5c4..be58f8c9f 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -526,6 +526,9 @@ public class Mekanism CraftingManager.getInstance().getRecipeList().add(new ShapelessMekanismRecipe(new ItemStack(MekanismItems.CraftingFormula), new Object[] { Items.paper, MekanismUtils.getControlCircuit(BaseTier.BASIC) })); + CraftingManager.getInstance().getRecipeList().add(new ShapelessMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 1, 9), new Object[] { + + })); //Energy Cube recipes CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC), new Object[] { diff --git a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java index bb95644f6..453921f84 100644 --- a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java @@ -6,6 +6,7 @@ import mekanism.api.IConfigCardAccess.ISpecialConfigData; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.integration.IComputerIntegration; +import mekanism.common.security.ISecurityTile; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import cofh.api.energy.IEnergyHandler; @@ -15,7 +16,7 @@ import cpw.mods.fml.common.Optional.InterfaceList; @InterfaceList({ @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), }) -public interface IAdvancedBoundingBlock extends IBoundingBlock, ISidedInventory, IEnergySink, IStrictEnergyAcceptor, IStrictEnergyStorage, IEnergyHandler, IComputerIntegration, ISpecialConfigData +public interface IAdvancedBoundingBlock extends IBoundingBlock, ISidedInventory, IEnergySink, IStrictEnergyAcceptor, IStrictEnergyStorage, IEnergyHandler, IComputerIntegration, ISpecialConfigData, ISecurityTile { public int[] getBoundSlots(Coord4D location, int side); diff --git a/src/main/java/mekanism/common/block/BlockBounding.java b/src/main/java/mekanism/common/block/BlockBounding.java index 7a0a0664a..b742a70b7 100644 --- a/src/main/java/mekanism/common/block/BlockBounding.java +++ b/src/main/java/mekanism/common/block/BlockBounding.java @@ -74,6 +74,17 @@ public class BlockBounding extends Block world.getBlock(tileEntity.mainX, tileEntity.mainY, tileEntity.mainZ).onNeighborBlockChange(world, tileEntity.mainX, tileEntity.mainY, tileEntity.mainZ, this); } catch(Exception e) {} } + + @Override + public float getBlockHardness(World world, int x, int y, int z) + { + try { + TileEntityBoundingBlock tileEntity = (TileEntityBoundingBlock)world.getTileEntity(x, y, z); + return world.getBlock(tileEntity.mainX, tileEntity.mainY, tileEntity.mainZ).getBlockHardness(world, x, y, z); + } catch(Exception e) { + return blockHardness; + } + } @Override public int quantityDropped(Random random) diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 6c6c386f8..903052c4f 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -454,6 +454,11 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { if(!world.isRemote) { + if(getOwner(itemstack) == null) + { + setOwner(itemstack, entityplayer.getCommandSenderName()); + } + if(SecurityUtils.canAccess(entityplayer, itemstack)) { InventoryPersonalChest inventory = new InventoryPersonalChest(entityplayer); @@ -543,10 +548,10 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec return itemstack; } } + else { + SecurityUtils.displayNoAccess(entityplayer); + } } - else { - SecurityUtils.displayNoAccess(entityplayer); - } return itemstack; } @@ -952,7 +957,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { MachineType type = MachineType.get(stack); - if(type != MachineType.LASER) + if(type != MachineType.LASER && type != MachineType.CHARGEPAD) { return true; } diff --git a/src/main/java/mekanism/common/network/PacketSecurityMode.java b/src/main/java/mekanism/common/network/PacketSecurityMode.java index 43944a606..0e86dfe89 100644 --- a/src/main/java/mekanism/common/network/PacketSecurityMode.java +++ b/src/main/java/mekanism/common/network/PacketSecurityMode.java @@ -4,9 +4,11 @@ import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.common.PacketHandler; import mekanism.common.network.PacketSecurityMode.SecurityModeMessage; +import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; import mekanism.common.security.ISecurityTile.SecurityMode; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; @@ -18,15 +20,27 @@ public class PacketSecurityMode implements IMessageHandler, OUTPUT extends MachineOutput, RECIPE extends MachineRecipe> extends TileEntityNoisyElectricBlock implements IElectricMachine, IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IConfigCardAccess +public abstract class TileEntityBasicMachine, OUTPUT extends MachineOutput, RECIPE extends MachineRecipe> extends TileEntityNoisyElectricBlock implements IElectricMachine, IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IConfigCardAccess, ISecurityTile { /** How much energy this machine uses per tick, un-upgraded. */ public double BASE_ENERGY_PER_TICK; @@ -69,6 +71,7 @@ public abstract class TileEntityBasicMachine, public TileComponentUpgrade upgradeComponent; public TileComponentEjector ejectorComponent; public TileComponentConfig configComponent; + public TileComponentSecurity securityComponent; /** * The foundation of all machines - a simple tile entity with a facing, active state, initialized state, sound effect, and animated texture. @@ -89,6 +92,8 @@ public abstract class TileEntityBasicMachine, ticksRequired = baseTicksRequired; guiLocation = location; isActive = false; + + securityComponent = new TileComponentSecurity(this); } @Override @@ -293,4 +298,10 @@ public abstract class TileEntityBasicMachine, { return ejectorComponent; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java index 7d1161de0..373f2af47 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java @@ -31,8 +31,10 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.GasInput; import mekanism.common.recipe.machines.CrystallizerRecipe; +import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; @@ -41,7 +43,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock implements IGasHandler, ITubeConnection, IRedstoneControl, ISideConfiguration, IUpgradeTile, ISustainedData, ITankManager, IConfigCardAccess +public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock implements IGasHandler, ITubeConnection, IRedstoneControl, ISideConfiguration, IUpgradeTile, ISustainedData, ITankManager, IConfigCardAccess, ISecurityTile { public static final int MAX_GAS = 10000; @@ -77,7 +79,8 @@ public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock public TileComponentUpgrade upgradeComponent; public TileComponentEjector ejectorComponent; public TileComponentConfig configComponent; - + public TileComponentSecurity securityComponent; + public TileEntityChemicalCrystallizer() { super("machine.crystallizer", "ChemicalCrystallizer", MachineType.CHEMICAL_CRYSTALLIZER.baseEnergy); @@ -104,6 +107,8 @@ public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock ejectorComponent = new TileComponentEjector(this); ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(2)); + + securityComponent = new TileComponentSecurity(this); } @Override @@ -488,4 +493,10 @@ public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock { return new Object[] {inputTank}; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java index f519a4b09..c140837b1 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java @@ -26,7 +26,9 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.machines.DissolutionRecipe; +import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentAdvancedUpgrade; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; @@ -37,7 +39,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityChemicalDissolutionChamber extends TileEntityNoisyElectricBlock implements ITubeConnection, IRedstoneControl, IGasHandler, IUpgradeTile, ISustainedData, ITankManager +public class TileEntityChemicalDissolutionChamber extends TileEntityNoisyElectricBlock implements ITubeConnection, IRedstoneControl, IGasHandler, IUpgradeTile, ISustainedData, ITankManager, ISecurityTile { public GasTank injectTank = new GasTank(MAX_GAS); public GasTank outputTank = new GasTank(MAX_GAS); @@ -73,6 +75,7 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityNoisyElectri public DissolutionRecipe cachedRecipe; public TileComponentUpgrade upgradeComponent = new TileComponentAdvancedUpgrade(this, 4); + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); public RedstoneControl controlType = RedstoneControl.DISABLED; @@ -503,4 +506,10 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityNoisyElectri { return new Object[] {injectTank, outputTank}; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java index 6a4bbe940..47e13d9e2 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java @@ -28,6 +28,8 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.ChemicalPairInput; import mekanism.common.recipe.machines.ChemicalInfuserRecipe; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; @@ -37,7 +39,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock implements IGasHandler, ITubeConnection, IRedstoneControl, ISustainedData, IUpgradeTile, IUpgradeInfoHandler, ITankManager +public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock implements IGasHandler, ITubeConnection, IRedstoneControl, ISustainedData, IUpgradeTile, IUpgradeInfoHandler, ITankManager, ISecurityTile { public GasTank leftTank = new GasTank(MAX_GAS); public GasTank rightTank = new GasTank(MAX_GAS); @@ -64,6 +66,7 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl public double clientEnergyUsed; public TileComponentUpgrade upgradeComponent = new TileComponentUpgrade(this, 4); + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); /** This machine's current RedstoneControl type. */ public RedstoneControl controlType = RedstoneControl.DISABLED; @@ -556,4 +559,10 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl { return new Object[] {leftTank, rightTank, centerTank}; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java index 57cc3098d..ea166c287 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java @@ -25,6 +25,8 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.machines.OxidationRecipe; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; @@ -34,7 +36,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityChemicalOxidizer extends TileEntityNoisyElectricBlock implements ITubeConnection, IRedstoneControl, IUpgradeTile, ISustainedData, ITankManager +public class TileEntityChemicalOxidizer extends TileEntityNoisyElectricBlock implements ITubeConnection, IRedstoneControl, IUpgradeTile, ISustainedData, ITankManager, ISecurityTile { public GasTank gasTank = new GasTank(MAX_GAS); @@ -65,6 +67,7 @@ public class TileEntityChemicalOxidizer extends TileEntityNoisyElectricBlock imp public RedstoneControl controlType = RedstoneControl.DISABLED; public TileComponentUpgrade upgradeComponent = new TileComponentUpgrade(this, 3); + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); public TileEntityChemicalOxidizer() { @@ -402,4 +405,10 @@ public class TileEntityChemicalOxidizer extends TileEntityNoisyElectricBlock imp { return new Object[] {gasTank}; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index fa9a9d121..b679d7043 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -28,6 +28,8 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.GasInput; import mekanism.common.recipe.machines.WasherRecipe; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; @@ -48,7 +50,7 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; -public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock implements IGasHandler, ITubeConnection, IRedstoneControl, IFluidHandler, IUpgradeTile, ISustainedData, IUpgradeInfoHandler, ITankManager +public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock implements IGasHandler, ITubeConnection, IRedstoneControl, IFluidHandler, IUpgradeTile, ISustainedData, IUpgradeInfoHandler, ITankManager, ISecurityTile { public FluidTank fluidTank = new FluidTank(MAX_FLUID); public GasTank inputTank = new GasTank(MAX_GAS); @@ -78,6 +80,7 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple public double clientEnergyUsed; public TileComponentUpgrade upgradeComponent = new TileComponentUpgrade(this, 4); + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); /** This machine's current RedstoneControl type. */ public RedstoneControl controlType = RedstoneControl.DISABLED; @@ -605,4 +608,10 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple { return new Object[] {fluidTank, inputTank, outputTank}; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index d7dafa669..d70894fe0 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -35,6 +35,7 @@ import mekanism.common.content.transporter.TransporterManager; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; @@ -115,6 +116,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I public RedstoneControl controlType = RedstoneControl.DISABLED; public TileComponentUpgrade upgradeComponent = new TileComponentUpgrade(this, 28); + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); public TileEntityDigitalMiner() { @@ -1489,4 +1491,10 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I break; } } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index 898ff7f3d..b892f6189 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -21,6 +21,8 @@ import mekanism.common.base.ISustainedTank; import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; import mekanism.common.integration.IComputerIntegration; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; @@ -45,7 +47,7 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; -public class TileEntityElectricPump extends TileEntityElectricBlock implements IFluidHandler, ISustainedTank, IConfigurable, IRedstoneControl, IUpgradeTile, ITankManager, IComputerIntegration +public class TileEntityElectricPump extends TileEntityElectricBlock implements IFluidHandler, ISustainedTank, IConfigurable, IRedstoneControl, IUpgradeTile, ITankManager, IComputerIntegration, ISecurityTile { /** This pump's tank */ public FluidTank fluidTank = new FluidTank(10000); @@ -75,6 +77,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I public RedstoneControl controlType = RedstoneControl.DISABLED; public TileComponentUpgrade upgradeComponent = new TileComponentUpgrade(this, 3); + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); public TileEntityElectricPump() { @@ -580,6 +583,12 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I } } + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } + @Override public void recalculateUpgradables(Upgrade upgrade) { diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java index fa395b2c5..faa159e1a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java @@ -32,7 +32,9 @@ import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.inputs.FluidInput; import mekanism.common.recipe.machines.SeparatorRecipe; import mekanism.common.recipe.outputs.ChemicalPairOutput; +import mekanism.common.security.ISecurityTile; import mekanism.common.tile.TileEntityGasTank.GasMode; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; @@ -51,7 +53,7 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; -public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock implements IFluidHandler, IComputerIntegration, ITubeConnection, ISustainedData, IGasHandler, IUpgradeTile, IUpgradeInfoHandler, ITankManager, IRedstoneControl, IActiveState +public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock implements IFluidHandler, IComputerIntegration, ITubeConnection, ISustainedData, IGasHandler, IUpgradeTile, IUpgradeInfoHandler, ITankManager, IRedstoneControl, IActiveState, ISecurityTile { /** This separator's water slot. */ public FluidTank fluidTank = new FluidTank(24000); @@ -94,6 +96,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp public double clientEnergyUsed; public TileComponentUpgrade upgradeComponent = new TileComponentUpgrade(this, 4); + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); /** This machine's current RedstoneControl type. */ public RedstoneControl controlType = RedstoneControl.DISABLED; @@ -818,6 +821,12 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp return upgradeComponent; } + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } + @Override public void recalculateUpgradables(Upgrade upgrade) { diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index c2325b6fb..e16422ae1 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -46,8 +46,10 @@ import mekanism.common.recipe.inputs.InfusionInput; import mekanism.common.recipe.machines.AdvancedMachineRecipe; import mekanism.common.recipe.machines.BasicMachineRecipe; import mekanism.common.recipe.machines.MetallurgicInfuserRecipe; +import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; @@ -60,7 +62,7 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class TileEntityFactory extends TileEntityNoisyElectricBlock implements IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IGasHandler, ITubeConnection, ISpecialConfigData +public class TileEntityFactory extends TileEntityNoisyElectricBlock implements IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IGasHandler, ITubeConnection, ISpecialConfigData, ISecurityTile { /** This Factory's tier. */ public FactoryTier tier; @@ -130,6 +132,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I public TileComponentUpgrade upgradeComponent; public TileComponentEjector ejectorComponent; public TileComponentConfig configComponent; + public TileComponentSecurity securityComponent; public TileEntityFactory() { @@ -157,6 +160,8 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I ejectorComponent = new TileComponentEjector(this); ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(2)); + + securityComponent = new TileComponentSecurity(this); } public TileEntityFactory(FactoryTier type, MachineType machine) @@ -1193,4 +1198,10 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I { return tier.getBaseTier().getLocalizedName() + " " + recipeType.getLocalizedName() + " " + super.getInventoryName(); } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } \ No newline at end of file diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java index 5bea75c3f..72753150e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java @@ -15,6 +15,8 @@ import mekanism.common.base.IFluidContainerManager; import mekanism.common.base.ISustainedTank; import mekanism.common.base.ITankManager; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; import mekanism.common.util.InventoryUtils; @@ -34,7 +36,7 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; -public class TileEntityFluidTank extends TileEntityContainerBlock implements IActiveState, IConfigurable, IFluidHandler, ISustainedTank, IFluidContainerManager, ITankManager +public class TileEntityFluidTank extends TileEntityContainerBlock implements IActiveState, IConfigurable, IFluidHandler, ISustainedTank, IFluidContainerManager, ITankManager, ISecurityTile { public boolean isActive; @@ -57,6 +59,8 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc public boolean needsPacket; + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); + public TileEntityFluidTank() { super("FluidTank"); @@ -575,4 +579,10 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc { return new Object[] {fluidTank}; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java index f80abd209..69bd444dd 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -18,8 +18,10 @@ import mekanism.common.base.IUpgradeTile; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.content.assemblicator.RecipeFormula; import mekanism.common.item.ItemCraftingFormula; +import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; @@ -28,7 +30,7 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock implements ISideConfiguration, IUpgradeTile, IRedstoneControl, IConfigCardAccess +public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock implements ISideConfiguration, IUpgradeTile, IRedstoneControl, IConfigCardAccess, ISecurityTile { public InventoryCrafting dummyInv = MekanismUtils.getDummyCraftingInv(); @@ -55,6 +57,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im public TileComponentUpgrade upgradeComponent; public TileComponentEjector ejectorComponent; public TileComponentConfig configComponent; + public TileComponentSecurity securityComponent; public TileEntityFormulaicAssemblicator() { @@ -77,6 +80,8 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im ejectorComponent = new TileComponentEjector(this); ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(2)); + + securityComponent = new TileComponentSecurity(this); } @Override @@ -663,6 +668,12 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im return ejectorComponent; } + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } + @Override public void recalculateUpgradables(Upgrade upgrade) { diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java index 9235c6d0f..179b36f47 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java @@ -15,6 +15,8 @@ import mekanism.common.Mekanism; import mekanism.common.base.IRedstoneControl; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; @@ -23,7 +25,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityLaserAmplifier extends TileEntityContainerBlock implements ILaserReceptor, IRedstoneControl, ICableOutputter, IStrictEnergyStorage, IComputerIntegration +public class TileEntityLaserAmplifier extends TileEntityContainerBlock implements ILaserReceptor, IRedstoneControl, ICableOutputter, IStrictEnergyStorage, IComputerIntegration, ISecurityTile { public static final double MAX_ENERGY = 5E9; public double collectedEnergy = 0; @@ -43,6 +45,8 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement public boolean emittingRedstone; public boolean entityDetection; + + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); public TileEntityLaserAmplifier() { @@ -332,4 +336,10 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement throw new NoSuchMethodException(); } } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java index 574439892..38910f2d6 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java @@ -13,6 +13,8 @@ import mekanism.common.LaserManager; import mekanism.common.LaserManager.LaserInfo; import mekanism.common.Mekanism; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.InventoryUtils; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; @@ -21,7 +23,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityLaserTractorBeam extends TileEntityContainerBlock implements ILaserReceptor +public class TileEntityLaserTractorBeam extends TileEntityContainerBlock implements ILaserReceptor, ISecurityTile { public static final double MAX_ENERGY = 5E9; public double collectedEnergy = 0; @@ -33,6 +35,8 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme public double diggingProgress; public static int[] availableSlotIDs = InventoryUtils.getIntRange(0, 26); + + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); public TileEntityLaserTractorBeam() { @@ -217,4 +221,10 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme return; } } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index fc613a224..c71b512d5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -24,6 +24,8 @@ import mekanism.common.content.transporter.TItemStackFilter; import mekanism.common.content.transporter.TransporterFilter; import mekanism.common.content.transporter.TransporterManager; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; @@ -37,7 +39,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityLogisticalSorter extends TileEntityElectricBlock implements IRedstoneControl, IActiveState, ISpecialConfigData, ISustainedData +public class TileEntityLogisticalSorter extends TileEntityElectricBlock implements IRedstoneControl, IActiveState, ISpecialConfigData, ISustainedData, ISecurityTile { public HashList filters = new HashList(); @@ -60,6 +62,8 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen public boolean clientActive; public final double ENERGY_PER_ITEM = 5; + + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); public TileEntityLogisticalSorter() { @@ -587,6 +591,12 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen { return true; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } @Override public NBTTagCompound getConfigurationData(NBTTagCompound nbtTags) diff --git a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java index da3ef11aa..df1174a91 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java +++ b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java @@ -17,6 +17,8 @@ import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; @@ -27,7 +29,7 @@ import net.minecraft.nbt.NBTTagList; import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.oredict.OreDictionary; -public class TileEntityOredictionificator extends TileEntityContainerBlock implements IRedstoneControl, ISpecialConfigData, ISustainedData +public class TileEntityOredictionificator extends TileEntityContainerBlock implements IRedstoneControl, ISpecialConfigData, ISustainedData, ISecurityTile { public static final int MAX_LENGTH = 24; @@ -39,6 +41,8 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple public boolean didProcess; + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); + public TileEntityOredictionificator() { super(MachineType.OREDICTIONIFICATOR.name); @@ -410,6 +414,12 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple return true; } + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } + public static class OredictionificatorFilter { public String filter; diff --git a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java index f333a33f8..4cf351b97 100644 --- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java @@ -25,6 +25,8 @@ import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; @@ -44,7 +46,7 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; -public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock implements IActiveState, ISustainedData, IFluidHandler, IGasHandler, ITubeConnection, IRedstoneControl, IUpgradeTile, IUpgradeInfoHandler, ITankManager +public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock implements IActiveState, ISustainedData, IFluidHandler, IGasHandler, ITubeConnection, IRedstoneControl, IUpgradeTile, IUpgradeInfoHandler, ITankManager, ISecurityTile { public GasTank gasTank = new GasTank(MAX_FLUID); @@ -72,6 +74,7 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp public double clientEnergyUsed; public TileComponentUpgrade upgradeComponent = new TileComponentUpgrade(this, 5); + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); /** This machine's current RedstoneControl type. */ public RedstoneControl controlType = RedstoneControl.DISABLED; @@ -587,4 +590,10 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp { return new Object[] {gasTank, fluidTank}; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java index aaaeee2b1..ceee8968b 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java @@ -14,13 +14,15 @@ import mekanism.common.base.IActiveState; import mekanism.common.base.IRedstoneControl; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntitySeismicVibrator extends TileEntityElectricBlock implements IActiveState, IRedstoneControl +public class TileEntitySeismicVibrator extends TileEntityElectricBlock implements IActiveState, IRedstoneControl, ISecurityTile { public boolean isActive; @@ -32,6 +34,8 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement public RedstoneControl controlType = RedstoneControl.DISABLED; + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); + public TileEntitySeismicVibrator() { super("SeismicVibrator", MachineType.SEISMIC_VIBRATOR.baseEnergy); @@ -204,4 +208,10 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement { return false; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java index 1c4c6fbab..7107ee178 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java @@ -23,6 +23,8 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.GasInput; import mekanism.common.recipe.machines.SolarNeutronRecipe; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -30,7 +32,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.biome.BiomeGenDesert; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock implements IRedstoneControl, IBoundingBlock, IGasHandler, ITubeConnection, IActiveState, ISustainedData, ITankManager +public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock implements IRedstoneControl, IBoundingBlock, IGasHandler, ITubeConnection, IActiveState, ISustainedData, ITankManager, ISecurityTile { public GasTank inputTank = new GasTank(MAX_GAS); public GasTank outputTank = new GasTank(MAX_GAS); @@ -53,6 +55,8 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im /** This machine's current RedstoneControl type. */ public RedstoneControl controlType = RedstoneControl.DISABLED; + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); + public TileEntitySolarNeutronActivator() { super("SolarNeutronActivator"); @@ -400,4 +404,10 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im { return new Object[] {inputTank, outputTank}; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/util/SecurityUtils.java b/src/main/java/mekanism/common/util/SecurityUtils.java index a657b68ee..bbc76085c 100644 --- a/src/main/java/mekanism/common/util/SecurityUtils.java +++ b/src/main/java/mekanism/common/util/SecurityUtils.java @@ -75,11 +75,14 @@ public final class SecurityUtils public static SecurityFrequency getFrequency(String owner) { - for(Frequency f : Mekanism.securityFrequencies.getFrequencies()) + if(owner != null) { - if(f instanceof SecurityFrequency && f.owner.equals(owner)) + for(Frequency f : Mekanism.securityFrequencies.getFrequencies()) { - return (SecurityFrequency)f; + if(f instanceof SecurityFrequency && f.owner.equals(owner)) + { + return (SecurityFrequency)f; + } } } From c48118008820059422d4cb5c32526086d8babc87 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Mon, 21 Mar 2016 19:43:03 -0400 Subject: [PATCH 06/62] A few bug fixes, added recipes for Security Desk --- .../client/gui/GuiQuantumEntangloporter.java | 9 ++++----- .../mekanism/client/gui/GuiSecurityDesk.java | 2 +- .../mekanism/client/gui/GuiTeleporter.java | 2 -- src/main/java/mekanism/common/Mekanism.java | 8 ++++---- .../mekanism/common/block/BlockBounding.java | 2 +- .../mekanism/common/block/BlockMachine.java | 18 ++++++++++++++++++ .../entangloporter/InventoryFrequency.java | 2 ++ .../mekanism/common/frequency/Frequency.java | 2 ++ .../common/frequency/FrequencyManager.java | 2 +- .../common/frequency/IFrequencyHandler.java | 2 +- .../mekanism/common/item/ItemBlockMachine.java | 10 +++++++--- .../common/security/SecurityFrequency.java | 2 ++ .../common/tile/TileEntityBasicBlock.java | 17 ++++++++++++++++- .../tile/TileEntityQuantumEntangloporter.java | 9 +++++++-- .../common/tile/TileEntityTeleporter.java | 9 +++++++-- .../tile/component/TileComponentSecurity.java | 6 +++--- 16 files changed, 76 insertions(+), 26 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java index b128b8894..275de0d4d 100644 --- a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java @@ -6,7 +6,6 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.gui.element.GuiScrollList; -import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiTransporterConfigTab; import mekanism.client.sound.SoundHandler; @@ -62,7 +61,6 @@ public class GuiQuantumEntangloporter extends GuiMekanism resource = MekanismUtils.getResource(ResourceType.GUI, "GuiTeleporter.png"); guiElements.add(scrollList = new GuiScrollList(this, resource, 28, 37, 120, 4)); - guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTeleporter.png"))); guiElements.add(new GuiSideConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTeleporter.png"))); guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTeleporter.png"))); @@ -161,7 +159,7 @@ public class GuiQuantumEntangloporter extends GuiMekanism { Frequency freq = privateMode ? tileEntity.privateCache.get(scrollList.selected) : tileEntity.publicCache.get(scrollList.selected); - if(tileEntity.getFrequency() == null || !tileEntity.getFrequency().equals(freq)) + if(tileEntity.getFrequency(null) == null || !tileEntity.getFrequency(null).equals(freq)) { setButton.enabled = true; } @@ -300,12 +298,13 @@ public class GuiQuantumEntangloporter extends GuiMekanism int yAxis = (mouseY-(height-ySize)/2); fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 4, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.owner") + ": " + (tileEntity.getSecurity().getOwner() != null ? tileEntity.getSecurity().getOwner() : LangUtils.localize("gui.none")), 8, (ySize-96)+4, 0x404040); fontRendererObj.drawString(LangUtils.localize("gui.freq") + ":", 32, 81, 0x404040); fontRendererObj.drawString(LangUtils.localize("gui.security") + ":", 32, 91, 0x404040); - fontRendererObj.drawString(" " + (tileEntity.getFrequency() != null ? tileEntity.getFrequency().name : EnumColor.DARK_RED + LangUtils.localize("gui.none")), 32 + fontRendererObj.getStringWidth(LangUtils.localize("gui.freq") + ":"), 81, 0x797979); - fontRendererObj.drawString(" " + (tileEntity.getFrequency() != null ? getSecurity(tileEntity.getFrequency()) : EnumColor.DARK_RED + LangUtils.localize("gui.none")), 32 + fontRendererObj.getStringWidth(LangUtils.localize("gui.security") + ":"), 91, 0x797979); + fontRendererObj.drawString(" " + (tileEntity.getFrequency(null) != null ? tileEntity.getFrequency(null).name : EnumColor.DARK_RED + LangUtils.localize("gui.none")), 32 + fontRendererObj.getStringWidth(LangUtils.localize("gui.freq") + ":"), 81, 0x797979); + fontRendererObj.drawString(" " + (tileEntity.getFrequency(null) != null ? getSecurity(tileEntity.getFrequency(null)) : EnumColor.DARK_RED + LangUtils.localize("gui.none")), 32 + fontRendererObj.getStringWidth(LangUtils.localize("gui.security") + ":"), 91, 0x797979); String str = LangUtils.localize("gui.set") + ":"; renderScaledText(str, 27, 104, 0x404040, 20); diff --git a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java index aa140b86e..0a26ada75 100644 --- a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java +++ b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java @@ -45,7 +45,7 @@ public class GuiSecurityDesk extends GuiMekanism public GuiTextField trustedField; - public static final List SPECIAL_CHARS = Arrays.asList('-', '|'); + public static final List SPECIAL_CHARS = Arrays.asList('-', '|', '_'); public GuiSecurityDesk(InventoryPlayer inventory, TileEntitySecurityDesk tentity) { diff --git a/src/main/java/mekanism/client/gui/GuiTeleporter.java b/src/main/java/mekanism/client/gui/GuiTeleporter.java index e92168463..f8fc41898 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -9,7 +9,6 @@ import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiScrollList; -import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -78,7 +77,6 @@ public class GuiTeleporter extends GuiMekanism resource = MekanismUtils.getResource(ResourceType.GUI, "GuiTeleporter.png"); guiElements.add(new GuiRedstoneControl(this, tileEntity, resource)); - guiElements.add(new GuiSecurityTab(this, tileEntity, resource)); guiElements.add(new GuiPowerBar(this, new IPowerInfoHandler() { @Override public String getTooltip() diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index be58f8c9f..d3cf2b000 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -178,13 +178,13 @@ public class Mekanism public static MultiblockManager boilerManager = new MultiblockManager("thermoelectricBoiler"); /** FrequencyManagers for various networks */ - public static FrequencyManager publicTeleporters = new FrequencyManager(Frequency.class, "Teleporter"); + public static FrequencyManager publicTeleporters = new FrequencyManager(Frequency.class, Frequency.TELEPORTER); public static Map privateTeleporters = new HashMap(); - public static FrequencyManager publicEntangloporters = new FrequencyManager(InventoryFrequency.class, "Entangloporter"); + public static FrequencyManager publicEntangloporters = new FrequencyManager(InventoryFrequency.class, InventoryFrequency.ENTANGLOPORTER); public static Map privateEntangloporters = new HashMap(); - public static FrequencyManager securityFrequencies = new FrequencyManager(SecurityFrequency.class, "Security"); + public static FrequencyManager securityFrequencies = new FrequencyManager(SecurityFrequency.class, SecurityFrequency.SECURITY); /** Mekanism creative tab */ public static CreativeTabMekanism tabMekanism = new CreativeTabMekanism(); @@ -527,7 +527,7 @@ public class Mekanism Items.paper, MekanismUtils.getControlCircuit(BaseTier.BASIC) })); CraftingManager.getInstance().getRecipeList().add(new ShapelessMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 1, 9), new Object[] { - + "SGS", "CIC", "STS", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ELITE), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('T'), MekanismItems.TeleportationCore })); //Energy Cube recipes diff --git a/src/main/java/mekanism/common/block/BlockBounding.java b/src/main/java/mekanism/common/block/BlockBounding.java index b742a70b7..e97da9420 100644 --- a/src/main/java/mekanism/common/block/BlockBounding.java +++ b/src/main/java/mekanism/common/block/BlockBounding.java @@ -80,7 +80,7 @@ public class BlockBounding extends Block { try { TileEntityBoundingBlock tileEntity = (TileEntityBoundingBlock)world.getTileEntity(x, y, z); - return world.getBlock(tileEntity.mainX, tileEntity.mainY, tileEntity.mainZ).getBlockHardness(world, x, y, z); + return world.getBlock(tileEntity.mainX, tileEntity.mainY, tileEntity.mainZ).getBlockHardness(world, tileEntity.mainX, tileEntity.mainY, tileEntity.mainZ); } catch(Exception e) { return blockHardness; } diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index dfb6a5923..2e60efa52 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -671,6 +671,24 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo return true; } + break; + case TELEPORTER: + case QUANTUM_ENTANGLOPORTER: + if(!entityplayer.isSneaking()) + { + String owner = ((ISecurityTile)tileEntity).getSecurity().getOwner(); + + if(owner == null || entityplayer.getCommandSenderName().equals(owner)) + { + entityplayer.openGui(Mekanism.instance, type.guiId, world, x, y, z); + } + else { + SecurityUtils.displayNoAccess(entityplayer); + } + + return true; + } + break; default: if(!entityplayer.isSneaking() && type.guiId != -1) diff --git a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java index 1d98fa17a..c769bd490 100644 --- a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java +++ b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java @@ -15,6 +15,8 @@ import net.minecraftforge.fluids.FluidTank; public class InventoryFrequency extends Frequency { + public static final String ENTANGLOPORTER = "Entangloporter"; + public static final double MAX_ENERGY = 1000000; public double storedEnergy; diff --git a/src/main/java/mekanism/common/frequency/Frequency.java b/src/main/java/mekanism/common/frequency/Frequency.java index cfedb1c8a..11c8cbeae 100644 --- a/src/main/java/mekanism/common/frequency/Frequency.java +++ b/src/main/java/mekanism/common/frequency/Frequency.java @@ -12,6 +12,8 @@ import net.minecraft.nbt.NBTTagCompound; public class Frequency { + public static final String TELEPORTER = "Teleporter"; + public String name; public String owner; diff --git a/src/main/java/mekanism/common/frequency/FrequencyManager.java b/src/main/java/mekanism/common/frequency/FrequencyManager.java index de97292f6..b5acee517 100644 --- a/src/main/java/mekanism/common/frequency/FrequencyManager.java +++ b/src/main/java/mekanism/common/frequency/FrequencyManager.java @@ -255,7 +255,7 @@ public class FrequencyManager iter.remove(); } else { - Frequency freq = ((IFrequencyHandler)tile).getFrequency(); + Frequency freq = ((IFrequencyHandler)tile).getFrequency(this); if(freq == null || !freq.equals(iterFreq)) { diff --git a/src/main/java/mekanism/common/frequency/IFrequencyHandler.java b/src/main/java/mekanism/common/frequency/IFrequencyHandler.java index 753e99d8f..4a760495c 100644 --- a/src/main/java/mekanism/common/frequency/IFrequencyHandler.java +++ b/src/main/java/mekanism/common/frequency/IFrequencyHandler.java @@ -2,5 +2,5 @@ package mekanism.common.frequency; public interface IFrequencyHandler { - public Frequency getFrequency(); + public Frequency getFrequency(FrequencyManager manager); } diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 903052c4f..df698755f 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -78,7 +78,7 @@ import cpw.mods.fml.relauncher.SideOnly; * 0:10: Energized Smelter * 0:11: Teleporter * 0:12: Electric Pump - * 0:13: Electric Chest + * 0:13: Personal Chest * 0:14: Chargepad * 0:15: Logistical Sorter * 1:0: Rotary Condensentrator @@ -303,7 +303,11 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { ISecurityTile security = (ISecurityTile)tileEntity; security.getSecurity().setOwner(getOwner(stack)); - security.getSecurity().setMode(getSecurity(stack)); + + if(hasSecurity(stack)) + { + security.getSecurity().setMode(getSecurity(stack)); + } if(getOwner(stack) == null) { @@ -957,7 +961,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { MachineType type = MachineType.get(stack); - if(type != MachineType.LASER && type != MachineType.CHARGEPAD) + if(type != MachineType.LASER && type != MachineType.CHARGEPAD && type != MachineType.TELEPORTER && type != MachineType.QUANTUM_ENTANGLOPORTER) { return true; } diff --git a/src/main/java/mekanism/common/security/SecurityFrequency.java b/src/main/java/mekanism/common/security/SecurityFrequency.java index 27460dc10..33506de51 100644 --- a/src/main/java/mekanism/common/security/SecurityFrequency.java +++ b/src/main/java/mekanism/common/security/SecurityFrequency.java @@ -15,6 +15,8 @@ import net.minecraftforge.common.util.Constants.NBT; public class SecurityFrequency extends Frequency { + public static final String SECURITY = "Security"; + public boolean override; public HashList trusted; diff --git a/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java b/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java index 19d45b1f0..a176ab320 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java @@ -15,8 +15,12 @@ import mekanism.common.base.IChunkLoadHandler; import mekanism.common.base.ITileComponent; import mekanism.common.base.ITileNetwork; import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.frequency.Frequency; +import mekanism.common.frequency.FrequencyManager; +import mekanism.common.frequency.IFrequencyHandler; import mekanism.common.network.PacketDataRequest.DataRequestMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityTile; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -28,7 +32,7 @@ import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; @Interface(iface = "ic2.api.tile.IWrenchable", modid = "IC2") -public abstract class TileEntityBasicBlock extends TileEntity implements IWrenchable, ITileNetwork, IChunkLoadHandler +public abstract class TileEntityBasicBlock extends TileEntity implements IWrenchable, ITileNetwork, IChunkLoadHandler, IFrequencyHandler { /** The direction this block is facing. */ public int facing; @@ -294,4 +298,15 @@ public abstract class TileEntityBasicBlock extends TileEntity implements IWrench { updatePower(); } + + @Override + public Frequency getFrequency(FrequencyManager manager) + { + if(manager == Mekanism.securityFrequencies && this instanceof ISecurityTile) + { + return ((ISecurityTile)this).getSecurity().getFrequency(); + } + + return null; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index eede3b520..d2d8b42a8 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -165,8 +165,13 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public Frequency getFrequency() + public Frequency getFrequency(FrequencyManager manager) { + if(manager == Mekanism.securityFrequencies) + { + return getSecurity().getFrequency(); + } + return frequency; } @@ -184,7 +189,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp else { if(!Mekanism.privateEntangloporters.containsKey(getSecurity().getOwner())) { - FrequencyManager manager = new FrequencyManager(InventoryFrequency.class, getSecurity().getOwner()); + FrequencyManager manager = new FrequencyManager(InventoryFrequency.class, InventoryFrequency.ENTANGLOPORTER, getSecurity().getOwner()); Mekanism.privateEntangloporters.put(getSecurity().getOwner(), manager); manager.createOrLoad(worldObj); } diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index a78a05950..08a0dfc64 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -155,8 +155,13 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo } @Override - public Frequency getFrequency() + public Frequency getFrequency(FrequencyManager manager) { + if(manager == Mekanism.securityFrequencies) + { + return getSecurity().getFrequency(); + } + return frequency; } @@ -208,7 +213,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo else { if(!Mekanism.privateTeleporters.containsKey(getSecurity().getOwner())) { - FrequencyManager manager = new FrequencyManager(Frequency.class, getSecurity().getOwner()); + FrequencyManager manager = new FrequencyManager(Frequency.class, Frequency.TELEPORTER, getSecurity().getOwner()); Mekanism.privateTeleporters.put(getSecurity().getOwner(), manager); manager.createOrLoad(worldObj); } diff --git a/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java b/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java index 4ded1fa5a..ad98efa7d 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java @@ -135,9 +135,9 @@ public class TileComponentSecurity implements ITileComponent owner = nbtTags.getString("owner"); } - if(nbtTags.hasKey("frequency")) + if(nbtTags.hasKey("securityFreq")) { - frequency = new SecurityFrequency(nbtTags.getCompoundTag("frequency")); + frequency = new SecurityFrequency(nbtTags.getCompoundTag("securityFreq")); frequency.valid = false; } } @@ -178,7 +178,7 @@ public class TileComponentSecurity implements ITileComponent { NBTTagCompound frequencyTag = new NBTTagCompound(); frequency.write(frequencyTag); - nbtTags.setTag("frequency", frequencyTag); + nbtTags.setTag("securityFreq", frequencyTag); } } From 00e7a99cf3e2702e21d9bd5c3f6c1ecf8e2f4f1c Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Mon, 21 Mar 2016 20:34:46 -0400 Subject: [PATCH 07/62] Fixed recipe --- src/main/java/mekanism/common/Mekanism.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index d3cf2b000..cd37fd992 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -526,8 +526,9 @@ public class Mekanism CraftingManager.getInstance().getRecipeList().add(new ShapelessMekanismRecipe(new ItemStack(MekanismItems.CraftingFormula), new Object[] { Items.paper, MekanismUtils.getControlCircuit(BaseTier.BASIC) })); - CraftingManager.getInstance().getRecipeList().add(new ShapelessMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 1, 9), new Object[] { - "SGS", "CIC", "STS", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ELITE), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('T'), MekanismItems.TeleportationCore + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 1, 9), new Object[] { + "SGS", "CIC", "STS", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ELITE), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), + Character.valueOf('T'), MekanismItems.TeleportationCore })); //Energy Cube recipes From b83257d83bb84d7f2accc65589fec25e8fbc1f72 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Mon, 21 Mar 2016 21:07:02 -0400 Subject: [PATCH 08/62] Fixed Wind Generator model, fixed crashes --- .../java/mekanism/common/tile/TileEntityFactory.java | 4 +--- .../common/tile/TileEntityFluidicPlenisher.java | 11 ++++++++++- .../common/tile/TileEntityResistiveHeater.java | 12 +++++++++++- .../generators/client/model/ModelWindGenerator.java | 8 ++++++-- 4 files changed, 28 insertions(+), 7 deletions(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index e16422ae1..d49eefe85 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -132,7 +132,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I public TileComponentUpgrade upgradeComponent; public TileComponentEjector ejectorComponent; public TileComponentConfig configComponent; - public TileComponentSecurity securityComponent; + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); public TileEntityFactory() { @@ -160,8 +160,6 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I ejectorComponent = new TileComponentEjector(this); ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(2)); - - securityComponent = new TileComponentSecurity(this); } public TileEntityFactory(FactoryTier type, MachineType machine) diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index 077e60260..f8ec352a4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -18,6 +18,8 @@ import mekanism.common.base.ISustainedTank; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.integration.IComputerIntegration; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; @@ -40,7 +42,7 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; -public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implements IComputerIntegration, IConfigurable, IFluidHandler, ISustainedTank, IUpgradeTile, IRedstoneControl +public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implements IComputerIntegration, IConfigurable, IFluidHandler, ISustainedTank, IUpgradeTile, IRedstoneControl, ISecurityTile { public Set activeNodes = new HashSet(); public Set usedNodes = new HashSet(); @@ -67,6 +69,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen private static EnumSet dirs = EnumSet.complementOf(EnumSet.of(ForgeDirection.UP, ForgeDirection.UNKNOWN)); public TileComponentUpgrade upgradeComponent = new TileComponentUpgrade(this, 3); + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); public TileEntityFluidicPlenisher() { @@ -557,4 +560,10 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen { return false; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java index 3442c4785..cab51c08f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java @@ -13,6 +13,8 @@ import mekanism.common.base.IRedstoneControl; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.ChargeUtils; import mekanism.common.util.HeatUtils; import mekanism.common.util.MekanismUtils; @@ -21,7 +23,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock implements IHeatTransfer, IComputerIntegration, IRedstoneControl +public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock implements IHeatTransfer, IComputerIntegration, IRedstoneControl, ISecurityTile { public double energyUsage = 100; @@ -44,6 +46,8 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl public RedstoneControl controlType = RedstoneControl.DISABLED; + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); + public TileEntityResistiveHeater() { super("machine.resistiveheater", "ResistiveHeater", MachineType.RESISTIVE_HEATER.baseEnergy); @@ -341,4 +345,10 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl { return false; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/generators/client/model/ModelWindGenerator.java b/src/main/java/mekanism/generators/client/model/ModelWindGenerator.java index 81cbeec65..8cf1992f7 100644 --- a/src/main/java/mekanism/generators/client/model/ModelWindGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelWindGenerator.java @@ -166,8 +166,6 @@ public class ModelWindGenerator extends ModelBase plateConnector2.render(size); plateConnector.render(size); plate.render(size); - bladeCap.render(size); - bladeCenter.render(size); baseRim.render(size); base.render(size); wire.render(size); @@ -187,12 +185,18 @@ public class ModelWindGenerator extends ModelBase setRotation(blade3a, 0F, 0F, getRotation(getAbsoluteAngle(angle + 60))); setRotation(blade3b, 0F, 0F, 0.0349066F + getRotation(getAbsoluteAngle(angle + 60))); + setRotation(bladeCap, 0F, 0F, getRotation(getAbsoluteAngle(angle))); + setRotation(bladeCenter, 0F, 0F, getRotation(getAbsoluteAngle(angle))); + blade1a.render(size); blade2a.render(size); blade3a.render(size); blade1b.render(size); blade2b.render(size); blade3b.render(size); + + bladeCap.render(size); + bladeCenter.render(size); } public float getRotation(double angle) From 5ed86f3f01f43e20b0776fcd7aa49e8771d8bcc6 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Mon, 21 Mar 2016 23:14:38 -0400 Subject: [PATCH 09/62] Extend security to generators, gas tanks and energy cubes --- .../mekanism/client/gui/GuiEnergyCube.java | 2 + .../java/mekanism/client/gui/GuiGasTank.java | 2 + .../common/block/BlockEnergyCube.java | 76 ++++++++++++--- .../mekanism/common/block/BlockGasTank.java | 74 ++++++++++++--- .../mekanism/common/block/BlockMachine.java | 8 +- .../common/item/ItemBlockEnergyCube.java | 92 +++++++++++++++++- .../common/item/ItemBlockGasTank.java | 89 +++++++++++++++++- .../common/tile/TileEntityEnergyCube.java | 13 ++- .../common/tile/TileEntityGasTank.java | 13 ++- .../client/gui/GuiBioGenerator.java | 2 + .../client/gui/GuiGasGenerator.java | 2 + .../client/gui/GuiHeatGenerator.java | 2 + .../client/gui/GuiSolarGenerator.java | 2 + .../client/gui/GuiWindGenerator.java | 2 + .../common/block/BlockGenerator.java | 83 ++++++++++++----- .../common/item/ItemBlockGenerator.java | 93 ++++++++++++++++++- .../common/tile/TileEntityGenerator.java | 12 ++- 17 files changed, 509 insertions(+), 58 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiEnergyCube.java b/src/main/java/mekanism/client/gui/GuiEnergyCube.java index 7ff8c13e0..00f2f29aa 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergyCube.java +++ b/src/main/java/mekanism/client/gui/GuiEnergyCube.java @@ -9,6 +9,7 @@ import mekanism.client.gui.element.GuiEnergyGauge; import mekanism.client.gui.element.GuiEnergyGauge.IEnergyInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; @@ -36,6 +37,7 @@ public class GuiEnergyCube extends GuiMekanism super(tentity, new ContainerEnergyCube(inventory, tentity)); tileEntity = tentity; guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiEnergyCube.png"))); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiEnergyCube.png"))); guiElements.add(new GuiSideConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiEnergyCube.png"))); guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiEnergyCube.png"))); guiElements.add(new GuiEnergyGauge(new IEnergyInfoHandler() diff --git a/src/main/java/mekanism/client/gui/GuiGasTank.java b/src/main/java/mekanism/client/gui/GuiGasTank.java index 3bec4dfcf..99a1eb195 100644 --- a/src/main/java/mekanism/client/gui/GuiGasTank.java +++ b/src/main/java/mekanism/client/gui/GuiGasTank.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; @@ -34,6 +35,7 @@ public class GuiGasTank extends GuiMekanism super(tentity, new ContainerGasTank(inventory, tentity)); tileEntity = tentity; guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiGasTank.png"))); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiGasTank.png"))); guiElements.add(new GuiSideConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiGasTank.png"))); guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiGasTank.png"))); guiElements.add(new GuiSlot(SlotType.OUTPUT, this, MekanismUtils.getResource(ResourceType.GUI, "GuiGasTank.png"), 7, 7).with(SlotOverlay.PLUS)); diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index 8e01d8974..8902bf29b 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -10,9 +10,13 @@ import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.base.IEnergyCube; import mekanism.common.base.ISustainedInventory; import mekanism.common.item.ItemBlockEnergyCube; +import mekanism.common.security.ISecurityItem; +import mekanism.common.security.ISecurityTile; +import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -23,6 +27,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; @@ -132,6 +137,19 @@ public class BlockEnergyCube extends BlockContainer list.add(charged); } } + + @Override + public float getBlockHardness(World world, int x, int y, int z) + { + TileEntity tile = world.getTileEntity(x, y, z); + + if(tile instanceof ISecurityTile) + { + return SecurityUtils.getSecurity((ISecurityTile)tile) == SecurityMode.PUBLIC ? blockHardness : -1; + } + + return blockHardness; + } @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int side, float f1, float f2, float f3) @@ -149,21 +167,28 @@ public class BlockEnergyCube extends BlockContainer if(MekanismUtils.hasUsableWrench(entityplayer, x, y, z)) { - if(entityplayer.isSneaking()) + if(SecurityUtils.canAccess(entityplayer, tileEntity)) { - dismantleBlock(world, x, y, z, false); - return true; + if(entityplayer.isSneaking()) + { + dismantleBlock(world, x, y, z, false); + + return true; + } + + if(MekanismUtils.isBCWrench(tool)) + { + ((IToolWrench) tool).wrenchUsed(entityplayer, x, y, z); + } + + int change = ForgeDirection.ROTATION_MATRIX[side][tileEntity.facing]; + + tileEntity.setFacing((short)change); + world.notifyBlocksOfNeighborChange(x, y, z, this); + } + else { + SecurityUtils.displayNoAccess(entityplayer); } - - if(MekanismUtils.isBCWrench(tool)) - { - ((IToolWrench) tool).wrenchUsed(entityplayer, x, y, z); - } - - int change = ForgeDirection.ROTATION_MATRIX[side][tileEntity.facing]; - - tileEntity.setFacing((short)change); - world.notifyBlocksOfNeighborChange(x, y, z, this); return true; } @@ -173,7 +198,14 @@ public class BlockEnergyCube extends BlockContainer { if(!entityplayer.isSneaking()) { - entityplayer.openGui(Mekanism.instance, 8, world, x, y, z); + if(SecurityUtils.canAccess(entityplayer, tileEntity)) + { + entityplayer.openGui(Mekanism.instance, 8, world, x, y, z); + } + else { + SecurityUtils.displayNoAccess(entityplayer); + } + return true; } } @@ -227,6 +259,22 @@ public class BlockEnergyCube extends BlockContainer { TileEntityEnergyCube tileEntity = (TileEntityEnergyCube)world.getTileEntity(x, y, z); ItemStack itemStack = new ItemStack(MekanismBlocks.EnergyCube); + + if(itemStack.stackTagCompound == null) + { + itemStack.setTagCompound(new NBTTagCompound()); + } + + if(tileEntity instanceof ISecurityTile) + { + ISecurityItem securityItem = (ISecurityItem)itemStack.getItem(); + + if(securityItem.hasSecurity(itemStack)) + { + securityItem.setOwner(itemStack, ((ISecurityTile)tileEntity).getSecurity().getOwner()); + securityItem.setSecurity(itemStack, ((ISecurityTile)tileEntity).getSecurity().getMode()); + } + } IEnergyCube energyCube = (IEnergyCube)itemStack.getItem(); energyCube.setEnergyCubeTier(itemStack, tileEntity.tier); diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index 710c985df..1e6082ebc 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -7,9 +7,13 @@ import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ITierItem; +import mekanism.common.security.ISecurityItem; +import mekanism.common.security.ISecurityTile; +import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -19,6 +23,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; @@ -79,6 +84,19 @@ public class BlockGasTank extends BlockContainer } } } + + @Override + public float getBlockHardness(World world, int x, int y, int z) + { + TileEntity tile = world.getTileEntity(x, y, z); + + if(tile instanceof ISecurityTile) + { + return SecurityUtils.getSecurity((ISecurityTile)tile) == SecurityMode.PUBLIC ? blockHardness : -1; + } + + return blockHardness; + } @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int side, float playerX, float playerY, float playerZ) @@ -96,21 +114,28 @@ public class BlockGasTank extends BlockContainer if(MekanismUtils.hasUsableWrench(entityplayer, x, y, z)) { - if(entityplayer.isSneaking()) + if(SecurityUtils.canAccess(entityplayer, tileEntity)) { - dismantleBlock(world, x, y, z, false); - return true; + if(entityplayer.isSneaking()) + { + dismantleBlock(world, x, y, z, false); + + return true; + } + + if(MekanismUtils.isBCWrench(tool)) + { + ((IToolWrench)tool).wrenchUsed(entityplayer, x, y, z); + } + + int change = ForgeDirection.ROTATION_MATRIX[ForgeDirection.UP.ordinal()][tileEntity.facing]; + + tileEntity.setFacing((short)change); + world.notifyBlocksOfNeighborChange(x, y, z, this); } - - if(MekanismUtils.isBCWrench(tool)) - { - ((IToolWrench)tool).wrenchUsed(entityplayer, x, y, z); + else { + SecurityUtils.displayNoAccess(entityplayer); } - - int change = ForgeDirection.ROTATION_MATRIX[ForgeDirection.UP.ordinal()][tileEntity.facing]; - - tileEntity.setFacing((short)change); - world.notifyBlocksOfNeighborChange(x, y, z, this); return true; } @@ -120,7 +145,14 @@ public class BlockGasTank extends BlockContainer { if(!entityplayer.isSneaking()) { - entityplayer.openGui(Mekanism.instance, 10, world, x, y, z); + if(SecurityUtils.canAccess(entityplayer, tileEntity)) + { + entityplayer.openGui(Mekanism.instance, 10, world, x, y, z); + } + else { + SecurityUtils.displayNoAccess(entityplayer); + } + return true; } } @@ -209,6 +241,22 @@ public class BlockGasTank extends BlockContainer TileEntityGasTank tileEntity = (TileEntityGasTank)world.getTileEntity(x, y, z); ItemStack itemStack = new ItemStack(MekanismBlocks.GasTank); + if(itemStack.stackTagCompound == null) + { + itemStack.setTagCompound(new NBTTagCompound()); + } + + if(tileEntity instanceof ISecurityTile) + { + ISecurityItem securityItem = (ISecurityItem)itemStack.getItem(); + + if(securityItem.hasSecurity(itemStack)) + { + securityItem.setOwner(itemStack, ((ISecurityTile)tileEntity).getSecurity().getOwner()); + securityItem.setSecurity(itemStack, ((ISecurityTile)tileEntity).getSecurity().getMode()); + } + } + ITierItem tierItem = (ITierItem)itemStack.getItem(); tierItem.setBaseTier(itemStack, tileEntity.tier.getBaseTier()); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 2e60efa52..43f1f5af4 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -960,8 +960,12 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo if(tileEntity instanceof ISecurityTile) { ISecurityItem securityItem = (ISecurityItem)itemStack.getItem(); - securityItem.setOwner(itemStack, ((ISecurityTile)tileEntity).getSecurity().getOwner()); - securityItem.setSecurity(itemStack, ((ISecurityTile)tileEntity).getSecurity().getMode()); + + if(securityItem.hasSecurity(itemStack)) + { + securityItem.setOwner(itemStack, ((ISecurityTile)tileEntity).getSecurity().getOwner()); + securityItem.setSecurity(itemStack, ((ISecurityTile)tileEntity).getSecurity().getMode()); + } } if(tileEntity instanceof IUpgradeTile) diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index 90ed0c961..495c44132 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -19,9 +19,13 @@ import mekanism.common.base.IEnergyCube; import mekanism.common.base.ISustainedInventory; import mekanism.common.integration.IC2ItemManager; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityItem; +import mekanism.common.security.ISecurityTile; +import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.player.EntityPlayer; @@ -42,7 +46,7 @@ import cpw.mods.fml.relauncher.SideOnly; @InterfaceList({ @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") }) -public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IEnergyCube, ISpecialElectricItem, ISustainedInventory, IEnergyContainerItem +public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IEnergyCube, ISpecialElectricItem, ISustainedInventory, IEnergyContainerItem, ISecurityItem { public Block metaBlock; @@ -60,12 +64,24 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE @SideOnly(Side.CLIENT) public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); + if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) { list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDetails") + "."); } else { - list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); + if(hasSecurity(itemstack)) + { + list.add(SecurityUtils.getOwnerDisplay(entityplayer.getCommandSenderName(), getOwner(itemstack))); + list.add(EnumColor.GREY + LangUtils.localize("gui.security") + ": " + SecurityUtils.getSecurityDisplay(itemstack)); + + if(SecurityUtils.isOverridden(itemstack)) + { + list.add(EnumColor.RED + "(" + LangUtils.localize("gui.overridden") + ")"); + } + } + list.add(EnumColor.AQUA + LangUtils.localize("tooltip.inventory") + ": " + EnumColor.GREY + LangUtils.transYesNo(getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); } } @@ -95,6 +111,22 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE TileEntityEnergyCube tileEntity = (TileEntityEnergyCube)world.getTileEntity(x, y, z); tileEntity.tier = ((IEnergyCube)stack.getItem()).getEnergyCubeTier(stack); tileEntity.electricityStored = getEnergy(stack); + + if(tileEntity instanceof ISecurityTile) + { + ISecurityTile security = (ISecurityTile)tileEntity; + security.getSecurity().setOwner(getOwner(stack)); + + if(hasSecurity(stack)) + { + security.getSecurity().setMode(getSecurity(stack)); + } + + if(getOwner(stack) == null) + { + security.getSecurity().setOwner(player.getCommandSenderName()); + } + } ((ISustainedInventory)tileEntity).setInventory(getInventory(stack)); @@ -330,4 +362,60 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE { return this; } + + @Override + public String getOwner(ItemStack stack) + { + if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("owner")) + { + return stack.stackTagCompound.getString("owner"); + } + + return null; + } + + @Override + public void setOwner(ItemStack stack, String owner) + { + if(stack.stackTagCompound == null) + { + stack.setTagCompound(new NBTTagCompound()); + } + + if(owner == null || owner.isEmpty()) + { + stack.stackTagCompound.removeTag("owner"); + return; + } + + stack.stackTagCompound.setString("owner", owner); + } + + @Override + public SecurityMode getSecurity(ItemStack stack) + { + if(stack.stackTagCompound == null) + { + return SecurityMode.PUBLIC; + } + + return SecurityMode.values()[stack.stackTagCompound.getInteger("security")]; + } + + @Override + public void setSecurity(ItemStack stack, SecurityMode mode) + { + if(stack.stackTagCompound == null) + { + stack.setTagCompound(new NBTTagCompound()); + } + + stack.stackTagCompound.setInteger("security", mode.ordinal()); + } + + @Override + public boolean hasSecurity(ItemStack stack) + { + return true; + } } diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index 12e60416b..25aa68c0b 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -18,8 +18,12 @@ import mekanism.common.Tier.GasTankTier; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ITierItem; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityItem; +import mekanism.common.security.ISecurityTile; +import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.util.LangUtils; +import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; import net.minecraft.client.settings.GameSettings; import net.minecraft.creativetab.CreativeTabs; @@ -33,7 +37,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants.NBT; -public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedInventory, ITierItem +public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedInventory, ITierItem, ISecurityItem { public Block metaBlock; @@ -81,6 +85,22 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI tileEntity.tier = GasTankTier.values()[getBaseTier(stack).ordinal()]; tileEntity.gasTank.setMaxGas(tileEntity.tier.storage); tileEntity.gasTank.setGas(getGas(stack)); + + if(tileEntity instanceof ISecurityTile) + { + ISecurityTile security = (ISecurityTile)tileEntity; + security.getSecurity().setOwner(getOwner(stack)); + + if(hasSecurity(stack)) + { + security.getSecurity().setMode(getSecurity(stack)); + } + + if(getOwner(stack) == null) + { + security.getSecurity().setOwner(player.getCommandSenderName()); + } + } ((ISustainedInventory)tileEntity).setInventory(getInventory(stack)); @@ -111,6 +131,17 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDetails") + "."); } else { + if(hasSecurity(itemstack)) + { + list.add(SecurityUtils.getOwnerDisplay(entityplayer.getCommandSenderName(), getOwner(itemstack))); + list.add(EnumColor.GREY + LangUtils.localize("gui.security") + ": " + SecurityUtils.getSecurityDisplay(itemstack)); + + if(SecurityUtils.isOverridden(itemstack)) + { + list.add(EnumColor.RED + "(" + LangUtils.localize("gui.overridden") + ")"); + } + } + list.add(EnumColor.AQUA + LangUtils.localize("tooltip.inventory") + ": " + EnumColor.GREY + LangUtils.transYesNo(getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); } } @@ -304,4 +335,60 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI { return 1D-((getGas(stack) != null ? (double)getGas(stack).amount : 0D)/(double)getMaxGas(stack)); } + + @Override + public String getOwner(ItemStack stack) + { + if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("owner")) + { + return stack.stackTagCompound.getString("owner"); + } + + return null; + } + + @Override + public void setOwner(ItemStack stack, String owner) + { + if(stack.stackTagCompound == null) + { + stack.setTagCompound(new NBTTagCompound()); + } + + if(owner == null || owner.isEmpty()) + { + stack.stackTagCompound.removeTag("owner"); + return; + } + + stack.stackTagCompound.setString("owner", owner); + } + + @Override + public SecurityMode getSecurity(ItemStack stack) + { + if(stack.stackTagCompound == null) + { + return SecurityMode.PUBLIC; + } + + return SecurityMode.values()[stack.stackTagCompound.getInteger("security")]; + } + + @Override + public void setSecurity(ItemStack stack, SecurityMode mode) + { + if(stack.stackTagCompound == null) + { + stack.setTagCompound(new NBTTagCompound()); + } + + stack.stackTagCompound.setInteger("security", mode.ordinal()); + } + + @Override + public boolean hasSecurity(ItemStack stack) + { + return true; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index 0f290f655..43c3448fd 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -16,8 +16,10 @@ import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.CableUtils; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; @@ -28,7 +30,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityEnergyCube extends TileEntityElectricBlock implements IComputerIntegration, IRedstoneControl, ISideConfiguration +public class TileEntityEnergyCube extends TileEntityElectricBlock implements IComputerIntegration, IRedstoneControl, ISideConfiguration, ISecurityTile { /** This Energy Cube's tier. */ public EnergyCubeTier tier = EnergyCubeTier.BASIC; @@ -43,6 +45,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo public TileComponentEjector ejectorComponent; public TileComponentConfig configComponent; + public TileComponentSecurity securityComponent; /** * A block used to store and transfer electricity. @@ -66,6 +69,8 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo controlType = RedstoneControl.DISABLED; ejectorComponent = new TileComponentEjector(this); + + securityComponent = new TileComponentSecurity(this); } @Override @@ -294,4 +299,10 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo { return facing; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index a830c620d..cefbfa33c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -21,8 +21,10 @@ import mekanism.common.Tier.GasTankTier; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.InventoryUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; @@ -33,7 +35,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityGasTank extends TileEntityContainerBlock implements IGasHandler, ITubeConnection, IRedstoneControl, ISideConfiguration +public class TileEntityGasTank extends TileEntityContainerBlock implements IGasHandler, ITubeConnection, IRedstoneControl, ISideConfiguration, ISecurityTile { public enum GasMode { @@ -56,6 +58,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH public TileComponentEjector ejectorComponent; public TileComponentConfig configComponent; + public TileComponentSecurity securityComponent; public TileEntityGasTank() { @@ -78,6 +81,8 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH controlType = RedstoneControl.DISABLED; ejectorComponent = new TileComponentEjector(this); + + securityComponent = new TileComponentSecurity(this); } @Override @@ -348,4 +353,10 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH { return facing; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java index f2afbd048..38920896a 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java @@ -9,6 +9,7 @@ import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -34,6 +35,7 @@ public class GuiBioGenerator extends GuiMekanism super(new ContainerBioGenerator(inventory, tentity)); tileEntity = tentity; guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBioGenerator.png"))); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBioGenerator.png"))); guiElements.add(new GuiEnergyInfo(new IInfoHandler() { @Override diff --git a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java index e5073a9ce..987ea3763 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java @@ -12,6 +12,7 @@ import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiGauge.Type; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -37,6 +38,7 @@ public class GuiGasGenerator extends GuiMekanism super(new ContainerGasGenerator(inventory, tentity)); tileEntity = tentity; guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiGasGenerator.png"))); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiGasGenerator.png"))); guiElements.add(new GuiEnergyInfo(new IInfoHandler() { @Override public List getInfo() diff --git a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java index f212666dc..e7ff30ba6 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java @@ -14,6 +14,7 @@ import mekanism.client.gui.element.GuiGauge.Type; import mekanism.client.gui.element.GuiHeatInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -40,6 +41,7 @@ public class GuiHeatGenerator extends GuiMekanism super(new ContainerHeatGenerator(inventory, tentity)); tileEntity = tentity; guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiHeatGenerator.png"))); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiHeatGenerator.png"))); guiElements.add(new GuiEnergyInfo(new IInfoHandler() { @Override diff --git a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java index 869314402..13b30719a 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java @@ -8,6 +8,7 @@ import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -33,6 +34,7 @@ public class GuiSolarGenerator extends GuiMekanism super(new ContainerSolarGenerator(inventory, tentity)); tileEntity = tentity; guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiSolarGenerator.png"))); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiSolarGenerator.png"))); guiElements.add(new GuiEnergyInfo(new IInfoHandler() { @Override diff --git a/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java index 54019aec3..94289a00c 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java @@ -11,6 +11,7 @@ import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -38,6 +39,7 @@ public class GuiWindGenerator extends GuiMekanism super(new ContainerWindGenerator(inventory, tentity)); tileEntity = tentity; guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiWindTurbine.png"))); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiWindTurbine.png"))); guiElements.add(new GuiEnergyInfo(new IInfoHandler() { @Override diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 3e7a49dae..e542ea7da 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -17,11 +17,15 @@ import mekanism.common.base.ISustainedData; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ISustainedTank; import mekanism.common.multiblock.IMultiblock; +import mekanism.common.security.ISecurityItem; +import mekanism.common.security.ISecurityTile; +import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.SecurityUtils; import mekanism.generators.common.GeneratorsBlocks; import mekanism.generators.common.GeneratorsItems; import mekanism.generators.common.MekanismGenerators; @@ -47,6 +51,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; @@ -250,6 +255,19 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB { return i; } + + @Override + public float getBlockHardness(World world, int x, int y, int z) + { + TileEntity tile = world.getTileEntity(x, y, z); + + if(tile instanceof ISecurityTile) + { + return SecurityUtils.getSecurity((ISecurityTile)tile) == SecurityMode.PUBLIC ? blockHardness : -1; + } + + return blockHardness; + } @Override @SideOnly(Side.CLIENT) @@ -425,32 +443,32 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB if(MekanismUtils.hasUsableWrench(entityplayer, x, y, z)) { - if(entityplayer.isSneaking()) + if(SecurityUtils.canAccess(entityplayer, tileEntity)) { - dismantleBlock(world, x, y, z, false); - return true; + if(entityplayer.isSneaking()) + { + dismantleBlock(world, x, y, z, false); + + return true; + } + + if(MekanismUtils.isBCWrench(tool)) + { + ((IToolWrench)tool).wrenchUsed(entityplayer, x, y, z); + } + + int change = ForgeDirection.ROTATION_MATRIX[ForgeDirection.UP.ordinal()][tileEntity.facing]; + + tileEntity.setFacing((short)change); + world.notifyBlocksOfNeighborChange(x, y, z, this); } - - if(MekanismUtils.isBCWrench(tool)) - { - ((IToolWrench)tool).wrenchUsed(entityplayer, x, y, z); + else { + SecurityUtils.displayNoAccess(entityplayer); } - - int change = ForgeDirection.ROTATION_MATRIX[ForgeDirection.UP.ordinal()][tileEntity.facing]; - - tileEntity.setFacing((short)change); - world.notifyBlocksOfNeighborChange(x, y, z, this); + return true; } } - - if(metadata == 3 && entityplayer.getCurrentEquippedItem() != null && entityplayer.getCurrentEquippedItem().isItemEqual(new ItemStack(GeneratorsBlocks.Generator, 1, 2))) - { - if(((TileEntityBasicBlock)world.getTileEntity(x, y, z)).facing != side) - { - return false; - } - } if(metadata == GeneratorType.TURBINE_CASING.meta || metadata == GeneratorType.TURBINE_VALVE.meta || metadata == GeneratorType.TURBINE_VENT.meta) { @@ -523,7 +541,14 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB { if(!entityplayer.isSneaking()) { - entityplayer.openGui(MekanismGenerators.instance, guiId, world, x, y, z); + if(SecurityUtils.canAccess(entityplayer, tileEntity)) + { + entityplayer.openGui(MekanismGenerators.instance, guiId, world, x, y, z); + } + else { + SecurityUtils.displayNoAccess(entityplayer); + } + return true; } } @@ -637,10 +662,26 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z); ItemStack itemStack = new ItemStack(GeneratorsBlocks.Generator, 1, world.getBlockMetadata(x, y, z)); + if(itemStack.stackTagCompound == null) + { + itemStack.setTagCompound(new NBTTagCompound()); + } + if(tileEntity == null) { return null; } + + if(tileEntity instanceof ISecurityTile) + { + ISecurityItem securityItem = (ISecurityItem)itemStack.getItem(); + + if(securityItem.hasSecurity(itemStack)) + { + securityItem.setOwner(itemStack, ((ISecurityTile)tileEntity).getSecurity().getOwner()); + securityItem.setSecurity(itemStack, ((ISecurityTile)tileEntity).getSecurity().getMode()); + } + } if(tileEntity instanceof TileEntityElectricBlock) { diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index 9c1be3eb5..32bfedfb8 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -14,10 +14,14 @@ import mekanism.common.base.ISustainedData; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ISustainedTank; import mekanism.common.integration.IC2ItemManager; +import mekanism.common.security.ISecurityItem; +import mekanism.common.security.ISecurityTile; +import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.SecurityUtils; import mekanism.generators.common.block.BlockGenerator.GeneratorType; import net.minecraft.block.Block; import net.minecraft.client.settings.GameSettings; @@ -59,7 +63,7 @@ import cpw.mods.fml.relauncher.SideOnly; @InterfaceList({ @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") }) -public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, ISustainedInventory, ISustainedTank, IEnergyContainerItem +public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, ISustainedInventory, ISustainedTank, IEnergyContainerItem, ISecurityItem { public Block metaBlock; @@ -122,8 +126,19 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp } else if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.modeSwitchKey)) { + if(hasSecurity(itemstack)) + { + list.add(SecurityUtils.getOwnerDisplay(entityplayer.getCommandSenderName(), getOwner(itemstack))); + list.add(EnumColor.GREY + LangUtils.localize("gui.security") + ": " + SecurityUtils.getSecurityDisplay(itemstack)); + + if(SecurityUtils.isOverridden(itemstack)) + { + list.add(EnumColor.RED + "(" + LangUtils.localize("gui.overridden") + ")"); + } + } + list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); - + if(hasTank(itemstack)) { if(getFluidStack(itemstack) != null) @@ -197,6 +212,22 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z); + if(tileEntity instanceof ISecurityTile) + { + ISecurityTile security = (ISecurityTile)tileEntity; + security.getSecurity().setOwner(getOwner(stack)); + + if(hasSecurity(stack)) + { + security.getSecurity().setMode(getSecurity(stack)); + } + + if(getOwner(stack) == null) + { + security.getSecurity().setOwner(player.getCommandSenderName()); + } + } + if(tileEntity instanceof TileEntityElectricBlock) { ((TileEntityElectricBlock)tileEntity).electricityStored = getEnergy(stack); @@ -456,4 +487,62 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp { return IC2ItemManager.getManager(this); } + + @Override + public String getOwner(ItemStack stack) + { + if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("owner")) + { + return stack.stackTagCompound.getString("owner"); + } + + return null; + } + + @Override + public void setOwner(ItemStack stack, String owner) + { + if(stack.stackTagCompound == null) + { + stack.setTagCompound(new NBTTagCompound()); + } + + if(owner == null || owner.isEmpty()) + { + stack.stackTagCompound.removeTag("owner"); + return; + } + + stack.stackTagCompound.setString("owner", owner); + } + + @Override + public SecurityMode getSecurity(ItemStack stack) + { + if(stack.stackTagCompound == null) + { + return SecurityMode.PUBLIC; + } + + return SecurityMode.values()[stack.stackTagCompound.getInteger("security")]; + } + + @Override + public void setSecurity(ItemStack stack, SecurityMode mode) + { + if(stack.stackTagCompound == null) + { + stack.setTagCompound(new NBTTagCompound()); + } + + stack.stackTagCompound.setInteger("security", mode.ordinal()); + } + + @Override + public boolean hasSecurity(ItemStack stack) + { + GeneratorType type = GeneratorType.getFromMetadata(stack.getItemDamage()); + + return type.hasModel; + } } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java index eda83e4d0..3e8dd3e5d 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -15,7 +15,9 @@ import mekanism.common.base.IHasSound; import mekanism.common.base.IRedstoneControl; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityTile; import mekanism.common.tile.TileEntityNoisyElectricBlock; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.CableUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; @@ -24,7 +26,7 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public abstract class TileEntityGenerator extends TileEntityNoisyElectricBlock implements IComputerIntegration, IActiveState, IHasSound, ISoundSource, IRedstoneControl +public abstract class TileEntityGenerator extends TileEntityNoisyElectricBlock implements IComputerIntegration, IActiveState, IHasSound, ISoundSource, IRedstoneControl, ISecurityTile { /** Output per tick this generator can transfer. */ public double output; @@ -40,6 +42,8 @@ public abstract class TileEntityGenerator extends TileEntityNoisyElectricBlock i /** This machine's current RedstoneControl type. */ public RedstoneControl controlType; + + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); /** * Generator -- a block that produces energy. It has a certain amount of fuel it can store as well as an output rate. @@ -223,4 +227,10 @@ public abstract class TileEntityGenerator extends TileEntityNoisyElectricBlock i { return false; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } From 5dcddaf25b60c90b2e2d8fda687a714fc4111b1e Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 22 Mar 2016 17:18:55 -0400 Subject: [PATCH 10/62] Fixed glass render, added new Thermal Evaporation Plant computer integration --- ...ationSolar.java => IEvaporationSolar.java} | 2 +- .../mekanism/common/block/BlockBasic.java | 2 +- .../TileEntityThermalEvaporationBlock.java | 38 ++++++++++++++++++- ...ileEntityThermalEvaporationController.java | 12 +++--- .../TileEntityAdvancedSolarGenerator.java | 4 +- 5 files changed, 47 insertions(+), 11 deletions(-) rename src/main/java/mekanism/api/{ISalinationSolar.java => IEvaporationSolar.java} (84%) diff --git a/src/main/java/mekanism/api/ISalinationSolar.java b/src/main/java/mekanism/api/IEvaporationSolar.java similarity index 84% rename from src/main/java/mekanism/api/ISalinationSolar.java rename to src/main/java/mekanism/api/IEvaporationSolar.java index 20e3e1ecf..fd5d2cf7d 100644 --- a/src/main/java/mekanism/api/ISalinationSolar.java +++ b/src/main/java/mekanism/api/IEvaporationSolar.java @@ -5,7 +5,7 @@ package mekanism.api; * @author aidancbrady * */ -public interface ISalinationSolar +public interface IEvaporationSolar { public boolean seesSun(); } diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 379bf95f2..e5e5c50fb 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -942,7 +942,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon { Coord4D obj = new Coord4D(x, y, z).getFromSide(ForgeDirection.getOrientation(side).getOpposite()); - if(BasicType.get(this, world.getBlockMetadata(x, y, z)) == BasicType.STRUCTURAL_GLASS) + if(BasicType.get(this, obj.getMetadata(world)) == BasicType.STRUCTURAL_GLASS) { return ctms[10][0].shouldRenderSide(world, x, y, z, side); } diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationBlock.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationBlock.java index da4fc578d..d255fc370 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationBlock.java @@ -4,12 +4,13 @@ import java.util.HashSet; import java.util.Set; import mekanism.api.Coord4D; +import mekanism.common.integration.IComputerIntegration; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityThermalEvaporationBlock extends TileEntityContainerBlock +public class TileEntityThermalEvaporationBlock extends TileEntityContainerBlock implements IComputerIntegration { public Coord4D master; @@ -154,4 +155,39 @@ public class TileEntityThermalEvaporationBlock extends TileEntityContainerBlock return found; } } + + private static final String[] methods = new String[] {"getTemperature", "getHeight", "isFormed", "getInput", "getOutput"}; + + @Override + public String[] getMethods() + { + return methods; + } + + @Override + public Object[] invoke(int method, Object[] args) throws Exception + { + TileEntityThermalEvaporationController controller = getController(); + + if(controller == null) + { + return new Object[] {"Unformed."}; + } + + switch(method) + { + case 0: + return new Object[] {controller.temperature}; + case 1: + return new Object[] {controller.height}; + case 2: + return new Object[] {controller.structured}; + case 3: + return new Object[] {controller.inputTank.getFluidAmount()}; + case 4: + return new Object[] {controller.outputTank.getFluidAmount()}; + default: + throw new NoSuchMethodException(); + } + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java index 9f424f021..a479ea440 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java @@ -7,7 +7,7 @@ import java.util.HashSet; import java.util.Set; import mekanism.api.Coord4D; -import mekanism.api.ISalinationSolar; +import mekanism.api.IEvaporationSolar; import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; import mekanism.client.SparkleAnimation.INodeChecker; @@ -47,7 +47,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva public FluidTank outputTank = new FluidTank(MAX_OUTPUT); public Set tankParts = new HashSet(); - public ISalinationSolar[] solars = new ISalinationSolar[4]; + public IEvaporationSolar[] solars = new IEvaporationSolar[4]; public boolean temperatureSet = false; @@ -324,7 +324,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva int ret = 0; - for(ISalinationSolar solar : solars) + for(IEvaporationSolar solar : solars) { if(solar != null && solar.seesSun()) { @@ -533,9 +533,9 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva public boolean addSolarPanel(TileEntity tile, int i) { - if(tile instanceof ISalinationSolar && !tile.isInvalid()) + if(tile instanceof IEvaporationSolar && !tile.isInvalid()) { - solars[i] = (ISalinationSolar)tile; + solars[i] = (IEvaporationSolar)tile; return true; } else { @@ -713,7 +713,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva } tankParts.clear(); - solars = new ISalinationSolar[] {null, null, null, null}; + solars = new IEvaporationSolar[] {null, null, null, null}; } @Override diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java index f0db0eeaa..4b718e927 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java @@ -3,13 +3,13 @@ package mekanism.generators.common.tile; import java.util.EnumSet; import mekanism.api.Coord4D; -import mekanism.api.ISalinationSolar; +import mekanism.api.IEvaporationSolar; import mekanism.api.MekanismConfig.generators; import mekanism.common.base.IBoundingBlock; import mekanism.common.util.MekanismUtils; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator implements IBoundingBlock, ISalinationSolar +public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator implements IBoundingBlock, IEvaporationSolar { public TileEntityAdvancedSolarGenerator() { From e6f410208740d7eab23b3a7228fc2c9aa703d8a8 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 22 Mar 2016 19:29:18 -0400 Subject: [PATCH 11/62] New "InternalMultiblock" framework to allow for easier multiblock component management, added "hot" state to superheating elements --- .../java/mekanism/client/MekanismClient.java | 10 ++- .../java/mekanism/common/base/IModule.java | 5 ++ .../mekanism/common/block/BlockBasic.java | 15 ++++ .../content/boiler/BoilerUpdateProtocol.java | 3 + .../boiler/SynchronizedBoilerData.java | 6 ++ .../content/tank/TankUpdateProtocol.java | 6 +- .../common/multiblock/SynchronizedData.java | 2 + .../TileEntityInternalMultiblock.java | 58 +++++++++++++ .../common/multiblock/UpdateProtocol.java | 36 +++++++- .../common/tile/TileEntityBoilerCasing.java | 20 ++++- .../common/tile/TileEntityMultiblock.java | 3 + .../tile/TileEntitySuperheatingElement.java | 43 +++++++++- .../client/render/RenderTurbineRotor.java | 6 +- .../generators/common/MekanismGenerators.java | 6 ++ .../turbine/SynchronizedTurbineData.java | 8 ++ .../turbine/TurbineUpdateProtocol.java | 27 +----- .../turbine/TileEntityRotationalComplex.java | 84 +++---------------- .../tile/turbine/TileEntityTurbineCasing.java | 17 ++-- .../mekanism/tools/common/MekanismTools.java | 3 + 19 files changed, 237 insertions(+), 121 deletions(-) create mode 100644 src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java diff --git a/src/main/java/mekanism/client/MekanismClient.java b/src/main/java/mekanism/client/MekanismClient.java index 45300bf81..9b4f54141 100644 --- a/src/main/java/mekanism/client/MekanismClient.java +++ b/src/main/java/mekanism/client/MekanismClient.java @@ -6,8 +6,9 @@ import mekanism.api.MekanismConfig.general; import mekanism.client.sound.SoundHandler; import mekanism.client.voice.VoiceClient; import mekanism.common.Mekanism; +import mekanism.common.base.IModule; +import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.network.PacketKey.KeyMessage; -import mekanism.generators.common.tile.turbine.TileEntityRotationalComplex; import net.minecraft.client.Minecraft; import net.minecraft.client.settings.KeyBinding; import net.minecraftforge.common.MinecraftForge; @@ -50,7 +51,12 @@ public class MekanismClient extends Mekanism Mekanism.flamethrowerActive.clear(); Mekanism.activeVibrators.clear(); - TileEntityRotationalComplex.clientRotationMap.clear(); + SynchronizedBoilerData.clientHotMap.clear(); + + for(IModule module : Mekanism.modulesLoaded) + { + module.resetClient(); + } SoundHandler.soundMaps.clear(); diff --git a/src/main/java/mekanism/common/base/IModule.java b/src/main/java/mekanism/common/base/IModule.java index 41c83c629..37a7a57e6 100644 --- a/src/main/java/mekanism/common/base/IModule.java +++ b/src/main/java/mekanism/common/base/IModule.java @@ -37,4 +37,9 @@ public interface IModule * @param dataStream - the incoming ByteBuf of the sync packet */ public void readConfig(ByteBuf dataStream) throws IOException; + + /** + * Called when the player returns to the main menu. + */ + public void resetClient(); } diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index e5e5c50fb..d85527227 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -18,6 +18,7 @@ import mekanism.common.base.IActiveState; import mekanism.common.base.IBlockCTM; import mekanism.common.base.IBoundingBlock; import mekanism.common.base.ITierItem; +import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.inventory.InventoryBin; import mekanism.common.item.ItemBlockBasic; @@ -745,6 +746,20 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon return 12; } } + else if(blockType == BasicBlock.BASIC_BLOCK_2) + { + if(metadata == 5) + { + TileEntitySuperheatingElement element = (TileEntitySuperheatingElement)tileEntity; + + if(element.multiblockUUID != null && SynchronizedBoilerData.clientHotMap.get(element.multiblockUUID) != null) + { + return SynchronizedBoilerData.clientHotMap.get(element.multiblockUUID) ? 15 : 0; + } + + return 0; + } + } return 0; } diff --git a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java index a8cc2c4af..d2440063f 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java @@ -65,6 +65,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol } else if(tile instanceof TileEntitySuperheatingElement) { + structure.internalLocations.add(coord); elements.add(coord); } } @@ -221,6 +222,8 @@ public class BoilerUpdateProtocol extends UpdateProtocol @Override protected void onFormed() { + super.onFormed(); + if((structureFound).waterStored != null) { (structureFound).waterStored.amount = Math.min((structureFound).waterStored.amount, structureFound.waterVolume*WATER_PER_TANK); diff --git a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java index d90ed2aec..eda394981 100644 --- a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java +++ b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java @@ -1,6 +1,8 @@ package mekanism.common.content.boiler; +import java.util.HashMap; import java.util.HashSet; +import java.util.Map; import java.util.Set; import mekanism.api.Coord4D; @@ -16,6 +18,8 @@ import net.minecraftforge.fluids.FluidStack; public class SynchronizedBoilerData extends SynchronizedData implements IHeatTransfer { + public static Map clientHotMap = new HashMap(); + public static double CASING_INSULATION_COEFFICIENT = 1; public static double CASING_INVERSE_CONDUCTION_COEFFICIENT = 1; public static double BASE_BOIL_TEMP = 100-(TemperatureUnit.AMBIENT.zeroOffset-TemperatureUnit.CELSIUS.zeroOffset); @@ -29,6 +33,8 @@ public class SynchronizedBoilerData extends SynchronizedData @Override protected boolean isValidFrame(int x, int y, int z) { - return pointer.getWorldObj().getBlock(x, y, z) == MekanismBlocks.BasicBlock && pointer.getWorldObj().getBlockMetadata(x, y, z) == 9; + return BasicType.get(pointer.getWorldObj().getBlock(x, y, z), pointer.getWorldObj().getBlockMetadata(x, y, z)) == BasicType.DYNAMIC_TANK; } @Override @@ -72,6 +72,8 @@ public class TankUpdateProtocol extends UpdateProtocol @Override protected void onFormed() { + super.onFormed(); + if(structureFound.fluidStored != null) { structureFound.fluidStored.amount = Math.min(structureFound.fluidStored.amount, structureFound.volume*FLUID_PER_TANK); diff --git a/src/main/java/mekanism/common/multiblock/SynchronizedData.java b/src/main/java/mekanism/common/multiblock/SynchronizedData.java index 982f65575..17d6b3cb2 100644 --- a/src/main/java/mekanism/common/multiblock/SynchronizedData.java +++ b/src/main/java/mekanism/common/multiblock/SynchronizedData.java @@ -31,6 +31,8 @@ public abstract class SynchronizedData> public boolean destroyed; + public Set internalLocations = new HashSet(); + public ItemStack[] getInventory() { return null; diff --git a/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java b/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java new file mode 100644 index 000000000..737f2c2d7 --- /dev/null +++ b/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java @@ -0,0 +1,58 @@ +package mekanism.common.multiblock; + +import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; + +import mekanism.common.PacketHandler; +import mekanism.common.tile.TileEntityBasicBlock; + +public class TileEntityInternalMultiblock extends TileEntityBasicBlock +{ + public String multiblockUUID; + + @Override + public void onUpdate() {} + + @Override + public boolean canUpdate() + { + return false; + } + + @Override + public void handlePacketData(ByteBuf dataStream) + { + super.handlePacketData(dataStream); + + if(dataStream.readBoolean()) + { + multiblockUUID = PacketHandler.readString(dataStream); + } + else { + multiblockUUID = null; + } + } + + @Override + public ArrayList getNetworkedData(ArrayList data) + { + super.getNetworkedData(data); + + if(multiblockUUID != null) + { + data.add(true); + data.add(multiblockUUID); + } + else { + data.add(false); + } + + return data; + } + + public void setMultiblock(String id) + { + multiblockUUID = id; + } +} diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index f537ffc4b..f33d6fb9f 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -388,13 +388,43 @@ public abstract class UpdateProtocol> protected abstract void mergeCaches(List rejectedItems, MultiblockCache cache, MultiblockCache merge); - protected void onFormed() {} + protected void onFormed() + { + for(Coord4D coord : structureFound.internalLocations) + { + TileEntity tile = coord.getTileEntity(pointer.getWorldObj()); + + if(tile instanceof TileEntityInternalMultiblock) + { + ((TileEntityInternalMultiblock)tile).setMultiblock(structureFound.inventoryID); + } + } + } protected void onStructureCreated(T structure, int origX, int origY, int origZ, int xmin, int xmax, int ymin, int ymax, int zmin, int zmax) {} - public void onStructureDestroyed(T structure) {} + public void onStructureDestroyed(T structure) + { + for(Coord4D coord : structure.internalLocations) + { + TileEntity tile = coord.getTileEntity(pointer.getWorldObj()); + + if(tile instanceof TileEntityInternalMultiblock) + { + ((TileEntityInternalMultiblock)tile).setMultiblock(null); + } + } + } - public void killInnerNode(Coord4D coord) {} + public void killInnerNode(Coord4D coord) + { + TileEntity tile = coord.getTileEntity(pointer.getWorldObj()); + + if(tile instanceof TileEntityInternalMultiblock) + { + ((TileEntityInternalMultiblock)tile).setMultiblock(null); + } + } /** * Runs the protocol and updates all nodes that make a part of the multiblock. diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java index 4ef947cfd..a6b73f751 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java @@ -39,7 +39,7 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock 0; } - if(needsValveUpdate || structure.needsRenderUpdate()) + boolean needsHotUpdate = false; + boolean newHot = structure.temperature >= SynchronizedBoilerData.BASE_BOIL_TEMP-0.01F; + + if(newHot != structure.clientHot) { - sendPacketToRenderer(); + needsHotUpdate = true; + structure.clientHot = newHot; } double[] d = structure.simulateHeat(); @@ -155,6 +159,11 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock toSend = new HashSet(); for(ValveData valveData : structure.valves) @@ -298,6 +309,9 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock> extend data.add(getSynchronizedData().volLength); getSynchronizedData().renderLocation.write(data); + data.add(getSynchronizedData().inventoryID); } else { data.add(false); @@ -223,6 +225,7 @@ public abstract class TileEntityMultiblock> extend getSynchronizedData().volLength = dataStream.readInt(); getSynchronizedData().renderLocation = Coord4D.read(dataStream); + getSynchronizedData().inventoryID = PacketHandler.readString(dataStream); } } } diff --git a/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java b/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java index d7207cb85..6bb80ad08 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java +++ b/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java @@ -1,13 +1,48 @@ package mekanism.common.tile; -public class TileEntitySuperheatingElement extends TileEntityBasicBlock +import mekanism.common.content.boiler.SynchronizedBoilerData; +import mekanism.common.multiblock.TileEntityInternalMultiblock; +import mekanism.common.util.MekanismUtils; + +public class TileEntitySuperheatingElement extends TileEntityInternalMultiblock { + public boolean prevHot; + + @Override + public void setMultiblock(String id) + { + if(id == null && multiblockUUID != null) + { + SynchronizedBoilerData.clientHotMap.remove(multiblockUUID); + } + + super.setMultiblock(id); + } + @Override public boolean canUpdate() { - return false; + return true; } - + @Override - public void onUpdate() {} + public void onUpdate() + { + if(worldObj.isRemote) + { + boolean newHot = false; + + if(multiblockUUID != null && SynchronizedBoilerData.clientHotMap.get(multiblockUUID) != null) + { + newHot = SynchronizedBoilerData.clientHotMap.get(multiblockUUID); + } + + if(prevHot != newHot) + { + MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord); + + prevHot = newHot; + } + } + } } diff --git a/src/main/java/mekanism/generators/client/render/RenderTurbineRotor.java b/src/main/java/mekanism/generators/client/render/RenderTurbineRotor.java index 285223439..6c95d1839 100644 --- a/src/main/java/mekanism/generators/client/render/RenderTurbineRotor.java +++ b/src/main/java/mekanism/generators/client/render/RenderTurbineRotor.java @@ -4,7 +4,7 @@ import mekanism.common.Mekanism; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelTurbine; -import mekanism.generators.common.tile.turbine.TileEntityRotationalComplex; +import mekanism.generators.common.content.turbine.SynchronizedTurbineData; import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -43,9 +43,9 @@ public class RenderTurbineRotor extends TileEntitySpecialRenderer int baseIndex = tileEntity.clientIndex*2; float rotateSpeed = 0.0F; - if(tileEntity.multiblockUUID != null && TileEntityRotationalComplex.clientRotationMap.containsKey(tileEntity.multiblockUUID)) + if(tileEntity.multiblockUUID != null && SynchronizedTurbineData.clientRotationMap.containsKey(tileEntity.multiblockUUID)) { - rotateSpeed = TileEntityRotationalComplex.clientRotationMap.get(tileEntity.multiblockUUID); + rotateSpeed = SynchronizedTurbineData.clientRotationMap.get(tileEntity.multiblockUUID); } if(!Mekanism.proxy.isPaused()) diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index a4208a7de..b072d17c1 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -232,6 +232,12 @@ public class MekanismGenerators implements IModule generators.turbineVentGasFlow = dataStream.readDouble(); generators.turbineDisperserGasFlow = dataStream.readDouble(); } + + @Override + public void resetClient() + { + SynchronizedTurbineData.clientRotationMap.clear(); + } @SubscribeEvent public void onConfigChanged(OnConfigChangedEvent event) diff --git a/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java b/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java index edb7c7478..667324ddf 100644 --- a/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java +++ b/src/main/java/mekanism/generators/common/content/turbine/SynchronizedTurbineData.java @@ -1,11 +1,18 @@ package mekanism.generators.common.content.turbine; +import java.util.HashMap; +import java.util.Map; + import mekanism.api.Coord4D; import mekanism.common.multiblock.SynchronizedData; import net.minecraftforge.fluids.FluidStack; public class SynchronizedTurbineData extends SynchronizedData { + public static Map clientRotationMap = new HashMap(); + + public static final float ROTATION_THRESHOLD = 0.001F; + public FluidStack fluidStored; public FluidStack prevFluid; @@ -25,6 +32,7 @@ public class SynchronizedTurbineData extends SynchronizedData clientRotationMap = new HashMap(); - - public static final float ROTATION_THRESHOLD = 0.001F; - - public String multiblockUUID; - public float rotation; - +public class TileEntityRotationalComplex extends TileEntityInternalMultiblock +{ @Override - public void onUpdate() {} - - @Override - public boolean canUpdate() - { - return false; - } - - @Override - public void handlePacketData(ByteBuf dataStream) - { - super.handlePacketData(dataStream); - - rotation = dataStream.readFloat(); - - if(dataStream.readBoolean()) - { - multiblockUUID = PacketHandler.readString(dataStream); - clientRotationMap.put(multiblockUUID, rotation); - } - else { - multiblockUUID = null; - } - } - - @Override - public ArrayList getNetworkedData(ArrayList data) - { - super.getNetworkedData(data); - - data.add(rotation); - - if(multiblockUUID != null) - { - data.add(true); - data.add(multiblockUUID); - } - else { - data.add(false); - } - - return data; - } - public void setMultiblock(String id) { - multiblockUUID = id; + if(id == null && multiblockUUID != null) + { + SynchronizedTurbineData.clientRotationMap.remove(multiblockUUID); + } + + super.setMultiblock(id); Coord4D coord = Coord4D.get(this).getFromSide(ForgeDirection.DOWN); TileEntity tile = coord.getTileEntity(worldObj); @@ -81,13 +26,4 @@ public class TileEntityRotationalComplex extends TileEntityBasicBlock ((TileEntityTurbineRotor)tile).updateRotors(); } } - - public void setRotation(float newRotation) - { - if(Math.abs(newRotation-rotation) > ROTATION_THRESHOLD) - { - rotation = newRotation; - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); - } - } } diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java index 39879c3e8..698736eff 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java @@ -22,12 +22,11 @@ import mekanism.generators.common.content.turbine.SynchronizedTurbineData; import mekanism.generators.common.content.turbine.TurbineCache; import mekanism.generators.common.content.turbine.TurbineUpdateProtocol; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; public class TileEntityTurbineCasing extends TileEntityMultiblock implements IStrictEnergyStorage -{ +{ public TileEntityTurbineCasing() { this("TurbineCasing"); @@ -87,14 +86,16 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock SynchronizedTurbineData.ROTATION_THRESHOLD) { - ((TileEntityRotationalComplex)tile).setRotation((float)flowRate); + structure.clientRotation = newRotation; + needsRotationUpdate = true; } - if(structure.needsRenderUpdate()) + if(structure.needsRenderUpdate() || needsRotationUpdate) { sendPacketToRenderer(); } @@ -187,6 +188,7 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock Date: Tue, 22 Mar 2016 19:48:47 -0400 Subject: [PATCH 12/62] Fixed Entangloporter not updating block surroundings --- .../mekanism/common/tile/TileEntityQuantumEntangloporter.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index d2d8b42a8..28ad777dc 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -210,6 +210,8 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp frequency = (InventoryFrequency)freq; frequency.activeCoords.add(Coord4D.get(this)); + markDirty(); + return; } } From ac16acb59a3693e25145ca967310b6c680acb86b Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 22 Mar 2016 20:37:16 -0400 Subject: [PATCH 13/62] Fixed pumps not outputting --- .../common/tile/TileEntityElectricPump.java | 18 +++++------------- .../client/render/RenderWindGenerator.java | 2 +- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index b892f6189..5d580a271 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -148,20 +148,12 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I if(!worldObj.isRemote && fluidTank.getFluid() != null) { - for(ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS) + TileEntity tileEntity = Coord4D.get(this).getFromSide(ForgeDirection.UP).getTileEntity(worldObj); + + if(tileEntity instanceof IFluidHandler) { - TileEntity tileEntity = Coord4D.get(this).getFromSide(orientation).getTileEntity(worldObj); - - if(tileEntity instanceof IFluidHandler) - { - FluidStack toDrain = new FluidStack(fluidTank.getFluid(), Math.min(256*upgradeComponent.getUpgrades(Upgrade.SPEED), fluidTank.getFluidAmount())); - fluidTank.drain(((IFluidHandler)tileEntity).fill(orientation.getOpposite(), toDrain, true), true); - - if(fluidTank.getFluid() == null || fluidTank.getFluid().amount <= 0) - { - break; - } - } + FluidStack toDrain = new FluidStack(fluidTank.getFluid(), Math.min(256*(upgradeComponent.getUpgrades(Upgrade.SPEED)+1), fluidTank.getFluidAmount())); + fluidTank.drain(((IFluidHandler)tileEntity).fill(ForgeDirection.DOWN, toDrain, true), true); } } } diff --git a/src/main/java/mekanism/generators/client/render/RenderWindGenerator.java b/src/main/java/mekanism/generators/client/render/RenderWindGenerator.java index f8ecaa6c6..35744a2a2 100644 --- a/src/main/java/mekanism/generators/client/render/RenderWindGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderWindGenerator.java @@ -39,7 +39,7 @@ public class RenderWindGenerator extends TileEntitySpecialRenderer if(!Mekanism.proxy.isPaused() && tileEntity.getWorldObj().canBlockSeeTheSky(tileEntity.xCoord, tileEntity.yCoord+4, tileEntity.zCoord)) { - tileEntity.angle = (tileEntity.angle+((tileEntity.yCoord+4)/256F)*8) % 360; + tileEntity.angle = (tileEntity.angle+((tileEntity.yCoord+4F)/256F)*8) % 360; } model.render(0.0625F, tileEntity.angle); From bfb17d45f657749da7683cfe0b74b9a5139ab177 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 23 Mar 2016 08:52:03 -0400 Subject: [PATCH 14/62] Reorganized assets --- .../client/render/MekanismRenderer.java | 48 ++++++++--------- .../mekanism/common/block/BlockBasic.java | 16 +++--- .../mekanism/common/block/BlockMachine.java | 51 +++++++++--------- .../textures/blocks/Chlorine.png.mcmeta | 5 -- .../textures/blocks/InductionCasing.png | Bin 1149 -> 0 bytes .../textures/blocks/InductionCellAdvanced.png | Bin 1582 -> 0 bytes .../textures/blocks/InductionCellBasic.png | Bin 1584 -> 0 bytes .../textures/blocks/InductionCellElite.png | Bin 1603 -> 0 bytes .../textures/blocks/InductionCellUltimate.png | Bin 1606 -> 0 bytes .../textures/blocks/InductionPortInput.png | Bin 1388 -> 0 bytes .../textures/blocks/InductionPortOutput.png | Bin 1386 -> 0 bytes .../blocks/InductionProviderAdvanced.png | Bin 2082 -> 0 bytes .../blocks/InductionProviderBasic.png | Bin 2080 -> 0 bytes .../blocks/InductionProviderElite.png | Bin 2075 -> 0 bytes .../blocks/InductionProviderUltimate.png | Bin 2083 -> 0 bytes .../blocks/{ => bin}/BinAdvancedFront.png | Bin .../blocks/{ => bin}/BinAdvancedFrontOn.png | Bin .../blocks/{ => bin}/BinAdvancedSide.png | Bin .../blocks/{ => bin}/BinAdvancedTop.png | Bin .../blocks/{ => bin}/BinAdvancedTopOn.png | Bin .../blocks/{ => bin}/BinBasicFront.png | Bin .../blocks/{ => bin}/BinBasicFrontOn.png | Bin .../blocks/{ => bin}/BinBasicSide.png | Bin .../textures/blocks/{ => bin}/BinBasicTop.png | Bin .../blocks/{ => bin}/BinBasicTopOn.png | Bin .../blocks/{ => bin}/BinEliteFront.png | Bin .../blocks/{ => bin}/BinEliteFrontOn.png | Bin .../blocks/{ => bin}/BinEliteSide.png | Bin .../textures/blocks/{ => bin}/BinEliteTop.png | Bin .../blocks/{ => bin}/BinEliteTopOn.png | Bin .../blocks/{ => bin}/BinUltimateFront.png | Bin .../blocks/{ => bin}/BinUltimateFrontOn.png | Bin .../blocks/{ => bin}/BinUltimateSide.png | Bin .../blocks/{ => bin}/BinUltimateTop.png | Bin .../blocks/{ => bin}/BinUltimateTopOn.png | Bin .../ChemicalInjectionChamberFront.png | Bin .../ChemicalInjectionChamberFrontOn.png | Bin ...ChemicalInjectionChamberFrontOn.png.mcmeta | 0 .../blocks/{ => combiner}/CombinerFront.png | Bin .../blocks/{ => combiner}/CombinerFrontOn.png | Bin .../{ => combiner}/CombinerFrontOn.png.mcmeta | 0 .../blocks/{ => crusher}/CrusherFront.png | Bin .../blocks/{ => crusher}/CrusherFrontOn.png | Bin .../{ => crusher}/CrusherFrontOn.png.mcmeta | 0 .../EnergizedSmelterFront.png | Bin .../EnergizedSmelterFrontOn.png | Bin .../EnergizedSmelterFrontOn.png.mcmeta | 0 .../EnrichmentChamberFront.png | Bin .../EnrichmentChamberFrontOn.png | Bin .../AdvancedCombiningFactoryFront.png | Bin .../AdvancedCombiningFactoryFrontOn.png | Bin ...AdvancedCombiningFactoryFrontOn.png.mcmeta | 0 .../AdvancedCompressingFactoryFront.png | Bin .../AdvancedCompressingFactoryFrontOn.png | Bin ...vancedCompressingFactoryFrontOn.png.mcmeta | 0 .../AdvancedCrushingFactoryFront.png | Bin .../AdvancedCrushingFactoryFrontOn.png | Bin .../AdvancedCrushingFactoryFrontOn.png.mcmeta | 0 .../AdvancedEnrichingFactoryFront.png | Bin .../AdvancedEnrichingFactoryFrontOn.png | Bin .../advanced}/AdvancedFactoryBottom.png | Bin .../advanced}/AdvancedFactoryFront.png | Bin .../advanced}/AdvancedFactorySide.png | Bin .../advanced}/AdvancedFactoryTop.png | Bin .../AdvancedInjectingFactoryFront.png | Bin .../AdvancedInjectingFactoryFrontOn.png | Bin .../AdvancedPurifyingFactoryFront.png | Bin .../AdvancedPurifyingFactoryFrontOn.png | Bin .../AdvancedSmeltingFactoryFront.png | Bin .../AdvancedSmeltingFactoryFrontOn.png | Bin .../AdvancedSmeltingFactoryFrontOn.png.mcmeta | 0 .../basic}/BasicCombiningFactoryFront.png | Bin .../basic}/BasicCombiningFactoryFrontOn.png | Bin .../BasicCombiningFactoryFrontOn.png.mcmeta | 0 .../basic}/BasicCompressingFactoryFront.png | Bin .../basic}/BasicCompressingFactoryFrontOn.png | Bin .../BasicCompressingFactoryFrontOn.png.mcmeta | 0 .../basic}/BasicCrushingFactoryFront.png | Bin .../basic}/BasicCrushingFactoryFrontOn.png | Bin .../BasicCrushingFactoryFrontOn.png.mcmeta | 0 .../basic}/BasicEnrichingFactoryFront.png | Bin .../basic}/BasicEnrichingFactoryFrontOn.png | Bin .../basic}/BasicFactoryBottom.png | Bin .../{ => factory/basic}/BasicFactoryFront.png | Bin .../{ => factory/basic}/BasicFactorySide.png | Bin .../{ => factory/basic}/BasicFactoryTop.png | Bin .../basic}/BasicInjectingFactoryFront.png | Bin .../basic}/BasicInjectingFactoryFrontOn.png | Bin .../basic}/BasicPurifyingFactoryFront.png | Bin .../basic}/BasicPurifyingFactoryFrontOn.png | Bin .../basic}/BasicSmeltingFactoryFront.png | Bin .../basic}/BasicSmeltingFactoryFrontOn.png | Bin .../BasicSmeltingFactoryFrontOn.png.mcmeta | 0 .../elite}/EliteCombiningFactoryFront.png | Bin .../elite}/EliteCombiningFactoryFrontOn.png | Bin .../EliteCombiningFactoryFrontOn.png.mcmeta | 0 .../elite}/EliteCompressingFactoryFront.png | Bin .../elite}/EliteCompressingFactoryFrontOn.png | Bin .../EliteCompressingFactoryFrontOn.png.mcmeta | 0 .../elite}/EliteCrushingFactoryFront.png | Bin .../elite}/EliteCrushingFactoryFrontOn.png | Bin .../EliteCrushingFactoryFrontOn.png.mcmeta | 0 .../elite}/EliteEnrichingFactoryFront.png | Bin .../elite}/EliteEnrichingFactoryFrontOn.png | Bin .../elite}/EliteFactoryBottom.png | Bin .../{ => factory/elite}/EliteFactoryFront.png | Bin .../{ => factory/elite}/EliteFactorySide.png | Bin .../{ => factory/elite}/EliteFactoryTop.png | Bin .../elite}/EliteInjectingFactoryFront.png | Bin .../elite}/EliteInjectingFactoryFrontOn.png | Bin .../elite}/ElitePurifyingFactoryFront.png | Bin .../elite}/ElitePurifyingFactoryFrontOn.png | Bin .../elite}/EliteSmeltingFactoryFront.png | Bin .../elite}/EliteSmeltingFactoryFrontOn.png | Bin .../EliteSmeltingFactoryFrontOn.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidBrine.png | Bin .../{ => liquid}/LiquidBrine.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidChlorine.png | Bin .../{ => liquid}/LiquidChlorine.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidCleanOre.png | Bin .../{ => liquid}/LiquidCleanOre.png.mcmeta | 0 .../textures/blocks/{ => liquid}/LiquidDT.png | Bin .../blocks/{ => liquid}/LiquidDT.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidDeuterium.png | Bin .../{ => liquid}/LiquidDeuterium.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidEnergy.png | Bin .../{ => liquid}/LiquidEnergy.png.mcmeta | 0 .../{ => liquid}/LiquidEnergyStatic.png | Bin .../blocks/{ => liquid}/LiquidEthene.png | Bin .../{ => liquid}/LiquidEthene.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidHeat.png | Bin .../blocks/{ => liquid}/LiquidHeat.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidHeavyWater.png | Bin .../{ => liquid}/LiquidHeavyWater.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidHydrogen.png | Bin .../{ => liquid}/LiquidHydrogen.png.mcmeta | 0 .../{ => liquid}/LiquidHydrogenChloride.png | Bin .../LiquidHydrogenChloride.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidLithium.png | Bin .../{ => liquid}/LiquidLithium.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidOre.png | Bin .../blocks/{ => liquid}/LiquidOre.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidOsmium.png | Bin .../{ => liquid}/LiquidOsmium.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidOxygen.png | Bin .../{ => liquid}/LiquidOxygen.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidSodium.png | Bin .../{ => liquid}/LiquidSodium.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidSteam.png | Bin .../{ => liquid}/LiquidSteam.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidStone.png | Bin .../{ => liquid}/LiquidStone.png.mcmeta | 0 .../{ => liquid}/LiquidSulfurDioxide.png | Bin .../LiquidSulfurDioxide.png.mcmeta | 0 .../{ => liquid}/LiquidSulfurTrioxide.png | Bin .../LiquidSulfurTrioxide.png.mcmeta | 0 .../{ => liquid}/LiquidSulfuricAcid.png | Bin .../LiquidSulfuricAcid.png.mcmeta | 0 .../blocks/{ => liquid}/LiquidTritium.png | Bin .../{ => liquid}/LiquidTritium.png.mcmeta | 0 .../OredictionificatorBack.png | Bin .../OredictionificatorFront.png | Bin .../OredictionificatorLeft.png | Bin .../OredictionificatorRight.png | Bin .../OredictionificatorSide.png | Bin .../OsmiumCompressorFront.png | Bin .../OsmiumCompressorFrontOn.png | Bin .../OsmiumCompressorFrontOn.png.mcmeta | 0 .../PrecisionSawmillFront.png | Bin .../PrecisionSawmillFrontOn.png | Bin .../PrecisionSawmillFrontOn.png.mcmeta | 0 .../PurificationChamberFront.png | Bin .../PurificationChamberFrontOn.png | Bin .../PurificationChamberFrontOn.png.mcmeta | 0 174 files changed, 59 insertions(+), 61 deletions(-) delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/Chlorine.png.mcmeta delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/InductionCasing.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/InductionCellAdvanced.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/InductionCellBasic.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/InductionCellElite.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/InductionCellUltimate.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/InductionPortInput.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/InductionPortOutput.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/InductionProviderAdvanced.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/InductionProviderBasic.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/InductionProviderElite.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/InductionProviderUltimate.png rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinAdvancedFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinAdvancedFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinAdvancedSide.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinAdvancedTop.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinAdvancedTopOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinBasicFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinBasicFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinBasicSide.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinBasicTop.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinBasicTopOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinEliteFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinEliteFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinEliteSide.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinEliteTop.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinEliteTopOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinUltimateFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinUltimateFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinUltimateSide.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinUltimateTop.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => bin}/BinUltimateTopOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => chemical_injection_chamber}/ChemicalInjectionChamberFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => chemical_injection_chamber}/ChemicalInjectionChamberFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => chemical_injection_chamber}/ChemicalInjectionChamberFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => combiner}/CombinerFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => combiner}/CombinerFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => combiner}/CombinerFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => crusher}/CrusherFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => crusher}/CrusherFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => crusher}/CrusherFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => energized_smelter}/EnergizedSmelterFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => energized_smelter}/EnergizedSmelterFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => energized_smelter}/EnergizedSmelterFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => enrichment_chamber}/EnrichmentChamberFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => enrichment_chamber}/EnrichmentChamberFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedCombiningFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedCombiningFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedCombiningFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedCompressingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedCompressingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedCompressingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedCrushingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedCrushingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedCrushingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedEnrichingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedEnrichingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedFactoryBottom.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedFactorySide.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedFactoryTop.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedInjectingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedInjectingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedPurifyingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedPurifyingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedSmeltingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedSmeltingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/advanced}/AdvancedSmeltingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicCombiningFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicCombiningFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicCombiningFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicCompressingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicCompressingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicCompressingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicCrushingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicCrushingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicCrushingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicEnrichingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicEnrichingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicFactoryBottom.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicFactorySide.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicFactoryTop.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicInjectingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicInjectingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicPurifyingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicPurifyingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicSmeltingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicSmeltingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/basic}/BasicSmeltingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteCombiningFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteCombiningFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteCombiningFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteCompressingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteCompressingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteCompressingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteCrushingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteCrushingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteCrushingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteEnrichingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteEnrichingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteFactoryBottom.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteFactorySide.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteFactoryTop.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteInjectingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteInjectingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/ElitePurifyingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/ElitePurifyingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteSmeltingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteSmeltingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => factory/elite}/EliteSmeltingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidBrine.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidBrine.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidChlorine.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidChlorine.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidCleanOre.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidCleanOre.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidDT.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidDT.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidDeuterium.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidDeuterium.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidEnergy.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidEnergy.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidEnergyStatic.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidEthene.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidEthene.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidHeat.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidHeat.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidHeavyWater.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidHeavyWater.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidHydrogen.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidHydrogen.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidHydrogenChloride.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidHydrogenChloride.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidLithium.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidLithium.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidOre.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidOre.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidOsmium.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidOsmium.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidOxygen.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidOxygen.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidSodium.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidSodium.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidSteam.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidSteam.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidStone.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidStone.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidSulfurDioxide.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidSulfurDioxide.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidSulfurTrioxide.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidSulfurTrioxide.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidSulfuricAcid.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidSulfuricAcid.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidTritium.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => liquid}/LiquidTritium.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => oredictionificator}/OredictionificatorBack.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => oredictionificator}/OredictionificatorFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => oredictionificator}/OredictionificatorLeft.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => oredictionificator}/OredictionificatorRight.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => oredictionificator}/OredictionificatorSide.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => osmium_compressor}/OsmiumCompressorFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => osmium_compressor}/OsmiumCompressorFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => osmium_compressor}/OsmiumCompressorFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => precision_sawmill}/PrecisionSawmillFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => precision_sawmill}/PrecisionSawmillFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => precision_sawmill}/PrecisionSawmillFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => purification_chamber}/PurificationChamberFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => purification_chamber}/PurificationChamberFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/{ => purification_chamber}/PurificationChamberFrontOn.png.mcmeta (100%) diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index bc21fd8f1..11c414d39 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -94,26 +94,26 @@ public class MekanismRenderer overlays.put(type, event.map.registerIcon("mekanism:overlay/" + type.getTransmission() + "Overlay")); } - energyIcon = event.map.registerIcon("mekanism:LiquidEnergy"); - heatIcon = event.map.registerIcon("mekanism:LiquidHeat"); + energyIcon = event.map.registerIcon("mekanism:liquid/LiquidEnergy"); + heatIcon = event.map.registerIcon("mekanism:liquid/LiquidHeat"); - GasRegistry.getGas("hydrogen").setIcon(event.map.registerIcon("mekanism:LiquidHydrogen")); - GasRegistry.getGas("oxygen").setIcon(event.map.registerIcon("mekanism:LiquidOxygen")); - GasRegistry.getGas("water").setIcon(event.map.registerIcon("mekanism:LiquidSteam")); - GasRegistry.getGas("chlorine").setIcon(event.map.registerIcon("mekanism:LiquidChlorine")); - GasRegistry.getGas("sulfurDioxideGas").setIcon(event.map.registerIcon("mekanism:LiquidSulfurDioxide")); - GasRegistry.getGas("sulfurTrioxideGas").setIcon(event.map.registerIcon("mekanism:LiquidSulfurTrioxide")); - GasRegistry.getGas("sulfuricAcid").setIcon(event.map.registerIcon("mekanism:LiquidSulfuricAcid")); - GasRegistry.getGas("hydrogenChloride").setIcon(event.map.registerIcon("mekanism:LiquidHydrogenChloride")); - GasRegistry.getGas("liquidOsmium").setIcon(event.map.registerIcon("mekanism:LiquidOsmium")); - GasRegistry.getGas("liquidStone").setIcon(event.map.registerIcon("mekanism:LiquidStone")); - GasRegistry.getGas("ethene").setIcon(event.map.registerIcon("mekanism:LiquidEthene")); - GasRegistry.getGas("brine").setIcon(event.map.registerIcon("mekanism:LiquidBrine")); - GasRegistry.getGas("sodium").setIcon(event.map.registerIcon("mekanism:LiquidSodium")); - GasRegistry.getGas("deuterium").setIcon(event.map.registerIcon("mekanism:LiquidDeuterium")); - GasRegistry.getGas("tritium").setIcon(event.map.registerIcon("mekanism:LiquidTritium")); - GasRegistry.getGas("fusionFuelDT").setIcon(event.map.registerIcon("mekanism:LiquidDT")); - GasRegistry.getGas("lithium").setIcon(event.map.registerIcon("mekanism:LiquidLithium")); + GasRegistry.getGas("hydrogen").setIcon(event.map.registerIcon("mekanism:liquid/LiquidHydrogen")); + GasRegistry.getGas("oxygen").setIcon(event.map.registerIcon("mekanism:liquid/LiquidOxygen")); + GasRegistry.getGas("water").setIcon(event.map.registerIcon("mekanism:liquid/LiquidSteam")); + GasRegistry.getGas("chlorine").setIcon(event.map.registerIcon("mekanism:liquid/LiquidChlorine")); + GasRegistry.getGas("sulfurDioxideGas").setIcon(event.map.registerIcon("mekanism:liquid/LiquidSulfurDioxide")); + GasRegistry.getGas("sulfurTrioxideGas").setIcon(event.map.registerIcon("mekanism:liquid/LiquidSulfurTrioxide")); + GasRegistry.getGas("sulfuricAcid").setIcon(event.map.registerIcon("mekanism:liquid/LiquidSulfuricAcid")); + GasRegistry.getGas("hydrogenChloride").setIcon(event.map.registerIcon("mekanism:liquid/LiquidHydrogenChloride")); + GasRegistry.getGas("liquidOsmium").setIcon(event.map.registerIcon("mekanism:liquid/LiquidOsmium")); + GasRegistry.getGas("liquidStone").setIcon(event.map.registerIcon("mekanism:liquid/LiquidStone")); + GasRegistry.getGas("ethene").setIcon(event.map.registerIcon("mekanism:liquid/LiquidEthene")); + GasRegistry.getGas("brine").setIcon(event.map.registerIcon("mekanism:liquid/LiquidBrine")); + GasRegistry.getGas("sodium").setIcon(event.map.registerIcon("mekanism:liquid/LiquidSodium")); + GasRegistry.getGas("deuterium").setIcon(event.map.registerIcon("mekanism:liquid/LiquidDeuterium")); + GasRegistry.getGas("tritium").setIcon(event.map.registerIcon("mekanism:liquid/LiquidTritium")); + GasRegistry.getGas("fusionFuelDT").setIcon(event.map.registerIcon("mekanism:liquid/LiquidDT")); + GasRegistry.getGas("lithium").setIcon(event.map.registerIcon("mekanism:liquid/LiquidLithium")); for(Gas gas : GasRegistry.getRegisteredGasses()) { @@ -121,17 +121,17 @@ public class MekanismRenderer { if(gas.getUnlocalizedName().contains("clean")) { - gas.setIcon(event.map.registerIcon("mekanism:LiquidCleanOre")); + gas.setIcon(event.map.registerIcon("mekanism:liquid/LiquidCleanOre")); } else { - gas.setIcon(event.map.registerIcon("mekanism:LiquidOre")); + gas.setIcon(event.map.registerIcon("mekanism:liquid/LiquidOre")); } } } - FluidRegistry.getFluid("brine").setIcons(event.map.registerIcon("mekanism:LiquidBrine")); - FluidRegistry.getFluid("heavywater").setIcons(event.map.registerIcon("mekanism:LiquidHeavyWater")); - FluidRegistry.getFluid("steam").setIcons(event.map.registerIcon("mekanism:LiquidSteam")); + FluidRegistry.getFluid("brine").setIcons(event.map.registerIcon("mekanism:liquid/LiquidBrine")); + FluidRegistry.getFluid("heavywater").setIcons(event.map.registerIcon("mekanism:liquid/LiquidHeavyWater")); + FluidRegistry.getFluid("steam").setIcons(event.map.registerIcon("mekanism:liquid/LiquidSteam")); for(InfuseType type : InfuseRegistry.getInfuseMap().values()) { diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index d85527227..53a04d7ce 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -188,14 +188,14 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon icons[5][0] = register.registerIcon("mekanism:SteelBlock"); icons[6][0] = register.registerIcon(ICON_BASE); - MekanismRenderer.loadDynamicTextures(register, "BinBasic", binIcons[0], DefIcon.getActivePair(register.registerIcon("mekanism:BinBasicSide"), 3, 4, 5), - new DefIcon(register.registerIcon("mekanism:BinBasicTop"), 0), new DefIcon(register.registerIcon("mekanism:BinBasicTopOn"), 6)); - MekanismRenderer.loadDynamicTextures(register, "BinAdvanced", binIcons[1], DefIcon.getActivePair(register.registerIcon("mekanism:BinAdvancedSide"), 3, 4, 5), - new DefIcon(register.registerIcon("mekanism:BinAdvancedTop"), 0), new DefIcon(register.registerIcon("mekanism:BinAdvancedTopOn"), 6)); - MekanismRenderer.loadDynamicTextures(register, "BinElite", binIcons[2], DefIcon.getActivePair(register.registerIcon("mekanism:BinEliteSide"), 3, 4, 5), - new DefIcon(register.registerIcon("mekanism:BinEliteTop"), 0), new DefIcon(register.registerIcon("mekanism:BinEliteTopOn"), 6)); - MekanismRenderer.loadDynamicTextures(register, "BinUltimate", binIcons[3], DefIcon.getActivePair(register.registerIcon("mekanism:BinUltimateSide"), 3, 4, 5), - new DefIcon(register.registerIcon("mekanism:BinUltimateTop"), 0), new DefIcon(register.registerIcon("mekanism:BinUltimateTopOn"), 6)); + MekanismRenderer.loadDynamicTextures(register, "bin/BinBasic", binIcons[0], DefIcon.getActivePair(register.registerIcon("mekanism:bin/BinBasicSide"), 3, 4, 5), + new DefIcon(register.registerIcon("mekanism:bin/BinBasicTop"), 0), new DefIcon(register.registerIcon("mekanism:bin/BinBasicTopOn"), 6)); + MekanismRenderer.loadDynamicTextures(register, "bin/BinAdvanced", binIcons[1], DefIcon.getActivePair(register.registerIcon("mekanism:bin/BinAdvancedSide"), 3, 4, 5), + new DefIcon(register.registerIcon("mekanism:bin/BinAdvancedTop"), 0), new DefIcon(register.registerIcon("mekanism:bin/BinAdvancedTopOn"), 6)); + MekanismRenderer.loadDynamicTextures(register, "bin/BinElite", binIcons[2], DefIcon.getActivePair(register.registerIcon("mekanism:bin/BinEliteSide"), 3, 4, 5), + new DefIcon(register.registerIcon("mekanism:bin/BinEliteTop"), 0), new DefIcon(register.registerIcon("mekanism:bin/BinEliteTopOn"), 6)); + MekanismRenderer.loadDynamicTextures(register, "bin/BinUltimate", binIcons[3], DefIcon.getActivePair(register.registerIcon("mekanism:bin/BinUltimateSide"), 3, 4, 5), + new DefIcon(register.registerIcon("mekanism:bin/BinUltimateTop"), 0), new DefIcon(register.registerIcon("mekanism:bin/BinUltimateTopOn"), 6)); icons[7][0] = ctms[7][0].mainTextureData.icon; icons[8][0] = register.registerIcon("mekanism:SteelCasing"); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 43f1f5af4..86ff01927 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -191,44 +191,47 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo case MACHINE_BLOCK_1: ctms[11][0] = new CTMData("ctm/Teleporter", this, Arrays.asList(11)).addOtherBlockConnectivities(MekanismBlocks.BasicBlock, Arrays.asList(7)).registerIcons(register); - MekanismRenderer.loadDynamicTextures(register, MachineType.ENRICHMENT_CHAMBER.name, icons[0], def); - MekanismRenderer.loadDynamicTextures(register, MachineType.OSMIUM_COMPRESSOR.name, icons[1], def); - MekanismRenderer.loadDynamicTextures(register, MachineType.COMBINER.name, icons[2], def); - MekanismRenderer.loadDynamicTextures(register, MachineType.CRUSHER.name, icons[3], def); + MekanismRenderer.loadDynamicTextures(register, "enrichment_chamber/" + MachineType.ENRICHMENT_CHAMBER.name, icons[0], def); + MekanismRenderer.loadDynamicTextures(register, "osmium_compressor/" + MachineType.OSMIUM_COMPRESSOR.name, icons[1], def); + MekanismRenderer.loadDynamicTextures(register, "combiner/" + MachineType.COMBINER.name, icons[2], def); + MekanismRenderer.loadDynamicTextures(register, "crusher/" + MachineType.CRUSHER.name, icons[3], def); for(RecipeType type : RecipeType.values()) { - MekanismRenderer.loadDynamicTextures(register, BaseTier.BASIC.getName() + type.getUnlocalizedName() + MachineType.BASIC_FACTORY.name, factoryIcons[0][type.ordinal()], - DefIcon.getActivePair(register.registerIcon("mekanism:BasicFactoryFront"), 2), - DefIcon.getActivePair(register.registerIcon("mekanism:BasicFactoryTop"), 1), - DefIcon.getActivePair(register.registerIcon("mekanism:BasicFactoryBottom"), 0), - DefIcon.getActivePair(register.registerIcon("mekanism:BasicFactorySide"), 3, 4, 5)); - MekanismRenderer.loadDynamicTextures(register, BaseTier.ADVANCED.getName() + type.getUnlocalizedName() + MachineType.ADVANCED_FACTORY.name, factoryIcons[1][type.ordinal()], - DefIcon.getActivePair(register.registerIcon("mekanism:AdvancedFactoryFront"), 2), - DefIcon.getActivePair(register.registerIcon("mekanism:AdvancedFactoryTop"), 1), - DefIcon.getActivePair(register.registerIcon("mekanism:AdvancedFactoryBottom"), 0), - DefIcon.getActivePair(register.registerIcon("mekanism:AdvancedFactorySide"), 3, 4, 5)); - MekanismRenderer.loadDynamicTextures(register, BaseTier.ELITE.getName() + type.getUnlocalizedName() + MachineType.ELITE_FACTORY.name, factoryIcons[2][type.ordinal()], - DefIcon.getActivePair(register.registerIcon("mekanism:EliteFactoryFront"), 2), - DefIcon.getActivePair(register.registerIcon("mekanism:EliteFactoryTop"), 1), - DefIcon.getActivePair(register.registerIcon("mekanism:EliteFactoryBottom"), 0), - DefIcon.getActivePair(register.registerIcon("mekanism:EliteFactorySide"), 3, 4, 5)); + MekanismRenderer.loadDynamicTextures(register, "factory/basic/" + BaseTier.BASIC.getName() + type.getUnlocalizedName() + MachineType.BASIC_FACTORY.name, factoryIcons[0][type.ordinal()], + DefIcon.getActivePair(register.registerIcon("mekanism:factory/basic/BasicFactoryFront"), 2), + DefIcon.getActivePair(register.registerIcon("mekanism:factory/basic/BasicFactoryTop"), 1), + DefIcon.getActivePair(register.registerIcon("mekanism:factory/basic/BasicFactoryBottom"), 0), + DefIcon.getActivePair(register.registerIcon("mekanism:factory/basic/BasicFactorySide"), 3, 4, 5)); + MekanismRenderer.loadDynamicTextures(register, "factory/advanced/" + BaseTier.ADVANCED.getName() + type.getUnlocalizedName() + MachineType.ADVANCED_FACTORY.name, factoryIcons[1][type.ordinal()], + DefIcon.getActivePair(register.registerIcon("mekanism:factory/advanced/AdvancedFactoryFront"), 2), + DefIcon.getActivePair(register.registerIcon("mekanism:factory/advanced/AdvancedFactoryTop"), 1), + DefIcon.getActivePair(register.registerIcon("mekanism:factory/advanced/AdvancedFactoryBottom"), 0), + DefIcon.getActivePair(register.registerIcon("mekanism:factory/advanced/AdvancedFactorySide"), 3, 4, 5)); + MekanismRenderer.loadDynamicTextures(register, "factory/elite/" + BaseTier.ELITE.getName() + type.getUnlocalizedName() + MachineType.ELITE_FACTORY.name, factoryIcons[2][type.ordinal()], + DefIcon.getActivePair(register.registerIcon("mekanism:factory/elite/EliteFactoryFront"), 2), + DefIcon.getActivePair(register.registerIcon("mekanism:factory/elite/EliteFactoryTop"), 1), + DefIcon.getActivePair(register.registerIcon("mekanism:factory/elite/EliteFactoryBottom"), 0), + DefIcon.getActivePair(register.registerIcon("mekanism:factory/elite/EliteFactorySide"), 3, 4, 5)); } - MekanismRenderer.loadDynamicTextures(register, MachineType.PURIFICATION_CHAMBER.name, icons[9], def); - MekanismRenderer.loadDynamicTextures(register, MachineType.ENERGIZED_SMELTER.name, icons[10], def); + MekanismRenderer.loadDynamicTextures(register, "purification_chamber/" + MachineType.PURIFICATION_CHAMBER.name, icons[9], def); + MekanismRenderer.loadDynamicTextures(register, "energized_smelter/" + MachineType.ENERGIZED_SMELTER.name, icons[10], def); icons[11][0] = ctms[11][0].mainTextureData.icon; + break; case MACHINE_BLOCK_2: - MekanismRenderer.loadDynamicTextures(register, MachineType.CHEMICAL_INJECTION_CHAMBER.name, icons[3], def); - MekanismRenderer.loadDynamicTextures(register, MachineType.PRECISION_SAWMILL.name, icons[5], def); + MekanismRenderer.loadDynamicTextures(register, "chemical_injection_chamber/" + MachineType.CHEMICAL_INJECTION_CHAMBER.name, icons[3], def); + MekanismRenderer.loadDynamicTextures(register, "precision_sawmill/" + MachineType.PRECISION_SAWMILL.name, icons[5], def); + break; case MACHINE_BLOCK_3: icons[0][0] = BASE_ICON; icons[2][0] = BASE_ICON; icons[4][0] = BASE_ICON; icons[5][0] = BASE_ICON; - MekanismRenderer.loadDynamicTextures(register, MachineType.OREDICTIONIFICATOR.name, icons[3], DefIcon.getAll(register.registerIcon("mekanism:OredictionificatorSide"))); + MekanismRenderer.loadDynamicTextures(register, "oredictionificator/" + MachineType.OREDICTIONIFICATOR.name, icons[3], DefIcon.getAll(register.registerIcon("mekanism:oredictionificator/OredictionificatorSide"))); + break; } } diff --git a/src/main/resources/assets/mekanism/textures/blocks/Chlorine.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/Chlorine.png.mcmeta deleted file mode 100644 index 4b721e09a..000000000 --- a/src/main/resources/assets/mekanism/textures/blocks/Chlorine.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation": { - "frametime": 2 - } -} diff --git a/src/main/resources/assets/mekanism/textures/blocks/InductionCasing.png b/src/main/resources/assets/mekanism/textures/blocks/InductionCasing.png deleted file mode 100644 index 0c77c335232e89a1a025d645166a0c88897051be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1149 zcmV-@1cLjCP)4Tx062|}Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p z4Tx062|}Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p zMJP~R+(n@x`~h54CSXnawlK(c+Av2`V%{H_c)@y9eCMcom)IExuIbSSFoLbAM4;BjaU?>ELQd zmudRLyl;T-0pA10GMb%1NjBcOdEW-3;bgNUYp4#GDq8R1;CZjaqVZx1TY<$NOrVCAzJ^%m! diff --git a/src/main/resources/assets/mekanism/textures/blocks/InductionCellBasic.png b/src/main/resources/assets/mekanism/textures/blocks/InductionCellBasic.png deleted file mode 100644 index 276f98c144ca4a01fb11a7f9dfc399bfdf60f898..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1584 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 B@4Wy3 diff --git a/src/main/resources/assets/mekanism/textures/blocks/InductionCellUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/InductionCellUltimate.png deleted file mode 100644 index b8dabeda9d6a4c782ee42aa226d3f7b2c98e1375..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1606 zcmV-M2D$l(P)4Tx062|}Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p z-2#HeMsB(@!_PVbc`m?p$0WGKkvOoSBCT7J|4qaiRF0xZO2vnN09 zFz~SmGAKMV11tZ;@D@xH;`6Zx6EvPE2fX_AgyCM-O0Z#hpC&L&;wyl&K@4O*jBQYr z0ainZV0prSh2fjfGyLj4af0R9Bp4XpKYY)?rUp?CVuJuOAH@Fk0wND9DIq*ea=y-M z21W%1h5tfALYT5hB7g31G9)#HGQ5BPp5fD{Pe?MDOg=t720=kVhC>}U7#>KS!c>4H zVq#*#z#{Wehe72J{<`2C!vSzGgM8K;RD#>r)$@N?UfD=V&LcJXAlq& zU?4RL2D~65D-D3+92D$oK%axaEnrA6USMD#Ck+r)4uEYzBS02{f*k}vY;plvX#k&P zq^1F)LjY95fwE!v$$D^B133c31_4mk0|A&Es2~DmLt+5YX#ivx$Y4+*11sr3Y?wHR zMwSEdi75w&YLuS)bO2-?NkEKEhCzly1+N}Zqm-y9FyeCn8w4xcVLl_o$7?%Oa=^=h zQ3s5Mz-S173nF6jD@YBf{Rje}Rul*j;)508Awa!y00AuK*7+>T(f|Me07*qoM6N<$ Ef)ID>R{#J2 diff --git a/src/main/resources/assets/mekanism/textures/blocks/InductionPortInput.png b/src/main/resources/assets/mekanism/textures/blocks/InductionPortInput.png deleted file mode 100644 index 33d963e1109447fe243dcd66a36f4317866fbd07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1388 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 M07*qoM6N<$g3Tx19RL6T diff --git a/src/main/resources/assets/mekanism/textures/blocks/InductionProviderBasic.png b/src/main/resources/assets/mekanism/textures/blocks/InductionProviderBasic.png deleted file mode 100644 index 9f5581eb05a2d6416b76e52d9c581d3ce64e6873..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2080 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 N002ovPDHLkV1nVK?gan< diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedFront.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinAdvancedFront.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinAdvancedFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedSide.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedSide.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinAdvancedSide.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedSide.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedTop.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedTop.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinAdvancedTop.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedTop.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedTopOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinAdvancedTopOn.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedTopOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinBasicFront.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinBasicFront.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinBasicFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinBasicFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinBasicSide.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicSide.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinBasicSide.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicSide.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinBasicTop.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicTop.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinBasicTop.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicTop.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinBasicTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicTopOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinBasicTopOn.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicTopOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinEliteFront.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinEliteFront.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinEliteFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinEliteFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinEliteSide.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteSide.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinEliteSide.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteSide.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinEliteTop.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteTop.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinEliteTop.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteTop.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinEliteTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteTopOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinEliteTopOn.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteTopOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinUltimateFront.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinUltimateFront.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinUltimateFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinUltimateFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinUltimateSide.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateSide.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinUltimateSide.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateSide.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinUltimateTop.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateTop.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinUltimateTop.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateTop.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinUltimateTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateTopOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BinUltimateTopOn.png rename to src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateTopOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ChemicalInjectionChamberFront.png b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ChemicalInjectionChamberFront.png rename to src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ChemicalInjectionChamberFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ChemicalInjectionChamberFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ChemicalInjectionChamberFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ChemicalInjectionChamberFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/CombinerFront.png b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/CombinerFront.png rename to src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/CombinerFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/CombinerFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/CombinerFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/CombinerFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/CrusherFront.png b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/CrusherFront.png rename to src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/CrusherFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/CrusherFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/CrusherFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/CrusherFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/EnergizedSmelterFront.png b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EnergizedSmelterFront.png rename to src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EnergizedSmelterFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EnergizedSmelterFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EnergizedSmelterFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EnergizedSmelterFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/EnrichmentChamberFront.png b/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EnrichmentChamberFront.png rename to src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EnrichmentChamberFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EnrichmentChamberFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCombiningFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCombiningFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedCombiningFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCombiningFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCombiningFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCombiningFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedCombiningFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCombiningFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCombiningFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCombiningFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedCombiningFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCombiningFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCompressingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCompressingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedCompressingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCompressingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCompressingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCompressingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedCompressingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCompressingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCompressingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCompressingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedCompressingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCompressingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCrushingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCrushingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedCrushingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCrushingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCrushingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCrushingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedCrushingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCrushingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCrushingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCrushingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedCrushingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCrushingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedEnrichingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedEnrichingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedEnrichingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedEnrichingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedEnrichingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedEnrichingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedEnrichingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedEnrichingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryBottom.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedFactoryBottom.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryBottom.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedFactorySide.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactorySide.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedFactorySide.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactorySide.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryTop.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedFactoryTop.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryTop.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedInjectingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedInjectingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedInjectingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedInjectingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedInjectingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedInjectingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedInjectingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedInjectingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedPurifyingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedPurifyingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedPurifyingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedPurifyingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedPurifyingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedPurifyingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedPurifyingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedPurifyingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedSmeltingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedSmeltingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedSmeltingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedSmeltingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedSmeltingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedSmeltingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedSmeltingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedSmeltingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedSmeltingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedSmeltingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedSmeltingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedSmeltingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicCombiningFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCombiningFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicCombiningFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCombiningFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicCombiningFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCombiningFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicCombiningFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCombiningFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicCombiningFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCombiningFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicCombiningFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCombiningFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicCompressingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCompressingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicCompressingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCompressingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicCompressingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCompressingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicCompressingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCompressingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicCompressingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCompressingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicCompressingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCompressingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicCrushingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCrushingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicCrushingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCrushingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicCrushingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCrushingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicCrushingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCrushingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicCrushingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCrushingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicCrushingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCrushingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicEnrichingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicEnrichingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicEnrichingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicEnrichingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicEnrichingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicEnrichingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicEnrichingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicEnrichingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryBottom.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicFactoryBottom.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryBottom.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicFactorySide.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactorySide.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicFactorySide.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactorySide.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryTop.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicFactoryTop.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryTop.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicInjectingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicInjectingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicInjectingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicInjectingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicInjectingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicInjectingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicInjectingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicInjectingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicPurifyingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicPurifyingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicPurifyingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicPurifyingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicPurifyingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicPurifyingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicPurifyingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicPurifyingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicSmeltingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicSmeltingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicSmeltingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicSmeltingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicSmeltingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicSmeltingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicSmeltingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicSmeltingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicSmeltingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicSmeltingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicSmeltingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicSmeltingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteCombiningFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCombiningFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteCombiningFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCombiningFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteCombiningFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCombiningFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteCombiningFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCombiningFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteCombiningFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCombiningFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteCombiningFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCombiningFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteCompressingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCompressingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteCompressingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCompressingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteCompressingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCompressingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteCompressingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCompressingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteCompressingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCompressingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteCompressingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCompressingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteCrushingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCrushingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteCrushingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCrushingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteCrushingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCrushingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteCrushingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCrushingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteCrushingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCrushingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteCrushingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCrushingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteEnrichingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteEnrichingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteEnrichingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteEnrichingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteEnrichingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteEnrichingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteEnrichingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteEnrichingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryBottom.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteFactoryBottom.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryBottom.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteFactorySide.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactorySide.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteFactorySide.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactorySide.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryTop.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteFactoryTop.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryTop.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteInjectingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteInjectingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteInjectingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteInjectingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteInjectingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteInjectingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteInjectingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteInjectingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ElitePurifyingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/ElitePurifyingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ElitePurifyingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/ElitePurifyingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ElitePurifyingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/ElitePurifyingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ElitePurifyingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/ElitePurifyingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteSmeltingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteSmeltingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteSmeltingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteSmeltingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteSmeltingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteSmeltingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteSmeltingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteSmeltingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteSmeltingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteSmeltingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteSmeltingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteSmeltingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidBrine.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidBrine.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidBrine.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidBrine.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidBrine.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidBrine.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidBrine.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidBrine.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidChlorine.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidChlorine.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidChlorine.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidChlorine.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidChlorine.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidChlorine.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidChlorine.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidChlorine.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidCleanOre.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidCleanOre.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidCleanOre.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidCleanOre.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidCleanOre.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidCleanOre.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidCleanOre.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidCleanOre.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidDT.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidDT.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidDT.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidDT.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidDT.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidDT.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidDT.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidDT.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidDeuterium.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidDeuterium.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidDeuterium.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidDeuterium.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidDeuterium.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidDeuterium.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidDeuterium.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidDeuterium.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidEnergy.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEnergy.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidEnergy.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEnergy.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidEnergy.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEnergy.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidEnergy.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEnergy.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidEnergyStatic.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEnergyStatic.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidEnergyStatic.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEnergyStatic.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidEthene.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEthene.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidEthene.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEthene.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidEthene.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEthene.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidEthene.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEthene.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidHeat.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHeat.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidHeat.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHeat.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidHeat.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHeat.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidHeat.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHeat.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidHeavyWater.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHeavyWater.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidHeavyWater.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHeavyWater.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidHeavyWater.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHeavyWater.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidHeavyWater.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHeavyWater.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidHydrogen.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHydrogen.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidHydrogen.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHydrogen.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidHydrogen.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHydrogen.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidHydrogen.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHydrogen.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidHydrogenChloride.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHydrogenChloride.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidHydrogenChloride.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHydrogenChloride.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidHydrogenChloride.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHydrogenChloride.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidHydrogenChloride.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHydrogenChloride.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidLithium.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidLithium.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidLithium.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidLithium.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidLithium.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidLithium.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidLithium.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidLithium.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidOre.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOre.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidOre.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOre.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidOre.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOre.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidOre.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOre.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidOsmium.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOsmium.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidOsmium.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOsmium.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidOsmium.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOsmium.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidOsmium.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOsmium.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidOxygen.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOxygen.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidOxygen.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOxygen.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidOxygen.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOxygen.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidOxygen.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOxygen.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSodium.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSodium.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSodium.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSodium.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSodium.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSodium.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSodium.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSodium.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSteam.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSteam.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSteam.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSteam.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSteam.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSteam.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSteam.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSteam.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidStone.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidStone.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidStone.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidStone.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidStone.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidStone.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidStone.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidStone.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSulfurDioxide.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfurDioxide.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSulfurDioxide.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfurDioxide.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSulfurDioxide.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfurDioxide.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSulfurDioxide.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfurDioxide.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSulfurTrioxide.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfurTrioxide.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSulfurTrioxide.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfurTrioxide.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSulfurTrioxide.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfurTrioxide.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSulfurTrioxide.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfurTrioxide.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSulfuricAcid.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfuricAcid.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSulfuricAcid.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfuricAcid.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSulfuricAcid.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfuricAcid.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSulfuricAcid.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfuricAcid.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidTritium.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidTritium.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidTritium.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidTritium.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidTritium.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidTritium.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidTritium.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidTritium.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/OredictionificatorBack.png b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorBack.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/OredictionificatorBack.png rename to src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorBack.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/OredictionificatorFront.png b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/OredictionificatorFront.png rename to src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/OredictionificatorLeft.png b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorLeft.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/OredictionificatorLeft.png rename to src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorLeft.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/OredictionificatorRight.png b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorRight.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/OredictionificatorRight.png rename to src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorRight.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/OredictionificatorSide.png b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorSide.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/OredictionificatorSide.png rename to src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorSide.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/OsmiumCompressorFront.png b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/OsmiumCompressorFront.png rename to src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/OsmiumCompressorFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/OsmiumCompressorFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/OsmiumCompressorFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/OsmiumCompressorFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/PrecisionSawmillFront.png b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/PrecisionSawmillFront.png rename to src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/PrecisionSawmillFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/PrecisionSawmillFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/PrecisionSawmillFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/PrecisionSawmillFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/PurificationChamberFront.png b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/PurificationChamberFront.png rename to src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/PurificationChamberFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/PurificationChamberFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/PurificationChamberFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/PurificationChamberFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberFrontOn.png.mcmeta From df3762dc1bc2cc33ca4d12b77e997d3e581e1806 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 23 Mar 2016 15:43:14 -0400 Subject: [PATCH 15/62] Add dynamic texture rendering to Formulaic Assemblicator --- src/main/java/mekanism/common/block/BlockMachine.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 86ff01927..d079118cb 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -228,9 +228,9 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo case MACHINE_BLOCK_3: icons[0][0] = BASE_ICON; icons[2][0] = BASE_ICON; - icons[4][0] = BASE_ICON; - icons[5][0] = BASE_ICON; MekanismRenderer.loadDynamicTextures(register, "oredictionificator/" + MachineType.OREDICTIONIFICATOR.name, icons[3], DefIcon.getAll(register.registerIcon("mekanism:oredictionificator/OredictionificatorSide"))); + icons[4][0] = BASE_ICON; + MekanismRenderer.loadDynamicTextures(register, "formulaic_assemblicator/" + MachineType.FORMULAIC_ASSEMBLICATOR.name, icons[5], DefIcon.getAll(register.registerIcon("mekanism:formulaic_assemblicator/FormulaicAssemblicatorSide"))); break; } From b3954b88ee2f54f868506ce14835bfd04aa3b2ce Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 23 Mar 2016 16:16:03 -0400 Subject: [PATCH 16/62] Further organized factory textures --- .../java/mekanism/common/block/BlockMachine.java | 6 +++--- .../AdvancedCombiningFactoryFront.png | Bin .../AdvancedCombiningFactoryFrontOn.png | Bin .../AdvancedCombiningFactoryFrontOn.png.mcmeta | 0 .../AdvancedCompressingFactoryFront.png | Bin .../AdvancedCompressingFactoryFrontOn.png | Bin .../AdvancedCompressingFactoryFrontOn.png.mcmeta | 0 .../{ => crushing}/AdvancedCrushingFactoryFront.png | Bin .../AdvancedCrushingFactoryFrontOn.png | Bin .../AdvancedCrushingFactoryFrontOn.png.mcmeta | 0 .../AdvancedEnrichingFactoryFront.png | Bin .../AdvancedEnrichingFactoryFrontOn.png | Bin .../AdvancedInjectingFactoryFront.png | Bin .../AdvancedInjectingFactoryFrontOn.png | Bin .../AdvancedPurifyingFactoryFront.png | Bin .../AdvancedPurifyingFactoryFrontOn.png | Bin .../{ => smelting}/AdvancedSmeltingFactoryFront.png | Bin .../AdvancedSmeltingFactoryFrontOn.png | Bin .../AdvancedSmeltingFactoryFrontOn.png.mcmeta | 0 .../{ => combining}/BasicCombiningFactoryFront.png | Bin .../BasicCombiningFactoryFrontOn.png | Bin .../BasicCombiningFactoryFrontOn.png.mcmeta | 0 .../BasicCompressingFactoryFront.png | Bin .../BasicCompressingFactoryFrontOn.png | Bin .../BasicCompressingFactoryFrontOn.png.mcmeta | 0 .../{ => crushing}/BasicCrushingFactoryFront.png | Bin .../{ => crushing}/BasicCrushingFactoryFrontOn.png | Bin .../BasicCrushingFactoryFrontOn.png.mcmeta | 0 .../{ => enriching}/BasicEnrichingFactoryFront.png | Bin .../BasicEnrichingFactoryFrontOn.png | Bin .../{ => injecting}/BasicInjectingFactoryFront.png | Bin .../BasicInjectingFactoryFrontOn.png | Bin .../{ => purifying}/BasicPurifyingFactoryFront.png | Bin .../BasicPurifyingFactoryFrontOn.png | Bin .../{ => smelting}/BasicSmeltingFactoryFront.png | Bin .../{ => smelting}/BasicSmeltingFactoryFrontOn.png | Bin .../BasicSmeltingFactoryFrontOn.png.mcmeta | 0 .../{ => combining}/EliteCombiningFactoryFront.png | Bin .../EliteCombiningFactoryFrontOn.png | Bin .../EliteCombiningFactoryFrontOn.png.mcmeta | 0 .../EliteCompressingFactoryFront.png | Bin .../EliteCompressingFactoryFrontOn.png | Bin .../EliteCompressingFactoryFrontOn.png.mcmeta | 0 .../{ => crushing}/EliteCrushingFactoryFront.png | Bin .../{ => crushing}/EliteCrushingFactoryFrontOn.png | Bin .../EliteCrushingFactoryFrontOn.png.mcmeta | 0 .../{ => enriching}/EliteEnrichingFactoryFront.png | Bin .../EliteEnrichingFactoryFrontOn.png | Bin .../{ => injecting}/EliteInjectingFactoryFront.png | Bin .../EliteInjectingFactoryFrontOn.png | Bin .../{ => purifying}/ElitePurifyingFactoryFront.png | Bin .../ElitePurifyingFactoryFrontOn.png | Bin .../{ => smelting}/EliteSmeltingFactoryFront.png | Bin .../{ => smelting}/EliteSmeltingFactoryFrontOn.png | Bin .../EliteSmeltingFactoryFrontOn.png.mcmeta | 0 55 files changed, 3 insertions(+), 3 deletions(-) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => combining}/AdvancedCombiningFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => combining}/AdvancedCombiningFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => combining}/AdvancedCombiningFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => compressing}/AdvancedCompressingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => compressing}/AdvancedCompressingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => compressing}/AdvancedCompressingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => crushing}/AdvancedCrushingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => crushing}/AdvancedCrushingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => crushing}/AdvancedCrushingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => enriching}/AdvancedEnrichingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => enriching}/AdvancedEnrichingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => injecting}/AdvancedInjectingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => injecting}/AdvancedInjectingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => purifying}/AdvancedPurifyingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => purifying}/AdvancedPurifyingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => smelting}/AdvancedSmeltingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => smelting}/AdvancedSmeltingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/advanced/{ => smelting}/AdvancedSmeltingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => combining}/BasicCombiningFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => combining}/BasicCombiningFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => combining}/BasicCombiningFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => compressing}/BasicCompressingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => compressing}/BasicCompressingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => compressing}/BasicCompressingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => crushing}/BasicCrushingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => crushing}/BasicCrushingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => crushing}/BasicCrushingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => enriching}/BasicEnrichingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => enriching}/BasicEnrichingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => injecting}/BasicInjectingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => injecting}/BasicInjectingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => purifying}/BasicPurifyingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => purifying}/BasicPurifyingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => smelting}/BasicSmeltingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => smelting}/BasicSmeltingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/basic/{ => smelting}/BasicSmeltingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => combining}/EliteCombiningFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => combining}/EliteCombiningFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => combining}/EliteCombiningFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => compressing}/EliteCompressingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => compressing}/EliteCompressingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => compressing}/EliteCompressingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => crushing}/EliteCrushingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => crushing}/EliteCrushingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => crushing}/EliteCrushingFactoryFrontOn.png.mcmeta (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => enriching}/EliteEnrichingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => enriching}/EliteEnrichingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => injecting}/EliteInjectingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => injecting}/EliteInjectingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => purifying}/ElitePurifyingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => purifying}/ElitePurifyingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => smelting}/EliteSmeltingFactoryFront.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => smelting}/EliteSmeltingFactoryFrontOn.png (100%) rename src/main/resources/assets/mekanism/textures/blocks/factory/elite/{ => smelting}/EliteSmeltingFactoryFrontOn.png.mcmeta (100%) diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index d079118cb..87b099687 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -198,17 +198,17 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo for(RecipeType type : RecipeType.values()) { - MekanismRenderer.loadDynamicTextures(register, "factory/basic/" + BaseTier.BASIC.getName() + type.getUnlocalizedName() + MachineType.BASIC_FACTORY.name, factoryIcons[0][type.ordinal()], + MekanismRenderer.loadDynamicTextures(register, "factory/basic/" + type.getUnlocalizedName().toLowerCase() + "/" + BaseTier.BASIC.getName() + type.getUnlocalizedName() + MachineType.BASIC_FACTORY.name, factoryIcons[0][type.ordinal()], DefIcon.getActivePair(register.registerIcon("mekanism:factory/basic/BasicFactoryFront"), 2), DefIcon.getActivePair(register.registerIcon("mekanism:factory/basic/BasicFactoryTop"), 1), DefIcon.getActivePair(register.registerIcon("mekanism:factory/basic/BasicFactoryBottom"), 0), DefIcon.getActivePair(register.registerIcon("mekanism:factory/basic/BasicFactorySide"), 3, 4, 5)); - MekanismRenderer.loadDynamicTextures(register, "factory/advanced/" + BaseTier.ADVANCED.getName() + type.getUnlocalizedName() + MachineType.ADVANCED_FACTORY.name, factoryIcons[1][type.ordinal()], + MekanismRenderer.loadDynamicTextures(register, "factory/advanced/" + type.getUnlocalizedName().toLowerCase() + "/" + BaseTier.ADVANCED.getName() + type.getUnlocalizedName() + MachineType.ADVANCED_FACTORY.name, factoryIcons[1][type.ordinal()], DefIcon.getActivePair(register.registerIcon("mekanism:factory/advanced/AdvancedFactoryFront"), 2), DefIcon.getActivePair(register.registerIcon("mekanism:factory/advanced/AdvancedFactoryTop"), 1), DefIcon.getActivePair(register.registerIcon("mekanism:factory/advanced/AdvancedFactoryBottom"), 0), DefIcon.getActivePair(register.registerIcon("mekanism:factory/advanced/AdvancedFactorySide"), 3, 4, 5)); - MekanismRenderer.loadDynamicTextures(register, "factory/elite/" + BaseTier.ELITE.getName() + type.getUnlocalizedName() + MachineType.ELITE_FACTORY.name, factoryIcons[2][type.ordinal()], + MekanismRenderer.loadDynamicTextures(register, "factory/elite/" + type.getUnlocalizedName().toLowerCase() + "/" + BaseTier.ELITE.getName() + type.getUnlocalizedName() + MachineType.ELITE_FACTORY.name, factoryIcons[2][type.ordinal()], DefIcon.getActivePair(register.registerIcon("mekanism:factory/elite/EliteFactoryFront"), 2), DefIcon.getActivePair(register.registerIcon("mekanism:factory/elite/EliteFactoryTop"), 1), DefIcon.getActivePair(register.registerIcon("mekanism:factory/elite/EliteFactoryBottom"), 0), diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCombiningFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCombiningFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCombiningFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCombiningFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCombiningFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCombiningFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCompressingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCompressingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCompressingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCompressingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCompressingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCompressingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCrushingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCrushingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCrushingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCrushingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCrushingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedCrushingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedEnrichingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedEnrichingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedEnrichingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedEnrichingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedInjectingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedInjectingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedInjectingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedInjectingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedPurifyingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedPurifyingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedPurifyingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedPurifyingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedSmeltingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedSmeltingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedSmeltingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedSmeltingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedSmeltingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedSmeltingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCombiningFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCombiningFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCombiningFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCombiningFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCombiningFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCombiningFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCompressingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCompressingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCompressingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCompressingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCompressingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCompressingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCrushingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCrushingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCrushingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCrushingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCrushingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicCrushingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicEnrichingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicEnrichingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicEnrichingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicEnrichingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicInjectingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicInjectingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicInjectingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicInjectingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicPurifyingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicPurifyingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicPurifyingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicPurifyingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicSmeltingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicSmeltingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicSmeltingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicSmeltingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicSmeltingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicSmeltingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCombiningFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCombiningFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCombiningFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCombiningFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCombiningFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCombiningFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCompressingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCompressingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCompressingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCompressingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCompressingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCompressingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCrushingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCrushingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCrushingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCrushingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCrushingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteCrushingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteEnrichingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteEnrichingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteEnrichingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteEnrichingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteInjectingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteInjectingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteInjectingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteInjectingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/ElitePurifyingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/ElitePurifyingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/ElitePurifyingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/ElitePurifyingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteSmeltingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteSmeltingFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteSmeltingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteSmeltingFactoryFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteSmeltingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteSmeltingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFrontOn.png.mcmeta From 44d9aa506fab624e401f6dec714f83c1d4a3b3ec Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 23 Mar 2016 17:35:03 -0400 Subject: [PATCH 17/62] A few Formulaic Assemblicator fixes --- .../client/gui/GuiFormulaicAssemblicator.java | 7 +-- .../content/assemblicator/RecipeFormula.java | 4 +- .../common/tile/TileEntityContainerBlock.java | 2 + .../TileEntityFormulaicAssemblicator.java | 56 +++++++++++------- .../assets/mekanism/gui/elements/GuiSlot.png | Bin 3010 -> 3192 bytes 5 files changed, 40 insertions(+), 29 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java index 3bf3c1b9c..892dafea9 100644 --- a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java +++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java @@ -182,11 +182,8 @@ public class GuiFormulaicAssemblicator extends GuiMekanism drawTexturedModalRect(guiWidth + 86, guiHeight + 43, 176, 48, display, 16); } - if(tileEntity.isRecipe) - { - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, "GuiSlot.png")); - drawTexturedModalRect(guiWidth + 90, guiHeight + 25, 2, 39, 14, 12); - } + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, "GuiSlot.png")); + drawTexturedModalRect(guiWidth + 90, guiHeight + 25, tileEntity.isRecipe ? 2 : 20, 39, 14, 12); if(tileEntity.formula != null) { diff --git a/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java b/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java index 79b4a5278..4f7ac2d6f 100644 --- a/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java +++ b/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java @@ -35,7 +35,7 @@ public class RecipeFormula } } - public boolean matches(World world, ItemStack[] input, int start) + public boolean matches(World world, ItemStack[] newInput, int start) { resetToRecipe(); @@ -43,7 +43,7 @@ public class RecipeFormula for(int i = 0; i < 9; i++) { - dummy.setInventorySlotContents(i, input[start+i]); + dummy.setInventorySlotContents(i, newInput[start+i]); } IRecipe newRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); diff --git a/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java b/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java index 478cfaa08..7cc33fd44 100644 --- a/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java @@ -139,6 +139,8 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl { itemstack.stackSize = getInventoryStackLimit(); } + + markDirty(); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java index 69bd444dd..2059a295b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -51,6 +51,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im public int pulseOperations; public RecipeFormula formula; + public RecipeFormula prevFormula; public RedstoneControl controlType = RedstoneControl.DISABLED; @@ -59,7 +60,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im public TileComponentConfig configComponent; public TileComponentSecurity securityComponent; - public TileEntityFormulaicAssemblicator() + public TileEntityFormulaicAssemblicator() { super("FormulaicAssemblicator", MachineType.FORMULAIC_ASSEMBLICATOR.baseEnergy); @@ -135,29 +136,17 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im formula = null; } + if(formula != prevFormula) + { + prevFormula = formula; + markDirty(); + } + if(autoMode && formula == null) { toggleAutoMode(); } - if(formula == null) - { - if(autoMode) - { - toggleAutoMode(); - } - - for(int i = 0; i < 9; i++) - { - dummyInv.setInventorySlotContents(i, inventory[27+i]); - } - - isRecipe = MekanismUtils.findMatchingRecipe(dummyInv, worldObj) != null; - } - else { - isRecipe = formula.matches(worldObj, inventory, 27); - } - if(autoMode && formula != null && ((controlType == RedstoneControl.PULSE && pulseOperations > 0) || MekanismUtils.canFunction(this))) { boolean canOperate = true; @@ -201,6 +190,25 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im } } + @Override + public void markDirty() + { + super.markDirty(); + + if(formula == null) + { + for(int i = 0; i < 9; i++) + { + dummyInv.setInventorySlotContents(i, inventory[27+i]); + } + + isRecipe = MekanismUtils.findMatchingRecipe(dummyInv, worldObj) != null; + } + else { + isRecipe = formula.matches(worldObj, inventory, 27); + } + } + private boolean doSingleCraft() { for(int i = 0; i < 9; i++) @@ -295,6 +303,8 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im private boolean moveItemsToGrid() { + boolean ret = true; + for(int i = 27; i <= 35; i++) { if(formula.isIngredientInPos(worldObj, inventory[i], i-27)) @@ -309,7 +319,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im if(inventory[i] != null) { - return false; + ret = false; } } else { @@ -336,12 +346,12 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im if(!found) { - return false; + ret = false; } } } - return true; + return ret; } private void craftAll() @@ -358,6 +368,8 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im inventory[i] = tryMoveToInput(inventory[i]); } } + + markDirty(); } private void toggleAutoMode() diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiSlot.png b/src/main/resources/assets/mekanism/gui/elements/GuiSlot.png index f744d4476705d4c6d178e87020e5558311ee994c..a8121bb15784b83f7cb11fb5e6d018f1d0147f76 100644 GIT binary patch delta 2241 zcmV;y2tN117x);EBYy-9X+uL$Nkc;*P;zf(X>4Tx062|}Rb6NtRTMtEb7vzY&QokO zg>Hg1+lHrgWSWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@ z+di}}l?o-=)F3E6wD^Ni=!>T7nL9I?X}YoAW$t|Qo$sD|?ti&w?*-_&s#unh6af~R zt}Pcb;&X?Oh&?NigomIP2BB9`9V=a_OaeAf3wO0!-$TNCU)j~&{-3S4MjaI(aUWu{ z=BNvZj{)$fRm*k(dis$cKk8Z@_G0L_F+jvGdbr_Z*TZu@evN5nWtO z;Zej(s*;~Z{0QP}ZGE;J;MNT3ndwE3s`n-8a z_I+}nIqm6u=<|e@EeHIimz0AQ#Dj=`p+-UW=i>gc+)5Aw8EP8kNq;VqqYhgy<6Uj0 z=+8?G7dO-&OBU<;fl{FVM6-)>fUj8wt5J-NPueZH>g)MY#m*OepL~TjtAT&M4YLUa zD3~yZy?+W#SOXDcC_o0^7T9R1gAN8V6s;5)ieI5-7aQlmJn}lUna#nz!j%5V$X|o` zxX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?ZvKPDL<64`^#UNTAck#RBsB6*5DP4<%< zvJ+(Q`q)ZrMP58N*8RMUGg79TMcp~HyP#nIGk+>fTvOMqEDpAYBg-lK1zo-T#$T~q z=`1%wHmU-|3&GWIL{YNX(Qxa>rWCyRuBf>}*(bcU2l~2ICg+(V4}G z#U1l;@#I$zMt+vbndh(cT|8NDE)GVlmj(K2`BoWDjYO>UgY<{AEWIavDE-F0&3(#! z&3}E)eZgG6#@QDHLj zCkzNR&Px>zCja= zBtvA3lr~iNxL5O`B9%|&QfUxVJ5v*>v47M-4~Mg+cA#wn`}`f%scy1T>e6H0eF9n2 zI&SL?%@ub`(vxBuuQn={n(F9?s2GOGOpa(%huUpg8wKy)^pEtLGP@5GTP{bO`wYOo zKk@AQF5-@~0G1qpfyX0m7|+TF-UT@Ggxa#(!5xuEd<)>z_w4q+`Z9Qa{nY8)#D8H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%YCP_p=RCodH-8+jURTKc=+q=t( zMh3nX5kyd7K-ff+MNJk1nVlaXh_M)nAZ=tg4dNpi#K<48hNFR)m>7t`f|-H{A|?h4 zg0jmF<=h_baC^3Es;6&xtJ?hvnt$%D$GNA!nschUXS!yxwYAlR!f9t`C+vMSD~uAt z#b+ns+Vx3soJYdB@MU z-YIY)t`Q5kWZK=`oi~8DUY(YN312+_K?v8I@YwX-qBt+jK00gwAzYh2Tz?ej=Ir%( z1DH-4WI`^AqZ@$fCjLsdrsa2dJvdj6}X2uogucjx9681-{0Ra`tawc=7ELFnE&wI zL3r)Ttuw_;xum4m&8e?ADG&DqY710r0DZi$Sp2cz^XbR$7oX?L+8)P(PsLkO{3o}K zF;C8G%fWmCV-VPw27l02{JU@8In&X9IP_Y7Pf%-|;UtaRpTN=vkdBUR!>oFgTNWpu zw`!ba#UFEf?uGN=y^lk)8BHMmC!AXU45QXKZ9gIAZ;HUu1~9hdpPBqUKg#EgAf5Ve zM)8kLR6Ycb1eP{{RgcVFh5jg*tuTY_U02HP$sbU6@g;$AN+Nvb@X4F+u^h(5SPVuOaurFC$QF^ z0;l5t^V^%P+ouA5YH~5W()_WoURw6^?5LZZrp0Awdo#nJY-##7vn! zo^H+uzxvCCJSH%lz;Ofk_0!)c_djvpLK8^EzixVY@yB9M`{PX$SXa|_1o{`a>ob7( zR^XrCZY_+o&e8v5@#g{K89+P}@OeP4;xU2x0(Uilm_ptJ`Y!(T5;cJ&;hw;70>^Iw z@)XkBf%ukS)nE7J+sDW8*M6t{kxzO%aB@4(39~T>c>|Mx2pk#y#{&NXjogtB1G*@G P00000NkvXXu0mjf#JXP^ delta 2057 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 From 4a78cb65b11fac7403a12ba141f34c5228a929ca Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 23 Mar 2016 19:51:37 -0400 Subject: [PATCH 18/62] Digital Miner now only accepts cable connections on certain sides --- .../common/base/IAdvancedBoundingBlock.java | 3 +++ .../tile/TileEntityAdvancedBoundingBlock.java | 10 +++---- .../common/tile/TileEntityDigitalMiner.java | 27 ++++++++++++++++++- .../TileEntityFormulaicAssemblicator.java | 7 ----- 4 files changed, 34 insertions(+), 13 deletions(-) diff --git a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java index 453921f84..45089a060 100644 --- a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java @@ -9,6 +9,7 @@ import mekanism.common.integration.IComputerIntegration; import mekanism.common.security.ISecurityTile; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyHandler; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; @@ -23,6 +24,8 @@ public interface IAdvancedBoundingBlock extends IBoundingBlock, ISidedInventory, public boolean canBoundInsert(Coord4D location, int i, ItemStack itemstack); public boolean canBoundExtract(Coord4D location, int i, ItemStack itemstack, int j); + + public boolean canBoundReceiveEnergy(Coord4D location, ForgeDirection side); public void onPower(); diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java index e52780302..11494c7f4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java @@ -198,7 +198,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp @Override public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - if(getInv() == null) + if(getInv() == null || !canReceiveEnergy(from)) { return 0; } @@ -225,7 +225,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp return false; } - return getInv().canConnectEnergy(from); + return canReceiveEnergy(from); } @Override @@ -286,7 +286,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp @Override public double transferEnergyToAcceptor(ForgeDirection side, double amount) { - if(getInv() == null) + if(getInv() == null || !canReceiveEnergy(side)) { return 0; } @@ -302,7 +302,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp return false; } - return getInv().canReceiveEnergy(side); + return getInv().canBoundReceiveEnergy(Coord4D.get(this), side); } @Override @@ -321,7 +321,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp @Method(modid = "IC2") public double injectEnergy(ForgeDirection directionFrom, double amount, double voltage) { - if(getInv() == null) + if(getInv() == null || !canReceiveEnergy(directionFrom)) { return amount; } diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index d70894fe0..ec388369a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -4,6 +4,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.BitSet; +import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -1099,7 +1100,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I @Override public boolean lightUpdate() { - return true; + return false; } @Override @@ -1491,6 +1492,30 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I break; } } + + @Override + public boolean canBoundReceiveEnergy(Coord4D coord, ForgeDirection side) + { + ForgeDirection left = MekanismUtils.getLeft(facing); + ForgeDirection right = MekanismUtils.getRight(facing); + + if(coord.equals(Coord4D.get(this).getFromSide(left))) + { + return side == left; + } + else if(coord.equals(Coord4D.get(this).getFromSide(right))) + { + return side == right; + } + + return false; + } + + @Override + public EnumSet getConsumingSides() + { + return EnumSet.of(MekanismUtils.getLeft(facing), MekanismUtils.getRight(facing), ForgeDirection.DOWN); + } @Override public TileComponentSecurity getSecurity() diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java index 2059a295b..ad80eece1 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -51,7 +51,6 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im public int pulseOperations; public RecipeFormula formula; - public RecipeFormula prevFormula; public RedstoneControl controlType = RedstoneControl.DISABLED; @@ -136,12 +135,6 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im formula = null; } - if(formula != prevFormula) - { - prevFormula = formula; - markDirty(); - } - if(autoMode && formula == null) { toggleAutoMode(); From 9d22b7277c2e740be84c7a16ce8d2c8f8e047515 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 24 Mar 2016 00:33:28 -0400 Subject: [PATCH 19/62] Added new models --- .../mekanism/client/model/ModelChargepad.java | 101 +++--- .../mekanism/client/model/ModelGasTank.java | 141 +++++--- .../client/model/ModelMetallurgicInfuser.java | 341 +++++++----------- .../ModelPressurizedReactionChamber.java | 256 ++++++------- .../render/block/MachineRenderingHandler.java | 2 +- .../render/item/ItemRenderingHandler.java | 2 +- .../render/tileentity/RenderGasTank.java | 8 +- .../mekanism/common/block/BlockMachine.java | 2 +- .../tile/TileEntityMetallurgicInfuser.java | 7 +- .../client/BlockRenderingHandler.java | 11 +- .../client/model/ModelBioGenerator.java | 195 +++------- .../client/model/ModelGasGenerator.java | 310 ++++++++-------- .../client/model/ModelHeatGenerator.java | 257 ++++++------- .../client/model/ModelSolarGenerator.java | 4 +- .../client/render/RenderBioGenerator.java | 80 ++-- .../client/render/RenderGasGenerator.java | 8 +- .../client/render/RenderHeatGenerator.java | 8 +- .../common/block/BlockGenerator.java | 16 +- .../common/tile/TileEntityBioGenerator.java | 7 - .../assets/mekanism/render/BioGenerator.png | Bin 5331 -> 5595 bytes .../assets/mekanism/render/Chargepad.png | Bin 4717 -> 3389 bytes .../assets/mekanism/render/GasGenerator.png | Bin 3596 -> 5356 bytes .../mekanism/render/GasTankAdvanced.png | Bin 3245 -> 3928 bytes .../assets/mekanism/render/GasTankBasic.png | Bin 3241 -> 3953 bytes .../assets/mekanism/render/GasTankElite.png | Bin 3231 -> 3980 bytes .../mekanism/render/GasTankUltimate.png | Bin 3238 -> 3201 bytes .../assets/mekanism/render/HeatGenerator.png | Bin 2783 -> 4941 bytes .../mekanism/render/HeatGeneratorOn.png | Bin 4747 -> 6283 bytes .../mekanism/render/MetallurgicInfuser.png | Bin 5108 -> 7098 bytes .../render/PressurizedReactionChamber.png | Bin 3747 -> 5404 bytes 30 files changed, 800 insertions(+), 956 deletions(-) mode change 100755 => 100644 src/main/resources/assets/mekanism/render/PressurizedReactionChamber.png diff --git a/src/main/java/mekanism/client/model/ModelChargepad.java b/src/main/java/mekanism/client/model/ModelChargepad.java index fe998d34a..6755ec719 100644 --- a/src/main/java/mekanism/client/model/ModelChargepad.java +++ b/src/main/java/mekanism/client/model/ModelChargepad.java @@ -8,56 +8,73 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelChargepad extends ModelBase { - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape3; - ModelRenderer Shape4; - ModelRenderer Shape5; + ModelRenderer base; + ModelRenderer port; + ModelRenderer plug; + ModelRenderer connector; + ModelRenderer stand; + ModelRenderer pillar2; + ModelRenderer pillar1; - public ModelChargepad() + public ModelChargepad() { textureWidth = 64; textureHeight = 64; - Shape1 = new ModelRenderer(this, 0, 0); - Shape1.addBox(0F, 0F, 0F, 16, 1, 16); - Shape1.setRotationPoint(-8F, 23F, -8F); - Shape1.setTextureSize(64, 64); - Shape1.mirror = true; - setRotation(Shape1, 0F, 0F, 0F); - Shape2 = new ModelRenderer(this, 0, 18); - Shape2.addBox(0F, 0F, 0F, 8, 11, 2); - Shape2.setRotationPoint(-4F, 12F, 6F); - Shape2.setTextureSize(64, 64); - Shape2.mirror = true; - setRotation(Shape2, 0F, 0F, 0F); - Shape3 = new ModelRenderer(this, 0, 0); - Shape3.addBox(0F, 0F, 0F, 4, 3, 1); - Shape3.setRotationPoint(-2F, 14F, 5F); - Shape3.setTextureSize(64, 64); - Shape3.mirror = true; - setRotation(Shape3, 0F, 0F, 0F); - Shape4 = new ModelRenderer(this, 3, 8); - Shape4.addBox(0F, 0F, 0F, 2, 5, 2); - Shape4.setRotationPoint(-5F, 18F, 5F); - Shape4.setTextureSize(64, 64); - Shape4.mirror = true; - setRotation(Shape4, 0F, 0F, 0F); - Shape5 = new ModelRenderer(this, 3, 8); - Shape5.addBox(0F, 0F, 0F, 2, 5, 2); - Shape5.setRotationPoint(3F, 18F, 5F); - Shape5.setTextureSize(64, 64); - Shape5.mirror = true; - setRotation(Shape5, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 1, 16); + base.setRotationPoint(-8F, 23F, -8F); + base.setTextureSize(64, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + port = new ModelRenderer(this, 0, 17); + port.addBox(0F, 0F, 0F, 8, 8, 1); + port.setRotationPoint(-4F, 12F, 7F); + port.setTextureSize(64, 64); + port.mirror = true; + setRotation(port, 0F, 0F, 0F); + plug = new ModelRenderer(this, 0, 11); + plug.addBox(0F, 0F, 0F, 2, 1, 2); + plug.setRotationPoint(-1F, 19F, 3F); + plug.setTextureSize(64, 64); + plug.mirror = true; + setRotation(plug, 0F, 0F, 0F); + connector = new ModelRenderer(this, 18, 17); + connector.addBox(0F, 0F, 0F, 6, 6, 1); + connector.setRotationPoint(-3F, 13F, 6F); + connector.setTextureSize(64, 64); + connector.mirror = true; + setRotation(connector, 0F, 0F, 0F); + stand = new ModelRenderer(this, 0, 0); + stand.addBox(0F, 0F, 0F, 6, 10, 1); + stand.setRotationPoint(-3F, 13F, 5F); + stand.setTextureSize(64, 64); + stand.mirror = true; + setRotation(stand, 0F, 0F, 0F); + pillar2 = new ModelRenderer(this, 48, 0); + pillar2.addBox(0F, 0F, 0F, 2, 7, 2); + pillar2.setRotationPoint(2F, 16F, 3.99F); + pillar2.setTextureSize(64, 64); + pillar2.mirror = true; + setRotation(pillar2, 0F, 0F, 0F); + pillar2.mirror = false; + pillar1 = new ModelRenderer(this, 48, 0); + pillar1.addBox(0F, 0F, 0F, 2, 7, 2); + pillar1.setRotationPoint(-4F, 16F, 3.99F); + pillar1.setTextureSize(64, 64); + pillar1.mirror = true; + setRotation(pillar1, 0F, 0F, 0F); } - public void render(float size) + public void render(float size) { - Shape1.render(size); - Shape2.render(size); - Shape3.render(size); - Shape4.render(size); - Shape5.render(size); + base.render(size); + port.render(size); + plug.render(size); + connector.render(size); + stand.render(size); + pillar2.render(size); + pillar1.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelGasTank.java b/src/main/java/mekanism/client/model/ModelGasTank.java index 595b1c2a9..083381ab0 100644 --- a/src/main/java/mekanism/client/model/ModelGasTank.java +++ b/src/main/java/mekanism/client/model/ModelGasTank.java @@ -8,72 +8,97 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelGasTank extends ModelBase { - ModelRenderer Panel1; - ModelRenderer Panel2; - ModelRenderer Panel3; - ModelRenderer Tank; - ModelRenderer Panel4; - ModelRenderer Top; - ModelRenderer Exit; + ModelRenderer rim4; + ModelRenderer rim5; + ModelRenderer rim2; + ModelRenderer tankBase; + ModelRenderer valve; + ModelRenderer rim3; + ModelRenderer tank; + ModelRenderer rim0; + ModelRenderer valveBase; + ModelRenderer rim1; public ModelGasTank() { - textureWidth = 32; - textureHeight = 64; + textureWidth = 64; + textureHeight = 32; - Panel1 = new ModelRenderer(this, 0, 22); - Panel1.addBox(0F, 0F, 0F, 5, 13, 1); - Panel1.setRotationPoint(-2.5F, 11F, 3.5F); - Panel1.setTextureSize(32, 64); - Panel1.mirror = true; - setRotation(Panel1, 0F, 0F, 0F); - Panel2 = new ModelRenderer(this, 0, 37); - Panel2.addBox(0F, 0F, 0F, 1, 13, 5); - Panel2.setRotationPoint(3.5F, 11F, -2.5F); - Panel2.setTextureSize(32, 64); - Panel2.mirror = true; - setRotation(Panel2, 0F, 0F, 0F); - Panel3 = new ModelRenderer(this, 0, 22); - Panel3.addBox(0F, 0F, 0F, 5, 13, 1); - Panel3.setRotationPoint(-2.5F, 11F, -4.5F); - Panel3.setTextureSize(32, 64); - Panel3.mirror = true; - setRotation(Panel3, 0F, 0F, 0F); - Tank = new ModelRenderer(this, 0, 0); - Tank.addBox(0F, 0F, 0F, 7, 14, 7); - Tank.setRotationPoint(-3.5F, 10F, -3.5F); - Tank.setTextureSize(32, 64); - Tank.mirror = true; - setRotation(Tank, 0F, 0F, 0F); - Panel4 = new ModelRenderer(this, 0, 37); - Panel4.addBox(0F, 0F, 0F, 1, 13, 5); - Panel4.setRotationPoint(-4.5F, 11F, -2.5F); - Panel4.setTextureSize(32, 64); - Panel4.mirror = true; - setRotation(Panel4, 0F, 0F, 0F); - Top = new ModelRenderer(this, 13, 22); - Top.addBox(0F, 0F, 0F, 2, 2, 2); - Top.setRotationPoint(-1F, 8F, -1F); - Top.setTextureSize(32, 64); - Top.mirror = true; - setRotation(Top, 0F, 0F, 0F); - Exit = new ModelRenderer(this, 22, 22); - Exit.addBox(0F, 0F, 0F, 1, 1, 1); - Exit.setRotationPoint(1F, 8.2F, -0.5F); - Exit.setTextureSize(32, 64); - Exit.mirror = true; - setRotation(Exit, 0F, 0F, 0F); + rim4 = new ModelRenderer(this, 30, 0); + rim4.addBox(0F, 0F, 0F, 1, 3, 6); + rim4.setRotationPoint(3F, 8F, -3F); + rim4.setTextureSize(64, 32); + rim4.mirror = true; + setRotation(rim4, 0F, 0F, 0F); + rim4.mirror = false; + rim5 = new ModelRenderer(this, 0, 4); + rim5.addBox(0F, 0F, 0F, 2, 3, 1); + rim5.setRotationPoint(2F, 8F, -4F); + rim5.setTextureSize(64, 32); + rim5.mirror = true; + setRotation(rim5, 0F, 0F, 0F); + rim2 = new ModelRenderer(this, 30, 0); + rim2.addBox(0F, 0F, 0F, 1, 3, 6); + rim2.setRotationPoint(-4F, 8F, -3F); + rim2.setTextureSize(64, 32); + rim2.mirror = true; + setRotation(rim2, 0F, 0F, 0F); + tankBase = new ModelRenderer(this, 0, 22); + tankBase.addBox(0F, 0F, 0F, 9, 1, 9); + tankBase.setRotationPoint(-4.5F, 22.5F, -4.5F); + tankBase.setTextureSize(64, 32); + tankBase.mirror = true; + setRotation(tankBase, 0F, 0F, 0F); + valve = new ModelRenderer(this, 46, 0); + valve.addBox(0F, 0F, 0F, 3, 1, 3); + valve.setRotationPoint(-1.5F, 8.5F, -1.5F); + valve.setTextureSize(64, 32); + valve.mirror = true; + setRotation(valve, 0F, 0F, 0F); + rim3 = new ModelRenderer(this, 44, 5); + rim3.addBox(0F, 0F, 0F, 8, 3, 1); + rim3.setRotationPoint(-4F, 8F, 3F); + rim3.setTextureSize(64, 32); + rim3.mirror = true; + setRotation(rim3, 0F, 0F, 0F); + tank = new ModelRenderer(this, 0, 0); + tank.addBox(0F, 0F, 0F, 10, 12, 10); + tank.setRotationPoint(-5F, 10.5F, -5F); + tank.setTextureSize(64, 32); + tank.mirror = true; + setRotation(tank, 0F, 0F, 0F); + rim0 = new ModelRenderer(this, 0, 8); + rim0.addBox(0F, 0F, 0F, 4, 1, 1); + rim0.setRotationPoint(-2F, 10F, -4F); + rim0.setTextureSize(64, 32); + rim0.mirror = true; + setRotation(rim0, 0F, 0F, 0F); + valveBase = new ModelRenderer(this, 38, 0); + valveBase.addBox(0F, 0F, 0F, 2, 1, 2); + valveBase.setRotationPoint(-1F, 9.5F, -1F); + valveBase.setTextureSize(64, 32); + valveBase.mirror = true; + setRotation(valveBase, 0F, 0F, 0F); + rim1 = new ModelRenderer(this, 0, 0); + rim1.addBox(0F, 0F, 0F, 2, 3, 1); + rim1.setRotationPoint(-4F, 8F, -4F); + rim1.setTextureSize(64, 32); + rim1.mirror = true; + setRotation(rim1, 0F, 0F, 0F); } public void render(float size) { - Panel1.render(size); - Panel2.render(size); - Panel3.render(size); - Tank.render(size); - Panel4.render(size); - Top.render(size); - Exit.render(size); + rim4.render(size); + rim5.render(size); + rim2.render(size); + tankBase.render(size); + valve.render(size); + rim3.render(size); + tank.render(size); + rim0.render(size); + valveBase.render(size); + rim1.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java b/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java index 496ec04a4..3876d2122 100644 --- a/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java @@ -8,216 +8,153 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelMetallurgicInfuser extends ModelBase { - ModelRenderer Base; - ModelRenderer RightChamber; - ModelRenderer TopChamber; - ModelRenderer BackChamber; - ModelRenderer LeftChamber; - ModelRenderer FCTop; - ModelRenderer FCBottom; - ModelRenderer FCRight; - ModelRenderer FCLeft; - ModelRenderer FCDoor; - ModelRenderer Cable1; - ModelRenderer Cable3; - ModelRenderer Cable5; - ModelRenderer Cable2; - ModelRenderer Cable4; - ModelRenderer Cable6; - ModelRenderer TopPanelDec; - ModelRenderer BackPlate; - ModelRenderer TopPanel; - ModelRenderer TopPanelExtr; - ModelRenderer ConnectorRight; - ModelRenderer ConnectorLeft; - ModelRenderer ConnectorWireRight; - ModelRenderer ConnectorWireLeft; - ModelRenderer ConnectorWireTop; + ModelRenderer base; + ModelRenderer back; + ModelRenderer connector1; + ModelRenderer connector2; + ModelRenderer sideRight; + ModelRenderer top; + ModelRenderer sideLeft; + ModelRenderer tap1; + ModelRenderer tap2; + ModelRenderer tapBase1; + ModelRenderer tapBase2; + ModelRenderer divider; + ModelRenderer plate1; + ModelRenderer plate2; + ModelRenderer plate3; + ModelRenderer bar1; + ModelRenderer bar2; - public ModelMetallurgicInfuser() + public ModelMetallurgicInfuser() { textureWidth = 128; textureHeight = 64; - Base = new ModelRenderer(this, 0, 0); - Base.addBox(0F, 0F, 0F, 14, 2, 16); - Base.setRotationPoint(-7F, 22F, -8F); - Base.setTextureSize(128, 64); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - RightChamber = new ModelRenderer(this, 61, 0); - RightChamber.addBox(0F, 0F, 0F, 1, 6, 5); - RightChamber.setRotationPoint(5.5F, 16F, -6F); - RightChamber.setTextureSize(128, 64); - RightChamber.mirror = true; - setRotation(RightChamber, 0F, 0F, 0F); - TopChamber = new ModelRenderer(this, 86, 12); - TopChamber.addBox(0F, 0F, 0F, 11, 1, 5); - TopChamber.setRotationPoint(-5.5F, 15F, -6F); - TopChamber.setTextureSize(128, 64); - TopChamber.mirror = true; - setRotation(TopChamber, 0F, 0F, 0F); - BackChamber = new ModelRenderer(this, 74, 0); - BackChamber.addBox(0F, 0F, 0F, 11, 6, 1); - BackChamber.setRotationPoint(-5.5F, 16F, -1F); - BackChamber.setTextureSize(128, 64); - BackChamber.mirror = true; - setRotation(BackChamber, 0F, 0F, 0F); - LeftChamber = new ModelRenderer(this, 61, 0); - LeftChamber.addBox(0F, 0F, 0F, 1, 6, 5); - LeftChamber.setRotationPoint(-6.5F, 16F, -6F); - LeftChamber.setTextureSize(128, 64); - LeftChamber.mirror = true; - setRotation(LeftChamber, 0F, 0F, 0F); - FCTop = new ModelRenderer(this, 99, 6); - FCTop.addBox(0F, 0F, 0F, 11, 1, 1); - FCTop.setRotationPoint(-5.5F, 16F, -7F); - FCTop.setTextureSize(128, 64); - FCTop.mirror = true; - setRotation(FCTop, 0F, 0F, 0F); - FCBottom = new ModelRenderer(this, 99, 6); - FCBottom.addBox(0F, 0F, 0F, 11, 1, 1); - FCBottom.setRotationPoint(-5.5F, 21F, -7F); - FCBottom.setTextureSize(128, 64); - FCBottom.mirror = true; - setRotation(FCBottom, 0F, 0F, 0F); - FCRight = new ModelRenderer(this, 61, 11); - FCRight.addBox(0F, 0F, 0F, 1, 4, 1); - FCRight.setRotationPoint(4.5F, 17F, -7F); - FCRight.setTextureSize(128, 64); - FCRight.mirror = true; - setRotation(FCRight, 0F, 0F, 0F); - FCLeft = new ModelRenderer(this, 61, 11); - FCLeft.addBox(0F, 0F, 0F, 1, 4, 1); - FCLeft.setRotationPoint(-5.5F, 17F, -7F); - FCLeft.setTextureSize(128, 64); - FCLeft.mirror = true; - setRotation(FCLeft, 0F, 0F, 0F); - FCDoor = new ModelRenderer(this, 99, 0); - FCDoor.addBox(0F, -2F, -0.5F, 9, 4, 1); - FCDoor.setRotationPoint(-4.5F, 19F, -7F); - FCDoor.setTextureSize(128, 64); - FCDoor.mirror = true; - setRotation(FCDoor, 0F, 0F, 0F); - Cable1 = new ModelRenderer(this, 105, 19); - Cable1.addBox(0F, 0F, 0F, 1, 1, 7); - Cable1.setRotationPoint(-4.5F, 19.5F, 0F); - Cable1.setTextureSize(128, 64); - Cable1.mirror = true; - setRotation(Cable1, 0F, 0.0174533F, 0F); - Cable3 = new ModelRenderer(this, 86, 19); - Cable3.addBox(0F, 0F, 0F, 2, 2, 7); - Cable3.setRotationPoint(3F, 18F, 0F); - Cable3.setTextureSize(128, 64); - Cable3.mirror = true; - setRotation(Cable3, 0F, 0.0174533F, 0F); - Cable5 = new ModelRenderer(this, 105, 19); - Cable5.addBox(0F, 0F, 0F, 1, 1, 7); - Cable5.setRotationPoint(3.5F, 19.5F, 0F); - Cable5.setTextureSize(128, 64); - Cable5.mirror = true; - setRotation(Cable5, 0F, 0.0174533F, 0F); - Cable2 = new ModelRenderer(this, 86, 19); - Cable2.addBox(0F, 0F, 0F, 2, 2, 7); - Cable2.setRotationPoint(-5F, 18F, 0F); - Cable2.setTextureSize(128, 64); - Cable2.mirror = true; - setRotation(Cable2, 0F, 0F, 0F); - Cable4 = new ModelRenderer(this, 105, 19); - Cable4.addBox(0F, 0F, 0F, 1, 1, 7); - Cable4.setRotationPoint(-4.5F, 17.5F, 0F); - Cable4.setTextureSize(128, 64); - Cable4.mirror = true; - setRotation(Cable4, 0F, 0.0174533F, 0F); - Cable6 = new ModelRenderer(this, 105, 19); - Cable6.addBox(0F, 0F, 0F, 1, 1, 7); - Cable6.setRotationPoint(3.5F, 17.5F, 0F); - Cable6.setTextureSize(128, 64); - Cable6.mirror = true; - setRotation(Cable6, 0F, 0.0174533F, 0F); - TopPanelDec = new ModelRenderer(this, 33, 28); - TopPanelDec.addBox(0F, 0F, 0F, 13, 1, 1); - TopPanelDec.setRotationPoint(-6.5F, 11.5F, 5.5F); - TopPanelDec.setTextureSize(128, 64); - TopPanelDec.mirror = true; - setRotation(TopPanelDec, 0F, 0F, 0F); - BackPlate = new ModelRenderer(this, 0, 19); - BackPlate.addBox(0F, 0F, 0F, 14, 12, 2); - BackPlate.setRotationPoint(-7F, 10F, 6F); - BackPlate.setTextureSize(128, 64); - BackPlate.mirror = true; - setRotation(BackPlate, 0F, 0F, 0F); - TopPanel = new ModelRenderer(this, 33, 19); - TopPanel.addBox(0F, 0F, 0F, 14, 2, 3); - TopPanel.setRotationPoint(-7F, 10F, 3F); - TopPanel.setTextureSize(128, 64); - TopPanel.mirror = true; - setRotation(TopPanel, 0F, 0F, 0F); - TopPanelExtr = new ModelRenderer(this, 33, 25); - TopPanelExtr.addBox(0F, 0F, 0F, 14, 1, 1); - TopPanelExtr.setRotationPoint(-7F, 10F, 2F); - TopPanelExtr.setTextureSize(128, 64); - TopPanelExtr.mirror = true; - setRotation(TopPanelExtr, 0F, 0F, 0F); - ConnectorRight = new ModelRenderer(this, 68, 19); - ConnectorRight.addBox(0F, 0F, 0F, 3, 1, 3); - ConnectorRight.setRotationPoint(1.5F, 14F, -5F); - ConnectorRight.setTextureSize(128, 64); - ConnectorRight.mirror = true; - setRotation(ConnectorRight, 0F, 0F, 0F); - ConnectorLeft = new ModelRenderer(this, 68, 19); - ConnectorLeft.addBox(0F, 0F, 0F, 3, 1, 3); - ConnectorLeft.setRotationPoint(-4.5F, 14F, -5F); - ConnectorLeft.setTextureSize(128, 64); - ConnectorLeft.mirror = true; - setRotation(ConnectorLeft, 0F, 0F, 0F); - ConnectorWireRight = new ModelRenderer(this, 68, 24); - ConnectorWireRight.addBox(0F, 0F, 0F, 1, 3, 1); - ConnectorWireRight.setRotationPoint(2.5F, 11F, -4F); - ConnectorWireRight.setTextureSize(128, 64); - ConnectorWireRight.mirror = true; - setRotation(ConnectorWireRight, 0F, 0F, 0F); - ConnectorWireLeft = new ModelRenderer(this, 68, 24); - ConnectorWireLeft.addBox(0F, 0F, 0F, 1, 3, 1); - ConnectorWireLeft.setRotationPoint(-3.5F, 11F, -4F); - ConnectorWireLeft.setTextureSize(128, 64); - ConnectorWireLeft.mirror = true; - setRotation(ConnectorWireLeft, 0F, 0F, 0F); - ConnectorWireTop = new ModelRenderer(this, 68, 29); - ConnectorWireTop.addBox(0F, 0F, 0F, 5, 1, 1); - ConnectorWireTop.setRotationPoint(-2.5F, 11F, -4F); - ConnectorWireTop.setTextureSize(128, 64); - ConnectorWireTop.mirror = true; - setRotation(ConnectorWireTop, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 4, 16); + base.setRotationPoint(-8F, 20F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + back = new ModelRenderer(this, 42, 20); + back.addBox(0F, 0F, 0F, 16, 12, 1); + back.setRotationPoint(-8F, 8F, 7F); + back.setTextureSize(128, 64); + back.mirror = true; + setRotation(back, 0F, 0F, 0F); + connector1 = new ModelRenderer(this, 0, 8); + connector1.addBox(0F, 0F, 0F, 1, 5, 3); + connector1.setRotationPoint(-4F, 8.5F, -3F); + connector1.setTextureSize(128, 64); + connector1.mirror = true; + setRotation(connector1, 0F, 0F, 0F); + connector2 = new ModelRenderer(this, 0, 8); + connector2.addBox(0F, 0F, 0F, 1, 5, 3); + connector2.setRotationPoint(3F, 8.5F, -3F); + connector2.setTextureSize(128, 64); + connector2.mirror = true; + setRotation(connector2, 0F, 0F, 0F); + sideRight = new ModelRenderer(this, 64, 0); + sideRight.addBox(0F, 0F, 0F, 1, 11, 7); + sideRight.setRotationPoint(7F, 9F, 0F); + sideRight.setTextureSize(128, 64); + sideRight.mirror = true; + setRotation(sideRight, 0F, 0F, 0F); + sideRight.mirror = false; + top = new ModelRenderer(this, 80, 0); + top.addBox(0F, 0F, 0F, 16, 1, 7); + top.setRotationPoint(-8F, 8F, 0F); + top.setTextureSize(128, 64); + top.mirror = true; + setRotation(top, 0F, 0F, 0F); + sideLeft = new ModelRenderer(this, 64, 0); + sideLeft.addBox(0F, 0F, 0F, 1, 11, 7); + sideLeft.setRotationPoint(-8F, 9F, 0F); + sideLeft.setTextureSize(128, 64); + sideLeft.mirror = true; + setRotation(sideLeft, 0F, 0F, 0F); + tap1 = new ModelRenderer(this, 80, 8); + tap1.addBox(0F, 0F, 0F, 2, 1, 11); + tap1.setRotationPoint(-4.5F, 11.5F, -4F); + tap1.setTextureSize(128, 64); + tap1.mirror = true; + setRotation(tap1, 0F, 0F, 0F); + tap2 = new ModelRenderer(this, 80, 8); + tap2.addBox(0F, 0F, 0F, 2, 1, 11); + tap2.setRotationPoint(2.5F, 11.5F, -4F); + tap2.setTextureSize(128, 64); + tap2.mirror = true; + setRotation(tap2, 0F, 0F, 0F); + tapBase1 = new ModelRenderer(this, 4, 0); + tapBase1.addBox(0F, 0F, 0F, 2, 1, 2); + tapBase1.setRotationPoint(-4.5F, 12.5F, 5F); + tapBase1.setTextureSize(128, 64); + tapBase1.mirror = true; + setRotation(tapBase1, 0F, 0F, 0F); + tapBase2 = new ModelRenderer(this, 4, 0); + tapBase2.addBox(0F, 0F, 0F, 2, 1, 2); + tapBase2.setRotationPoint(2.5F, 12.5F, 5F); + tapBase2.setTextureSize(128, 64); + tapBase2.mirror = true; + setRotation(tapBase2, 0F, 0F, 0F); + divider = new ModelRenderer(this, 66, 20); + divider.addBox(0F, 0F, 0F, 13, 1, 14); + divider.setRotationPoint(-6.5F, 16F, -6.5F); + divider.setTextureSize(128, 64); + divider.mirror = true; + setRotation(divider, 0F, 0F, 0F); + plate1 = new ModelRenderer(this, 0, 20); + plate1.addBox(0F, 0F, 0F, 14, 3, 14); + plate1.setRotationPoint(-7F, 9F, -7F); + plate1.setTextureSize(128, 64); + plate1.mirror = true; + setRotation(plate1, 0F, 0F, 0F); + plate2 = new ModelRenderer(this, 0, 37); + plate2.addBox(0F, 0F, 0F, 14, 3, 14); + plate2.setRotationPoint(-7F, 13F, -7F); + plate2.setTextureSize(128, 64); + plate2.mirror = true; + setRotation(plate2, 0F, 0F, 0F); + plate3 = new ModelRenderer(this, 0, 37); + plate3.addBox(0F, 0F, 0F, 14, 3, 14); + plate3.setRotationPoint(-7F, 17F, -7F); + plate3.setTextureSize(128, 64); + plate3.mirror = true; + setRotation(plate3, 0F, 0F, 0F); + bar1 = new ModelRenderer(this, 0, 0); + bar1.addBox(0F, 0F, 0F, 1, 1, 1); + bar1.setRotationPoint(-6.5F, 12F, -6.5F); + bar1.setTextureSize(128, 64); + bar1.mirror = true; + setRotation(bar1, 0F, 0F, 0F); + bar2 = new ModelRenderer(this, 0, 0); + bar2.addBox(0F, 0F, 0F, 1, 1, 1); + bar2.setRotationPoint(5.5F, 12F, -6.5F); + bar2.setTextureSize(128, 64); + bar2.mirror = true; + setRotation(bar2, 0F, 0F, 0F); } - public void render(float size) + public void render(float size) { - Base.render(size); - RightChamber.render(size); - TopChamber.render(size); - BackChamber.render(size); - LeftChamber.render(size); - FCTop.render(size); - FCBottom.render(size); - FCRight.render(size); - FCLeft.render(size); - FCDoor.render(size); - Cable1.render(size); - Cable3.render(size); - Cable5.render(size); - Cable2.render(size); - Cable4.render(size); - Cable6.render(size); - TopPanelDec.render(size); - BackPlate.render(size); - TopPanel.render(size); - TopPanelExtr.render(size); - ConnectorRight.render(size); - ConnectorLeft.render(size); - ConnectorWireRight.render(size); - ConnectorWireLeft.render(size); - ConnectorWireTop.render(size); + base.render(size); + back.render(size); + connector1.render(size); + connector2.render(size); + sideRight.render(size); + top.render(size); + sideLeft.render(size); + tap1.render(size); + tap2.render(size); + tapBase1.render(size); + tapBase2.render(size); + divider.render(size); + plate1.render(size); + plate2.render(size); + plate3.render(size); + bar1.render(size); + bar2.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java b/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java index 5a8226c28..af15410ab 100644 --- a/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java +++ b/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java @@ -8,168 +8,114 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelPressurizedReactionChamber extends ModelBase { - ModelRenderer Base; - ModelRenderer GasRight; - ModelRenderer GasLeft; - ModelRenderer GasConnector; - ModelRenderer FluidBack; - ModelRenderer CoreBase; - ModelRenderer Core; - ModelRenderer PoleRF; - ModelRenderer PoleFL; - ModelRenderer PoleLB; - ModelRenderer PoleBR; - ModelRenderer PoleR; - ModelRenderer PoleL; - ModelRenderer FrontPanel; - ModelRenderer TubeThing; - ModelRenderer CenterCore; - ModelRenderer BackConnector; - ModelRenderer BackCore; - ModelRenderer TopPanel; + ModelRenderer frontDivider1; + ModelRenderer base; + ModelRenderer port2b; + ModelRenderer front; + ModelRenderer bar1; + ModelRenderer body; + ModelRenderer port1b; + ModelRenderer bar5; + ModelRenderer bar4; + ModelRenderer bar3; + ModelRenderer bar2; + ModelRenderer frontDivider2; - public ModelPressurizedReactionChamber() + public ModelPressurizedReactionChamber() { textureWidth = 128; - textureHeight = 128; + textureHeight = 64; - Base = new ModelRenderer(this, 0, 0); - Base.addBox(0F, 0F, 0F, 16, 1, 16); - Base.setRotationPoint(-8F, 23F, -8F); - Base.setTextureSize(128, 128); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - GasRight = new ModelRenderer(this, 64, 12); - GasRight.addBox(0F, 0F, 0F, 1, 6, 6); - GasRight.setRotationPoint(-8F, 13F, -3F); - GasRight.setTextureSize(128, 128); - GasRight.mirror = true; - setRotation(GasRight, 0F, 0F, 0F); - GasLeft = new ModelRenderer(this, 64, 12); - GasLeft.addBox(0F, 0F, 0F, 1, 6, 6); - GasLeft.setRotationPoint(7F, 13F, -3F); - GasLeft.setTextureSize(128, 128); - GasLeft.mirror = true; - setRotation(GasLeft, 0F, 0F, 0F); - GasConnector = new ModelRenderer(this, 22, 38); - GasConnector.addBox(0F, 0F, 0F, 14, 2, 2); - GasConnector.setRotationPoint(-7F, 15F, -1F); - GasConnector.setTextureSize(128, 128); - GasConnector.mirror = true; - setRotation(GasConnector, 0F, 0F, 0F); - FluidBack = new ModelRenderer(this, 50, 24); - FluidBack.addBox(0F, 0F, 0F, 8, 8, 1); - FluidBack.setRotationPoint(-4F, 12F, 7F); - FluidBack.setTextureSize(128, 128); - FluidBack.mirror = true; - setRotation(FluidBack, 0F, 0F, 0F); - CoreBase = new ModelRenderer(this, 64, 0); - CoreBase.addBox(0F, 0F, 0F, 10, 1, 11); - CoreBase.setRotationPoint(-5F, 22F, -6F); - CoreBase.setTextureSize(128, 128); - CoreBase.mirror = true; - setRotation(CoreBase, 0F, 0F, 0F); - Core = new ModelRenderer(this, 0, 17); - Core.addBox(0F, 0F, 0F, 12, 8, 13); - Core.setRotationPoint(-6F, 14F, -7F); - Core.setTextureSize(128, 128); - Core.mirror = true; - setRotation(Core, 0F, 0F, 0F); - PoleRF = new ModelRenderer(this, 38, 42); - PoleRF.addBox(0F, 0F, 0F, 1, 6, 1); - PoleRF.setRotationPoint(-6F, 8F, -7F); - PoleRF.setTextureSize(128, 128); - PoleRF.mirror = true; - setRotation(PoleRF, 0F, 0F, 0F); - PoleFL = new ModelRenderer(this, 38, 42); - PoleFL.addBox(0F, 0F, 0F, 1, 6, 1); - PoleFL.setRotationPoint(5F, 8F, -7F); - PoleFL.setTextureSize(128, 128); - PoleFL.mirror = true; - setRotation(PoleFL, 0F, 0F, 0F); - PoleLB = new ModelRenderer(this, 38, 42); - PoleLB.addBox(0F, 0F, 0F, 1, 6, 1); - PoleLB.setRotationPoint(5F, 8F, 5F); - PoleLB.setTextureSize(128, 128); - PoleLB.mirror = true; - setRotation(PoleLB, 0F, 0F, 0F); - PoleBR = new ModelRenderer(this, 38, 42); - PoleBR.addBox(0F, -2F, 0F, 1, 6, 1); - PoleBR.setRotationPoint(-6F, 10F, 5F); - PoleBR.setTextureSize(128, 128); - PoleBR.mirror = true; - setRotation(PoleBR, 0F, 0F, 0F); - PoleR = new ModelRenderer(this, 0, 57); - PoleR.addBox(0F, 0F, 0F, 1, 1, 11); - PoleR.setRotationPoint(-6F, 8F, -6F); - PoleR.setTextureSize(128, 128); - PoleR.mirror = true; - setRotation(PoleR, 0F, 0F, 0F); - PoleL = new ModelRenderer(this, 0, 57); - PoleL.addBox(0F, 0F, 0F, 1, 1, 11); - PoleL.setRotationPoint(5F, 8F, -6F); - PoleL.setTextureSize(128, 128); - PoleL.mirror = true; - setRotation(PoleL, 0F, 0F, 0F); - FrontPanel = new ModelRenderer(this, 0, 38); - FrontPanel.addBox(0F, 0F, 0F, 10, 12, 1); - FrontPanel.setRotationPoint(-5F, 9F, -8F); - FrontPanel.setTextureSize(128, 128); - FrontPanel.mirror = true; - setRotation(FrontPanel, 0F, 0F, 0F); - TubeThing = new ModelRenderer(this, 22, 42); - TubeThing.addBox(0F, 0F, 0F, 2, 2, 6); - TubeThing.setRotationPoint(-1F, 12F, -7F); - TubeThing.setTextureSize(128, 128); - TubeThing.mirror = true; - setRotation(TubeThing, 0F, 0F, 0F); - CenterCore = new ModelRenderer(this, 84, 12); - CenterCore.addBox(0F, 0F, 0F, 4, 1, 4); - CenterCore.setRotationPoint(-2F, 13F, -3F); - CenterCore.setTextureSize(128, 128); - CenterCore.mirror = true; - setRotation(CenterCore, 0F, 0F, 0F); - BackConnector = new ModelRenderer(this, 78, 12); - BackConnector.addBox(0F, 0F, 0F, 2, 5, 1); - BackConnector.setRotationPoint(-1F, 13F, 6F); - BackConnector.setTextureSize(128, 128); - BackConnector.mirror = true; - setRotation(BackConnector, 0F, 0F, 0F); - BackCore = new ModelRenderer(this, 0, 51); - BackCore.addBox(0F, 0F, 0F, 2, 1, 5); - BackCore.setRotationPoint(-1F, 13F, 1F); - BackCore.setTextureSize(128, 128); - BackCore.mirror = true; - setRotation(BackCore, 0F, 0F, 0F); - TopPanel = new ModelRenderer(this, 0, 69); - TopPanel.addBox(0F, 0F, 0F, 10, 1, 13); - TopPanel.setRotationPoint(-5F, 8F, -7F); - TopPanel.setTextureSize(128, 128); - TopPanel.mirror = true; - setRotation(TopPanel, 0F, 0F, 0F); + frontDivider1 = new ModelRenderer(this, 52, 20); + frontDivider1.addBox(0F, 0F, 0F, 2, 12, 6); + frontDivider1.setRotationPoint(-7F, 8.5F, -7.5F); + frontDivider1.setTextureSize(128, 64); + frontDivider1.mirror = true; + setRotation(frontDivider1, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 4, 16); + base.setRotationPoint(-8F, 20F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + port2b = new ModelRenderer(this, 0, 6); + port2b.addBox(0F, 0F, 0F, 1, 8, 2); + port2b.setRotationPoint(7F, 12F, -4F); + port2b.setTextureSize(128, 64); + port2b.mirror = true; + setRotation(port2b, 0F, 0F, 0F); + port2b.mirror = false; + front = new ModelRenderer(this, 48, 0); + front.addBox(0F, 0F, 0F, 9, 11, 5); + front.setRotationPoint(-2F, 9F, -7F); + front.setTextureSize(128, 64); + front.mirror = true; + setRotation(front, 0F, 0F, 0F); + bar1 = new ModelRenderer(this, 0, 0); + bar1.addBox(0F, 0F, 0F, 1, 1, 5); + bar1.setRotationPoint(-5F, 18F, -7F); + bar1.setTextureSize(128, 64); + bar1.mirror = true; + setRotation(bar1, 0F, 0F, 0F); + body = new ModelRenderer(this, 0, 20); + body.addBox(0F, 0F, 0F, 16, 12, 10); + body.setRotationPoint(-8F, 8F, -2F); + body.setTextureSize(128, 64); + body.mirror = true; + setRotation(body, 0F, 0F, 0F); + port1b = new ModelRenderer(this, 0, 6); + port1b.addBox(0F, 0F, 0F, 1, 8, 2); + port1b.setRotationPoint(-8F, 12F, -4F); + port1b.setTextureSize(128, 64); + port1b.mirror = true; + setRotation(port1b, 0F, 0F, 0F); + bar5 = new ModelRenderer(this, 0, 0); + bar5.addBox(0F, 0F, 0F, 1, 1, 5); + bar5.setRotationPoint(-5F, 10F, -7F); + bar5.setTextureSize(128, 64); + bar5.mirror = true; + setRotation(bar5, 0F, 0F, 0F); + bar4 = new ModelRenderer(this, 0, 0); + bar4.addBox(0F, 0F, 0F, 1, 1, 5); + bar4.setRotationPoint(-5F, 12F, -7F); + bar4.setTextureSize(128, 64); + bar4.mirror = true; + setRotation(bar4, 0F, 0F, 0F); + bar3 = new ModelRenderer(this, 0, 0); + bar3.addBox(0F, 0F, 0F, 1, 1, 5); + bar3.setRotationPoint(-5F, 14F, -7F); + bar3.setTextureSize(128, 64); + bar3.mirror = true; + setRotation(bar3, 0F, 0F, 0F); + bar2 = new ModelRenderer(this, 0, 0); + bar2.addBox(0F, 0F, 0F, 1, 1, 5); + bar2.setRotationPoint(-5F, 16F, -7F); + bar2.setTextureSize(128, 64); + bar2.mirror = true; + setRotation(bar2, 0F, 0F, 0F); + frontDivider2 = new ModelRenderer(this, 52, 20); + frontDivider2.addBox(0F, 0F, 0F, 2, 12, 6); + frontDivider2.setRotationPoint(-4F, 8.5F, -7.5F); + frontDivider2.setTextureSize(128, 64); + frontDivider2.mirror = true; + setRotation(frontDivider2, 0F, 0F, 0F); + frontDivider2.mirror = false; } - public void render(float size) + public void render(float size) { - Base.render(size); - GasRight.render(size); - GasLeft.render(size); - GasConnector.render(size); - FluidBack.render(size); - CoreBase.render(size); - Core.render(size); - PoleRF.render(size); - PoleFL.render(size); - PoleLB.render(size); - PoleBR.render(size); - PoleR.render(size); - PoleL.render(size); - FrontPanel.render(size); - TubeThing.render(size); - CenterCore.render(size); - BackConnector.render(size); - BackCore.render(size); - TopPanel.render(size); + frontDivider1.render(size); + base.render(size); + port2b.render(size); + front.render(size); + bar1.render(size); + body.render(size); + port1b.render(size); + bar5.render(size); + bar4.render(size); + bar3.render(size); + bar2.render(size); + frontDivider2.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index 05aef6522..38f9fc0f5 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -83,7 +83,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler else if(type == MachineType.METALLURGIC_INFUSER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); + GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.0F, 0.0F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "MetallurgicInfuser.png")); metallurgicInfuser.render(0.0625F); diff --git a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java index d0537633b..3d929fd07 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -296,7 +296,7 @@ public class ItemRenderingHandler implements IItemRenderer BaseTier tier = ((ItemBlockGasTank)item.getItem()).getBaseTier(item); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank" + tier.getName() + ".png")); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); + GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.0F, 0.0F); gasTank.render(0.0625F); GL11.glPopMatrix(); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java index af4af146d..b19069212 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java @@ -32,10 +32,10 @@ public class RenderGasTank extends TileEntitySpecialRenderer 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; + case 2: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; + case 3: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; + case 4: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; + case 5: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; } GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 87b099687..cdd665637 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -921,7 +921,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo { ((TileEntityBasicBlock)tileEntity).onNeighborChange(block); } - + if(tileEntity instanceof TileEntityLogisticalSorter) { TileEntityLogisticalSorter sorter = (TileEntityLogisticalSorter)tileEntity; diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index 52e7c2e86..9c8b06bb5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -89,7 +89,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i { super("machine.metalinfuser", "MetallurgicInfuser", MachineType.METALLURGIC_INFUSER.baseEnergy); - configComponent = new TileComponentConfig(this, TransmissionType.ITEM, TransmissionType.ENERGY); + configComponent = new TileComponentConfig(this, TransmissionType.ITEM); configComponent.addOutput(TransmissionType.ITEM, new SideData("None", EnumColor.GREY, InventoryUtils.EMPTY)); configComponent.addOutput(TransmissionType.ITEM, new SideData("Input", EnumColor.DARK_RED, new int[] {2})); @@ -98,7 +98,6 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i configComponent.addOutput(TransmissionType.ITEM, new SideData("Infuse", EnumColor.PURPLE, new int[] {1})); configComponent.setConfig(TransmissionType.ITEM, new byte[] {4, 0, 0, 3, 1, 2}); - configComponent.setInputConfig(TransmissionType.ENERGY); inventory = new ItemStack[5]; @@ -266,7 +265,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i @Override public EnumSet getConsumingSides() { - return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1); + return EnumSet.of(ForgeDirection.getOrientation(facing).getOpposite()); } @Override @@ -516,7 +515,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i @Override public boolean renderUpdate() { - return true; + return false; } @Override diff --git a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java index 1b433e15f..e66e08718 100644 --- a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java +++ b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java @@ -29,8 +29,8 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler public ModelSolarGenerator solarGenerator = new ModelSolarGenerator(); public ModelBioGenerator bioGenerator = new ModelBioGenerator(); public ModelHeatGenerator heatGenerator = new ModelHeatGenerator(); - public ModelGasGenerator hydrogenGenerator = new ModelGasGenerator(); - public ModelWindGenerator windTurbine = new ModelWindGenerator(); + public ModelGasGenerator gasGenerator = new ModelGasGenerator(); + public ModelWindGenerator windGenerator = new ModelWindGenerator(); @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) @@ -43,7 +43,6 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler if(metadata == GeneratorType.BIO_GENERATOR.meta) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); GL11.glTranslated(0.0F, -1.0F, 0.0F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "BioGenerator.png")); bioGenerator.render(0.0625F); @@ -67,7 +66,6 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler else if(metadata == GeneratorType.HEAT_GENERATOR.meta) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); GL11.glTranslated(0.0F, -1.0F, 0.0F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "HeatGenerator.png")); heatGenerator.render(0.0625F); @@ -77,8 +75,9 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 1.0F, 1.0F); GL11.glRotatef(90F, -1.0F, 0.0F, 0.0F); GL11.glTranslated(0.0F, -1.0F, 0.0F); + GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasGenerator.png")); - hydrogenGenerator.render(0.0625F); + gasGenerator.render(0.0625F); } else if(metadata == GeneratorType.WIND_GENERATOR.meta) { @@ -86,7 +85,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.0F, 0.4F, 0.0F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "WindGenerator.png")); - windTurbine.render(0.016F, 0); + windGenerator.render(0.016F, 0); } else if(metadata != 2) { diff --git a/src/main/java/mekanism/generators/client/model/ModelBioGenerator.java b/src/main/java/mekanism/generators/client/model/ModelBioGenerator.java index 019b2aa54..93e9435d9 100644 --- a/src/main/java/mekanism/generators/client/model/ModelBioGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelBioGenerator.java @@ -1,156 +1,73 @@ package mekanism.generators.client.model; +import mekanism.client.render.MekanismRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; public class ModelBioGenerator extends ModelBase { - ModelRenderer Base; - ModelRenderer Pipe1; - ModelRenderer Pipe2; - ModelRenderer ContainerLid; - ModelRenderer ContainerRight; - ModelRenderer ContainerBottom; - ModelRenderer ContainerFront; - ModelRenderer ContainerBack; - ModelRenderer ContainerLeft; - ModelRenderer Decor1; - ModelRenderer Decor2; - ModelRenderer BackTop; - ModelRenderer FrontPanel1; - ModelRenderer FrontPanel2; - ModelRenderer LeftPanel; - ModelRenderer RightPanel; - ModelRenderer BackPanel; - - public ModelBioGenerator() + ModelRenderer base; + ModelRenderer sideRight; + ModelRenderer back; + ModelRenderer bar; + ModelRenderer glass; + ModelRenderer sideLeft; + + public ModelBioGenerator() { textureWidth = 64; textureHeight = 64; - Base = new ModelRenderer(this, 0, 0); - Base.addBox(0F, 0F, 0F, 14, 1, 14); - Base.setRotationPoint(-7F, 23F, -7F); - Base.setTextureSize(64, 64); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - Pipe1 = new ModelRenderer(this, 0, 16); - Pipe1.addBox(0F, 0F, 0F, 2, 2, 2); - Pipe1.setRotationPoint(-1F, 13F, -3F); - Pipe1.setTextureSize(64, 64); - Pipe1.mirror = true; - setRotation(Pipe1, 0F, 0F, 0F); - Pipe2 = new ModelRenderer(this, 0, 21); - Pipe2.addBox(0F, 0F, 0F, 2, 2, 8); - Pipe2.setRotationPoint(-1F, 11F, -3F); - Pipe2.setTextureSize(64, 64); - Pipe2.mirror = true; - setRotation(Pipe2, 0F, 0F, 0F); - ContainerLid = new ModelRenderer(this, 0, 32); - ContainerLid.addBox(0F, 0F, 0F, 4, 1, 4); - ContainerLid.setRotationPoint(-2F, 15F, -5F); - ContainerLid.setTextureSize(64, 64); - ContainerLid.mirror = true; - setRotation(ContainerLid, 0F, 0F, 0F); - ContainerRight = new ModelRenderer(this, 0, 38); - ContainerRight.addBox(0F, 0F, 0F, 1, 6, 4); - ContainerRight.setRotationPoint(2F, 16F, -5F); - ContainerRight.setTextureSize(64, 64); - ContainerRight.mirror = true; - setRotation(ContainerRight, 0F, 0F, 0F); - ContainerBottom = new ModelRenderer(this, 0, 49); - ContainerBottom.addBox(0F, 0F, 0F, 6, 1, 6); - ContainerBottom.setRotationPoint(-3F, 22F, -6F); - ContainerBottom.setTextureSize(64, 64); - ContainerBottom.mirror = true; - setRotation(ContainerBottom, 0F, 0F, 0F); - ContainerFront = new ModelRenderer(this, 11, 41); - ContainerFront.addBox(0F, 0F, 0F, 6, 6, 1); - ContainerFront.setRotationPoint(-3F, 16F, -6F); - ContainerFront.setTextureSize(64, 64); - ContainerFront.mirror = true; - setRotation(ContainerFront, 0F, 0F, 0F); - ContainerBack = new ModelRenderer(this, 11, 41); - ContainerBack.addBox(0F, 0F, 0F, 6, 6, 1); - ContainerBack.setRotationPoint(-3F, 16F, -1F); - ContainerBack.setTextureSize(64, 64); - ContainerBack.mirror = true; - setRotation(ContainerBack, 0F, 0F, 0F); - ContainerLeft = new ModelRenderer(this, 0, 38); - ContainerLeft.addBox(0F, 0F, 0F, 1, 6, 4); - ContainerLeft.setRotationPoint(-3F, 16F, -5F); - ContainerLeft.setTextureSize(64, 64); - setRotation(ContainerLeft, 0F, 0F, 0F); - ContainerLeft.mirror = false; - Decor1 = new ModelRenderer(this, 21, 20); - Decor1.addBox(0F, 0F, 0F, 2, 2, 3); - Decor1.setRotationPoint(4.1F, 15F, 2F); - Decor1.setTextureSize(64, 64); - Decor1.mirror = true; - setRotation(Decor1, 0F, 0F, 0F); - Decor2 = new ModelRenderer(this, 21, 20); - Decor2.addBox(0F, 0F, 0F, 2, 2, 3); - Decor2.setRotationPoint(-6.1F, 15F, 2F); - Decor2.setTextureSize(64, 64); - Decor2.mirror = true; - setRotation(Decor2, 0F, 0F, 0F); - BackTop = new ModelRenderer(this, 21, 26); - BackTop.addBox(0F, 0F, 0F, 8, 1, 3); - BackTop.setRotationPoint(-4F, 10F, 5F); - BackTop.setTextureSize(64, 64); - BackTop.mirror = true; - setRotation(BackTop, 0F, 0F, 0F); - FrontPanel1 = new ModelRenderer(this, 17, 32); - FrontPanel1.addBox(0F, 0F, 0F, 3, 6, 2); - FrontPanel1.setRotationPoint(-7F, 17F, -6F); - FrontPanel1.setTextureSize(64, 64); - FrontPanel1.mirror = true; - setRotation(FrontPanel1, 0F, 0F, 0F); - FrontPanel2 = new ModelRenderer(this, 17, 32); - FrontPanel2.addBox(0F, 0F, 0F, 3, 6, 2); - FrontPanel2.setRotationPoint(4F, 17F, -6F); - FrontPanel2.setTextureSize(64, 64); - FrontPanel2.mirror = true; - setRotation(FrontPanel2, 0F, 0F, 0F); - LeftPanel = new ModelRenderer(this, 28, 31); - LeftPanel.addBox(0F, 0F, 0F, 3, 7, 10); - LeftPanel.setRotationPoint(-7F, 16F, -4F); - LeftPanel.setTextureSize(64, 64); - LeftPanel.mirror = true; - setRotation(LeftPanel, 0F, 0F, 0F); - RightPanel = new ModelRenderer(this, 28, 31); - RightPanel.addBox(0F, 0F, 0F, 3, 7, 10); - RightPanel.setRotationPoint(4F, 16F, -4F); - RightPanel.setTextureSize(64, 64); - RightPanel.mirror = true; - setRotation(RightPanel, 0F, 0F, 0F); - BackPanel = new ModelRenderer(this, 28, 49); - BackPanel.addBox(0F, 0F, 0F, 10, 12, 3); - BackPanel.setRotationPoint(-5F, 11F, 5F); - BackPanel.setTextureSize(64, 64); - BackPanel.mirror = true; - setRotation(BackPanel, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 7, 16); + base.setRotationPoint(-8F, 17F, -8F); + base.setTextureSize(64, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + sideRight = new ModelRenderer(this, 0, 40); + sideRight.addBox(0F, 0F, 0F, 3, 9, 8); + sideRight.setRotationPoint(5F, 8F, -8F); + sideRight.setTextureSize(64, 64); + sideRight.mirror = true; + setRotation(sideRight, 0F, 0F, 0F); + sideRight.mirror = false; + back = new ModelRenderer(this, 0, 23); + back.addBox(0F, 0F, 0F, 16, 9, 8); + back.setRotationPoint(-8F, 8F, 0F); + back.setTextureSize(64, 64); + back.mirror = true; + setRotation(back, 0F, 0F, 0F); + bar = new ModelRenderer(this, 0, 57); + bar.addBox(0F, 0F, 0F, 10, 1, 1); + bar.setRotationPoint(-5F, 8.5F, -7.5F); + bar.setTextureSize(64, 64); + bar.mirror = true; + setRotation(bar, 0F, 0F, 0F); + glass = new ModelRenderer(this, 22, 40); + glass.addBox(0F, 0F, 0F, 12, 8, 7); + glass.setRotationPoint(-6F, 9F, -7F); + glass.setTextureSize(64, 64); + glass.mirror = true; + setRotation(glass, 0F, 0F, 0F); + sideLeft = new ModelRenderer(this, 0, 40); + sideLeft.addBox(0F, 0F, 0F, 3, 9, 8); + sideLeft.setRotationPoint(-8F, 8F, -8F); + sideLeft.setTextureSize(64, 64); + sideLeft.mirror = true; + setRotation(sideLeft, 0F, 0F, 0F); } - public void render(float size) + public void render(float size) { - Base.render(size); - Pipe1.render(size); - Pipe2.render(size); - ContainerLid.render(size); - ContainerRight.render(size); - ContainerBottom.render(size); - ContainerFront.render(size); - ContainerBack.render(size); - ContainerLeft.render(size); - Decor1.render(size); - Decor2.render(size); - BackTop.render(size); - FrontPanel1.render(size); - FrontPanel2.render(size); - LeftPanel.render(size); - RightPanel.render(size); - BackPanel.render(size); + base.render(size); + sideRight.render(size); + sideLeft.render(size); + back.render(size); + bar.render(size); + + MekanismRenderer.blendOn(); + glass.render(size); + MekanismRenderer.blendOff(); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/generators/client/model/ModelGasGenerator.java b/src/main/java/mekanism/generators/client/model/ModelGasGenerator.java index 7b3325fee..c7e1d9bf3 100644 --- a/src/main/java/mekanism/generators/client/model/ModelGasGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelGasGenerator.java @@ -8,168 +8,168 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelGasGenerator extends ModelBase { - ModelRenderer A; - ModelRenderer B; - ModelRenderer C; - ModelRenderer D; - ModelRenderer E; - ModelRenderer F; - ModelRenderer G; - ModelRenderer H; - ModelRenderer I; - ModelRenderer J; - ModelRenderer K; - ModelRenderer L; - ModelRenderer M; - ModelRenderer N; - ModelRenderer O; - ModelRenderer P; - ModelRenderer Q; - ModelRenderer R; - ModelRenderer S; + ModelRenderer port4; + ModelRenderer baseStand; + ModelRenderer pillar4; + ModelRenderer port3; + ModelRenderer port2; + ModelRenderer connectorAngle1; + ModelRenderer pillar3; + ModelRenderer pillar2; + ModelRenderer pillar1; + ModelRenderer center; + ModelRenderer connector3; + ModelRenderer port1; + ModelRenderer connector4; + ModelRenderer connectorAngle4; + ModelRenderer base; + ModelRenderer connectorAngle3; + ModelRenderer connector2; + ModelRenderer connectorAngle2; + ModelRenderer connector1; - public ModelGasGenerator() + public ModelGasGenerator() { textureWidth = 128; - textureHeight = 128; + textureHeight = 64; - A = new ModelRenderer(this, 0, 0); - A.addBox(0F, 0F, 0F, 16, 1, 16); - A.setRotationPoint(-8F, 23F, -8F); - A.setTextureSize(128, 128); - A.mirror = true; - setRotation(A, 0F, 0F, 0F); - B = new ModelRenderer(this, 0, 45); - B.addBox(0F, 0F, 0F, 16, 12, 6); - B.setRotationPoint(-8F, 11F, -3F); - B.setTextureSize(128, 128); - B.mirror = true; - setRotation(B, 0F, 0F, 0F); - C = new ModelRenderer(this, 0, 64); - C.addBox(-3F, 0F, -8F, 6, 12, 12); - C.setRotationPoint(0F, 11F, 0F); - C.setTextureSize(128, 128); - C.mirror = true; - setRotation(C, 0F, 0F, 0F); - D = new ModelRenderer(this, 66, 0); - D.addBox(-3F, 0F, 0F, 6, 10, 4); - D.setRotationPoint(0F, 13F, 4F); - D.setTextureSize(128, 128); - D.mirror = true; - setRotation(D, 0F, 0F, 0F); - E = new ModelRenderer(this, 0, 20); - E.addBox(-5F, 0F, -3F, 10, 13, 6); - E.setRotationPoint(0F, 10F, 0F); - E.setTextureSize(128, 128); - E.mirror = true; - setRotation(E, 0F, 0.5235988F, 0F); - F = new ModelRenderer(this, 0, 20); - F.addBox(-5F, 0F, -3F, 10, 13, 6); - F.setRotationPoint(0F, 10F, 0F); - F.setTextureSize(128, 128); - F.mirror = true; - setRotation(F, 0F, -0.5235988F, 0F); - G = new ModelRenderer(this, 34, 20); - G.addBox(-3F, 0F, -5F, 6, 13, 10); - G.setRotationPoint(0F, 10F, 0F); - G.setTextureSize(128, 128); - G.mirror = true; - setRotation(G, 0F, 0F, 0F); - H = new ModelRenderer(this, 67, 20); - H.addBox(-2F, 0F, -1F, 4, 2, 2); - H.setRotationPoint(0F, 8F, 0F); - H.setTextureSize(128, 128); - H.mirror = true; - setRotation(H, 0F, -0.5235988F, 0F); - I = new ModelRenderer(this, 67, 20); - I.addBox(-2F, 0F, -1F, 4, 2, 2); - I.setRotationPoint(0F, 8F, 0F); - I.setTextureSize(128, 128); - I.mirror = true; - setRotation(I, 0F, 0.5235988F, 0F); - J = new ModelRenderer(this, 67, 26); - J.addBox(-1F, 0F, -2F, 2, 2, 4); - J.setRotationPoint(0F, 8F, 0F); - J.setTextureSize(128, 128); - J.mirror = true; - setRotation(J, 0F, 0F, 0F); - K = new ModelRenderer(this, 88, 0); - K.addBox(-3F, 0F, 0F, 6, 2, 5); - K.setRotationPoint(0F, 10F, 4F); - K.setTextureSize(128, 128); - K.mirror = true; - setRotation(K, -0.6457718F, 0F, 0F); - L = new ModelRenderer(this, 0, 97); - L.addBox(0F, 0F, 0F, 4, 10, 4); - L.setRotationPoint(2F, 13F, -5F); - L.setTextureSize(128, 128); - L.mirror = true; - setRotation(L, 0F, 0.7853982F, 0F); - M = new ModelRenderer(this, 0, 90); - M.addBox(0F, 0F, 0F, 3, 1, 2); - M.setRotationPoint(2F, 12F, -4F); - M.setTextureSize(128, 128); - M.mirror = true; - setRotation(M, 0F, 0.7853982F, 0F); - N = new ModelRenderer(this, 0, 97); - N.addBox(0F, 0F, 0F, 4, 10, 4); - N.setRotationPoint(-8F, 13F, -5F); - N.setTextureSize(128, 128); - N.mirror = true; - setRotation(N, 0F, 0.7853982F, 0F); - O = new ModelRenderer(this, 0, 90); - O.addBox(0F, 0F, 0F, 2, 1, 3); - O.setRotationPoint(-6F, 12F, -5F); - O.setTextureSize(128, 128); - O.mirror = true; - setRotation(O, 0F, 0.7853982F, 0F); - P = new ModelRenderer(this, 0, 118); - P.addBox(-5F, 0F, 0F, 10, 1, 1); - P.setRotationPoint(0F, 15F, -7F); - P.setTextureSize(128, 128); - P.mirror = true; - setRotation(P, 0F, 0F, 0F); - Q = new ModelRenderer(this, 0, 118); - Q.addBox(-5F, 0F, 0F, 10, 1, 1); - Q.setRotationPoint(0F, 19F, -7F); - Q.setTextureSize(128, 128); - Q.mirror = true; - setRotation(Q, 0F, 0F, 0F); - R = new ModelRenderer(this, 0, 112); - R.addBox(-7F, 0F, -3F, 14, 1, 3); - R.setRotationPoint(0F, 15F, -2F); - R.setTextureSize(128, 128); - R.mirror = true; - setRotation(R, 0F, 0F, 0F); - S = new ModelRenderer(this, 0, 112); - S.addBox(-7F, 0F, -3F, 14, 1, 3); - S.setRotationPoint(0F, 19F, -2F); - S.setTextureSize(128, 128); - S.mirror = true; - setRotation(S, 0F, 0F, 0F); + port4 = new ModelRenderer(this, 40, 34); + port4.addBox(0F, 0F, 0F, 1, 8, 8); + port4.setRotationPoint(7F, 12F, -4F); + port4.setTextureSize(128, 64); + port4.mirror = true; + setRotation(port4, 0F, 0F, 0F); + baseStand = new ModelRenderer(this, 0, 20); + baseStand.addBox(0F, 0F, 0F, 13, 1, 13); + baseStand.setRotationPoint(-6.5F, 19F, -6.5F); + baseStand.setTextureSize(128, 64); + baseStand.mirror = true; + setRotation(baseStand, 0F, 0F, 0F); + pillar4 = new ModelRenderer(this, 0, 0); + pillar4.addBox(0F, 0F, 0F, 3, 9, 3); + pillar4.setRotationPoint(4F, 10F, 4F); + pillar4.setTextureSize(128, 64); + pillar4.mirror = true; + setRotation(pillar4, 0F, 0F, 0F); + port3 = new ModelRenderer(this, 40, 50); + port3.addBox(0F, 0F, 0F, 8, 8, 1); + port3.setRotationPoint(-4F, 12F, 7F); + port3.setTextureSize(128, 64); + port3.mirror = true; + setRotation(port3, 0F, 0F, 0F); + port2 = new ModelRenderer(this, 40, 34); + port2.addBox(0F, 0F, 0F, 1, 8, 8); + port2.setRotationPoint(-8F, 12F, -4F); + port2.setTextureSize(128, 64); + port2.mirror = true; + setRotation(port2, 0F, 0F, 0F); + connectorAngle1 = new ModelRenderer(this, 48, 13); + connectorAngle1.addBox(0F, 0F, 0.5F, 8, 1, 2); + connectorAngle1.setRotationPoint(-4F, 13.5F, -6F); + connectorAngle1.setTextureSize(128, 64); + connectorAngle1.mirror = true; + setRotation(connectorAngle1, 0.986111F, 0F, 0F); + pillar3 = new ModelRenderer(this, 0, 0); + pillar3.addBox(0F, 0F, 0F, 3, 9, 3); + pillar3.setRotationPoint(-7F, 10F, 4F); + pillar3.setTextureSize(128, 64); + pillar3.mirror = true; + setRotation(pillar3, 0F, 0F, 0F); + pillar2 = new ModelRenderer(this, 0, 0); + pillar2.addBox(0F, 0F, 0F, 3, 9, 3); + pillar2.setRotationPoint(4F, 10F, -7F); + pillar2.setTextureSize(128, 64); + pillar2.mirror = true; + setRotation(pillar2, 0F, 0F, 0F); + pillar1 = new ModelRenderer(this, 0, 0); + pillar1.addBox(0F, 0F, 0F, 3, 9, 3); + pillar1.setRotationPoint(-7F, 10F, -7F); + pillar1.setTextureSize(128, 64); + pillar1.mirror = true; + setRotation(pillar1, 0F, 0F, 0F); + center = new ModelRenderer(this, 0, 34); + center.addBox(0F, 0F, 0F, 10, 12, 10); + center.setRotationPoint(-5F, 8F, -5F); + center.setTextureSize(128, 64); + center.mirror = true; + setRotation(center, 0F, 0F, 0F); + connector3 = new ModelRenderer(this, 39, 20); + connector3.addBox(0F, 0F, 0F, 1, 1, 8); + connector3.setRotationPoint(5F, 11F, -4F); + connector3.setTextureSize(128, 64); + connector3.mirror = true; + setRotation(connector3, 0F, 0F, 0F); + port1 = new ModelRenderer(this, 40, 50); + port1.addBox(0F, 0F, 0F, 8, 8, 1); + port1.setRotationPoint(-4F, 12F, -8F); + port1.setTextureSize(128, 64); + port1.mirror = true; + setRotation(port1, 0F, 0F, 0F); + connector4 = new ModelRenderer(this, 39, 29); + connector4.addBox(0F, 0F, 0F, 8, 1, 1); + connector4.setRotationPoint(-4F, 11F, 5F); + connector4.setTextureSize(128, 64); + connector4.mirror = true; + setRotation(connector4, 0F, 0F, 0F); + connectorAngle4 = new ModelRenderer(this, 48, 10); + connectorAngle4.addBox(0F, 0F, -1F, 8, 2, 1); + connectorAngle4.setRotationPoint(-4F, 11F, 6F); + connectorAngle4.setTextureSize(128, 64); + connectorAngle4.mirror = true; + setRotation(connectorAngle4, 0.7941248F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 4, 16); + base.setRotationPoint(-8F, 20F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + connectorAngle3 = new ModelRenderer(this, 48, 0); + connectorAngle3.addBox(-1F, 0F, 0F, 1, 2, 8); + connectorAngle3.setRotationPoint(6F, 11F, -4F); + connectorAngle3.setTextureSize(128, 64); + connectorAngle3.mirror = true; + setRotation(connectorAngle3, 0F, 0F, -0.7941248F); + connector2 = new ModelRenderer(this, 39, 20); + connector2.addBox(0F, 0F, 0F, 1, 1, 8); + connector2.setRotationPoint(-6F, 11F, -4F); + connector2.setTextureSize(128, 64); + connector2.mirror = true; + setRotation(connector2, 0F, 0F, 0F); + connectorAngle2 = new ModelRenderer(this, 48, 0); + connectorAngle2.addBox(0F, 0F, 0F, 1, 2, 8); + connectorAngle2.setRotationPoint(-6F, 11F, -4F); + connectorAngle2.setTextureSize(128, 64); + connectorAngle2.mirror = true; + setRotation(connectorAngle2, 0F, 0F, 0.7941248F); + connector1 = new ModelRenderer(this, 48, 13); + connector1.addBox(0F, 0F, 0F, 8, 1, 2); + connector1.setRotationPoint(-4F, 13F, -7.5F); + connector1.setTextureSize(128, 64); + connector1.mirror = true; + setRotation(connector1, 0F, 0F, 0F); } - public void render(float size) + public void render(float size) { - A.render(size); - B.render(size); - C.render(size); - D.render(size); - E.render(size); - F.render(size); - G.render(size); - H.render(size); - I.render(size); - J.render(size); - K.render(size); - L.render(size); - M.render(size); - N.render(size); - O.render(size); - P.render(size); - Q.render(size); - R.render(size); - S.render(size); + port4.render(size); + baseStand.render(size); + pillar4.render(size); + port3.render(size); + port2.render(size); + connectorAngle1.render(size); + pillar3.render(size); + pillar2.render(size); + pillar1.render(size); + center.render(size); + connector3.render(size); + port1.render(size); + connector4.render(size); + connectorAngle4.render(size); + base.render(size); + connectorAngle3.render(size); + connector2.render(size); + connectorAngle2.render(size); + connector1.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java b/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java index 245bab043..2e717a9af 100644 --- a/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java @@ -8,136 +8,147 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelHeatGenerator extends ModelBase { - ModelRenderer A; - ModelRenderer B; - ModelRenderer C; - ModelRenderer D; - ModelRenderer E; - ModelRenderer F; - ModelRenderer G; - ModelRenderer H; - ModelRenderer I; - ModelRenderer J; - ModelRenderer K; - ModelRenderer L; - ModelRenderer M; - ModelRenderer N; - ModelRenderer O; + ModelRenderer drum; + ModelRenderer ring1; + ModelRenderer ring2; + ModelRenderer back; + ModelRenderer bar1; + ModelRenderer bar2; + ModelRenderer plate; + ModelRenderer fin8; + ModelRenderer fin7; + ModelRenderer fin1; + ModelRenderer fin2; + ModelRenderer fin3; + ModelRenderer fin4; + ModelRenderer fin5; + ModelRenderer fin6; + ModelRenderer base; - public ModelHeatGenerator() + public ModelHeatGenerator() { textureWidth = 128; - textureHeight = 128; + textureHeight = 64; - A = new ModelRenderer(this, 0, 0); - A.addBox(-8F, 0F, -8F, 16, 1, 16); - A.setRotationPoint(0F, 23F, 0F); - A.setTextureSize(128, 128); - A.mirror = true; - setRotation(A, 0F, 0F, 0F); - B = new ModelRenderer(this, 0, 85); - B.addBox(0F, 0F, 0F, 8, 6, 10); - B.setRotationPoint(-8F, 17F, -5F); - B.setTextureSize(128, 128); - B.mirror = true; - setRotation(B, 0F, 0F, 0F); - C = new ModelRenderer(this, 0, 67); - C.addBox(-1F, -2F, 0F, 2, 4, 12); - C.setRotationPoint(-5F, 20F, -6F); - C.setTextureSize(128, 128); - C.mirror = true; - setRotation(C, 0F, 0F, 1.570796F); - D = new ModelRenderer(this, 0, 67); - D.addBox(-1F, -2F, 0F, 2, 4, 12); - D.setRotationPoint(-5F, 20F, -6F); - D.setTextureSize(128, 128); - D.mirror = true; - setRotation(D, 0F, 0F, 0.5235988F); - E = new ModelRenderer(this, 0, 67); - E.addBox(-1F, -2F, 0F, 2, 4, 12); - E.setRotationPoint(-5F, 20F, -6F); - E.setTextureSize(128, 128); - E.mirror = true; - setRotation(E, 0F, 0F, -0.5235988F); - F = new ModelRenderer(this, 68, 0); - F.addBox(-2F, -4F, 0F, 4, 8, 10); - F.setRotationPoint(-4F, 13F, -5F); - F.setTextureSize(128, 128); - F.mirror = true; - setRotation(F, 0F, 0F, 0.5235988F); - G = new ModelRenderer(this, 68, 0); - G.addBox(-2F, -4F, 0F, 4, 8, 10); - G.setRotationPoint(-4F, 13F, -5F); - G.setTextureSize(128, 128); - G.mirror = true; - setRotation(G, 0F, 0F, -0.5235988F); - H = new ModelRenderer(this, 68, 0); - H.addBox(-2F, -4F, 0F, 4, 8, 10); - H.setRotationPoint(-4F, 13F, -5F); - H.setTextureSize(128, 128); - H.mirror = true; - setRotation(H, 0F, 0F, 1.570796F); - I = new ModelRenderer(this, 0, 18); - I.addBox(0F, 0F, 0F, 8, 13, 14); - I.setRotationPoint(0F, 10F, -6F); - I.setTextureSize(128, 128); - I.mirror = true; - setRotation(I, 0F, 0F, 0F); - J = new ModelRenderer(this, 0, 47); - J.addBox(0F, 0F, 0F, 6, 11, 1); - J.setRotationPoint(1F, 11F, -7F); - J.setTextureSize(128, 128); - J.mirror = true; - setRotation(J, 0F, 0F, 0F); - K = new ModelRenderer(this, 51, 21); - K.addBox(0F, 0F, 0F, 10, 4, 1); - K.setRotationPoint(-8F, 13F, -4F); - K.setTextureSize(128, 128); - K.mirror = true; - setRotation(K, 0F, 0F, 0F); - L = new ModelRenderer(this, 51, 21); - L.addBox(0F, 0F, 0F, 10, 4, 1); - L.setRotationPoint(-8F, 13F, 3F); - L.setTextureSize(128, 128); - L.mirror = true; - setRotation(L, 0F, 0F, 0F); - M = new ModelRenderer(this, 0, 103); - M.addBox(0F, 0F, 0F, 2, 4, 2); - M.setRotationPoint(-2F, 19F, -7F); - M.setTextureSize(128, 128); - M.mirror = true; - setRotation(M, 0F, 0F, 0F); - N = new ModelRenderer(this, 51, 0); - N.addBox(0F, 0F, 0F, 6, 1, 1); - N.setRotationPoint(-3F, 9F, 0F); - N.setTextureSize(128, 128); - N.mirror = true; - setRotation(N, 0F, 0F, 0F); - O = new ModelRenderer(this, 51, 0); - O.addBox(0F, 0F, 0F, 6, 1, 1); - O.setRotationPoint(-3F, 9F, 2F); - O.setTextureSize(128, 128); - O.mirror = true; - setRotation(O, 0F, 0F, 0F); + drum = new ModelRenderer(this, 0, 22); + drum.addBox(0F, 0F, 0F, 16, 9, 9); + drum.setRotationPoint(-8F, 8.5F, -7.5F); + drum.setTextureSize(128, 64); + drum.mirror = true; + setRotation(drum, 0F, 0F, 0F); + ring1 = new ModelRenderer(this, 88, 0); + ring1.addBox(0F, 0F, 0F, 2, 10, 10); + ring1.setRotationPoint(3F, 8F, -8F); + ring1.setTextureSize(128, 64); + ring1.mirror = true; + setRotation(ring1, 0F, 0F, 0F); + ring2 = new ModelRenderer(this, 88, 0); + ring2.addBox(0F, 0F, 0F, 2, 10, 10); + ring2.setRotationPoint(-5F, 8F, -8F); + ring2.setTextureSize(128, 64); + ring2.mirror = true; + setRotation(ring2, 0F, 0F, 0F); + back = new ModelRenderer(this, 48, 0); + back.addBox(0F, 0F, 0F, 16, 10, 4); + back.setRotationPoint(-8F, 8F, 2F); + back.setTextureSize(128, 64); + back.mirror = true; + setRotation(back, 0F, 0F, 0F); + bar1 = new ModelRenderer(this, 88, 0); + bar1.addBox(0F, 0F, 0F, 2, 9, 1); + bar1.setRotationPoint(3F, 9F, 6F); + bar1.setTextureSize(128, 64); + bar1.mirror = true; + setRotation(bar1, 0F, 0F, 0F); + bar2 = new ModelRenderer(this, 88, 0); + bar2.addBox(0F, 0F, 0F, 2, 9, 1); + bar2.setRotationPoint(-5F, 9F, 6F); + bar2.setTextureSize(128, 64); + bar2.mirror = true; + setRotation(bar2, 0F, 0F, 0F); + plate = new ModelRenderer(this, 41, 22); + plate.addBox(0F, 0F, 0F, 8, 6, 2); + plate.setRotationPoint(-4F, 12F, 6F); + plate.setTextureSize(128, 64); + plate.mirror = true; + setRotation(plate, 0F, 0F, 0F); + fin8 = new ModelRenderer(this, 14, 40); + fin8.addBox(0F, 0F, 0F, 16, 1, 2); + fin8.setRotationPoint(-8F, 8F, 6F); + fin8.setTextureSize(128, 64); + fin8.mirror = true; + setRotation(fin8, 0F, 0F, 0F); + fin7 = new ModelRenderer(this, 14, 40); + fin7.addBox(0F, 0F, 0F, 16, 1, 2); + fin7.setRotationPoint(-8F, 10F, 6F); + fin7.setTextureSize(128, 64); + fin7.mirror = true; + setRotation(fin7, 0F, 0F, 0F); + fin1 = new ModelRenderer(this, 0, 40); + fin1.addBox(0F, 0F, 0F, 4, 1, 2); + fin1.setRotationPoint(4F, 12F, 6F); + fin1.setTextureSize(128, 64); + fin1.mirror = true; + setRotation(fin1, 0F, 0F, 0F); + fin1.mirror = false; + fin2 = new ModelRenderer(this, 0, 40); + fin2.addBox(0F, 0F, 0F, 4, 1, 2); + fin2.setRotationPoint(4F, 14F, 6F); + fin2.setTextureSize(128, 64); + fin2.mirror = true; + setRotation(fin2, 0F, 0F, 0F); + fin2.mirror = false; + fin3 = new ModelRenderer(this, 0, 40); + fin3.addBox(0F, 0F, 0F, 4, 1, 2); + fin3.setRotationPoint(4F, 16F, 6F); + fin3.setTextureSize(128, 64); + fin3.mirror = true; + setRotation(fin3, 0F, 0F, 0F); + fin3.mirror = false; + fin4 = new ModelRenderer(this, 0, 40); + fin4.addBox(0F, 0F, 0F, 4, 1, 2); + fin4.setRotationPoint(-8F, 12F, 6F); + fin4.setTextureSize(128, 64); + fin4.mirror = true; + setRotation(fin4, 0F, 0F, 0F); + fin5 = new ModelRenderer(this, 0, 40); + fin5.addBox(0F, 0F, 0F, 4, 1, 2); + fin5.setRotationPoint(-8F, 14F, 6F); + fin5.setTextureSize(128, 64); + fin5.mirror = true; + setRotation(fin5, 0F, 0F, 0F); + fin6 = new ModelRenderer(this, 0, 40); + fin6.addBox(0F, 0F, 0F, 4, 1, 2); + fin6.setRotationPoint(-8F, 16F, 6F); + fin6.setTextureSize(128, 64); + fin6.mirror = true; + setRotation(fin6, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 6, 16); + base.setRotationPoint(-8F, 18F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); } - public void render(float size) + public void render(float size) { - A.render(size); - B.render(size); - C.render(size); - D.render(size); - E.render(size); - F.render(size); - G.render(size); - H.render(size); - I.render(size); - J.render(size); - K.render(size); - L.render(size); - M.render(size); - N.render(size); - O.render(size); + drum.render(size); + ring1.render(size); + ring2.render(size); + back.render(size); + bar1.render(size); + bar2.render(size); + plate.render(size); + fin8.render(size); + fin7.render(size); + fin1.render(size); + fin2.render(size); + fin3.render(size); + fin4.render(size); + fin5.render(size); + fin6.render(size); + base.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/generators/client/model/ModelSolarGenerator.java b/src/main/java/mekanism/generators/client/model/ModelSolarGenerator.java index 843f778e5..6020bf8fd 100644 --- a/src/main/java/mekanism/generators/client/model/ModelSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelSolarGenerator.java @@ -56,7 +56,7 @@ public class ModelSolarGenerator extends ModelBase solarPanelPipeConnector.mirror = true; setRotation(solarPanelPipeConnector, 0F, 0F, 0F); solarPanelPipeBase1 = new ModelRenderer(this, 36, 33); - solarPanelPipeBase1.addBox(0F, 0F, 0F, 2, 4, 4); + solarPanelPipeBase1.addBox(0F, 0F, 0F, 1, 4, 4); solarPanelPipeBase1.setRotationPoint(2F, 22F, -2F); solarPanelPipeBase1.setTextureSize(64, 64); solarPanelPipeBase1.mirror = true; @@ -69,7 +69,7 @@ public class ModelSolarGenerator extends ModelBase setRotation(solarPanelPipeU1, 0F, 0F, 0F); } - public void render(float size) + public void render(float size) { solarPanelPipeBase.render(size); solarPanel.render(size); diff --git a/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java b/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java index 6b3e9a9e6..73bb3024f 100644 --- a/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java @@ -37,22 +37,6 @@ public class RenderBioGenerator extends TileEntitySpecialRenderer private void renderAModelAt(TileEntityBioGenerator 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, "BioGenerator.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(180, 0F, 0F, 1F); - model.render(0.0625F); - GL11.glPopMatrix(); - if(tileEntity.bioFuelSlot.fluidStored > 0) { push(); @@ -65,6 +49,22 @@ public class RenderBioGenerator extends TileEntitySpecialRenderer pop(); } + + GL11.glPushMatrix(); + GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "BioGenerator.png")); + + switch(tileEntity.facing) + { + case 2: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; + case 3: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; + case 4: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; + case 5: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; + } + + GL11.glRotatef(180, 0F, 0F, 1F); + model.render(0.0625F); + GL11.glPopMatrix(); } @SuppressWarnings("incomplete-switch") @@ -89,46 +89,46 @@ public class RenderBioGenerator extends TileEntitySpecialRenderer { case NORTH: { - model3D.minZ = 0.1875; - model3D.maxZ = 0.4375; + model3D.minZ = 0.5; + model3D.maxZ = 0.875; - model3D.minX = 0.375; - model3D.maxX = 0.625; - model3D.minY = 0.125; - model3D.maxY = 0.125 + ((float)i/stages)*.34375; + model3D.minX = 0.1875; + model3D.maxX = 0.8215; + model3D.minY = 0.4375; + model3D.maxY = 0.4375 + ((float)i/stages)*0.4375; break; } case SOUTH: { - model3D.minZ = 0.5625; - model3D.maxZ = 0.8125; + model3D.minZ = 0.125; + model3D.maxZ = 0.5; - model3D.minX = 0.375; - model3D.maxX = 0.625; - model3D.minY = 0.125; - model3D.maxY = 0.125 + ((float)i/stages)*.34375; + model3D.minX = 0.1875; + model3D.maxX = 0.8215; + model3D.minY = 0.4375; + model3D.maxY = 0.4375 + ((float)i/stages)*0.4375; break; } case WEST: { - model3D.minX = 0.1875; - model3D.maxX = 0.4375; + model3D.minX = 0.5; + model3D.maxX = 0.875; - model3D.minZ = 0.375; - model3D.maxZ = 0.625; - model3D.minY = 0.125; - model3D.maxY = 0.125 + ((float)i/stages)*.34375; + model3D.minZ = 0.1875; + model3D.maxZ = 0.8215; + model3D.minY = 0.4375; + model3D.maxY = 0.4375 + ((float)i/stages)*0.4375; break; } case EAST: { - model3D.minX = 0.5625; - model3D.maxX = 0.8125; + model3D.minX = 0.125; + model3D.maxX = 0.5; - model3D.minZ = 0.375; - model3D.maxZ = 0.625; - model3D.minY = 0.125; - model3D.maxY = 0.125 + ((float)i/stages)*.34375; + model3D.minZ = 0.1875; + model3D.maxZ = 0.8215; + model3D.minY = 0.4375; + model3D.maxY = 0.4375 + ((float)i/stages)*0.4375; break; } } diff --git a/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java b/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java index a8db431d2..3cab83c32 100644 --- a/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java @@ -31,10 +31,10 @@ public class RenderGasGenerator extends TileEntitySpecialRenderer switch(tileEntity.facing) { - case 2: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; - case 3: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; - case 4: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; - case 5: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; + case 2: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; + case 3: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; + case 4: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; + case 5: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; } GL11.glRotatef(180F, 0.0F, 1.0F, 1.0F); diff --git a/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java b/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java index af366eec4..2a2d2d324 100644 --- a/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java @@ -31,10 +31,10 @@ public class RenderHeatGenerator extends TileEntitySpecialRenderer switch(tileEntity.facing) { - case 2: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; - case 3: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; - case 4: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; - case 5: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; + case 2: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; + case 3: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; + case 4: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; + case 5: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; } GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index e542ea7da..44ddf2a3c 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -299,8 +299,8 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB switch(GeneratorType.getFromMetadata(metadata)) { case HEAT_GENERATOR: - world.spawnParticle("smoke", (double)(xRandom + iRandom), (double)yRandom, (double)(zRandom - jRandom), 0.0D, 0.0D, 0.0D); - world.spawnParticle("flame", (double)(xRandom + iRandom), (double)yRandom, (double)(zRandom - jRandom), 0.0D, 0.0D, 0.0D); + world.spawnParticle("smoke", (double)(xRandom - iRandom), (double)yRandom + 0.5F, (double)(zRandom - jRandom), 0.0D, 0.0D, 0.0D); + world.spawnParticle("flame", (double)(xRandom - iRandom), (double)yRandom + 0.5F, (double)(zRandom - jRandom), 0.0D, 0.0D, 0.0D); break; case BIO_GENERATOR: world.spawnParticle("smoke", x+.25, y+.2, z+.5, 0.0D, 0.0D, 0.0D); @@ -314,8 +314,8 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB switch(GeneratorType.getFromMetadata(metadata)) { case HEAT_GENERATOR: - world.spawnParticle("smoke", (double)(xRandom - iRandom), (double)yRandom, (double)(zRandom - jRandom), 0.0D, 0.0D, 0.0D); - world.spawnParticle("flame", (double)(xRandom - iRandom), (double)yRandom, (double)(zRandom - jRandom), 0.0D, 0.0D, 0.0D); + world.spawnParticle("smoke", (double)(xRandom + iRandom), (double)yRandom + 0.5F, (double)(zRandom - jRandom), 0.0D, 0.0D, 0.0D); + world.spawnParticle("flame", (double)(xRandom + iRandom), (double)yRandom + 0.5F, (double)(zRandom - jRandom), 0.0D, 0.0D, 0.0D); break; case BIO_GENERATOR: world.spawnParticle("smoke", x+.75, y+.2, z+.5, 0.0D, 0.0D, 0.0D); @@ -329,8 +329,8 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB switch(GeneratorType.getFromMetadata(metadata)) { case HEAT_GENERATOR: - world.spawnParticle("smoke", (double)(xRandom - jRandom), (double)yRandom, (double)(zRandom + iRandom), 0.0D, 0.0D, 0.0D); - world.spawnParticle("flame", (double)(xRandom - jRandom), (double)yRandom, (double)(zRandom + iRandom), 0.0D, 0.0D, 0.0D); + world.spawnParticle("smoke", (double)(xRandom - jRandom), (double)yRandom + 0.5F, (double)(zRandom - iRandom), 0.0D, 0.0D, 0.0D); + world.spawnParticle("flame", (double)(xRandom - jRandom), (double)yRandom + 0.5F, (double)(zRandom - iRandom), 0.0D, 0.0D, 0.0D); break; case BIO_GENERATOR: world.spawnParticle("smoke", x+.5, y+.2, z+.25, 0.0D, 0.0D, 0.0D); @@ -344,8 +344,8 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB switch(GeneratorType.getFromMetadata(metadata)) { case HEAT_GENERATOR: - world.spawnParticle("smoke", (double)(xRandom - jRandom), (double)yRandom, (double)(zRandom - iRandom), 0.0D, 0.0D, 0.0D); - world.spawnParticle("flame", (double)(xRandom - jRandom), (double)yRandom, (double)(zRandom - iRandom), 0.0D, 0.0D, 0.0D); + world.spawnParticle("smoke", (double)(xRandom - jRandom), (double)yRandom + 0.5F, (double)(zRandom + iRandom), 0.0D, 0.0D, 0.0D); + world.spawnParticle("flame", (double)(xRandom - jRandom), (double)yRandom + 0.5F, (double)(zRandom + iRandom), 0.0D, 0.0D, 0.0D); break; case BIO_GENERATOR: world.spawnParticle("smoke", x+.5, y+.2, z+.75, 0.0D, 0.0D, 0.0D); diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index 96426d3c0..5bdce96d7 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -3,7 +3,6 @@ package mekanism.generators.common.tile; import io.netty.buffer.ByteBuf; import java.util.ArrayList; -import java.util.EnumSet; import mekanism.api.MekanismConfig.generators; import mekanism.common.FluidSlot; @@ -211,12 +210,6 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui return data; } - @Override - public EnumSet getOutputtingSides() - { - return EnumSet.of(ForgeDirection.getOrientation(facing).getOpposite()); - } - private static final String[] methods = new String[] {"getEnergy", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getBioFuel", "getBioFuelNeeded"}; @Override diff --git a/src/main/resources/assets/mekanism/render/BioGenerator.png b/src/main/resources/assets/mekanism/render/BioGenerator.png index 40d39196418ee9616910a580cde1d490b4ebab71..7e557bee80b1d12345c47246f81b760696434a24 100644 GIT binary patch literal 5595 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 Kx)s{jZvPkarArL} literal 5331 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 diff --git a/src/main/resources/assets/mekanism/render/Chargepad.png b/src/main/resources/assets/mekanism/render/Chargepad.png index 4e096ad432f2f8c9a7e79b24dfad325b80e2ba2e..8da4e6ca045c8fdb9ba4b2c83cddd1fde7f1532d 100644 GIT binary patch literal 3389 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 literal 4717 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 Pc@F4k7^=h7oMQeDSP}5N diff --git a/src/main/resources/assets/mekanism/render/GasGenerator.png b/src/main/resources/assets/mekanism/render/GasGenerator.png index 6ce2bbc7b741537ee88bf405d1b1143a0e837104..221ff4985e60f96b5ab4555637781bd453d99bd5 100644 GIT binary patch literal 5356 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 Hu0mjfF$KnP delta 2221 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 diff --git a/src/main/resources/assets/mekanism/render/GasTankBasic.png b/src/main/resources/assets/mekanism/render/GasTankBasic.png index 7d7dd42ddeee24a98474bea8663a0b673e32adc9..bc5c2eddda38eb061caa4cffcb5b9b2e160ce754 100644 GIT binary patch delta 2934 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 literal 3238 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 bVU2(!32Ch!l4!8{2bY7Lvu&C6v6KG=P<0cl literal 2783 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 Ze*yKHUkO;$)ZWD29C;p>d@ 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 R9sR@svaYF4iIx-fzX0E78MXib diff --git a/src/main/resources/assets/mekanism/render/PressurizedReactionChamber.png b/src/main/resources/assets/mekanism/render/PressurizedReactionChamber.png old mode 100755 new mode 100644 index bb09dc60e84e47ede7eccd6f93bb5f6eb8c0dc19..32d0c5ce78e0e7cef2c5261f67ee68fc09bbc075 GIT binary patch literal 5404 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 From 97bd7198d1dbab94dab6b299ae5e22d47a7b88ec Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 26 Mar 2016 01:39:22 -0400 Subject: [PATCH 20/62] Texture fixes for @CyanideX --- .../client/render/MekanismRenderer.java | 13 +++++++++- .../mekanism/common/block/BlockMachine.java | 24 +++++++++---------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 11c414d39..5cf312939 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -183,7 +183,7 @@ public class MekanismRenderer for(DefIcon def : defaults) { - if(def.icons.contains(side.ordinal()+6)) + if(def.icons.contains(side.ordinal()+6) && def.overridesInactive) { textures[side.ordinal()+6] = def.defIcon; found = true; @@ -219,6 +219,10 @@ public class MekanismRenderer public List icons = new ArrayList(); + /** If this DefIcon should be prioritized over a machine's side-specific off texture + * if no on texture is present. */ + public boolean overridesInactive = true; + public DefIcon(IIcon icon, int... is) { defIcon = icon; @@ -229,6 +233,13 @@ public class MekanismRenderer } } + public DefIcon setOverrides(boolean b) + { + overridesInactive = b; + + return this; + } + public static DefIcon getAll(IIcon icon) { return new DefIcon(icon, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index cdd665637..dd2d8e0d2 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -199,20 +199,20 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo for(RecipeType type : RecipeType.values()) { MekanismRenderer.loadDynamicTextures(register, "factory/basic/" + type.getUnlocalizedName().toLowerCase() + "/" + BaseTier.BASIC.getName() + type.getUnlocalizedName() + MachineType.BASIC_FACTORY.name, factoryIcons[0][type.ordinal()], - DefIcon.getActivePair(register.registerIcon("mekanism:factory/basic/BasicFactoryFront"), 2), - DefIcon.getActivePair(register.registerIcon("mekanism:factory/basic/BasicFactoryTop"), 1), - DefIcon.getActivePair(register.registerIcon("mekanism:factory/basic/BasicFactoryBottom"), 0), - DefIcon.getActivePair(register.registerIcon("mekanism:factory/basic/BasicFactorySide"), 3, 4, 5)); + DefIcon.getActivePair(register.registerIcon("mekanism:factory/basic/BasicFactoryFront"), 2).setOverrides(false), + DefIcon.getActivePair(register.registerIcon("mekanism:factory/basic/BasicFactoryTop"), 1).setOverrides(false), + DefIcon.getActivePair(register.registerIcon("mekanism:factory/basic/BasicFactoryBottom"), 0).setOverrides(false), + DefIcon.getActivePair(register.registerIcon("mekanism:factory/basic/BasicFactorySide"), 3, 4, 5).setOverrides(false)); MekanismRenderer.loadDynamicTextures(register, "factory/advanced/" + type.getUnlocalizedName().toLowerCase() + "/" + BaseTier.ADVANCED.getName() + type.getUnlocalizedName() + MachineType.ADVANCED_FACTORY.name, factoryIcons[1][type.ordinal()], - DefIcon.getActivePair(register.registerIcon("mekanism:factory/advanced/AdvancedFactoryFront"), 2), - DefIcon.getActivePair(register.registerIcon("mekanism:factory/advanced/AdvancedFactoryTop"), 1), - DefIcon.getActivePair(register.registerIcon("mekanism:factory/advanced/AdvancedFactoryBottom"), 0), - DefIcon.getActivePair(register.registerIcon("mekanism:factory/advanced/AdvancedFactorySide"), 3, 4, 5)); + DefIcon.getActivePair(register.registerIcon("mekanism:factory/advanced/AdvancedFactoryFront"), 2).setOverrides(false), + DefIcon.getActivePair(register.registerIcon("mekanism:factory/advanced/AdvancedFactoryTop"), 1).setOverrides(false), + DefIcon.getActivePair(register.registerIcon("mekanism:factory/advanced/AdvancedFactoryBottom"), 0).setOverrides(false), + DefIcon.getActivePair(register.registerIcon("mekanism:factory/advanced/AdvancedFactorySide"), 3, 4, 5).setOverrides(false)); MekanismRenderer.loadDynamicTextures(register, "factory/elite/" + type.getUnlocalizedName().toLowerCase() + "/" + BaseTier.ELITE.getName() + type.getUnlocalizedName() + MachineType.ELITE_FACTORY.name, factoryIcons[2][type.ordinal()], - DefIcon.getActivePair(register.registerIcon("mekanism:factory/elite/EliteFactoryFront"), 2), - DefIcon.getActivePair(register.registerIcon("mekanism:factory/elite/EliteFactoryTop"), 1), - DefIcon.getActivePair(register.registerIcon("mekanism:factory/elite/EliteFactoryBottom"), 0), - DefIcon.getActivePair(register.registerIcon("mekanism:factory/elite/EliteFactorySide"), 3, 4, 5)); + DefIcon.getActivePair(register.registerIcon("mekanism:factory/elite/EliteFactoryFront"), 2).setOverrides(false), + DefIcon.getActivePair(register.registerIcon("mekanism:factory/elite/EliteFactoryTop"), 1).setOverrides(false), + DefIcon.getActivePair(register.registerIcon("mekanism:factory/elite/EliteFactoryBottom"), 0).setOverrides(false), + DefIcon.getActivePair(register.registerIcon("mekanism:factory/elite/EliteFactorySide"), 3, 4, 5).setOverrides(false)); } MekanismRenderer.loadDynamicTextures(register, "purification_chamber/" + MachineType.PURIFICATION_CHAMBER.name, icons[9], def); From 42ca8c29b1206de2f13969e00e1d2be849b729f3 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 26 Mar 2016 12:34:34 -0400 Subject: [PATCH 21/62] Fix to weird item texture winding bug. I don't know why I have to do this --- .../java/mekanism/client/render/MekanismRenderer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 5cf312939..9ee77bbac 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -553,11 +553,11 @@ public class MekanismRenderer tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, custom.getIcon(stack, 4)); + renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, custom.getIcon(stack, 5)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, custom.getIcon(stack, 5)); + renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, custom.getIcon(stack, 4)); tessellator.draw(); } catch(Exception e) {} @@ -596,11 +596,11 @@ public class MekanismRenderer tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, metadata)); + renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, metadata)); + renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, metadata)); tessellator.draw(); } catch(Exception e) {} From 25866b39f9eed12cbf1dcf87d710d317f3eb3aa2 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 26 Mar 2016 13:28:48 -0400 Subject: [PATCH 22/62] Fixed fluid scaling issue --- src/main/java/mekanism/client/gui/GuiDynamicTank.java | 2 +- .../java/mekanism/common/multiblock/UpdateProtocol.java | 4 ++-- .../mekanism/common/tile/TileEntityBoilerCasing.java | 6 +++--- .../java/mekanism/common/tile/TileEntityDynamicTank.java | 9 ++++----- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiDynamicTank.java b/src/main/java/mekanism/client/gui/GuiDynamicTank.java index df836864a..46c5b07b8 100644 --- a/src/main/java/mekanism/client/gui/GuiDynamicTank.java +++ b/src/main/java/mekanism/client/gui/GuiDynamicTank.java @@ -62,7 +62,7 @@ public class GuiDynamicTank extends GuiMekanism int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); - + if(tileEntity.getScaledFluidLevel(58) > 0) { displayGauge(7, 14, tileEntity.getScaledFluidLevel(58), tileEntity.structure.fluidStored, 0); diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index f33d6fb9f..4c95d0e5c 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -182,7 +182,7 @@ public abstract class UpdateProtocol> volume += locations.size(); - if(volume >= 27 && volume <= 5832 && locations.size() >= 26) + if(Math.abs(xmax-xmin)+1 <= 18 && Math.abs(xmax-xmin)+1 <= 18 && Math.abs(zmax-zmin)+1 <= 18) { if(rightBlocks && rightFrame && isHollow && isCorner) { @@ -191,7 +191,7 @@ public abstract class UpdateProtocol> structure.volLength = Math.abs(xmax-xmin)+1; structure.volHeight = Math.abs(ymax-ymin)+1; structure.volWidth = Math.abs(zmax-zmin)+1; - structure.volume = volume; + structure.volume = structure.volLength*structure.volHeight*structure.volWidth; structure.renderLocation = Coord4D.get(tile).translate(0, 1, 0); structure.minLocation = Coord4D.get(tile).translate(xmin, ymin, zmin); structure.maxLocation = Coord4D.get(tile).translate(xmax, ymax, zmax); diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java index a6b73f751..232b16796 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java @@ -156,14 +156,14 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock 0.01) { prevScale = (9*prevScale + targetScale)/10; @@ -116,7 +115,7 @@ public class TileEntityDynamicTank extends TileEntityMultiblock Date: Sat, 26 Mar 2016 14:54:13 -0400 Subject: [PATCH 23/62] Crash fix --- .../java/mekanism/common/tile/TileEntityBoilerCasing.java | 4 ++-- src/main/java/mekanism/common/tile/TileEntityDynamicTank.java | 2 +- .../common/tile/turbine/TileEntityTurbineCasing.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java index 232b16796..1c2ab9efe 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java @@ -161,8 +161,8 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock Date: Sat, 26 Mar 2016 17:42:12 -0400 Subject: [PATCH 24/62] Texture fixes --- .../client/render/MekanismRenderer.java | 17 +++++++++-------- .../mekanism/common/block/BlockMachine.java | 2 ++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 9ee77bbac..d6a75452b 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -521,6 +521,7 @@ public class MekanismRenderer GL11.glColor4f(red, green, blue, 1.0F); } + GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(-0.5F, -0.5F, -0.5F); } @@ -545,19 +546,19 @@ public class MekanismRenderer tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, custom.getIcon(stack, 2)); + renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, custom.getIcon(stack, 3)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, custom.getIcon(stack, 3)); + renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, custom.getIcon(stack, 2)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, custom.getIcon(stack, 5)); + renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, custom.getIcon(stack, 4)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, custom.getIcon(stack, 4)); + renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, custom.getIcon(stack, 5)); tessellator.draw(); } catch(Exception e) {} @@ -588,19 +589,19 @@ public class MekanismRenderer tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, metadata)); + renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, metadata)); + renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, metadata)); + renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, metadata)); + renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, metadata)); tessellator.draw(); } catch(Exception e) {} diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index dd2d8e0d2..d80d8e681 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -430,6 +430,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo switch(meta) { case 3: + case 5: return icons[meta][side]; default: return icons[meta][0] != null ? icons[meta][0] : BASE_ICON; @@ -483,6 +484,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo switch(meta) { case 3: + case 5: boolean active = MekanismUtils.isActive(world, x, y, z); return icons[meta][MekanismUtils.getBaseOrientation(side, tileEntity.facing)+(active ? 6 : 0)]; default: From 882d9752aa4b2bb4162053a7311afa6cdc027f11 Mon Sep 17 00:00:00 2001 From: EzerArch Date: Sun, 27 Mar 2016 02:03:46 -0300 Subject: [PATCH 25/62] Update pt_BR lang Full Brazilian Portuguese translation of Mekanism. Still has room for improvements. European Portuguese to come. --- .../resources/assets/mekanism/lang/pt_BR.lang | 305 +++++++++++++----- 1 file changed, 216 insertions(+), 89 deletions(-) diff --git a/src/main/resources/assets/mekanism/lang/pt_BR.lang b/src/main/resources/assets/mekanism/lang/pt_BR.lang index e57a0e8e7..1b22de70f 100644 --- a/src/main/resources/assets/mekanism/lang/pt_BR.lang +++ b/src/main/resources/assets/mekanism/lang/pt_BR.lang @@ -10,8 +10,8 @@ item.AtomicAlloy.name=Liga Atômica item.EnergyTablet.name=Tablete de Energia item.SpeedUpgrade.name=Upgrade de Velocidade item.EnergyUpgrade.name=Upgrade de Energia -item.FilterUpgrade.name=Filter Upgrade -item.GasUpgrade.name=Gas Upgrade +item.FilterUpgrade.name=Upgrade de Filtro +item.GasUpgrade.name=Upgrade de Gás item.Robit.name=Robit item.AtomicDisassembler.name=Desintegrador Atômico item.ElectricBow.name=Arco Elétrico @@ -61,7 +61,7 @@ tile.GasTank.GasTank.name=Tanque de Gás tile.CardboardBox.name=Caixa de Papelão //Bounding Block -tile.BoundingBlock.name=Delimitadora de Bloco +tile.BoundingBlock.name=Delimitador de Bloco //Salt tile.SaltBlock.name=Bloco de Sal @@ -161,7 +161,10 @@ tile.OreBlock.CopperOre.name=Minério de Cobre tile.OreBlock.TinOre.name=Minério de Estanho //Transmitters -item.MultipartTransmitter.PressurizedTube.name=Tubo Pressurizado +item.MultipartTransmitter.BasicPressurizedTube.name=Tubo Pressurizado Básico +item.MultipartTransmitter.AdvancedPressurizedTube.name=Tubo Pressurizado Avançado +item.MultipartTransmitter.ElitePressurizedTube.name=Tubo Pressurizado Elite +item.MultipartTransmitter.UltimatePressurizedTube.name=Tubo Pressurizado Final item.MultipartTransmitter.BasicUniversalCable.name=Cabo Universal Básico item.MultipartTransmitter.AdvancedUniversalCable.name=Cabo Universal Avançado item.MultipartTransmitter.EliteUniversalCable.name=Cabo Universal Elite @@ -170,7 +173,10 @@ item.MultipartTransmitter.BasicMechanicalPipe.name=Tubo Mecânico Básico item.MultipartTransmitter.AdvancedMechanicalPipe.name=Tubo Mecânico Avançado item.MultipartTransmitter.EliteMechanicalPipe.name=Tubo Mecânico Elite item.MultipartTransmitter.UltimateMechanicalPipe.name=Tubo Mecânico Final -item.MultipartTransmitter.LogisticalTransporter.name=Transportador Logístico +item.MultipartTransmitter.BasicLogisticalTransporter.name=Transportador Logístico Básico +item.MultipartTransmitter.AdvancedLogisticalTransporter.name=Transportador Logístico Avançado +item.MultipartTransmitter.EliteLogisticalTransporter.name=Transportador Logístico Elite +item.MultipartTransmitter.UltimateLogisticalTransporter.name=Transportador Logístico Final item.MultipartTransmitter.RestrictiveTransporter.name=Transportador Restritivo item.MultipartTransmitter.DiversionTransporter.name=Transportador Redirecionador @@ -178,17 +184,23 @@ item.MultipartTransmitter.DiversionTransporter.name=Transportador Redirecionador item.GlowPanel.name=Painel de Pedra Luminosa //Energy Cubes -tile.EnergyCube.Basic.name=Cubo de Energia Básico -tile.EnergyCube.Advanced.name=Cubo de Energia Avançado -tile.EnergyCube.Elite.name=Cubo de Energia de Elite -tile.EnergyCube.Ultimate.name=Cubo de Energia Final -tile.EnergyCube.Creative.name=Cubo de Energia Criativo +tile.EnergyCubeBasic.name=Cubo de Energia Básico +tile.EnergyCubeAdvanced.name=Cubo de Energia Avançado +tile.EnergyCubeElite.name=Cubo de Energia de Elite +tile.EnergyCubeUltimate.name=Cubo de Energia Final +tile.EnergyCubeCreative.name=Cubo de Energia Criativo + +//Factory Installers +item.basicFactoryInstaller.name=Instalador Fabril Básico +item.advancedFactoryInstaller.name=Instalador Fabril Avançado +item.eliteFactoryInstaller.name=Instalador Fabril Elite //Dust item.ironDust.name=Pó de Ferro item.goldDust.name=Pó de Ouro item.osmiumDust.name=Pó de Ósmio -item.obsidianDust.name=Pó de Obsidiana Refinado +item.obsidianDust.name=Pó de Obsidiana +item.refinedobsidianDust.name=Pó de Obsidiana Refinado item.diamondDust.name=Pó de Diamante item.steelDust.name=Pó de Aço item.copperDust.name=Pó de Cobre @@ -205,7 +217,6 @@ item.osmiumClump.name=Aglomerado de Ósmio item.copperClump.name=Aglomerado de Cobre item.tinClump.name=Aglomerado de Estanho item.silverClump.name=Aglomerado de Prata -item.obsidianClump.name=Aglomerado de Obsidiana item.leadClump.name=Aglomerado de Chumbo //Shards @@ -215,7 +226,6 @@ item.osmiumShard.name=Estilhaço de Ósmio item.copperShard.name=Estilhaço de Cobre item.tinShard.name=Estilhaço de Estanho item.silverShard.name=Estilhaço de Prata -item.obsidianShard.name=Estilhaço de Obsidiana item.leadShard.name=Estilhaço de Chumbo //Crystals @@ -225,7 +235,6 @@ item.osmiumCrystal.name=Cristal de Ósmio item.copperCrystal.name=Cristal de Cobre item.tinCrystal.name=Cristal de Estanho item.silverCrystal.name=Cristal de Prata -item.obsidianCrystal.name=Cristal de Obsidiana item.leadCrystal.name=Cristal de Chumbo //Dirty Dust @@ -235,7 +244,6 @@ item.dirtyOsmiumDust.name=Pó de Ósmio Sujo item.dirtyCopperDust.name=Pó de Cobre Sujo item.dirtyTinDust.name=Pó de Estanho Sujo item.dirtySilverDust.name=Pó de Prata Sujo -item.dirtyObsidianDust.name=Pó de Obsidiana Sujo item.dirtyLeadDust.name=Pó de Chumbo Sujo //Ingots @@ -299,6 +307,11 @@ fluid.hydrogenChloride=Cloreto de Hidrogênio Líquido fluid.brine=Salmoura fluid.ethene=Etileno Líquido fluid.sodium=Sódio Líquido +fluid.heavyWater=Água Pesada +fluid.lithium=Lítio Líquido +fluid.deuterium=Deutério Líquido +fluid.tritium=Trítio Líquido +fluid.fusionFuelDT=Combustível D-T Líquido //OreGas names oregas.iron=Minério de Ferro @@ -317,6 +330,13 @@ tier.Elite=Elite tier.Ultimate=Final tier.Creative=Criativo +//Transmission types +transmission.Energy=Energia +transmission.Fluids=Fluidos +transmission.Gases=Gases +transmission.Items=Itens +transmission.Heat=Calor + //Update handler text update.consider=Considere atualizar para a versão update.newFeatures=Novas funcionalidades @@ -330,22 +350,31 @@ upgrade.energy=Energia upgrade.energy.desc=Aumenta a eficiência energética !ne a capacidade das máquinas. upgrade.speed=Velocidade upgrade.speed.desc=Aumenta a velocidade das máquinas. +upgrade.filter=Filtro +upgrade.filter.desc=Um filtro que separa !nágua pesada da água regular. +upgrade.gas=Gás +upgrade.gas.desc=Aumenta a eficiência de !nmáquinas a gás. //Key description text -key.mode=Modo Interruptor +key.mode=Alternar Modo de Ferramenta +key.armorMode=Alternar Modo de Armadura key.voice=Voz //Entities -entity.Robit.name=Robit -entity.BabySkeleton.name=Esqueleto Bebê +entity.Mekanism.Robit.name=Robit +entity.Mekanism.BabySkeleton.name=Esqueleto Bebê //Config Gui mekanism.configgui.ctgy.general=Configurações Gerais do Mekanism +mekanism.configgui.ctgy.machines=Configurações das Máquinas +mekanism.configgui.ctgy.tier=Configurações dos Níveis mekanism.configgui.ctgy.usage=Configurações de Uso mekanism.configgui.ctgy.client=Configurações do Cliente //Config Tooltips -mekanism.configgui.ctgy.general.tooltip=Configurações gerais a respeito Mekanism e todos os seus módulos +mekanism.configgui.ctgy.general.tooltip=Configurações gerais relativas a Mekanism e todos os seus módulos +mekanism.configgui.ctgy.machines.tooltip=Configurações relativas a habilitar e desabilitar de maquinário especifico +mekanism.configgui.ctgy.tier.tooltip=Configurações relativas a níveis do Mekanism e seus valores correspondentes mekanism.configgui.ctgy.usage.tooltip=Configurações relativas a máquinas e seu consumo de energia mekanism.configgui.ctgy.client.tooltip=Configurações específicas do cliente sobre Mekanism e todos os seus módulos @@ -353,7 +382,7 @@ mekanism.configgui.ctgy.client.tooltip=Configurações específicas do cliente s gui.removeSpeedUpgrade=Remover upgrade de velocidade gui.removeEnergyUpgrade=Remover upgrade de energia gui.condensentrating=Condensentrando -gui.decondensentrating=Decondensentrando +gui.decondensentrating=Descondensentrando gui.power=Energia gui.confirm=Confirmar gui.open=Abrir @@ -364,8 +393,8 @@ gui.edit=Editar gui.save=Salvar gui.output=Saída gui.delete=Deletar -gui.status=Estatus -gui.autoEject=Auto-ejetar +gui.status=Estado +gui.autoEject=Autoejetar gui.itemstack=PilhaDeItems gui.oredict=OreDict gui.material=Material @@ -379,18 +408,20 @@ gui.config=Configurar gui.teleport=Teleporte gui.eject=Ejetar gui.input=Entrada +gui.strictInput=Entrada Estrita gui.slots=Aberturas gui.state=Estado -gui.on=Ligado -gui.off=Desligado +gui.on=SIM +gui.off=NÃO gui.filters=Filtros +gui.filter=Filtro gui.idle=Inativo gui.data=Dados gui.newFilter=Novo Filtro gui.energy=Energia gui.gas=Gás gui.dumping=Despejar -gui.dumping_excess=Excesso de Despejo +gui.dumping_excess=Despejar Excesso gui.modID=Mod ID gui.key=Chave gui.id=ID @@ -402,35 +433,91 @@ gui.min=Min. gui.max=Máx. gui.delay=Atraso gui.noDelay=Sem atraso +gui.fuel=Combustível +gui.heat=Calor +gui.formed=Formado +gui.incomplete=Incompleto +gui.inductionMatrix=Matriz de Indução +gui.matrixStats=Estatísticas da Matriz +gui.main=Principal +gui.outputting=Emitindo +gui.receiving=Recebendo +gui.dimensions=Dimensões +gui.constituents=Componentes +gui.cells=células +gui.providers=provedores +gui.structure=Estrutura +gui.dynamicTank=Tanque Dinâmico +gui.visuals=Aparência +gui.noEject=Não Ejeta +gui.undefined=Indefinido +gui.owner=Proprietário +gui.public=Público +gui.private=Privado +gui.add=Adicionar +gui.set=Definir +gui.freq=Freq +gui.security=Segurança +gui.index=Índice +gui.producing=Produzindo +gui.maxOutput=Saída Máx. +gui.storing=Armazenando +gui.skyBlocked=Céu obstruído +gui.using=Usando +gui.needed=Necessário +gui.noRecipe=Sem receita +gui.conflict=Conflito +gui.height=Altura +gui.mult=Multi +gui.chunk=Chunk +gui.vibrating=Vibrando +gui.abundancy=Abundância +gui.nextItem=Próximo Item +gui.lastItem=Último Item +gui.oreDictCompat=Chave OreDict Compatível +gui.toggleCooling=Alternar Medições de Refrigeração +gui.coolingMeasurements=Resfriamento Ativo +gui.redstoneOutputMode=Modo Redstone +gui.entityDetection=Detecção de Entidades +gui.moveUp=Subir +gui.moveDown=Descer + +gui.reactor.injectionRate=Taxa de Injeção gui.upgrades=Aprimorações gui.upgrades.supported=Suportado -gui.upgrades.noSelection=Nenhuma seleção +gui.upgrades.noSelection=Sem seleção gui.upgrades.amount=Quantidade gui.upgrades.max=Máx. gui.upgrades.effect=Efeito gui.chemicalInfuser.short=Infusor Quím. gui.chemicalDissolutionChamber.short=Câm. Dissolução Quím. +gui.solarEvaporationController.short=Ctrl. Evaporação Solar gui.dictionary.noKey=Sem Entrada. gui.configuration=Configuração +gui.config=Config +gui.configuration.side=Configurar Lados +gui.configuration.transporter=Configurar Transportador gui.configuration.strictInput=Entrada Restrita gui.rotaryCondensentrator.toggleOperation=Alternar Operação gui.factory.secondaryEnergy=Energia Secundária -gui.factory.smelting=Fundindo -gui.factory.enriching=Enriquecendo -gui.factory.crushing=Triturando -gui.factory.compressing=Comprimido -gui.factory.combining=Combinando -gui.factory.purifying=Purificando -gui.factory.injecting=Injetando -gui.factory.autoSort=Classif. Auto +gui.factory.autoSort=Autoclassificar -gui.seismicReader.short=Leitor S. +//Recipe types +gui.factory.Smelting=Fundindo +gui.factory.Enriching=Enriquecendo +gui.factory.Crushing=Triturando +gui.factory.Compressing=Comprimindo +gui.factory.Combining=Combinando +gui.factory.Purifying=Purificando +gui.factory.Injecting=Injetando + +gui.seismicReader.short=Leitor Sís. gui.seismicReader.solids=Sólidos gui.seismicReader.fluids=Líquidos gui.seismicReader.reading=Lendo @@ -441,10 +528,12 @@ gui.oredictFilter=Filtro OreDict gui.oredictFilter.noKey=Nenhuma entrada digitada gui.oredictFilter.sameKey=Mesma entrada -gui.modIDFilter=Mod ID Filtro +gui.modIDFilter=Filtro Mod ID gui.modIDFilter.noID=Nenhuma ID inserido gui.modIDFilter.sameID=O mesmo ID +gui.oredictionificatorFilter=Filtro Oredictionificador + gui.itemFilter=Filtro de Itens gui.itemFilter.noItem=Sem Itens gui.itemFilter.details=Detalhes da Pilha De Itens @@ -460,13 +549,13 @@ gui.robit=Robit gui.robit.smelting=Fundição Robit gui.robit.inventory=Inventário Robit gui.robit.crafting=Criação Robit -gui.robit.greeting=Olá eu sou +gui.robit.greeting=Olá, eu sou gui.robit.toggleFollow=Alternar modo 'seguir' gui.robit.rename=Renomear este Robit gui.robit.teleport=Teleportar para casa gui.robit.togglePickup=Alternar modo 'coletar itens' gui.robit.following=Seguindo -gui.robit.dropPickup=Largar e Capturar +gui.robit.dropPickup=Coleta de itens gui.robit.owner=Proprietário gui.password.setPassword=Definir senha @@ -485,20 +574,22 @@ gui.electricChest.editPassword=Editar Senha gui.teleporter.notReady=Não Pronto gui.teleporter.ready=Pronto -gui.teleporter.noFrame=Nenhum frame +gui.teleporter.noFrame=Nenhum quadro gui.teleporter.noLink=Nenhuma conexão localizada gui.teleporter.exceeds=Conexões > 2 gui.teleporter.needsEnergy=Requer Energia +gui.teleporter.noAccess=You don't have access to this teleporter. +gui.teleporter.noFreq=Sem frequência gui.digitalMinerConfig=Config Minerador Digital -gui.digitalMiner.autoPull=Auto-puxar +gui.digitalMiner.autoPull=Autopuxar gui.digitalMiner.replaceBlock=Substituir bloco -gui.digitalMiner.reset=Resetar +gui.digitalMiner.reset=Redefinir gui.digitalMiner.silkTouch=Toque Suave gui.digitalMiner.pull=Puxar gui.digitalMiner.silk=Suave -gui.digitalMiner.toMine=Para Minerar +gui.digitalMiner.toMine=Minerar gui.digitalMiner.running=Rodando gui.digitalMiner.inverse=Modo Inverso gui.digitalMiner.requireReplace=Requer substituição @@ -507,6 +598,7 @@ gui.digitalMiner.missingBlock=Falta de Bloco //Recipe names recipe.mekanismShaped=Em Formato de +recipe.mekanismShapeless=Sem Formato //Item and block tooltip text tooltip.configurator.configurate=Configurar @@ -515,14 +607,17 @@ tooltip.configurator.rotate=Girar tooltip.configurator.wrench=Chave Inglesa tooltip.configurator.pumpReset=Resetar cálculo da Bomba Elétrica tooltip.configurator.toggleDiverter=Modo do Diversor alterado para -tooltip.configurator.toggleColor=Cor passada para -tooltip.configurator.viewColor=Cor atual +tooltip.configurator.toggleMode=%s behavior bumped to +tooltip.configurator.viewMode=Current %s behavior tooltip.configurator.unauth=Este baú está trancado tooltip.configurator.noLink=Sem ligação tooltip.configurator.linkMsg=Ligado a tooltip.configurator.dim=dimensão tooltip.configurator.setLink=Defina ligação ao bloco de tooltip.configurator.plenisherReset=Redefinição de Cálculo de Fluído +tooltip.configurator.inductionPortMode=Toggled Induction Port transfer mode to +tooltip.configurator.toggleColor=Cor passada para +tooltip.configurator.viewColor=Cor atual tooltip.upgrade.speed=Velocidade tooltip.upgrade.energy=Energia @@ -564,13 +659,18 @@ tooltip.keysFound=Chave(s) encontradas tooltip.noKey=Sem chave tooltip.hp=HP tooltip.configureState=Configurar Estado +tooltip.outputRate=Taxa de Emissão +tooltip.insufficientFuel=Pouco Combustível +tooltip.readyForReaction=Pronto para Reação +tooltip.speed=Velocidade +tooltip.and=e tooltip.portableTank.bucketMode=Modo Balde tooltip.disassembler.normal=normal tooltip.disassembler.slow=lento tooltip.disassembler.fast=rápido -tooltip.disassembler.vein=vein +tooltip.disassembler.vein=veio tooltip.disassembler.off=desligado tooltip.filterCard.got=Filtrar dados recuperados de %s @@ -578,6 +678,7 @@ tooltip.filterCard.set=Filtrar dados injetados do tipo %s tooltip.filterCard.unequal=Formatos de dados do filtro desiguais tooltip.filterCard.logisticalSorter=Classificador Logístico tooltip.filterCard.digitalMiner=Minerador Digital +tooltip.filterCard.oredictionificator=Oredictionificador tooltip.balloon=Balão @@ -585,14 +686,19 @@ tooltip.jetpack.regular=Normal tooltip.jetpack.hover=Pairar tooltip.jetpack.disabled=Desativado +tooltip.flamethrower.combat=Combate +tooltip.flamethrower.heat=Calor +tooltip.flamethrower.inferno=Inferno +tooltip.flamethrower.modeBump=Modo do Lança-Chamas mudado para + tooltip.seismicReader.needsEnergy=Energia não suficiente para interpretar a vibração tooltip.seismicReader.noVibrations=Incapaz de descobrir quaisquer vibrações -tooltip.EnrichmentChamber=Uma máquina simples usada para enriquecer minérios em !nduas de suas partes em pó, como também !nperformar diversas outras operações. -tooltip.OsmiumCompressor=Uma máquina um tanto avançada usado para comprimir !nósmio em vários pós em ordem para poder criar !nsuas partes em barras. -tooltip.Combiner=Uma máquina usada para combinar pós e pedregulho para !nformar suas partes em minério. -tooltip.Crusher=Uma máquina em pó usada para triturar barras em suas partes em pó, !ncomo também fazer várias outtas operações. -tooltip.DigitalMiner=Uma auto-mineradora altamente avançada com filtros que pode !nminerar qualquer bloco que quiser em !numa área (máxima) de 32 blocos. +tooltip.EnrichmentChamber=Uma máquina simples usada para enriquecer minérios !ntornando-os em duas porções de pó, como também !nrealizar muitas outras operações. +tooltip.OsmiumCompressor=Uma máquina um tanto avançada usada para comprimir !nósmio com pós de outros materiais parar convertê-los !nem lingotes. +tooltip.Combiner=Uma máquina usada para combinar pedregulho com pós de outros !nmateriais para convertê-los em minério. +tooltip.Crusher=Uma máquina usada para triturar lingotes em pó, !ncomo também fazer várias outtas operações. +tooltip.DigitalMiner=Uma automineradora altamente avançada com filtros que pode !nminerar qualquer bloco que ordenar !nnum raio de 32 blocos (máx.). tooltip.BasicFactory=O menor nível da linha de Fábricas, que pode !nser usada para processar múltiplas operações de máquinas !nde uma vez. tooltip.AdvancedFactory=O nível intermediário da linha de Fábricas, que pode !nser usada para processar múltiplas operações de máquinas !nde uma vez. tooltip.EliteFactory=O maior nível da linha de Fábricas, que pode !nser usada para processar múltiplas operações de máquinas !nde uma vez. @@ -603,23 +709,25 @@ tooltip.Teleporter=Uma máquina capaz de teletransportar jogadores pra vários ! tooltip.ElectricPump=Uma bomba capaz de bombear um lago de !nlava inteiro. tooltip.ElectricChest=Um baú portátil de 54 slots que usa energia para se !ntrancar de outros por meios de proteção por senha. tooltip.Chargepad=Uma plataforma recarregadora capaz de carregar qualquer item energizado de !nqualquer mod. -tooltip.LogisticalSorter=Uma máquina de triagem avançada com filtros que !npode auto-ejetar itens especificados pra dentro e pra fora de !ninventários adjacentes e Transportadores Logísticos. +tooltip.LogisticalSorter=Uma máquina de triagem avançada com filtros que !npode autoejetar itens especificados para dentro e para fora de !ninventários adjacentes e Transportadores Logísticos. tooltip.RotaryCondensentrator=Uma máquina capaz de converter gases em !nsuas formas líquidas e vice-versa. -tooltip.ChemicalInjectionChamber=Uma máquina de elite capaz de processar !nminérios em cacos, servindo como o estágio !ninicial de processamento de minérios 400%. -tooltip.ElectrolyticSeparator=Uma máquina que usa o processo de !neletrólise para separar um certo !gás em dois gases diferentes. -tooltip.PrecisionSawmill=Uma máquina usada para processar lenha e outros itens !de madeira mais eficientemente, como também !n obter serragem. -tooltip.ChemicalDissolutionChamber=Uma máquina definitiva usada para !nquimicamente dissolver quaisquer impurezas de um !nminério, deixando um lodo!nnão-processado atrás. -tooltip.ChemicalWasher=Uma máquina definitiva que limpar lodo !nnão-processado e o prepara para cristalização. +tooltip.ChemicalInjectionChamber=Uma máquina elite capaz de processar !nminérios em estilhaços, servindo como estágio !ninicial do processamento de minérios a 400%. +tooltip.ElectrolyticSeparator=Uma máquina que usa o processo de !neletrólise para quebrar um !ngás em dois gases diferentes. +tooltip.PrecisionSawmill=Uma máquina usada para processar lenha e outros itens !nde madeira mais eficientemente, como também !nobter serragem. +tooltip.ChemicalDissolutionChamber=Uma máquina definitiva usada para !ndissolver quimicamente todas impurezas de um !nminério, deixando um lodo!nnão-processado atrás. +tooltip.ChemicalWasher=Uma máquina definitiva que limpa lodo !nnão-processado e o prepara para cristalização. tooltip.ChemicalCrystallizer=Uma máquina definitiva usada para cristalizar lodo !nde minério purificado em cristais de minério. tooltip.ChemicalOxidizer=Uma máquina capaz de oxidar !nmateriais sólidos em fase gasosa. tooltip.ChemicalInfuser=Uma máquina que produz um novo tipo de !ngás por infusão de dois outros. -tooltip.SeismicVibrator=Uma máquina que usa vibrações sísmicas para !nprovideciar informações de diversas camadas !ndo mundo. -tooltip.PressurizedReactionChamber=Uma máquina avançada que processa uma mistura líquida, gasosa e sólida e cria ambos um produto gasoso e um sólido. -tooltip.PortableTank=Um tanque portátil útil que te deixa carregar 14 !nbaldes de fluido para onde !nquiser. Também serve como balde! +tooltip.SeismicVibrator=Uma máquina que usa vibrações sísmicas para !nfornecer informações sobre diversas camadas !ndo mundo. +tooltip.PressurizedReactionChamber=Uma máquina avançada que processa uma mistura líquida, gasosa e sólida e cria um produto gasoso e um sólido. +tooltip.PortableTank=Um tanque portátil útil que lhe permite carregar 14 !nbaldes de fluido para onde !nquiser. Também serve como balde! tooltip.FluidicPlenisher=Uma máquina que é capaz de criar lagos !ninteiros enchendo ravinas com fluidos. -tooltip.Laser=An advanced form of linear energy!ntransfer that utilizes an extremely!ncollimated beam of light. -tooltip.LaserAmplifier=A block that can be used to merge,!nredirect and amplify laser beams,!nwith fine controls over when to fire -tooltip.LaserTractorBeam=A block used to merge and!nredirect laser beams. Collects!ndrops from blocks it has broken. +tooltip.Laser=Uma forma avançada de transferência !nlinear de energia que utiliza um feixe extremamente !nalinhado de luz. +tooltip.LaserAmplifier=Um bloco que pode ser usado !npara fundir, redirecionar e ampliar raios laser, com !ncontroles finos sobre quando disparar. +tooltip.LaserTractorBeam=Um bloco usado para mesclar !ne redirecionar os raios laser. Recolhe itens de blocos !nque foram quebrados. +tooltip.SolarNeutronActivator=Uma máquina que direciona a radiação de !nnêutrons do sol para seu armazenamento interno, !npermitindo a criação lenta de vários isótopos. +tooltip.Oredictionificator=A máquina usada para unificar e traduzir vários itens !nblocos usando o Ore Dictionary. tooltip.HeatGenerator=Um gerador que usa o calor da lava ou !noutros recursos combustíveis para produzir energia. tooltip.SolarGenerator=Um gerador que usa o poder do !nsol para produzir energia. @@ -628,16 +736,27 @@ tooltip.BioGenerator=Um gerador que queima materiais orgânicos do !nmundo para tooltip.AdvancedSolarGenerator=Um gerador que diretamente !nabsorve os raios solares com pequena perda !npara produzir energia tooltip.WindTurbine=Um gerador que usa a força do vento !npara produzir energia, com maior eficiência !nem camadas mais altas. -tooltip.ReactorGlass=Reinforced glass that can be used in !nthe Fusion Reactor multiblock. -tooltip.ReactorLaserFocusMatrix=A panel of Reactor Glass that !n is capable of absorbing optical energy and !nthereby heating up the Fusion Reactor. -tooltip.ReactorController=The controlling block for the entire !nFusion Reactor structure. -tooltip.ReactorFrame=Reinforced framing that can be used in !nthe Fusion Reactor multiblock. -tooltip.ReactorNeutronCapturePlate=A block that can be used to !nboth block Fusion Reactor radiation and assist !nin the production of Tritium. -tooltip.ReactorPort=A block of reinforced framing that is capable !nof managing both the gas and energy transfer !nof the Fusion Reactor. +tooltip.ReactorGlass=Vidro Reforçado que pode ser utilizado !nno multibloco do Reator de Fusão. +tooltip.ReactorLaserFocusMatrix=Um painel do Vidro do Reator !nque é capaz de absorver energia óptica e !ndessa forma aquecendo o Reator de Fusão. +tooltip.ReactorController=O bloco controlador para a !nEstrutura Reator de Fusão toda. +tooltip.ReactorFrame=Armação reforçada que pode ser utilizada no !nmultibloco do Reator de Fusão. +tooltip.ReactorNeutronCapturePlate=Um bloco que pode ser usado para !nbloquear a radiação do Reator de Fusão e para !najudar na produção de Trítio. +tooltip.ReactorPort=Um bloco de armação reforçada que é capaz de !ngerenciar a transferência de gás e de energia !ndo Reator de Fusão. +tooltip.ReactorLogicAdapter=Um bloco que pode ser usado para !npermitir monitoramento básico de um reactor usando redstone. tooltip.OsmiumOre=Um mineral forte que pode ser achado !nem quase qualquer altura do mundo. !nÉ conhecido por ter muitos usos na !nconstrução de maquinaria. tooltip.CopperOre=Um material condutivo e comum que !npode ser usado na produção de !nfios. Sua habilidade de suportar !naltas temperaturas também o faz importante !nem maquinaria avançada. -tooltip.TinOre=Um material condutivo leve, porém resistente !nque é encontrado com um pouco menos !nfrequência que Cobre. +tooltip.TinOre=Um material condutivo leve, porém resistente, !nque é encontrado com um pouco menos de !nfrequência que Cobre. + +//Side data +sideData.None=Nada +sideData.Input=Entrada +sideData.Output=Saída +sideData.Energy=Energia +sideData.Gas=Gás +sideData.Extra=Extra +sideData.Infuse=Infusão +sideData.Fluid=Fluido //Redstone control control.disabled=Desativado @@ -694,6 +813,16 @@ dye.pink=Magenta dye.yellow=Amarelo dye.white=Branco +//Reactor Logic modes +reactor.disabled=Desativado +reactor.disabled.desc=Não irá emitir sinal de redstone +reactor.ready=Pronto para ignição +reactor.ready.desc=Reactor atingiu o nível necessário de calor para ignição +reactor.capacity=Capacidade de calor atendida +reactor.capacity.desc=A capacidade de calor do núcleo do reator foi atendida +reactor.depleted=Pouco Combustível +reactor.depleted.desc=O reactor tem combustível insuficiente para manter uma reação + //Creative tab itemGroup.tabMekanism=Mekanism @@ -706,27 +835,25 @@ nei.rotaryCondensentrator=Condensentrador Rot. //**********// //Items -item.BioFuel.name=Biocombustível item.SolarPanel.name=Painel Solar - -//Infuse types -infuse.bio=Biomassa +item.Hohlraum.name=Hohlraum //Generators -tile.Generator.HeatGenerator.name=Gerador à Calor -tile.Generator.SolarGenerator.name=Gerador à Energia Solar -tile.Generator.GasGenerator.name=Gerador à Queima de Gás -tile.Generator.BioGenerator.name=Bio-Gerador -tile.Generator.AdvancedSolarGenerator.name=Gerador à Energia Solar Avançado +tile.Generator.HeatGenerator.name=Gerador a Calor +tile.Generator.SolarGenerator.name=Gerador a Energia Solar +tile.Generator.GasGenerator.name=Gerador a Queima de Gás +tile.Generator.BioGenerator.name=Biogerador +tile.Generator.AdvancedSolarGenerator.name=Gerador a Energia Solar Avançado tile.Generator.WindTurbine.name=Turbina Eólica tile.Reactor.ReactorController.name=Controlador do Reator -tile.Reactor.ReactorFrame.name=Quadro do Reator +tile.Reactor.ReactorFrame.name=Armação do Reator tile.Reactor.ReactorNeutronCapturePlate.name=Placa de Captura de Nêutrons -tile.Reactor.ReactorInOutPort.name=Porta do Reator +tile.Reactor.ReactorPort.name=Porta do Reator +tile.Reactor.ReactorLogicAdapter.name=Adaptador Lógica do Reator tile.ReactorGlass.ReactorGlass.name=Vidro do Reator -tile.ReactorGlass.ReactorLaserFocusMatrix.name=Foco Matrix do Laser +tile.ReactorGlass.ReactorLaserFocusMatrix.name=Matriz Focal do Laser //Gui text gui.heatGenerator.fuel=Combustível @@ -734,15 +861,15 @@ gui.solarGenerator.sun=Sol gui.bioGenerator.bioFuel=Biocombustível gui.electrolyticSeparator.dump=Despejar -gui.passive=Passivo -gui.active=Ativo +gui.passive=Refrigerado a Ar +gui.active=Refrigerado a Água gui.minInject=Taxa Min. de Injeção gui.ignition=Temp de Ignição -gui.maxPlasma=Temp Máx. do Plasma -gui.maxCasing=Temp Máx. da Carcaça +gui.maxPlasma=Temp. Máx. do Plasma +gui.maxCasing=Temp. Máx. da Carcaça gui.passiveGeneration=Geração Passiva -gui.steamProduction=Produção a vapor +gui.steamProduction=Produção de Vapor //*****// //TOOLS// @@ -833,6 +960,6 @@ mekanism.configgui.ctgy.tools.armor=Balanceamento de Armadura mekanism.configgui.ctgy.tools.tools=Balanceamento de Ferramentas //Config Tooltips -mekanism.configgui.ctgy.tools.general.tooltip=Definições sobre a configuração geral do MekanismTools -mekanism.configgui.ctgy.tools.armor.tooltip=Configurações em relação aos valores de proteção e equilíbrio de equipamentos protetores do MekanismTools -mekanism.configgui.ctgy.tools.tools.tooltip=Configurações em relação aos valores de eficiência e equilíbrio de conjuntos de ferramentas do MekanismTools +mekanism.configgui.ctgy.tools.general.tooltip=Definições relativas a configuração geral do MekanismTools +mekanism.configgui.ctgy.tools.armor.tooltip=Configurações relativas aos valores de proteção e balanço de armaduras do MekanismTools +mekanism.configgui.ctgy.tools.tools.tooltip=Configurações relativas aos valores de eficiência e balanço de ferramentas do MekanismTools From 9fc9eb4cd34cc80a18a4463fd5fba39c92261940 Mon Sep 17 00:00:00 2001 From: EzerArch Date: Sun, 27 Mar 2016 06:14:36 -0300 Subject: [PATCH 26/62] More pt_BR update More improvements and fixes. --- .../resources/assets/mekanism/lang/pt_BR.lang | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/resources/assets/mekanism/lang/pt_BR.lang b/src/main/resources/assets/mekanism/lang/pt_BR.lang index 1b22de70f..d98203a54 100644 --- a/src/main/resources/assets/mekanism/lang/pt_BR.lang +++ b/src/main/resources/assets/mekanism/lang/pt_BR.lang @@ -405,14 +405,14 @@ gui.volume=Volume gui.start=Iniciar gui.stop=Parar gui.config=Configurar -gui.teleport=Teleporte +gui.teleport=Teletransporte gui.eject=Ejetar gui.input=Entrada gui.strictInput=Entrada Estrita gui.slots=Aberturas gui.state=Estado gui.on=SIM -gui.off=NÃO +gui.off=NãO gui.filters=Filtros gui.filter=Filtro gui.idle=Inativo @@ -552,7 +552,7 @@ gui.robit.crafting=Criação Robit gui.robit.greeting=Olá, eu sou gui.robit.toggleFollow=Alternar modo 'seguir' gui.robit.rename=Renomear este Robit -gui.robit.teleport=Teleportar para casa +gui.robit.teleport=Teletransportar para casa gui.robit.togglePickup=Alternar modo 'coletar itens' gui.robit.following=Seguindo gui.robit.dropPickup=Coleta de itens @@ -578,14 +578,14 @@ gui.teleporter.noFrame=Nenhum quadro gui.teleporter.noLink=Nenhuma conexão localizada gui.teleporter.exceeds=Conexões > 2 gui.teleporter.needsEnergy=Requer Energia -gui.teleporter.noAccess=You don't have access to this teleporter. +gui.teleporter.noAccess=Você não tem acesso a este teletransportador. gui.teleporter.noFreq=Sem frequência gui.digitalMinerConfig=Config Minerador Digital gui.digitalMiner.autoPull=Autopuxar gui.digitalMiner.replaceBlock=Substituir bloco -gui.digitalMiner.reset=Redefinir +gui.digitalMiner.reset=Reiniciar gui.digitalMiner.silkTouch=Toque Suave gui.digitalMiner.pull=Puxar gui.digitalMiner.silk=Suave @@ -605,18 +605,18 @@ tooltip.configurator.configurate=Configurar tooltip.configurator.empty=Vazio tooltip.configurator.rotate=Girar tooltip.configurator.wrench=Chave Inglesa -tooltip.configurator.pumpReset=Resetar cálculo da Bomba Elétrica -tooltip.configurator.toggleDiverter=Modo do Diversor alterado para -tooltip.configurator.toggleMode=%s behavior bumped to -tooltip.configurator.viewMode=Current %s behavior +tooltip.configurator.pumpReset=Reiniciar cálculo da Bomba Elétrica +tooltip.configurator.toggleDiverter=Modo do Redirecionador alterado para +tooltip.configurator.toggleMode=Comportamento de %s mudado para +tooltip.configurator.viewMode=Comportamento de %s atual tooltip.configurator.unauth=Este baú está trancado tooltip.configurator.noLink=Sem ligação tooltip.configurator.linkMsg=Ligado a tooltip.configurator.dim=dimensão tooltip.configurator.setLink=Defina ligação ao bloco de -tooltip.configurator.plenisherReset=Redefinição de Cálculo de Fluído -tooltip.configurator.inductionPortMode=Toggled Induction Port transfer mode to -tooltip.configurator.toggleColor=Cor passada para +tooltip.configurator.plenisherReset=Cálculo de Abastecedor Fluídico reiniciado +tooltip.configurator.inductionPortMode=Modo de transferência de Porta de Indução alternado para +tooltip.configurator.toggleColor=Cor mudada para tooltip.configurator.viewColor=Cor atual tooltip.upgrade.speed=Velocidade From b64108d1c682554fb64a44ba8b8f12be21a99276 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 27 Mar 2016 20:08:02 -0400 Subject: [PATCH 27/62] New models and fixes --- .../mekanism/client/model/ModelChargepad.java | 3 +- .../client/model/ModelChemicalOxidizer.java | 256 +++++--------- .../model/ModelElectrolyticSeparator.java | 316 ++++++++---------- .../client/model/ModelMetallurgicInfuser.java | 3 +- .../render/block/MachineRenderingHandler.java | 7 +- .../render/item/ItemRenderingHandler.java | 4 +- .../tileentity/RenderChemicalOxidizer.java | 23 +- .../RenderElectrolyticSeparator.java | 8 +- .../render/tileentity/RenderGasTank.java | 8 +- .../tile/TileEntityElectrolyticSeparator.java | 68 ---- .../client/model/ModelBioGenerator.java | 3 +- .../mekanism/render/ChemicalOxidizer.png | Bin 2279 -> 5535 bytes .../mekanism/render/ElectrolyticSeparator.png | Bin 4529 -> 19898 bytes .../mekanism/render/GasTankAdvanced.png | Bin 3928 -> 3951 bytes .../assets/mekanism/render/GasTankBasic.png | Bin 3953 -> 3974 bytes .../assets/mekanism/render/GasTankElite.png | Bin 3980 -> 4003 bytes .../mekanism/render/GasTankUltimate.png | Bin 3201 -> 3958 bytes 17 files changed, 238 insertions(+), 461 deletions(-) mode change 100644 => 100755 src/main/resources/assets/mekanism/render/ChemicalOxidizer.png diff --git a/src/main/java/mekanism/client/model/ModelChargepad.java b/src/main/java/mekanism/client/model/ModelChargepad.java index 6755ec719..658579891 100644 --- a/src/main/java/mekanism/client/model/ModelChargepad.java +++ b/src/main/java/mekanism/client/model/ModelChargepad.java @@ -52,12 +52,11 @@ public class ModelChargepad extends ModelBase stand.mirror = true; setRotation(stand, 0F, 0F, 0F); pillar2 = new ModelRenderer(this, 48, 0); + pillar2.mirror = true; pillar2.addBox(0F, 0F, 0F, 2, 7, 2); pillar2.setRotationPoint(2F, 16F, 3.99F); pillar2.setTextureSize(64, 64); - pillar2.mirror = true; setRotation(pillar2, 0F, 0F, 0F); - pillar2.mirror = false; pillar1 = new ModelRenderer(this, 48, 0); pillar1.addBox(0F, 0F, 0F, 2, 7, 2); pillar1.setRotationPoint(-4F, 16F, 3.99F); diff --git a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java b/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java index 9519791fd..c3a28875a 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java +++ b/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java @@ -12,188 +12,96 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelChemicalOxidizer extends ModelBase { - ModelRenderer Base; - ModelRenderer TSSW; - ModelRenderer TSNW; - ModelRenderer TSSE; - ModelRenderer TSNE; - ModelRenderer TTN; - ModelRenderer TTS; - ModelRenderer TTE; - ModelRenderer TTW; - ModelRenderer Connection; - ModelRenderer ItemEntry; - ModelRenderer GasExit; - ModelRenderer GasConnection; - ModelRenderer Machine; - ModelRenderer Post; - ModelRenderer GlassN; - ModelRenderer GlassS; - ModelRenderer GlassW; - ModelRenderer GlassE; - ModelRenderer GlassU; + ModelRenderer stand; + ModelRenderer tank; + ModelRenderer pipe2; + ModelRenderer bridge; + ModelRenderer pipe1; + ModelRenderer tower2; + ModelRenderer tower1; + ModelRenderer base; + ModelRenderer connector; + ModelRenderer connectorToggle; - public ModelChemicalOxidizer() + public ModelChemicalOxidizer() { textureWidth = 128; - textureHeight = 128; + textureHeight = 64; - Base = new ModelRenderer(this, 0, 0); - Base.addBox(0F, 0F, 0F, 16, 1, 16); - Base.setRotationPoint(-8F, 23F, -8F); - Base.setTextureSize(128, 128); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - TSSW = new ModelRenderer(this, 0, 17); - TSSW.addBox(0F, 0F, 0F, 1, 15, 1); - TSSW.setRotationPoint(-1F, 8F, 3F); - TSSW.setTextureSize(128, 128); - TSSW.mirror = true; - setRotation(TSSW, 0F, 0F, 0F); - TSNW = new ModelRenderer(this, 0, 17); - TSNW.addBox(0F, 0F, 0F, 1, 15, 1); - TSNW.setRotationPoint(-1F, 8F, -4F); - TSNW.setTextureSize(128, 128); - TSNW.mirror = true; - setRotation(TSNW, 0F, 0F, 0F); - TSSE = new ModelRenderer(this, 0, 17); - TSSE.addBox(0F, 0F, 0F, 1, 15, 1); - TSSE.setRotationPoint(6F, 8F, 3F); - TSSE.setTextureSize(128, 128); - TSSE.mirror = true; - setRotation(TSSE, 0F, 0F, 0F); - TSNE = new ModelRenderer(this, 0, 17); - TSNE.addBox(0F, 0F, 0F, 1, 15, 1); - TSNE.setRotationPoint(6F, 8F, -4F); - TSNE.setTextureSize(128, 128); - TSNE.mirror = true; - setRotation(TSNE, 0F, 0F, 0F); - TTN = new ModelRenderer(this, 4, 17); - TTN.addBox(0F, 0F, 0F, 6, 1, 1); - TTN.setRotationPoint(0F, 8F, -4F); - TTN.setTextureSize(128, 128); - TTN.mirror = true; - setRotation(TTN, 0F, 0F, 0F); - TTS = new ModelRenderer(this, 4, 17); - TTS.addBox(0F, 0F, 0F, 6, 1, 1); - TTS.setRotationPoint(0F, 8F, 3F); - TTS.setTextureSize(128, 128); - TTS.mirror = true; - setRotation(TTS, 0F, 0F, 0F); - TTE = new ModelRenderer(this, 18, 17); - TTE.addBox(0F, 0F, 0F, 1, 1, 6); - TTE.setRotationPoint(6F, 8F, -3F); - TTE.setTextureSize(128, 128); - TTE.mirror = true; - setRotation(TTE, 0F, 0F, 0F); - TTW = new ModelRenderer(this, 18, 17); - TTW.addBox(0F, 0F, 0F, 1, 1, 6); - TTW.setRotationPoint(-1F, 8F, -3F); - TTW.setTextureSize(128, 128); - TTW.mirror = true; - setRotation(TTW, 0F, 0F, 0F); - Connection = new ModelRenderer(this, 32, 17); - Connection.addBox(0F, 0F, 0F, 7, 4, 4); - Connection.setRotationPoint(-7F, 14F, -2F); - Connection.setTextureSize(128, 128); - Connection.mirror = true; - setRotation(Connection, 0F, 0F, 0F); - ItemEntry = new ModelRenderer(this, 64, 0); - ItemEntry.addBox(0F, 0F, 0F, 1, 8, 8); - ItemEntry.setRotationPoint(-8F, 12F, -4F); - ItemEntry.setTextureSize(128, 128); - ItemEntry.mirror = true; - setRotation(ItemEntry, 0F, 0F, 0F); - GasExit = new ModelRenderer(this, 0, 33); - GasExit.addBox(0F, 1F, 0F, 1, 6, 6); - GasExit.setRotationPoint(7F, 12F, -3F); - GasExit.setTextureSize(128, 128); - GasExit.mirror = true; - setRotation(GasExit, 0F, 0F, 0F); - GasConnection = new ModelRenderer(this, 82, 0); - GasConnection.addBox(0F, 1F, 0F, 1, 4, 4); - GasConnection.setRotationPoint(6F, 13F, -2F); - GasConnection.setTextureSize(128, 128); - GasConnection.mirror = true; - setRotation(GasConnection, 0F, 0F, 0F); - Machine = new ModelRenderer(this, 0, 45); - Machine.addBox(0F, 0F, 0F, 4, 6, 6); - Machine.setRotationPoint(-6F, 13F, -3F); - Machine.setTextureSize(128, 128); - Machine.mirror = true; - setRotation(Machine, 0F, 0F, 0F); - Post = new ModelRenderer(this, 0, 57); - Post.addBox(0F, 0F, 0F, 2, 4, 2); - Post.setRotationPoint(-5F, 19F, -1F); - Post.setTextureSize(128, 128); - Post.mirror = true; - setRotation(Post, 0F, 0F, 0F); - GlassN = new ModelRenderer(this, 92, 0); - GlassN.addBox(0F, 0F, 0F, 6, 14, 1); - GlassN.setRotationPoint(0F, 9F, -4F); - GlassN.setTextureSize(128, 128); - GlassN.mirror = true; - setRotation(GlassN, 0F, 0F, 0F); - GlassS = new ModelRenderer(this, 92, 0); - GlassS.addBox(0F, 0F, 0F, 6, 14, 1); - GlassS.setRotationPoint(0F, 9F, 3F); - GlassS.setTextureSize(128, 128); - GlassS.mirror = true; - setRotation(GlassS, 0F, 0F, 0F); - GlassW = new ModelRenderer(this, 0, 70); - GlassW.addBox(0F, 0F, 0F, 1, 14, 6); - GlassW.setRotationPoint(-1F, 9F, -3F); - GlassW.setTextureSize(128, 128); - GlassW.mirror = true; - setRotation(GlassW, 0F, 0F, 0F); - GlassE = new ModelRenderer(this, 0, 70); - GlassE.addBox(0F, 0F, 0F, 1, 14, 6); - GlassE.setRotationPoint(6F, 9F, -3F); - GlassE.setTextureSize(128, 128); - GlassE.mirror = true; - setRotation(GlassE, 0F, 0F, 0F); - GlassU = new ModelRenderer(this, 0, 63); - GlassU.addBox(0F, 0F, 0F, 6, 1, 6); - GlassU.setRotationPoint(0F, 8F, -3F); - GlassU.setTextureSize(128, 128); - GlassU.mirror = true; - setRotation(GlassU, 0F, 0F, 0F); + stand = new ModelRenderer(this, 0, 20); + stand.addBox(0F, 0F, 0F, 5, 1, 13); + stand.setRotationPoint(-5.5F, 19F, -6.5F); + stand.setTextureSize(128, 64); + stand.mirror = true; + setRotation(stand, 0F, 0F, 0F); + tank = new ModelRenderer(this, 66, 0); + tank.addBox(0F, 0F, 0F, 7, 12, 16); + tank.setRotationPoint(1F, 8F, -8F); + tank.setTextureSize(128, 64); + tank.mirror = true; + setRotation(tank, 0F, 0F, 0F); + pipe2 = new ModelRenderer(this, 82, 28); + pipe2.addBox(0F, 0F, 0F, 2, 6, 6); + pipe2.setRotationPoint(-7F, 13F, -3F); + pipe2.setTextureSize(128, 64); + pipe2.mirror = true; + setRotation(pipe2, 0F, 0F, 0F); + bridge = new ModelRenderer(this, 70, 0); + bridge.addBox(0F, 0F, 0F, 5, 10, 1); + bridge.setRotationPoint(-5.5F, 8.5F, -2F); + bridge.setTextureSize(128, 64); + bridge.mirror = true; + setRotation(bridge, 0F, 0F, 0F); + pipe1 = new ModelRenderer(this, 0, 0); + pipe1.addBox(0F, 0F, 0F, 1, 3, 3); + pipe1.setRotationPoint(0F, 14F, 1F); + pipe1.setTextureSize(128, 64); + pipe1.mirror = true; + setRotation(pipe1, 0F, 0F, 0F); + tower2 = new ModelRenderer(this, 36, 20); + tower2.addBox(0F, 0F, 0F, 6, 11, 8); + tower2.setRotationPoint(-6F, 8F, -1F); + tower2.setTextureSize(128, 64); + tower2.mirror = true; + setRotation(tower2, 0F, 0F, 0F); + tower1 = new ModelRenderer(this, 48, 0); + tower1.addBox(0F, 0F, 0F, 6, 11, 5); + tower1.setRotationPoint(-6F, 8F, -7F); + tower1.setTextureSize(128, 64); + tower1.mirror = true; + setRotation(tower1, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 4, 16); + base.setRotationPoint(-8F, 20F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + connector = new ModelRenderer(this, 64, 28); + connector.addBox(0F, 0F, 0F, 1, 8, 8); + connector.setRotationPoint(-8F, 12F, -4F); + connector.setTextureSize(128, 64); + connector.mirror = true; + setRotation(connector, 0F, 0F, 0F); + connectorToggle = new ModelRenderer(this, 64, 28); + connectorToggle.addBox(0F, 0F, 0F, 1, 8, 8); + connectorToggle.setRotationPoint(7.01F, 12F, -4F); + connectorToggle.setTextureSize(128, 64); + connectorToggle.mirror = true; + setRotation(connectorToggle, 0F, 0F, 0F); } public void render(float size) { - Base.render(size); - TSSW.render(size); - TSNW.render(size); - TSSE.render(size); - TSNE.render(size); - TTN.render(size); - TTS.render(size); - TTE.render(size); - TTW.render(size); - Connection.render(size); - ItemEntry.render(size); - GasExit.render(size); - GasConnection.render(size); - Machine.render(size); - Post.render(size); - } - - public void renderGlass(float size) - { - GL11.glPushMatrix(); - MekanismRenderer.blendOn(); - GL11.glColor4f(1, 1, 1, 0.2F); - - GlassN.render(size); - GlassS.render(size); - GlassW.render(size); - GlassE.render(size); - GlassU.render(size); - - MekanismRenderer.blendOff(); - GL11.glColor4f(1, 1, 1, 1); - GL11.glPopMatrix(); + stand.render(size); + tank.render(size); + pipe2.render(size); + bridge.render(size); + pipe1.render(size); + tower2.render(size); + tower1.render(size); + base.render(size); + connector.render(size); + connectorToggle.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java b/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java index ab6a84ec3..4ce2a350c 100644 --- a/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java @@ -8,192 +8,152 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelElectrolyticSeparator extends ModelBase { - ModelRenderer A; - ModelRenderer B; - ModelRenderer C; - ModelRenderer D; - ModelRenderer E; - ModelRenderer F; - ModelRenderer G; - ModelRenderer H; - ModelRenderer I; - ModelRenderer J; - ModelRenderer K; - ModelRenderer L; - ModelRenderer M; - ModelRenderer N; - ModelRenderer OUTPUT; - ModelRenderer P; - ModelRenderer Q; - ModelRenderer R; - ModelRenderer S; - ModelRenderer T; - ModelRenderer U; - ModelRenderer V; + ModelRenderer tank2; + ModelRenderer tank1; + ModelRenderer tank3; + ModelRenderer tube6; + ModelRenderer tube5; + ModelRenderer tube4; + ModelRenderer tube3; + ModelRenderer tube2; + ModelRenderer tube1; + ModelRenderer base; + ModelRenderer portToggle1; + ModelRenderer portToggle2a; + ModelRenderer portToggle2b; + ModelRenderer portToggle3a; + ModelRenderer portToggle3b; + ModelRenderer portToggle4a; + ModelRenderer portToggle4b; - public ModelElectrolyticSeparator() + public ModelElectrolyticSeparator() { textureWidth = 128; - textureHeight = 128; + textureHeight = 64; - A = new ModelRenderer(this, 0, 0); - A.addBox(-8F, 0F, -8F, 16, 1, 16); - A.setRotationPoint(0F, 23F, 0F); - A.setTextureSize(128, 128); - A.mirror = true; - setRotation(A, 0F, 0F, 0F); - B = new ModelRenderer(this, 85, 0); - B.addBox(-2F, 0F, -2F, 4, 10, 4); - B.setRotationPoint(4F, 12F, -4F); - B.setTextureSize(128, 128); - B.mirror = true; - setRotation(B, 0F, 1.570796F, 0F); - C = new ModelRenderer(this, 66, 0); - C.addBox(-2F, 0F, -2F, 4, 10, 4); - C.setRotationPoint(-4F, 12F, -4F); - C.setTextureSize(128, 128); - C.mirror = true; - setRotation(C, 0F, 1.570796F, 0F); - D = new ModelRenderer(this, 48, 19); - D.addBox(-1F, -1F, 0F, 2, 2, 6); - D.setRotationPoint(-2F, 18F, -4F); - D.setTextureSize(128, 128); - D.mirror = true; - setRotation(D, 0F, 1.570796F, 0F); - E = new ModelRenderer(this, 0, 19); - E.addBox(0F, 0F, -6F, 4, 15, 14); - E.setRotationPoint(0F, 8F, 8F); - E.setTextureSize(128, 128); - E.mirror = true; - setRotation(E, 0F, 1.570796F, 0F); - F = new ModelRenderer(this, 103, 0); - F.addBox(-3F, -1F, -1F, 6, 2, 2); - F.setRotationPoint(4F, 20F, 1F); - F.setTextureSize(128, 128); - F.mirror = true; - setRotation(F, 0F, 1.570796F, 0F); - G = new ModelRenderer(this, 103, 0); - G.addBox(-3F, 0F, 0F, 6, 2, 2); - G.setRotationPoint(-5F, 20F, 1F); - G.setTextureSize(128, 128); - G.mirror = true; - setRotation(G, 0F, 1.570796F, 0F); - H = new ModelRenderer(this, 0, 50); - H.addBox(-2F, 0F, 0F, 4, 12, 2); - H.setRotationPoint(-8F, 11F, 6F); - H.setTextureSize(128, 128); - H.mirror = true; - setRotation(H, 0F, 1.570796F, 0F); - I = new ModelRenderer(this, 41, 28); - I.addBox(0F, 0F, 0F, 6, 1, 6); - I.setRotationPoint(-7F, 22F, -7F); - I.setTextureSize(128, 128); - I.mirror = true; - setRotation(I, 0F, 0F, 0F); - J = new ModelRenderer(this, 41, 28); - J.addBox(0F, 0F, 0F, 6, 1, 6); - J.setRotationPoint(1F, 22F, -7F); - J.setTextureSize(128, 128); - J.mirror = true; - setRotation(J, 0F, 0F, 0F); - K = new ModelRenderer(this, 66, 16); - K.addBox(0F, 0F, 0F, 2, 1, 2); - K.setRotationPoint(-5F, 11F, -5F); - K.setTextureSize(128, 128); - K.mirror = true; - setRotation(K, 0F, 0F, 0F); - L = new ModelRenderer(this, 85, 15); - L.addBox(0F, 0F, 0F, 2, 2, 2); - L.setRotationPoint(3F, 10F, -5F); - L.setTextureSize(128, 128); - L.mirror = true; - setRotation(L, 0F, 0F, 0F); - M = new ModelRenderer(this, 66, 22); - M.addBox(-1F, 0F, -1F, 2, 2, 6); - M.setRotationPoint(-4F, 9F, -4F); - M.setTextureSize(128, 128); - M.mirror = true; - setRotation(M, 0F, 1.570796F, 0F); - N = new ModelRenderer(this, 66, 32); - N.addBox(-1F, -1F, -1F, 2, 6, 2); - N.setRotationPoint(0F, 12F, -4F); - N.setTextureSize(128, 128); - N.mirror = true; - setRotation(N, 0F, 0F, 0F); - OUTPUT = new ModelRenderer(this, 66, 42); - OUTPUT.addBox(-1F, -1F, -1F, 4, 2, 2); - OUTPUT.setRotationPoint(0F, 16F, -5F); - OUTPUT.setTextureSize(128, 128); - OUTPUT.mirror = true; - setRotation(OUTPUT, 0F, 1.570796F, 0F); - P = new ModelRenderer(this, 85, 21); - P.addBox(-1F, -1F, -1F, 2, 3, 2); - P.setRotationPoint(5F, 9F, -4F); - P.setTextureSize(128, 128); - P.mirror = true; - setRotation(P, 0F, 0F, 0.6457718F); - Q = new ModelRenderer(this, 0, 65); - Q.addBox(0F, 0F, -2F, 3, 11, 6); - Q.setRotationPoint(-8F, 12F, 0F); - Q.setTextureSize(128, 128); - Q.mirror = true; - setRotation(Q, 0F, 0F, 0F); - R = new ModelRenderer(this, 0, 65); - R.addBox(0F, 0F, -3F, 3, 11, 6); - R.setRotationPoint(8F, 12F, 1F); - R.setTextureSize(128, 128); - R.mirror = true; - setRotation(R, 0F, 3.141593F, 0F); - S = new ModelRenderer(this, 0, 84); - S.addBox(0F, 0F, 0F, 4, 1, 1); - S.setRotationPoint(2F, 16F, 3F); - S.setTextureSize(128, 128); - S.mirror = true; - setRotation(S, 0F, 0F, 0F); - T = new ModelRenderer(this, 0, 84); - T.addBox(0F, 0F, 0F, 4, 1, 1); - T.setRotationPoint(-6F, 16F, 3F); - T.setTextureSize(128, 128); - T.mirror = true; - setRotation(T, 0F, 0F, 0F); - U = new ModelRenderer(this, 0, 87); - U.addBox(0F, 0F, 0F, 4, 1, 1); - U.setRotationPoint(-6F, 18F, 3F); - U.setTextureSize(128, 128); - U.mirror = true; - setRotation(U, 0F, 0F, 0F); - V = new ModelRenderer(this, 0, 87); - V.addBox(0F, 0F, 0F, 4, 1, 1); - V.setRotationPoint(2F, 18F, 3F); - V.setTextureSize(128, 128); - V.mirror = true; - setRotation(V, 0F, 0F, 0F); + tank2 = new ModelRenderer(this, 64, 0); + tank2.addBox(0F, 0F, 0F, 7, 10, 7); + tank2.setRotationPoint(1F, 10F, 1F); + tank2.setTextureSize(128, 64); + tank2.mirror = true; + setRotation(tank2, 0F, 0F, 0F); + tank1 = new ModelRenderer(this, 0, 20); + tank1.addBox(0F, 0F, 0F, 8, 12, 16); + tank1.setRotationPoint(-8F, 8F, -8F); + tank1.setTextureSize(128, 64); + tank1.mirror = true; + setRotation(tank1, 0F, 0F, 0F); + tank3 = new ModelRenderer(this, 64, 0); + tank3.addBox(0F, 0F, 0F, 7, 10, 7); + tank3.setRotationPoint(1F, 10F, -8F); + tank3.setTextureSize(128, 64); + tank3.mirror = true; + setRotation(tank3, 0F, 0F, 0F); + tube6 = new ModelRenderer(this, 0, 0); + tube6.addBox(0F, 0F, 0F, 1, 1, 1); + tube6.setRotationPoint(4F, 9F, 4F); + tube6.setTextureSize(128, 64); + tube6.mirror = true; + setRotation(tube6, 0F, 0F, 0F); + tube5 = new ModelRenderer(this, 0, 0); + tube5.addBox(0F, 0F, 0F, 1, 1, 1); + tube5.setRotationPoint(4F, 9F, -5F); + tube5.setTextureSize(128, 64); + tube5.mirror = true; + setRotation(tube5, 0F, 0F, 0F); + tube4 = new ModelRenderer(this, 0, 48); + tube4.addBox(0F, 0F, 0F, 1, 1, 10); + tube4.setRotationPoint(4F, 8F, -5F); + tube4.setTextureSize(128, 64); + tube4.mirror = true; + setRotation(tube4, 0F, 0F, 0F); + tube3 = new ModelRenderer(this, 0, 0); + tube3.addBox(0F, 0F, 0F, 1, 3, 1); + tube3.setRotationPoint(4F, 9F, -0.5F); + tube3.setTextureSize(128, 64); + tube3.mirror = true; + setRotation(tube3, 0F, 0F, 0F); + tube2 = new ModelRenderer(this, 0, 0); + tube2.addBox(-4F, -1F, 0F, 4, 1, 1); + tube2.setRotationPoint(5F, 12F, -0.5F); + tube2.setTextureSize(128, 64); + tube2.mirror = true; + setRotation(tube2, 0F, 0F, -0.5235988F); + tube1 = new ModelRenderer(this, 0, 0); + tube1.addBox(-3F, -1F, 0F, 3, 1, 1); + tube1.setRotationPoint(1.5F, 14F, -0.5F); + tube1.setTextureSize(128, 64); + tube1.mirror = true; + setRotation(tube1, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 4, 16); + base.setRotationPoint(-8F, 20F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + portToggle1 = new ModelRenderer(this, 48, 20); + portToggle1.addBox(0F, 0F, 0F, 1, 8, 8); + portToggle1.setRotationPoint(-8.01F, 12F, -4F); + portToggle1.setTextureSize(128, 64); + portToggle1.mirror = true; + setRotation(portToggle1, 0F, 0F, 0F); + portToggle2a = new ModelRenderer(this, 48, 20); + portToggle2a.addBox(0F, 0F, 0F, 1, 8, 8); + portToggle2a.setRotationPoint(7.01F, 12F, -4F); + portToggle2a.setTextureSize(128, 64); + portToggle2a.mirror = true; + setRotation(portToggle2a, 0F, 0F, 0F); + portToggle2b = new ModelRenderer(this, 0, 4); + portToggle2b.addBox(0F, 0F, 0F, 2, 7, 2); + portToggle2b.setRotationPoint(5F, 13F, -1F); + portToggle2b.setTextureSize(128, 64); + portToggle2b.mirror = true; + setRotation(portToggle2b, 0F, 0F, 0F); + portToggle3a = new ModelRenderer(this, 66, 20); + portToggle3a.addBox(0F, 0F, 0F, 8, 8, 1); + portToggle3a.setRotationPoint(-4F, 12F, -8.01F); + portToggle3a.setTextureSize(128, 64); + portToggle3a.mirror = true; + setRotation(portToggle3a, 0F, 0F, 0F); + portToggle3b = new ModelRenderer(this, 0, 4); + portToggle3b.addBox(0F, 0F, 0F, 1, 7, 2); + portToggle3b.setRotationPoint(0F, 13F, -7F); + portToggle3b.setTextureSize(128, 64); + portToggle3b.mirror = true; + setRotation(portToggle3b, 0F, 0F, 0F); + portToggle4a = new ModelRenderer(this, 66, 20); + portToggle4a.addBox(0F, 0F, 0F, 8, 8, 1); + portToggle4a.setRotationPoint(-4F, 12F, 7.01F); + portToggle4a.setTextureSize(128, 64); + portToggle4a.mirror = true; + setRotation(portToggle4a, 0F, 0F, 0F); + portToggle4b = new ModelRenderer(this, 0, 4); + portToggle4b.addBox(0F, 0F, 0F, 1, 7, 2); + portToggle4b.setRotationPoint(0F, 13F, 5F); + portToggle4b.setTextureSize(128, 64); + portToggle4b.mirror = true; + setRotation(portToggle4b, 0F, 0F, 0F); } public void render(float size) { - A.render(size); - B.render(size); - C.render(size); - D.render(size); - E.render(size); - F.render(size); - G.render(size); - H.render(size); - I.render(size); - J.render(size); - K.render(size); - L.render(size); - M.render(size); - N.render(size); - OUTPUT.render(size); - P.render(size); - Q.render(size); - R.render(size); - S.render(size); - T.render(size); - U.render(size); - V.render(size); + tank2.render(size); + tank1.render(size); + tank3.render(size); + tube6.render(size); + tube5.render(size); + tube4.render(size); + tube3.render(size); + tube2.render(size); + tube1.render(size); + base.render(size); + portToggle1.render(size); + portToggle2a.render(size); + portToggle2b.render(size); + portToggle3a.render(size); + portToggle3b.render(size); + portToggle4a.render(size); + portToggle4b.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java b/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java index 3876d2122..b12adbee3 100644 --- a/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java @@ -56,12 +56,11 @@ public class ModelMetallurgicInfuser extends ModelBase connector2.mirror = true; setRotation(connector2, 0F, 0F, 0F); sideRight = new ModelRenderer(this, 64, 0); + sideRight.mirror = true; sideRight.addBox(0F, 0F, 0F, 1, 11, 7); sideRight.setRotationPoint(7F, 9F, 0F); sideRight.setTextureSize(128, 64); - sideRight.mirror = true; setRotation(sideRight, 0F, 0F, 0F); - sideRight.mirror = false; top = new ModelRenderer(this, 80, 0); top.addBox(0F, 0F, 0F, 16, 1, 7); top.setRotationPoint(-8F, 8F, 0F); diff --git a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index 38f9fc0f5..0ccade6ec 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -122,16 +122,14 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler else if(type == MachineType.CHEMICAL_OXIDIZER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.06F, 0.05F); + GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(0.0F, -1.00F, 0.05F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalOxidizer.png")); chemicalOxidizer.render(0.0625F); - chemicalOxidizer.renderGlass(0.0625F); } else if(type == MachineType.CHEMICAL_INFUSER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.06F, 0.05F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalInfuser.png")); chemicalInfuser.render(0.0625F); @@ -140,6 +138,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler else if(type == MachineType.ELECTROLYTIC_SEPARATOR) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(-90F, 0.0F, 1.0F, 0.0F); GL11.glTranslated(0.0F, -1.0F, 0.0F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectrolyticSeparator.png")); electrolyticSeparator.render(0.0625F); diff --git a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java index 3d929fd07..5d3c71939 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -293,12 +293,14 @@ public class ItemRenderingHandler implements IItemRenderer else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.GasTank) { GL11.glPushMatrix(); + BaseTier tier = ((ItemBlockGasTank)item.getItem()).getBaseTier(item); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank" + tier.getName() + ".png")); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.0F, 0.0F); gasTank.render(0.0625F); + GL11.glPopMatrix(); } else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.ObsidianTNT) diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java index 6d094c4a2..dcb6040ee 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java @@ -35,21 +35,6 @@ public class RenderChemicalOxidizer extends TileEntitySpecialRenderer private void renderAModelAt(TileEntityChemicalOxidizer tileEntity, double x, double y, double z, float partialTick) { render(false, x, y, z, tileEntity); - - if(tileEntity.gasTank.getGas() != null) - { - push(); - - GL11.glTranslatef((float)x, (float)y, (float)z); - GL11.glColor4f(1.0F, 1.0F, 1.0F, (float)tileEntity.gasTank.getStored()/tileEntity.gasTank.getMaxGas()); - bindTexture(MekanismRenderer.getBlocksTexture()); - getListAndRender(ForgeDirection.getOrientation(tileEntity.facing), tileEntity.gasTank.getGas().getGas()).render(); - GL11.glColor4f(1, 1, 1, 1); - - pop(); - } - - render(true, x, y, z, tileEntity); } /* @@ -72,13 +57,7 @@ public class RenderChemicalOxidizer extends TileEntitySpecialRenderer GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - if(!glass) - { - model.render(0.0625F); - } - else { - model.renderGlass(0.0625F); - } + model.render(0.0625F); GL11.glPopMatrix(); } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java b/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java index 79b1885ba..9f3aaee6f 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java @@ -31,10 +31,10 @@ public class RenderElectrolyticSeparator extends TileEntitySpecialRenderer switch(tileEntity.facing) { - case 2: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; - case 3: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; - case 4: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; - case 5: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; + 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); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java index b19069212..af4af146d 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java @@ -32,10 +32,10 @@ public class RenderGasTank extends TileEntitySpecialRenderer switch(tileEntity.facing) { - case 2: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; - case 3: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; - case 4: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; - case 5: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; + 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); diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java index faa159e1a..5b57092aa 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java @@ -76,9 +76,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp /** Type type of gas this block is dumping. */ public GasMode dumpRight = GasMode.IDLE; - public boolean clientDumpLeft = false; - public boolean clientDumpRight = false; - public double BASE_ENERGY_USAGE; public double energyPerTick; @@ -210,9 +207,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp } int dumpAmount = 8*(int)Math.pow(2, upgradeComponent.getUpgrades(Upgrade.SPEED)); - - boolean dumpedLeft = false; - boolean dumpedRight = false; if(leftTank.getGas() != null) { @@ -233,15 +227,11 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp else if(dumpLeft == GasMode.DUMPING) { leftTank.draw(dumpAmount, true); - - dumpedLeft = true; } if(dumpLeft == GasMode.DUMPING_EXCESS && leftTank.getNeeded() < output) { leftTank.draw(output-leftTank.getNeeded(), true); - - dumpedLeft = true; } } @@ -264,39 +254,16 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp else if(dumpRight == GasMode.DUMPING) { rightTank.draw(dumpAmount, true); - - dumpedRight = true; } if(dumpRight == GasMode.DUMPING_EXCESS && rightTank.getNeeded() < output) { rightTank.draw(output-rightTank.getNeeded(), true); - - dumpedRight = true; } } - - if(clientDumpLeft != dumpedLeft || clientDumpRight != dumpedRight) - { - clientDumpLeft = dumpedLeft; - clientDumpRight = dumpedRight; - - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); - } prevEnergy = getEnergy(); } - else { - if(clientDumpLeft) - { - spawnParticle(0); - } - - if(clientDumpRight) - { - spawnParticle(1); - } - } } public int getUpgradedUsage(SeparatorRecipe recipe) @@ -356,37 +323,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp && rightTank.canReceive(gases.rightGas.getGas()) && rightTank.getNeeded() >= gases.rightGas.amount); } - public void spawnParticle(int type) - { - if(type == 0) - { - ForgeDirection side = ForgeDirection.getOrientation(facing); - - double x = xCoord + (side.offsetX == 0 ? 0.5 : Math.max(side.offsetX, 0)); - double z = zCoord + (side.offsetZ == 0 ? 0.5 : Math.max(side.offsetZ, 0)); - - worldObj.spawnParticle("smoke", x, yCoord + 0.5, z, 0.0D, 0.0D, 0.0D); - } - else if(type == 1) - { - switch(facing) - { - case 3: - worldObj.spawnParticle("smoke", xCoord+0.9, yCoord+1, zCoord+0.75, 0.0D, 0.0D, 0.0D); - break; - case 4: - worldObj.spawnParticle("smoke", xCoord+0.25, yCoord+1, zCoord+0.9, 0.0D, 0.0D, 0.0D); - break; - case 2: - worldObj.spawnParticle("smoke", xCoord+0.1, yCoord+1, zCoord+0.25, 0.0D, 0.0D, 0.0D); - break; - case 5: - worldObj.spawnParticle("smoke", xCoord+0.75, yCoord+1, zCoord+0.1, 0.0D, 0.0D, 0.0D); - break; - } - } - } - @Override public boolean canExtractItem(int slotID, ItemStack itemstack, int side) { @@ -493,8 +429,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp controlType = RedstoneControl.values()[dataStream.readInt()]; dumpLeft = GasMode.values()[dataStream.readInt()]; dumpRight = GasMode.values()[dataStream.readInt()]; - clientDumpLeft = dataStream.readBoolean(); - clientDumpRight = dataStream.readBoolean(); clientActive = dataStream.readBoolean(); clientEnergyUsed = dataStream.readDouble(); @@ -544,8 +478,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp data.add(controlType.ordinal()); data.add(dumpLeft.ordinal()); data.add(dumpRight.ordinal()); - data.add(clientDumpLeft); - data.add(clientDumpRight); data.add(isActive); data.add(clientEnergyUsed); diff --git a/src/main/java/mekanism/generators/client/model/ModelBioGenerator.java b/src/main/java/mekanism/generators/client/model/ModelBioGenerator.java index 93e9435d9..190381f51 100644 --- a/src/main/java/mekanism/generators/client/model/ModelBioGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelBioGenerator.java @@ -25,12 +25,11 @@ public class ModelBioGenerator extends ModelBase base.mirror = true; setRotation(base, 0F, 0F, 0F); sideRight = new ModelRenderer(this, 0, 40); + sideRight.mirror = true; sideRight.addBox(0F, 0F, 0F, 3, 9, 8); sideRight.setRotationPoint(5F, 8F, -8F); sideRight.setTextureSize(64, 64); - sideRight.mirror = true; setRotation(sideRight, 0F, 0F, 0F); - sideRight.mirror = false; back = new ModelRenderer(this, 0, 23); back.addBox(0F, 0F, 0F, 16, 9, 8); back.setRotationPoint(-8F, 8F, 0F); diff --git a/src/main/resources/assets/mekanism/render/ChemicalOxidizer.png b/src/main/resources/assets/mekanism/render/ChemicalOxidizer.png old mode 100644 new mode 100755 index 95172c1dba343a315df5335527afe30fefac5d11..a6d93d1fa1fdb597cf3a99212021f5483e4b6004 GIT binary patch literal 5535 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 literal 2279 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 diff --git a/src/main/resources/assets/mekanism/render/GasTankAdvanced.png b/src/main/resources/assets/mekanism/render/GasTankAdvanced.png index 0c89a60930f513044a8f32a2ff3b1921b99539d5..e98d268b782f4fca2eb9a05ca644acaddb14b4b5 100644 GIT binary patch delta 2896 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 X!|SNd`_9V%00000NkvXXu0mjfHjO}O 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 Rqmcjr002ovPDHLkV1fWQ(6#^o delta 2898 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 diff --git a/src/main/resources/assets/mekanism/render/GasTankElite.png b/src/main/resources/assets/mekanism/render/GasTankElite.png index 5e79e95252074bdf6362c2eecf6e8f170ce8ab26..38c89e00c1f436a0a4435f177e320982dae86df0 100644 GIT binary patch delta 2948 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 literal 3201 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 From 1f0895322b25d95b51efa2b731a255d6350cbff1 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 27 Mar 2016 20:30:04 -0400 Subject: [PATCH 28/62] Fixes --- .../mekanism/client/model/ModelElectrolyticSeparator.java | 2 +- .../mekanism/common/tile/TileEntityFluidicPlenisher.java | 2 +- src/main/java/mekanism/common/util/MekanismUtils.java | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java b/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java index 4ce2a350c..c01a48f45 100644 --- a/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java @@ -16,7 +16,7 @@ public class ModelElectrolyticSeparator extends ModelBase ModelRenderer tube4; ModelRenderer tube3; ModelRenderer tube2; - ModelRenderer tube1; + ModelRenderer tube1; ModelRenderer base; ModelRenderer portToggle1; ModelRenderer portToggle2a; diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index f8ec352a4..f916381b5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -108,7 +108,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen } } - if(MekanismUtils.canFunction(this) && getEnergy() >= energyPerTick && fluidTank.getFluid().getFluid().canBePlacedInWorld()) + if(MekanismUtils.canFunction(this) && getEnergy() >= energyPerTick && fluidTank.getFluid() != null && fluidTank.getFluid().getFluid().canBePlacedInWorld()) { if(!finishedCalc) { diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 51f8c2c76..891968aa1 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -515,6 +515,11 @@ public final class MekanismUtils */ public static int getBaseOrientation(int side, int blockFacing) { + if(side == 0 || side == 1) + { + return side; + } + if(blockFacing == 3 || side == 1 || side == 0) { if(side == 2 || side == 3) From 65a7469433c5d4ba7cece673ced2a808ff154e98 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 27 Mar 2016 21:19:54 -0400 Subject: [PATCH 29/62] Side config fixes --- .../tile/component/TileComponentConfig.java | 6 ++- .../mekanism/common/util/MekanismUtils.java | 43 +++++++++++++++++-- 2 files changed, 44 insertions(+), 5 deletions(-) diff --git a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java index b074c2675..02677c02e 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java @@ -67,9 +67,11 @@ public class TileComponentConfig implements ITileComponent for(byte b = 0; b < 6; b++) { - if(getConfig(type)[b] == dataIndex) + int side = MekanismUtils.getBaseOrientation(b, facing); + + if(getConfig(type)[side] == dataIndex) { - ret.add(ForgeDirection.getOrientation(MekanismUtils.getBaseOrientation(b, facing))); + ret.add(ForgeDirection.getOrientation(b)); } } diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 891968aa1..8e5262720 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -515,12 +515,49 @@ public final class MekanismUtils */ public static int getBaseOrientation(int side, int blockFacing) { - if(side == 0 || side == 1) + if(blockFacing == 0) { + if(side == 0) + { + return 2; + } + else if(side == 1) + { + return 3; + } + else if(side == 2) + { + return 1; + } + else if(side == 3) + { + return 0; + } + return side; } - - if(blockFacing == 3 || side == 1 || side == 0) + else if(blockFacing == 1) + { + if(side == 0) + { + return 3; + } + else if(side == 1) + { + return 2; + } + else if(side == 2) + { + return 0; + } + else if(side == 3) + { + return 1; + } + + return side; + } + else if(blockFacing == 3 || side == 1 || side == 0) { if(side == 2 || side == 3) { From 1534abf200a9d4c6102999669469a372671b5060 Mon Sep 17 00:00:00 2001 From: HanatakeYurii Date: Mon, 28 Mar 2016 13:14:02 +0200 Subject: [PATCH 30/62] Update fr_FR.lang for v9 Hi, I tried to update the translation as far as I found differences. Feel free to tell me or correct yourself if I missed any change or made a mistake. --- .../resources/assets/mekanism/lang/fr_FR.lang | 200 ++++++++++++++---- 1 file changed, 160 insertions(+), 40 deletions(-) diff --git a/src/main/resources/assets/mekanism/lang/fr_FR.lang b/src/main/resources/assets/mekanism/lang/fr_FR.lang index 607fefb3d..39b828f6f 100644 --- a/src/main/resources/assets/mekanism/lang/fr_FR.lang +++ b/src/main/resources/assets/mekanism/lang/fr_FR.lang @@ -11,6 +11,7 @@ item.EnergyTablet.name=Tablette énergétique item.SpeedUpgrade.name=Amélioration de vitesse item.EnergyUpgrade.name=Amélioration d'énergie item.FilterUpgrade.name=Amélioration de filtre +item.MufflingUpgrade.name=Amélioration insonorisante item.GasUpgrade.name=Amélioration de gaz item.Robit.name=Robit item.AtomicDisassembler.name=Désassembleur atomique @@ -37,7 +38,7 @@ item.LithiumBucket.name=Seau de lithium item.HeavyWaterBucket.name=Seau d'eau lourde item.FreeRunners.name=Bottes rapides item.ArmoredJetpack.name=Propulseur blindé -item.FilterCard.name=Carte à filtre +item.ConfigurationCard.name=Carte de configuration item.SeismicReader.name=Lecteur sismique item.HDPEPellet.name=Boulette de PEHD item.HDPERod.name=Tige de PEHD @@ -47,15 +48,25 @@ item.Substrate.name=Substrat item.Flamethrower.name=Lance-flamme item.GaugeDropper.name=Gauge compte-goutte item.BioFuel.name=Bio-carburant +item.CraftingFormula.name=Formule de Fabrication //Control Circuits -item.BasicControlCircuit.name=Circuit de contrôle de base +item.BasicControlCircuit.name=Circuit de contrôle basique item.AdvancedControlCircuit.name=Circuit de contrôle avancé item.EliteControlCircuit.name=Circuit de contrôle élite item.UltimateControlCircuit.name=Circuit de contrôle ultime //Gas Tank -tile.GasTank.GasTank.name=Réservoir de gaz +tile.GasTankBasic.name=Réservoir de gaz basique +tile.GasTankAdvanced.name=Réservoir de gaz avancé +tile.GasTankElite.name=Réservoir de gaz élite +tile.GasTankUltimate.name=Réservoir de gaz ultime + +//Fluid Tank (part of MachineBlock2, naming handled differently) +tile.FluidTankBasic.name=Réservoir de fluide basique +tile.FluidTankAdvanced.name=Réservoir de fluide avancé +tile.FluidTankElite.name=Réservoir de fluide élite +tile.FluidTankUltimate.name=Réservoir de fluide ultime //Cardboard Box tile.CardboardBox.name=Boîte cartonnée @@ -73,7 +84,10 @@ tile.BasicBlock.RefinedObsidian.name=Obsidienne raffinée tile.BasicBlock.CoalBlock.name=Bloc de charbon tile.BasicBlock.RefinedGlowstone.name=Pierre lumineuse raffinée tile.BasicBlock.SteelBlock.name=Bloc d'acier -tile.BasicBlock.Bin.name=Silo +tile.BasicBlock.BinBasic.name=Silo basique +tile.BasicBlock.BinAdvanced.name=Silo avancé +tile.BasicBlock.BinElite.name=Silo élite +tile.BasicBlock.BinUltimate.name=Silo ultime tile.BasicBlock.TeleporterFrame.name=Cadre de téléporteur tile.BasicBlock.SteelCasing.name=Boîtier en acier tile.BasicBlock.DynamicTank.name=Réservoir dynamique @@ -81,21 +95,26 @@ tile.BasicBlock.DynamicGlass.name=Vitre dynamique tile.BasicBlock.DynamicValve.name=Valve dynamique tile.BasicBlock.CopperBlock.name=Bloc de cuivre tile.BasicBlock.TinBlock.name=Bloc d'étain -tile.BasicBlock.SalinationController.name=Contrôleur de salinisation -tile.BasicBlock.SalinationValve.name=Valve de salinisation +tile.BasicBlock.ThermalEvaporationController.name=Contrôleur d'évaporation thermale +tile.BasicBlock.ThermalEvaporationValve.name=Valve d'évaporation thermale //Basic Block 2 (second ID iteration) -tile.BasicBlock2.SolarEvaporationBlock.name=Solar Evaporation Block -tile.BasicBlock2.InductionCasing.name=Induction Casing +tile.BasicBlock2.ThermalEvaporationBlock.name=Bloc d'évaporation thermale +tile.BasicBlock2.InductionCasing.name=Revêtement d'induction tile.BasicBlock2.InductionPort.name=Port d'induction -tile.BasicBlock2.InductionCellBasic.name=Cellule d'induction de base +tile.BasicBlock2.InductionCellBasic.name=Cellule d'induction basique tile.BasicBlock2.InductionCellAdvanced.name=Cellule d'induction avancée tile.BasicBlock2.InductionCellElite.name=Cellule d'induction élite tile.BasicBlock2.InductionCellUltimate.name=Cellule d'induction ultime -tile.BasicBlock2.InductionProviderBasic.name=Fournisseur d'induction de base +tile.BasicBlock2.InductionProviderBasic.name=Fournisseur d'induction basique tile.BasicBlock2.InductionProviderAdvanced.name=Fournisseur d'induction avancé tile.BasicBlock2.InductionProviderElite.name=Fournisseur d'induction élite tile.BasicBlock2.InductionProviderUltimate.name=Fournisseur d'induction ultime +tile.BasicBlock2.SuperheatingElement.name=Elément de surchauffe +tile.BasicBlock2.PressureDisperser.name=Disperseur de pression +tile.BasicBlock2.BoilerCasing.name=Revêtement de chaudière +tile.BasicBlock2.BoilerValve.name=Valve de chaudière +tile.BasicBlock2.SecurityDesk.name=Bureau de Sécurité //Machine Block tile.MachineBlock.EnrichmentChamber.name=Chambre d'enrichissement @@ -108,7 +127,7 @@ tile.MachineBlock.PurificationChamber.name=Chambre de purification tile.MachineBlock.EnergizedSmelter.name=Fonderie alimentée tile.MachineBlock.Teleporter.name=Téléporteur tile.MachineBlock.ElectricPump.name=Pompe électrique -tile.MachineBlock.ElectricChest.name=Coffre électrique +tile.MachineBlock.PersonalChest.name=Coffre personnel tile.MachineBlock.Chargepad.name=Plaque de rechargement tile.MachineBlock.LogisticalSorter.name=Trieur logistique tile.MachineBlock.DigitalMiner.name=Mineur digital @@ -127,15 +146,17 @@ tile.MachineBlock2.ChemicalCrystallizer.name=Cristalliseur chimique tile.MachineBlock2.SeismicVibrator.name=Vibrateur sismique tile.MachineBlock2.PressurizedReactionChamber.name=Chambre de réaction pressurisée tile.MachineBlock2.PressurizedReactionChamber.short.name=CRP -tile.MachineBlock2.PortableTank.name=Réservoir portable tile.MachineBlock2.FluidicPlenisher.name=Remplisseur fluidique tile.MachineBlock2.Laser.name=Laser tile.MachineBlock2.LaserAmplifier.name=Amplifieur laser tile.MachineBlock2.LaserTractorBeam.name=Rayon tracteur laser //Machine Block 3 (third ID iteration) +tile.MachineBlock3.QuantumEntangloporter.name=Entangloporteur Quantique tile.MachineBlock3.SolarNeutronActivator.name=Activateur à neutrons solaire tile.MachineBlock3.Oredictionificator.name=Oredictionificateur +tile.MachineBlock3.ResistiveHeater.name=Chauffeur Resistif +tile.MachineBlock3.FormulaicAssemblicator.name=Assembleur Formulaic //Plastic tile.PlasticBlock.name=Bloc de plastique @@ -178,7 +199,11 @@ item.MultipartTransmitter.AdvancedLogisticalTransporter.name=Transporteur logist item.MultipartTransmitter.EliteLogisticalTransporter.name=Transporteur logistique élite item.MultipartTransmitter.UltimateLogisticalTransporter.name=Transporteur logistique ultime item.MultipartTransmitter.RestrictiveTransporter.name=Transporteur restrictif -item.MultipartTransmitter.DiversionTransporter.name=Transporteur divergent +item.MultipartTransmitter.DiversionTransporter.name=Transporteur diversif +item.MultipartTransmitter.BasicThermodynamicConductor.name=Conducteur Thermodynamique Basique +item.MultipartTransmitter.AdvancedThermodynamicConductor.name=Conducteur Thermodynamique Avancé +item.MultipartTransmitter.EliteThermodynamicConductor.name=Conducteur Thermodynamique Elite +item.MultipartTransmitter.UltimateThermodynamicConductor.name=Conducteur Thermodynamique Ultime //Glow Panel item.GlowPanel.name=Panneau lumineux @@ -312,6 +337,7 @@ fluid.lithium=Lithium liquide fluid.deuterium=Deutérium liquide fluid.tritium=Tritium liquide fluid.fusionFuelDT=Carburant D-T liquide +fluid.steam=Vapeur //OreGas names oregas.iron=Minerai de fer @@ -347,13 +373,15 @@ update.outdated=Vous utilisez d'anciennes versions d'un ou plusieurs modules //Upgrades upgrade.energy=Energie -upgrade.energy.desc=Increases energy efficiency !nand capacity of machinery. +upgrade.energy.desc=Augmente l'efficacité energétique !net la capacité de la machine. upgrade.speed=Vitesse -upgrade.speed.desc=Increases speed of machinery. +upgrade.speed.desc=Augmente la vitesse de la machine. upgrade.filter=Filtre -upgrade.filter.desc=A filter that separates !nheavy water from regular water. +upgrade.filter.desc=Un filtre qui separe l'eau !nlourde de l'eau normale. upgrade.gas=Gaz -upgrade.gas.desc=Increases the efficiency !nof gas-using machinery. +upgrade.gas.desc=Augmente l'efficacité !ndes machines consommant du gaz. +upgrade.muffling=Insonorisant +upgrade.muffling.desc=Reduit le bruit généré par la machine. //Key description text key.mode=Bascule de mode d'éléments @@ -379,8 +407,6 @@ mekanism.configgui.ctgy.usage.tooltip=Paramètres de la machinerie et de leur ut mekanism.configgui.ctgy.client.tooltip=Paramètres spécifiques au client de Mekanism et de tous ses modules //Gui text -gui.removeSpeedUpgrade=Retirer l'amélioration de vitesse -gui.removeEnergyUpgrade=Retirer l'amélioration d'énergie gui.condensentrating=Condensation gui.decondensentrating=Décondensation gui.power=Alimenté @@ -422,11 +448,11 @@ gui.energy=Énergie gui.gas=Gaz gui.dumping=Décharger gui.dumping_excess=Décharger surplus -gui.modID=ID Mod +gui.modID=ID du Mod gui.key=Clef gui.id=ID gui.finished=Terminé -gui.well=Tout va bien ! +gui.well=Tout va bien! gui.upgrade=Amélioration gui.infinite=Infinie gui.min=Mini @@ -439,14 +465,19 @@ gui.formed=Formé gui.incomplete=Incomplet gui.inductionMatrix=Matrice d'induction gui.matrixStats=Statistiques de la matrice +gui.turbineStats=Statistiques de la turbine +gui.boilerStats=Statistiques de la chaudière gui.main=Principal -gui.outputting=Rendement +gui.outputting=Envoie +gui.receiving=Reçoit gui.dimensions=Dimensions gui.constituents=Constituants gui.cells=cellules gui.providers=fournissuers gui.structure=Structure gui.dynamicTank=Réservoir dynamique +gui.industrialTurbine=Turbine Industrielle +gui.thermoelectricBoiler=Chaudière Thermoélectrique gui.visuals=Visuels gui.noEject=Impossible d'éjecter gui.undefined=Indéfinit @@ -473,13 +504,53 @@ gui.vibrating=Vibration gui.abundancy=Abondance gui.nextItem=Elément suivant gui.lastItem=Elément précédent -gui.oreDictCompat=Clef compatible OreDict +gui.oreDictCompat=Clé compatible OreDict gui.toggleCooling=Basculer le mesures de refroidissement gui.coolingMeasurements=Activer le refroidissement gui.redstoneOutputMode=Signal Redstone gui.entityDetection=Détection d'entité gui.moveUp=Monter gui.moveDown=Descendre +gui.flowRate=Débit +gui.maxFlow=Débit Max +gui.tankVolume=Volume du Réservoir +gui.steamFlow=Débit de Vapeur +gui.production=Production +gui.blades=Lames +gui.coils=Bobines +gui.dispersers=Disperseurs +gui.vents=Ventilateurs +gui.maxProduction=Production Max +gui.limiting=Restrictif +gui.steamInput=Entrée de Vapeur +gui.capacity=Capacité +gui.unit=Unité +gui.temp=Temp +gui.usage=Usage +gui.transferred=Transféré +gui.dissipated=Dissipé +gui.boilRate=Vitesse de chauffe +gui.maxBoil=Chauffe Max +gui.maxWater=Eau Max +gui.maxSteam=Vapeur Max +gui.heatTransfer=Transfert de Chaleur +gui.superheaters=Superchauffeurs +gui.boilCapacity=Capacité de la Chaudière +gui.encodeFormula=Encoder la Formule +gui.autoModeToggle=Activer le Mode Auto +gui.craftSingle=Fabriquer un Seul Item +gui.craftAvailable=Fabriquer autant d'Items que disponible +gui.fillEmpty=Remplir/Vider la Grille +gui.noOwner=Pas de Propriétaire +gui.securityOverride=Outrepasser la Sécurité +gui.remove=Retirer +gui.trustedPlayers=Joueurs de Confiance +gui.publicMode=Mode Public +gui.privateMode=Mode Privé +gui.trustedMode=Mode Confiance +gui.securityOffline=Securité Désactivée +gui.noAccessDesc=Vous n'avez pas accès à ce bloc. +gui.overridden=Outrepassé gui.reactor.injectionRate=Taux d'injection @@ -508,13 +579,14 @@ gui.factory.secondaryEnergy=Énergie secondaire gui.factory.autoSort=Tri auto //Recipe types -gui.factory.smelting=Fonte -gui.factory.enriching=Enrichissement -gui.factory.crushing=Broyage -gui.factory.compressing=Compression -gui.factory.combining=Combinage -gui.factory.purifying=Purification -gui.factory.injecting=Injection +gui.factory.Smelting=Fonte +gui.factory.Enriching=Enrichissement +gui.factory.Crushing=Broyage +gui.factory.Compressing=Compression +gui.factory.Combining=Combinage +gui.factory.Purifying=Purification +gui.factory.Injecting=Injection +gui.factory.Infusing=Infusion gui.seismicReader.short=Lect. Seism. gui.seismicReader.solids=Solides @@ -569,8 +641,6 @@ gui.logisticalSorter.default=Défaut gui.logisticalSorter.auto=Auto gui.logisticalSorter.roundRobin=Cyclique -gui.electricChest.editPassword=Éditer le mot de passe - gui.teleporter.notReady=Pas prêt gui.teleporter.ready=Prêt gui.teleporter.noFrame=Pas de cadre @@ -580,6 +650,8 @@ gui.teleporter.needsEnergy=Demande de l'énergie gui.teleporter.noAccess=Vous n'avez pas accès à ce téléporteur. gui.teleporter.noFreq=Pas de fréquence +gui.entangloporter.noAccess=Vous n'avez pas accès à cet Entangloporteur. + gui.digitalMinerConfig=Configuration du mineur digital gui.digitalMiner.autoPull=Tire-auto @@ -596,7 +668,13 @@ gui.digitalMiner.fuzzyMode=Mode flou gui.digitalMiner.missingBlock=bloc manquant //Recipe names -recipe.mekanismShaped=Formé +recipe.mekanismShaped=Avec forme +recipe.mekanismShapeless=Sans Forme + +//Security types +security.public=Public +security.private=Privé +security.trusted=Confiance //Item and block tooltip text tooltip.configurator.configurate=Configurer @@ -607,7 +685,6 @@ tooltip.configurator.pumpReset=Mise à zéro du calcul de la pompe électrique tooltip.configurator.toggleDiverter=Mode de divergence changé par tooltip.configurator.toggleMode=%s comportement heurté par tooltip.configurator.viewMode=Comportement courrant %s -tooltip.configurator.unauth=Ce coffre est verrouillé tooltip.configurator.noLink=Pas de lien tooltip.configurator.linkMsg=Lié à tooltip.configurator.dim=dimension @@ -662,6 +739,11 @@ tooltip.insufficientFuel=Carburant insufisant tooltip.readyForReaction=Prêt pour la réaction tooltip.speed=Vitesse tooltip.and=et +tooltip.heat=Chaleur +tooltip.itemAmount=Quantité d'items +tooltip.invalid=Invalide +tooltip.encoded=Encodé +tooltip.ingredients=Ingrédients tooltip.portableTank.bucketMode=Mode de seau @@ -671,12 +753,9 @@ tooltip.disassembler.fast=rapide tooltip.disassembler.vein=veine tooltip.disassembler.off=arrêt -tooltip.filterCard.got=Données de filtre recouvrées de %s -tooltip.filterCard.set=Données de filtre injectée de %s -tooltip.filterCard.unequal=Formats de données filtré différent -tooltip.filterCard.logisticalSorter=Trieur logistique -tooltip.filterCard.digitalMiner=Mineur digital -tooltip.filterCard.oredictionificator=Oredictionificateur +tooltip.configurationCard.got=Données de configuration récupérées de %s +tooltip.configurationCard.set=Données de configuration injectées de type %s +tooltip.configurationCard.unequal=Formats de données de configuration inégaux tooltip.balloon=Ballon @@ -684,9 +763,33 @@ tooltip.jetpack.regular=Normal tooltip.jetpack.hover=Stabilisé tooltip.jetpack.disabled=Désactivé +tooltip.flamethrower.combat=Combat +tooltip.flamethrower.heat=Chaleur +tooltip.flamethrower.inferno=Inferno +tooltip.flamethrower.modeBump=Mode Lance-flamme buté à + tooltip.seismicReader.needsEnergy=Pas assez d'énergie pour interpréter les vibrations tooltip.seismicReader.noVibrations=Impossible de découvrir des vibrations +tooltip.Bin=Un bloc utilisé pour stocker de larges quantités d'un unique type d'item. +tooltip.TeleporterFrame=Le cadre utilisé pour construire le Téléporteur multiblocs, permettant à un portail d'être généré dans la structure. +tooltip.SteelCasing=Un robuste encadrement à base d'acier utilisé comme foudation pour les machines. +tooltip.DynamicTank=L'encadrement utilisé dnas le Réservoir Dynamique multiblocs, une structure capable de stocker de grandes quantités de fluide. +tooltip.StructuralGlass=Un matériau de verre renforcé qui tombe lorsqu'il est cassé and peut être utilisé dans les structures multiblocs. +tooltip.DynamicValve=Une valve qui peut être placée sur un Réservoir Dynamique multiblocs, permettant aux fluides d'être insérés et extraits via de la tuyauterie externe. +tooltip.ThermalEvaporationController=Le contrôleur de la Centrale d'Evaporation Thermale, agissant comme le bloc maître de la structure. Seulement un peut être placé dans chaque structure multiblocs. +tooltip.ThermalEvaporationValve=Une valve qui peut être placée sur une Centrale d'Evaporation Thermale, permettant aux fluides d'être insérés et extraits via de la tuyauterie externe. +tooltip.ThermalEvaporationBlock=Un encadrement à base d'alliage de cuivre utilisé dans la structure d'une Centrale d'Evaporation Thermale, utilisant ses matériaux avancés pour conduire la grande quantité de chaleur nécessaire à son fonctionnement. +tooltip.InductionCasing=Un type d'encadrement résistant à l'énergie utilise dans la construction d'une Matrice à Induction Energétique multiblocs. +tooltip.InductionPort=Un port qui peut être placé sur une Matrice à Induction Energétique multiblocs, permettant à l'énergie energy d'être inséré et extraite via du cablage externe. +tooltip.InductionCell=Un condensateur hautement conductif capable de stocker des quantités massives d'énergie dans un seul bloc. Intégré dans une Matrice à Induction Energétique pour augmenter le stockage d'énergie du multiblocs. +tooltip.InductionProvider=Un ensemble de systèmes de refroidissement avancés, conducteurs and transformateurs permettant d'augmenter le taux de transfert énergétique maximum de la Matrice à Induction Energétique. +tooltip.SuperheatingElement=Un modulaire et quelque peu dangereux radiateur capable d'émettre des quantités massives de chaleur dans ses environs. +tooltip.PressureDisperser=Un bloc utilisé pour disperser la vapeur à travers une structure multiblocs. Ils doivent former une plaque horizontale sans trou pour contrôler correctement le débit de vapeur. +tooltip.BoilerCasing=Un dense encadrement résistant à la pression utilisé dans la construction d'une Chaudière Thermoélectrique multiblocs. +tooltip.BoilerValve=Une valve qui peut être placée sur une Chaudière Thermoélectrique multiblocs, permettant l'insertion d'énergie et d'eau iansi que l'extraction de la vapeur produite. +tooltip.SecurityDesk=Un centre de contrôle pour gérer la sécurité de toutes vos machines. + tooltip.EnrichmentChamber=Une machine simple utilisée pour enrichir !nles minerais dans deux de leurs équivalents !nen poussière, aussi bien qu'exécuter beaucoup !nd'autres opérations. tooltip.OsmiumCompressor=Une machine assez avancée utilisée pour !ncomprimer l'osmium dans diverses poussières pour !ncréer leurs équivalents en lingot. tooltip.Combiner=Une machine utilisée pour combiner les poussières !net les pavés pour former leurs équivalents minerais. @@ -728,6 +831,12 @@ tooltip.GasGenerator=Générateur qui exploite le changement !nmoléculaire des tooltip.BioGenerator=Générateur qui brule les matériaux organiques !ndu monde pour produire de l'énergie. tooltip.AdvancedSolarGenerator=Générateur avancé qui absorbe directement !nles rayons solaire avec peu de pertes !npour produire de l'énergie.. tooltip.WindTurbine=Générateur qui utilise la force du vent !pour produire de l'énergie, l'efficacité augmentant !naux niveaux les plus haut. +tooltip.TurbineRotor=La barre d'acier utilisée pour loger les Lames de Turbine dans une Turbine Industrielle. +tooltip.RotationalComplex=Un connecteur qui est placé sur le plus Rotor d'une Turbine Industrielle pour quider l'énergie kinétique dans ses Bobines Electromagnétiques. +tooltip.ElectromagneticCoil=Un bloc qui transforme l'énergie kinétique d'un Complexe Rotatif en électricité. Ils peuvent être placés dans n'importe quel agencement au-dessus de votre Complexe Rotatif , tant qu'ils se touchent tous entre eux et le Complexe lui-même. +tooltip.TurbineCasing=Encadrement résistant à la pression utilisé dans la construction d'une Turbine Industrielle. +tooltip.TurbineValve=Un type d'encadrement de Turbine qui inclu un port pour le transfert d'énergie et de vapeur. +tooltip.TurbineVent=Un type d'encadrement de Turbine avec une aération intégrée pour libérer la vapeur. Il doit être placésur le niveau ou au-dessus du Complexe Rotatif. tooltip.ReactorGlass=Reinforced glass that can be used in !nthe Fusion Reactor multiblock. tooltip.ReactorLaserFocusMatrix=A panel of Reactor Glass that !nis capable of absorbing optical energy and !nthereby heating up the Fusion Reactor. @@ -750,6 +859,10 @@ sideData.Gas=Gaz sideData.Extra=Extra sideData.Infuse=Infuser sideData.Fluid=Fluide +sideData.Fill=Remplir +sideData.Empty=Vider +sideData.Charge=Charger +sideData.Discharge=Décharger //Redstone control control.disabled=Désactivé @@ -830,6 +943,7 @@ nei.rotaryCondensentrator=Condensateur R. //Items item.SolarPanel.name=Panneau Solaire item.Hohlraum.name=Hohlraum +item.TurbineBlade.name=Lame de Turbine //Generators tile.Generator.HeatGenerator.name=Générateur thermique @@ -838,6 +952,12 @@ tile.Generator.HydrogenGenerator.name=Générateur à hydrogène tile.Generator.BioGenerator.name=Bio-Générateur tile.Generator.AdvancedSolarGenerator.name=Générateur solaire avancé tile.Generator.WindTurbine.name=Éolienne +tile.Generator.TurbineRotor.name=Rotor de Turbine +tile.Generator.RotationalComplex.name=Complexe Rotatif +tile.Generator.ElectromagneticCoil.name=Bobine Electromagnétique +tile.Generator.TurbineCasing.name=Encadrement de Turbine +tile.Generator.TurbineValve.name=Valve de Turbine +tile.Generator.TurbineVent.name=Ventilateur de Turbine tile.Reactor.ReactorController.name=Contrôleur de réacteur tile.Reactor.ReactorFrame.name=Cadre de réacteur From 648fcbd04ca209548aeecc9bdd706f72441bed24 Mon Sep 17 00:00:00 2001 From: LFalch Date: Tue, 29 Mar 2016 19:01:16 +0200 Subject: [PATCH 31/62] Update Danish locale Correct a few previous mistakes --- .../resources/assets/mekanism/lang/da_DK.lang | 312 ++++++++++++------ 1 file changed, 213 insertions(+), 99 deletions(-) diff --git a/src/main/resources/assets/mekanism/lang/da_DK.lang b/src/main/resources/assets/mekanism/lang/da_DK.lang index 1ef32add0..2891bf538 100644 --- a/src/main/resources/assets/mekanism/lang/da_DK.lang +++ b/src/main/resources/assets/mekanism/lang/da_DK.lang @@ -11,6 +11,7 @@ item.EnergyTablet.name=Energi-tablet item.SpeedUpgrade.name=Hastighedsopgradering item.EnergyUpgrade.name=Energiopgradering item.FilterUpgrade.name=Filtreringsopgradering +item.MufflingUpgrade.name=Dæmpeopgradering item.GasUpgrade.name=Gasopgradering item.Robit.name=Robit item.AtomicDisassembler.name=Atomadskiller @@ -47,6 +48,7 @@ item.Substrate.name=Substrat item.Flamethrower.name=Flammekaster item.GaugeDropper.name=Gauge Dropper item.BioFuel.name=Biobrændsel +item.CraftingFormula.name=Crafting-formel //Control Circuits item.BasicControlCircuit.name=Basalt Kontrolkredsløb @@ -55,7 +57,16 @@ item.EliteControlCircuit.name=Elite Kontrolkredsløb item.UltimateControlCircuit.name=Ultimativt Kontrolkredsløb //Gas Tank -tile.GasTank.GasTank.name=Gasstank +tile.GasTankBasic.name=Basal Gastank +tile.GasTankAdvanced.name=Avanceret Gastank +tile.GasTankElite.name=Elite Gastank +tile.GasTankUltimate.name=Ultimativ Gastank + +//Fluid Tank (part of MachineBlock2, naming handled differently) +tile.FluidTankBasic.name=Basal Væsketank +tile.FluidTankAdvanced.name=Avanceret Væsketank +tile.FluidTankElite.name=Elite Væsketank +tile.FluidTankUltimate.name=Ultimativ Væsketank //Cardboard Box tile.CardboardBox.name=Papkasse @@ -73,19 +84,22 @@ tile.BasicBlock.RefinedObsidian.name=Raffineret Obsidian tile.BasicBlock.CharcoalBlock.name=Trækulsblok tile.BasicBlock.RefinedGlowstone.name=Raffineret Glødesten tile.BasicBlock.SteelBlock.name=Stålblok -tile.BasicBlock.Bin.name=Papirkurv +tile.BasicBlock.BinBasic.name=Basal Papirkurv +tile.BasicBlock.BinAdvanced.name=Advanceret Papirkurv +tile.BasicBlock.BinElite.name=Elite Papirkurv +tile.BasicBlock.BinUltimate.name=Ultimativ Papirkurv tile.BasicBlock.TeleporterFrame.name=Teleportørindramning tile.BasicBlock.SteelCasing.name=Stål-casing tile.BasicBlock.DynamicTank.name=Dynamisk Tank -tile.BasicBlock.DynamicGlass.name=Dynamisk Glas +tile.BasicBlock.StructuralGlass.name=Strukturelt Glas tile.BasicBlock.DynamicValve.name=Dynamisk Ventil tile.BasicBlock.CopperBlock.name=Kobberblok tile.BasicBlock.TinBlock.name=Tinblok -tile.BasicBlock.SolarEvaporationController.name=Solfordampningscontroller -tile.BasicBlock.SolarEvaporationValve.name=Solfordampningsventil +tile.BasicBlock.ThermalEvaporationController.name=Termisk Fordampnings-controller +tile.BasicBlock.ThermalEvaporationValve.name=Termisk Fordampningsventil //Basic Block 2 (second ID iteration) -tile.BasicBlock2.SolarEvaporationBlock.name=Solfordampningsblok +tile.BasicBlock2.ThermalEvaporationBlock.name=Thermisk Fordampningsblok tile.BasicBlock2.InductionCasing.name=Induktions-casing tile.BasicBlock2.InductionPort.name=Induktionsport tile.BasicBlock2.InductionCellBasic.name=Basal Induktionscelle @@ -96,6 +110,11 @@ tile.BasicBlock2.InductionProviderBasic.name=Basal Induktionsprovider tile.BasicBlock2.InductionProviderAdvanced.name=Avanceret Induktionsprovider tile.BasicBlock2.InductionProviderElite.name=Elite Induktionsprovider tile.BasicBlock2.InductionProviderUltimate.name=Ultimativ Induktionsprovider +tile.BasicBlock2.SuperheatingElement.name=Superheating-element +tile.BasicBlock2.PressureDisperser.name=Trykspreder +tile.BasicBlock2.BoilerCasing.name=Kedel-casing +tile.BasicBlock2.BoilerValve.name=Kedelventil +tile.BasicBlock2.SecurityDesk.name=Sikkerhedskateder //Machine Block tile.MachineBlock.EnrichmentChamber.name=Berigelseskammer @@ -110,7 +129,7 @@ tile.MachineBlock.Teleporter.name=Teleporter tile.MachineBlock.ElectricPump.name=Elektrisk Pumpe tile.MachineBlock.ElectricChest.name=Elektrisk Kiste tile.MachineBlock.Chargepad.name=Chargepad -tile.MachineBlock.LogisticalSorter.name=Logistical Sorterer +tile.MachineBlock.LogisticalSorter.name=Logistisk Sorterer tile.MachineBlock.DigitalMiner.name=Digital Miner //Machine Block 2 (second ID iteration) @@ -127,15 +146,17 @@ tile.MachineBlock2.ChemicalCrystallizer.name=Kemisk Krystalisator tile.MachineBlock2.SeismicVibrator.name=Seismisk Vibrator tile.MachineBlock2.PressurizedReactionChamber.name=Pressurized Reaction Chamber tile.MachineBlock2.PressurizedReactionChamber.short.name=PRC -tile.MachineBlock2.PortableTank.name=Mobil Tank tile.MachineBlock2.FluidicPlenisher.name=Fluidisk Plenisher tile.MachineBlock2.Laser.name=Laser tile.MachineBlock2.LaserAmplifier.name=Laserfortstærker tile.MachineBlock2.LaserTractorBeam.name=Laser Traktorstråle //Machine Block 3 (third ID iteration) -tile.MachineBlock3.SolarNeutronActivator.name=Solar Neutron Activator +tile.MachineBlock3.QuantumEntangloporter.name=Kvante-entangloporter +tile.MachineBlock3.SolarNeutronActivator.name=Sol-neutronaktivator tile.MachineBlock3.Oredictionificator.name=Oredictionificator +tile.MachineBlock3.ResistiveHeater.name=Modstandsvarmeelement +tile.MachineBlock3.FormulaicAssemblicator.name=Formulæisk Samleenhed //Plastic tile.PlasticBlock.name=Plastblok @@ -179,6 +200,10 @@ item.MultipartTransmitter.EliteLogisticalTransporter.name=Elite Logistisk Transp item.MultipartTransmitter.UltimateLogisticalTransporter.name=Ultimativ Logistisk Transportør item.MultipartTransmitter.RestrictiveTransporter.name=Begrænsende Transporter item.MultipartTransmitter.DiversionTransporter.name=Afledningstransporter +item.MultipartTransmitter.BasicThermodynamicConductor.name=Basal Termodynamisk Leder +item.MultipartTransmitter.AdvancedThermodynamicConductor.name=Avanceret Termodynamisk Leder +item.MultipartTransmitter.EliteThermodynamicConductor.name=Elite Termodynamisk Leder +item.MultipartTransmitter.UltimateThermodynamicConductor.name=Ultimativ Thermodynamisk Leder //Glow Panel item.GlowPanel.name=Glødepanel @@ -312,6 +337,7 @@ fluid.lithium=Flydende Lithium fluid.deuterium=Flydende Deuterium fluid.tritium=Flydende Tritium fluid.fusionFuelDT=Flydende D-T Brændsel +fluid.steam=Damp //OreGas names oregas.iron=Jernmalm @@ -338,25 +364,27 @@ transmission.Items=Ting transmission.Heat=Varme //Update handler text -update.consider=Tænk på at opdatere til version +update.consider=Overvej at opdatere til version update.newFeatures=Nye funktioner update.visit=Besøg update.toDownload=til at downloade -update.devBuild=Du bruger en udviklerversion -update.outdated=Du bruger en forældet version på et eller flere moduler +update.devBuild=Bruger en udviklerversion +update.outdated=Bruger en forældet version på et eller flere moduler //Upgrades upgrade.energy=Energi -upgrade.energy.desc=Øger energieffektiviteten !nog kapaciteten på maskinen. +upgrade.energy.desc=Øger energieffektiviteten og kapaciteten på maskinen. upgrade.speed=Hastighed upgrade.speed.desc=Øger hastigheden på maskinen. upgrade.filter=Filter -upgrade.filter.desc=Et filter som sepererer !ntungtvand fra almindelig vand. +upgrade.filter.desc=Et filter som sepererer tungtvand fra almindelig vand. upgrade.gas=Gas -upgrade.gas.desc=Øger effektiviteten !naf gasforbrugende maskineri. +upgrade.gas.desc=Øger effektiviteten af gasforbrugende maskineri. +upgrade.muffling=Dæmpning +upgrade.muffling.desc=Reducérer støj genereret af maskineri. //Key description text -key.mode=Ændr Itemmodus +key.mode=Ændr Genstandsmodus key.armorMode=Ændr Armormodus key.voice=Stemme @@ -448,6 +476,8 @@ gui.cells=celler gui.providers=providers gui.structure=Struktur gui.dynamicTank=Dynamisk Tank +gui.industrialTurbine=Industriel Turbine +gui.thermoelectricBoiler=Termoelektrisk Kedel gui.visuals=Visuelle gui.noEject=Kan ikke udstøde gui.undefined=Udefineret @@ -459,28 +489,68 @@ gui.set=Sæt gui.freq=Frek. gui.security=Sikkerhed gui.index=Indeks -gui.producing=Producing -gui.maxOutput=Max Output -gui.storing=Storing -gui.skyBlocked=Sky blocked -gui.using=Using -gui.needed=Needed -gui.noRecipe=No recipe -gui.conflict=Conflict -gui.height=Height +gui.producing=Producerer +gui.maxOutput=Maks Output +gui.storing=Opbevarer +gui.skyBlocked=Himmel blokeret +gui.using=Bruger +gui.needed=Behøvet +gui.noRecipe=Ingen opskrift +gui.conflict=Konflikt +gui.height=Højde gui.mult=Mult gui.chunk=Chunk -gui.vibrating=Vibrating -gui.abundancy=Abundancy -gui.nextItem=Next Item -gui.lastItem=Last Item -gui.oreDictCompat=Compatible OreDict Key -gui.toggleCooling=Toggle Cooling Measurements -gui.coolingMeasurements=Active cooling -gui.redstoneOutputMode=Redstone mode +gui.vibrating=Vibrerer +gui.abundancy=Overflod +gui.nextItem=Næste Genstand +gui.lastItem=Sidste Genstand +gui.oreDictCompat=Kompatibel OreDict-nøgle +gui.toggleCooling=Skift Kølemålinger +gui.coolingMeasurements=Aktiv Køling +gui.redstoneOutputMode=Redstone-modus gui.entityDetection=Entity Detection -gui.moveUp=Move Up -gui.moveDown=Move Down +gui.moveUp=Flyt Op +gui.moveDown=Flyt Ned +gui.flowRate=Strømningshastighed +gui.maxFlow=Maks sats +gui.tankVolume=Tankrumfang +gui.steamFlow=Dampstrøm +gui.production=Produktion +gui.blades=Blade +gui.coils=Spoler +gui.dispersers=Spredere +gui.vents=Ventilatorer +gui.maxProduction=Maks Produktion +gui.limiting=Begrænsende +gui.steamInput=Damp-input +gui.capacity=Kapacitet +gui.unit=Enhed +gui.temp=Temp +gui.usage=Forbrug +gui.transferred=Overført +gui.dissipated=Spredt +gui.boilRate=Kogehastighed +gui.maxBoil=Maks Kogning +gui.maxWater=Maks Vand +gui.maxSteam=Maks Damp +gui.heatTransfer=Varmeoverførsel +gui.superheaters=Superheatere +gui.boilCapacity=Kogekapacitet +gui.encodeFormula=Enkodningsformel +gui.autoModeToggle=Skift Auto-modus +gui.craftSingle=Craft Enkel Genstand +gui.craftAvailable=Craft Tilgængelige Genstande +gui.fillEmpty=Fyld/Tøm Grid +gui.noOwner=Ingen Ejer +gui.securityOverride=Sikkerheds-override +gui.remove=Fjern +gui.trustedPlayers=Betroede Spillere +gui.publicMode=Offentlig Modus +gui.privateMode=Privat Modus +gui.trustedMode=Betroede Modus +gui.securityOffline=Sikkerhed Offline +gui.noAccessDesc=Du har ikke adgang til denne blok. +gui.overridden=Overriden gui.reactor.injectionRate=Injektionssats @@ -516,6 +586,7 @@ gui.factory.Compressing=Komprimerings gui.factory.Combining=Kombinerings gui.factory.Purifying=Rensnings gui.factory.Injecting=Injicerings +gui.factory.Infusing=Infusions gui.seismicReader.short=S. Aflæser gui.seismicReader.solids=Faste Stoffer @@ -570,8 +641,6 @@ gui.logisticalSorter.default=Standard gui.logisticalSorter.auto=Auto gui.logisticalSorter.roundRobin=Round-robin -gui.electricChest.editPassword=Ændr Kode - gui.teleporter.notReady=Ikke klar gui.teleporter.ready=Klar gui.teleporter.noFrame=Ingen indramning @@ -581,6 +650,8 @@ gui.teleporter.needsEnergy=Mangler energi gui.teleporter.noAccess=Du har ikke adgang til denne teleportør. gui.teleporter.noFreq=Ingen frekvens +gui.entangloporter.noAccess=Du har ikke adgang til denne Entangloporter. + gui.digitalMinerConfig=Digital Miner Konfig gui.digitalMiner.autoPull=Auto-træk @@ -598,6 +669,12 @@ gui.digitalMiner.missingBlock=Manglende blok //Recipe names recipe.mekanismShaped=Formet +recipe.mekanismShapeless=Formløs + +//Security types +security.public=Offentlig +security.private=Privat +security.trusted=Betroede //Item and block tooltip text tooltip.configurator.configurate=Konfigurér @@ -608,13 +685,12 @@ tooltip.configurator.pumpReset=Nulstil Elektrisk Pumpe udregning tooltip.configurator.toggleDiverter=Afledermodus ændret til tooltip.configurator.toggleMode=%s opførsel ændret til tooltip.configurator.viewMode=Nuværende %s opførsel -tooltip.configurator.unauth=Denne kiste er låst tooltip.configurator.noLink=Ingen forbindelse tooltip.configurator.linkMsg=Forbundet til tooltip.configurator.dim=dimension tooltip.configurator.setLink=Sæt tilkobling til blok tooltip.configurator.plenisherReset=Nulstil Fluidisk Plenisher udregning -tooltip.configurator.inductionPortMode=Skiftet Indukstionsports overføringsmodus til +tooltip.configurator.inductionPortMode=Skiftet Induktionsports overførelsesmodus til tooltip.configurator.toggleColor=Farve skiftet til tooltip.configurator.viewColor=Nuværende farve @@ -623,7 +699,7 @@ tooltip.upgrade.energy=Energi tooltip.inventory=Inventar tooltip.storedEnergy=Opbevaret energi -tooltip.auth=Enutentificeret +tooltip.auth=Autentificeret tooltip.locked=Låst tooltip.recipeType=Opskriftstype tooltip.hold=Hold @@ -663,6 +739,11 @@ tooltip.insufficientFuel=Utilstrækkelig Brændsel tooltip.readyForReaction=Klar til Reaktion tooltip.speed=Fart tooltip.and=og +tooltip.heat=Varme +tooltip.itemAmount=Genstandsmængde +tooltip.invalid=Invalid +tooltip.encoded=Enkodet +tooltip.ingredients=Ingredienser tooltip.portableTank.bucketMode=Spand-modus @@ -672,12 +753,9 @@ tooltip.disassembler.fast=hurtig tooltip.disassembler.vein=åre tooltip.disassembler.off=fra -tooltip.filterCard.got=Hentet filterdata fra %s -tooltip.filterCard.set=Injicerede filterdata af typen %s -tooltip.filterCard.unequal=Ulige filterdata-formater -tooltip.filterCard.logisticalSorter=Logistisk Sorterer -tooltip.filterCard.digitalMiner=Digital Miner -tooltip.filterCard.oredictionificator=Oredictionificator +tooltip.configurationCard.got=Hentede konfigurationsdata fra %s +tooltip.configurationCard.set=Injicerede konfigurationsdata af type %s +tooltip.configurationCard.unequal=Uens konfigurationsdataformater tooltip.balloon=Ballon @@ -688,64 +766,89 @@ tooltip.jetpack.disabled=Deaktiveret tooltip.flamethrower.combat=Kamp tooltip.flamethrower.heat=Opvarm tooltip.flamethrower.inferno=Inferno -tooltip.flamethrower.modeBump=Flammekastermodus skubbet til +tooltip.flamethrower.modeBump=Flammekastermodus skiftet til tooltip.seismicReader.needsEnergy=Ikke nok energi til at læse vibration tooltip.seismicReader.noVibrations=Ikke i stand til at opdage nogen vibrationer -tooltip.EnrichmentChamber=En simpel maskine brugt til at berige malm om til !nto af deres støvmodparter, såvel som at !nudføre mange andre operationer. -tooltip.OsmiumCompressor=En nogenlunde avanceret maskine brugt til at !nkomprimere osmium om til adskillige støve for !nså at kunne lave deres barremodparter. -tooltip.Combiner=En maskine brugt til at kombinere støv og brosten !nfor at forme deres malmmodparter. -tooltip.Crusher=En maskine brugt til at knuse barrer om til deres støvmodparter, !nså vel som at udføre mange andre operationer. -tooltip.DigitalMiner=En højtavanceret, filterbaseret, auto-miner !nder kan mine hvilken som helst blok du beder den om !ninden for en 32-bloks(maks)radius. -tooltip.BasicFactory=Det laveste tier i linjen af Fabrikker, !nder kan bruges til at processere forskellige !nmaskinoperationer ad gangen. -tooltip.AdvancedFactory=Det mellemste tier i linjen af Fabrikker, !nder kan bruges til at processere forskellige !nmaskinoperationer ad gangen. -tooltip.EliteFactory=The højeste tier i linjen af Fabrikker, !nder kan bruges til at processere forskellige !nmaskinoperationer ad gangen. -tooltip.MetallurgicInfuser=En maskine brugt til at infuse adskillige materialer !nom til (generelt) metaller til at lave legeringer !nog andre sammensætninger. -tooltip.PurificationChamber=En avanceret maskine i stand til at processere !nmalm om til the klumper: Bruges som det indledende !nfase i 300%-malmforarbejdning. -tooltip.EnergizedSmelter=En simpel maskine der bruges som en Mekanism-baseret !novn, der kører på energy. -tooltip.Teleporter=En maskine i stand til at teleportere spillere til forskellige !nsteder defineret af en anden teleporter. -tooltip.ElectricPump=En avanceret pumpe i stand til at pumpe !nen hele lavasø op. -tooltip.ElectricChest=En mobil kiste, med 54 pladser, der bruger energi til at låse !nsig selv fra andre vha. adgangskodebeskyttelse. -tooltip.Chargepad=En universal chargepad der kan lade !nenhver energibaseret ting fra enhver mod. -tooltip.LogisticalSorter=En filterbaseret, avanceret sorteringsmaskine, der !nautomatisk kan ustøde specifikke ting ud fra og ind i !ninventarer og Logistiske Transporters ved siden af. -tooltip.RotaryCondensentrator=En maskine i stand til at konvertere gasser om til !nderes flydende form og vice versa. -tooltip.ChemicalInjectionChamber=En elite maskine i stand til at forarbejde !nmalm om til fire shards: Bruges som det indledende !nfase i 400%-malmforarbejdning. -tooltip.ElectrolyticSeparator=En maskine, der bruger electrolyse til at !nsplitte en bestemt gas !nom til to forskellige gasser. -tooltip.PrecisionSawmill=En maskine brugt til at forarbejde logs og andre !ntræbaserede ting mere effektivt, så vel som !nat opnå savsmuld. -tooltip.ChemicalDissolutionChamber=En ultimativ maskine brugt til kemisk at !nopløse alle urenheder af malm, !nder efterlader en uforarbejdet slurry. -tooltip.ChemicalWasher=En ultimativ maskine der rengører uforarbejdet !nslurry og forbereder det krystalisering. -tooltip.ChemicalCrystallizer=En ultimativ maskine brugt til at krystalisere !nrenset malm slurry om til malmkrystaller. -tooltip.ChemicalOxidizer=En maskine i stand til at oxidere !nfast materiale ind til gasform. -tooltip.ChemicalInfuser=En maskine, der producerer en ny !ngas ved infuse til andre. -tooltip.SeismicVibrator=En maskine, der bruger seismiske vibrationer til at !ngive information om forskellige lag !ni verdenen. -tooltip.PressurizedReactionChamber=En avanceret maskine der forarbejder en !nfast, flydende og gasformig blanding og !nlaver både et gasformigt og fast produkt. -tooltip.PortableTank=En handy, mobil tank, der lader dig !nbære 14 spande væske hvorhen du !nønsker. Kan også bruges som spand! -tooltip.FluidicPlenisher=En maskine i stand til at lave hele !nsøer ved at fylde slugter op med væske. -tooltip.Laser=En avanceret form for linær!nenergitransfer der udnytter en!nekstremt kollimeret lysstråle. -tooltip.LaserAmplifier=En blok that can be brugt til at merge,!nomdirigere og forstærke laserstråler,!nmed finkontrollering over hvornår der skydes. -tooltip.LaserTractorBeam=En blok brugt til at forene og!nomdirigere laserstråler. Indsamler!ndrops fra blokke, den ødelægger. -tooltip.SolarNeutronActivator=En maskine der dirigerer neutronstrålingen !nfra solen om til sin interne reserve, hvilket tillader !nen langsom dannelse af forskelige isotoper. -tooltip.Oredictionificator=En maskine brugt til at forene og !noversætte mellem forskellige ting !nog blokke vha. Ore Dictionaryen. +tooltip.Bin=En blok brugt til at opbevare store mængder af en enkel slags genstand. +tooltip.TeleporterFrame=Kabinetet brugt til at konstruere Teleporter-multiblokken for, at en portal kan genereres inden for konstruktionen. +tooltip.SteelCasing=Et robust, stålbaseret kabinet brugt som fundament for maskineri. +tooltip.DynamicTank=Kabinetet brugt i Dynamisk Tank-multiblokken - en konstruktion i stand til at opbevare store mængder væske. +tooltip.StructuralGlass=Et avanceret, forstærket materiale af glas, der dropper sig selv, når den smadres, og kan bruges i konstruktionen af enhver anvendelig multiblok. +tooltip.DynamicValve=En ventil, der kan placeres på en Dynamisk Tank-multiblok for, at væsker kan indføres og udtrækkes via et eksternt rørssytem. +tooltip.ThermalEvaporationController=Controlleren til et Termisk Fordampningsanlæg, der også fungerer som anlæggets master-blok. Kun én af disse bør placeres på en multiblok. +tooltip.ThermalEvaporationValve=En ventil der kan placeres på en Termisk Fordampningsanlæg-multiblok for, at væsker kan indføres og udtrækkes via et eksternt rørssytem. +tooltip.ThermalEvaporationBlock=Et kobberlegeret kabinet brugt i konstruktionen af et Termisk Fordampningsanlæg ved brug af dets avancerede materiale til at lede de store mængder varme nødvendig til forarbejdning. +tooltip.InductionCasing=Et slags energi-modstående kabinet brugt i konstruktionen af en Energibaseret Induktionsmatrice-multiblok. +tooltip.InductionPort=En port, der kan placeres på Energibaseret Induktionsmatrice-multiblok for, at energi kan indføres fra og udtil eksterne kabler. +tooltip.InductionCell=En meget ledende energikodensator i stand til at opbevare massive mængder energi i en enkel blok. Huset i Energibaseret Induktionsmatrice-multiblok for at udvide multiblokkens energilagring. +tooltip.InductionProvider=Et avanceret compleks af kølesystemer, ledere og transformere i stand til at udvide den Energibaserede Induktionsmatrices maksimale energioverførselshastighed. +tooltip.SuperheatingElement=En modulær, nogenlunde farlig radiator, der er i stand til at afgive massive mængder varme til sine omgivelser. +tooltip.PressureDisperser=En blok brugt til at sprede damp hele vejen igennem en multiblok-konstruktion. Disse skulle forme et vandret plan uden huller for ordentligt at kunne kontrollere dampen. +tooltip.BoilerCasing=Et trykmodstående, tæt kabinet brugt i konstruktionen af en Termoelektrisk Kedel-multiblok. +tooltip.BoilerValve=En ventil, der kan placeres på en Termoelektrisk Kedel-multiblok, der muliggør indførslen af energi og vand samt udvindelsen af produceret damp. +tooltip.SecurityDesk=En central kontrolhub til at styre sikkerheden af alt dit egede maskineri. -tooltip.HeatGenerator=En generator der bruger lavaens varme eller !nandre brændbare ressourcer til at producere energi. -tooltip.SolarGenerator=En generator der bruger solens !nkraft til producere energi. -tooltip.GasGenerator=En generator der udnytter de molekulært !nvariende gasser til producere energi. -tooltip.BioGenerator=En generator der brænder organisk materiale i !nverdenen til producere energi. -tooltip.AdvancedSolarGenerator=En avanceret generator der direkte !nabsorberer solens stråler med lille tab !ntil at producere energi. -tooltip.WindTurbine=En generator der bruger vindens styrke !ntil at producere energi med større effektivitet !nved højere niveauer. +tooltip.EnrichmentChamber=En simpel maskine brugt til at berige malm om til to af deres støvmodparter, såvel som at udføre mange andre operationer. +tooltip.OsmiumCompressor=En nogenlunde avanceret maskine brugt til at komprimere osmium om til adskillige støve for så at kunne lave deres barremodparter. +tooltip.Combiner=En maskine brugt til at kombinere støv og brosten for at forme deres malmmodparter. +tooltip.Crusher=En maskine brugt til at knuse barrer om til deres støvmodparter, så vel som at udføre mange andre operationer. +tooltip.DigitalMiner=En højtavanceret, filterbaseret, auto-miner der kan mine hvilken som helst blok du beder den om inden for en 32-bloks(maks)radius. +tooltip.BasicFactory=Det laveste tier i linjen af Fabrikker, der kan bruges til at processere forskellige maskinoperationer ad gangen. +tooltip.AdvancedFactory=Det mellemste tier i linjen af Fabrikker, der kan bruges til at processere forskellige maskinoperationer ad gangen. +tooltip.EliteFactory=The højeste tier i linjen af Fabrikker, der kan bruges til at processere forskellige maskinoperationer ad gangen. +tooltip.MetallurgicInfuser=En maskine brugt til at infuse adskillige materialer om til (generelt) metaller til at lave legeringer og andre sammensætninger. +tooltip.PurificationChamber=En avanceret maskine i stand til at processere malm om til the klumper: Bruges som det indledende fase i 300%-malmforarbejdning. +tooltip.EnergizedSmelter=En simpel maskine der bruges som en Mekanism-baseret ovn, der kører på energy. +tooltip.Teleporter=En maskine i stand til at teleportere spillere til forskellige steder defineret af en anden teleporter. +tooltip.ElectricPump=En avanceret pumpe i stand til at pumpe en hele lavasø op. +tooltip.ElectricChest=En mobil kiste, med 54 pladser, der bruger energi til at låse sig selv fra andre vha. adgangskodebeskyttelse. +tooltip.Chargepad=En universal chargepad der kan lade enhver energibaseret ting fra enhver mod. +tooltip.LogisticalSorter=En filterbaseret, avanceret sorteringsmaskine, der automatisk kan ustøde specifikke ting ud fra og ind i inventarer og Logistiske Transporters ved siden af. +tooltip.RotaryCondensentrator=En maskine i stand til at konvertere gasser om til deres flydende form og vice versa. +tooltip.ChemicalInjectionChamber=En elite maskine i stand til at forarbejde malm om til fire shards: Bruges som det indledende fase i 400%-malmforarbejdning. +tooltip.ElectrolyticSeparator=En maskine, der bruger electrolyse til at splitte en bestemt gas om til to forskellige gasser. +tooltip.PrecisionSawmill=En maskine brugt til at forarbejde logs og andre træbaserede ting mere effektivt, så vel som at opnå savsmuld. +tooltip.ChemicalDissolutionChamber=En ultimativ maskine brugt til kemisk at opløse alle urenheder af malm, der efterlader en uforarbejdet slurry. +tooltip.ChemicalWasher=En ultimativ maskine der rengører uforarbejdet slurry og forbereder det krystalisering. +tooltip.ChemicalCrystallizer=En ultimativ maskine brugt til at krystalisere renset malm slurry om til malmkrystaller. +tooltip.ChemicalOxidizer=En maskine i stand til at oxidere fast materiale ind til gasform. +tooltip.ChemicalInfuser=En maskine, der producerer en ny gas ved infuse til andre. +tooltip.SeismicVibrator=En maskine, der bruger seismiske vibrationer til at give information om forskellige lag i verdenen. +tooltip.PressurizedReactionChamber=En avanceret maskine der forarbejder en fast, flydende og gasformig blanding og laver både et gasformigt og fast produkt. +tooltip.PortableTank=En handy, mobil tank, der lader dig bære 14 spande væske hvorhen du ønsker. Kan også bruges som spand! +tooltip.FluidicPlenisher=En maskine i stand til at lave hele søer ved at fylde slugter op med væske. +tooltip.Laser=En avanceret form for linærenergitransfer der udnytter enekstremt kollimeret lysstråle. +tooltip.LaserAmplifier=En blok that can be brugt til at merge,omdirigere og forstærke laserstråler,med finkontrollering over hvornår der skydes. +tooltip.LaserTractorBeam=En blok brugt til at forene ogomdirigere laserstråler. Indsamlerdrops fra blokke, den ødelægger. +tooltip.SolarNeutronActivator=En maskine der dirigerer neutronstrålingen fra solen om til sin interne reserve, hvilket tillader en langsom dannelse af forskelige isotoper. +tooltip.Oredictionificator=En maskine brugt til at forene og oversætte mellem forskellige ting og blokke vha. Ore Dictionaryen. -tooltip.ReactorGlass=Forstærket glas, der kan bruges i !nFusionsreaktor-multiblokken. -tooltip.ReactorLaserFocusMatrix=Et panel af Reaktorglas i !nstand til at absorbere optisk energi og !nderved opvarme Fusionsreaktoren. -tooltip.ReactorController=Den kotrollerende blok til hele !nFusionsreaktorens struktur. -tooltip.ReactorFrame=Forstærket indramning, der kan bruges i !nFusionsreaktor-multiblokken. -tooltip.ReactorNeutronCapturePlate=En blok, der kan bruges til !nbåde at blokere Fusionsreaktorstråling og assistere !ni produktionen af Tritium. -tooltip.ReactorPort=En blok forstærket indramning i stand til !nat håndtere både gas- og energioverførslen !naf Fusionsreaktoren. -tooltip.ReactorLogicAdapter=En blok der kan bruges til at !ntillade basal overvågning af en reaktor vha. rødsten. +tooltip.HeatGenerator=En generator der bruger lavaens varme eller andre brændbare ressourcer til at producere energi. +tooltip.SolarGenerator=En generator der bruger solens kraft til producere energi. +tooltip.GasGenerator=En generator der udnytter de molekulært variende gasser til producere energi. +tooltip.BioGenerator=En generator der brænder organisk materiale i verdenen til producere energi. +tooltip.AdvancedSolarGenerator=En avanceret generator der direkte absorberer solens stråler med lille tab til at producere energi. +tooltip.WindTurbine=En generator der bruger vindens styrke til at producere energi med større effektivitet ved højere niveauer. +tooltip.TurbineRotor=Stålstangen, der bruges til at huse Turbineblad indeni en Industriel Turbine. +tooltip.RotationalComplex=En connector, der er placeret på den højeste Turbinerotor på en Industriel Turbine til at bære kinetisk energi ind i sine Elektromagnetiske Spoler. +tooltip.ElectromagneticCoil=En blok, der konverterer kinetisk energi fra et Rotationskompleks omtil brugbar elektricitet. Disse kan placeres på hvilken som helst måde ovenpå dit Rotationscompleks, så længe de alle stadig rør hinanden og complekset sig selv. +tooltip.TurbineCasing=Pressure-resistant casing used in the creation of an Industrial Turbine. +tooltip.TurbineValve=Et slags Turbinekabinet, der inkluderer en port til overførsel af energi og damp. +tooltip.TurbineVent=Et slags Turbinekabinet med en integreret ventilator til udledningen af damp. Disse bør placeres på samme niveau som eller over turbinens Rotationscompleks. -tooltip.OsmiumOre=Et stærkt mineral der kan findes på !nenhver højde i verdenen. Den er!nkendt for at have mange anvendelser i !nkonstruktionen af maskineri. -tooltip.CopperOre=Et almindeligt, ledende materiale der !nkan bruges i produktionen af !nledninger. Dets evne til at modstå !nhøj varme gør den også essential !ntil avanceret maskineri. -tooltip.TinOre=Et letvægts, dog stadig robust, ledende !nmateriale, der er en smule mindre !nsjælden end Kobber. +tooltip.ReactorGlass=Forstærket glas, der kan bruges i Fusionsreaktor-multiblokken. +tooltip.ReactorLaserFocusMatrix=Et panel af Reaktorglas i stand til at absorbere optisk energi og derved opvarme Fusionsreaktoren. +tooltip.ReactorController=Den kotrollerende blok til hele Fusionsreaktorens struktur. +tooltip.ReactorFrame=Forstærket indramning, der kan bruges i Fusionsreaktor-multiblokken. +tooltip.ReactorNeutronCapturePlate=En blok, der kan bruges til både at blokere Fusionsreaktorstråling og assistere i produktionen af Tritium. +tooltip.ReactorPort=En blok forstærket indramning i stand til at håndtere både gas- og energioverførslen af Fusionsreaktoren. +tooltip.ReactorLogicAdapter=En blok der kan bruges til at tillade basal overvågning af en reaktor vha. rødsten. + +tooltip.OsmiumOre=Et stærkt mineral der kan findes på enhver højde i verdenen. Den erkendt for at have mange anvendelser i konstruktionen af maskineri. +tooltip.CopperOre=Et almindeligt, ledende materiale der kan bruges i produktionen af ledninger. Dets evne til at modstå høj varme gør den også essential til avanceret maskineri. +tooltip.TinOre=Et letvægts, dog stadig robust, ledende materiale, der er en smule mindre sjælden end Kobber. //Side data sideData.None=Ingen @@ -756,6 +859,10 @@ sideData.Gas=Gas sideData.Extra=Ekstra sideData.Infuse=Infuse sideData.Fluid=Væske +sideData.Fill=Fyld +sideData.Empty=Tøm +sideData.Charge=Oplad +sideData.Discharge=Aflad //Redstone control control.disabled=Deaktiveret @@ -836,6 +943,7 @@ nei.rotaryCondensentrator=R. Condensentrator //Items item.SolarPanel.name=Solpanel item.Hohlraum.name=Hohlraum +item.TurbineBlade.name=Turbineblad //Generators tile.Generator.HeatGenerator.name=Varmegenerator @@ -843,7 +951,13 @@ tile.Generator.SolarGenerator.name=Solgenerator tile.Generator.GasGenerator.name=Gasbrændende Generator tile.Generator.BioGenerator.name=Bio-generator tile.Generator.AdvancedSolarGenerator.name=Avanceret Solgenerator -tile.Generator.WindTurbine.name=Vindturbine +tile.Generator.WindGenerator.name=Vindgenerator +tile.Generator.TurbineRotor.name=Turbinerotor +tile.Generator.RotationalComplex.name=Rotationskompleks +tile.Generator.ElectromagneticCoil.name=Elektromagnetiskspole +tile.Generator.TurbineCasing.name=Turbinekabinet +tile.Generator.TurbineValve.name=Turbineventil +tile.Generator.TurbineVent.name=Turbineventilator tile.Reactor.ReactorController.name=Reaktor-controller tile.Reactor.ReactorFrame.name=Reaktorindramning @@ -857,7 +971,7 @@ tile.ReactorGlass.ReactorLaserFocusMatrix.name=Laserfokus-matrice //Gui text gui.heatGenerator.fuel=Brændstof gui.solarGenerator.sun=Sol -gui.bioGenerator.bioFuel=Bio-brændsel +gui.bioGenerator.bioFuel=Biobrændsel gui.electrolyticSeparator.dump=Udstød gui.passive=Luftkølet From 67372d703ed1f91cee1c296cff27462714313528 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 31 Mar 2016 20:17:00 -0400 Subject: [PATCH 32/62] Portable Teleporter remembers frequency, new side data functionality for blocks with non-configurable sides, fixed energy cubes not outputting up or down, fixed transmitter lighting --- .../client/gui/GuiSideConfiguration.java | 30 +++-- .../mekanism/client/gui/GuiTeleporter.java | 32 ++++- .../client/gui/GuiTransporterConfig.java | 31 +++-- .../client/render/RenderPartTransmitter.java | 10 +- .../tileentity/RenderConfigurableMachine.java | 32 +++-- .../common/item/ItemBlockEnergyCube.java | 6 + .../common/item/ItemBlockGasTank.java | 6 + .../common/item/ItemBlockMachine.java | 6 + .../common/item/ItemConfigurator.java | 46 ++++--- .../common/item/ItemPortableTeleporter.java | 126 +++++++++++++++++- .../network/PacketPortableTeleporter.java | 7 + .../mekanism/common/security/IOwnerItem.java | 12 ++ .../common/security/ISecurityItem.java | 8 +- .../common/tile/TileEntitySecurityDesk.java | 33 +++-- .../tile/component/TileComponentConfig.java | 14 +- .../mekanism/common/util/SecurityUtils.java | 8 ++ .../common/item/ItemBlockGenerator.java | 6 + .../assets/mekanism/gui/GuiConfiguration.png | Bin 4308 -> 4617 bytes .../mekanism/gui/GuiTransporterConfig.png | Bin 4338 -> 4631 bytes .../resources/assets/mekanism/lang/en_US.lang | 5 +- 20 files changed, 333 insertions(+), 85 deletions(-) create mode 100644 src/main/java/mekanism/common/security/IOwnerItem.java diff --git a/src/main/java/mekanism/client/gui/GuiSideConfiguration.java b/src/main/java/mekanism/client/gui/GuiSideConfiguration.java index 1363d9498..2337fe9be 100644 --- a/src/main/java/mekanism/client/gui/GuiSideConfiguration.java +++ b/src/main/java/mekanism/client/gui/GuiSideConfiguration.java @@ -19,6 +19,7 @@ import mekanism.common.network.PacketConfigurationUpdate.ConfigurationPacket; import mekanism.common.network.PacketConfigurationUpdate.ConfigurationUpdateMessage; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -134,17 +135,23 @@ public class GuiSideConfiguration extends GuiMekanism SideData data = configurable.getConfig().getOutput(currentType, i); - if(data.color != EnumColor.GREY) + if(data != TileComponentConfig.EMPTY) { - MekanismRenderer.color(data.color); - } - - if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) - { - drawTexturedModalRect(guiWidth + x, guiHeight + y, 176, 0, 14, 14); + if(data.color != EnumColor.GREY) + { + MekanismRenderer.color(data.color); + } + + if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) + { + drawTexturedModalRect(guiWidth + x, guiHeight + y, 176, 0, 14, 14); + } + else { + drawTexturedModalRect(guiWidth + x, guiHeight + y, 176, 14, 14, 14); + } } else { - drawTexturedModalRect(guiWidth + x, guiHeight + y, 176, 14, 14, 14); + drawTexturedModalRect(guiWidth + x, guiHeight + y, 176, 28, 14, 14); } } @@ -177,9 +184,12 @@ public class GuiSideConfiguration extends GuiMekanism SideData data = configurable.getConfig().getOutput(currentType, i); - if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) + if(data != TileComponentConfig.EMPTY) { - drawCreativeTabHoveringText(data.color + data.localize() + " (" + data.color.getName() + ")", xAxis, yAxis); + if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) + { + drawCreativeTabHoveringText(data.color + data.localize() + " (" + data.color.getName() + ")", xAxis, yAxis); + } } } diff --git a/src/main/java/mekanism/client/gui/GuiTeleporter.java b/src/main/java/mekanism/client/gui/GuiTeleporter.java index f8fc41898..3da5c177f 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -21,6 +21,7 @@ import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage; import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterPacketType; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.IOwnerItem; import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; @@ -69,6 +70,8 @@ public class GuiTeleporter extends GuiMekanism public List clientPublicCache = new ArrayList(); public List clientPrivateCache = new ArrayList(); + + public boolean isInit = true; public GuiTeleporter(InventoryPlayer inventory, TileEntityTeleporter tentity) { @@ -123,6 +126,17 @@ public class GuiTeleporter extends GuiMekanism }, resource, 158, 26)); guiElements.add(scrollList = new GuiScrollList(this, resource, 28, 37, 120, 4)); + ItemPortableTeleporter item = (ItemPortableTeleporter)itemStack.getItem(); + + if(item.getFrequency(stack) != null) + { + privateMode = item.isPrivateMode(itemStack); + setFrequency(item.getFrequency(stack)); + } + else { + Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.DATA_REQUEST, clientFreq)); + } + ySize = 175; } @@ -161,9 +175,15 @@ public class GuiTeleporter extends GuiMekanism if(itemStack != null) { buttonList.add(teleportButton); + + if(!isInit) + { + Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.DATA_REQUEST, clientFreq)); + } + else { + isInit = false; + } } - - Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.DATA_REQUEST, clientFreq)); } public void setFrequency(String freq) @@ -465,7 +485,13 @@ public class GuiTeleporter extends GuiMekanism private String getOwner() { - return tileEntity != null ? tileEntity.getSecurity().getOwner() : entityPlayer.getCommandSenderName(); + if(tileEntity != null) + { + return tileEntity.getSecurity().getOwner(); + } + else { + return ((IOwnerItem)itemStack.getItem()).getOwner(itemStack); + } } private byte getStatus() diff --git a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java index 8a96c7d48..c8daf4350 100644 --- a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java +++ b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java @@ -5,6 +5,7 @@ import java.util.Map; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.transmitters.TransmissionType; import mekanism.client.gui.GuiSideConfiguration.GuiPos; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; @@ -15,6 +16,7 @@ import mekanism.common.network.PacketConfigurationUpdate.ConfigurationPacket; import mekanism.common.network.PacketConfigurationUpdate.ConfigurationUpdateMessage; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -93,17 +95,23 @@ public class GuiTransporterConfig extends GuiMekanism EnumColor color = configurable.getEjector().getInputColor(ForgeDirection.getOrientation(i)); - if(color != null) + if(configurable.getConfig().getOutput(TransmissionType.ITEM, i) != TileComponentConfig.EMPTY) { - MekanismRenderer.color(color); - } - - if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) - { - drawTexturedModalRect(guiWidth + x, guiHeight + y, 176, 0, 14, 14); + if(color != null) + { + MekanismRenderer.color(color); + } + + if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) + { + drawTexturedModalRect(guiWidth + x, guiHeight + y, 176, 0, 14, 14); + } + else { + drawTexturedModalRect(guiWidth + x, guiHeight + y, 176, 14, 14, 14); + } } else { - drawTexturedModalRect(guiWidth + x, guiHeight + y, 176, 14, 14, 14); + drawTexturedModalRect(guiWidth + x, guiHeight + y, 176, 28, 14, 14); } } @@ -145,9 +153,12 @@ public class GuiTransporterConfig extends GuiMekanism EnumColor color = configurable.getEjector().getInputColor(ForgeDirection.getOrientation(i)); - if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) + if(configurable.getConfig().getOutput(TransmissionType.ITEM, i) != TileComponentConfig.EMPTY) { - drawCreativeTabHoveringText(color != null ? color.getName() : LangUtils.localize("gui.none"), xAxis, yAxis); + if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) + { + drawCreativeTabHoveringText(color != null ? color.getName() : LangUtils.localize("gui.none"), xAxis, yAxis); + } } } diff --git a/src/main/java/mekanism/client/render/RenderPartTransmitter.java b/src/main/java/mekanism/client/render/RenderPartTransmitter.java index cc914ef5b..03362b071 100644 --- a/src/main/java/mekanism/client/render/RenderPartTransmitter.java +++ b/src/main/java/mekanism/client/render/RenderPartTransmitter.java @@ -94,16 +94,14 @@ public class RenderPartTransmitter implements IIconSelfRegister for(Map.Entry e : small_models.entrySet()) { - e.setValue(e.getValue().twoFacedCopy().apply(new Translation(Vector3.center)).shrinkUVs(0.0005)); - e.getValue().computeLighting(LightModel.standardLightModel); + e.setValue(e.getValue().computeLighting(LightModel.standardLightModel).twoFacedCopy().apply(new Translation(Vector3.center)).shrinkUVs(0.0005)); } large_models = CCModel.parseObjModels(MekanismUtils.getResource(ResourceType.MODEL, "transmitter_large.obj"), 7, null); for(Map.Entry e : large_models.entrySet()) { - e.setValue(e.getValue().twoFacedCopy().apply(new Translation(Vector3.center)).shrinkUVs(0.0005)); - e.getValue().computeLighting(LightModel.standardLightModel); + e.setValue(e.getValue().computeLighting(LightModel.standardLightModel).twoFacedCopy().apply(new Translation(Vector3.center)).shrinkUVs(0.0005)); } contents_models = CCModel.parseObjModels(MekanismUtils.getResource(ResourceType.MODEL, "transmitter_contents.obj"), 7, null); @@ -297,12 +295,12 @@ public class RenderPartTransmitter implements IIconSelfRegister public void renderContents(PartMechanicalPipe pipe, Vector3 pos) { float targetScale; + if(pipe.getTransmitter().hasTransmitterNetwork()) { targetScale = pipe.getTransmitter().getTransmitterNetwork().fluidScale; } - else - { + else { targetScale = (float)pipe.buffer.getFluidAmount() / (float)pipe.buffer.getCapacity(); } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java index cb22c77ef..6a62c2b1e 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java @@ -3,13 +3,14 @@ package mekanism.client.render.tileentity; import java.util.HashMap; import mekanism.api.Coord4D; -import mekanism.api.EnumColor; import mekanism.api.transmitters.TransmissionType; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; +import mekanism.common.SideData; import mekanism.common.base.ISideConfiguration; import mekanism.common.item.ItemConfigurator; +import mekanism.common.tile.component.TileComponentConfig; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -69,19 +70,22 @@ public class RenderConfigurableMachine extends TileEntitySpecialRenderer { if(xPos == tileEntity.xCoord && yPos == tileEntity.yCoord && zPos == tileEntity.zCoord) { - EnumColor color = configurable.getConfig().getOutput(type, pos.sideHit, configurable.getOrientation()).color; - - push(); - - MekanismRenderer.color(color, 0.6F); - - bindTexture(MekanismRenderer.getBlocksTexture()); - GL11.glTranslatef((float)x, (float)y, (float)z); - - int display = getOverlayDisplay(world, ForgeDirection.getOrientation(pos.sideHit), type).display; - GL11.glCallList(display); - - pop(); + SideData data = configurable.getConfig().getOutput(type, pos.sideHit, configurable.getOrientation()); + + if(data != TileComponentConfig.EMPTY) + { + push(); + + MekanismRenderer.color(data.color, 0.6F); + + bindTexture(MekanismRenderer.getBlocksTexture()); + GL11.glTranslatef((float)x, (float)y, (float)z); + + int display = getOverlayDisplay(world, ForgeDirection.getOrientation(pos.sideHit), type).display; + GL11.glCallList(display); + + pop(); + } } } } diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index 495c44132..a56940d0a 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -418,4 +418,10 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE { return true; } + + @Override + public boolean hasOwner(ItemStack stack) + { + return hasSecurity(stack); + } } diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index 25aa68c0b..467233114 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -391,4 +391,10 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI { return true; } + + @Override + public boolean hasOwner(ItemStack stack) + { + return hasSecurity(stack); + } } diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index df698755f..17f615a42 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -968,4 +968,10 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec return false; } + + @Override + public boolean hasOwner(ItemStack stack) + { + return hasSecurity(stack); + } } diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 23a9e6367..54cb1d919 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -17,6 +17,7 @@ import mekanism.common.base.ISideConfiguration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.SecurityUtils; @@ -72,37 +73,38 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool if(tile instanceof ISideConfiguration && ((ISideConfiguration)tile).getConfig().supports(getState(stack).getTransmission())) { ISideConfiguration config = (ISideConfiguration)tile; + SideData initial = config.getConfig().getOutput(getState(stack).getTransmission(), side, config.getOrientation()); - if(!player.isSneaking()) + if(initial != TileComponentConfig.EMPTY) { - SideData data = config.getConfig().getOutput(getState(stack).getTransmission(), side, config.getOrientation()); - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + getViewModeText(getState(stack).getTransmission()) + ": " + data.color + data.localize() + " (" + data.color.getName() + ")")); - - return true; - } - else { - if(getEnergy(stack) >= ENERGY_PER_CONFIGURE) + if(!player.isSneaking()) { - if(SecurityUtils.canAccess(player, tile)) + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + getViewModeText(getState(stack).getTransmission()) + ": " + initial.color + initial.localize() + " (" + initial.color.getName() + ")")); + } + else { + if(getEnergy(stack) >= ENERGY_PER_CONFIGURE) { - setEnergy(stack, getEnergy(stack) - ENERGY_PER_CONFIGURE); - MekanismUtils.incrementOutput(config, getState(stack).getTransmission(), MekanismUtils.getBaseOrientation(side, config.getOrientation())); - SideData data = config.getConfig().getOutput(getState(stack).getTransmission(), side, config.getOrientation()); - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + getToggleModeText(getState(stack).getTransmission()) + ": " + data.color + data.localize() + " (" + data.color.getName() + ")")); - - if(config instanceof TileEntityBasicBlock) + if(SecurityUtils.canAccess(player, tile)) { - TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)config; - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity))); + setEnergy(stack, getEnergy(stack) - ENERGY_PER_CONFIGURE); + MekanismUtils.incrementOutput(config, getState(stack).getTransmission(), MekanismUtils.getBaseOrientation(side, config.getOrientation())); + SideData data = config.getConfig().getOutput(getState(stack).getTransmission(), side, config.getOrientation()); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + getToggleModeText(getState(stack).getTransmission()) + ": " + data.color + data.localize() + " (" + data.color.getName() + ")")); + + if(config instanceof TileEntityBasicBlock) + { + TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)config; + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity))); + } + } + else { + SecurityUtils.displayNoAccess(player); } } - else { - SecurityUtils.displayNoAccess(player); - } - - return true; } } + + return true; } else if(tile instanceof IConfigurable) { diff --git a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java index 040ef211c..4491be785 100644 --- a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java +++ b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java @@ -1,25 +1,69 @@ package mekanism.common.item; +import java.util.List; + import mekanism.api.Coord4D; +import mekanism.api.EnumColor; +import mekanism.client.MekKeyHandler; +import mekanism.client.MekanismKeyHandler; import mekanism.common.Mekanism; +import mekanism.common.security.IOwnerItem; +import mekanism.common.util.LangUtils; +import mekanism.common.util.SecurityUtils; +import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; -public class ItemPortableTeleporter extends ItemEnergized +public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem { public ItemPortableTeleporter() { super(1000000); } + + @Override + public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + { + list.add(SecurityUtils.getOwnerDisplay(entityplayer.getCommandSenderName(), getOwner(itemstack))); + + if(getFrequency(itemstack) != null) + { + list.add(EnumColor.INDIGO + LangUtils.localize("gui.frequency") + ": " + EnumColor.GREY + getFrequency(itemstack)); + list.add(EnumColor.INDIGO + LangUtils.localize("gui.mode") + ": " + EnumColor.GREY + LangUtils.localize("gui." + (isPrivateMode(itemstack) ? "private" : "public"))); + } + + if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) + { + list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDetails") + "."); + } + else { + super.addInformation(itemstack, entityplayer, list, flag); + } + } @Override public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { if(!world.isRemote) { - entityplayer.openGui(Mekanism.instance, 14, world, 0, 0, 0); + if(getOwner(itemstack) == null) + { + setOwner(itemstack, entityplayer.getCommandSenderName()); + entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("gui.nowOwn"))); + } + else { + if(SecurityUtils.canAccess(entityplayer, itemstack)) + { + entityplayer.openGui(Mekanism.instance, 14, world, 0, 0, 0); + } + else { + SecurityUtils.displayNoAccess(entityplayer); + } + } } return itemstack; @@ -51,4 +95,82 @@ public class ItemPortableTeleporter extends ItemEnergized { return false; } + + @Override + public String getOwner(ItemStack stack) + { + if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("owner")) + { + return stack.stackTagCompound.getString("owner"); + } + + return null; + } + + @Override + public void setOwner(ItemStack stack, String owner) + { + setFrequency(stack, null); + setPrivateMode(stack, false); + + if(owner == null || owner.isEmpty()) + { + stack.stackTagCompound.removeTag("owner"); + return; + } + + stack.stackTagCompound.setString("owner", owner); + } + + @Override + public boolean hasOwner(ItemStack stack) + { + return true; + } + + public boolean isPrivateMode(ItemStack stack) + { + if(stack.stackTagCompound != null) + { + return stack.stackTagCompound.getBoolean("private"); + } + + return false; + } + + public void setPrivateMode(ItemStack stack, boolean isPrivate) + { + if(stack.stackTagCompound == null) + { + stack.setTagCompound(new NBTTagCompound()); + } + + stack.stackTagCompound.setBoolean("private", isPrivate); + } + + public String getFrequency(ItemStack stack) + { + if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("frequency")) + { + return stack.stackTagCompound.getString("frequency"); + } + + return null; + } + + public void setFrequency(ItemStack stack, String frequency) + { + if(stack.stackTagCompound == null) + { + stack.setTagCompound(new NBTTagCompound()); + } + + if(frequency == null || frequency.isEmpty()) + { + stack.stackTagCompound.removeTag("frequency"); + return; + } + + stack.stackTagCompound.setString("frequency", frequency); + } } diff --git a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java index 2ff72ecad..9b70e2981 100644 --- a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java +++ b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java @@ -67,6 +67,9 @@ public class PacketPortableTeleporter implements IMessageHandler sideConfigs = new HashMap(); @@ -135,12 +138,19 @@ public class TileComponentConfig implements ITileComponent public SideData getOutput(TransmissionType type, int side, int facing) { - return getOutputs(type).get(getConfig(type)[MekanismUtils.getBaseOrientation(side, facing)]); + return getOutput(type, MekanismUtils.getBaseOrientation(side, facing)); } public SideData getOutput(TransmissionType type, int side) { - return getOutputs(type).get(getConfig(type)[side]); + int index = getConfig(type)[side]; + + if(index == -1) + { + return EMPTY; + } + + return getOutputs(type).get(index); } public boolean supports(TransmissionType type) diff --git a/src/main/java/mekanism/common/util/SecurityUtils.java b/src/main/java/mekanism/common/util/SecurityUtils.java index bbc76085c..666ef797b 100644 --- a/src/main/java/mekanism/common/util/SecurityUtils.java +++ b/src/main/java/mekanism/common/util/SecurityUtils.java @@ -3,6 +3,7 @@ package mekanism.common.util; import mekanism.api.EnumColor; import mekanism.common.Mekanism; import mekanism.common.frequency.Frequency; +import mekanism.common.security.IOwnerItem; import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; import mekanism.common.security.ISecurityTile.SecurityMode; @@ -17,6 +18,13 @@ public final class SecurityUtils { public static boolean canAccess(EntityPlayer player, ItemStack stack) { + if(!(stack.getItem() instanceof ISecurityItem) && stack.getItem() instanceof IOwnerItem) + { + String owner = ((IOwnerItem)stack.getItem()).getOwner(stack); + + return owner == null || owner.equals(player.getCommandSenderName()); + } + if((!player.worldObj.isRemote && MekanismUtils.isOp((EntityPlayerMP)player)) || stack == null || !(stack.getItem() instanceof ISecurityItem)) { return true; diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index 32bfedfb8..4efcc1b09 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -545,4 +545,10 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp return type.hasModel; } + + @Override + public boolean hasOwner(ItemStack stack) + { + return hasSecurity(stack); + } } diff --git a/src/main/resources/assets/mekanism/gui/GuiConfiguration.png b/src/main/resources/assets/mekanism/gui/GuiConfiguration.png index 8e676bdd1c88ee2f5342d08787ae28667557e162..3b8bf864fe0f7ee08709c602b588edfc0865c0f0 100644 GIT binary patch delta 3911 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 diff --git a/src/main/resources/assets/mekanism/gui/GuiTransporterConfig.png b/src/main/resources/assets/mekanism/gui/GuiTransporterConfig.png index 732493263cb7b12049b8cab0b253bcf53a182c88..9852812339ef1623f23703a42019d4311963f57b 100644 GIT binary patch literal 4631 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 Date: Fri, 1 Apr 2016 13:50:39 -0400 Subject: [PATCH 33/62] New round of machine models, updated Chemical Crystallizer side config defaults --- .../model/ModelChemicalCrystallizer.java | 435 +++++---------- .../ModelChemicalDissolutionChamber.java | 526 ++++++++---------- .../client/model/ModelChemicalOxidizer.java | 4 - .../client/model/ModelChemicalWasher.java | 456 ++++++--------- .../client/model/ModelElectricPump.java | 260 +++++---- .../model/ModelRotaryCondensentrator.java | 380 ++++++------- .../render/block/MachineRenderingHandler.java | 21 +- .../RenderChemicalCrystallizer.java | 2 +- .../render/tileentity/RenderElectricPump.java | 8 +- .../RenderRotaryCondensentrator.java | 8 +- .../common/item/ItemBlockMachine.java | 2 +- .../tile/TileEntityChemicalCrystallizer.java | 2 +- .../tile/TileEntitySeismicVibrator.java | 16 +- .../mekanism/render/ChemicalCrystallizer.png | Bin 5493 -> 5158 bytes .../render/ChemicalDissolutionChamber.png | Bin 5769 -> 5995 bytes .../assets/mekanism/render/ChemicalWasher.png | Bin 7088 -> 5820 bytes .../assets/mekanism/render/ElectricPump.png | Bin 3253 -> 6249 bytes .../mekanism/render/RotaryCondensentrator.png | Bin 3702 -> 7349 bytes 18 files changed, 943 insertions(+), 1177 deletions(-) diff --git a/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java b/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java index 18cc82b80..8a91a6a89 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java @@ -9,315 +9,158 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelChemicalCrystallizer extends ModelBase { - ModelRenderer Base; - ModelRenderer IO1; - ModelRenderer IO2; - ModelRenderer Base3; - ModelRenderer Base2; - ModelRenderer Can1B; - ModelRenderer Can1T; - ModelRenderer Can1Side3; - ModelRenderer Can1Side1; - ModelRenderer Can1Side2; - ModelRenderer Can1Side4; - ModelRenderer Can2Side4; - ModelRenderer Can3Side3; - ModelRenderer Can2Side2; - ModelRenderer Can2Side3; - ModelRenderer Can2Side1; - ModelRenderer Can4Side3; - ModelRenderer Can4Side1; - ModelRenderer Can4Sjde4; - ModelRenderer Can4Side2; - ModelRenderer Can3Side4; - ModelRenderer Can4B; - ModelRenderer Can3Side2; - ModelRenderer Can3Side1; - ModelRenderer Can2B; - ModelRenderer Can4T; - ModelRenderer Can2T; - ModelRenderer Can3T; - ModelRenderer Can3B; - ModelRenderer Spire; - ModelRenderer Spin; - ModelRenderer Vial1; - ModelRenderer Vial2; - ModelRenderer Vial3; - ModelRenderer Vial4; + ModelRenderer tray; + ModelRenderer support4; + ModelRenderer rimBack; + ModelRenderer portRight; + ModelRenderer rimRight; + ModelRenderer rimLeft; + ModelRenderer rimFront; + ModelRenderer portLeft; + ModelRenderer support3; + ModelRenderer support2; + ModelRenderer support1; + ModelRenderer tank; + ModelRenderer rod1; + ModelRenderer rod2; + ModelRenderer rod3; + ModelRenderer base; + ModelRenderer Shape1; - public ModelChemicalCrystallizer() + public ModelChemicalCrystallizer() { textureWidth = 128; textureHeight = 64; - Base = new ModelRenderer(this, 16, 0); - Base.addBox(0F, 0F, 0F, 14, 1, 14); - Base.setRotationPoint(-7F, 23F, -7F); - Base.setTextureSize(128, 64); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - IO1 = new ModelRenderer(this, 9, 17); - IO1.addBox(0F, 0F, 0F, 1, 8, 8); - IO1.setRotationPoint(-8F, 12F, -4F); - IO1.setTextureSize(128, 64); - IO1.mirror = true; - setRotation(IO1, 0F, 0F, 0F); - IO2 = new ModelRenderer(this, 9, 17); - IO2.addBox(0F, 0F, 0F, 1, 8, 8); - IO2.setRotationPoint(7F, 12F, -4F); - IO2.setTextureSize(128, 64); - IO2.mirror = true; - setRotation(IO2, 0F, 0F, 0F); - Base3 = new ModelRenderer(this, 16, 0); - Base3.addBox(0F, 0F, 0F, 14, 1, 14); - Base3.setRotationPoint(-7F, 9F, -7F); - Base3.setTextureSize(128, 64); - Base3.mirror = true; - setRotation(Base3, 0F, 0F, 0F); - Base2 = new ModelRenderer(this, 16, 0); - Base2.addBox(0F, 0F, 0F, 14, 1, 14); - Base2.setRotationPoint(-7F, 14F, -7F); - Base2.setTextureSize(128, 64); - Base2.mirror = true; - setRotation(Base2, 0F, 0F, 0F); - Can1B = new ModelRenderer(this, 0, 0); - Can1B.addBox(0F, 0F, 0F, 4, 1, 4); - Can1B.setRotationPoint(2F, 13F, 2F); - Can1B.setTextureSize(128, 64); - Can1B.mirror = true; - setRotation(Can1B, 0F, 0F, 0F); - Can1T = new ModelRenderer(this, 0, 0); - Can1T.addBox(0F, 0F, 0F, 4, 1, 4); - Can1T.setRotationPoint(2F, 10F, 2F); - Can1T.setTextureSize(128, 64); - Can1T.mirror = true; - setRotation(Can1T, 0F, 0F, 0F); - Can1Side3 = new ModelRenderer(this, 0, 0); - Can1Side3.addBox(0F, 0F, 0F, 1, 2, 2); - Can1Side3.setRotationPoint(5F, 11F, 3F); - Can1Side3.setTextureSize(128, 64); - Can1Side3.mirror = true; - setRotation(Can1Side3, 0F, 0F, 0F); - Can1Side1 = new ModelRenderer(this, 0, 0); - Can1Side1.addBox(0F, 0F, 0F, 4, 2, 1); - Can1Side1.setRotationPoint(2F, 11F, 5F); - Can1Side1.setTextureSize(128, 64); - Can1Side1.mirror = true; - setRotation(Can1Side1, 0F, 0F, 0F); - Can1Side2 = new ModelRenderer(this, 0, 0); - Can1Side2.addBox(0F, 0F, 0F, 4, 2, 1); - Can1Side2.setRotationPoint(2F, 11F, 2F); - Can1Side2.setTextureSize(128, 64); - Can1Side2.mirror = true; - setRotation(Can1Side2, 0F, 0F, 0F); - Can1Side4 = new ModelRenderer(this, 0, 0); - Can1Side4.addBox(0F, 0F, 0F, 1, 2, 2); - Can1Side4.setRotationPoint(2F, 11F, 3F); - Can1Side4.setTextureSize(128, 64); - Can1Side4.mirror = true; - setRotation(Can1Side4, 0F, 0F, 0F); - Can2Side4 = new ModelRenderer(this, 0, 0); - Can2Side4.addBox(0F, 0F, 0F, 1, 2, 2); - Can2Side4.setRotationPoint(-6F, 11F, 3F); - Can2Side4.setTextureSize(128, 64); - Can2Side4.mirror = true; - setRotation(Can2Side4, 0F, 0F, 0F); - Can3Side3 = new ModelRenderer(this, 0, 0); - Can3Side3.addBox(0F, 0F, 0F, 1, 2, 2); - Can3Side3.setRotationPoint(5F, 11F, -5F); - Can3Side3.setTextureSize(128, 64); - Can3Side3.mirror = true; - setRotation(Can3Side3, 0F, 0F, 0F); - Can2Side2 = new ModelRenderer(this, 0, 0); - Can2Side2.addBox(0F, 0F, 0F, 4, 2, 1); - Can2Side2.setRotationPoint(-6F, 11F, 2F); - Can2Side2.setTextureSize(128, 64); - Can2Side2.mirror = true; - setRotation(Can2Side2, 0F, 0F, 0F); - Can2Side3 = new ModelRenderer(this, 0, 0); - Can2Side3.addBox(0F, 0F, 0F, 1, 2, 2); - Can2Side3.setRotationPoint(-3F, 11F, 3F); - Can2Side3.setTextureSize(128, 64); - Can2Side3.mirror = true; - setRotation(Can2Side3, 0F, 0F, 0F); - Can2Side1 = new ModelRenderer(this, 0, 0); - Can2Side1.addBox(0F, 0F, 0F, 4, 2, 1); - Can2Side1.setRotationPoint(-6F, 11F, 5F); - Can2Side1.setTextureSize(128, 64); - Can2Side1.mirror = true; - setRotation(Can2Side1, 0F, 0F, 0F); - Can4Side3 = new ModelRenderer(this, 0, 0); - Can4Side3.addBox(0F, 0F, 0F, 1, 2, 2); - Can4Side3.setRotationPoint(-3F, 11F, -5F); - Can4Side3.setTextureSize(128, 64); - Can4Side3.mirror = true; - setRotation(Can4Side3, 0F, 0F, 0F); - Can4Side1 = new ModelRenderer(this, 0, 0); - Can4Side1.addBox(0F, 0F, 0F, 4, 2, 1); - Can4Side1.setRotationPoint(-6F, 11F, -3F); - Can4Side1.setTextureSize(128, 64); - Can4Side1.mirror = true; - setRotation(Can4Side1, 0F, 0F, 0F); - Can4Sjde4 = new ModelRenderer(this, 0, 0); - Can4Sjde4.addBox(0F, 0F, 0F, 1, 2, 2); - Can4Sjde4.setRotationPoint(-6F, 11F, -5F); - Can4Sjde4.setTextureSize(128, 64); - Can4Sjde4.mirror = true; - setRotation(Can4Sjde4, 0F, 0F, 0F); - Can4Side2 = new ModelRenderer(this, 0, 0); - Can4Side2.addBox(0F, 0F, 0F, 4, 2, 1); - Can4Side2.setRotationPoint(-6F, 11F, -6F); - Can4Side2.setTextureSize(128, 64); - Can4Side2.mirror = true; - setRotation(Can4Side2, 0F, 0F, 0F); - Can3Side4 = new ModelRenderer(this, 0, 0); - Can3Side4.addBox(0F, 0F, 0F, 1, 2, 2); - Can3Side4.setRotationPoint(2F, 11F, -5F); - Can3Side4.setTextureSize(128, 64); - Can3Side4.mirror = true; - setRotation(Can3Side4, 0F, 0F, 0F); - Can4B = new ModelRenderer(this, 0, 0); - Can4B.addBox(0F, 0F, 0F, 4, 1, 4); - Can4B.setRotationPoint(-6F, 13F, -6F); - Can4B.setTextureSize(128, 64); - Can4B.mirror = true; - setRotation(Can4B, 0F, 0F, 0F); - Can3Side2 = new ModelRenderer(this, 0, 0); - Can3Side2.addBox(0F, 0F, 0F, 4, 2, 1); - Can3Side2.setRotationPoint(2F, 11F, -6F); - Can3Side2.setTextureSize(128, 64); - Can3Side2.mirror = true; - setRotation(Can3Side2, 0F, 0F, 0F); - Can3Side1 = new ModelRenderer(this, 0, 0); - Can3Side1.addBox(0F, 0F, 0F, 4, 2, 1); - Can3Side1.setRotationPoint(2F, 11F, -3F); - Can3Side1.setTextureSize(128, 64); - Can3Side1.mirror = true; - setRotation(Can3Side1, 0F, 0F, 0F); - Can2B = new ModelRenderer(this, 0, 0); - Can2B.addBox(0F, 0F, 0F, 4, 1, 4); - Can2B.setRotationPoint(-6F, 13F, 2F); - Can2B.setTextureSize(128, 64); - Can2B.mirror = true; - setRotation(Can2B, 0F, 0F, 0F); - Can4T = new ModelRenderer(this, 0, 0); - Can4T.addBox(0F, 0F, 0F, 4, 1, 4); - Can4T.setRotationPoint(-6F, 10F, -6F); - Can4T.setTextureSize(128, 64); - Can4T.mirror = true; - setRotation(Can4T, 0F, 0F, 0F); - Can2T = new ModelRenderer(this, 0, 0); - Can2T.addBox(0F, 0F, 0F, 4, 1, 4); - Can2T.setRotationPoint(-6F, 10F, 2F); - Can2T.setTextureSize(128, 64); - Can2T.mirror = true; - setRotation(Can2T, 0F, 0F, 0F); - Can3T = new ModelRenderer(this, 0, 0); - Can3T.addBox(0F, 0F, 0F, 4, 1, 4); - Can3T.setRotationPoint(2F, 10F, -6F); - Can3T.setTextureSize(128, 64); - Can3T.mirror = true; - setRotation(Can3T, 0F, 0F, 0F); - Can3B = new ModelRenderer(this, 0, 0); - Can3B.addBox(0F, 0F, 0F, 4, 1, 4); - Can3B.setRotationPoint(2F, 13F, -6F); - Can3B.setTextureSize(128, 64); - Can3B.mirror = true; - setRotation(Can3B, 0F, 0F, 0F); - Spire = new ModelRenderer(this, 0, 6); - Spire.addBox(0F, 0F, 0F, 2, 8, 2); - Spire.setRotationPoint(-1F, 15F, -1F); - Spire.setTextureSize(128, 64); - Spire.mirror = true; - setRotation(Spire, 0F, 0F, 0F); - Spin = new ModelRenderer(this, 28, 24); - Spin.addBox(-4F, 0F, -4F, 8, 1, 8); - Spin.setRotationPoint(0F, 16F, 0F); - Spin.setTextureSize(128, 64); - Spin.mirror = true; - setRotation(Spin, 0F, 0F, 0F); - Vial1 = new ModelRenderer(this, 8, 6); - Vial1.addBox(-3F, 0.5F, 3F, 2, 3, 2); - Vial1.setRotationPoint(0F, 16F, 0F); - Vial1.setTextureSize(128, 64); - Vial1.mirror = true; - setRotation(Vial1, 0F, 0F, 0F); - Vial2 = new ModelRenderer(this, 8, 6); - Vial2.addBox(1F, 0.5F, 3F, 2, 3, 2); - Vial2.setRotationPoint(0F, 16F, 0F); - Vial2.setTextureSize(128, 64); - Vial2.mirror = true; - setRotation(Vial2, 0F, 0F, 0F); - Vial3 = new ModelRenderer(this, 8, 6); - Vial3.addBox(-3F, 0.5F, -5F, 2, 3, 2); - Vial3.setRotationPoint(0F, 16F, 0F); - Vial3.setTextureSize(128, 64); - Vial3.mirror = true; - setRotation(Vial3, 0F, 0F, 0F); - Vial4 = new ModelRenderer(this, 8, 6); - Vial4.addBox(1F, 0.5F, -5F, 2, 3, 2); - Vial4.setRotationPoint(0F, 16F, 0F); - Vial4.setTextureSize(128, 64); - Vial4.mirror = true; - setRotation(Vial4, 0F, 0F, 0F); + tray = new ModelRenderer(this, 48, 0); + tray.addBox(0F, 0F, 0F, 10, 1, 10); + tray.setRotationPoint(-5F, 18.5F, -5F); + tray.setTextureSize(128, 64); + tray.mirror = true; + setRotation(tray, 0F, 0F, 0F); + support4 = new ModelRenderer(this, 0, 0); + support4.addBox(0F, 0F, 0F, 1, 5, 1); + support4.setRotationPoint(6.5F, 13F, 6.5F); + support4.setTextureSize(128, 64); + support4.mirror = true; + setRotation(support4, 0F, 0F, 0F); + rimBack = new ModelRenderer(this, 0, 46); + rimBack.addBox(0F, 0F, 0F, 16, 2, 2); + rimBack.setRotationPoint(-8F, 17F, 6F); + rimBack.setTextureSize(128, 64); + rimBack.mirror = true; + setRotation(rimBack, 0F, 0F, 0F); + portRight = new ModelRenderer(this, 36, 42); + portRight.mirror = true; + portRight.addBox(0F, 0F, 0F, 1, 8, 8); + portRight.setRotationPoint(7.01F, 12F, -4F); + portRight.setTextureSize(128, 64); + setRotation(portRight, 0F, 0F, 0F); + rimRight = new ModelRenderer(this, 0, 50); + rimRight.mirror = true; + rimRight.addBox(0F, 0F, 0F, 2, 2, 12); + rimRight.setRotationPoint(6F, 17F, -6F); + rimRight.setTextureSize(128, 64); + setRotation(rimRight, 0F, 0F, 0F); + rimLeft = new ModelRenderer(this, 0, 50); + rimLeft.addBox(0F, 0F, 0F, 2, 2, 12); + rimLeft.setRotationPoint(-8F, 17F, -6F); + rimLeft.setTextureSize(128, 64); + rimLeft.mirror = true; + setRotation(rimLeft, 0F, 0F, 0F); + rimFront = new ModelRenderer(this, 0, 42); + rimFront.addBox(0F, 0F, 0F, 16, 2, 2); + rimFront.setRotationPoint(-8F, 17F, -8F); + rimFront.setTextureSize(128, 64); + rimFront.mirror = true; + setRotation(rimFront, 0F, 0F, 0F); + portLeft = new ModelRenderer(this, 36, 42); + portLeft.addBox(0F, 0F, 0F, 1, 8, 8); + portLeft.setRotationPoint(-8.01F, 12F, -4F); + portLeft.setTextureSize(128, 64); + portLeft.mirror = true; + setRotation(portLeft, 0F, 0F, 0F); + support3 = new ModelRenderer(this, 0, 0); + support3.addBox(0F, 0F, 0F, 1, 5, 1); + support3.setRotationPoint(-7.5F, 13F, 6.5F); + support3.setTextureSize(128, 64); + support3.mirror = true; + setRotation(support3, 0F, 0F, 0F); + support2 = new ModelRenderer(this, 0, 0); + support2.addBox(0F, 0F, 0F, 1, 5, 1); + support2.setRotationPoint(6.5F, 13F, -7.5F); + support2.setTextureSize(128, 64); + support2.mirror = true; + setRotation(support2, 0F, 0F, 0F); + support1 = new ModelRenderer(this, 0, 0); + support1.addBox(0F, 0F, 0F, 1, 5, 1); + support1.setRotationPoint(-7.5F, 13F, -7.5F); + support1.setTextureSize(128, 64); + support1.mirror = true; + setRotation(support1, 0F, 0F, 0F); + tank = new ModelRenderer(this, 0, 0); + tank.addBox(0F, 0F, 0F, 16, 5, 16); + tank.setRotationPoint(-8F, 8F, -8F); + tank.setTextureSize(128, 64); + tank.mirror = true; + setRotation(tank, 0F, 0F, 0F); + rod1 = new ModelRenderer(this, 8, 0); + rod1.addBox(0F, 0F, 0F, 1, 2, 1); + rod1.setRotationPoint(-2F, 13F, 0F); + rod1.setTextureSize(128, 64); + rod1.mirror = true; + setRotation(rod1, 0F, 0F, 0F); + rod2 = new ModelRenderer(this, 8, 3); + rod2.addBox(0F, 0F, 0F, 1, 3, 1); + rod2.setRotationPoint(1F, 13F, 1F); + rod2.setTextureSize(128, 64); + rod2.mirror = true; + setRotation(rod2, 0F, 0F, 0F); + rod3 = new ModelRenderer(this, 4, 0); + rod3.addBox(0F, 0F, 0F, 1, 4, 1); + rod3.setRotationPoint(-0.5F, 13F, -2F); + rod3.setTextureSize(128, 64); + rod3.mirror = true; + setRotation(rod3, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 21); + base.addBox(0F, 0F, 0F, 16, 5, 16); + base.setRotationPoint(-8F, 19F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + Shape1 = new ModelRenderer(this, 64, 11); + Shape1.addBox(0F, 0F, 0F, 14, 4, 14); + Shape1.setRotationPoint(-7F, 13F, -7F); + Shape1.setTextureSize(128, 64); + Shape1.mirror = true; + setRotation(Shape1, 0F, 0F, 0F); } public void render(float size) { MekanismRenderer.blendOn(); - - Base.render(size); - IO1.render(size); - IO2.render(size); - Base3.render(size); - Base2.render(size); - Can1B.render(size); - Can1T.render(size); - Can1Side3.render(size); - Can1Side1.render(size); - Can1Side2.render(size); - Can1Side4.render(size); - Can2Side4.render(size); - Can3Side3.render(size); - Can2Side2.render(size); - Can2Side3.render(size); - Can2Side1.render(size); - Can4Side3.render(size); - Can4Side1.render(size); - Can4Sjde4.render(size); - Can4Side2.render(size); - Can3Side4.render(size); - Can4B.render(size); - Can3Side2.render(size); - Can3Side1.render(size); - Can2B.render(size); - Can4T.render(size); - Can2T.render(size); - Can3T.render(size); - Can3B.render(size); - Spire.render(size); - Spin.render(size); - Vial1.render(size); - Vial2.render(size); - Vial3.render(size); - Vial4.render(size); - + + tray.render(size); + support4.render(size); + rimBack.render(size); + portRight.render(size); + rimRight.render(size); + rimLeft.render(size); + rimFront.render(size); + portLeft.render(size); + support3.render(size); + support2.render(size); + support1.render(size); + tank.render(size); + rod1.render(size); + rod2.render(size); + rod3.render(size); + base.render(size); + Shape1.render(size); + MekanismRenderer.blendOff(); } - public void renderWithRotation(float size, float rotate) - { - rotate *= Math.PI; - - Spin.rotateAngleY = rotate; - Vial1.rotateAngleY = rotate; - Vial2.rotateAngleY = rotate; - Vial3.rotateAngleY = rotate; - Vial4.rotateAngleY = rotate; - - render(size); - } - private void setRotation(ModelRenderer model, float x, float y, float z) { model.rotateAngleX = x; diff --git a/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java b/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java index 470ae4726..c69554a8f 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java @@ -9,299 +9,259 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelChemicalDissolutionChamber extends ModelBase { - ModelRenderer Centre; - ModelRenderer Base; - ModelRenderer Base2; - ModelRenderer Can1B; - ModelRenderer Can1T; - ModelRenderer Can1Side3; - ModelRenderer Can1Side1; - ModelRenderer Can1Side2; - ModelRenderer Can1Side4; - ModelRenderer Can2Side4; - ModelRenderer Can3Side3; - ModelRenderer Can2Side2; - ModelRenderer Can2Side3; - ModelRenderer Can2Side1; - ModelRenderer Can4Side3; - ModelRenderer Can4Side1; - ModelRenderer Can4Sjde4; - ModelRenderer Can4Side2; - ModelRenderer Can3Side4; - ModelRenderer Can4B; - ModelRenderer Can3Side2; - ModelRenderer Can3Side1; - ModelRenderer Can2B; - ModelRenderer Can4T; - ModelRenderer Can2T; - ModelRenderer Can3T; - ModelRenderer Can3B; - ModelRenderer IO1; - ModelRenderer IO2Port; - ModelRenderer IO2; - ModelRenderer IO2Port2; - ModelRenderer Coil1; - ModelRenderer Coil2; - ModelRenderer Coil3; - ModelRenderer Coil4; + ModelRenderer support2; + ModelRenderer vat5; + ModelRenderer top2; + ModelRenderer top; + ModelRenderer base; + ModelRenderer vat2; + ModelRenderer vat3; + ModelRenderer vat6; + ModelRenderer vat9; + ModelRenderer vat8; + ModelRenderer vat7; + ModelRenderer vat4; + ModelRenderer backEdge2; + ModelRenderer back; + ModelRenderer backEdge1; + ModelRenderer vents; + ModelRenderer support1; + ModelRenderer vat1; + ModelRenderer nozzle8; + ModelRenderer nozzle5; + ModelRenderer nozzle7; + ModelRenderer nozzle4; + ModelRenderer nozzle9; + ModelRenderer nozzle6; + ModelRenderer nozzle3; + ModelRenderer nozzle2; + ModelRenderer nozzle1; + ModelRenderer glass; + ModelRenderer portToggle1; + ModelRenderer portToggle2; - public ModelChemicalDissolutionChamber() + public ModelChemicalDissolutionChamber() { textureWidth = 128; textureHeight = 64; - Centre = new ModelRenderer(this, 0, 17); - Centre.addBox(0F, 0F, 0F, 2, 13, 2); - Centre.setRotationPoint(-1F, 9F, -1F); - Centre.setTextureSize(128, 64); - Centre.mirror = true; - setRotation(Centre, 0F, 0F, 0F); - Base = new ModelRenderer(this, 16, 0); - Base.addBox(0F, 0F, 0F, 14, 2, 14); - Base.setRotationPoint(-7F, 22F, -7F); - Base.setTextureSize(128, 64); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - Base2 = new ModelRenderer(this, 16, 0); - Base2.addBox(0F, 0F, 0F, 14, 1, 14); - Base2.setRotationPoint(-7F, 16F, -7F); - Base2.setTextureSize(128, 64); - Base2.mirror = true; - setRotation(Base2, 0F, 0F, 0F); - Can1B = new ModelRenderer(this, 0, 0); - Can1B.addBox(0F, 0F, 0F, 4, 1, 4); - Can1B.setRotationPoint(2F, 21F, 2F); - Can1B.setTextureSize(128, 64); - Can1B.mirror = true; - setRotation(Can1B, 0F, 0F, 0F); - Can1T = new ModelRenderer(this, 0, 0); - Can1T.addBox(0F, 0F, 0F, 4, 1, 4); - Can1T.setRotationPoint(2F, 17F, 2F); - Can1T.setTextureSize(128, 64); - Can1T.mirror = true; - setRotation(Can1T, 0F, 0F, 0F); - Can1Side3 = new ModelRenderer(this, 0, 0); - Can1Side3.addBox(0F, 0F, 0F, 1, 3, 2); - Can1Side3.setRotationPoint(5F, 18F, 3F); - Can1Side3.setTextureSize(128, 64); - Can1Side3.mirror = true; - setRotation(Can1Side3, 0F, 0F, 0F); - Can1Side1 = new ModelRenderer(this, 0, 0); - Can1Side1.addBox(0F, 0F, 0F, 4, 3, 1); - Can1Side1.setRotationPoint(2F, 18F, 5F); - Can1Side1.setTextureSize(128, 64); - Can1Side1.mirror = true; - setRotation(Can1Side1, 0F, 0F, 0F); - Can1Side2 = new ModelRenderer(this, 0, 0); - Can1Side2.addBox(0F, 0F, 0F, 4, 3, 1); - Can1Side2.setRotationPoint(2F, 18F, 2F); - Can1Side2.setTextureSize(128, 64); - Can1Side2.mirror = true; - setRotation(Can1Side2, 0F, 0F, 0F); - Can1Side4 = new ModelRenderer(this, 0, 0); - Can1Side4.addBox(0F, 0F, 0F, 1, 3, 2); - Can1Side4.setRotationPoint(2F, 18F, 3F); - Can1Side4.setTextureSize(128, 64); - Can1Side4.mirror = true; - setRotation(Can1Side4, 0F, 0F, 0F); - Can2Side4 = new ModelRenderer(this, 0, 0); - Can2Side4.addBox(0F, 0F, 0F, 1, 3, 2); - Can2Side4.setRotationPoint(-6F, 18F, 3F); - Can2Side4.setTextureSize(128, 64); - Can2Side4.mirror = true; - setRotation(Can2Side4, 0F, 0F, 0F); - Can3Side3 = new ModelRenderer(this, 0, 0); - Can3Side3.addBox(0F, 0F, 0F, 1, 3, 2); - Can3Side3.setRotationPoint(5F, 18F, -5F); - Can3Side3.setTextureSize(128, 64); - Can3Side3.mirror = true; - setRotation(Can3Side3, 0F, 0F, 0F); - Can2Side2 = new ModelRenderer(this, 0, 0); - Can2Side2.addBox(0F, 0F, 0F, 4, 3, 1); - Can2Side2.setRotationPoint(-6F, 18F, 2F); - Can2Side2.setTextureSize(128, 64); - Can2Side2.mirror = true; - setRotation(Can2Side2, 0F, 0F, 0F); - Can2Side3 = new ModelRenderer(this, 0, 0); - Can2Side3.addBox(0F, 0F, 0F, 1, 3, 2); - Can2Side3.setRotationPoint(-3F, 18F, 3F); - Can2Side3.setTextureSize(128, 64); - Can2Side3.mirror = true; - setRotation(Can2Side3, 0F, 0F, 0F); - Can2Side1 = new ModelRenderer(this, 0, 0); - Can2Side1.addBox(0F, 0F, 0F, 4, 3, 1); - Can2Side1.setRotationPoint(-6F, 18F, 5F); - Can2Side1.setTextureSize(128, 64); - Can2Side1.mirror = true; - setRotation(Can2Side1, 0F, 0F, 0F); - Can4Side3 = new ModelRenderer(this, 0, 0); - Can4Side3.addBox(0F, 0F, 0F, 1, 3, 2); - Can4Side3.setRotationPoint(-3F, 18F, -5F); - Can4Side3.setTextureSize(128, 64); - Can4Side3.mirror = true; - setRotation(Can4Side3, 0F, 0F, 0F); - Can4Side1 = new ModelRenderer(this, 0, 0); - Can4Side1.addBox(0F, 0F, 0F, 4, 3, 1); - Can4Side1.setRotationPoint(-6F, 18F, -3F); - Can4Side1.setTextureSize(128, 64); - Can4Side1.mirror = true; - setRotation(Can4Side1, 0F, 0F, 0F); - Can4Sjde4 = new ModelRenderer(this, 0, 0); - Can4Sjde4.addBox(0F, 0F, 0F, 1, 3, 2); - Can4Sjde4.setRotationPoint(-6F, 18F, -5F); - Can4Sjde4.setTextureSize(128, 64); - Can4Sjde4.mirror = true; - setRotation(Can4Sjde4, 0F, 0F, 0F); - Can4Side2 = new ModelRenderer(this, 0, 0); - Can4Side2.addBox(0F, 0F, 0F, 4, 3, 1); - Can4Side2.setRotationPoint(-6F, 18F, -6F); - Can4Side2.setTextureSize(128, 64); - Can4Side2.mirror = true; - setRotation(Can4Side2, 0F, 0F, 0F); - Can3Side4 = new ModelRenderer(this, 0, 0); - Can3Side4.addBox(0F, 0F, 0F, 1, 3, 2); - Can3Side4.setRotationPoint(2F, 18F, -5F); - Can3Side4.setTextureSize(128, 64); - Can3Side4.mirror = true; - setRotation(Can3Side4, 0F, 0F, 0F); - Can4B = new ModelRenderer(this, 0, 0); - Can4B.addBox(0F, 0F, 0F, 4, 1, 4); - Can4B.setRotationPoint(-6F, 21F, -6F); - Can4B.setTextureSize(128, 64); - Can4B.mirror = true; - setRotation(Can4B, 0F, 0F, 0F); - Can3Side2 = new ModelRenderer(this, 0, 0); - Can3Side2.addBox(0F, 0F, 0F, 4, 3, 1); - Can3Side2.setRotationPoint(2F, 18F, -6F); - Can3Side2.setTextureSize(128, 64); - Can3Side2.mirror = true; - setRotation(Can3Side2, 0F, 0F, 0F); - Can3Side1 = new ModelRenderer(this, 0, 0); - Can3Side1.addBox(0F, 0F, 0F, 4, 3, 1); - Can3Side1.setRotationPoint(2F, 18F, -3F); - Can3Side1.setTextureSize(128, 64); - Can3Side1.mirror = true; - setRotation(Can3Side1, 0F, 0F, 0F); - Can2B = new ModelRenderer(this, 0, 0); - Can2B.addBox(0F, 0F, 0F, 4, 1, 4); - Can2B.setRotationPoint(-6F, 21F, 2F); - Can2B.setTextureSize(128, 64); - Can2B.mirror = true; - setRotation(Can2B, 0F, 0F, 0F); - Can4T = new ModelRenderer(this, 0, 0); - Can4T.addBox(0F, 0F, 0F, 4, 1, 4); - Can4T.setRotationPoint(-6F, 17F, -6F); - Can4T.setTextureSize(128, 64); - Can4T.mirror = true; - setRotation(Can4T, 0F, 0F, 0F); - Can2T = new ModelRenderer(this, 0, 0); - Can2T.addBox(0F, 0F, 0F, 4, 1, 4); - Can2T.setRotationPoint(-6F, 17F, 2F); - Can2T.setTextureSize(128, 64); - Can2T.mirror = true; - setRotation(Can2T, 0F, 0F, 0F); - Can3T = new ModelRenderer(this, 0, 0); - Can3T.addBox(0F, 0F, 0F, 4, 1, 4); - Can3T.setRotationPoint(2F, 17F, -6F); - Can3T.setTextureSize(128, 64); - Can3T.mirror = true; - setRotation(Can3T, 0F, 0F, 0F); - Can3B = new ModelRenderer(this, 0, 0); - Can3B.addBox(0F, 0F, 0F, 4, 1, 4); - Can3B.setRotationPoint(2F, 21F, -6F); - Can3B.setTextureSize(128, 64); - Can3B.mirror = true; - setRotation(Can3B, 0F, 0F, 0F); - IO1 = new ModelRenderer(this, 9, 17); - IO1.addBox(0F, 0F, 0F, 1, 8, 8); - IO1.setRotationPoint(-8F, 12F, -4F); - IO1.setTextureSize(128, 64); - IO1.mirror = true; - setRotation(IO1, 0F, 0F, 0F); - IO2Port = new ModelRenderer(this, 28, 17); - IO2Port.addBox(0F, 0F, 0F, 2, 2, 4); - IO2Port.setRotationPoint(-7F, 14F, -2F); - IO2Port.setTextureSize(128, 64); - IO2Port.mirror = true; - setRotation(IO2Port, 0F, 0F, 0F); - IO2 = new ModelRenderer(this, 9, 17); - IO2.addBox(0F, 0F, 0F, 1, 8, 8); - IO2.setRotationPoint(7F, 12F, -4F); - IO2.setTextureSize(128, 64); - IO2.mirror = true; - setRotation(IO2, 0F, 0F, 0F); - IO2Port2 = new ModelRenderer(this, 28, 17); - IO2Port2.addBox(0F, 0F, 0F, 2, 2, 4); - IO2Port2.setRotationPoint(5F, 14F, -2F); - IO2Port2.setTextureSize(128, 64); - IO2Port2.mirror = true; - setRotation(IO2Port2, 0F, 0F, 0F); - Coil1 = new ModelRenderer(this, 0, 34); - Coil1.addBox(0F, 0F, 0F, 8, 1, 8); - Coil1.setRotationPoint(-4F, 14F, -4F); - Coil1.setTextureSize(128, 64); - Coil1.mirror = true; - setRotation(Coil1, 0F, 0F, 0F); - Coil2 = new ModelRenderer(this, 0, 34); - Coil2.addBox(0F, 0F, 0F, 8, 1, 8); - Coil2.setRotationPoint(-4F, 12F, -4F); - Coil2.setTextureSize(128, 64); - Coil2.mirror = true; - setRotation(Coil2, 0F, 0F, 0F); - Coil3 = new ModelRenderer(this, 0, 34); - Coil3.addBox(0F, 0F, 0F, 8, 1, 8); - Coil3.setRotationPoint(-4F, 10F, -4F); - Coil3.setTextureSize(128, 64); - Coil3.mirror = true; - setRotation(Coil3, 0F, 0F, 0F); - Coil4 = new ModelRenderer(this, 0, 34); - Coil4.addBox(0F, 0F, 0F, 8, 1, 8); - Coil4.setRotationPoint(-4F, 8F, -4F); - Coil4.setTextureSize(128, 64); - Coil4.mirror = true; - setRotation(Coil4, 0F, 0F, 0F); + support2 = new ModelRenderer(this, 4, 0); + support2.addBox(0F, 0F, 0F, 1, 2, 1); + support2.setRotationPoint(6F, 9F, -7F); + support2.setTextureSize(128, 64); + support2.mirror = true; + setRotation(support2, 0F, 0F, 0F); + vat5 = new ModelRenderer(this, 0, 23); + vat5.addBox(0F, 0F, 0F, 3, 4, 3); + vat5.setRotationPoint(-1.5F, 13F, -1.5F); + vat5.setTextureSize(128, 64); + vat5.mirror = true; + setRotation(vat5, 0F, 0F, 0F); + top2 = new ModelRenderer(this, 0, 40); + top2.addBox(0F, 0F, 0F, 16, 1, 15); + top2.setRotationPoint(-8F, 11F, -8F); + top2.setTextureSize(128, 64); + top2.mirror = true; + setRotation(top2, 0F, 0F, 0F); + top = new ModelRenderer(this, 0, 23); + top.addBox(0F, 0F, 0F, 16, 1, 16); + top.setRotationPoint(-8F, 8F, -8F); + top.setTextureSize(128, 64); + top.mirror = true; + setRotation(top, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 7, 16); + base.setRotationPoint(-8F, 17F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + vat2 = new ModelRenderer(this, 0, 23); + vat2.addBox(0F, 0F, 0F, 3, 4, 3); + vat2.setRotationPoint(-5F, 13F, -1.5F); + vat2.setTextureSize(128, 64); + vat2.mirror = true; + setRotation(vat2, 0F, 0F, 0F); + vat3 = new ModelRenderer(this, 0, 23); + vat3.addBox(0F, 0F, 0F, 3, 4, 3); + vat3.setRotationPoint(-5F, 13F, 2F); + vat3.setTextureSize(128, 64); + vat3.mirror = true; + setRotation(vat3, 0F, 0F, 0F); + vat6 = new ModelRenderer(this, 0, 23); + vat6.addBox(0F, 0F, 0F, 3, 4, 3); + vat6.setRotationPoint(-1.5F, 13F, 2F); + vat6.setTextureSize(128, 64); + vat6.mirror = true; + setRotation(vat6, 0F, 0F, 0F); + vat9 = new ModelRenderer(this, 0, 23); + vat9.addBox(0F, 0F, 0F, 3, 4, 3); + vat9.setRotationPoint(2F, 13F, 2F); + vat9.setTextureSize(128, 64); + vat9.mirror = true; + setRotation(vat9, 0F, 0F, 0F); + vat8 = new ModelRenderer(this, 0, 23); + vat8.addBox(0F, 0F, 0F, 3, 4, 3); + vat8.setRotationPoint(2F, 13F, -1.5F); + vat8.setTextureSize(128, 64); + vat8.mirror = true; + setRotation(vat8, 0F, 0F, 0F); + vat7 = new ModelRenderer(this, 0, 23); + vat7.addBox(0F, 0F, 0F, 3, 4, 3); + vat7.setRotationPoint(2F, 13F, -5F); + vat7.setTextureSize(128, 64); + vat7.mirror = true; + setRotation(vat7, 0F, 0F, 0F); + vat4 = new ModelRenderer(this, 0, 23); + vat4.addBox(0F, 0F, 0F, 3, 4, 3); + vat4.setRotationPoint(-1.5F, 13F, -5F); + vat4.setTextureSize(128, 64); + vat4.mirror = true; + setRotation(vat4, 0F, 0F, 0F); + backEdge2 = new ModelRenderer(this, 8, 0); + backEdge2.addBox(0F, 0F, 0F, 1, 8, 1); + backEdge2.setRotationPoint(7F, 9F, 7F); + backEdge2.setTextureSize(128, 64); + backEdge2.mirror = true; + setRotation(backEdge2, 0F, 0F, 0F); + back = new ModelRenderer(this, 48, 0); + back.addBox(0F, 0F, 0F, 14, 8, 2); + back.setRotationPoint(-7F, 9F, 6F); + back.setTextureSize(128, 64); + back.mirror = true; + setRotation(back, 0F, 0F, 0F); + backEdge1 = new ModelRenderer(this, 8, 0); + backEdge1.addBox(0F, 0F, 0F, 1, 8, 1); + backEdge1.setRotationPoint(-8F, 9F, 7F); + backEdge1.setTextureSize(128, 64); + backEdge1.mirror = true; + setRotation(backEdge1, 0F, 0F, 0F); + vents = new ModelRenderer(this, 70, 0); + vents.addBox(0F, 0F, 0F, 8, 2, 10); + vents.setRotationPoint(-4F, 9F, -4F); + vents.setTextureSize(128, 64); + vents.mirror = true; + setRotation(vents, 0F, 0F, 0F); + support1 = new ModelRenderer(this, 4, 0); + support1.addBox(0F, 0F, 0F, 1, 2, 1); + support1.setRotationPoint(-7F, 9F, -7F); + support1.setTextureSize(128, 64); + support1.mirror = true; + setRotation(support1, 0F, 0F, 0F); + vat1 = new ModelRenderer(this, 0, 23); + vat1.addBox(0F, 0F, 0F, 3, 4, 3); + vat1.setRotationPoint(-5F, 13F, -5F); + vat1.setTextureSize(128, 64); + vat1.mirror = true; + setRotation(vat1, 0F, 0F, 0F); + nozzle8 = new ModelRenderer(this, 0, 0); + nozzle8.addBox(0F, 0F, 0F, 1, 1, 1); + nozzle8.setRotationPoint(3F, 11.5F, -0.5F); + nozzle8.setTextureSize(128, 64); + nozzle8.mirror = true; + setRotation(nozzle8, 0F, 0F, 0F); + nozzle5 = new ModelRenderer(this, 0, 0); + nozzle5.addBox(0F, 0F, 0F, 1, 1, 1); + nozzle5.setRotationPoint(-0.5F, 11.5F, -0.5F); + nozzle5.setTextureSize(128, 64); + nozzle5.mirror = true; + setRotation(nozzle5, 0F, 0F, 0F); + nozzle7 = new ModelRenderer(this, 0, 0); + nozzle7.addBox(0F, 0F, 0F, 1, 1, 1); + nozzle7.setRotationPoint(3F, 11.5F, -4F); + nozzle7.setTextureSize(128, 64); + nozzle7.mirror = true; + setRotation(nozzle7, 0F, 0F, 0F); + nozzle4 = new ModelRenderer(this, 0, 0); + nozzle4.addBox(0F, 0F, 0F, 1, 1, 1); + nozzle4.setRotationPoint(-0.5F, 11.5F, -4F); + nozzle4.setTextureSize(128, 64); + nozzle4.mirror = true; + setRotation(nozzle4, 0F, 0F, 0F); + nozzle9 = new ModelRenderer(this, 0, 0); + nozzle9.addBox(0F, 0F, 0F, 1, 1, 1); + nozzle9.setRotationPoint(3F, 11.5F, 3F); + nozzle9.setTextureSize(128, 64); + nozzle9.mirror = true; + setRotation(nozzle9, 0F, 0F, 0F); + nozzle6 = new ModelRenderer(this, 0, 0); + nozzle6.addBox(0F, 0F, 0F, 1, 1, 1); + nozzle6.setRotationPoint(-0.5F, 11.5F, 3F); + nozzle6.setTextureSize(128, 64); + nozzle6.mirror = true; + setRotation(nozzle6, 0F, 0F, 0F); + nozzle3 = new ModelRenderer(this, 0, 0); + nozzle3.addBox(0F, 0F, 0F, 1, 1, 1); + nozzle3.setRotationPoint(-4F, 11.5F, 3F); + nozzle3.setTextureSize(128, 64); + nozzle3.mirror = true; + setRotation(nozzle3, 0F, 0F, 0F); + nozzle2 = new ModelRenderer(this, 0, 0); + nozzle2.addBox(0F, 0F, 0F, 1, 1, 1); + nozzle2.setRotationPoint(-4F, 11.5F, -0.5F); + nozzle2.setTextureSize(128, 64); + nozzle2.mirror = true; + setRotation(nozzle2, 0F, 0F, 0F); + nozzle1 = new ModelRenderer(this, 0, 0); + nozzle1.addBox(0F, 0F, 0F, 1, 1, 1); + nozzle1.setRotationPoint(-4F, 11.5F, -4F); + nozzle1.setTextureSize(128, 64); + nozzle1.mirror = true; + setRotation(nozzle1, 0F, 0F, 0F); + glass = new ModelRenderer(this, 64, 14); + glass.addBox(0F, 0F, 0F, 14, 5, 13); + glass.setRotationPoint(-7F, 12F, -7F); + glass.setTextureSize(128, 64); + glass.mirror = true; + setRotation(glass, 0F, 0F, 0F); + portToggle1 = new ModelRenderer(this, 64, 32); + portToggle1.addBox(0F, 0F, 0F, 1, 8, 8); + portToggle1.setRotationPoint(-8.01F, 12F, -4F); + portToggle1.setTextureSize(128, 64); + portToggle1.mirror = true; + setRotation(portToggle1, 0F, 0F, 0F); + portToggle2 = new ModelRenderer(this, 64, 32); + portToggle2.addBox(0F, 0F, 0F, 1, 8, 8); + portToggle2.setRotationPoint(7.01F, 12F, -4F); + portToggle2.setTextureSize(128, 64); + portToggle2.mirror = true; + setRotation(portToggle2, 0F, 0F, 0F); } public void render(float size) { MekanismRenderer.blendOn(); - - Centre.render(size); - Base.render(size); - Base2.render(size); - Can1B.render(size); - Can1T.render(size); - Can1Side3.render(size); - Can1Side1.render(size); - Can1Side2.render(size); - Can1Side4.render(size); - Can2Side4.render(size); - Can3Side3.render(size); - Can2Side2.render(size); - Can2Side3.render(size); - Can2Side1.render(size); - Can4Side3.render(size); - Can4Side1.render(size); - Can4Sjde4.render(size); - Can4Side2.render(size); - Can3Side4.render(size); - Can4B.render(size); - Can3Side2.render(size); - Can3Side1.render(size); - Can2B.render(size); - Can4T.render(size); - Can2T.render(size); - Can3T.render(size); - Can3B.render(size); - IO1.render(size); - IO2Port.render(size); - IO2.render(size); - IO2Port2.render(size); - Coil1.render(size); - Coil2.render(size); - Coil3.render(size); - Coil4.render(size); - + + support2.render(size); + vat5.render(size); + top2.render(size); + top.render(size); + base.render(size); + vat2.render(size); + vat3.render(size); + vat6.render(size); + vat9.render(size); + vat8.render(size); + vat7.render(size); + vat4.render(size); + backEdge2.render(size); + back.render(size); + backEdge1.render(size); + vents.render(size); + support1.render(size); + vat1.render(size); + nozzle8.render(size); + nozzle5.render(size); + nozzle7.render(size); + nozzle4.render(size); + nozzle9.render(size); + nozzle6.render(size); + nozzle3.render(size); + nozzle2.render(size); + nozzle1.render(size); + glass.render(size); + portToggle1.render(size); + portToggle2.render(size); + MekanismRenderer.blendOff(); } diff --git a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java b/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java index c3a28875a..da80b3674 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java +++ b/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java @@ -1,11 +1,7 @@ package mekanism.client.model; -import mekanism.client.render.MekanismRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/model/ModelChemicalWasher.java b/src/main/java/mekanism/client/model/ModelChemicalWasher.java index 434e29a32..0eb42e8d6 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalWasher.java +++ b/src/main/java/mekanism/client/model/ModelChemicalWasher.java @@ -1,6 +1,5 @@ package mekanism.client.model; -import mekanism.client.render.MekanismRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import cpw.mods.fml.relauncher.Side; @@ -9,285 +8,200 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelChemicalWasher extends ModelBase { - ModelRenderer Base; - ModelRenderer Base2; - ModelRenderer IO1; - ModelRenderer IO2; - ModelRenderer IO3; - ModelRenderer Base3; - ModelRenderer Base4; - ModelRenderer Base5; - ModelRenderer Base6; - ModelRenderer Can1B; - ModelRenderer Can1T; - ModelRenderer Can1Side3; - ModelRenderer Can1Side1; - ModelRenderer Can1Side2; - ModelRenderer Can1Side4; - ModelRenderer Can2Side4; - ModelRenderer Can3Side3; - ModelRenderer Can2Side2; - ModelRenderer Can2Side3; - ModelRenderer Can2Side1; - ModelRenderer Can4Side3; - ModelRenderer Can4Side1; - ModelRenderer Can4Sjde4; - ModelRenderer Can4Side2; - ModelRenderer Can3Side4; - ModelRenderer Can4B; - ModelRenderer Can3Side2; - ModelRenderer Can3Side1; - ModelRenderer Can2B; - ModelRenderer Can4T; - ModelRenderer Can2T; - ModelRenderer Can3T; - ModelRenderer Can3B; + ModelRenderer tankBack; + ModelRenderer base; + ModelRenderer portTop; + ModelRenderer pipe1; + ModelRenderer pipe2b; + ModelRenderer portRight; + ModelRenderer bridge1; + ModelRenderer bridge2; + ModelRenderer bridge3; + ModelRenderer conduit; + ModelRenderer bridge4; + ModelRenderer pipe2; + ModelRenderer tankLeft; + ModelRenderer connectorRight; + ModelRenderer portLeft; + ModelRenderer connectorLeft; + ModelRenderer tankRight; + ModelRenderer tubeLeft1; + ModelRenderer tubeLeft2; + ModelRenderer tubeRight3; + ModelRenderer tubeRight1; + ModelRenderer tubeRight2; + ModelRenderer tubeLeft3; - public ModelChemicalWasher() + public ModelChemicalWasher() { textureWidth = 128; textureHeight = 64; - Base = new ModelRenderer(this, 16, 0); - Base.addBox(0F, 0F, 0F, 14, 1, 14); - Base.setRotationPoint(-7F, 23F, -7F); - Base.setTextureSize(128, 64); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - Base2 = new ModelRenderer(this, 72, 0); - Base2.addBox(0F, 0F, 0F, 14, 10, 1); - Base2.setRotationPoint(-7F, 8F, 6F); - Base2.setTextureSize(128, 64); - Base2.mirror = true; - setRotation(Base2, 0F, 0F, 0F); - Base2.mirror = false; - IO1 = new ModelRenderer(this, 9, 17); - IO1.addBox(0F, 0F, 0F, 1, 8, 8); - IO1.setRotationPoint(-8F, 12F, -4F); - IO1.setTextureSize(128, 64); - IO1.mirror = true; - setRotation(IO1, 0F, 0F, 0F); - IO2 = new ModelRenderer(this, 9, 17); - IO2.addBox(0F, 0F, 0F, 1, 8, 8); - IO2.setRotationPoint(7F, 12F, -4F); - IO2.setTextureSize(128, 64); - IO2.mirror = true; - setRotation(IO2, 0F, 0F, 0F); - IO3 = new ModelRenderer(this, 0, 42); - IO3.addBox(0F, 0F, 0F, 12, 1, 8); - IO3.setRotationPoint(-6F, 8F, -4F); - IO3.setTextureSize(128, 64); - IO3.mirror = true; - setRotation(IO3, 0F, 0F, 0F); - Base3 = new ModelRenderer(this, 72, 0); - Base3.addBox(0F, 0F, 0F, 14, 10, 1); - Base3.setRotationPoint(-7F, 8F, -7F); - Base3.setTextureSize(128, 64); - Base3.mirror = true; - setRotation(Base3, 0F, 0F, 0F); - Base4 = new ModelRenderer(this, 72, 12); - Base4.addBox(0F, 0F, 0F, 1, 10, 12); - Base4.setRotationPoint(6F, 8F, -6F); - Base4.setTextureSize(128, 64); - Base4.mirror = true; - setRotation(Base4, 0F, 0F, 0F); - Base5 = new ModelRenderer(this, 72, 12); - Base5.addBox(0F, 0F, 0F, 1, 10, 12); - Base5.setRotationPoint(-7F, 8F, -6F); - Base5.setTextureSize(128, 64); - Base5.mirror = true; - setRotation(Base5, 0F, 0F, 0F); - Base6 = new ModelRenderer(this, 16, 0); - Base6.addBox(0F, 0F, 0F, 14, 1, 14); - Base6.setRotationPoint(-7F, 18F, -7F); - Base6.setTextureSize(128, 64); - Base6.mirror = true; - setRotation(Base6, 0F, 0F, 0F); - Can1B = new ModelRenderer(this, 0, 0); - Can1B.addBox(0F, 0F, 0F, 4, 1, 4); - Can1B.setRotationPoint(2F, 22F, 2F); - Can1B.setTextureSize(128, 64); - Can1B.mirror = true; - setRotation(Can1B, 0F, 0F, 0F); - Can1T = new ModelRenderer(this, 0, 0); - Can1T.addBox(0F, 0F, 0F, 4, 1, 4); - Can1T.setRotationPoint(2F, 19F, 2F); - Can1T.setTextureSize(128, 64); - Can1T.mirror = true; - setRotation(Can1T, 0F, 0F, 0F); - Can1Side3 = new ModelRenderer(this, 0, 0); - Can1Side3.addBox(0F, 0F, 0F, 1, 2, 2); - Can1Side3.setRotationPoint(5F, 20F, 3F); - Can1Side3.setTextureSize(128, 64); - Can1Side3.mirror = true; - setRotation(Can1Side3, 0F, 0F, 0F); - Can1Side1 = new ModelRenderer(this, 0, 0); - Can1Side1.addBox(0F, 0F, 0F, 4, 2, 1); - Can1Side1.setRotationPoint(2F, 20F, 5F); - Can1Side1.setTextureSize(128, 64); - Can1Side1.mirror = true; - setRotation(Can1Side1, 0F, 0F, 0F); - Can1Side2 = new ModelRenderer(this, 0, 0); - Can1Side2.addBox(0F, 0F, 0F, 4, 2, 1); - Can1Side2.setRotationPoint(2F, 20F, 2F); - Can1Side2.setTextureSize(128, 64); - Can1Side2.mirror = true; - setRotation(Can1Side2, 0F, 0F, 0F); - Can1Side4 = new ModelRenderer(this, 0, 0); - Can1Side4.addBox(0F, 0F, 0F, 1, 2, 2); - Can1Side4.setRotationPoint(2F, 20F, 3F); - Can1Side4.setTextureSize(128, 64); - Can1Side4.mirror = true; - setRotation(Can1Side4, 0F, 0F, 0F); - Can2Side4 = new ModelRenderer(this, 0, 0); - Can2Side4.addBox(0F, 0F, 0F, 1, 2, 2); - Can2Side4.setRotationPoint(-6F, 20F, 3F); - Can2Side4.setTextureSize(128, 64); - Can2Side4.mirror = true; - setRotation(Can2Side4, 0F, 0F, 0F); - Can3Side3 = new ModelRenderer(this, 0, 0); - Can3Side3.addBox(0F, 0F, 0F, 1, 2, 2); - Can3Side3.setRotationPoint(5F, 20F, -5F); - Can3Side3.setTextureSize(128, 64); - Can3Side3.mirror = true; - setRotation(Can3Side3, 0F, 0F, 0F); - Can2Side2 = new ModelRenderer(this, 0, 0); - Can2Side2.addBox(0F, 0F, 0F, 4, 2, 1); - Can2Side2.setRotationPoint(-6F, 20F, 2F); - Can2Side2.setTextureSize(128, 64); - Can2Side2.mirror = true; - setRotation(Can2Side2, 0F, 0F, 0F); - Can2Side3 = new ModelRenderer(this, 0, 0); - Can2Side3.addBox(0F, 0F, 0F, 1, 2, 2); - Can2Side3.setRotationPoint(-3F, 20F, 3F); - Can2Side3.setTextureSize(128, 64); - Can2Side3.mirror = true; - setRotation(Can2Side3, 0F, 0F, 0F); - Can2Side1 = new ModelRenderer(this, 0, 0); - Can2Side1.addBox(0F, 0F, 0F, 4, 2, 1); - Can2Side1.setRotationPoint(-6F, 20F, 5F); - Can2Side1.setTextureSize(128, 64); - Can2Side1.mirror = true; - setRotation(Can2Side1, 0F, 0F, 0F); - Can4Side3 = new ModelRenderer(this, 0, 0); - Can4Side3.addBox(0F, 0F, 0F, 1, 2, 2); - Can4Side3.setRotationPoint(-3F, 20F, -5F); - Can4Side3.setTextureSize(128, 64); - Can4Side3.mirror = true; - setRotation(Can4Side3, 0F, 0F, 0F); - Can4Side1 = new ModelRenderer(this, 0, 0); - Can4Side1.addBox(0F, 0F, 0F, 4, 2, 1); - Can4Side1.setRotationPoint(-6F, 20F, -3F); - Can4Side1.setTextureSize(128, 64); - Can4Side1.mirror = true; - setRotation(Can4Side1, 0F, 0F, 0F); - Can4Sjde4 = new ModelRenderer(this, 0, 0); - Can4Sjde4.addBox(0F, 0F, 0F, 1, 2, 2); - Can4Sjde4.setRotationPoint(-6F, 20F, -5F); - Can4Sjde4.setTextureSize(128, 64); - Can4Sjde4.mirror = true; - setRotation(Can4Sjde4, 0F, 0F, 0F); - Can4Side2 = new ModelRenderer(this, 0, 0); - Can4Side2.addBox(0F, 0F, 0F, 4, 2, 1); - Can4Side2.setRotationPoint(-6F, 20F, -6F); - Can4Side2.setTextureSize(128, 64); - Can4Side2.mirror = true; - setRotation(Can4Side2, 0F, 0F, 0F); - Can3Side4 = new ModelRenderer(this, 0, 0); - Can3Side4.addBox(0F, 0F, 0F, 1, 2, 2); - Can3Side4.setRotationPoint(2F, 20F, -5F); - Can3Side4.setTextureSize(128, 64); - Can3Side4.mirror = true; - setRotation(Can3Side4, 0F, 0F, 0F); - Can4B = new ModelRenderer(this, 0, 0); - Can4B.addBox(0F, 0F, 0F, 4, 1, 4); - Can4B.setRotationPoint(-6F, 22F, -6F); - Can4B.setTextureSize(128, 64); - Can4B.mirror = true; - setRotation(Can4B, 0F, 0F, 0F); - Can3Side2 = new ModelRenderer(this, 0, 0); - Can3Side2.addBox(0F, 0F, 0F, 4, 2, 1); - Can3Side2.setRotationPoint(2F, 20F, -6F); - Can3Side2.setTextureSize(128, 64); - Can3Side2.mirror = true; - setRotation(Can3Side2, 0F, 0F, 0F); - Can3Side1 = new ModelRenderer(this, 0, 0); - Can3Side1.addBox(0F, 0F, 0F, 4, 2, 1); - Can3Side1.setRotationPoint(2F, 20F, -3F); - Can3Side1.setTextureSize(128, 64); - Can3Side1.mirror = true; - setRotation(Can3Side1, 0F, 0F, 0F); - Can2B = new ModelRenderer(this, 0, 0); - Can2B.addBox(0F, 0F, 0F, 4, 1, 4); - Can2B.setRotationPoint(-6F, 22F, 2F); - Can2B.setTextureSize(128, 64); - Can2B.mirror = true; - setRotation(Can2B, 0F, 0F, 0F); - Can4T = new ModelRenderer(this, 0, 0); - Can4T.addBox(0F, 0F, 0F, 4, 1, 4); - Can4T.setRotationPoint(-6F, 19F, -6F); - Can4T.setTextureSize(128, 64); - Can4T.mirror = true; - setRotation(Can4T, 0F, 0F, 0F); - Can2T = new ModelRenderer(this, 0, 0); - Can2T.addBox(0F, 0F, 0F, 4, 1, 4); - Can2T.setRotationPoint(-6F, 19F, 2F); - Can2T.setTextureSize(128, 64); - Can2T.mirror = true; - setRotation(Can2T, 0F, 0F, 0F); - Can3T = new ModelRenderer(this, 0, 0); - Can3T.addBox(0F, 0F, 0F, 4, 1, 4); - Can3T.setRotationPoint(2F, 19F, -6F); - Can3T.setTextureSize(128, 64); - Can3T.mirror = true; - setRotation(Can3T, 0F, 0F, 0F); - Can3B = new ModelRenderer(this, 0, 0); - Can3B.addBox(0F, 0F, 0F, 4, 1, 4); - Can3B.setRotationPoint(2F, 22F, -6F); - Can3B.setTextureSize(128, 64); - Can3B.mirror = true; - setRotation(Can3B, 0F, 0F, 0F); + tankBack = new ModelRenderer(this, 0, 20); + tankBack.addBox(0F, 0F, 0F, 16, 10, 6); + tankBack.setRotationPoint(-8F, 10F, 2F); + tankBack.setTextureSize(128, 64); + tankBack.mirror = true; + setRotation(tankBack, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 4, 16); + base.setRotationPoint(-8F, 20F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + portTop = new ModelRenderer(this, 66, 0); + portTop.addBox(0F, 0F, 0F, 8, 1, 8); + portTop.setRotationPoint(-4F, 8F, -4F); + portTop.setTextureSize(128, 64); + portTop.mirror = true; + setRotation(portTop, 0F, 0F, 0F); + pipe1 = new ModelRenderer(this, 66, 9); + pipe1.addBox(0F, 0F, 0F, 7, 5, 7); + pipe1.setRotationPoint(-3.5F, 9F, -3.5F); + pipe1.setTextureSize(128, 64); + pipe1.mirror = true; + setRotation(pipe1, 0F, 0F, 0F); + pipe2b = new ModelRenderer(this, 44, 21); + pipe2b.addBox(0F, 0F, 0F, 1, 8, 4); + pipe2b.setRotationPoint(-3.49F, 14F, -3.5F); + pipe2b.setTextureSize(128, 64); + pipe2b.mirror = true; + setRotation(pipe2b, 0.837758F, 0F, 0F); + portRight = new ModelRenderer(this, 48, 0); + portRight.addBox(0F, 0F, 0F, 1, 8, 8); + portRight.setRotationPoint(7.01F, 12F, -4F); + portRight.setTextureSize(128, 64); + portRight.mirror = true; + setRotation(portRight, 0F, 0F, 0F); + bridge1 = new ModelRenderer(this, 0, 0); + bridge1.addBox(0F, 0F, 0F, 2, 1, 1); + bridge1.setRotationPoint(-1F, 11F, -7F); + bridge1.setTextureSize(128, 64); + bridge1.mirror = true; + setRotation(bridge1, 0F, 0F, 0F); + bridge2 = new ModelRenderer(this, 0, 0); + bridge2.addBox(0F, 0F, 0F, 2, 1, 1); + bridge2.setRotationPoint(-1F, 13F, -7F); + bridge2.setTextureSize(128, 64); + bridge2.mirror = true; + setRotation(bridge2, 0F, 0F, 0F); + bridge3 = new ModelRenderer(this, 0, 0); + bridge3.addBox(0F, 0F, 0F, 2, 1, 1); + bridge3.setRotationPoint(-1F, 15F, -7F); + bridge3.setTextureSize(128, 64); + bridge3.mirror = true; + setRotation(bridge3, 0F, 0F, 0F); + conduit = new ModelRenderer(this, 0, 3); + conduit.addBox(0F, 0F, 0F, 2, 1, 2); + conduit.setRotationPoint(-1F, 19.5F, -5F); + conduit.setTextureSize(128, 64); + conduit.mirror = true; + setRotation(conduit, 0F, 0F, 0F); + bridge4 = new ModelRenderer(this, 0, 0); + bridge4.addBox(0F, 0F, 0F, 2, 1, 1); + bridge4.setRotationPoint(-1F, 17F, -7F); + bridge4.setTextureSize(128, 64); + bridge4.mirror = true; + setRotation(bridge4, 0F, 0F, 0F); + pipe2 = new ModelRenderer(this, 54, 21); + pipe2.addBox(0F, 0F, 0F, 6, 8, 4); + pipe2.setRotationPoint(-2.51F, 14F, -3.5F); + pipe2.setTextureSize(128, 64); + pipe2.mirror = true; + setRotation(pipe2, 0.837758F, 0F, 0F); + tankLeft = new ModelRenderer(this, 0, 36); + tankLeft.addBox(0F, 0F, 0F, 7, 10, 8); + tankLeft.setRotationPoint(-8F, 10F, -8F); + tankLeft.setTextureSize(128, 64); + tankLeft.mirror = true; + setRotation(tankLeft, 0F, 0F, 0F); + connectorRight = new ModelRenderer(this, 0, 7); + connectorRight.addBox(0F, 0F, 0F, 2, 6, 2); + connectorRight.setRotationPoint(5F, 13F, 0F); + connectorRight.setTextureSize(128, 64); + connectorRight.mirror = true; + setRotation(connectorRight, 0F, 0F, 0F); + portLeft = new ModelRenderer(this, 48, 0); + portLeft.addBox(0F, 0F, 0F, 1, 8, 8); + portLeft.setRotationPoint(-8.01F, 12F, -4F); + portLeft.setTextureSize(128, 64); + portLeft.mirror = true; + setRotation(portLeft, 0F, 0F, 0F); + connectorLeft = new ModelRenderer(this, 0, 7); + connectorLeft.addBox(0F, 0F, 0F, 2, 6, 2); + connectorLeft.setRotationPoint(-7F, 13F, 0F); + connectorLeft.setTextureSize(128, 64); + connectorLeft.mirror = true; + setRotation(connectorLeft, 0F, 0F, 0F); + tankRight = new ModelRenderer(this, 0, 36); + tankRight.mirror = true; + tankRight.addBox(0F, 0F, 0F, 7, 10, 8); + tankRight.setRotationPoint(1F, 10F, -8F); + tankRight.setTextureSize(128, 64); + setRotation(tankRight, 0F, 0F, 0F); + tubeLeft1 = new ModelRenderer(this, 30, 36); + tubeLeft1.addBox(0F, 0F, -1F, 1, 2, 1); + tubeLeft1.setRotationPoint(-6F, 8.5F, 4F); + tubeLeft1.setTextureSize(128, 64); + tubeLeft1.mirror = true; + setRotation(tubeLeft1, 0.6806784F, 0F, 0F); + tubeLeft2 = new ModelRenderer(this, 30, 36); + tubeLeft2.addBox(0F, 0F, 0F, 1, 1, 8); + tubeLeft2.setRotationPoint(-6F, 8.5F, -4F); + tubeLeft2.setTextureSize(128, 64); + tubeLeft2.mirror = true; + setRotation(tubeLeft2, 0F, 0F, 0F); + tubeRight3 = new ModelRenderer(this, 30, 39); + tubeRight3.addBox(0F, -1F, 0F, 1, 2, 1); + tubeRight3.setRotationPoint(6F, 10F, -2.5F); + tubeRight3.setTextureSize(128, 64); + tubeRight3.mirror = true; + setRotation(tubeRight3, 0F, 0F, 0.3141593F); + tubeRight1 = new ModelRenderer(this, 30, 39); + tubeRight1.addBox(0F, -1F, 0F, 1, 2, 1); + tubeRight1.setRotationPoint(6F, 10F, -6.5F); + tubeRight1.setTextureSize(128, 64); + tubeRight1.mirror = true; + setRotation(tubeRight1, 0F, 0F, 0.3141593F); + tubeRight2 = new ModelRenderer(this, 30, 39); + tubeRight2.addBox(0F, -1F, 0F, 1, 2, 1); + tubeRight2.setRotationPoint(6F, 10F, -4.5F); + tubeRight2.setTextureSize(128, 64); + tubeRight2.mirror = true; + setRotation(tubeRight2, 0F, 0F, 0.3141593F); + tubeLeft3 = new ModelRenderer(this, 30, 36); + tubeLeft3.addBox(0F, 0F, 0F, 1, 2, 1); + tubeLeft3.setRotationPoint(-6F, 9.5F, -4F); + tubeLeft3.setTextureSize(128, 64); + tubeLeft3.mirror = true; + setRotation(tubeLeft3, 0F, 0F, -0.8203047F); } public void render(float size) { - MekanismRenderer.blendOn(); - - Base.render(size); - Base2.render(size); - IO1.render(size); - IO2.render(size); - IO3.render(size); - Base3.render(size); - Base4.render(size); - Base5.render(size); - Base6.render(size); - Can1B.render(size); - Can1T.render(size); - Can1Side3.render(size); - Can1Side1.render(size); - Can1Side2.render(size); - Can1Side4.render(size); - Can2Side4.render(size); - Can3Side3.render(size); - Can2Side2.render(size); - Can2Side3.render(size); - Can2Side1.render(size); - Can4Side3.render(size); - Can4Side1.render(size); - Can4Sjde4.render(size); - Can4Side2.render(size); - Can3Side4.render(size); - Can4B.render(size); - Can3Side2.render(size); - Can3Side1.render(size); - Can2B.render(size); - Can4T.render(size); - Can2T.render(size); - Can3T.render(size); - Can3B.render(size); - - MekanismRenderer.blendOff(); + tankBack.render(size); + base.render(size); + portTop.render(size); + pipe1.render(size); + pipe2b.render(size); + portRight.render(size); + bridge1.render(size); + bridge2.render(size); + bridge3.render(size); + conduit.render(size); + bridge4.render(size); + pipe2.render(size); + tankLeft.render(size); + connectorRight.render(size); + portLeft.render(size); + connectorLeft.render(size); + tankRight.render(size); + tubeLeft1.render(size); + tubeLeft2.render(size); + tubeRight3.render(size); + tubeRight1.render(size); + tubeRight2.render(size); + tubeLeft3.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelElectricPump.java b/src/main/java/mekanism/client/model/ModelElectricPump.java index 0c442b82a..39c8cdf42 100644 --- a/src/main/java/mekanism/client/model/ModelElectricPump.java +++ b/src/main/java/mekanism/client/model/ModelElectricPump.java @@ -8,112 +8,176 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelElectricPump extends ModelBase { - ModelRenderer PumpHead; - ModelRenderer Connector; - ModelRenderer Panel1; - ModelRenderer Panel2; - ModelRenderer Panel3; - ModelRenderer Body; - ModelRenderer Axil; - ModelRenderer Axil2; - ModelRenderer Ring1; - ModelRenderer Ring2; - ModelRenderer Plug; - ModelRenderer Ring3; + ModelRenderer pumpRingTop; + ModelRenderer pumpPortTop; + ModelRenderer pumpCasing; + ModelRenderer pumpBase; + ModelRenderer powerPort; + ModelRenderer powerConnector; + ModelRenderer powerConnectorFrame4; + ModelRenderer powerConnectorFrame3; + ModelRenderer powerConnectorFrame2; + ModelRenderer powerConnectorFrame1; + ModelRenderer pipeToggleBack; + ModelRenderer pipeToggleRingBack; + ModelRenderer pipeTogglePortBack; + ModelRenderer pipeToggleLeft; + ModelRenderer pipeToggleRingLeft; + ModelRenderer pipeTogglePortLeft; + ModelRenderer pipeToggleRight; + ModelRenderer pipeToggleRingRight; + ModelRenderer pipeTogglePortRight; + ModelRenderer pumpPipe; - public ModelElectricPump() + public ModelElectricPump() { - textureWidth = 64; + textureWidth = 128; textureHeight = 64; - PumpHead = new ModelRenderer(this, 33, 0); - PumpHead.addBox(0F, 0F, 0F, 6, 3, 6); - PumpHead.setRotationPoint(-3F, 19F, -3F); - PumpHead.setTextureSize(64, 64); - PumpHead.mirror = true; - setRotation(PumpHead, 0F, 0F, 0F); - Connector = new ModelRenderer(this, 33, 10); - Connector.addBox(0F, 0F, 0F, 4, 1, 5); - Connector.setRotationPoint(-2F, 14F, 2.5F); - Connector.setTextureSize(64, 64); - Connector.mirror = true; - setRotation(Connector, 0F, 0F, 0F); - Panel1 = new ModelRenderer(this, 0, 15); - Panel1.addBox(-3F, -6F, 0F, 6, 6, 1); - Panel1.setRotationPoint(0F, 21F, -3F); - Panel1.setTextureSize(64, 64); - Panel1.mirror = true; - setRotation(Panel1, 0.5585054F, 0F, 0F); - Panel2 = new ModelRenderer(this, 15, 15); - Panel2.addBox(0F, -6F, -3F, 1, 6, 6); - Panel2.setRotationPoint(-3F, 21F, 0F); - Panel2.setTextureSize(64, 64); - Panel2.mirror = true; - setRotation(Panel2, 0F, 0F, -0.5585054F); - Panel3 = new ModelRenderer(this, 15, 15); - Panel3.addBox(-1F, -6F, -3F, 1, 6, 6); - Panel3.setRotationPoint(3F, 21F, 0F); - Panel3.setTextureSize(64, 64); - Panel3.mirror = true; - setRotation(Panel3, 0F, 0F, 0.5585054F); - Body = new ModelRenderer(this, 30, 17); - Body.addBox(0F, 0F, 0F, 6, 10, 6); - Body.setRotationPoint(-3F, 9F, -3F); - Body.setTextureSize(64, 64); - Body.mirror = true; - setRotation(Body, 0F, 0F, 0F); - Axil = new ModelRenderer(this, 0, 28); - Axil.addBox(0F, 0F, 0F, 9, 2, 4); - Axil.setRotationPoint(-4.5F, 17F, -2F); - Axil.setTextureSize(64, 64); - Axil.mirror = true; - setRotation(Axil, 0F, 0F, 0F); - Axil2 = new ModelRenderer(this, 0, 0); - Axil2.addBox(0F, 0F, 0F, 4, 2, 12); - Axil2.setRotationPoint(-2F, 17F, -4.5F); - Axil2.setTextureSize(64, 64); - Axil2.mirror = true; - setRotation(Axil2, 0F, 0F, 0F); - Ring1 = new ModelRenderer(this, 0, 35); - Ring1.addBox(0F, 0F, 0F, 8, 1, 8); - Ring1.setRotationPoint(-4F, 12F, -4F); - Ring1.setTextureSize(64, 64); - Ring1.mirror = true; - setRotation(Ring1, 0F, 0F, 0F); - Ring2 = new ModelRenderer(this, 0, 35); - Ring2.addBox(0F, 0F, 0F, 8, 1, 8); - Ring2.setRotationPoint(-4F, 10F, -4F); - Ring2.setTextureSize(64, 64); - Ring2.mirror = true; - setRotation(Ring2, 0F, 0F, 0F); - Plug = new ModelRenderer(this, 0, 45); - Plug.addBox(0F, 0F, 0F, 6, 6, 1); - Plug.setRotationPoint(-3F, 13F, 7F); - Plug.setTextureSize(64, 64); - Plug.mirror = true; - setRotation(Plug, 0F, 0F, 0F); - Ring3 = new ModelRenderer(this, 0, 35); - Ring3.addBox(0F, 0F, 0F, 8, 1, 8); - Ring3.setRotationPoint(-4F, 8F, -4F); - Ring3.setTextureSize(64, 64); - Ring3.mirror = true; - setRotation(Ring3, 0F, 0F, 0F); + pumpRingTop = new ModelRenderer(this, 68, 9); + pumpRingTop.addBox(0F, 0F, 0F, 8, 1, 8); + pumpRingTop.setRotationPoint(-4F, 10F, -4F); + pumpRingTop.setTextureSize(128, 64); + pumpRingTop.mirror = true; + setRotation(pumpRingTop, 0F, 0F, 0F); + pumpPortTop = new ModelRenderer(this, 68, 0); + pumpPortTop.addBox(0F, 0F, 0F, 8, 1, 8); + pumpPortTop.setRotationPoint(-4F, 8F, -4F); + pumpPortTop.setTextureSize(128, 64); + pumpPortTop.mirror = true; + setRotation(pumpPortTop, 0F, 0F, 0F); + pumpCasing = new ModelRenderer(this, 0, 0); + pumpCasing.addBox(0F, 0F, 0F, 7, 12, 7); + pumpCasing.setRotationPoint(-3.5F, 11F, -3.5F); + pumpCasing.setTextureSize(128, 64); + pumpCasing.mirror = true; + setRotation(pumpCasing, 0F, 0F, 0F); + pumpBase = new ModelRenderer(this, 28, 0); + pumpBase.addBox(0F, 0F, 0F, 6, 15, 6); + pumpBase.setRotationPoint(-3F, 9F, -3F); + pumpBase.setTextureSize(128, 64); + pumpBase.mirror = true; + setRotation(pumpBase, 0F, 0F, 0F); + powerPort = new ModelRenderer(this, 38, 29); + powerPort.addBox(0F, 0F, 0F, 8, 8, 1); + powerPort.setRotationPoint(-4F, 12F, -8F); + powerPort.setTextureSize(128, 64); + powerPort.mirror = true; + setRotation(powerPort, 0F, 0F, 0F); + powerConnector = new ModelRenderer(this, 0, 29); + powerConnector.addBox(0F, 0F, 0F, 5, 5, 4); + powerConnector.setRotationPoint(-2.5F, 13.5F, -7F); + powerConnector.setTextureSize(128, 64); + powerConnector.mirror = true; + setRotation(powerConnector, 0F, 0F, 0F); + powerConnectorFrame4 = new ModelRenderer(this, 38, 21); + powerConnectorFrame4.addBox(0F, 0F, 0F, 1, 1, 4); + powerConnectorFrame4.setRotationPoint(2F, 18F, -7F); + powerConnectorFrame4.setTextureSize(128, 64); + powerConnectorFrame4.mirror = true; + setRotation(powerConnectorFrame4, 0F, 0F, 0F); + powerConnectorFrame3 = new ModelRenderer(this, 38, 21); + powerConnectorFrame3.addBox(0F, 0F, 0F, 1, 1, 4); + powerConnectorFrame3.setRotationPoint(-3F, 18F, -7F); + powerConnectorFrame3.setTextureSize(128, 64); + powerConnectorFrame3.mirror = true; + setRotation(powerConnectorFrame3, 0F, 0F, 0F); + powerConnectorFrame2 = new ModelRenderer(this, 38, 21); + powerConnectorFrame2.addBox(0F, 0F, 0F, 1, 1, 4); + powerConnectorFrame2.setRotationPoint(2F, 13F, -7F); + powerConnectorFrame2.setTextureSize(128, 64); + powerConnectorFrame2.mirror = true; + setRotation(powerConnectorFrame2, 0F, 0F, 0F); + powerConnectorFrame1 = new ModelRenderer(this, 38, 21); + powerConnectorFrame1.addBox(0F, 0F, 0F, 1, 1, 4); + powerConnectorFrame1.setRotationPoint(-3F, 13F, -7F); + powerConnectorFrame1.setTextureSize(128, 64); + powerConnectorFrame1.mirror = true; + setRotation(powerConnectorFrame1, 0F, 0F, 0F); + pipeToggleBack = new ModelRenderer(this, 0, 19); + pipeToggleBack.addBox(0F, 0F, 0F, 6, 6, 4); + pipeToggleBack.setRotationPoint(-3F, 13F, 3F); + pipeToggleBack.setTextureSize(128, 64); + pipeToggleBack.mirror = true; + setRotation(pipeToggleBack, 0F, 0F, 0F); + pipeToggleRingBack = new ModelRenderer(this, 18, 30); + pipeToggleRingBack.addBox(0F, 0F, 0F, 7, 7, 1); + pipeToggleRingBack.setRotationPoint(-3.5F, 12.5F, 5F); + pipeToggleRingBack.setTextureSize(128, 64); + pipeToggleRingBack.mirror = true; + setRotation(pipeToggleRingBack, 0F, 0F, 0F); + pipeTogglePortBack = new ModelRenderer(this, 20, 21); + pipeTogglePortBack.addBox(0F, 0F, 0F, 8, 8, 1); + pipeTogglePortBack.setRotationPoint(-4F, 12F, 7F); + pipeTogglePortBack.setTextureSize(128, 64); + pipeTogglePortBack.mirror = true; + setRotation(pipeTogglePortBack, 0F, 0F, 0F); + pipeToggleLeft = new ModelRenderer(this, 34, 38); + pipeToggleLeft.addBox(0F, 0F, 0F, 4, 6, 6); + pipeToggleLeft.setRotationPoint(3F, 13F, -3F); + pipeToggleLeft.setTextureSize(128, 64); + pipeToggleLeft.mirror = true; + setRotation(pipeToggleLeft, 0F, 0F, 0F); + pipeToggleRingLeft = new ModelRenderer(this, 18, 38); + pipeToggleRingLeft.addBox(0F, 0F, 0F, 1, 7, 7); + pipeToggleRingLeft.setRotationPoint(5F, 12.5F, -3.5F); + pipeToggleRingLeft.setTextureSize(128, 64); + pipeToggleRingLeft.mirror = true; + setRotation(pipeToggleRingLeft, 0F, 0F, 0F); + pipeTogglePortLeft = new ModelRenderer(this, 0, 38); + pipeTogglePortLeft.addBox(0F, 0F, 0F, 1, 8, 8); + pipeTogglePortLeft.setRotationPoint(7F, 12F, -4F); + pipeTogglePortLeft.setTextureSize(128, 64); + pipeTogglePortLeft.mirror = true; + setRotation(pipeTogglePortLeft, 0F, 0F, 0F); + pipeToggleRight = new ModelRenderer(this, 34, 38); + pipeToggleRight.mirror = true; + pipeToggleRight.addBox(0F, 0F, 0F, 4, 6, 6); + pipeToggleRight.setRotationPoint(-7F, 13F, -3F); + pipeToggleRight.setTextureSize(128, 64); + setRotation(pipeToggleRight, 0F, 0F, 0F); + pipeToggleRingRight = new ModelRenderer(this, 18, 38); + pipeToggleRingRight.addBox(0F, 0F, 0F, 1, 7, 7); + pipeToggleRingRight.setRotationPoint(-6F, 12.5F, -3.5F); + pipeToggleRingRight.setTextureSize(128, 64); + pipeToggleRingRight.mirror = true; + setRotation(pipeToggleRingRight, 0F, 0F, 0F); + pipeTogglePortRight = new ModelRenderer(this, 0, 38); + pipeTogglePortRight.addBox(0F, 0F, 0F, 1, 8, 8); + pipeTogglePortRight.setRotationPoint(-8F, 12F, -4F); + pipeTogglePortRight.setTextureSize(128, 64); + pipeTogglePortRight.mirror = true; + setRotation(pipeTogglePortRight, 0F, 0F, 0F); + pumpPipe = new ModelRenderer(this, 52, 0); + pumpPipe.addBox(0F, 0F, 0F, 4, 8, 4); + pumpPipe.setRotationPoint(-2F, 24F, -2F); + pumpPipe.setTextureSize(128, 64); + pumpPipe.mirror = true; + setRotation(pumpPipe, 0F, 0F, 0F); } public void render(float size) { - PumpHead.render(size); - Connector.render(size); - Panel1.render(size); - Panel2.render(size); - Panel3.render(size); - Body.render(size); - Axil.render(size); - Axil2.render(size); - Ring1.render(size); - Ring2.render(size); - Plug.render(size); - Ring3.render(size); + pumpRingTop.render(size); + pumpPortTop.render(size); + pumpCasing.render(size); + pumpBase.render(size); + powerPort.render(size); + powerConnector.render(size); + powerConnectorFrame4.render(size); + powerConnectorFrame3.render(size); + powerConnectorFrame2.render(size); + powerConnectorFrame1.render(size); + /*pipeToggleBack.render(size); + pipeToggleRingBack.render(size); + pipeTogglePortBack.render(size); + pipeToggleLeft.render(size); + pipeToggleRingLeft.render(size); + pipeTogglePortLeft.render(size); + pipeToggleRight.render(size); + pipeToggleRingRight.render(size); + pipeTogglePortRight.render(size);*/ + pumpPipe.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelRotaryCondensentrator.java b/src/main/java/mekanism/client/model/ModelRotaryCondensentrator.java index c52693ee9..5b252f01d 100644 --- a/src/main/java/mekanism/client/model/ModelRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/model/ModelRotaryCondensentrator.java @@ -8,216 +8,192 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelRotaryCondensentrator extends ModelBase { - ModelRenderer GasBottleLid1; - ModelRenderer GasBottleLid2; - ModelRenderer GasBottleDecor1; - ModelRenderer GasBottleDecor2; - ModelRenderer GasBottleDecor3; - ModelRenderer GasBottleDecor4; - ModelRenderer GasBottle1; - ModelRenderer GasBottle2; - ModelRenderer GasBottleBot1; - ModelRenderer GasBottleBot2; - ModelRenderer LiqBottleLid1; - ModelRenderer LiqBottleLid2; - ModelRenderer LiqBottleBot1; - ModelRenderer LiqBottleBot2; - ModelRenderer LiqBottle2; - ModelRenderer LiqBottle1; - ModelRenderer LiqBottleDecor1; - ModelRenderer LiqBottleDecor2; - ModelRenderer LiqBottleDecor3; - ModelRenderer LiqBottleDecor4; - ModelRenderer GasInput; - ModelRenderer MidSection1; - ModelRenderer MidSection2; - ModelRenderer LiquidOutput; - ModelRenderer MidSection3; + ModelRenderer portRight; + ModelRenderer tankRight; + ModelRenderer base; + ModelRenderer pipe; + ModelRenderer middle; + ModelRenderer shaft; + ModelRenderer portLeft; + ModelRenderer tankLeft; + ModelRenderer support4; + ModelRenderer bridge; + ModelRenderer tube8; + ModelRenderer tube7; + ModelRenderer tube6; + ModelRenderer tube5; + ModelRenderer tube4; + ModelRenderer tube3; + ModelRenderer tube2; + ModelRenderer tube1; + ModelRenderer top; + ModelRenderer support3; + ModelRenderer support2; + ModelRenderer support1; - public ModelRotaryCondensentrator() + public ModelRotaryCondensentrator() { textureWidth = 128; - textureHeight = 128; + textureHeight = 64; - GasBottleLid1 = new ModelRenderer(this, 0, 40); - GasBottleLid1.addBox(0F, 0F, 0F, 6, 1, 6); - GasBottleLid1.setRotationPoint(-7F, 11F, 1F); - GasBottleLid1.setTextureSize(128, 128); - GasBottleLid1.mirror = true; - setRotation(GasBottleLid1, 0F, 0F, 0F); - GasBottleLid2 = new ModelRenderer(this, 0, 40); - GasBottleLid2.addBox(0F, 0F, 0F, 6, 1, 6); - GasBottleLid2.setRotationPoint(1F, 11F, 1F); - GasBottleLid2.setTextureSize(128, 128); - GasBottleLid2.mirror = true; - setRotation(GasBottleLid2, 0F, 0F, 0F); - GasBottleDecor1 = new ModelRenderer(this, 0, 33); - GasBottleDecor1.addBox(0F, 0F, 0F, 5, 1, 5); - GasBottleDecor1.setRotationPoint(1.5F, 21F, 1.5F); - GasBottleDecor1.setTextureSize(128, 128); - GasBottleDecor1.mirror = true; - setRotation(GasBottleDecor1, 0F, 0F, 0F); - GasBottleDecor2 = new ModelRenderer(this, 0, 33); - GasBottleDecor2.addBox(0F, 0F, 0F, 5, 1, 5); - GasBottleDecor2.setRotationPoint(1.5F, 13F, 1.5F); - GasBottleDecor2.setTextureSize(128, 128); - GasBottleDecor2.mirror = true; - setRotation(GasBottleDecor2, 0F, 0F, 0F); - GasBottleDecor3 = new ModelRenderer(this, 0, 33); - GasBottleDecor3.addBox(0F, 0F, 0F, 5, 1, 5); - GasBottleDecor3.setRotationPoint(-6.5F, 21F, 1.5F); - GasBottleDecor3.setTextureSize(128, 128); - GasBottleDecor3.mirror = true; - setRotation(GasBottleDecor3, 0F, 0F, 0F); - GasBottleDecor4 = new ModelRenderer(this, 0, 33); - GasBottleDecor4.addBox(0F, 0F, 0F, 5, 1, 5); - GasBottleDecor4.setRotationPoint(-6.5F, 13F, 1.5F); - GasBottleDecor4.setTextureSize(128, 128); - GasBottleDecor4.mirror = true; - setRotation(GasBottleDecor4, 0F, 0F, 0F); - GasBottle1 = new ModelRenderer(this, 0, 48); - GasBottle1.addBox(0F, 0F, 0F, 4, 11, 4); - GasBottle1.setRotationPoint(-6F, 12F, 2F); - GasBottle1.setTextureSize(128, 128); - GasBottle1.mirror = true; - setRotation(GasBottle1, 0F, 0F, 0F); - GasBottle2 = new ModelRenderer(this, 0, 48); - GasBottle2.addBox(0F, 0F, 0F, 4, 11, 4); - GasBottle2.setRotationPoint(2F, 12F, 2F); - GasBottle2.setTextureSize(128, 128); - GasBottle2.mirror = true; - setRotation(GasBottle2, 0F, 0F, 0F); - GasBottleBot1 = new ModelRenderer(this, 0, 40); - GasBottleBot1.addBox(0F, 0F, 0F, 6, 1, 6); - GasBottleBot1.setRotationPoint(-7F, 23F, 1F); - GasBottleBot1.setTextureSize(128, 128); - GasBottleBot1.mirror = true; - setRotation(GasBottleBot1, 0F, 0F, 0F); - GasBottleBot2 = new ModelRenderer(this, 0, 40); - GasBottleBot2.addBox(0F, 0F, 0F, 6, 1, 6); - GasBottleBot2.setRotationPoint(1F, 23F, 1F); - GasBottleBot2.setTextureSize(128, 128); - GasBottleBot2.mirror = true; - setRotation(GasBottleBot2, 0F, 0F, 0F); - LiqBottleLid1 = new ModelRenderer(this, 25, 40); - LiqBottleLid1.addBox(0F, 0F, 0F, 6, 1, 6); - LiqBottleLid1.setRotationPoint(-7F, 11F, -7F); - LiqBottleLid1.setTextureSize(128, 128); - LiqBottleLid1.mirror = true; - setRotation(LiqBottleLid1, 0F, 0F, 0F); - LiqBottleLid2 = new ModelRenderer(this, 25, 40); - LiqBottleLid2.addBox(0F, 0F, 0F, 6, 1, 6); - LiqBottleLid2.setRotationPoint(1F, 11F, -7F); - LiqBottleLid2.setTextureSize(128, 128); - LiqBottleLid2.mirror = true; - setRotation(LiqBottleLid2, 0F, 0F, 0F); - LiqBottleBot1 = new ModelRenderer(this, 25, 40); - LiqBottleBot1.addBox(0F, 0F, 0F, 6, 1, 6); - LiqBottleBot1.setRotationPoint(-7F, 23F, -7F); - LiqBottleBot1.setTextureSize(128, 128); - LiqBottleBot1.mirror = true; - setRotation(LiqBottleBot1, 0F, 0F, 0F); - LiqBottleBot2 = new ModelRenderer(this, 25, 40); - LiqBottleBot2.addBox(0F, 0F, 0F, 6, 1, 6); - LiqBottleBot2.setRotationPoint(1F, 23F, -7F); - LiqBottleBot2.setTextureSize(128, 128); - LiqBottleBot2.mirror = true; - setRotation(LiqBottleBot2, 0F, 0F, 0F); - LiqBottle2 = new ModelRenderer(this, 25, 48); - LiqBottle2.addBox(0F, 0F, 0F, 4, 11, 4); - LiqBottle2.setRotationPoint(2F, 12F, -6F); - LiqBottle2.setTextureSize(128, 128); - LiqBottle2.mirror = true; - setRotation(LiqBottle2, 0F, 0F, 0F); - LiqBottle1 = new ModelRenderer(this, 25, 48); - LiqBottle1.addBox(0F, 0F, 0F, 4, 11, 4); - LiqBottle1.setRotationPoint(-6F, 12F, -6F); - LiqBottle1.setTextureSize(128, 128); - LiqBottle1.mirror = true; - setRotation(LiqBottle1, 0F, 0F, 0F); - LiqBottleDecor1 = new ModelRenderer(this, 25, 33); - LiqBottleDecor1.addBox(0F, 0F, 0F, 5, 1, 5); - LiqBottleDecor1.setRotationPoint(1.5F, 21F, -6.5F); - LiqBottleDecor1.setTextureSize(128, 128); - LiqBottleDecor1.mirror = true; - setRotation(LiqBottleDecor1, 0F, 0F, 0F); - LiqBottleDecor2 = new ModelRenderer(this, 25, 33); - LiqBottleDecor2.addBox(0F, 0F, 0F, 5, 1, 5); - LiqBottleDecor2.setRotationPoint(1.5F, 13F, -6.5F); - LiqBottleDecor2.setTextureSize(128, 128); - LiqBottleDecor2.mirror = true; - setRotation(LiqBottleDecor2, 0F, 0F, 0F); - LiqBottleDecor3 = new ModelRenderer(this, 25, 33); - LiqBottleDecor3.addBox(0F, 0F, 0F, 5, 1, 5); - LiqBottleDecor3.setRotationPoint(-6.5F, 21F, -6.5F); - LiqBottleDecor3.setTextureSize(128, 128); - LiqBottleDecor3.mirror = true; - setRotation(LiqBottleDecor3, 0F, 0F, 0F); - LiqBottleDecor4 = new ModelRenderer(this, 25, 33); - LiqBottleDecor4.addBox(0F, 0F, 0F, 5, 1, 5); - LiqBottleDecor4.setRotationPoint(-6.5F, 13F, -6.5F); - LiqBottleDecor4.setTextureSize(128, 128); - LiqBottleDecor4.mirror = true; - setRotation(LiqBottleDecor4, 0F, 0F, 0F); - GasInput = new ModelRenderer(this, 0, 24); - GasInput.addBox(0F, 0F, 0F, 6, 6, 1); - GasInput.setRotationPoint(-3F, 13F, 7F); - GasInput.setTextureSize(128, 128); - GasInput.mirror = true; - setRotation(GasInput, 0F, 0F, 0F); - MidSection1 = new ModelRenderer(this, 15, 20); - MidSection1.addBox(0F, 0F, 0F, 4, 5, 6); - MidSection1.setRotationPoint(-2F, 18F, 1F); - MidSection1.setTextureSize(128, 128); - MidSection1.mirror = true; - setRotation(MidSection1, 0F, 0F, 0F); - MidSection2 = new ModelRenderer(this, 37, 0); - MidSection2.addBox(0F, 0F, 0F, 6, 7, 8); - MidSection2.setRotationPoint(-3F, 17F, -7F); - MidSection2.setTextureSize(128, 128); - MidSection2.mirror = true; - setRotation(MidSection2, 0F, 0F, 0F); - LiquidOutput = new ModelRenderer(this, 36, 22); - LiquidOutput.addBox(0F, 0F, 0F, 8, 8, 1); - LiquidOutput.setRotationPoint(-4F, 12F, -8F); - LiquidOutput.setTextureSize(128, 128); - LiquidOutput.mirror = true; - setRotation(LiquidOutput, 0F, 0F, 0F); - MidSection3 = new ModelRenderer(this, 0, 0); - MidSection3.addBox(0F, 0F, 0F, 4, 2, 14); - MidSection3.setRotationPoint(-2F, 15F, -7F); - MidSection3.setTextureSize(128, 128); - MidSection3.mirror = true; - setRotation(MidSection3, 0F, 0F, 0F); + portRight = new ModelRenderer(this, 82, 31); + portRight.addBox(0F, 0F, 0F, 1, 10, 10); + portRight.setRotationPoint(7.01F, 11F, -5F); + portRight.setTextureSize(128, 64); + portRight.mirror = true; + setRotation(portRight, 0F, 0F, 0F); + tankRight = new ModelRenderer(this, 64, 9); + tankRight.mirror = true; + tankRight.addBox(0F, 0F, 0F, 6, 8, 14); + tankRight.setRotationPoint(1F, 11F, -7F); + tankRight.setTextureSize(128, 64); + setRotation(tankRight, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 34); + base.addBox(0F, 0F, 0F, 16, 5, 16); + base.setRotationPoint(-8F, 19F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + pipe = new ModelRenderer(this, 0, 4); + pipe.addBox(0F, 0F, 0F, 2, 6, 6); + pipe.setRotationPoint(-1.01F, 13F, -3F); + pipe.setTextureSize(128, 64); + pipe.mirror = true; + setRotation(pipe, 0F, 0F, 0F); + middle = new ModelRenderer(this, 0, 17); + middle.addBox(0F, 0F, 0F, 16, 1, 16); + middle.setRotationPoint(-8F, 10F, -8F); + middle.setTextureSize(128, 64); + middle.mirror = true; + setRotation(middle, 0F, 0F, 0F); + shaft = new ModelRenderer(this, 12, 0); + shaft.addBox(0F, 0F, 0F, 1, 2, 1); + shaft.setRotationPoint(-0.5F, 11F, -0.5F); + shaft.setTextureSize(128, 64); + shaft.mirror = true; + setRotation(shaft, 0F, 0F, 0F); + portLeft = new ModelRenderer(this, 64, 31); + portLeft.addBox(0F, 0F, 0F, 1, 8, 8); + portLeft.setRotationPoint(-8.01F, 12F, -4F); + portLeft.setTextureSize(128, 64); + portLeft.mirror = true; + setRotation(portLeft, 0F, 0F, 0F); + tankLeft = new ModelRenderer(this, 64, 9); + tankLeft.addBox(0F, 0F, 0F, 6, 8, 14); + tankLeft.setRotationPoint(-7F, 11F, -7F); + tankLeft.setTextureSize(128, 64); + tankLeft.mirror = true; + setRotation(tankLeft, 0F, 0F, 0F); + support4 = new ModelRenderer(this, 7, 0); + support4.addBox(0F, 0F, 0F, 1, 1, 1); + support4.setRotationPoint(6F, 9F, 6F); + support4.setTextureSize(128, 64); + support4.mirror = true; + setRotation(support4, 0F, 0F, 0F); + bridge = new ModelRenderer(this, 64, 0); + bridge.addBox(0F, 0F, 0F, 8, 1, 8); + bridge.setRotationPoint(-4F, 9F, -4F); + bridge.setTextureSize(128, 64); + bridge.mirror = true; + setRotation(bridge, 0F, 0F, 0F); + tube8 = new ModelRenderer(this, 0, 0); + tube8.addBox(0F, 0F, 0F, 2, 1, 1); + tube8.setRotationPoint(-1F, 18F, 5F); + tube8.setTextureSize(128, 64); + tube8.mirror = true; + setRotation(tube8, 0F, 0F, 0F); + tube7 = new ModelRenderer(this, 0, 0); + tube7.addBox(0F, 0F, 0F, 2, 1, 1); + tube7.setRotationPoint(-1F, 12F, 5F); + tube7.setTextureSize(128, 64); + tube7.mirror = true; + setRotation(tube7, 0F, 0F, 0F); + tube6 = new ModelRenderer(this, 0, 0); + tube6.addBox(0F, 0F, 0F, 2, 1, 1); + tube6.setRotationPoint(-1F, 14F, 5F); + tube6.setTextureSize(128, 64); + tube6.mirror = true; + setRotation(tube6, 0F, 0F, 0F); + tube5 = new ModelRenderer(this, 0, 0); + tube5.addBox(0F, 0F, 0F, 2, 1, 1); + tube5.setRotationPoint(-1F, 16F, 5F); + tube5.setTextureSize(128, 64); + tube5.mirror = true; + setRotation(tube5, 0F, 0F, 0F); + tube4 = new ModelRenderer(this, 0, 0); + tube4.addBox(0F, 0F, 0F, 2, 1, 1); + tube4.setRotationPoint(-1F, 18F, -6F); + tube4.setTextureSize(128, 64); + tube4.mirror = true; + setRotation(tube4, 0F, 0F, 0F); + tube3 = new ModelRenderer(this, 0, 0); + tube3.addBox(0F, 0F, 0F, 2, 1, 1); + tube3.setRotationPoint(-1F, 16F, -6F); + tube3.setTextureSize(128, 64); + tube3.mirror = true; + setRotation(tube3, 0F, 0F, 0F); + tube2 = new ModelRenderer(this, 0, 0); + tube2.addBox(0F, 0F, 0F, 2, 1, 1); + tube2.setRotationPoint(-1F, 14F, -6F); + tube2.setTextureSize(128, 64); + tube2.mirror = true; + setRotation(tube2, 0F, 0F, 0F); + tube1 = new ModelRenderer(this, 0, 0); + tube1.addBox(0F, 0F, 0F, 2, 1, 1); + tube1.setRotationPoint(-1F, 12F, -6F); + tube1.setTextureSize(128, 64); + tube1.mirror = true; + setRotation(tube1, 0F, 0F, 0F); + top = new ModelRenderer(this, 0, 0); + top.addBox(0F, 0F, 0F, 16, 1, 16); + top.setRotationPoint(-8F, 8F, -8F); + top.setTextureSize(128, 64); + top.mirror = true; + setRotation(top, 0F, 0F, 0F); + support3 = new ModelRenderer(this, 7, 0); + support3.addBox(0F, 0F, 0F, 1, 1, 1); + support3.setRotationPoint(6F, 9F, -7F); + support3.setTextureSize(128, 64); + support3.mirror = true; + setRotation(support3, 0F, 0F, 0F); + support2 = new ModelRenderer(this, 7, 0); + support2.addBox(0F, 0F, 0F, 1, 1, 1); + support2.setRotationPoint(-7F, 9F, -7F); + support2.setTextureSize(128, 64); + support2.mirror = true; + setRotation(support2, 0F, 0F, 0F); + support1 = new ModelRenderer(this, 7, 0); + support1.addBox(0F, 0F, 0F, 1, 1, 1); + support1.setRotationPoint(-7F, 9F, 6F); + support1.setTextureSize(128, 64); + support1.mirror = true; + setRotation(support1, 0F, 0F, 0F); } public void render(float size) { - GasBottleLid1.render(size); - GasBottleLid2.render(size); - GasBottleDecor1.render(size); - GasBottleDecor2.render(size); - GasBottleDecor3.render(size); - GasBottleDecor4.render(size); - GasBottle1.render(size); - GasBottle2.render(size); - GasBottleBot1.render(size); - GasBottleBot2.render(size); - LiqBottleLid1.render(size); - LiqBottleLid2.render(size); - LiqBottleBot1.render(size); - LiqBottleBot2.render(size); - LiqBottle2.render(size); - LiqBottle1.render(size); - LiqBottleDecor1.render(size); - LiqBottleDecor2.render(size); - LiqBottleDecor3.render(size); - LiqBottleDecor4.render(size); - GasInput.render(size); - MidSection1.render(size); - MidSection2.render(size); - LiquidOutput.render(size); - MidSection3.render(size); + portRight.render(size); + tankRight.render(size); + base.render(size); + pipe.render(size); + middle.render(size); + shaft.render(size); + portLeft.render(size); + tankLeft.render(size); + support4.render(size); + bridge.render(size); + tube8.render(size); + tube7.render(size); + tube6.render(size); + tube5.render(size); + tube4.render(size); + tube3.render(size); + tube2.render(size); + tube1.render(size); + top.render(size); + support3.render(size); + support2.render(size); + support1.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index 0ccade6ec..a99f56d7c 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -75,7 +75,6 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler if(type == MachineType.ELECTRIC_PUMP) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -0.85F, 0.0F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectricPump.png")); electricPump.render(0.0560F); @@ -114,8 +113,8 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler else if(type == MachineType.ROTARY_CONDENSENTRATOR) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.06F, 0.05F); + GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); + GL11.glTranslatef(0.05F, -0.96F, 0.05F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "RotaryCondensentrator.png")); rotaryCondensentrator.render(0.0625F); } @@ -146,24 +145,24 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler else if(type == MachineType.CHEMICAL_DISSOLUTION_CHAMBER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.06F, 0.05F); + GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); + GL11.glTranslatef(0.05F, -0.96F, 0.05F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalDissolutionChamber.png")); chemicalDissolutionChamber.render(0.0625F); } else if(type == MachineType.CHEMICAL_WASHER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.06F, 0.05F); + GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); + GL11.glTranslatef(0.05F, -0.96F, 0.05F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalWasher.png")); chemicalWasher.render(0.0625F); } else if(type == MachineType.CHEMICAL_CRYSTALLIZER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.06F, 0.05F); + GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); + GL11.glTranslatef(0.05F, -0.96F, 0.05F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalCrystallizer.png")); chemicalCrystallizer.render(0.0625F); } @@ -178,8 +177,8 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler else if(type == MachineType.PRESSURIZED_REACTION_CHAMBER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.06F, 0.05F); + GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); + GL11.glTranslatef(0.05F, -0.96F, 0.05F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PressurizedReactionChamber.png")); pressurizedReactionChamber.render(0.0625F); } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java index 73f91d754..847c9f532 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java @@ -49,7 +49,7 @@ public class RenderChemicalCrystallizer extends TileEntitySpecialRenderer tileEntity.spin = (tileEntity.spin + (tileEntity.spinSpeed*0.1F)) % 1; GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - model.renderWithRotation(0.0625F, tileEntity.spin); + model.render(0.0625F); GL11.glPopMatrix(); MekanismRenderer.machineRenderer.renderAModelAt(tileEntity, x, y, z, partialTick); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java b/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java index 0c08cb083..2524e3938 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java @@ -32,10 +32,10 @@ public class RenderElectricPump extends TileEntitySpecialRenderer 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; + case 2: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; + case 3: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; + case 4: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; + case 5: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; } GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java b/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java index f1a96863e..ac2892a04 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java @@ -32,10 +32,10 @@ public class RenderRotaryCondensentrator extends TileEntitySpecialRenderer switch(tileEntity.facing) { - case 2: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; - case 3: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; - case 4: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; - case 5: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; + 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); diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 17f615a42..5354c8cf8 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -280,7 +280,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } } } - else if(type == MachineType.SOLAR_NEUTRON_ACTIVATOR) + else if(type == MachineType.SOLAR_NEUTRON_ACTIVATOR || type == MachineType.SEISMIC_VIBRATOR) { if(y+1 > 255 || !world.getBlock(x, y+1, z).isReplaceable(world, x, y+1, z)) { diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java index 373f2af47..8218d594e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java @@ -95,7 +95,7 @@ public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock configComponent.addOutput(TransmissionType.GAS, new SideData("None", EnumColor.GREY, InventoryUtils.EMPTY)); configComponent.addOutput(TransmissionType.GAS, new SideData("Gas", EnumColor.YELLOW, new int[] {0})); - configComponent.setConfig(TransmissionType.GAS, new byte[] {0, 0, 0, 0, 1, 0}); + configComponent.setConfig(TransmissionType.GAS, new byte[] {-1, -1, -1, -1, 1, -1}); configComponent.setCanEject(TransmissionType.GAS, false); configComponent.setInputConfig(TransmissionType.ENERGY); diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java index ceee8968b..7e0447554 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java @@ -11,6 +11,7 @@ import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; +import mekanism.common.base.IBoundingBlock; import mekanism.common.base.IRedstoneControl; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -22,7 +23,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntitySeismicVibrator extends TileEntityElectricBlock implements IActiveState, IRedstoneControl, ISecurityTile +public class TileEntitySeismicVibrator extends TileEntityElectricBlock implements IActiveState, IRedstoneControl, ISecurityTile, IBoundingBlock { public boolean isActive; @@ -214,4 +215,17 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement { return securityComponent; } + + @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); + } } diff --git a/src/main/resources/assets/mekanism/render/ChemicalCrystallizer.png b/src/main/resources/assets/mekanism/render/ChemicalCrystallizer.png index c4d0ff88e2e59e2191d75f909372aad568688172..a67fe178f1baffb6b26f06e58067d7b044d7e76c 100644 GIT binary patch literal 5158 zcmaKQc|4SB*#BdzlZe6*kva5cH^#mWGDZtV2$gIzV~8TS0 z7LqLyp_)dv$-a)|opCzn{Qmfzcm9~q^W1Y?-}_p=*YcTYOAAw8Zc%Ok0C+E)hgkst z8}kte|K$+#`&)S>>jx2%i9N|0=SK2(A)o;x6wVb5x`1`Tpsmm@s6d}iv>pI(ob|A= zC)t~u=^$}fB^Q>AQUDgu!UFUR0`M+KPc#YSipF?&>q{=wHcEm#Q2LT~>gLMkcw@A? z$N3-v+B(R>1{vgu)J91fKtXx|I!pj8n&biszb~Q3oq)gCWX_$`BohvW|)}=;ue0 zc^d)creg(z|GbO&rZ4GEBH?wwV1IvqC4W^V903D{XlrYOl~uqhDvC@AMPi^g$t6J1 zn<(`+0t`(=5lhQzE+ibm28Z+dJBpU> zI1-NNj>ChDjSr#*lCksfM&bO4vIjcm<~kR=i6j?qB>DnOUy_NU5D~slm6C4{i_T6PhA!ruz2RpFf_r# z4~>Eoa9GfR+d3ZqZHv)=;{DV`{kJXW{!8ss|;1~A- zU*~4*S|GB6w@C;CKD8lVXx?n<4`TZF(79K6+fzL$o=4_Byz+d1@kv_Rs~4+-2m{4s zUB7vm^~vCcdXv4CUW3B0#pc7B@$u^!dVwVs{1XAxxUY3V^*IH8^wDy!#)`sg<#Lw_ zof;i84fc14gVaCZl>V~RG4EPM`4@THm0lmM3Vr!k8Zi`yhFOem!~PyavYvWRx5RHI zi1ewo6;|Oy#4fu-Bsq%)gT7F62p^8 z*KuMb*=b|mrFK5?aC19byLYGgO8Sq-UFiBeY1a?^{r$8+%480XKu|$$>Mqo&cE8lO zV!yfJKN)J5dH9&vn^DG6hXkfE>IX+sB>8YsA)^F4reT1s-(+|94JSKyHI}?LAG3DM zbvYTj%-+W#KQ&}rpogt-^LuuhOm^ZSZ_m7lz2)wiM;3qKCnHoE-5DUR7tj5B7bYmE zMs_gQ!HB1Kxih3IMx>*?y<}H>-w0Pmq_)RhWhCW|8|-aTf4>XgKx~+7BtvqC?t zi}oyYrKuBx313?CZyrt(z~WV&dwC9ZPefQ4(FXkgw4vM8mffHahT3Vb-db!})G14Y zipt-bxE;*KgS;;kUiUg=P=2z@HVrd9KSW;o+IH>g@k~i!9VebM_qS$}q=_+0zT&P` z66DR_bP;B-wwCR{IzhHzq4!GT5^@~ky+MysjYvgulZ$|fPgFGfN|(aMS^aV}yh6Qx>6O>k7FFk*$K_V>Y>QUNEI|c4JYGC%mC()(8!1MbUgy0Z*F_G79A*^z)(M^yY$@DzRY*5ImE2){E9XWm z;#s9$NvMc+r9G<=<;L759gx$Kq70Bp+j&ztuIn9Xh-UfkRjQ# z3!8jF)V)QW*3GW&5Ambj=M5dDg^m{@#sbq_B*I-z%C~X43!~C&f7Hk$1p^m87FzUu zcpo@lnQf<6(suQnwuk^lAr04wt@uyz?ry_P`o)+%U!<5B0W}~O$z|y5fjn`s(-WaC6*qsHx zcy;OeBMQgNDa*i;W^K1{n%-)kakr~jOy^_n@u&`ou)0C>xz#nDrY7zt<=6%rz*W@b zTXC3!nH-$@78*PM5L=K)**cl>?w2Z=ujaHIebkP-w_*E4X?@f&ag_)WTOiVfr-(1S zcr&%sLL*4+qGdg2tc;C8l^`6|Qkvm-ryanP!)3Ceckdt*g~c9$^$LRawhe&m#;CcyqTD6 z4JsXUJNr=c`l}of0aIv1-mC$6rz$I)1rO)q{`|Q)BCZ5`vCt27-IO{*>34Cs8o9e% z(D-y)`s~?!!+a)PPr~wT4K@}R@d@zKWdf8O^yRwAdy|))cfUAPM9xc?Ff>i2u z?e)e3Z=cBlkhj&u?ds+7|@l$_%4+!~JKM!yW+g;<5YOcUdI%Y1*5y^W!DVmyS zIoc$dLFYP!|Mn&U{!t^&_S2WUYO4fdHi*WR^m0YLr7v1Qx@4KNK$X93n@9pl{Rl7! z*b_kLT?R{3V#g{ZnS-dZgz-xINcHP@H@$&1WvlxQ9OC|;o7naltbm?$=jxjckB4r% zH}A&luiLjPSJo`YJ;4rUn~PWv9DP^4Hgdx`es5a+hb0e&#l^`PE9$6~AuV zhxv2Ps@~zZXnC9-9ah+Qpiq zU#oLcM8Zd6o>Q+Vg$mf5aV1wEHW1&_s!3bDH0sF9=ZU52*2R`CFuE)5NQX+1m?v~utNoVct@7Z;FkPLUr>w>>Bm=;wXL`yx!L6JquuJfBE5#~{cAING;PeYuE#2$^IFAta~u=y_;d!?K+QUD>mlfu zb!kVxEWoodwK;D&x385M+?9ylt90o2?b;yZ>2CETMKHmr=6#XSOI<75@4d0{K@=U|##hWx=2)=Rt-RC4rXk$sAJMxt z)kM-S{#LRjHPz>nXSZev@e!0viW@D|6FQNc&hwIyO_fCd1|tf=$2#j!1$T-A)A~n_ z@12h2h@O33^36}qG>D$G>>pFdSPkuuGW_HHPd|LQpV1F-)^l}Z84tE{wMHZ^F{g-- z`TN3`tJD1y^X|aqPU%|0{=UDDn-Q0>lPOBK@>;p}-KKAP0+$^)lkY=CCnn!K=9i6< zQ8J`k>syg_!r&9+2|gA7+Kn+*hupgYB-n*jV<+ESmx%KK30(GpF(`h0>xJBnjGk#v zGS4AlRx9AL6mPxHnuA^nql;zZGj!>Po@yD(cct!3{XjMjO7Bki_wSs72cyF09{D{(@10tR7ki5U7o$f^IpTaa24Ns{a z^d&E@CZBcGkLv2`>kh@#SbZ}+Z3Bb6z)Xwo+?=pOpw6~UR4_w?+A>KjYW+K>w1

dR5YHtl`0$Q$moSK@@JN8xL3tt#5NxV!?Mxh1NqBGW|?yi zn}|hy{Mw)DE|!6~p0YdHpPxHxC;YHx@8<0Ow}*)NSXQAUL7_m2iK(e+jLmU;>XAQ~ zYYQEf@BTjm@0z6C2)je?aR+lJhubi=<&K_8{D;|xaiTp@1?Qnj-9tgu8mC3N*6gf* zwqIEQ5+^yMg{wb#-VwR(S=#78!z&s*CoBOeDJkEPPx6w-3_ZCgZtiy66EBVPW(A75=1_rAPRta9hc!rp+7Ex$3J?6m z++tI0U_4e6xt6tdH4WgSP$k#!`vGq*>fhJ8IJZbZ4}S_Jo6$$ zNd`Y&<7=|l4Q^BzDEA!xb>>S;l*3YzV;baV;*``}Jf6wfnP1NhSReX(7PT z=kvxgs$><#%=!sb_98it=oL1Y2w=5pT)VMFZ);5M#lJ#rU1Go(6|<#KG9--oVg%Mga(P13_i>s=1`il z;Pcwfq{|L92&xILu_wk~l8|NlxNF6k*UciKAy_6ncd*>9W8daBn?X(RMxCVAjR3~O z7I3}Tz#fw&N4GMTrT5po2MGfaH;(NlNj#eukV%nWMSS&!ZE`RC6{}!V6NJ z0u%FZ7qh}AHTO5gr&K4Xin9WemxyK$eUiynTW;_RvC0`zEhjjYrMTI;xWNbB9RtvS;%7D5 zty02`3$%-u0ywD+?N*{OK2qqdzux-ge%t>p%e7*-0iTSleo70=*Kc(EnRuz%#pC5K z<*~iBZ=1;;TVr^JFp+l%IMsv!Mn1<|j^!jjKdo@aanvC$Ul(xPR%b|Ai z+K&DUu_j^LRlO)Qo$qa0m#4~{a>bQ*-2=s+lN}laF#bHTqBpZ`TbS1s%u0dMpW-8! z8wK1A4C(0ZCh8B|PvnWrd&uIj_HsV3<#}uBg~H*#WHg<+XJG50{An-P!&W;M;o`5= z?Ng%z?@o%iCA5e{^}#&c`z!gQx*z=>-Pu;Y*&{&~2>DTyscFNpQRvs#QxdTAhwIs4 zLb{VgmJdU73kxZgj(Sicd0Z;7Ri-9c@AqYe!gg0NzbSt_e|Lasy&%7Wm~fy}5#D5s zwR3$O->ays86Uyj1%J@u;P2n#eoFV!E4oVb(NBe8b|*8jC58_XqH^Ox+DTK1DoLF4 z=jZD^ye(74y|igYG!vQuO_%n7cF}(3wYxb@yBg^)Y!#g`NM5wtUJdcJ9F)FS_rUPl zhiH{K=|x=PSYd#yxrcm*qN26v-Y6 zymSNJlq2-%>mO9vwy((c6usOI_oTTja`Xk=^fT7%!wT$Bg!k;1ETENKw(LaM<}W=F z0&w%`;U8*%^~L%$SD7@{%|;3hY)d9T-p-nT>`B(yX`*-ke#C7Kc<#eiF%u2|z|h(l zRU;qZTE@K+eyxjPe#HVE$&Vx|$!X^jsshd6Tu>}jLYPWNG=tBDodPUH_Ktwb-$4iy z_z7SI9n4KUr-pTQ9+fV47}d6)ZxL$2`@Sfi%BTD_F7w-4*)`+!g30i>v72#5rspJu zvghM*ys&fpF=r=^Z>o{n#%*)+Nq45plZK|IsfilTJbBNBAN))<_+8`eAxk%zKO0kS zYfsLC) z;b1v0qS5T!G@p&GW;Qs80tUF7#E{g-o`wan#u`7qTBwj5Nr%H0vcOexLg78(oWnJWqSZHMSCF)5``Fv0Rq1~%|*HBya-Q)zP)_! zA}nYr%YWb<%wFYCw1YU<8lkZITzSoMddnR!3|5_ziCYdd@2^BNk>bw)&;|q)2 zLO!47LU$dD>1C3T=wlztK&dk#ug-{|b4A5pv1K4QBR!!Pq?P<>r7w?nhgoHpi1i-~ zc-7t@<(E^W<%8Aw&MQW>suqAvK=p~Od;$EP8+t;t-ly5PB^AwVG0>MM*mqk$SEg!V zuSRFQ1OAj`5QeRCL!9HaU_6H*46I|rZjn9lMs?drlx!7R&rYu zH_EHr0F8Fcv-XQjK-L@}I#?HB4DF)5)9GwEm~Y_#M^}Z72?&1}dXXuxvqMW9)zug! zpBsERf%t0Ow~=MERMp6%f$4`og0BD!6WkI8`T5%3d#VX)la@^-*uAD9Ivn=vdJzSoV@2-V4Q(MvEo~8 z#^7L}{CDm6EMIDy&_VlTQf+I{fk@GnO@kJ%%4}9n@!-)0pxSIl$C7-IS)jnikw7V)A47UGt3dhca1hp8yQ;IxL>VS*r(}$= z(>A06eCUEzld-ng)OFxB?^V%VC*i5B?;iyY>7hyUN{^6DbA|NK2;;+Exf;nS+M3pF zoDxr6{{qy}6aY<^`q)|WVF6j^Rpd?mc>_zo3|H~I1k)((3=*SBDyoNvHSIH6pMy?^9P8BANDO!n;y|WTE zf+4W2asE~2)S}N9SIEQD5>Mc{t^C58sko`YB(@n?^~6AspJNwMn^U*tu;|68PE>mZ z4wHk%L+(Dpq0Q%7hpLo!m(&|KLt@gg_i|J)K?(|{3dJL=IqV%%UbAP8WdM2V0ZCDfOyfrJhP5 zefXYwlf}c;Z@5jKD!L#O00(uykCHlLFoZuX_Z+{Tbn-s%2rAW>PWO^ymx{p{w@T*g ziD+GQlDJBhu(5zSlA`Ih-kb&bw*fUzFa?G$r(pR4wK61@U-aV;0*un-RuO^Dzn)7K zC9y146iODAI2NWva8(TRh;T$vP`swA48ZZWj&j>+l04V~xa2#)9hq$$*b2`apXf1N zxtIg}fKUlVNUxlviK;|OO9;A#-C4;~87M1kcnmn{qTpgA)*_zeSjz6>T*0ww*|i;k z&`hEp$$H0wWf2CXBo2vPc{blnE#D)?QzQ%WjLrE?$5;;`7OMQXUi>5k5=0TClYR~> zS()cY6_8oo5{L9mvG}nP>9e}bPTPa;z)}yZ08fAP`Sf~7E6MImfi?qnd!=A0vZEYr z@C$fVY;29`@FjC?JZ08UnMe{{lgVr(TUIo^JBHKSR;<_H7efLLrUXf!HWsq>xZo@q z7sNZe@d44-2F$%A4=yV$bd@;B|M@1;aJA+7BBB_3|9)2Ob9t$N@gbY#>e>Zk%6rmD zjxv=@N`sK90Apc~nQEu(TjCB4T>yeO*Up{DU(rEv$eXk89Z)v)sdp$hB4{laY2r>c z76I4*QSzNbgB>aA_4bL)8B!f&wd}_b`ATd>e|KVOLH+6kPk){iOfbOzT^#|Uj^8bc z6S~z2r_VK@j5m@_;!lSE=O;j&A0G*h_(8W(Jg_ z17RZJ8t1$I^pomy@fp%W zNpXMc?G3klxxEZ=jsXB}8pyrIF>l5p|DD;Ai6o4u0*_MWBZ~ML5~z8~ZxUohl^* z%V2H2WJ-#%Hi)ZCH?+)bD#&mqedSuwQla|%@CzVzxrx5YE)$BC??`=g#pV6W8FeJ` zE0KVA2Df8uZvq1W-W!uBK|Y%;*-0O};@=H^e-{46Gi?d?F7HRB?gPb*#6yUv^eNJW1s?;su6+u$anMb#P6rQv=gKHOSd?(Im>e=y1y`& z$BHQoTbmapmbDBKU)o#cgdfVdIv?d8TydGDs2yX?+TTVU^8|4O?c<*LdZ8}{s~_~| z=?Tn9*^naV78M!4spS+Op59l9r?;^ag~aHEGBq9G>|x1e1$xI%t`v|S)>A^P=J%Qd zqMNTH+?_$2i*c^E7@FiK@8;bIzCq~xk>~VyHd|i252vxtrt(EOc2PXol@8+(W8G_! zo0L&cy0A+Xer_O$KNx{TM>acxvOm>Td4JyTw>h0WTGiUP+0B|mexVT6eq(lfY%Mn? zC*Ww4-14%A3)U0CUO-ET=T~^p5`@wDmR(+(d<~N2n0H}sM3Z3DT?3QT1#6y-yx+b9 zzambf7Nt^V;vWblAIG2OZTN4X`OPl;m~4xvPhkEhisMx~Ix%UoX~)h7yVb;t3{^}b z8qXKFSDZpv>rPtOe)Y4c>K_h8p7I3Qso9e5p&NJZUL#!fwR5PVjhUir=k zf+NGr9M*l_*XloBcLeTCael98jWfG085!z<3EeZe79Kt264Q(XKPY!Gh{^QQ_|3E5 zFQpJFw&g8~WnW>X_Rj|pFFcZNtTyWSNWJ4eyRUKFE6Ew5fk}a1-Eydd@x1y+At{wV zN3~OKyz76S!~r*Wg_S7t%PRn$FlWH1q%w6KXp z4U69%?z##1q+8Jjct?$F|4!QPA;?wrGvn&NFnXfM=(F*=YOzxak*WktjSQu{@rG5k z>M4XT`7K=!ji4cGj`F)D%abeLDHB8_{~k>76ux%rAJ=wvZ8b%anE64fgwP;w;GGwO1bduRseMk9aMlsXXxkUS>CDpx@1_7b6V&#TeGz%t z6~Wm}Rd}KaRejtDJLfi-{(Lzh9Vt!bD5It+_gQ|pK-ko_ArcQ-*X_Zv=Yx9B9x`-e za{>>Z0X3`65BZ^kE}*?r`TeF~!{IbDOL@uDe89n(T0e$mzMu0*Z`|=}x}o1_=e&+Q zPmdVx^v_Dx1o61T%erH$!3lnE%4LAeZL${xK=YL-tJKp>=XSNUM6LXT?Ql%;tJ$vw~R*1oZ&y$ z3}k+Sb;3#kbEzYbz@Jr{LHa*G>|tWiv4Q8{9j#o#`WMddPbDkFo`OBju9Cl0$rJPx wS_&}o%vUlHju*BCc3v-Q`(JARO{$$Tp!9>bA4WZH_~%zuTSFI9tY#bhe^X#KasU7T diff --git a/src/main/resources/assets/mekanism/render/ChemicalDissolutionChamber.png b/src/main/resources/assets/mekanism/render/ChemicalDissolutionChamber.png index 7b1e34027b91469b0d0ac37af85ec16a699721f6..250669e6205dfeb3bf47c3e4bd2026ceacd87465 100644 GIT binary patch literal 5995 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 J_>|Ap{{fllQC=RW0GBpK-53C1 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 diff --git a/src/main/resources/assets/mekanism/render/ChemicalWasher.png b/src/main/resources/assets/mekanism/render/ChemicalWasher.png index 34e4e5cb18f833b08945ddcab449ca09fe406da7..b332e7c848864e66c327d676768b32c4f5bddae6 100644 GIT binary patch literal 5820 zcmbtYXIxX+x4i*G6cmtAq(^YT21y`vLg?s7QBeUwdVok8JrF}^3XYP9jZr{A6bk}M zR|ts|!C@#WO#(q`RJuR{hL9JX^8bH$^S-=%$nV^fz1CiPpLOp!H3T7oTzW+DPCD#{;B#A0xfW<-SM4_-6T`1>?O z6Z|72Dh#3drzj8SV_;i+1PW}ZXQUelgTcVYrg|_#69aw2LtuR<%n$-Kg}|V?P?#AE zYNihb|Mk%nWs3+3HalVG@K-L;6+$yKDvDqRfyBnf>ctx9;UhvIFjG@g2vi@UudgeL z(2b14MfnqTagkboGuWXb10&FcC^Q}i{?6zhfRBzsXo{5nSpt^u4=pb8uQrJq1|j+r zATT}X_mch&bawu~L$TO@q9dbDp#G!xeDJ&mD~m!pBDL|ABFKHamigjPl0?qK?=hG({|W zXmpU7zAeL z#eTN~mLSS(hl)VQpn@DC@L2GVvdz%{ss-louY7-DgZ^C$^k1GL#r?0v{(DN~ zpzp(ftSh?s$NVUq$ng;(Yj4{hDY|164jr+xK1m#$IeV6N^3<+b$xW%+!w$BZTaDny z?`iMO#-%&!Q<6-SG|n##*Q_aY)-9r6cm7fTxG8^0d`c^P$4ix+wqxRLX>hFmoqbz1 zxAqWl6>XO7^lA2!m%XQING10p`KN~?yB>Q*bA3p8be>Y~-MhF989B!K*Q4R8YHGUF z8vIBnyLCF-2>UxVc5Y}tHFlmIUAFm5$t_Y|N49YYPwAvkgR;IDTE~g})Lk%EOA&62 zt+r{=g2w9!qc-hqd_+Vb5O`fZ35@Z!fG>b7D$P4Xn7$s%*mKs}X9 z)ZlnkWA;;h&o9~+9hdB-^m0=8(D%&M)%eiE>Lad5!HtZEzQiRSLuoD4A033_F0?sb zmez_isAyShH+ZilJZnM!7H^hEk8L2tPc#X=%c|(zav<^H$-p_I|1A>p%d%|7uYB93v05^pJGMGbL%vkrohRF0=&Nc@wzRNR)$+Cbu=+*v z^=-JJHeUItnRfLx>f?F1&y_uB!iK0liWA~;7n4DUEag0oq?0;(;05oe(dGTaKA}?L zer2X`EetM{!0odgv#qeda}^uUWk(8)@$5rX^O%`7IFeNOc4M$AOz%3A{L0T`e96Ri z3z@-)^5}uNvpJ9P$|_Ih#!)t5Sigdf1**SkHI z?opOo$1m2XF;@w`A1^5Sw9U1Ki~V7>YU)?dT$%1?4XzHkGN7>&gwbbB%~jV;$<@n( zj}{*mqH7eJfmDzIAf@Sa(q!%$^k}ky;DTkMI!k(+Kk)SSYMW72@A|E+<-x%$4Nm54 zm(f1Q-{J%$!ACMw8Y*x1F-hqeHsK>P>8aY71eB_icV1sbmhX_bxOi!7m0@n~PFAit z&1V_M@HT1}EsS`Rq-NqZN#QiIGgF3h!#v`?N?i$vRhX)yTF|!fac<(Mj zMaMRl+8w3h?K7wl6}9=4J^31Q!kG^h2n6Hy?b|aAM~@yA7g)Z^-=QmfKccs5yz%}f zRI70Hu3NV(U;8B%0`HLseYmnlaRnBd-Tm4Um6(lVZRV8Kv+}R`UlDs&-ac+=^vY9> zK}S5~ae_m(e!JW0x-p$sRjqiS^Le2ot=d9G@9Q1g$Z(nX-Zmpi_>w`Fg_|nl+m~XD z>Sxty2KQ45-|I{|*VSUNS={kNqsXH^s_v&xmnU>19e0(>CTe{q-UN;NOM*IL#$RVV z6}nok-Ph?gG&j#CTT4qzi=Vo%o7VcrOyoX(ZZs>QJI_}pUseV%LZ+pRZ4N-R%)oX@ z6l4JDUwcit7T1_`7yZM;Y{uQ!$R%P?` zAqHhT^3~=PRz|`$ELd#6s9|YzxYKpblzs~{yPQ_#b5u}L?c6_39{BWm1+M-Zs85GkEaUxovr}RP z;2G%{zEu^^lu0D(TAf{+r?WXdkKN9qneM*is!6h5u(~Qt2|+85nQ!3Fg+ds{{^?49 zPU66^WAm3Mdc|n_Wy}>G9Tc98Tefi(1K-)}ZCj@Iv03$rB{MV72j*zHkVBl5=>+%R^=}Fuy>W+A3L|;*wyM}U)e&Qob zU{I$cx%+tWTCI(oqeR3kqP|mR&y$zZc_3F|0nHZ?i+PqKV6{i2FlVL+-QaZ*2Rw?uPkS2yL?NzbX7Y?&@|1JWzQ9@0$=7;!nmchm#MgJ*TBmATuhTdSbynGZLzUAa-8&Z|k=j zZL*(7c1SYdo1!Nf2WdW^(!*uj=a|QXR9e4|=PZdm-E#balZR51e}_8i=FQ$=8YX}p z`K)xN&S(BT)@UfKj6O9bMktly{KDkUR}S;%86#QVi5a&{jFx4rMy{^8|#&d^&FCCbcVKo^6{-XR0liXV3SPbwpEB!622jFXA zJAkY8B<_qS9drugk2k=W_-sq(z6jwcbe4I)xQ2dYy)v?Yio;ZP7RWqDgUXvQO zm8dBhctES_CC2?R!QcLq!t>#&HN2%R zB!ueb=GG#gi8n#U&UuID2kvbP8!H#3pk}e_yAHH%26v}=(gyX=&-$KEr_3=9ht8t^12o#6il_|MWz`zVp&dpcS(bg{K zt;Gke*gv0=_efcgEy2*3xYo;0ZK0V@R2=Q9tEz6&H(tPvkUHk0Pb?sHX$4t9%}#rM zfAEa#b@7!TpN(uiNH7=GD}})nS9unb>Qri2GnG!_jt2ps0(t7O$}35?FDaVMk|hfY z!~owh?kvlIWmNtkd^<}6HhKICxw6DqNQfghe6RQNbnMK)=(&jM+_;BocLzK+rGKlL ztSSjcZBs_*B0t=!Plb};d)ljOsM>q+Rl_b&qEkz|!our;LBD%oz#~T8{x{GwL7WE3r=J#6f%4i}9o4&Gt_I-)19cg^IByG|%JEZ@ zKhFLqGDI&`U@6-+;F(@WW^A{gcZw`?g~XeS#tK8-9D;$jX3@PHb#(PpX(Tnsc{!9o z`Ujw?1;`)0%IFMxiD?(FclQZmiPv|k)4Pf#Q37LBz38b2mTEj!5F)#Bu&n-FxiaK; z$%*IyNHzVJy6ZZwT=>-I&!77o)=ORTEK7Vzn=qBAV=%yapv^MT2M=TjmfyRE+{p>- zme)x+;Q^S-_tg-yAcWN#3>&L>+!{<)i{CWU`zG6x&$6+ z?d#<01a~_8G$QfbF@%WNh$;)PR}my`P_=Q4zXFkFlU6ib73Ln^{L*s1B<)GP zFGUdDhb!Ul{Ijh4MAKcu^|hszMP`zCi~KwU0tr#h4qF{nttBo7grDbr2&v!`>Z<14 z{}jJNe4re4G}vvPO|LTv==U9%BC09xWS_vv;`tL3LBa2rO6yX-{1trdp8Zn<=1W+A zDN1>_@-C8;i<47Oe<1>XsI-Y+D_b@q`^5LpW*z?Z8t++CyczWwz2NwZ6SDIYDJ$`n zDZ$jil4wTq_Xk|^)t?Tzv#lpo%d(rM)HO7^O4B4?uiZ8X`Bkfaja7|3NL`qU{9_~k z+n*T&X-|t&sfsZ86k#0dsG{l`O*zDoy`37!Kzt;W7 zfItzp&ip4U+~MZWI#K~ZGWakcl?(=frIIB??%(nMn`pFJpnxQS_Q#|q@N>tQ@Bb$s Mv3Id6wed^-9~C&y`2YX_ literal 7088 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 XrKBY8PR8heA9A|)^tB2!tV8|>i{P-y diff --git a/src/main/resources/assets/mekanism/render/ElectricPump.png b/src/main/resources/assets/mekanism/render/ElectricPump.png index f881af1fe17ccddbe2ca2fec6e3dad5f83463814..eb8209e46400b76ecc1d4de614f43e6154ecdfee 100644 GIT binary patch literal 6249 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 literal 3253 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 a->36L=R@hufDZmI2Ef(|VM#IfO87VIltu*r diff --git a/src/main/resources/assets/mekanism/render/RotaryCondensentrator.png b/src/main/resources/assets/mekanism/render/RotaryCondensentrator.png index f0f8e3574322ba3e96afd2b9882bef73c72e06cd..0a1e540843e7f50068db3f0fe29715a745331301 100644 GIT binary patch literal 7349 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 literal 3702 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 Date: Sat, 2 Apr 2016 10:23:32 -0400 Subject: [PATCH 34/62] models --- .../client/model/ModelChemicalInfuser.java | 552 ++++++++---------- .../client/model/ModelElectricPump.java | 4 +- .../client/model/ModelFluidicPlenisher.java | 244 ++++---- .../mekanism/client/model/ModelLaser.java | 314 +++++----- .../client/model/ModelSeismicVibrator.java | 488 ++++++++++++---- .../model/ModelSolarNeutronActivator.java | 405 +++++++++++++ .../render/block/MachineRenderingHandler.java | 20 +- .../tileentity/RenderChemicalInfuser.java | 176 +----- .../tileentity/RenderChemicalOxidizer.java | 112 ---- .../tileentity/RenderSeismicVibrator.java | 26 +- .../RenderSolarNeutronActivator.java | 18 +- .../tile/TileEntitySeismicVibrator.java | 9 +- .../client/model/ModelSolarGenerator.java | 66 +-- .../assets/mekanism/models/solar_tri.obj | 513 ---------------- .../mekanism/render/ChemicalInfuser.png | Bin 4115 -> 5160 bytes .../mekanism/render/FluidicPlenisher.png | Bin 2414 -> 4582 bytes .../assets/mekanism/render/Laser.png | Bin 6074 -> 3223 bytes .../mekanism/render/SeismicVibrator.png | Bin 10340 -> 8205 bytes .../assets/mekanism/render/SolarGenerator.png | Bin 3791 -> 4561 bytes .../mekanism/render/SolarNeutronActivator.png | Bin 15952 -> 6657 bytes 20 files changed, 1351 insertions(+), 1596 deletions(-) create mode 100644 src/main/java/mekanism/client/model/ModelSolarNeutronActivator.java delete mode 100644 src/main/resources/assets/mekanism/models/solar_tri.obj mode change 100755 => 100644 src/main/resources/assets/mekanism/render/ChemicalInfuser.png mode change 100755 => 100644 src/main/resources/assets/mekanism/render/FluidicPlenisher.png mode change 100755 => 100644 src/main/resources/assets/mekanism/render/SeismicVibrator.png diff --git a/src/main/java/mekanism/client/model/ModelChemicalInfuser.java b/src/main/java/mekanism/client/model/ModelChemicalInfuser.java index b7e2b8329..24413cb7c 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalInfuser.java +++ b/src/main/java/mekanism/client/model/ModelChemicalInfuser.java @@ -1,339 +1,255 @@ package mekanism.client.model; -import mekanism.client.render.MekanismRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelChemicalInfuser extends ModelBase { - ModelRenderer Base; - ModelRenderer GasExit; - ModelRenderer GasLeft; - ModelRenderer GasRight; - ModelRenderer MachineCore; - ModelRenderer TopPanel; - ModelRenderer SidePanel; - ModelRenderer LPanelNW; - ModelRenderer RPanelNW; - ModelRenderer RPanelNE; - ModelRenderer LPanelSW; - ModelRenderer RPanelSW; - ModelRenderer RPanelSE; - ModelRenderer LPanelNE; - ModelRenderer LPanelSE; - ModelRenderer LTopS; - ModelRenderer RTopN; - ModelRenderer LTopN; - ModelRenderer RTopS; - ModelRenderer RTopW; - ModelRenderer RTopE; - ModelRenderer LTopE; - ModelRenderer LTopW; - ModelRenderer FrontPanel; - ModelRenderer FrontConnection; - ModelRenderer RightConnection; - ModelRenderer LeftConnection; - ModelRenderer LGlassT; - ModelRenderer RGlassT; - ModelRenderer LGlassS; - ModelRenderer RGlassS; - ModelRenderer RGlassN; - ModelRenderer LGlassN; - ModelRenderer LGlassL; - ModelRenderer RGlassR; - ModelRenderer RGlassL; - ModelRenderer LGlassR; + ModelRenderer base; + ModelRenderer tank2; + ModelRenderer portRight; + ModelRenderer portBack; + ModelRenderer portLeft; + ModelRenderer tank1; + ModelRenderer portFront; + ModelRenderer tank3; + ModelRenderer pipeAngle2; + ModelRenderer connectorAngle; + ModelRenderer pipe2; + ModelRenderer connector; + ModelRenderer compressor; + ModelRenderer tube10; + ModelRenderer tube8; + ModelRenderer tube9; + ModelRenderer tube7; + ModelRenderer tube6; + ModelRenderer tube5; + ModelRenderer tube4; + ModelRenderer tube3; + ModelRenderer tube2; + ModelRenderer tube1; + ModelRenderer pipe1; + ModelRenderer pipeAngle1; + ModelRenderer exhaust4; + ModelRenderer exhaust3; + ModelRenderer exhaust2; + ModelRenderer exhaust1; - public ModelChemicalInfuser() + public ModelChemicalInfuser() { textureWidth = 128; - textureHeight = 128; + textureHeight = 64; - Base = new ModelRenderer(this, 0, 0); - Base.addBox(0F, 0F, 0F, 16, 1, 16); - Base.setRotationPoint(-8F, 23F, -8F); - Base.setTextureSize(128, 128); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - GasExit = new ModelRenderer(this, 0, 17); - GasExit.addBox(0F, 0F, 0F, 6, 6, 1); - GasExit.setRotationPoint(-3F, 13F, -8F); - GasExit.setTextureSize(128, 128); - GasExit.mirror = true; - setRotation(GasExit, 0F, 0F, 0F); - GasLeft = new ModelRenderer(this, 64, 0); - GasLeft.addBox(0F, 0F, 0F, 1, 6, 6); - GasLeft.setRotationPoint(-8F, 13F, -3F); - GasLeft.setTextureSize(128, 128); - GasLeft.mirror = true; - setRotation(GasLeft, 0F, 0F, 0F); - GasRight = new ModelRenderer(this, 64, 0); - GasRight.addBox(0F, 0F, 0F, 1, 6, 6); - GasRight.setRotationPoint(7F, 13F, -3F); - GasRight.setTextureSize(128, 128); - GasRight.mirror = true; - setRotation(GasRight, 0F, 0F, 0F); - MachineCore = new ModelRenderer(this, 0, 24); - MachineCore.addBox(0F, 0F, 0F, 10, 11, 5); - MachineCore.setRotationPoint(-5F, 12F, -4F); - MachineCore.setTextureSize(128, 128); - MachineCore.mirror = true; - setRotation(MachineCore, 0F, 0F, 0F); - TopPanel = new ModelRenderer(this, 0, 40); - TopPanel.addBox(0F, 0F, 0F, 2, 1, 8); - TopPanel.setRotationPoint(-1F, 11F, -3F); - TopPanel.setTextureSize(128, 128); - TopPanel.mirror = true; - setRotation(TopPanel, 0F, 0F, 0F); - SidePanel = new ModelRenderer(this, 30, 17); - SidePanel.addBox(0F, 0F, 0F, 2, 11, 1); - SidePanel.setRotationPoint(-1F, 12F, 4F); - SidePanel.setTextureSize(128, 128); - SidePanel.mirror = true; - setRotation(SidePanel, 0F, 0F, 0F); - LPanelNW = new ModelRenderer(this, 78, 0); - LPanelNW.addBox(0F, 0F, 0F, 1, 15, 1); - LPanelNW.setRotationPoint(-6F, 8F, 1F); - LPanelNW.setTextureSize(128, 128); - LPanelNW.mirror = true; - setRotation(LPanelNW, 0F, 0F, 0F); - RPanelNW = new ModelRenderer(this, 78, 0); - RPanelNW.addBox(0F, 0F, 0F, 1, 15, 1); - RPanelNW.setRotationPoint(1F, 8F, 1F); - RPanelNW.setTextureSize(128, 128); - RPanelNW.mirror = true; - setRotation(RPanelNW, 0F, 0F, 0F); - RPanelNE = new ModelRenderer(this, 78, 0); - RPanelNE.addBox(7F, 0F, 0F, 1, 15, 1); - RPanelNE.setRotationPoint(-2F, 8F, 1F); - RPanelNE.setTextureSize(128, 128); - RPanelNE.mirror = true; - setRotation(RPanelNE, 0F, 0F, 0F); - LPanelSW = new ModelRenderer(this, 78, 0); - LPanelSW.addBox(0F, 0F, 0F, 1, 15, 1); - LPanelSW.setRotationPoint(-6F, 8F, 5F); - LPanelSW.setTextureSize(128, 128); - LPanelSW.mirror = true; - setRotation(LPanelSW, 0F, 0F, 0F); - RPanelSW = new ModelRenderer(this, 78, 0); - RPanelSW.addBox(0F, 0F, 0F, 1, 15, 1); - RPanelSW.setRotationPoint(1F, 8F, 5F); - RPanelSW.setTextureSize(128, 128); - RPanelSW.mirror = true; - setRotation(RPanelSW, 0F, 0F, 0F); - RPanelSE = new ModelRenderer(this, 78, 0); - RPanelSE.addBox(0F, 0F, 0F, 1, 15, 1); - RPanelSE.setRotationPoint(5F, 8F, 5F); - RPanelSE.setTextureSize(128, 128); - RPanelSE.mirror = true; - setRotation(RPanelSE, 0F, 0F, 0F); - LPanelNE = new ModelRenderer(this, 78, 0); - LPanelNE.addBox(0F, 0F, 0F, 1, 15, 1); - LPanelNE.setRotationPoint(-2F, 8F, 1F); - LPanelNE.setTextureSize(128, 128); - LPanelNE.mirror = true; - setRotation(LPanelNE, 0F, 0F, 0F); - LPanelSE = new ModelRenderer(this, 78, 0); - LPanelSE.addBox(0F, 0F, 0F, 1, 15, 1); - LPanelSE.setRotationPoint(-2F, 8F, 5F); - LPanelSE.setTextureSize(128, 128); - LPanelSE.mirror = true; - setRotation(LPanelSE, 0F, 0F, 0F); - LTopS = new ModelRenderer(this, 82, 0); - LTopS.addBox(0F, 0F, 4F, 3, 1, 1); - LTopS.setRotationPoint(-5F, 8F, 1F); - LTopS.setTextureSize(128, 128); - LTopS.mirror = true; - setRotation(LTopS, 0F, 0F, 0F); - RTopN = new ModelRenderer(this, 82, 0); - RTopN.addBox(0F, 0F, 0F, 3, 1, 1); - RTopN.setRotationPoint(2F, 8F, 1F); - RTopN.setTextureSize(128, 128); - RTopN.mirror = true; - setRotation(RTopN, 0F, 0F, 0F); - LTopN = new ModelRenderer(this, 82, 0); - LTopN.addBox(0F, 0F, 0F, 3, 1, 1); - LTopN.setRotationPoint(-5F, 8F, 1F); - LTopN.setTextureSize(128, 128); - LTopN.mirror = true; - setRotation(LTopN, 0F, 0F, 0F); - RTopS = new ModelRenderer(this, 82, 0); - RTopS.addBox(0F, 0F, 4F, 3, 1, 1); - RTopS.setRotationPoint(2F, 8F, 1F); - RTopS.setTextureSize(128, 128); - RTopS.mirror = true; - setRotation(RTopS, 0F, 0F, 0F); - RTopW = new ModelRenderer(this, 90, 0); - RTopW.addBox(0F, 0F, 0F, 1, 1, 3); - RTopW.setRotationPoint(1F, 8F, 2F); - RTopW.setTextureSize(128, 128); - RTopW.mirror = true; - setRotation(RTopW, 0F, 0F, 0F); - RTopE = new ModelRenderer(this, 90, 0); - RTopE.addBox(0F, 1F, 0F, 1, 1, 3); - RTopE.setRotationPoint(5F, 7F, 2F); - RTopE.setTextureSize(128, 128); - RTopE.mirror = true; - setRotation(RTopE, 0F, 0F, 0F); - LTopE = new ModelRenderer(this, 90, 0); - LTopE.addBox(0F, 0F, 0F, 1, 1, 3); - LTopE.setRotationPoint(-2F, 8F, 2F); - LTopE.setTextureSize(128, 128); - LTopE.mirror = true; - setRotation(LTopE, 0F, 0F, 0F); - LTopW = new ModelRenderer(this, 90, 0); - LTopW.addBox(0F, 0F, 0F, 1, 1, 3); - LTopW.setRotationPoint(-6F, 8F, 2F); - LTopW.setTextureSize(128, 128); - LTopW.mirror = true; - setRotation(LTopW, 0F, 0F, 0F); - FrontPanel = new ModelRenderer(this, 0, 49); - FrontPanel.addBox(0F, 0F, 0F, 8, 9, 1); - FrontPanel.setRotationPoint(-4F, 13F, -5F); - FrontPanel.setTextureSize(128, 128); - FrontPanel.mirror = true; - setRotation(FrontPanel, 0F, 0F, 0F); - FrontConnection = new ModelRenderer(this, 0, 59); - FrontConnection.addBox(0F, 0F, 0F, 4, 4, 2); - FrontConnection.setRotationPoint(-2F, 14F, -7F); - FrontConnection.setTextureSize(128, 128); - FrontConnection.mirror = true; - setRotation(FrontConnection, 0F, 0F, 0F); - RightConnection = new ModelRenderer(this, 98, 0); - RightConnection.addBox(0F, 0F, 0F, 2, 4, 4); - RightConnection.setRotationPoint(5F, 14F, -2F); - RightConnection.setTextureSize(128, 128); - RightConnection.mirror = true; - setRotation(RightConnection, 0F, 0F, 0F); - LeftConnection = new ModelRenderer(this, 98, 0); - LeftConnection.addBox(0F, 0F, 0F, 2, 4, 4); - LeftConnection.setRotationPoint(-7F, 14F, -2F); - LeftConnection.setTextureSize(128, 128); - LeftConnection.mirror = true; - setRotation(LeftConnection, 0F, 0F, 0F); - LGlassT = new ModelRenderer(this, 36, 17); - LGlassT.addBox(0F, 0F, 0F, 3, 1, 3); - LGlassT.setRotationPoint(-5F, 8F, 2F); - LGlassT.setTextureSize(128, 128); - LGlassT.mirror = true; - setRotation(LGlassT, 0F, 0F, 0F); - RGlassT = new ModelRenderer(this, 36, 17); - RGlassT.addBox(0F, 0F, 0F, 3, 1, 3); - RGlassT.setRotationPoint(2F, 8F, 2F); - RGlassT.setTextureSize(128, 128); - RGlassT.mirror = true; - setRotation(RGlassT, 0F, 0F, 0F); - LGlassS = new ModelRenderer(this, 48, 17); - LGlassS.addBox(0F, 0F, 0F, 3, 14, 1); - LGlassS.setRotationPoint(-5F, 9F, 5F); - LGlassS.setTextureSize(128, 128); - LGlassS.mirror = true; - setRotation(LGlassS, 0F, 0F, 0F); - RGlassS = new ModelRenderer(this, 48, 17); - RGlassS.addBox(0F, 0F, 0F, 3, 14, 1); - RGlassS.setRotationPoint(2F, 9F, 5F); - RGlassS.setTextureSize(128, 128); - RGlassS.mirror = true; - setRotation(RGlassS, 0F, 0F, 0F); - RGlassN = new ModelRenderer(this, 48, 17); - RGlassN.addBox(0F, 0F, 0F, 3, 14, 1); - RGlassN.setRotationPoint(2F, 9F, 1F); - RGlassN.setTextureSize(128, 128); - RGlassN.mirror = true; - setRotation(RGlassN, 0F, 0F, 0F); - LGlassN = new ModelRenderer(this, 48, 17); - LGlassN.addBox(0F, 0F, 0F, 3, 14, 1); - LGlassN.setRotationPoint(-5F, 9F, 1F); - LGlassN.setTextureSize(128, 128); - LGlassN.mirror = true; - setRotation(LGlassN, 0F, 0F, 0F); - LGlassL = new ModelRenderer(this, 0, 65); - LGlassL.addBox(0F, 0F, 0F, 1, 14, 3); - LGlassL.setRotationPoint(-6F, 9F, 2F); - LGlassL.setTextureSize(128, 128); - LGlassL.mirror = true; - setRotation(LGlassL, 0F, 0F, 0F); - RGlassR = new ModelRenderer(this, 0, 65); - RGlassR.addBox(0F, 0F, 0F, 1, 14, 3); - RGlassR.setRotationPoint(5F, 9F, 2F); - RGlassR.setTextureSize(128, 128); - RGlassR.mirror = true; - setRotation(RGlassR, 0F, 0F, 0F); - RGlassL = new ModelRenderer(this, 0, 65); - RGlassL.addBox(0F, 0F, 0F, 1, 14, 3); - RGlassL.setRotationPoint(1F, 9F, 2F); - RGlassL.setTextureSize(128, 128); - RGlassL.mirror = true; - setRotation(RGlassL, 0F, 0F, 0F); - LGlassR = new ModelRenderer(this, 0, 65); - LGlassR.addBox(0F, 0F, 0F, 1, 14, 3); - LGlassR.setRotationPoint(-2F, 9F, 2F); - LGlassR.setTextureSize(128, 128); - LGlassR.mirror = true; - setRotation(LGlassR, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 5, 16); + base.setRotationPoint(-8F, 19F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + tank2 = new ModelRenderer(this, 0, 21); + tank2.mirror = true; + tank2.addBox(0F, 0F, 0F, 6, 11, 6); + tank2.setRotationPoint(1F, 8F, 1F); + tank2.setTextureSize(128, 64); + setRotation(tank2, 0F, 0F, 0F); + portRight = new ModelRenderer(this, 0, 38); + portRight.addBox(0F, 0F, 0F, 1, 8, 8); + portRight.setRotationPoint(7.01F, 12F, -4F); + portRight.setTextureSize(128, 64); + portRight.mirror = true; + setRotation(portRight, 0F, 0F, 0F); + portBack = new ModelRenderer(this, 0, 54); + portBack.addBox(0F, 0F, 0F, 8, 8, 1); + portBack.setRotationPoint(-4F, 12F, 7.01F); + portBack.setTextureSize(128, 64); + portBack.mirror = true; + setRotation(portBack, 0F, 0F, 0F); + portLeft = new ModelRenderer(this, 0, 38); + portLeft.addBox(0F, 0F, 0F, 1, 8, 8); + portLeft.setRotationPoint(-8.01F, 12F, -4F); + portLeft.setTextureSize(128, 64); + portLeft.mirror = true; + setRotation(portLeft, 0F, 0F, 0F); + tank1 = new ModelRenderer(this, 0, 21); + tank1.addBox(0F, 0F, 0F, 6, 11, 6); + tank1.setRotationPoint(-7F, 8F, 1F); + tank1.setTextureSize(128, 64); + tank1.mirror = true; + setRotation(tank1, 0F, 0F, 0F); + portFront = new ModelRenderer(this, 18, 38); + portFront.addBox(0F, 0F, 0F, 8, 8, 1); + portFront.setRotationPoint(-4F, 12F, -8.01F); + portFront.setTextureSize(128, 64); + portFront.mirror = true; + setRotation(portFront, 0F, 0F, 0F); + tank3 = new ModelRenderer(this, 24, 21); + tank3.addBox(0F, 0F, 0F, 12, 7, 7); + tank3.setRotationPoint(-6F, 12F, -7F); + tank3.setTextureSize(128, 64); + tank3.mirror = true; + setRotation(tank3, 0F, 0F, 0F); + pipeAngle2 = new ModelRenderer(this, 18, 55); + pipeAngle2.addBox(-5F, 0F, 0F, 5, 6, 3); + pipeAngle2.setRotationPoint(5F, 13.01F, -2F); + pipeAngle2.setTextureSize(128, 64); + pipeAngle2.mirror = true; + setRotation(pipeAngle2, 0F, 0.7853982F, 0F); + connectorAngle = new ModelRenderer(this, 40, 45); + connectorAngle.addBox(0F, 0F, 0F, 2, 8, 2); + connectorAngle.setRotationPoint(-1F, 13F, 5F); + connectorAngle.setTextureSize(128, 64); + connectorAngle.mirror = true; + setRotation(connectorAngle, -0.4886922F, 0F, 0F); + pipe2 = new ModelRenderer(this, 40, 35); + pipe2.addBox(0F, 0F, 0F, 1, 6, 4); + pipe2.setRotationPoint(6F, 13F, -3F); + pipe2.setTextureSize(128, 64); + pipe2.mirror = true; + setRotation(pipe2, 0F, 0F, 0F); + connector = new ModelRenderer(this, 50, 35); + connector.addBox(0F, 0F, 0F, 2, 6, 2); + connector.setRotationPoint(-1F, 13F, 5F); + connector.setTextureSize(128, 64); + connector.mirror = true; + setRotation(connector, 0F, 0F, 0F); + compressor = new ModelRenderer(this, 18, 49); + compressor.addBox(0F, 0F, 0F, 6, 3, 3); + compressor.setRotationPoint(-3F, 8.5F, -2.5F); + compressor.setTextureSize(128, 64); + compressor.mirror = true; + setRotation(compressor, 0F, 0F, 0F); + tube10 = new ModelRenderer(this, 0, 14); + tube10.addBox(0F, 0F, 0F, 2, 1, 1); + tube10.setRotationPoint(-1F, 9F, 5F); + tube10.setTextureSize(128, 64); + tube10.mirror = true; + setRotation(tube10, 0F, 0F, 0F); + tube8 = new ModelRenderer(this, 0, 2); + tube8.addBox(0F, 0F, 0F, 1, 1, 2); + tube8.setRotationPoint(4F, 9.5F, -0.5F); + tube8.setTextureSize(128, 64); + tube8.mirror = true; + setRotation(tube8, 0F, 0F, 0F); + tube9 = new ModelRenderer(this, 0, 14); + tube9.addBox(0F, 0F, 0F, 2, 1, 1); + tube9.setRotationPoint(-1F, 9F, 2F); + tube9.setTextureSize(128, 64); + tube9.mirror = true; + setRotation(tube9, 0F, 0F, 0F); + tube7 = new ModelRenderer(this, 0, 0); + tube7.addBox(0F, 0F, 0F, 2, 1, 1); + tube7.setRotationPoint(3F, 9.5F, -1.5F); + tube7.setTextureSize(128, 64); + tube7.mirror = true; + setRotation(tube7, 0F, 0F, 0F); + tube6 = new ModelRenderer(this, 12, 13); + tube6.addBox(0F, 0F, 0F, 1, 2, 1); + tube6.setRotationPoint(1F, 10.5F, -4F); + tube6.setTextureSize(128, 64); + tube6.mirror = true; + setRotation(tube6, 0F, 0F, 0F); + tube5 = new ModelRenderer(this, 0, 2); + tube5.addBox(0F, 0F, 0F, 1, 1, 2); + tube5.setRotationPoint(1F, 9.5F, -4F); + tube5.setTextureSize(128, 64); + tube5.mirror = true; + setRotation(tube5, 0F, 0F, 0F); + tube4 = new ModelRenderer(this, 0, 2); + tube4.addBox(0F, 0F, 0F, 1, 1, 2); + tube4.setRotationPoint(-2F, 9.5F, -4F); + tube4.setTextureSize(128, 64); + tube4.mirror = true; + setRotation(tube4, 0F, 0F, 0F); + tube3 = new ModelRenderer(this, 12, 13); + tube3.addBox(0F, 0F, 0F, 1, 2, 1); + tube3.setRotationPoint(-2F, 10.5F, -4F); + tube3.setTextureSize(128, 64); + tube3.mirror = true; + setRotation(tube3, 0F, 0F, 0F); + tube2 = new ModelRenderer(this, 0, 0); + tube2.addBox(0F, 0F, 0F, 2, 1, 1); + tube2.setRotationPoint(-5F, 9.5F, -1.5F); + tube2.setTextureSize(128, 64); + tube2.mirror = true; + setRotation(tube2, 0F, 0F, 0F); + tube1 = new ModelRenderer(this, 0, 2); + tube1.addBox(0F, 0F, 0F, 1, 1, 2); + tube1.setRotationPoint(-5F, 9.5F, -0.5F); + tube1.setTextureSize(128, 64); + tube1.mirror = true; + setRotation(tube1, 0F, 0F, 0F); + pipe1 = new ModelRenderer(this, 40, 35); + pipe1.addBox(0F, 0F, 0F, 1, 6, 4); + pipe1.setRotationPoint(-7F, 13F, -3F); + pipe1.setTextureSize(128, 64); + pipe1.mirror = true; + setRotation(pipe1, 0F, 0F, 0F); + pipeAngle1 = new ModelRenderer(this, 18, 55); + pipeAngle1.addBox(0F, 0F, 0F, 5, 6, 3); + pipeAngle1.setRotationPoint(-5F, 13.01F, -2F); + pipeAngle1.setTextureSize(128, 64); + pipeAngle1.mirror = true; + setRotation(pipeAngle1, 0F, -0.7853982F, 0F); + exhaust4 = new ModelRenderer(this, 0, 9); + exhaust4.addBox(0F, 0F, 0F, 1, 1, 1); + exhaust4.setRotationPoint(-1.33F, 11.5F, -6.2F); + exhaust4.setTextureSize(128, 64); + exhaust4.mirror = true; + setRotation(exhaust4, 0.3490659F, 0F, 0F); + exhaust3 = new ModelRenderer(this, 0, 9); + exhaust3.addBox(0F, 0F, 0F, 1, 1, 1); + exhaust3.setRotationPoint(-3F, 11.5F, -6.2F); + exhaust3.setTextureSize(128, 64); + exhaust3.mirror = true; + setRotation(exhaust3, 0.3490659F, 0F, 0F); + exhaust2 = new ModelRenderer(this, 0, 9); + exhaust2.addBox(0F, 0F, 0F, 1, 1, 1); + exhaust2.setRotationPoint(2F, 11.5F, -6.2F); + exhaust2.setTextureSize(128, 64); + exhaust2.mirror = true; + setRotation(exhaust2, 0.3490659F, 0F, 0F); + exhaust1 = new ModelRenderer(this, 0, 9); + exhaust1.addBox(0F, 0F, 0F, 1, 1, 1); + exhaust1.setRotationPoint(0.33F, 11.5F, -6.2F); + exhaust1.setTextureSize(128, 64); + exhaust1.mirror = true; + setRotation(exhaust1, 0.3490659F, 0F, 0F); } public void render(float size) { - Base.render(size); - GasExit.render(size); - GasLeft.render(size); - GasRight.render(size); - MachineCore.render(size); - TopPanel.render(size); - SidePanel.render(size); - LPanelNW.render(size); - RPanelNW.render(size); - RPanelNE.render(size); - LPanelSW.render(size); - RPanelSW.render(size); - RPanelSE.render(size); - LPanelNE.render(size); - LPanelSE.render(size); - LTopS.render(size); - RTopN.render(size); - LTopN.render(size); - RTopS.render(size); - RTopW.render(size); - RTopE.render(size); - LTopE.render(size); - LTopW.render(size); - FrontPanel.render(size); - FrontConnection.render(size); - - GL11.glPushMatrix(); - GL11.glScalef(0.999F, 0.999F, 0.999F); - RightConnection.render(size); - LeftConnection.render(size); - GL11.glPopMatrix(); - } - - public void renderGlass(float size) - { - GL11.glPushMatrix(); - MekanismRenderer.blendOn(); - GL11.glColor4f(1, 1, 1, 0.2F); - - LGlassT.render(size); - RGlassT.render(size); - LGlassS.render(size); - RGlassS.render(size); - RGlassN.render(size); - LGlassN.render(size); - LGlassL.render(size); - RGlassR.render(size); - RGlassL.render(size); - LGlassR.render(size); - - MekanismRenderer.blendOff(); - GL11.glColor4f(1, 1, 1, 1); - GL11.glPopMatrix(); + base.render(size); + tank2.render(size); + portRight.render(size); + portBack.render(size); + portLeft.render(size); + tank1.render(size); + portFront.render(size); + tank3.render(size); + pipeAngle2.render(size); + connectorAngle.render(size); + pipe2.render(size); + connector.render(size); + compressor.render(size); + tube10.render(size); + tube8.render(size); + tube9.render(size); + tube7.render(size); + tube6.render(size); + tube5.render(size); + tube4.render(size); + tube3.render(size); + tube2.render(size); + tube1.render(size); + pipe1.render(size); + pipeAngle1.render(size); + exhaust4.render(size); + exhaust3.render(size); + exhaust2.render(size); + exhaust1.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelElectricPump.java b/src/main/java/mekanism/client/model/ModelElectricPump.java index 39c8cdf42..dad1e41bc 100644 --- a/src/main/java/mekanism/client/model/ModelElectricPump.java +++ b/src/main/java/mekanism/client/model/ModelElectricPump.java @@ -176,8 +176,8 @@ public class ModelElectricPump extends ModelBase pipeTogglePortLeft.render(size); pipeToggleRight.render(size); pipeToggleRingRight.render(size); - pipeTogglePortRight.render(size);*/ - pumpPipe.render(size); + pipeTogglePortRight.render(size); + pumpPipe.render(size);*/ } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelFluidicPlenisher.java b/src/main/java/mekanism/client/model/ModelFluidicPlenisher.java index 979b27e06..23912acbe 100644 --- a/src/main/java/mekanism/client/model/ModelFluidicPlenisher.java +++ b/src/main/java/mekanism/client/model/ModelFluidicPlenisher.java @@ -8,136 +8,136 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelFluidicPlenisher extends ModelBase { - ModelRenderer PumpBase; - ModelRenderer PumpTube; - ModelRenderer CoreStart; - ModelRenderer Core; - ModelRenderer FluidOutput; - ModelRenderer EnergyInput; - ModelRenderer EnergyTube; - ModelRenderer Screen; - ModelRenderer Keyboard; - ModelRenderer RightThing; - ModelRenderer LeftThing; - ModelRenderer RightCable; - ModelRenderer LeftCable; - ModelRenderer LeftConnector; - ModelRenderer RightConnector; + ModelRenderer bearingRight; + ModelRenderer ringTank; + ModelRenderer portTop; + ModelRenderer portBack; + ModelRenderer Connector; + ModelRenderer pipeToggle; + ModelRenderer ringTop; + ModelRenderer ringBottom; + ModelRenderer tank; + ModelRenderer bearingLeft; + ModelRenderer connectorRing; + ModelRenderer rod4; + ModelRenderer rod3; + ModelRenderer rod2; + ModelRenderer rod1; public ModelFluidicPlenisher() { - textureWidth = 128; - textureHeight = 128; + textureWidth = 64; + textureHeight = 64; - PumpBase = new ModelRenderer(this, 0, 29); - PumpBase.addBox(0F, 0F, 0F, 6, 1, 6); - PumpBase.setRotationPoint(-3F, 23F, -3F); - PumpBase.setTextureSize(128, 128); - PumpBase.mirror = true; - setRotation(PumpBase, 0F, 0F, 0F); - PumpTube = new ModelRenderer(this, 40, 5); - PumpTube.addBox(0F, 0F, 0F, 2, 3, 2); - PumpTube.setRotationPoint(-1F, 20F, -1F); - PumpTube.setTextureSize(128, 128); - PumpTube.mirror = true; - setRotation(PumpTube, 0F, 0F, 0F); - CoreStart = new ModelRenderer(this, 40, 0); - CoreStart.addBox(0F, 0F, 0F, 4, 1, 4); - CoreStart.setRotationPoint(-2F, 19F, -2F); - CoreStart.setTextureSize(128, 128); - CoreStart.mirror = true; - setRotation(CoreStart, 0F, 0F, 0F); - Core = new ModelRenderer(this, 0, 0); - Core.addBox(0F, 0F, 0F, 10, 8, 10); - Core.setRotationPoint(-5F, 11F, -5F); - Core.setTextureSize(128, 128); - Core.mirror = true; - setRotation(Core, 0F, 0F, 0F); - FluidOutput = new ModelRenderer(this, 0, 18); - FluidOutput.addBox(0F, 0F, 0F, 8, 3, 8); - FluidOutput.setRotationPoint(-4F, 8F, -4F); - FluidOutput.setTextureSize(128, 128); - FluidOutput.mirror = true; - setRotation(FluidOutput, 0F, 0F, 0F); - EnergyInput = new ModelRenderer(this, 0, 36); - EnergyInput.addBox(0F, 0F, 0F, 6, 6, 1); - EnergyInput.setRotationPoint(-3F, 13F, 7F); - EnergyInput.setTextureSize(128, 128); - EnergyInput.mirror = true; - setRotation(EnergyInput, 0F, 0F, 0F); - EnergyTube = new ModelRenderer(this, 14, 36); - EnergyTube.addBox(0F, 0F, 0F, 2, 2, 2); - EnergyTube.setRotationPoint(-1F, 15F, 5F); - EnergyTube.setTextureSize(128, 128); - EnergyTube.mirror = true; - setRotation(EnergyTube, 0F, 0F, 0F); - Screen = new ModelRenderer(this, 40, 17); - Screen.addBox(0F, 0F, 0F, 8, 5, 1); - Screen.setRotationPoint(-4F, 12F, -6F); - Screen.setTextureSize(128, 128); - Screen.mirror = true; - setRotation(Screen, 0F, 0F, 0F); - Keyboard = new ModelRenderer(this, 40, 13); - Keyboard.addBox(0F, 0F, 0F, 8, 1, 3); - Keyboard.setRotationPoint(-4F, 17F, -8F); - Keyboard.setTextureSize(128, 128); - Keyboard.mirror = true; - setRotation(Keyboard, 0.3490659F, 0F, 0F); - RightThing = new ModelRenderer(this, 24, 29); - RightThing.addBox(0F, 0F, 0F, 1, 4, 4); - RightThing.setRotationPoint(-6F, 13F, -2F); - RightThing.setTextureSize(128, 128); - RightThing.mirror = true; - setRotation(RightThing, 0F, 0F, 0F); - LeftThing = new ModelRenderer(this, 24, 29); - LeftThing.addBox(0F, 0F, 0F, 1, 4, 4); - LeftThing.setRotationPoint(5F, 13F, -2F); - LeftThing.setTextureSize(128, 128); - LeftThing.mirror = true; - setRotation(LeftThing, 0F, 0F, 0F); - RightCable = new ModelRenderer(this, 32, 18); - RightCable.addBox(0F, 0F, 0F, 1, 3, 2); - RightCable.setRotationPoint(-6F, 17F, -1F); - RightCable.setTextureSize(128, 128); - RightCable.mirror = true; - setRotation(RightCable, 0F, 0F, 0F); - LeftCable = new ModelRenderer(this, 32, 18); - LeftCable.addBox(0F, 0F, 0F, 1, 3, 2); - LeftCable.setRotationPoint(5F, 17F, -1F); - LeftCable.setTextureSize(128, 128); - LeftCable.mirror = true; - setRotation(LeftCable, 0F, 0F, 0F); - LeftConnector = new ModelRenderer(this, 40, 10); - LeftConnector.addBox(0F, 0F, 0F, 3, 1, 2); - LeftConnector.setRotationPoint(2F, 19F, -1F); - LeftConnector.setTextureSize(128, 128); - LeftConnector.mirror = true; - setRotation(LeftConnector, 0F, 0F, 0F); - RightConnector = new ModelRenderer(this, 40, 10); - RightConnector.addBox(0F, 0F, 0F, 3, 1, 2); - RightConnector.setRotationPoint(-5F, 19F, -1F); - RightConnector.setTextureSize(128, 128); - RightConnector.mirror = true; - setRotation(RightConnector, 0F, 0F, 0F); + bearingRight = new ModelRenderer(this, 44, 26); + bearingRight.mirror = true; + bearingRight.addBox(0F, 0F, 0F, 1, 4, 4); + bearingRight.setRotationPoint(4F, 14F, -2F); + bearingRight.setTextureSize(64, 64); + setRotation(bearingRight, 0F, 0F, 0F); + ringTank = new ModelRenderer(this, 0, 32); + ringTank.addBox(0F, 0F, 0F, 11, 1, 11); + ringTank.setRotationPoint(-5.5F, 10F, -5.5F); + ringTank.setTextureSize(64, 64); + ringTank.mirror = true; + setRotation(ringTank, 0F, 0F, 0F); + portTop = new ModelRenderer(this, 0, 21); + portTop.addBox(0F, 0F, 0F, 10, 1, 10); + portTop.setRotationPoint(-5F, 8F, -5F); + portTop.setTextureSize(64, 64); + portTop.mirror = true; + setRotation(portTop, 0F, 0F, 0F); + portBack = new ModelRenderer(this, 36, 0); + portBack.addBox(0F, 0F, 0F, 8, 8, 1); + portBack.setRotationPoint(-4F, 12F, 7F); + portBack.setTextureSize(64, 64); + portBack.mirror = true; + setRotation(portBack, 0F, 0F, 0F); + Connector = new ModelRenderer(this, 36, 9); + Connector.addBox(0F, 0F, 0F, 5, 5, 4); + Connector.setRotationPoint(-2.5F, 13.5F, 3F); + Connector.setTextureSize(64, 64); + Connector.mirror = true; + setRotation(Connector, 0F, 0F, 0F); + pipeToggle = new ModelRenderer(this, 32, 44); + pipeToggle.addBox(0F, 0F, 0F, 6, 8, 6); + pipeToggle.setRotationPoint(-3F, 24F, -3F); + pipeToggle.setTextureSize(64, 64); + pipeToggle.mirror = true; + setRotation(pipeToggle, 0F, 0F, 0F); + ringTop = new ModelRenderer(this, 0, 44); + ringTop.addBox(0F, 0F, 0F, 8, 1, 8); + ringTop.setRotationPoint(-4F, 9F, -4F); + ringTop.setTextureSize(64, 64); + ringTop.mirror = true; + setRotation(ringTop, 0F, 0F, 0F); + ringBottom = new ModelRenderer(this, 0, 53); + ringBottom.addBox(0F, 0F, 0F, 8, 1, 8); + ringBottom.setRotationPoint(-4F, 23F, -4F); + ringBottom.setTextureSize(64, 64); + ringBottom.mirror = true; + setRotation(ringBottom, 0F, 0F, 0F); + tank = new ModelRenderer(this, 0, 0); + tank.addBox(0F, 0F, 0F, 9, 12, 9); + tank.setRotationPoint(-4.5F, 11F, -4.5F); + tank.setTextureSize(64, 64); + tank.mirror = true; + setRotation(tank, 0F, 0F, 0F); + bearingLeft = new ModelRenderer(this, 44, 26); + bearingLeft.addBox(0F, 0F, 0F, 1, 4, 4); + bearingLeft.setRotationPoint(-5F, 14F, -2F); + bearingLeft.setTextureSize(64, 64); + bearingLeft.mirror = true; + setRotation(bearingLeft, 0F, 0F, 0F); + connectorRing = new ModelRenderer(this, 40, 18); + connectorRing.addBox(0F, 0F, 0F, 7, 7, 1); + connectorRing.setRotationPoint(-3.5F, 12.5F, 5F); + connectorRing.setTextureSize(64, 64); + connectorRing.mirror = true; + setRotation(connectorRing, 0F, 0F, 0F); + rod4 = new ModelRenderer(this, 0, 0); + rod4.addBox(0F, 0F, 0F, 1, 1, 3); + rod4.setRotationPoint(2F, 18F, 4F); + rod4.setTextureSize(64, 64); + rod4.mirror = true; + setRotation(rod4, 0F, 0F, 0F); + rod3 = new ModelRenderer(this, 0, 0); + rod3.addBox(0F, 0F, 0F, 1, 1, 3); + rod3.setRotationPoint(-3F, 18F, 4F); + rod3.setTextureSize(64, 64); + rod3.mirror = true; + setRotation(rod3, 0F, 0F, 0F); + rod2 = new ModelRenderer(this, 0, 0); + rod2.addBox(0F, 0F, 0F, 1, 1, 3); + rod2.setRotationPoint(2F, 13F, 4F); + rod2.setTextureSize(64, 64); + rod2.mirror = true; + setRotation(rod2, 0F, 0F, 0F); + rod1 = new ModelRenderer(this, 0, 0); + rod1.addBox(0F, 0F, 0F, 1, 1, 3); + rod1.setRotationPoint(-3F, 13F, 4F); + rod1.setTextureSize(64, 64); + rod1.mirror = true; + setRotation(rod1, 0F, 0F, 0F); } public void render(float size) { - PumpBase.render(size); - PumpTube.render(size); - CoreStart.render(size); - Core.render(size); - FluidOutput.render(size); - EnergyInput.render(size); - EnergyTube.render(size); - Screen.render(size); - Keyboard.render(size); - RightThing.render(size); - LeftThing.render(size); - RightCable.render(size); - LeftCable.render(size); - LeftConnector.render(size); - RightConnector.render(size); + bearingRight.render(size); + ringTank.render(size); + portTop.render(size); + portBack.render(size); + Connector.render(size); + //pipeToggle.render(size); + ringTop.render(size); + ringBottom.render(size); + tank.render(size); + bearingLeft.render(size); + connectorRing.render(size); + rod4.render(size); + rod3.render(size); + rod2.render(size); + rod1.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelLaser.java b/src/main/java/mekanism/client/model/ModelLaser.java index 079f869b6..dfe696903 100644 --- a/src/main/java/mekanism/client/model/ModelLaser.java +++ b/src/main/java/mekanism/client/model/ModelLaser.java @@ -5,168 +5,176 @@ import net.minecraft.client.model.ModelRenderer; public class ModelLaser extends ModelBase { - ModelRenderer LeftOuterRail; - ModelRenderer LowerCache; - ModelRenderer LeftInnerRail; - ModelRenderer RightInnerRail; - ModelRenderer RightOuterRail; - ModelRenderer RightTopDecor; - ModelRenderer Base; - ModelRenderer LeftTopDecor; - ModelRenderer RightBottomDecor; - ModelRenderer LeftBottomDecor; - ModelRenderer HigherCache; - ModelRenderer LaserTip; - ModelRenderer LaserCable1; - ModelRenderer LaserCable2; - ModelRenderer LaserCable3; - ModelRenderer LaserCable4; - ModelRenderer LaserBase; - ModelRenderer LaserDecor; - ModelRenderer LaserDecor2; + ModelRenderer connector; + ModelRenderer center; + ModelRenderer shaft; + ModelRenderer ring1; + ModelRenderer port; + ModelRenderer rod1; + ModelRenderer fin1; + ModelRenderer fin2; + ModelRenderer fin3; + ModelRenderer fin4; + ModelRenderer ring2; + ModelRenderer body; + ModelRenderer rod2; + ModelRenderer wire; + ModelRenderer rod3; + ModelRenderer fin5; + ModelRenderer fin6; + ModelRenderer fin7; + ModelRenderer fin8; + ModelRenderer rod4; public ModelLaser() { textureWidth = 64; - textureHeight = 64; + textureHeight = 32; - LeftOuterRail = new ModelRenderer(this, 22, 29); - LeftOuterRail.addBox(0F, 0F, 0F, 1, 2, 14); - LeftOuterRail.setRotationPoint(-7F, 18F, -7F); - LeftOuterRail.setTextureSize(64, 64); - LeftOuterRail.mirror = true; - setRotation(LeftOuterRail, 0F, 0F, 0F); - LowerCache = new ModelRenderer(this, 0, 18); - LowerCache.addBox(0F, -4F, 0F, 12, 1, 10); - LowerCache.setRotationPoint(-6F, 23F, -5F); - LowerCache.setTextureSize(64, 64); - LowerCache.mirror = true; - setRotation(LowerCache, 0F, 0F, 0F); - LeftInnerRail = new ModelRenderer(this, 22, 29); - LeftInnerRail.addBox(0F, 0F, 0F, 1, 2, 14); - LeftInnerRail.setRotationPoint(-5F, 18F, -7F); - LeftInnerRail.setTextureSize(64, 64); - LeftInnerRail.mirror = true; - setRotation(LeftInnerRail, 0F, 0F, 0F); - RightInnerRail = new ModelRenderer(this, 22, 29); - RightInnerRail.addBox(0F, 0F, 0F, 1, 2, 14); - RightInnerRail.setRotationPoint(4F, 18F, -7F); - RightInnerRail.setTextureSize(64, 64); - RightInnerRail.mirror = true; - setRotation(RightInnerRail, 0F, 0F, 0F); - RightOuterRail = new ModelRenderer(this, 22, 29); - RightOuterRail.addBox(0F, 0F, 0F, 1, 2, 14); - RightOuterRail.setRotationPoint(6F, 18F, -7F); - RightOuterRail.setTextureSize(64, 64); - RightOuterRail.mirror = true; - setRotation(RightOuterRail, 0F, 0F, 0F); - RightTopDecor = new ModelRenderer(this, 0, 43); - RightTopDecor.addBox(0F, 0F, 0F, 1, 1, 8); - RightTopDecor.setRotationPoint(7F, 19F, -4F); - RightTopDecor.setTextureSize(64, 64); - RightTopDecor.mirror = true; - setRotation(RightTopDecor, 0F, 0F, 0F); - Base = new ModelRenderer(this, 0, 0); - Base.addBox(0F, 0F, 0F, 14, 4, 14); - Base.setRotationPoint(-7F, 20F, -7F); - Base.setTextureSize(64, 64); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - LeftTopDecor = new ModelRenderer(this, 0, 43); - LeftTopDecor.addBox(0F, 0F, 0F, 1, 1, 8); - LeftTopDecor.setRotationPoint(-8F, 19F, -4F); - LeftTopDecor.setTextureSize(64, 64); - LeftTopDecor.mirror = true; - setRotation(LeftTopDecor, 0F, 0F, 0F); - RightBottomDecor = new ModelRenderer(this, 0, 29); - RightBottomDecor.addBox(0F, 0F, 0F, 1, 4, 10); - RightBottomDecor.setRotationPoint(7F, 20F, -5F); - RightBottomDecor.setTextureSize(64, 64); - RightBottomDecor.mirror = true; - setRotation(RightBottomDecor, 0F, 0F, 0F); - LeftBottomDecor = new ModelRenderer(this, 0, 29); - LeftBottomDecor.addBox(0F, 0F, 0F, 1, 4, 10); - LeftBottomDecor.setRotationPoint(-8F, 20F, -5F); - LeftBottomDecor.setTextureSize(64, 64); - LeftBottomDecor.mirror = true; - setRotation(LeftBottomDecor, 0F, 0F, 0F); - HigherCache = new ModelRenderer(this, 0, 18); - HigherCache.addBox(0F, -4F, 0F, 12, 1, 10); - HigherCache.setRotationPoint(-6F, 21.5F, -5F); - HigherCache.setTextureSize(64, 64); - HigherCache.mirror = true; - setRotation(HigherCache, 0F, 0F, 0F); - LaserTip = new ModelRenderer(this, 30, 45); - LaserTip.addBox(0F, -4F, 0F, 2, 3, 2); - LaserTip.setRotationPoint(-1F, 13.5F, -1F); - LaserTip.setTextureSize(64, 64); - LaserTip.mirror = true; - setRotation(LaserTip, 0F, 0F, 0F); - LaserCable1 = new ModelRenderer(this, 22, 45); - LaserCable1.addBox(0F, 0F, 0F, 1, 1, 3); - LaserCable1.setRotationPoint(1F, 11.5F, -3F); - LaserCable1.setTextureSize(64, 64); - LaserCable1.mirror = true; - setRotation(LaserCable1, 0F, 0F, 0F); - LaserCable2 = new ModelRenderer(this, 18, 43); - LaserCable2.addBox(0F, -4F, 0F, 1, 6, 1); - LaserCable2.setRotationPoint(1F, 15.5F, -4F); - LaserCable2.setTextureSize(64, 64); - LaserCable2.mirror = true; - setRotation(LaserCable2, 0F, 0F, 0F); - LaserCable3 = new ModelRenderer(this, 22, 45); - LaserCable3.addBox(0F, 0F, 0F, 1, 1, 3); - LaserCable3.setRotationPoint(-2F, 11.5F, -3F); - LaserCable3.setTextureSize(64, 64); - LaserCable3.mirror = true; - setRotation(LaserCable3, 0F, 0F, 0F); - LaserCable4 = new ModelRenderer(this, 18, 43); - LaserCable4.addBox(0F, -4F, 0F, 1, 6, 1); - LaserCable4.setRotationPoint(-2F, 15.5F, -4F); - LaserCable4.setTextureSize(64, 64); - LaserCable4.mirror = true; - setRotation(LaserCable4, 0F, 0F, 0F); - LaserBase = new ModelRenderer(this, 0, 52); - LaserBase.addBox(0F, -4F, 0F, 6, 5, 6); - LaserBase.setRotationPoint(-3F, 16.5F, -3F); - LaserBase.setTextureSize(64, 64); - LaserBase.mirror = true; - setRotation(LaserBase, 0F, 0F, 0F); - LaserDecor = new ModelRenderer(this, 44, 18); - LaserDecor.addBox(-0.5F, 0F, 0F, 1, 4, 4); - LaserDecor.setRotationPoint(2.5F, 14.7F, -2F); - LaserDecor.setTextureSize(64, 64); - LaserDecor.mirror = true; - setRotation(LaserDecor, 0F, 0F, -0.6320361F); - LaserDecor2 = new ModelRenderer(this, 44, 18); - LaserDecor2.addBox(-0.5F, 0F, 0F, 1, 4, 4); - LaserDecor2.setRotationPoint(-2.5F, 14.7F, -2F); - LaserDecor2.setTextureSize(64, 64); - LaserDecor2.mirror = true; - setRotation(LaserDecor2, 0F, 0F, 0.6320364F); + connector = new ModelRenderer(this, 32, 15); + connector.addBox(0F, 0F, 0F, 6, 1, 6); + connector.setRotationPoint(-3F, 22F, -3F); + connector.setTextureSize(64, 32); + connector.mirror = true; + setRotation(connector, 0F, 0F, 0F); + center = new ModelRenderer(this, 18, 9); + center.addBox(0F, 0F, 0F, 2, 15, 2); + center.setRotationPoint(-1F, 8F, -1F); + center.setTextureSize(64, 32); + center.mirror = true; + setRotation(center, 0F, 0F, 0F); + shaft = new ModelRenderer(this, 0, 18); + shaft.addBox(0F, 0F, 0F, 3, 2, 3); + shaft.setRotationPoint(-1.5F, 13F, -1.5F); + shaft.setTextureSize(64, 32); + shaft.mirror = true; + setRotation(shaft, 0F, 0F, 0F); + ring1 = new ModelRenderer(this, 0, 23); + ring1.addBox(0F, 0F, 0F, 4, 1, 4); + ring1.setRotationPoint(-2F, 10F, -2F); + ring1.setTextureSize(64, 32); + ring1.mirror = true; + setRotation(ring1, 0F, 0F, 0F); + port = new ModelRenderer(this, 0, 0); + port.addBox(0F, 0F, 0F, 8, 1, 8); + port.setRotationPoint(-4F, 23F, -4F); + port.setTextureSize(64, 32); + port.mirror = true; + setRotation(port, 0F, 0F, 0F); + rod1 = new ModelRenderer(this, 0, 9); + rod1.addBox(0F, 0F, 0F, 1, 5, 1); + rod1.setRotationPoint(2.8F, 16F, 1F); + rod1.setTextureSize(64, 32); + rod1.mirror = true; + setRotation(rod1, 0F, 0F, 0F); + fin1 = new ModelRenderer(this, 0, 9); + fin1.addBox(0F, 0F, 0F, 1, 1, 8); + fin1.setRotationPoint(3F, 21F, -4F); + fin1.setTextureSize(64, 32); + fin1.mirror = true; + setRotation(fin1, 0F, 0F, 0F); + fin2 = new ModelRenderer(this, 0, 9); + fin2.addBox(0F, 0F, 0F, 1, 1, 8); + fin2.setRotationPoint(3F, 19F, -4F); + fin2.setTextureSize(64, 32); + fin2.mirror = true; + setRotation(fin2, 0F, 0F, 0F); + fin3 = new ModelRenderer(this, 0, 9); + fin3.addBox(0F, 0F, 0F, 1, 1, 8); + fin3.setRotationPoint(3F, 17F, -4F); + fin3.setTextureSize(64, 32); + fin3.mirror = true; + setRotation(fin3, 0F, 0F, 0F); + fin4 = new ModelRenderer(this, 0, 9); + fin4.addBox(0F, 0F, 0F, 1, 1, 8); + fin4.setRotationPoint(3F, 15F, -4F); + fin4.setTextureSize(64, 32); + fin4.mirror = true; + setRotation(fin4, 0F, 0F, 0F); + ring2 = new ModelRenderer(this, 0, 23); + ring2.addBox(0F, 0F, 0F, 4, 1, 4); + ring2.setRotationPoint(-2F, 12F, -2F); + ring2.setTextureSize(64, 32); + ring2.mirror = true; + setRotation(ring2, 0F, 0F, 0F); + body = new ModelRenderer(this, 32, 0); + body.addBox(0F, 0F, 0F, 6, 7, 8); + body.setRotationPoint(-3F, 15F, -4F); + body.setTextureSize(64, 32); + body.mirror = true; + setRotation(body, 0F, 0F, 0F); + rod2 = new ModelRenderer(this, 0, 9); + rod2.addBox(0F, 0F, 0F, 1, 5, 1); + rod2.setRotationPoint(2.8F, 16F, -2F); + rod2.setTextureSize(64, 32); + rod2.mirror = true; + setRotation(rod2, 0F, 0F, 0F); + wire = new ModelRenderer(this, 10, 9); + wire.addBox(0F, -1F, 0F, 1, 6, 1); + wire.setRotationPoint(-1.5F, 11F, -0.5F); + wire.setTextureSize(64, 32); + wire.mirror = true; + setRotation(wire, 0F, 0F, 0.1919862F); + rod3 = new ModelRenderer(this, 0, 9); + rod3.addBox(0F, 0F, 0F, 1, 5, 1); + rod3.setRotationPoint(-3.8F, 16F, 1F); + rod3.setTextureSize(64, 32); + rod3.mirror = true; + setRotation(rod3, 0F, 0F, 0F); + fin5 = new ModelRenderer(this, 0, 9); + fin5.addBox(0F, 0F, 0F, 1, 1, 8); + fin5.setRotationPoint(-4F, 15F, -4F); + fin5.setTextureSize(64, 32); + fin5.mirror = true; + setRotation(fin5, 0F, 0F, 0F); + fin6 = new ModelRenderer(this, 0, 9); + fin6.addBox(0F, 0F, 0F, 1, 1, 8); + fin6.setRotationPoint(-4F, 17F, -4F); + fin6.setTextureSize(64, 32); + fin6.mirror = true; + setRotation(fin6, 0F, 0F, 0F); + fin7 = new ModelRenderer(this, 0, 9); + fin7.addBox(0F, 0F, 0F, 1, 1, 8); + fin7.setRotationPoint(-4F, 19F, -4F); + fin7.setTextureSize(64, 32); + fin7.mirror = true; + setRotation(fin7, 0F, 0F, 0F); + fin8 = new ModelRenderer(this, 0, 9); + fin8.addBox(0F, 0F, 0F, 1, 1, 8); + fin8.setRotationPoint(-4F, 21F, -4F); + fin8.setTextureSize(64, 32); + fin8.mirror = true; + setRotation(fin8, 0F, 0F, 0F); + rod4 = new ModelRenderer(this, 0, 9); + rod4.addBox(0F, 0F, 0F, 1, 5, 1); + rod4.setRotationPoint(-3.8F, 16F, -2F); + rod4.setTextureSize(64, 32); + rod4.mirror = true; + setRotation(rod4, 0F, 0F, 0F); } public void render(float size) { - LeftOuterRail.render(size); - LowerCache.render(size); - LeftInnerRail.render(size); - RightInnerRail.render(size); - RightOuterRail.render(size); - RightTopDecor.render(size); - Base.render(size); - LeftTopDecor.render(size); - RightBottomDecor.render(size); - LeftBottomDecor.render(size); - HigherCache.render(size); - LaserTip.render(size); - LaserCable1.render(size); - LaserCable2.render(size); - LaserCable3.render(size); - LaserCable4.render(size); - LaserBase.render(size); - LaserDecor.render(size); - LaserDecor2.render(size); + connector.render(size); + center.render(size); + shaft.render(size); + ring1.render(size); + port.render(size); + rod1.render(size); + fin1.render(size); + fin2.render(size); + fin3.render(size); + fin4.render(size); + ring2.render(size); + body.render(size); + rod2.render(size); + wire.render(size); + rod3.render(size); + fin5.render(size); + fin6.render(size); + fin7.render(size); + fin8.render(size); + rod4.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelSeismicVibrator.java b/src/main/java/mekanism/client/model/ModelSeismicVibrator.java index 4d1d895f7..c304a8c71 100644 --- a/src/main/java/mekanism/client/model/ModelSeismicVibrator.java +++ b/src/main/java/mekanism/client/model/ModelSeismicVibrator.java @@ -2,144 +2,390 @@ package mekanism.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelSeismicVibrator extends ModelBase { - ModelRenderer Base; - ModelRenderer Tower; - ModelRenderer TowerTop; - ModelRenderer TopPanel; - ModelRenderer Vibrator; - ModelRenderer PoleBR; - ModelRenderer PoleLB; - ModelRenderer PoleFL; - ModelRenderer PoleRF; - ModelRenderer PoleL; - ModelRenderer PoleR; - ModelRenderer Cable; - ModelRenderer ScreenFront; - ModelRenderer Keyboard; + ModelRenderer plate3; + ModelRenderer baseBack; + ModelRenderer motor; + ModelRenderer port; + ModelRenderer pole4; + ModelRenderer shaft2; + ModelRenderer shaft1; + ModelRenderer arm3; + ModelRenderer plate2; + ModelRenderer arm2; + ModelRenderer arm1; + ModelRenderer top; + ModelRenderer frameBack5; + ModelRenderer pole3; + ModelRenderer frameRight5; + ModelRenderer baseRight; + ModelRenderer baseFront; + ModelRenderer baseLeft; + ModelRenderer frameRight3; + ModelRenderer pole1; + ModelRenderer frameRight4; + ModelRenderer frameRight1; + ModelRenderer frameRight2; + ModelRenderer frameLeft5; + ModelRenderer frameLeft4; + ModelRenderer frameBack3; + ModelRenderer frameLeft2; + ModelRenderer frameLeft1; + ModelRenderer pole2; + ModelRenderer frameBack1; + ModelRenderer frameBack2; + ModelRenderer frameBack4; + ModelRenderer frameLeft3; + ModelRenderer conduit; + ModelRenderer plate1; + ModelRenderer rivet10; + ModelRenderer rivet5; + ModelRenderer rivet1; + ModelRenderer rivet6; + ModelRenderer rivet2; + ModelRenderer rivet7; + ModelRenderer rivet3; + ModelRenderer rivet8; + ModelRenderer rivet4; + ModelRenderer rivet9; public ModelSeismicVibrator() { textureWidth = 128; - textureHeight = 128; + textureHeight = 64; - Base = new ModelRenderer(this, 0, 0); - Base.addBox(0F, 0F, 0F, 16, 1, 16); - Base.setRotationPoint(-8F, 23F, -8F); - Base.setTextureSize(128, 128); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - Tower = new ModelRenderer(this, 64, 0); - Tower.addBox(0F, 0F, 0F, 4, 11, 4); - Tower.setRotationPoint(-2F, 12F, -2F); - Tower.setTextureSize(128, 128); - Tower.mirror = true; - setRotation(Tower, 0F, 0F, 0F); - TowerTop = new ModelRenderer(this, 80, 0); - TowerTop.addBox(0F, 0F, 0F, 2, 1, 2); - TowerTop.setRotationPoint(-1F, 10F, -1F); - TowerTop.setTextureSize(128, 128); - TowerTop.mirror = true; - setRotation(TowerTop, 0F, 0F, 0F); - TopPanel = new ModelRenderer(this, 0, 17); - TopPanel.addBox(0F, 0F, 0F, 8, 1, 8); - TopPanel.setRotationPoint(-4F, 11F, -4F); - TopPanel.setTextureSize(128, 128); - TopPanel.mirror = true; - setRotation(TopPanel, 0F, 0F, 0F); - Vibrator = new ModelRenderer(this, 32, 17); - Vibrator.addBox(0F, 0F, 0F, 8, 4, 8); - Vibrator.setRotationPoint(-4F, 19F, -4F); - Vibrator.setTextureSize(128, 128); - Vibrator.mirror = true; - setRotation(Vibrator, 0F, 0F, 0F); - PoleBR = new ModelRenderer(this, 0, 26); - PoleBR.addBox(0F, 0F, 0F, 1, 13, 1); - PoleBR.setRotationPoint(-5F, 10F, 4F); - PoleBR.setTextureSize(128, 128); - PoleBR.mirror = true; - setRotation(PoleBR, 0F, 0F, 0F); - PoleLB = new ModelRenderer(this, 0, 26); - PoleLB.addBox(0F, 0F, 0F, 1, 13, 1); - PoleLB.setRotationPoint(4F, 10F, 4F); - PoleLB.setTextureSize(128, 128); - PoleLB.mirror = true; - setRotation(PoleLB, 0F, 0F, 0F); - PoleFL = new ModelRenderer(this, 0, 26); - PoleFL.addBox(0F, 0F, 0F, 1, 13, 1); - PoleFL.setRotationPoint(4F, 10F, -5F); - PoleFL.setTextureSize(128, 128); - PoleFL.mirror = true; - setRotation(PoleFL, 0F, 0F, 0F); - PoleRF = new ModelRenderer(this, 0, 26); - PoleRF.addBox(0F, 0F, 0F, 1, 13, 1); - PoleRF.setRotationPoint(-5F, 10F, -5F); - PoleRF.setTextureSize(128, 128); - PoleRF.mirror = true; - setRotation(PoleRF, 0F, 0F, 0F); - PoleL = new ModelRenderer(this, 4, 26); - PoleL.addBox(0F, 0F, 0F, 1, 1, 8); - PoleL.setRotationPoint(4F, 10F, -4F); - PoleL.setTextureSize(128, 128); - PoleL.mirror = true; - setRotation(PoleL, 0F, 0F, 0F); - PoleR = new ModelRenderer(this, 4, 26); - PoleR.addBox(0F, 0F, 0F, 1, 1, 8); - PoleR.setRotationPoint(-5F, 10F, -4F); - PoleR.setTextureSize(128, 128); - PoleR.mirror = true; - setRotation(PoleR, 0F, 0F, 0F); - Cable = new ModelRenderer(this, 64, 15); - Cable.addBox(0F, 0F, 0F, 6, 2, 6); - Cable.setRotationPoint(-3F, 8F, -3F); - Cable.setTextureSize(128, 128); - Cable.mirror = true; - setRotation(Cable, 0F, 0F, 0F); - ScreenFront = new ModelRenderer(this, 0, 40); - ScreenFront.addBox(0F, 0F, 0F, 8, 6, 1); - ScreenFront.setRotationPoint(-4F, 11F, -6F); - ScreenFront.setTextureSize(128, 128); - ScreenFront.mirror = true; - setRotation(ScreenFront, 0F, 0F, 0F); - Keyboard = new ModelRenderer(this, 0, 47); - Keyboard.addBox(0F, 0F, 0F, 8, 1, 3); - Keyboard.setRotationPoint(-4F, 18F, -8F); - Keyboard.setTextureSize(128, 128); - Keyboard.mirror = true; - setRotation(Keyboard, 0.4363323F, 0F, 0F); + plate3 = new ModelRenderer(this, 36, 42); + plate3.addBox(0F, 0F, 0F, 8, 2, 8); + plate3.setRotationPoint(-4F, 22F, -4F); + plate3.setTextureSize(128, 64); + plate3.mirror = true; + setRotation(plate3, 0F, 0F, 0F); + baseBack = new ModelRenderer(this, 0, 26); + baseBack.addBox(0F, 0F, 0F, 16, 5, 3); + baseBack.setRotationPoint(-8F, 19F, 5F); + baseBack.setTextureSize(128, 64); + baseBack.mirror = true; + setRotation(baseBack, 0F, 0F, 0F); + motor = new ModelRenderer(this, 76, 13); + motor.addBox(0F, 0F, 0F, 6, 4, 10); + motor.setRotationPoint(-3F, -5F, -3F); + motor.setTextureSize(128, 64); + motor.mirror = true; + setRotation(motor, 0F, 0F, 0F); + port = new ModelRenderer(this, 38, 33); + 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); + pole4 = new ModelRenderer(this, 0, 34); + pole4.addBox(0F, 0F, 0F, 1, 25, 1); + pole4.setRotationPoint(6.5F, -6F, 6.5F); + pole4.setTextureSize(128, 64); + pole4.mirror = true; + setRotation(pole4, 0F, 0F, 0F); + shaft2 = new ModelRenderer(this, 16, 34); + shaft2.addBox(0F, 0F, 0F, 3, 11, 3); + shaft2.setRotationPoint(-1.5F, -5F, -1.5F); + shaft2.setTextureSize(128, 64); + shaft2.mirror = true; + setRotation(shaft2, 0F, 0F, 0F); + shaft1 = new ModelRenderer(this, 8, 34); + shaft1.addBox(0F, 0F, 0F, 2, 15, 2); + shaft1.setRotationPoint(-1F, 6F, -1F); + shaft1.setTextureSize(128, 64); + shaft1.mirror = true; + setRotation(shaft1, 0F, 0F, 0F); + arm3 = new ModelRenderer(this, 0, 6); + arm3.addBox(0F, 0F, 0F, 2, 2, 4); + arm3.setRotationPoint(-1F, 7F, 3F); + arm3.setTextureSize(128, 64); + arm3.mirror = true; + setRotation(arm3, -0.3665191F, 0F, 0F); + plate2 = new ModelRenderer(this, 48, 0); + plate2.addBox(0F, 0F, 0F, 4, 2, 4); + plate2.setRotationPoint(-2F, 21F, -2F); + plate2.setTextureSize(128, 64); + plate2.mirror = true; + setRotation(plate2, 0F, 0F, 0F); + arm2 = new ModelRenderer(this, 48, 6); + arm2.addBox(0F, 0F, 0F, 4, 2, 4); + arm2.setRotationPoint(-2F, 7F, -2F); + arm2.setTextureSize(128, 64); + arm2.mirror = true; + setRotation(arm2, 0F, 0F, 0F); + arm1 = new ModelRenderer(this, 56, 33); + arm1.addBox(0F, 0F, 0F, 3, 2, 4); + arm1.setRotationPoint(-1.5F, 7F, 2F); + arm1.setTextureSize(128, 64); + arm1.mirror = true; + setRotation(arm1, 0F, 0F, 0F); + top = new ModelRenderer(this, 0, 0); + top.addBox(0F, 0F, 0F, 16, 2, 16); + top.setRotationPoint(-8F, -8F, -8F); + top.setTextureSize(128, 64); + top.mirror = true; + setRotation(top, 0F, 0F, 0F); + frameBack5 = new ModelRenderer(this, 4, 34); + frameBack5.addBox(-1F, 0F, 0F, 1, 19, 1); + frameBack5.setRotationPoint(7.5F, 7F, 6.49F); + frameBack5.setTextureSize(128, 64); + frameBack5.mirror = true; + setRotation(frameBack5, 0F, 0F, 0.837758F); + pole3 = new ModelRenderer(this, 0, 34); + pole3.addBox(0F, 0F, 0F, 1, 25, 1); + pole3.setRotationPoint(6.5F, -6F, -7.5F); + pole3.setTextureSize(128, 64); + pole3.mirror = true; + setRotation(pole3, 0F, 0F, 0F); + frameRight5 = new ModelRenderer(this, 4, 34); + frameRight5.addBox(0F, 0F, 0F, 1, 19, 1); + frameRight5.setRotationPoint(6.485F, 7F, -7.5F); + frameRight5.setTextureSize(128, 64); + frameRight5.mirror = true; + setRotation(frameRight5, 0.837758F, 0F, 0F); + baseRight = new ModelRenderer(this, 38, 18); + baseRight.mirror = true; + baseRight.addBox(0F, 0F, 0F, 3, 5, 10); + baseRight.setRotationPoint(5F, 19F, -5F); + baseRight.setTextureSize(128, 64); + setRotation(baseRight, 0F, 0F, 0F); + baseFront = new ModelRenderer(this, 0, 18); + baseFront.addBox(0F, 0F, 0F, 16, 5, 3); + baseFront.setRotationPoint(-8F, 19F, -8F); + baseFront.setTextureSize(128, 64); + baseFront.mirror = true; + setRotation(baseFront, 0F, 0F, 0F); + baseLeft = new ModelRenderer(this, 38, 18); + baseLeft.addBox(0F, 0F, 0F, 3, 5, 10); + baseLeft.setRotationPoint(-8F, 19F, -5F); + baseLeft.setTextureSize(128, 64); + baseLeft.mirror = true; + setRotation(baseLeft, 0F, 0F, 0F); + frameRight3 = new ModelRenderer(this, 64, 27); + frameRight3.addBox(0F, 0F, 0F, 1, 1, 13); + frameRight3.setRotationPoint(6.5F, 6F, -6.5F); + frameRight3.setTextureSize(128, 64); + frameRight3.mirror = true; + setRotation(frameRight3, 0F, 0F, 0F); + pole1 = new ModelRenderer(this, 0, 34); + pole1.addBox(0F, 0F, 0F, 1, 25, 1); + pole1.setRotationPoint(-7.5F, -6F, -7.5F); + pole1.setTextureSize(128, 64); + pole1.mirror = true; + setRotation(pole1, 0F, 0F, 0F); + frameRight4 = new ModelRenderer(this, 4, 34); + frameRight4.addBox(0F, 0F, -1F, 1, 19, 1); + frameRight4.setRotationPoint(6.49F, 7F, 7.5F); + frameRight4.setTextureSize(128, 64); + frameRight4.mirror = true; + setRotation(frameRight4, -0.837758F, 0F, 0F); + frameRight1 = new ModelRenderer(this, 4, 34); + frameRight1.addBox(0F, 0F, 0F, 1, 19, 1); + frameRight1.setRotationPoint(6.485F, -6F, -7.5F); + frameRight1.setTextureSize(128, 64); + frameRight1.mirror = true; + setRotation(frameRight1, 0.837758F, 0F, 0F); + frameRight2 = new ModelRenderer(this, 4, 34); + frameRight2.addBox(0F, 0F, -1F, 1, 19, 1); + frameRight2.setRotationPoint(6.49F, -6F, 7.5F); + frameRight2.setTextureSize(128, 64); + frameRight2.mirror = true; + setRotation(frameRight2, -0.837758F, 0F, 0F); + frameLeft5 = new ModelRenderer(this, 4, 34); + frameLeft5.addBox(0F, 0F, 0F, 1, 19, 1); + frameLeft5.setRotationPoint(-7.485F, 7F, -7.5F); + frameLeft5.setTextureSize(128, 64); + frameLeft5.mirror = true; + setRotation(frameLeft5, 0.837758F, 0F, 0F); + frameLeft4 = new ModelRenderer(this, 4, 34); + frameLeft4.addBox(0F, 0F, -1F, 1, 19, 1); + frameLeft4.setRotationPoint(-7.49F, 7F, 7.5F); + frameLeft4.setTextureSize(128, 64); + frameLeft4.mirror = true; + setRotation(frameLeft4, -0.837758F, 0F, 0F); + frameBack3 = new ModelRenderer(this, 36, 52); + frameBack3.addBox(0F, 0F, 0F, 13, 1, 1); + frameBack3.setRotationPoint(-6.5F, 6F, 6.5F); + frameBack3.setTextureSize(128, 64); + frameBack3.mirror = true; + setRotation(frameBack3, 0F, 0F, 0F); + frameLeft2 = new ModelRenderer(this, 4, 34); + frameLeft2.addBox(0F, 0F, 0F, 1, 19, 1); + frameLeft2.setRotationPoint(-7.485F, -6F, -7.5F); + frameLeft2.setTextureSize(128, 64); + frameLeft2.mirror = true; + setRotation(frameLeft2, 0.837758F, 0F, 0F); + frameLeft1 = new ModelRenderer(this, 4, 34); + frameLeft1.addBox(0F, 0F, -1F, 1, 19, 1); + frameLeft1.setRotationPoint(-7.49F, -6F, 7.5F); + frameLeft1.setTextureSize(128, 64); + frameLeft1.mirror = true; + setRotation(frameLeft1, -0.837758F, 0F, 0F); + pole2 = new ModelRenderer(this, 0, 34); + pole2.addBox(0F, 0F, 0F, 1, 25, 1); + pole2.setRotationPoint(-7.5F, -6F, 6.5F); + pole2.setTextureSize(128, 64); + pole2.mirror = true; + setRotation(pole2, 0F, 0F, 0F); + frameBack1 = new ModelRenderer(this, 4, 34); + frameBack1.addBox(-1F, 0F, 0F, 1, 19, 1); + frameBack1.setRotationPoint(7.5F, -6F, 6.49F); + frameBack1.setTextureSize(128, 64); + frameBack1.mirror = true; + setRotation(frameBack1, 0F, 0F, 0.837758F); + frameBack2 = new ModelRenderer(this, 4, 34); + frameBack2.addBox(0F, 0F, 0F, 1, 19, 1); + frameBack2.setRotationPoint(-7.5F, -6F, 6.49F); + frameBack2.setTextureSize(128, 64); + frameBack2.mirror = true; + setRotation(frameBack2, 0F, 0F, -0.837758F); + frameBack4 = new ModelRenderer(this, 4, 34); + frameBack4.addBox(0F, 0F, 0F, 1, 19, 1); + frameBack4.setRotationPoint(-7.5F, 7F, 6.49F); + frameBack4.setTextureSize(128, 64); + frameBack4.mirror = true; + setRotation(frameBack4, 0F, 0F, -0.837758F); + frameLeft3 = new ModelRenderer(this, 64, 27); + frameLeft3.addBox(0F, 0F, 0F, 1, 1, 13); + frameLeft3.setRotationPoint(-7.5F, 6F, -6.5F); + frameLeft3.setTextureSize(128, 64); + frameLeft3.mirror = true; + setRotation(frameLeft3, 0F, 0F, 0F); + conduit = new ModelRenderer(this, 64, 0); + conduit.addBox(0F, 0F, 0F, 4, 25, 2); + conduit.setRotationPoint(-2F, -6F, 6F); + conduit.setTextureSize(128, 64); + conduit.mirror = true; + setRotation(conduit, 0F, 0F, 0F); + plate1 = new ModelRenderer(this, 76, 0); + plate1.addBox(0F, 0F, 0F, 10, 1, 12); + plate1.setRotationPoint(-5F, -6F, -5F); + plate1.setTextureSize(128, 64); + plate1.mirror = true; + setRotation(plate1, 0F, 0F, 0F); + rivet10 = new ModelRenderer(this, 0, 0); + rivet10.addBox(0F, 0F, 0F, 1, 1, 1); + rivet10.setRotationPoint(3.5F, -5.5F, 3.5F); + rivet10.setTextureSize(128, 64); + rivet10.mirror = true; + setRotation(rivet10, 0F, 0F, 0F); + rivet5 = new ModelRenderer(this, 0, 0); + rivet5.addBox(0F, 0F, 0F, 1, 1, 1); + rivet5.setRotationPoint(-4.5F, -5.5F, 3.5F); + rivet5.setTextureSize(128, 64); + rivet5.mirror = true; + setRotation(rivet5, 0F, 0F, 0F); + rivet1 = new ModelRenderer(this, 0, 0); + rivet1.addBox(0F, 0F, 0F, 1, 1, 1); + rivet1.setRotationPoint(-4.5F, -5.5F, -4.5F); + rivet1.setTextureSize(128, 64); + rivet1.mirror = true; + setRotation(rivet1, 0F, 0F, 0F); + rivet6 = new ModelRenderer(this, 0, 0); + rivet6.addBox(0F, 0F, 0F, 1, 1, 1); + rivet6.setRotationPoint(3.5F, -5.5F, -4.5F); + rivet6.setTextureSize(128, 64); + rivet6.mirror = true; + setRotation(rivet6, 0F, 0F, 0F); + rivet2 = new ModelRenderer(this, 0, 0); + rivet2.addBox(0F, 0F, 0F, 1, 1, 1); + rivet2.setRotationPoint(-4.5F, -5.5F, -2.5F); + rivet2.setTextureSize(128, 64); + rivet2.mirror = true; + setRotation(rivet2, 0F, 0F, 0F); + rivet7 = new ModelRenderer(this, 0, 0); + rivet7.addBox(0F, 0F, 0F, 1, 1, 1); + rivet7.setRotationPoint(3.5F, -5.5F, -2.5F); + rivet7.setTextureSize(128, 64); + rivet7.mirror = true; + setRotation(rivet7, 0F, 0F, 0F); + rivet3 = new ModelRenderer(this, 0, 0); + rivet3.addBox(0F, 0F, 0F, 1, 1, 1); + rivet3.setRotationPoint(-4.5F, -5.5F, -0.5F); + rivet3.setTextureSize(128, 64); + rivet3.mirror = true; + setRotation(rivet3, 0F, 0F, 0F); + rivet8 = new ModelRenderer(this, 0, 0); + rivet8.addBox(0F, 0F, 0F, 1, 1, 1); + rivet8.setRotationPoint(3.5F, -5.5F, -0.5F); + rivet8.setTextureSize(128, 64); + rivet8.mirror = true; + setRotation(rivet8, 0F, 0F, 0F); + rivet4 = new ModelRenderer(this, 0, 0); + rivet4.addBox(0F, 0F, 0F, 1, 1, 1); + rivet4.setRotationPoint(-4.5F, -5.5F, 1.5F); + rivet4.setTextureSize(128, 64); + rivet4.mirror = true; + setRotation(rivet4, 0F, 0F, 0F); + rivet9 = new ModelRenderer(this, 0, 0); + rivet9.addBox(0F, 0F, 0F, 1, 1, 1); + rivet9.setRotationPoint(3.5F, -5.5F, 1.5F); + rivet9.setTextureSize(128, 64); + rivet9.mirror = true; + setRotation(rivet9, 0F, 0F, 0F); } - public void render(float size) + public void render(float size) { - Base.render(size); - Tower.render(size); - TowerTop.render(size); - TopPanel.render(size); - Vibrator.render(size); - PoleBR.render(size); - PoleLB.render(size); - PoleFL.render(size); - PoleRF.render(size); - PoleL.render(size); - PoleR.render(size); - Cable.render(size); - ScreenFront.render(size); - - GL11.glScalef(1.01F, 1.01F, 1.01F); - Keyboard.render(size); + plate3.render(size); + baseBack.render(size); + motor.render(size); + port.render(size); + pole4.render(size); + shaft2.render(size); + shaft1.render(size); + arm3.render(size); + plate2.render(size); + arm2.render(size); + arm1.render(size); + top.render(size); + frameBack5.render(size); + pole3.render(size); + frameRight5.render(size); + baseRight.render(size); + baseFront.render(size); + baseLeft.render(size); + frameRight3.render(size); + pole1.render(size); + frameRight4.render(size); + frameRight1.render(size); + frameRight2.render(size); + frameLeft5.render(size); + frameLeft4.render(size); + frameBack3.render(size); + frameLeft2.render(size); + frameLeft1.render(size); + pole2.render(size); + frameBack1.render(size); + frameBack2.render(size); + frameBack4.render(size); + frameLeft3.render(size); + conduit.render(size); + plate1.render(size); + rivet10.render(size); + rivet5.render(size); + rivet1.render(size); + rivet6.render(size); + rivet2.render(size); + rivet7.render(size); + rivet3.render(size); + rivet8.render(size); + rivet4.render(size); + rivet9.render(size); } - + public void renderWithPiston(float piston, float size) { - Vibrator.rotationPointY = 19 - (piston*7); + shaft1.rotationPointY = 6 - (piston*12); + plate2.rotationPointY = 21 - (piston*12); + plate3.rotationPointY = 22 - (piston*12); + render(size); } diff --git a/src/main/java/mekanism/client/model/ModelSolarNeutronActivator.java b/src/main/java/mekanism/client/model/ModelSolarNeutronActivator.java new file mode 100644 index 000000000..7159c810d --- /dev/null +++ b/src/main/java/mekanism/client/model/ModelSolarNeutronActivator.java @@ -0,0 +1,405 @@ +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 ModelSolarNeutronActivator extends ModelBase +{ + ModelRenderer pole; + ModelRenderer panel3; + ModelRenderer port; + ModelRenderer panel1; + ModelRenderer panel2; + ModelRenderer panelBase; + ModelRenderer panelBraceLeft2; + ModelRenderer panelBraceRight2; + ModelRenderer panelBraceLeft1; + ModelRenderer panelBraceRight1; + ModelRenderer panelBrace; + ModelRenderer bridge; + ModelRenderer platform; + ModelRenderer hole2; + ModelRenderer hole4; + ModelRenderer hole1; + ModelRenderer hole3; + ModelRenderer brace2; + ModelRenderer tube2c; + ModelRenderer tube1b; + ModelRenderer tube1c; + ModelRenderer tube2b; + ModelRenderer tube2a; + ModelRenderer tube1a; + ModelRenderer conduit; + ModelRenderer brace1; + ModelRenderer tank; + ModelRenderer laser; + ModelRenderer base; + ModelRenderer support1; + ModelRenderer support2; + ModelRenderer support3; + ModelRenderer support4; + ModelRenderer support5; + ModelRenderer support6; + ModelRenderer support7; + ModelRenderer support8; + ModelRenderer support9; + ModelRenderer support10; + ModelRenderer support11; + ModelRenderer support12; + ModelRenderer support13; + ModelRenderer support14; + ModelRenderer support15; + ModelRenderer support16; + ModelRenderer portConnector; + ModelRenderer laserBeamToggle; + + public ModelSolarNeutronActivator() + { + textureWidth = 128; + textureHeight = 64; + + pole = new ModelRenderer(this, 116, 0); + pole.addBox(0F, 0F, 0F, 4, 15, 2); + pole.setRotationPoint(-2F, -5F, 6F); + pole.setTextureSize(128, 64); + pole.mirror = true; + setRotation(pole, 0F, 0F, 0F); + panel3 = new ModelRenderer(this, 84, 32); + panel3.addBox(-6F, 0F, -16F, 6, 1, 16); + panel3.setRotationPoint(-2.75F, -4.95F, 8F); + panel3.setTextureSize(128, 64); + panel3.mirror = true; + setRotation(panel3, -0.1082104F, 0.0279253F, 0.2617994F); + port = new ModelRenderer(this, 0, 45); + port.addBox(0F, 0F, 0F, 8, 8, 1); + port.setRotationPoint(-4F, 12F, -8.01F); + port.setTextureSize(128, 64); + port.mirror = true; + setRotation(port, 0F, 0F, 0F); + panel1 = new ModelRenderer(this, 84, 32); + panel1.mirror = true; + panel1.addBox(0F, 0F, -16F, 6, 1, 16); + panel1.setRotationPoint(2.75F, -4.95F, 8F); + panel1.setTextureSize(128, 64); + setRotation(panel1, -0.1082104F, -0.0279253F, -0.2617994F); + panel2 = new ModelRenderer(this, 84, 15); + panel2.addBox(0F, 0F, -16F, 6, 1, 16); + panel2.setRotationPoint(-3F, -5F, 8F); + panel2.setTextureSize(128, 64); + panel2.mirror = true; + setRotation(panel2, -0.1047198F, 0F, 0F); + panelBase = new ModelRenderer(this, 28, 45); + panelBase.addBox(0F, 1F, -16F, 6, 1, 14); + panelBase.setRotationPoint(-3F, -5F, 9F); + panelBase.setTextureSize(128, 64); + panelBase.mirror = true; + setRotation(panelBase, -0.1047198F, 0F, 0F); + panelBraceLeft2 = new ModelRenderer(this, 64, 15); + panelBraceLeft2.addBox(-4F, 0.5F, -5F, 5, 1, 2); + panelBraceLeft2.setRotationPoint(-3F, -5F, 9F); + panelBraceLeft2.setTextureSize(128, 64); + panelBraceLeft2.mirror = true; + setRotation(panelBraceLeft2, -0.1047198F, 0F, 0.2505517F); + panelBraceRight2 = new ModelRenderer(this, 64, 15); + panelBraceRight2.addBox(-1F, 0.5F, -5F, 5, 1, 2); + panelBraceRight2.setRotationPoint(3F, -5F, 9F); + panelBraceRight2.setTextureSize(128, 64); + panelBraceRight2.mirror = true; + setRotation(panelBraceRight2, -0.1047198F, 0F, -0.2555938F); + panelBraceLeft1 = new ModelRenderer(this, 64, 15); + panelBraceLeft1.addBox(-4F, 0.5F, -15F, 5, 1, 2); + panelBraceLeft1.setRotationPoint(-3F, -5F, 9F); + panelBraceLeft1.setTextureSize(128, 64); + panelBraceLeft1.mirror = true; + setRotation(panelBraceLeft1, -0.1047198F, 0F, 0.2505517F); + panelBraceRight1 = new ModelRenderer(this, 64, 15); + panelBraceRight1.addBox(-1F, 0.5F, -15F, 5, 1, 2); + panelBraceRight1.setRotationPoint(3F, -5F, 9F); + panelBraceRight1.setTextureSize(128, 64); + panelBraceRight1.mirror = true; + setRotation(panelBraceRight1, -0.1047198F, 0F, -0.2555938F); + panelBrace = new ModelRenderer(this, 56, 18); + panelBrace.addBox(0F, 1.2F, -10F, 2, 2, 9); + panelBrace.setRotationPoint(-1F, -5F, 8F); + panelBrace.setTextureSize(128, 64); + panelBrace.mirror = true; + setRotation(panelBrace, -0.1047198F, 0F, 0F); + bridge = new ModelRenderer(this, 65, 1); + bridge.addBox(0F, 0F, 0F, 12, 1, 13); + bridge.setRotationPoint(-6F, 19F, -6F); + bridge.setTextureSize(128, 64); + bridge.mirror = true; + setRotation(bridge, 0F, 0F, 0F); + platform = new ModelRenderer(this, 18, 45); + platform.addBox(-2.5F, 1F, -2.5F, 6, 3, 6); + platform.setRotationPoint(-0.5F, 8F, -2.5F); + platform.setTextureSize(128, 64); + platform.mirror = true; + setRotation(platform, -0.1047198F, 0F, 0F); + hole2 = new ModelRenderer(this, 0, 6); + hole2.addBox(1F, 0F, 0F, 1, 2, 1); + hole2.setRotationPoint(-0.5F, 8F, -2.5F); + hole2.setTextureSize(128, 64); + hole2.mirror = true; + setRotation(hole2, -0.1047198F, 0F, 0F); + hole4 = new ModelRenderer(this, 0, 3); + hole4.addBox(-1F, 0F, 1F, 3, 2, 1); + hole4.setRotationPoint(-0.5F, 8F, -2.5F); + hole4.setTextureSize(128, 64); + hole4.mirror = true; + setRotation(hole4, -0.1047198F, 0F, 0F); + hole1 = new ModelRenderer(this, 0, 3); + hole1.addBox(-1F, 0F, -1F, 3, 2, 1); + hole1.setRotationPoint(-0.5F, 8F, -2.5F); + hole1.setTextureSize(128, 64); + hole1.mirror = true; + setRotation(hole1, -0.1047198F, 0F, 0F); + hole3 = new ModelRenderer(this, 0, 6); + hole3.addBox(-1F, 0F, 0F, 1, 2, 1); + hole3.setRotationPoint(-0.5F, 8F, -2.5F); + hole3.setTextureSize(128, 64); + hole3.mirror = true; + setRotation(hole3, -0.1047198F, 0F, 0F); + brace2 = new ModelRenderer(this, 0, 11); + brace2.addBox(0F, 0F, 0F, 1, 1, 2); + brace2.setRotationPoint(1F, 9.5F, -7.1F); + brace2.setTextureSize(128, 64); + brace2.mirror = true; + setRotation(brace2, 0.1745329F, 0F, 0F); + tube2c = new ModelRenderer(this, 0, 9); + tube2c.addBox(0F, 0F, 0F, 1, 1, 1); + tube2c.setRotationPoint(2F, 9F, 4F); + tube2c.setTextureSize(128, 64); + tube2c.mirror = true; + setRotation(tube2c, 0F, 0F, 0F); + tube1b = new ModelRenderer(this, 0, 14); + tube1b.addBox(0F, 0F, 0F, 6, 1, 1); + tube1b.setRotationPoint(-3F, 8F, 2F); + tube1b.setTextureSize(128, 64); + tube1b.mirror = true; + setRotation(tube1b, 0F, 0F, 0F); + tube1c = new ModelRenderer(this, 0, 9); + tube1c.addBox(0F, 0F, 0F, 1, 1, 1); + tube1c.setRotationPoint(2F, 9F, 2F); + tube1c.setTextureSize(128, 64); + tube1c.mirror = true; + setRotation(tube1c, 0F, 0F, 0F); + tube2b = new ModelRenderer(this, 0, 14); + tube2b.addBox(0F, 0F, 0F, 6, 1, 1); + tube2b.setRotationPoint(-3F, 8F, 4F); + tube2b.setTextureSize(128, 64); + tube2b.mirror = true; + setRotation(tube2b, 0F, 0F, 0F); + tube2a = new ModelRenderer(this, 0, 9); + tube2a.addBox(0F, 0F, 0F, 1, 1, 1); + tube2a.setRotationPoint(-3F, 9F, 4F); + tube2a.setTextureSize(128, 64); + tube2a.mirror = true; + setRotation(tube2a, 0F, 0F, 0F); + tube1a = new ModelRenderer(this, 0, 9); + tube1a.addBox(0F, 0F, 0F, 1, 1, 1); + tube1a.setRotationPoint(-3F, 9F, 2F); + tube1a.setTextureSize(128, 64); + tube1a.mirror = true; + setRotation(tube1a, 0F, 0F, 0F); + conduit = new ModelRenderer(this, 48, 0); + conduit.addBox(0F, 0F, 0F, 2, 1, 7); + conduit.setRotationPoint(-1F, 9.5F, -1F); + conduit.setTextureSize(128, 64); + conduit.mirror = true; + setRotation(conduit, 0F, 0F, 0F); + brace1 = new ModelRenderer(this, 0, 11); + brace1.addBox(0F, 0F, 0F, 1, 1, 2); + brace1.setRotationPoint(-2F, 9.5F, -7.1F); + brace1.setTextureSize(128, 64); + brace1.mirror = true; + setRotation(brace1, 0.1745329F, 0F, 0F); + tank = new ModelRenderer(this, 0, 0); + tank.addBox(0F, 0F, 0F, 16, 9, 16); + tank.setRotationPoint(-8F, 10F, -8F); + tank.setTextureSize(128, 64); + tank.mirror = true; + setRotation(tank, 0F, 0F, 0F); + laser = new ModelRenderer(this, 4, 0); + laser.addBox(0.5F, 2.1F, -9F, 1, 2, 1); + laser.setRotationPoint(-1F, -5F, 8F); + laser.setTextureSize(128, 64); + laser.mirror = true; + setRotation(laser, -0.1117011F, 0F, 0F); + base = new ModelRenderer(this, 0, 25); + base.addBox(0F, 0F, 0F, 16, 4, 16); + base.setRotationPoint(-8F, 20F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + support1 = new ModelRenderer(this, 0, 0); + support1.addBox(0F, 0F, 0F, 1, 1, 1); + support1.setRotationPoint(6.5F, 19F, -7.5F); + support1.setTextureSize(128, 64); + support1.mirror = true; + setRotation(support1, 0F, 0F, 0F); + support2 = new ModelRenderer(this, 0, 0); + support2.addBox(0F, 0F, 0F, 1, 1, 1); + support2.setRotationPoint(6.5F, 19F, 6.5F); + support2.setTextureSize(128, 64); + support2.mirror = true; + setRotation(support2, 0F, 0F, 0F); + support3 = new ModelRenderer(this, 0, 0); + support3.addBox(0F, 0F, 0F, 1, 1, 1); + support3.setRotationPoint(6.5F, 19F, -5.5F); + support3.setTextureSize(128, 64); + support3.mirror = true; + setRotation(support3, 0F, 0F, 0F); + support4 = new ModelRenderer(this, 0, 0); + support4.addBox(0F, 0F, 0F, 1, 1, 1); + support4.setRotationPoint(6.5F, 19F, -3.5F); + support4.setTextureSize(128, 64); + support4.mirror = true; + setRotation(support4, 0F, 0F, 0F); + support5 = new ModelRenderer(this, 0, 0); + support5.addBox(0F, 0F, 0F, 1, 1, 1); + support5.setRotationPoint(6.5F, 19F, -1.5F); + support5.setTextureSize(128, 64); + support5.mirror = true; + setRotation(support5, 0F, 0F, 0F); + support6 = new ModelRenderer(this, 0, 0); + support6.addBox(0F, 0F, 0F, 1, 1, 1); + support6.setRotationPoint(6.5F, 19F, 0.5F); + support6.setTextureSize(128, 64); + support6.mirror = true; + setRotation(support6, 0F, 0F, 0F); + support7 = new ModelRenderer(this, 0, 0); + support7.addBox(0F, 0F, 0F, 1, 1, 1); + support7.setRotationPoint(6.5F, 19F, 2.5F); + support7.setTextureSize(128, 64); + support7.mirror = true; + setRotation(support7, 0F, 0F, 0F); + support8 = new ModelRenderer(this, 0, 0); + support8.addBox(0F, 0F, 0F, 1, 1, 1); + support8.setRotationPoint(6.5F, 19F, 4.5F); + support8.setTextureSize(128, 64); + support8.mirror = true; + setRotation(support8, 0F, 0F, 0F); + support9 = new ModelRenderer(this, 0, 0); + support9.addBox(0F, 0F, 0F, 1, 1, 1); + support9.setRotationPoint(-7.5F, 19F, 6.5F); + support9.setTextureSize(128, 64); + support9.mirror = true; + setRotation(support9, 0F, 0F, 0F); + support10 = new ModelRenderer(this, 0, 0); + support10.addBox(0F, 0F, 0F, 1, 1, 1); + support10.setRotationPoint(-7.5F, 19F, 4.5F); + support10.setTextureSize(128, 64); + support10.mirror = true; + setRotation(support10, 0F, 0F, 0F); + support11 = new ModelRenderer(this, 0, 0); + support11.addBox(0F, 0F, 0F, 1, 1, 1); + support11.setRotationPoint(-7.5F, 19F, 2.5F); + support11.setTextureSize(128, 64); + support11.mirror = true; + setRotation(support11, 0F, 0F, 0F); + support12 = new ModelRenderer(this, 0, 0); + support12.addBox(0F, 0F, 0F, 1, 1, 1); + support12.setRotationPoint(-7.5F, 19F, 0.5F); + support12.setTextureSize(128, 64); + support12.mirror = true; + setRotation(support12, 0F, 0F, 0F); + support13 = new ModelRenderer(this, 0, 0); + support13.addBox(0F, 0F, 0F, 1, 1, 1); + support13.setRotationPoint(-7.5F, 19F, -1.5F); + support13.setTextureSize(128, 64); + support13.mirror = true; + setRotation(support13, 0F, 0F, 0F); + support14 = new ModelRenderer(this, 0, 0); + support14.addBox(0F, 0F, 0F, 1, 1, 1); + support14.setRotationPoint(-7.5F, 19F, -3.5F); + support14.setTextureSize(128, 64); + support14.mirror = true; + setRotation(support14, 0F, 0F, 0F); + support15 = new ModelRenderer(this, 0, 0); + support15.addBox(0F, 0F, 0F, 1, 1, 1); + support15.setRotationPoint(-7.5F, 19F, -5.5F); + support15.setTextureSize(128, 64); + support15.mirror = true; + setRotation(support15, 0F, 0F, 0F); + support16 = new ModelRenderer(this, 0, 0); + support16.addBox(0F, 0F, 0F, 1, 1, 1); + support16.setRotationPoint(-7.5F, 19F, -7.5F); + support16.setTextureSize(128, 64); + support16.mirror = true; + setRotation(support16, 0F, 0F, 0F); + portConnector = new ModelRenderer(this, 0, 14); + portConnector.addBox(0F, 0F, 0F, 6, 1, 1); + portConnector.setRotationPoint(-3F, 19F, -7.01F); + portConnector.setTextureSize(128, 64); + portConnector.mirror = true; + setRotation(portConnector, 0F, 0F, 0F); + laserBeamToggle = new ModelRenderer(this, 12, 0); + laserBeamToggle.addBox(0.5F, 4.1F, -9F, 1, 11, 1); + laserBeamToggle.setRotationPoint(-1F, -5F, 8F); + laserBeamToggle.setTextureSize(128, 64); + laserBeamToggle.mirror = true; + setRotation(laserBeamToggle, -0.1117011F, 0F, 0F); + } + + public void render(float size) + { + pole.render(size); + panel3.render(size); + port.render(size); + panel1.render(size); + panel2.render(size); + panelBase.render(size); + panelBraceLeft2.render(size); + panelBraceRight2.render(size); + panelBraceLeft1.render(size); + panelBraceRight1.render(size); + panelBrace.render(size); + bridge.render(size); + platform.render(size); + hole2.render(size); + hole4.render(size); + hole1.render(size); + hole3.render(size); + brace2.render(size); + tube2c.render(size); + tube1b.render(size); + tube1c.render(size); + tube2b.render(size); + tube2a.render(size); + tube1a.render(size); + conduit.render(size); + brace1.render(size); + tank.render(size); + laser.render(size); + base.render(size); + support1.render(size); + support2.render(size); + support3.render(size); + support4.render(size); + support5.render(size); + support6.render(size); + support7.render(size); + support8.render(size); + support9.render(size); + support10.render(size); + support11.render(size); + support12.render(size); + support13.render(size); + support14.render(size); + support15.render(size); + support16.render(size); + portConnector.render(size); + laserBeamToggle.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/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index a99f56d7c..37686fa73 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -18,6 +18,7 @@ import mekanism.client.model.ModelMetallurgicInfuser; import mekanism.client.model.ModelPressurizedReactionChamber; import mekanism.client.model.ModelRotaryCondensentrator; import mekanism.client.model.ModelSeismicVibrator; +import mekanism.client.model.ModelSolarNeutronActivator; import mekanism.client.render.MekanismRenderer; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.util.MekanismUtils; @@ -25,10 +26,7 @@ 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.util.ResourceLocation; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; import org.lwjgl.opengl.GL11; @@ -56,8 +54,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler public ModelFluidicPlenisher fluidicPlenisher = new ModelFluidicPlenisher(); public ModelLaser laser = new ModelLaser(); public ModelLaserAmplifier laserAmplifier = new ModelLaserAmplifier(); - - public IModelCustom solarNeutronActivator = AdvancedModelLoader.loadModel(new ResourceLocation("mekanism:models/solar_tri.obj")); + public ModelSolarNeutronActivator solarNeutronActivator = new ModelSolarNeutronActivator(); @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) @@ -132,7 +129,6 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glTranslatef(0.0F, -1.06F, 0.05F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalInfuser.png")); chemicalInfuser.render(0.0625F); - chemicalInfuser.renderGlass(0.0625F); } else if(type == MachineType.ELECTROLYTIC_SEPARATOR) { @@ -169,8 +165,9 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler else if(type == MachineType.SEISMIC_VIBRATOR) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.06F, 0.05F); + GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); + GL11.glScalef(0.6F, 0.6F, 0.6F); + GL11.glTranslatef(0.0F, -0.55F, 0.0F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SeismicVibrator.png")); seismicVibrator.render(0.0625F); } @@ -216,11 +213,12 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler } else if(type == MachineType.SOLAR_NEUTRON_ACTIVATOR) { + GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); - GL11.glScalef(0.45F, 0.45F, 0.45F); - GL11.glTranslatef(0.0F, -1.3F, 0.0F); + GL11.glScalef(0.6F, 0.6F, 0.6F); + GL11.glTranslatef(0.0F, -0.55F, 0.0F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SolarNeutronActivator.png")); - solarNeutronActivator.renderAll(); + solarNeutronActivator.render(0.0625F); } else { GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java index 290fb04b1..9b3571c2c 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java @@ -1,20 +1,11 @@ package mekanism.client.render.tileentity; -import java.util.HashMap; -import java.util.Map; - -import mekanism.api.gas.Gas; import mekanism.client.model.ModelChemicalInfuser; -import mekanism.client.render.MekanismRenderer; -import mekanism.client.render.MekanismRenderer.DisplayInteger; -import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; @@ -22,70 +13,13 @@ public class RenderChemicalInfuser extends TileEntitySpecialRenderer { private ModelChemicalInfuser model = new ModelChemicalInfuser(); - private static final double offset = 0.001; - - private Map> cachedGasses = new HashMap>(); - @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) { renderAModelAt((TileEntityChemicalInfuser)tileEntity, x, y, z, partialTick); } - @SuppressWarnings("incomplete-switch") private void renderAModelAt(TileEntityChemicalInfuser tileEntity, double x, double y, double z, float partialTick) - { - render(false, x, y, z, tileEntity); - - if(tileEntity.leftTank.getGas() != null) - { - push(); - - GL11.glTranslatef((float)x, (float)y, (float)z); - GL11.glColor4f(1.0F, 1.0F, 1.0F, (float)tileEntity.leftTank.getStored()/tileEntity.leftTank.getMaxGas()); - bindTexture(MekanismRenderer.getBlocksTexture()); - getListAndRender(ForgeDirection.getOrientation(tileEntity.facing), tileEntity.leftTank.getGas().getGas()).render(); - GL11.glColor4f(1, 1, 1, 1); - - pop(); - } - - if(tileEntity.rightTank.getGas() != null) - { - push(); - - switch(ForgeDirection.getOrientation(tileEntity.facing)) - { - case NORTH: - GL11.glTranslatef(-0.4375F, 0, 0); - break; - case SOUTH: - GL11.glTranslatef(0.4375F, 0, 0); - break; - case EAST: - GL11.glTranslatef(0, 0, -0.4375F); - break; - case WEST: - GL11.glTranslatef(0, 0, 0.4375F); - break; - } - - GL11.glTranslatef((float)x, (float)y, (float)z); - GL11.glColor4f(1.0F, 1.0F, 1.0F, (float)tileEntity.rightTank.getStored()/tileEntity.rightTank.getMaxGas()); - bindTexture(MekanismRenderer.getBlocksTexture()); - getListAndRender(ForgeDirection.getOrientation(tileEntity.facing), tileEntity.rightTank.getGas().getGas()).render(); - GL11.glColor4f(1, 1, 1, 1); - - pop(); - } - - render(true, x, y, z, tileEntity); - } - - /* - * 0: casing, 1: glass - */ - private void render(boolean glass, double x, double y, double z, TileEntityChemicalInfuser tileEntity) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); @@ -101,116 +35,8 @@ public class RenderChemicalInfuser extends TileEntitySpecialRenderer } GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - - if(!glass) - { - model.render(0.0625F); - } - else { - model.renderGlass(0.0625F); - } + model.render(0.0625F); GL11.glPopMatrix(); } - - @SuppressWarnings("incomplete-switch") - private DisplayInteger getListAndRender(ForgeDirection side, Gas gas) - { - if(gas == null || gas.getIcon() == null) - { - return null; - } - - if(cachedGasses.containsKey(side) && cachedGasses.get(side).containsKey(gas)) - { - return cachedGasses.get(side).get(gas); - } - - Model3D toReturn = new Model3D(); - toReturn.baseBlock = Blocks.water; - toReturn.setTexture(gas.getIcon()); - - DisplayInteger display = DisplayInteger.createAndStart(); - - if(cachedGasses.containsKey(side)) - { - cachedGasses.get(side).put(gas, display); - } - else { - HashMap map = new HashMap(); - map.put(gas, display); - cachedGasses.put(side, map); - } - - switch(side) - { - case NORTH: - { - toReturn.minX = 0.625 + offset; - toReturn.minY = 0.0625 + offset; - toReturn.minZ = 0.625 + offset; - - toReturn.maxX = 0.8125 - offset; - toReturn.maxY = 0.9375 - offset; - toReturn.maxZ = 0.8125 - offset; - break; - } - case SOUTH: - { - toReturn.minX = 0.1875 + offset; - toReturn.minY = 0.0625 + offset; - toReturn.minZ = 0.1875 + offset; - - toReturn.maxX = 0.375 - offset; - toReturn.maxY = 0.9375 - offset; - toReturn.maxZ = 0.375 - offset; - break; - } - case WEST: - { - toReturn.minX = 0.625 + offset; - toReturn.minY = 0.0625 + offset; - toReturn.minZ = 0.1875 + offset; - - toReturn.maxX = 0.8125 - offset; - toReturn.maxY = 0.9375 - offset; - toReturn.maxZ = 0.375 - offset; - break; - } - case EAST: - { - toReturn.minX = 0.1875 + offset; - toReturn.minY = 0.0625 + offset; - toReturn.minZ = 0.625 + offset; - - toReturn.maxX = 0.375 - offset; - toReturn.maxY = 0.9375 - offset; - toReturn.maxZ = 0.8125 - offset; - break; - } - } - - MekanismRenderer.renderObject(toReturn); - display.endList(); - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - - return display; - } - - private void pop() - { - GL11.glPopAttrib(); - GL11.glPopMatrix(); - } - - private void push() - { - GL11.glPushMatrix(); - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glEnable(GL11.GL_BLEND); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - } } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java index dcb6040ee..158ac18af 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java @@ -5,14 +5,11 @@ import java.util.Map; import mekanism.api.gas.Gas; import mekanism.client.model.ModelChemicalOxidizer; -import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; -import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.tile.TileEntityChemicalOxidizer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; @@ -33,14 +30,6 @@ public class RenderChemicalOxidizer extends TileEntitySpecialRenderer } private void renderAModelAt(TileEntityChemicalOxidizer tileEntity, double x, double y, double z, float partialTick) - { - render(false, x, y, z, tileEntity); - } - - /* - * 0: casing, 1: glass - */ - private void render(boolean glass, double x, double y, double z, TileEntityChemicalOxidizer tileEntity) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); @@ -61,105 +50,4 @@ public class RenderChemicalOxidizer extends TileEntitySpecialRenderer GL11.glPopMatrix(); } - - @SuppressWarnings("incomplete-switch") - private DisplayInteger getListAndRender(ForgeDirection side, Gas gas) - { - if(gas == null || gas.getIcon() == null) - { - return null; - } - - if(cachedGasses.containsKey(side) && cachedGasses.get(side).containsKey(gas)) - { - return cachedGasses.get(side).get(gas); - } - - Model3D toReturn = new Model3D(); - toReturn.baseBlock = Blocks.water; - toReturn.setTexture(gas.getIcon()); - - DisplayInteger display = DisplayInteger.createAndStart(); - - if(cachedGasses.containsKey(side)) - { - cachedGasses.get(side).put(gas, display); - } - else { - HashMap map = new HashMap(); - map.put(gas, display); - cachedGasses.put(side, map); - } - - switch(side) - { - case NORTH: - { - toReturn.minX = 0.125 + offset; - toReturn.minY = 0.0625 + offset; - toReturn.minZ = 0.3125 + offset; - - toReturn.maxX = 0.5 - offset; - toReturn.maxY = 0.9375 - offset; - toReturn.maxZ = 0.6875 - offset; - break; - } - case SOUTH: - { - toReturn.minX = 0.5 + offset; - toReturn.minY = 0.0625 + offset; - toReturn.minZ = 0.3125 + offset; - - toReturn.maxX = 0.875 - offset; - toReturn.maxY = 0.9375 - offset; - toReturn.maxZ = 0.6875 - offset; - break; - } - case WEST: - { - toReturn.minX = 0.3125 + offset; - toReturn.minY = 0.0625 + offset; - toReturn.minZ = 0.5 + offset; - - toReturn.maxX = 0.6875 - offset; - toReturn.maxY = 0.9375 - offset; - toReturn.maxZ = 0.875 - offset; - break; - } - case EAST: - { - toReturn.minX = 0.3125 + offset; - toReturn.minY = 0.0625 + offset; - toReturn.minZ = 0.125 + offset; - - toReturn.maxX = 0.6875 - offset; - toReturn.maxY = 0.9375 - offset; - toReturn.maxZ = 0.5 - offset; - break; - } - } - - MekanismRenderer.renderObject(toReturn); - display.endList(); - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - - return display; - } - - private void pop() - { - GL11.glPopAttrib(); - GL11.glPopMatrix(); - } - - private void push() - { - GL11.glPushMatrix(); - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glEnable(GL11.GL_BLEND); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - } } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java b/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java index de2980387..797f44102 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java @@ -1,7 +1,6 @@ package mekanism.client.render.tileentity; import mekanism.client.model.ModelSeismicVibrator; -import mekanism.common.Mekanism; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -29,7 +28,7 @@ public class RenderSeismicVibrator extends TileEntitySpecialRenderer GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SeismicVibrator" + (tileEntity.isActive ? "On" : "") + ".png")); + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SeismicVibrator" /*+ (tileEntity.isActive ? "On" : "")*/ + ".png")); switch(tileEntity.facing) { @@ -39,29 +38,10 @@ public class RenderSeismicVibrator extends TileEntitySpecialRenderer case 5: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; } - if(!Mekanism.proxy.isPaused()) - { - float rate = 0.01F; - - if(!tileEntity.getActive() && tileEntity.clientPiston > 0) - { - if(tileEntity.clientPiston < 1) - { - tileEntity.clientPiston = 1 + (1-tileEntity.clientPiston); - } - - tileEntity.clientPiston = Math.min(2, tileEntity.clientPiston+rate)%2; - } - else if(tileEntity.getActive()) - { - tileEntity.clientPiston = Math.min(2, tileEntity.clientPiston+rate)%2; - } - } - - float actualRate = tileEntity.clientPiston < 1 ? tileEntity.clientPiston : 2-tileEntity.clientPiston; + float actualRate = (float)Math.sin((tileEntity.clientPiston + (tileEntity.isActive ? partialTick : 0))/5F); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - model.renderWithPiston(actualRate, 0.0625F); + model.renderWithPiston(Math.max(0, actualRate), 0.0625F); GL11.glPopMatrix(); } } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java b/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java index 043aa0db6..a02c3882a 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java @@ -1,12 +1,11 @@ package mekanism.client.render.tileentity; +import mekanism.client.model.ModelSolarNeutronActivator; import mekanism.common.tile.TileEntitySolarNeutronActivator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; import org.lwjgl.opengl.GL11; @@ -16,12 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderSolarNeutronActivator extends TileEntitySpecialRenderer { - private IModelCustom model; - - public RenderSolarNeutronActivator() - { - model = AdvancedModelLoader.loadModel(MekanismUtils.getResource(ResourceType.MODEL, "solar_tri.obj")); - } + private ModelSolarNeutronActivator model = new ModelSolarNeutronActivator(); @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) @@ -32,8 +26,8 @@ public class RenderSolarNeutronActivator extends TileEntitySpecialRenderer private void renderAModelAt(TileEntitySolarNeutronActivator tileEntity, double x, double y, double z, float partialTick) { GL11.glPushMatrix(); - GL11.glTranslatef((float)x+0.5F, (float)y, (float)z+0.5F); - GL11.glScalef(0.5F, 0.5F, 0.5F); + GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SolarNeutronActivator.png")); switch(tileEntity.facing) @@ -44,7 +38,9 @@ public class RenderSolarNeutronActivator extends TileEntitySpecialRenderer case 5: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; } - model.renderAll(); + GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + + model.render(0.0625F); GL11.glPopMatrix(); } } diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java index 7e0447554..748369efb 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java @@ -31,7 +31,7 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement public int updateDelay; - public float clientPiston; + public int clientPiston; public RedstoneControl controlType = RedstoneControl.DISABLED; @@ -51,6 +51,11 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement if(worldObj.isRemote) { + if(isActive) + { + clientPiston++; + } + if(updateDelay > 0) { updateDelay--; @@ -194,7 +199,7 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement @Override public EnumSet getConsumingSides() { - return EnumSet.of(ForgeDirection.UP); + return EnumSet.of(ForgeDirection.getOrientation(facing).getOpposite()); } @Override diff --git a/src/main/java/mekanism/generators/client/model/ModelSolarGenerator.java b/src/main/java/mekanism/generators/client/model/ModelSolarGenerator.java index 6020bf8fd..ff5bde0b5 100644 --- a/src/main/java/mekanism/generators/client/model/ModelSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelSolarGenerator.java @@ -5,26 +5,20 @@ import net.minecraft.client.model.ModelRenderer; public class ModelSolarGenerator extends ModelBase { - ModelRenderer solarPanelPipeBase; ModelRenderer solarPanel; ModelRenderer solarPanelBottom; ModelRenderer solarPanelConnector; - ModelRenderer solarPanelPipeU; + ModelRenderer solarPanelRod2; ModelRenderer solarPanelPipeConnector; - ModelRenderer solarPanelPipeBase1; - ModelRenderer solarPanelPipeU1; + ModelRenderer solarPanelPort; + ModelRenderer solarPanelRod1; + ModelRenderer solarPanelPipeBase; public ModelSolarGenerator() { textureWidth = 64; textureHeight = 64; - solarPanelPipeBase = new ModelRenderer(this, 48, 33); - solarPanelPipeBase.addBox(0F, 0F, 0F, 1, 6, 6); - solarPanelPipeBase.setRotationPoint(3F, 23F, -3F); - solarPanelPipeBase.setTextureSize(64, 64); - solarPanelPipeBase.mirror = true; - setRotation(solarPanelPipeBase, 0F, 0F, 1.570796F); solarPanel = new ModelRenderer(this, 0, 0); solarPanel.addBox(0F, 0F, 0F, 16, 2, 16); solarPanel.setRotationPoint(-8F, 13F, -8F); @@ -43,42 +37,48 @@ public class ModelSolarGenerator extends ModelBase solarPanelConnector.setTextureSize(64, 64); solarPanelConnector.mirror = true; setRotation(solarPanelConnector, 0F, 0F, 0F); - solarPanelPipeU = new ModelRenderer(this, 16, 33); - solarPanelPipeU.addBox(0F, 0F, 0F, 2, 3, 2); - solarPanelPipeU.setRotationPoint(-1F, 19F, -1F); - solarPanelPipeU.setTextureSize(64, 64); - solarPanelPipeU.mirror = true; - setRotation(solarPanelPipeU, 0F, 0F, 0F); + solarPanelRod2 = new ModelRenderer(this, 16, 33); + solarPanelRod2.addBox(0F, 0F, 0F, 2, 3, 2); + solarPanelRod2.setRotationPoint(-1F, 19F, -1F); + solarPanelRod2.setTextureSize(64, 64); + solarPanelRod2.mirror = true; + setRotation(solarPanelRod2, 0F, 0F, 0F); solarPanelPipeConnector = new ModelRenderer(this, 24, 33); solarPanelPipeConnector.addBox(0F, 0F, 0F, 3, 3, 3); solarPanelPipeConnector.setRotationPoint(-1.5F, 18F, -1.5F); solarPanelPipeConnector.setTextureSize(64, 64); solarPanelPipeConnector.mirror = true; setRotation(solarPanelPipeConnector, 0F, 0F, 0F); - solarPanelPipeBase1 = new ModelRenderer(this, 36, 33); - solarPanelPipeBase1.addBox(0F, 0F, 0F, 1, 4, 4); - solarPanelPipeBase1.setRotationPoint(2F, 22F, -2F); - solarPanelPipeBase1.setTextureSize(64, 64); - solarPanelPipeBase1.mirror = true; - setRotation(solarPanelPipeBase1, 0F, 0F, 1.570796F); - solarPanelPipeU1 = new ModelRenderer(this, 16, 33); - solarPanelPipeU1.addBox(0F, 0F, 0F, 2, 3, 2); - solarPanelPipeU1.setRotationPoint(-1F, 16F, -1F); - solarPanelPipeU1.setTextureSize(64, 64); - solarPanelPipeU1.mirror = true; - setRotation(solarPanelPipeU1, 0F, 0F, 0F); + solarPanelPort = new ModelRenderer(this, 0, 44); + solarPanelPort.addBox(0F, 0F, 0F, 8, 1, 8); + solarPanelPort.setRotationPoint(-4F, 23F, -4F); + solarPanelPort.setTextureSize(64, 64); + solarPanelPort.mirror = true; + setRotation(solarPanelPort, 0F, 0F, 0F); + solarPanelRod1 = new ModelRenderer(this, 16, 33); + solarPanelRod1.addBox(0F, 0F, 0F, 2, 3, 2); + solarPanelRod1.setRotationPoint(-1F, 16F, -1F); + solarPanelRod1.setTextureSize(64, 64); + solarPanelRod1.mirror = true; + setRotation(solarPanelRod1, 0F, 0F, 0F); + solarPanelPipeBase = new ModelRenderer(this, 0, 39); + solarPanelPipeBase.addBox(0F, 0F, 0F, 4, 1, 4); + solarPanelPipeBase.setRotationPoint(-2F, 22F, -2F); + solarPanelPipeBase.setTextureSize(64, 64); + solarPanelPipeBase.mirror = true; + setRotation(solarPanelPipeBase, 0F, 0F, 0F); } - public void render(float size) + public void render(float size) { - solarPanelPipeBase.render(size); solarPanel.render(size); solarPanelBottom.render(size); solarPanelConnector.render(size); - solarPanelPipeU.render(size); + solarPanelRod2.render(size); solarPanelPipeConnector.render(size); - solarPanelPipeBase1.render(size); - solarPanelPipeU1.render(size); + solarPanelPort.render(size); + solarPanelRod1.render(size); + solarPanelPipeBase.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/resources/assets/mekanism/models/solar_tri.obj b/src/main/resources/assets/mekanism/models/solar_tri.obj deleted file mode 100644 index 094ade5c2..000000000 --- a/src/main/resources/assets/mekanism/models/solar_tri.obj +++ /dev/null @@ -1,513 +0,0 @@ -# Blender v2.70 (sub 0) OBJ File: 'untitled.blend' -# www.blender.org -o Cube -v 0.775751 0.000000 -0.775751 -v 0.775751 0.000000 0.775751 -v -0.775751 0.000000 0.775751 -v 0.600098 1.245471 -0.600098 -v 0.600098 1.245471 0.600099 -v -0.600098 1.245471 0.600098 -v -0.600098 1.245471 -0.600098 -v -0.775751 0.000000 -0.775751 -v -1.000000 2.000000 -1.000000 -v -0.400000 0.003810 -0.200000 -v -0.597037 0.003810 -1.000000 -v 0.597037 0.003810 -1.000000 -v 0.400000 0.003810 -0.200000 -v -0.210455 1.400000 -0.200000 -v -0.400000 1.400000 -1.000000 -v 0.400000 1.400000 -1.000000 -v 0.210455 1.400000 -0.200000 -v -0.163734 0.001860 0.929790 -v -0.163734 0.001860 0.602323 -v 0.163734 0.001860 0.602323 -v 0.163734 0.001860 0.929790 -v -0.163734 1.681595 0.929790 -v -0.163734 1.681595 0.602323 -v 0.163734 1.681595 0.602323 -v 0.163734 1.681595 0.929790 -v -0.163734 2.317753 0.908083 -v -0.163734 2.154813 0.624031 -v 0.163734 2.154813 0.624031 -v 0.163734 2.317753 0.908083 -v -0.163734 2.494844 0.723671 -v -0.163734 2.332132 0.542139 -v 0.163734 2.332132 0.542139 -v 0.163734 2.494844 0.723671 -v -0.163734 2.557197 0.442637 -v -0.163734 2.438710 0.421698 -v 0.163734 2.438710 0.421698 -v 0.163734 2.557197 0.442637 -v -0.163734 2.705466 -0.790486 -v -0.163734 2.586978 -0.811424 -v 0.163734 2.586978 -0.811424 -v 0.163734 2.705466 -0.790486 -v -0.724969 2.724604 0.442637 -v -0.724969 2.606117 0.421698 -v 0.724969 2.606117 0.421698 -v 0.724969 2.724604 0.442637 -v -0.724969 2.872873 -0.790486 -v -0.724969 2.754385 -0.811424 -v 0.724969 2.754385 -0.811424 -v 0.724969 2.872873 -0.790486 -v -0.208086 1.400000 -0.391914 -v -0.208086 1.400000 -0.808086 -v 0.208086 1.400000 -0.808086 -v 0.208086 1.400000 -0.391914 -v -0.150252 1.687980 -0.469609 -v -0.150252 1.837299 -0.730391 -v 0.150252 1.837299 -0.730391 -v 0.150252 1.687980 -0.469609 -v -0.079605 1.697107 -0.540204 -v -0.079605 1.776218 -0.678369 -v 0.079605 1.776218 -0.678369 -v 0.079605 1.697107 -0.540204 -v 0.444352 2.499090 0.421698 -v 0.444352 2.647359 -0.811424 -v 0.444352 2.765847 -0.790486 -v 0.444352 2.617578 0.442637 -v -0.444352 2.647359 -0.811424 -v -0.444352 2.499090 0.421698 -v -0.444352 2.617578 0.442637 -v -0.444352 2.765847 -0.790486 -v -0.163734 2.599183 -0.359366 -v 0.163734 2.599183 -0.359366 -v 0.163734 2.480696 -0.380305 -v -0.163734 2.480696 -0.380305 -v -0.724969 2.766590 -0.359366 -v 0.724969 2.766590 -0.359366 -v 0.724969 2.648103 -0.380305 -v -0.724969 2.648103 -0.380305 -v 0.444352 2.541076 -0.380305 -v 0.444352 2.659564 -0.359366 -v -0.444352 2.541076 -0.380305 -v -0.444352 2.659564 -0.359366 -vt 0.250000 0.851562 -vt 0.250000 0.656250 -vt 0.437500 0.656250 -vt 0.695312 0.046875 -vt 0.656250 0.250000 -vt 0.460938 0.250000 -vt 0.445312 0.453125 -vt 0.406250 0.656250 -vt 0.218750 0.656250 -vt 0.195312 0.250000 -vt 0.195312 0.000000 -vt 0.445312 0.000000 -vt 0.468750 0.250000 -vt 0.664062 0.250000 -vt 0.695312 0.453125 -vt 0.828125 0.250000 -vt 0.695312 0.250000 -vt 0.695312 0.015625 -vt 0.031250 0.226562 -vt 0.000000 0.000000 -vt 0.187500 0.000000 -vt 0.554688 0.890625 -vt 0.554688 0.664062 -vt 0.687500 0.664062 -vt 0.718750 0.921875 -vt 0.687500 0.703125 -vt 0.820312 0.703125 -vt 0.695312 0.328125 -vt 0.882812 0.328125 -vt 0.851562 0.453125 -vt 0.054688 0.351562 -vt 0.062500 0.312500 -vt 0.132812 0.312500 -vt 0.140625 0.625000 -vt 0.132812 0.359375 -vt 0.179688 0.359375 -vt 0.945312 0.781250 -vt 0.945312 0.507812 -vt 1.000000 0.507812 -vt 0.007812 0.625000 -vt 0.023438 0.359375 -vt 0.078125 0.359375 -vt 0.890625 0.726562 -vt 0.890625 0.453125 -vt 0.945312 0.453125 -vt 1.000000 0.453125 -vt 0.945312 0.726562 -vt 0.945312 0.828125 -vt 0.890625 0.828125 -vt 0.945312 0.867188 -vt 0.890625 0.867188 -vt 0.054688 0.632812 -vt 0.046875 0.703125 -vt 0.000000 0.726562 -vt 1.000000 0.781250 -vt 1.000000 0.851562 -vt 0.945312 0.851562 -vt 0.187500 0.625000 -vt 0.187500 0.726562 -vt 0.945312 0.914062 -vt 0.890625 0.914062 -vt 0.062500 0.734375 -vt 0.031250 0.757812 -vt 1.000000 0.882812 -vt 0.945312 0.882812 -vt 0.140625 0.703125 -vt 0.164062 0.757812 -vt 0.593750 0.585938 -vt 0.593750 0.656250 -vt 0.539062 0.656250 -vt 0.078125 0.750000 -vt 1.000000 0.914062 -vt 0.117188 0.773438 -vt 0.117188 0.750000 -vt 0.585938 0.046875 -vt 0.531250 0.046875 -vt 0.531250 0.031250 -vt 0.820312 0.648438 -vt 0.890625 0.648438 -vt 0.890625 0.695312 -vt 0.820312 0.546875 -vt 0.890625 0.546875 -vt 0.890625 0.601562 -vt 0.687500 0.500000 -vt 0.687500 0.453125 -vt 0.820312 0.453125 -vt 0.132812 0.820312 -vt 0.203125 0.828125 -vt 0.203125 0.851562 -vt 0.125000 0.820312 -vt 0.125000 0.796875 -vt 0.203125 0.796875 -vt 0.640625 0.453125 -vt 0.687500 0.460938 -vt 0.687500 0.585938 -vt 0.492188 0.585938 -vt 0.492188 0.656250 -vt 0.445312 0.656250 -vt 0.632812 0.039062 -vt 0.632812 0.015625 -vt 0.679688 0.000000 -vt 0.484375 0.039062 -vt 0.445312 0.023438 -vt 0.820312 0.296875 -vt 0.867188 0.296875 -vt 0.867188 0.320312 -vt 0.507812 0.828125 -vt 0.500000 0.851562 -vt 0.453125 0.851562 -vt 0.546875 0.710938 -vt 0.492188 0.710938 -vt 0.062500 0.257812 -vt 0.156250 0.226562 -vt 0.132812 0.257812 -vt 0.132812 0.351562 -vt 0.531250 0.718750 -vt 0.507812 0.718750 -vt 0.882812 0.703125 -vt 0.875000 0.773438 -vt 0.554688 0.750000 -vt 0.546875 0.820312 -vt 0.492188 0.820312 -vt 0.742188 0.265625 -vt 0.765625 0.304688 -vt 0.531250 0.742188 -vt 0.507812 0.742188 -vt 0.859375 0.773438 -vt 0.835938 0.765625 -vt 0.531250 0.828125 -vt 0.757812 0.265625 -vt 0.820312 0.601562 -vt 0.593750 0.453125 -vt 0.640625 0.585938 -vt 0.585938 0.031250 -vt 0.773438 0.296875 -vt 0.820312 0.312500 -vt 0.687500 0.546875 -vt 0.820312 0.500000 -vt 0.539062 0.585938 -vt 0.484375 0.015625 -vt 0.554688 0.835938 -vt 0.546875 0.859375 -vt 0.539062 0.453125 -vt 0.687500 0.648438 -vt 0.820312 0.695312 -vt 0.000000 0.835938 -vt 0.000000 0.820312 -vt 0.000000 0.773438 -vt 0.687500 0.656250 -vt 0.492188 0.453125 -vt 0.445312 0.585938 -vt 0.687500 0.601562 -vt 0.640625 0.656250 -vt 0.890625 0.500000 -vt 0.406250 0.250000 -vt 0.195312 0.453125 -vt 0.437500 0.851562 -vt 0.445312 0.046875 -vt 0.445312 0.250000 -vt 0.828125 0.023438 -vt 0.687500 0.890625 -vt 0.789062 0.921875 -vt 0.726562 0.453125 -vt 0.132812 0.734375 -vt 0.070312 0.773438 -vt 0.132812 0.835938 -vt 0.195312 0.820312 -vt 0.679688 0.023438 -vt 0.460938 0.828125 -vt 0.484375 0.664062 -vt 0.828125 0.750000 -vt 0.484375 0.750000 -vt 0.695312 0.320312 -vt 0.765625 0.289062 -vt 0.773438 0.320312 -vt 0.687500 0.695312 -vt 0.000000 0.789062 -vt 0.445312 0.460938 -vt 0.218750 0.250000 -vn 0.000000 1.000000 0.000000 -vn 0.990201 0.139651 0.000001 -vn -0.000001 0.139651 0.990201 -vn 0.000000 -1.000000 0.000000 -vn -0.990201 0.139651 -0.000000 -vn -0.964014 0.136046 0.228405 -vn 0.000000 0.000000 -1.000000 -vn 0.962655 0.130689 0.237099 -vn 0.000000 0.000000 1.000000 -vn 0.000000 1.000000 -0.000001 -vn -1.000000 0.000000 0.000000 -vn 1.000000 0.000000 0.000000 -vn 0.000000 0.034103 0.999418 -vn 0.000000 0.721277 0.692647 -vn 0.000000 0.045825 -0.998949 -vn 0.000000 0.976260 0.216604 -vn 0.000000 -0.419278 -0.907858 -vn 0.000000 0.970931 0.239361 -vn 0.000000 -0.748892 -0.662692 -vn 0.000000 0.174022 -0.984742 -vn 0.347263 -0.910507 -0.224466 -vn 0.000000 -0.970931 -0.239361 -vn -0.355931 -0.933234 -0.048855 -vn -0.355931 0.933234 0.048857 -vn 0.347263 0.910508 0.224464 -vn -0.066225 0.173640 -0.982580 -vn 0.066226 0.173641 -0.982580 -vn 0.066226 -0.173641 0.982580 -vn -0.066225 -0.173640 0.982580 -vn 0.000000 0.260479 0.965479 -vn 0.000000 1.000000 0.000001 -vn 0.000000 0.991746 0.128214 -vn 0.991368 0.131110 0.000000 -vn 0.000000 0.174930 -0.984581 -vn -0.964527 0.229089 0.131172 -vn 0.000000 0.867811 0.496894 -vn -0.358815 0.810023 0.463805 -vn 0.000000 0.648393 0.761306 -vn 0.358814 0.810023 0.463804 -vn 0.204500 -0.950411 -0.234303 -vn -0.210081 0.976347 0.051114 -vn -0.037418 0.173900 -0.984052 -vn 0.037418 -0.173901 0.984052 -vn -0.210081 -0.976347 -0.051112 -vn 0.204501 0.950412 0.234302 -vn 0.037419 0.173901 -0.984052 -vn -0.037418 -0.173900 0.984052 -vn 0.000000 0.998632 0.052280 -vn 0.355931 -0.933234 -0.048857 -vn 0.000000 -0.998632 -0.052280 -vn -0.347263 -0.910508 -0.224464 -vn -0.347263 0.910507 0.224466 -vn 0.355931 0.933234 0.048855 -vn 0.210081 -0.976347 -0.051114 -vn -0.204500 0.950411 0.234303 -vn -0.204501 -0.950412 -0.234302 -vn 0.210081 0.976347 0.051112 -vn 0.000000 0.139652 -0.990201 -vn 0.990201 0.139652 0.000000 -vn 0.000000 0.139651 0.990201 -vn -0.962655 0.130689 0.237099 -vn 0.964014 0.136046 0.228405 -vn 0.000000 0.721278 0.692646 -vn 0.000000 0.045824 -0.998950 -vn 0.000000 0.976260 0.216603 -vn 0.000000 0.970931 0.239362 -vn 0.000000 0.174021 -0.984742 -vn 0.347263 -0.910507 -0.224464 -vn 0.000000 -0.970930 -0.239362 -vn -0.355931 -0.933234 -0.048857 -vn -0.355931 0.933234 0.048855 -vn 0.347263 0.910507 0.224466 -vn -0.066226 0.173641 -0.982580 -vn 0.066225 0.173640 -0.982580 -vn 0.066225 -0.173640 0.982580 -vn -0.066226 -0.173641 0.982580 -vn 0.000000 0.260479 0.965480 -vn 0.000000 0.991746 0.128218 -vn 0.964527 0.229089 0.131172 -vn -0.991368 0.131110 0.000000 -vn 0.000000 0.867812 0.496892 -vn -0.358814 0.810023 0.463804 -vn 0.000000 0.648392 0.761307 -vn 0.358814 0.810023 0.463805 -vn 0.204501 -0.950412 -0.234302 -vn -0.210081 0.976347 0.051112 -vn -0.037418 0.173901 -0.984052 -vn 0.037418 -0.173900 0.984052 -vn -0.210081 -0.976347 -0.051114 -vn 0.204501 0.950411 0.234303 -vn 0.037418 0.173900 -0.984052 -vn -0.037419 -0.173901 0.984052 -vn 0.355931 -0.933234 -0.048855 -vn -0.347263 -0.910507 -0.224466 -vn -0.347263 0.910508 0.224464 -vn 0.355931 0.933234 0.048857 -vn 0.210081 -0.976347 -0.051112 -vn -0.204501 0.950412 0.234302 -vn -0.204500 -0.950411 -0.234304 -vn 0.210081 0.976347 0.051114 -vn 0.000000 0.139651 -0.990201 -s off -f 7/1/1 6/2/1 5/3/1 -f 1/4/2 4/5/2 5/6/2 -f 2/7/3 5/8/3 6/9/3 -f 2/10/4 3/11/4 8/12/4 -f 6/13/5 7/14/5 8/15/5 -f 14/16/6 15/17/6 11/18/6 -f 16/19/7 12/20/7 11/21/7 -f 17/22/8 13/23/8 12/24/8 -f 14/25/9 10/26/9 13/27/9 -f 11/28/4 12/29/4 13/30/4 -f 17/31/10 53/32/10 50/33/10 -f 23/34/11 19/35/11 18/36/11 -f 24/37/7 20/38/7 19/39/7 -f 25/40/12 21/41/12 20/42/12 -f 22/43/9 18/44/9 21/45/9 -f 18/46/4 19/39/4 20/38/4 -f 25/47/13 29/48/13 26/49/13 -f 29/48/14 33/50/14 30/51/14 -f 24/52/12 28/53/12 29/54/12 -f 23/55/15 27/56/15 28/57/15 -f 23/34/11 22/58/11 26/59/11 -f 33/50/16 37/60/16 34/61/16 -f 28/53/12 32/62/12 33/63/12 -f 27/56/17 31/64/17 32/65/17 -f 27/66/11 26/59/11 30/67/11 -f 71/68/18 41/69/18 38/70/18 -f 33/63/12 32/62/12 36/71/12 -f 31/64/19 35/72/19 36/60/19 -f 30/67/11 34/73/11 35/74/11 -f 40/75/20 39/76/20 38/77/20 -f 78/78/21 63/79/21 48/80/21 -f 73/81/22 39/82/22 40/83/22 -f 67/84/23 43/85/23 77/86/23 -f 76/87/12 48/88/12 49/89/12 -f 77/90/11 74/91/11 46/92/11 -f 65/93/24 45/94/24 75/95/24 -f 81/96/25 69/97/25 46/98/25 -f 63/99/26 64/100/26 49/101/26 -f 66/102/27 47/103/27 46/12/27 -f 62/104/28 44/105/28 45/106/28 -f 67/107/29 68/108/29 42/109/29 -f 53/23/30 57/110/30 54/111/30 -f 17/31/1 16/19/1 52/112/1 -f 15/113/31 51/114/31 52/112/31 -f 14/115/1 50/33/1 51/114/1 -f 57/110/32 61/116/32 58/117/32 -f 53/27/33 52/118/33 56/119/33 -f 51/120/34 55/121/34 56/122/34 -f 50/17/35 54/123/35 55/124/35 -f 60/125/36 59/126/36 58/117/36 -f 56/119/37 60/127/37 61/128/37 -f 55/121/38 59/129/38 60/107/38 -f 55/124/39 54/123/39 58/130/39 -f 72/131/40 40/83/40 63/79/40 -f 37/132/41 65/93/41 79/133/41 -f 40/75/42 41/134/42 64/100/42 -f 36/135/43 62/104/43 65/136/43 -f 35/137/44 67/84/44 80/138/44 -f 70/139/45 38/70/45 69/97/45 -f 39/76/46 66/102/46 69/140/46 -f 35/141/47 34/142/47 68/108/47 -f 34/143/48 37/132/48 71/68/48 -f 62/144/49 78/78/49 76/145/49 -f 35/137/50 73/81/50 72/131/50 -f 80/138/51 77/86/51 47/44/51 -f 45/146/12 44/147/12 76/87/12 -f 42/148/11 74/91/11 77/90/11 -f 79/133/52 75/95/52 49/149/52 -f 68/150/53 81/96/53 74/151/53 -f 36/152/54 72/131/54 78/78/54 -f 71/68/55 79/133/55 64/153/55 -f 73/81/56 80/138/56 66/154/56 -f 34/143/57 70/139/57 81/96/57 -f 4/155/58 1/7/58 8/156/58 -f 4/157/1 7/1/1 5/3/1 -f 2/158/59 1/4/59 5/6/59 -f 3/156/60 2/7/60 6/9/60 -f 1/159/4 2/10/4 8/12/4 -f 3/7/5 6/13/5 8/15/5 -f 10/160/61 14/16/61 11/18/61 -f 15/113/7 16/19/7 11/21/7 -f 16/161/62 17/22/62 12/24/62 -f 17/162/9 14/25/9 13/27/9 -f 10/163/4 11/28/4 13/30/4 -f 14/115/1 17/31/1 50/33/1 -f 22/58/11 23/34/11 18/36/11 -f 23/55/7 24/37/7 19/39/7 -f 24/52/12 25/40/12 20/42/12 -f 25/47/9 22/43/9 21/45/9 -f 21/45/4 18/46/4 20/38/4 -f 22/43/13 25/47/13 26/49/13 -f 26/49/63 29/48/63 30/51/63 -f 25/40/12 24/52/12 29/54/12 -f 24/37/64 23/55/64 28/57/64 -f 27/66/11 23/34/11 26/59/11 -f 30/51/65 33/50/65 34/61/65 -f 29/54/12 28/53/12 33/63/12 -f 28/57/17 27/56/17 32/65/17 -f 31/164/11 27/66/11 30/67/11 -f 70/139/66 71/68/66 38/70/66 -f 37/165/12 33/63/12 36/71/12 -f 32/65/19 31/64/19 36/60/19 -f 31/164/11 30/67/11 35/74/11 -f 41/134/67 40/75/67 38/77/67 -f 76/145/68 78/78/68 48/80/68 -f 72/131/69 73/81/69 40/83/69 -f 80/138/70 67/84/70 77/86/70 -f 75/166/12 76/87/12 49/89/12 -f 47/167/11 77/90/11 46/92/11 -f 79/133/71 65/93/71 75/95/71 -f 74/151/72 81/96/72 46/98/72 -f 48/168/73 63/99/73 49/101/73 -f 69/140/74 66/102/74 46/12/74 -f 65/136/75 62/104/75 45/106/75 -f 43/169/76 67/107/76 42/109/76 -f 50/170/77 53/23/77 54/111/77 -f 53/32/1 17/31/1 52/112/1 -f 16/19/1 15/113/1 52/112/1 -f 15/113/1 14/115/1 51/114/1 -f 54/111/78 57/110/78 58/117/78 -f 57/171/79 53/27/79 56/119/79 -f 52/172/34 51/120/34 56/122/34 -f 51/173/80 50/17/80 55/124/80 -f 61/116/81 60/125/81 58/117/81 -f 57/171/82 56/119/82 61/128/82 -f 56/122/83 55/121/83 60/107/83 -f 59/174/84 55/124/84 58/130/84 -f 78/78/85 72/131/85 63/79/85 -f 71/68/86 37/132/86 79/133/86 -f 63/99/87 40/75/87 64/100/87 -f 37/175/88 36/135/88 65/136/88 -f 73/81/89 35/137/89 80/138/89 -f 81/96/90 70/139/90 69/97/90 -f 38/77/91 39/76/91 69/140/91 -f 67/107/92 35/141/92 68/108/92 -f 70/139/48 34/143/48 71/68/48 -f 44/176/93 62/144/93 76/145/93 -f 36/152/50 35/137/50 72/131/50 -f 66/154/94 80/138/94 47/44/94 -f 75/166/12 45/146/12 76/87/12 -f 43/177/11 42/148/11 77/90/11 -f 64/153/95 79/133/95 49/149/95 -f 42/178/96 68/150/96 74/151/96 -f 62/144/97 36/152/97 78/78/97 -f 41/69/98 71/68/98 64/153/98 -f 39/82/99 73/81/99 66/154/99 -f 68/150/100 34/143/100 81/96/100 -f 7/179/101 4/155/101 8/156/101 diff --git a/src/main/resources/assets/mekanism/render/ChemicalInfuser.png b/src/main/resources/assets/mekanism/render/ChemicalInfuser.png old mode 100755 new mode 100644 index 44cc40639bba1af543d7d65af484f2eafeae6837..e29f5b6741c8d27c26e11b03eba2789b7ff47092 GIT binary patch literal 5160 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 LoY70P+m-(TNj_t_ literal 4115 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 Hhh_f*##`+t diff --git a/src/main/resources/assets/mekanism/render/Laser.png b/src/main/resources/assets/mekanism/render/Laser.png index 161cd258deb0b8263a0edd1354190ac6d55ded7b..a7326559bd99327bc92fb41e3d4fe1039f34f703 100644 GIT binary patch literal 3223 zcmaJ^dpy%^8{Zg1IiyEY%9=xz9hr=c$vGB{oZ@lVhBe!?Erx_B_KGAV3e{7QQ#n?O z%3BhWW1$?95R&s@}EC$?r9Ruev0)=b<0B6h#^d{4(T!;_VkH*A9C#!0p5E=y!b;b~p#6VN3 zKg}wXO?3!8=tvHwld%-2u@MBvGY|?es9bLdj}gG+81V4W@45!U{rWKi3i%G<((%y0 zi*g~_Lrht0Dg*=9gOO1v6l5P3j>72cpfTDIG!lhDAh8G(5{5(>ppXV=B;>~f6=q{o zd<{ru7C&+cBRtff%MCO@AcBK~;lVm^7TXVj!eX%qBpQK6!-NPJCxprM=E0a8)t?Gx zR1TR<3*^#ROvt*Tw-4($7Y`Ly`u7zWfxl##oF8oxHVnb@4n&~f$n`7z1QLn=AIf0- zLUXtz>Ob}VPhpN@NFWtKqH zOijOc4Wj8xV^Ubb9IfvhBGJH_$>Dl4$y94IJXELxr_m?|`}IsMbkJCoh5kN06v`Z9 zf<~iFQCJKTX|Z1qql5g(HDi&FGpJ1NPcG#jF8a6JbvrNug_+H$Y+4YNV!>uHAm6WT zK>KYi`WC;{`@yCBz82(fxd>q~i1p$A*RX#c2_3Y){bgNY@XP#ErqJZdt%i|i%KgX8GiD+Ys&H| zDsoGwpi$&r$aw(YM;!~np+w6;8xhp{OY3H zMZNbN_n7ZLrfjJJLm-X}!C?9@#Klg*lLS$Yhq&JyUEdfV>Fu71HiY-iyb|Blq~6G z-KG{Z+1%8G9fN6W>o*u08Ws+pn633|c~4)s-n&`FvgX$4fNs-tc8a2U^e@h@6vBf_C6|oUP^1z$X6cBEjwAO=woQw+fPgl3UvMI67_5rF_k0`VD4o1_Jo^A*1?A>&u5}UNE(f;CJ!WS9_Upc z-DI;GIW!6M01rmYd?KbXyGowzLAce>uv75*#eAs-WTkSy0;Pkb*OerAc8ue6+R?Ma(pXn%x4}VBG`iaZE zin&BRkePS5R%2fS)-wTAuYM;{GK~+OZBQT5;Ka4X9TKqtor|yY7~^?#ZnSm2e}~IY zLnvNUEbP z484_Z$I(}CR$4)lnC9!BP`axk`zx96|J4+lPc@Df7Z*>))kxw(d5HO(<;}w4 z$zb@z)~Rjpvk_Sk2%%H}B!%e=ChfM%a-lEvJ_;Me$!0#GNm_>n4L0QEnNe5=8}I3^ z-oLf`Rq6E*hHfW2e{itw+>r^^yL$uez^}MYtV^AhpgF51ToAMYfO}SZk#|Ri9E%dFEWCqXo5!&wfxve$#z8Z+Hr?ZgCfGFC*FN zqi}a`?1Gnv#KM%anb9tvTUAv(dGUdUW->%OJ3~P&Z|r^FZ2>SX!5YE$?7QcDyA^l= zZfWAU{WPE-_h-I?i-^cBe@QS;JJl`VRrpQ zPo*oVF!!C!MffxL$JZ+xZXLW*GQCw%ZKKoE@$rJW-rTj7rJ3BbDfcJtXmG;5$W}$o zeP$84kyNLTfMJvVP8AXVorV(+BZCX|#wR+byS43(UJ#7p198SGqfw&Zk}$*IFOAa< z4h~&-9fVrQD2L5v4^?Z;88xf5osr(I&HpeNRi3^o>ymY10&+EOWooWY0&vB*0rG^AVrKUVUTx$H{%j!r-_Lv;7OhReiq*#;3eJ%~E zGSDiXldnYJdd{;~lE)|FE$=9QN%dQ!S5F+632+vCHZ93A3eOnxe2q)b1-~~dHP{Ng zZ|rF}&vokV%YZzVQWF*PQYs+jkaI*fCKYKN%SvlZt`$t3-8eB+&rFS0ri#Zk(t56}2-BW;wHR&cw-?0tCYUe=_c^FYsGOp<#3i?E%!`*65`RO1tiud%OI z1q;Q}A}_`&qFv4E4-~)Bt%1biL_`Wa_ePcqe4xY2<>J2BB-6v;9+nko}bA~SuwkLTX#zjRLK|loCOuL>A z{a$YciUJr6=HOZHR6ftm&AF~_AqG!$r|x}X>(`vs^r+an;!Hrse9;xRPXYp9f_q0V z%Pno3&~z3sGc$7+I^YU~+V3HV)3a43`UT<%2?;|oBX94L`J-3&W_+L!H*v}{1O;>S zFf}8J*ZvsUUQ5$$DR#EDAdrNksK{dHNmxdCYfu128OM9wCG+C(c?K&(nzJ7k2 z6~V(@*`Fd4F8rIHfAT?vqI}cUtGhO!ykwm-5C>FMRrmS{8udjvL|+Z0XGbFkubA9# z2X7=#&Nd~#jl05KE!Dj0M0`oe9F-c9^{P&9Xhfa!&lD9T#nrwjf2~gpDQG`kaEYIh zL$iETcH_RUcy9ZkbGySx+w!HH4(Ck70Y$jG|7ZPFFEQOJ1*DG7W?{3mpi|pOi?~Sb zmX4cIA|jwYrvQm*&JBf0M;rPR5mmr&&5`XF1c1>9MP4&{;ObZe$cFFzt^e%01OqC6951J literal 6074 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 literal 10340 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 V{Jfl`bo3SjR%W)QwI*K4{{uzUY104z delta 3132 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 WJfVw4Em%JQ0000dTb? diff --git a/src/main/resources/assets/mekanism/render/SolarNeutronActivator.png b/src/main/resources/assets/mekanism/render/SolarNeutronActivator.png index a2920912fe805affe6bc408c3c1c37edbf581551..b73a2cf34205ea6644e9d7f27a44559deabc26ec 100644 GIT binary patch literal 6657 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 bVF933I!w=#)I(4Hl+n{N(5z6u|L}hR(806a literal 15952 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 Date: Sun, 3 Apr 2016 12:50:29 -0400 Subject: [PATCH 35/62] Gas Generator now scales burn rate to stored amount of gas --- .../render/block/MachineRenderingHandler.java | 2 +- .../client/gui/GuiGasGenerator.java | 4 +- .../common/tile/TileEntityGasGenerator.java | 71 ++++++++++++++----- .../resources/assets/mekanism/lang/en_US.lang | 1 + 4 files changed, 57 insertions(+), 21 deletions(-) diff --git a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index 37686fa73..1d8dc35c5 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -182,7 +182,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler else if(type == MachineType.FLUIDIC_PLENISHER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); + GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -0.85F, 0.0F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FluidicPlenisher.png")); fluidicPlenisher.render(0.0560F); diff --git a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java index 987ea3763..dc10809e6 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java @@ -44,7 +44,7 @@ public class GuiGasGenerator extends GuiMekanism public List getInfo() { return ListUtils.asList( - LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.generationRate) + "/t", + LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.generationRate*tileEntity.clientUsed) + "/t", LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiGasGenerator.png"))); @@ -67,6 +67,8 @@ public class GuiGasGenerator extends GuiMekanism fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 6, 0x404040); fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + String s = LangUtils.localize("gui.burnRate") + ": " + tileEntity.clientUsed; + fontRendererObj.drawString(s, xSize - 8 - fontRendererObj.getStringWidth(s), (ySize - 96) + 2, 0x404040); } @Override diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index 04df830df..c1f93c259 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -31,7 +31,10 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH public GasTank fuelTank; public int burnTicks = 0; + public int maxBurnTicks; public double generationRate = 0; + + public int clientUsed; public TileEntityGasGenerator() { @@ -82,34 +85,62 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH if(canOperate()) { setActive(true); - - if(burnTicks > 0) + + FuelGas fuel = null; + + if(fuelTank.getStored() != 0) { - burnTicks--; - setEnergy(electricityStored + generationRate); + fuel = FuelHandler.getFuel(fuelTank.getGas().getGas()); + maxBurnTicks = fuel.burnTicks; + generationRate = fuel.energyPerTick; } - else if(fuelTank.getStored() > 0) + + int toUse = getToUse(); + + output = generationRate*getToUse()*2; + + int total = burnTicks + fuelTank.getStored()*maxBurnTicks; + total -= toUse; + + setEnergy(getEnergy() + generationRate*toUse); + + if(fuelTank.getStored() > 0) { - FuelGas fuel = FuelHandler.getFuel(fuelTank.getGas().getGas()); - - if(fuel != null) - { - burnTicks = fuel.burnTicks - 1; - generationRate = fuel.energyPerTick; - fuelTank.draw(1, true); - setEnergy(getEnergy() + generationRate); - } - } - else { - burnTicks = 0; - generationRate = 0; + fuelTank.setGas(new GasStack(fuelTank.getGasType(), total/maxBurnTicks)); } + + burnTicks = total % maxBurnTicks; + clientUsed = toUse; } else { + reset(); setActive(false); } } } + + public void reset() + { + burnTicks = 0; + maxBurnTicks = 0; + generationRate = 0; + output = general.FROM_H2*2; + clientUsed = 0; + } + + public int getToUse() + { + if(generationRate == 0 || fuelTank.getGas() == null) + { + return 0; + } + + int max = (int)Math.ceil(((float)fuelTank.getStored()/(float)fuelTank.getMaxGas())*256F); + max = Math.min((fuelTank.getStored()*maxBurnTicks) + burnTicks, max); + max = (int)Math.min((getMaxEnergy()-getEnergy())/generationRate, max); + + return max; + } @Override public boolean canExtractItem(int slotID, ItemStack itemstack, int side) @@ -151,7 +182,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH @Override public boolean canOperate() { - return getEnergy() < getMaxEnergy() && fuelTank.getStored() > 0 && MekanismUtils.canFunction(this); + return getEnergy() < getMaxEnergy() && (fuelTank.getStored() > 0 || burnTicks > 0) && MekanismUtils.canFunction(this); } /** @@ -209,6 +240,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH generationRate = dataStream.readDouble(); output = dataStream.readDouble(); + clientUsed = dataStream.readInt(); } @Override @@ -228,6 +260,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH data.add(generationRate); data.add(output); + data.add(clientUsed); return data; } diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 035235167..48afbaf4a 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -554,6 +554,7 @@ gui.overridden=Overridden gui.nowOwn=You now own this item. gui.frequency=Frequency gui.mode=Mode +gui.burnRate=Burn Rate gui.reactor.injectionRate=Injection Rate From 4227439a9620d1c94937df2f917b0eafabce5436 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 5 Apr 2016 09:52:37 -0400 Subject: [PATCH 36/62] Use UUID instead of entity reference in teleporter calculations, fixed entity teleport --- .../java/mekanism/common/PacketHandler.java | 7 ++- .../common/network/PacketEntityMove.java | 61 +++++++++++++++++++ .../network/PacketPortableTeleporter.java | 2 +- .../common/tile/TileEntityTeleporter.java | 33 +++++++--- 4 files changed, 90 insertions(+), 13 deletions(-) create mode 100644 src/main/java/mekanism/common/network/PacketEntityMove.java diff --git a/src/main/java/mekanism/common/PacketHandler.java b/src/main/java/mekanism/common/PacketHandler.java index e4d2ae12d..646bbe637 100644 --- a/src/main/java/mekanism/common/PacketHandler.java +++ b/src/main/java/mekanism/common/PacketHandler.java @@ -27,8 +27,8 @@ import mekanism.common.network.PacketEditFilter; import mekanism.common.network.PacketEditFilter.EditFilterMessage; import mekanism.common.network.PacketElectricBowState; import mekanism.common.network.PacketElectricBowState.ElectricBowStateMessage; -import mekanism.common.network.PacketPersonalChest; -import mekanism.common.network.PacketPersonalChest.PersonalChestMessage; +import mekanism.common.network.PacketEntityMove; +import mekanism.common.network.PacketEntityMove.EntityMoveMessage; import mekanism.common.network.PacketFlamethrowerData; import mekanism.common.network.PacketFlamethrowerData.FlamethrowerDataMessage; import mekanism.common.network.PacketJetpackData; @@ -41,6 +41,8 @@ import mekanism.common.network.PacketNewFilter; import mekanism.common.network.PacketNewFilter.NewFilterMessage; import mekanism.common.network.PacketOredictionificatorGui; import mekanism.common.network.PacketOredictionificatorGui.OredictionificatorGuiMessage; +import mekanism.common.network.PacketPersonalChest; +import mekanism.common.network.PacketPersonalChest.PersonalChestMessage; import mekanism.common.network.PacketPortableTankState; import mekanism.common.network.PacketPortableTankState.PortableTankStateMessage; import mekanism.common.network.PacketPortableTeleporter; @@ -131,6 +133,7 @@ public class PacketHandler netHandler.registerMessage(PacketFlamethrowerData.class, FlamethrowerDataMessage.class, 27, Side.CLIENT); netHandler.registerMessage(PacketFlamethrowerData.class, FlamethrowerDataMessage.class, 27, Side.SERVER); netHandler.registerMessage(PacketDropperUse.class, DropperUseMessage.class, 28, Side.SERVER); + netHandler.registerMessage(PacketEntityMove.class, EntityMoveMessage.class, 29, Side.CLIENT); } /** diff --git a/src/main/java/mekanism/common/network/PacketEntityMove.java b/src/main/java/mekanism/common/network/PacketEntityMove.java new file mode 100644 index 000000000..e26435b01 --- /dev/null +++ b/src/main/java/mekanism/common/network/PacketEntityMove.java @@ -0,0 +1,61 @@ +package mekanism.common.network; + +import io.netty.buffer.ByteBuf; +import mekanism.api.Pos3D; +import mekanism.common.PacketHandler; +import mekanism.common.network.PacketEntityMove.EntityMoveMessage; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; + +public class PacketEntityMove implements IMessageHandler +{ + @Override + public IMessage onMessage(EntityMoveMessage message, MessageContext context) + { + EntityPlayer player = PacketHandler.getPlayer(context); + Entity entity = player.worldObj.getEntityByID(message.entityId); + + if(entity != null) + { + entity.setLocationAndAngles(message.pos.xPos, message.pos.yPos, message.pos.zPos, entity.rotationYaw, entity.rotationPitch); + } + + return null; + } + + public static class EntityMoveMessage implements IMessage + { + public int entityId; + + public Pos3D pos; + + public EntityMoveMessage() {} + + public EntityMoveMessage(Entity e) + { + entityId = e.getEntityId(); + pos = new Pos3D(e); + } + + @Override + public void toBytes(ByteBuf dataStream) + { + dataStream.writeInt(entityId); + + dataStream.writeFloat((float)pos.xPos); + dataStream.writeFloat((float)pos.yPos); + dataStream.writeFloat((float)pos.zPos); + } + + @Override + public void fromBytes(ByteBuf dataStream) + { + entityId = dataStream.readInt(); + + pos = new Pos3D(dataStream.readFloat(), dataStream.readFloat(), dataStream.readFloat()); + } + } +} diff --git a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java index 9b70e2981..9bc2683c1 100644 --- a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java +++ b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java @@ -107,7 +107,7 @@ public class PacketPortableTeleporter implements IMessageHandler didTeleport = new HashSet(); + public Set didTeleport = new HashSet(); public int teleDelay = 0; @@ -271,14 +274,20 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo public void cleanTeleportCache() { - List list = worldObj.getEntitiesWithinAABB(Entity.class, teleportBounds); - Set teleportCopy = (Set)((HashSet)didTeleport).clone(); - - for(Entity entity : teleportCopy) + List list = new ArrayList(); + + for(Entity e : (List)worldObj.getEntitiesWithinAABB(Entity.class, teleportBounds)) { - if(!list.contains(entity)) + list.add(e.getPersistentID()); + } + + Set teleportCopy = (Set)((HashSet)didTeleport).clone(); + + for(UUID id : teleportCopy) + { + if(!list.contains(id)) { - didTeleport.remove(entity); + didTeleport.remove(id); } } } @@ -362,7 +371,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo if(teleporter != null) { - teleporter.didTeleport.add(entity); + teleporter.didTeleport.add(entity.getPersistentID()); teleporter.teleDelay = 5; if(entity instanceof EntityPlayerMP) @@ -450,11 +459,15 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo { e.copyDataFrom(entity, true); world.spawnEntityInWorld(e); - teleporter.didTeleport.add(e); + teleporter.didTeleport.add(e.getPersistentID()); } entity.isDead = true; } + else { + entity.setLocationAndAngles(coord.xCoord+0.5, coord.yCoord+1, coord.zCoord+0.5, entity.rotationYaw, entity.rotationPitch); + Mekanism.packetHandler.sendToReceivers(new EntityMoveMessage(entity), new Range4D(new Coord4D(entity))); + } } public static void alignPlayer(EntityPlayerMP player, Coord4D coord) @@ -501,7 +514,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo for(Entity entity : entities) { - if(!didTeleport.contains(entity)) + if(!didTeleport.contains(entity.getPersistentID())) { ret.add(entity); } From bc25cc21a00421cab3611f6d0136bcb63f5b2311 Mon Sep 17 00:00:00 2001 From: Vexatos Date: Sun, 10 Apr 2016 09:31:10 +0200 Subject: [PATCH 37/62] Update de_DE.lang --- .../resources/assets/mekanism/lang/de_DE.lang | 187 +++++++++++++++--- 1 file changed, 155 insertions(+), 32 deletions(-) diff --git a/src/main/resources/assets/mekanism/lang/de_DE.lang b/src/main/resources/assets/mekanism/lang/de_DE.lang index cbfd346b9..5fc847496 100644 --- a/src/main/resources/assets/mekanism/lang/de_DE.lang +++ b/src/main/resources/assets/mekanism/lang/de_DE.lang @@ -11,6 +11,7 @@ item.EnergyTablet.name=Energietablett item.SpeedUpgrade.name=Geschwindigkeitsupgrade item.EnergyUpgrade.name=Energieupgrade item.FilterUpgrade.name=Filter-Upgrade +item.MufflingUpgrade.name=Schalldämpfer-Upgrade item.GasUpgrade.name=Gas-Upgrade item.Robit.name=Robit item.AtomicDisassembler.name=Atomar-Disassembler @@ -37,7 +38,7 @@ item.LithiumBucket.name=Eimer mit Lithium item.HeavyWaterBucket.name=Eimer mit Schwerem Wasser item.FreeRunners.name=Freiläufer item.ArmoredJetpack.name=Panzer-Jetpack -item.FilterCard.name=Filterkarte +item.ConfigurationCard.name=Konfigurationskarte item.SeismicReader.name=Seismisches Lesegerät item.HDPEPellet.name=HDPE-Pellet item.HDPERod.name=HDPE-Stange @@ -47,6 +48,7 @@ item.Substrate.name=Substrat item.Flamethrower.name=Flammenwerfer item.GaugeDropper.name=Ventilspender item.BioFuel.name=Biomasse +item.CraftingFormula.name=Fertigungsformel //Control Circuits item.BasicControlCircuit.name=Basis-Kontrollschaltkreis @@ -55,7 +57,16 @@ item.EliteControlCircuit.name=Elite-Kontrollschaltkreis item.UltimateControlCircuit.name=Ultimativer Kontrollschaltkreis //Gas Tank -tile.GasTank.GasTank.name=Gastank +tile.GasTankBasic.name=Basis-Gastank +tile.GasTankAdvanced.name=Fortgeschr. Gastank +tile.GasTankElite.name=Elite-Gastank +tile.GasTankUltimate.name=Ultimativer Gastank + +//Fluid Tank (part of MachineBlock2, naming handled differently) +tile.FluidTankBasic.name=Basis-Fluidtank +tile.FluidTankAdvanced.name=Fortgeschr. Fluidtank +tile.FluidTankElite.name=Elite-Fluidtank +tile.FluidTankUltimate.name=Ultimativer Fluidtank //Cardboard Box tile.CardboardBox.name=Pappkarton @@ -73,19 +84,22 @@ tile.BasicBlock.RefinedObsidian.name=Raffiniertes Obsidian tile.BasicBlock.CharcoalBlock.name=Holzkohleblock tile.BasicBlock.RefinedGlowstone.name=Raffiniertes Glowstone tile.BasicBlock.SteelBlock.name=Stahlblock -tile.BasicBlock.Bin.name=Silo +tile.BasicBlock.BinBasic.name=Basis-Silo +tile.BasicBlock.BinAdvanced.name=Fortgeschr. Silo +tile.BasicBlock.BinElite.name=Elite-Silo +tile.BasicBlock.BinUltimate.name=Ultimatives Silo tile.BasicBlock.TeleporterFrame.name=Teleporter-Rahmen tile.BasicBlock.SteelCasing.name=Stahlhülle tile.BasicBlock.DynamicTank.name=Dynamischer Tank -tile.BasicBlock.DynamicGlass.name=Dynamisches Glas +tile.BasicBlock.StructuralGlass.name=Strukturglas tile.BasicBlock.DynamicValve.name=Dynamisches Ventil tile.BasicBlock.CopperBlock.name=Kupferblock tile.BasicBlock.TinBlock.name=Zinnblock -tile.BasicBlock.SolarEvaporationController.name=Solarverdampfungs-Controller -tile.BasicBlock.SolarEvaporationValve.name=Solarverdampfungsventil +tile.BasicBlock.ThermalEvaporationController.name=Thermalverdampfungs-Controller +tile.BasicBlock.ThermalEvaporationValve.name=Thermalverdampfungsventil //Basic Block 2 (second ID iteration) -tile.BasicBlock2.SolarEvaporationBlock.name=Solarverdampfungsblock +tile.BasicBlock2.ThermalEvaporationBlock.name=Thermalverdampfungsblock tile.BasicBlock2.InductionCasing.name=Induktionshülle tile.BasicBlock2.InductionPort.name=Induktionsport tile.BasicBlock2.InductionCellBasic.name=Basis-Induktionszelle @@ -96,6 +110,11 @@ tile.BasicBlock2.InductionProviderBasic.name=Basis-Induktions-Provider tile.BasicBlock2.InductionProviderAdvanced.name=Fortgeschrittener Induktions-Provider tile.BasicBlock2.InductionProviderElite.name=Elite-Induktions-Provider tile.BasicBlock2.InductionProviderUltimate.name=Ultimativer Induktions-Provider +tile.BasicBlock2.SuperheatingElement.name=Überhitzungselement +tile.BasicBlock2.PressureDisperser.name=Druckventil +tile.BasicBlock2.BoilerCasing.name=Dampfkesselhülle +tile.BasicBlock2.BoilerValve.name=Dampfkesselventil +tile.BasicBlock2.SecurityDesk.name=Sicherungstisch //Machine Block tile.MachineBlock.EnrichmentChamber.name=Anreicherungskammer @@ -108,7 +127,7 @@ tile.MachineBlock.PurificationChamber.name=Purifikationskammer tile.MachineBlock.EnergizedSmelter.name=Energetisierter Schmelzer tile.MachineBlock.Teleporter.name=Teleporter tile.MachineBlock.ElectricPump.name=Elektrische Pumpe -tile.MachineBlock.ElectricChest.name=Elektrische Truhe +tile.MachineBlock.PersonalChest.name=Persönliche Truhe tile.MachineBlock.Chargepad.name=Ladepad tile.MachineBlock.LogisticalSorter.name=Logistischer Sortierer tile.MachineBlock.DigitalMiner.name=Digitalbergbaugerät @@ -127,15 +146,17 @@ tile.MachineBlock2.ChemicalCrystallizer.name=Chemischer Kristallisierer tile.MachineBlock2.SeismicVibrator.name=Seismischer Vibrator tile.MachineBlock2.PressurizedReactionChamber.name=Druckreaktionskammer tile.MachineBlock2.PressurizedReactionChamber.short.name=PRC -tile.MachineBlock2.PortableTank.name=Tragbarer Tank tile.MachineBlock2.FluidicPlenisher.name=Flüssigkeitsfüller tile.MachineBlock2.Laser.name=Laser tile.MachineBlock2.LaserAmplifier.name=Laser-Verstärker tile.MachineBlock2.LaserTractorBeam.name=Laser-Traktorstrahl //Machine Block 3 (third ID iteration) +tile.MachineBlock3.QuantumEntangloporter.name=Quantenverschränkungsporter tile.MachineBlock3.SolarNeutronActivator.name=Solarneutronenaktivator tile.MachineBlock3.Oredictionificator.name=Oredictionificator +tile.MachineBlock3.ResistiveHeater.name=Stromwärmeheizung +tile.MachineBlock3.FormulaicAssemblicator.name=Formelfertigungsfabrikator //Plastic tile.PlasticBlock.name=Plastikblock @@ -179,6 +200,10 @@ item.MultipartTransmitter.EliteLogisticalTransporter.name=Logistischer Elitetran item.MultipartTransmitter.UltimateLogisticalTransporter.name=Ultimativer Logistischer Transporter item.MultipartTransmitter.RestrictiveTransporter.name=Restriktiver Transporter item.MultipartTransmitter.DiversionTransporter.name=Diversionstransporter +item.MultipartTransmitter.BasicThermodynamicConductor.name=Thermodynamischer Basisleiter +item.MultipartTransmitter.AdvancedThermodynamicConductor.name=Fortgeschr. Thermodynamischer Leiter +item.MultipartTransmitter.EliteThermodynamicConductor.name=Thermodynamischer Eliteleiter +item.MultipartTransmitter.UltimateThermodynamicConductor.name=Ultimativer Thermodynamischer Leiter //Glow Panel item.GlowPanel.name=Leuchtplatte @@ -312,6 +337,7 @@ fluid.lithium=Flüssiges Lithium fluid.deuterium=Flüssiges Deuterium fluid.tritium=Flüssiges Tritium fluid.fusionFuelDT=Flüssiger D-T-Treibstoff +fluid.steam=Dampf //OreGas names oregas.iron=Eisenerz @@ -347,13 +373,15 @@ update.outdated=Verwendung von veralteten Versionen eines oder mehrerer Module //Upgrades upgrade.energy=Energie -upgrade.energy.desc=Erhöht Energieeffizienz !nund Maschineriekapazität +upgrade.energy.desc=Erhöht Energieeffizienz !nund Maschineriekapazität. upgrade.speed=Geschwindigkeit -upgrade.speed.desc=Erhöht Maschineriegeschwindigkeit +upgrade.speed.desc=Erhöht Maschineriegeschwindigkeit. upgrade.filter=Filter -upgrade.filter.desc=Ein Filter, welcher Schweres !nWasser von regulärem Wasser trennt +upgrade.filter.desc=Ein Filter, welcher Schweres !nWasser von regulärem Wasser trennt. upgrade.gas=Gas -upgrade.gas.desc=Erhöht die Effizienz von !ngasverwendenden Maschinen +upgrade.gas.desc=Erhöht die Effizienz von !ngasverwendenden Maschinen. +upgrade.muffling=Dämpfung +upgrade.muffling.desc=Verringert den von Maschinen produzierten Schall. //Key description text key.mode=Moduswechsel @@ -379,8 +407,6 @@ mekanism.configgui.ctgy.usage.tooltip=Einstellungen bezüglich Maschinerie und i mekanism.configgui.ctgy.client.tooltip=Client-spezifische Einstellungen bezüglich Mekanism und seinen Modulen //Gui text -gui.removeSpeedUpgrade=Entferne Geschwindigkeitsupgrade -gui.removeEnergyUpgrade=Entferne Energieupgrade gui.condensentrating=Kondensentrieren gui.decondensentrating=Dekondensentrieren gui.power=Energie @@ -439,6 +465,8 @@ gui.formed=Vollständig gui.incomplete=Unvollständig gui.inductionMatrix=Induktionsmatrix gui.matrixStats=Matrixstatistik +gui.turbineStats=Turbinenstatistik +gui.boilerStats=Dampfkesselstatistik gui.main=Kern gui.outputting=Output gui.receiving=Empfängt @@ -448,6 +476,8 @@ gui.cells=Zellen gui.providers=Provider gui.structure=Struktur gui.dynamicTank=Dynamischer Tank +gui.industrialTurbine=Industrieturbine +gui.thermoelectricBoiler=Thermoelektrischer Dampfkessel gui.visuals=Visuelles gui.noEject=Kein Auswerfen möglich gui.undefined=Undefiniert @@ -481,6 +511,50 @@ gui.redstoneOutputMode=Redstone-Modus gui.entityDetection=Entity-Erkennung gui.moveUp=Nach oben gui.moveDown=Nach unten +gui.flowRate=Fließgeschw. +gui.maxFlow=Max. Fluss +gui.tankVolume=Tankvolumen +gui.steamFlow=Dampffluss +gui.production=Produktion +gui.blades=Blätter +gui.coils=Spulen +gui.dispersers=Ventile +gui.vents=Abzüge +gui.maxProduction=Max. Produktion +gui.limiting=Grenze +gui.steamInput=Dampf-Input +gui.capacity=Kapazität +gui.unit=Einheit +gui.temp=Temp +gui.usage=Verbrauch +gui.transferred=Übertragen +gui.dissipated=Dissipation +gui.boilRate=Siederate +gui.maxBoil=Max. Sieden +gui.maxWater=Max. Wasser +gui.maxSteam=Max. Dampf +gui.heatTransfer=Wärmetransfer +gui.superheaters=Überhitzer +gui.boilCapacity=Siedekapazität +gui.encodeFormula=Formel codieren +gui.autoModeToggle=Auto-Modus +gui.craftSingle=Einelnes Item fertigen +gui.craftAvailable=Verfügbare Items fertigen +gui.fillEmpty=Gitter leeren/füllen +gui.noOwner=Kein Eigentümer +gui.securityOverride=Sicherungs-Override +gui.remove=Entfernen +gui.trustedPlayers=Vertraute Spieler +gui.publicMode=Öffentlich +gui.privateMode=Privat +gui.trustedMode=Vertraut +gui.securityOffline=Sicherheit offline +gui.noAccessDesc=Du hast keinen Zugriff. +gui.overridden=Übergangen +gui.nowOwn=Die gehört dieses Item nicht +gui.frequency=Frequenz +gui.mode=Modus +gui.burnRate=Brennrate gui.reactor.injectionRate=Injektionsrate @@ -493,7 +567,7 @@ gui.upgrades.effect=Effekt gui.chemicalInfuser.short=C. Infundierer gui.chemicalDissolutionChamber.short=C. Auflösungsk. -gui.solarEvaporationController.short=Solarv.-Controller +gui.thermalEvaporationController.short=Thermalv.-Controller gui.dictionary.noKey=Kein Key. @@ -516,6 +590,7 @@ gui.factory.Compressing=Komprimieren gui.factory.Combining=Kombinieren gui.factory.Purifying=Purifizieren gui.factory.Injecting=Injezieren +gui.factory.Infusing=Infundieren gui.seismicReader.short=S. Lesegerät gui.seismicReader.solids=Feststoffe @@ -570,8 +645,6 @@ gui.logisticalSorter.default=Standard gui.logisticalSorter.auto=Auto gui.logisticalSorter.roundRobin=Round-Robin -gui.electricChest.editPassword=Passwort ändern - gui.teleporter.notReady=Nicht bereit gui.teleporter.ready=Bereit gui.teleporter.noFrame=Kein Rahmen @@ -581,6 +654,8 @@ gui.teleporter.needsEnergy=Benötigt Energie gui.teleporter.noAccess=Du hast keinen Zugriff auf diesen Teleporter gui.teleporter.noFreq=Keine Frequenz +gui.entangloporter.noAccess=Du hast keinen Zugriff auf diesen Quantenporter + gui.digitalMinerConfig=Konfiguration gui.digitalMiner.autoPull=Auto-Anziehen @@ -598,6 +673,12 @@ gui.digitalMiner.missingBlock=Fehlender Block //Recipe names recipe.mekanismShaped=Geformt +recipe.mekanismShapeless=Formlos + +//Security types +security.public=Öffentlich +security.private=Privat +security.trusted=Vertraut //Item and block tooltip text tooltip.configurator.configurate=Konfigurieren @@ -608,7 +689,6 @@ tooltip.configurator.pumpReset=Kalkulation der Elektrischen Pumpe neu stellen tooltip.configurator.toggleDiverter=Divertermodus geändert zu tooltip.configurator.toggleMode=Verhalten %s geändert zu tooltip.configurator.viewMode=Aktuelles Verhalten %s -tooltip.configurator.unauth=Diese Truhe ist verschlossen tooltip.configurator.noLink=Kein Link tooltip.configurator.linkMsg=Verbunden mit tooltip.configurator.dim=Dimension @@ -663,6 +743,11 @@ tooltip.insufficientFuel=Nicht genügend Treibstoff tooltip.readyForReaction=Bereit für Reaktion tooltip.speed=Geschwindigkeit tooltip.and=und +tooltip.heat=Wärme +tooltip.itemAmount=Item-Menge +tooltip.invalid=Ungültig +tooltip.encoded=Codiert +tooltip.ingredients=Bestandteile tooltip.portableTank.bucketMode=Bucket Mode @@ -672,12 +757,9 @@ tooltip.disassembler.fast=fast tooltip.disassembler.vein=vein tooltip.disassembler.off=off -tooltip.filterCard.got=Filterdaten von %s empfangen -tooltip.filterCard.set=Filterdaten vom Typ %s injeziert -tooltip.filterCard.unequal=Ungleiche Filter-Dateiformate -tooltip.filterCard.logisticalSorter=Logistischer Sortierer -tooltip.filterCard.digitalMiner=Digitalbergbaugerät -tooltip.filterCard.oredictionificator=Oredictionificator +tooltip.configurationCard.got=Konfigurationsdaten erhalten: %s +tooltip.configurationCard.set=Konfigurationsdaten übertragen: %s +tooltip.configurationCard.unequal=Inkompatible Konfigurationsdatenformate tooltip.balloon=Ballon @@ -685,23 +767,44 @@ tooltip.jetpack.regular=Regulär tooltip.jetpack.hover=Schweben tooltip.jetpack.disabled=Deaktiviert +tooltip.flamethrower.combat=Kampf +tooltip.flamethrower.heat=Hitze +tooltip.flamethrower.inferno=Inferno +tooltip.flamethrower.modeBump=Flammenwerfermodus geändert: + tooltip.seismicReader.needsEnergy=Nicht genügend Energie, um Erschütterung zu bestimmen tooltip.seismicReader.noVibrations=Nicht fähig, Vibrationen zu erkennen +tooltip.Bin=Ein Block, um große Mengen eines einzelnen Items zu lagern. +tooltip.TeleporterFrame=Der Rahmen für den Teleporter-Multiblock. Innerhalb des Rahmens können Portale generiert werden. +tooltip.SteelCasing=Ein robustes, stählernes Gehäuse ist die Grundlage guter Maschinerie. +tooltip.DynamicTank=Das Gehäuse für Dynamische Tanks, einer Konstruktion, die große Mengen an Fluiden speichern kann. +tooltip.StructuralGlass=Ein fortschrittliches, verstärktes Glas, welches in Multiblocks verwendet werden kann. +tooltip.DynamicValve=Ein Ventil für Dynamische Tanks, welches Fluidtransfer ermöglicht. +tooltip.ThermalEvaporationController=Der Controller für die Thermalverdampfungsanlage. Nur einer davon sollte in einem Multiblock platziert werden. +tooltip.ThermalEvaporationValve=Ein Ventil für die Thermalverdampfungsanlage, welches Fluidtransfer ermöglicht. +tooltip.ThermalEvaporationBlock=Ein aus einer Kupferlegierung bestehendes Gehäuse für die Thermalverdampfungsanlage. Kann aufgrund seines Materials große Mengen an Wärme leiten. +tooltip.InductionCasing=Energieresistentes Gehäuse für energetisierte Induktionsmatrizen. +tooltip.InductionPort=Ein- und Ausgang für Energie in einer Induktionsmatrix. +tooltip.InductionCell=Äußerst leitfähiger Kondensator, der große Mengen an Energie speichern kann. Gehört in das Innere einer Induktionsmatrix, um die Kapazität zu erhöhen. +tooltip.InductionProvider=Ein Komplex aus Kühlsystemen, Leitern und Transformatoren, der die Energietransferrate der Induktionsmatrix erhöht. +tooltip.SuperheatingElement=Ein modularer, etwas gefährlicher Heizkörper, der gewaltige Wärmemengen an seine Umgebung abgeben kann. +tooltip.PressureDisperser=Ein Block, mit welchem Dampf in einer Multiblockstruktur verteilt wird. Mit ihnen sollte eine lückenlose horizontale Fläche gebildet werden, um den Dampffluss vernünftig kontrollieren zu können. +tooltip.BoilerCasing=Ein druckresistentes, dichtes Gehäuse für den Thermoelektrischen Dampfkessel. +tooltip.BoilerValve=Ein Ventil für Thermoelektrische Dampfkessel, welches Energie-, Wasser- und Dampftransfer ermöglicht. +tooltip.SecurityDesk=Eine zentrale Steuereinheit, um die Sicherheitseinstellungen all deiner Maschienen zu kontrollieren. + tooltip.EnrichmentChamber=Eine einfache Maschine, genutzt, um Erze zu !nzwei ihrer entsprechenden Stäube anzureichern !nsowie viele andere Operationen auszuführen. tooltip.OsmiumCompressor=Eine ziemlich fortschrittliche Maschine, genutzt, !num Osmium in verschiedene Stäube zu pressen, !num ihre entsprechenden Barren zu kreieren. tooltip.Combiner=Eine Maschine, genutzt, um Stäube mit Pflasterstein !nzu kombinieren, um entsprechende Erze zu formen. tooltip.Crusher=Eine Maschine, genutzt, um Barren in ihre entsprechenden !nStäube zu zerstoßen sowie viele andere Operationen auszuführen. tooltip.DigitalMiner=Ein äußerst fortschrittlicher, Filter-basierter !nAuto-Minierer, der alles abbauen kann, was du willst, !ninnerhalb eines Radius von 32 Blöcken (max). -tooltip.BasicFactory=Die niedrigste Stufe in der Reihe der Fabriken, !nwelche genutzt werden kann, um mehrere !nMaschinenoperationen auf einmal auszuführen. -tooltip.AdvancedFactory=Die mittlere Stufe in der Reihe der Fabriken, !nwelche genutzt werden kann, um mehrere !nMaschinenoperationen auf einmal auszuführen. -tooltip.EliteFactory=Die höchste Stufe in der Reihe der Fabriken, !nwelche genutzt werden kann, um mehrere !nMaschinenoperationen auf einmal auszuführen. tooltip.MetallurgicInfuser=Eine Maschine, genutzt, um verschiedene Materialien !n(generell) in Metalle einzuflößen, um Legierungen !nund andere Komponenten zu kreieren. tooltip.PurificationChamber=Eine fortgeschrittene Maschine, fähig, Erze zu !ndrei Klumpen zu verarbeiten, was im Anfangsstadium !n300% an Erzverarbeitung bietet. tooltip.EnergizedSmelter=Eine einfache Maschine, die einen Mekanism-basierten !nOfen bietet, der mit Energie läuft. tooltip.Teleporter=Eine Maschine, fähig, Spieler zu verschiedenen Orten, !ndefiniert durch andere Teleporter, zu teleportieren. tooltip.ElectricPump=Eine fortgeschrittene Pumpe, fähig, !nganze Lavaseen auszupumpen. -tooltip.ElectricChest=Eine Tragbare, 54-Slot-Truhe, die Energie nutzt, !num sich selbst zu sperren, per Passwortschutz. +tooltip.PersonalChest=Eine 54-Slot-Truhe, die von überall aus geöffnet werden kann - sogar von deinem eigenen Inventar aus. tooltip.Chargepad=Ein universelles Ladepad, dass jegliches energetisiertes !nItem jeglicher Mods aufladen kann. tooltip.LogisticalSorter=Eine Filter-basierte, fortgeschrittene Sortiermaschine, die !nautomatisch spezifische Items aus einem Inventar oder !nLogistischen Transporter heraus und in eines hinein treiben kann. tooltip.RotaryCondensentrator=Eine Maschine, die fähig ist, Gase in ihre !nflüssige Form zu konvertieren und umgekehrt. @@ -715,20 +818,29 @@ tooltip.ChemicalOxidizer=Eine Maschine, fähig, !nFeststoffe in ihre Gasform zu tooltip.ChemicalInfuser=Eine Maschine, die ein Gas durch Infusion !nvon zwei anderen erstellt. tooltip.SeismicVibrator=Eine Maschine, die seismische Vibrationen nutzt, !num Informationen über verschiedene Schichten !nder Welt zu beschaffen. tooltip.PressurizedReactionChamber=Eine fortgeschrittene Maschine, die !neine feste, flüssige sowie gasförmige Mixtur verarbeitet !nund sowohl ein gasförmiges als auch ein festes Produkt herstellt. -tooltip.PortableTank=Ein praktischer, tragbarer Tank, der dich !n14 Eimer einer Flüssigkeit überall hintragen lässt. !nFunktioniert ebenfalls als Eimer! +tooltip.FluidTank=Ein praktischer, robuster und tragbarer Tank, der dich gewisse Mengen an Fluiden überall hin tragen lässt. Funktioniert auch als Eimer! tooltip.FluidicPlenisher=Eine Maschine, fähig, ganze !nSeen durch das Füllen von Schluchten mit Flüssigkeiten zu kreieren. tooltip.Laser=Eine fortgeschrittene Form lineraren !nEnergietransfers, die einen extrem !nkollimierten Lichtstrahl verwendet. tooltip.LaserAmplifier=Ein Block, der verwendet wird, !n um Laserstrahlen zu bündeln, zu verstärken und umzulenken,!nmit genauer Kontrolle über den Zeitpunkt des Feuerns. tooltip.LaserTractorBeam=Ein Block, verwendet, um Laserstrahlen !nzu bündeln und umzulenken. Sammelt !nBlöcke, die er zerstört hat, ein. tooltip.SolarNeutronActivator=Eine Maschine, die Neutronenstrahlung der Sonne !nin sein eigenes Reservoir leitet, was die langsame !nKreierung verschiedener Isotope ermöglicht. tooltip.Oredictionificator=Eine Maschine, verwendet, um zwischen verschiedenen items !nund Blöcken mithilfe des Ore Dictionary umzuwandeln. +tooltip.Factory=Eine Maschine, die als Upgrade zu gewöhnlichen Machinen dient; erlaubt das Ausführen mehrerer Operationen auf einmal. +tooltip.ResistiveHeater=Ein dichter, gewundener Widerstand, der elektrische Energie direkt in Wärme umwandeln kann. +tooltip.FormulaicAssemblicator=Eine Maschine, die mithilfe von Energie mit hohem Tempo Items und Blöcke nach Fertigungsformeln fertigt. Fungiert auch als Werkbank. tooltip.HeatGenerator=Ein Generator, der die Wärme aus Lava oder !nanderen Brennstoffen zur Energieerzeugung nutzt. tooltip.SolarGenerator=Ein Generator, der die Energie der Sonne !nzur Energieerzeugung nutzt. tooltip.GasGenerator=Ein Generator, der molekular unterschiedliche !nGase zur Energieerzeugung nutzt. tooltip.BioGenerator=Ein Generator, der organische Materialien dieser Welt !nzur Energieerzeugung nutzt. tooltip.AdvancedSolarGenerator=Ein fortgeschrittener Generator, der Sonnenstrahlung !ndirekt und verlustarm zur Energieerzeugung absorbiert. -tooltip.WindTurbine=Ein Generator, der die Stärke des Windes !nzur Energieerzeugung nutzt, was in großer Höhe deutlich effizienter ist. +tooltip.WindGenerator=Ein Generator, der Windbewegung in Energie umwandelt; die Effizienz steigt mit zunehmender Höhe. +tooltip.TurbineRotor=Der Stahlstab, mit dem Rotorblätter in einer Industrieturbine gehalten werden. +tooltip.RotationalComplex=Ein Element, das am höchsten Rotor einer Industrieturbine platziert wird, um kinetische Energie in die Spulen zu übertragen. +tooltip.ElectromagneticCoil=Ein Block, der kinetische energie in elektrischen Strom umwandelt. Er kann in jeglicher Form oberhalb eines Rotationskomplexes platziert werden, solang alle von ihnen einander und den Komplex berühren. +tooltip.TurbineCasing=Druckresistentes Gehäuse für die Industrieturbine. +tooltip.TurbineValve=Gehäuseart für die Industrieturbine, die Energie- und Dampftransfer ermöglicht. +tooltip.TurbineVent=Gehäuseart für die Industrieturbine mit integriertem Dampfabzug. Sie sollte auf Höhe oder oberhalb des Rotationskomplexes platziert sein. tooltip.ReactorGlass=Verstärktes Glas, welches im !nFusionsreaktor-Multiblock verwendet werden kann. tooltip.ReactorLaserFocusMatrix=Eine Scheibe aus Reaktorglas, welche fähig ist, !noptische Energy zu absorbieren, und !nso den Fusionsreaktor aufheizt. @@ -751,6 +863,10 @@ sideData.Gas=Gas sideData.Extra=Extra sideData.Infuse=Infusion sideData.Fluid=Flüssigkeit +sideData.Fill=Füllen +sideData.Empty=Leeren +sideData.Charge=Laden +sideData.Discharge=Entladen //Redstone control control.disabled=Deaktiviert @@ -831,6 +947,7 @@ nei.rotaryCondensentrator=R.-Kondensentrator //Items item.SolarPanel.name=Solarmodul item.Hohlraum.name=Hohlraum +item.TurbineBlade.name=Rotorblatt //Generators tile.Generator.HeatGenerator.name=Hitzegenerator @@ -838,7 +955,13 @@ tile.Generator.SolarGenerator.name=Solargenerator tile.Generator.GasGenerator.name=Gasverbrennender Generator tile.Generator.BioGenerator.name=Bio-Generator tile.Generator.AdvancedSolarGenerator.name=Fortgeschrittener Solargenerator -tile.Generator.WindTurbine.name=Windturbine +tile.Generator.WindGenerator.name=Windgenerator +tile.Generator.TurbineRotor.name=Turbinenrotor +tile.Generator.RotationalComplex.name=Rotationskomplex +tile.Generator.ElectromagneticCoil.name=Elektromagnetische Spule +tile.Generator.TurbineCasing.name=Turbinengehäuse +tile.Generator.TurbineValve.name=Turbinenventil +tile.Generator.TurbineVent.name=Turbinenabzug tile.Reactor.ReactorController.name=Reaktor-Controller tile.Reactor.ReactorFrame.name=Reaktorrahmen From cc0766be483228e22094ae2eee92441924f1744c Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Mon, 11 Apr 2016 16:32:01 -0400 Subject: [PATCH 38/62] Loads of new assets --- .../java/mekanism/client/ClientProxy.java | 3 +- .../client/model/ModelSecurityDesk.java | 117 ++++++++++++++++++ .../render/block/BasicRenderingHandler.java | 29 ++++- .../render/tileentity/RenderSecurityDesk.java | 45 +++++++ .../mekanism/common/block/BlockBasic.java | 15 ++- .../mekanism/common/item/ItemBlockBasic.java | 18 ++- .../common/tile/TileEntitySecurityDesk.java | 28 ++++- .../mekanism/gui/GuiAdvancedMachine.png | Bin 2313 -> 1844 bytes .../assets/mekanism/gui/GuiBioGenerator.png | Bin 2253 -> 20722 bytes .../mekanism/gui/GuiChemicalCrystallizer.png | Bin 3345 -> 18862 bytes .../gui/GuiChemicalDissolutionChamber.png | Bin 3254 -> 2727 bytes .../mekanism/gui/GuiChemicalInfuser.png | Bin 3252 -> 2855 bytes .../mekanism/gui/GuiChemicalOxidizer.png | Bin 3254 -> 2724 bytes .../assets/mekanism/gui/GuiChemicalWasher.png | Bin 3631 -> 3116 bytes .../assets/mekanism/gui/GuiConfiguration.png | Bin 4617 -> 18078 bytes .../assets/mekanism/gui/GuiDictionary.png | Bin 3394 -> 3365 bytes .../assets/mekanism/gui/GuiDigitalMiner.png | Bin 5279 -> 19955 bytes .../mekanism/gui/GuiDigitalMinerConfig.png | Bin 2623 -> 25748 bytes .../assets/mekanism/gui/GuiDynamicTank.png | Bin 4360 -> 19083 bytes .../assets/mekanism/gui/GuiElectricChest.png | Bin 0 -> 21000 bytes .../assets/mekanism/gui/GuiElectricPump.png | Bin 2124 -> 18907 bytes .../mekanism/gui/GuiElectrolyticSeparator.png | Bin 3543 -> 17055 bytes .../assets/mekanism/gui/GuiFilterSelect.png | Bin 3562 -> 3614 bytes .../assets/mekanism/gui/GuiGasTank.png | Bin 4018 -> 17213 bytes .../mekanism/gui/GuiInductionMatrix.png | Bin 3982 -> 19338 bytes .../mekanism/gui/GuiLogisticalSorter.png | Bin 2519 -> 25973 bytes .../mekanism/gui/GuiMItemStackFilter.png | Bin 5141 -> 19998 bytes .../mekanism/gui/GuiMMaterialFilter.png | Bin 4501 -> 19807 bytes .../assets/mekanism/gui/GuiMModIDFilter.png | Bin 4755 -> 20055 bytes .../assets/mekanism/gui/GuiMOreDictFilter.png | Bin 4784 -> 20057 bytes .../assets/mekanism/gui/GuiMatrixStats.png | Bin 0 -> 2840 bytes .../mekanism/gui/GuiMetallurgicInfuser.png | Bin 2207 -> 17162 bytes .../mekanism/gui/GuiPortableTeleporter.png | Bin 5497 -> 20363 bytes .../mekanism/gui/GuiResistiveHeater.png | Bin 3940 -> 19052 bytes .../assets/mekanism/gui/GuiRobitMain.png | Bin 11181 -> 27960 bytes .../mekanism/gui/GuiRotaryCondensentrator.png | Bin 3312 -> 19818 bytes .../mekanism/gui/GuiSeismicVibrator.png | Bin 1991 -> 18712 bytes .../gui/GuiSolarEvaporationController.png | Bin 0 -> 20988 bytes .../assets/mekanism/gui/GuiSolarGenerator.png | Bin 2379 -> 19349 bytes .../mekanism/gui/GuiTItemStackFilter.png | Bin 4179 -> 19440 bytes .../mekanism/gui/GuiTMaterialFilter.png | Bin 3945 -> 19280 bytes .../assets/mekanism/gui/GuiTModIDFilter.png | Bin 4291 -> 19597 bytes .../assets/mekanism/gui/GuiTOreDictFilter.png | Bin 4291 -> 19753 bytes .../assets/mekanism/gui/GuiTeleporter.png | Bin 5928 -> 20127 bytes .../gui/GuiThermalEvaporationController.png | Bin 3973 -> 20490 bytes .../mekanism/gui/GuiTransporterConfig.png | Bin 4631 -> 17923 bytes .../mekanism/gui/GuiUpgradeManagement.png | Bin 5277 -> 5248 bytes .../assets/mekanism/gui/GuiWindTurbine.png | Bin 2279 -> 19375 bytes .../gui/elements/GuiContainerEditMode.png | Bin 4510 -> 18606 bytes .../mekanism/gui/elements/GuiEnergyInfo.png | Bin 2641 -> 18066 bytes .../mekanism/gui/elements/GuiEnergyTab.png | Bin 3614 -> 18431 bytes .../mekanism/gui/elements/GuiFluidsTab.png | Bin 3593 -> 17974 bytes .../mekanism/gui/elements/GuiFuelTab.png | Bin 2545 -> 18339 bytes .../mekanism/gui/elements/GuiGasesTab.png | Bin 3601 -> 18456 bytes .../mekanism/gui/elements/GuiHeatTab.png | Bin 3724 -> 18392 bytes .../mekanism/gui/elements/GuiItemsTab.png | Bin 3489 -> 18364 bytes .../mekanism/gui/elements/GuiPowerBar.png | Bin 553 -> 17061 bytes .../mekanism/gui/elements/GuiProgress.png | Bin 5055 -> 18320 bytes .../mekanism/gui/elements/GuiRateBar.png | Bin 2676 -> 17324 bytes .../mekanism/gui/elements/GuiRecipeType.png | Bin 3100 -> 16835 bytes .../assets/mekanism/gui/elements/GuiSlot.png | Bin 3192 -> 17640 bytes .../mekanism/gui/elements/GuiSortingTab.png | Bin 3566 -> 18322 bytes .../gui/elements/GuiUpgradeManagement.png | Bin 0 -> 3630 bytes .../gui/factory/GuiAdvancedFactory.png | Bin 4734 -> 19060 bytes .../mekanism/gui/factory/GuiBasicFactory.png | Bin 4690 -> 18963 bytes .../mekanism/gui/factory/GuiEliteFactory.png | Bin 4755 -> 19009 bytes .../gui/nei/GuiChemicalCrystallizer.png | Bin 4174 -> 20965 bytes .../gui/nei/GuiChemicalDissolutionChamber.png | Bin 4164 -> 18994 bytes .../mekanism/gui/nei/GuiChemicalInfuser.png | Bin 4314 -> 19318 bytes .../mekanism/gui/nei/GuiChemicalWasher.png | Bin 4141 -> 19242 bytes .../gui/nei/GuiRotaryCondensentrator.png | Bin 3566 -> 20537 bytes .../gui/nei/GuiSalinationController.png | Bin 0 -> 22750 bytes .../gui/nei/GuiSolarEvaporationController.png | Bin 0 -> 21019 bytes .../gui/nei/GuiSolarNeutronActivator.png | Bin 3779 -> 17477 bytes .../assets/mekanism/render/PersonalChest.png | Bin 2803 -> 3839 bytes .../assets/mekanism/render/SecurityDesk.png | Bin 0 -> 11862 bytes .../mekanism/textures/blocks/BronzeBlock.png | Bin 2896 -> 1508 bytes .../textures/blocks/CardboardBoxSide.png | Bin 3392 -> 2594 bytes .../blocks/CardboardBoxSideStorage.png | Bin 3557 -> 3678 bytes .../textures/blocks/CardboardBoxTop.png | Bin 5216 -> 2666 bytes .../mekanism/textures/blocks/CoalBlock.png | Bin 1450 -> 1478 bytes .../mekanism/textures/blocks/CopperBlock.png | Bin 1416 -> 1461 bytes .../textures/blocks/CopperBlock_alt.png | Bin 0 -> 1499 bytes .../mekanism/textures/blocks/CopperOre.png | Bin 561 -> 1468 bytes .../mekanism/textures/blocks/DynamicGlass.png | Bin 0 -> 1225 bytes .../mekanism/textures/blocks/DynamicTank.png | Bin 0 -> 1208 bytes .../mekanism/textures/blocks/DynamicValve.png | Bin 0 -> 1253 bytes .../textures/blocks/GlowPlasticBlock.png | Bin 1752 -> 1196 bytes .../mekanism/textures/blocks/OsmiumBlock.png | Bin 1510 -> 1607 bytes .../mekanism/textures/blocks/OsmiumOre.png | Bin 567 -> 1442 bytes .../mekanism/textures/blocks/PlasticBlock.png | Bin 1719 -> 1203 bytes .../mekanism/textures/blocks/PlasticFence.png | Bin 1478 -> 1332 bytes .../textures/blocks/PressureDisperser.png | Bin 1774 -> 1396 bytes .../textures/blocks/RefinedGlowstone.png | Bin 2129 -> 1672 bytes .../textures/blocks/RefinedObsidian.png | Bin 2666 -> 1478 bytes .../textures/blocks/RefinedObsidian_alt.png | Bin 0 -> 1484 bytes .../blocks/ReinforcedPlasticBlock.png | Bin 1419 -> 1305 bytes .../textures/blocks/RoadPlasticBlock.png | Bin 1356 -> 1214 bytes .../textures/blocks/RoadPlasticBlock_Alt.png | Bin 0 -> 1217 bytes .../textures/blocks/RotationalComplexSide.png | Bin 1327 -> 1428 bytes .../blocks/RotationalComplexSide_Dark.png | Bin 0 -> 1389 bytes .../textures/blocks/RotationalComplexTop.png | Bin 1251 -> 1161 bytes .../blocks/RotationalComplexTop_Dark.png | Bin 0 -> 1135 bytes .../textures/blocks/SalinationBlock.png | Bin 0 -> 1455 bytes .../textures/blocks/SalinationController.png | Bin 0 -> 1454 bytes .../blocks/SalinationControllerOn.png | Bin 0 -> 1531 bytes .../blocks/SalinationControllerOn.png.mcmeta | 5 + .../textures/blocks/SalinationValve.png | Bin 0 -> 1495 bytes .../textures/blocks/SlickPlasticBlock.png | Bin 1478 -> 1226 bytes .../mekanism/textures/blocks/SteelBlock.png | Bin 1413 -> 1358 bytes .../textures/blocks/SteelBlock_Oxidized.png | Bin 0 -> 1529 bytes .../mekanism/textures/blocks/SteelCasing.png | Bin 1267 -> 1707 bytes .../textures/blocks/SteelCasing_Alt.png | Bin 0 -> 1463 bytes .../textures/blocks/SteelCasing_Alt1.png | Bin 0 -> 1459 bytes .../textures/blocks/SteelCasing_Alt2.png | Bin 0 -> 1412 bytes .../textures/blocks/SteelCasing_alt3.png | Bin 0 -> 15510 bytes .../mekanism/textures/blocks/Teleporter.png | Bin 0 -> 1834 bytes .../textures/blocks/TeleporterFrame.png | Bin 0 -> 1695 bytes .../textures/blocks/TeleporterFront.png | Bin 0 -> 1648 bytes .../mekanism/textures/blocks/TinBlock.png | Bin 1439 -> 1486 bytes .../mekanism/textures/blocks/TinOre.png | Bin 553 -> 1401 bytes .../mekanism/textures/blocks/TurbineRod.png | Bin 2073 -> 1275 bytes .../textures/blocks/bin/BinAdvancedBack.png | Bin 0 -> 1646 bytes .../textures/blocks/bin/BinAdvancedBackOn.png | Bin 0 -> 1654 bytes .../textures/blocks/bin/BinAdvancedFront.png | Bin 1762 -> 1558 bytes .../blocks/bin/BinAdvancedFrontOn.png | Bin 1765 -> 1568 bytes .../textures/blocks/bin/BinAdvancedLeft.png | Bin 0 -> 1646 bytes .../textures/blocks/bin/BinAdvancedLeftOn.png | Bin 0 -> 1648 bytes .../textures/blocks/bin/BinAdvancedRight.png | Bin 0 -> 1646 bytes .../blocks/bin/BinAdvancedRightOn.png | Bin 0 -> 1648 bytes .../textures/blocks/bin/BinAdvancedSide.png | Bin 1834 -> 0 bytes .../textures/blocks/bin/BinAdvancedTop.png | Bin 1770 -> 1640 bytes .../textures/blocks/bin/BinAdvancedTopOn.png | Bin 1777 -> 1656 bytes .../textures/blocks/bin/BinBasicBack.png | Bin 0 -> 1646 bytes .../textures/blocks/bin/BinBasicBackOn.png | Bin 0 -> 1656 bytes .../textures/blocks/bin/BinBasicBottom.png | Bin 0 -> 1528 bytes .../textures/blocks/bin/BinBasicFront.png | Bin 1776 -> 1558 bytes .../textures/blocks/bin/BinBasicFrontOn.png | Bin 1777 -> 1572 bytes .../textures/blocks/bin/BinBasicLeft.png | Bin 0 -> 1646 bytes .../textures/blocks/bin/BinBasicLeftOn.png | Bin 0 -> 1658 bytes .../textures/blocks/bin/BinBasicRight.png | Bin 0 -> 1646 bytes .../textures/blocks/bin/BinBasicRightOn.png | Bin 0 -> 1659 bytes .../textures/blocks/bin/BinBasicSide.png | Bin 1847 -> 0 bytes .../textures/blocks/bin/BinBasicTop.png | Bin 1783 -> 1647 bytes .../textures/blocks/bin/BinBasicTopOn.png | Bin 1786 -> 1660 bytes .../textures/blocks/bin/BinBottom.png | Bin 0 -> 1528 bytes .../textures/blocks/bin/BinEliteBack.png | Bin 0 -> 1647 bytes .../textures/blocks/bin/BinEliteBackOn.png | Bin 0 -> 1655 bytes .../textures/blocks/bin/BinEliteBottom.png | Bin 0 -> 1528 bytes .../textures/blocks/bin/BinEliteFront.png | Bin 1767 -> 1564 bytes .../textures/blocks/bin/BinEliteFrontOn.png | Bin 1767 -> 1579 bytes .../textures/blocks/bin/BinEliteLeft.png | Bin 0 -> 1649 bytes .../textures/blocks/bin/BinEliteLeftOn.png | Bin 0 -> 1655 bytes .../textures/blocks/bin/BinEliteRight.png | Bin 0 -> 1649 bytes .../textures/blocks/bin/BinEliteRightOn.png | Bin 0 -> 1657 bytes .../textures/blocks/bin/BinEliteSide.png | Bin 1836 -> 0 bytes .../textures/blocks/bin/BinEliteTop.png | Bin 1765 -> 1642 bytes .../textures/blocks/bin/BinEliteTopOn.png | Bin 1772 -> 1661 bytes .../mekanism/textures/blocks/bin/BinFront.png | Bin 0 -> 1550 bytes .../textures/blocks/bin/BinFrontOn.png | Bin 0 -> 1572 bytes .../mekanism/textures/blocks/bin/BinSide.png | Bin 0 -> 1643 bytes .../textures/blocks/bin/BinSideOn.png | Bin 0 -> 1658 bytes .../mekanism/textures/blocks/bin/BinTop.png | Bin 0 -> 1622 bytes .../mekanism/textures/blocks/bin/BinTopOn.png | Bin 0 -> 1650 bytes .../textures/blocks/bin/BinUltimateBack.png | Bin 0 -> 1647 bytes .../textures/blocks/bin/BinUltimateBackOn.png | Bin 0 -> 1655 bytes .../textures/blocks/bin/BinUltimateBottom.png | Bin 0 -> 1528 bytes .../textures/blocks/bin/BinUltimateFront.png | Bin 1779 -> 1562 bytes .../blocks/bin/BinUltimateFrontOn.png | Bin 1783 -> 1581 bytes .../textures/blocks/bin/BinUltimateLeft.png | Bin 0 -> 1647 bytes .../textures/blocks/bin/BinUltimateLeftOn.png | Bin 0 -> 1655 bytes .../textures/blocks/bin/BinUltimateRight.png | Bin 0 -> 1647 bytes .../blocks/bin/BinUltimateRightOn.png | Bin 0 -> 1655 bytes .../textures/blocks/bin/BinUltimateSide.png | Bin 1849 -> 0 bytes .../textures/blocks/bin/BinUltimateTop.png | Bin 1772 -> 1647 bytes .../textures/blocks/bin/BinUltimateTopOn.png | Bin 1790 -> 1668 bytes .../ChemicalInjectionChamberBack.png | Bin 0 -> 1579 bytes .../ChemicalInjectionChamberBackOn.png | Bin 0 -> 1725 bytes .../ChemicalInjectionChamberBottom.png | Bin 0 -> 1427 bytes .../ChemicalInjectionChamberFront.png | Bin 2659 -> 1619 bytes .../ChemicalInjectionChamberFrontOn.png | Bin 4073 -> 1963 bytes .../ChemicalInjectionChamberLeft.png | Bin 0 -> 1537 bytes .../ChemicalInjectionChamberLeftOn.png | Bin 0 -> 1634 bytes .../ChemicalInjectionChamberRight.png | Bin 0 -> 1532 bytes .../ChemicalInjectionChamberRightOn.png | Bin 0 -> 1622 bytes .../ChemicalInjectionChamberTop.png | Bin 0 -> 1599 bytes .../ChemicalInjectionChamberTopOn.png | Bin 0 -> 2055 bytes .../textures/blocks/combiner/CombinerBack.png | Bin 0 -> 1538 bytes .../blocks/combiner/CombinerBack_alt.png | Bin 0 -> 1540 bytes .../blocks/combiner/CombinerBottom.png | Bin 0 -> 1427 bytes .../blocks/combiner/CombinerFront.png | Bin 1381 -> 1528 bytes .../textures/blocks/combiner/CombinerLeft.png | Bin 0 -> 1508 bytes .../blocks/combiner/CombinerRight.png | Bin 0 -> 1511 bytes .../textures/blocks/combiner/CombinerTop.png | Bin 0 -> 1492 bytes .../textures/blocks/crusher/CrusherBack.png | Bin 0 -> 1550 bytes .../textures/blocks/crusher/CrusherBackOn.png | Bin 0 -> 1552 bytes .../textures/blocks/crusher/CrusherFront.png | Bin 1508 -> 1562 bytes .../blocks/crusher/CrusherFrontOn.png | Bin 2806 -> 2538 bytes .../blocks/crusher/CrusherFrontOn.png.mcmeta | 24 +++- .../textures/blocks/crusher/CrusherLeft.png | Bin 0 -> 1555 bytes .../textures/blocks/crusher/CrusherLeftOn.png | Bin 0 -> 2416 bytes .../blocks/crusher/CrusherLeftOn.png.mcmeta | 25 ++++ .../textures/blocks/crusher/CrusherRight.png | Bin 0 -> 1555 bytes .../blocks/crusher/CrusherRightOn.png | Bin 0 -> 2418 bytes .../blocks/crusher/CrusherRightOn.png.mcmeta | 25 ++++ .../textures/blocks/crusher/CrusherTop.png | Bin 0 -> 1523 bytes .../textures/blocks/crusher/CrusherTopOn.png | Bin 0 -> 1523 bytes .../textures/blocks/ctm/BoilerCasing-ctm.png | Bin 1277 -> 1590 bytes .../textures/blocks/ctm/BoilerCasing.png | Bin 1202 -> 1283 bytes .../textures/blocks/ctm/BoilerValve-ctm.png | Bin 1414 -> 1657 bytes .../textures/blocks/ctm/BoilerValve.png | Bin 1288 -> 1343 bytes .../textures/blocks/ctm/DynamicGlass-ctm.png | Bin 0 -> 1515 bytes .../textures/blocks/ctm/DynamicGlass.png | Bin 0 -> 1225 bytes .../textures/blocks/ctm/DynamicTank-ctm.png | Bin 1277 -> 1485 bytes .../textures/blocks/ctm/DynamicTank.png | Bin 1201 -> 1208 bytes .../textures/blocks/ctm/DynamicValve-ctm.png | Bin 1410 -> 1539 bytes .../textures/blocks/ctm/DynamicValve.png | Bin 1308 -> 1253 bytes .../blocks/ctm/ElectromagneticCoil-ctm.png | Bin 1584 -> 1496 bytes .../blocks/ctm/ElectromagneticCoil.png | Bin 1281 -> 1168 bytes .../blocks/ctm/InductionCasing-ctm.png | Bin 1310 -> 1609 bytes .../textures/blocks/ctm/InductionCasing.png | Bin 1149 -> 1288 bytes .../blocks/ctm/InductionCellAdvanced-ctm.png | Bin 762 -> 3534 bytes .../blocks/ctm/InductionCellAdvanced.png | Bin 467 -> 1824 bytes .../blocks/ctm/InductionCellBasic-ctm.png | Bin 779 -> 3389 bytes .../blocks/ctm/InductionCellBasic.png | Bin 484 -> 1801 bytes .../blocks/ctm/InductionCellElite-ctm.png | Bin 743 -> 3409 bytes .../blocks/ctm/InductionCellElite.png | Bin 474 -> 1805 bytes .../blocks/ctm/InductionCellUltimate-ctm.png | Bin 799 -> 3508 bytes .../blocks/ctm/InductionCellUltimate.png | Bin 489 -> 1821 bytes .../blocks/ctm/InductionPortInput-ctm.png | Bin 1727 -> 1863 bytes .../blocks/ctm/InductionPortInput.png | Bin 1388 -> 1478 bytes .../blocks/ctm/InductionPortOutput-ctm.png | Bin 1726 -> 1857 bytes .../blocks/ctm/InductionPortOutput.png | Bin 1386 -> 1473 bytes .../ctm/InductionProviderAdvanced-ctm.png | Bin 1333 -> 2954 bytes .../blocks/ctm/InductionProviderAdvanced.png | Bin 903 -> 1971 bytes .../blocks/ctm/InductionProviderBasic-ctm.png | Bin 1348 -> 2860 bytes .../blocks/ctm/InductionProviderBasic.png | Bin 927 -> 1950 bytes .../blocks/ctm/InductionProviderElite-ctm.png | Bin 1304 -> 2912 bytes .../blocks/ctm/InductionProviderElite.png | Bin 909 -> 1963 bytes .../ctm/InductionProviderUltimate-ctm.png | Bin 1343 -> 2949 bytes .../blocks/ctm/InductionProviderUltimate.png | Bin 935 -> 1973 bytes .../blocks/ctm/ReactorControllerOff-ctm.png | Bin 3307 -> 1770 bytes .../ctm/ReactorControllerOff-ctm_Alt.png | Bin 0 -> 1718 bytes .../blocks/ctm/ReactorControllerOff.png | Bin 2203 -> 1510 bytes .../blocks/ctm/ReactorControllerOn-ctm.png | Bin 3496 -> 1887 bytes .../ctm/ReactorControllerOn-ctm_Alt.png | Bin 0 -> 1829 bytes .../blocks/ctm/ReactorControllerOn.png | Bin 2326 -> 1614 bytes .../blocks/ctm/ReactorControllerOn_Alt.png | Bin 0 -> 1581 bytes .../textures/blocks/ctm/ReactorFrame-ctm.png | Bin 2113 -> 1783 bytes .../textures/blocks/ctm/ReactorFrame.png | Bin 1814 -> 1513 bytes .../textures/blocks/ctm/ReactorGlass-ctm.png | Bin 3313 -> 2174 bytes .../textures/blocks/ctm/ReactorGlass.png | Bin 2621 -> 1682 bytes .../blocks/ctm/ReactorLaserFocus-ctm.png | Bin 3246 -> 2371 bytes .../textures/blocks/ctm/ReactorLaserFocus.png | Bin 2601 -> 1744 bytes .../blocks/ctm/ReactorLogicAdapter-ctm.png | Bin 3817 -> 1765 bytes .../blocks/ctm/ReactorLogicAdapter.png | Bin 2660 -> 1449 bytes .../blocks/ctm/ReactorNeutronCapture-ctm.png | Bin 2625 -> 1890 bytes .../blocks/ctm/ReactorNeutronCapture.png | Bin 1937 -> 1449 bytes .../textures/blocks/ctm/ReactorPort-ctm.png | Bin 2740 -> 1737 bytes .../textures/blocks/ctm/ReactorPort.png | Bin 1847 -> 1497 bytes .../blocks/ctm/StructuralGlass-ctm.png | Bin 1254 -> 1515 bytes .../textures/blocks/ctm/StructuralGlass.png | Bin 1245 -> 1225 bytes .../blocks/ctm/SuperheatingElement-ctm.png | Bin 3384 -> 2113 bytes .../blocks/ctm/SuperheatingElement-ctmOn.png | Bin 0 -> 2216 bytes .../blocks/ctm/SuperheatingElement.png | Bin 2010 -> 1424 bytes .../blocks/ctm/SuperheatingElementOn.png | Bin 0 -> 1468 bytes .../textures/blocks/ctm/Teleporter-ctm.png | Bin 4026 -> 4226 bytes .../textures/blocks/ctm/Teleporter.png | Bin 3597 -> 1832 bytes .../blocks/ctm/TeleporterFrame-ctm.png | Bin 4104 -> 2734 bytes .../textures/blocks/ctm/TeleporterFrame.png | Bin 3707 -> 1689 bytes .../ctm/ThermalEvaporationBlock-ctm.png | Bin 1292 -> 1871 bytes .../blocks/ctm/ThermalEvaporationBlock.png | Bin 1206 -> 1375 bytes .../ctm/ThermalEvaporationController-ctm.png | Bin 1735 -> 1877 bytes .../ctm/ThermalEvaporationController.png | Bin 1415 -> 1374 bytes .../ThermalEvaporationControllerOn-ctm.png | Bin 2240 -> 2123 bytes .../ctm/ThermalEvaporationControllerOn.png | Bin 1579 -> 1531 bytes .../ctm/ThermalEvaporationValve-ctm.png | Bin 1438 -> 1911 bytes .../blocks/ctm/ThermalEvaporationValve.png | Bin 1316 -> 1415 bytes .../textures/blocks/ctm/TurbineCasing-ctm.png | Bin 1337 -> 1788 bytes .../textures/blocks/ctm/TurbineCasing.png | Bin 1183 -> 1401 bytes .../textures/blocks/ctm/TurbineValve-ctm.png | Bin 1537 -> 1845 bytes .../textures/blocks/ctm/TurbineValve.png | Bin 1291 -> 1455 bytes .../textures/blocks/ctm/TurbineVent-ctm.png | Bin 2182 -> 1828 bytes .../textures/blocks/ctm/TurbineVent.png | Bin 1627 -> 1454 bytes .../EnergizedSmelterBack.png | Bin 0 -> 1513 bytes .../EnergizedSmelterBackOn.png | Bin 0 -> 1511 bytes .../EnergizedSmelterBottom.png | Bin 0 -> 15545 bytes .../EnergizedSmelterBottomOn.png | Bin 0 -> 15660 bytes .../EnergizedSmelterFront.png | Bin 1872 -> 1586 bytes .../EnergizedSmelterFrontOn.png | Bin 3977 -> 4031 bytes .../EnergizedSmelterFrontOn.png.mcmeta | 16 ++- .../EnergizedSmelterLeft.png | Bin 0 -> 1538 bytes .../EnergizedSmelterLeftOn.png | Bin 0 -> 1538 bytes .../EnergizedSmelterRight.png | Bin 0 -> 1540 bytes .../EnergizedSmelterRightOn.png | Bin 0 -> 1538 bytes .../energized_smelter/EnergizedSmelterTop.png | Bin 0 -> 1528 bytes .../EnergizedSmelterTopOn.png | Bin 0 -> 1529 bytes .../EnrichmentChamberBack.png | Bin 0 -> 1526 bytes .../EnrichmentChamberFront.png | Bin 1995 -> 1589 bytes .../EnrichmentChamberLeft.png | Bin 0 -> 1554 bytes .../EnrichmentChamberRight.png | Bin 0 -> 1556 bytes .../EnrichmentChamberTop.png | Bin 0 -> 1525 bytes .../advanced/AdvancedFactoryBottom.png | Bin 890 -> 1422 bytes .../factory/advanced/AdvancedFactorySide.png | Bin .../factory/advanced/AdvancedFactoryTop.png | Bin .../AdvancedCombiningFactoryBack.png | Bin 0 -> 1701 bytes .../AdvancedCombiningFactoryBackOn.png | Bin 0 -> 1960 bytes .../AdvancedCombiningFactoryFront.png | Bin 1148 -> 1665 bytes .../AdvancedCombiningFactoryFrontOn.png | Bin 2539 -> 1844 bytes ...AdvancedCombiningFactoryFrontOn.png.mcmeta | 0 .../AdvancedCombiningFactoryLeft.png | Bin 0 -> 1665 bytes .../AdvancedCombiningFactoryLeftOn.png | Bin 0 -> 1837 bytes .../AdvancedCombiningFactoryRight.png | Bin 0 -> 1664 bytes .../AdvancedCombiningFactoryRightOn.png | Bin 0 -> 1837 bytes .../combining/AdvancedCombiningFactoryTop.png | Bin 0 -> 1506 bytes .../AdvancedCombiningFactoryTopOn.png | Bin 0 -> 1599 bytes .../AdvancedCompressingFactoryBack.png | Bin 0 -> 1711 bytes .../AdvancedCompressingFactoryBackOn.png | Bin 0 -> 1903 bytes .../AdvancedCompressingFactoryFront.png | Bin 1459 -> 1719 bytes .../AdvancedCompressingFactoryFrontOn.png | Bin 3694 -> 1894 bytes ...vancedCompressingFactoryFrontOn.png.mcmeta | 0 .../AdvancedCompressingFactoryLeft.png | Bin 0 -> 1812 bytes .../AdvancedCompressingFactoryLeftOn.png | Bin 0 -> 2003 bytes .../AdvancedCompressingFactoryRight.png | Bin 0 -> 1788 bytes .../AdvancedCompressingFactoryRightOn.png | Bin 0 -> 1985 bytes .../AdvancedCompressingFactoryTop.png | Bin 0 -> 1550 bytes .../AdvancedCompressingFactoryTopOn.png | Bin 0 -> 1637 bytes .../crushing/AdvancedCrushingFactoryBack.png | Bin 0 -> 1843 bytes .../AdvancedCrushingFactoryBackOn.png | Bin 0 -> 2139 bytes .../crushing/AdvancedCrushingFactoryFront.png | Bin 1719 -> 1690 bytes .../AdvancedCrushingFactoryFrontOn.png | Bin 2838 -> 3007 bytes .../AdvancedCrushingFactoryFrontOn.png.mcmeta | 24 +++- .../crushing/AdvancedCrushingFactoryLeft.png | Bin 0 -> 1731 bytes .../AdvancedCrushingFactoryLeftOn.png | Bin 0 -> 2709 bytes .../AdvancedCrushingFactoryLeftOn.png.mcmeta | 25 ++++ .../crushing/AdvancedCrushingFactoryRight.png | Bin 0 -> 1733 bytes .../AdvancedCrushingFactoryRightOn.png | Bin 0 -> 2709 bytes .../AdvancedCrushingFactoryRightOn.png.mcmeta | 25 ++++ .../crushing/AdvancedCrushingFactoryTop.png | Bin 0 -> 1568 bytes .../crushing/AdvancedCrushingFactoryTopOn.png | Bin 0 -> 1890 bytes .../AdvancedEnrichingFactoryBack.png | Bin 0 -> 1737 bytes .../AdvancedEnrichingFactoryBackOn.png | Bin 0 -> 1942 bytes .../AdvancedEnrichingFactoryFront.png | Bin 3282 -> 1701 bytes .../AdvancedEnrichingFactoryFrontOn.png | Bin 1862 -> 1895 bytes .../AdvancedEnrichingFactoryLeft.png | Bin 0 -> 1689 bytes .../AdvancedEnrichingFactoryLeftOn.png | Bin 0 -> 1894 bytes .../AdvancedEnrichingFactoryRight.png | Bin 0 -> 1697 bytes .../AdvancedEnrichingFactoryRightOn.png | Bin 0 -> 1890 bytes .../enriching/AdvancedEnrichingFactoryTop.png | Bin 0 -> 1525 bytes .../AdvancedEnrichingFactoryTopOn.png | Bin 0 -> 1660 bytes .../infusing/AdvancedInfusingFactoryBack.png | Bin 0 -> 1837 bytes .../AdvancedInfusingFactoryBackOn.png | Bin 0 -> 2177 bytes .../AdvancedInfusingFactoryBottom.png | Bin 0 -> 1423 bytes .../infusing/AdvancedInfusingFactoryFront.png | Bin 0 -> 1792 bytes .../AdvancedInfusingFactoryFrontOn.png | Bin 0 -> 2002 bytes .../infusing/AdvancedInfusingFactoryLeft.png | Bin 0 -> 1815 bytes .../AdvancedInfusingFactoryLeftOn.png | Bin 0 -> 2021 bytes .../infusing/AdvancedInfusingFactoryRight.png | Bin 0 -> 1815 bytes .../AdvancedInfusingFactoryRightOn.png | Bin 0 -> 2021 bytes .../infusing/AdvancedInfusingFactoryTop.png | Bin 0 -> 1568 bytes .../infusing/AdvancedInfusingFactoryTopOn.png | Bin 0 -> 1752 bytes .../AdvancedInjectingFactoryBack.png | Bin 0 -> 1760 bytes .../AdvancedInjectingFactoryBackOn.png | Bin 0 -> 2020 bytes .../AdvancedInjectingFactoryFront.png | Bin 1339 -> 1749 bytes .../AdvancedInjectingFactoryFrontOn.png | Bin 1443 -> 1954 bytes .../AdvancedInjectingFactoryLeft.png | Bin 0 -> 1746 bytes .../AdvancedInjectingFactoryLeftOn.png | Bin 0 -> 1920 bytes .../AdvancedInjectingFactoryRight.png | Bin 0 -> 1745 bytes .../AdvancedInjectingFactoryRightOn.png | Bin 0 -> 1925 bytes .../injecting/AdvancedInjectingFactoryTop.png | Bin 0 -> 1593 bytes .../AdvancedInjectingFactoryTopOn.png | Bin 0 -> 1785 bytes .../AdvancedPurifyingFactoryBack.png | Bin 0 -> 1769 bytes .../AdvancedPurifyingFactoryBackOn.png | Bin 0 -> 2004 bytes .../AdvancedPurifyingFactoryFront.png | Bin 1717 -> 1739 bytes .../AdvancedPurifyingFactoryFrontOn.png | Bin 1783 -> 1936 bytes .../AdvancedPurifyingFactoryLeft.png | Bin 0 -> 1776 bytes .../AdvancedPurifyingFactoryLeftOn.png | Bin 0 -> 1933 bytes .../AdvancedPurifyingFactoryRight.png | Bin 0 -> 1775 bytes .../AdvancedPurifyingFactoryRightOn.png | Bin 0 -> 1935 bytes .../purifying/AdvancedPurifyingFactoryTop.png | Bin 0 -> 1582 bytes .../AdvancedPurifyingFactoryTopOn.png | Bin 0 -> 1771 bytes .../smelting/AdvancedSmeltingFactoryBack.png | Bin 0 -> 1802 bytes .../AdvancedSmeltingFactoryBackOn.png | Bin 0 -> 2008 bytes .../smelting/AdvancedSmeltingFactoryFront.png | Bin 1484 -> 1814 bytes .../AdvancedSmeltingFactoryFrontOn.png | Bin 3502 -> 2106 bytes .../AdvancedSmeltingFactoryFrontOn.png.mcmeta | 0 .../smelting/AdvancedSmeltingFactoryLeft.png | Bin 0 -> 1779 bytes .../AdvancedSmeltingFactoryLeftOn.png | Bin 0 -> 2004 bytes .../smelting/AdvancedSmeltingFactoryRight.png | Bin 0 -> 1779 bytes .../AdvancedSmeltingFactoryRightOn.png | Bin 0 -> 2002 bytes .../smelting/AdvancedSmeltingFactoryTop.png | Bin 0 -> 1553 bytes .../smelting/AdvancedSmeltingFactoryTopOn.png | Bin 0 -> 1639 bytes .../factory/basic/BasicFactoryBottom.png | Bin 2247 -> 1422 bytes .../blocks/factory/basic/BasicFactorySide.png | Bin .../blocks/factory/basic/BasicFactoryTop.png | Bin .../combining/BasicCombiningFactoryBack.png | Bin 0 -> 1714 bytes .../combining/BasicCombiningFactoryBackOn.png | Bin 0 -> 1991 bytes .../combining/BasicCombiningFactoryFront.png | Bin 1211 -> 1658 bytes .../BasicCombiningFactoryFrontOn.png | Bin 2557 -> 1879 bytes .../BasicCombiningFactoryFrontOn.png.mcmeta | 0 .../combining/BasicCombiningFactoryLeft.png | Bin 0 -> 1665 bytes .../combining/BasicCombiningFactoryLeftOn.png | Bin 0 -> 1876 bytes .../combining/BasicCombiningFactoryRight.png | Bin 0 -> 1663 bytes .../BasicCombiningFactoryRightOn.png | Bin 0 -> 1876 bytes .../combining/BasicCombiningFactoryTop.png | Bin 0 -> 1504 bytes .../combining/BasicCombiningFactoryTopOn.png | Bin 0 -> 1609 bytes .../BasicCompressingFactoryBack.png | Bin 0 -> 1709 bytes .../BasicCompressingFactoryBackOn.png | Bin 0 -> 1954 bytes .../BasicCompressingFactoryFront.png | Bin 1480 -> 1705 bytes .../BasicCompressingFactoryFrontOn.png | Bin 3651 -> 1914 bytes .../BasicCompressingFactoryFrontOn.png.mcmeta | 0 .../BasicCompressingFactoryLeft.png | Bin 0 -> 1806 bytes .../BasicCompressingFactoryLeftOn.png | Bin 0 -> 2058 bytes .../BasicCompressingFactoryRight.png | Bin 0 -> 1790 bytes .../BasicCompressingFactoryRightOn.png | Bin 0 -> 2032 bytes .../BasicCompressingFactoryTop.png | Bin 0 -> 1548 bytes .../BasicCompressingFactoryTopOn.png | Bin 0 -> 1647 bytes .../crushing/BasicCrushingFactoryBack.png | Bin 0 -> 1848 bytes .../crushing/BasicCrushingFactoryBackOn.png | Bin 0 -> 2193 bytes .../crushing/BasicCrushingFactoryFront.png | Bin 1796 -> 1683 bytes .../crushing/BasicCrushingFactoryFrontOn.png | Bin 2887 -> 2989 bytes .../BasicCrushingFactoryFrontOn.png.mcmeta | 24 +++- .../crushing/BasicCrushingFactoryLeft.png | Bin 0 -> 1728 bytes .../crushing/BasicCrushingFactoryLeftOn.png | Bin 0 -> 2726 bytes .../BasicCrushingFactoryLeftOn.png.mcmeta | 25 ++++ .../crushing/BasicCrushingFactoryRight.png | Bin 0 -> 1729 bytes .../crushing/BasicCrushingFactoryRightOn.png | Bin 0 -> 2727 bytes .../BasicCrushingFactoryRightOn.png.mcmeta | 25 ++++ .../crushing/BasicCrushingFactoryTop.png | Bin 0 -> 1574 bytes .../crushing/BasicCrushingFactoryTopOn.png | Bin 0 -> 1914 bytes .../enriching/BasicEnrichingFactoryBack.png | Bin 0 -> 1732 bytes .../enriching/BasicEnrichingFactoryBackOn.png | Bin 0 -> 1981 bytes .../enriching/BasicEnrichingFactoryFront.png | Bin 2122 -> 1691 bytes .../BasicEnrichingFactoryFrontOn.png | Bin 2004 -> 1923 bytes .../enriching/BasicEnrichingFactoryLeft.png | Bin 0 -> 1685 bytes .../enriching/BasicEnrichingFactoryLeftOn.png | Bin 0 -> 1922 bytes .../enriching/BasicEnrichingFactoryRight.png | Bin 0 -> 1694 bytes .../BasicEnrichingFactoryRightOn.png | Bin 0 -> 1934 bytes .../enriching/BasicEnrichingFactoryTop.png | Bin 0 -> 1529 bytes .../enriching/BasicEnrichingFactoryTopOn.png | Bin 0 -> 1668 bytes .../infusing/BasicInfusingFactoryBack.png | Bin 0 -> 1833 bytes .../infusing/BasicInfusingFactoryBackOn.png | Bin 0 -> 2118 bytes .../infusing/BasicInfusingFactoryBottom.png | Bin 0 -> 1422 bytes .../infusing/BasicInfusingFactoryFront.png | Bin 0 -> 1798 bytes .../infusing/BasicInfusingFactoryFrontOn.png | Bin 0 -> 2027 bytes .../infusing/BasicInfusingFactoryLeft.png | Bin 0 -> 1797 bytes .../infusing/BasicInfusingFactoryLeftOn.png | Bin 0 -> 1998 bytes .../infusing/BasicInfusingFactoryRight.png | Bin 0 -> 1796 bytes .../infusing/BasicInfusingFactoryRightOn.png | Bin 0 -> 2001 bytes .../infusing/BasicInfusingFactoryTop.png | Bin 0 -> 1585 bytes .../infusing/BasicInfusingFactoryTopOn.png | Bin 0 -> 1757 bytes .../injecting/BasicInjectingFactoryBack.png | Bin 0 -> 1768 bytes .../injecting/BasicInjectingFactoryBackOn.png | Bin 0 -> 2080 bytes .../injecting/BasicInjectingFactoryBottom.png | Bin 0 -> 1427 bytes .../injecting/BasicInjectingFactoryFront.png | Bin 1370 -> 1751 bytes .../BasicInjectingFactoryFrontOn.png | Bin 1462 -> 1959 bytes .../injecting/BasicInjectingFactoryLeft.png | Bin 0 -> 1745 bytes .../injecting/BasicInjectingFactoryLeftOn.png | Bin 0 -> 1935 bytes .../injecting/BasicInjectingFactoryRight.png | Bin 0 -> 1738 bytes .../BasicInjectingFactoryRightOn.png | Bin 0 -> 1954 bytes .../injecting/BasicInjectingFactoryTop.png | Bin 0 -> 1602 bytes .../injecting/BasicInjectingFactoryTopOn.png | Bin 0 -> 1799 bytes .../purifying/BasicPurifyingFactoryBack.png | Bin 0 -> 1778 bytes .../purifying/BasicPurifyingFactoryBackOn.png | Bin 0 -> 2045 bytes .../purifying/BasicPurifyingFactoryFront.png | Bin 1770 -> 1743 bytes .../BasicPurifyingFactoryFrontOn.png | Bin 1835 -> 1957 bytes .../purifying/BasicPurifyingFactoryLeft.png | Bin 0 -> 1771 bytes .../purifying/BasicPurifyingFactoryLeftOn.png | Bin 0 -> 1963 bytes .../purifying/BasicPurifyingFactoryRight.png | Bin 0 -> 1770 bytes .../BasicPurifyingFactoryRightOn.png | Bin 0 -> 1982 bytes .../purifying/BasicPurifyingFactoryTop.png | Bin 0 -> 1594 bytes .../purifying/BasicPurifyingFactoryTopOn.png | Bin 0 -> 1784 bytes .../smelting/BasicSmeltingFactoryBack.png | Bin 0 -> 1798 bytes .../smelting/BasicSmeltingFactoryBackOn.png | Bin 0 -> 2036 bytes .../smelting/BasicSmeltingFactoryFront.png | Bin 1552 -> 1819 bytes .../smelting/BasicSmeltingFactoryFrontOn.png | Bin 3549 -> 2120 bytes .../BasicSmeltingFactoryFrontOn.png.mcmeta | 0 .../smelting/BasicSmeltingFactoryLeft.png | Bin 0 -> 1777 bytes .../smelting/BasicSmeltingFactoryLeftOn.png | Bin 0 -> 2033 bytes .../smelting/BasicSmeltingFactoryRight.png | Bin 0 -> 1777 bytes .../smelting/BasicSmeltingFactoryRightOn.png | Bin 0 -> 2031 bytes .../smelting/BasicSmeltingFactoryTop.png | Bin 0 -> 1554 bytes .../smelting/BasicSmeltingFactoryTopOn.png | Bin 0 -> 1651 bytes .../factory/elite/EliteFactoryBottom.png | Bin 915 -> 1422 bytes .../blocks/factory/elite/EliteFactorySide.png | Bin .../blocks/factory/elite/EliteFactoryTop.png | Bin .../combining/EliteCombiningFactoryBack.png | Bin 0 -> 1710 bytes .../combining/EliteCombiningFactoryBackOn.png | Bin 0 -> 1973 bytes .../combining/EliteCombiningFactoryFront.png | Bin 1231 -> 1665 bytes .../EliteCombiningFactoryFrontOn.png | Bin 2569 -> 1852 bytes .../EliteCombiningFactoryFrontOn.png.mcmeta | 0 .../combining/EliteCombiningFactoryLeft.png | Bin 0 -> 1672 bytes .../combining/EliteCombiningFactoryLeftOn.png | Bin 0 -> 1868 bytes .../combining/EliteCombiningFactoryRight.png | Bin 0 -> 1668 bytes .../EliteCombiningFactoryRightOn.png | Bin 0 -> 1868 bytes .../combining/EliteCombiningFactoryTop.png | Bin 0 -> 1506 bytes .../combining/EliteCombiningFactoryTopOn.png | Bin 0 -> 1602 bytes .../EliteCompressingFactoryBack.png | Bin 0 -> 1719 bytes .../EliteCompressingFactoryBackOn.png | Bin 0 -> 1927 bytes .../EliteCompressingFactoryFront.png | Bin 1478 -> 1724 bytes .../EliteCompressingFactoryFrontOn.png | Bin 3628 -> 1914 bytes .../EliteCompressingFactoryFrontOn.png.mcmeta | 0 .../EliteCompressingFactoryLeft.png | Bin 0 -> 1815 bytes .../EliteCompressingFactoryLeftOn.png | Bin 0 -> 2022 bytes .../EliteCompressingFactoryRight.png | Bin 0 -> 1792 bytes .../EliteCompressingFactoryRightOn.png | Bin 0 -> 2008 bytes .../EliteCompressingFactoryTop.png | Bin 0 -> 1549 bytes .../EliteCompressingFactoryTopOn.png | Bin 0 -> 1639 bytes .../crushing/EliteCrushingFactoryBack.png | Bin 0 -> 1857 bytes .../crushing/EliteCrushingFactoryBackOn.png | Bin 0 -> 2171 bytes .../crushing/EliteCrushingFactoryFront.png | Bin 1789 -> 1687 bytes .../crushing/EliteCrushingFactoryFrontOn.png | Bin 2776 -> 2988 bytes .../EliteCrushingFactoryFrontOn.png.mcmeta | 24 +++- .../crushing/EliteCrushingFactoryLeft.png | Bin 0 -> 1734 bytes .../crushing/EliteCrushingFactoryLeftOn.png | Bin 0 -> 2667 bytes .../EliteCrushingFactoryLeftOn.png.mcmeta | 25 ++++ .../crushing/EliteCrushingFactoryRight.png | Bin 0 -> 1734 bytes .../crushing/EliteCrushingFactoryRightOn.png | Bin 0 -> 2712 bytes .../EliteCrushingFactoryRightOn.png.mcmeta | 25 ++++ .../crushing/EliteCrushingFactoryTop.png | Bin 0 -> 1563 bytes .../crushing/EliteCrushingFactoryTopOn.png | Bin 0 -> 1908 bytes .../enriching/EliteEnrichingFactoryBack.png | Bin 0 -> 1747 bytes .../enriching/EliteEnrichingFactoryBackOn.png | Bin 0 -> 1964 bytes .../enriching/EliteEnrichingFactoryFront.png | Bin 2125 -> 1700 bytes .../EliteEnrichingFactoryFrontOn.png | Bin 2012 -> 1914 bytes .../enriching/EliteEnrichingFactoryLeft.png | Bin 0 -> 1695 bytes .../enriching/EliteEnrichingFactoryLeftOn.png | Bin 0 -> 1904 bytes .../enriching/EliteEnrichingFactoryRight.png | Bin 0 -> 1700 bytes .../EliteEnrichingFactoryRightOn.png | Bin 0 -> 1905 bytes .../enriching/EliteEnrichingFactoryTop.png | Bin 0 -> 1528 bytes .../enriching/EliteEnrichingFactoryTopOn.png | Bin 0 -> 1662 bytes .../infusing/EliteInfusingFactoryBack.png | Bin 0 -> 1846 bytes .../infusing/EliteInfusingFactoryBackOn.png | Bin 0 -> 2196 bytes .../infusing/EliteInfusingFactoryFront.png | Bin 0 -> 1795 bytes .../infusing/EliteInfusingFactoryFrontOn.png | Bin 0 -> 2024 bytes .../infusing/EliteInfusingFactoryLeft.png | Bin 0 -> 1823 bytes .../infusing/EliteInfusingFactoryLeftOn.png | Bin 0 -> 2034 bytes .../infusing/EliteInfusingFactoryRight.png | Bin 0 -> 1825 bytes .../infusing/EliteInfusingFactoryRightOn.png | Bin 0 -> 2038 bytes .../infusing/EliteInfusingFactoryTop.png | Bin 0 -> 1578 bytes .../infusing/EliteInfusingFactoryTopOn.png | Bin 0 -> 1771 bytes .../injecting/EliteInjectingFactoryBack.png | Bin 0 -> 1771 bytes .../injecting/EliteInjectingFactoryBackOn.png | Bin 0 -> 2040 bytes .../injecting/EliteInjectingFactoryFront.png | Bin 1361 -> 1756 bytes .../EliteInjectingFactoryFrontOn.png | Bin 1462 -> 1953 bytes .../injecting/EliteInjectingFactoryLeft.png | Bin 0 -> 1762 bytes .../injecting/EliteInjectingFactoryLeftOn.png | Bin 0 -> 1927 bytes .../injecting/EliteInjectingFactoryRight.png | Bin 0 -> 1753 bytes .../EliteInjectingFactoryRightOn.png | Bin 0 -> 1940 bytes .../injecting/EliteInjectingFactoryTop.png | Bin 0 -> 1595 bytes .../injecting/EliteInjectingFactoryTopOn.png | Bin 0 -> 1785 bytes .../purifying/ElitePurifyingFactoryBack.png | Bin 0 -> 1778 bytes .../purifying/ElitePurifyingFactoryBackOn.png | Bin 0 -> 2006 bytes .../purifying/ElitePurifyingFactoryFront.png | Bin 1759 -> 1743 bytes .../ElitePurifyingFactoryFrontOn.png | Bin 1823 -> 1947 bytes .../purifying/ElitePurifyingFactoryLeft.png | Bin 0 -> 1788 bytes .../purifying/ElitePurifyingFactoryLeftOn.png | Bin 0 -> 1943 bytes .../purifying/ElitePurifyingFactoryRight.png | Bin 0 -> 1781 bytes .../ElitePurifyingFactoryRightOn.png | Bin 0 -> 1968 bytes .../purifying/ElitePurifyingFactoryTop.png | Bin 0 -> 1587 bytes .../purifying/ElitePurifyingFactoryTopOn.png | Bin 0 -> 1771 bytes .../smelting/EliteSmeltingFactoryBack.png | Bin 0 -> 1810 bytes .../smelting/EliteSmeltingFactoryBackOn.png | Bin 0 -> 2023 bytes .../smelting/EliteSmeltingFactoryFront.png | Bin 1563 -> 1820 bytes .../smelting/EliteSmeltingFactoryFrontOn.png | Bin 3506 -> 2135 bytes .../EliteSmeltingFactoryFrontOn.png.mcmeta | 0 .../smelting/EliteSmeltingFactoryLeft.png | Bin 0 -> 1787 bytes .../smelting/EliteSmeltingFactoryLeftOn.png | Bin 0 -> 2015 bytes .../smelting/EliteSmeltingFactoryRight.png | Bin 0 -> 1787 bytes .../smelting/EliteSmeltingFactoryRightOn.png | Bin 0 -> 2010 bytes .../smelting/EliteSmeltingFactoryTop.png | Bin 0 -> 1554 bytes .../smelting/EliteSmeltingFactoryTopOn.png | Bin 0 -> 1649 bytes .../FormulaicAssemblicatorBack.png | Bin 0 -> 1602 bytes .../FormulaicAssemblicatorBottom.png | Bin 0 -> 1427 bytes .../FormulaicAssemblicatorFront.png | Bin 0 -> 1856 bytes .../FormulaicAssemblicatorLeft.png | Bin 0 -> 1572 bytes .../FormulaicAssemblicatorRight.png | Bin 0 -> 1595 bytes .../FormulaicAssemblicatorTop.png | Bin 0 -> 1571 bytes .../blocks/models/HeatTransmitter.png | Bin 0 -> 1734 bytes .../blocks/models/LogisticalTransporter.png | Bin 0 -> 608 bytes .../models/LogisticalTransporterAdvanced.png | Bin 1548 -> 1734 bytes .../models/LogisticalTransporterBasic.png | Bin 1569 -> 1716 bytes .../models/LogisticalTransporterElite.png | Bin 1555 -> 1706 bytes .../models/LogisticalTransporterGlass.png | Bin 1169 -> 958 bytes .../LogisticalTransporterHorizontal.png | Bin 0 -> 220 bytes ...ogisticalTransporterHorizontalAdvanced.png | Bin 1162 -> 1401 bytes .../LogisticalTransporterHorizontalBasic.png | Bin 1167 -> 1374 bytes .../LogisticalTransporterHorizontalElite.png | Bin 1163 -> 1382 bytes .../LogisticalTransporterHorizontalGlass.png | Bin 1199 -> 958 bytes ...ogisticalTransporterHorizontalUltimate.png | Bin 1169 -> 1412 bytes .../models/LogisticalTransporterSide.png | Bin 0 -> 244 bytes ...rSide_HAFX_Oct-28-232850-2015_Conflict.png | Bin 0 -> 1147 bytes .../models/LogisticalTransporterUltimate.png | Bin 1570 -> 1738 bytes .../models/LogisticalTransporterVertical.png | Bin 0 -> 257 bytes .../LogisticalTransporterVerticalAdvanced.png | Bin 1165 -> 1434 bytes .../LogisticalTransporterVerticalBasic.png | Bin 1165 -> 1401 bytes .../LogisticalTransporterVerticalElite.png | Bin 1164 -> 1396 bytes .../LogisticalTransporterVerticalGlass.png | Bin 1169 -> 958 bytes .../LogisticalTransporterVerticalUltimate.png | Bin 1148 -> 1433 bytes ...anced_HAFX_Oct-28-232851-2015_Conflict.png | Bin 0 -> 1561 bytes ...Basic_HAFX_Oct-28-232851-2015_Conflict.png | Bin 0 -> 1580 bytes ...Elite_HAFX_Oct-28-232852-2015_Conflict.png | Bin 0 -> 1504 bytes .../models/MechanicalPipeHorizontal.png | Bin 0 -> 223 bytes .../MechanicalPipeHorizontalAdvanced.png | Bin 1244 -> 1245 bytes .../models/MechanicalPipeHorizontalBasic.png | Bin 1245 -> 1263 bytes .../models/MechanicalPipeHorizontalElite.png | Bin 1244 -> 1236 bytes .../MechanicalPipeHorizontalUltimate.png | Bin 1252 -> 1253 bytes .../blocks/models/MechanicalPipeSide.png | Bin 0 -> 242 bytes ...eSide_HAFX_Oct-28-232851-2015_Conflict.png | Bin 0 -> 1183 bytes ...imate_HAFX_Oct-28-232853-2015_Conflict.png | Bin 0 -> 1545 bytes .../blocks/models/MechanicalPipeVertical.png | Bin 0 -> 280 bytes .../models/MechanicalPipeVerticalAdvanced.png | Bin 1339 -> 1281 bytes .../models/MechanicalPipeVerticalBasic.png | Bin 1337 -> 1292 bytes .../models/MechanicalPipeVerticalElite.png | Bin 1337 -> 1286 bytes .../models/MechanicalPipeVerticalUltimate.png | Bin 1343 -> 1288 bytes .../blocks/models/PressurizedTube.png | Bin 0 -> 1940 bytes .../blocks/models/PressurizedTubeAdvanced.png | Bin 1977 -> 2510 bytes .../blocks/models/PressurizedTubeBasic.png | Bin 1983 -> 2598 bytes .../blocks/models/PressurizedTubeElite.png | Bin 1984 -> 2586 bytes .../blocks/models/PressurizedTubeUltimate.png | Bin 1998 -> 2505 bytes .../models/RestrictiveTransporterSide.png | Bin 0 -> 249 bytes .../models/SmallTransmitterHorizontal.png | Bin 0 -> 1967 bytes .../SmallTransmitterHorizontalAdvanced.png | Bin 1546 -> 1392 bytes .../SmallTransmitterHorizontalBasic.png | Bin 1563 -> 1375 bytes .../SmallTransmitterHorizontalElite.png | Bin 1547 -> 1363 bytes .../SmallTransmitterHorizontalUltimate.png | Bin 1566 -> 1391 bytes .../models/SmallTransmitterVertical.png | Bin 0 -> 1568 bytes .../SmallTransmitterVerticalAdvanced.png | Bin 1593 -> 1423 bytes .../models/SmallTransmitterVerticalBasic.png | Bin 1582 -> 1412 bytes .../models/SmallTransmitterVerticalElite.png | Bin 1594 -> 1403 bytes .../SmallTransmitterVerticalUltimate.png | Bin 1591 -> 1405 bytes .../blocks/models/TransmitterSideSmall.png | Bin 0 -> 1526 bytes .../OredictionificatorBack.png | Bin 1158 -> 1747 bytes .../OredictionificatorBottom.png | Bin 0 -> 1427 bytes .../OredictionificatorFront.png | Bin 1159 -> 1760 bytes .../OredictionificatorLeft.png | Bin 1162 -> 1706 bytes .../OredictionificatorRight.png | Bin 1162 -> 1729 bytes .../OredictionificatorSide.png | Bin 1157 -> 0 bytes .../OredictionificatorTop.png | Bin 0 -> 1516 bytes .../OsmiumCompressorBack.png | Bin 0 -> 1636 bytes .../OsmiumCompressorBackOn.png | Bin 0 -> 1636 bytes .../OsmiumCompressorBottom.png | Bin 0 -> 1427 bytes .../OsmiumCompressorFront.png | Bin 1399 -> 1634 bytes .../OsmiumCompressorFrontOn.png | Bin 3410 -> 1795 bytes .../OsmiumCompressorLeft.png | Bin 0 -> 1668 bytes .../OsmiumCompressorLeftOn.png | Bin 0 -> 1659 bytes .../OsmiumCompressorRight.png | Bin 0 -> 1653 bytes .../OsmiumCompressorRightOn.png | Bin 0 -> 1647 bytes .../osmium_compressor/OsmiumCompressorTop.png | Bin 0 -> 1538 bytes .../OsmiumCompressorTopOn.png | Bin 0 -> 1538 bytes .../textures/blocks/overlay/OverlayAqua.png | Bin 0 -> 1165 bytes .../textures/blocks/overlay/OverlayBlack.png | Bin 0 -> 1165 bytes .../blocks/overlay/OverlayBrightGreen.png | Bin 0 -> 1165 bytes .../blocks/overlay/OverlayBrightPink.png | Bin 0 -> 1165 bytes .../textures/blocks/overlay/OverlayBrown.png | Bin 0 -> 1165 bytes .../blocks/overlay/OverlayDarkAqua.png | Bin 0 -> 1165 bytes .../blocks/overlay/OverlayDarkBlue.png | Bin 0 -> 1165 bytes .../blocks/overlay/OverlayDarkGreen.png | Bin 0 -> 1165 bytes .../blocks/overlay/OverlayDarkGrey.png | Bin 0 -> 1165 bytes .../blocks/overlay/OverlayDarkRed.png | Bin 0 -> 1165 bytes .../textures/blocks/overlay/OverlayGrey.png | Bin 0 -> 1165 bytes .../textures/blocks/overlay/OverlayIndigo.png | Bin 0 -> 1165 bytes .../textures/blocks/overlay/OverlayOrange.png | Bin 0 -> 1165 bytes .../textures/blocks/overlay/OverlayPink.png | Bin 0 -> 1165 bytes .../textures/blocks/overlay/OverlayPurple.png | Bin 0 -> 1165 bytes .../textures/blocks/overlay/OverlayRed.png | Bin 0 -> 1165 bytes .../textures/blocks/overlay/OverlayWhite.png | Bin 0 -> 1163 bytes .../textures/blocks/overlay/OverlayYellow.png | Bin 0 -> 1165 bytes .../PrecisionSawmillBack.png | Bin 0 -> 1714 bytes .../PrecisionSawmillBackOn.png | Bin 0 -> 1870 bytes .../PrecisionSawmillBackOn.png.mcmeta | 10 ++ .../PrecisionSawmillBottom.png | Bin 0 -> 1422 bytes .../PrecisionSawmillFront.png | Bin 2566 -> 1642 bytes .../PrecisionSawmillFrontOn.png | Bin 3016 -> 1712 bytes .../PrecisionSawmillLeft.png | Bin 0 -> 1664 bytes .../PrecisionSawmillLeftOn.png | Bin 0 -> 1870 bytes .../PrecisionSawmillLeftOn.png.mcmeta | 5 + .../PrecisionSawmillRight.png | Bin 0 -> 1664 bytes .../PrecisionSawmillRightOn.png | Bin 0 -> 1868 bytes .../PrecisionSawmillRightOn.png.mcmeta | 10 ++ .../precision_sawmill/PrecisionSawmillTop.png | Bin 0 -> 1496 bytes .../PrecisionSawmillTopOn.png | Bin 0 -> 2663 bytes .../PrecisionSawmillTopOn.png.mcmeta | 11 ++ .../PurificationChamberBack.png | Bin 0 -> 1545 bytes .../PurificationChamberBackOn.png | Bin 0 -> 1652 bytes .../PurificationChamberBottom.png | Bin 0 -> 1427 bytes .../PurificationChamberFront.png | Bin 1862 -> 1616 bytes .../PurificationChamberFrontOn.png | Bin 6529 -> 2018 bytes .../PurificationChamberLeft.png | Bin 0 -> 1536 bytes .../PurificationChamberLeftOn.png | Bin 0 -> 1596 bytes .../PurificationChamberRight.png | Bin 0 -> 1532 bytes .../PurificationChamberRightOn.png | Bin 0 -> 1592 bytes .../PurificationChamberTop.png | Bin 0 -> 1570 bytes .../PurificationChamberTopOn.png | Bin 0 -> 2125 bytes .../textures/items/AdvancedControlCircuit.png | Bin 1549 -> 1684 bytes .../items/AdvancedFactoryInstaller.png | Bin 1679 -> 1442 bytes .../mekanism/textures/items/AtomicAlloy.png | Bin 366 -> 1584 bytes .../textures/items/BasicControlCircuit.png | Bin 307 -> 1663 bytes .../textures/items/BasicFactoryInstaller.png | Bin 1676 -> 1445 bytes .../mekanism/textures/items/BioFuel.png | Bin 437 -> 1495 bytes .../mekanism/textures/items/BronzeAxe.png | Bin 220 -> 1343 bytes .../mekanism/textures/items/BronzeBoots.png | Bin 192 -> 1529 bytes .../textures/items/BronzeChestplate.png | Bin 216 -> 1690 bytes .../mekanism/textures/items/BronzeHelmet.png | Bin 179 -> 1465 bytes .../mekanism/textures/items/BronzeHoe.png | Bin 217 -> 1266 bytes .../mekanism/textures/items/BronzeIngot.png | Bin 328 -> 1535 bytes .../textures/items/BronzeLeggings.png | Bin 169 -> 1486 bytes .../mekanism/textures/items/BronzePaxel.png | Bin 261 -> 1496 bytes .../mekanism/textures/items/BronzePickaxe.png | Bin 1463 -> 1455 bytes .../mekanism/textures/items/BronzeShovel.png | Bin 213 -> 1372 bytes .../mekanism/textures/items/BronzeSword.png | Bin 236 -> 1384 bytes .../textures/items/CompressedCarbon.png | Bin 305 -> 1364 bytes .../textures/items/CompressedDiamond.png | Bin 1527 -> 1535 bytes .../textures/items/CompressedObsidian.png | Bin 1493 -> 1495 bytes .../textures/items/CompressedRedstone.png | Bin 1545 -> 1419 bytes .../textures/items/ConfigurationCard.png | Bin 1487 -> 1401 bytes .../mekanism/textures/items/Configurator.png | Bin 1428 -> 1456 bytes .../textures/items/Configurator_Alt.png | Bin 0 -> 1447 bytes .../mekanism/textures/items/CopperClump.png | Bin 354 -> 1400 bytes .../mekanism/textures/items/CopperCrystal.png | Bin 1649 -> 1369 bytes .../mekanism/textures/items/CopperDust.png | Bin 239 -> 1511 bytes .../mekanism/textures/items/CopperIngot.png | Bin 1584 -> 1486 bytes .../mekanism/textures/items/CopperShard.png | Bin 1659 -> 1344 bytes .../textures/items/CraftingFormula.png | Bin 1296 -> 1598 bytes .../textures/items/CraftingFormulaEncoded.png | Bin 1299 -> 1605 bytes .../textures/items/CraftingFormulaInvalid.png | Bin 1299 -> 1604 bytes .../mekanism/textures/items/DiamondDust.png | Bin 238 -> 1446 bytes .../mekanism/textures/items/DiamondPaxel.png | Bin 259 -> 1521 bytes .../mekanism/textures/items/Dictionary.png | Bin 1546 -> 1379 bytes .../textures/items/DirtyCopperDust.png | Bin 234 -> 1400 bytes .../mekanism/textures/items/DirtyGoldDust.png | Bin 234 -> 1409 bytes .../mekanism/textures/items/DirtyIronDust.png | Bin 226 -> 1349 bytes .../mekanism/textures/items/DirtyLeadDust.png | Bin 1433 -> 1373 bytes .../textures/items/DirtyObsidianDust.png | Bin 0 -> 1367 bytes .../textures/items/DirtyOsmiumDust.png | Bin 236 -> 1405 bytes .../textures/items/DirtySilverDust.png | Bin 233 -> 1392 bytes .../mekanism/textures/items/DirtyTinDust.png | Bin 236 -> 1338 bytes .../mekanism/textures/items/ElectricBow.png | Bin 329 -> 1328 bytes .../textures/items/ElectrolyticCore.png | Bin 291 -> 1466 bytes .../textures/items/EliteControlCircuit.png | Bin 1573 -> 1693 bytes .../textures/items/EliteFactoryInstaller.png | Bin 1677 -> 1446 bytes .../mekanism/textures/items/EnergyTablet.png | Bin 201 -> 1526 bytes .../textures/items/EnergyTablet_Alt.png | Bin 0 -> 1527 bytes .../mekanism/textures/items/EnergyUpgrade.png | Bin 215 -> 1534 bytes .../textures/items/EnergyUpgrade_Alt.png | Bin 0 -> 1543 bytes .../mekanism/textures/items/EnrichedAlloy.png | Bin 253 -> 1311 bytes .../mekanism/textures/items/EnrichedIron.png | Bin 360 -> 1416 bytes .../textures/items/EnrichedIron_alt.png | Bin 0 -> 1511 bytes .../mekanism/textures/items/FilterUpgrade.png | Bin 1435 -> 1448 bytes .../textures/items/FilterUpgrade_Alt1.png | Bin 0 -> 1653 bytes .../mekanism/textures/items/GasUpgrade.png | Bin 613 -> 1870 bytes .../mekanism/textures/items/GaugeDropper.png | Bin 1354 -> 1387 bytes .../mekanism/textures/items/GlowstoneAxe.png | Bin 233 -> 1382 bytes .../textures/items/GlowstoneBoots.png | Bin 231 -> 1556 bytes .../textures/items/GlowstoneChestplate.png | Bin 268 -> 1694 bytes .../textures/items/GlowstoneHelmet.png | Bin 228 -> 1461 bytes .../mekanism/textures/items/GlowstoneHoe.png | Bin 222 -> 1267 bytes .../textures/items/GlowstoneIngot.png | Bin 321 -> 1632 bytes .../textures/items/GlowstoneLeggings.png | Bin 245 -> 1489 bytes .../textures/items/GlowstonePaxel.png | Bin 259 -> 1528 bytes .../textures/items/GlowstonePickaxe.png | Bin 239 -> 1401 bytes .../textures/items/GlowstoneShovel.png | Bin 214 -> 1386 bytes .../textures/items/GlowstoneSword.png | Bin 228 -> 1625 bytes .../mekanism/textures/items/GoldClump.png | Bin 347 -> 1290 bytes .../mekanism/textures/items/GoldCrystal.png | Bin 1621 -> 1369 bytes .../mekanism/textures/items/GoldDust.png | Bin 231 -> 1393 bytes .../mekanism/textures/items/GoldPaxel.png | Bin 259 -> 1521 bytes .../mekanism/textures/items/GoldShard.png | Bin 1655 -> 1354 bytes .../mekanism/textures/items/HDPEPellet.png | Bin 262 -> 1275 bytes .../mekanism/textures/items/HDPERod.png | Bin 2859 -> 1226 bytes .../mekanism/textures/items/HDPESheet.png | Bin 3567 -> 1412 bytes .../mekanism/textures/items/Hohlraum.png | Bin 1443 -> 1464 bytes .../mekanism/textures/items/IronClump.png | Bin 1657 -> 1382 bytes .../mekanism/textures/items/IronCrystal.png | Bin 1611 -> 1337 bytes .../mekanism/textures/items/IronDust.png | Bin 222 -> 1368 bytes .../mekanism/textures/items/IronPaxel.png | Bin 251 -> 1468 bytes .../mekanism/textures/items/IronShard.png | Bin 1638 -> 1296 bytes .../mekanism/textures/items/LazuliAxe.png | Bin 233 -> 1413 bytes .../mekanism/textures/items/LazuliBoots.png | Bin 191 -> 1412 bytes .../textures/items/LazuliChestplate.png | Bin 215 -> 1651 bytes .../mekanism/textures/items/LazuliHelmet.png | Bin 179 -> 1315 bytes .../mekanism/textures/items/LazuliHoe.png | Bin 222 -> 1270 bytes .../textures/items/LazuliLeggings.png | Bin 169 -> 1444 bytes .../mekanism/textures/items/LazuliPaxel.png | Bin 265 -> 1544 bytes .../mekanism/textures/items/LazuliPickaxe.png | Bin 239 -> 1444 bytes .../mekanism/textures/items/LazuliShovel.png | Bin 214 -> 1485 bytes .../mekanism/textures/items/LazuliSword.png | Bin 235 -> 1594 bytes .../mekanism/textures/items/LeadClump.png | Bin 1695 -> 1369 bytes .../mekanism/textures/items/LeadCrystal.png | Bin 1639 -> 1362 bytes .../mekanism/textures/items/LeadDust.png | Bin 1449 -> 1367 bytes .../mekanism/textures/items/LeadShard.png | Bin 1665 -> 1289 bytes .../mekanism/textures/items/LithiumBucket.png | Bin 1447 -> 1374 bytes .../mekanism/textures/items/LithiumDust.png | Bin 1386 -> 1513 bytes .../textures/items/MufflingUpgrade.png | Bin 1395 -> 16544 bytes .../mekanism/textures/items/NetworkReader.png | Bin 1028 -> 1410 bytes .../mekanism/textures/items/ObsidianAxe.png | Bin 235 -> 1401 bytes .../mekanism/textures/items/ObsidianBoots.png | Bin 193 -> 1402 bytes .../textures/items/ObsidianChestplate.png | Bin 224 -> 1568 bytes .../mekanism/textures/items/ObsidianClump.png | Bin 0 -> 1355 bytes .../textures/items/ObsidianCrystal.png | Bin 0 -> 1372 bytes .../mekanism/textures/items/ObsidianDust.png | Bin 227 -> 1478 bytes .../textures/items/ObsidianHelmet.png | Bin 182 -> 1348 bytes .../mekanism/textures/items/ObsidianHoe.png | Bin 219 -> 1294 bytes .../mekanism/textures/items/ObsidianIngot.png | Bin 257 -> 1631 bytes .../textures/items/ObsidianLeggings.png | Bin 177 -> 1422 bytes .../mekanism/textures/items/ObsidianPaxel.png | Bin 262 -> 1499 bytes .../textures/items/ObsidianPickaxe.png | Bin 248 -> 1441 bytes .../mekanism/textures/items/ObsidianShard.png | Bin 0 -> 1328 bytes .../textures/items/ObsidianShovel.png | Bin 217 -> 1454 bytes .../mekanism/textures/items/ObsidianSword.png | Bin 231 -> 1711 bytes .../mekanism/textures/items/OsmiumAxe.png | Bin 229 -> 1385 bytes .../mekanism/textures/items/OsmiumBoots.png | Bin 193 -> 1512 bytes .../textures/items/OsmiumChestplate.png | Bin 216 -> 1617 bytes .../mekanism/textures/items/OsmiumClump.png | Bin 356 -> 1445 bytes .../mekanism/textures/items/OsmiumCrystal.png | Bin 1646 -> 1358 bytes .../mekanism/textures/items/OsmiumDust.png | Bin 238 -> 1466 bytes .../mekanism/textures/items/OsmiumHelmet.png | Bin 179 -> 1433 bytes .../mekanism/textures/items/OsmiumHoe.png | Bin 223 -> 1297 bytes .../mekanism/textures/items/OsmiumIngot.png | Bin 293 -> 1651 bytes .../textures/items/OsmiumLeggings.png | Bin 169 -> 1458 bytes .../mekanism/textures/items/OsmiumPaxel.png | Bin 265 -> 1499 bytes .../mekanism/textures/items/OsmiumPickaxe.png | Bin 239 -> 1469 bytes .../mekanism/textures/items/OsmiumShard.png | Bin 1663 -> 1348 bytes .../mekanism/textures/items/OsmiumShovel.png | Bin 214 -> 1420 bytes .../mekanism/textures/items/OsmiumSword.png | Bin 235 -> 1521 bytes .../textures/items/PortableTeleporter.png | Bin 270 -> 1482 bytes .../textures/items/RefinedObsidianDust.png | Bin 235 -> 1528 bytes .../textures/items/ReinforcedAlloy.png | Bin 1475 -> 1488 bytes .../assets/mekanism/textures/items/Salt.png | Bin 1432 -> 1392 bytes .../mekanism/textures/items/Sawdust.png | Bin 1536 -> 1455 bytes .../mekanism/textures/items/SeismicReader.png | Bin 2366 -> 1390 bytes .../mekanism/textures/items/SilverClump.png | Bin 1693 -> 1430 bytes .../mekanism/textures/items/SilverCrystal.png | Bin 1691 -> 1350 bytes .../mekanism/textures/items/SilverDust.png | Bin 236 -> 1470 bytes .../mekanism/textures/items/SilverShard.png | Bin 1667 -> 1328 bytes .../mekanism/textures/items/SolarPanel.png | Bin 282 -> 1435 bytes .../textures/items/SolarPanel_Alt.png | Bin 0 -> 1455 bytes .../textures/items/SolarPanel_Alt2.png | Bin 0 -> 1497 bytes .../mekanism/textures/items/SpeedUpgrade.png | Bin 188 -> 1507 bytes .../mekanism/textures/items/SteelAxe.png | Bin 221 -> 1403 bytes .../mekanism/textures/items/SteelBoots.png | Bin 186 -> 1364 bytes .../textures/items/SteelChestplate.png | Bin 209 -> 1490 bytes .../mekanism/textures/items/SteelDust.png | Bin 247 -> 1347 bytes .../mekanism/textures/items/SteelHelmet.png | Bin 177 -> 1275 bytes .../mekanism/textures/items/SteelHoe.png | Bin 217 -> 1251 bytes .../mekanism/textures/items/SteelIngot.png | Bin 298 -> 1424 bytes .../mekanism/textures/items/SteelLeggings.png | Bin 165 -> 1368 bytes .../mekanism/textures/items/SteelPaxel.png | Bin 254 -> 1463 bytes .../mekanism/textures/items/SteelPickaxe.png | Bin 233 -> 1398 bytes .../mekanism/textures/items/SteelShovel.png | Bin 211 -> 1355 bytes .../mekanism/textures/items/SteelSword.png | Bin 224 -> 1453 bytes .../mekanism/textures/items/StonePaxel.png | Bin 254 -> 1389 bytes .../mekanism/textures/items/StorageTank.png | Bin 232 -> 0 bytes .../mekanism/textures/items/Substrate.png | Bin 1728 -> 1410 bytes .../mekanism/textures/items/Substrate_Alt.png | Bin 0 -> 1447 bytes .../mekanism/textures/items/SulfurDust.png | Bin 372 -> 1399 bytes .../textures/items/TeleportationCore.png | Bin 245 -> 1563 bytes .../mekanism/textures/items/TinClump.png | Bin 356 -> 1406 bytes .../mekanism/textures/items/TinCrystal.png | Bin 1639 -> 1310 bytes .../mekanism/textures/items/TinDust.png | Bin 240 -> 1327 bytes .../mekanism/textures/items/TinIngot.png | Bin 1569 -> 1418 bytes .../mekanism/textures/items/TinShard.png | Bin 1670 -> 1278 bytes .../mekanism/textures/items/TurbineBlade.png | Bin 1328 -> 16335 bytes .../textures/items/UltimateControlCircuit.png | Bin 1579 -> 1774 bytes .../items/UltimateControlCircuit_Alt.png | Bin 0 -> 1750 bytes .../textures/items/WalkieTalkieOff.png | Bin 1429 -> 1411 bytes .../textures/items/WalkieTalkie_ch1.png | Bin 1502 -> 1534 bytes .../textures/items/WalkieTalkie_ch2.png | Bin 1512 -> 1541 bytes .../textures/items/WalkieTalkie_ch3.png | Bin 1512 -> 1542 bytes .../textures/items/WalkieTalkie_ch4.png | Bin 1498 -> 1533 bytes .../textures/items/WalkieTalkie_ch5.png | Bin 1509 -> 1568 bytes .../textures/items/WalkieTalkie_ch6.png | Bin 1520 -> 1541 bytes .../textures/items/WalkieTalkie_ch7.png | Bin 1503 -> 1544 bytes .../textures/items/WalkieTalkie_ch8.png | Bin 1509 -> 1551 bytes .../textures/items/WalkieTalkie_ch9.png | Bin 1509 -> 1556 bytes .../mekanism/textures/items/WoodPaxel.png | Bin 258 -> 1493 bytes 876 files changed, 585 insertions(+), 23 deletions(-) create mode 100644 src/main/java/mekanism/client/model/ModelSecurityDesk.java create mode 100644 src/main/java/mekanism/client/render/tileentity/RenderSecurityDesk.java create mode 100644 src/main/resources/assets/mekanism/gui/GuiElectricChest.png create mode 100644 src/main/resources/assets/mekanism/gui/GuiMatrixStats.png create mode 100644 src/main/resources/assets/mekanism/gui/GuiSolarEvaporationController.png create mode 100644 src/main/resources/assets/mekanism/gui/elements/GuiUpgradeManagement.png create mode 100644 src/main/resources/assets/mekanism/gui/nei/GuiSalinationController.png create mode 100644 src/main/resources/assets/mekanism/gui/nei/GuiSolarEvaporationController.png create mode 100644 src/main/resources/assets/mekanism/render/SecurityDesk.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/CopperBlock_alt.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/DynamicGlass.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/DynamicTank.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/DynamicValve.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/GlowPlasticBlock.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/PlasticBlock.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/PlasticFence.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/RefinedObsidian_alt.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/ReinforcedPlasticBlock.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/RoadPlasticBlock.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/RoadPlasticBlock_Alt.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/RotationalComplexSide_Dark.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/RotationalComplexTop_Dark.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/SalinationBlock.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/SalinationController.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png.mcmeta create mode 100644 src/main/resources/assets/mekanism/textures/blocks/SalinationValve.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/SlickPlasticBlock.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/SteelBlock_Oxidized.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/SteelCasing_Alt.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/SteelCasing_Alt1.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/SteelCasing_Alt2.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/SteelCasing_alt3.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/Teleporter.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/TeleporterFrame.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/TeleporterFront.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedBackOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedRightOn.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedSide.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicBackOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicBottom.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicRightOn.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicSide.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinBottom.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteBackOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteBottom.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteRightOn.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteSide.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinFront.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinFrontOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinSide.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinSideOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateBackOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateBottom.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateRightOn.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateSide.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberBackOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberBottom.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerBack_alt.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerBottom.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherBackOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherLeftOn.png.mcmeta create mode 100644 src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherRightOn.png.mcmeta create mode 100644 src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicGlass-ctm.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicGlass.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOff-ctm_Alt.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn-ctm_Alt.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn_Alt.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElement-ctmOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElementOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterBackOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterBottom.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterBottomOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberTop.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryBottom.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactorySide.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryBackOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFront.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFrontOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFrontOn.png.mcmeta create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryBackOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFront.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFrontOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFrontOn.png.mcmeta create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryBackOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFront.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFrontOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFrontOn.png.mcmeta create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryLeftOn.png.mcmeta create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryRightOn.png.mcmeta create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryBackOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryFront.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryFrontOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryBackOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryBottom.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryFront.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryFrontOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryBackOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryFront.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryFrontOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryBackOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryFront.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryFrontOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryBackOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFront.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFrontOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFrontOn.png.mcmeta create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryTopOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryBottom.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactorySide.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryBackOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFront.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFrontOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFrontOn.png.mcmeta create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryBackOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFront.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFrontOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFrontOn.png.mcmeta create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryBackOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFront.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFrontOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFrontOn.png.mcmeta create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryLeftOn.png.mcmeta create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryRightOn.png.mcmeta create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryBackOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryFront.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryFrontOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryBackOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryBottom.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryFront.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryFrontOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryBackOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryBottom.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryFront.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryFrontOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryBackOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryFront.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryFrontOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryBackOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFront.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFrontOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFrontOn.png.mcmeta create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryTopOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryBottom.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactorySide.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryBackOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFront.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFrontOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFrontOn.png.mcmeta create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryBackOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFront.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFrontOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFrontOn.png.mcmeta create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryBackOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFront.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFrontOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFrontOn.png.mcmeta create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryLeftOn.png.mcmeta create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryRightOn.png.mcmeta create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryBackOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryFront.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryFrontOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryBackOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryFront.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryFrontOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryBackOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryFront.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryFrontOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryBackOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryFront.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryFrontOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryBackOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFront.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFrontOn.png mode change 100755 => 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFrontOn.png.mcmeta create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorBottom.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorFront.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/HeatTransmitter.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporter.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontal.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterSide.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterSide_HAFX_Oct-28-232850-2015_Conflict.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVertical.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeAdvanced_HAFX_Oct-28-232851-2015_Conflict.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeBasic_HAFX_Oct-28-232851-2015_Conflict.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeElite_HAFX_Oct-28-232852-2015_Conflict.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeHorizontal.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeSide.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeSide_HAFX_Oct-28-232851-2015_Conflict.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeUltimate_HAFX_Oct-28-232853-2015_Conflict.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeVertical.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTube.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/RestrictiveTransporterSide.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontal.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVertical.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/TransmitterSideSmall.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorBottom.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorSide.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorBackOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorBottom.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayAqua.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBlack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrightGreen.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrightPink.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrown.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkAqua.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkBlue.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkGreen.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkGrey.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkRed.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayGrey.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayIndigo.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayOrange.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayPink.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayPurple.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayRed.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayWhite.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayYellow.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillBackOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillBackOn.png.mcmeta create mode 100644 src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillBottom.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillLeftOn.png.mcmeta create mode 100644 src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillRightOn.png.mcmeta create mode 100644 src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillTopOn.png.mcmeta create mode 100644 src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberBackOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberBottom.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/items/Configurator_Alt.png create mode 100644 src/main/resources/assets/mekanism/textures/items/DirtyObsidianDust.png create mode 100644 src/main/resources/assets/mekanism/textures/items/EnergyTablet_Alt.png create mode 100644 src/main/resources/assets/mekanism/textures/items/EnergyUpgrade_Alt.png create mode 100644 src/main/resources/assets/mekanism/textures/items/EnrichedIron_alt.png create mode 100644 src/main/resources/assets/mekanism/textures/items/FilterUpgrade_Alt1.png create mode 100644 src/main/resources/assets/mekanism/textures/items/ObsidianClump.png create mode 100644 src/main/resources/assets/mekanism/textures/items/ObsidianCrystal.png create mode 100644 src/main/resources/assets/mekanism/textures/items/ObsidianShard.png create mode 100644 src/main/resources/assets/mekanism/textures/items/SolarPanel_Alt.png create mode 100644 src/main/resources/assets/mekanism/textures/items/SolarPanel_Alt2.png delete mode 100644 src/main/resources/assets/mekanism/textures/items/StorageTank.png create mode 100644 src/main/resources/assets/mekanism/textures/items/Substrate_Alt.png create mode 100644 src/main/resources/assets/mekanism/textures/items/UltimateControlCircuit_Alt.png 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 cacea2e3d042f4a37fd01ce272c8c2aed03f149d..612c487f0d71ab84a1eceb4e76e8e2e109633044 100644 GIT binary patch literal 1844 zcmbtVeM}o=9DZAHDGd24qwP!f`#|0{5}I>jy+< zi+_+MN@9$`!D39%&8eF#i^4>dMB_%njLCF!A8J?>7S}l^frY@p_kdP2Y5&>%aqsVa z?|Giz^LyXln>$kLs!C0MG8q7n>Zm5_08qhD1vES0&?J7)4u@>H!Y$YH?XsT~X<+m4 zZ8YLw$qu@XCOtiers+}u5}slj+_KwQgHt@KBNdD;zzUEJKxtV(AgL}|M%w5OhO=nz zPJE?B7>`BUXmskGf}QSUs(VGczSq@2^>$HakG5<-QX0Ua087gx5@5SI2@hDb8@f1* zm1R_mY(V5Li+0nL+gXd)d67npI%5H)H(*GKS%(>m%ow&8G3c>E6w{*ya{-3oMI|^^ zjBGtxm`(Jw<8?&kRxUWRXgg(Dz){ri_v`$HI$rERF|*l>>J6yDPyi7HQV%DSfdWq2 z9Z?`?i4qw>W_S)!6v;N;D_gYC>1GM65S8Vmt!;uEh6YFh#dLb5qzKUIj1OhmC|Z*1 z=zslgD=ani2sBzpOT1U4;K8-;R#FMLU8G5w7aMrKJF<(loxIFToxFh9?Z}=+hV$@# zDSrd*bm9(9l1YxD9fU;-1#}GK!OIPmwjzVRk}#Nz7*TPj7F}>(3VscSv235}W zKj$1-g3Y6Z(XNG)Xy4NuY<3ZL^-A$-F1#!!9fYkRa4mcz#Jp$C3LePowxuk!sfx*G zFOU9c%FJ#SO5Py)o;XX*Sv0en)!Ft%`=nI9SaeWGn?3aXK-%?;!Fl|JYL~dwuRr`6 zSeZ00n}^A)rZa0d-~ZtR_$KRA^7FS>*6zKG`A+Xx9aAfVR&)AQ$Mn=?QAP9gOXaMq1@Y~1Ze%0K4Ft@&to{<$? zX3Nmk;ET}CbKAoIFA#U-ulm7LxxVJX)s&&*C%Lg<^IZ6y`YWFnE@rCS`-2(m^D)Rwd9N=gG&4s-)+8$ks;}<6a4bA89J`nkLaKa;;$~4(y5V%yo#bv;nsj+Wy->AL zy>HS8z4c$>RB<}M3ihgC<;aA3_{|5q2B^kX*ZI>^o0Q;9-THFQf_+M#-A|5=*WSvs zj<PyXpzcJvba1p1=Tl@Y2sJ#2@ literal 2313 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 LME9(^$ zv33WK000w07(j>$12L$?8vv1MKWl3|*4i404$mI+|!^yVVbVii%$R+cs4+fZ5$8v_Uv70?O zKTjIa(^Ki$Stdufh_fuU`IzD&s$)G-57KLkv;ElWzU3LmP>emk7JTt&X|agrZL5G| zW)bQ5W5Dt=&-AOB-nImnQ=wTyJ6rWtH6)D)W7|Emk_vmPbiQi6 zSkd3J5U^oJHKq!MLysxfzoi@w;pUv`bg9ST*H{Lm{l|F}-ssQo+fu(ar1rR7detoz zRqkJheX$GG{9UklTa-Mnsg0<0Ep!*==dB!S;q!$zh6>|^DI_Pc_N*YT6yNOoE@NBm zxuCH3=4Ds%{Ob*`nq5|u9w_UwN*_UCGQEQzx+hS_uRZQ)**%GN_!fq%C=% ztF1kODi!sEJqBmFx)gc44X?)OrnqkkmimaUboyqVc(AFU4KvwW+*XS={xY;B=)~TW z`YCc&tJl3mD--I{X9BGs#pbEx(-~UlW7hdO;UQRW>Tkg5V@;bHHqcf|A{|izOO@fNbU05y4yDHa#IhfogIuQ z{=9QkFZuNAw9svW6z$Y0Ht z@J*Iy1S7K#?0@iL?F#+6TXvlkpKI|PlWY2FACBIo#bOq-_WvT|R z0D$<6J!t6^3ghu$-cBBc%$1dur}=AM@&&jZiv(b5YAToE9K#%ihcxut^Hw4)B4%%3 z#Af-j%)y`WYnVY;^dZEu9LTNpGQ`rDmKdPA-4t1227^^J-D>cH#9%OT!8DCI2ZuA~ zyeCt{RfQn>xd_xJD+T&;>rA$hrKEtEgd`#W_hl-*CY(w&2{NHZ(3m|vJz^7Q+r8FZ z5oLCNt04`faC_=yCBhee4o~oSkNx9ubn}akgtI_P1w-$+b{=~m$YamF4n#Ch2pa3u z#CO_Yz)o*DoErM!`0Q*-PXE#J%uV=wai4NX(GY( zqWj07mqN9aoQxr?P%XdX6fOKtB=~KFcQc@;k`ZPBpjU04cVnKHNP}E&Q}jn+tINs?onpk^nt3U&3QU2SpGD^ zUCUo-e_)o@nRc3l|v3^Ni7Z=~u(9p#)f&4=vsXEgp@aBkE zj6Nu$bg4WT2^u?hB9%pt$dmZIe=O{yElu6bUp!XmebcbBbWAD@{P<9rg{h?hghs)f zIA7?Fzl(sGF$Kk(>f&~vWE@qIHHR>gueD{dC8fzaWVMD=a4}0qIzf06&ZD|^M<0N} z@IIxTAi7s$O)Q`)5nbdC-L`PY&Ck#K7#bSp*82UrH7$_EYUQ7}n>TL~5eE?hpJ!*= z_+G$4o__YPGOI7&AksjC_CSXy93h3o&;ShjKlo>e@P!YpfhN)Vs+zlmSHf2ZVE=GD JSZ?JJ^DnL%L(u>L diff --git a/src/main/resources/assets/mekanism/gui/GuiChemicalDissolutionChamber.png b/src/main/resources/assets/mekanism/gui/GuiChemicalDissolutionChamber.png index 7f14a7fe736eb194db832f79200f6649776b4d63..4ca3ef2a88ff67cd5f83a9e9b955a30135423acd 100644 GIT binary patch literal 2727 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 diff --git a/src/main/resources/assets/mekanism/gui/GuiChemicalInfuser.png b/src/main/resources/assets/mekanism/gui/GuiChemicalInfuser.png index 8e8fed47dfbb9aba22d74fb73f2d2c34cdf9723f..61388f0e576bb19f20e251307f796761d4838ee5 100644 GIT binary patch literal 2855 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 diff --git a/src/main/resources/assets/mekanism/gui/GuiChemicalOxidizer.png b/src/main/resources/assets/mekanism/gui/GuiChemicalOxidizer.png index 7f14a7fe736eb194db832f79200f6649776b4d63..df97a3f6406b7a2924f13489808fba202ef0b3ec 100644 GIT binary patch literal 2724 zcmb_dX;f3!7QRqlrHa@p0f8`8aX>($f`;S*5t18jE+h;pK3A8o zuYzd62!dFjqJj*9E|ADn7Da|6RAiJ%nXF+DC?Lx4E;97}@VQ)XdH$Sz&fWX__Wt%h z>;AN7m-DI>YgYgOu*%hi_KSTq1w+e$?oZXkq$zK}m($ixjP zig6&H$HeWYx)I$(4p0E!B^-hFh41p#WL^JwN=nx7fuYe_Zph0J+omXHP2j7Q;^^ZYExJQ5XJ#Cc!56PZYL zv?q~SWIL<}j^=a=3z`$1VsCFrW)W%jc8jsDLNUq_a-l_TKE}NeOZs3e!vTRfD2#Z( zaM0ou>wdnF2TR1?&vj_NU>1b%Lm{3M0t>)*5;OSkq5rtj=i_<* zuXF?~DZ<>G{MXzpUSY#HXD+=0?6CBXAR+d65bTwl+|gqX0H0U7vg|yhE&Z)Zp-12P zis24Ar7K~0TPPU&wewy(<>p`h6>FjwQYWaVzRY>P!6dUJ@OnGT_yu0SHqG7JGb4_1 z&D%5DeZ{%rmm z&F;(nRJL~*C9mkUd4lFU3Z=5|%L~bzk#S$d--^BUBrh}aI2@;|d8ioi61L;jM_%;) z+W&*io2k%)WhTnzax~AWdC)i{OGc|xKhKw?m_C$u#LQfo$&Xj%SCuI!Po$MY(lOsb#l@$}5ycxq#D@TOve6Y-Rc>v?a&|6a|eK21^o z)HB(tm}Q5Zk&tbyRMX85OdG{~`8Pvlzqcg?4D?RZe5yx$Xe$R~lcf@MUulD!pQqrP zNph%9)wjdxZC>%V=ZYSAX?#?TKeG*#-MqIuy?XnQJnQ1jr+hzI1jSS3v5ntYIaIOn z=8>V^wg>S^8wfq9#^YkabZc{=tRSr}E_X0}M11F>Y=%{@%o^qRq#q2sSsd9}krO&1 zZn~3|WgAn{J)DvTS1IznZJtQPMa7A!3b`sfSvfqdoA|8jM}ha1=CrgRn$-g~bL%;c zZaSxZurNNgBaU5WZP;F^3Ls8q?^4{m@x!)5%_`^m0S{=#r%=8!SOymOOR0z;kn)=XPpUdBV_*`nB?o^jzi%kKTc}ii~@S1(E6kQ_yMB zd**!kF??HrY~%fQtJjxo45Ff=R}B$UTd>u21a8egKQ-z<%WjZEsGnvkJ5gPh!zgBJ z$Cmo+!kfnLZb!bTU3cS{^14C%R$b?WZPjmt#mN(z8`dp`J@DA+C;v9-)8F0GE+w2s zz7VA`FYit)jMF==ijJT^J@jZIy-}QHI%#{mNEOi9{bvnQWB|tl(c~jG%3}Q9fT~9M zW#OBF(6E_5BI!-4jE1&94;Gr%Pxr@2a@k)ZId@!a0ypn<@yd-;j=Yw)r4(P-0c^27 zGkT)rWmei}v#GhWeWP#dBBqYPn=Ff#0n30j!1lSneAnX$6nSO zO-KqNClS2Q!x!axz>NOs(oUD@U$o zOsm=4SOWqTwcWzWUc^VKtjk;#MLj$V_&hT%>HeE^ zgDmiI<+@Ts@s*I6+2x&Ie@LBWC7UqaVt%2<`u%Jruj8X7jthIjoIJw5U2d~j`qcFR|fl5VGPoxzC@3BMgM)LsL0ew%{+yK~ymO1toyUdhbLSJwSfu4+_u*C;juhynm@KnDQdV}QVFEge9l+x(8Sta|jx z`cp^OVkhHycXjt|n%2OIAeDJd7_$H9>aDd721mVv5ILMNzvyb-(;I4j*X2SR)i|QI>pV`zJ>QL=nfDC7?!V#%KBBdJUiIM z^7>Gl(X*?wdRG}QV4a;E3#t9Dl9u>C+W2%xOCo;^o)O%n-V%hhog KE7ShyKmG%7Ur`y^ZW(RTFpo@M0fVpwQbs}us zWrt;Y7_n5*l2)CyT_Jxe5n{_8#+_^?>Vx{-smI@Tc&k5Wqou}XHX|>c zrk6oAORO)RF;7rk3ZmrFk5`AHH>!in5ZhlQZb$PDv?4Vn-lk+CaIP8eW5_#$K@+a-= z56`kkyrO%C5lNN7O}I{jy=|XFyR?%OmRh@sS~p@0u*-J}<4Rwwy+SL_;1^Kr^u`OK zRJwCpU|+6wV@O17zeUB>;^1cVb@MAq$jOQ!>zt{**gXHp$KKcCW^Pmuv>VRrIezj; zRGhi5HGiBmIn>>IEe?@1J;sNz+}$4fd-1-f>SlRwk3_uHt8w{gk#5^c>&DKHmUTDk znQ*x35rjjYMp-+ozu)qethv^dBM7y5@@w(#!lK?t%a0ay`+sK*S61ZvwW`?0@66IV zO!MiGnKyN-f*dNpnI_YwLOO+qLLGCRhkwc4nO=5wyWdt_|3!qD18TuPly35tp`YmxaGkiHmGkQCHoW3$F zJ^zSacP;0udEM1^S9{-3|C?{jEbMNkDfObfI{f0}2S}UH*vpv>TIc#qN9BXubf%>q zq-kNs)o^)}xt4hfysf;Jh-kv?@yj@oi|DlIl<1_$OSJ3!`&%S;5w1}qelIce?g)3v zS1@~pOc*)z^D{5J;e*Ut0vY$m2?KkEeb-Csu--PD@1W}NEZeLhrX@yCvY6RAGO}8Y zVWfCKPf94nSf%MZoem>F^}3Pb!l(o zRK4Tf?*-CqbFhX1`GJyQQqOiigIF=@Oh%U z(a$E%u}>Y$`T7HVRMi5i{hnI+^DlbU0^e`9NF7s+~lj-wsoI z1|kYitDtwM>vl$!ywr)qOpasfZ7urI!)gxL0^W!5y3N(&Ng9j4OXRa2t@9dqhU=>f zmR~Yh?FMacSBczWZ_9)`@taY7v1*a>)7n);RWG5p_fNc3qZcczDZ!bgp&`9i5o=*S zYa3Y9_b^kH>pIC9@D0Sh*_2?0Hq0Dkn806aS9v_y9vRj!-o^TVJX5-ok9TYGN0n;U5*bkp{?~0S8{z>|~fQYv?%wlr6TufI> z`A0sV-xdA+PdpY74u1n8&CSf>DXv1oi>|INYd|P4D|tnr_#!9e?KM$=oH2n8%aVXG ztFJ9=(Ue=<#q{aZU%2B5OLV~k-^yJmQ+cwz@ji;QQ)+?fY%reY?GIg>pR!#RWzjlv0yOc*TR>YT3Q}kzPhio)dfm>?V&snF)=Zr0y51e&wLal+@7K; zQYS*ce0##UE72k`Epx#X%z?qMrJ?S+$^9TmGb;ZKx0OQxIn91gV5VE)lz!U7y$Bo@ zu;u61$xRF2!c*{dxBO&0si|U$^2M=H@SE_DSLu^r%eB4**y2n8Z6%l zzd)_*P|1?@B54fFEb@-cl-?JJ_E6!q;vGY?LmPO(?>Z{wB`Vq>xhB1KVNJy`_))H) zp0(udxPnx@tHCj%?DHsb@G*oy4Bc$NF%FKacGOJ_%#OL%<)I>lQEPcyqj$=v@xaUdSbj|04kI*h$+;YoC;V0RcK27XSbN diff --git a/src/main/resources/assets/mekanism/gui/GuiChemicalWasher.png b/src/main/resources/assets/mekanism/gui/GuiChemicalWasher.png index 77507901fa835fa2e66c72080e8870f202c95f8c..8a3bb3b4eece8c584aa614119c6fb4cec2031e2d 100644 GIT binary patch literal 3116 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 Rj4vL*)X2iH?5a!ne*gzT=f3~| diff --git a/src/main/resources/assets/mekanism/gui/GuiDictionary.png b/src/main/resources/assets/mekanism/gui/GuiDictionary.png index 5c8d64c25e2148e8d32b0d4d87d90bf755c361f0..05fdc0e539735c0f3fd39a9f1913ee6c5ca18d9b 100644 GIT binary patch delta 1038 zcmV+p1o8XA8l@VLBYy+%X+uL$Nkc;*P;zf(X>4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wF2RW IvpNI_3H*c$FaQ7m delta 1067 zcmV+`1l0Sb8p0ZoBYy-9X+uL$Nkc;*P;zf(X>4Tx062|}Rb6NtRTMtEb7vzY&QokO zg>Hg1+lHrgWSWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@ z+di}}l?o-=)F3E6wD^Ni=!>T7nL9I?X}YoAW$t|Qo$sD|?ti&w?*-_&s#unh6af~R zt}Pcb;&X?Oh&?NigomIP2BB9`9V=a_OaeAf3wO0!-$TNCU)j~&{-3S4MjaI(aUWu{ z=BNvZj{)$fRm*k(dis$cKk8Z@_G0L_F+jvGdbr_Z*TZu@evN5nWtO z;Zej(s*;~Z{0QP}ZGE;J;MNT3ndwE3s`n-8a z_I+}nIqm6u=<|e@EeHIimz0AQ#Dj=`p+-UW=i>gc+)5Aw8EP8kNq;VqqYhgy<6Uj0 z=+8?G7dO-&OBU<;fl{FVM6-)>fUj8wt5J-NPueZH>g)MY#m*OepL~TjtAT&M4YLUa zD3~yZy?+W#SOXDcC_o0^7T9R1gAN8V6s;5)ieI5-7aQlmJn}lUna#nz!j%5V$X|o` zxX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?ZvKPDL<64`^#UNTAck#RBsB6*5DP4<%< zvJ+(Q`q)ZrMP58N*8RMUGg79TMcp~HyP#nIGk+>fTvOMqEDpAYBg-lK1zo-T#$T~q z=`1%wHmU-|3&GWIL{YNX(Qxa>rWCyRuBf>}*(bcU2l~2ICg+(V4}G z#U1l;@#I$zMt+vbndh(cT|8NDE)GVlmj(K2`BoWDjYO>UgY<{AEWIavDE-F0&3(#! z&3}E)eZgG6#@QDHLj zCkzNR&Px>zCja= zBtvA3lr~iNxL5O`B9%|&QfUxVJ5v*>v47M-4~Mg+cA#wn`}`f%scy1T>e6H0eF9n2 zI&SL?%@ub`(vxBuuQn={n(F9?s2GOGOpa(%huUpg8wKy)^pEtLGP@5GTP{bO`wYOo zKk@AQF5-@~0G1qpfyX0m7|+TF-UT@Ggxa#(!5xuEd<)>z_w4q+`Z9Qa{nY8)#2<64 l=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95Z?hc)2njB(8i4=+ diff --git a/src/main/resources/assets/mekanism/gui/GuiDigitalMiner.png b/src/main/resources/assets/mekanism/gui/GuiDigitalMiner.png index b4d34c3bedb8d6f0dee59d90478436b9867ebd65..5b52b3a26affce48a2c82d2f2d664be2f88eea0c 100644 GIT binary patch literal 19955 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 diff --git a/src/main/resources/assets/mekanism/gui/GuiDigitalMinerConfig.png b/src/main/resources/assets/mekanism/gui/GuiDigitalMinerConfig.png index eadb5f8f125434deeb4f8786fbb8afb83abca201..0051bf133fdc88483dc8f19e71c66eb00bbfae1b 100644 GIT binary patch literal 25748 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 R?|)~%y2=IRXNu-Q{{sj6C-VRR literal 2623 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 diff --git a/src/main/resources/assets/mekanism/gui/GuiDynamicTank.png b/src/main/resources/assets/mekanism/gui/GuiDynamicTank.png index 2bfc215e907e567be0c95c776793f99107e12632..261aced9ed71553320242ce00cc28a7c054f5378 100644 GIT binary patch literal 19083 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 literal 4360 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 ZFX4_V1)uX=;6EI|(#+QM#Szl)e+LOfdK~}& 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 0000000000000000000000000000000000000000..f3ae944e5245fccc75dbc7b4f74b4a7b15f7ba52 GIT binary patch literal 21000 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 T`3R0Z0DUNy_7-Q&)@=SSo9gn5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/gui/GuiElectricPump.png b/src/main/resources/assets/mekanism/gui/GuiElectricPump.png index e7aac4b6f0cf6d7d0c12d50a4c26efce4f78da41..db141a9837f47f7dc75c3d75c569db67ada9b8c0 100644 GIT binary patch literal 18907 zcmeI4c{r5o-@qSBn>Hz@D48fHWy}m?nZY2kRJKqYN@M1kF)>RsgRwhGt7zYlN((KN zB}Gz4<#Z}imY9$fqOnAg_4kY=deXeT@A+NV`_DYrAZ`~K&iJ@&Si zGi4NI005Y2ZDqb503@JS31I4E=$|_~i30tTrkdKA0>G>0&x__=1^}rZnwgosy%&?q zg?!td!gdBN0Y4& zU-+;}@%FP)w1xcTV^s$(+$G6`nR_@d4f{#TgI2qzNQ4tQ}3|OP8KE z;#Qh?9sUw=nU#|2n6v58t%IpyxCVbhYq5?=!NyZ{C#)5=RDar}lW;I5;lwe64NImK znf~5sa_M4_ZMM6nq~@bY%d&irCHJfKrc^c$a(p)=Uy@pSdX>*cqmaezwD2Rz1}U=< z)fQjd)N4#%w;R4y(p1~+LgXE*)5zCeq&!>Sv1z&Iv3=*uGgrJ__Ml%I^VMfY$D)W# zRXb#pV)oNO2S33n;tQ8-JNv;R9j5Ld?SbtdKGmzmyv>Oz-RxgbA{&+55^-R^Ma$x#aDs>kl2=KVLG=b>AW>+1gq{jE81S&JpB=H;U&yMtuI z8Y`Qmi(FkUQZ~OIh+G-%F^eNxhD>*QN7!SYd*+czOZlZow~)9ubxYW8TAQ?^=dBtz zM4Ftw`}V;OhS{|paSKnyKH(U@BV?{PTU3&A`52h1WFEXAdKvc2mi!qlc$e!ET1f|X z&A6+?a&VNAT6e_0Wc`r^doB@Yfr5bd;rZJhoS1pF{G^Trt*CZR%Z^2{+_{k-3mOpW zhs?+)qQcizFJ&IgU%Kzb95(Ca%|-i)JgX`?I|$h4E9;cDKfQh0!ed_R)u0#8Q^PvD ze)H}<7)M)~z?*U}e^$l`srH^!&Hn2vKiycRc_%2nxk+xFVRBwFKlyWsOv{zz%-sij zj52rTIa`q!lmo?v1d9W^=08Df&If~opR)#~0{o(~mU%wIm(QiS{N6a_!mefdd}ZsS zHAjq(%DZTIGG1#;~nmTR~5EtOzZ_o(>Nx&~6m$L)b` zrCK&Qn;p>?qB7h9t^ZkrvP!jj_;*4Ha;7!u#p05W)rMKTJ3Qp%xO=&!rC)C7r$+oC zWjjfpXSxfipH3ez^M0{*rxlT3GArGcfq4*jLjEOUU(mxj+pHE*ZyimzHN{u;R>RG8 z@dGDhyrSe&IfxT@-78N6mpl(J2??yE&KD#J;N>vzttcGXj<;7Yymo_(e_)2eKj|J(Eg z33vT7daonf3hkDLO0;e5?P?F(q;Myep%Xj1?QT=I^p?6hN=L$b3a4&uXWnGi zz&4&jsb0(EzZc4gi9}0ic-;0LEzmpt5nLh7|#_oyM|q z+mEdU6V*=dV-ofItz*b0EWgq7Lnu)auJ>& zmBuhqY0b$~LD0xXDjRid&^9bH(2Hgj$Oat)ZJkJg-Xt7Z#h4&t$iqVc=pdJf;L&{; z96ZlRWhgEldKWgMR1iZZTyG;4Q(=b)7aMzo8IuhnbToC4B(xR=p@-AN=wNXej0Qpr zjnPJ7&?qe&5`)2G_3#*7#K@yUkb&L|*<=cSy}89mcaUVH;>G2%@F5Vdts@3!gdIc?#Urv%7)>;4A}2EGn-9yE?K3nqG6@CxfOL?-IW! z^;{ZdEIHpr5^8=rc92K=iJMR}>^3wNhBIUceJkFK4HCIbwiA=-Ll~ZAWBV+$%`V?a zW00Bt9Cbq!+Y!a8B}@n|hP=DQfJDPP<*L!s&GivE%J}(Ap#|9eqQTaLq$bVwp-LjHKv*SR@gP#UP19EesOW*45T0>Z5TK;dp*<9~;?7=+WLsLJxhawjPG0 zP1Hqd>q9e?qJt$Pae6vvBo3`h0kuhb6kVduXy|e7KZLep)1bOf^ciRKjpqNNiwVN~ z(3KTUnA-ptcwsgi!EN8Sj^%c!LbHf$4k)ZYMk=EP=vzsLOus#bLv;*KBnfLffg~&s zAlVT0UF+De;BK@Z6A1nig5mh%+<)GOzZb|5Rbz%j4O#s>2!~1G`V-lpDHU2X|3l>) z4*0zXJo3a#0>U%2@O)_hA_p9z-@nViuPvefYX&B$(El$P5V9WbnB+xdP(d;QH9Boa z8-6Wm!>Rm!J&l%uAJ?Cua7)HRYZsbF#Gy5VF+}~)HrDg7y^C-S`uGmn>uI5(2Rge! z&xq@IHQd!zwCi{^+;z;;nL*})3lem7bhM$82ycda*wc8R zkBd1C+K)KGDx#&MJK_Y_Oz7$QQ_pdl5zpadjXRDG6~Wd5iN>wiRJ^-igCe!h!(}TMDu}Z z#kgQVM2livqWQqIVq7pFqD3(-(R^T9F)kPo(V`faXg)Bl7#9qPXi16{W(#dLvT0n94LJI;KsI!>|KWqwD(L#{8*6h@CtjtX zs@QoUZrs{JUILF?`?g3 zAG3HD`$IiWpFVv@R`SiwklruXKKc!o?Q|d9G(A2=IkibLDW|ICQe9=!-^C4uUxV#> zJHA9eiFVB^TRbWb z1YKD%N+GZBs!a`l=4DWrpP&CY-rx0@vPY4{RA2k3zf`uW%AE8$FBgJr?xO>%=_v_w zrG3gwuZ3JvgeSuy^G zi^BpnuP5h4+*B|n4UE~R8Ww6a1AzXPucWyYxlTF zy(&Q)H!aFN+T+8Bi+@Pf>mx7Zlzrv#Px1>MpWYaBlbO1?^P)n-N9TJ}-_-9MsEEGj zHFa?a6D#LpDO2$%wnvW0d^acleRdL4*wd2aml2JJT+0rot@Rfi zz&F`fxQ5g>L@&-^tUPr&E_<@4Qn*bFK&day#f37v6Rst7ZD ztuvd;ZC^Jx(i=Nd@+{*G7M^_?CD(+!d+E+(md-|ryP^F(FAEZk!wAWBU4G5`H?-Ti zmMZVpOe@%%qGs-|L5bn#IOF(C*{Y25b?J}i+Pwf7sl&;sQ$0aQb zKKr34HGIDM)L5DDiu6C2yee6vqcAMjNI(UeDUK zBq-|YWqa;d2Re{Kk&*T7bi{|1V9E;Z{hwF6W)KXh1*LRz@OD~GS6X^NMy8${s}p>)Ghy_Rj~xuzE3NzXcxMOU+X4S`*e)Hd8|~EgATG=ckIeV5i(m<%}G? zEf>$Vst3thIEPdAhLV-S{LV)Jx02Jtxc!8j>eHK6c&9c{_XVW)cJZTi)0LO>eob2& zJtQt5locAA6?_BGbW`<%U6Ze4c$M1_4xPE@(uT>bYKFF<7`G2U_S9t6N( z|6Riev`<}$!3VqLr^X+Ssc%bEw{C6NQ@teVv|^NIJIF*x#^x+!QF!q)Tlw0-z3q)H zd0)KgOAc1hOi|dhz=#UGMW^B`=?C?a2$}6($E%a>Sr~=(2E^mjSQ10J$`Tx+^!G`l5J{|KaiNNoJPQ4;Oc|Op2&Ah9+WTPhf^5fiH0m zNM?3_h`&Z%A@^*D-3GTaA%tSVKNSTIdpIq8wI+!YH*Ry*=M?|KXDJHg{CWqS+LQj> z0{Vc0v-DnkUz*1I-mcbKjw0P!chVL!)$m;&_?Ajc+S#r~L1x+qv)n7FE6a~K%bq%E z3zgIC9$6dtLRapCsc+PjVruex2ZAo-G{-dC9u>qVR5&K&Iy9(v%`*QyNVSv|$mU(c z>AOkJlwfhZfy96EDz@@63PLkpYA$40(#@%Y>eG>4NMbIx+|9!abd-AaPSK>5lUU`K zSeL$#b5579-JO(s^?+s2t{R_*34YSDMmJYVK*jq@ZwPMDtkA=(7>TydPN(Xcntrv~ z8Jd%Sd6!Bt&06}Zqod>D?CUkHPnw&r_+@bX4D9Ue0-I{4hJT*V+LK>vzuChhGci7$ z@6b^^PsDzQfHp+lG-y-wPjZ{RC9mdqel4qgyO*Vb`=w3lpzE;Ya%^2`hl&0vM3tCYx%Ru7V4j zs?<&3UK#z6<|z6IAn|4y6y)_1q5o$=TSJn}(`OFyuZ9`EY1uj0w>V*qdQKH1>rQTN zz_!}LlIhEz97lQFQF*-s!m@r%#kJ|L+!q5Ej=U{>cX7aP(!EI3x%sj!$5)&D{M7Ml zXOju7M$#whOf#Y15Gg3{KX(+O6low0ur3TptUkuS_9&^L2!I~z)wbp-tF}b^2OMw< Ak^lez literal 2124 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 V=I3{eV?Kahk?%x@E5nit{|Wxiu5|za diff --git a/src/main/resources/assets/mekanism/gui/GuiFilterSelect.png b/src/main/resources/assets/mekanism/gui/GuiFilterSelect.png index fca5d0c7254ebbb7dc44553b3ac542e6e6cdbf9c..fbb97bd8a00da3496184673c774f3889c8a03942 100644 GIT binary patch delta 1090 zcmV-I1iky}8=f4HBYy-WX+uL$Nkc;*P;zf(X>4Tx05}naRo`#hR1`jmZ&IWdKOk5~ zhl<6oRa0BJ8yc;~21%2p?MfD<>DVeH9(p*dx19w`~g7O0}n_%Aq@s% zd)fBDv`JHkDym6Hd+5XuAtvnwRpGmKVkc9?T=n|PIo~$m6N9yl%7qB(zDb{1JtYOPA!qk%@Qub75C2T;T?(y%k7cw{!aEIzj}+@(TO5Y zz-|>CeHr)+QOwk9wo4Sh2mAPGw+7tv9PraN1Olr9mwlWPc+tlvJx(D%369Vz>lLjC zyaqhH*k&)cVSir(7|4_1Rc;%)B4&}Zt&(AK&*3kRaknx54=$T^^z2=OSo@r%xnsBw ziQX&rRKAHn*R}K<@Jp~?uenKKe+BrD`qF#?cpp*psgiwk-seYOU#%402HpjG(Qu~= zP5WwfF?$>svC;J<>zK$RIM;P&60@WifbUlLwAf?lk$1u(mFRYq89Q?S8HyrsX^MVnpsf`{W6(5UXREr zZM&7ilpo6ux^|%%%N9z;(dj0Ct!8>>5!%=VyPg-?ke}Vs>~sbgdDuU^Ixpr19NS&g zQew8Fz<)>RL_{M_7A<1csY*MfP@XcB#Jxr~JS8&7goVS)VKE|4(h_Xlc{z{c$ApZs z7riZ_QKdV_uW-M~u~8PF3UX~a6)MwxDE0Ha zPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiSBY#iOF*IB46Cei@XmvNzKBsGIKkN=X z$_Bgm&h5TyYjpf^^Nrn$ZO1mSZpOC4_}H(pE&Od#0y|)Oik6|u@OHupcq1J>TmjQ1 z4eM{2+Oeah>iL1tBPPK=$Ue-{x#7^N{-XY=Zm3_V7u4T7YJ?d(rX+nTeJlMa zeSar?Fa1o4bXmG0{UlwLzL72kIlJ$@pC#CPuU}yk-HKgk)oY(MCsR(!d*m18l>EH> zvOF8G6uDm>lc(gp@azfp%?$k=y%=-~vuaJXdoA$<7&H$h2Au}i##F_Gt8^Aw+nR IvmFG@372FW82|tP delta 1038 zcmV+p1o8Wx9O@g8BYy+%X+uL$Nkc;*P;zf(X>4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wF2RW Ivrz=i36J6oFaQ7m diff --git a/src/main/resources/assets/mekanism/gui/GuiGasTank.png b/src/main/resources/assets/mekanism/gui/GuiGasTank.png index 40a5d81348cab4c8b96aa83ebf80a22efd5fd2f0..eaa7bee77fc586b7bb39d5e0d489946ad5b5b521 100644 GIT binary patch literal 17213 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 HfP}vRPVX2l diff --git a/src/main/resources/assets/mekanism/gui/GuiInductionMatrix.png b/src/main/resources/assets/mekanism/gui/GuiInductionMatrix.png index 630ae08033b2f4f5940ea2a6b70380156574634a..3c6dcb1511ef7d6cc2db66af4aec97670e829ae7 100644 GIT binary patch literal 19338 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 X?xH^=t{_SR;A3iRVU)GmegFReda~8k delta 2975 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 BOVt1X literal 2519 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 diff --git a/src/main/resources/assets/mekanism/gui/GuiMItemStackFilter.png b/src/main/resources/assets/mekanism/gui/GuiMItemStackFilter.png index f848a31e60b262cda7a6c5499f8de4df5f17712a..a91038f04c964149d72359693864c4094e8cda40 100644 GIT binary patch literal 19998 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 delta 3831 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 Bf%^ae diff --git a/src/main/resources/assets/mekanism/gui/GuiMMaterialFilter.png b/src/main/resources/assets/mekanism/gui/GuiMMaterialFilter.png index 4da67ab336695cab7182bfeea1314ee09e5696b9..9c6a9d25feef458868fe14b6a0c23fe3fe512ca0 100644 GIT binary patch literal 19807 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 I9p@AO2lylt^#A|> delta 3498 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 E5B!pr82|tP literal 4784 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 IQUc}XKhR?^NB{r; literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/gui/GuiMetallurgicInfuser.png b/src/main/resources/assets/mekanism/gui/GuiMetallurgicInfuser.png index 0b5079604ec373f85504b6364a3aa77b08c8af2c..a8d74869197a8c6afc0f8d89ba811c2e33d661b5 100644 GIT binary patch literal 17162 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 literal 2207 zcmcIkdpH#68vkZY400_(Y@%X^ZC4jd2+gPwiwG&oy31u^ikXCwav9NV(owk!QHqR7 zW?WkLTxJx-xYIFC8FQvFW6Y49cF!Msdd_qH*yq{rd%o}eJ?|gy`}^Ma_r2*ZPRA7F zwB!H)3ifD}D*zA)gaEj-#CS(P3<5xEITVR>u}30xU7|5Tq2Yl5;Fy`W>6op78eP^@ z-oRs7GZ{BX#>;eT0_h0Fmn3Z)OYNn&^ahRjjpgRD7sn=Q-;8qeM?dLXMGbC$m`EUM zTjt{Sy*#I~x7Aik))pC#b~L*!)JLiAO&Mx)jFk!LSXu7lB@}X2#Fm`wq&}AWRO}n| zzRSf`w?DlVwm-;uVS6w56!OQgs+eiktAFk!RB@=5(M#)&a??yf4rhb+xU#1;WoU~{ zo%%=}>5z0|m>2<@Q?Fr#ETod~>I<%OTe3+#P#?bGUf|<)!cy^K<=}Da0Pj}v_F=7n z`J{qMRC7U^z7n{Y^S~g-|4feSB;wILdG6JlUJA6|}Sn}OpkgXnQov?>V z$F&pvJTvrLGf0h#sjG4|ny!iDpw8%4Q?&KLYQ-CN!sSN>TBR81M_nK6uP+D95`Vp~ zby$12oZfdp$=$Cn&|;wwR*<^fpQ5czTniZrD26W+D3ya+X{+_gFUQeQcUh>?M6=n! zA&cSUz@qKs75BPmvrmune~GMA<%VrruhEWUs9VM23}?5NZzk&ZuGW|wQXVEw6l-OM zb-X8IeSherizD%dpY{w?c?24FdRJHZeLJg?=zuYvANp~q>N>Jjk+Fi^;aZa%$tKDDadUBK89@hpP|9gH--9#Tf zBLQ(|t@ENv{HfW4+{Tgb<@Ah1?UOMP=Eay3teE>OpVMe#g!azFMrwV1X{>7#d&JXe z0${PpZL7EEy^b^?jw`wz|&3`zrsHwDoOBZDVt(!I|N_% zjJG|wNH%CZ8~)00zoq0P{O3y^=15PMr@1|6rramf=n#l}W18dWTHucUAku+J*8 z`#;}W-ydfs4i$t8R#MApv$x4N$xq3g`lt06@{U?EkGY90!!8k&2_j~zJ*I97#e~@?U@y|69*`4KsEHT8ARbxdn>iw%|8^Alw{1H5e+?}=ciR9L5A zsq8!VGB#E#hn$riIZVy?>i*;eZ0Nt1g1WE3SFBH+7P0zXzh0-?oFVX*TD(9MZulf3 zN-_qd{Tz;=z{Zzd)Krlz@yK34dtm{P-}2=^z`Z;TiBsmH{ZDo>lQ31VPnzSu0|Nle z*dAqj631juG&$*=&>+lUOved1IWww@2gf_Sucp_hL?2hRXi#3rtoK@Q452}c{2eGJ zQIwHsy(hbV=pN|97X+=3uA{RCdNmIO*9jkO4oL}L?Hue7-{*=>cFqpWhL_gSguSo% z&d4X9jg36@|1DZ(#jQmA96{l?bvVCqtZ=hPzE+%fsm{L&%%b5mW}1wuCA^I8jXCOApj`U_~c{)u4RmU z+T?;ffCF7X008=z!G8jTE}VkiTjW>Xcz*qoGPp%WKLkH4EXl! z4LY4(&6I_M%;z*irS)9is-=^&^8^&c0ES4XmCNOd{Y}?L&w&scaw?V1;-#f|c&|l5 zd}ShD2sZ)M<}a7QSA?tUxSmPWi6?4Tw@NWS@=M-*^x7$T*REK3Fs7lH8dr#qkB|6y z6QLZ3!;OqR&d%N<|3O_+Ev-^Rq9Jj%P5dY^QZ({G3s{6X(>n1tThyqN#1MX0Z=4IseG)kgA|^ck_4T5e|)qUOx+n%8~7wiXYj zry2J?i$0Wp+8cdQhLoS5@1>yCCQlI8HWSKr7Z*=aCBOXdSqx|k#Ia!SlKn9S+LsLW Mc21}#M|`jT1`4XR*8l(j diff --git a/src/main/resources/assets/mekanism/gui/GuiPortableTeleporter.png b/src/main/resources/assets/mekanism/gui/GuiPortableTeleporter.png index 6db1c29f9b0487657b8d42536e35a783fec8441b..8d13876e8048a64fa98399dfc770fc4d06c7b429 100644 GIT binary patch literal 20363 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 delta 4502 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 diff --git a/src/main/resources/assets/mekanism/gui/GuiResistiveHeater.png b/src/main/resources/assets/mekanism/gui/GuiResistiveHeater.png index 67588cf77610516d8b9aefa148b742cede0f009f..fdba427abfd787e7a22d18bca8dcc92520b2e5ee 100644 GIT binary patch literal 19052 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 literal 3940 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 eA#?}a46}6rk{SN*;0~V&XCa+HWT>BTZ?|k_H diff --git a/src/main/resources/assets/mekanism/gui/GuiRobitMain.png b/src/main/resources/assets/mekanism/gui/GuiRobitMain.png index a01146df77bf57477f6d35bfe67f3c1e45be3ff1..b5cf7d5626adfefff6c8284748c5b67cf6e7fdaf 100644 GIT binary patch literal 27960 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 G!2bnS_4r!= delta 10230 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 gb;rBeNlIpUM-yhInXwm6ds!;cB9%5Fagb;c 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 delta 2314 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 literal 1991 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 L*pp-668?VxZjKFb literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/gui/GuiSolarGenerator.png b/src/main/resources/assets/mekanism/gui/GuiSolarGenerator.png index a8e5ea46df369caaa1fde4eacf2b9f5ea3397a2f..b4707635ac0f2f4bb1d70769d4e7808ea178615c 100644 GIT binary patch literal 19349 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 b3>ELv5f>V;kt+=SLIVcpO>~RTUHa=ECYVoi diff --git a/src/main/resources/assets/mekanism/gui/GuiTModIDFilter.png b/src/main/resources/assets/mekanism/gui/GuiTModIDFilter.png index 723e36df7dfa34fc42719b89dcb08cc72cba80ef..6c6c2188dc33a08888ebffbb848e73ab307e0bb4 100644 GIT binary patch literal 19597 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 literal 4291 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

    r3sf8hfmEj#vT6j;*PHSUwn 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 aQ_D;|4U*Tzo{R^ehhT1PmTq$3*uMZ66Rar! literal 4631 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 IvpNK05K89@W&i*H delta 1067 zcmV+`1l0S0DV-^hBYy-9X+uL$Nkc;*P;zf(X>4Tx062|}Rb6NtRTMtEb7vzY&QokO zg>Hg1+lHrgWSWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@ z+di}}l?o-=)F3E6wD^Ni=!>T7nL9I?X}YoAW$t|Qo$sD|?ti&w?*-_&s#unh6af~R zt}Pcb;&X?Oh&?NigomIP2BB9`9V=a_OaeAf3wO0!-$TNCU)j~&{-3S4MjaI(aUWu{ z=BNvZj{)$fRm*k(dis$cKk8Z@_G0L_F+jvGdbr_Z*TZu@evN5nWtO z;Zej(s*;~Z{0QP}ZGE;J;MNT3ndwE3s`n-8a z_I+}nIqm6u=<|e@EeHIimz0AQ#Dj=`p+-UW=i>gc+)5Aw8EP8kNq;VqqYhgy<6Uj0 z=+8?G7dO-&OBU<;fl{FVM6-)>fUj8wt5J-NPueZH>g)MY#m*OepL~TjtAT&M4YLUa zD3~yZy?+W#SOXDcC_o0^7T9R1gAN8V6s;5)ieI5-7aQlmJn}lUna#nz!j%5V$X|o` zxX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?ZvKPDL<64`^#UNTAck#RBsB6*5DP4<%< zvJ+(Q`q)ZrMP58N*8RMUGg79TMcp~HyP#nIGk+>fTvOMqEDpAYBg-lK1zo-T#$T~q z=`1%wHmU-|3&GWIL{YNX(Qxa>rWCyRuBf>}*(bcU2l~2ICg+(V4}G z#U1l;@#I$zMt+vbndh(cT|8NDE)GVlmj(K2`BoWDjYO>UgY<{AEWIavDE-F0&3(#! z&3}E)eZgG6#@QDHLj zCkzNR&Px>zCja= zBtvA3lr~iNxL5O`B9%|&QfUxVJ5v*>v47M-4~Mg+cA#wn`}`f%scy1T>e6H0eF9n2 zI&SL?%@ub`(vxBuuQn={n(F9?s2GOGOpa(%huUpg8wKy)^pEtLGP@5GTP{bO`wYOo zKk@AQF5-@~0G1qpfyX0m7|+TF-UT@Ggxa#(!5xuEd<)>z_w4q+`Z9Qa{nY8)#2<64 l=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95Z?hc)V-R=-8n*xd diff --git a/src/main/resources/assets/mekanism/gui/GuiWindTurbine.png b/src/main/resources/assets/mekanism/gui/GuiWindTurbine.png index 8706425afb37b25078f58cf2ad647b9bfb6f6e15..30d8bf3477219c715ca5c584e6e5df0fe2731b67 100644 GIT binary patch literal 19375 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 EH=^<5vH$=8 literal 2279 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 b&(^|>;piBLLS+kVBTgLuw`YxeXy*R`DV3kt diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiFluidsTab.png b/src/main/resources/assets/mekanism/gui/elements/GuiFluidsTab.png index d8104fda2b29c07d3fde335e5bb3a1cac22acd8b..fd8c91ca4acc8e3e29d9d8efd80c9f99f9657bbf 100644 GIT binary patch literal 17974 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 BgnR%1 diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiFuelTab.png b/src/main/resources/assets/mekanism/gui/elements/GuiFuelTab.png index 98fdc81b35edd94ceb39198ddeea70498cceb0c2..a193120cd172b670c13804ac26bf7dffd9244554 100644 GIT binary patch literal 18339 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 G<9`6#Etl8; literal 2545 zcmds32UC*?6Mlmb5v9sSNUIRZp5g41!Yb!hzJInxh1yO9>tdLJk2bDk4FU z0FfqyBDokiYADh{5=tOSKnRhRgqjck#Ds-u0~;|0jho96Y*toKTa(95o7O`<)n{G> zw*>5I2s0tIth-AonK6(h2j=PQOsbIEwz?+Z_M81RiSUZyn(Rdmqkpy9x$%RvPoR^+5qiFS5*A9T7?a+czERKCgzu8>&|ICD@7jU9p*MMbMG$l_0>sr2pCYG0KaPn&tIkRH(anHc7& z)it;m9HYLW_L1P|3+r;NB6$70AdRs`!xqO3#t4thTP22gVX8>W5g)PC^zL|=Moy3S ze97I*=}FcnQd2DE-xT_Q{eN(kPfcS=6hG+p-~js*=J zdYg;zO_6#}WB(665)u6VZNHi;p26BD7rVHmpSGWp4Q&{WWi54%4;9ANM6glpjSOUjoAs4#xSZ2X zu)_eACed|4t!n8^eA9I?L=|a-`Uu_nfnrLcQExReu)qXmni|ATE;C6EBeC=Hv4Wk7 zF4Xzm4+2c?E`U|IQfdK#_304+nzem&9 z(|v!r-cSG-0@oIoybBrL&Oz)2YuOu~UpC~9nF}R6W;nHBr=o-W^iJD+6aLd$RMF>w zvL{6TxwHH}*bx^1sS2A8>ch%UpRbCWgO~3j%9e`{cLi6+b30suU@5AJ8Rt1*3|%vL zf37)Hh0EhH*Mk*<6tfB>=5^E6`%s^$BTZ~hZ{6dW862~Q$63F=&F#{BHOf51)#7stUj8oa3t$Yr9ss6Xj;w{4U~B zK0cig=#}-8*uH%!>wf(U65Hs#A}%4J2FLb~k7OkT26H-Qvq@R1R+a9`aAUcpUz`>J zJIJU^(aV0)Wd^q9Y`^&7=U3yc#pT5n0c4RrC;)D6`uT8?d)vnul4J%!DZJYrNcuEA zn`-?mxvZ`D$>7>_#!UAd`HWPeNHqxN;AT*^0t)&ZV?l@ij+~i1z+v8>jw!S(^tYEC z-$E1MwrzF(K#X!0Yijv^>s0;j>R*E1UgFx|hOSz6>g?aXAAx+e-SPdtx9$Ayxx;Bn z)*<#nrp^=gc@a2q-CMst6A#BeyfxbO z`Au5mD|i1(04xSDH01m5^Gqm(65rIm64Kg2TGq>|R}fF%NCKVImvYsv8$X?ERtGWK zcrM1Fe5Lh3aUX!ioNrIzG$6;rN$5fhze?3gW)NqRaU(-{S=(s>kdj_s=)~&K>5b`l zl$VyAg>xQf{IJHId_u zT#7l$LLx)s;^Gz~+)SNZT(EdlF{(gR7&~P9)&M>0${+9>-DNVF&G)|CG@%dP@$kr4 zkA`-4caN%cz)R!|r9~l6L8?|yiIX)R9{hpcx`LNf(q&I?Zxsni$-Oqg8Xi{%D~UWW z1*;TB9Bsy#Lhq=0{_wE()D~qA?3w3lFZ*crZxKJ> zq=Aui^c_@XWo1WOo0)*t)djb(pg^?fd90XIwiF!zh5`=_d}FRh2YSyg3; zL~=o`N8A%+P<>>a^E#>2?{pgkT3*CO`ch(r>|`xn$@e3w<0B&U;3ZiyfaY~@CLTp0 zH=Pu!j}Qcgl&{dh=b90qqFCajND>~kSofgmf{>m)5=jhtdzgZi0^C2u$=7&LxE1Z3 oju>U)q~?6=_b2E7RQTq6@w}l5OR~Pm{Pz*9EN@#>U-$g`f8gq{2mk;8 diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiGasesTab.png b/src/main/resources/assets/mekanism/gui/elements/GuiGasesTab.png index 09f62b719becf56aef00c03e321b06711b10ba0c..31f22cfa690d6c5891d4feba3d7262530c5f5321 100644 GIT binary patch literal 18456 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 F|39c(0CWHV delta 2591 zcmc&!X*ipS7S0!m#&R_(!eE-Tma4sTdo5LbvA5Q`sI3@g&}j$N7Sqr#QAR_R%#)j5t1 zE=uWXD4Z6miu$jlo_oGOWmkKN$_l~#({k&Djzq<2t+;wqkK`?LqNQt*GQZT3j^Avuj%2Zn$cpTNhX=XufE?D;X`=V-;)wM#9NV7=_dR_^~CyPvp{? zvNY6BIt46VN?~Ee#!^l|ST3 z4i_cm;fESWX=!Qn_R&JljsZx23NqB$Q~wEfWhCHAz~%_)+^bp>`?Hh_8F3P~;W%U& z3eAk54=Cav2^VMNfNf0H?q)&6`b>^ESh`VuhuFWk(Denj?-(5Mv(nKJ05X|&x~Zf@ zl!MmR66|Xq-e1_*75&T}8VcNCU~a+4x8eDLunX#VLE_Q-OAckvLLJh^L)EX5dwYAY zm7A*JEpD^>dr4~5HeX$Ns$3=y^a4H=$AiO7W};2-93IvD04DUMY{XoUVM;0<_&QeF zL11GnyWtXXtnujZusc+nriS;u^;^4VjoBt;V!=+EmGMVrAXtXtoAjqD(MudQE^f1y zy6tZi*tdp^9kEW<0~FAj9`qF~I5w_bxn&;lu2Fs}De?yjf%D`&ZobLVc6%18(dcW1 zeXGBQm{W~wfIoqx$(vgdJfe;8g&X2mnzv+KI4&RvppV||hSTqi2*iuJp&>uiEXCZu zq7rO`Kl2!&qxSNN$~S|tDD<#KTmv$3@xP67%d{44^q}LIfprw+ zLC3W{dmm|A#os`E{SN>hfN-TgHM*Ct`gZbJj+2v%(4iZNU3-4DX>BXB1c#xZ%)?tW zwRk6?-|sMvyq;0fw{v*(0#!Iz{(q%d-E*nP9MN+Wrt~`xH-V0s|cmGbz z%;N~-n}}IN{}z;59Vr!U7=UGPLLeU!djNR{SxBvK7OcJH;p{e5qdUK_qrG56K4%MW z9r97R>lcsg?7ps1w?~$Y4OueSVUlr)By@F7;A7r+30ojZJ38Mh-dVS#uX}=+o#Fj; z*{E{|LHbqlEZn)HGG?;C3c@5v-Lq`kdefyHPI*8FKO}Jz$FKLKL;K0waXW5=@}Wb# zm{ZNpEQfr#VxEMdqTh-C=o_{B4~U)(r$tKd7pIqC?O zu9Rq4n~yM3z*xZpC}$4%`NQ7!(X?%6Mp&_X(|zL>G7);<1PK(GlGb(D?*?m#;+>8a zlBS`j2%&1}Ds^krQqjp*N1$|0$PzlSB6>ao^-|3XiV0)|bXmo3$=;ZMU6Z2cC$n4+ z+$#{)B_O%=RiO|lPZ#;pX(fHiSUQ9R&0+c!b@bRWZ3zjg*M!XH1grgFOg*Eqzs-se^9mT zZ-6@c{KuO&GeCWETP#q$fg>Be@zjGOs?983VcBzYbNsz*71?(&v!J#&Hl==_vhj`U zbFL7jqiv^P{ZkJXp5TR7obfj%9Z%1a)`?q^JxMSCjzFRD;2#6%PkNuD1^uzK&p}Uu z{(429R0s5z7y6|1fb9SMxj{ZHJskS~(j%bHKRsD=co}y>fAZ8q5QD1>lhp|qZ|4V& Hks1F3Bol`g diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiHeatTab.png b/src/main/resources/assets/mekanism/gui/elements/GuiHeatTab.png index eaeb1fb307427102ede663241592be1a744ba3f7..b96df52a3e062cf12d96182a3513378d17b0396d 100644 GIT binary patch literal 18392 zcmeI4dpy+H|HnUKyGr#-l(m_ZE?Z;n*BE!1?;4keux`!eGn$x-nUO&v+jW&q_o(c5 zvx!7%gXucKN*toc? zlPDzebrLCxX=8(Okx2x?AP@kkyLY?)Eva|Ywb&`~N!GLY`D~odoY)L^ws+3g2EUa| zWbXU*skK4Q&A+})E(;MGuEGL>#Evf{{@#DD3k8C^~*!nq^4*tI&K~0VIDdEg)n-5>dN#P zs0RDq&Si~O_g+I5BL6VTae-ZxT>C4B9e|mW7ry9S|((0K}>47=SE0~1^ zk9+1Vj+*l#zr@F6w-RId@<>8N@*llr6umZf2dZIb_WGW!sV)WUZth>4Es}-ZVx(<5 z8kkG@(fkMfS&eB`*6}S1Ee{CfXZ&|WwCz57yAb;v?fCfnO?qu7OrEcjHdd9C?}(Tg z_2h1=R)v@6Nr7MUhpo%w{B`6rYtdP5j~F{`^M5X}d|sDQl8vU_Z(1Pp#`_ZDbge(^ z1Al7I zcI|?1q^@jDO~?H%)vNc<-I>DC0o%ixql<&D9G-rr?g+_VSn*)i^DTynirHJAmA0Uk z?X}?_-WBcGut*YLyePJEmP}f8!7#Rh`}dt!T@2#wzq5R`QmMc>HFW8zdUPgnirAP*7|>rW~qg#^{KC`r#?TOdVWXz zTl4eV3f&!eV!@t2%^3E3w(FOp{EESi8*fYdHN!USx@f|^Nw1qN^jz{}(y!Z1sP#t7 z1C9GF4$Ntu)|@8`^*&U;f!X8Mv!=(j$EnA!XCD8-Ua40PGuwFMLZ4m7YMNSjUC(|9 z_pZUSF8Q&szwSEc9nQS|FN{Nm!_{j^)#&L=UgiAiXANc-m3d0^#G^&|H8pR}QZr({ z*L3=7j?!v7nwlm0U=vvR-8KhKeYH-Oml${D=;1k4sMv_Bvw|HA1F{b!WlsuOnB8*0 z@z{sMQ`ha9lOabPrjt+K2w!kJ%rY|kZh(IKsrIA6yYJ*;I@tT`nu(jzPWk-)>hdNp z0*mGnmie7|tLg1l)bAar!e5L|UG7Go?FwJi)i{y*O25I2VthxTc|UN*&wb||YPW|z z%u3Smq5e#{x3%+@^P)`}o$LF$Uqt!N%S#lK5@&Q4wDxGNZE6y9B{d7=P2asLoG2}O zr|$&>E9X5qxgPo|pm+|eSpcvd`gH8l0f62(0NBz501?pu&?W-_i%bA8_E^5cfdSQ> zB6aYR1HiP|sviv?;pkkbaFT+_vYXVXIqxfzDV0xeP@tl@3Oi4QJ@g?#IdMcFuqs68 z0CE&=9ImNU9B{~ED^z8rwb0E|;mLBO^CTiu4qw6rO_d@kw>wE@=&9l~WGJKV{Q7aqu?@r^AQQ_YlgNI(QCI4GqkNGzu- z&5Z|i>Cn5X7-NhYsGE5JfU2p?O$54n?7v;z&dq4z~h@$KnVW z92SG8p>a4mkwV9jQA3Y0V=DA!CgTg}t8MLvnu9EJ<8=y!l#aoKhK8Dk5=s zqhYXk3?7e$YM|v|Vg*Nu7Rwh7ihR_u1?4=MP^u70#3+?6hbswDm>V0b8XA6v#wC&t zHzbx1v4bdLlpHArXNtv)7sTfc$4EnDK?7am^Dtl#C<4U_ITVK*H%|I-e;5uQ)8w%G zvkgOY!eWgd{IS0x(YQ^^6?PjS1Vc#2H2X19?iMBmF{?qjBt*so?KVI|SvcP46+*$t zvmQV*e+FA0?| zGsD1Zk4*K55NOL$fD9-VNoXtqjib5Ypgg3}iBvR}LdRl9i44|+X|N=Gp&)FG2A=4K z$I}T=G;OrTsG4vMXzB1d3eFd)jIKLMhtH!6Br*|4!4Qf#0U!qY447d?3P;r(PAIyK zBuFBIx&<-_W|;Ac$BlwcF++zK#wt(@%7i@B>Q&Ys4>qHPM%5fw$yUM(QLPOtF%OhO zGb$f7)6jemtbS`wz}V7{jvyfenqE`BkWa_+1stLPB%$#n5)Vxy5%Fj$iAq5Ws2mcW zgu`?B0-_m4wdSFqk)8~t)KK}b7)Sy+Aen>4;~_;7NaUe8I4p>!@Q6e#fxsbBID#)0 zqvEYdII5k!jg>VXhqEKnY;ZPI8xnzJMaE*OB+8cyQLODrB%Hk!fkILVQ7KrWJ?lA4%3B z>5r`sNe^WIKad_3{)x1+Ob8tXI6Fxz1;IVz zMtXfVa+GH%a&QVq9d-xS(_krdl!i|6nBimmCrfR3A^b02MuzmiRE24&8-W2qHr2S0 z`M|ttTreQWrWzMAADCB-3kC$)RO3SC1M{kJ!GIu}YFx;CU|uyY7!YJrjSHC%%&W!) z1A=U-aUt`8dDXaJK#)x}E@VD1uNoH&2(qchh0F)$RpWvIK{nO6komy8YFscN$fg<> zG9Q>%jSB_@*;L~~<^%JpalwEfn`&Ihd|+NRE*KDGQ;iFm56r8^1p|U?s&OInfqB)q zU_g*fH7;a6Fs~XH3<$ER#)ZrW=2hc@0YNs^xRCk4ylPx9AjqZ~7cw81SB(n>1ld&M zLgoYWs&T=9Ae)G|rjA^U1;x;9*ih)&Ywn@l@z9mofg88%q5Bp9?A{@$fHHs`A_Zm8{|vZ#CF5`C3hx%Ct(BYdZu{RXiI0ay>4W~rMCKp*>)fUvMCH88;FAid# zJ~L6op3D_5OP%`?(yCCK5BZG(dTNzp+I~<74N<3PpHG7l%`16!FLFXY-)E+2%*y&d{J?C9)-D*9%ZNWDZ5BalPP3@=FJh-!&>8No( zY%+x(O zqtdId`&m`VqI${A_eN&Qwa}Q7ChTg;4zKe!*tWpk{nxa#n!57P505(;z%8vUDZ~lN zcTS8YU`}Ntk(HbNotJ6HWVe9OP)gRFXP&wTPsB9W6(!gMiHV7UQJE)--<}j!8s(Ig zZk?u|nU%Hgf@lU*{bZV6s8)hg%ISDOnz=Cgm!&@j^LV^==L`384zV|%m=<;E(xn{5 z)5`VxJ9{c#KcB1>m^eWfT77{=JWS)&z5-`=bb9CVa(s73V?_|T9IGAH)5-DM)Z6?j zvM|AzI&EgHesoAjPkDZ*&#m_IOrQ6W9S!-~#Sh~w{3Bnx3$pHftL}E`AK@G6$4;iVxw#+c-6#&cOg{;;1h z^XAQHy&#+j@8 z{>aR`9}pE4MVjOJ{84>bF#F2*bEdD|t>Ia>WWsxlKE}^+@4X!P66VY6 z%QGJRddTm4md2azZnnES^jn0cvKB@!F{K-Z)%lyg^vzQSzwQYld;j+C5O_r1a?51r zGQbR@ajK0js-N%OZV~n2U2ETWk&P=gCLd1$4D)sFKY38p9M}IO&eA3~ozTA>O1-4W zH(muF-UepS^LA(```>rxKkST|Sk#->xeJ#wQ3KEdW&)O~f6p@Ng?b>)ciQji&RP@v zie?qnoc757qf>i1nM|&In*%^IRW`+M$`itb2U?nYQo1jrCIA)R1J7L6P9I0=Q}KUL rGNx1iAa2x9;8AMH|4QI~|D(cf9?@len{$-VRt+%ioNUvr*T(z@jA60< delta 2715 zcmcgsYdD)}8vb%XViPsAYZVn!Egju57@eXL)Oj?WR?Cb=VyCESHFRp6M!qk!T-^~m zs8bPLMaQ90jMR`OI?FK5vT>+E+pHp?;*g3QWMcpBb#42{zQ5id_x0S*b3gZUPvpR| z%Qdf z8LBg_P8hk#Zms>=v9{KboDrQ~l59J#^E zOJf}6!#8u{4*Yuh&usG?(0K2l$jm^$yR!LkY=2N>20*XUsy610enPsRmbDcyIc+xf zBhBmsQPX+WUoi54q1BNm(MzGBXpHJGVF`4q2eqfBB7#{+RK0J7z%n>Us8efP_E`qd zreAabeB$6Ib|Cu~9J0Awn3orqno4o z;y%pI@d*@h+4$1>Iz;DUqJ2=v+kxjyfc^!Yp$)mG_CC%MJ9JYEF9Ao?GO-cAtG#_{ zz|JB;D?2BrrY}$**SLQN_`8@{;h#&{8#I7akQ=!?_&| zM_#}+N}OKkibx?|ZP=pF6cE3CWAqYY`A<+p&4$cR0X{@@4#p04S|U7+g*12Hu$9e{E&X zf;r7`mx^Zt(+J7i4K$XYN?}CQi466GtgVq3Y#LWFIHDSydllBbjn-~k!CxcI5#{7- z3dXO(NG0UH6B0Yj6`RFq^u$ zDZ;C_pPmrA&VwZfXrCrY=38i^wu}x}}#{uVLrd|NVgVPz2z@7uHvaTcl_8|X;%Rz^owRcS1RwhXoMk)hZ8;bzC z7`1 z^$E23!Lqq43SVqhTvW5;nwQab(^1A#QWM!Fq-DJLFyVz99)TJL>$q&LwCmzHOX8VQ z5a!A_!AV(^HV^d`+Sc7WPQ9Q|D5SHfQb(+t*bws?@hmet+zbW}HtNxg1(q@J(_1Y8 zLy2zK_N=Y-5;2TToqaUZk;KQqn%p`+{K6yc){I(Y{_wA8<#BkZpNc;`COyaOcYN}| z%2p_MT>CZ&l#0$fDCAP{;;Sr`gJq9fukK!rm28GFurVpo{d)MvuxgC0{~bReQFyv? z@J6(9uHmi=GQ!QBlDK*t5m6khxi2H@aiD+|?T-B(9?%3K(<&<~i|-RsHj%e5*tJ8r zXxSvq?W@bw9VNx+ek2sH@~Oxvd)^Srt_5@DvrpnGdoiP8s{r2$%~-7e*uDr2)HNi> z#Z)B>J%1oyT;%u7>k<6N3T@QIgCzQ1Pbj0)RufbUmcWCAA&$yXqO{b{&)qtEUCRC4 z`DkB<0j|-R&d`Cjy2~*Y$h3}ztj#=F{#1Imx=zt3I7JDgRKjpVWdgV|Gr&wwf+L*` zG$D~FlZ5+F`Qd2&5X;71z%F%v?8xm9Z;1C=Yla**rF?Am13=H#LPFViAk%8N3Ic|! zo_=Mx5JCVJWQf>AI7t@;kVGy{?+pU~s}$umRU^GQ-II;4S9-_ZCK0w;8TG-fEWLwHjkGJk1o1`1>#lv)w$-m(`bDh0RmufBE z!1n>|A_jbq9(R!*0N*XqZqmcRcW!7`>EYnJ46?iQNKO8~pHX+I5Agp>FHs+sIJ7Q$ VorG3Dwgxm0<>z(!)FTf{+8>ua;gkRX diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiItemsTab.png b/src/main/resources/assets/mekanism/gui/elements/GuiItemsTab.png index e427834bc3153c98a15aa88549050bb636340c03..861c0a0ea800e2468620a4effe442acb33030c26 100644 GIT binary patch literal 18364 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 W*R8m%GrJssALa&I^9!aszW+Da#@(O* delta 2478 zcmchWc{r3?9LL{zy~Cg~lB_Y;QsQZ%QPEgldm&4SQle#aZ@1!>%uwc?q0&{?Qb^gR zxCS+{BwNh1s2EFG>sE$(2BW5AyM|fr_^;*u?fi9~^E~JK`JMCqejlWuZtA5PD=Lit z=HlX4;WDm(EUzBA007Fzwz)b5P*B2m_9+@3+Q8s+|Eju+Y?p-MSu>-;t^Ql6uGD9m zY0haElEC^E>YgT0A{OUAt`P59Sm=BUozyVdPYRuXdW1NW8`0SCu=bm85pUKW6PU4tzHQy@f(Z|L!7Z|y5`mNwDh;nnt0uO;lm>_n z%_B22wP{^R;WSqoTmqJ;T3!{f_SS^=T`IGSnK(S$Gh}%~^w+WZ9TxM#Ylh)7>-LI< z8}ciu5jHAIxXBf{0R14SssLBq>2R=^6L$-S+q1iG6S#(s)V6^KF$5KDVrT@PmC(^f zwSX{p*8BYqjGlfLLVK{va&1h&l$&4@8R@**{_cdMp<$MAlXrA54rY|YEEJ<^BmRi4 zFr_u$d@h$rb|)G-oV7V+_2G~&__WPuLCaLGb@9qF#m8qk5q1o%?P9^y(Bs5U!Z$VD z+3wr~ssjb5j`OQu(8@)E8{#(HK=`d0Eoe7>O8R{_E)JbgYY|DIAU3vrAPVGTdUS#J zc=)a2Wg=?r-+0*0%sSU0Zq9m-Fe+Fi7_opzUAVV0~T=`+WIP z#bjeRtV9k9Yg+O3qoc&jk?q*0w(QKFx9C?qUg*6yn?R@!E5G?f19?1DtDHJF%gm5X z@VyG&)dL7~?Q0K47A!h(*aY!X z&Q}-vl8ve6XZIb{HMt!4Xvj%cE8}J9*xb3`Tn6Fu3@&sHMZMVAC#I1j@`I6S_1SPdh{R0FP=mur>*BjNbB0IR( z)@vDPCLmV$7cHUlLjL5r_J1WjHo_ja(^JNp;r-5N;ml*_dVQOdnc`cIJP^4Z=7@NL zc{~sD4wjnw<#8UZFHBMH<`(@*Ef+3o&-Rqm-=wR6{)!;HaFzLKsMx!Tn+~i()YHFWGmFkKwIW=J{ zOU|fEWFjltu5c(R@!b7no{rh{7|DGwUbWDQ=BbUWL}&hr&SCoI8>o1GP|R2nPz2$N zIo?3=*m`hXRS3zQk+sCSeyNg@61Q@pZ}A`j#RxMP*>XHK0LjpyM@L7yi#~!mmtH@F z0+-MFg7B2!Zb-u>9kr~80Vdx0vR2N_l^32tqc{-CROvAQig*fJS@eLRf^>gDw+-T? zulI2hbx_dz%8ACQTgbuPPLo;m`PL)Z>7NpP$-6Fu7>ilCK^yK;@z~s`R#@QGw%^sFnc`?I3^{Js$f>E z!~!bawrQMURSb|VTU8Gt;CVDedlcnkQZ52P&M=Z#_WxR8!y&X%sgd7Mmu(tA_e7f? zM}7MIIWU-VT?1F12OH;C*L1N}Q#&#GrcgnpIsu>d4)Rpo!j=bN~fH z7%UE^eX~J+K3dchoEHWO8d>@C!#^aFh(zxh&82Ppgi;t)2 e$-9_sF|LN+Rp#=vqOS;$uWfEVu4T?)@&5t63Q9Tv diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiPowerBar.png b/src/main/resources/assets/mekanism/gui/elements/GuiPowerBar.png index f4e9da5eaf0cb6cb846c4ea396cae7a0d59b177a..c539e7a9eedbbf3c3832966c6451d3efa7ae1373 100644 GIT binary patch literal 17061 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 BCTsuz literal 5055 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 F{}<(_H_QM4 diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiRateBar.png b/src/main/resources/assets/mekanism/gui/elements/GuiRateBar.png index 1bd5c511f30e079e7bac6249d5f7021630e33216..dbdea013034b6491679bbc50261bf57c475760b3 100644 GIT binary patch literal 17324 zcmeI4X;c%*+Q*AUQ3e6W6~`rl=pCJqjV&>RRV4}z!y=0e5|a)@Ac;wU5D+ptie3Q+ zN4ThrIM)?qR}@qfE()&1K>^1FbP!Px0TDqq-wq%&h|}+Vk6+$%y3gV8Q2l@Y)%~lg zr|V0x%W3VZDVlRM0RU5&_IAzysKB8Lm^2ao%sgvF4d-I?*_T0yi*lub*ag7HRk^!wV9)J3?endNff$I|@xtSD+jD5K>M6RR@!19eGEJ>Qx)KboY(?@38Y zT)uAMWQFyTw^k>Php#>FZKP^cx_wnu$%ci+HD($Qnm&kw*QK6NTXe`K(A{Fo{5GC^ zU+VHq9bC=I_pRU7T0d%||25BO@lFqxG_mfx63W~KI_55o|Jazg`)GCE(!UI^^ifFf z1GU=cZp}0J9^W|U{4LoJA|?^~Q7 zBnm5Mr0qx!IB)h(i*2)})~4OHiEl8lO5lpqH|z{=ip{xmnfMy-@Z2kMX44VF*QX4A+f%@t{#%;puUl>r>yqeOcTFZLw|@{u9bQ_`#Vo2=w1o=$!J^W1}y zY1?0wHQ>J8Ys*QBkvr5Z62zA*+FdbKB)ofe?rz1#$A7+UXBgjERyS|kt%5@r<(DJL9`8@^)NyvuE?Uzx+XGto$W<)=ivG2^0}=NBBW4EF|Wf;l|sv>S;WWB`-9N zMH`wwT)<4I-DjCFqyDS~if|*Y!i!+Ag0iJkCU*k{>ay_RwhKZVJzn1An84gH+-q7*+dxu~$R z@?DO3)>bdIwG(DYt)ubgr-S-!11i?+uxCBIr+wO!Pr8zvG~+IAclgz*o9*ZN| zclO)jNKc9*)hR4@jYXr;okm=C3-0p27o05a#OJij7PZ$-G=Dp*#?wsyPl?)-0G-1< zdG=M&p?{rDQSmlEZ1!k-Yx(z!B2`*9^>nsH{it{GAm8MmPV1${E_L6!I&OPPJy%?} z=I!N)!t1@WJi%tE-iza#;HrRQ+dDe~5Dk}(7;OOF#{uwj9RT5S0GdPqSmpwt@4oCi zdj_nXEVTC&1Mt-}<&O$DkUSf1)Q~V8S7_9#=}pj`5XQHGD+`z{S>YjB2^SLFT2>GQ zRt58%SrW*GB{CB7{hm1HT!RY?m*?ss@o;pYu?0a!ERJ9!WF!p|!pQ*8Eu}&hI{=d4 zHbQ+r8-NcdTD71zAdG<09lhq{CRve5UJNQ5*3Av849D3oF( z5cv^ER4SD~BooMFJgmTr!}t=G6wenM44QoOv4g~H5l<-L3HUgrFKeS9SYn~Cuk2{} z8hWoF;c!QM@en(hB0_Hd3cSQI$$XdE^H3WS0nzC;Y?k;csve*8WR zr;qA#`1WTzhR4Lwas1?u&l?mpZr5VTiVzsV5YkcIe#{iRh6y2pGb9!Si`dYL5cpLL z#(R4Sk2^9rqnwm?KKtyDl=qo5<(mrGV4LZf{8|F(;9Y(DAAo+pMUc^G2y!%JYG zAi6-CN4I{w5y%@TY(kbu3@Mkbh5pBNJ6s8e3!O4&VENNnY-LGgu$8L{f&q_e9eJ$b z%%L>i|8)Qd{SoP(?<3S7;{V;!9JCrxecnVY;7USSBFNego)ahqW6*GP##m=MLHYFv znS+Cc*boeiT6HYK-AR zMT8V!xR5kZV+hKW$b+0&o*jLiwOPG7 zDV9;?I#GQtX>MME{o>=!p5pqp&T7q8$K{dThd=BkY`DbfZC3Cq$)(rwSEjkeh0LZ( z2`XKe8HT*;5#<-@J{2;>`)&ubkk)>+Y(|E6)9NkhN0%ttP0B*KAbSOPUbcT7zS;k} zLwDJsKe-2TwskI$_otqaK{4@Vb@2h-)cLTiY<^KFv*Sj*f%x_4{~!lR_q2^}Igx`dnr1Cd2k~y|Y@4REhHq z`d)a7k98y_Ce}2o6wM3=9TntF$LHe>C@&MlJ}b3Dl2o4MSAS@qlX@g~6BG+Q^NrTC zl0lGRVMW{_x6WGm6fQWOm7ebERvrxHB^-G;;b**RHe+$&0;+-%ka4C;bUQveXB({A zlhC+~mypik*0;5`MdMY4^C(oW#$!vGd^960Qo=||_;)Pl^9mczXP&9r>+0jffQLyV zvcp|2j`iN}S@?!l?rqXeTWg@P{1#|@p;r(!*&`#@3zBJpcS$PVY))o^>#>eQB)_zR zXG1NSLeM6E>CaNJN2fn*nt$`vv{oGg9xutzpy4fXPKRK}+ zEGvvlZgSXtR}N45OXd6X_Ifhw9m2!)b>WVgX^(6Bs~w4fvu>{#^^>tEo}L3!s-PZC$VDXPOt8Ms$OwQDzS^fBbr zRaM@CmPzWSlZv)X^v&#vwF=0P>{0p8e3jY3&u%2R*4r!cR+iE%G_{tiKS|Nk6F**} z60kU;b-eKyQHIo_Bj2WXG#5S}e=nuU|VA)XG4A#fP?= zwH-COnzfOD5!IgzSAp4+?>qHH+?sViZi&oF`M(_0fiCz`fiAEGs$dep0Xg_m!IyIy hexm=^mJvt#)f&>$j{Me@auvWAbH!S_OdH>={{xg!Q@{WK delta 1658 zcmZ3}&iF-Sf-)QPhfHVZfQ`-{nCpeMK5S!PV6*phaSW+oe0zIi-W3M{wg;w4K|-B+ zixxCZI=%bO=NSLOmlf)AOe;RIh=_P73SC;59dy&&^62X~Yxb{Js*XHgC+t@LB;`hq zS-a84n|a%xp1yni;%@P$g%W!oDlsx;va~&Bu=wXL|NG7N-=Fe#$m|Z~X$TY(=UgIG zUm+c8T{AD@WAdY2r&&0b2v$s97St-FV6fX^2E(bhNBVyW9e8tggJR=SR+WaOM{WBZ zoS6!lD((kt^-^?52xH_-2=kjQctTY`t>K~C^~MnIh6A60DxXJ3dM>bTG+>;6q8nzO&2?WO$;i22W|&6Hfloju?1;jiM502EA+O!rs3umtE} zzI#k2H!WNRXE-}B&2YXb$1;hlh4aDr!<7IC$clKNQq8hkjm}Z#G#`I44Zb%@oPP)1WgqNWGDZiOqpEBwFZ%QUXKD%PCfzAp!;rS_^JX zau8!=R`6ba#dATE!;kF@-w(fEc&Iqnv%!IzY4_cC1+OkU^=2tJG%zqSv2Y0BW7HF) zh=ywFiEtwgt#7C&97MFVo}r##4AInj#(F{tgtpc*)e}gcG`5~49e?&9-Fo-N|M!<# U_u2b)o@M|7Pgg&ebxsLQ0L_1vvj6}9 diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiRecipeType.png b/src/main/resources/assets/mekanism/gui/elements/GuiRecipeType.png index 510d16feea97fc2325fa157f93f804041cdbf266..3655afbd4fc4f3841378891dc801910283b2cff2 100644 GIT binary patch literal 16835 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 Hur>b$5%DXZ literal 3100 zcmeH}c{tRK7RP_TUq2d&$b@7WM9NZl8(!;_L3TqZ+sGC&WT{^JOw^F2lw@s2DFpr4uP;uR$8f;4H0I<367 z-#PS;OVOpKA}S&`T>mJkeV#NriVn-QLXRl1{g>zZ^IrAq>o%>GIG8)eYflv-+glol zD7BwEKAY4Yytz$f3l=o{NU%+jDWd#PVxNhxVdMi=LOi$9-YX| zMuL(Bk2R%qm{H`bsmAKpQpi*(!4fx|oVr(;ErfOuzEI~eX4V#m|1>nZPN{6LklTfd zQ1GppC>2h<3NAc!={*m|u4XHkPPxl3`?4FfG3^Iq8^8K}d>Lhum>C@SU4!{9RlvnL zB=wfq)z=+=TWsfPKly;C+J#I%V*j|~TX=4iT77o@)H;RG8gz+6c=>Q3pJI|Sf69}m zeprR|71wU_=sLxMk6@l5B-G1}f6gt;7B>~V_JvVU^+0?c>sj%6>!W7My~?^PiixZg zG)IG}nL41y>TzxzE`M~Rqp0|{Kflai~sm4E+MPV%ny#T@(z({+w4wk5%*Wa2#!e(2bCp@3hE#$k-M+pO9G|#u;@lh2DSNpt<7yY>)qY> zq=|Q3S=%2MsRG$sq1Gb*dA1gFO>n|(!?&k@3(fFPC zYR^dxJzPC=cky$#{uTVnG+$>~ogZ>&cwt}0?CD&@u_9dvTb<+A0 zdJ_5)`V(5cplrk5;&07gwazL;;X9W@I5O^Iags684W}n_&s10|Du?cpmyB#ff5n~B zS=zT9;dc}_OvDzU|=Isq%nJV;w+=3}~YN_<)ZriLNXYvTaeUHFAgL{=*sMEAV!b8ilh_{{I zY`QqZ(_&`T0=cq8QkQa=^gz#6hJZdNW#sASR=MnB@xtTpf6Xkntm^!gxb}YXOM6rW zOOsfqXIR`aHXr@L1hY{NoX$)Fsg!sZN1yd@0NC1Ng*|foFK~9$&WVXZ0zOYBwtK#; z^VshdEBxzA+tPLhHofjlRjZ0L#U+0#d_!)hfXXxhT9ez$4bPSl~tnA1?u<%qaAUO3KRBmC6B zZn>6yIemx>)Eh&vNLSKoyr`f@>Fjg*ULjN)p-KKt{S4QvW*-Q3!KyX@;V!X0pi7h< z3&HkMc^V+LJDBXiaxj&R+lgA(Lz*Gb$B@yX9(azis=qO5Q6Tmzz?Aeke4jI)dtqRN$#je1JjDwDQ!1fw|$>Xa+@MAM-F2J-hnd`z^zBIIk6vvVDmMxH* z#%9uYSq6g(R3jv72lPd4 z)C^UiAXrtZTNNlyT3QwdNOz!OA=E5?GJY@!X-}k=LX|=ovO=B6aSIJAu{kFP@9v~d8N(^L$uPdGX=~q%d zG{v&Ss*rlaf(FHdBsP~d**UmUE{fL-_i(M`SQF_+uqRw(X_$5$BMu5t5#>jPUYlW{ zy#Ey;d0zmTqL_~ax)N@G4zPI@1`?PrA00N8@j~Q;dBf+~c(Ky91#6$cf5OkYYYjc~ zTLP*78CEG;j{kIzV>Emj(TLE;4m87oTK`QI@)HqqBJ*lODVRZL;>V9}J)3l%&?9Ny z^ERCgqhWXd4tQmdV@IS1LxbAss>J!FbL;O$I=x|p7z#rKK%|SuOF~7x5qv{>T~fQf}nZB diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiSlot.png b/src/main/resources/assets/mekanism/gui/elements/GuiSlot.png index a8121bb15784b83f7cb11fb5e6d018f1d0147f76..4c395c5f563dd5e756b6f48e54b0523260bea9df 100644 GIT binary patch literal 17640 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 Q2)xo#GaPSEnEld!0cXa98UO$Q literal 3192 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 Ac>n+a 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 0000000000000000000000000000000000000000..6fecb7bb76e41dd3bc4b9279b9fcc9a2e766cefa GIT binary patch literal 3630 zcmeHK`8(8$8vo9h8Dq~_%bGo9OBu~z6lKd0l^n|q-Kb;@$rxrXC3H=Wv{@q|hZ#p@ z8)k?o*;RH!G91ge)+uA0x&Od@?r-;(etMVZeV@)1rvctVr3macoSsgSN1}nhF#9Tyde}|qG_8>+yqt9Sbz7kG{ zS<;6CjcfgJLQ0)k(-%UO8#DtmYbt;DkL;Z`rbN`5?nxWvL~ktlCSBUeEvdg;C!IQZ zcvnZ?y_?| z+LWN8RNcR+v-qS_%i?Qv5TfRVB8hX6`+E5Dd}djv$2FEetHp`<>M8D7#KpPfiLRR8 zo_+$gDF0xTcF&STNSN1^^fGAo019bVq_F1f85~+wesZ+xnb$e--J?&@ew5BbA&uFs z57oP*8e*RB?^1Aj-@l-nSQ!`>Br`e;ZOm63eNZqluoMMTx;>1cqm1WZDr3Gw?g4L$ znfCK`c3M~k!+_7_PUshI`9~kNHJvfH)H&LjeCJ)4zp19{0OH2P?Gu!59m)6qRBSRV zI#+`3poTL(RA0h)j6itm0X0h|%0aR(XvpE5CAf17sznMa78!z)Hy9-9Z?4l_qt7d# zux@KS8>0Tbb3G%R13$Yd{JYO+&WAU&T>DIqc`wUqh{#@zMh;k)1_xu7q%1$e8o52o z&B4J@yomLGO{9l(nA1Yvzis6XQ>zVmA?_d=AD8y%`N!3mR?%23RVyFJppN8X7|W|~ z)P1zNxa6-N-J56O-U6wR>XWU|0wS{LVZO&BpUy*?x^o)`xN=^WAeS<_04b9HMOP}Yd0rp zX3U?Q+-W`?Ga(VO;%%3**NR@ec-6a1mbkoclW}15?kYBZ&a5b1WV4}ZhF$D13(NFC z(WZ7(7o2A%qH6nNN!u5C_3Y5<$OC&-$OCAc=AJ_Tm35345D|Mr`LHYih_*Z0oje~4 zSsu3vRSuGax($T0t-a1%ua!}uwuSs9=Ve2OQQMCCGTV?FEf+|}uo`mmM6?KA4K8sYI|q@to? z&SH90b-~zj4Es(ZPd`5sAlpJGvC?(?rTF=8TMc^~BSeEI<-$hB#@liC(J~t0C^FJH z|9W|V*V=JHDChzrIlvtAapImS#g)HVi!;x`33B)!NNNtOWUy8YkK&9??Ztgr!0@+w z=caVVp4PTRYJ> zn5VopQ!vNl_V^MVNK8>-HA7PW9cxs~_M66GP8#_;cJLBW?7-4vBHj@UtOpkBwV~Zy`A$xE0s)u%XPf5g;_2JtpdN%k(GJzpkxA=S= zy0^~m&3VU}Y-&72rl@098g`OuT@<;z5>oo^NnH_m?pZun3ZLpZ-HJQ)`6eRv8Pksg zyzJc=Y$Pq1?eV_#_42=)e^ zTO}xJE({11oo&bD#W(lf#NF!TkH>G5> zJ3HbLt2(4TX}FyDc$|nyBzNt5SLM3`YhuG@wKRO61qQ+adcuPIOv%Nf`lRA>ahf1o zukgRQB*a-OxA>Hpi>`JgX2rf(8sNjD24MVz$)}+){1YTP_om-Qc5Ealj5P}9sFK9_ zv*_?sps{W^74TciwlIZ&dWv5uO-wM~uycEa#Kylo(V5Euh8N@Dt?gOnuUFNTG{ zmnPf-TmmY`e9&||#!-E1Hdw^g)hp%5r-W!K3buU`nBIgF! zs)>mHFJ)YM4Ol1g>7iB&@Z5Ul*38Vz^$!w)!JYcgrarbzVe8tku7QJh>aRlTxCL*O zD4OA7kuEmU*<11ehtH~UHEkh e{_mHNmAKRYRpD-3^{U_x1RPIe?W#`U|M@p$Kl57v literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/gui/factory/GuiAdvancedFactory.png b/src/main/resources/assets/mekanism/gui/factory/GuiAdvancedFactory.png index bdd2baafd434c1c517942c84caa394dbf528e6c7..43deb51df3c6dffabccb2e6f2bc54fde2f3cdaab 100644 GIT binary patch literal 19060 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 O09NKUW~nBgyZ#HS7bOS) literal 4734 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

    _j>-EdA)FdukZE!T;J<`t^T-Yr=$Jy$?7`l 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 OV06t~pZKTygZ}_`j!g0Z diff --git a/src/main/resources/assets/mekanism/gui/factory/GuiEliteFactory.png b/src/main/resources/assets/mekanism/gui/factory/GuiEliteFactory.png index affbb338597897992f8a3ff0bb43394eb70fc1b8..2e502daa69bd08f41422f7e3e3bc8bd47c193497 100644 GIT binary patch literal 19009 zcmeI4dpMNa+s7XyZIaqjyQC&5?KI|mjB%FPA)5*jjhSaOF^6VGPK8~+&LJfs(t%1j z7KuoEciJ{0k(5wQ<&colPQ1^c@T7VBz1REa%yqdu_qx~pU2A>Ty4PCs$1?})Y*(u) z&sPQjK$UJ~ZVv!*(4!nMZ7TH7Rd|sN{hQ)xVq*dTPulwy%)SHw3jcD<%biH72* z##@fP-*rilmhNz4)4l5v>A{p%Us~5gg7JOF*v4r3yv=nzn+ORJ;R(@Et2QkDsmw(8 zo$-b9fwp*v$!vOkS0yhN!dr z`1aR&liF^BmsPZP?$lMcUJwSN2U?2ON@`RMJew41KUG0%L~zOkk&05gXXlKTl!|Tp#IUl;{Aa$gI_&u zn^NZNbe`?jJh(?M%zcJv=40g5bxpJb<^`wk8NaE%aPK;j($KhA=z`sZ3!7~^c$7Ky z>i*n_UY=R%f8sP_PZo=enrPW8&XiTAU5Ww=w9I$>61Eh7dh_k+Z>UZga@dPU_D#R3 zCHUPzLBTrGuF^j8mjf3VGr&&&=8)Ul?nJAmRL2l3Ib|xyi!B6Sd?HO6o3f=#v>wnJB>&Z0L&kwxX-uAP#L2_a8v*f-?KD64dGHRIi%LC!cEik<(J zHHK~agfrw`r1o95-8aDb*L3Mu;SUHOT zKt)~hCkMpF{Q?y#iRm^LO7#l!rmE^M@8_gLMOtDDC$S~8ksxdtTo738!?Ez@h(SvR zQ_L6o>kD|E8_)aR2Y^*iIP09mPBzw5CZDU%VDUXbeLt=MQUCx0BR>Iy=>>`r9-t?O zXQ&+8U z{S38-b*a#^q!^`*7_K7rGSoJaG>CAru|t^gg&=~UPe3x!SPX(h(Z>+*6bxo10*l7r zP#81{OF?2VR6L1_AtFXU+B9Y8$w0_rQ|-+yN1KBzL+veMv4Dy~`TF|m`{MNZLQfQi zLZP70SQHkEglZr~{yZ_m56KfP84>xSV-AX#LXJSp;qwp@U4{qWM{KCAEotcMXLMX# z!Pka(qEU7bMU)>yfWqjbQIiF+m|tTAK0@!|uCbUX&>Q4}Jh2Fh!%P|{_;N^m4WH2D zSNC@thUUb^X7b=K{pE5eZCWI@*bX5WMLMC`FOi~k{sItX4~qCcLMCXj9U97#$wn{c zu*W86f|A7Z-M)iB`! zVDam)I4TB5#S_PCjH?OPfKrFW5Ho&AWqjRnIxHrY%@=YRVj73b@B~rNHei4nD;!tz z>w==1@xA#%s9PWnXMmclc+x27Dl>YMp{)jappe5v*snJIa=RHXG_K~PO6Gi~k0dut zcuY_P&8TSHOhfZMoc*Q@&xxg99NrunG`;#P4vUJmuppUG&?e?sQ!EB!fv4b1(3T`K zOA~@Q)|_ZgGC)c49SRuh#prSxE&n2fWw9A}Hb_8X2?QpRLcn8@WCEFlWRn>LECGY{ zV6pK(E(Q`n21sNeu~ zO>iWF1U#99##>^{P0TDQmKJy-lsrEOo3u?1aU+>l1RX#krWaEi^SrI1P>1^ zh(lvoKP=`!z_3{u4-%3EdN7eVvV@g~WFClUB9jE2JOm2%hs7k+NfZ_V(qRyhL>8Wn zB$Gilq{t-UC@hdk@c40FAc5im;z?vA5lf*U$!xp_(u2)nA<0-Y4y2%QOe}#sdCx{l zCnm%ARFjrUlD*ExhDzs�)6Y=;p(T!+{b91X%$%{@MLI642Tqk2_2&Z4>XyL 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 YbFqVt!hr&f7y$avEo{xxOgHcPA8%>(CjbBd literal 4755 zcmeHLS5#A5x88{fU8;aei*!LL7Ld@Q0+Eh_2tuR@O7As9k|TCxBvi5()IdvGyUt=5oUhgF0LNV0C0up$?b9PVT%)5(cZV-3uq&( z&`~kp3vZj-d=omI-^8S!n6+#mkVP4glbk`SMt>Ay9;TG$nqmp6Oa~Cu;4!Wn8fT6( zIbsL5Yrp85N6F>t-@q<3a-ET0hTop7404n)Z?xUoYf~Fnn^&K|H>{&+=lV7I)a_@l z@(R*ABwr?G3nZl*$8?wU7#{1%qnMmeXlv(HsN>)HwKORb!_u~#uySOwEm0E|JJJ;` zZd&WbFM>No=eYT^$Gz0>L=E#k-L;HqWJ7rMw+alJ2Yro8|{&g(^e+QW3kf+b=B^VC6Lki-+_!egzLs;5 zqirR3-~NP35bxJyx6k02@!DVVt8(D&-AL7o?*!Hj@3?yve7rhTkZgUE{qVwD^?SsY zv!0bN>yyOVI4gqwIn^d$(9}hdj>vZjd%!a^0Iy6J9C|?-?WP7WoeUk&u0kr#F$oW2 zdTu$EX4aw?baW(41kOA5el$>jZA$cQ>=tn+ttveiU12n-4+`#2ibgNyUMva5g_rB){Bmob1*{ zm1&@b0Mf*4{Q!lNeRlKLAno*CJMrjga*?6@ri5vy@+F&PJ_Ix0!$8$;t!#I9Z7Qcm zD^n%?*K)PHd%%J3M%-wuXR}I?S5s*{eW0-T{DJ2!sJeYv%&UJ|SA*(VLnK5rZ6Uv< zjxTvnSa%NH8Y<4rTHGacN=Vmfw`l$B{x;c}d-U$;qgReyj$qHYx?AKa^$(IbIh_2V zEKUZecxV(8U|k`8D2aJlouB|$tE7=hQUlmRI|she7|g?7chY4UbCXu=jNok2LDj)$ z4WXhF-|R#avuDVwRMzcwjzbah$pE$zH{-9^^J}n^m$;;u(wO?2EWStP1qfIVlM+AN zQfX-#*p$c)vQ3?R6%&F?kCC|%O^Y>cY@WIZElaPW-=j+xeK@vtl*p%qL{4~~Gm>h# zIF*LN^m*3 zJ~mUb`muQY!qu_;YTckw4$l=EohU}V`jX{Cn;bseGWS-^>7l2qCgF1z-^DU-RgkCV zGjGf=C72_N#`i@ihEt;fWnCfoo!cEUI_hGorx^vRr`7Gm83J9-8`{=@Z-|GGJRbmX z%IWJ|wFrSMj~YL-)fEL+PdjzyJiGZU#0vTduRze{5)}v*(`}w9(M=VXRt-hO5eP*w7;ar4n=R^`VuwD~l^17k}lg*fn(0 z@{VYBHDNUELTttOr${@|lp3RC@lIF5OO?vU5g3X{*=wyqj(NM|bTqpy*131C z&uP=Lk9*-oZL5KQ_m0VC$W(Ll?1qTJ=f5oq23vpsu=`=J?{8y|!)cn(<8Dvj9~J^( z|NKf-`<qYRl0U{ltJ+e!-px8H5DC9-b9PT)nKutM9wm2=~7mXrzUwFO+z zukJ?&BW~*7=I56pMC!GPmq|m5->;PHJ@gJML4a>JZvd{l|D_R-SxU!jfcMQmc8acxN|Sm88J24 z5XC&#p2WAxn~|Dz1D4BY2ILA|VC9nqAtaTYh(-lM*-(Mkr5&KN;Q4;9#CdW|P>>w2 z7D=OwR6Nw|*DXnCFUUym@wbtzN#O2Q>lmF3B*<08nM5UmAGll1FoDHFMrpkgSaT80 ztnMKFZVT~`p&xGYaut6tr{?wtkc$HK2?=of`Lu9@`tu{+H=&L|IAb7XvSg~H^x-&6q4k-Mbu^&ixg>WyFO z$COvdJ7a`hSC__QJ^9FjFynr98&i3uUOULsv;*HLW=>%iMe=6%m;F*r2=tD%eXcwn zEgJe>zpRG)%j+Yl0-)gYlTkh^B;g|)s>jvzk<3xIh&-|i4>jkmw4r^)!D)j6run&9kwcV5jB?4T~3=jy%2NF>R zD98zFCM?hQIr~r)cbLoX-c#RD))pd| z*h1cOe(tGoko>r8zSKB$-sdto=z-IZb1>vhz_IzMh)2UKdAPiv&0Lo3QBZ?p zY~IgjE?e{-*VZiWz3=~LMaEsT{C33t5v4A__2=OdZE13xVZ|kQR5p0vaWC{!VWD>u z=>pbzL^dsiD}z)v1Cg+-q0%V@VR0Sd*jUAygU@g2b1B}^o}V{|0~gusDd=MWL5*D& z@MkJhhhlh7?($9y_A*@Nck@=w=xuvj$9yftaK84Byf1P^Zru@Mb2QHF_bk-MI#jMh zCD>6Ty)@Gq41%h?o1HKFAjlavMUkj{Wn3~b!yYj*6uuvrZZ$pYwt9M;-R9>t1dW5F ztLMmzP*Mex;?)zRlYs>*d#6c94>l*A0sM>`if0KhML`zE-n2Zc9RU;e?dC8KVFm1r zQ6aulJa1C)P$gA2b@9$WV+89YE&=rin`KVV6Ai17d2t}?v(x>Ohj5j!P3kMPgU7pj zSMSdGbZG8ycs=yW0rw_-ug^Q{LtmYY4i;m0;%s0+Dq%G8PLRTdn(HXY0K{>7k!>V` zad_s)Xyail3d_&!%`!DZGU~(viE4wn)6im;M!xYM+M}p%&^N!@`b7AwFc=KQ%HVd^ z#m_)vN~lK!sU{#olx29_RFUV-C(4P+#mg8)4~z-IvLi&SSK6`a`8uLAknr{ESLyF@ zadC7i8^Wo!iuna0`z&Dyu2&7ag5CC5#w9ZTVyQaXTblfsoqqSlSU{c-NVd_&>}$If z%hJ!*282plHTLYjCecI&{6A4px#D*8g;yKH&uHW&?JN%q{vv6M6_A4}cfZF9HeBxa zs7WrTd`PL!GJJi_HfVLC&S%)O?8)^g&L?H#k18pqxuc(^KCJKV&XZy{^DI&etM_u1 z6&x@ZEF&0u{=;h3nWcttShw&o+|FodDzjlFv6u!CzT%Tn7drR$L4C1Pb25ci!_aEv z!!eEy+oMHe>u1|uH>3rR4W=5c%@EtBAaw9-RhbA4rK#|LokfedMKsJ%Ywo8iG`SHU zAB{YXqZKXtVWzb-T_luBfmHS20=2i}A=7a_i#;EuW5piP&x{0*Q#b}cHczZ=i`&$J{+(*}xD4`0Xdu|E)W`r3Ro!mFVvcpylv zphS(T>j~fXG}frxdN`+ju-Xt5N~e}|)Tek?pYp0&Yw~G0t{PeHz+@%Oqh9%f_eF=%G z1Sr_H5S=qDJ#ra957KX4+6;w)$l_&TguCDXzKb>)gR!y50&wmp2(vs;-7 z4-{sX97%%=P?^leEOel~Ad+5=mpZITpxm^k#N5a@O_(_Zrh@6yJH`HDQ}5xs?{S~f z(rQ~GI8O&t;!&BC)A~y$=#90(P&9%e9PnlTi~HYq0A(wUPJhvrki@>}i(}0qgl;`G zcQW&f%>B(xL0HV{vcgws0Va_bL8fN%`5Y{0{S_ENGwa}(E z(3c>}ms}Z}tTSMIYGFgXIiRrRgacWo2s8@P()IflY8C`HdrTGwRRfLq^ir4{h(JyZ zMd51!iSXO}B4zdswf+cLu}BofXl<0icr?z3aA2u7YYp+5^{#sMJRrfkCv|a%A~dK$M4x0HD;QxW z1>Z~*>sWF6QQ43V7NwR1Okgl{9z#HLTU9X=?n9ofO%Yyh`1B9|3!g3Z4}7Wrjne-a z=YJ@>KlUNzOP*l?yFZ&{$b#k$dk5SlN?I_Io?+Q~XczGLQ`_|SL5PY`DRtCI!?=kYb=ejb{Sa~Dvh0pj1c1xFl zJ$BUda%<^NvM?8gqK$#HUCw1Z0D;0-xDlxTH~u3epq!x$<^+fScY-+{FTlqpKwsBH Kr{J3XU;hP0cwDXk diff --git a/src/main/resources/assets/mekanism/gui/nei/GuiChemicalCrystallizer.png b/src/main/resources/assets/mekanism/gui/nei/GuiChemicalCrystallizer.png index 10f170ece56f2389bc9b7cf50a37dc8aa5779198..cead4ce3218b0c79ff51255305874682a6c65810 100644 GIT binary patch literal 20965 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 delta 3168 zcmcIkdpuNm8$WY8V`qqUi|Un`b;-OgNi8A9wAL-FQMpf+*V-tgTGukpoGdoUC@ack zMhPWM3@K$s$?`5nB)42b?&Frr%%I-WzPo?D|MYo3+wY(A`#tCUzUO(K@Avz>y@hEd zrfN!Unm=J}?R?*QeiN)%`6dAXHg9wI_JB(iM%Zr@sMfO$7&>f!MZ?MdLNW2k&djZ? zIciEj;~kXJ7)P=w{M4Pe;8MkW>2cHWUy6q$FK_SGkw-GqbXDaV+zagAYB-s;L-%IV zPKDRBx6ZV#@2z-uoQKr(ceb8?$D11zM@Hr@b6sN|=Fp?NEI~LSdqM%VXhd zJUC|y3qEozCB(d8S13{=-u*OD-vIa! zW5G)8(WI|VF4i~C&XEyaBy6!zDK=tlhET!$_uT%b-$UG@3%G!3llz+rstbE*^uvRF z*NcR@Lhnr;HcjLloW8lZ1F2n&Yx+>@`5wv`{L&oO~r4aOD#r+?mesWR&_ZI}$fxu*5hm{1u8jC{1xMmuROVlu2X8 zWVx8w*=JRpsSY<}~otf@*{v}nzu}AR0z(DT#nFEpFam=HN&b>&Tj0oB- zQpR%*^7Sd{t&8IaWzYoQMy+`8(5HvoAIGitUO{K&Nd|x!WY`day|GS)YZN9*LNQo& z=mMf%b~)aw{ia6MW2hM%O*ed@80gB^VYr!vzj{FF)aUEo50==}w}Z~cG8|Ys*hoCW zHUYh5f+cvhWdj4?IOZm|S7~c4BM5jVxPrrn?PLRCw#7ey&s3d(1eT_P;>36CrR|ge zyO&0Y3ij@C%rW9IId3oE&s`8R7Rnwq8gB=Ow3u}#orqsxx`4BdSGVHBv`{3dmDgdL_cFm^)?pm!e+N1^hUK*s`a&c zd$uN8q^3u|V&ee{rtvFBKdrVaA8ATSDWriV(wW#_&iqBhn!;`w`JZ-utjLe!rPO$U z%>}}?JidLa=4z)QA_1SM05H7xF!lnM*mj#zhGqYbOzhvu`DuLhzFaE}cFvBGbf`#P z*!ZA&@M+(sHa<;d_zzE+8T@QU~taJ7_g~ zeY)w_;eno>6W1I{%H>V7f@x_Xq`F=D0Q_NserEjEm)1tHg`$5g^reNyOS*@?_WFrNX$tdVBnh-Ohs8%t+}=y?-srZU-I#M z!gOtIt)u30=<3Q!(z9pJ8ia+i%X`y3V)h?r?T?(*SLd=4u(~poDa$7u4Vu@nueSgj z`fj5Y-9Jh?Mt?dt)d5euyd|WmV)|4%2}m-e%t*ef?E;3#kbsa&Q%s62Dm~jKMO~x{ z9UE0P%XUOm{={4U_;gAi`l|1yL^JgY157gvP@lgaD|IVan$E0JPA1(b%rBLIIYh;G*=&ahK>gm`J>C|y}#3+cK;Nn!U4kWxra zPOi0vOePkhgSev%slF|9N)mr5;La|15@m2P5sDbDlt#BHKtt=W$+!HM= zER?AiVSZ*#S*i4~Z-#!8g+2<^5EW{cYiRMZNPqRd?&-?IqnC*6Z9a`z8V*>?8s8G3*Gf?h$ zoq^}-pn49tQ>YFV5I&qYeQB$v;SIgM5gcG=XZJi!hic;2Cgs53$Ma`cuI4px dYV0Fbk=0UQiGsx@js<`&2b)9RmVV=V;Xk~07zqFX diff --git a/src/main/resources/assets/mekanism/gui/nei/GuiChemicalDissolutionChamber.png b/src/main/resources/assets/mekanism/gui/nei/GuiChemicalDissolutionChamber.png index 4608ce945d6b52d02ce3c4d31cf40f19541bbdab..1e703be47cb7091937db51be1f8d4d7fa8c7fbbd 100644 GIT binary patch literal 18994 zcmeI4c|26@`^V3qv@cKERg1mS| zls1)kzDkK`Pds=e3XvtEsNWeBPMUAO=k@(_&gYbJ&*;n9d$PiM zT=Ijw87DIRB;&X*C|92NE{bW=kq&CsRbAAdxGTVV+@RY{7ppOsI9#id&x}u)EAuVA z_BO3MBa2Vq-dLV-ZFfQ#{f$5C{UgZo?vg{L5uC9eMfJ;}nB6;LA`Z-6Jh^|a)wB@>E2r}hY&-Gd@{CtgZ?};MEk1)94A)(rvH+|c zcRf4k_tn*hc#mDKFL3&r3rQ(U>w@Yk>dQ@bzPhpV*$V%=PltuYdna>l7%qtz;^|$R2Hlz< z`<<(+>#)!1>B4NW9ja6<861KSvp~TcJdKBcZ2umf*(Ij2>bAHl=tV| z(c+mg0s3j_LoP+=)_qDaYfGG2f5F=9W^htfkH#cliHXQgih4e!s(=;PFLVTeO~}%*eFy-wgag1Ir2r7D0)Q$x09afE0HY-{XW6rmy8UJL zt_lDcI70o00S-lvK??Pi97kLIV%@QQhl5Kt!uCkfOr@=h(hgZju=9DoFfhkYY~uy{ ziUm9$wpgK%`uHiuQi+Wh&zBF&&14c!!WLjN05BzDXBVZ5qXR=A^)=%OrF_^dz*mOo zAwG)$8BgF1E3tgoQ!FtzdVeF;2rCwv8!dqx@s2VZ*h_35B!{^{^PL4j-U7PN$bvP1 z8NfgUd|@RI8{q3BQ7{6`joNh?$i2E4XM}C9qVzU5vQjsQb#ZjU+DPRv7BYiC0iH;} zQt4&{h)gFCW?_kV0trXJ9ApiKrWW4Sz*<>JigRV zX>MesZs_~f`CPuT?+r;5o$L^bxB#9EM=-Y{^ogTm@4?^l_4VzwX@$~uHG-fMX^&>VMJk*FWiW0btdRQ2 z1+eXEtBb5le(pe}yR%hpye#)m=g`o2P_X$WVkpJP9Pwoe9V|q%+7g5Km>`@!do^ zYN9k8r9!bNu!jbb>`Wvv5E(Ke*`?8~CRziTIzpb3_e(0>>vq!-3K$}(+?S_hiG6vV zFb-J;n7FROZZ*FTD29#HM=D3sf>|UcuD9Y|qmYA5=edS82bREcu>iYpj`g>*PIsYh zHG5TJO9g)FxnU&{zzU>C72SFo>F@U0Z_V@US^CZ4BW5ApYbF#68F*V;sudk?#U@%4 z2?Sd*on(c#quSV6L2M$M!lp8D>iLcYbY;;woI1ZrUnnB~x)=<>Jea}*i9|#Zg2@7qN5I1%RX`@=NhBVb$`k#v7zs~>kpxH} zBoYxo5s@qe`8>J^gprIP3Z6it5#V1IqYQj&5g5rXZ8&7s1=okj|r1Xl$YtvNPC{tsq;f9ovSA zr&8E#D>nO=g?Kb7OcBxuAWWi=K?+31gLEoH1c_t{#OD)X5}qLZWidWP5D5uh7b`g%F~{qkt44Sp?E(un18UP)T$lEP(jG4jzW+ ze3(q7ffOR04$?$qKFAjdg&>WHC&6?)NkD{Xzn+Xwx7ItQ)hosSN4i`157GVE~1c%l>R(9Y~_h; zIsfJ0&>`3}0yKT@R3DBQ$S^=s;9jAU4 zm54_!`=ulV9q21l+(5}cu60wqntbFZ>qKdmksZVenXACa#vH`Ow5VFNE zap+=ngp)V`_Hkj0k&}T!Js^n?r85Za={3^zr;*(}osk`#)$PTgeLi)RBCj3D8xQXL zE6)#8?fXRdU*2>*(*IHwrKN2I1w^x{#if}K%B#hN0;1W};?m3q<<;Us0nuz~acSm* z@@jFRfM_IrI`=PtHp%^qS@5q(#!|t)#5?{(QImQY376SYH^`}Xg0OD zH1k1uwYX3~G@Dvnn)#r-T3jd~noTV(&3sT^EiM!g&88NYWbqxGar;! ziwgxrv#G_UnGedV#f1W*+0^3F%m?Mw;z9w@Y-(|7=7aKTaiM@{HZ|fJ(De~9EJ3~; z_D4Pu9{hOo1myGLG3pPNxt-rz0H|*?$ywo^NS&eTI!okYB`gQHell2&{N%!&+X;mL z&@YC=wsH>0uP$_yx;?|(E%|yl_%11QV9r3}$z#~_mRW&om-hejL{z`HtaGz&%`uiH z;oOf+0&FX<#~Gb4vpl&n%J%8pOZ%q}?{7NUsDB;p$iagBV*Bv}ecXdH8kjR*|FQRN zP>!^Q?k{(Hom!bDoPOntpe{d|5#=}EBA7w7NZFsWd&c1$hl!!}*owj2FT%-<=XVI> z>_-)tQs$U`vdv+Bw3dXfCKaBHG<0Vk3Ja4@vrV;ctmoHzL10{V>) zL0`zNG}3WmS>nAFydAS2!eI37Cr+kgv_0rv-ak1Wt zu)5e5rEJ=q`zM0R*w@=;9B$b#E868=8%}CcJ)<$}_=i#DB=?-yS(}ofn^7$*Nm;lF zS*_&`+e3YAQt3j?+iE0RivMcp0xmuBOSy|ESx_Rt|Yb` z8z)R=MINsxr#_n`XD$lGhxrsIz*(<7AG;;X%c5pKk2)XBIh%d@-J7Sa12f-Y%S8K& z-k$wXWwnQKXS(?ER-fnNlMAoM9P@%*1}WsL>5&OsgZ0dJ#hK-`zi(xj&avHk%mJ6u zn&LOx_Uzo$%aJccq0#bFIj0+@@2vd%(%z!_Shhoc+}70-N2RnTH*yy4tGK$cDk}U9NXXc=!I*p-I-$!u2&Ztz#GSwe>}f4Y1anj((2Y@tu1T+p1Wp*YN$o)!?W8i z_*XnWX`K1&>=MNX_f&@z`dojflWtyR4uqJZ7nz42r3?yMKg(=FX2$Uqc8cTK`>M|k z)#rrmYvJve-?|_9eD{Z%p^Dg$U4yn7S_BzY9S^lrWQIToKl@oUPIn!*S`i{4B#er! zUz89Nb$<5P!BvLu4YSriN*|QPE8i-qfk};tIs8J$tIOf3u?>Mz^Q-ypr?`Ged57kO zU5eaPW*0tkVDjM=_l*K?t+=1=^ZG^E9bH$QkgPk~M*ExBwlus^l>Dbp!s2mj91GXf zUA+;5&kf5hE*3X`oTLQy2>ty0mgpv&Kc9R&&3k3`WjCE+fX9GEW*Gg7{L9`2Up|eO z-YhZd4{Ul_Utj+D zQ$+n#)y}o+%mI_zp%#4-OQr$ahwuEP2V@)x8;Gy+B3Q&p47GxZ!zhUZOQfbrN`3Xj zEIpKHd{x#8&LBlY4 zpZdPb$j@JD=6=h^u=HJkq5ts*7y9?p0r~-0Km`E3-{7xYF(2xI%!&o!eM#Y~#w@Vi z6I3;A4=b>C-H5f@NkdARfkqEc&O5lrcuB&F!l1#E#tA+?S$o)75WRll-7S_)>J-1{ zin_4`I;IzW_&u7yV#tG4M!QyJgc?rMnecEz+Hd9K`fHJ8KxhA z-w@qT7=2;VrgEQPqhZ^TVd|>W{!EEe3M4v=k$JRIe9qojoumcrBsOxTJCX`k`OII| zQLA?ZD&U$P7DzLY&q!2fcBs_Z!z7%$7R0EZN)>mb%~R^k*?Mex<;*4VuM7Q){cJt9 zGHAM+Wu65Q3$#aGB^z za>8ze(srm7rnXUvg{CH<^Iy0mPcO6DPt*q9khA@AZF|2>XG~`fGk1L$r|05PnIdE# zomfENbIkk zCsG8eH@_%RXqUsfz2EbLIbS2&!LCOY?ANBqTAwBqECOE>(@qBUw8-hDt zi{W)J-MYbBDphVSEP}1^6ZYPxYNT$xEH8fLcCTwfCC;x(?U+kBHDGJW`Jux>T2A%N zk6cei&+OPWJTdrLxh1k@UglC-ZR!@mx*NCO8wLi6TW=M-BKnWc8N0X?^NqqrSwnk# z^Vls9?gXfXiU_{z*_K^QYL(Xh8Q^}h{4I*KdU>~E@aFu>{8n3!akueLX2il|mlVIt zvymfhCy(=Y{51>?6u= zZ`Kh4>;%wwtBpe}Q9jzbleQ|n-x0@noKj|fW=opTt)}6$%qzjhdpkg@S3l3w(_ra@ z?sr)2Zs&4?r>Fm+-{!NCSg#h%GVkUOpLYjK-zgn>*?<_=keI|b-`4^^BZ8zw^{zqs zWH}do#vQwdY=+)t=g{}a-O{H&8MNxR_f}7I7c#OK1>X5C`KbOe%$-OfOs))3k$C1v zo+w9DIkJfHcdU^*l5zgK;iWRGPVH)ahU{Qysf!!$NR0FC0nd!{a<=&Iq0^|Dgu}YS z_qwOb_^MsR;`65K*Om}F9UMoZ^@9G$@;jE5p-SseK@BchSUT)yv)$LoB7XtL;f(lP z8_m|{!7b^$z-wtUi7`QFN{pPzlhs(lmzGI&u!>T*dwutGSuV>qBc4|kjUM+pYa!dJ zKADd8yKJXa1Mu!oyamR3jCq@o&O50w6IhG5%&G#Ip+c6DEQS9 z?8BzG3wA+}<&k>tQ#5|SRna8*w8;eePe9U}v-aGzxA$l2E)@EM6**$m!G4cTpa>NW ze6s&X@evEeDc591YDCJCBwu&c*8F>2wh$$GA}!emX)ZH2s`DF@*0lGggmBqF>4Cu! zT?>pC(5B&jw;80h&k_&DB1VeCcNghycT?3)>}}4upc|c3484uVpdq~4I@Mzf;(-b8 zr`p~2#<-^9Cfye;hxS??RDC5;2L|jt^y2FE$GeUDY>dQ_)Q%2IaU%U8H4{XkP`{5{ zTwF@S*J}spf*EOsoNERVm`(+1XHaKnXP}t)#`yN)&!Q@yF|l5|R3RkCHbwX#E!ew& zc8z8C&b8Ii`U85kG9fJ^qg2G&pC|RWX4JN?&955fDv5P{10tyxd3^?ugq2=ldcvt4cfujKN!xeXmHaM%cvxvzk^@3#Z5V%2KcVsN^U8lYB~h zMGX(piaHuLq=k1bP(QS*Hl6{RKGFkZ$hozE*F}eYqc3+Lx6#nMEVYcbxXVS39@XG* z##$Fn zhN0~|`N(nN1|`=U!Vpujq;%b#%lQI86iIDR(#icSXxM?!e!F>czeIo}%hB-k-I9gS z>$^s-`8p8wS#L8nl?K20(0jN>I`|=`5B2G)nrNsj>-eBh()><3h}Tfli^>7E zIMBBqD8p*lxrvST?ASiZ@icwW_sh6cPXXHG^9F0r)BfOnD1EE!Rx2AHtZA$7&F?eRb>Rm^Dt#C zPG2O87-e?ZQnNXzmz)stKygxHl}$z-sjaU~{RXQ9p#)cBOm!yd$%|47|Lu?{UvY>A zQ{%?g065OA3M)EK=3v_8kJeX$2o4!5Jy7s=XpN=RIG?I%)?aRlzy)fx<^!bm&-Rt) zo<5MZfe~k!IQW*VZ`F1D4|A6zqXU`~pdYqd7P3BRl)q|&`+kL_1cfglEehaEN`UOO z*Qu0A!CJN5E0(r z2Vu>mWE(Y3DpSw(mI7y`yV8x57nHHN(j@mT%E(;Sm#`(m@yTegJNRd}s~KoplQr6$ zBeL^)JGX4}wRRY9nY;u1sl4jn>5UwY5J9zdO(Rz`OvJZKi?$@@CNwXlQz)7ZD_?cN z26&>}l^zo(6lwl(MVGYei5A`Jm`g)7z;0xmjVHl11T2AAsK`l4siu%XRpClbo+Jtr z)Tc#9Q*SeG#oPUwI3@{6-MS|w1!gk`kZnE8OJZ!*j6de5e^=m1jr`!#Kf;2^#%OCbO=ZSBG52 zT)xx&5ON)pIr{5K8rA^|f%DQy*y~KD&k7DNaW)f(LH6S+gOn?>PUlq z!((Ti?hDE-maP70I}#8h)VW^DM2FElI{Y=BcTEYAm6erOw8Dr)=kUbeWiwcEvoxvK zJviG~Kz&qWaXolwZk^5cK6_~(k1uCtY+?YS-2w|qa=geHg+(#F@V_6)^wS5_2Q=JM zyR`K?oYwE)s86wM^kklVp%Q|)I(Xj6__~)aC@=aNcjl;vH z1{Q~f{Kpc{HX%vtxjMCB&FdbcF;}F)XX>C4`bQ$w>c5`|&devm>x>z_yE;}>1uEG$ zg(vAD)6P+6g;~ffOdGIFXh^HFk(*;l?(XgrYCAfZrJ0$WAVu(gV7TrX-$&FwHn@fW zsn;d=rjbDTsOG<;Yx#%zZ{6u2ZmUA}#WgI%go2&mjfTquJbGRT8I%?9O3rE*D#a`h zM{okaG1E*V`1HxqOtkkGW5hSECf&Wy3+`I?0hYY7V>rd@!_;m(X5QNOo%1PEzYda>36mn zM+Zh6LlOw?U2E5aM*Eu3%~?(qr~o~zay@$MQ41u9t?n;eR)NA$L5HKFVGlL2Bme?J l;oK7c5B`rd;W290Kwf$RQPN;G%={eyOpWlkl8df?{TDkM=*9p5 diff --git a/src/main/resources/assets/mekanism/gui/nei/GuiChemicalInfuser.png b/src/main/resources/assets/mekanism/gui/nei/GuiChemicalInfuser.png index 7f6713a99b3d72f410fb1b1946a34ffc01a63442..30b35699795b8424324af41cf2d16f618b6cf1ec 100644 GIT binary patch literal 19318 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 V!(mA~MN9y?EKO}pF06L{{oex`h5rBm delta 3309 zcmb`JYcy1QAIJCJwqr(xM$!oxMIxkgRPJ`tala38sgYGk5s^E4MnwlXDn=pAQMn7{ zE=)=3=5pN1(6|%DxD10Cp53#awa%O8&3T^wuYPO4_rk9=|Phb|XOrDMw6F ztthifYLr?HwHffCDjU!?|$9xVd53t zm|xvHTd!=eZcP9UUw5~HXT*Knix`zx49YomEY|u$#=!oZ6-%Yr?D*HWpi{tMai(H>V`6&nD`dz+g*q5*FVa=TsY)L4ElP9V!Nw`Z7@}C>bGsw$R$_y8eervpYCNoOa37k>7l~rW0 zq3B>2dI@v__bPT1sljkTF`$yl{G{~4q`9y-^oERY1?--$d)R29OS~kk|NOFxD%h2E zXPu@X<`+qriBjh@IZ$*_TRgF?%`S{iuAa92UFv?du(~>+6K@LWxW_hJ$k!#A)hGy8 z3zxpk+aXRhgSs7oR%NI7Nuz=5y++BKF6OvErKD5bEVg&(FbDUrlU%4kvEo~t_rz?? zLqu?NrA9dUOPcEdCUq23x_CA}6Q8$Q1U-h{zby%b7Eoc5E2vqhdy#G*Az4ByJN(Yc z9H71R{YD(_c6|0KsnP}7p@VR6FJTWS(1X*%6yeKf!=<0ae_KyfO%*!iJZR9ed8+ER zVO%sY5o-&zY%3?V!lWoi%z)=uuNE~-5aZ%ues(r{VFqS~OP2U5^XnZ|LCqFsU)ak+ z^gpE3gDHVMYwV$>sqR9jK#|iGR}a1yF3nx|=m03cqDwA@YU%%r&*zyKwA{CAJyHTQU$& z9Il!j6m& z9;Fbl-6e%zRArwL^bZcE>5X8g`^}p-SAsJgq8Vjea!!&{KHq09d6VqmZCLD8M0j}m zp|4d{8v*FV>gwuIsa9o!!4td#3d0T_jV`*QFNCTOfhv*jV~qz-F&ron@wV3T6x$0d zWy^Zfde0NDW3Zdxj_mTfM7Wgc*-j&vj~$iSZ{!YrUk0QLraFEv9b1OJ<1hc~DroNm zBiDIa+K(sDw)@6a%e4n1S#oaki#rt6InkE`*EDOR5~V(z?%A0Fh}`zvC}K6Djo~Zv zW9u|@#nI&Zi+Ex14mGnWd%G~bjfusKD0ujr0hX44ajuZ zC6ygERY556|7&*S^&dytvh?b%Jb_G@zuicka}@$ z4^BhDU9g>0y*W4oc_YCXU)~fRu`EhM35-fTpX^>0zG6(GhW+ZO+brt*^=*?&j_FMuRqRra;T}pm$`yH+L!vWbh`y&(BpjW3)uM zd^4gcF&)U^M)(aSX{Dv5nO^C0JfXuRHPrV!ZJX{bX|(KmYATqGCoXCf0rv{cn_J*WYDmXAq8Ki?__#k;A7_`m8UM^Xg2tJHgvZn6=@$?7o>B3YJ zh$lK&ghAiMWdu7(xQD_fK)%OY@ktW|n%s9M$B^iNKqeCQS%@)2K#ZSjNI?16P;h4+ z)+Qta+QK>cVyKBkGGN!7qS$_u0=L_$TV6v7C~&fJjxIF`&R!P4ZNwSy(69Y*!NW0; z!}^spam`xa)%CVQz4Z*r46a;CU%GrIi1d15PKMgr);6o%P+g5PXwv_B(2iIO;e2Cd z^d^Rqjs)oGuSM-@JlK5xWBTqvX(XQZ1lAVEJfNHMzKEG@#XOX!D74?jJUAnkaY#Jo zA^VXEwH219v_d}GupKsRQ$33h+KchnZqq53yc^@;tz=IB731-gk}g8shVeLV?hM_- zc-#~03c@|anE*;IZwZqY7!MVC&N1R~j7NtZ4e^3H*1&3eOWi&+a*F#hqU?|{Lx%d> zRLve6X+JaB5IEj-;=+x`fMJtdvX*Gbv)`xZKFy9KAps9Ei(A3b$$WEq046&J?9``9 zW3tB9C!rggOn@6g?QHxgCaV=bMeue*Aa7kttToXXfm%B3(~uF2{s^cM329+NQdTXz zQxZ)Ec8b!6#9J@~mlnGe+N&`Hp}>~=ND_wNL9QD0753BdO2C^7U&0Vb>s`icsEO6f zQglAQeDE$e$@-b3YapB*0>3?X;w1D4{@y|Q-yJZFDL4HKwoV?!2*|~cBkm6=usXr& z5Tu7QvWBwm-9yi|1-z|mI(6#Q&NdNh);(F4M5quo%@}7Sj(8vVdIC#df8*cjA2YtE z*N1*&`eXq8-_qB8e)V_yehE!u>j7uDUm{dHSQgBA+C`v_W3a{zJsEHg_R6p?c7jyS ze50Y0P{(mid}z>Gbxm!pOMS#LIz!y+dke<#R7y{Q()D2rv3RN{%yTY1XUO5s77SQ) z7CGX!Nrpa~-9Bq01mnbr2n7J4A2y&r{KkKFA^M{O{WEznm;ak5{TX8e1Wiv|NLaEO Q0I*|v+{);&p?l1~0NX%~8UO$Q diff --git a/src/main/resources/assets/mekanism/gui/nei/GuiChemicalWasher.png b/src/main/resources/assets/mekanism/gui/nei/GuiChemicalWasher.png index c32e6088c063c829a72ee888ae728a7a1325b382..32c9e1b4aa760b1917e22b6de5d232859fb283b5 100644 GIT binary patch literal 19242 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 delta 3135 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 OTt}_!Et!W1zx)Fo5e`%U diff --git a/src/main/resources/assets/mekanism/gui/nei/GuiRotaryCondensentrator.png b/src/main/resources/assets/mekanism/gui/nei/GuiRotaryCondensentrator.png index 95c24cae26faf61d39b6e658fe5a929b3bb1d9f1..23ac403f0c7fa1db1d2733006440bf1124449878 100644 GIT binary patch literal 20537 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 W3a&RH%h~|^u{2#v&oTD=<$nOaQwOsE delta 2570 zcmb_ci$By^8$UDHk-JEWT%&A65w=annh}XIia9Yk!67&|sA%gAj8jWIE17{)tx_kH&tc+dHq&+nY)_nhzdJkR&}JdHHiyum&5 zZ3+t!?(QeO+}%x1UWvXG5g7`AGqd*82LI{E^mZ1MV)wn1GPD+ahr` zr;z~6g}l;pS$cc_K(A;XPEe)k@?2RZo*6XvFFU={B9~7pes>?*>823onS1f1R=nqp zOUm$0!cMQ22|OZ0*CK!(d4FJ+AldRpeUP$vRN5%s&hd^d*}_YEc2nvo5`Lvum-)NH zd)HkN>sE&{)t9S{9r_)#XC!3n%)QKrgOfwAxnWbuoe1L=V@Nh(OCZ>&lBiY5l7(;n zXpG~YQBIM3kYb?qRv$LXCE~nY&jUk@nJxYFhKyP*8=3pozi54ojd4v#@4qabAITgH zBG}AxS~=E^OIHHBV{-a7g7HoV4E3<3UIPjC(Q8&{wRE)MF5G=?BVb8p=uLM$tzL!i z%ZAn`8uC_)sj`oW*dG#>eij!trt;Q&*5HY;$E~8)pm6>VFtC6c|Lfz@bR zk`HIN=_QPGwri%>KF1eb9y@j{RPD1BVUe2-?u$FtIsi_b=X9b`*vW2;=yoOFjBfpE z99j!vqjIJ$t_lKf?PY#mU^&j?c>-kKZ=!e&lfJs&M|XC9=-*AZp2n;t+x}E$ZcBes z=JhbAWG`Kx4{$(*H3+#!+Np_W+hQFS5C93^_;y2a_CS!rmswB(EamLPBZ%6~I1Rr(}b=5ure~iMt&s|yL4w0dl6b)iA zkri9_qpUqdiwenBO0RQ&_&VrL(^a#3Mxa=1=6%hoR4&LOg=o}P8ycxFGBk9jIZ@DL z??0QGFuFWWx8`C#eI1-Cnw-fE6%K__-%=%EPU|_L&<-+%s(hv>@u%wXh+$+UJf8Xa z?6KtYa&+d zvsL;eHx!L$sUhq|Je_0Tc?GT%klr(#% zRex)p>C5(ZH?{PRl`uGP{G~z)UDXI#9xx_($X)c4DSZm=pduefjG8%@`j#@U%@)80 z5>m?u!Md+frd^rz7qJr_sP9eNpv8D;pY-Fw4j8E=Kwd-sxoE5|Hg_szM@?DTX8l-_ zy#!8R2fPNW*Db9ZZ5x-!CQ-C&3^+?H+$dED5pIdzdar(El8hN|7BJ#WmjLfUA}4ha ztp%3)v!UnD_$`C7=WU+~Eg2hO56>dnGOw=7v+SKWTfTP5o&o(D0JXNe06F_Wo+)@1 zwBi$IgYks{o0|Cpi(QDe-d^92e179W>)+<*tE6SBuo&??UNClHCW^!0GiDdH#!CFB zyoF1C`$QHX_f5r>hKf2yFJ+Q2_s(WpO#}>-FU+YrF05Ic&{6@81s>NAF*KCmz)sQ6 zl%vGUg%Sn^ldFXVsZj@GZo!e}f?T+1We zz;U;tpKCdwA!5$ss$=U_ST@Y6Y8=C;$U+l#R=6`v9?My5aQQVC=V`#RDwp>iBla)V zUAs+`L7P^{zbfGInX6lY_tc{qJrQI9rYXzU7SKVuZxU)%Soe)U#Z3=J8d&%~{q4nV zUWCt7zYq^#$n1#8G(ZFpPy{A`7-ql4^Rd5@ zT(f)+#!KM$PWp$@ktCYoR7=bkqlhGu3o*2%kKcX^@dn$gns*^{bv9p75eD?($Zo&C zZbc~rWq{b0yryOrK5Ur9;~q zkCcPR6Ur}C;J}o1`MZEpNDHtgwCoVXu4f*Z(ru@XGt?BBm(Sp(g<`R|aL%Y+p5p8o z7!6Ug`TMSb!h=Dx!!=nf9ZvM4Bz)yeX7W1TRwD1sjUKD_3~-Mo5ssuSUy&V$pQWr z@=yQG^7zN3Nc5H~%ro5t5KYw__EmZmSELg8m-ejYc~>SDg*t9^NYnUe7C}7UXvXR= zLN>*5@0PoT<%7Vxb=zxVy?DHzRl(mQ{J)$3+t*-hk 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 0000000000000000000000000000000000000000..1b3cddc61512482eb3bd0ef91b0390744fc35662 GIT binary patch literal 22750 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a7f20569a818619d87e53cb12f97b276bac16888 GIT binary patch literal 21019 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 OGB(<~Gi8U<(fcA= literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/gui/nei/GuiSolarNeutronActivator.png b/src/main/resources/assets/mekanism/gui/nei/GuiSolarNeutronActivator.png index af61bb8960b0acaaa8fd852864a3644c3a4ef9a5..2491ee1aa1af275f744fca13ba3fee6a8c049cdf 100644 GIT binary patch literal 17477 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 delta 2770 zcmcguX;4#H7QXNCk|qQ+2?C0JiiYto-d^DgUYeNGPBB1mri0mReFL6X^X$9>@ zP*w#|gKVWDCkBD0^4}feBVkRaZ?<&D6}4_t&Yq=YHp$@B8kpTN4F6 z-w?YIFE#FNXlRvhI4*@zih3^tAamWs$l$vm=u=m@?|Ksw-eq#wFE+f2vj&74bJbrN zDkwzC1`VnsyWlOTqwOT$ZVg>Fm&RT#`*r2sgK}X$MwEp1?%Y5OlJfHn7cR_9FPJ)$ z*D?elL&Fq>5_TA)hZ2|FY^qpV6`_AlyLNQ5&81m!j8N7BTiTUQ2$7-F=|A)4sUGn3 z&3l@#U}D1eqPw|4S~AzKEG#9gh!KbB$xB}syRi@^3xN|%*+fA3~Zst5N3!&Z4v4I z!A9{w{dhley>oPQG-omMl+k!;z9=BczV(PB^75^2fP4aq0yCDI4D5h=T8Y%jWQ^wH zDu|?!7!WnDtXIGagigr~DT3vQ`6mU~>*}hAuHe*z1LVfs;LcF*B1fQ8A6lYStS7!Y z|5s&C@-EW{%_eDV7I0&oJq9}uw<>!Adf3l>0Wg z{d05p^llZnC=k*hjgH*~Z@l}+Qbe74SKbFjU>E0lZCH;{9TLqisPuwdY=f~BeCktM z@d4YNZ937cGSPho{F96{%S6}wFfAS}i3erJze_Y;(ZqtlN=W^EFEL1o*2?mNtQ>9i z-IQ9XtA<-G(Q1(czwG{Jz*kz-YESWjZjJZS(JbZi%+s*E!~j3g%nfPjD|pJj&Gf1j z3G^sn_n~y`jG{#Q$50oXR?Io~%huKxis{0v$l)OW3q+tcAH>VG&2ZkIJXOY570ge+ zP9fOR65@J()%?~agA^1fC!i#rN*z>~n|NRA4^a;ubGecn1)LP8D4FZ1%5 zEZgcQ0UrxPR?Dz>O$8?sb!OZS~zp z6sF};oPMP85$^DTd19XdA7qmFg&ca#(&<#g>L-EYd7^S0%eMddx;+i)A+sZt6j99U zj!y?FkTRUODK~X-M8P?axjWoQLWP5rI#zIEDFthAjMjbdn9tP2tuUIT znKje374Dyn#l(6wBhf)gd+zQ=Fa}X0{zDkSkQLTz`M(*X|Z-F z$nZ>lMtFfk(9T9#-A)6qi!FMQ zcM>Qs%nc8_OOC#6-I|0lQSd^JhtjfH;AqEzNckwqP^EX3r85*BI;~Dylv`etD({ve zn)v0x==<&qa0?%Q-Z-smygwr#@}9naZmx7+0TftH4Yd?1qqiTc4BbfF-rX#m`#3vs zw?#^ix;30he(1HKtVAT6X2x8nTvqnZ{6q{tf@+U&)*Fu&;Yq*m zy@mQoh^$~YsFBDdK-P05Y?2UKzy4tuOopKUIsyB45EACO3f{wA{Y|wGsuX4qBOH6= zs@XXWwjKOi|77rR%URo{9kqEKKfq3KlJuFiY=0673^p1spaLTZ@=;AXiM%pMdn#Re zT;th-PJheEv9Yn10z*Mkva_>7&{r6nno6^hW9@O)%~RF3ugo5qXdipe;jYN#1RG8N zxH(qhicQ{WlLR9KL5=vw;d+T(Ch^-+Q6m)m&k5MSg5b1C`LuL|1kO)SJo2uoBt!PN z>qE*1qgh$7rR4v>J%8)8YOICC{2sS263oMUAPI@%Q!7Q$T@^9y}X33gQ!F;^DN8>%X!d$Vg^_r4<3m_Pg yCecvVmk6*gS?o`0VPA08KPe9%`VXmg(;TPb69bb?dd0VZWSJOS80CE9a`EqJYE@?d diff --git a/src/main/resources/assets/mekanism/render/PersonalChest.png b/src/main/resources/assets/mekanism/render/PersonalChest.png index ccd10a6491ff55b9d062ac2bf9d3865fcf1a4251..3a258ec96a250c8311b4172792dab73716e456b3 100644 GIT binary patch literal 3839 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 U{d|1g+ApcS^#N>=rFY!_054U|N&o-= literal 2803 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 R$%fc}*KTt%`}4}{{{b3zD4PHP literal 2896 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 literal 3392 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 diff --git a/src/main/resources/assets/mekanism/textures/blocks/CardboardBoxTop.png b/src/main/resources/assets/mekanism/textures/blocks/CardboardBoxTop.png index 4e7e6e6b6fca47bc26abac22a4e0ba38b99c2734..8691157820eb55d63d800aeeb959161e861a7ae2 100644 GIT binary patch literal 2666 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 OzdyPMlUCv$tojcdYm7qx literal 5216 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 literal 1450 zcmV;b1y%ZqP)r1Rn&|6&pyKO5B}C74 zpJf<^`k)eMywt_k7DD3j+#W-#k6pod=N{GV+d_?4B-EUxBfh2NnrQKJUvzRSfy=h7 zH3nY~jL(7RC`HCTpQVmtp-l|+JhqSVIyWDbHu0ki1e%N|qJoL0Y2;nL_mwBl=~`qQ zGcOcEsOR~*jmst0@=SG}C%)Mod`*Y=1Y!zL&>}9aw&iC<=ar41hc@W zWgL|!jusaVT-e7Lx!8Z_hTFX0R?ne<{=0ME>O$9HxFo%5d;?*$(+%Kidk$cO>$)%p zUc`YOcj=qt28<&*7VW6VT7VeyxZhJq0$gIC6Zr>U6*^*~^R+hYfUl7i?YI??nDH%w zG5VlvR1b`Q&z=82M`_0w<@MUCCxy7@jM2R2CSJ%mVg(z7B5=TLuu`9S8F>TCGFOic ztW;q-1~yM!44o1Y(sZ14VbQWm7b>9*1ky9c+C1pT8z2a`CS#AApRn7;^E5`_udmGBXbcMl7kxf{Cv?Z!k9OP48kPLA*ZQIb^W}?My-) zYnzaMq6qSVrQwz}CWvM;a{xMyLCmSB&x_7y);V(|i_cq35xyiI|31VAz>}mZgRd~j zA0&0p`n`Mj<<)<^{%U_{zL1*!dmn(#B_Ht0pLCmtIfNTHRi{^@Tn}Uh3=s=@4p@Pe z0z>wZPUk%YJf0y6e|!Y(oDTpa!=JUB#j9bZjPYx^Y20we2EbzYL~GNWKw^Vn43hUA za&c|s8=@Onn@@{JYfQ&(0}_XcoiUkLaK9)VK*n=!AJ}^hX2>UoieLv0T_lt~IABCR z5LKi9;=tV>;!V#!#Cy(nfaBF7{G>>Npvc&EptbVBv^f+5Az==6uuv}0HXdD6uTGHCZkz^?w)bK{u%E^dl zJsS_$NXW}y>vZ#Y*0RNlFmy&UG#=s07}NNlb7jutZYf4Z6tSl}0!tiI` zG!F=>buk&^$k`sR{>uC5%TA{pg1Jpx3g?5!4J;@8A8{{#FFMVe-vL*T$~hHH0?htFEBBP7bM2Mgfq6mstRN zM5Y?}0mC=dUjd~M^hCW72&zHvT8fiJ1CzuUVq#chLs03eSeW5zfeN#rT9E9>-Nfez zEbw-u%HlP8!!)Q7+|3GD*IXIknrk_dM^=@=r7=nq5P{0TF|kgHP%%3)qf2S)j=@&afLY8WhLym$5i_Bf5yeS8hEZlKg%R-VgJ{+i zK1BJQ6|=UqogJxB)i8yk(P-2VH5p{38pTMGM2$F#<9ZFDk2Fat6VpqP!jys&L^wqV ztAZ@SNkxX08&o@@dHOH}G3@m|5|$#fiPBPr#+WdQ8H}hXCgYkxM^r!f*Nr*Rkw8-z zpnedM8x&5vk5FNXtmW?UhLS+d8|qa>&@P3kbIM$U2qe|xv?JOV126CtZe<9d#jLjg z%&NC>W^J$nR*#!)Y{+INtvGK<>CDA9IbAeuw9rnY%YtDpv(033(AIJ@ZMM;7%;-pQ zJyJwvBo3r(3!3d&Zuw)m6s-V8m6d=j*QKh!S0k%(q(%OF^e|v2 zP=rRnS17Uw&!m_V<}l9?JjW9Zqc`z5s}GsXAw9|22t8{xlPpQ#1ZyRbSw8=NQ-^9! zp~*V=Pu--Bv|>yyA9aDYdDKTh(waxnx+FdH;5r1Q-Sjvef!NIg|H_U>vN=mOoDZ|;dz}s4?2JHY#5iS`d%mE=i*yl%l$+=khn%(%4=)O zxHJCoaohG6yiO{+^N+;FgCMl|=bpi}qes|8X^p7R*&!~xWZ{*%{heoiDk_$ff z)Uk@;lUKVJj*qsv1Jj3BY>Kt)qDG3|6ej!Wce3}TU)-)6VAnj=J>0peDnG5&cXB5p=#@gejznm%_@{QCog$T36e29_)na&t;errzF{P%r1glQXG)bAYiuXP3o$tLj?Mh{b N>Ty*%PnK_O`3J`W1%dzo literal 1416 zcmV;31$X+1P)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0003WNkl!%|V8Qcc-{w!TQy#vP5jAP_MtOddJ4j}2Nh#prVpeN|SzlZ(SSXkzk;a+<`Bw WDveCGGE7YX0000c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvGjMjE=kNwPKDW>3A7uk*Bq~2E9aur#FG4?ko^1{SSkp} z$S=t+&d4uNaCTPE2+zz*$uBR~1jP`j;VX|iFe zuCak}qOL)ri5bxUW(K-RX-U9fFi5gAF*a6$>Q5mz==6b((g&pzq;vxl0wzWf6P^oz z9C$uT%>!nhB492NFj;tkfq{v^)5S5Q;+9R2Z(fKY&o){0%KT-`4x&PLnt8MJ7_TQC zPJAHM!RoQW(Md;3%j*5{&g6ZW+MB%I-1t{_=KZ}rYMp{>j=6{kt8NbH?Fb3_d|`@! zyoI3HqRz)}S5L2y^FF%#S)I+eE?`@mQb)PI>?!V6Ob6wm-zVB((*}9%yQ9@}umH$2ZS^9q3 zCJkGeXDUL6`uWoiEdJjvSnn~B?Q~Un`$G-UXMT=9x-ur!Mu%_KX>i+mZQuHbinp`ELOxNdH9MBQ+OqXt^!LLthKF+a(^NaGV-=2W z*gIKd@Ac{1KHpaoSp4C}tzFL^m^p27YT5R7))mcZM;E=_@ibFQ{HKuCgK)KTi?`Qq zzgK8uqc zD~)g7+~ziC*Uz_E%Z(E3v!;E1yP@JsW9M2)8?8BQUw@x%Jg~+o`*pGAl2hX54zuT| z)c*XX8=r9Crk>{G?zW%6z47*zcUP;P-js4dJo23P@mGv{ z^E3YV%zf$~~+(m*?@yo{^1#)xmE+%e1U;P;u+& L>gTe~DWM4fqTnhY literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/CopperOre.png b/src/main/resources/assets/mekanism/textures/blocks/CopperOre.png index c49ac6a6529cceb5587be065d0fcfe3ed1ec1c04..78fc61e0591efc89cc55d07b66e60be4f5ae92f1 100644 GIT binary patch literal 1468 zcmbVMdr%a096uooc_=xG<)o~qnlDwn)~m_j5J;0H2|g#1OkM25`D5xFEhN1rhzG6Inc z&B{@u+;#_I5k!D!Ra%r$6F8zbs&K8wh~tY9LXBr)xEdpjD2|gFJ&Eg(v7v<8MAl0> zDeIUncrz<~vK$~WEEo)`f|)8oEWmK1(TJ%Dj37{mK&4H*Oovcjnj4cq0f`a0fXoRz z5|v1Mgc8}TgqDuF;1AgCf%u4u0#d0i3=xH5*KBHQI>rn%v zfr}n^P(owycnun(o?x{xIgjE~nOQoE)oP*CILtw|#+YT*W$E-rN<*o$ah!^AZM-DY zJOg67IjDP#yX>)C(jo#{7DSgI6ve8*;S*#*@(BUNVnG(H;doXEN*U1%jXF#Lkt+qP zRTTWlNQg=95$Xv7Xf+^Hi{c(ei|Py-18P(g3<^AiN6#1-f;Ir<7@z&Wp~Ik2ShP<5 zQ#Y|ESd7u*co)FScpm{CHjfCqWYUuGZwkePA8k~YE7ZN-Y0rs!Y1)<>%vA4{@RX*_ z*7T(G&lb*j)9pIE!`FGTqWbTK^wi(i9!Xdj7p~lSx$&B__I*dj)Abo>+pYoUQ~kG# z`;R^RK)S!B6?<;-o+exO{PS&x4h5Xe)9xI1HV?ARC%)!)9_V$UmPiwq(E0tw1!+}r z^L>q~>8hE}FkiOBC;j#F{y)mf*Vpwdy}LAdj97r?3BVy1c<<2g#a6P%rx_&Y;Tw_}k!HUppU}A29l&W082Yh=mx-OpET-+TXTxO=xr z-xVy5?7N}pyM7gqIu09$KAERFlz-~# zy$g2+rb*wumebx-KkK6t_pnP{M_NC9n0|ZL>|3iA4^2TU&V1{b)zCMbee>4K-psg`9MUjGLe4jUc- literal 561 zcmV-10?z%3P)Qk2b8Yeid#Ryt$Ua5-Cf-J1%gY5Zh{CM z0tOeUQRq@Tq$h9>c}Aza-X$b?d3w%0=bqOX3J)?@X$PjyZzI@G*tu3-D^@r;MRWW<2YA3=%6Rkql zMiW&JNmYfn$5l zlq6$X^LT%H(rw|Mh}iRPnj`(bu)Q58Il}D6s-Fne{Y0#3TfYYS{r;}(%%<}|)vxKP zNYz!!U^r<=tt=`(O}b2xz33NURALMG0zrFz^D2gh-8%Y99cbh)RP7P4!H>TYYGFaFRK< z`M&@1o&TS`eZAc)8&)?^6tyzjqvgr`K=j^o7a7;w{97l}Dx4X>{iuj5x(}(eg$zh% z9lZqeP`5_5o`Y=^RkzhH4B&y>dc{OeOph?J(D4YHqT1R+PdA4krVUuK-4t`<^ydt1 zTPbE!BFE=E6%N`xqdx2(?Jbz2L#Avo?N8Bdp+XEe5bJd447-66rkDl03Ry?T978Wa z@KB0b3~C_PN2|z(bRw2uOv3p|K(fae661wauc1+>!Dhauj4tEl9) zuBtDxOEH5OdkV)@DwS9z9z%YK1F|f0yub+pOAu@@;$l5y-JrQo#pr-PSjU3Neu`p02wiv5Y)7w%4xNe?~2F88aL|(Sa(fW^KBE~RjzbL zuA=%-$H*@rG+e8KzCnahFo--_Rq4kz*{+2u!Q;^lEhel%-`)nTE+0Acg2alwjC+Ak z0HLVMY}~LcR+Pm!EAy7j8c9(yiZb6S8gZt|xBjnm90`hx>f}FlQ#&HX7%i8&fNYlf z2)d+se9|SW4$Q${Nv`=+DnT@zq#I z)9#O*KlQUz_c!Gaf6E$h?)U9G9$hy-Ie+l8`&))ry#MUIbC>=omcGwrPFT0k>HN0Y z*Dp-g-#&k{QF-Ldt#|KkIlTGQwH{_?y7&_Q60;Z?N&+otf(&3kn z?yO(&)U7kB*w>zSy} literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e6b2a90eca7a0d28077650b68ce312b4ff449228 GIT binary patch literal 1208 zcmbVMTWB0r7#>VhV`yU(kr=#;6D_S|_RN``-PswlO|v^2v*;#avzjeZbS`JJV={9l zGiTl1C`jvrih?mq+9jr6R3}2TBhwnkrZ?Hs3vwIdWebC9FMXYrmw%|>Edl zE6I(=azf5aqq03Te;et6cX(|@iznSf;sZ_v0L}zQxlpCnEB)6oi(sg(YICcp_ zCX?KB?4oT0%0#J3NQ+w07Qj{P?cmA#@WWhQER?cQuEqi z!xr5oxiTT13P815jZ~u%>`wrwC<+inAc{Oi@Il=rdX0C3o~D9^0@JrWVq=#L6?Fqw zNRp$TE{EWFx!j7d8#EF{QwD0f2Vg`1juXbUgbqj^{p-f6=%7&d5XhqdSA3J+N2#Yt zrn$Skp%6&DQAd26UWz`YVYA{Omt?ghN54cY+fqeYk0Tm0A45>)6Q)E585z7NC5%!+ zQe@GJHFZ|wYcQ@+dPaj{3c`#upd~UXaUd0w2cu9*$W3n64T$cVsA=1#wi{gSvRpOo zBb{Ksfbmqb3P#JA;Gm2>Hl1cSj@zz{5zVdlmDd5QAb# zSNN!5S-hl3QC<-&g*OtCY?KrsE*Vj-!MFZz>Hu{Lgmv$$b%#(MjuOV@otB$^~P+mBF)57sD_J4o$Kwa72_1W*0dw+O-%iIH>ANkAu;O;9obPc_(z6CD! z9&_%${f))<&s4U3dZD-fme#|E4!-+h>iVZ=JHf~2Paivf?$OpRX8V_H*VV6X{WbiT NWHZCsq11yr{sB}mn704` literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..87bb9aec2349c8d8b5ab0f7f1bb79c34dc7b932e GIT binary patch literal 1253 zcmbVMZD`zN9M4)Ddaf{0i#w{uRHTFD@^Z=L5_^`rBxetIXT9ENoqkwep6i8PUM|V? z(sOpW&6k1TI?;ki5!o1VhlE2Fx)JZwC1?R>)60UXn!C;0TcKN8kkkf6M_`BrYpd8cuZjE8pIz@ zVe3wf=7&(xb^*%9SX?7%3g!41#WFla?LujiiW3w`&^%620>cSZ0&P7QwC3t%p(tfr zw%{&>ReawO2%^zw#2WFK?T!%?&+`OH6EuxO1nx~*z7pV;*V|T*fTy{J;~TbxhKh=6 z*ZmX*JzWpMbn^KPVasbJ3Z{$*6o;T#G8x(O^lC#5j>C8is?Kyyk0z?g9sP#m7r7&vf1#c3v~ zmXi$6(K_4K*^DoXnKYS^lM+Q|C`x8{hRJ5rVv>ooT%5^>ZEnu;e8tj0+qMC1x47I5 zxq|2d#kbv(ZCBe>FjTR9+pE|PDvD^|h+*k=!`m6&(0afUaE%F|XIzeeS&)^3<(=EIfB;pLWlbEMHokBHk2I zd+HbSpI@x?$hTcxN*w%=%7X5x$L{##(1F>L)YiMu+_BZfw{vHggqOamcRlgh(a6ki zm(K<>AH2Kk_IoGp-0|f3E32>ny!+!ndmlJ{wY$(c5b1S#p0_7nUOduQIElpxbK=T&hLF;@W9^)(VYEZB_nmX@IrHY=K!3;DjcX~2>L_f}N@RXKdfQi#asPo@l1xwHTm=uIDsJdLq%syV zAYE|uQCNbyH97t*?4_u-al2f>mEv~AL{40fY~rEg5i~{hZVf%%tV2v2aMX5H=GLjx z3~gH~Gn^>$MK23$_O_-EhnfRrvspJ~i`lw`?hO?};6SX?p)=+NN~kgmyb4)I#~ed1 znBcm~EIL&w4$@iVLpl*puqH16Iwi+JLXrV^juvApgie8t^@-#;hW?> zs<9TB=oqG zqMlBe0J0)4>MXBINfLjOXN{^s(!d+CB#O)u-ul0(_+q@#>>z zp80O}*5Tr2Z&)%5XCB=?+em=kN&c*Mk!iKgj?Z1~hW8Kb$M^C&5_RhVrW~67kakBc@ntNB) zpYDpCkG&0cUJAv%FLjPK?)F@09&5h-<7e+Y^5VlY)P~%_`=x_tkL-E=z`Aq8!T8Qk zr+&I~?pW=WQ@mZ`bPHr14m7i AP5=M^ literal 1752 zcmeH{`B#!z7{@7>QnSVl*BQ+*Yph6}I)>&MOv)2k+*;|*XiJy^v4sKD0NmX?;*RvKtp zYg-$XU|JE4*4EZWhYEs0XEGQ}CS)rCMkbTRVzo2dnXGnJI|RF()6V9w*&GgJD*;9h zhs))5a634VLGU{G9UXk&d_IrI=RpC)=XZ8?3itwkrvRitAOv&?y95GY-NG(FH=qY9 zKyR-|+$#cz#o|8Def@xe{sE`~gM*R*i3GSrIt10wie&QFG6=b1SfNl14-b!wj6fQN z7#kfM836`(15mzEjzOkWs#GfFxKcH)QjL#KOaKE+s3+Cx$w{?FJvF6)YFeY2o|>Kk zXlJz3GqYO2taf&8er^tEVSZ7kThJ{oEb72R{Li;@1K1`+E;x-*dPr<03}#{hX%*~N zr43kILquZ&*No^JS(Hc@S=X1Q ziN5WVQ~J(0AU!*$tfVkfgsKeHyOdOPozo2xadjB!X<^|i{rg5m8Mr4%jd$^_Y@Tw- z;O3EV=DM#Y3EX_u&S}0pODaV6Y;`1-;0V5PFc<9iNopw{Kh`5eiZR{Gj()_*8O&ZDkwe8 zcSE#oanpCk`t)CAWRc58+*Ii%dl4V`;p0AbKPxBS4CF?Sy`p2(;GNwHCSAN0idU7Q{dN+3RYoP1!$-kZ65@{(7* z^zHk`5`=U%nc!A8T9k#P=ji0)|4e9g>4ZBFkSB)o- Rk3v5ObYK|j@!n%+{{vXT>;3=$ diff --git a/src/main/resources/assets/mekanism/textures/blocks/OsmiumBlock.png b/src/main/resources/assets/mekanism/textures/blocks/OsmiumBlock.png index bab6ea716495945146c8311efbbde8d7ac02ce88..8d9079f854412da97702d7406a867ec8b4aaaab2 100644 GIT binary patch literal 1607 zcmbVMc~BE~6kcq#AYw%ks`S{zV~9g`v&n`eD*?%+p~ zwOXolhFW!k#}uq1BU9-V4=mP>b!r$p9w-WBTD2A#hgyr&;zc(=Z2xflqdT*|YrpTk z@4er9yE!jsY0T8QQvm>oF)q`Y_<2U?jhw`fb)VQ$_-PKOH*@(+G3Uiu3dpcB1O*yt zyo54QxV56}ER_lXFO}H~%$zwp3nLjC!b2FyN4t170Hmh-TsT=uaUemJ*qv(O-S(40 z&~8-=SIV;`*)A<*voEV;sr<^E0*D$=^ruyfB&1-HRQCfV>(km$mbkf;)5!Sx!?<&Ztuh`7e;wZpEYu zJcZ(87RxC_Ay$$oKPV_dEJc+>u@Y4&q*i&@&hz*vs#hWssa7XJv^uI7bYOv_R@$FKzq;|Nzlo{ixcw~cXuS}mBg((be} zUbiT8L*oJKDAw+wtOk~$!Lbx$_UE`)%5bHeL@2RLBE!WJ98KZlPmzd;VuDYDgixU} zUj8`W`hQag^P=ETo&2Y6!bf~DhL+E|fZsgpBg)A)56gGS>g~Ii0>C7PQI}ER>xnZN zon1@f4jl`6dIx`>9~m2=u+;rB<;&}nVrO<+PSG30iPJY+J*>$hCP&vq3XI+_$RnF} z6|Q*f=*S!$y|{js|F0XzhSH{ywF1HXrkR1oWaPqHQ(XSkC^AbVsBM}tNAT;wh2>CV zTMAxZa?SsZt*v+8V8h{}?m_rLp5{tVYx0^7zy7{*>y?hGQRgKzqN%h~UD{B;)6>!N z+uGsQzTt%4&b#UUHoCv>wB}{-_VtGLBhz1PzUJs!?N#?540hsZEvtS{x%SZ?3oRLu zGLh17pygm;@bXA7F|q20qnAIo_w*%qCJgB_jjn;f##eC7nH}@{*Kf;pq)T;W-#yv; z_KL3Ii@CckuM>^+m3Q-NYlvDRPvZ*4eda-vgbS?AOAY4j=RDf<_W|=mKX7aZf@PIe zb=>PQ21_agO+Psj&mVt_KBbzyNU*Nb12yhCQ34cMObJbTgT#LgO#`}4N8PNMW=L2y zu)rE{4U*QiiaA9_cwHRi;3oQ z$CLZ(606BAQ8}_YbK=#rfuV}!+F|JL8Het1nn3i?Y4Ni}f0ll*2bsM1D;AH|%$I=5hT*8wxNm O^lLZjb95~lOZ7i3pjJ8n literal 1510 zcmV4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0004fNkl5KYWXAQ3+sZ)TM{58ws7 zjEC?Fp28{*V7ZX8f>grHgrH8RG2IY|XeuoW`ZFK;z1JBs;pOe!D(LXhdg5m#r)OJd z7qe{Vc$^-Sb=k|akB>-pfIuO#>zga`^YbYQgQr&-2bEz72#Y-5nm747$;)9tjZ#wC zUgTu2k!$6}b zaQ{g2jeS`{5Cc6U=G~7(2x0(B>d9&q`JJ69z}khk@)_uQ!g1n~6#ivP3-1lCT*8zn z_EyJZ;S3y#9JO8}uQjhKU|=zO^T?gJ9yk;+2>bcHwBV}5TT{%}Lruq7`pzi-DQH&z z<)g+tZyadMk$-Cr$ocp`VxZP|RX@k21D7{9?FxX}TMZVZ*1YHO6RmgH3cIYlJ|U~i0X z0Di!WEluaZQV5#bBn5(6(6^Eml$eRnVN9u5TxUbj(q*YQFGPU`hd_fQ+mTxz3?Q&1 z+L5)C&+Lo4Kt!r(Rl%CpRRN(jDlj6l%mFV=vATj7(0Di%Ym^gg%8rcdW%YATj3Mwi zM2p&y38#X-TG*wi0H#b7DwqizwlOB0A{iX7gb6cl!EiH1Fer|*q>aU`@Z^K&)>JXf z`Z>>}E&XOkBAOOwF)W!(nvxciqBdYS!!Veczz71>5on@C*7y`ECyaRw97qVN6xSq0 zhI1PEkkYK#5#7^?5Mptk@1bHjF_|bmWmt-jW4OtT#bUX*#?cAQ5B_!Ik?2IAB@Qq@ zNGQ#!pw}a8%#-!pJ>F0bsC&b%RwcbCd?Tj_%`qTrUe1o_UreGTvV@Jd0zGDw0=NyO z1yWyZAcPVm9SYMVVW^jLL?hp^Js&OFyECp2Cb zK;E{LvpvBjAIoK3D&RFm4Jb-uz6)w2il!tYN*s2%;KgetSyYmVmvR-F2$%z^vOB(M1~#4*!-nPTll% z^zO?-SIb7GL<^3cS?Njl&05>?pl4kp-TT_xrEOJo-|)|o>)nIlcE|eO%QfL`eaBCY zy=l0&qrKp-_bYo2S3NlwP^Zg28@vB!rt+|*wrc0AJ&R5rn!15%sJU3wcjpy4xO1#) zTgea440kW-4}M-1tb49>dDoHk?I*vIuhiW*aqne^QVv=EHkEw)eQ|~VyRy#S5yKZk zzc|lby2V#DbeBGT$@Kb){w3u*ocH7O9%m;>c8<>9BkjvvyZPy*nMX1!HjX~^qdR+t zy)?4$`oQfuvxY5d`$yZw9cP?FUGD~#WCy%21~&B%T)uMDFFW=g4-IBEo5t3!J6F+~ u9<)UrhPLOYZ$FiG&bfd0g^mRU)1jyNY3~iTt**}fHNEat+&k49w)_Ks^a7ax literal 567 zcmV-70?7S|P)5-GHwvZF#upZ z9&42(b`FjK0M`$10D#@KS5Gw{RZM*3w*Y{$EVW*4r29IvnvtwvRaY*V_uf|*NENfE zQtf1DV@6H5KzB4>fjOi4%HBvdXITaSIKQ~mT*2q)qJF<`e2$P>YP!p)c=zOdM1#uOxxxwz!}cj%r9g`l4?}1 zhekik^yB-|RlTmSX-MWS7ubF$)3ei~h1qfQzOK2$n>1|MPPfwMGWA#yy5U4HCQ~^% zm5M!`g#S&$zYLYp6>>j+PQ@;!%z37wWG3PIckJDH;2TWO@&2+TW}N^4002ovPDHLk FV1hmU`78hc 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 4697f350f2f41a93976801241c874667b262f809..d069e12ba1eb85d07fac0b0802786e4de349b511 GIT binary patch literal 1203 zcmbVMTWB0r7@pP#wYV5B1zWTX6N?r)J9Fl;J2PZklAWzx>Lziskcg-~GjldOWM|HF z=B&HPgVt6difFx2s(p}B+qam9N-tg-MAT3y+FIHKi*2P1#!FCxvhEqSG3Z8z6nSOzJR1Os9h_ z#O6IXh>8e0!#gHX2gBU5!z~Svfx@GPjlCp{ZITTyplF8a*xU%9J%k8rp+VQraC0A> zw+i=lEhOBJ{tB3Z18^6-eNFOWQT4*TSVhCPPC@c~CQ8Q6AWkLf60!WI2=f!a?SVyFY{&izn>!>swAfbpNTnlY_ zALaHInC9;0La`zB#^?!MdMU7KV!P%cpXAL9N53Q;*D<6tOd%RGuOg7CBq}rF72=jd9$V|ZX5E}9-Di2ruL*a(aHVw>E5UQ=(y)h`hmF>xzAtwVSMkn_r%ea>R8+3^M9`% z-9Iy>_kQ!3_C+^)@@IJd$o$2fuhtR=_i4HDd+XD0?mTTz9?Bf}7=H5YwYL60?>qJE z2dV0Qe#7;%zdilyJNKVjr%x%TSLget-#`4;?1QhYo031QPMkaQ;^cuJ`Ags5KAt!+ z_|TR0+xPLayT@MMHL4w)|8nf7*~@od-E{oc^`l>1ZJ%Izu2}E=l2c~l-$*{!ZH{$q G-}MiprlBqX literal 1719 zcmV;o21xmdP)3X7C5aj(|V@x!Tin165L_q{uU2&V2xmA4* zCihR^BU03mOUE(^?l!QY}1^C>+pN=Z98`Fqvtq| zIh_m!gT><8vaHc)wDdgNwg9pUR<1jrS+h+X;a`O9f4Xzm=+MpK@N4NUZOa;uMqc1K zu49^JxLymo)9d|lY&@Ct2mLwFZR_uNd&FR86O19*#DQ?2=<+q`FwWv!- z#;Rtjs-g_g#WP^~8y&}bcT=AKD3hR#XhjqcO?qD}7Oa6v0#u^&47ul>XQWrtw!N{c zdBJXiBX>k^ntGp$Bjt$ry)yc{jTkT=J;S!`KOa4DkxBy5J&CEiIFf#ss#2L>-2~4- z85AE!1bTbDRCTpaiGHNu6~ocBjot@S44#o*Rp`RKD0kUU&b(evIdz;u)n3DzVR^_=h{u8HGA}*+v1HwAyDGU{PQL(}OOe-xIN# z=B}!$J%c0&gSRr$t5i~R-=`{IaPJ2`zK7GS#heT~b%Dc_)l|+<8RR=XLl+5m-K$*^ z(2=!LMmMSEj>rKzD#4VKu$$qcUK3?HN3xsP0m#ToxW}xja7VB!M~X5G7@#A*@H0j) z(V+xjF(M5_DJCD$)AY*e!6cAgWjCn=&btH#dLlVPbn!c|enkMe(=5_-GOlgR0}pdp zEA!4sD%0hAPVP7&NF_H>9wId~gsXOu= z=v_AfUF8h?t{q9;88DI!Xi|=i0!Q4!EI6yI8Ufdq)heLw#h!jIyKVxyuBu94W+WXc z=&GA^unRiACjv_J%E$vO*A^cacP^e`zDqZ)s-}T5s#n!(*K7M$Mn)bTS=LO=aKkXh zP>Pd8W|@rZ`%M-Z%b3p{Yc`Xr=5Ucp0#p@?%=yFtiPzd|D@^ws8z;?OX~keakUNej z%E&;yvyCjQNl|RfX55yD{@w}59bt!-R=T5C>2B#&c_jVuFPoKyseGSFQDrj%8q%mIt_lrHM``^Ys+K83C) zA5%=wpPe$Os?=GJYZ(KmY8NozUc)8`M@&OJ>3{a=qCR$D*PUUt9u8&s#cDl9sxZbe zu0vUVUHhY_R%>%G=zlL3=uNEFSlXnUCc!G0&s{9PXi2?V3;J|6HRfD?XR=3f(?fE| ztZ*kl->k8wWAc5d#oYutqZdCLGhmjMZBIqCHVjV 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 b339997f56d83e8b378c0f45a57c4f59f018cf59..98eb5cba824daf40095e01d484d804f6743bc6ff GIT binary patch delta 1284 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 Oa?sP&&t;ucLK6U32k!3x literal 1774 zcmV4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%S zoJmAMR9Fe^S4*!cK@je9???#oTzEu0R<;&)7VN~ox_`^Y8bO2&5@A6i5#nc5ySl1te3Z-O&p;p`-qno#e*dny1vdWYZL?n|Hsl42$7A7g zx#X^=yhkFDn_ZI!Hk*xDuh$}z$%y0eNOHAWS<1;|BJfi=Dwb{BX1>1sO{G%*91aJ; z`Ft+&`MfxtP9hqOlJt7L$5#48jECQc%eFkzXq+wFwM;~^frZSnwm zd%d2(f~wUj$>DHF%8=-nF%4)qk8Ci9Ou?On)I!%CGph3d@>=6}1N9Cwk#{mybn+50dSvZ|eivDmoObg;j4hDk) z&{cvQL&CgE5AIx6$7lylF#!cF<^C` zJUJGHbi|^tb2KXs#}O%AA9o%&91imM!}nY+N8`gM#*wVk8$Vs{+QJxC_GH zC`Rxgny!G^79*q(h|}qmjI>%U!nImWi_xia+U+)RI4xBhWa#?%aSY%*IR@Bk90UJ9 zNZ?(*uJO?!$AoPR*cB38VNp3M)^Ruvv{}G|Ealyxk1^MSmwb?PyIoojc84rsj83)q zs947#W0%LB2YBFF64!A$ohI{$57R%RY&QF>c`fbU6(dW{Ck>DX-uVyt3-kf<%w^L0 QiU0rr07*qoM6N<$g4CsG*8l(j diff --git a/src/main/resources/assets/mekanism/textures/blocks/RefinedGlowstone.png b/src/main/resources/assets/mekanism/textures/blocks/RefinedGlowstone.png index 3e0f657d996bdd54ab6d1fff2e4833a04610ad1e..5f6c6fbfa8d85a67736aab4094c4e2157067d5ef 100644 GIT binary patch literal 1672 zcmaJ?dr;GM91l!Uu!;x69c)T09?FoWDHLg-7HGj%DOOsA4K0>7(t>G98)$(|ltb)L zCk|234FqN94iRLc4hMoT<^!hq07PXQ3^!3Mpp2JzOA&B?jO8x*J?``Qd|#itd?5;5 zGvCI^1^|Hh0zNN{To;<(xt8QN>!8w`TpWp@2ttf+BlI#Y3Ir(dXcQD+vKTZBl_`?q zucLkd@Sdwm53>uj{4kf^7G)ARnQ%#qzP(hV~O$}!X z=|T+`RjT;OT2!1IDv>A0$yo|2XEo?&Ku7@$C1juh+pg9j1~zp<7a{lNYlsR?K!`Xt z^=(oSLJ`QtwJ6A>d3(rV7zS6dXfV^qlfhgGGUzZ9qO%~F?m>qUn2s>$;N(LkqiGe} zkT72GWGwQ;rYZ?SgFuj8uczrfX}C59f>|sUL}x$@h6jo8&?Tt}nZZM?bD2`$p*p!% zr6E+f8Z;})qVWWRO(ipZTLPw;mR0K}+e9`DGRQO#Orx7ingR-i{}08mX|#?AL*M25 zpTasxk_LssP#vD2m6L{KrVNpYv77-m0E%8 zb#4|w!GQsECKKic!3@T# zDJ~C}Ct#?WnBpqlaTzmm&33>vWMm$yRVAW|U@eY;6J;Z+8FL8?o>6a-tC%?#`ixwN zOa?L!_g}-Fx*{E9-cDPWJWQJ(Rg;d_lGe^X^hgN+mcs&GfW**F`K1YeC;@=Jp}hRX zzKO3LE~2?C3iP@r(2!23$k2LgYL1;^6536|IjY{tj51)mkVEG5f6C5u$7a2 zb}*y4wrx?#<4y(ES^uScdE#~sXLx)z$IyGXVg;WfJ~mn)+9^7k;EPol4@TT9^aktC zWvAuM`#g>A>1f}$b$H--%mQ_Xw4Jq}Y{9jFwl!yBtsb+ltl@{OlHQ)>7~^;(l+9WishwBMY&`=+fNKjN;43dnzddaW$1apH~0o=|~InvsgR#5WdXx$5ACLXiJU32~%)hstq3q7@K$WSDje@bBVjuw?AcWrhBfvF#}0-Z4Z>~ z5JQ+Lc~6&Dx#P&J&I+ zggTv-vHn?Ub@OPKwl|km>incnI%Znkx-DE!&8T{~|&#x^fx_OAz) z*S3t@pxm-Z8u|T5$};Ogxz(-p10SCl_~Ffd(>^rwPbjSl7oBT#Xu8@GS3a)fR}C%=e8Q9X(ScxHLwmm9AZu smu}J2|5TZEd!J1?xM*p8W2z+usOU(ni&`5iHUAp~L7}{}fm_r50qWV9jQ{`u literal 2129 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 literal 2666 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 Y2Qv8l9iH421^@s607*qoM6N<$f}#BeYybcN 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 0000000000000000000000000000000000000000..48e4a900248af352fa04f0f01a63831a8fadbd9d GIT binary patch literal 1484 zcmbVMeNYr-96m)9WmFu+zzo&}OpLv~-TPiR@$OdQ8V>M4VIs4=-4{4vZ;#!D`%oOk zDRKNLbD|F!QD_(;tsxwfNRb+vX|f@57{dS=NvEU{t;rfG?LFYAKN$aLXZHQt=Xrh~ z@9(zO8yHLc% zna~2QU1j%JL8&VY~Z42&9XsIlFC>-~Cy-KfIDTpOFVKf?X6^WB11`(L#cgu_qb4v*!1sX`K=<>)e z!HonJ8K+Pwn^5TKR0zDsZl4i$OVf#hDZ_n?2Pc#&oacjaO`;{)0seJkRSM`jQ-X|WQ-CXLx@p{;7IS({-o6DooTacyo% zX51_Y*>*wO(_GaPxs+7|j4X)xf>0i+g4|L;7NkbQWMvR%0-5S{yz1l+KBMA#)86Cy>0V$OXVZO->yU+wsMN3=QWY(eiJJ^Jiv z#2K~l!pd&^Ui-GBkrzhMn!7_oKW67_Deyn65_SacRK)e@ zL~M3MJ6AGamc%yZ2tpk&ZrE`C{Oyh<$#*AW!Y_(M(X=cIW0&IfN_yWG>`Y@Uc4 zdZzERMT$3D;)ZuFc)!_R+nplSM9=R|Y^&Nu9loMgKQLWx8xVJ|ITWsbsda_&Guz3+ z73atW%Nt%@uXMcG!W=!Y_vwvuHvg7*eV;Va@$O!4R-m12Z%K@<950Q~+^%#SJ9seZ zk0mkH<0to=X)(4h@Llz<%|6RVC+$OSb)<&1tu0&TX^lzT12XsTtSPz~7j>y2?)9Q^ zM_TxaZ@cT+_b@|3>)xR&arF{ebnMrcJIwR8&V6*r-?Vj2|5$8#@1^>{c6nLeX5FeY zo^|0(OLs4P?x`0~p%2aKBUEN`a$2ieAE>Cf@VGkugznFuCf?e1>LNH^NALqV%RX6p zV=(pb$L3Dq@1e1==yR`aYvtSc`-$Ie{o-b9%KnIk^j+qTNBbJjq(2`1W(fPeudSzP pexTPh@-uSic+qYh(f>G7r5KM0OuRD?$O`^nZJV;`4=u0M`~y8n85#fp literal 0 HcmV?d00001 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 1cf648c8c4f9a9c5a02fd834c152b40c1c832346..6b1ca30b03ff0e8336b982a9c427aaf06913e6e4 GIT binary patch literal 1305 zcmbVMZA=?w96!q5($H)R0ViU1UfpC1*L&$*+q<+w=oMC3p%&)AxVY=xQ+k8DD|ZJi z7)_8GLF2MbjT((kU6zOrbeg?rCKAHT{Gc(>8PRFnc>9RWXl$8|?fHcZ_5};94 z>;VZN%0vB^K@dU8`<2cvt1GsTmvq%5+89qx%|JGS1RHW0QR)R2ngl(H7Q%k}Xc|Km zIfNZxV`MB725DvQumL)T+d8G;UWt>jhCOI7$3p`uutYSc_Gu=c3t>gOJY3ty1cnwN zR&NMf4yr2_N5i@SP}alZ5=m32pYu>G!%t<9ZVqXdn8P*GU9unmQ!+Py0n5fH~tVp!|41V&LEh zNt|W^$y9*h{ItxL?5xSB!X!trq(D*vMMapVW||B$3>k@VjZL&aQsPE6(-Jialzc0; z?;@9Jz9p9r8$h&lqf^)WN>va~>y~b&^$Z#gqjd)qP1dvKF8hX-6BdA>3<9~?&{ec3 zF|VxQKHwDttV99aOL|3|6d51P-$&xfR1(TSCOO9I#a8(8|CNq_K@oPH{HJb8N3a;} z zpXwG8BMxW7!Ebg%e;;4`c}jz}{9()qa=@8+8F zck5eS@2hvLpZTlOrMaJNkH1#!O0QfoesynH#dJ)R#A1LrLy+g+&%8G)VA9iVjT}UZ{&CX(8~Tf zaaEkS^y`bR*J>x*D$8foM|-|JIkh-?v-g*W*@{?Q-Rb+g2gaz=vlVCW>~F2yZ6>On zqu;7q zNy|9%&If_hhKEXZ-ReYlcXwA;SI^JSlgZ@QuU~I(Z;y|Ux3{;m+3e}*>HhwHu~@vk zyx{ZY`y>+9*g(%ZkagRbBElYXv!xm^CB0~-ap_kO)z9}b7Asq!-a_;}xRo2stfrc2|mERh8vA=#9}&U!UIjJj>_t9Q3j*12)ndZh7C6o|FCoR#p4y^lhLoKsW8FX|H{j zXUE^@rhTL@SF3=H^akIJCGDV7dtKEnq-YY46Mw_x~WA6ISP3n>BCEHMN5d z4@7@`eT~Abj+vo$H)aO6%)IwU?yB>gCL}T=y=|M)F_F4OIdfpvk&Z%i?g8j(F*rjy z63MF*`fiD2-fdUu%-J*{GjIl*k6RR7lcYJ7ZjdAV4SsP}MK|rf$_gd2X5LSqOyuay zS!OC^2K4^0$7`9B-gO-mOZSi>w3z5gNMy!Dwn`*2Lwc^B(X2A>m=Dw5!}o^CMuXWT z)uG#&B6TEuPu3}K8GBgBnU>CcS!U!6cA_j+$#2@xk8%cdv_NeQ7Ia79^k9oIYJ+y| z>W~>UK|Bl2*sPAb3Oc(MbTrt8b2>u{Fh$bM6sb29HT4Xgan`_&DKhQDtf~pV={ECf zFnpfQruaSFP0&4*9m)@1GiSy`a+){+=*Zf%C)`!jKIHw-$eB-eyV0o~ou=6mnPmq$ zf&`@po*rxhn^jJe8rTiH%CShz_aTwy3>yq|^doez+ZWj9pnEtEaL&=0(2;az>~}}) za0c6xrip3itSawdoplVgGmVuGx@nQlRVuZU53lAs`W^Ifnn1Un>Ca9*UXWEXRs3Tjz#&7uZu3-!^7{t>0se=I5~dM#R_RWr(@+W55HLXD_tw1>&l@0|LBv+ ZuYflk7$xLLVHM z`#0zNzH`n!XO0*8cek}}ZDkmyE!Sri>AX39Th`O@UTQiCC4(he>o zHs`@XR7B7j8~GGPye-LqP3Zzq6&-+`tSo_q2qaO~c>oM0Wq>5xcsQySIu)a6 z^)|HV&g80u1coTqYBiyj5O6ps0$tZdNfu?9rxtuP<`Y=w{ivhKV4=tk-GI2*XJbZK z#-qgKsHZC-ctJkDO6*6CMA4Lqbr^_1kVMam<65?kND=+(#+ueqX)Hiu5k+`3wCR0R zI+|dbyW0!JhSVElf9TRnfx{NIM?K_|oMm$Ki{QA9A*Wyx(U^G^ffTRV3LR3Y%*%>a zu4sy$k{z|lvlc$BCezs@P%Q~q0A!UO(5q-xudbymMb^^kCN}3s1o}2=YP(dsfmLpc zH8LTB1cxPzhnrPUsA7VnDh}98hV4A$`VOu|JK`H!3D`oRdjvVXA@&9F zstpjIkP?uWppvBVCndgIDbqAaWnD=mxCY+&zo`?cQ({~v|EZhi5iQ1ex!MJEv)V_< zr_B@6F7cSB?xP)cJ!hp$_3xbG-n)*mn=`Ys@BX}W|8Kj5ryuO$etj%|`lW9+o>*{S zZhvQ?E7S7*#}7;n-ZJ;i<@V30KfWHFzZ3j@;&}11k%wl~sdbAJyODGTZk?W<>AcbL z!o|+F7SFB!$(q$m^V_#w`g87R>il1Y)(g*yI(SrlWp3)q4)gQt^Uri#aJr98{GhfU zdG*xnlA77fj`sU)q#Gbv$1#Ns!_L~15xAE&c!qOv? zaQ=;l@6CMihtPHsA8vUPZ8G0>w|)5SFYiD9$sJG<9yVs>dq3peG12jf3V NF57Qi?s@LTe*l6HliC0P literal 1356 zcmV-S1+)5zP)KKrdh34%awA?s@3at%eI@%X6L0- zE|(3{_{Zl927}RPG#n1a;<02h84860fq?(PAC81$u~;M;eSCaO{+sms{lQRBRXuu5 z=!R)ljLI3^YP1?Bdex`~JbGB@!BFTS_;5y##1ruoJrE2i=w_|9Uat>_!*aQpEoRf% z^kenGla;gD?zV@|!)!WTEEn^|VmKTY3I*!f6r29QhKXVdeSPfn&(eg!iwL2?kv)yR=4Ej>&JQkRX^N+2&D8X%raK$xTKnfg(=kox+wF!A&lhvlQLpJ`O}87+ zwf2{erem7Wo6QFFr{t5;AFNiV)0wAToH=|RotcYvUhNP2*SFV9HtW(Wo_2Aj^K$9} z-51RUub}(Bn(Z+06xRd!Xh%dQH2HfM)c%a7$~G@^^NQcmA- zS4F#a=18wp*&z!$M^eeVvyQx^PeeO=v~GaG| z`-h{Qan{amwyHq%u##IwluwNw_0uJ+4<*w8q#poXd!sRq|yIneR(C?4NBX$^P#*+#3 zUcZ;kW;2;gKA%Tfu~dZnC-sNJL3ib{*+Q|v4r3rw0J@HA$#*i6_xyp6f#46R=M?{; zXYz%Dc!Ks!HuE2!>GfzQzK>F7r|CJJrXw$XzdAptCpi>X4)*z;e8)yk#{1hl z^n2z9^|+$sKJyFxN51nUo6B;Ve)i0-^MiVFNp}(Vi+l2&Y7RVIq?O(=KO|F?dwYqW zb>!82x9e7=QW=hhp6|Ej2lcI1OUXUb)sFaM0)J`$%6Br7GCUFb&G{jjsyJobBTv3- z`jvdAnl!|bbKf=n%KV@nl+w3UQq{dj>bqE++ftIGl{*1fXu?WnljOVZ0#}aL1=r^R zuXwJwd886@kKTZ8n8sguqZ1#Ym9fYG O0000WwZAG~O)aR8^O%EWEu{;Bk z1xFu(8q}?^ksB~Y5N#uNX#foryA{)O7(KFK>W+`m1d-~f`?@&{5oy37+f7sVE?%NY z+e%aYQjshASy-|6j0do9yr*Q251X<@b?hQjbp;bR5b0#ysk)(3Pg6_03SLLYEJZGv zpy4#N9MnLum&|$rBqc_oO^yd-LS}#@$^bk;@*EIYz_Gkc1E7cr1;ojfhr-?htE^~h ze#IBwrKt)+zQVG#T8*g*j28^CK$c~e<5`}ku>~EDxk#_mZn&+*pu*4$Y#-U4OGb>k z;f5eiGj)^(o+497Z7l-H7Vh&1?b7;9RGr7<6}8VtSBz{K}a z-qr$R?e6a=GQ`m+PX{)>6uqi?=BNW*R8Z3t{=!(crSJ(o4sp)31VMsMnj#(&(4cuS zX_S+qoZu~~#j_SZBZFKn3z8}aQ~+{fCYJ}=o{jcRx6}_}SkFnr(mnaN*?K)UDm^jedXj zlYMW`>U-bOzWn{`i94wm@BJhkR&OqJH=aN9@`f+A-<-H}_^XBQp6%OO{r1zrhl>}k z&dtS?*Cux@UU{SQ#GA2Wn>HTp`lxYR*l~IO)Sc^MSOq=#g?19f8pR%>%=sdajV>0N_)^XRaY@cr)%+1`GpFa51p`9atR5!o( z{ki1Ok;nFJVfq)Qe(o~bC-&ds=-XQ+rA?XmiRSLv(aqlEU%#GyXq`_kZX6_H(>15D S@Y~+#r&7rEsAoF|kNg8znxtU> literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexSide.png b/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexSide.png index 61b18bac1506b3e82ec967b7ac1152910b9d9b86..21396b781a8b10086b926d7c7bba21a04fccd106 100644 GIT binary patch literal 1428 zcmaJ>eM}p57(QFr=&%uEoQQEbZ-l{s-nF%~J=#&)Yo%sjR~ptV%i!o8^a8yry~7qT zlsa5M2m_IgATpO2^)EJ^#yJdRi7*%v{9_n#5)}5~WP}ezK)T_Twah`o4L~48 zXrZHuTqM_RAe~fBwTH~F&a*kH%N%L~$~pvUd?+8lMRGXkbCuI9>eE77aZ!FBx`rWe z3&NFYp+}v=& zDzcR-m0E8!C>0o@(i=??u9;>zoOX~AF7=qJd?FV$cu1UMJT`_Yk95!CWH^R(GH%dd z*y=LJ>vjj%mW0UyLU&lh-g){t zY`V|8P?uY#7d{pj_6N_| zsqe=|U+DZ?9KSbzt~p*Y(cusN^Y!JM&FxL8=l@zf%lOZ%WG*f*zjK=gx|Dq*U8f6w zI6%r5;2f@14DJ@9y|OQ_cNNdBv{M1)xiN z-dcG4brf{PjxN`x;zt@Ay61J?aZ38zZM-QZYJGRI1Ui_|bLsiyLjzOCb#+QjO{S&$ z+0Iw%+5nL+2NaxKxjTNYvr&+|@?gVj(F|X|t{3c62Z|=#b3djh#mr4!Ds7E9^4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q z-AP12R9Fe^moW~*APhyFiUo-!XXp*OaRd&~8+7FoEWKS9=H3E{F_qiebre=`2eKGh zQU3cMCn8G-VO!S~v@TO?)zStueo|Ba3QvHUfO-PPdk@xHwU@z^Qs8#IGr;-sSw0`! zf?mCp(w}_?$m!2Ju=`%U<`ByGNw`<92|%JFDg$W5j|Lfl-1dr^o{v>(9025vBi3&K zt@zR4E&&-0x$oWE0g&j(+5{N6B@ECzYD~4I!2ly;ms(4Vag&XaYv&x8oU___U>?hH lyVZwq0;nfoa1b>AkYC0PPC-TH{>=aY002ovPDHLkV1hx3hk*b9 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 0000000000000000000000000000000000000000..2a088fb2af28f919c9534063018cc88eaa900505 GIT binary patch literal 1389 zcmaJ>eM}p57`{@ZtdXRG(}5-)H`i<#?Ol5m=!LG7UOTFkv91wjh;VHWdg*%CU61x4 z85>%*`N!gxO{WGz=O18MmaDZ^Vot`ZBoY`U@AV0604UY-KEmlCInY5iQM3+<4SocH zluHNIXsn3UXC&QJMJr40X|1w5TRl##3)1fZOLFrZGFrtN3hyqbzDg;v_;OYYj z*;rR2X2Z>^xrCDra&w#ygW+H>s0^Y?hHZjXTCEmF)UaBu5D*G~3(XO{g7$AtMZihF zlcjtd#n50PBH>_~IUOV@T`9rqvs%{z)BaVX1j}Ha@WCo20(-rQx{_!=XCv>)SQqWL zxA;idM*5j%)+zL(adV0+cz6Fq380_`!x?9@m!vrhu7iXdrHgW5C3qofEG$ONh(U1C zq%q(oLrGzAxmJUs8gmJf;#z1wN6=0(#ij0X)%WFMMwTQvhP5-yzEt~^~g5Sz`P#p7{QmR3-9`O+ncT{;2~WzovY%J}lq3kWE0TUgx*tje| zbHg?9llgD8OAoz%rU>YWMx)@YA+YI(DzJehJN}SR3-dFN9S;pk`y_5zow!b)gWigd zsgLDa4(XgiIGs7Pr5>QTDL(^XS}- z$V+|M3gvSn(b1n{`nK+`9Un&`v6lxXBB$dy+mD@ZxtoTb>wj0h>n!T{#$K~LH#Pnf zjaDi9LZid=LrZ(Vja`gH9(`p{%Lx=(#sHs9HpvwL^`BjN8(da|_VP0+3P z#bUZ`aEnCJTR+*;t&b~b`{P$W$?d!#cF%{NI! literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexTop.png b/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexTop.png index 5b0da119347f400ee662bb5dc00e6947367afff5..066f25a467103ae85f53b0dffaa6d1c99581b15f 100644 GIT binary patch literal 1161 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nAI{vB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk&``nLQqR!T z!q~`EN5ROz&{W^RQs2-(*TB%q(7?*bKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlve7 zBQO+QO)ZQZO`Qx~olJlNriRYWFuk66#U+V($*C~CnFzg>c=cL27o{eaQ#zd*s+85~;*8sV9FDf#8anxNo?x;C{avn(~mttdZN0USP7nONLl=49bw z;AH9S>gHk$a=)XKnVGAzv9XDzqmiqllbaG$ZweN_L-o4g)TkrMZlyjus{D6FkAfeba4!+xYZMMk;~OVq~zua;ZKsEj@bVw%lG=p z!auLVQM$DK;?3UZcT?Wpm}^;F_9G

    6{NX`S;78^K$vmd%hs(K-1RuzoW9n-rO+h z^}cJ-cju9o)S49k%Pb$CHmo)Awd}W@QNa`_5?F5$kYzm~rQeUwO!R(bPw4ywJ*@7J zYS&F{IqMgDJ@ovMcW1lkdG)t+5$Su%29TatMUuWS1gHKCUUPQOKDH!hm7pPZx*uZ1W`Fjrc wzk8gqP}r^BS#{6aQ)qI~?QQ4o|KKuU*cbb7cI)$7A3=qKr>mdKI;Vst0A=5kmjD0& literal 1251 zcmV<91RVQ`P)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q zkx4{BR9Fe^maz@MAPfYZh=!6)Sc3srf~6RTB^U#VG7(X#$V9RmH&1EHygAH^Bc*hO z5Xfq|Ij5C2t%ILt>aQ>w009sH0doRQ>Vz>y^4@RDT5H=Jmk>8F#-Lg&w-=RC*!W-2 z{0h(j2#8<7n&_M}JJ_1vmAHZ4J1edYVg^6}1V8`;9xK*(xYl~VbvMF67sX`%GA{rC N002ovPDHLkV1hqpT-N{q 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 0000000000000000000000000000000000000000..0bf571573463328eb489c99dd939cf208d121da6 GIT binary patch literal 1135 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nAI{vB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk&``nLQqR!T z!q~`EN5ROz&{W^RQs2-(*TB%q(7?*bKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvc=cL27o{eaQ#zd*s+85~;*8sV9FDf#8anxNo?x;C{avn(~mttdZN0USP7nONLl=49bw z;AH9S>gHk$a=)XKnVGAzv9XDzqmiqllbaG$ZweN_L-o4g)TkrMZlyz=lkpqV79pL>EaktajR!iEMJR)Kr?H7Tu&9-`+BQhektX= z>-{_~=7s8!M%=n@MebVk9SuFV^RrF&_EleA|BegbF!^%tw*V8bx!>g{58wViC$_q9 zOOu$xlNAfrF3bEdS=!h)H1_($^~@`FGA+1cC6OEU=Xpf-4lXI)X*1NLj7-dRPbYob zwT`)5#@$O(|IC@sYxdJG}vFYC!TQq zWbVn8);4|9f_zD}rlWs;xmFh3-WIv${O-`#yC&s?1eEy;)I2jgFx}x*{WbRnMuz<{ VPqI1r+mC~a08dvxmvv4FO#lz~ff@h+ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7023484edb35bcaea92dd329c6eddb7cbd39f2ad GIT binary patch literal 1455 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 F`X9rPDg^)l literal 0 HcmV?d00001 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 5ae84ba414068cd8d81a3a3b76540685eb5121f9..0dc7e1d7846b4c81ec2841995e2c9811471bb4b9 GIT binary patch literal 1226 zcmbVMYiJx*6rOYm#5NIwP-+mlPAMd9X6LapyF25qF`3CWtJ%10SG#B*&f{)&+|1nB znTb1zNNu9QLcv!-C_Z9~=r5@vDO5^pL0nU{ieRB&@sCE4HdI!;+4ys2bWt1Ixi^f=KlRj;dFo4>UMx+G%p}<1-{M zjWoGi$T2xbh81&Y(uKPwM~eDnRTmAi?|zU9BurpIUj>0RW_wbQCYO07ybh0P5-gke z)ik-{R4JDSGIAjhq5`Ee919X+lofc9WqSd~urZotXilV9R^k&98waZoiPc=AEESZ@ zsutd*$%^kg5>40Z^=Lg7MeZogilRs}9L;eQwxGNT+gAh1_O><|6zJ)$>G&qHLCC0T zXxvYe*wd8|EGL&+BeuQOMB$Xtf$Gp~l%XvvjBDB2^9%4_H`cZGiW3f`3(!O3u8!}c zytN6&xx2McXo$U$9(GN9De9Pl^l=N?epX47_)F9<4T(#rafoB41jr_+q|W0Z0X2%_ zlUg~+iwVvUnmp^_#(V9V(k@d zGIL9;B)d@cky}J)tXT#53i6RxK@N~*(7oHV4OI7f!W&u%Sb?tj6f`m}vcPhRC37A5 zWK2y8It!^76H_Th<>NU1I74Y=4X1(8L_QWHSMkRGO&yJ$qQg4*Pu(<+a509l>sM{tKNW|jV8aB0sg=R2n#XqWG;Zh!ml9j#XmZr(Dp-?-!&}D>HpH*4myD-R1G?*~-MQ({#%$!TDXrSq9(i2McD(*t z*F`!((b^?As dcV)*}qV{a@(VhEJKZSpn?BIy<{=gGc{{WX~qZ|ML literal 1478 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 T-H$bc00000NkvXXu0mjfn**A9 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 0000000000000000000000000000000000000000..06621f301014fbb24cf3942cd26aa4f8942b5db2 GIT binary patch literal 1529 zcmbVMZBP_-9KONHK>|f&HGAT9Rm@zd;oInjD4b9M*YUIO7se!hKob`e6Lp!tow|$=9%k%&J zwmL62D<&!~N~Kc8*yfRTWsVKKkrB$caZ`z2nO>Bw1@dCPNcK@8tulLf7Y*20s+hLZ zl&8Gx9G$9CjVogu1#&^o0>aI+YAS?L`&mI@t5m7!et~i?r)9uJ7c-m*95{Ls1Q?GA z%-7{0If8{QVdhnc^x}$Khr43A8~1?eX+WxX*2^_IYDC^KM3<4t% zdASLE98^J09$?``8qleAkQ>2Jz<{e!ofb#YR{;z`H86_67!IK*p*0Yw9vFQ<#hd6U zBJ5=5s4rz_0!w6BAYj<%^QnCrH7^#!D30SWg25ODDF{d^=VZzcaZ+N~0!d45kr8Bu z=YWt!%EfzS6R1S`I0aV7$$4U!lSYM7B!m5w0HbOIX4z0)BWOvs)BlDsCR%co3p8w} zCEhE#mHQ}443ib@p6)0FRH7jkii~n8R4K{3y)4biHqrztU(_DPLtq9ZO473Zvv_@BvQHvWek1lLyEPjSnmx<`DS`tCcC~DQ3@eDIgVrCMC?R5K608^4BAftH`CufVgn2MgxxWJ^xoaSP2Ra z)yaSACVZq6V`%xL3zW^1KB76Lc|@g4w%gACu2MzB+eov+-y2$r4x@F1rUF6otSpzrLoP0QBSqYV%-pxi`#b)x?(qbF>hg#Qu zT`mQj3)&x5ZoB*UU%{SWbwcN!NlRu4$DbF-)6w}id(u}=-`!i-iq|ylU1m(HSraUY z?E0i-unA*jTX`CqP1v`lua8K& z;DwVrj$J(4Q&(oY-ZUrQSeJ!-aH4N$KiS<8^iHmjsEIpkU(05@s+JW_ysVzT<%`YE zI^BcSGkbd8IL4C;8xz|qr_Q^vH^RroKyxcvmU~@10lGhmHSYo2C`xuDO?wg3GI8$Qhz z=3ZE|Z*6^Ns$cyhkiA(m$>1$q+B!b=?hD&v44JM6M-G|ZY8N(;=f>|m-j?v;3V+g9 mi(&`L^3r^re{?^Jh*r%xP_^q~@|_)_pRvuFOSWXZ{q8@yaYAGO literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/SteelCasing.png b/src/main/resources/assets/mekanism/textures/blocks/SteelCasing.png index 9e8131df41345ec254ec3e3198a8b672bd332c75..c06aba64021b1da79164b871b54eab2571569b91 100644 GIT binary patch literal 1707 zcmbVNX;2eq7*3%IGD20Xa*ZsZ#ac-=o0CK%Ik=e=h4 z#>iH>yZN}0NF;Y@ggBO10mtp?L_GiY`r{O_c;k|IJPzH28(|C~2~?;80i;?u35i8u zReH)5WI2iCtkcNj@%X4no)XnkVTTRXq}3B>5@~s;Ne?TxAUL2vk~BI#d8E0G3}{q* z@)}kYElMv!)S8G442jE-$(0#flw1`#bOo^7#3Kl_2o3`#ZL-e5Gx5ojygXv>cny+) zNfUevpZrQxd{hh|LNNqjQP~tF1VI3YONCe=3_2?qpwl20NaKPKjY5NX5RFHt0aF*5 z@P?^2@nXf{Q@)53pRC4lJr4wpMkCe8prTk32ywYwkVXgTbP8cXF{JBo*hJA80;d_o zh(U>I^tcAq0S-o3fu`boGNJTU2wHtq)N5j$VJcBX%0LsW2O%mA)M_1ZOG^M<@wr3mHO@Sj1pWbG!-5V$(PbA(Im>5Q!j2!r}@=G%+L) zN+3wUhB)EVSgFo{!#X80?N>wiox-x;isgwg1jbQJj-tua9T1~Nanztj^?*n;S#jW_ zH5#1?H5!&UO7tpXF@kB*5LGyaYJtfd^E7YJz@;-oXbd)&LJwguC<-N$O@Y}g4uwrq z(m5;@8xCPY7I}or&4Tl_KJ46I=PvC z3w**mFHXObv-Yd4zxT>->Z__+EEdb6Jj=k?tOgVx!OCspAf6(67cX9l=J+pUY>}tGIZfq=Y?*uX{GGBYzn!#`~`o96`0n+5ZZ zHAdDR$m;Zw1{HMVTpj$UW(V?}$eJe~H~9}Bxv$1LtHa{ED4xT-98*t$8j zBdxWuS8E#`t=HUZQN8&_geg z2KnA4eKDR1300rf^~9T7TXlz}k(JhgfuyC-pm*1qnwm8(4BVWJhpN1 zC-aT=(q*w$9m_m6+}|%TH#P>XOGv0oP0CZ(pvmp6$)Qe>g{0amr$| zoqXa~G=CuO+D{kmdQ$v6d@VgM$HzbT<<_maCC83+Uvie6xj7U$175y}^ZmiR;$q(+ z;c3Ix_V>!6AvNHsE*V^HyOUksHg`WCn5fN`cFk5ZeL56%5&6ZE;r=rD$C}3v9z={( zS67$sOw7ICUbC;n%>2ehed+e2I1iajb~WW$`Pb*pX%@x>7Zv)q#9-U$9{ a-bRuw_`8XK9buJ@--lEp6Q2=o%>D;I7^6f0 delta 1258 zcmVySS` zg`4MHxcmAP+e^srH({~4Gx_O#9!7C3y1=ds7@6YSgb-#Ci&26yl%gCEzyJk&mKbHa zoYA(4xEal}Nq;t582}CWZfnA7a)YPPzLDOlf7&%!*3!oz(zejZ#){Ji}5*D$~W^DPFpJ4+8H3AU@dn>Qm$`UHwQ_!69Q zfj}PiUn@h!pn=DLT*Mf9{rST%zyi}^pnHB%S#K3D?uxv}2=8<4oR~nN{4N6kXO7^L z0RkWAOAAie0Yi9TXXGeF;^z6;@{%+{f%my*!hd2V0#Sryl)x+6-OeSetN;TnFu~5G zeEsdoiUte_TmUk{c2*jKVs?gKEATky<3nsPj}G*L0hWx+L@_0o$zFLNrIGzEJ4!GV zH@k0a_yXoD-}G)}S+Ly~27o2mtlsWey@nDh8ZF(qqTMqwoKDQIcEFSc2!oKVDrCxH zsed0VFu^VuxLs7Im8=$(_>n#UQUnkNq-pu7b`&mVQ)^yU3`w^Yr-*3`kO~^`xvN8F zninS?2H?}R^Qq)SCu4x4kNDWUzL<-A#@M=Y!$lfKpNJAsl%^dNqu7HBm@@+7U_`PC zIAb@i^M@8qE(beHg96Im9i5Rr6f4#IZhusY0f8NjrS(JO3UD9vS(+AUc}4ksJl(ue zhe~l8xSmDHVwk0@OZzM>43t=}$QLAEl2LfDPPh#4S;QP0`8>J^lbDt&d|6r=Wk6aD z)7_Xc&yRNYd!JjzICpReQPwH%R)`{ou5w^!>EV!;;&hkH`%8wGRUD}<5TM$?>VIWt zX8{?DfWOLs$m&Jo+bJeG~KBE6);OLiSH_5Li?}M z%*V$eS%2%+Z!qmfghhUV-zo0E$72MKnttohQiY?)XpVIA^8R%7ab=~LTucr4leb}N z!0+CMDHF7VZ$tCfU-vfDbNSFy`d4p57UM&EqVrTg^frvL{%vT#W32F30J?Dh|DpbM U_j>ZxkpKVy07*qoM6N<$f)h1!ZU6uP 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 0000000000000000000000000000000000000000..6989eda9f6d85f242017d816acab6d77cfed5e25 GIT binary patch literal 1463 zcmbVMdrT8|952Fvk-#7jM0}mc=6GGNcigqT8|Br)s8Fb-!G@X1J$|JZxx0EjY^l>J zOeYdI&@GH?344NOqRZG8qS=UXPT7oRVGEh!d_@^CnQ?>}M`m_K>h_26k6m)V*L^;p z@8kFVUYE1(#pI;yB%Mx|Y_GPtv^h2MCN9y&o?f3(o0h4S9<@RCszF8px^iA-0c01M z7T^L5-@auW6zg=cTLia9^*Cy2P8Rh{1fvg$evPfu6_Shc4&?%3@30Y+YK%|~TI0KGBCQ6Ty1chOR5N^PVP|Seh6oO$iVWKf3wD`c9HHG)m zE?d>2Ep2CkeX8oGQ8X9~>VrjkS!qErilR^hj^a3?A&@}3q%t8y3gko;Y#_iXf?pM6 z35qB(tlXwrV9nEqA&7p5u3>npX$?}g#~frg=%zPuz3&rQ$X-!Z1|`{DN7@ypW2Q-;0i z-|i@0b)EHmJTdddnHzWK|Gq2*iEO6elSA`?Z(N6e@)284tUP(m?@Rl<@Y9JIcmCT= z!|`YDhT^8@!Wg+Cr3GIG-?*FAnRnH^V>=WV)8P(M~{@REW9;)|IWP$k0G}Aw;6Rw>hYUOKYcN=WT4(x zKQwW&xp@|I99*?_E^P6Y#i!h!qX#b3uT8)1M*C{K{pVYrhNrzFYnJY>x)wkFOKawv zXO?z9b$vxj!k-y)V%$696|ZH*C;WBzBc#7JfBN7HA9%WFcZ{v?X-n^lbHb||g!A5! zv(Kf42^Zd#I+?KE^W&bFLgQz9I|p}_?OZqbZsO|h)1w)gVB6q<(U*^%^De9N8G5%r z$a&us94~&hWBFUottT!kt~JY#HWsMXviVh4C-2;gNsjMS;nI;^9a+vl9`uC9u5g!r zhL&{17Dx#xag{5|JUfHVW0TuUR_C3b{p!_q<$I=ekZ~xt=K1&RT{SmLW8!r)7j`;p Ts@}+n{7UVWb+)4w%^m*$g@_0Y literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..462446505ddab83668e0be711f3e1fd91b4a5e80 GIT binary patch literal 1459 zcmbVMeM}a09Dh)BVS)_F9!Tmun1kW--2IMw-Yy;ppBEr`5P=D8X5Mr6gXfgz?(y#6 zd0@1VmWoc1>;+|x7%N6NK^tR(N?I5y(IB-fbG8_zIb%ph&D{Duz(f7P{G;3M_wv2Z z=llM>hJyU;$W`&HG#X80ZjQYW?a{&aiDhU#*5omwElzcmszp+n>StxB$>Jq9#B#lC zIV^-MU%mGdOxI|Z?-hzm)lyd;!%1E}8^q`XULRs>H0hZEAIt55D&~gef@sC32F~M{ zz+3SWgNt zgQ$C~_`Fl4t^&*^$q+N>4LXjb0A{l2fq}LFunD6`kVXKKpe#B77}~@DBewA1$ePTT zF@<*Lf-Q8j;vQA?F$CfF`}O`by(E_tz+$lwBt=k^4k2_(wWzWIov0*+G}xiS$%0Q6 zBoPa0WZhDwYQ>SK^C5VBF4v-BQCUb7N*NJgeFV^xgx4F4YYwfbh45cDmP9MX)jmiR zLPe^SIaH6b#1I+f?(v3#K;#XxRTfZD*b2MEReGVQ=Gv_|`l9Cro}o;v5u%uN1_(?# zGe@Jv1l>A{HoMErw8cd6hLE16_`pOvX_6%Ez?KDogEkwovdngRvxBA_Gyt{`H&;|t zR^(vFwt#F0xoJ+P^RZmUCPP-0wI z?34fWO-O{AF?d{@0(4oNBPgQbkyBextXh!8)WL zijS$CvHe~BN_4~fL!VwbEVuS0`eUe5Us;r&^LoX;uDku-8&k74Cgn%w>Dr7-om;lm zXOEm)-8fv79Q*Ok?psq+vky_K#NHjD^R)t60}K zobv0*wMU#BsU1`YZjSZr>`s0AvdTcN|J@Oo(b_S3uPSvSIqRLgjcsh?*-9iS?7UYs zaBHf4JlP(wbwnLpQ8(TA?8ULc#M;@13B7pOEF0FI^r(n3wT%9B`g(SPud}$`@yGV( z$1a~ym5iAE%Mw}4vV~apWcmequ%|2Hz~^nHo6aS>Ry!ghI_lQk@szE-?I|dE-6lpn z*By5->FC9?(0kcV?PsD6?0W&zuCCAPxNBN7w(hwJuDP5_kO1tK(z! Q!QW`EBj0{z^RD`T0KsS%K>z>% literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..764f6e32ec87548e08a56f446c02e9529bb1db83 GIT binary patch literal 1412 zcmbVMeNYr-96rFz_$VAuCTntAvB2Ejdzah0-PJ?R+d~fm8DxNI%-WClxCL%^-CenZ z3aZI38owa3MAMv#h_Nr5un|YY8Z?@@N++PEF~=!J(X5Q2Da-bNqyBLGqn+9JYoF)& zeZ0TlZYe8Wk(N9!*=Dn)`B!q~)|?)DXC+$Wj-5fLHQjCcs?F7Ezzp*`w0R^|fQUcD z*T8bfOO5MJ!=*M`(mJ`K+N>^lm=)C!&c`r#B&1nvn{DZ`h{lU`&_o1SBP(w7>e1sU zB1>+xiYl>}XkHkUS2pQzbyI1D*iS~!&SY801U$rc9I}T%tByBqhj(AOfeS36*y>!x~!S9 zsvt2%UQpMYZq)L0GK7#;QZg;97*mO|Qbt60jR3fv2!&#CO`r|49RBOZP0>b0qXvm` zXsGLT(YlYof;idA-K`D9fR;DxDqXfNg|FvSaeW9Xrk``8))!ooC6;vYPH4r9Q4qK= zT69>03kn$NpoIYKU|gg`#dU7R_W~L)F2>FQuMYs9!;|Oq`Z$WFNSb6guP4s+D~8D{ zB8=OXE!&e^y6~1<)~iF_RP_o~t&dkhSx_}qBdBVK*Nfy-$%>?gjojD`O$N+CU2cF< zp{|CIi4?Q)P0R~UAVNWKVWdFkVU*+m7{iky1}K4M054GhNaz$_`oF0oET@QAo&2Y6 z;zw37#+K7vU~Q)R2r5?d=vJ55S0=XGYzbX{&QlTjCi|;_)>=>MZDo%Qu2_;j!;?N| z#z=DW<{O8;FZkq{ZJdVW)b=#|**m&dN`I@NZQs5k*neRizWa$|Yp;$kX+M3v_{#XW zYk%})QmU~btMyZ%^GxopqUgx#;b=74e0+ZD%$BZ%fgi}^+lP;ShmTa`WX^rw=j@o% zUD>@q+F9BC>YIb3TMNApoeCU259T_S+vjb~d|K)0_^JQG?B?U=?$4&jn~sf+?U|MG zRN`lgcC~KIX&mnTB9B@mys|v=$hFQhTe7MTRc`M;S+BMK{6|YmOUl9r-yn+oy9azd z7tQ3e*Y@p68r%7@qb;1jzmW<)(0)fzU*PbtMqh3?8qnrEitqNHII#V!l#$+jAZ`A9 z;?CK-_L@UV4_Jd!#VRrd zkA5v^Ta#Pw?5Lc{WnJ1Jh<;D+#;^N+sXTI_^Tg|yGE#gyGcO)l`%dGHzRmBoK3Pj1 z92zWm;qu3SY4it=VCV4HQZ_ly|Nfz#9c=4ud$+3ZIpl9`asHkmH+QW2-cv0JGi~3# WXm}2Op0^|RU-bJ*xwn@;{_HZg zT@sU0OO4{m=&S~-o;R9ko!w!etriDOuhW@~w3(ufl*yr|X~tq_ zXqzteAzeifEdriopjY7YKaLv|=il%c4eo*qMw*&xM26zy<0D5Hrone`?2H1c3CL1cj0aF&S=h+i4SSb*+6OT5b^}oCc5(iSJUMtDbei3PV5$FmBr8wpwg#ZMEC$HPdjCne1-wdYjwq z_OKqa)k!UBk)2VgW(wF_z16JAZ1u1fcQs9WEe>xj>oFOt9o4Lt_RzMpJ(8MdTQABA zC-NZGYXSC}=c+ls%@6cEZ?)>HgBFXP^V^Mj8|SC#U?2b-Mn~EjNzb!pK}_fdf%P#d zl2|NJE+zwY;?|JqnVVT%DWZv~&j|T_ve-;^Yry8vJ8Tw{-fFSf^$v%{ueb4L-fF1^ zwjjqjsl4=TpI`&dWOd;G8K=C|taBO#^0@hvq)w0(DYg@-P&=e4pwh#|Ky3&vG*|L?XiV=GI*&(JwN(%UQjfeQZMZmNX=lEJ z6GI^2qSA@!g4`4*rH)!ySUhOS(#2z$o*4OKuP$lE69XKa6D^Vy#ym-`I@_hJ5nwq5 zWciv~Xa{4qF&1N*Z^k64%<=F^0U@|^u}A(GsUC^W|Vz67lWp+}9ijgdJ|5tZxIDNRpLZO{hURkcbRo$+_ zT?xJ2WP~61#sNR6RJ1xbwe9|?XmxICHgk(8C@xc~wVYxkOFg8LFq+|u8F1OGR`rO< zEzZqo6yhM<$_nu8lGUw4JvS0LxfKNy+m=d1DpHBbHG;fCC6-XK6uzLrcS9=ka=3VP zW%jEtILJQH7i^5$X^o&Xu(5^qJB0>ckE|dl~zAvt#>~%{Z!aJ5d@G|AIXAbRv7ctA!i=54=n=wSrr5MZk zABCW1rK;H)6BH05n!BPP1}~DHefRBYf_O+@&(^k7P1L;p!A5iK6XW|1zGrv|{Ql{S zO^^TN;h&c~pZY`m&fKamjohr|`rFrj&s%ls!iL~y<)5G3SogOI=YMYe@$TK12V45+ z!GGVoH@tuKcv&S;HAw7my}5F1MxP%P0JwuXTcK>o{D6(ztl_N9D3HBRgXXMDt z+VPuXm)mz2H$DIUCj%STR2;o@=-_SV<@O)`sl&3c>7Scw!goF_-F#%`edn&_CBq{` zvAeN-_Aed3n-*tBztUg3ziHv#JrE>rj*2H=?0#tj%l_ir_1|0?JwAJS+t~aC2f6y{ z+Q9*N)v8r*eDLwi%()l0Z-4Sz!SY|*eP-h6{>jP7iiXJ4hgYu__tWD~c|ToPXumvi zX;e6L`}XaMo$a&JqWy3~$)~fkzpC1^|MlauqwCK9cAfVh*RS)YgRPyOM?LyI{?pg? zp1Xb}+^r}V-x=mUo}cewpQ!j`{_eE+EIEFlqW#R*`{?hy_1|TOt>Ev=wk!<5IYrca L8`$IS9pC*QbhJTL literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..46b046fff7ae327016697bb206ede186c9fe5d76 GIT binary patch literal 1834 zcmbVNc~BE~6b^@|AS!}Xi{ctYK}DmGG41P>GnDu=cp;!L|iu>HgFkM7Lw@A|&?z4w0a&F&3b zz0%SCb9(}T;20Vr2**dj@=mkHzwhR~JdO|ZG2td`9U6n_r5czJEJveZAXF)hg~MT~ zJaI=8>`x%rAc$lWwn_XYM}{iNQVWJ`P^xh@f#4r#P)lWTFa|`!v51OG9H_1(0*IVT z+{h49#A-gQKthr<@Vcbc5?NB5j4dYy1_1sB4sJjRV^YANj8|zn1}<^jE(f1mwm~8= z4#DEM#P?2Z5{ChNR09JHGJ_1`Aqq%klOTvgXL2B4VB#U- zY8rVACtM(!(85<-q5{Lz91zs&^<+JbjA~**h|Ok$6e>uil5hk`o2bI129iqaF=;^n zYh@ZljUlKCuvnBvqX`(7h!Bg5|_#$%F<=kC)&79j2oXN?BIFGU(JKxGL^ScQcOxJ3MfEJx%V z9>nJ{=)Qtr7EdUoL3sF7CQm5x<s1huoOcz5)_S}tbi~DilJHsss{Lcz-uF- zlB0U9x8-);2P=Rzhz^#EG^i37PcH}gh&+?UhM{PPN`k3uDk+*tXOLJlxs*huQ{=2@ zN(?(j7EPSs%l}W>K-?kFQXl`Rm&q->2rbhO)sHVe^bf4Un?{3o$J=L;J$Tb?3>5@R z4EJj`a8c*r*_Ycp#wr$i?6+pSoY0iz7KgZC7_j!XIjDJ7Ny)L2mFZbgQipeGKDOa= zHe2Vl^^CQ3$aF=Om%iVBHPUo$xL^0MCXwd%GFzi_MM0S<>WW_b-2fQSD17XF;R<_MbB&vOx*d0TWTYu|ekxq>ZnV$Y zA@j_EU){cu7f`k5D(gMr(5gIohiH^)&b*WPYWcw6VD5&c`Fq*LsS%|t}G~yn@Z6VI$t$-vW06~1`1A)&iJ^8WdHeG5dyj|SlCL5XvnBruw}h!CaUnO zSnG1BU^GRQ@)f;tc&bg&=oa;=wdUNQ^7#YhNK5~UCq!Sr?BszWbJw-zoYI?4Ioa9S zjG963W~%Lt(QmE#BF-I*9GT+0@BHiTrqV30GuVsDr1M$*eNLV~8FL@eZ)rz*)hw)Y z`%$PntloXmBEP6ER@E{?Kx{4}>U-aMIFyTxhx>urLoKtG|IjrQ<$%@AYsbS4x)AEASaI{hKEtlaL+8z6>x0KUi|hZ;RmW8- zVq>qhb|lTMn`Yw9-~H0y;a)8B+S^!Rd!c2z()8<)3+h?X28gt;Uq<*jr$Y;*A zah<1B7dh{UjEtN)rN(OPk#Spg-@~A-1_xoL#I>!Dx-Bti;k5|nU|_v&*;&8Vuiw1M zyM*?5Ggj#Rs>yC?E;am)#+MpJ363C&8XyyOP3j$5pDFQRz`A|S6^N{>AK14 za(VBIhWzOrcVlZ~Hcxth=!z=){2v)JvJ!eq`5>^8>i y*4?P`AMSo40+;<5xN7|jJDZbd-EL*nTF)S8Q-}D;#XVM*zgMVmwV<50J^df#irNMM literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..702e2a9710992ab3b20f8507efc480101bde53b5 GIT binary patch literal 1695 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 SsbSW8{{d=MB3!Llk@pXm;(As9 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/TinBlock.png b/src/main/resources/assets/mekanism/textures/blocks/TinBlock.png index 6fb0c94b5c2c22545fe9835e57bd0f91c2af6b03..9f448166b098c738f855a6a46e96799b034cab44 100644 GIT binary patch literal 1486 zcmbVMeNYr-96oSNWCn$Xv4p~PZLq|>{kV_4yFBQ)JLHr@JZ|)4nq=?xJy`H|&)uav za4NMA#6i9^%MYYdEE%yvvce`Z94yMl;Tk}U&IuYVBr~T{)apG1>JP_1+L?X7_IZ9E z&-?prRbKA$xY(pvg+dW$%eFY+93OdOqTyIqU#x}GeA()f^98RQU__uWv4R^QHXl<2 z9DrfVH+~70DHJm{a!!}*vga5)f=|grFv_6M57`REvW%dg@st7?af2d`H=mK{1zIA%gshT&Jg^)T3w7jC5pK&;SkifXpC4-v(YX1dZr~T?1T4j&T&3 zfXJmr^lnftdmdsIM1W|N8q7mbBtq+zq(-eL$)yNIkSd%ca7vGnq(My^NG&q?pwOGh zdJPUs)}$}EGor<^>^I%b(`-_itQ4)v(ob`3 zyd*Qc2Tb|qpzlep=Du8mSpaono$wY85~^NaI)cBBHr43Vx)iI z$>UL{;;+TnX2;xk=B+!kww|56<)y(T+d*Y@%cB?CekYb|m-M?zKIEG&7{^0HLl3^# zbm{d5N6+qNjd$I==Caj^X=$wmr3u(0p_2B?wO2FhM$BJ4RIP6x)7kk0RUe%%8{4A0 z)zOk34u5s!w@N(R8P|1j_qsHVuIQ-s>N)k9V+$HLrBpV(pxh~?2dhT6e>Qr3W#QhI zniZ{NQvETmw^+m0xOF%_`s4WtYX+&%isqKK z5oT4wfaOR>OI60)8RGZ&;X?}xb{;zM!P}0;8+&`-`})W3oSClCj(Oc(QS`_)b(x)( z=<0><&>2i}!a)`%Ej?qG+ispRc5gm33#{wC^?BlzOW<(Zxiwej3_omk<&UHuIk=B{ ztRelolvQ`$+~@7@i~IBVNN&^L80rh1JKb2aeox;f=aK!Pqu9;c!`IdpyjmaKlOGN- z6(w|XVrR{8e`V#Uf9BHK8FSzLrYII$Nc_pv%vFP?MXD?JMUoP)>I;H9P wOF#X!V9yS+t~%b+cRs5|V#9%NM*griYp&&3X5rR<06h>c=>Px# literal 1439 zcmV;Q1z`G#P)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0003tNklPuVqDMIQs{WQ+dW1tp2>77QH%M!G&;?)+Vh$ET^z>}KPk=j zLvn_)^=9L}mI@*BJZCAGJH;OP+C)*LsnY#12!tQrf%tOqDr{2j1^2KS-T_3kRbJJ5 z@_dSR9H4SN?Qgzf>N#&a{ltTI9Qd_zdk#<$*fi~3drp4P&ijjLhomdL;&&sX?eJR&HPuvWIVJJ@6aiFVW8r#%!;`E(k#{nvA zLamf|J>~H99OWSA|KosG&U9z)4nZl(Pzu7QY06U2t^-;zWq+z%E55pKLh{*h;IQ9Q tR4p!7D>>I+RPc9q>(wTC9TGpd15e<>vCM*oD#8E&002ovPDHLkV1lGKw)6l1 diff --git a/src/main/resources/assets/mekanism/textures/blocks/TinOre.png b/src/main/resources/assets/mekanism/textures/blocks/TinOre.png index b8c1c40c8b46b1f86312f4819c5bb0f0ee18dc3e..9afcb4e8f93edb1f359aa279a437c237ddfe054e 100644 GIT binary patch literal 1401 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 D000Dh 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 0000000000000000000000000000000000000000..ccb6004676282ee0806058ee154859feb263cce0 GIT binary patch literal 1646 zcmaJ?dr;GM91jlx5eD;xa=OLHHm0;m`l8KQur@7J1q;^698*FYZJ=#x8f*bi!E;r( z=>RPZnYzi8sR-v|IOQDpI8diB?O+P$O^3)ipHrq&d@M!k_6IX}`Tf4XUp}Aj`+F(U zCMSdjM+O4`5UNSUQ@K6d^9K2HYe}h5!fg{-RT?{=Udq}Dh6EG_I+Fx7W?~tcN)m?L zQ|X)dOx&3wXx;XBM$jtu}a;vH5(pG~r0Cb^8V$f0|UO%O;Kcu$Oa}7h_AcW19 zL$91lOVWZ$njt|kU&7O)C4?!^$!2}36^gx_7#;_Di z#nnT$xRV?*vaA(@VY}VVw+s0+vkXRMG8v2rV1a2As6%8Oq91 zv<38NBr@q7Rt|BVz6!x?O-g#L*kT(>6qhpCL0DmwkHBWLC$2%XjZG#0bz@kxO_ysW z;Z)K_=P-J%9!sZs$z1Np*Xh)IZ>>@g)*sHtrV&iYN--e zc)1#jjU_C4(rcUIY!7jjZ{%W1h9p>;(b2TY+XY%9&C)g_Z3UG|FnS?nG0=9~hn@<( z3K%CDY6WRfGqf2TOfg0cV_t|WQMFitu)`=MJyuhqQ1*!*J7aulAN60DP-7xI*XXic0NH9+NV5 zYo+Z**L2?4=rI<*DDk3Gr=I>C>590nd$><+WFqY@Os=st z{jfVABdZ^{!1tMNt8lx`(%W_k2C(IXnSSV zs1w>BOWZg6=T7TA+Sb-4T)VqDEWN${Y)Ah}W?=b?p5q^!J8-+}kF1Auwp2I%MnpqH zgL6;nzE0!kedC1@E}Q$8&w|{hLwT|ClLACUI^rtwqqZ*$ZXb0aZFAp~=CJz6zcxK6 z3cq%6$EBN#kFEN?YK!Js?&_igb3O)oMr_m{F-h|C^Q$V`GuBRzZplAx4&CFw5?~V&`ZeCoD zZEd@M*CN%P4s?EX?@0HPJE{~>Xmv*xRwvvxp>6f3S4rqtcKd+bW~VY=(rJ4;&d zvd%F@4yaTY;O8XX5%nLvvZ}tRVShly^X7N=OuH0cRk>h6PAwJFn(353T^UsW?FP}L zaK$%T>!gJ8URQ^!1PoEq8`bIS=8t`E^tcnqv%LNh)@!?cBHZgcYo=%}lFvsU?ru3% za1*Ei!U+FrkY99PngMD`uQ&GgZgQ9&pRc2~00H|F%ls#9>pLFa{8swc(ZT0xJF;Ni zxK>SBpW{0}h1Mr<%Ptl4_UcF^5b&Q9U9fYe`}CqE?R^i+NgpI!7~;otH%uvvLk>>R zpDrAI?)c$>{E)_)ni_3r;L9^Jec8#~3O8Uv&OTmwHQ?flkqFSF`QrVAr2Z_=A3&o@ K#_MKftoa8??Q#hK literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2d6754afb9ad64e777e8c65cd4bdd61ef7e1a141 GIT binary patch literal 1654 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 bt4G7Kzz^>8sr&v)i~gx?W(QG|zI5F`^Px)u literal 1762 zcmV<81|9i{P)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%S zkV!;AR9FesS4)dpF%-_#>jNEp))pT{5fxlpHx6_oxGRHX9C7*ltnGjv*%?lc9;-U5d^{eX)DtzD-73(o?DcwR;PH5F#(>FWVos+M zc8Li(9jfmEQLooyWWit%Nb+;kLHW#tGq7APp-rc2wZC`NXJD~dU}TSj0Wcg61BnR; zS0?=S>vp@aQmIscANDrYXFwEpCz0-GK@hH-@6+ad-Ti()Dv0szLmRUC4AA+fUD|H% zM#gvUt%6RcW7TR^#=zUVyO+U$v;@Q9knza98js`?ZoxvM(O{Fw1d-c4v@H$b79Cw; zLnOa#u~^VP5C{OtM_gi5*@oLrBoZht6biuL{$^C40h%eDhQaq0`=D2`viux56bi9&xhzvHl}eCb zj5pM9Z^$F}hU5_sha8K=4#oe<^V?4uqR}Yhk^i80{O2j~`FzTDSIMXB3G_Fdr9Yt) z`oYlKjrPE?pHb`8|BQ$Mx(SJE`sE%&(xdnNtNk7S0R+w*jsTI%bN~PV07*qoM6N<$ Ef=In>82|tP 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 a776eab8b29aa84411599653e444d44334c2cbf7..c7b409b9b008c8dce9e86d9c3652b52f090e4c94 100644 GIT binary patch literal 1568 zcmaJ>eNfYO7_Pu^UV)Q=O!QE*I6qL^ByCfg((2l#m4Zbmb+V1QrEP#n+q7w*Eh1Bf z&Tk#!?qt&w<~f-T6`dawVJ8z*Zqw;d$94*J(t(Fgy`4C4TZ+`}54PMTzpv+cpZE8E zWJ6Zwq8R=ZK99$X(Wl`?Zj24S}t%jOyu%Pq8BNCYuLuieS9c|65JuamG8kt|>)3n+&Yd~l`(1SqQ# zT!tE8gHuBmQfZ|OnNyl+vXmBCFe|ul0if{8IRkc*B>=D8=5WisN^r!koSO%?ArKgW zutiGnxl_4@EI>muB!CK~0t`sH>g<*$#G*Dc~ATQyB5FrfN?ZJDEpxvyI{Kt(k(QcE^ zNkT@_O&2p3E+6?bLS!y>|1T5-a^A?7Fcg;*!iLk9Vms+z^|%t`PJ~vk^q*hTt--N+*>_MN)|f9OYWa2-_%E z`=4Bha|R05$G_?&w8a%+aQdS9xy6hAAst-PFkE-!pvn0>UYJ3Tt4!XmJfoo~K6~PB z-{ann{e~S^K1$zv^yX`?Zr-xV)^*i5>HKtXaC+XU#}iJyJ{)e$?r-ZCrY2uXtFPQ= zRA;PcqYA1nmNf@57%!4^l|#C%INa$O%(?Y z^tC2_>fKUoaS>}=j`EawJJaj)w$>f#ECsU9#l3v~;!$7T8#OJrCCks28I~?Rn{)8@ z_x8Mb{lLnrGb>jo@E5(aH6pt^mb5+T$!zh+lcJTkGY%)bO-t@41U4Q~iN9Xjzb>k7 zPKE!HtK@{|$+Urol{;Ymnb`{!bW>B)=A_?x@VJ0N&{KcTMqFARPl%UDq=3EM-WQ$eVa$pd>X~b4_y6b0TAB zqx~&c^=h+ZN}sq(u&TH9%#+R)2?v{#mS6R0qZF4*l5P|aJzJnmeLQR0{#WKTx(Cus zYH`Dz{;x7O8jTyCG{L^UVh9a>O+8g2FZW#(f)elvCO(agQke=6f4+Z~t0MnO*Yt6bya}J=ZQL{X>xJMyTd&Q;8`SSs{0$jXQM&*D literal 1765 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 Jq9!_J?LV+|aO400 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8c5afa156f1a6ed52c268db0f769ecc6861587e1 GIT binary patch literal 1648 zcmaJ?drT8|9KQm?Vnmr!d=YXSXxK)3y}sxbij-c_s_n2=gheOU_MnGcuihO{U^7%i z8R7%*fhNv5-0-`Kqh=btbW5ZySIecu2x<~*KVd{28aQlOK$=&bu{d~Tk-}jOG zJjt{uaPr*A000CU7Gq|94D!B0AO5?u+@a)$Ih;O)TS2FDxi~`rT03neKm&zm5M~0m z=dEuiVgbOHBrPdiigB6RMpI(kYa@13E*=d4u?yWU+_sM3Kr4|!IyF#lV-p0Db`7*j zVU!qMI>JFN&S!`f`6i1kf1M4rLkr`;Sht!dpa>2J-Bgy7Rl7CND6g8Id$(Z-95vzA zX`t7lQjAHUj%El@Ay$fP2!epos2EYGWKu;GD3u@zSc1ZcL?l7fh(s-wfMXBDdt>bB zYBQEN=8IoxAP2{})G(Zzn=8(hiD@PSMo<)mB~n-_74a4#HqXi7ZjqA>A7{V_*2a)7 zj-;KSml3zp*_;OAmA<|Lr6=bqs-XG-ILZtnn&Ha?l*jI%pTD(}9tzNT;37W#9K^ z==Fs$f+2GVdm=+q;An`|i-uD^I~9cef+0h#<%z)^iJPYKfid>KZKKS8iwzVo%=s?0D#W{1E#gOZ$_BAOkMFo zg9LT@Jzav2pltq^f+H3(a^|*8)2~&-yG~b+1gt!Ga%7U;^7QK+ced3x%Z&l1C4Lt# zt)J1>_wpA(YpuL7hE2b`FKp>i^Xy`|UN*&dJ9Xo>pEkZj-j`NytMqGUhStvBEPQo- zAR!$OD}#p3rsEy#$z2c5#>Bu5tXSJKtTomgomJU2eE#_1D<$_D2J7nXH+8yBh(%(G zq5>6l$){vOQB;Qb)T}+kg}YfR$U$epF$#*j*#D_`$nyP(;I+ZUb36}*B_%bxTT}mt z3VxtBJmOBTZOX6Qzx2gRmwxMqP+=cZhDMd%y>)9%I#T4Yyv+94+?l4fPWJ+(Zu#$S zdGd_nJrMy7)zz(S&z)!Hy<2YU8eEvYnNUX8w%aphjY!Xs$M7VzX5`z__?`V5&UQSU zvgq)g`1!pt7d*Yxtopt4+ohM1Pd&_kV$b{{^x)jh9$`h0pP(W6gWWAHE$!IB*_HR} zm<_Ld2UKWGK}Y7^i$qVAwWqbszkfAtU8cG232wPM=}_#I76j~I_7yXurJTpvEbZgeCjv9w(qr7Rm62JU%cr@ z>(AM1QunO7o*ceWVmyq7-kX}dQX#(ZRpdxc|4bKtt#E5aRL(N?$m1JX&#KoK-=x^g z^Erh}3KxaXP1b%~o~9~+-tjN*9(wlMjZRZucWo3$}~YHVqJN4+7dyE%;Mov8$WsSqifJL#oa^Zg^UxjT6p%E=Uv9{p~Xa*mt0$R=7H@-un+Q=uKEn ILfXcE0QVqkaR2}S literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c8c18fbea3bd73618572d51928c76a3424f76052 GIT binary patch literal 1646 zcmaJ=dr;GM91ntk2!r`TIh`@GjVW!CzG!n63{4AF!Gd)%$CS`U3A9a3gDv1Gc&-XJ z9iYIF`ItwJ6sR?m%c(?)G-jJpa2ZNy zKvYtk4pcEL1xkf7fdNHPFhU_jrE;-I8V-sOR0<;s7)1mKilGQ5LcqZX;=QrPWmqDi z8T7@Ulu#PSSuq&4+wDTTSje!;VN{_|z=#MIi3B`CV9T;_q(fk_O&_vAP&NZgTREDs zfNqOqDwD}6AztY~2xe8 zKkUsBor~{AeJfsdo&4~^p}QS_q(5ddg6rz) zocj_Fw5NU1GeI0&VsriSxv$G~Bs)TRT7*a_M`T$}=#E8xt)nj`ZRvT|7+4$f*XBq0 zK{pQXx^jETiPhg%Y}LNVT9bch?k7Ok$W4Z0CRt8SPDOcZ%DS0Rt%|&giJOZQ1*6ac zD8^o?smvo1ybcuXdNksAE*m*k@A%IE8`l~e51^OKvs3-IfC2{m`_pSYHBlxotfs@8Q=Q7^t9)y}-6)wH zgny&6PL3(+%1pQUaCQb7C1>@cyGyW9vBD;5_^~PS0VAqEBs%hHG)XOnPJDbkr z-UiBmK+>xc6y`sar-0g`oAuq@n;oX77i;LPfcJseVy{Wtdrk&5zLUH&%VTRN;C z->fa}aeU{A>pXn6?omVUt_eYW0I#`Wxw~h(&Mscs+Vi-S@<4*b{+?`S-L$+&*d=N0JQ3O Jq9!_J?LV+|aO400 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8c5afa156f1a6ed52c268db0f769ecc6861587e1 GIT binary patch literal 1648 zcmaJ?drT8|9KQm?Vnmr!d=YXSXxK)3y}sxbij-c_s_n2=gheOU_MnGcuihO{U^7%i z8R7%*fhNv5-0-`Kqh=btbW5ZySIecu2x<~*KVd{28aQlOK$=&bu{d~Tk-}jOG zJjt{uaPr*A000CU7Gq|94D!B0AO5?u+@a)$Ih;O)TS2FDxi~`rT03neKm&zm5M~0m z=dEuiVgbOHBrPdiigB6RMpI(kYa@13E*=d4u?yWU+_sM3Kr4|!IyF#lV-p0Db`7*j zVU!qMI>JFN&S!`f`6i1kf1M4rLkr`;Sht!dpa>2J-Bgy7Rl7CND6g8Id$(Z-95vzA zX`t7lQjAHUj%El@Ay$fP2!epos2EYGWKu;GD3u@zSc1ZcL?l7fh(s-wfMXBDdt>bB zYBQEN=8IoxAP2{})G(Zzn=8(hiD@PSMo<)mB~n-_74a4#HqXi7ZjqA>A7{V_*2a)7 zj-;KSml3zp*_;OAmA<|Lr6=bqs-XG-ILZtnn&Ha?l*jI%pTD(}9tzNT;37W#9K^ z==Fs$f+2GVdm=+q;An`|i-uD^I~9cef+0h#<%z)^iJPYKfid>KZKKS8iwzVo%=s?0D#W{1E#gOZ$_BAOkMFo zg9LT@Jzav2pltq^f+H3(a^|*8)2~&-yG~b+1gt!Ga%7U;^7QK+ced3x%Z&l1C4Lt# zt)J1>_wpA(YpuL7hE2b`FKp>i^Xy`|UN*&dJ9Xo>pEkZj-j`NytMqGUhStvBEPQo- zAR!$OD}#p3rsEy#$z2c5#>Bu5tXSJKtTomgomJU2eE#_1D<$_D2J7nXH+8yBh(%(G zq5>6l$){vOQB;Qb)T}+kg}YfR$U$epF$#*j*#D_`$nyP(;I+ZUb36}*B_%bxTT}mt z3VxtBJmOBTZOX6Qzx2gRmwxMqP+=cZhDMd%y>)9%I#T4Yyv+94+?l4fPWJ+(Zu#$S zdGd_nJrMy7)zz(S&z)!Hy<2YU8eEvYnNUX8w%aphjY!Xs$M7VzX5`z__?`V5&UQSU zvgq)g`1!pt7d*Yxtopt4+ohM1Pd&_kV$b{{^x)jh9$`h0pP(W6gWWAHE$!IB*_HR} zm<_Ld2UKWGK}Y7^i$qVAwWqbszkfAtU8cG232wPM=}_#I76j~I_7yXurJTpvEbZgeCjv9w(qr7Rm62JU%cr@ z>(AM1QunO7o*ceWVmyq7-kX}dQX#(ZRpdxc|4bKtt#E5aRL(N?$m1JX&#KoK-=x^g z^Erh}3KxaXP1b%~o~9~+-tjN*9(wlMjZRZucWo3$}~YHVqJN4+7dyE%;Mov8$WsSqifJL#oa^Zg^UxjT6p%E=Uv9{p~Xa*mt0$R=7H@-un+Q=uKEn ILfXcE0QVqkaR2}S literal 0 HcmV?d00001 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 55fd07f98dbe17b231723f6b469449f7b35ce0e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1834 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 E2ikLL6951J literal 1770 zcmV4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%S zm`OxIR9Fe+mr0A7K@f(=UEFZN;1Y2|LC})}ir^uTdmw)#xBM_~Uc3b2ArM7zi71LY zqX;U9;+FXOy~8MoI&=62;-R0eUdrnFx~sY+-#@zd5C49<-R^+r-+qtghfCzZ&1QqD zR;vX$p8D9o-EPsZR;xkwOCgC^$ob#PuU}A|OeUa8r2_l?K4>%=L8sFRvS`(6s9LR7 zP$rXsT=8PDfK0t6lL@lx$4^jv4=k5USi+SCgF(oRMg!!EBasMX7NgM!RlD5|j>ls# z8jXVM^%`uoS|{z*Y85i~iufLoN{=>hS9ZHySm-BftE@nk}GSvubbc8?RH}#J-+`_hb+Dac>cLd>-D2$8ja?@rCu1V zP$y=rpugE{g7io-nS{*SF;~uc)WbXG`^knp z?|j=a4)7(zZ+!kT;(4wKFQfT<4i8WtBkZM@ky&^nioORV|NZOuFST7T1Xt6?FaQ7m M07*qoM6N<$g3K^+I{*Lx 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 3cd450e728c20b2e78ec825d9fc210061208d2b6..21f4fd68a7bc9195c2f5324b1a642ecf134f4d67 100644 GIT binary patch literal 1656 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 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 0000000000000000000000000000000000000000..0d03afc270dfd54a9d70dba4f7bbb2d026a9e488 GIT binary patch literal 1646 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 literal 0 HcmV?d00001 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 19b8520b7df0db69f3d0e8f612c558ce389e3475..376899adf9041f603c6f1390e0a678ad3224f7f5 100644 GIT binary patch literal 1558 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 O0TT5|cy(On@_zso%WRYY literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..03befa252290a5237b9568910acdf4c69396e724 GIT binary patch literal 1658 zcmaJ?eNfYO7!Ja;19ZUr8t9CbY316cDQ#&>3znup)j};D6sOFP1{$GFX(KIcPOJ`x zHyISiM4UIr6k+OgDmw6M^8=?2KTtX45IrW<^8}ruPH|g`!1f0-cggSTdEV#!y&snn zZBoKm|4@Gb0LH2l5gk1Sd0)mT`de0R64Apul*&M*kXe)iwc&umNM_=o+Kgu7Ivh0? zjiGZ*z@xK6W`W&?mM)@ent9Gn6(@od5(XZAK7WrBoJ&P)?( zcp9q`HxY@2Haw*;NskrgU=kxUHU^YArL+MvPNAUFoNKX5opR=YT`4{HZbM9P07B)+ znXjBOXtbb`wBewTE8<`<41-Y;E-VyB@`Y@W&x3^!PXfU_4iA>XJSm?C4n9m;&1TG! z>X7(BEqWzqnkdRDg&>E+!F5D(Nn17qOC%DA$A|cQ4vpa03oI1stV4&!bK~B^P!CW3>Hhb?ifVNXQ{9iXlMBDWR zRvgmdc5;~wqw|q9V~9-0?)5@mAnlDb*+$SwL30rjTV}>Blp2vU=@YJzFiIt&C=bIj@F8u2)*j@FUdxp#Z8%DiHa$t^4po8HL{g;PL|Q?m5@e+j79;7f z&-P~M)rAqbQ7xPNd9-8443JLd0?oeTh@YSoBB@4Oza zJDb$54eIMU^@BJ(JP14(ak*&yM7PV2?OxjucBY~8!nFEEw6*>PckT8&)BNfZ_h|xW zm!<8QQy@`1jLy$>xJz-O=gPS%iRWF}S7-lRnH*wdjdz`B$W4@;pP>$^UM=637g&4e zq31=6EB2ABV$;`stL8M8g_NA2WIc^7-Q5#Q7@dzg%F`;(l>B7Kmp{7Om5sDM{^OGF zC0Wy!((UPPyLz>7`PM~8{HF_=$_}wA+4DTV=nr2tb?(=+BfRyQ*Qn=p`iP#~-Uq>( z@$}As`u%5!Tk8Y%&Q_Qj>Y=9@&9yacz2xc3nf}KNrKoAFvGo~oD@|bUb7}6?dRq&{*BYWW&If7T2hr&v%s+^A@W>B&D)FHf{QWPdEd6U zEmo`b8=`(&PT$h|{r$6!^Y_%%wHI$X>p?Llk{Y8gyLWJ-f@KejN6Spe^oC} zKT<*7p4S?5a@NH=dO>JPJ}FJn%}R&2Wa^u@;dOM&ZH z&!623KIE2a%ai@0o0?jzEcK9fh+FW-gagG{afGnZ^kDB-QsbjU2`x& z=*l;5jt*tG9_+r^xG?YNp|FoivJFAw7>YNx@2FoYp7La-Pt0z1K&ci;V4XUUe_-#u zFyNe4034t2yLOD^^HJ5u%JPy|kNLZj3zcElvSVAUQ+%WQKO8;XulIi7R9nb}x8gK6 eeZeQmMLxh(?icHH&aoQr-$1QOLUzS1as31J#ddH2 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c6e3ba0ad07e2c4af0fbadb10c111d057b355957 GIT binary patch literal 1646 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 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 dc5a1fffd113cbf39ca4bc5cdade6aa04efb0f31..cb06e8fc892e03940211faac91013955c92c38a0 100644 GIT binary patch literal 1647 zcmaJ?Yfuws6pcYqK~NNJq*~X=D0E1&n|DG2l5B#Z1TmyTMyRsMF0ztj<7OezK~Yf< zXMCZB;xlC`MH#eEd{M+sm4c&K3R62Oh>u#KNJX&~tF@468De^vO=(P25|K{15E5g=poAF%bT(uaX21}1 z?V8J&g2C{?aifVc>Eq=V!p23sHe9#OL8BQAMYP+2STZpRFk`E5yORC*n+t3JN0sbk zksj1L)K~_-WF3hmtxGUk)@52`C_6d|P`KqZfeoV&z-_bIopQI5JatM_3L15%z)80rl zU2cH2BfjXBlAS?O4mpqKa=ExJ0hb_G@gSK@#sm30KA%HdaGY!H6yoOCoeM@8V9aSD zaR-GHcEHPsn29V($)+QHa|N42uYXHyca8`}OU82}4j#k>c{ZE(Uc=T-%7FbF#+cSl z<5~yCGhj|4i?q=BNMA4trnP&wBd;MHjeIGI(@8xJb3$Ip7gc2yhPyzL*%PB#rncgMy9j|m2Yc~A$(7~MA` zic*r=7Y8?eeM5h^AiT{+-8}pW?#msxXI`DqpuALj0P1nM@JY|L_Ma)wj zN4NDY-tULE{d)SaC$jXiz2;%=&;@7U@)avi&pohU&Xt;dpVyTSD2Q9)rZrP8N_Pra zQ_?PWapS@_t}-Xx zd~fg>TzvB0lR=|Bu7}Eg{@a{|KMppZF!uH;FC2-ElH*6toNCZc%X7zkR$5x6>nbTO zW|no&$SKC=eK6PB&=vej_2HqR&W2Qua{HEokRSdmL_#J;hxAk%`K773b%CLGSUJ;G ztV@XnOf6m&dZnZ@VWK7ePJ3hH){dSp+9pfCJRA(QCY_B9LSwrh^(9Ng;+_xXX)3n( zpMUCT+_5aUwY=XAdJMinvm*CTp8aj(j&fq3#Q1U6z)PQ@RBrMyW9lN$(yuIX*16kZ zX4BPKegi8`7Ch*`JD|SKVjVwzxhALcyze6Mwv=hw?ml*e|EB?g6D-xszAsBFoN%@! zPE)k{#<7S;K^1k3z-FJK$)9+PzlR-(+OSPq)(SJXTU>2rtnrs}{R6CLns&E9lg1;p zud&RAvx(f2&V!03bzM%>)c0=Jb0uBtovZ@PR52A;R>JIj)$>!RuK$In8}2*Svhrcw z?JhzXS9vskp+FhgSt0TGX72j=>A8C2-u*4<*qBQ$n<9Xh z*AjAlH=7kfB`1Hmo>=K>_le%)7;LWnd+I!C;8qo*T|wj*TpR}_c2%llkEf(~s{W{r zynnwc`=iIb+`Ane2mewvADWO~9pMk!Rv+-$>u8;6W#u>ZZra4a3(#p2;1jB}&Hn&W-EZ*# literal 1783 zcmV4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%S zrAb6VR9Fe+SILT6K@{~lfS2p^~cCY@#kBw*IRh}HXAf64j~1X%O$Et zqY+4X>SOmo?6r6f(HXC@!RshQHf!S;ZOFBQrOs}r4z-zS{kTZ@(qu?z1{XVKLmkT%; z41lp%47gY!UpcjR;vXI-EKGV`uZA}&1QjqzaMBen}O|i z8|d+PfW=}FNWB(|1>E6q0O_&v{IiflDPy75YPI-%AP@kOk47W#+uPe6^P0`(4kzKB zAm8G6JXYM?+@Ohjf~RZ!OT?YWWBBjD{dy*o*>5_DUtC-ql~d2>a|m^Rbb+Bz2uM#H z)o?_Bk+0EcKr)xhi4kD|@}B~=TC4&sl_crNoX+d!ntQ!o45Y_Dt-pfH?*X2F?$Z1F zdst>L7|xsO0cnj!gPwdo52Oc7E)%%?9-!g9UJunsBm!g(V5FnmxmYTdFk~AOwjXoK zm&qNt{2pN5X3X~ae8RH7IRfMv1@$Hp31~^BQozM4kuBx-0J9cPL$@m;B5yX&nEcMr zLP6YsUVb*@osGM8XBtl+!C(-h7+)9}PtJy0Lr%$RPp}O`r0|Cj9sqBqZ%@+Ubc)-r z$s{5fZ_T`0#^Z75A>a38I-N%U_wYBM{HI_)8`|x5SjKq3*v+*om&@p{*XuxfB$-Tt z^LEUca~$>Xj`?!3AKt96L^677-0{+jPy3~MwERINdNuo Z_&44(E_Dk_X+Hn}002ovPDHLkV1oR)aH0SJ 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 f105955553cb37fe129f1669bce88c5f8603542c..8edd5ed56729152d3581a0894d7207b7e6d1b5d1 100644 GIT binary patch literal 1660 zcmaJ?X;2eq7+!-X41!1*OBq}PIw_LuZZ49TppaxqqzMoLWbmjVS;#8MhU_9Ca;T#W z8g-QMpei!$jK!)r3W8Md7;CjyjzR^YDC1F;X~z){ss)d3IBb7VcV_pyp67ku?>%O> zC2He*y@S000Pt0-6gqnJ_q;P1^mq3ji;x~ZrIZFLnaHH_j1CNlF%uaWsJ0rjFdb$z z=jSwIQULJ6alL^uXugn`2rI|v!El^bJIw|F=~AcNXj+F+Uj@p&bbI&%!1V0Q5|CzhdJe{1g0O01^waZ~$9=-$@MSqqs#`A4!sc$B;>JhqgzJ>+`Q@{zaE z1*&2r`H|Qc>?KpL7aYaa_u>FuL;d-gOEV8|=ZD0JCsi~<2 z+wbp@)oXU`@;euu-Ml)VANszxso>>c4oj4{V(H~?vCyLGAFrdPGd;t@@y(APodG1s zwUGOzI6)M*JghnH>b2EPjk&y|#_jg0>k8f(w`zOANN@6Myf>%^I0+=@KRc3i9DmYy z;^(_tyec;ACi^YHFVWJfqK>V1)&%?4#=9TPIo8mzv-M48)vq~^T!sDmh!j@fUF5dB zX`?df?lkwGUJIbXuUfw8dvafSZ=h=q@mH%hE-hu~e4(#!ZbmXHw)`MkKCiSy{BBCI zNP4BWWzW>Q6qbsU=8)ufyqg9XuI|Tln`TVk;!h>5NUu)6aLzS9_Ui7I9_PxWH#2i? zF7mG~JnF?)ZQk5h+Ht3SiQ6as?}C1HdceYY2eef&ZP%_fK7ZjmJ1kT+hY`-$HqhPr z)b_o;Ocn}Wt*}+SdvF_e&8SP~9MXgb@JL?WT3@MQL(P8e(fEhD3#${fnmU2?K;e~| z6&Lp%jtFvh82BNxM*`bl)e_N{0=A(y7uO-b4D?em39Nb2`k&rE^lDfJ0`SlammMBR zF6eq2(V)NGyQ$xmHovmm!v73yw`Z4ER=$5+QtP8VD?A;5p1e41{gm_gLC!g!AV#{6 c;dR($;Ezv8eH(>O_xumkO0D8l?3&I00O#*>t^fc4 literal 1786 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 OUw~d~gb%4R3;zXJ?Qux} literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..098168d616901291362ea45be163d31173bc5029 GIT binary patch literal 1655 zcmaJ?drT8|9IvIz@Bt&tC?dn#(KsIVaeZG$h1zSSZpB&<2;lVSUFo6ib?sq`kIX0| zjNfRpWt)a?)EC3nBq=kxu1f8R&$ z3w`p+pgG}l7z{>`HVHA%V~Fn!WYXU~rDh2|ETYsIR0?ULoTwdVC^0ez2ecM67dPN2 zR`6*X9?xI|5JYMQm7)7sZX_*S)Q91^EH;|WV8kc5Y^ZS~P60W1E@4%GPa7|Q0D&pM zbg_=Fv#D@1k+j8*r))`1HE!8xgfTE-IS}uX(*`U!g#s?iCaXj4Qh-x-<@DUQ%>#ic z2(?iGzH%xlAWHdoB-xVVK7k@B{)5jo>&6tQ6|vSRGM*3kdEo z+6fy)kXFEF5zQgj#!MrVi79Kk>QZv&P;rzOe&R$)k3vKErcMoSP4rtN{I*& zYWNb7OalA4TC0OXtw!9hP0-rYT)`W;a+MuNDbk)wlAHWhpf{5g=`fQvK&1kr(+Mj^ zIvp{-486KAg4>DBIHs|a7GNsGa$*K~A)D_;rZ(0KlS3@qKnWseO>+Z;&uPvR=R2Iba#{i;k^t7^SBmKrn-9B zhIJ{u`jC!RoqaC=M8}${dQS`@C+}!<|eNV@SugArl7&A~GR*sL|fA?3Jb-Sf{ zvH=P^<@v~ym6f&Y+sxQ+78Nc?58dA~*CSw+R^JT2T~R|+1QyrDA6}&}aEou9yw#Px z`(eS|xixt=>MxZ8BU){qvnKe^h20%1C(obhYP-SS@r?OXMDo(T)oF3H`w~U5ljob5 zkrl>{pC1&$#o*bj>a;W6W$an$Yu_7T-W{Zv;DMga|H^V@@yk!%IdDAk zWN|`qAge9G)6h3`acJns_ht3LwbJ|sVP9MsR&F}B#+jWflC1uEbx?C6OIx_&{d<|w z^WAQ@CTcrY@+keR*ZcH9YqxFeTzC6`w+m|Ny77GN@ABcxVU1T=nWHab0te0w-}f|| zyj2Ca|H9q)ILZ!nBS-Ttbk;p7Q8io}%-{NW@#8&D#_w#9vBnpM&TYPLJN`K0L5Qbv z8(b7Kc+kD=Qm3ij{abYL$c7_5y%b8OO?(0LymiCH!O^60~qk)euRKPo(RjCrd{*|SAe*J75< z>Q7{<*8rvyf084Q#9*i=%p3A{A;65J)-6eM}Q~7_LAZGL))J@%uQPAB^@s+AHmiT50b}y8%Ka%5QK-qq`A3j{KV zNN_R0oNmTBhRUW>G3tzLI&n@DjZ;8FP!p}na8nc{x}i~%U6H!|!Mx<|_w_vQ^ZwqC ztI5tv9~(0@MxjuQwc7}XJSszPbcFn^t9R?Io=5NA8Q2xjxmDE zuuM49Yhm4-twdy(lw{@7C55zs0Zj{m)Br9U@URjE1UyB&4-Xi@A-lLd4{bvrFa(hb zjo?eC@-njliy*Q9rq-!w1VMllgBro~8Wc+gP#D1=*Z?803Px}Q#!(m;en44GWL&s| zunudD|3=p3B(yUd}hM=rxQ|I67nznw$f$4boX(O zI6f+E?xykg2TLm-J&3zm^~9+M}7e(PT2!5S3r9 zxa~U3p<8!!{Mp^T)7H?{J0o_qAP8%Z8I{q>?8FT_F1Yq~76gOA_nHm``&&<(=v(`4 z#XZ}ch*Qs=l_qTl>t2+d?>XeyGkx3}hp(nKv}v}+MmIU^Uj6jgC3`y;8Ma@%TI4#i z{M_;5$9Ly`f1tI$uP-ZUGkUPAcg*16pt5RoSB7~^(u)0)l3tXz{<7+3)B_2x`t?@9 zktC;0x2-Bz^7F_0mtKjWn^#wU5WVQeK;ZfF=gE^k{R-Stkq|rj?!`YI?b2-21z~C!chi1jF?OAuD9!wtf zUE`aizWw3Az`^VMrgL*jnYe87t;4XAS#ZB>;jF0LbWQecRm*kWcH>^cy6WT@S~1y1 z&G$ZrBS*!>#kH4}m)|+Pa%KXUxPHp#HTU27;(R^pUvw*S-zR6L{N2ePttpOgF-;#w w&8KD-&O5bIsq~e09-TbSh{h}H5}!aP6^r{T605JQZV&y7?PM0wY+hCQ4=3g{6aWAK literal 0 HcmV?d00001 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 318ddd90dfa0c74a773f1c4d8e1d23984099012e..522bffcad199a7f8e02eb3cb5b461a492ff45870 100644 GIT binary patch literal 1564 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 JPDHLkV1lBnVR8Tf 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 0000000000000000000000000000000000000000..b16df590f81742f1966d215cbcf35c7f94734fd9 GIT binary patch literal 1649 zcmaJ?eNfYO7>?i&s~{qGLxvh67QCZPQrgmXvgn+Sp67ku-}`a- zSg%_czzO3301%*Agc;Z|$ou;Hu-}qTZDMwq$*9tq6gq=(<4yudw9;k*)Y$P%!a(5G zyw&H3cmVJvNn<*bu3aLt&~`rV#qd3L2g?S4_ymsww`36vXeKgAN)G*b`~(D&RymX= z(jr=ilCY7B@|{FVzRqaL&$39ZP=W%C_sCcSc7nk{k3E}m$vkps#IB5;d$(Z-9Dy)d za_EIq=~_Lgq@4sP;){6}6h*-}DIXO{Vg;fYP=KH!7?Hv#!b4CQipT^AIQl@Wn$wyg zGhpgbEp{b`Yz*U&!LZxy=DTD0v@;V%rBW%32w;JL$0B&HJc_|RJjyk9%mPNZEKbtF zkTeB)E#hW6hmk|9r!THxcWAXQ4O6bsK(Qf%J-7o#`3P*cd+#-Zb}%{Y^N}%kjLgRF)k0n%>y2!wlVp>EXJfP_$4*d;29rbV3ExUuWm0jR6d?p6 zo`nq|k3fZ19&Q%K@kAo4R3yYDW(k3g*%^;7Nfe++ETU4WRRR=Mi4w(96jR0`BB3Zr zgko`HTn*)7aLPiAX_Kt>C>MJrSEh6lI72&)G@U(G1$rCJ&@LP80F_EGI*p{PwA(e` zo1qsM#t0{wOIX!T+76C{SVoQ`AB!nbwMdL%s0v|S7fNC!C?-)Qs>MRFKr9qMqg?Aa zVH@SD{+A20&cNRK_)oozZLvk@oxZGocJZ=*2#ReQC)*txe-BLt0H1OVmT2^JL>fA& zjs-!7n;yLJWC1w&K-r$4$ovTHo<}~ZosD}2K2-E>t5MY7pCe4(GCU!#lH};-2TTYn zE87`yDzvlzo9^|S2r}2*cTt-85kG`;dhUkAmX+9oMpl$YS;R z`{!42OJ^2sdAs(qIef)pld-0-a^RV1|Ighw|ISHi{jO}rne4twQ|;}FJHE|pqc@)J zt=m!5ezm#{=FY3`Jf1&bPG|@j9_kLB_hTu*eLAt=_08vQcXip#^9rWdJ=@1o;8kth zZzJzb5lodI+bP_sjno9&Qp*n9o3W;;d|{re{j29S2g8qlu2Vr*x{Udf(6yT%mS*2+ zT-RLk>tl0$=dA13iwZgKwdozR)N|NCj#R}C-M)vl3zu9mfgeu#f_kiQ`*GNgfWbIw3WM*8=jn%bSa?t3ubwimYbBO4>>cZC$IcTZ~v5Ar&4_R8PoUkpe@PE z#r)NKcegRy109olg477-YQw~0U%#tUwNW=3i_$I(e%%+)0w6Y3yYQ?dd{QBhd&{Q< zS((xF?(;$0wD#tb=neWw>vs7B8dG}*hq|Gafq?&3J+Sz#kY$DG$4r-nTENfTP^VN> zv_%vskb|L?vjxEy3v!18TBu{D!c~&~rGCM?vM%us`JeRLZEAgu0=p^zU*Mf3CA`_^ Rm-~5t0veSLt4mtB?jIHYa5ew{ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..21c4620b2dfa8d45295a3d3616c62391efa88823 GIT binary patch literal 1655 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..eb4dda1aac00802a3864906f3266dd06934a6c48 GIT binary patch literal 1657 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 K3T}u@F8BwAadDmi literal 1765 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 literal 1772 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

    cR3OC&ZN9^Xs2Jz2wbWq_Y%M1uZqZ+vcvz zxtjFISCeq7FW7mLR-uYTca~S0b}x+@Sde>7+t=CqLPrrP?d_x&?n!Iv-Ln46INLpr zKNToDx{!<-fCplOlX{y`t4JyAlWo|+Wz}1PEe8~HnwqOR8xs!gf)6e}cC_WuS{|9Z znM%de;>)5h?{HoV3^f%G{p^3xFbk@mx3i*uu!1@n_#$@!pW~WK*6i!P8>lEv>3tmR z+t8fbezc)3>riZ}E$TEkv(oh2!|%=&p))Ld_r6yPM!4J81oqcmT(|kfl*3nk>FDX| zdH#0Qk)QsCh2~f8m7cp^sEK*3#xgg(x?}3jx>ac(1si}Hhhu@bminw?nb{HLVBf?3 za(;Qqfhq2DYr0)0^q0>}daGsfhYQNyeD}dL%hKGHd*XLop1yi8<^mA7lH0m+*1YYZ OKeWYcBkPx~E&m59P)jxd literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2b0954a4b1b86720d6289bb00ff5bba430a46082 GIT binary patch literal 1572 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..336856eb4770597ecded3f64c617c6b8a474d4ee GIT binary patch literal 1650 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 O3oyd5`r4??dH(>yy=@Bs literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..710762e9c151abcf5e3282405f94a417c241f33f GIT binary patch literal 1655 zcmaJ?drT8|952X_A~1qxJ}`RJs$gjEuJrnn!b-1|B1I^m#X0rb9<)Gv<$9$BNrogc zB^t!35$0n?SDjNj%zO=XDvF>EK{9j*f}*0s2UC>H>D(2m+aJtJ?tZWD=kxi#ez|q2 zDGP!Frv)+?j9^tFs-eeF&l})Ne>YYc1@thLQfR4kBAaqxB+if-2ptZn%vcVt!7)Qo zK{Fo9V2m@FGPIOdoh;E4W-jKj;X2J$8qHwD#yhQ;J`bk=9iC&dNLf$oe`WzDgOs%d zQA29095p%SQ>l-Hcl(6)I)XCtQQcAQ20MVhHCU z96g;v4i57T98AX-auCEIM);UWC&FPb&scbY5)z68s7Rqy#K5ouks)F@K`xXjlt==c zfGE6JmBmJ37Cr9OHqqLnSm6h;5;=)u6hUSXM83BRQjG*f*o=e~kjsI{B_@l3aM+?e z6?zviij$^7+@K^0Gcb~3iD?Y^7*q}`5dn(A3W#={FNzVtbRaUNfG^+)_&nAq)-Xoe zMzMy;(3bH_Cv7g*v;`otLqF{DTS1nmJE?snN1!hr7D_ zi)NI?|HTfkyb#+1?%J}a?Lj{Kj_74aNBXq1ode?ZW13pDzv1iZNBxUdgkCIY-m>L> zPshq{qOX7l-R_UelfKp9p%t9Qt4aG@-%ap2`kT@2t}n-d$V<;kB&X8iIQMqmJ3qCm zzv$|VfeoDne`o^+nW|jJ@8F7)6<5mtE;+t;;zA~)@1ynN?TKuQ#d7C)0lMef)AZ=x zI(V_#uH3deQgbRZe1ktn6=u!c903mQNVz!o^*THgJP>sG;33z!+f7SzkMs=qd^OZZ zJzTJWub79Nmz*hJ|>yb+2?v0kjne$)zEgd=;6>v|~a%(`E zb$YA&u1&u^NgBAOYyZ)qpN4L41?-P_%#b)wd?NQM_ zU7z|Y(g4@8x5IN@eX?f%luG!#PsG~N@#=Qp)upS5AI3BM76g>;Y4UI0@wh*{dgy!| z)W`^O4*D1L%A+3mRm9!}Do%*po2rxjYkPwuhFXI}5V1eM}Q~7_LAZGL)*Q_QK-qq`23j{KV zNN_R2oNmUc^J~+o7&S&Voj9k7#wnm7sEJl(=oAHsZfMkGSEO!#FfY0LeLc_nyubJ3 z>T74T`4$D2(6`tcMU-1tSCk6DSM}KA@~7GH$|2 z+6J}cl>zifl8=C(Kp>zFXw-sO03mw49)eK_MO89F^5Tb@5uQz>SG}% z>laEyTF!@iMuaTK?(IThpzIB?K;-14P{pJ`mv~uTa*zg4K2b9qL+G{XdYDCV6)lHQ z#UdD^qFh+I3db2ej!`<7jzuDNhT>xwX0yOH%xbfu2x7%`xJhr*nf2+U*<`^HO@!;< z{Sw8~Y($%rwFkMHw{i)K$WoFZ<_SV^qzZC8f+YAof)B7*fZ2;Vo)H56IpGYwzA(v( z+)9?QiGmjx2rK*GFW&SI%gaq8%H45q+>@;eMbvu^(v%mxp7Lc!VPURv^|~JK zx;39-;}aA22X}vGZag!28jPzW=mK z935ktxqkG+{_^T4&ol3aLi254!?`Z8#%!uO2TfbIG;L$|UrP>l?A1(KYcv|`$m(yF z-ft9t|=sN7&J7v^6N3LaTYtd|qkKOHb_;gd^7w&7Hr{8kvTCw}+ zlJh4{oY<51+ErWGV5~83|3tmBy-VCa`KQO<6Nz!TwI4O1Te9!RJen}< zhwblLb*+#4`VQUT*Pl-*XA*L(kAERVBYQM{hyzm_;)*htgbY%$v9;c xHJh4NH0$&-rP5#Cer&=h1DdF;PksiSQY`4LO0K=SqBZ<4c388?M)UIOe*l_qH2DAk literal 0 HcmV?d00001 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 76e4f5f23af9638242283590bf936f06fca40bd6..d8159e9a97007c0e4fa43698b772963369e32b55 100644 GIT binary patch literal 1562 zcmaJ>c~BE~6i(I7Ajp7D>Y#OWU26p;+1(_YV)dWOiu$+y%=x6L2(4&b=Vm<=2e4(b}@b)-iAP6 z5W+21gD-+AFy#PR))*|Z3m*Y4Gh!azP6EZar%Ng?bwYprll3}?jEAb%nzX%bV(6)KpL zpdu?Tp@>3cq=+b$DMTnrs!$oBELBoS#LjShL@CqA6o^cx*GUmXhi0f08A?Pe(P^YQ zy;hSE;Tjn?M=(|@;+y7u4{>?mE4Y}}MG+k9vaqZ@QUy6SmSf#E)(L2}Kw>`4kgUg@ z6wc6#3*(fFUP_UA7wZ59CC2Ds+)HsSqDSR8j_6=MbeU4BL~x}}qnFF%61hwQ4spq0 zWEx$*7e^D1S1SaTx0RxEY6*u zeWgUm+z$L*b?Vl5;H`v>ceyf4Z*9ZMt}`*e^gS%>nF7bhE=cV9>E4)4_3_`{g2`3D z{@SCVw#wsQX8&lb%Rbyos(}_i5E-L)}S?bZ| z%7GSB)N8YZk5Bv&<3Bm|+>PG-`eSZiSNmVfq5kH(zTFR$={r`(ZX0o6oT4~hH&%GP zTJve3^^xy`ZyHAtm(tSir+O+YC#&ytylHBDNY>1V&TCCN-&PfsFd7dAgK>fF-L_FP zy2eB!ufJ`)++iQ^-G2twCj}hGZ?v?u9JHtOoZqT7e^OT!C2rhxto?APO{_aqEY25y zRP@F8Th(aAY34oYy1AyjHOWVBA2BA>tWP+NRd-OBLg|_W8c0y|HS$_T67kU6}13cUn2p z@NvWJLVr%%-KzoFlLgGxsnZnc zRzB|$ZfoA6ZJoEmvT8RxW=sA1am$O&Jy|g~chRiQRX2qDJEPafVl$^3P9}VIu(4!P mW>OW9gT7I`Zpo;DX(t8QErplA%fAVP|JFub7JeY3r0O3u`cRSp literal 1779 zcmV4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%S zp-DtRR9FesS4*o}F%Ztt;{z3+SEvuFhzfR95H~LC#Z?#5W!L^4|A;?8aO+BUR#C(% z6cM!>K?SY&>dkkUQ_tzuYgITlkbIeBGMP-0nMC;f;p>6Dr2T%+K~9GQn%OBN#_e{C zs?}-*52wCPx(vX@Hvy=*1%&6w7i_luBNSrscpQ~}zt38&mehD-nM$RY z&*y`bPNxI>)s`$KZ^5ZK91h2+u8Z1dGs*O)m_?mV+J*gII?co35WIfB|85qrSS-xr z@jxzF;(OyKXwA=nXf#TD5sAEqMnu15Ixt^Ya0_fU8*tO@dK^EnUaz6qcsvHiVlg0D z0>q64_kM%H08;ApI?%%20kuB^qA1-&^3j4Id8iu~tr*VtJroL|jV%6SEO}h*EkLJ{ zPHC^#gQooC-YXdl2G(da6c(`AY@ju_fULk|GGRP>yTx&G=i~|W zHw=H0uFJJQBOXI|qH9PV_Rr5qivKQ`3w)3BGa?Jny@Yx%1^seQA@R}g_rLue{|0vV V7}D#4RoMUl002ovPDHLkV1mhFX}tgd 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 1a2584411487f20bb5afa9c0ee6e627d1ecc7c33..6ea785b1c5eb9508ad9396ab96ed5444ac1a698a 100644 GIT binary patch literal 1581 zcmaJ>dr;GM9Pik4MP$hAZHR8h;5Ja&G-=b zb2+|`3zQ6Ay zpG`MUjvf|2Odt?M8#6E~KaL2!!U+DmVx>#L52HAJ4mX1?;Cwhk2-2K%J^>ghypXUG zxU;PII59~ec$p+^Ib4oun#Ms>5X76>M#`n|ZLh~R*HqLB1x!8^_SL4b5> z!EDqdHF~3)DZnJZhBrVF91i#?w};jEwP3$p4L=WULmSuF(*YgL5CAGsh#fEt14^|7MpZHdO$HDtj6za11WUzISOZHnh!hxjKwgb; z7HF)PVL*#tX+amqc{LE^^Z6t`nS^EvAy}M{O87?Xx3Kd zB_J!o(j|<8&qqN*n9RrS#X=zZj5%6P=tpwVp@bjG|68D#um%DgqAM8H^97>68i-)9DR*84T-DwM?ed%M@suLMN5N zh(63UdRPwkIEb(|$!iaA(_hHd=okX$XvRjf?X)65isAFf@Hu{ruut{}3L&X&Amc-s=Vv1%ilNBbH|Kx4SK-qLCKS z+Oj)DO8X`_+L(mpZZk|o8$aBgK2cm^>D+sdZt9I`^8L`%ZJ01+h$T6;M4;>2x!d>c+<9=w_f-wnB+;jj1^T$^Ro0{tr)$ zLZ(b*3u@Xmqhm*G`hj7K&Sy5)Bu6e`T8e!E3thk4+__+MWfoUi+G{9HjvAdjG*9oT z8XrUwPyKZM{+?wg=Y9i<4)p}uA1}D2sjaQO{?gbBuGiDC1kieHldPewS{N6JeYt#j zONF9y-dJXX0S;P&Qi&)VjVIdd-ZNr!zivV)vpY;CWN|66;pw7h|=w|5y|y^xbaE{g#RcR3DU zt`Z6Lmbl)BcW(z8NLhB_&HLpeUdg*$H8Nv^JtHFfR^QIX+3uLYxC5%#slniu=wEW| zvx9#f6$gj+jS#IhPagY+;a;n9$47ONuS7Go)Q__ar}y4oU$m~R@w`iZ?$U-1cBNs8 zvE+2~Doe7%M^!qjj@iy4-7US|TUV}Z?pV5_Xiu)O?+H*BY+K&5@lj9Owb**3SM0 A{{R30 literal 1783 zcmV4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%S zrAb6VR9FesSIvqVK@e_r{6R%mT|-oeA}SaN1jLKSxOmDza?DxC)A#^+1s_20>Pc@# zQN&dUB5HCFRM3cj+5U!_IFr>iIxwc8`|Ikisj2z8yJ}kZ@$Kh5dn&u#j)PS8dknK< zNQ#@y23?!Y1|)s5NAuh57V{R11xWLHNE$W*y*vDHkM3kL0h-Nb;BYtu-rd~+1AzdL znog&K?!DIpG#Cs(`r^f60eLc+0&OlMaQ;mP)SLm`L--RG+wmR_u~;mIPOsNv&1O>^ zys}Lulg#Jy!AiT`2L5V^j7dvy>>W<0^Vrl`AIabuv)F)*=RHZ zMx#+6F#+MqhDX1CzYi<5S`BDruYua{0YMN?BE@K(PK;1jezfdyzV5+b5M#vn_mLQJ zwP%2KBkj^|w+m1C&Q+@zjYd|l*JTXY?RLnTGaxxI9*-HXUauFGa)KHxv|24To6S(U z-9y`w18ThJ5*q^LZHL2w=R=_okaEN&MwQQS+o@Cv!=+LQxL%79SbGNOODP*tM5I3( zwQ@qE(ZH80v*F4AfowJ_u}R01sGQH|m|HHFk`C{XuT`DU`Ao@YZ|c{Zesc<6E>kvJ6psn4UIvc%(Y#w));@%rp3c=hF-^0}+z zQ}%RpHw=9ckISVuBc4Nep<_r9_Rq~o%>OQz3wpP6Ga?4)T*AGlhHkmXko4&G``_M< Ze*-*)7$%XsM9TmG002ovPDHLkV1lLvatQzc 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 0000000000000000000000000000000000000000..7aff84f02abd470dd19aa77a0d302022e7426371 GIT binary patch literal 1647 zcmaJ?drT8|950{)L0wUpk2U0|4nb|N*B8A?)zUkpN`VzrWK%qP2faY=%H3fLE-Hu) zrolNg+0X?T5qw09F!2F69B~AzB6BK{AtXLFok9erpfm1@;PwaelDpsQ^Z9$_uQRsesJo)dJd#!4In8Tq-TmqfOIWUG0=y5ug0E{*)oiGy^ zo|Dx^LLB)0ufFvZ@@-y7~r&JQmodg6OY=}@^kk#C~{By0}FVNMCf&KtLY5UhnE z?Hox{fZHOLN@sIAG4JV{E7aSX{P1+G9F`Gs zmBhk_P(naTT!N)4!zC&e4y%-yCRIZ~<8~(EtI%**sW#}*C{zJKs0v0PC=x-{dc7Wk z<&lPQu90FnjIt2p+9a<%#)aR>)fyNA<7g(4rZdN@Al^!IG;5{pfWZKSt|cj)cCcaY z486H9LNMee0*_*78!#GTEjfX_0x>{QDm8*YsEl`AsZnSkM1$(1)JnBnt(1$$xcCHN z8{?w?%LRF7KzDuor(VXl_#$*q-&Q}rc-ub&#WxMZcgL=B*D8U)^PmyYCpvG>H+P$F z#|y8v8<`pL!hk?UWkB}I>d6md&U#cI55KwKk5xm2wu!2y<6DcHo&?^})bB`IiI%5v z!+x6i!Ba+_dKaGi4wIQs;^IeeY>Ti zw*FjwL&FkL*s0|2^j1QbweCo1m9(I9OZ@rSX?*r8T%)(2BvxceD9||x0TKj10qp7aPnbnmYow2!_ul0NFyIdD@ zKYel@aOjn}`udzZJ@0$_!Uu$#YxcPw+(bK+yEiouOX}57?4G#n^(!VB3tF(=WNFEs z;$o%g26sHWyYb9$UXEz}r;ViRqIpV4)$DUmEAm8L9YaNyI1K4==tEnxruT?04IKY$ z-fMNp!=cJ(9GX$IaJz@ARx!PaI^FYUb$vqoadrRPY=Ojl(`bi(TCY~lUb^P(2X z5li4mK}u*qX4n4tB%7fCd|Ix3au@2`h<+T21^eXF3sO90)y%c~8x${o`{m)#>bt&e zwGgy%$?}hyEB&V(1E@kf3;@Qx_qv)KC4JAg-}0^^J!k(QHqNk~sqtGS*jm2r`%q!s zh7-#|p82oX;k;}J66R0!Iec`k?~cZ^7lH&rQLsnx>_L2KS^IrPPz3D+d-YQXnm=Dt zXUy-dc<)8xvDK6E1_#-~;DVr?9^OBns#fd54|`Wc-11sn{w!sihafa}*VDh22R6EY N0Y)?ysfpZ}{|}`1ZR-F4 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b3145ad9b9d039abe0fa05413993f990237f4eb1 GIT binary patch literal 1655 zcmaJ?eM}Q~7%s?=A~1qxeqi*dRl(5SUFnrxrLfX#rAQG9XmL)xwg)ZHUb$XrL6RYf zOo#??YLxjIU3E@jnE5r-sVIUv1j*1L2#O9JelSJJoX%a5y8XetGv5tWMiDbir4?E_jm)AQI7P5z22w`=Dl?uRVPXGq?wPqF?^@l%CK3im^h~u*XI&6pd+$P7Afax{ZAagWRP-} zAZkc$l@mr&LJ>uz6(y(Zi*og-ffE-C#5g640W(44fYY33u}Pd#&WK$JGk0%;9AE@O z=Sn&6oYJaO069q!0KymX^e_wq(I_8A#8Cny5)eQz0zxPVLp%tUz>q`$0izFxQKJl5 z5)Gyt)nZmsj*+IV5)gDa9DGL3-NW~*BL-mt|s8Ym`YpcA)(FdqWVX7{~D&^B5_{OiV;Xj^)r zl>jw_jkHsGCLdX|JY*(z9~N>08E+(uC=-(uJP#xFb~9n2RhX2+obU}Mg9H^tqYxoL zczPy;JOUOPc(_g&%|j3aiU@JBPE5caJ7e(?Q9LX}1omS0bkfoF=JslFai|L5h*2Nt=)>AQB2Vqg=xn zVH@Qt{+A0f&VcUv_)oofwwNMxPv2KRvv}V>goSAuis_DrS+91pSl;_om@M7d$<Eng55@Z;-9Zar_RhI8|}A?C;_e`z9`Av-&<-hi*^cS}c~k&-1ap*Po_E z_SV6R)pq69J>i*g1k$X2=5@ybS>9cg`RD|Dsam(!i zY37+NwfAiL?TJ$VHKlt}v=4_fx18>4eM}d1FQ*W8b4`CxnS8?+{MhK}K?|xI@u0e{ zJIBXu-RR0`nssU!Kl@g}$z{uzXTD^ghlX4S?}`>rnhp4$dHPoTI_LzHb5_BbD5TTc ze@UNb&#cFeUVUT+l5{MiB(*-(A6Fh z>DBeAw;~mAEqgmW=hY``4os)gKrl_D9diCEV4ErObCHWx`GD&&wT32BImw2Di1Lv|p$VRtbBJ1U44 zs)Mz*Qqc}jM&dEz2o(>&Vj0UIDpIR5QiK_gR;w@qRnR(i1H|?Z>dx%`uJ^t7{l53! zY?0BhVp`zbKo*NNO&6~=F(cda2KX}HFZbG{%rJ-6B-2TRm3G1;%8EsZG!)R;;dIo5 z!bnb5D;mRM`C*tjnNHRxC@h4X4|{C*F1v$4vsf|9Tn^Zhfzm)4nvUU0Zh!rcTmVCq z+_e(DK<`kYHY`4uM3Zt2W=n2{MUHTnEd^p+3dVsQrD4Ej&%`N(OUWJet6=7yZIBC$ zn$Q_a?ii_Ly%A6mBnn9QQl15ZARt=Kha@tQP_h^h3Lpt6kb{tbCx8@?Kp_+W;}4gK zMj}>)Nv$1^#jKQE8%;YDAn0^D`A!j^Ak#reE|-G>At)5`7z-YigVV5!hg0*s9@Hph zAu$Jy5jf!S2&WO*w35p(9lL_vq1V54j8o%6F_M8U*a1R(0cf{-?lo#n(I)g?8WUPm z<{SqKnox?!CM`@ptn<8JM!R_*{$vL~yt)V%AYmP)KGTe?NdX*pb1m-6OL zb45+v`MUc0C7h_!Dc{A~P-WJ-qoq~+g3dLy-StoB?9VHYY8yOoW#-Y8sD{XbSwF?J zzuMsF&OG!@djY#FBkAJFkx%k-M$I^Tf zcei$Oz<{6-O>uwARqMVFG{I*VUM`$9jGy_Ceeu_t$6FsyZF`dGuI%VEJ)Fw} zCqA3^MjG*Gs4^abW)v;l?$cHyn%;G{)Lmt=f0a@QgD9VwaFR@o7sw0b&K_`q<1 z)66?+2^}d&jSR``+CLwoGDJW?^Yu^eL46xFAIHJr0r|v&RG(SZa~;7d(aYa{c{H^8 zUSMkt1Z`Zh{G+DI;AzJJywD*B0NvjEU5(C?z8BkX`&VJUvwz^~X4uYF2d!dlE#LNi zB)fLQ$z>7GgIDZuT~URx^QQ(JIW{+NN5i>`VJtQ$+^2ZPdNngH&O7LD)_o|DR90rON0d{uME|{T7!$Pu=Fjip<^h?62ja Q4W3_sPGeA4$8F622mW1c9smFU literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fb80dadd44e1e38b4ec55df073c5059f2e23b64f GIT binary patch literal 1655 zcmaJ?Yfuws6b(p`AW#OK`oPg8Mg@mtcav;LB7w$iB0+)>K!dgFCRxY=$%f5_1Z1Yj zj8qsM#HypzM;&dnR-ricRn)2|f?5O_(IN_qyla^PPL| zY-v*B!a)CN{wx+NP!oshm@(M%`gt?ojTL4wGfbsbdOC&7pq&_nvlJ%MfCCx}mWk_d z%#@$oh)1(n;|L;EPwTY_G9zi>V;&p6%VJ~DELL=^%Z3@VaT+k-nS@o&c~<)~2Ovyx z&Qe4RX>Cf}OvDvXcuGNHs<9y3C^d0nV}NLvjB#MWX$){#a;$clOU@bcD`V!KZIA;D znb6sC&M+yxHVIIY6b>MKG0zCYFc2l>!-zyEKq3JF1S23M1!0H>!7><<2_RtP;V{uC zQ-(~3sz+imD>=tZ(>56hI-O3wQ^+T&Oc0hzr642#1p*#p!L#REY0Sm5+GmY=KykZ~ zB5X84S^K8TemDIB9oDwQO2MynvnOwy#?OxggY5(r;PSWTqU z9^uK*@P$#FBJyyPnj$U0ki;@#jPOEK39At?ioz<0p)QgLB`_*cDb!+-SRfWL)Q7RA zF=QLTs{R)XGGstcef+0hMz@$E^i1DZKeKq>Ke&}?8j9(Tb2oyWESC2^4XQ|WwR3e> z5^pC3zwBv0la~+@5(4OpMMaY~m*`sj5XIr2_7o~&-M629f3R=K=Z?=%)jQy^In+CB zcC|tAf+~J2IcB_+H-5^M>m92zo32WQrkLG>h2?H@33j$7VZ!vA4x)0-(_bp}T*Z-& z&ffeP#j$^JL(4BlcY(XN>}`3N!@VbY)z+3WEqPa;H08Li3hk}?di&$v#Vdm^^His&68%f`_WBKQ4*?R)+_d@#?R|?{|MU!Ry$sW=C~x2@Zr`eqJa$ogBk^uTiWI@uzzRbrMYiP@ig#Yz?DOX-RJK%EXz9D)#vrq zKo9+BDSHjDwsS#k=Zua!L9hMuZ-(XVZ_3ECCvQrqGas!yW-PC-Z#h>{)wd2{Cr?_F zU8C>l>YBOX$BLM&w$QnAW8w0;bKPl+nkM@lKlALJGf_mR zwBAUa=SZ(bkL0WmycLwh?l+@#^WqkT1boR2U+?q$?VXmJPiuE}T3SV30r3@Fw#eNY z5$VfdKTy1C_^!*dqJm29p;lSI; Zt60}WrGX8X+iN_(0*xvWty-|E_#Zhebl3m@ literal 0 HcmV?d00001 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 19b58516f820cf8abe762159a6d907eb6ce58add..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1849 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 literal 1772 zcmV4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%S znn^@KR9Fe+mr1LdF%*WK6(<})y;vs{EV>e^2=3Zlcir`8x^v^!rB-pMRTSr<2r7u; z)cS_^whFEG-o+=>MV_25C-LMYIVX{SeEaz%`}sQ_k7qppPA7bp{fSiE@As%03kJ7zdt@;qM)<>xDw$`qN#q%jLSMr`m3}P#TZNU^pBG>4}>o+)!ZT z>-BojER{;2UM7r_{uHQGVijnqTrMKijfvge%r*DSl6T8g zDus5+*PhJh^Jv#k9yJ@pvqj(-3Iyel=v0yK*N O0000+NK@#C}8Q30rLoLN&_@0X=n@cZd24# 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b0d6a0785a55f716620f07b89597c6dac35b4d64 GIT binary patch literal 1427 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFz024M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7p`n7grJkXw zg|U&Tj)IYap{c%srM{tou7RPIp@Ef=fdUjL0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LcpzHo!{ilG4o3^M(S!~%UoJp=vRT#&!Os*6j4QW4I;s=7F&vLIDI zD784hv?v)EA8E=k&A_n3ZxKi#&^1>6MVY`zNz8G{PcF?(%`5SAu~h=f=%r+)SUDLw zJDHl8xj0%lxw;w~0=;i!?&Rub=49;T?BZ-}3Nr(nUUO$BGYbn7H#cJ=U`)80T3R@} zSX!7{xSE<;0;2-1*E6rUBrz{J6=rWH&|ausSG;=c`5nj#hRcfg80}awJ5VJHN~wcKUV=9##Wiw+>nx*Vr-CPteco- zo~UbSYGSBsnV4v(Yhsz0VriLXVPR&Tssz=aLQdG}10AFfN+d{$1||edi6ACC3jjIr zOq7}j%sEBCEONWQub6>>akr<7V@SoVBhyazH8}{lIv#s|D8rzx<^O;G86DC>m0CWk z?IG(7Zl`4xt`yr2XJf+~JU&kA<(la%C@nK6TAhkvK+6 z=VzPBYvxO(`JWUhInX_IR`Q*z7IhV@2BCVlauXJ2Z@FFbboUDf!&is3FIYX9Jxej_ zd6rcA(sM#edyMxmee+YF^{gT5&@nm7*{L6{O2w_3o%Qul?0IJSzFqIFPS4<#_~|B7 zzq0e#y_Yema&O9Z+wbN*RS~v(<+;xPD^m8Y>3I>d$|pN6y*Z8V^-L4*zv7MGf8Vv% zt`{x1qIK2ln(Xm;=a>6GTbj0M-jAO(-=zOM&-i!Xdv=tkc*5DIMITQD3G=!|POJ2I qF8*)N{&VM@moE$}EnwZx#KW-KIQXVTQZy&1nDlh@b6Mw<&;$T)&lX4k literal 0 HcmV?d00001 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 2b386688912da2859f604676d3a724814ec0d65c..1f9c64cc8c648d85593e9994e95e885d05fd905d 100644 GIT binary patch literal 1619 zcmbVMeNfY89IgsOae&O52P&Gy+fJEnnnFL4wXn8nv^$Fx>a0wJ&;}^9NofO=iZG`W zD%Qbyn`0<`;O_k3<6v{TAp=Gog3h^3W#AYL6y|n{95)Vd>QV%^KRo|f?vnR?li&0F zp5Iqo+L$!~{)_!N98Q3GEf&kJfcKs|n|=Nra<`IQLK&5wiKA1P9KuF&H5dz_AK){EE5FdeHK9>)pFdr50f$0lm zz1fT@Xe@?L`(jTrFpXiXC6S zonv3+Ezy&RG16wrCXKj_wg6K(MorJqU=T@!a0*OtMF>K0`JzZZmoP+<+!O>(mLLQv z7V`;k8gKkRxr10ikhe+x(=;=$*iQ6rpN;@~csfKR#ZHcm9TBo-q>00sy-khDb&l@y zAF20*%NOhptB5OJ7#?`y#1a*jkQ)$m?Ddy@p+3Cj{l1QOeph1)7BAkgWuCu#bo^Lv zug{Lwn;UQUM|{_DYVz^LqRT%n^7nP)mDkfUt)?QCgwLI>uLWH)3k?>;(zg?3L= z#Xxq0>$Ux^b6a=?-}W|6Flc*J|Jc1h9xv^y*ZFX-?hEcJoU`|0RK>ezJP~!r=&(Lf zq<`SOyxfgriIS2WO0?vPUu2a=RQ~E@Uewru?}uEXa`(rVZWpyAm7MFLmT#@fTNLWX z9}QR~MTM<9LgxBN>aPaYhKxLTxRh+@xsti&QQy3@jyIZvu5HiHuU}+r)LH8E`T^?f z!0964FL`-+3uMcJ5;y)j>qgHVrhe>)G!L?G@{}&z(~{KuRmD*An(z;uRoNH9k{<8i z-5MX}jn`6_ZVT$Jrw8wEzjX<@y0x~`)%sgWXRBFsx}Vc!lP)VOS|!aw!)_E`F3oH^ z7+;N>&))QCS7M*XS4$H!{kk!*WklhdUr_K_tnQApaqy5|#uxF`MQ(iO&t_5A!okY7 zOAe=#!P(^(l3TjTs?*oQ>w1TyjT>q^2TF(RnrigT!K9$l)X?~oy8e|7TWSiC`+gmx zftz=wYcm4w=jXn3baz7!FC#BXP<#P=ux(uTO8@Z4Tx065EyRo!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p z@? z%?4vkxwAVHLm2c}fIIiTB*us_hUh(}s>lgq@QBfC*L$&b1waacl=9A6FTwepwf?Tx z&%ej2D#3X!&fb+jl5!}gv_*a0y6CXhZGhistQIsZwR7_sVYPS-?o^#W;`B~Vr11cw9N`rRj4X9 z134D-lj)RtHl;az)dNR?9Kh#DP8n1%Vn}2l5h94voumVnP%&E4+R5`NXna6~cAT&BYvB3t!*A&(ZB$gK~f;kDsy$Ew&a`=W~AjyWi{(GpA52=A1*V zMRm)lX0hPKo436D{y9F5h`|^0=R`Fg?L7BjCY9x9zxerZ$HQ+Q>;P{Um&2X_YHa}^ zT@(ORRS6YU<;S;gv0g4|&t3sS7G<$m7v@eT!*dVj#miT$SIwYgfB#?ycnsl#&;%&} zjIBs14GE;KYaTs%#Pa+t?^Z2M)6g{Mc-P|F4a>`ANjU9>EK1Ben7xV;-VcW9EwEaysOuW%954UzcbdyP{5SIGuaAf4#o3!37XXMcB@g5j5Crc% zv%4oWr>}6{gUAOT|1UDTdom!%DUegb=A2P$5iK0>-gEfH=Xmd#?(gGPD{NJhV`SqT z)*5V86THKFPgPaJdkCdwj3*OvjKmbFZG{V-5F(?xrropy2}QNkf7ry@2zX3RZ zamuHZ&wu&=b&kw7t=p6mDFhIPzX6!PJNu-{_m7Tot5xsSqBCbyRS~s_K=1+cUM2gK z;+-SJhybFNobxslrj!v8nv07c48Zi@faC)?7oBP?di6j`aR|j9LRRy|2No_I=o$%Q z48e!NXP;X3_HVLybJqQA*SuJ3iNVvZTX_4HoH9T9`YWWWFh+7@SfoOuwRe&h~Ae(6oUsTA8g#3(|6GVB zpM8|C?>+np%VtUNffORBqM~5U2WM?5zd}xlOeV)f_FEr%=Qun(gR?*ct;yOvGYxQGfv)pFE zz8_F)iwpXY5EVp)-!7K?62q?!r;O?m^r)?6G#*oRgJZ3W4LxrL=C7cgL4T$OhAa*UhijZ<1 z5>VJ|$T{tDpoHO^*!}6Bj*j`W3YkQ3j`?PTRtC$Mn4np%uJMOKJCfDontD3LwJo-; z$`F%t0oVD#*lOF5^kFCnH;#|UIg?``I?sAB$2-r><6~A=>Vz5tDup+FvDs`$Ia5t0 zO4a4hINDrGjbb;aSy z@&A1|9XK%WrlIS?>;3AuUaygk;j`Hc-?l6+FCph4HTPD%I_me|^wPI~{{bxVm?jhF RZCwBW002ovPDHLkV1gv8Azc6f 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 ad6cfc582c3a344c93f984c203ceb11a23cb479e..7e48f708de8f5d1c73eb66c991c5c18794f3b7dd 100644 GIT binary patch literal 1963 zcmbVNYg7|w8V(@B%7V}Z6qPy+SlikpGYJVyAf)65s7M6LO|~#eCJ;z6xlACS9JLEB zD9R<;m1x{jqb-%=djW@AJIR zdplDo-V*A(Y}GOniR2s}CWs&Y7l7#iUSffRiWmP$J#o{ zfI`M0$1x+o2n`=iQ-tN{(CC~kG18n2DJ&y%gMlC;n;=l3I06_|O0}MC11+tlt8rLi#Tz}X*jN7(`Z>)S=1~B71O2CAQ*;eAe~01QwR%+K3k0=Mv7YR zv&bMo^-`TegDWsKU}Z!km;vXI38gPWP-!9}UJ|SI3yC69Ml&KB8bk$YDwQ>^d22l$ zh5jz%mDc*0Yz<0_LiLzICnf43_gMrJx%*>BRzpG!J5r}0ih?KwnAD&`)p)poLngjZ zWeORa2l07KKb9aQfF~3(AR>IaKTjxP@fbY5fX`qqa=Z#lhe1AH!1EIcg#ri?GGQSM z2QU~QB&74`d>(HR8?M&lh+2v+`c)8q7qE;!#IpH16u~iF42CHeJ3yR<;g~)R(*S(_ ze8qvc;uLBbmZg8&TA~*b3s9XR6P1Z{mUX@P3a9h4{P)p`Kp}&2Rpr$L4%@_sGNhl$7h6YRX1B z+S)egk3MT@ZC!T#=FN}V&1UnHsUUMsg@aS0bHS1f))Bk@iYSNSEAJ&Z$271T^PXy) zN-W^+6Yfp}J1^{mU1q=bE->}<^pq%-N>XiY?cLV}VRfm^v9Ynh;NW2C#07a%a-B>Y zXuQ0O873$Z_y3vU&!25RaCpb6_S}q&eda^uJ~PXA*m@5%ojkc`_Q;VVCxTsHKgGRa z`)_91w;tlI?G6&)j)3nl-M@eR{e7d-k*EiOWkY#y@=yz*X;U8?v~(ndelDVpC4bi9WS~{ceWIkgxyZ@J$va= z(W87qb649`(FNI0hE`w`cdl;^Dkw|sO%8MVyz%Kbk$4l9%vk}S^zQz0)PBVWmD-j> z`-;lS+BjX`&q*D*rpskKbE_)8aAN1=O+!)L_NJkCx|!>7zuvy6V3n8LWxHe3Irl<0 z(XrcwKO`k4emK(0tvG<@Bk{V(n!_8uJ{LFBFoW$2ymxzB=V*0>;ht?%L4S!P#C31F zS?Qj?fqn2&T+xFQHIK8!`o|tV=Ko}`U0V7<%d@fi?jJVB{w=ffp!V5sm+xd=eT^G5 z&{^3fy)iXDi-^gs+Kb1_Y%pDy{oNRrV-Z0ny>7nO8ek!|s=GdXUkin}} z+b(`p<6C6-WvqAmM$xT2w{4LdXdS0az0-3$PlGis^3>FcGf6`hiz&D8GZv}kOygWX zwW_0ZAbM(e_3Y%XByn>TgY(%{PIl?PraPju>c#>SpSEI<}h6}d{j`LDJ{4dACC-eXS literal 4073 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7c6fb4f165af3c9f3f7dfb826a9aa1b935a9976f GIT binary patch literal 1532 zcmbVMeNfY891d)pjuWQ0V>cBgi*iF}o21{#D79^ZR9EDnV7)msZBhudNljB*m>+E1 z@ar}dhaf0A(cw+h-KJAfL_EETo1&sJbl!o2JIDF8E2p>NwiKz`AD(|Kcgg#{$@Bbv z&+jX1vohzz#ZHO^03gniL1arS7{13wOV8oA?lnrwM3Jf9HhK3Do0?CCmh!Z+9zf+|H^nF+Gi{A zGH^EILm<&MHYNew<CsjHO#Ufk_ z=MyQ;$wd6JlHXCT1bqn?Hwz3U@`8=$-H{H+D&$4pSIB!ovw5WAV9ElPqxpbuMz}=J zA|@DtUB=Mq0`CDwa*VSt(11{sL#Nd-GNnqPlR332Ooma6O6I~aROxWih>LPSqkQ`R z)Buv&R#U zPC3R##Y890PFb|!Ny3Swx0eF1C2h1%|LFu>JLkGg_p9capYW;? z)ZVz4ck$5ii;ohQRjj$4Tw7I{7=N&NaHz#SH@`jU=+8q*yQ^%6R?gjbE8yBwrc_h@ z9c9(cmi%_tcc@`s-j7RqO1GYU)6MO%e0!@eX?-*GO-0F(#)jeK17)?pXAWPeziT+X zQB9<-gZkEY^}JVq{#Ja^pkZI)`14nbk|*@H(5<_!?f^~{I-ZucYIKu6+m+VaaJi&6 z^ykyn1+g(y)BJa*^?uk9Ulp<+vhb=M$d z@A`CR^|^U9P2E+Kzi5xQj=8aFjj^-A(c-xL+gHcm$k#>X_m{N{%!tjZ7`%AcK5JZN zQ^Cj>nM2Y|a literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7faf82984650bb2d2e4a3e16433dc5160222cb58 GIT binary patch literal 1622 zcmbVMeNfY89Ioh`V{+<^F?FJ`qN30y=?5g0R%jcfr>zJG3_Ue%17y-9Cc%~-sDndq zL-4lwF;uwSP^RL?oFXz22cn!*{Dj*;nP1zL$xWPyfS@i#VEe=KkL50T-#7U^&-44t z=h3D`KHgKkMIw=pAxa-3tbpep=OsJ`CjV6;EK_(ak&mU5c{|P$q6jN(CIEvCPa$Fm z+?uiO5)md6ji$)BL_X2DL}j6EQru%Bb=VjIEfR$-bTGJOEx`k3B88;X;?6VY!~khk zixZSa$jIo3R5HrR60uHGoW;4;f?CB3H9(j{B@oyM9tRw@G>TI>)Z#&2m9Y1`2F1Xj z3BOh?e(hAEF&fa(ECDE`ArcD=!$2r1g_Ve0rVIvT5Ud0t6oerO1gl_3C4+#WODw3d z)?`(TK5|G)IH|>{JkO{=&~CR&?Q$v2rhqVtq97y#Wip9iA>lG89(PD6Zq_h^p5QDj z$?zmi0Uk!&OsDf|vEb?J5NwRmI6_QuLx~bn20CyCgryK@vw7kgwC4C2;$Ju3XwAiC zFa#JwaCACr5$cgVYZxr#?(ISzL%|!>QkE2of~VNS)mT^6^Xny81xZwj@GK3pU|!0 zzPV?!Tf9Gw3ZFkt3HHGQ8*4sRL@l2kuyf4li!188(DTdtzfe!8f7V@|b*1g%vrJ7z zuojcC6+MC_Z zt6K^-I5Z#aKKa7kQFcAyte3g*`OByK7-;fjV_lJR6Nq-{>oU%Fx$BsNEOzo4|Ncwya|Jp(^v2DSIy#19@jN;dS|!)E`SH|<)*ZERG-0o7Am#jRR* zZ~xvT)3wt9eQss`&4HSt+deCmWhDXm5A>T441n2_cDR-hkzY-yl%M#$&njDXdez)E zw|K_dw5YFh^PJ$|?Uyux?ybFCk?H%3+ADr}n8f>T`ATWNf!&@J)YqVBz5hzr h>Uw@Ssb=-4v7+GmT~Vd+9s50hdIM(CAJwkO{s&)IedYiF literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..adcdb406d028b0d38438504ec719e5b7955a7b33 GIT binary patch literal 1599 zcmbVMeNfY89PWt@uNzFJPQb4$cst!_lk_{GEk~Q8)wLpY+Nn&^Hl+oc#5B-Q@r&MY z(@oFm>D?T#*_#tR+;H1*4uxY=5kGKlV>&k+@-cDhz}u8lL6#zQ`@{2(;;pc-BylD?mqWX`0Kt-?3>WPn0ke8UQaZ4|p$P=M zE*-c`X@M<_k@R>M1X(gCXtg|;WC2=AM0;o|bqSVM`%2YrGBT5KHAq1Ad2!_Cz3g zXbdKk91+5osSTz~l|gPW;zqeL%JC$u3dw+RWri`+WWo`|q(n7nra_~SD`C_qQ=2qV zteNt21mz^7e!YUcP{D2m7(P8aMZ9N-w< z^?z~)34)+Vll-S?qOXKbjBFo|fN*#`L?k6l4l9hv<&?aKBGI^fGoE4NFCX2tsNj{1 zDHUsvs}oObbnSH}y!6MMHO%x2HQRE>m-pG!pmpWOxn1$&l9$9f%1q(GUmvvA^__Vu zt*&q&@N>t~>XGyj^z}Bw$DNGkL+huVgM;-SUA!?>TWKxVS1%s8c5VK5z3lZFfAiY% zmhL43W%?UwRQ-zEgZ&L#W0P3(%R7=2>O#$VSxiGm!H)yZ#^3rU46kdFwyfpXmz7=m zrjtE#iqu!X8p@hGhu6$VT^^Qg{&u>m&-!BNCglgH>Il`gWt^#|hzV*J`r z;{}iHb9<_|q#<`vtzNGeH#Rnk?*?_bo2DL`)sPmm6Pyf)ySnZKC6|g+6LM;HK8&07 zNw#@lcsLi{bFM(I+Hf&?tB$Lf-hXTFMOc=K;E%8>lsI7dqMGy&s0Yy zwu9T>K3V9fT{`(DhaD&iU&z|!o~;ZdG~A5|Vl$^qOPFS_u_>-_SnX=0v!zo%^W6t` zm&(NNht8j0+Bq6;r)(_TPw|ylRHXowf42~!Ql7(-Q%nNEJ^E4j^AWS zS>85#Xz+4#(XD+w8?1-zsfxY5?7YM+C%*jUtXtm9Yo(e>>m4n@9xj|8UWh)6#I|(T zRZZ0pJuFJX$?xHglDezR{xi3yT#IKK-Ytp|ooOX@-@lGhkzcym LWW^5|^2+}K{=8#` literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1f1cca0561307a4aed01138b2a8d5d1f52d0a4f0 GIT binary patch literal 2055 zcmbVNYg7|w8V*nq5d;-b*n>`|sDLJu2?-=A5lALTD4_(Aq6d^*29ioLF_}mbKoqRV zt@Q@TVi!&^5=Br%iwDrGi-@<1f|doUMbH*4te2`tS=OB(*#7YJN9UYxzRSGN`#$e& zzWkWzHO`J+jwBMvSrCE55;I^O4z|Smzl%q!iOCb^C*W(b6g*w5K}lgUOo9Rer8pIh zMa441mMds5iDaiz#3kSf!YH;BQ&PlM8H!%1CeS2OaEM+lmTpFIK!Td8k|wVbq{&jnQ#Z<7O#K28OH#g7s`dffB{VfL@uV(z5j&a7r(mSX+-F z5SS9dH*>(Zq!NTN01wlk0D}@pmclR$1hFVEgBd_$tO96Mm;q5)5KJXgVKz)<)2P7o z0}|FWvJ`eK5BVXYrcfcJ((2cgv=)y= zf2Z+YX>FWAjY6@g7Sm~@L_ShJngJ8B`*TB9L4pnYQ;mX1iZ~6yq&g+4!UYHiB)(8& z3K^RV^SBIpAQHyp^7#QU;XW;h%MTCa25@-@FMu(l<9%2rkH>`R+@NqiAAw;$gBi#S zXR;XKFpn8X=Q9IlumY797ptV`j9mp`cN!b`r&u;mgNkuX6Nh1GGZhdc$8bz5$J79i zHj|F#*n7SV=wm-S{solvP=Aw?Fk1O}IB-Pi|l^+aq zThvKvb-9|ev}#iHeB#=U-OLRqy2h@?L!p+v&TWeQU%y$X7kczE>wfcb7>7jKgGks9ZtLVB4^Gq%u?(bb+XMCX;!jo|3#DUV8O$@E?X0@V0%?^T`2p*$2EIPhg()`Dx|-P52AV2o<6#IJhKOUoR`44PQ%)oPy+h53_Sv%r({>(3*VrzsA537-svYlBMTz2b<;z@F_?P9B+?kun@hU#T z*>-f*P{gSNh4ilLRI|%jiv?T%U`wsZ=SOpwvHj7#7j4107Y6Fj|5TT@sP@{!9Nq^d zeixdsiZ%Z2FaM>8^)p_5?)iGqnPPj#zog*Sv*X>`Rmp?9mwXdieq6nGJt8 zHnd)JUz#_xwP2m_`XNwz!>;sj{&Uxrrh;Mj#+Rg`1pg9z{l%S^62I6_FSEIgo2v#u zbIyTh*}3wu`)$6_8@{r1&81fe8&60Y66)eju1YvA*V8 za)D2!C_cmH*NCV~9R2!d{m{Owtjud{$;jM%3rnx@j%;5DZu;c(MCIM?`KvRx z4xDX1-(0&6Q#aa}Q(Q$c%hJ&Tw?M~B^%6-A0MkJIv=ua;<5>x({2F#!e{xfLwkK~p8P=B(~*2e&OdsL zioo^b`ZLHzSwwQ-@O87{?4WCYKmqdz0E? zS*^SLardp=U6z`C;QqEfodZ{zbj$n86HoN~l9HviEeaRO&X!(#czk~9f0jNaBa&xM zr|!5(NF|4Reku2UIWhTYj;OZ$bFEHi+Jd5}u{kO6-~>|IJzA%@?^HFfEyEwz>h}ixyd>I2beED<^TWy literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..90acd0d5391f17d3bb9ca3d6fd14f78d8d55c807 GIT binary patch literal 1538 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 FCIIFWKnMT; literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6c7dd2f7947d20190d3af98e56619d9d8ea4fa2b GIT binary patch literal 1427 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFz024M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7p`n7grJkXw zg|U&Tj)IYap{c%srM{tou7RPIp@Ef=fdUjL0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LcpzHo!{ilG4o3^M(S!~%UoJp=vRT#&!Os*6j4QW4I;s=7F&vLIDI zD784hv?v)EA8E=k&A_n3ZxKi#&^1>6MVY`zNz8G{PcF?(%`5SAu~h=f=%r+)SUDLw zJDHl8xj0%lxw;w~0=;i!?&Rub=49;T?BZ-}3Nr(nUN>_$R|8ikQ#WHnS3^TrQzug= zS4#^QLq}(43nw#I6PRAlyyB9?yyR4vy_rCJp?Xd5>a}t%N=+=uFAB-e&w-_YfQiJ`7#Vxpn0iDhDnrDd9hg_(J(5>$T*Ibo*{bdWwMksu`+m=G`}f|&3u z0OY_kQEDDA=M(|6h|^nRdFb$w9!?@!0c283uJN|Nr~X=#Unw z)bden4_Rk$J1whlr3mkx+p+wQZod_C4U{?F7JFTi?{LBlmClD*TZ{hG*!4*iu6h6a zWokWZ-l8%6#7S4mV}{-49=Xof>g{Yw`6Q&C{16v*Q}~H12*p zlQsOnyrkcM?`_DGx|BWZ;-<$xQp8_xd|USV%chPW^CIDsI*6tgnY+&oj&S?Rsx@dIqn= zPdAzRm7T}#y^KkfdsDXCemC!_im=@)&vpJ^k+N@1&x?>%KG|{U&1rnEXPS8b6>t3h z`>wTiy=cJ|t*c(wWRK4~zuf=X(zH$Ue*CQYCjIAm#=isKv!gu46V5&@`gkHpnAa_G tTBXNx@qc^vpF8iod|_B=0qcGy9){J%!8a|EqB%juq^GN&%Q~loCIB?`7c>9> literal 0 HcmV?d00001 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 6c5f0ea73b397b818b083b83890d128169c1e416..d2796d325b1cf66bf7a8804edf22480cd411adcf 100644 GIT binary patch literal 1528 zcmbVMdrT8|9PbbmnPzd01sw^uBRU_nch^#SccUfkU8^LtJQYT!>$UeQoY=c^J#2Z* z7&j+4$FfA!Wio;|<0DfUB4OePVRIO!fRCy8fQ_(4Bdf~jKWX_Q?1()PwM4<f&)Ow zZYB?80ER6tyZ{mvia9)&l_TX?Q%I-aRxtq^mEY}=(F#RklHbEP3xEVUKpw~I;gPeg zFvPKXI9qE)tsV;Gb8AaPkXd5Oa+VZ02^LN=K#6`*CU66Zf&A{xyqEOr;b~q{-UnVI zFf?r<73kp^Q90H$h!R8qX;leICx&5=j!;L24A!A}E1is1n6U3?7seBrhAm$+$K@bS4M$~GhY@zfP^Ah7%^4{1W0}Z@R zk@HBLz(WB>#vv3*dRSIE6N1}gwLT-}y|amuQ-=5%4}z&s#O)5mHEr#cGQhtwo@?#R zD)s;*19*iZ(J9x%6&nQ0xqGprfT660Ocgn~D9mPBa2B}%FD27@SpK47IhHhGlt~+( zKpSzB*{s3j@YOn#*^*$=m?)akXoDQj!&-DGX0i~pMS~eJ%&a8{Gir?2(nhTs$0>>q zVv~8V#PCiK^vlV9XR*`^u_Pq|MiRs2coFyibE^1Ii3}K-j#t8 z%|uKCk=p`Tizv9E=^T^Xb2R8!z-my3M#;EzjFQmCV@iTyFl9W!ums`4@dO=!XYuU+ z$sHmKLIO?lpQZ`Ek~=Z5eKrE};n@%YUY;CL9+BUd*JUXbAy6`H%<}iP>}@_KrZ3o` zzmz!`7yde2US561ur1XMeu=$pqC*S6FaG(BsgYMdm>MEh?k(-Od7_Ga#nyD|(O+ei z1K}G_X196pIDczj*y^fXXX*#Wju_hPX`c9{^9?nr#@0S0Dm?VHCx(5>@Q=mjxTuI7 zdq%ptKJ91Ki(2mRWM$IOj{~(S$FCi$q~S$vWBvyf+dBsj?(YAiB5UUCnFs7`?nl9xV078 z-#Hk%uk$NAS$&>q%&qt)WjW=m&k4U=ebKeO+P3DJb9i_g1}MpKA5fM>d&v@TSxLHdP^GC`S9q6(d}1? z!fao!zv8cT;nCk6pNM(8^ZF*oZMZ4qw{?-9jh7h^yrwG&ez`ZgtYL2YTvx+8ZTF=6 z6(RWffid6JpE~;|4X4}_y_4H+((ss}?%nKB-^j$1r-S*CHwyLD2C;pU=V|H6;)kkT zmbw_Mv87|@CzCqghT(zrqpRk%%*D0J%mp!>*DqZ@Kkv|T{kJ^_O3qC!0+*Kk`Qe=! n^w(?b_$hr|x#74>@OPwLv3N;(5!bU@3jB+c%{Kak$-ey`#_L9D delta 1373 zcmV-j1)}=+3*`!s8Gi-<0047(dh`GQ1uRKKK~#9!#h2?+8%Gd@_eUJ6FbF7J_96+b z1V|txag&I+2xDX63r@=Ava9?Gd6+y@o@~-z@Ai6txC&xY{?Xdq+1Wm4x=;6vf^xa+ zuu7%ksjYeU$d`?oYtAFn>4At}-G5i{Cz|a2a zi5nbGvg`OruY1!Iw|jK--SNy0bqpI$#`ng|?v9x+B>+<vqYIxb05SKruh&8;ncZg#sa?f2cfTy<=t zqwl#kHaA_X*MHOZt(_g$-raQ@!=dX*G`7cMecn1aP-C1q5Kv4>X;2daqvK;81Po`B zS1;Y<#S3?Q^-67abE9_g;l`c6d*{xsuif$B7eD)!m_wwUMcm4INn}7M@ zu0DOz_owr@+uR!!1i)nR!Md!Pyb?|Ww{SnT)kL5~gnxT55wH?KK;(!pUjFfW_JM?F zZEek!N+q|nw4@dU!Gnx%Q%PgDyXAJp=lEb)5ZD}z^d3wlU>YDSyd-o?SY26B(8a|? zx3IAAU~scaxssFUy3wGoK0{e77^VRwKwb6^4|T97$|Pq@UMVfR(z2}l`SVAE--<-5 zrID}*bboU!Fe4FuK(inp!M`)8;BTPrpKV1cPs;1kfDO*V^kds};UE59O~&R|d& zT7My&sG2L^VY-ug)?}Rb?5uL%pH9`+EdpqOgM<-a>m9Sxi5O3$B7B?5PPZp1GQ;8M z{M_wdUh0)+-zaP5;qOqi#WQ6H7MNNE2%)!^v0}f6#6-HG5jcMPwlE*q3~)0@_~sM9 zc;-w17MMyPj3sajYZ0$K?>|Za*Kd}AR#=zrh$?uhkube znCBZ5H6Dt!X*6O{esAM-+kEn-rl7KNB_UBE1)RF96)S<&)zyLkC03J<*D6(cj zk39l*|12i}5a6VNNU+gyC}olC1%F^_E2dRi88U&7{}d;X2pj8~Kg++Lg5XXB{PC>o zbrjgNKqMgn0qX-)pc1e$R1M^RHi$$`1gZ5d?K4i(2aAwi!luLFgYYW>x$Q5?&E#-G!IfdAJTYc`vDtxJwNGHFA0Gc)F+UfvHR>^l{( zJaZG%Q-e|yQz{EjrrIztFz024M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7p`n7grJkXw zg|U&Tj)IYap{c%srM{tou7RPIp@Ef=fdUjL0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LcpzHo!{ilG4o3^M(S!~%UoJp=vRT#&!Os*6j4QW4I;s=7F&vLIDI zD784hv?v)EA8E=k&A_n3ZxKi#&^1>6MVY`zNz8G{PcF?(%`5SAu~h=f=%r+)SUDLw zJDHl8xj0%lxw;w~0=;i!?&Rub=49;T?BZ-}3Nr(nUPm({BV#8sXE$R*7ehl=U@SNS z4RSTLbT)A`H+Qsz>GjMjE=kNwPKDW<3A7ig*9os)E9aur#FG4?ko^1{SPBTp$S=t+ z&d4uNaCQdAxPnG_W?o8ud9fxaiXc9ANiE7OOHFYr%Fk5*hp|;A7B`ruq^1}fBpK@_ zrkN+|TAG>|>RKiy8tR%@CZ%cKSdE>4OppQlfzg0aGG~3C{vR z4m=a3<^gj~5ipB(f(-tcXpAO z9m1|hzE@{GJ26+u==3(Rsea2Z?cDyVtaQ=Ej42)}i!_YtcgCDaH5 zho622J05zi-PkzS%5=7G>i^*12huOk-@d@XRinjYKmUu}HmbTygFKDrCppv|JSq|M zujSJz$M6+=bv-xVUTH2};Z?!*r0@UymnB*IZok!9zQHm4LjsTVD%W*^vf5W(f8D>m z$@sx(g|%0+PA#_Qtoi?O_jT>A?NMvP{+RIG>waN#@5Gw_;!W(gew?paa{vE9$r^40 ZhSPhK|4ST-_Pg! z`M$b0IcZI3(2^jDL=tLTt4|SEzAcaCETFC5$tU$VCtUc1lpr`E? zp0NoG#{ynPGMg(9)S#$zIs~gNF>#idwa+9biW7KO~ybCv=t%?d`n8Wg|CDTX4nh)#<| z$LKY&T7v;a#PAhLtsx;si)wXx9g6ul=E5qXH5jVI;RF;hAcz6eAkm0U7mFhpqSF{q zr4MUl?E=YKXrEt3^gE4>O?W1j(D5`WaJ-4*@_ZeToXZKEJ(sfqI^9&oft48yOL0zn zl($6F5$kE5anMu(&sl+~923kO8k7`Gp>Q@TBXg9b49B7o8BUUjEE*>%9M6f3jZxCz z44(Qwxr0POkhe+x(=@(UVkdgHvm+oLW`~Go#mV8t5m}}RP)j8978>;$ldG?J|N4FN zG$CcLZ0;`yN~PhCfYOQZ$)+_>khFO(cw?-kcYJ>zd_j73sY0!;Jp6SXp}v$Gy>3O= zrtr!(bK?+N`N8PeI2%`ev8qHR9s2BiUFTzguueFdDof&O%8g&8jAZ?-x!=(xzwdZw zPy0tuc+imhm)hhG_ruZRn3@ZNKP>eOn^!O5NZZfvmK|tlF+-j~{;koAw>(QSzDe^m zT}$$u?dZJnX+;M*P`&u4RTbrwbNyNT-&JM&NUu5@=? zPfpW3*m8ElF*(TB|9ax>-r~8 cM-&Iak`fQ&SCxO~6YsCrXh_n3tKCxi58dH9c>n+a literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..647b2369a5c852ef3c1d12aa9a89a77e97ec011b GIT binary patch literal 1492 zcmbVMdr%a09AEK~L8#+2mP)y^XQPF8`?%+>oN#x02RC+jgQ%w>xZM7L<=EYGcMlFi zQyWKoHf5$wh0cMxr>T#c&G8C<23rE=08^u|-r4 z?HaPBo~%fTq68@vt*EHbRp@o1RE**zNun5m5`h8fJnhuES8CkHs~JmX#dvuN%Xn<=o03Ky!dB zh9tjQk0MQ+tmf|NhGIa~8)}}!sYPMRXwe_yfuOi)E24hUu^da;afjV#Fwr)P-Rach zYWRfN?sS>#db@*m=#6oW;kYIP?!b*kn@f+|aolON7|aA|a}iFOb`XS}jC0+BtT2Kf z#O-pb-61adR4(O^0HcUft|*qpJHT5aDxzE>24RO|u;TE{MV!Ej74oaG5=m}p{yO@?sWU33pzU6;Ve;y_n%U7v<({dxuT08*M}K75H!TTibAMcJONk!+ z(*CRC@XcvoFlXlaHl(i%8LIiz16wqC-i5XMJ1%a0^!ePXQ|u?)?it(Mdw)Lho@_s` za?`+>$ee@yA+*%=;gtSp^q#j-vUu-~3uPG>O6$*V42ZqEh-l{O5zy`v3zGH`*yh-O*6qxuYwgR|{sX$x BFJJ%w literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0b09c353c9c1436c1a196e4cba02b805dd8d66ff GIT binary patch literal 1550 zcmbVMdr;GM9M6GpSj89OgBvajI+@z0N%~4{VQoW4Ia?Vpiw~HgNlS$$Aqlo3j2+52 zhqv2&?csWCcFd_KK5pu!prDASn^SM|P&eQN!f*_z4S0HK~hN|a*s1i}bN*qR%awVcilzLPNj$DxB zji=oD0>V1tOF9{$a#7^;FzomH6@E;?@*Wt$aU52nFpA103%Rh05y^m@5i(*71TDCD zFDH6g28=S2Wo)%*ge0X;Lhx~R`%_{@7)g|rGB`kTFrrYxK3_DhVQWDwp#PQeOlzTN z6-UDbw7^#LE~y^wj2KwT-SZtq4J9@Dg}hfP3Ry|8u4*66h&I9qNnaF{m(rUNi&?GG z5GI{DCkI2M@KLQf$Eq=7W(#4#)G>}{VKJ+gP?^jsD~6y5lA|{1EI5IpN}UDMst_d_ z!`c`@BpDYS^XrxTj$pCpV)YiDCPkJnV%f@A2jrKtA}f@$9B8o&R~*cAdKrrK3$H{= z^dw?}=DjOv%F44oa5%?$?=v)LDVoBRWtg0FYe_k-Rv~hnBoVm^Cn+3v>vS3|4UOQb z|C2jd5(Gz^AxdTZ!iW@h+W*S3o*M)#B< zUDvow-PW_CHlF?>99dbI-i_58W;8UPH1EA!Dbu7ScM;G_x}d}II`{3eO%oTpvge)p zJuvSQb4dNp+^bCQ_V4e_n!CEb<6|&*taMNPy+_;M_M+2gTd?cm&Ygy!lz6l|{Gx9E(!nOrg)_2lZdM?H5)LfcvG5}gI=v-ra_3ZgcgWpQ z`uNHRanA6A8e?RrJ>|>nqj^24H~ubZZM#!3?ckdo>8Tr<^IA773hj>HKYISA&pUU1 z{YfR9v}@e*pkw=ijh#vN9xNG1qzA@SWwpGaog1#(x^C|PP)bcGZRtp`W}c|N<#Jr* zR+ObLO1iUbRP#-KM+dg`tc*Fdls;3<8(Yq8RwIpOQ$<$Gxq7EHEbAM~_Qdx=y$3Up z*)!_Cf~Pd6tr;KrFe8xg(~WY~A3;y$=1H#kt;VLy8$auKG~hWeJ349_AagQ96UWOV P(Lb~;$3e82mpA+a17AYA literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..52614740b54a6a9c09d7f37a3e457ae1fa73ba6e GIT binary patch literal 1552 zcmbVMeQ?uc9PU1d`VrVFSlz+N3OOO}aE)yU8e5 z1cbu_JWrX@dAi}`l(E58ZcZ5cfH4q{4G|b$tIB!8U{eG^2AGZ&{e$BVbCV z_x!%HG0XbeXjzg>B9V+X&m*$M6^Py=;>G9S6z%sU6A=ffr>)>1pGHRpnyWApLB1xa?cax4HS^(_y3Wn8z{Y}jv zz)(6c2eZHyw}CEX=9TmGqH?RvQC{T0DR6EEknY!t1TI=20l%x5^=SP%aEMnc?xU|E z5EwEMige&3QMr~Zz`*e|fGN`C4g^5}HLgG~jS|J?04R)L5R5|zEQb*-0&7ti7`{N! z8&5g4*@S7>mw3{Fg@WMLLXgkrQ}~n$j$Z*GIF3Uw3ZbZ6w2*tsSb_A*Sx-ugfuKDO zo^cBd#{yAC($0AW9VjY&6oSibu{|z()Pzbyn3M>LAVy4&t2BB9Q5kU<#b6U2 z!Qd4#QHM&+~G$ zM2{jSXr3vhDHG4RfT0{~nI~vaQ#7T7?MgZ6RFiTXQz3GkBoVm^Cn+3vYBXtT8XU$` z|0j2lCo2m`c9f(~!;W~Dw{#WGxU(uln%psVGXZY09{n}a`q{Z+nW=hV z%j#xG6S7LjZG5};dg-F%c4Z)aTJYxGy!x)f5kFq@w)oQ(nrT}S7P=er-XFWvF?UW! z#69cm%CKtvD;UB&Ta}Es02dI`FjFY4{F!=(9)(5-%xi)7~$)in%p-r;Z`8E zmrGh%=CA6x3(4N=ta)(Mx$kP6DZK3T%z=@OS4*3MSNNrsOHwB+F4Kkt>BHsi>qc#@ zK%Yx_=0aEI?z6SwWfq-b%$N;p>waqvo^Ymon7yl}v2CRA(rric<)YOQ`eM-jQ^Y#s z;2#BX_|Dwk){hq^6xauzpL$L{*cRwICTn+h1f-NFylmHk?X{JefB)+BFV^JQ=1dGHxstb9&VD*dx@6~R z>aENyujHC7b!RBi9=6T{CAfNKZ-?vum%DYc{jL~2V)&yN849r?7==ce&yioHlNhLUj1{Ne_PS{ zZQI9f$@pQCO!{uihTF#@&G9RFc(VU{<=3xoYzTE%we^`#UJBeh#Yqd|M@eps_e46O RL#@$&wApAS>hy00{{dG!O1A(2 literal 0 HcmV?d00001 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 2c2e6ac842b19fcbd39954f937a519725b26a9b4..228cd7b66c3dd7323b6b0195ef2908b12c1c96da 100644 GIT binary patch literal 1562 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFz024M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7p`n7grJkXw zg|U&Tj)IYap{c%srM{tou7RPIp@Ef=fdUjL0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LcpzHo!{ilG4o3^M(S!~%UoJp=vRT#&!Os*6j4QW4I;s=7F&vLIDI zD784hv?v)EA8E=k&A_n3ZxKi#&^1>6MVY`zNz8G{PcF?(%`5SAu~h=f=%r+)SUDLw zJDHl8xj0%lxw;w~0=;i!?&Rub=49;T?BZ-}3Nr(nUSm^pV`C>1H#Z{_14BbsQ%4g+ zGiMhIOCtkwCo>aECzxK(yyB9?yyR4vy_rCJp?Y2M>a}t%N=+=uFAB-e&w-_YfQ0ZOjTs_8pG+IpKKy1^ew6+7DfR>=%CX>RcA9xqXi<8XX)yRPE(*TO4@s_g}q; zwPB`dGX3snIol66ExzdS;b#pOTeIWA0F5OQB{g!15g}Tl2R&34)vz}=J}9vg-E%k3 z%HQteU%%%c6H)R(#~NP+`aIw_gOG%s-#* zuV1<8Ki7@P7vGj`J@p~!#+>ts#t-jhZQUaOPuoL9=oh=K1Yf(mlEv>8~EUrBy8Z&t*2d_s^8msdKw_amkd| zM;z#`KBl#8m-E5fxI%|{GO0OU9|Js{xHZE)auQkI*?bGHMJzF1p@x!-{ed9g2>hepK z8?V1^5x!p(xH3d2W^Gv0*Q!{9$tPb(`YpdK_k2PA{`=fTlPs=&{u#3&LZ|Md%!4~A zMw%A0&xRaN+W6ta(f8LfzulR{`8q^vY2EKI{)E8QSGW8QxnKA8LAINX-1S|Ho24Eo zh3wlu_f6h6t$%k8#1+h!-f(T+r22i`5e|1hvgzH*+rDc?<%~ySS-yUD^TSzp#=M(8 z=e@0insxF2gWW*_(fJel?XG-Y>f&cM`|Fe|^{iW#-hcmEL}q7hj`YLq`$^y4wlP`% g|F---R~?H4Lt4tDoc&8!=736TPgg&ebxsLQ0NW8*1^@s6 delta 1501 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 T+U##){QL4_1bSce+P(k3@XS(f literal 2806 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 W_|o2A)yMy#0w%^5Mx_SMVSfWJ&O+$` 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 0000000000000000000000000000000000000000..fbf95c8919ddaa230eb4c03a300a3d74738153e5 GIT binary patch literal 1555 zcmbVMeNfY89IkTSppz*>9dqhpyy-;RB>hfC!M14;wJ5cdo}Ud(3N17#Nw5VSPM8ii zr{{U-KIA<2#heUO#<9uRtlr7+3nv5FCNQVWi3q6EPEfZLsoNi(e=K*&`@YHVd4A9D zE1MUmr9_J-i$x+)bm~0ZBCJ5@jvOsK@5NpJNLZfdjW&J>7Xt={r2wT=C2=4K0;o|bqSVM`$^<|LBT5KHAq1Ad2!_Cz3<29Qf5!2jAqJ)$|e!>eOQW)}hLU9dSbG(K6SH@$lIctHJ zf-Drr;JYOqDDODGDFi!+XV4@L8-xE2(?NJ$ro=@ElosZilM zjoxUKBSQExwccn_>E(I@ZjdX(9FN1waRsc0QMpNuC=tY{)ESjB4XRS(Iv7^qDpMGn zN^?9xJE*WE_4IGf=aE}QWJ2E%a0ftNE}G|Bk5*`X3W zj2Nd_*BXj6v5W^8&N1eCj0QDHk#aawE+L$1LV_w4hy*1FM4~_m5=EUFjY>^{BY5)v z#Y8tzuCEnMHAP8#4p*JOb~yGO)0m9?ttk^$RA*4S*3SMq z`~Fr-A77e3b4N_#v~7ctH=$i8lN&BK^-UZ|%hXJ9mt8cr@BaIk^Jv3Qx$fi(b4nX8 z4UW^=5+<#m(tRy*=-Z8KFdcI=Q=Yjw>x0wczTn!x>aMO6qu-dlrLyseHU5+L>O0a7tdQ=X929%Mchrxs}4-8TX!9upCmr(F25yjc+m2$`--@@ zY`(Fpi>@2fa`j6f_DoW&9X*G(@ufYNntsUsGq{!OjA-w^RS>x0uf#sHgWJzqm**`H zwp{)A?v5tB!d>4{gpXp5*KE}5@)eV#?{7MiToRbOzU|uWAJc&g+}FGB^w#V+b>YK^ zNt(UOzUW!VV^eRBt$C}fqGexOITw|34# literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..26ee67e973e4621bf4b812f38e24f23846b559df GIT binary patch literal 2416 zcmaJ@dsGv577ijtMGRQ=23RTX1ciEBPv@Vxzu(;NyZ3(g-g72D zGCbIA;_Qhe63H!OsW^&w10<4D*7z}mCDQc`5U*LdM2auR6u3dAMM;5j3`T(vm24dv zh05fqDOS{vL~`D&jF#fkuuuVlspv9?58bHJ5NHy~FTkjgAxS6>!00-qT1e|WT}15Lh|lLUm@Ed11ri>hE>(@ojG$WQ zHNqf9b%<7}!IhXAa4^bXOpgm`M5b>`P-()#Mv2wBcR~@8F^n<|1EMn-DwU(IVQ(EC zh5nhwN4<5?sT!0Kh3YW979skf@EQRV+WmDPha-`VAVRAonj%XUV~Adbs__u9kVbr= z%aw8gi^qmxnSuwhAcYKM`*I-A7e-_tkIPkX*<2q56XuNYd=$?Kf+S*J_7XP4g&+x+ zPgo*fQII5vVDmi3odfk=zWa7-JGVaX#?5SfVKm@X01 z03y+F*MS8wO0^s_=stI}>21|wRI6N%%9m&{6)>!`K>3jz_*@o~Cuhq*ri`NinLG{x z!Y~sBVIJETK{zakDVNdS;pOk?_jXQ+8=?-)NIC)q%HpG3UmmDnaabS(pV8II9;ZQ-k2OQ`z8~l~*X0-U@|DeATvP zALMCRq1Wp-zL@{0va-^zvHr0({9IMlqF8#N`RA2~!W*t!iS>LuFmU_MC)*_6jg5`w zml-x|x__s9ZzQw0k42XxLPFtl`N3#b#;%<^O=nJ>()K)jSaW2*u=c*2-|l6fKE0?9Nl*XXdiU-s@8ICzFju?& zU(3E$0V!xgLbY{hDAOBLt4*eo5?&I^0$5I-e3tq0<;$Y!X0!Q;Vf$D3=3B29G|f0R z_Gm(M1=YEhn?7+z>F4eBsh>QTIVC^7JYgNCv5brTdX-dKK6LZuP1St&&VTQWy&`~# zfjidMXSZh_O)1{xbYhRmglji$v~^^WJytL1NU^`Zc5U}B0lvQFvHFaRW_Q;ncEywH z*T21etfB%=8(-UKw^yD`MvxlX#3`pDLPKvAasTm|SB_VKJ7w3dU6tO_`1lk2O(%Ew z+}|*#_VxYydk4-&9h8b!$H#LtYd2@N=8EIbAD`QKW^&EVCQm5W#}BKpknZdS_NAqz zftl{p&R{J+*Y!HHa}B|6aaS)afIVeX2lE8$R<4<26b4`K)o(}b2$RkB@^`1^QCLrM z;HXBIJNJ43o>ioo6oG^u2D~-H3MSN;YJ?~jV!9TY}_!kyXzR1b3 z^#iBob#3*TS$Q;%QcHf|+`XxPaXK)}SW7PM3Y=BU%`=E&I5Pq-6&B9eop(S{LdCs~ zPrWZLIjy@9gn#$h7P_7r08%GWD3^Mi+U6pyOF9`-K4g~HkqZOky`LYs z{XHW|+tOWE&_C#eUoy4y&6Zd?^MvAv#!KJGi7@Yon z*Y@*$*Ls}TPWAKsvuvrJM|7Fhd-V4z_U}x1ob`mhy!-s+%a<*ajXntlJwq!-RT-tc zyp__>(D2*jd&*!-XOqXQNxjbP3C9~L#(5XAU%Ys6>-nONmK8s88$OhVP%6j%C`S-s zs;>>OH%ZLyJBs6>6yn1r0{S2#25Rj(^23$3+uDU!k zEBgbb9dvK3d)ia#&Wl9T{;xr`bR?Ao#~60J$;t;p8=<%Zi8T1NP1UJBQ>G8qrLt3w^?K7HLrnF>J+Y?HLLagr0#92 z-E8z<$)V!J{BJ(e`5_8*E|t3RE~5MCk?|=;K3i4Q7x%cA+|^Q*Y}=EOIWk?NI=WL& zcvEZrGA`YiW_9%}Z3r1N#p>Zal+){cYxAC=VoJaG(|iiN@K$s4s|P~|FBCFj4+tW7 xlQ2*JBD49`gL5{H8@2Th$$NZ*=)m8qNec3#HBIxtO^$z{5J|ZBNKiud{{ZC3>_7kj literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..783ce363dd829fdfcc36dd954b39277767752d9d GIT binary patch literal 1555 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFz024M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7p`n7grJkXw zg|U&Tj)IYap{c%srM{tou7RPIp@Ef=fdUjL0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LcpzHo!{ilG4o3^M(S!~%UoJp=vRT#&!Os*6j4QW4I;s=7F&vLIDI zD784hv?v)EA8E=k&A_n3ZxKi#&^1>6MVY`zNz8G{PcF?(%`5SAu~h=f=%r+)SUDLw zJDHl8xj0%lxw;w~0=;i!?&Rub=49;T?BZ-}3Nr(nUSlUmGXqx>3pZm!Q$s^nQzxKq zpk8MqXJbQ43s)zYUeCPZlEl2^RG7V)KzpHj&GG8BaxO|uEXgkl$GXD`>e#mwvyi`Fu_2)~xr!Z@&L-bWo7s;kuV+esKMI z{e#CJD@JHdE%BXmKK(3b`{Ab3PlG;ut>SERQgl53S;U#~xL}*>#t4xf7o}6>cJsN{ zUC%!F`|rBnPd3-t&EK`|`s-c7y>6`GtFO9?#H~9|Z6U+= zNqzQNu6N(7560iWe~PI^vuDlm10h;VXYRi1w;@JvwbXa6f)i<*1>cnIZrT{(bKd*( zTvM(!-5ft2scIeUd=kf~&a-ZV==PeomR@#T7qaGlHs1U1@{FwKTuoEGT<_n{+s=CV z>uh zCta3j?Y>**!kB+-bE}hMsfiTt-?jtx%?BOouf6_yB~al`@y~$~D=sKlT>ns8EBkNW`@}5XavQh4xzgXc65JoW zNHJRZZ=w9RXPcH!o6E0utWLJ}m0R=O9J9;1CV}qPzNKs}Z{B;paPQsa)6a?i5ldh& XpPF@BC)P*{R7`ui`njxgN@xNAHFQ>L literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2f93956d409985cbba0e2bf45e7dc4b3760a32bf GIT binary patch literal 2418 zcmaJ@X;>3k7L5WE$8JSs8bMoAB%eD)QVEq%0RotSYym|SP!uak1=5(sq=0}RFfc7{ zv#{&OPtmbHA^) zEe}{WW%8`aBob+gkGCL*cmpKTgp^4Wi4|Yd*H64`anDeErBaH=p=yleAyJAjz(9XKZJXGk<6)WWqs42!lD_0R{63N9)t3t)m7!HWANSVTw`l7Ug z3dkg`)DT$65UTiCl*~Ipjjc=w2o@(qixCOcjR&}Bxdee6!%;vh->A@VwXW0=UM{gV z9n-16NC+P7N*xsyDqIfmm1+!t9oV24f*^o{I6$xyiwWBUOa=tg83-L>fDDKWF}O?y z@Zq5n+0+s#H%Q?1As4Z8rAFbnic6=*#l<2AM$H*}S?jvxe z5?>r7G6|Q-VTnYjlmjv$DGIWj93jw2Bt}6F3`=1a%$71lj$=HZ#j}|Z!eD!Pu^OyZ?h%7KwOb7h~=fWS-!N5Vou2I?pU z85~D3C=xL+P{d(5iN%ggh#^6#AMlcK^&9mmaYEcfH718E#h3^NJ8?iM(~${65C#)$ z5F11sA(Y8N5C#hoQR#$4y2(1@tTc8+_|vrfI2gp{<7iKKY+*M4fxd$cXywY z+Lx#YtW|-Txw&&*V7+a+q-$Hdw;7i#S+d3Dm!hK=FWw#A3OTvDzLvM8c2eKi{`J`0 zIX$pgS6tkg{O>(iEFS2!`=F@&&b4PlQ;c7S?lgM$-gqaVMHWj3teaa~OOtO_SLc?M zmTJ^EelHqLT6h0+kbHNJt&NT9LVo_wHBC)x7Z?nNa=2@)dwO_8gmXzj!4t`{Wn254 zkI$HE_bh2@@4Wpl&8Hu{Vo?S2JZX-X2O7D)$@Z12XCwEYp9|kr?AtnVG4Jwbxx6-d zd(|lkY`Y_KXU@5!4ObJ3ii-L)nSL!3FJ$=@yRWeW>-`VQ?ZFRx%dFNtS(Bcb zpP#>ehF@!Wa=j5lPzs*Zj#m06tRehC2NRfE41_#Y9K$)tICoa6M_G*uN z@&An-EzG$ZazS8g_w2tsIrSno?O5I2zT!bM!d*&aS9_Y9b~r`0x8}RO?h`EO^t>ZS za?DA^knyMM#Nk36&dYmlfHtM3JKHz literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..df9e537002eafd6b0561d85e4c1c9cd5a99d730b GIT binary patch literal 1523 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 F{sFAYZ72W$ literal 1277 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 Qk^lez07*qoM6N<$g1;z6MgRZ+ 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 51847a8995692fd044c7ed626d8ff3bb3c9a81c0..0e87bfe6b97cf979fd06ea152ab5c5c85efea1aa 100644 GIT binary patch literal 1657 zcmbVNeM}Q)7%yyYi~z-;Q;@~;su6|udZjJBrlr=FuSq+o%|Paa>)jP9ZLi!Nv@op; zg5t+Srx+8_2|5+0Xf{!?*_tT^VW{zgsbsjJ_%(F%t6~*(R|K~|jDPHsyZ3$G_xU}) z=QFn=OP>}V8WYOlaKbavwFY(t0&hq#`yHBicRRa8Gby>uT++-qQHtQGaneKp88)<# zFc2tSUeZA*IGlG%EXG_WSC=WrNSgo+=m=ak2aD!#6e^bk#fk|AFcF0oyAu4{;{^c= zt^{)=I-$;?A&M;N6%;YILT|(>iZKKSRmp(DC1(xT2nGdQHmjYMyOiLtT{*iC977;5 ztilv4!BaqY0NfCfVAmL*|5ey_D0$3tOU^oE~3E@Nt7D6I~55sbCk{p%-BM->3 zQMg%d(58-Xv62!jVi<=Uf}BpLz?mo@sX_=w5Cjs6Ad!gAYVhfDJA=CTcA7V8K}*mW zWpOYT(hdYHq9(GGQG%?euR^dnbh_7u?es{Z*pxvo)B(W)A!M@!;u_Yb83XaJ8*kL6 zjpYskG7vObN?~k0%)C)Bo4dCY1r%9tx9l^}Z~z%95O!C+K| znNU7~;RxR>6=QrEZWi%nB3Ouu2(eg*nMdus39m+Gi)E>)S}iP6!*GgNE!51GCCL(5 zL7bQ>k&a?B>@u48b6_E@{7m*G?qXFV_EOwl9 z(lY`TdKIvipe$tso=TB6U^vBc%NyunF(Q#93PpTGh`@o+alXlnNcl+!M&Kq1f=H8a za0HM4-_${@Q&6B!{?j+3M{F|&wy&pv6<*H~VP}VjVy8sEmhf;m!CN!5YNM-XL!IX| z2!~ZWm-XqZIoZMEr#1G4yJD_Pm=ZH<+_;+1Nay2U>eu;-TY5?j+BI~&>=0d_@ZqX_ zfBN}H5B-X7&QPtZ*G}zt_WXt08`5<$Bl*_>UxAPl78d`gYu-lKy8zmFYb?`K<_VwV ztJsp#WHfD#KG^^9w+~zjoX1_$&iibOzWrXkkE@ul<7@q{_3ySW4f;Md=&Nh7r>;dd z-V5Ss_g}nb_WL^DufWYG!oNH=rmGeb6inKuxEkU}$aX($2)kd_xPs;vif8#_e>qHKTVGwm@n9;*m-_N1?Nda%`U&=s-|OGOPAZZ9v+5-KQ(oHhP-+w$1By$K6jV!mjLD3`_NrNoOm zH&-89!9}tz_f_Bd;4iDxvta+N^1Tc8%&R*+*1hPYIyL_5BR7DjVytLagL_fUri06mtDBBrNmj;mhaGc!r$<~k@>5+D7nrL*+S}}p>s!y= z61=n59)CF7RdsLunVUacnNoEmr@cdR=lZsS$mof^JFEkPD>hsb9gTo;_kFr2|CuB& zFQun>jpnjd`m#sW)^tPnbIbO#H8*AckA5HUJ05eZ<9!c3XV-a`RLvP0YM#0J&&f^H z)qZDd>_zT{OZ7t$t7oP8YQaT%cg~nJA2(B^@(xt)cCWonMGy5myO%Yh^ZAoh$yMpa z)4ktW8=t0`e;ep?wodL=t#l&(&r74bRiVpD9(XFFx>W{Aq{^E%SlfZ0D-!3k^_fJp12e*$d_5S$~?Vf(0iO7)4IXMQ!mE{ Peg+vSdTsOUg35mYDocU* literal 1414 zcmV;11$p|3P)4Tx0C?Jsl+SMzWf;dlyYtSh2{;E+0gJ(jKY)-zwqTG3L3g{$wouDv+hW_8 znCoMPiX1$ccrw9X5iY<%0|`MxY)DKvl=ve=5-x_+!%TMv zXvO#R%=3Pq@AvyW?~{Sd=T+Z#(-zEnp{kVf*7(GvmAOHhXIMiwYpQnO=gQ?FfU57i zJaX>+ObX!I_LcAd^Q@`Kz=qTlK(iLuvyeIlx@-F?1mhO4=V<7Mka-s9QsWbokjVmF z^(Za?T~kp!4s@x}No`@q40Cbh4CzWGcl~Ud+tLC)h%7op= zT>sBA>$aBlHUVpcnUO=lR!ALdsDVlxe_~gQBfyK0y6lJf3a}Ycf3#-Ca={irt|ajcdi^v~yrE#?Sk1c_{KG&Z<^rEXG`|s$wbP5r0c> zEaucV)T)I;zz)#&b0k$o(qsyWjmLc~DwN1$;iG6Wje|=GiHAhtq@H93XBAu-iHhS6 zqK?F45ru=j3MNvx9b=key~v7PA}jWaA+b;F5q((VHSxOGFA5?n`o!LLZ8@QDQRjA> z=UrMzEGir!f4aN1wWD`Zz3tdnPThH+y7`D_x$Gx70Rm>)$nDAgFU^0qp~G=qoO|oq z+Dr2se%yTZTl%7YUB9K@&=)!g{a1ZKU(j!m!^NeJWEP2oha^ZiNcM06myjwhzv0nL z;2uz%_D*+qZtN?k?#TCs?+tUZr<2Y8lKnG#J^N|)Z1(quro7^mw2!o}wC}aAwQsZ^ zv9$Br1?>mzqV}csZQ`v~-;eg&lS_0f@m8F*#5MEgM)L);U_NKQWDa%s%=KokIbd!v z3+Bf5yCwCKy*NzZwx_zXR)ibF!{I0rML-o7kK+&Re_Sm#iC!`I(AMq|dqvx&Q8Wrh z4$IhP^clUzK_l1kXKXPFMxU|8C_b=t_9`971S;9*cBYU7%%E_XL*f!3LwPI&=x_SR zl~Zqo*3NA96)WfauCxX{dqJyPJ+lA+0TW3?K~#9!?b{&^gfI|5(b)}# z;7}+GqK5l$3NFA&xLQMc0R%|ou3ABMSI`Wtm_LpZGUZWPnhcL|9AA<#LI~1zU6$O= zIeCil00000000000002MY7{Zw?p0O&J>N9V?Ry8!{Fecaa{=~HN z7crgK_g&_BKDABLlx)~)=4TQFfK?zahG94zZ`+o%<68Nn0M>Q=*;bZilAG7ee;J_f z`>aD&J3o^k000000000000011cZ1G3+W_8svp4U(=M?||0000000000u=^=|^#bYx zs1Kk%fJqPl%d5aAs1NwjMtwknpgw>}5C8xG00000002N~GZaF|-ichl&x?q>0lndJ Uu*PGi>Hq)$07*qoM6N<$g5$}k*#H0l 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 f60ee83dd24df729a5db3fd55349336496c342d9..36887dcdd965e591db34de1a5c19b51d15b06256 100644 GIT binary patch literal 1343 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+mc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvGjMjE=kNwPKDW>3A7uk*AlN@E9aur#FG4?ko^1{SSkp} z$S=t+&d4uNaCTPE2+zz*$uBR~1jP`}x$hzZXH zKn^?~rRD)MPZ2Peblc6j!N9>lI{5>2Z0vBcT*)Yd?sA@D86CgxBucQ zB~!v$4n@pJaM@S$PVIf{qtvpwH|O4dTCn@>A`PylhU(bsxwj7)-1$D2=f?xS87d7u zjp3o990&I5bQ_v+TFCW(w&4z7^1W;l#$IJNe@bBQi~kO)%(H)gtWelyloRl&Xy*xj ziF@CFyYjbr%`-S(d}EuHy@Zjkwr$&lC(ryI@JY>h(wkJOK5yB}uT?L1*1t>W6lgdW z#c?-K?CJB*FL(L*U5H;FewN`3?`5lLk`i}LFns?l>lP^T*kW1cs~R14k1euS%ugHH zTi3?Mt&g00KD{=F&F%KKTirc@qHDHSuHNMGO#J`@r$I^Jf_d!Wpd!uF)z4*}Q$iB} DdwbsS literal 1288 zcmV+j1^4=iP)4Tx0C?Jsl+SMzWf;dlyYtSh2{;E+0gJ(jKY)-zwqTG3L3g{$wouDv+hW_8 znCoMPiX1$ccrw9X5iY<%0|`MxY)DKvl=ve=5-x_+!%TMv zXvO#R%=3Pq@AvyW?~{Sd=T+Z#(-zEnp{kVf*7(GvmAOHhXIMiwYpQnO=gQ?FfU57i zJaX>+ObX!I_LcAd^Q@`Kz=qTlK(iLuvyeIlx@-F?1mhO4=V<7Mka-s9QsWbokjVmF z^(Za?T~kp!4s@x}No`@q40Cbh4CzWGcl~Ud+tLC)h%7op= zT>sBA>$aBlHUVpcnUO=lR!ALdsDVlxe_~gQBfyK0y6lJf3a}Ycf3#-Ca={irt|ajcdi^v~yrE#?Sk1c_{KG&Z<^rEXG`|s$wbP5r0c> zEaucV)T)I;zz)#&b0k$o(qsyWjmLc~DwN1$;iG6Wje|=GiHAhtq@H93XBAu-iHhS6 zqK?F45ru=j3MNvx9b=key~v7PA}jWaA+b;F5q((VHSxOGFA5?n`o!LLZ8@QDQRjA> z=UrMzEGir!f4aN1wWD`Zz3tdnPThH+y7`D_x$Gx70Rm>)$nDAgFU^0qp~G=qoO|oq z+Dr2se%yTZTl%7YUB9K@&=)!g{a1ZKU(j!m!^NeJWEP2oha^ZiNcM06myjwhzv0nL z;2uz%_D*+qZtN?k?#TCs?+tUZr<2Y8lKnG#J^N|)Z1(quro7^mw2!o}wC}aAwQsZ^ zv9$Br1?>mzqV}csZQ`v~-;eg&lS_0f@m8F*#5MEgM)L);U_NKQWDa%s%=KokIbd!v z3+Bf5yCwCKy*NzZwx_zXR)ibF!{I0rML-o7kK+&Re_Sm#iC!`I(AMq|dqvx&Q8Wrh z4$IhP^clUzK_l1kXKXPFMxU|8C_b=t_9`971S;9*cBYU7%%E_XL*f!3LwPI&=x_SR zl~Zqo*3NA96)WfauCxX{dq)`zK@I=_0F_BZK~z}7?bjg=Lm>t*2ZmMThWDZowl`N~iT0 y<9C4G`^%g$WrP-+zoGf5>+`x*?%3r13NW0000SK@_hM zdF)i7)ef6QiG%fOJ<8x30ydCpLa!qUA`#Z$gcc)kOhcjsLFo(>kpz!F2(TuxE-KfO zIc^K=jEGxNd=!TH{eHDys}`jaj37x8!!?*jg8~F92L*)=pn^OnqQSz+jO6ht9#Me9 z8fmAvLNOx1)5jt3KCAVKVnH5H6i68spnVvj#xb4`$2EqQm0a#$H=c@?9YG(5<#MvP zLSjHYTyr91kh^Ca3Il;RRF32UMWIVABC~?$1SQ*IM8J)j^{^Dl5Ogx*q*0DxNz|33 zW6)&Qr9qQ51Ws!>oepPQ5j{`iWTV>(MSca@&N!WN*3tjrv(H)_mI0HoU8n;qLabm9I;V{OyU^Q)W7%yI6ZBVo6F zAVdBt>bD~W6Yga2jXnD-e}Ar})s0`=v!IdhSX_PSc7Eu=d$FfhSCkzdYB`tF!mi7? zet%>pZ92E`ot-ygE_Pn^&m6e%atHP1@@sv)%cmI<>VOci`Yi3}mWqbqwC1+;L-&`M zYAgD*XF5wpEJ)W+ofTcQsaT)T*Sq_yLYMq;B3wI(aYxpFV)vwiMsPcXQLR{nwkyD_fUttI4@CII^rN3Tikb V^zErx1bPF4vNLR!y>Az<`UkYZMVSBq literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ef433d55c02ec467979ce2775a5719ee4182becb GIT binary patch literal 1225 zcmbVMTWl0n7@p8ZO)ct^DZDUFHELyc=FHA^cE+ylc4pfyVQblLpx|{bXSb7f<_t4u z*=Y?zz>tt=`(O}b2xz33NURALMG0zrFz^D2gh-8%Y99cbh)RP7P4!H>TYYGFaFRK< z`M&@1o&TS`eZAc)8&)?^6tyzjqvgr`K=j^o7a7;w{97l}Dx4X>{iuj5x(}(eg$zh% z9lZqeP`5_5o`Y=^RkzhH4B&y>dc{OeOph?J(D4YHqT1R+PdA4krVUuK-4t`<^ydt1 zTPbE!BFE=E6%N`xqdx2(?Jbz2L#Avo?N8Bdp+XEe5bJd447-66rkDl03Ry?T978Wa z@KB0b3~C_PN2|z(bRw2uOv3p|K(fae661wauc1+>!Dhauj4tEl9) zuBtDxOEH5OdkV)@DwS9z9z%YK1F|f0yub+pOAu@@;$l5y-JrQo#pr-PSjU3Neu`p02wiv5Y)7w%4xNe?~2F88aL|(Sa(fW^KBE~RjzbL zuA=%-$H*@rG+e8KzCnahFo--_Rq4kz*{+2u!Q;^lEhel%-`)nTE+0Acg2alwjC+Ak z0HLVMY}~LcR+Pm!EAy7j8c9(yiZb6S8gZt|xBjnm90`hx>f}FlQ#&HX7%i8&fNYlf z2)d+se9|SW4$Q${Nv`=+DnT@zq#I z)9#O*KlQUz_c!Gaf6E$h?)U9G9$hy-Ie+l8`&))ry#MUIbC>=omcGwrPFT0k>HN0Y z*Dp-g-#&k{QF-Ldt#|KkIlTGQwH{_?y7&_Q60;Z?N&+otf(&3kn z?yO(&)U7kB*w>zSy} literal 0 HcmV?d00001 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 af7e4bd8c06f7f9fcd703c2e8a5ea86f18a3de07..c48db523d9e8cb2301a9b704ed534b22fe058f53 100644 GIT binary patch literal 1485 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 ax3viJS_R$NDP_#AWjx)zF_otRfBzpWYFGdO 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 ca24627d38846b7094bc1edc385f96f0cb818ec8..e6b2a90eca7a0d28077650b68ce312b4ff449228 100644 GIT binary patch literal 1208 zcmbVMTWB0r7#>VhV`yU(kr=#;6D_S|_RN``-PswlO|v^2v*;#avzjeZbS`JJV={9l zGiTl1C`jvrih?mq+9jr6R3}2TBhwnkrZ?Hs3vwIdWebC9FMXYrmw%|>Edl zE6I(=azf5aqq03Te;et6cX(|@iznSf;sZ_v0L}zQxlpCnEB)6oi(sg(YICcp_ zCX?KB?4oT0%0#J3NQ+w07Qj{P?cmA#@WWhQER?cQuEqi z!xr5oxiTT13P815jZ~u%>`wrwC<+inAc{Oi@Il=rdX0C3o~D9^0@JrWVq=#L6?Fqw zNRp$TE{EWFx!j7d8#EF{QwD0f2Vg`1juXbUgbqj^{p-f6=%7&d5XhqdSA3J+N2#Yt zrn$Skp%6&DQAd26UWz`YVYA{Omt?ghN54cY+fqeYk0Tm0A45>)6Q)E585z7NC5%!+ zQe@GJHFZ|wYcQ@+dPaj{3c`#upd~UXaUd0w2cu9*$W3n64T$cVsA=1#wi{gSvRpOo zBb{Ksfbmqb3P#JA;Gm2>Hl1cSj@zz{5zVdlmDd5QAb# zSNN!5S-hl3QC<-&g*OtCY?KrsE*Vj-!MFZz>Hu{Lgmv$$b%#(MjuOV@otB$^~P+mBF)57sD_J4o$Kwa72_1W*0dw+O-%iIH>ANkAu;O;9obPc_(z6CD! z9&_%${f))<&s4U3dZD-fme#|E4!-+h>iVZ=JHf~2Paivf?$OpRX8V_H*VV6X{WbiT NWHZCsq11yr{sB}mn704` literal 1201 zcmV;i1Wx;jP)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0000;NklF@z@QGDGFqd2|ZgO+k9r9!VL$qJ<6tkXq~yIXJXk*1_3Nb zBF-2+i^OtH0*NJXj3IztkFn06&dd15Sfd3e2m_51i8yZ6CmM~I1tX*NxSp^iSQ3KV zWWlX40tbWsw1+h;q6p<_4=EEn8GXceW@&77G-$krz18<6aTCq2~e9 zK<4uSmn4fWXgtLf{}S`Ko-`PuF#;hm5)XvVA(>7x1~HN>;4%#)8Dr$&2|o9KQ-`Wf zp@BO2Pu&E!)M5-wUvz=Gc+p2dP@6|qyQD0spN>1(cGPx^+@B42e+maoshv&Vmb zgTKj{KXvuuedS$rPRD~2kr#fbe`vkiJ6NIY_c@+~)-<67?;Wl1{w}u+WXCODP-nYc zcJ?jr9lo+8VpMEikc7Ey5e=_>+1=)w)9H7V*juu4W2=u`JSXhEy?N5R7b5anszMLn zJQY&?=+@^@_{vp{U8Pt5+VyBzQNhfN3v$clU!D~CM{Y^=pA2j+^{;DtRyK3-zD}XJ z_sM8sO_M!DkLGU~nY%SS{Cr+Tt$*dTj<3(|&bK})eiPc{nfhC9%=Nr^L*biecNlT0 z=D>nW{oCWa?b{Fep}O#&q4qtKoN@`4mAIUdhqWU$({vxD0`vNkUa0-kj~i*?<{tyC zbkp~p(w3*)P`V`Wd@e-?siY{WO6n)xRi1Ha{DYYJVPn6dL8@T*K@ literal 1410 zcmV-|1%3L7P)4Tx0C?Jsl+SMzWf;dlyYtSh2{;E+0gJ(jKY)-zwqTG3L3g{$wouDv+hW_8 znCoMPiX1$ccrw9X5iY<%0|`MxY)DKvl=ve=5-x_+!%TMv zXvO#R%=3Pq@AvyW?~{Sd=T+Z#(-zEnp{kVf*7(GvmAOHhXIMiwYpQnO=gQ?FfU57i zJaX>+ObX!I_LcAd^Q@`Kz=qTlK(iLuvyeIlx@-F?1mhO4=V<7Mka-s9QsWbokjVmF z^(Za?T~kp!4s@x}No`@q40Cbh4CzWGcl~Ud+tLC)h%7op= zT>sBA>$aBlHUVpcnUO=lR!ALdsDVlxe_~gQBfyK0y6lJf3a}Ycf3#-Ca={irt|ajcdi^v~yrE#?Sk1c_{KG&Z<^rEXG`|s$wbP5r0c> zEaucV)T)I;zz)#&b0k$o(qsyWjmLc~DwN1$;iG6Wje|=GiHAhtq@H93XBAu-iHhS6 zqK?F45ru=j3MNvx9b=key~v7PA}jWaA+b;F5q((VHSxOGFA5?n`o!LLZ8@QDQRjA> z=UrMzEGir!f4aN1wWD`Zz3tdnPThH+y7`D_x$Gx70Rm>)$nDAgFU^0qp~G=qoO|oq z+Dr2se%yTZTl%7YUB9K@&=)!g{a1ZKU(j!m!^NeJWEP2oha^ZiNcM06myjwhzv0nL z;2uz%_D*+qZtN?k?#TCs?+tUZr<2Y8lKnG#J^N|)Z1(quro7^mw2!o}wC}aAwQsZ^ zv9$Br1?>mzqV}csZQ`v~-;eg&lS_0f@m8F*#5MEgM)L);U_NKQWDa%s%=KokIbd!v z3+Bf5yCwCKy*NzZwx_zXR)ibF!{I0rML-o7kK+&Re_Sm#iC!`I(AMq|dqvx&Q8Wrh z4$IhP^clUzK_l1kXKXPFMxU|8C_b=t_9`971S;9*cBYU7%%E_XL*f!3LwPI&=x_SR zl~Zqo*3NA96)WfauCxX{dqx0S`$;K~#9!?b|U5gfI|5(Q&a6 zJ3&aJH}E{(#glk6!5bLS(sH-jLe?!JW2VTT&V(@W86$x)>$>hOhT*-Jx~@%fJLlvj zi3b1x00000000000I5bEI-qG9Da-P2|1?dHPFOpCFu-vf(zdNsRrS+1&-3F?Ogn#m zXA=9q%Q%jwwqY2eEnCg}Y=Qvr6}T6D-=D6xZHqc_t^BtDmSwqYD~ck@&1>cl23XhC zbjfPxXA=Yf000000000003g-VpmQ#1fXuo;f>!_l0000000000005)2K$6 zK7dUSfRw)i-=IF=qK*212tj=Sn;-xH000000001h(qYJZZ$1gD-{(a{J_=uV12)}n Q(EtDd07*qoM6N<$g2mpVkpKVy 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 b053a882cf2ccfa3543e4e7ece57a20ddee34216..87bb9aec2349c8d8b5ab0f7f1bb79c34dc7b932e 100644 GIT binary patch literal 1253 zcmbVMZD`zN9M4)Ddaf{0i#w{uRHTFD@^Z=L5_^`rBxetIXT9ENoqkwep6i8PUM|V? z(sOpW&6k1TI?;ki5!o1VhlE2Fx)JZwC1?R>)60UXn!C;0TcKN8kkkf6M_`BrYpd8cuZjE8pIz@ zVe3wf=7&(xb^*%9SX?7%3g!41#WFla?LujiiW3w`&^%620>cSZ0&P7QwC3t%p(tfr zw%{&>ReawO2%^zw#2WFK?T!%?&+`OH6EuxO1nx~*z7pV;*V|T*fTy{J;~TbxhKh=6 z*ZmX*JzWpMbn^KPVasbJ3Z{$*6o;T#G8x(O^lC#5j>C8is?Kyyk0z?g9sP#m7r7&vf1#c3v~ zmXi$6(K_4K*^DoXnKYS^lM+Q|C`x8{hRJ5rVv>ooT%5^>ZEnu;e8tj0+qMC1x47I5 zxq|2d#kbv(ZCBe>FjTR9+pE|PDvD^|h+*k=!`m6&(0afUaE%F|XIzeeS&)^3<(=EIfB;pLWlbEMHokBHk2I zd+HbSpI@x?$hTcxN*w%=%7X5x$L{##(1F>L)YiMu+_BZfw{vHggqOamcRlgh(a6ki zm(K<>AH2Kk_IoGp-0|f3E32>ny!+!ndmlJ{wY$(c5b1S#p0_7nUOduQIElpxbK=T&hLF;@W9^)(VYEZ^dOP)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER00029NklMCsB@&0plXx;@HbfXUttu04xj_*0JsCk z?k1E{62{o&HShgp?q6bCKx>UCr3mMI;tL^6*b3Md&Kb1Ly!c@Lk1_KjaTCEh8H; SD+(|G0000{( zJaZG%Q-e|yQz{EjrrIztFso&TM3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7p`n7grJkXw zg|U&Tj)IYap{c%srM{tou7RPIp@Ef=fdUjL0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LbwWAlok!2}F2{ffi_eM3D1ke6TzeSPsO&CP|YE-nd5MYtEM!Nnn! z1*!T$sm1xFMajU3OH&3}Rbb^@l$uzQUlfv`p92fUfQydR_99OLJ56N?>|Z5PDs4>IEf-+ybD@E~!PCWvMA{Mftf3U~gMx;&zJ@ zPV=C8Q*gV*8K+)-pkwqwk&6`BFd<+H0x{u97s!Dp{?t5RiZ22t?IV-k9bjN!^6+$V z45_&FX4-x)W=DZz@AW3vFX3ofus|b2x$%K9htf8)ZP)fSceF0ZPe{(r)#gyT5pjEk zLdV4pr3h7(olo@YKJMn3-F+x8^|8q8v+wfD%G1)*&#ezzJx?)EB-LnU-TwE#?QU80 zH7hu*c36E?ON492QHy^?r{2tFim+I#om8r|nP0YK(@hLDLKvi zohTs9a%a`;w?!RmU%l{ToWZ{3xiEKy#-%qI^O=-O?sUq3oI9^$!b{)JKm7K5Xuq6s z`|Y-@N!nuFHd}YL+v@L)O(l6`yS(Y4N(T?e%m@7dPL zS|{?@-)&Rv45dZeMNV9(Hn8d17}T&r_ACEl%d`BdJDa!O_1@KC^4G%R(1)JWx0kQ- zbPxO?cf4}%B$YE-Q@f7IuuNZeP4Llf)dt=VWv8BQQoWyH((>M^_w4h}%bc{*N{-AE zKezF!_NO|*xtpF$Zf9F``Q-}d`WV4=4fR)cPWy9!X;;Tf9oE2lnSw{I@)IQ$mwl=b zN?Yc=G^2KxX56f^%Vw^!;ZBTL{%C4t$(}lnAa>*V&veeRxSajdSJm+J&1?6flmEXy zc>kJlZ(1aO#msMe=E$$Hy4w7_-(TIXU@iN)J!{^@806@_W;9s->tPK4m&2zgm9J)R zx%;XyyRLk#yyv!!XWs8xSNm6h@8%SD==6{S?5~3A(jlV{*hSPw-^~$?HTCV@B PL1nF{tDnm{r-UW|$2mvR literal 1584 zcmV-02G9A4P)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%R z-bqA3RCodHTQN?=Fc923MT$_Oq@oHhfCtd?14Khj0R`_thz3zoz(aTdO=|LhM3GP` zxIK~1-mwm?64`6%cxT6veD-acruiXIzFu$Wmd>+~HId#lc#%Z7cRgyFpEU-VJ8F)s)KF-8+5UAJO^4x3lKHKJ4OUyWc`f;~!r> zN-&M%=;WO_5x+S24ov56={grVR? zW&S`P@BI9~{K+o?6ClKfF}E=X#GKub*vtVTD#hH!91wGMLt--rgs2pA8*@O+*$s&; z<1Ha7r?+p!?OZkY^+hg4{P%;em?+-pnX3f`F8+Z0-ERZDEo|S^Fs&l zIsBm?yB`pe;)UBl2P`~4b$Sy(UE-A!m;+XxAob~)1Jos6Ie|G~ZDBn6gp?h|GgN&ETo$=Py#Ert;L5 zkiSsfdU?8-P3@~hnW}-C9_!yRB87{z(vk!%%S!yqr5tFmA z@QJ4i2$>vBm&;{;Ip~L0AI(OiQJM+Rfq)Mqe0INqWXEUNO;rUE*ovi@NP`CHD$03S zLOg{t{ZN8#&dD0~Y@2YyXh$|_*3Y;lRe_T9|4?0@L)$0=KIZ$M!gjXb1at=2uw*HC zaJ@}#D3cQ`AR}mHA>3K*VpjnoXcwSK3PPo8exv zENwSXlNQv;O4*!NJD1j)db3=$b}o^cTpA}syTkq0u&Yeqdn7TiDt? zO^rthVjhta<5}n4zD&>JL8jr@pKm>Vm*_|O%yfF?Wlz7Sg=MD~G_*N&=8gknqeDh} z_eAikU+$k+ck@v6$IPP$ck%L-pPLtrHk(&2+!ZP;d<@uR+ zvBRgY{`2*%@!!+>34VAC_DtP>rjHSa(D4h`PCmGO6poG2IyLP$=X=V&oJH^U b|4Mj>eM9&5q}${P_aBi;bc(0icMQG<^&^lS literal 1281 zcmV+c1^)VpP)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q zuSrBfR9Fe^mpcx_APk0`DiQ+-7B()|llCC&8~_9ZOOjG`$N(5AgBP=a_>FBo5Rc6{ zcWSMHs_eB^NGXxTZxer!M7{;(1egF5U;<2loWOoNmb=aGZ3$A!uC~(Yy`P$)1ai*s zc^^

    e5 zpc7VVMpEYo^nu^$EiG0z;@j9=t2R>BQsoEqh2Qb^o*%$W5C*5tPjI{@0g5{%{>1U= z^8;+%(F1P~bZPsOo z{8TtK{(2ry#j|(s-Zdl(_+ciT0XP(8keuTYGNLb>?sB?A>23V9m;Vr<4FLvceDwDu z1S~z@C+y`wl=rlwFND+XOoy`=C63aOi0ASX46$F-)&m+_-fEogQaQ@Ef9g~l1HH4I z;I<9_Ef0QE0S3k~79VrM{aA|+@^d1bc=qyX0|9_Df_vK24nkoHjD$FVKF&<5&;|T1 f390fE7#r|6QDD!io!|UT00000NkvXXu0mjfPEsSc 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 d230f981129dafe5c79f918dbe3795653ce282a7..1ed63f580fdab5b53585e6e1d85bd994d4583a5d 100644 GIT binary patch literal 1449 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nAI{vB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk&``nLQqR!T z!q~`EN5ROz&{W^RQs2-(*TB%q(7?*bKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvryA&s6}2k5wiXH@F%( zyE?l%83Wzm2y(xLi?e~7sfnA3o3Xi}nX8c!RBs9vzeDw!;MA)Rbc{YIa*-k%CIn1D zASOKN0y*%+pPC0u@kPL-tyESE%ot3Po-U3d6}Mz2ozA;sz~ibpX_9XBC7ug9w|twF zX8-&DzC>_AhPdXe<0)x5kyB1wQdQ8+nP{_T&%@u3nFSRWYR%A0x^RtAP$9s8pM!(( zkIB`0QD%@&XPMugc3Q;J;em*+b=BotdqS0)4%^H*6}41((|>tM@0}M6x)-v=9-YC- zd_&-4P28zXB@b$TsQ6aSVdAa7Z!dFWxwk~tRKuW~PwKgj9zMIJwnimuy}o+-pU-7% z4M!eE-ZDIXFU#F*s>sBp&g&OlyEMoDdgzj=%jf^w)w+Q}M*h7yZ@VVq{$rD$n~s{lmFWvu#h1)B`LSYrSMOuPi1=x$&rd$zb2cXA^NjDdJM7m*OCP^d zv-ZH&E0%&=vjcwC>`4t!Yc=V+e6~_Ii1pyFw<5EhTDGmbo;Xj_ZSfPA!0DZZ+E*_; zd^&?Y{9x(PYbREw++H?k_Q6+uugXon)gKcQ1|W1 s?aA*Gr_Vn0-<{*tPd6Rjf1Cyk%9&|fUM8)(0V+H_UHx3vIVCg!0N)NIJ^%m! literal 2660 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 F{sNkg22KC~ literal 2625 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 E2OlP~=>Px# literal 2740 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 KK(K~LP5(b8X+5j} 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 cc6294ea363b6d206ad5d185acb985f22d77ae44..373b8c12a4f84cd89efdc7aa61201a792cc419a7 100644 GIT binary patch literal 1497 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 rY|kheyU7i#I`)E6e%lBy#tZKiQ5n8zlBSK@_hM zdF)i7)ef6QiG%fOJ<8x30ydCpLa!qUA`#Z$gcc)kOhcjsLFo(>kpz!F2(TuxE-KfO zIc^K=jEGxNd=!TH{eHDys}`jaj37x8!!?*jg8~F92L*)=pn^OnqQSz+jO6ht9#Me9 z8fmAvLNOx1)5jt3KCAVKVnH5H6i68spnVvj#xb4`$2EqQm0a#$H=c@?9YG(5<#MvP zLSjHYTyr91kh^Ca3Il;RRF32UMWIVABC~?$1SQ*IM8J)j^{^Dl5Ogx*q*0DxNz|33 zW6)&Qr9qQ51Ws!>oepPQ5j{`iWTV>(MSca@&N!WN*3tjrv(H)_mI0HoU8n;qLabm9I;V{OyU^Q)W7%yI6ZBVo6F zAVdBt>bD~W6Yga2jXnD-e}Ar})s0`=v!IdhSX_PSc7Eu=d$FfhSCkzdYB`tF!mi7? zet%>pZ92E`ot-ygE_Pn^&m6e%atHP1@@sv)%cmI<>VOci`Yi3}mWqbqwC1+;L-&`M zYAgD*XF5wpEJ)W+ofTcQsaT)T*Sq_yLYMq;B3wI(aYxpFV)vwiMsPcXQLR{nwkyD_fUttI4@CII^rN3Tikb V^zErx1bPF4vNLR!y>Az<`UkYZMVSBq literal 1254 zcmV4Tx0C?Jsl+SMzWf;dlyYtSh2{;E+0gJ(jKY)-zwqTG3L3g{$wouDv+hW_8 znCoMPiX1$ccrw9X5iY<%0|`MxY)DKvl=ve=5-x_+!%TMv zXvO#R%=3Pq@AvyW?~{Sd=T+Z#(-zEnp{kVf*7(GvmAOHhXIMiwYpQnO=gQ?FfU57i zJaX>+ObX!I_LcAd^Q@`Kz=qTlK(iLuvyeIlx@-F?1mhO4=V<7Mka-s9QsWbokjVmF z^(Za?T~kp!4s@x}No`@q40Cbh4CzWGcl~Ud+tLC)h%7op= zT>sBA>$aBlHUVpcnUO=lR!ALdsDVlxe_~gQBfyK0y6lJf3a}Ycf3#-Ca={irt|ajcdi^v~yrE#?Sk1c_{KG&Z<^rEXG`|s$wbP5r0c> zEaucV)T)I;zz)#&b0k$o(qsyWjmLc~DwN1$;iG6Wje|=GiHAhtq@H93XBAu-iHhS6 zqK?F45ru=j3MNvx9b=key~v7PA}jWaA+b;F5q((VHSxOGFA5?n`o!LLZ8@QDQRjA> z=UrMzEGir!f4aN1wWD`Zz3tdnPThH+y7`D_x$Gx70Rm>)$nDAgFU^0qp~G=qoO|oq z+Dr2se%yTZTl%7YUB9K@&=)!g{a1ZKU(j!m!^NeJWEP2oha^ZiNcM06myjwhzv0nL z;2uz%_D*+qZtN?k?#TCs?+tUZr<2Y8lKnG#J^N|)Z1(quro7^mw2!o}wC}aAwQsZ^ zv9$Br1?>mzqV}csZQ`v~-;eg&lS_0f@m8F*#5MEgM)L);U_NKQWDa%s%=KokIbd!v z3+Bf5yCwCKy*NzZwx_zXR)ibF!{I0rML-o7kK+&Re_Sm#iC!`I(AMq|dqvx&Q8Wrh z4$IhP^clUzK_l1kXKXPFMxU|8C_b=t_9`971S;9*cBYU7%%E_XL*f!3LwPI&=x_SR zl~Zqo*3NA96)WfauCxX{dqXw500000008jUPTTeK_~!fk7qE^G+bG2E QssI2007*qoM6N<$f+M_MEC2ui 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 938ca1ee79a0b9794ea8963856a43cf3b4d3f7a3..ef433d55c02ec467979ce2775a5719ee4182becb 100644 GIT binary patch literal 1225 zcmbVMTWl0n7@p8ZO)ct^DZDUFHELyc=FHA^cE+ylc4pfyVQblLpx|{bXSb7f<_t4u z*=Y?zz>tt=`(O}b2xz33NURALMG0zrFz^D2gh-8%Y99cbh)RP7P4!H>TYYGFaFRK< z`M&@1o&TS`eZAc)8&)?^6tyzjqvgr`K=j^o7a7;w{97l}Dx4X>{iuj5x(}(eg$zh% z9lZqeP`5_5o`Y=^RkzhH4B&y>dc{OeOph?J(D4YHqT1R+PdA4krVUuK-4t`<^ydt1 zTPbE!BFE=E6%N`xqdx2(?Jbz2L#Avo?N8Bdp+XEe5bJd447-66rkDl03Ry?T978Wa z@KB0b3~C_PN2|z(bRw2uOv3p|K(fae661wauc1+>!Dhauj4tEl9) zuBtDxOEH5OdkV)@DwS9z9z%YK1F|f0yub+pOAu@@;$l5y-JrQo#pr-PSjU3Neu`p02wiv5Y)7w%4xNe?~2F88aL|(Sa(fW^KBE~RjzbL zuA=%-$H*@rG+e8KzCnahFo--_Rq4kz*{+2u!Q;^lEhel%-`)nTE+0Acg2alwjC+Ak z0HLVMY}~LcR+Pm!EAy7j8c9(yiZb6S8gZt|xBjnm90`hx>f}FlQ#&HX7%i8&fNYlf z2)d+se9|SW4$Q${Nv`=+DnT@zq#I z)9#O*KlQUz_c!Gaf6E$h?)U9G9$hy-Ie+l8`&))ry#MUIbC>=omcGwrPFT0k>HN0Y z*Dp-g-#&k{QF-Ldt#|KkIlTGQwH{_?y7&_Q60;Z?N&+otf(&3kn z?yO(&)U7kB*w>zSy} literal 1245 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 CxM!pQ literal 3384 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 E0&e`DqW}N^ literal 0 HcmV?d00001 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 1c629e326436ec20ff1c0e7856ced80f55e47e21..0831aa3a4e2e6765f97f434898a11ec29eaeeb63 100644 GIT binary patch literal 1424 zcmaJ>drT8|96vzk8<`I_44b!eb0vX$wb#c8B2WNri(*2qHa^O@ra3rshv9J6vmXt+-8ExcEwirhx3=*@A1v&^ZkCl zk6cY*e(tR43#J1AFw4Ho;#AJ0$Tu}!*>^Yiw91hpTix;s!7B$Ti2+QsP|SdKjw)fC z3`Lihe$QkAK*D0y<(A!!<)la8U@C%vL!79v0U&c}NTfV|Mh1(S5|%eY!(W|(K$bQ_ zs|g3{5Y3E_T~;A6D=P9`o(jLmKtoHjz|0V-IN%tW0z=#eK0t$1gy>QU>FAK3@}FM)i{w3;wVNSr~$#y3=|_Vl*Camx*#Q*M0-i6 z#TJdFyo``fmPHalg25mhRKtQ)f?x)N0YPyD$1@Z}MxdORsZa(VSQPVMVFDhB6=hc7 z!H7qySSXW?kfQW)3Y_S0JaNniqJ>gQhJ+{)!C(~OxJX_T=z#2Gp2~P8I^Zf78N|s1 zgfhva^uxO-MpkO~{6G<)qK32xo-&T%WxK@)DHfP!X;O=;3Cyh1*ib!zVOGLKmx_dm^!nUo2NT%U}t@^~`*46jVQq>T2SBJC9bhzINzlPh%9;_T$- znv(7e?X5ggiQZ0nt8e?Hm%jUF%ar&uC#d5}&ARRACg*Ire0N{lM{R@f_`}hT zRkeGaEx*srDa^Ch{!uY9HVbQQ)Lhu{VdWavJxy;}cUNcTVC%(`Bj>a$scyWdwe8@~ z-`4lp#TC$5i{oPcz4UZ0+>kKXteQOh_6=hG=L1K9`E{GGPdP7>`%K={lH}=GbB^t) zR&DE|kuWE0KzscU_e-fr_NfOWY3F9n_r+_^g~Q?D^EZz?5PGj3O`mc2i`g|zLt}N= zma29`YE{u$_MP0g27hVZvNwNddF@@p)@j++PAUNVde zQ2(RwqgUhf11-QWe?Hvh8cF2D{cz)MaZOO(>;Cmt^CvreSJfn399k6%_rf+T*sGNGq*43 z)>Yo}{Pg!Jtmn7Qd1D+b(d4VX}Bee*fj6RR{a;t*;rMh61w1-OfR}(#Sv3 MZq2u}<*eKGFN#qOzyJUM literal 2010 zcmV<02POE4P)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%T zh)G02R9Fecm%nZkK@i5*=W`qfA)|llr^k=%pKo1XNhDeVoFa0}T!5J0 z+U%Iga_QCp2pBGG5P~D`$KDURDv4?om_P`bA{W9;n#ZZq|)us_T?1gpIoqX48-1JV;Xl_NQqo^`J6{b>$L?8#TvSP6h2%7{SBRo_=X zeRJVdwPz0X0!7IXMlt0UO1CHgHa+{cUogFPEOpMI8#d&W%oXhO)B^*QdVppXsDi`n zAqs%aTm({vqEuzTsY-#bFzAN^-$Sg+UVc~$B?FuA;}qkfBsji((w_~iaq=P9wv$GI1sEf1B@)CeOrrq83<$!3LY6cl zju{E4tjHEU&j3RROep}zRRtsp04D?zbz-EO_|B%;Xf6fgtq@~kf;R#il|rX$A$|L> z@?(U7j!-#;5rp%AHJ-^7mh`&%O0fa{7a)i_pMBfGq zC>Ho}q9H^3&@b~S0M%LVE)F#p7_uTD3|#HB@;U2bhydu3LzRF-g+S_hHtRj+;{&15 z=nHgwaF8wM0*4PeK(L=Rz#pmv{Nj-{AaDT1yz@8}5S-sUvF;p0G0%L$0iHSEgMecn zdqP%R2H7oo5cMZrr@l9`LvzFOmsvCZ`4luxZ>&BO_ncc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk&``nLQqR!T z!q~`EN5ROz&{W^RQs2-(*TB%q(7?*bKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvryA&s6}2k5wiXHy9Wh z85kRxxVjk_fZgw8Y+&eOU}@=SZfs=X>|~?_)tiFF?@+yNIQ8lS9itD5T%^c`2?0|O zhzU=+Kn^_dr{)1ud=W5dADFe{J_7@jj;D)bNX0Fipxs>}fdXq+Rp*!cm%qbJuIC!6yX*X1+u)s5G5o%l4L+yIyjipPnyP%- zR_;3Eo_(3G=6u@zSoold>S347k-O#G6Eko3Deao(H7oeg-@Gv4?zJ*2A|5QAqI@}N zBg@Q0iAas*PG_d(uxYhs$cBBceDC~CG19qZ_Tddq-+yw8tEML&<6q+I^*ukf_QR*U z)6dU$;s_13%wCh0n!LO2`0x2I>Pmk93R@m<(#ls|qT#v9jt7pDGdhyP3|97Bl#sKp zZ{}NJuGHwkx@$#Vnq}374F=qI4P8H+i&k@QXMc02ezyF+3hSvsEImgH-8^<=Sw*eA zIzxTEy@!_$Q;p!x>c>LUPc{hHbRV|i{vfn??U9a^E`51%^NuCiSU7U7GMegO@N|Mn zbcbVPG25bJD->;Nzs}o!r(lwn0FUUJBL`%Xb8cqc$Z?xuyKnC9@(Kp$WgkDdtMk9N z`Q0(oH~8p;AGiL+nZN(FFMiHChdYf=_aANKOkk9a{B`&4<)@#1uWx1j;TOL==vl2X z&+J|A6P1s5h;EtM@ILFy+ST4&pZERV7~#bH$g+^{-uB$?**D!&*aEG6n*LC4hhs1$@#4q^N)hNC%~h zNRuK+FA{>%d#`cg8+|iB-ppO=-gC}g-?#U-%Q`5TDnK*6b$osf=jfHuOx1#S#?aKia?z!j*dsCnH?EismQ zx^gfiLe$|WMih(irm(4~6rfmd2bc#O18{`9xOqYN)@mF10B%kYJ`1p(n4Y&P+|^CX z9|bq@*Efavd%$F!_@Iga1*{y!0RoP30ALZGUT8TigzqoEa+Li~GmsDP7X;%0;rq8J zOFct?DiQ?;fJLQ5U?30(AT28j0?SBLAV^kL7APhT6c-nvAVknOFN_0L#0$;; z+k+Y$4MVwkW89ElfS(>69Fe{l2p>i1zf(YX>*@XN*bDuuP?VAZu@2rqkf<0Cf%uu% zUuZPO82%p_|AlY=i-J-5;mrS=OsU=f5A+jAQ6r~@g!v-iUKnjP2p`2F z>g47m2Ue9-1FNfOXh=$lgFxzFWho6QS#=FbX$ciI5J*b>H&@#WjdAdT!GCkz{==o9 z{|{GA6$N*|AW^1Br04JM8M-1dNVF@`8=$HRxM|_$<%IM@-}+hEUqaz1w|j6W4HOaq z_^UK>ZvPNoMH(z7sjMQQCaEGukuIrB5w5PGssU1!2B|8Gf%$%Mo&F*1UtG!m$puox z0Dt!Nzxw>!L>Zo++rOula`=1h;a-$sM^UEwIMZ^Bii&k}q8vJ8&oR5Kr+cNvcTVl%8arWeYdGsd~1CMSo&n zs(gRJW>B~Okksl^R|S(^)$Gr@PLA@MTe8Eu^ej)-a<0h@5KMgCCw14p9&~rf&Sh-L z&qd3iXQO9iRL(`ar8*AWfnjWiyKdhCIa@t2y7gU>F=H-l4)>tgG5kEc=v^*O&JWn{ zCv1H)OpUwXI|mcdtodd3s0x#*SJQ8-boP~*KT8mySy+|x*{4k67J75Vf)6H^7R|*K zbzC1kdUP2wr^sE?=6gC{!Q$E&Aw0f<96h%i!CG^h{&U1_D#}@Ulw-5`@Hk z*6nRVyt~0em&a*GcDO~oc5?fBqvH#Q0x#w!2SfVx7m2cCl`NeT_a*vOMFUoJ@|LS? z{Drd5o9F?mXe=LA>5Yp&dfr|q^cVtxT$YxW?&h%Ty+Z;=TP@ROw!S-fZGPB9K9Tt` zQ5rwSI+uAIdCtZPRZ1j2vgboU?b*P_S)#S1r!X1ZUfYiWg0WHV%<}$7f|f4_>*n@2 z^8Bs)Vj~O;O?T#>KJOxM*77*VxmRA5H=Zw>V@%*^zNk+oW17#iCKhSDrYUl>Aqw3NExJ4d(anU^drPW$f*3C3>$1S?tn8NRM;RL^g5V zTFtnV9qJf~T?SdAj`39&U0hsZgspB=NnsUy7ZXYYG-eV5Usj(JF|$f-DJ)2nMsgsI z6n8^!pzSLRpY?hTKzjWmn^_{aUr0=rq>`?T@bydjV6vqbCZ<%~JU=(zEwM`Udiq|w zpm&syQIez~ajz`e#o1YGb+kOM`^O0Wfj|)X7#Gb1Juc~UC^DCjK6m)x^yt>*%%I`H z0t*mhkn>~a%~q2i%?DpQvl!R+Iq(ZZkI6AlL$jVAePRdNwHyo#B=k{lFCXF$-jk26 z5Yjlb65<#5bZ(-+DSgWZ8(*q8N+2~WILm&|FI!t%vn#j^i`dxMDjaW8efKj`r5r3* zyK}D$XF+7eSKa{|WfoZ4o60+00m!i4hpLBC(oMlpD*4FRj(Dy~@X_H&|6|eI$=@>>pmB#rM zE2jd!;gbIBPPJSN?0M1cE)BJW<2;5d`>;9Bpd)3~7MmR8K{2@Qq3U;o2%6=>hkFgr zc-I}Q1&gQqdM;seugJ!H6a1Je`Oq_|Q)q8>@{y05TSt4^n#UaHuI`NN``a6NP<4*G zR%P@fJ=h122?T6y}h)@NI?k?tOImMq(}GKY<+2Ise@!mLn))Pln*9ueY#dD z%_s3<*YR`7R(g++onC`MlLeno+3WY9{NoQT==jxpd9EX)G3nW#sm6uIUG42NN7sa54|c>Q7s=(w+>Z zb$mw`uRUNlPSbvp!RZVP-#xSY=2n4ZS+B+ z(Q-sw)qz{6=b-LN&9nN=d$}!b+uM?@@iz?m@mjAEP&l}i`Ej3xfwUee;!0l9*(-@x z{%B(_lm49Dh1apVI@cgHmDf2j9mfAzLsmHLbwTyG9Zy;DzKyW^)k@s~w&%$o2GyfV zGYCbCw@t-$tm~OS4ffD_;*rDYEB=-B{40TDZ_G=imi_yh6F;qQME=v*PiI=N9-ez7*#g0mw#h&IiWTSv zN0If3h#hN{-W?@(0#~-UtxsY5=jW#%3qjBFGXA9OR>3N=%D z(^(%z4$%yLMk2@r9aazu*+qMzlxpe)Tm`>8EhXy0b8|b6-uDA`%fz_XBECNuf z-(0)nX2D#yK0)A7#Lilw%N?F4{69&coM_S`6v0TmK6C&fzopX7UpFkDdheq~!ilG2*|N5Y#J@AHoK*c-Shl+F?G2Au& zr{6(_zRCyo9t{e6u6`D>=LIIrsl~%sogo$vYWHYmU?lKh&e@U*)y5x!lS?0E#rzA~ zM38MR>GBIq6K{P!Ocb2`A)VafeEr!gBd&&W`uQFSVFk#?JI6WCHhxTzLt>alv~U-} zoIt9~5Lp5CO(q(dD_rp}f zRPL=ZCHPn7$&ms=w{0K4(&}$+1dn@Y#5L*Ky<8JU+Uo%Kq&h{6|D$$_#IMC(Ghj{8e_u*!_)`1({(_zL(#IHn$uvw`?+Is2FYYSOV<=D z$GUkSc$zZ$2e-{$y`5SMRgvGNjq-OoKSvhUS=~Q_^C;0R_^voT zSb^D{*6tHR1GoUoBGKma?!h>1=?={D#aqy?t2%s zpS&+cvN*&~v3lBK+WZ3bx)gy_$UdH?ap!SjK;^am{I+|93EI&QE$t}>qVxKP)HVxq zGyVMvt40%4pzF+FwxzC>@ZgoPO2i>`^@TL}$Icnen^rn9_n0ehZCX@e zgXRKb&#C>A4J01(Wt*o7RK3D9f?v27*xPfkRfmqu3Ak2lJ;1%n-B7)`KegW59!8ta zd-6VjhnU{z3G-^d*BiuAThOyPTO4L7RhRKeMDu~BL(=W3!$(;<=}b9~6_oakM8+I~ z0k1V_8t0kj>+r!xdnxi0f9NkVM`kzQC3p8`MNqDW5LGysLe%Hg2 z{*qL%D|ApfDLHw~B`*UNrbXx)ZGcj-3U=soZU>*Hr?M%{FpYHteg64ZKwDj3?TyOa G`~L#lY4%M3 literal 4026 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 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 df6735bd6bdf80de329c0922d44f203bac85db79..f5d08dd55a45732e31b078b12603f248d81a0cba 100644 GIT binary patch literal 1832 zcmbVNc~BE~6pn&osYg{nh$8Ds71SKNNq`NY=7cy#Q=kSdRYG=;6-Kn!Q3h{L1sSX;1$9s?B9~Wj3f68EZ2xflqdT+vyT0#z@4er9v%58` zf~GjK9a${a6jiW1gc$+bJ83-g9dYd|Vg@%_5l)9v2HK)CVJrzsMPY!7&_!b*m<~;h zufqaZEIS+z3#Y@?E5&+>;OcA`u9Yw{Y!)kEnboM%$6_=Pg+=3JAUJUT0tnz}AgC3o z`D&vKi@}4FOju~rsxW<0tR6wZWlMnotC%rBV6+af5^u@vJ%{590E91YwKo9okHXVE?-DQM5TM z(TMRvFf)~4(lhsAm_J5la`$N=8<6ovyxN2_m!gZ4Q~Cq~BWaa95M)lcD2|GykW4BP z`p6}IQiVbQG2z3$Qiak-Dv-+LGJ$B!#>co2qJ)%u#78ca_&|_CDCH|)1tL*Md__t~ zDwmCMRiv5Lk$P-Q7iV-wxuQ>U#WEA7qbXAuMa7L(fF_2bDRT^E1Y|P6ON)~zWifl( zZs&cla?FHp!ce7&B7k@472_X~7eG;dhycPk7@|ixe4)_5@e`o}4kqw}5fKa{h`<1j z^3ng3HXh>;&sHD*sh6=WrU-4*57o~sKJ*VpGEHM*x+C?obHPm0eXWv9!mMqTYtEB1 zB~BfQy;t`8f!><&GfL((#1{rT(X`Xen=P6bl9wgjS>3N4gC0ai%uDwyw+BzP4j;Qi|Z@j+9iyV6N<*S6!+KRb<)|PV1t_Mdc zM;tii#fxq%s*CXGt2w%V(iwT)JIYQ+2?GkUp3p1S++Mvnp`-=mg;t-AaFd?NKWs<$ zvB;?xwar!Y7B;}^)-P%+tn9ipIC!z2*tBfU-i@xDhgHg`)7s%h^nZAoF~if7A(R)>(ks{+-vM=w3GT^~isk_)3fPD$i zdD^FD`Dahes0}h)8}Zwhbv?EI^obv*PaEu+u_;M)5k6y2$Gq8^%$Y?{)cMM9n#RX? z1|Ps~X0V^JoMo%zkC8*EhRjqhmz%rQDAP19;h^+AYFfw{W{-p;`<&owmN^AV4x2?wxg@Lu{1*o zOc>Dkb{73T_slv@8r$XG%IN#vIgY~{>!a{1o}B(WDL)sm>mCpHZ^^U2n+fQ1W8XIpf_79z6e|cbM*i0i)yj$(eZL#FI zH-rp1&sy(t#Hx)~qV1)UJ<2?Ozi+HK=lphJ&biV)Xq|1OncmAq6Mx#J&(!rG?* literal 3597 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 Z{U1v6q=7*1$(aBE002ovPDHLkV1ix5O)CHZ 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 91611254d28403c39c0fc8df2cfda451953cbffa..957773472908f33a7e98189d1ec79df13c850c64 100644 GIT binary patch literal 1871 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 Ug(bnEbN~PV07*qoM6N<$g3*#ZH2?qr 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 656d7b08e544fae283fa9b0f09ba0b782c190384..c6b92e3ac614399f45aa328a1dae7bc6b4e880ef 100644 GIT binary patch literal 1877 zcmbVNX;2eq7>-5-#TcxPAR}cBYC%ahn*>5OM1&+DY7jX}ypYXibAZ{6$sz#+6wo3} z5xhY>P#gtkK$%7zaeyM#u^eKpN1=)eii!$qJt|i>Dz-lye{^Sdzwg_9pXYhc*{xxr z!Hfwm6KFIVBV?g0oLT|fZ9kfN4mdwMLM_utxsr?^G-M)T!e{|%LWKb#21JX6V~9Fw z-DS*=Mx(FOM=D9BVhM~A1`cAg;aCht3QeQ=`CE(#8jq2H3e)Ow39GldmIdh55>~Xg zf~zn}F`a&4vI&bw4vj>U<57{CVpxltVT*+IffuIsw$~sF_+UcD zOIRPBQYyj#DPh6@Z;m$` z1Bc6kK50=W2}?(kMi>MW6B9X!d=6pKf{;ig0=Ybp$753#Y;zJ$A{I7ob{}DoVP@2% zHAy@e!bGU$utE_T@obgog+54VPf8J{DCzmF?E;AR^40LsJ*FYCn#J5B&qPxgSS2Rsz z_*thO&VKV&yRD=Bz@k!Q;WQ7Y+^ggAuGg13NBcmU>jCvUFWmmYDWj|skNhszYjfZv zC?vZ$Ck_@}zP8hfD?L1d&kc967H#NkE9sOkVk}?$&DN$ow@Z8a`kBi7YUTmi%)Fs; z>)qwK&5eg0>67C*y?ABp*wvO353^^{Ti2xb_iXnFzIpB;<4X9i$IjqI-Rv9T;=Y0b z`i^N088xXJHJ(QkCdOR#o=9)b+*;^=@(+GTYB-^E<5N=s7otg<_I zadYWPMz;NB;*xt|;Hx``d{6ao`pm~sQ>w;q`KdFN8CKEcKKA|7mVS?0VUydMbS1O% zB`)&jQ%}RX$CnWenI`3^Q`c7#wRu%uv+b^McdaTH^>{k3*c9ZbZc{ich5O<{qavEY zA;#?V7tP?B!M>ASaZ{nz$H%uoX=qk%)Me3`PSL4K`wl;Gt>snQ<8HT_sAY4Oi1WPy zW9H(ICbri4r@enNhY@Vobfx`8jIO08PFOJ`Ggf&oi$-sjD;4n^7wc&A;Jemhw$)+j zU-k3;-u86E@uW!$q5_xa*1Yp7$nOZK(-!H|djBwcx#nywgJ#b1b-9=DQgP%^gQ<8C?2RXgf^ zi#0Ia@xdmedzv#7Fy5%>&97hQTsdJ kF&c9qQ;VHQ9c2A@WdJMPO{kKhH1mvH$=8 literal 1735 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 VVPI<(y2t z$41_Pwqr25QmN1%@fUcrKv+f+E!&XPG6jmpV79xd6(TSkLU18as8sHPAFHmxz2od4bvIx0~rFOx;@ykNz%iCl; z?u`i&?t*_S%3t7vW5Y@aM<+QEK>z@7&P)pMtPCXsOeT{|p^~XoB5FZY#mW(pnkZM< zu6p1=Do`m^AW~S4TlOdlfuj%?JgW5V6=Vv5;GJW+Y9&x;$jEAuf((!-WSMOFUT>^b zh%fYC8Sk}L31bxy*%wm5QA!Zahs1UjjK=PdiIxpfHLTrADVh{f1P2DAWRM*3 z6$UGCY&LGIpHwb}V^oCY486TD2U1F-Au&%0%W!W(%#yx`-r0l3qtYlm4nSq1(rNBg zE|uxb1sH%6#gR(k;a9NY_k`^&7NGoJEEyF;UapV-sh8C)v!xP=3Zdbz5?&#cf517s(T$HD#@4G@;K5DXFjwZeKLPW z)qQj*@t4W_9oS&AD{chH>rQ;=k%qNq4OaQqmanoln|cOxKeE1lwe>;HCAveS{>hw* zobwe3s7H8}xzQAj+2w0m?TI+a?&v!rnwaNaC7st<; zo&7j8wbkO;%uVf&QG*w-i`Pd>Bar~+(3)neVt(o~qnaO^m~v`b8-`4%scpdQpWC*u zXZrWdu508X&E(xAjb^(<{TUcCiapYO*eAzj7Ms7;&)sI=dKmvI_N%6eO|cSlk3$L8vBS^PzGyGZDyh0Pub@Px^v{U{Ce+Cv z@GAzzpWSvdHVdeFXng2!_tJE;n%WTPr>$#iPQO?iXw`Dr%l0OrYXG#pzKd`uUpgKD z$BvIHZY9ya`J}hv$#0KnmHgqxo--1M+%*L!`^~%sSDw@r_loGO@~|OjUg1)A|(U z_(Ahh=b$7T>AJ?GEXrD|pH59HKJiQL>?ybySh6Xaa65&2Ce40M`sdnP_guA$z14MF z?9K{Hb{m8-kSG&C9cbz)4&K4dS zueU686$bijd$5BLarAY6Xco@ZG47zjq|RL)&MrHz`stPhT`jGIK8CIGCNM#x_$iaz zyl3l9-^hG$VQ%q&rY$IlForGDmkD$eoxNx;up8+9m1C|3?NyqvHb{GuZFBmiNnok4 za*Q;fcfU+iyD_kG%xk!0f!$yKdF5C%@0nx)BPDmlY&u~_AHi-Yy`W6oUH^?}X~)iD zW#SNv`}mS3ta#&;?m6zi7PH~pk$64l=h&$R{k(_qPdyT0Vidobx1g(YdtlC(5YZJ~ zy!el6Ggl4QiWf~?Q?sQ5lXZ?0`6g`x9rvRC z+4*?mOlQT3(--(;N>6qw8cpM!%78WO$T`*lL`#od!0DyHEOle4{ v$~Re@ne90>x7e28bKebRa2!g}tg*sG3~G+w*l!=S{CoH0?&4H>97z5T^T&D6 literal 2240 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 XxRimrf(vKH`hLeILlSXJm$~I%wWCHE literal 1579 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 literal 1438 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 literal 1316 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 B(ewZS literal 1337 zcmV-91;+Y`P)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q z=Sf6CRCodHo52Y}F#toWbO7<7;KiZ5x`Q)&5%eH#pcLHU1@gK;(&WV+5Mqo?GIy%C1j+&M8FT_ppgaL5P!52vfD>>600000NkvXXu0mjf;ah>c 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 be74746465b2e6712243623dd6bf993a9da90375..06215c275983567a1a293872b8b249e91188df99 100644 GIT binary patch literal 1401 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 P|H%A&mLLV*5lR05kBk78 literal 1537 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 BaN+;} 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 358dee71421e6531731aa0743b41d46555ddcde2..241d8645ae1a7b66932f8a0c1fd424cf5263ce8c 100644 GIT binary patch literal 1828 zcmaJ?c~BE)6c3<)c;JCWtj8ME3T?94kVq0PlWYP}!Vy8J)#|dl$POeMl7$3t6h%h_ zty=MdTCG~GCjyQqf(qgRK|H`)0S8hQgcuo1NozL>wtrZ6X7~Hv_r2eHzjw{9jfw~z z?l#_y!C(wmguyC$1?;b@BmK3F>)cB(UX(1JnoA~921JK5#2A@?0}3^=1Xtk*mXUf5 z4`eW$2qGq)idTk^f|tT1%rDjKC117D1D73P`}05Sk!n*SSh2Kwv@4IKGmj z)JpLrA}mvf&&`a8K{Jz4A;t^|1_F&D+JG9T5WuKT(db3SAm)3!B6@E>2ARNn6)HK1 z`GHitG76BAIvn7$XR=TTf&hOZ8{!N6xcqMbE(hX+93cpCSR6row{ zr3g|3*exOnWEvI3q?vvQL9JCPKN{BP`x8Z{3^XEI5Mpycwb~xndu=_X!vCf5No{>h zh871^xSmYYp>#bGy$8T_?mq9xu1K>HMd}E;C`bxSqG@VeLn+`OCVj)k2uvhIAw+;C zAS@ikgsjAwJd`EC61gk^7vdmXoX6v!i34^%g%|L-0!R$WWOA4bK{CG3j|WM_d`Qga z@cBZRJAhSa^c12&@d4ii?Ykcfe-TrZ2bulEFGSCH4NhC$;lSnNfl>#&32n|LW z^gi|qeFzxFbwoOj$#tX}c%Nbs@d@{0p@b)p%cU^H71PvtVvbZI@E7>e0?$v*pULdU zVxLG`KNkL9EJ%|9?fvneei=BTo6x@f*!{HdaeizCQlqvipa}Oe)QeG{3X> z*X}wp%eMzDS*$O=JG-Q_-epwx$dg$&z8rPF@^qAHY)cE*BkY!2)Vntg!E&1jN z-QehHmv=3y?5psE%$&{n!$$uK$1?6kgsK!-$8#0IlipIk>rSeR_D|tW>GN{VaaecZ zOlMzDmDBE;HwS*KtuE_{hC&uRe)5BS@7ZIUJ<=bQ>^kUs=w|rr)h;#nmM$GTB;Pw% zzC57P(X}uO&GlP*{Q4VX^|u~I=Txm|visB(kF-54&%WY)AGR8sb7K=i=J8NVzt|6JP@22}WXn%vKxJGb!YyxsVA=Ruy? vP+n1FP?wl+fM+ literal 2182 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 IM6N<$g4#?fivR!s 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 e522259ef671643744d0d28dce0d5511efab47ba..664a34cc94ae42d796d1861cb5f34aaf0b53d9bb 100644 GIT binary patch literal 1454 zcmaJ>drT8|96xXmAux0=6}NF5Iv-nmcWtljU0PV_6{%YlOD9B~+qHM4C%wn+jkw%U*xOtUmsu~sMrwFskdkb{-{9PAdD63)vp zZ28;Yb2bQ?!t=gjt=RJ#6_5ly6T|4Ef(+OYWXp-lOrVt0U_V#Fi*{t7`3wT{tQ{#L zJeWszav?syLg5N4miPh{r2&#fa! z+^J$u0qm3%4kq+wT>!^%*h1=Y!fG@SFT(~5Cs2$;aZHEd6pm2_44!xpU`=6zl$Xw% zumyH@B&2CFg`$y2L?1EgC8Y$#Ns>e{18Okn079phiy9NviE36{f#%eJ!pj;jiEvDj z@k?cz9RZ$>hakuv&jVpmok$c&85(6|6xU;@AjIMtL#vvX``3+0(WJM5?q{YAzah=Kd77J#@%mnVrqYXIjBCJ5mX|)oh)9JF%E?1oE7FCTA16wq;7sM(w9x%-*{5u?*r$_=k zmST#Z#5`s;(Pk%3(zqcPxNaipJc1^1M_wLI8cn%IWP;01lC}x1t(EeF!^R6aSX zNO8bcRXnG9XvN}`%wIY?54Al49pIDi1qU16XjC^e^1C+GR#gde{z86xAtR|Pt?tgA z#-7bhbq#BZHV^jq>mJQ|uQnLEapB$eW7iW*R_Ko>>Ya@p<`)yk~hNg9~hthv?T&%jj zEH}T;7(M;!{=Ne{TD#@TM{ln^yMO0!!I4XH+1x8v`v$L6rryuqxphtY&4jJDdWJ5% zxnOS5seMg54=!G?3OTkiZI3zk{($%AvLA0enRw@5-Ekpv?jPQc{-MU+`lj5r!rl8v zM*lXYwEB}cX%W% zV-|ZN>_|EO%I2lds0>r+S>2g)v#EwEiT6 UWi8!!G4=;_yOz*La^KqU4>>d%3jhEB literal 1627 zcmV-h2Bi6kP)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%S z2}wjjR9Fe^SItU7K@=WCAwzDNWRXH5gewc(xN#LNTLf+E8G5K*p=G%CE_5S=KbsN@ zf$+?U1irO4>oda} z2R0c9`!!+WASJe=JARNrcW>Q}7U%1L^D`0st}RBRk%-6R!f_l@6p2KLc3%2KGbwA1 z!2xhAlgyS0qx&%S02H-aEs}3Gn*zowm5NKBjA=9)WSnJOzy(aGd~rQJJU&@)C4{w` z5aa%{>rRf2GjN(oxG*w<4CqP_Xb{05qQU}22Grnq>3& zJSorRavoibDV0ie$Giuq92gx4Qr{pL#qOM4x(8U2>(9Kd4@^Da`wXF6HN*x%FR$*1 zeR_P*;*wce!n-$?z$>!a6JrK2WYGEY^BW8X;&b>b5IHZDK*hvjF}~JPV+MHefVSIh zQUog39D58W6$9S1j1C~GLZLudd~S3A(Ja#goGq4NLpo}F zhSt%!ux8RxMa!A=CCC^+fMb3#{#K;itgi!K!~Y)~Zjse;#uBX7oLAe%flUVJ6|D0g Z@*f1)8G^7-91s8i002ovPDHLkV1iZT4*dWC 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 0000000000000000000000000000000000000000..379977b218e3f1c085b8a02b99571ceb59ce6043 GIT binary patch literal 1513 zcmbVMeM}Q)96n)L1jpi{QDB1Sxoi??uXnvtdbV@4*Fw=UES(S|=(Tr+8?@KmowP8f zgKU0m3xudBNEH&B3`IbtN{T2j6@ny!s0@+Ahzv$m5(L39C5|M4vkxSy zag-f56NXtWaixI@1i^*Fu-omHy5&-q%ZCw_N(IYM7)2$bg@iA03ZzHkSX8K<@=CtN5 zB`z8^(>%M4vx)VvuMC03+&x(+XefGvzsfOUQOF{KwQY0IPQgfMAn`;>F%+&vbXodP9;{uGJAbxgx|d7Z#IYgh8iA2@DbQug6q!LlS}Nlrn-)X=RF( z5Z37A1=4AwL%NKpJBvl0h{bgrO$sb$VcDWk2V@qo0?QY$E>NcfS7kF!igoh|!RkB; zmY_MNn5GOI>i}oci!*b`E0a|;Vnt91jjB+IRf#Di$#RO6pqPwGw#w`(yUhyC;;H|W zHdu5B4)(`?`X#g_Heqo3xckM$ZM=yp{uXgcYn~GUTHW;KvnBsY#N`+ zoxE4pcy`F_y*b`g-9vbtaLe?+)MDA+GOUS^R>|8^!YeWIAeRS3}^o zCns>N|Mk}SsjZv#<+b#8Z$f!b*nn}(vS<6!o1kwtOaF{Tue9a09N&wEuRnCY$L_my z>#29Oo!bWw6kPGX*_m+kyR2JrdsCn9c~D-zr2g#%{_co&U**)u)O6+5$ngg9r-k7g zD|U1(`nz~dZf&of8a}alcfy8G&JDhgV7sTK))#6nN9<1cYS+?%XQH;p=yv+5ezUr7 zCm#FpbhQ7Sm%!S(-ZOV2rp-qdHEW13X198jG$KHw}_oc!QJHD8h{J}FZQmq^wy)dzVMe|K)^9lbDccGvRn~oWt zsxRuelzK<4o)%3IXGLL<{X&(#B4e7BSDL|r~vgABm#`z8Ja<{06s cSU&G*;QM0R=XHtiwFG~@Mtug+tle7i4>ajb2mk;8 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..90e8ebf3c0fb4f1cf8b117280616f4652a0b857b GIT binary patch literal 1511 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 M16}?fdAINWFJW3Q)c^nh literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..19bfac3002477b7d6377df151a98c5a07f10d164 GIT binary patch literal 15660 zcmeI3du$ZP9mm(uron`W#7&A))m$!3QwZnXz4tBW!@h@Wlb-9E!`KQIuKkxT?Cp|kh) z+}+fw^5?E}kKcUf_xsI$<~K9@&;Goj{(B2bA1WmXVnJQ4yAl3sl+WFB;P-zPUHu*W znHQ;TkqBabner(icJ5k45KJ5IYnGe6-)A^6T*3OqR!|WSM__M)u&;aO>3-R+#suU+9NwZ|D4APi(y6Ay<3iHTQg z6LA^%Uuh<_nnV}5y;57PB-Au}8#FF43N)q)vyP)_T4S+Q&?c)vZ(63&Q?!YsY$Q$T zD4L-uMo(!{m)21V|JkGd0MqEMNu`5Ur8X$b5r!mVu~vgb) zPU;e5Hm(z-N0LF(aoj-SqI^W=MM0y)Wn0A#xl*fD5@oK`eT5@lZzh!>rRYJ9WSotV zbOl9*!(<^(Np1w$K^F9sd|eShHUdfPh;jgSf243APbVB*>TYKd$kPb~xnL+bXZS#c z^82}rPoyInN`UrrBnW{p%p*YtbU^@-peTz{P%M%%BPSphN-Xn%A^;Vos2hm$Mcfo6 z>6WOe0L6nE(&xYJ0*P+~3o!bG03P0~>oV3enGMe4hR;R~fpka~eEly93 z*=caP+%AL3P8JQ3t*BI*0^#*~kJD^%8r?>ti>5tBE3G#g^KjH0ZL_d8f2$4{0#==oG8%NO#medY`hdx5i2AfGo1p+`v8H`4qO-~ziR+cgY zgEe5Gseql#bI*jd9K;WX%soPn_ncgyd;a!t{g!bkg|oW0_$hCriBnc zOKKT*aJ4fmr)*9RiG}19AUSQ>AtybQM9B^XfX}W7^4yE(hy{V*fV;IB&Yn(h^y%Sl zO*48pqZWpu(nC%3Djq}<19FUwg6cN7&>YF*p&`9nXk4zuaiIC`8eZ^=F=P)xd z;kh6yv;n_^Ogp93>j{E{p)-~gb0u~mAPZUG5xgFFcJFaXr z;AUlzC2jE028J>)dI&yAIuj(>6N%v!{d}NnW{mvVQex!vL}S2n+|SDFtfJ)h&57gZ zn1C1!v$BH^vu%Kk2yJ#U+nCcca~?1*F(gLeuzeBR;h%{sxsA1 zwryr>c9mv!`~STi7cZKb@pA`{8=YM_&XfZPt_C)-?rA%j*OqhB39VV#eM23I{uVt2 zFZlEXuas-9jJmeqU2|pBHS4)r;AMwCl?`dm@lwv*g#KB!R8v89+}j*xOpuJ)WK!bE{2TjBF2eAFc~&$@ZFli7j4%s<&X z`ZA*;vD7385WK14!t+5?6&C^oZ>qTPd=OQ|g#f{uDlR-9L{)JiK=7uD3(p5pRa^)V zys6^C^FdS<7Xk!ts<`lc5LLy60KuCoE<7JZRdFFe@TQ6j&j(ReTnG@nsp7)(K~xnN z0t9cWxbS=sRmFt>!J8^BJRd|=aUnqPriu&C2T@gA2oSuf;==PmR23Hj1aGRi@O%(e z#f1RDn<_3mA4FAgAwck^iVM#NQB_qTPd=OQ|g#f{uDlR-9 zL{)JiK=39OS84X`Q6RuqMq}{ZP}X@U2Hz{yaJ7wIg6MvfAbK|v#LYYK_cMa%pa|k$ z>)^5?kB^uIBFwUcPt|3L3a|NTe910}a>mu-AYbNvrb zJ-zskXKSY(54<>C^1k7O)iU;B++HJp^44^Rx4GQ>%)OgkYtQdo7dDNJ>^}5n_0xlA zhDX{BebUhnwzeGWx9>TBb?EKhf!$}U(p1l>E#rsp39>_xJ*$@v{L?(~>6rzejEbxqG*dE?pwb9tD*&-Co)hHGbT_jcaeDIPf9 z1E%*~Tsd^J;l#!-USH|iV!q4%(;G(blUIU6O*Vsh=-%Mr<+?Rb{>6Ox+^zkZirqtf z{^f^mlM@GRqtiV{x4t)ePT2og*|&z*zXFKu-+r^9e4_QvYwvq{u6*tC^g|;-WB26v zfqhHv%=1l8o|;cg{)lpt^gX@A%Dwl^s~WiU@H(dd#SKsvuEEKHdgr#6N2#4LifQz cZt59gqNjIcnXy+;-e<1!)Vp7GuKU@40ewSf*Z=?k literal 0 HcmV?d00001 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 1878235740dacd9985d0dd1a2b2a644dde287e15..634e808105cb340ef603f63f238074e0416e54ef 100644 GIT binary patch literal 1586 zcmbVMdr;GM9FHA}vN?6Qoj7mCFdt0XBz>n+v2BXfwH;D!fYZ&iO(8;)l0;gVYz|Ju zO@^K~M4hWloo*=Zbe=c$T24jheBk34(}{MdXN7Y;4mt6dx)iC~AD(|KcggSd`Fy_5 zU)E$<=Z{U8oB#m8SW_mREsS9F9W4^Re^0u%T^N#hV;*l~T)dZHNkHdh>?CM%69r^8 zNjS?&PLpW>@DfGk@wq($8vxSMeICM5MDn1WETCvD6gd)vK+36w zaupWD;xUkgRAxC#+RCjtj`AW0=7iGcf@waDAmAo>0`$3yX-?zQLPNS5VIJLvA#e!7 z7ipoVPUTs$Km)^)phBV$I}j-fsxS$vkYgyC3Q7@F2BQcp#l$G8k*hSQ5*&UY!5Zsy zX|nN*VOzpV3l;LbM+3uNuUF!gNf@>OMllS75h*N{iUow2E2DYBC#JdNm;z364wmxp z6hnhiMZ(T3=e3aF>C+J09*gCfFwG4oN=O;(BRnuFL14E#8rKk-+QH%ap*Tnh;&5+~)<=uv}SAy?u$ zwccoyp+fjlmEM@4)XVe++#plLG@i#rR7ymLD)hKqu0v6y97AwDE>kNEm`ZIF^kQ5S z&G7{7AY*nZ!R|0u_d>45z>);dusIA<9P5CrLWXC!LdF9c4B)I>igq$yE+tx>r@`VR zOO=w&43=?&L+RB}&oOUT$_SMMb%+&q1QTOUxl*i_5t!I6whopr|!wR>l#< zZ(^{M?&|ej^QFF#nC@@u+IVLAfFa!2)4yypQ&3ftGVRj#?C)!4ZZP#ttWa)w{YK0rHGb>N%iyld)bZ76lWXTzhCJ$qj;+>HEAIEMQf{ejJ={ru;XSfsu;b3Yi-k2D zcYpNmsWnq(m8xI6c4jv6(0ZHAUvcPhWiKfgWuR&sB#EwZWoMrB`UdP;*U zG*Z-kqGSKTRVr6*){;%;lkbR2XKrnubE4(1vf7qQJ$+LGrzTuCxo<}*tBv69H$`pV|3Vt9{{$Bb}dbT(C2K z>YCI;`#Or660bKl?@sFewXHck2t>liT?eQSLpNoj^i|#chfklKdhFn$z2-!%C~b4w zo%)JfizNjmI~d){VBq@Q>Q+0k|AypZ@}#;`g@h|}9wU3q5AoaJp{04)$JNg$l8LfD;ere@D)=^`` delta 1868 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 literal 3977 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 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 0000000000000000000000000000000000000000..0e61f010b5dbf291e5fe606e13ba92f9b93adc71 GIT binary patch literal 1538 zcmbVMdrT8|9KY$v7(t!NMggstx;dP-*So&YR&9GN)LB3tf#Hkm^-53LyYud_1#uFL z7;Knv2AzO0j%3qB(2XrJQ5a&zG@{v5jK+>?Fh<>cN6AFl6{*`F#y@t+-S74Jd_UjU z@9J{0GA1RYCIA31$&rcWiX#|(<0pvU5y@XI;*cWPiiAAIBLr}c1k7&6MS>1LUP|VY zxVvKQDbff46DcacNGNhHMG3~Qz@r#N(9eo&05C2JvN%yj3ZRQDrD&7vUT3!qq}(Q1 zp~k6nvR2YdWma-zUS(E3QCUV9+_FUrL1PdV4fsg`2ZMee&7(n+Y|Jhy&ZFCq3>f794+Mq8jJ+ zpt+cRTuWS;WL`mFQ3whI0*Zi2!EmJzY%mxgB?2LcTtvwE3R=K}a+;qVvw)F2!BMP0 zF*F#ph`X3_!6XwseHntEbvj=erup$ii7A7EI19lFCFJ)<;~GQrLN58Q8?Qz4`4ub) z<&r#8&JkigJhNkDF?VkkiULJ%&}@zpi-P+whA8)wwBW!@GVw&=rrf9nwpui5EoRnR zY&I1vhL7khHoMlMvRE;zN)xm3IqxhqWBlM)dQs{%@_H=-dq_ehCrOuHj^k>V+yE15xl#ukRBDX}(YxKUalZTiqzw`s zf};KLpMHsLiA@-tzUqE)@#_ANw0LPa@pjaGP}~jx6Cej>&JSKWw(}HyJ?A}JeO<~X zzziHnuCm_L4Uaso$^3Ki9-(ov^-Rf}z_Px%#}A+7q@n!S<#_tY@}9lh zwq25JXx|w3c*+2Mq*dyzDc=td=`Q>cNqks4tGN5YqxOQ2LQmVOR}h`yEEd@DEK*X>W==cfjDDi{h&AgiB#Hl`I0nqPqymr>7*%Ds+s7#S!;dUPYxFz zE^ZxyC5dm39_vbYv0?r6gJsgM0?^?M!_Z(4N@ zX^NX$HazXK3yQDLKlq_o-ZKb6-_+I*t$u51a%gi&;j^2A&pIzw8|S3n{$#N(eB$nv z+ll3!;imA7)jdA#j=rjeqfgT6mkeFBJ^y@At1q}Vhb@(m>1@H##{F9s%&Q1{N05V? zw;wF(XfF$Q?wa3H_q;c4&5w;UetoC$`{Cv_IS2B6Pp<2C&dP8Oyn8y;o<3W;p?P=O zx~YE$t*b^uCFXEi<-CqjK9a?BEO?)9XuWi&$?)_L@Ws_%So3u0nedB~E!CMF(5_GO zvilz%{Vk%AZtK6n2{#9Bg!+!3TiGCKxZf7(1||agLhIR;_&{a!uk5g8VQrR@ntuSD CCr17N literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a8cf0d7d96426a2e0910f579c7fddedadaa24a37 GIT binary patch literal 1538 zcmbVMeM}Q)9KPwu96_DRLIJIpx-p!#ch~Qpt=jeq)KNe_0>dwk_ANbW@6Nl!7Q{&~ zVzfcy3_1a09Lc7MpqpD{qA?Fb3WHj*^M8D+1de#y@t+-TU=CzvuV$ z-j=M4)XC8a(GUbpwxaflae1wszv7W^a!AhU}p2C&^nmVj(P zy2{s_1x5&(NKv^3LV+V4cQQT&8Nnz5K2~Hyka1CfC7q=}fQvy1MVn*~+B#$~38!&7>tVA&tf}x1gAjdFVt-~=bJo?B)HO}S6 zvx$^ZEpcU%c?5yQ5ybEJEBq=2!<8VI!C*j8C8AWyMTDF$rv)+~r};T!76`yQIf@l1 zhK3^+$zrBVFv&zuUx(mh9gcCsG(VasF=a@AWD!h(B0gUvt`RgZWP^X*cq5w6EoT9e z4S1%EbBgtF&lw|&xqG`%1SoogXL6KS6w*sD&N3gM1v_Dqi6;sd<-#qP)uK^r3A5f} zv#BsKe5KA}OVL_X7As*@X~t~4iEA^XO1&jTPpH)v46~`t7J{(a^eTfztHx}Waju=_ z1(J4xFR2V{8|f#E$23tO#lay~`77(YKZQk~bq5`d%D z0#^#h_~4QB;?x`DfkvxCRR)b5b-RHaRjJi-gA!B8^(3kVD!p5Wp>EkI-}QgehKLR! zk^cBkzl?2(O&FPucfYt8zdwK$FAXQ&j`TCX4nWWZ#7>xV1J_UNI!oWm`oLDZC4M7h zh7QJ6TJPuvhn`la{keFrP(Q_bz9`ARw0rK!BNupi%f79rZY;ahgeKHh!^yGH)tkG_ zs3WJd_&blJW`B4ZP&qIYU=g=dm4q4ei+n zKMEM7JzYO7S2QfVaA`mt7iIraa&J{;rtZegVCVDpm2v6emcAu*WhbspqK_@>+_!!E zRmu9J8={_0?WK=3OFh+P2e5wK4N;^`|H@oAVU0I2-M>c3L%oOlh!AFOy8h?M#<9<@Oapgs2 zL)6^T!Reo0R(yTw(GP|4&OQYBrlz)k)jR2N!A(W^FYffcXuDEnOiH->>0({z)cxys zW6Ih>4WZksI=$MR-IWW6pC#5V>Azxo`9+^rpLa8fEs=m^Ht%@-fz1o%m4`e-%0ruW z94cr%S{iEGJ-=zo%dW)LKi1DY^IrY;gN>`R4(58F-O}%xo$Ba)|6D>!@*L^<#yyE^ zr~MtUt{e^)nL~*c^IC`ba0b)5;6uKy`Rcs}!}G(?wi~~&<{8rSp;xDys?u7K-Jj)T z_B=lRTUaCA-gBE1?)2UccAvbsqE1rxuqE69O@#Ib*Rd1}qS}aA?{{Xx& BM?e4o literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0bf673d2b324dbf2754a27fcbda0243b1784a105 GIT binary patch literal 1540 zcmbVMeNYr-96nSS#W2T@1~qYKEwtor_uczmxjXM}kGSFxP6Be&Ty7Uw;ck!J)jJS| z2?tP9%848_Mbn8iAThNh1w5J2RLChnQ?X0K90I#aoF+wV4>{`($3NPc-S_Kxe$Vgg z-AyUUuSG@9j+96wQPxDlE{;&}oj6YX4oBbFFAlQ=OQx`l%@#Z)M@x(pn?*xbCz(Ur zX_6`|I7i1zB;y$-EmO#}CE*U%DI-!Rsa+d9(m!(K(Du2M12H!4N~~ z;0&b=wYkl7E|XZq(aVaG(;P*44lM;6^iaGP7Y#URfrPxyd>4;-GyE`jt)UHtrz1%l=s9OD)k z)&&JEl3DCpK?jSTJ`Ta@w%MK-cJX705>tkFNjCyyDB^Sm;~GWtf}Q@?ji;jdv_dzH z*lC_!%Q?h)WX}(g#oRqxC$3nv`erOI#@iBQ4EEffZ3!}s0gFR zWUVTA7R$%#D)(x4>(83JHMX?_Km0)!q2TRZ# zvyP?`IMxY`rWa?PBCkh$OR5D9g%ni-tz4nZ#xxWKkMXJhlQu+j z2nqJbfBGe~B{pGj`lS2C#gqF(yTnVwiMOM2K6Y0k83(L{G0l7R=-?{$SvG#sp_5@>e zMOkIL5xs!<><9bM&9JYl|0S<}&xW=$`gP4KdcQRUB5Lm>C&ldlE)lJAoUMMiyfOB; zKd`%%YmW2A$6TK>@cJh=hYr_Xyj{L9v8(&=$jESU``p&(;=r6J-;Cexr`I)n(3#*q zaXnJ6*R3oWq8>#anAgzNf4q3_q)XfGPxU9}ZBTwQ$*(9itXj1qohuDQZd87G?aqXp zBRhUBpOV+TzM-(JzxG#q_|Q~+;URCvsqw9Ub=IwZbmPYClE!yBhIjHAb%UqWmp^X# zbAff&0{zI$hV(^+&sCazZ?kM!o8KQkXL$gW)Tf@QLHi=YJN9ht-{AUcpm=x@RM)+} zzUS*-_WC{BI(Jtqi~opYW~TNJ9=+!D?KyNPIcoa3wsAGG7bg2^FI_x)`_l_y1xYT>8_;Ms=3+PtF6b18`~a^G(DhBpD07ZA|xPAC|OBVPYnK-t(Iis JbJOawe*pgkPL2Qo literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e43f5f548f20cc499cd4c30bb77c850c755701d6 GIT binary patch literal 1538 zcmbVMdrT8|9KY#^j-XCup@7y)*&I&WyX*DAovqsI1L`awkHGN7(O&6Edw1R)wjfS| zQG*RL&Y%-C#*u8A2)emNCJIB$mlXbaPXQ(uTS9?$A6ZJ} zP^7D3-8sqt0266CuTU&>EW@3wPen#Bs(_D^*Z^Qy9N&~ zDhjj?*uj}851moTQ@NFydCtl*C+1QtUIZEfxMaXbi6j{Cc^Lr@7!{*-acLgeh7{l^ zL@YBZUOQFj$Og?UPk~yMR_TP*2&l(Yh*pCk$O2FeBPfKxkQ!4W2(HoNhz=Zk6p|Y6 za^pD`+nAQLGAcZx$l(y=_xn|TRK@b85Q1SC1gjynS}7rvLIop|0VN}(L@ih-!O7E{ zNV5zWu}GG%<)Tp`dHOm8ALnq48)k&DL`f-w0wf0^Dj4$lB5{qP1u=*E*Nr!#g}e%m zf^sNtrqZrX{F)E}Jm5X-a1Y#z%8lAUYve|Jf+p?VHDFUVYi!7!l*{0#MB6?Oe0|(g{Han2<%pj@m>EXZII*; z6zPxu^hC*7h?HK8qR15$UAiKqs7r1t6_c`Wf_WRbl+QiL( z2{@ckWxlN+8h%=n@#m8LV#8E(Pw`y;^6q)3kM#-4mIK?*Twigq2~Mi30aN2+YqoWn zU`K9e$#)*v)`Q_Y;ta!q3!UHI=vM6sRIk7ZN0)hv%s%pJbGHlOPlXl&0p z{9(W#@9p|&rK)jJ-^Dwcgc$pmvU_W?vh>$)1UsL%uTEGNZW&lwUw-Q9Wah+*&I3Dk zT#;=&zA5JEw0`D9v)ofteh3-VU-}~)_jv1^qK-#Tj^}?AeBM&M(%BZu`=k6 zqUJ$F7WeMRsrJ}c8#l~6Qr3~))9g-kc4a5WAKRqsno2_+&Yu;Iw5ZqE+@Z$Esi?++vhPg?1KUty=ow!<%6Fs~j77MnuJmGfIigm5O?y6^*`zWK_%M(p`f;EU_OaHg5^p3tkaP1PB#(4J3o zvw9z&{4K1N@94e7i?{o41-nmQSXD2pf7lZ4044$lgB!S2WPfGkuWYwwT3U$WntuR0 CY(|~{ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7a9cf711ee9a1f9d2bafb69a0fcab388e0159afa GIT binary patch literal 1528 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 C1Zy(@ delta 1992 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 Zz>wWvB&m4l^>0u)?dj_0vd$@?2>>2wP&ohq literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1db9426c69dfcdf4a2ae4de17cdb5e1367b7c27d GIT binary patch literal 1525 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 delta 878 zcmV-!1CjiW3;G6-8Gi-<0047(dh`GQ13^hdK~#9!y;s{(+dvG>Com-OJxn13#Kss% zO5!9Y5bhM{v}OALpQ8H6k-J`B!i#y(*xJ>u&Pqpn>2$kYg7kVlGWvb~s{f8{Q$PI| zF*bsB$Fa$>EOKp&2A;>_xgME)gKb>L;khl-WZ^NXU|#mS+kd4FepbN+Esi7p#+&a| z5Yg=Dw6;ByklP^hQB-OZ(c5G$`0fBH4BXva7RxeQ74ZWQ48Sx@MuWzwn;AX7-_iPR zl@FRs$26Xt=lbjK2fBN@%Jm<=?hE$lzkj~T^~-od(^T+3b}|s~iIjFMqfZMzDgbzR zx#bDZ#}VsSH-8ISBr`fW^;v)W^O)*!-VcYWy#R>LL)KTf%X9%}6a*u>+yH=2@S?M~ zx5s%!V=}M{5s(RWK<^(<1ps6aiiT`SC*E zFUJ&|WD!}e=9Li;0EpP_!wuUD0Qh78rdj5|`u>{c%YRutfWI%Si-Y943_$G%0L*cE zc9N$6J{bV&a(WnK%-o~^#sDBB(n$&Z>200s7ioUy%W19s`^R%mN{Ik`I!+3}vz-zL z+LRIpuxkkbL;xUSO^_Oh^ovc>ATlO2`z&xg^Q=4t>@(ddJ17MqVXRGD1p=Zwi)%p3 zzc`k5A%7v#&k+z3R;{WEL{ooc8HI@HW6>`p^bi5;MgpKIq*akn!BnNI4wwMo2;fAL z6kwu}(Q9<@84zkJtL%&Wz!nm2%ePL@Djume0sua-2k~jxM8eOeC2oj-ZX*%kD$oH` zl~eMGNYrtl%C-Oi9Kc1Qj)Z#sZ(F^d@3;m4e1CEkfC!VJpPvPFwcb>EO@z~s2fq+cS1=4c0%3lzLs0;H<T{rzuQ6?k}7D>4`i`0KhZ9UL6ca5&5b z_TY`@xfF&W`TmGkhITh?lkqZ#=y(9B^Z0?EUdtW&2VW_{MA2qmpa1{>07*qoM6N<$ Ef~0hplmGw# 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 0000000000000000000000000000000000000000..1c1781b82f4e6aa3cf9b651b6688307de166a2f2 GIT binary patch literal 1701 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 delta 1127 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 I#R)6_0V4t7djJ3c literal 2539 zcmds2iCa@w77qq|FCiq45XeHpO8~Qy7y@Al$;+-FYY{A31)?IjVFX-C4ZB8b71Ti~ zDpg!SM?q>uss#zrj&-TaXdMt0hN@5o3KiMGd4A(xG3Wm7cD{4Z@80wMzVGgdi&^M` zXW%gyj7vngAs(IC7|a|Dh(%XVj#RaylViFzT8qInlsZqFoG=(HCN3($h%TI*P&fgA z6CS|eK8^q$bi#oE0SDl5AP$Ga<3T(gN5FwD1cHl;3z0}9kw_38gh)g;R}ut4uCA_R zG77RAY814QDHIfL6bi-N-QB~(gG!~kGdyWDD(vY&r_<FLQ}(itoU z)6qhqWqVp+azPp>i!%ghr=I252qq+w| z1UW=hxDwT_BqfwFo(n8a@jl{$Cu~Lo##7`@52@N zaz$J|kHhDA3k2Rmk+(?XBNXriVxCywBN6(FghG)>B$V)l5`k#G(9cigCl&fhMe_sw z=F25Au^>Rgm-&mOa*2P?{NRB3GMT?jCJPLZ1qb>Eg!l(2WPxD;a%Dh}GEgCxDuVn& zLxMw)pip(NGBgkg3sNeALqkJVVWCQ;5{v*PtVB6$j-{j&d$!s$+1{0d3h-E z^7Hc#mBrec)AsG#w}1cs($dlolO?E-{+}$$v-BnU9-KLRX*LE!Z2Q<9-1&r}lrcMy~%b&PP2`lf}BdXRF>MSqxxhwt>`cxbYwvDb|6odPTAXm@PNGx3QnI}2*$c1wXZ=}EYb)OjC!9N9 z%}8PFTX4a4Eps<*0i~XRt!KC-ZZ@{%Hr3U|JcHZj)%NH2EUc*OS7#=auhWxq&CSEW z^2E=94>r>BLCe@<(0JmTp1r8 zVFQK4w_Vk#>+q!4YW$^ewBEt{KakDg$4F{`%|MKwSSm;*l9<^Adpvwq*dU(T^b ziGFe_N;;q^{gEQBwhrV+f1y=X3kJh0JXDo!Lnj)R9QPvh*)VfIQ$0eayKFNsc`R>c zV757BSI2`h@dJBS0i?lK=R7NA!RO(>CU%H^`)RDbML$Jih86%3<+A!QaZ=^;slMwB=DD5ND|@?cuL}YC^i`z9nDp-P`fskLwpuC%#xF~6 zi%WZ!n_(gE!hv5r)oMqhg=X(kkC>Q5%6pqyygh!8!x*Qf^V*RsCo0YN&ax^<;?0z{ z78bVVGJZ~9@yN-)S&|Z+b-RZF*1>K5U5H=KuUn_f-`fA$-fukSJZLYPD33L-9v`1L z8b|B4%gPrla`c&9Luev({4fmjOiiTOhP6lr1j3awJrBOQagBf-)JGn=!KVHF*bNMJ z(0*$PrKoY&PDKdyG4Y=DdIZX?vMQd`6=^2f7JeFBxwQ$$}aW2SyGWn~*a z+&ZiMNIv@hFf=+|NK|1_g3-*&C6|gL^0On!Xx_p5%WUJNQ$0Ls7jkU(6z^T}vBoch z9owv{BQNLsZkm3Y_Iz|@tA*Cyfrs6_bg+bkZRX!Rt(vX1clXfD@Zg$o5WgVY>XVMv zm$14CY9xLYgH{6wxWDt#mW*b{!V&Fc+#Td}eTUA>x+g-9NO<2uQPx?{5NfCO`HDu! zC(7DFL=!i^6?0mFFRU^6Cel?&lCEn!_8^gU96g~3^W)qG9(T8i(JBZ@oxJ?Qn6>B9W7xlqToz@M@KvUnteFQxG{hBK1v^^Rv zM*D^qsJ3{|cREy6We?!r-vJZT+DUf)>?c^t5D@SLg`<=~9dS3$YcL-2eap 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 0000000000000000000000000000000000000000..0688d43203c14069b8898e734d1c810ba4b08ef4 GIT binary patch literal 1665 zcmbVNX;2eq7!D{SDyZNU$*4P_R;?zR-AzI^kTT>_96^Xl1x7n0n+-&gY}~96P8Ago z9Pup5c#Pr!s9?PXA|g5?piR}H)>0^yLj*-&thQC@28its#~QRZuo%@bR7}KTF-DlVS{H_EH(O~ogAo#Hw`#E@oC0)sg3%&j_f%A|0i#~R zUM7g(MObBcqH$pwi7!oyRAXsL7^-K7ehq}!#k2u4PH6$V*<`Va?GpB&T`|3Py$0F9 zAcRViu!ls&L_`5Hg2VvtP6Vlj+=j-jNGPs}V0DjdW48COLtvHscm5TrOeLU$}asUMz)V zQUPBm4--ih3Iw9Vhl8XFrBI4UWpWuJaNGD4SAf7W0R#sr5hV&i3c3n>1*+sjGDIYk zDPhFT4Y$}Rtp&r~evP!>VXpAAT(OMAwG=_B3Bu&=fT%=*B5a9-6_CjWD-O(AX0+&u z6x&=^iH0JU6Y7Kh8j)b=Np z-_>so2%D5sanX?%z5EW78RfraJ+vc2Dje;R-yYk?Tz9&k5!>N=roavV-2b>+*E!G(8)#YQ9Y`^M; zm9v=MBPo{8Mrn5LEvePsuM{>Gv#9K>ea=Mo&L1_m3O=Osm_Dt&FLCGSxQhiPkGr~(-e>xpFgTAu15px_Yt2wnGiR+$ot@gSY#%%B*AM> zPUeTVI>)8Z%-HUb2~!=-@Ap+C&);i*?NOmBz8!cla;z}GcZKiIrf<5YZ-3nKve|O^ z^$!m^sgYwhX2(}GhvsbU)_q^}hPtqrKM=fko0x~0+p)5=Rt4OeJE~oHUK9Oi*^?zJ z{RFSlPN)YYN12kDSJU5@=3hH}NYuogTt#euo_f6TeAY&dlci~Ym?v-DJUecnxK3W# z;BS&-6)oy{8F~EK@6yia&ljCd$to>8Q0~wm&dT!M3y;!wJ(%|{_1L5%t4;|i968HZtFMIUB{FYn*&%3@S@HFaM+jR-f zc(b;S-!q}{>9dwY9)bN?3&!_D?Yk8jlKWc>`HNr@emdIb`YD7fBITvh`0RfG@1l(V literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..69ce87a37e3d98885ca2b39d6d33e7c11cad4763 GIT binary patch literal 1837 zcmbVNX;2eq7>>sf&^n^1CzK%|#N3nhOXBu|O56pqpeNAtW1xOgl+YB5)iYACP+LosP|IGaESS!mM1ay5bhG9*Q%<&o@l4J1IN;E|Rw zqo`3jA)-`;XX=sI%;-3IrdrNXkQOcgLQGs-fd;`~z@$mj8n`ANX;?28-#f%02^fZ8 zY98r>Q}Izt03oVJ049Y+mO~H(1aT-3lTD{F0|6QpVuDl-2vNyYhzn7|T|`XL03E-LDyVy$5$QFzKg6RZOv3Ki679B~b!4Ok5FuN$94 z8{*751dKrpXu4jG*CW|?l#J)@^M)Ki+#9Y`ufmH0r-@K`x(3l=5)qGt-%u1P1y=wG z1xyA@#Age{VmgF}PYV)=Lst2#6iN@}K#-WpW-<995i^u7 zz@ymM2TXkL5b=Bp>Vk3z}#gj ztpYU~<~d6AAz~4tS7jiIP(7*vhI7nSeZmJhhf1f(WH6bP46(^9np2+G74VDB-uTQt+~d`+ zz*2eZA~y?|>D^WMn$mg#x%9yD`spK1ANyKiXI)+0R_H3HQ^_D*d7#hvYTA^Cedb2? zc9&e&J;cF!>CBBj@D9I>t-D$dzb~0*7QI}am{>F8Y{se+@qWFp-u#|AKwQuEoa)41 zwKv;yeNa(z@biwxk1w}>e{^1{b4p5zX6?k>tOq?kJuV;!mU(t{ZYzqk?mtbu?KZyd z;lqc{#O&{CJc@nlafDk<&h#IOk}84<@_TuUJo%MgH*#*3lPjmS>8o078Mg47lTQ&5 z`Oz12xz%}3n+Hl~U6u|lwa$>O0A^n;aR(bDkH~>>Xw79B@-k87AQpU&+wgFyAbG!DAt*{nBrUS;})VAil-DZs;mYU=|me+QZ zcDV3f*dm|sB2mF?H~%fi6!X2^{ybOO+n?zYJG(4eJ)oL;-9uizVD&B%`8>O9ntG1c zPHo549qk+Fd)IK>I>x1!ytjps8>JktcRjw%-r>#m$qCg>!M^!X-2TA^m;3JCt_$dI ziRbK-hFt3lA`^=91>cBcwyA-Lak{FzhJ7p92}VmmPt9Ye*C$WZN7vURv_Fn0m0f$6 zS`%Tq%bsI<(XwOv?(416eG6TFdvNmSH5;asTLY_}Og~x@{^nhii@4=T$aU*QEYmqM zs&%NTs5?h6)JeK^T&=ORZC;+Bcwq@qrQQX{`|UKZ3xMudwZ7l?N~Fwc4PtJj`xi7` zX-OnyhurgbLgx1@?q2KBeXQCEJ9K_e${!)#eJ9E+Mb)jR^!LT4I|uhXFa8_j?g^82 zZ0jx#e_FPwxJi>&9v$r4_lB_UNxjdr?b+k)U&MFU+kvwt*9%>K8!L?1k>?3z$@ak8 vxz@$^&*ag11y&fWzDP9fuRn8zH{gGUkov+Z1a4$UJAPmiakQvhuqx{x!nxls literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b02e0ab964f9768b6b60b676dcc933a2b91a7ae7 GIT binary patch literal 1664 zcmbVNX;2eq7!E}Rbrh9qix=Cq3KEme<|L7bWH*6S!)1g>9c7bUk`$7Sn}sCMQ3};o zsdyES8N{oK9OA)H1relmpm@}xMLQl0QxHc5l_C|3lx`4ce>nc=&g_2QxBEWN`@Gle z=IF@qNfTyHV6j+})DdVbvjXnh`#t9Q`opdx%;HBYb@U1{iFRNV!3x7kJprgKn30Gj zFx<7SkqBY2JgsJ}j@D_G%M7H2i@9yMPK%8}vsfXaP8()OCTKuU7|m8W`0RWw2$*p> z7%$TBG&Y1VnIqCEVnuqS){vfTkm6wI5+KAWV+bq+jR8(eiq$T2%E2LC8MAl4hCpD* zgie-&Z$#-d(EvhH1R&yyIR+Sp0g03gi-HAw(ISA)gGCTe3c)-M50=3^8J`CXUm)X+ z!jojNsA||3bCQE5nzqRx$l-8s9Re;%86j9Il|no|#OHGu3y$4or7D3V{Ma5rJrg<84?WDik6@kxC^{NnuziQV3x*3=t@lC@hkQ zkx{JLYNs))ff(^?X8aCgmG8vL5Q@NPlG2i7%18%9n@F0pn@AggAVU=g0^`kAoOIY1 zx=ZvXVw9lFX#}pKNDDBOW10Ca8VpjNfUnnM9B~pH%n3FK`5Zl8pyvoNJx?MQ8N^bd z0362S|0j14BM5Rg$$y$=`GtoM$q(J-y^PW5h0 zj&InMO-8va zB8Rrm&E64#+Lj!cSQf{=P`_^W*2jZOIg1u-Tg@%>tDCd@<7rt(nj*^UL+f`nqP!V7 zkGl3YJWDEfP4PK)v#4X)ueY95BnIW(=-%4UmY&~;kLe$%DKN@g_EzE#Tji}1*m?A( zxvtw;x~k2uyDRPd;sm`HC73WMwQsmHyr9ZqlAR#wMBm4ULP`1bPL%v{ghbPk8 znR(-s&$EKkxIg=&dQN!#et6I!5wF_F$#V{RwK~^zuRhge^4|T){JIozN$=$Fl-mBY zcP;l_vi-TO4cBwy5?X`KOx&3D^pR2F7nUut6govRIzy+3`02Tt+1DlU(Sd3Ew} zz{>awPIzVUU`LQ@o7b-WuQng3@vjM9!+F2@chHeud?df7GKL-Xx~jY4q5SfrIqO5CC*-eP>wn3U z%G`1s`|Ieck{4i5W&tv@Xj;t!_IB6L=aBn3iC^rljB*wfHavfji^pXy4AcX4?hoL_Z2I8zCWvhGGJHFJ e+|#;Hk8!NPdx;IM676aCKS8aGM9UP3S^ogie1@z5 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3e164fee08bb0406cf906681666b4dc87d50c7cd GIT binary patch literal 1837 zcmbVNX;2eq7>>sf&^n@^D8sP?D=H+L%|#N3noWWPgixT0)N7M0B!pyRvXBI?mP661 z)O!>KkI+#kpa^tmQB<^|Ry;skK`KzLiekJ55f8dSu>IlqqdT+vec$^%&wIbKn_{9D zOc>`mjzl6&kcNw6i4}0X&ZCL%+iAT=iDf!2NxjwUDpCv^2zlp_#RMf=wcY&NJ%~g$Bg|Ihw522`Kiea}+?W6i^nk zqv%n35vo#$XBg19jOchphDO0tQs&JCLd|?affmIPz^qNx8Tn=bWk@fd*gM1^1sH&jeu|YZygy>W{#E0m71|1lFD1XGC>LMC$ec|#5$;SFDAP!mN#QpK1eO^fPqsaQZEZfHuik`F^7 zn9bsdg3|p&hGRw*rUyi#p^5{u7OQni z%w(MHDA9+A#i&7@jw-_pm=+kyF<<=&9~3+~lOdNQR8A7arE(Q4235{r%Bd_wP7mg= z6&xOmNg3uV|4;5f!XePnB>!oe5fRaej_t=0APygg2-OjjV<1K(8f2{|Chu#hSQu|^ zIP^JS=Ju-i{4)I)Fa&U)vv%J zMZW{oHoNW=mT(WFg#ncPwD@zk*Jbv}&_mqC}I>}sn_XUp0YntH_@6L;muU!Q1m53+8(XPkGmeL zntQ5b`AOMJWlByP5;EYFmN{_2tcon!(L2Ys?=0EF!{eo8pt4<>j$1>1x~;nRPI&6h z?uBmU8jU7<o1yqO*Xj5HdVe9@VQaw0iKgSqz1*OetBqfOhB$J zf1>LNpTI-)^RX3zh{^8XA1m z^GDfWdX-jIP*%pQ$y;G9X61$S0^ZAKweKB$(v}aI51I;68tZa*TeQYF`f}&dg2p?H zBl{jKnC};!FW&Cs7O?raa*nUtpBIZB_hq=m`4mTM`qh(fc`C~1uG&SRUg8$JYi4@y z)V1E&(X^hqcQwzgbxc~}``!iA8X3>~UAKRoZ+M-3Vq$r1h<{!bzi;52ON)oE>s;nr z@agzM!9=JqqR0}T9T-IZVgqZG=pPj?6j;6gj&iP-tT`UR%JE>vo|mUw%1&* zUq;CaeGuS;&gov*vBtCGc)1gP_|l%_KSF(9long_%Nx!ZS|sNChxR-x_#5Z%Ss-iO z+EEbxqi6Q8`9cG)qYR6WsS9eksnfWP4a8-Bgux^*$rPiqZ1@SHl5K9zi5SJHY`Y?L`@{IhF1dT(_wM&R zzvuULRXN%7$7@rx004}4Wl^Ua5$f~llsgC1C0TL!ltog$5}|_}kjY8`4s;20 z0q5apwsgg5&H?}A ztxzuRM%=QUE9A4vg509AY%fz*%n&RzcMfQYk}83~DKr=rO2iNuwL(L@q`Hs4h9Pjs zL@BmH&qVp$IiOt%av-iZ=@=A6!E{28;${Pe&jv9B#bJbiQACHJB#Mw20uEo0>Mh9T zlOD=B>`Ogap+ZHGNf?eqBKn9yF9i!=lpqKg!C(y2sTR6Wsi@FVoft|@Fi>2G3G%YS zOClI&qyth|u|lfSXCVl(+x?ta3=JnrO&J`eWf;{Xupq?a8nO;49`0WmFSHJMOJxrB za3LuiWYl`(rzXH^?q2RFZm6mu7Y2E?D0B%WF=2rd6&GcN)GvCLXGt4sx8X(;m1(v) z90pVkA4|76oF<#WW~b~1Ji+lIEbcTKO-3{7G&l(qb>IY&iQ9041H&*A?!c)8)+L4% zT4cC{UtaY)j746GCGA0uR-~X;l1dUCkW(lrQm9apLA!mZ;^53&USy?6XjZ&L&myL{ zAit7hok2+ehjL8vFVMgchye=(Xq_n^HS5fb5z_@QLqKPw14z0FXH10A01e~W|C2jd z6$Hnd3;zV_Fg6fE*Z47S(fDu|3mFbOMY1-LP-8%0TN;upA zSJ^99!Fs)|EpNmnAO0^Uq>Fh@nzlej6B|wd3s}P#o|c#{Gy547&Ur6+?YuHTS5lCOQ8>t|M3rfPD( z*l~TZVsg_m{co|R`r5n><44)y^p$e`K2Oc9&EoO2Xk+)N56&FyuVgCrtv}v-&o>zQ zW_fs1x#n2Pjlk_=%j*jQkE?5Id|j2__3f#fHlTgG1xHt`8`s|7y}h(N@Ha7i+~@3me(#KJu1|Wu z-ER4~^F&+uE&uBmCWhf6V@k@s%Owvt=V>0alqL=AKgXJHLbrR`0$Ye}rRREnubor0 zd-kNx_fKUEWZf2TUi#~C#m~KMsWt2BTdN)rReP-F!KWS7#ZtFsasOsuBrtWxl8MPe RS3~@->vCjMhiv}Je*kRAJbwTH literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..af7954833b77dc57d2ea19893bc0d4d48bf2cc73 GIT binary patch literal 1599 zcmbVMeM}Q)7;hj3DMLw+sbqok*c6BD-SzvLR;70>cB2ey8C4v5ZI5z5@9OoSh2R%# zL%`@5Zj-1Hb$){%(F~16w<(4ryoR?rpL9&Cfk$}-fI7u@} zIEvR?B{c#;C{01E>0gX@1D{zq<0r*@6v`6jJf)jex{626Efxv_a zm#+n1lCql80gPcuKrU8@>q%@4Nx zD24_C8VMUy$Z0{I=}Q+}ZjMD0O;+LMPQ>I3|?`b-WHM*U9t}95WcC1{6W`@??V&#}HJBsgjj?3^4?; zM%u#>w4DsvrFgrOSp6HZYK$cbj$thfQxL3x^jwBxJh_Y;z_5vo1Bsaw?O?o~`GFL@ z^cW{us)%$LSjGiR#8^$ehJzi2r4pNs5GisHl}KfmNkle@)FzSn=ds4;=2MnyFd}m-3X7HR?%INvWjY|r!;XDZPq=$Df`Xy$Ec=`vV*P0C*$MVCuO~MEOOt) z9{5?mPxCq2l63RV)S0`Q+VY0Q2jXioW>;rDnRU0d&f*U#dc>){C$Y#B8xqx2|UMrs$> zlJxy4Jo4>JHRFXby7;Q$@r|*u-f-zq|4~|2+L&~7OTx}U)>D05s%-f2 ztz0g1h`5IC$=G^N%bl3!$sQITY0H~)ul8!+qU@Nyuu-&g=}yg^&XV{_{t5jiVsx;} zQxoT{-t^V{k#j3Ptv|Q!`;W7Mx)J8hRf8{3OH^zXX^RFd$62Z=9BVRawVQf+7JSxiFLRZ1C%C2kEt<4 zm%5<|6VhnY%mz&?85kv$q$jCRuX6t04sFZ_= zYEms2sK%^#GJ#U{NL)AtrgHagM-D?u4g5J_po)SRWjLB_!px*nCZbbcm^ymva>gj)Dh4a;{h&%$2jbatV(o zW((M?DXh|LB@r`Z;3YzQ1|JP#Gqh}umJx(#S;0Im z$`b@}=#zNe|H&Ol2?8BW@}H)edPQ}jWBXa$|*5#m$V60aJ!%xWp@b}rlHgfe$&!-b(oQs)j`Y>gpFQ{bPH6*QAyfVNbk zOz@`CvhvJ@BkdQ{@74CHs;bdxrf6o10W}?>qTB*(_XlXbLl>DO1LxpxAPsw>JB5j*kd@?|4y;$N6TZsT~`zR zoE|?bfv-4uwhB0W!E~22=U3VNo7g@zGlkcaHT|7~!`kDEz4A{9=j4S>>u}w5t#9@n z3*RH1o-NtpM!IA<9ogYcFK^9-L!VeTGHp+IPH`2hS9|2c+U%?~F>0WX7jZy6TF{Ke zOurmb9HC7(sL5UTaWI@YTG3{>J>7YUP7)G!c>E{&_dxFRIFm8>D^=LB?zyM0U;c}P zH`m-{suL=2dPa3VNvm(tsjJ%K!^>Nb1?K;}DX*}0R%n94`*~NjNm1<9)6!unE9@}x z;@fh3?r`GA*3i!{_+$K4b(f9J$vLz`dtaw7INjb?xh%CMjK9`e@zD3ytQ*!DF8&Fb zv4Q@(<4beZ-yZetKVC7~7!3g<-^zgeQt*QG%TnlVN(eB%-S~yRe z4i0=%mNAY5EcnP+coN+6Xl&n?o^?>XI3xdyRmj=Sy>%-%pNx&VJv;fr{RXl2*S_}D zOTBHo4{iPK!@TrI-Qwi7L58m9Z5_fBu^|vbbiyqF|e)0Dn?#OnPSJUQ_I{n$Md_{Rrb6WkL(m1sD zYuA{K?X&-^idoXS=zQ03hF5fD^y#?LqPo)bvF1xBGWyGxZFu_X`1}tV8?7!4?|IW^ Wj?F6@Mud9DFGML<$&O0aW&Q)fah;+7 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4fd1bcf5a99b3ac392bc19bc0a324902c39c8ae3 GIT binary patch literal 1903 zcmbVNX;2eq7|!6qAqpyE6;apV0cx_zhAbo|AUTj&0~j)hipOSmfgst9*#!bfTLodT ziUqM6N5oq3LJ@7zNCj)XP(eH^plEAVP@yU#0~(ZW5Nv-q{^&RJo%=lR{m$k_gv}l9 z;_1R-v4*Qc6&hv-?9<7CS$oE||Hy3PXk|1VNygGChzVx}W26oTR0bpt*Wd`2y6O@x zVX+1gdTlfvt)4GNNdp(LW4LC6kzun~k|47YL0955pu^+zgp~c_m(y%Ok4f1Jg=(JK zD97XVp=l;OGA&GtrmaLp7&|BskeJ1c00T}VfZ32pP-3%`-6vPfobAsb8|Z`3E2ZoY zMn$V506A&G0U;OWpnN_b@E39U!Tb^ug++b> zc0V8cKd}QDgFt(c{HJIJo|sCsA3wGLbNSdrIKgy|iD{8kU9^_zysaulu-4pkD(Z@6 zbg)O!P7785fI{so@7yU!{_tT9$5vdNZY|dy@7er)Nw>1CT;s9e{-Qbizss`Jnk&Oi z2FIff=dvrQmfEW3uI2@I@7~S(>t1uSXmd%SLmdX~QWfkmvXQYa4{d?*9?IWFx0s52 z!QxGe4-eg57u#tmn+fL~=7oA){JK-`=jj~gX3fjXd!OT&Kv9v2E$iz#B;oGoz8K1$ zIVz^&7ao1VpINh3@l0p(hR8*AF99Wz)_?X)s%>lrAGG@eE z#lhP%M%H*uoTwR=JNX82!gtWQ`xn&~^n~*c{9wuXav$%-4L&7Phd{*Hb?b&mo^^^# zhdd4n3UaHy9`AleMkEe?wKOIss~Wf_o7R@0c)n?dgNx&;z|xKF+1DDK#)jq3O*l|h zC7oll*+SnnHF-MBD~c+;{gnRw&Yj4b3l~D%2OoNOF}}pc`umC#`oJwm9%6BNc(w6m zD5s*LV#{{85U8gcsa&V@Z9S)x_C2^%JNBS#{g%x|3#O6v3)4F`oZv-urAZreIx}Cl z9=TjOrlEkl-;{Vyed87pwL~*@OnBwu(vx{nW!GO$-u@Agw&Sg$LSEr*QpMGm%vpOdpad$+aD zKUGi5PC`}Zp4CoyzqGK+_+WBNe){_{xZ@!KLdSbsu#`vCG-*9=;PE*JKH9 zSzV@|3j8&qBi}h4(*Om>&W28RzEgPMdE(?FZXI>f9oH+qedM&$-1KyrN5cJ{b<<*+ z?=ETc)T`&>t0h%)UOYkFeK)R{9b~yRXjlGAxMCHargZQ8W{+;E1;#d_@S2CRq31IS zw@cb`ZQX5cvwX5kU&h5%t`C^k_~*@HWm}c(2jKW?TgIE(H}YQNnf2|k?9Gx#C_6lB zLg2gQ$#t=jVaHph)=v*lAGathrYSx=#^w)upJ|xioVnb=m6eekt9^eB%Ci3gRmw0$ JnQX<{e*lLq_&ops literal 0 HcmV?d00001 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 69f09985450078b673c03e94f9e71f0028e23b84..d11930ac7b21b2f7b8b5169bdfc0b5365efab817 GIT binary patch literal 1719 zcmbVNX;2eq7!DwwV7vXZy@1kw~7haB&Q=0?vD;EAbrn>OV>>-nb+VUyEt*EX0J81Zqr)0x~_4g2teT zI(zdkD33&PGiViYc$|DSSB2?mh|`8<(HjXgiNp)D7!j2Y#Q`OnqBZa-gBMyTfL6_? ztY^yUa-#@M)rMP5=vr%}LS@ydIBH5*D8RFD2?9NeBY;JpZZLB#e98nbm)JXBgA`!G z1lRE?Z$-t)qX7|SLIEa?MO8r%1cY#C5R(lvn9BhM9b$rX4hYeybchSlxePimc~J;& zCbfneBbHA3B2IitDvleuAefbvMazO|m?;H>I2;a0XMhX_m9U_ivkf?6p&HD~rWnMi zS!L21aV=&5oQ#MP%fR^*Lh0KO^hUY-9kIbYnJ6MMbtyHYzj=|?!%6phJ+e!lu1hz1xXiUsti49z-3}Sh4?~KYt>vK zBoZ=%Sz-ZOD3QPr5k4bCD3P*+uuvox!OSU+_hCaIHUz^WsT7v7AV|U#KvD@u3b73$4m+gOP}h1=u`~H%&C|W5Q!!#4g{{( z8q`>pImlU}w-Jj`lQt7oOHG&_n8-0#`yLG{4jpDFl?aukf!I{GDwsi4GGHY&7*Wzg zSWFd*6AV)(@#_DRJCG0rI-BG_O*8e1=tSrC-3SnecSD34h{-V#BNAHlRWga>dS50M zC@kGgu@O3-HH#{}?^n4~XZZ+OpY8i?*OHs1>+*`y8y_bJ?rYsS=Vnji{8!{xixbZq zLN+M6B{M@8Fgx=~6~%)&@FD&W<(=Ohv3`loO&PemrFldV6;Nh7?)inN|K^R1rGFaP zxqDkGU3+XUzANO#+t>@TdA_8Uuman#CB6CFo!)6QQNmyKBl8Qyxslb5CI=nkuUO%h znap#`lpb~eI4CM$;ab0PURB45rrw&^S{*_^*fwd z#H+~eAKw}67grH@y3&Ooi7hFz?+jm_Tr3r-t$F3){{Ha#_S|QTvC(e3-Q7dL!*v~l z5y6jeA6q(Wj-2hg#Lw|)wB4h#^u^bGryu9OfLk1N;QU6~)su?Cu7c@Zg1*Yt0d8{I zfgPnjV~6kb7Y30FE(ymsk1dEFyL8FL@7Rr$r?>BV2n^rfdEWQ@xmR4^B8#tD?LIH| z!TGJBCj+ch+H%*^Y!xBW~HBe%%oa^~q-K&0D&a@qZB-M5DL!<;^k zJ$v>HSzca4yc$9Vn^!)wUW_@LmVz2i^z;oZz3WKZc5rp;mM!hr4qip~Yu&RaUG1fF z$z*$LbfEvby7->7bGbP!+mC$YzC(b>rgxg7svR35K5ZC$xixfCU98){z(8T*?kl{b zb&56H+Gs0V)f-MK)a2|_l`c<4w13PPDs!AktD3g^%7glXj9+^*FWA#Gii=4HUf5+N zUghJVV~Io^>iei~ye%O3c|tGe}DbD`BrUfu21XnjkN329zNAc+ZIl*uGUq| z@Y}m;YfV>;?ZLM;=&-bnmSfL1wKr-QdStX?>CR$qZP4}Q7yhO`8NX3T@h)*Z_CB#V zf?R(ndV5aJ+@{7x*QDg+2zkj_Tg1gA^3{rmv&=cQn!^nvLz=2?B+!v$-Jh7x8t(6T lb87VG%PGTQb%$I%NY`sh_WyJ;-s1d~$Rv^CZ-krj{sBi{p;Z6? delta 1441 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 Hi`M)D_Brk+ literal 3694 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 VAB>Gs{iL?vtW+WwTZAdQ{{uA#DB}PC literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2b0eabfd0d2e3c0e0c3f7c32f19786156fefc6a7 GIT binary patch literal 1788 zcmbVNX;2eq7!HCR4?sac4rSIA1zVEr<|0{%0@-kB5Fyowh-{JtA|xA(saq2-SqKM!)o&_&xP)aulwm%$ybZ2(I@7sN!=Y8I5c6)eO zkj*65Ni-VGCL|b*pjN= zA^2XDOcD-=2ptY^89cfIhGD=*z<{}YHjC>GuppSrgak|&qC+qOLkJ53MlX=^rc=ft z5oqA3FX|)&6G&2vFqx^Tsf<)MgV4n@VSzxvgjh@#i%wb4^=TRsGtf2q*<%bSu2<+( zT2e)505c;dCsIfuNGW|Ef?6w)d?427M-xS*jA_8MOqc;N)oOEGBi4E{0{>UWN3HeJ zG%e1I!1Y9mPC?ZpZuS_M%H5|OnGGp5$P%53Dhif_5{eWxt|3EEAxM2;C{;=%02T#s zIXu*#A0QU9VJdup&~YSjN@Zijz}ct@!6a}b|4Ri#azC>m?wfD9-kxT z@=zbn7&b(sCozozAM>lC{ElMTpTr^}9gdNNPD&6-V;vBlK#+t!fzSdX(MZJsujML@ zl1SChGneRn#3-&)t;LmrIzkPM{6D#4Qi7P~Cizd(jJ={d(Y*aI0@UHd5aAkXa&**)RF|Z!r6$iK1of91 zZl7HyDUVp{U|e1mv#|5kY{ zA5&GU1z(w>!L3*$!)da>^V<+&DPVBsgI_IH-GA(Bd9d{1^=j`w(v7yop@*l& zdO2)riiP~bPspq_m$?Cd4!lLXEUmIp5BJ;xmt{kH&);_6CMuk+KepU%zh}7~pK=g` zdZeo>9{B+@w_SlbO&FNpcqECpW9CvfzdctxoXUcc16w`nqHR}B^T)e4G~A%o$GQ~E zYqH94%9b8Pzic0GnSQgdRYb2f~Ij8_?6- z*Ew^(|EZYgdhd>=r={8cVQxuQcE;N$w$E-B)SNwW%%{`Ywi}fW-RhjPZkk7Hg=5v< z!)H6)Y-Dt4L)+8ypKbPc$@gAn(n0-_oog$%mG@cgAw309D@2YJRr#Dyv6c>B4M?m~yJ^26C!_%?^YAs{3*}O22#!*O8cc-(v3f*{ zCZdR@aBmkHL7_Zj(8(2qLiV~qjp^x#6GJ!ajU<~wiHI^A5p@nq04h|gGelDFw4S8` zI!z=snImJ!jAArP7gL0zyNcrE>Y^MqUqg+06^JkkNCA43KmfBo*I*KuBdJSr1?1X! z3{rt52$2&>eQcCMmH>z`90fRZE=>(V5D?C%LmVE9$=L=l84w3#@Ii<{V?Y9kAz(6q zVu@F{u?7=?7}V&BULC1-nalV~u0V{V2!Y{p49i`qfP^fJz)V?~5fF=) zG7fA_))_Qdf$3#uiXM9mqqr^~)kttm4=lx4pnHl9YCeO-RH+aeHxuH~cxpD2red;G zG&Z7QgmXD+E}zY!F7q}2PwYU_AkbMP|5G$8M`R^Bmrq)N+&pO_)IfF)PPRy9K<{a? z^KQq&Lb>@Td(!1NxzKy6ZDblw-xATj$~(X>S5d0m9%?C*SoftmE}h z{nk@&Pyy<@)fJsR=X$=oHjwx0H?-`*c3bQ}J|4I_lGoUH;>+~(^rRh|gMv=<_NR#d zgY!GtviLDLZ^m+a~oXZVPPD%n^+OlOV zL#Yh%oOL+H2mAZId%SZ_+gnjNV$ zGH>*hD6UN4fw<9lcWf+!AU5n87#JA#X?D?AESuJdH8}43a)Uf<_+$65^{XE3T>I6U z8tCw-tY5oxuIGcS!}%ShL+lB5V1HId2F3SNU+Hi69S(6tJ(P|AJ$ z)Gm7v%kFOXw94(P^%-^k{{H_=JF_9x`fG$`&BEx(+cCdL!895kUi53&E8%pycK?@?QP5K81?2qn~+M_xD2 z{5~<$i=WFzX36hW@S8CNY}y*4>|70slD6!V*2Tv=kF)epz`<1Wkbz^JMfJI9nJrRqnK`P%C+m(fB2b! zo!{N{mM*_>$19VQf|BuipKX3eD!qn2?{R$h!9uMU3TUz0MQ*jwaxl!|3y7yFU?&lSMF%%58s>n z)cQ=x!`@pDlApsetyk_|7tIungqTylleX*PLmxe`Mjqv#VWy^O>$F;Jas9uPQ6;of uyO`bg-?e>y_89u=h4j~c%yUyd7eLu$WuMOvxNLF$RAZy#;4efOZ~p<8#vu&= literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..408502297e94a4c3836c7e481c7472f547065e1e GIT binary patch literal 1550 zcmbVMdrZ`J9KT7%P*G6_PMKRRG6wPbxJU2WabtJa7A^|I;~^kZdcEFJ;o7q;+;MSp z5$EOu=N6P0e8ib$bLxBsH!(V=h8Q1c$Xp~@NMJsgl8c~B;;HK)=k|y3k2Pt3zhC?P ze7>LWt7{7jawkogH9@1%OmgIrPIU#McfvUJ8F^!1x4O(!s4}HU^e6#F;xtyb=;8o} zkMVL&j&V0EKhI@rG;so7T&9%eFCbXa2Qg6_DCqO6XpJU2C+KI`8cqRRoR=3YV7UDh z2=HzTxX74~+$>OT4! z27yr%rN#n26IGU92-ro51B?)+WlKDk(y9pa=w;2r> zX*Js@N{_1H>r6I^#%y|bUE&x;l!`^MHr4@!)uJNG)uJD;+ea%7yt{}O++sk^jF#wG z#3U#2^_-iQL?1AkV}gHy1{O#3I+u&lVjk42HM0ht)}_64vtGr zjPE{EemE6Pke?*Kez-kyJ|%wjqiJ#N7wK!)sMAo_&7q$+*0+B&vjS>4er?eF=H!Zr zJCKC=LKT+Y&)gp$_rs-;6)8*iml}7Tw;x?OWy7m&;8p&}>XL7rj)t=bz^22c)`D|% z(Zlf{v`+8nTlkLbY3uE7g-*;_Vx6;|OHVD|dh+b2jo`B3`g4un_k{1@<-1=S9)^y5 zmG>8&7U$yz9)x;ltf$C~qYEbvr8cdhw*@1|(^+p4opoiJui0)`c=@Sm*2S#N>uzrP zjd6y-q^Y@Ccl!3O+B#ga3oP}tUZM|W)MYeIO)h`Dv4f@7VbwV&@9y(db#6^BS${^;lYr`eFWc%X8}ACIGd NXa`k5{%EUO^$$c-K)3(^ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..82186ede8bad06cf5724c5961495e38436a25785 GIT binary patch literal 1637 zcmbVMX;2eq7>+0vP&;ZZMLfEV?Ff`)cXN`R1SA*4m=qxdu!wFp3yCDzuvthzD4?P^ zfUP1P)PpLvwJ11hM;R6Dl+viQDvVgM)LRD2Q7dTCI(7rZ_J`w-?#%A@eY?-|zR!E@ z#yD-vw1D6M27@t86)TUYSHN@o`Owe5gZlT=%WO)KOeGNMloKU!MzoPI;DE}CX5jHS zYRt_#hl?4Ei8iw?nM&3yK`_F~Mm-p|%W9|D42C$$Wk<10oB|AZhS?@z4xVae0%oIx znZ(yX8oLZPnPc-vJRwi3!}2mQk&zh{35Z<9=toldrs%O=PS5Eh9SEa(3%nNOxC0~2 zcFIiH0FOn~Kx9)ACarWV1gl-6d1=_@7*7}WRVW2gu2d$Mars^wui^@o3Iz=DWlFA60K*EtRL0}UxKfcw!4pI% zq+BmoWphxd4a2>D&9vWfuJpBBL`LE$MUXmzuy{Kl&O}gz!$jBtnQXM;KuD6=W+a@B zP)~`*B9`N%IR`f?Nx}+@<`^-*LIWm(xEzB4WeL*Z2v!8f_0DX8lM7WKf9FiUp6Oq!wVE9z1PIHfu+8FJ4agmH-)8$Z$5bPthV6B z!UAM>&^wdbih^Trl|0`f>8n~?GGsfkddga8s$+(Q7hGF+C9G%B0D8MTxb95ar$e{w zE2ro$WB^!!c>c)jEM6;g?DygGGa9a}YV!{~bRKETS7%J0G@<$Ub!+RIu(ZSa#;)y` zH%xtF?Ob9PBXnwb7%9x3m?uDb~=oLPQUeKWD)>du&v#FnM^ zLrV|2O*5l>LRQ}<8!x5bU7}6R?ZAaCABMPhinBfo@7Nv$EG?}*z5I(}6KAJ=PwiQs z$A7XbH@mJ@tbcQBWwv;Jh8{cQAy4f*vAO4l2-u5$4rdy_VDenQ*U+?M> z2Jhg1t{HeQWy9c8(1+PFqjLB~b3otL!nadf+APgCxH)%wQ{FXY&f7;+WwsZiP1SyZ zmCBfoz~#KMIK|OV3Jdd3>JwA1s=B(b_^(l&8qAO0YqqTN0DmjxN_d)OP) zF4@^$OrNVC36+D|!g&dOLzd%YdBwK@Zv}2FD{wRTMK5CgvY3o2;E%)48zb`;NBQ4b zer-imb?fEA$f%#5q^ygb)je4i(06Q_B5^3GXaXZQsidc=^iqZA$FEXo<@M5)YyJU} CCvN`$ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..bf0fdc41c2d6716c704f7a470407c7ff646f919c GIT binary patch literal 1843 zcmbVNdo)ye9G_BaSVfZ1>l%7&%;V0OVJ4$BFH}<+Bl0MBW-g{?=8iizGt^ovkyg^i zmZFtbg;r%dOR|=9cBLeHHeu^zDM~F->rvUgBij9=(;s`!x%c<`-TVD~zMt>w+Z7HzP5W-gfI4(Fc=F!A~8LL!US&xB7*@xH53I)U`P=c z(+GPK2qqe(G#CpOZ{WxgH3c%-Pz-7 zJGrE{qJqW#03ShNfJtGIDv(0TCw;Yu|_wQC_H6U1Ei&b6dF~nHpVq+t-~bnzcSuy zt&_%SVX6eyA-hmHUXMtpX)vC<4?8j%;%YdXP$gazNF_kzyVS4-^Am7M_!o*oso?NH zK9A|f5_o&?ghB?0hfjCs2}LX(gU1)}8O&*p_hH?=8En40h%I7>XdozL@!;CSkVXzq`&Ht8r?4I$#B%s33}FZ=MG)0=2lz)L7@~_tv;dz!S#e-h zkW!;S^tw-sC3+jN07jLuutJ0)YG5+Q9OZj7$k{XoT_%IbtVqy<>>+oflVx;!py*iC0IehR@qaHGn5f0x~0=oV%=2=T&~c*72mU^15w~#8KdVHk%vW zCfaekyOtQT$_&0_cgnxPhL>l*t6`00dH(R5o@1SdDal8X=heLh12MO{_09U6iHU@? ztA(q~A+HlFv8u3?YqIR~l(Ec~XZ~BeQR^pT$%prkE$%8W@*$F&NYcPF*0iQUbcH;0IWvo5T2wob{+ z%xrBfE?)8Y;hj6Vo`plM^(ON^eKBuqaLSC%F4G;?ygFN3N$fA|R2t27hRZ-*M~4Hq zdAa2Bqso^r)->urvMkL&2iW?;?4-H%i?V*SIuPC;87Ipfth4I5l~NSc&3nY`ZmX6C z+9$lpp)bhN=kR*UW5#z_gh!>-J7z`4EzU4W_<`uqG{dp~@(M+kMRDy%@%KX)x(P}y z9WqUSob#$8uXxje0${B5mzDJk<=m8oNP_d8;U1f=)GqtnWh2&ee=i{IVb+Zg^IdEA z81e>(?kVdVpD%5a6x5LK_9t4OJdzvW-21t;+%|uCd+U-7#EHb#wl<%vj*gJVB#a~O z8y-`9Ci`Y)i`@fv!|Xr3kpW+i(|@>1IyyV62CDD1ng@^ne9rmFulKj>OQnHL4ts01 z7douoZkitH`PK5{;Am3~`>zKzb+$`x<-zd*r;w0?-Ky+oyH8g`!X;siNmcCn!+q>@Gy+NrV!3HY!ozyng9QbHPVoo* zR%>c@JS4c*iwP8YqS=E58W-(i&${sBn!B@8mi`^|+c-6O!CC3L@fn?rqZVD`T K3clk-B>w~A5#SmC literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c3cf8eb8ded7f77e07a6c916c43b7a812f2b9756 GIT binary patch literal 2139 zcmbVNdpKKZ9uCH(gQB!G>d`a|irg=fG}uHE(n=_)OGisCM`TG(B!`3=8<*N@XIMpz zr?yzjbjGD)##lw^sIk>ux7O0j47y7xZCRbFqU|19-TkA_{ITbG&iTIYocI0x-rwyx zc_D%T%MTqsL?95Byg+s+ydpPlGeh{fZvVI%UOs|2kx&>I2WdrW0Kt@kVgSigh-5%0 zAd;pg^#Ke7!bm9>MnaMNAi4xpU_=`jj836~*$4!~Pp1+|5&#G(24r%j4{D*k3x$+R zeNYi(K8~;Q2jb;{X=)%WO(2w{B}iyel%Fq>p`*hF6aXYb>J*7e4PEDh+O$iD_ZzRV zDC8ytO7KCw5f#Y~LHdJg07=GB&=NczkMyQt@MJ2HK=wisaCkBnN5kTAXdIr7$I%Hm z0eG`I0#pk~>tkk?s6r3`wPNc%(F*vM3u@ToM zS_6dw|CRAxv__b!0i^Cz};qVFGEDo2#BC`D1{zUSYjrVbxR0@g3q|vxUE)I|9 zkZEidjYA_6y-74Cm&zn=ad}D&BvML%Ex&Tu?^`bQSGjb5H6VgOwGadow>lss9)v(m zJg7qY`)^hp=^i0hN9-FF)QDvN1ioM(lx znzQgQND7g09e4M-F?-FFU2Nvi;k`>kncH|ltR3HJ+ipD{_vi|nscnld-)`3A(0O8Y zBxN~FotAdgY+ua>;dMu1U5oymGjzCoc=hG8-y-AZn9jS>THL})2saOIyPta7BYom8 z_NQ{Mjb&w6?m895)n^VaF5++&{*&wL3~AKym*&4b3*Z_y9I^BNhMJ$6jcY!KIwC@^0KMs zpu>$*Cx2YKT3Be)UK{B$aQn9XtDZV?e{{@JpVf$dchu2@pJQ7JP14;8va^jm&-|$} zu)4b@%IHBWDZ!Cb=!52+dBd)ZwR7-!Ht*`O?)DGa58<(~&}!W$W$c=B}SV8&Ipe__6FWE>u^QebpNpclfTR z>_zkQ`^)u7$qj7d#9L#&9W!e`{JbYPDE@BUo3>X__{5Y$3N@;=z{B~)FhuT4U@?K zjEV?&=u*5e^ssN<(=&51zon(=NyhhI=Lnhw<&7@<3`5&$%Ng{9d1u3p_;{zjGs1JX zPa2!ngnHQtmns#$JJ}w>)T(vc%iXq7F1&z_o=Spt(hHqf_HlbomZ7^OuAqMuxhI$U zGT(J?M?Gao(lr2OcSaw(mV0SkFoZ20V-5movxb_P66ZOs#`tStX+gMtVwZb`%wzr! z|1z%-==Sd^RoK1AZ;&+nbRqh$R*q}!PU?uZ^cO3$#@C_y>#5gUTbc^ZK5cB@lY4jd z#F@0wS@#ul&W**)=HuO7;w1StNG5Z0n7O&MW7NWOJFm)njF){ub1X6}`Y5~H1b^q& z0gAHTKD&3v1#4GEve*zq*e?3zi=vdoHZO|PY4>JniDR|rNR!->7L~iNyW4Z>RB3RD98{yR6kB5FdLj^B@JJf>^_7#ho0Hn9kkLyvX*2Lk!V@1DmIup3#iS^oj= C3TVXu literal 0 HcmV?d00001 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 351e8204864c368782875d1ffeffc27ccf01e2d0..4025cd6a67cc59c63bc75153b466c72dfea8e972 GIT binary patch literal 1690 zcmbVNX;2eq7!EXEIB30)QmEUY6~Sb)n**{CEx9m^93lc!MU!kchmdSc77{Wb7O@Vc zsEjQhTox-h2$VxDD)9yf(eXe~J43~Bszpl#1f&K^Hwd;r9Dj6YcE9i2eV^xj-fK1| zIx@`N&C88Kp}0%eh+@bUaNaXr$>*qN?@@C3gb*hX>v0ufmK!ljs1jFTfK(?}V=2#V_%a;FW$qBD?a3MFK<#UMwMFal6uYOS76dwK2x4bUq2 zw0KSgGr}OmG}<**Bevce8H-wzP@a;udKD02K}Z4}M#uq+E?I9vEPUDoFGB8}uR$6x zVL~MFX>Ua(L_`BZ+=u}j2A7UP5CjDB7!W6j1#?ycFcac{Odbd^=}ZWLmSi+JpAxO;Ou|!;PD38hG zu?0-Fm^p=&>P>`Pk784PwWQxktmuPSL}yZzC3AMr|sllo)XxFp*y3LV3vZ;mMfTn zTn@_Rv01c9yz>9#4kQJE&L;U!(@ec0JJGp)Hv;70-4J1Va&nC1h{SuK9TbY|WvM7M z*79pp!L6-c>lU_zslD^YV-&vOZh{|Aw)heGf;VnG4TF$d;%k?)J>?EY_~s*xNpT+3 z#p`B%QMY0L$K#P!`{?!l&bx^%x#^}R)6n)uyhmeCe3mQ;-m@ULnW}C$bmXNYE4Nut zdwc8b@}kC`{smdTCD-&TxQo1FOJ_|F1w8i_=GVONKm0PE8+ACu|A%j7wESp$@9D?e z9rcW$qFbj*`>(eBe)sDB99eZ-dx;WW@t`*~uuO&&`}@|XW@ds9G;Hd#&&~d#riKPz zOGZX@=A{wo@hdgU#=UK>Pk-VRM%;v(G{Xlo3;FZyL)OF>^K4nw)$}oeJ5s!-WyHl? zx9T{xX1DK|^63tT<4u8w%{919x!-H4@cj1U6gzw26`ySI;kCTMzS27Zo_Uf1%d6)V z&yb3W^0v8)f*z07?pW;juKGb|Z%cfCYioSkXWsYXS6o*wI8>!XM}Vp)+swx(yPGmz zccs{Dw&ma82QP{Kpw+i}ZgiOFvxg5WF2Tcd-f~TEqJ5*nbT1Lj%?YDuC8L) zi4IuZ+S@Bx*u8J(0 zOLk^c=MB5vUO8v5-(yKZ__9RlpN;o!HK?Ch>b6w0Yx8>4S>v`-fx{QK Hfh_AE`#+(% delta 1703 zcmV;Y23Yx;4Yv)DB!2{FK}|sb0I`n?{9y$E000SaNLh0L01mS^DZNL};Bh< zF4}fTcPr!1KY#Aj*UUQC6Z3kq9bPn~fZOdtiUH<(*n1sx-MzFvZ#Ol~1#tWOuOI7c z=AN_rHFr>RL(A%=KsemPumT=ROo1KPwmtOgFS7GrYaFNtG*a_UW~bCZ z5!E+syT|QPqvvdZk8*>Z<+BNB*|iiPV#*14JY)n(qJMeX$PxVv%GTPv(y$z4t)P7L zGdEiRS}DLTI4s33z1ut|&%WB*tKPn~wSQ;F-`D5yUHS}gc<^Zd+4DzFzj^rL^pO%q zBka+jl>)TMBG|oN)}T#Jmp8XoH>!){auOaD12U;5;PIHIv9>n9ySp(pTRyzE_vHAXUVxIYH0+`Te*66= zJke0NwO2)eFhI+B$rum~OF-}HzML;)s+*Pd>VNXV{`RK=i$bi|Oj&FJmJhyuavyAL zt!bLfC1^Q+xdRns8ohnprSkB?!t~PeEDL#X|K>S?IUy=FQx+uvHA{K(?pvj?alPVl zyAXhuMSmm^jfKZ2O0)CRE35N&_ID2N-KZC+gxY6>SP^2?uc;m-Kn&i$e~G|%uTI{+ zJ%7DJs2cZt1 z3Baxdz|rx&>gIwHsQnM@Ak)hcjgA#oS7$f3D?7XEXefbxE4(BRF}NIHuM;VC#e zKG4*?AcJhh087TeqxpQ^&Q4!2*b_BE|ioD z&}$^4Ni&|yo1>*6b0}FXMti$A(ACMh2=(+_IbSfDz>=xs$p}cKVhEs$!w~8jLkgrKxsmirb}fGcz5(qxg&@oS~Y`G4{0#Vhn+ zPt2CfS4Z*8mvY5&9$@2^%o>SI3`7%=foKpy{>f6n;czH{MAqoI)UM#`^!dB|fu2Ag zLq?b(rp3t1tdS|2kPeLwg2LF4(g0`-4ri2Jf2dc!`@z6RY089_#>NI&M9ForK?n>G zb+l%jj-t!a+|=08($vz@oPTk)V&FUIayT&>8sx8`fgXU8Kj60>oGy+>?tpw^2Z&#Q zqDi`ryDl#2PS{%-8(JC#(+e)gu-nnn+|>8Qg|MR)F}P+mr%O%{&A2r+(%ahH$N_Q& z5PlF)cM$`@aGzO7$C8nV5lWGELn)S{b`3B%cXc=z_2)z6XfhXnYJUXy_JY<=2YfnqbhOt#9sj3~UnRgT^r5u1$qz1yudd)jxajQe x?hXVl^K#g;@VBR6@E{pio8$8Z0s&pu{{i{|=!M;7a@YU>002ovPDHLkV1jLmMoRzy 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 657b6229bae85124ed76d5930b89763df1efa00e..3cbd3b35d42b8a3c0e4b483fa9ad947d86a2537e GIT binary patch literal 3007 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 Nd%AnmueydE`434!H8B7H literal 2838 zcmb7GcTiJV7Y_!BAYGA2F$hSNl8Ax=30Z>l5GhItN-qK-K&S?3yGj=n5JGPPi=u#n zNOh%c0Hr9sNy{QtKp;TydvU*={bs&@cIVEUbKaSG_ncq3cU}w*tINe9!~p_dzy1A0QWOl+z=>GokHfOx# zBC90$1c6OYOzc7}-eL+*YtbS7oAlabckZ?=d1N3fC#MeyUe5RSq)5S?D<&c5)Amu7RQY#NnMEXXQIwy!fq3IvX%MVw8>;UdErn>jn3W)?Tv-~2{jRn&+_D??jig*9Lc6Pg^qL@wEQ ztd@B}ct0I(t_4m?e7N2wy<*qR{V;7%II6FYg%DSI)C1JuQY`?tDa!2oI;=2H1 zr+!zGrLCkH%PrsF{e3#vw zjML#C%eIvw%B2_Tefe4L6CT_z1fGn1|8V(9fa`AC&eZa<=TxJg*Un@@PJTXdZj-Ix zw^`}>spgQ4jh(5(^}QJAEL^BY--A=l^;B|WdEBL8!>;1;A;nuGO+?1RAfr(f{vxZ& z&Z<1^6~W5Gmtf_vzVT^5)%#|&A|XqHeJz&7J%J^MbjntLY+!MB%P7EqWqD>~X0QFm zgQmu{i+SDZX9#>z%?)939ZM+9u>I|}mF(whlXbU!5gG`#?xHHRT2_ygs_GD7vcWf? zcx(Fe`%Tw77Hom%mok0bVxb2NSTpVfPhWPn7bldhzyFpCCzPv0?Bme)Hlwq(q5h5@ z`!kcP->jo-()^o6C^JI6<2c_q?@cCyS zz$UhZ#&ehJ?XBw5Ua9s^e8Ka9O$SnP?=qr-@bnM~UQRnLYoX8%mvZ{R&57vuX>@B)EN=v9Ag}_}U?e`hKvt{Y+sp{O6*J-Yvdo zZBNcLUd6ueUU+|Ap!T`#Xz2RbL}R9d@@Gz^NB7}Do>oKIb);V%v;yE-Cb^p9O(8cq zsm!q3 zlvrzPY_=TMcHFY=WnBQHy*S~S1>8;S`P+I_GsYx$Wu!_m9Uagf-WiV`PQ<(kxg$|I ztR;Tg)LJIXMqU6rZ6#F%Cux4##1qa0`0;UyU;dcDu*$Omy-?Q!Iryv9xi;LD7E1@7HMfLNoPOAT~NER z!I~oL6dW$)Ct}iZP42=ymJ0LqcFo5sY#F;B%VG@2%17{2cjWP0D=U4QOLi*V>1wEj zAac5^3vHvV?WarLrs>EGN~g)`OmjK(2elrfjRL3E^B3Sb*+!@5jmP-P;`zZ_&Gd8C zaz2X3-&pw=3vUnEKey!7X?odpK8H2K|d5w#% zv1Zl9r!hvaNXQIoLOwB~rW4M;(%~z* zQXR29n6^+;lU7qRi0^q_+_3oPZSw-tKunuDW8kba2d zxN6d?XyMAfd{29a^P&%=brDAOi<~{lwO3iU>Pg%YwPDc9*xgc-q<2Wlqp6JV#$yxp4MfCFW_E4Al+plAJ?GYz);z#BTJ_9(z<8wuLK+ zRC5W>VRhMg{Ss|?uRIl6l)Ty+t!lS4JP}&Z;C}$~y4x0R;nqwFpl}JEo00u!|N8at z)D$e??%T)jLSy$e036c~5>|2U3KoTx|+ZdQrP-kcB~IVbR@zQQUMVdfw{xgep?abAJ^K6R8XRZuwtIvJOklTD9oYdSGA( zFdM}p#?Pv^C)Q*1MKkxEVzStn!4Eae5=i_K4n<_K)3T{HRLE5-M0|51Px~)jNlFrQeSI z0nM((EgcRx;mkEaBpkAI@<0wIGNRKC3L|v(`j|6Id;%#voq%*g|C)-AyLn&#b_7+u zjl$GH7uYDNIHG}VjS1x+xh;>Zm9~Mcd=d@dO#b&${xPK_9(TwP9|Fh%R!j0?V;wMnqa-DYeGTa?fXSSigh`zxze7$24DEeKl>(Mx?*Pngr1mEQ8JKeK zQ-iFoNWyjez&(clu>3rDG@#FmJ;W|Ja$@6?LP>}2)_6U^OyGzQDj~YhG5!e#KS?T SHY@NC3)0uYVk&;Ji~J8$>sOor 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 0000000000000000000000000000000000000000..4c6adcf8838fb096ed70ffeb87b59a72649ba33b GIT binary patch literal 1731 zcmbVNX;2eq7!F7|9BH{!uvnKxDl+8Qgdm9=O|k(Zgv(f{Q!Sg#0%=G#Y!(tIAlj&9 zsDgu2K`Yi$r3f-=m4X+DCt`t$FoPCBRTv4#u~eld1ROop1OiG$2$;x~ zvZPuOmZpr%A+XgsF)}nqh4K_&SSS!|;8P0J7>NJ|b-G5!H-vywdim7ea?J#RDG^c? z0#1`klEwidoWKAsBan_l5Cp8?F(7Ubht2f|*er<4Wbv2~i_U`h5R1=d0W$-ntPzS7 zegYgmV~aY4fN3PD*;j zYDp!o0W2C3Ii5*|fE3ed7t~s*^rd2rZYEGv$e0F1%Y+y#rdn4c%`&X zmaWB@378JgBv2|JDc-YSDt50oWD%s;@M8%jl@uf$#?eeQrXeM82uQs!6iNkO2#JK; zfIwIfBovD|5am95g-{$GDC7u5u!zH*)$uB9kRV(n2!cf6oNyKdiMc!&f(0TDYegVT zJqb9oScyhQA{rE%wX3A;&R~VF#qvc2hLAWR!}0Xl3W!U?NnDqPYXOmHD&v4}qEe&4 z^}6Mj6is^!V}vpbQ-l+^8kmYPU-=3SD38Tq%jF0?Fa-*t2cZFMx}43C(*qDW*Cw5GV5Ytj5|0$Z;E2ZgkJJu<~tM0U;4JUM0CAXHQ4yLwe{kI3*}MI2*R}VdAt6d@k5)1f_S$zYaF(o_uAiK z^7bsgY}|EriL0%f)ch=3hz7|&3HEfVcTpMZ)vh1!et08uZ+vc6rpNJNHHK~O43OT* z&-HH@ulvTKztVa1{E|NuZ0CB+`Q1{m}_WqXVKki+UEs)+C3BTBP?(B!?1_Lkj*qKf_nKdfq+x2~^WRhpNbvEu{UIk(S;7R_nz==d(R<|i&-k) zaKz-~VfpWEuf9=(zWjH z1+isuzVK)5&DB6hOmA7_@Tczq&9Of^noK6+Wd6Q~X7jZozl5Hio<`eaeYKI#TC6W` z%p+;(+K4;Jl_xt}ziq9otnBkJ<=9lqR%u7)-hWdRx_yr4`2p7W;o63qN6)M;Hu*OE zYA&jpK)OopySp#!rS+x-lr08JRn?Z%su^|y+gtPWXsK`w<(U$p(+ba!3o*8L4P z{~op_PekM;7c5S(ziU-$v+{~n%*cTQKHCrWrMq0ZozaqWrv0xgpnPl?UY+q)!NJZ4 vgErz_LM(f%fLQ@9IU*fl4CdH0z2Q#F^vEr^?wGsH@>`LJW8gYr@}_?P@L8?A literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3ed6e40949720d7cfc009eae77ad2963a515ac69 GIT binary patch literal 2709 zcmaJ@2UHX37LMZED3&}{5W`aw=M%iR0j?|%2*b0*e#{hGP@ zCi*B8YOaGl&jnfWDAcs@nbVOSS3NLs+7 zk2=^2h0@z2b@SACI;~@h6f!et+{P?OrbN6^C@W5o5)$ozHFzPsO)6&*x=YImc&V60 z*a$k2os?YIS85-uf?b2xyNQB#h!|o5hmE%iVj=)CSOejMWPWlrGl)f)z-1!)@oN$R zKVhQT!6HnO@^o^>a}_EW51LsJMF0TcX$&&}q*E#2YCMGufFv@51dxejfC-S96f*wv zLqMXb#1f_pkN-Iqa$*sDH5w(8L<$THGz+AfDOB4?0E59Gktrk!g@{-X)jQ=HD2OOm zFPlQ(!D^98s?kHN zeH9vo+E<~(bGZ{$$A7<3Dis&*{8@2l817N4pRbC7%)hu5hWCJ1Py>e zqEHA}5EVmWGX{QAR!b<#ciM;Wkgl2)s2vue*dw)XV(-dhn> z4Gli(6-hmQUOqk_{4VN;(4(WH`ODsWG2iyg`)u-HdkJV8H7O zyz0GIP*3gvY_>cY8{Ayu9~oUV>-osY$S*;L4UrEYKAeBNPrEfVwBblIrpN3Knm^qK zv$*!j!l^Q9+9!MKJPs_&(q1y;L0tP8y{ zR3DZgV+H?Y`m(Z;pR>2CV?RIia>Sjq^mLOXcXxLJ&BB7m4*i(&-cBI+1sZum7|NeKAe%K^?Pw-qC3G#F}FSswrK-B>=M@dj;aZ|=ys z_>WDO1a_gHhWk9kWVn(U;q#wV3vi>+xaNK@je=79UMX$;i8=^}o~A z)s;S6S64>}Gu^qV)lwIhaKQN4o9h2D^St8UUsr8r4hC$?{rGO6F1IMTVW7C9qrmfP*pGkgy9{{KbfoRpT}_sS)0F@ zQ@Is_Y{ZU^@fRdAnUi?)=8US-rD z6aj@K{v25nHqG%(!WHTBVmM8=(nObn$s4`8t}ns@mr_ghlAQ?!hr&awC%~%Et$MxF zkfZaz*)hvZMpMHB-xQy1(-SYXAAIQFjXN@==JE{I_mm;Mit3Kj9y|GrGfv`*-z1ED z1x_3rl^TZKJ-`wbY-g6dKDbXKTEGr3YtrNO4~2w>2D<7(1~7-ls?Y1WQ>BhzVWDpI zbr*SAh_gU&JQ?Hsn7yyMr_b&)n=j;|Y~S7LJ-qT&K~XW7+a@m8md3vr(tDkdT5}xK zH*0L()l(!49{XE1*6fnBki_NlT!QSa!KACr=h7eJPUt#;5+q=DT9cc{tY*E;_}+R> zO}zgN@fz&?yv1Gu3W@FO>q}QpTRb<$#eA;Ap9LDHWEh88U~K%LfOz|8ca4FXLRr{$ ztD}KKH;OL%S5?BTmzJG1X}R1G}@(vFRn^^1^`RaR1m@b9}yLvQ1Q2D}x{ttBH%E{A3J z#f}}VBeR1NUSSeX0&nrMtr11#mu4R5>gXWxXz^U7kh%q-fv4S7@ zS7b!-MeNj!49iQE{Gz>!>l^#8LWgUj@648{)eF|GTj%*~?CkBcq)qPds3IM>&KS(j$*H*e rVf4&U&oqvJ_j{>s&0g|pHW~FirI_RR=Fo-lA4Lbd^}Hh6t&zV0UCWko literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..15c65911f4e98a8de825bc3feaa0dbf7ba1dc736 GIT binary patch literal 1733 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2402cf1a66062c8cb8ccb0efaf157e073741a552 GIT binary patch literal 1568 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFz024M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7p`n7grJkXw zg|U&Tj)IYap{c%srM{tou7RPIp@Ef=fdUjL0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LcpzHo!{ilG4o3^M(S!~%UoJp=vRT#&!Os*6j4QW4I;s=7F&vLIDI zD784hv?v)EA8E=k&A_n3ZxKi#&^1>6MVY`zNz8G{PcF?(%`5SAu~h=f=%r+)SUDLw zJDHl8xj0%lxw;w~0=;i!?&Rub=49;T?BZ-}3Nr(%UL!M8SD-F8V>bgsLswG^16OBP zS2t4^LrViU10yq-UeCPZlEl2^RG7V)AbTNtjqvKVaxO|uEXgkl$GXD`MY4PC<3``!LE{-7;xAsi4?!V`d9u+ti&R8iv$E>U zT)R?^=D9O6wXig?`cz0TOa3l?*EdJ$>JPEwi$7M>oV#OOu6FJHciq#w;?`fg-*GgF zYx2n@hyJV&Z;jMmcfoi0p1S8+xz~4UY}s$4z2|NomvE;`#=IS=7L#nE)=t~db~?o< z@W=1l>8;W6^Iz{WYAZYN>(R@M?YA#Y_FFEhC)VvDVk5`@v)Ja{-~M@i%awg1eQzC2 z3VisnVv453dyBpvmBmjE?_r7%{&4E~XDe4#AW+qR|Bdj9!Tw$EHf_H|W$KkofKvHSn?iy11j zz8o-~>EkxVcX@E@*Q(f0%flHzbFDDmHveP&T;|IM6BO(g&Y!q9PXEcG%P&>551x4@ z%2IkUy_cOMV#BPRF?u1ICy%6U7WCc4_l@1yeFOiWUwpw9ucitud&6)qDE&*_j?2t! zrPt?M-jX@MXZnLZ{Dr7nxnS~_{6K*@l7degibL0TH?r5n8N4dn4fGGosRBO9L+$N{ z9sP1XbKRRi-zM&smC)I=;DYuqD zoann+{;9x%=c>kEKlkYUo(BA{PR`7|EqL$Ew9`vV4z^0iJbe0g|Mu6%ulsX_ubyhr h#o_00nd={i0Yl;TRKfU(<*Pwuwx_F~%Q~loCICSnO@9CY literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..789f27e58a4a3c39f1cca8dbff64f218c7b0ee1c GIT binary patch literal 1890 zcmbVNX;2eq7!J`vr7)gc9%T)T9FpvA!UhtEno|;l9QUydQf{38yu(nl71#DIDpar@CvHjurqdT+vz2En}&-321*%4t& z9qeY?(P%UWd9XxDt$_8NOsBqoyYwBW7FSZLB3BRzWV+gj(S%w;g8_1#IuTQ1YHh}v z+gK2dHbIX^sz_DnGCoS^SZb>d%d9g{Xc{eOvDu(TlQ9y|V2QY1!1$xm!T@lsfDw&^ zLZJpRmV^hdHDW8)hDD-llTn_Qv3L;>Wad)@I*e2UW?hQj#5W5Vqr7}dwjP5FU{r-n z7BI$~QiVnUV#0_42#d=^VHgJdc`O(S;II*2fDOS22=PD|VnQ$gdcYesDX zUn!Bjw?*v)j3kmY@If#=J)M=#VG+he5a#iCAjAgQY$m0_G-c>XwVA0mxsNkQFcWIT z4J1zJ0V|_gL!^=d2Ic8k2s%S(=m%oG>3yQ8l!0co0fbo)sMA^F8r3$DO6*@ZKB{es z%rIb}5;GC0MwF^Yg8Mj_%H5|8SrsX7_~AyJDvCNqLZGQSOi#)s0tR)%(&Ada2o{SF zKdwX=Ad*TsFcm)AUnG@rMI4b>BIY3D93RCZG9Ds?gffl{f?+8lk|7+4pOlis0SF|K zj$`F|6RFmt*tlKXYIh9F`y`exHeza$Fh&wY%6JDvBoQQGN+Jw^SUg&Bz$+TpYl(D| zx3xrL5lb*5o`z{t3YyVH~K*}M|+9dyJn(-s56RqNh5ui37h6vMBlVhYtJ2iPbH>-<-#-5l#6`s&pSsie7&>uc~ODSobGZJ?OEI+`ov8~Cknkb)#r4g zM_f4)MYsF?-M+PG+>u|`Js-#m3=9-)_mE4P3is`vw(3}5tK*g-VVUo87!YIj=Y^W3z|^S)J0S;NQ5G{o`KC5YTE3_rLPaf$Wb zQ(vgm?wzuT`=WlvmLtWD3f z@ZOq&#c#ImYPj_Ox@(^gMinD{8J3cm65E8@+S=|1t*zabTWtrGWsa5G z+*PlAH%GSql2!3p<$CE`Q5X9HzM7H!&6eT1y7~8phK7#LY-pa;-rl~#XLfEaRO0UF zT#$XEh8ZCfigGvEN)w|*6Xt*QGNAuJB96<0?(FNYHU!w`)2Cv+;VMqJ>(y1wHl;fX zt5k0{E>{%h(Ae>Zy&Go+CVoqt+vVsyY;n0eX~`tFKOdcTJEifd+PAVA(azn^bHq!E zzKnM|xU+6gy{pH9kWTE%&2~@Lqu$oms3pvh%bV+6Z2G5>lWlL`DXDn=_s1C$*?;;dN`$imvUSn>EF| zvNl<0U--)Fae{Ab!H&x7c`YkrtNVtA*5B&wOIxSlX(NhTiZmyhk~aIl7wzC=&er{e{u}dk_D`y}Xnj|MC=^8=Za`N>Av@up?A ztYfj!=}{d$KAMq-Wi+`%@w{43w$tht13mRuJW6{T8XK!-o%{ZNal*_r%iPYvXKhc` ytY8)IjA-lO76cDpx&&=0c-WooTzWQh3Ph_uG!oKNGq2kE*ON=bBxgnOU;P87|M8Ci literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fc1287abb26725b9e2a6e1eb166a1ceba2f15e69 GIT binary patch literal 1737 zcmbVNX;2eq7!HV5gR~r0sYh87Mo>&Pn~<|cnq(72j&h`cD8eRLWPxOJEGAq95vUX^ zm9{#Fpd%x+GKy6ZPe7=HiWMlfDB!JNtq3X}fHK`6*#2<*(Vf}-zHj$^p7(jL+5F(3 zkG59!Z4ZafBH$q7;b+SD}EP7FmaeqKGEN za2{Psp-jTA&>>O_+BmO>+*@CRG+^9> zNEFlFh>8ph24uJq1-MKeLk&R?z!x$hu7JblE&xMI*f# zHF2U)STW&?Jc()X1fds!pxJC@nmJ6|xDJGbLLtavgKRc~v|yN0bOd5y=uGrU1{gJ| zjhLRma2;S}L{xY(A*PW^--Mvm2L`?+)|n;}MWzh2AbJpDvOulY8rQhBi3mmimGMq% zlQKn*f}yAhPd2K_dc@Hu!DQ~<@5pLMsu6u*#K@u`NieQX)}lJX4;ItNFH8-l5lJDL zl30GPy%#Hz8Bv75jY=F(n(Tn!c$~mZ@wgt4$;K-Vctv13 z4Q@6qvX(7=jAxI&?d!%*>14uc2z2p9sjM#JzCKyd;# z2N56$hc!oe$ya12TDNaUfIPe%B2-6Cj*%RZwT&0{P$;&K{a}gG z(se4_KhY&*R@wOgb_y@#%wjt`dX$Q~%xhDq)1mW)jt2MWpY3bpdjV=!`2LT2jxRdl z_yNw&(ZtR9|0HbRehL|7Gvsz3atKOPfzewB9rBsHo}I z_TOkrE^Qll;qpB7w9Tghl^t6*V>@!L=_0yrLg_nNntrAKxYB8wt<6|Pt7k^fV<~IP zorn9dw6xVvg0r@^_K8EXzZo%Jb2{b#w2 z%^e5poi1HFH@&29NzdFD!$ZZMzFzd=ixyv)9+K&iP`uE-tDf)C^=-EY&v}-O<}+qe zhfmIeq74i3v-@gBpGVRzD`IR$`bWySO|0#`LEmSf&%JMz49{q6G1ocPWg4~({(fBy49Mo+dkd+t}^4re68YySdOQuRz|YdH~e6{yDp|$<=I3&nP{(GvI<(GoPQ*d*5ro_x3}E zo7m$BV;Zg4fO6N?qQ+o+-)cSMrlLx^Eq_Nrm068h5 A2mk;8 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..eb09555d0bef0141b456ae71dfd45ae2cfca51b9 GIT binary patch literal 1942 zcmbVNeNja4+=OprBS@NN!Wda6hh)CKI1+kWCcL>%Wp8n{bbMO1U_ddVp`8^-M zbKh4g*0{}CI)_4`xXIQ^;>Z&nMo$9VVA0gfxLrVQGW~#u188hovHb%m}9= zaR{u-$!tf$DHJDEuTCHm zNChTM2!nw7oK%8b35YQq0oZg7O$$K~5XPfJY%Yt*4gr`9hz&A$AjF_CAU?$4Ga10t zMJ1!*x-@>AByuVic@j`F2*Sh%L5sygx3K6Ko(@7h9uH(NK_-(%TF}fnC;?k(s5xNT zg9I^aalMJqV<_P82&ZCMgn&vieV&5RB$vN%jGCtkMV1V-!X^-+GeD!!k=LZPnTSLF zq482{vpUCwfN_W!%fhu}KhgrG!DQ|JJCMVWWW$fa^<-1vO%hC-WkgUyCJ|7{FLa$= z#}`3j5j&J45pqRRDGMUgXNHNSksJ|AB$kL->}ek_!-g@~B4H>iERrV)gCHrJCy}y+ zp<;+BVX(yzhdYgxp=JU`wa9c_JsEcj%lS_%UyLI#f#GTl+cZ4^$_$La%o&&o5Q`@} z4g_iRs1CE3gB>k;p0NbM_1TCn632|dWR3aymvCUD!E7Ecl|@VCAS@aO3gyzcTAhv- z%7xOnOcu14%-lV@UorG}EuhNpx&qNPs-N5D|is%E3vARF&UxC6(7K zlL*z;-llk&VX<&=?XR^JD@x@nmXNxP-m_kc{@`pX^QEpxT72IS}y2P$5lVr() zT?O9-6dlT#wcwk_TfPdacIh0d|ENvNJ9H`PW=XrwMSEi3)}w>oKC9vxiwbV~ZJD#Z zb##vJMH|%+`Z>~fJ?3kL5qu;PMy--vgcBg?r}YLpMRCNV_w@U zPFq5{=gx*&D=u`|bGH=+bYw?fFL&yhaI$4Lx1CI;ukkMa*6bLxmJGAShC88wnX}9N^j@^$V_Js3Km5q*HY|Pgv&>tRl z&%D_HU%*_z$~)S1casHI?{o26_SO84nwy^{7AEdLt2QSG|E3)7UHJNmzYc$TTt4wJOyi}EK@cpF!!}T^(%A?VT^Gk}0ngf@$)R&IlDA(l2VE3uv zjE8ZZjT7$k59TU<*F}&0SKuOnm5#!zV)IL-@^_T`1)OXwk-O@ zy{osBu8LV_ueY{RQhKjnZx}Qh^T)=<@{g;3EoK+l^9L^Y>6Th^eK+{6`256;QBTE@ zzmAVK^oM+ZH1pa-X3u<2C$(yznJ0RBpuBn@B1yQnApV`QWWW3wxvG)GtGtD_YpNgR zby+EK30*^?g_nDxdfNxRBFh?g9kXw(+vxQdQ9jpO{8LqW06g2hASdD)MD zkofxB6LQZSIKj{opQjni-2LFGaPQeZ!L6v6Kru%V6SJsHaWpudb&|FGF=1Ks?7@!O zQMnJt^mA~?FH!MHeU~o_Z9R4Cu8j0X`%1d2PL^i7S2pL>49598H+7Zo^p`PX4^+gq zx(<)MOL>ja$zCx~-LkSS%xyeY+HpQv9$07|geH{3XgO<0;~%40f3)m^v+c8J{>SM! zQ+DRle00GTmE9Fxe&gW2;X75ufnDp|y?Y|}zaG$2JSX7Uq2Qe|WM^;Ga*rBjQevXZ z@a@}0MYfEM8xtQ?&-7hY9&O9{Fu3p7`vo0eYup0W5tU(G=gw_E;SxUH);*y3{#(h8 zIyYNJePiP_;?3>`yJ5*ekJy5gLiWA$DF@!`Gx&@nkCV2|pag@bOWN|jPIde#Wm1Kt IRbtHw#$VffLlENugkxk_IS+bBc2U z>YUuPPI@zIuIOc>Q196OT%rOrgdd#UX75Pvc;>TQy;QYh$kL50T-#2-l=l6Xn zjEh<7>B042u~?qEXxPB4fb*WgW}c7z?vyi&KdnimSCA$;8=-Jk6h@*rpd*kJ+<+rk zPDUFZ&SJS*%<+kIqJEjeND_R+iQ(G`E5l~7!Xxcg#F&oL0E(xWElP0cbR!6uF(sHF z(F^rfHJ)mYc2M{VM@+oYk#3Y@U}OXkZdWh@1WqG>omgkFDeOvcLRZ1;ov#HTFae>{ zmEbd{67_L_nxt?*!k6-l5Cj1-IUkaQg^DDL0Fe-q2!wJ0B;*Mp1te66guvtlGS(=} zq%gqRNn6ZG38vDtRUr^$XJ_-XL-{0?B7o#_xj-lqh(tUF!L#L9XvEI5*aD^$VBBV; z%vRb=S^%daf|8lE5@bAm76M__>z@l-Y?Fy%QYNq?RsqBp3JAg(*96)|8}R?!cq!Tz zpJT-Z2HZwwQbwj8rhq9jlekr$rZnnt58!oLX%WHNv@mffVfnWCT*#t6;P`uDh>oEm@OEY zZ3}Uh=vl-tPMNcCOiPgjFp*=0`6WKcaTA2fFcD8?6hk~2CKmBfnH1y6O}H3EOcGos zLBUBr_J49GU>p)So8*P2nR>-^qI3Iv1en9~A;K-pSMQ-!nh|yE&eI)d5=Jr9RGG)}N#ESN6HrxL@bg%+1`@J!9@%?g!J{m$$gc zz9h;Hiw@tC)$xlD=AOS%F@9^b>UPz=eYQbhb#k(MK2QW^)b)7pI2W+I1V=3uV_}@a zZ|iyre#$yG@FYw9xbIg&-&If?2%&CQYHCA%`)lX2pb@VTYuKDsRlXyAgUeK`}w|`nntUR#vvGZ;UPL>~DcVr0-{nQxL>Gux+3@Jz`;np)m35 z3yEIba80bVRGFLJz>at{ym{<%o-bN{eyvpdMV?se>%l=!TncnFthT+;?z6~urlUUR z{(Cz&dqsBo3}^I9kXdN*BHzLbX}kQko-OF^?!CFa($O(zJic^k#jMyj&!+2&^$CU} z^Ob{x7JQ}qw0vyLp+qYTNJf9R3tjd%cy#@lxM2A4gTXzA3d!E5LZ4p(TYIn7o;)<; z!=fck{Lk7O0%yCqqNkEf8C!&G*L+pDYT;M0w|x$FnH}}Js|wbi+EChWvH`~lXg6NWLI;yPgYm= zL+Gu%k&FDAV%cj?Ox8z9ogd|f2f1zPODllE6n}O`Nz?7C*63~LuC-J{&BI5&=VrC) zQX1H$9j$pSIcIu#+H&v3S4!G%tRb$m8rjMG1??qNtf!yL#(Bpf4jJ&{*yXMJSM)bd6S3$w(?kAf8;cB{UT{C{Br5Z7S>UnX?H^FRamj}Fz3FmF z=-LX%7AVfcmycElc`wE|9{at>@zJ|uZlh~&sQruBwMk8+iyLcZNFrBYddKGcap*KL K@KM#;{C@$nE{%r( literal 3282 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 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 a20afd93e598b35fca9644bced45846c6d0e3e95..4ce0599aada5335a367fd70fc6956a63cfa81b7d GIT binary patch literal 1895 zcmbVNX;2eq7>-i0lcF32iw@!%GyzMp*@Pq{k|?>#UBnbn0ZFn8q$Il`SxJ;qDqyvh z)!2UJL+1{G2UYtB*t4J@QY zaYC7)dI^%G3D{sjR&EGWs5d05`7mXf2=Frt2m&2~D*>}kiy8%HA!UMBKu@23Q2HhWojx@5Eir1GOcaqa(5%#h5Q7Qobk?{gtc`dC@{f#n zS{oJX^#~Y&7_oH*HBpZQk0~&byZ?4%H6+vsJ~e2FqA0aeOubHrpm?BENFly3U=1t~ zLlQB^hb#5>70YC7hzOs>6U*dWFq(Z`PC49C$ZfB#0n$^M2TYt1%_#-Iv_j=!!ctLrUxXFiHZZB zQ5qD+OhzwjiQYskMGTr$1eO~x9Waq&f#w|=_(%ez;=wFBPwfNId9V+QuHtcFIzIvN zQ7IER2#=$pOyc4HlRJ1TKg6B_44Ci z*rRqI1ue2owrLGgeRWNok!tc|uU)#=*>g$n$???GgptCby~h5lPhuF2u6>0catlJm zUWd--50Z@w8?>uu{jc(6QZn8XbBHyU`d3)K~Z8IKcQcJIU z6g2(5iD@UP9KUk-*F|GqJ?)a*l6={oqa~~4f3@TkQ*XM<>(zh0+R@t6qV=BR(b?Jg z_yV9}#hU!pQzqZ7&YQ>=Ia@wti23w_{J1vBom;Hy~ zX2-g?;6oAF7gV_w5i4FaG&b&3xlsEnlF{ki(xLPo>4M0DQU`{&w}a)_vHaXfK~gZp z5(>LGX)o>aUD7*Lw^8l~N>LFn{h0Pl$Z71!=CdB_|^KRF$pe|Tl_SbhC_ z!rAttu~9I~rWJH1X9oudHw=!5NcQ!0%?o;adx1LzyGDz*EK3`1>%LSt?0qGp?ekpb z^ELa)O;`OEb#`}CV`5@_zT7;(ZEkLMvREvsP!;>hz~*bMymRFP`t{_)hn~i8A2Ih` z8{XV-F-LsD^LFiNHhK5=r5)Y8^wk^ElC~T?@GSDkXGa<{yS?u2yD?`;c}r_|2D9gf zeoE1Tkg)5|m(ogD)gxJ9rSRH4A>_>cAFrviJ$0qoEidY?($9{#-y0vRxO_hTxTf;r z&ZwW$<_GU7ZF_X^-i26~tZ4qi{Hu0$7e`Q6cXuu=dvCDs%yZhr#LarGHitSAwD`}K zp@MIbfwa7qfct$rW_qTE$ahu6W-wA7Zd$!xFLZGN4`}i9B1+%s!8zGAH8uVCQjthh zwas<^Wx+i4rR;}|etR4$OU85VZj|`x-h1W%k3Jf%PTy_{Ozzs+i;Ow9xs6u7diCWm zSy@@`=_jS)Rk26ga)JVCdJ|05ijKYv+`X=yMx*spZC+!^z>?ARUB06Us@1ugcN zmh4dQ8ZS=iw49*bSt^}jS7%?9Y92_lkyi|zvkRPdCe`-r3|G=m*AB%^A3Zj1{q+UP K!lV{)eCFTN+xZdz delta 1847 zcmV-72gvy64#p0UB!3BTNLh0L01m?d01m?e$8V@)0000ObVXQnQ*UN;cVTj60B~Vx zZgehgWpp4kE-)@NWrZ?j000KmNklryOs=|Um^eM~sjtX<8bb*MQCbb(5%IJd2w zk{aKCd$ibM)qjl?g;knlTBL;0Xfy~hrg2iV03}-N z&TT=dptCn@06x?W?ASgI0a~1z2q0tB2~ep}5hxN?rGG|^aMz$VtJV-hb|5VU_2I7F z<^rH40yqVNMcIkBS~WUu7E7seDO0QDn$7%PuRIvk`uo*pt5B`x+O1-_mfnen%avTK zRqpN8y1m-*xOaH8cYo5O!qBj(SkMvy^if4%*J!W@Hn8DMXJX0JR(3a0truJEa;sD6 z_iIN--GAe8r`4_X`t@3~P%Njwe)i}XI2;dF1>IJBV>%t}L^nZ#vqAv0L;#uy7D9== zn@qf25<}s2-@0czy4l&Q4)<%>-FTx_7#+89jzTdx95wsHMyp+Vd@+9c^5W^UGeE#X zr+9WYDwOV(OKHN1^w1ojl4b%bl_(1FcsRG4Tz?OF8?EBOuns^50_AG9Qp?qw`DA8m ze^>{uu1?>3b@{@`%yIrZ3>w+bfkyDF`49phdh$4v-C5fLmJDNDfOX9ZjTm z>b2~m0NBg5T)SJM?CnnBaNL=m9=`wKlTgGDfp})i=XZ8{)nq2lvZR(ki};fh&?KXy zy??Xp@wy_BjqRNvHqz}B5Tfp&TC3%&^+LXs1odFp=nX2ZcK&eOJ%2n#e4t@*nv$8w zaKY22xIS2$j;b`E&>FDxuQYa*F0)G&KmYe|B1q~6$Dpyu@lGEZ3cv6{Yt+89H z6Lz54F6<8*KqeEdRC1MSZhzE9{hUk>FD_1=J)b(gw&0fc;_75DY^Bl>DlmHw=1ImV zLgZd^#NxqpHk#W_K%-E-S12bNjRJ80L4SYP%I0Ie0Rq*Wob(TlI_DRYi>DLOE`J0z z+|$$H`2L{ZZ(!pP04=#HATT=t$MSle%VXb(24jhEHW!U1L)GSPWZU2A)la6w)AQr$ zba?sv;isRy{P>d>FWx=Bd^UOfbmH+zqGXK3f)2Os{L$fHSZC?IK$0xy02axCid>&+ zHK)^Q^~P1N&k+oJ9d4`9thd?Ccz-{1yiPFk7Ms~>GwD{ef=O=@1&q5rc2P1pJ$8rF z>hVhOLB(UoGXdm)d|qS$Bwef3;H`1EEP>z}*_tRoz+^TEW*#dsWi$(v7ciOhqD3%@ z2GMSGdaQbb4qeegiU$`TXh{_z_D16h1kgbmG)ro%N2)i%UdbV10k(`5)PFL&0Rm8k z0|aC`?0~ns#aJo?YI*y(_{hx)+L-{dL2@F$%sjt>HBOh+<9CSGnSj+UTJ1!}Xw)Mz zloxtngqT?rM4OSoO7;$bia-(&fAS{dRzja%=;X#Fdw6pXF9H`L1#BA9MaVZcN75^A z7qp~`a02>GzJa+P0E3Rq_kVE%^t(-#s939PkgvjAfR?29CW@$62j5C;;w(d}di zgR#tZG9SBFOkf0d9Oawdg6HP;Mku-oz=oSA;BxyNfaJDYPy%Z5Js<+NZr!2+?tp9g z&Ju-oMXS^6c!4)z%4Ne8mN`5USo|R$Nbhc~1HqlUR0Dv~@!R zZQbp=yN2!1Qv)y%cYhij7>n^i=Fr7j_@jjY{=Gmu4-qNTbSVi}q!CJ3KmnVkl(HiM z$cJ-HLSk%AiztZ(6OU{mXIkAd+7-QyW|4mMmzFdP{!$@;FC3~3GQhkXsR5wo@D~L9 zmmBD)4ZsF)0{l8IFE7o09sj4FUn+oG=*^>6lOHZT+Jy%`NH7-$4F&_xuj0y@uY&)4 l2@L$k&DLnOJkN6+_csbEH~y>c8*Kmp002ovPDHLkV1jroYGnWb 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 0000000000000000000000000000000000000000..0456f2b19230caea1d82fab67656a137d38f5191 GIT binary patch literal 1689 zcmbVNX;2eq7!Js^kqSDEP^bvojm{_~+3b>oghV9S1XBeuq(ZGCo9qTMB-yZ8Ot6%y zfCE*E_l?#b0wVPq>?m3wKPrM&t0NYnAgCjvG@}*NilrM4+aHcUx-+}q_wByV^FHr2 zTbi7d5a9p5Ka0f*&@MoA%nEpKwlDJ>4jK5CSwd-b8l6I#XeUMytazL>5P;T-WfD39 z!}D@35ONl4lFh77qtg->$&93xk9lqQE~}kEvsm&tmmM=^6Et8TGR-yx=&5f20W+=u zQ$>k_M7xT}GA~$75h<&a^v2cMMkx-)%>(2v8AD(tXbf;!EjEYDr2t2HWz63D8Ule) z6FOS~j)_W3Oa@dWMF1kcm}i7x7?4Q$uqY-P5k&!r02V<4DFh360$2tMWQYJ5zd*(t zg_~qLR5R|2IVr#_nzqXz$mw+QozZ-f%7kF4R0;_Y2tjy^1<#RZqcIoH=HN~+poGIn zneDWhv;kg5%s}SS3XoAc7J}8DnD~m=<`_>DlQPJK*&&!OfUH(;T%*?QxwdClEz#sVWYLE0%X4MaWgJc!YZXm zC`RLBlxlS}%!H3flxmGw8Ld>Is%X&!$Lp{fL?ls*P=Q7$7Q(Pv6oZI0Qdk-zM1^7) zRca=%TAPE$Y(`?jubJ^XhE-|ah?S`*0;5SvPm-324oJ=-Y0{BJ+5wenwBo>=RI?2y zosPNQ5{*TS5|nurfomwz3XJAhW`2zZDPe*Q5**=4j6#?v!G#FVAQ9s{sfiF8Fq4Ro zhz#I39{)eNgBU@Ow@LofG!w6wPV{bHjR13aHAIAsnH-84kqw^?En~5Ko3v=W-gWcr z(uNJ3CDXcgT28bV4L7<|C~aejlnP$P2KTYek5fyEZ+=qxjf)-Z&ap@S)?QLU{Jm!S zy5ipW={0^mUllH7ht1k@XUiorbEs7jF@xvlT={4~5L+MHeNp16ofEua&!I96cL1OK z0ejL~R!{ys=d+&B^7B_yj^3D@c{23i<$GKEp1x>rTb?fCw_A1yLZ-BMxCv3NO}CLs z(@E{F3-~OLJ!Vl_&2>4pW@9o0xT>bm6{Sg)DGA#*L*UvHz2cAP`TXWUOH?bBWkPm0 zzkMtIY=68QyuSbRWmZtaz?v_b-KRbdFVPPMhOft(D}()?WCaGNRN`OmIlS-KrkT@q z{GF3is<-6_bFSQ{@671Tyz*eMPZznJec<<452yF}-UyuRTEWeK(i_{;_OjLD$>(+! zG!6}QsN6WB4e>9Yl{zQ6wy5B$a8<=T;%4E`w>f3S53e4dS>6*=&>8kL)N> z9-O}u1)HAS&T+4*PYfwV!~Uw)MCvS%=~WBvP||9@ec7!qY7YD7zPD~= z#njwW<>lpy-IJ>NdKd3szoM|=ER4Su5%5c&?lSd^SN8INHK%izy&!@fT3)wzaCYnOUSA4`KdJO>$_RP7Lm2? zyRv-vT)$sqdGV3s?;JduUU6a9#ik6PrqlEE`^t`imW{U(UQiVL$IrBT!aT%)J^KXO>znj5onXS2g{?ZYF_h+G1C!s$mGuHhB{(X?S literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..778ef33ca4f14e3adb642ee18839ba87d2089856 GIT binary patch literal 1894 zcmbVNYgE%_817&b6j2%I6h&hdE0;D+ue4HuwiFANJ6aVEq)iGH+SE4Cg5m^<=yake z2vbxJh>8O@FCbGuWe5&+iaJ3D%*&=zMCaiM3X`P>Za+N!Sk6hl?@Qk2d7t-ovN<$3 zz`iDd@vFUKP=6>fy}D9I1O6eu9o!0~7}3L~j& zE}`BelC@SHDaYlqrFLP4bpiaM5odrK1Am;=)mYjCcNnp z6+c`o8TCb+1mpx9*YQEnXf)D{Od6(-2O%Dh2htfJgFz)MsD@N64x6Z2!@MyDF=|li z)jC{_X#oo(tiY0S0hv(xE(DEECVNk;HH;>TNEv8?bs$8egBpz`t`Tbk9*+Ji~+2 z%xG}4l;~Z=VpOkAK@o`_(*Pqm=Bq!TfrqLf1s7pZxk?s9F z<+2szQ9Sa0at9KEKueSSr)kDs5uIq+z8?YN@P3F;EipNIVnnbRyT=ogw@oVci!|Li zyDTWtG0bV-qGOlK$|{8`HG6P}yMfWQx_PIclsA;bg@qcc#9^M9b|p^hHY_R${OmmX zrSEXYl%}X4kAejCv{TtES=&-o)uS#5SrbhQc>F`vojIKQR@O5^-bA|R z+cq~h=XYO1@^tCxb(GoX$UoZI`rwn3R(UyZgadZLAS>hA&7$75q*ZY)XOG-|>cYE` z#JOb`cim%cs)-<9gbIw;q>T?QYv*0=Fsa*Bgp;z1P2(+feUk>MwfXw&#lb(H%Z%*^QHtU6s`p z0h5%&!%N!x`dFRgY;3Xzt*y<2gM;Su^mLck5euDmJ!>gAQDKu@UtPUmAER>CQm>$M zTMMy%Rbv~QjZmgn{pIPyMx8JBd%u~}QY(SJKKb^ivKVv8NvL;aC9fo~AiyDl0(R8nQGG+*vy-QFi;@J@~6zz58SGD3k@8x_@n-pPGb- zFBV@=Bu(8i|IiI}o9A2iykL%~qv`t#*QQj)4Yj|KHlqQI-((#{^!d^Sf#sCRXyb&3 z86+9KnO(FluwfcF&AusY&E35Go`KnGmR-oFc<5`~mE!L-B#!NfTn%vaZV) z?_Vx(N%^zWfl*)QfVLkruJdk6^}V?Dla$V^2CIprr~Cr>1M`X+%b!o`A1tmC#%2Bk DuBhto literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..dade2ec6a9c0c3250b37701e5442e3ac6d8cf424 GIT binary patch literal 1697 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3f1dde5d009e8586faff5014c277f28037b650d4 GIT binary patch literal 1525 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFz024M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7p`n7grJkXw zg|U&Tj)IYap{c%srM{tou7RPIp@Ef=fdUjL0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LcpzHo!{ilG4o3^M(S!~%UoJp=vRT#&!Os*6j4QW4I;s=7F&vLIDI zD784hv?v)EA8E=k&A_n3ZxKi#&^1>6MVY`zNz8G{PcF?(%`5SAu~h=f=%r+)SUDLw zJDHl8xj0%lxw;w~0=;i!?&Rub=49;T?BZ-}3Nr(nUT1SNR}&WlH#bWcGebjHQ%7?b zS4T%@Hzx~cQx{VcXP92kyyB9?yyR4vy_rCJp?Y2M>a}t%N=+=uFAB-e&w-_YfQiG^XBg^_WhMPj0{5>$T*Ibo*{bdWwMksu`+m=G`}f|&3u z0OY_kQEDDA=M(|6NYcS6nhXp~vYsxEAr-gwOxxXe$brXI_@2L`XY-1TmEXiytoRXJ zRhK-`VagVTk7_L}*B)+|W}fjfS{6uIxWt{Xq@cT+z9x#qsOeA~hw#~&-&%|E~T z{L`XGi#3Ggk8k{*{U!PP@7U^pXTHirJNnq|jq|VB7!k7MOZe*0kB$Nw`-4`h{43j? z$^W)!=bAqm>%&(2NW`oUclEt;f-y&LdUqPf{T#ES@_g*Fhbtm(#cbMC&Gx3VarM&oqKZ6azz5&rX3aZg(n(lwBxH9nt`?vK`h36Xh zUtF-e;h6r_dF`#Jh4N+@Z4whWfjTzae*5I|%aWi|j-p4VXcV7o=r)w-S=;sI=F@qM z*3GMfR=(h`K6j&Q>HM69dKHJSeo8R?&f}11%J3>`?Xtoe^VRFB_O9EUa5KZ?$olKA zeIzCncCKWRTDmxUgRuMRs-gt#hRAOr+ak}ra+_@7^+0X1=c_j|{l~lb9@}l0Im2)H z%E-eH14KhN><%o+`59kz|Ltd;{rBIWUVb<4weZ1vC%3$nWzVY8;a{y(y?e)b#vQxv z=Dm8N*z|3yvs%ts;lhAm-shhq({-nx<_S&t+UJ+Hd1jWR%eOy`+H*4a*_c26{u{UX zYtsCSktz916N-%MS&;Js3Sv)JKbLh*2~7YxY(h`~ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..489098b78fbeb18c9f8170aea0dd1f1e60b024e1 GIT binary patch literal 1660 zcmbVNdr;GM9IxVZ0&ce*n}W<{^)0kX`m!w)Y?ET^S>!cArkiOKAkrpX8fXiG$m5Sr zR|Uiqbwdx`IdMAYaHq)2i5&BRoMQ@ZaGq`_V-*>&sS{j^;P!{-AIn|x`~8yd=kxu1 zUl(^=?8;gGA^tobZ zfxvLrM{PtTkLO2`NhxfKaka`!TSb`9M&z{GI5dwJ8SS)T=1hVGOhh_KsRaXdjRJtg z)q-T15i;5kB7@ZDFhpWbY?3)A)2ze=(NRF8Q^gTj2^IsKRtsfUIn{!3UKO|Zy#@uq zxCxu77CaM`VvGY2njrw0NG>$PFbphLieQ;SB9?^%VhEOjkP?I;Aq1;nNF|1ViA%tF zWAHRp0va>ni#w?W87ym4fuO_T5IH0wnn?#?rBVq(Vo)p=au!0ni()aSkh0I8WIzeK znIUZ~NmGE25i`+QtXjY+eHMb%W;8x0rtA}m;!*}WF&hYrAkb>{#WikiXA_8jWxUYZ zp5(F-U;<&Mvlug1kF@!dU@mtrcjPnV)Tq`lBv%y7g3{(JD?zaaR4w4Xh;R~DX<$AwY_oTd;4t(z7Irx`}Mz8e_s-GmXUrI zw&Pfp{i?dmva-4qzL**Y8{TyHy4 z(|mcdV3!5<&!=hn;Nr2ZqvVNQR}1`EC;#^Y*T=9Eztw9aEDr)hcFt_r-M;b6`c<9Y zY;b>3*tMVvWqOm2@4vlv+i=%=QGRQuC)a=QI)7MM?Fjec0gmRm$M?=SRng81>h?Q8 z$@ghm+jVvQ_wS3g7ZNp{Ws0iy#^Nc#vyHlp{hkxe9#8kk-4z48n7+hy>4PFi@+IscE(9lrJk=wR8p>Oqf-ekjF!uqO9-uP^2j=r;xJr5Q(l)G*? zLXVIgk>6|^_9o=N*3{WQB8r_C^uv}2TszU+)_h&q(hc3=Lk{y5~`1 zE*!Yj^KNwK@(qVZMNy^e^6SqjDx(bxQZ=|SwB>Po>)gg$iz^3@uf6oi)3FDDx2AI$ z9x(4|8qh@aY$_Eb*Iw+>R^Qw6)f4^EO_nr^WrN9Ih)Qr`n@^*W35d@lx!@fDtc-lZ?w5= Uhx6fp$M-)l=wi|1+Kq+(0PnAbe*gdg literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..be9726255edb285d375214461903731f0917ec91 GIT binary patch literal 1837 zcmbVNX;2eq7!IOb5^F6Lw2EucLV;wn2_c7|l7!0;K)}KvqB%COVzSHb0uk|6Dl%G? zt6C045!8wusZI?bSjJjWv5pnNiUL(cf*dk(6x41&Y=1cZ=r{A7`#$gcyw_|-Xs|!s zX08p5MxzG?NW-WdFioo|)H>$y;yAU_wxQ>yU^jGD;pKQlVOw!X(4eYcUE9IXriO!-jYuTL?mICL0n#Y!QbIyc-P48m`ue z!lZuhY*9CFMm$MkA`nbTNnxdMStuR{LPDVsWOG0che=5=iH$l^p=as{r%4S`m{8#e zMk1&VFlkgM(InEFK{1_hL5s=d?-lEacY&fp2I>_U2(j3pR%`NWT$&)m;D2d+P@0I? zh{0eOOrS})ipqz^X%bAu?&F3`f)pE32#!!mQEZT+sw6F}BLk)04C)I@ji^OpNFwHW zcuIW)Vqae_M7hu5i+%k(#ayvOD&g`bb$k#j7VxB856I8MlLJA%JONuE7I;!CB!q-w zh(C!9)DfgYr-CQ#A||^NSoTM;A_)#FNEDAi(G8Oo5E_q?C=rihfJ8E$alj=K(W%iC z;ww{%COnqHIFbyj{cuzZjK^4ne1L-x)<84?6&fDQ z=P4QQ@aq2)JCGs-nu_ELIuxy9xq@}N4aI;*OmmMtvK>^yBKvzxxqX2rhlojrzwhR(lg zti;aNa8j1tUP1D4ZN}PBd~mG6skhNEy&?8jqHthI@5Z6gH}lWd)I8QyAV(~2J{zbl zD42h=MQ52_^LDC1`%5OvIrO%@9oRwCuJ!-KOjdFz^+p@!lD$cmw|}?HeYUx%;AHGo zrE5;TnzLd_*M;ipvmQ^2TS}ClI@nq`9kd#9NH>d#jy|0+?NZGCXt#3(!h(eYhwlAt9l5Ik0@^@Sgl*Q~Yi1BK_=bru8&8 zHHDT!j*Y8Z`}Kd&NlQ&dGbXUTXD}GBKbxAYx;r~*jF6e;FFQIk4tJWHtsQN4A3!kg zfw+VOSpiZ#E$2=tk+b^Pk|&sGX5h3bIV;`da`}PUtIHo8!_$|pTckhvYW5H1Zq;Aja4S;GK?MFt;+Rix^ zSj1l9)AJpSeyxQyZrRM`0ev@e^EKETXLfUO#Z8$(9$h@Pz48A2Z)6h5&U&-Kl|{Ep z>vJ-R9h=jWD=IicF3xdp`sNucTn-1dpFe*-jCbeFkrf?YM|s`s%2n$@<4~_u#fw7C zs^`3|o{;zgIgtMB{b^|p=vc>xW3oHke&t*pz) z6(&#Zl$UHfWj=Z$EjMrRg6NV%<^)ko$}(T#>l8l8e#bf6?d_jFZ~IQP@Y2?Ei=L0A z(N(R50M0@*O@F(YjMmDsvo#`-HUgQKt8?~>7pUB*|bXI!`8 zto8elGEJQhj?$UAWrb(QK6>~tV%C^I9dk7W0kbzhL)U=BOg(v%C*zP+YAan1At3-k?^mW$Wz_y^5B-ah~U literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3ff955db2fbc58c0bf7d5f4ef63a1c057a040e9b GIT binary patch literal 2177 zcmbVOeLPh88XvFQx|GZAB4mubW?q>YGZ@UA5oL_UqHGv52ZNb2%^ZxER#viNSCXtS zZnd<^rr5~U8nu#_E|sYC!Y(3~B$Zp(dx-A+qtE_v&*$?yznAlTpXd9$ozE}F&v(0y z)@Cgf3Z>)i1^6Q~dSz@-Mc#{s)2EQh2xf=C0ZV6;%|ih0(o#Gr)&S4=RO zL*PhQV2sc!MG6L__y+P*;`lTH#*Kk?k<$?cA`s@G<)V18j4pS@tm>sB>y=|X2E8f* z$GKwOkqY7Xp;?d=M3Zq8ET2duqNy|-k?iC^BHN=$1R@zvpy7!GEP+TT66hoXdhNj= z)}(?cxN(|0b2Bpl9r#bVi7ppcN^_=Sqc0Qh4zI#7_``V%QsS#UNjB z0-=D;B(j)fM+)HK#ALG_h=}_nDwFL=VLC8b0Ly{AuH!>k7Kur9qEG=(M+%8ZWRsax zwj+(eqL8UH2Ty>^UdMWiWiU_72iNTi5xZ+x)?Z@jEGfu?A!#54#jjU@Ukn68vKUB$ zX0cW?jq)TsW1@~cuFA=dNsy$;RiU-z$juQRY1a0`Hn;^Rp3a% zMp7vPEG-IjjO0a;K`J>CvxXP^Ke59jgzzgx@;^nheuPxw%JO{+Ae;A11d5T)ks>V; zX}8G~g;KBf20Q}ggO`II#qDA1Ry?X7e_UGHTh;jsv06uiZ~4Okz>d>)+NE9T{)0`- zzS$8EQT1lstihlfvpd!vu^P(df~}aC{_CIEddK(aL0+txaa!|o)cELVh?lzgOx93| zb97?wjm5<1pnvuB=oR>D-HWGW^w2n;*pzazn#|=FXq8lf*+U;rI71_ONIp9X5&f-|@{Vib~`mm6*!S zdrkhH@N&x}zNpQrqE{_ADCkvgtKA{fi$|~K8Fo9@4Ni%U5ZlI%>Nzwgea1O;OSiVK zCL@zjJcTbd7#}BBS62u4;c)hh!hvH;PQzOd=Ps2U zi&m}c?qJpd_0j5c9HY?C(AJq5@yA|aIrf1b4Fgru&G6ZNz0&FFX_)*Qt50Q9-@w4J z<&0;oDZf0vd-tQeR@Tkfw)!bq7R8e5ELBH!TdOSKFFfo1a`F!YPxPaS1cc zL*=I~T+nZ}ot)h8zaNS%rveqG_K#;tgpGsab@Dw2~_7N$QPa7#Tl zR_m6cx6t)AZMb$1!8nC@5_gTEl#TeZ!0==A;z`BqQ0>JAK0mM)J;w@7vdSh=4%`P20D zH-4AAECwm&8GcJ&P%<0d607Q z`^@6$J;T9Gq}h@uralX#Vdi|ANN4WlLsWWe`V06a_p$Jrc|*-PRi*6~m6nk3Uya_l zOk^(lGtN{t+jNZ5rIZJSW;aWHmg}`aY<&uuAvIx`x+QAA5DztHZ~QAPsx`i zIyR&!o7$`wJBI(!>-@Sbw7c6s#ah1ISs^M)+kXA55)>Ai9% z%X51E>f4KU3T#DL><#+;5!^74HDP(kC!;%4OJ}0NDk43%rjf=_YqxrBooF#Ay!NO2 zLt|1Md`~|9imzTHhs65gowK{a|cigun#%0=1^Ck`op~L+f zTg*B-kK*i#Gh;6vj~!K*Z^;S!gKhDO)E1Uf*Y?IO!I4a-9}nsp#T{#UCD>Le*tK}% o%UtDL&_c(+?kj5f!;p$5O5UfAj?2y(TDcT>vweYc%!sf51Krb(761SM literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5b83ac09f26a0c8055a703e05a424f6bc67ddc7c GIT binary patch literal 1423 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFz024M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7p`n7grJkXw zg|U&Tj)IYap{c%srM{tou7RPIp@Ef=fdUjL0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LcpzHo!{ilG4o3^M(S!~%UoJp=vRT#&!Os*6j4QW4I;s=7F&vLIDI zD784hv?v)EA8E=k&A_n3ZxKi#&^1>6MVY`zNz8G{PcF?(%`5SAu~h=f=%r+)SUDLw zJDHl8xj0%lxw;w~0=;i!?&Rub=49;T?BZ-}3Nr(nUPluPV;4hb3pYbIS3^TrQwvi= zpgE4NE~c(7PG)W{Fuk66#U+V($*C}VGlBL(^_t_=Yvo*&npl!w6q28x14{t`8Tlpo z#Toep3eL{p7+25;&&*57FE7>vMG?fuE~!PCWvMA{Mftf3;4rqz#Nvij6Eh=21G6+; zi)8aeT@ynS3n0rlNjKTlI5pYa%p^6*$VdsQKZTsI(+4_8ACyRt5)DiUm=ZxucoqP1 z;F%~j514a`fLTO&{`Lb542;`7T^vIyZta!&h^t^=kBZwOX16+q|Ns3@HB2!0 z(8!;+zPtJzUrXZcg9|Nn-`;zEbBWGrjjnm;)4!ODb+=CToMdtH`(Ka#XJ4ykrtOTe z`dPO>cir#DCq8@pnB%AJ{QYN5U4Gx=iEWlU*h)Uy+uh~tU$v^q;K8%wj~}Mo-sUIA z$L`EB&9Z(?nD*@W_2KHXmlbZ(;QD>tp7{;Ow7+%vHf>M!%Qmb~|IvLSQ2M|;3Flww z7fR8HWpJOB6JyyCN*MW^kVU6*fcwDY|z7}u-uByICXjU@HwYp%am;MpJ& z=4`Yher95AYC~H_;_@&pzt86xy0tGUGN->eC%4vqjZp8Lw$QeU&*vESMDXrz4m6Ew zE%B*t{-qqEyQr&H3DiWxH?2d=6gh_glQW@A%^%U&S@}&pqF~^2^*cg}w8y m{CdTov!JS~xtz_OiHAYeHSZM5#k-$DMWm;zpUXO@geCy5ixO!7 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..25ce72df5b0d20cd02992e7022a6c6d7a30fb531 GIT binary patch literal 1792 zcmbVNX;2eq7!KgzF<@=25-H#|SgS~~xi%!hDC8m$0vG~B$EwL@0|Al^*#&}FQ55S@ z4?q-{p&-;!I~A0c5d`tBLn{`FK~%g@KoFq{v>=ssgJAo^@ke)N_xrxx_j%suy=HfZ zhX%RMa-T&akzD06v65H;`#r;vc>YCxR!S@jaETg^K=pWv#)6Onb*L5r+CGN{zJS`osBQ6o)bx1m{$W&%wjEnjIhYv6bU2ee3x!6cvz)SjaN2AzNs z4Jqgfvj~Yb$TnG!h)tm?cvC#g(@|Eg0G3<%1c4F3HGtKaV8ZxT0cC=hPweflK?*Qo zg2xLeuSKa9;eZIWAOJ+;P+G~42a8OLcRc#&VWEV4`k4(bOxV6=QHWRqCY8trjSSYx;n`B%nU ztua-q83C0Dh9+5Hq8@thDKL?{cRR8h5^DHi76VZfO@bJOlZ=Q7mx~1y;tNe@(D8)~ zkq}~Y#DQF)M8aYa;WPb&5-CT>5{kqk7Bt22HY_I)VoKOdj+DXSG8hs_$n^`9a{QQF zkyt8){KQjOxe3EHCK#FWYaskiVxf0p`63IV!BL9}MH8kvAUqbuQ7jfU10vBx#epT! z29pj=!Is)f^g3cOVlgBmI;jOU0uwpr8{VQp3$gVG9pX~iY#5;;bT&lQ>hugMhogl# zEIkBsnHtI@UiW`;2NHrndz1X9X{KHgooL^_83E$(W{40IF*z1uL_YrQY6UTQOXT7} zmGyRAlp=oa>JJMWLYM}nyVy;-%F$t|J}xs)R*?BL;FW;(a(cT@$L)Op4exx<+xsZ z++T6{OOMUY?KzJ|M#yb(Ra;A&W#p_q_OIp?u%3XcNgJ;R$?T(3U|OX#$c@ag?Ks+Ww37pUN54_ot)v+Z#) zraeV=y5JK)yYgw9i)uv2b|2>TUUQMHVdtlI7R5E0PCp-fa4)5$skNxOuuSdi7#$Tw zdr;!TS+f3UY_j+!^$V>bQ`*=)-WpYA+#a6RqF^B<~)o9WlO5AJXiySf&Co8=bfTY2<}x@4_7x%RWxg~uNcrncX{b&IrO{jdJ}$A@gP6AoWDjfLg~ z?Ra=u;#>b6Iiok-xvM^V$TI@FGRP_38yy{d-fv+3a_HRdruOX*pR86ochGEQM|&uD zk{{Js{h!HV&d6q1w%q3QN~*pXTL>>KORp(2-f`=fq@|_RkGpRMwG|soucmD|>C&^v z7B{aW!!5gb?|C;v;C$aT&b)@$c{S@oUsMlNW&D}=w9dWB#}|~4Dzoz*l;Z)zJBmi7 zW18CBU7j8?LEFU}u9qddLWgTyolfavBhFXkKkd)Gdv`GI0c&T%C6iBocEg6afY!dQ zzO%=a@&fl;$6rP63%=Xq;U%w!)iuAoq-mWGA!%tJkq=zW^v0Am5#?LXfmo!nH8=WN z{&-f{ykQbn?j?wvZ%Th@)4%xOY}g4_zKc0MeM9|7?=at-n7CT#;pKIGbLFjsJx8{5 zyW_4y37lm;5&jS|OjV!<-E3t~Rc?u)sk^tu{2sj3fs_{9)+lQ2yl?*}$t9uUa^c2| Fe*hoc$esWI literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a5476b61262bb7b266f2bdf6a057df9a88306f2c GIT binary patch literal 2002 zcmbVNYg7|w8V=aXr9z>CA}2?NAgo%FnMufyL_^ID2!bF)q+7s-$s|NbCQL>XaHR;{ zMOv(Qx3YApNQG^nqEgmNfw*)_MGFYkLJM+&77!&{trw`mP7vJv;pvZ^b7sEpn|Yt- zecs!dl7tOW9`63`G#brA9xY9zR={z)I#bW5e)p=VWf>_;A(L=5X;KmxO{BszFhH(T zYOq91smjgy7F$cBEzoNfDP&4qtN_JzETzMSW!4!eG>x|QEwe$1W?>|dfoZgQA;W&5 zg#l<)LdIrp9294eV42$JJOWF~+n_-6vQWN?@m2(|)-0e1bQq}w%(`s7QD7D_W_bnF z-tih_0JA1!mXPsWR7zX|Ai)U?;Ia@V3d1lE&S$|~9*4~h1=tYG1tC5NLre%3z>t6q z0dp6F@&g#lZj>Guy8^H!hAj-gxDaP&7>@t##}wAG&A+a zpm_!}@z_*b?2Bq|Q2s%St+zVp8aV}9*%0RQy0KzN?)ae{?%~~7D zMC`vZUTSSr3ksWoD?< zFcU#CP=urAqCB>eF^5hNNSFg-On1T`WhOgNC5 zyeYX`&FRoHPl)`Imek9K5AF%ga?6>%bV_fR z?|+5R>FVBeX8zL9em1(gZRxV!tbH!Yc)B#UT(|#6;DS}LC$cF0LQSAc*#b?cbJQDA zT}x}*@8z_5*m#kJh0y!eTN|gMShbUt^c4EfMF7NpP0)9E`|>}^tJ91_ErWf1yMF5L zFO2Q!-5INzZuh|4VK93Qs-t1)1;k0}6DMsT^W@)2aa>ykA7 z1Mj~!KfBMN|AQPOT&%yK8#^1MwKKurmo&E>yUSalQLF#`c&w)wQgjBSfBkeU3svXm zFR$y*@k0CW5(W^Vk%pIc#x>VhxHQf(v zx)EujC2XTz90I|G;-`}>gb16RZ|HX?=S1?E$hlp z|Mp(;=Uod2qbTUw2D(s zsr*xehim)-0$j>`a*o{3HNVk`2iNsBto$kI=n40p4qzSoz|o<)HBQgmL4&zp@l|(0 z#hQ^=PaBQ}lZmUfJN#O~n+2%%S%5Ux| zZ#}F^g@qxzgJ_%2qi>JSOl;ZF==+%Q$#Cgin~kB0kKg-X-?O&I6>rzx7}rm1z538C zqVHsYS172=cQQ^KNzdV*WnFtZc>S{{yVDLfEcf>>OifGM7T$dOHfBun_cN?U5aiLo zx#s5YJb$p}^)|Wl*=*a;QWO08>6_KLGnHFPBkW!gAM!NjReR}H&}ktJ8lWc+E=p)~ P{AJ~`4bpn?yM_M&zVj-@ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..61b1d7a0d02e0e93d8515e54c2e1161b0e83018b GIT binary patch literal 1815 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 aYegFSJENmJwwI6+i4-CX6V&sP^Zx-nv&&!r literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6f871a706f5182eafb68227562df6839eba715af GIT binary patch literal 2021 zcmbVNX;c&E8V+dPqhR%jluC?>Qp_?5i6juXA%Vz+fP_GzxMi7v0F#N6!7P>{E!rw| zLzL@^7OYYZPz4GiB84hgKybf$Wh=5-1gaotz;=S*y+1ttap#eT;vlXHfvF0s4b=$ia5RD7a~X8f#6`xv zp=yXL5&BQ~!cRPMG=}N8G@8L+pc~U zy$aRnFb$$5Ss4{dBp&0Dai#A?6^>i;KqG+YqP+9dzeG?TCJPPA^{j{tsnKSZDwpBxk)5#Q;}mk5NZ z!~h{*YJ6N45gEHNe1W&6H=*;WI<-@qD?a0LWNCt(#(6=;3x~v{=+J}S+4HWRmDqg* zyFHj)KC`H>^?CZL85@Q!+6R8;o_yS{{p7Kyb&sl%d<1I9lRGE(EFOVQ#XoqoV^ew2 z!%#Ojx6lQy=XP2wmWuCI?Y!a8+Sv)EE>ElNV9;wB$jr-kd+Ki8dQ<$H$F!JSUa2K% z^X}&Q`g)tT)po%)GMOx?y}kXML=zV`2fflXE#k9GaVblX2j+Q=%qUrz-_*3JwY&Sm!#NLs?^vz~ z&bc2W=Q{IiN}+-tSU&G%i>3H37LuJBcc!#$Lxv>wVhQ-D{}X=qqJ))#)=zaPddFu) zb@urnXIEzbw?+43hFTnr#L8#P15f9h#Jof01+vOtflW{6=qvu&2o2cx_V%{+ANx4c zUxa+#TRNO8Te9znx$AD^LE1_4oRP=VeQao_Oiymgw6-mtqSvC<>vsdmo+oOf4qU&; z{j;NC>w`OYE`G81S=G%(-6MxZjf2K;$6wDWvo;^f;+UjrRbfqdM%^3wP+!xYDWL0> zK2gQV@;80r-1?%Fkbiv9Q#r5V_w@Z!wiw5Dw91@$Grdf2Jy#}SODm?b8#+;v{%2f==3N)FvMKZbTA!15jUg+)r z`1HKq6-g=G*tnP2Od%(h6y!R^m_7@Ve80S>Y=cupQ_A+LKh8dddJ8OutvkX)I0>;+ zUc}$-y3}=Z&`@3Yxat;Tj5uO?eo(c^GIxMEW;gH}UHNkL9e$qYt^<}WgDy3R^0SSM zdpS2M$;$O!=u~fQT*(Xwf)3_fNqn-atmH?+*fYw*wy)dK#`ADkTFWWTaWnB6v)g{C@ciyqWzh}C>g3Li!mxe*RT*i6DdBA#$J1$bj4@?i m4=v-;lD74MPR6N;v*`q?O-+QkxHI4S;|=f&7UubG{qis9v`aDo literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9f04b0b0ffb6944f517db9a8e6fa1e58bab70a0b GIT binary patch literal 1568 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFz024M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7p`n7grJkXw zg|U&Tj)IYap{c%srM{tou7RPIp@Ef=fdUjL0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LcpzHo!{ilG4o3^M(S!~%UoJp=vRT#&!Os*6j4QW4I;s=7F&vLIDI zD784hv?v)EA8E=k&A_n3ZxKi#&^1>6MVY`zNz8G{PcF?(%`5SAu~h=f=%r+)SUDLw zJDHl8xj0%lxw;w~0=;i!?&Rub=49;T?BZ-}3Nr(nUK1lnHy1}^V>d%HOG86fQzvsL zGYeNUS92#fV;4sgH<(_}yyB9?yyR4vy_rCJp?Zz*>a}t%N=+=uFAB-e&w-_YfQ$T*Ibo*{bdWwMksu`+m=G`}f|&3u z0OY_kQEDDA=M(|6$eCN4c^DX&JUm?-Ln?0VnRYVokONN}b4#u0(ip*z(3MA;Km3zf zwTeq&T?cb_gj0jnU!~Jct89I14AR8T|F53eV=vcld;WBa(W1o~Lbbc^x}oLAs+c4ZG*WGTaEs;!XfyEaU?)+AE+Kga4_ zd?#6;#w?>a3(?{Wo_Q3d z86UBjRdb+o@4MmynF3qX51)C)Fs;Y9Dd2ZO6MJl|*3_UxhbsqM*LbS^J@aGn0ii3~ zj@{t?w&k6YQn#A$70!#>ud-%6>fUyr^Gn_SaOr%Y52e03A6d!ui@~Mm#G1Ih1_`#g zuKo|)cf0V+e|^2K%tO5K5ra&puC&M8z4t761Z0k_Yhk?JuvcQo#0h!Zf4{zd<5Pl| z!;>Cu^^?I~>$~FCFBfc4=y;ReZg8t_>vy|wImhJdHFo|J8(m$}54G(OK6`wg!<*BG z#XO?!rvwCdD70QqF$(^*QLo-@Um#3TqmD!%IelF{r5}E+jo>6N6 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6f7cbd02a6da810f40b227f38edb32dbf33ff48f GIT binary patch literal 1752 zcmbVNYfuwc6i$UIV0C6LIPmhwzd_odUtix4=5z(QP03|L*fnW_1hen`? zG9~E->QAA#VCu+dB3c##D{u`RaboBujh19nDE=!=T11h65`Y|yQ)2>Z|M`nlK&=!| zqaYbmrWK*_>Y!8|x-K;|QjwaV;47&sKLh+tFsVR;5(r?@Bw~8lB%qGzg~`41m_Y@` zAVh+I`o^hfSr{O~btnMQxikd`f`A{N4njOO3-Se6Ob}u)`3#UrV}dZqgjq~r{GpQ8 zbV?N*A(oEYA|(Meo*=X^gJCop=|(mk*TpeFKA+EEvKTBDjYQD&DHws6Xqeu6LW3C9 zD|Bitp~f-5sS%Om20}n3J$(~`Mk|xORgCG!6Gf(sVM4SFkj`XiG|srj(0U>Q{nw3m zqVT!ckLDoa%JwYaO_kKf8An6UfR;MP5f+UJ@g+YU2M6g&uC2#0TwGtMB zA|b@#iUW8;iG&T3;j{dN5-C^67K+3oHZ-B*U0k*p;&Ip#mK5ajK~Mtmd47@rDWAt; z@+2HcESlg3V|oI?6zGIqHEDO83%-{Ni*zVL;JQd0Pn_t0uy~xn_3^kC5Q)Yr4lIpQ zV@lkpU*;^)n~24zPMwS@r8-;#jO7?szrzPP#8IJ4h)3ga6eta4av+*qsRC(Su3W)o zs~`oBg;2-&%Kwu)2I&yP*(CpInu#N_6P??)BR~pohX}>U$Q!8&e~OV zJsl|f57Ew9O& z-sd~TXJxU)yhRfe9wk=st7>Wzbg;#CMgHe;;B2&SQTMEKv?<^!mzh47Go@#3w*H2iX2wc6K%=P@b`|QB|ePwbnuYt65*^_4~`*D$F_CE<{** zQ`anwK{jXH_Rnl@-!OHkudng-{EsI495TX|0|%|vF#euBd&~)6-0NPn{)(-sOUVMY zfq{XxS2i0m=~{jOx6q3Dl@51wTtW-4Cl3z~-|1^?3|;O~r8-Xv+{YpO;#HnZhBwx8g#KoemI=IE4tD; zFp!z<*tnw4HMyBq8GOTWc=X9$`mVYUvJx?mWAwC#NzxfSQNqsjI3Uf_w9oVC?WO$V z!si+4WcOW1o^_Q!|J5}8#NT$i{VG5)yQyq*7C5{PUmWpI*_(BDaB%Qb>UHli^%dRT;hU;HspHk;U8|jLSdLp=JoW`$9&q&h{IVX4 znS1ws%zk-p;r9gtG4|>+(~^oq*D6|nC~PXP&23fGctQgfO-mD;>VE2|F~zIHUTjGF z_SBt{=UdVMqBUiB^Mlg9mm~c>H~U_;XNNA1c+obBPw`pMUoq;zq`dC8qc?jvrOtm% Muq0GmA>5q#4@|Gc3;+NC literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5983b66a2ae58d749f146f304a0323bd14d344ed GIT binary patch literal 1760 zcmbVNeNfY89Inm*qKI=$1Vv*N6-Sz;C4~km(x%no%J&pyz|uBAfhHwQEue?^g&-%6 zO+G|WltZ0g;I}6Vdcf%pWHNU+tLzZ<*i=M?ae&B{BDnqG`NwjXyziSl&+qsAzAiZ- zK`R{WUF|s>j)QU~7RIiC^|qVHK8I&@SFno>b+soIF=|jWl$<^fM6aU((A2pjiQZA81b)+52B3` zX$ArcBaD=Z*0A-6TQE*$bN6vaRv@be4W@N$QSfAp(wOuF$tW=im;J)i>a?g7mPrvW z5fDp!c4La7Xs36XIdAL0feUOrL<=B1D;*hgllpiIF+{8o z3KZj9C23@EQbUaU)v z5p&1*+W(U~h!q4`o8&)DGyaP0MCE8jkgg)4hsKInyxXi|JzYX+V)-@00#cA(YS*%?vYF_rz6EXrvoixOtp zr1bTAtD~Pymy}p^>(^lyAMSa3;LhUgvY-{Dc+Rwg=@(35UF**S13s-!=+C0S%10K9 z>uDc1=c|_P3kf?vt?}KMk(e0RQhZqH>0~cCUEZ3I-L`#WOy90;^$j*Fo@BC9=5e>S zDDbHuD*1AILwC2{R2#E6=%wZG6*Ui!$AFHf2BlsUfZ=GXT z#zdpaD}#LtUOoIPJTT++{^GS+!zBY9mZ?oon=59Y%{o}+H-hDt?A0(bVw;YZ&8(Z(Z*F_G`^Sc5a!LKNTfc1AR^Qxk!q_;1 zE=h^svFYT@hDV8o?wgLjC`Jn0dUu^_et5C;_pYeGI>)W^)x4q~*0$a8q^CJJxa~Xr zvi+c{w<}_;KKW>jKf2ViUF4nPUK@4a@_m|Z&m*$x@}Dg&EwP&Ec9Zf{aMI!VHT+e# zxBgu>t9%h|+qeC2oBg$Ao+D=XTCia6LXsvI&X}y;UzgwC-~V{Zk=4hQ?i$#noI z+s{RM9_u-jGr4nUC_OkmbZNnissM=j0-Gp6m(VsT$9g9zS~_AI>McnD_rU@18plZ( ViOcq#i?;rAl=2|#l=Ryz{{R~@v+Do= literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ed8a8438fcf2e5f7950676104c3e3da187088b3f GIT binary patch literal 2020 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%0AX@*+cbbr9x zq;YNHo^+W2cQ0t|EfQtw@UQ{J6>vD)kcU18Obx*zzzN4FGQciJX#i@DTM)R+4LWH9 zY(NBD9W||~a&`PjmtQI1uH3|}=Jk4|!NtmM_>e9JL!nSG*sLfFR94|{FCoF85GreQ eJs1qCs`?M&_O1Lje0%c%0000uL+4a< zHX<4XHl*%!A|WJ_J8II#;4zUKg?fvb3A=2V4zra&lSm<<4lArrMsS)AF`7^jFy49r zpqUIJU<)@AjI>ISL{mf>hD4{SwfeMVy}$s3ZlHxYgam;Z!C{)iyaTlf9U@?sS4iw# zuUPOfC+K=95#17jSWIv7ARmrAOnPi5GZ7W zw7Cl)ykUj}p++j7^F^FQKq8J?g)ElcZfDv#ObcdYK>~q*1+rOeHiNKW*ium(b}&%e zs(A(}V$)+LD{iu&G#4YRv!vi6fKd7(1hX|V@+C29n@bdtGL{3jvLGhNGMim-&05=V z4f3muS6bV&saAxgL2Q;3Oi$D!VbwgC$lY%{av2h8gdbuiqA2hVsYRb+Mo?TK6#>K- zrom(oiXn-Z8yF-F=Zj@B4n%~{=80wUATdWQkxDq+d5%|M1$>@3JY2?;%Vcs0l5qu6 zJ|qj`vbhonz`rH~c@jV-bQ_t|s}PrkQ_5bfRnfas-IO%OOHgVsbEILI{N>*S@mIT_>!aN?O|cEL?xYe{6yZq&ubJ@i{kn(T*pV$J->gCdwS?h zOFq9_{S)Kgr@YI{%78sl zN;gI~IV2>c*CTIlyIOtcmpTY2{-w{m{f7{1AN^|jwf5ocY_~&!kv>s3Q^Mr2LFGOZ z$<5i*RZ!yf%R1=d%uL3mFJRKOy`y(ix}1Di+Y^w!6CGAOSg)ig>uXHE)9}3S+~V;0 zpO>BcBqz2(ei_zbn%X7mLt#gKR0r{f&;WPrh-UCLkJ|N_`6o}tHUKy21z+u{J>^5M zK67R`7!rC>^E!H)tEyJT4D}b+JE2RhA=RFnE+bhHlL4MTk(tjw^1;I>&XyDLG0Tie z#d&`be{;MxP_?~+vVffBae!r2OA$@skJS{ey=F z9&OG&dUVCbf`Y{$)i8fKhmR$oHvPHQu=~C!nIDVo}_-ZCldg zhjOuwk)0Q>Ui}g*iP#@s*ER5u2M@`&yU(_tu8IE>{hpP7Z1==J4>z7FEIfDj^%)pN z7h6+P{jCm1jI1@|jeoT@HIdFWH@iKXn9+C9SGM&&D%_~(ZkgWJpo9E>xJwoa1fJ#B z?z@L<*znrmz(Dko4~VOl zk4Pi|m1v1dy1iQWW@g&1&SkMr(!Sp3H@e(heC@uQpP!#wNpW$M^4No))3VD{oyuk{ zImx>-%$Z$8(igOxgc-NbM)wrVrdFM}KV@c7Jrji?_rT(i|Zr-YTDiqW(Dkj(w z?`lOCADsRc4EozMrazR=`+oJZx+`zy%iVf@d|ck^KDw};j^&rWd(c@oo}25AO%8dE z1KiwTC>lAn)mLQKen;=4^^R1WJ@go#`uL6dz&^uhz2-#SfA-f?C!ghiS8!{WXXfi5 YX&rWUSYSQ9!1dQu$kftC@%Ehm0=xVMLjV8( delta 1425 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 HDck-5<~pcs literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..83ff48c4fe07f8ada0d52dff702f790009f9d96a GIT binary patch literal 1925 zcmbVNYg7|w8jkL26j4_|3}v-LK(InvzGnTanqK@UbqckfFj5Yb#25+#p~C=; z8O_8JG1QQoa}8U~VEoR4C#6s++Bm76FmqA24cBS5(r5-_b)?gZ>a#Ek&|#UlMaCX! zInM@ggN&Ul((<%c6=uR?TqL&M6`!PcW$9r9J2C=T?Ud34W{g4sr#ahVlR9PWNnRs0b1RL|idP4?z$R26G{iM8Fq?0(>4M0(me9@i;t43h|_T z9x!#WX>X*#C{0A7rhL&S8QVlrRw)QN91gBSz$M5`5Q1SC-4Y`GQ+b#g4W zz-a~qv*}6PO5ubBa5JJh!cNK9w9+>rn5|mvTVjiCDp7RGKqqPiAubOzo856uTHB~Z z?7uSJX>Ci&wPIi*W+UvRp00;6a2ibK?zbJe4QVyf1QMr6`Ae!cQ7gi{dh(ux`KS~|NgCMmC<_iUg zO09&UD3M5lz|&Zb#YUkPJvQwZr~OW0q2I(xRV0Q|1ert-+0z}c)t#vFX8CJgfIt2F(JnY z!;nCyH}H(8jy;7p{6Dz^X+fa7N&cs4reD#W=-$2^0s8QEh%gI1IV3$IKNg$}peL_Z zgD8@mJ*^*V6TB6y``z8!*L#RqbN9|{U~6Gk zczFJ%y0ZFouJ_BW5f@`?l%|76AIo=NQJLMU+zWa{K~F+s|d6+Vr(>pdqnZrpgUY)#jUhVGu8o+Z04r!gXRa);A9wZ)!y zw4gM6<@nZ3b;!g8*XNhhK4CVhv~q`u3IE~r@QKA&(fQ=;2ze0iu5+GPEPj$RsOx-q zxvgx?rK;WtjQ`^K7<+Vdk0Af2kN&bK{=RJ0__GZczghRRF5la+_p=Vs-~K&T9_;_> z=i<$Q2mblMzRtEUScL$-6=CO-oB! ztE+8IfBJJ}YVq-i!tLrS)xi^3M%RT43|VSwDz)I-+S)~*Dg!DwtS9gj!PVshKfHV? zMOT*mea!P7THKyKcmY|ugp2tM*~yO^XBFPxbTebd`KsI9vEioFG2>sq7XD*@N8E>} z13mlYoSW3G<}U)`I=oH~=iKpVue`BrSxtcz*RSl%dI9aP?k&1;bg^dOJ?XdPSAM0* zOT##+Sf^xFzTlj9epu|@1lzS;^Hx!p{g)4IKAyERwEu1fv!6qp%Ptt1S7cziZp_#) z@Ztl+J<&V!48 za2B*}zVcAA&n7K-W$;~MJ-&9sc-p;??7>oVGShyx_quA^e!u&Nvi&1{eV_l7k>Hu} zd9~N!nI}Sz4K1$FY{_hY&|73}QeY1w_H+yiqqTis7;deUcZ}9mRxW#Vh$WoZ^2tc; zs|9&m{up#NvoCA#+yljqF;+#z$#UbVlM&yww9FkE8v1qDtk69%raA?P)bwb4qM7YY sOPce_ndIzK1-n}A%=EW>|Ne~G4Ev56zhhd;?EW!o)bYp(WyX&G0Co)e8~^|S literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..df549383cb23e53cb054cf9b7c6b5a41318d50ab GIT binary patch literal 1593 zcmbVMe@qj16z_1GU}TCBRHE}dCv$V{{b(!gX;s>5rBM(|6`W@A+FsiedsnZAJt_(l z5!6o1*hFK9bBJ+f&}<}%A~QqgkCB1Ouc$*|ETSdoDnk^A?uyjy591%Z<&hI&Cx}F%NPQx15LO^~hldHzk?DP9!ZL%?rgN!`m2(p;DN3*~CKAv) z2pef22}{SRp6*!OxOos zLm)6}!eywymqDc`r2ra+B>}l)q1cQd2oSH7AaaEim45=DFd~OwC4|6Y7{L%2Lt$X- z0tGhKV#N%&Zj4JfsX#l&IWY)wyWJAERKl<}2vI7P5R5`7Di$ont}L1(cropo8}fjY zE;CCxIf|iyphv>QWO6D{i1cL&4rfx*E622JOejGzh$oy7B7q@?Bbe8ywTm;5|Az5e zYnL(0NkRtF#bmN(p&r(`A+Vs`n~8#kLNwSamJ*6WY{nULrh}w8J+1Yhr*2!lZ~-kYcF}Rfx^;GNo8akTS7VsYIkEvjw&i zCU6XI`9Io0LO@WkN&eF`p;tmD2Dh(9KsdY_B9ay+hZRPoy)%IqiNXjyo?zr}oj=&H z30ysScWwQ!x1>D$96M*fHzBN1`ZU(xc7J{N6z<6R!s?#}_HjW&> z!NpYhm+bQuEw8D#;P<(1t^4@vneP=eKbZP(aNDu=-sp23bXUpI3;8<=R`7p&cDaZ1 z8jFTYodMN?-{~{zl7{lZy1}M{`xnh%_2mY2QBQ1pVE)Xa%XQ5~TiC) zwFW8|l_vM@ZR%TfvEBka(85&LBz@wXbst(wGG}VUr-w%Jg zWnA%9y!v*Z3>#UtBk$*LoM$)ecv?RYMWTnNR<>uf+G@kj=Tr~XKN{@KhNs&(xTN8` z6J1XGul%u;Yunb@=(O3LG57f0BbQ7FQErHO;!&mgbYK*5c0*eoKh`1>JSh-+(=OZ9L8nP?(`VMq>poreSxretOJ#pmEbmX>ZaZA|ynm!^_Q3_6J8gf7TA`SIr*f;k^wpmJxa|}D2}`^6HI0_X zjfI!Hhh8W?XX1~1u_?0P;)(c)#>Xoj*7j{Y{qRIfZt0%`18WpVev>sEy_@e1#7&7P zjuV*9edV5W@4$-}L%mHocPm#tW9qKkj}N6-QzM^8z@jB_smwdcJ}CGz*K3pUO7+H_ F{{V^Uc258R literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..92e9014bd12fe468eced4d98d1990d21db2c235a GIT binary patch literal 1785 zcmbVNX;2eq7!F1F_gJ%sM@ZrcnGhn)Qe(0VMz>s?lNrv?phpXn4LmMjXA2;-_`9f}b_Z~%?`!cc3~ z0udw@aXG%QkSCHz*bo^$%TFYc`ij^hF)U_t=Q-Yng&-b@lfqJol&pk=%LAn%AzR4h z`?7?5k;HEv8-y7N1XH2&ezm0EIjs1dSb^ApA_Q&-!|}xV4hV_I3EUWu>jANNw&K7C z5n4=*n~dI;61|QXMh)6eQMJ^7>wwuD3$$<103wKz=f^|oYz~V@SNU=HbUuP|=y7~L z#8#@*U>u^P&EeJmCwELz5Yy5m|7n`}S7awzwr@s&JiHkq6eB0cK#oY7qRpP1JhvcN z7-qiP7#=KNEu;>Q44mFWcm8bO?iGs;mRY-bP*;zf=hieRmQlU$*t;!?{?S_5Vna3M zWM-;uY<4xVZykD^CPw=%dga^JnX$3T9jDT^8BC@KYqtuIlC54@yG26#lK|(%t-sIt zhF>d+ymBM>&%m}50)8MOCg6)s=XR>}tsGI?7{t6)7Dhr>SehBed&AO?j7SNH*u1Qc(e3Pojl>&GBqY z0qZ+wc8Rwa3Oa*t2UhG;uC&)xZFoGEdaW$<1T}n++xf9i)=}m!-nBkSH{6f4?&=EP z0^fAfI1x%stnHfR=|SGvxtnt??j5ZRy`FE?cdn)eh&7b;3_I*?Rn}opsg)1qC(@_4Pd0>9o>XM*5Pd^yb={?Z-Tibyp`!>w0t-3JVLp zxJ#>!;WLgyonXUJi4;-UcO>bQ_IWE6-#8xCTwu8k^ZmWZzRPri5 zxzf}lZ$6#z*X|;RsH|RixV5AEc^S7IZtI5ga#c`aw)7k2$_vF`{lHkc^hm`(>eI)> tG<>n@l7)cuAxM#g|_eawo_sl%c@ArG2@8|RVeBb8D z4hizVLUsN|_=KHgL>BcCMDpaeoSYLc`#-zcEX@$$*N=`}#3 z&Y2L20@}Q&NLdI~jOkG-%wW@%5Cl;7)f6Ptg*Hk*>v^7a1fd zuGFh_gc{RQO^iq^mP`m}q|*5iG&-5=J+T&FNEDeez=-Gohyel`jVZ1^MWC*^TC zTo0Hdl`LWdwK#!jmFS{hHR*RA>nHsvmM_+$2!ZLtF)V4Z140ro0>cw99aSuzt2otF zq1LJ}1HRQ%qWOp=s9wDnRY~=jhB}vHzWM_im@F<2MnD#w$6+h!EYO2Z=f*N&IvC4i zGTACND-Pk(7VxV7lRJPE1eluSKTWgvitI$w_WcNuhxbE-YRSpblOqC;eSVIdJnKM- zFx=Q(A0bP$3AHUb5p<&{pRFmf?UpBXJbJid+4)-6t1ruEmRSp5v>fU#mxtJwN7#Nj zB>y^BjcUi09-D$llIw)ooCAw5BU* zckbcoiDFO{`AtMM=q~hRo)&jhhD|)4TRB4{m*9wQ9}ViHS26O2pD9188Y3Xm41Rj)2E# z?uAXYpYG^YtXZ8k(e&WK;c}PylVaJa4OYvR-m@LB&M-Te%slZ(HsYq^*H%_$fezUT zJIluEbpBN_743sHt3y}LUUIyA03LDUa=9n-ixo{*T8*zuJzK~34GdDE)7(SqFK`3j zz38=SP*^eW>9?N!Lu>zp8ww{YU7o|$n_D6au1!DxOkG@BI#}WAG~r(^d=e)-GgIT} zTuHOD%9im)jy=Aze{ELBjWO5fDWkqL*V98UD-7xB(Klnv>d)&r!N!3xPQ#9~3Udq? zF!!l$S+hY(>;A|Bb~xC;SZwXozgn{G zV#HZ>!P$vb_KR literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..20d26dc0230c519c57e5a90c338eea7309c01430 GIT binary patch literal 2004 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 D7bvEZ delta 1701 zcmV;W23q;c4YduBB!2{FK}|sb0I`n?{9y$E000SaNLh0L01m$Z01m$aI0aKA0000O zbVXQnQ*UN;cVTj60B~VxZgehgWpp4kE-)@NWrZ?j000IvNkll^`+g1 zLnsBZ+Lzw7IqSRUd}r_b4fk+4-{-FS`g%T}kFj6~g$#`13o{IWLCA={USF4lAQ9v) ztO8)5%tWBQUD=|MW7Oovwsr-}%F1VQkm43-(a@RvEk*Gy-ADwWkA+S#(W2(cGIC=~c3qlH_B;RA5{ z^N)k#5qnE)H6vgd0ci2`M4+`*fn^GKP%#QbP_PS2*Oz3n;s^(f8b+YX(V`?Ai9~`F zV;PZR1SnDQZNXLu_;j_z2H->8z>dd95THfWL;w||9)F^y9{}n~p-?Gh3b|aZRBKRH zm4a2ul?qHMShYf>Qjt+v>|bDj0BDH-qCm1BfCWzODrkTUyxWo2xn zZ|?7G?(glNpX_H&_OquDkSp^V#SEoZp>E)DB7S<6ol4BX4I!2bfR+e|L_#DBsVo)HXtXAy#p#%siTWqT zpTy_h?CtJmj!&+$AAbJaXEF`D-KQTeQ|m8MFV|EoTOvTpLu-IeswjZ`8ZD-og?Msx zB^aIF*xBAX-g|eJ&fH#4CFX6x(38c4ClcP++kal#SVe701W;$t;teM?KsCw*kldDz zcB{)7Pc6+aCD-1*A_AFo=H_ZHl{EYOPgBdD$k^-s-G!y)W`(Ro0KEiSp$@|N9$7wvlz2@d}0nj4<-xNR# z^?&Jg{z!N-7M)p0Jb&|Q{oVG?$zl5P?ERM;|J2lYeE#J6D*O54;`&Onj2t$_3?Kw8 zi2%n%#S}@EvWLArHn+<^5lJjBuWh|q+j{->=pdcVT-;pS1HsU2?DEU)&QW?c^;1QG z{Cn`NA|tIxkvkBGKAVfLq|m0&*gj70Uw@ok+lPeq=9C1YFpV__M(@&S1M+eeM0=XjR zY5=Re1~QdWikDQQ?(BZlYcRS)flw@J^ZCp!r^D|ZvSakyJswvu&~G%Lr%MFz#D94K z)PVfGlowfzqlRsL(5W3XTD_j&)RZ$6G?+~Wt3_`%57|d-K5vg+XS7%btyUaOB?7nw zE$JfEL8-i7E`awyDwk>6+YM&3&Fv0N$1H9K*bP>*7O$~qG?q+)8jnwoBekkr0JM1l zRHIw~K;S*vexuD|8+Cia;bEJN2!EJO1H(gub{hqbSY?jAL;xuQE%Hy^WSmO4ryd1% z3TOZ*IF8KR5uF>!xt$wTF!Jma1qKj;mUIy!p#RDL3PeetsDf82w~&=dc7EIc_I!3^xNXfXKL2T!Me#2s`3u;DgjGa4;=K!0cK@6mOG z5N|ROsH>}^0)sY#TqUDWvI@41ZR>39>iJP?=))4W>4$V+vAWG5b@=RnE8w6S05t5Q zR;u@~_W}9eXQlsWQ*5Z^a;wP22{Z_*I2;&&o~g5m>qi^-)jV!(4X?Jg+A6NAso}wQ zM8X%=^00^es;V#pK#6Tt=YRfiWaOwo1n4J30P(v#?j0U+9cvKG-xq?thFew3_OP-$4vq)Atxr4K{G9xm9;~+`4LBT{Ra8L=Hgsw*Wnhu<)p_%i8Jt 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 642303697e566cf54939425963806de961afeac6..8739a94e09e0f408b610a9295a93cd96f78d8eed GIT binary patch literal 1936 zcmbVNeN%6B%Qj*06!puhfGHj>WN}*}AIH}W$8n$C3pvO$OMZ%mq zafS)tMhP#%!?$Q7zb_P7-DgNm|7q=x{jL4j!AZnLtP+5`i2p$mOyq36_0_g+!e! zi#>8t1A^HNHrz_$gaz-RT zJE_5br14Z~yLN{a12veP$hR4&d}K#1f~na3v?0GB#YUWF!>Od8xd>s%H)9qu0g*7N zKWrmz6w4un9OerUnNY4&@*v86Zme9X63BUS1)|`=i#nc$Rq<6qj#9{1$rOADQo=F; zB1BXO4XG6D=-Rp*{G1YfH(d>u>&bWpub4|r)UAWs&rC*6&&u3g(U z?3oTwho+(NOIFJ>G`q^=MTw(7@akMW2UBB)BBHL`swudAxpwaI_1Z%#R;(ypo)}#} z*Xcb`!M}r=nvP+*YuB%bm+ZMotNv_RuX;4w#(dAb ze&28SL1Ep=>jORQ?UCwl1=i2km4C8Kdb4y>&jV-P{TqoBTNBNRlY0y+^xp~|-UMd5>E7Otj*kh4<6P>s2eKs+NnfzZWco$wZP-hfw03nJ(bHgWo}?d= z=J$^YM6 z)ckzwmLGm*=(?u9g6!XN`T^^~*wl8^9C0bKZ0=VZChAVjbbgkb_?SYoz5r?3Jlm^)KQ%@ zJMd5Fp=TrWS#L!}Mb+%tURO;`;8vZ^`|Q4m-AMdf@wXn~9U+4eCrj3@$z1ZaXz=q7 zI+~6p@ivW=Tw8kbOzi!0qZzk@XU9$By)%68*R{2^+SW!>zVM|NlGD;!8w!hCM;-Aa z!5Ov3(*7}3RmQB?X8N8{&ChfXqo1yN7}%CB6Wg<%*?;E_?v)>^_e?fNZ-^}Zuyj|l zY-Yzbu(%^fR?NwY*g9l+vj$O~DdX1hU4`FOy13F`pDjH3_ug<#z(@BhD=S|(?OP^> z;iiVA?xU~2?^85fhYN~Xu&8RGIP69cL)VwI9u?LgEwz@Ki;y`5Zl z*!On0oBvnozN|lHW;_giROZ^-uM=IK+}I4yMtW&)x>{n) CECE*l delta 1767 zcmV^YKebH9?35`{v6ktr$_2SxnD3J1ZU;z~dLK5eN0 zqRjoU3jqQ}CImG##wv>*qa`<1*BE$S_vK1Xw3tGwEOaG5r6QhEM?wI8Y}Bc_YBh(k zR;{9fDI_`+Vt;y-N=cR9e@%%;c->g3)s!}sYrsJWlu8AtumS&4#4Zw*N*Rv#vMI+Y zATay$k6rNy-y6D_Q}Ub=usA&-uv!h+rUDB}MgB93gSnNZh3C(f z)>fWvyjaU@tz~vHXGfWnqfGV~1bSnh1CEjk2|%D&OF6(20`x4ph!Wfykw`c51ZJy6 zZ#Kn-hks@k(vx$uvrCIVZmzHG?Hpg6@131Ku(gd$r;abOqtlZxLx_|B?zblM1b`(3 zrKKt)3#r5^<0k|bORLN2>GlteC&EL6k5ZE_ceb}r4v#LgZ-4sG>~eJm0>^L9(<{%? zKQ5bio)WMekn+$PppzH@-4zBXHs)Zi+|C?*y`5C`r*#2)BTg{%hBm6AsTx$ zI~|PoukLKjuP&iBlz`;`bp|Y+a8d(QgA#~SgydG$)_8lmQ|bAs`MKrI=Y-&7|K#do zGCk)Gg&(IEg7JYDneCbRg-U~t60jqpmjH|WlL%Om#Sx%+YU}U!#-hU$iLt3k9CLMd zV}JYfAbb7p!!JK~bO$CD(?@U4Umfn_1a~VdZ$tnBz#{*j5r`u|3pLwq;duXWGBG|g z{q*JYl~)^EM|=C{r*A%9g-1sRQ&UHm7ugT*W>*#~b>y;vBRe7h0ZSslb-_|3F0$6B zd(hM<1bV_l@#%$y<@J}#>n}DBcK5RQI5=lInOf9C-rr_8(+|Rr|eSQ7j>FWv&4<1}*_s)*jcefEPCBPAB4nP1{ za#euft3`%SgRR9M4kc4l<10Q1Utizx`}4JfU4QK- z0&$9RMb6a#8m$4_hPBRQ)Z!tvnCluIHaVPuSR|HA2%(U>r`sRy>+oR=`+~uqXr#sI zKu=Qwc0`;wPkB&%eSatas~}2x zj{hR$wZjN#n+icsUp&x18W|cNfW*gQ;lUslV~@gv$^PMqI98w!B%;xg5G=dHU4dvf z1Uk$*1gFzuhuEAgjkX2=;z=e1#l^*xpj~k2O*$$@-oRJ$)pgeT#_wAl&DesQy~73+ zZ@>*uf5->viTEi81RTCzFMs8G&~%@?_j&DSZ3>4XnM_K4l1Q0SDv>~e*tudsUD8{o zD3HsF3gtyb1zvS=VWAwhT^fa|NDd$JmrAh$0TXXE=UzBEa#bJ#^b;Zg`5n3Jww#y_ zlqsj~seoQ6lNQM&a1Uq{edUV60(pJOofhRcAOqIeU9Pkc4w3?y^nbQoR$L%2E|4LC z$N>QVCZKl_HXb(DdwM$U?X4}2CYP_>?RVigG-?PGe1%1p)k#DjSa02YwJ-f9yK$dnR$bynx|EyFa5GI zjRaq*Aix_Ay#*QwYhXvJK+tpe3WEHT8Q`c6fet|g_;f5UFUx;A{!bsjlt7vP63_kA zYBg0VL_gS|Tv*iW^;&Hu$6+Dw1$*WK1)p(wpNa~tR;yB}{sN~RKE_yjvO@p>002ov JPDHLkV1h^fC+z?L 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 0000000000000000000000000000000000000000..b9e2a0eea60478c9296c659ece697573dfedc223 GIT binary patch literal 1776 zcmbVNX;2eq7>?R1A|l|eC`&{ICE4ACoCYDcAmIoo5yj?OAm-S(Ss;LDMXaJjp^8?c z)@thoBGr0uC?1p%v_`xgPSIL*RKzkZ0nv7YVEe=IM|WoT`@Y@xdEV!}X7i#WrK4S^ zxROYu(P0Zja$*IXx64rC**EFs55zJV7c1~sGzm{vVF-z@Mb!upW>h63azv%gSXqzo zNTgvVU7P|}$RfBJ)JRo1ZKzhGnLv|Byb!BdrO_iephl8)reN}`s`F$(rwt~@Gh~p= zEJRXt3o0<1=Z$-=b;llytO#NPQDBm?~>xIUQt zUX(%>4G2*T0T@&!MFYbyz~WG02AfV}1OhY&W`Ga}gdqw9b76=}gMfjHOnAezNnE)| zGT@6i1(Q>7+{^{R^z?LUI-QDQ$so+(a6pI#(r6UIf?~-q;VLV|WSKF@AVMq}OlQV* zs0nZ~s?=yI9!w^bz7N4@mdQR4n=Au~B2orgRb~*TLZH#;jH}<;g3FPAWqj1y5|?2{ zKsjPTQ!x!ukE9ucU?O*)cH}f9)NrFP9Z?jOL4;~jjfe>k69torFI25g%N4*v0V9Yh z;DpJhQSVqPC;?hl7gB6p|HQ=fPcKsq(##$ z0nQS=k646Yx->*9!B8X6pJT4>V;bme4nqaeDI6A4L!m=KObS~~V^AP9hel&+ne-$T zn>>Km{-4}|gdot_B>!oe!B<2lI=3H2fH-^@BE&>Y4n~Yf*aJ47 zQh4~3>_2((ctH6Ae_i8Q8=L+Gue*3*MR#DeeUBxwH`|i*yLV}{|7Syo$Zompx_0oy z+Jm||RkxmbOrJK*Gp#C7Py-eD9DZK;$FQEJTdJH#4GkVDXp*1dOw*=RKQCV%kLPDN zm5{qHdO@i!XiE6#zXW@cCAqcg8xucQ4w2NpG>(@pEuUIh^L>D;*K4-E_}-qb!l(D# z-4$CMQEp@AX1C4_Jqiz(2V8phZuNnYE2ZR*Iwf8i7b(|&UMJ_^}ULq;^M~O%?aY_nsu%z`(}wo zj8o3MYb{fvXu-SPA&JcV3lFr0%jwS+nrOrPjV}C-V!U*uLSvS*o-Vz~ z@?5vK`{0)CMaAv8>1k<;vz5az%`+^g^JZy5F1r1Y3rIccS)FJfYj0WZyDB5u)_IB7 zR93s@aqFD+pKFgqO0!-cd+hJ{I|dywtx7Z8v7^T)W%7|wx7*X9y~&b#t^67}xiGPA zrgqedsjIu+#vF<3t0NmROkUfv=hd3#@SCwQcN*@M$m7f2c1ud`tf=-6Z3|u1;)+#x zx7S5=e662Ax9K``pQpe(gqVU|1uL`;~Chuis9v2tx+-qorhXXY9@YmM#4NDlZyCH2hE*0JZV zbS@h*=hoY_d4&_*d3RPUf^&SHw_nV3J9>GSdqQ^Qjg!ZZ!`o&*SRc!0l+T;F-);Fu mhC@B!Nqfhs(Cg#-yp*Kfx6wo2MCFcj{)58Ak)mS)WzIi+iMBfc literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..64615556ca2e7f12e0298b920e917404e5f5f13b GIT binary patch literal 1933 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9fa82c0d1e7f8890f647e62ab8d8a9385efdfb89 GIT binary patch literal 1935 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2ab44a59c598e3c71c5fe4466df11abc9a0b66cc GIT binary patch literal 1771 zcmbVNX;2eq7!EKaicnDwQ7EkOf*i`l1)&cP(rML>7H#)Jja~|D~M$gE{ej#uy{Nb(V`?@1tvp*AQh5;N>D_R zmU092A(1T9%J3*WO1u`9V=5|Q!cYw=4Z$XneE0?pB2PkbK!zqL)jaZxZ;WI>so;?# znPQq)BR~_Cf$3T_EIlM#o}MJU77-by$9ZHz>Dv%g8nO7DVYO~LQAEl>1EK*TDh*VrOmR)2b+`omSH^qM zy6`j&3QABNrq{}edc-fCArra#up<+YPy>f*l|)gHWFaQkt57u_B;=8aFI0t60sBD$ zKc+WJ=*#gFi5L(OKAr6+@@M%m`~*S)gE?d4eOwX4k1b-dx&FQaCIpF?Tsns<@aEDu z9G15~oz0lx2B~#8qL!mGewBpZX)fo3Tv(t*5ggNoV_5P`2dqoPa7>qoX#jy>s^Wlq zq*ATGQgt4t61|OBh-#HvQH8%2Qvp*shL!KpKxc5cOoYauaM>(5g+cRXQ8+R>lR}em z>2#KY#fV2ZMEOrBkk z&^O%h=wigpkd2V-$8W|~05N7c)#dr;2b<fpX)PRqAjudPO8Wpk1X_Tt{>>#pg3>&uOiN>`MZyZ5gzl$4$>E$JS`c9v$@+bj&8 z+%~cKczD~PJolUD?|)QrJij2#$~fQcj^|xtSwsy4Kf9b&H{`vsa-yxxjs9XY()hZ` z>*}ulr32eleP3<3Pq7Mqd2aXy-@jZ^MeFJAwni@>%c`+=h&gvcV%hXC;K%4sAMV%_ zI+9zb-{LNQvZG^5V@z(^QO50Cw|3jeJNz398ZLG3)+Y@$?=p#cJ4KA)ek-C(c{UGKbHYa5w<>1gc} z`$}mYqp3@U)GBYu9?zArnat&5&!1NrEW3Mp;=8-L=Kh>hB6#2%yJ=HlgJho_@_BK& z_ISlC+uqU9wAKd?Hne7DT102JH#9WldU|^1u3WiNX6abA|Cky1i?yWrzW4PFoeCcx zpF)f4mQJ;2&Ok#$Lv+?+n`ooaSXAxI&-9k=0WU^OI69Bi6l6W>=!om??cLdGy_LW% zTX3+NEL5r0A>-l{oi2=S=6d>cp&dDI=uAXS=4!W9nd+}SLHFv}pP99{xBt*PIk$ge zr+y@7q4mJQL50wk+uYoIpxMpMEtpp+mA~%q58N^|eE2 zb;O~msi|^XisK)#zfVj$u`L=eTv%4O;_2AfSf|lpe9ej86W~bS4iP_ADh*j?`KNhG zwwISzU})Kb`mX1ACI7DbDg7QW#j!WH^b@`k!}zrR%f@-SgrSxL z9{Z`Kal4YAeh0S+AB{@ZgY{0gNv}SSo;}vtS@PH9KvApnsR6fFuS05jjXPUT>0aG& m=~on_zrl~>#a4~m#gSYVoy?a8|72$R{RD|ZglGNYGX4Q4k+v@Y literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..32aa039cceaa0acae17c6e26d0f230547d64ba31 GIT binary patch literal 1802 zcmbVNX;2eq7>+WIRzXlu5w9g8UgX$ZOCmu@Ho+i4L_|bDHra(lNH%O12zV6~6mUQV zsa6mNtF2m(s#ru2DX2vY2=y2dp^Z9PMJyCiBb06sY=1cZ=+5kZ-?#fd&-=XBY-V79 zuiaReu{0XZPO%gYqE^6qj~Pil`lekQrh+%<3p^(Mqus9qBWx+5e>q*4K&>LqDGr*Wp zO=u0I7S{t-Mnr`tkYYNe^g{?bgHrjCSZ^Fk6qPcT2{EuhCYzqbCHj+WuzcM~) zZ46E}V5}g_h$j$gsvgm^hrv|tKJUnCNU0GmC$v;ikT@7uC+ILeser|F>I)Oqq9O?> zmGF52*vC^MlW{>Rd=4a$$psRwL<&o}{9%qyVTA&@)CcB!%6WVk1Z8{)Bx6fK9w?M~ zf}S#gbQr798%ad3#)kcBDZfKl=(AXnl)w-YCxUT2Zny&iH8_bIHMjwgN(UD;o}ftdTMeAYD9c>nXT01aTKsmu&Je@ zU|Fo=3a9JbT(n!W$HnzdkjvLgJ(Od!g5hIhBJSn_W=VO_l=azuK2GOPhR!N8t|Whd zv~~yuw%#rUFwmaCm&4P@`PB^mT5_S6G{<``(C>IN@D0}v1U!k zveQfK@j&j55uDU@MQ;uTFKBvV{v++w#m>q;W%t$>*MnurJ(ekTdFuY!MU9&szQv2s zZcyWSn#|6uF!$w$%Nv0i^j{?k0<%4 zg&t_cy=@(N)wT&s8XISNqdRur^Kh5}R(6>bzxG@_w$g1~QJ;JxR}5DWZx(jdWS^_O z>6q=Yc$Rz4!{WJ@4`BUA;tSfn#l982hEz|8i>|qGBKP&t(fJcC`wG^&J>4=T6|27!KXX02`Ole8Pt41!yEW&lo24C^ zfet@aaT@gO`Bvtt1HIML-sfcK4Q)0sw}1Q7x{~SvuW+@!_q4dC%(M4PAem({93QSZ zv#FT8TR5T4Vn*td$8U@EjyfOjyYOg^WB+{*@POxym*+~azP{C1G(9rXeR4_)nqOmf z+x_yn`HKYs&grQCWmm_=Kgr6=Tdqz2%{En=6Lw89=g_H+za}N53A19loW_WI%My#S zqeiV4I@=Qd<3`P|iL7dGZywPbVIQJ~;7EH>O}zcB{k>ecG;FU+AvbD5PuVP&*4*^> zyJc@%j?Pd{b#~sBF!Iu_N&Yk6e*@^XF&_A8P>m( MLKXm@l0>Eb0}*P*8~^|S literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..864b081c5d5fd685c7203bb08a6859faa4b9f8b9 GIT binary patch literal 2008 zcmbVNYg7|w8jj&&$|aWCR?3PFfr=KA$>c&vB+}e~P@*(MiELX;CIdvsOiTt6NXtbl zwrbT~3zlIcMhkzM1!V z-sioY`8083tglyq7l}mjmB&ey#0t1>3YmD$_z!(aEN|d4HJ*f};TDYvA&GRD76If2 zO**1PG`id!SCA+Y$qm)3)VNxaAb>FgL*uexSPe!3O(I1_Ta6kx6Tty3lCDREwBd#p z8lcw+X~|p#Q(=@K8Tz<96Oxp-Q3dB^!h9VqdIJz;6%Ygl1lIsoLl$ZlScSBCUIDRp zy#{H(ya}Euq&*X*RwM!v%!B}3Mg$#(APC^`84x#;&EkdwEGEPSnS2mp(wUF|VhUJH zVBw+>-b}hQfl?Z?;EOm3X&E?f6o8<`VqsX=49t`cLVP|SWU@dOi%wY3&ABM9vC>g< z@FIg0F~cUk5!YiV;9}Hhv20vOBa}W1!C+Jwa7Bw)Icml=D2y!n)f0Xfu&iIj3M3{(gJUKYhGi{wKw<`lW9AIZ2uLLJ z6$jQP>rowMF|Tu#=vl;4#H7zbbTKB(0LDpBc@a7~ zKMmn%HECRg$JNpn@VeiUJCG0rx|-zwnr878(TT3@^AR8p&xZ&>iODe$BU1Y5(^wM8 zog|lvRMtC9KRk_WN7L zQs^MKRCMBV@~YLV-5lX=sKKx#ti;QRARdwH*Lx@Y(Y>y=*7Imt*^=t&YI103XpzRB zeEt@7$dQ{&m`ASFxAz$n6bk;_=v0&uh95Lr zjX2&{dAj_1+l32c<^g!cNB@FhICRE8FwmnmrD}Qoss348tB_BnQVWBFgIm)a1C^)K z_hVIC%$z?2JWOi(z;Y+DyI|Sg_CMQB4((r4HEuXre*N`iXUoNllF%#DCnr|^GEulJ zrGqW%)(1{q;wUy9eQk8WH?tVpw#Ee(1f_GV< zS``-G)s^VuyCNi`bd}#7e>(2;Fk26O*f3s{lv_WV=b`n#*}0*y{Cxe6sh7S5Q>S0E zKE1lNXCF34o|$!26#mGV%^KKre95tbiP)ZRI>YCtyh~@NA5;|C8|RjfT>jpnKifPR z^f^;-p+*5(tq)pvUaaE8}ZLbg&-wn&ytGig~$UKxiaqw?By_>y3zXX|QrsDt{xKARY zJCyRPeIZ9X9Z6Q(x_h-_hiorT-hJ}A&i-h}H4NR=ylzH19@RN{b4$vACamkWdw!C@ zaIP9zKb1Tk)Z;ysGk7-6R)ePB7%u4j9XOj`{Gt4~z5mCvBjqV)S}zY79<^P%tn`@|LXJWrS%-+8C$jKmeeZyY7Ohvw5 zdUdb<%wOI*73Gk6F-kvvSz>xzqGIh!J%W|2iP&7`R65_SAsxH%PQ_J&eZRX|EhvHHO8D?dMOizfS!y56tJ UE!sx0xc;?r*+yx#c-zkZ0x0J+3jhEB literal 0 HcmV?d00001 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 4b9ec711a9cc194e9db397e0199fde80f74d1ee4..1aa2b828a617774bf1ccaa07d8381fc57d307833 GIT binary patch literal 1814 zcmbVNYfuwc7>z|SV6hIq!N(fWVkOCL$Of|}(2xWOk`w|66|F4U4T+F!Og1E7EtIE- zuZn=;D4-5i5UW+7DpApbB7+uDD2^5>P{u(8hx(|4wHpN6AC5n|GrRZR-S3?5e6QKu zP(`4Nvzs%GMstw`NtDzI*l+qr)N^FcK-`Pf+CsAzd8ASR4B0JC^Z6$C+m51$3WE4(?d7r+4_m<{sT5Xb}}1OgEb2#j3}%9{~W zBT7lYm@n!iWN1jzfUwyXi-l$JW)a4CHpJ)i*&v6_;V>x+rYTuZqE@Efw0N9Bf}2!E zt%1}Mdce+z#t~*x$e@(I4MAs+%ij^}O=F3oQpUET1~$Y3**cv)u2E|fsl@-4@m_0F zM6v;AD{&KHHmaz4s27iesoZ_ok=>9|gM4AsQbj=%C4|bX!}X+0B4kisSeO<={2{SF z%;iZ$EBvKWZ-@$?w6?3Fg z5h#LIjALbb6N&0o__$v!<#!A#{U8<*8*!8*j1dHpINkxF8iFKD8o~gG#iJDmJfpOF zjIfxN*-P{`VhL{4CgE6skgW}Mnb%>=pLJP_q! zC=Bx%V|eWU`VV%wYKKTR|Kit0rB_T30jhj&AS>#4~xQX{gb&vOYidA>42yZARdRIemT%{64feg~k#NgrcvXqYwVK|va^!g*uKw*sU2D8r&6T&A z51dpUo7O&H_TPC`Y+W?G|776wx`AqXOK?GQt#avzX_+Fr@{Y9#owMzCOJI{gAUJY! zXb3Fp7{HgecXT-AMK#i2RNUIoG1EOHKlzb)ehxS*@9D+Ts;a6J*0e2^VHpd*3(A}= z`e;-4!e4&$YRt%R_@lXxGko9$t>)6XhK7dnkfRY^v(Bz5FE6LJJ>t5{Vk_1HZpL82Ith z?UP@Yep8z79uwIZc&Ve}(Z@pzWM_)n0mo~zYWC`w8{#4gs*bE;Oz*s)S}?PnxQ=XEmip4TZ|GUu#_QMi-;9JO&v3qf>`RVUzjo@?>K!kOkL89sO?uVa z>#^C<(J`~99_W7ZgjLox*dJn$ZcJq?-yU34J&|w4ruLI{`OjKg!=TeCDaB9nRpGMs zO2lE!z)$8wW$sAo>_x@7!d4e;j7CwIHMuJhZS6~M^RQsA3h|BilCn0hmoM74t0_1+ ztGAGzS<_p4es_j-ZJkqEXX2~_b!V5k-Ko(ja@|sbLO4E4;6smbGiKC>RH zz-Ks&T#6Kn({t)?+?d+^-~oWLih2f`_ei$g?C)vP9Q^e7^_GefnCXUePuRepMn5XO zKc{MU&RSbsy=vv$9dmP{8gi#U4!IIp8PnzXczu%fPOPFJcuD3bF1bIa5dw4XwoJFk z3G>q%Y&P5XaxVO}F8OF!{Nqmc`H-boPQ|QS7g;N!r{~d6AiycLPUqs(+&_GOQ|IfM Zu{6&FW4YFK2WbCO$)pO&3IEvie*nAf$s_;( delta 1466 zcmV;r1x5On4$KRXB!2{FK}|sb0I`n?{9y$E000SaNLh0L01m+b01m+cxRGn^0000O zbVXQnQ*UN;cVTj60B~VxZgehgWpp4kE-)@NWrZ?j000F_Nklab6fCuSW5SV7MQqD7${n0QBy1w$y6(2dKpi-7A4`T zQ*e3bVjx$vgntzN`2FL_5vwCBwRF;3Ov51v5(xz=Hn2|;`vf#Cap}tWV5+JLK<%$T zpH7b09+6kogsvuV%jpF{wOU|X0u4zfK?H#uZ2j`HSp3%!1;(HYBEKSXorxpno0}7R}iCw z)X@&r0s`C$0-_*U(!0=3C6@}NH^LWpKKbV1od;ik`Dp)+B!;7!RB?ab05u|j}bK>#PoB9)xoaf~SletP)?j{WcNJ$Z8f#?5OV z-MTJ(Qhy#<13GC;kW9L+H3h-1zx{Y`?=~C~w{Gr0KpAjLzC;bEhEJfa!^@3?tMjQR@^P~O=&u*CQPNUm%_3El+8?AQ3YddefWX3M5|xcG1@x`^Bti^~u&p$xf|WzN+bv`(KJ_4+Ob z9GS817{G4SAb=HxF6=E!5HyU=iRODd=YQOm?H`|uPu#4y9TQLuQ4{~qY#3#125a7M zv+sJsg~&;#>2(B+ZJT7qKc+>Xc!aFcth;Snz!PT&xDqf6ttrW$3U(dbPrWiyck+66|Lw{vH910--Gd9H# z@-CBuFqt1J#}r%i86n`?3%5avM4O(uw1p~Vgb4!)WLZ+_odQsgdc&kJ)p}Vs^?WHu zwWwJpyU4h_l9g4IFa3pubcnB12zbNMZP0+A9i;&1Ilh9xf2rY4$^aP<0iTYGiwomV z$N%Z$R}ydwy?Rn9@xjHDnKO9MpnKa+;?74f!0d Ua6bbxJ^%m!07*qoM6N<$f>G|Zi2wiq 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 f537a6512926609d8f9eae68a0d5e502f1c13583..7d5402378f968694e2033b3749dab0121fb13b60 GIT binary patch literal 2106 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 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 0000000000000000000000000000000000000000..03871d1421d0193bd3e4f040834a43cf3975a4fe GIT binary patch literal 1779 zcmbVNc~BE)6i>lXPVwMSvAP6NDCXGBof3g$6GRLkqCs1bC0SsBWYf(efl{LsIto=B zMIF$JEtT3 z6PTXFa2;T=h{WNkq=Zf}eG`IKuT;J@tTT)yib@&Fi0D}$lg-j7sutCe!LWo*{b6b_jaUlG zq&zMk4irk|at=s^4+*4l1z*aM%3v9XH*VuySO^q=LY_dTfY=ZS%6USN4=Z>um#^T6 zgmNxCjt$lsNJOVb$NgfI-!ZK8y;!k~KoJrrB5^!ryaU1$aS}Hq;(9&Y1m${oOSN=Tp>Yu51hStw*Ijp_^TwP%vU?*NESUk^0GACbS*L3~yf|`XP z4+b+Dv#%tr$cWut>httiOmwt1FKfwu`YO{WQJu#=%mkYS&JNR7Hb*~9vbnmSDAXGa z+bd16>pM0I>MLkZznq%iiZ0q`dyrQ(vHuFJZJua$do;EN+R*F>aYmZI@C(DKA>8-Ba%Mkakm?=$u z?R1af^v92m_-yfO+)o1=2~$kR=KK9>&6?RSmk!6pZT;)`xv=bt;=S|y{Kc)$wtF1E z+0DtWDD5=qvio-Bhfa;D`#3}>5hZp%s1{t=X|=@m)k1gMkzFUEcwuJ_JLX(EYuZ;D z;Zqb>HN!q%VQZgbg@o@BwJ!=dx9^v4-LGU-+pp_9Ft?%g)kmk}tGQ(r6|aZf%NDk) zhFpN6w&I=*hWW1t!*g631cetbZadV1Z+dbr*DPGFUiaAH*`6tFFYck|vB}xcbZ)n? z#AVCu`3|><>{{#3YrnX9^~juzBil>N1?SV!&Ugpy+Lex~+^#qK`i?vammc+~H#xc8 z|1HAZaAWZK?G9SfOzRyt{CLZ59hlzZ)tMJqjCbuCZCSsCF0J%s*1S+}^l7U1?CQJqs?yyiW zVudP~u23z)p>A=(u2My^;JP3xE4Ct7f)enuf*6q%@B&CD2(~{w`=fKt%=djW@AJIR zdplzc4e@h!bax~W2+jfikOW_ew)+En{5kDrt-_a8m?#npL*g*K4221N1riGr1Jts3 zSOUuw$%$8CE`hK}qmo8qk-Y&H~wT8pCz1g@_^E0gbqF=8wnuhQ^HqfIR& zqDsLdMS#K7V66~Vs{B(>I4mVZDo@!fXDdj)TZmi(2PaU&n2cypCunpW1CKPv%fa`y z*8qt)XM*kJk=}}m3=Sm<5fmnZ6mPPeMxzl~YzhtZVbH%75+FpLq=q$E0K_BV zUnmNdf+L^_1t8NK;`<0hA_ff)pUx79#NGmiKnMvL-~z|{us)EG39;BLF%yJnG!e*W z3m}2m2V{suOaWg2EnovQI!vaK!wY^@xZioK_s?QELKK!^2r5O8goO?WRU#OoQzBZT zP&ij{qF01Uqd@e!U)xIbHev`yRr_Ft7)8{?xg2v;@6o`9<7lxg1)a>2GihX&f=MUG zvb+^!b{x!%mBoQD3ydYr;}!o;?f_g6U~7{9X_|#scqiJn??wPWyc;4|gHH~MkI3Ys z>(}wgn+|~ZQiItP9*FGNv0}?qMf%g)bHEk#LyxsvSKlnQb6exTCMh!0j!!bms$HZX zEdS7c>1h6^ok2x0q<>Ym2>xLF!lx*7y{Z-qHQy>tMN*%#%aQugJL#;ALH?Ac>-wJE z@z(U7R5b{KA1%(7IG%5Ac41y7RC%Fpc^;>`_tHO0m^nsyHuUB3EPY+nn@V}btc4VR`<@tU0JQ;mqL) z_JF>`>OFF_Fxvt}WsRn+u2=^W_@KTECPm~cfTBROIX#{=*sE55#^MZ zpFddpdrzmow2S?|JD#EZP1;n?*Z1`2HyW6XMHj+r`Dole2m0pzJ9h2Qaw|P5mQT+N zt;-FJzxS+E5iSTW;R$YbRUg(G7w29XJj0hLjjfVhFFnWGWO_KG}3%y89a|zs>x#NG!;R-0x96Oi|VIA1l|TZz*1}89kI@ ztajYB>CuZ5lCK_YIulWI>E68)RljpB*#>|A=R;|fS%}JQUg65j$v<}0|Z%hB3Sc!S;vakM7LwJ@@YU&iT%3?z-5R zx!xX=JSY^3cho$ol3W4j>*hj!2PSmyCYOnXEP+^rr4U9KM<|gREExf!v~Vh-L|~2i z^Cm<{p^VU>@d-qNVu3)7Y3Z<2hi=m9Ni>Bbj42LDJB9**LN&J0@P8ouLlbP$OmoLX&_rphXB6FljS&27yUL9keSTW#=(S1qM}! z3=#D$sRTtVAi;11;Ly1=H3UHbFPsi>_$($T3}7-K4#)@xAqI^B2_S}m$pD5PD(MZ^ zqzIH!`H(MiC!(eigkAuGMx&8#WYIA^6@C3@EL=_2BW3z9n9SXW9XSl5rx%Tn=9*=CWAw zNSU0+8^%WI3I&yMwazr+mFQMe*1x86D<4tWf zOQJJ;*}aul<>Iw?B7k!$IwX7iyd1F(d6l@w^#sqA5ihkGdN@v#P?P zyZW+g^RA{Z&R(&@8uIj5QevXEaLxQZ)TNeB6IzdblmpfC{Jh33sZV^E?sjbtzFluH zY_7Dd$Zc86J7S|e{c3DcBQm?peILg@viGV~TR+m_{Yv`xQILLmAG_s91;u`{wXKbM zR>RyBK=4O({XYG%t9AU((ZO?kV8wpbXR2KH9LX&PoH}>Z+~rs1H1t+AB{K3yDn|mG|3fUm6-9v$DaZ6Im`Ukyg&GN~w7CcW*-uTz?a|`oqrMqSbBLt1lHcvZ# ztDTi+v$k4vdEMKJV#X#N{v?_&3QueA+RwYX)n&f>>##ugfo&%eI1A4l^v=J0)>39w zhLj}RCwLag-97VN;Mkqv&9mp6EBp1kz^iNad#-BTJGG|q^~a}E_Or`vwm1EO9{Dm%@k(+e-OSpyZ_-Q8QVT#`-|^m+QH s`hD+}w3hSS5%Tz!Fk^K^=<}d@3YNKYG-Z$4;=G2UWHHhT@rpJ70IPMl^8f$< literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9c69ea1e97386962e45c9b334d5c9c3213a2bf61 GIT binary patch literal 2002 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 S1sladg|w%upUXO@geCy`C`#7= literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..515c3effdf963f387055bc04df4e8c6b03ab4701 GIT binary patch literal 1639 zcmbVMeNfY894?@a)f3QDM42qc+m5d`O(88U6h@m?$}F&gQaw*-n-nTEDQTdEflh7? zK_;he!_)b3G6yO;(W!8#!1)2ip`t6BB7*KZZ$rj#epG?E6v6Ee&p(#C)QFQQBU2P@E=ub2O*la-Q3=R=;bKNiEQMuK zBvOFJM@i-K2$%_i1))IPr%CC{}JBdZ#h!x8yTuYNw8cF6(bwElsNt2dr(hSIC6BP%7(~Sg1 zS}h^&61|KV#VKO}jwvY81We>uYLX!}5R2qS3`wtCVPbn(fw^ zuk2eE!hWCi_H~_0^lk{2w$5xV|7l<==#-QJ9kWzX#~@Sf&Z@kaZx+`Ey}Pcm`r(V} z!-tN1d*k5!!o-la%T6%6a`tL&b?N!LDQ3a0w|!=KwFOs9o4mzz(7KbSN*d2^p1tFGds0oe-w#fz^spl|Xnn!M zXT=4huA!R`!lo~4t{m{RDsIQJ1M)^S1KbAt=dsIM1v{h4c9)+Z;^H?nTblcB+4kiL zYq}GTIo7T$*=|RVsSkQ@Y1g+Ar^6b1hk|^P;wp~ctRGK3?3h;7UXxjSqhZg+=v51h zr+a%YJJvd$?{>9$a!RI;wQi|nY1^YVCEMo-4G*848TgGp9y{><4poLntz$5MFuKtq z1admOPOt4dTO4RjU)TBM$9V&(w%J~U$0s2(k^HPj_s6P&flSa_-!lg%9gw<(=v8^)SK4>%-- zl&ib*s_pCx@AO2#?5D1y9Rkd?N)veCVp09j?-zae7Tv#pe=3gp)and*c zo}%O`o-yuPp+5I~{O_aNso3I0Uh!Y#-dXu)(VfvHt*q{8yZ)Fnf5_(k^(*B`=uv5A F=|70be;oh- literal 0 HcmV?d00001 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 cdf498a6d9316db4c6b5e240d93cdc891a980735..5e75b07d0b000887b7a499990d80da849cb15804 GIT binary patch literal 1422 zcmbVMZ%i9y7{84<$z(dS$pACG9E+%-y+7@>^q?T^wWH3KT4<;-6OZ-yyzCl#vziG43)T!9}2i<@8AS!bJpT zJ$j^ov|?7D5tOny)dI+?w&lC4%iKB-l9dT(1Spxn3nT^(c*{AF3h0qlUP_iD$0!1? zsz_yeWX&m;)eakZ0l=hEqj2Lm4r_HvoJ>;@WGYNxIEi996vq@8PT?3uVDS2b$kqf; zG3B7m>$c>b9x0V1ABCcRzhCKBDS4p;#dSIziV-M5C}a(VSj9<9K*5R0Q3e`_Zh`el zEYHCaMy80bko1V`=~@V0pVhiS%!%uXl2e8T7$1r&G1Tjg#I>p|N)GU^8=Gp2`BgrE zI)KPm2yVF^#mP~yoVy1biYUt7P`Lst7lkROd3S{uaFT`ABl3;X!+IzKZZwc;4V|54 zFqu@i96q5nn9Lf3%3!38Dl*Ek8CFMN8a0m5X54JXaTA%Aovo$~D#EPAY1~YzqgV?k zN(|=)QM;^ccO7edAeJ%;fRT71pXbY?9bhlzC0;D$eX!BET5f zfxuP*k6GZo@M?}Jb`u|fT0`KNrdW~Y)-nn;u1=FBRguC?s(@RoQG+6aK-Te||C2jZ zb_k6$$$y$AdL(yZMBEqwd9yJ@fRiUjkVmBA%@##(I8J6p2r zpV?OTNI@nPUa{RC_$X-KHTLU0+;78DCzZ+}FFSnx;)&UB8e6{%FV66nkKFMzpR#=y z3fDh1gvFhDB{klb`B`qu?DGEk3`gd%OZ_9guXTr7nmnz{qg{_5ntw0XKQR49=EF?i z(4h(4b@hoRr!x@={`hzD4@66d)24J!bT%#Czq$O!FqB@~o_cT^SJnjUO#1#py730| z=jDW-v+4$?nVG5nrSz2dk6p=~?9oho0-sw_*`=f>X9_y6ZRVR#Bgx?(UkHwa~-8^Jljg zD)*)|w8pv`#u_K@j>pgabzz9iB5$9q`KsjHq_wc-t@)`yM)QlIt4S00EN8lx`?hy{ dp$(M$mfQzHx41#caX=gSLt0EWy36o-?LX|p5Sjo0 delta 2246 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 UMx3NEL;wH)07*qoM6N<$f&ec`kN^Mx 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 0000000000000000000000000000000000000000..fdd78220407652a97db2e1060cf50f4d1ce71238 GIT binary patch literal 1714 zcmbVNX;2eq7!II_6vR+GpjFnzsfZ-In~P*iKyoQ!QiN1cv}2Bi1V}b)77`*_3rG<> z%Xo1Gr0CRxGUJTMfTFZ&X@_fUu~MW}s}-pds5eNvL9qSd_@n#H?sx3_yzlc~^X-UL ztnl^>@TAdb-q9;1anuYrUk_L6J2wA84K?|b(nK;IPbMuY0;5G~aWw`+8&oM+9H!D{ zXS8AAG@6@HuS_Hp<*QK*ZeXgMGEA$%M4@T4@JOpkrAfm`K#is7jY4p!sRab|S|OOg zmBVtA7}M!j+6XM(rci2ZX&QkRjEn%ntth3yfRQS|YDhPlQL7M~(2G)Q=P?8V6Cz}q z5PU@{Q63A3aRLLlOddmnAP5j9U?N;To5c+USTMqcU;%`{3>ZNX7-hl0JL+^*PZgLRK^prMPiAV&7IQmCaetRhY2JymW(Y6Ll7xf#22%pBqAP5D&~rK zd}In6Z8VcAqXwI@tEcQvVv)CEQ89t3NSsjOc=}WY#OiPoH|uZ{AQn$#90*R(8@0H_ zywsVZR~}0+LZ5|cWdv>jCSr{0-@rj5fY~gyTE*ZcBYXy5!(lPhEVi1#QK{iD9#_K? zaM<7^Ui*Jy2T_C|XOaA;Xr_*+N^~w?w*a+y-9(s?>KuYHOL~bE|Y+w-tF+-KUt-q}}y_ zv$a0;BOOOPW;QO4@L03wYfakdb)v@Kuj2H+p+C>{*?JnN(VxmZ81GkmZE$Hz!SUny zien`vPC)z5s)47Y>D`$XCV0N%{VcD~)x%xGg_qR%F)=Z>DrU_XJ0yJn#aDlJVLE0a2D=PxvgsxNrW&XBBIdueR% zY1f4VWa)mr(Ct}qa8T;=oJu%gmv2uhx7EbodE>FI;*b=iho1N;WYK~BtG2@>ZSazB zFVvyiwmOov)5|xdWM0jG;)olc+mgF={i(Sr9fW%-udMdU{e9JSOD%SP&Qojn$z_eU zI~_rTD;}m~W&Wkz8@>>J+@CYA)q9#p!$E1^;6+ z*e5@j;Irf12W?47Hu|kPL($I7=lTz?-yU)o_x){Gsio=0*s`&_!@u6zT=3Y-k!<}; z*9s}O^~I~~kG{+JAQq_~eYv&Yr+8xutJ%%%dYaW`1E(X2>uWP0a4Q)>@5#}!VV_N9QjhUnSq`J1FO<$F+T%5exL2q0~4wVOvD4s{?1bKE> ZFPilenMUBbHqCj9L`xNtI?<-we*g?+mD&IR literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2dd75fbeac52cc932cadb4f4b7377e944781467f GIT binary patch literal 1991 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 Xz}F2NE0SFF{0$=2I@J+H!n%I}Q6q%S delta 1191 zcmV;Y1X%m}47&-CB!2{FK}|sb0I`n?{9y$E000SaNLh0L01m7VF1_gs^{V}jwxTG? z3Jryx_4}-?GyK2zaCD?CxGkU07YYS>-!RQGMzAqbHp_-#U{t(j6^k-uLQ--Yvj7H{ zcwPz2X8rYXmwxQ_(`j!sTKRZHVd(G(*2k;CM?vsWHbSnU&&0~8>8v&ASB5PCkKo6j z-}?4)zb?j~e}DWE?Aa9>>5f|C?PWBSK&ezjiV5~xrV)f`mcIY#wf|T)ihyN*|MhFI zXK%>1yH$I&1}*pd}?*tyUw%Oyem% z5Tf9tZ?~5#G8?ji3a`5icK$w2Kubj^0W!vftiBb90DrVf051rZFHkV88$x(GgF3WI zfSMf+oeu;Ggo*;LzwhgyP`_$v=WNzP<4-ll6dG=c)q5`Q%st|E@#e`@?QUjRaAl?S}= zLLpL~USET#65F7FcMd*IGPxpS*V3ROs0*qiC;+W`RX`N-fNG=Ws66V=Be=3r&D1oN zO?`(vP*o%X!5na2I5og< zFK}Bx09qwbE|BaGjZ%)5_eGV>OJwLg8%;58{PcFZE@zt9PMzGJnJv)2(jFk^h z9)BF4Jp|Y+yLYg?y|)Qw+Z*HA2trP>63Aw=BCvC?)x6UXwC$Gd*v@KaFz!vaCQPwy z^WF@W{p0(P9z8n*k4}$71E6vEWMA~w*8ALOc<@1)vLO+TMpV;IjroYCVSvqr^g%KE z#K^_;Xd=#;itQKE@wm>~2c=v-p|eN*B7YG^07`aekqZY}^{U{2P)~S(cv6qf>1ye@ zG5@LA#*&km-X}r@a+ZdyMGY5 zW%}~%B}+*oN^B5dOG<^E1dxxryE76qxjPEl-fO5Ufq+p5(ny=7UgR;&H4 zv4(nJxZCY^I?IN^K*_3DvR<}`%^+u-x2N6iI33e8{{d46wdqS%BOL$$002ovPDHLk FV1gxgEHMB8 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 b37141091b5568718d7959b1a013a01870937c3e..96fbe152015ea827c58fabdcd215ac1843adc405 GIT binary patch literal 1879 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e938a93daf6bfe1befa6cd3cc258db684a4779f9 GIT binary patch literal 1876 zcmbVNX;2eq7!D!=RzR_ik_xV&BOWB1%|#LjVy;Rh0V8Sz1U8$+gph1ZRuU*;ZBbxE zG1fX`aTFCOXcem>A{Y=)I#on1jAD_321gq4fO^+%5Nv-q{^)+Q`yKl}@B6&he1&oH zFMP(6$CF4TpXh~R1u+Az*J}*%eLc;&pO^x0i4tFerQsIXgpwAhF%=3#>)}@1r&nmI~Vjune4q{gLx!SM94rZYy=@19n|Yxeho{TaRvG>jSotj zD3&iWp)ih_;xQ~^v;yKZ7>=1Wm=O?(hBFS#UamE$ zF^hSQD@E@-7NaI@CaRX2Fg-9FW4`tS91tFz$xx|aDklx%Qn?6=K~*uBDk=+B(Ze`w zgu`PoDI<9G|A`$)5CUCA@}Hs^Jt8X6wS3($ze1T}jqMMeN|&5Cx`G!T zZf5SCVJ+U#==t2O-syDOm^+Ug;hgNf9Tjrb&w(6QRGnP1LGbihX{YmA>#>l)JChR= zb5xeh%-he}npmC8E;@hy{MeIqFTPtA8XEDX2-h(xV-&eBJDL-!;(^GAdn^O%vUaB& zYTxBwO1VGQcG=o_F`Xso%}HYVSVR>GySSPtTI()29W^ z%MMDo;o<#*zFRcCwQt+nZ1q`Nii^EF)>-9R`#tK0ql1EedyP+A1?M&EXD2)_K-Qi{ z-`Tof+J!}yb@@X}%kB+stc(BNy1r<_(4z44yb33H54k&NRSezF)Ac?LE3|f(uV|W{ zH04qB+(j}*mC}|WDGOlEm`DyPRnNWRR{dLURBdYa`F@aRpQoE%vpFmStbTGOC3*F= z%9QB0{kr6zoX*ChbBkyO>a}a` z-G7^LQxgfKJnYiNseS!?s}80OxeHiipXSVZ*_pbPjc3zKfoYGQwbIVlCLB6-E3vx6 z+t1I}>tGGp!&v(!@m#3#?Bn3f!KEc??+N<40-p^3BJzb@9_Z&<&84afF_S6|UJJa` zsWfkMmsf;(dfck2R1U0POatD~I=Dz}!OO~1tn`SW?dYD?oR;3D_LUxGxvIptGC*OQ zv^6lFdZMjXn@2syX|TO~(6+iW+166;g?*+87$}tg*qgCyT!ZasnBv5PKYra$?uicx z34WISwYg-is5>w}sDaru`;}ef=hzQN8dT4-MN?#)64~-&O`og?sBS7?SZB6(Z(4lU ionuHzeHiq5aw^F_r?aDx!i{p>bI}sH_^>ebn|}Z%U+38X literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..773e79e9628c0895c49b8b5ae19b76f2af5dbb56 GIT binary patch literal 1663 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFz024M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7p`n7grJkXw zg|U&Tj)IYap{c%srM{tou7RPIp@Ef=fdUjL0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LcpzHo!{ilG4o3^M(S!~%UoJp=vRT#&!Os*6j4QW4I;s=7F&vLIDI zD784hv?v)EA8E=k&A_n3ZxKi#&^1>6MVY`zNz8G{PcF?(%`5SAu~h=f=%r+)SUDLw zJDHl8xj0%lxw;w~0=;i!?&Rub=49;T?BZ-}3Nr(nUJExfb7vEC3pZmo3qwO!Qzusw zGiMW5GjkV9V>csnOPF5IyyB9?yyR4vy_rCJp?b~n>a}t%N=+=uFAB-e&w-_YfQ$T*Ibo*{bdWwMksu`+m=G`}f|&3u z0OY_kQEDDA=M(|6$o!gjwG0eQ%ROBjLn?0VnRdEMI8dPN^4*>3lN=5haw{?(br3q( z`$*$m>zPYaA8G%PXv&s9(5j@dNLt(|`rv7nrs;D(I&mnqd8$0In_05voVeEUGi6ps zKYX8gdAa|;RlioB+o(0wOF>|Rj`xQT9|86$Z&UfVR zz8iO0$a=!;g9#g^@&C6~=##k9skX*f&p$&fBitfA{p<1;Q)B_I9nk{`%K%37@kwA0NA2W2e7k z`}e4Q8q@XHI8C|5rMgYU{;+Uj?rrTxmY4SB?`uouJoxr4Gn7foN!{hz8TPhUHyM{E z^1qKSihX_X^2<}qg@qr>jm*lL8TCJQ%QrkecP{jx+hWBCt*I=VZ?1VI+jryRyZc#N zw|th7k>Rkbd%EIMP58u64UsL&7pE@zd4FZfl}5>IWBKf>%JP#G<82IXp9ylkDV=(7 zzW(Z_^!&=7KmI*g`(WnX?(EO+PMkit{rP*=^Y?e^{rGxO`e3p7dX9e;8{hZl$A32Z zl~doWKI`+-_45ui^4IUV4)Zu2u)9ig+z?}2Mr-~0nEl5t0*_U%!X i?+H|Uv77xriv)wol(;v(Q{Ns1RSBN1elF{r5}E+$o{Aj+ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1fe335ebdf65e1977c4d91df5db8ae1707aa3624 GIT binary patch literal 1876 zcmbVNYfuwc7>%U}SOLX$T2jF^bc$M%-OW3J@W`vul7JC43IdzWVnRqZCMyXPv9>5M zq8MwPu{er?6ts%PB3dv(e6)005w$RiMG6`mX+$klYqfTRVEe=IM|WoT-n;vq^PTTC zTb81HKX4j#8ihg$Ok5~ckt^W6{a+!UkKgiClS?QeQxl8vY{G_EFiL_J*I+=R5m|+) zFhrZbx&w=$P<%}KR5hViBneU6$UwX{47<@xqA8S^IJ+4^4HyAvuvL1Kh&IyVq5*oX zh_;NQfD~p4rqeGhuwaV|l&NTe0TpOzaj`&*T}TobF#-YX#$1zCXcy7Od4=TO`x>MH z<0gbbM0+Mmtw;eRxCH|^3@#moVHn^E7%+#=VsfGYCIoXpNC3hR9fE~0BxFLs#6=^$ zS+vEXbZdnDw0)YU8m>`o$CoSmKd=r7#=_YH$B!d*Q zq87cG(Bme+%ZO<3HH3&pDt#7$(X3EBCpK9p5=EvAv?FE^W$S(}7UMm#C z5;2F(l_v1TG8qdd!)NluGC5bw5=*2K7H5*@`WI+G1rUp=(I9kgHq58h%}zba*>l)m?%w1 zwO?&r+L=5n;q~1+fAIuQ+h*3mwd>DZo+UHUIf=VBr>|HMB3?K@pyc#iWN!*k zzOVF%Ix6Jc>ZH2u7B1xfN;@mtI_)6@CR(l6kR=A4`#&NinrqCd*c-gtL(^zs-Q+uGp{ zi5?o6;w+n*ap}^f;-R6TEu0uhVX{&w|E4%>Yh^|QZ(GG^OhojzvWXBqp z3!|RzMB#etoK7QiQ&z43-#e5(k49vPDRneoK_7(N1Kw&(_%pLTUQTJpD4R0Q;_vn%z^oAeEhqoQGFQ(#Ih_c8lx5At59 zqB|Sf*;y^`!((guLf|DeH%B*~Nd4TtzI^)FhtWC3wI1*$dSleC8oO0&82p`AX7As> zylr;+8+Q{Ie5hd7s~x$rno!o98PxD9?Sk`D8h$Q{Z_esJI}8e(?-^z{ZRX{I4foGy zW~{zgmznr<*pTs+$Kz^TP|mor`_%o&!-ng9mUlDm9@w{XNul%IcK#yA($D~za6hNJ zVeOimx1Q!+(ZvFpclrz|+MwW|`h(eHJ|Z?XusyFuaq7fM*Xf)p;H`TPIvHo1R~-8G zYFa~2KyYx7|G_4zuete2+L3b1*qf08a0n?2qN&|C4%Bkme`C{+rb>G*YOPX1G z@M75ay=v<=A7yQnpYPTBI`zox=0}xvh>zx4TyNW;i-p{PDMSp(AC=F9&mXO>K2F@>Iue|N3J! zbs#k|GU7qO$JWZVlK!xg@K#payuX~1V0SeVYtlR{ki4PbRw|YqZF_BbXhT~m(>}Mm mf77BHK3r2~)}8Rjv$818`Mo_Z8b99qpG%Y}rH92?pZo(5b?CAH literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..88cc06aef09a9945ee4da4ef3051dbb12a1bc4f6 GIT binary patch literal 1504 zcmbVMeM}Q)94;yeq6T8ffZ@zp=b~bJUtDPqDxzZ@=+NER8=h)i(>0(aOP@i`GQdO}=c1)W*Q;_?MI$SwlitvJe^gZkxi8sQ7W4>Wi62G!9@WFEs%i6QOvq!mMjLQDVwK59tJ9IRrW!fw(5oE+Lct*Ns`xuIw@= z4QA3Vu9T<5dgLz;lEvJ;*iZl{dV_D^8L=p2F~L!#4w@AVgjyu7R~0EI~n} zDm6MC3X9<*i5i_=p+PlTLW^QSjoG-6j?k+#I)xt9D`8lNDHQ}psNh5lhErh$3J19c z)+LZEMF;INqTOjO_ChYM2RUM1>f56Ti%>uI$SE2y|H8gqwR+AUsn@6&C0 zkYTaEb)XRQt+_n!X>#8jg? zGaiqX&%fb!k7);UuF33g%InX?C7sRbvnM?3aw?7~?oDqSJ~i?{_`Yz*H`hl$zkkaTV(A=z$M<^teE74DizUdR zu%&y~`38$$JA2drQPR2R(LH@4Ca-hM*&18r-Ies*S9Ubcf9s`;edy`dT@|68x-Wgz z$|u`4zt^|ZTCx4;j?UbU^%I*0YIb-X^qG=(7xeTDd{|OJ{r&Zd_#WGFW_Nd2}iMO3m+uXa4AFs-75GyR%}W8(C7aZ_J;6deu<(v&&#o)83(b zQB94yPm}y??1s%^0&P`d zk*cVT*88qgn32nlqv$|Yu=T+4=(GZw7Ho@RrAANzEyi|(#P)~dkA5@Xx$pD7&wK6K zR6|l2i^Bo{AWWC6PGfd3INun{tk0(3Kg4V^XpNCxMCQ^ijKYCL3u(eZogK@=({RjE zTzCpfG?T{@)1-7BT^VexCkmk5g8u=M+d}Mqb#|y zG_`ir7IRZTR+@ImVA$ny@mvBPN#(()R4RoLKFsHH840eln4mE?mvBafG^lZ>nX)-( z8%cmcjhKlnq7@Ls^o0v{hhG0uG2t8y6caMojX7YHhro7w(613`C!L1>OXHQ&&h%mj z4yWNxvWPM>`N)k5ftlF7-cV4GVIx~e*_fnY1!~el~AM& zVReL)#t1VWvTI}Pj$#F`#mZC^j?pBQPLc(o3P`n*H0iXG4p5~U$v7CZ*hW}Lmoqk) zq8A>kamuzFw`eKS4vxfFW_tw(vlJ2VO(u*h&P63$iCM_!n)m_}SBROAc(KSVmI?*X zDBkjaVh1yX;9!ybr)WY?OeF@7FI#}Qylf(zU^<6lTBNan5Cg#2LY+D>-F>rZ+Xr)wjAv2q&(){(y1bn#jw!i~8JhmSN78 zGjDF(6eg+|91h&tfA-fYce?8rc&zu+G`8I2zL%e&u|L&da7**19R>zF?vmfOFryzg##GX>3 zseGwKb0wtZOdboP{9e<2rUx8oW zT^mmKUqAIcP`qH1i?6DjaVTr^-*uW3$-_fE53=Wr3o|NezA2l{XZLm=j%_@r@Xlnh z1M9C2Cf$&4S+Vkx-Qdl5ymst~^KH{i`#X}wN4zJATXjpKyIOAE=&*F|uf6zl6-(mk z^gi$(uiQ~tXPw)1x>dZe#me(vYKUw*dE2-9?zMUX^2&!+9sTP2g!ks=@2l@iS~UjX X7JfQ^&KJE;gFknj#-OfK=6L=A8OLr3 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..757cc7c6d2116b975cc7db8dd50211b1a5ff38b9 GIT binary patch literal 1709 zcmbVNX;2eq7>>t?;?VIxipaEUV1x=ec5{&o;Yc<}tfUZ;MD0*E*$r7G*_bRxQlNsg z;6dwD9Yz5;l#Xq{t2pWiQWQA^WvpeOAP&|+3y3IS10J*+4%;7&Ke{u!-}mjl&+|U- zHM=)jvBAyN%aul>xyd78CA9+1d+~hg`Py^%1huRtWomLWp(9ffGe!$X2@M9w4M-xU z#1PcFs|5?D(H0o-ST(7R+9c8v1}5UPVWt^O6q-g04ox#5+MO5)Xs|@wD5j5GsiOlp zDyFM=QS2y_6w~98HZ!)_rij(rc4~zvJv0OeP7_fC28=|2G((cnB1#j}r+G!x-uaqE z2c}KPonrcoD0NgcASKKgz+>_mS`Y*QfshIEf;bQ_5P;YqkHr?UKsJL7ia@pqVgs`m zo$_Wzbs{AkG3$#uiRpThG>KTO)YMdFDu+p!6Iq~8C}goA76dUU3x>sNB#|_R(c&}5 z0Am)d88?wQVFa9vh=xce#dJ#POb7;3RMcByqh&TxRLWRsh=~O<*(`&>8P~M6g;Zky z%6O->CDv-fSW3)7B%8HVJ#;>EU@CX-cjPpr)QCPa<5W?QB$&`98!#g&hsAX23lqgr zkpz@Vcw9al9wd>;I3N{1B#_7=_!5pp3QIY>IgWQ?IpG2hPr!@dL~ub+#tVmePy`Ig zV4e_?$RObyR&KPAh*68p`Nf@nXRzG&VntFjhLD6gmLQVmIv`q4kc34~m;kACy5fMp z3OAxes^t@BiDn{(F*BZmp%G@n08Hmtgug?BR>%bsJkd_NEG!RF_;368f zfX~zNg$d&F_%I z;jwAmHF2NXl`-xik0;{Nm%DylI;jV8au&sKO}gt#^Y=~d{we?`fBbkk-1`(Td#GfE zYWc)34*SSNvBwolK#{j2VK^hSv-``8q2$x?_6}~;_Nut{AO*)ws`M@y+(&h(K8%pg8BwiuJ|GBV#T=& zJ%+55+zLnpU+rK}J8)#llx zS98cgQk38K@=a#f$`%xYOYaVl`mY<74ZN`ZHn04?w(DL@&qDO*4jc>|%v;4gzg3>4 zHhAv8akhWV8n^Ujs8{|UpZmM#C9D;!&z@*}xT|aF`~Xx^yPy%%tKe8;kyLwwyeL^&|zz|uXd_I|8`9@p$B!l)6y4K}r?f*Vz zUG^ml-y5$`*|+pmmn~}FR3IwIJDY2rs;e3+ZaYx6{-j#?`)cfX$K+3nkB0W`=`6x) za$oEjFUpxW`YprVwFOoAl^_0r;j*I=m&tYL-g7A{7WwZ;5|rHI)w!NwwHec=7LT^J zUVJn;u%OvK<~W!dAIz^kUU>A+nn``8ONlrqsn+IVef8vO-^JTc!!yNo!Alm{8$;cI z?D|sc)HAp2wgc^R literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4599ecae2f9830c834206695ddab3616dfd6e132 GIT binary patch literal 1954 zcmbVNYg7~I8IDjaS6OytMO|LGJy~>lO}^nKo2Y; z7nPtz*=5--!m@Q;6l=jg3nTY$Jlgm;&D5+LM5oSiL0$`RG zA@|MCI`r5GS4mbK$CLq|qW764{(D@+1HX2*QYfpv7WgSXd0)ln+9DJ|ASlAPmz<3%c2c5lSl^ zGq0Fukf3I@NoOQByoeizK+Z*nnb$Tp|F- zFAR-NgNPuph{NVegz+M&lm(ID!#t5x#uc$dVu_f=ndf*DRwxzmU>S=iW69VMB<1jV zJV*w^LTxh$W~=w;9#QOt^tMn`1=x1`TRHlLf0(N;+2y#na=}Y?!Ws zSt>ePsbccD95t8EW&v|}&Hs}-kQ4-Zo8*6*X8sk~iQet&5g-q*hX}>U$uW^50{-T4 zKRJ2*a)~h0daY-DO4>T%;?GVTY3ye$@Cgw4UXI|#eK1fFrRVLyh*sIl`r72&+D{@p zAvCBmeffej6^Styox4Vw9>BZ&f}0VYBJJDKp{6Ovm6Vi}k?hoU>3YL5 zMf;@!Yqb3Bi`uSn+i1d`iAni1hr{vv1Z{FJmELf=gQ_FcoplGV6xu!wn=Ha{Prd)+ zGiNHE{N8!|9p}-+-J9ZTzM3BUZqs`EpSPTiSqh=Zrfo-$Lb*3wuAM=lp`jOshN`Nn zPOoS--o1H~g5^o8s;jpyu-ol1y^)lMu+w?7Yw^tpYv7YQ{d-OQE&E>l8$A*y|i(h=X{x2g@%a?4y zLy4Y**4$BHnP;YN&^Kk-2={d8q7aeRlJDFQA)Mgy9374F+;cMCF8AN}0{ZlZ=N-ah z;=T6BJF1#PSdHegC~HGh(w%py0Uh)e(xLX9#j9u(`Ju{vIpZy=xT&?te)V;g?gaj^ zPs7lS1z5*bjHe-$Oqe9?x2g)a7pCoN4=wOZQZ7^Pt^yP zzIQTUF{nxJslUbz{pHix8^goCJ8n-rjmq-v%urbGTEg;=WX9SyDWDIRR6nnNc+2mf zTSLS8zc1u~X_cj|Q=WTTt#)ScmSgP2*f_`-JrezRH literal 0 HcmV?d00001 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 dd777354b435b5b01b3d9b358e08ed4bf45b8c2b..13049268a5ae2297fbe05a154f062bbb6becfd44 GIT binary patch literal 1705 zcmbVNeNfY894_hxhaYppDI({x;1IBFnwFNfqbN;VU{Vz5pyKh7HUSE4Q`%q)GG&Sm zI6n}bP7!pVf=uz_c4H`_BB&e)I2BMpCL&BdCn_JJs7n#t{_y-`xl7*nO`hlZeP6Pc z2l-96ce1C^Xww7yB_Y%bSZ}*Y)N|DFQ4zJwC8bI-l!ztGs1c|6VuT6@0(58`9)hD- zN>Ux}O`}cLYZOXSDGwB?2^|x)Vwe`4fnw8W-is{;RGo;EfC`V(=tbb;(`P|IgNeX! zuAC(|Ab7mSKh=nbrUoh0sflU<1}^piye&dXK!=kkV9{yyCZR5M~M4EMWWsDQiY7 zRv03YjoYG5A~2pL4MGSqo6Sr!he;UYAXp#}KrA-IW-}-R!<3>YQ42$Fa+y$&;3l^-itOV zQVcj0f}4nBqnfHmtjh$M%H4+zS%H){!evGcRTNY!A=Jq_Tu%l_L?HEriD@vQ7)Hcg zPoBh=FP2IwR3}=u??!++yc;51Pfd=I8WGpNn>dX&>1u$)S7EtT z8CIX|6g>0MZ|#2dj?Jw7fd2Ys$CHM+H5;ak{xD)2`FsDoZm@7@HOy05) zefl}S`nHzWAo?t;KXg;rFL>6v&c;oL3*9y~e`>$M@<$8{7)U+SVD{PPAS()Pob7#l zSN&J*ec|buE_-ey47xcK`z*;n^ZuH1u2dV5n} zT_}BaorB#J<)u}pUzJaKa(VR1vl3JKi;DJZu`Uen~5JCBDPjuD(Z>|vM1 zWrQ<#)m13zmys1cg7Yys(<09vq}SYqX4n@*wm}dy|G<)J-~K7`ny{P_ptpDBUx&QB zTC)oi_T*{H+pjDfii+!O-Popk-7(p8y9cRx&}n-&2a8B}vwF{ow$j{+{G`j@*WUvN zUcO2zm9|{Clhb_niSr=1uj!J<&$KlSy8~T!?!|=VNA`E>9WJWi-VJFT-wsqMYLrD& zm%xe#ry5Nq7wN(2%9os^>fYjG8H1_$tZn}N3(5p7_AMnPQO7O~&r$l7MeQ!w8cpHa z{YH4*nME!w3EXOhM{QcI^SSjMo_X>rnlrh2 P)}Kd!G)Ph=j#>8)xZIoI delta 1462 zcmV;n1xfm;4af_SB!2{FK}|sb0I`n?{9y$E000SaNLh0L01mNkl<4iC5 zzx1a6P_NqG*|V%^EZ#6Z^URs|?0L`goR4?kbJ|Y0<>bkeot>T3zM-lLMswkdqAI~) z5JUHh*3~7uR7e7Dp%=j55`QNIibX4*OHt?CdT`KmoaC2Z1hNKAkk6%?n-a}UIS}$T z^yx@Cy+)>oI)9msNYDh;)!V)ux4NbA=O53SYeuzvNjZ_+a2yRG5D0W3MF-(}O*u`PBi6^f<9&@y`=Ffd@!ErEv=lVAnD?RWkD+u}hr4%Gc- z_>`eT%aOE&!(q0VZdOVSBvEtIx1(`g_O{qSY_IDEJAcz>5zrD5LVy#KPC(O$h@hq^ zdPviCRo7He>ly|hLt!EZ2gP+0(IRb)kHS;K_64970<40~lI(bQs@fp|2^tBz8(JYi zJDW9N4~KPC69R3AC_+GEO$q|g5*TePip^px^^k7c#^D9-RA$&l2)#4lSM&sQ&2h}b z3si1TbAMnQ1GF5JI0H@t0hZF!8$P_i_1UY665tr1W&gzrYtzNtT z;LhVG_ujl|yxV&P_VyY(Z#Q3VJ=xveSX{Uk41We7gjTG8geSL1WnJ;U;!y7Vh4S?5 zyUX)SuE5H@#YgoTn4O)dR_Cfq^N*g~d-eMHX5;D3&L-?q0Ib(nr)RE60q;NX z51EZ)i_V-aO-+r>+?<%3zlO#_^~Pf5dabqyUc6j;RA0S$YwF?p@_Kz`V{`5Cv-{gS z8-F`*HyT@Yi639AudUVCZ3Lhdse&!?R-h_IGB#W;{4g;#d3F5e+~mZy%S$V_u6%#~ z{=?+*4{K+HKlK>2&VGrL*PHV%9Mcurnz$V=&UR6ILc| zXVd6GZQDsFXIj~mQ?Q249KQ>SeMSeX<8sNyh)dd?IA8KW?qot(bx`5V;F9;dSO0qNVG))!?BVw6s+8M9}@|K%=MVEmGnnyv%pDYB9A3y#T0VupQc0j=aw-yZyZZuZ#uQ2^j zvTRtixl`0TsY8*RMFAVK|FnB1xJq_{kEfn#Zp)n$iHo9Iqg7kQ;Q;2H1cV@O13$?eU(D|I_1F3Iya! zT$WHMM9l*#5{X3j3qHgHpD$CXR3Z^4Wl?yGNq;#++C1aDG0|wkNT{m%4_)g3l22uw Q9smFU07*qoM6N<$f(;P2`Tzg` 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 a8a266e985cfeefd58a5bb9b790f27f11e15a598..ce420b655482a26db7a53f7b963677661d348503 GIT binary patch literal 1914 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 Qzz-kD7-eQqs*j2K53AqsssI20 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 0000000000000000000000000000000000000000..de0295891679b5b8bfddfdd1f4061c79342c939a GIT binary patch literal 1806 zcmbVNX;2eq7!EBulp*!DNJY270}aV$b0-px9AKnDgoub@$+3Y5$;Qn>0w_`nm7t*2 zPNPT_tqL6!tS5{`MhsPo7_oSu$fXWdL?Wow0&O=4wm%$y^qbl5e4ppNXDt!op+t8t zcLISxlr9xV;w#|%+&;kPVb8uF@MRVziNT@}4Q5iHFd~p>f(NPsn8LC-lz|jPPf1uf*P$j__po9~&dI72bTrCOEss*G~EE!E^ z5W$JsrRgXfl^!lvr6;L)YEobT;BV&R1UeW~0A^jX-pDr#NTa-beDAylNx-NGmLwp( zF)BtD0f-P323S-!MFl|+z~NCL7MDS1`2lnq!~$tN5Ta3N5FeuP=`>($kZ^6NTEmYN zhm7gMPXbaRh8g%EXfm0oCI%Hj6F`W^?#j$t|P#qvcctiTXdjv&e76%dh#V2CjhF#sabXvP8GRa(6oF&P&* zQ}o7TF^p? zq%pku|HKZ&4Fa7-@}Hs^zrrigxqaIL_~C66!Fs%NP`pL1oVKEP=dq>YV7d9u&(SqW zQ5&W=HHHqZ*tKByj#yvuPQGihUjdMx<9E2wWue4Yf4V%JN_twMk1jp9IV&t5h@D{z znkXe*IJ|zxDQVH6*8{_7cb}c<>jqlUj>;`V?Mr$xYdm{V zk*$qUDok8=0(t;x$C-swA2+_dU=Rh8Sifc=wf z=zau8QxlZ=pTF)&=++AJGE1vLWUw^;P#5N01eU0eqUV>(1 ztnuBsBxQ$f?krnVmCMmwul6l1kK8^^-xjcaTGQ>eHrsq_;{m}`OHSj%?!Ec-%EOVX z+O^L-`XYW$n z<`%5K80O*UX&|cP%Y+A}74S7ODf9ZH=eN&v3H(o9PM?!^{E{WGEheirt;c)#{?K|a z{k@TEy(w0!T^8Z!(0Jx6%lkVwU##uY>U6|Up6|py;4I;g?SE#@udo9%P8weo*VG8i z(^I_8UGB8Tr=~`;hn{(tOq!lla?4_Bj+(U+y;W2zYyGygqBs{6bgW=(9GN=Yv#_$| z_2UVz>TZ7eiov0hZ^~9$Ku~TMSH|Ul0U5;2eB(Mt?zYE=E7$aw9*l3fKbLHnvpw|t zj?7)hlq1il?YrBst6bV{DfTOyGt@OGowq;!$wq5`(QEgZ4XY=1S7+z-{?@p<`D|?f zv85@a^o2|lz6VUDuI`Pq@8K3^)T~o94L*HZ;ajp`aE9S!%qFx8oc+2pFJNO??zuwR zU!9#n-4?@{rVhz7^V;^K{bA?#Ck()v*1!j4$l4JOn*nw0P5ydhYCK`>lfIlTa>H%s OA4)0-7gq@5v;P6$0nr!$ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..727999114e7af5c0f84cb6c9fa058268df68daec GIT binary patch literal 2058 zcmbVNYg7|w8V=~9P_Yz5Zqba1Sg__YxhI%nu1ioT%UwLK<}ygoWI{5Ka9LXgM7mNH z+ad)777A#AaW9{ z6XR|{J29A58dYc{5*e_EtAN!cnFT{Ks^hg2FKe)3ui9#AQH z_y|S-B|s~LVpM)fIw&M5FjSFrSiw=^ecuOm8o8(fHH63jqxy(O&o%P!OM1EJ-XbRB zfh7oXn1_GmRAfL9AcS=gz#uV+3J?SV7Ka2f*fc6*2SBBO3^Ij71}Q`e$OS1}Dg{`6 z@TfJNGMXDKk}TUoPdt1Kf@ry9vcX^=8E7O}cZdvfI2Wm-&ZWu22Wb5Lg!q!$(#+ASeb#V0{d%1%$$- ziUVE|Dvc60=)El^dKIw<(y0<4r9=m-fu$UCRd4V?!J*Koa=DDij0V|6wt`M2%BeIt zkuH-{SWJe3$)VHm%Y5bklRGl%5ZTfs|I;)pBD51N+t(w29$pU-q(LV~hmMG=DRmtN zvzjUu@k5P2HHGi~Kq=nP9DiV_VcP$y@U-pV*=^ts8`}w6kJfM&_v(*(*&TgH;vaXo zzUXL+Lp)0|pW(he))*%i;CuGC;;h=zB80s|-*isiGkE*Q6ttCAA>F)%p^) z4V=lnxrx}C`Jd!P)mxg^JvX17XT2?vNY0#yZM0ieURG9Pf8UqGx!4!G7Vj`-ZS4kl z(Qtgz!;h+}h&kt@>usaFHdO2WU8#SHQamfYhYHO{IC6iqmL0k%cc4qA8^}Iiw zZa!TtN#Ca})N~}&9=5Tu!3z4mXI7lMvHkSMs#9sD!HJg>KmMzeOW(-INTcdI-e|7U zcfBa`QJZh`B6ciqasgv*&*-r?3@?IRSHFQl`ESo}i|Axa;hfLF zxJSp%&5FwyStC=yEL}YsKMoqHTsDkPT;ePye68i*VG%@lA!7aMC9r&WZ1X!VO}(qwh%m#gUx3)7>vGtV+@ zZ@hTHe>e8d8s=0{%c9xisWV;uvcWqm+*=q88wO%4@JQAVg{gaP_Cr?a{+OMQxy~wU{G{@H@ugGKTlMy5()#!8&JMXK5A%O(mz<#Sl#G|VO1nOFyg?w6 z40%saTtAMlS(Cr1V9=%Y-R~Q1?TRP1cX&^U#Qe1F+4<7O`yM9~RLH%XUw_e#AIELg z=exM|vnQ>ZJhct8=Q0XXoN!nyGK`tN#$1E_=fu>@;q8OTUk2a0-|F$n+`rh1Q^g6F z=hi;H)7_oF^PTSW=H#NX^75fuFPlbZM^$7(SLSYyh0I@vYuz$8504(LY+3D!8JRJj Up!65QPe8+ zAZ-~roMM5B3ayG->+Mi+Pzo)Ij21KkUX0aIP;2F~8wA@Qjz79HyWjWizR&YM?=@Qx z6CF0)!NY;YVoi?-SH?0cV7n(zV4g#6PpX*3omM5%afF`ELP?Ajsv|TQ5Me-5u~-b% zWoKT&f>|uK5sy!#6Qd%fTEf6XZ8ki!!Nj0htl$u{3Du@!G@!v!aia`;dgcNM;5r$Y zAdKQinG{$W9-c#DaXHcP+MIN)L%2AV|W4g(Wg$F*Ood>HL;~>zkU+p?EVxv*kw(p2Bjr8Lpu{LG ziJNGgFakD4R70$$Wgw&UZ3qTaRMb0SBQ=&NCS{NrH9;_s4;c)$xJIohIu`p^#(S-) z_-qpf#bOk(n$$A&(0h-AncRKYkN4lsoa231RiHRX#plCnL>&mjDy9kuEQiIRh)Sdu zDU^b7Y=n`bQKJ?c_lq-r$FTelVxC_})07i2x#owbrE8!yojRxh4^styK)&>f=8Udo=2BI2%kVvQ% zNdggY46pk?xq}!%kgZAn(=_9+m`=29-;DrscsE3tk(nHl84>M~$hpkq&5clo#+y6N ze*Sy9OQ@^0#kgMBa)P6woUVP{py15+$@eYK_nK5#9$-D2GqbNJ;_$f~j-T17E^l*J zVNUB0L3q)^C7UgQMIyW{V@QADCG3;$V0`dw&EF4Nng^|ilg=zZJnM_h+}w;Ik7``5 zu3CJ#&m6qb#eK%s{F^7HXOkpI^>}i;@1f7*d|d%;UCC+0nKO&+pWE>K>>bi$r#ky{u4>la!ncB98}mp6fOGHGiqXK!PJrY_F}uv z-bmQxMX9TEwsZT%LvAs9YEtI1=W}^H`7g0O;pJPl*fpbmoM{c}8==zf_8|S(l{yRpss5%W|EJb(+%`9*wkX zzk3yZZV!2*zP>)vt#!|-0m)@(>C<>S>&c0KZY7sQ$O-L6%fv`NpB+ zuVa_=zua!wyCS3Z^#Jy=Qr1~Mg&qH8e@EjXI_B;Z$0a$t*rmfY{S|jp6DqH|K**f~ zSFUY8`H7@{?eH>dL(-)UTvf-00K}#G&6bjR8P2zAFZecW$}4Jhe-@owpAx;lt?B8v zyP9#r$?L}n+o;x6=O6A!k8!U+R$_k*uIuaX?ydmL$(O*M>+>q#3@_fh*e5~lPuo9u z^r+_ElqY2)OZA17#rVv1QEN{%nS0Oe7SQ$~c5bXm$GQ_c548K*{zwt3XyqaK%KU!- DF$}=7 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a0671c12e36b996cdf6ab348cb8c868cc9e26f6e GIT binary patch literal 2032 zcmbVNc~ld39*=;+;!-@Y6$-vF)B_>M?6B@Bpl3Jn|# zE7ZFauE2f-f~{UFlVftpHb{l&$O@|s*{n0*Xad1+li8q9#laY$gf&_{m-wuqkqBtj zTw)kgLX{Z!aEvxE359ngNoA^}I2A`t+~g1VnIW7&2V)Artc%whAv2da%M0Oq>uU-T zm^H!TxWqT23>1(|rRa3lxMr=5STOuw z8Sk_<%61!IN-%6h5>XXik7&<%FrK?Vc4Rfg)j-=(EnXBwyZ})p>R>%47I2C97qVKb zhIk;K$7HYso7p^}kPhPE(|mbC5sOFX@dbQ3bDrZ}SRu`q!=i#T5naRpK_Qdl%cKiM zLK+LN3tdQO&11!SBc{-+;Ca7V-0vI~{6j3nM_~nqpfUuBpYMR67z9I%F^B=+^Jgm# ztPj)b)riUHWi8R0hy^gJ{R~!%P(%mJ<`~kxLxYM#rPGv31&I|6vPoep zp``kBK_|}P)&EcKD7YYswMqV`Y35(yooL;@9Rd9Cc8Fj-J~=2pBDpStDgwc7 zrC6|8X1@DJ}e&~^7Dg}gaGkL$r*NLZJU2)?enWW zwU%kQ;3%nk@z&Qa>7P1(TSNNzYDW5M>a}fQ4}XPz6aML-`_>bAebT|PA3`P)hC<8l z-@gwy?5qgQaV~RFySL_O^NTK7{?V;VkEvL_u`sJ(`9p{OWap0J@^Y^>-f1BD!0AzN z^b)b<_(V(IN0uL57qm`IP0cJ@V9GkvCT?kRh^=!|m&>4#MJaHh1I@qXYU+2qZ(c4n zY~PgK5xpEuOk9B~l{W9an3&)z5X4#PdmI zSGu!8sU=3OWle@LFK(c!XoUq1#ifQLno}uVYiwe794U5PaAc9a{pxtE+>2-p}>^C@1jfnb(UGp8f62FUxMU zHP<%hYxaLUS-sAqEd!T})(%N%!lUu(iX9SEm*+j0(4rl1LPZ;j2zwXt?_l2tv`@)9Xv6`Z@S{D)Z*l22= z<-}0uu61j3D}I_T>f6;7BcNZC9ud#@vp>I8Yjjyu_;}doxXUo?gk{o{~o&Y1Uar`b|7}AA2l&-;(eK zZ1mhldF@zW&V$>%r{zggf3JS=xFM(6zW0mik%${o+WW4QJDXcijoW9?=W0$HbH^xpj^P&;Cqjj|hh* zpgJ)2sM7nTO-vQ*t>UcPIq^={(5(s>Eui>@p{wI z)|c)czuzmoIUcq!x&P+P+~ma`t5!jFVdq9O*yEPTs!c=RoS=t(R$3WwDq5rY%a^5* wn#lIyylb>q%F01XW9_Pxs6QUCw| literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2a6a8a04b908a7bb8d741cc9f5a6ff3d12514314 GIT binary patch literal 1548 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 J4eFGw{{RXJa|-|f literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6b16e65bbe67cc9d78e32410e2dc46cac73dbd36 GIT binary patch literal 1848 zcmbVNX;2eq7>?C3h$vtI1*%;G3W7;?b0-ijNj4DWGN1+>i<@MD2+77|BMTlVrnE(= zGF*n@0gh9^1JF^SASjMn1B^zwfcU&tgSV6N=!NDHg+0#ycQ73BxgS5@rOX(y@vI{ws9` zEtYCtU@y`8h-Iirw*l44O_&}S%dtrJ2@M({$Y!b42%VPz3Frb1hecPj*lIclQG*t8FL?f=OglN7|XH_3mRX8aY|iT3Ts5g-pAhX^&0lVc)B#I`rSft8-zM6K`r11zh*d$$W5$lu0T{k#mW4VYP=oGS~d$Q38ukOx## zmu1LyqtS~zBsN!(HR<5P?Y8w7gZ7#;Opkeoc69xI`qf=?)5gZZeU}DH24gyJ-=01F z`!av4x3{+yhGDBMJPWKpy)*i`V9H+4>x#a(+!)>Ul@~Kyy|T^~S1u{n6$4GTMYz{U z`QgKw`jV8tu3mLRI9~HojP*V94UlrK;vvt_T`#T-B37bUh^=T^M{hl?ql?R%)jXO{&S3(X8(7 z?rI&19wKaEzFO*NoRv!3`lrwFYKMuZ&O2Ytex7WxoHR~`RPpge;{KPwoLwCUeP(oU zFI}T{_{J~3UmkF!Ei_&+(0@ltydIc@yu0vrq4Q6!_Xe_pBX6db-pY?l>{9Ni3=p@^ zUl7yQMz3>uy`<#cjG|*Fq&*?KZVe0E>NgqKNef3K;%;zbUW9?0=k4h|iB2f8t)ur& zPdDitU z->s{@KT&3Wx$N=qOMYu!*2C5u?EGNulAsqoZQfHN?~Vi}EPdt1e$vu$+M07|`mpe6 zdVbHBt>s@cL#GmDy1bI74<4xZjh;=WuURi&YGuT%%x!k4TVa&I{PV%35EId44HQuh3v+UZwbx5NG~Q^1k3 JW0JL*{{Ykz*en15 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..24a1c552bd9aef4d9a42e36e71a6f3252acf8c13 GIT binary patch literal 2193 zcmbVOc~lek77hqS78eAm8pRM1l_kj}BqV_VS&;~cVbcmimH|>oCMLmzRluWy3OC?sm?kdV9Go zF<4`OKp>X5Z)NddiJE;EYs25ERlk?OVzrXJQ|SYRDphKf4~v51Ba zAbR3FWlS(!yfsD+`owto3S%OK6cO6R8Rev=!UiOul8;hLBBctdnueaUONH07$5=FK zPDL3(Lw_c<)6*NpgybNKh#}bt0RTWbP%r?IOu!RuQFt6c#NsGe0B45-r~rcEmiW>c2dQL z1q&=tA(V?{N--ow&06FOpeQ8`4Kw{5f<)%&`NgnQF`pV-)I?#<$($)N-l)!5xQXk4Cn6e9nC7jY^dAiVz?;$NERfFl7LdBJBx;f zZ!jXUh{^z%45B@WMJF@ZYytp>k9T0OIV1*w!DKNB#048)!!ijR4vXzT<`CE%0ALg8 z1P+VAVUpPZEXhP*0qZVRDEU$$xZqa|`<=%+{4JKsl!JUFB=?1&$b}B@4u_PGA{>&T zn9R9~qc#VKr6NeB*fLw9&k?ggxp*Ha;>aNhYA(lA@mDwqDL4XNAmH1PLIJWJS!j>9 z6W|E~JA1wW=RhI~NfdhmdLA$Oe{zR~31MfOh<-o(EF!;Jw=d*gt#uYIIH7ty)p!oW5VS;?g_+w{3D*^Ef}^i>Bf(xm0OaI9K6i! zdX8G`^!?>g9M>R1wJRj+x1i*frqZe^lU0W-WFir36+oouYqA4w)_ljdN-DDS+KTmz zF_x643RZ6l;B0CddHHgAQaA+Z<#!GzWqRF?vi(Pfaq7Xyi3iO9nVU&3DyIB~PHRZl zMIwa+KXFj>$p`fgu6C_Pf`zGjg&m+ofi2Nsabptyg<(-_zOYpf3Bt~pXU zkYOYJX$!g3IA}EdcP?Av+2vSuE_bqeyhT%Q7sO;SRjSuo&eNLlrVpjdkQ-d4tnWNs zq{GVge3|?qSlcK4pPqf;bbY#B+ssTt+^biw;+Ed)>|9iK;lk9khfP(TR^X~0>3y5~ zw4pGY6?eNZ$4|)2tF7$D*6qM&p+wYeIrm?>oGZ16-zU*8 z^~D5u4@wv{&aOpg3^xRFklvFcEml^=CFNV+*mXbLRdOa-m-~&YFknZofNXeUxO(#; zFXRDz<1V?%+14mfX?lJ&Ic=|jW$u`c3Xx|u;^3yY{B|@_7EsRgE#RFz<;dt;hcwIR z3O3>;nopf9|1_m<(3i1YmUvTrjMtrtaZ#F~4ZltCNqDxw);4b1^vQ6m^U9< z_+HJLhXxxX2HuBNL{eIfA?C1YlzCyYjb*X-1G$2c(iRn-3z1h;jY0OapLDpF_jp%Bt_Em=P_+>6P&3$9;TFgTQ1QFAO-ddo%I2obp+h@~d*TW5a~+}U2NN=8WX EU+>d}zyJUM literal 0 HcmV?d00001 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 da5872802d2f2cee9325aafa7bc0296e5052aa58..78fe9ed21b95ea89e6508c82daddb6b8ecee1b67 GIT binary patch literal 1683 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 W;yuazCSA_}000017T8 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 b26f7930ff86a449a2544e25a2f11862e45cc011..4e7e7a2f1953987a37d15b5d248c5373ea350727 GIT binary patch literal 2989 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 literal 2887 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..633ffb727250fc2ccc63263188ebe27c7012fa46 GIT binary patch literal 1729 zcmbVNX;2eq7+ys=6sQ7;W8*X5!@sT1W7g~D+!2773@?| zYCRASutn{7V{MD5MZBt(Qc5kY7d41CDky>xi_;B)?GMKv-I?9*`*z>wd7t;1{VXv) z+GEtjQ2+pV$YUhQ^a?s|*WvW@?+K5q=*5qcrc$%W49bF=2p~#JstHi8$1{m!0@vm( zxM3ycl-$cyHk5_8)7iv%~BO)9Ovtl%Xo}h5hs?RZ)F{_XCp)$7_fI4wz62 zg^V|%QWc4ym^2X}kHu$dU>F8NQ5MV-a1h=M5MjeSh>b!po5_YTn2jN9aPVT#-b~sI zELkEO^hKY9j4X;WVi07pSXdSgi!^0IFp8oO8-WmnNn0?@c?Jr%G7aV_LktqatTE|~ zl#Voj4n|x}E~bPGTIrh*^hSl^EwRBom?%1BkQFyVFpCZ8^^Uj(tj$z1@vn?`TAP)5 zMgmGE%;aK|hOS4(lp!#kyZ1YC7}9F61e1;~3Z5e&HH-Cxfs#vv4EhU8tJ7j4SS;dk z`I0DsNGj#PbofZ9NGjutI3lq`%;61jybFtnqS#Ra1eI~5G8mTf&`=Ru$`^=GlrN@P z1VdQ4!A#)>4Kd_bNBbSb3f_yw#3ll#NRyHzbA~z~F^i-~a~5d?#o~dAgVW~d3|i7+ z4tA92O~ewyq{}6=G83r>2Xc(*-l0K*vN?!ajWhWfuz)Gha1o{&;i#EhT+I&U^E7;v z%V7-Swf`q~5G@FDG|7LOX6O~&iH_~t5ugumhlnuHlVhSsWaQQB4FE9wfm{-$v|c+o zJC^iH^2yjz{%pEp^%4IdE-nr(9XWfgTgYbn=n|M!64D;;?d`pGbYSaoQ%YdS{NqGR zigd$1*AGATR?B~qZH%^_wbgc)pH-aT{BnaEST@t8Z%1drJ=I1P>z+~IBMq8VdZ8#b zHn!;UgN?=tOnU$M{h~hQxwvo9&S>wkhYNIG6ITT>cEpQPQvA*@i7k_@NjuY4ZQI@P z^AGb5uFk3J8PRb`(#2~UTiTz)Z?`u#D#91ls)~B@TQ|GQs>U8I%aD9wXc%Z4i{b`r~?>lGj zcZ)91%i43;#zOt8SHAd?mpx|9dHbY>K6hb;VlmQiw`ZXbqv`Pq*C zk@>5k=E0rcYSXtqywa*~e*OH~#G}B9;0c!kocj8gt;^w`S78Ese8R1#=R{v^B3f(W z`un?2Rp(;9>TKi1gVB{KDcAG1@9FPZQt6r=ewA@D*HYQl(mVIeeoMGl-CyAe*7nx{ zZQU-uu7_`of8~4kW#gxvZk7sz->PSi8nx?(xkWA)i$izY%g(reJv!tAkH(-8oC|UM zZFk(-d-C0y{f>>>X;*Ho+7ff$spfiPLbJ!p(}mSHJH2zU$um{EBvnbhk<&MMjZB~0 z7G_-MSs!pC34PSYqL8q;GsgQ`wktxfm2bDD<<~UjEnxK(gnMopS2pweKRXr`)T%xz zQPsuR+aJ65liZ#TvMx4uw-+83kQo6s6ofYgHfWJY)4*eAm;9Kvvgu$Gu&l7|BIq;f zh&P|lx8B`#S=Sr4zvWi>yuHezC+l6?nwy)C#DCKuy$Bqtr&ROj69jRp;RU--{A4-h z^e}r)VBzEp*N2|>Y$JH}%*pP~=r)Wp|)M>|k srZ;SGDR}DBQ=eA0Y)xv#>A+#mKy`8Pcfos`>K#87xinsKNVH(ZKkvDl=l}o! literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..efe053ac172bf351bbe24530390d87009b488ca8 GIT binary patch literal 2727 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1ed032c250b92aaad43d8903fcb756ea59a4663e GIT binary patch literal 1914 zcmbVNeOME99G_r1krz#~L73-I0d>3G#>RHCkiEqc(9u+|e7W5Yn6TZt-PnLqgQs+X zk|q!+iUKOAP#E|^F?|Tl)F@LDOnVs?Fy2i=LhXiN{o&Ie-Sgc2e&65k^ZCAipR=uq zdDY9q&x1yzc_|}hvD6B+zAdW;%PPew&rX80>Wm=&fJ=rIxjtojs#3AT!vqk3U#?>YvVz$k=F z7BinX6&Jk%km3Xe@Yw(ASFcV7X zjHC`X04|M)1~-#pCgtgq5cJ0A=%Pn7txgL|AgP2O zB9KK0C2~0rqQd8fO5_TGgeQ^8q&)t(j%RTN0-;bOkth^AxdMXZd`c2ZgrO8!79x@H zCF5MB!9*ek6dSjzqwJ1x<^Rcrr38kMIHAVzl<^K&k%W`DDG4_MQt4>LfuPkogBG`# zf?Xwg60r;;bg7tDLEw5|G{>;+89tyQ4v(wRAS^)wBxDKE5H3r@)Tn z(gmHpmCg#dxQ54ZWI0--X0!R;aZ|6@jCU3n&n{Q5T-jBlJD&Gl-OVYpzu)|5=`qzu zd+z_zGN(GqR}xFDZvF&3_hZ`d zn!Od7Tj#FNc)OOZ$#DP&D$PC17FRd++>V~#xxO4O_8!j4%DU)DgXta4g+aLyUJVDT z2AWPq(ox{Wlr2~$esDoQxhw2!@pfD9Z;&x<2 z#^<;8Qc**KjHQgzpy(2$$PE&o+P*bFuX14#-%&--C%nh$wS6y&n1Qrg_ zo$o_*`P&RzY?l9LBSF&{s#Ol_)tZbyyDc-?A6*JPGx)9W;A`C(85tcvw6vUmyqtdK zmLZ|eZqMC>qFDnU?S8I|)3-l-%bl`i-M?wlr-|JkH`4E)9Vok_IK=n&4-1?6ur^Ox zR$pHqAGkNsv+m@{3+fQR?U~o>lEUWvaCGEadMbA~zm)B3#hreBUj-f!Z4F*>rMda{ z!qj;?a&viyFS~n=6#A@NkM)1Qrtxem!+S$WrES9U;GKgLKb&wkDr4UbQNX9acs_pY z$#5@`dUja4CRZ{par7^|<>i~0Fztv*aO3F052n16@0a;k6?dtA*VoP)etk1u6xY|* z=Bb?dMHh1dw@lCUZt6lr9tFy_PmBT6%iBU;8v0H>+wW5DzOX~t{lr~`&&8_ZJCn1{ zeH_zPmJ+k<@XzrmKPlD4f|X9`G*)4xZCx7ZT^-e(9veIj| z=!I2o@0RQ;DDhpuEt%x)<8xQtuKnX`ZStwLo2>)=^(UP-H$Qss=DmW_0NKhl4VrnI ehI@vO(%fnLF9#)_K>Xiu{SB4!7+IBML+0P(Xa*br literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..600d535f4a4428f4daf5f0f653d5a270f5c34664 GIT binary patch literal 1732 zcmbVNX;2eq7+wx3QV^wh(GG5tDGD{&Y(h>FX->=th!7zvqD!(sgk)oOkq{8j0&+}+ zf)>!R3RK5Yp%p7bM-UMi4-iDfQp74+i&zlaayW|E4T9|t#~(x+pOZ_5D#>LjAy*S&SPYSbm{35h#iCJAsYhbbP!!Q7 zZ@-EP0l?0nQ>h7cP@q7A>FJ2ohHlmyNi+Zm{mn*16OR&LG#aZjh$zG78Y!SoE22cO zgBU?ZDH^9+Z84!?mSB~}60hNFDgLWKp;z-bdA zUPO5#N*xpeN-+}(vgsU}28Lmf%csL^9*fCd2{IWl8)EPwm_cK}0+=CSGQgROLV7c4 zV+5fx#f&fVB%;I-gi!!NNl8icBo-Yr#X>Nj&xaUHh{>dp7BoEBKpNHms6h$y7eHzDYaK|ybc4fsr=$do~5#0bH32BgWV>iQ_5wGA<0u*j0NX*OOsq2Z z)Q2nM!`8W{HSa7dR>-$^ZqEC!DvGi>fmx=zS@Bpo#NI*~7glV+ov-x{Z~cH>O-R z|2&u0N*N>sJB6h&XS|nwYLA@kD&m-(rFgQV&@I=#yrcgS=8-*m`j4#U?%D=j;Lwgu zf8_wwlGbE5oAU_=j>#^SD}cra-W4_#!56lj^%=4>(Df743}~BY{Mn6%V~)&sW|S7# zq&I;dn3wMxNVC7ft2yPfas9jm_PjRLSoW1`kD2B7hli`ij=SFOZMxM&Z^_s);^FA< zcc0%w;8B|W(a>Dam)ZUwh8?v0ARa%9Q?sk@n@9H#4*Yp9vt+n>L3>nh>-eNoU)9|1 zlbNi=H}_u0f2V)tk-aK8<&aNNaKU(}d%n6aXN%*!xXX8r+%oifb*e8Y!MoDEw9J8S zaap(8UikgJ+Lqz(dIsegX@2Q=i*L)twzQg#z;sHg&`)80aV_9t?1Zb^w+ALKj5joA zK8h%DT-;yg4>ye$`|WY;h)NHrV{l{czG&{h9%Zj`d(oB9>fQd@{n(uvOD)Yez-h8J z&`Vli7Pjwlby={;Y0gC>uU_X`>A!$GYIk&3M2B7d<-~;pSG7f+yT16s0@pR3cvb#P z@}O%9_;URdhl!WKFTG_b?X~&3K>3MApSme^4KG!@b{Q7&6Y(*$fp#vqrsBMCr<7+J z1^Ol;S`(JV${$CqOmVZ>f#Zih_jJlCO?iFr?(#*{-l^iT!lc^^)vu^$oEs3Y@nsqs zbbl-Ks>pAD1Un<|LB55R;pQ+bxuIk%*%#mS(VWzYy$>z+&%Nq1zNze7(Jwk&!kHWj zUp)YfEE)0W=RbYgm7CpusmftPwaTZ+dr|&P>PV@pqQMVYbs|SC5_FELd_GIGZFIm| tyDJOP=UI`>TPE`@$5W~TxaS&eoq?(6ks)orO$A&3D@u8=tXi^l_djuvqWAy+ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..81dfcd81cbe2c59a595c0f8dcada05bfcb3cf913 GIT binary patch literal 1981 zcmbVNYg7|w8V;f&l)CMT^#aH^RQq$QI?QyLO6a`ToUGl3YA37NqJ+=|vy zw|HH3cTrfSltmN~DzNKzi@>@?iBhc~-IY=m6i|;q1;hqXcY@&V4^MyWcg}pbd7k(F zo-bDyyW-7&`2h?D<4yHSMI5~X-fzYfdLEnGS4=PSC}kqGnlMpL)PXaiF(L&A)K)YV zkHb+cE5nUPF&Mr!vp$hZ)O;j15>^)K#jspfJI!V=qTYAeQKJQ?fD}B{Y?FcmU)O_x z8Iytud<|P;NANWB%4`R|Iy+Wx%(fUs82G*nh;oT(0alzs0hcx1Mv7fha9pmK-g~bh z5EzG07Ag4Bs6>qpKnMp8@L2+;5r$zPQpAG!LN15D9N@5FKExJ5Fq_GS#V}jUVFMEb zq_sIPlQ>SHn$Sg`q+l9F*~Jj#bUIm1E{kxaLa<0Ag4i60!(q}0CYfcUP#4oiE}E2} zz)7RSY^ThG4e&}tQ;1AT3euLobir!ZXkH1nkrRQULk77}I|Q@Xkk#t-YaC5darl4D zcrBXLXW4Nm4kw9Bhmp>QY0)H^j@>US@&ajV#9D`$P70c?AdHz-+(xMtQjq?`!pxXh z4kL0tPoRhv%9TnkOuNsClq*#NIaiJ-5H5dG#_PC|Dmvf_wn`;ZM8dF=FN6`1k}FUl zJPsn~iIkIEwT+}un-QPXYo_&1aFxHv6(bHDr3iA7o)9(( zIb2kTqFiu-kNrQfgJ^>wZ;|{@(M(>^mFV5RY61H2s)=wL-8l}rMVdWB$LY@NRx6_Q zuJ+pa7z?JHdoGjsvA-_s)bFMi-@umSYD`6(;KnrqkI$}ODOA@3eYq^tlIX=iK>nWj zVKcsPgC`d5yZu7<7EiWWz;!o++x`6y_fw@|nbM6%>)P_(t$w>j=@`A!QCU`(y5{7` zlkZ&}Dr+mt3oHp@2O@@$iz{55za)PPCtD2XHaIz1GjB<{i#%KoXG$~1sVW_i1Q*07 zUYJXMq1~(c=cD0mMv|;%F0l6kGeTPS*Z9@!{$oopIHXvfcR5xT6-5o+-}1rQmW*=! zvK5lOWQdZ*5ElcEB>9M!T-AIsmp)%GlXF&UF#wg()DO+LcAs8#EXA4{k5P* z?bKeGuDiP-!V;P&a%}Ir4?<*EHef+QYoZMG=RBR+Z{7QYCwyVO?1|*3A3hywc!PK` zz1HJd-H>3)neC}g-PStrJaFCGpy%E54%9!rYrft6B*&+sLrCly9lV%)+4s*=b7s$K zzdKg=js5`|BWSNK0ZwURW4lT#E43j5ebf5;`g|l3iS{8n68_Be?8}y>(gEL!;znxh z>4;(FcaCMThcRF1^r4@b`6C}`A6-JrFAVPQT+7;}JJYtQhH*nyYo&}e%R6wQIg|AdfH1Opx^9R zOj^$Ck39?6^;IFu?H=tqI6U;E(qC5puxT9yEPUz_h8ooka_e7-m&vZ9$T&>cjG#10CDP?)}8B z?YP#YXHn5y#~&T%Vm?cZU2f8yrn3h=29GvsuPk`CsCUr~@knUlqgBx- zKzGuf(+}VHMpZcbpdmj&oqK52lWXaNZbUWsr_0^zQa3xDzVvHxv>7>FTzsb~CO2wD zkg{La%lxq-cyFao-6j_j8WJKj<>cH-QXCt_T8QumL#pCR>))^GWrfc0#eL%E$vtZK q(pJ`m{E@+kp#w6@55rYYwcC6c^P+m?^+iSF52{)jtEiA0KKT#EG%2Y7 literal 0 HcmV?d00001 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 3c4dbe028d995ffc054270095c675247d4e701f2..b65ca5ecbab7401ed7df41fcb88bd64954d8a7e6 GIT binary patch literal 1691 zcmbVNYfuwc7!9bEX7Guq2-S6=HdK<$hCE105Ry$GjsXNT2o=m@6CxxVHmigb3rZbL z1+7v+K&u5iAWn-?XLJgR(V&7aEaDp+v|t@UumJ}LwA~=s{&4)!o!Pzj?tbTd=X=fC zVxuFcQ5R4t6v{MN6cR_Sfa~^fC!eG9`zp!Bhma%^@tBs#QsO8jLW8MLKxRLn)L=MtwpektkmwP-6y$(q+T27)&IZLJ3`FF)7vQC;_NYo!%$}`|BG)K(7&k z3XYs9H;K_SeUuePj)xDJB(d_KfvK`a)Xw4j@_jfB!dH=6w?7!cH~ z#`Pvbj~M|Mqf&)!AcP>P^lbp1_Np&WQY(Xzc4gzRcXe_`&F@kf$RGcwQTdt>oVVr?heKEMb$L}y-mEeZgPCIBRcuW zp6;w!QFpf1-Hmj7-53+JcX`nBfde{5iT|zjoP5?9_teIYXCviLpSVT4_bwX_+vx2m ztED9f>dr+TJeh9?l9yJ;IK2dlis`9}JM#W{ z2h(<2oG${FW}i+;=jGMT>-8KM8ET(N-RkM%o>^>vW?vUxAgy%VNIN`~JDhpWOJ0oj z_+Oj!W(n*!y|k`L^+MsxKie2y)z)11>FcVGcDil$ItEX{{4d@9{478VUva$raZ1mS z)mGH}$0F{6hLoRI_ZIEzlTs~zz2>#JsZM{%SkpNxm6o?)c!%e!oUqlB*1{IM=luK! z`~O6|O!XJaklydSX?bA{-EEg2`nKlpoq^J*t;CeZ$@3{^S;-+?e#d-WzYCcp8u>-E GZp%O5(w2V! delta 2120 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 delta 1990 zcmV;%2RZnI57ZBkB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHD!e|WdHyNMM*?K zR7gv;R!MIo#})3MFf*1!vAIa1W+<__bd%lOB~g?_X+{*aP=BPzAw>@NofJt?>qs^= z)<`1{U<2bNfdKo zV)sPAW;0=!0yC%>1x_%q2SdOAUHX?=Oh7whQa|RDpnpY37`0jr7h@PFMGH`(;qJhm zo>kJ(dp1Da+nWYd2F&6CrEmlsVc3=N$y0a_w}zQw|UU9DEK3b}918;ge` z(XIXDUZIq!)^gQ)zSSz8o;J?T>(xfF*(wz)=}a~X_E#UD0Vn6}S>uzf&|0^9yc1jp z3C;=u&>}GyXu?@=rBbC71kT|UHv+56tDf!Pvw!+Qp>tT=Pln6Y^zm5@=SZg`o#RTY zQ?AysuW!!Zy}SA3?JK}2=%ya$YwK91PoyS zEr0w)Vt{Bs07sdeQafEzG#1>8?v#rA!vbK>6%(~ama^CC>67z%_v++}-@Mt_T!BD1 zzO}UCZZr##cvvo%Aq=2}|H%nxkdZvokEcA|xy{YB?HxZh(x|85qDH$=ET#&jbSe`8 zb-Pn;w)53m>g2p}{rVjKfrjK3BJs_OkAIF1kLr=TlTz_sK(06FmXaBxTt>u zR?g|Q^B((7(7ziF>?d}EdmDwyi+|1Sm3p&u+3j3ipLM&P+qWNm^Ub@jzy9>o&#rGj zxp;kd;aPHu4t{gj@0zz=e|*yJl;mvx1SE^70EvNuluwn4)oL|*)2w&NwI1-g=B>P0 zZ?l{6eQ0%0Ogtyq%vPJAotZWXdO&p-ej1ZQGWg?%B^Ya3ptOT+?f8Ld&^0N!kX08}x-0d>hl z1k9X$-m)9r5G5X)01x&G0e{dE0l8d`Xg~mmB1hw9u*N-S^(?zYE1@7hv0JQmBE$1~ zc&4{a6AlVSh?y-$(Z&;4`CjQIbpik_GKhT1_+_F`3p%OH_|j<|M)m8LYf_NWq9Cd# z2zvFoU#JJ8y^76ZuXMYhC0PU)(SPzi4CVna=$pYl?xXkLrb~1JF@NwS|13b$)VHy` zx#thula+|0N9x3@y*XKy8!3B zU2=*b#FtD29z1wJ1r~gBQ;#PprnMR^r{#<~K{7e!Y#72am&XZ~75@@QpKh%J>pM@W z1^|uKzzWqfTY3D^aDRgTNmDHNj(JG&4`%dR<^yW~g&FyQ8T~sm2K#$vcY~~MSpCEo*IAwzfY`6KRG$U;Fbyj{Na#okO2niNDTlvhg%TvOVdC{Z2&evZjX{-YHG57b^Mhs zzf?d*Z{qY(sXtU`ae>lkG}G@N%t1cjwZUM}>1I)~@Zc^+=hG$B#x<_LW_nu3=~$Ni Y2{*OM6vd%u9smFU07*qoM6N<$f}xAC?*IS* 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 0000000000000000000000000000000000000000..a96baa566e2ddbdff12056f99183787df6340dd2 GIT binary patch literal 1685 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 AkpKVy literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b22146e8f2a8603518698eb5de098b2aeb3febed GIT binary patch literal 1934 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5af24e0d4789ad23387fc863cff7106eb3913629 GIT binary patch literal 1668 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..41489c14356aa130b937babd42b4bfd2dd067787 GIT binary patch literal 2118 zcmbVNYg7|w8jj*}tDsP-q5{+41qx&`xspH^_r5cEn7hQ{GMIeHB&jYUu(3W-*zSoraqO?W^d zW8s6TendYFABj&QfY{5(OQQF zB7ewuueDB`q(Q(yM5m6|O0jy#9hbpa?*817!4Ol!+^tn$MS=GV)Y5n*qC&j|EIjsw zAXCVgJc!SuQfLCMJ5MMiLsP};DxeOthAs~^KvEC{j3ag~ZvR?(}cL^)_Q!JCOMPO8|6|2?zmpdRJMvbannv!O(9BNiZ9MFJudY1K+#F~>~Bdo)O42&OS)bT<-_CUc|GDRMWM zPNloi8B~}~Clh5vDH*?nm;FDv12I9Mp-KLyX_jAMooLv;8v*R_Zio;SHaS{sM4WQA zMc{C&RNexvSpWFeUk78ug*Io4J!Z#tvIk{})IG1FDh?NX;guy$`RA9d+f%KqCM#?l z{=TN(Y_IuO=af}5MiocdHh-yqz2NX>Fb{r)gDb>pxjNh-So+^qI=YCG5eD7t?hY(gAva+0(MQ}SRWqr1DinOBj%vBs0l&IROh zIWVGSJi%3!KiGXfaFUknz@2LT2ddMihCcTg&POG+A%}5AalvhEZNy9)BZg&~+}$MH ztl`nTX+lE6g#K06HOtmmhbI}owcTG+`O&vCli(NNSr4;Y(__1vzo`yr1S6U(Qlj&R z95R9lzKmkD5G)VeMM#|^TTb=#Tuk`fc)sQKLP4KRz{fk0Jp5;yj4~BPl#@qFFULQ7 zabowdg!7>LrsM3M{8Q$Stu${KZ+`s+=%iPBuACbka!5ZL$+Ad!-aDRg{VB&N<>1S( zlRqSH){n(E_U{Y7FgLQ!dtvmkw7KYMmCr%l9L0S0d2mig$%#XEFPTNeE%?Bf;`$47 z)}eP4Mhp%ouYF>ohGR4^FwlJaHajgMY_R(^yCqH+Jyh2|_c9>=Uv!^vkzS*hKP!v-A4mH)wg>op8O--Nw&{ zjC(w+?2L%yZdzsQrEOL2NXv=IKQnvvyln%0ZMN^tc=Soa=I?_JA2;vam*#Q@ot`;f z&>hXGnBZ`HPU(L(4xRqpG3oR<(}G*`BMv;{;;^buQ->WTkMGrAP^bT7@5KskNO`g=8cK_r^XPfu-{4@M^Fnm=NPeob%gjc~ zlz-ipd-snJuI?C76%z;%3toj4VzIbA>y+J(?mpZ0S3aGHep2>faZX@>?@iHHgJuu=10MOFDe*(k88^JN zd!%u29)0=oS&<24$m-1ZA}Dt|pw2Ts$tIl_;mg?dvzMk&9|7MvNQ!lG&26 z=ygMlTQf6al;l$MrGmt9NU-pDy}BS>5L2<)KF-~T2& iuOsq)|CH&1l>}GS;Cx=Pqus>tXZIHR3$F4chyDvd++IEa literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..90b8520fc98188ef105ec1b3dcee2470732773d9 GIT binary patch literal 1422 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 Jc!nRB@ege&#uWen literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4b7889031075c23b38549616dfc77639f6b61306 GIT binary patch literal 2027 zcmbVNYg7|w8jc8rQfOCD5j^5Fpr<0aOp*ynngF>0SqOTg3A281Mnv3LZKYt@N} z3Q@xu+pi%45^1Rp4U5Dh6`T1QOiNQ+Y-s6PJ%J{X1b*pywI&(Cfp{bl)d?wMm)a-* z3JWO_kbz=uZzAufvvc>_!a2+?|hKt9OeGa10b zMIpQy-~_%(8nEDtI0-39IIic@>1k zEHX$DqsD;haTL=57DjbEmWm50gwi)5X!Q!kTVkDYAyGui=;>-b9i%bnTCF9nd21uC zLjEh`oz}*%3_U_uAx13Kpdsp!;IRlMa`)$sEQW*{zS4jaMNy|nF-@u#(cyBbkV1T+ z!6?iZgAy^s=14_cu}sDSiSU^|Vp#x3%o0na5*D<`@h&Wz$r3?aPCx+2@c}^@#N~-u z1e^h~0w6{JPr8Ve>x{Tsr$H9|qJ-ZCtn5#*e2D>3xsz$Az+|Hx)`Aaim$w)(PH z-GvJkhn<#n>l)u5EennIgw7oim`A85rmFUvX#MvB{r=jhZ;gqnZs>wbJVkC${fhe= z%|{(2Cqx~I@$ptnMQFF+R{7}%b7o0F*2ABLiS?X+zQDXFj$+3rE>D*VP%nA>Z@rYwo|2wxP_wGJoUT*}UC`6JBQ@B$UStRgdEQdcL%` z6wE-)vXgxmOiqaHSDgnXeV;)?>!T&^YuA3=v#$7y$Npt`=-_A1kKOWWRQ2XN^yW&R z1qKEdk;&wu)>wL^^wy)U%^@Yc`plG+vps&2GqmR80hP;aD=RCDW@cuJYHDiQ_3*kK z%O&3J`t)7CIiE&G+L_UY=+fOEnQiR1=U(B4IO|18E>OU5cG>5?n*c-JzhMufsds&@ z|B9dwmMTv=oYE(@#(q)gn)(fy&AU3%e|+w6UPp%{d+_rY*rC%~zt&c?H8t7sKKW$E z+BYC1-H&y*;HsV;ASyPt>&ffcZ6#N;XUA7R z-8ueUMBT-Uws(_Ug1uYSw?XMehJeRYzkb+bHVck$e0J_L|JK*iFfr}Z$|c+Ft=IN= zh?~BrtoJ*(${)FX+po0bBGf~!4f9|5py?mh(*w$g>q)OySSi-*@d!kjp5d-JP9|^D z@o{crTdh~g_^ILQshDgDswYP)g3mBo z9jrWA1s{Y&Z5!JRf4+p3~o*i@cs2hMkIF_jvXS-It+XKni<|K-&^T4@R}DwfuhNvS8^saop}d0M8~jGynhq literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4e38bd3dda924306f6cce04ebb3a85ad5a4a050a GIT binary patch literal 1797 zcmbVNYfuws6iq8C1ZbxPM67kvwJ-uE*-c17RvwZE5N*P<5-1io$r1u28#fCHXhBhG zMNwxET164D=s4OSVo(tV0Ut#Lq*CRj)H1ddD8aEPR?uz~Y=1cZ=+5kZuY1n9_kQ=z zZjY3OIa3!=DHMvcBwQ3tjx^hA|1SBRTKMM?a_}I;av}yxCX5JVbbbJG=&lnY|( z5QyVQL8)Gdrf9;maWp1d7OTuoQ}R_na1brP1d{|>lt5@EZMx0?n*xECyf8VpZ8HJd zOA{h35P0R3TpCFeVmM0UFt~Ij1VJ<&p8;|F*(}a-8ViItOpwonKspG)5D2qC+ROux zYPc#HjuwT^XpyTxAcY|GFq3IC8W~151H;u!h|lLUK^Bw6qLUVMLza#}Omv-L=`4c? zH7Ie7p3q=AnvD@rU>QUpKzjNr1g%~weNC)0%p{6T8PkO5nGgeHYPGhwURoQ7X!Kt< z-e_%z&C;XHXw-mZ;7am7l9$ec$=tnN$Yw}-14rN*@=}m=5vI)0qB=q%3Ixa#hDxJ? z1&~m{@#Bg@`~_k$8zRGJ@dV;fu7E8NiiB*=EXSL$e*Dl-Ke1RC3W|6TB^ z7l6DFHpv3bVkJ5Qf#{UztgeRCoxuv;iiL$ZiVzqci(%=r6%d(%5ttzb)6;}P+Ojx} zPK6l_-nQF$6|4xwHJPX?6vwo*m+6HyZ;)4Vc|4_x&7&(=5SxymejK_&$pz^wKYvJp zf-GJ#=m*T;RsSb#Owu8ytv>!!FSA=@5!$A&tDjuF?jKY~HVsa8hc}_OC!3BX5rxE> zdh1KBr@2JAUNNxQS$T z_j$;8)p&lng;6L^akp&U8@=C43QzPuEiR3^nGc@dfyrcJ2l)g1fqm>$y&iO>dRN-< zxLmulwY7HIz6FU13HajqD;5<}Z>MrPGzFm$L-;g^4dS@yeiGUJfrusB#+5KAk!7-bf~ph_T_f^=cFqxd0F*q zlajCl)cSePhl|3_Y&AdJa!FP-=^Ive(}`dH;iyAd)3s{_iMy68>sd3@E40CtR+)h^~GOvx-MSalxRw-*!M`-m-)_jN37bC#umPqXVIuTul(@)!EGOZm%TC9@5DSOXT@e`N6&I!KrlG8HNH7s zwt4b?=SeG2vGV%y*aEAA(uMhS!br(k5XE*rK9Z@nYp1L|LOq?x__lDH)d^_s$O#x# zS0D0ewn$v04<2P5amkIix$Qa6Gv14VOY5gr2ToZNK>fT%yM+|z<;F43{;~wyk4Yky KiOhm^dH(?KYRe4( literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..21daebf3e230114b8f1b604f5e865f86eeb52691 GIT binary patch literal 1998 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 UD<{R-_3oc+lt>2E2@-ez7ZKPv=l}o! literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d6859dc7d965591d085d0a2100c1d7db09d507ce GIT binary patch literal 1585 zcmbVMdr;GM94`YaGIX9W9UN#DIL}v`r0IiXRBf9e-C4u}6P=2oNlSnxH4V0OPGD1% zV>%zx%_o~|zQG4mhL0)JQ*oXf=VPbby!l|m0qdLs8!B6h)a?(?KbE`X_xmN^&*%I3 zzEY8%Hf?A`Y=lfE8){A^tkMbu?(mnS=i}EptEDAIB(uc~-Y$A5fsq+#K9>Q^PRhYp z8Hz4m*u*5uWT70JnJs2prsFo=siXonO0Ux;p=GkcM_qT-pa-Lm<#^ zA{OYur=qeg>41qB7(k=cDr^XX06I*GXp&HsW)h%+5e)=m5CSV;1V><81p@;YD0vfT zJ8mUX27E~;J(wqoE*ye99*@$4DtW;HAsB{1unJPC6q1F)UCfD;SHZaxf(!)Xwh63D zWO)tKM z2C_14zDTf1^{^)d!BXyC>?mL;sljImtW*@Lkl<}aPKFcBgdUW>C~20)jflypQELf9 zl941)L<(P}GmP&$oHp~EzkPKUxYY(v2TJpF%i z2T6jUK$HBZX@ak$P7G|HjevA`Hbe|3O^zUqNDR1PmQ422Y%^iV^xinWp=sC+czF5j z5#5%L1k!c8G_y}Ps}hPJqhLBe0&=)RpWhc^nsn1&3%!}O=~U|9NuLA;zzFX`278`1?qi=)@4*T zr{2Bg8ZNxwc&gLi^XScp_30x&?()sM+|u4v7}b2)8`Zc<1@#Jr}=tJJk zOGs_28Ipcy?Uw72pG{l)O47n>CBuG~8`@*++QA2i56camr-zIdi>jN)Ee)9&I_luq zjStaY|C$no>dKL`NiTPA{|y8y6QiySX|BIIDF1dPVX8>r>o;FI_;Xdr&0S-_w5;z3 z1IC2CzOHXdpM3eMzAV0T#Ky3>C%fxRN5i9s!HI5c>aQJLtI(-GeUO2L)`q-;xDt@F zcMjq^j2)-cdu5^rP!k0CDY}861%s}V7v9x*7z7stSe}u>GTy$(+S>z-TkJ6sm znzy7U?DW^kg=NuQ7P)3wxHYNft%+M(RvkVZmane6K0U|M_Q12pBc~Uim|t?-vBKNi zzI@&F_M?4OKNPJ#kyGE&d2V8&!@s$4N{Cz*cVTlc8^0|)@Dn$aX+*7Y!F&GzRUA}_ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b7e81c79d0801e62f40ee4efe2e4b9f55a028039 GIT binary patch literal 1757 zcmbVNX;2eq7!Fk{rb@B(07SbD^{mP6CghZGB%6dNp%5aX^?PMT*K{sTHaf=?1~}hvSd#%RmvGW`Q(CfsE zWn2}cGE1>!eRw8;#bicmw3!C2P{#-f27+uNiol4GC}1+7?d|c zmnc#r@)2LuNz6zlNwWw9tyU|`%30LJ(quY&Mg!U|KRvBx+-tECHho2xid| zdNZlVO@NybO~BJgF@sY2Dg>ihrFuze*RZvPRAc|jc%!vN zlVQd{HD}Z5lG}P2Z3Q3R~QJ%r4TF?NZ2w+ z9w;2eDoqv=HEFR?zk15=2sZ4kSdo;#P!cCJIG!@v0a3{~iCdC!Ga!`?R~(qPOmEWR zR?B>MiC#sFV1zy$)5!_k2n^>~q<@13EefMNp^ndFLp&Xm%MVOsqI@o&$ro}_KA!{W zAT5V6g4g|@+<}xJ(A^~eX`0bjR42N(uSbA7ydEOVL`@DsjfnTfcc)R4H%^I!X>7O7 z6gQb-VDDVx-fahW)NDRb=2x;1(wcIwPM!A?!??Yx&$r>3 zSFwJ#ZoL|u^HtC37eo134gHy7ZT`tvEPBcU*+qfDaJt!X=c7AC%Uf3P?K|e;AvbgQ zIs8NMKM0Soo7me=-xQpA&+9w?76CEyxvM9=^h$Mec*Ia=D0`rLaC&1&6DRf5pR=9Y z%ko_MyVG5}mOtO}x#<5)ps5rm+e!GS-s}gftuARlTU0J@c5FfgP)cqA>DrV zX9-oF;nAy8=YAS_dCgh1f6lTeOLGOT6yDOvBd!P1#cA=yO&ujG8T^jWpHt$SDr)j= zAD2hJ?D#_K^?M_5Y~#i;+kpW3*80bnE~)GRRiUgT$MTwn-cyXf9)G>9ue`iGPG(lE ztUfH)*2;=1G$)menPirG&xYiBtKo9*Zy{rx=R65VM>y6)dc zI?Mu%xhH**9Y48Z@{}d?<*Rsp1v}f?+uOtQ)MZYELXm1+w=QH_&I(s+SC^s0GH36V zPOHzR=gniI+Y9Z7d=q9WgX=c+_FA&}w8MMCihrXORXEP?>#rZ{WqR7y)>aB+bMI|1 z6gFlh4z9maN1q*igqzE%T6Vnd^5nXOg%MG6Pwb7I9(@5UoVwUwxGUnGzrm@<=06(W z@GZU9V{+92XWzqd9-XISZ%^pH`1yft_D=p__f}Tkd5>K382unCt1VUTEs&N=>Ns12 zC!Pt;7ipaXGJt;mt$8^F^e`zfx#yVS=JEGyD_ftsta~d{LuwKiE1ljuTQaPJifj*BZs(pED|{;iQn)Kl%2Fk literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8d6741a586177d8068036265f2d408cb2911c092 GIT binary patch literal 1768 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4a1079806352212d85ab6ed61587a5aea674f970 GIT binary patch literal 1427 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFz024M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7p`n7grJkXw zg|U&Tj)IYap{c%srM{tou7RPIp@Ef=fdUjL0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LcpzHo!{ilG4o3^M(S!~%UoJp=vRT#&!Os*6j4QW4I;s=7F&vLIDI zD784hv?v)EA8E=k&A_n3ZxKi#&^1>6MVY`zNz8G{PcF?(%`5SAu~h=f=%r+)SUDLw zJDHl8xj0%lxw;w~0=;i!?&Rub=49;T?BZ-}3Nr(nUIPmg17k}A6E{~^CqqM5U@Vvz zyBZt2n7Fz)npwCR!t{FP6_+IDC8xsd%>>#D)oYAbua$FAYGO%#QAmD%4lD%(WaO9R z7iZ)bC^$QVV_ZQaJTosPzr0uz6h#mpyQCInmZhe+73JqDfWz1-6N?+nO^p&04bseX zO;Sx#bd$|ZOmr=cjZJh-O_Pi*lT6dn%u^GUp!!qD2|InDgY-d(1S!$Lgn%g##Dr%7 zAP1g_QuBa0rwEuu7!S(nFfcIg_H=O!skn7y+UdR~2LV^dW6uv|7}T}=|L;GeLt3a( z%SW|6WSzn7w5-CFBD{BQ$MQeA{Z`C1Q091B>~%@L!wEA~Iv-|jE&5Yq*C$c9=Kb%J zzdrH?Cj2(seEMrusjS9<`1RM@-hZz?Bp5Ha@0Gn=zpKcW+}H8vKHvFJVkIfZ$8Ilr zC1Lj2V-uDKG(TFkil=*#fzRbD^Lf`h+?4HiKYaalYQ*)e#n*E*PhX16j%(c0xcl); z*6;)Kl79caw;@yNQueHin;!p25r4h$ZQ1LO8^fBk9~_E19J2GV@by=&?B&m=u9+$l z$7t#NY*Ts7e5o}5lL93Nx~I-czH`;0u7cGdRPR=9!out=w`-p6e&JyF>ag|&t0%K( zDMmfdl1g8CPDp8w@gAmce(JNHHDnz+CTBT2^}|)ExK*>Wz8;D_&n(}!>%GY2y7?yz%?* zyVlzEq6Js9u6kXQJwEUJa{p&b(>Bff@w4We^q=P${|wIQz8dzopr0HsG1%K!iX literal 0 HcmV?d00001 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 f46a5d9c266bfa78d98d0fcceb74604df54557f4..0e05757b15d88021bf77a5bba1187614e2902f6d GIT binary patch literal 1751 zcmbVNX;2eq7!IHaTEzpo+TyaD9=S;%D*6iG1))}ARZ_<3^JK|%P z&z$Zvoj@SW6h-qT_zKu>7f1a0m)B4&zIbB-DVB&Tv20j}5I71{h5#ZpoQ6mcSdp{A zf@V)&t83e{munaah zE=nqn2Y9Fs0T?7EQBI{&fiM<{$_S^^7)t;eg~}jPSY#@NNTEVh3Phs-6Bmek(GC4ato0Lr_p}I6OmBnI_DKs*TM#L?M`Wy`g8;Kgd|0Dw+(aUuz zEv7;>fSnPRp$3c%;!4LuP;15F55yY%M56GNk&UpHOeImsYPCJCF>5_0LH?ETQEPot zjus(H5It(p$?Jq&31_gFG_H_C zXVRIISdm7L!5TR-=~spO9mj?WKZ%8SIt0d0T@s3BPIf?iI*OtCbW{uQcw-d@Le{7> z3N%~4&|aePi1~<4m4zsTI#dmejD!-EEEbh6 zlPf4nSO!ku75^u9WLyy0-X#BNn#osqC)&3kMgTv27$QW2PmT^B5f@F6AA#WbUc~1l z8GpaHdgaQ`6WkA4VjlUp{+fKVbyMnR$I7`gUU|9?9xvei3C@{Xu#D&DP`%~EZE@HT z#C_)GexcrZLtyfqfc>Fztdxb!Q#-ILYZox3l12a&odP?r3k?D^uh9GrO}&g|)d} znEC6-1(~U}9Zv%z*zCZVfVpjRCC8F%PoF$lWUcp3fx(S$e4XRB%|>iJ>)v>ZSEW={ zRo$JJrY`N;WeMnc@ZbyB{4l6+L37U;RmIUx>uZ+py|nWCLwyBGrP8G;Hu#WR2_W_K zXGKNbYTI%JxZd5@x7~0u4RH0&&&s;SA~;Kzmu+5b#Go$|-?dnMcNUomP06>u>&*P6 z_hre274#pmFow3dFKBLab_nGm)u+6skRN&k=Ysw${>vNA3=k{|> z{@A&DsdJY3(Za5#r3vl^ByeNL)Y81@!;-?z%smv3k_`=Bb7Z9I1_+L)hz(^^qc@k4G}L-OPK z>CTQ0P1UkGae9qqFK4*7%lw-ZsUd@5sh$@+OtYG59EZ!=rX;s_?<6=8+(xsam(dCh P_Fs)i5X-OQrf&HMX=SC~ delta 1351 zcmV-N1-Sax4cZEjB!2{FK}|sb0I`n?{9y$E000SaNLh0L01m+b01m+cxRGn^0000O zbVXQnQ*UN;cVTj60B~VxZgehgWpp4kE-)@NWrZ?j000EoNkl0b;&Lj5~o$@1u$5|p9z6{-bkk+)G4dZF>CMd2wuKs^Lq-^rZ%aXb1tPvkNIY7_X_WdZ?;% zu{3Wt6;~I)?VrDYtFIZ`UyO_TE~;^$?u&V^ z>uzWXiNovlvc+_>QfeTH>YKLh54vSd{De!u9UVarH##pk9XEzzplPHc?nKVs)xsWFZOqij&>nI zBNXq3R(}Z4P9}BOyXZkGd^~2WNCHo>u>ICJX+bSR`w5`RjZYwlb_zd|MlIww{L$r zIC``D^YNL$!K){rTv<_6Ct-k=K#3R-4I!Y3#P@jAK)@G{1&40+e>FPPKbSTW;Y>D> z%YU1J(2ba(r!t9jCLZYX$Kv6*8O`R+n}wX2iw_jC{R8R3P(EttM4K=`%cR8$WRTe_ zm&@7R<6#()xH~eG?>CdF7>v}>xDJdIPwW(L%c3OZHo17QnTLAGLmCD$bd93N0@0cKniAO>6=S1tgc6>UZv+CpKELYrbh#9sn{Dmw7YVRS(4KCQm8K0IHlVl!4bC>?rQg%j z?ckM)05=@jhKy9ArYQ|T&hZKY7r8+vZGa6}0Z+%?-k#di@gqHcrGQhu#6V^7cs$fR zpnN``|FqykKJYmbiG)HyZdM9!G3hUdNSkL|ZH(U^(nG4M{tL;${yFL@8KM9H002ov JPDHLkV1lrfa^3&{ 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 d10ad9a122508aa61133909bdcd96ed1b458b036..dbf628bc351852f32fb7143198e45ba6c356c542 GIT binary patch literal 1959 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 Tx$f}~zFRX!5r-U-Y4d&stos~E literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..cb2a186055177703c9b9c8db399c5cb631e148f0 GIT binary patch literal 1602 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 Ig-Kif0Z0bbDF6Tf literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..bd2b058ed58fb8a4c12d17455d09afa0b6289e94 GIT binary patch literal 1778 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 literal 0 HcmV?d00001 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 2f22aab935d73d0e368caed0a9644a8177f08863..fc4c1a5adbcb9d52e23c796ea8d2a806fb9e40a4 GIT binary patch literal 1743 zcmbVNX;2eq7>-~m(h+FA5VhSd#ey}-ZZ-+oK!BVY1mvnv6-ti9M3QVw780%wHdwAf zkr5rB2o|gdt%!(Y@eZ_Vi&T+{1u0cJ7PWvC9YO`#4TtRy#~>2@H5~+| zOo(J2I4vqJECLYX1`J@)*i;1!!+;-3gIOGe!CDP4AecpmP&y1zA(#t8Tm}TpTp;Pq zpiJUMi6k?=$P*7#5rm#gr<+VBnhBxdhAng$MNvA$pfea$(t>JC(-AT=RcG{?We{OT zg+Z++)VL0?Gs@(63c&+OrPCp3^gA5KGtsL?9Fi5!Nin%dlb*ON6kPkc2N}!myadfglO$=f`HE z489)|V$WiwIwK*|DX>|;YSQmC7LmLX%M}_h8G##Oa9lIn0TC*kz>O+g4+w=*6$gA` z)jB0^GWyy}G##-BGpJKBrNn@1fvFsG)i2S&KsYE%1|d|`kFB605R*;i$QdjuBu5zx zwvvq`$vEH)Uip7=M<)f*?M?EZrkQ<3cA|azVg$&;iy^{v^wcj9j>Xo21`MmGfEkcLBl0c}2R8pkF(5&zGHuXm*}A_WFEqdvN1$bNm{g zF~=RpqP$y+REnBqo1~q8y`7PC{;9cPamZD3F@DU{UWxXl?JN&n=`Ah6$|7zuty`Ny z21cLHJ7_~33R^-{D;{u#Db`1m`s%8QCzX$fhIZ;RGAi@|Z!cI?@I_T==;G2GT17=g z&cUdBJ=3#c(NS5Y=EmT_GXF%B;c6N6@V6d`@M+y2@ptC$iIB~0-GfdgqpYR6Z+PVS zB`0?CW|}oKaJ@&7q|Cc^L*1Xfy}j{)7<}3)3P^KxJS@m#j6<=L;^;-D*x1--t@)SJ zRuq2g+;!`gvwx-QyW__j8en5c=W^HF4egOt^52fTUGT3AA9A=3S6!Nz;Ke7Lw;fp3 zajj_byx_paz1IHR+}xa>HG9vkb|Ef$y_N5tknl{ms}>djYz*b6}QLN zvF^j+J@tK?eG8f!7nG&)TRJQjM{8pva?avee!I#Sw)Xcctea_TY_!Hh>L)#;!iEy8 zf0WsAGv=!E*~vR1kiW0Abdgn3!;f3N_#686YxuqB9g9_9|^8^d+%9-ZSY=! zd+8jf!)+52S?%5pM`5IUkiC9keOKLRcWg$^$3dA1YrPdiK0EHWi7d4@)z;9JEvE{5 z7bXMX++Vs6aZT@!EUgaQEtZ=^sZ~`~Ki>Y}VQrLeI~WNmH0&P13Fp4KSG?OCw>jk{ zOjhKsxduJAPo}0D8L6<)UZV7$>ML>G8VkITSBW@|=gJCZ_!tBNc~>jtLS! F{RdJvt@8i? delta 1754 zcmV<01||8=4eAY$B!2{FK}|sb0I`n?{9y$E000SaNLh0L01m(a01m(bYSxJf0000O zbVXQnQ*UN;cVTj60B~VxZgehgWpp4kE-)@NWrZ?j000JPNkl&j3@mXa5ipze?M5A1Bioux%?3kb;Rr#S7G0p-*p%C)$nDaFAm>0I6O9I$ zwpEI@v5lcX7k`K+o@ea_eLXe){9`k>#j3m!oq;i08=yf1`1~43VFK&LB0(-hBL3{+ zbhaxL)Bte%`>)&F7Hjitm99?JBmpg+o(ObwG-H|q9#o71JILDEso#E?`B4i8wCZMw zLR$-3q=X}pNDyL7W2a~VN|f8p+VX~4szD8E10=Sr4}YiuJU%u7T2urPK*p$FwMYz5 zn}SiurHo9blq=P0Mx|g>a+#dLAfr+;3Wb8SazaO;tD_7gM7lcA5&`T2!J_OO_LtQF z7kE==M~U^-<;_>CTkEevv9)}3k5)n!r+L- zA_NQ3%$-I+@$4p>)iL0in2rV}#-GJ!-|p@1o*kduTz>lYrNd_H^LkG|T_x9FC10;8 zRH{4y5N2|Kqxhfz;%jx-rWfLg)s;|mYGWt0eSf_7{`~Ol{w6X%=L&_NEzbMKMmF|R zOB<`mO`ZU{pv4I%IY2fF1rXc@U88ewAf8;BTS~0G+av;Khi7-!v&n?rA9$Wz_Kl6c zN$)N!ElU__o&ahIw1_|1L1B_1fa1}$=!e3g$(iWX+$N`OELW_6~Sw zR)3NwAFtjYAL0pWCHYB)0B8|^a#cJifD-EHG6%*+CS%d*h546nH`m{%c1{isug*Vy zy$eJl;2Br;Y{-92Y&@J=io<4MpzLdZ!j2rF&ke=qD-NYIzCK) zIR9{eYjyYgC&!O&E)OnFxA%9k-9iD-lB)tCdT<9=V=#Am0{&QhZhGOx{L5r)adBgB z_u}q$a3tK*?}^U6a1Rfk-d=4T?bkmfz$Tf^0j#`fl4OOv9*0z|Y%;X9Tddx2Fn=72 zy8M3o;D9GE-0MagaQl3Npl+#AbGe9s z-PYaL+v9do;EI*A?0H#47qqA#a+2}NM4x(O*(sm_AmO+&*(;iD$-T|C3K)c)B9{RG zEvX`eh`y8akX-}7pd+wzeKKHQ+SFguA_ZXJB>yWw%hcs_43Bw7BEgC2QGZ};DjXR1 zVKDqGFdiG3oEgIi?9pf_^wbZ}fk3}EGyuScTd&J%b#wt{Yp2m{03l8?5hyP&rvg1L zi%cP2OBmJUo|Sy!(aEKaW-q#nN;7z}!-1^^BBkdx}Qw(Idm!w&va zrdUwQ)_>9B80_onF?Cwn zZSEes$A-tDy9Qt&?ld?sa^r){p^LTfM+*Ubdx7?Qh}bfH`g|O&NF$W6fC4s6DP>0j zkdJPg8HwrWHX2NAx)$UL?=yx$F{>E0RzYY z0)FHMI%)&30rK@|)Kkf1(#)sh|Mc-o1^AgyarReNSBF+C7BdVZ|Nesy>H)(#olc`^ w5C|~97uSlZKV3p?e8y$g$mJTXMkEsb1It8UqfTCz2><{907*qoM6N<$f+ROAf&c&j 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 e9b8168cb57def0f6c29c49e502a7bb0c2d829a8..7a7238487c7e99e11238c3667ff31da19508ec6d GIT binary patch literal 1957 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 KMNUMnLSTXb{&~3o 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 0000000000000000000000000000000000000000..dad7361bfe1c3601dd4a62ffb1ab976ec40cda97 GIT binary patch literal 1771 zcmbVNX;2eq7*4fXiZ|i_rNYiy1q;a@At4(RA*X_dDr8J*MO~5w7RYW)780UPMFS{; zM;&EQTZ$;fR#6#`TE)sSwW5HwDAWtl)>4p4n?kWb?FPa2hvSd#% zQ5>sOkN9FwQZSie%wh<#*=#%;pGRAgAOyoO2u2|k<+2uBYbM3ub}nU|HOinQtOg5d zW=NU>+>Cevoz6%>R_XH)OlFPd1udt% znSf#mE1hmJu=PlsH40{P_i9IOLspIWJqyVe1y57bhIA7_F;Pk>$bR7&NuyYfDCB}L zp;9K2t5kf14Id4ctJFd{U#?Ip_<~W6mtj$*fRBmPGPO*BA&5#KQYc^%hK7a7Oaotp32>Ot#lnRKE*}mPazzQKfD0#JC@M4x`H8p) z9Kjp^PwpUA5ae!>|1{0$E4CBe+ZQ9i9$pL)L9vr#VMk<64|I~9yy;O&nbv;m{IW%< zaWd}<$0Ylbc9mU8h>P|hWx;CiaH?|iBHe|l&I+dVbn@JO&eD*)2hq9&U0%m_^U|Zh z>0eI<3lCOnqQ4zT?<#uw;H)mbz9IC&Cu zTzfOlHKZN)8I%M}!Aq9-dX80QZT7rn59^#K=!M@)6mvg%$#=fqCocr$# z4a^BDDt1lWk(z&9pAUO&frEaW>4-cp;@9q3GgzYsWqMv=rcdI>N%vh(`%9O7fux|k z9^Z+-$i69=t;}_W!E#kL0b7{e8+hIFxiKy6^XOc|G-;G&S=I`z8$h9aOV>T&utH43v0~ zd-G0}q?GJ@P}Nk&-BolV*4y(-^_YO#sZOub`I-6PjOrb_dTlFC`seUWfmg!4H>`SG zppsT<(?hDxuGkiF{Iy&9`97dzZSSmh*KVwazctW9r>k_jT5ft2uZUP^Pm#4Y9eg&} zU~^6>e6%=j{osLAr2pCV&a2| zwtEp7Hd}59n4Xcb$3?Xa1ja|*J6xX9}#2 zVeNm0%OfsN&#g;~Gv9U0ZbsMt<1uROu|B?^#jFsvQ9OiZHbSTZ)v)bIev54ZZBKR3B9*2`$&H5;kszw zJ9~wPWI-LXR~~EWWW3rJH2K~<=dm<0LiUu3v}G6AcdlAH?&9{W@((IQ?n{yKiI@C7 zMZ4)UIqTXl#vNUTf&C`}0*+j|=m_>)k=uN|nGrXLWh+E8w3~*?lzXQ6SPJaOR@d>i gQ<0ba2EA5u_LA0htp~HebN_y#R58j5`Ra}T05%Y{q5uE@ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4d15a0f89d78998f7a8d52670c2a12d809eba00c GIT binary patch literal 1963 zcmbVNYg7|w8cu6bp}GddQfdp+NJXm2WD*jRNC@PHcnE|LE(J9;cQ-Qjtz3qdBAv#t~YK0o5Tu zoCVHBGze@cF8B(Gq|ugGjoNfFT@^3VqZStI!LaNWjAGMhkrF!w>rDs==#X5aRm_-h zv@rmqLCi?wsn{w^hU6Kyl;B8mNrF~iV$ur@3`rCaX%|rjEC>k$c8l3ci0opW<*=#HumxbcFAS4tDK{f~EaF`T=NfcX2*v_;P z>lQ7@5kij}G17=y0gpvkhZd4z2Bq|22o_AGdTiKAJW3RmGSCiVAjD#W7Kb6_flhkV2TlRJIU4AutFNLgJ-Z>@dl9i?%-vKNQo;o?8lU;mu z#|vk*bDGr~PFAMQ`+3E<>}1cbSIiCkj*x@y&uy28E9mBXepzK34i?Wi`-$9fxBH5a z$ob~(U7Y^R*0A;>htqNdx^(?oM!TTS`!G=fKVKqIo1E_G2SdH^#e)3&YWAM5=*py# z*H*1qL2o#8h+ZUmsol&U`{mONX3J93QLw(-H?{dHH;MM#o7%zt-wHM@zo!meF>vfi zczDNw1K)-O`?+r_-{V!y_y1~aX_@z-n`(N_LhZxDaEo_AtoU6J&(Zi^UVB9qPro)+ z*yfXXzvYN}!;B<0Ha6(9$@02!`YJ|U#?#3o>)!YAzjpKH&9{^0*F>(b*OnDv-%Z?} zO1_iw@6C~YPrY=7(>j%umZl6hqOatGzNLw&B+9ifx9n^gaw@9H)SZYzVlz!;JvxTyl0>f|G?M1KX6>=a5!9L z!ztIBleQ;3h&pyTA={UC;MfP!5vj4>>&x1g!P*XibGOUC`t(OWM3G;J$O eo7_oTLi;hh@92*GBSz2fGft5p|C{v9^8Wz3j}?6Y literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..dd2c9645b5b019c68f45867cd3ce3e31c1e0d562 GIT binary patch literal 1770 zcmbVNX;2eq7!F!HNTJ9jU=^2u7m#E(At6~oNU{kca)lJB3bIKS2#{<{HV|kl<*>zr zQgMou3aE5Yu!zcdaj0Mgkx}f3BPdkx0>lbxK`f}G zfk7G}7Oz~Lrp3b3f~E4bL^)4E^<4#c8(>m^3L{X!ph{BfV1o~JN-j*UjmHcsFa;qJ zeW=q$MFxceLR^ahY&wS~had>>;?W^Cm&Igz089{KGe8~#0%;%wLm4E}Yv2&Al1vJkgy3?$3R4pSh!2(gLsuvjumBPY z*q$7O&lQM7EQoZU=_L?}IRchIhzMEi85!^6vV?rL*pnp^^MyPJ60rqdVm<;Qe2%Bk zlZA-6Gu!~RjzHCNY(}q=)ccl;e2@zZwHQj^S}Bev%~U{WJWk-ccw7Srg;N;^makK) z6?lqng)v3b9wV4mnT#pKT3iK8#TZt;#|9>g%VVP;i^lWf$Z0IllSAXmm~0v-<1v{W z1&0-jl0HoH75^u84ALNmu}J8kvkVpL1gDy2OxZ@ z;Z}V_V4_W!?N#q*h2Be#ZHsb9fNZJGQ8^JkDdC5H&U}JwT%Drsm`|IdcdoLUv!~XI zc6!wQw6(2ye6IWM?brP54+O0F18;BG-ewoTF1 zEu7Gs`jh@;R(%?->%zR2?4t5xiw{-0O=R3XRTk*Kv!m;i8hyQmuJ%~gC1tr3oUc(+1FK$E$Lj?Cn&N)I=-S?Uy^}3OqTr~ z4^}eiBZVG={O0{jknL&X`}`dB)Lp&b?Ts7p;s%cPh33@V+G5{e)^H)~(}A*Ou9o2W z;K!Rw8vFX3qv(6928!bD4LWtbsBRB4aq?#DYB-aYKQgv^R^Ql_@TM*GfrT5gUTxJ3 zi6d^w+AnN)URn98@84^>k9VcIi()%JGn>#y%_}NlDjY>_)L6gE(#|mDQ0-Dx)`P@v z`|R7B^Tx5m2@z>~3JL}!%O58cy_OAmcHQLo+MMl<2I|xLZTb#(J2trwr8X6J^O|nd zEjBIfSs7wT4eD&Yzmv_!-h@1a&TV@QyV#DT&li8OapV0bx#F_y8wo#xt|t`3v*SO0 zlv%K^V11Riu)Y6`@4ULe{*3(KgM-$lA93LcCDy*8Gp1>6Z3ib2D!X=jOn33+s`IzM zuQH8FPk$A?_PO2u(#1FuoVRKHcuVyHS^DPwMSb0({Ri&g=jMhSyA=0Rlt^71f4Qa9 zdq+oR;b6IPdvljf>g19eb{;3W@PNh24bMCRTf@y?`q}jql^d2xv&{vTkym1`7ZpjI zlXLHRG}g2#@<)1mztO~s34MiB`?St9Y#+9F_T$c06=Z&rzxsF>sTkilG#YMs-O7e(^WnJ^`X&vjzYF literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4bd3832940ac6d24de3a241f7c7edecebdd1eef9 GIT binary patch literal 1982 zcmbVNdr%X19uLG)AE5NkoMNesL9M5GY_cR|Lt@O6#uAxX7~5|?S4O> z@8|oPEslwb2w1#oF%E|dkbNwU!&ajAUg(QGJu4rd#FijbqD147RMe_6!#IH!QNu); zL6ru_!7At$$!7M12y+%}J zqZlnA^9*9xqA}}Cs17j_y^Ja~l8N$2n9|oF7))~c8)BnnE>T#@Xf~CJMyCQagTWiu zthEJ=gMX9pR%?r5uL-8b!4@RbtikG$8Zr;Ya`*d=yoQ(>PPAEv6-A{NBbrPDY(!;Z z9trzG)#|hyAzdV7hO)#0wooDg=~(!TFrh@s5`sdJSOhZXIo^f^AvOR(pj0XlL3Fx= zDS+r~F-QkP1t1*&n9_Ny%xFPXMh!ggSBLqX!%BV^%MqDj6^fV@2%?|wfS7ayMJ(xv zi6|1yR-CvYQD@X5R?DBgC3+pP7&hy&V6D`Q7>Khu=IGv{fdR51rV0QlP#8-?0fA5! zg{@{VDS#ScFj!g^n5trv=J4A8CwDYV5Y5{p|I;+{udq(^Zr_Xmc6c*Huo0UaGd3cQ z*cv`Ic`lh)ps?L-PWS`~mIPLfjPxD6-*$CDLPdFpPzfE}z%@T>FMZ*&aLsb@gJkL! z(w36__^p6%vF3_Tk@Cf+U~wQJ9t+smJUM|2R4aXx>nko4_aq^;y2X*D3m#VDrLjXD#aCDIqsm^k?5x-v6&;Ot zvi-6+A56GgTXB;E12~8ALP3%6@=b`#eX74$;W^w+I=AyIpWyejaCLWYul+Buo5$cS zOX}REwJF)mFYUI|Q~6=5uE;u~E4d>t+|@n}u1tMSFq_44L9tdBej5IlK59?PVBa;_ zKu=FaN_*{eS`78r^o^OBmWY#iB@tO83khk|Tk%&gxh zrTazgH``p{5lSCJ&w*cv_#cNVXFx}PfBXIS&l>tRJRkZu(@~uQeU8i7lTG-Ky9jJO z+Opl}o@b!ak;2DOcb=LCC$GK)cVDlh@wpk1w#RiTt%g*WKDwslgw1q1y*}`7+=L$B z@bd3N*2&|)i|B4-#WjuHv1$)F&u4j#*HrB8`m5DwT$;aW)3TZ$^75VBu}^v@@Do4h z5NuDJ)%*G67T=uVyNt>42cxY;(fJGRO^x|ZKCV+IZj878Q8CI7KRO-toEh&o`N}_% z9UeYfXGPKF7wz_d;I2-p~rvQ~7JHy3vJJq}KN zKQJUD8+NKL;QBQ|&5G4&Qy=+#=`M}#52MG2=mT?<#UKHI&gjJ%`l*NOTGaYy!& znufcB{m=Hx9qY;D9k=cO%)YdD$-T1i9ThX~@i<3R-Ya)l+X4I7A@WvB694k}R}q_Y z_5NoXz@G-Yj%;fixRr7gc>41bXX}j{@?8x{?|fTdf4O?Nc4KM48TZtO%hvq3cHfpq zkCweUu=O3ynpNFt%bN~hgEH7B{Mb>%XR^~sZeo0AoT+|=*#1B__b|^NM=fF!xt@x%*h6H?*q^H)LVrq5- zeR-GgoL7=N>b8G)?%D9A{#8>&-3pJoB?f?J) literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e474812a1a2ae9e1167b1347d43066b7dea87a97 GIT binary patch literal 1594 zcmbVMdr;GM9ItZcO&sE(b?ThvqVvJo=Fz6KIa;7et94SkQlV}#Nt+ZZG^uHz1p!5e zuhY4mQ*P7wU<&hm&+B~Pbn4_p$C&TUH`6;62CM@-Q5;K=y8Yq#$8wkae!t}V`Fua$ zS5{ig(_^B?L`x)+7}E^WDy~5Ieq*5c>>1ViwYZEH40a)%a|wQmXCx^!=U@Pnhst5B z3`G|$sAm!-k|@?~vkUgrS-6w)$f>Z6JmB$)Xo(~-Dd44?d5i!!m>f5&1>0*+fPkCU zf|*z43xlE)sYcfdT@aeAb5tv|t}EF7CsxArR;@ z5%RR)3sLq|3qWu@17LEM%!wcfkf4zxm|B5i(*P7kFbLK_2rPpU9D#8Z2Kp~h^v2UJ z+)5hzeTgS6m@5cg9D@9Qzud2ob9@ejXfzrKMj;fHi54_$YVb7PEf$5!Cpl+M^@y+TirgaV6jyb5a|NhOKsNn;9uA&3D}Be2Q{ql8g!L`g*o5y6^R zpFpurCgRsE`t8ROuf^g7&rkx#+c+*i(gBuSPT+jGoEIR7zKR1=GTkiA`F&HvC3+Dt z$?)z%hBoq?2k6T&?tX;^RH4>j6s(YG5>!r^0#>SIY6ptRV21`pRkTXsqSRnNp8h|% zgG514xJmxgG?7P$~gP;HoRx9d~#j^ zhBqc>4$+O-dVD3Rr*_(`zqS^>YrcBGK8reFx2eYty<=P6o){H>#=O`zEUUfns^(Hl z7d_zFfTjGA-TSZ1pZb&QU|iDJp;h>U(GR<-j?>TaA;FTB*;nSzrfMz~IqMdFcVmz3 zluY`5FpwzkZnp2bLQlS1UL}}qo7!S3^oyR|TrlWC#~ic8Mt+pN!}?hXqAq=U|NLO% z&0FT`C4ZdESFJl5J1FYH(#=@!<7cH8-mG)iePWd!VwLe{%YGT%;7Y%|r!l&#IO}L- zaDQ*-yys2IC{DMfGJW`m@=ETIwCK^}=8LgqoAz~fl<52+b9I{?{o?b@$%A_q;$Lk~ z>Wpu}@0+gvwYs)uYUyG7wC%CiT7tH2-^hy{6$8>M%HG2pC0ck$Q`)5Avvus0>Xuq< zR#NcMm_=OLwWfI)ZTCV?JbPWSs~frIrI&keoX9903`>d&oa;|NE#Dgco0|+~a<4vn F$v>kwX378n literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..78c6795d020021892cd63fa03f31f85e28c79da6 GIT binary patch literal 1784 zcmbVNX;2eq7!I{qH3%wNL2cbGc%UY`n~*>vfk`$AhXxTa!BWvpvOo;U#@&@fXsyP( zA{bj09GvQiwT@Z`)TXE)cyN>yZ1KVv#Zhr8p5thdqjrN}`@``^cV_qdzTNkEp7)&H zl$01da>RrYEEa2Ie4IR)Spn}o>;vZ68}w)&vjo$MG&+UIq^%f1blMp3O*h!72-iXB*=3NIWGkF;$mm)QR+9Of(Q>6Eg%RoW=l~DaTBSZ4$7bSIq3auOSfV zH=&IZ@QqVxsw4mmWj802^tRv{HB(MTmG9_0E77)QG`&(;ltrVPNbG6;J{iDk0;a% z`I%TGIDpsxpWH!=Ly)&g{?jyrub58sZr_dob9g&MxS5$8k{OZVxjT%^>&#v1=ERTqBGeiGeLTGBTAcx7eS+PH13`K6#Ojz z{6O!5Fz1CfWpU{KOQD`<-EB`kwjtsCGMCM2jo7}r{PdPFs`X`8TxYx4Wmjw3qPCZr zON9Ev#WnnjjMeq^v2|Z?>wh_Z{BHD*8>BLKfX`eTwPtA`S7ov+LXKNuZUfKL)XAX zi-I~kI}3IvPJ?%7>q6|%MKgwdc5Ua*owc*uYioV(G&XKxR}@XE@Xswz^UIHIiwqcg zacl{DqKNgCMxzOKI-S8YwDxZ2dzRFIyYUce~bo>a=pf9bbpEaV2(+fWAVYH@Dc3urAA6-dX##00$B`eMT3mgZ(z^OAM}D&PC-!{C~b=^Jf(c!h<9 zvfQlvb$xw(NmbX_FQG@+SFT+?+Y|ObU8=ot^Ja8UdhOBjLe_$A`{bLNOH@_H_jCN( zed+qN^mMjh_1v1PX6M8QA%{p|K>3*b@=Q`w%lX7%yb%|4&)+wC(W)sqm3Vk%&%}Jy z{0&=_Yn)RJOUHSfugT3IHM*rBPkigvvp+@Z#qQ(o`!AciJ{`X3!nMVucHa3TMcaf2 zazcF<1HP}=1w|3=hbJ80BpU-8C425aA5k>y)vAnPxkuE;LZiP9t1dtFcURwm@Qw!$ woUqWXnOCry-ILPN`||PiX-zX{z8(&|ssI20 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..84e064fb3d8384a1d4eb9ac453a3740ca1dc4f31 GIT binary patch literal 1798 zcmbVNX;2eq7>MZu$6p@Wgj}W)l6WE(*AiC5gi*p!T#W%TJ(7qiFa%9q zQ;h{vC@uz_GM_1z;Ro z&X5~L*eYE_nhA?di&ARRk~BON3=IK-ZG4hIj}Zu9(Ao+!k>QKHA775vb zLE#o;=b4(W`I*H?P8tfJih{alkK5XFzeQ z+22{Bw-JjmlP(2Ar6ybt4CR=wdyfVlriIlUlu6@g0$~~l4P?^PoFJ6O(_(>YM9aoF zY&AHHNB>XmAW{(IY?A*p&B!aV6P??4BS0SB4H0G_C&xsNNTJO~L{1)ECJs~D>M!iB zN%D&Eu3}{c%IrRD^$(!G{L6rh4InjUxn)j%WL$-Dc0$qkQ<4I}y?#l_#D=r}0d;P9 z>o==TZR{_zSADY4b+UY%Z0AXt?>cLRk)`!tNN?r%TAwbgeR#fo`=?n~Kbx>6&#$?^ zKPbNV*5!rsT%<>07}*gUvLjp@?%f*|TjYJ$Zg-itQ+B+#c)W5kwJuPuaGbVuOgTeX zt(&3>y-Jo8AHLu9k)~{K?_6*9uk?ET3*-;u<}1k5Lp80V?T?5^@NRwmjurOU+bWfc zQlboC4xHRnsfwMEo13dTyWDVeZd3AlSI40luh!1|*mbn3NV#JLi`iz)$VjO7X}Y{O zh{I{UZ@cqmZ1Bu1M_AK7d78d2^I-Y1wckFcx{o=#<2BMdqd)xe_=^t@9`5el-jk0^ zk*8<&Z2LL~nGip&@l@!><@7Bz9W5oLJVVIRO&J4z)TEr|dD!RW{OM6AxPQm)HQl;* z+~d#LuE;eMMaBJIt5q6}OK;jm1#L!WOebsG{&RW#+(r9ex1=Y>W#7DW$M^iDKJh@i zl3D97y^@g7RIvI=s8l1kab|jFliT&SMlWGa^+ciXjacFIt*;g}SKM%s_ef$3LDs%+dDetBj0X>f3zDQU)FyHcP$hE{*-qooG*ZlmNo;SI! zytdsdwN_goU;l(!-br~<6n-pqT6t+-E|Turu`+_In-}yaNY|8zlMY#~RG-z=l^%v)#NhXOB JmkL!I{{be&%{l-8 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b90a2b5d38bfb6f4994f9cc1db853c6c62bec142 GIT binary patch literal 2036 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 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 aedfacc76a15a51b609c654c9870b1a2e00cfa99..35ce245a8e3e661a2820aded75f3dc6c5207a386 GIT binary patch literal 2120 zcmbVNX;c&E8jescvS?KlrCP_ZRH0cW8<~_f8$=tV2ndxn49R2>lL^TP35d8+s8+Cg zFH{anwSXd6tru{iT*QNda9FOW7r86~Riu_pc7$>#2=@N)^v9iZX1?#6d7tNf-tEjc z0sg)=miCqe0>MV)#}C9;z;s)f;m_%{eLv#MI!q9X?Lg&NEUZHaJ~A{C0Yqw8fdnG3 z%ou$iaVHSWHL9RcEL8j%M~bS+u*rsOP-}5Cf#B|C(8AIv1Op-wg-YW=94IX(0xFpY zaVJwu6>E8jQsoz?Lw3aZ2T9|iq>zm0eC!C=6k-lNfT3?9TeUJkxDy`~U> zITI|(gZM^Ns5k)Np*jR$l364v2!encL9EtA5Jczi`HzBCCV)0vIjeb5+c*-aSSW5xPREk<{ifhhVj|C!s z%6O->KFFv=D1nF`-K&%0^^iL(fbrb@wIh=uu7mAF06n`%WRPWFrhY=yd5G$gHMhQACWxI%)11_ zds-3SC&!38!}bmQqHj1o z{Hb2J-QVAGQ_kOR3x8aM)h~5IE`8|~_WJj*jLp%nPTm`nOo>?E)>^@50v)p)Mc$+q za)G0D$qMb(k`A8_rGs=f+oCYY#oN%C^S$H?jC;0}_N=Jpa)mGtxX(W&;qOumbJskN zDBq-`bKHqpjkiV&M&o3qg=1F9vd-F8OY`&I%haErFp3u){JO{QSdqVN2(e~W*TZ@R zP;XxaVlj>9sLjHo5B2PjdYUvdPwVu^{ziFu!}_Nc6+S=w=MgZGYdynGs}Wobr?;}0 z5t8Q8{QUeID}DL+fNy~wn|T-jkFw%cK?F$1En2Uni@-KD^;W zt6kbcUTUz95~+J zR9q4)s#D6PyT8)_$)SY@&5Qx(bH`i`7hD%1j~tguf5E# zBn&bJ?{4EK_D!OR6IO#$7wiJQYe=l_wr@NWa6Nx}?JTr@lt@w)EY3Y@T|G1uJv}lq z67aOG?RH(A7?-TL$bWHB>k0MCFTDOL(z7WXYWKD3IPyKUe^BR@DmLHevi3ADVG}SZh~)B=et>&Z{jLCBF>0 ztnN#?65*XV&guQ42Rcy{+>kGsHVZAATq8czBP!^ce4_t1AI8FO=M5y4q0Y(ACPNC+ zCFaL1t1?cmPZ(KIsncM#ZsSueoX|2w{UEz;T2RZY0`6uBx8`g-^;PzAYIk*Y^;C;} zN^)F$=gSAvX1RV>izqv@t)xpEgx!+p?_dapjKu>UDWS8wOwvW46P~fWh?YVN4G2HE% zt_r#GXt#U!L~wK$KT1EaG25o9W65Pn%=D#BsQCKzs>7LS(do!R`4yw^+UaHj3+_x! zO^sP~nekDXxiqt`@*gE_&igjY6$)OzTrQ7f%3pPT0NorqAUl2YCPZ!?8;e=je|W!L b+o}ix_!B>6R=+aF^lujl{P{m|BM$u+ZZ2#L literal 3549 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f888fa57f7ca8cfc8199b9630969e8c66822a315 GIT binary patch literal 2031 zcmbVNZB!Fi8V-VBrKlCCtYDl5^?;I0CJ;hmkWEOyv<5hVHhipLNG2E{nUD++AfhZ4 z3X}@2MwBADtds&Pf`GLeh`Mq>QI?8`RKQ&X6c84aMLyjLg1bLF{jqb-%)NK!eV+Gu zzs_U@`1x9`-Mkiu!&&k6as=2481FT!u;;wp%Mxt)9m)+x0}&~jC{n>VmIR4}0iIkG z1q)!2Bq^>1X5w(B3RzGv8qD9v5F>Ju$Y?{-$dwoxhhutalp=8qi~^BxluY4C7{As? z0AvzRf{@B5^OfH4LD}A96&#rC7bH%O5z{3EuRQ=$!@vmSFe(Bx@>qqMq46Xv@iMTz z@ij;QmQ2tXPr^GpkU}A17DRQD0u^b9 z3bo@30|!=%RWc9qn-pz>AMi*N=K8p^UD@6oZ&&IH$A_?7va1i7!gBR-qjDgK zOJ#E)cP^XCW%;mKG>8qYV0j8PDpH8y6~8jf?=qJ1n^=ao3KpS=DhNShS2`fzAc7+5 zgNPFF_Fk$u;3SkOBuJv#*;t}?5p!UbECH7Is1P}@lw*eM0~+YC6pExtC`6jr4IqO)B{Rm)(_d^6Lu*p$j zBNAEKHHpKSZQ^lQL7MLCUwsj?|4W-abIdWvt4YrM>>JW^{E_WjY6TYAB_H<(OtA8^ zLqDlakIwm=WmEgtP+PP1gn$mgE{_Re*_yib7N4fq-vdm(V7HEJ8|u|Bbk5#?JZ<-q z^Ha|gZ4_KoH$BrC9#d6!ucISqgISZ^)21f#ztb(g{d2R}F2nFu#p>8Azp|jRp-Y{~ z_q+zp_v0aRyjUzYY~wKlhexIuWPady#07zgG-Qx^qT*rs^s&j-)>iq%fkTISE-wz; zImv(0aw=VGuh$#mRgXgaLcpp@oKPrCyEZ-giT(bob9nM$kBp2AE%Ui`NM`h{1uH7e z$@=QevZnDz6~aS7s=13P2K``gSeU7wzkf>j>k?+ccve%^zCh`zWP>ZGaJ~}lG2PRA zrTvkGLvIZ?Awq39**o~;q%-wd;oSKsSeEoS?3dCxybFo+&xvN!S8+DiCyGWF!@$0r z+N7ZlB<~o$>m%*UTXzlpRimHIJmWr1$#jlbh2QOVzNYJYO}x6u4B{etPg zTC?<>XZ#yl7XI&5&ccq;`ShNp;|t3Vi#jGT+;gu+}>UpcH{IVk`DA0f~H`cX{ZA$Pj(ox$Q0h8oW*NMqd*Ntw^ zbF&&#!v}|dd0|~FZt14C|K(Wf+FRXMz|YrfCQqQXRcCFr^Jre(E0>xJ`gNg2f+<9w zd+V(>W!K|aWbA8j`dh^J<3Z`rxy_G%whix_f3@S;#FqZ=rXHFl=6-j_%&K|H>taj3 z13qJ*HP=3Gytm#e{QkZB*{Kq<*_a27j*-=4rPKqNNklpD`}rTVY0dOM)lGCtI)5m1 z4lzGEP-=VWXES{L8p2zj8sEO~kjh{aK*=pTX>E5{LR-%hqFBPVOpbULQvu*~1;<=utv6B)C~g^V*Y_reCj z@l7RyhVwN7)v1=86n=yDuI5Axv3dkQPc-1Fb7#H2&P?BG`~~y4ew>T!1AqJv4{uPQ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..95b9a7bb6e66e635b4f5e1de9ef9d363569f1602 GIT binary patch literal 1554 zcmbVMX;2eq7>*QAL|X?dwgtCA#siW)k}SzWfNYMEDS-%4p<0K{W(iBk?wVapq_l%t zprY0~BU%TLR;JpiTI^W0j2Ea?sbxkgcr@UE^{QGCSN}oEFXR!i$)*f#OLI z%?UKi06|8=&Xx*Vsp#p`5Zs)_@{E|_M-wHc4D=Bk2+JYR?GDB@qRk6A)W2>#SDUx3 z*AxaD^S?Z=3!EDe<#T&VUc3?QH$5l$y zpi|>UqXHJgN0M-(3B?t--k?{gLLAS-qNoB@>LA#JKnM&QRXBob)H=OR11BXZmAEd1 zH8Z?GFeDYSON(|#vCs>#nBGGX0_(A{Y)PmCtVOKA@t>X{6hD@3V{@SVC zcbATVD`#j5UYBI%>kqZEuIS$1jc59~^M{u=SHzm9eA3y)e{Mam9*#K`WBJ~`;J}WF zQ?Z_eeKDIKO}qcg{kgZF4Ch|-|6LFd7c>X%>=BwP%7Nm8{=QY4Zj5z}OK3^6r^~No ze7Csu!k6j({Pr=s*VjIXIU~RGnQcD(e#(*fG+X3vzJaL literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c2385d08fca6031d84be8885254b89368ffbc95f GIT binary patch literal 1651 zcmbVNdrT8|96xzDML`l#w9Iiirc&-e3v z<-SgcTjuM-@&N$ASG8Q8$gH62p60Ns~b& z5*l4@_Ai7O06a-!aw?swj>T}w#L>8HIChhnK?8s|+HTh1Sp*Ggi3}qtfktZTA<(Fk zKq&$>tTxLCgK>GDg-FVaOUCoEaFGs*UJ8os7(-wpXbosLZ6d9hT>?$;V$9z4nhSvw zCUlkrdMhebodC)x3jqo^5o{bm5Kt)MAc9C9DhLNr7!hz`5f_2kFoGd4hQi?F1u@<% zIz5&sS5Eq3P7=sK(`Jmzwb^VO8;?U-GPsCHB;vv-7e(2O1>2fS(i%IPw1&7D?_P%r%)@aZOlT=|tjR8Sk~W zCg++7ZX#i&Hd}C}9{LbBn91FT9k~n{HCVjG$P`7hNlxLLO$14+B4NX~+DQc6u0}>1rO<4_;8I;K;Dh@7AF_JpU zW?kYc(c6gSgvFRc=#&=91Wx1_GrmUys@38sPH5O#K7p_WC||&i#PtzuElxzhk%WLR z#D&l#UiW`;$7KX@T}|?zrg6VwI?=U#Hv-Jz-4GEZGdUJ!MB2+@eF4CuSS621w*OXJ zs5-<#{1q!hABY?S>8budd#7La&IdSs6_xkDjf8hD?9n%f5BG(q?Fu*S*>G`ga9P{v zn-u+O;^b|kzt@T-4bArgZHC-&k6$Id(O@;Yjp7>|BETj2CZLM>Cz`J;sc(A{q%dq-j7%| z9&5kXx{AWv!lGEO)9t6a?c%vZIW>-&JCAz0$IBNVX|9fblDA>hF80a67W9XA-MY5C z=1vZ$BU8{HHP+~NVSLW0XVh_zuNL%z#}0*Uy&mA>-Ee!bPu#u8e)N(@To#{oBdW?O z1g%#+>oW_g@`IcicZn^3`iusoHEr7nq+k2^ly~n|zw+XX1HXTbhd z)ybiv;Amm~vZU(uIcskFKfULI@g0aL^01|PrMI!k|VO4h4WH?EJ*@t;-o zASFnd-uKuc*k9BY{E7d{OS1>Vy7}nM$}>&dD)$w=jykZaFXlvI_Va9K;mhN(I|B=< zdLQV|XUF&KV4d?S7|*RaC>z=yyz$8fuNlyhYbzFx;Uz_6r>tGtnOB$7RsF;Dy^R$< zXI48F)z+DZ-n4ou&m5eOs(*Y@dGfQ1yX~XB&W@2a{-Hsc4FiSKbla<2IyCu?!(W2u zLQzM@K;PT5 z=G>O=nva&ee%!k*9IBrF>b0|UZBhNmi1uE8No(zaDdnra8KUxi*Vf(bDFr+M$Kk@D T=)%)aUB3a9B2Io*n(p`q^6i6A literal 0 HcmV?d00001 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 491eda5ec7c3252439dbc12f9a76fed847e48103..5e75b07d0b000887b7a499990d80da849cb15804 GIT binary patch literal 1422 zcmbVMZ%i9y7{84<$z(dS$pACG9E+%-y+7@>^q?T^wWH3KT4<;-6OZ-yyzCl#vziG43)T!9}2i<@8AS!bJpT zJ$j^ov|?7D5tOny)dI+?w&lC4%iKB-l9dT(1Spxn3nT^(c*{AF3h0qlUP_iD$0!1? zsz_yeWX&m;)eakZ0l=hEqj2Lm4r_HvoJ>;@WGYNxIEi996vq@8PT?3uVDS2b$kqf; zG3B7m>$c>b9x0V1ABCcRzhCKBDS4p;#dSIziV-M5C}a(VSj9<9K*5R0Q3e`_Zh`el zEYHCaMy80bko1V`=~@V0pVhiS%!%uXl2e8T7$1r&G1Tjg#I>p|N)GU^8=Gp2`BgrE zI)KPm2yVF^#mP~yoVy1biYUt7P`Lst7lkROd3S{uaFT`ABl3;X!+IzKZZwc;4V|54 zFqu@i96q5nn9Lf3%3!38Dl*Ek8CFMN8a0m5X54JXaTA%Aovo$~D#EPAY1~YzqgV?k zN(|=)QM;^ccO7edAeJ%;fRT71pXbY?9bhlzC0;D$eX!BET5f zfxuP*k6GZo@M?}Jb`u|fT0`KNrdW~Y)-nn;u1=FBRguC?s(@RoQG+6aK-Te||C2jZ zb_k6$$$y$AdL(yZMBEqwd9yJ@fRiUjkVmBA%@##(I8J6p2r zpV?OTNI@nPUa{RC_$X-KHTLU0+;78DCzZ+}FFSnx;)&UB8e6{%FV66nkKFMzpR#=y z3fDh1gvFhDB{klb`B`qu?DGEk3`gd%OZ_9guXTr7nmnz{qg{_5ntw0XKQR49=EF?i z(4h(4b@hoRr!x@={`hzD4@66d)24J!bT%#Czq$O!FqB@~o_cT^SJnjUO#1#py730| z=jDW-v+4$?nVG5nrSz2dk6p=~?9oho0-sw_*`=f>X9_y6ZRVR#Bgx?(UkHwa~-8^Jljg zD)*)|w8pv`#u_K@j>pgabzz9iB5$9q`KsjHq_wc-t@)`yM)QlIt4S00EN8lx`?hy{ dp$(M$mfQzHx41#caX=gSLt0EWy36o-?LX|p5Sjo0 delta 904 zcmV;319$w63zG+s8Gi-<0047(dh`GQ16oN$K~#9!y;s{(+b|H#CuAUruVD&l0Vg4Z zID}jX5bhM{v}OALpQ7rlvx+3k4i9x7cC3|To#WlJl3d%}-4(D#qam8j7CrTL5Qehd z)T~8@{xArI@B7js5x3i9Q5=h==h2)njA(7o^U3fI4C|tQM}Jxkjo$QH9FOPOGo8`1 zH(rXPbXwR?HoD0Aq$T57u8+;`ZNot5~Fme{MTO(;_hjw{O>>SjrkbAf4))v`7{+1X=r=Vh_HZ(l*$PBqMObQ z0uL{@wBT?wAb)>(GZ*tq8OD=@{I}na(x0kv0P6FZz+l)X|LS%jKj2h!yT_8igs^}K zUDWpW_9(CD4B|^80=%G2=>6l#AYhNf2Z6IR^B-SV^bv20O_GnwDnVp2H&{o`4Qk|O}jzz;zn z&S{`Z%V_|+mLeb{021`n45@*sah}6%hw(ej;DijoKGxzCNKEXMHIxF2P=V?o76~F^ z16qW6K7Y3vnEP3TNPiZAwFsSG<%&efcq<&35wqUKIEyfhVr)ds4S|x7x*}naaiyz( z7!#lf;6zd>kP9`uq!i#YB#cx#<{SIKRuOK=cTS)V9qDsa1SBT*AUX|8Mfl0IxP(|V zha*5$kR#wIr!w%;h!m8yK>!-SMWRTAx%%Jo^?x~iI7k8um{bK2!q-8n&Vs^PFDbn; z!R4YM4OqY=0znWMBGgM}+eWi(UvLU}9RXmX0O&O2E19j_qCA6OX{FeNtmse*Bqm)* zkOG}R<%f}rfW8q`eJ4~YkUJsm1NC~{D8s7ngsKW;1lFhFMg#V(xRN^|bf96H8Yqas zzkj?FW*ELnz}7&Ocft%~gK27DO`ys_w`A*ZAgMC7hTH_1XGBpWtM6HrksP!xo* zD(F~Xri!9+)B~`BGHMm63Ru>Ilqqu8Y(~ z5QSoE&_%`)vC2@s8q+fns|>@UH5;V2=c zQG#l9AsINjIwLGnosq2OX=uV_K#+w`D$t_@0$B7Z1{2>RpiSuIlV|HQNCPHBh-3ln zEvZ;#I3U4r6yPwpbTtgaKmd;ca{^gRjz7SJU=9fJKp3J!Fdv5aObD19G}0QbN#sXJ z<&(C^n}DVz2qPZ^&1N&h%wk}85(x8nJP=}nOeUR_pqtVS1Y)5ZOx{x(q^L=a>x_gB zGXPeNhzd(11T>QATNm_3rShF(gK08QWXM1ZVgz9Z1nTuxzb2$jLpzgg{H6y zgNZ;4YIMr3Zo=*a7XBcXFTqiS!0<>6OPQ*Ga4kk)CM{+JB$A1Y1HLgjg9bC3mRM8t z)?+D(>%K%aavakG6EWuN-oru7gIG+J3ZZio;Xrzzn$4uEm@E~Yji{giE=SGfv01c9 zyypMJ4kQVI)*|^&(M&y&m1sS_YXS1|u8B|s**Q4bBFdwZJPO6;wn8e3wA^cozMdbk z%6W5nX2n8Z#=U8Z-}1ag%Ezh@F?FAdsFM~iJ*JJBJx!LsEb)_R)rX3r@?Yn2vu5TL z+bU%)b6DA<$Bnn1+&O9LZXakoP$;e#xu(|u$A5(Gwkl?dac;$k>KumQ@i^{FMizYM=eVA$mxZZ&le2kiaX^MNKqxFP3mk^h^D&ui^t2I+ebZG02g zofs^A+76}Vk90d&wRnD!Q(JYdQ)b?YSk>aoDe5vb&Tvx4dV!V>ZF*$ilVz^5EC0)D z(fx*DJL*A~^9!EX+p-_V%6{Fg3Kedkf(|Rw;s$GS6=Ib6z*ttme&HuB1>OSQ~Rsj zit6_4wWY_-JKEi-ZF$@iKW8vuILxJgc+)Z8jISd>=Sn1p1Hs-vJ Y623I@qP8T3YyE>LWMR@8@w%=505OP_;s5{u literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..dd1517e1f532c0d08dbd0018bfe702646943488f GIT binary patch literal 1973 zcmbVNYfuyC8V<-*OchRx1;r{cIIXB5ySb4>FioL0&Nu(5j=>{0uc+uZV>GG;q=GZnceUEcAw{c zpZ7MK7Zo))E5)w(HO~cWIL^4seMyw^UaM*(hw_*m0O`}ChtOi({fshOhl7`|@%>LSX zCIi()G1v1|fXX08HleF*M&un^Y=YL7p%v+vk`;_dtC%u?AtcPOVwt!}Y>i@0*cDTI z&ucc5F##bnqL|M_C92{Wa>9r(_~8PU76d^?geV;33%MNrG6n|#`D{SM1_2fTia|ik z0T`1Plk#TN>BVYDIq8c!MKL##q(RJPTP&7v3pboFrm;bhNW=y>Yz~J-Ay}r(I0;)> zxG8kX0)&{fM$|x}1kUhSgf)bjjABwspM`)KRI2BOanod?sFbm-uz?MR18fZQ#5I97 zk!s{G881Ye5;hwUwi+=JW}}v>hdy+QOy%zH9eIG18u8mklqw3G2@zT|hTvp06vd>z zgzHe9SO&^ve4YT33S|lf7o@`HM936Mfs8AYLvk*E%EpVhQiT!#1xkUEs}zBtf-mGy ze7RJ>;{!?&1oEc1(YT3(aV;|C7p448a`}JD70ZnXOcKTfg2`VVtbn8f0}0M71fEJ?eh_!4$p@O!KukHQX?|FGHVw# zdAFh=X@d3Vx^?Xt2`gupe*5?lo^`PBEm>;G=c?40S1S}3>be&CJ_*?nbB;M1It)oq zrppIb9%cIGtN(NJ$cmx_}$BaW2b zYkNwY6%aN9t2?;e?apc4D%t#A+u1E!4s=`M<{?#bE4dVh8!sPDZ0}#a@8GhEwG|`R z(gHdMGBGSZ_p687XIAVedx;MRA8j~&qis(eEyGtjr}*4B)B9mF23^ls1&?gRhxj-|hUX8N*d!TqY3+g3(A9s?S*lwIlUlF|EhsGO4uN8|p-ec2~oKiGZ zbNvtZj+nbWXU0`8mHzxj+%KzBGDYSYfqwg1vCjgM7dq49GkxY)Zf_}6fHhhBaK2>^F?Nw_#R+@r|EH$lq-((_(eZe<+~z-uJ27az$s3(jk`PB zUw6O0b5BLl!}%Y|%T`AZoNt<0+wv5X+t=-Cy7Q(<%{f$1P+3h54!z+>tLhjKTL~O#6rhq8{hjAd|NTv literal 0 HcmV?d00001 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 01fadc4175a22e7675294e90dc543be8f095da50..dc105a83bb5be440fa96a6bc135ae00f3589c62b GIT binary patch literal 1665 zcmbVNX;2eq7!EMXA$V4+w!(Hn4QjHxIY~^Q*&G5T$PodpU^klu)*Kr*8wnIGQfwF%Ar-J)1vJ-Y84dIk=e=e( zB*ZTY3YZzd;c$XtqBTkE3V3cmZ}vGf{q8PynZan&m}DxG$-!uXqcTxO0*J9&%wxlMS?w&E!%;-J>=Z?q{> zo}|%@_+n2=Fq>iQatO-F$>HY+`4pW6Au^c^f(4L3z+)|Vj$9jqxp+25=qQ7RaNsm) zXGqEhco;Dw*bxRf$!IK!YMWp-zS%TCog~=ujyt76?TWL@SYv zVqjtGLZ;g1TGTri~^yNC&G-dR3gSDGLaA* z!JGb1?jTkWHTZ5?r^`tYc1`T^YU)vO*@RI!O2?>9?qDO@w9L5@`jY6BYRKHg3;nL>h{?+XQq7BTA0oa>$`M| z@q;RH^mhG$wn>AR5^J+(s`wSUEY`=E9E1jYQLK9S7@B`Xii6Lx(u=E}x_R`co1a=5%>Vu>!a#V~LE z`Rfn1eY?AhbdUd9jk?E=^=VnwFh~5Guj;(lLtjc~sP%s&XzZvJKinGC)>InRb<3dZ z%o(%tSVsM+^YhK=$%B2+iIO&>VBeKRT%XX4AM=9;Et1eXPqqx$vidjO-dXN{T?3*G zcba}4zg{FAd!lOL;z;w3e&grW_b;f+ zNGN1Oe$(pIo_$r%dbdpQds35X`E<>LPI_u-!gHRbwQLAlxAdpL?t@P4uNP>%G;WT6 z?_CK7mX$8O+K_c_?ip#d^F$4OI4)v)oOj1g<1f(_(P3cNQq*v$*SWt3Ykx-TxAmuS z-@9=kLO8U~WWejW59{yWw4d7laj*|$?#nH>Ts#nc@yiKb)xH&L^FtMd-BmNVkE(s$ ze>yvBG88XkU7Lb$HhMp<$`(COEm`hW)1UrL``E_1$}!I1TJO5%-i6PkzE2t}8r|{L z0jltV?x(3iS;gzbRnQj!AD9asxD?G(8VvKSxii-Ie^=B!cly=&Mcwed#QTw}|9&xh e;85WT??8^*mDrq}dC5Vo*nAwUwN1%ZiKjExt-1`;Rnnq1`M1^gtw&VNPTB{zAYTqR#m4dX!^ z6BCm@HGQhPtNwqgtGZ{j8NU^a#Zsw6A1bzOp+p-qmTj4)iQ)#$DVJr*2E_0is|W}_ z@U$Wr4wu(@E&86{4+iaS_wMBxC7mWiWUaRp9g0MU;t03~KMR&SwkiX9dv+wEhLyq3 zzrG7~!|jXm=YJm`F7)nrV#cYiFWvIsPy~iihKdFJ9ovkGZ5!`@c@qvTvy5Q&_g^2Q zJ-(B=(=nVbu)Mt@@Vqw5B3KBS2oZ#Oxb*vPZ$H;#pmfJ8S*r@xFtpj(S+xAdfST=ennHjmqf)6*C}gwQwBNKV8^+aYwO+q{x7qBiF5xaX5CBVIXpUpESu!gG z`CJa%R4S$GdH{1}E6x;sj(WS*3<;1R2OPx-f?PI}&7{*)QvtviG!@6(9C3sMqybn? zxXJ<9h<_4rIx?9|;QGZ4j`{g&gunxq{Z|o$Nfv@!E*Cgmv%wK10G9n%vl9f&1RmFH zyxAuLw-2m}fD3P8i&Ui7=U`Xa+bBVB4lXB|T#>PBaZnM|1=SHH09IWU08K8oBTDd< z5)im!U{w{7hvntPkl@C|9RsTfEXz{axN!pis-S|@Nmidsru+*%YVqHMca_%#R#g#O z6nv8}N@yoOGNXo=%1fP~q1X8BEkGG$m9=!PB=-W3Z$my%+hi8wOeE$96 z*?;R7-@QF$2L0s6~bI>2JZS8H|-{0bOBx(eOeSeqD zL5c1UnPZ4A_Vf_&?*;7n7WrlR^4%Gxq!A_@M9?Lrf=&X+$NJWg#CYqy?x53JX)ZSE zDz+pECnabOaqC0)8F2`Ga4_ z|LNyf2#nxY+;5dih2C+TTCKKl-ZZeG9++;mT8+jX(`3SMTu1E1MRb1S0-uG2Mzdkt Z_CMMPq`DTWSpWb4002ovPDHLkV1juxIu-x` 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 9940312a17110654f0a3a6e2d407680ee542d391..058e483bb1fb15bdc0c0cf68903508c7fcb60b4d GIT binary patch literal 1852 zcmbVNX;2eq7>*Z;NI^vmVx4X9Ky0$v-6SMY#GFDU;V>e!ifob%q>yY(76=jW;!qK# z4i*oXc!63kTCpk;)M|rwq*Fny2Y5nN6b~p?p&JC+AC5n|GrQmS?Y__RKJPWVIzm3% zefYTH6bi*XG(;Rlu7L9%HjsS2qdwb7ELC1C`h#1gdnAlma2Cux9I9YmYY zmN8`p5tgV8u^6$r7P&%YNmB9DwBVV*3^Si3&|w4$n03i|6W<&}>*3{-d*^GA2K1N^ zNkOy^qGDtbfCx8Y0Gq*~s~`vh0(lIG%|&4LmjKL!*dUV!LQFan;zLY6%mjKb8tKib z*6^dm(q3QWDTtOx5C%R7rlqAZ(hvr2OaLJsj|Vbg5Qgcb1>KacCr~q8Z}RJ75Mw5l zQEMQyxE^paqDnl42%?cnKZKw&$YlM*dQ)$r$drL*)Br*ZCaBXn(V1ze#-fWaG+2k

    d>NGw9weHwumd^R*w*pyDwRSgAzm91X;!b5$&uu7nXKorNlyfgHAq z!($<|UcCDMX1&_6_&o}3&bIU;59j7oCy)S+U5!hEwj z`r;f#BsKWZ^h3Fx(p>+PhLwA76+O6;Gq}q`Qd!86oLF&+l^v&F`Siz%+8-oK^91ot zRj{k8`uB}|q~nh1ZOyC8xBh;}a{1GI>|Ja6ZBxzNj%s6aa@erCM3#78=+qp=l?*pYP|B_nUn< z!}EpRO|jM*e|LLU_7UN|M{;q&E4Qzo3|?J3Ymrr?TE@W|6O`5VS4pTRwPo1t_V%Bx zf|b`!PdLz}AD8V2VPI{Ek0V`+cg(x2E8Y4(~~Lb>04 zR^?b0_aK-+Vsp548TW2qU3}?AXF#T;>+td8n_~_>8S$XG*}wYWf^`Mnj^O%jR>$Mf zCuu>WkPWM91FXBd>g&B5FI)hrrPI@9&a10a8g^|Ovm+IVnpQT~xA5_;tk?6BkdD6w zzOJ28L#fGx2byDx+;icX+ zC8xr?lyD$7H?PD|?1g(A4eZ>yyOZK|r_Mdve{}Qe*rK*3*&f+f)0iV0z@w+-d($69 zUZ8nwJl;L<4a95pnRujOP8M+aC!x-3%P$j_uyaOU-*cvP_=tmB(#vfVUd&u?I$6F8 z-2L!|tGWC8O$XKjJ3B4;nd7T$Yg(IGr{&1v?54twwlKF1ozoIdVUJ^1{gEr579ktq zJM*(u+YZ0JoptSQ>Xz-pE_HGf9i{KAE1%dFw(p9cIIpQ9VBEvZuK8ysl}VQztIpW? zwlc3G!hgI{vQH5(y|U!8CbNFksFq`QTEOgDrXzA!CjUU^l1J0HDI+EdT%j literal 2569 zcmdUwiC5EC7RM7v$S;vBkdTBxRusuX2ua9B$U=f_$_~Y)kZ2Kfkb*=93jt&?N-N-4 z5!5PCK&aGOwThxFqNo+n>QJ>f7-Xsf!Z4t$BJ=AxGk?U~cYp7`bKiOIe%^cEbAAV+ zB7)H<3JL;&phH9SF<@jsAa)SI9vuDs=*j0`fTe2JX(5oGDpq_n!XXfQNYvW6AQ+g3 zfewSi;V3u+fWuI5_zDCJiGVvI;79<00pJ(_fkYxvC;;u~h(@EaSgZ>YK|mpJSPb3? zi^JiZoSdAUo$+`)0q;y85L{ebh(yqdBofJ$OeB*@6bgy%1`f!suC5eUiW`OeXP{8r zKywG1n>*OMyHlxD8jVJz@LgPeNp3=tn~3BlA-PLk-KAuA8HJ{BbyvEvR=P3#Su|Gx z&Qa=&R^TxV2HlfIUF|{VtfDiS3>J&!;o-qt$zZKwdU&!tSFQB)^7Q0*ve~P>*&ck( zN*|xqY_=Dh!{%~0TrQX6&F1mAJRZ+`rGzKo2))@NzL!wQ5sA1$UvGh!@9XCy75Rw8 zJU_9wM8cQJ_;R_AQ0OZJO(GDBgi^7uNG24^MG}9pROzSi6DTCUa+y@7l*j|5O1W6& zFHtI_a=Bcgk}1^k0DrkssZ^;{{u+6JPN51?s)GXbL`)D77ff;rCpoPnJ4KV715A7!|iE zI{x#RgrwNdlH(E$@#~EV8#aHInz}VLHFe82L&{$^r=_K3@7$T4oozCi%w}_bKIr)c z1qF4r#-6)52M-=BFE6jCs92t_0`>NPVb2BmwIC=mGh}@>1cK@K^Mh{x?En%?l1)L0 zrr0mHn*M6snF7f)Zp$$7Gg3?pF<-#bvBlrf_9YDNwC)Kd9>Ija#?*aoN_vn>;%X0VY&rZ*{R%3x#wE0|r|{Dc zZ7<)Pc(bQZKi70>=Bu_Xh~0gu5Bs{O&Fy^|WnIzlc>CxT_y@yTxgS5(uZsAw>yN3N zGV1O-*8VPbLMm^Jb&PnYv|;FUQnpuLNF@wZHS(H$>XFKVNkZL&Bme66|2F1eqtE7> zlO!IIAGdr5Z+$a`>TUXVB09c>#+x7)C=IKp7?V@9qZgG84q5hm+YLKbPC~KPFDjar z&3$m@drEa3=a(}Xcj}u~Mt!)4g6)5upmZX)|58PzT+jWh`zZg1bV+Mn8O}M2J4pU` z{<_q+@($#k4vGGzV)%RBZGl)-o(06+zEQ?i1Tkwxx z79Q7o=Gn+P8)|H_>(k312ab512apcEUt?W*D))zH1s7d@n~u6w=li{L!yE2) zh<)_mCfr)gi@*7d9B*IBAA9}dlKH8qrtSUnCugzdK=DzbPgq|`pmp@>;JnRNqf0(< zvub4g=ArvvJXWVJsCX5RTAwfG7(1_qX*Qv&0DMH&0nTJyU_VZ(!#{R!`7rJpN$ScgGk*w{|L8+`Ax6baH+Sr@V$1S@}X)jTnqgAsaE$96_Gp9WjD~gtzctb zqI-t23_8*ELLM}0-J)Nd-yTIC(mhXqk&bj+*v@3+U5HFub|S2qv$>tL6;thQSvI`9 zryEzdI)Xg=D9I6qmbAW2j+yjw$!VNSNE|h6)C3z;n+}}8b#Dafe44mIwy0rnIqrg_Fjy4LU$1cztfiew}9S z!k(W4&MpP#4c#Q$RPWG>-OYQO%^$V`0R0vE=QeHl;zRz%Ru_djM zSu{Z3_3S4%aE=?wfuS8^sJm$$kXft${ZhfMXBR8VJMtdkHvzGh?k)c#xE&e`oG;F| zI~y=Nlyd?kczeANe8k|d*|!-_te24BRnK(o!`X_PbRvfm?9p;^pkc8hntJS*Z-+T8 zLs(L)ilUZpDgp_b)&s`3nJrYXd_#oi?ZzfuIKrU?OS)c-TWguiQrJxomGprivYNvG zYQa>kNzAEza&j^AB$S!cF+o&a&SuE4*Hk7EBStZ7#e>x)cp$A{*arO_+!xW}0N;$u z6YNPV2J0P$TF;WPpObN_OmGnaH=#QWDf)NjN$`{*iG_ka8e<*yu_bRt`!pIjhiM{! zdegmPx!gKk904Ng&oN6LG511;iU+r&I(OAZ8cVPXDW0$=RtpII6&7DKlId!H3lY!> zBB#}Zcfw(o2ux`~4y9Q3KUlE-Ar?B59>YF|Yb=g9wLcV;*VLSrroK0f7%9$M(zbnK zBp3Yo%q`fdr4?O>23T9RYAx|z0lj+!=&^*_J+|DKGPcgD)yuydG6`XW;I9f28Wf>FA8080523TW Ae*gdg 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 0000000000000000000000000000000000000000..352b9f648853084048dedf31012f2e0b1a6028d8 GIT binary patch literal 1672 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0245d32a159528100ef2b14f8e6d7b6d4c6544c1 GIT binary patch literal 1868 zcmbVNX;2eq7>;-hqEVoVidC1`AzsPu<|2s(Bo{%6U_gi$y4ftSLb74Am0~U*$WvrJazpwz@C}TwlwUE}L zz~XRCGKqyJPl-U2<57u`72pp{uuEwI6GkC`-IQRqO6@XM2d|XgJ70q=pu>cUm$5#J z(rd#21wmqfkSpS#Fbo5J5-uzh^LfH?01twNAS3}{hy%e=7?ScJpz~tU-biDNRHsyT z`l3%VRvblHq#$Us*|;`7mmp(7SR#>t5D(<>IJ5=Fy1+~!c8=LPvWr29Sy2+VP&i=* zoQ#NpNTOscTIuHyOct&73$fYSnJ7ACpdGP*Fc$(%CTCn7)>cY~{VU_E*4Bsx77Wy3 zRw9W+>3YPB>;lud`?e#eA+1IlO5$`;kOU=xCYdlZ6|9u8=r3F&Zj{PlgdhySgnSXfeOBW2Ps5i0o;WR zHd`sgjAC7WaoTSu*6*8Gse;51iXbBhBB84T!r};uu*MMHBS0U%3=w9gCx@g*Brgrlq$iKASYU+xPHE)i(D1+k zXZcoQ#Bq(>P=2A8XZV_)n{w~ZDVyU!8$fp^oO^2i9(d{?^Q{u7t*7UM;jV$AjNg54 zv71}6o>bW+!)9)pcN9FXj7%f#l(=!SDy4eV z#th@!0jiAj@+DBP=MZ#_$D{TwC$qg5dU<(ec%16KKR@5Kr0&p>%!Sz>KlvkhVcGS& zme&OZ1>H21x3(6)T6VMOL`H3G?Sp%UqobM{8^<9BuY1Zap7##O(MwYL9ASIgtE;Nq zTasl6v-18u^&U89vcB8VXOt9uU2)gty$ACzhxSNI@siQI>x1^ynJYDq`WFRN-gQYW zGsnip7WsyIP3dL3#%$`*n*RDJXX7N@G(A71PfbnD(>L!CzM#BC6xI0R#i7P^z4Fh- z9LuvMCa$-{H?XVq(~ASht82-KG2yAFqt4A}n3|R$UL0Ne5ev~5R0aD2tFzg!ibnJo z7-f+Y^Ya!iYzKm`Ew3)GaN%A3bSVGrkI?)UaLz< z`on8Qfvy6xzu7r+<^F=r`mw*BIbN!D{bXM=ZQa$=ih(<_f7Yl1#*E0nuSx5ZA9bO=#8Dn-rWp17Lxqa z>Y+Qayq1Hp$F;ZdJK#?DoO`K`l6B33`1IKNxMgqU249Q5uNm`J*)X` z;YAp-<>XZKzI5r*-rTJZ=f#~$J#c+qMoLP`wUmbW8ylv@W6xivcPGzPPg1?OJMYA# z6$8g?bXzOAb&sv{35mRrRr-B@-4?X^zy^nA{uzAm^pnpti*qUl_~cFw%#!y*;Z;R$ zO_}Wdl9#-~KR=vreM$zrNUE=bbNslE?Fr@E53lzgR`e`4JS z!nO3_uJZBS*R;JGCK$Xf^R;*-(jcshD~vu|xxHufip!6feZllWsm!xaRTF@R%{^nx e<#W3AV$3>t`^K};35%Tnw_w#2{( zJaZG%Q-e|yQz{EjrrIztFz024M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7p`n7grJkXw zg|U&Tj)IYap{c%srM{tou7RPIp@Ef=fdUjL0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LcpzHo!{ilG4o3^M(S!~%UoJp=vRT#&!Os*6j4QW4I;s=7F&vLIDI zD784hv?v)EA8E=k&A_n3ZxKi#&^1>6MVY`zNz8G{PcF?(%`5SAu~h=f=%r+)SUDLw zJDHl8xj0%lxw;w~0=;i!?&Rub=49;T?BZ-}3Nr(%UZ7%EBR3~EV>e4fLswG^6H{YX zH)Ass3nLdN7fV-|UeCPZlEl2^RG7V)AbTNt9r5b5axO|uEXgkl$GXD`Nxl$dWrwt<$d+!I@ROd`pMGI|9@J)>F>{)ca`(r|8DyJ`|j`Dtx>)oe%5e3 ztJITdTevQz<=BbG9|d@t945*#oiF5mXez_U`ugjx2QN#4;!LI-lv?(u`)io(<6bxC zg3UKW7Ck82Evj@QZ#(N_i)+RkvO{)kO51k-J+~YmyKLgMy-d=tAAi)?5w(^je*N?Z zPm2QWr_`q2ZCduSWYzAC&DE@dA}{;%wrkHwo%x_>XGmOuj`Yq|cb_SavBUf&U( zuvt*gEPt|!=8-Szo79pEx#bR5n@zr>{UCd9+JvMA3EO;NVK=7SCe zyYF)KxhWs~TDA7h#k2bZ+W5Y6{V-bBzWXdgjq9D0{O6eOR`72x=$bQguj?J{1DjoV z#g0sTe_N}?PUQA)W>b@QLSc{2ugWv2$<qEa~@pU&N zYoC}cj|kO$bf?lis$BT^`6scCpP%j4J9=~WOVi#h^J~}tsfgS1=vH{S>&!o@2N(>m VM<|9%EVTobx}L6nF6*2UngF2{HTeJl literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8914dd001657f2cdc792ef855a0681d03d914bf7 GIT binary patch literal 1602 zcmbVMdr;GM9PbbrqHOBa31gUro#LZS(l&kMC_-P*9YriC#cp7l1}M;^OM)%+2~0f| z(K$e;vJK_D+Z1u~pw*buKZ@hjlH1O52tvzhny^GgV)GjqvwCg;K#QV?sStt4P@;8~=J z#BBwi{z^s(1mh@sikUMT6EK2yh;Xls$n9|QXn`PVq1%ZQxg-Zz$t*ji0`J#1gMi(p z0#i{VY;rpA6*$6+@q6!U2n0q< zxLg%DD#~n30yH#30;otPBoG7vw zm`ST2^TnT3U^d4&F$i+GTq2i5L^D|sqEsp&SPY59Lf%5i7Em1S7E)}4k3mba1Y>t{ zcA5gbjJTD~=TsoCbTkBq(`bB2OtE8$;!_5>aVLa`V94R{#x-KiawhU$8LzZvQwp3U zWFlEQpCR~qWJdVFeC}TF$ZN=}!4@%gz9@K}mL~EYB*huDDvq-B8U!+m7qF>LMGS5YG9d6srO+G z6wBchLHhjKy?#fr=xecRQ6&({G-*)&J9*|ZbTXhtdyM5fv)8|`A}dP_7K zv6f`)D@dE3p&h_TjxqZyG!RNyBDPv_p)3EVPOxR-qKP!g3i($dpnEIEJ_V zpWH#bAjsP!|7jZEE4~xG+m|E2A6^a-N%51z@FP;P1fDDq_~jV1u_^A04HcHsP-L?1 zQtz$jW$t)jJ$WR!V*6^_xX!o=boZ>J52L?{D0FL%C%1lZAYentT+@wh^N(~tZoFwB z_nga~=3j{DAGo6ehL_FUP-NHSmJMQaYgz5C+CP5Jh@9r1b+j{iTG(3~_XI9IxTMAU{hf}Oj)y<1a`l#)imOcB zfT|?3Hm1#UY}tgw+3&PSjpL7Bs(I4dSo?$JtaRq2XE}$qHx{jmzCSDt4Q_e922zA? zQ$dQ$^7HV;o<|L9SJYR2{Y9f+pa`Q@9JhqX2BuA+~24)&i) ze-81%f+%D>-Qk__(r}xgS`DIlRE63k0>A7}TBFLEH>MQP# zkzZ~V?gg_B(4XI(el=}hz{KmPUYrQ3di$557cs$G>p%N)us=;6+Vp4nlC~+L$okp? z13m9O?H2xBoiKa%kgNGh^S6WW&An&8i+dQ3nKvpsJnxpbld~RPa}Lg`4eBd?8rBsz`;H7+KgR4EqkJ9N*G*K*z7k+aDrHE Tf@DyW_pffyC29|=mlyp5ciUwn literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..362a6bb0ee9c7cd1b7988ebc1f9ce39eee8d6401 GIT binary patch literal 1719 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 delta 1460 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1bf5591290b891492f867c38a08c951e56c4e088 GIT binary patch literal 1792 zcmbVNX;2eq7!C#xu8I^9kfGbq7D19dazG-1kW-XI1**uXLyiRkBpY`Z2nfnZ(c&>^ z9YjQ}j8m~5gbrmqkm2w^z)@!qwIUF!jDT7YQI6u+4T9|t#~Vr;HM4F#}6&(_xtnCJIfXg@&6=YHcb?0va?)Zxk{HYwH<+UMFO% z<0>JgNrEQpmuKT>Otvako1LoV>loo-K&V+j5g1TX4VVpSMnYf~GNyP1lx#Z&8NieZ znJQ#_a4Jr@8jxT(3UFCGrWS@_AehgBxgl(X8w4N_%mpDn2t!N=7Qm1Ifq?0UL0Q9f ziGpaUeA*VZ6Ec!X(j)-E%*;$yCYy!fNg&MU^Fas!5rj!;Fo`T9sWvl>gx?H<6eYB{ z-bCs#BVc1xYp`@u$e=v^5Q4#^RDL8j64QyIQU;pUCJ<&ppuu2^Yf76SqtSoe_@p)w zn`J`5Xq3RxaV=GkM86p@mAlUyvMEyD2v*^GswnC-DW**~phhxMDr8VMES+8_5W^BN zm&21rgotG_HcW+&1dC;Io|r9`NF{9U49BOi5j?I~im=&owwwpUGA^G3aVa?>gdfb| zOM*Ew*hnKms*PH7#;%^SJB>v?ixo(4R83-dEQY1cbinFljKqj!%mhdzQxyl6tkWBH zSSAr*E76CDr6{h?Ky`8)GXPUL7U)0WgO(4m5sgO8(<`yNa9-ug;4%U)#Q+X^&7ua7yUDTDS{ny#7) zZb>W4U12w0w{GzEUyUvHQFpJRyQ&XV_q@m{V)vYlXO%3Jm8vRQE#;>J?<7{+tvk~( zXH_Dv%t7AHvF3y=B8GiDu01V(wSW0Hc^S1Ed)hS%!Yb>aL%sNT=OK^X1y(ORMct;J zNc%^Bq|`X-eD)lVKR4^B>Y3bY>|i>hWz2Kw+yTdxul=mYaNp)9a8>lLH0^JmJ|p8f zP~V$uQ=q$Jqw~cbZC%C^=d=dVa$VD7$nVPOa77g|XL4WLZvMSC=eJ)DZ1B$Cl6*7d z47l{+%M5ycV?upTk(6OBj{5GEESVm~@xCT5Eo^?WBr>qLsiH+x`oL;Q$+IMQ9SC?N z9dj=@6-qB|t5k?m4-a$wj;{e+X-zT1u0=hA%|6F|Y7`lCi|^*~ex$+g@^@8vI$0fG zuMF@@NAe5P==7SnAWg>Wg!1*pwL5=?>bEV^ujx49f9c?gU)<7XXX&cf`_6k2d!{4) z+*(#iXTtFK+Pxjj#4eLcNyvlH$_to=&xq%v_^uh*K<52sl z@O^t)jq&HUR>jvS=HrKYE@e9BOb#JKx73m&aRYn(cjSk9UEGQfy45*+`+f6D-*@k` zF5l-KkB@t&s-TaUL!11*Ub~sNGg?z5ue{MVYFDq#2BX{ifA1?9(bU$rju)o_qpFK# zct-;Cpe45eC5$h73_QqJxPr6u3 zM=g1KbKi|fd%~#7h6I@1CzQEKC-OZG`!@`ReKoX8X=znRHZH1l+24D64$)n8cClh` zqR8^6)88(2en&jdcUPu}78de=O)(Cg@5Of=%IxpA20MB2h(o{shOnFlhcxNuxDoq3`|*q1X6e(c7~OEn0JPP*xfx z@B3k^;XSij0k@6pzId`er!D(N-NEE+`|#PGH2O0uk+Jtwx$U16DN{)+#R=R00dx?* Ap8x;= literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4b21aabad98d8708b358dfcfd57260a28613a620 GIT binary patch literal 2008 zcmbVNYg7|w8jgZOEf-OAkt$9@w{pv65)w#Aj7cU5xN<2VA}TUTh7ci{kc>^Ft-VN~ zh+Wj;mOZR10xDQUSV*ygMRvQi3IgXKlA_4fP;PS5V#UHv5ZwLY>5rXrX1?#6d7tNf z-rJe1h%kxc8uv8>0>LpP7>dMKzQ44{H$uUye!~X$(JrMgr zuyhe|Z(4aGI}#Ev`NB_JViJaF*c6IhuP5v2WK^r5fGie^LZwk?G!kw>(j8G_uz{r3 zc`h?Rh)$+eYA_|L2CR&*6g`Y_iMZ02A*eK=p|6P5x}`+nDWe!*4Fx1qDJqpUu0?Ad z7K!{<#%ry0(ML20B@)r0hqW@i9*LgIU_5uf@5pM1t6_(0m3UF$6bO|aRv~IE1mY6$ zFJ!q=&K7_|0mGjO@dE`S5go+Crv(T^Vy1vD5JEyaW0~W1SUx=<(4WZy#dI+f1Vs!! zOU!^kCXEj9A(p>Du#62+>o8a?Lzew2alcDg>hEINLM;Mgs5Tl!QJ%T@tDR zgu=y&173TSYB{Rcd0R{LGGYkPD&I%sVlAoy7IVy2zD9$LMWxfEQkcX{1OrKdGJhIL zN~23j{;-r9z+}jnEPpz22`~SDa!0`hQLIh!KTWgz3hzYg_SFdBhgU;{sPW0s;v@1% z%DYY=*b+h@ezc*hF6Kb^TN2mqpU#><3w>S2n)h}j6i@!sX7CRM#Cf4dT! zb$PNIIlY`qE#+G{Li#}2cUOOIXyBWtrl!(vY-ccxlI-kkvr89&78I0i+)m^1a!%(q zAt|A@x4&PpaCx+A$;7xoqw_12!{HrLe0JDf>-9#>sm zS;;@Z_we=gty>#d8h7R1AyY?3hlgCHBAsjX+!G9(@)vmuQ&YXJnrx%5M^(g*Ca$&L zI_hob)8F4;7~vI|zOQJ$0&=ZYUYKScf70~B*Ll2WeU4*aAAHplIj8E~wh1TaQ&nBVo94H@2_I_S{junFUJvx_-EP~a zm0vz>Dccw9|JO@pG|SZ)U4eW2bY|O*^S%#ndjNm|iu=6cjm%$4bMGcxsN80Y#eB;3 zp2@Yj?sI}L?AFy**_B50^EkR{-?QOWDKm4Fitsv;Vg0p8qog%tgXP1~Kc%p$f7@m0 zIqDSjWX9LrnB!b5xL<#Kq_m zzSI36&)GCP?P^#%Ha^}rysf=`@55uqe(UL@zvt61pQ`!fL38tmBky~i+4S99c>e>FYWkY7M$baI1gCJ3y8A1gPST>H%>z}AqYx|C15%l9s< zzgCI%7I&P4_P!yG5gGS8+;WN?|6%7~%M+JYxW?;lX-fq5<;IiiuzUSkzUbxD#_oZ0 zM-mOs-!AIb+n|=oN$S|tRAv55*yNU>kG)-n5}F3)HgB062`ZX6xM9qAC$asbHyQ4Z znY|q&ZZ4O2E(@bM^C^}SXSS41xRgA4gmik}8ntxNK5(tt72nMGb=rHhZ#J&$JIQ1X b!G`d~Uo`tN&I~@a{%b=-VNkgs;j{k$TLC!h literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d444e147e7e9fff6671a4387d00be8864dd6bf6b GIT binary patch literal 1549 zcmbVMdrT8|96w~DL2(*^fCh6OnrTOSuimviDN0|n%vPvOFiPh2?h2>$u3ir*M48cS zA_kc+G88rQkII@f8yv!OoGnO^xENNZtN0{;^B$e!t({=kxu3 zzOP%C>wGUEenLC|015Wl7MHSuk$dDY<@qcnyhmA5Wow~4PxQ#;w8R0~tmx)IyO%EJ zTpZ0-EIZF-0zj<5=NHO_jyV(~dNp(eqX~F@3L5}2X9j#Uvy_uTH&@IHM(E**HVEWd zBUC^*5QopqmGHAGC2n4&GoPtk${1K^W)_$kpcDgMPNu*N9Rvj2a9E7{Oo+Q!5Cyze14dfLidUM=e-5KO^xz znHL2xVv%->WwH@cl)enX>vK3>85aCQiBeJq2WTIRY7p4#jl?yG_RB8rUm34O`|~S& z9PHx!VwuD!_3)%e$x80t>?i_M)KGIJUMUJ)Y7v<-FDJ-$ixE=3Xjq=5OsLsJXh}=9 z-ek4ns1iP=Gg)n<2{)N7W}JxHcpX=tO<<_WWU%2j5=E^oU%mvZGp^&@?|dHEZ+v>KhOL zt{Jr^^~>xo)t!ZZJ-RCy`h%BL$#Hl8FpNDV9m~kt^IPleb>54wy(!LZ{3KW^Rzt83tmbbrP|r;i3wl5$Ap*9 zXy2aJd@uEK>03k<)=>RWrascdPA7Lbw~j!Y8xoDN1M?5|#^&670jAa3HXS~aT$DL+ zbX=%o!J&!h@BXaO@mGol*io^k6V9}2S~j+p_)nN^IOH%K3c_3k2+{YR9TT5APLQTvF>#q;OH6!xcZuI&O+1`E-F7l+0 z>#eoLg}Oq0e|9QyuX2{`Nxq|-kWj1de_Zyy?T7ZdEniFxO)o}bt*y{c+ev|y3iy%9^?Jw+dRMOpEkqn5 zDuxKdxGgFhW@-!qqNvF#Dt>GR%!Eu93>XCkhd9vT<`6${R|K~|jDPHsyZ3$Xe$VrJ zeqXmUF@D7~{%k&v$D3v`8*JPP1n!U^?)f5e@F2GcSYs-iM5nV}j3IbhC+#2riwoO8 z*a*y-yRn&2^LUdf(w@quTH{nW?Gj@F8?n#j=FmKzI>zV5@JxaQ9K;5a(twW|8bN?` zYQPkkRbqAPi44-5#}G+*@pe2f6IVLHnB{=lr{V})1d9PaR~F?_`841duZr6TUPB-- zX2ND_z}KQut%-o1W(YtgmWyy0hJk3M7?vqeM79(_B(MyUC?QxPlE5lhqCzCV_yuy_ z7-zc5W-yKW;!YYcgJs<+2=aQpVlOJDnGF!ER4O3}0wIWqvk-Z5DHijID35T0!9aL$ zhIF$eO#uN$%t2?f8jw@^Is}*7YJEdYdBzjPr3~_6ZU`1jAeSo;*O;}3wGscyc&oL? zp6ezc8{wg|8Jw#}x^M!_Wi)DxMog$l4#P&7!l2bE6}uX za2)UaKe>ZAK~SJc{?jxQueeSOY~PFkcX%^I1jS7b!;Q$(1lv&_FR097(As^SXOmZ! zcE*McQa2-qJ}3^JQhITp(7m-nn9`(V=7)w&3tF%zIHR!W=}q>?K;N(SkoU9VM4#kj zd;Pbo6V{fQgopRE?_kYR`dkT4i?@fmk+g{Gp3}BJFKdViKwC?4Vb&)mpC5K9W0{dbgV%>9P$!lvP z`md#5j;Q&qES5QUiy9HA*JKJhhJ4N|D-X}a3xlicLrXgF{q&k$&jtC#o!+YMf(oqP4aCDaX;F{x&9a%_EcTeS7#5+ZhM2hYRzM3rm zR9V@T5u03_?BC&>cm6?R$c!y3;@V%mT5>#Tbd`GsTK^>P+6iGo<&!OKon+6c`o)%S zW%I35N>Djgys2dLjHV>fSikv;^XJOFWeBDgE_vD0+ER64_|)lNh7MG0n|Hq)?R^|t zD9yPy(lQ;XJ#CHYj=LL`yO^(j7CT^GzgzeqB6Pm2;FZ~2XxXoe+}*W)edD6rk4j1p zLNVuOl@1Sg73o_*$xvFv>eiIu5i2iuy86Y8G+rjZ2&y*p<_3QK7Gu2Om@cjG9}*sI Aw*UYD literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c2bb8ff7ec1b68f7865874cef564dad228f44ed5 GIT binary patch literal 1857 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 literal 0 HcmV?d00001 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 f7aec373042e346e43ad23e5d752e0560d3123c6..dcada5c610d2cd64d09c7528bf366e45be536005 GIT binary patch literal 1687 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 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 0000000000000000000000000000000000000000..0a125e738d77db1d1db7b978406534296cae7d9b GIT binary patch literal 1734 zcmbVNX;2eq7)}9)ii$v_plxvtND#@fIS7eFAQzwzEks}>QgbY1CD{#|#e`^4TdSas z)RDqaYEg6$5Y&295fv=4hz?q$3@DyavGw4nB2ct;gJAo^@ke)N_xs-Od!F}xXY-fJ zqo=veawCyQ(_&*J3B(FG-VdFK?@QmOdx>QxE=|D`(RAFb!XQ$V7F9z)tU;9lB|s`| zPF4#PP9ixYup$LdiH{R#Py=1%z|buQBf%z-!Xqq3l_nFy0X38XBSK1FeFFu6wL(fV zH=Y@96hk^V#)?6SR=GlB&D8LeJ@ua#vm1rVhR-1PjtXi9g3qS9cl!`;<1VYLCG+p zMa`ypjuO3zSOQ`2YDg=?Py;ZQV*&gQA2fU>o26E(Xrbv~7%fc0VbRnqwwlIKshPY` zt|pYvVN=HW+W(U~2H_CH(Io$Anu#N#6CK;PBR~jmhX_K5$-#&bSrF)Si9~Yhjg>?x zEZ0vLEzTr=HlulG+%34!<%wvy*M;Cdsoq>}XzV4U3~KRe>Sg6c2G144{mb+Jc%^+G{7p@&QrLsUK1F(ywWa9SALRS_vwPOuc{VaU4LjV> zfGP_6o8~=o>zKR7IlJ-;+bn)efY;jX&{@|bbV;J;O&ysUR-E}HrTFlUy@!I_f7<9e zTr=YL+$yxzoweRk=)1dDTrW#iYQ2F%(GI0%CDT`XNxolvqkB}oB%$hgxFq8v<%UU* z`fk6L9&ZAtSCGB2zH2;b7Gk)sTQ}O4Y%hH{-VufcjnAHaH>7sC2m`ZXip>g zm%br#+su>R_pjv(1HJxgd_4GPBHq;2<~h*c|4mol5Ur{_{bR7c8l13MoGWY7q%5SR@Smi4Cicq)u^26;-n9bR`zz?HC}kpvFh8d(`#E#&Rsk^ zJs&_ep2miS7p_r|Rn$Z#%D+Oq3;U14y zbA}=W&N;`cr|))Wy9}{nBU3l0W+aQe_x^sx+OxiHC#m&dn_dCa*B~~hz92Bkm@*k0jr*Z%Q literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1f96e3e3bb3f664e8e68115810458e7f8837cc80 GIT binary patch literal 2667 zcmaJ@2UHW;8V;hywc)Nj3m6jvc2XuGq(Fo~h~T5CAXp(~A`wGkX4nLQfS^bbR#pW> z1#k?#%sF%Ko&Wp(?{8-&-pgb8l!;~& zQ7F_DR~POoj z?qqkl6BsCQ*{%RrZ};#PZVwVNMR@yVI6D;!A&`PFAE%OT4Te}MHhzegg{%jUNqF3l z2^_@64~z11_rf{J6d;a9v>^xq0Kn0iM1aPiQfO8<3K^i0$V?JICXfLZKxR?MxRDEw zcvFbPtW{jzh%aQv#s|W%oJArjl}e(LN|Y%!lK>`@Ng`876bb>cAV8tPFkeLohAc)I zxF94{NaV0Y7K|HYoFH+?N9C}@AcYCi7<7V|VvVo?AdMgp z05$}sHNdA(nM^X3DZrBuiKM~S`AaK}9wGfXxco90$mYvvfx*Z;DUiY0R5DA9LXD4b z<#N1LwQr8x^0f3ZEzQl%(S~{koJgLP>7lxGZ6*Co+)_8cLjA1iNlQac?n@6meC1v7 zP0^at5=J4VBP;#9m*eqR)TG&Sjh8H#Jhk0dNz2SR2lZJS40f^OdAfCThz5gC%i*xQ zzkTq%oNH^tU<9sRV>M&?Z#o@`lHwBQ_W%3%&uS&(1!GOu&kdoT^@a12+!k2eE0Csm zyqn=tv*hZd?&4xjhjBs{&c@o>GSbYX1M#?yZjs z5}0E!v`y6!xxXx)=JML*W&M*U(%utYGxn#Y9g5VWFI~EnouqPrU&T2-a9aM+EJ9yZ z#ou%%c3TBOzbTepg|2XT$_+4r%f=@jv$gEn_2I{)hcQs<$4iVziCe`THRL{@Yy!& zlT~MTS`GE!!?V~`g&7Gw7oND;$x9?GF&$HxPtAL7YjvR2*gHKTVd8ys+?z}u zzaOxgzA;PnI!DtY7N6O((8%0$K_&f>EO$j%#uQm)=AC_!B?Ic6`_U^?y6WyyJ^g7Z z`uh6dEgt^u!D%zp=+B*S z{CHvEI+0X*HhvYEfboI4vY=cqag^wx3;z>(f+&RoVmHV zGttT_y%~tTk^P5R71<=pvr#J_=bU=|R$-@ue^J6G2lE3HFLp)fA3T69vEH%usovpw zhh;eIUX$d8m~uOLG-@{lFRWYgE+0C6Z~m_)n(7P_xzQbT+_go^76owdSE5eBWp$di z+KX=*gfpj(oe5n?%lf>$v{|bhNaR!BD1w~J_4({f{zkPS!hVK@Abtc%>aKwCNuFrC}c&)MV?-(b8kF*#oy zb?fCTTVlLTv=3Ty)$;G5M1{Ze>nQH;FS_7Vskw1q`7#ce{h!Ir4bJDV&z|!GjB>vF7b9MIM<~asL F{|P4>e-How literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6f9a6af847a3424c35ba374349d85539cef2bb49 GIT binary patch literal 1734 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e989c11094c0762cf141bed98dfbaeb277fee7cb GIT binary patch literal 1563 zcmbVMdrT8|9KX;AjE7_KZA34p@qxDYC@sCS72945T`YEOkupv6dc8t{yQ|m3w#?~f z;sX`842NUtbV#BMWN|uiibLmcnFj0ra85~7oVYlrP8?2@$F4}-{xJTrOYXkE$M^I3 zzOT}jmy?<_ISBxOR7);tmn0Z{6XT?B|HOOyBr!=exkLx=6@!$(0D2GaW( z@`P9Z$Y=pT#`&Bs(Pdpk&^)W4qB@EY>zB{~pv?~XDY}#qK{r$6<8;u26KxRa^XQ-g zl@+o2jZCpGw?beX6?sm&qLjuxQ1${)8zLkEmJum1#FlXZBBX9XS#6+^7Z^~bP|Il)MZqjwfvPl0Of?V05L5*tIE*541SL>}zz}fcfh22!$4l5r z^N1~Jr-O<`(NDl|Fc?$>l?q-cf>9jDVFZIQOfG5217S|2LUJxJJ;p#X0b20+MIXRUk0SM&laR4v2QKMYYZln z5|zTovJ57(+MqNTNuyE~<9HcXjTjI;qRBEV%~B;yDqNk3kQ&lxKvAVhk}<4>3y2g) zGcmh9$?gbN{Yorh6c|e61t-s!#X7)N%!_=WnD>K5<8Z~n*#$n%!v_O%q9uABG06zN zRgA|h@GLl-W5V|mA7~s=Vs1AjS9?*7TtjDKayO=Q%QGoAlBHJBYCKa3jo>~1CwH*q z5FBli|1?ePNb1Ds^2G>9n-@dGaMI)m(ulM#|Nc4v#2GE5-Wj^uT63cL>cX@QY}u)8 z@6GIjn$y2r7~Fj8;)cuC>LXe}J}NOSCoOG4Lg%u>x98V3HRU$^G3RV!Z$H!^y&0tw4`ZwA?u!Igecm*0$9X0rW$FhT`|;|^!5mM!fDXh!75&T$Pl8^`q@eD)~v z>qD33&IWH!Un{b+!+S1ka%#h#YoqMHBt#Yj2D%3vIG8?qW8IkBg;yT@O=tAHyByQs zx;5$I1btOJV*Ai~xt!kp(VJy0OS|eHtyr6ehvWYWJ}XH!pLDF-o_=cS)2$0$U*-Li z1cl=&AU&LueZcSlIlkGoZ*8&+s?V2Q$Ug~V@e?*xocwIBH#J_l-MIeZ=f8yo_pHc` z?kD5BF6BW@mrCYj?}^aFPxI%h4qPhv&Q)-A%TP^{40AO&>!0e=a@BWxD;D91f6A<* z1)JOJc2#x@g?$~~>YJ7EP*39co@Dbt&E84 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..92065865d9637a4be51abd22585420fc81b46f40 GIT binary patch literal 1908 zcmbVNYfuwc6pjQ_KxH5*6>P^f;F~-)At8wb%~KG97^7m;Lb6$44aw%QkOj4^G8IwO z7LXPNv{tc-Xse>5NUd!NRza;)?L*LFD`>eCP3rovH#2d94unN}d zb1mP(F(eY%gs4-n6lJ0iLX8ZqSB8Nb%>U zTqR3smcp4xT%HwPl9!~0@(hqbPn#DD#Na|gff2^E0B+1O*@U==Hl$Zbti8uf8Zab+ z8AP-fPNgW50V!&Q0WO0_hd>Ynq6G|)%jdAUkpP_oIo3^NOvOuOCAuyYuwHG>HX1Og_D&1AFbgaqA|Yr?cR-DC?N(IA6u zkQFgw2x7fSiDR`Bfc>7h+ZfG zr4nuwPbTI|Gla3w4* zk04Ph5sYBtO*Twxg5VLm2w`^^3;rioD7C^`47I9JG;5>+k~2{ZwPm7aKq?)|I52ZL zV$!2_+bnO2UPLT|tw;{6S6ERaFvPJCd4&&%$D6Nha z&ErBmK@^8JjMx7k?wEu_OmC6=t7t}!h)VP>U$y|TdD%p;iRc_F(IR4>8?%YdtB9A0 z)%Z{6mbE2~7f+}vZ#(t=e zC#xyGWNvAW{r*79y83&XR%#u8!-Jkj&E>ASox5!cm&-Nh!12f>aI0pHu~;F!uIX(2 zIEl(VQ&`vCe=NJ|%y)5x3A0NY-aMeaR7mjXfEaM~|EO zx@sekO~FuB)jh*k0zAZ$Tiv@ZBG9!X`sYc%8+IPP5D+C8m?m03&Ncmt?PnJ*W_D5Oh)|8kUE9y*1z(kI zEeguN?kbvj52RBxe&a5C${as_9(%nqguJAXYN1C)?wt}?5X|l5Y5{oY-^uS4tw}>cYV%PbLgH91hgy z55KT&3jNIo*tOFdx?|Btql-2DcZ13r=n>=#Qyx7m$M0MYYbq%lQ+_|mysKwZc-OJR zZ_q@svD<~e@S)F6pN_8HcOea!4w~0$Qh484*6;=rs0Z9z*YC}YpkxA7dpq8s0DXOZ zmi=LcH8nLCXZ4z=fBr{(%Cj-~1qS4st@zzLT^+u?rPNuANTIB&>ZZcVaO$p>+JxsE zvV+tWM0QuYH_Udh6PL;>q>c|l)xN18vD2oJJ5St?Tv;9*Kna}LJ9gB&(g*81_GJ)% z!tgbD72BF|pGi}@g2uYP{($42L5^GaEPy+Q>hn(K8sD-#G3!H$EB78Xo!WKwNR8~L z?wlq})pDfh!lg?K)o&`y>E|m_fqq~v{`#M1HQzH2W-O*|5pGsZK9%ScPjosB^Wz3@ zx3x7kw`cL1N~IK=%?4$_77KXuo4OlIo9oY=3lN9c(baJP10_131go(nZ=(ObJ0pqPol_+q2-X?1g4%s{uhfJ7#>bkLWI STs39hdoW&}Bs(fe+xR!FLi2Y3 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..36e2685e94770657c35e40ab8d75ec79e2a8f99c GIT binary patch literal 1747 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 bh*5;=^_O4k7uvtG{SBq!1)`&Z delta 1998 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 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 0000000000000000000000000000000000000000..dcf1c5bed3c482fdee2d69b95fc03d027be805e4 GIT binary patch literal 1695 zcmbVNX;2eq7>=L@5L!9pa-d5%EShUKcOXQPO*CSV0xDXnZn6sm$ZpsyCg4;Zq$;#_ ztRqkc2Ry1`RZwgPtuoeFm4b>ETc=pGAdFaTfuh9#2eF7$IW@b?4s5=3dzs1zcDvLPhKh(`$n2I$O4CYFpL zXhGihSS*9#ikni?s5Jdjxsfn)5vL8;Znn^91|wE!w;;wGi~!qkPeG;H1NDL5h#T+9Df`CNE1w~Q;Bw_;)9~ANUG9Jk1@Ig7qmqUDD@?z26 zNHjy93~MKS(I*8fi=r%Y9?xd8acu%FL1ywmnM}sxLp%uL&=wqP0Zt)y4sH#fVt_HL zku+H-6M+LxM#MnmQwkQX^koQUi(dbV7`IL)icT5Nj#zjgm(MesopDWATd8F1Um35p zwx$+XFkUidCGtrlU5||LDKMS8H#>3~(rV<(NE2NYBo`)(`DP5Kbg+U&f8nAgRIUQm zDv?kO$4gZjjR2&>ha@VER;&`J)UaA0n&NmJRx8yCq_9w?6^ex*s1d2eG6>{zmr($8?kaVi6In0rV>Q%R0kww5fov~A}oMfJyCJs-IXRB zC2ZDcXNg`$3}d8eJ%(yY!VFC0SZ;ca1{szC8YC#hkr;&_M}i6=jzJ$EVsm z&aH^~*!MlZ>Z+>|mBq0q2IlPY^FD=|zYFNY*+sk7hWTe_MwWK7(%f2$j;_lLUtbs>kT}k$qUZ@L&!l*OpE}gifaZXi5X#!Lk@x&h6J<{wwE3`-2c4YN& zpC}*q3wQd5ean|bE(!#~Z_RQGgm``e~2@*@QY)%fq}xN?jw~hA-`=|bz4`t{}42fjWR#- z^O)gCV@FkMn8IMM!I>jLU#;eR(=$}yxKr`=>AtWqnaiaceM5$meZ{3|^UHjee4AdST#GGl zK0JGr+|=CEi8qEkbgk`cb$B~o%&q_X6Gi^koY89n$8q&M_Qszc`utHaUewm$S@U4S z+PKKkyeGo0xchSu>>;}*kEn@p?7i3D9@*Yw{o0Tnp3)gH8sy;}diz=3?xp#hu`jpJ z-y~8nuQhX0`dfGOcY7t2wG~&rr58S)mMVOtc)Dyj-hF6Xb)%&2QTZu1xADjCTv|W# zSyaR3@+}ttOEmJo*0zu|Ip@rU`@Q3nKPJL_u6!|mSH8K4`k;zLw^MxWT-Dk!f>VrgvQbwUOb<=uj*kE9aIKJAWBE LO(I;UT37TBwT*^u literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e148591e4fe74aa843bba2282a42975c5396e25f GIT binary patch literal 1904 zcmbVNX;2eq7>=bPjUWo99;2`gQ|py%HYW*0Bv*-&a4JYkamj9ufn?)m6M`0s)QS|a zg<4zesME2CaWtfO6}+$(DAtOFaw-GuSdfO$w2T&8wB4ZC{&4!EJG1+J-|qW7@AF=> zrHSfSgQ!cX6bdCs87E67SHO1%JV!pK7JH76%MwDKPNZO3A`iw(FEr zM)J3{q0tnIpUIG#PNb{iMHI^0^{g?BX>3{(d z)6;k=mdY$e^@h0ZIGVCuovPWMqY)zXm~}w3T|^QXQ33|+#$1y{WEaz?c}3*j_Zp-F z(TjPmM60w@+47Y%0N481|cR3G#Y(zOgd>s4q#WK1$Fr~szECQY$FdY$J{N-IJPDV>S42u8 zc?yAq&5f1LV3j5d0h=`Fj9&xk_c2ze_)n}zilZ=r;i(vwJJSJ)dW^sE0y74`8Tr6A0oQTeQ>g6hx>b@gmc35)w_l?ZveL_{v zk8<0I_Zu37Th|>v*Iw_(7YIDmiZs{7ixqW!eOrd^oC$R%|9QWXEV4j4Hrg{-l$n{?l*`XKQ~z9Nwf6&6Xxg}5zf{#<>xt|BOg(l#;`J{%wn>cI zTaln>-wkW^W6Q^?9TQDgD)WavXb`BLrN!S>Q&ZzC93B~APPW{57VX*XHQnF+nTUY?5`%N?O*ILv;Mm z_ABtPQg$sR<1a};%jaOZcTTlEKeuIn{?5oNO%v|~Y&k#d{JO_p73F573x`$8&n^I) zowYUZvdX5`SHy(Ac&=pU4+CjU9e0857gjW96=ylTH#R2E&V4WIO4Z2^z^}p@0&_3M z_^nk3wh5sJsn?c6UGHKE%@^VM9^+WyW%mO|$hP3}_&>XpeSUT4>VlW$H`;7A$uI5U zgFi8+_MSR@de`|@)!=~(QERf+MGU7i=S(%$7vH`!F<^V=b!JKQTN!WouR2^s>wT%G zYs0q+iOQjDsm!{Xxh;U2@=%A|8=@u7>%G$ySi}lAjUR}%bku)&9j`g5nmki|FsWf> zDZ6>3dNq|Zi^|UVgOW*I9UuO1$%)~H!jm^#qm5^Gu8l2g3Gefq+$6U4G`~_=nsq9u zAZmfoeXGB}$nAD_YZF{MIxp|LJ3`z2=|M?UR8)z5g~haQ!^=C=v@*H7ufM;({H`uq zJUXZ@A9=o}TPpf4_0vQb=ir5o&Pu*+;i>pHMoZhz-wy7N*6ayN^S)Lzi$bftIdN?v Q;qv_hm2$PrDcM^5H|!(=od5s; literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..277099a356ebc4cad85397a26c6b5f69554b70df GIT binary patch literal 1700 zcmbVNX;2eq7+$cB6x1q$D5bgv1r?LcCfS5U0_NgS0u)k$)AC5n|GrQmS?Y__RKJPWV zBPJ?rhO4(L001*0!lkj)3Oa5VXX-gR@9`08nNP|R$T(a}T2KN5L>gR$fe{8Y35&&0 zO-9-!EC>Lm81;$-GC>|GP~!#$>aby04JHZ=06`&E6RJ+ZNKl0(>5W2~y|#e{>NP@| z5|K0ICJCm~hi4L4TxOI)otdKMYiJ?CV31Wn5g0HM1+9iuqgh}T(#ClO)ZXzLqJiTk zWQvgXT2z8O29)3g1|keDT@Ax9$m26$B#_NQR)8!fj6h621T*POSO7BxEG9T{(I{_( zMk|PwhEDjRPC}ZFBuxScvREt(3!8xxNf6BE^C2b+VzKCy1>KxsBvC8fX!f0CkYZ*v zp*N9w+z2`tQ5Bv}3Tc$m*C7~8a`_u#qj@4xRLUSLYJy+}6EYYaagAG>$yn@P8E>^V zD>6(N6pNYhbV5zlL+d*UrgHagM-D?ujUbxPQ$;~jrMNoXfEmdMsgOo}VQBOkff$yE z5e`=>3KYv^Y?un4#S_ayxnj0hB9*X_NshN+MLZUQh$KiThs%Ls86uL(cv6-ukS*p) zrD7>}5*uMOlc-URP5RYSekZV;cVYz+0z*lhP~dp#WCz6Pa1uA`a1$tzj8`07s?-}b zxW&B8QKHuoOEE&f3DblUxB(o`u|WS84SY-st9Tj~ou}r&be@L8qN{jZ4V|yWI4V?& zU_3-co4{-SPwpT}5aei*|1{0yE2za}d1>lT;hZdh5D2z6;#T|Viy624C&v*q4XTYX~Tt)JJ?8zcRGNiLr5 zs*uMN3OqpX{M-Q7b6(#)_tHUo>dtv2X9piHJk?=02m8$ATN0fFZXW=jRDv;K#WN9? z0ojG_ClzO}>w0!N?^S}cI{UY}-OS!yI;A$JrY7qzV^N3tuz#~>w(l0YcRmpv_q_-D zL%i>a__9$TzBEcQ)$U}uU(vR*95^WBP21{(2KwAB@c$yBF|$6ZYD-j4QDyt=_TLls z3~z4i^U7n5t*WX{WKDm0qowdC-wP`J*-K;YJFGFrlVNukam7J9Yl^J{t5)53cEz(e zrSn7AZFBp58al2C%5M)x4h=kC-ZfkXxhzaQxHzbG(cdGL%WYoe^^5B&Gj9JlSX+2; z?0Bag{&MJUb#L2I&!+h91uebAiutZLKV7iB_ROtR_kEXpx9ttAd>Evw{L@$!eocFN z(BFN>iYv&_>Sw{u%g=kH2Tgs?^2jIX!6-jF@66N7wy<`WhO7;IxpnA)y0IQh%l)8! z?!8;rB4e9Ue<`0KK+Q}?2q;?@MLAIpsF*{?*r{MYq17j!PYHtDB5tm z741)++ShhctaxN!+HC(uTvEYQcLj_F69clOu7#$itTuac&wbk(_HYp}1xUR9*{03& RHs?A18xgW7X}Ne~&ObsHmM#DQ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8b53f14794c125d8e3a90e6baac170400ba20819 GIT binary patch literal 1905 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..848934d6ad8de678c8fbcc10efb06f3751e30cf8 GIT binary patch literal 1662 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 F`5PP!kjel6 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..68631438a7353771cb4965b7486273b4e951fc8f GIT binary patch literal 1795 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 ntSRG{^hSP^M1laMq?376a;(4-J3##A_1i@k# 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 C@k=!T literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..567883b0755ecb8bfb216febf72196845706cba7 GIT binary patch literal 1578 zcmbVMdrT8|9500_Ds1AM4u*Q3E@Q^_de>g*9aL<4tw1bbMdhKwad(un^zOV~X<-Br z6Gi9d9CL){GGH?TjwsGY1m}EA9q~OhnNdm9NHU1-VT=Lhu1MYfF#fSi?tZ`D-S_kP ze!j2Uo{_dJa%#*}g+dXTl1w<{6$sqnO8GhZ?r^KTL`&8zX(eAM`ACsbm}tI$0aDzg zlW{O4UAplClc-RHa%^Unlx1IzQ@mSE25i)Rw;-bxio_(pKvFJ70ty%>%NfB($A16; zmNtTGP`k!1SePOAs5es?kF!Tm;XoEMk(f!7cS zjGIU=*Ebu*llLKs2$i<)L>+zeaHs7_Cq z3}&lU3(Mgn@n)+{Z`PVEghh)6IbMZDP^-;s(xWz5kHN4NHJNN$bG*)EFko5&BXmJ* z3g?kXj$(p-S=sLdR`*&gZV?$$;>Ap!FAjDh0>8im@@sp_I!DaQ<@^S z9`j+fKzrPbsvT7yR687x2Ue`FthdCaZpk<^KOejIAUAtfZd-lRsfgz2ThIBAN)EPO zjjOppcW3Xe?X%t=tC(Ha_kgJA?XlLUX1C32Cg%2je(CgYtL~3HI?{aVP3ND_%5|3w zbKi*mRsnr zbEtl!5;>8z_|T4l`lAE!SaI*>8IhsWBA$k??${G{e0|r0^p5@+7kV-mv8&tr+t1(T z_O5Lu_cS$bIC2ZD?fa(ErEj?UHxNE^=AzAu)yB)$|I)`q-Xad>blvoRzgF#9QH^Hb zF4iN?^vz2SMVNb0(=SICI`x*p-Sf!TuBLS(^`be`E`9E4riCIF)Hkm;hjyZx1Ij_ zM%P#iEYys~U$yng50#%4#^DhZ#%Os^#9yo4)72{-PHtS$ZQr+v@Ln?dD!QB6}~ z{M#6)Rw)3cIu?$RyaPTxLr`Muw>9v-G@pafm-`t&^e;5}cvCyXvf>JodM`J-C@ q*i-Mt5wE_%_#|WJ9kePbWRjv$XtT~4Z0`*Gy;H1d#CPWWs(%2uBuu0L literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9a140950d0262001b4b6deef903018187bac8add GIT binary patch literal 1771 zcmbVNX;2eq7>*Pu(xQ@Ti+HUOs#22O%}G*%=0un#LO{WBP?F6CA|x9&3kk=lfHz`c zQ0!PobZ8ZUL6B+%L8XMsHQHn^5X;2`@ppHRRs9Kwx z(1`j|D4!Vh;gLk7;yVF?85nB24Z~_Mk!T9Vf0fmwM&eKc(4aATqmb5r@iGn2YlXB3 zjsjAcBxtODO$v^Nr6|LZlsJU1rL778{H+3#z z#0hEdL`5n>011Yp0EfY)BQOjDJU#>F__3HAUw{e091!AzFhqx70SpP45HNMoNN>1S zCs0Y{Q@+TPkQPf2CIJXqEEa}^#lY|w5a#pwAjAZjOgd>nHzykjwUur(FPmnNqGklw zn+QE-1ni7z4VFjw#d~6-c`8w4%0R2y1i}mmG#Ko0O|Dx%;>yyCJDYuol;oMN!8~F(lD|8i^pOkVbxCX!Tlw7?y}R zY_3$~Czi=rFd06RCzi>%VwPAUm9RL|93R3m`4S0R0<+{Wmk+}-j#$Fyi^WnglLN7& zB9VL=8)P&SY9oS9`_+?vr?AYAVg(W$RTCH_rxjQ!mq(xb_rR8lYKAdgo zsjwCMKB~W6y4dEN`pxXp^&!u078Dj1YVYt*?HSA5e5t&)GHmnQ^S-r_5%<)*7PGSE zaP<+TT(zzsU~5QkXBnI=mvq(F*W->UcfJiWA9n~1yRi#Iv^ za#VS0EG)3UW0tag$&%F28(Yp)*Pmpywi*sS9&lXtDD$B!%Kedkm0IQFOid_q&5foy za%trW$2!XP&EU>|JP_Gsv*icpbUOXfG1}M1xSkse5ntF zis#lkPTdn>JsHQm$zQL{L?!9y9nf1}y) zV0sM{lIu~s37ntw7xIc7a-A{DofZ72zcTLo8CBa%rW_APU~!%AQ8DsXGg!U0F_Ud{ zbI#;Rb5gH1Il9&S{`4}IA-XThU+!XwNSt>BeSqm(AH|Qa_S_KL<1jB^VP02u{rIAs zJyzF~1>N24U!s*=&8;05@Af4#gq%%fNAxixeJ`LSMeEG#HLa1isZI~G>1i!DZMPb1 zw*n*5Y=T_}ipmJ;Yc#n+Tj0Da8Br~m)} literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..171f36fe4061d6bbc9caed663f50bcbfbe1b2efb GIT binary patch literal 1771 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 E00VMBWB>pF literal 0 HcmV?d00001 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 c9318fc7a8e58ef8e0321ee27d28324cfab63543..01ad9a198a5c703acd6eb8513ee73d510d2c67b9 GIT binary patch literal 1756 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 U=gN1Bd_PU4B2|7^n)&H}0F0X#fB*mh delta 1444 zcmV;V1zY-|54H=CB!2{FK}|sb0I`n?{9y$E000SaNLh0L01m(a01m(bYSxJf0000O zbVXQnQ*UN;cVTj60B~VxZgehgWpp4kE-)@NWrZ?j000FvNklapX;TotE;=a8?|Xjk_e-@z#~ec!{LA- z8-?2Kyh{R!pcnK4V9<#_V*=^48jl4~$Miat3Tc}Es)r%!LlcO{g3V2i<|ZEqasqvH zi1LuAq)B{T#N%NFm1Ezw_lg9s}aC#n&=iI zj8+hc)9J((qZ=zl%?zEWrP;9UQi%6jY!-%1=3z8}>3?GpphZS70h|~Q0w_gBI4Bim zh03xdQ;F3wg#oAHMCKqs)WcY|aGS!(A}MTxibg@p1h5Kh7WX3h-u>*@#KWoSiNeZ4 zd2Q)waiLhuZEogEtNEq;%#*@wrCQ#umNzz^?(VI>c~gIT@d~)OsGpu6y*%DKJF9^N zR1PHtT7M>hb~NgP%juLQDy9cx55COK%uTJ77gtKTqAswyzPwW{19Nkeg~CFinA_P~ zfA#wLQGNgP^a$)+0H{>gK!UYG0JKO9f<}S9i_G-&*zEk|LhcbXmI{xT z^FNf!%fR8w?Vak{{NnUhrBtb|){eG!4>nFtYk#Nbwfb?Dqj0wd~R*axVQfEo!#wGaYQ>8KV90cymT9F9)SjB7C!>@2~k z2m#Q-X1@wEi=gcD^<&K7P&|7-qs18on}2dL8c#AARrO=yFo00l2S$iRqCqX8GQ?Fq zr;SVnEn5M8czlaY4FDYgvKv$2V_>63ra5~U^u#y50JB&B6dK=woHV`z^N`JsPX*Aj zUj??Pc?Hzn_a9*j=!dMI0W8yt2+~{*2^ls_qg?eg6;l8+HUw}6xH|q_pw_^M;eTM| z_tqvajhIUTc?h&Di*OFA+TS98IdTfl1@Q5x;o*{|OtW*OMF6x+KomuG8qEUO0dp8H zoL#3dn$3Eqv(~ajphX6;FPUALpZbtN2wIj!*dpUjZiN}gwYi5iuS5d;-bR2!MgSX# zFZoh{r>SL(3Cjd6umoR1zYmx|M}J4h4FaH;wUOC2vPMWAMmu>-Y>R}<67rReEbD1w z8Nz`Z4J&9#Q%eK~#?RYGfwVs(WaZZFjrO+OEi}m%Avr>-ZPyCm!T~M&RdjZCBA;$p z!L!@8{Wg{?yM*l9$fk`PwviWvl!)!1{aOJKLI5es1o*$m8leN@JG;8weSdefcp{E# zLDK>u)#L3~T)ntG?4o#`0N!4pZETUArj`g3ptu2+U=#e(ce#29Ua2gfsKz=V!;@0i zGYoiW0f};xn 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 0000000000000000000000000000000000000000..480468466a36fc6c05813244b66c2b7d4471f3ee GIT binary patch literal 1762 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 lNgT*6#W>#weB}4YG9`{sxEf`8EIm literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..92043ce27593cc3325ee19d04e0fe90e126bcca1 GIT binary patch literal 1753 zcmbVNX;2eq7>*n^fFKS|1rgkaa)>0G4GAO>P?AkBg&>zo>(wRMkO;{pn}r0b(jwG@ zYCMZd6|BSE0@efYf+8p?1(9kM>jP;*MiS8&6p^Rt zE}=mbils&s7f-}XBlt2*%|OgH45M00qA8T1g+?tROF{`C0ZmkCf@y=N>u7*V9!y)# zkus%PA*xg@PRG&M^vF0_dXkJMr!5Qtf{c8UK#dXzU{oh-^n7D5ZJd`+?#-`38Zd4` zBn8vnh>Dj+0YVH%0S+U8E`uNl2;?y!4%eT>@dH>)hyyZtAjG6IAwI<9vzWldMI*i8 zas@vI7EkyhPr)=LL1_6PXfPNU27d;ICxQ@<#{-!xkj0{t7Ib}@hCqyTjoxFD0Y>#Q zT%{#cm zJ}ym*f-$HbOTlGiJro|3U@~{_cVsps)$o_#DzYd@GK|Sm)ToA#z`-=~3q!7w^97Jl zz+nf#p-0_5TC5TP1!a&U4)8~|}LIeAkgaA=&d zvvFB?Qf#zi>-zg+?99!cSyqr|QO??J46Ez{t9wfvbsycSjb0IF`&jUqr7a`H<8ebB zP~+4js=rY~y|C5f*d$urdn@Rm{+t$X>CAJ#Y$(=ae~u}7^LSyB!WggJlIWQYn(A=n z(Rk{}Sjge)Ydz;oo0?TtX6vd9$g}z4tb4bXJF`uBz-z}C)^|YEMwH@ z-rjtoF>jlRa<|a}to$wfrl#6D3I2NY+fNGT(Yx(Sq{nW3SGMWt48RoMwLLlWM2mGq zG`-e$n^+iRGX|vl^?1}<|8do+%OUlNWqUbZS#MGnxZJ1gtzXsSQF47P!J7s4A9&Pz zUj5VH%8(M@%Xcp3Us}E5koTEaKzNNVW#_FI)zpspRSO*})@;$`1?vYpGs}F-!H^iN zF~M&4%(Rt?;wxqSeg*3{EXZ{W&%Q0|k;qQw-ab{KyUp13NcVHwhSLVqUelQ^i}uJ_ zlHBCf@Q%N{`@=4sJAP6!O!PQ+H@OblO(z460IeqT6%fA`4T&EssmK0@GS5h+=tdaU& z*9PoqN9?Pe8*PZ!{kd6nxsfwkGZ42OZ4aCLb}eO>yA4DXHV+TE4JVsQ?`^s$bRIk! z^1AVQO3jsD3!m?QIRC|*m(OyZEVz60e0NoINEx?WwH2c!H3NIT%&w)1ht_4EVutC4 zZl0aJsIJeF@M?8>fPZ?k%dQCjpx(4*V72|#{X;Gm54lEd>zCK=KXVJhPgqO|kmiVr zE=2jj`>s4tuyVd{FKM1_JnXyg<0|M#fs4}8d%AL}A$oe+jqQJ{2&)WhXUeEr&II%O QzB2!8B%(;TLhyO!KQVl%>i_@% literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f7a5739fabaf33772f6f01ce734bfba21c7f454d GIT binary patch literal 1940 zcmbVNdstIt7@uKY5V4#f2-&4(-+Oz`#<0*O zlbvTc(`dBG(xqqwwE~WB!b{Zr$m6D!T0BWf3>itNNHb=@X+cUtjssFH7K=yVm@;u~ zGrovMbJD4!V#pZTa*=}2GBJk?)1uW=Xc}!%phb@<;&Bp?wr0 zAekP)6}$g7*fVvu@aD%DC+FpLEA zxc+F6AXp;dz?A!Jey}9OKbRAYpa_RIs^dji9>NXs=kTErNeBeP5}p7Ra1lhp=JF+c zAs69}Vx>AGiRl#hs9iN>_bJvtglTu#^?P@PvJMT4R& z=WA9@I_uGb zSxcwE*{O3qw)yO+FB>9WJ^n$mzUQz9>e<4ba(fASEfe4pJ4CqzJJVm+x=9Q_mxm$tLckL`RrAv zcYj|}@>726>{T7%mPrqQ0Q=bLoS8$YT~oetcQLQk^Uu`mo(o6cDLZ&Dy(u>%qrfZq zuEF_EUqG>UQ9U2ZpIz&$-jY+&H*mt9Tae>r;}x*%8P58n82U*GOqS(n4S z7>ts{>AATNj{8pRps(M%Fmm3_V{S#bw2zzJl6fPsG&|CskNci&saldXcX><8YoBQd zqDhgEaMpCB%IR0&@{Qq_QuvlJmdCxZJrBPftdGCwQ$GdCOWpaw*Qt$<^U|UZqot*# z&E~K(k+!uJ0lih8fA$}L;<8y2AKz##EIis@-`P2}?9ices!8LMT_3s_Hzrop)VO$i zdL9^BeyjWh{npVnG4Yj|s|}Ue*S2>q^FMW>?z~{mcQ#>x+r5e&QbAAIhB9B5tW*B* zd(_seQMB4+(zg`pu4#qS-)?m8aLezam$*%NuVsqwxL>~YD`_1ES2~09Cdjt;&ev_3 z`0;rDk7J+gb(+0qFr_QNZ}H6|zPZC!GVkUr&VGC;8bk&Jdun@csICQy`DLWEuJ!IX zog%CGkAbrFN8;-IHmN?RXFoZ$A-uM|VfeclbE!uoXWdtD@inP&aYtL*7_S*KQX?ZH zEy<72%(CDjjhG|OguM6dO`mBCEN&3%!*W4jb_)5_Kpsx->+X!?d$8?fTd|P znuBY6SRuX_q?=o39k=BL^|!4THdbw3QrTHd>SN@sfKPi=jqNTy_ Gr~eHpeG+^C literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b153fbd9b5869927849421fb78c560c3bb693a2c GIT binary patch literal 1595 zcmbVMeNfY894@+*f}p7N1Mk!r)Cp&sq#w}cC`iAwH;ScJg>xLHNeUI3gfx}fIY7lB zIOQDYl+BfGY-5`Ybm+K=2#AiMczEYvbKE9)hoa7}%^hx2S&G!{56?fAyX1Y}`(X-HROs40$!^YSzgY1{u-tPn!ejygsu_VUPtc|AggB@VWr8(N2OEZ8@H(qgI*?K2M(1q^U zK#874tS4FLW|A37()(OVk*tkT}$8L~h3k*n!!> z2|V$CatHB(pg@!Sr)h$(_)ZLLpN#;2cs4{N#ZL~)kI2zwEq;Mu5^mC`*t|cTT-RN3 zdPS7-PCA2K1GoDVcZn+I^vYLWmw$iwe6|Sm^(~x^eG5g6rKGpLm1dvw-+R=2%~N-c7~2G^qKm+N zgR?5TI_V?+j>koH=h<%vVNqKREDkTw^zL@T4{{gJM~~%UG*hz z;%u4!{P4rf`pyG=p_VCIbA^9KmUWhXVl8LjxuVv25yG(DXTc#xCANiL@d>{Z$A##H zA6~uS(EWIW6IFFDP8Kd0W~+}}&Y$6E%53POn(@BO-u6QfF*`l^uZz3H1=X|G9_|xu z`0}0hu)CR!KO73njMMhR#ZisXxBft}wky|rz8-Kn!aC6tb1vEXi%Q-X%@oIJUu)lV z{M`Ldt+9Kj2#er)d^?s!y%MwIvkv>w!IPstP5+L|ar?uu<^l3TJAA>CP8j<4z8Ue+ zf|0k3wTn_0G&Njoz1Q)iulPaPa0Ii>@j-|!xu#b>`3$-4)umO_A9h%#J&-G6^Hv*w z!S<~xZJV}a@Xipkv0>Ya6)LP`$&>P&g)>ucDh!dZ$D#L6 z=SOB$G(~L%PL0)`+Ff_6#Czh&$(zTkQsj14m|YSg=z2LrSDdLZ2Y%-!Lz=!p HyK(zJctciN literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4c97664ea16fcfaf88998c59a853888597674941 GIT binary patch literal 1785 zcmbVNdrT8|94}I=WB727R#oMf~J`W)P9g<_RNEt(y8ySGf zAZ4r&q;b-$3MAK*Qj8(XiWh73#d&(Mfe|kQ;%pLE+uU^C}iaEVRI80VFcd(Uf- z0gRgvc~Zs)Q5k7V0R@U7fPgJz=^+RLL}E51h~;qwF#wkX2|$h*gg7h?B!M^*E(e&n z7^FAMV3cT-NfW-vla!H55LO8Y78Mn-i+F4l%K;&=SPXKwAeYM`Em-(k3jy0$7Cd5- zL5bjc%w#1@s0Hva!a8&fA!U$CKZIbmrlox(w%`+qB2xz1U@Hi*IiT6>iEG>%Cp5@E zGCpaIYu8#4P=ny;8ca{t!x%9MCUf`Sjy#5>8p#sOL>2|kSEBkgX2e3Ml~M-zg>5hy zByvb07x0D3#8|mX#e>N3xgxnLNhs&Z6-ot9Fv;;LER?8<fd` zh+1K?7|P=NkO2eN&eL|lds55^lU$l0D1U0M2Ll)9LzH!>sWSj^1{{1 zM6Io(Aw6wz2ozK=-7zb{*ATqr+SGt);pJ^s+F*jHoK>;9q%1vU^RZ2}Q zITpeUXxsqJuiQ=zjBKNU?kn|G_X?=d&kM^_Q|)c)SBGZ#`};SoIw4%;l@Y=!FwYG+ zwEU-O%yT6Prjm;D)aTR-sRwRM+aE5yo6B$5*xzr;uFK$SdRc+N#R#*jH1t|UB2Wc? zQU7pj%^wA!f!-y~(6XuD-?H}!9A_6``9bpLQVhHA0lq$HR#sL?;q?a(mOJ`;dyO}{LqbB{#kfs5 zj_I<`o+L$tvYp<=T zDLZoHNK;Qwk9N~3XJJuMd2(`clgqUx?1zBA?gKB*tl0KCP@4Ksn{fE|U3ZRtTkjhu zlhN;AFQJEpU76Q8-~Oz=y?teisES6THQDW-54G>u;qTaPA32^`*t-7boRj7g+Ze3hPi}TjNoNYd1cb2oO$3~pgcNbdwZ6|K%3T)S`^WR3caA$WP_N`51LWyj)dZb@Mx~-aSVj|GHDyM;sBj zHbf>@DraBNFS{@78V0Z?D{ZURB3w?dl90ioYsZ u-8k|(SYko*?k1KF-+lqT0b5<5*Hnss*lAq*{Ht!y&q%FWtUM{t-uO4F*|qQh literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..12f36c044a6b3990817ca02a35a1368a047dc912 GIT binary patch literal 1778 zcmbVNYfuwc7)^<2OGO1i!K$;YV?{LCY{G^l5FE0JfRacd0u^6*Y{&}9#$+)8TC|QL z6a*DTEvVEAf+!3qs8z>mu@)boBH)9FM6IA$#Rnib+6{v3562(fncaKu?m6FgzSnF< zxGdP&X_6C-Msp4g5l2ufV81_ipq_6$p8P^Bo}?s(j3hLqSz*LzL25#Y0iilY92S8o z)JZGrumBp3uE*suWQ;USpdxfkg&o7R=nNE_Mhlo@F(_2=7zrq`I9x9TpPo1k0=QZT zMk7*|)PQ1IJS5qOMJCJSs^oYTUk%O)1OhAq%76|d6@W#Tpf?FDLU7QofZE$%Lm)5+ zA>)PMdr>jcZ~!HY7=SRj3>6H+fFGX;BRmcpnGLX6Faojo5X@q*U;)e$uvx&+1ybIO zYKW*EdegLF3u4Tq zGU5gjC-i{bqC!a|l0uMD`aT4mK`Q-VSZ^9i6qPc_qA)-(lLhH?_P7SoCNcv1SH?%t zCV7$pgCZ~!k!Vy=_0UWkCR4flv?Du^QX^Pk#Hpev62ycmQHSZtP_YoCzA)9eS|EZ^ z5#q}g2k}G_2?wUaXZwjHbGagp2o<9oWZ1^XxCkFc`7Ay>Hwfjyums_Wec>QKKQ=02 zvpBvYbeJ2eH<1dx3LEx|Q+|iItWR5ugqqh6vMBlVhYtMB@8LE;V_RLd8LH z%dL}n^W!6f+|HW_{ch>CeTPEfb<4rx<{BW~-OcRk#e72p*IwE6Rkft3kSRXoee8Ns zs%wx-MxT!)OkA0Cq-@hBZbk9Nxcbuti>+<`nak>T`I}7jJKyc}WNg34pFBp|n0{*M zf`lXHcHYXny)LJgysEjkGSh0cPT!5oGg4Ag#7kN-Wcwpa{AcS&BK@IX=Zd#qlyvnD z)K*s`-7>;w&Z?WsEI+2j47BFfsnuEM?|J3Tn;r{xtU6&!#J^wioX6*vJ}((7?0C{O z4m|@@T07HE)3XZ~Gs_mXzeP*8R=vL19K5{w(v3bIJbBFgF#j&(C2e)3W@N>Lq)bz4>*z0KII6t;!~DMA?b$~~C#+d=K=wgscJ zvO*T-x9xQZpVi?xdZf>oY}fwI{1uL>gE@s)wO1O}=OVv%9((a-#?9V}DaDSKXH_9R z&(FGbHy!f(YB#jR-H1|6Z7XO>)OFVRoa1sh{$byE-<|Y@Wi;yO zHswV(`+$4|x-_q}D)=UM^o-kqn+fkVsfani)*g{KrZNAr=D}y<3pYL}^RjKby(hgQ zN;VFH9%NKR|CRBjxo!NiR)5LKBPCsy0Jt^i_*>l~I^%+SdfF}e!-w1UZw?XP5plvN z9vM-6{c)l)aL@MsHBY&_M%`*{Ex2zz*t=Rby?*9_N!?GPOYw?xQ`bM;(cu30ap9sv z^HMLn>}$kry<4w6Khr>DY-@aYeMeNj$3S1&v80}W?v6*Jls|`WI(#Y0-Lo>L>m4W0 zv|$JH*R7h=tZdhurZStA_?ut#IT~1Hv sD*TiEMpWJo-BAiJr7*NfBUU?l(4tOh*431zWZC~hp%R(6T(o@cKjE&w0ssI2 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ce7304ecb7c96d9871a282aaef10d1297c9df44e GIT binary patch literal 2006 zcmbVNYg7|w8ji3Q7i8@!t$+e!z(QG)$%TX@5Glz7jctO(2$W)VNG1?MG9ece5JXVK z76GZaDyCd&g&vOqTU>2bFsxcjLBtD4L;g^{^Vjg-Fm?1mG*+ zI3yf_CCN$kNDvNZtCWeNv{8bOSYlK`gsm8&L7~FfI9yP$K?RHDh!%)N;$%uTe(2(5 zJRp;>@sTtENuc5)@v;pmYGiYYP$W)~iuV4X%tN$tHvXlkD8VLxi>eWTMx+zOWHK2DU=qnR29-kd11Kai4J0u^GKoMUv&bYC zg#^61@R&EXM9K<>LSOm9PHcRZwFj9S4$`OeRR8fD{S=Ll88{N-b<4 zC^eo779d0;R?Adc8L9-V7U5V_r)A?Yr7uHJs04!7hLxIEiNaC_8ekPjCXzsf!W!2+ zTB8j|{ww2+XpJaYg@ECR2Gyy>SUsek3uG*Jf9}W%#MH3D)H19na3X|?bqYkODs92Wo47Q8Dv8eI@NSSdyp{K_!Duei{ka#>t80&7vV2t^YYI$%>gszo*N zs0!e6=PM5QM9P#BRIhp8TB4T`Lx@_o1CfNPQ3WucW0vd<8Yol-lLnKh1ZDtTOrVnd z=>$eBg+?I7GAR_ggie*hSPU=ulK&@nASMX3Hp%}q&B80J6Rq3VBY+)V4-uloCP$5p zNbTdU1Z?tV`A~?+aQ{-or(rQ$oI3t6QUi{=Q^zrUyHweJ-TG<`ossZm#(?4sZ&*h%T)&#^%$#XTBr805Bh$vho79~gyFHVvx0VWR$0zydd-W19Ci8l_et`>f&7fh77EcZ6W2&u$_{-` za}t&q8{Squ@)YhrGaSHV{VspH-46(4RbGVidxdUN-hN&k7IQom?#}u(|xBc+Mg!8vktm#K%&z>n%!os=6ECV-_9b#--%WHKj&E_JlU_37~(U03$D*}q(x zna$y(kJzfZefvBzN@@d6oc%d#wop?9NeXcF&a z^j-gVQa1GY*dHcNj+y>hf28Jw=VC(3nI|2SlgV>t$Hv^_Xha4YGv_{Wsy?tBID* zPP@v=%BiW+=lMpvhzqOleEf%->*+D?7gb!Jq!P#bi`y=)vREvi42=tGPvplQTod&) zsP$Bs;`B7Mv*OmQUuv1#?@(EDPz5#edq1;u`d6E^klXr|Y@`6HQLO{exee7JR} zGjDOo@Sx`Aanie|}BHEj+H+rM|8UL&@J54vC{p98bl0gL@J)rI%x{!r@94ae;AIlX`@L^Y-D_>75K4~`4-XC%Us?TK z;?Kr53-uWFT$JC`FQ-MmyDoew6{w?)-Kt)PyqrS?+g42%cgbc->;{8wNblVH?bfY= zUVm4|s=rSbdS{Qu6vnwVw_a}%RFs#e_ME$X&ENN#@N54-pPG+qp33_h&L3E>uUh;2 d!_4%>&baU{8<#fNZJ+f|%jXH9O3wDo{{WDXME3vy literal 0 HcmV?d00001 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 a398bed5d42d4ee0385ca4bff4586526fe8563e6..4f707c42920301a1ef8b4b5214266850bf06c5c5 GIT binary patch literal 1743 zcmbVNdrT8|9Itj(K$(abk&x!7@)**`^|;bj%A+miWqAwTBF<}jK%wn**OL|m)X{D7 zGLa>lhB=2$2~lL&AvzSbfQsUDDlsypA`3`B5uE6Rja?Dg{xJJvm)!k+zq{|}^Zk5Z zxw52$Xjd067Yc>q8XF@`Ay>e0J1r)k)1FU{kjq*kNTu*^CGiKb9O!_5Xnm4_0563y1=MU1i53k*P` z7BMnlIY(}gpgEeDLL5ykOh{7|=BWf~MtB$yY8H|NI+Q>Fvrelw3e6(MEU%E0S z=?zzB2~(u9IbY;S#K<8CgOJTOnM^Db#KQ1wHYgAX*c>jK%Vm-lOk;tbK+H_Naos$F z6g8@Fje*c$dceVmD6#E?h(RiS8-mUtmoE_OjdO`2Q^qzU1~$mzuyr~|T(j0jA_e_N z#yhQzX$1z9oq`&%?YN4pN7lM|FqymmcH}T5)d&-D4OtXKE5%gXb*P?*m5LbT7nWM1 z7K%ZM7!Kx1Bl+T}CmPjQKJkRkitV|4Z#1e6^EK(8-f>Cg!L;{Ni zA;B;ViFu%S0UN6~5{O=f&imDne&?{ze`19a97PBWPs1?ndABd{iyNF&!|QW1;398n_T&03#fTDG1@Im=GtJ$K)%yFq5Mc zaJf7+56VLLj5)me|KyHM3Sv8&8J2U-^+GWYpOI_V95!NwbctpT` zq9-cfSF@+$Soz`nm4R(u_Q~#|;c;bZfbT$L+u3ggkg?5pb0BVNYKm4GS-sviOvEV~ z(w#;075)BoUmLQl?kAUjZYi!faIdt>Vrbm#f1)SXQd3i7StV}_aH-Ya`ml06;Y=&F zw6wHX2FCZF-(|w1vs@M8i#tweI_gfJKFxQ(9DYII{r*gQYGE#~Mr7N@@qGU35-qIv zX}<0H^>|y%dRvgs%ff?WvLneQabKbNE3p#GZqN4)SMoyxXOtR`=8=&R%eeWQdrgW; zgGyEU!@ZIEwMRRB+?;|!eLvbOTi3VZPwUm(=7~ei&9Jzl(`Nr7+U-f_L8A3xclXeX zary(h-CFh6@{Y>3wzffU3iU~+FuJ&W<5JOMz4iW?Wfx^TX$|QWtVYvL&(-ZWs@|MG zetg5E$I8UIJC-X~u6U!#+o<$@!~W;f)6`+czM&Uxf^_-h=HB*0iI1CuHW+DsUzV}3 zzLIp0fu9r1eM{iP)OwHpt}bVvpxTcEK%15quL$sPvJY+DRCl}8x=+znJ-NecII)VR z8|ZoE=kELy|6qcxwRNLS*>ttoSzEH|&=iYHxn2}@v&YTlGpCvxgWOXwy?uS@{&%mH z$2HjfwJpDnwzl^Jql9qTAEn)0YOWz5n0#bC>qCn`t zCY)8ax$3|#PxA{7pV`8CscUV#+mczdCC*p%?A&NkMk387E%m0;-3M{OWaj8G1+_`? z=zPXZ+-vzr!W$@}m{HO3Y|m(zNR;_J<3|CX|0u|P33OS@WBXPZ{32KgeGe2-IboMR zp#D~EAImV-Z`pc{{@og7xh;>Vjyq}_NvZEBrcGAKRF`g#yqs`e-DCZ}%nzaY>|K!! zHh6Vd>BoX`YDsNg?a(7uASF*d*gk!$<`R1mjWVOqpL!C*TjTh}#6~4ZPl~sF`ZrY3 Bp-2D# delta 1743 zcmV;=1~B>04c`rrB!2{FK}|sb0I`n?{9y$E000SaNLh0L01m$Z01m$aI0aKA0000O zbVXQnQ*UN;cVTj60B~VxZgehgWpp4kE-)@NWrZ?j000JENklH8t~F=4JlSJk5N4 zn-B!@I9=yOnerK+l`y1E*5MiGleP_hepL}HOpD1;(O7lzNLLt=mk z*n&|A5Ln(GR>85^^kRI;0NBEUJ|$ACy;6V;ee zi=|d7q*-H5B!6FIbb+LuDu4gA{-BoFa(Wn9N2AIF4niOh@Ii$E%xA>HY!QnE)AN&= zrbx(#!0g|DZnJC5&D9ybfH43Te@_TZrX~zifdwU_f)!-+%+MddP5r2b0nr&#wWyWA z3IrUfR0KY1>Qode zrA#50tCec4R-sWTG)lQrflh@+tx%~{q*i9ze@9^SfF%T21)N34IBdyq01LQVXGh7^ z<;C^a%Nwh&x87{*ZEx)D?p>Vhot^Amo`OKGOmk!-2y4uMB?QP>y}mA=K&{it)vD;& z=-gszI)6Dozr6IzyUmS*-P7x#Od|r`0O;yu*7@E?9`C+CKRmm?8GoOh@kFA}=Vt@MgKN863v0`WO%4I# z3|Q=N5(7jdp8(E%+EDNA>rJEixf42E8$76ZdWZ}xWP78a!n zSssB2u<$=wLBSv+c^X=p`=gPuso2EKG=6h!e{1Lb=<@#amp^~+>h(`8rA|Ixy+1z0 zAAd-s(tHBI!vEx`C`f=5GFdI5;lZ(ZY;tb))!X&e_gmX12ZvYZAHUv(#>YnzGbcCK zmtQ{5uP#YtwfP8uB`d&zSI|YZN?B{0(c|w6jSkN)F0O38UDNRZwKKMFG33K#jq;eXi6>BLeBX$p?5XrRlBI)CI1 z1o|T3cDoHZor8csP7@#oxH|F)us^YVbj^+CPP=;`5E&oujYe!vht2J>I-OnK9#3$< zXtmf~u1>cbM^i3=#0FTBMTkRlvo@aq`=C}X)7ID9oKBD5ADxK1{63)D+)gvLaiBk* zOadCePmUwCDxUzbgg_(`k!a)*K!31sqq*Jgae4avfx*FUkB1OA9Ua|Won8+W9I;9k zJ(qwzDv&{BCzC6aJ=QUhL8k%^2m+2HlRcu@nw;Bgt%8z9r;u9=qLTg;?zEMvDP}?Xm#H?RNsy7xY5= z$x%^JQGtBI3PApt$9=>jrbEKYnVKq~mvDI;jkburVgXQ ztZ!&RtTc$30?DjVXzMgIiuBT#$!a-xrILJN3?$()Ny(;TT0swE!Yc^!BQwBJ9ReMK z72xS8m&?*m$N%Z^OGpU>>8ChbYHDgwGYq3pD3sp{Y>*G=ZfI!G>7ELO=nyaxhT799 lRL3(eJx8h3)#=1y@qdslRStHyYQz8l002ovPDHLkV1i!;K2QJv 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 699dfba9f320f2ba83cb70687628cf78fa6fde59..7705050672b70b0eed68b0b8350ad98ef9c3e964 GIT binary patch literal 1947 zcmbVNYg7|w8jhx-VqMl&dr-8_#udv-E|ZWz0s)gu5`uvOyaYhsVjc@YJZD2D^1=R=trxlSm<9RwJxVLvTQaq-YI%%HxJh z6hN!tQ)1b2hTJGZQnlfk7!sWs8KcfjQ*$+xuuvex$|DH$2o3{Qz0P3bS^1P1ULGO4 zkLeU(Mg>pfQ(ie0CyxR|D24!R8i%R|K@bS!(m-|)i^=u}m<*6jXK?8tgUSGTAcMzb z0J9H;u!d=pc?w7}Ym3O zS~tf4Atp7ZHR4*-0Js@p6>7%$6vES2A?S^A`DX*N+r%IH?uNC#;Qx?b;&Yew6I zE0F)X@kVV^OokDmD-aWE#?(YTlGn|FiQN6RA-5vo4evutOB4mxL8#iSM+~?O;!}tl znntVP2|Tu>|#hyp-R%od0_ zAR)0BfdK*`$dt@sWd;)t8`Q|0T`ggE77P6*mM6jx7)P-f6xGdjKvXJ8 z6$d_u)fzOY#pLHM(W{6d1k>(9G!hKe12Z}1Y2V-jlNH2e!weRc8^}>pS&RS<*QF1h2pvVmi!^=?34WaEff15Z={_VSU>Xe#83pBXf-;{@Q$ZMEPK|} z)b!mu8~$v}Udkvw9Fcp=J}({I^591Iv9`Da=_ki3zwpaXY{|mdcl!E1kMl8CZ8$vs zR@OvD<|i?zTTs>#PwO9CWq853xoYn`Y|PkKfJX`0@;+$lh(F4ewSI- zmhEvPd|jTOtgs@STeBxPL8^Ratp1t!C$59p_W$-WNXKG$*I*&mZ->X7lfLI+v_ox$>-X zx_osp`-IeFVvP+pdmUSnzQo#`w!CV;@f#d`+fb|59`$lvUV?Ii1e*ja2G_ zn%Y|O{o!F<;*-+ke$2uKs8Xp^&$->%Ne&DQl#va0mJ}#Y)=0{(bpBm6eW7EUF`=*h ztWD$*;pbSjzt=yaLg5%0(fd%h;y!wp%att>iP~asUN{#vuAjUXYaa*>J~aI3=)P;- zL*0{j5$Rm}S7VO6g_co@ZR+yk5!)VV)uC3yl;imKE?cqPZs#2Bu8Q)3rNPwn#YmYy|SFVAr3bf2#c9<>pnb8s=9E1W7OUILX^L9;Zd$ zz5dsK%jEK<#`N^@OFxq<_um%hv$q|ts967^@ywZ|M{if3G8HwP>nbf#DwVp)sZ)hb zrxzBjDX%*w!=F`26H9Kcy}I#$cUVZut=N{`nI~^9d;0mKANntl$Rx)||BsK6$W89w NrA!@6l+YCVw>#Q&Tg4V_xTF{?I(l zd`;sOb@Dj3&h0wgea`oFpL4qJWuB*>l9H0r(o(dXA{L9FWIq@YiA6%85Q-%8uw`X* zN(>M|`oSy&2x;JALSV7fH5#kY8q=-WTx&2?Jsu&VuS6HpXspTZQpxU8M}RZn$Am~? z6P26MiltU6q<>p(P9$G(x9EuDR!6Eg&vnt!n-EFYTyEGmK!AY;^sRj43T zr=n0PWeT}mtyF8Z3XMvkQOcDH3@S8gg-WF&tuovG4uRDJmJnbU2o{~=|G_XyhT{Mh zaMzCalZ*4S%Wvmb7T>PDTiM=N+1}bdJ={J%+&()3fn1s4fFmPj00Ko=ZU!tNK+Wp) zm2~>aFn^P?o*_`{v~sm7GBh|fn~Eo=r|0K>T3=n+-8#BB-#tBPurv=(CXO!7MkeDh z!xkw5+@HiV1b{_hFf1!Zun(NF>|1^~?D07sD{;D7jGjriJKjW|roW8%l5&1J(dooN$r@WP=i9hX}!aQC;Qk>`0_$ zCT5Zg>&t}Tc<=c7BA!Y*dxEc0vw{A;ciWp&GqX~Kj1t@}ku?Dp@h3arlAOH*6i;=1 zU4K_3JTx91orq(ZOFL_uC;MkNU%vkSYioypd@gnP>HNdN9#$ZcN+0dO1X#qMTooKa z_6|@&CaWdb-#ZkGj!jLzdB42)VQu4Zckle<)3@v3$jCrq;_&j~?CY25#W|_0;_(sz zOLl+@j|)+Dk}H(5hDM{u-x(b2pPZdtSbu%Lu=;L&e`oLP_~Z4ZHx!PH$IidqZ0zri zr+(xJvI{+P4jv?#n?_g>B7Z0peH~BCrBJ5eSUcF;{&@27=F0AE?-?4{zdYMLJzCw_ z#C9nGmdM2bu;i*hi2gIl@G)4Le8HYrVq$FS_2ipWY2Y>;_=4T7UbI1P zAkY~OHQ8;bX^Oxt5i8CRAP4w#JeWoo=M%?AS65?hvAeqi;gOM!NZ96d*xW9w)7k26 z_w;ldtrok>)#7&JYI?9lTzr5fReyv$)YWO}bas+)4l3j_ZB>=c>Gb&hkbH=(+|61PRBLnZBaaExEVTt$zy2J$nuT zfPf`cgb-!E$@hgiz>ad$5z>8R38CL@7ziaWNRzRqI|5p!o`9>n-`_hD8XW6`^p8e@ z0|5+1UIqtZy+h;u7=hjw4Tpz&VA&CD_lG+m&|%i%OMXF5*Ft$3>1j_uuE8!%jf0i@$>U@-DL%Nd3@Nm3yMne`S2lc zP7X#OVAAN+_}~DRTopw{MW`q20OZg3yr+C(+9xcYC@%qe9xo@K$A7@xFDU9373Jmf z>kFSX75@M-V2w(im*&BN$>rrds;H 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 0000000000000000000000000000000000000000..b0ca863f2a7afa6eff832e8f1b49bce91cc1abe6 GIT binary patch literal 1788 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 M<#Doek_~_T4JptFq5uE@ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6275341ceabe8c7bb776203b370bb8622be28a68 GIT binary patch literal 1781 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 ZrYxsj09zcDb3Omir1%uc!ML?={|z__8vy_S literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..89022eb3834b69c9775660e56f527dff09f2ca91 GIT binary patch literal 1587 zcmbVMeM}Q)81Eoc2kOYg0UMh0Tqb_B_fcAUw^q_Gpw1So1v+tzYkMsPdRMO}JaIxL{xJTrOYYwHdEejf z`F?I=jv;ee%quYhfnb_0OJn3$ApA~=;=f~w{Z0Im#A?m#a@x*%35FCXZM201bS}a{ z8cD)dv8tPt3k1=W(`07N`lYy)c8Q2EM#Q*P61$eu?69k+# z1(+|a{x8Xkbp!a6;Tg@K6&KIQgOwWg6PL+C@^VPNM+%8Pu+;up>N;$~jpG#90m*S;TJ@*jNE>sq3if>}K|x zWnGtpTvo^8#%w~CTt7P}w$Bv0U|)L&$Xt~;I9Bof%->0$#QO!y;@+X9uloFk zOzEi?6XQ2&eVa4X1n#dN>Y?Vf9B8a=NfAQ_Yg*6ENWYnT*VT4$W*}~-osG}kS=qD;2o<5dLx&F*bS^aQ&HbqGe%C|A zdp~XHnfm+rvOI&{vbeF}kGwOxkC!gFG`#A2H1O+RXO4N%!!v^1N_*72!Tu}mx{*`4 zzrFk8)?3$;9NEinxTOu<$)X)^E*lAnn$N{XQ!_^kPFGDDu5OPTDNZ%s39cVK*+05> ys5}(1-?z(>R}7rJca(dS9Ri0Q1zX?ld_GaoHJ`jjn$(-Zzj2+`plMMR)%*jCA!OkI literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fa2ffe7a0dc7dfb634b89be1c9e3b82d600d010d GIT binary patch literal 1771 zcmbVNX;2eq7>~AdI*K+8QO3Z>Y3 zw^}Wh;ijo*3R7a#>fXaxbVNn>W z%gnfd1v40qxFJSEY1H8oEn(!Kb{me(Xrj>!M(})_3DvH^C?Ew(GvHEYPk9v+FzBSr zIKG;zHpwx)Vc{wgi(VBGqg}N^E7mdRhXBDg3GKj$Q7B+DrsHObP0AegE1~!H*B}!Z zHKA5WnXgD`)QbT*L1F-(BVcPG2m*v+4#XGnV157qb0I#+6@w6$&4nZoR|0c^v5QGZ zBXy~gC`36Hi#|!2dWtehK+tNna;!WKL8gI_SS$v)FbKnJ+JbG)#3|Iq#?5}?9uUl| zB@HIZK;VGgBbq{3C@GU>`YHvZNv(eE7&ngviZaUXBOA_87042uwDsGJW$3cf5*AXExPfkK!M z2l9o2ajXhAQz)**#^W03xMNuPTd@*3iJ=rh#t=mM_yjE06BJ?A6DB||AMH3WC(eND z2&~Xn z;H9D><``c0e`*KPgh2a{{AXy!U(u6j-@cXreRwS*45yVt(h_OGzwM`$H$#Pl#@KFG z#4d_RfZR?D7dX`cy5_>t&1KojPC?=0pZt<96TeR_l{vUXd!DGpbKJQ=!U4BEz3cX!peSAxIRqP-e)Fa8qbJ`srkl$bZBuM9nmEW{Rt$Eqk#MK949#?wQ1`CKRoit?%A<*~4XD*jK{=b7m!Jea?3JZ)>QzpUjX7g~F1$ z>SdE7{9Gqo`QqV`DV+WwGR3phrM|DP&o?;<7yOV*>o}c7)_T?k4ea3UUF$AAT2T>x ztE+$4(|O|FzZccM{~X8htq+=-qEEV>uB=p_K6T1tdv(T*(BjxbYX*G1(`pzYiVm65 zwYuu(s0}8IWoK_&TlN5IIi~SXjF0yX7K>5oRYvB^DQzso!Fd|9N(?7B!Qk=!e&kqPBU`_4{YwxSof_xZ(JEiLVjx2CN-a)e!+ zbZ6q=!@rJ(6kS$mxz9ug(FLEUI=)9!bxodx$HtgPiXZeZL>5iHSRa!QiouLM1 zm~QtBoC!$*>oeDb86K_S`E&Jd86%m7rOz)oxkb))o^k1UXU`I$VpdXO;y3xtx`=~a z5pf5QiQXuyY)jtm^PRaJ`P9|@tSd#IDbL0{eFTa>e5U)g5Zcz!>ie;wmcM_+rXO;DI(_PvHPr!5XRhhr?P|OZ5(UNcM@B+}8yXtw4z%4Db>?+o{ajvEW?8JZ cqdd!D3d1X+(({s3ears)Q7IyjVp(#|KfPwOZvX%Q literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..626e3a7debf82012df5cd90a78cd9359ea72cb17 GIT binary patch literal 1810 zcmbVNYgE%_7%ni;1ByDlphJz-GeB*dl$P3z!f4Y9LIK-yQRbwyDHLo|n;->2HawG~ z=$I1`6-7Z|2!c9+O_7Tma&u4wZw$pNIz>^iC^B^^g4+*|KbCWn@B5PXdEV!}ooos8 zUpC2Rwhe_sndIY*NXQj1-xDm!=id&G^T=fuAq*v?n2Ly#>rslA5{p0qAB{W`m7sEE z{JKWeokFqFs%4=>sMrryU>dsIY(qC_bR?QWarZRnRZ=}Y0CxjS5@=9D4j43RwK#0xQAc=Ta&LakpaLT% zL=2DmPE@Ek5D;K`6kyZcXbK2|01lT9v6s3s*-HQ>2(cL;mjQt^5P~5PW`e-zMJ2uI zl`2?*h(>*pCmuD5AapQ;5f>Lnk8`DC`bY-E<#HJylfh)tNDCSsuO;LLnigL$#( zLa){lYD^258RZdJEWx9aO5cT`(TTqR5mn400UL#vIp(HBLy-e`S2o z8kfcEP=*A>u~@x=tcPmB7?{l6#~qmsNi}eQUQHH7z81k0u^LoM_#iwg`Gu}jD`7q) z;Imn7h}TlSQ0NMg;WIgWp~#Kz$`>F4SN0gkhp=u-MQkS1jVWTW5eO2JRbYW479>QN z2p4qaLStATEl$X_3Uth`n)Ex0g+7Xf1$tCYV0sybtsU!tz$lEs@F+|N2m~V)2b@FH zS|t{TyO>M#E@A}LtJkASksi|kBRPiEAJD)>RZs*+$)s@IkRiUg1 zxr&W)*b&rGyz>9#jzJ1yn49E3O*8h2>_qeS{RohU_d|qg$;r`^BXV_K4nj^I?1Om8 z44svk-M&(}Lw#I1-qq8kvJIvMc4Xb|5oTBq<=MJe4%<^tPbfW_w!Cmk?!k_RjmFg+ z$;{U;C#TSJ*T|+t$4+P0|ByYkWi4E=ufD2pcvoD(YU@bG9sB_AJ} z+KJn1%F5U}g~H0OpgmkFwa@ZiSabfoNSBl}$M1+FTp+N@^838jd!Z$~-`{vo@3OV8 zoIb~P_p4V4MsVWs&?PBz)5mWUsp;kl~0{pTvD>A zNbQ18Nvo^jA3B&Dz@28ZYiLDSm~GF%(8;g*{}|j*(|xx|^>aAr@JUE;aK@$Q+n(*u z$q8XLa*PG{?x7~P8)e;ArB{lojO#@^gTpk3j$D|Llbh`8>l^L#DD?(@tifu) z@^<*4Pdlr*#m4k}Gy69O(7rOJdVE@1+AofOH9Vl#*L~4Fe~m|3bD=tY-VV+%sVf3h7OgMN>}AE!TA}X}rAqo!S1Hr)@K{j~FVCP0Rgq`>mpNk522H9s8S3 z+8=s4-kll6w_CpQ%4*5r(QxbNpJujduiwt3mC68Ek?^WBqxnesx^rxai{E zefxr5RQR7t&i^r6`h0Ui!axS>JJ|NwBjk?y_*+MC@0J-WJa;r+xtZRw>1GS3_4nTG zeT&;;xNVW;Nr@IMCP(Xv>O`A2T^lG}&@-Ft$MC}ZyTkXVXGig_ai29`y2L-Q&pLUW zWq9iRll?)#A-yk(x9TO)x%$ZE>y1x5)uzoQE8C{#qnsj{U8u0Prx>LNTRv*)T(i=t zH!m?WU`GdjKImcc)MMea;ny3%osG_W27{Ylt_t`j_F-GJzn~{}Kza3vML@pE6QS>x z&VJK+P}qTcvb$RAUSFUl9Wx^BtHQ#9_8aM{@AlVsy39g5>q6VVzJYoapUpgVeN(mN ZL`uz})v(1L!(#Ja%17vrl<>n-{sHTh*xCR9 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3c35deced6c949cb654b1b39fa89ecb15eb68aea GIT binary patch literal 2023 zcmbVNYg7|w8jb?qk!=xzAZV2ZO=5hp!PvqbuHd&zg=tN4B~usxnGI0LL^6d#A#PyA!u}B@jGIzelk&L$^es82T(|4K%;TSHDRqs zqQU>lc(1iSHbn;l(V!mM17H((cJy9Bc~y%h7$#=(4t7yLP)kt18R|QA(w!D zA<0#84xb|6Gw1=r5Efq~qEXQBsZ72oG=NXz3xon1V~XQ_*Z`4`K_-*wp>&3jLJ=|e zbQVh(B49D7d=^6(5Hf`g*Xj|eRt8S_RiS<-v9v$Las)6aMIbm9g49zTuwDrvkX{Mt z@B+a^#qldPshho+wRXfJ{arVG=L@e{u()f&gce{7=(Ny+S+DxqUYR=;7TEfm(EOV01(z z=Gb}+#?>QS7!qr`TN4)!d4_rR^^|{g%?I$7&h=G0B3D)1n6?z2b^n*5=YRgj)ju=l zpg`i;u-w;R%Zg|qxc+0=D3%~vy9TxpuNyLnZtdRfG}%qWtE&t;vD=%q)V=tJJJ42p z>6^~zq4>{oa#FrJnLAypR%3D~^_MQO@7331bTEu<>+15bd^3y1<+?w6`qU*-ES^?f zU7c3j?~;Mntr%azq0jKK+wJw_d1(*fMPD?_%^4XP`y&(zKXTsMOV@7eUc7k08o%{~ zt}_^h?WT&_+CIr4e?2)UXx^&4wWQa%fgDcHs1kx^F3i66uPyMS#?*QvY_(c3?RW2* z_wp~>PADw>4Grms_WhI=eERh1OC79slSie)IwI(^EZ=koUK*2>UG})Er>C?^KK6a; zew1LQN1q&h%;T;cEGio@Zz~*I@Y}t?PFCCn z++nQ80qkhjPUWHJq<#MRSA_e|`MF73Q~?y}qh!;rz}GHHyc~r&;I1 zxL~Wt%O4sN+U6z;ghwqB+aA$_O`e(#YrlHy;WA~=SXY%|&3DheT7El*&}9e9GY>d| z|GGaDZ81srk&CzLteY1=rTLZLeZly0!25Fg9Nxtlb8M22N2YH`4?Dj1p9$Ts3~}Y| z8F`Jhmy2wJ&k9QO2h%05(mr3=Ks+Vb)e|P&*&V??@~E%n6Zk%6c=mPCHuKh!XO7fw zSH8Si0#tz7(ekG2yqVpkAlL3FT<*M_as1x-1#n5cXiqeIXYR6Lu^snVe*S#tj#bG+ zJy!|^61usw?DptrP;5d%!hrGTSL4*=)WNG)U6U?o+v9SonY1xLeg3%L5?UZFqfOn_ z`M|LHOz4*<2Z-3Pqoj{31lE?~EQ@(CYX+e#l;e)`#KPs7~5C6v&Xb;M$u zu!wT#^9ZQ8@rkkUlOHQfna#!z>e5Zr&GGT(?Ck8w?jy<_J4%~RZM!qnwxG@3vE<_B z2P4x)G`&n=@G;}!J&FS#44pms>F{69DxyxD=`SfN`TFan#+ZX%RSl_Uhfm0Jo3m}p mxBZ8TJ7*-?e)g%sZpUcrdKcRBeZP19dc#GL!gBuh^xpyLmO*j= literal 0 HcmV?d00001 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 79a3e269c68215faadc1bd8056381565f973024a..3946c11476f390623c3f0f059fac4d0b1679537e GIT binary patch literal 1820 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 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 ce0f626c282700ce3cfd2e1cb4b1a0768c578bd1..b21eb883c76fe94ba8e38d17437b5b03be9e107b GIT binary patch literal 2135 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8ec168e0dd536130debdfad6486f3f5c49beab55 GIT binary patch literal 2015 zcmbVNYg7|w8VO6l}bf8fZbZ83kCvm^MWPRogldT!_yy~b7sEpn|Yt- zecs!df|wm)1kcr;I2?`;zFjE6R-)^E)g5~}y+^;omQ`q|9F@Wv)S@s$xNT}!2@%5$ zieyLvDb#!4zXow|IJ{98D@WzxD7FeVP!uj3iq&Ak&^R22XEiBQdI%*dp=6zrOB!ov zCJ}XNE@?L?rix7hNUPhPW`?9`J7QI7dKF7e;)M`7RyIapfKUa|YDh66Y%7;E$IHg{ zuGavGIA?r( zbSiQFB4OUlY7JW=6wUj>PF#`}MNMn~uvjb{W0G&?8EXc@SBdV~H zjfmd@gAhVgW}OMu!A7EsQK5uWQ7#En`aA@KNi2RrY((Z0g{2IzDog;4LIn&4S6p+} z2r7a8C*!5oNbFt{1V|tRPBp8rdT9I>z*z47+>y%=Q^Srn>#(9IQiQN7)c_gMa3Pn3 zeW9pzYBrxH;DbR7;kICYXlNh}3!l#9hl&{dK)ygI2m}{6UWR4z8GMi$#1I96LK-a; zWC=i_K*S6d3YdXZ5PX3RHzKIQsDc*!>M+0aSnyA=Y=Ie4ps+a>hEo5Rh>x^pHf^2k^=y}9K$gJA~sYPbkK%C1lTlW$TEJ#CBGSzf4Qx!xbGu1(K zvXaSAlUW)lNU6|(5EE3A=JD#kk~;ts1h|^y|C(mu71oKa?TZn>4ljlXGGdcs#zrLK zq5okVZjnd0a9gbPPNOV7I(GNpLuTF?bpPQSf?#zn$6DY&eu9u$H{^9_+N(68d{RAg zf`1`mNyUnkNPS01f@&mB=Q|S+r|Kv8uH(mj@4b9k1-`AN?bt8y=vZ5b$FQ{c{rn7@ zJo(Garqo`&0Sped2OpGpUb5NnopE?>yUl)?QYSfstLdti#&;qgDYRh2-PGa6jLlBe zV!`JT>!QxIYiuo&GwRvMN=b|PyA<%#+d~%~9h&Uu=+I9jrKkUVJ}Y=jL;jYh=EHF9 zxn-Bc4+hBwIhOB-1WgJ-?f4! zPKLMjp2MSM2niD&|IWjy{BSa}ud_G7ukgpNsm$6MQFG%fzows$F_!~KBbIb zMR_KBzfa%U?t^Z;HCM=!%rSg^>oeTlW6Nee{7BCxyV6?%i?iL&CXT)?cr*$R^x!KN zWmgt0aq>Go}xHT8)bRrzf5&rWHbz{ey=tA_mNdc&QF?sp0#?39o9{6s*h=R z-HRvGnAxZyOXpKIURv2$`Dp!3;r^s;AMq|N_B<&Mm~z{hn}7ecWd}vwoX=LCnmENs zG-*U%rT z4d)Hcj z-~o*C&{x-#l$4wtw%c=>0om~zQhRUWXK6Jy+e%CF#I;}RbnW*)h%7AJFW%i9(jW*a z3p@5KPLA7HMhU1Bd>t^bU9^=Im9zisz1pa2n-tZScv->~{B^hRrERy`7k?nzamTCM z+Ox*??z!>TAC`JmubW~7`P+|fx_-+2)0C^7Stly~y((l_+Vdkad-`S(>f>MJuf1ij zVO-gH;Px2zF?gdiq4i05)OuC4rue95O-+q#@TgX+?Ln%(Iv%h$uRoJ?+0m7`*7O)z zjW8yR0`bY1x=&75als4GH<7zTc89)HTU}Mvx+h{%DLcZ9ef*Z_Xrs4&azHxh*Q+l` eebSfcwixHX2hSQ`yu8Tu%MB0RA*|&m<^C5p5JF}E literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ad0362eaa4bda9bb22c4da8150e95b30784a6513 GIT binary patch literal 1787 zcmbVNX;2eq7>;5QL=F|Jpv5%^c;wp69SKSf|Q4q_|Pq5eO(~Hwd;r9Dj6YcE9)gzV~_Fd$uSdY?b3Q z_h~pB&M_!ZAi`F_`r1v#z9VyA9l;hiR47KHkYrRZ(ZD!=IUkY*kq7Gq<|cd!htBj_=Cr+Y2?Wq zksx5)7PjN!Q&CjSA(QobJxNa`A(|92$Y!(26o?E#L`;LI%~qij15u^*oL~^ZTA4ZtR?ysu>jU6vS4|D22lcIIp!$7-~&u!Kp=&YOk~NJ5+V(xu`r1$CCcbjSjJ?~ zU?~LQ$MN$2lRGlz5ZT%!|7n_uBdimx;^z^-HlK$GR$-H)!A1mX=$?yBo@bE2Kicr; zrP!eKs7Tj**$*`StSa4F)U*C7dM9n!{bpgL@!c#zLSWo;o-%UDw!-?DlZDHf!a0XS z^o0(YyyCmDFRny`r4oAOy;ZuN0;p9^}aFKY0sDS z*VfeR{7Fm*c9fU4d5vzGUlNes?eAAvdg@X8t!lHAN&NW5+Z_A1k8dCQ^(Lph)g}4N znk$1log^*cSr2VGonsff?iwx#PpYnS>^_;PTxr{FAJ5vj;AsyWyL52ph61sy`qU{G z5`hqy*w7NiKC;jRlcjEje7mz)Z=dbjFEt|Nm>5RZUdWoSc$^4kPru@s^NXpqg1zw z+S`^%hlfwZbhba;-(y^V!Lt3?Q1=Y8NZ#e%cwqM1w3dTD#y6%>jJ!lgt1T0U#S1Mt#$Fn_O%?@?8>qm-n@23zuGM)47DY%2@w2|+~x?1b+C`cG4sNp3Q{sW0sw>kg- literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c746b33bb3d223da01fcc1a0c47d5bccbd2f86e1 GIT binary patch literal 2010 zcmbVNYg7|w8V=A3ik#goxM)Qg0wPtC$>ah_O1LBe4HB>+g(yKtGLw*#%Vd+mBoqqW zuBFtitd^=RAYKks7K^MbS`i`C+7?|Jk6dNF-~j^_1rAq*LU)4T?hj9Y?3^?6ec#Oc zJn!?~&J^uV+~Kw6%{2r9!Ar1{FTz*Ad3(6x&tKL*J%cYBuviI}j4Cm+%!m+TU{sC( z0-a2Sh!7cU{ZktfK_Iy4)nW-I5hkz|sE#ai+K??e1CAyTBBCq?nL>kLfE-b&^&H~Z zl@=nPhB?GkhL9pO@Q^I^&Kx6>oRcV43laL|E83feyiBfJLX(o7ff(afz3W z@13tfBCuqFX*k3eq9nrI01q`H0D~MxQa}&{gtN#HgGr+@LIElTVt^DD2vJBBhz(KL zR0^9eHC_~%mX9j3b%-7l@Hs^M z3mI0!Y%av(GU#Fa7$!G1mImSBQ^UEjaba8!sUV*ImRpWk_u`$1iW%G=P3`31#6xFVD!0s#*Lrqzz z0pRhLDh`CCs`W5xHofI6(Tj-rh*7;Cf#Zy*4p_=DTm1?REJO*(!(l2ZTtSCO;V_*_ zl81-EB$g7P%VkOi63&nlm+|oblRFR>1Uj4Kf0}0H72b)??aL9s4=;xZ(c_b2#7D%n ztaTHC@S3ZDA0xK(HKnvCN#FI!pUwN1``Qe~TIjVsz4Bd|E+3KUwUXOWtszA}#;14Q z-su^}`)7r`6dO=^kl#$7OFav{!jqgUq#hEb)ssC*CULrTR79y&@e5IV6xd4&gG}2>-rO$rGup! z-RqkVU$O4m*gfy=Zo77k*Z<@2+1}&jrDHB5g*7!bHys~F9&XTR*Jt!}u0n|BVaD_M zJYBnT%LTO2{jZGFYO!nW`SWS}rUEZZ#y)8C{^IDK^zYqH1oZJ$l|OGDFU~dTbhcdc zCH{lXg2aeVzu8#T`8Ra1khT5#LY_uY>Ugj2(xt){&mnWJ{qn@u{Fd<V@9Bjr1ptk0;9g`~Q9Gmcj4zjP%x*yXKpj zB~jM{gHL5??8h%|F%}-qdq6XGU#y?;o1Pe@rK>w8ntI*7pDG{Oeqso`XZgcK=Uuz) zQK`b#cBi5snR+uRSH&d-h;JRg~};aT^$v$o1Kh3xETesU2f zI(~e6VM70BK~+*OIcsW@pguSH)8gWR^Y!(~eq+Og(a}-YG@)H^!mWF)J#0bQP-lK8 z>5J)WdASeCPYyH$6NP)vNlsNsygs@3uv()_ypjD~DOk3VFQPK-@z=eDBbIFea9I}P zVVbAL$j0*CS8u8qZ>(&poObz%|8Zu_0e`96f!*gme_jyMdTsK6$Br|a6Y-uMmgG{9 zNl!WSTy#$q`TK1>9irIbXYZeMM6LT{&;1g?cTnd-)7+5pBE?5 z%$w4Oro*a?V`M|#9!KkZ@{v>DZWRsJRj1^>-7>I0Wf%RM9aFVKKO}uNeY7s&ao2{n z4`zR{5tw=u<#ly*xaI#kKkIK@!SLXw{Lw~q>0cT zx>GC8^|<_9B&$`3V1Ru)yQa(CB#6$C1`Sb0dXyrk{mKY}wNk;o%gkM?4} bTlCE&#G#8Z-W#Q4=igQko5-)_X8!p{( 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 Qn?aR;r>mdKI;Vst03!T+9{>OV literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3e773c5ffe1e498ad5d0d348af518ebdd28f77ae GIT binary patch literal 1602 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFz024M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7p`n7grJkXw zg|U&Tj)IYap{c%srM{tou7RPIp@Ef=fdUjL0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LcpzHo!{ilG4o3^M(S!~%UoJp=vRT#&!Os*6j4QW4I;s=7F&vLIDI zD784hv?v)EA8E=k&A_n3ZxKi#&^1>6MVY`zNz8G{PcF?(%`5SAu~h=f=%r+)SUDLw zJDHl8xj0%lxw;w~0=;i!?&Rub=49;T?BZ-}3Nr(nURQGq14Bm>XE$R<7ehl=Q%7@i zM;A*27eh-^6BkD}xL(h^;*!L?>O)SYT3dzsUfu(?ejQo=P z;*9(P1!re)j4Nn_XXd5kmltb-q6p$+m(-%nveXo}qWoM1a2Q) zl3Ajeu9=yMrEa2`sgZ7qrAeYma6allylGZuO3=B+Jo-U3d6}R?;d9QX16e(NxdTP4JQ^ARiHf$0nP8{(0 zx$@bmhAEu_Mh1yaog7d9?t1<0ZrJYPcVFh1{y4YoTjiSkwfSp(SA}R<&Gnn4a_IM8 zzYGHjj$AY8g%>kazWl6dnS8S4!u#*SufA3tdRylG;$sCzte*J843kH(52pL2{#IM; zy)ZyQrvG@$*Q&V}UX}<=JDqwcYV9$8pXI@E$=fex{BisBRXSU3vf`PiMJ;>d{Ds-J z-|nriv6DZPV&o~o!*-Lu?m^Yg7!F-A?#-HF-7%ZLR-MiHkoHy5!QNm6N7l^q&s&xT zb#Azu_y4y++3d4w?!9jg$E}~P#xue9g9C5E`R9`hHsAaZmH9|dtL6Ki`}zCaYuO(0 z*I0^hZH($WuAFEhHPyB)FMe%U%g>s5A8PDQ8#QkI#lzR$?DHN-sC%xynk47deKg5t z@T>(qAPNW?y(yw_n{yMd;1TvfV98-WM-?p6JnH`y%B`_~esIIGc|@cAS3s z<&jG9P@YolwNYz@+72gvb1?2c+O)afYsEPSucbjHhO^I}VYn<NKxF8Tj6nqzl6!`hN!iq?U!)ltC9*_B@BxkT43g9&s*^c PRH}Qr`njxgN@xNA6q{TG literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..09c3ae6e5b306dce002544342c90f7b6336e789a GIT binary patch literal 1427 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4da4a8e2dbb141baa0b58e72c2fd0e0a9c077e86 GIT binary patch literal 1595 zcmbVMdr;GM94{|7tLRjGGtI>v&Ow_dv?=XqdwpuvR)lVH4l8LB+KNqL5}+`cT3?8F zdz@p)6o$IVKqj7!Lj>d)V>@JQdeie{>JHiYz@f68j#=cE0(JYt^N-~&`Tc&$_w)IF zzOU>}u`Z7mE)WU?f@t#!Ln^-l!TaTK{y8#l@F>5`=ZxuG8kNQ6VGJSA;*^5`%wEhz zq!JjOzom;v76>9pk1d@`x2#q=DX$m{+K7E#nnw!+$r>MxIkO24a1bsJsRAD~w}F5M zSApwf7Kw${6K>Cn0)|K{u-cpj*-ixxYScioPstN_2@V5%-pwSd^r^rxUM0T|zJ@?x z%!JEUf#agmEh&JWVhBJcMnz5-h5@-k49k)d5m^F&NMIQxQ9!UnB!QK%M2Sd%i3{Yt zF?g0T)nJYQ-QqF@esVU#qx}pWG52ErwsC8Gz5z!kk=cGYs{MEQi*?MJlC4F z<lL-0s1pSU<(HCNsdWOI_im_4D=1>QuxG9ce-4qSz^upKh$B09RRP<#72g}VG!j17KRhd=cuU_bZH%q3^UFr@M$$E}wY%IN zd$7_II8>V^^Y+~SbI!ibO%1}zpIqH-*y*d0@uel1(gm}B&u#V(`7$n$jZ?&BtJ+t* z2F{y0DN3W!L{(U;t2+9I1DZKI_UvGprb9Oy)_)aQ{c}y#_x&?QhKExY7PMA=Dqj%Y zo^`q=rmeMg^0Cxq?R~Vn#9v#s zrc_#&mae@awTD&1xy=X-$y#!t3+H~JdkfWb6Uw^%fv5KBZB0W$ zdYbE|;|!~gy|_hl>T2D9?b3zr?tSNlrFcvDk;xllbCMU8#?@bmKVz?7Op0TK{=Ej> z?f570m&ulJ(7N0Y#n)a{Uwb?{dZOPtRd@J9CT70O9;VtU1Ol`+I^&zZlRx%XSeHLq zJW1?`l6D*ErTx8kIvUdxYR`Ug`VV#C{5p4F`bT&E3dFs4F>{YAC1O%|So@H#E?JM~ z&+4SBcgOADo0%{tFnG#zGPfz?$;!9~KMX;uyCPrR?S1Hf^Zw1EfzR%LYnPViKuq)X zl8Rp+tZPKSb4zEgj@y6sorN3TKDeVj6F6Y4-WuQWxqaupucvLFyJ+dD;X!pd{yvmn zW1D%XC+k+x#ky-J8gh!`&SY1Nw!Iq>|J$18(f&0@XOGOt6kM;89y?!iBO>@aHyf>n I6S_?QKVWuVqW}N^ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..963221376510c48e55812a55665aa60297e85182 GIT binary patch literal 1571 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..73906f050cdbdb92fc4dca2fd4b119eb7bb34a28 GIT binary patch literal 608 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 delta 1553 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 Z0>g|&Dsw!ZT#*6Q9-gj#F6*2Ung9fzqq6`2 delta 1538 zcmV+d2L1V}4U-IzBYy+%X+uL$Nkc;*P;zf(X>4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wSVD; z0005rNkl2ZTF5QP^ZAepgi@Sk*$CelG_Ob2Nq9k>sVIit7u$$~Ksu`PLL zV0E$I(*a1?ZnqmYn~fZgM-dssm|XJQO6GEPQ@i`rj4{66RWxL&K$1Ua*Mlav*nErV7@iTaq zqqy`;Ks>aMOeP8p7Lg`SLNpWkHW5G;UZqq<7KDuB@5ujI<@X9D3*QDW;D6qrw?6L$ zg!6K1u(i*HEH7Z~!;fy~#Ecr~9}Tz^FJyTEml~!hd%l1ayij3X+WfJVfMb(l^2`W!HmMCv-6b_Hfed^qBNIGRVkNo@K9!NF0j|TQhyZ`_I07*qoM6N<$f^5O_7XSbN 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 6889a646aee1ef5e513e5c696e0916239be9b6ab..7d24d36fb221ec819ddb0f397b1f5fd5f9eab420 100644 GIT binary patch literal 958 zcmaJ=O^ee&7>>Ijy6pY{MP$grqF^&g+BD73Sh`7T3#OEAWeXlOn@ro#O(rH&llCOu z)SuwRU*O4`2lcoYucDs33+_Si>ZIFr6|4iveDFTc`@HWw^Q_ysv$J(|i{rSRcFXLs z8D!t3i|ilI=RetWg*FECfDCD3N0_U-R&QJn&qdKU6Hy3JpB=TJs1W%sYK&K5;acuiXaK z6fpuHQyZlIaS)?a=NG()t+QjugGC6P==_ju*&=s{dS-K(i|urNOlgQ9Op-)MiUNs7P|`FFiZYbt0*ffb zvw+%ZA&7T#1{23l;Iv? zzlx4&51;G(Cvn`Lg&6j5Os0{;E^fG+r3#S|VVjbuPsnlJ#qO9;5|2p;3}ewXaO2Pm zT$02$7Z}Sz?I5Oh;NZ5Y^NdCCJQp=gqhy#BO=-%8BsCOmzg*NbvtdZhdby}na;!<5 zsgDDiW8HIXeJwV#gCDZYCXT$v*lk9{2aB?iw_c07mT!r5*K4V)#X=?qW|#ZNW#>oC zLD_O;UA9@79|z3w5wrF$@!AP{7DC&s_tP)mKS~!kZhPa^=h~YW-!?C|zTSWS4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wRYi# z00017NklZa P00000NkvXXu0mjf$h<>&kwQgP%c0`hdbpjR zIn$n5_%H+WwE6b+Mmn2m zzISS0)+g~x^rD6Y>lc=uQ>RWb-!@N4PnUmK>&(d5$OyE`Y;UNFo_To>&{76ZS3j3^ HP6l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0= z2~P8%dQ)(_#T2JreV}9XL6M6T*)Sns3IZ|VNf*e0C;rqtV2UpSChhcVw=5YL7+-q2 zIEGZ*dJ`V)cPKz$?lh+g&qrJnTogW>RXX50LqTf$L$Ny@^G}KKd@{Mxu+E8frA^lP zR?Wk_NAw?`pSxtHwQ>5g^t}42HC{^}MNf0h=|0-DWZ|}`wI>Q?O4Hud*o9j@sJ+j> zG3L39bkgl@nnIl`jBU=`W534R`^$hQVN(&KXUsE0=GqDsPxa}iS2EmYXkl-7TD0=h z856PYmA6W)LZ9EvS@!8;MNH-S&r{sx^LU;-5bkW5b=>>ICTnwr?N_!> zsw$T)k8b4u(99RR)c6T+b;(@IWjn2JJTNd{`)tKdM!p~C?+Hilul>K@Z1%sKJdDl< z1PoY^sGVo$|Jdp@Q|_2v=;!Qs?P)75>lQ{Wbos74{an{Ust%|x=5X{vizCtufFc;k1yunso-F%2s2w#Gok%NhudN;{iy<x#5a{a2A zbZn>Y&SOG8?|HW_yyI}aIq0#h(&qQuN<{bMi~W{oWMdH9;NV>~_l6^=F!Xfwb6Mw< G&;$U8(*Fhk delta 1142 zcmV-+1d03k3W^DkBYy+%X+uL$Nkc;*P;zf(X>4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wQu2u z00010NklnRx?zXLrGT#D&)X zcs_TaC!hiBE1-Y^3Mim}0tzUg055l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0N@Uj$6rTR!I9Wnf@D=jq}Y zQgQ1|_-U`h4kCLix0poVcU>t~qPUiOp}fKm{ybAHjUSwKv!e?ahP+^Q6mf}t;Z&}w zn0b6&X5J3jpqS3tI|a_&Nk2C?r)W;t>ZLNr6}OrAdP)^7zSvQ7|9bj5-$^dV1J+MD zm2G+6(Co*$*OQ)C{^Dub>3Ve8!izF(j6Pv{3Z17d(iZUdtGvAay7X;=w8%rpg9R2> z3e%$WrkCa!NW3T(akYwD8Des*aE)N?4#Nq|Y>o?_e-zsD<_hl#-LttV%xts5d;Ar7 zO*iK`O6k9_dcOL~?O#itR7||}I$uQg+{L%IP9M2nvHV3w-0%DBjIsK*K{ns=!{%w& z#xDC^829_?^F8r%Ls#zp>3GkzS8m&W4co|BS6aDC!mH1|ZkX}<&$qw-Z^isd-^`-J z=zTzF1A^LLxO4fe-@C8u%?egNJeOxS>kY$Cm!|)nt8@SKqrH-!=NRya)}2)}Xb|9W z2s2w#BhY?AW2%>x-c*4{I@c$p+n#JIXEjMu9cd@d#V ze5X+04$i{HP+F|+ZsLzt163^4s&t;ucLK6UN2=ko) delta 1147 zcmV->1cdwE3XchpBYy+%X+uL$Nkc;*P;zf(X>4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wRGWz z00015NklNQdsgg~U?EtB#JfNd;%=nnx~Pr2Bu>NVkw?iR+I zJ<{|)e9S%79mq!j0R#|0009ILKmdWu1$><)-G-i-(gONz7!lGh`~YlR2*J|Xbl3m@ N002ovPDHLkV1iGSI8y)s 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 9f7fcec5570fbd56a41c9680bbc1b86637ebc8f4..1f74a36fe2efb8122a47cf51f7859729f96f708e 100644 GIT binary patch literal 1382 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0= zGfwlMdQ)(_#RaEceV}9XL6M6T*)Sns3IZ|VNf*e0C;rqtV2UpSCheGCr$rbT7_WJ{ zIEGZ*dJ}%y?@)li+-XiLj{IOg*3#RV(9``(a8v0^rmQ~#+v_^(74|P+ys~3Oe$pLp z5oM=}EAtu;K4d$5YRAsWCdk(5Ufnx+@#^RPr$n_w>a#8fZS>jNzMVz8_9-4|BkrUJLmriAI-Rnmpes>=gG#>eVClqZc0NbnGl*JARbmZPylm1KWjW zGc%^iU*CIz+x>a!I=6y78eM5`CTSQ;Z#gQ|%xSM#dN1vf_Qs`Gjx^2O8=Sww+~Dtm pZx#DHXO>4V|Q3X2JlBYy+%X+uL$Nkc;*P;zf(X>4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wQ%8v z00011Nkl7>3h)B>Fv;#lml3`VPgS8G;R6UT3K&pE9TNZm002ov JPDHLkV1jmcFv|b{ 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 e6d483f36d34bb037276e92881e680aaa965473e..c34ea126b014afac34e5c925f24a6ee16df819fc 100644 GIT binary patch literal 958 zcmaJ=J#W)M7&eMjl}HscOeYsrAc)T&aUxqWC9z{_2}e;HsTu3om&8i#GrkLPG9d;e z{sCsR*%gf z|8{rSpDdR@*>sz>2lN<^=-f*Y*9`Cw0VndtsE52@@$3s~a9rsi><{R`eX9F761*HE zWKqJ{9M?F^63?F^3WjJL#s>f6<0l@3fx(}suIMHvnuJHo6df-+eSbOiwSYf-1R9yn z1R_K|kVR)P(KCZz>FR8qA449jAarW*SEdGT7nnFjKox2gU#!(ZT@xg=Ua!_40$G$) zC@N49E3%?jMZGG6_25~wG#KeU%U;J~JANz*ha%21Xo3{fGA zn0i?yCi{hgg@~Vq2@P=!az$^5XVl=C)2kGsWFs4sb(vVfVCE%I62v^E0_eK`hepu` zO=u5Y`~9ad=`Ruldx+p!>a&X*?dPEq-As{3aoWfDtf*plf+;2woB-2YRSn!b3F83I z$^8|_b#*5u)Qf%OSO(8jgfI+rTUKq!wA!jIo08O4TTNMOR+Uy;G@GpUwSsG5e-@#b z7Tn;PYj5S|?GPm_vW3#{IST9)M_`q<9&YzyZq-|JgY90dtz5{=!2ELmxa{JHbx^+C zv@Y9hnjgii<5Sk!aOcef_ACU)YWA~>@8{ADj@vE03xAy}uWsEvy}0~(`S!(M4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wSVD; z0001bNklxfdNC6t$zr#S{l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0= z5l-`}L9G%HJCG=3=`vv*nKvt)rh)I3vH^=6#`iHn)VC zZB}@X|3cmw^Ya{M>%0&$E|PAD6D9| zmv<>d!d79w-OcWN_o^SqIit?W1br}ZT|L=dq5?#8#UG!$FFZF}QB){(?Dd@ZlV4viv|nF$ zwfpmH+nO8UJGmb3TyJqI{#(I{=@R$*C-OhHep+OCV7(;^n+*%|9u4V0yA#eSM;;fR z%T{gKbHenBtAE!5M;*ChRkmYC8P;}f@iQ=8C^j==+Vt0PPgoa!HVUs!*b}w(o39?H z@n%PF9l;qFCI>yw{k2Od+RImE#!cx==e><9*|#41-FargZKKc+3nCxcvq~`h6g9n> TG{f`?s9f}P^>bP0l+XkKB)178 delta 1149 zcmV-@1cLj73y}$sBYy+%X+uL$Nkc;*P;zf(X>4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wRYi# z00017Nkl<>&kwYhez0mNBqmD*+8L2PZ!6Kh{JEEY~($lz{4`%WXqce zO4b)ri=Hj`z_%sj99KeOq*o31otKVmO$tA(S6a_a*^s?da{X>?1U5HBDqiUa~7rftV*Q}(dTl6@}v zzwiJ4|NneC+qZYMZ=;W*sMVQ$QjV;^dpp|6*QwRslBEl$ia3vka7D2pmC(>21Q|ma zhB>Hc)g#j|Mp4VR>V+aM%KJqX83DzM3Alzu&=eKxaV=R#sQD26$(_|PPqtqqAeDZQAB zoZ@r|V@qV1N~IF0gaXJOX4q&n$^)FAuNM;Gz z`cbH*ZDfE(*`nTB3z5@G%K}zwttHYD%MdY)H{5>>yLm+%zsf2g!2 zdmjIIp?>sS-<~J#^SLQz^75(t%=o&WyRwzUy56s^uI-&XSRehYc&*Jk)c?!$iH^j; z?pxhi_RJq=eQ+toKQPq0+_v>pfZzg3^nN*)N I(K~SbAK>?a`~Uy| literal 0 HcmV?d00001 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 f64daddbcddd723d30bd455822f95e86589f5cfb..b1e10324f845152407b085bad1062c33e286fb41 100644 GIT binary patch literal 1738 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0= z8BX({dQ)(_#T=(zeV}9XL6M6T*)Sns3IZ|VNf*e0C;rqtV2UpSCT$JrC+mSZ#>&&h zF{I+wp78V8!Hxp+_T+r3%FZ@jD%$#FLUV$!^P2m|EI|EwV!IP5pfNh_V~%f3;azEmtJo9x0sc+yJd1q=gFfR7^ar;KhS#j zX(QXShs9G(UL&l*e@za0(`mFhX*}JE8E4`KqJv2F*R9M#Z^2zr1@$u_^* zzH!C0H&(vhF8!$6Dn9C(_zP{uxja#gjEeDF_Flcv+sW3dHitXT_fuwL|NPm8Ei0Kk z_iW>z^-m|@R<9y!xSY!38)cQ(SMwh+J3hUqMYdn8V7>V4?2h-}e{VbxsQ+`T!v?V< zN{d?;x;kE$=Xw?0%iXDUBE`s1{(}_zF5T|>H{2{)8fiKodYQf#oat)&ZYaSMGI8!F z=6tRP1rOaM>Xmo=l#Sp0+K}&zV&CM?ipeJwbhd4`S@d9m>hsmi(rpV}cv!R4=8I{V zUO81@Hz~0_F7i`H(>D>;w7WO58;lwkck+t;XJ-Ave7IdzY0-NN1`(fiy*W-n_r3T1 zw~F0=Q-GcA&CEvL_=7b$_rA{IJ`^KSe1uypqx|o_j)DL+rL7FyYzr9l7e~(vG?;UY z(Jg)}iy(t)K+G2Y*_-}*DY5WA5IetOZYGO!x5u@4+a=t~nv);qCB|78{GN7y?#V+rKCZsrNj4P06huUCH7IC*R0t=q288hLCYCVgEJJ;&hZhWoF- z>iu%qv@F^8MVR#sf!Q1W6lrVi(~Rht6tQjRdxm$(CtMaDm|Q4WKIwPC)|Dl7r6H3% zE-@I(7t5ZTo4xw6t7+nfNB>{S3j3^ HP64Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wSVD; z0005)Nkl$P^= z;+ewe-@cyl_@mkD<3~>xAg(+X5RDupCQ}7q5^3QeB#4Vv90?!=uTm-_3x7g}@pt6^ z%<@Zxl7(-B7jS9PbMN;8!sl{svZeQhEH7Z`&DV}|Vg?QL*9IKR7qYy7V}U8I-CjV7 zUd}P_C=B1pxuBTWRY1G%VlqzVRsnbSmH!i-jJ|Rs;8>)XJTrooO=<&ES4oX4paP%D z$OO-nn2GLyPi17P0Ib_E0)OEGGPV#h^>2t11i+^b;G4n&oj`eN;pX%Q?<>&kwQgP%c4v0!`JTcA*%r;B4q#NoG7HVPh4;BehWm9-okxG$8Hq+F&v2EJ`?l6!evWzHbcWb>s6)?Dl5Iu zg=hb$4dfKOaKM+1?Q6C5 wRHx*uaXS>ta>(mPH2WczP0TkN-!xpWsZmLOo4-!wB+z9Hp00i_>zopr0GK6RH~;_u literal 0 HcmV?d00001 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 2ecca65e7a8f89b74ca0ae00592a64b0e8ba4043..0fce09d261907601fd951ca03e886bef07af1930 100644 GIT binary patch literal 1434 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0= z6HfD>dQ)(_#TlnweV}9XL6M6T*)Sns3IZ|VNf*e0C;rqtV2UpSCT-a-%d8j}n7BM$ z978H@?FozaV{#ODBRlPR|BM1g;RxA3#s`fz%sY`?A%6B9=blD^11-X*V-g<|U zpIPfV4jAs_Vp?I%b5nVO$;K?kl+!c6r}hY{@EI3y9sVd2@k()mnz+CNem9myD+(VJ z>n-ODXHsDL;UUfVYZVJa*|yucGx+Cyp2C@6n0@eg=Av!~Ly3?j5#fzl>Ra~l7Qg!;d89tiOgf&; zSMhK>q_#2XzV)`|iR{1XgvT+Ym6Tbbc^xcCU~ wP5y{Kb_;B{ZQj%uI@Br`ZEiSMS;r#5;JnvNVBPXP|3Rgtr>mdKI;Vst0HovqQ~&?~ delta 1145 zcmV-<1cv*X3yleoBYy+%X+uL$Nkc;*P;zf(X>4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wQ}Kx z00013Nkld3hO_Xk-u3 z#*R8*Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMneDqExHQBpCHJ500000 LNkvXXu0mjf&w4WV 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 9d9ec842317986718915e0220c4a2ad876ef52b7..595864edbd518c5c5a58d4debc1509fb8cd1780a 100644 GIT binary patch literal 1401 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 KMNUMnLSTX%hcX`k 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 6d2f8254dc1c7e7ef2f0a19fab8555f4fe479d68..90ea0180b520fa3aad3a49c3cf2134fa90da890a 100644 GIT binary patch literal 958 zcmaJ=O^ee&7>*QVEi8J~(~uQWu$g=`O%oc|Hfh~}DWzN39yd*m|g3@?9&LbTnJo$ne3{$$}4~ArDKh|6va84e> zWkE#I4Aa=pBFCK}0!C=!hdTS?!zUK_p3WZ0Hg87;n)(OJ7#%LV19v%dRgc|&02-M_ z2?9hMkOe1UqGdX};??LnKZYz=g^-!fUWgjnJz(G%0hy~+T)w6NMdbupQL4&)Ao79? zc?n8h!?nsTYc;dlZCRaGG`LQ$;Hh)S{u ziIY{rWUpW_QR2paM0^~AoY5KKIni0F^rD0y+R%o{x=plUFmoa(aC}};5op{04-JA% zbVB;*Qtv;BlffcFu#XZvk6n6kxCcv2D!?6XJv}vP_+&ES&FqTBoMg_@U+&?b6IHC^9 zmmBNS&BpvFq>hiNwO_pcc!NF*&N7>W?CkrgaD`!ZN^kvNr_#&ow~x=xzn;H&_Sg7) Yjb|RdFX`XP6DxmFR=aDyYaKuT4Q3E2@&Et; delta 1149 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..13f991f0700406c5537934d577acad02482b8caa GIT binary patch literal 1504 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0Mv>2~2MaLa#ASy`bcfTL84#CABECEH%ZgC_h&L>}{(|+-@3U0R;;?%1Tbc{YIa*-k%CIn1DASOKN0y*%+pPC0u@kPL-eJMI(5d#BLfTxRN zNX4x^;iq#C8}LjOImUNEx9Amv0HdjG>mV-k3 zB#*ADKN@*vvt^QbmRx=*qLaAp^)3aaUuU--e;imDF~3+Z+tOc-^M9~c;>L&<=57JA zqGE*2t{qZnIChIU;;^o~(FT6|>?H|IJzuNVDzhZp%s;=YW15-oVyCj*bLZ9UzpuSN zH(Hjzy}9oOd;dk_Im>NMFy?N*ZO?xr_{#EyM7%g)-Wh&XWD-`;-Or~U&^ zbd_z^r9gYa(hBMwbiF{jzBGGS*-mX$7R(lUdVxU~}k&c!^a`*e!iV#@`s5OdQb zk}PZbmb!2F8tXWt_V9!m$vgEFbahh)Y26IjY+&kLQ=`T_Drf=_h21$Wk9jzwI*_Z9g zR{U{c{b8+q;UDuD7#`Mc?B{3oIPY2e-70Ibn%nH#k9*@5-3u01OLSY5>VJQI7i&d} z$JV@LF4c}3cQ5VTkz76Zzty^{St8$FM)lls{o2hT$K20$%kp;7RsOhcLn)P%M{AE& zH%^Fd&{--nL-JZ8zp`iXAA{q+;@|78f4tKCq3P3WbHDFduzv5Xw?DKGFyx=D+j29N RZxX1?^>p=fS?83{1OQp!E!F@4 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..bab0e8bee0ddb04e68164c33ff3532a8b0fc3e13 GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&kwQgP%dhY^j~g8lX^)r;B4q#NoHs4Y>{|@UUKpIAU1- zNx-uD-NP4?*4^b=^w;bE?B<^eZj;XFuxM<*HsSA6p$&Jc#g(dx$_u|&tn5s7;%UFD zc4W=r>G9GR`IveBOSL&Gw4J*okY4ZN67Rh=>`h*T*Uz7MD^^`#Fi)DDap|8L%Xy%^ N44$rjF6*2UngD(l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0DJKVR~KilS^|`^GaZPQxJO1aq0ynhui|7%`T}$nPsUdZbkXI3Se(rW#V>= z2~P8%dQ)(_#T2JreV}9XL6M6T*)Sns3IZ|VNf*e0C;rqtV2UpSChZBE?o}`_F#3AB zIEGZ*dNbWK>xhAXt7@d&x`(A=jYm|TpY@&O{X=Ws+b{Y*mPPHDo71Ei(x|z5*}tIV z3!i;2=iIAypZ)x1rgL6wxOnoE@@syVRSd7>-`;lJ=)45)Yk{WIn|$s)OnkV)!qjBh zVS|RGuWVZiWRLTFd3aGNIrjRd6Q5&*G+N@PxjqVs5@~(1Yu)6z{D&1jZqhm0|5!t= z*1~X}PiSa)@x;r;&0#fLr04OmZHPR6dB4x~IcHPn{;#RFwEu6vjYBY;i{o9=XZu>l z|NmHg8aNFY)ef-CU=U7V@^Sc6RloOJ)W45kbS5xfYi7TBU~-O!T?ezCLqNy(+In&I zJqqg&va+<;*gh-L-Lr!I!0YHwf}bb8bug4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wSVD; z0001|Nklic zY^@pE6K$sMw|O{rGCcz80NmdbkQ1o2cK-~7%c_I3$OPeRr{yvKRZ%m-Sxn1g{!rD5 zYk5QFPWA+Tm4Nmu*YZAXPAe|*#6ro(G7!$xDIRJ@I4@$VA`^s9nR~M*V3C0N!zARK nyZ672 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 78b0d9f7c74f609af072cdf28f190936e2e83106..40f25cfa0fba4c9125a4fa2e7df5f293a4628395 100644 GIT binary patch literal 1263 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0= z0Z#LvdQ)(_#So`neV}9XL6M6T*)Sns3IZ|VNf*e0C;rqtV2UpSChc6epKBNx7~?%% z978H@y_xQt*K8or+M8Qf#dGbh(pRIYMMqb)C(aN4z<+l3w}}UtZpj8cow(?r@#E>~ z?h}7ZTD5ALiYHI9jQe8dy_NHNzsJq9wB~8PVz6K5wAE?5Y@Ri1w;r=pKYxN_x48_P zSzD68g2-Bi+?eYN8*6`LOx~yC9l0b^ih zp3SxF&%OU&BTnpEjLgaW{|)u^%oiO@1bAKGR73smJ+Z%nUc}q)i{xF?&a=r;?dF7< z0QQ)M1p)cD%YxPSELeY#m8HebxMZhT+!dx1zjQ16f1W5)kgoZ{Q>7yJDP@J^s~@}8 z&9C`vz??2%Ssfd1ZZ9#h_=fYp!4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wSVD; z0001}Nklh~WOv@Ag zP}COJ@`l8XY!3X&0qrf<@;+@&TSL6d>n`5fK)6t+cqkd+(!^9mA_$)nw`6mG;Q;+( o64I6!8*iHQzhQ_mwr&`c6PRgLHvqP5Jpcdz07*qoM6N<$f)TS~vH$=8 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 9e4f9f4750898b0788b6a8502a5adc5f98d1b910..8c48c35f407af506da2b7c020d9e389a4d4f86d4 100644 GIT binary patch literal 1236 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0#K&74eJVR~KilS^|`^GaZPQxJMxaOwpmhui|7%`T}$nPsUdZbkXI3Se(rW#V>= zBTn<6dQ)(_#R;cgeV}9XL6M6T*)Sns3IZ|VNf*e0C;rqtV2UpSCT*+JJHIn9FuHiU zIEGZ*dNVzHRkMLW>tqS}+Xei3EAIMzn?2jk(^-o`ITqag!AUU zn=9YT=FUrB&bzZTHnu15UZl0};=UD;H+)9cJjd zDt+Nlsf_W3cK7a{(%92V=ZifT2-HQ2bp~e!icEUF%dgCir}@a~O(OPviz~i7JW^p4 z8oKwatKWIvsE-%(Dy$?9q{;gKH;OGbn_hbFe*L-g|L5yE9hu71wEM=N{P+Xc=QnT~ zFsdD3nZY2Oz~s}wx#M3{T`_+n&jvZ06KwNRoIg3r6fib9?Ro!uyTwD+N?tt$g(oi! zr)NKOwPlFAKdFC4e-8VmgNw5#D1V%wetG80IXAYwm1~jEI6PtV>tFZ&B)ME$*#4(I y*2w*sPj$JOP11IM`*ntY^jZFP&e~efWxycMeL-_G4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wSVD; z0001|Nklh?jii=0Mwlob&6;KzO@q=PD9GxX5XF!hb}RjBqKY%1{GUNz}|!w_Sv-7qF6hk#W!o@IEG00000NkvXXu0mjfmq1?s 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 cb9bcb5517c66504acb50481550111e77cbe8dc9..f4a3a859e7730f568dbf1157bda16b9db876896e 100644 GIT binary patch literal 1253 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0= z8BX({dQ)(_#T=(zeV}9XL6M6T*)Sns3IZ|VNf*e0C;rqtV2UpSCT;fshb{&N#!yce z$B>F!Z>FEjJ!~N0>e&?~<-z#Mk==ZvvsAIPrcy3TR_m>)e>nFUsHGegcWyYy*dmzz zS)G@$W?Sa0t5Mk*mrW#dPw1Xb+VlO>xm$%Ys%^hYW4A{=lU$tmc8+o6w3F60XWoh) zZ#z~Y!4|OQUW3@W$1@u3Y@(K|e;p-OInSG^^}}Zy?>S!GizdWyIF{Y}zW2!KO(OO@ z%@toB9;q-24ZVBD)$e?1)W>^y6;=`l(q#Mp8^sozOfUT>WcN?$pw01PkGHg26fd$Y z-gNW-zJ}@cjVcP99!!%OVAO&5`}Y2OMSi{CuHVSBLC)p`+q@L#PmVGLj7?5^UhkT1 z@sPEWS5HCV$xFlO*$-W98RG6w`aYvShket*#n}^-KTc48JoBT>{cUf>S|l_MPgwl= z*R?;VJJvY!|K#7D($^#TJuhd+@x1SKG08uaS!(-dZT&Bpz>u-4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wSVD; z00025NklaYqTIfIZqOesa`2uf)tBoA{0MKmEx2+31q`Kad65EzIMV5~HminsYi vYe%tMmD)*bJMfx6@O?ueAtAgjq_rdflvq`Lu%TgV00000NkvXXu0mjf^$1>% 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 0000000000000000000000000000000000000000..7a953c1fba74c2b123004f28ced10f0989e03350 GIT binary patch literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&kwYhey~*ezMnQSD;Y6r;B4q#NoG7Hu4@&;9;3BGUd%d z37&&{dLG(pWX=&iaA?z%Ke`3W*(DWP{>;5nece)>Az^K+q1z{sZP!em^Dt;Eeb5>A zpqf!>Q6dm;y(S`*FfpEY!wFx;<@q(H2dq9%W#Io=)-b)s`he2?zuJ1!Kcs9_4|*pg gP{zrrc;pm!@)i@h)zw>5fKFlXboFyt=akR{09uSwZ~y=R literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..846f3d8cda6bceaffff86998dcd68a44a7b72f90 GIT binary patch literal 1183 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0IeOx=u}3=LgP9W9+)U5#B0 zot@oWEzArZVR~KilS^|`^GaZPQxJMhaq0ynhui|7%`T}$nPsUdZbkXI3Se(rW#V>= z5l-`w?A1laE!%ix>LbWqYDH1_V*MOUJ_ zCj=-NENakD;99Uq>u zR%G737V((5+OH%wy?gGmPS(H)A|EaooA2CKul~?$-}gBM6ID8MnXMOWGy3&~CxMUS z;*QzxH%qh~oOD}6VS4`Crcj={wi~80&G+khyd%!VhNIx2?hak`d0sd6n{wODbvRhY vu~DS&MD4@s+oyiS3b48`*6Tk|KEU8~v%9AB(qmxIFfe$!`njxgN@xNAKO~ev literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..61754ff9ac7a713534ec35ed4b31f3070aec8a51 GIT binary patch literal 1545 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0= z8BX({dQ)(_#T=(zeV}9XL6M6T*)Sns3IZ|VNf*e0C;rqtV2UpSChhX?57#mygI)4g8~E&bjUMu|rEi|e<6wAeS!RmRL_am*ncJh* zKH0rW>!tqbpj*4vEj?;g!Smok(VSl!#5Tp~^&jXswykPA3sdX0qZVAcGZybH@DsZ0 z(Gq^OG(M5-)ZydmJx(t-o;|v9Kl`@X%KsS`z1ydl|8OU}4e!wdk5AvNd{IB)_v}`d zJ=?@f4?O6Z%Kkt0fn?RJjY5(s4yv*n3q&Q-%sj*trhmNr{Dtc8m@h_ae4V8|^4t@Q zSl#7xyDQ}wzuhwKn}3$cpFg5Zv@3r7^)|b|yxI3WP0p;?(~@DGX(Pv-UoP@`ew)CJ zsnSBnPO{E2+IuOWnsK(DOY3bOhegFaKFcrH^)7h-{e@5S9htIoPRn?m#CYx<+Qqny zVbOHf=>oF(lUVn#2dwnC`0*ik!?%c9*X}dc9HuW%3T{whQubn^{&W!s;2`E zmR^??ocKd%bwWzx9oF9UuO+j4T7L+;SI4=1X{u=W$)Crz>rb7e90SM47Qf!JY08bC z3U;5^rn5aax^4BDL)(b} zF&rwaTBbP0l+XkKkGMVo literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7b532bed79e008b6c06d7dbeb79fe350ad25efab GIT binary patch literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&kwQgP%c4dfV>(@j#)ao-U3d5r^MS*(m6$$id>z?EHHH zPxpqn(+l{Wh3mQb+kUG^S#P%1h<-Mw{5>y&#q)%LT+FztO80xV zNsNnER|C78)`P~~ENk**v>wP7cQ7#L2_+mjeEkFG9-)0ec!?$A!+9pTAJ_LgX)a7n zG8Og{^w55I-)g}skJk(hN=lZp2?unA4Gue7KWKSgdcer=nAEI!-GWM&|H}XJOSkJ= SCUG0+Ul3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0bnZ=3=E8g zo-U3d6}OIr@Af-lAh2a_=#&~(*4QYKz)zYrqVgrGtgNi1`;>z2v1e!2yk?M z?fLHa#k+HQ>cR=vN@age30J(mZE3p>tAiYKz)R8ByVCf*7?-*|+Vs9!>7O{OLymW# z(5wxv8|rVwP7rCZmgG=8BD8>~aqh;o{|jZzSSgVsk!HGe|l~MZA1($L2Xr8OI8HE=@UR;;R`s*S4wSM(l!R;dvW38CyBNXHr?q z)pEaT%NF(r%#PU`8ul`uI_>{>;>*??K7(Bj-}`a|9!jN6xScs8*JZ-|hpnHvW=sp3 zCV2j`*;EJH0}@AbZ@bAAuu4m==HB4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wSVD; z00037Nkl_BR;H#Dz{FEZl!Gz=kGMG{ z17J_S$3z3L8Sg^9HwECexhHPxFn_=daSFhj@#ypvz*!;hJ{*Bp;Osv+0DDWM0G>vb z0eHkM9vOi5me2rf#?mJA+B|}Q9he~w_rNT17{JqDXs^H#jB;%E7{}xQj5r)Yd&1G2 zjZ5yp2<~W)0zez{ 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 ba6f1bc373f17d88d6c01b569afd60c67bedee0d..c7d020dec311bf468378ac871d9afd68a619ef4f 100644 GIT binary patch literal 1292 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0= zB~J68dQ)(_#Sy1oeV}9XL6M6T*)Sns3IZ|VNf*e0C;rqtV2UpSChe;I`EM8)7;8LT z978H@9SM*2JM6%7=WaxxQX%`l&+>)bM|drygZvNZS}@$VbalDcdb3PSz199&&y}*< zH9fZ5(qr#$d;61nU8YpHNNaU{)ZN>UyUXi4+OMa}o&UbPzv9I%y*joD%nHwMa^0&| zuVDUY;(L95_nIZCk#2S$m^SHnS7j_^IGM~aL2kzLpT8V7P1=0LC+1qIui)QqCY5VT zPjITN5&REdoiL5p4-`H?I4?E%!c`O!j2%&`{STjmGI0L`qUD9Y3YG zyi`aMI%3hcJ7|gF64mtgRf5YcTQ7d8m0w!;PA{9`u)&g)hqi}0)+}f6<!Ez(S-aV9uphd(f$2M+mcISX#i{ylY91J|RyOWUPIuYUrh8(m^gA=9Q~4LU zkBb`UE)DCgD7hWN^rfLy^m?gm4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wSVD; z00035Nkl%bNH@1ZOq_9~wY+ z9y807b3XQc4>q>X7S{JVos&V2<+mL3cRs7f7{g1gQ%X6Qno<(^CLXg}nQ41YUus|KtGdEs+9v8dV11 z5x00`0Nz_d1F#uOo6u`>4+3^zggD#-qr_nVPlKVo0!PrxvEE}GlLIi~a0K-Udvi7} zxdT18yFCg3ZLB+?)*1}JX4?|1*CBvW;syf&u#IJf(YPQ0E65DSF*yJuZXkz}1F&() d0hp-l+drP5WM8NBhEf0k002ovPDHLkV1gF_fzAK` 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 3771aebbf8e91b358f403e8cc3acc4deffdaa774..00dde5ef161d9b14b5e087735e550b052ff26431 100644 GIT binary patch literal 1286 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0krMZl!}(DwR61_s75PZ!6K zid#p*qy3H;@c0C+-eT_f_r0$LWBY^2ixv8g#_KyS-8X$}xbP&sKNAmLTDR$T|Hk8w zJ753aw?F1^Y3%b=tBT&gJ1U#sfA4Q%%X5AiegFCE%Ou(!e)BnKDk75}R`GuBi|I`I zr;C1X*W-@5zV)Hzy0)C#V)C0L79zNjKkPSPc(6rO)tUR8 zn#$jU^O{aDTshex(6p5ym*Y*><$v%gXrejN| zs2Ne6W$=YqtT3$A3PE$+dK6y7RrqE5`viSOB yHD*n2rmxH2g-A*KPWV=K=2iy-&l-J3Hin#6C+*JtFgge-nLJ(nT-G@yGywp-^v2Kt delta 1319 zcmV+?1=#wA3b_i9BYy+%X+uL$Nkc;*P;zf(X>4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wSVD; z00035NklNIw#lr={aYW`*H%5o7%pm^oO5MrN&!rKU02FM8GuLJoRR^s zC*NbD0oaUpq28MU@Y>uHw{;j`hJQE(;LUh+dJ5pIkar)Bz$l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0= zF;4TKdQ)(_#RR8beV}9XL6M6T*)Sns3IZ|VNf*e0C;rqtV2UpSChZz2yBr1v#tKgt z$B>F!N5W709(CZkle0!6^J!m6Esly?4o+nDz2M6AKt}UFyVMX-|}RW3IKMt?BWZ zu2rj=UQB1wKkdYrJL}j7k#Og2x!(MdJPdb)0$!P3D?KYWg=>pc>*;;(Ie)}UFl@+o zJ$a$2*5!Y@Eo&#^iqFA3sf@`z*O;~_Zqokt*S_y@cVltBm+S3qY-@a8xF>M+2)bO& zXwFoSbmdKI;Vst0FQLW AzyJUM delta 1325 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 LNkvXXu0mjf78ugk 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 b6eceb1579e26d302120ec32534ada36d30b65fe..8bf698c9b040b3292cdc30188866f5aab41b3e7d 100644 GIT binary patch literal 2598 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 Hc=~?;wyr8= literal 1998 zcmV;<2Qm1GP)4Tx062|}Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p zIR}W#i7-$a9ATXQu}oi!G0*I7v%vm(^80j(wsrNh)ymmp^qMWD|<# zn{WTjKF+fv^w!pv=4-Xuh&<1n-}ohChp|h~Et5_l2>$Sj!h?%8jG+mtnOMiA=s`A{ zBM5l2{TYqp4a_wgSYO^akP+>H!TFw{b89VFl^Ps>3az!XX4yB#K_aQ{d7f4>DOOy; z-QQZ%w#8VhU|d*I`L9Y)?y(d|h0b@}4I_WEsKF|LEL#Go}Gpl_i+8_i!m>V)9Lh}i~$xdsnJ=~4tm}<@=?ry`DM39`rtNTBT zrj+rZBjW(cAc0z3fctI}cN@>~`-e3`Wo3KBfSwtC<`1Pr@YmmYG3rBZcSM>pCyz+k z{*clp$lAbu!F~P?IO2@g`F(IR(WfYVJ2HU~#MVcYzr`%YH?}V1^$twyGQP2={-yH; zDwN>n4dmWkWFUEt>^#@vahluD9|J>koxvkL@lEC= z8}A5#P2f^#DyNL|I>pU|j3aL{e=YcD!A4~%Q*b@0oWoz0Nxv<|GmcRlBG{FJDCId$ g6;lR~RJjcx1^@s607*qoM6N<$f(7Z_82|tP 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 0000000000000000000000000000000000000000..86282330121e83515dd23d882b254d54fdcbdd5b GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&kwYhez0$@4>@G-+)4Go-U3d5r^MS*~oi9L4es;q;s0A z#wO-iwRFC&`;F6HZDu&i{qd*A&*%fwawQ97p1*Gi;`)A%ks+B!An=078O!1xL52xI zhZ5&D>})I+ySQICLN+n?$oHwuDJ@!@9!Iu^1W0eZ$+pCBwZsJhap?;}^W#2B*SzZ5 p{Lc-$+yz0Rxv&pSk8zmh~8A!Wz>w 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 I&MBb@01HJ0#{d8T delta 1529 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 delta 1530 zcmV4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wSVD; z0005jNkl6=LGSgfnt88+IUcP6^WYLZT2r2>cZ|rPR@5&|yp57Be z5>c1SC24CQ286v45`a}@cMqFV0;MXb5;4}cZCj?T+2e_Cs6sar_*V@_NQ|N zpI;P!2vu+^HppxZ|hU@=8=5#1scqG5PK-*;P(ye3&iV#U*be%UNUq5|^XXRn03q0D>b z#9TFp2q`36213ZE(ly5!8&`OC#19U-j~)_Ecga|Lzu)JAZ+(9cKX2Lp8-E`Y0d>7z zr)xhz!=BIQOe-nbwjDg(K4m^IXD zog*WHp`s^n-NGwY!o%%4)f14?$dgY^e3|#~2j}oKJ^D?ykH;hT`gwZFC2sxl`?1Dy gr7r)l6ideb0+d_XujDPHuK)l507*qoM6N<$f;S=c;{X5v 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 e7b36364a899d6b20873dc34255b18e3cfa29a74..edf1ca6a2da33f90f3cb46297312cdefbbf66f36 100644 GIT binary patch literal 1391 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nAI{vB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuU%v{0TQqR!T z+}y-mN5ROz&{W^RSl`${*T~q)#K6kLNC66zfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$IMft0!ZY(y z^2>`g!FqgstvvIJOA_;vQ$1a5m4K$`WoD*WIXgKTo10lUo4T1A85+8pTAG*{IvP3| zn7Ei&m>4@5!t}c2Czs}?=9R$orXcjX;M5CB4!H$Dn_W_iGRsm^+=}vZ6~NxM%Eav! zN1WzC^`_u+FSz7bNr_9Ba|#-pM}wn?PR7W`XYtpUgjT?K`>HSVhkyZ%vCs z`QPxptCpG1^_!h?<@MJ~4+}gjpZ{3fpRxPyvAcQOy?rll+4Ny&bIH0@TA?eOk7%_1 z{#z$;yukAvkMyO}lTWHh{QhevVWc9(*RHrFMlU$_dgk7^<9{BdZM<1rS+J}qVNM6fA@5g$)<={-6gkw*TJ`1hm-i3e%Raf8 zb8U*W$c`ohwGavMl17yq>4z-6#XG_iq?hTNE!!@m^CWuB?Hq$8Jn?e<$3Hf6x*k-& zto-!MxkUAcIh$|J2|H5Ad?eN~!{xE?o8L#5-;fuJm)4tXA2083zfK|HL$BMnx4WmD z&;MFnah?0w>?s*vf-aiGX>GbP*XxPxM_2J}e{`4X>^qbyz;aS@Q>?bsBg@`goB8MU zXTA6@@kerL;k_IN#p54jT;DDzHT^Yf^SXMu*t6~XSR@!WUYNSGea($~pd!%I)z4*} HQ$iB}qrnCD delta 1550 zcmV+p2J!jt3Z4v*BYy+%X+uL$Nkc;*P;zf(X>4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wSVD; z0005$NklBc*$zAg!nX+W>)}QFs|G!*@_8dS^39Q)WoGfX!G8yaX zJs~7v4u?aw=paRcdn;xDG}U?!n{x(ZM$kwkSnRs4Zaa66A4bGve}J7p^$T~qUHk7( z_xK(@|CF#LGpEyuGYlX(e6-s97JnaO!Q`}Xa~lT~ru#(aYVJdfz?%a0M9?EH9Pe+c z&n*Bc2=>*0(OQmzZ=YB|#0>9Mbd6MrhT#g^ZNCO7|Fo)DtVX(>U$zLbsDeTWB`PJ~ zaOFJ;Vy;?JM4XZ}2PKqK*|Ek2n;N_X5(W?b+ZHlScPUsrpU-o_r@p_3pMR(P|D9ix z0dqVar)z(K2JZL!LaQa&bv<1Dz~eiCb+*{NC+JotXyg&^Mob%<@}bnKti&_L@@$FR z(Yn-@$pg`HXzM6YOv=(L3B12@F#YXqC<4xMH*=yyq+O+(xwDl>u#{>LGP~j!AW66P z8+PYLOqEBl7<>S7bQ=vK5Pu;7LQT(HFi|R4{TD(6YwIiKn0)Y_O<1y!Q!ZEpwu_?V zY{R40dv;4Tx0C?Jsl+SMzWf;dlyYtSh2{;E+0gJ(jKY)-zwqTG3L3g{$wouDv+hW_8 znCoMPiX1$ccrw9X5iY<%0|`MxY)DKvl=ve=5-x_+!%TMv zXvO#R%=3Pq@AvyW?~{Sd=T+Z#(-zEnp{kVf*7(GvmAOHhXIMiwYpQnO=gQ?FfU57i zJaX>+ObX!I_LcAd^Q@`Kz=qTlK(iLuvyeIlx@-F?1mhO4=V<7Mka-s9QsWbokjVmF z^(Za?T~kp!4s@x}No`@q40Cbh4CzWGcl~Ud+tLC)h%7op= zT>sBA>$aBlHUVpcnUO=lR!ALdsDVlxe_~gQBfyK0y6lJf3a}Ycf3#-Ca={irt|ajcdi^v~yrE#?Sk1c_{KG&Z<^rEXG`|s$wbP5r0c> zEaucV)T)I;zz)#&b0k$o(qsyWjmLc~DwN1$;iG6Wje|=GiHAhtq@H93XBAu-iHhS6 zqK?F45ru=j3MNvx9b=key~v7PA}jWaA+b;F5q((VHSxOGFA5?n`o!LLZ8@QDQRjA> z=UrMzEGir!f4aN1wWD`Zz3tdnPThH+y7`D_x$Gx70Rm>)$nDAgFU^0qp~G=qoO|oq z+Dr2se%yTZTl%7YUB9K@&=)!g{a1ZKU(j!m!^NeJWEP2oha^ZiNcM06myjwhzv0nL z;2uz%_D*+qZtN?k?#TCs?+tUZr<2Y8lKnG#J^N|)Z1(quro7^mw2!o}wC}aAwQsZ^ zv9$Br1?>mzqV}csZQ`v~-;eg&lS_0f@m8F*#5MEgM)L);U_NKQWDa%s%=KokIbd!v z3+Bf5yCwCKy*NzZwx_zXR)ibF!{I0rML-o7kK+&Re_Sm#iC!`I(AMq|dqvx&Q8Wrh z4$IhP^clUzK_l1kXKXPFMxU|8C_b=t_9`971S;9*cBYU7%%E_XL*f!3LwPI&=x_SR zl~Zqo*3NA96)WfauCxX{dq8YOqyqVxa&0j)_yK~zY`wN*`y^Dqc~fbDcK zQq^m8)%%~Kcd7Ixu?@^(I{6Z}`RQViBE>lHfCq%G*Q=k;XY_p!GeZaga3H1#5rK%{ z@p#~VzY}J1yWRY9xjYlWFXRbggGDWUIs*AbJw+leL z9?0993Y*@?JnRCv8S;~lT>vLSn5nJWcJxnzyAX~6(2S(tj@okW&G&~&gr*ygWbiQn z0Mwk3v##EoJ4z|*_PzrUQbJ0y9vucwLv`*XepRWp@uZnpVYIPSt zL=aP2=*l>5uZmAQspO1d`0q4!-QJ)v%zWA{wdyX&>C{cOn{BFYAU7}*>a)Hge4KE9 zZ4RCnLFl-%qb1~)e~A$iBeW>Yw*kwLHz(TNmnAB-KubZ*8C@5_v^@{q*J*b~764J= z6v>ePA?Ih!DaF%%5?hMGvfNBDneDAAN-EHNyXVReS>|Y|Pr2 S)$?!w0000c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuU%v{0TQqR!T z+}y-mN5ROz&{W^RSl`${*T~q)#K6kLNC66zfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$IMft0!ZY(y z^2>`g!FqgstvvIJOA_;vQ$1a5m4K$`WoD*WIhq=qm^xXQn!1@985+8pT9`PQI5``as9%gCZ9xvSC8N6a-?zlP-`0PyDHQz!YBuOxkJh-pevDF#h*+ zaSW-r)f2kA=#YWHl%4~|e;9b}C*1ShCGs-k^U9K+4I(d%-Wlb6W;d|m;i~=^$9HsE zQO|LYIq%Bee{0E~rM7GK+Uwck$tC*n^WXjbc(d|-?Df)3+wbP>mEL$ZO*uV$_0-j? zPTAJ(*?GO)?cA1JZM%m>J3S069+d8$o9~{@rGO8}< zV)Q<=y|=xKWp^jP!I954ztUS5{n1>%u~R2jbZ6y7N9Q!F!0VP@GL@!X`S;Od oFVdQ&MBb@0GR#}!2kdN delta 1577 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 delta 1566 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 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 24352b0842d2f5ec3140857083032de8c1036c14..e27fd30eeffae84ea28c4cadbf3d78096103298f 100644 GIT binary patch literal 1405 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nAI{vB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuU%v{0TQqR!T z+}y-mN5ROz&{W^RSl`${*T~q)#K6kLNC66zfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$IMft0!ZY(y z^2>`g!FqgstvvIJOA_;vQ$1a5m4K$`WoD*WIlDSpIJ!8Ro4T1A85+8pS{NBxIvF^- zIvSdqy0{ve!t}c2Czs}?=9R$orXciM;M5CB4!H$Dn_W_iGRsm^+=}vZ6~NxM%Eav! zQ=H~O^`_us9{{Gm@CVAU$AKiO4?edPMwbx%)lx>W#c)yq1 zUjE&WU!v!8w%>jsoVPuihmHLYW1IPY-NTl4ulh}O4IY$O)xMLNYc0d4DJaw*$#L-R z`|pkp401nSFrDL>qr6cfLTrmp$vhu5&b^_lKL3=dO-$+9uJ)~~!Ee?XEy0=yp?#)u zT0$k0RS!wskGcM)YOh;-Nuk~RhqZOOjjP}Optqj?@?YPeSi#cZAYm}ISSWQD&CLOqG#KxHXWB-olJc2SwY&_h7 z!oAZ@WSKmj^S#wj!1^p>Q*c(4(k7|o26i7#mVbLhm70TqY2s_6PifwkH8=Q|YB#0c ze*gX10zn38ZtJ;zha;@+S)Kg(H|4IY>NL+~FCRC~;=HxZw|0f^<}PNomBIx*-Mov! zS^t#tZMnJcfYqrfA)%Zp311r?{NSrUb@9kN57X6`)_qmjzxh){qh#o!JItGI$rL=Q zl=~aJQ03p0@Jyxb@K#g(%nK7{`d!)DYUjV?de6UQKZLSegMYh9|32REdp{EogIWH> U)kebEpz@T#)78&qol`;+0NFGId;kCd delta 1575 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 literal 0 HcmV?d00001 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 c00b014d8cf13f7dd92c9d5005c250e0e791adda..d213a8f32994da8c1ab53e77bdc2c63e1bf0ffe3 100644 GIT binary patch literal 1747 zcmbVNX;2eq7*4HHz#^t{7w8g26i9YAAtxZ@;IamhL#R@9$u1B{vLRU@h+~n)Qm;~U z&{AMTDAFm&QLAkVf<`HI1fi`5DgluSW0gZ4t#W8L2(~{Qe{^Sdzwg_9pXYtvYj$^3 zWSEV$i#3Hpv55$mM3XCEzAfjG&nc&oN^)@~LK27=JekNsG#EvQ;z<|~p+r)!XbeHK z(=T8F6w2Ewd29laAYCJn;YtQ#wqfX$Y7$MM1O(~Sh%5~wfFvwMt_q}$HMPB!Lnm5J0C?sI&rIAZ>@2K^ib) zLZk)KUW!VPMgd}6g8^&?hc1I*7~t|5Fq_9>vV8$21hYYi55f=~f(0-nU_!v`MI*gw z&}2chBy`pnc?zVZ5`~Kvj4T!d*Q9_jpU(#&Cdg#cNej9*TSXu`x=OorjzNNH zWg5AfkmD-A%!nl68AKqBRQfUmrCKU|MXb`!CW=fMs6*5s%z!|p(j3=}wU&s+{+01s zYi(?{8Uv#-EuNu~k@ZMkItM0m_hv_CLsE@ktwv531yM+FS%wl*5fPF=8u^8R%29y` z7K_+^9Ep%83JGDsWcW<3C?u34Vu{2OF^fIN@j5I!lmm&FkT8@5b744yEn*8{zDUdy zK`wDj7ECS5Eq!#q!^X6^Jz$Lg1QM99PVBKvXJD;M!DN4T!}v6$e(t z%T*|zrCn(*(aVS>m`0w7p`jXF3C!eJAb*VpE{dTnD2YW!lDP<-&-R1qd<22%etZPw z^OJcz4i}@%;?e(;JCGCvnw#W5O*8k3>_qeS)d-M>S3`uU$jQ-=BT{AXn50nVO-4wB zvAP@0>;3mGS?45Wva(x0TU?lcc8ngtuG=s0r{;(yy`shM(;XIuPwQ`gtTU0QL^ z9;nwETnA2G$u=HeyTItd9@> z;esw|o#{nD@xH@{*SdO-?-G^PZqnAt_ZaF*gbw#w8ZHT%hZ0Z4$L;D$H`raS4c99; z9~M+qc^bbod|Y#dw^2P`W08?deb>Uu>!8)m@}yg~9gm(h(?6Pj?5W0(xcqX4N095H z6JL~-xh3!E4GTPH8=O$#cxFjvM$A*{Y0t7qEiQa)oa`yevE$ud6s#!sFAP_A4x$(B zd5(^bDHR3odG-yt{f&#T7qZ<*JZRi+vAMD&Z>7be&uqSZCl1qUb}~lRWcjqjZPM! zhP>%RX*&$D-qhs>FE}&0ca|1DdPiKBySmD_wY;NllfJhgw9UR}Bs1kX9UVL8ZvE%; z4fWTo1|RUol1vku^i69<-I-w>jXsZxMjB}~0Z$9N??;V?<-SF!rYIPRvCh5b-%LbE Kq@+%?CGQ{RD6L!o literal 1158 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NSs56Z83KGlT;-&t6=Y=<<>Zv)<&_l_R1_6em6TMKmDN>LG=NA|RZ~q(Q(awC zLqkhbQ%6HXM^jT*OG{TO>_%)r2R7=#&*=dVZs3QCr^MwA5S zrmdKI;Vst04j&Zo&W#< 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 0000000000000000000000000000000000000000..a1713603204238bbc4e416e3798f00b46d1a92b1 GIT binary patch literal 1427 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFz024M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7p`n7grJkXw zg|U&Tj)IYap{c%srM{tou7RPIp@Ef=fdUjL0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LcpzHo!{ilG4o3^M(S!~%UoJp=vRT#&!Os*6j4QW4I;s=7F&vLIDI zD784hv?v)EA8E=k&A_n3ZxKi#&^1>6MVY`zNz8G{PcF?(%`5SAu~h=f=%r+)SUDLw zJDHl8xj0%lxw;w~0=;i!?&Rub=49;T?BZ-}3Nr(nUNc8i6GsylGdE*Hb3;Q{Q%4hX zBTHu>-_XR($kGL_*E6rUBrz{J6=rWH&|ausQ@nbuoQqNuOY)0C^7C_GDIg#tza+mn zBfmhw*%=(;3L4>=c`5nj#hRcfg80}awJ5VJHN~wcKUV=9##WhF++d!Pnqq8_WUQN* zW}c{PX=-AqYnhm6sB2=Gm||&}W?^Awo~i`ZpF&R9=>r|44@x9Ri3TPFOo<>SJPQCh z@Jy7N2h2G|z${|7~Lm*hK~FhiyDVb<27KQ(rJ5`}Bt|33Na zBX3~BZ^O-}zgCsXY8;4Pf4%Mf_v%A}@q+ta*~|62ifqY!9e?igoew2el5%|P_M%r3 zW}iJaVR=CFqgAVTx)&MvT)r}&cfG?+*?#xK*I%bbT;E!JJxBBOrO52K#yyR@AJ1eB zKQJ%p_uqRPGNmqM&$_tj@sAYo*BjrKz5ci{tV#R9p}4~#J0A;Qf91+v{(S11sUmTV zmd?*MmDkLdO7lM{P;#Jq>a65DS1sx)SPeq;ZsjH{%-(Xl=IQPi4u-D|YhSQ>GJBR{ z)blK<^rh#7l=c|!VfyB$KI>US)}do^ma|hoT$PGjH9PC;q1f}x@_oDBTb-W4EAi7! zrhaATv3oCLQsv&1?Y7^|d#WOA_sVmf|5v2!ThsF*WR*{LTzYdF-|Lws-hag#zyH2# ztz9o#a7F8?*EQMW^Ug2#f3`Gj)4U%)YraYUd7km_!1wGZPw|AaPm4aD2omOXi=0;J r@m&1hp8e;}J1<`tR$9QipNWTIwQ=xGi==2yP%-K0>gTe~DWM4f?Zy^! literal 0 HcmV?d00001 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 54b7378ce1c313c1927e292174a14c48e5b55e62..b2524d847a8a5177ad4d004594b476dfb3d78114 100644 GIT binary patch literal 1760 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 WrmCUnk|o#v_Xw9pN@_*%U;hIaK%KAv literal 1162 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NSs56Z83KGlT;-&tWo2dMeI>6ciN|RTLFfm6TMKmDN>L z)KyhAR8%xnRW;SrwA9r#H8iv|HMO*~wY7D0G&FQHHFdSLbhWj0b#!!fboKQO40Lo1 zboGq%^o;cN4Gj#8jZI7q3``9T&5VsrO-#(p%q@(KElo@;O--%M&220!Y%MJvZET!u zZC&i`T^$_U939=AoIISJyw*3q1*0KAFa+EuX5|7EaTa()7BevL9R^{>nJEuZ&%Y`EB9#V~Khs@T}+ zp?iC`A1Y;dylwW`eSdAYo&7P-;6dT-_-FrKzrQl`vAd>%-tqjkSEBB&`;w|BDB--Z zkn>}0^wAf_0*QxA6_0#+%RX%xXM)DjHj5*lbXo=36c%gjDA%1`<>ILsHsQ__r|8oU zf<>Qra>+T*i`Ls}yGo^qe}kOV($ZjBIADLJNorxhMB8sbpEG#6`njxgN@xNA Dl{e1y 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 7331844d79e356161f165cad3fe9d1e90ec733c8..4ac3ef054ec8a6142fd75c41e6eca43b57e5bb2c 100644 GIT binary patch literal 1729 zcmbVNeNfY89Ik?=ARenCRh%wYnA6REq@}be6r@f02C*_hhm_EUQlLpmf-Q)surW3! zOws8OG@8Ni3osiIO&Ur8NvKYb$=GA{SJ{AG zD`UrsBKeU<1)8D{$tKV(*-@*FeWe4~Jer736U_dDZFdNb_Qfij5XLzOb-u{}$ z24+mCG#UG)sJO^zK!Fn|AmaLPG$059Vu%ZhBtn5`10djoA|4;&fqV`hl!APzfDg=G zY}y;4O_r+Qpjlt^Nybj0D5I3eGnq_WlaPxOIvxl?5RWh52?QM4f01%2G|*qBs`Onv1z3*LogU4BVQ3?{DV$8fjetTiQ*mHj ztRBCh=uWh6UyT5Lcr`>QMo$hwj|dg04`nds4~N2m zG3I*>U)@Suw%M)4mK){S+NM%HN!kDLr7!zW1EX%tyY9m(cmWGLwU}976VA*y=~%Rg z8-L})UjhQZEsA#7ZMawPo2qPZ_=>IQJx%>kD#5bGbA``yt&kNmHC#`+^Wd?$F`;Q^ z{i8{7j({G3CJG7%Qfo19K zbuX`|VEIAN=HlDU_b(=TEoJ)o`@4@&(sSoKQ=Pg}e>||R&%2x1k;p$Yd2vH{XGB!g ziMC~ytcu+p`wIpc7e+q-#=fYm^nB*JM&jq^7O}Q8Z`ZC}9%)r%-{O`euqi*^A@k6b zv*c@L$&JIJ;_W-80rOZp+9X!zI`yjgnYM`zTv&TIAa~mHvhh|-#DJ}?ujlub2j1C# z`u4nsb=^lLX;(e?!3k}rMjrh77sb_o)D>Oc?j^dvjCCQq66)T!@Nu4q?4QaVDCjF? zSsks74eS3jwx0Mto|SXysbaj-_FY~{#k5;aV@~9FQ^!~jro%?tCY`T!EjV^W{cxzz zWpL1Tv-@c3=i8hLC#Ld8`;V8E9lS9za{h;w@Kvi;UoyRJ40uOnlqA< zgDNAQKb)?q^=?}Mf3y8U@pw@F>Qf~iZ<%lmD|7b&PaYVEbZcI1q6Ik>mz22TdU2dB zd|dr*scDc}e)OOdrtv3xQ_jYOS*yaHOg7~Do(o%ZDSpaz;m)UT*E#36mqk?_W~uK~ zmP2uBv3R@BvDI5!3bUD9Lh6`cF2C7dThr=AT2>Aa+l)G$j@q+4;qU6>nT2aF`yMYA o=z@tZze%#%^~LZ{c~|GVFgD84ClbARJo`^2R2cNSs56Z83KGlT;-&tWo2dMeI>6ciN|RTLFfm6TMKmDN>L z)KyhAR8%xnRW;SrwA9r#H8iv|HMO*~wY7D0G&FQHHFdSLbhWj0b#!!fboKQO40Lo1 zboGq%^o;cN4Gj#8jZI7q3``9T&5VsrO-#(p%q@(KElo@;O--%M&220!Y%MJvZET!u zZC&i`T^$_U939=AoIISJyw*3q1*0KAFa+EuX5|7EaTa()7BevL9R^{>nJEuZ&%Y`EB9#V~Khs@T}+ zp?iC`A1Y;dylwW`eSdAYo&7P-;6dT-_-FrKzrQl`vAd>%-tqjkSEBB&`;w|BDB--Z zkn>}0^wAf_0*QxA6_0#+%RX%xXM)DjHj5*lbXo=36c%gjDA%1`<>ILsHsQ__r|8oU zf<>Qra>+T*i`Ls}yGo^qe}kOV($ZjBIADLJNorxhMB8sbpEG#6`njxgN@xNA Dl{e1y 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 0e8e8c16ad66b15638c6c6a9ce55206a6eeca8a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1157 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstPBjy3;{kN zu5!}S3bL|_a&k)Y^2!Pds)~xLN=jgw<6>f`S2>*3+&>FMv~~;_n|C7#JQD6cG>* z5fl^^92^xA5*ZpA6&4m79v&MJ5f>Sm92b`o8=DdzpO%!Am7JWJl9HL4nwy@UlaY~| znVFxRU6`9&oS$D&TwGOFR##csTwf0ifl)9T0%#%dw{vzCP>8d@BeIx*f$ty)Gwzs} z{T3)FS>hT|5}cn_Ql40p$`Fv4nOCCc=Nh6=W~^tbXX@GY=K)aBH%}MG5RG8o^W9-h z1`-Sp6x0W1zKXbERg;|enWNhlb-R0nE z_0W&cs;;UmI55M-=joKN`@WMtR)AqS1Zd_?;6!%^JFxcfq*2fn!|Hsz0@Z6S-F4vQK#ZdpWQHlTPR)KlI5Mc0h L^>bP0l+XkKQAyl# 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 0000000000000000000000000000000000000000..b5bb7e66ead7becb18d54b91801acfb8912f784c GIT binary patch literal 1516 zcmbVMeM}Q)7(a0}&R`HkqlkJbi^8D2UQ53YT1LO1hA%4_#F@&`drJ%Su3k@iU{PRm zVvN&?0j3cgY?H~9WE*h{Fb5G5#6=m9F@iFujF?5mnWftty0=K#{xJTrOYYwHy?cJo z^Lu{J^W5Q_thALYqE;XXveKMxu)q}!+{;7Y^Y3-{Tj8>vGv;$U7(3@BS%9QcOd&wc zF0u$%07;ea83f4)vXpk_=5zU(8H9~-iOGPCn0L7$8bOj%csFS)0UTNgik!4Y_^|7; z5Oq=-VV*owlIhk1hcmr`1v@ITa%~kQHZ>(o(W1#b0UfviN20u|l=cw3MmX=6fcwB} zOo+~#a3vbyb5i-4IjEjt0V)?OL^d49QKedp%T+R|JOPzTa5*MXW4J^l!3kVKNG0gP zC4|vf%1&4eriEDWq!Bte&P`yL*XtE~WnzXc!f>@(jY*`KR4RfNB2PKZk-UiZ!~{JU zfXBu<-JFx5(SS#?klD*=gpld;6kP7i%tgnvXF(_^8OD=t3>QlW6EHyB;y)Hm=W`jluzlbR(Md)z7 zPM)YRq^fjAqYQ`XOO-mKNuiVJ^aj059`x}dER-8piqA68r zNHr>CL9Chfa3pO5!MIKscLA$=DVET)faDl9mtjhS9gyQ-IL6~(+^AkZUvV@x&q-5^ z*Ao{g(esQAfOVDu%EU4*bY5e^`2r3~3Q#ghp-e>Dm83{5PsBxPlEg)cYLZf`?JAW* z34{xH>i=kmK|)xdN&eF`!B?;o1KY(BfQQ8)0yLZ)7LEub=^R6lkVvy3HJ6|0t~Vd) zdt=qX)f>GnZD()2(!2Z4vqO`2*a&~+X{9eG@{zP5YqRyl=NY%!FC;a6XWt&#zbB!4 z>S14T=j%RgbKlMjTYNp%KFg<+zu;p_xOP+6?I&}JX7=mSKm5_$oa3H!)3KxBlfCvY z;*y)M4@6Z??(WDVd#sm!Ak)0{;9%@mH|c?fwo2`0^2BRvr%bJ+zsH)*tD>*Hms0E# zmwR}DuTIdBbuOlRmv|rwT=Di;XNnIikDng7cXB9=7hHK?;B9%eHv z_qQwF$oG3H-UHku>5Qk5}V!V9`?W;F~uPPRv%uW5_`zl3(rk{^!e zg*UZ@c2qTfzt4SpsI3~)atYCcYsdNz3}4+a+Z$nB(%IWUp08ytz4hpRSyw$`TJ6f{ zyBl-zSR<|20F2sL`?8_@g3ZVM)2vw(zw+n4v(49MEI$@^el{5A8_h|!#P#1V+jn{D z*YKGZV*P_vA7pH~G29wiyWH_-!Q@1JeA0om_K(62>D$};3%9>h!xLvth5S`l;opaJ zR?j_aGEP@bocnT6TRrd~J8A#Z8-r7I>mJ-K=-j!67e|FIQ;a;B`=&oi;NE(5f6Z_4 z>Fp!tr(A@!I;FLDG<)0H$7@XEw`;eqFWgP0Jx+p>&2Ae>^u9Ygb~Ma)IsRs|qWcUH edhw^cswK#^UN(2>)2@NQ|JQ8HGF;RZ)cgZq1vk|I literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3c5105deba7ff3a23ad30f9161ca73878fb10c87 GIT binary patch literal 1636 zcmbVMdr;GM9Pi{IGEl%5Fz8}X$J91S-;LBl8>)2{TrGofJ_t#G4w}>?*n)E#Q>PpP z^LC()oo?rYbLz0}m=8dwJ9RqIQ_cg#2it(@fD;|+PC%C;u>Ilr$8wkae!t}V`Fua$ zSBjS=EesBf3>1k(!RAGnRagP<9WYLK4u<#c7M2J;F^ylwWbrPXr9=rNlSu()2cAt? zDV!`=eSwM-iF|0gEsamJEI|pzA;rBmQn$k?phcoMz1xWsxfBm%QrUJ|2i~tc1p;A)PGccKvFa=D}~xs+kEAw;XyLa+>y$s~e>ge#zV+%2KGm{A6d;t1C6 z8p^~j1D1q-=*wIi>gpaxB5?LtxTJd7do9Td%*F&!v;k&<>2H6TWVQlY{U zG={`PIUYhL6Eme{?jz0uY^wYZpTJIIE)PuMGKR|3L~;EFtA)C8n?xaCD`0I>MM_zJ%p!h zoDftO@{Uim-{wR6ipsuJw_kO~7S8nbi}tH(X@36sq=Gp7S*YdM*-|cZ{*#-HYfjvv zfe>fZ!lyiHUI>QX`=t|%E;a3~X+FTi;R=G+L{%=>b>-U8w#G{nHX2O&+v_TzV)5C` zt7#j0?_%JLhPK`<*ZYVMHBoyA&-T`dQMa4!^~VHt{dHVi)p#ymo!SS0swV?01_LUv znw{GpTqyJ92D1UE`;Q$ih49RbLB4a-`wS&@*7qr&$i8(Ius`^&pqdkn`WI;(Xo6+`XsA#TZQ;yL}Ns$ zX=ln87s!T{RVh6&GjlF&4N049)^3>Tf7Lg+&(ZPmfs;pC4~lEkOY`2%j17xy?#}<# z_I2sqlxK~dY&sKiC~U^}fvpNCxU6?Dgw4_35H4ekgD^T9r|?7u0a;}9VE8iiO?}Iz=mq)EnZVz6F5VmG zLi3K6N3PA2H-&cX=blGo?3PYGH%(KteeKrji5VF#@nxt*|3+=ez@3uF($74XPp-O= taxwLaU;EnEr+eN9uMGBAoz}nRFQQfhJ&*4+t=JOn$^a$F|>tE#~6aA#OWjgFxaqU!bD(r#?l%h zl*jX=$k=!`-Z%#}(>5XI#t5A@JIChnLT5VdnAu9OKoXHmQVM>@+4FpW#1;H`h!HZ{ z)kF%Z&t!<0%*a@CrqwLR`7^_SP$$X>un{Z`UjuW#^4szq|x>3 z;!X;F3d`D25KK=`7p9AaG?NU%a=9FYM4(6{;1B{w2E}4d0p$o9kf0$PW`?x0BuxQs ziC7Yy#wz%nrLSGE*^S0Gf+cS%XF~B$pH{RYRN8Yy`y`GzvcVBE(4?Rl#Z%B9Us8Au6p_ z40G;_WGbyrsuHWz8nqZ1knuJyqC-NIBArCX;bB;dC`E`?35j7H3`-D+OgX?cP!1NO z%*23RlGEGI6~B{^rk)@18#@FJF$B z{?U+}Sg^w@Ud^ zzo|HD4RdjEnBU);`jUmh2Y0)>yEAXGXk7f-3#Ctg`r`VQIg^;j0aG^3K6R+1-Xdo8 z`+cs+;gEpMLjgkh%NJGf)UwVf5Vhe1or0)B^}^VOC6hZVf~%eQtE(rJ#m(dnv`Z?l(m z@cpwkoL(sGGUj&l&Zz28h^hB)v^0n-F5P9w@`?|CJX{n#uA(Ap?4qF;n-`aI4@VM? wjO;1zTJ%{#_toqJE1boLVwUUbZtmoH@|LFYGm7T!sd4}J4cbV}VO3(zKY)dP$^ZZW literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..69b57d9dd9d9f4ca93c82f4260856731e8dae498 GIT binary patch literal 1427 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFz024M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7p`n7grJkXw zg|U&Tj)IYap{c%srM{tou7RPIp@Ef=fdUjL0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LcpzHo!{ilG4o3^M(S!~%UoJp=vRT#&!Os*6j4QW4I;s=7F&vLIDI zD784hv?v)EA8E=k&A_n3ZxKi#&^1>6MVY`zNz8G{PcF?(%`5SAu~h=f=%r+)SUDLw zJDHl8xj0%lxw;w~0=;i!?&Rub=49;T?BZ-}3Nr(nUQ0tqb5k=57dN1KLqk_n3sW;o zH*+U53u7k}XE!$km|oAk;*!L?>O)SYT3dzsUfu(?ejQo=P z;*9(P1!re)j4Nn_XXd5kmltb-q6p$+m(-%nveXo}qWoM1a2Q)6alk{`lD~J7#J9Ld%8G=RNOi;?Q~z0gMh2!vFC>}4C-3`|M#EKAuUv? z<)hjjvd-XkT2|po5#BquWBDK5ekys#4^ZxhA zUmtk`6Mh?RKK-?-R953a{QB!{@4r_c5{wtz_sU+b-&JHw?(6t-pYMDqv67VIW49N* zk}&)1u?foqnjfuN#nZjWz~}On`Mm2LZp!w%AHM!NHRAf#;_Eq@r!Pfj$2IP0-2Hea zYxseANx%Qz+mI=BDSOt%O^<)1h`-+Ww(RxCjbTmN4-Um04%zuw`1&hX_VVXb*Gv_O zW3+UBwyC^kzEqn3Nr93B-BV{J-??g0SHWr!s&^|lVPW=`+ci&jzi=>oby)j?)sxw? z6r-MJNu@76C#1B;cn{MzKlNG98nO-@le3(i`r)cn+^X4GUk}BeXO{2V_1^0A3|@(! zZZh>NJCEIa8Ivmarfj$UZr)QBVY^qJ>-@hWW#5{f7a^;Bvg6X5)A(M`H1Yl`-uV6Z zU2E-n(Sj>lSG}&u9-nu9x&O1JX`AN#_*wH!`p@%>e+Ry2M|p}ToPApK@kEd?uUq7_ sN{{E_|Mu)ZciwsV!m!c;*8NO846BWUZ(1ZpbApOVPgg&ebxsLQ0QK`1Qvd(} literal 0 HcmV?d00001 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 2f52c4143ffd3eaf5bca397166f124f20cd28301..c953b8b63718edb23fba8413fdaaace1f5b073fb 100644 GIT binary patch literal 1634 zcmbVMeNfY89BxHa5Jf#jt3g%K2iQ9cYzT_EF) z!cC}NrJ3@@oMd1sP1{fiayT43hk!>?DG(x+N+FmJ@%dcFf@^nKY0SyB+C#hyD#C80 z%r@FgS^*CumP}^SGLTXFA_R*~r+Z0kwNE9ANg3qCY!JeOA&bQm*QB+b))W8Ac%`*H z!DS;LJz*y^DI-%4Q-~ML3eSLZDEplmd~L<5k!gl~Sb=@*_2Tffzy5q8J9D<_jVfN?3qM z5RDhBwc2USY9zdV&5YkEtmw5^R7nvSO;QOYneOd?xKxrR?Wv>{$KP1Ojwci|_^jmYkZC=p9 z?%^z-lloQtKLupmA9dypjcwl;m)mq(K2TI5zt3(RNIUb3KDhQk?yd*>K8vkd`DXc} zi>CUkfm_>fK70Ovav}v$LZOG(`xd#+&(#9+3Xk=WDno?gQP|Za}BxuCEq3TMn}e@_W%}yr=|T>?)^GLl zS)K5$w1$dzYC3@Croy+BAlwysuy%N`hzIrO`Ewy}ZHp@Q@bH zV1zqsM&|Lha9e%Xo)du*%v8S=E^X1yJXPDF&VIf@*D%e|Smtca|MGlvdD!z3xS&Tq zyIVGM)cHnWO~>kp1^N4N#r4be%L*=E8?^V?Bn#g@T36o6uDtWtV|?$U@$96?&kz57 zDyHvlQGRHTOVHSBJ-aP@qO;&fLt`SZ;?|JwL$@p`teB0K#a8=&W9)Ga{rT(M1DB{} z?O{X1JETcnNawYjh#;S=#+^yg<%>J-2Dq=?`{LxK{z6V=*?8iUn~wS8d0U!46dXxY zB2UufHM@dqYdX?aX6H2RjK0V2%J`sgarW{3=M3Bjo1R_Rd=?6tJ$fu>;<;wL?!@3g xeAP)#Mgw)_$hm~CuT{sYPAii3{sV4;a*6-| delta 1391 zcmV-#1(5pU4EG9<8Gi-<0047(dh`GQ1wKhcK~#9!#h2So8%Yp`=K?m;25CV)jAwkr z7#kad&B2Z_7)T5x1QM}PE+XY7%H2N9KGZ&0ZGAPa$*?4=tQ0mE<(WRX{=ciM{_Y8K zxtw76d|nF0qCK5;vO?HyTpj*pTYxrnRf>wlsP@sp-@D zHkvlhv(jowy?@iO@p`u_>)YG1v9lu`jmFmDp|v;n_RQ#K4g?HSw=^g!f!*=gIswC3 zYdDnF?r!?WK4Bxw$H&r}Or$#+831Fc=GJf?+Mwgee_u{#YL#8#@ zO$mU>;)9y5ntdgl4h~ZTT{s-fW{Km|Q!~JvhygF=?0=q|SR3H!n_DAscyVC_hy-ML zf(0fCYy?Ok_J}az==$SFdHeaZoZjA;oxgn}$5&Toqq8$PQ|B}7r#+s(klD?RoV5C^V6u420TKeSfB=c}SOlU*-Kq>MFxh^KfF~ifO4k2hNf>KR1gMdz zlCq)WHD3^z&X*eL+pp6$A_{Ff9V; zv2B4e@9YyF@6ekZ3|8Q4VY9W}%ePlO2L9sRJeg%ToI^r3`qjN|{F4tNq0 z76`CP01htZa)j6{NMO9&R0V1H-4w~&1>O^P`UT?q*nTI~`H2|(Q- zM1K?jaZopxVJsz)C7|X6zyi~%AWOhbHYLCoJX2|f08a;Z0^^r24V0vH@GJp0kCbl_ zeI(&M0^|S}2`50ZSPooYr=VGI9J%>wS>4wN_#uVAeLXX1lhj~=X;nZXbOs44&U;93 znmGZI(Jc$?=HYb`S<4c@XmcQe1*Q>*qJKmdxsb4WE+ZBJ4RaP8QaB@o9?~?~vbH#~ zosh4dxs;%thNVOaDF9PKu4H5;`=2kxU#?$z=_H8&$Jt2Vrw~%7CmJD+WC9tJ{-J zt(x_w9zaUESc)X4Up#9{h`D7|RaZopX-Gi8b$|*q0$zre1B;IhB2mlpz_Kz3&r7#EB0Uh~U_*zO`k9vqv?nj%e4{lkW;O z_s7Z|oKlA*Nmy^JOTdTX&-yfL=$#_Hmj8^8)09B=(;BN*tM)AG9yN8+hTe4Cm{0aH x-q)~qHKd^?VAc=+cOTy711RgKr`tyk{0$jwyw`rs_(7f3_0VY84BG*H2V zs^C?NGZm-LE(< zHfomB0w)@cHcK8YRZ=rxA2S@O_o&Cy1JpF1j7%U`;%TG_Auw75il<_LT!*A%N(@1B zvo2y`G};usMwLJ&D3%M=xQ>O`F)XvrK(T4Gu%%`LqSj(0kcy>i^dd&z=~f1yK}C#J zu!5~HNU#h|w1vP{T4Ggdi&iZ_8B4=~Ftd;npu<~(1|bNVOeU6z%fg9t5E2LkAe#enI7|w`H0J6_#LUzieJ3SIF{7H$ z7)TAS2ka7&R6Ls$F(^x4yPz{D6mJCUjT3>QLI#=<0|>F$piXD^YaDGPmDs;#ycKO! z_EyI;R-@SB?ZZp;_7T2rYGf65rg`|LN%yR3`xXr z2u~UjDvpfgLX`U)zBp3G6LZB9se}tp%6JJAqW#iLpV$r3PG8vY5X)MJA}()BRmwL z{9{b;(f<=WkTM9g7s-E$X7Y%tMEmkh3s9RkO@!&G&LOB48F=JhL3Lh`TpFP=cQnVJ zj`fU~eLJ_tbgQJkz;XL_x;U<&XzGpV-O;1(DHlwg<}_NkGF0wfT{19FwU!n_hCJ{u z%3#kJ?bvtmw&=)Zzl{M`E$BY4HEX&ABZ8oYhK8_f?qd3|MbxG|EcG}K-R{hx3R(n*h>i;rza;R%{p7CKY2Nr4r`fr2L?FCsEsynPfy>q7E7vodmkyx|J`lRmJwQds+X5n z)`rSOWBF%XyDwdGdU(L>xet9DsZymi084OmbD- ztqss8^!D)j27K#>{#q9o*CkiB$s`{KRSh1En3*!2H`Kk?y63N*v(Fu@s*3iH**sVn z7NaVtta$X9+u?%PuLeE;Y(E;mWznu(yMljE`o_G>O5e2n)$@+%s+tX7t|+>%?>w1T z;j+1-uCFT<$+sRhZSz|4;!8KHhwPG8FsIBk*1gxeYTh3=3V*EMF;}M!`YzDf-TCVo z?t#}!KL%l(x=0cid|0>WtHyYHm+kH|nG~>G<1IUS4T&)!*yFm(PsZF6-%X zUft_3#1yr${hFJb{Sp%s(PVwN&34|QY<1{^v9WU7ubIdAWp!sC(yo77R@VK#H77@Q zs-a=HV_PhpeHz%rr+$rVxuqo~11*j(Z2FL&n&OXqP*PgzUS3}AR$E(puqEjz@o9nA zy^_!8jSTnn1b3aY6T z3n=!k45VjCf6)agXxoJWmaeTluUuC6`n ztlro_n}}W()_a5W?TvRyDE#I~U(Si3Yfp}6xLTdrwDpS)HFdfqwb-vEd1S1#R-Cf_ E9|AGByZ`_I literal 3410 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 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 0000000000000000000000000000000000000000..dc7909bb2b2fb0a2d66419117005af98f66efe38 GIT binary patch literal 1668 zcmbVNX;2eq7>)=QgQ!@FQL3z~qi9KXHwQUj#cU415{>|c+IlR>LINZkHVX-7DQZ26 z)fTZT9;4Q=71SYWk zo1!B_J=wF_EEdZ%JWQ!&R=|0?yD-nEoc=@1GK*Fv(y?SRZNn*oCD)Tl1Q2e*QwS}A z>$5W&iC`9MqS+XiNGEC{WIEEs!<{xfyUD_!S*+j?y9L*!5j2oQq!`U8_~2{}2pIJ! zm>|-?8jFH37{hWXA~q*7PM4FWlj^~cr9iM<#t@hY8VBsAbhA}vN5N5E8MAl3hCpD{ zgib@j7ork1(SU-a2tdROo6W|v33w!x0wGeV6oUB>pU-71xYleljoZ0q>-=#BC1KT3 zMhk5u&47~;Pa-pE6l9dX2*G60XkHSVtz(H|QU=*^3xx1s$YgTHHEM08wZy+NUTJNO z%eD}ZmavkUl#Z!K^89fyle^bDavCyfWKoonDGHvhBz2i4!c2!NQIPq<(;M|N3{hYr zVW3hj!Bi>%!i3KkV=8qZCcqR*g+MgU@hYrZEf+}TQi+-`5Fv<4gvnvK5`!_NkT1s& zv0@w>Zno06Sx1cfH8Ot3u;SNZWeSSGX_AT~$@K9Kh>kX*G}*K%p3|IN+aPH0w#5 zb+NNVFCtbFlrf9Yt0~e1jOJKoe1!%C7VG!~Ea1WtoZyNPp@b{ZCF5K^EY=e+jtHfM z5FEqn|4;59MiAs|lK(W#_$#Ipo!gfqz#Lu<5n*N~hhj#=2URq%SS}UeN_m|9`nerJ zX{mDW^`iO&rMHL5S3a>`J6#@>HgX`Op;Z=W^mdJj$g8WmnfXlL-B?{aAi22I+P+J0 zvb~_W*?OdHva3t&n&_;W?#pV>tMm4s{=Qq(MAVUz`)zF{gO#@|iH|LkhJ8P!_`bK2!b5l-QD%G^B+~+IF=sZbF%Nk74+??eh1eCmMvzLUu^<9 z%D%jO@mxUuI`+@r!ZOXhvz1-_S<_;+g)KOhF5A0f`0iiTJ6i5gSY1M$+|e1p=FBg8 zk~g=M9e<)Dw&seV;dn<{RIs@q`iDiw4-EiAorAro+pdV@%0zFrn^#_LZX4<6=Z7`j zam-L}yz7#kpC6yYaeT-t&0Vo9Mp#o4Qr1%MbLQAq_vLGs$x9Y|do4BFR=mpe2kJI^ z!K&W#8}kYZj!ruWyFVQoYTcQ7x{0H5`%3#wn60L}D&pP4TA#`7&u_^+zxbfeYoy4) zp80veO#EgL_ga6};B=3}q2H}act4eR7RZ^huw)a}wf58s?!4VA-}$)slCCAX{A$G~ z8!tU5tsuiZR{IWOM+^ODJe;vVy%}}u&${8*GB`OPANzf1g6n5Jhqa9lH=I~5{dC<( z=@eVM<4$4GymEFGdR5zb=Ju>OZDsGivi9Oft7{FyR-J6`_1*BZj3q1M4^BE?wIuWL zrje*qp%+Kmu$?CI+1b#QC9AGi?TmkLhm@qfH}LWMN95#-dObGPO?ZXV-ABDP6K zYX|ENC9$AjcPPnndELDP&Vk}G*P-8H#a$sgH_V!w2^G0zL@g}Y7c{4<(bE>{;Qq3` z(xWgz?xHG2%_{R=yWhtK}H^!9s;b-^Z7ut;AD#b&a8;!8IJTzfA9}2OO#lD@ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..90dbfa03df294ebff47e0591df087d80dab3b534 GIT binary patch literal 1659 zcmbVNdrT8|96zaP)PR6&zEC`mY22i}M`=qB3iP?w0U{tUBc#{fl~(9oy&kqO#m&bI zQ@6>2ObBy|8l6nQ#rU9Ltes`bG=ljkT zCnvohFlpu_0007v25kzzg1&o#AO9Sl-dDvhGdNu)m&#Z6q z1uNUA7yuB^_OwhcGcf_TFb*-{!-zc&C(j0em^hDj1d~R97=lV+L;<6S2tjca!7&6Jy&&EiOIq<1 zt$x%Ne^Np=j&tHL>~_1wZi$#-b6`}VP{0TVW0;6Xh+G9UM|ecED|}2rOSvqp-O1S* z8uTd=W+tCgLcFIhLvT0~6JH6_uF*vCDT6(P6Gp`d>~Q$v8bQ0b6zX3$UW<066*wt4 zg>o_Ztc9zMj{>4cpXNyhDZ*H@yK z5o;;dzKSCCEaL!2a*W$w|7n`BS9~Y>wy#EjKfD?uismPW|joBdy&G6g*z@WdB3Wba7*>qXJoYkk6Jt7BVF_YM{h|K0y9g8q@Z z;H~k&b*XwN`0U+*1^e5+7#w`&KV#BHGWxf+k79S$H<^wsn+rUDk)3w6qNeKuuYZyM z+oet4UZ>A5Kl7M9eyj=HdFgJqCuZ`kigw|q9BhUyD0IUoCe?eT>+<)e5Rbx%DaGUO z?>^N{AFUm?Y6URWyK9`F_V=gHOYF5%n2ZAJyydV!oG<|&0u@H6BVY<_nw>* zyrWLFZBB1>Xk*;5K)3T@);ppQZ0hDKH@KFIJ(p)2mz_W?(>n7X#R$yzM2jNs?de~N z{g@vwJTX{1ZCgWQdSy=h^1B1wL*H~PT@<=CBh0!%l(tj0EC>lL>BD1h+qof9#UG-|u(#{d~Tk z?<-f5oD@6TFT{_-;mnSYQ|s6j^4v40vCpxf!CH0+W;Cfx3TMjPNLNjeKa@fKq? z&;cXq+V~TQ=5V|zvp$tcOXba!yvEe%{Ru;|SL@S(DBasUjC<|npDLFiJrX7aN zq#Rx+PDB%}Dv)E2E3ko-f+RgrkV{BOSP=t7J7p|^1u#a)Y00DPGN&A#;FYm^&uavR zCQO)IIs8ggYGN{^qHO>Y^CNi#hG9^Yl#hueLV!x-I2$TRU=zvGqXi8=Ba67lLb&ryjl*kU-+b%l;M~P z7mFg*N(rvf2r)K%K@_ghM&d$TrB(^WQyg!?YE>dsBEqyrO;jBEc%7Ld zX@`B0r$nzJRs)+kACOubZGk3oEHl4B1BONs0)Ps6sKf|(QJ6@=lMp5&Pk=^|05xJF zDGFUFTccU?749x;2$)Nu3O%bLiLvP&6F>$(l-!~0!U$JGOXlgL}x)tzR6m zY<>Vwn^4Dj8bDOFPWNAG^`+Us}yQ$j;)LxwA!*Q1K$@`@C0i+r@RHliW6r6JZU zqpcT2UEq}M)`oYlJsNT5&QQc|(}{ZT4^4iRD?j>U^sJj|cgd=EMSqgMtZ%ein!F<} z{kc@M8lUq{*cv>oABoOrx^+WUuiv9teRyUV-j~!ci2IMV-uh*3W&73Ep@qTUB^>Yl z#wFOtr2kg(t2@}Ru;x-<+c~h{PO$S~aiOo@*Dv#z>>KL|>H2;2L0PMtQs}&!>vw&1 zzpC)((!mk5Xd5s~yEBG$H;XAz!9sVS+VFr(4y{Zpvu8c=yL~?L-2+FwPF;jf9qw4+ zdu@x-N2s5nxL+0ey&|>vy_k`7AHT;}|J*))$a`6jq3bj_wDZYe)r)JK(#OvOW>pQN z2Gcb!|GWo%8AWpOk3$M?YuSZ?wxJc96G~iX`rCWEZxCrcz2_X$+kJvK*?|wAZhu+* Q%=06N*CeSMal_~T0AhD^rT_o{ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..391b509dfffe346d86144639c487128e523a1f88 GIT binary patch literal 1647 zcmbVNdr;GM9Pdy;I6UXZHo%<=LAT-2rfHi(YYXcuTD6GS4P*}pO-gHNQrbYvV<7At zQ)EydL*^KB;A>OB^T8a$qC1BiH&Jjync@`PVBnR43eLxtBDnqG?T_Uy`Tc&$=kxi# zFB{|Imd*(X4PdcYbJWX}3Cs$3@7X@g^Fi>fT4o8MRY~+3N>AG{E5VZCR2l)O%~(2- zKwx-IW;-Eav1X7)Z4#ZNSt-_0W)9}Xa2#d}!)CE0u?`ESGZ8e9Mx+}_Dd=u?fq)U0 zf{BQRtFb5ugK=4|l~|J-r`6?}bRry#jR7PMF(Y6mXbfyOT_9u4 zitEJ*N_5H=bCQAvnzo1`$ZofD?0gPoO^0BSNCa_t5Rb=Z5NulxNn;K+X$zlLP!cws z)o7uO6bX10u{0`+mV%6@k3%q9G@2*Eq-`ouOv)e!W`ST17c!f@aZRFabOP~@8&5^s zv^f?6N+4`hmQ}~pLmxg(W^(u6hP*(=8}TZuktqt6p`>(KW`d;EN-4;E;owGGEQb|x zL?BekqU9fYzE2#C=`llwLp!uIW(nUOFM`>b*#aR_SEIOQ3$5Ly2(&DUQNF6q187t|JUtUo4C z|8s9cRciFhDCh)cFC4$$f`iTq$%67N?Rdf{Emotot9OR?d%n4G%~Bz$>C``8dU|ES z!?{@!!@%C;gP~w!IKOK14gF#G!ies~6>`y<{oBkX3;GUU8s-FMH&a+tIaq>CsPfTk0#0B(u$Bd(ImM*8jDsDEmCm$G}z9)HR+_Tqt>1 zTC{5Jx>Hcc?_*o!%lAa&q(;;k1VQtu+Thf1-|M$aBfHYr=R6aYuZFFBuXbaTQ+96X zjv%j~KuK!_s+$`T0jU zruKDq-;0OZ!Un4P(YyZDvNs-81b)F9EPuQGUQb)=_*oZqxLeJ`(#(e7q~r5BX(QGCJqs zuIA8Ka9&~NhgVB`Zynn;=3bGqJO7TOMH<@Kb@jzv{E6^Z)}@qd$(}uaTJJAFt%_6D I%TtU01_)(=Pyhe` literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4193ef106aca09e69f10f5d680323f95a9741b63 GIT binary patch literal 1538 zcmbVMeM}Q)9PVV9=*EVK*>Ib=opA!Oy^r>2d$x3Kua!=Ud{kjNiPyWgP^EYEdO#7- zSu-av{LEwybPOgg6C@E)qXUd9b55Dt6elOj&B^J{HkQrIt2_Tz? z&I6f%W=mF|20EE6f^$1^#2kAn$?zTp9kNmQJzfbdlj#h8FU_n1BIE>lZcY#1KHddG zZdMOx6L!?@HG_P2${GP=tx0n*YgRE@7B(b9IzK59cz{Sleoq1CBmH`KoR^gLq1Olu zjhl$8^zb85IrenO%nJY_6iIRh!!Ss#RbYfhi4*f69K{F()gl-wM==sZNgRbHE?Dv= zur4x_vQGGtPI@?B6ul&Z6c-mOij@jp$U`u#R*RrGg5z?@LhdW!MA|Rse6zz06!0;E z+bg@Zl$-P0X~3?((>BEc;cg)X3YrqBa8(MIWE>5GDOv!n?#n+R1B zWz?7~79}QykE=}Nx>w?D*?BDbHyL0J#CwjRf-8Tj8@V@i5 z)ifGGq*ORNz&ZbC>Cs(RxGdV+HNeC*I})!|bvNu;zq~OxgJ^46vT*FG_lIe&9eFE! z<+@oTwYtt+1Qd1T64&=;+O*io=3Y9sRXb1<%G@0lu`NTEwfT)drYz7b zESfzzqi0>fR8+I>VD&Rs*9K2)>^s}v8Gi}%t!)3PFSm7WR&9@!k#D*8pt)l(YQq;d zHo6vWpXM4s>o5PpsfXK_+HdV5sfWh=XD@9I*0;noe0SsE-IQF*CtxU0SJ~5aXZm}G z-&E98&HL?a!Krrja?xBCFa_ppuWn8?I8PY25v9kk8C9>nI8xV)O)4#|=}Y~*urXu( z;kNq^%ZG1`kWJG&GoHUy+tcK#D;qmHXL?>VNW2g;5dT3zL*3uJ>f^=x7q`5z|La4) zS|E6fcyXY0>XQEK_bYRD4ULv|@42}91*?M{nZG-2MneDK!_hO}uYB%)-8)M=BBSnX z4h~YYCU02Z5RtGC)IKOne!1)Nkh3Fx@7sUHtdN-vOK-LvdT=cCSGHNwr~{@Ifqwup Cs7eI@ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4ad673dd738b3fbd39019c121f241eb7c11952a3 GIT binary patch literal 1538 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFz024M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7p`n7grJkXw zg|U&Tj)IYap{c%srM{tou7RPIp@Ef=fdUjL0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LcpzHo!{ilG4o3^M(S!~%UoJp=vRT#&!Os*6j4QW4I;s=7F&vLIDI zD784hv?v)EA8E=k&A_n3ZxKi#&^1>6MVY`zNz8G{PcF?(%`5SAu~h=f=%r+)SUDLw zJDHl8xj0%lxw;w~0=;i!?&Rub=49;T?BZ-}3Nr(nUUPF-OJ`#jBR8OWLqk_n3rkaD zM^k5Gb4McsQ&Trfm|oAk;*!L?>O)SYT3dzsUfu(?ejQo=P z;*9(P1!re)j4Nn_XXd5kmltb-q6p$+m(-%nveXo}qWoM1a2Q)PhQv}Q+TtbM*GcJI~gtE`RX`el!wOfh;?d%t|2?(DN&^>*_g zH7f|bubj6og(dmP$BK^f*l=6x9e#(NHLkv!*M0tJ(IfxmlOG*QV9S~ybhPU9ypK)` z73y~1U3Ta}-Tvc75i3KEhW3)HVHds?Tq;-x13%cYaJ`*QsRNCgs>W z|7_Z$-FM&3PgFQ6*4_F^fqmPgN$Cgnn@aW05c*L+!B0(CGwOEtp9^k_C-xOgd*jBp zXx4w0);D_pQ>2*>{q1Pv-8^$^ZQzE}o33Up-Mlx>f0^0r-eXa6&p$_2ACzVbJk5J{ znu_w7eTfd+cizo=l)ZJ^V>#fewtR&%w2wjBKae)`<2JZ~&FZ>bWL zdLY|*u+xT*joFnw$nUh-=btrtb=z+rtqSy-`bYHugWUb7Cp`9-7J^D;Pgg&ebxsLQ E08TkZ^#A|> literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7e9aac3d6c5f76bfd2804f04c3d5bdb2bb08871e GIT binary patch literal 1165 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8cce9d4b9ccfcc5613a0cf25f200183b95ba9075 GIT binary patch literal 1165 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..75eb19c5ee1bbe6e082ea36f11cc541a76c81e1d GIT binary patch literal 1165 zcmV;81akX{P)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0000aNkl~00000NkvXXu0mjft-LJ; literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..10bf8b883c256f7b1d03e57e68b2569c401dec59 GIT binary patch literal 1165 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 fKj#CM>74}1xu(0BRg3+VM6vlZt1OT literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..261988fe5fc8ad608af4dc2496ff5ee25b315bb1 GIT binary patch literal 1870 zcmaJ?c~BEq7!P38Q5^87c$RHIi3PIR?B+BfCfP)y1`tw{qOHVal@yYV*%bm75O5T= zC?h%;5$jQ*)(WDx94088jLmoxojX2t20Yxz;&MzLWN3&A|QOOK%r9e6{tdqD^cDM$NR7dkE0M_0u0A6A%dtt5m328fN@l)oFnIo zR6|&ejiQY<6ES4h0_+ZA(GOz9N(W)2Nr#RklZQGWCXu8`Dv`89N+rb7TWn@Bm73+L z&f8#d!eL1v%xVW|g$B|qw!Fu@T)nLnz9?MJXKjBpH*nEHQm2E+P-tHU8Uc076J>g5s(Xqj!$?i;7R{yS2iDsrt88uPa zyRV_~VCU;Y)z#Hmz9}gw<2K;_!?spbRBVu0&E|_W_4NyD+-^ZlZ*OnGn7`WEg0RnA z3to4IEVI>ARw93g!SMWs5wjjfFIW&6A(e_;QDr3+wY9b7TXt7I1N-_`FIHaI?3GR@ z%Qf#nuuLW^F^3%ao}AjG*Xv87VHj3+Gj1eEgu;S5O-;X?I8ons?AWn}B-7d{T7L1E zGdsKP-MwqP(5?w8E-W11F(Pey^3piX<#hI&Wbu;+kNGkQ)QB->%VgixcJR)8RWZ7~ zp`qc$3+LXLy0CzN0Jqy68XB6jBy8dV3pNGBuxZn#rbnHfV*h6Q?VGweh8k6L`2DrH z-{w#MxMxk^qXO?AFsQRHE>bg2B`K^i__Y5(=4egTcA`_Xmme>>}RDs(RLJ zzmU@05#KDDv*g-Vb&%Dyf7Z;4Ud5Zwk38;n*G$u=UB7<)PMb4hab<8CG>TQa8!_NyehHr|{@jB*bLug$#=qQ%N~j?rD3D zd(X;Pe7^d3s2Wsu^IAWNY?4rR!V{&|w`}*F1b9Tpw-GR=`mX`xUe{_FK5yOWeytYm<`s`G<=MSe*Md9U& Hgq(i>6wu@B literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..91740af277c39a3753445fb2a6a6f145cf212f77 GIT binary patch literal 1422 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFlT0lM3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWscy1?k)eXQrJkXw ziKU^Tj)IYap|QT9fxeNYuA!loiMf@bnF16j0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LcpzHo!{ilG4o3^M(S!~%UoJp=vRT#&!Os*6j4QW4I;s=7F&vLIDI zD784hv?v)EA8E=k&A_n3ZxKi#&^1>6MVY`zNz8G{PcF?(%`5SAu~h=f=%r+)SUDLw zJDHl8xj0%lxw;w~0=;i!?&Rub=49;T?BZ-}3Nr(nULzATGe<{90~Zq$Q$s^n6GuZs z3pX%wbTW5zHiqf-%quQQ%u7y%*_#Qp7oykF4X<7+=c3falKi5O{QMkP3JA!^FUc>? z$S+WEc2>{`&&*57FE7>v#SX-?E~!PCWvMA{Mftf3;NZ2&#A3aPv8h3trA3NvqN!=J zu4#%%lCFiZskyFks)40(VsdIya*~-6RDTLN!KM#%kUl7VAf*?W5HJyfnDEpO}4C-3`|M#EKAuUv?<)hjj zvd-XkT2|po5#BquWBDK5ekys#4^ZxhAUmtk` z6Mh?RKK-?-R953a{QB!{@4r_c5{wtz_sU+b-&JHw?(6t-pYMDqv67VIW49N*k}&)1 zu?foqnjfuN#nZjWz~}On`Mm2LZp!w%AHM!NHRAf#;_Eq@r!Pfj$2IP0-2HeaYxseA zNx%Qz+mI=BDSOt%O^<)1h`-+Ww(RxCjbTmN4-Um04%zuw`1&hX_VVXb*Gv_OW3+UB zwyC^kzEqn3Nr93B-BV{J-??g0SHWr!s&^|lVPW=`+ci&jzi=>oby)j?)sxw?6r-MJ zNu@76C#1B;cn{MzKlNG98nO-@le3(i`r)cn+^X4GUk}BeXO{2V_1^0A3|@(!ZZh>N zJCEIa8Ivmarfj$UZr)QBVY^qJ>-@hWW#5{f7a^;Bvg6X5)A(M`H1Yl`-uV6ZU2E-n z(Sj>lSG}&u9-nu9x&O1JX`AN#_*wH!`p@%>e+Ry2M|p}ToPApK@kEd?uUq7_N{{E_ o|Mu)ZciwsV!m!c;*8NO846BWUZ(1ZpbAn1pPgg&ebxsLQ0DB!3I{*Lx literal 0 HcmV?d00001 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 bf970210c965e99b9152c66cb936a729477c6080..7e1993c0ed7fefdf71e152a8aeea8c305860a14b 100644 GIT binary patch literal 1642 zcmbVMdr%a096v5P5xMbIfP}WQN2U(9dwcI&?@;cgXCA_F1^GDGyW4}~xZ7=S;f{+i zoFqZXEQv9Pe2rp~_#P`1u3#hra?FsxCN(P*Wf)5nF|$43tUnz8aA$UZug~ZE_Oo6aO0v=5_jR;rz_;()=8<>4kA zvzNTlfh$?8XPi!RHl1x;j@k$}goQAW-%T=X7E8IvPhvI~P6Jjv&*@Qt!%Zz9;Iym2 zEQwKIBsF-xb7_FWGXrU6Tfk*g*uh09fYOgL2HZG}0e*L($BX(^;Fw*MnTNJv5Ez5d zE)_T)RJJi4&=3?3NFWK{CJ-WkOaUPhu>wJo0igg9!H57BD)!F z9xsh~YD6tzxS{E)e6m$c}>(eEZYL z1~UP{q5k+^zl67#CJap9AtO1tO;&Xtg{@7^PjeqpS;+;ueGSl0fz}mh9cRww zcDQq2Tv_A)0UjfxEb2r@UIXSbtxQTnS zxG5Mo4Gl}T8!K;?raUx6{yO!GuL50;W9?TlReR=^?waLuU+TRrPN-&UcD;Y?FlSQ_ z+23~kc)_{5^B)S?f0RS#_Z?qfuxUff?Yh#2o`T>|@svVw0{CIZM-lbLz>s9)rkNS; z_%pw^u6}Vz?xKF}n#eWv+>(GiG3o05SV7IQi1w?<;nh%Q%AM+3M^E#~zJKKGqpM8G z8)kouQSnuRYUQWq1;MhGsa?o{ z-TTu8uFvEuiZb6Z@5gVftxp+Fy<0zjh}4@n?c18KkWtCcMS}yB;&Q(D=#Yq;Pv|=m zl50DOh4+jrYs$(lUgR{a`0o3Z_^*wL!#iO|gkUT+f}Ts0c^UV~*JaiKTo z`BU4kMFnc0!%3%(?^P%FZ%_cikRG6ovIeYTf3@^X+RUH317+iPC{ literal 2566 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 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 a3b6dff12d1bf6aae6fca54fb52c4a6152866889..22385253fad930cd873992365d98cacf7a63d362 100644 GIT binary patch literal 1712 zcmbVNdr;GM953LsD2h68$W*d01s`pizGx!|O&^N`S_QlU*rgDuE`V{jmh z?S>PadQ)+Z9fFSO1jP+;PUrD*R`51KrlPO|LGkcTR>x8Vw?91pSniVF>+|`3zOUb9 zk0vT&?rh)LEEa37YP}+w83E_Zc4fW}pGU`-VKJ?Yr(;MxZN(^pCBw;N0#F&T?L;(z z;hE{zh+r1W&0x^R)A8y^L`NFAm=nXb8O;ov#R?9!nK4}|K?BLec7rJd9BFI<0RtWa z#);HCwOLN27}jS|L`+tcR+p8klj30LIw07FFb0eSjR7`en#qFLLcmG82s3wXLm)5- zp;JS^mrlj2HGrI?2tdRYadbRB3p>Y zi#F3tK+%MS%%F5kJ@o$5WF~iS7IFd^Z;*|Yfhh`>rXY10M#4m^6d@pU!o>|Zg2HlC zBor%T5>%-az)bl3AXFJHMg^!`As2|IZM=>vg+<|fIjm3!g+drs3QlW$r=r%7e3` z(mQ>bW!qBAQ;p!d=Eb5aGOp?FpN|IQUmaLnU7dfhE&RDCP5kb$9#cTKsXo84 zXBeM%C8sGg;ke;Ik#|YqL$hQc0{jfv%B^VHC{7qS-`>68RP1WB%B~uq&awNSN;{gj z;Fb12yGvYo=*+<}M6mB^34E~4ravD2UQOqY`~vjDTjd*;$DU0*HKKHJxRFPeL7_jc z$R7KvS zk9{&SphitJ_(fUTZ)!ab3lFL_KD}HzW(#ih z8sBZhcoVj`wk3ZwI>tf2uGL{(nsi>-uD#v07rp9+&WE-|_?@|xSNumfmwV`iG+nMLr%gE4JBlt2$ddGP4t0sy#dIWm9bKsvB8nPA~o` z_-e!zN1l&`eHR?c9J*lzxTn{R)KpBI2qRq=WZ7jd%VqY5qe(G{+oCd0b^#i=jPD}K zjoGd4(A7+AdyBFvyDlV-m?eFS0g#+EOx;F5@=w@%t*`IP4{|-th41JOqs6MX=M@e% z2l;r69tZ<29)I>cJF<)C5uKaN8|agA literal 3016 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 hIN^T6lf}7XctW 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..dd441ac27fb649ee59f26bbc99a27deee83a36d3 GIT binary patch literal 1868 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 N=rmdCI^~*;{{X$&dh`GQ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f79899dbb73169680aa48383476e172b878c8939 GIT binary patch literal 1427 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFz024M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7p`n7grJkXw zg|U&Tj)IYap{c%srM{tou7RPIp@Ef=fdUjL0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LcpzHo!{ilG4o3^M(S!~%UoJp=vRT#&!Os*6j4QW4I;s=7F&vLIDI zD784hv?v)EA8E=k&A_n3ZxKi#&^1>6MVY`zNz8G{PcF?(%`5SAu~h=f=%r+)SUDLw zJDHl8xj0%lxw;w~0=;i!?&Rub=49;T?BZ-}3Nr(nUN-|n3nLR}OE+U96GKB+Q%eJ9 zGYeN!M@wTz10x^{rq?sCxFj(zITdDaCeU7}UJJZ>t(=Qe6HD@oLh|!-U@0IVBfliS zI3vG6!Pyxc;|dz#nRzMs<;9wyD1!LdCABECEH%ZgC_h&L9L83eSlnQqlA2;{kYucz zm}Z`+YiVj?sB4*+XsByqnV4c}nPy>OW}d19)t^F6*y#fuqz_6YNQnj}1Wbt_COiuO zIq*!Bng`4|MZhfL=(}Evfq`+ir;B4q#jPXLPWLrA2)H^PdwwXxpswZrfBzXB(n6J5 zKC0~@>kMwEWfiUz;k|P^mjBW1w_>h=GRNCuuS@bBPMD$6`7mp1(VrT-K8eCL?|+~C z^^rF);kV)D(_gDfWi<}OufN{*{(JQy!Fa)auk7XeT}8I!zK%cl`Ob$DD@i#%c6-q) z3A4{0o3K2f`O&IXJl%^7d@f&^&%55?rfk3a;p?wcBd%{PzMi9b`chyrwtMBd&i^Y?_O0o85wglBJ1)IBjqmkL6Ysy`jo*LY zwbrf|Ex4j})$5w<@pVNS7OOL{iF6w4A{dgVw$f%2FxZK7GJzzl zd226_N*-??buZ+lTcW`JPPr1Iq0C!0aQW>ta7 zXskHap(QhHi}M*WG2fVE$fw2K{+8ApZ zmVoQWba5vYn8C6R41!!Pm&hd%(M&o7D-;Syj6et?V2#9w zHBe5Lpe&?MuZ`0?hK1jV#k34bur!lI)7icXh|i!|+L=K+0Iha3zMzdyNgSMIw{PrG!vyQJ_LXEJcM13yKIygs_Um3Iau87#zb} z|4-~7&LGHJB>yQI-xXJh-tDUv;0~{vh@`mAVYn8F^DlkQ3B`dqfpTWW6U7Z8`3ENxl1mQT?yIi@IZ@^26_}r_a@d{Md)|Q)gYTdw*Uk-N; zy|}Ub=a@BuG8U^$IU3$W$$Re&gQDQcWb=lt!p z2hOCXhU_@+Ic;3~OuIu=*t|ajDK~kZ7ludek9(kvWQn(ybhNH(N`X4e^?{xDh95ny z*>F1L=(nXg&)7#B0vsy^#lab^CHK$z>8R&-Qe zL}*0V)ouj?+V^(z^4%^ay|_~3BRx>I4vg7U7< zH@Bo6GlT|gX`1e7JJju$yW!aNKr*4{{@WCR*{u_>gqwL%hIH&iq45wCv6wsViS z#XS$J3f^Z7|2w_5s#bP&{Fg(|jF)%cbU7Zzgja;6f4qu37_`2-EWfYdZuHLP+lh^v bn*FEnK9i?>-&vhg?ES|ZbVj^RlUn=_>Dy_m delta 1858 zcmV-I2fg^v48{(S8Gi-<0047(dh`GQ2MtL?K~#9!#aCNfT2~O|p>5t;jUsRk2nvcK z0xA$dypgCe-Zfe;iOHwAs4;4yi80aKZ{OFi4}Itl>MvWJHLwYZ*z_$A!#-!T_srTe zYi7@J)Ya92QeR&WXG4RImCqi_g45~zA~H|myvJj~?RM+4*MI9ROG9amW!tLT<#MU$ z9uev_b{+glAya}AbP#p$+mH2<4<{m)~cnIi}VK-Ulr6}TH45$fzjsG|dRFbH2u3#{g5 z_*z>Lh(ypRqkql?oArN=-cShsa9IEMx3{B7_69{qSiI4eOzL|}R~Hh!z39wjbPWNh zO$n)^K>)iF{b>_lGromwvHCkSFa*9 zJdCcw5EA)(S#Lyu(H3p;@Qy|~HRBoxwdw+g!=b|GMt?aOjVsB-==Sj;me$v>diOTg zHrH```yMv;cSQEE|Kch3pNX6vDFE&vi2muRGkSl!Sf@5gUr*^_evFomPF$UzllK!`o1f7=^j7ZLwWJ!Tr5m>^^&fr*BU1_K#0!mr!-*ayWW> zik0=-Sh;gc!%@uxHKoi`0CZKPySpj?5{pXWJzbbun8T8sd}w?e8#~+Bda{Ry&ku0? z@r|5#7O9~jj4jTi_eud9d)rvvSW}LquUx4LfPXgKLVO2_!+10{2hS`FCE^;-#-;$0 zf_QFa8MDhvxb@&}5y0^Qo_%F>Xg$mTG8V+BuNo#Nq> z1AhhUl<=l57tV5^wg`ZSR}PR6f#BH?w2GS;qV{M92E?_alj9PKdEC5z7wZqVvGepX z4qhJP)#ncw5V8%=%?c-8x%k9D?NyYO>NZsmz^GMjvTopIAw1tt9H3K78 zFu%HrTU+-LPm!Cgk=kNg2E59p%?8wNuBxLPyup05D zng`laDFwg~zKc}g2}~2Vf!v#e0Y!CWvOFfoB- zZ$^z%BCLYFc}y-XsbK=u`#`{Fs%1eX0CIqhL^S{mK~_#c4}_&E#!~_ypOX+2&@BX2 z0OEzt?u3vqRTjM|#W*jr?C5A!0JN!DKq7<%F&hTfb8~Hm5(zcV8;wE`6o1oJS*2@N zM>SX)ZCl5fT)_ko7gC!0fa3Q1)fR0k0FTF`gkVF$#^a(8BPc{m3vy%J-0f7x>ewkn z<1-~8>G_oiF;(Q5Ad-@X-BJw$(ulBu;eOhpO(uX=LbhaV64?KV zsGR3oTNqEnh70s0L4ObcZ4m%7Pyv`UR1TCrHt2~4A!I~)`G{Q09;t-?mxTOQU^~x3 zM)xZK8Trmo5J0&hDTbh!hGZy-!p$aL{21W}3xQCv5jLy@%o7>msja3aEn*a-k0&?A znd$^d68Zy8aPUL%M}3+FFm>T-KfsfYWG4)e|rph`Uv2_HG|FX{d3RdV!)?f?J)07*qoM6N<$f*r$nrT_o{ 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 4e074459bf8569f699b0de94682851ae18048fcf..ab546308bfbc4515f0a1b30b4b0e5447cca97729 100644 GIT binary patch literal 2018 zcmbVNYg7|w8cxJD${qo&P^_Y3@QAwRGP#m0fs&hW)&Pd6pj4S;h7cr~>||&XL@k$y zxGt^n~^D{)x_9*)M~W(Y$_fiS8@fM7kO zMU)5xTYuk#_>o9X2AwJbk5FtAYEV5La@f!A4y6MVmj`bJcQA`FnA7y@wVJemdsL4YrygIr%Wi@OD2F+nbaDPVw18WR+POd*R2 z%w1H%8wSS+l~VbfFXAMk#^Sh9$Y7YwX1bY8M=>n}6bJ+iCX2yh(FhBg$!fqM3(a8i zo@bCECJm-D;yTm-I2a){nt+R_gwi)5=#2`+TVjK0E>T3v7#7IL0O?GIUhjx&*4l(C zk^jngr?p9CH6jcpVnP!z4N;F6?|CqhyI*$XFeKCnLoppu6ewPbY7+E_0S}gnsKggK ztb>JOP$K4Xc+x;$u}sDWiSSu`u}sbrv&9mrgw37jco!Cw%UDb%n}RE!^8hi?ihq1hNDUTr)lP25uNDRz8wML@OFq012H)mF(QQrE)9@K z3!Q_dfhxYd+(cyDzp=pTALhJMoE*_E?w!!h55WFNXUCC_r~shYaXttaX;W8kB& zkFDq?50f?)1z9O+(zLY2N8M5`!xeuN&5XBDZqNoSXvo@|y(Rr66Qxz9iS@T{AAvl@ zi=#b{*g1;i+}vDyLxb#bd;7|-+v68>`7YWU6-9dA!{d{lo*w)7xV11_c~NW7E z6SwS|n3zSekthGPO16v{yqxP}9zK`0O;A+O+p8<=^0jw#bR;KbcLR$@1YNwimy$Kc zNUfCqG$g~nh?4!x6!$n%=@W|onezI$Q|*)7(_c;a-Ex|`8&Y(BI5|~&rK-v~FF$|B z^riB0r@P%Oqh7x>qP#7+(_p?cICkaEH~N<>5G21CowQ%OCUB3$ipsNFD-&WoE7jf7sUF zPdB2dYxy1O!Yb9~bT-A-zZ=;v|dr(xj;3;og z^cGD`nN8p_8Ah)E+rx(*>nA5CqioRk>Ga$Asynz=OPO?ab=|SPV4|-0?-@O{yYeZO zqluy|>y~BvJ?Km(7fg3{di}}&LRRV{R~MJUOz=xeT(qmNI_15(yuFwGM>d@5Bi{%= z+0sMSj2(Zpa^vzMxOksPrq=0}xV9zi_!YI;BKvrqOZJuaKwH%?kbI-BPhWj#w2yy* zb507B$ELn)dEGKtxV_xA{isJur{A{U_)Gzx))}{~lsi2vN!s#Oxy%_1LrlE`e zAU9EiWg{0>ZIF-LtXs`a7o{acXS5zy-yM;`dV@hc{Bvme=CbXZej3gcU;~4@vmDJu~8JH|I#H!t9GXTh4h;wH8~?oiblPTfCK} zZLIMxo3^gCRa_L_h9jpBPVMy?3>C+vziNW-eb%JiR~fY@Y5L`8Dm%g*O^u~9K586M zysuqR-REC9u;-G;&cid^=~<%2XCjrT>)YpMuVlXB2;~dj3yyP_Ls;pvMYSIVG#97lvwx*_x=`&yYV)sPCeN!sj6(0{j fl-ZFwv(S@di;|!Ds%j#@@z)KOg-FZ9(JB7{YRf-e literal 6529 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 CT0b5D literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..119b55aba0522e4265ddfe80a6217915e150337f GIT binary patch literal 1596 zcmbVMZBWx@9PcTcf->fMZm0+`vMD>-ByCe@qzG+Vt+Sv|wRlrWo0R5CladBoiYF5l z_1q0TjxpWvgKmx&r{@Vc=XB!BZk=w^!49Q*yQ97wW7Q!lLqV1zb^GA?VYy45=ShCQ z-~T;3mgOvpjhPuE5{Y6Bi}5^R1;Y2_3Bq$YK6F4>X7D;QpU>KO55ZBQY?8H5fWb)= zQF#M8dRag zv(q&?og5Lum!)ZRdZk9L(c)S;8qs(WSFcG&P#G%M3wQ+4q3K~E6|RtLG>Aq9;}Ncb zaq|RYr6P7|!R|O$_EIjU=4co#k1#opk|P?O4Tu`KxG#WIgVbaEYEp zj8h!Fo+9-e>jcJfjL|Rf!A4N15+Mi)Nh)L#6j6{8i!IG2ffaHkOejeLMOEN9pZq_$ zg9L}5aFhI}X(F$LP7H6KkAQG^K138FOb#cE$fTmBqax7+(tu~1yxre^Y-D?~rdG)f zKy;F%r3E;;xMPHbb*1P)Fwyk z-nMP$vI8BxpF3Mu*Q!erro{eo_N}N*Z39EY(x`^4E5ku;PyCF~zVa2j;w!h=t+via?$=j(l0kZRzo?E_VHU8|gR7r)53aO9R4 zU!I&62(3Ki;MI~OG8oY^5K z(t*Nx%zwNXg+taz=kH;gY z&+q#2Ac zf1-L*hr?Sjk~GxFDDc^;zp)zUJKP6JJ^NR9->o?LbjxX9W8<08%u43CV=zJT(6eE^ z<<7`RQD)brvV(~~h?iIO+8@W&?99}Mf+>&c_D$TcN_dUM;+h+x4s;)Gfv0Y*?)#>< zyA0-d2JvDjy&H8;YvC}QNxA)IKkbUFB8O=0Cf DA5&(b literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6491c41f3192ad0849c876edc1c365b6e0eff7cd GIT binary patch literal 1532 zcmbVMeNfY89PWWkttjjU!#O--&^o7WlD6qb)~YmVrAn2LPB{d((1cQ;Nl79toG=Hc zp1Q-kjdAFP+wk1!$-tBI6GhS8oSOp9k2~k43|En%plsqewJb&I_6O%5%U$xmZ}NMd z-}C#*mXsAsr%Go?B@)S0YZ8$ru0Zgf6ed2OPQSlfT;34O8A3XnD|ktcmLyVa4h>k{ zq?1mgNvfpiJZ+Fj!Wox6L&&ftV-D7>AcHmvpW7p%B@)A8pNDi5&;pP{J6((s9B4TO z0xrr3u10OJ&4bfaUXmQ zfxxJVP+$a~i^{O2065Fh0IJZ)9SDK|TD<~6bt)yg5KzJh3c-2^f#ooQAuy(dfw2n| zy>V17mPS~{e2FI`m?sDx41&B~ufnTRu$&V@^m;u6D5=J0>a)wU`F%UHG z;9MTT#WFyUk<4M&2}V#<`aA@;$7Xv$%p2GNDqW4V94zb#x-iq3u*MfGRC#$ z?Ij)>N~3vp9p@11k(&?#i@AHbqoARv23yIw#G;Ue1nXGmrWwIX7(wxif^t!q3BgUM zT04rYQ@@x`ELgW3F*DXepXf!8s~9nX4t`dQ^?b^(2YN)q0ZB>vMHFjg|(- z@YMgw9V7~Zf=%+DrU|_gJ2AL@F#_V@#SqbqI60g+A}7$jgAz&D94nD%_x*gL<~(y| zNi^}WqAfa1Iw3kPMv?SXdaEO1TGHR`vI{xQlwrGC&K>Sa`RJS@>uUC|4kuPuvuy6U zqDYw)pS#}ms5JK4q0Eb2 zy@Im#>wRs&B&x&Dy^0#PwJzI}18=Q2#hebaT*{wY6e;(1lp#qC6&;p@%fg~lgXHd6 zv$pS$wFFc%wzNKtjV}0Zb&LDJ)%-28?y6Z`%iGt-76pE5xq%*C+vK0$f2RqE#EZPn{1=sFMf3)o;vKpOb|WY$P()AD!wTCTiZ?%XI%+BbQBc*H$w zWk6coQa9ZD_{l48Ub{^k&gXI4$FWf(8B|oIvEl5@N54ZKM0{KA?e^YG9+_QrZ+3T4 z{FL`TZ*Tt5KX^6K{VeX&@cLud3+Gf^=)1N&bE>p!n{0?ZvZk{6dh#FP{SkE&+kJ+1 zL;5$;cgiw*YwI^1UA*7^DD%FetTD!4zqV=K%&af6j&DjG8cCMne-3Bm*Js4F?NnST z)Z995I9c<{myyMJ*o^=lX&H*S9Gh;}`s*H?nfw5pct!3_-Js0cyy#A4+v%=LyDr>a zv+(tZ^0>CJo}bbmh7WhnQ{f$l4n8X%S=BSVV8iY}G5*?u$m(8f$%g@MPr_HNotQ`V x$@$NCbZPdHolQ3f_6|gy4E*K1DJ_qfE}0USYkYFHXI1cjY&EYS8cpw4`~#-VLsS3& literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..02bdbd032a95b460f0e06ac47466d9fead7db1a3 GIT binary patch literal 1592 zcmbVMdrT8|9Pd=d!ho60jX{jN6`T-l@2>6jakjF)&`ye^)KT_Oue~chXnXZ~(1H}1 zi=tZuCpv} z&-e3v-KPA!#YqWi2^p(T1V@QeW&+ST zuwueMV0gvqQ-qwuneHTwCdQ=CMJ<$rk40_xUWbcCb2##BuM4x35)5D_ibiTZrf(y-Q8l$R(9DQBav@v{aT_WH>i_5g_-XEP;byFu?1uJKd;P!JXtq*?sgi z$OR@%m{JAzi71mkA5c>?0U&%a&jQ0RAd&H5L@E>@3jhHGBOoLLVTcF8C=8(j2$;IK ztT!6Bq6SUQlrQ$A;My3*g@T~R$F)*9E=R1lTvTD#}G|3hPvuh|znS*dLI*o$Me&ORJj;dg_ z3K5AlN~ub#6~b)z0*OkSBUTAjYK>Zm#5kUXg+w`Gp-KbiXmcbmtVNVk5uy@6N{L1& zQmbUz7*^+WGnmst#Qc)1-zhBgTr8@l35=m=BSqO`9guIM7|Ly$$y$A_KNMq==SLdu!pBZL^#>Wq1h4n?f8S`9L}^=I*roky>jf! zrS(^!S?j~{nxRbFhUAUys+Ocz*RG%No0SXgIqfsvo-4ne{wl@b(PcojvLc_1%{TzapAWwq}YdcNPbg!LmWrbTx=pN&9ZPH!Ek_a{DiK z-Yf4(JA1S1k^VtTRSgK=UmvJA5o}D^+%wR3 z?;06NI1Y770^#$mrQTg_Y1X*mm%XOQQ5S>vz5&*=Bc2n)b+nZKK5{9xu8KH-Q zNPM>W(?CPU!KzctUrurJ;&@~%WK10TquPIH4t`a5B;(SzoL<}UMW3~HZl(NJ!wXIy z%hYup6KOY36y=@`8eeZ}OzG&|IR5_UzqX!f$_sQhe7}7(t7K@+^4+b$(|5Pte6OHL z)Rb$FZ=Bb-58D=5`_5~-sz-#q*LAlij=WKKp(Xd0q%^#&VCLcWP`TQVXVll+*0jBx zRD0r;k9V$EYR}&gI?uq7__xOM{IXB_Q)h$%+k3w|niZ-|Y2tw9cLzph#bu`7ITxrB zH*k<&iBLH=-c@Q3KXT&K;`bf{LX F`v=%WNimPqq<1~9v* zEXK-EbpEFo8J$cvoMUb2V!GvH+`+pPRM7)m>A>$bt|I!yp)iP*g5i$UXU-NcrWQXKI9jWIPUm zb&D*|0bxeU&U-~YC@CEb!R5ACUJ`Sjp+re3gZz{mLKHCMa)sj>u=a>n=3g1FwD#EY z-3(-9JiJ$MNcC_|jew=xz1~sSP*Q`>6Zbz9?vx#tFngs8tDM zqLwfkm53BRsv(S~1VTv|NP|)x;dmw1NUBs?gfuBp6@nPm1cn+2mD)rSiE4r*i3rxr zc|?kHFcH6O*zX|L@LDWx5Ex421sl)jMmiuRn-_UcHtz-uhJlI$)6!Uu=6#;`!zCJw zm}CStkD*Nh?*ayLjI*!MprILB3EP!&%Bi8`m|BI%F^WRuDvY8r%&FBTXc%w^Pye6X zL6RUS+$8^Ln#e1u6T{n=BOo1K4iUpilOsqY61%QRDU%JGV(*{h-rL?O#61msS6F+)(sZ|bC&waMsMJ0^7LS*;|e@=AByJlU9B-`YO0#O<#`v_`<76XN$^EY}bkW z(l+nprsn%Q>9`dIox&&m_3cmf7c%hp?mtq|n6X8@%MP9F3Ft46XwFGJb?eZtqfDBq zyZ6~!OI8)0FS?YinmDC4syg)m`|NkcZ*>ia`)aloC@ULtTF>g-f^Tr%4~ZJ9gnXdf0)6j(J_@Y}bA;RQ$5I;z(_|b+tGa3_frkiz}b7heL literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a85ee3e8ac4e1db321e96d69b30a244e1a133c5b GIT binary patch literal 2125 zcmbVNX;f2Z8ctZOVi2?_3W^~DMN9St5=~RGfB}LOQNckaBsU~La>LDqgjHl2S1hP( zHjZrdh-DQ4D<}c6R8Xfq6jW>vJq)WXT2!#$=-ePU^TX30^PO|Q?Y__R?&mum;O}i| zVP}Ctp)7?v`GLraHGa!YkonE}$x>w501JZQ-JlHCiXi~yDFwp;tWYVA00IHAG(P4o zumgoMRVjjk;b4&;O9CnhVxtT}r&J?o6lw=Yrxr`102mt%L?~2j+_R<@99AJ^bo1zr}iH(nEQ*aZLb!QUDbPpBZij0DYHLP8b0!fNEnh#21m4FHs^4U1#4?(Js zvbba(mri5wJw3Pr0hNrnPjTl8yck?6m&fN(=}R0R!_r7zJOR&>=OyrRCzAzqE`!JL z5K!G2Om_y!gCbbM3RN0dtdamrdKHM?MJ)F(u`C`0h+z;40>S8|3J8#cFsPA(YAlbp zka4W*K7~pOYBgJpDSGcQAAl5bfYb{DmDq(CvlJh(K_&+146;~^mr7|AJe^FF;=^U` zGCYY!Wst-SshCb@;ui7J|0i}t#2})vNdBj2madRWG;Tk%0CM=yM1TtE90+NVR(gv8 zg))m3@;!reea(A)!9l+DRQ_Zwn_B3Ny^C{p>sk>boVLpTea+A(skkqfZyl`hO<5Vx6?9ckDF!7D0d$@G#&aSI!o{P;}PEmtBX%2<6@H! z?TKv+4heD02=GDIxtYQTYy-BMkH$L`_1a~V^JZ6X>Oh|hG_jLRGxaYvdOvgTGo$I; z+}s8oik}_xv_}09qfg9wQ^VP~3hn!CplVe|j<)Hy6auEA{`n}(Vy2TY=x*B068e=> zC$@mn^cxbJm{oo4Ip0L2j?dq^I1lM`1=KHhkvC^so({W}^&;ay0+YkJ*nuh4y}X9%O_vAbWIjz*51c0 z({4-4m%EI1x4ND>^)zTKu74)HJ8Sa$Ut+_{Z~N$-I&a)5wz+KMWwLs0^s)((3%f9t ze@K;l39tw$!;iJ^wQswe+1SVlwY`^8m)!Dc;apo(ygC0XxG+}m`8$WP^p%~NXXTye zM7z6IboWO3u5b=>c~EiHMqfTptIM=$FFRQ9(AL(rG^Zwzt_Tk;zvh>^A=9u;;%ZKu z93H-8J>mHskd;v1IudzsB!pgcA*JQ;_buxxC(hY-_ZTGS?eC7t85y>Nlt&eNYHIF9 z0{tg`y3>5!r>@o%+$M40_&;G*$Gkxt-Vc<7X;b%|=aMLG@J?cJ1j6Wew%k zdfa7iG3Hl4Su;1(@hmlX^+cOhX>>`^_T_@lb1l|)p7Gp<@989lrzWzdiV6hRS3>*# zz1DercFI}NoA8{(d62zXt)$s`Mde4vr%XX7-wv$$yXI}_83|AtEx%^cefszP!YIt^ zXXfZ*rfpopxz;yo?6Krxx4DNMD9t*FIw=WrJx06Re(uki-jL{u&Vru}UE21_F;d>k z3-wyZw*D{rW_;97b7l4^hn?Q)+;1N%*_Mg%sIB5%IZdvLIg;f>TvlPX-2dCFW}#N> zGt!XJY}dNHCjNoMlH#=WRu!i%IwbcwjJg(g6WF$8UzO1N_nJ-*_ubh0bi8txPiRDK zirof(p&_eMG~!cq{|^%ZM%IPPX&7GPub`IItsQ2$)jxm@b38Be^w7w;Ys0nKkC~jr zz_6oLRaI@J2dhVTzo}+B6`3ibhQs}7H6oE{=v7ie!raDxN+U{oM}~)|&l~&<)xtA_ zd#0^&Kby9W7-;br8Q$PGbt(Ah^|N74&!egz+F!7~FT3?buh*j<+`ETz*tBVA_PEgh zUw`Y)q8gG6P1ZB3XJ=>8`T6;1ZCo5GKQ9kjmYA4`{bOJN_Y!&gG@93I<0Tl2@vvzY i{qZ}_q0gT5n_y6%{+RyCPb5JbA9$g_pI^ldOZyM-`e!u& literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/items/AdvancedControlCircuit.png b/src/main/resources/assets/mekanism/textures/items/AdvancedControlCircuit.png index d9aedf653747a5d81b238cb83e1b5175334c00fa..db575ea2e6aaf6df9d4bfccab8f0a9c990271eaf 100644 GIT binary patch literal 1684 zcmbVNX;2eq7!HUi2#6Xeh~m0{!r*4Jo6RY~LN*+g00U8&qBfgk13{9F$sz&KYUof= zv9%OD3Uw%GDGZDblu^8@R9Yw?9`zb+9Z|uHwj9coR=VM^{o(kd-^_RJ^St*vTa*|d z?e4nJmBnJY$Hw4E%;1G5U$7(P!Y!)kQmDNOOHj*@;Ce!ssDfru|b0DDCO2HJq zf~zpe$P9fi4kN4fN~KYjBsI83?YaF6G{*PFf~9%n^~)q zB;iq0x|o|3%%EwL1cq~RayU6W4rNY<5wTbdb5R&YAqD|ia*Z@$g^ZSfX$d%K(U|on zT2C1PyF@}wWz$lSv2@Y}gGr%yE!b$83KSDE*h-jSgu{gm2D@JqXbYW0{%gh?(H3Q{ ziG-6#3zcowF!|60Op}?|yuEJ9KZp_oXm6JcT@s^w41c@tkQM7WW{NUkhO$VU)4Cc+V(Jc@^N3^_xj;l$kOB6Csx9-=JQNVLD8W@E{$^6+tA1k&v1v)Id5O$y19E9>K*# z;1pl`e?tc|M#1(v`A^+UKQYB%|!SdJ%S@d%~$c6D-E z%;yp8SC7VTT<^F$Vyn-Ma9jVpFr}txR#mVIKcz#F=gBW>z@0|C=M8&1c^8rcy16Ht z570Yo-1GiTf{W~{{wr$Nw0!dv8u?Y))!DrEl1KT;3aUGQs7t(O=dtpm3+}d$#$3VN zvo#wwV{I{|&V?%*-Ms2%E6ynw32JH%U;EBS_Pp=#Gi#P8WEa@y>4vjvS0*gK4`y5_ zQ@pGiS>0O=?LHKsJQQ{ysLwIr7`RglOOD?v`7*HUY*bK7W zEp0Q1hXp*veJ!wU?YsofYuAs+W3F~?Q;jag3g-4~xi@E|zM%sNixTr^&wyXnHW>m=+|F%@NySk+SW1HfAjs4e4CqPf9O_yisV`S znN($dO;Jzl%i@*((x~w0>U9t3vmTXshh2UV+nzr5WBW$FLai0^<2llIx;lKzkDHfy zFZ^KclR3Qui`!TQvRl_w&Ud-!;LXAD^m_-AO_hPOHm3{!dJ?VlO6@`Cp8(GH{#}B6 z)ZrFzRPEzWw-9_MOa;D|kQunu=b$Y+ZPBOuTu%G3{ee5I&Nv4mG;s9AkV8hO7u(p? z`mj5E-5A>aKq!b?V6IQ=8O~(CxGliK{Tz$;R$hMWtQJ)Mv0;^}dHZO3QR{f~kuaad zgQ~_Lk1ZZqA9LbnK_O1nSBax_Gj`XyQhjqqPrKe2ENN2t2S+UB)pqp!zBSS~aOaEN zW&0b0gWKgppZK!N9#tAl@q3wco^P{#3wVDeiVwoub3-n@+t;+@V%?7ALlXATh0Kb< q-j;M*Mf{#+`|=$xm8Er`o9V-<>{g9A%Y~2Z|A|<6Jl+tgvi$=pqk8}V literal 1549 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 B8%Y2F literal 1679 zcmV;A25|X_P)4Tx062|}Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p zDdn?jQ1M%nLqo{po`6GcNRX0AYp4XH*IkPLJhV>~*Yj^0HD z4_XK_a|QmY0ihYSjYb3cd|nUt`+XD&1?~5GJw2Yw-BmxL~P%h00E!;@bFWG zxdI2<*wy~&gRuL`daLhIyml4KCnsXT;s&h=Fgt>rP``zb_RR9dniqmG>MDzcQrT>%F~xIb8`{+_9YfD zI+&^m%Sw7?P4Hr=2*-6`f=h6c_;ulubQ7($0xYag2(Hn}l%=a7dr0cQ1h^3<@v2*NP|%iX^nx{43M9Zp*l zu)W)dku9B67m;PmRLe#xAm0J002ovPDHLkV1kbnGR6P^ diff --git a/src/main/resources/assets/mekanism/textures/items/AtomicAlloy.png b/src/main/resources/assets/mekanism/textures/items/AtomicAlloy.png index 6a9daad49e6799a672534a702028d334aaa99f69..ad65e1b5f80330de02539ca5fe974184df5a9137 100644 GIT binary patch literal 1584 zcmbVMdr%a096vFUP{=1LD();cgA;rExcAD*;~sFz>B*gfGs?KP`#bKGyFGRnIDBN9 zIH;8Gq-4spbPOS-5ILKeq_Cv$QA(mniHe~OPRLF8$o7!4{&4!E-^}m1pU?OG-OZNy z=~0ofkrIg{%9Nqc68AB|84)h7Gy0xV;xZRu^s1G#hJlmkKuJDQ6yOE|1^L|h9-j1R;X%2icn&_JFf<4eR%+pA zM&+0-kdEa5q>w5R8pm-+rIF$awTw_CLIj2@P)vj37=qy>j*$cg4Gmb-#xV{uOK%*~ zCEm2KQxLo)iWV0aON(VvmditNjYflF1WFKyh(P!fk3jhl4<8?rpa(q7xx9jl^*}+1 zl$|XUw6JLDGZ)-mv-!DT4?h$rF=VKZ@}jsDL*4G6UxR2~$O8YE@j^6jEAav}3-D|q zM~nGz#D~aY?EYI(5GYzhF5p~ZQmA}AOBcFNr3NEN5fc{7@BGoUFj|PSy+QbWlRJ%fqn6{H$Pxo;j=soT~^h zMviqugCQneFHo-{WQ-CAGDPW6;Rvmg6NrYEVF*rW)Qrkbs~wmO9^y0qH*~0I6dJ6P zf7MOsNi4?T@p%`Bm*;&1JYw^3VwbdbW&J9Vge@}ZQ*FNXkF1^ZtOXOEF0E^>UDk$P z_^{e}DdxuH*b2HqzXFq|KRBcWZ&uqE#5LXR|08YyV-4x`lQ^<^ z&+!edRTrnjc|U<^%aS)P-a2A-Y~uFLv-vlziOXZdsEDe*mwMKB_O_A!)fHxTYz;$d^q!yiW^{mhRV)x$TBSv+aVjFiZ}JqGT}SIY-3 zkH~)~Ghs?w!4FJl&nMKbeb|!Z(yb$#%AZu9-4bo72UADQ67EQA&W+~kw|)%2SsotW znR!#TqwCm~y0WFQW9POu?#>w2?t7s9wl}G<;+ALEjs?e8H!LrGyltGT!WrZ2UmEz7 n%vF091k}&FN2vtsrePRt31We994!EYP1EF|wf3Ob+qSjXzeoT& zF3YkK5&*ic3kF94?4Od@4W1H!;2^OlkdhDyaAzP(AeK-#@I22OI0J5*D-ePu5PG7f zX;zFe8#n`Q8{QY26_Ef9?m{IF6@aOwft7lBP!V|N*#c0_I0E0G4}xI{(2Ds}UO|9n zHVVXp|4L8+7!w3&*^UZehSPtJK&WrFKxiPYKujV_;Ph8;c@pM-hQ{NN&#>A;bb2XH zEk?M>05HSdHt}L~`Ep#vhUD@sSrwa7msmpW@jnNX>W*er98Qno4MfUc<>M$=fB*mh M07*qoM6N<$f?F(=F#rGn diff --git a/src/main/resources/assets/mekanism/textures/items/BasicControlCircuit.png b/src/main/resources/assets/mekanism/textures/items/BasicControlCircuit.png index 781448bdb73e71a6d07474fcbb960e91e9079773..8fd67b58b55843475e478ca1428234a81a84d038 100644 GIT binary patch literal 1663 zcmbVNX;2eq7!Dx8qFf4!XmO4FKrz{DvLVM1F{cCpBSgVbk^8J-+vyU8hZ( z859^5$Y3ynG)c;IdJgrz!~FCXfy=Lt*{} zkicO0=>R4C`b=X7MqmyYfCE&vKXYSOhGC) z)vf?$OHvUDGK$i4cu_7cHn0+>LkTVkEno!{2Dz+xHiyI|W%cVy=(YD4Wr_^%7E%x-fCL-?8|U&6NGRqY0#uA3(;yxf;ll_Q=84$|B0+@`Bpw=gShO|LV3edQ z)dRNZos?y!D7yrPolYmm$>$KH2}Z&@xO5ngri=DC% zHpr`p>4^eL%A!4e8-mrInmQzGa||SkP8saN>@dRN!d9y{u70$GN(cYB@lLcuS7--t zI&csLBu?Llaq=LU&fWVBd4aSylG&t%z7#A^N#F%mV52ljDU1HXF<1-|o)C)%bj)l4 zK!j`&j?#k==-E6}q&JFCv5;pF4C=g#FIREJDj8RyPzzB6QK51!U#5_wT!m0BSE1@5 zuEyq|FdGgAZChyD16=ugxe^5lFp3~`1d%sb1zIyf5e_q9hZG7ZHq&A=5KhMw?+v{T zSP4kWC%~X42`ki}Vu|G)=JhCQMD+-tZRBx9Y=EMGt>+7Iwvi9`dJ)3MxTuIVz&Cto z>R{R_*jp$6tDC_ix){C7p)Q~|Lwy8nbn}pOmv9!ZsAMpF>oiK4&UL%avmhyaPGrX$ zldv!V=&rd!r{AK?{8QJHtE-RBGndPx5jWfSWV2$YK52}0uidsjIz0waxl^u% z%QDe}gUpnFSOXZ?_DSvD+ zz3Mw#5?)74*_1SgteMcVK5G53m&sM-{^xV3z2hI3#ufKP7UyWYBhPR5G`j`!ZsgQ- ztZqJ6!Ylp>mZc>}Z)+`FwO0Dzs?iL5n90>MJP`q{iEA4#pFS|`VQsuFi*R4uP&vK1 z);}%fLUv5nxcTmbL|DMIarZO(-t?TQ+_L8O?y=fCeS4R`8s<5={CZ-8e2WRr?p_wS z{pWz=5f55fBisp1>$K0$3z)s#g~|@KqFzw^sPg8CqkgZq`%ojBCms5}rhd=p;<>^1 zdhWh@Rxskoz3WMp+AT;GzVlYFu?iC0a-Z1fU$<-GIr-lc$dHL`&dpy}wCz$s|fOkoiKzae7mG+Ghi=3^mZyuCokYQX2g#~T%o!Xi9? zO@xTgr-CR=0VgNZ+y#JBu)FbdBn3qMcj_R#Wvm^=CP1`|OLoCSv|X}y9);si=>QA>W&&Yp6a%hkXrBN8002ovPDHLk FV1lnNcw7Jg diff --git a/src/main/resources/assets/mekanism/textures/items/BasicFactoryInstaller.png b/src/main/resources/assets/mekanism/textures/items/BasicFactoryInstaller.png index 66954141a4b9b4bdee93598d9232eba798318c60..800376d4f8ec603f72b5cc42bd4ec22db2d577b0 100644 GIT binary patch literal 1445 zcmbVMe@qi+7_JINi!K{e7e&K)i0P7E??ov7aW{csvAqxZL(jDathGc1=$A> zSCA_MUcd>}l|O(ijb=fmSXiQ#xbsftWFuKI77_%3$|12}g%oCEHgtxUh3oh+ zjv_NAYPk)4=~Ri^gE(XbASQze;|YpH7^{Ia(N>bwBNRazagx9(D@Kwm&9I~ynSD^G zrU-u4>&%_if;$@;P}LBNxJTm&>MD(BEn1IDx5N36$Fy%a@tV%#UO|ROEH`oz?d-; zAQ{ZU({Nyb52I*{&u^iv3?-NnJagfVMus-qO;$&)-AnmNjyksi%@$OYk4h}btr&SWu;J-D-u=U3COA(4#*+I;Xri7q9n-C@VoIFdKs`2 zC}IQ%xr!V_W>Ug9(h4$ACbaFdqXm!T5QBFmpaZ@Ght%V{r+4PUG8tV^}8KG+Dj54X;ZA)%ve!KP{7gC>n^00r&=)O;% zOg%cp)auf&ZtnHAW;XQs&ku_CCM=_Pq7=OBOD8`aEm!(Q%LNT7dR-j6ALB zjJ&b6s3_8L=A!pP;V+R6m0k0GbL#j+Ln(3S&f}>5tTvfz+F_{g^NaMVW9L1(fnAqw zR+s~)9t66Vow@1JuUMQke_iTgUt7Z$y#l3Qkuo*inX&)DD=kT%Cgb=mCp<&yTxIJ?}K$x;^NT zszcEePm;YCj_YH=d1>x5`RggrbbfT=Tu%FDTD>|pfg9@Z%&ykojwa{dy?m>pXW+`^ zs_oUi{gWxn%IkjGo!7bZ```ag8QwX4XWzIyZ=uGl?ddrXa9xc5I9(eHoUI#55Bvkc CcoVq* literal 1676 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 diff --git a/src/main/resources/assets/mekanism/textures/items/BronzeAxe.png b/src/main/resources/assets/mekanism/textures/items/BronzeAxe.png index f21740c69ac7620084b42641dd47244f66b326a8..1ac7fce51da6ca3434e79f87d485d1344590999a 100644 GIT binary patch literal 1343 zcmbVMZ%o`|81I6hvO~C-2#1L@U6d`_>mPbo+T4M+9w(>iFUg^wu6_Alvm8#c(bWAL?cL`F`E|UUSOjV=+^Wg_Uol7 z4Aqn%*5-?mv9thswB|t*>>6xI$b-Eyr(lf@Xduf&f)ubtG@DB57M~4bE4(~h=Z^^t zT`{qHgV?H5?Xgx=Fie2@ygpneX$oaIFXdx6ih2g6Nve*ZNP^~YisBiTr~K&JgF!V@ zQTcc{vZe)hL9EBN(>y_BG8u2C&TE+61jTV2LDB?Gri{pnX@c^SL@Je!YsK2KJ%?G190Ypj+ECT`@A&w)_pP1{?;a_9{>! zrjbHdQp{@`$crqasM_+o*XJZed8n8efX8vE{{mhp8SHmhP2hqJDYAk?5bI~rdCuORdRp+v3b^b z1TR?_ag}tq{RiKhY^V#o{@eTR-l{k6aeq&?jCSSjEe2+nPJQaC{CQbz9?Nv)a(8Lr zqj9%z``zm<{VY9N)j4!=dOmT}885Gysh*m0klo*G+j^(*`;K?S%Wu8yI=58n+A|hZ zf4OQtF<(4+rsSuF{>OtCoNwuUVC2-rF>!FzH#>J}%JbE7?uEU~0p`cscj!+7cMr~V zelXlOd#u)(dc&ES$lVA=Bv-DylsuvyX$yTl_5uH2u`^^PZu_ pWZZ?$sji~t&pk#bT8unUg><}l6iX(@ujGGe(WaL0x$RvC{s9^u)-3=4 literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ#hxyXAr-fhfBgS%f7l_ZE%9+f zgzm!sCn}y;Fr+=4pCT#Zv&Ok?9rFd*SjmdL3`)jAqA8T z%$Rk)&_pxmCg@zo6vl{VaVpBDQ$n=P$4r$iMwrh{;&5Se4t7QA_J{G0U2?zIeLkP> zxcF)D3WZ{v&1!ba^Tg;o`W1Oh>l-BHX{uy#OL?4EDkB9(LC~Cs0c?J< zh;cF`UB0S=$xPq&|eY|@t_eL(#7R<^cVtx zA&69L1fM$PwmSe5Coq6ktyNL51_AV#8quN{g3JaqFp>!&Fr>j$2!f+}9MJ*84=7s` zXfN(G&mXoW?~I^Nl6V|~%F4>rWtnPDD1s0S!ys4#X*4Psp%Tjj5*btlL}g6D%!ri0 z@)FAhfT$wr;YuYVD0})e1V3-LKNAj!!-$=E}s^qBrz3 zU^64Is~LK}!1;lp6yxl3%wq_JXuUM8LPWB2ike%A`G{o~BTYK~Qj*PygT4 zL9$a&v`+q0H?bqR7^BN)T_A6s^$`=0n@5nlggsrKqEL*OZZi|E;I&iRbF7ncQ_h^o zS#b4QQvQ$QEpfH#RA;E(bf$hpaXR5>n6*LY_&V;U9mzR8Zz9pNH!0Gvh&&8>BIz5| z3*Y-}>sfHal}MAnX!St&e!q9-&Zh3^kI%uq4=a27KMME$UA1M^`P|UbhIt3v*$I2X zeM(>xzgu%AmHPp`ij+9f?3lCp!5eF@_IOEgik82hU z)OZq>CteG8z1v)HDE#|Wy|ROVl!a6!)U!o|(UH6MnkF@7Q+;(+pX57XY3!T=+sV=! z=~qX+)zX%=F0JsV+?Fv*wQ)%q1=puVHvMw%4d0HjXD)XhxG>RJ%@@yXtLh|dU$mdS z)$rsZnKYZrTicS9%)NU22z%6W^F*iNhqUhd$**tg{>qU!I`Q+ouEjeB8kK$Im`j=A zt?8{Fc8qE3&OVp{r}Xwz?z+d9KhchG)rA(k&)}{rX`?p$`eS5c=vUa_hoiXL) zg~+}&dG%Q9%Om@*j_$)ASNwG$`)v8ShV4-N9dp8rLR7c@%H`5Szs9$>b~%-y#N|iU zzO)FsRk!ch&&R5*>)mUr@y1<^J37-=+^s!0#ep6@mRNe}yG)iG( zvZ^m`RrmF`wm}?!R81z_S}3Tz=k4!WXOY<*TkJDc1DIa2&WM~RarUfoL(}T_rz&%} z1U2J7f96PVWnJ{Mk|m4HE5VkrdafI*&b`ZX+z)6UI2g$IWRKi#`}qyF239@{J2U+4 q7+G}k_eaI~$2I;Eoqk{wlX=`+&-ep3`1Syu#Ng@b=d#Wzp$Py2I!9yx diff --git a/src/main/resources/assets/mekanism/textures/items/BronzeChestplate.png b/src/main/resources/assets/mekanism/textures/items/BronzeChestplate.png index 13cdafa678b37b811305e9dd185ef99c1ef78b2a..d9bff93252eace6b1ab3f55fd61a7cd1961574a7 100644 GIT binary patch literal 1690 zcmbVNX;2eq7)}8Nqo6Qe@m!V`43ca%2RTT@ghZj`&=@pm>9ENzWQAmx%|a5Y)*>jP zhzHu*TC3>jpklnLwlbg~GU`~QMO!GPK(#8P!VIl=ROkl5_J`w-?#zD2yU+99@9f4! zi3|PN)7UH)%Reqwt7rBJp4V?Qv(D}tM3{|3>x}dgBAs?16vk4cgb4%UtVjl?#}L$& zeHBx(Sl-#V!AKhu;uU7X%11mHzSBxFY!*uy?IaO%CPo7$ECaWxz@7^=Ab_JPaG4}Q zkU+*@7CbhO!j|ME8q9f_W;qH*&jXZB1*5=<(FowQX4&itrwSa>t6Sb;Rj@_QE0kC zuU#-~i@B*l3r&*>2y!?ae20inP#F*`m&+l65E2S`41#BO*=WScv)MyNG-xrqnZijL zCv1R6BVrod_yTL_b zkRG!WIh2{HM|#KznaSPT4S9f!H;N<*XNrPkX$fQCS{2BA;iEXJ5K56qjER{i z!C)y*W)?Gx6f^OJVwovjCYDQusANRXoA_d#OfC{hWLkkh4Z}LIOdySn5osbt>IIBg zARFPv+3Yl8Gh-vRamMyASNc}2B8I{cnxG5>ku}lU@Yk4~U$);{-F`2)On)qF>M_x~1Ljjl zM`*x!X%#=jXRz{e#R=il9{)>++Fve z?gcDO*BJM(*N6u*wjADia-2pQ8UkXo-@iUiR?!|Zf7Gt9$d0Oc#`be*EwI1KsccJ} z&i+2L2?9#vBW~uKW_F1hO;vS8a=Y|Su}m=U)LE^&w4r(POl9LGoa5Cqu&(d{G9$J` zcegU}{1oeb$*fD;Z;d-w$NuH#g*QJ*?j_4s!BHK5*9XhO1CcQt@QJWXv95Uw%c4JNS$4aLd*Lb?$dT#RcL5ZCFRc#j)B@%&#rFGkLJ=yjyg5 z%l1Dml-~T)h1AEEKlbVSUzvi?}WylJye_5>DZ@rU>1=dMlrwL3qybSzGhH zr%jRgt8=g4FzqJm1R;fnDJ#tG@i$zF%AF(6U{<7{r>h{gjbEX6QF!8RhMXgTHS7z% zMcLKvc*9(fu>RU_#tU+8IyUkSYyU9qVbv7<#@wI~W%^%|mwm>!{0heWPp>Cjc57e( PI+elG)z4*}Q$iB}bplal diff --git a/src/main/resources/assets/mekanism/textures/items/BronzeHelmet.png b/src/main/resources/assets/mekanism/textures/items/BronzeHelmet.png index 150053edcbc747476417975db8d029836d2fd35c..9749faf7d09ad83706b26b113271afbbfaecdb6b 100644 GIT binary patch literal 1465 zcmbVMeNYr-96ke4Kt_^Ll(KdfHI(l5cGJP?0+L?X7_IaM) z$NT$joiignA}l6MqtQgzth7s=BmM8}5OsWUbc|7_MM`R}k|`D_WsC$gDV*pAkj=vs z0vBMo@=cdPqDB+6iO0*ZKRg#PVimqL)TvNBy+f=-kQ5tJlJM2{gDrd1JIxm-{fpH`4#0}3>dS&8>5 zyeL3^MaC_bDrQ*qbRqjX5 z$OglC=O5Zx&NCwM0E=B z*U5kCCUB${qklQo1?pz1kAR>ykEC`9R$||%(agAMqf@eceTOp#;t#J|SoPJ_U+dpm z)G5X=ec7+*BBKx28g<{>J;nAD8y*IouDspRyMgcC_jgO==g)>kx7?5I-hTS)PJweC z;=kST!!5S$J2KzCcT48}2S1sQj3)K`mDF~+>GYFJ=wXtS6MGO zetzCYez0nPjde*)U2AAnPsI5W`x~ONz<$O4FghD;ySHQMwa~FAx|iyhk07f&zhfm< zcjusfeR=w>_{K-25x+cW>c3n6I6S7%xvelUd?a+Vl4#s_|H7P)kJbFRVb%sadRrqt+{dLsHxq>U;lJ) z&oD7swE{VcoVwVs0!42O)|9k{-#in(+aPpp1@+drfm7~22< literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJDo+>3kcwN$KmPx>KkSgy7RcUX zm2kqs!PE1ly=KJ^3x>1@le0<}70g_0A;Hbf-Td)FDZ{R#FB&E=ca)yEP|UDVjNhL9 zfWf*P_RSeTtQd|xeY<8D=;tA7^~Qr?{=CapmHwT#E!giCp16tAs0z chwm{m%s-Lu|C`0n3g`+3Pgg&ebxsLQ0HYZ~*fHw#1r-E$(6K{rM$5+Ph2d zuFWMc?R3;lT2y2RmLamYA$t(#6dwvkCv_796-o=6Q)IH2QAMqDH2$tlst;uk9^Ci$ z=RTkB|L>g{%pCOYd}1epAl_6`$ij7(`#$^-lzV@xi*WJTiM%~z6zsBS0wk&!62MZL zSOi%hDwXj?(2F3g<7zH%=hKII+0gu=i}5>J39=ESx6dhw@+hz|2^3X5g5UXc0moD& zf*%c~1L;y6jHt<~35KefoLn81IR)=~9_w{@s6Yd@h&kGrZt+e8-_Xm$y?agK*apNN zjo_P3<(m? z1{${DDT0sKc8Mp+a=Gj;2mOXwBq@&L$N){!GyxHWRncwHA#|&&sX+jiY^o(&HFV6? zC`!hJ9l@cen;~eWbb3p%ZZ#4GQ${*siKP4iQq$bHHqe%x1^>FSE!xUeN`TA)%a|}_ zSdT(ilMHire?u-1dc(h9s<0^Hm|(~g8qn>O5W(RWzoIHU&5B_FVD^fr14R zK{Gv4p@-pES_w7vY{zFQI>^KrAwIxGDJsFlI4T~zFqAr7`Z57&X zaO3yo@^KT0wqfQBW31T)gCmA*SR+OWi^s9yU+ccAq9^MYj@?G}j%D=F2Sv*Xui8dG(|H zwJ(d8sn*r-`qJ8?=H%@k-$I{y`Z4szjj7>NsX%-CP+gmFe3|Qa(Ld-93KEK}puYx_ z!EoE*&zENpwLktz_^04>_x!l8|HH4BP;9Y)wk9w6y2v*?$O9;Hdam;Q@LZ+K{R^cM L8R24V_~m~9LWi#f literal 217 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 Dp4BbJ literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJGoCJvAr-ftPB-K_-G5<3 z$_1xv{R!8Od1Y_>#&YkFcIDQD&4*5~NB(%j$C;-lwx0XX@%fTBS|pNJcoygv+|qkw z{$IJ_!1dTE&lA^1xc=eXkWgUV6{PjZT|s9>`^mB4)XkgU(gXi+Kha8OTHL!}mP6*# zHNOrjuTV4CQY2xU6xJP!vcMJ3Dh0M%bNUc7O%6 z6lm7A(S|k}O^E@TdTC9dt&K)4p_CRwZK4l=wXM>|R*f-*77VUj*0aE(52O!HGUqnm z_g}vA|8uakq$oA%$s`0pQk}()GB~G2-UJkmnR8(lPAa9KQrRtflx9{2h?N)J0CRfT z8c+sUzNKLtIuBEU)nr6CEgHf5X@m?JsYU z08s|~Vx!E#`|xB%$xyq8JBk2dG|cm|0565DcZgi07x)yX!;Hf(8eZTTEzKGM%vo&! z6s^wV^l+eoTdmdSxjlJ$6RqV9Q9GOQjTB`!8FhAhp^2ub0=<RW)m*SWTbav8e}SVfe}MX^3w1*Ns3BKm7Z3A5X=>;SUR1o%Q(^kS$&rEu61yKUdW4%>xJ zmsGHSs=djx9nEOk9vlv@=%h1e$prZf^;=2)c*4;I{S&dzv@MQTyqS$|tvb{tSgWhi z>Lw3bW8qNB0MLfTv|!PV&#C%DlOfCUR4y9VP!fzMhPx)U_!}`-5wzR9>vr#s^Wjj( z!0i3c_T0MrIGZ*BxNA4R=wL4wIne>JLe-(!wSQzDNlh6%9bUc~xIGs?R`tnY>g{h| zzBoHKnj4(Ir=b21KYFj@?nS?ui6V&c>zb7@&yyYhdo&AvpoFJ_^SB_^W5>6Db2jPoGycZfcf?7JB_pth~# z7E436senq;4KiZRcH;yXt zpncQnfAHJVFNg9}_lB3pPXBes+=-H9$KH?Gl7iTcCykjyN82L5P-j7jW5Bkj^B)1* B5%K^4 literal 1463 zcmV;o1xWgdP)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0003_Nklasjr~_C?je4z`A4z3U&It{?QMJRP!Y6*dJ$q^TE zh?eI+!1N1Y4ww-r^w3KKD9%UXzZP`jJg2kb4uf!*bo_fApnbWa?5sNeGXGM;2}V;9Duo$R`h^}005J1eP1`m R*!BPb002ovPDHLkV1l}Sx{Lq- diff --git a/src/main/resources/assets/mekanism/textures/items/BronzeShovel.png b/src/main/resources/assets/mekanism/textures/items/BronzeShovel.png index d368cccb7cf9e8c552017ce8a8f3d7403c96e25a..e1c361e889f9849eda1d87c1a6ff6ef6319572f6 100644 GIT binary patch literal 1372 zcmbVMeM}o=7(Z6iAnV374vUfOa>R&Ydmn8%uC`!5p}Hc2D%~H>Uhm$63*23IJ#6`i zV~bWX`@RX`bA7p=c$-Q6q z{C>aZdEV!_-uk+l9R&{*APBM}Q0r}g^RDchuZQEFr3?$FV$B!U8WllHuqr@Yyb=Xy zKw_Ig17P`%gX6$~Ai9HMD6EBpd+nSenc1w3IVr^;8bKV@$r#JE0u7CVW>I!x^Ir~O zsK`69CR>mQ#yp@!tnE}mV`p86>ulv19;>cG9Z5SRkbuUbNvTba+mlXgjn@v>*<&0- z*G#llC${cXI9QK*6cwO0v(3a26p7M|nY39Ml6(xM2-1R+1Wqv~lC)cCJ6VBlJQ!3{ zdBNV`^>1jwofB)(w3r>o6N!X5VKFOeGfpxLgA)`^Q6^|%ig(Bwn>5Ms(j0>q#5q-r zX`&*dSw=Rhv};Zbdb%Eh6blA7iRJi4qF~DKBpbs?Gl5G|Hm)`6xYhvvbz@8Gc&H-= z@CFc9+EotThftaW!`$6jC~FA4u|KVf@KV?|ufnxUK-L0YCkDTmd6BnMG+O~+%qANk zX;URh=+Y#pdxdE|TSvIi& zIj*rX2XfjX)ZV~a?})W~RKRMA8d8+DTou%}D4G&)QDUgagO)XkGOr}!k7RFXJzy_T z#TNkYR}~3eOR-(tLY}3qg21t~iKiLP1bC~>6s2J%Xo2I23O35~Q5xI8^Zz$>ICKin z*2#bBCU*pjF}vLC0=U`iBOt@(QDK*y{(0Y@2$FX=;B|$PKSftEnQGlbJ-vtB>22Jo zxSe|@(*J0|+1{FK8C>sAO$-^0a#i>6LgwPb=Y36AF+=*){?LKzLkSPAoBnOmu;=6n zkX-y#@2Q!8?)9t1`}4)OLi?8I-`+j8uyoUrx_C;lT&T4Wj-gE9A!FLQRIoks$44TU z988pqEH}>^Z_gdN9Q*rLVXCh%6G;sZ4^$gJeCdbbx#@uei1Jc+~C<43p_$* zr`{*$r7q={ryd`8k6Kw>)J-DVncuIJ`%yianVwmoK5^W7V9ZcH@s$vX z-jyo5=iB`6R#I$ZSJBAljbp{nKGR-M+J9~d|k@WRQ`qF6n z!pQhHgfbzW)AvYK9kZ6O<<)Rc`AfiSguO*)Im&eebeIjy_*SRTWKg5kU|l zgI#^DnZG&=y7cjFH=6m&1iCzP@6B__YwqrMddK%3edTob`TkvR)}6`oKlz#EiJm-! Xm^=2x-8ZfcW&d{pU!C_;cjU-F^pNl+ literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJIi4<#Ar-fhfBgS%f7l_ZEs&ij zn*B%?=ilRP?faP%#Qu6tb3Az5N#uaUUB$!48DEI~&uvVYan#`B!{-c6VuybmzRqZn zvrzMgd`suniXRpXX@!|9WF$^^7B?CycDL_iE{N=zXOS5u$vXpRSo^K6X2V@aP1g6Z zpJ8lis`+8naLdu|hb+V9hAFVdQ I&MBb@0KL9al>h($ diff --git a/src/main/resources/assets/mekanism/textures/items/BronzeSword.png b/src/main/resources/assets/mekanism/textures/items/BronzeSword.png index fd37539ec2f2b3bcee7f369c7116bdcba9e53eac..6ad9ae74ccc389eb45cf0a875040ab675d344bf6 100644 GIT binary patch literal 1384 zcmbVMZA=?w9PjLeWfR?pW+3t9JmRd*>-DZZuDwxf*Q29K3n^7+@tQ@B9y%Joz@JXK6 z`~Cj!|LboI?k?M0x!GVal=(^G;53?5010?Z#5 zT0sa1Qg`Pps4*CfopLy$M*{VnsKzZq0b@zW6Nqgv)VR|LL2L&)76q-c;=*ryJcDDh z@yiL~=97(29DND*`QMFc*ayp%)l_qJLKnNn)t>{9UP?A+e2|P%Onw-#O zRly1pg{a!4yKrRbiVN{XAh0G_Nv;M8g^WxK36io{$#}fr*D^Y(hrqvPtcy;DyAyy6 zfu!1{i6|ejsv;T1?)HibKx7TqpvfpHLI13W1Fh0$u>2CdA*pqSym)9m3*|2p%sUDpvilI zX}vQQ`g zshi>xD#pTbtqag)t&f0$nny!j(sA^g4ufIC5kKzFhiwTTYCOW!+O_ZwRs7kG=BAscptBrQthF zB?lKznyy3l!~=OZ5&jL1*}sK^r5*~}M&{B}lN;JE(!#CGY4T>~oriwRNZk&x_t@pk zR^RZ*i1HU)`16{Bd9T9y_47+`$~Xtx=MTaL^Kfp@{X6n-_V`HA>&uh!Q@bV zzP#de{(QO5e68i|%bCH}cWLXsrHh{~=6=l_8YrKj&9jFWj=X3xjx#)b+Ml(ZTC`bD zMritrLpN4jP>8u!W~BD%KkrIz52sYW^nwc!Mg^U$HlLx?_14u?6bFpC-aAo z_AlKSorQb6!}okX)A<1n#S5m+QoJsE;Y}MX-FWA%N47sRD*ASomQH5x{{70Oy5QcD aO;*F%%7I?uSr1nD_xWps{KT%7-hTkmfBfPA literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ&7LlfAr-fhfBgS%&um+;X4-}N zoEeEXtQpcS&X3_WuoGLvaP07X#vM9sAKTY6cWjkdR`pZ|tX{F~iX!uSh7#t7j(ur{3tgW~iRsvt kQ*qAc8L#LiwDmAE9C%kUJH+;=G|>4Bp00i_>zopr07EBSo&W#< diff --git a/src/main/resources/assets/mekanism/textures/items/CompressedCarbon.png b/src/main/resources/assets/mekanism/textures/items/CompressedCarbon.png index b26af0d263f9a05964f8228ca26cde5fe9b9b35a..36644b5d4cdb32ccf8d0771ed8c2bcf48eecb58d 100644 GIT binary patch literal 1364 zcmbVMZA=?w96vT)5Vnaz7$b9@$A&|Dz1PyaOACRvNaG5uRK|>MTzgOH4X$_G9kehL zGZ*6KG8e}*iZKf=*@AB)z6No!EK@Q>j2~v1#Ar~$2q9!K3USQ&6e#+E?1Puw^LD@A z@Bi}r|97mW>WNJm`56d;Z1PsR{cz4ozUdp_`0(#{L^y3VJ@sa-8a8914v;cQ4Fc4w zh>gGxM5(>yDsUjk`W87*Z`S*E3n5jpib;$$u4s^rAdb?wCWe}Ti3UNV9Cc!I1A`bU zOHORB%}4q)7l_D}9XhD(s0xHSnnJvUm6o86xBvwdV2Ws5X^t8~+=(se3UHk~CNOjf zVm3LkWvA+WHK z_}vvNw&2c*MNCr@2qG4XS!0Y<)f)+l=Xrvp37WxmA}(qKWhDtkNyfE=HcUVG*NrvNMxb2-gdZ4c zs~&>)5iUrPVeam3C<%n#2-Ug_FGXy2tD#l}L`|>TiNP;cNtOiKE*1kAGj0Qv9p^$U z9PA*7(<~PZb1ZMCC0j~oExwDg@iy94=Blu}D9XcfZVyxLVK|B+JtS{0PjS6b!xW<- zkg_d9+bdlDu3W*T1JP9VfT}j9s-PyKnyL{|HPq!ockPvo{HJbG zN3a-^%hfJ`o7Fx7QP?~>>=J374IoHbyVqS7i2rz{%QurI=6v-XQ%GUrBjC|}Sub^~ zzYL5H|IpY_mfLmev+`qKcnXNK#y2}|4}CrHd{amFbpO=fqZebRXFgxp$u8#ob?eEJ zGci|B)@eVwwffma%fL@s$(hN`gZIDa`eS$xkvXYfxA|(VSAx{YlyT3xH1C)DFO1F2 zA9Z7K$M!yDJo~1lult-lHrvK++dS4>T)E@H*Q?H_Z#YtaA%RUa9e%ZUe{Z1X{krcD zep0h5M;rWkk0rPBTw>Vn{=+{W`o7`Jfc_%8cg=_0>R~KeabN6jHayW7P+QH7#2LU zXM8r}f!UET^Ne+iCHMH;p-VUBZ_%BzZI7RIY(M#7X3i8>YEKlP`PtVkFOQNNZ+`pR zq+V3F@Z8RZrz*H@ul1kz7rn9Z(4}EVsq13Fq|Wb~-15qS#s1+tf7(m#%|lLk#xKA3 S&dBBDf6nWva(__X@WMZ*U*i@4 literal 305 zcmV-10nYx3P)hEgXq;m}1yCA8u2RouW9@U6$l0{;Ft{0o5#kKr(-7jN(=00000NkvXXu0mjf DOKyeF diff --git a/src/main/resources/assets/mekanism/textures/items/CompressedDiamond.png b/src/main/resources/assets/mekanism/textures/items/CompressedDiamond.png index d8274fef2050e7d77e61a2ae0c72b8a8279fc046..9d2e009b9dcb7d23046e09bfcff5cb7041c63fdd 100644 GIT binary patch literal 1535 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 diff --git a/src/main/resources/assets/mekanism/textures/items/CompressedObsidian.png b/src/main/resources/assets/mekanism/textures/items/CompressedObsidian.png index 90d4e97ebaaf93d523c1d6b623ea3c311e774bf8..3e18a22455f95038d2351f157f9537ad0835e410 100644 GIT binary patch literal 1495 zcmbVMZBP_t9KWJ*=t5)+P06vHMH!s9+n3wp?p6+^d+{#369ENZW^`}wIapzLkKM&P zD0O_nk&yHRbR0iinTF0ds3RF#N?JNzh?+Hl`Z@fB1tx~DRI~~@1I44El_;GN2W$14PPE!?Iu~H!VlmH_ERgPEm0K~~N zB_JO#-l~cS$Wp1|D!9U8rPwu}W<_4hL^0YR?}u!aDr-*A&#+}cK|G*@6U^vuAGMP$S5xF$F7-S&8#2 zoG2hsMaCmmDrOXVIvN7+cex%53-VZ^V9Kx{Vd1=zXWC9qoMh^&s z#>i4|FaVE+q>LV)kun)buRf;pBtEXgO;!@eEp~&AAZ(P;V9T`WZ8=80&1fMBBF1$J zvcd=~h}q_#?GY|vw?CCjTO`0JqEsk~<*_QrD-{({E*1TV#e$?4ae`M2$g`q1G#aoK zNZe}RwM!z8jHH<6o?zZXQ9jB;=rleOH);Sy0gXpzU^PA+(0Po6j=?D-I>z_@-_&8y zDJ)ti|EZhU5iG{&@^Kfy&Eq}-0&E@$cFD=h5!kxVJak%f3WL3$HFPd0$Voo8Zm93n z&f~3(X?wZn^BgmCw%UuzmkgY(U)NF_s!2P!5O18|j2mQDQDQlVcf@9Lk>ZY!`JeF1&vBTzeWy9q0{P6MpFa z{N?+?FXr{}7y8~Wy~gjOi250Fje12Odq-rSBcbci&M&*&Yb*~_&!}Haar?86RABS2 zz0rK@BKIJ1t=yY^Yr&tJ(b>#x4nJ8uATG&d!oI5aMLd4?!%2!Ubwg7`0s~RajLeao`sVqW#Z9at<&bVw!F4- F!#@VFEFAy< literal 1493 zcmV;`1uFW9P)4Tx062|}Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p zI`bO>l7dNh`lr4(uX-|(Ht`=F*wx_=*IMok@RjbX ztBr`QF;xP*)UDq2T%|qGnI^i?m)?q;;zUEPrd3zPjgR1=MrRiwtS`{bV_iRbP|x^fuUIIIKB+dy4EF#a6f7h6l?AICU|QB z5zZ#VTx$z)&6#flXJ2CpGMr7h?%DpfaB}VNQHl%)^sNu=>$uv25c-Tcy1>~}bRfeG zSk`uhlWXB2jBp<)7Q4puiFgM3z{xS^K!mfPP4tD6yXHU>+;<#Z83IQ@%>e|Q=v;d` zn*Ffk6VE2cP&j#N0vL!Q_+E-J;N-5AfC2tK@zMa`u=PHKW5LNk=YXLlC&q*?6~JT` vF*dwWKomiL(fge7l?P66tsJxgtiyp{i^%dyH3_+200000NkvXXu0mjf+kV=q diff --git a/src/main/resources/assets/mekanism/textures/items/CompressedRedstone.png b/src/main/resources/assets/mekanism/textures/items/CompressedRedstone.png index f2f640b5e8f8a704aaedf4a9ae79e265a9ea2081..246cec43dd4d9c47b3e4982c27766e009b353128 100644 GIT binary patch literal 1419 zcmbVMdrTX396wf&4TKS#fMmM!#>_Of_vrO?P)6y)cG7}vVO_!^*WR!62JLm%gBHd# zvWc4`xJ_^~EKVWOY(4^;h`PuG2XX42{-G|iX<6ekm%+lO)9m3DDEbH4A6|05*L^;p z@8kFV-i`{}GZ|_5X%GZuSj+~yIA_J*#Se(%is^f_I6Wd5U4n!23SpWDkdEQp0Jiw) zT3`n>)3oUXD1so#Cf4Z^T-Gwm!}(=&93zYPgCZM(iq=Gew5JXTup88}0WC6l^cVuO zj22m^uwvGr9{5;uGY=fiHm9e#&ZA+FHN|jIgc1e(K%n7>zdjJ6B3fidmlD_UV-$gB zAVQrMnRUu#t$_6$4`78%A@yJc4y!aWTtRAZ{ArlLa5;)&D4~(!I7O-`TnW!Th-i&x zyp-KwnzJSDw1`g-f)t8|!(mxiF5~!G6xV1pC`O?-{-D)5FB}NXB}z;g8li(IF2hj2KOWZ%IwaV^ziupu4mq2G z0JVb<*T8$k`|z$zkj32H-%uPVdP9}-tavGOy@B&I_(4Fh7_^A^MaHlUMW|>c5M!1q z0Irg%J)}6OfLltCYPVNSYE%THNa!rYS89x=Qk_w+H>r#`ZY0&FQrx5?N=+nbBru&k z!LOYP8NZ>~ zfDM3W8v$eDIX^s;Vv1eByqhGwq#Kt@y#%I~0+Iw$w_N3sdgVawR^xISBh|e{Y6Fp6x*c;%(BJbeF_yg#!~DV;;IoPy}p z5!>PQRhMs$6yO#g3o1;*V`T3!83i>4F@#LYg@lj^vg-$H>q1s4k z-*4(0t=sk&obCPHz9?Kh42|v0|3Q+z)?n?`_I=xxRtetRR@Roe$MRI?T4$;&y@rF9 zM4?+_gmt6!y#j$U4CL>ocS(NH4L7 z9qr$H(6$`9cdO&=)YH97H!KB*V*I{OQ)+VWX2q_@?%d2gxA=pes^V|1x7hA97T&(w zu3ZuP@W`dA=!Ib>Hd!k_KYY2Tqubn>^!4i-eLi)+Iz^fNAolR?pGyY6-`6B*ufF!^ z?Yxqfv}2ohxh8eTKi^6G4ZXkhxoS^G%T-75$=Hv7`IebS?46%2+S!Usyn1S?v$yb% e$rmREAqn(T?2F27$21xLJz9)5!$+kxt^WWypa2vA literal 1545 zcmV+k2KM=hP)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0004?Nkl}ITNxVWrYiZXTdpz%ZzOzp0-2P()?ovAN>Dk-V6SO7<@IyML zeKrkmDL>3487e^Vj|{u9z9nLqfC$%yTOuwLxTp8O;=(2Y5l-?amt10W4w!$p z`A_TPYx!F%qB>fH$CB4l%)yCWB_P5*%zN#}m*B*8Tj1e()jY_1t@#$bTY!hNNHBRV zA@ZF09ysfo7DPCUqVKW%z3`@h2#=sBgoJD0ivl8?;8t4;Ctvjtdbsyl9!rRy+X5%g zq-5$nTw|?%E1bMV1zK?JSg#og_P|+RQ~&|jHh62pI&igv#zNX&I5{r)Qp^9-c5ica zAGO8HMX@8`c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlv40bFpxS>GjMjE=kNwPKDW>3A7uk*BGx}E9aur#FG4?ko^1{SSkp} z$S=t+&d4uNaCTPE2+zz*$uBR~1jP`<(}qXJBBQ=jq}YQgQ1@u&w{001?~29V-=7u3k8lVYMOS(4&M$ z2l5VZC?C7oGV`d*<0fJI#+kBrO?rL^|6pZf@<>>~7?n}`T}@ZDk7wSKuiy6mepjjf z{I2@Xef_lx$^I+8MCwf!Q8E0(u~Gb{_*uuxTVk8iHoshcIkRFOyXT|@tF*#ai(Y$e zniAQzNTVQj`sWyxPnTbcT+IqiV!CV+s3Ef9X3mZV4-Fxv{tVqI%Ku(}{T0^u*uv(8 zh!>lB(8nCJ=5?>vs0B>$P^pj;(h=iUt5_LQP+Z;d-JHF3QP-KP+Pm)RX?HJ*(L22D ztuCW)$Af>G{qOZz%liccEyV01rXA&4wBYjd&p+2OMfJRPOiCaW;hXVK-C3#R>l(sb)7`|;=PW@|E(zy7W@k>cG~ zt<-%qDd$a!(Zj8ugC*6I;@`dD5RXup&b-Od|IhE_TeBa8H!w07>YsZ)DJFM4s4(<& L^>bP0l+XkK+WhrZ literal 1487 zcmV;=1u*)FP)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0004INklk4BR_ikq4y82WWT&Uxnso@y?Q3`7zdP{84M>vY zi{~M6*L5K<57RUa@lpWfS(bS~D{0%-f~e1{s&XjeT}1>G*OJTDAF=>>Q50I4YI&Z! zvMecI62Mu$Q~>}uR(Fo0_%l6Ge7NWs0*K&o{XUD2W(9B}1j}7(C^0f0$I%VLK;>Bh zmIKmC>i8l6a=B&&SPrb6fiz7$4YL9)2cXOSeDRuD$?0~TKqdn4=VdtnowSA%2BY8! zK=P3LwJ_R!Yg$Oa(pT!HGf>wxiH+mfK@K}C9&a)O$Ses_6xIRv<1--1AxA>o5hG_H z^v>}-?lc2f2;DcG0T3ZA=XZ}HH=6-Y#)a@0MEvRu03n|P`AUW7YZiSG!Qm*1f1o%Pg9}amdtZd%f$&wMT0$Js4dqB}i=NOyoY^LI>@Y>tS1v zZ)HO>MwZ1GC8C?l41XA>{$b__BEzp`#$?kO7l+Qd$r1w_gR$x8-U4O&gZRfTx%cz= zJs-d4dESna;@4D5S1v^mMCB@CO5waL`KK%3m^GeY;glg4_~b33Uyia8KpcX|0n`;_ zD?lk=g?P;sU`3F$nn0OP_PICHycpE7Nf~V{7=~yBvD#x{mahUb%7KbN$cBxc>&MW5 zV8gsdx6U1Qg33TqodmYj6_@dKRlG&O>>E*QjD`w=KxWZcusRf>V>WC?FAdkpV;n zmIGo4O=@I0u~xQW(9_uvf?>CNUU4WgM--$CkFjB#(CYADFd5g3bVM!%|GKfDbfhdE z26!omh_weQ*f4mb6#@cHQmhHUm^DT~ zP#QCDfCB|M4QViQezUpW@f=p0;UeK9XP7pW>o5KtLmpU9e zg(vIeKXsEjg2k9z&UXRa%=Zxp!RC=*muL)WpCZUJH(ZRPEOwiFl1SLoa+^E0zdLaB zX!)Txif;I}ZJkU^9HNxN{SEx?RVV8v-a6ZQ{d!6F!TZaXPk-loQ*Vt;b=@27Z#ovw zM%O;tn(W5*k=oqEpAT-RFO;6n_zB;(o72-sy@M(Hz>%fiw7z0L zdHK}q)9-m-1m%C|d7rs~bVj`R{T_Rh+UN6y*R0O+c-lX_kguq54=290C)isxkJq(* z^U>c*&*&ZDY<&FX!O`LVUq4|?CR6*~t5*}9ot?_wi(8dm^`eaT_xEw>#n=41#wS%y zY1_)iwBjDy{{V&u5!L_z literal 1428 zcmV;F1#9|=P)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0003iNkladuaI=<3-(z*S&s i9PMvN4f4yn*#%y-{tD~1%ln}K0000$AGzUz23Fu=!IHJTcm0MJ7O!-jQe;C=V-57k5Smh zM_pLZY%XRR1IC49Cc44I%|s$WvJrHPN?06;aZ9#2XSO91lWlw?*!mVI`Ulw`UUKi( zJ-^@Yd7k%quD7P@#q^C?8xaIacU3w(aDF23rm5hVb2rYyNvk-0%67@Gw6ZclY=XoA z)D>VGfCsQbTl0BPiXf@YVy#c{xnE&;DWGE$Ho8b41kngmYK??geiu+s4m5~C3pP7C zj-jGp!MrB7-W{@oMzOM82HV@KYWenEyjj4kFQBCn1`-5-!lIEtQ!va#EZ8zH1J{XT z0z;QglwB5V#VMb=2DM8vKutOm&g&@>rOi6hWHggx5lZPv13~Hu%8ZjFW270f7+rlZ zs3r@3#^b11)q*<<)~F~Uh9Fv7TXn4log_C9q}gmH^b|o+IJCgSZ9#>N;K6WSlEDGO zyex(kQ3|37MwXLW6blADT?ru&a=X`vgW=Ug!ITjZHbjs*JrM{b;##&2D<1H#8|zw! zYuiGA@PM$?BJ=P*{CP<*%-w^95{A$lrdk%^rLav7iEjyjpyF~^F!)6$hyp{=Y%zc_ z<0e4TcnNQW0}VKwGL~@u5~G=>1XGe{J-o@})Z5II(_UdSk)+dDZqpm>dfGubi_0tY z#U)9sD;QSTAP@r{#Nv@Toreqb=G)jsTZj?f(-HvYYia|kY4L_f_ zp_PCgKo)lcp+c4d=yHk~aUFSImo*k*JgZ)J^gT7Gq+$)&+30)<+-+n@5ISa&hF!5`v`s=yKR@whcLzpM9+ zgJ%W?>ib`>oblDYHW$C&Pphwt@8kDx8g9S;)<|@Ey5{4)>lqobOTHb3(#XQ$YqR5> z$J%nyEjPzMIjNiIwja=_)76^J*wXp3uQH3?&Wj&4^n$D33?Dj^_L+9G>e0PXRoV^j zQvCKuQ&-#eY@0YW`L34zEq`+Im$AR@|B%_!P@Qck-FNSB?$+Wt>uB|c)bBsNqux}o z+rXXfdh++DrJXxf!R+iF)M`~V=XUhmYRQi;-k8yx^__}|!@rgs1 zsi=5P5s$e`@}m!Z;H;bV<_x zEr;c4v-|@vhHb_Pq2C zJMrB?bxJIzjz**PPN_@G5s-6bgBL0vLDKXH{mj7NV;8(_iC?G7S>-rcULXAj%b^3A literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/items/CopperClump.png b/src/main/resources/assets/mekanism/textures/items/CopperClump.png index 91b62056a823fcfee1ef66e3b7aea4b64836b3cf..c8fad5ce908fe1d60527276391917cf7626b2895 100644 GIT binary patch literal 1400 zcmbVMeM}o=9ImhtQpch)b)!aahuILkUhmfSdM6dTwu~wV*foKPupPa(^a9r_cLyzG zVY-0hNbrz_bC7&ANWT3I}QVBp@ zB3BCBfa9wxdO^BI6I&s83e*BNoAFAbo{M1gVKE5V8cljeILLX+fQpoWQXybPZ=61Z zA_8wk^G&RQ4cdWU$f}XS=9(Ojx2DWX^JvDiNP3uo0wPd3BrKK(6ees%=X4pkjvV7C zG6zx1tmwQ`1#BK-mt=sL^d`(}APIz`^@Pbt6U5U9X&^S>gaIdMj35{z#Sms>;X$D_ znfEbnN9KYpxU-^uRShyY9twr@p$&RTF2xC&rf~y_lOzTam{J{3xiA(`lA{U^pm=2= zs0va5i70Xj0iGnG^!(0$2^aflMBXP~471a&?bz@1i;;9Y- z+zk||Quf08@FhpdFn9Mh6ahkSm|R(am%^1hByXh%0;^p`>$T> zc4Qy#LQ>Hzs%2I4Sf+o+&Y__W{cQd0p;qmvdbzJ5*`OWcHX&oJ7d?j=fXKD{WCvQXdgZw`}?iFy6W5ee=ZuWT=v(^Np16MufKt8H5&eS z#Qv$Wy=MB@>A1nXw+3IejPGJUDb$@4-DQ^TMMdNOJMV_RKG8Uvq;?F9$I-(BTb}70 zJ3m$!(|Y#$4eQEWyeG3c_q)H>cyyRP&3q|zVarQlc3q=AA+6v_0zQ-6bO6&%Wz4R4 zEPvuMGLT)hntl6QEmOFj@r`~|O#J%hIlp!9^_%e z_I)N4&&2X_VsVpu`N3*iZ%W(o#wQaWe12_1+Sxx3-imqoD*naEt-E`&_D&5ybgFBa zuBPG0Z?1J6v)ygqpP5WNyywT_b~U}fYOr=_s;hsXvth^b)tbPy17S9Ke{SSo=yK*b JS~qUn`46b!{nr2h literal 354 zcmV-o0iFJdP)@56|U5vLlzWUPMHgE0q@)fHiVfY2g?|ZgPskromWLgl_ZsQ&>m0%MHNP zR@kshxuOjaX8VMh5P#Se8dXZ{ArVio82gHFzS@3k>E9el!{6OprJV5 z1Zn{V=LL!6#yY60|tULIH7L@Mtm~lXW)f#}?(X@SJ`oFmw@O zwD_?lqZ-0BD5q!ubvxX+K++V-_#Bkm<)f&rC{0pMf+7jphf@^mVpz(9E)NW9)5IuS z8?0E?1#f<=*)UX=AQFj$BjI!?S`$I}d_IDt37Wpi^a*#wkp7v`ItsAxAUo%!k>-Fs_AZmfG zv}pp&N3F%-R7QBjUVpW7+PqLR>`PiJV!;ULhYeL$?x zlsLK=Vpdv3J)lTF8l@Rr6ub=XW?Wv}$1pzJ14xSYP*Iw8G1xL+{J)_ipixA+PX1Fj znI~9`>ElWlz{^S>0U0)r2D_y0{KY&3S<@K`mewb)MdnO1VA=f2p#x>Z-PNauD|*-b za>?w!E!w*rH`YEO2*Suz_uiq-1FfG7vX-KaBj)Vjv|Yizz)ia$t1aoc@?Yi;Pwv*qzZl8J8;hflg z_RVL!m-FF)b*WQ1NeDBIR`qRO--jw;pnNj<2_TworCHB41CpO-n?@!$v*qu{35zDzRufNlM z)3n*-Utb(Qv3cN2wd?Cx&o*KY9V^;*{9;4j!5QP;%&gm*3IyyW7dkGhfB(7PTAsI~ z=R+pXc_ItlVd-3$pG@AqJ8e$nblGRFUbQC|7QmJHAKjKs>o(qc*9@L*Jbvy4%jEpA z!_}7qb5o}Z#y?(|U1u#Uw0`b?85`a5EMKIP*YC`KU~W=M!053X_N-#&p|v)o@|&Y= UWwTrR(?7dVc~$VEvc~Rz0Fh$wi~s-t literal 1649 zcmV-%29EiOP)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0006ANklx?F~lQy3=iN1yo0tDlEOkXMT`;>ErggCdExE++07;PnQ}btno`fw%3IHI`^Z5~NSu>N<`SI;N z`^d1TbOe_-4~!MexeW=%n!V3pZ%PRmNIAlW>U6OB(}QhY9^RhZ#vKa)O~|pix=b;c zW2^;E5yb_d73DOc7u&Ms`C!cj@RN#|D8?4;oC5&(+MQiDXe&Kv1mDf)Q*LYvM} z02*`}YLO)8DwY6vH$kb@%J^h!MUV+N=PH%}*kD#?aJvqj*H!_0e!4amfb9hv+}bsG zj$C>T?I!I7YlEJ$>kA5B@3$_>K&mqKfqpfSzz!T2ePgd<2>_p1t&C^O1YRF_fO%X1 zK_H0FIG6(fFdlBzimSU<^(n~=tOfy(uZ1u^>7<{|)iqt*QgmK!hK!t-tSLcd_s vK)G*qgI*W`fFnWJO|#U!Mx15*zZdHZ=~S`~Vloi)00000NkvXXu0mjfl@$+D diff --git a/src/main/resources/assets/mekanism/textures/items/CopperDust.png b/src/main/resources/assets/mekanism/textures/items/CopperDust.png index 45c19c1ee003187e9522f7fb5650961c37ff0ec0..c5ccdb1d8e499f71f9b1de285e1fc9e8d74b37c7 100644 GIT binary patch literal 1511 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+mc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvGjMjE=kNwPKDW>3A7uk*ATB>E9aur#FG4?ko^1{SSkp} z$S=t+&d4uNaCTPE2+zz*$uBR~1jP`*e_KQ;xk!1`QJ>%2PydiH)9%^%P(Gj zd-T+uIkWqglr>!~eR4{a#rn3QyvkK4hTCoL|0rxJ5>%4#dTIY4XyLaX8_n$bdvCq? zrs1(hEO7a;K;hI#H=Rqz+xBQpF=Jh%krchUx#;j&sn+K$O=c4x)M~Zs@4x2xSk{D7 zrs3@J9pw*sf`1(K-W$82^7J+z5!0@eI&QV~(hrvXZ0D3o{pMJ!{UqH-;m=XSdDb5^ p=c@Y!otvg|()3G3%`#g?HU`ZVKO^))U+e%Cy`HXqF6*2UngFNeFZuug literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJZJsWUAr-fhfBgS%f7l_ZEs(v( zD&d5cgR|QYdm}kZzJ^E(-IIK*lV49*_?Te^>+aQm4@jhaTpih&FehO>=dmSLDIcsE z!Y3?Fp26%N+d)GX^KV mMO!k>zQ`Ed(w8XXV_;~kO^MF%jT8s^fWgz%&t;ucLK6VxW>+Qv diff --git a/src/main/resources/assets/mekanism/textures/items/CopperIngot.png b/src/main/resources/assets/mekanism/textures/items/CopperIngot.png index a482c4d99dcafb8f7bb37f117a352b9b445cb90b..da7e582b6572d87bf1cbd59065173b8cfbbcbe0c 100644 GIT binary patch literal 1486 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+mc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvu~?sKXpoqeW@N6L zl5AnFYie#{p=)VwZmDaQYG7z&W|(GVWMZxa)t^Fc(CGsmr4LFcNa+S91Wb$|COj7a zIq-axng`50MZjFLvp@PE0|Vn{PZ!6Kid#p5_vc@Bkf<#$6T0miY}&i|0;A*QRjpjE z3Zjg{&g?272jdSMV3HP2N=|j~(COIN^q*nbs^Cyg!zrqgtAaY^r*g5jT5Uc5{6@Nb z`LfOs)~O4b)8{|^{bld>y}RGbP7Hda()_69@SfVQcLFB7XlG!~ebqioC4QNb^4|gh z)#KU*K3ZRwuuUx2_j~;D(pQ^re_ncfpPh5!kF9b=Q;I9=6NO6Ms;e zEq!-^yAN;PuE#qnGsW)x)3*o{oEFO%?67Q7?DoEf)&*0ND%Z9?*^phjn`fQaPq93c zGl>z#YdhTI*GA~X#S@J3JcxKSp!Ccx?S z>vIe;-;$QHvbvY-;y)78&qol`;+0A_|Ao&W#< literal 1584 zcmV-02G9A4P)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0005UNklL2RrudXQA{i+jv-0!07xfx057Y(t*dJN-(zv?QM3iFy&0N5U6_tDh*!;5H)3y7p zmCPO{aMq?9&Be_6I1tEy3F_$_6lMlcg~_k)2igU@{HExf%62E-o;(x12~)^aGr`Hr z4BT{H(=4UQ&0$+f0S16OJ$)f^B@e)!iWC6)+VKGWq4kl9nvHp1treGm*mN|ueh;`t z-GusIga_bApdx_-%cD9bQH6R`e7z(ivatld?YeJ1qrYsS?ZOO5KxelSP98u_x|G!G z*8xnRXVEi7eo;B~dq586`YYBx^_BdT$z=P^)K!z`n>hnC9Bu4kB5&|YW4{g@$AT*i iveK>53}CRQF24a0c$ECpBkS7$0000b6D0_O>Qgj;I&Dr|AZZF^SR3VZuoP8^(j;XkD3YLAoT4}f!%;4DYhX~DCdRn1 zzivwxym_#8!%#VbNTpJ?l-;Iiae`u5mLO?@rg4bC^={eV)3~gc7bN(BE@+Z!NQ#W+ zCGt_F)9_%>(oGkVYB0DhSk|`!1w%%pd6l4SB#}(!{n|k5Mi~5S#*S#cxmyK980bo; zCcu2e$_r!|yN4^v1EDqCF-?L=;XC|_(3u3X5%7C3_{AnlB1bd43qYT7C!iSIEjZx9 zfGAEo+|iiZ!7{YyEXdi3?{at@jF)D8bu`RDt;1X6BE7C!nr8h}t-X#ca09Y#@Uj33 zx+SQ4i|c+Um-A_WHx#W|Q924$(AcgRir%iMsLzK!+ak%LlG2~cXK2%5KhUHuAl7M0 z65R+fC+(mfP$VCV(F`sMZU%QU4mZv+42!z}NzpDUM$--k+v1D=H*^FvipbZ=f9j_2 z1dB0$-0lK++3q7C!{*Uomt0(Jt3Z%lFmT@H^zCTQG^>j$`bS=?Is9@_!yUsMt?#P1 z*?+6_FZ0MJAz>oBIAbP;p83c+UO9KCFLyh$r|iPdVD0yngBhaBHT=`a>~-thl6*az zd+_*hOUql-SAFW>Rp$BAi*p~ZnE0tP^o^_w>$vhoYIHqbx$sT){&c|7>U&}M$de2m zse7Hi@#Y`vm&e9t-%-Yb^Sj^wF$5-h|D=m9pRF2f?XYB4K3_U;=v6bLuCDL51Rrb5 zSt7qC$l3Fg=e)=L@ABPUPi00E2d$Mq%vc9rdHTSGDKj@Z^yo{w%X=D*kFL&K`SxmN ze0^@&44r#plb@of0L*ok;Fmi}$op1HMj&-%;xuQSC>HwW$xFmJb!XGH@!{0S%`?A;OW{x7eEC@Szx_hlG%Ku literal 1659 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 Jcg-pO;2+!=S>FHv delta 1277 zcmV4Tx062|}Rb6NtRTMtEb7vzY&QokO zg>Hg1+lHrgWSWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@ z+di}}l?o-=)F3E6wD^Ni=!>T7nL9I?X}YoAW$t|Qo$sD|?ti&w?*-_&s#unh6af~R zt}Pcb;&X?Oh&?NigomIP2BB9`9V=a_OaeAf3wO0!-$TNCU)j~&{-3S4MjaI(aUWu{ z=BNvZj{)$fRm*k(dis$cKk8Z@_G0L_F+jvGdbr_Z*TZu@evN5nWtO z;Zej(s*;~Z{0QP}ZGE;J;MNT3ndwE3s`n-8a z_I+}nIqm6u=<|e@EeHIimz0AQ#Dj=`p+-UW=i>gc+)5Aw8EP8kNq;VqqYhgy<6Uj0 z=+8?G7dO-&OBU<;fl{FVM6-)>fUj8wt5J-NPueZH>g)MY#m*OepL~TjtAT&M4YLUa zD3~yZy?+W#SOXDcC_o0^7T9R1gAN8V6s;5)ieI5-7aQlmJn}lUna#nz!j%5V$X|o` zxX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?ZvKPDL<64`^#UNTAck#RBsB6*5DP4<%< zvJ+(Q`q)ZrMP58N*8RMUGg79TMcp~HyP#nIGk+>fTvOMqEDpAYBg-lK1zo-T#$T~q z=`1%wHmU-|3&GWIL{YNX(Qxa>rWCyRuBf>}*(bcU2l~2ICg+(V4}G z#U1l;@#I$zMt+vbndh(cT|8NDE)GVlmj(K2`BoWDjYO>UgY<{AEWIavDE-F0&3(#! z&3}E)eZgG6#@QDHLj zCkzNR&Px>zCja= zBtvA3lr~iNxL5O`B9%|&QfUxVJ5v*>v47M-4~Mg+cA#wn`}`f%scy1T>e6H0eF9n2 zI&SL?%@ub`(vxBuuQn={n(F9?s2GOGOpa(%huUpg8wKy)^pEtLGP@5GTP{bO`wYOo zKk@AQF5-@~0G1qpfyX0m7|+TF-UT@Ggxa#(!5xuEd<)>z_w4q+`Z9Qa{nY8)#D8H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%QzDYzuR9Fe^R$U5%FbvLQ*XSkM z`yZh_ihEi2>WG+!3VvzCQHBXfjQQ!;FA+lIa(4zE8UZP$MTE^QuK$Cfq;WJ=r!M?|u-P0u#fS!WZ7@vXREpPzp5b{3Qv)fsx nU*h3b%t60i%LRz*`!eta&;33FQPSRK00000NkvXXu0mjf%JqW6 diff --git a/src/main/resources/assets/mekanism/textures/items/CraftingFormulaEncoded.png b/src/main/resources/assets/mekanism/textures/items/CraftingFormulaEncoded.png index ca802ce64964566f6dc53e2ebbc5e5178488a94c..86f96ea0272a7c4fd642076956dc3295626e84e7 100644 GIT binary patch literal 1605 zcmbVMeM}Q~7(OK;pokjXgg8BpDLQHIqb=;Oh8oJj9%1l|v zvJKx;$p8?tfzHVn@(r1Ujde;b0gTk+bct*LNKW;*EVdF#0IigRX4KH{P0bKUlWHhW zVL%Kn4OK)hFXyQ2a$}CIyu^l+P-+U8>>)%2PD-$V9_M<7Cp>CsOfMns1J^JFjzNSH zHT2S{e1i$pup9*{q=^z6ilU$rm!b-l3{xb47=kKb1cy;Xf}jM75EufEKagmRBkhD) zn=x)nJgK1~L2wZ;>~_1QZkd$j959OGIE-L0hDk((gfC+Ri$}unaX}4QinnpJOQ2Z> z3~01i*^Po45>R&fri{^96Toi1k zcy=Ra6YF7*3zEg$z1dIzD0)L=akN+z%X%$q+vubiL9bOq;uk4NlLV%;BvN9`5(R}S zB`TX-6iUh}!Q?8dT_wkr7^w*Ac^yAPg~^nn&}C?G6xAv4L?xCcQz>P#bQy}vkRVsj z@PdW0Q9;|ZXnUNCzL864ILachTn@{w4|aj6h!t4Ah;@M)4Y(+eW=Ph}FAh}bWx!gB zqf03=gJYfGSc(byHRdVAZdX`UN(pAOTP0SjoRU~EF?2aj$x%{fRp7V`8t0S$H+8V+ z6ddT2|MX4pN^Hi!_SF=KhgWk%G2-xW;*`wmimn5IiN$(tT8`(|VBQtqEz>Mx=8l<- zzRT&0gwhJ&MazXJQ+3}Cv|TtgSf6!$^8G2oomNBM32t?SGp)LAlh2sfIvC-5R1lBe z>gIWdKS<39S5^J8r67gP99H|2dQSVco=a2tAA~#RISRbb8>&|vZ0)}{I<%%``w_o) z<~O{8oXV7t9T$I{*U?hiG^u;2)O*1?F2^P=adbd?@AmZ( z)5DPZ!|!eH)?6`GUM`mH+i`4NLv+@=GY54fd17_m{@qW>rr7qS4L5CPx`rY?JnP+1 z7j-DZ*y&AA(e6%!b*sJ_k-Rk+Y7W0j#6O-}GBJBg%3WXRjo;);vih!WIbdFVr!oF$ zv&1{=%%;O__1oaKzn4`$PZvyoAzi6!JC-*0IM#N^Yuk%lBb~*av*UkIeipg*Xzr4h zLgc%J`kx*@8?8Cs*nKTJ{Lsov#|P`93P)n&_GNM-o0BT;90TpTnyT8Dx#(n5Y;jz1&6M2I^OyQDH`F?O|BJAX zjQ0K>?c{{LD?UHIt0@j5{G&+&QOfzunc4{tU(|H)aPLVV1emW~*eKO~5*7Hd>vcwL JeR|=he*jLdVF&;K delta 1280 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 Td!F`sP`U2u>gTe~DWM4fXPai4 delta 1280 zcmV+b1^@cQ43i3wBYy-9X+uL$Nkc;*P;zf(X>4Tx062|}Rb6NtRTMtEb7vzY&QokO zg>Hg1+lHrgWSWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@ z+di}}l?o-=)F3E6wD^Ni=!>T7nL9I?X}YoAW$t|Qo$sD|?ti&w?*-_&s#unh6af~R zt}Pcb;&X?Oh&?NigomIP2BB9`9V=a_OaeAf3wO0!-$TNCU)j~&{-3S4MjaI(aUWu{ z=BNvZj{)$fRm*k(dis$cKk8Z@_G0L_F+jvGdbr_Z*TZu@evN5nWtO z;Zej(s*;~Z{0QP}ZGE;J;MNT3ndwE3s`n-8a z_I+}nIqm6u=<|e@EeHIimz0AQ#Dj=`p+-UW=i>gc+)5Aw8EP8kNq;VqqYhgy<6Uj0 z=+8?G7dO-&OBU<;fl{FVM6-)>fUj8wt5J-NPueZH>g)MY#m*OepL~TjtAT&M4YLUa zD3~yZy?+W#SOXDcC_o0^7T9R1gAN8V6s;5)ieI5-7aQlmJn}lUna#nz!j%5V$X|o` zxX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?ZvKPDL<64`^#UNTAck#RBsB6*5DP4<%< zvJ+(Q`q)ZrMP58N*8RMUGg79TMcp~HyP#nIGk+>fTvOMqEDpAYBg-lK1zo-T#$T~q z=`1%wHmU-|3&GWIL{YNX(Qxa>rWCyRuBf>}*(bcU2l~2ICg+(V4}G z#U1l;@#I$zMt+vbndh(cT|8NDE)GVlmj(K2`BoWDjYO>UgY<{AEWIavDE-F0&3(#! z&3}E)eZgG6#@QDHLj zCkzNR&Px>zCja= zBtvA3lr~iNxL5O`B9%|&QfUxVJ5v*>v47M-4~Mg+cA#wn`}`f%scy1T>e6H0eF9n2 zI&SL?%@ub`(vxBuuQn={n(F9?s2GOGOpa(%huUpg8wKy)^pEtLGP@5GTP{bO`wYOo zKk@AQF5-@~0G1qpfyX0m7|+TF-UT@Ggxa#(!5xuEd<)>z_w4q+`Z9Qa{nY8)#D8H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q!AV3xR9FdPU>F4>Jp>pD1%R=U z@qa>U@X4P&cNVW5cqKuWzkB}lvkdwLF13U#JI0J2_VQ=?6*ulF!b{Fr! zK^?M)q6Q1fiE_ZEXu_a`zD5)=m0?O?)YK6PQKM-l#_F;uMx*zDqyBLGqn+9JeV=!K zzvuhe`ux1?=q0O`AP5p|-(o9(dra_M90}L>zzhesm1<_OS}3_xA14FEB1lev+TC0! zC;*&LRWS(C5hS8QbQG(_xj80Ya%;FCM&oyTAsa!`GyGnTF9#~>1f`gWUiM5W#X1<85CCMIr!>w-Y8%ho6&T?2`X>{l|%jR-5$l{H)FGUP4FDNCNOjs zqL!PnIj4$q^HElk0jksJaGsty*sVGfST7n`8+K5w>iP4*=G<5#Kpfy== znF?%K^R}R5#>!OHYa$4r&!_QeHIiIPP)4JXAZdc8afrZ`Dv!$fagUN1(qID$FN`~?u1ye@&IWIwJNW$$7#x;vp)B^CY8xKV*jw&x8 z3V%xD=|cdxqGysAP{x)E>Ao-LH!3xa$7fl*)z%T%JYV|zs(gLm1KxsLWF<|q2;s2(NfKCy? zKKW1IgsxyS29FC<0ELA)0vu28>-WF$BHqh6d@!Q^~ z9pM}7{m;JKRY=oDIC6*GRl_3UKw znZxnlcCVv0sj4Xyhi{G~~yCm<}z z+0k#z&N-M+A3NHA;OI^9KGkz|a{;k<Cx01)hqY> zVJ`oyH@S7)cwlGkcgUAN?`ZogW#I39{XS%7O8X$T1gW;KTGhH58wmb6?U{MDPHRc+ EKjDiK9smFU literal 238 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 literal 1546 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 literal 234 zcmVtw)!28C*gkY8u!r=NJmmGfGa3nLX4tb03M{RmI9(jkPW~=Cc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvGjMjE=kNwPKDW>3A7uk*A=f`E9aur#FG4?ko^1{SSkp} z$S=t+&d4uNaCTPE2+zz*$uBR~1jP`&WEYs}4B` zwEgeBxZsG|1oMCmfgvtiE~#-W+qm(>?x&7AYjf5nD=KxcgzSl5TzpRF#mBHb*<*|t-7k!byUf=sES=^YSsyJHLYdhjz|_fQc!Qq1$v%&tH5&%RE3hX3DY c*s(}3WX?ET@M-hQy`X~4)78&qol`;+07H4-b^rhX literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJm7Xq+Ar-gYUO&irK!JxfV7uU) z1B^C1JAd;hD1KPT%aSa*Xl;AF#+D}&TdwVjTD`f)x`FwI*n_?6zyD!xXj(eO{hre| z#sv;uolS=f-Mr4tyu=+TudsCvdqdobT@1O2d>o1a2CKwUY#X-Z)VwU{{r!Vui*ls6 zg6I`JMYoOm4E&$MvKbF68!&qa@Hthio|yTb(YT@H!-Z{CzqTLXxxmybclI0eoc~Sd a8TB%fqWc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvcC~aeGz2n@ zP0XBK3=EwN44f_8OkH7mJ@bl767!N%VRmN%?S|+zal@`gK`{jJuuE!DW?5>ATTy%Ho{v)VfSIQVm`i3%nykjaz}V#J;uunK>&WEO-b{fK zN6*idyuy(cs5wJ$kN%O#NszSlI@iU`JV9aQf3ddmIn zIY;XqIobJh4hiSnnd04{Dm1}Z%eUByF<`Uhq|dB(%-8fYjbeD|PgbIq$xDFVdQ&MBb@0M*Ck AMgRZ+ literal 1433 zcmV;K1!nq*P)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0003nNkl$hIFP1|wJxbx2XEgqjXAeBX`@kpY6t$^f#$ac`2PH< z-W!JNujXp0li0X!m;F=7N8^Qlt2k2DiQjPm@*r3W`TY@z-mV8x*PG%gckQx+oLY9Wd^KPsvl*NfF0KX_1wrc$*394rDR_IRvB~Qc~aRPo&lD zxT5FFmLa)n%7k?Xj2VDjCx#qM#!;hW!EuJPa<#e+u&*KJS(}J;ydrYOSI+_Ee!mh`=9QW+>keej0ak``E>J6PJz6Pcztc34^LzCjV5O+; n2z|7Om~p6e2Utk0|LedDok3(T|GFSf00000NkvXXu0mjf??bjw 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 0000000000000000000000000000000000000000..79018e1a9f8d8625052defed311a3ae8b9b01d61 GIT binary patch literal 1367 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+mc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvGjMjE=kNwPKDW>3A7uk*ATB>E9aur#FG4?ko^1{SSkp} z$S=t+&d4uNaCTPE2+zz*$uBR~1jP`&WES-iHz- zj-KD$?aj4v3-?{K)4ZvUwJYlv{=dIqwo{}_)Xb30miJFz-tDyV3df%d#%#%t=Y0Ni z&dkkaMjDTgWw5k@>x`C%c|W#1Zv8U*+^m#0dA~w5-#HhsE)|K5o4?6kIj36Gil=YF z7oj_M<|n7GWh!6o^4Ki3d3H}NTg5v6h1Cn>BQnaP4K5!xQJ8wS5Tyarc|7B-S-law**2@hlM6W@8qM(kPm*HRu$R-MxaK4*kwHxwjvC^E4T~bkGfnh|*e6`kf)& z?X&i`#3^5@clq?WJ?`q&HJrO>yYIAIMbo4+SDb=3AGf-D@ub+Q<5y4SKYU#gH<9P; uI}1LG=PRyfzj;3W$Jqz>>z0)>vN6mKK7GMmWx^3qQRnIE=d#Wzp$PyzbLeXT literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/items/DirtyOsmiumDust.png b/src/main/resources/assets/mekanism/textures/items/DirtyOsmiumDust.png index e44fb488f74abbbf55002c6e6a661eb512e93405..8e7885fd7b7ff5e27f855617484f1449e5d897cb 100644 GIT binary patch literal 1405 zcmbVMeM}o=94;`G%`lmO0i5nq3<=%w_v@bL z`F*^<-_;d5a^u#eu2ZR0ake~bkut}J-`IzhansBKqf99>?UIWHuN-7VpvqCCA;kTMvvgrFky@)PgS{xV%6KSAXCVw2>5`^Kp|fRFBwB-^`fp(S%;4i zHM9tk%gyQ~r(E_z$RdaU(rI+C2gNanq%@e0pfGGJgrk@i!B7OJU<@-7q!H6Y%a2;I zCbC{*k#+mBEoEm`m&vlvq z&M$KU4}}#Ow-AucYQ@u~5PW{SeMOj;mJ_9<3<)uQ1k<31&liqs5iQ9@;9oaZMN7^~ zKR}9rBm_i{av$Eb2wBP9gAIj&iZ{jrky9>(sjv#3fDiDp&1zOFUoxBl9h%neN9kI6gJVt%F#8AB5T9TT4i3f8})eJpycOEY|?cgqit z=FW9J*J9dTys&X{$07RZiJGHh>nrcve`sdxS*NDtG~@U)szVC&9FkJVd(p4F=9!Bg zMqMwvei~@4q!J4|M%e&YH*m$YGg%yLhJHDCwL)KazkaG2*G_lfiG^JyO`@;qyPI3) z$y05o_CDSnGd!X@{Ojxd<{^npA?@BBpT=C?SI4C`oKMKA9*1I0=^vT(sV#HyXB%wC zp1f5*xS{F#$9>mt1>cSDetXZx3r}@S-xyrGra!kWVe(#9|F;95Jp}ookuR z_!=dkwmsiptZuzqOC)|X);`tv$Np|#`6DT}ul2oHvv+FKs|$CUt7B2s$+$1&^qchg P@DI^OJFHzf`wssD{$u`n literal 236 zcmVkkd7o?09R1F3HMQ?3&29!YAN9H2!a7P2n8L75NS2?+IJurfV+4|TmAZ3 m5Dee~J-wQx2gv^gp95^=eQNi>?4(Zs0000c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvGjMjE=kNwPKDW>3A7uk*AlN@E9aur#FG4?ko^1{SSkp} z$S=t+&d4uNaCTPE2+zz*$uBR~1jP`$T*xk0B7bd)|Qogk$fm=G{Af|&4J z0OY{)QEDDA^ArJd$*+e$CowQEPW5zg45_$vWb$cmCr6QE`?KTZUmnX%+@h;|N$0fB z*)EP%zO14mxrcgxFFNq*JlFS|VLY8(3)t;;MRnb)iM2gz`sOL~Ay;`BiDzg2{MdJx z$KBzr|9tV_OU|vkuU|TN?3~%z-RTczmL>kb;a}gi;q})^|37e8 z1|F$2;7In@54#q&a^_{W1HZ1R?UdnD3D)0q@fKs;(zfh0vF_8}SHvECt2kk3*;AbqCi&8*Vb~zU=ACSj^3Bl4Pi?{Y=37NTC>q!rapb&GMW>S2?V| zuKepuhaTIOzTR4=DPLPp@TFgp?D)wP-L0{|)8p9ViXFS1_f2ru5NT3alC@4~W5igTe~DWM4f D5oYgM literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ4W2HJAr-gYUJvAQa1da7u$Rw# zf_ou@rg*?74a@(l*6yD%>rB*E>oy_Yw95<+xIM)cbbS~@V|ONmlu!7=aA(uSrH4)5 zEmoe;rxME$9u~$VJ=|j&s-h%~22WQ%mvv4FO#o+rSf~I1 diff --git a/src/main/resources/assets/mekanism/textures/items/DirtyTinDust.png b/src/main/resources/assets/mekanism/textures/items/DirtyTinDust.png index 85ee2f06e254e692f0b15e1881db1c5e1fa26010..f01fbee4d10bc845192285f7799fcd72182e7a80 100644 GIT binary patch literal 1338 zcmbVMe{9rb815v(GJ+0V$UxNEX@E(u_w{c<8l^I=>nxTcqV3VSHh+F+% z6SyLKh>*~IiUw*d2od&qeZ39lm4ZsGRwgU$R>=f-L0pJ-I4_JKeA&@mg zj`Lx`KW7W=JVe5>be^Kp>9j5FuxUmU1>9~oWv3~cCJ}-(+f+-;kg8ddQxKpj8H#Qx znu=!?#hBJ&c?jg`YzQem7@QYY&ACLOlu;Q`r-02)rBd0rX3(Y;hX1;;Ali(y>5vLT zQ)@9KbRY4O92w>A{)VzZ3w@cTiP&*$~I1ps_Zwa@4B3IcFDIoj)U&T|8*X^E-? zbG8*^dyXsIm&~pTH0Kny`kBF1!yR(Q1%;I z3ZF?auPk7mjxn4IK#_E?AVxYwh9ljwlOb6Sh;h3EI7Ai@bA0*#rj9~RQQ12APu=8> zP%&ng^Id>8^L+$W)I0|2lJ9?(w_;e{%K@P(k{KC1RCe;>#=hgUp%UIE#8&)+U@h>M}HWr{W7{+>HhWZy+1z9|0-4Y`A?T7GJ^@Gn(y(S{P9?Q zPetCyID2!ljoZKLw>t%w?0UtK=hhWnO|oMpM;m&>XB*#pp$BV8o55+TKrH)>=kD9)s`1+$%-RO&qPW+czf-Kp|#-ljqdM;Z-#3c z`%gV%?myGe`%&4Ab9=veU`SqZr~R?+PsIMwEk&%#K6*U7zH{)Mjir4roG98bd@R9~ zl9QLahJ6<%GHV8IN#|esMd!BhJv;s!SQLG~<}GgR0fCsvFy~(HAGJSz;Q246Rut~3 tT2r!e@6gzxA>pqbot4=1lweK@{0G%Y)>Hrh literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ&7LlfAr-gYUN_`wFyLXmFwgm5 zFvl(n4n04m9lJT=4*U++sJZBnvC1j>?FV+plggY?Q?Et+?D1+~=@1LJw%6{tJ%dQh zwYQUYPpDwfF!0-aGH^$h&#gRz!qyi42T^{^4caO(4OS${RX40TAB1JwFV2I^BFu{{an^LB{Ts5^$1p6 diff --git a/src/main/resources/assets/mekanism/textures/items/ElectricBow.png b/src/main/resources/assets/mekanism/textures/items/ElectricBow.png index 65b364811bd6f2f2b470ad7293f7f40851950d61..7374cd1481e64ade77a0792d01fbc5e19ff179af 100644 GIT binary patch literal 1328 zcmbVMZEO=|96uZ(I1BP&F&j~KxvC&~z1~ZA?PaBOy$(v~7^8+M#Ck8!wddNqa(A=c zOc;2OEd;eHvBSiXvT{~P^QtybOb>bbR@>OxdoWcolm!R`eEUNm)!Gq zzu)iw^8EjIsIg(os`9nv2!gDNY~`Eayr%H3Tmi@GDO-S3l@)HbcIk?h6%2p`WnBbl zBrPOB6AMX_rvIxN_+XWFtszAeRxO7GR+wNT`}0`~B1q zhN`k3+wFW!6 z(0Pc};>Q-8YK}IdA>9C|$K}B#H$|eX&qaC|A4xuiQf`taNH;;)6kJ zhOBT+e0|Xt-1)JjWo0;m$Y!&yEbY>b1VQ?IKEh2A6oo?sZnkNbki#|8SyJGEDH&?U zQgsb2C<>z9YWXqf=|TwUOfAw!TZH<3;k;+jXBRulNwjU~}$tStkG zCSdBVh6L|JahAw1clS0_077rL9fk@oMM&|w)S3pG72*9D{Nj>TnWI>t2Edqc4*_wjF%15VJhgYtD!?dFHM!W5zVv& zO#&s`DzshX*4&fJg$y8Ax)Ia$RH+IYle(pwNj-yxLgf}Fl zQ#yjhSXeH00o*M15zt`s7_dvSpEzL4E_*t{2V=P_;;d~4${ss#sI%^LT^@_a<0t5F zI9&DI(Ej0`pz9 zuYLIyc)fe%(&>qb$IsbxqEax}zP*2TBuDN)cs}LGZ$HUQO-<3vNR0gM*fU>G1lB*? zH}lKoC++^LC(pY*(KXnLKklRU-=3JW`>U`09e8Q%2YYaE(7s^w$7}!Un7*~Mf~*)G zyJOpTCMVClKlAzc5&OYMxasO2>na*VajfHDbo|5Q+_XJ$<6PyNI~~aA)zQ(J?p}4{ zD`(lwiE5v*`~$^NmOp%$oXro9UZ`C6Ko8&Lxb|uLq8p_OBnMq?M~zE03;csjhEtKim0U f{+*lk2aqzP>-v@*+Xi2C7XD$8a0B00_k7ns8dKvA literal 329 zcmV-P0k-~$P)|KRm1;9=@|NkTd|${4<(U zphObyJ!s;vK%B7e`z5-rTd${S`nuP)?M!>k@c`!>>=KB9F$@z+LfruZBZw-Zl}jAQ zIF2w31E^;J!Pq{Guxbf32hR!+{Pw&oD|SEw&cQbY2!4NG*XlK330x##31mgdNzX52YfPQBZzH9KxVmWprIa6DTsFL;^96F6?i*V zYH}G|vJ+GZc|ipf1q+I~U^Pea*ox(-EkHvBKA^E^z*i%xbij^H>ZRd6a*bo?Bt)yW zV|Se@bGcEcqyW^UH|aP7NuU-=Pne7pL8PIifk?**15Q#pf}o8SnlPhN4+gC%yq7Ly za;9v-lO3zlG?~V6zu&L-r|Tu95+^8%!VM%&k~)acsr91926UpjB&vY{DyImtCP*S0 z(a3tFI?awjPw$4{lU=TRibZuQQ7~nAfR%AVZ@_)NNL-U>RVxJlx^Z8$T3jy!yb!2T zox;I-c$Y-UFn13&6ahkS=+%kr8;K=&YO( z3JdV)NTb!`wHhf4$(y2j?#ItEQe>8iAe}i5h9I(yR+4czh-`w%Fn>G6u`s1IRYXa9tBRxX=`F5g2aUL8Aoy8%$_1w_53v{_SH`2jF7Hk)FNY9DtF=dtu0L?*Q1}vVT`*(&kk{E4&Na+?`;~yLV341^;qbzS z%*?LgmgKmJf>3PR@T(Kbw1YoQ-*Ig7%JxQ2M|VYROz>spp=)DE1&&`H|7*df0pxf^ zZ~w{GS*78PW5+_rPsNu%?^u(vbo;dOP{{q~$he$&q4%qe4=<{)4~*visEgk+G$(oI z->n}v+^nZR$U0S*5ZblSzRlj;F{*F2Ub=8|-tDbP%{fctjLX}?FI_x1-_^noxY_Nb*Qc$=S90N`RV{+BPnCKQZ=h z66v+=eMFq7kXzlEpBBHhR(Sv0>oaCjb30s*&%ToJ&dR}qgZz1pBX5rA@A1rSeI2`Iy_9-zrD5ND z&Xr6KA1(S6y);*`NwhsIXGrELR8ff2=6i7PvWf1*hKjes9zmA;W#>R_-L@3Q9X4|F zm^u`rJ03HoSawa&ZMf4e8I^sCDdB<5dBtnDwll=ozuzu!FI?ooUVkQ=b<^2?I5V6I zX3)^*b1<0DzRtF-=zgBVO7V+PKR+_=Y`+-x^Lk&h$nq)ge|tO{db7BarzjTaYX(nOKbLh*2~7aXDst`s diff --git a/src/main/resources/assets/mekanism/textures/items/EliteControlCircuit.png b/src/main/resources/assets/mekanism/textures/items/EliteControlCircuit.png index 720c164640a67dbfaeecc80e0d0d66dcf9bc2a1e..02943787c3ece26476c34eb5feb2bd5a763d0bba 100644 GIT binary patch literal 1693 zcmbVNc~BEq7!Qh^(nKROih#>PIn-pcxf6+y0|+V=;%-nN|{j#R76D)sg*Jyo>a7gr5+toxKQ9`M<`b`0B~v@Y`Fglf>%5UMjN0aqF{$JV+(6ne0?_1oTnnIh6P5{*0jAH- zZ3B@s+SFX5CY4N0SSHosCN}28uTPM-OQH!BSyOdI30wf06O*v+()GmX^^-3w(d5yr(IE2iW z!LOZ4O-O>2H~}C5TfowBxF{r&uu%bDf}#r{E(hfyCQ@}U^yyWmuCWIGF~NvsV{83Q7`3+Fd?8~ zW(fc)Vu^KpY7qe~i^~^l4Pw4T#MKKX^}LNQP;i8(n5$66ii9W{!N@a9M75Tf}|{*#I0Gl1yU-Z@D!t2kK3#f z&I-K_SOo~h=Cypjfv-h*ECZJ#W&u7Qu(Ujpj%DBho>q+VFb-b~ zPw@5cn>vJY3UT(y|N3U~ifTru_+|>I!<#t*W@>l{YD(g6crT;TrZmN?r9a{#6l+Z>3_f&<(WmrNy>f8+2oQDqHaEhbxZsq3+$JQgmaE@@Uo2&cm z2i&F)95*{m!+r~oc{jG)qm_}B5HGPmd6h4l{`B^pZ}eSsI)rD#Rij1aRo-Rn!fngZ zR*Ctb+X>g**H2t&{$!Lj-{r!{^Z6Su?vS24@exScySb$vs?rOvrKi$xe`NcD46pR<_2-E);nC0P??w2-y)8{4hC{LanQMnj8;c*6KTqeJIvL$Bb{*=C zLzHy?YQJ6k0doL!JEO7r4jQE&D)lo&p=6?YVxqUAH literal 1573 zcmV+=2HN?FP)4Tx062|}Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p zOWx=@fa$~6PG~B*3wx)DA3?&gnAW0JSgmE0JM%nr) zQRjf@{XsV#d}!NRF^Gf&UIN^Z0rJ%&qSmqw(YSxlDbs>TNg^v1301)%faa>93GGH8 zAywcCR)gajJ6Dsh(t}U!b7Ri@e6dHgwm-VE-AA&|N>x~Sjskg}M+x2fRR9Sd1u$$f zd?qUVS}$AyKy969+2KQeULb-?s!`^$jf+|p90h$R1K5qJ13m{mrU zcg`rG?hprDCPD~A)N8vcNEG;ZNAOwjjKD7EID`P#>I3QfRzMM`U@3#S%Vj@3a)unT z*yC#zknoWJfnHl}D}PUv^)*xp@i7|#0D#2vrGQfIGmGK%>Af Xt&E=ikBACM00000NkvXXu0mjfA*t~c diff --git a/src/main/resources/assets/mekanism/textures/items/EliteFactoryInstaller.png b/src/main/resources/assets/mekanism/textures/items/EliteFactoryInstaller.png index 0ba1b50adfa77e1d79097a410654cfbbf9f41264..ea0f39edf851c89c160a2a706a09686ee35fc41f 100644 GIT binary patch literal 1446 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+mc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlv-D$ZZaX5`>-J*TxtDvzZE6>Nepfu>x_WXP?}8fk zd9#-lDIct{Q=jW6+<#n>hpnXUz?G=|Z(h_0epap7tQ@iaxnYLN-V8Vot6=(9cKYp5)oWE$* zsyE-OHJ1jhyzu(#i?ZEQyj0aDb2d6K%s-z#+d)*crKM=6kJ;>{7c)F2IW2TpeKl$K z-A6?`b5tcBDf5YRyZ))O?{sO(FwwehG?VA_(@BRPCU`&iRJB*gUW997)Y=M>T8&!4 z>r#B}fg-K-((kPfmL*GWiO^XRc{S^+KkMlb!5OEYrj%Zk-?m+$sr6jc+GEk)zn}e( zczU9{EYcF|4Tx062|}Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p z zf*u4BLVAejURu2f;-!c;4_*}twa}9n58}zCm)ymFpfuh@+t5Q-f(O%B(yW_x--~aX z9XH8rKo+!f*qM1V^S7bl%wOZ^aR8JI*shGI}F*Zb1S3n}*Fs698uFI!L z!QU;0nYjXg-YBk+O;@p@30lG8GP=y5q z-6mB25`rHefg&Q?)3>+qY-tN;z0E|hB%?6_icZZfu#fY{>rg#~AQ&We?l6b@Z{DHR z+{4|KGx)GMP$~&fw;2;4`6==Xy_dLs=O#Lb9TZDNCUIqDmBGpR+_met@!%1#|3$}2 zoTp1dYXC^#g<=6Jr!WjI2t?xh{8gEb?Tr*$NK#% zSHOs&0#uAJTRJI3bQK{nssWUM)TCnaWWvK(0g7t&XblpbePr`kz?>)XQak}SS~ezN zTH7PfhJ$p4$k1t;Z6g(s{{Z=(r*WEQZ{`Zb{!TRJ@(-t(r=BKaWv;-~;hY})XB7Aa X^up$Q9%`M900000NkvXXu0mjfGQ>2x diff --git a/src/main/resources/assets/mekanism/textures/items/EnergyTablet.png b/src/main/resources/assets/mekanism/textures/items/EnergyTablet.png index 4f47026d7afdcb76c7d46a0a798b4b1ea13cccf5..63a934e3c0c32a4ccc34a40dd28f22d30f0addad 100644 GIT binary patch literal 1526 zcmbVMeM}Q)96m=x!hm&tZ0eSI9FnQwdcF4A-reXJv~@Jv0;M8;#%u3wxykj)-PIP% z)D1I%xi|;=FzSY)nT#lzZc2h*8*Z}c+#Ck{M2(6I%XAZs8g=X~Qnx>hf9#TbzwUXS z-^cs=U2UQ3_0;5v$q0g^I`VC9IBQ~WQX(8D4GeN{nxNWC)ndu7MmQNDxxC~Bs6*re zzzsOQvf>AjjUWjXf~Qn1bYO1fC=>FlWKdk?^7yJ2`xqX}c@@o$vQR(-Du+hJ@}R;-E!dDQ3)it@0z-!& z>S7D_(5X^qA!?OmfEu+%+^5r%sF~4{Mv5WHEL5)}4Fstp^bAgtEM;a%6FU50(3;Hq zS+{Naur0W=U}dTrVhJJ=iD)ARtt1Bsl3^G^rziA!93pU~GN^JLE9$wEjK zq#zno$c0&&XwgFjK z0{H2&B%(tpW`)O?_ZrNA27V)Mpbb3EQxpY5_W|7NqiC8pn)H;xj}7zr|C>4jIz`0l z8@P1Wu%NX`0_ zZJ9kMCT)Iebm!oj+r7>BKJ9~J^0COB-hoeVFU{F>{`#(szeuh_-Y=K6_Ei-~bL}}ZOS!SI=J2I?3AU!=`+ttqq_<3HKj*q4&B3X4iDkP_kKH=@$f?$3z|BB% zHRC6KCEvbDN$b*onpV8`;CCaAT?}0LJ2|=iR{D+{`o*-qtNz-|!;F39nua@f?V zef31Wuz!ZV+_c{G+NMHOlcXCr_c9%*ymKva)Pts!v}crMgOf8dmNu8PoW|y6J(n^) zBl5|G%z@P-iHbE9HySE;-y2iXa;R^Ixafk)I<#5a)LmOj>w6M{o^PSnJH^DhM5Q&bZstp~+I1Z}=Wg)VzUvrs_rCdTaE~d$e(_)}y7t#uM_bEh z-s?)atp0XJ#FqDJZk_X2Ox>E=*p^mw_|k#`4QLG?=nTvW7wrypb@%mL-}#2*Tv5_u zZ@y{m{$};U)|c1jZ#$p7s-u6w_L6&pI^)FD^pB4;zi0Y!*`LwuejV5~C*0UDf6Ca= irjyItFWoO#F#>tef3z!H{o#n%pV(n{*>>bDdix)9x;Mc9 literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ37#&FAr-gYPLJhkP~d4OZ|JD{ z?DOd09^d6JZBEY@+p<9D(8Vtgt7mSi{n0EeAgI!)_d%NRxy-Z$?hQg!@4Fi&NCj2p zG8J>UA2T)9k?h*8d_Yn0FH_CQl?7XM1;ih)TK;0~G2H$_c*C`%7V#!d|CnP}IldTw zDB)dg@Aio4ZK=!gBeoBt?cR4CW&L&DW91jRZsNS88?3IEYi$~dL>Z%Ua|vOQm(D|qDqB>~9B2p#}CII0l1 z0L7G*w1629G^~Wp&6o3?vv6AAv{YC|8{|X<4M8(z21SZ40y69Yg)DDX-#OT*hFQj{ zb{m~Kr$_)Fn^7)-x#iipba@eNVbn8I;Tb_(QNRJ2f`eQ!@5h5yb-!L*S%;4iHQX;E z7g^N^k4Hgug4(oMjGJ@(5y+wnfxBAdX z#a(3jpeaQa==6wQuTdm4{xV*sf*RhR5Ya#aKP|DM z%nCdl)<}7TQrW6jJRJyu6P?bdih2JaQ3_>9kP;D8t3x<099O@zUv`0i-FT+7KetQ- zhzt0IQi)db;Z2Bu74DvIC@iRWgU^;&B`H)fDbS@H;AIDCRVz1IhGlR)Mwx&Tv&INe zOk<`E%76inMsF~Cyk>(1(=*11o@e51Ix}X}kwm&J8Aa^|vne^5uwz6zYB8A&SaJmG z;Qcbi(;#A-4ci{T63@lrgajyAka7i~I8p^UK0y}zK0$;D0-ok(c}58MlfoGq2$%#C zy9hAplEA_J6yxkO%u|@b>!m47!(bL#0~mu*Jd4`v~w#^GHgUd>y*lk+M(Abr_&9DH zw{A_ZhlWDpfOYyei{KeHYGZ*UfsoqjS=3(0ge1k{f+<9=%bK z=(xb;9X+w+Y=?hnSB*R@Gv>YC-t*L7GiCs|dp7t6Nea+aiQzNyd ze*1k6TvPDF74b$KqgM^BfQH-|b}K|}Q{EHvx#hoqa5Qwk^hw`)nOi?et!VPtj1#F} zqISDi%*SIcFW(Vzd|VJq@9(<6JsLIo5|737_TKt#b;*hQQdw*|S$AemcJa^6(vRs^vuqoe+fy3935ABNYTBGyQD0wsYW(D5+{N}uEmPOL zeXQj4*Vi}a?ds_X-D)*dHJohRemA}oBiRRgYmb&y*SPPNAAac{dt^!{;%Y^ZbZ}l(Ykt^Ahh}Y~FTmnbvlA z!PE^%^pw^KFGY=A`O&$&#Ia{CuRVEvW;Hw9w*RfQ?Kk(Cd|w{_u&ukJI%#bt8`Ig8 kwrS12Zc|^;U-1i}Yk#ypd@S#24L`*Wdp7x1+QQ0z0C7%0zW@LL literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/items/EnergyUpgrade.png b/src/main/resources/assets/mekanism/textures/items/EnergyUpgrade.png index f1f8acdb5ab92908cbbb560ff3ba272d3e42cc66..52ff6e6977e6d1d8ecc1566ac22c050aae8e1c05 100644 GIT binary patch literal 1534 zcmbVMeM}Q)96m+mLosaPWNPGcpwxx-de^(QchYI;hn4|C=@3z-*WO#WL3`!ypao}! z4yF!27MU()Lt}KPVK5=Msi4d>;&7tQ8O=1Cnu%^P29Yc>+;mr@Zhsj6*d_OV-Sa%Z zkN5YxO*z?%V`FB-3ZLF z24oqTrOxu1Knb^`S^#;~*$!8Asf%Kfg>S-X0a_OD0EvMEo-(gU2MoxlE-kM^$0!1i zLZngy^317%tQ^?H3jiinq|&9vF<3{bFp{7!EEUGpm}x&+QA zal97}DKbvJLNXw-r_Vz0__DH|3wy<}M9C>b1B?&FRBF`Y3B@&v79~6Q*NqpVMMsqn zpmreg6@p8?4|h_SEa&d!hC)Eu8+xh0$(O>EnR!=*2Y4l$*?`DjR4m8RxQ@{RIc6mZ zFr8BGBIH2_oJyR~JKcJM(%~!_)_Duv<;wNx(Of2#TZ&X?*e)AypMoaZXQAIlIHQZ2O(&DlFe*%1g`CG=qsI;8-Myja`3j8 z+0c`or^x?dOHPp@#@&yUw3IHJ=r5{W9@VU7WRWw#GDt|-oseu~_->(QN)Hw**27Zk=#IQrei;EeCv$6pvyH)ij>cRcg@*G$5P zT?g#*r%Z|%K8coItvFKHQaR~hezWn|%ALVp*1r4mDR++F7?=#tZp@DCb2nTf$0=qy z+Y)~9cut+`|M)!XW_vmky4oUnV*S3=ORro>HcEA6+WL3CO4+c7FWXqQHITM-Fp#?4 z^m}5ZzrXjM6;dg%LrqQG@WYD4k%x1;jzrNt_4h5qDcyrN&#z6`RLdT4=BC73*nICi z$0DvOdQZ!&K;7cu+N&{_gJ=I}-oCM|iL*j~uUZi`@@Ml0pRTE2G!j)bn>ll$KKNtA zxuV{T%x|vO{i?rPbIYfgmHOI1S5DXFzB94kKAAc^R3m=$XyF`$NxmJ|IDbdRT`1%1 z-Ju65C-vzQ7p!T{IMt$A-nuQwM;={!zbSd|dxf*c&1Fd%=3d!+$nnNZS4aJm^Y2ecfTk^lKIyBbLVtM3X2~|UrmtTA548t08UO$Q literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJd7dtgAr-gYPT$Depdi3dFKlhT zAxZR_!nAKZ39mEq9&lyY?K`S2(J|rs#YbA7?x+SZv?`D68DT zrlC98sqY_y&~mQZoDUv_Bw91pG%tU_xkKz+V^GTeuA|KV=3h)_Dx3D_{{_~jm&rhv OGI+ZBxvX9-r#!W?yxOt zB240gsBs2~GF%)QbQ+w~;SwJRYKZYY;v5<`w>hWINdzBzXu2y>w?B-3?3etW_xXI^ z-&<8$@@`UMY9a(dNwz}9q3+`%Ga*i0-y90F>NZKqFH>fT9wop^0LtY=7l3U7TLBz^ zTwjuwJJg@hkObf)cWL%s00ScZi)9Ryy$}? z5?Pm6qgW8t(x)y6e!KmdV4pk^C^ckgkoBXOPLB#g#IIqrtT@2GW;_=yJ41eeI)E(J zNNzPBo{T72jophCMS!X`^bCntlfqUpqPs=_KE=jZ5cP|W<2f2Pu|}Z!tR(?v(wg0b zx|o1VixXy-$4pQroFk)hp2ue}1~cF!$>4cv4)O_e0b|ZDFy|UcDwoVRFj20}Co8Pa z4WhbvRrd&&cp;azN`O^F$tj9e(JCnQii#+EML%q{!kKe;A14OnDUl34b(jGXzX)&z zk|@B#A*T7~s5f~CU^GyemWw#-(G$4Vj2VH}z!?lANdeqQ637Uj`@f+>Rin^Io&2Y6 zqEBiuMvl+AK)pQcBj8h;M^d|FfxYMi1jTA>Os+F{dE17r#@A+!>+L!?cVA19gke(Z z`MfVId&g-c0SUC9sjHCvYvAKb%BB9Y%mnGj#Po$dHJ^p+n>tt5r)SOEkzb$w;pu^^ z_HQ4xp1M0pBVGfK4xe7)`99zw&kgy<8y+{i_TKF8TyslFJf`O!)LNDwV?*m0WMc9P zfBBq;A9cU8%b69wEN|;Iuy5|motmO8A1F7DT=_lm=z-b08fp)p{f3OmOjXKzeLI&2 zk-7%2(otOA$4)cexi@j?OY`TKH;wL|;MzNpZe2TC6a`!V{?g3Rz17>euKT^ee3>08 zuNzvCw$ZzDJDOR(8`3cpz?C%PZ{q^Cf>p5Tl z)aN^JVc^l&n2e_N@#7l<1>tp$hZ*M|Hw?6|b+_M3Zdu&Uc5Hg}_*o9$WQB^}dwYX_ za))yL#??=6r#9}mtBVo4*fuVG^XgS`#XW=lmm&S8;`-SRX89QBfwZGzlhPJ97Pc0% zpU2+nUF2xLx%*;W+?cylvSONbnx6-o8}&z0&+oYve|xGBw49A?*p@6qZzMM*H$8b0 zj$2i*GNj}+cad+&KnV#*jElD3^ZIxfmJ2P~pFn)75 t=9M1Z_CCJ9Z*ub~{{Drve^KEH3!(k%6FS0MONt`DW?Oy<(~-BZ{vXcfJ@^0s literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/items/EnrichedAlloy.png b/src/main/resources/assets/mekanism/textures/items/EnrichedAlloy.png index 1503625dd89c3ccc9871357681c0bf1cf121f702..64eb59522746c6070eb29320c4f63cbbea750da9 100644 GIT binary patch literal 1311 zcmbVMX-pht7#;%BO19b`Rsl_%Ohe+)**W%@Lsn#GmUaybWV;H{NOyMTTbRHc%na^A zq9~0=o0zmU>5-_=AB5P}+BQvFLsKvaNllZQ8V`(3vuaTE2c-l{Ephx7So8;VDjUd%ESyPfbfP}^QMy&W>AU^UO8)ma`2Xuy%stk$X9d^UtF>+*1&KPE7A z8RB$=uob6TVoj)ESO5)pgSbpl6v}X3D!}^az&4a7sQ^K81V!Q`#Zx3tlj!P$L2H(h z=Hp`Bsx7z+VeO7%@&u8|WV{)l*Ra|MisLwfqzRhFAp*C1bVthKy1liaAOc&qRMSxn z9nC9BDWls7VbIf+5HvFuTNBpp)kMLR5n0J3C@)E9T0X92wC%*fzizCHwi7)jAmYF_ zx-A*rM|x|440CsHLwO+dhHtb~cqvk+Xvp0f(4D9l!r&LLqAEPiNI?K&#sh$2a8~xi zfdMI;_Oq!p>*p9+2^4hJLFfl=&)*#t_up|d56`%Pp`ql`JKJa6mjdTplyes9 ze+!NbT)$#od#eA<_i|O^-*kL8wm5r!gJ(m%P!T?<6(6ttcD(;e5%)}Pq*VCn*bAQ1 zmo9mpKX4#9r}Xu`J#oC*w={haw3H@xe~s)L_~XE9W9Rz)!?7C^gC&Xh{+TZ}|ML5n zgP#md++0}dd8qjC&9_cfK1z%WlZ{!qXyU%Xuk?@3?9I8Ok9fLTTRl~m4<_dhT^;b9 zxPE$f?#9%x=ji0M3$Gx1kEtI#SaC}TmrtMAb=92B31sWV?x%&<#gg&hkweJ<3o*ZL zbU$@JyuA%1b1#+qMw)(qi~WcKhiWVR%hbib)}4%o0{kC4RUOZH!68s?q2p!==+yu(3* z!kAy}^O!GiO9ja`tgC-v$*@x*?JJxfz0R6+@>FVdQ&MBb@04oJ# A;Q#;t diff --git a/src/main/resources/assets/mekanism/textures/items/EnrichedIron.png b/src/main/resources/assets/mekanism/textures/items/EnrichedIron.png index 528b9f69b75791ecbb76c8e4e4dbe16b45582651..18347831208fdf6a3488df174f903b3741f3a8ea 100644 GIT binary patch literal 1416 zcmbVMZA=q)7{3m|jSLmThe{0IPR9V(Uhn#Pm%a>Jx;CR&Ycp$R2-mxR;ehta^=J#* zoD35NV__5BFl-}ZFX)U;rwa-q0Y{i~ZZnKHoNgu<86%`HLkKgOy8>nVK>V;v?)ksm z@Atev*XS&IJ}osf6@s8NyUpSf*A4Oa@f1;Rx&M$7mrX)}N7&8zgb2k0D4*fH0Ji(7 zQs4prpobouFu$kiltd^@~v;xOqEg{F$Dgwivg>eO@L@@=56EX}VRaz3$z{?LJTH_fX z>9SatZHXrXQYHvN5=A4Ch&-Z{b9^a^5d?uMa1_U7B0?6b2?$hF76@%kXt00~&9gy) z9f#cmASDEMnXBj7Op)xKAo6T^}9yY*mkx*{DLQ4T# z0MCX2W92zNyqIE=UBx^_dl?1pV`K`TjSCecBfL67Ml--mD71j_=`_ePpZUM3Lq(_1 zc%S^IZxUBxGsd?oQy?Bz<_HAD;o-$8xzoOF9D*b#?UsCZ^yb&C{a5pMNr(FdirH2PPN>sKC+%C;H)Ho3H%v_v*zh{2#-mA}Ce)-+| zw;tSzP1JlCyU>uHZrr=kxNl1mqb_OgdwOK@T-z6}_zaP~QE^W1aV2OTNn!4t@Kz zWA40NCq|J^!RI%o+$UdDe^Y^dcIi&m%=$kU^xsb?Pu44$vb94h~6;}3ns>w9mn>l%4N)9$#- zb+?DhO?q2)>)rVW1?sb7&2zPHJqI7y-;a`Gfo@$^%kSadSXK~fIr7IK+gFU{$=`e7 z=jrhEr(&IBmH3I#CX=N7T1v}s(iu;4v-RV)m%2t~H@AXKDfM;cUnLL2M=!0BLg69h VxwQ+Do$-I8y`ac)YDdZI{{W3d1~C8t literal 360 zcmV-u0hj)XP)zZj!7{K{@ zUm2g~r2(O9IIILIId`{!gK$S4Xq_+4Aporoq8Z`N;Ubg(c+}iEov(9sOpAJR2DAd@ z3InuNyO<8Vt=R-1IhP{WvQfYHAlyqxb5Nq!>Y>d{vWw6wJjrN8Fo3nET0LlBG#lXz zc#6~llmQAsBdyVS#*6IJk+!{tUSvfa0?h*a8vc%ze7q<``)yzgByuDgEer5HAm4=P zn_eyrfJ1};qz*>v5jCT9-g<)Jrqt^5ETfTzw*MFG4)6io$ceVPed`SX0000@FWh$B=&aSgBACK-Nid# z#xKYbWu}m9bjH%uv1ovi5l2iD2qdu}3M;cI8#Tcc(QzzcRC*6N>kr32+L?Xd=Y9A0 zd%mBo$VgifJ?W)MI-M@swUqY2{khQlOe9=q-yUJ$HeGXMYs)3S7GM;hOW`CRKwJWo z2Rwk`iVHhIqE0uykk8E4vfXcxtRxti5XKM`WXRU(5|e^5!xjJy@qs*Ew4;N^n^A=4 z?5Nk`Ho9dBo8iNFdHKIxe?dYgp63U@#3`IsE zT7eyX=v1~l1EC}ZAQpo~&l*iQVkHc?#Z2J%D~QR6$78q=GZA_mC(Tw8Pe8^V6k1a_ zKk1>JW47SQj^=BcOk!9d5HJMd4U&?F;RHcoMiXW-=^;X|7K<7a)Qjreum&2atisD0 zFNsJ4CeHeluyWNizi|SaSV9Kx{BV)M1hzUX{u2HnAdBDGJJQl5H7Rvzh z097hdSXdAL+%OsD?#YHiKjb_ zjWxr?3VeE#+2-@x%!Jj%S;BfA$G1^tTWYF~&%;cfD2PVWU8#f6hw!{vkY>S;%&~WhQ+Sx-r zRHcWmUMF}44*qie?v2zP4v84L0d{`ax2x}dSJb85`*%(0;Vc3oMsM$&=ZWvVS)BOk zo8DV>C-S>yTrqr^u=@Rv)xlX=b)VhMso(p_(b>0x_tH0cYRZ$BEKp8ici+mHzvHya zMRt5!S$XkXi*DZ7F6Gvl91>UOd+N!wQL&iEm&d{YW{IUo<-%ng)Im}lxdkaK(TnVE;Dn=2!` z9s8R~`<_p8pxIt;!(hvtSY^fQiG|q2ja8fTGqbYx){Qi7zvs_=uT=ptFJP-W&bCds zIXu2;@w$lWsej{kOGQ<~v;DtaC>waX*lR4ee8EVqC(;+iQSs>T@Z?KtFGfbbyC+$w z+gx8Sp1!Rv?Ok8iB=xs*y@zHr9vRxX@5CR|UMnP(Ddam}=Uu4oL{1uNPWL74YdnO{G5i+p_5+Q{wm=ESbft7vyW=)X19=gTcCnblkp{W+8UJKM1AigK)9i#U6&sB~QO z`UT%#EiP|kvKC%$;`ek-GbWnbIf81Pp3~Kx+-shBeW2~f8NQJbb~vs@cc;F4-LJLy QozSn>ht8p4=SObojMW&4Bp$1b_w*FDek ze*E6|_E`#ZlM>%cgdix%lxMI?^P=ecW`Z;>ADdvL>0L3$E*9}FF~|r2(y_b)z$PD4 z0<3^x!{zN@9R$5m?y=cLySadN@;(_8#mGWFzr=>1b=e_5myW3T@6RuT#S!+3VqTAzBjf0g-`2zA`RAhqTC~E-kI2#~1=n zLPW0?nR3c*w!nH`0I)))K%F>Az$%T5P*56z$bw0nkYfanks6dBXi7yBN_hG~Bx?fe zqOAtwv@L0;Mckt3r!g!T49bFX884Jzghr#ma1tX)R6?MEFefr0lnZ3U6bvBX6g+;> z!*g&{k#X=9q85=noeII{H=AdKxxjRyq?BPH#*Yy)9P|02aZREFq80q>#;oXoE$j!F z6$JPS!71H`DeQJ~}vy;<-`m%@}8cxQzVaH7eeMWin>*2B`Iictb7W>f(P z6{>bp(x3tkl%&)SmzvV3NLCTknU$ZTQ{*UfaJ^BfB#0bJvymi>q#W042$c?}R57lJ z3y2Ko1Tov5sO?Fv!T4G(trq|z@`8=$%VJevaq}V{aPxjxuZLG}@o+33415s1p{alk zK=4!o)+q2kcrwMbXBP7gigHm7LXNsfT#W*X0;of-a-uFdkUP|boWUtIGRB`uB1$x|=aj>cEl)VvBF!fXFPPT%pWepV)JJ6+u4rnaB6XMMf(#k^m(gC)AZ z%MaaKFkBN(lN;r-v09kfw9l}ytL;{)Vt?vzYuEU;+BwiW);U)f7F>%&|DC3sLc^Jj HJ9hm8nu--F literal 1435 zcmV;M1!Ve(P)4Tx062|}Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p z!y3<%FD&-MT1y7yn6sb)!Q?bPctR~al{zD z)gwn`;BtJ2T)KI@;5$r!jAp0|h>#eOSabL80gZ?&r;&i11KQr_uFbow?VP~I`OI=G pXEv{lWqV2002ovPDHLkV1gLNw_pGO 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 0000000000000000000000000000000000000000..b0b7cff7360b4cc7ceb4c72e2db75f69dea99b88 GIT binary patch literal 1653 zcmbVNX;2eq7!HUEl+zO^l{KK1$YytQkfTH-2|g3F#2lM!77|dk(9{wFugJjn)c`wQ8MuM+L1&89KGaZjjjiaQxA4<~#R!-us=c&P-1U z^pEgoFc^WU^W-Xe4{=Z5ar7EB@DioBa4I>6$|7`>9VKx_5=LlnAk~EC<0>4*imm7I z1O{V_Rjwxom>WhY*oS1i>7L!vSdoXe%~Tr~@?HqCFDixJ^syEtH-x z18#|^hA5;YOxn^{E|@GztO!^BO(_>@+@o7h>mKEb-pUorNF1dIQcVy>PZeYq5ENl6AS{4P2F%LVn=!&}i*;w{ zmBVtJ)ED8Hf+S49NQlMyH>lU}csia2;et92ECg{L4+k||ffm$pajr&)a8Z~iWRCK& z{~J1pHVSgr$$#p`^F$Y;`}n#G=*#Oq!p(H^kaU-13?E=I7~T!3@+7t6dQ+AmtriVC z(YB`Y!MXEaA&25FHs>{U>G&-EuS#xjeDXZ{=+Hy2=9U)gz$LH`N;o$?^JuKM zcTE32o6lh2RJhLqMEIh&l7pA|c(GlucUl=W=TWD%eM5Wgok?DZs&$WHeOTKEmkadL z4Kt^1He`q8Ha6~LpOf|8yb-oCaa@JeSqJDpJH7Sqch)}qx=;o;z>kZfrvzvZ<};eF zi@y!+f4(cYtRu=`Ff{sf6>JKoCYSVqajTBpXGO}2cuNigx%;Hsj#N9Zb^8{UP0Ln% z-esKdam*L0>d@m8>lR)KvmX0-p!aFng6fTRtN+^j@JXL^QE~W%mhNWXJN?2fsxJ?e z-*_Z1zqW44ax(9Pv7*#cRd?^fUhD27V{2<`=VfG6E{+@A92wGkw%RZ5;>r|PPmp@y z)y^lR=5(*@>LHi#{jf#hgMKr%JwI5nDrk24_PLkLlhe0J%D1$aUY;fnC~osU%c2}t zdMY*hrWB8Taci(d6ddclXYbj&Nsjx$AJ!bMN*UhOZHc%&Hzawyzw?{l8-J8t@Y=L2 zO}HA1w$5HFf#~Glb~csm2nW)FLPR@QyVa~SR7!}C-_4Ci`=>AcU`BvFMrP~tTH*c? Nq$a1!_e=9W`UiB2Y?1%~ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/items/GasUpgrade.png b/src/main/resources/assets/mekanism/textures/items/GasUpgrade.png index be83d491843d942669e126302f7817a04ee9cc6f..0df142dd62d78b18dd4ad32515f5a1410f18a8e0 100644 GIT binary patch literal 1870 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 literal 1354 zcmV-Q1-1H#P)4Tx062|}Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p zaZ1}JvGgsAXH zl%ODyLy-eOmKQ8rxtv5hQIwPI0BTqcatYZEpw#EEU?AH8Fas#1sp0@i5+cP8pfoK| z>;OvB0>us(6ls7GM^GFBlq5iq!zpqAr3nz^0Fr7hkOmMyuMx?u2|;F26apXvCc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvGjMjE=kNwPKDW>3A7uk*8s0xE9aur#FG4?ko^1{SSkp} z$S=t+&d4uNaCTPE2+zz*$uBR~1jP`I^eNvdv=v3as?nsKUel7*phqJfEp5>$T*xk0B7bd)|Qogk$fm=G{Af|&4J z0OY{)QEDDA^ArJdNr>Y*Lk0%MZci7-kcwMNg7$hl1&aK?yL@J#l#Qqshxdd7IUQ{R zf(I8ZJLk5 z_MWmj{Pf=8_pf947EXC&zjT`3zBuQtJ2xb;ik( zw)3t!6NOxy^#p>L82ML+vQPHxZ$9ik@y*AG16$TB?Xl~PnW%nmW1h)(R~I?uozqUU zTF5eQ_-bJYAl!(VBr*!23tyyAMhUsjDsAJQenQ zb91WJnsX%7BXzz*^z#GD%LMv)lnPfb+$1Pt7UtQ_wefsj(T?t)1+}G(YwwygNz42! zW9fXe>Gg)%KRnwVy{9n?dTF!VyezJCn^`rzQAb6z&u5EAmg5=!jjEf1481niJOA@? r5Zf)+xNA--(^sq0-yW?0s&|0l-H8b-MdqSBppwti)z4*}Q$iB}P?Y9F literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ4W2HJAr-fhfBgS%f7l_ZE%7mf zdV1Uc6BSP^7}6egUY?^dBch!rmVH6=ovWw$j&)BjZ20)0ltHii;>Olx3KH$NI+{Uz zofC;-;!`&?8T!Qd&Ef88?`JL$wb`K19?4V8aVBwx(9;X03_Od~%_1f&RzLOdIm3*j zOBWU;^vt`_v35?|Jmvyc%ezu4%+DCIqHRiK95goa#El5IYahI^L@rGe4h@! fZxFn0&Bk!W{&;rPrGxH3w=;OU`njxgN@xNAvd>+W diff --git a/src/main/resources/assets/mekanism/textures/items/GlowstoneBoots.png b/src/main/resources/assets/mekanism/textures/items/GlowstoneBoots.png index 6531cf5733acd6d9af6f44edbcfee61c44a59065..5eb2ec7115daa0909c7ddd26abbb2b746ca6f469 100644 GIT binary patch literal 1556 zcmbVMdrT8|953p8fDeW*rkmale4*FtU0beKsao11ot8migEi4{^nRr`=v}=Ywh%>! z77>Hd8DGo|R8S@f(PXF@nYt=Ym^#cfx=kF&z-cC!phjmV`xU9%AI3j+$$fv1`+UCd z?`=*^SvoF!TDVLm8)r^7THzWQd`FLja%TSk1DCfXQF}c7B z7`AX#3rLX3hOgo>vZO4_a;;r($(bNV?sK^zTP90b>~k~rJRl)CAeZBHXkXK56yaDM znyI!ZEN%mEa>+#^NH0psuovaoX%=0)2ubj1p#m3>7{uqw=RI1V4jt61h5O(&jv|8) zDNl#Ka4O4^iWmeDAZoc9vnxmfp=ddwR?!5p03j8G5+@WmNn-?|RZ&_Z9vOO2Xia1t zTB|W>$QC^5P^TohwK(qedgWfFTo7|{f~IL)LEHM@)zebN6~fK_K)-`@YD*qA>YJ!Cv43yks`&Q20g8a;%o5n0NqV#?*kI zFpXUW1qE_2Ql-gpXjC*svg(kYSMg1HmC-=PQ-&m!i6BfWjgeGn;t9$?D+vvy(1*BY z-Xk%*9fWLi(Do2F{h#7*AAL@csryvO)r{G2m24rp~$FqXhGcQ=77XcfA z$gKu!k|?;4!4zw`SC}VNcIc>*#xxohz^GMFC^Sk8s5K5itJExDXmp6r{@>K$&?!9F zC;#c2&=qXP;P&Mdz{ATq0z4cZ5l)Hx?D{)0*)ZB{)Mxm9Ik#h(b7I=0(t(A_Le)>x zzN${FeGKZVo5IU`ulYObYe$Ed^p3c)6KlVBzGD7V+tJcGr+$TVzO%mU(WeJezq6Ri zr^Hq4N%^cLq4$#ROY{D_iz51R_U!faQ3C^2%966S3uIfzC(+ra-OUrG9&I={vvmK1 zo-1R@XC-dyJ>Pql@@H?VnteHnyVMu^*ZB6RD{DKSrRV>wv}Sh5Z#Mt%?2hyLt>TA{ zB4q5CTP>3-#9K@Iwtn%)jeA`mG*s<-YK~;vOCsk-zPsk!?K3?W(@u65F3%n1J6Jk) zO>ESxuOC&Q4~BhsTS?UoSD7~Hq7Q9sFCOXlpGdVD{9z*!=dM_Cq$@mbOIP)gumcxv zPm>Y)OiRt@V`{4=bZCD=)^441G`gChBC=Lf<;xaVCk(fJQ@`F;cK33ZdivA7-$$+- ze=0Ag&YhNgJbQmL??3VIZQHM-X9-u!ch;$0Y{d1YBU?Utuk&%m`ljtkbvK%(G*<4| z{h%LL^#2*t8rHdzFR>{%6r5@7)Ze?CA2`!C>0%E$W6{&rfO;c`R$kqv@3Px(c&j50 z%fYcz&4KPMbGXTE*LDTAchZ{EhgP`R%^+aP>Yi;ber#v(K-H~t1sSHaSb#ijR zxjLLkN8Y@1uFE!Qm-<9wYgD^!Mp{juV_D6Sn=6ZF+rr8Qo>R{!X3IW)C#q%L!gU*h O|7o)+#n_OTUGfiYeoH?9 literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJb)GJcAr-gYPCLulV8GK_e4+W= z!tNJLkF*{MG&OVbg(?bl9lS8Vn{(TTJpJ|ZzEND~EPn(AFmN?gH6*fpUluc8mO=i) zqG?;*N^KXY{4X@qST*_2G=_JkXGOJG9JE<-*c0XRFEg((A7K7*Y@@SBoo4&>*US&3kJ)LcyswUP*L0U>klYcpKPsp%uHlom e9>adt9Sq*~HM3JiZY~D8oWax8&t;ucLK6U{_Em)d diff --git a/src/main/resources/assets/mekanism/textures/items/GlowstoneChestplate.png b/src/main/resources/assets/mekanism/textures/items/GlowstoneChestplate.png index 9166800c5cb3787c848cf3d16381b5a214e4fa74..1ab7b7b6d8410365e987f43015558a84dfcc963c 100644 GIT binary patch literal 1694 zcmbVNX;2eq7>)-WMHwOj0xh@(Wdun!8#dQAsRKD6qX7aLjTI}K>=%fTY)FmC zo|+usAK}knFalI5@(g-q`rb(&&~oO$2u?5IltM>kl19pb+W;exAoT!JneiNu0dS(I z;3kkT7!wLiS{u@{wI*ciO~wofWjfCIp1Q(oKn_ny%@dsUBfKsHH6BO zvfenQQ>Q~R(gq+thtD=}c?cvFa}Yi%Mv!=j$3+rggbVY;Yy`njA%+N`(T7D_vk^ut zL#`aPMW3XsT#B+{Fzj$RIF1AkY0H5Tu~-aqc`%R1rV(s=k%hvYY>Pd5OoJTQ4K|aN zGLaU@rxDkag_M*vsJBrtJq>6O%$Cn*oj+Vgu{i+W?x*d(RL~W{OiU$(ROW- z6~Gz5P8Qk>bUlpGV`Msa?>FQF(%xWcHWOVGJYP;43eCVmspL`?{e?rA2#hDh1%Qs3 z%?F5(Ei$0A5CT1$hl=z@5h@n)2>zI!ckvYnPsSA~_%bD`KoA8g;>&~zg(yL+lp_K$ zS2)I1S?m;UF@Q1KCffEW7kw`mli2`Hkv1(!=8ttjdM-(k_FU2m$z;&n#U=|uI_$B& z3cU$f4s52+0im>!X6SW_G1EKD^H75T5hjS)A`t=Ts8L#QMG0)c7a4&VDN0v39BZ1j|D83=mHV2p26$rH8Cj;h^DQnZ?| z=GBjXtxdqdq6k0MxpXf3T#CkB%3jx#9jXa8?_p~81WKPV2h#~yDo+e$YvpO~No{%% zjAicA$rBYTwxx2;W;NGWw1nmMtqOcx{87u$fVVulYR{G`RH;+iy7MorY2~kLEqe8E zb8rK6y;Y9ij4k}y|4wD^s?y;7KcbNuU2#x*M0SHmx^Z@COSS!8XMN1p-~*Az4s@@G ze|Ud-S=Q?H4I!_FJLi>cyA%`U`l<2O@7ETV_ikjTW(_~xp7i`++>%fGH$DG2ZJNI) z#&E}o`c*&b`bCh`<2`u33Zx#+Z6D`8T~SKqi{;~*k9yUy?x8YIjl$`vKk?wZ9my~L zsOoj;7F{f-{5rg=0@^NXr>1fCQychoA-dVY#J#~R{S}zmo?{4{*nhhp5szTTygBCQ zPwJ*$n)>V*bMp6HqTaeGlW$GCz5Flc3h%le4$I!5(eD)PHoEUdiR5T!lCniv^(?OK zqU4Kd#--gZWa2loRC^;LAB7!RslL{6Jp9nvlD@4u{orK78OgQA#G@Nh9ilCVr&yNP zMpb0DmTn9D>bSk;ha!zjf(^_Vyiu|DO9Wf4acy>ZBwfqk!B*z1{X6293DUF=oY(g) zJvkB+HuXqtTjcq^!eSyH6>=bO>@ilh3z%@2hSEikLsY}^-|RyXqJ<&nx0jI88cz5E*yugSc{i`N3EUHAPGI{t4wB<{R_ZEFSrlp zmmRw5AJqR@^>0<0kyG1u1r&98g_)P`Y_LP-1>>rZcRumN&71L}Hty)~6m;T;bz0@F tl_P72C)K45XW~J9ZSTwV%feLNkZgwOoTPxSmI!@+43#2Pekv)um4SKP==G-~`O|HaRNMDz=E$UY}P$B?4+xit}aT z=368p78{D8EcoW*$BD|pp~4M4;&RYu7DbaDipnR#uZ?ZTAF_ubr<;AZ^IXmVJ){l S##e{{00001$tNRPFrBe zhf61k&P|t~bCYdZLj1^JSzOFa9MCy*V`0-JIyP`_6GvnNhfa*p+gqe;e-QuJCHK4^ z_xnBH&vg{!ZI4@(yb3{(IA@Nd5Uy*&@8fDHQ)UzfE*d$jR4x*#WFI2}WGgFF0@UeY zszD)O*oOLxARR%X>bc@lxzv?waSI+D6UONL9xr4gNP33f%eZTSj8=kbj<;e{XFtbK zj!4PNN8l8uN5 zEbw;gQPZFq!))7XECWus&)Ds4r(BmYnB?t>;vJh$L;)6kJ zB3orCbYw5uf+s6hBgY*Fx_3n{j6%a|uAcN$?b&|0&Z1u$v~3ccB&1x9lfpeZ8@7#dsTv;Q}B zICKgR_sM_yCUOOvF}z)x0(e-OBf!Jq5#f~l+Bm)vK~y77$JS#1NadWOWJGOl?P%MU z`LQbX!aIr*YM*G1In`==5dFlf&yl3wyyaNMV}>J#-=tJQB%sXC2YZ`dzo>L|b2jL_Rf5z zDxdAVes4-S6a0C&M~ThPJ8hW$`ZGgn-7a=^=0QquD&xmK_4b>7;+5v6*REg7NLSB= zZg;iqdAXArZ7&HpZ@okuKKY5E_29*h7hBqrV>D%x`;xvr6n7$KcgQ{acgS}2$WU%- zZ1)smTw&~0Ma>WPw8Wk&8<@SUihnj?&xgBLKtQHzD0j^_shR5NbqT@Y{CthAc|O>> zWsN53*taXeX38izmt0Lz_ z=@+Q>ZFS;XiA?pG#``ORqutk%Chx4&+}8A=J^ZSYUWp%R@svlYH`JF04mBkjkRSG4 z!mbcyeS43s^U3SlxC57@*ptb3`wudA*Y*cK?LOXqI+G|$)uwY1g(0O@|#*hE?dIs;_B(f&Ys3_FbmRP;QsNv&19KU*Wc3Uf*vbC}3&g+y7z1&MK$>nIQ*(mRho~L?+_BJl7uWz3lF? zr2SyCfn5t_APip+RP>7q4muFQDp6WWJ1hGz{4#Ya6C8dp17%d#8lP*M>W8uq9^CVP zp67nQ|NH-@2M3OI?0I+(f*>84w3vgk(|_A`!S&$p4GD^Xmn?cGEX^xR4nPvBB?ByD zNJAh8Bz5fcGU!7P^t7HYdd2KFcl9k}?83Oa?=`8OQ5$H5}8` zI9>>6sjMx4VLd(WfD_{bd1ZV=iK%%1(^y}HhYAefNm#`gHC?_E$2auyaPMD}IJN=t zM&kIUQ^o8cCRh%@!oe`1Pz;SlV?jF1#%TH}jG^cdNmC>fBWRjuqdXnKwjLZ>b5xDb ziK#7H@D#^~J2zSi%qzYlWy-f`wa1}?lJ>4=f zU!x>jB`=OcPd7s_>}+;hvFUCl3Z{&#NH$3aDbg_fxHizPmjnO0u_M~ekJ*6C0oN)y z3ap3L+a$x>-P@24gx>JaIyx+hG%8w3$pEI85#u=g5>$1SXQEOBz?g|JprZt*uyBb2 znP6B>);Km6Wz=v}&rbYAl1&M8gc4F*lBSdFQ7R#(*c20mk`tI%lbbPJPcjwIw5>zi zo7`~fo?KpVfaF6_*iY({^( zJq7TvJx9QV!{fjyd9x=ygCH&488MNsT$k4xjehj;YU|?EwF9YFrk*^huHLQJCn5*5 z$%&bj_PukzQRfycl(@KGQi`Qptsk~5VYA1l6VFs{)+XQTnLj^tzWdO}PT-}r(Z6eF zt}CgHY6^Kl0v<^{#!Ia{IwkOYeNJu=L{_hgTbat-MBo8Lp#xcKxdt zs{21*zkPS&{ZDXV>YMh-Ysb*Q$w$Z0!hG9a@eiu{XV>nvs~3LJ+U{JGUjOVCDm-_! zl<)d(@nBCQ(Ng%napCNAvij4NJB69{c<1gXaQWBTM-Pzm%ctJ{GI)co2YN3bdJO#{ zBCM}WWm_Jajoi#Fh?l-zZO5)?&+qCqLJ>55IWUjpjK%cy&-Yak6xsKx@onqNN0$BH OP$oGbUOM{XxqkqH!?M8u literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJrJgR1Ar-fhfBgS%f7l_ZP4P8@ zdV1Uc8y`NDGn`o@yxj8Oj@8p;Stq}mu<$uUOkhCBA+BRD_%>b;VR;-NU1%U@$9LeV z!VKqx9VQ`sJx`D9JW%n&ilHshk*}L;hI4`HxrdJ#z8qoWE^@kA^un4U&2Zrnvp+Ho z+9zIyN%PHM*5LiL@HImg>(2|t3|pIPURX4QIokb@b$G2H|A%iu=>+~d_MRR03>o}5 WZ%&?l+1~=_UYBpX;scEe^dAv)S& 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 mZ!Guw7 z3GM}kOGv+LM*xA}aYwvAEuj_hC%^@R$Fm_yMf?az!8!Q8Kko_u0^G67$w%?JpNM1E z68;4wPPZ`T8X$|1lVPyYf4=9VpA&h-dzl}i_xe*vj-PGGhXm_4YV3rqzWMlTTUmec?M002ov JPDHLkV1iF}Xc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvGjMjE=kNwPKDW>3A7uk*A%Z_E9aur#FG4?ko^1{SSkp} z$S=t+&d4uNaCTPE2+zz*$uBR~1jP`I^eNvdv=v3as?nsKUel7*phqJfEp5>$T*xk0B7bd)|Qogk$fm=G{Af|&4J z0OY{)QEDDA^ArJdNw`q^ItB*Dd7dtgAr-fl1Y3JJC5rs(%gjm$aAXsb5@ZQf+VUhw z@XLg#D5ixA_nus&$+6t6eZjG!?AM&G-M&|a_Hr!soV=iBLdwEr_b%@ZUn`v{Qdh9U z{`>y>kLR3LOmj00Sm?FFn|=D-A8!v?=BJ5CY>kqQo1D+UxuJi@$?f}l*1nbav{NRm zyg8mJpv1@~IU%~7?P7)ctlQO$hfOvu41ANT_i5I5PO-&uQd`^hsRlgCQ1+~JeBknk z=hx-pJFVdtu3l{EJgN9&J^#i+fwt;vD)rt=6?gp-(G4)1_=D$({o+FZeztRk+;U2q zHv3afT9yafHMTU|u&>YDC{q1ggG(shr+16e#4{(aYpFVF?GJGc*RtZjB~@4>dUVD~ zhxd^OUPUzc{oa26#56J6Ye(m$+6IQNRb%nD@knpE&${FW^ER~~dW(&2Caw~HEc~j( zw8KSiVPL3-L+c~6o0dynENNh4KA07%IQMB6r^|DVdpzdic_9=pO>!ad^pj~O1Xiz^f1ncTi|`vnn}#{trX26DUj6wJ61_?jPH z3a~VoCj6Y~@xu2EP7-2IUIeyk7xKxoFHkp&m~dF8VV*^MKXZcEW3L^(d7DKZ>QojgC=Jf{`t0|rl5KbLh*2~7YVP*$G+ diff --git a/src/main/resources/assets/mekanism/textures/items/GlowstoneShovel.png b/src/main/resources/assets/mekanism/textures/items/GlowstoneShovel.png index b20c25e846dd68978bbdc77465d70123254af938..5dec303e5d62bea4eebca77b58c67ee06f9d6150 100644 GIT binary patch literal 1386 zcmbVMeM}p57(Rp*hLTa)3d6`Q1+r?m-e+lhQW0po)vm0Tnz86U?&DW_Lhs7mu@cqhovoU8hOBOMkbM7PR@DCMXUV);2kp1B$_xrl% zdESrT`(CHNc2!PxVKxLoIiA(dfHvnQ-z=Rru9&#TXw!1lRj<}bAvMOx0IK387Qmhe z(*Od1;ai(WK?MY*Hw(dfwcfXe=A?+3Nn*_LNK|7(P(@`t%5aT9g;~%bhz{c~Cr=q+ zfp-|!S$vo;S_8tu>NXkFwbcf>wnom*8!MlLE8?^!5CJL!$0JRmLdPA(8C_aiCy!Ah zJOfc19mZLw>V1B=Mv?(+FIV<=%qaGa*BG+qwRJx0x% z%!lZJ(>-TP+c}J3RgKap8jHouG14r_4JdB6+fj@_2?Eg&h|(&mOdJuF;*^3DD4Z-r zRY4Nrq$0ygEvmz)c{&?HB5Dj_^agQaEa~#?t1@(n)%tFY0cDz@2An+%t#hAYQDy^-3jE#Z~3Hq_@aJgS@o6j#UEProq=B6 z4;?#-Cv|>2r~55~b+GEj6Sqzz`rvbK>cp-khl^gh_R;XrzPG8(p8OY7*E^5@I3T#Z z1BK!D5!1KNGTgb&tKQ0z&V!FYC!4DlC2O zy~Ks>QwK&5q#rTYZQY(1%-eOwz{;6FpS=593$|$be982YGHcpY-`(RGiy!Q6A6<0s t_O?eqZePEm=#S4|JUFoR)Wkk09qQY?hyDHLpP}U6&*Q3f9;@Em{tvhG*@ZNAR*n;^N7R50W$<+M Kb6Mw<&;$TIMpMNA diff --git a/src/main/resources/assets/mekanism/textures/items/GlowstoneSword.png b/src/main/resources/assets/mekanism/textures/items/GlowstoneSword.png index b22d64022c56d63961ef1383f82b41e992179d9e..4b96a767bc4cc28205c0a4273610911fc9c3c2f9 100644 GIT binary patch literal 1625 zcmbVMdr;GM9Iq L`tO0~w?dC+gBPZAzPtf~74|p;(|`#|~YZrc$9zNds+}Pjv1o z9F7S?)al%*)7^CF+mey@B!pYP-M z{l=rqnKw2nHj2aHjMZeS^4NKN@Esk&jtTdlO>z__%18nlE53xx zBXN_vyp2rZa7LC}^ajSD&6W|Am5&E8e3#YEvN@cTG?yJGN=XJVl1nT$Ie70_D+pLj za&VzoE701NWQirSiYD``a`Z%1DS?^5v{WF)C1VAwB!dGkYnjaX9o z1Yt_$;0vb=S{D4*AUvlRiLprbGBkFW1CRQQJ3~2^}sL^ypAyq3dg;FI% zlNAzGh^w(V7~DpXA=?(#_ApoQTCPkAZek+W}=*q zS-~565wMD+EtRAxgQl#&P>N-iSC}`Vs2MdPBFHQhNFfqMNysRY5Rh3!ii}c3gbPq9 zILtTw-_*gZQ*f|O{!=%hBeocW%a>iiZeI2gX=9s*X1nA!gFc(X30t92DfF)E4SB_x z8*%Q6?&Y0_20uC1I%E46?%vru=;nrfsAv7>YrB3fm^!97QNiTu6gsB4X>xC4!|HVz zAFi96)dzc$+Z(tOBm-yY(w?ohp5GnqWtY~*yH;X-y;xrgy{+#+%#?E%PPuPZ@-j#G zP9=fWQRTU(svY52#EikwRTGi^b8XOoTQDVD8Fy^`cfRviaCL5Y$1=G8+Z!$80zTtl zbce6t>bf}pgR14iKw!;8)k0;9e#?%6r!B+>5vswM>^IVs_3h)HwtTd-uA@5qIJVKFuVbq>O2G6x?Sdwo;d}or;_*NEgkGM3q zaM1`Nhx<);-43t+xVI_h@yM`(%LC~fkF2_JFzePIk2!ZN+h$?Bg5w9G#3#`wdvtqZMs7b^eznY~ismnf-mtkddGr;d_jG=6cEzBR^v~PZizSCb+bh3s&0^Hdq z^j@C1vsQjOvU_gay|M{OH=}EECimAa)zl}{RIcWYofuVnTh~9G`>U_Lal^EMuuYq4 zG+E8bfyFtA`SFqWF^O#RLH|RK>&BGblFB-(#vfhUQJ{Mm4;5Kcfs@|Ygos^>ChafQ z@wjy#TeHt!YMgtg>BkdE5noQ)CGY?-Er(r=iLkeRH}~3;D;F=WIv%L)Y1{HwMPXaq ldk=Vf{THS^_bd*J=A=G*w(Ol-g2Ld>UZc)Y?N5Kd`X2=iV#)vj literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ)t)YnAr-fhfBgS%&uqJ4vhm^i zoEeEXtQpcSc3z&7uqRKMU4p-!{lO-QWAgj>6s{%B`1SBHLy)eV9iPJWM+aXsd|5Op zOpL#dz2xhrX2V^MS2k6Auxgm#ydw4Eg;IvCI&y#b6rKop=>q8u7exN>A6jVkD52+_ zK+MgO7eGr2Ggrt+obD`cG+ei6R!}?79_9|boFyt=akR{08rvvy#N3J diff --git a/src/main/resources/assets/mekanism/textures/items/GoldClump.png b/src/main/resources/assets/mekanism/textures/items/GoldClump.png index 636c9f20787a391e3097710c0bc37b5b75482f67..7ddec43ff785a59fe217355ae7259cf954c8a7d5 100644 GIT binary patch literal 1290 zcmbVMZD<>19KW`s=uE6qglvc&S1PORW8uq9^CVG zzu)iw^8EjIXfX1ObNkNi2!c36dxa>RAE~_$G{f=9KdK^}cG$tVJ*21Xyl4W%FY8Hw zhEy>PqCk|3*)Ksaf;457Slo_>_wkahy2TpCT~H0kMv&gVf+0#7V53QpRx}@W>-;>1 zDzXn7X2N9H2!JtVZ^;BhrASOFWh73<`gWte1s)2hz!uShI<8rK!H2Es@^D={CNOjj zVrP8Vx>ND+AR5q3fHH0dmq?mIS+Ug1duq0D4Y(>}5 znxdH0bG8qIp00!W*V&3sawJ20{bV2*U@0o-@do+_IFh0mA=vHr3S^xd(kxrlBv7}l zK-=qFZs5LLK41dT*3Fo%kJqbUa7?##YfLxLKmgq}tZ1^Hw>oM!v>vbkOl1Pd1E#K` zYboZHEzARo6jLdh#bwFM;tcEY;vCCzcn=^cx`#^9w1>qu`11cv9RZypYIX9Tx~U(* zVyrDUy8v!B`v_>Tc}&!NcXsOPRT3zFhurm+SC@XUQ9Xj*l+9_tmtr+LHWY=IxWNH@<$Tx}@HA zxkeJ8QdoIBj>xWyi5)XT!{7gKr_u5J$9HG_uYiug;^l6K-~GGe)N=vX$Vb(ti3@-E zD$a`jmiL|V^`*$nv)`ttn2Qy3v1=rEn*ap*RN@VBt=TjGV_PfYFa@2Rn%hLn>JnsLFr&{#M#VMCq56Ccp&n zKDa+5;#wWxC3^hSNQfW+4TorQ03muox&TIixWl&;rsDVQz9kH*7b@KU^JSyLFaZC@ z&wT@NjGS$K7Rka`wY<0hw2{+F3fmC%$q9u`f}v=>uBY9zcpcfU0033P#=FdSZUc)W zfELnb2Y8p#Y81|uffxeaDcj=&Knr;R3?2et3naiYAAu0o5^uSn0iZJh04jDbL#F}Y zl%VyRxZ44(ml!ea}=1%G?snYr3~FB*L&&9^)A%fwN#K55ik%F=U9#{!^DtWKz)F;UmVC)#;Nu=$=sD-9M3NI>UML+X$<*6`ZabXmC09pg51 z4WhSuZR<|8gzM3Oq5{-qcVRq1ktogBNtcr$$qJMrNC!?5IK^Nj$vSD4bfX)O4O&x$ zDBBPWZPj)}*mjqM{0LF~D07+vW z-U$a9L@>(fi9|h4hNc8pUS})5$3xOIRpk$ar~pY;IXw*F4!9Vy${+MNf*v~0t&ugI zlX;N0EkfHHT;_pXHlPAdSJWm&>Bv_>eVd{yTALC>0|9hjvnUHnT-%?!q4j`+Koz@z z5K+?&>g^6xU+UWrbf`+o0r z%WU(g@t0PmNh+=wWLa4-$9%iT}^pR3m5NRjV1c`OnmypwADJ-A&kb;=7BR` zR7_m&edkKaUaMvH#&)9O#mT>YOhmwd1Is3`Y$KP7| Sd?fd?tEs9Bes=Ki(SHC$iSDrg literal 1621 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 diff --git a/src/main/resources/assets/mekanism/textures/items/GoldPaxel.png b/src/main/resources/assets/mekanism/textures/items/GoldPaxel.png index 032f86691ff3b17e5bd0d54c40c0fe8bbc7a7565..a602973dc23023db1823d329d4e1ec4b8f5d7a7c 100644 GIT binary patch literal 1521 zcmbVMX-pJn7+ySxQdCkJqSDHAFo>1e*%@}(osre-#UU)v6_sGM&hhOb?94DT>n_$7 z<**cc7;V7@Lu!qwN4+Y+Ql!>IYrQSnOGDZQt5F+KX+Rppev7Q_595zcGT$}N^SsCR zzVl8|LH4AW=`k9OW>RjB-38~k@H-(Ij!Auw7&uK+9VO~Q(X9p<8E7oL$O0tS&v<|f zFnndjDUhkrjIHn$m#8Jqe3}#eS|*IqhWrv_Yc!ejLlVQ40Tp3^$0wN4-j1Uv;^WQe z5`$Cclx)E3%ULahg{upSxz%MH#iR4*A(3iyG_AR&LbpwJ;RI-*O%b@&)Zkr9Ym zW=0=7RpKl{Y@!ShgEj->2!cS2l$J1<(n&)aLh1+uuA^{5hv^8K(9xt08GTS_P3GOS z%bqoA3+~LQS5+k%$AiJ3HkhszWe-kJ6ou&8>jN^zwGa2HU- zfXu=Ba3@E|Fn7;36b3?X=t9{CFNG<$i(J4D1U1)gM&TDN@8fCG$YcN*GiCsU5i@am zI2Zwok$MyBHt8uN$r~a%Pve_Rl);o?v^%owR)TOCECziBMP(W7CPGhI^|}Z*S5Q<& z;6TK-5858(+Mda!Z8Bg~Q7#t6@<{#CE=(d!^zQc3x2>IXbOZN zAAOgH3SU~&P!*DTsymw!qxW_1>2YM%ZrC0u7bbskkeJ;5V%&R+zv;8QHgQA7;i9yf zn&+CtvYgX5q(%3CuPgY9Dxbt-kdZ_Mm(lh20M?6Ij(l!mXU4{6{O9v zi;r`1sRFN+K#myXltv!SCO=>_2#lqnhw?d z(roEtFm%R#^!a<7@aqW+A2T?KEly4netw~l zVO>sp-^ImD&k|zzB&+xoTF#oZ{%_u}XOE49@Tqx+k24x{8{buk2%E#+!1PK3 diff --git a/src/main/resources/assets/mekanism/textures/items/GoldShard.png b/src/main/resources/assets/mekanism/textures/items/GoldShard.png index 46e009774eb18295f1143367acce155e61a4e429..9a5727727311e41c47449942db2991e5861f284b 100644 GIT binary patch literal 1354 zcmbVMZA{!`953EBHn>fk*#|TmU8j*bdVRTnO$%=PQwTJ@_f!mZM(Yq6TOl$8+;fCObN3D9U- zYy(X|lzR?c0JR9>IHbf|td`hbPSVmYv4C-9(>i1$NG+e$MX3W=XcDw3Y5W2X!7c#CSqJ#^(!$L!qEgC~~8!X^E-? zin)AGaFtwzh&Pb-*?-6_!0N31NmFQ z!C!{gRC=z=+LK52Z<|~D&^o0#8vlK+f#-!EZF_!~ZQD1m*)N_LwEIq8aFo4ePp+MN z&DM?$wB8fiHyo(2Tjj)A_wzyi;_*EH>?TL<)YvP#Pj;8q@40srST=Yjw^Zd@oUY|LeD>wW;y%unJ*Ql~louONq@B=XJ4r4SD@DcXo7$dfI>M zD&OjucxRTp#@>80|8vKN>GD%IsELpN7!Jns4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0006GNklLh1GGN=z(S0%G^=OHNoHr~J}A`0a1%0n=XK6Jb`e>f|JH%s zeJOsWCJzX@qUaT#EktT9WQgej@bu7=Wq?BYvIyh=k<@f{AHs6=Ndiplkr>@<)w(db z`;_a>c1`c1e=Cy&Y#<4pUyS8r)Uamh9Iw}OF-10k{>f&gDh&iusCwD&q}AWDk0uUgz+)ij2UTLB(Be!b}g}l zA|RIMpVfgyQVk=*D%oyy2VK&;QH}6#K>~LEHXL2?h|!P4kcT=?1_{vF&L6KIk5?@_ z6C=lX$Rq(S7K1b>!Dxe|zxLC1`T*aX37`snyxE3ynxxL5pMwORAEmK(a4UoUoAxiCb!B{J zyRir8NV|1Z{%ip@S@cT?5(uy}L}dU$)il5A*P@W%7HeKS&5f#U3aK9lkWn zeSu#L6n38A2;C>4$|6HtF-$ z-|zQ-dH(;tp6+a4wq(^31VNUiIuaQ;*L!cR4~|bvl|?wMbdot|n~`@4q6LtcVn_f@ zX<|3X08tt2zXX~QWMRLW%{e(?GbbCGU-U43S2H0SL7F$ZrYQFU2bDm#sz#&Aq#99>deYRy)vs{8(Yw3mxBTta75JA`gEIfqu7it2iM*)fuS=H zr#FhtI+YXBC~sH*W&8{-lK~11vwn)9S&G_#21qJMP$Usxaf;&TFh_;Z%7Z~`mXhZ( ziMEO@xQk*vj$?8JQ79Drg`nTCx(SM9S%M4@fdCE>xIL&lqKoTxV^tvmY}ryxM>TZR zQxqj*z=>ke)7cO-QxN8ab-R)%m@>i@O@i{1gr<3M&7f^31O9bmUbLMZGy#zTwlQGI z@ILa5RWi)o!wq>r=nc2UQsJeDeF;Mz(17lw5>X6(@hhsr1;Szoz?g9cP+>eG({Km_ z2@lW_DIcNPa6nWWdY*LgQI8*lWe^WvkVQL zNinC+V?Ixl5tfu?T#1Mj4rDrni(y&8rJw>>Qc@HWNLYoh{NL0O&?&;JlmFCB^#~TD zx18$&xS8uCpu^^|V3+vnTBZ=B22CYmS@+tN{le4dTI*l^F12BO!;v+)xWM3Lcpx15UH=kPj)Y?13!r@!7=fD2A)G~GXz2f92x%|qU^;fj( zMt5w}Vk}eqZED)Rn0YobefbhC>{@V+Oh2>Yg$Iu`ywN^UI9WG*{ld?mj$VIdwYGR? z`Ot7NI{oL-j{Qp~eSH@{{QcKGr;+mDiF$6i|e-z$3Dl zfq`2Xgc%uT&5-~KvX^-Jy0YJ6;b4?d{+e~`3{YsYr;B4q#NoG7z4;mpI9wVl7T^2N zF^5xJFJ#t?Pu}96rX4dnu!Z4*iSK4fo_W(Vbb2_t@BHd`(e={PVcwzO1KJax?hp}7 zPfK_>U-}6YnZjCR;DqgZo60P@3Y>)c5C=m zr6f5g28Q-RF5j{h`4Kl8ugFf=)HBH}>#~XcbCxeP<~37peDeZ2kHOQ`&t;ucLK6Tu C`(Q=@ diff --git a/src/main/resources/assets/mekanism/textures/items/HDPERod.png b/src/main/resources/assets/mekanism/textures/items/HDPERod.png index 59957229cc8414cd7bd178e48002f7d7535a08d5..fd919c2b3a5f8434bfd92dff2ed4e076607dce4a 100644 GIT binary patch literal 1226 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 JPDHLkV1gd+Oh*6! diff --git a/src/main/resources/assets/mekanism/textures/items/HDPESheet.png b/src/main/resources/assets/mekanism/textures/items/HDPESheet.png index fba24d76622aafc73a3cecf896c54a717411861b..8122679f1ed36fa8bf0cf0507a8af2274bc6a50e 100644 GIT binary patch literal 1412 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 b8JHO^dY-%>pxCbgDoZ_G{an^LB{Ts5&f6i! literal 1443 zcmV;U1zh@xP)4Tx062|}Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p zIi&s2hVnE+cX)p6u2NZ;vhBTIl(fdrU`rw02%lnWH}6= zJ3=$+EKCX5i&c?c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvGjMjE=kNwPKDW>3A7uk*9@;-E9aur#FG4?ko^1{SSkp} z$S=t+&d4uNaCTPE2+zz*$uBR~1jP`$T*xk0B7bd)|Qogk$fm=G{Af|&4J z0OY{)QEDDA^ArJd$(>1$;ushhyFFbTLn>|^nS9!tDNy8?eR9vNi-xk93;mqz{!PxB zI$`J9YZJF}o~ieXa&2sM%o53LGZylDoPF$g&rOr!gDYxsVoDwqz1vw(_x(5D_gg%N z4=8PHVNFhC_`2D`+P80e+p^4#Hs@>i)XbwLUhP`=(yFQEK-oMm|L_9_Jdq-{xydC*u{s8izXUm2&-`@iG&_a)99J}#PHv_Ilu1y;_UmpC~EDZ zn>i2GhBaS$t5iGDX=4F@+p>kS*lfBcJR9?MOO|Fa2zTG}u98~goy85}Sb4q9e0NB~?=Kufz literal 1657 zcmV-<28Q{GP)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0006INkl=B{3`IAY+<}SXCjE3TS(e8R$xKpMGoD@VO8Q@4GNd%vpuit1@YWZ9JRX0_ z_kO?kj#EtA+A9&@`~AM;ST2|8w@AE~tUWff*(`fO#wyYywAJNX1Wu<@NhA_KCGt@+ zzOYeSo-N7q@k(1dXFwGSOgw3aRpfTNrK+lQUDhsAy;=ac`oG<7b8-u=J1+3$nM@{m zr2rLCSeZ?zfDQ1Ko7e=I`Fw7VvIGD~8$TBXHeQFBwfYKQJ6oB`WYyC;@m@)kngh-Y08P5F=Q|D(0 zh=z`YR!&tU74QW(GJGQf4F!A~NGACsaDf3VaQQ1%MCEJO1_3TbLi1qdx3V(vG7Bny zfHjm+^~5$>poCiW*{C|seMKba9&&yd)gIq_T_aHNOIGNePt8HeluH zO+W!!A;b@kw>GK0pWa_4KmxA{XI&NJGuWWOzf#}}lGq)Q?Bh` z`~6>@|GzKS)jpDM+F(KuB;Qx<4#2q}_2%Zl@!r|Lc{mjro<^fy4H+?B14xyqHUZQp z^UWXtc(F736{tXvHBl+pXf*n3I6;-od7#GR)nr4W)q48}2bpf|tU#xmBTE28!WxJ23dgEJ`9rF+2@m%(xAZ3~m>! za9}_aPFd|uA-k1jDAAVDS&i@V+DWg=>vnl57fE`oPRiqEsVdszw0jt*lg@B`if-_V z05Y~EXnUFKx+Rx$X@ECWEvTw(nJTCYtA?tF)d=cxp_>~dMO0(@gQ*)@3fK)asRM{! zO_kAfiaBW&^MJJQp%BI3qF`rm8)LQOEW@xk4J;%@lOc+-GT1U-{J*Iqpi@MuPX1Fj znIl+?spU!+z|Be@0R=XX2D{|u`mrno$$HY~t_sG_pQ^8H{bF13(+y6OblZ9Ea`JQE zO=Nnw-(-t)C3y+b1fZ+8vck#&3C*98ZA&Z2t?sh6=!o{ zPhRMM>c-TG8>It*VyZ84@#5Lu>5hA@T;Dsjb?UX>e|zqYYZXJ^puHHKKYCI*{^s>W z36repKXPPlaD2LBU3Qji-LSdP6#iiQv)v2GWrNEd-C5S#t$nn=y6fraN~W zn;75ze$L~Cr_$)bb(Go^UiFLuP%nI^OMP|n_5(&VCe2svlV;C7e8Jo{A95O`)jJk tXF6jhzMo&XG%%NNB=3s-F>~Qh^GT#@Vt>Qr)!pfzna@+}KJ47l{SP0W+Ry+1 literal 1611 zcmV-R2DJH!P)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0005vNklZlNX$`dKtPj&!QpTyQUd4ZsI_>OnfbHXY%<<&7fE+r z_uM$0PWQ{@@-cew5fCW=p!4}$a;}eIa&Fviw@G~y5dg^XcqCRdm-a%5VhTJUpiXO} zIvuQjyDfM^#lcqdBEo6qH!F1hk^5k}{7~i~DwV3H+oYCP=A8Kj(-5 zp3ZK!qc5yhtKNp;HKMA87`-yA$3{fJ23v6J$J(kj^~$mY6uhLek{DY=mVgH5Dx*@l z7{yXMNr0dloU&CZ#(4cgpUz1F3OYwxBq@1{0|MSlP-(R?{$y)Kut~V&DGmr&FuNwW z-N%~GRtbA?x;IL|_JReseg!YFN52QO7d*h6AJ>I}?*q)r$!0c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvGjMjE=kNwPKDW>3A7uk*8s0xE9aur#FG4?ko^1{SSkp} z$S=t+&d4uNaCTPE2+zz*$uBR~1jP`qxNedPYYP z+rzir%v!3n1y5>iyQ*Ol@<=>m<(6H4)uZg4oEJqpK2)|+QVLXP5^y|XU_P_*_q^Jv zkM5?uJ9p0V`<>!+iRUu&TlnRV9cPI*O6=MDS4XV-O8nNS)NQ%RX0sD*#l42Twb#GWl7iVw``|3O*omdck3X(x*c;b>MY7HD zNTUNo-TwQ(Mgpc;j~bo@?wtJ)ulfZ7j-x-JkWY3M631lPoLl2N14_KPTJV()_hX4 uLg>Vaw9S9&_OH$_5A|=VulDh0WMdGqWo62nYcv5=)_J=6xvX+6XheAJe5!kde}VP| zF|O-T(M9KU7YqDmSoze3p~vYB)0S3Cg{4=TzOrm&pTH+=Us7@Gk@AJUBYF;6D{NaN zTH_haK80m7URJ)rHbFtA3ht#87>`lzWwUy{ifUo^$TyVo{@j>N4$owfbo5O W_^13QGxq=;%;4$j=d#Wzp$PyGomP4P diff --git a/src/main/resources/assets/mekanism/textures/items/IronPaxel.png b/src/main/resources/assets/mekanism/textures/items/IronPaxel.png index 53eac923d8f6c644c33806503c32a8a49f5f906b..63aee7b852e26bbe86f4927f4058dba888e6dd6d 100644 GIT binary patch literal 1468 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+mc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvGjMjE=kNwPKDW>3A7uk*8s0xE9aur#FG4?ko^1{SSkp} z$S=t+&d4uNaCTPE2+zz*$uBR~1jP`I^eNvdv=v3as?nsKUel7*phqJfEp5>$T*xk0B7bd)|Qogk$fm=G{Af|&4J z0OY{)QEDDA^ArJdiB{yTeg+1{hn_BuAr-fl1fBOz3Y4%lKi$}Fs`aVB&{U6Us?NsD z%Zm;!HQ-?u(q)U;v9Y(l@l4dEx&K)6SmgD*Jj5Sqi3^$JNy%uaWC`d9A2O_6R`GdX z)z!=4v(G*I_h8=VxyAeY1H3-U`JA4eKmV)$^hb}xD{SOme64!&x$@L!n>S_FoNUbn zyYK#}u2I>$J7?Q`)|4$`(>@j#3rDRLds#B8YHu716XTB>yQsBcCpo&l2kZ0O|FNms zD<{><#^SgjY;~y8^(@nt!-?C1mS66idiAS1-^Bk7t`WcU4!vVMz9xA8{eHjY%!@B} zRPE*4d{bwx_fjD@nN9oEJp@Jg-o4`x+V8^C?mWqB>4dXs6HlfD=!hk5zL~HwLZJWn z#kXZES23H;v32`*!uO)&Wafz;EEhATxT@}q@q3vt=f@WG;J)bI`a;E?PH^FOZ)7-bwO3%Z2E?o;Z4plxacx8g^ e{)2lNm>Ir!JS#9}Tq+MLPd#1zT-G@yGywp$eH0S_ literal 251 zcmVMkzf8ApJ-c0K(l=x`$O1SIaa3+&{a5$SsV zjsOL3>zies5b1ix7ogzh002ovPDHLkV1gTI BYQz8l diff --git a/src/main/resources/assets/mekanism/textures/items/IronShard.png b/src/main/resources/assets/mekanism/textures/items/IronShard.png index 0b0d5853e2b0a98d4e4baa4b227aa7c0624656bf..417778eb83419149d0323ba28467cec0a0d1a184 100644 GIT binary patch literal 1296 zcmbVMTWs4@81@v}!C1x6ifD(Xx}HF6!m*Fz#21pLX)bM~rK^&NhJnx=`?z)6*q-f@ zw1u_|D4K-O9;T_&kV?k`nud4)i5HMsRv{=I+8%bP(6~$>ih@K3MHJZ7aMC7)hiVU4 z^11o@zW;Lm-^aT;+v|4h*@0nLUA!ZbMDwoldv7fon^sB^ni`#G#z`5flb0-rg%l$T z@pw+^fk`MSLr3SKAH!TnwRFbGBo2zQk#kFBjJuFC5gWt&!GbBt{m{X)ut(Da#PUZo z1g7u=P>5g)?k|W)AO{@@FXRSvTPy^KbzKpy%f}Rf zuS1;v0I}gzCeek54GZF4x0jS@2H>3F23}SG;0c_efrkP##Rwz-BFl-uhgTi~S+f*X zOh#fATWA*`dL73UDJq}OyYn8mVf9cz5Cn>5D25>sg0zQpM=FrIy|1befwpXErlT1; zURIQ{#-I}*kf$3Vb@!&{%`6ip>*M^?4436=z4Vg_)BfA&$zx=SSYRR>HD7B zR$sel#^dv)OH;uTb>P6?m*lrzP3?W^;Vaj!tx;~bn)yJjo0|%b-4e%Z&U|-!b-8i; zLr-sCAM^3Z>Kn~-pWgq&L$MP#mR7odeJzwuUn!kDSzkLkI$8?=n0SQK>5h0D@C)bH zwrjBmcJFkxyzu9&`QydLi7(G^9{4cx##^)4nO=l)t*YAhCu4Vg@)!KdH&-2CZs^Mt4AIY5lK`f-N(IqM%R*1tSG-5gG(b}vSo zf}_gi>(_he2Y1~*MDO(v-x|O9^oVcq#J4kJ9{=c_$xwUy_KRvZdttd|l51_1^d~1z vy*v3^(Ph literal 1638 zcmV-s2ATPZP)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0005~Nklc|fq; zZnvj*mLv6@J1E%!aJgK<7@%CdCIT%$Bz3>vb6BpuN`Qeq5{JX#O@&tp!fLg8v%Bao zW0iotNJ6L6DGbA4kHdPsezTPf%>)*UMUs^QffTYHD?f-82{2m(1|UFmT(8%}w%hIE z@p8FrE<=$3!4Md7_kADG{mk@yKGP-6+>=OhnAuD+_QcGMRdtoSAb30$x>L}ma% z=3bWj{XT#^2jg(Ba|BR>UF!=8XUNzC1)=G58v6x)B~YAm6cwP8&K@|+!2buW;E0>; z0R_dHHC4Oqe)fSanclJMY6);b1LAY6gP&&F_}Ok%p{WEK?A2V!$Hfu?5j+X4qe+2M kFjYtWl(gDE>p!Q!4=dgJ>*18~z5oCK07*qoM6N<$f*_d@ga7~l diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliAxe.png b/src/main/resources/assets/mekanism/textures/items/LazuliAxe.png index 2ed32ff19eb6203ef67c7bc98d8398e2ab58ddcd..61d69be574cbbfa6e3c2b0943d783e61164bf125 100644 GIT binary patch literal 1413 zcmbVMZA=?w9KQ}>2sgznxYnsVZi~8w>-DZL*LIWwEwv~GEJRo|8`rz1w1eIqcZWS- z$>xZJg|YdPWm~pnIt|lJ&3p;L7zM{n*cj0`iW;u1k#q34yAUhToKQdvs4S+%ngqqEx$rr;PIyi}lQ=d9 zQ5#+Oyis+5D$FCw0J9pc1ZSctjByw#tHnW4`50}Y%p_$ZX$L`3P7C9tY}mrUp*EQh zJA+=|f-ZP-;Sp7poFo~K$Bl8bQIs1<%HeR3CYq#a0wM^dRZv-t5R|nk30|OZa#T{I zqJSkOvLUfWb>Yy`c^6_*Ah0M{P!<9OLq=+>L{df*8H*+TnnNpU5d3S#l4zx-RRUxX zC}NAu!F+_*rpPdMcUP1ILTj9raugQ!&GMO)wc$DI{2ni>)ON%44T!%2%4=mI;c= z3LHr3jzZlFT-#l_PLB*&Rg`N)u_;vrRS{7Ym53-|9uM|JZB*dJxUxQ(p?QbBK#slu zc%LlBu(=RBqf4j{S$GQYfF~RbWg@~R3r~b-8W2{-W(xy5Wuq7lU*PlqH*_R4icHqY zf9fXn1dB0wT<-;ydXInP$oQrGZnSw1 zjt&5uOk%2#0>d#4Mjsg2FAjsM+4)PLTt>4ruR_M(T6kD}REw}r0d{B$a_ zdL*+u{b?evUw3~xH`{SKw=n;u^>@f@)ixX!CO4r2Th?&>pEYg}$l-x4r@G!XT%P(l z>j8A?XdCJtm>rx>Ux)Oy{`v+}e_?j!=IzA!ju?6_Ki_LW`V74WuQV`rHbS2JV(?nG z&YU;?k>SY7gVGOZ&j#PJ&8JN}B8NUO6ummC&v<#O*;j(ELhjKctB<|zf3$n6KKWxT ME3NRpUsAvGA8fSrng9R* literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ4W2HJAr-fhfBgS%f7l_ZE%7l! znBnXHCn}y;Fr+PPcw8mov&Ok?9rFdcYb_P#ZKbLh*2~7a$)merB diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliBoots.png b/src/main/resources/assets/mekanism/textures/items/LazuliBoots.png index 95bbaf3005313cc54e14f2e2c86d9fa1326f119c..4048738e32fa145af1d64e0743970a2947700900 100644 GIT binary patch literal 1412 zcmbVMe@qi+7(T25QDAJ~0A1qcn9eO+uXp{$os?2qs$DFyNtPET zH$*$p#AL~`uxWIeTXbY`(`AmuWGH9?nq|o{0}>a;BDy~o=z&iyceKl3cYAHUuf54fbC|gjt%xvCAP5u|jRc#85EC(B3%U$kr;Z5> zU4SS}CT!6ux3dnliZVd;YCZ1LP$X)k)udiWlVll6X-F+WY6yzPNs`eS8Pb3*Js7km zbAHBUvoG0#I};XA6p0~-a5$_EYt^FMNRTv56B>%3C>$d2P@ABz5nKqBrWI@;ilGC{?EQFR41ye>uScxFj8X_1>#kGJADK7A@8!Mti^=%R$ zTp%R2%074>{?arV=I+^sQb6bpvrFdTrLfI5(bpOTg5t25F!)8y@f<@LSp$GE<9a|E z@p7LI4o2X`DP6hOU#_E#6sJ$?ti(6cHiLzvG*-LLLXtJQYQ4Rhw$e7zV71daT9@WJ zgpk4tK9IJ}L)(j7(*8^?W0e7`h;qFsHm9qgE+8smC?HCx)rxLy-~~<$hh9zH&|<(g zAoKeGXP3nwx{zXqU%`BNIp;GN{2E;A2Q04f>AW}#!^U-9mh*c_j`On=w#4WDZ|Vr> z6p^Zv|I|(T2o_^%x!eVCv)o5OfXySrF8L+)=OYBk_|jps)JI0WiDc5O+WcNuM|IW3 zj54(UyGf?AGjEgIGx}kdWCj!Ww12#?O`0eenB3w#ysl~$dL(*bC@0Y)Y`vVAd-8$h zIvVZRGrIb#%+FsuSJXT5aq+5`e!cd|mKnpf8*3u&;!9`$ioKsvTA=Oxz6%+!yu8ta z-mL8&kKNuio9mf)zHwy#-vtBl;h*aY$#18r!K2@3?;e;vF+O%?DyMHgu|3!3M)sN? z9vi=NO)k`rUIIsRlaetdkaFPTkuI|@c$?~u=ws0D%b-2XkR zCz0jK`zSvBNI!5SK32T<^r@S%2l4&UjoaQz4wQjI{Qbh)T;QGaYnl$W9C)o_=he&e z@t-7bE8f{#lV@d}X4SfL`R?cLB6;lk=-FGhN@{<5+W)ENIyXej6`mEC$>F9Y??p$ZKDnAzdaVR$V)E@0KSCWY*k23?u(b9^2-FJ#1=kdFv zr@pBAVWvve_gN-37=0yv@(pj{y$0Juiqu?`$%Ae3hSCRQUPM@(twAm&zU~>G&pw>` OFFI;!Z5OINhyDR>qX%OE literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJHcuDFkcwMxrx|h`P~dTm-7Q+w ze4+b`#=H&gK8hcvUvS83ckB7E?frM&z#OGZ|CUU3;9Me}kXD&wV&2cd_3d-ew#C{m zOKQ%ZS8fm$?RfTFaD}8s<5!k9rBb3BD*TJ(7}qnfyR%OCT=nK(4b!&+FANx;EVBK{ pBCui4->gd8O4e85F-)hq?rhW+x_{BSq8sQU22WQ%mvv4FO#pc`N~iz; diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliChestplate.png b/src/main/resources/assets/mekanism/textures/items/LazuliChestplate.png index 85042a4084d31dd0ae2d3cec4712dfb71c788a75..0ea8b9bcc67bd772863b1ac77c6d0d8c91c02491 100644 GIT binary patch literal 1651 zcmbVNZA=q)9IhZzI~7!v$&4Nc7>8W1*OtD8s->k+p_Ml+F~;5^ z%T;Ha(kBaI1Uw#ZvLQp4%gvF2mp_3U=MIga+%$_#D`4|z8|y_Gf~Uc0D*+f>sGZ0q zP`qT#cSH)07rKVbFJKFdSt^Wn3DE#X=ySO_HjkIG$md2eC&2<%!cJ0ZaPZ7I5Fl|i zXiheYjBYLAATvrCBCphxkCi$xB@QlH2&DK_oPdj9QNZUaq&zC08XVPCaqGY_3<9GN z)~NsGRVuW4twti%>m)L% zOs@}e4U~sPDU1l(COO+G+h|1f@}xP(jEux2DDmWzL}(O+Uxl+ za6_*H))5R@OyGKkb^)U)R*`QpuTbEaOlA{75*vX+B1~$9P%dmpYDICI6~S>EDh9{+ z`2S5E%sB-I>f}Fl6FlOIF|d5o1>ELM9}yJSJPg+*O-1ua9xtTcpws00Ztbnj%*xY5 z`A5Dz6(KxPx5K1m7J zhV}d!YD(dA5+wC7=B^XNA94 zQc*b)%Ph+5qn9V7HAEKFSJc&2r=};)G~@A&C;A^1$H|ZL&R?;0MWkq`pToYKc0aQA z$?BG+hqfne+wgI{Ff&_q=SBU%NG$5<}-j`{5`mjb^qQYBC-kU^L z9yqeFdTY2DjQGi)RoVHV%D5vWhhDt4d+J{)=Q?mfS1PihVcgXhXB;E_W(YE#y&rn= z6+FL2E6U1Q)fYeXQh32W*I!p(JvR=1{PK<~YFSULur=!Jz^aqYnqf(E&#CR{1^W+u z8oF#}##av$iQV=4c<)0kw`1BaH5~-U4fdbDs*^q6HNqG1Vxz;8PMyx^4*UiTX(rvV IRLlB*0Eb>@rvLx| literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJd7dtgAr-gYPCv+bK!L|~@3*i5 z=9fycONGmhh_pET6!2M_l%)Nq`;SV$3oEl=>qIX5hRTL1LU*s;%I9YgUh{kA)*Sa~ zQzZWC-0L??yU991NTFfM3bT9s4OgOa=g2dd6)EWHDu`|4SLj_7p17MK=SW};`+{## zcC|a+Fc&1OzxJE)f}ERUrvYs diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliHelmet.png b/src/main/resources/assets/mekanism/textures/items/LazuliHelmet.png index 1cfbf231fba869783143c954898a23b2e451e05e..2d619d8026ca018f01ae925ce30c08ea79204722 100644 GIT binary patch literal 1315 zcmbVMTTI(l7&giXT^qWw7n(AuuA@!sgyTz`o0W`0oIo@}fg%xUYKmi@fCsT1+mL|N zvhhGWZ4;gL&{mr|R35rsRI-<~+SC>VQnd@H+8&syN>w#&Ri~+8VpAuT;GFu`!^v)hk>x#1;2>*8pm%9Z*SaNHRI>Vk(hY3{%mGar z0%Al{(&&1MS!o;dKA$LfJSh@)r2vnU0+Ymf7&gu%c`=owL@~wF*d|~6zo{djQ$(pw z{!=&QBUp^3<0YtAH? zsa=;ZX6)bt^eb0l_q7UiA<+@Gt^GP?t9^V7T>tC$s=4U~(|&wy?Y8>%cVhnB!`l~n zya#`vAKv=BBM`cDp?+?0WuHAUy1KAje44dJQbX3t%#iifNMzh`d9OWjH2&?5ALqs% zw^k2VjGz6aK$2hNEg$w;e>TlEGEeK|YVpJ)+-6xk=bM>v2#d>q9;~yRIQ5dnac8nH zebv=c_UGtKPwd8UAsAc{#5tu z_=6{>muy$=Vb`ZVdaJ3nb>+Zavw1?PxpC6GfAmOY^ZljT(^dTmv3kcwN$KmPx>KkSgy7RcUX zm2kqs!PE1ly=KJ^3x>1>4Uel987%iwlHlg%ZvJ?olwsG=7Y!4bJ4#PnC}!9w#&6Gl zz+hbt`{s-vRt(3)pC=ygz9?(-s^Q^dh8d2^#~EMnDQ+ujT)DU^*CK&WB3HQ2D&Y#_ c;d_h>{7>!9A9-iR4Ri&Ar>mdKI;Vst09KnqIsgCw diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliHoe.png b/src/main/resources/assets/mekanism/textures/items/LazuliHoe.png index 20c8e0e8fc23b60f56142a332eaa70b9462c0378..cb36b363ee1f0c1d06cd14be2beadc6302fe864e 100644 GIT binary patch literal 1270 zcmbVMTWs4@7cx~&^s1*2gPvs@6M;@HQD*C_@^cf#`@dwGUAw27)nx7_b*MjY_D{iM8RlO$ray9o3=KZIZOeUIFbvxk?HA){Zg$_sO=#TxM^!?T*XbQ`hK-byl`M#b6(b4p zs3wiUIFyw9{(0DmVGaA$#E3HzdrXiG%_q4SUrsX-8^b!ga;79_po1sjn5u_}-_LzP z;HnZL_OdZLW=3FI?JrnxxGVj$;ZGmCa^-S-;P)#wft^JVi4U!;lC;+IiiPa-?pz)fGf&%a&?7s-feq zqLefyoDhLLT?;`oW3hE%-L54HrHsl+CIx&nrD<+lt7zMa!++h_5N#*&CZyufHYO|? z-AAgePDZ)Ay&)Hfyb&I^RCFoQxM;`|8q}Sr7$VRYpQ0)P!%0DiVkTJ#II=?ypn-!) zk_mJqQyl@GV-&Wovk{*S^l<(#7Zhol1)w(&4)Wo?-f%d~F)S^DzB)Im+m58mux?vL zwrgDWwp<}%LCG18+QuX5SSFLB? z%vTn!FWx(8P`>5rpVgMO_Fe6zW6xB7`pqkib|3IGUEeX~891}`UD_N-GoPJ1dm_BD zoZR%(j^N~z&yUiFe?7i%vvRf6($~Cl^Tzh#sp+QT@zcAD?{B9{^H0BZ#6GWmjjdFN z=-0yi5598chpVqPRgT6|;^yMzCHa@Gxl0wjEajH3wHN>Xc(J?uvbV9|dB;0{X}Y=G z*gc2Ml-uw6{5kRdowMSp@+WtL7c>4n4O3^l$2{WY=`!}x_yzh<;&l)wKE?1^?8D`P U|BYt{ite8%+B+zo?%8+vA6S{aw*UYD literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJrJgR1Ar-fhfBgS%f7l_ZP4P8D znBnXHH$HqQXE>w8c>HU^nbZqCO`fGEE)+AY(|8c#$&y^s9+AP-RJfwoLV{nO{Xvny z8AXE_DJ}M6MUP?&IkuI9ZUGFV)&|bMa*3vM` zhvLU@8JmL`oYIWNWs2@2VOus4WJ{(RqFI+2;Ukg&)g&M>-kZ-KJ?LHuKv-1~LE z-}C&Q=Y5_#T2`_%B{?%$Bod`q3(e(lPK~~a32@vz7op&kAz17}1?v=i6bD2GhNS^w zbyL-#98gSS{Z)`J5{c_wHoIUiF48(!w~UHnWPZ07vPGhNz28eYYJq^zpxWipp^v`4 zj3O>ZhgPbJ@nWwD)VK-*9HzNNtC^~3^B1BKvXi7)Pc(hL`}*Fm69Zgt%w{a6c~YHa#BhVTBTY`SoQ^XIff!=7nie z&-~xiVNetnt&{)MP3#C3V|2OF1#q*{N5BJ{hl5=rv4l>GL~&QGW`oUtn+``Jdhv_R zM_Y_Tt)o+~Moxt;o_(OtQM@t|2}XwKj-sN}KO>iSWF8DE1~p{b;kfs&N4~rML%MnX z=ZsCid^I}r`+R)+#Qy!n%(*WK@3D`G@WS71lebQih+aXfnmap>wj6%0!c zp6uX2o;b}mrSBa`R427}Dg58eJo&9Up`!O;SuNE*o$(}Nu*sj2l)I-SAtNcSePijM z_>I|(U&L+QcSW*$OE+=q(%u_0kLT94cb|2x8EHOg82hv}w9W9=@J;=5-|xJ6W#~xO z@$#SMtHz+DmJ9Q1KkIph5#dNg@%fwr=M(X8Q}E2><3k^I*gyCq5(!G0u8m2~-=)hs zgZJ%K3>_b6dvkJpHq%>lzi3_WjuVwOaYnrSxZ%fhr$grl*5?jOx*pjVI=sff{G_@q zXwKZ1Ci!G`7oK%#CVl$lyRs^0bzyxPu#^2+S^mWOJ?$4uZy3KFe`ot^>EVTuaogT& zL)m?69!}i8v!VMzm%Pf~5ZH163r7~#e>8q@a^lS9w}<}PuzPHDDEE1gN*o!U$=ub~ zsyxuhC7-w#n%ea2ue~pX=ZCX9fLj){cl<=CFTpps@8u1 D4Js2E literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ0#6smkcwN$KmPx>KkSgy7Rb(1 z#jc^L`FA-Be=Pd}9)W@wf3asFo-E0UiHQbszxW*3m9H}zG#5U6_?n@lJAv)+hZBVi zdd!}o_OBWO*?X)Kt}rgzopr0Kzmk>;M1& diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliPaxel.png b/src/main/resources/assets/mekanism/textures/items/LazuliPaxel.png index 9931890794e00c2d8b3f53453479caba254bd1b8..912f45497d04a3698e2b0109cbdcbe2c76f7cbc1 100644 GIT binary patch literal 1544 zcmbVMX;2eq7*4B52X#tqL;*|JjipN2>|xF=0YerfjL{G>8hgnm`z35cvdd;6A@xES zEsj`Q?B%Ek4l__}e^9hqlw+#aUexM1t!Po&a#*igryiq~ZjjjiaQxAo+3(utdEVoD z->tDOUN|)_DNZJnO*Q9HHffHJyiZJ$#%HgO($bVD<~YPc&MgLM0mzID=LC@1M|*$` z&`d??S0FrsqA2?CK2NT9+m(jmkjP(&3d5O4`BFS48; ziYU@fu1qw*lBf4W@bMPQ17Uw)JW*20&=Ad|xDrEszDQhS=zwSg|GM!|biiK01Jnir zT$$jK?!&E!lBL`|+E4^2c|$G{Sm{#e5{h$``G8+EQwCW2qGVWxB($^!NHHU7fNK$* zOC=3j;6w?$BjfzP7Y?IFief(IjU@e(i*W`Ttnd)h3SYW*X$37 zwBH4ywpq#cI9LBjE@=_~EpmdL<4U4cU@hiEE>O(zkjVtiUB>zuE*O{>xuN?3Q$S$L z0h23mK4>h(B>NEaP8EX#1~7AOND)YBX-3!!@|p1&{NY|C>5gate*q z$$#o5dL$KNWci>Aq|Jjq0)DA^1gT3D7gprUWRD|e%4iSuZL)puecCv4Ro$hdjL*5K zu~B1b-LP?DZ9xWAeI9R&>8XN-tR=IXw=_1-4aMJ`@X>)cp@R6A4I>TmhHF;5y)sSS z?(pqy+UIml`7YH`UiVB;TXI^{daLMmX8F+Hx7_Qk`3(!n9ZN5^gr?cw;rCx860#2N zY8uSgy!ZN?xATg;*v6_?f5caMpPX46Iy-EC0nPv5#*V7z`2=@M^`*nmq0=)==ic=$ z=!hBM9sPqxE)CB+@cTrS{mhN8d*Sq2@v&{+pL>@Vjh;1C6m)kCROe@6^>eN?c@Ez;nBykQ-XmZ0&6I>w zLSk7<=^K^}BlW8mY~A);?UJ6LyG7*xZRKg>#l3&7w_<7!K$(Gq_T*%e%RY{N@QC-2SdioN6h zZ2Kb}+Q($Zw#(>;eJ462|7LT}V(OFZqILfOF2g@- literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ3!W~HAr-fhfBgS%f7l_ZP4PWL znBnXHCn}y;Fr+PPcwA-h%qW8`IY`#%i%i4mB#CDso-D~pvPLB`4kwaIc!KknY4RL% zzR$R0ldP3nf7i^&t^^(JbIc&276Y9VPoF+LI3wVjj2&M?UFW7VO+vyxv?|vgLT6d1@$Kalcbk2zhek$p7UyMaFsO!!~R`DuiFimy#o4;!PC{x JWt~$(69D1JX7m66 diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliPickaxe.png b/src/main/resources/assets/mekanism/textures/items/LazuliPickaxe.png index 10d7311a19a66068a942a0434a499815d4d8cfbf..e4764f0d2a756395da7b32e1dd6bb80214903138 100644 GIT binary patch literal 1444 zcmbVMZ%i9?7{09=GHjjuKn7&W?Qm`jwD+gi9=%XIY(W}VsKA5|ID5VOm7dUExn9>o z;@D(1C`-l`GqPzSBYreUqQ*I86oIWMWvCISGq5qEA2vgmMR1l;uRzfcWFNfbe*f-y zp7+o1eeW%My&k*8d#tX`@STvCt`0aVHfP5@gy zOe3fU4A5vgw(WT{e>KH}f z6^PViL{^=ux7lH{AOcvY(WzOCz+uXu!F8ko$BSSB!?h@mp@cz=<1|UpxE@}65ZRi@ zx#((3`I;?xXGGkRV{SW zwg8bo0=RNf@W3l6ruhxbJ4p@)9N^Rj3dhtgjO5f#f&gkArPsSaF|Nlc7FpwS|2K80 z>=c@+lmFCB`baLu)N;KG{meShL&(5V}(xljP?DVr4 z6*qoeN+uFi$FWXKftt3DEDENa=G^jZe6}rPYfEMLF?5K%1i2tZ^y%LC6BjNf-=7&| z9oe|!=GiG%Mf?Y6ap1Og176&MdPz(DaE9 zPVYdLX1}#}-inO4JTTn8bz5cl!HxWmSeNUkiNBU+ zjN#zHua)hWhsFeGN|k&{`DX6It0C3&-953Zk!Um;866#sBpz;=2xKZoPtM(%%$Q5Q z?RYmId9Y=3-}NAowZBz6Ffh=Y7wPmpKIPio8xt^c*ALs|ueQm@gOcQ3}`{=q-n z?e31v%6(&*FRKDQJtS%|*^SY{!K;URFWsE^cs_aPOw}gc?SXUl!`)a_@>-z~>lL`+ r&>z#UhpC-s@h|Dmx)(m*0Y{*h=K4<>547A%{Wq;;m6rbJ9dG;tMr#(~ literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJZJsWUAr-fhfBgS%f7l_ZEs&kZ zl6^y0L& z(qcbW^e865=8LQY$KfU!+0_;Q4eyJ!aU1>xr(3K`BM#dPw{b4ZLVy41ZHJFBwlv91XD&!RzVI4^>bP0l+XkKRU%s? diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliShovel.png b/src/main/resources/assets/mekanism/textures/items/LazuliShovel.png index 3c2fc7a6f0fb831e43eb67b8d7735df87ec461f5..a9afb2908ef38bd895961d893e6f2c527512ab49 100644 GIT binary patch literal 1485 zcmbVMeNYr-9A3gwL=+r{4=0Cp)ft_<+uOY_cIBYs4&;|+jNB4H$I~KUzb8qPm z3Jr~MluRcy2TPrZEEFYRAh8*6=s5BHYQdHEzlxhT1+XK$}gYl1cX5X)Up6B=R z{(ieNC3$7g%=t4R2nsSK8q=gX*!#|SMH(YVo>9^iA;xElYk8aKrUU@#8QuzDlY_E@ zG(a&0o4*0k5ahp^wPcE!<|LBl9dgQxk$W6Yi48%~u^uNy=K>M70z1p;ko#Y^ATZ15 zkPNk1VRjloHk()|fVG9m7P>H(CKx0(29EZSl7It<6zp;2aW2xML&kMUY3)5m5qKOT z=IW3Mr!vhcuz?o232^ofwDlLg=;K>J(tO<;b zOfx1-+LCrUBwG}nB#OG-Zn;}2=LI{85d?uMa1_U75<=!G;6%zJ<6Mh;3P#|f1=cCD zJO_IfDJ!2Z>JZ7(i4Yu4v-!C&=bB8Elrq#qIZ;fmKphTmT;ph$mGAcWr=1Og8UwujCzaba%I_u#In>^JGR=J zPxYo(j$Dt=GIZ_r=tBor1y4^Ms2JXM=I-mc8>ZzCZV*$0_2Q-Y67dIa*XeTy|M+Zw zXwQNAz@QIKT(&ANHRpV|qUo#mvhLqId+W~cv9}5iKkFO~T(;!3V(Yx0X2+aKztT2v zl6-%`pS3IAGVhuG#^cKFoP~3D?(8>o4n=<4!7ScXvvH04^FxoXo90Is^)=q3+lIbDDjBh}d0!Z>{*oLsVw!K;8=xClDPLVsvhH%j zf>RB)ih5Im|AFjlR}7!#AR)zb+Rfsz^gGATkM-7uCn0g81*4CK{rb}*spFlc7uR{OQ^XDJL`enh7cl>sb2w{Hh53H!+ zZZkJseFr`D)$fRw19xw{w6KUPozc>~J!N@CU6p_P;;O`?ee=FQbR_xcmZm2iC!fTm z{#aKgdft^2iM@UH)~#Q*H9bO{gNu7MlC?qv|<>y+d33p6*Kt y9}sS&EgdcnpM7*y%-c~T-3od7=?k$hheJ?h-M+4X^26RAtSLU(crtF&wtoOFi7wLs literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJxt=bLAr-fhfBgS%f7l_ZEs&ij zntel8Lxm1Xq#52(JbaF^MW^j!`+DYt z8&1I=>^X$9KYl1=IP>UIfTh7S;pa@rPGbDE><>0c*cM(|VgTe~DWM4f%J)#_ diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliSword.png b/src/main/resources/assets/mekanism/textures/items/LazuliSword.png index 78246d88cc6445f7e96994f5b6458bd15edde656..3a66d0bc0c54357ea56c6c05c7f033afe55fb0ff 100644 GIT binary patch literal 1594 zcmbVMdrT8|9Ir(MnMP3O5LC{?$ediS*9YxgDAE_SNP$5opfm1zcP$lqSFVRG%oxGN zp)M+h;e4ZIn?}J0gZLPtOhxcD7dszOvnd&%+Ym55W(K<=b^F8k$9~E0d7sbs{k^rB z=_wOJBSQrO!33j0m&Na4{uwfsU!w2tYk#>%;ImJ+B*#zFx`2X3RXD4Z-Q zYNrwef}kS1IhV^drC|i)5aE7|$m4MGY=IzQzQ>6Z1r!HZD4U&DfxRbNK)_C_z#O?r zY;tO;e7m8PrLs%Y%|vMdfs)|-L?FR~@d6wahXWo*A??CEDsWgX#-IJqFbE7oxB?aU z%BWmZCZJ_l3XqHB5FwTzfC3dEav6#saezdONMS?_OHc?wFqr~F;(?I?^4eI^ie>4N zM|ANw6`0R)P7H?KZnwxS6)~(0Mo<)m#S&N|fp`SuDxo>t1JSOSfCL@oB3QeVvokc{ zmxx=KVon9}mcDYq;WU|E3#MHof#O33dvGU=h{UkN;rDA8?c%bif6aI!+GQ?rQg9aK zVv1RU&xbW8K;~ojc13<5Zw;2g+WDm5g*t{Pc2G2D)Tu!Ji-@$7m_&icQ@qcRoI(_k zl92I>g0esonbKla%20)bln3OziLcg3qEdalHo!H~ zE)J&&DxllW>mK3C-pa+aEQNCnYi5|jKow->GaTc}XPkgm3%s9Wr%A@`n(NQdD~ELy zYhO;0$t>dlhC__m-=N+iBN2+ENC;IRV#q3%k&s0qp&+>;KHf?xk$6NwfFpeJ|Ar3c zje`Ak@}Ig1Jn_ZoKfdk){_?tyD4K5`mhX~%_q7!QfpDo&r#5?T*JdvC;Q|&!kE>`PlLh{83xp!6xU=-E&U19}S!3t?BNNRGdvay1n&8W!0FiiVlNu z+uw%p0yO1d9EFTE<(AzEu$Mkf|I%k(h|J`KG6{#tIVR9 zywRGcJ(*MFjSKS|7afjU-_enJY)$fh-=cTA_8$PB7v)IFb;AD3imJLKa8_ogXjI#W z;_<7SU&bA~cFi;+*zK)rp6me0TU zjG#LkvBL-I$JH;k9r?a?Lm}+j({f<#?vT&nLo)}bdux)m#-`9`tg~vXW1#NldxC)@ z3nHdXUv>Vb!MdxF_(ebIh5n-o(**cVP}%HhPxm&~MZFg_kvLafiZs+z^d*+HuN-qI z_WWs2@R5eXKYA6F-neC+@D0_UhP3oN=-IOF?r#$N7f+hN{-)@*f+ls{b@Ex#;fHnD zwisLAjygeQ|N6~26=|J2pT~9{AL?4H{EnFHn<^Z1jy=;iQzI?Xc(XOj`)?3OZxxzz z8l%0@n>{b?!NT$fZrxC literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJO`a}}Ar-fhfBgS%&unY3ddAoK zoEeEXtQpcKHaxB}cxL*V{qe*13^8Jde;mHfcqED^*uF-_Vb#&Y#~GhQ*;L3j#D!cs z^+@pn!%hYcH{*^dG5$FA1<^-VPU1LrWn0Ays|KJ*9lJmg$5Id-k-_zk{b7J~p~0~N zj=mhLFR~1qcbJ6m^*lYY^MFM9=UGneJbRcg@V2m8?mBv;%%W`_v&B{812dv-X1}m( gxW#&ALLmc#$uz##Mo)!2fv#upboFyt=akR{03v8xtN;K2 diff --git a/src/main/resources/assets/mekanism/textures/items/LeadClump.png b/src/main/resources/assets/mekanism/textures/items/LeadClump.png index 77ac97addc3baa7ea9cb75c241e8cb93834ec262..7d3e6b98c2807c0421b2ecfdc47ae2f2a5c83c54 100644 GIT binary patch literal 1369 zcmbVMeM}o=96n@2gb`{s;^s#@4~)RLUhjJCeT2f``Z+D@3I-%I;o5skFVJ4O9_vAL zQJ5q~o#G-hAwvV2MdwK7RN|Z&Bm^WnX6%+2CT^x?E}6=7Dj9LXw?NT9$o}w>d%x~^ zp5Mp&``wGaI#)s7{dow26nNZrKb#HeH#Y~458qrC;j}|@G->rpNK1$+Kx!l<08mdv zYz2NGN?jc@pb|l{JLHBYt;zcYA5O2&P08K>oNP9HS>o#mfmxt^0F@d2g z5UtIItvc1@^`U~I0@Px(;6W2bq6}vwEi^}x6)0sQ%>-#8C=Mq{o@RK`imp8vw5CcS z-fwrV*@8P87S^;FPY{Vj!k91{6}6QhIgTSt6hToqMBwqRs3z)oG+vxhu!DF|m1CN$ zMA5XO7*IMj8wNdH4IvWqde?=c@wG(3lo7fZBS@o(h(ywHt)SzYAN=dahUj=hR}2t- z5LY_YAiR%IafS?YcV|OsAoPacqss77#CE$9?2Le@=CRu__{Av65>GLr6~LHr3m_Ss z4bpI6Kmey`HV|TIj-ez=MrR{F>m)fd%dmn&u#%*MuCWNTQ{aSJb1luV&e{yu6OC(P zGzc=bWoUbi%iNL63n~ybMQu=&_DmJ{!iuKE!%7Sl1hlkKj!H@*UY5S0)qw3lmG=Y5 zsVWh4CB?kFfq6ih#88N0a4E<#xP_rvoMRXcw*nJMS;-JZ(G0f6m;P_+2~6ao$DeHNw5TYbkMJ%TiV(uldJ=wY+&Ze`q#5+msx1?S3aY<+#tdIDhxzck$U2 zc_`I#JYza{_1ylPs<)J*xBe~* znR|Oaed_qrm?8IrrRqo7KbMO1A%T5xGE5&F-Qz1S@|_s!6}Kz*^t<0I$@g?m=#>+J zlO-39h3V0bOJ}mDPnx{R2gc`zzI;gNFRC0H^1Zk3>sOwA@`d5QT4r_o$lirU)0VBh z6G-8!i={`-`znSE#hX>dz>($CmJ5fUPdzj2u)Y)+&<(D!og?!DZ_E5|HLlWaw|@Dd zZ&P1NcNsP{4LFhug^vu{u&$ zmF&ChuX@e>^GLEE%`N-l_nohM#Gs!297uh1I`sK@{F~|Ad~p3r^Ubr%Q$$t{!j26# U-@aUNG5xdiIO^=9wJkmW07#qUod5s; literal 1695 zcmV;Q24MM#P)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0006uNkl63(1lH)Qg_UJ%BDDlcQd15o0+IRrJG9n~DzbIz zH0l8WRR6)?UCb?THacUCFTcg&SDd*(=@R&7pOXiWtTZ5Vc=)z*JRW~he^l(l;fIh@ zV}k(T4oYBdbh~eI=4f*gUaB04N)M#qWOFi(NHQm}|Li1OUVL(wfI|KL$BHf8WP8AC z>T7~&wpGK$T%*zFIH%wk9o%DL!0Incz#B|!5;z%dkJO#cahT0U>ztFxx6p3C3MeG9 ziX+DRi=Zq4WmCs%fBWMs=*F^XK6-f?mk>$^aiviqK$m*cxr74tuIEP6>3PhZD}jR& z?@H;cLO@2%k`5^ym~)ygHz33ha_)mN*wd$2c?D@g)n9fJN={~OM7^Z~egJF8SNq(& zp+H&&f+W8uOyvYv;PO{&>gz-{K14cHxAGnECnOa}O26HtI=N<;&uqa=0er~TFh pNT5DZGUmD)yYFtjQ{cZ);5XTo9du-~;M)KI002ovPDHLkV1nC&H2eSn diff --git a/src/main/resources/assets/mekanism/textures/items/LeadCrystal.png b/src/main/resources/assets/mekanism/textures/items/LeadCrystal.png index 07491ca905211571054aa92b3987f96681e1c412..b4eec10e081db7652a02ae323fe678daebad0a2f 100644 GIT binary patch literal 1362 zcmbVMZA=?w96wRFxn#H|C*Md5Rr;85f1cB)G|lPP%H^OIpd#`{32zq?4=<{oS&nq-9hmBkuV~m9(IvautieeFt4*?AhfJ#xaA@{x+ zLSRv_Av?_;+!JwtDzT(a0p)e2KE5u*TLq-35H5((x+zK$Pb z2)qE%LN;X4DZi%-cE}2V%|&s z0P_M>u2FdXK7yGEvYxv~8;S#UZ|GMQQNI+fnw9yQFpxAiYeV!eMnM#4lH&4#9y4kN z1ch37lRi)&fRZLlAZRgJDN-;ebXMZyCKKag8K=WVvIOBYF}RtryKoCjAwC!XNC zB~{}j9wcmwy6q({`$#VBPynaNicglS6ID=FC2O);B}ZU~1Kzw-lmt1dZi(N}V!$j= z#CL$;QsgkakYZX~!8{;vE*K;!RNyTXYNkvU)JjoSG#}sunNI{s(nKLkeBuA54%3~& z;&t+$x=9@A#TZ{McY(fH?js=S&7Spb}*z|>R&vwS1V!J=tw?Ek1 z4pKU5sMqBE^w z^yxqA-W++5WIG)GU}D2(6VdwaV#w9}aF;=(zW90iV&_Gszx~CIn=O{7_P37roTR=z z&2F5oz4Br5sqx@%Q<3vu-C%OtATF!JjCH-1I(#^1b@Qj+g$&6j0@ntU@10F;go|^y zVRGhg!^h*RKKk4=d-+|~D7EezZD<>99m`rB3iOWf+bWAsY-KiOT-sr3tj=jNv<&ps zKe&@uVQ7Bqy|JS6XR94&a+vJO-z#$WlyqnBdvbJl!-c`5XYOwOahH_dbKs5bJ>So5 z`*QLJ`(#i3Ok3vHL*28DX|rRYgU=s7y6U+bf26#4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER00060Nkl2f6kIOoqMD`^I0T3q5=0X` zd;^yMAp8dsegj!Sf~f$3X)sMwMFp-YOq02pecnT96G&Kd&hDNwJ7@NBuXF$HH!E;- ze7W2!=kG(8a-E zG`d|W(L@4yO))9uid%q$e*Y?!=Z%r{eE!C9^OkuE0O#Th)AJes!*IgtYM z_g7+h)_NeJ*lafPa!Z|vKq(m2Rn=}C!s=W5hfaxG$pXmRf*M&I9748k_mr+@b#ZUP z&`ACbGSR(-*FeZiI;XLE4HhTyO zpl5+&YD@Ea5RsGmt;;GS*Qsh lkR-ySP4;#1P2&DttWPmf#VW6GOPl}z002ovPDHLkV1fr44GRDO diff --git a/src/main/resources/assets/mekanism/textures/items/LeadDust.png b/src/main/resources/assets/mekanism/textures/items/LeadDust.png index ec2eaec0b2803fa3a1ef75209ebd945c1819ecf9..65ad2bc5de8de818b44529864c835acba915dc32 100644 GIT binary patch literal 1367 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+mc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvGjMjE=kNwPKDW>3A7uk*95O#E9aur#FG4?ko^1{SSkp} z$S=t+&d4uNaCTPE2+zz*$uBR~1jP`qxM-H&dX5 zt#PsJaYF$eEfwRt96?D={EjRuYwH)f?l+9$$kp-?JaUL*6Nj@=rh)w9Jzt*P2{MqE z7O!1hz4N(s&2#JLMN@)wf^5Xrv~r&KAkckOO|JGH!{zYMxSjj+Tb&Z;Bt#Wk?Bc&? zxZ{cA--#DGo_u>%w2x)?&nI7a{P+(#+jY-9qNuer-735(mi?p&^E=t4forEYvapv0 zdzSFZ9(-XI*Y*910-JepXIZh$)VAxp`3jh<-in!AZaBfcfrt0gEcQjJmsYZTyYcae zp~}tHs<*s5eb_eXC~pyMT(wHUg=wK)g;|)}>A5owJPExMGw1M&nLg#=mjmmxoCN0n zSabE_p9=To7iZ38?y|eQ=Ow?f(CYMs3r#-EINKOG|2`fGTHLymS2Z#JbGnof5?dzg1;SKkU3vT6V|uJ1>e^-tIbN;N|@=?bZ)z s0k#hh(*w_L>x;}xc~Jkq_dXL3!`VY~qq$yP)dLlEp00i_>zopr0KsG2l>h($ literal 1449 zcmV;a1y=frP)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0003%Nkl(#`Xr-Qhja84k$2XL+(;~a;_za6)h(hFWau<|;{E&=v+qtTb5 zPp426GTMoblbka@djyP=OZG37qME>RF_t0ixE+inKl>es8tY2T#W{hSbAZZF&IMxQ zt4GRG_B+Wq=Zt5c0F|Pe2zfNgG4oL81Slle_a$%v&3su*JTCaT00000NkvXXu0mjf DDvi66 diff --git a/src/main/resources/assets/mekanism/textures/items/LeadShard.png b/src/main/resources/assets/mekanism/textures/items/LeadShard.png index 5f9d1e060181d0a16838ce903aa03a5e2769e607..7e1ee4363e632550f2ea52aeeca7b8230a753658 100644 GIT binary patch literal 1289 zcmbVMZD`zN9FNwuXJ@-I>*hpkOa&)vl1uI-FZ4FA$(_5ccb>OnJ%^jkB~RMeUXms` z@2+UUu2@9J*qBtei8uxw4n;p$QIX@+q7`J~9L}xn@Y4{)tq!T;OMTMbRX>z{Fp%dh zzu)iw^8EjKA(?ojsqvmh1VNf&JH-^7Tin-E5689}OA?&6IFXFA$55SuWC0|s7+HYE za#9~i0ZAzh&45k>sT};O8i+1Esx`kEFaL&EXWq`x%}JqSXh3)+|Nk zQ)0Ag3+_T#zvGxZNfrtPqTnM8tB<5Ojw8J^Nz*t);C4xOq#~}{?KK4v*s`UWj%Mhn zt0-lSyc5Eprz;`k%y@iNShuT*f+-`5l1Wm8m(1ndxR%kjlLG&`u_oG1mrOvWfNkV0 z8QzE5UL(WY-Q181gx>IvS{l3*X;3ued=BVNOblW03!!KVPcu>wz?ks>pctH${cvDF z7N`AeR%QJhLo0!r&RTq5I1*t+Uqpz~VTy|QyP|Bg%SUr;Bp3-tg{~SmrrVCB%b;dk zgSM+&@upl}uz=(kR@yKIYgLf!Hyp$6H%wFz(5*e1t{4UTA@_z>0v3U#Jq?toW#rK1 z6!Y2|<^koERF!6MMP?a1!1!65V;Bw(0xv}eDV3)E3|8eU|2K6cbc%HABFrJ*RSm#`R>$XzSalh7b;Vk z@qOmj%Jg)(GIyceJ%M?M=1s@2OD*AjVhffX|E*nXEKLoi&U-dBwB6hA`Nta;f1abT zPuL2j{)s2gX8d=T>z3a%HGksu<~s)FFV3pW#OCCo$7lIqqIvP% zy>Erjef8YMtCQPC);+O!-)mEK`KOM~?Z3RB#*Pflv-M-)o&&<^ThDDc+{SR>-s7L8 p;|H(&dgjXdJ1>9n_fp^R=3ZpuL0}&0-s}G8kXR%kzTMS3`VUa7x;g*= literal 1665 zcmV-{27dX8P)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0006QNklAs)H)Y-pCPR3ee}TgP|%RVf3Rg#32?MO#yV)=a1`03uVj7 z#Kdtw#-sp!{*shrG9dk>pIq0^NdY<&NlG%7n|+{3V)LYc!=pQIKS`w!&p}KmEY=4} z0nbm@-u-7qC({vg4T8S70DRITn8 z{em@$*M52)t$=pMJd`n;jsFjF$q_Hvgm8kDN}I)JI-7p$?$5b)azCDvM*t^zkMTN| z##b{jzP59#kaYwqn0GU@AP9+dJ%w`25-R5P+rqsS11p7QXxo#{sX<00000 LNkvXXu0mjfNh}dw diff --git a/src/main/resources/assets/mekanism/textures/items/LithiumBucket.png b/src/main/resources/assets/mekanism/textures/items/LithiumBucket.png index e2613134101abc908542cac0bf2f7b8c3a64f2e5..aee99659355af71098b44c9f77cb1a9159c8c5d5 100644 GIT binary patch literal 1374 zcmbVMZA{!`950?AVc>Af%t6@bx~N0FYoBs2y^iBJ?!}#QKyH{36DNInfCkzgZP^`! z#jzpT;@sSfhJ?u$`QoC%glu7kD2$oO3{DL)7m3R*BQt~uEZa238GH^n^aI%koAi0> z@Avz^JpX@>R#(21la-%^VOUORw?BgB+~k{?fyTmnOB|Z=j6kiiN3AzvoCYzksPYgG z$y@`BKu&CHxe7}#%+w;))Ec$n3RX~ME0@Gr<8lNn z=A(DN7|ktcd#CgLz*~uL?ha>{pBl@q+BZ(s_Q?EV&c3ngNaT<^*L&;s*C*mOxLLM8Epy_Gr*OWbr}R_njUl!0bk5|l4RseWH;J2OMi0;R+jf~A ZH)GFtpXKJ2GDq@{7YbDR2g>UX{R4?$4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wSVD; z0004UNkl*Us$A;m?a{vf;wb?Jo9@=5Tg0#((ZX5BVhpSLfq|VKU>ik#Hn&{i27LAjZdAjO7&t z`9+}nJPA|Wm{1?R7*BUagki`4l_#L6wY@cLRa7RXFOj*BjA)TKUBZCCX0wSyYZVQ9 z9iQ(pJH}`Tly_9zUKZJ^R;y_}q&pZ42F!#QmSssqI^IGKxITT5aLIrsWPhUTI*uF3 z1xf~K+aL&73d1lM-0%1C zdQX4PmPn8t$w;AGmx13-yaPTpO*6J_o407STA&0}j^jx237eU~bzPdV;$q%Ue=`Y) kz@PLqnZLei{7?N47(c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlv+Q?;_71TV(4n=Vh+>mnO9trn3tRivpW-HH$<;1UcFY%MX8A;`9&f5`8lvu5Rj2y zl3$#WU!dUZte_E|nU|7ZUaSdA#54nAL*qmF!M}mFxg#txv-=F

    EO74&C7vH)M<@}(#4kE z-iy7~|0hJ>-DxZ(er)Q+)?-IvAG;?dUAi_SYt1r_uw_#;Sx<$h&p34Eb7^9aWSP#M z)#aZj6`!~K9&w2*f0Z^nYPmO-NG0wUS5vL{^TssC>{Q=zHlvjmJEP7# zn6CEl>~CM5TU_t%@BXacU@z2qn=Rz2+P5<6f*Y)5pMRyYJYT%y_Xp0|-z`0U<#09K zYd94ZR3OYeD~w-mZw2f2 z{0{zjtu-Mh5;SKz83{V?zujme{zSoY&utCk>1Q3RUTrkm5wPRL@+pyqyE*y~_pM!j z|HA9ChhMy2$i8_Pusp)==!df0**jY}HyYf?G>Ooh-t?q&@$xi z?J;GZWp?P$ONEf&l;GF($F{$b!C-88(l4tLFYU znA7R*Fjp_5neRzd_h}9RZU+S!w*}vtbHd6b6p=fS?83{1OVcWC+`3N literal 1386 zcmV-w1(o`VP)4Tx062|}Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p zX=HB3eZOBd3KSQ=rcIq@Z2y^7^lv_t=UPtR@d|Mi@kNW@o6;NJ-(zXf31 z_T_%9<2YZvD|P=86XW!!AH{jKUQ?F}kxxnd4gs8Z2YqqAn9oJ?g`%iyS)$~R07*qoM6N<$f|aSMasU7T diff --git a/src/main/resources/assets/mekanism/textures/items/MufflingUpgrade.png b/src/main/resources/assets/mekanism/textures/items/MufflingUpgrade.png index f3a5037d08e8bf6cf6f5d4948cdaf446f8e0b6f0..9e8e31f96a44adef73c566fe933148926889855f 100644 GIT binary patch literal 16544 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 delta 1378 zcmV-o1)ch!fdTUhkRyKt4QWF|P)S2WAW(8|W@&6?0020Rja6M}990xPyK`qFB+gT8 zG=+4iKMf@flU6jLw7P%Y-8OEPNjBOd=w$Zp&X~#0I5WHbp-)9nd@<^q6vV%`fFLOK z58FPpFO>=<+SDK@KD79QQ0R-M>zO+rpAr&Y^#0ebq8A3y3^9`<7Bw=qD(FM7D)W7orTK7Ng9X5=j5(})FCQ)-Bp z5Rc5o_(lx-F|dEuU!YBD>#FGGqGFqM-Jr2>?_vI*ZNX@T^KHYY&zYY-gzsTo`ztji z=iyPrORAEeM*IlkYi)hD9N^oQn~@Pe29Vs|ny;o2??haz+Xt$?pQNp|iXndIgf{am z;w^~JH|NSz!Pu*+lf|6DcEq9Tbl95a{GU6Q=anY%X@i5{QA6k zNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS}_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqwjZfMwx$5irQN_*|e4l)UHmiYuz74Yp z1t^#>hrNFaO;`gFWGFxe-xkC@w7Z~S|1*CoOk7jftSk<;h9k=<`vqOS{Kj9g zT(=v@E?ReJK6Lz0G~f zea(M;&V9jM0+Bn*o#VdYE^r@nU&i)o^BP*;dlq>Zw`b{=YphBkBWx8O7IMNi;Zb2S z@+S-kV?t5bftIc7`xc)so;@87V;|$l>{#8{}>2Q=O9ae8mIKDv> zj3h&3jFdK1_qbQ{p(2$}QtHxU-hBdD z(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7ZS{nuL-t>?3n=-o(6I(7vocj#G zzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@?NPG+6)c5T6zxpzGe*M(x+{Ax# ztmiF&wKqGRzu)h4);>W0s{m(>e*vJMd{t0j{%-&P0U=35K~z`??N%`kgD?zCtB!ny z5AXm6p3DRI02>n{5{&F^UDZ`^V`|QoTD4e0IF92xUxG*oyZyTY2Tg!H&(GQ%5^vi! ziFHJZy>rb;7URyVs*+RCcpS&ux~qQztms0C?^8gw$sNeJbvz8iYN|_tuImCl9)k%G z@H9=K?|Tn^fC*@*P19&o$v8xSyN@d}a8VS2{divUpFYD>qTFYaUK#__dyAO}P{9=F z79cGb+5)W@65k1!&H(NIJkJk>vn+e~UdKd0p6t4=gCs$pp3Jk5gU&!%mJ3=%2#CSA z5`hS;b;d;2a^g9dKuU$Uu+=x60j(I3@R~}1?*Xs==UxKv7I=Yq{o;Pc!TX!t^fc4 diff --git a/src/main/resources/assets/mekanism/textures/items/NetworkReader.png b/src/main/resources/assets/mekanism/textures/items/NetworkReader.png index 0ddc0aceb9c564e3621995c54020b01375911bc2..673f8e8d683389ebc9d0a927336363aee0672efc 100644 GIT binary patch literal 1410 zcmbVMeM}o=7(YIoi~t&k!HJRMSSBO1*K2!R??P8-3$8+ubd?ok8`rzH^q{>fcZaly zBo1-YeZ&l%@dJ!5y2w6)k!2$e#^^*DnGD!Jb7uZwwt>+tndi+ErQ#ldYqLECk3@^%tjjyh9DY2iY?&~%QXWP^@2u0G-Efv zI*p+MZ^pKePMtGk1Abvsy9_qBSGl?NW{&1D%SN;~%s_%5P+2q_42TL7He(CC3|z;K zaSUBBQJc-!qEjAcHENS&fRb8L!|C({O3_+^G|~i7i0XBO0Vj00p4JcqW26|O2wi$G zs3!A1#$_*G(t?X1Ypb> z5)hQe#2Mj00k1}HGzm6wtPQD&q`oxxgWG?W=lrc#36X8gADlJ7-T$UGEa!{~@8jzhF>2F-axN zH1$kfkK|{Lg^R~)*I^B_^O>)fAb)k{O#3q@`28p9G}nG%51*}EAKe+v^?mu?fcc}T z?xe=24^F3ap3Zrl9q7$i-?MsVe(+nz2kpas7v8=5(5~Oxhes@lSKnT@`gmQs>xG@< z{Mai;KbiLLI)5opbCL<~Jpj&J7Na#&xy^K1-(jmoKa$+BX5iZBMAI{m-5D8Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv000AXNklLNxS)36S#Q|I?3WDNBPy#{QDoPMy)j$!t>(W(0N+;;BDsB1K|B)vm z&Am4<;NtL%@1AphXS~k^!1bJ>b-uN=h4b_CTSjxxi;D|vZf+XsXaQDMR&aK9W@OBP zBrw5EptS%C3kwNnAR3Kgb#*m00E>%@31@&ATUuI59Y7=!F*4?)JmmmKM@I<(oSvRy zZEej+N81C-%gfl?+cPreWMFr97ZVc`Mmk!6!NEb}XdD1WKQl9v8i0X;0SpZd85wf` zrlzJaJw0utqs%}s7(_-!1~M}o62SY`i{|EL^!E1R;NZXr;PCJe-QC@2Y;1)8ga7FO z4Gj&Ttgo*d0c>w?qrJUdbnIXD(*QgXkCcGvY-(ykC=`kd!Splw`T2R#VFo;xo~Hp= z?<`3_qoF}wF!B0;|KHi!!R+iTT3cHM*#4em2H1eUYo9pn>gtjwWpZ*-qNKCO5)Owk zIyx#N%d;&lEf^jiM&NfqnT7v0Apz{KHfn2Y(bv}}8K8`hkAt@(80?6=ojm^A)ak=>2?HeKM5XiW0RI5>!gl#TIGo-90000c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvsF#tw}p{t3L zo0++#lc}YviJ^;uqopHEuV-FyNn&1dD$MRopxsctu6XrYITxiSmgEQgoAyj8b(?&CSfxQY{S449%03p!!qD4LW_Gqx3=P1S#FXgn)?=#DwPp zAP1h0QuBbBrwEu!gjIcP85kJndAc};RNR^q?Cs4IC}A6Z{AA6PehwC0=EaMYCM<9b zak{uHba&X_?mExzYik$Pxr#^x?ReFA%bBNYCa+bnv8nOBW8TIRlhb5paDOh8yFc@x zke8;EN8eHd3CY&&yW4H|bhBS~EvTBgtW-82R8;2qp%5iklfTTft)+dQI|#pG`~32$ zSm;Yhsi_n7=U#YvR8(b==MP)O6J1On*Ea3`)Vp*e&nEHTJ8E?fJm*v}6FBW#`?lzOa+=`@8-GT}-=B_{pEG-fNrWAJdy<;{Uq+8QB literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJO`a}}Ar-fhfBgS%f7l_ZE%7mf zAY1SM6BSP^7}64L4hM?(tZ{Bz$9zF|TY3iDJw9jWw z5S!k1s?o42NqJk5R2AO=(I+L@6L@AYugLv)p^#zW5wjXuht&%5fA|)ZPT;R&zhHHO geLu5X%zFuj9EO>XFLO@y1iGHV)78&qol`;+03|V3lmGw# diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianBoots.png b/src/main/resources/assets/mekanism/textures/items/ObsidianBoots.png index fdcab2f7a828a47117317fa7bf31dc2eafb1b8ce..6ecee92f037c86b9834806b1ff6832f579e55f24 100644 GIT binary patch literal 1402 zcmbVMeM}Q)7{7`Z1^fsze8{q$rz|YtdcAV}y3rNr(b2^gR-4#lD%{6gIHA4cdW?cH z3Y$8k$&zJriOVEGmTZY(HCeVfmbKa?#KZ))CHoK)(XkMx2D0gpfp%|!vi(8)W0&0f zb-&;9{GR81o;%Utd1-UbjvNF*HoNK=FPyif-;G*0KKo~ig;TLw>sR+m0kxA=08%YT z96((`wi$Q0nFkB{$e<*fo{e-W*W(9l2-s4N-@wuQoU#D*=|rQte# zOkn5|L~XTU%cA`52Gk)b05$52IIlO5sM)F`jg*xn%Ta@#tRP4|VX)#PNmFK;G@&aG z2E8dlfc7%Z6<=^?!&+2TrU|06vs2eup_7zmg0xz#gx)|H3^+vK;jWO%M(|L0SH=PZ z!n`8Nswjofv_+PaI#e45l`e-6l-=%C!=dm>qF~C12rCn$PEQ1b>A05AVbu%%m9Zu| z?CX*N;RRu-L*e0l1a@V}Fn3ROlmiSG!4km_P=82q9WM1eM#SrdRU z<3>Q5aSKnu!3;RuKv}qeg|eCrf-z%fExvhqEwjoZ?s^z>$IwU=7#`U--YN zBcLcET_^vko6Hd`#`JQv3*ct8k3a}Ej{>`-uV;J|K{Nv{rrH;|#x15&_N>zAiN2bu z3z~9taA&LLjjzs@`jSx%=@`^-Vlv5Bq2T-m#? zYzJR<-^)qHQz^M5kt|Kfvp?&O*?W7>m2o_1wsicyJNd=TK=JFT$5&>j=Nf%kRho^L z8{@s)_)jrzQkV`roSPw%y&nhL&OeRwGpn24RmwlV=3WtA1V*OA-;=}ocv3j{YIyJVx@^WGn|8{onMk7B9wdENRVq+rX%?~mRu?@9j+U9}!&xTdN9 EAEM&=d;kCd literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ4o?@ykcwMxuN~xUFyLXm@MZ#U zQ4#m_0_D5bPKF%|8zcDDOj_%IFMA*0-8l2%c?U)=0XYYkJEt@B`5oBS6l~GiuvH=H z^z}Nq1|9tax6d=LFb-(=$?&UOiuFZAc(Kd@+l2j}?%d#>Fpn+b{&D6PynEX{m2BV7 rsbJ82v8OgGviK3xtI(K+Oh)y`SN|?iOc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvGjMjE=kNwPKDW>3A7uk*9fm(E9aur#FG4?ko^1{SSkp} z$S=t+&d4uNaCTPE2+zz*$uBR~1jP`Q6Qv}Qx;Hy;UYv3) z!|6)P5sB?CzCGNf2QR%ix77ZCs`lecGbGIQc#gG78(ux)&eXbK%eTfa+FRFNa5`wG zvGlElaqSHK9j{}3)XdAz*?ym6-4fJQ=HxV6@pJOKho{3H9sMJGE5Y?$%>MPK%-22n zwzc}vrw12(1>(*y&f-7s{dbG+*99@CY+qb*!H}yxm*d@KxfbO_onQAG83hcT zwuT8#(K#kp^3q+Q{Dj6-{tZv!7Z@cQ*OswW@8sF#Tc+XVb7iH;gTU3H8}~}LUwxCn zAXWCi)$qAW&NRE0DXG`)o^-hMBlw2va<}zmjlGVKq6M$rJ!I-+B-?s3quDXtX=~KM zhT0GYuON0GHtnV^e&gwBp4<%rha5L--Q4;0hxx_O<)#YZCl*DVT38cu=*bV(n*N$& zb#?9~b&qSm<+rrywpc4Z^IV>#BDc?M+E8lx$8*P#h>0a;D_5z% et$V(oiHG6V%dd_u$qf5JWwxiQpUXO@geCwHMn|{+ literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ<(@8%Ar-gYPS53PP~dSWXU~7I zKJTKYRp7nqMw3+s=gfS#rRBT(w~qy49333GjqwNeG<=skf2D7``T_1U0!qRDT8m zuzm`xabNId^Pb<2H|aZc=F8UFGwqx{(Ok}d!IV1Id0iR3zXcyC?F^}xG!>Wlmb-)T Yk-50am5%k5KqoVJy85}Sb4q9e0KjWktN;K2 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 0000000000000000000000000000000000000000..5690541f4cbbb65380e9d932953c6c438c01d5b7 GIT binary patch literal 1355 zcmbVMeN5bB94>AUgyGN;r=U^_i!#>h2Y2nY;UMfj#w{G)4h)xI488Wfqe9!GExQA@ zY(W>nWf3!&5^uOU%%)R9B+MB#a|5Rg=N1!Vf}2L8i%XVFLzdv2%=dsp{~-IrCVjv9 zJkRgr{r%eKuiKWBm7j$mNRGG06@YVY^3BYEW8vIg0Zxya?x0z(h0U0t1EgBgLICwD zLIebWAa%A+g9-#$(=Imz&7iNA7d6EqBr%q_5`}C8si=xa1+f*FXb41P)q&mo_zZ^1 zk^^hB`AA>X30mZuE*;c&)isD+ts*C3Rh4K(oQDDmFa++E6Y<1y8K|!nl6R; zfXlON3+^0Pi)luAf{4XpmRPw((<21MaU4O?1Wn@*fg7EwDa3KrC{8K3fFbH~)RZ+9 zO)3f@t;2L+(9@+5l&H_QBCHzAiGnF3;zE?5EF_^Q$+#BLh8Y0=y0I$SXy}XrA^;4n zLl@zFgo{&Tn7ex$N&=xb{L{J&FGXl`X<~;0RMYEnVDO7Yk|myI1qQ&FaT}mm+%8(- zz=9A?TkWB+-O91FWJ~F+#&=U5hAn5xoo**XQEsc$DXv#FOhFYv z%C-z`FLUX8a(Sl?1XI%+G_5UF1^yPz)QlD_iaMR>Q;o7JX)&WTc|%J9yMQk51d>PB z6m&7gyu6BeK#@W?OtZKo+F9JjTJ1Q;vK-C;lA;+ZOw(2tTjopuH+2Mbib&SUf9fW6 z1dB1bTP8)|u%8*;Qu;vp4u^ckQQokDvpGPJKA>L-&KBy&nial^h)UXga|~ z=*Hf+GWWmUo303ZfB7*qF;=<#7`aZ!pV_i8W7s(v%X=|x-Nn4o!mlIcx#{gU%KpS2 z`|euvS0{hnT{1OwVz{hm_A2Mvyy=f~?RfuZ&bI?+uX#Ea9#~tH=A)vW-5FbVEqLzh zdEwLIMB<6L+4XnkA0NBUjU(NcKW{qec~YJG;;+}rtd+w@zsw&Q$-9JR?mqoo;l%Bn z?X6(o<)+{_#&2eUf6#inZvEuG^JMe3XEaCA8`G0DksVs)&!aoj-aP&LiJ8*$gD`5elZ(etu JYjkUK&p(hg+-?8> literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..20769df74a36b7f7b606b1d65d2df19f72e054bf GIT binary patch literal 1372 zcmbVMZA=?w96v^=ik-|D1LcF9M@XjG^?FC!>z$O2^$Iku3=4)PF41f6DV(Ku-QBSk z_S!C@I7UXcF;VAY_JI$Q35g%jCA@Fhrh{l)jLSA8(IA;-c4h|0OMMCy{Xq7?OYV8Q z-|zQ-dH(EQAjnpCHRpx%w)Fd?4vs~Crg%6RG?!1SlY?56R{&BW$bNvj z!+ay~0$ym{cMX&wNcKLl-lzFIyV-yoHu7nVF&2(MHiDEnVi7(N0vhTEjiO}7?q3?g zP*JdB4Hl2d6LEqjvARtGb!|2EfwoY95imzNS{7rWKp1E|8Vff|DjTz7tGX;)r;iB? zU4>{NJGSPO&r^#!Wd)!XqXiF`C=#U^BWW=+B)J2nOk^oRnh1))Ns=|wENMm89}HSk zgdpqXD%WknogHh^vf+-_ne1ss4CL$b8$F+)9H81$rjZM*NeQN{| zUZBb?N&wzRusB18xqG~!G!S~j?omW|DSR_02U@~F(%hUKgI|n-D6kaGTLFw2w*ZpH zZ2>bJXyC^wv&|p0nHicAEE%0m`4nX{o6M!oN{S;%mzkkT$x6!QvN|b}bJ?sJu3J(y zUJ8JWZ82?ojY~b2%Q_XnYqC-=%gvc8sBMxpS#6RdsMCpVZxAIxj;b%EZ)h!G4k+S& zAXF-H7+p; z{!=%ZBUp^-ByJ193LDUoQ;ls{^rQ2&o!m*|Is(qU6H){b?Ud|;mHFPZ`|mLpRZaP z>HU~-E++Qs@{5n?Za!BuSeTg2v9}!1l^eTLU4?NyI5lqQX?cMkda#gttfQToNL{Gf z`Qp@jKOj=gZ0eb>R`gvLd-TuG-_cK(&+w+#_6tKRO-0H0!o%rT+k1xhwx7AzK;HiH zK^On%o16On{ttKdzB^ekdbPIpqw53exu+(M_c;oN4=!H*V{Yb9d*005XYVCa`o6zz z3nx#X0l&UIAKZ5KBtP`0+d{fWuTK3ZAkB=7jo#RPJ#s(E z=HnSERl{A}^;Y5^459Y; literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianDust.png b/src/main/resources/assets/mekanism/textures/items/ObsidianDust.png index 5ce8e60ea9b1f9de11a074bcaea6fbe64016ea78..385f447c90bb05c674d16535ba3c4e8a536f4e60 100644 GIT binary patch literal 1478 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 diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianHoe.png b/src/main/resources/assets/mekanism/textures/items/ObsidianHoe.png index ab25f754df9282440338631c0e5cee3c12fa18f2..1b8c9cddda2c631224781492f59d5e5c870a553d 100644 GIT binary patch literal 1294 zcmbVMTWs4@7oNf_ISEWG>nzrKDC#^|sXSPGq z3e?h~wMdhAp;M<-8xmvEGzL5Yg0Xc}Y#l1B(hy=}8W&aUVFQK`mqFEV(k6w6Y7bcQ zx%vCP|8oA{FL!lrtKL+%3B$1J$aXP?=9=QWu@a39zZN7kx$SVm?lw|(PBJ0ZrWi?x zM>MGq#-OAO?!5q;FwD7EjVJ6xbcY}t8YLAmR9?#v)$Kzj>>lcj%R_0ISBREoyeTgr0S(#`p4SF+OUMU_6!%Gi=teHwm zh>0B~TWA*~`fWQS&~z@BqjDa~F#Bl0^E}P4G|Q3*L0W^lE#*nwYAh>=(2`9xW2=Ua z7Zs(Xk+p*a@^m!>EfbBd3F}rVQ7C0}UdqsbVrWe(#=^vljdjshd@uv)7_^M6 zDWm&HHI~UJcXu{a1R`&Qou-N|MH&zdIjce4j)*}5eW4Up5m>+EgD7Uw3xS^u$Q&B{ zFiEmpAejnqyq{IPWu5i-fsok21JNroj2D0~7XaaKdpPW2+d^ER1GJa95#6#SU4~`b zDzaVTa(CnkArnfrVa5$(pj-uA{f2E={YC~4h44pvR9!K0)?>vRS`Ao)rurOII!r^u zS5hpf>zGe+3V;e!NZt<^GR1HTnPgc=di_3M3I>1=_+_HRSN?D6Xyg=KtdsxLP5B5F zV{y6G1!%L@M^H!2W1=o;uRr(*hB-VDu`Qmzl3XejTAW))D$Y$@+ERJx)T!yJ>FI&0 z^UXJw3%9QaXOA=tyAxAi)m|H3p6Q?cW8ypCLi^J$-@d2D_q@2XCN=WnJq@SXsdsimB|kJNeR6VF;o#I% zZ7g`A_6zu``^%qtM{o9a)SP|k;_!j1@3}wY4fgY^S3bV=%-;r{zRP5yc7_T#fRUb*PjTLNb%k|S>%sA)dGw4vgGxs-47?#gDW zbKlNyPLEYf1aWM+kw4^GB(-x-?r#lk9CytBFgbp0###L!<4SuzSiGG6`; literal 219 zcmV<103`p3P)$sxgs3ALNNp}F}bt&>wG*TB01+MXCxNTQ0MN_ z55PeS?c7A$sizQm0N*3%Xy&evp|3eRwwxY-4+IEWt>H{tae4s=ljBhU;=7!B0N2Zg z$wRNDd;ks(T{e9H-{hZt4YL8>PA(S^YjSyj*ptfvq?){ZKQZo{Fb8|y$-crk>-Hl;m|o6jqXtQoT(>}&}~3in}&^pb_#J=>56D0qV{=B&b{5Jfmkme3T#>u{A=_yU@(W(+}zcuI&_ zBBx+fq9A3$fKnz2B2$y!g8dfXfaG3^0 zy<8n*=Lv?Sytb_#+hbhxnOsc6Q3TI&nJio6tpY6u>+%1i7=XRNNTseDiJQ zUeU#uLb`Oa@P=^>t%hpX_KP9TT6)i{U)OcYnp<}Pn|hM&UY*ff<*tAKOI^U)Z`^%{ zS60e=*R?IsN0vuDU(o?pCXK@rA13X-)V0qzv*y!)>h7AUxi)if>lTiyE8I$AAy-7P z$;ZxWoI@iscNB#E)*E#oA$;UA#=Sb7O$_`vcjuY{?A)>-)9avL%R6QIlZc^v#{Kf- ze5SztpqJPq-+$@oKzdq3E=^Bt&`K^O2kb4GSHHZ+)m!pO#&E0kR=a?ZU%thYb47%=YjyiL_B?*zQ8@jJ(zL6Z=ux9r!fl=F5*Zx@kS435N=cJ=K zzVaojvwuoYA6$56z=wx!Ipl$Tbrr#r;@YC~nsbZY>PP2~Ro**XzTi;W@E5*2Cu)_= z>r+X2d!23esnE%FrU{?F^`L&gzp-P^z@eJ_zb`kI4o*3%?Hx|d+tt=_!}r8UBd$xI z7(F2V;h-&PM>fj58+a{35q?3|`1O?f6d(7J{;J;(tQr8b_j7-aOi#JHa!&lJ{xW3t m6n~4Gcc1>Fy}$d7@d2XS;Xw4X7aBkC{PK0lY51kMGw0uXj_-brPFwy6d7xxwh!DB&ReE2_=bS2caMAbMzj3-or8VX$>Ri#K(-u zE(T%Ib@~nBwz9T7o9yD?ufD|`HN2GCCop00i_>zopr E0RD7e0ssI2 diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianLeggings.png b/src/main/resources/assets/mekanism/textures/items/ObsidianLeggings.png index 1807a410373f02e764d95b9d84b9e226db58ae82..0c39a45e1823b49b9ec141a03026c5b447c7c03a 100644 GIT binary patch literal 1422 zcmbVMdrT8|94`?WqHKbSo4R-&u9M;Qde`gg*79hNM+rr!HIfB0?(r+!uy^%(*h&{c zMcoTRVy4r{COm0yO!8%mKvZ zXKR25u)>aQUjmy(GjE&dtyC-Br8F=5b!-fy3;P3*tXP_wOVmKiIXG-5m<1Cq_Sa53TDPFFd)b) zVn7vT35i)`Ik{f7qcGC@Dfk0!_XERHa8@WN86IW>IHA+yet#^l8FWzffPcf76CL#K z2msszf^xmW!~5`M#>r5-hdYV^VKnpxMTD2aZe?V?-VY?z#n@5!MJI>?O`2H~fH`AE zK$tNLPr<33{DQ6*NA&3IXVaV4z7%S-@EfiyL=Eu1% zDX6j%58}Q>=zErHcqo^4Du7jG#VgBO<5f^zE30y_Rt_LeC$es{C<$^Xm=(LB`w25Z z5w`=OP?7z}jKs7!hkJ`f;7ul<9y9m=i|Kia!&sO$Mscj*;|M|Uu_QXn7yhqwI1CDp z)yaSACVm8qF}8fr1#t7AkAMW5M}b|kd(o{_jV7Vr#pHX#S2_=j;PWaTKXbn0aL$E8 zJ)VLOuPx)o+b$I!xs=|xr}4AsSTuU}^XOY&j5+$mYvV2D>9=k=(x{&B(oG$Qr_TAG zJ62jZDjO#|KDqJtxzPE=C0Q?IB^VESuY7{VTQFL`P-xDb>a_mwCeCaywJgZU zxY0AH&9sqw&rR%nW9`D6(__CzB81KI=-W>ZGsg$snZK*U_O<<$=|8jEONY7MJwMi7 zUwQ0c!+nYds zV_Ey8!UH4wzrUE8yyoV@<`b`99m-DL-89&rOsu_drrl&7da-!Ra&570Nl~$Va`30$ z92WGIT;eG^fxD^hA}@9*ob%IoxOv+sfQeUC_n<7 literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ3QrfukcwN$KmPx>KkSgy7Rb(1 z#jc^L`FA-Be=Pd}o(<_4irm=-Ee#ttY%q}EuVr7rd}o?@^T!XR3}+HzW;_ctNZ@nW z&XH!o(=WsRz-U6q*TsAir3Y3pyU7~7YFPM~A!e$;(pT+$%okS2I`Jul{e4h=pyQ=9 a6T?fc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvSsHZrv^HFq_K>GjMjE=kNwPKDW>3A7uk*AcH?E9aur#FG4?ko^1{SSkp} z$S=t+&d4uNaCTPE2+zz*$uBR~1jP`revX;K+G<%t|}ceE}{ z<(_U>n#<*r^xJw1|A;mFs5NJpbj^GzUh?mU=2vUu@aBZXcJdr!+wOhX#cbJPsuKCyY@|UsVvj>lEh{?Y?HYrw&ElG2u zLqDVX?$eCo{QRsRqkeZT%xj%`iaX${!jyHsZ>_Xbxt-t=| zKJa_?DCNQV9qaDzVF`W77@3yd{4B+tXQRuZ-rd4$9y`C9a;C6syO!U-uw5!kuP(T2 zUw-IYt@X^~3oLieeUatqt~FI?Ygoo K=d#Wzp$P!PkSeqQ literal 262 zcmV+h0r~!kP){VlMP#tRnFQP_S^KJ5wtXM?ecMk?)V=mWeNb)~=)+#bX|rUB6-C z3us8?DJ4c*&)*S{;OX2kQn?81>B^KM@dYFp9X1I>7gSsUR5@B(bQt3aXq6*@#YW&J zP+K{wzIg<00^sQ>@~ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianPickaxe.png b/src/main/resources/assets/mekanism/textures/items/ObsidianPickaxe.png index 9c3055c616bbdda13d58dc0826c826234f04042e..0395a654875e614a8674179cf6cb6a254c68be25 100644 GIT binary patch literal 1441 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+mc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvGjMjE=kNwPKDW>3A7uk*AcH?E9aur#FG4?ko^1{SSkp} z$S=t+&d4uNaCTPE2+zz*$uBR~1jP`$T*xk0B7bd)|Qogk$fm=G{Af|&4J z0OY{)QEDDA^ArJd3FlOsH4F@l$2?seLn>}93HJ4t4ivF9mlPIu=HW~63GunjVlR++ zAtRQfOX>U7$YL8cyOAJ^OYZ=t32()%yQ@Ktet5x zX=SGNlMij|@6TC&zjL_y$e9clF%yoJ_YyTew8ZMl?RaC?z$s)IsPnR-dV|Z;UvE}i z-ynN`r_yAH5+B2|{q-`JZP#D)kt%BSj(J_#^Tl_ey~W|XMM8{68}B?Ve;mK+>;kQZ zBKg8S|1?jyi1FCf@boX2%{$5c^%29&&9N*~m4*0T^#>d+j-M9NJMqjkizPA-qq9ZM zy!+j{;#JRL~lKkWxz9osZh^O{S9o6=14 z6aLnB6qI)4+Wpap>*l_YA~r*|t~5Kk=Ffo_H9^LntdBpL?UXTElVZ$0r|xIX?HZ>u zb3DY}O;~*`=%%kp%;Uid8+Blr5?LK_tCo&^Llzf!r;C7`TU4Xq!r~FOUL}V=Ew{ z6{jD8Ww9Z02rP@!j{p|diVX{*P5lUHk!x-1M<5lsCZM&W9f91)HG%lPz-H_Ttc^S+ yvic}4Ch%?Kn>|X432YU)U4gwLKfb`v{S9CBHd&KldmlIe0000*2q?EhoLnZJ3ALt8cYEq zZYXV_87Nv$*CeRLu+lC)+3L0?4#+Ard`bc1%NiD9V_0n{Ybk06aETOX)6F3H^W{;J z(6u1h;!iLMD+1c}{k=9g)Z3U;dplG~BSTLSwOJVn7{FDCtkG#YayCe==*nnaIHpNr z1>$xD$yKLX6HP<}+JNx;{FKUYEFnlf*3U~UyNBQywuWXInv*D&m3cvC1H{@xB5Ssm zmYbvXYqroXNVdDKCDU{!lksJ0e9&&ASxJ&;hNC%-LI}#~F(wM3zm(OJc!Ssz0iMj@^hwBt5|f8E#+?Ie3FKsN&i zcH1htk92jBjBWkVId6ny$&5pacMlneqcxphT5N zg8)(#$BU`7$V&pJ`HMOm@%=)erjD0w0avF z#7c@~eFO7=Wt4Q96DUm;1dw;bZqLopPw=hdm+%(&=-)%14-Daq-mV(Ie0F~3+Fty;@0R*a zdK>uTm*w51Q#*0GIQNlYJvI6XLHm59}K# a!9IGWYyQK<#BYUvSUlDkeYfuD$$tP5lGI%Q literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianShovel.png b/src/main/resources/assets/mekanism/textures/items/ObsidianShovel.png index 38c952ee1b34acf99470cc418ba76cb8ee0e3b81..9c09bfdb2c28035cc4249f700a79a0f6abe8f427 100644 GIT binary patch literal 1454 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+mc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvNUoz*UGslHL)bWC?r2W2bKx~GV)9E zi!<^I6r7zEG{Q6UQu51-H9;{1@vuv3QD#|cid#{Bt^zoStunD#pJb9^n3|HBqHAex zXrP;BV3MMnWMq`8Yie$0mX>N^Xl7`htOV7cLT=FM10AIgN+(F^1||edj36dF7XUf% ze3Y68%sfTFT=MuK4=|%LUiNfx45_%aWb)~3;XsjN_2!e=%?#J(ieJrI?c`Ov)wN)u zi=ZG2Yq(a)W9FEhALR>QyA?ckDtPJCb^40aEDh7E6V-Ajl;z~6CV5Sob=)Uy-Q0=O z+Lo-HkY9NIVa&ewd)|o#dEIJkH+y)u=-vF64`tM5g=XtCEMPWl*9%+0qX z_oMdug+ExmqXc8GKiwPMfAUPa#uM!$`}aLB`KPq>RMlpOJloFrGrQ`R{m>WVaQpe^ zsq)RE;xl?K%G&kBU3kI!J$QTX-|Y#1W(x8B{B*PV#ZQ*S&Vjr5T4%&|1g@TX^#7Vb zt0(4@E$7+QxR&X9RymeFQYtO2ywCMyW88l4GLB&5_YwbgwnUn@Jo@-iBko@CfwOaF z=>2Fm0e6BmQv}v-tdw|WoX-u0!pUstcBkdM_w&2`q zGj5red>c$Rgr%@|uP&Y=WW2jh?W3daTdRvV-e);K%MIFn|L1xJW`?^D54*~4>TLp* Npq{RNF6*2UngE_^8F&By literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ1)eUBAr-gYPPgW2FyL`8-p%P` zp1!xS`GM-2HPb(^%sX4`%9~>FLwe2Hm4~HoJ+*aG6cG@tVXAMq)xg7b$GM)N+iHfH z$OR!I7ykwka|0orXVtZg;YoI{c@tI{9i6&6$(B(^F30bQn&L0lTk|{i%NM9j>%V-{ z=#$uiq-bfUuDR=z^BKdHuSFVdQ&MBb@05PdiJpcdz diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianSword.png b/src/main/resources/assets/mekanism/textures/items/ObsidianSword.png index 756e8c40046416bee3136bd78e97d33406ac17e2..fb12fe8d0f349721fb90dd8fa97b1d3ef9291a7e 100644 GIT binary patch literal 1711 zcmbVNX;2eq7>*UFQaOZQ%)74?Id$V60WVrZ_NOt@VJ4ZL|p8aM=EE{L!8H?)Q1#d$u$-Cd$Qm zjx&u$bCE|&mDK8PAJd$u+4se$np(U`nTm|Vb!3*BKxtwG*PwtLQ>UOxRE=b(UqZuZ zw5jQaconHqtPpB(jH$NEFfEvgLepqrOD!g~HWeiS4Vq#wis;YV&d>n^BBHP1C|C-U z1l1d&a|kppCnjE-ld2UU^rcIHFpH2Pz)(^RSgRYV^* zN~MSeBshTr943dMWx)`@6EGnTTL3{J0L+3yL5Kyy0tN&L**qb{1tvZ^rHw#zLZviv zLKk%s(e)&05`th>Ru(fWl!+55AS4h7Ko$(bFoTj{n6r(f+QKlJ{U#Zts98%GOr!xf z0(M5V2G1Zxbjs3k7ci4T@s`+Vo(L2bGSH$nfe@1gVwl~pF=;cYME^D8ozmv`Y!eD9 zQ8S)FXsLYY{3gLv?B1`)E=XA;TuB(Hq^Q%RxHbbrjig*EqEjzS#DEB4o|=nNJ~KEd z#AEQaY--}68V1bfYjk|JfCnR-NuGD&AucbJ3-hHc79WCSY=Iz@8WB>d0Om>}dAv!i z+-N4%MlCw2+hEr{j^(`=FH;$}T=0wfY3XpO;$;92Hidxpjx zmZF3q6Gb8k90SHeEHu1By@riID1ssk0S{s^bSyT)(7-Ut;PALy9mn` zneNj?;>>4~lY0(yKx^4uRh8U=@OqP%qD_@peeU?@o++7d`%ngbK+meF^-;5)95JoK z0){ud*{MHpw%z2`pIk4EaC3Nd$=%yyixqs_7cff_^zlylU`>@Zp)ZgV@=NdNyqK`r z8Z^y`&hy>BAC!FacmDd;`hmfhKh`#O>TztB>{UQea7f;*&Y~hk)v>_pv$uwWdg1Ls zqgxm0IOa5lsBP1Nz(m<6x3PYLO?#!%gKu z4zG(fMuSI}9_+mBWXSWDJ^L!RJ*|1I+;Qt=)G|D@WU=SSUGe=x`vT)1yRo(_Y{G^k zqQ+i--Q}X|arX;HdfaQObdvi_=}l`3;BetkTS1>6yrSE!!29>Z(8)KZ=sd65t~r{R zy1-L@2ZOhCmazFw_m0kR8Jg~A?)1!LRrjq{u}+FTPOt$W*Onf(_c Mm&HiGi%8!156v5l6#xJL literal 231 zcmV3_vrx34)umu1*f#LY>{bftT_go-1M?OR)H9)ilE!3Z?H+XrO?I@C6x^cm$Xa zV9^LG(ZNF44{(WjZ8zYmnD^TWxGT03@KmffK#t0{#QFnD=m~jHD6!rEDXL*2LW|=K z2qo4Za2Db#)*sMRDeeqyPRJ0~GmSrh#q&@QMV=6@QSBS@e}FuYuUv|+emLR{kk9O^ hFPol#&;ur#fDPV64I?_1I;Imga7#b})Tcnv4`d&_l zB76{d0WUT;UIfJmvavB#U8~l*pX3BNV&F3vLn0D|Yy>GTO+VrXR ziWuO$j>=VAaA(8nRW-^HL_8ih#Ek}72@;gmY9&aTplKW;@L02?@(EmuZOXhxCu%T1~cgPyL05Q)0oYr;}&HBm5SM1qeJlz}87kxX36=$PsS|GKd*I#%5r z1%wyGFN}3>;YC$7#mm4_Fv0ON*wg&U$>(Nzn{rH#$htNKsCvg0z=AEM{vtYjRpFPG^?u zl42?^2_S1b1Z}T!={s^cy8?JsR;pz=oUH;+y{yWydO3>P?dXo0kR;0S*rS;nS_#+z zl+bfPtW@L(x}0Jzw2pZ{BT_&FB5q|V5)Y7!i2G?8;3n2=4gd>frdR=6<%|C}bp&*Z z$kfSy>Lz;xi!rlY>jJo0>mwk+=22jmc#{3FLpOA|9Oc!CAN&jHbm>OAZQ!wh_ULPY zxy74BttU?CQ^T{ROQ%lK#!(%h4qYADt$!#orN87~=)GR2|EBl+fwX?fxERp>rt{7H zHE|`~?~{`wx*keA!lr`(KYzP19wgb(WLL0)eWAU*{ovtaZ;YpB52UBM2MRhmKf5q} zV=$p9xQ-wS!EpGwCHzOSn*DA~6-gkrtJ(=#cZX78CF z)1S!KjNQezHK%pGLmcz^%;j5Sxjmhq3!m^zK3jR*P&O9sN^SmbvT&sT=U?hy+WPy8Olvqf ze{AOKqrnkE0-{x|b)2-XGN8+x|47^&$E1b6BSP^7}6fz+?*b0u#r!47oWrSic6bh6LQ3E@*O*TopFbb+i|g3O$jnt%3%Hm z1^51@DbG|BbkxtW9y@%TaR--N#Dv2-Zsii|Tr5ju84kbbl{DYrJGg1-hHT)78&qol`;+0J`H@2LJ#7 diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumBoots.png b/src/main/resources/assets/mekanism/textures/items/OsmiumBoots.png index 6b571013033d68ac847a7264c7a0a57822597d3e..ef321b7797229219e1b8f0f71ae921a721aa3930 100644 GIT binary patch literal 1512 zcmbVMdr%a09ABRy4i1ePf{E*5YU$qY9{1Xn%Q@~2Iqe9KOO7;PZ})ewa(jF1E^*>3 z#YV+ZFh!fx6x1x6R2ZT`Ee)N5(bSX~A6Y)jL6IEOP)hB0$XS0l{?Tvd_uS9t`~L2V z%#5iq(FxHAg2Xt|Z7#UShG*13xQ_ngF$=eN)$UQVB%fN!$^fzOk{6&3ku3l&!18m8 zTR{qf^eYzJ9@XP~gW)7m!-g@MkQjt)1WB0^3bI@gP*E=^5CUfG_x%SkRN&26w%$oP zgH})|q?gGct1QFKl@)O`k4XDS_(DN8cMIDDQXg`C8=bBA_*;xQxu~!GL!-B9T?Om^FGF9OY7AI zZ)U7eRf7ycl$MriN|QB`TtHAXO%tS+&}wmrz?HcHl?~wmB`G4o1{6*ff~p_|(6B_- zE0w5b3|jic1u^J!J{25LdIJSRMugZPL1{=r6vKY?pcT~x{x##7XvIA@2nZKYq!O8f z`S2x0$S`)#R}=<9YnV4>0Vaj@+a#_;1Oe4yGh^_Jh8K87Yh(=o`i$!VWyDRK4lYLE z#kD$<*JskvMlG+8$axmuq%-R6R%@CyEt~_pj!v`EsWywzX0oT!T1pq;Is%Hy1~?GW zEkND9T>Epmj8z7#D#>n1@<*y5vrtkcrBDi@Rx3IoTL|z{sq$(#Lr)yG0a8TS1_Y0>s`t7;9yCl)qr zH>Ypi;o7!5G&H5%(P256TalP@fBfB!oVwvh`tNA){5_y)-3?3Gu0HoZ`SASNll~Xy z6;d02Pz&ZyE;@bTYjyos9S25ld2syLEZ4Nliw53`Idrw@%!n2~wx%Lk=~$CFwwSw{ z5MOb7es?tn(E5$rvR53<%*i?Y#mx=ukzxI+=fu2!F23YZb5#Aq1?2Vt(-TN~T;Iht zvxiJAtE@FWoQdygi?5mfxX;|yFMzeeNzLtwWUg+;o z;$lBXJ+CdEZCH7ul8O6hUsdfg?r>Aqr!&tqkuzV;dEveM`fKav#a92CU@$Z`R5lov zi04du503n}Yot62<9~`zAgk!rkB(8gkxswZ%~_jbm;%_((*Lu5{7yGnGft{l_4 z%%j|{_>hz&f7oTd9+p>)3$Ph zbTYbce}4so)I`S@K5ECB^`t|#37 zyFVdQ&MBb@00sd}XaE2J diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumChestplate.png b/src/main/resources/assets/mekanism/textures/items/OsmiumChestplate.png index f8e968a4f40610b27d073ba71eedca3962521108..f85cc5ad608dadd5fa767d5edc56553535311d2e 100644 GIT binary patch literal 1617 zcmbVMdrT8|9KXqMSY-nQ6huABFxA;!ue7v1s8HH68mwUHfaqL$y}Q!0k2|hc+o}_V z4FqQpHL*UHsJQ9o+?<=6(8Xk~EdG<%Wd_Mma@j2qW@2X^ss5**QKM#q0zNT8IkLrQ-i~qJS!hGGa%CXxv;u>=O?N)arRDq(m&C=tUM5G;lyN+Ap*QaJ)=g5!hFX=89J zV$|l3>*8)IzKvyR1cJO?ugIGrqL>N@Rw|W{SOQ5TLJlEx`&}&R6S~}KVF_BojWHz6 zl9US!NklD_hgI=8OP{#lqz#6rf?e+MKye|1d?*dUA~EE2hWr{syICXguNluoyG?$Y zfQ*Ej@-P^e4{KVO%*F2cib6on8l;FJxul>DErofUgp1W{RebJ?2q$qwB1ba`&S#;F zfaO93Cgm16VG&BC3X4@CRmvr}EG*|)e7RbduTkeoH2I+%=%h-qLXrFVLgmsgg?r|>sTrQ$v2$ZE56Gb_~RZwiBSjugqXi%d81!bfQr@ZdDp$t87 zSW7VE3Ifk(C?_};VuXB#dW8bVGBd4WVTP4JgE{;*T zy}icP&Q2q^KITxY5sS}>8gUwHCPf=Ma)zk;88I!#a`_7mz&mVPb7Qmz5(JSKnmy6W z_x<$l$;+a-U01H-4?Nz>yOb3o{oKl3>GY)!u5CMWdjQnOq&zw|mDEq({IZ~Lc0^!z ztEcu)SZ`dL`{T`N16g#-XyWb4$(k#hrzg$Y^1wZ~`o)HM;*6|~kBZZpOlHTl!FGGk z;$=f;H;j}`Iddn`_H%!YW@2-55%EKPVxTm(VMbJB#O{bl{2Oyw!Xwke`{ z$qMjsuKVq&-ADWf8hDKtHy*rEMyE0p_xCQjUr@C7*yFa21`ctRfySl#b)H>-G$YZe!#ub~D?OZ}(w=;6}K6O^%yZDgDH`;NYK$8&+g!VQ67b{(yF z&pPYN_V$#jSB(9=U#ac}uc-a$woFw{uQV(6ppnKyCTF#N0C!3(Oo<1QX1F XVNb9+>D%kWp`W~7w@CYGp1JxT54c?0 literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ`JOJ0Ar-gYPCv+bK!L~g?m=Fe zMZ3S;^R0TJbk~?wF~E)`c=e1MT>q8qPbvo`cPGPA_`POf@nGdksu1nK> zJyBKF&A$74a!+I#;}RAQ1=Ur(-Nvc9?P5U+K8#OGV|4KK{)E PI+elG)z4*}Q$iB}(AQAj diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumClump.png b/src/main/resources/assets/mekanism/textures/items/OsmiumClump.png index 31af05694178f795089ee0623ed3b4663b41ffe1..33f2b0a3dd91cb667178a7b9fd235c33297f5a05 100644 GIT binary patch literal 1445 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 diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumDust.png b/src/main/resources/assets/mekanism/textures/items/OsmiumDust.png index 415ae11a300898c510bd17dddfe3400f90de35ba..54f4d4fa72898a8dea758f6f25f04de564efcf5d 100644 GIT binary patch literal 1466 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+mc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlv`bd3{DEOaeXOigsnEDRIV42%tp6U_{jp!!qD4LW_Gqx3=P1S#FXgn)?=#DwPp zAP1h0QuBbBrwEu!1lh{hF)%RR_jGX#skn6{*w)Q+#|-~=bv+S2tnz05rT$)nvo*2H?+M1OU-D35 zZB-oe_UX&bnb#K_J31jS^opc(LCvg&g_E3hG!(1!9)6!c-_m!Fm0$Tm+jEycPd~2^ zdc;vHu~M;Z%bX@jwKrUxbB-vlSSIr3t^b9ui{^Xfo{=?;l6nyR`SBm6M!#zAZ-+E< zg;%?rqR{a9c666{QbSk%*ybr`)4uLy)7kb>>|p(G cpKvA~hC}RZCR(fFwu4GjPgg&ebxsLQ0Hz)m!TFlE3xR{ikb<3818Jk zxb(2;yT!^A`c&c>!UJ}-NVx7~uc$E2Z4prWZgDFnGH9xvX@D1Z z7G&v&Lpfp)kF*i9DV=;WO*4qEQOGh88&QD~`$KJpCK3>o68jx+)E|z2v^)EIem>v# zcN_9@GQvWmLlFcC%gQw6!#TqLEnf!5_{m2soL-d81+rCi$X-?gNGdPd0h;AxOF%wg z`I^e}z&v%=+Jd`4_uE(6#8V**3xA#%A9 zTQI7?l82^=5%(21gn$GS@NkmgmIcv; z`X#bEN^+Ya{CIMC!C7UQ#1gapfRFp+espv-2($H7e3NBvsdKCT)EjVlfl28r! zbV+og^C4!0$Eerocuu2nsPJS5U~v^k+i@1Ujnj6Pci2gucd!(;$mjoW=m=;O;jfeb z)J@hrkhtQ zj(mep-`xJu%k8Z%JVLn6=Oc6Hh`HzDdbXwZwEC>!(Td*H2afE>462JAiORkbS~vv0 z5Xa1&WBZ=IGjZd1+k=Z2ytf+$+gTI&NHA znzJKBk#5FY|L*CTspg+P`{CA6+goLc;g(Ak@4wWXN!8u?AnM!16*s5P6c#4^{A(j) zDB5`DYIPr9-LU=K^#`}5*|UoMSISy5Fx@5ovT$SY>ehAKg>3NKAG5yh_rh}%vp=Qk zliE%D@UoQ$8iy-)6FsUo#-@7WVm|gZ_Sw6>8|uw4@BI3y4x7|8aSTKsYEfL=rCqnV zcWeUnB(=@$-4u-Mxtq}!(^a}o({V5Kbn!rTUVLp~|NXzY#!rktp1*!v@rxYO_-Ezb zWvQnIHa7fT5#*hWJTaaT95Q#p@bp~YH~|W-qG2wax`_Zhq@Dn-?6mmTR`_M oO1*2x;m!|_KO7&uZ>3kcwN$KmPx>KkSgy7RcUX zm2kqs!PE1ly=KJ^3x>1=ug^k@HbkaaOK@{@H-EfP%CPI`i-rlz9i=BO6f diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumHoe.png b/src/main/resources/assets/mekanism/textures/items/OsmiumHoe.png index bc55214953fb3f159dff7a125224068f1b4a3a22..a905163f71bf4ae952559b7e59e23130943d0967 100644 GIT binary patch literal 1297 zcmbVMZA{!`94`_XPNs_*W4O-f_;h>B!2y9 zp1>73NF4XY>9`Sr8KrH=gk3`&NolBG;$)&Fgf}}p5>TNn;*OftEZzwcWnCVvOUD#} zmmzk4kl1pnJKl*$bQ9t}w~v%)2H-5`20kwbz!99GfrkP##c(75yqD#HAK!imWX+V* zd_stB+d{h_k+E%qr>I;m=gxWDy4gnoj^ikrp%{il2-3=Hw&;+W)mTvwpe31#VJo_Z zmlVa6K4=FCHtlrYTh|#Z^XIb^`wE#;#~9nKvMnfR;XJ zO6We)jTJJ=-Te)ffXEyEn5m#k5wn6W4XRMHV?vNXU)-`H^9(EcA&QywLBNs$$%_US zrbxycNTmZ_j%8$DMQ1mDgo!eMrD=hteE_t2k4B>5aMTkHb2RH=qils6(=1!mBv`Sn zAlqfGKN`I+myeiGv~@G7>)A>bbY^s0w=%kcMsRyr(uRK|^QYfs}O|>t& zzMDV!`_!?zLw`)3J-zn*@L13ACT$*g=`*7tGd-d{wz%_^W6H^ z^z{?tp0xX6F4_uzIC1xwbw%Q8!Cu>n=Pp*L(E@=D)o{|1$sf^nuaSm!4g`n7>ii z^yr-E{CTUX@kI(By*Y!0F28o?1~*omv>WTMLZ&|ZZA)*>E%n~TI|qOG`HekKG3Oip z^0YOtKJ>xd<3~Ogg!aELf3XGw`JX&reZGIG_POiW%o5%*>Xo_{gm;!cd;*;9_k^m) vXI+z3!p$>F*z4JA^r_@Iu<^hZ3}3+Bof$q^s~nyy{iI^89m0D@dq@5O{PD!8 literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJWu7jMAr-fhfBgS%f7l_ZP4P8D zEqD9>8y`NDGn`qpIsJUo$0e!O0R}7iB&+xih_a?le4EhoPJr9j(SUEOAp7Hoj~Qb4 znk-q`yq%vOi13@k-P69FIYC0~$%YjTmMr0qWbF7H{Bt%as87*t-^ZLFChV1S_&no| zra5_AA2wJvTvCwV#kU}A0>3SLfc1&?KIRP3C(ZX6xA1*B_?{t({pW-710AnrnHjvc WeM-;YzoP-@Vg^rFKbLh*2~7Ym^;SFp diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumIngot.png b/src/main/resources/assets/mekanism/textures/items/OsmiumIngot.png index cb15a91c7c47670d4f5f0f40e98888a629e23d85..48cb32ebb3c26ad065719167a7f993e4762f069b 100644 GIT binary patch literal 1651 zcmbVNc~BE~6po@TFnCR)7!_R>Y7tE~yW}7XkwOkgH3ET3#wxJc-HJRAxL%2c+sKQmdogAhG?!@sIAz{;qxB_r3Ri z@6DE_%u5^L7)uJ`3C2PK1{%vD zO(aGX<~NhE0)byXm2T$D#n45Kn73M+u22jtaQ z!it)-`XMcTrv_~t=RhII<#I_}Q4)sDfnb$N1xXPILBza;*jZ@jFt^z54D&H)Nhi)y z4vu2%fR_=oFa?|%E%u@WNV0l^wFQ7>~XV9ua{)>d52ozCb3X+dm zEGJ>5I2xDngOap}5m~gw8ZA>P5kl_cc@th6&nI1rz#2WGhhd#8L6M+J&?%y1dRV1E zl&}wLusb=-j*~uZiq{^(O5ch_H7tp744cj{dA=%0u`wLuv@s4qqX8l^C_BNpoHM*P z^eSL2$x@3+LeDZZFqmSLdV@SnD6MiSPKpU!iizbiS(G@Mu*k(xh!j&|QbH=n5pW1k z{NL0;yi<_3PX1Fjz9YUEz022Kz;9mn5oza}hvmCu){*oD0>SVd25o%0yZ!v<7w4p> zPHBqkzUjQ*xpVcU)UdFh4g;H$LOlMFHY{c9*!@=Bn1xsC+J#30J{|u!ctpTBA~`5y zoK9b=zu{NBrG0%%-mZbpn5co>8~au)mi*l}`gGURiu=9(RYK>Cm8$Z*jxHmPht>63 zIuuo=fHqmcx?!a9j3T_`n~2nF*?zNThX3*vEdt|igOevsigrD|6W1^>HKs1GWNLl* zL-)+c9Ziq6JgeE~%+W@)oh+=%GK9Xc=07+;qx5lq@i1fU<%5*{_ouyZXJg6sfwc|x z%9pq9E^%GiZBs02DGSSKy>+>AD>U*fTy`k4De|+(KJviE)yH0P!Y>0YSK%NsJIV0F zW~)4 zNW~!{^pm~C1G6Rl71f2mEvT`i_5}Ybl~>%k*ex70tux-1T6*ew+tKaqUpx)kv<$46 zi#+^OWI{c6=hXCj{1%?P*3{zOm8jYDpc6U5Hq_nF>U7!@Sp8w7v*B3fvc~D(QXSS^8HnvKf=pv3=*HEfy5hW^%!%9H#UkvZgTMmz!q?}jchV>pB7{;- zRe!J~V59J(HP!bzk~G=oCwl-9>Rvs&_`=@(Sm=vq%yaP>L4aji$I0l^x!&J^K{roZ Imyo^UANMYD+W-In literal 293 zcmV+=0owkFP)WiNL%7CVY?zU^nRz?e8AH6WA^A6o{eBs- z*##*ja0Y)s;{bzvB+URIQ#B7jhp=LEwlW}X)$aj(LqZ7M@p^OSfOJ*q0YZm-gD*gO zI(7hlF`VyobSQSPKUvjQLXrXC5JKJ^nk`SYr3=6dQ%LL(mM`{J=>aN#o9#u1kl3Nh z@O1qwIl#C$ScL*YhiK)km>ocG#T0@7@6mdOybmPofXAn!q7Vdx9%=MLDLcS`v{auS rN*92GY%eD40EZ|ue-1Xlw@&5`eJZUEgoJ;x00000NkvXXu0mjfUdVMC diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumLeggings.png b/src/main/resources/assets/mekanism/textures/items/OsmiumLeggings.png index 7ded5f26a65de51e7e4720c079c265efc0a556af..18e6b2ab24e132c3c0b2b396b6d8f8fa4b181e20 100644 GIT binary patch literal 1458 zcmbVMZEO=|9Ir6mT_D|pqDC$Ui6FaPuf4t+uq&oZfjQz zj1dtT+e8#(BnX2|7MMon2s$kx@*;~22Vu++2nIK%!Y0C)vdDZoR`dhmgHQ6j-tYH+ z|KGby7QdW1`I*Tol`7Mn@ASfbT53)l57(KuhiSOYQ1blBG9jqMXbGt7tPlW*J4&wt zUO=;@MW=yPr5anr`TUCCQ$R67R70mQns`)%Y?aEI8y9IN3=|{)R&l%y?Qc1XA{=W& zmm54Jh+GPuQ_nbxj6jsI z4Sisg-?Id92ogXH8Uw~?bp&FvXb1yoA&4AArzP|_p~ZC;j36k|L=i@0bf8e1#0Dv^ z(>1CK-fU<{QA7&IW3iYfrq>A4Dx9!bEVx#O>vR}IU~(z1&~c2HXQd@Lfy_vpsBi+0 zq$JV-p;)n@(9#DkL`9G1pmG088ZOFgqax< zE+!Dbbfh^DG?NySjy0s^Jc@7D+DQvZk`7lY2YIAj?{Jy*q|xOv84Nlnk>b*^5}*}9@(DsDT?I=*f+ENvK|~x5WX^JqXN8zNHpWy z2~lJu#1!`^^=6ha8iQI)9|Sa}Wyk#uS%JhRsthOsPnS zx4ZhrRK%X|S~!sX?b~IAZ!9?fW^?Zi#cVD9;9RHK9ocC7wQ9x97gyey`NwK&Yq$D# z)Ae}r(5C70TkE&&_f;<){^2`UZ^>GDzt!D+ylB@q@w}GHTiCp|!5QpaC*{>{A<&DuAiIz<9k~3X6=)lai>3gXxv*j<@!WTUEK?T`PIf` zC_i+fV^BcrGxk)MJ=SSwsN#S1g{r*d37ytT9HCFZ9y{~FIL$>p& PzoKkSgy7Rb(1 z#jc^L`FA-Be=Pd}9*@j8Co!|`9QNeI#6$zRUwjVi%GVhUnhPI3e9chOoxpbZ!-+x$ zJ!a2P`&SKt>^)WqR~Q%bNm%h62;~f1RrkVzVec)~Ck#nf`RmwwX6#dB@K0d8+*Gzt Q7ic$wr>mdKI;Vst0IOX$XaE2J diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumPaxel.png b/src/main/resources/assets/mekanism/textures/items/OsmiumPaxel.png index 0e70ec6bd45c339ee732d712e0733e8322fa9e50..fb2ac4be1616bd72333b040a90863833fc55d796 100644 GIT binary patch literal 1499 zcmbVMeM}Q)7(Zn?qo5ck5gF@wWE-qruXnV)_M{T%hcsG-r4x)J<9hcNZqVLwJ!nDa z{32*HW`nsb8sc<=Fl2u0LlG8m6XQD6fjZ~rN0=iDPU4)Oi*D{MQnx>hf9#TbzwY_{ ze$Vr~&vP5{au>u+o;?{skT^$<)dlDH$UA8w991_TvT#aNY=ug`=v9KO43I2d^Z?Z1 zV@rSwuzYnz7-S$wOoiYsR0^Go7*6zQ*ociLFNzO$nEtyV`T7oj+B+2M#hBTmK4+hm_ z-pjbG_AxEEGh?NSA~6IJ3WiGnF3LaaoP8ZF`TMdBK@4k#}0uNzOa4!El& zK)66atdu!;AKsKG80PNjLJ>pg4fCojz)NAvts+ZMqEkNxttoEr`#v%h&5oNb1mPe}~uT)gTK&dF977LnMAozJP7)XoU(4&B@ zKo+V1Z%3l$rE#7%aX8?0dfY?9OweAA*BV$4&wFTW4A1}H)Dh4r zB2p*+shj8#EXK(4aTmbN<30j@*gP`ql7rbrY6KaNIILOj(9iGHA77ZX__-tB_ttI5 zZs+lS_GI?nDbssul~c8Rzq6ppQ`A0mRMmHK zm8+wrHes9R%bZUgx~=b=Fscqz&#>2rQ$xj}X&3J|2Ckn!x_;8_?|5qO)jxmJV~qoN z$x^1#Z{(W49_ih=@BNv{e>9b?w_@?O>6d;;y`bvaV3iZ-fM~B z(=&!z$FF#u-_}-DwOH!wT{7-)N=51$-G|OyE!(|H-JKz#6APaW?mtj``$BrEYr?NL zmWOU!##O3$q_&~$lJv!obxn7xZ`GVXroQ*d(3`6t>?zNjpgz`Mnw!>k=JSSqTM9Nx zo#v9H55l{WUX1DLU!ty}NO$rT@|o^X$7=mg>ki)QZFF1&oy#(>#pN!%ytN&hrG8tz zpXlFxCB0{MY+Jah=Ns>YU!=45?tHdANo`y}W$)+<|J{wmAcMCqjKmKNwM2fm4qL8u JcXsibe*g;gEx!N& literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ3!W~HAr-fhfBgS%f7l_ZP4PWL zs_x^&oe$@vs~xmQM9<^fUHB_gy6NsUis_{411iz%BL}k)Byd);OXk; Jvd$@?2>^WIVweB` diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumPickaxe.png b/src/main/resources/assets/mekanism/textures/items/OsmiumPickaxe.png index 4d5786261c44a1a735875b9e67fa5cb3605e0fca..b9fb39e4fc40e615a7721aaad2a5a209c811d214 100644 GIT binary patch literal 1469 zcmbVMZBP_-7+)d@=qMVR7?r?)FBH<@^*`jS4~!q$nf<>$ zzvt!mJkP(Qq_{96eOWq!AQ`R=_EI=!#{bk5I4-{zqv52K9UgfT?~{YH2$1zG?**vK zPgjFdK(meYL%@O{$@N^BNA|dj%na|>(s3DW$S*)Nf>`oH0?pI{8TEo{E?~tbPn^b3 zjBLA%9&!GKZ|#yk0Y0$B%Ig zofna7t=J={Jnj7prm7WHRA|4%g{4P(mX$24p&<2}rpK4R#k?H^Qp3x~&>lArEI#02gTf{s~8GJs5rZg;NVl;p?7&TrBGC}zmmdK;MEbFDP1w8wI zsl%aDc)U*jQ#XktSd8)I<1T=k$9)6>uz5t-C5oiNP6SE%#bsY#7P{(<#$x%&D_c9- z3L@Lx#25Si%FoKm+R^%vx(nB8&rFT{#IV1{wi*NZ@5Qw0bSL7{;P?Z#`Yb}TEcSeQePN7KQwjo*Wk4jqIEney>jRD+=a;C z;Kj=o!;#^kfw21QIpOx%-1hh1$RjLkejG|QASaeqts5Ki_2;z2^q0${u?zQwEZg-X zdc|aA3o|o2mf=G`-!=VN&8a(+`MuMpGk+kTG7cy2-TV8#?y2cvseQalosu>djj7wz z8dZ<5>_FP+3a2`yvH!c059o(~7Ao$JZdAnj?8>z*54$60`a5rLA9%ikzV~g*lC`T9??^SCy=`u`W9vGu$?|0}DiSaHuC)AY^c>x7SWZ}!%IrORl%7{t zX8&|@Tie!%YV`PEaqMvF*AG@C_oy<%4}|2AV+X11ZLwK+dnaf2%}>@KbKk^zaunx? z{nt;|f1LEvoRC~}t32|3_+rYE?03$UghTJ8jdYev*&7vIr|w^A`S3`C;u-C!?t{we zika9S8NCm7s+4zMn*g_>(T=2DOAnoF8lH-FyHj4^9PPE$&yjVNrkq~H`PNbWy4ED5 Y?dju(Z;TyyHvXWx9L4rS1y$Ss0r8q71poj5 literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJZJsWUAr-fhfBgS%f7l_ZEs&kZ zlKn-r#UFJxetY%QnG|an^;K*0ZQ1wX0j;|rIM|kD_+Ys2k?D~vN95MU17GU&C>LBn0!wY}Ye z%+oERa|XI=od9+>P*m?#kU-?sUI+YaC0PEmN8Ig#+I24ha2LROO;h6tB9%(HQ#Ec??;$9bWeJidXc~tI+~`+KA&o0Wc|m~(hN#P$ zDXR)T#IPKYyj-nboejmd&*83V6s-9t)2EM=zD~2g3 zA}H9FZQDy+^0r(qqyxcJ^$t~y7pkDOS2b0mSJlu^2z_L$tVn9gsIqTpDPSJx@-84X z>S_XAOfe^~VjfVW5R1_aE{T2y_c9(o&N2*(`v6JNJ}O4j9tK*POm zQ#gXfXfIc~0B%_5bl4^DU84;IDU!o{T}S#{G;di!N9A+-p09swo8$ZWC-dX# zTbqv-8E3My+52ZsU%N6tZB<=fr@euc@aFb&$N#jlL2IGwnYmvxx_rv|pk)VHF_jdy z?7z6@oljqI1~UuYC$3+;J9lc_ay`DEc5RGoTL=bxZ$5NP!vrEfd-Ly1DC~0NvKi;# z_F5-#;R~UusU&*%^XPAx_O-^)=ubQH#e)m8!xzVHyy!f6>jF4o%vA0jezhX^!$j8g z0Qa{C`q=8XOmOaxt}kcDRUmGbREpqyN0ixfBB&K)Q_e9-IvQ9Yp*cH zEnOSN=4#%xdZs61Y3;8yxhb`)>^ym#8cg4Mz38K&hwu4A?7p-3=#dd`=#|&*y)^Mz xw(RDEzsy;aBkj)2LjK#A?ihPJdjwhIL=K()_&|L9`a%1@7H(+fKdkTG^AG;L=0*Sj literal 1663 zcmV-_27vjAP)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0006ONkl z8#h?AZ4!$~Op02J7BQ_!i(#9^CM<$ki>zgf#poZfdIk>MxqIhhg9@?(GBbDP-SfL2 zZ=cSM$A8Pfe61S%N=%jzY^PWE1M4gXH5ofd*&(oVbm2x3iuo%7C=nvm^V?@k%d}?! z=-7g2Y@H2dq4&^s%Z=?JyQ%(d%mU~K3DjwyyN~{hK6cf5Ysi)|6a&mHR6$fy2vCT6 z)bs-^3BYLK7=jRyV{P*=uvPV@Kc20v6qg|hKruK*x?j834&Bd4druu+@iX@X2@WHh zsfax=({W&oY|wdf(v3p zuv8yp0UmEpg7=@bB?$Cr6WZQZ0+|Is6mnR#joBom^dZ+#fcJiH;_`Ucb#D&jeZQ8G zam{q250H`7rD^}C1JKTrzl4Cm1GGWm>NXG?$wq(gj; z<>058Hh#8Cvrq&;=a?l7_7)J{oF4;#s2m!IXQcqVKc4?A17Fdc_{o{9qgns}002ov JPDHLkV1kUv9jO2S diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumShovel.png b/src/main/resources/assets/mekanism/textures/items/OsmiumShovel.png index 340371aba6e84afd0384beaa8591a130ce23f3a8..ea1624d480cd56276e4e5ddca546fbe330e511ac 100644 GIT binary patch literal 1420 zcmbVMZA=qq9PdPtp=OLJnJ>)q+C>4c_d?(9pi1c#soGjgGdi=#u6IxA3GJ2ZX$yhGWVUbs3`35ffOLZjLQ6aZ8NJ80aLCFS@5d***|I?2>!l?)Urs zU!MQ}nq1Cx3sRS)s#K~4_F~oz=d}2nk_^Y?e?R5mv{Z(4FuTmvdi5{=wb!=pKDX8V*7;P*VhHRB8e{C$x@fAQpe4tzmnbDDp-=T;o zn9)+bgK&hcARrdk$e^Ug>EUZCcv?W$u0ir+3={|gg+pS&%20%fnb8Sd2Cn1BIEqX_ zlnOIC>6F*uLadSu5WQB9@dQO8Mp{eibu>w?Mks>J#YqCEXpAHoosl68$kc;EYqH>H z+-%X5Ex0qI0YwQjI3A5gwb5LyB$wkPP186*;S_~I1Qw|dDO?N-Mbrre7DRYi3@f4( zLgI>?Pui}SQRwMp2*I$!F)bX5OeG4Y43BYPoYWF{Fc^<(0v%D@;9oapL`OW;VSu|q zMA|O%@IL(N1R3V;*@ogk=nb<;7U89Em8`^X4}y?lXU!=5q7_7ep^TgXz?d;TAdQ%b z*TKOEd>ExO`TQmwZKMQ!LT4tvMOSDjq%1a;AaY641_=g>jUY(YLbEKXww(nvPY6C6II{}NQx8*NMXckMOKxHAwh~pvf?*1888cEaR(5J zWGRSDq?i$BFz?d|BoKgr(MFQM{De-xd=v#Rz0qLs0~2W=jXXNV7yfVRaOe~suap1O zP2va^V|+Q?1#mOnM<4{7M}}Q8zw~UGO7&c)owaykLm!sdaqH%VPqe2?0!>*bhxfPc zy*AjK#%nZa=U0K3a+c=I%d6{gUftWZ=c-%dE2(c>hZf&zuCd*38$z?s?tEk9$h)s~ z?XT_ow)@BN{_%eEKG*s~^By*@;u!=Jrhcg4jQ z^emq}P}X=Z>qXCzRn(FVrmogqja@6*Q*C!d{|Ch>{S*KI literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJxt=bLAr-fhfBgS%f7l_ZEs&ij zn*Bwz#h>GC?faP%#C)T+F|*Eg-PUZl%ek$e`GT%rW*pNogYLvfhtD&%=(K%oU(cLy z!zuWKJ%@1i#}9=JXC7S&ur!z^{G2J-NsPai{lO*)+rmq0jHC?M59si16=Y8?>CTLk z<)6XK!TR$c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvG&FQEFfcbXbTzRs zFg9^BaB_2UHFkA&Gk1jP^~@_SNz6-5h1s16vKyk;0Iyyv=c3falKi5O{QMkPDhSBP zFUc>?$S+WEc2>{`&&*57FE7>v#Sp~9E~!PCWvMA{Mftf3;2^fj#A1DtNs3`=N@|L( zrMaPjZkmBfif)pTQL3(~xtUp7s)eDMp?R_rRDTM&L8lLNls+h(Af+3a5HK-xH~c#E@Id?LpEdQhd<&;Ms&C38c>d)nmJA3x=$>!Z`Vtd4x@?WzZ zp7HXU8{@37!;h`6dj>b|b>ctO)iqhY&7i21Ypx7;-}|OTC$7|A?EdM&bCW;&Sah&) zaa5?6QCcbN zayT$R_=RX8i?Q%!3;n+2%#WrwVs$1KS>D-ietTEz!N$4|cbUFcoJ%UJ61vCzxI#R# zW!|(opQ{ecu>SDn=Arc|`+qA4a9r4Rvu}MR=TTnH4^%Dm`P0&$JR+`+ zTfHWHVNZNt>a;rawrlVkgB-&j5I h+>lTD&zCbWGn{Gv_b2<-^F>wF@ literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJO`a}}Ar-fhfBgS%&uqJ4U+dxe zoEeEXtQpcS-rSsiu;S7t*#w(EvJIz`BJ8? zNShzB31T<-j=f+DJpJh4Ylf2Upjp!!47cja?c!T7?P&9T#ugc;l^|MdR?~k+iz{w2 zJr`x0v}g0xvLDdVA4>) h8g8+knNY~U@YV70WvvYNN}%f*JYD@<);T3K0RZSIU$g)K diff --git a/src/main/resources/assets/mekanism/textures/items/PortableTeleporter.png b/src/main/resources/assets/mekanism/textures/items/PortableTeleporter.png index 466d1bb8d82fda92f12792366577404baaaf1abb..0dfc5eaa573b29bfd26d5f4bc7a437eb97dc411e 100644 GIT binary patch literal 1482 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+mc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvU3|60cq>=c3falKi5O{QMkPDhSBP zFUc>?$S+WEc2>{`&&*57FE7>v#Sp~9E~!PCWvMA{Mftf3;2^fj#A1D-xk*}Da-z9z zin(R7Zfc5&scw=vFeJ>=l2Z)K5|dI=lFXH$`cudaI(?v{^g-zaDc!(?fQb>rgy#Yv z2cC~o^MIMB2$)OOi={?0FfhLNba4!+xV0qse710)z`uKGXY-Q&Oq9>vtf2VlY{mf* zFIN6#PS?HpEMHnqx9t$K;n?{ss%zG2_WunsJr!S+GBsO+wyR#)A(H7d+iS_P#o zz7$hqgLUWEDp`Jc-G=aaO3%JN+`Nz9N|deM^~k}=l`50UFTVbIhw;%zi)-4eU+k;x zfArGqu~N^s{#uS@91qX3uL;!>khQzxmSG|lF-81fEdQeqK^(rXMZ6DM$^`N6QxlRn z=aXEV{8)xzr^b>PJ@?w_%sY%{JGo!~ID2j2`;vh5R~f{lqpLi_pjA;@2{5sp&al3ZxWWYhiI{eh6;ANT*%tGAXDnpQ=^~yn%0jB zLo_^vveuL?@3?*T!{a%J9}1jJ6TX@yT6e8z`|VN{n|~5+FU|#vJbiCJ`|KqjHRsgG rWiLx+_5E2I^fHET=9fADISd%?v_FuR^zGRNDqTHY{an^LB{Ts5k7XH| literal 270 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 diff --git a/src/main/resources/assets/mekanism/textures/items/Salt.png b/src/main/resources/assets/mekanism/textures/items/Salt.png index 6e0e4a7d1250c3c031d74ba58e45b53c9b007265..75fda32ed8d9a220f51faa2e683b7b02d1a010ff 100644 GIT binary patch literal 1392 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 literal 1536 zcmV+b2LJhqP)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0004(Nkl8z5S+7I+ zVzSI)LN;U|*es-43iG+Wo*YE0r~;Ti(8&M}5mG~9z(auOc!T>qG7;?KpXauN>GxlM zf$10Tzk=zHUw?vWVnbr^hXCB?&URp*{d{r@Oz*k)2u!=^L(&4fktdjcVbd}&O>9UE z-VlKK+(KOf>?3w|HZcA3CnV0n93a6iqXuSPIB^n8fB5K|Bw#|Y@&V>km^h4v<#!k#R|yD{AMjj&GY!C8h)$!22)aBW mAET=u@DM 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 diff --git a/src/main/resources/assets/mekanism/textures/items/SilverCrystal.png b/src/main/resources/assets/mekanism/textures/items/SilverCrystal.png index 993aa0ab5ef5e1c65abe4c801868156ed80a5aaf..5806c0ba256f35a9d1d7b720b882ddee0172d55c 100644 GIT binary patch literal 1350 zcmbVMZA=?w9IqR&hB*gA=SJr|52HhOz23FgyPnjgv~<*22Bi@kxa@lOlwRn)aCfYQ zp>rD&)J%-Vmt?}G#FtSpnvFPvFt^MJ#w9H3TnL$x7#;2dTlla{;>%N@=m)Y7UUJXd z{eHjy%k%%=iE67@(4-< zAOVSM03pB$Elp#f#AI68B!+8^+TfEcuSixdjj<*r6|zmHl5I(q;~Rm2L_mWmyV04U z(JtS$t4v zO%tMQ$md_Q1$S;VW*91qe8Gieg+|Kj|fiGKa@TGCn`)pc$K&V0`urHz4Z< zC-WdqWNIh_aw0^y2glEd=ZXnz$DT zeoc{(`4qF_GUfqc7yfVRaOf1Cu9N@N zP38y|V|uyN1#q*}M?i+nqromo{qb&($#h3!z~>1kC(c#x*s+4U+kLdx?(QFtTe2>G zFls(KkyAD29Gt;@sW%7Slg7I~THkT8uT2;z%=36`500HAg56DR-%g%?`l~I)r>=fE zb!Z>{+t5uFFGBBJY3Vq3bj5*K)@NP$k-5iW&La;Ejc=TyEr&bCj;Q9u&Z^M&Ik&uP z+lM8)JTO!I^V;nE&i24}j=s@c@ILy?s+nMZXpPY~;>SsND;WJ(4*fn;tM`W^}QwzZ0E0fzdZ{qWqyLP31nC|=V`Qe&R zwm$l6%5pl@G0U1Gk5I`~Uvz(cxxL`{%}rNEo+yu!*H6_STK&s6>(0MW)n@4(?R)9? zSfKL;^VIO}OEt%8Q=ba#;dtO||Gu2U>CT7Osp{VKc3=OVOLbS{-Lq8JiC%u!?)rlp zUOsdEwflN{-oEwwiOc&7x<~GL{ob0lgbQ_JfBjjwKWl@j&Oe6?em*^s{<8(jDtsT8 H?m74mbZgrV literal 1691 zcmV;M24wk(P)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0006qNkl`z&U$qpkO)oiT*nr=l?>iHDL!A?*m_%EG}V zj}HxfTeRSP7sbj*v@8th7)oWLOD&rz39aQj2j~jR0P|mBm%YRNr84?8C7= zN>VLg4$l@WLg<#AkyaXiJ*BO=aVPq}oJKq5ml?uot z)3@P5-vXxsvS=gHf@H|2m@>O5-#@I~-INP6^Z9D1yQfR__YK6bY&NT+D5cuc=>mVU z8GL=IR9z6xjg6{~OuKq|d{(GQjA@+;m_W{bYVfnI=PuMFzzaqKW^pr4T&Q(kLKcvB zfoszG;_@OQ$M(0*serFDzKHVGl%(k6xQKQATS^e%Pps^WXDbWSr?nC0ae)Mhpgwb8 zH3A6E&P}Pq{S%2v_$({~lCWH-FV&DF;=kHl1OeNqRK7kj#xBk;l?`j+h^IxKybCb_ l07!!1W>~p-GwT1nnxAza*&!Y3FN**G002ovPDHLkV1i3|FgO4J diff --git a/src/main/resources/assets/mekanism/textures/items/SilverDust.png b/src/main/resources/assets/mekanism/textures/items/SilverDust.png index 7fa85e284a04ca66e3370c851c7ea9925ebaf36d..11a1ffab6fab9571a0143088b508d1d6ad4db7de 100644 GIT binary patch literal 1470 zcmbVMdrZ`J96vWOouasVPeD~IEV8!x5PPSG^p_pqYiZ<+jQ#z=k|y3k2UG<)z9bi zef+-PZYwD+NJ*ZTtWv2`+=ULWGN;8}^%P~yc=$K1Omk&txm?NzGOYdK%JT<%#;F?>iv$1s{`NKn`+Rjwr}&`cGOAwQ_(!e;pXu@f-F zv1YhT@6mb$I|y=xwIV33E%q_BRSe0(mOLmoN+|*%Ak$DZR2`P6s2Lv9rIdB-7=@uR zh+Jic$DJzolt6Y~1dv{%M;I-RK}J%8=?N0UmO{7|)1jCa#YqIiD8fi#2591e6>B0J zpu7&(ge_%fhJ&&!P$(LSL^Khdh8HVQj3h}^i=#M>CcnBfE<9RL|mL?LVqzsMH0*Yz0XebnmYYZ*PUhuCQFGNee8UdhQ zAo1%&M!AnbR-CNl?&XGJK*bwsg~%zFLRUL@W?cw`Ww*l&D_=A$$5ObFHUK4NL=P|{ zVqyqoFake<6DEJaM36?D)yH*S$hSGQR>E$wJ4pwIISJBfBTNp1-KaO{bR=$zbKPM{ zro#+~+vZ}n$GOIraw)qAXqgv%JYOBJf|4LF^HPu(AiEvPF5|*1ACcaO-OzZz4j^*t z0qYX^5HyxzihGfHKVdRrfJSr%%#Y}3!i12loM@liqme0FD**xzf5LTK;RJz1RF6mLJ5^lI1R$ug&{?b)dv#oQ?omZOk8yfSG z(173jX|T{;WX(2sEQi|b-u#o@SEqi~np>9b3(f>nzjU?cbTMWEb-vuX^!yW^7Rb$&>vTq z-L4SoOWOw<_wKb7sdu-{I^dsul#JA;j(mNgTl?_0nLRi6`MFHbkHb@m!IR5o+{r9I zx46UAk`}V^Z|5??{O;Pr71p)azF8@5n|0Zre(`AIy^T^zN_z`(ImvRmZO8Wc?I8KR zf?DM4dCjF;Lb|7>;%Wc4y~9|}u9Oo)TY_EJOXp~}S~C_ngV{Fo2nvl zy534C_T0DRFgLIbBcoYgtY6Uffd8p_{wv(6HH0=@9o2tuU}z6Fbe#TbVUp%S#fozA zZqMm=7vcA=%(@vpa`J};!uDjx_eXStKleU+y#3?Vhg%04nuRN`&&a!b??|Vs>FLO| cCuJKGRQR#J&eX2oWB+B9+ga@Bu&v(w4;PdalmGw# literal 236 zcmVXMH64*&({bvorKBpv_?EF0ONaN9LD!`R#0g@g}~TFwK&T}Ze9ZD9_`i_8Y2x`KoU zkd}=v9j6((K?BzwZSfA` z%me&D82~9%^jd)W!%`in z1d`Iy^cg5XkmM${Drf}*WxTA1?NS_LkA)+UjUWX(V-ZPi02W#c>Qv2*&3$+QLsi9% z?R5mmKturbYH_OpcDI&S$*m1Cr(ipGpan4=3J3#BLSx}Z&E#WlY*8)`&+%shLl+@d zgBx2iDj29h1>FFs!|uRklBQ6Wvr`U+qp0mDO;ULTMG`cJQxwmzJmo}}2L`nnN{Fu% zeapJw&5hMtR)i;rXf$e%=Gk?lj-WV>BS@N{X&fSOvqiI{7_OPw2?-)FWkZcvs;;4N ziBhfJY`HOL>5>cKNFcBxSTmOc1w%%}qzFOTNg^DM`?ZKRtxE8(8LOhrs+I^KDuJmt z8#2sCC_6!hvAeyZI1pOHKVqmbDN>`T%gte+S$@%t!7p}2Rd||}oB;ZaI{?MvE}4M~ z3u0>*U5kCCh-J| zF@9X>0(e>JBcQ?NF<_Uxb+*BYAZzyc#louCw^vR~mL@%#F>*of>q_gQO-Z*mRz!yU?sb{?BhVQG=^ixN=7Dn}u%e;U6 z3_J3-^M`J$X!NDa>pCV++;wR9{KEXr;;HK6KN?;3{{F4ABPnagb0*%K>Mt)DEFtD{ zF2DX=@La?B*CwAxw~y51zr6W{_DFr!;8U-BbM=k~>&CM0J%&^}I?v3cGE;}YpA)`Z zv&FlA6HP`=~K8DP`nDWPl9Ro>Cf)eUUetg^A1C0Zx kN8i2m^}*lU52caFePus&JvOnwFa8hnd&|W>Pt7y`09`fH4*&oF literal 1667 zcmV-}27LL6P)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0006SNkl0seLdn8s5R-*6MVS=J!lxKp=K0q%J^wTJZ8nnJ(!KZGbIuX@v%1h5wgv^2lw>Q8lh>{i#8+iWpIHo#}2QOZh%0EMhO zEkD4b0L&JFAqWv2)3ZAzTmRrpaaDK#YZj*+odmF%s3^r)ZuWr{iS3gBCug9U1c4rHqFvZ>Ad>*dLWl2dLpFuf7`pD!jjnI5s$Cl^Ti#CynK3xm z1VtZIuW#M)>3%C5Y@rbZzy&~Hwr>b=lpUE91b!S4Z^CoiiqkU4q7aaM+fx4_;gA_y zM*xjajuriaGs0UxyHECjz2M6jP}&E%;)tCM&^OTQ@TbFef6iy8_pwes0i3i4@N=w# zKh3o9XFInF(I#Y24Q9U#3xqqdu4hcnSrwqOZ`SJQxk9V`fBow!@D1iU3RL~;6~X`j N002ovPDHLkV1lIyBC`Mh diff --git a/src/main/resources/assets/mekanism/textures/items/SolarPanel.png b/src/main/resources/assets/mekanism/textures/items/SolarPanel.png index 1c31873e2622ce1014a87acdfd4740b2c235fab1..91884dcb05a1020379d4aea7c9225189dc13a80e 100644 GIT binary patch literal 1435 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 Np`PM0*Iq|e>p!N@9hCq8 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b190b840d47ce8895eaa6db1fc333da677401818 GIT binary patch literal 1497 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+mc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvGjMjE=kNwPKDW>3A7uk*AlN@E9aur#FG4?ko^1{SSkp} z$S=t+&d4uNaCTPE2+zz*$uBR~1jP`w0)Ad-@n4<3oQ3!=i(h z?bqdXr<_v=={maR$is5yIL50c$JaaeCRAHgANrnuc*U1_hbnCP7&L>OmQB!V_Hv)F zviD+&Rm&CTid`+&4URQj-pgEZc;`fMmQJCdiJF{KTpEIm=5cC-`R;3LI?3M9ox~9k zc&;kIA$Z-MX;&?n=4_s^U&KJ1^>Ssl3f&h#IV@-KVcL;E(^ z?>YD_WVJW*W)s6+>jkf^c-WX(@&#nJPI_@K?yZ2$9M1=Lf6tpY=Uvv;Du%8_4!5_> zc*3gb;o-=1xm=?=`?k)_$uWm7?Yw$j$;|gNLjn7b4*~M)a<6cvrFL%LKZQwihKTZ& zFXwJ^ue3aPhUb$_{W?bGJv#$jxL*o=N$0%1HPCTAZ_NE5DeCiTu|K8^8KQ1-G#sM}9!a-FVdQ I&MBb@0J%FM@c;k- literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/items/SpeedUpgrade.png b/src/main/resources/assets/mekanism/textures/items/SpeedUpgrade.png index c79774f898fab063c5dff13411d600c69e48dd0c..153d53cf9bcb1ea971e96f414ab3ed7d9524c60a 100644 GIT binary patch literal 1507 zcmbVMeM}Q~7`{3{rZ53FK#k)#6_s(lUhn#KT0nYqEm~GSqD-^RYx^rbpuKWE=tp!T z3PIVNe@Moh=z;%>*^ZDRWn(Zhsj6*d_P-y61V` zkKg;=PILa-v2zyAfgmW>XrK$lIWF`@M~P#~y{C*gEf8``gd)x^co`l*Yiyhaz(yxi z3JL*Z^H-h&t0Cx>O18K}C^4<0tejKIgfLQ{(=D(U~3Po6?x z)}}=^C`>YwTL&DhA;5#8Kz^|`P;S-OkgQC2wT}`7oIqe;pR>Z{p?q3oT9*>np<@hz zry)YQ7J24WiOCG>I3BKbg5ahw%S^0^>tno+V)g8hETc z>lRqf1&0(F3s)s*5z*6UAvoP8({o{$XC_f%$}k_}#&D?&b2>wDO`|S&ymxRe;?p|&v1QflY-r-sCQkV*wvsO8QOEA(}MEoMPu{KJsVw6CP z8C3vWg{rNjIH-UHm6K|VT}^6Ka+@No^CG?y*XiWCH7cE6sl@SIQmxeIs0kd`5V>l- zf{=x|MwdrmTviaa&5E{XxXPDuDIE_Of#Zugt|D9oW(Oy59tY=!bvk&(2G(Wcyq=Yz z8+sNn4S2R1*z`Q-gr`$Xu`e)hAxS%F!3oqZm#I-ek^r?3Dl2Ly0AW$%1S2EW$PC~1 ze^ZBvPGO-s`A^-1kHlgOEuVLRxOv`3z$G>hFLuehx3_-?L9?Qb^qOMdSZmRbWeW>l z&;0qCdZPmAos{J5t3BFHo`jFFDXBwMoh@i=#AKB5i>y6y(WCvex2}3(?&u1?B(gF! zsHP}FJHFF%ujfMD`KeVCtHvJ%Po&4_0>Po-_QH{cqq+XOmctjzdZ1gpCL{6V8_kBLwllSOaQk33ba42O>W(WF+xik9{h^W!{r4Bs zL1N51i zQd3j+tRd(ZsNvNEc`N@a>LPaJc4dAv|InR1Tlu}W#>xt^;};)^f#TxdXo7|V?>BF{ zm|{8B`)I!_xcifuz3a|Gr{8RfJUA!`UU$%gLXN7m{{G}h(q!qfyAJ}tse_9LcEnan zM)A2-Tl?2C$wT`(7jJyhhc<3%KHGmO&Cp`*T`OtiPc)kw8!oWM7Jv70eV3|-p8e%` ze8l`VMa-6QRa^5&Pw?rd)$D~`H^*K(o`$HQ?+g57NH$<)t@&Rqp^_om(R20wuTy=J^Y(8OBDpwa z8IUD>{dm{uq{G7w!>*xuvVk3$aoOg!Ety#9<;J{ak&7N&yZhvW8VR&MD&fvI;NfWK Ow`;7 diff --git a/src/main/resources/assets/mekanism/textures/items/SteelAxe.png b/src/main/resources/assets/mekanism/textures/items/SteelAxe.png index 9fe7dfa58cb3083c90fd9adb1a2fce7f25a6c789..f24686fabda0fb0a4bcc3d555917978adfd6529f 100644 GIT binary patch literal 1403 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+mc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvGjMjE=kNwPKDW>3A7uk*95O#E9aur#FG4?ko^1{SSkp} z$S=t+&d4uNaCTPE2+zz*$uBR~1jP`hQ4 zZc2(pvaU&@iLq{yNm7b#N@7xSilu?6nUO(~5>$T*xk0B7bd)|Qogk$fm=G{Af|&4J z0OY{)QEDDA^ArJdiRGfi4h9Cs1)eUBAr-f#OtSZON)$OZKm5?bGi}qXJtnn!B{V-! zxbs?|xMr(V?Bbm=UQ30RU0%tuIYP%{`Q-~QOI*Y@aHvo8P?&wTDfQ-2B~1~o z8SI^Dn|I!t$oj#?|4o_o#+x}uQj9!*hpiS}8N$WZ%*fZy{I@P%>CIo(6VE@dHZQMq znwcyr#d{#bWRm5aRadi8+3k;tKWDFaS?6i)uO@83eyq$6j`04;cqna-p75s z@Je|3<(;!cyInWcOkO(G_v6eu`S1Pm8T)uUCY_FNX#L^g{o#t(#aBEhx6NO5OC+10 z^T)a8eveEK^xpSh&n&owP3gzC-+qs_3RvG=cjf${g7l3!9sgJ6GqN!>9=rbNhuyI+ PpyJTe)z4*}Q$iB}%Od!l literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJC7v#hAr-ftPB-LhP!M2Q`F72V z7rHNXo=Dmp<^SM*ulc0v>=&voT!I!|nHgo9ZZ@o%GAXN5NI7AxZ}~GphlHMwjw?^> zV6w4jaX2AonRvT!>U52ar?%TqANlx|1)jXejmS}?CD=_pYP>0j0dm$ VDp$7bE&#fh!PC{xWt~$(69A->T1)@{ diff --git a/src/main/resources/assets/mekanism/textures/items/SteelBoots.png b/src/main/resources/assets/mekanism/textures/items/SteelBoots.png index 82640e7498ed10bfc2fd8ed840b1613796b7ece5..9234f1487db98fbdafe2e49afe92f5b6763bfc65 100644 GIT binary patch literal 1364 zcmbVMeM}Q)96rVrLPo-bB@W4U9@9<7^*(z2x=nl2l017GD7|}tf0y!E{QS4Xtr+P3{ z5}jDJ#ZUU9E)bEtts1CoEe{H<4T3|&mM=q#<17@Afx)41xlz&CxD%VyW#Kw`Okn6F z#AtA0Q%;5a6{t(q0BSK=aDk*L)aEcz7REtQMJP>DW`ZIK+JRFP%h*`TicUWmw5Ew+ zHsCIswgq=iEMgc@mLOuWm?>s9saicjIUEjxqzRhFAp+MEiowNkMK4S#xPdNcQq+)C z1x+e)yxMFyG3e=32y)c#pAlB{=|sVl5pga`P$rU)rU zHfsXBk8oj%40HErLrEa?hFz;k@KU%&w<(~O-D+Zl(A7A+~A+4wGt#Y)+kQdb#cqbLtkYA&(48JCqbQ)On4l}vGcif(X< z08+LkXnUGl@<=Z0(g0_uT2NIRQ&mtAQ4Lj(s8Q7ALSLws6j6=oOOiJ<6|fs)y=U~`4!*gPor$jN#(bzO!{J*Iqpi@M$PX1Fj zsUuj7$>mHJz|Bk_0R=XX2D@Zi-TFHSl9uqfOM>z5&R06$IJ+X}$YS4Pw~(1uBxi3<>dN?Js-A5K<@ARBBtXj56;v4+ZK33;Txy- z+K%_tUiK8MMnC9X>>V5+pUBIabMu#b4>v9LUkJTDaIEN)p|SdmpWi=U^YLqZ_x-Bt z8X zSB3AOUFGK(|LDDk71hUzgp)&On)Z`v+1o!q_Y*R7qN(SH#G;8e+Yh#1+R!_YccIz& z{U&bXXM6hQT)Wkoo;jMEbF1Z4ufg{IYMhPS8T)J9>ia*|-puU}@7%nkBO|wG{9=F9 zzUA=Y$fq^$20Mhu+8X~%?<&t2xto7!!>+aCt*7V8I~43laA{|M_-m2A`bF2U2OGKD z+Bq;>5HEga>y`&pNzRqA7CmEgn)k+wiNT}f-ZfXPt7_^lkH~GZb>Fvr!o=VCuRJ~< Yab4>kZ5d`yB>!_hPr3U@>H4;R0DpDsmjD0& literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJMo$;VkcwMxrx|iFDDtrU?Ms!L zaQ^2<8IId6+)uXb=+O4rzAo5h! diff --git a/src/main/resources/assets/mekanism/textures/items/SteelChestplate.png b/src/main/resources/assets/mekanism/textures/items/SteelChestplate.png index 8f79824cd650c24f7a1901eac537e81894d2c1e1..ab0be11f38aadd92761703584ad6d5a426ace935 100644 GIT binary patch literal 1490 zcmbVMeQXnD7{9?-a0>D<$y@-B8=4JvyPw*JEq1yB@6j z;M;;A8T$xX2x5Z+15uF8ESrKhgQ*O}K~x6Li0B9o9FR;hK0@&AwxWL!{_v7}zwY;Y zp5ODl&vQHSm*h@JPD@4*WP;OSbHRC1>>Zy3$JYj*uyA@+$th9_B#%xzy}l-4f#s_K_+CzhV3$N9Xlp4 zbQq$Pn6VL2MS1zCRgwX!Q|WMCtszkZts-?4O_EutMonr7QcY-RoFo~_z>s=$^ueGv zS@19}n|;(5+?g@2q68R%C@(Kpm1|X!TuhKOO%rMjq0!(Ffd?!63LC=x!SuKV8wm2U z7*IsXkH##roU~RkV^HZx2);mG-c!T=;Ao;?%7_pfAV`&(@cCkK4WomK3;ZkNndqRq zA^->%2uf>Z9^Qv1Jx+$Xd%mL>5UOF`l0|qaY^hD+*ZP28aoWrn{Gt*>fzcRPJ%BOe zIzSq5BTvD>061Jj899%Uq752B7q{~)ezt)&W^1)MRy$=N$sEc;YYldtKHE-Pt!lkp z6X!bpL5216Ansd)zDK#X=W-dV3|K{y-I7!quY!E9q)0)p6hN(3G-H|Q7o_rFX6%MW z0=5BJTn7ZZEcwvk6f@#8+#8Jouh)CjxYh$$T+LG)&cd*9iem*2M+$<6h4M%E!v9Sj z0Ywq9I{8oC#E)Px#+FaJ0B)Z45%9z2kz-xbflNh^gdwLb+a3D(U_tlCW$dI4tLE38 zx|d#md|^v%c-*`zm-DCT`xdlstPQuGDJ;}mmOFM@Y|gXYuQa3In+Lzh?cXr3;KuuH zw07`2ZTHE=lM<^rO||#QpL@<-UsdBeGTSusWu~Q6|KiPB@|(xeSy>HTcTW!u8B)jP zCuEYTFIiNLO}zuBxMp?o%1?VNS<|+zIBGxSx;E}>)1@`7AEcbU-tt?(xVo+PfO}5n zwN%^Gb7E7g-&5ul;xcy?kl4yDJkZXL{a`>k;?JHIH zA3m&%Y<739Y2})W0@R*GVK23FA&NAf3vbp^ie#Ei#0wa@d}gRdMzk7jI$Mw*uXE`Qz` zF!ossGEy9GG}P)FxvSeU=-vT6RyV$L?_E{KteLxc)6DcpcQmEx^+yGplDz8F3tsAe z%Z0ziisbN^V?A?!@f#v940LV0V`27tW>3DT-gka_YtOBY8-pGFioEEg&^fbVjc>-cD?A*X~+hxqo9~D)N#3_VV*3m*D>wL7X{DY{x9CxBLUnbtT3C literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ8J;eVAr-gYP7mZ_P~>pg?KfX` z!RgXMai&Dc38ia2Zu34S?kO?PG3Gi1Pg}naghREx&@1;~aDT0gc;2KsPdYy85}S Ib4q9e0JptQcK`qY diff --git a/src/main/resources/assets/mekanism/textures/items/SteelDust.png b/src/main/resources/assets/mekanism/textures/items/SteelDust.png index cdac9358ab4bf646ba71be80d57da2c200b02b1c..01675de41b0fba47ec7be8ee32a6374f271ef245 100644 GIT binary patch literal 1347 zcmbVMZA{c=94~V+VUnPt2Had%U~$e~U$|bc9VZ@bnYZkK9k+RNYAEeZAk&E!U$S1*#wANHL3vW z3Cq>M2V}Le?m8$$kacyMKVSvCZ}5r{w#f;MEgp_QHi8ru#Urv(11z)(RBO5mTNu8E zp_=N#4lrKQ8xcTA+uvk@il$P((o~~xDps@?EsXO}APg)SjfZRXC?9uWOS(K5;TWX6mMsF%7Lyt7_?@p zLEa~ptk{A(7Z$Rt2u~2PSj-kHuo-4GL2(>MkTgNlI7HylM%|L*xE{?-Du^Jem|Dcr z3>{4<%2h_a<-(w+%OQj#Uhk@~9$iTkOc@cEBLrn5iEua(*AhBv`M|$!tci~L8zX@5 zfv8b$D)2snxk)n2-IEO^fY2Mh%+%ne$hD%O)Q5p?c|;cmzt~hw8cTnzMQzB<$y(CY7Iaw zF^w>~lww|6!#to!IT)l_TvePb&aieT&ao_qI{-=14k}2~b{1RVtN%B31ayi>)X9J9 zCV2#lF|l0j0=QZ2BcQ|PF=3Z10{3nNNeOvGw?F>#4;2$%wv=Zbp1aX1npxtBT_>d0 z(9AQ=qn*>u-<4(L<%mDFrhmG*rTg`F-fO)vGV{gQ?Jf5n49*;>8QS`0)~{WEjh%hS zxL<1499G^j)-PO6Ua5 z&6mHKUC6Gy<@oKvw%q?d3Y39eZhc4c< zkEyh0wC($p{^|C6R|h7J@dX=mujfnqI!gQ3O)UoaO{wlt^!(L>UuS;!qW>+a*Vle0 zxNpn&UF!6Bu64NjmrC+@=2N}Cw9D4Tl)eplp5iM9rI90Zq$lmz)=Pu8<|D(moo8=u z{$uy_&QCJZ3%Vvh59~1md0qZ96Cf*n{l+$-*0E#Lg8TlNj&1kTJ~D@%%jrlh%l-4| z?$ZAE+eQtR8hF?=xxIV(gWkWlpS$$CQ8X)%1TOf#Hu^2A4hAn51pm?4qNSdH&93pUc%=8o=H{Irnf&^UE(QQw+Of*nb za@MF9!=R_DAsDtSuL+xOIZ-fWgs<2H6($M82;y2nyIuzT>&CihH#=qnA_H7&)KTGm z zCX&lX7@ngwwxY8hpQ9p7qBA0jNrt1S1jEP0L}xOdLDk9DO&?l8$AdD=8NA zb<9U1n%dTuC-K%iP;gRZa<~G+#+jU=<#Uv#v+0eFRL{JPz!VhmUwy5M%?IlHyta;`!HRUYY1^b(GnVTJ$A(md8n)K^W{lV^HH^!eX{r&RPw)EHRT;Vh$KlH{&$i?kbmruN8EZ9vO z#}2-;xTo$Evh%>9%fe($p{ZH!x&GlT^US``t#>AFuO28x#aBZo-~6V&;{bTC<+iVW zX?#wZ{H?e5vuk_zgX8s=G8fK#GV|kKPtE@1M}Mz6W^EZ9*xK~LiK7e4o4XG;GIHZE z>pU50Ivu)-{OL!f2M*5F>I;uW^Ycu)_w^e`J}pHHKRCzF9o~1>=a*)7|GKpI`f~gH a^GFrKRlCR&rRlA~?8yGxY{an^LB{Ts5Uj#uc diff --git a/src/main/resources/assets/mekanism/textures/items/SteelHoe.png b/src/main/resources/assets/mekanism/textures/items/SteelHoe.png index de0c9b43c9b5d7a0cb68cdc1281e0f099b688102..018fe9245f23aa639b762ef87b57617b6e609234 100644 GIT binary patch literal 1251 zcmbVLU1%It6rQ*?)HbOBiQC$TT&AW((%Jdh*_q6c&6@5cX2ngzcA<+F>CD_ayF)TR zote115w%(fDLzz*lKLPOA1pq!#OA>VDM^2fNo-Ll_#jG9QQIO^6rqS_y_4)lA3`4- zn7Kc5zVn^)opVl&3_sPnnj|-ZDr84M+VK!b#1fRwa4Zm|7@OcFmOTJChKg~F2271gEL7(-iDnAf_sALP)#VQgvb=c_KFbI5nb zJssD>*w+AK?e0$$8scc=L!OC?qK+w!K5ij9$S6q?|A|2p%ABYQ2C5GztWI*&gh z(kPDa(TpBm5;>S?_}L22bBrLeOgud(;TjC^Qe0&E1xZp4@;oa@Yy+FI{Xn&K)ZjKT zcOA>!7b~Ydqy~PiWC$jokEaLP@0I95DgtNf~rBNiDVrQ|F3j34vG%@CdC zTb+NUh5q=4{@|(A=4ZRQuPn~q`EqAI^2X)8RsX$*R@b8K?d;J@6K}sdGc%+9G*_&> zL;rH@+U*A*`0dxnr?l%UD}R2mw6xUL-u`J@H2N9yFVx|m%Qh-LiJYb%h81et3a%#c5$~-(P;GKhXZ{lzxw&xGtJ*DcI>V7H wVjOL5v*JQz=;EHMM9!K#SA2Rd{^W@!VwpA0zngstYeEp2fnnvs!DFxe17HZLe*gdg literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ1)eUBAr-ftUf;;updiqim}RYP zRpo8PE!i9x(;z#OeX@6);zR*ujdHR2v(wd&tqAgZby_64VXIlJs(eFpQcnoS!z-~I z_6{!vEuOEC*`#Ou)ZF(Z;}nO61$U)Sz3808?Jz^8pJ~FSr&E|u=u4}u-#hIOqs5N0 zn@c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvGjMjE=kNwPKDW>3A7uk*ATB>E9aur#FG4?ko^1{SSkp} z$S=t+&d4uNaCTPE2+zz*$uBR~1jP`$T*xk0B7bd)|Qogk$fm=G{Af|&4J z0OY{)QEDDA^ArJdN&ol2gA5FeTRmMILn>|^2|k&{nd|Kqc+3c)}Z!Go-K%3bCz>9*+XP@Le*)%J4ctM9L_zRptPVEQMN|0CHW zR`2?HGpo6Nj%t$^-p$+0-ZbBVuig2L{^XMf^0q6_KFjsDZoaL+mnvJqDL!hh0U9Ds zT2q^1^xFNFJ8z6|F_1X&woI6)UtJNlnq}S9tO*_}JL1-F`Cenky+mQI zpYr_khu@YJS3XE9Y=~R$t~dQ~+GfR4v)Q~+YsD_VoU-rdY>p5uQKm+Q&`-brYD_xyK)8c-r?nKRB6T z;-x0n?_P8}Yim$+uUm7+`vuD#cTF~#?fYwI)Y=O#OFXptFJ>Hx>-$t&sQ&Qy_PcrW jwf1s-d%yi-Yy%_1)w0XU(hULgL1m<;tDnm{r-UW|7=Zqo literal 298 zcmV+_0oDGAP)z`+-48*>4;9DvzDzay~!8U3BW4Scc-N(!>GKmY&$07*qoM6N<$f*VbCtpET3 diff --git a/src/main/resources/assets/mekanism/textures/items/SteelLeggings.png b/src/main/resources/assets/mekanism/textures/items/SteelLeggings.png index b4781df9a57f256598f785578543e143091e969c..2726116136d687fc20a7e7ab44b0eec6a826b6b0 100644 GIT binary patch literal 1368 zcmbVMeM}o=7(e+6phUJIy18tZBO0b$uXptGM#rF~qYFh+I$*dc_wkl?a35TcwP1z@ zrn7T(&SV;dqLIxAi#TMHOoHH8+{~g=mxat_Vn9J9%S`HYizfIMDEbH4A6|0r$8*2m z^Zi_?qI^e2`i67_K{6brHW%D8V{d8-TsKD-7`UxhOKQ|g$)g4s1t3Md!~)bIF!jI% z7`~sK zTXL$#S%F$51)zG39_O?ai5krsQm-?UWFAUs$$Wy;5|kMyNm^&5Ndvn4V9=VvduW%< zzHAHLESOhSWtt!Yfq*8EuaT5`f;5}Wgq9*G3Wo^X-y*6^5EuP9aSb-$=M5c%;1><=<7vvs7yyhJ*8|dsn>Za@ zjDW={or(3BbY>&P>*IP>;}@H?dR>XmXtnE%Bw3;>vXe$A%h#F>W|M)k$GHyCuQDPB z;Lg|8MFD=oAs_lmGNh zTm+jjc3hbPcv+bvAj08M;FPqsMb9J1efu4@B6sk+QR&^dfPyyf$mChZGg_eZWiw6lyoyN4aRRyQ`)Tak-K z%4d|bb%w4ryOR=5)#hb)Fps=nbyD8ABSKz$rzUUh52FXJ{BnF#l>KmWLL9D~J6f95 z=T0A(e`3AVb@A7ah2E)KGqS0Uj`Sb;#+!AfHsgl)=ZVm{Li-ini3>jl3tr!rIOaU| z$w1DgBizUhmg;J?4Rf6BmZd z9-o-q|AsvJ%+W7BSF=)QcX426?y;T3w>^h#CkLvYyc~TH=^?W3@4h_uaN6|ssk@qS ZwN$K literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ98VX=kcwMxuUm657;>-#tWTcF zTw$sI&gp>LguhEXV$==h`oyVEntAb@0K;+SV-njY?PAamxau!BQ8I1bO8$=Z`Uko< z{}C6k|CHn}?-2H*Ob%!$14DyVLk{QKbJrP}d%b>LTUO@QYqu($vs6}yCcECf-OlztxZc)V z2Xn9y8H#4%V;Pl?KoFM*h-g5?z%ub83qeFPU&#kOZ@>}4ro+u98;+MD20d=Xa6M+QX>r_cBJ8*YnR-yD zCNUwqk91FI!JPwbl4a43VX;_D7c=SvsS(3%HXEilUiJUP-`$*gCVQQMi>}#hUZ~;H(_$QaNOi{+srubGFh#adN=MQ%>-$)xGSfz z9zH5lJPk71EYzOD8Xt+ZJ0(ELg5(#3NTv$vngm&hHVGo)bRwF1mS==m^x5Lzmpi!r^N?gF@(?jyj%=8<5RBon!)N;Tt(hphA~m*4VLgcnc?+pmu8+%Z_x zqbn%wnzIp^RdbA7`sph1PDy@ME^%v#b$;G0wI+YVXWQqx=B$^G#@BDQ7SHQGKd>To z@DeS+5Fl4!%5|C+mYcvb}tr3_$43x#8;oXcJR7bd?_-2S8ZPB zfU2v=`S;t;Aw?Y*Zjwia_a6<+8DIOKaa-QOe(&`v!gXI+3GjU)_IxZ%@t4eHyfPX#J>ld8s;ZXr-fF zUrd&6r8-NNX6;etj*TzuCbKpm9csaoJOoz#+;n^-CtUeN*_GbF~C|e|*Wt39YqYNpLTa zQflA)j{pK|twbq>(2DpI;DSNUnHUxEBOnF$;QPn@O!ybzj$KbbiqHE-TrVfWzkmcP zk1-M$8Ml^I@p8x;= diff --git a/src/main/resources/assets/mekanism/textures/items/SteelPickaxe.png b/src/main/resources/assets/mekanism/textures/items/SteelPickaxe.png index 096f170b092076766409452bcc9ddcfa52793b81..9b96bbdda4914354ca9ab67af9722a81e452e77f 100644 GIT binary patch literal 1398 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 O-h7@K?pWoPSN;Lj2Hm*; literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJS)MMAAr-gYPB-LhP~dT$d3Vm8 zJF+)ro=C_X5UT~y?MPO!XfKP74tl~%D;>PPo#ike&=i635svoOg@|6VMzSXd+ExO^$UTnWbkzL Kb6Mw<&;$UU!&is^ diff --git a/src/main/resources/assets/mekanism/textures/items/SteelSword.png b/src/main/resources/assets/mekanism/textures/items/SteelSword.png index 3ea9f6961dda69d1aa07b647cefd2e60e80f85aa..ee892b3773b0f0a74e501fff5fbd2a02de4c2a68 100644 GIT binary patch literal 1453 zcmbVMZA=qq96wTr;*_vg+7Z{Yj7%ffyDL|&*R?j-QYBj}!FCYF4A;A-&}e(*dfFDU z6s7}Zx}b5xxEkYxaXzkf^4{|Z_6y)R8o13v`+9!VO9i4883JMTH$9K zKowy5Xwzk2LJ&oh&s8JUI9@Yyf?vy~G1`bf2-yf?vP6O`w*g3~2Q>HsX3ecL2@UGw z&6;YxgKz|`pwYLcSp@5voi46<1IO?h%SzM~F+u@;AhBq~zcCOpM$DQixkh+SKjRv7 z3L z?=@E0>@&LH&8%sZq@WSU!{M+tT%r}k2ApIV1}Aj5PKQAR7K#QWHi890g&7Gp5aL8% zQ1S@@G%bSPHG9n7m@ru$wXpM2L=z~dNH`)YllOF`63Y%F2zi4?MZ`9FjDS$p> zdO*^cfurC;0}rO73?8q6VrU(&&&ZjRZ=e~?Mv&P;u7}9a*b9Iu#zCU1Yu*Q3Mv}~NeDFxLDXtRmsR@$ybum8PiJV_ zVH*&An*nbZ1wT3!Vxw;k^(;+!y&OwpJk4+z;3+-kpdtS>IOJ%3P6Q&x9;n6h*D?xE2?U zx#f}A#JRtJyI$D-^R-iiZr4Zsy{9K)Yk~`sU*+Sf)WieD^M%8$oqx2;52DdUD_-xZ z5B7%n`*$Z_sfq8}ODrp1F5em*9q0}H;LHZV-TvH)Y9ekDyPhh}(IM)u@#4uui+oVt zepn^Hy!OEO$k3I$md{M<^Y`p=Ptv5G+gs95y5->UrOCF*`AVnSa$#Ff_K~cc`@fJ6 zn4%ZZrAu?}+!nJjY)Si}Dl_|(Mr?`6Y;#i`iWB!kQkM607ZJnKM`U2I5#83S# z1xLKkD$Xjb?z*~oS#|Zj#Oc%Xl7o%{)uNp{RDqHHi^0@Tjy;~*`o!SwqF0rpV`K7) z95R)E!!x1o-urOmn}HjN58g|~-h9g%ZyTET{XqTUq58@Mvzs` zC6=Mex~}A9US~MaqJkL{KS1kx!%&Bo7>ZY zpM842MfrJOUrK&B{%%`$clY(1*G}arUR?RoFw%-BkiPek+>;H<|4RQrE6Sa=Pgm8y F{SOBw8pr?u literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ<(@8%Ar-goPPgW2FyL{p-fg*) zv#;;2%$_#)k4$@$&kLJQP>uNG>T9&ekz-%`7Di@<7X1#xLvjae89Iy3d3bStln)TP zy!n2^=A>EQg$qL8s6SX2kgTe~DWM4fHq2DJ diff --git a/src/main/resources/assets/mekanism/textures/items/StonePaxel.png b/src/main/resources/assets/mekanism/textures/items/StonePaxel.png index daeb99288c358d374cd2f069c0cce2a30fd40f6c..b82cdaa0dc211ba8d1e2bce556d957322accff91 100644 GIT binary patch literal 1389 zcmbVMe@q)?7`_diD{+9!20|j92Ma84z25cu>()x3rK8&l*fp#=NVxXC!U?@Qu7@ow zj17kbXEa;D1QIqSGFc`D&D^Yx4OocdpG`8i2yWAb1g1kJA(2St^ea&G53)bJE#AE)J}n+WkS&fPn+wiK(RcGEIKH^>Hw&j!rO>177yU|zl>w5^iC%y@ z0&Ep<0hVj18wX|tiL2w?9>wF_$N0p6nvG)A;eZ6$2x86)ORTR3D5w`y@qz{W{p%|j z%5xU%fX=CLN>)(K7d6UYe`B%R*I45-aai8Vs5#6)fdEigG#scEf=t+gE$cFH9X%#6 zbQz-5Sg;kRJkCs=$^}(Pu zne#I)n|;+5+*z<{MUfbS2!%rGkX9|qRRn1=nFtLntj8~~>#g~;k+RxN8j>uejkJNxx9N3IQfJ7wT4P*? z5L8&f2V%B)XnU1QK9S2=wn^SQV63i;5Vm7A4ebMY9j^0w;!oJEJ$W60i-( z{2PF?%VGdsPBFu;W8O>Ce%ecFaX+Oo;((?B?$sK6xL*sjUL&bxHM9|1<#Ycxbp&*Z zh}Ow}>Lzvsi!r)f>jJo0>mwk*=8<8SM5a=%AjpQ34qLuEJoS<5#@^A&=MP_wq+RG8 zF5aVTFF)4Vac!d|tTJc5uyJTH@#zY)%He5K_b}JgI~#M7wsy@WXBv~Y29|Cay7Ojk z_oe*N^ycEBQ?pH{7k6~H9%Y4RXSqXH7e=oC**Y*^9>M0yny+7GCnFahf73CXGdij5 zF8=trcAIqeq5DvO(vR_XUP|}#pLuNA+X^D(cI?CvzT4e&sVC$9rQy-TZ_UW2XWOjb zy{;=d`P5ZS((y5=!_?PYmh`>F{$VNF=W2iL{nm+UdVKuzcf#g`Q?oz+b@z)3Ro$7N zs(P0W&M(F99-B|^oycw+N^coK&z7BgoZhePq2_PTP-#R7dJOH{lYf&wvoA~x*J=iH z2kzS&+A?!b5JwU=#Xb1yH?j9%*U>zuckkvFDcUqJF-jM21N2>Ak4ei3WwffWzucGt6OsX!p-|qe3hhL|r6VE?f*#2c_ vO7bTaSqYv8=aUT+B@M#Zu7TD&7m+w5v41e4^$y&P{s0|?#kNliDqH>mo8j>f literal 254 zcmVM}RxKmUa{*%!&9Dka*m$un}WK zr1Sh80SaE15A$?Er1SJIK*6u)4WZz6X}MAO72qnD9$@|jq{=yg!$x2x&|5iI{qP9P z1V$?#ei@kwXe;ksy6+dzRxXLCKT6F7w3Q$Jb9%PG8>tX(henS@9smFU07*qoM6N<$ Ef{k@yJ^%m! 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 fe996df43a38f8f5c2ee01389013fcb846eebb1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ^`0({Ar-gYPB-K_q9EW}%$}bx z^VF$BYU~>}ZrSpcDeix}KF7MFdfgI<s(mf`b_h2p2ztvSGPcsggr`^2?tw;1O) z^44t*QD|w9P!94sVHy78oaMUC1Mj&$92aI36o8<{|6&SzTIz%%u8Dtnd&62T-*0>Q b@y&NSt}Rm8AsEaIbUK5ltDnm{r-UW|vl3Yi diff --git a/src/main/resources/assets/mekanism/textures/items/Substrate.png b/src/main/resources/assets/mekanism/textures/items/Substrate.png index 44074f562280a8fb39c715210714852c4e3b3f3d..d95ae1913562a974a0c7d210152dea77170392c7 100644 GIT binary patch literal 1410 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/items/SulfurDust.png b/src/main/resources/assets/mekanism/textures/items/SulfurDust.png index 05e2296166410420d1dd7b78fe263bc2cd9dc714..12e6db27544eb38a69702459dc281c9c929d2617 100644 GIT binary patch literal 1399 zcmbVMZA=?w96w+X1t$z0GLy~Q!3;RA_d?sFCza7&8QofBPz6U~xb~jH3B4;|aa z$5(+8zzYp^;~*D7V(LU!xmNCUupZf`w15+yS>^TjC) z6$LX^W^j^DzZF!Ag^da*Z7gzm8f!cz0n2*|%?+|pzy~xQ4f<*&l?|G)MO_xI!^Z@M zE<&^#Gq&VZxw9Cx$_hXYIs@(@X$oabI?A9oQB)R6lTuIEM-KO9}HSk z1TR~{6)f9=J2O_TX?~U<0)c=okgb!IDuObZOaw_2G>t<9t~N*-AH*d!Euz2y)uV`h zO_U`xtjN3Ndd-YMPnSaQ`JK)cVM$$16igWrXR)k?s>Zmfz{T@8Lf zlmJz(S3K}OylD|K%-y{Wg@Mo;_Gv|gm%`U_vZvk$B+bs5G5AF%hyqJ9yb-{daRZ zs>Vwm5V0*n+soYidvaN;0(ebUT(Vpnse;no`L5u_FZZ9_%JC16^#-o~JkjHI zzuX;*QRz3^rpl)(y54vzIiYv!kB5c6H!~7ajA_>SsZY8x<_oh^&%RFmdEv=h-_*6m zoqHgqyL9HaL$gia&T0>)VGEDf-UbVJWTn`5Ak~w%^Tyv}xZRx}7;x{$dCV!9{=s9@paMm_581vjq&6|5GUWqNF6LUJIr|+yeB3iyy zQQctDyCu^7!^idxu1o!J>aS4iz*p-XEvK%o+0#KL4fO2* literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&kwQk&)3_Y{iU~B@7IVjGiuzArXg@|NQ@Nf7pRZt&Ndw zF`q;!1NTlT(^S`hP3ONJ&zEp_<2X>W@BbFHu)-kcq!%p=XWHA(R~s7u!JnVS{f!{d zeHu(Bp6%P6(t4z!ok4lwE{5{Qo8iOq0I$Cc#-yTrAA(;e4A);nn>|kH$)ZjLG5MZp5>;s3G7q zyRA#X)AFQfuV#A|j#dsUi6UL4V;A>5>?mhoIJ3B>qgT1@958$sJYD@<);T3K0RWG@ Bist|T diff --git a/src/main/resources/assets/mekanism/textures/items/TeleportationCore.png b/src/main/resources/assets/mekanism/textures/items/TeleportationCore.png index 0cc31d66a8a7bd5f277ec3b74d7cbd022264f07d..21df5c8842c8a97ae0f700b67d2ad4b5df079115 100644 GIT binary patch literal 1563 zcmbVMdr;GM94~^xRSS$U73L#`V~Vp)Q(DqwRIE)ah&(I|igIe2q%@;#N)pxr8z(*{ z_(G43P3P@k;B-zo$D9v56kn4~cTCR*K6a;WdTdVIspmEa$9_fX_J`*m%U!;|M?RnL z`8_z!E2!ZBicZkbIQD%8U$eXQ2!?Rl-_X zim533mQ9t(Ld&>(n`FycK+wEfMFlV_zuODgGFfVx-%HV@tOVKF63%0Q?;k!2LmXp( z3w2rQEU$@ma_N-2f#gkupdF48Eusjv+J{mBNCUl{yy1 zlzLhV1jgEx8m->$&}(r_!{~x~p2x>@$!cA43Tm<#^(boA0%@F^V!lL8fb8ZgNU z+}kW;5qLK=oMM7|j(G~xIvg~GDH#l>l`NyxDeV}@1m>U_bqZx?7&``!@R|RcIs`a{ z1p4GZeG|L_%^27|n*wlnHb<-n437Y>5e*mdQrV$smpS{;REd?(~L*vDJ?~c&2;5 zd>S>V{@7fzaD7eo%sAt#cEzgrC-YWRU(W7JT=doW1K&ML zB8$%_74avdcC6G`_BnT5x_PA>+j=eSc-2s7|AjZG!={dfdhagZ zH6Lr+7fW4iyLfPNVN=Jhu&YxhxEd8UbZB0r^_AAL{bw>`WTC>PRyb-rG2~Z~cN9iS<<>n0`yh zskqjo9MX58JTg7h3`Oyzdx?>ig3Om0-BIH7#g`=wLyMW?$Z zN3GM^y7ozRhjitGAG)vmX>`b}Sn&1oLsA;NExx|zubcb&SDNn~oAORgXUo*>Tb80b zlHNNsm^l7OPiw5PabRqYE%aeT%bqt)MZ3%6f8F@$y$us8&_qXCeHW%%+kJL=DxZpE zW_pj8%$X&tT^LgQ*(4fytM<={2ldyAKkxeS`kuOVGrySjZrIS+$TKH%LdM8WSQW1i TObmHB@Vm}1XOnGnm#z2*dr&;; literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJJ)SO(Ar-gYUUTGXcHn7!=x|Z5 zig~8%_u}oAp5?Zl=N}x4c6IA*DOqMPAtQQIh4sV#E*{(+9O-;A4;a{MY!zA>ilok) zF+TX^wBzBvAdUQ%y!*_0T@C+sDrN8}F5Z&D`5;lwmc`*?RD|pS!CN2I95m&UW6HP` z+S^wiw*HpSA?)z-ZLy8AMZ=?K4Y$-SL;`+)D^b7VR~Q^4qh0Kvb#yJGXN&#ZY*7bY st?ddKx3B*BJ3slq`x6HCKeh>M(~}qacKP;}0sXFVdQ&MBb@097zvzW@LL diff --git a/src/main/resources/assets/mekanism/textures/items/TinClump.png b/src/main/resources/assets/mekanism/textures/items/TinClump.png index 33b66866b830cc7c3b1e54ded70c4986b74dbc00..dc5de63efba67e15c53db17560a88e8d56e72167 100644 GIT binary patch literal 1406 zcmbVMZA=qq9KTHh48frA0XG=ufty6G_d?t29TZmE0wt7T=>(Q#a_v2(9o${HJJy1O zOcDVX!q`5{K^)Pr%q>QuIOc>om6t3G!)9QKVY-Pk(>V=Mq9jV@|Njn_mK4Orych#PP@JvM;!x-K&>J18j;RYzS#{c~SSyq=(W3-d2|y-JbOG4L zv(>->SgxUN0^~r@hB}|KLaDG9Gj5UBupx{l$oo|`1m)xf{j9qND6k7u`vfC0KYSj6 zeVh>~*V%Eq-weFI!bS;{HI_KtjWuqXL-KOroFJnL@IYbVAYUuUOwfod>oV#(bc`YJ zGDN8{A}dZ+*h^uvC;?cf(V=dfBw&ix5IQYQ5ScKE6ImF6VlhktRAQ_qdGuP zsKKpO2MV}QQfqK|3|g8ZIbB$1J$^n(QKX)v%~rFXAgo$iPvHiu#Y&s9^aj028|K;s zSz!e?2;26lwpY1^XL1>{1Xx9soT6A8u7XmpsED#x^uuN|yrbMFaAH8t2;I<1z!o6+ z-UVE~B=YcbiW%QJ<^h4T9uG;OoZCR5I!bFmX^NszJ-`W4Pk2aDOChU#?*FC^Q=P&> zb@HFO2_LD&7+S7%fx21iBOs{FBdJ}oHL$T1f}ZQMSxnC0>{!{bW8}3&3WpZYew&$ic<{2fbaJ4ph&LxjkV&0Cdk22IG9om#-Mv@cTz%n5!>e>^ z+i0Kp>+F=+g0xxT%wH4tiC}NwPTuxQdw=qr?&>4IdwbI_@5G&JPMw@I-F!g5x45(u z%C@I(Ng{qc@kwM&PAi>s{l-#k)48?@?)hu@Rb#MeUtd&r?45^9(V6Wx7aEFxKi2Um z9t^frWVV*#x2G=P#onG)*QxgD>EsAg#QXvg|I)|lM;%`s`StIitdsXL`uoMMl4BPe zj2#09ZXK$=J+%Mj;iQ-YmGjq9s?hHAFX$t?D_h|YI{z%Rj68lE+4E+?qnZ4{J#tiZ zTlw|9Te_TyNkg5v^3%Dw&Bu$gqfOnmuD;zjVyb#xkyC&1 Nh&F49rGHmd%Rk2>`RD)u literal 356 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 diff --git a/src/main/resources/assets/mekanism/textures/items/TinDust.png b/src/main/resources/assets/mekanism/textures/items/TinDust.png index 56708f508c26d878a2a29e9ebaac1fb0337046b5..db7131ffe1cd8d3060e3685eef8f58ea0d07ab66 100644 GIT binary patch literal 1327 zcmbVMZA{!`953P&Fl^^Ci6h%69Zr|6*L!-s>$ToFkLw|)9FXHOa374l_TebpwMSdH zf-hm3`IfP4aam%9F~Mo(;x;AD`!LuLnbQzOC5|b+gt=u|;zlxOhAc*(0}lN__Q587 z-unCf{x8q}-&gBvA1f{@Ey6IYI8-e}&}_@T1$Uvb?DxM#G_5s*O=g4EY^FsWVt!eR zK|GWc<1hk6xvTvP=*6)7b|u#(7_HY#{QqJaFTS4}q-d zax)(hsupdbosVcS%@j{j>2%tjcG@*PP63YNCH(T(WRQAMXJWeoPq!iNmo*) zqN#XRQH*IFrjJ0LE`*Rwg~Ln2st?)HYVK;#Wyrz_}E#Dt(p9Z9H~A;CwWFLqgxd72g75XDToAYe(4 z#GrwNF_LCHv1Sj$v9#>U=`6>u3~ zf;rm?vc1S4b8X zt|jsL6!Xe5=II#YVF46LryImbr^t9nPIfV*+XKXAhZ8tOHy{@I^8Za8g`A?Yb@HFO z$sM6$%r2L@0Bx4~2&$-gbkrp~HXONyVR_Mz;E!5AjJ`hf+DN@^S6zRwCT^=JAqt7u z73Y(4Sl7jI489DU%!@?`)|7>{ozUXM#b?F+N-`+SdGBEJl@X>31+E;xSAFnJJ zY@mOB|MZHjCHH{0#?Ktb#x6yegJGt$c=i-k5t`%hf;+ys+PM#|bssFQnRvEvbKc<( zziXW~`SNhXja$#HTY2~4BSn)PPwaiL=W!Ve^wE)1@C=vO>p{T z>xsF)iZWBZyM~@xwLfn~^~>kV*^3F!x(k-~`Um}oE;MeM`l#%I+S=9=rTNDvxBRj% zfAz8LTXt8yUH8*u=F#4XEBgcAGQCI7w(ss9+Ve;Em!Ir7aHjCooonFK$N03Gk%ler j^Q#YRpUs@TQ9g{#&J7OUT)*>t_7@fk)(XcepMK#V|1;5W literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ?Vc`fJ|z9&&k|7NXRPrB|6u47BAQa)HS zgilzUJcHSz^u&WwhK*v2trsj=#M+Y>=z2o2`8?weA?d0`%^wqAU0B?3Lql>8-+@%c zjhzBwqR!VD4SHWV`mSNt=xbsuX3%S2V9n8Xv018ZWf&jN4CVq;n-1QrRo7XWpD{S` nE!vW4_C?0vmcB$89|J?hguUx*H6929y};n<>gTe~DWM4f7m!!| diff --git a/src/main/resources/assets/mekanism/textures/items/TinIngot.png b/src/main/resources/assets/mekanism/textures/items/TinIngot.png index 44e1ecb663577edf38b80ef6104b5241aa4a444e..1fbe339541936214bd5d6f2191632caf16ee8534 100644 GIT binary patch literal 1418 zcmbVMdrT8|96y5?gO~wPg5a{-k!9+7y+?ao@1&5@vy*9|)J7Y!Ene?_rMJ>vy*t*5 zh9S#zFjywWIGJW~!A;Q(d~GfcYo?oG*nGuD*1aNQXaYgvj4mT{SDlJDF(`uNQK$Gko*(pGr2HL_oe@(O@#qU-~3 zd5Et8ZorEhH}rvG2uj-^dAyp}xtbN^kdaSfjImHeXG2hNX)MAEL7>4tP$Pw{$mpp! z0!yM5Sw}f>XT%Ny(#m=Ttf{Z?2=zgM5s}goxH!h@0wJLBa4b|CR@s;pnb2kRb@CWP z;0cHpv?7yEd7UoUE-L`0j1(&1BmvWmk)X^BK^R~XCrlWDVQq6nUP5Z#(0 z`dK&Un6jnstVlr9A}oeQqfukjWR#T}j9?fB!%2)JQ5}J*8^anOL&IueN`V8aphyu- zlEZLPk@v}UnibJKoeUuqaXP1k!|GI`^ps&SK7tWO91De#aZR9A%?n)fBIx(wFHDj3+&$S)5~zE_Rw|NyDSRy_3w0q7*2+06qJJ@plE{)YUj+1+Q3?<= zY7xx(Km#92nk_!R#mvy8NTqaU;?p*cwp*AoyMuHP#0oP*6p*lUatNMCF)Phro)Bq2g$n=`1)N7Iv)P1NL?4BkNSvp6T*N7XM5g%S|4kjHJB20d z;+s_!C3a@XFqgi8Pez3IG5`%cjSuWUc>Ia*f7)6^HXlY`zF49{LjbziwE}Xh|BeVtda1sNF&+8lM4M6x>bmCkQ`#7=7WY72eidA9w~^{zRW4_d=1aB1#49dqI3>$jcVGOMd{PhJ~-D*-*-n;2Ppaq#Hy!%ZV+ zF8YtLY2%5Jk4?6m#z(o^W;Zp~78UdjD(q8RIk&6Tkk@%lO5f5vsDAnKANMr&V99ae zPR+^T#_SI+4OO>}?q8IbS6a2M`{u&8Memii+oOlBGd<%y&dBoKS1S$M+8k&5{ia=) zh8FJq`mUCL`keom^!P5%JmXA52c literal 1569 zcmV++2HyFJP)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0005FNkld<3IIeS##yN40b1?0?YS8atwpQ> zxy0)>J!v$wR?bB$;F2;*2@Wd&EKHt`MmB}G=%&DR?cI3H;Z~o7%;GpMIi*j@D4+pl?tpNry#5=b?m_?Jc T5E(0*00000NkvXXu0mjfqg(Iv diff --git a/src/main/resources/assets/mekanism/textures/items/TinShard.png b/src/main/resources/assets/mekanism/textures/items/TinShard.png index 5e7e766d69e54430ed8f132a11da1b39dc8ae1db..aef97110061c42766b39f4f8be3d3031a545a9ae 100644 GIT binary patch literal 1278 zcmbVMZEO=|9KSj&SYfhk5K{8R2`r$rwbQJnnGF5Nx2w~qPC+nNi`D`NzfclQ9Q%)lp9?f7}TaqDLx(y zFY1CfFP1hgR%8L8HT)i3hDi~!K~?O|0mY02y%_xBlw^sgS-}mU&$tUvEbb8*xUe9J z(~KvX@-Q4rORlP%<@kP&$K_*LG7zR=4ni;yOwb>oI6v9!3x^o8%8e+7DJUYS>XxDI z1+F{%KrSE9fnch7LRGWXDu|_3Q#I16h6Vy?(*aqL)PnJpm7xWPgFu&G1X5U6bLf1C zd3hQ2fFgxdie_<1^su;#Wjr{?vK;OPBt^Ta6iqWMw#b+MZ|DeU6k*lLf9j_C1dGu+ zE_DICEcFpkVDsp(OT_vW1cKNaBSBxHIClN`mq&YJ4M*m-mEUY)wjNshbtw46_oLTqd?(dUV?+;90m|OW)U0v%2+m@@754~}@ zadU0oq;0Ti@MhM&w_&t<;$2($`rn_+8>Q#%-wmIeP$p}pW?ov=`&xNuZ^Og4DqQ=S z`qAP3E2+v)kABNUSKDj)FN@;}n?8Bu_dlO04}Fy%xbgVdXNRX}JNpIx?cOub9y>I= zU08p~c>3h&>=!T0^o>l^mfoqDf7~TkpFMtm)5YIDd2ZXKD|?=-U*WsB`RMSZk?IfzyF)$r=8=wR(>%1*DoXM jYx^FXotk^~G-0zN_kJiPc3iu6&iW%oLhZpJe`oJMXqdp( literal 1670 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 mG-b}{A0BgU=sh_T)gD~ literal 1579 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 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 c6eb014346623783fc94f23f900ec322715800b9..3f33ff28a0ab42fdd3b96dd7ad5e66736b9d5ce1 100644 GIT binary patch literal 1541 zcmaJ>dr%a09AA8pC<;Q8;FzxKyJR2t+=@S6}n5O%_(r|4s-LzILbczOY1c2}W)ulfgL%mITyhCY=OzG?7UrlY}{M zV+$Dr0ApuUDMrqyUyhp?8YcW0n5S(58vtTrc^hHMA~`Uf%%rSJ=&t7!1X5-tlqS`q zdYgu{P)nUGxzcG!F*&nL3NsX|0%Lew5THqp0C_swYR7pcG^mRUd;c{8frAh(O9{P5 z%BW8QH4ICFQdk;gLPZ!TSHPH5qQJ1lpa{jp2!6(J%~lz@n`=UF*|kFwh53@d0!yNRW29K~2c zzao*& zw)8fvf4J+fD4Tn z_h+u>-Imhb0mms>Sy78imH$~}*~dL-L@*#O4KAOSFtzjA9Yqhi{in{j0<$Qn$0GSr zD$Q>1c@(hj`y1{k;jaS+09B=RCb{_ zWZ_5gt_lV%>^eGaeABH^be|zyKTkJi7g<`q-%#P+*-~g(`^Kk$>D!2;l~rwfYFvP? zd*GG&=7D*=Pru;u!}@#r9H-M{Z8Q2r?%L*ZIC5`g*dwc_{jBt^?>%4dhDDoP&g%2! z=NcLpT-&Ph9`1P1E`GMT8Y*7L2RfJd0*)VOy5-%-SdQEeyxmz@*L;3grq**~N_SsB$~^Uibl0}k z6hbu(p0Zw+$*I4xZ35k$?*d%TFN2;q6RVzu)=jEA^<+xO539UBp1&Va-&b+-^3&I+ zrXRWl%IKO^ZbL=*u`7Q7&Xa57PFz~Be*T)Pz}DO|#_FQ+zs1z z=%0^0Lb&NWDYm&`L3FD4JP+^QYAN>B-&~Pem6~y9`QOXj0f6JW>|{-M{|5h$S(jkY JejUGl%Rf0ESYiMG delta 1495 zcmV;|1t|K34Co7xBYy-WX+uL$Nkc;*P;zf(X>4Tx05}naRo`#hR1`jmZ&IWdKOk5~ zhl<6oRa0BJ8yc;~21%2p?MfD<>DVeH9(p*dx19w`~g7O0}n_%Aq@s% zd)fBDv`JHkDym6Hd+5XuAtvnwRpGmKVkc9?T=n|PIo~$m6N9yl%7qB(zDb{1JtYOPA!qk%@Qub75C2T;T?(y%k7cw{!aEIzj}+@(TO5Y zz-|>CeHr)+QOwk9wo4Sh2mAPGw+7tv9PraN1Olr9mwlWPc+tlvJx(D%369Vz>lLjC zyaqhH*k&)cVSir(7|4_1Rc;%)B4&}Zt&(AK&*3kRaknx54=$T^^z2=OSo@r%xnsBw ziQX&rRKAHn*R}K<@Jp~?uenKKe+BrD`qF#?cpp*psgiwk-seYOU#%402HpjG(Qu~= zP5WwfF?$>svC;J<>zK$RIM;P&60@WifbUlLwAf?lk$1u(mFRYq89Q?S8HyrsX^MVnpsf`{W6(5UXREr zZM&7ilpo6ux^|%%%N9z;(dj0Ct!8>>5!%=VyPg-?ke}Vs>~sbgdDuU^Ixpr19NS&g zQew8Fz<)>RL_{M_7A<1csY*MfP@XcB#Jxr~JS8&7goVS)VKE|4(h_Xlc{z{c$ApZs z7riZ_QKdV_uW-M~u~8PF3UX~a6)MwxDE0Ha zPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiSBY#iOF*IB46Cei@XmvNzKBsGIKkN=X z$_Bgm&h5TyYjpf^^Nrn$ZO1mSZpOC4_}H(pE&Od#0y|)Oik6|u@OHupcq1J>TmjQ1 z4eM{2+Oeah>iL1tBPPK=$Ue-{x#7^N{-XY=Zm3_V7u4T7YJ?d(rX+nTeJlMa zeSar?Fa1o4bXmG0{UlwLzL72kIlJ$@pC#CPuU}yk-HKgk)oY(MCsR(!d*m18l>EH> zvOF8G6uDm>lc(gp@azfp%?$k=y%=-~vuaJXdoA$<7&H$h2Au}i##F_Gt8^Aw+nR z0004hNklT+oj$ciZ860m znS^#hUDx7*S^{gDCRx%$#}Xj$VHn`6mg6{@vMdcp;#rb4%QA`EgHPZ04?0&NB0xbO zr;{7Y_CJqD)()eX00MmS>wLbM-VcXcJJi^O0D;?}Hkl9s@iycV+2EYtl7CH1fJTLp zxsnpYPEtciwFGuzkN~)CTNK}6Za zMHq#`1gmNQc`i32ns-ui^xg$rI%)z0UKE9!$4t|7)oDqn2>=;@=+mv4rYX8&8C3&s zKfi|lm~ZtA5a{>oOAPikc2E@on*NxFip^S007bU6-muvKp|+X;C0qmKBNA1FzN8v` xa0cjM>25gBDkCbB3qMUZ)` zFH&;>z(2xiNfXnIpJH~FRuVpp(oJ&`8vy1exH-a}O^ILzmE~l#itgHa1?VKT3Tvzp zHgbB(;auq9sU;qh#qPjF-W@2VM zc_@~2(<&UI$YBuVa=DbQ7$wVRK?sVX5Uhe!s%QxjE#xsG;f`j6$YBMX670N_6P+vr z`V@%_c8#c2NSVGZf#ybJ8DXeRQo|rO!9j=;_LVdYG#dXOO4B1~K{QkUP)geIZ=ZkN$Pk!DISm0=utc#hvQ*%n2WRaH8jPD!(4KN zn+T7}^*Mp&q{ukMJ98;AnP+Kmuwu+PdM@~=dP7`t)LhV{QMr(m4CI^ZzvevrB$>x| z9C5958Sy>ENM`3HS2x^>(gMJkd;^|nao_sGx+pt*vFv+q&$9ix(9@egshy-*Z=N-O zb+PgIrK<^@2W^@sGkP@Slv~CeLs;nTfQ{!*oU{eE*KiT(1&=}w+_f~7$GA7PemAqZ zWc)eJjr<)k9j-?0{g4*5v4-yK-ii>rzv$cY+Ybku&Q@8X-dt&n=)YfmiYBaGU2pDi z@~V#RZZd1d*yf7Y1=E>tFWvj;_xNdL=N#%Wm+$dat7J(h?4^B=56s)23IskB!@GLi zWii**&XK?CHzTjEXxGJnrxyowuxaKlxQSFfO*omp?dBrCrAz(1*P?8{Ebj`;zfD%B z?Ubj=HZ(M*T7zD-b<4J1u%F3^TeK(T>wsC8R5ug$Hu+^8pGvGeWC6l92P|xHsQ1)m z06h;&PZex`6!@%v-;2UYeb22&4Tp2Q==G(*+HL5Ht0k3_cQ6&2GbIyyPrE&tt-Aa? z8)>rGri48%x{z-m&ub%BU;y;*ZF6uLt}WclNiG+-}IkSIDP?nqQtBUvqt8Vd&WAP0HO{_U4zDsN}_)yvGbBXwz4wiZD1d$o6MVVRS3` zb7n1iL|J*BT3Ksd@TD$fpvJF1uO)Q)(U|l%rJbwp-0(InN9x||EzsTR+npVmJ8=E; z^!mv8IVaN_D#}gcnxEwQzw~J5)ptyMaIG)k@{itdTgwr-*9OZ2%1jkSR~)jcb|#F1 zg^bvS7F+!~U|eooJM%s)3-*gEHBR=g*^U&Y5W4EUV|u$@c-e=OBRc%6)3%m{ zTgbLoMU>3ehE17v$db}VZfrk#;ci4o&#$F(Dm`_Lv&-Kp91jC!$L4JKMm#Lp5C9BG LCj7{J+xou&0WeQX delta 1495 zcmV;|1t|K44Co7xBYy-WX+uL$Nkc;*P;zf(X>4Tx05}naRo`#hR1`jmZ&IWdKOk5~ zhl<6oRa0BJ8yc;~21%2p?MfD<>DVeH9(p*dx19w`~g7O0}n_%Aq@s% zd)fBDv`JHkDym6Hd+5XuAtvnwRpGmKVkc9?T=n|PIo~$m6N9yl%7qB(zDb{1JtYOPA!qk%@Qub75C2T;T?(y%k7cw{!aEIzj}+@(TO5Y zz-|>CeHr)+QOwk9wo4Sh2mAPGw+7tv9PraN1Olr9mwlWPc+tlvJx(D%369Vz>lLjC zyaqhH*k&)cVSir(7|4_1Rc;%)B4&}Zt&(AK&*3kRaknx54=$T^^z2=OSo@r%xnsBw ziQX&rRKAHn*R}K<@Jp~?uenKKe+BrD`qF#?cpp*psgiwk-seYOU#%402HpjG(Qu~= zP5WwfF?$>svC;J<>zK$RIM;P&60@WifbUlLwAf?lk$1u(mFRYq89Q?S8HyrsX^MVnpsf`{W6(5UXREr zZM&7ilpo6ux^|%%%N9z;(dj0Ct!8>>5!%=VyPg-?ke}Vs>~sbgdDuU^Ixpr19NS&g zQew8Fz<)>RL_{M_7A<1csY*MfP@XcB#Jxr~JS8&7goVS)VKE|4(h_Xlc{z{c$ApZs z7riZ_QKdV_uW-M~u~8PF3UX~a6)MwxDE0Ha zPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiSBY#iOF*IB46Cei@XmvNzKBsGIKkN=X z$_Bgm&h5TyYjpf^^Nrn$ZO1mSZpOC4_}H(pE&Od#0y|)Oik6|u@OHupcq1J>TmjQ1 z4eM{2+Oeah>iL1tBPPK=$Ue-{x#7^N{-XY=Zm3_V7u4T7YJ?d(rX+nTeJlMa zeSar?Fa1o4bXmG0{UlwLzL72kIlJ$@pC#CPuU}yk-HKgk)oY(MCsR(!d*m18l>EH> zvOF8G6uDm>lc(gp@azfp%?$k=y%=-~vuaJXdoA$<7&H$h2Au}i##F_Gt8^Aw+nR z0004hNkl9C6vj>I$c)6o%v>?`2E9OUkhxn9ku7s>kPGw%oluX!j2M^@ zE9n>MMV148@7YK!MY3$af8P&d41dWy&t}i-Woz*~&u27g-OT}{!W8!pAYK9Ov!x~G z`h

    be$hs3ozcX_6&7*}MP{ABKTq)%`e*rYuY2gLsux&9Y1q_7v0i{gcf#hyalE zbvn7Z-ud}>^!mvu2B3ts{(8AQT%U)-W6TXU0f4wIYQt~<;@8ku$QJj-Er0pM0Jtl< zGq z8wvKS9zn2*Co$+8`1>+0mXsX5ZlW3h;zd!ob<8wPcbgVM4M55yNOOEO(=?^2xR2Tc zA3whaE#?Yd0f>ITzr|?Zb5Mf-u>3JUDmJwmfHv9E^Cq7yz>U=aC>SEN1`@Ri*NSTF x>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8K--E^(yW49+@N*=dA3R!B_#z``ugSN z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0;1ij|46siUK#k(;xdqq(7>tBHlNlZAz`n~AH7 zv#FblvkOeGOMY@`Zfaf$Om7NYudxA6y`YqkTL84#CABECEH%ZgC_h&L>|?7;+-`Bf zX&zK>3Qo5ex#HBT4|I$^C|;4`872fwJRl}K)dD&2bf20BOzcI#RBgh$av=i)Q<0~O zV@SoVE8*VVw*o}YnLgg^RI5;8yzY(L9gb5uEsv5Gi2P#z!<@%ecKM&+f5*)5rFVOD zm$Eu?F)tL25Y6Yqu;-)|1&+J-K?)ocHs>XRLdDX`SPB z$>d9R&EKYbsosrp-Wa3zKj^&b-A@*qc5ht&^!9J%i5vw65^t84@8G#GQ;dt%=i2M9 zerYj!m)kC8u$+1R`Nnz;u9q9n)}BjT5TSFZ$w#fZRB57t?$&ePsw`OUef-%l`6Nrl z`yUcw%Y!u6Y`&>8FL?d+nVTgpnD9odzS=O=>u89DQE1resSlXDk2-yryYQ&M+wwS( zp5w_0deen#@V)*OebWy;ajabLmXM)JQhAX2(;~_3_+OzR%BlcIVdr zOM(|A+w}As!o_`G>YdN%eIIn-Kz{swj;#mYfA@~NCm6Z!^X_|}J}hq7a5s-T{np#E zM!A0W8}Gk2Haal8*!+v-)Dkz|f{bvVk1|}X4VPbvNOT`?fdOo#vg delta 1481 zcmV;)1vdKq3)%~iBYy-WX+uL$Nkc;*P;zf(X>4Tx05}naRo`#hR1`jmZ&IWdKOk5~ zhl<6oRa0BJ8yc;~21%2p?MfD<>DVeH9(p*dx19w`~g7O0}n_%Aq@s% zd)fBDv`JHkDym6Hd+5XuAtvnwRpGmKVkc9?T=n|PIo~$m6N9yl%7qB(zDb{1JtYOPA!qk%@Qub75C2T;T?(y%k7cw{!aEIzj}+@(TO5Y zz-|>CeHr)+QOwk9wo4Sh2mAPGw+7tv9PraN1Olr9mwlWPc+tlvJx(D%369Vz>lLjC zyaqhH*k&)cVSir(7|4_1Rc;%)B4&}Zt&(AK&*3kRaknx54=$T^^z2=OSo@r%xnsBw ziQX&rRKAHn*R}K<@Jp~?uenKKe+BrD`qF#?cpp*psgiwk-seYOU#%402HpjG(Qu~= zP5WwfF?$>svC;J<>zK$RIM;P&60@WifbUlLwAf?lk$1u(mFRYq89Q?S8HyrsX^MVnpsf`{W6(5UXREr zZM&7ilpo6ux^|%%%N9z;(dj0Ct!8>>5!%=VyPg-?ke}Vs>~sbgdDuU^Ixpr19NS&g zQew8Fz<)>RL_{M_7A<1csY*MfP@XcB#Jxr~JS8&7goVS)VKE|4(h_Xlc{z{c$ApZs z7riZ_QKdV_uW-M~u~8PF3UX~a6)MwxDE0Ha zPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiSBY#iOF*IB46Cei@XmvNzKBsGIKkN=X z$_Bgm&h5TyYjpf^^Nrn$ZO1mSZpOC4_}H(pE&Od#0y|)Oik6|u@OHupcq1J>TmjQ1 z4eM{2+Oeah>iL1tBPPK=$Ue-{x#7^N{-XY=Zm3_V7u4T7YJ?d(rX+nTeJlMa zeSar?Fa1o4bXmG0{UlwLzL72kIlJ$@pC#CPuU}yk-HKgk)oY(MCsR(!d*m18l>EH> zvOF8G6uDm>lc(gp@azfp%?$k=y%=-~vuaJXdoA$<7&H$h2Au}i##F_Gt8^Aw+nR z0004TNklNuZhntvv>WLwP*o~G#pof~&{0$gC6_b0&4fOKs!#V#4S zc0pN|?1D0Z)pZ@2>}azR0Pw!=ajsYn!=Um!S2hxBPShkxIMcr7bY1slqXrfMa5|h$ z)Yqz?k4Nh`4zi079Zd3ixqO(Z{xL|DSqPArB9*-auBei~)?=|V000O=<$u1al-_j! z*EgF01OgCjNCI_VDI%bQ>STPu!H;zi`JMw!)2N~-!VjXhZ9{(2>ML3TYb4J>uWk6c z8I5q9qnA302>^JOWi*Z&$MJ2Gk`NO>WCTPVZp}E3QDw`Z8ra<*3VKNM&H#Ykwwn;_ zx33ogNPoyfMQ1H0fJJ6nZ$cc?0bJi=0uay#=ogWoBK#FpVs~Z$9+q^=NdR1Pt(Orv jFZwKZv7cjn@fvsng5i4Wl5bNX00000NkvXXu0mjf(@(@= 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 b719948aa4d525002064d27bf894d5fe7ec134c2..e945bd3391dd02c7a32281e6c5acca4690964306 100644 GIT binary patch literal 1568 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%!-*I5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8K--E^(yW49+@N*=dA3R!B_#z``ugSN z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0;1ij}dUxwD(8rIE9nqq(7>tBIwBfvKAbF#HWn z&0Gwe-C%lM@{>z*Q}aq-dQ%X3jdAJ)rG(r9pv^9+MVV!(DQ-pixe8z(TV>*Q3(!_v zZh`1c!R;19oO<AP1iAQ}cj{y$G19Ia_V>85o$Rdb&7< zRNT4}?%gfrC@`<=T6)V5hZCu`GrKDUr?e`t@N+9B>Nm#xVUA;ZHtCOGy|bU<&NVl6 zA_ewvIA62j+0htdQz5|H_g>QNcxSM!sZV~HP`U64ALq}dw_|VJ4-dVodeNkJ_o|1_ zTLki^xBb?h+Ld8FztOkr3 zy~q1sFs9DxTmIhf-`VJfi)&X2Nh^PvGt>P39@FFO{QPIvZ2Td|{=|*TB!1sApZPL{ zXTy)H$;sF@tUL9kVbAsBoa*V;+Ue3QyZFDp`&zY7**MiF-uCbDl|n+o%&)q3H9W6; z@vuN*SDa$v)RMS7)!I`yVuM6)8719xviwmwdKa^uMDO2uW}6}7=G2*9k`gmBEi+l!0a}+!TjYn z-h#}~o}V(EE)3$`tO-gJ8Qy&V-D6Zy{3v@xdXx2Q#+-QDk%1jlc2*JxoW|1s$ArHqBJqcun2kI{U){ npZ^xQUd`Lyxj6sOd?p@-+;*pZa^;HppfcOj)z4*}Q$iB}^VnMc delta 1492 zcmV;_1uOcX4CM=uBYy-WX+uL$Nkc;*P;zf(X>4Tx05}naRo`#hR1`jmZ&IWdKOk5~ zhl<6oRa0BJ8yc;~21%2p?MfD<>DVeH9(p*dx19w`~g7O0}n_%Aq@s% zd)fBDv`JHkDym6Hd+5XuAtvnwRpGmKVkc9?T=n|PIo~$m6N9yl%7qB(zDb{1JtYOPA!qk%@Qub75C2T;T?(y%k7cw{!aEIzj}+@(TO5Y zz-|>CeHr)+QOwk9wo4Sh2mAPGw+7tv9PraN1Olr9mwlWPc+tlvJx(D%369Vz>lLjC zyaqhH*k&)cVSir(7|4_1Rc;%)B4&}Zt&(AK&*3kRaknx54=$T^^z2=OSo@r%xnsBw ziQX&rRKAHn*R}K<@Jp~?uenKKe+BrD`qF#?cpp*psgiwk-seYOU#%402HpjG(Qu~= zP5WwfF?$>svC;J<>zK$RIM;P&60@WifbUlLwAf?lk$1u(mFRYq89Q?S8HyrsX^MVnpsf`{W6(5UXREr zZM&7ilpo6ux^|%%%N9z;(dj0Ct!8>>5!%=VyPg-?ke}Vs>~sbgdDuU^Ixpr19NS&g zQew8Fz<)>RL_{M_7A<1csY*MfP@XcB#Jxr~JS8&7goVS)VKE|4(h_Xlc{z{c$ApZs z7riZ_QKdV_uW-M~u~8PF3UX~a6)MwxDE0Ha zPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiSBY#iOF*IB46Cei@XmvNzKBsGIKkN=X z$_Bgm&h5TyYjpf^^Nrn$ZO1mSZpOC4_}H(pE&Od#0y|)Oik6|u@OHupcq1J>TmjQ1 z4eM{2+Oeah>iL1tBPPK=$Ue-{x#7^N{-XY=Zm3_V7u4T7YJ?d(rX+nTeJlMa zeSar?Fa1o4bXmG0{UlwLzL72kIlJ$@pC#CPuU}yk-HKgk)oY(MCsR(!d*m18l>EH> zvOF8G6uDm>lc(gp@azfp%?$k=y%=-~vuaJXdoA$<7&H$h2Au}i##F_Gt8^Aw+nR z0004eNklZt~5HukrH4+UqbwrgPgL*QLH6rP+v`e0>%K{Ba*ZU?*-N9gBhTQ uB|mZ+fY4m;Wkk-qKFdSwx3KTN2Yvv;yohW-BT{w%0000l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8K--E^(yW49+@N*=dA3R!B_#z``ugSN z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0;1ij|R>tFe=@lbf@fqq(7>tBHl9xwEsYp_7ZH zxud0lqXA5>OMY@`Zfaf$Om7NYud@M8y`YqkTL84#CABECEH%ZgC_h&L>|?7;+-`Bf zX&zK>3Qo5;x#HBT4|I$^C|;4`872fwJRl}K)dD&2bf20BOzcI#RBgIreh&i!QSryh*hn~1C8M&m1@hyH#$-Sn}7 zXU5qy&S1|;45^W7zn_1$e2`OGxxjm=Qy2C+Ep=L z|Ml?E@$SE(4)VKV^yYoHGEOy6;tzkyoBHeytKV{A0|AbNyEp#p7#K%yHoYGo8`67v z&$e>+7CWAMcbWd}$mQt2F1q$#?1%LqZeJB&H=|DMM~&UXXRo&kTGzkQU3*_paa)w` zqsxBFnO~IcW~|;Tx8VMJ_Ajq$nZhnzl}xz2PU5qr1P_zn^56p*CR{i2ws#suSbj7) zlCvS+zJb|#cHVYw39eR#*=N-{8Dox1I4s>T?}k5PP4SzW3(HUF2z5?)-x#6ewuw#j z<~Q2}N!A LtDnm{r-UW|y2(R* delta 1503 zcmV<51t9u`4Dbt(BYy-WX+uL$Nkc;*P;zf(X>4Tx05}naRo`#hR1`jmZ&IWdKOk5~ zhl<6oRa0BJ8yc;~21%2p?MfD<>DVeH9(p*dx19w`~g7O0}n_%Aq@s% zd)fBDv`JHkDym6Hd+5XuAtvnwRpGmKVkc9?T=n|PIo~$m6N9yl%7qB(zDb{1JtYOPA!qk%@Qub75C2T;T?(y%k7cw{!aEIzj}+@(TO5Y zz-|>CeHr)+QOwk9wo4Sh2mAPGw+7tv9PraN1Olr9mwlWPc+tlvJx(D%369Vz>lLjC zyaqhH*k&)cVSir(7|4_1Rc;%)B4&}Zt&(AK&*3kRaknx54=$T^^z2=OSo@r%xnsBw ziQX&rRKAHn*R}K<@Jp~?uenKKe+BrD`qF#?cpp*psgiwk-seYOU#%402HpjG(Qu~= zP5WwfF?$>svC;J<>zK$RIM;P&60@WifbUlLwAf?lk$1u(mFRYq89Q?S8HyrsX^MVnpsf`{W6(5UXREr zZM&7ilpo6ux^|%%%N9z;(dj0Ct!8>>5!%=VyPg-?ke}Vs>~sbgdDuU^Ixpr19NS&g zQew8Fz<)>RL_{M_7A<1csY*MfP@XcB#Jxr~JS8&7goVS)VKE|4(h_Xlc{z{c$ApZs z7riZ_QKdV_uW-M~u~8PF3UX~a6)MwxDE0Ha zPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiSBY#iOF*IB46Cei@XmvNzKBsGIKkN=X z$_Bgm&h5TyYjpf^^Nrn$ZO1mSZpOC4_}H(pE&Od#0y|)Oik6|u@OHupcq1J>TmjQ1 z4eM{2+Oeah>iL1tBPPK=$Ue-{x#7^N{-XY=Zm3_V7u4T7YJ?d(rX+nTeJlMa zeSar?Fa1o4bXmG0{UlwLzL72kIlJ$@pC#CPuU}yk-HKgk)oY(MCsR(!d*m18l>EH> zvOF8G6uDm>lc(gp@azfp%?$k=y%=-~vuaJXdoA$<7&H$h2Au}i##F_Gt8^Aw+nR z0004pNklT+oj$ciZ8621 zOt@W8*R{BymcW{(NtX1`c?l5sFbwcj%W)h{S(e5};#rb4%QA`EgHPZ04?0&NB0xbO zr;{7&?SCGRUOS9p0ti@>U+449^nN(p+FWB30t9Y@+GIEa;%&$!vh6k*TYtaQ789UR zVPvjEV%rBgPO6r`9vMggfcmhzHux+_@eEL~ofu%GN1N<65wdZg=pYI`2imqZRaM0w zL|xZ$0|~aPmLM3#6R0XeT5(R&wg>8J@1cu^E?9y3kTRi`DPCIDmrqEEMG znx^QAWmFBk{rnpGW4_=SAXw1v*OwUVYitk!n*NxFip^S007bU6-muvKTw6_m5{3Y+ z5s50owWJz7I|KBvbhn%afb;cUMijj3vz%kUg?;xL_ydpEh;Iy#oWuYC002ovPDHLk FV1fzl*sA~l 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 87d9a0c208dc44bde290742ba1032adc1a15e462..2808e0951a0005b60a3e24df1997bba972f36aec 100644 GIT binary patch literal 1544 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%!-*I5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8K--E^(yW49+@N*=dA3R!B_#z``ugSN z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0;1ij|?Gvy-c#iHWnDqq(7>tBHl7nX8Mbg|nlj zv!l6*g$qotOMY@`Zfaf$Om7N8uPIKwpp=kX0JPa9wJ5VJHN~wcKUV?lW2;QuZZX1X z9#n4%ZnqfY)TVL91WY_2COp*wIq-C!ng>kmMZi>jxxd?=fq|*k)5S5Q z;?|XL?`)|+k$u-Y`FjN9Iqn{rdb2~?@uVAv9@Ekb_7CI>f;Y_m*8f9#msYH+SEfTj zu!Pj@BMqD-j}NtG6xQ^dGqCd8`}~~e-b^1~uiG=Z+w<2IpFcC_z0J~TsS|gL{qxgQ zy{%&tuQy${n!jtR*V8y#{-5Ww(=Yet>h7<#lj>#C>e@7QUa_RZe6eoV9T9rd%Z(m? zERa6-*f3#XK*Q%vI*a9E?VroBc`X%+m~b{NalVh*&ZXP(+ZPKy$Wvfgu}bT~Ao6U5PbpsQB>8^#0?&(oen~4A{s0 zOFn*&NK$I>`9eMB7ujoG&dOc6^5ctXOp19w0~9})r4u}Fz|^^67lzZ%-t9DeTK z`DE%3_E&5Z@6XR$`+Dbkaf8H*XOEbePM9rmF;pPtmXcud`2rI2Iy&rUlxzeB)! zZr_8;aqHP%eE!M6-prU_Ai=_OqnIh|QYe4H%aEQ}0~tPMzvaOPDs1>}ye(r*+fbBb zek7;hzD)zS`s}*>{1Tlm47cBI6JV~8PiB~TsOpg&+lSMIpB(2eO5GUY^TU3Ehf2#D zM>n&-@&!E1C6|{pX-_^G@p@X~(a*pCHnq-pzg>M*+GbDLSk8J50|ws?SJ8VvUM>KY N&7Q7)F6*2UngDv`O40xT delta 1486 zcmV;<1u^=F4BrcoBYy-WX+uL$Nkc;*P;zf(X>4Tx05}naRo`#hR1`jmZ&IWdKOk5~ zhl<6oRa0BJ8yc;~21%2p?MfD<>DVeH9(p*dx19w`~g7O0}n_%Aq@s% zd)fBDv`JHkDym6Hd+5XuAtvnwRpGmKVkc9?T=n|PIo~$m6N9yl%7qB(zDb{1JtYOPA!qk%@Qub75C2T;T?(y%k7cw{!aEIzj}+@(TO5Y zz-|>CeHr)+QOwk9wo4Sh2mAPGw+7tv9PraN1Olr9mwlWPc+tlvJx(D%369Vz>lLjC zyaqhH*k&)cVSir(7|4_1Rc;%)B4&}Zt&(AK&*3kRaknx54=$T^^z2=OSo@r%xnsBw ziQX&rRKAHn*R}K<@Jp~?uenKKe+BrD`qF#?cpp*psgiwk-seYOU#%402HpjG(Qu~= zP5WwfF?$>svC;J<>zK$RIM;P&60@WifbUlLwAf?lk$1u(mFRYq89Q?S8HyrsX^MVnpsf`{W6(5UXREr zZM&7ilpo6ux^|%%%N9z;(dj0Ct!8>>5!%=VyPg-?ke}Vs>~sbgdDuU^Ixpr19NS&g zQew8Fz<)>RL_{M_7A<1csY*MfP@XcB#Jxr~JS8&7goVS)VKE|4(h_Xlc{z{c$ApZs z7riZ_QKdV_uW-M~u~8PF3UX~a6)MwxDE0Ha zPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiSBY#iOF*IB46Cei@XmvNzKBsGIKkN=X z$_Bgm&h5TyYjpf^^Nrn$ZO1mSZpOC4_}H(pE&Od#0y|)Oik6|u@OHupcq1J>TmjQ1 z4eM{2+Oeah>iL1tBPPK=$Ue-{x#7^N{-XY=Zm3_V7u4T7YJ?d(rX+nTeJlMa zeSar?Fa1o4bXmG0{UlwLzL72kIlJ$@pC#CPuU}yk-HKgk)oY(MCsR(!d*m18l>EH> zvOF8G6uDm>lc(gp@azfp%?$k=y%=-~vuaJXdoA$<7&H$h2Au}i##F_Gt8^Aw+nR z0004YNklG?FoX%-BdYK|;pknfX5(zkiZ>o?*}Du(f!e=QFps;E@R2Ef{gLid5TZK0~F_>HLRI$H;#?V?{0t!79N zv=98BjD}PIoUK<66a%1mQ51R}n5OAvlR}6ANSOqwj;Cgtrc`B@QFGw??*aJ6Ji#M? zqQ76CG1{-#AOIZxn2U-^Ek_2RNoM-r)TRpfzQq8TFhs}(5;X~JNhNmg2;jw1Uvd%w opRe;U!r)!6l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8K--E^(yW49+@N*=dA3R!B_#z``ugSN z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0;1ij|>(o0+4rxuvt4qq(7>tBI3=p@ox~xrvdB zv#XJlvjt4AOMY@`Zfaf$Om7N8uOm*qpp=kX0JPa9wJ5VJHN~wcKUV?lW2;QuZZXGc z9#n4%Zns$A)TVL91WY_2COp*wIq-C!ng>kmMZi>Dm?G!Hz`)ev>Eakt zaqCL>*=#9Ck^2{aL@L%PJQ4DLrWD7rG@#{?qCim9%Zv2~ybs3Rsz0({arvdVB=1=b z4^%gpJUiUL`Q_2U=8O-~<&m-5-_5SQE!(*^lj)|cM4jSx))phCj-+p(w5?crMBzxk#P&$G`z z_nx|uGv#oC0mGRTqYd+)S8h>0R(mZ_Vftyt<`g5&&lx6OGqd)+{rbB>|4!b4iy16C zw(jNadHm7hOz=vPKmJRD6t4w2OiMjbw38=7M{MOmHq)7B(|mY5CLKBA7az>=J^H-} zPrLJh605TYqAZL7BCcuwORQMu_^9!G4qC|~(S6imR@7RzHKNQN*7EijE!VyF_}qMD zZ}OY|`}GM)saNMF$FW|xKI1ZL?@FBuFShNjol@Dq?sL2QuD7TE#@ZGyV(Oluz+cta zZu0fv`g?m9>T7t({Qvvpitm@c%cq57&KrZ-*F1eeL?J_u0*H?@=5jVHo&OP9uz!0(i`b>!fr9F%xT%S9?iX1RMeu}-e>x|Pv zfzP%Aoh~zio4eNhk~8RKN(o)sq&v|=!!0f1@2(iVHpO}0pLVT^S}PQse&{|E55vlA V$HE&yIv+trw5O||%Q~loCIBG*S3Cd! delta 1492 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 btP%_tUOUddZ2$TxsGRn6^>bP0l+XkK#M@3& delta 1492 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 Date: Mon, 11 Apr 2016 16:36:12 -0400 Subject: [PATCH 39/62] Remove alt textures --- .../textures/blocks/CopperBlock_alt.png | Bin 1499 -> 0 bytes .../textures/blocks/RefinedObsidian_alt.png | Bin 1484 -> 0 bytes .../textures/blocks/RoadPlasticBlock_Alt.png | Bin 1217 -> 0 bytes .../blocks/RotationalComplexSide_Dark.png | Bin 1389 -> 0 bytes .../blocks/RotationalComplexTop_Dark.png | Bin 1135 -> 0 bytes .../textures/blocks/SteelCasing_Alt.png | Bin 1463 -> 0 bytes .../textures/blocks/SteelCasing_Alt1.png | Bin 1459 -> 0 bytes .../textures/blocks/SteelCasing_Alt2.png | Bin 1412 -> 0 bytes .../textures/blocks/SteelCasing_alt3.png | Bin 15510 -> 0 bytes .../textures/items/Configurator_Alt.png | Bin 1447 -> 0 bytes .../textures/items/EnergyTablet_Alt.png | Bin 1527 -> 0 bytes .../mekanism/textures/items/EnergyUpgrade.png | Bin 1534 -> 1543 bytes .../textures/items/EnergyUpgrade_Alt.png | Bin 1543 -> 0 bytes .../textures/items/FilterUpgrade_Alt1.png | Bin 1653 -> 0 bytes .../textures/items/SolarPanel_Alt.png | Bin 1455 -> 0 bytes .../textures/items/SolarPanel_Alt2.png | Bin 1497 -> 0 bytes .../items/UltimateControlCircuit_Alt.png | Bin 1750 -> 0 bytes 17 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/CopperBlock_alt.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/RefinedObsidian_alt.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/RoadPlasticBlock_Alt.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/RotationalComplexSide_Dark.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/RotationalComplexTop_Dark.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/SteelCasing_Alt.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/SteelCasing_Alt1.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/SteelCasing_Alt2.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/SteelCasing_alt3.png delete mode 100644 src/main/resources/assets/mekanism/textures/items/Configurator_Alt.png delete mode 100644 src/main/resources/assets/mekanism/textures/items/EnergyTablet_Alt.png delete mode 100644 src/main/resources/assets/mekanism/textures/items/EnergyUpgrade_Alt.png delete mode 100644 src/main/resources/assets/mekanism/textures/items/FilterUpgrade_Alt1.png delete mode 100644 src/main/resources/assets/mekanism/textures/items/SolarPanel_Alt.png delete mode 100644 src/main/resources/assets/mekanism/textures/items/SolarPanel_Alt2.png delete mode 100644 src/main/resources/assets/mekanism/textures/items/UltimateControlCircuit_Alt.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/CopperBlock_alt.png b/src/main/resources/assets/mekanism/textures/blocks/CopperBlock_alt.png deleted file mode 100644 index 0da5ea2d04696ab0e705938fd54d320e11f84ce3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1499 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+mc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvGjMjE=kNwPKDW>3A7uk*Bq~2E9aur#FG4?ko^1{SSkp} z$S=t+&d4uNaCTPE2+zz*$uBR~1jP`j;VX|iFe zuCak}qOL)ri5bxUW(K-RX-U9fFi5gAF*a6$>Q5mz==6b((g&pzq;vxl0wzWf6P^oz z9C$uT%>!nhB492NFj;tkfq{v^)5S5Q;+9R2Z(fKY&o){0%KT-`4x&PLnt8MJ7_TQC zPJAHM!RoQW(Md;3%j*5{&g6ZW+MB%I-1t{_=KZ}rYMp{>j=6{kt8NbH?Fb3_d|`@! zyoI3HqRz)}S5L2y^FF%#S)I+eE?`@mQb)PI>?!V6Ob6wm-zVB((*}9%yQ9@}umH$2ZS^9q3 zCJkGeXDUL6`uWoiEdJjvSnn~B?Q~Un`$G-UXMT=9x-ur!Mu%_KX>i+mZQuHbinp`ELOxNdH9MBQ+OqXt^!LLthKF+a(^NaGV-=2W z*gIKd@Ac{1KHpaoSp4C}tzFL^m^p27YT5R7))mcZM;E=_@ibFQ{HKuCgK)KTi?`Qq zzgK8uqc zD~)g7+~ziC*Uz_E%Z(E3v!;E1yP@JsW9M2)8?8BQUw@x%Jg~+o`*pGAl2hX54zuT| z)c*XX8=r9Crk>{G?zW%6z47*zcUP;P-js4dJo23P@mGv{ z^E3YV%zf$~~+(m*?@yo{^1#)xmE+%e1U;P;u+& L>gTe~DWM4fqTnhY diff --git a/src/main/resources/assets/mekanism/textures/blocks/RefinedObsidian_alt.png b/src/main/resources/assets/mekanism/textures/blocks/RefinedObsidian_alt.png deleted file mode 100644 index 48e4a900248af352fa04f0f01a63831a8fadbd9d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1484 zcmbVMeNYr-96m)9WmFu+zzo&}OpLv~-TPiR@$OdQ8V>M4VIs4=-4{4vZ;#!D`%oOk zDRKNLbD|F!QD_(;tsxwfNRb+vX|f@57{dS=NvEU{t;rfG?LFYAKN$aLXZHQt=Xrh~ z@9(zO8yHLc% zna~2QU1j%JL8&VY~Z42&9XsIlFC>-~Cy-KfIDTpOFVKf?X6^WB11`(L#cgu_qb4v*!1sX`K=<>)e z!HonJ8K+Pwn^5TKR0zDsZl4i$OVf#hDZ_n?2Pc#&oacjaO`;{)0seJkRSM`jQ-X|WQ-CXLx@p{;7IS({-o6DooTacyo% zX51_Y*>*wO(_GaPxs+7|j4X)xf>0i+g4|L;7NkbQWMvR%0-5S{yz1l+KBMA#)86Cy>0V$OXVZO->yU+wsMN3=QWY(eiJJ^Jiv z#2K~l!pd&^Ui-GBkrzhMn!7_oKW67_Deyn65_SacRK)e@ zL~M3MJ6AGamc%yZ2tpk&ZrE`C{Oyh<$#*AW!Y_(M(X=cIW0&IfN_yWG>`Y@Uc4 zdZzERMT$3D;)ZuFc)!_R+nplSM9=R|Y^&Nu9loMgKQLWx8xVJ|ITWsbsda_&Guz3+ z73atW%Nt%@uXMcG!W=!Y_vwvuHvg7*eV;Va@$O!4R-m12Z%K@<950Q~+^%#SJ9seZ zk0mkH<0to=X)(4h@Llz<%|6RVC+$OSb)<&1tu0&TX^lzT12XsTtSPz~7j>y2?)9Q^ zM_TxaZ@cT+_b@|3>)xR&arF{ebnMrcJIwR8&V6*r-?Vj2|5$8#@1^>{c6nLeX5FeY zo^|0(OLs4P?x`0~p%2aKBUEN`a$2ieAE>Cf@VGkugznFuCf?e1>LNH^NALqV%RX6p zV=(pb$L3Dq@1e1==yR`aYvtSc`-$Ie{o-b9%KnIk^j+qTNBbJjq(2`1W(fPeudSzP pexTPh@-uSic+qYh(f>G7r5KM0OuRD?$O`^nZJV;`4=u0M`~y8n85#fp diff --git a/src/main/resources/assets/mekanism/textures/blocks/RoadPlasticBlock_Alt.png b/src/main/resources/assets/mekanism/textures/blocks/RoadPlasticBlock_Alt.png deleted file mode 100644 index 5193be0c41666887e8f9119ae88f549488248d49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1217 zcmbVMTWB0r7#@w4uvlm*rBoD#=|fv^E@v*gJL7KC&CYJRl8te)kW^`#xtz_8*|}uq z#NEWk(xPAmwIWDCizTfQg|-yLLb}?ETbha#`p|$k8W9T;wL*M|`r?@+8+{0UaA3}D z{_p$$|2zLbM|*p^*2f-=5d^Wmut(MKydiqqAH?Iaw<>WwZAG~O)aR8^O%EWEu{;Bk z1xFu(8q}?^ksB~Y5N#uNX#foryA{)O7(KFK>W+`m1d-~f`?@&{5oy37+f7sVE?%NY z+e%aYQjshASy-|6j0do9yr*Q251X<@b?hQjbp;bR5b0#ysk)(3Pg6_03SLLYEJZGv zpy4#N9MnLum&|$rBqc_oO^yd-LS}#@$^bk;@*EIYz_Gkc1E7cr1;ojfhr-?htE^~h ze#IBwrKt)+zQVG#T8*g*j28^CK$c~e<5`}ku>~EDxk#_mZn&+*pu*4$Y#-U4OGb>k z;f5eiGj)^(o+497Z7l-H7Vh&1?b7;9RGr7<6}8VtSBz{K}a z-qr$R?e6a=GQ`m+PX{)>6uqi?=BNW*R8Z3t{=!(crSJ(o4sp)31VMsMnj#(&(4cuS zX_S+qoZu~~#j_SZBZFKn3z8}aQ~+{fCYJ}=o{jcRx6}_}SkFnr(mnaN*?K)UDm^jedXj zlYMW`>U-bOzWn{`i94wm@BJhkR&OqJH=aN9@`f+A-<-H}_^XBQp6%OO{r1zrhl>}k z&dtS?*Cux@UU{SQ#GA2Wn>HTp`lxYR*l~IO)Sc^MSOq=#g?19f8pR%>%=sdajV>0N_)^XRaY@cr)%+1`GpFa51p`9atR5!o( z{ki1Ok;nFJVfq)Qe(o~bC-&ds=-XQ+rA?XmiRSLv(aqlEU%#GyXq`_kZX6_H(>15D S@Y~+#r&7rEsAoF|kNg8znxtU> diff --git a/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexSide_Dark.png b/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexSide_Dark.png deleted file mode 100644 index 2a088fb2af28f919c9534063018cc88eaa900505..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1389 zcmaJ>eM}p57`{@ZtdXRG(}5-)H`i<#?Ol5m=!LG7UOTFkv91wjh;VHWdg*%CU61x4 z85>%*`N!gxO{WGz=O18MmaDZ^Vot`ZBoY`U@AV0604UY-KEmlCInY5iQM3+<4SocH zluHNIXsn3UXC&QJMJr40X|1w5TRl##3)1fZOLFrZGFrtN3hyqbzDg;v_;OYYj z*;rR2X2Z>^xrCDra&w#ygW+H>s0^Y?hHZjXTCEmF)UaBu5D*G~3(XO{g7$AtMZihF zlcjtd#n50PBH>_~IUOV@T`9rqvs%{z)BaVX1j}Ha@WCo20(-rQx{_!=XCv>)SQqWL zxA;idM*5j%)+zL(adV0+cz6Fq380_`!x?9@m!vrhu7iXdrHgW5C3qofEG$ONh(U1C zq%q(oLrGzAxmJUs8gmJf;#z1wN6=0(#ij0X)%WFMMwTQvhP5-yzEt~^~g5Sz`P#p7{QmR3-9`O+ncT{;2~WzovY%J}lq3kWE0TUgx*tje| zbHg?9llgD8OAoz%rU>YWMx)@YA+YI(DzJehJN}SR3-dFN9S;pk`y_5zow!b)gWigd zsgLDa4(XgiIGs7Pr5>QTDL(^XS}- z$V+|M3gvSn(b1n{`nK+`9Un&`v6lxXBB$dy+mD@ZxtoTb>wj0h>n!T{#$K~LH#Pnf zjaDi9LZid=LrZ(Vja`gH9(`p{%Lx=(#sHs9HpvwL^`BjN8(da|_VP0+3P z#bUZ`aEnCJTR+*;t&b~b`{P$W$?d!#cF%{NI! diff --git a/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexTop_Dark.png b/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexTop_Dark.png deleted file mode 100644 index 0bf571573463328eb489c99dd939cf208d121da6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1135 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nAI{vB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk&``nLQqR!T z!q~`EN5ROz&{W^RQs2-(*TB%q(7?*bKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvc=cL27o{eaQ#zd*s+85~;*8sV9FDf#8anxNo?x;C{avn(~mttdZN0USP7nONLl=49bw z;AH9S>gHk$a=)XKnVGAzv9XDzqmiqllbaG$ZweN_L-o4g)TkrMZlyz=lkpqV79pL>EaktajR!iEMJR)Kr?H7Tu&9-`+BQhektX= z>-{_~=7s8!M%=n@MebVk9SuFV^RrF&_EleA|BegbF!^%tw*V8bx!>g{58wViC$_q9 zOOu$xlNAfrF3bEdS=!h)H1_($^~@`FGA+1cC6OEU=Xpf-4lXI)X*1NLj7-dRPbYob zwT`)5#@$O(|IC@sYxdJG}vFYC!TQq zWbVn8);4|9f_zD}rlWs;xmFh3-WIv${O-`#yC&s?1eEy;)I2jgFx}x*{WbRnMuz<{ VPqI1r+mC~a08dvxmvv4FO#lz~ff@h+ diff --git a/src/main/resources/assets/mekanism/textures/blocks/SteelCasing_Alt.png b/src/main/resources/assets/mekanism/textures/blocks/SteelCasing_Alt.png deleted file mode 100644 index 6989eda9f6d85f242017d816acab6d77cfed5e25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1463 zcmbVMdrT8|952Fvk-#7jM0}mc=6GGNcigqT8|Br)s8Fb-!G@X1J$|JZxx0EjY^l>J zOeYdI&@GH?344NOqRZG8qS=UXPT7oRVGEh!d_@^CnQ?>}M`m_K>h_26k6m)V*L^;p z@8kFVUYE1(#pI;yB%Mx|Y_GPtv^h2MCN9y&o?f3(o0h4S9<@RCszF8px^iA-0c01M z7T^L5-@auW6zg=cTLia9^*Cy2P8Rh{1fvg$evPfu6_Shc4&?%3@30Y+YK%|~TI0KGBCQ6Ty1chOR5N^PVP|Seh6oO$iVWKf3wD`c9HHG)m zE?d>2Ep2CkeX8oGQ8X9~>VrjkS!qErilR^hj^a3?A&@}3q%t8y3gko;Y#_iXf?pM6 z35qB(tlXwrV9nEqA&7p5u3>npX$?}g#~frg=%zPuz3&rQ$X-!Z1|`{DN7@ypW2Q-;0i z-|i@0b)EHmJTdddnHzWK|Gq2*iEO6elSA`?Z(N6e@)284tUP(m?@Rl<@Y9JIcmCT= z!|`YDhT^8@!Wg+Cr3GIG-?*FAnRnH^V>=WV)8P(M~{@REW9;)|IWP$k0G}Aw;6Rw>hYUOKYcN=WT4(x zKQwW&xp@|I99*?_E^P6Y#i!h!qX#b3uT8)1M*C{K{pVYrhNrzFYnJY>x)wkFOKawv zXO?z9b$vxj!k-y)V%$696|ZH*C;WBzBc#7JfBN7HA9%WFcZ{v?X-n^lbHb||g!A5! zv(Kf42^Zd#I+?KE^W&bFLgQz9I|p}_?OZqbZsO|h)1w)gVB6q<(U*^%^De9N8G5%r z$a&us94~&hWBFUottT!kt~JY#HWsMXviVh4C-2;gNsjMS;nI;^9a+vl9`uC9u5g!r zhL&{17Dx#xag{5|JUfHVW0TuUR_C3b{p!_q<$I=ekZ~xt=K1&RT{SmLW8!r)7j`;p Ts@}+n{7UVWb+)4w%^m*$g@_0Y diff --git a/src/main/resources/assets/mekanism/textures/blocks/SteelCasing_Alt1.png b/src/main/resources/assets/mekanism/textures/blocks/SteelCasing_Alt1.png deleted file mode 100644 index 462446505ddab83668e0be711f3e1fd91b4a5e80..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1459 zcmbVMeM}a09Dh)BVS)_F9!Tmun1kW--2IMw-Yy;ppBEr`5P=D8X5Mr6gXfgz?(y#6 zd0@1VmWoc1>;+|x7%N6NK^tR(N?I5y(IB-fbG8_zIb%ph&D{Duz(f7P{G;3M_wv2Z z=llM>hJyU;$W`&HG#X80ZjQYW?a{&aiDhU#*5omwElzcmszp+n>StxB$>Jq9#B#lC zIV^-MU%mGdOxI|Z?-hzm)lyd;!%1E}8^q`XULRs>H0hZEAIt55D&~gef@sC32F~M{ zz+3SWgNt zgQ$C~_`Fl4t^&*^$q+N>4LXjb0A{l2fq}LFunD6`kVXKKpe#B77}~@DBewA1$ePTT zF@<*Lf-Q8j;vQA?F$CfF`}O`by(E_tz+$lwBt=k^4k2_(wWzWIov0*+G}xiS$%0Q6 zBoPa0WZhDwYQ>SK^C5VBF4v-BQCUb7N*NJgeFV^xgx4F4YYwfbh45cDmP9MX)jmiR zLPe^SIaH6b#1I+f?(v3#K;#XxRTfZD*b2MEReGVQ=Gv_|`l9Cro}o;v5u%uN1_(?# zGe@Jv1l>A{HoMErw8cd6hLE16_`pOvX_6%Ez?KDogEkwovdngRvxBA_Gyt{`H&;|t zR^(vFwt#F0xoJ+P^RZmUCPP-0wI z?34fWO-O{AF?d{@0(4oNBPgQbkyBextXh!8)WL zijS$CvHe~BN_4~fL!VwbEVuS0`eUe5Us;r&^LoX;uDku-8&k74Cgn%w>Dr7-om;lm zXOEm)-8fv79Q*Ok?psq+vky_K#NHjD^R)t60}K zobv0*wMU#BsU1`YZjSZr>`s0AvdTcN|J@Oo(b_S3uPSvSIqRLgjcsh?*-9iS?7UYs zaBHf4JlP(wbwnLpQ8(TA?8ULc#M;@13B7pOEF0FI^r(n3wT%9B`g(SPud}$`@yGV( z$1a~ym5iAE%Mw}4vV~apWcmequ%|2Hz~^nHo6aS>Ry!ghI_lQk@szE-?I|dE-6lpn z*By5->FC9?(0kcV?PsD6?0W&zuCCAPxNBN7w(hwJuDP5_kO1tK(z! Q!QW`EBj0{z^RD`T0KsS%K>z>% diff --git a/src/main/resources/assets/mekanism/textures/blocks/SteelCasing_Alt2.png b/src/main/resources/assets/mekanism/textures/blocks/SteelCasing_Alt2.png deleted file mode 100644 index 764f6e32ec87548e08a56f446c02e9529bb1db83..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1412 zcmbVMeNYr-96rFz_$VAuCTntAvB2Ejdzah0-PJ?R+d~fm8DxNI%-WClxCL%^-CenZ z3aZI38owa3MAMv#h_Nr5un|YY8Z?@@N++PEF~=!J(X5Q2Da-bNqyBLGqn+9JYoF)& zeZ0TlZYe8Wk(N9!*=Dn)`B!q~)|?)DXC+$Wj-5fLHQjCcs?F7Ezzp*`w0R^|fQUcD z*T8bfOO5MJ!=*M`(mJ`K+N>^lm=)C!&c`r#B&1nvn{DZ`h{lU`&_o1SBP(w7>e1sU zB1>+xiYl>}XkHkUS2pQzbyI1D*iS~!&SY801U$rc9I}T%tByBqhj(AOfeS36*y>!x~!S9 zsvt2%UQpMYZq)L0GK7#;QZg;97*mO|Qbt60jR3fv2!&#CO`r|49RBOZP0>b0qXvm` zXsGLT(YlYof;idA-K`D9fR;DxDqXfNg|FvSaeW9Xrk``8))!ooC6;vYPH4r9Q4qK= zT69>03kn$NpoIYKU|gg`#dU7R_W~L)F2>FQuMYs9!;|Oq`Z$WFNSb6guP4s+D~8D{ zB8=OXE!&e^y6~1<)~iF_RP_o~t&dkhSx_}qBdBVK*Nfy-$%>?gjojD`O$N+CU2cF< zp{|CIi4?Q)P0R~UAVNWKVWdFkVU*+m7{iky1}K4M054GhNaz$_`oF0oET@QAo&2Y6 z;zw37#+K7vU~Q)R2r5?d=vJ55S0=XGYzbX{&QlTjCi|;_)>=>MZDo%Qu2_;j!;?N| z#z=DW<{O8;FZkq{ZJdVW)b=#|**m&dN`I@NZQs5k*neRizWa$|Yp;$kX+M3v_{#XW zYk%})QmU~btMyZ%^GxopqUgx#;b=74e0+ZD%$BZ%fgi}^+lP;ShmTa`WX^rw=j@o% zUD>@q+F9BC>YIb3TMNApoeCU259T_S+vjb~d|K)0_^JQG?B?U=?$4&jn~sf+?U|MG zRN`lgcC~KIX&mnTB9B@mys|v=$hFQhTe7MTRc`M;S+BMK{6|YmOUl9r-yn+oy9azd z7tQ3e*Y@p68r%7@qb;1jzmW<)(0)fzU*PbtMqh3?8qnrEitqNHII#V!l#$+jAZ`A9 z;?CK-_L@UV4_Jd!#VRrd zkA5v^Ta#Pw?5Lc{WnJ1Jh<;D+#;^N+sXTI_^Tg|yGE#gyGcO)l`%dGHzRmBoK3Pj1 z92zWm;qu3SY4it=VCV4HQZ_ly|Nfz#9c=4ud$+3ZIpl9`asHkmH+QW2-cv0JGi~3# WXm}2Op0^|RU-bJ*xwn@;{_HZg zT@sU0OO4{m=&S~-o;R9ko!w!etriDOuhW@~w3(ufl*yr|X~tq_ zXqzteAzeifEdriopjY7YKaLv|=il%c4eo*qMw*&xM26zy<0D5Hrone`?2H1c3CL1cj0aF&S=h+i4SSb*+6OT5b^}oCc5(iSJUMtDbei3PV5$FmBr8wpwg#ZMEC$HPdjCne1-wdYjwq z_OKqa)k!UBk)2VgW(wF_z16JAZ1u1fcQs9WEe>xj>oFOt9o4Lt_RzMpJ(8MdTQABA zC-NZGYXSC}=c+ls%@6cEZ?)>HgBFXP^V^Mj8|SC#U?2b-Mn~EjNzb!pK}_fdf%P#d zl2|NJE+zwY;?|JqnVVT%DWZv~&j|T_ve-;^Yry8vJ8Tw{-fFSf^$v%{ueb4L-fF1^ zwjjqjsl4=TpI`&dWOd;G8K=C|taBO#^0@hvq)w0(DYg@-P&=e4pwh#|Ky3&vG*|L?XiV=GI*&(JwN(%UQjfeQZMZmNX=lEJ z6GI^2qSA@!g4`4*rH)!ySUhOS(#2z$o*4OKuP$lE69XKa6D^Vy#ym-`I@_hJ5nwq5 zWciv~Xa{4qF&1N*Z^k64%<=F^0U@|^u}A(GsUC^W|Vz67lWp+}9ijgdJ|5tZxIDNRpLZO{hURkcbRo$+_ zT?xJ2WP~61#sNR6RJ1xbwe9|?XmxICHgk(8C@xc~wVYxkOFg8LFq+|u8F1OGR`rO< zEzZqo6yhM<$_nu8lGUw4JvS0LxfKNy+m=d1DpHBbHG;fCC6-XK6uzLrcS9=ka=3VP zW%jEtILJQH7i^5$X^o&Xu(5^qJB0>ckE|dl~zAvt#>~%{Z!aJ5d@G|AIXAbRv7ctA!i=54=n=wSrr5MZk zABCW1rK;H)6BH05n!BPP1}~DHefRBYf_O+@&(^k7P1L;p!A5iK6XW|1zGrv|{Ql{S zO^^TN;h&c~pZY`m&fKamjohr|`rFrj&s%ls!iL~y<)5G3SogOI=YMYe@$TK12V45+ z!GGVoH@tuKcv&S;HAw7my}5F1MxP%P0JwuXTcK>o{D6(ztl_N9D3HBRgXXMDt z+VPuXm)mz2H$DIUCj%STR2;o@=-_SV<@O)`sl&3c>7Scw!goF_-F#%`edn&_CBq{` zvAeN-_Aed3n-*tBztUg3ziHv#JrE>rj*2H=?0#tj%l_ir_1|0?JwAJS+t~aC2f6y{ z+Q9*N)v8r*eDLwi%()l0Z-4Sz!SY|*eP-h6{>jP7iiXJ4hgYu__tWD~c|ToPXumvi zX;e6L`}XaMo$a&JqWy3~$)~fkzpC1^|MlauqwCK9cAfVh*RS)YgRPyOM?LyI{?pg? zp1Xb}+^r}V-x=mUo}cewpQ!j`{_eE+EIEFlqW#R*`{?hy_1|TOt>Ev=wk!<5IYrca L8`$IS9pC*QbhJTL diff --git a/src/main/resources/assets/mekanism/textures/items/Configurator_Alt.png b/src/main/resources/assets/mekanism/textures/items/Configurator_Alt.png deleted file mode 100644 index 36c7ef1d6ced549d2a6f99ed91b291a9ca9c51b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1447 zcmbVMeM}o=7(c`{IEx?nLCYc>$AGzUz23Fu=!IHJTcm0MJ7O!-jQe;C=V-57k5Smh zM_pLZY%XRR1IC49Cc44I%|s$WvJrHPN?06;aZ9#2XSO91lWlw?*!mVI`Ulw`UUKi( zJ-^@Yd7k%quD7P@#q^C?8xaIacU3w(aDF23rm5hVb2rYyNvk-0%67@Gw6ZclY=XoA z)D>VGfCsQbTl0BPiXf@YVy#c{xnE&;DWGE$Ho8b41kngmYK??geiu+s4m5~C3pP7C zj-jGp!MrB7-W{@oMzOM82HV@KYWenEyjj4kFQBCn1`-5-!lIEtQ!va#EZ8zH1J{XT z0z;QglwB5V#VMb=2DM8vKutOm&g&@>rOi6hWHggx5lZPv13~Hu%8ZjFW270f7+rlZ zs3r@3#^b11)q*<<)~F~Uh9Fv7TXn4log_C9q}gmH^b|o+IJCgSZ9#>N;K6WSlEDGO zyex(kQ3|37MwXLW6blADT?ru&a=X`vgW=Ug!ITjZHbjs*JrM{b;##&2D<1H#8|zw! zYuiGA@PM$?BJ=P*{CP<*%-w^95{A$lrdk%^rLav7iEjyjpyF~^F!)6$hyp{=Y%zc_ z<0e4TcnNQW0}VKwGL~@u5~G=>1XGe{J-o@})Z5II(_UdSk)+dDZqpm>dfGubi_0tY z#U)9sD;QSTAP@r{#Nv@Toreqb=G)jsTZj?f(-HvYYia|kY4L_f_ zp_PCgKo)lcp+c4d=yHk~aUFSImo*k*JgZ)J^gT7Gq+$)&+30)<+-+n@5ISa&hF!5`v`s=yKR@whcLzpM9+ zgJ%W?>ib`>oblDYHW$C&Pphwt@8kDx8g9S;)<|@Ey5{4)>lqobOTHb3(#XQ$YqR5> z$J%nyEjPzMIjNiIwja=_)76^J*wXp3uQH3?&Wj&4^n$D33?Dj^_L+9G>e0PXRoV^j zQvCKuQ&-#eY@0YW`L34zEq`+Im$AR@|B%_!P@Qck-FNSB?$+Wt>uB|c)bBsNqux}o z+rXXfdh++DrJXxf!R+iF)M`~V=XUhmYRQi;-k8yx^__}|!@rgs1 zsi=5P5s$e`@}m!Z;H;bV<_x zEr;c4v-|@vhHb_Pq2C zJMrB?bxJIzjz**PPN_@G5s-6bgBL0vLDKXH{mj7NV;8(_iC?G7S>-rcULXAj%b^3A diff --git a/src/main/resources/assets/mekanism/textures/items/EnergyTablet_Alt.png b/src/main/resources/assets/mekanism/textures/items/EnergyTablet_Alt.png deleted file mode 100644 index db29cd8a5007e6b6f5783596f58ba1d11a057e59..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1527 zcmbVMc~BE)6koMPl%kHHHEQclpjD1jRZsNS88?3IEYi$~dL>Z%Ua|vOQm(D|qDqB>~9B2p#}CII0l1 z0L7G*w1629G^~Wp&6o3?vv6AAv{YC|8{|X<4M8(z21SZ40y69Yg)DDX-#OT*hFQj{ zb{m~Kr$_)Fn^7)-x#iipba@eNVbn8I;Tb_(QNRJ2f`eQ!@5h5yb-!L*S%;4iHQX;E z7g^N^k4Hgug4(oMjGJ@(5y+wnfxBAdX z#a(3jpeaQa==6wQuTdm4{xV*sf*RhR5Ya#aKP|DM z%nCdl)<}7TQrW6jJRJyu6P?bdih2JaQ3_>9kP;D8t3x<099O@zUv`0i-FT+7KetQ- zhzt0IQi)db;Z2Bu74DvIC@iRWgU^;&B`H)fDbS@H;AIDCRVz1IhGlR)Mwx&Tv&INe zOk<`E%76inMsF~Cyk>(1(=*11o@e51Ix}X}kwm&J8Aa^|vne^5uwz6zYB8A&SaJmG z;Qcbi(;#A-4ci{T63@lrgajyAka7i~I8p^UK0y}zK0$;D0-ok(c}58MlfoGq2$%#C zy9hAplEA_J6yxkO%u|@b>!m47!(bL#0~mu*Jd4`v~w#^GHgUd>y*lk+M(Abr_&9DH zw{A_ZhlWDpfOYyei{KeHYGZ*UfsoqjS=3(0ge1k{f+<9=%bK z=(xb;9X+w+Y=?hnSB*R@Gv>YC-t*L7GiCs|dp7t6Nea+aiQzNyd ze*1k6TvPDF74b$KqgM^BfQH-|b}K|}Q{EHvx#hoqa5Qwk^hw`)nOi?et!VPtj1#F} zqISDi%*SIcFW(Vzd|VJq@9(<6JsLIo5|737_TKt#b;*hQQdw*|S$AemcJa^6(vRs^vuqoe+fy3935ABNYTBGyQD0wsYW(D5+{N}uEmPOL zeXQj4*Vi}a?ds_X-D)*dHJohRemA}oBiRRgYmb&y*SPPNAAac{dt^!{;%Y^ZbZ}l(Ykt^Ahh}Y~FTmnbvlA z!PE^%^pw^KFGY=A`O&$&#Ia{CuRVEvW;Hw9w*RfQ?Kk(Cd|w{_u&ukJI%#bt8`Ig8 kwrS12Zc|^;U-1i}Yk#ypd@S#24L`*Wdp7x1+QQ0z0C7%0zW@LL diff --git a/src/main/resources/assets/mekanism/textures/items/EnergyUpgrade.png b/src/main/resources/assets/mekanism/textures/items/EnergyUpgrade.png index 52ff6e6977e6d1d8ecc1566ac22c050aae8e1c05..5ef8e2bf0cc5cb1a7635d0aa24f73200fe4b3ab3 100644 GIT binary patch delta 671 zcmeyz-OjTij!D7A(8bW$$kf!u$jQ>s(AC7k&Bemi&BD>l)Y8$^)!1cn9g_@9kqItE zn|Cp>GSwID_Ct91m`6yA#8XX-wmF1vl(nblZxqU48`MI7qw*+Xg94}mwvj5BRr<-glV;euW zOHa#KxinKMZck0?>-wMPE4F=-eqSs$Z@o#Oa*&wE4HH#sZ9Xl9iIJ5VTI}g2hvuHF zeB!UueR;2cXpUWMQ|(c)`xQ2J{6DU9RDF6O^I*@x!w0kHSZ-_hot~fg{2TKV`yG!i z=WW0E{yRUT^3;j!BHiU~|NDc!DPQ>0`hIy|^74;-v#XaUuA3=zSXgd^y%g;27{SCO<_SUEj%IHr4R7)N>_J# z%=JlJ#q{!cS#+AYn-*Nc!SE(~@kO5lSHFH`m=@rCROe6r8m7O2X-k=A^G-5coV_*b z?C0Aa?6dwe3Les1dO7pvW%cQ&GrwHy`(^oGG=X8uM2>a;7y5ZK0D-5gpUXO@geCxG CwJxRr delta 662 zcmZqY`NzE>j!D7T($v-2(aqGw$jQ;r(AC7!+0??##Kg$W!oa}X)W~&m9g_@9kqItE zn|Cp>GS;tVdh(Hhfl1lZ#WAGf){@C*vxNgij-FRJ{G`}t@-e4ijj)To0kIlfX-}0h z)@FyZmdCb4a;%HlExOTlg9vBJ+n^Wn3MCIW30!h@j9SroOeZN#?PSWNk8`8by-IGf z_s{(PY~Ov`_w%fy1Xy;QxNunf^d_eBpAF{vEquMp=k~V5dWp6@%Y!s|*qDFp)6c$M zx;1KT8QY4m)s8!3rX4<+5;SiP&$C_k-*YR-%=KeGn>P89DWir|(ng7Uxw!|=Je_bZ zB`xLH7KuF@+4D`B7AN>$yQbn;(wbw|9k*V+eSUsUM^0abP2a}~ok`9w<;%*So_y`b zpr>KDa@n%XAD>F)e|@S~-LsX$>R9(%*B|QpKR!5DE794KvOFnJUBopdEKe=OA+wTm z{#xmZR`(w**SW47KJ|6=q>hctGTj*d#z%Af`nkG!dUdzMFOFE5#N&Ir4_{_J6MNFj zXZ!8e#}>~U9u{aw>xjMI6R@Y}>~Y=$|M-44U`RK+Xsc@ehUnXNvUv-g3c!cc)x+9-r#!W?yxOt zB240gsBs2~GF%)QbQ+w~;SwJRYKZYY;v5<`w>hWINdzBzXu2y>w?B-3?3etW_xXI^ z-&<8$@@`UMY9a(dNwz}9q3+`%Ga*i0-y90F>NZKqFH>fT9wop^0LtY=7l3U7TLBz^ zTwjuwJJg@hkObf)cWL%s00ScZi)9Ryy$}? z5?Pm6qgW8t(x)y6e!KmdV4pk^C^ckgkoBXOPLB#g#IIqrtT@2GW;_=yJ41eeI)E(J zNNzPBo{T72jophCMS!X`^bCntlfqUpqPs=_KE=jZ5cP|W<2f2Pu|}Z!tR(?v(wg0b zx|o1VixXy-$4pQroFk)hp2ue}1~cF!$>4cv4)O_e0b|ZDFy|UcDwoVRFj20}Co8Pa z4WhbvRrd&&cp;azN`O^F$tj9e(JCnQii#+EML%q{!kKe;A14OnDUl34b(jGXzX)&z zk|@B#A*T7~s5f~CU^GyemWw#-(G$4Vj2VH}z!?lANdeqQ637Uj`@f+>Rin^Io&2Y6 zqEBiuMvl+AK)pQcBj8h;M^d|FfxYMi1jTA>Os+F{dE17r#@A+!>+L!?cVA19gke(Z z`MfVId&g-c0SUC9sjHCvYvAKb%BB9Y%mnGj#Po$dHJ^p+n>tt5r)SOEkzb$w;pu^^ z_HQ4xp1M0pBVGfK4xe7)`99zw&kgy<8y+{i_TKF8TyslFJf`O!)LNDwV?*m0WMc9P zfBBq;A9cU8%b69wEN|;Iuy5|motmO8A1F7DT=_lm=z-b08fp)p{f3OmOjXKzeLI&2 zk-7%2(otOA$4)cexi@j?OY`TKH;wL|;MzNpZe2TC6a`!V{?g3Rz17>euKT^ee3>08 zuNzvCw$ZzDJDOR(8`3cpz?C%PZ{q^Cf>p5Tl z)aN^JVc^l&n2e_N@#7l<1>tp$hZ*M|Hw?6|b+_M3Zdu&Uc5Hg}_*o9$WQB^}dwYX_ za))yL#??=6r#9}mtBVo4*fuVG^XgS`#XW=lmm&S8;`-SRX89QBfwZGzlhPJ97Pc0% zpU2+nUF2xLx%*;W+?cylvSONbnx6-o8}&z0&+oYve|xGBw49A?*p@6qZzMM*H$8b0 zj$2i*GNj}+cad+&KnV#*jElD3^ZIxfmJ2P~pFn)75 t=9M1Z_CCJ9Z*ub~{{Drve^KEH3!(k%6FS0MONt`DW?Oy<(~-BZ{vXcfJ@^0s diff --git a/src/main/resources/assets/mekanism/textures/items/FilterUpgrade_Alt1.png b/src/main/resources/assets/mekanism/textures/items/FilterUpgrade_Alt1.png deleted file mode 100644 index b0b7cff7360b4cc7ceb4c72e2db75f69dea99b88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1653 zcmbVNX;2eq7!HUEl+zO^l{KK1$YytQkfTH-2|g3F#2lM!77|dk(9{wFugJjn)c`wQ8MuM+L1&89KGaZjjjiaQxA4<~#R!-us=c&P-1U z^pEgoFc^WU^W-Xe4{=Z5ar7EB@DioBa4I>6$|7`>9VKx_5=LlnAk~EC<0>4*imm7I z1O{V_Rjwxom>WhY*oS1i>7L!vSdoXe%~Tr~@?HqCFDixJ^syEtH-x z18#|^hA5;YOxn^{E|@GztO!^BO(_>@+@o7h>mKEb-pUorNF1dIQcVy>PZeYq5ENl6AS{4P2F%LVn=!&}i*;w{ zmBVtJ)ED8Hf+S49NQlMyH>lU}csia2;et92ECg{L4+k||ffm$pajr&)a8Z~iWRCK& z{~J1pHVSgr$$#p`^F$Y;`}n#G=*#Oq!p(H^kaU-13?E=I7~T!3@+7t6dQ+AmtriVC z(YB`Y!MXEaA&25FHs>{U>G&-EuS#xjeDXZ{=+Hy2=9U)gz$LH`N;o$?^JuKM zcTE32o6lh2RJhLqMEIh&l7pA|c(GlucUl=W=TWD%eM5Wgok?DZs&$WHeOTKEmkadL z4Kt^1He`q8Ha6~LpOf|8yb-oCaa@JeSqJDpJH7Sqch)}qx=;o;z>kZfrvzvZ<};eF zi@y!+f4(cYtRu=`Ff{sf6>JKoCYSVqajTBpXGO}2cuNigx%;Hsj#N9Zb^8{UP0Ln% z-esKdam*L0>d@m8>lR)KvmX0-p!aFng6fTRtN+^j@JXL^QE~W%mhNWXJN?2fsxJ?e z-*_Z1zqW44ax(9Pv7*#cRd?^fUhD27V{2<`=VfG6E{+@A92wGkw%RZ5;>r|PPmp@y z)y^lR=5(*@>LHi#{jf#hgMKr%JwI5nDrk24_PLkLlhe0J%D1$aUY;fnC~osU%c2}t zdMY*hrWB8Taci(d6ddclXYbj&Nsjx$AJ!bMN*UhOZHc%&Hzawyzw?{l8-J8t@Y=L2 zO}HA1w$5HFf#~Glb~csm2nW)FLPR@QyVa~SR7!}C-_4Ci`=>AcU`BvFMrP~tTH*c? Nq$a1!_e=9W`UiB2Y?1%~ diff --git a/src/main/resources/assets/mekanism/textures/items/SolarPanel_Alt.png b/src/main/resources/assets/mekanism/textures/items/SolarPanel_Alt.png deleted file mode 100644 index b795f9ccf9200760e761831028f178aa708a7a2a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1455 zcmbVMeQXnD7{3Xd3ox^&k&i5LT>WD%w%5D0z24ay^ka2R)-i7l)L~%PySMAH^{%_# z)@~5o7x9bC3Dda{NJJ4fJ|Z83OhP~m7@R1C%FwNbO%RA8>WCOY=G(ENe=PjrCHH>a z^ZWgt=Xsy!UN0|uA!pWtSqOsUcuHIxoO4re_9JlYd^==;(|oPiuT>~PEyk+=v5QIo zpq?;a4LHDyjdiDi4MAqqNj|^k_m(n(5;pKD8$&!CfoKG=EsjTcp$2GZ08~pdi`_hO z3_~T6#g?1BMsLIkLQ+YS3M!h)d_q%=K#SPoBGeXVAVC;tJQ@$z%26iHVw1cKT&Iq4 z44pL5YFO;PQ+{tb>Qq#Knhj>XU?d5Yq78)EL=(hwC}|`Lal(j`w4NXs6U7h~bn3yN znkohv&gGucf;$!qXV_}7hTt)sri z2*5cIRq9m%-bYZE2E*JvTqtD-yAZRtw6e*h1Jk#NgG-bBBX^YcscMwFe$!@f`>_*yHXmnZK#iS#R z^~h0;mj#g4mZ0_&*8ET`<5U5!DXLFVYSUFv9#S+V8d4&t(~0IUmt;|iMW0RG(EWg2 zK$RMR=vI|5I+ZkIU|hf7ivW=y<|D=V0=!9&vw* zcmLRLXXa8%#V)FIb}4P3`5XQlFD z)}Crd%cy-ib)|KC{Bx0RUFk*J^NB(Hjo#$ZzR%jW%pcy|J0bUV#cY4{eS$2>3~akt zxpJWFI5u=(N88>{@7^4oIVY0Q{!6EDLAv$Ik-mb8%9|{X?HlgNesgH#{d?OJ6CYpu z`}XdG8K`RV#*az?Kq=f^;h8Y#O}CFH_uG1We3i7 zF$TF{1>*j;|2+5MhHG7p2Khk2*hl4e4kWhbCy%We4}Cv0aqza1k%jEvnUi~#Z?UF+ Np`PM0*Iq|e>p!N@9hCq8 diff --git a/src/main/resources/assets/mekanism/textures/items/SolarPanel_Alt2.png b/src/main/resources/assets/mekanism/textures/items/SolarPanel_Alt2.png deleted file mode 100644 index b190b840d47ce8895eaa6db1fc333da677401818..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1497 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+mc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvGjMjE=kNwPKDW>3A7uk*AlN@E9aur#FG4?ko^1{SSkp} z$S=t+&d4uNaCTPE2+zz*$uBR~1jP`w0)Ad-@n4<3oQ3!=i(h z?bqdXr<_v=={maR$is5yIL50c$JaaeCRAHgANrnuc*U1_hbnCP7&L>OmQB!V_Hv)F zviD+&Rm&CTid`+&4URQj-pgEZc;`fMmQJCdiJF{KTpEIm=5cC-`R;3LI?3M9ox~9k zc&;kIA$Z-MX;&?n=4_s^U&KJ1^>Ssl3f&h#IV@-KVcL;E(^ z?>YD_WVJW*W)s6+>jkf^c-WX(@&#nJPI_@K?yZ2$9M1=Lf6tpY=Uvv;Du%8_4!5_> zc*3gb;o-=1xm=?=`?k)_$uWm7?Yw$j$;|gNLjn7b4*~M)a<6cvrFL%LKZQwihKTZ& zFXwJ^ue3aPhUb$_{W?bGJv#$jxL*o=N$0%1HPCTAZ_NE5DeCiTu|K8^8KQ1-G#sM}9!a-FVdQ I&MBb@0J%FM@c;k- diff --git a/src/main/resources/assets/mekanism/textures/items/UltimateControlCircuit_Alt.png b/src/main/resources/assets/mekanism/textures/items/UltimateControlCircuit_Alt.png deleted file mode 100644 index fe2cac10ab55c362dc6ada68d54eed7c674f6ad0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1750 zcmbVNX;2eq7>-pD@BjwH3KX^x3(l}fHU~MHfS3cL1d*h|h@zX#CIm<}B&!5Oiv@HP zoN{QZ^`L@awFHrC+KMo-wNnLA4i6L+uxJ70sO30A(kcuY1A3IwJfGGWcA zQu883l4)DSPC$;saRZM^O-@dxBr_X{^mPb2gG}~DSZ|t66p=Ej88%QM3XQ7M+2Wc)oA5~VUpL;0 zHYrjJC^Zr_VcU!daUbesGh`xn?>1xu65jCE8MVZvz=2>3^7 z^(rjcw8C~nuLBmLM(uV~B{5<;U@FBt?OV(%nM^fP2{Ax5oyGxCCKCmf3^oF)87M=^ zffz82$stekRsT12RKh8$txo<^H#0{>G1``Ix`5cc=_6E6G>?(!k}U4+SQ6>Imr_xP z!hH8sLCiWulv{ek&Su)YxsP-5x!&;p6|u4HeuvK7jPR-!=aR;(3C#GX86MzE?DW|R5JJGPrKxY zEzN$zR|BdCj$CXRVf*!H>=$Gv4Y<0#@*I(Otv5d}yY^nEQ|-xASH9D$>o*@uUbt_J zxtIHtal^#Nnd8o-cM@c>JI{t(2P)2gb0c9^P{51KlSflHql*G=7?`h-;uY-c-F2jJGi9itXKTWH1X2FP^UA$2A5f4W*1(X_+(&x zja%M!hjk)- z_11Y=i}{o13bHQucJ}?1{kXiXsJ~byAs_kr(XL|Wp^4)U?P;W Date: Thu, 14 Apr 2016 15:54:52 -0400 Subject: [PATCH 40/62] Resistive Heater model, fixed Fusion Reactor --- .../java/mekanism/client/ClientProxy.java | 4 +- .../client/model/ModelResistiveHeater.java | 189 ++++++++++++++++++ .../render/block/MachineRenderingHandler.java | 10 + ...icator.java => RenderResistiveHeater.java} | 15 +- .../java/mekanism/common/CommonProxy.java | 1 + src/main/java/mekanism/common/Mekanism.java | 2 - .../mekanism/common/block/BlockMachine.java | 2 +- .../generators/common/FusionReactor.java | 4 +- .../reactor/TileEntityReactorController.java | 3 +- .../mekanism/render/resistiveHeater.png | Bin 0 -> 4830 bytes 10 files changed, 214 insertions(+), 16 deletions(-) create mode 100644 src/main/java/mekanism/client/model/ModelResistiveHeater.java rename src/main/java/mekanism/client/render/tileentity/{RenderOredictionificator.java => RenderResistiveHeater.java} (64%) create mode 100644 src/main/resources/assets/mekanism/render/resistiveHeater.png diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 2657e5895..0b68bc909 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -98,6 +98,7 @@ import mekanism.client.render.tileentity.RenderMetallurgicInfuser; import mekanism.client.render.tileentity.RenderObsidianTNT; import mekanism.client.render.tileentity.RenderPersonalChest; import mekanism.client.render.tileentity.RenderPressurizedReactionChamber; +import mekanism.client.render.tileentity.RenderResistiveHeater; import mekanism.client.render.tileentity.RenderRotaryCondensentrator; import mekanism.client.render.tileentity.RenderSecurityDesk; import mekanism.client.render.tileentity.RenderSeismicVibrator; @@ -312,7 +313,8 @@ public class ClientProxy extends CommonProxy GameRegistry.registerTileEntity(TileEntityInductionProvider.class, "InductionProvider"); GameRegistry.registerTileEntity(TileEntityOredictionificator.class, "Oredictionificator"); GameRegistry.registerTileEntity(TileEntityStructuralGlass.class, "StructuralGlass"); - GameRegistry.registerTileEntity(TileEntityResistiveHeater.class, "ResistiveHeater"); + ClientRegistry.registerTileEntity(TileEntityFormulaicAssemblicator.class, "FormulaicAssemblicator", new RenderConfigurableMachine()); + ClientRegistry.registerTileEntity(TileEntityResistiveHeater.class, "ResistiveHeater", new RenderResistiveHeater()); ClientRegistry.registerTileEntity(TileEntityBoilerCasing.class, "BoilerCasing", new RenderThermoelectricBoiler()); ClientRegistry.registerTileEntity(TileEntityBoilerValve.class, "BoilerValve", new RenderThermoelectricBoiler()); ClientRegistry.registerTileEntity(TileEntitySecurityDesk.class, "SecurityDesk", new RenderSecurityDesk()); diff --git a/src/main/java/mekanism/client/model/ModelResistiveHeater.java b/src/main/java/mekanism/client/model/ModelResistiveHeater.java new file mode 100644 index 000000000..5533d83a4 --- /dev/null +++ b/src/main/java/mekanism/client/model/ModelResistiveHeater.java @@ -0,0 +1,189 @@ +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 ModelResistiveHeater extends ModelBase +{ + ModelRenderer wallLeft; + ModelRenderer base; + ModelRenderer fin10; + ModelRenderer portRight; + ModelRenderer fin9; + ModelRenderer fin2; + ModelRenderer bar2; + ModelRenderer fin4; + ModelRenderer fin3; + ModelRenderer fin6; + ModelRenderer center; + ModelRenderer fin8; + ModelRenderer fin7; + ModelRenderer fin5; + ModelRenderer fin1; + ModelRenderer bar1; + ModelRenderer bar4; + ModelRenderer bar3; + ModelRenderer wallRight; + ModelRenderer portLeft; + + public ModelResistiveHeater() + { + textureWidth = 128; + textureHeight = 64; + + wallLeft = new ModelRenderer(this, 0, 23); + wallLeft.mirror = true; + wallLeft.addBox(0F, 0F, 0F, 3, 9, 16); + wallLeft.setRotationPoint(5F, 8F, -8F); + wallLeft.setTextureSize(128, 64); + setRotation(wallLeft, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 7, 16); + base.setRotationPoint(-8F, 17F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + fin10 = new ModelRenderer(this, 38, 38); + fin10.mirror = true; + fin10.addBox(0F, 0F, 0F, 10, 9, 1); + fin10.setRotationPoint(-5F, 8.5F, 6.5F); + fin10.setTextureSize(128, 64); + setRotation(fin10, 0F, 0F, 0F); + portRight = new ModelRenderer(this, 48, 0); + portRight.addBox(0F, 0F, 0F, 1, 8, 8); + portRight.setRotationPoint(-8.01F, 12F, -4F); + portRight.setTextureSize(128, 64); + portRight.mirror = true; + setRotation(portRight, 0F, 0F, 0F); + fin9 = new ModelRenderer(this, 0, 48); + fin9.mirror = true; + fin9.addBox(0F, 0F, 0F, 10, 9, 1); + fin9.setRotationPoint(-5F, 8.5F, 5F); + fin9.setTextureSize(128, 64); + setRotation(fin9, 0F, 0F, 0F); + fin2 = new ModelRenderer(this, 0, 48); + fin2.addBox(0F, 0F, 0F, 10, 9, 1); + fin2.setRotationPoint(-5F, 8.5F, -6F); + fin2.setTextureSize(128, 64); + fin2.mirror = true; + setRotation(fin2, 0F, 0F, 0F); + bar2 = new ModelRenderer(this, 36, 23); + bar2.addBox(0F, 0F, 0F, 1, 1, 13); + bar2.setRotationPoint(-2F, 9.5F, -6.5F); + bar2.setTextureSize(128, 64); + bar2.mirror = true; + setRotation(bar2, 0F, 0F, 0F); + fin4 = new ModelRenderer(this, 0, 48); + fin4.addBox(0F, 0F, 0F, 10, 9, 1); + fin4.setRotationPoint(-5F, 8.5F, -3F); + fin4.setTextureSize(128, 64); + fin4.mirror = true; + setRotation(fin4, 0F, 0F, 0F); + fin3 = new ModelRenderer(this, 0, 48); + fin3.mirror = true; + fin3.addBox(0F, 0F, 0F, 10, 9, 1); + fin3.setRotationPoint(-5F, 8.5F, -4.5F); + fin3.setTextureSize(128, 64); + setRotation(fin3, 0F, 0F, 0F); + fin6 = new ModelRenderer(this, 0, 48); + fin6.addBox(0F, 0F, 0F, 10, 9, 1); + fin6.setRotationPoint(-5F, 8.5F, 0.5F); + fin6.setTextureSize(128, 64); + fin6.mirror = true; + setRotation(fin6, 0F, 0F, 0F); + center = new ModelRenderer(this, 0, 0); + center.addBox(0F, 0F, 0F, 6, 6, 1); + center.setRotationPoint(-3F, 11.5F, -0.5F); + center.setTextureSize(128, 64); + center.mirror = true; + setRotation(center, 0F, 0F, 0F); + fin8 = new ModelRenderer(this, 0, 48); + fin8.addBox(0F, 0F, 0F, 10, 9, 1); + fin8.setRotationPoint(-5F, 8.5F, 3.5F); + fin8.setTextureSize(128, 64); + fin8.mirror = true; + setRotation(fin8, 0F, 0F, 0F); + fin7 = new ModelRenderer(this, 0, 48); + fin7.mirror = true; + fin7.addBox(0F, 0F, 0F, 10, 9, 1); + fin7.setRotationPoint(-5F, 8.5F, 2F); + fin7.setTextureSize(128, 64); + setRotation(fin7, 0F, 0F, 0F); + fin5 = new ModelRenderer(this, 0, 48); + fin5.mirror = true; + fin5.addBox(0F, 0F, 0F, 10, 9, 1); + fin5.setRotationPoint(-5F, 8.5F, -1.5F); + fin5.setTextureSize(128, 64); + setRotation(fin5, 0F, 0F, 0F); + fin1 = new ModelRenderer(this, 22, 48); + fin1.addBox(0F, 0F, 0F, 10, 9, 1); + fin1.setRotationPoint(-5F, 8.5F, -7.5F); + fin1.setTextureSize(128, 64); + fin1.mirror = true; + setRotation(fin1, 0F, 0F, 0F); + bar1 = new ModelRenderer(this, 36, 23); + bar1.addBox(0F, 0F, 0F, 1, 1, 13); + bar1.setRotationPoint(-4F, 9.5F, -6.5F); + bar1.setTextureSize(128, 64); + bar1.mirror = true; + setRotation(bar1, 0F, 0F, 0F); + bar4 = new ModelRenderer(this, 36, 23); + bar4.addBox(0F, 0F, 0F, 1, 1, 13); + bar4.setRotationPoint(3F, 9.5F, -6.5F); + bar4.setTextureSize(128, 64); + bar4.mirror = true; + setRotation(bar4, 0F, 0F, 0F); + bar3 = new ModelRenderer(this, 36, 23); + bar3.addBox(0F, 0F, 0F, 1, 1, 13); + bar3.setRotationPoint(1F, 9.5F, -6.5F); + bar3.setTextureSize(128, 64); + bar3.mirror = true; + setRotation(bar3, 0F, 0F, 0F); + wallRight = new ModelRenderer(this, 0, 23); + wallRight.addBox(0F, 0F, 0F, 3, 9, 16); + wallRight.setRotationPoint(-8F, 8F, -8F); + wallRight.setTextureSize(128, 64); + wallRight.mirror = true; + setRotation(wallRight, 0F, 0F, 0F); + portLeft = new ModelRenderer(this, 48, 0); + portLeft.addBox(0F, 0F, 0F, 1, 8, 8); + portLeft.setRotationPoint(7.01F, 12F, -4F); + portLeft.setTextureSize(128, 64); + portLeft.mirror = true; + setRotation(portLeft, 0F, 0F, 0F); + } + + public void render(float size) + { + wallLeft.render(size); + base.render(size); + fin10.render(size); + portRight.render(size); + fin9.render(size); + fin2.render(size); + bar2.render(size); + fin4.render(size); + fin3.render(size); + fin6.render(size); + center.render(size); + fin8.render(size); + fin7.render(size); + fin5.render(size); + fin1.render(size); + bar1.render(size); + bar4.render(size); + bar3.render(size); + wallRight.render(size); + portLeft.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/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index 1d8dc35c5..84d0d64d7 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -16,6 +16,7 @@ import mekanism.client.model.ModelLaserAmplifier; import mekanism.client.model.ModelLogisticalSorter; import mekanism.client.model.ModelMetallurgicInfuser; import mekanism.client.model.ModelPressurizedReactionChamber; +import mekanism.client.model.ModelResistiveHeater; import mekanism.client.model.ModelRotaryCondensentrator; import mekanism.client.model.ModelSeismicVibrator; import mekanism.client.model.ModelSolarNeutronActivator; @@ -55,6 +56,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler public ModelLaser laser = new ModelLaser(); public ModelLaserAmplifier laserAmplifier = new ModelLaserAmplifier(); public ModelSolarNeutronActivator solarNeutronActivator = new ModelSolarNeutronActivator(); + public ModelResistiveHeater resistiveHeater = new ModelResistiveHeater(); @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) @@ -211,6 +213,14 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LaserTractorBeam.png")); laserAmplifier.render(0.0560F); } + else if(type == MachineType.RESISTIVE_HEATER) + { + GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); + GL11.glTranslatef(0.05F, -0.96F, 0.05F); + Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ResistiveHeater.png")); + resistiveHeater.render(0.0625F); + } else if(type == MachineType.SOLAR_NEUTRON_ACTIVATOR) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderOredictionificator.java b/src/main/java/mekanism/client/render/tileentity/RenderResistiveHeater.java similarity index 64% rename from src/main/java/mekanism/client/render/tileentity/RenderOredictionificator.java rename to src/main/java/mekanism/client/render/tileentity/RenderResistiveHeater.java index 8ba3e9569..fcc242677 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderOredictionificator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderResistiveHeater.java @@ -1,7 +1,7 @@ package mekanism.client.render.tileentity; -import mekanism.client.model.ModelMetallurgicInfuser; -import mekanism.common.tile.TileEntityOredictionificator; +import mekanism.client.model.ModelResistiveHeater; +import mekanism.common.tile.TileEntityResistiveHeater; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -13,22 +13,21 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class RenderOredictionificator extends TileEntitySpecialRenderer +public class RenderResistiveHeater extends TileEntitySpecialRenderer { - private ModelMetallurgicInfuser model = new ModelMetallurgicInfuser(); + private ModelResistiveHeater model = new ModelResistiveHeater(); @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) { - renderAModelAt((TileEntityOredictionificator)tileEntity, x, y, z, partialTick); + renderAModelAt((TileEntityResistiveHeater)tileEntity, x, y, z, partialTick); } - private void renderAModelAt(TileEntityOredictionificator tileEntity, double x, double y, double z, float partialTick) + private void renderAModelAt(TileEntityResistiveHeater 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, "MetallurgicInfuser.png")); + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ResistiveHeater.png")); switch(tileEntity.facing) { diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index f1a0ed2bf..bbc363944 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -203,6 +203,7 @@ public class CommonProxy implements IGuiProvider GameRegistry.registerTileEntity(TileEntityInductionProvider.class, "InductionProvider"); GameRegistry.registerTileEntity(TileEntityOredictionificator.class, "Oredictionificator"); GameRegistry.registerTileEntity(TileEntityStructuralGlass.class, "StructuralGlass"); + GameRegistry.registerTileEntity(TileEntityFormulaicAssemblicator.class, "FormulaicAssemblicator"); GameRegistry.registerTileEntity(TileEntityResistiveHeater.class, "ResistiveHeater"); GameRegistry.registerTileEntity(TileEntityBoilerCasing.class, "BoilerCasing"); GameRegistry.registerTileEntity(TileEntityBoilerValve.class, "BoilerValve"); diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index cd37fd992..653f1f048 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -78,7 +78,6 @@ import mekanism.common.tile.TileEntityAdvancedBoundingBlock; import mekanism.common.tile.TileEntityBoundingBlock; import mekanism.common.tile.TileEntityCardboardBox; import mekanism.common.tile.TileEntityElectricBlock; -import mekanism.common.tile.TileEntityFormulaicAssemblicator; import mekanism.common.tile.TileEntityPressureDisperser; import mekanism.common.tile.TileEntityQuantumEntangloporter; import mekanism.common.tile.TileEntitySuperheatingElement; @@ -1147,7 +1146,6 @@ public class Mekanism GameRegistry.registerTileEntity(TileEntityQuantumEntangloporter.class, "QuantumEntangloporter"); GameRegistry.registerTileEntity(TileEntityPressureDisperser.class, "PressureDisperser"); GameRegistry.registerTileEntity(TileEntitySuperheatingElement.class, "SuperheatingElement"); - GameRegistry.registerTileEntity(TileEntityFormulaicAssemblicator.class, "FormulaicAssemblicator"); //Load tile entities that have special renderers. proxy.registerSpecialTileEntities(); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index d80d8e681..96f02c739 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -1186,7 +1186,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo SOLAR_NEUTRON_ACTIVATOR(MachineBlock.MACHINE_BLOCK_3, 1, "SolarNeutronActivator", 47, TileEntitySolarNeutronActivator.class, false, true, false), AMBIENT_ACCUMULATOR(MachineBlock.MACHINE_BLOCK_3, 2, "AmbientAccumulator", 48, TileEntityAmbientAccumulator.class, true, false, false), OREDICTIONIFICATOR(MachineBlock.MACHINE_BLOCK_3, 3, "Oredictionificator", 52, TileEntityOredictionificator.class, false, false, false), - RESISTIVE_HEATER(MachineBlock.MACHINE_BLOCK_3, 4, "ResistiveHeater", 53, TileEntityResistiveHeater.class, true, false, false), + RESISTIVE_HEATER(MachineBlock.MACHINE_BLOCK_3, 4, "ResistiveHeater", 53, TileEntityResistiveHeater.class, true, true, false), FORMULAIC_ASSEMBLICATOR(MachineBlock.MACHINE_BLOCK_3, 5, "FormulaicAssemblicator", 56, TileEntityFormulaicAssemblicator.class, true, false, true); public MachineBlock typeBlock; diff --git a/src/main/java/mekanism/generators/common/FusionReactor.java b/src/main/java/mekanism/generators/common/FusionReactor.java index 9ab515397..6e480791b 100644 --- a/src/main/java/mekanism/generators/common/FusionReactor.java +++ b/src/main/java/mekanism/generators/common/FusionReactor.java @@ -141,7 +141,7 @@ public class FusionReactor implements IFusionReactor else { burning = false; } - + //Perform the heat transfer calculations transferHeat(); @@ -218,7 +218,7 @@ public class FusionReactor implements IFusionReactor double plasmaCaseHeat = plasmaCaseConductivity * (lastPlasmaTemperature - lastCaseTemperature); plasmaTemperature -= plasmaCaseHeat / plasmaHeatCapacity; caseTemperature += plasmaCaseHeat / caseHeatCapacity; - + //Transfer from casing to water if necessary if(activelyCooled) { diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java index ad72c4253..b2791444b 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java @@ -35,8 +35,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class TileEntityReactorController extends TileEntityReactorBlock implements IActiveState, IHasSound, ISoundSource { public static final int MAX_WATER = 100 * FluidContainerRegistry.BUCKET_VOLUME; - public static final int MAX_STEAM = MAX_WATER * 1000; - + public static final int MAX_STEAM = MAX_WATER * 100; public static final int MAX_FUEL = 1 * FluidContainerRegistry.BUCKET_VOLUME; public FluidTank waterTank = new FluidTank(MAX_WATER); diff --git a/src/main/resources/assets/mekanism/render/resistiveHeater.png b/src/main/resources/assets/mekanism/render/resistiveHeater.png new file mode 100644 index 0000000000000000000000000000000000000000..0e28d107ec34ec8688ed8a424df984645c803753 GIT binary patch literal 4830 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 cZBb`nI{WvSK+NGv?mtc!49yKn^qg<}2W Date: Thu, 14 Apr 2016 16:13:18 -0400 Subject: [PATCH 41/62] Model fixes! --- .../model/ModelChemicalCrystallizer.java | 6 +++--- .../ModelChemicalDissolutionChamber.java | 6 +++--- .../client/model/ModelChemicalInfuser.java | 14 +++++++------- .../client/model/ModelChemicalOxidizer.java | 8 ++++---- .../client/model/ModelChemicalWasher.java | 6 +++--- .../mekanism/render/ChemicalCrystallizer.png | Bin 5158 -> 5552 bytes .../render/ChemicalDissolutionChamber.png | Bin 5995 -> 6594 bytes .../mekanism/render/ChemicalInfuser.png | Bin 5160 -> 5957 bytes .../mekanism/render/ChemicalOxidizer.png | Bin 5535 -> 6050 bytes .../assets/mekanism/render/ChemicalWasher.png | Bin 5820 -> 6389 bytes 10 files changed, 20 insertions(+), 20 deletions(-) mode change 100755 => 100644 src/main/resources/assets/mekanism/render/ChemicalOxidizer.png diff --git a/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java b/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java index 8a91a6a89..ac0441e12 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java @@ -50,10 +50,10 @@ public class ModelChemicalCrystallizer extends ModelBase rimBack.setTextureSize(128, 64); rimBack.mirror = true; setRotation(rimBack, 0F, 0F, 0F); - portRight = new ModelRenderer(this, 36, 42); + portRight = new ModelRenderer(this, 54, 42); portRight.mirror = true; - portRight.addBox(0F, 0F, 0F, 1, 8, 8); - portRight.setRotationPoint(7.01F, 12F, -4F); + portRight.addBox(0F, 0F, 0F, 1, 10, 10); + portRight.setRotationPoint(7.01F, 11F, -5F); portRight.setTextureSize(128, 64); setRotation(portRight, 0F, 0F, 0F); rimRight = new ModelRenderer(this, 0, 50); diff --git a/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java b/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java index c69554a8f..9787060be 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java @@ -213,9 +213,9 @@ public class ModelChemicalDissolutionChamber extends ModelBase glass.setTextureSize(128, 64); glass.mirror = true; setRotation(glass, 0F, 0F, 0F); - portToggle1 = new ModelRenderer(this, 64, 32); - portToggle1.addBox(0F, 0F, 0F, 1, 8, 8); - portToggle1.setRotationPoint(-8.01F, 12F, -4F); + portToggle1 = new ModelRenderer(this, 106, 0); + portToggle1.addBox(0F, 0F, 0F, 1, 10, 10); + portToggle1.setRotationPoint(-8.01F, 10.99F, -5F); portToggle1.setTextureSize(128, 64); portToggle1.mirror = true; setRotation(portToggle1, 0F, 0F, 0F); diff --git a/src/main/java/mekanism/client/model/ModelChemicalInfuser.java b/src/main/java/mekanism/client/model/ModelChemicalInfuser.java index 24413cb7c..b99901adf 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalInfuser.java +++ b/src/main/java/mekanism/client/model/ModelChemicalInfuser.java @@ -55,11 +55,11 @@ public class ModelChemicalInfuser extends ModelBase tank2.setRotationPoint(1F, 8F, 1F); tank2.setTextureSize(128, 64); setRotation(tank2, 0F, 0F, 0F); - portRight = new ModelRenderer(this, 0, 38); - portRight.addBox(0F, 0F, 0F, 1, 8, 8); - portRight.setRotationPoint(7.01F, 12F, -4F); - portRight.setTextureSize(128, 64); + portRight = new ModelRenderer(this, 64, 0); portRight.mirror = true; + portRight.addBox(0F, 0F, 0F, 1, 10, 10); + portRight.setRotationPoint(7.01F, 11F, -5F); + portRight.setTextureSize(128, 64); setRotation(portRight, 0F, 0F, 0F); portBack = new ModelRenderer(this, 0, 54); portBack.addBox(0F, 0F, 0F, 8, 8, 1); @@ -67,9 +67,9 @@ public class ModelChemicalInfuser extends ModelBase portBack.setTextureSize(128, 64); portBack.mirror = true; setRotation(portBack, 0F, 0F, 0F); - portLeft = new ModelRenderer(this, 0, 38); - portLeft.addBox(0F, 0F, 0F, 1, 8, 8); - portLeft.setRotationPoint(-8.01F, 12F, -4F); + portLeft = new ModelRenderer(this, 64, 0); + portLeft.addBox(0F, 0F, 0F, 1, 10, 10); + portLeft.setRotationPoint(-8.01F, 11F, -5F); portLeft.setTextureSize(128, 64); portLeft.mirror = true; setRotation(portLeft, 0F, 0F, 0F); diff --git a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java b/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java index da80b3674..b2cd1a122 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java +++ b/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java @@ -19,7 +19,7 @@ public class ModelChemicalOxidizer extends ModelBase ModelRenderer connector; ModelRenderer connectorToggle; - public ModelChemicalOxidizer() + public ModelChemicalOxidizer() { textureWidth = 128; textureHeight = 64; @@ -72,9 +72,9 @@ public class ModelChemicalOxidizer extends ModelBase base.setTextureSize(128, 64); base.mirror = true; setRotation(base, 0F, 0F, 0F); - connector = new ModelRenderer(this, 64, 28); - connector.addBox(0F, 0F, 0F, 1, 8, 8); - connector.setRotationPoint(-8F, 12F, -4F); + connector = new ModelRenderer(this, 0, 34); + connector.addBox(0F, 0F, 0F, 1, 10, 10); + connector.setRotationPoint(-8F, 11F, -5F); connector.setTextureSize(128, 64); connector.mirror = true; setRotation(connector, 0F, 0F, 0F); diff --git a/src/main/java/mekanism/client/model/ModelChemicalWasher.java b/src/main/java/mekanism/client/model/ModelChemicalWasher.java index 0eb42e8d6..3aa26bc5e 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalWasher.java +++ b/src/main/java/mekanism/client/model/ModelChemicalWasher.java @@ -49,9 +49,9 @@ public class ModelChemicalWasher extends ModelBase base.setTextureSize(128, 64); base.mirror = true; setRotation(base, 0F, 0F, 0F); - portTop = new ModelRenderer(this, 66, 0); - portTop.addBox(0F, 0F, 0F, 8, 1, 8); - portTop.setRotationPoint(-4F, 8F, -4F); + portTop = new ModelRenderer(this, 53, 33); + portTop.addBox(0F, 0F, 0F, 10, 1, 10); + portTop.setRotationPoint(-5F, 8F, -5F); portTop.setTextureSize(128, 64); portTop.mirror = true; setRotation(portTop, 0F, 0F, 0F); diff --git a/src/main/resources/assets/mekanism/render/ChemicalCrystallizer.png b/src/main/resources/assets/mekanism/render/ChemicalCrystallizer.png index a67fe178f1baffb6b26f06e58067d7b044d7e76c..cbc5076307c267dcdf38776d5686eaa0d7e0c2db 100644 GIT binary patch delta 4818 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 RbpXzD{hFC!iNW2c{{z16hu;7I delta 4368 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 JOylv3{{a7bR6hU! delta 5156 zcmb7IX&{vA+aF_16I#?vmQg1q5@SLdLr#lRM@d-{Su>M;ExTuM8)>C#PBZJ907!0$R|LDB$`~7`BJ)f@ox_|fmTdunWxp4NyH4z`;bvbaNwdk?L zaIiw+QPJax)nJzs+By$hFgiN=nr?a+9ZlB<=d?AQUG(%d&mqt28t5Wi^%2^b#0#Q| ziOS$(iNT^KfW@%P9T4bX;Z0Dwyb+^La7^mK;ui|?Tn{Bwp zbZIr#m%}CIonLQm3A?5)ReBCTCiCn7l9xNdn7dex<+a>quFZ6Db#SSZuW!Q=Z_jlZ z=5dUN%x!P=HOES#_;+gp+#Ijc!c7#tV0euaTT!Hq#o>kmb6;!xTW?gJM*wx8$4d0OsgNSD!eP zV|pyLF0EXVq(yO;o^{mAS7&N%;+0Srmfp#YFDKbJjKaFYyEz-fj=>}Y*>;zc@8G9y zra$ajD5)z6Oy|NL9K;!n=6=gDC6H#y+`2Aopm(rQ|TXWPhE79C&POZok9vM`?Hd0r0qec^Kq_bUkYB)8V zic}FuB4ec&#Z0$2HZD9~B?+YHzQrc@s~_yk9$br$R&$1GNNkFxBrP~e5mM3C)4cYl zM}lADxO0e43;w9}BUeOn#z<3-F$)G;x+M@>Y8?>^ioLQw) zP)q&3C6}@zwt<;sEDx2B0eBGw4C~XPSxlOSw2D-W8m|0`t~pAI)X{QCThmPXU^5PL zro>f2{8w~lRY^w^X_mcpW!+7tPx{tZM~*Wl0Psep7BfJu;b&xG1Jg$(kVpuVVfy*e zdKSZ@qhv?9fC$XY*`m#j0gd`yK;MI+PD8n?K-|WrnLLP*=I*QlZDXxrf}nlRK!E`n z3-Ji`lX|TNq$bEc+x}5=l$R{mAOzww6LX_UT6RHj#4+Mas6*1JcUZ)D-7RWc_Ag<8`?VL3vGw^I0kp*Yp3MUe>B1-Ahyr9HGn>3 zZ_fQOqAwZdNy>`lgBQyQNwg?2dthz)Gnr2;j^>&+`!&Y87-JGTk>$5#R>hwE?*fiI zb(#9bi`jo(g<2R-iJQza~0z^49ZaEZ5+C?bmXt^!Njx zrX~&EYZpn?m>+u1mo5OdcdqY&xU8tFf6>FGst^1Nje0$At&1^jdEd6&S&HN>uit9> zvdMnazWmWhxBWKK(i+R1=7tQ)B2T9*F(&!3UNF3L<@21etF|MTzPheo-;=spXnT@s z&8rIo4qcQJvjDY%A#sFiSO;qcpTP1bFJ5L5_pvN%xPa3IQ)De%{?6$9QfMFr`ib9m z(0u(veX(5?ej47Ldn4_hw5o5D?y!CTn=L@DeQTSM#YW!@nk2eXILeKiW1f8>Xo@@B zSS-pH-pH9R>tV9 z+JiEOitUSwIh7Tm^D*e`@ykM59Rix(dK4~p}LLx`tKn^GC-sy4Q8lMC&7r5 zkF*X_tfyAJTD=R`KH2V(o?oG|OOKjjkQbU(;eLk^Qh8O;Y_Xb^5KWvyk!jYUMJ*t6 zLnm`2yR_3VcB8t}|A-KN6S?ji;ww8`W-zp}vvY5K!1F%VMun>}2pB^}Z28exh1H?q zGS+$`Sf0Ni_U97WPQ1+UW%rMBWbU$O@Oef$eKx~_;_7c|Yj8=9vYPH?OhlWD1CEw3O;^VW*_oR*H_pPpIpJG_? z&mmEqe_-C#K$YY3ZyC1ntcH7~!{7?ad$jT#eB**Ij<2HV{WlA@Dmi*a$UzmU*|*^H zev=ou@S;hF%F0e>MtV@c<7*KO(k)qtBobk6Yy(g!qW&bR?5-iC6iVZW^sgU&=i;L? zREIPDGU4p{?Vw9>@=BQN+*WtvU1~d(sDq#si%^Vm(J+aO>N?B%F|e2Z?wr#}yUP9@ zzyGP^Dc!^xc9@ftXz}o(J?3`bAq*4azdN15PF?%ILU@;mp0|MRorY&%4C?6FCD}Z_ z(1lMN{)xW9M^I+yZ0e3=2gR;)%YB|f{GrN1nP88sIU=5p+#b=RA`xy^^#d1=2ZqIYn9h+6) z;Yij~Er1M_komd!$k(uFr+gcS&<~nS;gQR*tO{p$rexBUyC(cv_hk@Io0(f?TM*>9MLfNLa^^U8qoX8q@iE{t5H8JQz2_SxfNIY%1mzeSldfLE3(z>iEysE zDE4hMOo?G6)l2iu-H2jrmiyLKWe}Qx%pg($RnO@pBO;SPUp4Sqs6!rBRsI+1YU#;C zxnZ!Uh_b-1%^~`P^{env}B;UnORWB zn$X=myW};jgS;e_pW5g_F!B-OI zWJSHENY>nvD$F4$K5iSGMfMsk>mA9^-MV!`O<`V1jPPaYWqeCE*+dV7U4zM+MXit0 zHq?(&)p_ZXGYTtb{>0uf3~yu774Z(mHS@__M*W^;(;14h0%7?1r=_l?ZT6$}nTiAT z{-1$e`fDErq(Ks~HA^ok$zN@;k%|&4MOZn_P#qba`KW~l=uJ>QA=6DpDf2hJDZJG@q2@L zy!;+8@19<|3h-~(avX{7Hw4n&oBg#T+%u%ZkxRun}N2Za+Z2T89t?HS)EoVT>zZ|Eqxc>lKX1&wzeQ zzUh)I`rM%J83sfRUxKxfz<@0S!ulp#jo89`r8l+uPUec1HeQYTF5ZDtIurodVz^=r$Jh$|A zzL&Vw8@uowD};!B-(st9ell&5x@g$weKNBcTG8^7rIPNAt_x<~tbVYYgUVe*q1LSt z+s;wkX;hjP#5@Rqllk_tc~fm##pMQ`)%aG+KOdeJ%mdCaX^5JW6)+y}NofpWCJM>qrC@t8+D!l=xgJPrp7 z<;$(WCV}-{@j_7kFR6TyrjQQFCatq@kYE1|{YNAk5YB8MJundN8KfM(NPKw|%%af97+2+DNb*%di4pw zEmX-*Y|jKQj(iD?wvckj!|fp61XrjSKt^Zlg>x#q5&=v#VGQ^ z9^w79wFX6~g_`gc3R-5GNp6u2`^;aa5uvy6ckk)CS;-08~KZ@ z7(Fcv>$aYjwyKt<*~EEP`oD;cWIrit?9QR)DPlSfPZArDBL3;NVj3dczo^lYGtG<9 zNpY}@$A*AL^uA_T^i}co!k2UbZ!y|EFJso=_~5p2LiXx(q0X@kPjs{5Hc0H3T+rj? zqugX*i#im^u38w*a#_1yoJ2+p=xRL*jG(u1tV#M*!G^IQ(qUl_#$C;5@!`d(ap#9c zKR^G){|4{RVqm(3lojjAis@yc8n}ebmoFR>Vmf zJMMqj0XnFR>-7^&&!TB?&Kn5?k^7%+JsPIym5VvZL(@P@mJ6Z~1?O?0*b4O-a|F=d z`Om>q9Gw!Fl160v3SP;n+eaaWO0>$dmE!Ju2U&c1w-`FjD!3ab6lbBU`HX?Q_FD4%peXjclUZ&#syKhw!VTGEh-!4XvBqD^X2$N-+bd&4D zl-CG!_gttOgHsr>o`I#UazV4etf7}wiLCjR-d5|$*G}n#GQZ793zpc=7Yd;r$gs5T zRpe_D;KmbgLYAAm@3Oq_2cI=c8PSvIShr_JfYw`KPey>n5h8wH6C)d1P%rAxbG{rT zR9iW*Ks%B1U8Si9a@~xd-Jh8)zYS76brt0Hy@EcX_&3Kh_p$I*r_?tt`Z;dF>zCcB zRhXD_!8ina`5VBXfMSDx8>3PrFGe*TobMU=S&)X5Hrm64F zDc0={cqVcXaeCWKs~5gE*2MV&Qq9TO)t!*tFhwXe=a%>H^qU(i*|h!4w#P7H(lI~( tB0$zLDt}7~ojgK_(*OVG0C2zwq=vT%a?(io01|%JuH3v_@~czKe*vtFR|^0D diff --git a/src/main/resources/assets/mekanism/render/ChemicalInfuser.png b/src/main/resources/assets/mekanism/render/ChemicalInfuser.png index e29f5b6741c8d27c26e11b03eba2789b7ff47092..35997e70902f2ee538ebf262d2c722ceb794d3e0 100644 GIT binary patch delta 5226 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 diff --git a/src/main/resources/assets/mekanism/render/ChemicalOxidizer.png b/src/main/resources/assets/mekanism/render/ChemicalOxidizer.png old mode 100755 new mode 100644 index a6d93d1fa1fdb597cf3a99212021f5483e4b6004..b33cddde28bd8899f3461ac298a66b27564dd9a1 GIT binary patch delta 5357 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 delta 4785 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 Z0OXRLqIQdmIRg@0&gb3EVSW$1_aBCCa{vGU diff --git a/src/main/resources/assets/mekanism/render/ChemicalWasher.png b/src/main/resources/assets/mekanism/render/ChemicalWasher.png index b332e7c848864e66c327d676768b32c4f5bddae6..ede657f799e3bc576e1faa51c0638f702382ae00 100644 GIT binary patch delta 5662 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 delta 5036 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 GlK&55r0QA# From 7387f15b6421d102f5042e85ba77cc1432d2812c Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 16 Apr 2016 17:14:02 -0400 Subject: [PATCH 42/62] New and fixed models! Energy Cubes look awesome. --- .../client/model/ModelChemicalInfuser.java | 14 +- .../client/model/ModelEnergyCube.java | 662 +++++++++++++----- .../client/model/ModelLogisticalSorter.java | 386 +++++----- .../render/block/MachineRenderingHandler.java | 7 +- .../render/item/ItemRenderingHandler.java | 39 +- .../render/tileentity/RenderEnergyCube.java | 32 +- .../tileentity/RenderLogisticalSorter.java | 16 +- .../mekanism/render/ChemicalInfuser.png | Bin 5957 -> 5160 bytes .../mekanism/render/EnergyCubeAdvanced.png | Bin 2199 -> 2959 bytes .../mekanism/render/EnergyCubeBasic.png | Bin 2262 -> 2961 bytes .../mekanism/render/EnergyCubeCreative.png | Bin 1692 -> 2938 bytes .../mekanism/render/EnergyCubeElite.png | Bin 2277 -> 2960 bytes .../mekanism/render/EnergyCubeUltimate.png | Bin 2315 -> 2960 bytes .../assets/mekanism/render/EnergyCube_Off.png | Bin 0 -> 3928 bytes .../assets/mekanism/render/EnergyCube_On.png | Bin 0 -> 3036 bytes .../mekanism/render/LogisticalSorter.png | Bin 6831 -> 4959 bytes .../mekanism/render/LogisticalSorterOn.png | Bin 6761 -> 4416 bytes .../mekanism/render/MetallurgicInfuser.png | Bin 7098 -> 6958 bytes .../render/PressurizedReactionChamber.png | Bin 5404 -> 19243 bytes 19 files changed, 779 insertions(+), 377 deletions(-) create mode 100644 src/main/resources/assets/mekanism/render/EnergyCube_Off.png create mode 100644 src/main/resources/assets/mekanism/render/EnergyCube_On.png diff --git a/src/main/java/mekanism/client/model/ModelChemicalInfuser.java b/src/main/java/mekanism/client/model/ModelChemicalInfuser.java index b99901adf..24413cb7c 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalInfuser.java +++ b/src/main/java/mekanism/client/model/ModelChemicalInfuser.java @@ -55,11 +55,11 @@ public class ModelChemicalInfuser extends ModelBase tank2.setRotationPoint(1F, 8F, 1F); tank2.setTextureSize(128, 64); setRotation(tank2, 0F, 0F, 0F); - portRight = new ModelRenderer(this, 64, 0); - portRight.mirror = true; - portRight.addBox(0F, 0F, 0F, 1, 10, 10); - portRight.setRotationPoint(7.01F, 11F, -5F); + portRight = new ModelRenderer(this, 0, 38); + portRight.addBox(0F, 0F, 0F, 1, 8, 8); + portRight.setRotationPoint(7.01F, 12F, -4F); portRight.setTextureSize(128, 64); + portRight.mirror = true; setRotation(portRight, 0F, 0F, 0F); portBack = new ModelRenderer(this, 0, 54); portBack.addBox(0F, 0F, 0F, 8, 8, 1); @@ -67,9 +67,9 @@ public class ModelChemicalInfuser extends ModelBase portBack.setTextureSize(128, 64); portBack.mirror = true; setRotation(portBack, 0F, 0F, 0F); - portLeft = new ModelRenderer(this, 64, 0); - portLeft.addBox(0F, 0F, 0F, 1, 10, 10); - portLeft.setRotationPoint(-8.01F, 11F, -5F); + portLeft = new ModelRenderer(this, 0, 38); + portLeft.addBox(0F, 0F, 0F, 1, 8, 8); + portLeft.setRotationPoint(-8.01F, 12F, -4F); portLeft.setTextureSize(128, 64); portLeft.mirror = true; setRotation(portLeft, 0F, 0F, 0F); diff --git a/src/main/java/mekanism/client/model/ModelEnergyCube.java b/src/main/java/mekanism/client/model/ModelEnergyCube.java index bccffea10..81816487f 100644 --- a/src/main/java/mekanism/client/model/ModelEnergyCube.java +++ b/src/main/java/mekanism/client/model/ModelEnergyCube.java @@ -1,195 +1,517 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; +import mekanism.common.SideData.IOState; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelEnergyCube extends ModelBase { - ModelRenderer Corner1; - ModelRenderer Corner2; - ModelRenderer Corner3; - ModelRenderer Corner4; - ModelRenderer Corner5; - ModelRenderer Corner6; - ModelRenderer Corner7; - ModelRenderer Corner8; - ModelRenderer Frame4; - ModelRenderer Frame3; - ModelRenderer Frame2; - ModelRenderer Frame1; - ModelRenderer Connection; - ModelRenderer HoriPole1; - ModelRenderer HoriPole2; - ModelRenderer HoriPole3; - ModelRenderer HoriPole4; - ModelRenderer HoriPole5; - ModelRenderer HoriPole6; - ModelRenderer HoriPole7; - ModelRenderer HoriPole8; + public static ResourceLocation LED_ON = MekanismUtils.getResource(ResourceType.RENDER, "EnergyCube_On.png"); + public static ResourceLocation LED_OFF = MekanismUtils.getResource(ResourceType.RENDER, "EnergyCube_Off.png"); + + ModelRenderer frame12; + ModelRenderer frame11; + ModelRenderer frame10; + ModelRenderer frame9; + ModelRenderer frame8; + ModelRenderer frame7; + ModelRenderer frame6; + ModelRenderer frame5; + ModelRenderer frame4; + ModelRenderer frame3; + ModelRenderer frame2; + ModelRenderer frame1; + ModelRenderer corner8; + ModelRenderer corner7; + ModelRenderer corner6; + ModelRenderer corner5; + ModelRenderer corner4; + ModelRenderer corner3; + ModelRenderer corner2; + ModelRenderer corner1; + ModelRenderer connectorBackToggle; + ModelRenderer connectorRightToggle; + ModelRenderer connectorBottomToggle; + ModelRenderer connectorLeftToggle; + ModelRenderer connectorFrontToggle; + ModelRenderer connectorTopToggle; + ModelRenderer portBackToggle; + ModelRenderer portBottomToggle; + ModelRenderer portFrontToggle; + ModelRenderer portLeftToggle; + ModelRenderer portRightToggle; + ModelRenderer portTopToggle; + ModelRenderer ledTop1; + ModelRenderer ledTop2; + ModelRenderer ledBack1; + ModelRenderer ledBack2; + ModelRenderer ledBottom2; + ModelRenderer ledBottom1; + ModelRenderer ledFront1; + ModelRenderer ledFront2; + ModelRenderer ledRight2; + ModelRenderer ledRight1; + ModelRenderer ledLeft1; + ModelRenderer ledLeft2; - public ModelEnergyCube() + public ModelEnergyCube() { textureWidth = 64; textureHeight = 64; - Corner1 = new ModelRenderer(this, 0, 17); - Corner1.addBox(0F, 0F, 0F, 3, 3, 3); - Corner1.setRotationPoint(5F, 21F, -8F); - Corner1.setTextureSize(64, 64); - Corner1.mirror = true; - setRotation(Corner1, 0F, 0F, 0F); - Corner2 = new ModelRenderer(this, 0, 17); - Corner2.addBox(0F, 0F, 0F, 3, 3, 3); - Corner2.setRotationPoint(-8F, 21F, -8F); - Corner2.setTextureSize(64, 64); - Corner2.mirror = true; - setRotation(Corner2, 0F, 0F, 0F); - Corner3 = new ModelRenderer(this, 0, 17); - Corner3.addBox(0F, 0F, 0F, 3, 3, 3); - Corner3.setRotationPoint(5F, 21F, 5F); - Corner3.setTextureSize(64, 64); - Corner3.mirror = true; - setRotation(Corner3, 0F, 0F, 0F); - Corner4 = new ModelRenderer(this, 0, 17); - Corner4.addBox(0F, 0F, 0F, 3, 3, 3); - Corner4.setRotationPoint(-8F, 21F, 5F); - Corner4.setTextureSize(64, 64); - Corner4.mirror = true; - setRotation(Corner4, 0F, 0F, 0F); - Corner5 = new ModelRenderer(this, 0, 17); - Corner5.addBox(0F, 0F, 0F, 3, 3, 3); - Corner5.setRotationPoint(5F, 8F, -8F); - Corner5.setTextureSize(64, 64); - Corner5.mirror = true; - setRotation(Corner5, 0F, 0F, 0F); - Corner6 = new ModelRenderer(this, 0, 17); - Corner6.addBox(0F, 0F, 0F, 3, 3, 3); - Corner6.setRotationPoint(-8F, 8F, -8F); - Corner6.setTextureSize(64, 64); - Corner6.mirror = true; - setRotation(Corner6, 0F, 0F, 0F); - Corner7 = new ModelRenderer(this, 0, 17); - Corner7.addBox(0F, 0F, 0F, 3, 3, 3); - Corner7.setRotationPoint(-8F, 8F, 5F); - Corner7.setTextureSize(64, 64); - Corner7.mirror = true; - setRotation(Corner7, 0F, 0F, 0F); - Corner8 = new ModelRenderer(this, 0, 17); - Corner8.addBox(0F, 0F, 0F, 3, 3, 3); - Corner8.setRotationPoint(5F, 8F, 5F); - Corner8.setTextureSize(64, 64); - Corner8.mirror = true; - setRotation(Corner8, 0F, 0F, 0F); - Frame4 = new ModelRenderer(this, 0, 24); - Frame4.addBox(0F, 0F, 0F, 3, 10, 3); - Frame4.setRotationPoint(5F, 11F, -8F); - Frame4.setTextureSize(64, 64); - Frame4.mirror = true; - setRotation(Frame4, 0F, 0F, 0F); - Frame3 = new ModelRenderer(this, 0, 24); - Frame3.addBox(0F, 0F, 0F, 3, 10, 3); - Frame3.setRotationPoint(-8F, 11F, -8F); - Frame3.setTextureSize(64, 64); - Frame3.mirror = true; - setRotation(Frame3, 0F, 0F, 0F); - Frame2 = new ModelRenderer(this, 0, 24); - Frame2.addBox(0F, 0F, 0F, 3, 10, 3); - Frame2.setRotationPoint(-8F, 11F, 5F); - Frame2.setTextureSize(64, 64); - Frame2.mirror = true; - setRotation(Frame2, 0F, 0F, 0F); - Frame1 = new ModelRenderer(this, 0, 24); - Frame1.addBox(0F, 0F, 0F, 3, 10, 3); - Frame1.setRotationPoint(5F, 11F, 5F); - Frame1.setTextureSize(64, 64); - Frame1.mirror = true; - setRotation(Frame1, 0F, 0F, 0F); - Connection = new ModelRenderer(this, 0, 7); - Connection.addBox(0F, 0F, 0F, 10, 6, 1); - Connection.setRotationPoint(-5F, 13F, -8F); - Connection.setTextureSize(64, 64); - Connection.mirror = true; - setRotation(Connection, 0F, 0F, 0F); - HoriPole1 = new ModelRenderer(this, 27, 0); - HoriPole1.addBox(0F, 0F, 0F, 3, 3, 10); - HoriPole1.setRotationPoint(5F, 21F, -5F); - HoriPole1.setTextureSize(64, 64); - HoriPole1.mirror = true; - setRotation(HoriPole1, 0F, 0F, 0F); - HoriPole2 = new ModelRenderer(this, 0, 0); - HoriPole2.addBox(0F, 0F, 0F, 10, 3, 3); - HoriPole2.setRotationPoint(-5F, 21F, 5F); - HoriPole2.setTextureSize(64, 64); - HoriPole2.mirror = true; - setRotation(HoriPole2, 0F, 0F, 0F); - HoriPole3 = new ModelRenderer(this, 27, 0); - HoriPole3.addBox(0F, 0F, 0F, 3, 3, 10); - HoriPole3.setRotationPoint(-8F, 21F, -5F); - HoriPole3.setTextureSize(64, 64); - HoriPole3.mirror = true; - setRotation(HoriPole3, 0F, 0F, 0F); - HoriPole4 = new ModelRenderer(this, 0, 0); - HoriPole4.addBox(0F, 0F, 0F, 10, 3, 3); - HoriPole4.setRotationPoint(-5F, 21F, -8F); - HoriPole4.setTextureSize(64, 64); - HoriPole4.mirror = true; - setRotation(HoriPole4, 0F, 0F, 0F); - HoriPole5 = new ModelRenderer(this, 27, 0); - HoriPole5.addBox(0F, 0F, 0F, 3, 3, 10); - HoriPole5.setRotationPoint(5F, 8F, -5F); - HoriPole5.setTextureSize(64, 64); - HoriPole5.mirror = true; - setRotation(HoriPole5, 0F, 0F, 0F); - HoriPole6 = new ModelRenderer(this, 0, 0); - HoriPole6.addBox(0F, 0F, 0F, 10, 3, 3); - HoriPole6.setRotationPoint(-5F, 8F, 5F); - HoriPole6.setTextureSize(64, 64); - HoriPole6.mirror = true; - setRotation(HoriPole6, 0F, 0F, 0F); - HoriPole7 = new ModelRenderer(this, 27, 0); - HoriPole7.addBox(0F, 0F, 0F, 3, 3, 10); - HoriPole7.setRotationPoint(-8F, 8F, -5F); - HoriPole7.setTextureSize(64, 64); - HoriPole7.mirror = true; - setRotation(HoriPole7, 0F, 0F, 0F); - HoriPole8 = new ModelRenderer(this, 0, 0); - HoriPole8.addBox(0F, 0F, 0F, 10, 3, 3); - HoriPole8.setRotationPoint(-5F, 8F, -8F); - HoriPole8.setTextureSize(64, 64); - HoriPole8.mirror = true; - setRotation(HoriPole8, 0F, 0F, 0F); + frame12 = new ModelRenderer(this, 0, 0); + frame12.addBox(0F, 0F, 0F, 3, 10, 3); + frame12.setRotationPoint(-8F, 11F, 5F); + frame12.setTextureSize(64, 64); + frame12.mirror = true; + setRotation(frame12, 0F, 0F, 0F); + frame11 = new ModelRenderer(this, 0, 0); + frame11.addBox(0F, 0F, 0F, 3, 10, 3); + frame11.setRotationPoint(5F, 11F, -8F); + frame11.setTextureSize(64, 64); + frame11.mirror = true; + setRotation(frame11, 0F, 0F, 0F); + frame10 = new ModelRenderer(this, 0, 13); + frame10.addBox(0F, 0F, 0F, 10, 3, 3); + frame10.setRotationPoint(-5F, 21F, 5F); + frame10.setTextureSize(64, 64); + frame10.mirror = true; + setRotation(frame10, 0F, 0F, 0F); + frame9 = new ModelRenderer(this, 12, 0); + frame9.addBox(0F, 0F, 0F, 3, 3, 10); + frame9.setRotationPoint(5F, 21F, -5F); + frame9.setTextureSize(64, 64); + frame9.mirror = true; + setRotation(frame9, 0F, 0F, 0F); + frame8 = new ModelRenderer(this, 0, 13); + frame8.addBox(0F, 0F, 0F, 10, 3, 3); + frame8.setRotationPoint(-5F, 8F, 5F); + frame8.setTextureSize(64, 64); + frame8.mirror = true; + setRotation(frame8, 0F, 0F, 0F); + frame7 = new ModelRenderer(this, 0, 13); + frame7.addBox(0F, 0F, 0F, 10, 3, 3); + frame7.setRotationPoint(-5F, 21F, -8F); + frame7.setTextureSize(64, 64); + frame7.mirror = true; + setRotation(frame7, 0F, 0F, 0F); + frame6 = new ModelRenderer(this, 0, 0); + frame6.addBox(0F, 0F, 0F, 3, 10, 3); + frame6.setRotationPoint(5F, 11F, 5F); + frame6.setTextureSize(64, 64); + frame6.mirror = true; + setRotation(frame6, 0F, 0F, 0F); + frame5 = new ModelRenderer(this, 0, 0); + frame5.addBox(0F, 0F, 0F, 3, 10, 3); + frame5.setRotationPoint(-8F, 11F, -8F); + frame5.setTextureSize(64, 64); + frame5.mirror = true; + setRotation(frame5, 0F, 0F, 0F); + frame4 = new ModelRenderer(this, 12, 0); + frame4.addBox(0F, 0F, 0F, 3, 3, 10); + frame4.setRotationPoint(5F, 8F, -5F); + frame4.setTextureSize(64, 64); + frame4.mirror = true; + setRotation(frame4, 0F, 0F, 0F); + frame3 = new ModelRenderer(this, 12, 0); + frame3.addBox(0F, 0F, 0F, 3, 3, 10); + frame3.setRotationPoint(-8F, 21F, -5F); + frame3.setTextureSize(64, 64); + frame3.mirror = true; + setRotation(frame3, 0F, 0F, 0F); + frame2 = new ModelRenderer(this, 12, 0); + frame2.addBox(0F, 0F, 0F, 3, 3, 10); + frame2.setRotationPoint(-8F, 8F, -5F); + frame2.setTextureSize(64, 64); + frame2.mirror = true; + setRotation(frame2, 0F, 0F, 0F); + frame1 = new ModelRenderer(this, 0, 13); + frame1.addBox(0F, 0F, 0F, 10, 3, 3); + frame1.setRotationPoint(-5F, 8F, -8F); + frame1.setTextureSize(64, 64); + frame1.mirror = true; + setRotation(frame1, 0F, 0F, 0F); + corner8 = new ModelRenderer(this, 26, 13); + corner8.addBox(0F, 0F, 0F, 3, 3, 3); + corner8.setRotationPoint(5F, 21F, 5F); + corner8.setTextureSize(64, 64); + corner8.mirror = true; + setRotation(corner8, 0F, 0F, 0F); + corner7 = new ModelRenderer(this, 26, 13); + corner7.addBox(0F, 0F, 0F, 3, 3, 3); + corner7.setRotationPoint(5F, 21F, -8F); + corner7.setTextureSize(64, 64); + corner7.mirror = true; + setRotation(corner7, 0F, 0F, 0F); + corner6 = new ModelRenderer(this, 26, 13); + corner6.addBox(0F, 0F, 0F, 3, 3, 3); + corner6.setRotationPoint(-8F, 21F, 5F); + corner6.setTextureSize(64, 64); + corner6.mirror = true; + setRotation(corner6, 0F, 0F, 0F); + corner5 = new ModelRenderer(this, 26, 13); + corner5.addBox(0F, 0F, 0F, 3, 3, 3); + corner5.setRotationPoint(-8F, 21F, -8F); + corner5.setTextureSize(64, 64); + corner5.mirror = true; + setRotation(corner5, 0F, 0F, 0F); + corner4 = new ModelRenderer(this, 26, 13); + corner4.addBox(0F, 0F, 0F, 3, 3, 3); + corner4.setRotationPoint(5F, 8F, 5F); + corner4.setTextureSize(64, 64); + corner4.mirror = true; + setRotation(corner4, 0F, 0F, 0F); + corner3 = new ModelRenderer(this, 26, 13); + corner3.addBox(0F, 0F, 0F, 3, 3, 3); + corner3.setRotationPoint(5F, 8F, -8F); + corner3.setTextureSize(64, 64); + corner3.mirror = true; + setRotation(corner3, 0F, 0F, 0F); + corner2 = new ModelRenderer(this, 26, 13); + corner2.addBox(0F, 0F, 0F, 3, 3, 3); + corner2.setRotationPoint(-8F, 8F, 5F); + corner2.setTextureSize(64, 64); + corner2.mirror = true; + setRotation(corner2, 0F, 0F, 0F); + corner1 = new ModelRenderer(this, 26, 13); + corner1.addBox(0F, 0F, 0F, 3, 3, 3); + corner1.setRotationPoint(-8F, 8F, -8F); + corner1.setTextureSize(64, 64); + corner1.mirror = true; + setRotation(corner1, 0F, 0F, 0F); + connectorBackToggle = new ModelRenderer(this, 38, 16); + connectorBackToggle.addBox(0F, 0F, 0F, 10, 6, 1); + connectorBackToggle.setRotationPoint(-5F, 13F, 6F); + connectorBackToggle.setTextureSize(64, 64); + connectorBackToggle.mirror = true; + setRotation(connectorBackToggle, 0F, 0F, 0F); + connectorRightToggle = new ModelRenderer(this, 38, 0); + connectorRightToggle.addBox(0F, 0F, 0F, 1, 6, 10); + connectorRightToggle.setRotationPoint(6F, 13F, -5F); + connectorRightToggle.setTextureSize(64, 64); + connectorRightToggle.mirror = true; + setRotation(connectorRightToggle, 0F, 0F, 0F); + connectorBottomToggle = new ModelRenderer(this, 0, 19); + connectorBottomToggle.addBox(0F, 0F, 0F, 10, 1, 6); + connectorBottomToggle.setRotationPoint(-5F, 22F, -3F); + connectorBottomToggle.setTextureSize(64, 64); + connectorBottomToggle.mirror = true; + setRotation(connectorBottomToggle, 0F, 0F, 0F); + connectorLeftToggle = new ModelRenderer(this, 38, 0); + connectorLeftToggle.addBox(0F, 0F, 0F, 1, 6, 10); + connectorLeftToggle.setRotationPoint(-7F, 13F, -5F); + connectorLeftToggle.setTextureSize(64, 64); + connectorLeftToggle.mirror = true; + setRotation(connectorLeftToggle, 0F, 0F, 0F); + connectorFrontToggle = new ModelRenderer(this, 38, 16); + connectorFrontToggle.addBox(0F, 0F, 0F, 10, 6, 1); + connectorFrontToggle.setRotationPoint(-5F, 13F, -7F); + connectorFrontToggle.setTextureSize(64, 64); + connectorFrontToggle.mirror = true; + setRotation(connectorFrontToggle, 0F, 0F, 0F); + connectorTopToggle = new ModelRenderer(this, 0, 19); + connectorTopToggle.addBox(0F, 0F, 0F, 10, 1, 6); + connectorTopToggle.setRotationPoint(-5F, 9F, -3F); + connectorTopToggle.setTextureSize(64, 64); + connectorTopToggle.mirror = true; + setRotation(connectorTopToggle, 0F, 0F, 0F); + portBackToggle = new ModelRenderer(this, 18, 35); + portBackToggle.addBox(0F, 0F, 0F, 8, 8, 1); + portBackToggle.setRotationPoint(-4F, 12F, 7F); + portBackToggle.setTextureSize(64, 64); + portBackToggle.mirror = true; + setRotation(portBackToggle, 0F, 0F, 0F); + portBottomToggle = new ModelRenderer(this, 0, 26); + portBottomToggle.addBox(0F, 0F, 0F, 8, 1, 8); + portBottomToggle.setRotationPoint(-4F, 23F, -4F); + portBottomToggle.setTextureSize(64, 64); + portBottomToggle.mirror = true; + setRotation(portBottomToggle, 0F, 0F, 0F); + portFrontToggle = new ModelRenderer(this, 18, 35); + portFrontToggle.addBox(0F, 0F, 0F, 8, 8, 1); + portFrontToggle.setRotationPoint(-4F, 12F, -8F); + portFrontToggle.setTextureSize(64, 64); + portFrontToggle.mirror = true; + setRotation(portFrontToggle, 0F, 0F, 0F); + portLeftToggle = new ModelRenderer(this, 0, 35); + portLeftToggle.addBox(0F, 0F, 0F, 1, 8, 8); + portLeftToggle.setRotationPoint(-8F, 12F, -4F); + portLeftToggle.setTextureSize(64, 64); + portLeftToggle.mirror = true; + setRotation(portLeftToggle, 0F, 0F, 0F); + portRightToggle = new ModelRenderer(this, 0, 35); + portRightToggle.addBox(0F, 0F, 0F, 1, 8, 8); + portRightToggle.setRotationPoint(7F, 12F, -4F); + portRightToggle.setTextureSize(64, 64); + portRightToggle.mirror = true; + setRotation(portRightToggle, 0F, 0F, 0F); + portTopToggle = new ModelRenderer(this, 0, 26); + portTopToggle.addBox(0F, 0F, 0F, 8, 1, 8); + portTopToggle.setRotationPoint(-4F, 8F, -4F); + portTopToggle.setTextureSize(64, 64); + portTopToggle.mirror = true; + setRotation(portTopToggle, 0F, 0F, 0F); + ledTop1 = new ModelRenderer(this, 0, 51); + ledTop1.addBox(0F, 0F, 0F, 1, 1, 1); + ledTop1.setRotationPoint(-5.5F, 8.1F, -0.5F); + ledTop1.setTextureSize(64, 64); + ledTop1.mirror = true; + setRotation(ledTop1, 0F, 0F, 0F); + ledTop2 = new ModelRenderer(this, 0, 51); + ledTop2.addBox(0F, 0F, 0F, 1, 1, 1); + ledTop2.setRotationPoint(4.5F, 8.1F, -0.5F); + ledTop2.setTextureSize(64, 64); + ledTop2.mirror = true; + setRotation(ledTop2, 0F, 0F, 0F); + ledBack1 = new ModelRenderer(this, 0, 51); + ledBack1.addBox(0F, 0F, 0F, 1, 1, 1); + ledBack1.setRotationPoint(-5.5F, 15.5F, 6.9F); + ledBack1.setTextureSize(64, 64); + ledBack1.mirror = true; + setRotation(ledBack1, 0F, 0F, 0F); + ledBack2 = new ModelRenderer(this, 0, 51); + ledBack2.addBox(0F, 0F, 0F, 1, 1, 1); + ledBack2.setRotationPoint(4.5F, 15.5F, 6.9F); + ledBack2.setTextureSize(64, 64); + ledBack2.mirror = true; + setRotation(ledBack2, 0F, 0F, 0F); + ledBottom2 = new ModelRenderer(this, 0, 51); + ledBottom2.addBox(0F, 0F, 0F, 1, 1, 1); + ledBottom2.setRotationPoint(4.5F, 22.9F, -0.5F); + ledBottom2.setTextureSize(64, 64); + ledBottom2.mirror = true; + setRotation(ledBottom2, 0F, 0F, 0F); + ledBottom1 = new ModelRenderer(this, 0, 51); + ledBottom1.addBox(0F, 0F, 0F, 1, 1, 1); + ledBottom1.setRotationPoint(-5.5F, 22.9F, -0.5F); + ledBottom1.setTextureSize(64, 64); + ledBottom1.mirror = true; + setRotation(ledBottom1, 0F, 0F, 0F); + ledFront1 = new ModelRenderer(this, 0, 51); + ledFront1.addBox(0F, 0F, 0F, 1, 1, 1); + ledFront1.setRotationPoint(-5.5F, 15.5F, -7.9F); + ledFront1.setTextureSize(64, 64); + ledFront1.mirror = true; + setRotation(ledFront1, 0F, 0F, 0F); + ledFront2 = new ModelRenderer(this, 0, 51); + ledFront2.addBox(0F, 0F, 0F, 1, 1, 1); + ledFront2.setRotationPoint(4.5F, 15.5F, -7.9F); + ledFront2.setTextureSize(64, 64); + ledFront2.mirror = true; + setRotation(ledFront2, 0F, 0F, 0F); + ledRight2 = new ModelRenderer(this, 0, 51); + ledRight2.addBox(0F, 0F, 0F, 1, 1, 1); + ledRight2.setRotationPoint(6.9F, 15.5F, 4.5F); + ledRight2.setTextureSize(64, 64); + ledRight2.mirror = true; + setRotation(ledRight2, 0F, 0F, 0F); + ledRight1 = new ModelRenderer(this, 0, 51); + ledRight1.addBox(0F, 0F, 0F, 1, 1, 1); + ledRight1.setRotationPoint(6.9F, 15.5F, -5.5F); + ledRight1.setTextureSize(64, 64); + ledRight1.mirror = true; + setRotation(ledRight1, 0F, 0F, 0F); + ledLeft1 = new ModelRenderer(this, 0, 51); + ledLeft1.addBox(0F, 0F, 0F, 1, 1, 1); + ledLeft1.setRotationPoint(-7.9F, 15.5F, 4.5F); + ledLeft1.setTextureSize(64, 64); + ledLeft1.mirror = true; + setRotation(ledLeft1, 0F, 0F, 0F); + ledLeft2 = new ModelRenderer(this, 0, 51); + ledLeft2.addBox(0F, 0F, 0F, 1, 1, 1); + ledLeft2.setRotationPoint(-7.9F, 15.5F, -5.5F); + ledLeft2.setTextureSize(64, 64); + ledLeft2.mirror = true; + setRotation(ledLeft2, 0F, 0F, 0F); } public void render(float size) { + frame12.render(size); + frame11.render(size); + frame10.render(size); + frame9.render(size); + frame8.render(size); + frame7.render(size); + frame6.render(size); + frame5.render(size); + frame4.render(size); + frame3.render(size); + frame2.render(size); + frame1.render(size); + MekanismRenderer.glowOn(); - Corner1.render(size); - Corner2.render(size); - Corner3.render(size); - Corner4.render(size); - Corner5.render(size); - Corner6.render(size); - Corner7.render(size); - Corner8.render(size); + corner8.render(size); + corner7.render(size); + corner6.render(size); + corner5.render(size); + corner4.render(size); + corner3.render(size); + corner2.render(size); + corner1.render(size); MekanismRenderer.glowOff(); - - Frame4.render(size); - Frame3.render(size); - Frame2.render(size); - Frame1.render(size); - Connection.render(size); - HoriPole1.render(size); - HoriPole2.render(size); - HoriPole3.render(size); - HoriPole4.render(size); - HoriPole5.render(size); - HoriPole6.render(size); - HoriPole7.render(size); - HoriPole8.render(size); + } + + @SuppressWarnings("incomplete-switch") + public void renderSide(float size, ForgeDirection side, IOState state, TextureManager renderer) + { + if(state != IOState.OFF) + { + switch(side) + { + case DOWN: + connectorBottomToggle.render(size); + + if(state == IOState.OUTPUT) + { + MekanismRenderer.glowOn(); + } + + portBottomToggle.render(size); + + if(state == IOState.OUTPUT) + { + MekanismRenderer.glowOff(); + } + + break; + case UP: + connectorTopToggle.render(size); + + if(state == IOState.OUTPUT) + { + MekanismRenderer.glowOn(); + } + + portTopToggle.render(size); + + if(state == IOState.OUTPUT) + { + MekanismRenderer.glowOff(); + } + + break; + case NORTH: + connectorFrontToggle.render(size); + + if(state == IOState.OUTPUT) + { + MekanismRenderer.glowOn(); + } + + portFrontToggle.render(size); + + if(state == IOState.OUTPUT) + { + MekanismRenderer.glowOff(); + } + + break; + case SOUTH: + connectorBackToggle.render(size); + + if(state == IOState.OUTPUT) + { + MekanismRenderer.glowOn(); + } + + portBackToggle.render(size); + + if(state == IOState.OUTPUT) + { + MekanismRenderer.glowOff(); + } + + break; + case WEST: + connectorLeftToggle.render(size); + + if(state == IOState.OUTPUT) + { + MekanismRenderer.glowOn(); + } + + portLeftToggle.render(size); + + if(state == IOState.OUTPUT) + { + MekanismRenderer.glowOff(); + } + + break; + case EAST: + connectorRightToggle.render(size); + + if(state == IOState.OUTPUT) + { + MekanismRenderer.glowOn(); + } + + portRightToggle.render(size); + + if(state == IOState.OUTPUT) + { + MekanismRenderer.glowOff(); + } + + break; + } + } + + renderer.bindTexture(state == IOState.OUTPUT ? LED_ON : LED_OFF); + + if(state == IOState.OUTPUT) + { + MekanismRenderer.glowOn(); + } + + switch(side) + { + case DOWN: + ledBottom1.render(size); + ledBottom2.render(size); + + break; + case UP: + ledTop1.render(size); + ledTop2.render(size); + + break; + case NORTH: + ledFront1.render(size); + ledFront2.render(size); + + break; + case SOUTH: + ledBack1.render(size); + ledBack2.render(size); + + break; + case WEST: + ledLeft1.render(size); + ledLeft2.render(size); + + break; + case EAST: + ledRight1.render(size); + ledRight2.render(size); + + break; + } + + if(state == IOState.OUTPUT) + { + MekanismRenderer.glowOff(); + } } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelLogisticalSorter.java b/src/main/java/mekanism/client/model/ModelLogisticalSorter.java index fc065cd10..8fec0d967 100644 --- a/src/main/java/mekanism/client/model/ModelLogisticalSorter.java +++ b/src/main/java/mekanism/client/model/ModelLogisticalSorter.java @@ -9,196 +9,236 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelLogisticalSorter extends ModelBase { - ModelRenderer LeftThing; - ModelRenderer RightThing; - ModelRenderer BottomPlate; - ModelRenderer TopPlate; - ModelRenderer LeftPlate; - ModelRenderer RightPlate; - ModelRenderer BR1Block1; - ModelRenderer BL1Block1; - ModelRenderer TL1Block1; - ModelRenderer TR1Block1; - ModelRenderer BR1Block2; - ModelRenderer BL1Block2; - ModelRenderer TL1Block2; - ModelRenderer TR1Block2; - ModelRenderer PoleBR; - ModelRenderer PoleTL; - ModelRenderer PoleTR; - ModelRenderer PoleBL; - ModelRenderer Base; - ModelRenderer PipeBase; - ModelRenderer DecorPlate; + ModelRenderer portBack; + ModelRenderer portBackLarge; + ModelRenderer connectorBack; + ModelRenderer portFront; + ModelRenderer ring1; + ModelRenderer ring2; + ModelRenderer ring3; + ModelRenderer ring4; + ModelRenderer ring5; + ModelRenderer ring6; + ModelRenderer ring7; + ModelRenderer pistonBar1; + ModelRenderer pipe; + ModelRenderer pistonBase1; + ModelRenderer pistonBrace1; + ModelRenderer pistonConnector1; + ModelRenderer pistonBrace2; + ModelRenderer pistonConnector2; + ModelRenderer pistonBar2; + ModelRenderer pistonBase2; + ModelRenderer panel2; + ModelRenderer led4; + ModelRenderer led3; + ModelRenderer led2; + ModelRenderer led1; + ModelRenderer panel1; - public ModelLogisticalSorter() + public ModelLogisticalSorter() { textureWidth = 128; textureHeight = 64; - LeftThing = new ModelRenderer(this, 0, 29); - LeftThing.addBox(0F, 0F, 0F, 1, 12, 1); - LeftThing.setRotationPoint(5.5F, 10F, 5F); - LeftThing.setTextureSize(128, 64); - LeftThing.mirror = true; - setRotation(LeftThing, 0F, 0F, 0F); - RightThing = new ModelRenderer(this, 0, 29); - RightThing.addBox(0F, 0F, 0F, 1, 12, 1); - RightThing.setRotationPoint(5.5F, 10F, -6F); - RightThing.setTextureSize(128, 64); - RightThing.mirror = true; - setRotation(RightThing, 0F, 0F, 0F); - BottomPlate = new ModelRenderer(this, 60, 7); - BottomPlate.addBox(0F, 0F, 0F, 12, 1, 4); - BottomPlate.setRotationPoint(-6F, 18F, -2F); - BottomPlate.setTextureSize(128, 64); - BottomPlate.mirror = true; - setRotation(BottomPlate, 0F, 0F, 0F); - TopPlate = new ModelRenderer(this, 60, 7); - TopPlate.addBox(0F, 0F, 0F, 12, 1, 4); - TopPlate.setRotationPoint(-6F, 13F, -2F); - TopPlate.setTextureSize(128, 64); - TopPlate.mirror = true; - setRotation(TopPlate, 0F, 0F, 0F); - LeftPlate = new ModelRenderer(this, 33, 5); - LeftPlate.addBox(0F, 0F, 0F, 12, 6, 1); - LeftPlate.setRotationPoint(-6F, 13F, 2F); - LeftPlate.setTextureSize(128, 64); - LeftPlate.mirror = true; - setRotation(LeftPlate, 0F, 0F, 0F); - RightPlate = new ModelRenderer(this, 33, 5); - RightPlate.addBox(0F, 0F, 0F, 12, 6, 1); - RightPlate.setRotationPoint(-6F, 13F, -3F); - RightPlate.setTextureSize(128, 64); - RightPlate.mirror = true; - setRotation(RightPlate, 0F, 0F, 0F); - BR1Block1 = new ModelRenderer(this, 33, 0); - BR1Block1.addBox(0F, 0F, 0F, 1, 2, 2); - BR1Block1.setRotationPoint(4F, 17.5F, -3.5F); - BR1Block1.setTextureSize(128, 64); - BR1Block1.mirror = true; - setRotation(BR1Block1, 0F, 0.0174533F, 0F); - BL1Block1 = new ModelRenderer(this, 33, 0); - BL1Block1.addBox(0F, 0F, 0F, 1, 2, 2); - BL1Block1.setRotationPoint(4F, 17.5F, 1.473333F); - BL1Block1.setTextureSize(128, 64); - BL1Block1.mirror = true; - setRotation(BL1Block1, 0F, 0F, 0F); - TL1Block1 = new ModelRenderer(this, 33, 0); - TL1Block1.addBox(0F, 0F, 0F, 1, 2, 2); - TL1Block1.setRotationPoint(4F, 12.5F, 1.473333F); - TL1Block1.setTextureSize(128, 64); - TL1Block1.mirror = true; - setRotation(TL1Block1, 0F, 0F, 0F); - TR1Block1 = new ModelRenderer(this, 33, 0); - TR1Block1.addBox(0F, 0F, 0F, 1, 2, 2); - TR1Block1.setRotationPoint(4F, 12.5F, -3.5F); - TR1Block1.setTextureSize(128, 64); - TR1Block1.mirror = true; - setRotation(TR1Block1, 0F, 0F, 0F); - BR1Block2 = new ModelRenderer(this, 33, 0); - BR1Block2.addBox(0F, 0F, 0F, 1, 2, 2); - BR1Block2.setRotationPoint(-5F, 17.5F, -3.5F); - BR1Block2.setTextureSize(128, 64); - BR1Block2.mirror = true; - setRotation(BR1Block2, 0F, 0F, 0F); - BL1Block2 = new ModelRenderer(this, 33, 0); - BL1Block2.addBox(0F, 0F, 0F, 1, 2, 2); - BL1Block2.setRotationPoint(-5F, 17.5F, 1.473333F); - BL1Block2.setTextureSize(128, 64); - BL1Block2.mirror = true; - setRotation(BL1Block2, 0F, 0F, 0F); - TL1Block2 = new ModelRenderer(this, 33, 0); - TL1Block2.addBox(0F, 0F, 0F, 1, 2, 2); - TL1Block2.setRotationPoint(-5F, 12.5F, 1.473333F); - TL1Block2.setTextureSize(128, 64); - TL1Block2.mirror = true; - setRotation(TL1Block2, 0F, 0F, 0F); - TR1Block2 = new ModelRenderer(this, 33, 0); - TR1Block2.addBox(0F, 0F, 0F, 1, 2, 2); - TR1Block2.setRotationPoint(-5F, 12.5F, -3.5F); - TR1Block2.setTextureSize(128, 64); - TR1Block2.mirror = true; - setRotation(TR1Block2, 0F, 0F, 0F); - PoleBR = new ModelRenderer(this, 40, 0); - PoleBR.addBox(0F, 0F, 0F, 8, 1, 1); - PoleBR.setRotationPoint(-4F, 18.2F, 2.2F); - PoleBR.setTextureSize(128, 64); - PoleBR.mirror = true; - setRotation(PoleBR, 0F, 0F, 0F); - PoleTL = new ModelRenderer(this, 40, 0); - PoleTL.addBox(0F, 0F, 0F, 8, 1, 1); - PoleTL.setRotationPoint(-4F, 12.8F, -3.2F); - PoleTL.setTextureSize(128, 64); - PoleTL.mirror = true; - setRotation(PoleTL, 0F, 0F, 0F); - PoleTR = new ModelRenderer(this, 40, 0); - PoleTR.addBox(0F, 0F, 0F, 8, 1, 1); - PoleTR.setRotationPoint(-4F, 12.8F, 2.2F); - PoleTR.setTextureSize(128, 64); - PoleTR.mirror = true; - setRotation(PoleTR, 0F, 0F, 0F); - PoleBL = new ModelRenderer(this, 40, 0); - PoleBL.addBox(0F, 0F, 0F, 8, 1, 1); - PoleBL.setRotationPoint(-4F, 18.2F, -3.2F); - PoleBL.setTextureSize(128, 64); - PoleBL.mirror = true; - setRotation(PoleBL, 0F, 0F, 0F); - Base = new ModelRenderer(this, 0, 0); - Base.addBox(0F, 0F, 0F, 2, 14, 14); - Base.setRotationPoint(6F, 9F, -7F); - Base.setTextureSize(128, 64); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - PipeBase = new ModelRenderer(this, 33, 13); - PipeBase.addBox(0F, 0F, 0F, 3, 8, 8); - PipeBase.setRotationPoint(-8F, 12F, -4F); - PipeBase.setTextureSize(128, 64); - PipeBase.mirror = true; - setRotation(PipeBase, 0F, 0F, 0F); - DecorPlate = new ModelRenderer(this, 5, 29); - DecorPlate.addBox(0F, 0F, 0F, 1, 8, 8); - DecorPlate.setRotationPoint(5F, 12F, -4F); - DecorPlate.setTextureSize(128, 64); - DecorPlate.mirror = true; - setRotation(DecorPlate, 0F, 0F, 0F); + portBack = new ModelRenderer(this, 26, 11); + portBack.addBox(0F, 0F, 0F, 8, 8, 1); + portBack.setRotationPoint(-4F, 12F, 8F); + portBack.setTextureSize(128, 64); + portBack.mirror = true; + setRotation(portBack, 0F, 0F, 0F); + portBackLarge = new ModelRenderer(this, 0, 0); + portBackLarge.addBox(0F, 0F, 0F, 12, 12, 1); + portBackLarge.setRotationPoint(-6F, 10F, 7F); + portBackLarge.setTextureSize(128, 64); + portBackLarge.mirror = true; + setRotation(portBackLarge, 0F, 0F, 0F); + connectorBack = new ModelRenderer(this, 26, 0); + connectorBack.addBox(0F, 0F, 0F, 10, 10, 1); + connectorBack.setRotationPoint(-5F, 11F, 6F); + connectorBack.setTextureSize(128, 64); + connectorBack.mirror = true; + setRotation(connectorBack, 0F, 0F, 0F); + portFront = new ModelRenderer(this, 48, 0); + portFront.addBox(0F, 0F, 0F, 10, 10, 1); + portFront.setRotationPoint(-5F, 11F, -8F); + portFront.setTextureSize(128, 64); + portFront.mirror = true; + setRotation(portFront, 0F, 0F, 0F); + ring1 = new ModelRenderer(this, 44, 11); + ring1.addBox(0F, 0F, 0F, 7, 7, 1); + ring1.setRotationPoint(-3.5F, 12.5F, -7F); + ring1.setTextureSize(128, 64); + ring1.mirror = true; + setRotation(ring1, 0F, 0F, 0F); + ring2 = new ModelRenderer(this, 44, 11); + ring2.addBox(0F, 0F, 0F, 7, 7, 1); + ring2.setRotationPoint(-3.5F, 12.5F, -5F); + ring2.setTextureSize(128, 64); + ring2.mirror = true; + setRotation(ring2, 0F, 0F, 0F); + ring3 = new ModelRenderer(this, 44, 11); + ring3.addBox(0F, 0F, 0F, 7, 7, 1); + ring3.setRotationPoint(-3.5F, 12.5F, -3F); + ring3.setTextureSize(128, 64); + ring3.mirror = true; + setRotation(ring3, 0F, 0F, 0F); + ring4 = new ModelRenderer(this, 44, 11); + ring4.addBox(0F, 0F, 0F, 7, 7, 1); + ring4.setRotationPoint(-3.5F, 12.5F, -1F); + ring4.setTextureSize(128, 64); + ring4.mirror = true; + setRotation(ring4, 0F, 0F, 0F); + ring5 = new ModelRenderer(this, 44, 11); + ring5.addBox(0F, 0F, 0F, 7, 7, 1); + ring5.setRotationPoint(-3.5F, 12.5F, 1F); + ring5.setTextureSize(128, 64); + ring5.mirror = true; + setRotation(ring5, 0F, 0F, 0F); + ring6 = new ModelRenderer(this, 44, 11); + ring6.addBox(0F, 0F, 0F, 7, 7, 1); + ring6.setRotationPoint(-3.5F, 12.5F, 3F); + ring6.setTextureSize(128, 64); + ring6.mirror = true; + setRotation(ring6, 0F, 0F, 0F); + ring7 = new ModelRenderer(this, 44, 11); + ring7.addBox(0F, 0F, 0F, 7, 7, 1); + ring7.setRotationPoint(-3.5F, 12.5F, 5F); + ring7.setTextureSize(128, 64); + ring7.mirror = true; + setRotation(ring7, 0F, 0F, 0F); + pistonBar1 = new ModelRenderer(this, 0, 20); + pistonBar1.addBox(0F, 0F, 0F, 1, 1, 5); + pistonBar1.setRotationPoint(-0.5F, 19.5F, -2.99F); + pistonBar1.setTextureSize(128, 64); + pistonBar1.mirror = true; + setRotation(pistonBar1, 0F, 0F, 0F); + pipe = new ModelRenderer(this, 0, 13); + pipe.addBox(0F, 0F, 0F, 6, 6, 14); + pipe.setRotationPoint(-3F, 13F, -7F); + pipe.setTextureSize(128, 64); + pipe.mirror = true; + setRotation(pipe, 0F, 0F, 0F); + pistonBase1 = new ModelRenderer(this, 0, 13); + pistonBase1.addBox(0F, 0F, 0F, 2, 2, 5); + pistonBase1.setRotationPoint(-1F, 19F, 1.01F); + pistonBase1.setTextureSize(128, 64); + pistonBase1.mirror = true; + setRotation(pistonBase1, 0F, 0F, 0F); + pistonBrace1 = new ModelRenderer(this, 0, 33); + pistonBrace1.addBox(0F, 0F, 0F, 2, 2, 3); + pistonBrace1.setRotationPoint(-1F, 18.5F, -7F); + pistonBrace1.setTextureSize(128, 64); + pistonBrace1.mirror = true; + setRotation(pistonBrace1, 0F, 0F, 0F); + pistonConnector1 = new ModelRenderer(this, 10, 33); + pistonConnector1.addBox(0F, 0F, 0F, 2, 2, 1); + pistonConnector1.setRotationPoint(-1F, 19F, -4F); + pistonConnector1.setTextureSize(128, 64); + pistonConnector1.mirror = true; + setRotation(pistonConnector1, 0F, 0F, 0F); + pistonBrace2 = new ModelRenderer(this, 0, 33); + pistonBrace2.addBox(0F, 0F, 0F, 2, 2, 3); + pistonBrace2.setRotationPoint(-1F, 11.5F, -7F); + pistonBrace2.setTextureSize(128, 64); + pistonBrace2.mirror = true; + setRotation(pistonBrace2, 0F, 0F, 0F); + pistonConnector2 = new ModelRenderer(this, 10, 33); + pistonConnector2.addBox(0F, 0F, 0F, 2, 2, 1); + pistonConnector2.setRotationPoint(-1F, 11F, -4F); + pistonConnector2.setTextureSize(128, 64); + pistonConnector2.mirror = true; + setRotation(pistonConnector2, 0F, 0F, 0F); + pistonBar2 = new ModelRenderer(this, 0, 20); + pistonBar2.addBox(0F, 0F, 0F, 1, 1, 5); + pistonBar2.setRotationPoint(-0.5F, 11.5F, -2.99F); + pistonBar2.setTextureSize(128, 64); + pistonBar2.mirror = true; + setRotation(pistonBar2, 0F, 0F, 0F); + pistonBase2 = new ModelRenderer(this, 0, 13); + pistonBase2.addBox(0F, 0F, 0F, 2, 2, 5); + pistonBase2.setRotationPoint(-1F, 11F, 1.01F); + pistonBase2.setTextureSize(128, 64); + pistonBase2.mirror = true; + setRotation(pistonBase2, 0F, 0F, 0F); + panel2 = new ModelRenderer(this, 40, 22); + panel2.addBox(0F, 0F, 0F, 1, 3, 8); + panel2.setRotationPoint(3F, 14.5F, -4.5F); + panel2.setTextureSize(128, 64); + panel2.mirror = true; + setRotation(panel2, 0F, 0F, 0F); + led4 = new ModelRenderer(this, 40, 22); + led4.addBox(0F, 0F, 0F, 1, 1, 1); + led4.setRotationPoint(3.5F, 15.5F, -1.5F); + led4.setTextureSize(128, 64); + led4.mirror = true; + setRotation(led4, 0F, 0F, 0F); + led3 = new ModelRenderer(this, 40, 22); + led3.addBox(0F, 0F, 0F, 1, 1, 1); + led3.setRotationPoint(3.5F, 15.5F, -3.5F); + led3.setTextureSize(128, 64); + led3.mirror = true; + setRotation(led3, 0F, 0F, 0F); + led2 = new ModelRenderer(this, 40, 22); + led2.addBox(0F, 0F, 0F, 1, 1, 1); + led2.setRotationPoint(-4.5F, 15.5F, -3.5F); + led2.setTextureSize(128, 64); + led2.mirror = true; + setRotation(led2, 0F, 0F, 0F); + led1 = new ModelRenderer(this, 40, 22); + led1.addBox(0F, 0F, 0F, 1, 1, 1); + led1.setRotationPoint(-4.5F, 15.5F, -1.5F); + led1.setTextureSize(128, 64); + led1.mirror = true; + setRotation(led1, 0F, 0F, 0F); + panel1 = new ModelRenderer(this, 40, 22); + panel1.addBox(0F, 0F, 0F, 1, 3, 8); + panel1.setRotationPoint(-4F, 14.5F, -4.5F); + panel1.setTextureSize(128, 64); + panel1.mirror = true; + setRotation(panel1, 0F, 0F, 0F); } public void render(float size, boolean active) { - LeftThing.render(size); - RightThing.render(size); - BottomPlate.render(size); - TopPlate.render(size); - LeftPlate.render(size); - RightPlate.render(size); - + portBack.render(size); + portBackLarge.render(size); + connectorBack.render(size); + portFront.render(size); + ring1.render(size); + ring2.render(size); + ring3.render(size); + ring4.render(size); + ring5.render(size); + ring6.render(size); + ring7.render(size); + pistonBar1.render(size); + pipe.render(size); + pistonBase1.render(size); + pistonBrace1.render(size); + pistonConnector1.render(size); + pistonBrace2.render(size); + pistonConnector2.render(size); + pistonBar2.render(size); + pistonBase2.render(size); + panel2.render(size); + if(active) { MekanismRenderer.glowOn(); } - - BR1Block1.render(size); - BL1Block1.render(size); - TL1Block1.render(size); - TR1Block1.render(size); - BR1Block2.render(size); - BL1Block2.render(size); - TL1Block2.render(size); - TR1Block2.render(size); - + + led4.render(size); + led3.render(size); + led2.render(size); + led1.render(size); + if(active) { MekanismRenderer.glowOff(); } - - PoleBR.render(size); - PoleTL.render(size); - PoleTR.render(size); - PoleBL.render(size); - Base.render(size); - PipeBase.render(size); - DecorPlate.render(size); + + panel1.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index 84d0d64d7..e2d0dd061 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -96,8 +96,8 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler else if(type == MachineType.LOGISTICAL_SORTER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.85F, -0.15F); + GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(0.0F, -1.0F, 0.0F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LogisticalSorter.png")); logisticalSorter.render(0.0625F, false); } @@ -128,7 +128,8 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler else if(type == MachineType.CHEMICAL_INFUSER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.0F, -1.06F, 0.05F); + GL11.glRotatef(180f, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(0.0F, -0.96F, 0.05F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalInfuser.png")); chemicalInfuser.render(0.0625F); } diff --git a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java index 5d3c71939..95ce0ec47 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -21,9 +21,11 @@ import mekanism.client.render.RenderGlowPanel; import mekanism.client.render.RenderPartTransmitter; import mekanism.client.render.entity.RenderBalloon; import mekanism.client.render.tileentity.RenderBin; +import mekanism.client.render.tileentity.RenderEnergyCube; import mekanism.client.render.tileentity.RenderFluidTank; import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; +import mekanism.common.SideData.IOState; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.Tier.FluidTankTier; @@ -75,6 +77,8 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ItemRenderingHandler implements IItemRenderer { + private Minecraft mc = Minecraft.getMinecraft(); + public ModelRobit robit = new ModelRobit(); public ModelChest personalChest = new ModelChest(); public ModelEnergyCube energyCube = new ModelEnergyCube(); @@ -125,17 +129,22 @@ public class ItemRenderingHandler implements IItemRenderer { EnergyCubeTier tier = ((IEnergyCube)item.getItem()).getEnergyCubeTier(item); IEnergizedItem energized = (IEnergizedItem)item.getItem(); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "EnergyCube" + tier.getBaseTier().getName() + ".png")); + mc.renderEngine.bindTexture(RenderEnergyCube.resources.get(tier)); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.0F, 0.0F); energyCube.render(0.0625F); + + for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + { + energyCube.renderSide(0.0625F, side, side == ForgeDirection.NORTH ? IOState.OUTPUT : IOState.INPUT, mc.renderEngine); + } GL11.glPushMatrix(); GL11.glTranslated(0.0, 1.0, 0.0); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "EnergyCore.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "EnergyCore.png")); GL11.glShadeModel(GL11.GL_SMOOTH); GL11.glEnable(GL11.GL_BLEND); @@ -219,7 +228,7 @@ public class ItemRenderingHandler implements IItemRenderer GL11.glScalef(scale*scaler, scale*scaler, 0); - TextureManager renderEngine = Minecraft.getMinecraft().renderEngine; + TextureManager renderEngine = mc.renderEngine; GL11.glDisable(GL11.GL_LIGHTING); @@ -295,7 +304,7 @@ public class ItemRenderingHandler implements IItemRenderer GL11.glPushMatrix(); BaseTier tier = ((ItemBlockGasTank)item.getItem()).getBaseTier(item); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank" + tier.getName() + ".png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank" + tier.getName() + ".png")); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.0F, 0.0F); @@ -306,7 +315,7 @@ public class ItemRenderingHandler implements IItemRenderer else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.ObsidianTNT) { GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ObsidianTNT.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ObsidianTNT.png")); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.0F, 0.0F); @@ -337,7 +346,7 @@ public class ItemRenderingHandler implements IItemRenderer GL11.glTranslatef(0, 1.0F, 1.0F); GL11.glScalef(1.0F, -1F, -1F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PersonalChest.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PersonalChest.png")); personalChest.renderAll(); GL11.glPopMatrix(); @@ -348,7 +357,7 @@ public class ItemRenderingHandler implements IItemRenderer GL11.glRotatef(180, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.5F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Robit.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Robit.png")); robit.render(0.08F); GL11.glPopMatrix(); } @@ -358,7 +367,7 @@ public class ItemRenderingHandler implements IItemRenderer GL11.glRotatef(180, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.2F, -0.35F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Jetpack.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Jetpack.png")); jetpack.render(0.0625F); GL11.glPopMatrix(); } @@ -368,7 +377,7 @@ public class ItemRenderingHandler implements IItemRenderer GL11.glRotatef(180, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.2F, -0.35F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Jetpack.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Jetpack.png")); armoredJetpack.render(0.0625F); GL11.glPopMatrix(); } @@ -378,7 +387,7 @@ public class ItemRenderingHandler implements IItemRenderer GL11.glRotatef(180, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.1F, 0.2F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ScubaSet.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ScubaSet.png")); gasMask.render(0.0625F); GL11.glPopMatrix(); } @@ -389,7 +398,7 @@ public class ItemRenderingHandler implements IItemRenderer GL11.glRotatef(90, 0.0F, -1.0F, 0.0F); GL11.glScalef(1.6F, 1.6F, 1.6F); GL11.glTranslatef(0.2F, -0.5F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ScubaSet.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ScubaSet.png")); scubaTank.render(0.0625F); GL11.glPopMatrix(); } @@ -400,7 +409,7 @@ public class ItemRenderingHandler implements IItemRenderer GL11.glRotatef(90, 0.0F, -1.0F, 0.0F); GL11.glScalef(2.0F, 2.0F, 2.0F); GL11.glTranslatef(0.2F, -1.43F, 0.12F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FreeRunners.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FreeRunners.png")); freeRunners.render(0.0625F); GL11.glPopMatrix(); } @@ -446,7 +455,7 @@ public class ItemRenderingHandler implements IItemRenderer GL11.glTranslatef(0.0F, -0.7F, 0.0F); } - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "AtomicDisassembler.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "AtomicDisassembler.png")); atomicDisassembler.render(0.0625F); GL11.glPopMatrix(); } @@ -481,7 +490,7 @@ public class ItemRenderingHandler implements IItemRenderer { GL11.glPushMatrix(); GL11.glRotatef(160, 0.0F, 0.0F, 1.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Flamethrower.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Flamethrower.png")); GL11.glTranslatef(0.0F, -1.0F, 0.0F); GL11.glRotatef(135, 0.0F, 1.0F, 0.0F); @@ -513,7 +522,7 @@ public class ItemRenderingHandler implements IItemRenderer { GL11.glPushMatrix(); GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FluidTank.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FluidTank.png")); ItemBlockMachine itemMachine = (ItemBlockMachine)item.getItem(); float targetScale = (float)(itemMachine.getFluidStack(item) != null ? itemMachine.getFluidStack(item).amount : 0)/itemMachine.getCapacity(item); FluidTankTier tier = FluidTankTier.values()[itemMachine.getBaseTier(item).ordinal()]; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java index 487a35992..368a69eaf 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java @@ -1,15 +1,22 @@ package mekanism.client.render.tileentity; +import java.util.HashMap; +import java.util.Map; + import mekanism.api.EnumColor; +import mekanism.api.transmitters.TransmissionType; import mekanism.client.MekanismClient; import mekanism.client.model.ModelEnergyCube; import mekanism.client.model.ModelEnergyCube.ModelEnergyCore; import mekanism.client.render.MekanismRenderer; +import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; @@ -21,7 +28,19 @@ public class RenderEnergyCube extends TileEntitySpecialRenderer { private ModelEnergyCube model = new ModelEnergyCube(); private ModelEnergyCore core = new ModelEnergyCore(); + + public static Map resources = new HashMap(); + static { + if(resources.isEmpty()) + { + for(EnergyCubeTier tier : EnergyCubeTier.values()) + { + resources.put(tier, MekanismUtils.getResource(ResourceType.RENDER, "EnergyCube" + tier.getBaseTier().getName() + ".png")); + } + } + } + @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) { @@ -33,18 +52,22 @@ public class RenderEnergyCube extends TileEntitySpecialRenderer GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "EnergyCube" + tileEntity.tier.getBaseTier().getName() + ".png")); + bindTexture(resources.get(tileEntity.tier)); switch(tileEntity.facing) { case 0: + { GL11.glRotatef(90F, -1.0F, 0.0F, 0.0F); GL11.glTranslatef(0.0F, 1.0F, -1.0F); break; + } case 1: + { GL11.glRotatef(90F, 1.0F, 0.0F, 0.0F); GL11.glTranslatef(0.0F, 1.0F, 1.0F); break; + } 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; @@ -53,6 +76,13 @@ public class RenderEnergyCube extends TileEntitySpecialRenderer GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); model.render(0.0625F); + + for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + { + bindTexture(resources.get(tileEntity.tier)); + model.renderSide(0.0625F, side, tileEntity.configComponent.getOutput(TransmissionType.ENERGY, side.ordinal()).ioState, field_147501_a.field_147553_e); + } + GL11.glPopMatrix(); if(tileEntity.getEnergy()/tileEntity.getMaxEnergy() > 0.1) diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java b/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java index 3adaa8efd..418586b68 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java @@ -34,20 +34,20 @@ public class RenderLogisticalSorter extends TileEntitySpecialRenderer { case 0: { - GL11.glRotatef(90F, 0.0F, 0.0F, -1.0F); - GL11.glTranslatef(1.0F, 1.0F, 0.0F); + GL11.glRotatef(90F, -1.0F, 0.0F, 0.0F); + GL11.glTranslatef(0.0F, 1.0F, -1.0F); break; } case 1: { - GL11.glRotatef(90F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(-1.0F, 1.0F, 0.0F); + GL11.glRotatef(90F, 1.0F, 0.0F, 0.0F); + GL11.glTranslatef(0.0F, 1.0F, 1.0F); break; } - case 2: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; - case 3: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; - case 4: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; - case 5: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; + 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); diff --git a/src/main/resources/assets/mekanism/render/ChemicalInfuser.png b/src/main/resources/assets/mekanism/render/ChemicalInfuser.png index 35997e70902f2ee538ebf262d2c722ceb794d3e0..e29f5b6741c8d27c26e11b03eba2789b7ff47092 100644 GIT binary patch delta 4372 zcmXX}c_7qX_y5i?$U0lDU>b7&_uSkFtXHSi9&cx62|%+MJa^}^<>|oA|p%0 zSd!t%GDyZUwlwxFBV&x=o!;N?{&Vj?_uO+n=YBrtoVJrCYNQ~@b2{YEb3cgx^H8X^ zkP6}NTNf@ET0L)t>OS9rAf8L{sXi};>OytRpN~Tgp}OaJ+kxk&`Obm|OB`4L0Doy^ zcJ>lsWGQPD@7OLwN!~Z*i4+l%QaOuBfF}rA?yIS*SupX4&BaO=T3S9Om@n8!?wP9F zeRpagj^tKFALYlDTu^#7%5+a3K1{q1M(`dqX|FnJm1Y-=qHdZ^afj(K*TFB&KaP>Q_(GM!${y zcB_O5p?wEs`EDo6C`_-8Rd%IX-MYTMzTnPG*FW}#k(&Xl@;dtZ7V{k)2`@C)Be&M_ z!X9&K{vMSrT5Vunyr^^X+r}|?e$YSJX>#GezdIWzZg0$g^Em+yRNbtY4H8X!AkE^7 z5l`P5EW?feuKN1mhUU(>Y>gx~bJk+MQ?qHQ=(KlNLcc|_QaED@WqO7n&N#P^lrM<| zFha+PBTyUu#LdZ;duq{)H0OpzlCKr|3{oj+iYYEGettgRJh5SCl2h!6MxJUv0!U+Q zY!c=CU+Vg&7lS~`57yb;WMz}hbqll|KStP8NEMcX71^NQZn@o)Wu$Li?nXxV#||I! zai{<8TUJ2+SZ8z^i#*b~giZxGGX#kwn2PddMIJI&t#*gYVYTnNj>mA8-|moEOT&j@ zDj&W9|M`iiJ(Zz>a^9%r7)Yp^Q4qjZNl7p13#kw+l^&vb!+;?<@0<({w=SwC1$B~` z23YJ_SXhv!3)lT&o`R^8XGw33ltG=f7gr8ulLkuRxe6|jNz^)nHND=Cy-JW!g{j1)KrIEgM)KqV&Q5?m1n2D} zswVj8Ucv5Fbh42UduJ!cAejTdCzR&yj{%kc??TB5Qq`K(8AGL4Y5JFK1c#2zrglEK zG0U`KJn)3`oa%mh*kYqh4&)^;K~xQ>dA#JnjEY24)Ab7Zwf<6WmYW@qvpchNdKyLT zlpwp8M5z`6aquUKe3MUO@-D}y+9)Fg0m5UGq-%9`Q5)a9_*Ih5t;RAfCAqfh?n1`_ zRWmPjz{NTV){On^JTnZc#y2yUFRQKzHQOPf>}yWSl+DVv*$@y|#QwoSC+b~h1DKkuyYtrd|E*sFmYCEGeQJFYdD%b~z92Sv z8H}q1TkgWf*>+udgACd$*ZNTNc^<{`H@?}LIG#v>!ZDVRLI64Uk7Qy<7Fw)+XrYKe{~3%?dPtCE~rOf%5-SDt{83iK=R)-*WfmC=E zy&B%`#X5#VH-!y;b+7hwM0YneJp^SO`Tl@)mV(ud>@Uew6Io>6H5e z<#`8yq~pTAPb+%>!wkISRM#~ruvOkZ;e&W4q&e>?7O2@z5S5vi}gzjK~-O@#Ux zOI>6XJM0cu`sj+A{&_1!ICn^U$|!WHqrUM7PClDKIlS;}#Uy5jZ~@uBxjf1Yl6`T) zw_k~f5=kjo|NeDvsKV<5{g0dWhUQd(xEqnn)ihLM(wuI7uk-t>zp^zpcm4P#BIf&x zvTYUD$>B@JAnV=q)=0H~Hsih1E)QxU)qZ<`G+8s4<=;(Ozwm}d6JEjlz@W;Roay0X z?Z1!Oq!ZFJ!-U`7*~Jw017ED>Jq6OFBb(rdTE$GsQdgdrfBZ|I`79{=r7d@;Oz zaj=XT^}Enm^bFW2v7mMwR6W%P)Q;ik-yI)v;^E){KY)Nd6Gh0*a$4Z(a@uk%7=0p; zM0#JJ_O(`6VwZh%%}&t_m1^sBS;$^^0S3ni=MrGV-MQWlv|DT72cCm2PF*?f4TK6- zV*}oF4z-sZMZUro`9niBTgZ_o4}CfVXv+#w{e_%vn&!-|=R`5Rj?cN=?RQeR4Cs3Q zgih{%l{b zT7fUF8R_>$4(qbWOVcy>_OY=s;X?^~^}zQ2>mu)ZS11Ll&P4rV3}(qzV1eov5iub7 zVN*Es^|7(po-EuN!&QW5_gp2oeTz&Vj&M2si?iC4++9Aj^L$(cd8JD2Z9_>19Y>rE zC^OaQe2?>ExIAjg8S`m>{c-@#Q~bwXGQ;YPy3*-a&izz}B)xID_fSCP;=Ww%ez>RP zDA4>lc4o$#dUq)(+zZR64Vp8nl7+Yd2!7v&Giz} zW!;l$8==XGE)~_F^^bnUTO1D+hoYYKJIZf<{1me2bSHp1tle(S6T=P?)b!ruN$DTk zOq9-$7~<0-l|p#j8Uh%Pz2D@rl<3WfQ7Fi7#(L4b-0(RXP?Ip8CJgP=MJX+s4F3sG zMo}2BzJBYL)+T67_cG&-rLqvxyu^x2oBB%GVfmWTO|K;r_ZN8GQzg;V8#VNoJMfmGIW|aN(sif_3pbj`B-Yw8Y61M!X zxxx)vxmVg~c?m$xWS)>f%GmUk(vwpy`h#vvX>Sm7M2<^|fBwa}sJB6zA5QIKl-m^I~TE(lxS zSl&Hu*4V|7F_!+LPF8Bf+XZuqii%)1Y+-r1ECGgTv@&7@&}+3{59L|5GoLwvHI4*(S4qFLZU6scJXd394aHS6L zwjZ-CY8Ex9+#n6PEcSfWb|1qUQQD=6MrpD({=gfs_Y$s8C{G|)8rExM zSF+)<+QS|G8_)}@nm185lf3?3j##jkVKis~F$w#K(*eBmD)uKS;zT|2Ut+LbE!^n- zSN^@)sif&6*y%p4pMD0pM7l@LouT94BbPgVb8Y@DE-%M_F4=i~A>%ghe`)h7D)$q>==t>S5_%$vd4c@< zp1+uh{oYB_*<@V)fv}Vo`8(5rvGECDefK9$Tg%qvFvg4n-X`ctJ#fSPtnQjc;Q}F9XEbCeyZS!hB@yTA3!D5phxHk|acxrxA>zEteC82YP#AAw z)=B|X-gV#JtKc+c2ME3lc>r1(dymCSn;u=irsdh|y;i3kZ!n=mmZJ3brpOhWinfGU z@Hkk~TUzheJsx~)xz_c*9pZiG)D=*FQci9s<8#Ji;isj5hn0rz;(L0OxH393`CaZD z_Gd>-CX_UBlfBLu*F`bs`VMQJkDV1)G)zr)kcwojIEtvg4&<{Vf%HFs1freTC*2z6 zbdkJnPEF?!X^X!0C1~n1tQ=E*weA#aZL0Ni@Ctv?zoBx%+G)Oi{{Ed0j#T1W2(qp` zfUwMAa%9*FZ!D;*_NSe1_vy*}m;8%zFn;#LvsE-zn?F%fh02_z&JLDdo@SgjFpyWo z*#d(yk2~AxpnQEJexk8(n1~QYF1SOk!#1Q<=Gr?Wrcjzc_GuXinFOPUuBYnnHxGb3 zk^do!`Omxnz#OYMcoKO?UC3FBhR?QyxR}&)P%HZGDdrdv+PwJm1GFMKy z(+_&kQY7%e!VF`^i`M7(QraEvY5fJzQj||qsX8PfNO8f`OEqLhUCc%uSlk~L8tOEl z5Ec^BmR{-60*%%%YgO5QEbb~%j|3p@;ea{icKFg*d|e1`yepdXeIj_VCaKsx z2`t79CMoAUOcJCd)24R_+sUlm{Jr~dhob@>X?x|Pd(yh1IeXhV_O0t}`0NXP)dPrU z)R+*xPpr|aibz}JmrJ1#t%met-D^E2wLKb;Up>a&?6F~DgL;aQ6g4$A^oOLUa2rsH zEr{%K6%z`)A0qf;hz?OTTfR9$x^`|H{5{_XQWsgw=7Zz*584G$F=5vNe}0@bPQ;tE ziw&^nE$VOkjB_gGA}vLpbnV9iG9KJPWwKWDUsagiH=4GKCaPu#F(4`|2^Qxu!7IRR z0R1~icZ0coUM%~?Q&?@77vQT#Iu9Te!b-|`v%_&+fJ6!CQ~mz;QbRNbw2#RADAW{v zD}c*g`H2XVlF;XW4Gf5=e7S@La1$F&d$Agm@1^2GphZBOds}s4B>5wqu(Dsz*UmzKiE_+`S3cy=d<`>Q0V?6Hu7huYJjsO4v delta 5226 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 X^y%xOZs_v7^cUIA+JPXj^pE)m0gMG- literal 2199 zcmbVO`#%$Y7hj%L;ww>#?DZ&LU0g>J^>y2tvW&z`MrLl~>pFMKkV~V6BzIYgEsZUW ztaAB=rc9++?oUN{xh&t6xo-1pdYI^~rX2IfK;JMufEveO#Nl`0?(;s^l%8uAoH*zHn#SERj1Gyt&srR;2D=ZEm6&Vw;_ zmt$Nb0%PK_Q2_vFY;bstk&_+rP@JienURUf`JYg806=~(90oxqc=IbfnMk`mnHL8z zotp7Z9lx(|DQ4DXtG3Q65W9@y>MCkyku6;-4Q+74k1>R35OtWg;!lJJEY^;XyYc8N zVbk9h9P#T*vu@x~o7hLQDXxAki0D)3#FlqYMx&~-ZXN(L_#K&w^ZXizVpK60lN{{M z^uDrTJo51F)42!md}en->2&Cx0+Dglkpn#54_xyURAnF1sSWlrg+J27E7W)Yl*xKU zviMW~ups0!&k$ZeGfhwM2%62P$4&>)Nw`hN+%vwqZ(~CWVE2 z&j2&k-$d^!uzg;ANquzvBSI@lJ#4_qQ;4m5HsS9vjtza~>b*)84TmM!qgDdcw6Vvj z75>X6qKF^+jn7vY(ElLUTYRfdaFr~avexlbj9wUOh*c?Da=8=sFS+Tgf`C|3!@L*L zol6<#kTxD4#mIrI2uo_%7_SK*w6H9RKhIjfQ1YKrzN$A%ZkS8SnS8L5B^HaD3YCMc z!hRut(ey=%;_ZS$)+5uqhVI7DF@UV%X8Phh~QBb4!?^cxzy6K~I^gZ3QE7lIy) z$>;+i5fSuupx&Z*VUSNV=(jxix@zCE7P&@QLr7TI`CQQOYqVdB61NdY8uFUvvaXzN z+KK_Gw95z_?VWe!*y(72mQAu~%A?ohsZhfiecFhFJDLM_Vqn_azLPMEk~8nBKTQUX zupXR2E8g3JuZ@)7n{)Va#-MheoDZEStcfIQdFN&qPJY~tSMk0Hpd7upQ8qvrLtKr^ za`Z0gLJ?&TqNR2Xeu(^DwUP+5!B2GQPedcyTw0xHVn`+k?x1pSvJC*_?WvD16A{EYyea=5 zwb4VIX^~m9o>LJ|Yx|K~Mosd6)nKx9HI5)RJOHY2+}r@$YdtoRR=@s+W_OLb4fphv6uM zVru>R?Z)*+j@u8T*-Gf;h9@#u7d&ZtR}*&ca0t_ zYvz^w^?XZ3fL2HGL@};)zr3{?43l$Azq{tRqXKn;hv5M4BMYi#f#G{zflk%B;5mIx&9#?h2#uy4mhpH6DW2N3^2@$ zMqLsRIAv|tL@dBn zkhX=yX7Xpjs>l(vsVkNZOvUgfwU0vT)4D!OPT4PEPX3I?ex}KWXIquj-3s)~kvHrHo=6i~pdO*9!1|vx9MH2B=+E4nvWX2Bjvm&hyiTqW1JF2u3qD&An zU8Hj#Si~7{C4y6~n>^@n6&K?*W*~VR;^v0D)Kv;cB7R){b>`He&CVg3c-**B>Dx^G z*Y4F`*0$?5oh6sPB8VX0aYe!R3_%RjbQQm_3F=N5pG>q(9?`Z`q=s%9CxJU8Jh{z~b7I8^%iD;Z;9d_1D3ulr%;y7 zg*bITvI+N^!*io~ub#x$|7H3racyQ)@bdc6!|p|_26CjTFN4?GQSxof18B1^n2sZybCy7hCnELB{6-M&VW zjK=)Piq_D?O#SWSpJX9>3!~92l;ZPxS!@{D=P1_TkQKD??dOao@fh7-_0sIKUb(Yd zx><$ytVGiIjf{dI0%37#tLm2ki*@ uqG@`+YCTOu$~Q+w`u`zHZnw5>0v67;IamMr@|E-x0f5^%!5C1Vw0{G}!%&m} diff --git a/src/main/resources/assets/mekanism/render/EnergyCubeBasic.png b/src/main/resources/assets/mekanism/render/EnergyCubeBasic.png index fafa51be2f1276f4ca28fd1d599f69ba0f053b03..cd1a4c924fe5af50acf34ccc3f92a05220c9f1f1 100644 GIT binary patch literal 2961 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 L-4B1mm6-i+9#!tG literal 2262 zcmbVO`#+O?A0MIN7CA(28gokJu-oxLmNKL{q_(B477BAJr|4-mha?dxrzD4H^%xc@ zhhaVBbUV!9mQ&pe$ziv%F`Lc3>3;r!=ZEk2`?{{r`+9#q@Av2Wey=Op-PKV>N>vH~ z0LYwmviA_IvBCkA5X`N%UfqI4%+Jon4gjc1m)`Lb7hFr;a`FrZ01o_DI7I3)0v820 zRU=@RA}-wYjfnCJy8&?b!i7W_y237M+%_>ZGlW1K*H2pj06>qk_I4MeuP){@)4sGH zOk|l;!x8aQ0asJtz#gp>gDBlLgY6Peu1)kx5w*!% zn{EIXozHgg3gXuKj(=;lbezSJ%{R=D`A5lC8x_&NOEVq|Xl1(=>dQ}S|I+q7p~v?A z?u9=^+aD<0KqNIQCFLvL>;(0WCtc^Zg;>+=mtdZx%}u$9UW=>uzP7S#Y`K zd1T}q)pYXy&Opx>ML7h@3cci-2N1YpVj(VBF@YzFZtwlAzjaOXVAqSJ2iMDab`YKCah=6Uf}Z-*|5e=xkBrMi6k?9X>wCGxV(?0-Zo1GmcQMhhK6hFkAfG%HiAl%= zF$Matz}Z1R+s?my*eoDe@54h%c-DRbr^QnCLZNCpM9_AYrp7zhxUAfQMQ3MkuoXHD zC;AqFeu8}NK|AIQ3y3uZstp0EgjNZt0{VxK3_X{qim+iEGw;yJUYJyao270Gs{x6( z0q4jnK;@4oov$c&iQQ`-P5{QTIbS>GEC$WrpVdd0nLwPuOFq8dnf6~g zdOjUZu1kNGd|o~jWYP{l9J9a32plcrLlkVe9+$Y~RXXA1xfF{O)7>E(gJyI@{4^F% zW${7_vKa`4j6O2Z@;G@pE2#EoA?xuGkkwvQhR?{b2hXk7wLtdhvPSAPN?tjHF_C+)*`Fn z+~p7!@k$hTjY72CsxlwlsUF*&_gS3=tMkG#e^BV$WMdMd&O;Vz4c}h~DotPn>wO%V zZHeR?$qr3@-3}nKmhhtAW?9SZ<&NFy!lr^(yoJqLUJEGsOq0axbxdACdfO5j=1%8-3kI`ai=?K0yd3B&aaSLm+p$v)Zu`Fp~eNx z@yU^i7HGr*^ic_** zFj~;|mm%JRRD^lj88OoZrfI9idp*dJZlDOAx6_u?UHu0U@5D)R$mOG4421Z2C(Qe5 zOuwq2-pjC-P*(MflA&@0Ru}?L)&*-_#`eeX4z}0)enY&e{3lhx2(W#3saw2aQkX|h zvWhL0vlab8zUIC#o^eawg}ilH$S0m5Cp{o%r2I2rr+uY9$g}h8&s^de+Nvl6a_nje*=*GZe9QY diff --git a/src/main/resources/assets/mekanism/render/EnergyCubeCreative.png b/src/main/resources/assets/mekanism/render/EnergyCubeCreative.png index 6379c7ebce53e46230a0c17d008f92b319b8207d..4b9eb062d1820789719d4facc49a58f0d30c5b8a 100644 GIT binary patch literal 2938 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 delta 1676 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 NvX6%^{hV7==HFRJ*^dAK literal 2277 zcmbVOi93{CA09&JBTF=-mo!Os;SG6BLX0)r2r-5jqwHIlF})!>QCY_l;>~0xOX5=~ zA_<{M*0E%7jIoWujCV#|-yiTj*LBXh&N=tTM0N{l~j127Wx{j+-21IFcdNyJ6fL2R1s9|3hf4L9XI5D3IeGMNl-Zf+i< zkjbaV+7pf+mG0EhwRU+mQ1a2StkpE+&qPQJuqi8LS%F?Q68w~x|I<-e=@eL7dyz(? zCA=S*F_bD)JVU)*;=6qk*~g>aeaudv3il(!yC+^2bWPspgI6RJlt(@Zxv60q-O z%Jz=PR0KOR|A&g>f9#Wszm`;rMnhfrpv{M@&#~tkesS6aRXdmKoa&IWzAjvJ^?FT9W z93dS^wN-|sWJ9auOLH0CWW!odIR0kS#S>2r`i-6Dl-<*{ZJ=R`(bz+Goc7kFzD=3m z>&a1VJ(HSlE@e^Y7E3tHNy8BwD1tNqgJq`)vGn5_qN^Xvegy6V&^|q38Hi4 z#vg<8^TIf6!k*R5t(Nm$UpLXHQ!(|KnC}vG|H(4c;6uG{=6t+?AaB}7=PvozS>Sx- zqhfYroiNV1{+R8q1#74BNcclTmEf48^7JyNy?+vGT>l%oWC2~C)l(WQI_(is&`$`T zvuB%VBb*DZ$;Df_zI`#?6ikJ^joR8#mHM& zkz^VjZf}C*e9V?_AIA?bQRm8D%je1m+<8T4IDx0MZ|K*&f%O^Qj2i~ERlXZ);RzcL zDF5qnhn%W~2d;&s_Eko58%U@V!Pl>UAJ!aB7NF|L!BpHP&u7z8UWycS>`QrVYeuvMB=V@ZO1Uzl|WZ2UEMO3`lDN!axy3n02BqlYpCk4 zBxt9Q#hLn~m-i|I0T8PmgO6S3bFTKXLR*jYL@t7n1s)tgTg^&%$R`>e|i z^@wUvypWW%ct@v#uMO%4arQG~RLP4y=NOa;v^dfc{woyDz%kk)K(b?yio$)D%DGXM z5TZs@TR2p6;>20twRH;sinlnW7`Bx!vtuvhM=VyNWU~NkC=c2s#+8wAy9E>v>tSYBOg0R1nY_kUo$dUQkfb#pqs-QBUqW ziJF}S#+G=Zpln-GLv9fN$sCQ;^pH##Y{GrFXH~I2*EwDn9+xBdTOgD_O87BY)~7h7 za>I;K+Z*2%x+QZ_qi7@4A$2dU-clL(HS6OuLNv)c(nb8<9dicWWAhZUV004=BYu7_ zpVXL~7jGjHB&Kn!3^b$QEq)Es;qVz)cWd+Xy_Uo&tyIPZjHbp4Cuue!0=(3`*T3sO z>xh0$M+u?U!24Ac!PcebLNIM27O}8r`J@ThSlhgZkcdMI0!c?lVEt7Psh3XD<~V<;~7kGfR3|o|B{*?%ugD4$S zP&Buc$J_}c{Y4KFTKjkqwvNdckF_4sovIT(V8EnDCP}-il^8G;Opk~%+__k|S4)Wr z|7snlUVTw%Stu8=>mOAeeULD#*m!vdv5qeK#@Ro#O-wp)i@N+hGPA=bVlAU`#Q!(rH+OM|ZP z^K{yv(dd2}Nie%@4Lf;d5j0;$*;|dp6u#J|zRiK|f+3GQ52Qz2u0(0-nLe6#^UaZK z@1`$pFi#>y%1zoj?OIPOaVU>7Nkpa-L%0*@`8jwh8$YJ|I#@jNr#0J;lXnUI2dDyY z&$YE*PtUP|=?25#2#PJNZ-Te0JYO}9!8!`^!v0>+l|8HW;CmEF_3*}u$(73efzL_; z{!0r;;m&$~*)+#35yAuT`&_6&IknX4{eR@tq&2k0Q*m;|cNA2nkSw ze{UEKKIzGh$8!DR5`vTl5o?okO0@P_*?e;1{tI`Q3W%#6RP-AIa`WE}ARPkCmReEY zG>5d$4fy6Gu~|M^y_!~#`h0K6N|3XqMw*>Sb%lgysyfT_|EtTz;`gL!gds|ZSdS9x PmjnPYwlczBb-({FTDO1b diff --git a/src/main/resources/assets/mekanism/render/EnergyCubeUltimate.png b/src/main/resources/assets/mekanism/render/EnergyCubeUltimate.png index b4f2a805c3275b759fe394cdf84c6f28354a2818..8cb4f6cb1347d371f11b4ee380ae3fd4501d8c06 100644 GIT binary patch literal 2960 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 MJGhbaw^8H%4KQ=|T>t<8 literal 2315 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 diff --git a/src/main/resources/assets/mekanism/render/EnergyCube_Off.png b/src/main/resources/assets/mekanism/render/EnergyCube_Off.png new file mode 100644 index 0000000000000000000000000000000000000000..ab0c1a48bfdbb3d6523ad383c1db44d044de0cc3 GIT binary patch literal 3928 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/render/EnergyCube_On.png b/src/main/resources/assets/mekanism/render/EnergyCube_On.png new file mode 100644 index 0000000000000000000000000000000000000000..ee63030a094298543cd606575136458dbf02c6d1 GIT binary patch literal 3036 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 Y$rr5Yg2i0#0~nX7k)`2ReYe>E0gSE*Pyhe` diff --git a/src/main/resources/assets/mekanism/render/LogisticalSorterOn.png b/src/main/resources/assets/mekanism/render/LogisticalSorterOn.png index 039c46ecbc55c5ab78180f9769e71b2ad64642a0..eff1682b74852f6fd553ca9b4431caa5b4eb958d 100644 GIT binary patch literal 4416 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 literal 6761 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 D$N=cd diff --git a/src/main/resources/assets/mekanism/render/MetallurgicInfuser.png b/src/main/resources/assets/mekanism/render/MetallurgicInfuser.png index 462341192e302c70336e61f44d3c5ccda112bc03..a01c3a730e807b27f068551666f47044baf956f4 100644 GIT binary patch delta 6202 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 delta 6281 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 diff --git a/src/main/resources/assets/mekanism/render/PressurizedReactionChamber.png b/src/main/resources/assets/mekanism/render/PressurizedReactionChamber.png index 32d0c5ce78e0e7cef2c5261f67ee68fc09bbc075..bc43ff6d28ff209b1458e4d6ed33697b693fa0b9 100644 GIT binary patch literal 19243 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 delta 4834 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 Date: Sat, 16 Apr 2016 19:33:31 -0400 Subject: [PATCH 43/62] More new textures --- .../assets/mekanism/render/FluidTank.png | Bin 2578 -> 2879 bytes .../assets/mekanism/render/FluidTankOn.png | Bin 2638 -> 2887 bytes .../assets/mekanism/render/LaserAmplifier.png | Bin 3489 -> 2624 bytes .../mekanism/render/LaserTractorBeam.png | Bin 3446 -> 2982 bytes .../blocks/models/DiversionTransporter.png | Bin 1455 -> 1668 bytes .../models/DiversionTransporterHorizontal.png | Bin 1161 -> 1125 bytes .../models/DiversionTransporterVertical.png | Bin 1159 -> 1158 bytes .../blocks/models/HeatTransmitter.png | Bin 1734 -> 0 bytes .../blocks/models/LogisticalTransporter.png | Bin 608 -> 0 bytes .../LogisticalTransporterGlassColored.png | Bin 1279 -> 1457 bytes .../LogisticalTransporterHorizontal.png | Bin 220 -> 0 bytes ...ticalTransporterHorizontalGlassColored.png | Bin 1277 -> 1442 bytes .../models/LogisticalTransporterSide.png | Bin 244 -> 0 bytes ...rSide_HAFX_Oct-28-232850-2015_Conflict.png | Bin 1147 -> 0 bytes .../models/LogisticalTransporterVertical.png | Bin 257 -> 0 bytes ...isticalTransporterVerticalGlassColored.png | Bin 1318 -> 1528 bytes .../blocks/models/MechanicalPipeAdvanced.png | Bin 1627 -> 1561 bytes ...anced_HAFX_Oct-28-232851-2015_Conflict.png | Bin 1561 -> 0 bytes .../blocks/models/MechanicalPipeBasic.png | Bin 1635 -> 1580 bytes ...Basic_HAFX_Oct-28-232851-2015_Conflict.png | Bin 1580 -> 0 bytes .../blocks/models/MechanicalPipeElite.png | Bin 1641 -> 1504 bytes ...Elite_HAFX_Oct-28-232852-2015_Conflict.png | Bin 1504 -> 0 bytes .../models/MechanicalPipeHorizontal.png | Bin 223 -> 0 bytes .../blocks/models/MechanicalPipeSide.png | Bin 242 -> 0 bytes ...eSide_HAFX_Oct-28-232851-2015_Conflict.png | Bin 1183 -> 0 bytes .../blocks/models/MechanicalPipeUltimate.png | Bin 1643 -> 1545 bytes ...imate_HAFX_Oct-28-232853-2015_Conflict.png | Bin 1545 -> 0 bytes .../blocks/models/MechanicalPipeVertical.png | Bin 280 -> 0 bytes .../blocks/models/PressurizedTube.png | Bin 1940 -> 0 bytes .../blocks/models/RestrictiveTransporter.png | Bin 1640 -> 1760 bytes .../RestrictiveTransporterHorizontal.png | Bin 273 -> 1449 bytes .../models/RestrictiveTransporterVertical.png | Bin 272 -> 1460 bytes .../models/SmallTransmitterHorizontal.png | Bin 1967 -> 0 bytes .../models/SmallTransmitterVertical.png | Bin 1568 -> 0 bytes .../models/ThermodynamicConductorAdvanced.png | Bin 1764 -> 2587 bytes .../models/ThermodynamicConductorBasic.png | Bin 1775 -> 2616 bytes .../models/ThermodynamicConductorElite.png | Bin 1771 -> 2642 bytes .../models/ThermodynamicConductorUltimate.png | Bin 1786 -> 2595 bytes .../blocks/models/TransmitterSideSmall.png | Bin 1526 -> 0 bytes .../blocks/models/UniversalCableAdvanced.png | Bin 1944 -> 2522 bytes .../blocks/models/UniversalCableBasic.png | Bin 1941 -> 2533 bytes .../blocks/models/UniversalCableElite.png | Bin 1933 -> 2533 bytes .../blocks/models/UniversalCableUltimate.png | Bin 1937 -> 2513 bytes 43 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 src/main/resources/assets/mekanism/render/FluidTank.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/HeatTransmitter.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporter.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontal.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterSide.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterSide_HAFX_Oct-28-232850-2015_Conflict.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVertical.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeAdvanced_HAFX_Oct-28-232851-2015_Conflict.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeBasic_HAFX_Oct-28-232851-2015_Conflict.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeElite_HAFX_Oct-28-232852-2015_Conflict.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeHorizontal.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeSide.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeSide_HAFX_Oct-28-232851-2015_Conflict.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeUltimate_HAFX_Oct-28-232853-2015_Conflict.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeVertical.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTube.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontal.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVertical.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/TransmitterSideSmall.png diff --git a/src/main/resources/assets/mekanism/render/FluidTank.png b/src/main/resources/assets/mekanism/render/FluidTank.png old mode 100755 new mode 100644 index b1dc430e97c0010f4c8483e3d1b4cd2929e88440..1a44fa00b0f37ef83cea2b8fd589210e17d0ec71 GIT binary patch literal 2879 zcmb7GX;@QN8a_!_d~m@Tw-E}Yac1fUNmw)qgh&Z$WL0t4!I)e^fb16tktOJKTu|c_ zt56ZJ>eRXr1wnSO6{#YkD27l41r10Lq%l#6lDWaH&pa|ud(Mxu-0ywA_j}Lx~zsp$O{0>-?^dTaCl$rI3Yn}V2*z%KI9xszH(J|>!*bbF zT$o27AyDWGC2-fu#Lz}rP$)~5#3HkCG;gezl!6fOAef1j@{;)yij<0*A6?%pwwr*p*}#q6f*%)nhrUX)26BU;L!$JxkpO%*9lIG?j5OeTEGMS7gxZ+)1oskGTDh^TlwgjH=11(?j&L+e#yp$=#6I}@AlHLaf z2LAt09`8f61l|CB)cZ+dNocwd!f${if)p_edARsR=2Sw8uNY#&0&%E7ko?}okOToN zkR%9%SYO{s*RYGjxO}!CO|oPX6BtNg@Fg&l&w?0qDh^?B;d0p&I+@_^zS@JlnoRd2 z68${B^!4>4ySn>&xV!qexe`e4v2+0|g$MEB_gMBvtk0BKb35>aNM<@D=B7gI)nWk; zJ6Se`JGGXTQ}VsTvZvNUni7jg#Nf@3`p8HT~-y z09Y#-be~XZ_wfCC{@k#+*3V*C1j|6Xzm~v`*x7r2n7!?r^qjRKr;y`wVMgrd>llId zKL0+5ORzuraxK;tHFKsz@41IFyxFPjMSBKDRIjr-5?phuSJ-Q^+Y779pDP@x-OIQv z7Hh6?puJd8-yrC1NX&lFl#^&0xnFxeE-o_iltCF=f6CC>+R9R{{Kn3tX*>L;$D)vy z-5@LOsY~DJ&|8yodb~m5L>uv0;@^WFEPc$#JobHXaV4eaJgeo@n*{fzlq@c%z3A)& zKy7dhok}xZsvqm$ktX}1 zF~Z3+)-$VSyoNNPf6;iQR2|ol5dpvMC`%I!-aHyx|L31+wg>Lu?^}E}!)ntKlK<^_G;89lk} zd1qn|4(vG$rN?Hg6y*nK`lnBJDdJvdHyQWub}oIzYArD7wW?05>6=hzj)a>?ZY|zH zbyXv6d4$TvIl4xjsxRr-`jt<|d_YD{;ln;VYH$tdPvyT9sh-|Ckb5@Eq1a6ZKamtN z6mjdU*57#fN(VhgPgi4h=D7!5c5z$iiI+iV0w%^ewJs%HJ`$Nj#;`Hdpv?WFXzy(U^SmvB;h( zUvb46b#A)){=PYc%KW3cf3}XKWm>hLIH&JV?rENJr2kQc_{rE89=d_zMPcYj>!xi6 z5VW`LXT6#d+@KK^%`R497JGV6lgI4b5xvFO=%1~myy|;&eW5bT)~nSpE-JdIuNcp> zYrHUQ;QVcWZ*MsW`0;Ysx0e})+jqVBYCo0tHAAqYY3oH9`$Z2e?LXe$%fIeZVB)HT z%wf@k;i}Q+3p1;2@SKNrMS^R=!&k@F?Ts6EL$w!@-MU8xZm<-X@(?O0@jV2{KRJ@c z>|wnopwMBo5YuZ*}v9!j=-Ywi4$JG%^yiNCrN@rZDyrt9X-dszu zY+J|r9_hfV%GO?iW{o8Xs6DJTiBeBhj4s)^Y-j2eC}z;3ev z3C%59(?el+Aa#eWQ|UfsbamP3o~FmGhfepJ9$n2FdO5Dw9vOCyu9sDGj@_HL$`Twn z3p$!}7t}9X3PQmu4jL;1YU{4twzjtQ$vu%sVY112637e6qDN7ednjP?au8L52J=0^ z84Q>QO04CMh@j0!Bdn2SmF?zPNE_^6{$trZD#F^7u?eU#UD`eQZWr1uLe0SEpnDW` zJ@LeMXhgzwj%^bKVVOjxZUuKyavRXKz1pbCc|l=~R&Ft8K<9szWT;%4Q>qNNmT75}}#~ zRsnzpvw<7{3xGBMEd|^uyZB&xWl@Bb7L?-kmlFHm3Kv1Bd9?OEr^VFFuMY-N0}Y605=zopp(zf zn)G8Z(H3jCYp#THi6TE3VaCh`y1VAWQ2_o|Er>dUK~$auHQkt<^(n|k9yD0nKEq7- zKe9hj$sfF$to{#TKH4@l@SU$y2mIFk-yijRQh$PZ@emDV1w1$Pb~=>rm@C%}s Jez|$ue*qT>Ne=)3 literal 2578 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 Aod5s; diff --git a/src/main/resources/assets/mekanism/render/LaserAmplifier.png b/src/main/resources/assets/mekanism/render/LaserAmplifier.png index 1443543969b655b460abbfce15aeaca578732218..5be9e22b2fa9fc437ef8d977131663086e4b8e82 100644 GIT binary patch literal 2624 zcmaJ@XIK+?9-a_MM2fH{N>Let3KmEqp#(yagtkTzB1A=xfkX+A!XzOPa1AILj0Ig0 z8_Mc(pi3ws2*d>}2*@p14pGXA3Tr_?4nd^31A@CB&YS1S%)h+v`+I-oLsA3Q`{>Uz zn+E`ZzMn5W5cw*meseL%`?ed@fP73P47MalxI-d?U@qXv5r%U?KR&dR8_0z?yJG9P zt^j~u!DF!{Z00&@gph9sO=0Zhd=bJ109SXp2#Sd2O2BaLPM&~<>(^A_KpuyN3!yLx zOpzBilII%_bA#g7vm)Z7Bb+%ncQ?>gPDKRxTnPlq`7r`9RZhcA>r#>R)G;0hPD3Qo zG~5?cY-RxHC4{*k#m>Ptf=DESj?Q*OijzHwvIZm(h!i}*8BZkG5{OhHfl4BPGY<}l z26J{$1L@u~v5*}N7b%g5sCc|gCbN^-+X>;Fc%rkjGoC=glSsA*!dARXAc5qz0=80SQ_HWTi)_9QKUaWEJdBL?<)4c4002|yNB3mO zTiEBL!tr8biDs$&{r#THth5FuQ&Lju zhsVcVmE)|*Q49$%1#Jx>B}iWYlW-rpyO%3F)6>)I#rUe)0)`Os68AYS?~TFx}n0CPPf$R!Ravma&{VIVpZ7nx_sMbirJO$e=ur^)W6rP-2CM^!u5NCaLDA+EBpK{hQ^?66t+u}I zWc269lXbux(<~jt+Nr#UMny`SylTiDE<5+?cHiKjIN;ZY#e&|WdLC)0GYaJ$*F>q5 zqO8u&&h9L$c#1Bq>wRK}$7B09%s@bwSWfd{Uk0b%*oAHf7u>jj7gN((Eld?4n*5uV zA(UHT1m!*~+72dsNGmofl78%ku!nxU_XR*5Uqn={>1uo~GRdrJ_~cZ2)xWB$YQ70( zFz&|s?r9UPdFU)NpF2sWg%%!n!d1!><%^9DFFxYS{9*vPK9`xvIPJMAUgQd^S)}@x zT`^WANNFFeW{r)FZH^v-KelXA`C@E-#nf&4B}3!>7@#}OED_XU6x{N5BXSR(F#%=j zr6o!Za4{8Cd2){Z%z3z8nkE=8L;7*i9Nm@Q+|YrTe|;Ayj~>cpEJGVI^#TqCAKgMn z#K^jJo2Ej{>UQ@bIlRt8cU@_|wD6do2f6cmQ&vt=@x#Uk7midR?OL^0X+Wv&?Ny&C zoOto#;&1|rTcYdRYyNwPOr~ERm>=e!@X!v9+G^X;*x0zI9L&hb@S8Y>^4|&UofIrqkeR#kwJBF7-oGy_8g-*m z&Bkh5c)b;^R&~I><>Y@9&D209q~l` zh|vAMBQ0)QuMr2hbsWVxY6%Yy3=AwgQ3PA}8-!~cMYUEe)#T4eT(uVL-c1X`T;6qi zz}(#2^GHEYQBTxS5N&u;@BZ+oad=P5tBLC+K53}A^PBtn`a(hqRo`_5%N8-+GGVi_ zx(|cJ4K+&t>(3_2cKvZgg2RZ zHi3_>%g#NQAeRSBY}kJr%CavjFDE(&HEvj9Ri+B6{jSJu?-Rz|u-HW|cSB8_&YnH{ z^3m#YpYb+#RTW0*LcMEkcxX=&*SVOeG6Wb?W#H&%y^ z7Jo~7vedd2cgug94XH=x+LiWXrOtUv&b-Ax3KRCr}j!N_tABEZnhLBw@Io;%GLSBm~z8{l6UuVV!j_L zJk-e>(i&-RjmzoPU)NzAL(=Wk%krTp7}!JRKyW7I(u3U5>lA0p;5gM5Y}k_fR+z%K zik0f({d#E^!@2yQnt*qCmgroc%jpZwmZYH2Y$Qf_5L2@bMGFH~cN;)=fYv31`wjJ) z@WflM@JoPJ%;sxDF+ilOy6kNSL%pfiV4%UY`f6Zp7RYM4EWqlW*U#d&T-7Lx6-%qL z7pzC?n|Nr@m=2GHnUuwVw!K2Sd*d2(qfv4ufqFfFzs9?e6K<;jv!glr?q zL}RI!X^3W&vh>PeFvQsDo$2}g^Zd^JIrll|d#>wyuH}60&vj?GI9Wr5WP|_!fZEzz zKyXJquS58`Z;I)aKJLIDU~hc^_{Dol+AAM&5y40s&u9P;eaq{hLvTAh7ZixGb+i;1 z6BGjuo{o5);=^Usw7qcNE&j`b?`V{4>j9IOR1w>ZpN{wRJ?rA+_5MsdM%zr=F(aSZ zyq)+yP_xjut`B>o!NXI$yA^n3oSqfp)TG+7FO#a+W~Xx4G1hy=s(kRQfUC!T&dZ z(TQm05ugMm6XPpMzYgRe%=4bb_l($~b@BJ<{cB zY>kh3LpdJl*vYIGg z6*ku}*fA7)pJuluiuwNZUHKV*1}1WCgiG|=`YGC~TRNgTfqjvSffG}O$IJe3B_JX{ zoJY$AAJ>iRA@O3fl&8UNY7Ub%44D$y(kGu|o_4j%=neqYaOg>7Hdf=Xa6fZpaN!3q zqWGazJMwkGG~Zm2aGL%U;P+?{9p&Q7c*;sZ3m>oO3e}V4Wz-}Vgp(sm+cgsS3CVe4 zrsE9;Oj5xq!Xhf!X*S6L+j^kMS{`{>*Hwn7>3dP46!~B4`mbuk_|o+>Z+*Mvz|lTw zWVRfDAGlfGNjxco`7)CjrSLe*@?t18*vo4}yu7(5q*>z5hB1I;6KNyTE#;#H@@D{KB)w7byO)Ojq~!R{Mbvs#FybtU&t> z4$&Xr<%XZhj&glY%nT2ftEr}c(Z_|S(3r&kQxYALg`vmU2Yh4c$LajFLm^Y3Yc z(YZr)b#>Owyc|FGP={B%xU2!*d+<@Sh8A<8cSzHHYTu9V`;T%stTrp|<%K@3=jAw1 z*oLL4>#?zXVv+?9s$;Nf8WYebr&n&m$KqLs0XmE0(RVWxYXHPTuFP{+hu`16H0pNM z*UvA!G#YN{@9!^=1{=O#U=Y(otKQOCkSj=k7R@1svrBz0m|$xCrj-^UcrJ2E@`g3w zP+XngnvUJqL1;~IZCRfH9vNPWm|Ht~1aM`}1!;bNaHsX(qDElkoKJhd+C9UWK>kz!!Z(GD1CVtx> z86>G4^xMiop}!4zB5{B@@gL=Xoxt^|^IrhhApza_&yCl1qgpSFl8joT-9|)Oqb)D) zXw>?VBxz%#EfMm=qM1o`pF{OnY3YYg;IGSG;4?dYyD_Ay>TO7~&>^kjlJ1WT(!%7o zAF(#`$UqU(UpvCMwa>ykOVj6E5MbETDsc6vH=&S{TLzDein>iiElpEp&ob-JdICUR zWo7*CmM(d7S{6vJstX&P=Uh>S6Tj*N3KbO>cM=Xcc$$UZEA0-rRaI4@Z|TIqT&`mb z^q9#)M=|j~H*`!lrw$q?tis)TbvQw`MW8RFZVpG6yfvrZPdhqJ^$0`0k}+9ydL!g& zZc~ENc#Z~*TgYY+QG;ioVBCE@O8R>#{s?TW49^MVL5b$HrJLEP)wmx9ZQ_Mhx1i#00X36VL>h9CVEZtT3Rh@ zFF4cl6Q(A(Q93*#LKi4)PMR;;R>4aKdG6KLvW_Dl@QR1CeYs}=;MQ2I3wWk&(ce7% z4Q_j(B{{rcdSU5d-;bX=+$LPZi69{AMoGITn+=D!8XCZ&jEo84qYL7#RJ7{d%Wm!} zX(FE;2d~#O7sCQTW+0`axXOWim1Ru@^#6eZa1kF!pKR}el*x$X@!xeoU=7(Ybpl`R-vX1?&zYZX*%MXu7 zj&**cj?kLvZ|Gi^*r=nQFuvYE<7Oy-x$YTd$1Zxl$`xoyGg(d_RmCoj9?uWj+$OV&b%>)+B0jCR>+~46wY6Xn=hd>3lXf}xNhm*V-SL4_yzU~a=Wy*Lfe^p7sumvZ0ppf5!ZE(GfH?1t z9s$O%NItJ7lCX_uqd^NhQB2K*`!yW%^#$$v=GUP{Uon1)%D6Lh35dAk@dtiuB#xJ( zy}3atEG!)8zwx0{+iP`UA?)RBLoH)9Y&9{P#Zre`W#4+zH@hfF}WmkhG*k1`)6?!}4Jq1s=+HlD$MJYx1<;HTnj?%DYwmX)X!|32sm z>kmJh3l!)QZWjE|UDX-gxbFj>DeLjb8^t?TqGZgI^^M)+n}SmBK7aOfKIx;lFKK7F z_n0y!HkSU-HMQ{YzaT{SUQTc(abhJd$xjQ>MfRnmXDFg2S@$K)7Z(ZpQuy?_+n;>40q*Uxu<_VO-1~3f%Ki<^bKWw_0#eaK@KpGR=6wi$I2p&~uV04c7W0cn zbT|!)J9SFhRIFbI<0;P(x3zhyf3S79`%TrU+SP8lW)5T^xviIn$njU?jqKbRPB`}k zNKb4$o_6;pTjw!tTPi_tg~oSM)gMpk&CW71fXWOYiG6ut^% z?T*}p6euId$gfg!@hcFBRE@;^wAd6xN>MJ9G082PnM~&88jpC+oV(O(i3AX`*((FP zHhHf4B4#{p5zFr{(k{O%4wD60h?!*8tmovA1P%f92efh2%xC(iu?H8y0ZPdD6=l5! zRsW@&P+2K45T)?MW-5&jf**lM-K^DhlU;E~}1#J2@-R z#{%Mj8E&5lbq_~jf`)m_Q#)?y#TtTn_(u?_H#fY9k#2SibZB8a>j9NHhxch|c2oU_;dzWwdtu60iOdb{iE ztknSkK;P4YvX(0bfpOQat{f`G(Hn>W^hB9Fi$oujJbzNV?-ah z#v}j$)QaUt5mLyz@N_O4K~wo4By1jt1^|Migh!)CFom#CW*Cb@guiTVgTq)1B0K;~ zMv-|g%y5=R44=6-#@mk`6G6u@;EoP3f&>o|u$e*{Ou~-j2=Edje3=&y?p0sM}I^23m591e#>VUQS%4d`Jbh~@}s5*v=d z@*@L@DWLONJRytAfvFg2q1-4T5e_PSp8}iriIyYyP$sZoNC}OHL?ckDls-C=$^YM# z&Hm&q5bk0AqxXLj3;d#aOynM>fE&f9gN-|6sS3rzyYQJbA(!vR#u7VEqNw+-jE<0F>DrAM)u9N|YS;~%WsXR)erVDrGpBqpCFVlv$LTsCYu zZ9MDqT3kNM_W{fJycW`Du}Dx1Qq|mlHT$CpoFLWq)98YSPs7jTfD_LLM>`377W~h& z)_9Vf{Uk%rgL=HjJq-UyvSlPtYJR$^wQ;WH)FImfyS3Wd+9EO3{F_g&g2`|XI}fo`1iKV%*;6MNz{{-c^x~azX%vUTh_5%kFL@!KE`by0S zt8MN)r!1a=XknbplsJG885UNeq*0^~tNqPWv6KrB?2w{(29T)dyFy|J_$0fxL(2%d z{Y`1tX~yP@LCZ*aKqw^dWKzk)sEaX6sbh8)`HORNl&0Cv7wLLV8IW#Xe0=cTl=026 zQBk!w4jU+gPQyC08;2iMi$#3iOb^30a z+Dj03s7Hyx7oIvjf7b=5n-+460Rxu-eFK*t(_#}U`xQC*=@m^J1N)HN581O*1nCK3 zw2AepZp91YRtxvCbJNYu&1#B}(X_|a^UEr%q5;y_q#X*H2A!l_ob+ftqc~T6T(Ot_ zJ`wV3AS^7bxVLaM(as{GVjt$|)HKIZRld;kHyrW!oq=UpG4br$6AW2pCvZMuX3xuX zG|-<0*)#a8cmzx$eA)V&>qe+ylwL;DzVtv62H4#RSbW`nr8Z^&{sZI$M$;om#lirJ z%%Hzi-u7yB#C)LG{hfy(Fu`?4LJjrBAILsTFpTX zK#`_Jci|TO+$>Sr;=O5cOw3NEVLx26p|KHdR2O{kpx--0VVVe1aa6HTT3Jb}7%<(% z_8GpKGvw!0-`2Kd1La3Yo7OsFoCZzh8>%zv3s_@@4+2>eIYXAYo17quIBs3Oeitm_ zarAfhLcH%;OynjrTC9G5d%q=>mR?l=XjDAxF8q6L@MYs*H}p*;scMyR*OC2$R|S8~ zjTbC2kh^+LV>D+^bm_sM@a>4CRcmm{M&Aa#NqBlT)GCnZX ze)#RX*mw&@Yx%^=(To+@SQ9||<{|wR-9zT4a>En7Q&{o*C90Ql_TF0S)hK>(q=|1s z3K5QhZr8t*vj!J9YzZ|v=S$Bf=18^{Npa!^Os}IqD>W~H2!D-mx)XYK?E6G_Y)LAk zs$=X3cWVt8HzLV7^bw1zlYQJ`tZ2>b ziEOldx+K?gvt3^=lilE$<@|##4kL;FS{O7kGGtEc1CHf1WW{k`caBbd`J!c&)jDg_ zO6PARx8A;ex?tT)Enp_q);4WGo*BGrde<_v19)`wLT0FsiPrP}P0wbUHm27SFUP5E zZ*^>Q7@3V*B2TP5H3eJ=Jr~d8P3~T8O-5VbwMI2UZ0h+{#L-^ zWX>#uMJur`;{GsuJ4ZULF+87(skr1Il1d}i9*nKEs$w@uHG+XvU(N3;Zo|(ta4d%O zxVhhJujGvJI3DA##S;6|lNOaZ+x?;IW{u(!<|!tqKe7z$4o^$4{#EXd78>!ecYn{}0ym1}aedrL}VoeRn7URAGMr4mYjkt+wAKy4KJ zUaWoRl$O$abG2Dw&#FR8saNuCxg)Ejl?t4`daU>y6t7;tt1tk!Ci`k&JWTW_ja@G= zQXU8?G~S#VfG>364Qn)%pz@~Gf^KbSP*1@Bu?|X&Nf?OI;-F=JE2U30ntpXLk)Y(_ zb}wW`%@^&tkPLO5sTbyxH+6;Nl#uIy$8T3=HIc1O&%i)zSfVqMGHx(A>~KeP#7F7v zEz7o678`p6r6}ukGm4#pPi)(#JbsAIt z)wdABmXNAVb#?ZA12c;6^RO+?5$<{+evm20z(-~d#$q*zzg$>RV`ZwzJ1;}m^xVBn zQ>&^uuIKACtYd<+dN~--X}u*vGU}M3t=tVU`j%`n!PlIx}2UqxqC^nWqMV zk{<^S&6Fb^A(Zs9)cf6Qe_DTE6OWQbY3P+E5Vl0vL0afCjSJy=aiorTTljSV literal 3446 zcmZ`+XIK+k6W$~c5JQ#T1d%IIx=58`D1j&)6wm~ei=e=jrc@yyNRe&;MT#Pz(mR?2 zM38n-iu4{O^bXRId>j4#d_TV3=j@r8GxN^7Gw1B{Y_ypPnw3S61pok6BSSq4aK_UI zGaP(2Y2EAqC-|+)Xgz>NzhBn9c?w#Nc^KMy0{~kieL#4mFnG|&{XNKjcL|^fVV07Pm{23eV^ERE>;tX2rI(MYZkb zFc{>YG0pO^!2E3scSPh8I8Y60Oh`#$iSFS2qiPN)K*@N-0mUF`0<*$Z10J1wT`b~e z);z$=JAz8aj})dg1GleG@P-L8W$xFx^}q9(A|v*K*zyS1u3`r@Fy#X%=IH#_RYg|Zu zUZX+3jFiUmPDB%H$s^wc6_+hTalUOP-)BEUrF2ihwZ*vQOmHTn= z&+&!9LZI`~O%Q)-W(JH0&5nrF4#|<4h=G9Cap>AVLw1YUnt_pz$}JAcFJ9ddw6dP| zPlUD-(hv^#x!B^xfZ4-5oquVqRV}wGLls)iJ?4H}ZP2UKZKul|`t|k{>_UkS%XZ6e z_w@Wwjz*F>ORkHvImJ44y7T!JbANO0iREw4O*E<()m@5x!^+FS7jCajVl+Ezpb>*} zwymjr>hk^0C!}KS02C-FK=mpe#liukWG>-Z*KDFiysVr+gD4s>tq$i1E}z|0i&fBo z@ML!B<%+HRFhWubqG_Xvbgr=qW|+OU3_jfMsf|nwi?~y=(3|tm&_6G_dw0gsL9(6$ z%c5sGSMx7%)&x``dU zS#IN?m7PFO3)s5;YFu|omjiogKamLab1*11y5wY=Bi)h7ZGwp&c2g#j{{{m8h8zm# zi(p6uUP4H!oR;ZuQMHD?fY%No`zh(9CGIT4vN_Wn`YZMEJ4~9>bM~QKYw2q&JPvce zf)@;AgF))Br6dTjmZDiQdy*-Ty{KXdr7Psg-XNi-+LZrT+ zAQNkZ`Fk)*@jDn&b@kn~T;X3|mU8F_g#QaG6<`|#TT;vJgp3l0- zh#L30ocZ&P|6W#T$f^c#$&!4Slxh<6{D}L*T4S1lzotI*koVq|-)tDWmxbl(HY!tY z$bRrR+sKhbn&H&Ud(by@DTPQc;t+c7!C=pak(y$A9U^JA)~m0-X>s?W(^S$gH|0^I z@rlP|9|nXUa5iuIU=CLoFx_SCH6C*U;}1W1Fg~rUvfNTDPZMGn;DZ`JdX`+f5W6LsdpT z1)Z_D|T;8c@qHlV96v&V7e?cS%3jNo^LqX;Lgs_VLiFHLdEZEeA z>kG@{!8BaFo(*)2%Ql}iD}Z1VW7fj7vZ%l@xQPH=fQkNb9+P0sP`oO4lXFKNkNh2# zkktSR`Lc3`ydW2l9Z&VJu4Qy%HNdY-ZQM~vE4CsDt z{m`v|WeFVd((&fflEtPM(+>>i92^l^hiejK+L2|@-Vbdv3n+(F3}W$x5OuU8S-PX_ zhOD_Y502~yaTVe1U<4fQdxgz*WlvRhX~FO>4;P3gcB_10sBbcge>Kg|Bd_2Zr~*`F zemiMisTgR05EcB+f4vQJM^yE=ynrW&YJCn|t&3!07u}sxJ^fKHNmBB^)xZy=+|iW%{tscjICjC^eG_#BD8Vwqjl$M@Vcqv7jN;;lLZ9@ zmC}~L(st*emFq7(%$^J|Yi+H$61>@pw#H8F?~gRSL2X>-9tNbAJy8}!%UbsXr(UIy z3oS(*6;_qQ2o)6-L43EJcGW;IQ$z2?u8(bdAt#U8WYet_TZ9A{Bwm7{i_U5LFa zmYnZrmFhGMeFnkz2&RYrh1$H#-2+q&)KVf!ITZ%%0#`B)3~Y^iZNxv{?^S{WC4;UZ z!<-;3&Uk#l6Ws8($rOu__KKnu3)$6ulhGPBo%sw)AkkT%pkm`bE%A^mj)S45cp4Tf zo8e8%{CeB>lt88QbqrG9Hq`{YVT4W zoe&Q%A5hje&w!W>j6`;R7~|i(3{1i(p*($JoXKEq;1uU^x2~lM=@1-uGvC07+{Q(k z(ct|7{$987+67`KzoY0494?q_S4=JDtmZ)NE58Fdf%OVA;Pmfpk>8xCpI+#qPcf8`4c%Th($iHm*1MrT1rMT9_U<83k_DU>6n^ zxMDuN26tKC=FlsFvw7<3Ec=e;?`U!R!>UR#ukG6t_bsbYYn21}hKWKA?d?YB<9hf< z?y_+t+3ORzVtpqcb|#hd%?)Lzb)*O5X--k!{QMm>W`6aEG_hzpLVkHwZH-MnSyDo>95cOz(hMy7#iF&eXN=NuHf0uf+?J?@d*MxLV z(GZ=4pyOY6<`527SfcqT*rwKS-Ka2x;Of$o2tHL&VN_Kxe#o>p9#oWtQH0boGfU~6 zXhzf&V?1jlhYV}%%Av&f-*TP|S(_%y+uV3u_yn8y`_#8qf(Ho+|BX8)P8DddugktM&VMeYSnL{K`y6z{o+uS3ZX51)B3->SB| z|LRO&@+sYoWx2mX;P;rxfbk03*BxxDxXT1&bEBV!z)sk!43 z92{R+dA?}S^~~_jD91nTWNJfEz75^F?7EwpxhA8J z6!G06@`qm#?JDAd61O4Z8V-Kz5aO3y z6PS7W`9u7s7l{Abr1maBt(~_ZM=ICfH99lbR{XE86S^N6p^oG z<#A76^EbTY(8k8Er6dlfp`oPA@k;VOObBd7_{@t1ND@NqD$^C0`k%rRdZDah;6h|% z-);Rujv}*=tXl$VhB>^ f|0@KD{9=DxR~F|{t;PrbApu7ECVC|(hp_(uCr^4X diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/DiversionTransporter.png b/src/main/resources/assets/mekanism/textures/blocks/models/DiversionTransporter.png index 670c90605921e54ec55c845c2598eab1808ccf50..0d3cdb7f58f3906987f4d8a6038d05cb37793fc6 100644 GIT binary patch literal 1668 zcmaJ?dr;GM9M6HLAOh196wosSWrEN&g;E-+2yKBDimX6E=7Z9vw3a5N4YX9pfp*?N zz{7#g2RKnsnXe7x94O-Eydi=Qwy8q|q(is)Jaj;rb18z`A7i;oevkWnKHt~pE=39P z(ay6yX9ED>EQsNWsTH)n4l}8*-eh`7EgmF4l}scQq(Q2~fCxE}fq?>zG!qkJQh8o> zI~E22_P(m5R5Dc*hsp>IO=`o?j2bP)27s_|qgE6Cq?!Z0 zO)6EC0CEW(1~O?OfieU^Ko*;ZFhheF%m9!034I}hGI)Wl}ltBk4ABc*klPgd$ zFKRLtb>cuulGLIwY%myTh9DZD%Y+d&n+?+$FoO|DAp-SzI4Ly-;(DJc1sI1-M)MA>C&k!5`TnP{ zJ}FO&!D38Lo-=P)H~eiSR?BSP?7);WI;d5zNp?gvpBHBRqs1I>qG? zvK$SDlT%#zKU~(dT$>#h-s_AnHo>p&?E1y0W=CoXxN(QzK z_g}-Fx}qFp+rG0db$Dlf45u8gqpV#Uotpvxb}t3Ih$Q3Bms2|N9{L<#KlUEG@5;C% zb}dg3J4%ORapRLTC* zHt9!Kor+CIIHwiSH#WP^COh|@pa-uwFw*87T$kw}Zyj_7+V(lBD$x9x(#Jb`vVh70 zuH`m#^F+r|$;$kfN=reVq|$rclEMJVh4g`~_RyMk->YxF?@s)BW|5+*_NjMC8SvpO zv0M07uY|S|hF1TVv!mdIxZQ4u45(4BYsm4B+o!5Okj!}~F1exTZ{B9Y2WnjAA8WL} zu(}+Rt1SqlguUt}|JpKlb28h*1%%>KZ zW7(t9kAK*3=-FqAU(QwU$lx`un$?J`RUV8IE{t`j-*6KeT#CLOzhsSu_iD}N%EPSk z!h4G^#W{NU#YP zRB8n_UpVqb=W&V9ZAD^-y#Dw%wY_Dvr>hS=j=-Fl3DfJGy`T@Ws`mXZ-Js$roPN kAMGo975Hky;6=b5C>`69Y|eJ4{ulrt;K%b$MW%248*D&|A^-pY delta 1438 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 Hu0mjfE_E@C diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/DiversionTransporterVertical.png b/src/main/resources/assets/mekanism/textures/blocks/models/DiversionTransporterVertical.png index 972ff77df46930c6358131518a881598744e3014..d443bd607abb3897e9a3bc615e06c2947c8f61b9 100644 GIT binary patch literal 1158 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0= z5l-`Uc5js+z@P70s4Rr`+t&+=-w z+uPP3Z56mAmHg#h`^D1OM=yWd)%HK0aqUoQ-zuHcTP)8{S+M$bloQLk@Ba=>-_LY= zTP*)7FXt}@?|%PVG;cpsPQ~QRSt>3M#E$+x_a*Kh*M+Gm%fc87W!eMf1KMllBd&)6 zwbsgK%yI+Lw(>u=b3NGnn7Ksta#o}mr{In|clx*r)Qp19Gle7^=iHxPczOA%--U73 zb_dP|9=16zq*UIteihs&R%bVI6m>KMOD)>J7 R)vpGX44$rjF6*2UngHeljy?bY delta 1139 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 diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporter.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporter.png deleted file mode 100644 index 73906f050cdbdb92fc4dca2fd4b119eb7bb34a28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 608 zcmV-m0-ybfP)y5B$iS=cpfU6(gBTw8lZPLMlw?`LSm#o= zs;D-{<1z1cJG}QmM%AKPAY|(1!fmK(|GQYlT8pY8A{0e|F@_i;DJ4P(#281PloHN4 zy!SLsgWc_Rlx4|%7^u$_BfUp!#gHX!+m13YCw~1tO6d*ruvT^{smAi)bobL@>r6)(AQ0RpH&nWQ;+YoXI)UOce3V+gIQnGv|!B>#pWz z&VyH4)eZJTi80aekTS10000l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT-VtFWlg~VrW1CgG|37u|VHY&pf(~1RD?6IsxA(xEJ)Q4 zN-fSWElLK)N18HBGcfG%TLe-Fbd8luesXDUYF>$_i>(q+L@y;X#mdCo*x1p)$<@u= z(ag}$)zrep%)r^z+{wks(9qn#%oL{AGq1QLF)uk4rZ*Fz*9EU$E9aur#FG4?ko^1{ zSnLI469T3n z5EGtsfgE_^Pt60S_#$A^{>>1b%fP^-=;`7ZQgQ3e^qakh90Xi87RsGtEKb?NIDzB8 zOUsU;0-2cIsV^5UGTnUR&kuI*jAO;6rRAlS8gl)|Q_d`()AOf>v4?Mg7jK@~?D@a{ z-urqrEcEKu%P&g~RRoH}#;@&IGi~G3qR8yC4+}C*Z>o70x&Hd?IEEVyids+0c9$xA zSyv~1$ey|CdcNKK>rwSqbE6Jq&b`$iw4m2$fqd&9=5uq9!2D&I z^Atn74Y$gyD?d9~t8!iCqM6JSSsL7P%HG?k_AKq0ptWP7@Sb{QhMC`f*S=;y)Oter z|3tNG&l#pz3Rwwua>%XHvf=gHQNh=?b$L09SocwH$(I6^IzftAmSeb!>-;c(0fJmi+Cvx9(GSTRUCIjWyU? zFZe#keeMADR}0oBdL5io6ZkPD;P2y)H{3pUt$cBo@rI9X@|ml>mdKI;Vst0G`7bL;wH) delta 1260 zcmV4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wSVD; z0002WNklcxALXH?thb6}Y=+2EctSCIFJ2Q3sHSQ+%obQgH|% zl`SGJ2FQt^Pn8`(PMmIn4mJRK!x9)9pi~Ime*_@axCCtuQ0g6X0IS|XBd`B`&w(8w Wb3`yoa5}jF00005* diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontal.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterHorizontal.png deleted file mode 100644 index 4d4e0a5105dbcecff86cedfe7fd890d8a85ca196..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&kwQgP%c0`hdbpjR zIn$n5_%H+WwE6b+Mmn2m zzISS0)+g~x^rD6Y>lc=uQ>RWb-!@N4PnUmK>&(d5$OyE`Y;UNFo_To>&{76ZS3j3^ HP6l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT-VtFWlg~VrW1CgG|37u|VHY&pf(~1RD?6IsxA(xEJ)Q4 zN-fSWElLK)N18HBGcfG%TLe-Fbd8luesXDUYF>$_i>(q+L@y;X#mdCU!pOqX$;Hjw z(ag}$)zs3$5XiE$G<7yMc5^gygz5FnD=taQOHPI9%|z&R#;e!LxhOTUB)=#mKR*W+ zdjT2wCHch}`2`Bj&fwTm&dK}gn%gs z#DphZAP1iKQ}ci+z6hAK?WSk#Vqjnr@^osp8vJ#(jMsO04cGaR|LJ>PGgX$aOWI#*I6X4&yjLYb+Daec4BqU0OJ=T|s2YPU2TuXZ`a z7&xPT4vQ7rvHQMD14{SbSD#+8G=U}VGTN3 z&1?wJb$7Nr^-|wIhd;LXomWLTqu_2&2I>A8Ts#j|R)qd~v*!GscXd~|T>1rtu5_lK zDwv>BR$dY}V_iAlljeMLmGzZ(G_JV0Ua8ZNo%HV2i<2AE{`s~WZ=V+RwxVp?yqU-R zLoc7*IGdO4!@nB4{(THbmYoop)z(vTZO+BW&E}WR?zx_IAlf=~qT&2I4-116U4HzP zh}|+xjJL)6ONr8s7(MgvZL^LjJTNZz_D(LGy(_fhr9zMI{xWmXOdcWD0jr0B+ k&Xk=Y`(qpPekLA<*LS7_JimABEU474Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wSVD; z0002UNklanZWn6Z{84wmqWZh;F$&huptab4=l!O z8W8c(rSV|RMdtD1B67DtBJBAN17oKpz|OmDqvoAvz&mO(9B<9b2DGzMgl~p}qno2< zt&&&W0~i9(5~0TMmd>l^1VAdCSt5p88dj?kVB{Wnl|YXHtY;V)o&ejT!2dsiA3mQ@ UTU8n?#sB~S07*qoM6N<$f?6hXYXATM diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterSide.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterSide.png deleted file mode 100644 index d63d60bbdd7472fa58ce64537659c744a1730752..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&kwYhez0mNBqmD*+8L2PZ!6Kh{JEEY~($lz{4`%WXqce zO4b)ri=Hj`z_%sj99KeOq*o31otKVmO$tA(S6a_a*^s?da{X>?1U5HBDqiUa~7rftV*Q}(dTl6@}v zzwiJ4|NneC+qZYMZ=;W*sMVQ$QjV;^dpp|6*QwRslBEl$ia3vka7D2pmC(>21Q|ma zhB>Hc)g#j|Mp4VR>V+aM%KJqX83DzM3Alzu&=eKxaV=R#sQD26$(_|PPqtqqAeDZQAB zoZ@r|V@qV1N~IF0gaXJOX4q&n$^)FAuNM;Gz z`cbH*ZDfE(*`nTB3z5@G%K}zwttHYD%MdY)H{5>>yLm+%zsf2g!2 zdmjIIp?>sS-<~J#^SLQz^75(t%=o&WyRwzUy56s^uI-&XSRehYc&*Jk)c?!$iH^j; z?pxhi_RJq=eQ+toKQPq0+_v>pfZzg3^nN*)N I(K~SbAK>?a`~Uy| diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVertical.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVertical.png deleted file mode 100644 index fc05d6958e1f80e28f14f7c7e06b65cd43884536..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&kwQgP%c4v0!`JTcA*%r;B4q#NoG7HVPh4;BehWm9-okxG$8Hq+F&v2EJ`?l6!evWzHbcWb>s6)?Dl5Iu zg=hb$4dfKOaKM+1?Q6C5 wRHx*uaXS>ta>(mPH2WczP0TkN-!xpWsZmLOo4-!wB+z9Hp00i_>zopr0GK6RH~;_u diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVerticalGlassColored.png b/src/main/resources/assets/mekanism/textures/blocks/models/LogisticalTransporterVerticalGlassColored.png index 02192743bd4abd112b9e0d94b90bcb98487fb2dc..28fa7ec77ab16f957973f73e9f0e2ba6f1d08abf 100644 GIT binary patch literal 1528 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT-VtFWlg~VrW1CgG|37u|VHY&pf(~1RD?6IsxA(xEJ)Q4 zN-fSWElLK)N18HBGcfG%TLe-Fbd8luesXDUYF>$_i>(q+L@y;X#mdCg%+$cy(A>@3 z(ag}$)zrz%+11I+&CS`w+`!P)%>|~{Gq1QLF)uk4rZ*Fz*9@;-E9aur#FG4?ko^1{ zSnLI4YGez5W_xu2QGdgI76CE?@W)}^N(_x@X9vno7y`|aARrLlM4fA`w^%*;3V zsA<*n=p3ordE4)=&oK#Ilo-=1xA@mF3;#LgyYJq6cRx(h_t=dP>20~zeJ{=L%SiTS z=WLBCUAcF*%;Py+$zO_E%6m=;+S=tCF-6(TKI^vPZbgj=`??pkd*jMq`7gh`VB^^| zV_rtxeR1pSKNK1DZ$4&nzLP7GGe?KW!cabhY@N+HqVY z+3p=jW7jbb_f@H>2a`5R+^n&YV?WPzzIN~H-8|f?MlB(8pD=X)Es+yCHsiUI%Zjc| z4mn}<7BX!21@v6z{cxTU#Ajlu_(4Zv?>|u`p8ZNOeEj#67R*SBQ5V~3AsHzcJo$&a zr2ZoYCFVCDgBJC(&DEdmB#`V;^-w}!@+7X__B9fX6;l3|;;NRr>|SKAw(#)l zIR|ENhx#0!!l&XaP|Dzb#hO3Hc!y+nDZ{kttB+gVRis?zo_{{KYRcvgX1U8V>fTLp zetW-5reGSgrIU*KqQFpxqGj)YE3TXA;}q2Ws+~!-=tY&!e#QK!~R)5dVmqh1}e3WJVDg!;GKxv1c>V7k`HP5I7#a_jHRSXXescxgnJ z<7k#W7X1`2pX0IefxFj>?F*jod?bIpVwuQGhc&FC;roRfZoOvw&p%Q0-kclO zTP7~}C@<`CM)%}Br49Grw{z^(UJ~yWH)GMHjtE0e&&}!5)nyB6=GeG*)Uik~IC*w< TIL?s>1(n5~u6{1-oD!M<#m+V- delta 1300 zcmV+v1?&3w3#JN?BYy+%X+uL$Nkc;*P;zf(X>4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wSVD; z0002-Nkl>KT7l4d-fZ80OH{V>s05s!GsP{wwS(|&} zQI`Q`h$Db(#-rOKfTKp)b2);nz<<$qb^!X9SOGGFY6HlKM?5xw>|cTbXvWqd%-TGH zkR6yIF3-R$aTy>pVCt;M5sY$d&xm7o03t3&(B5#gr*YXG7{TqGApmu-_Jn#h8GvTn z6Kv}ez%22AkpSpmMPoHC2_PDhMI5sO5b?N_9e~DV2Ov?!yB{c|TtKI!z75p?0000< KMNUMnLSTZHCxp)c diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeAdvanced.png index 6df474e5c778605167ec036b00ed7ac73200498f..ffc141b974240f3804943611dc5591516f9b5af3 100644 GIT binary patch literal 1561 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 JPDHLkV1gnMCKCVv diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeAdvanced_HAFX_Oct-28-232851-2015_Conflict.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeAdvanced_HAFX_Oct-28-232851-2015_Conflict.png deleted file mode 100644 index ffc141b974240f3804943611dc5591516f9b5af3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1561 zcmaJ>dr;GM9FL$Bc}#?D&c|U42M4$|Noi@DwQ6m6Ddi;&y!q%O0WwHZnqbq4qUd(u zhE^0G8=^a9>?VW5V{A?k=VLn^pmW0cIOn|Sd~o=f-nQbDr3kn`#&VbZ9{2ftzOT=v zG9xW1IABHq006-$$#|Byg5KBPPyBK&*AsD>&L`yZOV~W#VYZWio?tB`m_nQL$t==L zIE&AaS^)5kqOx=OTw^L`Woen&i;)SmO=JUrcD`UUTMJ1Zw2=7}qk|qC?Sw#z&_Ov$ zBVx1}$O0yTX+9?}P zu?*-{G+WpbUI&Spz9@mVjma|HNSnll!GhTaqcX%>(kReq{C_A-kD)m}i+q{ye+qNi zP8$hlksMoMw~B+yi|~fBVFo*C=2?3-%NC7xF{6OxS+0P!fd<2H*TCo;iXm7B7c5Our?F^qC?)>=Z7 z3_r>xUUCiNa=mt-ZDM4cv{S1|BGJy$;BeU(HGVFdarH*H#Q3@B$K}FeGO%~J{~Gq_ zmFOVvcFelsVa)s_BRbwLTDweiC;<3Wrr`Q);YxeXVrC{9R6|^@iy$(=^=l@<)l0W- z|CQMFl;}0e+*NA=hjjO}@767({LqZ`k;u-**)hLwgPyHEYW#Uk(l;xc)53lmJmx?X z?{WjT?Ay@B^q872Yj3|XdC1_;wB#nwmPU6;naMM+p0ok)^-eoq-d|k1VeMb7?x|(S zk;_GdkK{ndHRfG0R!{6Tw6Ek#JLsg?hic5 zj}&T6raR9EpB1lqQnvrkh9IFEE;#O=F?h4l|H^?+D{B_G^|39FPQ10)$LiWBOemec zs$~KD{c_}>w(;v5Ls71P)bOaxu8eTge#;iNC$KBkeeX`}oaZ+6#SJI3e4o#443o4> ztPO1#Q0`ZT@A{$s)Ig{uxa0Vtk2f~AyG=d0CgW=tzso@{gbUp_BZJzQBP*NxXX!g1 z__%iz(THVBW$J`EVSf3ucJEfLpSJ0G~ zrn8*^E{jhdUQwa(J=_a;(2fr{&%XL;NC^5cA@AFVKF+DZMxgH0jFyn78HnE;*&=C$ z-<_d~Zgqn^?}i{%dDOD>o|?jI{`2lnx!%h!KRCtu$>yD1C5qGPz|2s% zq2t3+NRoNzN0}C9FPtfKE|Tcg>0j&s;(Dm#cRT8_x3N)_0CDEI_KkJl)G`wk{sr(l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0$o&6x?nx#Hm*w=oo!a_m(Gj63hYTQxRc z?R@bgZ~NtMReQ6#YcEK&IG?VZ*S>ebvGU%VLU(Q$S3G>?ld?+CD3Rk)cE=g%1KdtJdlEJ^KG15|YW|h!7-Ndoj4wTH z#)p6L{CcxC<=({$P4ny+jg=G@xoN$OU99-iaId$nQ)N_xuLnm>XQaWN2a+2bwz)-j z{6Ca&KEXwI1>1}N2hu#ur}TW6v|vzFdt$n-aQ9si&ba&g)3Yspm2H(>wcIDOV%`6j zha4Z~c%6ECZ|i|69Uj8P6ZP%aty0Tqo_6X<(-@bPYn!g0OZpw&z{nt6vT^!zcfnjx`R(cI=d#Wzp$P!q!f;do delta 1619 zcmV-Z2CVt44C4%tBYy+%X+uL$Nkc;*P;zf(X>4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wSVD; z0006mNkl$vVJ)h5whyMV4Hk-wa`hOYcZ9D8!P33B*8m>&CY{j+wf)yf7QG=0*$?XDOzfUn=LQY<*t z^K<>A$Arsw%<`-g(v@)P+@|;Yec9HowwU!Ce$^6J%CL_HzS(TDmQO5ZqJIv6Jv~Hn z;V{Hvo7Mpgfe-0h2cT)`a+bT!ZGK`_9Y9+Lwe?wN_36@89z0`^PIdSsJZ9Aaq`=gF z65izacs-hpD)-57^~u$}av;}ft{qF^`+Vhc9b=cXTPy%Rou8K6oMHJrpW-+xhX#`i zhso)w(%w!lL&5aVg=5Q!$$tXiecU`gVUUv4+V+8q3D>qEvyihL+aP_ms;zy+L_A4I zBwfka22agasy=3B2heAPDX{7lfSssybe5LUm|85$0Traj05=miW_cB)KOMlU+=*G1 z13(l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0$o&6x?nx#Hm*w=oo!a_m(Gj63hYTQxRc z?R@bgZ~NtMReQ6#YcEK&IG?VZ*S>ebvGU%VLU(Q$S3G>?ld?+CD3Rk)cE=g%1KdtJdlEJ^KG15|YW|h!7-Ndoj4wTH z#)p6L{CcxC<=({$P4ny+jg=G@xoN$OU99-iaId$nQ)N_xuLnm>XQaWN2a+2bwz)-j z{6Ca&KEXwI1>1}N2hu#ur}TW6v|vzFdt$n-aQ9si&ba&g)3Yspm2H(>wcIDOV%`6j zha4Z~c%6ECZ|i|69Uj8P6ZP%aty0Tqo_6X<(-@bPYn!g0OZpw&z{nt6vT^!zcfnjx`R(cI=d#Wzp$P!q!f;do diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeElite.png index 2a6d91f0e120c2b17557def2b782c44d3d8a86d7..13f991f0700406c5537934d577acad02482b8caa 100644 GIT binary patch literal 1504 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0Mv>2~2MaLa#ASy`bcfTL84#CABECEH%ZgC_h&L>}{(|+-@3U0R;;?%1Tbc{YIa*-k%CIn1DASOKN0y*%+pPC0u@kPL-eJMI(5d#BLfTxRN zNX4x^;iq#C8}LjOImUNEx9Amv0HdjG>mV-k3 zB#*ADKN@*vvt^QbmRx=*qLaAp^)3aaUuU--e;imDF~3+Z+tOc-^M9~c;>L&<=57JA zqGE*2t{qZnIChIU;;^o~(FT6|>?H|IJzuNVDzhZp%s;=YW15-oVyCj*bLZ9UzpuSN zH(Hjzy}9oOd;dk_Im>NMFy?N*ZO?xr_{#EyM7%g)-Wh&XWD-`;-Or~U&^ zbd_z^r9gYa(hBMwbiF{jzBGGS*-mX$7R(lUdVxU~}k&c!^a`*e!iV#@`s5OdQb zk}PZbmb!2F8tXWt_V9!m$vgEFbahh)Y26IjY+&kLQ=`T_Drf=_h21$Wk9jzwI*_Z9g zR{U{c{b8+q;UDuD7#`Mc?B{3oIPY2e-70Ibn%nH#k9*@5-3u01OLSY5>VJQI7i&d} z$JV@LF4c}3cQ5VTkz76Zzty^{St8$FM)lls{o2hT$K20$%kp;7RsOhcLn)P%M{AE& zH%^Fd&{--nL-JZ8zp`iXAA{q+;@|78f4tKCq3P3WbHDFduzv5Xw?DKGFyx=D+j29N RZxX1?^>p=fS?83{1OQp!E!F@4 delta 1625 zcmV-f2B!Jo3+W7yBYy+%X+uL$Nkc;*P;zf(X>4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wSVD; z0006sNklrc+_p`KvlI@U}g z145qwVMDRo?aK9f?M|nYL%jDcgy71ubl2f*n+9lP0VW__ri&*!cv3U|NX-Q)3a zx7*D$&#FT&mrLW}KLB4W7BQoF#(#O25F`-b$mMde0C=Viuml?gFWzdka)FWaJD<-M znT!|>B4d^1uuE&SsTqiQ0Y^lFd|mgZ-MLm%{eRB)ZnN3gz=Nhw+I@c%Q-RIz?x$>6 zRYmn&ub=d!@Tc>bxo{X_u}zx*#=yt)Z357=^f}92=Po}ns|ld1gW86yv-=p}vPv^TOH)mLW&!;%f z%CW)Z!eMfHsRocptZqPZ*>mwYEdxV#2j;$SmY+$1cc_t!isu zF%eG^5=mb&cEMA#m8y@K*#Qh0VG68z1z;y?9i63RG^G~HazF*?DZuT-jagm=>30Y4 zDtBU*Zn+uW~151rmX6q0_Oe&h7t&<@OU3`@nsU%OVNEjZ%eo0*6L@q^7u< zWnE4+O~>QW1}6P#lmso|^@=c{KWkmtXmA?T%gbr(2q!54B$#H4GEn;Q(|&LJh%cwV XF>rWbVr+Q200000NkvXXu0mjf4#qQz diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeElite_HAFX_Oct-28-232852-2015_Conflict.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeElite_HAFX_Oct-28-232852-2015_Conflict.png deleted file mode 100644 index 13f991f0700406c5537934d577acad02482b8caa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1504 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0Mv>2~2MaLa#ASy`bcfTL84#CABECEH%ZgC_h&L>}{(|+-@3U0R;;?%1Tbc{YIa*-k%CIn1DASOKN0y*%+pPC0u@kPL-eJMI(5d#BLfTxRN zNX4x^;iq#C8}LjOImUNEx9Amv0HdjG>mV-k3 zB#*ADKN@*vvt^QbmRx=*qLaAp^)3aaUuU--e;imDF~3+Z+tOc-^M9~c;>L&<=57JA zqGE*2t{qZnIChIU;;^o~(FT6|>?H|IJzuNVDzhZp%s;=YW15-oVyCj*bLZ9UzpuSN zH(Hjzy}9oOd;dk_Im>NMFy?N*ZO?xr_{#EyM7%g)-Wh&XWD-`;-Or~U&^ zbd_z^r9gYa(hBMwbiF{jzBGGS*-mX$7R(lUdVxU~}k&c!^a`*e!iV#@`s5OdQb zk}PZbmb!2F8tXWt_V9!m$vgEFbahh)Y26IjY+&kLQ=`T_Drf=_h21$Wk9jzwI*_Z9g zR{U{c{b8+q;UDuD7#`Mc?B{3oIPY2e-70Ibn%nH#k9*@5-3u01OLSY5>VJQI7i&d} z$JV@LF4c}3cQ5VTkz76Zzty^{St8$FM)lls{o2hT$K20$%kp;7RsOhcLn)P%M{AE& zH%^Fd&{--nL-JZ8zp`iXAA{q+;@|78f4tKCq3P3WbHDFduzv5Xw?DKGFyx=D+j29N RZxX1?^>p=fS?83{1OQp!E!F@4 diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeHorizontal.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeHorizontal.png deleted file mode 100644 index bab0e8bee0ddb04e68164c33ff3532a8b0fc3e13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&kwQgP%dhY^j~g8lX^)r;B4q#NoHs4Y>{|@UUKpIAU1- zNx-uD-NP4?*4^b=^w;bE?B<^eZj;XFuxM<*HsSA6p$&Jc#g(dx$_u|&tn5s7;%UFD zc4W=r>G9GR`IveBOSL&Gw4J*okY4ZN67Rh=>`h*T*Uz7MD^^`#Fi)DDap|8L%Xy%^ N44$rjF6*2UngD(<>&kwYhey~*ezMnQSD;Y6r;B4q#NoG7Hu4@&;9;3BGUd%d z37&&{dLG(pWX=&iaA?z%Ke`3W*(DWP{>;5nece)>Az^K+q1z{sZP!em^Dt;Eeb5>A zpqf!>Q6dm;y(S`*FfpEY!wFx;<@q(H2dq9%W#Io=)-b)s`he2?zuJ1!Kcs9_4|*pg gP{zrrc;pm!@)i@h)zw>5fKFlXboFyt=akR{09uSwZ~y=R diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeSide_HAFX_Oct-28-232851-2015_Conflict.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeSide_HAFX_Oct-28-232851-2015_Conflict.png deleted file mode 100644 index 846f3d8cda6bceaffff86998dcd68a44a7b72f90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1183 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0IeOx=u}3=LgP9W9+)U5#B0 zot@oWEzArZVR~KilS^|`^GaZPQxJMhaq0ynhui|7%`T}$nPsUdZbkXI3Se(rW#V>= z5l-`w?A1laE!%ix>LbWqYDH1_V*MOUJ_ zCj=-NENakD;99Uq>u zR%G737V((5+OH%wy?gGmPS(H)A|EaooA2CKul~?$-}gBM6ID8MnXMOWGy3&~CxMUS z;*QzxH%qh~oOD}6VS4`Crcj={wi~80&G+khyd%!VhNIx2?hak`d0sd6n{wODbvRhY vu~DS&MD4@s+oyiS3b48`*6Tk|KEU8~v%9AB(qmxIFfe$!`njxgN@xNAKO~ev diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeUltimate.png index d3081b5a3e8af1f42ffa6180a21212eb1faae238..61754ff9ac7a713534ec35ed4b31f3070aec8a51 100644 GIT binary patch literal 1545 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0= z8BX({dQ)(_#T=(zeV}9XL6M6T*)Sns3IZ|VNf*e0C;rqtV2UpSChhX?57#mygI)4g8~E&bjUMu|rEi|e<6wAeS!RmRL_am*ncJh* zKH0rW>!tqbpj*4vEj?;g!Smok(VSl!#5Tp~^&jXswykPA3sdX0qZVAcGZybH@DsZ0 z(Gq^OG(M5-)ZydmJx(t-o;|v9Kl`@X%KsS`z1ydl|8OU}4e!wdk5AvNd{IB)_v}`d zJ=?@f4?O6Z%Kkt0fn?RJjY5(s4yv*n3q&Q-%sj*trhmNr{Dtc8m@h_ae4V8|^4t@Q zSl#7xyDQ}wzuhwKn}3$cpFg5Zv@3r7^)|b|yxI3WP0p;?(~@DGX(Pv-UoP@`ew)CJ zsnSBnPO{E2+IuOWnsK(DOY3bOhegFaKFcrH^)7h-{e@5S9htIoPRn?m#CYx<+Qqny zVbOHf=>oF(lUVn#2dwnC`0*ik!?%c9*X}dc9HuW%3T{whQubn^{&W!s;2`E zmR^??ocKd%bwWzx9oF9UuO+j4T7L+;SI4=1X{u=W$)Crz>rb7e90SM47Qf!JY08bC z3U;5^rn5aax^4BDL)(b} zF&rwaTBbP0l+XkKkGMVo delta 1627 zcmV-h2Bi6k4C@S#BYy+%X+uL$Nkc;*P;zf(X>4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wSVD; z0006uNkle+S(o2fSF$Z^$68yHJ56`dJ zXpDp+YiH~guGu1*L%jDcgy71ubf?oP*4aPXj@@K3iG8S_PN%LY z3U|3&-1T~O=kqygo>hmQ&*zbc|9=2{Hk(;S{fzTAAxI#=k>l|g1K^o9z!Gc}ym*Vn z!Uaao?{GN8$YjK55E-j1hizJ;P0fJi1so9x^8B-jdhEaNr%$(9t>VCgrce6)>$Mm& zfVY>AQY<*t^KJd4$ArtbWqH;K=}I_tZqwWCwrp!xn`PaGU$xju8TQe@*MIAE*7AwP zOw<9er-w)`9EMnI(>j15@F9Kc05mOK&T`ke&5vc(0km~cTc34SpDtbH!7T>qREI~x zEvpV71*ZOy@FvIG^=LM#+$Y1;Cs+5%fn2A#b}WVO^OehWj9t!di2?BGe6-}|49oBN z6x*yE8cZ%6Ca0%L`*?a83V)`5E*x7G)x zjcZ>q5l<2lNmnwq!Bex9s<+JS0Q!tD1y;QRh$m_touy?orWPyafC|!MfSZYHSzZO{ zM+a~(cPuOB0MM=^{BL0Qa>ud)iNLnd>6ml-e_^@(#Kb;upX0JfLR4^L;hn&tQ6H%> zu4Y-6Q%%!uw~GUlzBfvOmhgH-7|@@!u52_o4eIXY)H=dRN&pF_*`f@Te*CoGn?CI2 Z^cO&pd1ppV1iSzM002ovPDHLkV1fY>H!1)C diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeUltimate_HAFX_Oct-28-232853-2015_Conflict.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeUltimate_HAFX_Oct-28-232853-2015_Conflict.png deleted file mode 100644 index 61754ff9ac7a713534ec35ed4b31f3070aec8a51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1545 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0= z8BX({dQ)(_#T=(zeV}9XL6M6T*)Sns3IZ|VNf*e0C;rqtV2UpSChhX?57#mygI)4g8~E&bjUMu|rEi|e<6wAeS!RmRL_am*ncJh* zKH0rW>!tqbpj*4vEj?;g!Smok(VSl!#5Tp~^&jXswykPA3sdX0qZVAcGZybH@DsZ0 z(Gq^OG(M5-)ZydmJx(t-o;|v9Kl`@X%KsS`z1ydl|8OU}4e!wdk5AvNd{IB)_v}`d zJ=?@f4?O6Z%Kkt0fn?RJjY5(s4yv*n3q&Q-%sj*trhmNr{Dtc8m@h_ae4V8|^4t@Q zSl#7xyDQ}wzuhwKn}3$cpFg5Zv@3r7^)|b|yxI3WP0p;?(~@DGX(Pv-UoP@`ew)CJ zsnSBnPO{E2+IuOWnsK(DOY3bOhegFaKFcrH^)7h-{e@5S9htIoPRn?m#CYx<+Qqny zVbOHf=>oF(lUVn#2dwnC`0*ik!?%c9*X}dc9HuW%3T{whQubn^{&W!s;2`E zmR^??ocKd%bwWzx9oF9UuO+j4T7L+;SI4=1X{u=W$)Crz>rb7e90SM47Qf!JY08bC z3U;5^rn5aax^4BDL)(b} zF&rwaTBbP0l+XkKkGMVo diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeVertical.png b/src/main/resources/assets/mekanism/textures/blocks/models/MechanicalPipeVertical.png deleted file mode 100644 index 7b532bed79e008b6c06d7dbeb79fe350ad25efab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 280 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 delta 1624 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 D7gHvZ delta 245 zcmVz>%o=HSOR9M69S1}5}APkH_aP?>jp553Wvj zb!cNLY6{J*2j)U9hcPk63WBgXXUY12APiedfzN=5DiPI{yl(giRKPa{Z2Q56(@6eO zKni5IM@I6vq6o+1s!s2COo0qHui3n=p$fnz9H0{(Fe99>aVvD(3^TUj@d$byPWM2s vL)`)upaR~)aR2xvmyvVs=eMEvUR1ydF{);oY?Ar(00000NkvXXu0mjf8Pj8j diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/RestrictiveTransporterVertical.png b/src/main/resources/assets/mekanism/textures/blocks/models/RestrictiveTransporterVertical.png index 2badef84eeb3973273a11d93882be0d3113ca8d4..9647b90ea12bf7a2ab618882fc259eff0ede7417 100644 GIT binary patch literal 1460 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0= zDNggCdQ)(_#SEujeV}9XL6M6T*)Sns3IZ|VNf*e0C;rqtV2UpSChb0%S$tA^|cNEw))K2qV*m-%u@sonLf>S2DicNIkbM-8H zvu-ID=L!z9uRmPu472v%7yeLD^-Gd>&;I|x0fl?^{+;^Q&ffmX_O^UEv7-tt4^ql3 zWLOgKfB#gy`DRD#`s+!(hA&;Sj|yEpv+!C~n*Q|e8?V34`eSQzWZMI_5&>Rk4^00m&=m20?~U7U)ylTtcDxmQuP@;R zcdaS=A=}d|Wpjc$5)ZsASrx^4{PDyU-Dh5|4;3)D;$LlN)bsm^L9XMYA8V#b#wM4{ zQEuC>`25(3hOCI+s)fePJJ+={UbwsJ^?|I2RQs2;-V@H73aat2u!g%?S$+{m-Q)BZqJ^4CrB0l8I&DyDqD zy=2{t@Ce07&f3XFCN(^&=4%c-JnF%^vMiR-&$8iA!=qpCcCXvT=VBiv-H$jk9&$;9xlRmqoZCdK_jxo{faq<5Hk~E$>WHEE>%l;#t Zz#!Oc?iPGKdON5b^>p=fS?83{1OSQAAPN8g delta 244 zcmdnOJ%MS0Nb?$a_SAr}d$HiIA@KjuU((GygpEILNmpWJ&)d>!yNB zKc*_QOnB?RV@i-W{0zpYgBZm4XEJe~G>N?tgZ516|7C>FVdQ&MBb@09?stng9R* diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontal.png b/src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontal.png deleted file mode 100644 index 63d245278129c65f56431104e64024912dba0b8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1967 zcmY*Z30M-?7RD$ov&9lMmqc8%0GHetAQw`}jl>Lc-$+yz0Rxv&pSk8zmh~8A!Wz>w zmDDUWO$*YgEX^gyEG-$cG`BRRMIEeO@4fqd_ug~Q{m=iObHDGNY@CPl7DWw3006KB z>w@u;?dofDqr7Z=#YRa10N^ay(GiDrbOhrVG!i*F900J%%RBOtHsq~xAe-h_s(PTL zHh(K9M{or1+o-8g-7b$kcjcXfM&skZOiCZbQZ?`cRyTVoNBE2DXi8FGN}a;)GaLsE zCGle2l-vz0-X7GiUy5Qqw~IKpm|97%5#Vq8w+jmd$+qKc^vqLByN;tp5-xUE(C`O; zOMby=KKH^eKDwK_?2Q)e%F7Zwn*3nvVD0J7&qRT`cZaPNo=>haV|^;hf%+F6qK~3} z-91N6DXjRVW*d0e>C^0<5&IW&$Wd*WVHP2nb3w9CWTBh|VXlIr9i2Gh>;k>2)4 zSqa;d-#(vM-$f*pkpjk6()Z>EZe?zN2Ceu08=Z}5DQUNx9w=`YLTz73bQ!+p{ucQv z4l8Fv8iLQbaLg?v|>7-z=TTU9Xj=)3l0NJJa8HjDz=_ zbqwR?rnn93(+WiTIX%h@dhboGoUV|UgA4QM{oQ*d+9x|3FFFOP%v2@xbPJLfmQUJ9)SZy;faae^i^QoiQHQTA&(IQJIMs2w+dG>4Qz&Vu;)h#51a>$ zZ60f8uzmkMbOI~&mikB!OFg6k(p_P%&(euftPql@=a>6?zhpdg{{6{#-+puV+W~mf zE4ep(54wLFzG}#|99`J`-wF zPg!w{>T%6*2_EX(T2G{!iFsU5FE}URzH*F<)^Xu^zEB}nPdI+l?e`U~Vni-Tzyxy< zR@XY?b-Uy2evN;ATy5&=6fY)kun9hcFB}-#pHz9(@A|^sB%+18EiSIk6*U3to&aB; z0k>Y(xq5dAT00-FKR+UGv!FIiw1y0_fUlyqm3(P%d6vl@t>?@6*_2qnNS}S;sh=b_ z8~J5vF4=!qb1~Jjc-!oq3F-PEiG(!IA0sg(t_!X5^ao$nh=3T*j)vD6vKFw3?m}b& z0GoHNO*udjPu3meh-7a9i{S2t2&GYA!C|zJa2SU|m!SawBnKfgDdDVOFozONWg<8z z$TtK+X0N&75b!q$D+&c6xZ}W%G)6es61E>^3PCG^!C)jKjD+yQIQXvdEu!A#*lxn-fqH7~-GK@OKGukoYJkl&F1 z=lh|9gs+MJPcq*t{pOXGidICze?A*p(e0iQ5dc^Rz+&vZUA9aeajlbpl~iHT zPjq1O(6P2@yD?qPu8HF_OJ+>$inu_>^9r z;hv8uA_@KSDLwduA<*7OC+dk=7*L_t*{Z_Cl5v)X;!#L4dK?TDy7IJb(#ql#i1ym@e( zCZ>(p^f*i<=Y8=DQq$leF<~EcQ;mP4QC8xR$nG^u*;Nu;%eC0?3(8@#~gon2t)6Urkh?+#V>h zE^;(9Kya}>WzkZ!+`24Tx0C?Jsl+SMzWf;dlyYtSh2{;E+0gJ(jKY)-zwqTG3L3g{$wouDv+hW_8 znCoMPiX1$ccrw9X5iY<%0|`MxY)DKvl=ve=5-x_+!%TMv zXvO#R%=3Pq@AvyW?~{Sd=T+Z#(-zEnp{kVf*7(GvmAOHhXIMiwYpQnO=gQ?FfU57i zJaX>+ObX!I_LcAd^Q@`Kz=qTlK(iLuvyeIlx@-F?1mhO4=V<7Mka-s9QsWbokjVmF z^(Za?T~kp!4s@x}No`@q40Cbh4CzWGcl~Ud+tLC)h%7op= zT>sBA>$aBlHUVpcnUO=lR!ALdsDVlxe_~gQBfyK0y6lJf3a}Ycf3#-Ca={irt|ajcdi^v~yrE#?Sk1c_{KG&Z<^rEXG`|s$wbP5r0c> zEaucV)T)I;zz)#&b0k$o(qsyWjmLc~DwN1$;iG6Wje|=GiHAhtq@H93XBAu-iHhS6 zqK?F45ru=j3MNvx9b=key~v7PA}jWaA+b;F5q((VHSxOGFA5?n`o!LLZ8@QDQRjA> z=UrMzEGir!f4aN1wWD`Zz3tdnPThH+y7`D_x$Gx70Rm>)$nDAgFU^0qp~G=qoO|oq z+Dr2se%yTZTl%7YUB9K@&=)!g{a1ZKU(j!m!^NeJWEP2oha^ZiNcM06myjwhzv0nL z;2uz%_D*+qZtN?k?#TCs?+tUZr<2Y8lKnG#J^N|)Z1(quro7^mw2!o}wC}aAwQsZ^ zv9$Br1?>mzqV}csZQ`v~-;eg&lS_0f@m8F*#5MEgM)L);U_NKQWDa%s%=KokIbd!v z3+Bf5yCwCKy*NzZwx_zXR)ibF!{I0rML-o7kK+&Re_Sm#iC!`I(AMq|dqvx&Q8Wrh z4$IhP^clUzK_l1kXKXPFMxU|8C_b=t_9`971S;9*cBYU7%%E_XL*f!3LwPI&=x_SR zl~Zqo*3NA96)WfauCxX{dq8YOqyqVxa&0j)_yK~zY`wN*`y^Dqc~fbDcK zQq^m8)%%~Kcd7Ixu?@^(I{6Z}`RQViBE>lHfCq%G*Q=k;XY_p!GeZaga3H1#5rK%{ z@p#~VzY}J1yWRY9xjYlWFXRbggGDWUIs*AbJw+leL z9?0993Y*@?JnRCv8S;~lT>vLSn5nJWcJxnzyAX~6(2S(tj@okW&G&~&gr*ygWbiQn z0Mwk3v##EoJ4z|*_PzrUQbJ0y9vucwLv`*XepRWp@uZnpVYIPSt zL=aP2=*l>5uZmAQspO1d`0q4!-QJ)v%zWA{wdyX&>C{cOn{BFYAU7}*>a)Hge4KE9 zZ4RCnLFl-%qb1~)e~A$iBeW>Yw*kwLHz(TNmnAB-KubZ*8C@5_v^@{q*J*b~764J= z6v>ePA?Ih!DaF%%5?hMGvfNBDneDAAN-EHNyXVReS>|Y|Pr2 S)$?!w0000% zLA)bY{?)6*>r-#$WAUa6TDXD-S-xNhg#$p$Xe=K9N@h?F0}cR%#t&)+j3E$79lE0{ z=xVbcPh~OmDJvL#9)m4rLm*;4qy@fK6A`!k}~-0p^0XLD;Z~fFIo| zlmi?LwRNP122gP{n8_ZfF%K_xzyLrBl*b5Ua`8L@?2BK#_`G6rNTdbYoQOtXNfu}n+CsdTW509BOfE=aQi1PW`afL6zjE&Ie4iNr76g6g`^nKV`icl%0tzo`W{^k9Hy$zd^|U+ROW|3rfY#tda>X^BBw z?zUXfkFzAA%rF=Oj5sedG*+ztE0^|@+`nY~ zKfn}EJV!j*Dtg5c5QuafnPle3>uYsu;~sSSHImQg!?$KJq;}tf?~T{>`RQKORm#(eV@8E~ZU6n07_C}(Fyy=oAC|IS=!Zmy;^Ss^v4A+N1*Y39{( zQfKGFrlh+qsjZimrmCi2a36iRln|zj4SIPpTlbi$shiyh$E`O8(J5s36SLMPG_AMJ zRj#ea#}D(I1#d?@oao37t%L|%m!{M6MJ?C8ox2mxl$D=5=`~TjV=Fs)-NM3xLG2&j zf~6E-Rz^i;{BHZe=v%(OLS3fNUUw#gjct9?6x1ry*48%LB4*U;zZoKDE4U(Ul1H@4 zj_(mjxpiwcNr(CoWXT=^SAHZvvF}Nttbg*-mEw1-yUP+!8W%;C&rEI^Mn1-j<*9^> z9a0UAT{wQmL)5aWnU?gPfI!@b$9t+}&6^`1;B}^p?rH^%R+6?@U0?{L=_GTxfsVlt z;(5<@y2oPICbd zCD|mF^XYaxp946wkDEjEB2a7yaa|r|8@*t1uyg@KD^!wgd(aNLg zG4nH0^*)J!(a}Lf#gzoRp_t2Th4;vHknY@`oP_f0)A4D_m7HZrQoxZ&(K_|VL?*g zv*g>6(~V?~>E#LbiptAmFCvY0mHCJ}X zgdC}_5;nSKAC*=OSKAj8zHu@p#%J9!BF2K?b@|!+lDAK0eyN&~5~k6vR_S?mXZ3#J z;G;CR@K@2VT|j!5c9S&6UygXxzCnU8)mzc|o15&ZkfVlz2!=;|W$Kkwt9%XH<MckW zxJ#~8`dliC-P)IDj@%2$UP?&GDa*}NLbZg<-KihHZX&#Gu@n|oH{`eU>N$KgB=o4x z(6{kO+ej1Z>l7z;1|u8Cgrwkk}t2|%f)S*AN<={oKE zm<5rcUawBP_?3`{ayy-Vdc)SX%ls*}@A$xZaK{2dt#h)3^z!AgNR_7adl#HENF=oy z^w7ud%!L+O!KXHTxS2}Du9T*P{$(<8%%g=>{uJLyd-GT{w%2oQ( zn+lt?5w+OH53_0=+RjVDq#BnAp0Ay#FU^bR?VgvFd~x&5OzFU#1qXHP+y7kuq*Oq!}oU8@3&PLpTCwJwK<^vKwwu(z{hR?_2O^F@Lw_( z^MULICwT?uRlRo1h@sMxer*>onvD5eUM&o`sd?TvxTyS%(HiFZJZZDFVaFQDt5dXD zi%#-)Bt9e$H1w=z`LFX6NX@*zIOLVs0JJoawr{+n`f=@iz-D~=osB!lZPr%O{`Y(b z%d*eCciQzxJNB0oQa4U#4Suc@q{}xe(2VB_lKAg?e!;53DE9rC|KUtrpQ1%-JxObh z#)^_7MpoBt9vnoBm09zXi(JOtsaBf|z}QWSe?QLeDH-03+TtC^*=gh*!woaZpw!ks zKt6h|?#JBGcS7-=J*z+|fgD}E^I*#8sB|V@qloplTA9({cHA=QR4LqkV zFS-{?zLC!{ACYHt(&&44Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%S zl1W5CR7efAR?UhNK@k3?r>7^$qVXgMD;@+7Ij$n)wji>Qtd|851Yg0M;L#`W;9Ce@ z6IjHH2NCun=vDOK1E?WpGQZY0*&ZiDPsF%eP}4ot-CtFA{d9YS!Jz2(`&cX%01EiN z77n1Kue1-X`R_w1g&+vvc^PNKK?y zA3v1s|9&3b9##;V=Ub=82c!D$Klfi8PpdVjzFVDJB|XDV>6hjX&JceUeHQRM6cu>^ zZHy^H(T12+=xQfC-yPuDPvB(K?kgLsCSq3};VisP0a8E#_U8M-p}BmVh70=tIeoJs{o(o`_->F<;1?&`34#q$o(T*raMM zp!MpCWbPeFv?D!ri1<`pG)3E~kv+%@AL^llipZ z%YwwoQl=1?pn9sbJzMO~*rr*6=vNGu=PZ}Rm3x4@Aog$Uctr}vq78`v0000%r-eirBae&F(rqxj&D=Z z(V*Vz192squ=}ee4g*&{#@66U-#jUC(e~&r!h-^77PZ{aIm*# zDo^axr#4-=Klc;VDvyN{8&8QFv`rGq76C9C7xD*?4j?-KU;=Dzc<^Ij9SjCv!Do3& zJe{2=90)|Sr!eR+P^e_XVCyWyglx`sK!WrK0{8+dYM`(fh2(Ros7*v?th0~~@c8x- zBET(z!Qw=0=a9K5%k{{0VHBkU5RkBuVPKFzObMf+zWb#p?^9+B3i%x(*-l0MBg)g+ z6-kFg0FsDaYs$gla7YpvjU$>9@WeGpJQhd9V96L9))b4Q;II@t7WreLl+i@oZ4{=p z?T=W>7Zt^mNQ4v&CNwk@9ZEn$q5uqzOeSNncnltIszjKI!vzv{n5jT)^wWbiAm)hp zLJ1!dAg4UC{h<&E6{S@APYR&W+4+}af%r$ElqJK2v4t2M8jAtJsl2|U#S$j)uZ-WK z#jJ24fMEh+C`80j_G6pTPqMOh{~c%ws8mC-hBzT0Adom%Q&CC_n#<=>@V4ey8rjy& zmP9tk;cSRBBFW0e%GQ=dvtCQX+Yoswju~beyT;^H#Un-}jAiOZzVM_xRO0rg30N8}>%GB<&r`-F=86T0BCN%jHF)vySCgD*eNxJh;c2 zN`JD0;*{nxnygeUZ;!!h7pteb%RD-_T$YbXb|yA2$#~H^f$4%qJ_oc!r&_#RI=Q#` z__LatP47NF<1Y<*eFxbw>jplmCX=cdXl(R|4i@zsH@QY%;PvQDhQ`rl)r*f_fOqF< zJVhqh+qe1X2TcYQf9X?Ik0#>r*_1NrzRkHyp$$u}TaP-9+sEiH_FKF%X^R{iyL%VX z!CO~Y8`_0>xWTkZ$M|Hb#{=#7ipScOQp!VBb-f-q{e{?M{;r$CYN=sNezNqQSNO(V zZ}zb6$wsf2W*-Oy23JWxQwwXOE*Vw3sXlF|UMMx$Z+e)1jX5@U(PV#=54pB2!OLqy z?1O1X%Qcr*K}O9b+FblX8ThDw2|9Lt{$ZolZTjyyD`1N9TVFaa*LY$|mrD;2)7VM5D_$&8k4Jwv>56q}8%+qJJ7tOfpbiN%vy2{)yes9Hv zU48M5Z|%nEDfO8ar271b7gdGhxs6?PnXbyhoy8s$av+gl_> zW#chFY(Q^@1zg?4d+Sor_x`-Mgz_#QZ>!!yKRfHb&ETk?R{ZL%bMCrFV#nST6!w=f z9zI#5c{k8jmLKjSYR)2F`&_PBcWj7PZB#x}w0bsur)$}?Z@$;qAQbqzZLl+Ld~MBo zZX;G8C&yv#Kx`5pi zcmI5!m3Eql+Tpmc5^;V|H`&feO^aw|=9)F^U%<=>Q(VmDKS?nvaqK#km719^AFJv8 zlOw)($E5Sdbugf@zh!hh_jFoW!O$q{4Et?|kHMjF-=hX6xT-UG*-N&jFnkLdlNH3_ zWTzE;eek`A$w*IaaV?H`Rrc`YqV9JR)I#iN;Gx=N;gW;jPNqAwq#w`B_}Wk;yxM*5 zV_S~m_Ap>)^IDeL;Oleb%tAq`}rz9Ao&zSGU|;=WA!eCrM|l z$9(SrCy{RHdi7jHn^WAwt9eiLr00FF*3_RlP1YDX|Ad7K@FJJYc`lo)b|vzZjhs>a zxV4-&*DiO>4*Oe4ZpSwIiAxQmCqKqW;%0w}X`c_a5ZhsjFNM7Opb(c zD`EEuq9W@&!^o?4q@6AJe8;!2#JlPukcgg5mo6F&=*d2?@<_|2oH@<;fdng04W3~$ z;mpa+pU<`6ITWf!uKfWP!+N$Z9oLTtdeaNGwwH-JI@{LE^E)10eC1?xrb&Ecu1G}E zc+y`_8q;3@--b=suU;3K@E81cq)>Z=3w<~`U$IZ65{KJWUAhjCIbG>*KsOmh2^e3$ z?)wsM5Q7|>eoLxV<@j>24jP|69H(g~(}9Myd5J1o6L~eosD#Sogg7QzL>M*X788nO zVhl@Kk&=k0-}&U8%O>NEmpm($$IaNQBD@bwS|SV+A8R~Mwa+|b5S};h9l0s{HZ5b$ z0DAk^6jpx);Bb(3pd=~!ty;j}P4M#IG4JPVZ zT8g?DMHc#6v4!K(gB=N#=DSCXiCP9p5f6R5+!h%aT>eP;V2aoh{1@Irrs8mqVQ6}J zda}Y}(~b=9;mC=v;iV?8TSP}Dx5oS5*Lx}*S^j{V;8Crpr-bBAQYt=$T17|p^gh^H jGZI;U=veKp=?K`1PmlJgld8<7{^cBO7}l4q{9^tF`3-nl literal 1775 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 MGsV@R*ltJ6-&JU9@&Et; literal 1771 zcmV;P)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%S znMp)JR7efAR?UjkKoI`Y(@AD#(e)$>D;@+7b6mabZ9znsSuYDB_zYeJFM{CRH}C;` zfC(((#e)cY*@IWngAd?3jFU++iS;F0F%x=59Cr&U-Kp;Ws=Di^+Zzl9#rF0#X0sW9 z0-cT(_F<%NYzNlzzXM|oeBX!Xc~~qK$nzXomX&?}D^nhZVTqR{2`s_8-L8PQ$wN^T zNYk`jOyK!^UMk>BjuBLe29QaL*X#9QX*oHL<9dLTIGLa%T2A6WEhIRZJ7C+UCZ6RW zHIYuPy(!!O{p_7StsyMWw@E|uqWSyJ{V0D`uQ~Hwb#Arv96P07+B-N${3`ks@FEly zc>x;)K^ck~Vye*9j*lW>3wZexI35mNQ%aeJZ^s(gG^=8H-44c4gxMWn_5hIF!}E#6 z`nw3D`)(yvz;O1Ah3ReemSWyzR=fuUcLn@VMxRKI>;lO?@JtlDi1|Y9hJjQAPl|#h zizZcj0j)RJC3Ejdq8$qI@Bsc}`QHKdgMb;Hp^0 z+!TMfNd4Kr+=mUNB&5PTvz7D%$WP>Gc3vY7E}{6GAU~DautEKA?hf2kvQ`OP3V<&GOCFRHt$wJ5Zx0(+NvOR#rU~ zHtV^{Hf=*cgzd@&t#@eiCQ?v3s&tkkS2X+iFwj2NDIWVP?_>^=m?QL)I_W~ z4)LWsnNJJ8EEG)26#T%ipDL@KExI$d*&;>!D*?;%BA3LKdw{zj_HS?BKXohmnGpa0 N002ovPDHLkV1iE|WN!cf diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/ThermodynamicConductorUltimate.png index b6d1157e75c2c2f94c95373273aa590a86ce281f..58d9b1761124892a3ef6c3cc5641d632a6aa3640 100644 GIT binary patch literal 2595 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 WaS7nLSWYhgwz0joGs?E^P5UoFFKHS8 literal 1786 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 diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/UniversalCableAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/UniversalCableAdvanced.png index 6a5287e15ead3982a3091881c0371e025d867ebb..2ceb8a7480a969114bc823c14799e724d0121960 100644 GIT binary patch literal 2522 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 ZDi95+crCH93%~HUMRsx{UUdxG|2GTPL*D=Z literal 1944 zcmV;J2WR++P)4Tx0C?Jsl+SMzWf;dlyYtSh2{;E+0gJ(jKY)-zwqTG3L3g{$wouDv+hW_8 znCoMPiX1$ccrw9X5iY<%0|`MxY)DKvl=ve=5-x_+!%TMv zXvO#R%=3Pq@AvyW?~{Sd=T+Z#(-zEnp{kVf*7(GvmAOHhXIMiwYpQnO=gQ?FfU57i zJaX>+ObX!I_LcAd^Q@`Kz=qTlK(iLuvyeIlx@-F?1mhO4=V<7Mka-s9QsWbokjVmF z^(Za?T~kp!4s@x}No`@q40Cbh4CzWGcl~Ud+tLC)h%7op= zT>sBA>$aBlHUVpcnUO=lR!ALdsDVlxe_~gQBfyK0y6lJf3a}Ycf3#-Ca={irt|ajcdi^v~yrE#?Sk1c_{KG&Z<^rEXG`|s$wbP5r0c> zEaucV)T)I;zz)#&b0k$o(qsyWjmLc~DwN1$;iG6Wje|=GiHAhtq@H93XBAu-iHhS6 zqK?F45ru=j3MNvx9b=key~v7PA}jWaA+b;F5q((VHSxOGFA5?n`o!LLZ8@QDQRjA> z=UrMzEGir!f4aN1wWD`Zz3tdnPThH+y7`D_x$Gx70Rm>)$nDAgFU^0qp~G=qoO|oq z+Dr2se%yTZTl%7YUB9K@&=)!g{a1ZKU(j!m!^NeJWEP2oha^ZiNcM06myjwhzv0nL z;2uz%_D*+qZtN?k?#TCs?+tUZr<2Y8lKnG#J^N|)Z1(quro7^mw2!o}wC}aAwQsZ^ zv9$Br1?>mzqV}csZQ`v~-;eg&lS_0f@m8F*#5MEgM)L);U_NKQWDa%s%=KokIbd!v z3+Bf5yCwCKy*NzZwx_zXR)ibF!{I0rML-o7kK+&Re_Sm#iC!`I(AMq|dqvx&Q8Wrh z4$IhP^clUzK_l1kXKXPFMxU|8C_b=t_9`971S;9*cBYU7%%E_XL*f!3LwPI&=x_SR zl~Zqo*3NA96)WfauCxX{dqu^?E(ZvIGq81Kwu{h6GOt z0q;E`LY8GX=TKErO2imZ)z(TW(dl$3%aW?92)$m9q9|AthnZ2=HL8kpj>%+#a}EGA zLse(mB7%qj%<#J1E}<+-%CclU9=8mM$P6sYvZ+buNGV}vm>Drf%xuB6dA!hA0=V_- zFSwciUmdGDt+XbwkZ zFc|Rdrz6&0x=eZhJJL9k$_n3qmC@iXS2oYJ(sNWS8ItGuA#0W>#z((lwUR0&zw`#> z?hcnf&z6EW^z}iII_j|zG~V}~eT}$(2a5?Qo*~5%CXbz%nx^5L1VZ;*m&vG{7V(JW zt54#5KJ`8(eEvAYzqWbnqkk3{HXn_14(A+2Cnp3ajLl|EH80hp2Xt4rNeWhjsWN={ z2V2(#(?p7fCHP=#t)2S=yf}`8>YytZ(({?H`t&PE=OS5nfp9)zYFvEo5~-@NsO;Up z&3iXksD+52s;pdCA#_BjMHW(|I$`(jk61nBd+4swv4~X(S$&?t&d*%^>cWXE%5x#8 z>cZdxc=zKB$Y$qnKIs!yo&t3Y?)`KsIKXf?IW!PsJhos>%F^DSOw_TrbDL{hYo~%Y zYzmF%$FZmZ|N6rMXOaB}zn=-b89%Cu98Jw}Qt#elGKpNhxpF4YTLzYS-lCmb;r%Z- z6L@QerF6Cku6=p_KZ6785BCXmjIA*-KhOWKbg~X^V`IaLqF_88FJ*$NBFFSf)BPcY z)+Ct6TY4wYw|z>9`HQLfFCq&RU$~R2s-oBH9nKIOS)R?FD$AZN^DAo2cvRtoph>Z0 e6h%Q*Rs0Kk!P#kX@7Rq10000JY zBbM}J0i$ubEIb0iNgIaXlUWE99Jx@^B9KJ-|4=&pCz```1OCnT ze+qLvB3J;z4d5`t*%ayE0(BQcvG4>oK;|;p9!zHFVi$MPm|P}@#$-VWgzsI0ZuA5h zR3?wJ={tu+!aFiJTrz_KI1(*jQWZD|Qt@^eA`WeaF~-_qjZr9DtToQWmSAIp#-WH< z6C{SP$R#o<;dFq(UF1^#q-wl%?~i7j%Q1)ZF?ZM5dx9lQXp^p7o__H%jX}SiSc9=Ww17MkubuWB6rZxoR{g`Y zDPEJb$5;+5aLdBLKd6Qc;^!f1AOwmIbeMwg=0=Cab#r_YAi zZ5%p1akjdTao)Zv&+36#ysGtViGuzG0B`A76>XT}5EpiOkM+9kG8rREqPsYWwvF2w zJF>`Ct&C6 zt9gMJ9*#X!{rP$6G4J8uFQB}K%}esH!nb7#-10(SE??`MIF*TiRPHDDaaBi_ z*3CDW4>8)e`>dky-x?C$vLZHX9e_49*bQWUlsL_crYrSLkfq6SFcEWqdQs9UG%QUk z%~h9Zy!t={W3qe4C0!MDuXA5fteJw=`J|=@`ENmz{i-Tt^YfjzmP(#LmpH~ogryzy z6W7+vcF{tUiZm5xUSz)yjS4Z)=u`yb$!5VW;xmZr+O)al=1&f*mY_(=Fap}Qbz1Vl zaC42;x($j!p0W0c6_v|st7E4GaQ}x!-%Y*svWWKNGwOvuyHd*RA+SVeHFTLD~j2%!vZqiXj7}bwN^LxyIdYzRk_!Y-6$>D7;!oC=f z5Vkjt#cOlr5-csBjzvW9IwuI5jhTY`FYWsg^SQc|${Un8$ze^kBSN^UOl2y|VtCZU zbtHah-?bU98%oo+_Sbm#bIF&lJn-fh-X3wtpL|DKlYiGl*y(X(-c(+;S23+%t8?|5 z`Iya-4$&L?BHo;M;r_LTGI^=|(BsuNueOyGt`}Gd<=gd?b3Uu9-g~bo7k)PB^+Ua8 z(Cq_n+TmGPWX+X$vHFhmiJX$UgIn32eTo9BGxj^U2DIW0u5lV8tIJ(e2SKA?k#~wd z@{A@rEd?oTws>1Uo3&Rzw%j%x^OVhqE)48_>{Eqtrq?PYC-7C+ANT&@8z-MzJ}j=- zjDPO4d#YD*Sm`%ktG&mYR2&i@k<^nl8vDemF&TiJLw{s9UH_?|@mb_ROZrEl(q-X) zyoBZV><8o5xisB+lOYs@ho^ToS{Y&UbL&%I1KJl~}A1wBxT!-|&B!rna!E{MK3SR8G>;43=>gnyBDY$qs zX0$plnp}N=Ic^4fcY1bE>u3h&bd;EQC%;n~gD fqvP{i=9Q2T7yUBH1fhN5M-Jj>>q0EE@sIf%iRwQJ literal 1941 zcmV;G2Wt34Tx0C?Jsl+SMzWf;dlyYtSh2{;E+0gJ(jKY)-zwqTG3L3g{$wouDv+hW_8 znCoMPiX1$ccrw9X5iY<%0|`MxY)DKvl=ve=5-x_+!%TMv zXvO#R%=3Pq@AvyW?~{Sd=T+Z#(-zEnp{kVf*7(GvmAOHhXIMiwYpQnO=gQ?FfU57i zJaX>+ObX!I_LcAd^Q@`Kz=qTlK(iLuvyeIlx@-F?1mhO4=V<7Mka-s9QsWbokjVmF z^(Za?T~kp!4s@x}No`@q40Cbh4CzWGcl~Ud+tLC)h%7op= zT>sBA>$aBlHUVpcnUO=lR!ALdsDVlxe_~gQBfyK0y6lJf3a}Ycf3#-Ca={irt|ajcdi^v~yrE#?Sk1c_{KG&Z<^rEXG`|s$wbP5r0c> zEaucV)T)I;zz)#&b0k$o(qsyWjmLc~DwN1$;iG6Wje|=GiHAhtq@H93XBAu-iHhS6 zqK?F45ru=j3MNvx9b=key~v7PA}jWaA+b;F5q((VHSxOGFA5?n`o!LLZ8@QDQRjA> z=UrMzEGir!f4aN1wWD`Zz3tdnPThH+y7`D_x$Gx70Rm>)$nDAgFU^0qp~G=qoO|oq z+Dr2se%yTZTl%7YUB9K@&=)!g{a1ZKU(j!m!^NeJWEP2oha^ZiNcM06myjwhzv0nL z;2uz%_D*+qZtN?k?#TCs?+tUZr<2Y8lKnG#J^N|)Z1(quro7^mw2!o}wC}aAwQsZ^ zv9$Br1?>mzqV}csZQ`v~-;eg&lS_0f@m8F*#5MEgM)L);U_NKQWDa%s%=KokIbd!v z3+Bf5yCwCKy*NzZwx_zXR)ibF!{I0rML-o7kK+&Re_Sm#iC!`I(AMq|dqvx&Q8Wrh z4$IhP^clUzK_l1kXKXPFMxU|8C_b=t_9`971S;9*cBYU7%%E_XL*f!3LwPI&=x_SR zl~Zqo*3NA96)WfauCxX{dqbgc%an3QFPI1lwU}mUl zds{>h5rCGj-|rL3vZO3aCX>mWArWcGvMf6>=^QB~%nUOl#)z49T$|+!jU@p4{PePN z>RlwVD$I=aTkGvPc<<*fY<;;kcOH#K7m^N#!}k6D`}f;-?>(W(+j;nLXG%&5qG4)i zR4f`v6W4c!OTQD5ZUl>vD&?t{-h^7wI%0LC{Ckh1M|aNs&U=4SgXVBH*Q3#hA3hng z`SLZ&2S1S}kyKXr;j4^Cce%c^K9`~5(xeEKGSh|Qp7XJH=f4%{KWg1 z@cEM*|Fy>(AO6!(*laY;Ih=F!ikuLfFfnVJY8KVwhx9l0ND5YisdD`24|d-ZOcN;@ zmf+pp%}y^k=ZKR?sQ&B9PI^8SHlBS2DXx%(7YUalrpA@$uac??i^}1H+r0f1omz+p zs><5sH9{dmEz(Jm>Xd`KKV$WY-a~(r!Xj2BWa9-!`@eGI+so&wD9?qUs-3|F@YY8e zkhSOUKOPd+o&j}??)`EhIl%Gp^wdC%abdxll%>NznX2P(|28*wH!mb_)D#-e7pbTr z|L%hx<$-e_x5b=_yr3&ZcG&>Vtbsr;!_9udU?yoPlMY&&kfM@y-{lL_RmeQd%v7 zo8Mge-{b&C$47)Z#&%4Y+1xyz#hCF*%Z8bjDzbvmD~i)qd26u}R25m!D^2%@5auSq z?CM>*lV`n3DRri;nIR$_iFbB#RaFcIgVPy;Bg?b)S7q66%j^@iW-_kuLC~aFGJ3rp bRaNmXa(v>1Coc}F00000NkvXXu0mjfi>Ap; diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/UniversalCableElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/UniversalCableElite.png index e78f477563691b6cb104e028f307023f00b46f2e..2c8d7f89a3fde9c6a29e04455ceab102b8b4ee4d 100644 GIT binary patch literal 2533 zcmaJ@c|25mAD&3rlckMn3?JEMWf)_NnX!~9G8mDJaWKZr88b&S8BK{+aS8(2mI4jg1;fJSUs5}x7!E%e` z1KzP)Xv|nP(7BP5eEDEzw(hne&`v0LE&QG)e+6Mfa z@Bb7Q(020x^fo{M#_*Z4!G#$tgyIoNe1HLgd>RNw{pg}+1PFnG2#^OSk-l{eZtTb6 zhJr$Y$u|y_N_6K6AO@ESxRdP>G8Ghy6-vZAVJKD>6f)igkH=yucpHMVHN_fZL3SqK ztt~BWesIYkGlm0jpPf4P)jau@8t;mIPC0X}ON5bDAQIq+{~6Is8`#rc+|>S)7dK*Uw1HXI9un{b(WJ{Ub!M( zS);J+#AWVgO5up=Gn%Gtihg6S&6yd8&jTMiQg-gDNxJg6Sjrn0)>!<-j)5SWm$r{j z=G)DvEbq%Y$IMqG(QI?JjHj7}mio`@jEs(tXZxo1zqw|0;oecwQ~D9_t0AR6j!Ny( z1U;i;CD+OMnjc*#imiQh^78WL*SffGcjbBZD!p@MMMl2984wUaV`sa>5OW5xjg5`f zDWi`>866$|K{vgYUv2}C4({dgW}o8DMyCfl>3YbWC{z9;e%+d7`Ye@nv#IXiiX^j- zuF;m|sCs?v9Y5dg0Njwi8~d}HK#C#!UXgH#B2P z-oX0erfN!=@QvKa$?DQZW1rh9%@@+zOvEDC;I?q-&Gkd2%#T|0tk~Gj(N!ZWvfXW+ za5qkUOg$HRqbW&63A4)4{hC(}sn_wOAyUQe@K@fV&t6n3%G2V-N_VaUeOkQhbXwuk zkpvRBRM}{+@B8;l)t0NK+nI45D(a7iP zW6$s?i&dmI<4!F6#VJRYbqAEJ&6MH2!sh8K z{bfNXtzz&C`%_OQec*84l6w}~&jV-k$~PXwCsZXK*HKS9eE0Z{GZJpVa9uq~xya8) zvnbqKFqPN4FWk@)FN|X{y-iFz>TaO%PNvL?-NA_iiJFI=Lh%~(oWuaore~bchXz7Ig#xjT(Sag+RbaU_O5DRM;gq(@-v#&dK^MvwoG-*c2=>4q^&F4 zBXlYpr`x*!y!fV-I`ewO@fs?2Ma_~IhHAmnF&g*BloU7-kF@IzAF;gd#CrQzDt){f zneePXT>KTaoz0EeaLZxDzw%hxDv#z?w|vEz)(!lEQnZbSKk10hig@e+eIGA>1!_)0 zQ252MR5pM-y~SmFR!!c84q<8L+6M0|2QrydBYc^fAk8Kq%oTI~L)dBanym)KP?#1) z_^8N zjS9LCfJtwTthzg?64jrfW~wXkZfc)Oa`f4wRN{}tp3!*)AIs0VaklTTQlROzPWh6u zK+Hxtc?d8H($WvAhdz_dlTdq1j|1sSVIHM+Et`9*GtS-%_6{H3=g|h6macn2C{3;T zL;cW3xl_jPyGNsxUDCevPN=g8Wn}|J>>{O-22QW}bN|C9t(AN3pL{UUg|iK2!Pl29 zua9zZpqb>>9@PpFo!fb2ae|?E;6cJxIc@fBXiTYYu(qmBciETb24U``mCMiVUo;QDtiyt&zWJXkW>pA>g@TheR*E>aMNdY`i3;_fzz<$#b7S z3neX_=E~!V;MO%WT3y!?lLZDlPe=_bnTxmPGJ1TE0`>hyUYnkH*WQ*KOHQ72-MiPZ zBHC5HmN#=^x$DIp@8iBK35gY?uQrinf{|%%=lgn!W}1itweqgi=OXwbTZQdL{XK8X zs!Do_E>yQfv<>JGUR<8LLk7-gbSp+YnM`NkHfI>?KL-POt literal 1933 zcmV;82Xgp{P)4Tx0C?Jsl+SMzWf;dlyYtSh2{;E+0gJ(jKY)-zwqTG3L3g{$wouDv+hW_8 znCoMPiX1$ccrw9X5iY<%0|`MxY)DKvl=ve=5-x_+!%TMv zXvO#R%=3Pq@AvyW?~{Sd=T+Z#(-zEnp{kVf*7(GvmAOHhXIMiwYpQnO=gQ?FfU57i zJaX>+ObX!I_LcAd^Q@`Kz=qTlK(iLuvyeIlx@-F?1mhO4=V<7Mka-s9QsWbokjVmF z^(Za?T~kp!4s@x}No`@q40Cbh4CzWGcl~Ud+tLC)h%7op= zT>sBA>$aBlHUVpcnUO=lR!ALdsDVlxe_~gQBfyK0y6lJf3a}Ycf3#-Ca={irt|ajcdi^v~yrE#?Sk1c_{KG&Z<^rEXG`|s$wbP5r0c> zEaucV)T)I;zz)#&b0k$o(qsyWjmLc~DwN1$;iG6Wje|=GiHAhtq@H93XBAu-iHhS6 zqK?F45ru=j3MNvx9b=key~v7PA}jWaA+b;F5q((VHSxOGFA5?n`o!LLZ8@QDQRjA> z=UrMzEGir!f4aN1wWD`Zz3tdnPThH+y7`D_x$Gx70Rm>)$nDAgFU^0qp~G=qoO|oq z+Dr2se%yTZTl%7YUB9K@&=)!g{a1ZKU(j!m!^NeJWEP2oha^ZiNcM06myjwhzv0nL z;2uz%_D*+qZtN?k?#TCs?+tUZr<2Y8lKnG#J^N|)Z1(quro7^mw2!o}wC}aAwQsZ^ zv9$Br1?>mzqV}csZQ`v~-;eg&lS_0f@m8F*#5MEgM)L);U_NKQWDa%s%=KokIbd!v z3+Bf5yCwCKy*NzZwx_zXR)ibF!{I0rML-o7kK+&Re_Sm#iC!`I(AMq|dqvx&Q8Wrh z4$IhP^clUzK_l1kXKXPFMxU|8C_b=t_9`971S;9*cBYU7%%E_XL*f!3LwPI&=x_SR zl~Zqo*3NA96)WfauCxX{dq7r!Gzg_YiY$oY zCPV?9jbrcK?!0*v&TekKceW$(l~$V3?tb5o`M&qYt*@_JQ52MA2^ii7yw4B}37!xF z-g`uZEX#1tp{k^mh%ut7ohPM4p68ThNmW&Zq9_;+hxFkvGwQlVRdLQSo6T^}0bpjR zYWuZ_AR+)Q-)J-5E_+ev4N(rK2YG_m}8c7pZ zHpWZ;6On!di;ybinOEL{TG2XUb)@`fi@gW8kNwYke|QGX<|rnU2{%7IVC~Xn%6mVO zrjb-u`0?u;Ozv=H<4h+#M`6j3!C=savkdX!?^vy*N*P>ulX7R9%b#aU$s76lAV?i` zVFZo$#S3o`_ike`A;afM@c@&jj!jKda83eYbY{ftpgcUpBN(hci}Qm+?_|cJBO))rWcyqcw7iSe1~~mzZq-%GGbq9jl_jKnSYZYg_>Dev$!MyZ`>i zn6PpY)G@jH%ZcOw`}?!U24aj053EU9+Wm`}I(D~jacy($MDj*Wq49i?iW>6oJ|5yM zvUmTFQ;|0{rK-r$)GR{1bC=mHa`mf~Q+eJou*~z0?A!|Pf5EB9J3TC=(?xLY>$6Wx z4zRbsN2p`$w2AqC4nWbk^W=jk&vL>r&)ZQsKZ)j*psL7%T4}03gwW{(^P_j^Or9_M zlv1zTni(R}lX!0?S5-w(6pwodj%<*%SCwVgmiZ@Y&Gewc2SJl!$ruiYR8_@)lQ`1V T$&cx;00000NkvXXu0mjfv#`JT diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/UniversalCableUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/UniversalCableUltimate.png index ad77389c4087b594101923fa0a7ea3c9b26093c2..0966eb006f409760718151143f2cb5215b18c3f6 100644 GIT binary patch literal 2513 zcmaJ@c{o)2AD+l0ODV|`8lzGdvl`53h#AXVl$dNK#>|Pi%+k!!3^Q@HD6(9IN>@tZ z4lUZqPSGM-6l06aBuX{JwREH3=%)Mo^xlWSW(Y)i z1C#0x`g?j1=o}V;HjhCFSzHAh0@>^!>+rQUB1OqtcdV%5abe&NP$3r5MU7;UKkRM$K#PG3=)H}R3I$*(QJ?=v}E&57Zk_< zpUz`)K_-U{n^&ZTa-u*YT#@NNC9t^PW!e01ZBjH0DWq|cXas7$qy?a-=l_SYSl`in z&>Q$S-~TDhr$%!Dq&L9lMDgf~gWF>|ABsyL@cyg-Kb*sbkw{;= z2HWVzWHUGd{-&=SPfr4c%?D|0IzS;4;R+Q5lgS`pF?g~S8Rv|1!Qs$oXB^(j3g?W$ zx{&ZFCnqNx>jf^ELyuwsY;b|g_?PSQL+-pCSX@P9GQeZ*0~jtm4h#0RYy$JgxsZOS z_l?W=aW3Q^a*>K;kn@N8Ux&T0rEt*v^t*Kxi|^(K*b2w<6xKFAS=J7LKpiP$N2;)^ zIUva6%nrS|nzXE}`lP#2{4>kqS7Jj8mRZXR0zB$+*Icc#z9*Emu&bt;+_9b-+bj!#}>ZaF(PC~CSPD73T`5OvLl?1&EX=-#1OeBr*h zxLP2fl(jSMWJ-!=@viy@VteE*=?IXv+vLQ1_dH;ri}-i>QW$ zpD87&_ho3*y(WW1?-wIFCT>Tx71zP1Hz5I9$}cxGJGVCf+O>4Pw7vb}eZ|K zn)T-{4G#(o;Ht;%iz8hQX$jEVBLbig!t#e{f%==15GA^r_NDbn z{y77!>01n(RAyiZ=XlLIyJFp4LA#R&frIk4$7fSycq5W@k{$ z$QfeEz< z4brZ&le_h^E4-&O8kF8AZRbCN{o>>n=3IA9O1yt77pa$e#Pv(al&+^qFprHc=|jS8 zmQ?v%n4)WMw+m5DyyJ_0eP=n#(8CA&$1&TsJ0>eu2wNK;#wJd*Zs|h{%MLgEY=Pmw zy*#8O`b1AZ+c;hH`=1|XJNzG|X{E#yLakbE{uF{Tx-x%vRkzpJO^&xbvC^f7j~jHUdM(qLAjZ zzfy)=J1i8$`Q3Ojl9HDH+PG(_U2y0+sQOKKmKT{Ys69FIW>hbLl&*tQq8~EpzAibC zY8K23e9o%R8tiPI@SZ3L^U5la7i7L~_R)2ql1Z_uc%igm1JsGv}P8H773jX4$zvTM_p3A@Sp5uqnC8W1wh=lLp- zd|;7*-nnAzSd!{qOWEX1o+!2dv>d!{fvHahd>aVnR~`soo9J0Zc`sochrW|eT}nHB zc=GTL+r=w~$?2l!ov(WGX6i?mF;8{1zmk~q9^6v-GjcJmWKlR;P!OR1W_^CVxb?%1 z8833n~uyga3!4nEG$;k{W; z37cz(m3ejD?v`etvo_rBO3!HF!L%n)8#!*JMn`TUMjz{>vd+qy?S_&C$!q%Et4A+-Su)+;pL&1ReQIRtL_}hD!p6o|k`KEbpit=a3bn%>_lz_(?!MgVYM8U{&G?vR zgOJ~4VhfkfgL zBWdeZ4SzG1O(VF!Fdg|Tr=m5^=+#DdfO^0I8ikl>h($ literal 1937 zcmV;C2X6R@P)4Tx0C?Jsl+SMzWf;dlyYtSh2{;E+0gJ(jKY)-zwqTG3L3g{$wouDv+hW_8 znCoMPiX1$ccrw9X5iY<%0|`MxY)DKvl=ve=5-x_+!%TMv zXvO#R%=3Pq@AvyW?~{Sd=T+Z#(-zEnp{kVf*7(GvmAOHhXIMiwYpQnO=gQ?FfU57i zJaX>+ObX!I_LcAd^Q@`Kz=qTlK(iLuvyeIlx@-F?1mhO4=V<7Mka-s9QsWbokjVmF z^(Za?T~kp!4s@x}No`@q40Cbh4CzWGcl~Ud+tLC)h%7op= zT>sBA>$aBlHUVpcnUO=lR!ALdsDVlxe_~gQBfyK0y6lJf3a}Ycf3#-Ca={irt|ajcdi^v~yrE#?Sk1c_{KG&Z<^rEXG`|s$wbP5r0c> zEaucV)T)I;zz)#&b0k$o(qsyWjmLc~DwN1$;iG6Wje|=GiHAhtq@H93XBAu-iHhS6 zqK?F45ru=j3MNvx9b=key~v7PA}jWaA+b;F5q((VHSxOGFA5?n`o!LLZ8@QDQRjA> z=UrMzEGir!f4aN1wWD`Zz3tdnPThH+y7`D_x$Gx70Rm>)$nDAgFU^0qp~G=qoO|oq z+Dr2se%yTZTl%7YUB9K@&=)!g{a1ZKU(j!m!^NeJWEP2oha^ZiNcM06myjwhzv0nL z;2uz%_D*+qZtN?k?#TCs?+tUZr<2Y8lKnG#J^N|)Z1(quro7^mw2!o}wC}aAwQsZ^ zv9$Br1?>mzqV}csZQ`v~-;eg&lS_0f@m8F*#5MEgM)L);U_NKQWDa%s%=KokIbd!v z3+Bf5yCwCKy*NzZwx_zXR)ibF!{I0rML-o7kK+&Re_Sm#iC!`I(AMq|dqvx&Q8Wrh z4$IhP^clUzK_l1kXKXPFMxU|8C_b=t_9`971S;9*cBYU7%%E_XL*f!3LwPI&=x_SR zl~Zqo*3NA96)WfauCxX{dqDrf%xuoJS-#L%0=N|3 zW+CF@*Z9S+f6BgY*TMVlSHG|S*x8RpBTmC`IBeH1-hK7RzW0PCZztjV%_%7*h=!@5 zQL$(wOxk8n^51R7_imhc&U=4&2hHXo%9@sB}4K&Z^K!Jc>fQqR#K(p>z62ZcewmXwv@b) zuMdLMQ5Qzgct3dh72@~?78BBYiWCnpdE~^@GzI4*5c=o(Ob^P#OFV{r^>Lif5512G zpFhg}Kij&7!)0hyLm|Nx^C`Rrc@w#n!umX(C0# z61=mu*3JC`zBq}5>Oob`rRQT|^~slz;v!jij&MF=YFvC~om5p=RQ7IP=grTUy9*IP zRav>PLMTM2MdnhZI%W6fFIau3_t0OXu!vO&S$&q#&Tm}(^1_KK%5x#8>RjUjc;kZ% z$lCq49}WpCPk=f`w|+g99AJNcdSoER2r_?RP0G^V-%Qo9w{x9qTWhD1H)@i`^F=CZ z$iI58hm*kg&Yx!@Z)&Pz;3U+$x0p^NS3h4lljj`+%RKMM&aLp)r<{qr)5B6aTLjm> zIRDV(0OS2Jp^mX_6NYvAc?WkNnx7&o2)&|cN9E6avrq}DiY%y=rust&olY=2dY8`R z*|JY5&2?KdLqv`wzHBB}RmEU1IO-udvOH^lRhIp>%sx?TCI=Nh2$~d2Mz7bSsw(~m XZQaqg@U|xA00000NkvXXu0mjfb$z@y From aeecb5797890d694d9f04c2421437dbca2b01482 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 17 Apr 2016 23:12:33 -0400 Subject: [PATCH 44/62] Fixed internal multi blocks of Thermoelectric Boiler not updating --- .../mekanism/common/block/BlockBasic.java | 30 ++++++++++++++++-- .../tile/TileEntitySuperheatingElement.java | 18 +++++++++++ ...tmOn.png => SuperheatingElementOn-ctm.png} | Bin 3 files changed, 46 insertions(+), 2 deletions(-) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{SuperheatingElement-ctmOn.png => SuperheatingElementOn-ctm.png} (100%) diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index bcbcb39f2..f38df5e7f 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -34,6 +34,7 @@ import mekanism.common.tile.TileEntityInductionCasing; import mekanism.common.tile.TileEntityInductionCell; import mekanism.common.tile.TileEntityInductionPort; import mekanism.common.tile.TileEntityInductionProvider; +import mekanism.common.tile.TileEntityMultiblock; import mekanism.common.tile.TileEntityPressureDisperser; import mekanism.common.tile.TileEntitySecurityDesk; import mekanism.common.tile.TileEntityStructuralGlass; @@ -223,6 +224,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon ctms[4][2] = new CTMData("ctm/InductionProviderElite", this, Arrays.asList(3, 4)).registerIcons(register).setRenderConvexConnections(); ctms[4][3] = new CTMData("ctm/InductionProviderUltimate", this, Arrays.asList(3, 4)).registerIcons(register).setRenderConvexConnections(); ctms[5][0] = new CTMData("ctm/SuperheatingElement", this, Arrays.asList(5)).registerIcons(register).setRenderConvexConnections(); + ctms[5][1] = new CTMData("ctm/SuperheatingElementOn", this, Arrays.asList(5)).registerIcons(register).setRenderConvexConnections(); ctms[7][0] = new CTMData("ctm/BoilerCasing", this, Arrays.asList(7, 8)).registerIcons(register); ctms[8][0] = new CTMData("ctm/BoilerValve", this, Arrays.asList(7, 8)).registerIcons(register); @@ -241,6 +243,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon icons[4][2] = ctms[4][2].mainTextureData.icon; icons[4][3] = ctms[4][3].mainTextureData.icon; icons[5][0] = ctms[5][0].mainTextureData.icon; + icons[5][1] = ctms[5][1].mainTextureData.icon; icons[7][0] = ctms[7][0].mainTextureData.icon; icons[8][0] = ctms[8][0].mainTextureData.icon; @@ -291,6 +294,15 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon case 4: TileEntityInductionProvider tileEntity2 = (TileEntityInductionProvider)world.getTileEntity(x, y, z); return icons[meta][tileEntity2.tier.ordinal()]; + case 5: + TileEntitySuperheatingElement element = (TileEntitySuperheatingElement)world.getTileEntity(x, y, z); + + if(element.multiblockUUID != null && SynchronizedBoilerData.clientHotMap.get(element.multiblockUUID) != null) + { + return icons[meta][SynchronizedBoilerData.clientHotMap.get(element.multiblockUUID) ? 1 : 0]; + } + + return icons[meta][0]; default: return getIcon(side, meta); } @@ -373,8 +385,9 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon case BASIC_BLOCK_1: switch(meta) { - case 9: case 10: + return false; + case 9: case 11: TileEntityDynamicTank tileEntity = (TileEntityDynamicTank)world.getTileEntity(x, y, z); @@ -402,7 +415,9 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon { case 1: case 2: - TileEntityInductionCasing tileEntity = (TileEntityInductionCasing)world.getTileEntity(x, y, z); + case 7: + case 8: + TileEntityMultiblock tileEntity = (TileEntityMultiblock)world.getTileEntity(x, y, z); if(tileEntity != null) { @@ -1040,6 +1055,17 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon TileEntityInductionProvider tileEntity = (TileEntityInductionProvider)world.getTileEntity(x, y, z); return ctms[meta][tileEntity.tier.ordinal()]; } + else if(type == BasicType.SUPERHEATING_ELEMENT) + { + TileEntitySuperheatingElement element = (TileEntitySuperheatingElement)world.getTileEntity(x, y, z); + + if(element.multiblockUUID != null && SynchronizedBoilerData.clientHotMap.get(element.multiblockUUID) != null) + { + return ctms[meta][SynchronizedBoilerData.clientHotMap.get(element.multiblockUUID) ? 1 : 0]; + } + + return ctms[meta][0]; + } return ctms[meta][0]; } diff --git a/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java b/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java index 6bb80ad08..65fd819b9 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java +++ b/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java @@ -1,7 +1,13 @@ package mekanism.common.tile; +import java.util.ArrayList; + +import mekanism.api.Coord4D; +import mekanism.api.Range4D; +import mekanism.common.Mekanism; import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.multiblock.TileEntityInternalMultiblock; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.MekanismUtils; public class TileEntitySuperheatingElement extends TileEntityInternalMultiblock @@ -11,12 +17,24 @@ public class TileEntitySuperheatingElement extends TileEntityInternalMultiblock @Override public void setMultiblock(String id) { + boolean packet = false; + if(id == null && multiblockUUID != null) { SynchronizedBoilerData.clientHotMap.remove(multiblockUUID); + packet = true; + } + else if(id != null && multiblockUUID == null) + { + packet = true; } super.setMultiblock(id); + + if(packet && !worldObj.isRemote) + { + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + } } @Override diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElement-ctmOn.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElementOn-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElement-ctmOn.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElementOn-ctm.png From a95f231fcc64b42e306a96b69bdf01b6c64402cc Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Mon, 18 Apr 2016 14:06:33 -0400 Subject: [PATCH 45/62] Energy Cube fancy render --- .../client/model/ModelEnergyCube.java | 182 +++++------------- .../render/item/ItemRenderingHandler.java | 9 +- .../render/tileentity/RenderEnergyCube.java | 12 +- .../assets/mekanism/render/EnergyCube.png | Bin 0 -> 2954 bytes .../mekanism/render/EnergyCubeAdvanced.png | Bin 2959 -> 2423 bytes .../mekanism/render/EnergyCubeBasic.png | Bin 2961 -> 2428 bytes .../mekanism/render/EnergyCubeCreative.png | Bin 2938 -> 2415 bytes .../mekanism/render/EnergyCubeElite.png | Bin 2960 -> 2427 bytes .../mekanism/render/EnergyCubeUltimate.png | Bin 2960 -> 2424 bytes .../assets/mekanism/render/EnergyCube_Off.png | Bin 3928 -> 1242 bytes .../assets/mekanism/render/EnergyCube_On.png | Bin 3036 -> 1240 bytes 11 files changed, 60 insertions(+), 143 deletions(-) create mode 100644 src/main/resources/assets/mekanism/render/EnergyCube.png diff --git a/src/main/java/mekanism/client/model/ModelEnergyCube.java b/src/main/java/mekanism/client/model/ModelEnergyCube.java index 81816487f..fa38aa4a1 100644 --- a/src/main/java/mekanism/client/model/ModelEnergyCube.java +++ b/src/main/java/mekanism/client/model/ModelEnergyCube.java @@ -1,7 +1,9 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; +import mekanism.client.render.tileentity.RenderEnergyCube; import mekanism.common.SideData.IOState; +import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.model.ModelBase; @@ -9,6 +11,9 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.util.ForgeDirection; + +import org.lwjgl.opengl.GL11; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -62,6 +67,12 @@ public class ModelEnergyCube extends ModelBase ModelRenderer ledRight1; ModelRenderer ledLeft1; ModelRenderer ledLeft2; + + public ModelRenderer[] leds1; + public ModelRenderer[] leds2; + + public ModelRenderer[] ports; + public ModelRenderer[] connectors; public ModelEnergyCube() { @@ -332,9 +343,15 @@ public class ModelEnergyCube extends ModelBase ledLeft2.setTextureSize(64, 64); ledLeft2.mirror = true; setRotation(ledLeft2, 0F, 0F, 0F); + + leds1 = new ModelRenderer[] {ledBottom1, ledTop1, ledFront1, ledBack1, ledLeft1, ledRight1}; + leds2 = new ModelRenderer[] {ledBottom2, ledTop2, ledFront2, ledBack2, ledLeft2, ledRight2}; + + ports = new ModelRenderer[] {portBottomToggle, portTopToggle, portFrontToggle, portBackToggle, portLeftToggle, portRightToggle}; + connectors = new ModelRenderer[] {connectorBottomToggle, connectorTopToggle, connectorFrontToggle, connectorBackToggle, connectorLeftToggle, connectorRightToggle}; } - public void render(float size) + public void render(float size, EnergyCubeTier tier, TextureManager manager) { frame12.render(size); frame11.render(size); @@ -349,7 +366,6 @@ public class ModelEnergyCube extends ModelBase frame2.render(size); frame1.render(size); - MekanismRenderer.glowOn(); corner8.render(size); corner7.render(size); corner6.render(size); @@ -358,112 +374,41 @@ public class ModelEnergyCube extends ModelBase corner3.render(size); corner2.render(size); corner1.render(size); + + GL11.glPushMatrix(); + GL11.glScalef(1.0001F, 1.0001F, 1.0001F); + GL11.glTranslatef(0, -0.00011F, 0); + manager.bindTexture(RenderEnergyCube.resources.get(tier)); + MekanismRenderer.glowOn(); + + corner8.render(size); + corner7.render(size); + corner6.render(size); + corner5.render(size); + corner4.render(size); + corner3.render(size); + corner2.render(size); + corner1.render(size); + MekanismRenderer.glowOff(); + GL11.glPopMatrix(); } - @SuppressWarnings("incomplete-switch") - public void renderSide(float size, ForgeDirection side, IOState state, TextureManager renderer) + public void renderSide(float size, ForgeDirection side, IOState state, EnergyCubeTier tier, TextureManager renderer) { if(state != IOState.OFF) { - switch(side) + connectors[side.ordinal()].render(size); + ports[side.ordinal()].render(size); + + if(state == IOState.OUTPUT) { - case DOWN: - connectorBottomToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOn(); - } - - portBottomToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOff(); - } - - break; - case UP: - connectorTopToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOn(); - } - - portTopToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOff(); - } - - break; - case NORTH: - connectorFrontToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOn(); - } - - portFrontToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOff(); - } - - break; - case SOUTH: - connectorBackToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOn(); - } - - portBackToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOff(); - } - - break; - case WEST: - connectorLeftToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOn(); - } - - portLeftToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOff(); - } - - break; - case EAST: - connectorRightToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOn(); - } - - portRightToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOff(); - } - - break; + MekanismRenderer.glowOn(); + renderer.bindTexture(RenderEnergyCube.resources.get(tier)); + + ports[side.ordinal()].render(size); + + MekanismRenderer.glowOff(); } } @@ -474,39 +419,8 @@ public class ModelEnergyCube extends ModelBase MekanismRenderer.glowOn(); } - switch(side) - { - case DOWN: - ledBottom1.render(size); - ledBottom2.render(size); - - break; - case UP: - ledTop1.render(size); - ledTop2.render(size); - - break; - case NORTH: - ledFront1.render(size); - ledFront2.render(size); - - break; - case SOUTH: - ledBack1.render(size); - ledBack2.render(size); - - break; - case WEST: - ledLeft1.render(size); - ledLeft2.render(size); - - break; - case EAST: - ledRight1.render(size); - ledRight2.render(size); - - break; - } + leds1[side.ordinal()].render(size); + leds2[side.ordinal()].render(size); if(state == IOState.OUTPUT) { diff --git a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java index 95ce0ec47..38d3e7565 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -129,22 +129,23 @@ public class ItemRenderingHandler implements IItemRenderer { EnergyCubeTier tier = ((IEnergyCube)item.getItem()).getEnergyCubeTier(item); IEnergizedItem energized = (IEnergizedItem)item.getItem(); - mc.renderEngine.bindTexture(RenderEnergyCube.resources.get(tier)); + mc.renderEngine.bindTexture(RenderEnergyCube.baseTexture); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.0F, 0.0F); - energyCube.render(0.0625F); + energyCube.render(0.0625F, tier, mc.renderEngine); for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { - energyCube.renderSide(0.0625F, side, side == ForgeDirection.NORTH ? IOState.OUTPUT : IOState.INPUT, mc.renderEngine); + mc.renderEngine.bindTexture(RenderEnergyCube.baseTexture); + energyCube.renderSide(0.0625F, side, side == ForgeDirection.NORTH ? IOState.OUTPUT : IOState.INPUT, tier, mc.renderEngine); } GL11.glPushMatrix(); GL11.glTranslated(0.0, 1.0, 0.0); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "EnergyCore.png")); + mc.renderEngine.bindTexture(RenderEnergyCube.coreTexture); GL11.glShadeModel(GL11.GL_SMOOTH); GL11.glEnable(GL11.GL_BLEND); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java index 368a69eaf..c4239399d 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java @@ -30,6 +30,8 @@ public class RenderEnergyCube extends TileEntitySpecialRenderer private ModelEnergyCore core = new ModelEnergyCore(); public static Map resources = new HashMap(); + public static ResourceLocation baseTexture = MekanismUtils.getResource(ResourceType.RENDER, "EnergyCube.png"); + public static ResourceLocation coreTexture = MekanismUtils.getResource(ResourceType.RENDER, "EnergyCore.png"); static { if(resources.isEmpty()) @@ -52,7 +54,7 @@ public class RenderEnergyCube extends TileEntitySpecialRenderer GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); - bindTexture(resources.get(tileEntity.tier)); + bindTexture(baseTexture); switch(tileEntity.facing) { @@ -75,12 +77,12 @@ public class RenderEnergyCube extends TileEntitySpecialRenderer } GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - model.render(0.0625F); + model.render(0.0625F, tileEntity.tier, field_147501_a.field_147553_e); for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { - bindTexture(resources.get(tileEntity.tier)); - model.renderSide(0.0625F, side, tileEntity.configComponent.getOutput(TransmissionType.ENERGY, side.ordinal()).ioState, field_147501_a.field_147553_e); + bindTexture(baseTexture); + model.renderSide(0.0625F, side, tileEntity.configComponent.getOutput(TransmissionType.ENERGY, side.ordinal()).ioState, tileEntity.tier, field_147501_a.field_147553_e); } GL11.glPopMatrix(); @@ -89,7 +91,7 @@ public class RenderEnergyCube extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5); - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "EnergyCore.png")); + bindTexture(coreTexture); MekanismRenderer.blendOn(); MekanismRenderer.glowOn(); diff --git a/src/main/resources/assets/mekanism/render/EnergyCube.png b/src/main/resources/assets/mekanism/render/EnergyCube.png new file mode 100644 index 0000000000000000000000000000000000000000..558ed0bc1e80f16ae42397cfe7e8fb066967e4b6 GIT binary patch literal 2954 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 Jcy82;{{Xi+2ebeH delta 2308 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 ZR&fCRxROkP9qa%{M^D>8i>P5A`5!imJFWl# diff --git a/src/main/resources/assets/mekanism/render/EnergyCubeBasic.png b/src/main/resources/assets/mekanism/render/EnergyCubeBasic.png index cd1a4c924fe5af50acf34ccc3f92a05220c9f1f1..d96c1d6cc296ee6b87108876bf86ec6530162990 100644 GIT binary patch delta 1670 zcmb8vYdF&j7y$79{wx|riK5a-)`eXGkYsb2Rj7H+zg3yKwDbvv~#pHLm_{$Ft>C-Bk9}04gVtB|3&i<6ulTk z(cQoebP1?KPXV>)=5n^wHu)7#0RTGgY;Wrs(?6cGXRn^unm?HNbNV`Xdu408hYu~g z5V+=BkIJ5geN?%F)Y6!I{Q#jaRao2AwoXmfYyvMoq^JZ}emm}6iE;$vJ}y4LMowa| zO2@V9>muB}e4k}UMf8=`vE_s~vDKGB-j$m00q~WBQWK~MzyT@^06^fM>L-eQ7aBNL z7|f^FnYpsru(17jc=*Zr$cP9Ai^=T#{B>rgmN!P|?(gqsgzR;7Wt@2t zN#yYP{45(!e}4gWeq?0iE|ty6`*>Dm@>wLBXck#3ZEtT6Th*MJpRdC#E`Bs77PCLi zHJqeSCa04j(87JA5%FgSk2p1Q?%zM5%pVvKUFsetItsJ%^4J<08lbGXf^)FTc|npG z!s0F#QS9*NRL^x9mwb+sxzidOaUzN2B?gO)((@_w9<1NeZ#qmJ!@V#in?2(5(@Eh( zPFh+T-sTP^Hzo$Rc*6j1{$3o(CfUx{&=|4!D(|TNfdQXloTVk=>b;!YT#UAHm0)7Z zoy?U;?hCCFuxnXOnrf|&)!%ZYK*9p4G-yVDzCAE211KmcaILSeU;o4i-{65jqcui_ z7FiR0yk|yKc-#SNrrb_gWlhb{lnIYXYiVgYGslRFi^IR7{7F#Q^8lu}MBm7&FA^X# zb}Ub3P`6R**bV9F8O|)zpzrC!^*N@-KKCy^gW&0jw0G|UQw>TLn7cxiubcSxym~eI zU{D}PjoLv2X@i=Vh*UHpw-vas4`QLw$;}SY z6=>E?e)aY9i^Y0Ji>CXh&jL`u-G~-@t0O?hWpo@(87A%)P7?OoSX(C_{kB{kkMl@& zTC^s@CJ3ps0)h$}w+Roy1D;$kI3&b;PRaY=K|2Tl>p{R0;teuHv9C9E)(WW9I$?!m zIffD*zQXtx07rvP4woCsZB7qR#B&O#Mr)$SFK)7_j@+@4wW&e!rEYre!s1`WA*|1b z9te74R7r|g#Huju21$=}V#uFZT`MZ*(L>WB=QgBIaViA0pKWBrC9L0~usZNysA}uu zP*TtUGK15`+~W5u(~(b>QJ=g&ueLC(ehTa4v=Z*PYI8|T?-^7+Jw>Z=(0dTQL%Yo$ zNDoCO`LIx|dK@8-{7HISNXeXn>%iP%<{uxypEgDMq!fvV2bsg$hK6jrbKv>)%b?v{hJHuZ~5byxhU= z@W(&N6qyuMNib?NkE@eFAmU6toF+|?|isubG9yBH`yq= zGy01^b&4re!QR=GkdtU6$h2#|UeT01)0;vy6KC!OiX$`){*yicjJhgFqPyS~==MQhzNlCgY09ZqwR%;#fF;51T!r8&q JzT7S#{%`9b^Vk3Y delta 2155 zcmZ{hc|6qp7RP^M7$ajz$WoTd9Z`&Z?O{;Jnl)>qFhwIqwh6yMC07|sG1(&&p-IY^ zYndjQlr0a_7+H!e)8m;bOV^S+p6C8~@Ar@MJ?H&BpL5RZe79us_CJk*6ih%46+}QH z3*v?J;A)AuXcrfA#{!0sQNb2OsXzv*UQj1wB!oIuFezjKK?$s4fdLc^eq*X!1pqk2 z(GKmEIQ}ij!tJ2FY%ovcHsuC@zI8EAvr3_)2=~@CQ>IcKRIAj?&%V0o@$fC^fPSL+ zPuXEl;IW7B5e^*cXpdIzL93M;lY1qwJo|Wi+Jpryc0Fc&^N8U$wgpz#Vm^8P{d;yz zI2PN>XE2!#XU50J{lU28)YN6O=6Cb+^O24$YR5Q-Gs@?(nomsG7wH~9?zbJ> z-{0@EQ$9RAT(y}P6{S4_AcqeK?z|U=x`N+ zWc9l&eF-&fB80d!cNS*(-(Kd6$F_d{Jlo3QaOzWje7*BM{&jMYtCu1aGqVSlc_EP| znD!r|;esi*=oz9X{SH29ZuWf#GBEIj_iM@+#3NKz@*0olz8HnWt(IQ7bcy;snL02$ zoYyWn%V02iP%Jdqu|}z`X0W=ujoYLMKj}%#)i@cdRXT-2sgme0)$zVSzVBxp$hW+b zWJ@<}Fus@F%gm`xyn9wpQ%Ro0!UL&OvD~raq~Hmu1v67qUZOr(Y`x2a z;H31|&w)sf0YLX$=gQoP&_4-25>D5#i+*|oPB^t^5yR>?XUZiO9QPknXl!zO1|}5# z`rIRaxU-y0*4$96O+E2mzqYO}W!25qRqI5)_QjE-gL*dVmV3*^Ma2jo`d&=FW~ip&9GV*&V_D<%(b+%^ogv_Z;af;PZ{J={jAMcdT-Yl%myt{I6=zVhs9%rZ_f42{QGC> zi+GWk%TBuSa`dzJD@3B>-PK`m!lYGGYaE9~KOIbEr~b}Hk0ppS;N>yJf6OPvyC?qI zqV5HANTmHP=VjOSq@P!vL`oZdrT@T!;o(|JQn}F3Fkckqp7o(G+G#Zyi&H&8V*BLo zjdx^U^UXzA!{9Hc&ugEWiH+&840u!+gw_WX)z}}4yfmC=m3=j6>7jtW^)rg@EK;auxkUqD&y`P3J?c5V$^|o^xXdk?-pj;EaSyha;q0LnASm%7vUcG702T0zncm zOXwk8+NngA2(tHPLL5%!Y?UVS(|+(t73SCiRr3z3JEnE}$_74RcT_7<*mDy*N#DN5 z?#BmgXI-}?TH0y-@d;aD)&>4*@E?z3Exx4;y$lpJoZRZScbzE$EeWsIuy6-5Bos4? z4U2J+kWYQxpb_kpjqU;4!Kp97a+`daEY0n#yR(44roMv$Dp6O)-0u;c|NT|*>MuJR z7|>pbju|mNPvgY$*>txJ%lYaRq{k}&>b86hCf$68UOAIswjL2ON&pXqKywvx(D`HA z%@=qXkmW9g%bdR|I}C)5!0ubXyLp+e2>np-g?g~RI9xo(yDbtq$DKd=)z1fVctL` z@?1KomFm37`8D+#0kP{;z(hx*SaRqjth7E53s{&DaikBc`HD=yuDCAk1u)2p1Y9CT zG6sqoL~rPf21nb#rVUYLPrbF7#f;k;X&bLRKKi5A-+0KLKtROkK8+tH1 z?%#6gfyS;bs}IV*RV}wK61Kn#{=6ecUZn%NwVw@46P}$Ef7DIKN)x7egbHtPNYSdnE)v@w*|KWu-u*pk!|A^ z#zLo?lw$?q+%V9_Jq2r92^9F(To+N{F-}kPiEQ@c92oJwn_ORse{~onvP;#E5|4IG%L1YqG(l F{|CW_{u2NI diff --git a/src/main/resources/assets/mekanism/render/EnergyCubeCreative.png b/src/main/resources/assets/mekanism/render/EnergyCubeCreative.png index 4b9eb062d1820789719d4facc49a58f0d30c5b8a..c90b056715e99f0db31c4a5d5d918142e0f5fed6 100644 GIT binary patch delta 1738 zcmb7+e>~HPAICqR%@SW7*SXs&Ay=6~o3RJ! zd?9381lF76G4U~Oe{P-rY0GzldUEZW9SQ*eHn`i{BRH+^b#bTvE3)~y#JEYHm3b>ach72t zpyAJ;_MFCmYimY8I(UDVOSY`LnN}=)yxz(SvR3Y z<0N}IxJ_CSd4lpUId_p&G49-ZaU{gLDQ<)YfPevD1`vUdh5L8=9}00r;1is!t!?8v z7K=rt(F&C>Uc^hK(ol^?leDDKRKI*TJ3D`)slNVL_(DbKu3g#s*DqfDkiJj1SAIt# zc{-iF7J-=GH#j_8PH`+O*6a0Q+`*one21A|CZa+^AHl)Xh&5{@I-RbnrNyH%02u;@ z!;_j20m-SUb109pA~sh~>&z|hd}7qwc%&d7M}EAy2!%=xASbSTqrM(JWMPE2qU=K5Y`FqzD< z%z%aMZ>HO4RX2d@^J;ax`yQ?(qtY%2-&|xN~raK?0OjfNr+wpFu(Jk%~h1h#!r=k+-e&q7z@Ct41 z!7I_)$3qRAD7})uF80?hd10Z$e|uCwX`5H`*x0`nUntKg1up0O3LM8KC*MU{Sz11D zvm$~-3*%BWjSx(b-MRA|p2LQc>bUp^TFy`687+SQ3}_B;TSdUyoLE&CE^x>sGIdcb z7H3#i-D7hSIXid|p6i!HLLf6a`H(-e_Q7%dt(kX~LfV!qA)`b@svu6IZz7h6@=L94%Ca=&qyNlXN2i3-<8}R!QpTc z8)Gi8`fFbBtA`V#6S>#bB|BM@jSIae7dzo{4Nf4h!!6MVPvJ%zK4|^gPl@}E9^UTb zYVa_1B}_4pG5O(*GCW*%;y#;m+~KW5iNI;c^ho~xdCk!%>E5~#BhY9o4?(88PfSHJ z)qV|O!_uD)2lvmF*b!2hO%3H24ecI*tz6`RjV@O?HJejv0|n1tCQN;wYiRU2@wc!G z!&ef&*U%NpLs6&PM($a~Zuj{XVjk5ryCz`3?=e-NPOqO!N_;+_mWKj2o~yiclQK2? zfbBAEOJQEKG!428jXSn#E4!!Dp4^1)>NmboTwHDU&8PuHD`!Z> zV)Z)8hphEYQt8<*yYryD3tPE7&hde~RG0@C0ATRE_*~zxOK;0fkU(d1iU(n52oxcs z-hR5!E*G42tfnWQhTJyUW4lLb9K^aR*@*gC(sQJ`bdF)yu|12I#i*d>75(Re3i$Cb zOoV@o0RP~Q!BCW~K3&mdqrZW`guejpvWX2t1%D!F;HS?ARM65AdE27*4b*(#X*kq-8^`~HhU1zfp^;@KiO4d>I*LOLlD%w2mMAe}AKO^|VagJm# z#2AFEAtGw1kadnNl87vM(&@RLSG{=dSNHX~zrXLj{5}e8ik1gJQb!=tsooG=Y6zF= zDP)+Bzqz@NiEj|W&DZ^!307D7J5l!X^3c&j8=}!DO(PUaO-)tRP*YnCjny_%S3_$W z8J$(rI-9x)kwE?{(n9@GRLF&L`ssxIl}H*HM7VJ6x{imRd$7+nU&4Q<@c7>phQE57 zisn88E;4d80f2Yj1Z!Xu_U^+KQ%ebBL7E1RRxOC+J7{mJhuj|b>FU*hC{G{Y5jI@W z-M!^tE!;IZpL+D61Q)M9jZjT`cv=*gXD*`>~U=vP^8tWe@i#pkGj;>;{+mRsFC zeSRtH?a0zn*;IUDVj{UJbZNwT*rhS@(}y9Dla!Q%k>k2Uq0krRmzL~?zXxrhpM%5U z>=^WhhSB+5H4NsGzn_YtA~p~aQ=f`f*V3X_mzJ6{&CSg%@~!+=zSc8xiUxqPvND^k z@n&vz^v1FQGd(@MaixeP;OpgOy|}ZrZkyfBiR56Zsz6a=etvW1e(skXY#In9iPtch zwwse0?a;1*miG4c{q0XO`3a2fM6^J=P2zvv;h(CIgv-4mcG%9t;;##4isKu zKFT>)1If6~E({#5iC8b|nCgdiC8D9OS+?2F6K{%>yzG1w7$SmG0a7TEvYa+Q($^h$ zRr1cpS6og`j%LN(cOc~u=mAV>?zNceZOLEX-gaU-+=Zna+N1I47sckBYDfcm40-H; zZhSun8wb57+63sYJyw#Gl9783|K36}R5Usyr0^Y;D#?~YAWr%j_YD2mQnt+1|IIDd zLf~Y`G)*_6aLLKVC08hNd!zqzTzTN9bD5HOJl+O;)#}O@+Vf?>l~9CAj9j0cJ=Y&$ zY-}ta!S)s^(6O|%q%dM)d{9UFTMv9Wo4n9c?G&oC`hc!#_TmJxIE==uKkB!)Z@ark zyY=bwC2-;WNgZF;GO_qv8cl&w6Z(;+BWgl(PKC3>N$=k~Q+Qi~{@5a6uneGk>CLxo z@N1=C{Oj|6m$-}6>6&S=x9Q2&?cxUw(TCaLLLEP@90`JB7;SC;>95=s&Q^+wVxnao z_^`rGLs^}+n!38W`%Vm#?bW%9GBYvGv$6eE)z!q+$!Pt)iHZD<)Mm4qUFLw}AYfMM zeG&7AKh)vMl{HR7MMVYKgDvFP1}5DTX%(8dM6|oJb3r_zGP_9P3V3q1M)7ra-uqEavtw_=G&IGai%B zuo+CY7Ho~H7ztbt|MR7zfJXM7i>HPuC zS`XR;EmZf#X4apt+$k@Jtzz&Ga!xeuIm{wGv;H!-v^SjO>tdY%>%CLYUd*DcX*WmK9f3sw_s??Bs?Ke%8&b8Z!S5vVxymTjk z6^0^3FyKn<#>7d_@pL~b{Vjvq@zg>)U9F+Fz<$@yW#`Sz=^dZq)rLPu20vkYj_ONE zr+w+Cf6V#)DOg$dPql7Wr za9;h7GS(51-yGVb>#@>3pRi{FfjQwh83MfiF!&qQ?6qq|)Lg^bRAL4UASh8M3w_!` zSTmDPj*Y>HU*a*eb9~&er(yGR`t_Pn>aC~O#>PxPmLM$K@PJTjzsW!yr~^e1maQr( zeGry1GQ9eMvPqhqBmEWdfQ@kfH$QA8t1Gtq%y~^bYwZ_TlZ6jF3vi>zrL+JlAZ>&o z>?|w~n#$#i)DlWmxNn}OC4>u?TlY+kQe~*JN<|V|SY-l(!d0wGUssM2J&mvT$^+_-V# zwYXkOS=}6QI|Hb2a=na$+gUaY?eo__O?9>&@(?kbwR+Z_f->o`sghThui|^>q_8-) zJ$Ha2?MQUshzIaB%{z|JeHA|^%k%iNm8PJ1efI;{O774mTP-w+%YGC@`vOkE?gCA= zEX5;${b(m}ypL1tSZxe(3htI&S$gxrmi1xcpB*58Q3uK4PnPFJqMrk9i2cWI06hCi wc@RN$fDF}t3Gf{O47id155&SYEJ>meAT&_)8*HnJ7x*3~h8EbeGp^+S076A7^8f$< diff --git a/src/main/resources/assets/mekanism/render/EnergyCubeElite.png b/src/main/resources/assets/mekanism/render/EnergyCubeElite.png index 063f76d1def2f309aff940b1a7eb8bb840bf8fce..7c993a8e6d16284c29acb3cbe366f076d3b2c014 100644 GIT binary patch delta 1749 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 LN+n4`5>NaEM%4eA delta 2309 zcmZ{hc{tSX8pgk4GQt?5Wv0YXvV}2eFo>~*Y@H)Z!W2#RFvt?$$?{_&V~xrd<)pHu zCQE6NZDcvtvJ7JEM)uG&NA)|``Qu!@|Gd}xdG7mp?&o^Hi6$Q?_lKknL8Q|>Azo?0 zJgQpg5FbAa3%sc>Iq;&d>t$0z9qApS?BU^t$DJgo5pVsKNIH@mu0dl!3|Oy9Ldl%%9e4J}U>lxU6EC1Ba;w=i(Bm;U_uBYH)}zvcHQSl+k( znjt17G`hNK^FsY9(`I37tH#sH((*dX9|9ff>3J|fr{jA2dV0Pws0yxtb%c{s&J+@a z<+oCkVU$Bvbb9d8JK?>Dj?x61nwm2AE|L^FUn|R+Y3#j9Xh*$OdxA*io2kf&jh;*wOuk@n5E;*Z=(n8O#l0^LssY<{qZ zwWc`R8%f$Ax=-+CtW5p;wILu^J|KmPP%Uk5x0LDk5>;1McdbUO>PsdTRabv5Jg@-` z3l0v}&V`fSbIQ`0slPvrnttLf_~lE1%A!V#iV*_Y@+1d#0RYZ~yo})J|2j+j|zgmzx_*B9Rig zqb@FB*}&xv*?&>_gVa`gl9ZLqCU z6K-v7bu~ud@Ru=GbD2GUEd~`KW9f3g+ir4osIV(ctOL>&)36|UYa&#y?REIZ^${rL zMUbP{H-gt3y{vn1a1KmQTZqfh4PQ5}&i`=%9I$4G!?5ata#Q$YpCgf>=U4z?5z;(+ zF!Gc4n+uxSk|P~`rRXG|nTAqnq~b~?(2h{}01!I1n_kd;xAFEZit2+jyjJs8De+u8 zk9j3Wy8|Jxva(|Qee>&BeSvA>duM|6eEs&Wf=2C-AKm}50u>JmCqvyX+hHm)^rXiX zZ#*Pw88&ni@k&9chlw|$uV^4dE2ngMEK-2;V-yRm>&QY;sqYG>nUE(;YQ!9`xUdHMO3 zPbaamXmb_d1&{_zgf-ASxcRd8cGP>~ASOmh-^Ibrl$DwBj-2jdT27s0V|H4L?^ItJ zmuB^b?a%(M=D$=;t}gju_+Cm+LONr;FHI$TM3Pf*J9s!KEa3R6Qa|L@OK_X|&u^QO zwA^wIibs?Lppcsmp_^tx`y)R*k#RngKxn7|K`!UizU?JZsvL)!J^^6muqH@Mh>9rQ z;nBOLt~CGOPRMmDW0&x9WeKUFo3(tCx2MgKLz8gfyw zE!mJ2#R1eYigFcOzx!Tr03=Cr1a5ZF^YNX{B;rcKlf+)*ZzHqk284E>G zOjgu7_m6Id3FUi~5IZ*m*77?a4hUK{1KF@5F}f$O139bWsI`l|fTQ9x)Ba{boD^E> z)8l<^Z5JEKfa8m(riOUYm-n}wQYZw68-~@N?r~CgqDhLOZws1x2^G#3uh#%<*rYgbNYs23 z|6#^;2hn5HJ2!E$$71&r?x`rZb2)8SC5-5+^=w(plEksmk=c%@<(|5|E2t+x)2z^qw_94 Td9b1n*g2*~mWHMJ#HjxO5xgwE diff --git a/src/main/resources/assets/mekanism/render/EnergyCube_Off.png b/src/main/resources/assets/mekanism/render/EnergyCube_Off.png index ab0c1a48bfdbb3d6523ad383c1db44d044de0cc3..946c86d09d8f6edc80b515409a0ed73067bbfe18 100644 GIT binary patch literal 1242 zcmc&yO>7KN9Dk(|pFy284$lZBu{-l-ceZA9^#3P|DwnMXoMKnfBRQGn&cv23o$mEQ_TSi=6|VV< zoA@hNNw`>}#LW@XUzuKeFQLTiB@Rp^O4EWHJ5AdlMQ>Bk-m+Tkng_6va)|{?{ZY(0 zG{n@T*pfm>5X$M~?Z*py?vIbv?EF+W`nC4j@sSsgw9ku1&VC=AJU=##rXEPo o#-d%H4}+Kf^gqkIeeU2A0UVvGoBA+*F%8&BC)?CZEnP=`0v>*Cw*UYD literal 3928 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 diff --git a/src/main/resources/assets/mekanism/render/EnergyCube_On.png b/src/main/resources/assets/mekanism/render/EnergyCube_On.png index ee63030a094298543cd606575136458dbf02c6d1..e8b82f291dea9fd393e9b7093e4ca349fb41cccf 100644 GIT binary patch delta 559 zcmca3euHy^7*n*Vg{7gXfw7T+sj;!4p{tpbtA(Yrg_)6|i(q+L@zTl#R{s|5QpB$g-oe2W-hKqPHu*V1_luG9Ssf4olT6~EM1IU z4ULV>loX0ff>P70Qu32ab5rw5VCJU)&4=nW!liez5wlbM>L1e{F)%QCc)B=-RNQ)V z?IPzP0}+RdDre1_ykAOmJrHT~zS?*zJ(y!h(@V>MS>KFz)|$AxJlfHvE5N|yz`()4 zsKCI|z(6jio?;U~25=k@!{HF+Rj+p~3-a1^X8Ve*%Q|kXe;ZpjS5EVJ&U81v1+oSG z3)1fHzHj>Y)b;bWx5W3`=NN7&-TnRR?>{C?eP8$ue1oH=rOs!tFVdQ&MBb@08m_!q5uE@ delta 2369 zcmaizX*kq-8^`}+i+Lv7G$rdC=P*(-ri>ZV3=Pg?l8L5JAv=wI%l02jMY2~Ud&)Wn zDNB)^s7YnXo`%XY&q&!~bo6wd>w4at>$%_E-{1ZDyt(h+JF&4nmAeIO4jE!}4&$|q z&=?$EOUnprh{dCEhj1hVZSCzIPf|t()4fle&?S5N`P+LsIFU*E%G=37H#bM!zgf~h zuxUO5PUj3sS~xsb+X#)u82t3(u~-}leGH8z9X?Dlz!@qd{rpckIqN!lIRwz1JpKRc zcii^>%^Lp`n}!iI1bu}mj{!iGLM9nl29GS9H$5qDBAKJ@aj97p5+&(lv;>J%I-)UL zZzbma8;HznmtM_+8}+b6s|wUkO+S&in&lg-F^m+z>L`Ut7$W5s;fpcuYuyx=tK&Jd z*%f91gFj`NYn)=u!d+5#O?hX5!=HRZx%{Nl9hA zfq{Yhi8@$p*rZ9irlzJ1{{o#(r~Sxz{+v7%`n0k#xjS5_$Bga$<%7|{b{mDVf& zN}O*nt3M}x6E1~#zqn}rC_Fs8H2lklEAA5F;sP^d2z;!+zi?!5kT!7p_H-5w zy2L(>dTri&n4RqDYtP#{ zs}!z8&q>AS3BzZ73!(%vj0Yb0Ds!OQuXlUsoXz#GN8?T8R8i_`3^z-bpewC)7@^`i`HNH0?kNed zG`J)1;XpJdq4dPe<47N;X9hII5ZJxmICTV4lOe#En>nj`gkolC4!kYa<*IG+H&#o> zCnjjzyE25@u^^7cVoSO9=ooOwWycA$ zs$~Z0=*IVD5A8q`lWV-N(9n&Nncjej#?Yb)!FBFv?YP>I0ob@w_2h}3c}p|4PNHF> z<#P9OxO6=ss-$G!P-h*k!qOq*?rGwwt*5R&$A%A=VsFKF{Mku8aJ)ul*Up5l<>hRW ze7sToqw@{^#YzV15Qw~y;t@;n zo+N0!6j{iRd>-ZZa}9TUf&v4x#>dZ_V;tJia%F<1ksQ4Nr3r{BdW=&`W4Iv9zOT zSl-LilYJ*Q7u4B`wzrqQ7tGvGsSw;PI#~vuL_@>s(6`V0yU|RVLo_n|;#t*3_s;gZ+*O29$erUgql*W?xm% zp)Boxd-c?ayFo9{9IAm}h^0-M%;PfKzbV#!iV(dEvHbDvb0B7~V7tb!tfFFIW0U;6 z&v^PgPl|DlwWh^YT5$y71|rB*bD*RLU`dHHOdP_t!7=#`vM%a$pmD-rC~) zg-;_ai>_R~)X}+$PAQhr~U( zCmAEy-QN9b?p~35_2Ta|jV)_yiuwwlHTkq4jBr6&s)&%10?H6oja0?pBJ)N>l$=U|I}q8dDVslYB@>SyH!KR=d7xmP*O2$@9&E z*Y`CxL1Ra9V|RGG66q-{-@fxgxueyt`OEV5dOT^TJ|`x@Q?_!Zy<-<2X9U)q}?nty?cg6+(o0ecttEBVR>Zo3Ox`DMI4 zO&qf}7?jURc=6-eFC3;-lb@e|)@v>HZou0vv5Nw0zL9QB`!S!n#)FLE=BRrx)8qpg zefj0-Dt6MjC9W2(r(C6K))&_{zh@J|1czm>oo*6)0ys{-VK-F0&{NsdTyE2XAWrUc z7-ZUk(B^Wvy~IeX+Nk}&L(dzKjDY~7J47Jd3orj(sZL=GY zZ3$!yYPL@V3GD$cmRwAjJi=$+(hnugn^eC!$tPr4*NC-`*iSKnoEYzuyNNJ{n!>Oy z?+@daxTQ_6H_>B4DG-smuM43%-MU{k#)DgwOsO}Cwf^?9#vAxph+}G{bJF+eO3$eY zjVauMVLt=%;i#gSH-cym5mg5agptL75Q32>AZZCiLH}P!>RCI(fB+GnWnu<3H1&Y( NA{&{JDh%zS{sI Date: Tue, 19 Apr 2016 13:35:10 -0400 Subject: [PATCH 46/62] New assets and overlays! --- .../client/model/ModelDigitalMiner.java | 41 ++++++++++------ .../client/model/ModelEnergyCube.java | 6 +-- .../ModelPressurizedReactionChamber.java | 20 +------- .../client/model/ModelSecurityDesk.java | 35 ++++++++++---- .../render/block/BasicRenderingHandler.java | 6 ++- .../render/block/MachineRenderingHandler.java | 44 +++++++++--------- .../render/tileentity/RenderDigitalMiner.java | 2 +- .../render/tileentity/RenderSecurityDesk.java | 2 +- .../render/DigitalMiner_OverlayOff.png | Bin 0 -> 39435 bytes .../render/DigitalMiner_OverlayOn.png | Bin 0 -> 38491 bytes ...Cube_Off.png => EnergyCube_OverlayOff.png} | Bin ...gyCube_On.png => EnergyCube_OverlayOn.png} | Bin .../mekanism/render/MetallurgicInfuser.png | Bin 6958 -> 7015 bytes .../render/PressurizedReactionChamber.png | Bin 19243 -> 5167 bytes .../mekanism/render/SecurityDesk_Overlay.png | Bin 0 -> 12576 bytes 15 files changed, 86 insertions(+), 70 deletions(-) create mode 100644 src/main/resources/assets/mekanism/render/DigitalMiner_OverlayOff.png create mode 100644 src/main/resources/assets/mekanism/render/DigitalMiner_OverlayOn.png rename src/main/resources/assets/mekanism/render/{EnergyCube_Off.png => EnergyCube_OverlayOff.png} (100%) rename src/main/resources/assets/mekanism/render/{EnergyCube_On.png => EnergyCube_OverlayOn.png} (100%) create mode 100644 src/main/resources/assets/mekanism/render/SecurityDesk_Overlay.png diff --git a/src/main/java/mekanism/client/model/ModelDigitalMiner.java b/src/main/java/mekanism/client/model/ModelDigitalMiner.java index 7218fef36..77289d7ef 100644 --- a/src/main/java/mekanism/client/model/ModelDigitalMiner.java +++ b/src/main/java/mekanism/client/model/ModelDigitalMiner.java @@ -1,14 +1,24 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelDigitalMiner extends ModelBase { + public static ResourceLocation OVERLAY_ON = MekanismUtils.getResource(ResourceType.RENDER, "DigitalMiner_OverlayOn.png"); + public static ResourceLocation OVERLAY_OFF = MekanismUtils.getResource(ResourceType.RENDER, "DigitalMiner_OverlayOff.png"); + ModelRenderer keyboard; ModelRenderer keyboardBottom; ModelRenderer keyboardSupportExt1; @@ -411,8 +421,24 @@ public class ModelDigitalMiner extends ModelBase monitor3.mirror = true; setRotation(monitor3, 0.0872665F, 0.2094395F, 0F); } + + public void render(float size, boolean on, TextureManager manager) + { + render(size); + + GL11.glPushMatrix(); + manager.bindTexture(on ? OVERLAY_ON : OVERLAY_OFF); + GL11.glScalef(1.001F, 1.001F, 1.001F); + GL11.glTranslatef(0, -0.0011F, 0); + MekanismRenderer.glowOn(); + + render(size); + + MekanismRenderer.glowOff(); + GL11.glPopMatrix(); + } - public void render(float size, boolean on) + public void render(float size) { keyboard.render(size); keyboardBottom.render(size); @@ -425,25 +451,12 @@ public class ModelDigitalMiner extends ModelBase monitor3back.render(size); monitorBar1.render(size); monitorBar2.render(size); - - if(on) - { - MekanismRenderer.glowOn(); - } - led1.render(size); led2.render(size); led3.render(size); - monitor1.render(size); monitor2.render(size); monitor3.render(size); - - if(on) - { - MekanismRenderer.glowOff(); - } - monitorMount1.render(size); monitorMount2.render(size); frame1.render(size); diff --git a/src/main/java/mekanism/client/model/ModelEnergyCube.java b/src/main/java/mekanism/client/model/ModelEnergyCube.java index fa38aa4a1..334846a76 100644 --- a/src/main/java/mekanism/client/model/ModelEnergyCube.java +++ b/src/main/java/mekanism/client/model/ModelEnergyCube.java @@ -20,8 +20,8 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelEnergyCube extends ModelBase { - public static ResourceLocation LED_ON = MekanismUtils.getResource(ResourceType.RENDER, "EnergyCube_On.png"); - public static ResourceLocation LED_OFF = MekanismUtils.getResource(ResourceType.RENDER, "EnergyCube_Off.png"); + public static ResourceLocation OVERLAY_ON = MekanismUtils.getResource(ResourceType.RENDER, "EnergyCube_OverlayOn.png"); + public static ResourceLocation OVERLAY_OFF = MekanismUtils.getResource(ResourceType.RENDER, "EnergyCube_OverlayOff.png"); ModelRenderer frame12; ModelRenderer frame11; @@ -412,7 +412,7 @@ public class ModelEnergyCube extends ModelBase } } - renderer.bindTexture(state == IOState.OUTPUT ? LED_ON : LED_OFF); + renderer.bindTexture(state == IOState.OUTPUT ? OVERLAY_ON : OVERLAY_OFF); if(state == IOState.OUTPUT) { diff --git a/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java b/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java index af15410ab..4e0ae34a3 100644 --- a/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java +++ b/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java @@ -10,11 +10,9 @@ public class ModelPressurizedReactionChamber extends ModelBase { ModelRenderer frontDivider1; ModelRenderer base; - ModelRenderer port2b; ModelRenderer front; ModelRenderer bar1; ModelRenderer body; - ModelRenderer port1b; ModelRenderer bar5; ModelRenderer bar4; ModelRenderer bar3; @@ -38,13 +36,6 @@ public class ModelPressurizedReactionChamber extends ModelBase base.setTextureSize(128, 64); base.mirror = true; setRotation(base, 0F, 0F, 0F); - port2b = new ModelRenderer(this, 0, 6); - port2b.addBox(0F, 0F, 0F, 1, 8, 2); - port2b.setRotationPoint(7F, 12F, -4F); - port2b.setTextureSize(128, 64); - port2b.mirror = true; - setRotation(port2b, 0F, 0F, 0F); - port2b.mirror = false; front = new ModelRenderer(this, 48, 0); front.addBox(0F, 0F, 0F, 9, 11, 5); front.setRotationPoint(-2F, 9F, -7F); @@ -63,12 +54,6 @@ public class ModelPressurizedReactionChamber extends ModelBase body.setTextureSize(128, 64); body.mirror = true; setRotation(body, 0F, 0F, 0F); - port1b = new ModelRenderer(this, 0, 6); - port1b.addBox(0F, 0F, 0F, 1, 8, 2); - port1b.setRotationPoint(-8F, 12F, -4F); - port1b.setTextureSize(128, 64); - port1b.mirror = true; - setRotation(port1b, 0F, 0F, 0F); bar5 = new ModelRenderer(this, 0, 0); bar5.addBox(0F, 0F, 0F, 1, 1, 5); bar5.setRotationPoint(-5F, 10F, -7F); @@ -94,23 +79,20 @@ public class ModelPressurizedReactionChamber extends ModelBase bar2.mirror = true; setRotation(bar2, 0F, 0F, 0F); frontDivider2 = new ModelRenderer(this, 52, 20); + frontDivider2.mirror = true; frontDivider2.addBox(0F, 0F, 0F, 2, 12, 6); frontDivider2.setRotationPoint(-4F, 8.5F, -7.5F); frontDivider2.setTextureSize(128, 64); - frontDivider2.mirror = true; setRotation(frontDivider2, 0F, 0F, 0F); - frontDivider2.mirror = false; } public void render(float size) { frontDivider1.render(size); base.render(size); - port2b.render(size); front.render(size); bar1.render(size); body.render(size); - port1b.render(size); bar5.render(size); bar4.render(size); bar3.render(size); diff --git a/src/main/java/mekanism/client/model/ModelSecurityDesk.java b/src/main/java/mekanism/client/model/ModelSecurityDesk.java index ca1c4ad76..26fa88682 100644 --- a/src/main/java/mekanism/client/model/ModelSecurityDesk.java +++ b/src/main/java/mekanism/client/model/ModelSecurityDesk.java @@ -1,15 +1,23 @@ package mekanism.client.model; +import org.lwjgl.opengl.GL11; + +import mekanism.client.render.MekanismRenderer; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelSecurityDesk extends ModelBase { + public static ResourceLocation OVERLAY = MekanismUtils.getResource(ResourceType.RENDER, "SecurityDesk_Overlay.png"); + ModelRenderer deskTop; - ModelRenderer port; ModelRenderer deskBase; ModelRenderer led; ModelRenderer monitorBack; @@ -31,12 +39,6 @@ public class ModelSecurityDesk extends ModelBase 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); @@ -93,10 +95,25 @@ public class ModelSecurityDesk extends ModelBase setRotation(monitorScreen, -0.4712389F, 0F, 0F); } - public void render(float size) + public void render(float size, TextureManager manager) + { + doRender(size); + + GL11.glPushMatrix(); + manager.bindTexture(OVERLAY); + GL11.glScalef(1.001F, 1.001F, 1.001F); + GL11.glTranslatef(0, -0.0011F, 0); + MekanismRenderer.glowOn(); + + doRender(size); + + MekanismRenderer.glowOff(); + GL11.glPopMatrix(); + } + + private void doRender(float size) { deskTop.render(size); - port.render(size); deskBase.render(size); led.render(size); monitorBack.render(size); diff --git a/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java b/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java index 5a7278685..7b59fbfab 100644 --- a/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java @@ -21,6 +21,8 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class BasicRenderingHandler implements ISimpleBlockRenderingHandler { + private Minecraft mc = Minecraft.getMinecraft(); + public ModelSecurityDesk securityDesk = new ModelSecurityDesk(); @Override @@ -47,8 +49,8 @@ public class BasicRenderingHandler implements ISimpleBlockRenderingHandler 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); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SecurityDesk.png")); + securityDesk.render(0.0625F, mc.renderEngine); } if(type == BasicType.STRUCTURAL_GLASS) diff --git a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index e2d0dd061..3f77abf78 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -38,6 +38,8 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class MachineRenderingHandler implements ISimpleBlockRenderingHandler { + private Minecraft mc = Minecraft.getMinecraft(); + public ModelElectricPump electricPump = new ModelElectricPump(); public ModelMetallurgicInfuser metallurgicInfuser = new ModelMetallurgicInfuser(); public ModelChargepad chargepad = new ModelChargepad(); @@ -75,7 +77,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glTranslatef(0.0F, -0.85F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectricPump.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectricPump.png")); electricPump.render(0.0560F); } else if(type == MachineType.METALLURGIC_INFUSER) @@ -83,14 +85,14 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.0F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "MetallurgicInfuser.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "MetallurgicInfuser.png")); metallurgicInfuser.render(0.0625F); } else if(type == MachineType.CHARGEPAD) { GL11.glRotatef(180F, 1.0F, 0.0F, 0.0F); GL11.glTranslatef(0.0F, -1.1F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Chargepad.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Chargepad.png")); chargepad.render(0.0625F); } else if(type == MachineType.LOGISTICAL_SORTER) @@ -98,7 +100,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.0F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LogisticalSorter.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LogisticalSorter.png")); logisticalSorter.render(0.0625F, false); } else if(type == MachineType.DIGITAL_MINER) @@ -106,15 +108,15 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(-180F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.35F, 0.1F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "DigitalMiner.png")); - digitalMiner.render(0.022F, false); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "DigitalMiner.png")); + digitalMiner.render(0.022F, false, mc.renderEngine); } else if(type == MachineType.ROTARY_CONDENSENTRATOR) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.05F, -0.96F, 0.05F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "RotaryCondensentrator.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "RotaryCondensentrator.png")); rotaryCondensentrator.render(0.0625F); } else if(type == MachineType.CHEMICAL_OXIDIZER) @@ -122,7 +124,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.00F, 0.05F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalOxidizer.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalOxidizer.png")); chemicalOxidizer.render(0.0625F); } else if(type == MachineType.CHEMICAL_INFUSER) @@ -130,7 +132,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180f, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.0F, -0.96F, 0.05F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalInfuser.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalInfuser.png")); chemicalInfuser.render(0.0625F); } else if(type == MachineType.ELECTROLYTIC_SEPARATOR) @@ -138,7 +140,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(-90F, 0.0F, 1.0F, 0.0F); GL11.glTranslated(0.0F, -1.0F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectrolyticSeparator.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectrolyticSeparator.png")); electrolyticSeparator.render(0.0625F); } else if(type == MachineType.CHEMICAL_DISSOLUTION_CHAMBER) @@ -146,7 +148,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.05F, -0.96F, 0.05F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalDissolutionChamber.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalDissolutionChamber.png")); chemicalDissolutionChamber.render(0.0625F); } else if(type == MachineType.CHEMICAL_WASHER) @@ -154,7 +156,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.05F, -0.96F, 0.05F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalWasher.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalWasher.png")); chemicalWasher.render(0.0625F); } else if(type == MachineType.CHEMICAL_CRYSTALLIZER) @@ -162,7 +164,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.05F, -0.96F, 0.05F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalCrystallizer.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalCrystallizer.png")); chemicalCrystallizer.render(0.0625F); } else if(type == MachineType.SEISMIC_VIBRATOR) @@ -171,7 +173,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glScalef(0.6F, 0.6F, 0.6F); GL11.glTranslatef(0.0F, -0.55F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SeismicVibrator.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SeismicVibrator.png")); seismicVibrator.render(0.0625F); } else if(type == MachineType.PRESSURIZED_REACTION_CHAMBER) @@ -179,7 +181,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.05F, -0.96F, 0.05F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PressurizedReactionChamber.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PressurizedReactionChamber.png")); pressurizedReactionChamber.render(0.0625F); } else if(type == MachineType.FLUIDIC_PLENISHER) @@ -187,7 +189,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -0.85F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FluidicPlenisher.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FluidicPlenisher.png")); fluidicPlenisher.render(0.0560F); } else if(type == MachineType.LASER) @@ -195,7 +197,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -0.85F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Laser.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Laser.png")); laser.render(0.0560F); } else if(type == MachineType.LASER_AMPLIFIER) @@ -203,7 +205,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -0.85F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LaserAmplifier.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LaserAmplifier.png")); laserAmplifier.render(0.0560F); } else if(type == MachineType.LASER_TRACTOR_BEAM) @@ -211,7 +213,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -0.85F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LaserTractorBeam.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LaserTractorBeam.png")); laserAmplifier.render(0.0560F); } else if(type == MachineType.RESISTIVE_HEATER) @@ -219,7 +221,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.05F, -0.96F, 0.05F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ResistiveHeater.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ResistiveHeater.png")); resistiveHeater.render(0.0625F); } else if(type == MachineType.SOLAR_NEUTRON_ACTIVATOR) @@ -228,7 +230,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); GL11.glScalef(0.6F, 0.6F, 0.6F); GL11.glTranslatef(0.0F, -0.55F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SolarNeutronActivator.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SolarNeutronActivator.png")); solarNeutronActivator.render(0.0625F); } else { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java b/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java index a4eec471c..152d9e735 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java @@ -52,7 +52,7 @@ public class RenderDigitalMiner extends TileEntitySpecialRenderer } GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - model.render(0.0625F, tileEntity.isActive); + model.render(0.0625F, tileEntity.isActive, field_147501_a.field_147553_e); GL11.glPopMatrix(); if(tileEntity.clientRendering) diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSecurityDesk.java b/src/main/java/mekanism/client/render/tileentity/RenderSecurityDesk.java index 08f1e551a..1644afd11 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderSecurityDesk.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderSecurityDesk.java @@ -39,7 +39,7 @@ public class RenderSecurityDesk extends TileEntitySpecialRenderer } GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - model.render(0.0625F); + model.render(0.0625F, field_147501_a.field_147553_e); GL11.glPopMatrix(); } } diff --git a/src/main/resources/assets/mekanism/render/DigitalMiner_OverlayOff.png b/src/main/resources/assets/mekanism/render/DigitalMiner_OverlayOff.png new file mode 100644 index 0000000000000000000000000000000000000000..066761bcbe00c754acaf3e5bd0c2eb2fc07dd681 GIT binary patch literal 39435 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/render/DigitalMiner_OverlayOn.png b/src/main/resources/assets/mekanism/render/DigitalMiner_OverlayOn.png new file mode 100644 index 0000000000000000000000000000000000000000..a9cb86786531ea2ae380505f53fd3aa8c66f99b1 GIT binary patch literal 38491 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/render/EnergyCube_Off.png b/src/main/resources/assets/mekanism/render/EnergyCube_OverlayOff.png similarity index 100% rename from src/main/resources/assets/mekanism/render/EnergyCube_Off.png rename to src/main/resources/assets/mekanism/render/EnergyCube_OverlayOff.png diff --git a/src/main/resources/assets/mekanism/render/EnergyCube_On.png b/src/main/resources/assets/mekanism/render/EnergyCube_OverlayOn.png similarity index 100% rename from src/main/resources/assets/mekanism/render/EnergyCube_On.png rename to src/main/resources/assets/mekanism/render/EnergyCube_OverlayOn.png diff --git a/src/main/resources/assets/mekanism/render/MetallurgicInfuser.png b/src/main/resources/assets/mekanism/render/MetallurgicInfuser.png index a01c3a730e807b27f068551666f47044baf956f4..57c1b70ec6ab8eb870fe5b004f3cb177c8e6589f 100644 GIT binary patch delta 6285 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 Zs6j-xF(ZB03oPh-=xQ2j)TlW|{TJ`eY;gbp delta 6227 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 UnaQ;XKzbdrJ7)Xb+B^0?0mDt)k^lez literal 19243 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 diff --git a/src/main/resources/assets/mekanism/render/SecurityDesk_Overlay.png b/src/main/resources/assets/mekanism/render/SecurityDesk_Overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..ff8569d2ce9491a962a27ae8bd6cf2737655c13b GIT binary patch literal 12576 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 XJg=M^B@;#j*nid*cIM9yA^!Y7yDCa+ literal 0 HcmV?d00001 From d6bce421f4c793d8d464305478632d52e7723c35 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 19 Apr 2016 16:13:59 -0400 Subject: [PATCH 47/62] Oredictionificator GUI fixes --- .../mekanism/client/gui/GuiOredictionificator.java | 10 +++++----- .../client/render/block/PlasticRenderingHandler.java | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificator.java b/src/main/java/mekanism/client/gui/GuiOredictionificator.java index ccd659c88..f18638c1a 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificator.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificator.java @@ -70,7 +70,7 @@ public class GuiOredictionificator extends GuiMekanism public int getScroll() { - return Math.max(Math.min((int)(scroll*88), 88), 0); + return Math.max(Math.min((int)(scroll*73), 73), 0); } public int getFilterIndex() @@ -167,7 +167,7 @@ public class GuiOredictionificator extends GuiMekanism if(tileEntity.filters.get(getFilterIndex()+i) != null) { int yStart = i*22 + 18; - boolean mouseOver = xAxis >= 10 && xAxis <= 152 && yAxis >= yStart && yAxis <= yStart+22; + boolean mouseOver = xAxis > 10 && xAxis <= 152 && yAxis > yStart && yAxis <= yStart+22; if(mouseOver) { @@ -207,9 +207,9 @@ public class GuiOredictionificator extends GuiMekanism { if(tileEntity.filters.get(getFilterIndex()+i) != null) { - int yStart = i*29 + 18; + int yStart = i*22 + 18; - if(xAxis >= 10 && xAxis <= 152 && yAxis >= yStart && yAxis <= yStart+22) + if(xAxis > 10 && xAxis <= 152 && yAxis > yStart && yAxis <= yStart+22) { OredictionificatorFilter filter = tileEntity.filters.get(getFilterIndex()+i); @@ -231,7 +231,7 @@ public class GuiOredictionificator extends GuiMekanism if(isDragging) { - scroll = Math.min(Math.max((float)(yAxis-18-dragOffset)/88F, 0), 1); + scroll = Math.min(Math.max((float)(yAxis-18-dragOffset)/73F, 0), 1); } } diff --git a/src/main/java/mekanism/client/render/block/PlasticRenderingHandler.java b/src/main/java/mekanism/client/render/block/PlasticRenderingHandler.java index 8358af979..7a4131901 100644 --- a/src/main/java/mekanism/client/render/block/PlasticRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/PlasticRenderingHandler.java @@ -24,6 +24,7 @@ public class PlasticRenderingHandler implements ISimpleBlockRenderingHandler public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { boolean flag = false; + if(block == MekanismBlocks.GlowPlasticBlock) { Tessellator tessellator = Tessellator.instance; @@ -73,8 +74,10 @@ public class PlasticRenderingHandler implements ISimpleBlockRenderingHandler return flag; } + flag = renderer.renderStandardBlock(block, x, y, z); renderer.setRenderBoundsFromBlock(block); + return flag; } From 8b995f407fa721fefa47a8e8ad3a5ddd71c9640b Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 20 Apr 2016 19:08:06 -0400 Subject: [PATCH 48/62] Heat Generator and Restrictive Heater overlays --- .../client/model/ModelDigitalMiner.java | 6 ++-- .../client/model/ModelResistiveHeater.java | 28 ++++++++++++++++- .../render/block/MachineRenderingHandler.java | 2 +- .../tileentity/RenderResistiveHeater.java | 2 +- .../inventory/slot/SlotPersonalChest.java | 5 +++ .../client/BlockRenderingHandler.java | 16 +++++----- .../client/model/ModelHeatGenerator.java | 29 +++++++++++++++++- .../client/render/RenderHeatGenerator.java | 4 +-- .../mekanism/render/HeatGeneratorOn.png | Bin 6283 -> 0 bytes .../render/HeatGenerator_OverlayOff.png | Bin 0 -> 1985 bytes .../render/HeatGenerator_OverlayOn.png | Bin 0 -> 5265 bytes .../render/ResistiveHeater_OverlayOff.png | Bin 0 -> 1995 bytes .../render/ResistiveHeater_OverlayOn.png | Bin 0 -> 6433 bytes 13 files changed, 76 insertions(+), 16 deletions(-) delete mode 100644 src/main/resources/assets/mekanism/render/HeatGeneratorOn.png create mode 100644 src/main/resources/assets/mekanism/render/HeatGenerator_OverlayOff.png create mode 100644 src/main/resources/assets/mekanism/render/HeatGenerator_OverlayOn.png create mode 100644 src/main/resources/assets/mekanism/render/ResistiveHeater_OverlayOff.png create mode 100644 src/main/resources/assets/mekanism/render/ResistiveHeater_OverlayOn.png diff --git a/src/main/java/mekanism/client/model/ModelDigitalMiner.java b/src/main/java/mekanism/client/model/ModelDigitalMiner.java index 77289d7ef..072b199df 100644 --- a/src/main/java/mekanism/client/model/ModelDigitalMiner.java +++ b/src/main/java/mekanism/client/model/ModelDigitalMiner.java @@ -424,7 +424,7 @@ public class ModelDigitalMiner extends ModelBase public void render(float size, boolean on, TextureManager manager) { - render(size); + doRender(size); GL11.glPushMatrix(); manager.bindTexture(on ? OVERLAY_ON : OVERLAY_OFF); @@ -432,13 +432,13 @@ public class ModelDigitalMiner extends ModelBase GL11.glTranslatef(0, -0.0011F, 0); MekanismRenderer.glowOn(); - render(size); + doRender(size); MekanismRenderer.glowOff(); GL11.glPopMatrix(); } - public void render(float size) + private void doRender(float size) { keyboard.render(size); keyboardBottom.render(size); diff --git a/src/main/java/mekanism/client/model/ModelResistiveHeater.java b/src/main/java/mekanism/client/model/ModelResistiveHeater.java index 5533d83a4..d21e83eb5 100644 --- a/src/main/java/mekanism/client/model/ModelResistiveHeater.java +++ b/src/main/java/mekanism/client/model/ModelResistiveHeater.java @@ -1,13 +1,23 @@ package mekanism.client.model; +import org.lwjgl.opengl.GL11; + +import mekanism.client.render.MekanismRenderer; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelResistiveHeater extends ModelBase { + public static ResourceLocation OVERLAY_ON = MekanismUtils.getResource(ResourceType.RENDER, "ResistiveHeater_OverlayOn.png"); + public static ResourceLocation OVERLAY_OFF = MekanismUtils.getResource(ResourceType.RENDER, "ResistiveHeater_OverlayOff.png"); + ModelRenderer wallLeft; ModelRenderer base; ModelRenderer fin10; @@ -155,8 +165,24 @@ public class ModelResistiveHeater extends ModelBase portLeft.mirror = true; setRotation(portLeft, 0F, 0F, 0F); } + + public void render(float size, boolean on, TextureManager manager) + { + doRender(size); + + GL11.glPushMatrix(); + manager.bindTexture(on ? OVERLAY_ON : OVERLAY_OFF); + GL11.glScalef(1.001F, 1.001F, 1.001F); + GL11.glTranslatef(0, -0.0011F, 0); + MekanismRenderer.glowOn(); + + doRender(size); + + MekanismRenderer.glowOff(); + GL11.glPopMatrix(); + } - public void render(float size) + private void doRender(float size) { wallLeft.render(size); base.render(size); diff --git a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index 3f77abf78..e4ae995f7 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -222,7 +222,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.05F, -0.96F, 0.05F); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ResistiveHeater.png")); - resistiveHeater.render(0.0625F); + resistiveHeater.render(0.0625F, false, mc.renderEngine); } else if(type == MachineType.SOLAR_NEUTRON_ACTIVATOR) { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderResistiveHeater.java b/src/main/java/mekanism/client/render/tileentity/RenderResistiveHeater.java index fcc242677..df43ecd60 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderResistiveHeater.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderResistiveHeater.java @@ -38,7 +38,7 @@ public class RenderResistiveHeater extends TileEntitySpecialRenderer } GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - model.render(0.0625F); + model.render(0.0625F, tileEntity.isActive, field_147501_a.field_147553_e); GL11.glPopMatrix(); } } diff --git a/src/main/java/mekanism/common/inventory/slot/SlotPersonalChest.java b/src/main/java/mekanism/common/inventory/slot/SlotPersonalChest.java index 665008122..881c4fbc7 100644 --- a/src/main/java/mekanism/common/inventory/slot/SlotPersonalChest.java +++ b/src/main/java/mekanism/common/inventory/slot/SlotPersonalChest.java @@ -15,6 +15,11 @@ public class SlotPersonalChest extends Slot @Override public boolean canTakeStack(EntityPlayer player) { + if(inventory.getStackInSlot(getSlotIndex()) == null) + { + return false; + } + return MachineType.get(inventory.getStackInSlot(getSlotIndex())) != MachineType.PERSONAL_CHEST; } } diff --git a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java index e66e08718..dcf6f4324 100644 --- a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java +++ b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java @@ -25,6 +25,8 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class BlockRenderingHandler implements ISimpleBlockRenderingHandler { + private Minecraft mc = Minecraft.getMinecraft(); + public ModelAdvancedSolarGenerator advancedSolarGenerator = new ModelAdvancedSolarGenerator(); public ModelSolarGenerator solarGenerator = new ModelSolarGenerator(); public ModelBioGenerator bioGenerator = new ModelBioGenerator(); @@ -44,7 +46,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glTranslated(0.0F, -1.0F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "BioGenerator.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "BioGenerator.png")); bioGenerator.render(0.0625F); } else if(metadata == GeneratorType.ADVANCED_SOLAR_GENERATOR.meta) @@ -52,7 +54,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.0F, 0.2F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "AdvancedSolarGenerator.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "AdvancedSolarGenerator.png")); advancedSolarGenerator.render(0.022F); } else if(metadata == GeneratorType.SOLAR_GENERATOR.meta) @@ -60,15 +62,15 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); GL11.glTranslated(0.0F, -1.0F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SolarGenerator.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SolarGenerator.png")); solarGenerator.render(0.0625F); } else if(metadata == GeneratorType.HEAT_GENERATOR.meta) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glTranslated(0.0F, -1.0F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "HeatGenerator.png")); - heatGenerator.render(0.0625F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "HeatGenerator.png")); + heatGenerator.render(0.0625F, false, mc.renderEngine); } else if(metadata == GeneratorType.GAS_GENERATOR.meta) { @@ -76,7 +78,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(90F, -1.0F, 0.0F, 0.0F); GL11.glTranslated(0.0F, -1.0F, 0.0F); GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasGenerator.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasGenerator.png")); gasGenerator.render(0.0625F); } else if(metadata == GeneratorType.WIND_GENERATOR.meta) @@ -84,7 +86,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.0F, 0.4F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "WindGenerator.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "WindGenerator.png")); windGenerator.render(0.016F, 0); } else if(metadata != 2) diff --git a/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java b/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java index 2e717a9af..96b2afa3e 100644 --- a/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java @@ -1,13 +1,24 @@ package mekanism.generators.client.model; +import mekanism.client.render.MekanismRenderer; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelHeatGenerator extends ModelBase { + public static ResourceLocation OVERLAY_ON = MekanismUtils.getResource(ResourceType.RENDER, "HeatGenerator_OverlayOn.png"); + public static ResourceLocation OVERLAY_OFF = MekanismUtils.getResource(ResourceType.RENDER, "HeatGenerator_OverlayOff.png"); + ModelRenderer drum; ModelRenderer ring1; ModelRenderer ring2; @@ -130,8 +141,24 @@ public class ModelHeatGenerator extends ModelBase base.mirror = true; setRotation(base, 0F, 0F, 0F); } + + public void render(float size, boolean on, TextureManager manager) + { + doRender(size); + + GL11.glPushMatrix(); + manager.bindTexture(on ? OVERLAY_ON : OVERLAY_OFF); + GL11.glScalef(1.001F, 1.001F, 1.001F); + GL11.glTranslatef(0, -0.0011F, 0); + MekanismRenderer.glowOn(); + + doRender(size); + + MekanismRenderer.glowOff(); + GL11.glPopMatrix(); + } - public void render(float size) + private void doRender(float size) { drum.render(size); ring1.render(size); diff --git a/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java b/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java index 2a2d2d324..2c1886223 100644 --- a/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java @@ -27,7 +27,7 @@ public class RenderHeatGenerator extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, tileEntity.isActive ? "HeatGeneratorOn.png" : "HeatGenerator.png")); + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "HeatGenerator.png")); switch(tileEntity.facing) { @@ -38,7 +38,7 @@ public class RenderHeatGenerator extends TileEntitySpecialRenderer } GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - model.render(0.0625F); + model.render(0.0625F, tileEntity.isActive, field_147501_a.field_147553_e); GL11.glPopMatrix(); } } diff --git a/src/main/resources/assets/mekanism/render/HeatGeneratorOn.png b/src/main/resources/assets/mekanism/render/HeatGeneratorOn.png deleted file mode 100644 index d683512fd7b0c958996676ac62def59f0e9b2c01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6283 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/render/HeatGenerator_OverlayOn.png b/src/main/resources/assets/mekanism/render/HeatGenerator_OverlayOn.png new file mode 100644 index 0000000000000000000000000000000000000000..4d4e36e8827551849bd3de6a2bc224becafeed1b GIT binary patch literal 5265 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 C;R=rc literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/render/ResistiveHeater_OverlayOn.png b/src/main/resources/assets/mekanism/render/ResistiveHeater_OverlayOn.png new file mode 100644 index 0000000000000000000000000000000000000000..f84d08696990ac93505e796a52dbe97ab431cc48 GIT binary patch literal 6433 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 bM1jT@$K6!tHYd^-C_r0XPpwSFF5*7`V%oDc literal 0 HcmV?d00001 From 4436ca5b0146fd75dcc1061f9bbe865429b1133c Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 20 Apr 2016 19:57:29 -0400 Subject: [PATCH 49/62] Chargepad overlay --- .../mekanism/client/model/ModelChargepad.java | 28 +++++++++++++++++- .../render/block/MachineRenderingHandler.java | 2 +- .../render/tileentity/RenderChargepad.java | 2 +- .../mekanism/render/Chargepad_Overlay.png | Bin 0 -> 1652 bytes 4 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/assets/mekanism/render/Chargepad_Overlay.png diff --git a/src/main/java/mekanism/client/model/ModelChargepad.java b/src/main/java/mekanism/client/model/ModelChargepad.java index 658579891..7cb1679d7 100644 --- a/src/main/java/mekanism/client/model/ModelChargepad.java +++ b/src/main/java/mekanism/client/model/ModelChargepad.java @@ -1,13 +1,23 @@ package mekanism.client.model; +import mekanism.client.render.MekanismRenderer; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelChargepad extends ModelBase { + public static ResourceLocation OVERLAY = MekanismUtils.getResource(ResourceType.RENDER, "Chargepad_Overlay.png"); + ModelRenderer base; ModelRenderer port; ModelRenderer plug; @@ -64,8 +74,24 @@ public class ModelChargepad extends ModelBase pillar1.mirror = true; setRotation(pillar1, 0F, 0F, 0F); } + + public void render(float size, TextureManager manager) + { + doRender(size); + + GL11.glPushMatrix(); + manager.bindTexture(OVERLAY); + GL11.glScalef(1.001F, 1.001F, 1.001F); + GL11.glTranslatef(0, -0.0011F, 0); + MekanismRenderer.glowOn(); + + doRender(size); + + MekanismRenderer.glowOff(); + GL11.glPopMatrix(); + } - public void render(float size) + private void doRender(float size) { base.render(size); port.render(size); diff --git a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index e4ae995f7..68eeb63c3 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -93,7 +93,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 1.0F, 0.0F, 0.0F); GL11.glTranslatef(0.0F, -1.1F, 0.0F); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Chargepad.png")); - chargepad.render(0.0625F); + chargepad.render(0.0625F, mc.renderEngine); } else if(type == MachineType.LOGISTICAL_SORTER) { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java b/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java index 96c439baf..f01e85ec0 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java @@ -38,7 +38,7 @@ public class RenderChargepad extends TileEntitySpecialRenderer } GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - model.render(0.0625F); + model.render(0.0625F, field_147501_a.field_147553_e); GL11.glPopMatrix(); } } diff --git a/src/main/resources/assets/mekanism/render/Chargepad_Overlay.png b/src/main/resources/assets/mekanism/render/Chargepad_Overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..b964be49084a942710d48fa2ed8dc468a392dc8d GIT binary patch literal 1652 zcmb_ddpOez82(wd+xnv4OYBQR0$t7Vz*_=wQ2}8*J zo^T2!K{`lVSd*0`LzV~_F?~gCR_TqUVei?oM0EAE%Ozrl1^zY(> z>|r~?s}BHpg#t`WY*8jAingKGt^@>K1_0gUWCwSDIR|k>LztiP(E&`*>3cT{kwPj$ z>5ixKY4ybMah+f?N@q-o?#o^oc-%XntKG1jZ)0YQKed!A-qBnet*H91$X5hSGm~Fs zY*+gTwcMmo-*_9tkn52!SuRfXL6c24>aeMx}?@jSX^qn zq1waPII1Kh-w7?R=3Zn4(ylKHn_hd$s6+Gin`xiV?O}+hrAg53a-`v9t+q0axj~Mh-G@Yan#PJEKH+2EQ=pe%(;9s zS8;?Ixv8(@+_Zy8$ir_FIpqZhnWk=~U-uU`QJ$AoCmxAfh}B`iX4K;c;S29Dt)nHy z>77qn!#irvxU8@1^R^_^yXLHQhjMV3y!D0or87BwcOp%>TW=#TunD1*vp*K`bXF`` zeLwd_Rt8C;gA`B9H#cT4%y9g+4_XRJ!iNG%FJv~^`=9>Z93Ew!xU1+5YH>DIh zba}1ho|}&tG71I6(VHd1)4SD{#|M`eL$a=>};djs|NyMo``EYV0SxBlHsn2(9j*H2uD(vrW?)*A>FB zUF<-XjLYO5XrxrF-y->Hsl^fHAc@1!&^DcEw3pWUF+o0`bLi0+av6gIrD*0E$_x7_ ze1FMtYtnG!N#Im~Hmr9X9PAgbXB?Mzyk@Q2WGt3+)WkO_L&yH-8z)x2Ql`zkU4SS? zA0t*&F>EXnS5**B#eq0n`H`aFO1q_xJ`)7cr6IjwhETsmgyqL{Z<%tP6XcvFdVHbO z{T{0ne@xsM&P5i?oY+X+$kl2P5p&fz|AZsh(u7=F=4i~M&;YVrbWFE$u+-qY{S#na zR_s{i*H-zo3wVL4;h)Rw<}IyTQQO0d-#Wrd7u2Jx;rdUTCz&@sA&hoQ0Ka4+50!#< zu=U)z1^^%>l&P`(EuJ5v6(MaW#Q|HDtbowRuZ=8vAh1@5w4#YID*Lpj21B&hUVM7* zJ{Q-9e+3Z{>#Xy~qAVahAYMLEMWblo&kehlQ%3^z80Gz&G{b@~fq7f_<@FFY|Q-wVF}zA?YE$-||Wiy}Nr(HfXHt z&RAyn>OT+v(=#MNR?D3T8+W{h3HP;b?WmAPkJ(hnmtUsRq{};v}`M7{;u4UpF T>Ri~~Hvv#)7foNC^St{XhH=Ia literal 0 HcmV?d00001 From cf6b493d4cfcca90a3821d1b211442a003baf1a9 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 21 Apr 2016 22:48:42 -0400 Subject: [PATCH 50/62] Fixed Precision Sawmill not accepting muffling upgrade --- .../common/tile/TileEntityChanceMachine.java | 3 +++ .../assets/mekanism/render/resistiveHeater.png | Bin 4830 -> 0 bytes 2 files changed, 3 insertions(+) delete mode 100644 src/main/resources/assets/mekanism/render/resistiveHeater.png diff --git a/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java b/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java index cd7685160..11b4b87ef 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java @@ -6,6 +6,7 @@ import mekanism.api.EnumColor; import mekanism.api.transmitters.TransmissionType; import mekanism.common.MekanismItems; import mekanism.common.SideData; +import mekanism.common.Upgrade; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.machines.ChanceMachineRecipe; @@ -38,6 +39,8 @@ public abstract class TileEntityChanceMachineMg-4m0BG6brB^R!YQixvw7YoqR2?=mP`(W@gt{4w5e{ImhODagl%S{_(t7--_ z3(&`SdYuo$VJySUtIQhPVVk;Yu*> zmVOGFnf?Ewet!Q*2jVR-|K@(7b@l&Mmm3a# z0UXN)7@Suy#?1(a^^@7zHp1)QxoG?=-Va^3f9G=cUv;4zGElB_|Hs)smpBo`ef%eM zIWPYNKgORE@ifp06@_Eg27pyQOq*^8G_R zLdk~ZEkfc|x68*y4eZ=*zHv>Fj(iNhTi$vq?oh1TEwMvt$7~GtK6p@z&K^gMH(S+N zPWDv|`;U{PXP$-oTMrx{)>qfFW;Ns8E8ZU-tj0Pq`Pto`Dq&;e?dec*TcWhiO2-7t zzS>_kOgU34v|N02b!(IDOKeYrn6wE>BY)fMW<-%Zwd?BYtV8FAo={ zE$eRoO`4UIkmw*mi*bKX_qc!P$~8&=TQ7){^TXAx>x6|745VtrY3YJo_`!L>`AfL%>1j`E{|_}~ z3iKko5)!(F@uI=N+jehg38gZC#6LPkU0Yq4O$zUEIG2h=W&L1`xL(c4K*5=s-zJA06X1U7Z-#o=PN&N+MduV!P;tLfxAPGU?_0`J(8A&2@>B zqr2EwpQdFIi_fJ3^!ytNO==y&M{ZX6#0f{j-NX1Um2YHEna~*-RJT{clzDGBW9+bT z#X;{LCXy-Kja*(vSq;hZ-i1@%{pBNO6&3LC5jGtf`L@S@^ahtZIEW9XqSD_pfJOvE zn%A4q7Sgm>nQ54>3Z&_HFPYun}wDKKmkfGl?l<2kN(%nazw7U+~%Vt}hoZMzM&2TaI?JQ1WX1nto*YVR^rjXJ%)YOp?F zU^g$#E}vpAY}rc+vYn(J$WdSR_Oa>wcDbjA!%PXi(|?1KqN1V-cB%P)XxX~NxW$Wr zpm0J3Dhmq>@h>tzV~HF!KGoT~fRudrPx_mku6$EeL(|>n9zBDW0nBeh>q`7QK|h}5+Qegk6#&_Vmaq9 z&zVriNHGwU|7K=jaq}9FGvfSR#zsJ6^l>$aIH}>Yy3W#i5of(r=9yvB<9tj!agU3l zJODoaKw-};y3xXi?R#8WchFem(YTALbk$uRxe;}9cEN9#c2ikQdaK8)8_jJu-%67v zuHI3_+G^7Tfj*wCz^#~kX&){8=Y_SH>(dX&U+SdB`5SJqfPSHw!OE`3jLo>2_g3(L z%(9w<&Bm~;QkVQ_OPH@5?-{T*y~kYZ-N9qVk(+m8WV#H$wYN&6H^j%}^pI$|#z6<7 zR3Ilv(-wC%fJ=El@plTU_`2w5p+aB-@gIk+6K4)0r1%?D9vDrhg1#9uW>l4Q$$hbE zC4Wh_@e7hNMLmLK?4t57o?urJI}hwll+rFR#_jUX)Ght6&1x?;=zK#;8eI7G%kr`0 z)#5A93lv%%)Q7{?2rwHUPhTMNxIu{Ar+|r=jsV$|;~5_H47d%jk2kHhvMVC*ejxrK zQp9f8HI?4GB;TP*`Pu}^)*?!yq&nsHdEwS~#r73hKC@UD^|`of#7RP44I znVIo5dpxIsB3Y9XU-Pw&FIVDb5LW&5*hfm}>FW{lhb_EPo%4yEuqXA2_4V~duHA3# z(rfc4_IW**>T;rl^yDKFA@#xyAd;SN z9^1ITPGPR%x*lPDN^RK$>gW${DRFpNu+(%%v^7Ee2Tr z@m%rYBfyA@O(Ek&OdvSpM*cislarI< z7T3-S`cf9p2`^ekZZ;5WMn?sA=1wsgJC!jliB~R{@~4*q7|kuvUji+F#bdZ}qC0;c zVu(S=5aZIeLkML1$1Rjmzk@sjP^;z=0DGeH#KB17j-I=`9N@aeJfQLC_K3#ZPImyG zE)k}qPa~htAe*XGbooZGE)!d?sHi~5g3V$PR}APjgKF89{p}iKmbr7 z6F*-2LC6M}0Q!lYJkyzxKN)w!k?h>@htp$1So$xbMS!W=XD5oCia?}9BAb2+p9EctzXMm~SQj=M zxM!QjEw~IO`>gn4-SoAgb8x@W`j2f*+y>vKvS-g8A#6oSSL5RpW#+Vkw!_=RRY%6< zcDrWR8Tw4$)50YdlVM%!+Vn>j>QgCSmZ2v)Je*RX*?)}nJMUhfW3R8VLO(S`RVe_h z=U#oM6nVJxTGxPYB?}*4s`>Pk#unNX8`DbNW-zIarTA<4B7YD|sDV@Fu4SGPo}O|u zGW5QSU>T7ITNXMe>B|~=;$Y=fM(Awl@|Vua&9J43U)Y^BQb!C^UOoGDcJJsp^``>S zL{Q%q}Rm$SSRXL8vz ztFy22y#U7NI}KO)nWO;k)UJxgGmp*M@10r{{6_Gt^^)dmy!t*1;7{%3IF6^sH-sJx56# zh)-<(_10(X(EC!C#>&mH7cU75XK;+e)0V!I>&P+2jOb`z-_wi9!Tq8+=r%!*-v=V$$b@TU1}R5fjBe-B zL;XG>DO0tvwKKFWM4mO7&^1JBcHP!J*r}B{7jHn;6@`RAVj*^y4Yc~oY7+hBlimI4Ip`S+YOKCo zv3W=SzWB2(liK?$1T+jE|8Zx$fHEyQ4ZgKg9jthsoosIJ%n)sV>ge-4@`XY|Qf$@K z+bmfmQ0IjH#3=Hb*)Wau_(dg4H{VH4hPHHczWI5rUF=MkB@`V|uT~#H+v?9Lgalb< zkLG%Et43e1bI{293Xcb6CwnqT;Bbk1q6^962|=qNP5Rnpsr%WV!#!mk#m`;O4dDz^ zQL~A|)mU4$2}IUO{-A69;!DwD4#>v>KIFJjPe<@%B*~7{=_=`6^p~+y+=A(n}nCd?GmgeJIJRnwQhQX&HRE=~oHk z<3%Hl%1_d=#t}wF@QIX0Stwy#Ry-I<+PI5yFNyb%ykWhcT~a=dOhsi+RXr zl+%f8K)mPv3ef-9e66{JdsnDL4p&412~$hU&8tldor>|~)Ko>=Q^IMuF_-lqGvK5^ zHknLTXhdwRPye8s3m7kN)*4drPN=xCJFnnsY_a;lvmT5JPVOFdAnvj^hlKV&nXgaLy3>Ux6&) cZBb`nI{WvSK+NGv?mtc!49yKn^qg<}2W Date: Thu, 21 Apr 2016 22:49:02 -0400 Subject: [PATCH 51/62] Fixed Resistive Heater texture --- .../assets/mekanism/render/ResistiveHeater.png | Bin 0 -> 6361 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/mekanism/render/ResistiveHeater.png diff --git a/src/main/resources/assets/mekanism/render/ResistiveHeater.png b/src/main/resources/assets/mekanism/render/ResistiveHeater.png new file mode 100644 index 0000000000000000000000000000000000000000..3005d0b74a84dc6dda5e9e38a345695ead957680 GIT binary patch literal 6361 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 literal 0 HcmV?d00001 From 5c495de348b07d03b2d62af4989cc40a145ef777 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 21 Apr 2016 23:36:02 -0400 Subject: [PATCH 52/62] Fixed block placement checks --- src/main/java/mekanism/common/block/BlockBasic.java | 2 +- src/main/java/mekanism/common/block/BlockEnergyCube.java | 2 +- src/main/java/mekanism/common/block/BlockGasTank.java | 2 +- src/main/java/mekanism/common/block/BlockMachine.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index f38df5e7f..8b3b6c519 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -487,7 +487,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon if(world.isRemote) { - return true; + return false; } if(tile instanceof TileEntityThermalEvaporationController) diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index 8902bf29b..29ca4ad21 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -156,7 +156,7 @@ public class BlockEnergyCube extends BlockContainer { if(world.isRemote) { - return true; + return false; } TileEntityEnergyCube tileEntity = (TileEntityEnergyCube)world.getTileEntity(x, y, z); diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index 1e6082ebc..55bd3ee41 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -103,7 +103,7 @@ public class BlockGasTank extends BlockContainer { if(world.isRemote) { - return true; + return false; } TileEntityGasTank tileEntity = (TileEntityGasTank)world.getTileEntity(x, y, z); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 96f02c739..d25b17713 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -558,7 +558,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo { if(world.isRemote) { - return true; + return false; } TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z); From 9d50b8773b370394a0621c4bc883969fb9a258b8 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 21 Apr 2016 23:46:47 -0400 Subject: [PATCH 53/62] More fixes --- .../mekanism/common/block/BlockBasic.java | 118 ++++++++++-------- .../common/block/BlockEnergyCube.java | 2 +- .../mekanism/common/block/BlockGasTank.java | 2 +- .../mekanism/common/block/BlockMachine.java | 2 +- 4 files changed, 71 insertions(+), 53 deletions(-) diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 8b3b6c519..35f5946b1 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -484,17 +484,16 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon return true; } } - - if(world.isRemote) - { - return false; - } if(tile instanceof TileEntityThermalEvaporationController) { if(!entityplayer.isSneaking()) { - entityplayer.openGui(Mekanism.instance, 33, world, x, y, z); + if(!world.isRemote) + { + entityplayer.openGui(Mekanism.instance, 33, world, x, y, z); + } + return true; } } @@ -504,12 +503,15 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon if(!entityplayer.isSneaking()) { - if(owner == null || entityplayer.getCommandSenderName().equals(owner)) + if(!world.isRemote) { - entityplayer.openGui(Mekanism.instance, 57, world, x, y, z); - } - else { - SecurityUtils.displayNoAccess(entityplayer); + if(owner == null || entityplayer.getCommandSenderName().equals(owner)) + { + entityplayer.openGui(Mekanism.instance, 57, world, x, y, z); + } + else { + SecurityUtils.displayNoAccess(entityplayer); + } } return true; @@ -521,57 +523,63 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon if(entityplayer.getCurrentEquippedItem() != null && MekanismUtils.hasUsableWrench(entityplayer, x, y, z)) { - Item tool = entityplayer.getCurrentEquippedItem().getItem(); - - if(entityplayer.isSneaking()) + if(!world.isRemote) { - dismantleBlock(world, x, y, z, false); - return true; + Item tool = entityplayer.getCurrentEquippedItem().getItem(); + + if(entityplayer.isSneaking()) + { + dismantleBlock(world, x, y, z, false); + return true; + } + + if(MekanismUtils.isBCWrench(tool)) + { + ((IToolWrench)tool).wrenchUsed(entityplayer, x, y, z); + } + + int change = ForgeDirection.ROTATION_MATRIX[ForgeDirection.UP.ordinal()][bin.facing]; + + bin.setFacing((short)change); + world.notifyBlocksOfNeighborChange(x, y, z, this); } - - if(MekanismUtils.isBCWrench(tool)) - { - ((IToolWrench)tool).wrenchUsed(entityplayer, x, y, z); - } - - int change = ForgeDirection.ROTATION_MATRIX[ForgeDirection.UP.ordinal()][bin.facing]; - - bin.setFacing((short)change); - world.notifyBlocksOfNeighborChange(x, y, z, this); return true; } - if(bin.getItemCount() < bin.tier.storage) + if(!world.isRemote) { - if(bin.addTicks == 0 && entityplayer.getCurrentEquippedItem() != null) + if(bin.getItemCount() < bin.tier.storage) { - if(entityplayer.getCurrentEquippedItem() != null) + if(bin.addTicks == 0 && entityplayer.getCurrentEquippedItem() != null) { - ItemStack remain = bin.add(entityplayer.getCurrentEquippedItem()); - entityplayer.setCurrentItemOrArmor(0, remain); - bin.addTicks = 5; - } - } - else if(bin.addTicks > 0 && bin.getItemCount() > 0) - { - ItemStack[] inv = entityplayer.inventory.mainInventory; - - for(int i = 0; i < inv.length; i++) - { - if(bin.getItemCount() == bin.tier.storage) + if(entityplayer.getCurrentEquippedItem() != null) { - break; - } - - if(inv[i] != null) - { - ItemStack remain = bin.add(inv[i]); - inv[i] = remain; + ItemStack remain = bin.add(entityplayer.getCurrentEquippedItem()); + entityplayer.setCurrentItemOrArmor(0, remain); bin.addTicks = 5; } - - ((EntityPlayerMP)entityplayer).sendContainerAndContentsToPlayer(entityplayer.openContainer, entityplayer.openContainer.getInventory()); + } + else if(bin.addTicks > 0 && bin.getItemCount() > 0) + { + ItemStack[] inv = entityplayer.inventory.mainInventory; + + for(int i = 0; i < inv.length; i++) + { + if(bin.getItemCount() == bin.tier.storage) + { + break; + } + + if(inv[i] != null) + { + ItemStack remain = bin.add(inv[i]); + inv[i] = remain; + bin.addTicks = 5; + } + + ((EntityPlayerMP)entityplayer).sendContainerAndContentsToPlayer(entityplayer.openContainer, entityplayer.openContainer.getInventory()); + } } } } @@ -580,10 +588,20 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon } else if(tile instanceof IMultiblock) { + if(world.isRemote) + { + return true; + } + return ((IMultiblock)world.getTileEntity(x, y, z)).onActivate(entityplayer); } else if(tile instanceof IStructuralMultiblock) { + if(world.isRemote) + { + return true; + } + return ((IStructuralMultiblock)world.getTileEntity(x, y, z)).onActivate(entityplayer); } diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index 29ca4ad21..8902bf29b 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -156,7 +156,7 @@ public class BlockEnergyCube extends BlockContainer { if(world.isRemote) { - return false; + return true; } TileEntityEnergyCube tileEntity = (TileEntityEnergyCube)world.getTileEntity(x, y, z); diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index 55bd3ee41..1e6082ebc 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -103,7 +103,7 @@ public class BlockGasTank extends BlockContainer { if(world.isRemote) { - return false; + return true; } TileEntityGasTank tileEntity = (TileEntityGasTank)world.getTileEntity(x, y, z); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index d25b17713..96f02c739 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -558,7 +558,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo { if(world.isRemote) { - return false; + return true; } TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z); From 2838794ec3ab5d2f3d99f87b4e0e3fe3dc351f01 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 22 Apr 2016 07:56:15 -0400 Subject: [PATCH 54/62] Factory installers now maintain security --- .../common/tile/TileEntityAdvancedElectricMachine.java | 1 + .../mekanism/common/tile/TileEntityElectricMachine.java | 1 + src/main/java/mekanism/common/tile/TileEntityFactory.java | 1 + .../mekanism/common/tile/TileEntityMetallurgicInfuser.java | 1 + .../common/tile/component/TileComponentSecurity.java | 6 ++++++ 5 files changed, 10 insertions(+) diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java index a8e9b5584..821814659 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java @@ -123,6 +123,7 @@ public abstract class TileEntityAdvancedElectricMachine Date: Fri, 22 Apr 2016 23:15:18 -0400 Subject: [PATCH 55/62] Quantum Entangloporter model! --- .../java/mekanism/client/ClientProxy.java | 2 + .../model/ModelQuantumEntangloporter.java | 383 ++++++++++++++++++ .../render/block/MachineRenderingHandler.java | 10 + .../RenderQuantumEntangloporter.java | 48 +++ .../java/mekanism/common/CommonProxy.java | 1 + src/main/java/mekanism/common/Mekanism.java | 2 - .../mekanism/common/block/BlockMachine.java | 2 +- .../assets/mekanism/gui/GuiTeleporter.png | Bin 20127 -> 6367 bytes .../mekanism/render/QuantumEntangloporter.png | Bin 0 -> 5759 bytes .../render/QuantumEntangloporter_Overlay.png | Bin 0 -> 5181 bytes 10 files changed, 445 insertions(+), 3 deletions(-) create mode 100644 src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java create mode 100644 src/main/java/mekanism/client/render/tileentity/RenderQuantumEntangloporter.java create mode 100644 src/main/resources/assets/mekanism/render/QuantumEntangloporter.png create mode 100644 src/main/resources/assets/mekanism/render/QuantumEntangloporter_Overlay.png diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 0b68bc909..a8ae79c71 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -98,6 +98,7 @@ import mekanism.client.render.tileentity.RenderMetallurgicInfuser; import mekanism.client.render.tileentity.RenderObsidianTNT; import mekanism.client.render.tileentity.RenderPersonalChest; import mekanism.client.render.tileentity.RenderPressurizedReactionChamber; +import mekanism.client.render.tileentity.RenderQuantumEntangloporter; import mekanism.client.render.tileentity.RenderResistiveHeater; import mekanism.client.render.tileentity.RenderRotaryCondensentrator; import mekanism.client.render.tileentity.RenderSecurityDesk; @@ -318,6 +319,7 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityBoilerCasing.class, "BoilerCasing", new RenderThermoelectricBoiler()); ClientRegistry.registerTileEntity(TileEntityBoilerValve.class, "BoilerValve", new RenderThermoelectricBoiler()); ClientRegistry.registerTileEntity(TileEntitySecurityDesk.class, "SecurityDesk", new RenderSecurityDesk()); + ClientRegistry.registerTileEntity(TileEntityQuantumEntangloporter.class, "QuantumEntangloporter", new RenderQuantumEntangloporter()); } @Override diff --git a/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java b/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java new file mode 100644 index 000000000..4597cfeba --- /dev/null +++ b/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java @@ -0,0 +1,383 @@ +package mekanism.client.model; + +import mekanism.client.render.MekanismRenderer; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class ModelQuantumEntangloporter extends ModelBase +{ + public static ResourceLocation OVERLAY = MekanismUtils.getResource(ResourceType.RENDER, "QuantumEntangloporter_Overlay.png"); + + ModelRenderer portTop; + ModelRenderer portBottom; + ModelRenderer portLeft; + ModelRenderer portRight; + ModelRenderer portBack; + ModelRenderer portFront; + ModelRenderer energyCubeCore; + ModelRenderer frameEdge1; + ModelRenderer frameEdge2; + ModelRenderer frameEdge3; + ModelRenderer frameEdge4; + ModelRenderer frameEdge5; + ModelRenderer frameEdge6; + ModelRenderer frameEdge7; + ModelRenderer frameEdge8; + ModelRenderer frameEdge9; + ModelRenderer frameEdge10; + ModelRenderer frameEdge11; + ModelRenderer frameEdge12; + ModelRenderer frame1; + ModelRenderer frame2; + ModelRenderer frame3; + ModelRenderer frame4; + ModelRenderer frame5; + ModelRenderer frame6; + ModelRenderer frame7; + ModelRenderer frame8; + ModelRenderer frame9; + ModelRenderer frame10; + ModelRenderer frame11; + ModelRenderer frame12; + ModelRenderer corner1; + ModelRenderer corner2; + ModelRenderer corner3; + ModelRenderer corner4; + ModelRenderer corner5; + ModelRenderer corner6; + ModelRenderer corner7; + ModelRenderer corner8; + ModelRenderer portRightLarge; + ModelRenderer portLeftLarge; + + public ModelQuantumEntangloporter() + { + textureWidth = 128; + textureHeight = 64; + + portTop = new ModelRenderer(this, 36, 0); + portTop.addBox(0F, 0F, 0F, 8, 1, 8); + portTop.setRotationPoint(-4F, 8F, -4F); + portTop.setTextureSize(128, 64); + portTop.mirror = true; + setRotation(portTop, 0F, 0F, 0F); + portBottom = new ModelRenderer(this, 36, 9); + portBottom.addBox(0F, 0F, 0F, 8, 1, 8); + portBottom.setRotationPoint(-4F, 23F, -4F); + portBottom.setTextureSize(128, 64); + portBottom.mirror = true; + setRotation(portBottom, 0F, 0F, 0F); + portLeft = new ModelRenderer(this, 0, 0); + portLeft.addBox(0F, 0F, 0F, 1, 8, 8); + portLeft.setRotationPoint(-8F, 12F, -4F); + portLeft.setTextureSize(128, 64); + portLeft.mirror = true; + setRotation(portLeft, 0F, 0F, 0F); + portRight = new ModelRenderer(this, 0, 0); + portRight.mirror = true; + portRight.addBox(0F, 0F, 0F, 1, 8, 8); + portRight.setRotationPoint(7F, 12F, -4F); + portRight.setTextureSize(128, 64); + setRotation(portRight, 0F, 0F, 0F); + portBack = new ModelRenderer(this, 18, 9); + portBack.addBox(0F, 0F, 0F, 8, 8, 1); + portBack.setRotationPoint(-4F, 12F, 7F); + portBack.setTextureSize(128, 64); + portBack.mirror = true; + setRotation(portBack, 0F, 0F, 0F); + portFront = new ModelRenderer(this, 18, 0); + portFront.addBox(0F, 0F, 0F, 8, 8, 1); + portFront.setRotationPoint(-4F, 12F, -8F); + portFront.setTextureSize(128, 64); + portFront.mirror = true; + setRotation(portFront, 0F, 0F, 0F); + energyCubeCore = new ModelRenderer(this, 0, 41); + energyCubeCore.addBox(-2F, -2F, -2F, 4, 4, 4); + energyCubeCore.setRotationPoint(0F, 16F, 0F); + energyCubeCore.setTextureSize(128, 64); + energyCubeCore.mirror = true; + setRotation(energyCubeCore, 0.7132579F, 0.403365F, 0.645384F); + frameEdge1 = new ModelRenderer(this, 0, 16); + frameEdge1.addBox(0F, 0F, 0F, 1, 10, 1); + frameEdge1.setRotationPoint(-7.5F, 11F, -7.5F); + frameEdge1.setTextureSize(128, 64); + frameEdge1.mirror = true; + setRotation(frameEdge1, 0F, 0F, 0F); + frameEdge2 = new ModelRenderer(this, 0, 16); + frameEdge2.addBox(0F, 0F, 0F, 1, 10, 1); + frameEdge2.setRotationPoint(6.5F, 11F, -7.5F); + frameEdge2.setTextureSize(128, 64); + frameEdge2.mirror = true; + setRotation(frameEdge2, 0F, 0F, 0F); + frameEdge3 = new ModelRenderer(this, 0, 16); + frameEdge3.addBox(0F, 0F, 0F, 1, 10, 1); + frameEdge3.setRotationPoint(-7.5F, 11F, 6.5F); + frameEdge3.setTextureSize(128, 64); + frameEdge3.mirror = true; + setRotation(frameEdge3, 0F, 0F, 0F); + frameEdge4 = new ModelRenderer(this, 0, 16); + frameEdge4.addBox(0F, 0F, 0F, 1, 10, 1); + frameEdge4.setRotationPoint(6.5F, 11F, 6.5F); + frameEdge4.setTextureSize(128, 64); + frameEdge4.mirror = true; + setRotation(frameEdge4, 0F, 0F, 0F); + frameEdge5 = new ModelRenderer(this, 4, 27); + frameEdge5.addBox(0F, 0F, 0F, 10, 1, 1); + frameEdge5.setRotationPoint(-5F, 22.5F, -7.5F); + frameEdge5.setTextureSize(128, 64); + frameEdge5.mirror = true; + setRotation(frameEdge5, 0F, 0F, 0F); + frameEdge6 = new ModelRenderer(this, 4, 16); + frameEdge6.addBox(0F, 0F, 0F, 1, 1, 10); + frameEdge6.setRotationPoint(-7.5F, 22.5F, -5F); + frameEdge6.setTextureSize(128, 64); + frameEdge6.mirror = true; + setRotation(frameEdge6, 0F, 0F, 0F); + frameEdge7 = new ModelRenderer(this, 4, 16); + frameEdge7.addBox(0F, 0F, 0F, 1, 1, 10); + frameEdge7.setRotationPoint(6.5F, 22.5F, -5F); + frameEdge7.setTextureSize(128, 64); + frameEdge7.mirror = true; + setRotation(frameEdge7, 0F, 0F, 0F); + frameEdge8 = new ModelRenderer(this, 4, 27); + frameEdge8.addBox(0F, 0F, 0F, 10, 1, 1); + frameEdge8.setRotationPoint(-5F, 22.5F, 6.5F); + frameEdge8.setTextureSize(128, 64); + frameEdge8.mirror = true; + setRotation(frameEdge8, 0F, 0F, 0F); + frameEdge9 = new ModelRenderer(this, 4, 27); + frameEdge9.addBox(0F, 0F, 0F, 10, 1, 1); + frameEdge9.setRotationPoint(-5F, 8.5F, -7.5F); + frameEdge9.setTextureSize(128, 64); + frameEdge9.mirror = true; + setRotation(frameEdge9, 0F, 0F, 0F); + frameEdge10 = new ModelRenderer(this, 4, 16); + frameEdge10.addBox(0F, 0F, 0F, 1, 1, 10); + frameEdge10.setRotationPoint(-7.5F, 8.5F, -5F); + frameEdge10.setTextureSize(128, 64); + frameEdge10.mirror = true; + setRotation(frameEdge10, 0F, 0F, 0F); + frameEdge11 = new ModelRenderer(this, 4, 16); + frameEdge11.addBox(0F, 0F, 0F, 1, 1, 10); + frameEdge11.setRotationPoint(6.5F, 8.5F, -5F); + frameEdge11.setTextureSize(128, 64); + frameEdge11.mirror = true; + setRotation(frameEdge11, 0F, 0F, 0F); + frameEdge12 = new ModelRenderer(this, 4, 27); + frameEdge12.addBox(0F, 0F, 0F, 10, 1, 1); + frameEdge12.setRotationPoint(-5F, 8.5F, 6.5F); + frameEdge12.setTextureSize(128, 64); + frameEdge12.mirror = true; + setRotation(frameEdge12, 0F, 0F, 0F); + frame1 = new ModelRenderer(this, 0, 29); + frame1.addBox(0F, 0F, 0F, 2, 10, 2); + frame1.setRotationPoint(-7F, 11F, -7F); + frame1.setTextureSize(128, 64); + frame1.mirror = true; + setRotation(frame1, 0F, 0F, 0F); + frame2 = new ModelRenderer(this, 0, 29); + frame2.mirror = true; + frame2.addBox(0F, 0F, 0F, 2, 10, 2); + frame2.setRotationPoint(5F, 11F, -7F); + frame2.setTextureSize(128, 64); + setRotation(frame2, 0F, 0F, 0F); + frame3 = new ModelRenderer(this, 8, 29); + frame3.addBox(0F, 0F, 0F, 2, 10, 2); + frame3.setRotationPoint(-7F, 11F, 5F); + frame3.setTextureSize(128, 64); + frame3.mirror = true; + setRotation(frame3, 0F, 0F, 0F); + frame4 = new ModelRenderer(this, 8, 29); + frame4.mirror = true; + frame4.addBox(0F, 0F, 0F, 2, 10, 2); + frame4.setRotationPoint(5F, 11F, 5F); + frame4.setTextureSize(128, 64); + setRotation(frame4, 0F, 0F, 0F); + frame5 = new ModelRenderer(this, 16, 45); + frame5.addBox(0F, 0F, 0F, 10, 2, 2); + frame5.setRotationPoint(-5F, 21F, -7F); + frame5.setTextureSize(128, 64); + frame5.mirror = true; + setRotation(frame5, 0F, 0F, 0F); + frame6 = new ModelRenderer(this, 40, 29); + frame6.addBox(0F, 0F, 0F, 2, 2, 10); + frame6.setRotationPoint(-7F, 21F, -5F); + frame6.setTextureSize(128, 64); + frame6.mirror = true; + setRotation(frame6, 0F, 0F, 0F); + frame7 = new ModelRenderer(this, 40, 29); + frame7.mirror = true; + frame7.addBox(0F, 0F, 0F, 2, 2, 10); + frame7.setRotationPoint(5F, 21F, -5F); + frame7.setTextureSize(128, 64); + setRotation(frame7, 0F, 0F, 0F); + frame8 = new ModelRenderer(this, 16, 49); + frame8.addBox(0F, 0F, 0F, 10, 2, 2); + frame8.setRotationPoint(-5F, 21F, 5F); + frame8.setTextureSize(128, 64); + frame8.mirror = true; + setRotation(frame8, 0F, 0F, 0F); + frame9 = new ModelRenderer(this, 16, 41); + frame9.addBox(0F, 0F, 0F, 10, 2, 2); + frame9.setRotationPoint(-5F, 9F, -7F); + frame9.setTextureSize(128, 64); + frame9.mirror = true; + setRotation(frame9, 0F, 0F, 0F); + frame10 = new ModelRenderer(this, 16, 29); + frame10.addBox(0F, 0F, 0F, 2, 2, 10); + frame10.setRotationPoint(-7F, 9F, -5F); + frame10.setTextureSize(128, 64); + frame10.mirror = true; + setRotation(frame10, 0F, 0F, 0F); + frame11 = new ModelRenderer(this, 16, 29); + frame11.mirror = true; + frame11.addBox(0F, 0F, 0F, 2, 2, 10); + frame11.setRotationPoint(5F, 9F, -5F); + frame11.setTextureSize(128, 64); + setRotation(frame11, 0F, 0F, 0F); + frame12 = new ModelRenderer(this, 16, 53); + frame12.addBox(0F, 0F, 0F, 10, 2, 2); + frame12.setRotationPoint(-5F, 9F, 5F); + frame12.setTextureSize(128, 64); + frame12.mirror = true; + setRotation(frame12, 0F, 0F, 0F); + corner1 = new ModelRenderer(this, 0, 49); + corner1.addBox(0F, 0F, 0F, 3, 3, 3); + corner1.setRotationPoint(-8F, 8F, -8F); + corner1.setTextureSize(128, 64); + corner1.mirror = true; + setRotation(corner1, 0F, 0F, 0F); + corner2 = new ModelRenderer(this, 0, 49); + corner2.addBox(0F, 0F, 0F, 3, 3, 3); + corner2.setRotationPoint(5F, 8F, -8F); + corner2.setTextureSize(128, 64); + corner2.mirror = true; + setRotation(corner2, 0F, 0F, 0F); + corner3 = new ModelRenderer(this, 0, 49); + corner3.addBox(0F, 0F, 0F, 3, 3, 3); + corner3.setRotationPoint(-8F, 8F, 5F); + corner3.setTextureSize(128, 64); + corner3.mirror = true; + setRotation(corner3, 0F, 0F, 0F); + corner4 = new ModelRenderer(this, 0, 49); + corner4.addBox(0F, 0F, 0F, 3, 3, 3); + corner4.setRotationPoint(5F, 8F, 5F); + corner4.setTextureSize(128, 64); + corner4.mirror = true; + setRotation(corner4, 0F, 0F, 0F); + corner5 = new ModelRenderer(this, 0, 49); + corner5.addBox(0F, 0F, 0F, 3, 3, 3); + corner5.setRotationPoint(-8F, 21F, -8F); + corner5.setTextureSize(128, 64); + corner5.mirror = true; + setRotation(corner5, 0F, 0F, 0F); + corner6 = new ModelRenderer(this, 0, 49); + corner6.addBox(0F, 0F, 0F, 3, 3, 3); + corner6.setRotationPoint(5F, 21F, -8F); + corner6.setTextureSize(128, 64); + corner6.mirror = true; + setRotation(corner6, 0F, 0F, 0F); + corner7 = new ModelRenderer(this, 0, 49); + corner7.addBox(0F, 0F, 0F, 3, 3, 3); + corner7.setRotationPoint(-8F, 21F, 5F); + corner7.setTextureSize(128, 64); + corner7.mirror = true; + setRotation(corner7, 0F, 0F, 0F); + corner8 = new ModelRenderer(this, 0, 49); + corner8.addBox(0F, 0F, 0F, 3, 3, 3); + corner8.setRotationPoint(5F, 21F, 5F); + corner8.setTextureSize(128, 64); + corner8.mirror = true; + setRotation(corner8, 0F, 0F, 0F); + portRightLarge = new ModelRenderer(this, 68, 0); + portRightLarge.mirror = true; + portRightLarge.addBox(0F, 0F, 0F, 1, 10, 10); + portRightLarge.setRotationPoint(7F, 11F, -5F); + portRightLarge.setTextureSize(128, 64); + setRotation(portRightLarge, 0F, 0F, 0F); + portLeftLarge = new ModelRenderer(this, 68, 0); + portLeftLarge.addBox(0F, 0F, 0F, 1, 10, 10); + portLeftLarge.setRotationPoint(-8F, 11F, -5F); + portLeftLarge.setTextureSize(128, 64); + portLeftLarge.mirror = true; + setRotation(portLeftLarge, 0F, 0F, 0F); + } + + public void render(float size, TextureManager manager) + { + doRender(size); + + GL11.glPushMatrix(); + manager.bindTexture(OVERLAY); + GL11.glScalef(1.001F, 1.001F, 1.001F); + GL11.glTranslatef(0, -0.0011F, 0); + MekanismRenderer.glowOn(); + + doRender(size); + + MekanismRenderer.glowOff(); + GL11.glPopMatrix(); + } + + public void doRender(float size) + { + portTop.render(size); + portBottom.render(size); + portLeft.render(size); + portRight.render(size); + portBack.render(size); + portFront.render(size); + energyCubeCore.render(size); + frameEdge1.render(size); + frameEdge2.render(size); + frameEdge3.render(size); + frameEdge4.render(size); + frameEdge5.render(size); + frameEdge6.render(size); + frameEdge7.render(size); + frameEdge8.render(size); + frameEdge9.render(size); + frameEdge10.render(size); + frameEdge11.render(size); + frameEdge12.render(size); + frame1.render(size); + frame2.render(size); + frame3.render(size); + frame4.render(size); + frame5.render(size); + frame6.render(size); + frame7.render(size); + frame8.render(size); + frame9.render(size); + frame10.render(size); + frame11.render(size); + frame12.render(size); + corner1.render(size); + corner2.render(size); + corner3.render(size); + corner4.render(size); + corner5.render(size); + corner6.render(size); + corner7.render(size); + corner8.render(size); + //portRightLarge.render(size); + //portLeftLarge.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/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index 68eeb63c3..a0baa5454 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -16,6 +16,7 @@ import mekanism.client.model.ModelLaserAmplifier; import mekanism.client.model.ModelLogisticalSorter; import mekanism.client.model.ModelMetallurgicInfuser; import mekanism.client.model.ModelPressurizedReactionChamber; +import mekanism.client.model.ModelQuantumEntangloporter; import mekanism.client.model.ModelResistiveHeater; import mekanism.client.model.ModelRotaryCondensentrator; import mekanism.client.model.ModelSeismicVibrator; @@ -59,6 +60,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler public ModelLaserAmplifier laserAmplifier = new ModelLaserAmplifier(); public ModelSolarNeutronActivator solarNeutronActivator = new ModelSolarNeutronActivator(); public ModelResistiveHeater resistiveHeater = new ModelResistiveHeater(); + public ModelQuantumEntangloporter quantumEntangloporter = new ModelQuantumEntangloporter(); @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) @@ -233,6 +235,14 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SolarNeutronActivator.png")); solarNeutronActivator.render(0.0625F); } + else if(type == MachineType.QUANTUM_ENTANGLOPORTER) + { + GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); + GL11.glTranslatef(0.0F, -1.0F, 0.0F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "QuantumEntangloporter.png")); + quantumEntangloporter.render(0.0625F, mc.renderEngine); + } else { GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); MekanismRenderer.renderItem(renderer, metadata, block); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderQuantumEntangloporter.java b/src/main/java/mekanism/client/render/tileentity/RenderQuantumEntangloporter.java new file mode 100644 index 000000000..1187767e5 --- /dev/null +++ b/src/main/java/mekanism/client/render/tileentity/RenderQuantumEntangloporter.java @@ -0,0 +1,48 @@ +package mekanism.client.render.tileentity; + +import mekanism.client.model.ModelQuantumEntangloporter; +import mekanism.client.render.MekanismRenderer; +import mekanism.common.tile.TileEntityQuantumEntangloporter; +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 RenderQuantumEntangloporter extends TileEntitySpecialRenderer +{ + private ModelQuantumEntangloporter model = new ModelQuantumEntangloporter(); + + @Override + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) + { + renderAModelAt((TileEntityQuantumEntangloporter)tileEntity, x, y, z, partialTick); + } + + private void renderAModelAt(TileEntityQuantumEntangloporter 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, "QuantumEntangloporter.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, field_147501_a.field_147553_e); + GL11.glPopMatrix(); + + MekanismRenderer.machineRenderer.renderAModelAt(tileEntity, x, y, z, partialTick); + } +} diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index bbc363944..ed46e1993 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -208,6 +208,7 @@ public class CommonProxy implements IGuiProvider GameRegistry.registerTileEntity(TileEntityBoilerCasing.class, "BoilerCasing"); GameRegistry.registerTileEntity(TileEntityBoilerValve.class, "BoilerValve"); GameRegistry.registerTileEntity(TileEntitySecurityDesk.class, "SecurityDesk"); + GameRegistry.registerTileEntity(TileEntityQuantumEntangloporter.class, "QuantumEntangloporter"); } public void handleTeleporterUpdate(PortableTeleporterMessage message) {} diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 653f1f048..4a84ad285 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -79,7 +79,6 @@ import mekanism.common.tile.TileEntityBoundingBlock; import mekanism.common.tile.TileEntityCardboardBox; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.tile.TileEntityPressureDisperser; -import mekanism.common.tile.TileEntityQuantumEntangloporter; import mekanism.common.tile.TileEntitySuperheatingElement; import mekanism.common.tile.TileEntityThermalEvaporationBlock; import mekanism.common.tile.TileEntityThermalEvaporationValve; @@ -1143,7 +1142,6 @@ public class Mekanism GameRegistry.registerTileEntity(TileEntityCardboardBox.class, "CardboardBox"); GameRegistry.registerTileEntity(TileEntityThermalEvaporationValve.class, "SalinationValve"); //TODO rename GameRegistry.registerTileEntity(TileEntityThermalEvaporationBlock.class, "SalinationTank"); //TODO rename - GameRegistry.registerTileEntity(TileEntityQuantumEntangloporter.class, "QuantumEntangloporter"); GameRegistry.registerTileEntity(TileEntityPressureDisperser.class, "PressureDisperser"); GameRegistry.registerTileEntity(TileEntitySuperheatingElement.class, "SuperheatingElement"); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 96f02c739..09efe6fb7 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -1182,7 +1182,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo LASER(MachineBlock.MACHINE_BLOCK_2, 13, "Laser", -1, TileEntityLaser.class, true, true, false), LASER_AMPLIFIER(MachineBlock.MACHINE_BLOCK_2, 14, "LaserAmplifier", 44, TileEntityLaserAmplifier.class, false, true, false), LASER_TRACTOR_BEAM(MachineBlock.MACHINE_BLOCK_2, 15, "LaserTractorBeam", 45, TileEntityLaserTractorBeam.class, false, true, false), - QUANTUM_ENTANGLOPORTER(MachineBlock.MACHINE_BLOCK_3, 0, "QuantumEntangloporter", 46, TileEntityQuantumEntangloporter.class, true, false, false), + QUANTUM_ENTANGLOPORTER(MachineBlock.MACHINE_BLOCK_3, 0, "QuantumEntangloporter", 46, TileEntityQuantumEntangloporter.class, true, true, false), SOLAR_NEUTRON_ACTIVATOR(MachineBlock.MACHINE_BLOCK_3, 1, "SolarNeutronActivator", 47, TileEntitySolarNeutronActivator.class, false, true, false), AMBIENT_ACCUMULATOR(MachineBlock.MACHINE_BLOCK_3, 2, "AmbientAccumulator", 48, TileEntityAmbientAccumulator.class, true, false, false), OREDICTIONIFICATOR(MachineBlock.MACHINE_BLOCK_3, 3, "Oredictionificator", 52, TileEntityOredictionificator.class, false, false, false), diff --git a/src/main/resources/assets/mekanism/gui/GuiTeleporter.png b/src/main/resources/assets/mekanism/gui/GuiTeleporter.png index c2731f41d35e94dd00ef0cba129a73d0cde54c08..3ac1693621aed35a8b2b8e63cb0420282861663b 100644 GIT binary patch literal 6367 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 literal 20127 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 LR!3f#5TgDA*l2s+ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/render/QuantumEntangloporter_Overlay.png b/src/main/resources/assets/mekanism/render/QuantumEntangloporter_Overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..b4fce7ad941cb08083a56b0ca82d27b66bd22388 GIT binary patch literal 5181 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 T`&7(!e&|_QoHQ>t^}O^y*Hb#@ literal 0 HcmV?d00001 From ec69b2675e71c5c45e79873fc843a933ca6e2ef2 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 23 Apr 2016 13:02:47 -0400 Subject: [PATCH 56/62] Formulaic Assemblicator fixes --- .../client/gui/GuiFormulaicAssemblicator.java | 28 +++++++++++++------ .../TileEntityFormulaicAssemblicator.java | 4 ++- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java index 892dafea9..573ee0fca 100644 --- a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java +++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java @@ -15,6 +15,7 @@ import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.gui.element.GuiTransporterConfigTab; +import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; @@ -28,6 +29,7 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -38,16 +40,19 @@ import cpw.mods.fml.relauncher.SideOnly; public class GuiFormulaicAssemblicator extends GuiMekanism { public TileEntityFormulaicAssemblicator tileEntity; + + public ResourceLocation guiLocation = MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"); public GuiFormulaicAssemblicator(InventoryPlayer inventory, TileEntityFormulaicAssemblicator tentity) { super(tentity, new ContainerFormulaicAssemblicator(inventory, tentity)); tileEntity = tentity; - guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"))); - guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"))); - guiElements.add(new GuiSideConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"))); - guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"))); - guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"), 159, 15)); + guiElements.add(new GuiSecurityTab(this, tileEntity, guiLocation)); + guiElements.add(new GuiUpgradeTab(this, tileEntity, guiLocation)); + guiElements.add(new GuiRedstoneControl(this, tileEntity, guiLocation)); + guiElements.add(new GuiSideConfigurationTab(this, tileEntity, guiLocation)); + guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, guiLocation)); + guiElements.add(new GuiPowerBar(this, tileEntity, guiLocation, 159, 15)); guiElements.add(new GuiEnergyInfo(new IInfoHandler() { @Override public List getInfo() @@ -55,8 +60,8 @@ public class GuiFormulaicAssemblicator extends GuiMekanism String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"))); - guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"), 151, 75).with(SlotOverlay.POWER)); + }, this, guiLocation)); + guiElements.add(new GuiSlot(SlotType.POWER, this, guiLocation, 151, 75).with(SlotOverlay.POWER)); ySize+=64; } @@ -101,7 +106,7 @@ public class GuiFormulaicAssemblicator extends GuiMekanism @Override protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png")); + mc.renderEngine.bindTexture(guiLocation); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; @@ -194,8 +199,13 @@ public class GuiFormulaicAssemblicator extends GuiMekanism if(stack != null) { Slot slot = (Slot)inventorySlots.inventorySlots.get(i+20); - GL11.glPushMatrix(); + + if(slot.getStack() == null || !slot.getStack().isItemEqual(stack)) + { + drawGradientRect(guiWidth + slot.xDisplayPosition, guiHeight + slot.yDisplayPosition, guiWidth + slot.xDisplayPosition + 16, guiHeight + slot.yDisplayPosition + 16, -2137456640, -2137456640); + } + GL11.glEnable(GL11.GL_LIGHTING); MekanismRenderer.blendOn(); GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.4F); diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java index ad80eece1..065919d7e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -153,7 +153,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im { isRecipe = true; - if(operatingTicks == ticksRequired) + if(operatingTicks >= ticksRequired) { if(doSingleCraft()) { @@ -163,6 +163,8 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im { pulseOperations--; } + + ejectorComponent.outputItems(); } } else { From 2873c0c797a67f4778e7b6f7b6d0b433c2697e2e Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 23 Apr 2016 17:09:01 -0400 Subject: [PATCH 57/62] Added Fuelwood Heater, currently has no texture. After doing some server timing tests, the last thing we need to make efficient is the Formulaic Assemblicator --- .../java/mekanism/api/MekanismConfig.java | 1 + .../java/mekanism/client/ClientProxy.java | 6 + .../client/gui/GuiFuelwoodHeater.java | 80 +++++ .../render/block/MachineRenderingHandler.java | 9 + .../tileentity/RenderFuelwoodHeater.java | 44 +++ .../java/mekanism/common/CommonProxy.java | 6 + src/main/java/mekanism/common/Mekanism.java | 3 + .../mekanism/common/block/BlockMachine.java | 5 +- .../container/ContainerFuelwoodHeater.java | 123 ++++++++ .../common/item/ItemBlockMachine.java | 1 + .../common/network/PacketConfigSync.java | 2 + .../common/tile/TileEntityFuelwoodHeater.java | 279 ++++++++++++++++++ .../tile/TileEntityResistiveHeater.java | 7 + .../assets/mekanism/gui/GuiFuelwoodHeater.png | Bin 0 -> 5359 bytes .../resources/assets/mekanism/lang/en_US.lang | 2 + 15 files changed, 567 insertions(+), 1 deletion(-) create mode 100644 src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java create mode 100644 src/main/java/mekanism/client/render/tileentity/RenderFuelwoodHeater.java create mode 100644 src/main/java/mekanism/common/inventory/container/ContainerFuelwoodHeater.java create mode 100644 src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java create mode 100644 src/main/resources/assets/mekanism/gui/GuiFuelwoodHeater.png diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index b3125f1d2..3b0522bc7 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -63,6 +63,7 @@ public class MekanismConfig public static double energyPerHeat = 1000; public static double maxEnergyPerSteam = 100; public static double superheatingHeatTransfer = 10000; + public static double heatPerFuelTick = 1; } public static class client diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index a8ae79c71..414dd2a69 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -31,6 +31,7 @@ import mekanism.client.gui.GuiFactory; import mekanism.client.gui.GuiFluidTank; import mekanism.client.gui.GuiFluidicPlenisher; import mekanism.client.gui.GuiFormulaicAssemblicator; +import mekanism.client.gui.GuiFuelwoodHeater; import mekanism.client.gui.GuiGasTank; import mekanism.client.gui.GuiInductionMatrix; import mekanism.client.gui.GuiLaserAmplifier; @@ -89,6 +90,7 @@ import mekanism.client.render.tileentity.RenderElectrolyticSeparator; import mekanism.client.render.tileentity.RenderEnergyCube; import mekanism.client.render.tileentity.RenderFluidTank; import mekanism.client.render.tileentity.RenderFluidicPlenisher; +import mekanism.client.render.tileentity.RenderFuelwoodHeater; import mekanism.client.render.tileentity.RenderGasTank; import mekanism.client.render.tileentity.RenderLaser; import mekanism.client.render.tileentity.RenderLaserAmplifier; @@ -153,6 +155,7 @@ import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.tile.TileEntityFluidicPlenisher; import mekanism.common.tile.TileEntityFormulaicAssemblicator; +import mekanism.common.tile.TileEntityFuelwoodHeater; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.tile.TileEntityInductionCasing; import mekanism.common.tile.TileEntityInductionCell; @@ -320,6 +323,7 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityBoilerValve.class, "BoilerValve", new RenderThermoelectricBoiler()); ClientRegistry.registerTileEntity(TileEntitySecurityDesk.class, "SecurityDesk", new RenderSecurityDesk()); ClientRegistry.registerTileEntity(TileEntityQuantumEntangloporter.class, "QuantumEntangloporter", new RenderQuantumEntangloporter()); + ClientRegistry.registerTileEntity(TileEntityFuelwoodHeater.class, "FuelwoodHeater", new RenderFuelwoodHeater()); } @Override @@ -507,6 +511,8 @@ public class ClientProxy extends CommonProxy return new GuiFormulaicAssemblicator(player.inventory, (TileEntityFormulaicAssemblicator)tileEntity); case 57: return new GuiSecurityDesk(player.inventory, (TileEntitySecurityDesk)tileEntity); + case 58: + return new GuiFuelwoodHeater(player.inventory, (TileEntityFuelwoodHeater)tileEntity); } return null; diff --git a/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java b/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java new file mode 100644 index 000000000..640d5b73e --- /dev/null +++ b/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java @@ -0,0 +1,80 @@ +package mekanism.client.gui; + +import java.util.List; + +import mekanism.api.util.ListUtils; +import mekanism.api.util.UnitDisplayUtils; +import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; +import mekanism.client.gui.element.GuiElement.IInfoHandler; +import mekanism.client.gui.element.GuiHeatInfo; +import mekanism.client.gui.element.GuiSecurityTab; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.common.inventory.container.ContainerFuelwoodHeater; +import mekanism.common.tile.TileEntityFuelwoodHeater; +import mekanism.common.util.LangUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.entity.player.InventoryPlayer; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiFuelwoodHeater extends GuiMekanism +{ + public TileEntityFuelwoodHeater tileEntity; + + public GuiFuelwoodHeater(InventoryPlayer inventory, TileEntityFuelwoodHeater tentity) + { + super(tentity, new ContainerFuelwoodHeater(inventory, tentity)); + tileEntity = tentity; + + guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiFuelwoodHeater.png"), 14, 28)); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFuelwoodHeater.png"))); + guiElements.add(new GuiHeatInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String transfer = UnitDisplayUtils.getDisplayShort(tileEntity.lastTransferLoss, TemperatureUnit.KELVIN); + String environment = UnitDisplayUtils.getDisplayShort(tileEntity.lastEnvironmentLoss, TemperatureUnit.KELVIN); + return ListUtils.asList(LangUtils.localize("gui.transferred") + ": " + transfer + "/t", LangUtils.localize("gui.dissipated") + ": " + environment + "/t"); + } + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiFuelwoodHeater.png"))); + } + + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) + { + fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getInventoryName()) / 2), 6, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); + + renderScaledText(LangUtils.localize("gui.temp") + ": " + MekanismUtils.getTemperatureDisplay(tileEntity.temperature, TemperatureUnit.AMBIENT), 50, 25, 0x00CD00, 76); + renderScaledText(LangUtils.localize("gui.fuel") + ": " + tileEntity.burnTime, 50, 41, 0x00CD00, 76); + + super.drawGuiContainerForegroundLayer(mouseX, mouseY); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) + { + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiFuelwoodHeater.png")); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + int guiWidth = (width - xSize) / 2; + int guiHeight = (height - ySize) / 2; + drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); + + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + if(tileEntity.burnTime > 0) + { + int displayInt = tileEntity.burnTime*13 / tileEntity.maxBurnTime; + drawTexturedModalRect(guiWidth + 143, guiHeight + 30 + 12 - displayInt, 176, 12 - displayInt, 14, displayInt + 1); + } + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); + } +} diff --git a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index a0baa5454..fdac9a6e3 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -61,6 +61,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler public ModelSolarNeutronActivator solarNeutronActivator = new ModelSolarNeutronActivator(); public ModelResistiveHeater resistiveHeater = new ModelResistiveHeater(); public ModelQuantumEntangloporter quantumEntangloporter = new ModelQuantumEntangloporter(); + public ModelResistiveHeater fuelwoodHeater = new ModelResistiveHeater(); @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) @@ -226,6 +227,14 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ResistiveHeater.png")); resistiveHeater.render(0.0625F, false, mc.renderEngine); } + else if(type == MachineType.FUELWOOD_HEATER) + { + GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); + GL11.glTranslatef(0.05F, -0.96F, 0.05F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FuelwoodHeater.png")); + fuelwoodHeater.render(0.0625F, false, mc.renderEngine); + } else if(type == MachineType.SOLAR_NEUTRON_ACTIVATOR) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderFuelwoodHeater.java b/src/main/java/mekanism/client/render/tileentity/RenderFuelwoodHeater.java new file mode 100644 index 000000000..a4727be12 --- /dev/null +++ b/src/main/java/mekanism/client/render/tileentity/RenderFuelwoodHeater.java @@ -0,0 +1,44 @@ +package mekanism.client.render.tileentity; + +import mekanism.client.model.ModelResistiveHeater; +import mekanism.common.tile.TileEntityFuelwoodHeater; +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 RenderFuelwoodHeater extends TileEntitySpecialRenderer +{ + private ModelResistiveHeater model = new ModelResistiveHeater(); + + @Override + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) + { + renderAModelAt((TileEntityFuelwoodHeater)tileEntity, x, y, z, partialTick); + } + + private void renderAModelAt(TileEntityFuelwoodHeater 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, "FuelwoodHeater.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, tileEntity.isActive, field_147501_a.field_147553_e); + GL11.glPopMatrix(); + } +} diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index ed46e1993..1b238ac20 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -35,6 +35,7 @@ import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.inventory.container.ContainerFluidTank; import mekanism.common.inventory.container.ContainerFluidicPlenisher; import mekanism.common.inventory.container.ContainerFormulaicAssemblicator; +import mekanism.common.inventory.container.ContainerFuelwoodHeater; import mekanism.common.inventory.container.ContainerGasTank; import mekanism.common.inventory.container.ContainerInductionMatrix; import mekanism.common.inventory.container.ContainerLaserAmplifier; @@ -90,6 +91,7 @@ import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.tile.TileEntityFluidicPlenisher; import mekanism.common.tile.TileEntityFormulaicAssemblicator; +import mekanism.common.tile.TileEntityFuelwoodHeater; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.tile.TileEntityInductionCasing; import mekanism.common.tile.TileEntityInductionCell; @@ -209,6 +211,7 @@ public class CommonProxy implements IGuiProvider GameRegistry.registerTileEntity(TileEntityBoilerValve.class, "BoilerValve"); GameRegistry.registerTileEntity(TileEntitySecurityDesk.class, "SecurityDesk"); GameRegistry.registerTileEntity(TileEntityQuantumEntangloporter.class, "QuantumEntangloporter"); + GameRegistry.registerTileEntity(TileEntityFuelwoodHeater.class, "FuelwoodHeater"); } public void handleTeleporterUpdate(PortableTeleporterMessage message) {} @@ -292,6 +295,7 @@ public class CommonProxy implements IGuiProvider general.energyPerHeat = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyPerHeat", 1000D).getDouble(); general.maxEnergyPerSteam = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "MaxEnergyPerSteam", 100D).getDouble(); general.superheatingHeatTransfer = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "SuperheatingHeatTransfer", 10000D).getDouble(); + general.heatPerFuelTick = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "HeatPerFuelTick", 1D).getDouble(); general.blacklistIC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistIC2Power", false).getBoolean(); general.blacklistRF = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistRFPower", false).getBoolean(); @@ -560,6 +564,8 @@ public class CommonProxy implements IGuiProvider return new ContainerFormulaicAssemblicator(player.inventory, (TileEntityFormulaicAssemblicator)tileEntity); case 57: return new ContainerSecurityDesk(player.inventory, (TileEntitySecurityDesk)tileEntity); + case 58: + return new ContainerFuelwoodHeater(player.inventory, (TileEntityFuelwoodHeater)tileEntity); } return null; diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 4a84ad285..388cd5703 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -528,6 +528,9 @@ public class Mekanism "SGS", "CIC", "STS", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ELITE), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('T'), MekanismItems.TeleportationCore })); + MachineType.FUELWOOD_HEATER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock3, 1, 6), new Object[] { + "SCS", "FHF", "SSS", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('F'), Blocks.furnace, Character.valueOf('H'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) + })); //Energy Cube recipes CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC), new Object[] { diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 09efe6fb7..71572bc90 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -65,6 +65,7 @@ import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.tile.TileEntityFluidicPlenisher; import mekanism.common.tile.TileEntityFormulaicAssemblicator; +import mekanism.common.tile.TileEntityFuelwoodHeater; import mekanism.common.tile.TileEntityLaser; import mekanism.common.tile.TileEntityLaserAmplifier; import mekanism.common.tile.TileEntityLaserTractorBeam; @@ -155,6 +156,7 @@ import cpw.mods.fml.relauncher.SideOnly; * 2:3: Oredictionificator * 2:4: Resistive Heater * 2:5: Formulaic Assemblicator + * 2:6: Fuelwood Heater * * @author AidanBrady * @@ -1187,7 +1189,8 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo AMBIENT_ACCUMULATOR(MachineBlock.MACHINE_BLOCK_3, 2, "AmbientAccumulator", 48, TileEntityAmbientAccumulator.class, true, false, false), OREDICTIONIFICATOR(MachineBlock.MACHINE_BLOCK_3, 3, "Oredictionificator", 52, TileEntityOredictionificator.class, false, false, false), RESISTIVE_HEATER(MachineBlock.MACHINE_BLOCK_3, 4, "ResistiveHeater", 53, TileEntityResistiveHeater.class, true, true, false), - FORMULAIC_ASSEMBLICATOR(MachineBlock.MACHINE_BLOCK_3, 5, "FormulaicAssemblicator", 56, TileEntityFormulaicAssemblicator.class, true, false, true); + FORMULAIC_ASSEMBLICATOR(MachineBlock.MACHINE_BLOCK_3, 5, "FormulaicAssemblicator", 56, TileEntityFormulaicAssemblicator.class, true, false, true), + FUELWOOD_HEATER(MachineBlock.MACHINE_BLOCK_3, 6, "FuelwoodHeater", 58, TileEntityFuelwoodHeater.class, false, true, false); public MachineBlock typeBlock; public int meta; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFuelwoodHeater.java b/src/main/java/mekanism/common/inventory/container/ContainerFuelwoodHeater.java new file mode 100644 index 000000000..d22546b70 --- /dev/null +++ b/src/main/java/mekanism/common/inventory/container/ContainerFuelwoodHeater.java @@ -0,0 +1,123 @@ +package mekanism.common.inventory.container; + +import mekanism.common.tile.TileEntityFuelwoodHeater; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntityFurnace; + +public class ContainerFuelwoodHeater extends Container +{ + private TileEntityFuelwoodHeater tileEntity; + + public ContainerFuelwoodHeater(InventoryPlayer inventory, TileEntityFuelwoodHeater tentity) + { + tileEntity = tentity; + addSlotToContainer(new Slot(tentity, 0, 15, 29)); + + int slotY; + + for(slotY = 0; slotY < 3; slotY++) + { + for(int slotX = 0; slotX < 9; slotX++) + { + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); + } + } + + for(slotY = 0; slotY < 9; slotY++) + { + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); + } + + tileEntity.open(inventory.player); + tileEntity.openInventory(); + } + + @Override + public void onContainerClosed(EntityPlayer entityplayer) + { + super.onContainerClosed(entityplayer); + + tileEntity.close(entityplayer); + tileEntity.closeInventory(); + } + + @Override + public boolean canInteractWith(EntityPlayer entityplayer) + { + return tileEntity.isUseableByPlayer(entityplayer); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int slotID) + { + ItemStack stack = null; + Slot currentSlot = (Slot)inventorySlots.get(slotID); + + if(currentSlot != null && currentSlot.getHasStack()) + { + ItemStack slotStack = currentSlot.getStack(); + stack = slotStack.copy(); + + if(TileEntityFurnace.getItemBurnTime(slotStack) > 0) + { + if(slotID != 0) + { + if(!mergeItemStack(slotStack, 0, 1, false)) + { + return null; + } + } + else if(slotID == 0) + { + if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true)) + { + return null; + } + } + } + else { + if(slotID >= 1 && slotID <= 27) + { + if(!mergeItemStack(slotStack, 28, inventorySlots.size(), false)) + { + return null; + } + } + else if(slotID > 27) + { + if(!mergeItemStack(slotStack, 1, 27, false)) + { + return null; + } + } + else { + if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true)) + { + return null; + } + } + } + + if(slotStack.stackSize == 0) + { + currentSlot.putStack((ItemStack)null); + } + else { + currentSlot.onSlotChanged(); + } + + if(slotStack.stackSize == stack.stackSize) + { + return null; + } + + currentSlot.onPickupFromSlot(player, slotStack); + } + + return stack; + } +} diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 5354c8cf8..0d48336ce 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -103,6 +103,7 @@ import cpw.mods.fml.relauncher.SideOnly; * 2:3: Oredictionificator * 2:4: Resistive Heater * 2:5: Formulaic Assemblicator + * 2:6: Fuelwood Heater * @author AidanBrady * */ diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index a6cbed45d..2f7a2e638 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -70,6 +70,7 @@ public class PacketConfigSync implements IMessageHandler 0) + { + updateDelay--; + + if(updateDelay == 0 && clientActive != isActive) + { + isActive = clientActive; + MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord); + } + } + + if(!worldObj.isRemote) + { + if(updateDelay > 0) + { + updateDelay--; + + if(updateDelay == 0 && clientActive != isActive) + { + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + } + } + + boolean burning = false; + + if(burnTime > 0) + { + burnTime--; + burning = true; + } + else { + if(inventory[0] != null) + { + maxBurnTime = burnTime = TileEntityFurnace.getItemBurnTime(inventory[0])/2; + + if(burnTime > 0) + { + inventory[0].stackSize--; + + if(inventory[0].stackSize == 0) + { + inventory[0] = inventory[0].getItem().getContainerItem(inventory[0]); + } + + burning = true; + } + } + } + + if(burning) + { + heatToAbsorb += general.heatPerFuelTick; + } + + double[] loss = simulateHeat(); + applyTemperatureChange(); + + lastTransferLoss = loss[0]; + lastEnvironmentLoss = loss[1]; + + setActive(burning); + } + } + + @Override + public void readFromNBT(NBTTagCompound nbtTags) + { + super.readFromNBT(nbtTags); + + temperature = nbtTags.getDouble("temperature"); + clientActive = isActive = nbtTags.getBoolean("isActive"); + burnTime = nbtTags.getInteger("burnTime"); + maxBurnTime = nbtTags.getInteger("maxBurnTime"); + } + + @Override + public void writeToNBT(NBTTagCompound nbtTags) + { + super.writeToNBT(nbtTags); + + nbtTags.setDouble("temperature", temperature); + nbtTags.setBoolean("isActive", isActive); + nbtTags.setInteger("burnTime", burnTime); + nbtTags.setInteger("maxBurnTime", maxBurnTime); + } + + @Override + public void handlePacketData(ByteBuf dataStream) + { + super.handlePacketData(dataStream); + + temperature = dataStream.readDouble(); + clientActive = dataStream.readBoolean(); + burnTime = dataStream.readInt(); + maxBurnTime = dataStream.readInt(); + + lastTransferLoss = dataStream.readDouble(); + lastEnvironmentLoss = dataStream.readDouble(); + + if(updateDelay == 0 && clientActive != isActive) + { + updateDelay = general.UPDATE_DELAY; + isActive = clientActive; + MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord); + } + } + + @Override + public ArrayList getNetworkedData(ArrayList data) + { + super.getNetworkedData(data); + + data.add(temperature); + data.add(isActive); + data.add(burnTime); + data.add(maxBurnTime); + + data.add(lastTransferLoss); + data.add(lastEnvironmentLoss); + + return data; + } + + @Override + public boolean canSetFacing(int side) + { + return side != 0 && side != 1; + } + + @Override + public void setActive(boolean active) + { + isActive = active; + + if(clientActive != active && updateDelay == 0) + { + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + + updateDelay = 10; + clientActive = active; + } + } + + @Override + public boolean getActive() + { + return isActive; + } + + @Override + public boolean renderUpdate() + { + return false; + } + + @Override + public boolean lightUpdate() + { + return true; + } + + @Override + public double getTemp() + { + return temperature; + } + + @Override + public double getInverseConductionCoefficient() + { + return 1; + } + + @Override + public double getInsulationCoefficient(ForgeDirection side) + { + return 1000; + } + + @Override + public void transferHeatTo(double heat) + { + heatToAbsorb += heat; + } + + @Override + public double[] simulateHeat() + { + return HeatUtils.simulate(this); + } + + @Override + public double applyTemperatureChange() + { + temperature += heatToAbsorb; + heatToAbsorb = 0; + + return temperature; + } + + @Override + public boolean canConnectHeat(ForgeDirection side) + { + return true; + } + + @Override + public IHeatTransfer getAdjacent(ForgeDirection side) + { + TileEntity adj = Coord4D.get(this).getFromSide(side).getTileEntity(worldObj); + + if(adj instanceof IHeatTransfer) + { + return (IHeatTransfer)adj; + } + + return null; + } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } +} diff --git a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java index cab51c08f..40f2c845a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java @@ -3,6 +3,7 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; import java.util.ArrayList; +import java.util.EnumSet; import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; @@ -119,6 +120,12 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl } } + @Override + public EnumSet getConsumingSides() + { + return EnumSet.of(MekanismUtils.getLeft(facing), MekanismUtils.getRight(facing)); + } + @Override public boolean canSetFacing(int side) { diff --git a/src/main/resources/assets/mekanism/gui/GuiFuelwoodHeater.png b/src/main/resources/assets/mekanism/gui/GuiFuelwoodHeater.png new file mode 100644 index 0000000000000000000000000000000000000000..f42eff054834236823da34655a542616174262d3 GIT binary patch literal 5359 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 48afbaf4a..0f0bfd485 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -157,6 +157,7 @@ tile.MachineBlock3.SolarNeutronActivator.name=Solar Neutron Activator tile.MachineBlock3.Oredictionificator.name=Oredictionificator tile.MachineBlock3.ResistiveHeater.name=Resistive Heater tile.MachineBlock3.FormulaicAssemblicator.name=Formulaic Assemblicator +tile.MachineBlock3.FuelwoodHeater.name=Fuelwood Heater //Plastic tile.PlasticBlock.name=Plastic Block @@ -828,6 +829,7 @@ tooltip.Oredictionificator=A machine used to unify and translate between various tooltip.Factory=A machine that serves as an upgrade to regular machinery, allowing for multiple processing operations to occur at once. tooltip.ResistiveHeater=A condensed, coiled resistor capable of converting electrical energy directly into heat energy. tooltip.FormulaicAssemblicator=A machine that uses energy to rapidly craft items and blocks from Crafting Formulas. Doubles as an advanced crafting bench. +tooltip.FuelwoodHeater=A machine that is capable of producing large quantities of heat energy by burning combustible items. tooltip.HeatGenerator=A generator that uses the heat of lava or other burnable resources to produce energy. tooltip.SolarGenerator=A generator that uses the power of the sun to produce energy. From 8f96e5114253bfa455dc03550bcce07de9af5d7b Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 23 Apr 2016 17:44:14 -0400 Subject: [PATCH 58/62] Reduced Formulaic Assemblicator CPU usage by a factor of 10 --- .../content/assemblicator/RecipeFormula.java | 36 ++++++------------ .../TileEntityFormulaicAssemblicator.java | 8 ++-- .../assets/mekanism/gui/elements/GuiSlot.png | Bin 17640 -> 3149 bytes 3 files changed, 16 insertions(+), 28 deletions(-) diff --git a/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java b/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java index 4f7ac2d6f..5c73d99bf 100644 --- a/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java +++ b/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java @@ -14,17 +14,22 @@ public class RecipeFormula public ItemStack[] input = new ItemStack[9]; - public RecipeFormula(ItemStack[] inv) + public IRecipe recipe = null; + + public RecipeFormula(World world, ItemStack[] inv) { - this(inv, 0); + this(world, inv, 0); } - public RecipeFormula(ItemStack[] inv, int start) + public RecipeFormula(World world, ItemStack[] inv, int start) { for(int i = 0; i < 9; i++) { input[i] = StackUtils.size(inv[start+i], 1); } + + resetToRecipe(); + recipe = RecipeUtils.getRecipeFromGrid(dummy, world); } private void resetToRecipe() @@ -37,44 +42,29 @@ public class RecipeFormula public boolean matches(World world, ItemStack[] newInput, int start) { - resetToRecipe(); - - IRecipe origRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); - for(int i = 0; i < 9; i++) { dummy.setInventorySlotContents(i, newInput[start+i]); } - IRecipe newRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); - - return origRecipe == newRecipe; + return recipe.matches(dummy, world); } public boolean isIngredientInPos(World world, ItemStack stack, int i) { resetToRecipe(); - - IRecipe origRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); dummy.setInventorySlotContents(i, stack); - IRecipe newRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); - return origRecipe == newRecipe; + return recipe.matches(dummy, world); } public boolean isIngredient(World world, ItemStack stack) { - resetToRecipe(); - - IRecipe origRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); - for(int i = 0; i < 9; i++) { dummy.setInventorySlotContents(i, stack); - IRecipe newRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); - - if(origRecipe == newRecipe) + if(recipe.matches(dummy, world)) { return true; } @@ -92,9 +82,7 @@ public class RecipeFormula public IRecipe getRecipe(World world) { - resetToRecipe(); - - return RecipeUtils.getRecipeFromGrid(dummy, world); + return recipe; } public boolean isFormulaEqual(World world, RecipeFormula formula) diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java index 065919d7e..6e52271ee 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -108,7 +108,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im if(item.getInventory(inventory[2]) != null && !item.isInvalid(inventory[2])) { - RecipeFormula itemFormula = new RecipeFormula(item.getInventory(inventory[2])); + RecipeFormula itemFormula = new RecipeFormula(worldObj, item.getInventory(inventory[2])); if(itemFormula.isValidFormula(worldObj)) { @@ -144,7 +144,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im { boolean canOperate = true; - if(!formula.matches(worldObj, inventory, 27)) + if(!isRecipe) { canOperate = moveItemsToGrid(); } @@ -456,7 +456,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im if(item.getInventory(inventory[2]) == null) { - RecipeFormula formula = new RecipeFormula(inventory, 27); + RecipeFormula formula = new RecipeFormula(worldObj, inventory, 27); if(formula.isValidFormula(worldObj)) { @@ -592,7 +592,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im } } - formula = new RecipeFormula(inv); + formula = new RecipeFormula(worldObj, inv); } else { formula = null; diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiSlot.png b/src/main/resources/assets/mekanism/gui/elements/GuiSlot.png index 4c395c5f563dd5e756b6f48e54b0523260bea9df..a022df7db24770f203c0dbd01652a1a44048bd19 100644 GIT binary patch literal 3149 zcmeHKc{J1u8~)8OW67Y#UM_`@L8%7m8hcT8gJjE=!B{KFFkD2kWZ%uW-B7kBTZPH4 zl+le!b|a0o$&AJ_V|@Pp{Rn@C`-hblYx)wW$s6)N+Yf@2l20d6l0c z6Z%b>d4fvgqw*^HOr#lNFZ_lk;l) zR(&8P6ZE4B{q`2<&Q6vbYT4yCme*qIDT7|kJJ095KleoF$EIWaz9Oh2DG;=MKuUpV z=DWTvGa>e=r=L8CmH{hI78m~XD!DmDB!$wiaS7Ni|0E{1r)s!}pr1&;=E_z(t3;c# z?Y;CQn_$M_rv_qUT8_+4JfHFRvD_4}`O^_T>!P!t&YTx6x51oSpWli>#P% zg6`T9ZjqUoug=GLRFIn>-kXquuP`%Y(WqR~q=hJtbb!o)IbI|Cq3~7Bc{gn3;_xLQ zN$pX&OA;$P@pi;Llg9huaSd0XHMVK#*5m3gmRGiI`zVq)0xk(z6OSju8U-LKg(s6c z1TCF;4*IAVKxZVz{2wO>L$$=}#H3R_D*Pl5(>l*H&NUScb&t5GG}FlX@QPKrJlEB-j+4k68;b^hcI01jn;=ekrw}ub6ylZ=Qxo0)VIU*7*gN4pZ{P?@5?_QrQGi?2< zlZaVt{+l9N!-m`WD02)f56fj2CG(mS??ShY_{cvxh$>jT(w1H&)&vV!>>V?8nE!&+L{zcu&WGuZ)}vUV#mXM_&4n z<0aF8Jdt0#yqHogb@%n<41fFNajeT>2z`1ZbE8D7O$2^b<3cH0sFRFZUuA1hGn#<> zBXRKq3c*stgM8Bv9cJSAvxzR*tc$nLh?GQ5=5 zee!E;`)0@R5W8G&X>wwEd3pKT>rx~V*}X;&_B9ijd&JbddntO@cR;so!)T1nE?d>1 zQQ8lG-(%gpRl2ay+C5T*@*R+tB-ZSvz4e}C6w(s-w4>)gHMX~R+D)1wW=k;<5vM1~ z;c7V698LFH_q=wb@mTaBid$Q;IE}iw>0S7vtNC*y6@hyBAq3D4ZYPLekKD9-1^U`A zU0~wGmM$20zHn+-G&tkx5JQ-kkvt)s-E;uVJIL=3__~@Z*(Ak5ZTc|Tit$=t83So2 zTLFioM36&Rv7$LKZ9mnIb^xRIx#-g4=7&@ih@jjs@jL_ZeXe+wdG`O?=BXF~B1)$X zmr;Ap?`$%!LsLbVDVt21)%vyH)?>Mos`~BJFS{!*vVyE0wbB(dp}a&7Bu*wqA+*)6vg7nahX8uL4L&3IOx+(<(Ufjdw?S>>g*ZMH8u>? z;Wjrn!%@cc)z#aBK`>>zj4BIaBlIbmJgqsqwzl^8z)fG@1*z$-F2lm6Eqe{su_oQ2 z6IO#gdhzv;bAf;^pTvc|E8_Tf3KF;z)1_3oX=MMA@`8xT79|@OVk-2c;L!|Dn1vkd zc!!{rc;nahdb0KVkFgdm_om7^Uqc_54OE^P&j^1=6`};ft1uhZPP`*HUjK9T*-XN& zwa)g8vVVcM6B|>I-fY#dUl2O}!SZ3uU`-3vIx1Q@bez`=8HZGeDB+P#%Q542MPa>! z+{Z=SVWV1%R$a3d(ZT|Qycr%F4s+)wX=bmab97HpTeY{z3BaH*8wAt!Dp$Kz^9G9# zw;EG(s8PxWL_>LG+*W{d5E2CDMwr(bJ=s>5@5_U@7koliJqPZMbDb z%D+QR&XP!M0_^Be2`WK| zA5po#15wo-C-4PJ&%J7a%Zwt_sd9%!W%WxF(aHv%6fjBPa)}Xwu@x{LJISbAd#C(w x3jQxD|Kj|!3xDbJOP_x|RsU_0co_&6LRofJhl>MC`)>kZZfa#xZ{+#Me*p4Uos9qh literal 17640 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 Q2)xo#GaPSEnEld!0cXa98UO$Q From 65be977161a2a5c36d9f544957a7397b52b9d1c5 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 23 Apr 2016 18:51:55 -0400 Subject: [PATCH 59/62] Formulaic Assemblicators are now 1000 times more efficient, combined with the last commit. I'm proud --- .../content/assemblicator/RecipeFormula.java | 1 + .../TileEntityFormulaicAssemblicator.java | 134 +++++++++++------- 2 files changed, 87 insertions(+), 48 deletions(-) diff --git a/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java b/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java index 5c73d99bf..3713ca9d1 100644 --- a/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java +++ b/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java @@ -29,6 +29,7 @@ public class RecipeFormula } resetToRecipe(); + recipe = RecipeUtils.getRecipeFromGrid(dummy, world); } diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java index 6e52271ee..996c0b54a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -59,6 +59,9 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im public TileComponentConfig configComponent; public TileComponentSecurity securityComponent; + public ItemStack lastFormulaStack; + public boolean needsFormulaUpdate = false; + public TileEntityFormulaicAssemblicator() { super("FormulaicAssemblicator", MachineType.FORMULAIC_ASSEMBLICATOR.baseEnergy); @@ -102,39 +105,28 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im pulseOperations++; } + RecipeFormula prev = formula; + if(inventory[2] != null && inventory[2].getItem() instanceof ItemCraftingFormula) { ItemCraftingFormula item = (ItemCraftingFormula)inventory[2].getItem(); - if(item.getInventory(inventory[2]) != null && !item.isInvalid(inventory[2])) + if(formula == null || lastFormulaStack != inventory[2]) { - RecipeFormula itemFormula = new RecipeFormula(worldObj, item.getInventory(inventory[2])); - - if(itemFormula.isValidFormula(worldObj)) - { - if(formula != null && !formula.isFormulaEqual(worldObj, itemFormula)) - { - itemFormula = formula; - operatingTicks = 0; - } - else if(formula == null) - { - formula = itemFormula; - } - } - else { - formula = null; - item.setInvalid(inventory[2], true); - } - } - else { - formula = null; + loadFormula(); } } else { formula = null; } + if(prev != formula) + { + needsFormulaUpdate = true; + } + + lastFormulaStack = inventory[2]; + if(autoMode && formula == null) { toggleAutoMode(); @@ -185,22 +177,55 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im } } + public void loadFormula() + { + ItemCraftingFormula item = (ItemCraftingFormula)inventory[2].getItem(); + + if(item.getInventory(inventory[2]) != null && !item.isInvalid(inventory[2])) + { + RecipeFormula itemFormula = new RecipeFormula(worldObj, item.getInventory(inventory[2])); + + if(itemFormula.isValidFormula(worldObj)) + { + if(formula != null && !formula.isFormulaEqual(worldObj, itemFormula)) + { + formula = itemFormula; + operatingTicks = 0; + } + else if(formula == null) + { + formula = itemFormula; + } + } + else { + formula = null; + item.setInvalid(inventory[2], true); + } + } + else { + formula = null; + } + } + @Override public void markDirty() { super.markDirty(); - if(formula == null) + if(worldObj != null && !worldObj.isRemote) { - for(int i = 0; i < 9; i++) + if(formula == null) { - dummyInv.setInventorySlotContents(i, inventory[27+i]); + for(int i = 0; i < 9; i++) + { + dummyInv.setInventorySlotContents(i, inventory[27+i]); + } + + isRecipe = MekanismUtils.findMatchingRecipe(dummyInv, worldObj) != null; + } + else { + isRecipe = formula.matches(worldObj, inventory, 27); } - - isRecipe = MekanismUtils.findMatchingRecipe(dummyInv, worldObj) != null; - } - else { - isRecipe = formula.matches(worldObj, inventory, 27); } } @@ -582,20 +607,23 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im if(dataStream.readBoolean()) { - ItemStack[] inv = new ItemStack[9]; - - for(int i = 0; i < 9; i++) + if(dataStream.readBoolean()) { - if(dataStream.readBoolean()) + ItemStack[] inv = new ItemStack[9]; + + for(int i = 0; i < 9; i++) { - inv[i] = PacketHandler.readStack(dataStream); + if(dataStream.readBoolean()) + { + inv[i] = PacketHandler.readStack(dataStream); + } } + + formula = new RecipeFormula(worldObj, inv); + } + else { + formula = null; } - - formula = new RecipeFormula(worldObj, inv); - } - else { - formula = null; } } @@ -609,26 +637,36 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im data.add(controlType.ordinal()); data.add(isRecipe); - if(formula != null) + if(needsFormulaUpdate) { data.add(true); - for(int i = 0; i < 9; i++) + if(formula != null) { - if(formula.input[i] != null) + data.add(true); + + for(int i = 0; i < 9; i++) { - data.add(true); - data.add(formula.input[i]); - } - else { - data.add(false); + if(formula.input[i] != null) + { + data.add(true); + data.add(formula.input[i]); + } + else { + data.add(false); + } } } + else { + data.add(false); + } } else { data.add(false); } + needsFormulaUpdate = false; + return data; } From 112c20c521d66a1799de35489c7bbe2c6d487334 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 23 Apr 2016 18:59:38 -0400 Subject: [PATCH 60/62] Fixed falling through certain Generator-related blocks --- .../mekanism/generators/common/block/BlockGenerator.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 44ddf2a3c..63be3713e 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -53,6 +53,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; @@ -131,6 +132,14 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB return !GeneratorType.getFromMetadata(meta).hasModel; } + @Override + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) + { + setBlockBoundsBasedOnState(world, x, y, z); + + return super.getCollisionBoundingBoxFromPool(world, x, y, z); + } + @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) From f645ced8cf4b7b6acb0cc0da8508261b85f9cf9c Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 23 Apr 2016 19:35:34 -0400 Subject: [PATCH 61/62] Fixed orphaned TEs. I hope this never is an issue again --- src/main/java/mekanism/common/block/BlockBasic.java | 2 ++ src/main/java/mekanism/common/block/BlockBounding.java | 8 ++++++++ src/main/java/mekanism/common/block/BlockObsidianTNT.java | 8 ++++++++ 3 files changed, 18 insertions(+) diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 35f5946b1..8ab1f831e 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -908,6 +908,8 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon } super.breakBlock(world, x, y, z, block, meta); + + world.removeTileEntity(x, y, z); } @Override diff --git a/src/main/java/mekanism/common/block/BlockBounding.java b/src/main/java/mekanism/common/block/BlockBounding.java index e97da9420..0050baee5 100644 --- a/src/main/java/mekanism/common/block/BlockBounding.java +++ b/src/main/java/mekanism/common/block/BlockBounding.java @@ -42,6 +42,14 @@ public class BlockBounding extends Block return false; } } + + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int meta) + { + super.breakBlock(world, x, y, z, block, meta); + + world.removeTileEntity(x, y, z); + } @Override public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) diff --git a/src/main/java/mekanism/common/block/BlockObsidianTNT.java b/src/main/java/mekanism/common/block/BlockObsidianTNT.java index 6e54a94ac..4fc6002d0 100644 --- a/src/main/java/mekanism/common/block/BlockObsidianTNT.java +++ b/src/main/java/mekanism/common/block/BlockObsidianTNT.java @@ -30,6 +30,14 @@ public class BlockObsidianTNT extends Block @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister register) {} + + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int meta) + { + super.breakBlock(world, x, y, z, block, meta); + + world.removeTileEntity(x, y, z); + } @Override public void onBlockAdded(World world, int x, int y, int z) From 5b893a1a813133912ce81a9ed99fe96f48a0ab34 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 23 Apr 2016 20:26:01 -0400 Subject: [PATCH 62/62] Fuelwood Heater textures --- .../java/mekanism/client/ClientProxy.java | 3 +- .../render/block/MachineRenderingHandler.java | 9 ---- .../tileentity/RenderFuelwoodHeater.java | 44 ------------------ .../mekanism/common/block/BlockBasic.java | 12 ++--- .../mekanism/common/block/BlockMachine.java | 9 ++-- .../fuelwood_heater/FuelwoodHeaterBack.png | Bin 0 -> 1833 bytes .../fuelwood_heater/FuelwoodHeaterBackOn.png | Bin 0 -> 2607 bytes .../fuelwood_heater/FuelwoodHeaterBottom.png | Bin 0 -> 1479 bytes .../FuelwoodHeaterBottomOn.png | Bin 0 -> 2241 bytes .../fuelwood_heater/FuelwoodHeaterFront.png | Bin 0 -> 1833 bytes .../fuelwood_heater/FuelwoodHeaterFrontOn.png | Bin 0 -> 2607 bytes .../fuelwood_heater/FuelwoodHeaterLeft.png | Bin 0 -> 1512 bytes .../fuelwood_heater/FuelwoodHeaterLeftOn.png | Bin 0 -> 2215 bytes .../fuelwood_heater/FuelwoodHeaterRight.png | Bin 0 -> 1514 bytes .../fuelwood_heater/FuelwoodHeaterRightOn.png | Bin 0 -> 2215 bytes .../fuelwood_heater/FuelwoodHeaterTop.png | Bin 0 -> 1890 bytes .../fuelwood_heater/FuelwoodHeaterTopOn.png | Bin 0 -> 2314 bytes 17 files changed, 11 insertions(+), 66 deletions(-) delete mode 100644 src/main/java/mekanism/client/render/tileentity/RenderFuelwoodHeater.java create mode 100644 src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterBack.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterBackOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterBottom.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterBottomOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterFront.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterFrontOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterLeft.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterLeftOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterRight.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterRightOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterTopOn.png diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 414dd2a69..920dc1388 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -90,7 +90,6 @@ import mekanism.client.render.tileentity.RenderElectrolyticSeparator; import mekanism.client.render.tileentity.RenderEnergyCube; import mekanism.client.render.tileentity.RenderFluidTank; import mekanism.client.render.tileentity.RenderFluidicPlenisher; -import mekanism.client.render.tileentity.RenderFuelwoodHeater; import mekanism.client.render.tileentity.RenderGasTank; import mekanism.client.render.tileentity.RenderLaser; import mekanism.client.render.tileentity.RenderLaserAmplifier; @@ -323,7 +322,7 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityBoilerValve.class, "BoilerValve", new RenderThermoelectricBoiler()); ClientRegistry.registerTileEntity(TileEntitySecurityDesk.class, "SecurityDesk", new RenderSecurityDesk()); ClientRegistry.registerTileEntity(TileEntityQuantumEntangloporter.class, "QuantumEntangloporter", new RenderQuantumEntangloporter()); - ClientRegistry.registerTileEntity(TileEntityFuelwoodHeater.class, "FuelwoodHeater", new RenderFuelwoodHeater()); + GameRegistry.registerTileEntity(TileEntityFuelwoodHeater.class, "FuelwoodHeater"); } @Override diff --git a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index fdac9a6e3..a0baa5454 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -61,7 +61,6 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler public ModelSolarNeutronActivator solarNeutronActivator = new ModelSolarNeutronActivator(); public ModelResistiveHeater resistiveHeater = new ModelResistiveHeater(); public ModelQuantumEntangloporter quantumEntangloporter = new ModelQuantumEntangloporter(); - public ModelResistiveHeater fuelwoodHeater = new ModelResistiveHeater(); @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) @@ -227,14 +226,6 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ResistiveHeater.png")); resistiveHeater.render(0.0625F, false, mc.renderEngine); } - else if(type == MachineType.FUELWOOD_HEATER) - { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.05F, -0.96F, 0.05F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FuelwoodHeater.png")); - fuelwoodHeater.render(0.0625F, false, mc.renderEngine); - } else if(type == MachineType.SOLAR_NEUTRON_ACTIVATOR) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderFuelwoodHeater.java b/src/main/java/mekanism/client/render/tileentity/RenderFuelwoodHeater.java deleted file mode 100644 index a4727be12..000000000 --- a/src/main/java/mekanism/client/render/tileentity/RenderFuelwoodHeater.java +++ /dev/null @@ -1,44 +0,0 @@ -package mekanism.client.render.tileentity; - -import mekanism.client.model.ModelResistiveHeater; -import mekanism.common.tile.TileEntityFuelwoodHeater; -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 RenderFuelwoodHeater extends TileEntitySpecialRenderer -{ - private ModelResistiveHeater model = new ModelResistiveHeater(); - - @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityFuelwoodHeater)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityFuelwoodHeater 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, "FuelwoodHeater.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, tileEntity.isActive, field_147501_a.field_147553_e); - GL11.glPopMatrix(); - } -} diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 8ab1f831e..4505152fe 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -189,14 +189,10 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon icons[5][0] = register.registerIcon("mekanism:SteelBlock"); icons[6][0] = register.registerIcon(ICON_BASE); - MekanismRenderer.loadDynamicTextures(register, "bin/BinBasic", binIcons[0], DefIcon.getActivePair(register.registerIcon("mekanism:bin/BinBasicSide"), 3, 4, 5), - new DefIcon(register.registerIcon("mekanism:bin/BinBasicTop"), 0), new DefIcon(register.registerIcon("mekanism:bin/BinBasicTopOn"), 6)); - MekanismRenderer.loadDynamicTextures(register, "bin/BinAdvanced", binIcons[1], DefIcon.getActivePair(register.registerIcon("mekanism:bin/BinAdvancedSide"), 3, 4, 5), - new DefIcon(register.registerIcon("mekanism:bin/BinAdvancedTop"), 0), new DefIcon(register.registerIcon("mekanism:bin/BinAdvancedTopOn"), 6)); - MekanismRenderer.loadDynamicTextures(register, "bin/BinElite", binIcons[2], DefIcon.getActivePair(register.registerIcon("mekanism:bin/BinEliteSide"), 3, 4, 5), - new DefIcon(register.registerIcon("mekanism:bin/BinEliteTop"), 0), new DefIcon(register.registerIcon("mekanism:bin/BinEliteTopOn"), 6)); - MekanismRenderer.loadDynamicTextures(register, "bin/BinUltimate", binIcons[3], DefIcon.getActivePair(register.registerIcon("mekanism:bin/BinUltimateSide"), 3, 4, 5), - new DefIcon(register.registerIcon("mekanism:bin/BinUltimateTop"), 0), new DefIcon(register.registerIcon("mekanism:bin/BinUltimateTopOn"), 6)); + MekanismRenderer.loadDynamicTextures(register, "bin/BinBasic", binIcons[0], new DefIcon(register.registerIcon("mekanism:bin/BinBasicTop"), 0), new DefIcon(register.registerIcon("mekanism:bin/BinBasicTopOn"), 6)); + MekanismRenderer.loadDynamicTextures(register, "bin/BinAdvanced", binIcons[1], new DefIcon(register.registerIcon("mekanism:bin/BinAdvancedTop"), 0), new DefIcon(register.registerIcon("mekanism:bin/BinAdvancedTopOn"), 6)); + MekanismRenderer.loadDynamicTextures(register, "bin/BinElite", binIcons[2], new DefIcon(register.registerIcon("mekanism:bin/BinEliteTop"), 0), new DefIcon(register.registerIcon("mekanism:bin/BinEliteTopOn"), 6)); + MekanismRenderer.loadDynamicTextures(register, "bin/BinUltimate", binIcons[3], new DefIcon(register.registerIcon("mekanism:bin/BinUltimateTop"), 0), new DefIcon(register.registerIcon("mekanism:bin/BinUltimateTopOn"), 6)); icons[7][0] = ctms[7][0].mainTextureData.icon; icons[8][0] = register.registerIcon("mekanism:SteelCasing"); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 71572bc90..c3032b308 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -230,9 +230,10 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo case MACHINE_BLOCK_3: icons[0][0] = BASE_ICON; icons[2][0] = BASE_ICON; - MekanismRenderer.loadDynamicTextures(register, "oredictionificator/" + MachineType.OREDICTIONIFICATOR.name, icons[3], DefIcon.getAll(register.registerIcon("mekanism:oredictionificator/OredictionificatorSide"))); + MekanismRenderer.loadDynamicTextures(register, "oredictionificator/" + MachineType.OREDICTIONIFICATOR.name, icons[3]); icons[4][0] = BASE_ICON; - MekanismRenderer.loadDynamicTextures(register, "formulaic_assemblicator/" + MachineType.FORMULAIC_ASSEMBLICATOR.name, icons[5], DefIcon.getAll(register.registerIcon("mekanism:formulaic_assemblicator/FormulaicAssemblicatorSide"))); + MekanismRenderer.loadDynamicTextures(register, "formulaic_assemblicator/" + MachineType.FORMULAIC_ASSEMBLICATOR.name, icons[5]); + MekanismRenderer.loadDynamicTextures(register, "fuelwood_heater/" + MachineType.FUELWOOD_HEATER.name, icons[6]); break; } @@ -433,6 +434,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo { case 3: case 5: + case 6: return icons[meta][side]; default: return icons[meta][0] != null ? icons[meta][0] : BASE_ICON; @@ -487,6 +489,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo { case 3: case 5: + case 6: boolean active = MekanismUtils.isActive(world, x, y, z); return icons[meta][MekanismUtils.getBaseOrientation(side, tileEntity.facing)+(active ? 6 : 0)]; default: @@ -1190,7 +1193,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo OREDICTIONIFICATOR(MachineBlock.MACHINE_BLOCK_3, 3, "Oredictionificator", 52, TileEntityOredictionificator.class, false, false, false), RESISTIVE_HEATER(MachineBlock.MACHINE_BLOCK_3, 4, "ResistiveHeater", 53, TileEntityResistiveHeater.class, true, true, false), FORMULAIC_ASSEMBLICATOR(MachineBlock.MACHINE_BLOCK_3, 5, "FormulaicAssemblicator", 56, TileEntityFormulaicAssemblicator.class, true, false, true), - FUELWOOD_HEATER(MachineBlock.MACHINE_BLOCK_3, 6, "FuelwoodHeater", 58, TileEntityFuelwoodHeater.class, false, true, false); + FUELWOOD_HEATER(MachineBlock.MACHINE_BLOCK_3, 6, "FuelwoodHeater", 58, TileEntityFuelwoodHeater.class, false, false, false); public MachineBlock typeBlock; public int meta; diff --git a/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterBack.png b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterBack.png new file mode 100644 index 0000000000000000000000000000000000000000..b7932157392131c5a8c6c1caa21a5a000e1d14f5 GIT binary patch literal 1833 zcmV+^2iEwBP)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%S z*GWV{R9Fecm&uMIF%U!z6#FU;aDfAS2LJyZaAA?)z`k!&k?5hCl1B2hs#TV#Y}-jX zBQl&+XGWvZ+l3>O$;i0-{cbj&&zrqouV#3sd+f&OjW{H>-dA5vaD&fqJFp=nx`($eizSD_}HeV7$P8l0Ct1H0YMGU{|XW~mXG)4{}q>PRik zIr6|?y&^iI+R!?;2FB87fEuG#YD|q#y)>XTkg^V1=8A(pvskA4uthFv^<|TH&^FZu$&>gbb-=qtP&M{CcVO`k)y)CHq3I zp?G?KWDqy*_g%*^DN8AR;|0_lWFT3u*A@fy>P<%KCi7^`(+c0do3=4i{T6JD<-jF7wrDW%D210uJ{<=IiqZ X$a$w^63Vi100000NkvXXu0mjfR?did literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterBackOn.png new file mode 100644 index 0000000000000000000000000000000000000000..03a47c31c20c802ee2daa13860ef779a6dda16f0 GIT binary patch literal 2607 zcmY*Zc{~(a8y>P08Dw`Y(@0mv3}YLNeaXINC;KvDMl*A58GBhmsJPal$hBt6zAq8Q z6sX%bpwoGl z>14%*h3x&6H#l;u$F%{Wb2w!t9Gp1KCV-0@cxS-v8$7S~2ha*B&lb$dS=(ebP{pUYe6CTig zEwvsAq6<4n7gb+#5ZQGnH_2%9L&KVvJf{1wY7r?&?@yA%i3CP#E5C#+jt8#?zU!T* z$<$1_6q@)^%E>EF+;e~XP*@vCbvq&i^!VQ04(KZ#%ONr)-GnaP~imP5EU5p^bDQrs;r4q&zNyAn> zGZp0z2l9G?`kUk(wzgClx)WO+b2bMtv;eDuEz-)Ge9p+7P@Thr_E7y@JcgjOz8X&6 zj?0u{J}k+46wA{en-E!~r@2ca9@V}#8J*`-oD?{|?s@`V$^?BGl(*o~|Z&@sm3C3N;Es*3=rgIr?dCb(a?}f?0)lT!&T3CwHV$y z!Nb%_-U+YGin~r8TOW5;g740h9R!|1@FNeGkOheCB+p45XGLx0_y z2*s%%?a8v1&vJD?C^fVdx*p43HFmO^u9O5e-V+$EDVXwgU%$ZxeB z-FMli9Kv?59r_h7Mt-v0Y{CpWyl$&A?)&0zhYhwC3}9O3{W_jKkT@W`eS7nhExTSs z=BsSd^Bre|JsJYktIT3N@Y}Z$Fip{^+=<32+ytgUaX20pqXY=bs|cWQDaU()tWexz_?ui19H z2>jS=#S+P3rDDZZRy(Q59$)_~s4#$@b}0O=3{_{j_SWMgp5A^!8AV}x!xL=u_MyAr zbA_v!IcwyEKltwr8K?SM#m@ye{K826xbt8q7uLqkadUO^J;Lew;jD|3dtY|D4qzb>KPFe-_hTzbQc*7yRr0$QsJJOL zjpGV{Pf8?RAtBt_-1P_z0MOYZZ`k4NOpKL1&;bxPPqe!iBqSj4q;UWMh!EwIFu)7v z1_}xAM`4viRKY(H$|vz@8VUyegy3$eg6&MqLE31H7f2o=2ayJ=v4B7z1jf@_*-}UE zpYoHFD%cl?3siBb(dv1$w}vi3PTny7f}xJNlMUG7$t;!^P!Ywqf@l?5-Ln&u)RBBqp$ zv<&a(5#_`aOJ?jD?sX2{=CbzE^|H2jsV_Cn8QQ74xVdT3weW5kzc9T!Kc73r%ZFFp z9@l&_0msH{NIxXCIB;x^jNES&6%lFB8)Z5}@LrZNxp(F>YdSS-&V`$|EN`5XJE^W% zgrriAt&II1oj~2#m}EdXrvkhY)-Hf#I-1PF`g&Do3@Z=GdKjEMv^0GwF*~rGHBKx! zZlYf1kx)yZtK)?qO^HLz9zTFWeeE+mu$#kUobX=UIkJ8hr1@A{lLO~pKWjXHrM|=Y zD940Mpp<=f$>fLe73)}3{>JhBlJAeU^RE;k>weC3gWX4$3~&e$A2HXbeuFj^>@C%| zs^+w7h7;$K0PFz1G+7Cr=9-%&(T5(Jbuh8NO+3f_x)2pony*`ZEMjtHPW@E~f)u1=>_&`l3@5egOl{1px zBVUt9rKybc-#O+|8oxyCdtujKxWi!A+oMfX^r;i7fF#|!@k$6F(WGEj0Zc|iL z)WM@kUaNSDfB^a)i#xf#brkJ3Y}mtQ)wfFRKjH$ylY6R(Sb}gS7Y8COxKk9c&(e~|E^7TAaDJ8Rv+xzX?bSTNMlO)HwF;X|rwR~TOw7JPSNSnr% zR9LMW!`lO3f|Isc)R(Z1sc#Ui!sVr&dw1!&@UW^vJ7!iP7t?_h(E*l^Jrf={PRuM zJ48yS^RSUv`4@&m=?_-)`hkV&%M<28Ed?g8Tq=F7pfRB`Kp#^Nv=Vmfo8l9roiF-r z2?oIO>KCfSz2Mk9?cAj$_u4yWv5w58syvvQrmF#{306Ys(n` literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterBottom.png b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterBottom.png new file mode 100644 index 0000000000000000000000000000000000000000..0b708352e3a3b8b43773a310b0f54feaee06b5ef GIT binary patch literal 1479 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFso&TM3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7p`n7grJkXw zg|U&Tj)IYap{c%srM{tou7RPIp@Ef=fdUjL0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LbwWAlok!2}F2{ffi_eM3D1ke6TzeSPsO&CP|YE-nd5MYtEM!Nnn! z1*!T$sm1xFMajU3OH&3}Rbb^@l$uzQUlfv`p92fUfQT9C8bQHoK%2WtOF;xE1B+DuBIhm5JLe zCOFN5>P^Az7E_#h^?{Dj2SqMYWW$7jDG0=bCtV;1p7>MqfGNHRn6yGV67 z%P+TtXt@TeRPT&Qk?(K68MXFW-uA~9)9Ux%Pd)u~lWSJ_?z?g8!*8n!c|W=Q`#jUl z?$C>uQf=g-O>U%bmh_1Hl)qhih3>No8#%uAs=a#kMl+v8=uJP(B(W!U>gS(1@o{Uz zHhE5xnC-TBp;XA~(4P?%2Rdi(d01j~GS5u<=EH&v!-tYTw7yo^-uzpaA34o~Wu{Jg z$DBo5E}696%-g=%{6o&N)eD5Gj2uMQq;1Z;Y2tS`Ph973o&3`o(~g90`N4ClQG4z| zu6SmDF_99seIHIeGXV(40R~pLO(i_qO^mcyU?7);D<8>_i~>#8f6 zZ+tv#>~J)4UyR(rrFvJV&EKSxwIEj1^X|Oa3*Mw{tz7-(e#c)?=6%oh&veeZETX&d z1@lIhqIE?spU!=l>+|kU=QH`>x~nG@4h2cCso*fOtElC#&zkk?9jkT30acMj8ItEi zJwColiI+CfYuTy?3bgK~HJpF-Z&oS}tR^MwsYxGvDT{yuqeZFOgpa07X$DW(St-tzx=NpRPO!1{%c(yx8zLyYttE+8OnYvEzO)CKMhp0db;|#taD0e0swlyHedh% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterBottomOn.png b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterBottomOn.png new file mode 100644 index 0000000000000000000000000000000000000000..6c2b0ee8616093a862f9fc352311f6ce6d5faa42 GIT binary patch literal 2241 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 X$a$w^63Vi100000NkvXXu0mjfR?did literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterFrontOn.png new file mode 100644 index 0000000000000000000000000000000000000000..03a47c31c20c802ee2daa13860ef779a6dda16f0 GIT binary patch literal 2607 zcmY*Zc{~(a8y>P08Dw`Y(@0mv3}YLNeaXINC;KvDMl*A58GBhmsJPal$hBt6zAq8Q z6sX%bpwoGl z>14%*h3x&6H#l;u$F%{Wb2w!t9Gp1KCV-0@cxS-v8$7S~2ha*B&lb$dS=(ebP{pUYe6CTig zEwvsAq6<4n7gb+#5ZQGnH_2%9L&KVvJf{1wY7r?&?@yA%i3CP#E5C#+jt8#?zU!T* z$<$1_6q@)^%E>EF+;e~XP*@vCbvq&i^!VQ04(KZ#%ONr)-GnaP~imP5EU5p^bDQrs;r4q&zNyAn> zGZp0z2l9G?`kUk(wzgClx)WO+b2bMtv;eDuEz-)Ge9p+7P@Thr_E7y@JcgjOz8X&6 zj?0u{J}k+46wA{en-E!~r@2ca9@V}#8J*`-oD?{|?s@`V$^?BGl(*o~|Z&@sm3C3N;Es*3=rgIr?dCb(a?}f?0)lT!&T3CwHV$y z!Nb%_-U+YGin~r8TOW5;g740h9R!|1@FNeGkOheCB+p45XGLx0_y z2*s%%?a8v1&vJD?C^fVdx*p43HFmO^u9O5e-V+$EDVXwgU%$ZxeB z-FMli9Kv?59r_h7Mt-v0Y{CpWyl$&A?)&0zhYhwC3}9O3{W_jKkT@W`eS7nhExTSs z=BsSd^Bre|JsJYktIT3N@Y}Z$Fip{^+=<32+ytgUaX20pqXY=bs|cWQDaU()tWexz_?ui19H z2>jS=#S+P3rDDZZRy(Q59$)_~s4#$@b}0O=3{_{j_SWMgp5A^!8AV}x!xL=u_MyAr zbA_v!IcwyEKltwr8K?SM#m@ye{K826xbt8q7uLqkadUO^J;Lew;jD|3dtY|D4qzb>KPFe-_hTzbQc*7yRr0$QsJJOL zjpGV{Pf8?RAtBt_-1P_z0MOYZZ`k4NOpKL1&;bxPPqe!iBqSj4q;UWMh!EwIFu)7v z1_}xAM`4viRKY(H$|vz@8VUyegy3$eg6&MqLE31H7f2o=2ayJ=v4B7z1jf@_*-}UE zpYoHFD%cl?3siBb(dv1$w}vi3PTny7f}xJNlMUG7$t;!^P!Ywqf@l?5-Ln&u)RBBqp$ zv<&a(5#_`aOJ?jD?sX2{=CbzE^|H2jsV_Cn8QQ74xVdT3weW5kzc9T!Kc73r%ZFFp z9@l&_0msH{NIxXCIB;x^jNES&6%lFB8)Z5}@LrZNxp(F>YdSS-&V`$|EN`5XJE^W% zgrriAt&II1oj~2#m}EdXrvkhY)-Hf#I-1PF`g&Do3@Z=GdKjEMv^0GwF*~rGHBKx! zZlYf1kx)yZtK)?qO^HLz9zTFWeeE+mu$#kUobX=UIkJ8hr1@A{lLO~pKWjXHrM|=Y zD940Mpp<=f$>fLe73)}3{>JhBlJAeU^RE;k>weC3gWX4$3~&e$A2HXbeuFj^>@C%| zs^+w7h7;$K0PFz1G+7Cr=9-%&(T5(Jbuh8NO+3f_x)2pony*`ZEMjtHPW@E~f)u1=>_&`l3@5egOl{1px zBVUt9rKybc-#O+|8oxyCdtujKxWi!A+oMfX^r;i7fF#|!@k$6F(WGEj0Zc|iL z)WM@kUaNSDfB^a)i#xf#brkJ3Y}mtQ)wfFRKjH$ylY6R(Sb}gS7Y8COxKk9c&(e~|E^7TAaDJ8Rv+xzX?bSTNMlO)HwF;X|rwR~TOw7JPSNSnr% zR9LMW!`lO3f|Isc)R(Z1sc#Ui!sVr&dw1!&@UW^vJ7!iP7t?_h(E*l^Jrf={PRuM zJ48yS^RSUv`4@&m=?_-)`hkV&%M<28Ed?g8Tq=F7pfRB`Kp#^Nv=Vmfo8l9roiF-r z2?oIO>KCfSz2Mk9?cAj$_u4yWv5w58syvvQrmF#{306Ys(n` literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterLeft.png b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterLeft.png new file mode 100644 index 0000000000000000000000000000000000000000..c7ecfd5685229d622c0b14d41aa95e8dea5e20a9 GIT binary patch literal 1512 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 Ynz3c`Sc)=a;n%^(BY<{u_kn}I1K0ko00000 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterRight.png b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterRight.png new file mode 100644 index 0000000000000000000000000000000000000000..d3df1155150b7d46c1806a236ebe7c7b86240cd2 GIT binary patch literal 1514 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFso&TM3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7p`n7grJkXw zg|U&Tj)IYap{c%srM{tou7RPIp@Ef=fdUjL0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LbwWAlok!2}F2{ffi_eM3D1ke6TzeSPsO&CP|YE-nd5MYtEM!Nnn! z1*!T$sm1xFMajU3OH&3}Rbb^@l$uzQUlfv`p92fUfQP^Az7IU0>^?{Dj2SqMYWW$7jDG0=bCtV;1p7>MqfGNHRn6xu8{L>j2n4&yg z978H@?U`oT|H*-;jq|&rl$6E<4GoK<@(+(+R#cHvSs}n7@W}2{ zemipghVf(G_QNhp4=d+A_*x};CT(-m_usJw(@%5S$?+ddFdZL*{HjdRr+Md}*H1e5wCG}m zcz0{U-Z*ic>8GRaJ1tyLvouKX&in6L-)rMHN9s*)x|$U#aQdC`f_jBT$?AT~C%gID z2i*T!^>^*`4F~QeG_F5%uXr9~X^Y$9iPxsQ*AnLZg$FINpPTfsEz+bxL z_43OrpFQ+^!}xiAN~*%os1J{>dThRVW#zFnt4nLIu$Ufge3PiK$0A^@d_W1??z?_< zSzBk#+Hh2qGwjIxS$=FOTbmv^Y-^mmxq4b3PyCyuaq(ToKZABlcBUsedB_#9WCxbLplGVM2h$4m|5HwwS|-jHQShic&Vx~_B z-_gv8YyroxfIaXJTN1hM4yv(OxSYKFfdFzhz zhffyRo!lGeAJ2Toc;4G1ZQG+a%>35+apl(ay>H8Yt55Fve>F?=r(MJL_dM0kH_TG= i*3NM&n0L^gk&WTS>I%>A?}fNQrLU)}pUXO@geCwB^-Jvl literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterRightOn.png new file mode 100644 index 0000000000000000000000000000000000000000..50a6df4964b178ebd0a055f9db8ab0d178d013af GIT binary patch literal 2215 zcmaJ@dpuNm8y~T#mb6hD$~37&b2;NOX4be4nhF`?l51n;Ftf~@F>^FCB(F&8vX;!J zR#EPv(%MLJNo!?Y3Q1DiqEu=yn@jS_+s@du?;o%Cd_L#=E}!T7eZJ50eE&Ep2i;w@ z*66Q6AP`#Ay%d^aMJiv-Rf_M2uP2HW%VyZw5B7q>U=c$AA{Y%QAmD;911aW4@`NNY8MVYqQtXx2SQK(8 z1dbr1{ubrub`a?V2|%PJ#tO{@002oKVgO5PbG+pqBpwG?VsS()fJ5T|5`ZJ&amY^( zN|8;#3M0`dE}wEKPGl4thWR8cRwNQ(MCKSs5RL_iL?RZ4$Kvs5MFd(X;lT_snkU@8 z%s>H!OaX@vb08j4$;b$WqG2*hq4e((xctwwJmIG{DH?_qGx%5lgHx8Y9O&lu|3kUl z&(T7d2L7Y>e-aDn5Kh*o5WdBi-q%w ze4nta6}4Entcb-b#9)=f{jXs!Unv}<+gSjt(WucpF2 z4dy#)E*y9;ZPQ~+wJ(wS+=(*WKf7QMgxS~>79KwF{n#X>^97z=)>l=#^W#|EfGpwk zz8w)6@7m>yi;Evy6OY}3R(QeJlcY*?#|B6&cEW*IcZjMnb6kOmfzRc zm(QBN8*4x7l*V(-89P${?je1h?vUa>%OAB?YVfnY|F6+$Wxbv-%Eb1U1|4tT^C?rg z+USdg8oI9j=j^zt39e1Av?B)TqN)oLs7Zsy6A z>W7aKK0I!_G*l&r{v!c4c4T-Gl9MIRWHMP&uo^o;7H&K^XPC$J`a#$A7t`6!(6ZvV z=M9x{#zc2~(k-8J8bwceKlo%>tl_9vP%@IuH1>v-lkIE&O+WPo9)B6-7<6q=EolC* zv)u(kR*6ZfONA|g6{cR0mr;ByJ&tlGI&iJUDLC!x>&{<#rZR!EtqU9L&KOI2(v)laBeZA?AcclQwz@p1%xzyf2KJJ7^7lc_NL&bl}NutlclFwy!a zjY{`j-JU6S+mb~kksNACxuJLxbvB8S+t@h$l^{(d|JU2d*iHJ=HBZF62eO{J`N=(b zTJwuBs_nVw`hE}pCU(2OP{b<=er}x55aDPQnXMDOC8mF2vUwd(t$1~H4}R4>owOw+5bUTwZd+OC4i%un4? zg+HPBXK7C5+U(!1j~DCjko(>q4XC;ob#aNz*z%gTRXo z8@^v)&yA%ZPtxjbvuZANsp8l7T}+R8F8^-4rm5-WsfTj)+BA?|(p?`kV^Dt1T!I@b z+R#Id9sKdw7J108U2a-t>5_-?eSHt4S<)*RW1SW~f%o_26`bCapNB=GNA&yO=mu)G zoN6`R_Kuc)SfAZ&b<|rR-EW_rGb!a%#J(9kB>awbGiayKcSc1}y;kdd&Stka9V%Vl za;6h^zSQp=AMH<>puuy`plx`EJUleqniYEFqTDn9S4#b|zTEU^`NzW6kusO~+j=|F cWFac*hzWH~N@0GIp7Pg$>g-ObbUb|gFUKpbl>h($ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterTop.png b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterTop.png new file mode 100644 index 0000000000000000000000000000000000000000..f9ecff1babed9fecf2f66c7e9e13bac037dfe32f GIT binary patch literal 1890 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@h0RWvgsq9nrC$0|8LS1&Oo zKPgqOBDVmjgMq=O!V1XDO)W`OsL0L9E4HezRRXK90GK4GQ<#=IWDQi$wiq3C7Jno3LtY6lk!VTY?YKi7Qq3;oh6xR z2%GYXq22;|P#+|tZ>VRWk4+oUv%bD?7ozB^NGt$r%gx2Av$!NE6^D&5oy8%Q1*!T$ zsm1xFMaii^<;pmmfZqY|Fadhm2ILzn|Dw!PV2FXj#m>+M>_ZeWMEKZ%J!s{UT9jFq zn&MWJp9>Dig2bZYRFLazm0-?8wgqGn*nd`;dBr7(dC94sE_OhZ^fEJ3tW2Fv+{_Hz zObsj@oed3L%^VF(%v^y2#+Jq|W|oHLHu@M^5$-{loRXhhnhW#=)Z`R|$!3I1M$(Ef z*+w73tKb9)Nhh#yz-g%kZcCx&BD5k|3X$`~8A|4aj78FlYOIxWQEFmIeo;t%evX|Z zD3dA#WaO9R7iZ)bC^$PS7#SFvDrkgf=B4D97i)rjkD>)?nvFgv;~-@uNG=770<)fG%iD2%v;S$wz`%6I)5S3)g7fHf&;CaS0qMdVGcEspSD_MT|Wc~Hmr5Pqtid{#wg) z-59aOX8!qUPm3(qgsr~t`m0Ty&7Rs5&p*p4bGIJKeq;BP&tQJeZErs50p&!)xIe|)t6W{Kdw!^?@uPAD4d$Wtn#?!sm<9N^YlBmY*b56pn0P zCER}aVXXL!_Q+Qp&r{Dch@IS@rEs{YW?e)e+XU9IzEXpWIcCY5*UwtOd9E??mESj> z2gx-~TbP<_LU}ZvJD#$sGFZBOc~Zl%eJRqB%#-Df7aYFXbN2Ftz&k~`9sFP2y3K$3 zyhvntcA?SI(D_eBuNPNxNYsoUGZ^`PdH$QWv?I!|uD(5Bs{fk@-VzLwK3$v()o$J7 z2UZf^D~%5@&OgQB{gGE>((;H^C&Z!)<6louF|yTKo6V+K=Dwott5kx~81vpQyD$lcvNHAwD){{X+E? z&2P;w-$*KWmA($0?V~pBPM3Ih>+!1SQ~!Sm)V|_~4@h#04>Z}7wKJxQ>q&~|E1m=a zwm&NO-!s*47}dCmaZFt#efna*^7X_^fqN$Ce*SsKtl<6uha{a+wvwn#7B`#ncX6cd zYq-E{IW?ei-ELdEqtlNFlry|tKHKp8VTR`$>~DV1X0w>%duc*FLs{RFI|pB0PXSeL Mp00i_>zopr09V1VhX4Qo literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterTopOn.png new file mode 100644 index 0000000000000000000000000000000000000000..4106bd614c24f6909b072c15e6765422ac2fdd28 GIT binary patch literal 2314 zcmai04LDT!8b3Z`h-ni~SUW~5YRv~@m}yLyG009elPxXE>^RKaYvxR6K7Ex|DzT&M zv#gJcZIktJ*M=fgZWl@2cHM|pp1OoSWMv7*58lGMa~$_ZlI4Gr7%fP`ZJ zFoT2=h5DOKfxUCf{&*P1XMi&;#O{n-N>#NLfzKro1L#gT9XEFFcxU}$i71eMEV zEy0mH53E2YlTh(^rBaDgy5Jx<5>KR1D0qT1-r3m+$#9ZJi)B2OlUQo^hU6^|6O{5{ zp+qKx#25`P?<+_y^T1*?3%%Qxbc!Tw_PeFT(j{MrL%fP7!4q)=yhw!q5K=1Rg3BU5 zh?E9KOF%pqltOZt4F7O%Tg8B%95qG9kWP1d3(; zOga+4g$u)}t_%{3OklYaC|(RA(TD6sAd!8LfD6TiNv06pX!!S_%Vm5^3&KJL7|wzr z(PF(NJXi{9ynA5ZnqMhKqi3;tRH0ZZfpbs9kn!#ByNN=We zF^Y^S9fcs@jyxST)#==id?1j%@(K(xJh$&YT(ZMB>%Or{nVx(0+t=sk7Wg(?`JQAq z!kHUav%0L)a(b>Qsae^vdjfm|Qu;eO0vHcs8Vk@{I=GJYv^$eeE~SpN#(5uo`j;EA z9WhlCmCqeIC(CKIit!%MTpki6dK^D;Z}y zI&)l1-16gNVz{H#`ah>{;>^s?SCV#RXIki;8&NZJs>@{bSF`1Ab@fH3YC3C!zbxmE zF652Qw6r90AN(>lC7&A~FX|d7-o8z-*)Px7I1&H7_>cm1Z%6N8C<@hHP*^Cpd3+7? zUAur;BKfN%w!(h)`t;`<^DY7k49ytqF{>l%YgbiO-Gs<4OqfD4pe1bPuafDsya7Uk(e2;F7Yf*x=|OyI#FMCf30P2H?xq#RByXCu|M1KW0Mm* zilRIH{AU*oLMV=?vk80WA1c&OqBnnQpOLJ#rI;5E?U|W$j~x02i#}e2`*dXQg|XR9 zf_R);*OL%V%^|~25~m6$8jIId{=ta-Q#b!t=IPoRa%*-A?H;r{Lsz8}r?nAf7Hxar zoEZz3M7N8W6x2D_cDiIZrkpA{x$dO9X_Ru~2UU2nGU@apqbQa0k1!G-Bb*Po{$)+r9yPtyN-r z+NXcyna&Var{(ovwLr$^dr|DJ!?WvY^kkzRxvf?bhW9vlC=IG zLY7tk)3jTtY3*bZTkciN`Z7}Y7{{&%{OyDdeN4@9KiEK4ggtI)*iPOU)zKgK;P>)F z1s18E7j`<(iz+s>nZ{)pQa049lhONq?e)^zE_xQbXb;u)HL9A6WwCwjWr--gF;{1c zIGqMxp6A5~?Jq)pz?Vim|AxEH&@%W!uJ>bWPxHHa%!HSr2G-5e z&D26;^^eo@Q$<+s@4c@)awy(3-0*MdA8uB=NT%)~lYS|E0>e2^j{_Ie(o+?pBt6}u zBs6ecX$urp?$PnN^TMRvc0JZI%sjTP|!fpWvD!na>0@ zY~l1QXOPK0c}4rM=gb&7?0kkIt^4WG5_Nvpm9|nze}BJh;}_%b<*xC^QQq4le`yIO zSi;ZSv|sh&Z7vuwPgBOmUw1f&@m_%yd$;Bv9coL>Uw7$mWr8C%3p8+lZEk7fLNKf{ zLhE^IlNn~8k;~V2>%->_?6T4>epeCW!Q#T+)msHODE#TPXcLQ+q!)}vt%Heaa+c>n z*1``Jp

    DDuC8u>4x39LAIVzXImPa(w6hcRZTVS-W$LI^{%_8vg@K#Xzd025Zmk}m-# rzyz286JP@51b&xM`yo@5_A9>t-pfCOO0T?N00000NkvXXu0mjfMfhsf 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 186329393a0d64c7069b6db413162cb1a105e704..c1340397b6b3b0e97b7e4db0febbfdff40de8d6f 100644 GIT binary patch literal 1609 zcmbVMeM}Q)9PXGKDxh|#vzxF>B|6>O>mAq9R$9JVu#+-|T_mWJ-dCrFcmslSe^13!YD9 zQ8-yzbb*TJ@!l*l8M3)-eY%ohEMh!>5j!kaz~=Gd6C75YFjE|qN9CJnmGE)9O9+`r zm2jz4FVS05r~=cXGL~9WmSG^u%!GmzCa9r!hY|=_C=Q1lmO|R5bf|=*x=OGQyoQC) zD1ocJghNU2>SSlhUC<4VP#E2AAAjroMDnVjlL;|A<5rQbOI3*&3#xEhT z#*#*5mL_%F7C5Pd1srEp!m!KVrVF!i03iIoJt5h9Sgx?)$3mh)3)(Mft0}x+zKON32d0Dk1nHCQYPLK_IxC z$iqbxK`KN>8AgcYq!AU#QAC2H6oyF%V^HUnd`ynXWD11_LA3~?#pE(=YI3qPR)J~J zSPV-Ia&@$g!)byF+BOAjk8$O%eM?wzZf)6NIJD2dXUcd*rT>bm0dBQ@|e062htX_XAs|K`-i?dc<_s( z*B+IaPu~3Le(Ns<9qN?R@BFapM197-i3=O1i|{O)z09K+|$1MKMs4d-T?`D(!)?`~?| z)qKfc8usCaiG9y*tX;LX?N*C-ci4-WdoyFoFQ-pixe}fH-HiF>NO$dqy%8B76mRvj zJB!LK>h1N?&UN*7(%Zz#o~6z{zou(j(#3D?#*}G)ZLf3BTs&#s`gyDCx^L05hkw+z~)s454%yZX=R;T}7fOR*=?G#Lpid4-Czf{QIrCZUwujhh%0)Oe0o-cDM z1iYGiA5prt2|HAGvoCjmVo}bfXneC7avdn2ea`7>JY(GH3w^7(t#^N|vGuxD9zL*e zWNlC1NM$MYS?JJ;eH(|*T=JWrt7ueY+-g{&xRq>9IA3ul28d<89uOI}N_6F$?Ix O&t0d@(6l7yR{R6j#&whc literal 1310 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 LFe4P`xm^A~n+HyS delta 749 zcmV{%$D%0h)m&$ zai%?P0~7sGdw*>qy;;gqzdTAGr`dypD7CEI0Xwi%8qv5N*l7GpztVv7n(N|5RN-0Vn_kpa2v=q0M=HfW)%Y*ZKh0^#Kyg zQs4Q(h!j9p`r>Wzy)V%WTz5YI_1Q{vFtLzc3}(nuU+V*0*9RnVfi(3s4@epV{&hZ| zR}4r?U+V*k{u$Kz0N3>aq8N~&zVrG3X%NgxzZBQ4JFuuO?ow$qZ)00000NkvXXu0mjf4?k32 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 08fc0f9703a914b2e7480e6b54d716d61295b0f7..fc6df4d0a3da70c78b625393482c573a0e81cc1f 100644 GIT binary patch literal 1824 zcmaJ?c~BE~6i!h`g{t7mp}1_o8YRbW5|XS22{|M)atKj_^&lh*L`*j9ZXgI^IR#P6 zfLKwWXp49oM{sOKK&@J>V6`eJP%9$ffnu#F6|@@#+drr~v%hQK_kHiZ-+Qw;Awdhr z*}K})XtZ(409hzC1GaaJ9X0klcYjAsE~H#dhG9`;f(A!v5*-$a0!o7>8VyA?y2Q9k z=zJP&gkG;wlj^`lh!!)jG&UQS#bBb)G}`c9{{is2~0XZbL-93KH75V0V>K)@4t126~TvpHNgm&1g)2#;+My~4iNQ#Wh`~&NR0_;qrZ?)a z1cG6^p$`GeP+T96>J&I;0N$q<(GMff<3I|&0OHFaSVp&qb1y2AD zVs*o$Z4m48zgRZq4BJ*8|EZUuBdQ2(%a7GhZ9eu7YNVP5r@CYA4gLnB9iOO>4 z#?pD%B#C29b8Avl!-xW*qn#anat_D~;O&->Jiy*FWyHIUzVB!uveelzU3q1@>0=}l zy}&qkpOlvF^u(r4`B_LlJ%@SWaqADai?Eua)}Gs~H-Rx{>qez}NI$zSbhv(|A>y0P zFDBgEuZ9_EV<(*dy|o5+(H$B0bAU4MjynJ3p6@*w_9eWne!ck0uAWU*uM0f~Cfwan ztQ`6F+tcxGy2GK2{u#2b2!`x=rbn<#TyM$6pyNx_UD0Tp6Gs608{(o|+bin3BX>2P zGX;!4Y(CaDy(5^h#NMk4}U{WUQenT>st~0=#Prx zoRSkIRpT~mQTzCpZ&t?EpCcSHpPkKBZ}E0vc#d2!h3@Ti;L^ldVM|T&iG}C3)h&j3 z?=FDS^B28+T3eLO$vLGzDkj`ddb7oT8+^_0ME23jU!R84B6bp4&!g`Y!?`VEMG-9S z8c1@@qjbgc@U8jka<7awL?U_Z^Yt!Z18civ>58!AkAFfhF=P=$j@-F&ze)taoCgn*qAJMP)h&F5sFx~Ph2;$cVdKUYE;ItTO88!V_2ikThi~bC`%lJqPVHUaaj(kDk$Zzt zko`10Xxgy`cvoy~tUfk)K;c#oHq2{GEw}7fr9Ub2pqF=MhwrikXM44$93(PsT2pII z&GD$tEnK@MS03Dbx4W&~=vo@;^#+}?c-HGh1Wbm4+p*w3#L^z=Gf88@vbHC_zcJ$2ul5+rMP zdlYAOe|5JqV9W9c>(V<$w=-~M&4uJ04_`2vN$s((>p#xEc4sXpXCssBX@ o(l_R$Ho4`_+tsTZYezZL{t7R%pWKwR!uHQn%7bJ_{3Fu-0Zr`74FCWD delta 452 zcmV;#0XzPn4$}jW8Gi-<0047(dh`GQ00v@9M??Vs0RI60puMM)00009a7bBm000XU z000XU0RWnu7ytkO2XskIMF-yl5&$O~!mOGX0004CNklZP2UHPyYJrj-f@?D-eFS85nH5Rz4$gSgntlh)~r7*DCHKkASko82WKyJ?oX}(C_6O(dX^2q=|i1%vC4P|ji{%< zD}Yi8r4(Kv;wcCkO!g%%E@h{NQi_jO7l7ld3ry1l0hN9eAp~Hp(LFHR13k;eEBGe| zcx-ji2dni!dR6860Ke?tc-8oSV_4}oX&0-2kAW#3sXYbbAqXKD4}I=;J5xNsp}TOX56Ob_t>i(H2uK91`>Qz4AMzJ_-iO?V-&wZ+0000uF00%x*;>k_*xYRxvsvo66r$4wGs7^OZ8FzwA}Km`rKl0q)aE!SM;nRDtq&mZSGzt`*c``+H~&-?TJT>kha9CtV(wNrT~0059W zYKwCcj#gW*_%`A9fW)T+;h@B{ImL9Q`Y=NYbP@pLP4yx{k5UM}BqtKVJ1qDQk~shX zB$HiEF;Cgsp@>w9E@2C!%c9VPYyiOAl0_pB14vA$7s;0#WC5Fb!Gl4`-WD)7BYT8B z4NLMP+lJFg&fyL&#P9$j(i>)phMKcbLIV^MlK^E=0)rSRmIdrjyC~s&Ya0%O{t00Q zSit^r>XiL)D3(emL5*~cb%+RK6Q~JNSI@}A#L(n0R3D*d1VaiyFeTfC)YQ>k1T_z5U;YgBafeB@7vyMWDg;bP;e0 zW$Rvlq8Usl(tq9fM>NAFj7EYxkr>nvI#HMppZ(v-!r1-0&=yeW4a$*D7AA!dh@%oi zD5N0fQJe)#c%th~_C_IzdIVFV7eR+a^hWCV7#k9GOuc>dbxig35Cnaap&^3k^WDxr z@v#UaJRX6-U`&mXdU`fS7=#fLV`7Lk#+z8&Mlcsi8={WHWU z@;}HU4NVP=jgh7}J$)OY>xQPrHh61mBLk$NjlO}QAs+UP>-|q*`-_YGzg)P`8TeLx z{7=1n-x3z#*7Wb{7cTzpA5xI8Y3Rc404fYO0suSwkK!;ctp2w@QmCqKa+zif-=%l( z^j?S0&ywy86*xJI?tz}D%9d4kkKKt&IUOy<%iiFu#9D3C_E=xh-j{MCi{r9ypWmN)FKriAYS zxlE$@3-lmzCF;(p!{M1dQ|I|$x8MR}FhZj;FMr%qS3q0u+nu36)yWI3;N%l;RL^yU ziI0_7mN$*+pJk$MH!aH#!3so82OH+}<;6sNbLG%o>$wRGM$yW3#S2v_pFhy&Q})ySv*7+|axd zkaOC0?g}PYoLyyJt*HDfgPD2yN?1MfadLlPeurktF{dW?;&QEWC;rb<6VTXBIx?vz zVK&JIEWIQG!N-7p>1r~VBX_l40bTO-H=#|L2%egGsuLrgWNl96a$d>ZGK;Hp6eJyd zg*vy788tkbPLt13tiU*4fv47;F|(H$CC>GkhjCWWgy4CS8M_a-O;@muSh+kXGr~2Q z_RFal-FE8E+5nr|*Sn#eYGd9H@~T?&^i=s6vDR44E(Pa!Ltz+j)D06q{8zR6I~d^nPS|K*`{{v`DIqivZ+%g~~{GF4HrAqMt+ zZT6h<&w0KF;68)Wb@k!Z;UTrJFUsIdV$#YsR}}MEiD^zz3(u8eHG(5A?zc2BLFN41 zd6nD*R*HT!JM1uG&n?E!C7XqL;3fE9u4;W?ShPgszr!$Z5pv^$pUyQIgFScOm?eeU z6{PA-Ikyx$QeiS~hNyRar)5uk{yIM17Thp2E*l?+4{o<_T%4P+zY31q^}+ez)2MX5 zNbbXgR%F?WyxPz&p!ucv#%Fv!pEmf;=HgOSLi2dRz#^_aH;orQRXuJoisyQwmc?GTZ?(UoLOY zxH_ZpbVkKbR)>juYA=O0iT5}RlM>C#zPpyP2PZN7wy34V0xHE-M|SO!kK!Cs;`2_| zDb{;RMuICj&(&HvX~0WyxeVD>Jx%WtiN^u66Tz%)f}{6#HHCCE9}~G)Yk*RfyfJiU z{k6x-O0{+Fs+NVpG3okJfQSP#S3EQRkPjM|-#b& z`3)SGwYy%~Lvzo_`hj`{_SqwaH)(I5lz3@hlgS8IqC@+2Jhg8Xv_F_lsWk$K1 zcVc`co9D6eAyC0`TD)_JQ36m6N5fiZ`$J6u+;%#9nqjVr!j!yQuZ`l4M|{QoERCx$^d6E>AsH zgxK53VJL{ZUU43Q_|u2>Qt;YFWg96m%JRGInngcp*f;L0a+tn!Ui`h}+zuk+_Iz?V z+vj}Ry;4~C>Q5JPqA{79T2H1{??#XHdrC2btsm}9oM@$1AQdM_TpwY1aCqq&05xa%SF28AK;7=p;cB zz3*%kSiQybYSW^>e~S88+y&b*GsdxroSpG)8&{LmCe0EX@^5pJ-kvC#qx!+u8EJX{((I7f~vI;opScxkvaQh#j z5tp+bv=?T94lgMdgL{=ars>f?u3FWS8P`B>VmH=GThu2VXAosS2heTJ@vfc!6wvbf{R=L#*;-{?wA@6z14+K%2&&$`AZSE-2qzCSkbwDNY zps=o54V{?TglAV01PHOr*Pjs15Dqx?5gT5z!1b0I83#X62ynFE31~*$)v01)`KZ!? z&(eJ0a(URk)KWJ5WdYi%@r{j27o>ZJy4D__H4fgKS8Hb<&?<v|Vv?th(pcsR{s`nuEP^aZ!!UA2a4ogfEW2tsCW7euLcho9K`lK!|5J5)-cw5Ju-^36O^!l?B>_Z>tD9b6e-b*yj;@{! z*=-kl$$_6pP?Xgo;8wAnJriuZ`as@hGbG#D|958RU9f6YF7(XrK4BNTVSA_EV{unZ z-B~*tT--owJ3m6af_Sp#V6=K+{}2A+?7RrChr9=N)%Vv;CNqKH{@-f-dbsbCqAvWs1ZI1Z0ZQC6<8!IZA84lUcUz}Xzl_*zhXU| z+ufBOT4lr?x2)N#8OmiN7Bf^9_poqw=aO!Hv{sD6X!rxO$y1p*OBrt`hKk!eL4$g$ z)t#RgMIuHEy=>?9Y5VGZ;DLAAgKQ#E# z=ltF806g#S@qfZ8kH)~*d^rBuC`7hOHvLn>@^O+{GyzDjfLHfO=Y#8B-3zXtnWyt` zdNN+RPEzC6XEBIb{Y4>ADwU>&z#)fJA6D@^k4~pE@!o7Ui!p}E*JoUPe^~@zS_rgi z%~1ZL5D;w~YQbZc&clO`TkPMf0C0QnDF6rMZ2<1S-G8FGw)tlT3bIW}L$*?3{H?wP zdPVSkAK&-s73ZJ5qw)_G0-opL`#zs`b^*A)v5xDy7-QxV0#biT2qeA^2$cg4%G>mc zaC2iFfDb#nEFR4-2T1)z0K$@6JObBsN8@=bDt~JiRM$3vU<{1SXMF_Y z_7~>>2!ARpW6Y@1GRBOq59epAuqbmt82`vNL#ie}F_b{bTDCwG0)E7QNvzrIo7^dxu$qsjp`{k1l&npK+<*)q#Nq-G$e?aX00TNmCkG(%Yngnh6&(t3fw`}w$ w=z)j=Pyh-*0Vse3E7fguWB(J}njDdJni;sXU0DuRPN6cH5Y2Eq0Rb!YZ_?K$_Jd%t^U_k@M6 zw6 zS1>+>Vy03>L=(}{)jT<_rlUp--JsTzYzl=RV9=uS1dIS=Se!~Dp!S|SPX$y80X2#v zWk|ImOsNV=(_!nMlHPQR zSY9|Hne;{O1XLwKXn7!*l9EDCVbO729LVHyxgY}qA&5pIX!=wQff{HUz5A2}1k=lP zDlMVHHGt6~D#Mcr0hLtxF$A?%D*a?wqn}I^nKICTYC$HQ0jkx;xF*ngA{_fy#G**N0t>l9iO|oN%Vdft$ z3-S{Maz#_zV2z$YHF9jqw~F*V$rXQ=%Mo% zfv4!bjW_f$U}v}P|W0r*&+!W zrcQDd)1+;Z>-)c4kQ4(N>*GK5GIc~2p>g@C`pM0w{=qb4)9A?V$RF=JLN=XmFd~dF zJiHruBXq9N?nqZx{sYXsK@vS|KTpo^>=x!Y&N=3`iJuDfyKHgoIAkjN##Q+nv1+{xCHUUzU?$S@Doo z?Xc_CQt^&@tLx7FPqH;*Z)YMjdrtei_@DaHJ?1rRo3)$X*W=`>e{>^PAX?@T-=38- z)Haqg^XC1wuB_E9?ei9`<kZ7naiKgxG8%b&~ajxLM{zq4^*ds$VpX zLI3&%_-_}i;)mcG%l%U6#Wnc*6U`&tS1X^`nWJkR@`6|au1@it{Dlb@Rj!v0hA|9P zCM@=KGe`fL4IPHmkyhFdadnrjy#_q@&rmFq-NCZl)*tO$-%uIvBnT;C z^(qH_imHqAR!N+`AMZAI%j+y*xB!PzJGN%@&8k9OPC3%rpW4LgDo@8Gl(w|Ir1jle za^Uf4nOjw9?(LYh1ATKwMyxmQe#eZ61Pg*2GaZj=$7c8s#|&0^ed)BN>B_aO+ASQ8 zbZzN&N>%QPv69h6{0k#)FP28xXdOS8{r!8hX?MBDUh$xHQh(#@S1FD6S|863X~Ju4 znv34t{Gwn)zPNX}GOAW5TT!sGt+65H&BAnt)n6sF5AbZkM02 z%b$^zR5*0t=etF8J+y9@L3+RIdZT4?Vvfs5s7uYvY~{;K&&NlSN29ixP(1%E%E)^$ RI&S`xsOdcAo;KY!6N3y?_vc=V}drz4KEdkqD@eYhGIt zP+FsRV7dkx*$Vxnb#s8nYK>rPxf<{<%RJb^O8XcuYfk^K4Rg(F^mHDuFfie-RDxj_ zR8<`xU}1aR_HFFA1Pc$GahceD%oz!`&l281;t}u&toc;z<`4NB<_M9Aa4~;u00000 LNkvXXu0mjfKeo?| 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 fd7c9bfd71aa50c8a31cb31842c78bf1a51e0ea9..69a386b4db357f968ac80250c557c9e60e9aba3b 100644 GIT binary patch literal 3409 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 M07*qoM6N<$f|Gblk^lez 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 bd200172f4d408ef8a1f923463d4b0eee3b03c21..d3c9bf19701dd87cddacfbfdc1f3d2cedb9e10a6 100644 GIT binary patch literal 1805 zcmaJ?X;2eq7>(O(Fpyn~*386cAFZM~)4NB-xNGBpi+f>9n?p zIwMkHKrJfNDzzX{n#!SqQVIhj1qVf}<#3d1RMe=IZV+sLP`{b|&i8qr_nh4yB@TC4 zg$>R1UX5k;`&h?Xd|%Mi_4J%+~NfE$a=}B^y0v{3#1ew{G0xgV60kc-4GqTMb{FGicwzprC@W7M^n#94s zGfEVSpeV+yGF?6b6Y*BhknNDveDiv*}b|df+iOgF?xU zhWOK5*olKzp{SlsBAHAkqKQUC42dKPi^U?5sU#|ufJqRHX*yJDCg_YlGa4Y+C^x9} zs2b4$c8yXQl7e#Zn5FMr(CS5^_lkAK=|Ev2BblXo5`{=6X|;C0rlgH%H2kj_vq~Fd z)ATSY8a5&+204}wrOyl)i`|Eb?1Gpz>_~$eONvwjA@US0tV4wm2amlF6>0^W3Q7ZE z%x3}vrho*doQ_Q(EF)0qOqr5NXMt1&V@A(xc!(*p2CO^ye@yPfnvN}mLSxN6 zopDzp-9p{^ii>-#^2mjY0y%c_Q^Y+e*RhDO? zX8d^5XxIGPkH*Wdtq2$x41-2pk`A=E$cH|itQ`$<^Bmdhc=ZyiFKz-Wq0%am9m1Zr^Gid6V6^&-O5olUpa?Sm)Ag_cCeTDt3MOXA|nDDjQ+e82gcc$eJ5>gy!~4L94ZN18YJT}ta{ zQ{CL``8Xht(cO8nx3lo?SMvtG?D2_kY)Ytab9c7si@097-QAHLKco+BBJYsr?yjyc zohX7fI)z zDg9sq;-1`_>hyDkvogd|DtUCvx2tEB%rkrhEUdfW6}L1a7+SoSyYTe#s*18#ri?MC zt3GEHb>|>AtG5T7)%dK9*Z-=~>q#xHm?3D3qhzmXVb+DrvDCbzw4V_K_o7|5bdm0# zX%_d;-E*{VwYySjyEf5f<6F-S{~2??>~iR&*PM8u3ZV|@%AKFS_ zgNKtrL^woFtV_OXkE`N<}E!iXy{Q*Mv^1yJ> zhWB2fgQ+}uB=1b$xg75K?)lES+#6x{VL&QJP!^^099VKvIhF|6LINRykU(^zsLxke zPENmjEa?*g^~U=7DF7E=7MC&e2LnUChu?1+{!5@4Af-eze(|WU8PgRh!sgWgV|#qm z#~s%74pK^N+kYM#nn)xNLSR<=e@l?cO(=m|W^EOYo=V*Ap8=4yiU2gtG60A7C2E-h zy$(QQzEjXmgHj5m6y5Z^r@(D6*^=1UWUV4fDPF2|0QOFf(RCdJqgMlG`t`hV*AcSxeIM`eF zd=L9B!PKU2z{-|S609AB50a2TNMO-l#R2}1zX6G}jNRd2&{hBd002ovPDHLkV1oQ; B#*P30 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 2bcd2cca0dfa05453dce4f0c18baee70cd15fe44..ecf471073ea6acef074aaf02adb56c299ec77fc5 100644 GIT binary patch literal 3508 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 R4h#SQ002ovPDHLkV1kXcUN`^% 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 0c94b176518c5e94166cfc139f2596810d5e837b..f40e8809b1fff4a8fb644a041c244c90c05a0ad2 100644 GIT binary patch literal 1821 zcmaJ?c~BE~6b^?K9nX3c5p@aFB9hIuxz5l~UgvBaIQ*^n$I2v!9ZPoPTa zC>A_NydsJ^2r77CTME`&RG=uzp#q}ysEXYn*#1G?nf+b+zVCbQ{ob2h7alr&@IbGD z6bfaqGFTQt&Vcjva3#n0p3ioZ(-=Y?P0YsQ2%E-&P{ev%ivUVYV?ZJhjXo*iS42pm zxS^;znuu1-gmpLuYMeHp9W#??3Pl)XH*0i8gaEXN0X2!J?WJW@0M(1AQ5+RRWtJj~ z(cq;PWcJcfwQi|VC(u)arUF7cOcG!Sp#khzyvYjNMbvIym|Q!L=~STGgfNPzpPY(T zg#%LDf&d(lOVcs9Jb)(vnH(Mu;spXM29rZ)u<2|Djm3r`1`M%)o`*`RS@dymgiO(+ zMean@#ROr7>2#aT2HMylZZXiA0)c?eV9{AD8fihZCYcD0oo2H7_AC;}nGt#f zV#O0JI`Tf^e0#xU?!GMKG$g%&!z?IyDVlg0u1mxa6QPuesN@$=kLqC-Ps2sXm}wk@ z$)oXg5IOJ=EsX{7wQ+n%z+>q-y*z#56>No+56Q%Qu7t^ybHrSTCFRSd9EinWFvP50 ztkPs9G$tL=tBpFfKVhX`#KKYwq9JgL8pq>%s~~(aPTLn?;~wJ zSnmH~>7+AsXMOyqUV4wnB6Kc4S3kM=+&_qkY#IyM9Z+R*2HA8WN|{(~zk4HchH<2L zSYAt8jUmtPs_>#-E*UoJbV1gZV4=MeNc~tI+b9YW4-caXnlGj803?h6pAgAr)dNRO zZOi58%$ho;zG(b0m*kz-S{(Zwf43fN9WntF4M+u6#U^|Bh+%_xVu!K4^L?X_q@f8+ zDE|6olK(4{rtPa>-C$7J?^=X=PNd)A;Po35J7>+rGUZ%EAlP=KY8Ac zUMM|t(5=u|*Cx4of7{unWkcCFca-D|YE)0+WLwu9|^WW%GLG+&IG$B!4}<^iia?b|1A2yOORU)sMi*vErb z>n>P^P5rG&y>o4N4Anmnj(s=B?UZPa>)g-+*MJMRJiBt3i!%1+l>WSZZ(MsrNyUyg zzu)kGo}O^%){}tzch9wQkDb+Ohk9nruFfRT-}6B9in+t&Yg!#P-lOpY9>Z7f0MM9nck}&~?J-BQG7ArTUkm=F zK5+S+W372^=ep(@6N?6nUT{)*T>B=*Sk;7xrcCX>+?ch_Gbpb(X1EH>A+()*r9+ z*~9A2hj5FcQo^vP6GCQcM|OZ&Da;taYBewmU;Y)J7;IaW=XtizO5_FuhWRvd7 zCP-_@JpK6OYsUP&=cn!4_ezxd^sR52uFhy0RZ%hBUUjx8<58~gdcUt`_)f3e{~>dQ kXx@U49c5=7A3Ye97c=)Mww$Q^)A_?v%0p!i$)ePM01I=>8vpF-QVo6vuytaA?qd zp-X{Ip_AI!EP|Vj4h=U24uJ?Z8HnJ}Ab}tuI5{>ty0{fVTYqlS&){Kl(X3EE(Rc{{zY zV;BZ!4^;pR41a(np6k~ULU7N(S^*WGh7y`3yF0xCAl)tk(A8=HWII)wu{@Izq$t@t z1>*=vDUnh#j@Uc}OBP^|ZWobK^4w?vki0lYRaFpdY{B1n2UdHatJN4sW;X}uHCp%w z+x38VTjl-%v$D_eul7K;GaEYui|#kW_A$)$>ojBeMN=|hiQ8(yWCTJ8CZl-)gjjqx zxrr@ZN*~{P8+&`W8z#JW^y5;xRs~KDlI}v{3UCGdUjd#>NSiv9JQ_&w1)PzX?EhZa QtN;K207*qoM6N<$g1TR 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 95bde973d0eb211ba49deb058734cd63fe961776..baed4d2b39a1b4c6fa88a0443eaff28e1acb793c 100644 GIT binary patch literal 1863 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 literal 1388 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 literal 1386 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 delta 1325 zcmV+|1=9M87qtqI8Gi-<0063Kaozv`00v@9M??Vs0RI60puMM)00009a7bBm000XU z000XU0RWnu7ytkO2XskIMF-yl5&;JRtB5W5000ESNkl;PNXaM^eRC}9-4sU(dPMbUNOE5SehcxK{@d_2Ib#qY!CW~d$~Pri+x zoNW9h1Dss~{eOR$J~;=92hn<%xC0=67nuG<^ztG3eS9bR>&eDfq6V3qli!(31}q=V6EB_On2sDJt?2bWpg8+?z9k(;nDB`UJ; zV_jfNC+(lVL}FkHlSj`MG}GDS)3|^P{7?g2z645(FF*s+#djonwpuN8yIrphz^BtT zjmR^LOkh3|pSVnXC2Y+sakS&bvMkuP4a>3s0Jd#=)%7Ia`jtyT-RZDTwhquFc%0LEj&D_%DY1Dd7*N2ce?^sAgFEx7&qfS!gz!I6giG05lp606?$T0|2z!ZFD*v=(>)F9G!Xk1@TTJ0^q9f(=CIe zXzC1yLpY8D$8j(m4nyCe5jbj$#AQ$d{!$FsJAW}f8Y+A2IZwexqXEZp(CKsl0ES^e zRaLJYq~O$HlL+F4#eh}f3p1d2kbdb3N})>D=udyA?<)&GGzQT0v9!;!Dc%Qry&i_c zAq>L+0CYMX)M~XQAEfClpSz31fK}oPGk`|lD5=$IP*oMGs-jk_g%7T$Ujby}N5%l! zk$?IQ?}P1j+t-KJc^{lvq`x}=u%9jltO{Q^57;ULvk~h^DQFmmFZfUjQa!i~eSAxH zXQ|U*N%+1Pz<-@EztMFanx=V~mZoXmbE?xezncqgMS0BAm>{?+e4)({wH{4JscV=g zCg|#9E}ro^ZNDk8lr||DStq_CvW)cKr+-gl`~Sh&o(y~?ihlI;CAZ5?RQMeI>K(Ic zZkJh`r|#5QfP4;2Q!qd#zLInrLw#s+4s3r#2AyB|-`%bdx?WwdXSrSf?k=A)9hQY3 zX@FA5vOzPd;=y8@S@v7JP+dN>bO(StO1~eFg&%5w?>}43CB&PO*n2YZmke-mKY#gh zBI#}}N-hK@DH~rAxv@!mbCc$Bblv#b<>;mxKzXnu{_>x%7u4Dj({F_Vo_^TeumAKz z<^rp!54diWzBTm$H<7G9AVISF0Ll1SeL&ovJgX1L>H}C{%IX8Kn)-ma!w?zxS$)8| z>jQ!!8-L^L19J6x-B&KZcVeRdo_|H*LY17+)t~(CQP8&S(EE8!(@?2YplKQkM?c}w zGt!?XB9HGRr^2%Fv-*H_*9U~f0Gaq3Ump+|1Ka_-atiujobWz)^ars%-OQwk0kZJ3 z`ha!U2SlCZ$imO+14NdQtUe&C56J2R0A%$6H&8g*Bqr%P|Bmc# j@YG%ZBt-xF{3_&Mg_;A_@83j=00000NkvXXu0mjfAHHqG 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 5efc46f8971f71a3db20d5680927dd8d10f04a73..933486817a16009d463ccb707840725687aa7aac 100644 GIT binary patch literal 1971 zcmaJ?dsGv57LEkvVG%8Z4~oiIr>VBSU=zz`w0xHcpMiFr)O3?!me0blC_ zq$w>5J^;nqg0v`BfgHgqA|MOGVL1Y#m7-Pz<#80NuoDH_Kitka^Lx$xzWd$#yZ6k$ zBf_LU-XD77a5x{?Dv<)40oUv4hK(=hKQ6>3e^jhOBjI?|rnW*jz7~#y0GUah04X4~ zc2nYYXax?3*XxxkR3-n6tAR~qwabQVH(4+=4!0u2Zc%Ft5DLUW33@Y+I9Pd!27Le+rXWHcjOJCFF9my4}k#}p#) z+5|Q5h;Kxxh9FJXax-O!~rhJfaRoEnEu4X0wrP3^Hs@pwKuR4uwjm(CH-1f`n``qiQ?Jj4YgD z5J8B>s<)te*bKNB)p2kV$|GV*--KYY$mMT|&B$b;u#{2kY72!%rcz8MS6r{H5mW*F zA>*Cah;ow!q9`B)PO@sS`-opS1;%ps*N$9O=lRgYbY+9-lGNhZjQ%0xUO_Jyp~ zYq@k#9Ry)9lUNW9B(XJ2YyhD+5}nD8i)S-AAYIFv;&~UILt_g;0Vv|LgG4l%m?hv# zf+PZv9mL{`Xlwy(3M(@ssM@T7rhMx$-;-G3Ut+mJE2KtYs}hEdQ&kY5gHagK!4^O$ z1eQeW&05%oEOp(`n}9`-Ri6xLC05u3yiPG!{|@&|Dow%yX)FF&rxe5L(XThtAMGMcdMndYe9;-dLtpTa9`MDdBeACxs8=#a0UUQzbkgHZ8M65CO7 z;R8Z6nb0+sdVYy%&UBDV^b}N!OHQu+xaig=ehKv9f!&vo|Kx)3#@jk0$$lun+~geW zLbl$wH93Fj?5-?W@_tq(SLo%Xcczc19u^N(O&q*PBIkV7viWa^oxgASIi>E3s_x6E zgS8catT5YK5x==U(W@*w$LMRwD=bxZYU+Ck!9i zohc0dZb5p$M-$}S;f}dXN4cLiZi`26&#A3x0ZvPU|KOHylAN6Fq5B&vXT7Kb9}o&o z{5%(kp`{d6rI(jZ#nx%02C#x#t`N%JatUn$&{ zWK=uPGdEPab6Sm`I#!H7-Bqhv-roX^AHK0S^gZ9y5Xz~9{j_8K-4L3KMBLz9`+8^rlIi%x%96nhx|Jo|KxIQXJxsG;_!H9ZNw zQm?!Dt9O1^K^REyb4zVEcShw_wkk&$*PaIU=n5`uY@RKO@}R#gg7Z$TK6)f^-J!L2 z8?O1RD|!Ff{oE@jUkHb~OW*ShFE9SFD@OWNJy*JMY{6bcKd0BmZfZaJc!$RNp|Ygk ze^GI1@S?6~2l%y*W-Lu}IGD$d=T>d%i~ivtJl#;LGWb2Z-6iLX3{|GT-=*SxjfL{6 z!~a}qET)alO_{mcee=wPKV&cl4jC_x)n+y1Y)hOVd}3>_8C+cE9eyZzSl4zv3f=R3 zxW9u_r|vO1j4|Vmm+j*paa-;?zmPp?FiVr%hiXQU{A>q0JbHS3pp*24m-kj_O@;f* z_A|4}hqTG&tN{D12SoMlKCb2B_vw3=y&@$CKIvdq(SLKU>6}K(ZoLq@aM}dEetn+f t`1MPXJrfNX%WIvB!$aEsJGyMz44mjdr#QBH@L#Uqs7xFtIwSZz?SGmbD$oD` delta 891 zcmV->1BCpu4~GYk8Gi-<0047(dh`GQ00v@9M??Vs0RI60puMM)00009a7bBm000XU z000XU0RWnu7ytkO2XskIMF-yl5&;7t^oqzd0009NNkl$jR`R_ApVKsC2RhQ43R3aq<=zUC<9U>4~SY#Z6c*n zlO_z8i_dMGUs4<1;`h#X_uhTque(^|Iivjz)<(&1-SsKo-+(x4rlcx-dU^05NT%0stph(D)O`y;I2SMa$Eu+l16E^nVFCR}kMXFXp&FrQWId z4!dH*TtSSDGJj!1uFiy<*o2`g=BIXHa2Y7>`;gM6>zNsZQdzD5*B4^*>`uUUn=ooa ztOqw8F+W!j$`YI6KL}$M3PP1KdqPoqN66{CP$KzsJ`6eC;KY;7x5XZ@UVzk6E{Gd~ zfB%$~0`uedG0a9_{6Yp?ok4btfDFvmYZ1NWa+zwiI)CATkSzJbA0pL;t}tNKUc!K^ z0=r7C>*9GHuImEedER7P%C75T7{+9M&xKg>u6t%0AS1l*2dPvpm+?H0PNzeuR05#W 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 F;%^*X^@jie delta 1340 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 delta 916 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 H^zeTGNN)ta delta 1296 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 delta 897 zcmV-{1AhFg4~++q8Gi-<0047(dh`GQ00v@9M??Vs0RI60puMM)00009a7bBm000XU z000XU0RWnu7ytkO2XskIMF-yl5&$tUa){P|0009TNkl_Q~!WM$1XubO*fAn3V+?abZj#Rnm~$%LN0M6 zTpSZ8c8Bvxr^J%&Knc7DQ8z;AmsYR5?q}}iu(a98sqh(2BA_`EW_oQJbY<0 z;=B7WY(u68*B!aOSeDANEAl%?W2Op1oeEo0QGQd(`8BCT@%gnl=rCP0q@B4H* z9jetT0G*D+RhJ#d!8A=;9|mD8DO9I6KyA{ax6x=IgrHijvbVPfK&4UvpxJB!P_Nf< zU3Y}QZhxpa3I54x*iMGd^E`qeAP53H&l|f&WkAvy6SE+<5y`p>DwPUB5a7Bl0FL8e z7)Hq7bU{BzHew;I4kV?{w3J_yHRAgB9T4aTG8S;X+b-ztL$^I+J3e~q+|QldIDzE}25grO@9{};n2vz{V)<9}pS%s{_(J{* XNvC8Fp`k7$00000NkvXXu0mjfs|cgH 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 73716350e05a38cbf263bc339c9896ed817670a9..8b72a1718f7b6b43481087d214f6700bc4f49475 100644 GIT binary patch literal 2949 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 delta 1335 zcmV-71<3k^7rzRS8Gi-<0063Kaozv`00v@9M??Vs0RI60puMM)00009a7bBm000XU z000XU0RWnu7ytkO2XskIMF-yl5&;4&sw_hw zZGnXwfR2G6tATa@@C?T1IU`2=&xx?xBCsHKs@`%*;7TqK7?mHacd-v|{Q|_y^?@tj^o-95B z0DN-%Su8z{9JKfFQTawD_?y@7UIWul|ewp-<>pNd6uCT(N>H;(JIBH(|GBPj)$uGa&BW5N$gHPfDEbs$e;Pne{ zplO{P;c$5uhs(S8^qUVoWxr0#R7S?woICLc&Jte;S~KTeX6F{eFkqS{41@G)nx_4n z>V{!JmVaftecu3bg4aCVn5Fg#bNombpb>UpIZMgb))q|DM7P^TtyTj7bi2f^+`6i& zkR%DefBUEH%k--zF@IM0fj zp=laqS;ke|w1M5`=f^w1USI%B3qRR1*amza*WPm>z z170oIW++^C9=lDjTCKveENGer08mvGqA1#BzX=X3XApk8pcs%QeryXURFW@Ue#w`~ z8vXWF^0ut-17iS9ALmz{Y|8C}jYb2yu0vH-0Dz`xP!wgt2WdL%Uee;kfHd)ATL6u| zVSl113Pe$aD2h-NCAf1r`3k@qKQso=hSYc5K3K2UJx$!Y+XqJmY2RxCSWOlK(!!6O z2h0?KQO9XWO;A-;Pw=58NOk`*^rlUAXNl8bM);l>;Ql&6ek02=BuTO}ElHB>=TxU< z_ioO=6?J2V#eg*NV{L}$?9p^|_>8#54}V|(1i)Q}PbXz-;n+@Tqmq#<@r5|cNbBfv z;xxAPADr#6z!$>IkDk8dmYfq6caA8@2-PsZ`*WpX&S#HU@yPHdx4zt1!oq+j(WrJo^h01uFS@h0$zC3wo*?(&S zy-xD|04w~!3AnU!JC#caYa!m@AWQs-2@pO$iR>uqZZ1sz!Sm>##282c)Y)BD*@K-L4uQXW3N&s`uDe!y9y^gF{3IFE3C zK!k990Aqa4516(m=llT94{!n#=YIzv9e%*H!w?quoF9-iKfo`n@i{*rYkt6lFvjQn zfUNleK{0?O{)OiU4ztGR{D7?a0bwUOtnfKMAkH$v`2n0C!1)0HI6vUr^1tB+oG?}1d451v tH%3WsjyOLcfd~ifz03y@_wVy*$iI?|Gq6$NAP)cl002ovPDHLkV1fd)co_fy 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 10ba4afda06fa3a41b2f5e6f584be3a9576aad6c..c637d6d444e0555ceeb817aad18dba4b0a26f61f 100644 GIT binary patch literal 1973 zcmaJ?eOOa<8=f=UBtgXu#T1XjC4TJd?Bi^6laFo4P>78g%S1Wb4sc$!owajh178&w zYDP$)seA~;$jVCu4U~k$C@n1|%q!k7L7csig=Qw2QFf-_`~G2_>pH)$^W69SJkRfW zuCpU4aYbOj>;MXd5~z(+>&Y4LzjP`&j?NnPl2a(5F%rpGI^lwy2qoHrnGis0gEJ64 z0$XxkJ&PzPl!+*6FcQXuRdO?C(O8IOIH@%jM#_gj~#-!4t@2G9Dk~fgp#p;NUrS0(Nukc=$Mj z8o|v@)Ip$_9q=>4CTs(tWRade4#DO~NO(eQ$Hx*yri|x?9XtV-&$HS5aXqre2|e;Z zH=b&Z8*&^7Pmkc(2B(?4kM!_yFqyl57V;aC-pF5cqU5E(RyAhcU_NLf*cw(@ifOnZRA6Z9&M^E1;m-s4Ok@CSls0;G=QbLIpK|Q};P}X$d7uY?GgmkCs z>fZIc!PC`^~=@Z z@hO>!*JG;p$#n6do3D>5e!E@cp7uwEX=H}{Q+m>c+cV}{u4J8@HjvUFfVjRl7jPI~ zJ*e>gxP#Tw8yT`tzNv%{uz4KV8&(j7w+>OjU2K4c7EFbL@Mb zFIlo^zj3KGL!k>wV=G#N&PjeaaBM{gk^NeI)W+ho6=_>mH@&;NAip;3kReVC4)G1~ zgDMmIPB9LwO5U|3v`M!T?a~zwdVu@0>ko>q7tF~^9Vpe5j?{SSJq_oL^SCQP=xj)mh+0 zj%f?K$QWPZ9nS68@pIL}tyAPne1(%_^aZzSrN;-O=WjpLaV+EwZ$B+5p;?@Eh?XI^ znNsN(35&0zDZQ;&e&w|&aZ}P6nn*@5o*DY-<2pmz@ zD?91CgL@cBab8X%m}1Qd}$wDZfzB-XHdoJFnR_^+i zSE?o&xD0;qcIl_zR#Uego1uAKakab0awXq8uyyqJg)>?52iKbCcFwH+fyf%|yjRrs pe%r&NAA}SqOnunc_+vkH3gxJ7`19$L-9!E#saBJyJ{*%)@E5#40_gw% delta 924 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 Y--hqcvQED{UP}N@_Ac;t+rX^<0Ot;B4*&oF 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 0000000000000000000000000000000000000000..4c7fd5d53254ebd23535ff71a07c64922ab192fb GIT binary patch literal 1718 zcmaJ?do)ye93Sk;Dy6h}^l(jWDD$`&nvp#2u+7#?(u5=$GZ)jCx#P~AW;}8>ii+q> z9;sALsjSNB$RpG?ETtq?rJCIw96JYzv|f8hX#ZGy&$++n=kxhK@41J4I6oR0S{M=t z1S8f)rY}AN+SfoAA4knJ`S@gxc?DqGkT6WaLt%o4011TwmY5d~`@%dybW|O@oq<;RHlbOF(A1F&Anzy-uG#sie%NQsQ0bR|yeGVrzbm_h_5A(+UO_{FIJ zwhsUyC=AfZG!ma`4+73~GDvfzgPo?l^B6xQU-;hP$2Qq?&Q$RYMPNCXU?CnW7f+UNUU_2#BB3n7Fz=UOdR4B!S zhy>6o@7)8mGQb00Q8`3n8&HjI=SUiK4VZQKJfB#ch z#*LQ36kk||$WcCCxUiL4Q&I+m!aNK?xd;+DokgDr1VdyIh!lVzz{X!F5g-bg?IfJd zX0RkOj3?p4ET$_F7a$9T0tVy=Ie0=$Diid8K+wyPPV=IAQ=LF3&vi^krnC1nmx=J@ zVpxJra|K_y;H+G2Cy1rEWhRUY_rd~i6cGcH5i^9d`T}{)syD?I%<2o|Ju8=jJ44ad z^*6z}S@dkp>Yk7X^3>A_XLytBPtvdr07aFYFGgI&Na zy*m44a}%uI&p~UgCMHaEP9$2c6-TOGzL=LRP#keMzQ`uyGGT!FZeB{+uJ#wZKK4-D zT*7b2FJ8OYa^h6zby`wRwRP@L(!B3&iT5f>H^j>K0`a#?!y3zjqlen1cSDlqn?BS-T zE|$%&bMsbYt2x~Hs=~$kSHZ-x(IHjrU&6rCSHT5E^v=S1=Y77NK_=(gKyyv`QNFJ3 zr>NBWhSY+yOKz%TZDDo0BqOU2+MK$|qVxEz+f<8 z`e*e81nt;=sdsg7f~H~N(q)a;i_yA7{hqlG(RFVQRzP`5i<=v78Qc4fzCr?YyX{w}?gdm4VQo#zr`b(C3ab!oZv zp{5b@qt>_YYm&c#9o4Fb?>@wJs!!NUb~AY5Rba+tbt27)i#o4qj>3k*x`SfqfC1I2S`=7H=u%w+$XMfAsdo z;;i?FIF|!Aj%Y+kkY@%>9eb&(F?*^1ue(LE!sgHCdOKa%1G$kEBAfgQcgvrQDzitc z#(U4N z#ZcnM+%W=vt3y+F7br{v4TtqrFB*E{ie%AQy=kkT|I&3KwXViCdwXX{rLsTWa`WSz mst&%}v1_2pazpS0sfv&olCx%cN%33lpM>SbVczuIo$wE<*}ob9 literal 0 HcmV?d00001 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 2aa4295d1ace50bc9dbd6702fcd285e1161d9b41..853e630535a648d8c5624f51d78aee465215edbf 100644 GIT binary patch literal 1510 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+mc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvU3|9Isw0=c3falKi5O{QMkPDhSBP zFUc>?$S+WEc2>{`&&*57FE7>v#Sp~9E~!PCWvMA{Mftf3;2^fj#A1DtnPGBjQj)o@ zQIdtRu4#&ip{`}3QL?U~X_AGdVPcA@p<#*=RDTM&L8lLNls+h(Af+3a5HK-jRq8@Zi zW9eEkhs?!W4o#iWd86|E>9@SkyI*D9cihRKMzJX+3kK1>zzH|l8#k>Cp7PTaw@bwH7PTa43ztka5;mMbO`;=x&SZ*xLJvit3mObpROaEn? zx*Ko=D!FG|P!oK}oDk)FtnJXxdEXS(4k@s38L)e4r7jDYEEFn~!*Nb|;*Lu`^ZV)@ z7@m4nCYw6`n-_OXyIxl=`|otu z&UlvRYn*SU&fQaf`L2<^&l?a%G= zReN22J-^n@Zth$iv*U@c&t;g||F??2BgcRIuan}U<^6Kgq=n16R-O9V##y}f^@7l* zkW?;qZ=v9;??spVxp?xB>$Ju1mv?GLxW7`@c~aW)TW0&wM+xFQMxKFdx;_62CNTJ& W_1TenaNadg$?NIr=d#Wzp$Pz;2QOy; literal 2203 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 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 e628b87f712d2533af8700affe7283844b997641..06e6ac08d709186df9edc658bd525b756ce5e154 100644 GIT binary patch literal 1887 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 literal 0 HcmV?d00001 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 21274e1806e7e6a2760f20397685808bd2d134c3..955a0feacbe08e970c1eb0da756523e703111d8d 100644 GIT binary patch literal 1614 zcmbVMeNfYO7_KO;QyB%Zif$tYMW?oDO4Bygs`LX}rN|K0;_1$`Noj;MB@Jug{OG|v z#p#BgmF+;sJP`FJP6eDpwlRS@m_xT6;zwm#PtP%NPN!qL$x@_le|Y|}+~xO`=Xu_b z-}|O4BYjEKxT)iKJYJO1pv&ZDLFna2aAWxnhn$<@S-pi_LEBjm#t^&|oVF5xk-~C` zOajA;3cev0@OYyO$SezMF{P<&G$qDD7_pafacmxM!6L5U!q&@lu8 z!w@!44L)(oV#)xtG(!N07!lbdQW#L6Vi=L3Fgy>CO5kJ&mOxTe1j8zsLIul#kq6|g zF}PiosY@NP#qHFfgJoSR2=aJ5Vo$P|W^y4IMNvp1g``puhY-1ooGj)QIo*k21s&nG zF{FznX(td;#H@57s|GnwpM*fUOs1#8PWMQnxRgO&%mu+>2}Dt$xQ5YgHk0_*jc20W zSw$`a$|T%$A!Fn2!=4x>bGduIp%9SsMzx$Fxl6(Fb+oOJBAl#Irv|w%Vw}WPQUxX_ zxR^x<0V_mGn~WP2gjFP!DXn&;3{^;RB&_o+zFwk~O7w_E2dAXMuwI60BucFel`CMm zBw3-8gt#kLp37Bf83JQzCX1%?!&Q*spjq1Opk07g3(Pi?PMr3* zUklyPlYn&uL%v1esSHg4!zosg&oFP5!#2WdRfwckWwHptWv~dvq&5+ZSd}P@;Rp=l z;0Pc8zo~;br=U=s{HJchM_e(6mQTBY+dSu`jAD zQYed?azmNIALqH-a-#Wo@Kj~~vG(NT?#FvuH=W$wvy$}3N@mqc^bxhZjKr={Sw29q zU$<*pV-upjc5LZyMMxK@J>MNLXy>kA-}z|5`__TPwZWD?D&bJu_m?bh*PZA;GSD4g z+kd)o^Zmh2O}**jP;2awKxNN?G&>q2ezS7VDF(S2IDaVnOz!&524*aO(kwpqQ-lBL z>VzxjT(_zzL2pj>nBwMp_J)(|8XjGJG`}>M{`2qIEmNC^7LT5>;nbgv)0o01+jeD~LSDu4gZk25sdR&&+6@SYdS?|M|5rCX;W zU7d%o#^((^KK{9Sj^NeRj}G5Hcp+h9S*5?yf3WLp#WV^W;P0y){Gg{zX?K)d@UKi4 z{Jp04z?pe5Xz8)>UuAU^%jYk;oHXO=#mny*-#Ej6idD16_9W^4 afWG8mjM-cisJj#T!yEPKx_Zr;l79fGQC?2~ literal 2326 zcmV+x3F-EUP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+$tiu~XJ00@RjL_t(YOO=+nk1JUf#w(t2yS*<}cI{Oz z@B7-`mu_!uyKQ&BUf#UNdx+8Sf=M7kLi`hikdq*h5fBg&AdLt}5JHe3Ap#^wkRTd< zWxx3Yuu9jbPTjiaobNmLyCsOCXjzuyIJsP|P$*jvxm+(-8s$op6*`@6v)Qgx zc)d|7*Xs2~quFk?+E-Wo!C=VP>kT?ry-ugs?~mG@-e54EOsA8{bUdDn$Fq99LjsZ{ z39>9_bES6sdb@qKT<+)d&Fp%2dwaK7ZEtV)o9%JA+Ro>j7B$u!AR3I!M5#6r9PkU-@W^AfB$xK z_xS4Zv*Z2q;o;@}{)yQSuU;M>-#kBmwm&@IKRn;xzr23^?&<06e*d`HJSAcX+c4_H*xfyCHm@KLV!GYF8$c8j%~p3dyMdOg?tHe`({16f z1gu|v`MqdVIUC_{@@#}cA3dUIGA0rZqpp)ggBM}w6k|V`-1K^V7a~!VYqj?5dOn;i z`@_|Ax$X6O9?t~`ESI}bD0wylf!Nsy2BmL|#A$*%%5q-Q$^+8j2vKS0+X4lJpzyIl{o=7ClqsvP_D+Yt1%gcz@8}a)imzUv_5e)<+zdsQQ zNhAT7ic)N~T6Ep<`1;M8_nYnA)m4`*EJ%`ab=4!_XmmZ9%&%|OJh-^<{#+1#EeO96 zgkK55?*t(bh~xRCAbceVUT@Ir4HFV@@G}}lMboOCPKV8LclY%2@^-b_bbF@?Aenv| zPZqP;g7oL}b+uaac)S-EK948p^Mx)h0$#7r@5k_Yz1SFj48K1PIN`9uXqpYvtTmfW zHU||vJ$<%V08!60O_u}qI`~k;_4O_6cRE*aAiV#X@SR@>-~X-f!#@Z={`!+oJi-rt zFZ}3F*dEU%C3-v_pDzklmzTbCfK!`3YCByF5*=+c(LVQA zuh&sc1Qjx|0fdy#;+jsUc?&=4G#)R=a=F^EUEKhRqVu3wD$%p5s>+HI4u_FgWSn0j zk-(ok{o?K||1!uT<7eq+M8{v{SM9gT^s#Ll#+H7{*0JfcJG&*bw2nhrT zpqXYSDQhIlLW-i2wnYe|!)KFN(_9aGWe*{`SKBG~rwA?qD!SLsO{~U1ZS!wOXCd0c|Q}T{Jw& zmHc?gimqxVvn?wXi@78bSXE6Lgo<%mwu8aZ!s?XXY;m}bI5j!y*~tbKaH!?;C3;_$ zO)???VKAhGLds`|02}b5QMX_I{Z9Dvqo5n+f8M*(bR)(1_t(7WBobDs+$a|5%(`0v zMDbBkDpedO9}3Zk5J);oG%B5oNFfe& z-qMqKPAc0jIS$`44YmkHDeS{^I+x3rgTYu_lr1ZlOlpv<>y9MplJt=Y*kU9w9+IF| z2$4F@uUqNvjKaKO`(fuFYwq{6cDqL>c`lPnFx zz(W^Fr%AlVYzW9ZPC1pTI!-~?O?b}cs<4uBNTQf>kbVTTR;l!h#j8T0#z!uQbLH~Y zN~L1kWlgg+&CC}H^eE|Y*aiqe|Dm05XjvI9!$?sUf`P#;O2A%0wdhxNB5IgUvu-hy z;cL8*O40LWaJHRoz_ZiWnGRe=@wKpZ*bL56f$(C_#E4}cUpQC$bC_W%F@07*qoM6N<$g8H3w(*OVf 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 0000000000000000000000000000000000000000..64591b932766160859016d670e12370fb5857a35 GIT binary patch literal 1581 zcmbVMeNfYO7>-3IIFx$o5Zt*KKV}DQnzW@f(qTV9sur;pMctuk5@;+j26%q$(4F(tsdES0ZhA7tZDW4Ti4*h=+)|)!e|Y|}+~xO`=Xu_b z-}`1$cGlc6qZ39005HauX>~}mJoHA%r167o?qq3-7t(Wu#caOd$2kfxk*tdXZC<>9 za!@!KD7r+Y0zgC&?aUQ&?F%r1^{Vg?MkRWE5*q+g(?lOmcqjpMQ3W((gdUu3g+Q7# zLQ8dawcTf-+;nCsM=dVRauTH;!azc4Z-c2KCJA^c0S85IA;V*$5gOFRq;=>RhQL9H z;4wl&PUYIOK?}=KpiZSz5^59y^#&E9(;5&Y2}IS121e8{YEU8wrqyFeGC2G|k~NOZ z#~jv-VO!G92)PBphrzJl?^pRXDwZpN5re@1t5Fz5l@db92N(etl?*>EtYD>hf}?!` z%`#v}5qGi0f)SED9SXtgv)i8wGyHI(q?ExT?t>AP8uofaaSft*!9o4&#tYHBGvK3O z2gS3+93kCD{yyo>L6fewB4#y$q-)IXM2+Wexzy95$=TDc+dwnD3cjk{`X( zeTA9%{*1fRHjguBFYH>>6VacTml|C^p+EZB$a78Wx~^7D`Ahz%Jhn6@Q@HA}d_H@& zvF%pQ_ij^P!{Nr(xQ>n+?aLF7Y%H&>G0%&ykJ2(YQxG zI#{ci{Iq%gkMx>>-mmV6-M@F&9j$GCbA03EoE>!8*o5*YKexell4v%qV!yiwRkj5u zJ=lFe=i^@Jsr$q7f~%{du=m-Y1&_O-2HW8ZrBO7N%1v+rEA zFoyhdQ}$>t#4HmV`tJ?IJgq~rruKcQj+)(ms>=4HeBUI+Hgs0xf%3g83;4A&?$=u) zgOMQIlRqNjRk45lxTcz}Jdz3;N_#px_Q!rY!Z*Hi^x1?%va_-n;Bvix)xkZQCGztd z9F1vf_a?Ps0||49s*?x7-!9Er{iM12yvyCbK)Vca?8U zOgpx-3`(4MxhZ2i;U4v?8aZ&hC~8xnrSXgjs#esz7gsT(UG#Xi^RK05)g?vCt4@A{ p^m3m5AEui#oy+QWbshsEfTmvRTGOp_YePS9TY8rDsCm`8e*oF7N?!l~ literal 0 HcmV?d00001 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 ae572cfda976d853cfd7b25e72f85f7d423988fb..b20bf91c088d2986b1c52782716532afcfebe084 100644 GIT binary patch literal 1783 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 fU0qiW>27Y>@kgOlJ=0Z{&4)Go!R$mpXd2~ zyuaU8rY~I-9rbb)f*{e>RNAi06T|P=;mTOO*_EJ7)8vI&a)y{E`xyx$W=?cM)aqvP zp&c?@anVVbgdih|ct@6;Wm{roMYoCxV^jgRM`0sKQgXn$;0glw77H>Hzy)tyM1h80R^mM} zFA8W_k#UMX*@P*cJ_*6?vDuyq3*MnbDJdfYjE4X!HQ{!L;~GSJWjp-Wjc200j$#ia z?9eOvBv!ePytoKi$=&k}g@KAU#$^((TnbZ2i>%KL1=&iQFy)Ji<2j?oz$8E=W?T<} z0Vi3VG8mu}*XT%R9;u@Y8crY4c^044o3#crMbW@)0AQhxRFf97VFA6sY|$lHKuUyb z6}&PdurOkqS8NY)$>(y776~%4C^RY}F42QpEa)qlyugWm@7(YWJqehG z62BU9DU#?$2UBe1pJCpa09fdB8gPx1)Z%(h2XKnfusF~=NeVEW9smv-;&cBub%f#+ z5w4T})J^0_DaP>fX%{G)r+owkrFkT!OQ4}D8bO9nu+nBnpfkq4c+-?w6C1~D+EaR= zgC=si)=eE4`1MY%^Iq2z8*Y_eJ@f_9zGO**dheuNeZy#^jdTy2 zgkJ1zVC(N*K3ewhcGS%X&iZAbQ;hp7Y;@7ox^k1v5`RIClaLWCf-(n`W zZrs`XV3ibm`F~%s|U`({tIWV^;=`d-wf$wBqj`et#%bo@m8LoLLv7pQO#cydUVka&(JalhzG_v?1$*Lz@?DeL9z->hO_np+E4Pl#(xFlENg-3a#8?{8kL)zi9TM|wZqzUua#?zC;C`%dT8%{_Ty^XWC(x8B{d zg1wSfP-GoH`i;Kbty0eieYMBi<67c_sqeS{Fy_>W*ZU7t2=e#MXAd6hdcpDVuQFd< z)r+kMK412rDRuH%s`0Z>RP3YT*rH1p`%eyQYpuy#)cmz|bk5F<{qtv>+n#x|w{FD_{QQ}u{>OK>T^)CO^taiyGmBzI%#^f`2k5%x$sN}9 bYle?UR9cBWOom#+KVR#@rF7$h+_nDzzyUmd literal 1814 zcmeIy`#02S7y$6G6p>AaZYpCKV_e3#&bS+9#*DdrZ}XjDjEupcO^o|(+GrKEn?e^A zmD*NUT_klls>MOII+Dw-O`)`w!fvd{e*F{s(|*qLyw7>xU!HT`_q^OZXPyTRIb9|ba8+HVOv^S z5(oqk$z-yfogIZjvA4H(aBy&RbaZlZqEe~O&dxL%&BevV z)z#I_&CT82-NVDf)6uT1O^5&nam(eaBwgu zgvDa9*=!CbB!tc3hH$wYu7Jzs@_4*Z44)s$7w`oFo<}R;g4mF)^{Rv2k&6YPC8cAt5m_ zF(oA>Jv}`uD+_z3|NWOYu-bZtkM&!V%neJ$;nHa|cSnF1Cs`ocy3<>bE9sdaPvKY!6u>n^v3KD}jMAO7?@ zdiB;&{J{5|$4MXNpK z?*msi61lA7O|NAGMSK!`n^85NUe`ok*5)sD-RPs!XODONlb1dBN1I(m=jc@R9&)6v z+2n!lxuR+<)!R^-R|j*p8wIqV#*QuGT$&FlPmCZp5O zsNAQ2BA>Q3(w?W9X@%3DL_ccW5be+B-T2CI$iRR8qbi#sIWMZZ{Jb>kh^FFlYXry7 z!fbGSs3G8W8~0()kssTu*VL}sC~(}+GvB@1L3m($bB(ikjm8^YTr#>A8^lodjBN{u z|F$=2E7S3gDWv#ebbk6`sbk!sx{f!b_k(B0&u=2BrAND_Thl%*mBKt4KR!~q*)plH zzycpsmEiQEH~ubTiIXgv@!RZjJA2fodaC&#(VEuC6>NFg-e))?EI4Lw~>9 zrbdQa(W&X)*&9{0@MVQwr0s|P88tRS{zAf<-b5((Do~KG=Eb}qgKR((}JWLKv zsJ$IQX4W5QO>2AP6xBOo<4e>W?ZC&a9m7-L$}7cP z&6UmC(5^MV`trB&7IDY(kae_JFZ%++wXY6836>{IuU(Mi4A}rZ7{a2a# z+ljQV?OPJ(9^o|a&K|^X8eKM74R+6Jir1Uls5Q5><2C*37PKeSAxyJ}ghQrhz|*1q zPJ8R)`iz3xr%l>yib{K04v)x^xzJQbV$`k&7W?dqbT>UV2-=4?%Pzzb^-|TB^w5c2 zH*%Bj?di7E^HUG6U1 zjrrpy99CUH?2pksyN=aM9L-+7?31<(HdRF5yra{y=SAJZ?PMZDzA`U(Y!T~vP*lOc D*SS|3 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 cd001c80cc09b967c95340ca3ea76fe81bd0fa75..1c15e5fe6c298f2e7a65942fe94a5a4db9f73af1 100644 GIT binary patch literal 2174 zcmaJ@dpwi-AK!ABYkRi2ZY60$OOwkqr5D!rV6i>3J!~U&QsfdRx*$X3 z9FpiH$FDkvLn-C->qKrzi87bsNSsciep@G<^T)5>^Ljnc_wstb-=Ew2k0;&F*IQrL zTo-{r=+n2-0#qwn{px6|zT$+0H>%}p*fSUogd$)GTLdCJxX@k@P3N;C!2poWmBrox zHzE)k);wk~9L(5G;Xr&mTaCd>`9c*Nf!OFS6|y6Q^xNkyllu}dzd=O@%rTiFym?CwDC zqunrnB^Au@LsKCUh<3s|;Wz{m5$!_86P+B%MB;ihi9mD!hy;K{#u14WM;8jw8U5+O zsG^Cu5tIO$*QZ#jlN%-qhJ_RWkVqtWi31)IMFK=JnG6s}0EvWCA#h@u0A@>Z0k7BoVLu2xl-Tbb%OV3pgO1=7v!T;CVbQg+wB`5Qsz)jp#uo5_PJ+JG(A&X%Hul4+`K#F86P)!xy<~C-8-;$TU#IiwC)0B8ZRvSTTk7#aaDW`m z4-i(4rle>&S!K0^HkBk!6}5mDXSSuwribfT?hEtn@hj#t749!b$Ka}LL&Fdcqa)qB z3-00XNnQ15H-`zl`rXM3HBDFKoO?X}JeTBOVKOAm!tlYLPE<*!sx`Ia2hq(9 zhh5COO|jULU6z${aYpg%J0E98=Mub9f>QFUuirx%M#fr3|8&G^e4VrxyZD@BV|BEU~0$e#towg z6EuVuI1fa*GJmgn5aX<+?CR?)DD<@}GASNVzJ9McVO4DUD<^2b$-bp6_OIJcXz%Ly zS2`z*Igx-%;@G?X6BKrR8>0%K*eF*7qW z(A6?^wflaZXJGRs5_fnySYF>eI8=5>Lo;8;};0i z1UFu1%?8WzJl4+gzI|iBKJnwp43_QT9RJ z+7vT~<>|9vsYcNBLnPi*8jf4GwG&->sV`Sv{mNIN?NsFd-Ib2ORAbxrw#{h;II^Es zN#t+H+(XZ-cllLlTC59c=pR00Yt(x8xNzoAy&#KIAT6olaYnf*NK`6S@X>>BDwEO9`qzxW3=@Wxpg)Wel z!;YQ>d5yF0hfQ&9thq4vCf5&&gA0}u+#j#bd3Ci+O->4kw39xm#}&=k_RH5M6($yQ zV#6b33gwu40qSmEPfJe`YJ4dAzDC@1y#hHHv}*q=*;#z!+(tjM+9!=k%Cyq6zx{Ie za_zA9B8Ur;tvADOtzdzzY?+@X;B|GaR?^*>e z0PbdUkG1U$+-tk)u#wYz`O$~XJ;nbBwpV4pw8K5RaH>snug^9cFJZ>;>2=E5 zuik56Q92$Lc+qrkq0Q_?FZ-tVbIR@@rQ+Byy=KiBc(G f(*rZ(VMuMn_8H3+z*BjH`j3F_=}W8G5}y2DgVBtm literal 3313 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 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 5f1c34c34fd0aa21d10e5918af3b38f85e9a4892..41cbacb46e2de69b237dc3cf0ac90283f2c49a6f 100644 GIT binary patch literal 1682 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 KhLqZM-0dhcEfk04DMBVHzVIj$e%|ZfFtqfH{ zRlKl(pj1bWdeFj%q7*xVRHsP6!4|0%wF(t2;8nDaV>bx4KOBGbo7wMtpXa@2ZR+R< z*BSF?Fc=J1Rir$QUft}U^E7()e)1ZomwA*Tk5VgR4T2N4bz0t6x!#OH}1C;;Gcpg=anVRJuwG6enFh>AspJwS{lY?VRLm8?K^W~b z$j2Z7C`5SlB*3&FmnYPw2zep_7v)d#ybB)`2q{E-u2K$#$skC<3+D-WvcND%6wc%E zp>WP5R%J9(uo1x~b>p<|39RD1Sh0-6V2U8)2|_SpqaE=K$IZ5Pmow|#^e>E#Y^T^%ezUOjB$-&{4nK3(D18=k>uN>^D)ud4-qHE2pbiWZ>_-NblOGyzzx82MW zj>Aqn1M1qIH#lc??zJ5*sL~DWTo@eOE#H;S8|pq?Tx_+Xl*WIt&4uyVTxCX`=eC?r zWkgTf(4D(YmUgE{U2VIS$F6CS?I-swi`AVPGOdbS)!8(vdv?0>@mk;YBYnRexSiDf zOMj6iLRsUWQU~{PIvcBX)v~aA4h6Srj`jUnAJ9-H%6;{?DQ}~cD{h<~%mq|G_W@VD z6z-;~zuUKFQzPve-)KTJLn~{WF3!QruJ&$ublzLq+~21UYAT+M@}{)T+TXJ2dI+ys zdgaLtN%O{6Z3kkc0}7{ZXWQ+88=seI22VCSUhKQoWs>!M;p?Xf)jz#_j}*Op@%wV= zCezF34`TWUKX_@8>nnw4UNFBp{mC&=|N8O}>ABJPHLdK#BFDT79W8a6i)I(*^?JGa zK2<2Exq#`oCZAidva9un3_T-&QPMQ#Wy?Mq_ig8D+_rC7=oOhy)uj}JcR|QaQA11P zDvyyrgnnCx^V7DceXP!NSx{7>R5^Uu>bw$h485?QEFE)ov2v!bS+N8J*45zZz$HJe z&B@m1_IF&ZJC%EM|Lj8v4=z5=Df3=9Tyd~G*;-%Ue4KN1%G6|^XsWV3jx~i-n56Q@ zE5sXLlzwM+)jZY8rWrQhA38Buvg_+Ci%zxY?rVvo_bnvJ={{T4xKFNDXI59I9I|=- z+GyA|*W=E-srj{ETFPa+=ctzo-6L6shU>dfu=C-=hkNq8w$#VYAIm5+DmVCFb2}`D zOFcBT@r4x~`SAy~>YSi;`Kbsp-S<=|4F@%y&d(>V-s@r7-VliPai{}`1bT7EKoL*755gPLIg literal 2601 zcmV+^3fA?BP)VGd000McNliru-UlBOEhJp??=b)X3ARZ@ zK~z}7jaNO79oca`RdqkQ`}NE`4k?j&1Zx31vcgT78c=433T!BI>cB7r z2}+$AFa&4&2Q05s!B{}fmI5}A1!yVKGmpdfUVq$stIEL}E*AdW${Kwe)%TpLQ>W;? z_ug|6L9G=b1TZsNYXAUd1~cPLFf&vY?hZ2p5h2D15dkx!)(R2%{Jg57>pF-CVvIN* zk673B^Y3nMZV=oZ-~ax1|MYmQsaEoFB-`(86k!j6LrO+hS4&4E%FHwjQr4Af*WqBs z6eGM80|1CHN^uUsky2DZ?BZf9*Vk7m1a=~$WijsiuGTv7kAM7=e++%!W1fxsKCgY> z$7Pwj%|_^OScKVlSv<|N#SpkLyE3D?lU-bFtTl&OP?5@|XzaS!O4;X9q%k7^)nC5c zMI!UoV9ewqj#6d`K|JStLO?Y`HO1@e*P9rL?%us)L?9ygZnuZK)bsOD%*b+1G)+Zb zy=s{`mXsO+-1<2Y)Jah;~F4#U95W>riX0%)N+MsI^)trRAJmM2@AD=!0RaF? zQO!9lT}LVsB9O+B8jYFC@Z71Q!vgDntZ9M9|s_v(EY+;oiLm zrIakwGJ1mzA08;cy7UF!Z%n zS1kpAivUFAM9M^ja0}&f@7`G>iaj9Pl+wjK&%D`ez|0~d%FOkXPo6#b=wCki-kZd4 z;tS8-b=_ZYx7$zGb@kgKjYL$;LTYW+QpiP2iGnlpiGs~$SeW}9LZ>1f6OpKDud1tv z=rm0+=e&IM(Lev?e@*^B{D{Bx*6;keyAy!5og~kh#YF@}2BJc$3#%%)>pF~Mq!2vj zETpQ7yDyu~W(7b1+}-JuPo8}fUot*<_KPPuXH`|oIj=eA8bWRWp_CHLHZF3yM<}I0 zhHYs z?hi^Sf)jsKYxS;6jfmZh+$_6$BLLu&y8&%BzG0T(R%G1FVhDl95o_O*{`SM){mqv} z;K`H6&zN~(W<5JQYn#nRYc1&ejSfTd5CqKmq^>6m#+fL#TGs~fuq;ajkO1^4T}I|s z03845kKg}$0RF$#!qcZu{SUtRt-r}RFRE%HVyfz@$^g6Sig{jyNF6XCB7_rHKBPo0 z!f~EUsI}Uj&{r`rVZ-4v!AHDtdTc57$+Ei7? zacs9UB;4E_$!ukj2qK_07!kcG!cbLB+?D#iuK<<@4<5`RguLJHSwwmfxi}muF7MpA z`QU>O{`S|u{_NiEY{hr}I$tjhzLD=_*<=nZvbl7b#=Gf82~vRkF?!xX`bg)Yhl&e+;6)Q?6*#v0nDY8Vnl7~`~K$6ojZ%W z-vDUiIBL#$UDp-kI3lH_BGSfjY!??7uSzL1fVQq{t+nbr&vComRx@)EN!QocY-VtW zxz|i2o)STXK}07hzPTx-?*|Zxmr~YS{;Qdhs^;VIcwTE|RRw@XL^=$^mAjYQ{Xk-j zvfuCJ>gwt^j$;xLAtKaT0{{jJa_+sgm8J;-6qp%8j1gwhOPOr9BjjwVs!J(lQ%X59 zGvA6*>AFt(zTXqkbaizlXJ=!}7*6}#QbHASqzY1;QOO1Zv%9b!y#jLM~Ot+k%^f_wKa4kEy26N_r6 zBJS>uU%guMJWJ?%CL%8G4d>_44~JS**P_}aC90~8WAyUi!KJ-^z2f{lpjKvGo$Z&xSxie zyW`F3emj~!e-~rKx~^E)^}nt1r4+b3Zms&~LIwc0CKt=H0090I=a{JOeQB3400000 LNkvXXu0mjfNd6rp 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 aba84ffe814acac4ca1a0c1ad52ece3553c443fe..967b527f7cc051397c36e472c4593503b172dfae 100644 GIT binary patch literal 1765 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