From c9a9c52e3b81c5ef4bdf66448321bc1ccee3ad66 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Mon, 26 Sep 2016 18:01:28 +0200 Subject: [PATCH] New solderer model --- .../refinedstorage/block/BlockSolderer.java | 38 +- .../java/refinedstorage/gui/GuiSolderer.java | 4 +- .../refinedstorage/tile/TileSolderer.java | 41 +- .../refinedstorage/blockstates/solderer.json | 26 +- .../refinedstorage/models/block/solderer.json | 1441 ++++++++++++++--- .../textures/blocks/solderer_bottom.png | Bin 0 -> 1267 bytes .../textures/blocks/solderer_elements.png | Bin 0 -> 1166 bytes .../textures/blocks/solderer_glass.png | Bin 0 -> 1068 bytes .../textures/blocks/solderer_laser.png | Bin 190 -> 0 bytes .../blocks/solderer_laser_working.png | Bin 169 -> 0 bytes .../textures/blocks/solderer_middle.png | Bin 0 -> 1258 bytes .../textures/blocks/solderer_roof.png | Bin 0 -> 1252 bytes .../textures/blocks/solderer_side.png | Bin 0 -> 1209 bytes .../textures/blocks/solderer_top.png | Bin 0 -> 1336 bytes 14 files changed, 1268 insertions(+), 282 deletions(-) create mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/solderer_bottom.png create mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/solderer_elements.png create mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/solderer_glass.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/solderer_laser.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/solderer_laser_working.png create mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/solderer_middle.png create mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/solderer_roof.png create mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/solderer_side.png create mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/solderer_top.png diff --git a/src/main/java/refinedstorage/block/BlockSolderer.java b/src/main/java/refinedstorage/block/BlockSolderer.java index f4b3d82f1..3d2c803ad 100755 --- a/src/main/java/refinedstorage/block/BlockSolderer.java +++ b/src/main/java/refinedstorage/block/BlockSolderer.java @@ -1,18 +1,15 @@ package refinedstorage.block; -import net.minecraft.block.properties.PropertyBool; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; @@ -21,10 +18,6 @@ import refinedstorage.tile.TileSolderer; import java.util.List; public class BlockSolderer extends BlockNode { - private static final AxisAlignedBB AABB_SOLDERER = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 14D / 16D, 1.0D); - - private static final PropertyBool WORKING = PropertyBool.create("working"); - public BlockSolderer() { super("solderer"); } @@ -54,30 +47,6 @@ public class BlockSolderer extends BlockNode { return true; } - @Override - public boolean hasConnectivityState() { - return true; - } - - @Override - @SuppressWarnings("deprecation") - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { - return AABB_SOLDERER; - } - - @Override - protected BlockStateContainer createBlockState() { - return super.createBlockStateBuilder() - .add(WORKING) - .build(); - } - - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { - return super.getActualState(state, world, pos) - .withProperty(WORKING, ((TileSolderer) world.getTileEntity(pos)).isWorking()); - } - @Override @SuppressWarnings("deprecation") public boolean isOpaqueCube(IBlockState state) { @@ -90,6 +59,11 @@ public class BlockSolderer extends BlockNode { return false; } + @Override + public BlockRenderLayer getBlockLayer() { + return BlockRenderLayer.TRANSLUCENT; + } + @Override public EnumPlacementType getPlacementType() { return EnumPlacementType.HORIZONTAL; diff --git a/src/main/java/refinedstorage/gui/GuiSolderer.java b/src/main/java/refinedstorage/gui/GuiSolderer.java index 36623869b..d02036e91 100755 --- a/src/main/java/refinedstorage/gui/GuiSolderer.java +++ b/src/main/java/refinedstorage/gui/GuiSolderer.java @@ -28,7 +28,7 @@ public class GuiSolderer extends GuiBase { drawTexture(x, y, 0, 0, width, height); - if (solderer.isWorking()) { + if (TileSolderer.WORKING.getValue()) { drawTexture(x + 83, y + 38 - 1, 212, 0, getProgressScaled(22), 15); } } @@ -38,7 +38,7 @@ public class GuiSolderer extends GuiBase { drawString(7, 7, t("gui.refinedstorage:solderer")); drawString(7, 77, t("container.inventory")); - if (inBounds(83, 38, 22, 15, mouseX, mouseY) && solderer.isWorking()) { + if (inBounds(83, 38, 22, 15, mouseX, mouseY) && TileSolderer.WORKING.getValue()) { drawTooltip(mouseX, mouseY, getProgressScaled(100) + "%"); } } diff --git a/src/main/java/refinedstorage/tile/TileSolderer.java b/src/main/java/refinedstorage/tile/TileSolderer.java index cee776b7d..4139bdc1c 100755 --- a/src/main/java/refinedstorage/tile/TileSolderer.java +++ b/src/main/java/refinedstorage/tile/TileSolderer.java @@ -37,6 +37,13 @@ public class TileSolderer extends TileNode { } }); + public static final TileDataParameter WORKING = new TileDataParameter<>(DataSerializers.BOOLEAN, false, new ITileDataProducer() { + @Override + public Boolean getValue(TileSolderer tile) { + return tile.working; + } + }); + private static final String NBT_WORKING = "Working"; private static final String NBT_PROGRESS = "Progress"; @@ -72,11 +79,7 @@ public class TileSolderer extends TileNode { public TileSolderer() { dataManager.addWatchedParameter(DURATION); dataManager.addWatchedParameter(PROGRESS); - } - - @Override - public boolean hasConnectivityState() { - return true; + dataManager.addWatchedParameter(WORKING); } @Override @@ -86,8 +89,6 @@ public class TileSolderer extends TileNode { @Override public void updateNode() { - boolean wasWorking = working; - if (items.getStackInSlot(1) == null && items.getStackInSlot(2) == null && result.getStackInSlot(0) == null) { stop(); } else { @@ -129,10 +130,6 @@ public class TileSolderer extends TileNode { } } } - - if (wasWorking != working) { - updateBlock(); - } } @Override @@ -141,8 +138,6 @@ public class TileSolderer extends TileNode { if (!state) { stop(); - - updateBlock(); } } @@ -187,26 +182,6 @@ public class TileSolderer extends TileNode { return tag; } - @Override - public NBTTagCompound writeUpdate(NBTTagCompound tag) { - super.writeUpdate(tag); - - tag.setBoolean(NBT_WORKING, working); - - return tag; - } - - @Override - public void readUpdate(NBTTagCompound tag) { - working = tag.getBoolean(NBT_WORKING); - - super.readUpdate(tag); - } - - public boolean isWorking() { - return working; - } - public ItemHandlerBasic getItems() { return items; } diff --git a/src/main/resources/assets/refinedstorage/blockstates/solderer.json b/src/main/resources/assets/refinedstorage/blockstates/solderer.json index 9121a02fc..27d066cd3 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/solderer.json +++ b/src/main/resources/assets/refinedstorage/blockstates/solderer.json @@ -1,37 +1,17 @@ { "forge_marker": 1, "defaults": { - "textures": { - "particle": "refinedstorage:blocks/side_borderless", - "3": "refinedstorage:blocks/solderer_laser", - "4": "refinedstorage:blocks/solderer_laser" - }, "model": "refinedstorage:solderer", - "uvlock": true + "textures": { + "particle": "refinedstorage:blocks/solderer_side" + } }, "variants": { "inventory": [ { - "model": "refinedstorage:solderer", "transform": "forge:default-block" } ], - "working": { - "true": { - "textures": { - "3": "refinedstorage:blocks/solderer_laser_working", - "4": "refinedstorage:blocks/solderer_laser_working" - } - }, - "false": { - } - }, - "connected": { - "true": { - }, - "false": { - } - }, "direction": { "north": { "y": 0 diff --git a/src/main/resources/assets/refinedstorage/models/block/solderer.json b/src/main/resources/assets/refinedstorage/models/block/solderer.json index 5d84a1218..c2883a841 100755 --- a/src/main/resources/assets/refinedstorage/models/block/solderer.json +++ b/src/main/resources/assets/refinedstorage/models/block/solderer.json @@ -1,200 +1,1257 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "refinedstorage:blocks/side", - "1": "refinedstorage:blocks/side", - "2": "refinedstorage:blocks/side_borderless" - }, - "elements": [ - { - "name": "base", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 4.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 12.0, 16.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 12.0, 16.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 12.0, 16.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 12.0, 16.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } + "__comment": "Model made by CyanideX", + "textures": { + "0": "refinedstorage:blocks/solderer_side", + "1": "refinedstorage:blocks/solderer_top", + "2": "refinedstorage:blocks/solderer_bottom", + "3": "refinedstorage:blocks/solderer_middle", + "4": "refinedstorage:blocks/solderer_roof", + "5": "refinedstorage:blocks/solderer_elements", + "6": "refinedstorage:blocks/solderer_glass", + "-1": "refinedstorage:blocks/solderer_glass" + }, + "elements": [ + { + "name": "Bottom", + "from": [ + 0.0, + 0.0, + 0.0 + ], + "to": [ + 16.0, + 5.0, + 16.0 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 0.0, + 11.0, + 16.0, + 16.0 + ] }, - { - "name": "pedestalNW", - "from": [ 3.0, 4.0, 3.0 ], - "to": [ 7.0, 5.0, 7.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 4.0, 0.0, 8.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 7.0, 0.0, 11.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 12.0, 0.0, 16.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 2.0, 2.0, 6.0, 6.0 ] } - } + "east": { + "texture": "#0", + "uv": [ + 0.0, + 11.0, + 16.0, + 16.0 + ] }, - { - "name": "pedestalNE", - "from": [ 9.0, 4.0, 3.0 ], - "to": [ 13.0, 5.0, 7.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 4.0, 0.0, 8.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 8.0, 0.0, 12.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 12.0, 0.0, 16.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 10.0, 2.0, 14.0, 6.0 ] } - } + "south": { + "texture": "#0", + "uv": [ + 0.0, + 11.0, + 16.0, + 16.0 + ] }, - { - "name": "pedestalS", - "from": [ 6.0, 4.0, 9.0 ], - "to": [ 10.0, 5.0, 13.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 4.0, 0.0, 8.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 8.0, 0.0, 12.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 12.0, 0.0, 16.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 6.0, 11.0, 10.0, 15.0 ] } - } + "west": { + "texture": "#0", + "uv": [ + 0.0, + 11.0, + 16.0, + 16.0 + ] }, - { - "name": "poleNW", - "from": [ 1.0, 4.0, 1.0 ], - "to": [ 1.5, 12.0, 1.5 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] } - } + "up": { + "texture": "#1", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] }, - { - "name": "poleNE", - "from": [ 15.0, 4.0, 1.0 ], - "to": [ 15.5, 12.0, 1.5 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] } - } - }, - { - "name": "poleSW", - "from": [ 1.0, 4.0, 15.0 ], - "to": [ 1.5, 12.0, 15.5 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] } - } - }, - { - "name": "poleSE", - "from": [ 15.0, 4.0, 15.0 ], - "to": [ 15.5, 12.0, 15.5 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] } - } - }, - { - "name": "roof", - "from": [ 0.0, 12.0, 0.0 ], - "to": [ 16.0, 13.5, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.5 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.5 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.5 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.5 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - }, - { - "name": "roofAccent", - "from": [ 2.0, 13.5, 2.0 ], - "to": [ 14.0, 14.0, 14.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 12.0, 0.5 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 12.0, 0.5 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 12.0, 0.5 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 12.0, 0.5 ] }, - "up": { "texture": "#0", "uv": [ 2.0, 2.0, 14.0, 14.0 ] } - } - }, - { - "name": "laserbaseNW", - "from": [ 4.0, 9.0, 4.0 ], - "to": [ 6.0, 12.0, 6.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] }, - "east": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] }, - "south": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] }, - "west": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] }, - "down": { "texture": "#2", "uv": [ 1.0, 1.0, 3.0, 3.0 ] } - } - }, - { - "name": "laserbaseNE", - "from": [ 10.0, 9.0, 4.0 ], - "to": [ 12.0, 12.0, 6.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] }, - "east": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] }, - "south": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] }, - "west": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] }, - "down": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 3.0 ] } - } - }, - { - "name": "laserbaseS", - "from": [ 7.0, 9.0, 10.0 ], - "to": [ 9.0, 12.0, 12.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] }, - "east": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] }, - "south": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] }, - "west": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] }, - "down": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 3.0 ] } - } - }, - { - "name": "laserNW", - "from": [ 4.5, 6.0, 4.5 ], - "to": [ 5.5, 9.0, 5.5 ], - "faces": { - "north": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "east": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "south": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "west": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "down": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "laserNE", - "from": [ 10.5, 6.0, 4.5 ], - "to": [ 11.5, 9.0, 5.5 ], - "faces": { - "north": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "east": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "south": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "west": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "down": { "texture": "#4", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "laserS", - "from": [ 7.5, 6.0, 10.5 ], - "to": [ 8.5, 9.0, 11.5 ], - "faces": { - "north": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "east": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "south": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "west": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "down": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } + "down": { + "texture": "#2", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] } - ] + } + }, + { + "name": "Divider", + "from": [ + 1.0, + 5.0, + 1.0 + ], + "to": [ + 15.0, + 6.0, + 15.0 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 1.0, + 10.0, + 15.0, + 11.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 1.0, + 10.0, + 15.0, + 11.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 1.0, + 10.0, + 15.0, + 11.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 1.0, + 10.0, + 15.0, + 11.0 + ] + }, + "up": { + "texture": "#3", + "uv": [ + 2.0, + 2.0, + 14.0, + 14.0 + ] + }, + "down": { + "texture": "#3", + "uv": [ + 2.0, + 2.0, + 14.0, + 14.0 + ] + } + } + }, + { + "name": "Middle", + "from": [ + 0.0, + 6.0, + 0.0 + ], + "to": [ + 16.0, + 7.0, + 16.0 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 0.0, + 9.0, + 16.0, + 10.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 9.0, + 16.0, + 10.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 0.0, + 9.0, + 16.0, + 10.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 0.0, + 9.0, + 16.0, + 10.0 + ] + }, + "up": { + "texture": "#3", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "down": { + "texture": "#2", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + } + } + }, + { + "name": "Top", + "from": [ + 0.0, + 13.0, + 0.0 + ], + "to": [ + 16.0, + 16.0, + 16.0 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 3.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 3.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 3.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 3.0 + ] + }, + "up": { + "texture": "#1", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "down": { + "texture": "#4", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + } + } + }, + { + "name": "Tray", + "from": [ + 4.0, + 6.5, + 4.0 + ], + "to": [ + 12.0, + 7.5, + 12.0 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 4.0, + 8.0, + 12.0, + 9.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 4.0, + 8.0, + 12.0, + 9.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 4.0, + 8.0, + 12.0, + 9.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 4.0, + 8.0, + 12.0, + 9.0 + ] + }, + "up": { + "texture": "#5", + "uv": [ + 6.0, + 4.0, + 14.0, + 12.0 + ] + }, + "down": { + "texture": "#5", + "uv": [ + 6.0, + 4.0, + 14.0, + 12.0 + ] + } + } + }, + { + "name": "Pipe1", + "from": [ + 1.0, + 7.0, + 1.0 + ], + "to": [ + 2.0, + 13.0, + 2.0 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 1.0, + 3.0, + 2.0, + 9.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 14.0, + 3.0, + 15.0, + 9.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 1.0, + 3.0, + 2.0, + 9.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 14.0, + 3.0, + 15.0, + 9.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 1.0, + 1.0 + ] + }, + "down": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 1.0, + 1.0 + ] + } + } + }, + { + "name": "Track1", + "from": [ + 2.0, + 11.0, + 2.0 + ], + "to": [ + 3.0, + 13.0, + 14.0 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 2.0, + 3.0, + 3.0, + 5.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 2.0, + 3.0, + 14.0, + 5.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 13.0, + 3.0, + 14.0, + 5.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 2.0, + 3.0, + 14.0, + 5.0 + ] + }, + "up": { + "texture": "#5", + "uv": [ + 2.0, + 2.0, + 3.0, + 14.0 + ] + }, + "down": { + "texture": "#5", + "uv": [ + 3.0, + 2.0, + 2.0, + 14.0 + ] + } + } + }, + { + "name": "Track2", + "from": [ + 13.0, + 11.0, + 2.0 + ], + "to": [ + 14.0, + 13.0, + 14.0 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 2.0, + 3.0, + 3.0, + 5.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 2.0, + 3.0, + 14.0, + 5.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 14.0, + 3.0, + 13.0, + 5.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 2.0, + 3.0, + 14.0, + 5.0 + ] + }, + "up": { + "texture": "#5", + "uv": [ + 2.0, + 2.0, + 3.0, + 14.0 + ] + }, + "down": { + "texture": "#5", + "uv": [ + 3.0, + 2.0, + 4.0, + 14.0 + ] + } + } + }, + { + "name": "Track3", + "from": [ + 3.0, + 11.5, + 6.0 + ], + "to": [ + 13.0, + 12.5, + 7.0 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 3.0, + 1.0, + 13.0, + 2.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 1.0, + 0.0, + 2.0, + 1.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 3.0, + 1.0, + 13.0, + 2.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 1.0, + 0.0, + 2.0, + 1.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 3.0, + 1.0, + 13.0, + 2.0 + ] + }, + "down": { + "texture": "#0", + "uv": [ + 3.0, + 14.0, + 13.0, + 15.0 + ] + } + } + }, + { + "name": "Pipe2", + "from": [ + 14.0, + 7.0, + 1.0 + ], + "to": [ + 15.0, + 13.0, + 2.0 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 1.0, + 3.0, + 2.0, + 9.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 14.0, + 3.0, + 15.0, + 9.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 1.0, + 3.0, + 2.0, + 9.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 14.0, + 3.0, + 15.0, + 9.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 1.0, + 1.0 + ] + }, + "down": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 1.0, + 1.0 + ] + } + } + }, + { + "name": "Pipe3", + "from": [ + 14.0, + 7.0, + 14.0 + ], + "to": [ + 15.0, + 13.0, + 15.0 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 1.0, + 3.0, + 2.0, + 9.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 14.0, + 3.0, + 15.0, + 9.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 1.0, + 3.0, + 2.0, + 9.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 14.0, + 3.0, + 15.0, + 9.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 1.0, + 1.0 + ] + }, + "down": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 1.0, + 1.0 + ] + } + } + }, + { + "name": "Pipe4", + "from": [ + 1.0, + 7.0, + 14.0 + ], + "to": [ + 2.0, + 13.0, + 15.0 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 1.0, + 3.0, + 2.0, + 9.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 14.0, + 3.0, + 15.0, + 9.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 1.0, + 3.0, + 2.0, + 9.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 14.0, + 3.0, + 15.0, + 9.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 1.0, + 1.0 + ] + }, + "down": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 1.0, + 1.0 + ] + } + } + }, + { + "name": "Ring", + "from": [ + 6.0, + 11.0, + 5.5 + ], + "to": [ + 7.0, + 13.0, + 7.5 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 13.0, + 5.0, + 14.0, + 7.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 12.0, + 5.0, + 14.0, + 7.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 13.0, + 5.0, + 14.0, + 7.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 12.0, + 7.0, + 14.0, + 9.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 12.0, + 6.0, + 13.0, + 8.0 + ] + }, + "down": { + "texture": "#0", + "uv": [ + 12.0, + 6.0, + 13.0, + 8.0 + ] + } + } + }, + { + "name": "Solderer", + "from": [ + 6.0, + 8.0, + 6.0 + ], + "to": [ + 7.0, + 11.0, + 7.0 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 3.0, + 5.0, + 4.0, + 9.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 2.0, + 5.0, + 3.0, + 9.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 3.0, + 5.0, + 4.0, + 9.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 2.0, + 5.0, + 3.0, + 9.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 1.0, + 1.0 + ] + }, + "down": { + "texture": "#0", + "uv": [ + 3.0, + 8.0, + 4.0, + 9.0 + ] + } + } + }, + { + "name": "Window1", + "from": [ + 2.0, + 7.0, + 14.0 + ], + "to": [ + 14.0, + 13.0, + 15.0 + ], + "faces": { + "north": { + "texture": "#6", + "uv": [ + 2.0, + 5.0, + 14.0, + 11.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 6.0 + ] + }, + "south": { + "texture": "#6", + "uv": [ + 2.0, + 5.0, + 14.0, + 11.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 6.0 + ] + }, + "up": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 12.0, + 1.0 + ] + }, + "down": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 12.0, + 1.0 + ] + } + } + }, + { + "name": "Window2", + "from": [ + 2.0, + 7.0, + 1.0 + ], + "to": [ + 14.0, + 13.0, + 2.0 + ], + "faces": { + "north": { + "texture": "#6", + "uv": [ + 2.0, + 5.0, + 14.0, + 11.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 6.0 + ] + }, + "south": { + "texture": "#6", + "uv": [ + 2.0, + 5.0, + 14.0, + 11.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 6.0 + ] + }, + "up": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 12.0, + 1.0 + ] + }, + "down": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 12.0, + 1.0 + ] + } + } + }, + { + "name": "Window3", + "from": [ + 14.0, + 7.0, + 2.0 + ], + "to": [ + 15.0, + 13.0, + 14.0 + ], + "faces": { + "north": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 6.0 + ] + }, + "east": { + "texture": "#6", + "uv": [ + 2.0, + 5.0, + 14.0, + 11.0 + ] + }, + "south": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 6.0 + ] + }, + "west": { + "texture": "#6", + "uv": [ + 2.0, + 5.0, + 14.0, + 11.0 + ] + }, + "up": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 12.0 + ] + }, + "down": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 12.0 + ] + } + } + }, + { + "name": "Window4", + "from": [ + 1.0, + 7.0, + 2.0 + ], + "to": [ + 2.0, + 13.0, + 14.0 + ], + "faces": { + "north": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 6.0 + ] + }, + "east": { + "texture": "#6", + "uv": [ + 2.0, + 5.0, + 14.0, + 11.0 + ] + }, + "south": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 6.0 + ] + }, + "west": { + "texture": "#6", + "uv": [ + 2.0, + 5.0, + 14.0, + 11.0 + ] + }, + "up": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 12.0 + ] + }, + "down": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 12.0 + ] + } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/solderer_bottom.png b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_bottom.png new file mode 100755 index 0000000000000000000000000000000000000000..e9c9d23a9e599267b173acd7e9df360ba59f8bb3 GIT binary patch literal 1267 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$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*WnYlR`8o60GSr}Uw7#g~oIT@KbT9{jy z8JQXyxSE-}!1TK0Czs}?=9R$orXch>l_0F=) znCo}9y|p=i{PDxsPsN>&EpEJcY_Z4Q@XxAMPN${Y9zOr9I6LXfzV{jTzc0Q2e!Keh z*I#EXJ1Mbw-Rfdbnd4Ui`VIS%?|;uqIpAz@{`0!mES$Oqvks(`L{3XMwrr*1oMkJ2 zacY<)@{~nSYi&{SoY9cDS<;DZs>HFH=m!huKValkpK8{~fA&a_0860A-8l^|S2E2j z_x$f=6?cAnvE|5&j!iRuUWmI{;kw7A=7EjA;_N5yEh9QMTw4^RFmu^{35Q$yA6@uv z{@K~TH00)zp!0c6xi7lB1)f(v^Z6bfu+49!WtsECWj<>%`4S7)W-oXt8k2NiX#Td` z*SpSb>Ivy8WwbSzcJNu|2dOtpSEjxA{By}u1D>Y7;GBDB#9STs+Ac-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$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*WnYo#no0_>ng)vO8OMY@`Zfaf$Om7N8uO&{spyZHS0JPa9wJ5VJHN~wcKUV?lZL3V&ZZX4Y z9#n4%Znv1@)TkrMZl!p7C&<uon} z&fgL&c&kuy>yZUtlY*y^X6m%m-%R(v+n(n>Trg|dd@F{wM4g@MmSv zKtj9gk>Z0ni(QUCxV!4qCLP6=V!LDymg%p*9yRgU%*14%uFVE_VxM)~wi5uE4L(dVAZ!Hs0%{7nkHl@0#S!KC5L; z!rNVaHV5>AChg@u@Zxt|c*i1+sh*8ZZ`s#2=^l@q_xv~ibrarYI;Vv$*Vku$`+mPl aJb~eJ;o345yN>ms62jBf&t;ucLK6T=)sEEw literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/solderer_glass.png b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_glass.png new file mode 100755 index 0000000000000000000000000000000000000000..0ff7c19c6ef3173d709cf61d7ab28a44368d356d GIT binary patch literal 1068 zcmaJ=O-K|`93K!PWGyd2dg(EWB(?LkjyjW@>CUQKuGl)DMUdmnQ-^itjWbVol>&)^ zf-ZTe4uYo+T{?K_OG%5&4%H!~G6F#`vOvp2c&Xm3u6Ae}c=JB^{eJ(C_j}jcTAK2en zxv6&I&UlNgBa6{|43oAT!ltO&y0oL|Nr*u=>^1E$z4rJC4NN0UcZhK=?nGdp**xOH z_K{XqA4%$xLDwAzwP~3MSP*L7T#(~so|6R*Y=1O~<{CY6LTTKNMRsAj4`WAW*;FdU zq(TgGds$wRB$g9cK?o8=&>Oa~mJZrpX;wjjp6;3sHjxc{MXehR;xJ7z-73Lyc4TdD zyG^8FY+7?zp5gqGvcP!!|4_@?L3=m>ck}(Hu%`|?kWD}j4Z1qHxSmo!lp{x6sA1%) z2=!;X*w%+I^7@biB9Tnjz~K(lHc-l|$Z+CuIc9rUvvn9#!ZcA~Ow*9LDxo0~tqRqI zB$4N%RSkk9D%H{I5GRU!sGiGm6{HVZ(8gJ=vCFN@$@T4EIV7?IU2_N;jV`i4rfk{F zoeQ5+Z<}l6&PB+{Wl1uuf4P5McJ_!k$Y1VQmuz;-4{hRjmsne_nXVzvVmzkQtLepW zW2g2#0|8~zeyG0rbPN_3O{|_NxqEt2?^qbSGQ0e}Ydsmfug_YG`-{r*UkpqoPBNF5 z&L)TEMyG$SydQu2{9ur|GsPCD=aSQ-1Ksm#?c9SSGp{!)fin6fa68OP^Xnf2BWpLQ z>t9>mbshMy94M1M_n){Co4g7xUdSJN#Da=Vro1Wd)zj5q=Z7bjN@u8BYR?ZGSXlAj NZ!FrX+-vB%^aoFtVBY`$ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/solderer_laser.png b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_laser.png deleted file mode 100755 index d7c097f6f4586cb8c6c9aa531453448f633d29b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJv^tqh*7elF{r5}E)COFT3H diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/solderer_laser_working.png b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_laser_working.png deleted file mode 100755 index 7d7a0a15193569ba3fb522d6a546c9a51eee5663..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJduSVV9KUp0YTU{?igto>yUC`sxkpM~N3NmCB{u4nke+QfNA2bA*XB&`vAb)N zMi_PAqg3V=-Ge!um9}#mbks+sD>5BAl;HxMRjC^l3thwh5K-J@PQ1&S&OeL?cfSXp z&*%I4aKo|ICpOq0vO^HGA=*O6&2^*oR#lka{Rfh6bJ=W!JB>D_$4GM;fSLs*0pO^_ z^@2Fygu&fk13v_<+a|J|Mkn($$tx1dSr{}UsU{nO{DF+h@hM=y3D7Ib6!OdLIRq93 z3h8h$IHQI@Qf$d;pe@_V^4S#c6Ocd??9Y&l#DgBE(2h z$epA*nHU^WGyuC$w}U4L0`~Y&!sTsrx*A|7PPj1KhY`2~CrAP(ojAPuAZ9d8=po~D zWHpv~qL8Fvs3eA^(`hu_h$>nyM)-U_40mEqr^7@z^g-F+G7eeaT2i2a&TFD-h>8qb zid;hJHz>r+^iBzqx+W{@t8FqHhGjSvBT(EbsRU%0|A$J_8d^8v;BLPEDXg=DD!}4E zSNb*H99+*lZz@2LZD*8jW-|-^95a0$UjNeQc%b_1!`rLxtK{{Pf22M|&32myYR+H`;f9+V$(cB?xCOPfKUM zzyF8D{8xLgEf36Y9;&?f!N$`}YvI+Jz?UtxXJu?)X4jDG-Ou+=P!;dHYnY{xqetTN zf9yHuTQ@g+GLo|$yEsl%)p<{jUpRbuXR6`j+HD|)K5$B?utntf6vY3vc-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$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*WnH!rpx|y3gTNqmy7#g~oSr}NDTAG;~ z8(2EI8n~Fd!SuT1Czs}?=9R$orXcjX;M5CB4!H$Dn_W_iGRsm^+=}vZ6~NxM%Eav! zN1WzC^`_ugS&wdXm7Gka^2i=HA}--jVH4h2!cVjG>F$xynS*{F%qbbUTwQSEokt){7m_Cu`g=&$u@A)sBNDychqZ_I}j;m^tfN)!tt$ zu^XL}D|+wdr7Is?eyQ~C!-4``wH;^cXZN-%ACne&exXleZ|R-|+W$lo7;68-+}7T< R)EiXpc)I$ztaD0e0sym?!PEc% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/solderer_side.png b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_side.png new file mode 100755 index 0000000000000000000000000000000000000000..f5ba86fe9ff970694fd2008c49eba90e7af274a7 GIT binary patch literal 1209 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 zlv;+`xm*f{`Ar-f_1X=gFCWw5i4(@1jTDY0Ts#P=~ zx^Zb_Z$#r0HLj&Bo!@8lC+De6-g)v)(!L`nD{G&BO-_`ki@C9__j#qqizWqwV+&-C zAJlVrZo${p(WAgI!OC~?A`KVkiu>iBlRB8~7aca3lB&t%8u(`;^9-JKCcg6h?dx81 z$iy?SPuiup^|jUc&!23>6K`z0yKQZvgo)}b1yQS6!JVbC2e;_FE_u|f?J2Zllg{Hh zXAxJIeViJdQZpK>8Lv2r%$col+Q|1)S3}Y1O&5&5d-z^<=zRR6QY@-@+o8f27ncA0 zb~x~@{DQyx%oRVYSoD3~zn`r?IdfLn^{uN`c`Q}2_{m+Ov|!b$%6aDndiK5dy)1Kl xVq2pN&%fu&3QuPMs+yg31JYD@<);T3K0RWSmqyzu} literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/solderer_top.png b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_top.png new file mode 100755 index 0000000000000000000000000000000000000000..9504d025b915b3d369e6a61d1171778acddda673 GIT binary patch literal 1336 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$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*WIXb!+7`T}OL)*f@(9qS)$;iag#mLym z(AdJ*)YaGxrq?AuximL5uLPzy1)^tNj;PTNRhOI|eQio~F4{w40=jxbLR8l-xI23ChHrG0PzD~GuIW{!* zZgT$q`_=Ql*X`fEZu7NoReKL6T-c^7ndEhB#;$di_VdpdSd?_!&2ztE!rSt)WL9eA zyyq9X7Aa_)o}^V{wEXf(K>>^T=QC#s{g>mLa{RGjVWdcC=-(xp&%aj1t_{1OlbZGV zYn9Q=3o3n&4Z1i~mhk;x^lfnNF3sBaKDpu0+p^0x>zpIE`3kor?!SM0?WC~eld2sR zJLjBD%V1`jm_G9_AM=9Wb!;-$imXzSQK$J$nWk)&QJJ8Y?=V^EQOma)yNlE01ul44 zsb4eNwb{ALR_WN>otl5V1q!kxQ#cIr9Zu+Fx2=?rsmbZ+&-F6Oe_(D&={PP@6 zK2KZLaCW0M_N&Ymj5lH!1a0K_cZLf;Qt{l9A(eDSm(kOgr&rBUK;Uraq8D}h4@-n3woSJb>Uhnq1t35x36BsT<<{mb&N$~-dWuC5nF6*2UngFUg(s=*? literal 0 HcmV?d00001