From 11183280e0ad825e07a3d1e6b081cc09a0dff93f Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Wed, 11 Jul 2018 22:00:03 +0200 Subject: [PATCH] Fullbright network receiver, network transmitter, relay. #1860 --- .../block/BlockNetworkReceiver.java | 10 ++++++++++ .../block/BlockNetworkTransmitter.java | 10 ++++++++++ .../refinedstorage/block/BlockRelay.java | 10 ++++++++++ .../blockstates/network_receiver.json | 8 +++++--- .../blockstates/network_transmitter.json | 8 +++++--- .../refinedstorage/blockstates/relay.json | 8 +++++--- .../cutouts/connected.png} | Bin .../network_receiver/cutouts/disconnected.png | Bin 0 -> 268 bytes .../network_receiver/network_receiver.png | Bin 0 -> 673 bytes .../blocks/network_receiver_connected.png | Bin 16769 -> 0 bytes .../network_receiver_connected_glow.png.mcmeta | 9 --------- .../blocks/network_receiver_disconnected.png | Bin 1412 -> 0 bytes .../cutouts/connected.png} | Bin .../cutouts/disconnected.png | Bin 0 -> 270 bytes .../network_transmitter/network_transmitter.png | Bin 0 -> 701 bytes .../blocks/network_transmitter_connected.png | Bin 16695 -> 0 bytes ...etwork_transmitter_connected_glow.png.mcmeta | 9 --------- .../blocks/network_transmitter_disconnected.png | Bin 1406 -> 0 bytes .../cutouts/connected.png} | Bin .../blocks/relay/cutouts/disconnected.png | Bin 0 -> 280 bytes .../textures/blocks/relay/relay.png | Bin 0 -> 654 bytes .../textures/blocks/relay_connected.png | Bin 16010 -> 0 bytes .../blocks/relay_connected_glow.png.mcmeta | 9 --------- .../textures/blocks/relay_disconnected.png | Bin 1337 -> 0 bytes 24 files changed, 45 insertions(+), 36 deletions(-) rename src/main/resources/assets/refinedstorage/textures/blocks/{network_receiver_connected_glow.png => network_receiver/cutouts/connected.png} (100%) create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/network_receiver/cutouts/disconnected.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/network_receiver/network_receiver.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected_glow.png.mcmeta delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_disconnected.png rename src/main/resources/assets/refinedstorage/textures/blocks/{network_transmitter_connected_glow.png => network_transmitter/cutouts/connected.png} (100%) create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter/cutouts/disconnected.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter/network_transmitter.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected_glow.png.mcmeta delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_disconnected.png rename src/main/resources/assets/refinedstorage/textures/blocks/{relay_connected_glow.png => relay/cutouts/connected.png} (100%) create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/relay/cutouts/disconnected.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/relay/relay.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/relay_connected.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/relay_connected_glow.png.mcmeta delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/relay_disconnected.png diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java index 308143b73..ad9805550 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkReceiver.java @@ -1,9 +1,12 @@ package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.block.info.BlockInfoBuilder; import com.raoulvdberge.refinedstorage.render.IModelRegistration; +import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelFullbright; import com.raoulvdberge.refinedstorage.tile.TileNetworkReceiver; import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.util.BlockRenderLayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -16,6 +19,13 @@ public class BlockNetworkReceiver extends BlockNode { @SideOnly(Side.CLIENT) public void registerModels(IModelRegistration modelRegistration) { modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory")); + + modelRegistration.addBakedModelOverride(info.getId(), base -> new BakedModelFullbright(base, RS.ID + ":blocks/network_receiver/cutouts/connected")); + } + + @Override + public BlockRenderLayer getBlockLayer() { + return BlockRenderLayer.CUTOUT; } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java index bb0005045..2cb605b38 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNetworkTransmitter.java @@ -1,12 +1,15 @@ package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.RSGui; import com.raoulvdberge.refinedstorage.block.info.BlockInfoBuilder; import com.raoulvdberge.refinedstorage.render.IModelRegistration; +import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelFullbright; import com.raoulvdberge.refinedstorage.tile.TileNetworkTransmitter; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; @@ -23,6 +26,13 @@ public class BlockNetworkTransmitter extends BlockNode { @SideOnly(Side.CLIENT) public void registerModels(IModelRegistration modelRegistration) { modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory")); + + modelRegistration.addBakedModelOverride(info.getId(), base -> new BakedModelFullbright(base, RS.ID + ":blocks/network_transmitter/cutouts/connected")); + } + + @Override + public BlockRenderLayer getBlockLayer() { + return BlockRenderLayer.CUTOUT; } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java index 11c011aeb..7b7e21800 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockRelay.java @@ -1,12 +1,15 @@ package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.RSGui; import com.raoulvdberge.refinedstorage.block.info.BlockInfoBuilder; import com.raoulvdberge.refinedstorage.render.IModelRegistration; +import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelFullbright; import com.raoulvdberge.refinedstorage.tile.TileRelay; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; @@ -23,6 +26,13 @@ public class BlockRelay extends BlockNode { @SideOnly(Side.CLIENT) public void registerModels(IModelRegistration modelRegistration) { modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory")); + + modelRegistration.addBakedModelOverride(info.getId(), base -> new BakedModelFullbright(base, RS.ID + ":blocks/relay/cutouts/connected")); + } + + @Override + public BlockRenderLayer getBlockLayer() { + return BlockRenderLayer.CUTOUT; } @Override diff --git a/src/main/resources/assets/refinedstorage/blockstates/network_receiver.json b/src/main/resources/assets/refinedstorage/blockstates/network_receiver.json index 774d8c95a..f79e7224b 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/network_receiver.json +++ b/src/main/resources/assets/refinedstorage/blockstates/network_receiver.json @@ -1,9 +1,11 @@ { "forge_marker": 1, "defaults": { - "model": "cube_all", + "model": "refinedstorage:cube_all_cutout", "textures": { - "all": "refinedstorage:blocks/network_receiver_disconnected" + "particle": "refinedstorage:blocks/network_receiver/network_receiver", + "all": "refinedstorage:blocks/network_receiver/network_receiver", + "cutout": "refinedstorage:blocks/network_receiver/cutouts/disconnected" } }, "variants": { @@ -15,7 +17,7 @@ "connected": { "true": { "textures": { - "all": "refinedstorage:blocks/network_receiver_connected" + "cutout": "refinedstorage:blocks/network_receiver/cutouts/connected" } }, "false": { diff --git a/src/main/resources/assets/refinedstorage/blockstates/network_transmitter.json b/src/main/resources/assets/refinedstorage/blockstates/network_transmitter.json index 86e56d08f..a88a3dae1 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/network_transmitter.json +++ b/src/main/resources/assets/refinedstorage/blockstates/network_transmitter.json @@ -1,9 +1,11 @@ { "forge_marker": 1, "defaults": { - "model": "cube_all", + "model": "refinedstorage:cube_all_cutout", "textures": { - "all": "refinedstorage:blocks/network_transmitter_disconnected" + "particle": "refinedstorage:blocks/network_transmitter/network_transmitter", + "all": "refinedstorage:blocks/network_transmitter/network_transmitter", + "cutout": "refinedstorage:blocks/network_transmitter/cutouts/disconnected" } }, "variants": { @@ -15,7 +17,7 @@ "connected": { "true": { "textures": { - "all": "refinedstorage:blocks/network_transmitter_connected" + "cutout": "refinedstorage:blocks/network_transmitter/cutouts/connected" } }, "false": { diff --git a/src/main/resources/assets/refinedstorage/blockstates/relay.json b/src/main/resources/assets/refinedstorage/blockstates/relay.json index 93857548a..3acf95d9a 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/relay.json +++ b/src/main/resources/assets/refinedstorage/blockstates/relay.json @@ -1,9 +1,11 @@ { "forge_marker": 1, "defaults": { - "model": "cube_all", + "model": "refinedstorage:cube_all_cutout", "textures": { - "all": "refinedstorage:blocks/relay_disconnected" + "particle": "refinedstorage:blocks/relay/relay", + "all": "refinedstorage:blocks/relay/relay", + "cutout": "refinedstorage:blocks/relay/cutouts/disconnected" } }, "variants": { @@ -15,7 +17,7 @@ "connected": { "true": { "textures": { - "all": "refinedstorage:blocks/relay_connected" + "cutout": "refinedstorage:blocks/relay/cutouts/connected" } }, "false": { diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver/cutouts/connected.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected_glow.png rename to src/main/resources/assets/refinedstorage/textures/blocks/network_receiver/cutouts/connected.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver/cutouts/disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver/cutouts/disconnected.png new file mode 100644 index 0000000000000000000000000000000000000000..b5bc63f8f2eb850321fd4bf0b9a41cfe299ebdd7 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJtM=93Yk-ZifTMv978PpmrlIM)u6!R`d3W!%K!fdu6BwkPA~dekR^BX!0wc^{S$<| zG_O@}zcwrI{P(^oe&>E}lw8uIkjkQ|EHi(5xfaLt|D_!~E4SW~NY+2kxTgEa%J2jR z+biuqKC!%?I9(8;RQ6EQ&HEFDI69X^PJbVx_|$5eS$gjEy}cXdnt<+L@O1TaS?83{ F1OQ&3VJ!dv literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver/network_receiver.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver/network_receiver.png new file mode 100644 index 0000000000000000000000000000000000000000..f0fdad1d7ae215e5d0382822309b4c0e1fbb7416 GIT binary patch literal 673 zcmV;S0$%-zP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;2FkAZe8V00I$7L_t(IPfb%v%Yk7O^@muS$4n6+WQxpl z#tbRRLRl!1l!aI*l7;-g`+eusE9&$-@6$c!o;y(4Y&Nmm?P4?t#HKVF4U+wSzZ8o_x>mW}ZVEuTP$)<{yWQk`KFjm@l+wE37 z9uJeiF$ItTfNdy)h%!)4r_+&szc1Zxm-plG$hsi_G8(H=YK2HN8kN`UCG+|GI}H#J zQ?J+Ma5&HbY6ph`P{M~I0;|Y~F{;&S(P%Ujs#dGAUay%|iDwgkACL(SU>`G91mFS! zaPS)sVHE-uawHOA)5ha59UuS>0nB~3+wn~i`IZ2nNf_7r{boaZy&m6Cd%0ZZx!G*k z4>TK`uRy!qWXQ0fGb1cZ1zF8O?(M7YJ@fC6YxsZ=5n-9}jo zSpnWah7cAhm&600000NkvXX Hu0mjfVL%S7 literal 0 HcmV?d00001 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 deleted file mode 100755 index 6e431b3fda987128d28847110aecafff0049e8ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16769 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 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected_glow.png.mcmeta deleted file mode 100644 index eea6c1fe1..000000000 --- a/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected_glow.png.mcmeta +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ctm": { - "ctm_version": 1, - "layer": "CUTOUT", - "extra": { - "light": 15 - } - } -} \ No newline at end of file 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 deleted file mode 100755 index a99eef39f3326b1141767752e6b5c0071c560e2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1412 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nAI{vB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk&``nLQqR!T z!q~`EN5ROz&{W^RQs2-(*TB%q(7?*bKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$IMft0!ZY(y z^2>`g!FqgstvvIJOA_;vQ$1a5m4K$`WoD*W8M-)I7&$u|m^!v1to{v0-((TK zPV=C8Q*gS)$qlDoeV}9XL6M6T*)Sns3IZ|VNf*e0C;rqtV2UpSCha$8GHx?4Fn;lL zaSW-rr83ELeWs&G>)gd9j$1kvPV81X_&`p{P3TejkBP_Hp0TmD%#6u(>e!cmKl~NX zt2a^A>+i0KjoKP@)#Pp6{{8p!6LoXf1R5}diuK8{l}X>fBqSbWypqk z=ha)>78}a&J$%5{>9%;L51W3?fx7+cofRCn-@g0)`|Y>eLbQ%18QyVGpX_<~hbs5= zn>l5B;|y7HEE*jW_Qnabi14*L9+>O*{QiA`*>yE`@+?*&Tli8o-&DAgwe|B)ALBCx zyYJq~GrxW|&3S&7kP_>Xu+^a&A`O1agLmImW3}6Svxm`guAere+T>1=Hg2)<{^N%u z%69L)nRCj=N$h;u<~du;C3vQtPBoCYva+xLciwhux&9u$UbC>(SAYLzl;dmvS>wkY zl&VlSW!aR|Pn*uXSoVJTHKrBojvTn?_|ihIUs=R8Lzcz&g+RAL5h%r3dF~()N{5Rvdeyn1m zD_sNj#vNCfve0sG++iq!)9m)f@v{a_%V>G-voy$tOHRT}DEnzqr0!JyX1Rh1Q(wK()wo!=(*0|E a10zEQe_=#-;Pelma?#V(&t;ucLK6TJ^8RZ8 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter/cutouts/connected.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected_glow.png rename to src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter/cutouts/connected.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter/cutouts/disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter/cutouts/disconnected.png new file mode 100644 index 0000000000000000000000000000000000000000..d86c8677a4d8ff4faa5cfd144bd58073f5314c0b GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJtM=93Yk-Zit0RF978Ppmrjc2I-tPAV%yDs<+r>+Y3r1P=~*9=Rd^iFW(iExUJ+7s zjwvjEq0o{kOSY=*Enm5n@96IpUmTXQYuWBOdVh}g3HR4Krv#-%Xq7)OxSPUdBP!%x z%T$%zv)DxWM)unuJq65D<$&r{FRafIP7heA@G^Es$UNnTj7Ph!AJ9&!ECITN!PC{x JWt~$(698E-UNZmy literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter/network_transmitter.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter/network_transmitter.png new file mode 100644 index 0000000000000000000000000000000000000000..9e4f2df055631673dd373c566b8d6be18d860866 GIT binary patch literal 701 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 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected_glow.png.mcmeta deleted file mode 100644 index eea6c1fe1..000000000 --- a/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected_glow.png.mcmeta +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ctm": { - "ctm_version": 1, - "layer": "CUTOUT", - "extra": { - "light": 15 - } - } -} \ No newline at end of file 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 deleted file mode 100755 index 1c0ac2baf61de084665e7bf0cd15213635ca3d7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1406 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nAI{vB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk&``nLQqR!T z!q~`EN5ROz&{W^RQs2-(*TB%q(7?*bKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$IMft0!ZY(y z^2>`g!FqgstvvIJOA_;vQ$1a5m4K$`WoD*W8M!(;o0u6HnL4|g8ydQrIhmN7xw<+V zS{RuaS{gZ7!t}c2Czs}?=9R$orXchhrut#E2|3hb~Qx|R=IkL2+$dl*J`|F?U>u=kY zmSwL$y?Nf(HM*;=u3DD4{`zSXU&WTANgHqGoPYlL{dd7jrGNj{6&G#2{nlu4(8`2b zJ9(}_kT zw@&i#>#s$3-+w=w7VPV^EFjsjPwo2at(RXiIPw@th@=}y&R7$+I>A7r_2H$rW$KeT zA3NQBS+Xrkw^JqMbB@_*&bJpcT+IJi)vv!Eyed|2`sJ4{k|t)edw>2eSXDKPVU_XB zNpr&F`r8|3MW_}&I>KB$b@5@-xqi-44<3I!G1bQ8Z63!5i-WtjUx3e_^irh4GcKfZE^-P~n2Oc;(r!dS5&3IZA>3gPqp~w>ExmQ)Z0-TDncm0cRU}T7D WDf|3VyTlh%B6_;|xvX0#LT=By}Z;C1rt33 zJtM=93Yk-ZiaI=9978Ppw@&orI%2@X@>%5l?f?Im2eR{AmXm$cVkzP)UZgX}+a)gX zl(0`_lcxUH9V-KfH>ib|bRei=Mmf(2_r)r=4Vt9S} WVvfp&IlVwPF?hQAxvXPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;2FkAZe8V00I6D?`1xpOTXWj>2#{= zWHQl*mEd$bNwr#)&(BZUZnv7STCEiH_4OsQ+3YuQBIEH`lhf(6bUGbXZN%eoC4jlz zZcC%lkhixtjbgE=k;~;YiO6I!^8WrV^?F@PGNRF_5^Odbsnu%o`!oKEL?WS&pjZiF zv6x&g7nKb&Aj+Ve#bP1r^;(w8rS7?-ZU`!siW+O+^znF95OM)suUESpB!C%>MtX+= zUZ+GQK*r&4P=Z3Cpdj|N(cy52)9F;A!C+t$e0+RJKA-<@A}q8B6EO%7^69ZffC`J? z<>f_7#V?2rfL6<1Utblp+wD{V02C73bH^Dt%C$YfKun@tfUG&-jM{s>p6vm6OM&eH zg93oM0R0ur4Kq+Gm2{*HjKDOeESXG7Hk-AFhI*NkR4OGTT6+}G2_0o5(FN)nk4G{b z4mDb>f70!CRcfo%(u8ukta}ns%ill=FbFV-xJ^0Cdb8P70@}vjB4UvEW(d_)nCJ$6 oKuB5asgc*LPFP(5Lzt#1KQhxE;Kkc7J^%m!07*qoM6N<$f?jVORR910 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected.png deleted file mode 100755 index 9bd1c0621b9f7707f0589528bdc0cc50a0b740c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16010 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