From 71c445d1ed6797947530b4153df81f025b6bc8be Mon Sep 17 00:00:00 2001 From: joflashstudios Date: Sat, 6 Jun 2015 15:37:52 -0400 Subject: [PATCH] Fixed tetrahedrite ore texture. This gets rid of the different texture per-side feature, because it's incompatible with the ore texture loader we're using. I don't think it's worth writing custom code just so tetrahedrite can have more than one texture. --- .../{oreTetrahedrite1.png => oreTetrahedrite.png} | Bin .../textures/blocks/ore/oreTetrahedrite2.png | Bin 480 -> 0 bytes .../textures/blocks/ore/oreTetrahedrite3.png | Bin 469 -> 0 bytes .../textures/blocks/ore/oreTetrahedrite4.png | Bin 478 -> 0 bytes .../textures/blocks/ore/oreTetrahedrite5.png | Bin 457 -> 0 bytes .../textures/blocks/ore/oreTetrahedrite6.png | Bin 449 -> 0 bytes 6 files changed, 0 insertions(+), 0 deletions(-) rename src/main/resources/assets/techreborn/textures/blocks/ore/{oreTetrahedrite1.png => oreTetrahedrite.png} (100%) delete mode 100644 src/main/resources/assets/techreborn/textures/blocks/ore/oreTetrahedrite2.png delete mode 100644 src/main/resources/assets/techreborn/textures/blocks/ore/oreTetrahedrite3.png delete mode 100644 src/main/resources/assets/techreborn/textures/blocks/ore/oreTetrahedrite4.png delete mode 100644 src/main/resources/assets/techreborn/textures/blocks/ore/oreTetrahedrite5.png delete mode 100644 src/main/resources/assets/techreborn/textures/blocks/ore/oreTetrahedrite6.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/ore/oreTetrahedrite1.png b/src/main/resources/assets/techreborn/textures/blocks/ore/oreTetrahedrite.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/ore/oreTetrahedrite1.png rename to src/main/resources/assets/techreborn/textures/blocks/ore/oreTetrahedrite.png diff --git a/src/main/resources/assets/techreborn/textures/blocks/ore/oreTetrahedrite2.png b/src/main/resources/assets/techreborn/textures/blocks/ore/oreTetrahedrite2.png deleted file mode 100644 index 5bc6df404c28d1f8ed77bd1599c013082cd94ac3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 480 zcmV<60U!Q}P)pj~)3^;r4=9kOJ~2jm|*X)c0@EI0Uu zW+)vlc1%id(xIpK-n~;1LJ$#5MMTCJ05L}A95dhDmP^pGs;UBDj4{T<7_GGcM5F|e zb5@%7!{K?m)dzK5r<8~Yz{m0UbGi7YA)+FLV2ojA#pRr>wXeIKB9?w`mQ*^Wq)tRc zbws4D>*a$OV<{pcLPVnHwWV?}vqFC^7XWYjy>A+8 zEdyV`)1(t)EJ6s{+}Tx1&1xP1KnY;obpUePI_KtO9=q-nsE6T>rMO$%HG{rCPv@2Q zbI{CuTU<(M)AtX<03dn)J&sjX%_%XnMqjjTt6S7D)Q<+OxK-Dkfu~`(4gJ>=fKA^U z;54;oVCDUFarz71_Im)nX;kXu{a4>(!kJ0)-&ob#Y)o&7s9fU4adgfpVxDydD8(;o Wan4}ve!2Ak0000s{QLgz{!8YZV`g-Rh?G(Qy!XbKl+wj*J`@d4Q4|1_Qc5ZBz1A84 zGv@$ejMC<=uJ_i;gR(3`2t)+nak&KWTtRqX)vm-dV#)*%ET zVP>{=1Tb@1mcs|$`<$7XnTW*wZM_CCpG=4-#`v;YosP%n=@dZQwp#04dZd&@dO98f zyl*ykHq%;5+533!Gv}NX7r4?=vg!u_koOo*AbiQ!fLyHozDRTYrosJD2kpwr6kd3i^W2=C}RkZ1TDHzRULqbra2FNjU-#Y z1wOm-0F12tU7Y*{!mXSWtG%_mx<;o{o#(%?3R@2*w?vc=b#2=kV?@!<+6$z`50f#? UPzirh)c^nh07*qoM6N<$f+&m1y8r+H diff --git a/src/main/resources/assets/techreborn/textures/blocks/ore/oreTetrahedrite5.png b/src/main/resources/assets/techreborn/textures/blocks/ore/oreTetrahedrite5.png deleted file mode 100644 index e8adf192d21569159a5d15da45947cfe334fb6ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 457 zcmV;)0XF`LP){|c;0ai&w zK~yNubyBfv!!QtiruK9W9CT2@i-&@K&1*or&@S+r&+4i<2qHp2P~T9xbhz4a6RJta zJ-zqtof_}Gh+sWL#LNIvO4iz1>qEEQgZ8KIdjQPL%qb;f3;+>n0hCgd<}JpHbNXNy zhMY4I0eC;10DO8+M2+{JnQN_zE2S7?4k4TY{_FN`Nu_hn>O@4uxegGKVHoxgQcA6e zhzJp>`WV6uxHv~dr4&9MwFIy%i!r8Ej#{fiZvcSr7~#D!<_4UBan(sFHQswI9_%Wm zX0;6fpapOU0YI51YwecI7{UiI%<}_Fpr zzVEk`YONZ5Gfk6jQO8g}8noiN5U#*D&-bC9E$P-@fxMPipmXkbarz6?H+!#A7w66~ zV#V>Q`ERW1Z8N4_B5L=zWm&AXir8k|07~%#7?H?Y*Zt+T00000NkvXXu0mjfo<+d+ diff --git a/src/main/resources/assets/techreborn/textures/blocks/ore/oreTetrahedrite6.png b/src/main/resources/assets/techreborn/textures/blocks/ore/oreTetrahedrite6.png deleted file mode 100644 index 093d18f2b623e3107813450a1872195a2a3ace00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 449 zcmV;y0Y3hTP)ptc%unULS5^ET5i!O92q8G0?;{TyM8?*I8?M zEj}TH%6ret2A3n*RS5u~E*Nk7y>qTK!`xq|(`HJwSsc$WO@sl!00hf9zZMr`9H!~B z?-`mrg+AxZ>Z{}N$SpDkd02EQqp&?g|3xCz`pR;ji{oEF?sM1Cs&Cut?ZynWrRTr3 ru0`da6_I+ao9Ed%M@7k61RU`LTo~TgcDlj900000NkvXXu0mjfLu$CA