diff --git a/src/main/java/refinedstorage/block/BlockCable.java b/src/main/java/refinedstorage/block/BlockCable.java index c3397d844..d68b74c77 100755 --- a/src/main/java/refinedstorage/block/BlockCable.java +++ b/src/main/java/refinedstorage/block/BlockCable.java @@ -356,6 +356,7 @@ public class BlockCable extends BlockCoverable { @Override public BlockRenderLayer getBlockLayer() { - return RefinedStorage.INSTANCE.config.translucentCables ? BlockRenderLayer.TRANSLUCENT : super.getBlockLayer(); + // @TODO: Remove config + return BlockRenderLayer.CUTOUT; } } diff --git a/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java b/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java index fe9134b8b..a2ca0e331 100755 --- a/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java +++ b/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java @@ -1,5 +1,6 @@ package refinedstorage.block; +import mcmultipart.block.BlockCoverable; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -14,7 +15,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; -import refinedstorage.tile.TileCable; import refinedstorage.tile.TileWirelessTransmitter; public class BlockWirelessTransmitter extends BlockNode { @@ -69,7 +69,7 @@ public class BlockWirelessTransmitter extends BlockNode { @Override public boolean canPlaceBlockAt(World world, BlockPos pos) { - return world.getTileEntity(pos.offset(EnumFacing.DOWN)) instanceof TileCable; + return world.getBlockState(pos.offset(EnumFacing.DOWN)).getBlock() instanceof BlockCoverable; } @Override diff --git a/src/main/java/refinedstorage/proxy/ClientProxy.java b/src/main/java/refinedstorage/proxy/ClientProxy.java index 64aa8e38a..f170aa508 100755 --- a/src/main/java/refinedstorage/proxy/ClientProxy.java +++ b/src/main/java/refinedstorage/proxy/ClientProxy.java @@ -270,7 +270,7 @@ public class ClientProxy extends CommonProxy { ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.FLUID_INTERFACE), 0, new ModelResourceLocation("refinedstorage:fluid_interface", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER), 0, new ModelResourceLocation("refinedstorage:wireless_transmitter", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTING_MONITOR), 0, new ModelResourceLocation("refinedstorage:crafting_monitor", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTER), 0, new ModelResourceLocation("refinedstorage:crafter", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTER), 0, new ModelResourceLocation("refinedstorage:crafter", "connected=false,direction=north")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.PROCESSING_PATTERN_ENCODER), 0, new ModelResourceLocation("refinedstorage:processing_pattern_encoder", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.NETWORK_TRANSMITTER), 0, new ModelResourceLocation("refinedstorage:network_transmitter", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.NETWORK_RECEIVER), 0, new ModelResourceLocation("refinedstorage:network_receiver", "inventory")); diff --git a/src/main/resources/assets/refinedstorage/blockstates/cable.json b/src/main/resources/assets/refinedstorage/blockstates/cable.json index 0965f8664..beb3576c3 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/cable.json +++ b/src/main/resources/assets/refinedstorage/blockstates/cable.json @@ -2,8 +2,8 @@ "forge_marker": 1, "defaults": { "textures": { - "all": "refinedstorage:blocks/cable", - "particle": "refinedstorage:blocks/cable" + "all": "refinedstorage:blocks/cable_new", + "particle": "refinedstorage:blocks/cable_new" }, "model": "refinedstorage:cable_core", "uvlock": true diff --git a/src/main/resources/assets/refinedstorage/blockstates/constructor.json b/src/main/resources/assets/refinedstorage/blockstates/constructor.json index 8df2b5d8e..a1a83c747 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/constructor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/constructor.json @@ -4,8 +4,8 @@ "textures": { "all": "refinedstorage:blocks/cable", "particle": "refinedstorage:blocks/cable", - "front": "refinedstorage:blocks/constructor", - "line": "refinedstorage:blocks/cable_part" + "front": "refinedstorage:blocks/constructor_on", + "line": "refinedstorage:blocks/importer_exporter_external_storage" }, "model": "refinedstorage:cable_core", "uvlock": true @@ -17,12 +17,6 @@ "transform": "forge:default-block" } ], - "connected": { - "true": { - }, - "false": { - } - }, "direction": { "north": { "submodel": "refinedstorage:constructor_destructor_north" diff --git a/src/main/resources/assets/refinedstorage/blockstates/controller.json b/src/main/resources/assets/refinedstorage/blockstates/controller.json index cdeb2c4e0..006b358b4 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/controller.json +++ b/src/main/resources/assets/refinedstorage/blockstates/controller.json @@ -3,8 +3,9 @@ "defaults": { "model": "orientable", "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side", + "particle": "refinedstorage:blocks/controller_0", + "side": "refinedstorage:blocks/controller_0", + "top": "refinedstorage:blocks/controller_0", "front": "refinedstorage:blocks/controller_0" } }, @@ -17,37 +18,51 @@ }, "1": { "textures": { + "side": "refinedstorage:blocks/controller_1", + "top": "refinedstorage:blocks/controller_1", "front": "refinedstorage:blocks/controller_1" } }, "2": { "textures": { + "side": "refinedstorage:blocks/controller_2", + "top": "refinedstorage:blocks/controller_2", "front": "refinedstorage:blocks/controller_2" } }, "3": { "textures": { - "front": "refinedstorage:blocks/controller_3" + "side": "refinedstorage:blocks/controller_on", + "top": "refinedstorage:blocks/controller_on", + "front": "refinedstorage:blocks/controller_on" } }, "4": { "textures": { - "front": "refinedstorage:blocks/controller_4" + "side": "refinedstorage:blocks/controller_on", + "top": "refinedstorage:blocks/controller_on", + "front": "refinedstorage:blocks/controller_on" } }, "5": { "textures": { - "front": "refinedstorage:blocks/controller_5" + "side": "refinedstorage:blocks/controller_on", + "top": "refinedstorage:blocks/controller_on", + "front": "refinedstorage:blocks/controller_on" } }, "6": { "textures": { - "front": "refinedstorage:blocks/controller_6" + "side": "refinedstorage:blocks/controller_on", + "top": "refinedstorage:blocks/controller_on", + "front": "refinedstorage:blocks/controller_on" } }, "7": { "textures": { - "front": "refinedstorage:blocks/controller_7" + "side": "refinedstorage:blocks/controller_on", + "top": "refinedstorage:blocks/controller_on", + "front": "refinedstorage:blocks/controller_on" } } }, diff --git a/src/main/resources/assets/refinedstorage/blockstates/crafter.json b/src/main/resources/assets/refinedstorage/blockstates/crafter.json index d18a1219a..1d763d418 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/crafter.json +++ b/src/main/resources/assets/refinedstorage/blockstates/crafter.json @@ -1,51 +1,93 @@ { "forge_marker": 1, "defaults": { - "model": "orientable", + "model": "cube", "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side" - } + "particle": "refinedstorage:blocks/crafter_side", + "crafter_side": "refinedstorage:blocks/crafter_side", + "crafter_side_90": "refinedstorage:blocks/crafter_side_90", + "crafter_side_180": "refinedstorage:blocks/crafter_side_180", + "crafter_side_270": "refinedstorage:blocks/crafter_side_270", + "crafter_front": "refinedstorage:blocks/crafter_front" + }, + "uvlock": true }, "variants": { - "inventory": [ - { - "textures": { - "front": "refinedstorage:blocks/crafter_disconnected" - }, - "y": 0 - } - ], "connected": { "true": { "textures": { - "front": "refinedstorage:blocks/crafter_connected" + "crafter_side": "refinedstorage:blocks/crafter_side_connected", + "crafter_side_90": "refinedstorage:blocks/crafter_side_connected_90", + "crafter_side_180": "refinedstorage:blocks/crafter_side_connected_180", + "crafter_side_270": "refinedstorage:blocks/crafter_side_connected_270", + "crafter_front": "refinedstorage:blocks/crafter_front_connected" } }, "false": { "textures": { - "front": "refinedstorage:blocks/crafter_disconnected" } } }, "direction": { "north": { - "y": 0 + "textures": { + "down": "#crafter_side", + "up": "#crafter_side", + "north": "#crafter_front", + "east": "#crafter_side_90", + "south": "refinedstorage:blocks/crafter_bottom", + "west": "#crafter_side_270" + } }, "east": { - "y": 90 + "textures": { + "down": "refinedstorage:blocks/crafter_bottom", + "up": "#crafter_side_90", + "north": "#crafter_side_270", + "east": "#crafter_front", + "south": "#crafter_side_90", + "west": "refinedstorage:blocks/crafter_bottom" + } }, "south": { - "y": 180 + "textures": { + "down": "refinedstorage:blocks/crafter_bottom", + "up": "#crafter_side_180", + "north": "refinedstorage:blocks/crafter_bottom", + "east": "#crafter_side_270", + "south": "#crafter_front", + "west": "#crafter_side_90" + } }, "west": { - "y": 270 + "textures": { + "down": "refinedstorage:blocks/crafter_bottom", + "up": "#crafter_side_270", + "north": "#crafter_side_90", + "east": "refinedstorage:blocks/crafter_bottom", + "south": "#crafter_side_270", + "west": "#crafter_front" + } }, "up": { - "x": 270 + "textures": { + "down": "refinedstorage:blocks/crafter_bottom", + "up": "#crafter_front", + "north": "#crafter_side", + "east": "#crafter_side", + "south": "#crafter_side", + "west": "#crafter_side" + } }, "down": { - "x": 90 + "textures": { + "down": "#crafter_front", + "up": "refinedstorage:blocks/crafter_bottom", + "north": "#crafter_side_180", + "east": "#crafter_side_180", + "south": "#crafter_side_180", + "west": "#crafter_side_180" + } } } } diff --git a/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json b/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json index 9aea2d1a0..d06778647 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json @@ -1,23 +1,28 @@ { "forge_marker": 1, "defaults": { - "model": "orientable", + "model": "cube", "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side", - "front": "refinedstorage:blocks/crafting_monitor_disconnected" + "particle": "refinedstorage:blocks/crafting_monitor_front", + "north": "refinedstorage:blocks/crafting_monitor_front", + "east": "refinedstorage:blocks/crafting_monitor_left", + "south": "refinedstorage:blocks/crafting_monitor_back", + "west": "refinedstorage:blocks/crafting_monitor_right", + "up": "refinedstorage:blocks/crafting_monitor_top", + "down": "refinedstorage:blocks/bottom" } }, "variants": { "inventory": [ { + "transform": "forge:default-block", "y": 0 } ], "connected": { "true": { "textures": { - "front": "refinedstorage:blocks/crafting_monitor_connected" + "north": "refinedstorage:blocks/crafting_monitor_connected_front" } }, "false": { diff --git a/src/main/resources/assets/refinedstorage/blockstates/destructor.json b/src/main/resources/assets/refinedstorage/blockstates/destructor.json index 969789778..8ed1ed42d 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/destructor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/destructor.json @@ -4,8 +4,8 @@ "textures": { "all": "refinedstorage:blocks/cable", "particle": "refinedstorage:blocks/cable", - "front": "refinedstorage:blocks/destructor", - "line": "refinedstorage:blocks/cable_part" + "front": "refinedstorage:blocks/destructor_on", + "line": "refinedstorage:blocks/importer_exporter_external_storage" }, "model": "refinedstorage:cable_core", "uvlock": true @@ -17,12 +17,6 @@ "transform": "forge:default-block" } ], - "connected": { - "true": { - }, - "false": { - } - }, "direction": { "north": { "submodel": "refinedstorage:constructor_destructor_north" diff --git a/src/main/resources/assets/refinedstorage/blockstates/disk_drive.json b/src/main/resources/assets/refinedstorage/blockstates/disk_drive.json index 6a8eb8ce2..28ed34516 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/disk_drive.json +++ b/src/main/resources/assets/refinedstorage/blockstates/disk_drive.json @@ -1,11 +1,15 @@ { "forge_marker": 1, "defaults": { - "model": "orientable", + "model": "cube", "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side", - "front": "refinedstorage:blocks/disk_drive_0" + "particle": "refinedstorage:blocks/disk_drive_0", + "down": "refinedstorage:blocks/disk_drive_bottom", + "up": "refinedstorage:blocks/disk_drive_top", + "north": "refinedstorage:blocks/disk_drive_0", + "east": "refinedstorage:blocks/disk_drive_side", + "south": "refinedstorage:blocks/disk_drive_side", + "west": "refinedstorage:blocks/disk_drive_side" } }, "variants": { @@ -65,42 +69,42 @@ "stored": { "0": { "textures": { - "front": "refinedstorage:blocks/disk_drive_0" + "north": "refinedstorage:blocks/disk_drive_0" } }, "1": { "textures": { - "front": "refinedstorage:blocks/disk_drive_1" + "north": "refinedstorage:blocks/disk_drive_0" } }, "2": { "textures": { - "front": "refinedstorage:blocks/disk_drive_2" + "north": "refinedstorage:blocks/disk_drive_0" } }, "3": { "textures": { - "front": "refinedstorage:blocks/disk_drive_3" + "north": "refinedstorage:blocks/disk_drive_0" } }, "4": { "textures": { - "front": "refinedstorage:blocks/disk_drive_4" + "north": "refinedstorage:blocks/disk_drive_0" } }, "5": { "textures": { - "front": "refinedstorage:blocks/disk_drive_5" + "north": "refinedstorage:blocks/disk_drive_0" } }, "6": { "textures": { - "front": "refinedstorage:blocks/disk_drive_6" + "north": "refinedstorage:blocks/disk_drive_0" } }, "7": { "textures": { - "front": "refinedstorage:blocks/disk_drive_7" + "north": "refinedstorage:blocks/disk_drive_0" } } }, diff --git a/src/main/resources/assets/refinedstorage/blockstates/disk_manipulator.json b/src/main/resources/assets/refinedstorage/blockstates/disk_manipulator.json index 55d47d6a8..81075175f 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/disk_manipulator.json +++ b/src/main/resources/assets/refinedstorage/blockstates/disk_manipulator.json @@ -5,7 +5,7 @@ "textures": { "side": "refinedstorage:blocks/side", "top": "refinedstorage:blocks/side", - "front": "refinedstorage:blocks/disk_manipulator" + "front": "refinedstorage:blocks/disk_manipulator_disconnected" } }, "variants": { @@ -16,6 +16,9 @@ ], "connected": { "true": { + "textures": { + "front": "refinedstorage:blocks/disk_manipulator" + } }, "false": { } diff --git a/src/main/resources/assets/refinedstorage/blockstates/exporter.json b/src/main/resources/assets/refinedstorage/blockstates/exporter.json index a0f233ebd..8cb54ce29 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/exporter.json +++ b/src/main/resources/assets/refinedstorage/blockstates/exporter.json @@ -4,7 +4,7 @@ "textures": { "all": "refinedstorage:blocks/cable", "particle": "refinedstorage:blocks/cable", - "line": "refinedstorage:blocks/cable_part" + "line": "refinedstorage:blocks/importer_exporter_external_storage" }, "model": "refinedstorage:cable_core", "uvlock": true diff --git a/src/main/resources/assets/refinedstorage/blockstates/external_storage.json b/src/main/resources/assets/refinedstorage/blockstates/external_storage.json index adf5b62a1..d5499367e 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/external_storage.json +++ b/src/main/resources/assets/refinedstorage/blockstates/external_storage.json @@ -4,7 +4,7 @@ "textures": { "all": "refinedstorage:blocks/cable", "particle": "refinedstorage:blocks/cable", - "line": "refinedstorage:blocks/cable_part" + "line": "refinedstorage:blocks/importer_exporter_external_storage" }, "model": "refinedstorage:cable_core", "uvlock": true diff --git a/src/main/resources/assets/refinedstorage/blockstates/grid.json b/src/main/resources/assets/refinedstorage/blockstates/grid.json index 054ca63e6..e6b273bbb 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/grid.json +++ b/src/main/resources/assets/refinedstorage/blockstates/grid.json @@ -1,49 +1,60 @@ { "forge_marker": 1, "defaults": { - "model": "orientable", + "model": "cube", "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side", - "front": "refinedstorage:blocks/grid_disconnected" + "particle": "refinedstorage:blocks/side", + "north": "refinedstorage:blocks/grid_disconnected", + "east": "refinedstorage:blocks/grid_left", + "south": "refinedstorage:blocks/grid_back", + "west": "refinedstorage:blocks/grid_right", + "up": "refinedstorage:blocks/grid_top", + "down": "refinedstorage:blocks/bottom" } }, "variants": { "connected": { "true": { "textures": { - "front_fluid_grid": "refinedstorage:blocks/fluid_grid_connected", - "front_other": "refinedstorage:blocks/grid_connected" + "north_normal": "refinedstorage:blocks/grid_front_connected", + "north_crafting": "refinedstorage:blocks/grid_crafting_front_connected", + "north_pattern": "refinedstorage:blocks/grid_pattern_front_connected", + "north_fluid": "refinedstorage:blocks/grid_fluid_front_connected" } }, "false": { "textures": { - "front_fluid_grid": "refinedstorage:blocks/fluid_grid_disconnected", - "front_other": "refinedstorage:blocks/grid_disconnected" + "north_normal": "refinedstorage:blocks/grid_front", + "north_crafting": "refinedstorage:blocks/grid_crafting_front", + "north_pattern": "refinedstorage:blocks/grid_pattern_front", + "north_fluid": "refinedstorage:blocks/grid_fluid_front" } } }, "type": { "normal": { "textures": { - "front": "#front_other" + "north": "#north_normal" } }, "crafting": { "textures": { - "front": "#front_other" + "north": "#north_crafting" } }, "pattern": { "textures": { - "front": "#front_other" + "north": "#north_pattern" } }, "fluid": { "textures": { - "front": "#front_fluid_grid", - "side": "refinedstorage:blocks/fluid_grid_side", - "top": "refinedstorage:blocks/fluid_grid_side" + "north": "#north_fluid", + "east": "refinedstorage:blocks/grid_fluid_left", + "south": "refinedstorage:blocks/grid_fluid_back", + "west": "refinedstorage:blocks/grid_fluid_right", + "up": "refinedstorage:blocks/grid_fluid_top", + "down": "refinedstorage:blocks/bottom" } } }, diff --git a/src/main/resources/assets/refinedstorage/blockstates/importer.json b/src/main/resources/assets/refinedstorage/blockstates/importer.json index ccbadf616..a131e1e27 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/importer.json +++ b/src/main/resources/assets/refinedstorage/blockstates/importer.json @@ -4,7 +4,7 @@ "textures": { "all": "refinedstorage:blocks/cable", "particle": "refinedstorage:blocks/cable", - "line": "refinedstorage:blocks/cable_part" + "line": "refinedstorage:blocks/importer_exporter_external_storage" }, "model": "refinedstorage:cable_core", "uvlock": true diff --git a/src/main/resources/assets/refinedstorage/blockstates/machine_casing.json b/src/main/resources/assets/refinedstorage/blockstates/machine_casing.json index 6bb002548..0526b619f 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/machine_casing.json +++ b/src/main/resources/assets/refinedstorage/blockstates/machine_casing.json @@ -3,7 +3,7 @@ "defaults": { "model": "cube_all", "textures": { - "all": "refinedstorage:blocks/side" + "all": "refinedstorage:blocks/casing" } }, "variants": { diff --git a/src/main/resources/assets/refinedstorage/blockstates/processing_pattern_encoder.json b/src/main/resources/assets/refinedstorage/blockstates/processing_pattern_encoder.json index 64c04521f..a3c98690b 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/processing_pattern_encoder.json +++ b/src/main/resources/assets/refinedstorage/blockstates/processing_pattern_encoder.json @@ -15,7 +15,8 @@ "variants": { "inventory": [ { - "transform": "forge:default-block" + "transform": "forge:default-block", + "y": 0 } ], "normal": { diff --git a/src/main/resources/assets/refinedstorage/models/block/cable.json b/src/main/resources/assets/refinedstorage/models/block/cable.json index 3170aa97d..c6ae3adf3 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable.json @@ -1,5 +1,8 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + "0": "refinedstorage:blocks/cable_new" + }, "elements": [ { "name": "Core", @@ -15,57 +18,57 @@ ], "faces": { "north": { - "texture": "#all", + "texture": "#0", "uv": [ - 4.0, - 4.0, - 8.0, - 8.0 + 6.0, + 6.0, + 10.0, + 10.0 ] }, "east": { - "texture": "#all", + "texture": "#0", "uv": [ - 0.0, - 4.0, - 4.0, - 8.0 + 6.0, + 6.0, + 10.0, + 10.0 ] }, "south": { - "texture": "#all", + "texture": "#0", "uv": [ - 12.0, - 4.0, - 16.0, - 8.0 + 6.0, + 6.0, + 10.0, + 10.0 ] }, "west": { - "texture": "#all", + "texture": "#0", "uv": [ - 8.0, - 4.0, - 12.0, - 8.0 + 6.0, + 6.0, + 10.0, + 10.0 ] }, "up": { - "texture": "#all", + "texture": "#0", "uv": [ - 8.0, - 4.0, - 4.0, - 0.0 + 6.0, + 6.0, + 10.0, + 10.0 ] }, "down": { - "texture": "#all", + "texture": "#0", "uv": [ - 12.0, - 0.0, - 8.0, - 4.0 + 6.0, + 6.0, + 10.0, + 10.0 ] } } @@ -84,58 +87,60 @@ ], "faces": { "north": { - "texture": "#all", + "texture": "#0", "uv": [ - 4.0, - 4.0, - 8.0, - 8.0 + 0.0, + 6.0, + 6.0, + 10.0 ] }, "east": { - "texture": "#all", + "texture": "#0", "uv": [ - 0.0, - 4.0, - 4.0, - 8.0 + 6.0, + 6.0, + 10.0, + 10.0 ] }, "south": { - "texture": "#all", + "texture": "#0", "uv": [ - 12.0, - 4.0, + 10.0, + 6.0, 16.0, - 8.0 + 10.0 ] }, "west": { - "texture": "#all", + "texture": "#0", "uv": [ - 8.0, - 4.0, - 12.0, - 8.0 + 6.0, + 6.0, + 10.0, + 10.0 ] }, "up": { - "texture": "#all", + "texture": "#0", "uv": [ - 8.0, - 4.0, - 4.0, + 6.0, + 6.0, + 10.0, 0.0 - ] + ], + "rotation": 270 }, "down": { - "texture": "#all", + "texture": "#0", "uv": [ - 12.0, - 0.0, - 8.0, - 4.0 - ] + 6.0, + 10.0, + 10.0, + 16.0 + ], + "rotation": 270 } } }, @@ -153,60 +158,62 @@ ], "faces": { "north": { - "texture": "#all", + "texture": "#0", "uv": [ - 4.0, - 4.0, - 8.0, - 8.0 + 10.0, + 6.0, + 16.0, + 10.0 ] }, "east": { - "texture": "#all", + "texture": "#0", "uv": [ - 0.0, - 4.0, - 4.0, - 8.0 + 6.0, + 6.0, + 10.0, + 10.0 ] }, "south": { - "texture": "#all", + "texture": "#0", "uv": [ - 12.0, - 4.0, - 16.0, - 8.0 + 0.0, + 6.0, + 6.0, + 10.0 ] }, "west": { - "texture": "#all", + "texture": "#0", "uv": [ - 8.0, - 4.0, - 12.0, - 8.0 + 6.0, + 6.0, + 10.0, + 10.0 ] }, "up": { - "texture": "#all", + "texture": "#0", "uv": [ - 8.0, - 4.0, - 4.0, + 10.0, + 6.0, + 6.0, 0.0 - ] + ], + "rotation": 90 }, "down": { - "texture": "#all", + "texture": "#0", "uv": [ - 12.0, - 0.0, - 8.0, - 4.0 - ] + 6.0, + 10.0, + 10.0, + 16.0 + ], + "rotation": 90 } } } ] -} +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_core.json b/src/main/resources/assets/refinedstorage/models/block/cable_core.json index 9f9d5149d..e32888b86 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_core.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_core.json @@ -1,5 +1,8 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + "0": "refinedstorage:blocks/cable_new" + }, "elements": [ { "name": "Core", @@ -15,57 +18,57 @@ ], "faces": { "north": { - "texture": "#all", + "texture": "#0", "uv": [ - 4.0, - 4.0, - 8.0, - 8.0 + 6.0, + 6.0, + 10.0, + 10.0 ] }, "east": { - "texture": "#all", + "texture": "#0", "uv": [ - 0.0, - 4.0, - 4.0, - 8.0 + 6.0, + 6.0, + 10.0, + 10.0 ] }, "south": { - "texture": "#all", + "texture": "#0", "uv": [ - 12.0, - 4.0, - 16.0, - 8.0 + 6.0, + 6.0, + 10.0, + 10.0 ] }, "west": { - "texture": "#all", + "texture": "#0", "uv": [ - 8.0, - 4.0, - 12.0, - 8.0 + 6.0, + 6.0, + 10.0, + 10.0 ] }, "up": { - "texture": "#all", + "texture": "#0", "uv": [ - 8.0, - 4.0, - 4.0, - 0.0 + 6.0, + 6.0, + 10.0, + 10.0 ] }, "down": { - "texture": "#all", + "texture": "#0", "uv": [ - 12.0, - 0.0, - 8.0, - 4.0 + 6.0, + 6.0, + 10.0, + 10.0 ] } } diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_down.json b/src/main/resources/assets/refinedstorage/models/block/cable_down.json index b6751c24f..b4ecfef4f 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_down.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_down.json @@ -1,5 +1,8 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + "0": "refinedstorage:blocks/cable_new" + }, "elements": [ { "name": "Down", @@ -15,57 +18,57 @@ ], "faces": { "north": { - "texture": "#all", + "texture": "#0", "uv": [ - 4.0, - 4.0, - 8.0, - 8.0 + 6.0, + 10.0, + 10.0, + 16.0 ] }, "east": { - "texture": "#all", + "texture": "#0", "uv": [ - 0.0, - 4.0, - 4.0, - 8.0 + 6.0, + 10.0, + 10.0, + 16.0 ] }, "south": { - "texture": "#all", + "texture": "#0", "uv": [ - 12.0, - 4.0, - 16.0, - 8.0 + 6.0, + 10.0, + 10.0, + 16.0 ] }, "west": { - "texture": "#all", + "texture": "#0", "uv": [ - 8.0, - 4.0, - 12.0, - 8.0 + 6.0, + 10.0, + 10.0, + 16.0 ] }, "up": { - "texture": "#all", + "texture": "#0", "uv": [ - 8.0, - 4.0, - 4.0, - 0.0 + 6.0, + 6.0, + 10.0, + 10.0 ] }, "down": { - "texture": "#all", + "texture": "#0", "uv": [ - 12.0, - 0.0, - 8.0, - 4.0 + 6.0, + 6.0, + 10.0, + 10.0 ] } } diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_east.json b/src/main/resources/assets/refinedstorage/models/block/cable_east.json index 52ab45d9d..1b6b50894 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_east.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_east.json @@ -1,5 +1,8 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + "0": "refinedstorage:blocks/cable_new" + }, "elements": [ { "name": "East", @@ -15,57 +18,57 @@ ], "faces": { "north": { - "texture": "#all", + "texture": "#0", "uv": [ - 4.0, - 4.0, - 8.0, - 8.0 + 0.0, + 6.0, + 6.0, + 10.0 ] }, "east": { - "texture": "#all", + "texture": "#0", "uv": [ - 0.0, - 4.0, - 4.0, - 8.0 + 6.0, + 6.0, + 10.0, + 10.0 ] }, "south": { - "texture": "#all", + "texture": "#0", "uv": [ - 12.0, - 4.0, + 10.0, + 6.0, 16.0, - 8.0 + 10.0 ] }, "west": { - "texture": "#all", + "texture": "#0", "uv": [ - 8.0, - 4.0, - 12.0, - 8.0 + 6.0, + 6.0, + 10.0, + 10.0 ] }, "up": { - "texture": "#all", + "texture": "#0", "uv": [ - 8.0, - 4.0, - 4.0, - 0.0 + 10.0, + 6.0, + 16.0, + 10.0 ] }, "down": { - "texture": "#all", + "texture": "#0", "uv": [ - 12.0, - 0.0, - 8.0, - 4.0 + 10.0, + 6.0, + 16.0, + 10.0 ] } } diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_north.json b/src/main/resources/assets/refinedstorage/models/block/cable_north.json index 8ea78cadb..316187294 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_north.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_north.json @@ -1,5 +1,8 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + "0": "refinedstorage:blocks/cable_new" + }, "elements": [ { "name": "North", @@ -15,57 +18,57 @@ ], "faces": { "north": { - "texture": "#all", + "texture": "#0", "uv": [ - 4.0, - 4.0, - 8.0, - 8.0 + 6.0, + 6.0, + 10.0, + 10.0 ] }, "east": { - "texture": "#all", + "texture": "#0", "uv": [ - 0.0, - 4.0, - 4.0, - 8.0 + 10.0, + 6.0, + 16.0, + 10.0 ] }, "south": { - "texture": "#all", + "texture": "#0", "uv": [ - 12.0, - 4.0, - 16.0, - 8.0 + 6.0, + 6.0, + 10.0, + 10.0 ] }, "west": { - "texture": "#all", + "texture": "#0", "uv": [ - 8.0, - 4.0, - 12.0, - 8.0 + 0.0, + 6.0, + 6.0, + 10.0 ] }, "up": { - "texture": "#all", + "texture": "#0", "uv": [ - 8.0, - 4.0, - 4.0, - 0.0 + 6.0, + 0.0, + 10.0, + 6.0 ] }, "down": { - "texture": "#all", + "texture": "#0", "uv": [ - 12.0, - 0.0, - 8.0, - 4.0 + 6.0, + 10.0, + 10.0, + 16.0 ] } } diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_south.json b/src/main/resources/assets/refinedstorage/models/block/cable_south.json index ade8e334a..f3509482e 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_south.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_south.json @@ -1,5 +1,8 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + "0": "refinedstorage:blocks/cable_new" + }, "elements": [ { "name": "South", @@ -15,57 +18,57 @@ ], "faces": { "north": { - "texture": "#all", + "texture": "#0", "uv": [ - 4.0, - 4.0, - 8.0, - 8.0 + 6.0, + 6.0, + 10.0, + 10.0 ] }, "east": { - "texture": "#all", + "texture": "#0", "uv": [ 0.0, - 4.0, - 4.0, - 8.0 + 6.0, + 6.0, + 10.0 ] }, "south": { - "texture": "#all", + "texture": "#0", "uv": [ - 12.0, - 4.0, - 16.0, - 8.0 + 6.0, + 6.0, + 10.0, + 10.0 ] }, "west": { - "texture": "#all", + "texture": "#0", "uv": [ - 8.0, - 4.0, - 12.0, - 8.0 + 10.0, + 6.0, + 16.0, + 10.0 ] }, "up": { - "texture": "#all", + "texture": "#0", "uv": [ - 8.0, - 4.0, - 4.0, - 0.0 + 6.0, + 10.0, + 10.0, + 16.0 ] }, "down": { - "texture": "#all", + "texture": "#0", "uv": [ - 12.0, + 6.0, 0.0, - 8.0, - 4.0 + 10.0, + 6.0 ] } } diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_up.json b/src/main/resources/assets/refinedstorage/models/block/cable_up.json index deddf2228..d12e83542 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_up.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_up.json @@ -1,5 +1,8 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + "0": "refinedstorage:blocks/cable_new" + }, "elements": [ { "name": "Up", @@ -15,57 +18,57 @@ ], "faces": { "north": { - "texture": "#all", + "texture": "#0", "uv": [ - 4.0, - 4.0, - 8.0, - 8.0 + 6.0, + 0.0, + 10.0, + 6.0 ] }, "east": { - "texture": "#all", + "texture": "#0", "uv": [ - 0.0, - 4.0, - 4.0, - 8.0 + 6.0, + 16.0, + 10.0, + 10.0 ] }, "south": { - "texture": "#all", + "texture": "#0", "uv": [ - 12.0, - 4.0, - 16.0, - 8.0 + 6.0, + 0.0, + 10.0, + 6.0 ] }, "west": { - "texture": "#all", + "texture": "#0", "uv": [ - 8.0, - 4.0, - 12.0, - 8.0 + 6.0, + 16.0, + 10.0, + 10.0 ] }, "up": { - "texture": "#all", + "texture": "#0", "uv": [ - 8.0, - 4.0, - 4.0, - 0.0 + 6.0, + 6.0, + 10.0, + 10.0 ] }, "down": { - "texture": "#all", + "texture": "#0", "uv": [ - 12.0, - 0.0, - 8.0, - 4.0 + 6.0, + 6.0, + 10.0, + 10.0 ] } } diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_west.json b/src/main/resources/assets/refinedstorage/models/block/cable_west.json index 49d4b478c..6d573f2e7 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_west.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_west.json @@ -1,5 +1,8 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + "0": "refinedstorage:blocks/cable_new" + }, "elements": [ { "name": "West", @@ -15,58 +18,60 @@ ], "faces": { "north": { - "texture": "#all", + "texture": "#0", "uv": [ - 4.0, - 4.0, - 8.0, - 8.0 + 10.0, + 6.0, + 16.0, + 10.0 ] }, "east": { - "texture": "#all", + "texture": "#0", "uv": [ - 0.0, - 4.0, - 4.0, - 8.0 + 6.0, + 6.0, + 10.0, + 10.0 ] }, "south": { - "texture": "#all", + "texture": "#0", "uv": [ - 12.0, - 4.0, - 16.0, - 8.0 + 0.0, + 6.0, + 6.0, + 10.0 ] }, "west": { - "texture": "#all", + "texture": "#0", "uv": [ - 8.0, - 4.0, - 12.0, - 8.0 + 6.0, + 6.0, + 10.0, + 10.0 ] }, "up": { - "texture": "#all", + "texture": "#0", "uv": [ - 8.0, - 4.0, - 4.0, + 10.0, + 6.0, + 6.0, 0.0 - ] + ], + "rotation": 90 }, "down": { - "texture": "#all", + "texture": "#0", "uv": [ - 12.0, - 0.0, - 8.0, - 4.0 - ] + 10.0, + 10.0, + 6.0, + 16.0 + ], + "rotation": 90 } } } diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_down.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_down.json index 9f035e4b6..72d06794f 100755 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_down.json +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_down.json @@ -1,7 +1,5 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - }, "elements": [ { "name": "Line1", diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_east.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_east.json index 40b6af3cd..6efd16250 100755 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_east.json +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_east.json @@ -1,7 +1,5 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - }, "elements": [ { "name": "Line1", diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_north.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_north.json index 6d505f45e..79bfd0e91 100755 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_north.json +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_north.json @@ -1,7 +1,5 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - }, "elements": [ { "name": "Line1", diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_south.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_south.json index 3f803eb7f..7e33dad1a 100755 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_south.json +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_south.json @@ -1,7 +1,5 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - }, "elements": [ { "name": "Line1", diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_up.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_up.json index 0fcd3795d..1aa14b6c6 100755 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_up.json +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_up.json @@ -1,7 +1,5 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - }, "elements": [ { "name": "Line1", diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_west.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_west.json index fd17c53e4..d897e8201 100755 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_west.json +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_west.json @@ -1,7 +1,5 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - }, "elements": [ { "name": "Line1", diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/128k_fluid_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/128k_fluid_storage_block.png index 84d05bc83..fd9dc3862 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/128k_fluid_storage_block.png and b/src/main/resources/assets/refinedstorage/textures/blocks/128k_fluid_storage_block.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/16k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/16k_storage_block.png index 9b007f0b4..f873aa6fd 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/16k_storage_block.png and b/src/main/resources/assets/refinedstorage/textures/blocks/16k_storage_block.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/1k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/1k_storage_block.png index e69c21afa..5351aa39e 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/1k_storage_block.png and b/src/main/resources/assets/refinedstorage/textures/blocks/1k_storage_block.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/256k_fluid_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/256k_fluid_storage_block.png index e6c1cbcff..d460dc9c6 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/256k_fluid_storage_block.png and b/src/main/resources/assets/refinedstorage/textures/blocks/256k_fluid_storage_block.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/4k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/4k_storage_block.png index 5bd206ac9..400a4e53a 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/4k_storage_block.png and b/src/main/resources/assets/refinedstorage/textures/blocks/4k_storage_block.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/512k_fluid_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/512k_fluid_storage_block.png index b1928d064..c611462b8 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/512k_fluid_storage_block.png and b/src/main/resources/assets/refinedstorage/textures/blocks/512k_fluid_storage_block.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/64k_fluid_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/64k_fluid_storage_block.png index 81fa83eb0..dd20e849e 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/64k_fluid_storage_block.png and b/src/main/resources/assets/refinedstorage/textures/blocks/64k_fluid_storage_block.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/64k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/64k_storage_block.png index 770e2656c..97fbe60e6 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/64k_storage_block.png and b/src/main/resources/assets/refinedstorage/textures/blocks/64k_storage_block.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/bottom.png b/src/main/resources/assets/refinedstorage/textures/blocks/bottom.png new file mode 100755 index 000000000..1d2dde206 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/bottom.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/cable.png b/src/main/resources/assets/refinedstorage/textures/blocks/cable.png old mode 100644 new mode 100755 index 6efa5a384..a1246790e Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/cable.png and b/src/main/resources/assets/refinedstorage/textures/blocks/cable.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/cable_new.png b/src/main/resources/assets/refinedstorage/textures/blocks/cable_new.png new file mode 100755 index 000000000..29e835584 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/cable_new.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/cable_part.png b/src/main/resources/assets/refinedstorage/textures/blocks/cable_part.png index a0c07decf..d2915c337 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/cable_part.png and b/src/main/resources/assets/refinedstorage/textures/blocks/cable_part.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/cable_striped.png b/src/main/resources/assets/refinedstorage/textures/blocks/cable_striped.png new file mode 100755 index 000000000..9f1fcda0b Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/cable_striped.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/casing.png b/src/main/resources/assets/refinedstorage/textures/blocks/casing.png new file mode 100755 index 000000000..6a0554315 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/casing.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/constructor.png b/src/main/resources/assets/refinedstorage/textures/blocks/constructor.png index dfbc00905..d3ab43ebf 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/constructor.png and b/src/main/resources/assets/refinedstorage/textures/blocks/constructor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/constructor_on.png b/src/main/resources/assets/refinedstorage/textures/blocks/constructor_on.png new file mode 100755 index 000000000..5ae493b75 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/constructor_on.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/constructor_on.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/constructor_on.png.mcmeta new file mode 100755 index 000000000..e0a228a98 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/textures/blocks/constructor_on.png.mcmeta @@ -0,0 +1,19 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11 + ] + } +} diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_0.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_0.png index a285f34b1..c91484b31 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/controller_0.png and b/src/main/resources/assets/refinedstorage/textures/blocks/controller_0.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_1.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_1.png old mode 100644 new mode 100755 index afeb97ca0..8cdc7c581 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/controller_1.png and b/src/main/resources/assets/refinedstorage/textures/blocks/controller_1.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_1.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/controller_1.png.mcmeta new file mode 100755 index 000000000..b9f2c6457 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/textures/blocks/controller_1.png.mcmeta @@ -0,0 +1,19 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11 + ] + } +} diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_2.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_2.png old mode 100644 new mode 100755 index edc14165a..34f0b109b Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/controller_2.png and b/src/main/resources/assets/refinedstorage/textures/blocks/controller_2.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_2.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/controller_2.png.mcmeta new file mode 100755 index 000000000..e0a228a98 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/textures/blocks/controller_2.png.mcmeta @@ -0,0 +1,19 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11 + ] + } +} diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_3.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_3.png deleted file mode 100644 index 26cdd1f49..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/controller_3.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_4.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_4.png deleted file mode 100644 index 6e3735eaa..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/controller_4.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_5.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_5.png deleted file mode 100644 index 563ebdb97..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/controller_5.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_6.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_6.png deleted file mode 100644 index ec99b0a0c..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/controller_6.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_7.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_7.png deleted file mode 100755 index e4b82d6e0..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/controller_7.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_on.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_on.png new file mode 100755 index 000000000..4c3838386 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/controller_on.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_on.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/controller_on.png.mcmeta new file mode 100755 index 000000000..e0a228a98 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/textures/blocks/controller_on.png.mcmeta @@ -0,0 +1,19 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11 + ] + } +} diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_on_purple.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_on_purple.png new file mode 100755 index 000000000..d3e283598 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/controller_on_purple.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_bottom.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_bottom.png new file mode 100755 index 000000000..b5ec5a1ad Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_bottom.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_connected.png deleted file mode 100755 index dfa342129..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_connected.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_disconnected.png deleted file mode 100755 index 90612c207..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_disconnected.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_front.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_front.png new file mode 100755 index 000000000..9b5be0fd2 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_front.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_front_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_front_connected.png new file mode 100755 index 000000000..05b302039 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_front_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side.png new file mode 100755 index 000000000..33661fcec Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_180.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_180.png new file mode 100755 index 000000000..4892ba5fd Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_180.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_270.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_270.png new file mode 100755 index 000000000..de2ba154d Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_270.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_90.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_90.png new file mode 100755 index 000000000..2559b3710 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_90.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected.png new file mode 100755 index 000000000..3a7899010 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_180.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_180.png new file mode 100755 index 000000000..87709d925 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_180.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_270.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_270.png new file mode 100755 index 000000000..cce7fd60f Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_270.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_90.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_90.png new file mode 100755 index 000000000..6d919ab48 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_90.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_top.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_top.png new file mode 100755 index 000000000..9b5be0fd2 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_top.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_top_alt.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_top_alt.png new file mode 100755 index 000000000..4df9cbdc6 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_top_alt.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_top_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_top_connected.png new file mode 100755 index 000000000..05b302039 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_top_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_top_connected_alt.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_top_connected_alt.png new file mode 100755 index 000000000..a91a54811 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_top_connected_alt.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_back.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_back.png new file mode 100755 index 000000000..3d9b6a87e Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_back.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_connected.png index 5eaf85ba8..ec94f31e7 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_connected.png and b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_connected_front.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_connected_front.png new file mode 100755 index 000000000..e82d4a9b7 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_connected_front.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_disconnected.png old mode 100644 new mode 100755 index 3a6dfb5de..6db474b97 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_disconnected.png and b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_disconnected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_front.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_front.png new file mode 100755 index 000000000..5719629cc Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_front.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_left.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_left.png new file mode 100755 index 000000000..2b9d3cf12 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_left.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_right.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_right.png new file mode 100755 index 000000000..55647d716 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_right.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_top.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_top.png new file mode 100755 index 000000000..61ab1c376 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_top.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/creative_fluid_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/creative_fluid_storage_block.png index f493a2ebd..f4af18aa9 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/creative_fluid_storage_block.png and b/src/main/resources/assets/refinedstorage/textures/blocks/creative_fluid_storage_block.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/creative_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/creative_storage_block.png index 34c6f5ace..651bf47e3 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/creative_storage_block.png and b/src/main/resources/assets/refinedstorage/textures/blocks/creative_storage_block.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/destructor.png b/src/main/resources/assets/refinedstorage/textures/blocks/destructor.png index f4d75f47f..266950ceb 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/destructor.png and b/src/main/resources/assets/refinedstorage/textures/blocks/destructor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/destructor_on.png b/src/main/resources/assets/refinedstorage/textures/blocks/destructor_on.png new file mode 100755 index 000000000..e1c170f0b Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/destructor_on.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/destructor_on.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/destructor_on.png.mcmeta new file mode 100755 index 000000000..2f6e41aa5 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/textures/blocks/destructor_on.png.mcmeta @@ -0,0 +1,27 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19 + ] + } +} diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_0.png b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_0.png new file mode 100755 index 000000000..b8234d75d Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_0.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_0_alt.png b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_0_alt.png new file mode 100755 index 000000000..66e8d7ac4 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_0_alt.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_0_alt1.png b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_0_alt1.png new file mode 100755 index 000000000..784b0f0e7 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_0_alt1.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_0_alt2.png b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_0_alt2.png new file mode 100755 index 000000000..589f1b6fb Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_0_alt2.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_0_alt3.png b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_0_alt3.png new file mode 100755 index 000000000..0b926e46e Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_0_alt3.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_0_alt4.png b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_0_alt4.png new file mode 100755 index 000000000..eff33800c Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_0_alt4.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_1.png b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_1.png new file mode 100755 index 000000000..f7f71ccbc Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_1.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_2.png b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_2.png new file mode 100755 index 000000000..ed5d2495b Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_2.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_3.png b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_3.png new file mode 100755 index 000000000..de41558f9 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_3.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_4.png b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_4.png new file mode 100755 index 000000000..0040d0cae Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_4.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_5.png b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_5.png new file mode 100755 index 000000000..eaea08f05 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_5.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_6.png b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_6.png new file mode 100755 index 000000000..1fc3f3ffb Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_6.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_7.png b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_7.png new file mode 100755 index 000000000..35c655666 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_7.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_bottom.png b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_bottom.png new file mode 100755 index 000000000..4ea6acb89 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_bottom.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_side.png b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_side.png new file mode 100755 index 000000000..4d08a6530 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_side.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_top.png b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_top.png new file mode 100755 index 000000000..75a85ac75 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/diskDrive/disk_drive_top.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_0.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_0.png old mode 100644 new mode 100755 index 100995008..b8234d75d Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_0.png and b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_0.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_1.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_1.png old mode 100644 new mode 100755 index 82af1fa73..b8234d75d Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_1.png and b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_1.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_2.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_2.png old mode 100644 new mode 100755 index 36085f782..b8234d75d Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_2.png and b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_2.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_3.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_3.png old mode 100644 new mode 100755 index 71ccf155a..b8234d75d Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_3.png and b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_3.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_4.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_4.png deleted file mode 100644 index 54a9705a4..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_4.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_5.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_5.png deleted file mode 100644 index 241cc1a79..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_5.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_6.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_6.png deleted file mode 100644 index b84fcdde4..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_6.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_7.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_7.png deleted file mode 100644 index c265caf1d..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_7.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_bottom.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_bottom.png new file mode 100755 index 000000000..4ea6acb89 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_bottom.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_side.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_side.png new file mode 100755 index 000000000..4d08a6530 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_side.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_top.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_top.png new file mode 100755 index 000000000..75a85ac75 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_top.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator.png index b8601345b..029c880a3 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator.png and b/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_alt.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_alt.png new file mode 100755 index 000000000..eb1e92759 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_alt.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_disconnected.png new file mode 100755 index 000000000..bd129a659 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_disconnected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_0.png b/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_0.png new file mode 100755 index 000000000..a30f564e3 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_0.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_0_alt.png b/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_0_alt.png new file mode 100755 index 000000000..66e8d7ac4 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_0_alt.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_0_alt1.png b/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_0_alt1.png new file mode 100755 index 000000000..784b0f0e7 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_0_alt1.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_0_alt2.png b/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_0_alt2.png new file mode 100755 index 000000000..589f1b6fb Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_0_alt2.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_0_alt3.png b/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_0_alt3.png new file mode 100755 index 000000000..0b926e46e Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_0_alt3.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_0_alt4.png b/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_0_alt4.png new file mode 100755 index 000000000..eff33800c Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_0_alt4.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_1.png b/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_1.png new file mode 100755 index 000000000..f7f71ccbc Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_1.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_2.png b/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_2.png new file mode 100755 index 000000000..ed5d2495b Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_2.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_3.png b/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_3.png new file mode 100755 index 000000000..de41558f9 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_3.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_4.png b/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_4.png new file mode 100755 index 000000000..0040d0cae Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_4.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_5.png b/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_5.png new file mode 100755 index 000000000..eaea08f05 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_5.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_6.png b/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_6.png new file mode 100755 index 000000000..1fc3f3ffb Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_6.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_7.png b/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_7.png new file mode 100755 index 000000000..35c655666 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/drive/disk_drive_7.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/fluid_grid_back.png b/src/main/resources/assets/refinedstorage/textures/blocks/fluid_grid_back.png new file mode 100755 index 000000000..e3fdca654 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/fluid_grid_back.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/fluid_grid_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/fluid_grid_connected.png deleted file mode 100644 index bf5f83398..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/fluid_grid_connected.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/fluid_grid_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/fluid_grid_disconnected.png deleted file mode 100644 index c18d692c1..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/fluid_grid_disconnected.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/fluid_grid_side.png b/src/main/resources/assets/refinedstorage/textures/blocks/fluid_grid_side.png deleted file mode 100755 index 2a73ad925..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/fluid_grid_side.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/fluid_interface_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/fluid_interface_connected.png index 41fd9eead..85e407a03 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/fluid_interface_connected.png and b/src/main/resources/assets/refinedstorage/textures/blocks/fluid_interface_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/fluid_interface_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/fluid_interface_disconnected.png index 86243eb0b..3d7933d55 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/fluid_interface_disconnected.png and b/src/main/resources/assets/refinedstorage/textures/blocks/fluid_interface_disconnected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_back.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_back.png new file mode 100755 index 000000000..ffb76f755 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/grid_back.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_connected.png deleted file mode 100644 index 577db5198..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/grid_connected.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_crafting_front.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_crafting_front.png new file mode 100755 index 000000000..f5557e7a7 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/grid_crafting_front.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_crafting_front_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_crafting_front_connected.png new file mode 100755 index 000000000..69accdf48 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/grid_crafting_front_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_disconnected.png deleted file mode 100644 index 909631862..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/grid_disconnected.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_back.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_back.png new file mode 100755 index 000000000..e2be827ec Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_back.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_front.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_front.png new file mode 100755 index 000000000..41862b21d Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_front.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_front_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_front_connected.png new file mode 100755 index 000000000..648e41fef Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_front_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_left.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_left.png new file mode 100755 index 000000000..358b8b30b Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_left.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_right.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_right.png new file mode 100755 index 000000000..d274f23bd Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_right.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_side.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_side.png new file mode 100755 index 000000000..03bd12da4 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_side.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_top.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_top.png new file mode 100755 index 000000000..08d0e2457 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_top.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_front.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_front.png new file mode 100755 index 000000000..c20fe1fad Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/grid_front.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_front_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_front_connected.png new file mode 100755 index 000000000..167baea72 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/grid_front_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_left.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_left.png new file mode 100755 index 000000000..eb4e500c5 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/grid_left.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_pattern_front.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_pattern_front.png new file mode 100755 index 000000000..11edb7e9d Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/grid_pattern_front.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_pattern_front_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_pattern_front_connected.png new file mode 100755 index 000000000..f00385697 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/grid_pattern_front_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_right.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_right.png new file mode 100755 index 000000000..a4a5b2664 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/grid_right.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_top.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_top.png new file mode 100755 index 000000000..0d782d2d0 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/grid_top.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/importer_exporter_external_storage.png b/src/main/resources/assets/refinedstorage/textures/blocks/importer_exporter_external_storage.png new file mode 100755 index 000000000..a0c07decf Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/importer_exporter_external_storage.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/interface_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/interface_connected.png index 24d133c7e..a40760922 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/interface_connected.png and b/src/main/resources/assets/refinedstorage/textures/blocks/interface_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/interface_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/interface_disconnected.png index e3fa3c48d..93f94e3a1 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/interface_disconnected.png and b/src/main/resources/assets/refinedstorage/textures/blocks/interface_disconnected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected.png index 46c528615..faac6827a 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected.png and b/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_disconnected.png index f56457e64..a99eef39f 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_disconnected.png and b/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_disconnected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected.png index 1e590c582..ee8550857 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected.png and b/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_disconnected.png index 77c4f8da5..1c0ac2baf 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_disconnected.png and b/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_disconnected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/processing_pattern_encoder.png b/src/main/resources/assets/refinedstorage/textures/blocks/processing_pattern_encoder.png index 1cd80c8b1..75523b4fb 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/processing_pattern_encoder.png and b/src/main/resources/assets/refinedstorage/textures/blocks/processing_pattern_encoder.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/processing_pattern_encoder_side.png b/src/main/resources/assets/refinedstorage/textures/blocks/processing_pattern_encoder_side.png index ebf851067..ebe6496e3 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/processing_pattern_encoder_side.png and b/src/main/resources/assets/refinedstorage/textures/blocks/processing_pattern_encoder_side.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected.png index 67e9f88aa..9bd1c0621 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected.png and b/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/relay_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/relay_disconnected.png index 767a69d6d..402aa2850 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/relay_disconnected.png and b/src/main/resources/assets/refinedstorage/textures/blocks/relay_disconnected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/side.png b/src/main/resources/assets/refinedstorage/textures/blocks/side.png old mode 100644 new mode 100755 index 420d1aaab..027efabe5 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/side.png and b/src/main/resources/assets/refinedstorage/textures/blocks/side.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_connected.png index 050413d01..3f6dd7d6e 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_connected.png and b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_disconnected.png index cd31b9b1b..13aa433b3 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_disconnected.png and b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_disconnected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/gui/controller.png b/src/main/resources/assets/refinedstorage/textures/gui/controller.png index 00fa5e0e0..04a48e8c3 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/gui/controller.png and b/src/main/resources/assets/refinedstorage/textures/gui/controller.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/gui/crafting_preview.png b/src/main/resources/assets/refinedstorage/textures/gui/crafting_preview.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/gui/disk_drive.png b/src/main/resources/assets/refinedstorage/textures/gui/disk_drive.png index e35aabeb1..94d201a52 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/gui/disk_drive.png and b/src/main/resources/assets/refinedstorage/textures/gui/disk_drive.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/gui/disk_manipulator.png b/src/main/resources/assets/refinedstorage/textures/gui/disk_manipulator.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/gui/exporter.png b/src/main/resources/assets/refinedstorage/textures/gui/exporter.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/gui/grid.png b/src/main/resources/assets/refinedstorage/textures/gui/grid.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/gui/importer.png b/src/main/resources/assets/refinedstorage/textures/gui/importer.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/refinedstorage/textures/gui/storage.png b/src/main/resources/assets/refinedstorage/textures/gui/storage.png index 5d30982d3..57b56f7ff 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/gui/storage.png and b/src/main/resources/assets/refinedstorage/textures/gui/storage.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/icons.png b/src/main/resources/assets/refinedstorage/textures/icons.png index 13a5e28bd..7f1b2e7e9 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/icons.png and b/src/main/resources/assets/refinedstorage/textures/icons.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/128k_fluid_storage_disk.png b/src/main/resources/assets/refinedstorage/textures/items/128k_fluid_storage_disk.png index ec4b9863b..4389a459f 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/128k_fluid_storage_disk.png and b/src/main/resources/assets/refinedstorage/textures/items/128k_fluid_storage_disk.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/128k_fluid_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/128k_fluid_storage_part.png index 297cf10b1..47d51e333 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/128k_fluid_storage_part.png and b/src/main/resources/assets/refinedstorage/textures/items/128k_fluid_storage_part.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/16k_storage_disk.png b/src/main/resources/assets/refinedstorage/textures/items/16k_storage_disk.png index dd6c99b80..fa4e16968 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/16k_storage_disk.png and b/src/main/resources/assets/refinedstorage/textures/items/16k_storage_disk.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/16k_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/16k_storage_part.png index 15a735c34..4abb0a0d7 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/16k_storage_part.png and b/src/main/resources/assets/refinedstorage/textures/items/16k_storage_part.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/1k_storage_disk.png b/src/main/resources/assets/refinedstorage/textures/items/1k_storage_disk.png index 95614d39b..b66f4d8ab 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/1k_storage_disk.png and b/src/main/resources/assets/refinedstorage/textures/items/1k_storage_disk.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/1k_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/1k_storage_part.png index 1f2f14dfd..df8e6f1ed 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/1k_storage_part.png and b/src/main/resources/assets/refinedstorage/textures/items/1k_storage_part.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/256k_fluid_storage_disk.png b/src/main/resources/assets/refinedstorage/textures/items/256k_fluid_storage_disk.png index 0fe57b157..28e1b1435 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/256k_fluid_storage_disk.png and b/src/main/resources/assets/refinedstorage/textures/items/256k_fluid_storage_disk.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/256k_fluid_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/256k_fluid_storage_part.png index 8f1d9f4ca..8c9362153 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/256k_fluid_storage_part.png and b/src/main/resources/assets/refinedstorage/textures/items/256k_fluid_storage_part.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/4k_storage_disk.png b/src/main/resources/assets/refinedstorage/textures/items/4k_storage_disk.png index 0e1e76ae5..5f05b1ad3 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/4k_storage_disk.png and b/src/main/resources/assets/refinedstorage/textures/items/4k_storage_disk.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/4k_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/4k_storage_part.png index 3d6f1557b..230118f8f 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/4k_storage_part.png and b/src/main/resources/assets/refinedstorage/textures/items/4k_storage_part.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/512k_fluid_storage_disk.png b/src/main/resources/assets/refinedstorage/textures/items/512k_fluid_storage_disk.png index 8517b8213..d589d71ca 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/512k_fluid_storage_disk.png and b/src/main/resources/assets/refinedstorage/textures/items/512k_fluid_storage_disk.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/512k_fluid_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/512k_fluid_storage_part.png index 0cbd2cdd9..a517315c6 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/512k_fluid_storage_part.png and b/src/main/resources/assets/refinedstorage/textures/items/512k_fluid_storage_part.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/64k_fluid_storage_disk.png b/src/main/resources/assets/refinedstorage/textures/items/64k_fluid_storage_disk.png index ccabf7748..f7d91ae7a 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/64k_fluid_storage_disk.png and b/src/main/resources/assets/refinedstorage/textures/items/64k_fluid_storage_disk.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/64k_fluid_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/64k_fluid_storage_part.png index f911f7d29..d9a435ea4 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/64k_fluid_storage_part.png and b/src/main/resources/assets/refinedstorage/textures/items/64k_fluid_storage_part.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/64k_storage_disk.png b/src/main/resources/assets/refinedstorage/textures/items/64k_storage_disk.png index 5a7e17133..1806eb361 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/64k_storage_disk.png and b/src/main/resources/assets/refinedstorage/textures/items/64k_storage_disk.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/64k_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/64k_storage_part.png index e2a9c568a..98840a6bd 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/64k_storage_part.png and b/src/main/resources/assets/refinedstorage/textures/items/64k_storage_part.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/advanced_printed_processor.png b/src/main/resources/assets/refinedstorage/textures/items/advanced_printed_processor.png index f22e5945d..ef33ad07f 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/advanced_printed_processor.png and b/src/main/resources/assets/refinedstorage/textures/items/advanced_printed_processor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/advanced_processor.png b/src/main/resources/assets/refinedstorage/textures/items/advanced_processor.png index 6ddce529a..3710ec1a5 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/advanced_processor.png and b/src/main/resources/assets/refinedstorage/textures/items/advanced_processor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/alt2_processors/advanced_printed_processor.png b/src/main/resources/assets/refinedstorage/textures/items/alt2_processors/advanced_printed_processor.png new file mode 100755 index 000000000..6919a301d Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/alt2_processors/advanced_printed_processor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/alt2_processors/advanced_processor.png b/src/main/resources/assets/refinedstorage/textures/items/alt2_processors/advanced_processor.png new file mode 100755 index 000000000..1a5269f51 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/alt2_processors/advanced_processor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/alt2_processors/basic_printed_processor.png b/src/main/resources/assets/refinedstorage/textures/items/alt2_processors/basic_printed_processor.png new file mode 100755 index 000000000..f764e9929 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/alt2_processors/basic_printed_processor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/alt2_processors/basic_processor.png b/src/main/resources/assets/refinedstorage/textures/items/alt2_processors/basic_processor.png new file mode 100755 index 000000000..63e607c0c Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/alt2_processors/basic_processor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/alt2_processors/improved_printed_processor.png b/src/main/resources/assets/refinedstorage/textures/items/alt2_processors/improved_printed_processor.png new file mode 100755 index 000000000..fde9260b2 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/alt2_processors/improved_printed_processor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/alt2_processors/improved_processor.png b/src/main/resources/assets/refinedstorage/textures/items/alt2_processors/improved_processor.png new file mode 100755 index 000000000..ac191f91b Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/alt2_processors/improved_processor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/alt_processors/advanced_printed_processor.png b/src/main/resources/assets/refinedstorage/textures/items/alt_processors/advanced_printed_processor.png new file mode 100755 index 000000000..e6b8d25f2 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/alt_processors/advanced_printed_processor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/alt_processors/advanced_processor.png b/src/main/resources/assets/refinedstorage/textures/items/alt_processors/advanced_processor.png new file mode 100755 index 000000000..8ccf96ba5 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/alt_processors/advanced_processor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/alt_processors/basic_printed_processor.png b/src/main/resources/assets/refinedstorage/textures/items/alt_processors/basic_printed_processor.png new file mode 100755 index 000000000..0f483a322 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/alt_processors/basic_printed_processor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/alt_processors/basic_processor.png b/src/main/resources/assets/refinedstorage/textures/items/alt_processors/basic_processor.png new file mode 100755 index 000000000..78c85b926 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/alt_processors/basic_processor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/alt_processors/construction_core.png b/src/main/resources/assets/refinedstorage/textures/items/alt_processors/construction_core.png new file mode 100755 index 000000000..abd4ba61b Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/alt_processors/construction_core.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/alt_processors/destruction_core.png b/src/main/resources/assets/refinedstorage/textures/items/alt_processors/destruction_core.png new file mode 100755 index 000000000..fd00f3cf0 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/alt_processors/destruction_core.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/alt_processors/improved_printed_processor.png b/src/main/resources/assets/refinedstorage/textures/items/alt_processors/improved_printed_processor.png new file mode 100755 index 000000000..71590dadb Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/alt_processors/improved_printed_processor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/alt_processors/improved_processor.png b/src/main/resources/assets/refinedstorage/textures/items/alt_processors/improved_processor.png new file mode 100755 index 000000000..4df4ea9d8 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/alt_processors/improved_processor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/alt_processors/printed_silicon.png b/src/main/resources/assets/refinedstorage/textures/items/alt_processors/printed_silicon.png new file mode 100755 index 000000000..4068828d0 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/alt_processors/printed_silicon.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/basic_printed_processor.png b/src/main/resources/assets/refinedstorage/textures/items/basic_printed_processor.png index 4591f0289..a37b2b52b 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/basic_printed_processor.png and b/src/main/resources/assets/refinedstorage/textures/items/basic_printed_processor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/basic_processor.png b/src/main/resources/assets/refinedstorage/textures/items/basic_processor.png index 41d9784c3..fee78d1ca 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/basic_processor.png and b/src/main/resources/assets/refinedstorage/textures/items/basic_processor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/construction_core.png b/src/main/resources/assets/refinedstorage/textures/items/construction_core.png index dea53d83a..77c945c6b 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/construction_core.png and b/src/main/resources/assets/refinedstorage/textures/items/construction_core.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/crafting_upgrade.png b/src/main/resources/assets/refinedstorage/textures/items/crafting_upgrade.png index 93cf8f7b8..b61112b8d 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/crafting_upgrade.png and b/src/main/resources/assets/refinedstorage/textures/items/crafting_upgrade.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/creative_fluid_storage_disk.png b/src/main/resources/assets/refinedstorage/textures/items/creative_fluid_storage_disk.png index 10334447d..bc25aca83 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/creative_fluid_storage_disk.png and b/src/main/resources/assets/refinedstorage/textures/items/creative_fluid_storage_disk.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/creative_storage_disk.png b/src/main/resources/assets/refinedstorage/textures/items/creative_storage_disk.png index 3e50b7ec2..da447cea9 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/creative_storage_disk.png and b/src/main/resources/assets/refinedstorage/textures/items/creative_storage_disk.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/creative_storage_disk_alt.png b/src/main/resources/assets/refinedstorage/textures/items/creative_storage_disk_alt.png new file mode 100755 index 000000000..33bd44946 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/creative_storage_disk_alt.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/destruction_core.png b/src/main/resources/assets/refinedstorage/textures/items/destruction_core.png index 16af3013a..9e363ae8a 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/destruction_core.png and b/src/main/resources/assets/refinedstorage/textures/items/destruction_core.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/grid_filter.png b/src/main/resources/assets/refinedstorage/textures/items/grid_filter.png index 9d2a62091..d780f10f0 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/grid_filter.png and b/src/main/resources/assets/refinedstorage/textures/items/grid_filter.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/improved_printed_processor.png b/src/main/resources/assets/refinedstorage/textures/items/improved_printed_processor.png index 6bf3586dc..ed6f645ce 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/improved_printed_processor.png and b/src/main/resources/assets/refinedstorage/textures/items/improved_printed_processor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/improved_processor.png b/src/main/resources/assets/refinedstorage/textures/items/improved_processor.png index 488a3228d..7639acd43 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/improved_processor.png and b/src/main/resources/assets/refinedstorage/textures/items/improved_processor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/interdimensional_upgrade.png b/src/main/resources/assets/refinedstorage/textures/items/interdimensional_upgrade.png index df8e37dda..41c40bf99 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/interdimensional_upgrade.png and b/src/main/resources/assets/refinedstorage/textures/items/interdimensional_upgrade.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/network_card.png b/src/main/resources/assets/refinedstorage/textures/items/network_card.png index 40d0716be..b755f018e 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/network_card.png and b/src/main/resources/assets/refinedstorage/textures/items/network_card.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/pattern.png b/src/main/resources/assets/refinedstorage/textures/items/pattern.png index 8d5627bcf..5b838ac0e 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/pattern.png and b/src/main/resources/assets/refinedstorage/textures/items/pattern.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/printed_silicon.png b/src/main/resources/assets/refinedstorage/textures/items/printed_silicon.png index b1c09018f..943b7abbc 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/printed_silicon.png and b/src/main/resources/assets/refinedstorage/textures/items/printed_silicon.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/quartz_enriched_iron.png b/src/main/resources/assets/refinedstorage/textures/items/quartz_enriched_iron.png index c57169d91..57a6dd5aa 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/quartz_enriched_iron.png and b/src/main/resources/assets/refinedstorage/textures/items/quartz_enriched_iron.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/range_upgrade.png b/src/main/resources/assets/refinedstorage/textures/items/range_upgrade.png index d538d5475..d1d7f1ac1 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/range_upgrade.png and b/src/main/resources/assets/refinedstorage/textures/items/range_upgrade.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/silicon.png b/src/main/resources/assets/refinedstorage/textures/items/silicon.png index c5f837dc7..a8995b0d1 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/silicon.png and b/src/main/resources/assets/refinedstorage/textures/items/silicon.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/speed_upgrade.png b/src/main/resources/assets/refinedstorage/textures/items/speed_upgrade.png index b0a0dc690..2c46a53b5 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/speed_upgrade.png and b/src/main/resources/assets/refinedstorage/textures/items/speed_upgrade.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/stack_upgrade.png b/src/main/resources/assets/refinedstorage/textures/items/stack_upgrade.png index 78e4d461f..4809b9831 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/stack_upgrade.png and b/src/main/resources/assets/refinedstorage/textures/items/stack_upgrade.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/storage_housing.png b/src/main/resources/assets/refinedstorage/textures/items/storage_housing.png index 148b2cbc1..9c6e212c9 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/storage_housing.png and b/src/main/resources/assets/refinedstorage/textures/items/storage_housing.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/storage_housing_alt.png b/src/main/resources/assets/refinedstorage/textures/items/storage_housing_alt.png new file mode 100755 index 000000000..d0d77c9d8 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/storage_housing_alt.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/upgrade.png b/src/main/resources/assets/refinedstorage/textures/items/upgrade.png index d2c17551f..ba66433f4 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/upgrade.png and b/src/main/resources/assets/refinedstorage/textures/items/upgrade.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/upgrade_alt.png b/src/main/resources/assets/refinedstorage/textures/items/upgrade_alt.png new file mode 100755 index 000000000..7bcab9513 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/upgrade_alt.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_alt/wireless_grid_connected.png b/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_alt/wireless_grid_connected.png new file mode 100755 index 000000000..efff9014c Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_alt/wireless_grid_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_alt/wireless_grid_disconnected.png b/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_alt/wireless_grid_disconnected.png new file mode 100755 index 000000000..f44a1fea5 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_alt/wireless_grid_disconnected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_connected.png b/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_connected.png index e53bc2e82..1d5f5b240 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_connected.png and b/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_disconnected.png b/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_disconnected.png index 9f506593c..577fab77d 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_disconnected.png and b/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_disconnected.png differ