From 655e350e1122b2b66edb2eafde708fee04ccad1f Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 30 Nov 2020 21:58:44 -0800 Subject: [PATCH 01/14] Pack format 3 --- Colorcaecum/pack.mcmeta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Colorcaecum/pack.mcmeta b/Colorcaecum/pack.mcmeta index 371ca9a..7298995 100644 --- a/Colorcaecum/pack.mcmeta +++ b/Colorcaecum/pack.mcmeta @@ -1,6 +1,6 @@ { "pack":{ - "pack_format":1, + "pack_format": 3, "description": "Adds textures for colorblind people - By Vexatos" }, "language":{ From 099b82f83c9e3e212b426df9b3f0ae5e5edbe6cc Mon Sep 17 00:00:00 2001 From: Patrick White Date: Mon, 30 Nov 2020 22:48:20 -0800 Subject: [PATCH 02/14] Replaced . with _ in file names --- ...ignal.lamp.bottom.png => signal_lamp_bottom.png} | Bin .../{signal.lamp.box.png => signal_lamp_box.png} | Bin .../{signal.lamp.top.png => signal_lamp_top.png} | Bin 3 files changed, 0 insertions(+), 0 deletions(-) rename Colorcaecum/assets/railcraft/textures/blocks/{signal.lamp.bottom.png => signal_lamp_bottom.png} (100%) rename Colorcaecum/assets/railcraft/textures/blocks/{signal.lamp.box.png => signal_lamp_box.png} (100%) rename Colorcaecum/assets/railcraft/textures/blocks/{signal.lamp.top.png => signal_lamp_top.png} (100%) diff --git a/Colorcaecum/assets/railcraft/textures/blocks/signal.lamp.bottom.png b/Colorcaecum/assets/railcraft/textures/blocks/signal_lamp_bottom.png similarity index 100% rename from Colorcaecum/assets/railcraft/textures/blocks/signal.lamp.bottom.png rename to Colorcaecum/assets/railcraft/textures/blocks/signal_lamp_bottom.png diff --git a/Colorcaecum/assets/railcraft/textures/blocks/signal.lamp.box.png b/Colorcaecum/assets/railcraft/textures/blocks/signal_lamp_box.png similarity index 100% rename from Colorcaecum/assets/railcraft/textures/blocks/signal.lamp.box.png rename to Colorcaecum/assets/railcraft/textures/blocks/signal_lamp_box.png diff --git a/Colorcaecum/assets/railcraft/textures/blocks/signal.lamp.top.png b/Colorcaecum/assets/railcraft/textures/blocks/signal_lamp_top.png similarity index 100% rename from Colorcaecum/assets/railcraft/textures/blocks/signal.lamp.top.png rename to Colorcaecum/assets/railcraft/textures/blocks/signal_lamp_top.png From 5d57b13a2fe84760c06daf88d68329b44961c4f1 Mon Sep 17 00:00:00 2001 From: Patrick White Date: Mon, 30 Nov 2020 22:51:33 -0800 Subject: [PATCH 03/14] Update locomotive tracks for 1.12 kit system --- .../blocks/tracks/outfitted/kit/locomotive_0.png | Bin 0 -> 1434 bytes .../blocks/tracks/outfitted/kit/locomotive_1.png | Bin 0 -> 1471 bytes .../blocks/tracks/outfitted/kit/locomotive_2.png | Bin 0 -> 1409 bytes .../blocks/tracks/outfitted/kit/locomotive_3.png | Bin 0 -> 1439 bytes .../blocks/tracks/outfitted/kit/locomotive_4.png | Bin 0 -> 1475 bytes .../blocks/tracks/outfitted/kit/locomotive_5.png | Bin 0 -> 1473 bytes .../textures/blocks/tracks/track.locomotive.png | Bin 1070 -> 0 bytes 7 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 Colorcaecum/assets/railcraft/textures/blocks/tracks/outfitted/kit/locomotive_0.png create mode 100644 Colorcaecum/assets/railcraft/textures/blocks/tracks/outfitted/kit/locomotive_1.png create mode 100644 Colorcaecum/assets/railcraft/textures/blocks/tracks/outfitted/kit/locomotive_2.png create mode 100644 Colorcaecum/assets/railcraft/textures/blocks/tracks/outfitted/kit/locomotive_3.png create mode 100644 Colorcaecum/assets/railcraft/textures/blocks/tracks/outfitted/kit/locomotive_4.png create mode 100644 Colorcaecum/assets/railcraft/textures/blocks/tracks/outfitted/kit/locomotive_5.png delete mode 100644 Colorcaecum/assets/railcraft/textures/blocks/tracks/track.locomotive.png diff --git a/Colorcaecum/assets/railcraft/textures/blocks/tracks/outfitted/kit/locomotive_0.png b/Colorcaecum/assets/railcraft/textures/blocks/tracks/outfitted/kit/locomotive_0.png new file mode 100644 index 0000000000000000000000000000000000000000..784e41c94fadfa03145eb478c6cdc9eda8a2fa6c GIT binary patch literal 1434 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%Lhn)CkWs zUtb0-Ae)1Ml~IU+8OUM;LIy@D29OFMi@}Rg8qN-4G-O}`iU|U7RC^`^3sg-GkOqMS zAO`6H(*=o{c_n&zsU->~dIoxi20(G91x#=~3JaJKY@i&&b&FdPK#H@#BeIx*f$sv0i>ry1t>MrKP@sk-m|UE>MMTab;dfVufyAu`tKo-FP)SbBnaEtPap}qq8Pro9uK;KZ$Kp&f?lFT%O^H6kwWN>Or zt;oco4I~561`Z5}8*P9gYUNy%npl!w6q28xV}~A>Hu~r)5FWGvxx~u9C^HopM4*7M zGqlmi5JOTAa)MPrW<_dFgiB^_YF;r&kFk-BK2`~=8Y6LOM3R7Nw9yB}3sO8m5&>8g zmpW>OH9_I>8D-+?^cDq@#;6{G=F6-U*w;NA(O|q*$ zxA~3F^e?xaBUZjrJdpTaIKVPdsDx!U@4?FdX1x9H57%yQJoD8!s^!ewswU}MUmQ8E z`!nkHEfSS5(icAO*Iu>Hpn$c;_05#1?|qJ9Efrr*R2Qb$NHBP@JIC8ycV~RfICHg@ zP}(LQ+10I)g1#;ZIp5tHqAfR83G84xRO)cmtTFQ0AAt=)D;bU@SvM@pWZHM1iNk#L z`U4LH-`~sWZ49-LnU_4>BY{<>|KsjO3AP1sizet^+V^yp=<4+iGDmk`_nYXU6UNMH z;yXK7Wv0)e3hnExTjuLHtar2EI2pLH;^^-6DUW6_oq4V={^p(YdFDU&_8zjmcx;Da z^3tW&JsV_n{+eZfu{rSONv8e${cMvHB^q|EV-8y#>af2zyTxy=y6${J0736mtFaO%8 ztsv7<%gyqmj=!L-@J!dl&i4%+XO8j&E_HG3co{DN3;;t1o)@l5K5RO$e%?tpk!2NE z>pnR{#MSRz3oy}aHgqgo-nG#&IWWeaRjM>4?tw`CKXD(mMN6JPV_nzqUT4OX53MdO pvwc;z%s#}Wx%BwH8n$%@#3LrQ`F&`8lnyGFJYD@<);T3K0RXAe;&%W5 literal 0 HcmV?d00001 diff --git a/Colorcaecum/assets/railcraft/textures/blocks/tracks/outfitted/kit/locomotive_1.png b/Colorcaecum/assets/railcraft/textures/blocks/tracks/outfitted/kit/locomotive_1.png new file mode 100644 index 0000000000000000000000000000000000000000..c7bfd33d709abe78571cf2524b188f1e273d93ba GIT binary patch literal 1471 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 X-|AYw;L)yNQ1RpG>gTe~DWM4f9E9ro literal 0 HcmV?d00001 diff --git a/Colorcaecum/assets/railcraft/textures/blocks/tracks/outfitted/kit/locomotive_3.png b/Colorcaecum/assets/railcraft/textures/blocks/tracks/outfitted/kit/locomotive_3.png new file mode 100644 index 0000000000000000000000000000000000000000..38533370799223671f79f25675853b3c54f0a283 GIT binary patch literal 1439 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%Lhn)CkWs zUtb0-Ae)1Ml~IU+8OUM;LIy@D29OFMi@}Rg8qN-4G-O}`iU|U7RC^`^3sg-GkOqMS zAO`6H(*=o{c_n&zsU->~dIoxi20(G91x#=~3JaJKY@i&&b&FdPK#H@#BeIx*f$sv0i>ry1t>MrKP@sk-m|UE>MMTab;dfVufyAu`tKo-FP)SbBnaEtPap}qq8Pro9uK;KZ$Kp&f?lFT%O^H6kwWN>Or zt;oco4I~561`Z5}8*P9gYUNy%npl!w6q28xV}~A>Hu~r)5FWGvxx~u9C^HopM4*7M zGqlmi5JOTAa)MPrW<_dFgiB^_YF;r&kFk-BK2`~=8Y6LOM3R7Nw9yB}3sO8m5&>8g zmb*1a)4rXV`E#G;^ORMc zGxk3?#Zl!wPd+MQ=DB4JYmaGPh!K>s>N-1N(cSqoFMdqkvHp6;&wEn3vxJV+Y@Rhe zPA;iJIO&7Ph9Z?)=X!XTotv8S=Z8eMrL_7whcz8<=kBW0nZT+kX?v`q?}W*0humGF zr=LI2craJ!bIB|Y?!ykpcQ0Ra;)%QAH|g95CniPNdc-h3wVJT4?O;w_vRH)P^u}$m zEW6fm*H|%WnE#J&d?tB!Z}ojf?bz$TZ#?}R!e}k~D{oc^f75H8O|G-QIBkCPUppb? z#k;kkN=dgxH4-Aj<|{1?;(R=DsnrGh?+t;yMFN`^N4<3@%dhZy#1e4*`u?-+{L1_v zD!(uLazy%an^Vl69nP~)9qhlq&(BTn!Ro^G>t9FD&=TP~kYmPOBEv4RowN7Cyv++H zIh*Vc(by%v{rQID-+6yJY;PA)Hqvy-Qrx4YHji~8*M=nrm$IpTVLin)@A<9=zwMSu zsef@Yns#{R=U+!e1NaW5^E2()&#rP&@z@iKqL4yIFv2Y7zC zrkvWOus%+rmB(jMmi_NUA7HphJP_`WRJrxe=ID_re>S`f$k{Mgi*Fv&RxQK(GZ#+3 zaQuH$Uij3K`F9^^2BNS%Lhn)CkWs zUtb0-Ae)1Ml~IU+8OUM;LIy@D29OFMi@}Rg8qN-4G-O}`iU|U7RC^`^3sg-GkOqMS zAO`6H(*=o{c_n&zsU->~dIoxi20(G91x#=~3JaJKY@i&&b&FdPK#H@#BeIx*f$sv0i>ry1t>MrKP@sk-m|UE>MMTab;dfVufyAu`tKo-FP)SbBnaEtPap}qq8Pro9uK;KZ$Kp&f?lFT%O^H6kwWN>Or zt;oco4I~561`Z5}8*P9gYUNy%npl!w6q28xV}~A>Hu~r)5FWGvxx~u9C^HopM4*7M zGqlmi5JOTAa)MPrW<_dFgiB^_YF;r&kFk-BK2`~=8Y6LOM3R7Nw9yB}3sO8m5&>8g zmCfNO#W5s;^J=)S|7{0>*y%YNCoe0q(^C)?3=QpKIJi{k zKcn9V_6O|+kLFE|n0fD$$r3-a`{&Sh^e|Veyxopx=OZkLwokh%LRuSbgUz$Id zxL-}$n{g!UsJy1a5xLKMnj4vC?mIGXow$z8ECsb1zGdsW`Ck0qU9?{NP*!Psz|*!L zefK$Dm)4l}ENOVZfBNk22S0E7th?oQx9eRV?_8KG^822X^xK3J&psaU z;40Yn)q?MFO>Kr>x>6wH_NF-b8kaKtoIQ(n%vo=s$hY`o$(Em7+Ecwu{(nBK?-VIw z(pRk_r*N(^4XZNPcd+~13OdvCYD$30%LyyB7tCeu>f9x0DWI^5WzCJHGQ5+j_IE8d zC}rJJ>@fF7q}-ytYn9Z~o*cSmSmb>3<)a^(59T-iOk*`)`1?QiuGrX1%w><4J4hah o{C+n-DTvMBnyH?~C;!++YtcEAPDSs|as?G&p00i_>zopr0JIzk+5i9m literal 0 HcmV?d00001 diff --git a/Colorcaecum/assets/railcraft/textures/blocks/tracks/outfitted/kit/locomotive_5.png b/Colorcaecum/assets/railcraft/textures/blocks/tracks/outfitted/kit/locomotive_5.png new file mode 100644 index 0000000000000000000000000000000000000000..5bb400f98eb976566036ec445783371221e705bc GIT binary patch literal 1473 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%Lg%sS%!O zzP=1vKsE;h8>0{dGmymygba*Q3?LOi7DE`LG@KpBr~y^O1e7#n0Fn%XK%CZ|$-n|t zUjd{+AOVO$`oVNTVrE{6US4X6f{C7io}mFyoM{0QT#v#6W&|53$6z*Dvld8k7I;J! zGcfQS0b$0e+I-SLeXBA~aDsl@zx)^LKtboki)RIJnirk#M zVyg;UC9n!BAR8pCucQE0Qj%?}6yY17;GAESs$i-Ibd-`Emx6+VO;JjkRgjAtR6CGo ztCUevQedU8UtV6WS8lAAUzDzIXlZGwZ(yWvWTXpJp<7&;SCUwvn^&w1F$89gOKNd) zQD#9&W`3Rm$lS!F{L&IzB_)tWZ~%2@ZUNk)yke-Yfd133NG#Ad)HBe>rl}+|4dFZ# zT_72p+EObracBd{K(v7a1L8&-V2D~d7o{eaj?2Dj>5WH7CL)GdDG_7-W+% zP#;zatQsS6X+)BMYP8V@#U@hhLXr+x6qt7GxPT!7ONVw`F&5XYfT@<-)5S3)g7fb5 zvwnvh1dcD~y3}O)^!0*Hmn5I$DK8x7JLTQ8`53aVq1=C8gL|(Of83q`A>l;|0ZdO< zU*a;3oxqYZ{y7$-5j2zuk&oamkRQ;&5f; zLz(aChckZaEz1w>{PSu`+$n~M&$T(zr|s&#$NrWdY<9h2CYILvUsfP_%lA*5jT)!etrSihU1FY+_{Pg>?y+xM zW4N!@7zRv_{qz1n$$Qn7#EbKM)ZEWMy||sT`5=Rd@9f66!Im>JXMcZC&pt)xYSrJq zMZZ7P@H;L$^4r6|k73XKpdJfPL;k8|XN%dzp1nA~^wxT&XQe+HHZ^_SxGQ0nn%P$Q zmn|xCf4ARn>T6`{ImgVGIA_zM^_MLbl&sR)B9^MS&j{Y1S&-BqxIuWL3tPkHuL^3( z7AcW$(?1)0y~FtKGeh*pT|U*dD}#Je=Jf4x+j#KU$E*)BE5bVVOjtVk!jt;O)Q?W* td${K@YcjFFekSZ0q{1Lp9{6=S^ZoYO-2!dmk3N8kEKgTImvv4FO#n_c`Og3V literal 0 HcmV?d00001 diff --git a/Colorcaecum/assets/railcraft/textures/blocks/tracks/track.locomotive.png b/Colorcaecum/assets/railcraft/textures/blocks/tracks/track.locomotive.png deleted file mode 100644 index 6624f422cbdadd86d66f9dba8ac7dd114e8613c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1070 zcmeAS@N?(olHy`uVBq!ia0vp^2Y^_CgAGW!%qVXKQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5hd`K7RKu$QC@4|l8c`CQpH@PIMe#A*Ti0m+X#pn^k+``)-|$|1KDO^KJh5@q|Iq4E`EEyYN|y7uJ1U{^d2piv9EcNl$;S zE2viR@QdQJS4R(@x&FH?@>G%HJC3qk{^HN4m@eCvUlCMc=+CHKQEyOR=EeAR`sddy zGR9Em?9J-@5lTJ@4{y}5{Xafw^SjmbDrN51CW>u@7LA# zOXJxc{%-x|F8txPpFXQ#U44SY?>zO-zgH$c*|M;-;n&spR*;IXUyg5ED0cq5;kU14 zX=!O~nI=*`yYHrbFc&&nnaH#;R|CnY?F$Pwe_Z-}#@xB79%*mi_JsPaxSC~HA1`sN z?#|g3&Li6vZhNGDL9z79_p0m0)3*F?e{esDX(ji8TTi3J6J9aB_$sEpjG?xLGvQ^U zfH&XCj8B1r0Ztw)#~-Gt`Z${yv5Pmc`$!%kS~WR7cjwGeuO* zI;+Nf@XMDiJbyO5EwS1s`==&nhNJL}p8LK({&hyQ)*oiK=h`siu*UlN3;rEvS+nc^ z-In+BJ3@b$*L+ya&~2G>)&2s*4#)NT7&&UZi&ABY)0aKG3URomMSaJSV%mr4KfSTAl&9*4_Eh!4^F~Gdd;OXk;vd$@?2>{uW2nzrJ From 58679ac022b80843d807966e09ec60f306ac4201 Mon Sep 17 00:00:00 2001 From: Patrick White Date: Mon, 30 Nov 2020 22:56:44 -0800 Subject: [PATCH 04/14] Removed limiter/throttle tracks Reverse top speed being increased to 3 prompted changes in the default texture which make this no longer needed --- .../textures/blocks/tracks/track.limiter.png | Bin 1421 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Colorcaecum/assets/railcraft/textures/blocks/tracks/track.limiter.png diff --git a/Colorcaecum/assets/railcraft/textures/blocks/tracks/track.limiter.png b/Colorcaecum/assets/railcraft/textures/blocks/tracks/track.limiter.png deleted file mode 100644 index dbecfb6cbcf192b02e5527098960f687e75be158..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1421 zcmbVLTTC2P7(NSP3n>@FOCiM$L#Uu-X7ArZFv0#KeQi6f;CQxN18T2Wmt6Dk-PWo6PxP_dNajy~Uiy9&aJx2pN!BfbAh ztOna>jJe%QRl^Fl^CBlj)WRi< z&qsSjRb#~v^m?2)Vj*~*qpii|l!NjV8(nUT(a6|}ZN)~$<1$$tZqxvmF^=^}p*8`E zS{%zg!a7#P#>PRAQDhHP_LAnG+Zzstk@ZURR=>MIKW=u}^7Si^=|6$+ z3&nT81KhT!TX&Ssjez+d!NMp=Pfyo>N$NdNb$=M7rKO!d?63DxOvzLFM1l{1=Kx>; zcrXTTeGC2?0(*B^{}=?f`+>n=C@d_@%*;$lNhv5O(66pNBry8anw*@Rq@<+T0Z{GC z-&v8LoSeKk4uk+{0pKM7XaFh!*aAQe0Q#k-DzxkR!J`9Lk=zo^UlTy)|6HKwo02CH z&3&)O6^u@N*7dX4No6qoX_@udGd-<>`z&!|viF3ppRYRpc$uZ*?6rG_8J<8R*ab;F6>yVIuMI&pfa@7S5Fca9|Nezzz4a&Dk= z&-}rKs^kxEiBkW>+@{X(C*>Q~T>koe-omNKr!P)%KWw~|G0WWSFP-tg+*mzo%? From d22c59db7f69ce4d828a432ebf4c22841dc338e0 Mon Sep 17 00:00:00 2001 From: Patrick White Date: Mon, 30 Nov 2020 23:01:42 -0800 Subject: [PATCH 05/14] Replace . with _ in file names --- ...png => buildcraft_gate_trigger_aspect_green.png} | Bin ...f.png => buildcraft_gate_trigger_aspect_off.png} | Bin ...d.png => buildcraft_gate_trigger_aspect_red.png} | Bin ...=> buildcraft_gate_trigger_aspect_red_blink.png} | Bin ...ng => buildcraft_gate_trigger_aspect_yellow.png} | Bin ...buildcraft_gate_trigger_aspect_yellow_blink.png} | Bin 6 files changed, 0 insertions(+), 0 deletions(-) rename Colorcaecum/assets/railcraft/textures/items/{buildcraft.gate.trigger.aspect.green.png => buildcraft_gate_trigger_aspect_green.png} (100%) rename Colorcaecum/assets/railcraft/textures/items/{buildcraft.gate.trigger.aspect.off.png => buildcraft_gate_trigger_aspect_off.png} (100%) rename Colorcaecum/assets/railcraft/textures/items/{buildcraft.gate.trigger.aspect.red.png => buildcraft_gate_trigger_aspect_red.png} (100%) rename Colorcaecum/assets/railcraft/textures/items/{buildcraft.gate.trigger.aspect.red.blink.png => buildcraft_gate_trigger_aspect_red_blink.png} (100%) rename Colorcaecum/assets/railcraft/textures/items/{buildcraft.gate.trigger.aspect.yellow.png => buildcraft_gate_trigger_aspect_yellow.png} (100%) rename Colorcaecum/assets/railcraft/textures/items/{buildcraft.gate.trigger.aspect.yellow.blink.png => buildcraft_gate_trigger_aspect_yellow_blink.png} (100%) diff --git a/Colorcaecum/assets/railcraft/textures/items/buildcraft.gate.trigger.aspect.green.png b/Colorcaecum/assets/railcraft/textures/items/buildcraft_gate_trigger_aspect_green.png similarity index 100% rename from Colorcaecum/assets/railcraft/textures/items/buildcraft.gate.trigger.aspect.green.png rename to Colorcaecum/assets/railcraft/textures/items/buildcraft_gate_trigger_aspect_green.png diff --git a/Colorcaecum/assets/railcraft/textures/items/buildcraft.gate.trigger.aspect.off.png b/Colorcaecum/assets/railcraft/textures/items/buildcraft_gate_trigger_aspect_off.png similarity index 100% rename from Colorcaecum/assets/railcraft/textures/items/buildcraft.gate.trigger.aspect.off.png rename to Colorcaecum/assets/railcraft/textures/items/buildcraft_gate_trigger_aspect_off.png diff --git a/Colorcaecum/assets/railcraft/textures/items/buildcraft.gate.trigger.aspect.red.png b/Colorcaecum/assets/railcraft/textures/items/buildcraft_gate_trigger_aspect_red.png similarity index 100% rename from Colorcaecum/assets/railcraft/textures/items/buildcraft.gate.trigger.aspect.red.png rename to Colorcaecum/assets/railcraft/textures/items/buildcraft_gate_trigger_aspect_red.png diff --git a/Colorcaecum/assets/railcraft/textures/items/buildcraft.gate.trigger.aspect.red.blink.png b/Colorcaecum/assets/railcraft/textures/items/buildcraft_gate_trigger_aspect_red_blink.png similarity index 100% rename from Colorcaecum/assets/railcraft/textures/items/buildcraft.gate.trigger.aspect.red.blink.png rename to Colorcaecum/assets/railcraft/textures/items/buildcraft_gate_trigger_aspect_red_blink.png diff --git a/Colorcaecum/assets/railcraft/textures/items/buildcraft.gate.trigger.aspect.yellow.png b/Colorcaecum/assets/railcraft/textures/items/buildcraft_gate_trigger_aspect_yellow.png similarity index 100% rename from Colorcaecum/assets/railcraft/textures/items/buildcraft.gate.trigger.aspect.yellow.png rename to Colorcaecum/assets/railcraft/textures/items/buildcraft_gate_trigger_aspect_yellow.png diff --git a/Colorcaecum/assets/railcraft/textures/items/buildcraft.gate.trigger.aspect.yellow.blink.png b/Colorcaecum/assets/railcraft/textures/items/buildcraft_gate_trigger_aspect_yellow_blink.png similarity index 100% rename from Colorcaecum/assets/railcraft/textures/items/buildcraft.gate.trigger.aspect.yellow.blink.png rename to Colorcaecum/assets/railcraft/textures/items/buildcraft_gate_trigger_aspect_yellow_blink.png From 1aadb237c08c2dbb9352ac8d3a0700ad044352f8 Mon Sep 17 00:00:00 2001 From: Patrick White Date: Mon, 30 Nov 2020 23:03:39 -0800 Subject: [PATCH 06/14] Replace . with _ in file names --- ...ignal.lamp.bottom.png => signal_lamp_bottom.png} | Bin .../{signal.lamp.box.png => signal_lamp_box.png} | Bin .../{signal.lamp.top.png => signal_lamp_top.png} | Bin 3 files changed, 0 insertions(+), 0 deletions(-) rename Forecaster/assets/railcraft/textures/blocks/{signal.lamp.bottom.png => signal_lamp_bottom.png} (100%) rename Forecaster/assets/railcraft/textures/blocks/{signal.lamp.box.png => signal_lamp_box.png} (100%) rename Forecaster/assets/railcraft/textures/blocks/{signal.lamp.top.png => signal_lamp_top.png} (100%) diff --git a/Forecaster/assets/railcraft/textures/blocks/signal.lamp.bottom.png b/Forecaster/assets/railcraft/textures/blocks/signal_lamp_bottom.png similarity index 100% rename from Forecaster/assets/railcraft/textures/blocks/signal.lamp.bottom.png rename to Forecaster/assets/railcraft/textures/blocks/signal_lamp_bottom.png diff --git a/Forecaster/assets/railcraft/textures/blocks/signal.lamp.box.png b/Forecaster/assets/railcraft/textures/blocks/signal_lamp_box.png similarity index 100% rename from Forecaster/assets/railcraft/textures/blocks/signal.lamp.box.png rename to Forecaster/assets/railcraft/textures/blocks/signal_lamp_box.png diff --git a/Forecaster/assets/railcraft/textures/blocks/signal.lamp.top.png b/Forecaster/assets/railcraft/textures/blocks/signal_lamp_top.png similarity index 100% rename from Forecaster/assets/railcraft/textures/blocks/signal.lamp.top.png rename to Forecaster/assets/railcraft/textures/blocks/signal_lamp_top.png From 57fe2c6014afcf889ede7277847f22c27133c197 Mon Sep 17 00:00:00 2001 From: Patrick White Date: Mon, 30 Nov 2020 23:08:58 -0800 Subject: [PATCH 07/14] Update locomotive tracks for 1.12 kit system --- .../blocks/tracks/outfitted/kit/locomotive_0.png | Bin 0 -> 1429 bytes .../blocks/tracks/outfitted/kit/locomotive_1.png | Bin 0 -> 1469 bytes .../blocks/tracks/outfitted/kit/locomotive_2.png | Bin 0 -> 1410 bytes .../blocks/tracks/outfitted/kit/locomotive_3.png | Bin 0 -> 1437 bytes .../blocks/tracks/outfitted/kit/locomotive_4.png | Bin 0 -> 1473 bytes .../blocks/tracks/outfitted/kit/locomotive_5.png | Bin 0 -> 1483 bytes .../textures/blocks/tracks/track.locomotive.png | Bin 1766 -> 0 bytes 7 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 Forecaster/assets/railcraft/textures/blocks/tracks/outfitted/kit/locomotive_0.png create mode 100644 Forecaster/assets/railcraft/textures/blocks/tracks/outfitted/kit/locomotive_1.png create mode 100644 Forecaster/assets/railcraft/textures/blocks/tracks/outfitted/kit/locomotive_2.png create mode 100644 Forecaster/assets/railcraft/textures/blocks/tracks/outfitted/kit/locomotive_3.png create mode 100644 Forecaster/assets/railcraft/textures/blocks/tracks/outfitted/kit/locomotive_4.png create mode 100644 Forecaster/assets/railcraft/textures/blocks/tracks/outfitted/kit/locomotive_5.png delete mode 100644 Forecaster/assets/railcraft/textures/blocks/tracks/track.locomotive.png diff --git a/Forecaster/assets/railcraft/textures/blocks/tracks/outfitted/kit/locomotive_0.png b/Forecaster/assets/railcraft/textures/blocks/tracks/outfitted/kit/locomotive_0.png new file mode 100644 index 0000000000000000000000000000000000000000..2c38c62489a6268c0c086cfccff2c2840e5d4b0c GIT binary patch literal 1429 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%Lhn)CkWs zUtb0-Ae)1Ml~IU+8OUM;LIy@D29OFMi@}Rg8qN-4G-O}`iU|U7RC^`^3sg-GkOqMS zAO`6H(*=o{c_n&zsU->~dIoxi20(G91x#=~3JaJKY@i&&b&FdPK#H@#BeIx*f$sv0i>ry1t>MrKP@sk-m|UE>MMTab;dfVufyAu`tKo-FP)SbBnaEtPap}qq8Pro9uK;KZ$Kp&f?lFT%O^H6kwWN>Or zt;oco4I~561`Z5}8*P9gYUNy%npl!w6q28xV}~A>Hu~r)5FWGvxx~u9C^HopM4*7M zGqlmi5JOTAa)MPrW<_dFgiB^_YF;r&kFk-BK2`~=8Y6LOM3R7Nw9yB}3sO8m5&>8g zm$&f$t&L+%7XBz+ zU%LIb$KE?j)E^5A9!h)LdLcqo>aIteo66t1v%IInIpS*>K6jSZah$pPdrP{;=N1vZ z`AjE8TyBdb#HGxe%5`5e@dcMgYR>eiuMq*FE_>cwTppBgCqp1>v+vRwhZi^0ay|QK z!NDE7T>3X>=tPg>8E>vcwIs9dtP|M9bg5Qho{VZ*_wCOuOM^Nun5c8=o>r={Q<|{v zPc5rd`i<(>D}C22x~TE+px&PPRj7pQOee$rIH z@T~Ryzh~1nr^suEaLz5heLereiZu@AH;Z=ONsu|{`7=}LfItMRe06@niW)opuA|%a z54hDoS+}=bP8EZg5~5#R! rg`(j@cbN{CJSo|r=nU2;ahd@fr=zgS3j3^P6NS%Lhn)CkWs zUtb0-Ae)1Ml~IU+8OUM;LIy@D29OFMi@}Rg8qN-4G-O}`iU|U7RC^`^3sg-GkOqMS zAO`6H(*=o{c_n&zsU->~dIoxi20(G91x#=~3JaJKY@i&&b&FdPK#H@#BeIx*f$sv0i>ry1t>MrKP@sk-m|UE>MMTab;dfVufyAu`tKo-FP)SbBnaEtPap}qq8Pro9uK;KZ$Kp&f?lFT%O^H6kwWN>Or zt;oco4I~561`Z5}8*P9gYUNy%npl!w6q28xV}~A>Hu~r)5FWGvxx~u9C^HopM4*7M zGqlmi5JOTAa)MPrW<_dFgiB^_YF;r&kFk-BK2`~=8Y6LOM3R7Nw9yB}3sO8m5&>8g zmCe;C#W5s;^J@5Mufq-^b8m!9zUFm{YmoxSqR>?@jxD{k zSNdRY9?O2G!l&jxn0FOFHSdTHEL7~^TKnMGwp(sFx!JdlJ-fHlOLUUwsv~TZCeJ+c zdXD9Hqlq(4pWYMhv-))OLM~fpW}}3yA?zW~XR_!w^~)VBtG~uG{e9Ap>o!L65exiI z+&Oc!!nM(kBk{YYK z3Itp)Jup3(;o@uo_|~H$+m>uR@nxh^%#7bF5d{bY%(J`|0!pHYxahU8^MTm@El> z{;;I<1e@1-2TQxQv0SlHe9Q0Fz!hT zxl&@o{zWs!XQq*=)}t*R_eBN1F&Hisp4i1?uK}DCRtDnm{r-UW|M_c<$ literal 0 HcmV?d00001 diff --git a/Forecaster/assets/railcraft/textures/blocks/tracks/outfitted/kit/locomotive_2.png b/Forecaster/assets/railcraft/textures/blocks/tracks/outfitted/kit/locomotive_2.png new file mode 100644 index 0000000000000000000000000000000000000000..f3f3c1139edbd59c0f5ab7f70eb8c2df3ccaca78 GIT binary patch literal 1410 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%Lhn)CkWs zUtb0-Ae)1Ml~IU+8OUM;LIy@D29OFMi@}Rg8qN-4G-O}`iU|U7RC^`^3sg-GkOqMS zAO`6H(*=o{c_n&zsU->~dIoxi20(G91x#=~3JaJKY@i&&b&FdPK#H@#BeIx*f$sv0i>ry1t>MrKP@sk-m|UE>MMTab;dfVufyAu`tKo-FP)SbBnaEtPap}qq8Pro9uK;KZ$Kp&f?lFT%O^H6kwWN>Or zt;oco4I~561`Z5}8*P9gYUNy%npl!w6q28xV}~A>Hu~r)5FWGvxx~u9C^HopM4*7M zGqlmi5JOTAa)MPrW<_dFgiB^_YF;r&kFk-BK2`~=8Y6LOM3R7Nw9yB}3sO8m5&>8g zm5tFT#W5s;^KQ7e{~-r~d0PG3B6JlDXU)jqsR&razPI@M z3;QqZKjdw)u1F*&`S8rB2-FE+dK$W5o3ZQ^mcnWS*6JJi<=-a$-8WZ~jgzVFT=$!b z=%}lF??R?4cg#(b542?Av~D`v^kA2LwA*$5f||$8GxX&@t0ldg61;EWDPbpzdaevl zp|uQ0{&ZGe%euqevQS&#M6zvGZ}tI=jvx1w*Q<9H?(WsdEoGW(Y0nk0{YXq`r@;xM zvNc?;u1ccEH{N}tbnH{oPlXcJmd_2Vbd@&Woh*AKX=BHV*Q-00Whz};FVHgkX83|y z_x$`Ywi8-Xy?r-Urq>$0<2^C=d4j=$O4o%o5B8`TL@n{n&I&oRkEy8XUYxa((yo7f zTp6?2wx&%u)p|P6`(cs z*oiVt*`AwfylL@_wX=)%R(jssTR+QH>BJ51|9MVdey!-RuGy_1|FJnq=%r!w3of7D zi|@lr=c)9(ej(?|dcH7jL$0*%S?N{6Pn!RKi@vZafML7b2T3(etzBwY84GWU8y}iE zNhEP;-Jzc!8Pg7kPIO{w`2R&=x$urB+wYuzZqT-_p}_WldEBKJYnR4;;@oDf`iWPr z`_UiG4}ogWSm!@_QGc*N!>cMM_5~M5y3@XIA0}$4sO3nQY~JQ58FY$|X|CihrujE3 V`c|1|8gzlmA5T|5mvv4FO#mGY-Dm&+ literal 0 HcmV?d00001 diff --git a/Forecaster/assets/railcraft/textures/blocks/tracks/outfitted/kit/locomotive_3.png b/Forecaster/assets/railcraft/textures/blocks/tracks/outfitted/kit/locomotive_3.png new file mode 100644 index 0000000000000000000000000000000000000000..5ea9f82ee8dc5ee63b43a1cb8f50571731f91c1f GIT binary patch literal 1437 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%Lhn)CkWs zUtb0-Ae)1Ml~IU+8OUM;LIy@D29OFMi@}Rg8qN-4G-O}`iU|U7RC^`^3sg-GkOqMS zAO`6H(*=o{c_n&zsU->~dIoxi20(G91x#=~3JaJKY@i&&b&FdPK#H@#BeIx*f$sv0i>ry1t>MrKP@sk-m|UE>MMTab;dfVufyAu`tKo-FP)SbBnaEtPap}qq8Pro9uK;KZ$Kp&f?lFT%O^H6kwWN>Or zt;oco4I~561`Z5}8*P9gYUNy%npl!w6q28xV}~A>Hu~r)5FWGvxx~u9C^HopM4*7M zGqlmi5JOTAa)MPrW<_dFgiB^_YF;r&kFk-BK2`~=8Y6LOM3R7Nw9yB}3sO8m5&>8g zmcc!H7{np=Qb7#cQy|BPU;Ior%T1Dor z4{Q%?S(O5X*3OtXF>`5_LEhFF!{^7m!w-ZW*%Z3{J)?i)`3|{4ZLgFnTbIP`?@ui+ z7r7wUS*hXD;wbXbIs3v&j^j-c*R7e4IGl^Li`d1~_t`;XQ{R~>mu-&}?d;Jw&FK;v zDro;sKxThfeB(Xgw|j3%C~5D%-@hXMiLXxb^DFwEQ}~bRC)(&9+P3XO$eMjjNi)9L z75TWN{5+emFF8nIrcaXXgly$k=Vz^~k2|`RX=MnPN$xev+fs5fKC5lc+8)bryZYM( z&L1i_bIOi|uMA;w4P5rN+0!baKXzm60e|*g>zHSsS#>6R`=+P4+bSK-1*{9t*WAT_ z{@c$8;bV^r*X+L+(8KdGU`Eawt#zUsiayQW)|&oh_v1p(1I2Ic7X%;ty{s~Elj)ig zxfg9J&;H-ecMNxCRQt}@oEYMCjCtxiM#qZ+m)&OyHHbJaX4QXxghBmazKaki!?A14 z68wuhW8Xcmv(SrWylrzJ{8XW`Q+4gi0G}njeNL@O&9^OG-)jb}7yO*mmgjW&KkMR& y!I#vm-)l}#cx14v&Rva@sbS*dCA*@yY8c~B_wW7nZ-OSMX!3ORb6Mw<&;$VSS?g{9 literal 0 HcmV?d00001 diff --git a/Forecaster/assets/railcraft/textures/blocks/tracks/outfitted/kit/locomotive_4.png b/Forecaster/assets/railcraft/textures/blocks/tracks/outfitted/kit/locomotive_4.png new file mode 100644 index 0000000000000000000000000000000000000000..e9b1435ccb1d1fc46b858db72037c4b9bd2c4d88 GIT binary patch literal 1473 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 From 63253b4949c1c707440b7f87ce17892b3b62dd25 Mon Sep 17 00:00:00 2001 From: Patrick White Date: Mon, 30 Nov 2020 23:11:45 -0800 Subject: [PATCH 08/14] Replace . with _ in file names --- ...png => buildcraft_gate_trigger_aspect_green.png} | Bin ...f.png => buildcraft_gate_trigger_aspect_off.png} | Bin ...d.png => buildcraft_gate_trigger_aspect_red.png} | Bin ...=> buildcraft_gate_trigger_aspect_red_blink.png} | Bin ...ng => buildcraft_gate_trigger_aspect_yellow.png} | Bin ...buildcraft_gate_trigger_aspect_yellow_blink.png} | Bin 6 files changed, 0 insertions(+), 0 deletions(-) rename Forecaster/assets/railcraft/textures/items/{buildcraft.gate.trigger.aspect.green.png => buildcraft_gate_trigger_aspect_green.png} (100%) rename Forecaster/assets/railcraft/textures/items/{buildcraft.gate.trigger.aspect.off.png => buildcraft_gate_trigger_aspect_off.png} (100%) rename Forecaster/assets/railcraft/textures/items/{buildcraft.gate.trigger.aspect.red.png => buildcraft_gate_trigger_aspect_red.png} (100%) rename Forecaster/assets/railcraft/textures/items/{buildcraft.gate.trigger.aspect.red.blink.png => buildcraft_gate_trigger_aspect_red_blink.png} (100%) rename Forecaster/assets/railcraft/textures/items/{buildcraft.gate.trigger.aspect.yellow.png => buildcraft_gate_trigger_aspect_yellow.png} (100%) rename Forecaster/assets/railcraft/textures/items/{buildcraft.gate.trigger.aspect.yellow.blink.png => buildcraft_gate_trigger_aspect_yellow_blink.png} (100%) diff --git a/Forecaster/assets/railcraft/textures/items/buildcraft.gate.trigger.aspect.green.png b/Forecaster/assets/railcraft/textures/items/buildcraft_gate_trigger_aspect_green.png similarity index 100% rename from Forecaster/assets/railcraft/textures/items/buildcraft.gate.trigger.aspect.green.png rename to Forecaster/assets/railcraft/textures/items/buildcraft_gate_trigger_aspect_green.png diff --git a/Forecaster/assets/railcraft/textures/items/buildcraft.gate.trigger.aspect.off.png b/Forecaster/assets/railcraft/textures/items/buildcraft_gate_trigger_aspect_off.png similarity index 100% rename from Forecaster/assets/railcraft/textures/items/buildcraft.gate.trigger.aspect.off.png rename to Forecaster/assets/railcraft/textures/items/buildcraft_gate_trigger_aspect_off.png diff --git a/Forecaster/assets/railcraft/textures/items/buildcraft.gate.trigger.aspect.red.png b/Forecaster/assets/railcraft/textures/items/buildcraft_gate_trigger_aspect_red.png similarity index 100% rename from Forecaster/assets/railcraft/textures/items/buildcraft.gate.trigger.aspect.red.png rename to Forecaster/assets/railcraft/textures/items/buildcraft_gate_trigger_aspect_red.png diff --git a/Forecaster/assets/railcraft/textures/items/buildcraft.gate.trigger.aspect.red.blink.png b/Forecaster/assets/railcraft/textures/items/buildcraft_gate_trigger_aspect_red_blink.png similarity index 100% rename from Forecaster/assets/railcraft/textures/items/buildcraft.gate.trigger.aspect.red.blink.png rename to Forecaster/assets/railcraft/textures/items/buildcraft_gate_trigger_aspect_red_blink.png diff --git a/Forecaster/assets/railcraft/textures/items/buildcraft.gate.trigger.aspect.yellow.png b/Forecaster/assets/railcraft/textures/items/buildcraft_gate_trigger_aspect_yellow.png similarity index 100% rename from Forecaster/assets/railcraft/textures/items/buildcraft.gate.trigger.aspect.yellow.png rename to Forecaster/assets/railcraft/textures/items/buildcraft_gate_trigger_aspect_yellow.png diff --git a/Forecaster/assets/railcraft/textures/items/buildcraft.gate.trigger.aspect.yellow.blink.png b/Forecaster/assets/railcraft/textures/items/buildcraft_gate_trigger_aspect_yellow_blink.png similarity index 100% rename from Forecaster/assets/railcraft/textures/items/buildcraft.gate.trigger.aspect.yellow.blink.png rename to Forecaster/assets/railcraft/textures/items/buildcraft_gate_trigger_aspect_yellow_blink.png From b5c6dc815cde661ba144aa739045a7849da18367 Mon Sep 17 00:00:00 2001 From: Patrick White Date: Mon, 30 Nov 2020 23:13:20 -0800 Subject: [PATCH 09/14] Pack format 3 --- Forecaster/pack.mcmeta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Forecaster/pack.mcmeta b/Forecaster/pack.mcmeta index 966f343..88d5140 100644 --- a/Forecaster/pack.mcmeta +++ b/Forecaster/pack.mcmeta @@ -1,6 +1,6 @@ { "pack":{ - "pack_format":1, + "pack_format": 3, "description": "Addon for the Colorcaecum Pack - By Forecaster" } } From ae56b20fa0d785282d6e391f9353473b69c64fb8 Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 30 Nov 2020 23:27:41 -0800 Subject: [PATCH 10/14] CoFH mods now have a colorblind mode built-in Navigate to .minecraft > config > cofh > core > B:EnableColorBlindTextures= and set this value to true --- .../textures/blocks/cell/Cell_Config_Blue.png | Bin 3829 -> 0 bytes .../textures/blocks/cell/Cell_Config_Orange.png | Bin 3829 -> 0 bytes .../textures/blocks/config/Config_Blue.png | Bin 2871 -> 0 bytes .../textures/blocks/config/Config_Green.png | Bin 3186 -> 0 bytes .../textures/blocks/config/Config_None.png | Bin 2808 -> 0 bytes .../textures/blocks/config/Config_Orange.png | Bin 3084 -> 0 bytes .../textures/blocks/config/Config_Purple.png | Bin 2926 -> 0 bytes .../textures/blocks/config/Config_Red.png | Bin 3091 -> 0 bytes .../textures/blocks/config/Config_Yellow.png | Bin 3107 -> 0 bytes .../blocks/energycell/Cell_Config_Blue.png | Bin 3829 -> 0 bytes .../blocks/energycell/Cell_Config_Orange.png | Bin 3829 -> 0 bytes .../textures/gui/elements/Slots.png | Bin 8004 -> 0 bytes 12 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Colorcaecum/assets/thermalexpansion/textures/blocks/cell/Cell_Config_Blue.png delete mode 100644 Colorcaecum/assets/thermalexpansion/textures/blocks/cell/Cell_Config_Orange.png delete mode 100644 Colorcaecum/assets/thermalexpansion/textures/blocks/config/Config_Blue.png delete mode 100644 Colorcaecum/assets/thermalexpansion/textures/blocks/config/Config_Green.png delete mode 100644 Colorcaecum/assets/thermalexpansion/textures/blocks/config/Config_None.png delete mode 100644 Colorcaecum/assets/thermalexpansion/textures/blocks/config/Config_Orange.png delete mode 100644 Colorcaecum/assets/thermalexpansion/textures/blocks/config/Config_Purple.png delete mode 100644 Colorcaecum/assets/thermalexpansion/textures/blocks/config/Config_Red.png delete mode 100644 Colorcaecum/assets/thermalexpansion/textures/blocks/config/Config_Yellow.png delete mode 100644 Colorcaecum/assets/thermalexpansion/textures/blocks/energycell/Cell_Config_Blue.png delete mode 100644 Colorcaecum/assets/thermalexpansion/textures/blocks/energycell/Cell_Config_Orange.png delete mode 100644 Colorcaecum/assets/thermalexpansion/textures/gui/elements/Slots.png diff --git a/Colorcaecum/assets/thermalexpansion/textures/blocks/cell/Cell_Config_Blue.png b/Colorcaecum/assets/thermalexpansion/textures/blocks/cell/Cell_Config_Blue.png deleted file mode 100644 index 7369cb60b26384dbd24eaba635455a2acaa27dcb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3829 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 Aw*UYD diff --git a/Colorcaecum/assets/thermalexpansion/textures/blocks/cell/Cell_Config_Orange.png b/Colorcaecum/assets/thermalexpansion/textures/blocks/cell/Cell_Config_Orange.png deleted file mode 100644 index f97afc5a9ee1a708e71235e54477ddc95a35ae97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3829 zcmeHJS5OpM61^ixP9i}-l$<0-$uL8X0)q@mG6NzKL`j0={6IvqgMgBQ2r@VXC1-{t zaR`zH1XhBegjsxFe!LH>cE7gvR`u3Ttv)T!zwemew%^-0z2}PQggppJT zMG5rUrO)AA?VStD!YZL;T%PB3*Eq62IOT+ZqhJMv8ywBV9{|K}l$-=K>t{EMUX8|6 zZ$LAxAR!TuW}oDnx+EcVKqVj%S_o7$AR(v>9utsD2yFWt?3chTAz;haWtO=Yem07KT;gVGkwImVpA~rJ2q;&3E0hLG<`{C-+m^pP49XWZP{k@>EAmN&RkGR0 zB`U>}O1RbZJ(Z#-^-nvJoEE;uP*OtGZj#G(?9(w2`#1z=A_-$=(9`b(2te7C3w>DJfLOq?N1nUxQ{&Iy_qWzwzaAzCz?M*?_6oc zoy=9Y%Ly7{4;%*H`V!KHsyCBL6Z%5g?5?S5A@mRilUl`WSGgoFO_R!y5=0oa@^YjU z>%QZuzx1R1ioLj4G(t;|bDTEmvItFJ46I#-i#8S}&Wm|^LHq4%_z3NY#>jnR&UL|( zY)LI<&Xk^MN4IKX+2?|6H@YL2QOj-163Z;h?7Nm^D0>yJ*GDFce8#0b!;eJLoT=)=2WkbF$pSBS45nS8Ij$C?SoowU|Of`Oj>~550Q4d3< z+Iij%Og(-i(2#M;+7Pc;T9PLVlhBbct1;et?yO9_l;L&s!pDGgjjt$uFF0W1|Rrz;6(vvkgOH!bV<9C%qT z1dJS@vTL$iw~BFZwxzdSx1(oX_DjCx&oP&HFx1u!`)sr_tW5qgRn%?1JlGIs7>cZ2 z;}mfaNj9sPsH!XQEj_f`VO09AEW13 zn3cdagIz5F{eWj*lN+V{xjG~Y1XnN-yd_T?^(ggbv*mIavL3Oyiz~`CiG@E)e(D7+ zW!FzZBR7z%&X4-aog%BxI_}5UiCjx1?s2PmT7J=7hzt!a`~tV&n-CzbMmm`}e;kPI zl}#(lxiPTSU(<_wD)VCJC4P&xm3HA7x*$r|Oo$b++Ejj5wpzi;3l2`eYem%ExlnawGg*Wa#OOE$e_)ci7jhGgoyckt=-Qk6pIpl zY+NNBjxnA7$t2&5-wI2#NAJhXndk3H%GxoGgU%z)>#K7@IhIsurRl5bRQD;Trr%M{ z-+s4s@Le4zl0LwPYY0cfFt0u;yl-?W>cI}kE5l#I_u)U`(%U1mwRRIn_lLJx0vo?e zejUSEHXfcT^?bmYLQM6?oX4DwwU28Kl`CUQ*N@VU-K{GO+`YEC2u27_i8-mz6PQn9 ztRsqWr72DSdeOPa>8a+wynaYJe|U{jZu(I|VEF>^==Dde zNLG=%(5&4ojck*wV@rF>dc%ID;qi^RfD=vJb?O(A3g-Sgd+;9D>GiPD6y)w;0xA_1 z6fFE>#uk^44qS7<&flf>*r})SSr}2r$FIpZ%44l|-}~%V<5n)4y*JBxBWL5j;j^J| zmNIJC)$pPrs}f`7hS?5istt5LTxZFV!OreC`F~@;kB{ZZD$X|T1$Z2G93IRw%m#b& zo?`nNrhIv~D;f5m zWbBlAA`B3{6DVacl>{+g+EUH55T`$ z_=or(hyG6h!2gN{zt8rc48ZUBzcu)Mw*Q3Scl>|63lISCc=04rFUZ&YnP1tp)eY1t Ip|)ZF1{zsje*gdg diff --git a/Colorcaecum/assets/thermalexpansion/textures/blocks/config/Config_Blue.png b/Colorcaecum/assets/thermalexpansion/textures/blocks/config/Config_Blue.png deleted file mode 100644 index 24edbc38fe9348d80e9084488ded931056540ba0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2871 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 VKMTc!@ALow002ovPDHLkV1hsdTtNT; diff --git a/Colorcaecum/assets/thermalexpansion/textures/blocks/config/Config_Green.png b/Colorcaecum/assets/thermalexpansion/textures/blocks/config/Config_Green.png deleted file mode 100644 index d83c4b8aa6948756f37b174bce1622387c9921be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3186 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 Y0O%sH+eC@LH2?qr07*qoM6N<$f+tb!l>h($ diff --git a/Colorcaecum/assets/thermalexpansion/textures/blocks/config/Config_None.png b/Colorcaecum/assets/thermalexpansion/textures/blocks/config/Config_None.png deleted file mode 100644 index 76c82f4f5c5f381c433f8e32a7ffd5051cb661c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2808 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 KMNUMnLSTYxgENKz diff --git a/Colorcaecum/assets/thermalexpansion/textures/blocks/config/Config_Orange.png b/Colorcaecum/assets/thermalexpansion/textures/blocks/config/Config_Orange.png deleted file mode 100644 index 5be014d24101f6d75fa137828c86297e6bbd3b86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3084 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 diff --git a/Colorcaecum/assets/thermalexpansion/textures/blocks/config/Config_Yellow.png b/Colorcaecum/assets/thermalexpansion/textures/blocks/config/Config_Yellow.png deleted file mode 100644 index eaa7c79c8acb2bbc8f76395c1cbe6ab23306deb7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3107 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 Aw*UYD diff --git a/Colorcaecum/assets/thermalexpansion/textures/blocks/energycell/Cell_Config_Orange.png b/Colorcaecum/assets/thermalexpansion/textures/blocks/energycell/Cell_Config_Orange.png deleted file mode 100644 index f97afc5a9ee1a708e71235e54477ddc95a35ae97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3829 zcmeHJS5OpM61^ixP9i}-l$<0-$uL8X0)q@mG6NzKL`j0={6IvqgMgBQ2r@VXC1-{t zaR`zH1XhBegjsxFe!LH>cE7gvR`u3Ttv)T!zwemew%^-0z2}PQggppJT zMG5rUrO)AA?VStD!YZL;T%PB3*Eq62IOT+ZqhJMv8ywBV9{|K}l$-=K>t{EMUX8|6 zZ$LAxAR!TuW}oDnx+EcVKqVj%S_o7$AR(v>9utsD2yFWt?3chTAz;haWtO=Yem07KT;gVGkwImVpA~rJ2q;&3E0hLG<`{C-+m^pP49XWZP{k@>EAmN&RkGR0 zB`U>}O1RbZJ(Z#-^-nvJoEE;uP*OtGZj#G(?9(w2`#1z=A_-$=(9`b(2te7C3w>DJfLOq?N1nUxQ{&Iy_qWzwzaAzCz?M*?_6oc zoy=9Y%Ly7{4;%*H`V!KHsyCBL6Z%5g?5?S5A@mRilUl`WSGgoFO_R!y5=0oa@^YjU z>%QZuzx1R1ioLj4G(t;|bDTEmvItFJ46I#-i#8S}&Wm|^LHq4%_z3NY#>jnR&UL|( zY)LI<&Xk^MN4IKX+2?|6H@YL2QOj-163Z;h?7Nm^D0>yJ*GDFce8#0b!;eJLoT=)=2WkbF$pSBS45nS8Ij$C?SoowU|Of`Oj>~550Q4d3< z+Iij%Og(-i(2#M;+7Pc;T9PLVlhBbct1;et?yO9_l;L&s!pDGgjjt$uFF0W1|Rrz;6(vvkgOH!bV<9C%qT z1dJS@vTL$iw~BFZwxzdSx1(oX_DjCx&oP&HFx1u!`)sr_tW5qgRn%?1JlGIs7>cZ2 z;}mfaNj9sPsH!XQEj_f`VO09AEW13 zn3cdagIz5F{eWj*lN+V{xjG~Y1XnN-yd_T?^(ggbv*mIavL3Oyiz~`CiG@E)e(D7+ zW!FzZBR7z%&X4-aog%BxI_}5UiCjx1?s2PmT7J=7hzt!a`~tV&n-CzbMmm`}e;kPI zl}#(lxiPTSU(<_wD)VCJC4P&xm3HA7x*$r|Oo$b++Ejj5wpzi;3l2`eYem%ExlnawGg*Wa#OOE$e_)ci7jhGgoyckt=-Qk6pIpl zY+NNBjxnA7$t2&5-wI2#NAJhXndk3H%GxoGgU%z)>#K7@IhIsurRl5bRQD;Trr%M{ z-+s4s@Le4zl0LwPYY0cfFt0u;yl-?W>cI}kE5l#I_u)U`(%U1mwRRIn_lLJx0vo?e zejUSEHXfcT^?bmYLQM6?oX4DwwU28Kl`CUQ*N@VU-K{GO+`YEC2u27_i8-mz6PQn9 ztRsqWr72DSdeOPa>8a+wynaYJe|U{jZu(I|VEF>^==Dde zNLG=%(5&4ojck*wV@rF>dc%ID;qi^RfD=vJb?O(A3g-Sgd+;9D>GiPD6y)w;0xA_1 z6fFE>#uk^44qS7<&flf>*r})SSr}2r$FIpZ%44l|-}~%V<5n)4y*JBxBWL5j;j^J| zmNIJC)$pPrs}f`7hS?5istt5LTxZFV!OreC`F~@;kB{ZZD$X|T1$Z2G93IRw%m#b& zo?`nNrhIv~D;f5m zWbBlAA`B3{6DVacl>{+g+EUH55T`$ z_=or(hyG6h!2gN{zt8rc48ZUBzcu)Mw*Q3Scl>|63lISCc=04rFUZ&YnP1tp)eY1t Ip|)ZF1{zsje*gdg diff --git a/Colorcaecum/assets/thermalexpansion/textures/gui/elements/Slots.png b/Colorcaecum/assets/thermalexpansion/textures/gui/elements/Slots.png deleted file mode 100644 index 244f32279caa022c18ab75197b4203cc8ba8d09f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8004 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 Date: Mon, 30 Nov 2020 23:39:09 -0800 Subject: [PATCH 11/14] Updated Unity version to new TE file organization --- .../cell_config_blue.png} | Bin .../textures/blocks/config/cell_config_omni.png | Bin 0 -> 1434 bytes .../cell_config_orange.png} | Bin .../blocks/energycell/Cell_Config_Blue.png | Bin 1243 -> 0 bytes .../blocks/energycell/Cell_Config_Orange.png | Bin 1252 -> 0 bytes .../gui/elements/{Slots.png => slots_cb.png} | Bin 6 files changed, 0 insertions(+), 0 deletions(-) rename Unity/assets/thermalexpansion/textures/blocks/{cell/Cell_Config_Blue.png => config/cell_config_blue.png} (100%) create mode 100644 Unity/assets/thermalexpansion/textures/blocks/config/cell_config_omni.png rename Unity/assets/thermalexpansion/textures/blocks/{cell/Cell_Config_Orange.png => config/cell_config_orange.png} (100%) delete mode 100644 Unity/assets/thermalexpansion/textures/blocks/energycell/Cell_Config_Blue.png delete mode 100644 Unity/assets/thermalexpansion/textures/blocks/energycell/Cell_Config_Orange.png rename Unity/assets/thermalexpansion/textures/gui/elements/{Slots.png => slots_cb.png} (100%) diff --git a/Unity/assets/thermalexpansion/textures/blocks/cell/Cell_Config_Blue.png b/Unity/assets/thermalexpansion/textures/blocks/config/cell_config_blue.png similarity index 100% rename from Unity/assets/thermalexpansion/textures/blocks/cell/Cell_Config_Blue.png rename to Unity/assets/thermalexpansion/textures/blocks/config/cell_config_blue.png diff --git a/Unity/assets/thermalexpansion/textures/blocks/config/cell_config_omni.png b/Unity/assets/thermalexpansion/textures/blocks/config/cell_config_omni.png new file mode 100644 index 0000000000000000000000000000000000000000..9ce3d89aa9206390cd43a8d068c67bcbfee2f952 GIT binary patch literal 1434 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 diff --git a/Unity/assets/thermalexpansion/textures/gui/elements/Slots.png b/Unity/assets/thermalexpansion/textures/gui/elements/slots_cb.png similarity index 100% rename from Unity/assets/thermalexpansion/textures/gui/elements/Slots.png rename to Unity/assets/thermalexpansion/textures/gui/elements/slots_cb.png From 54ecfd80ad6fa294a62e3d5f89b16703224c0f7a Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 30 Nov 2020 23:39:23 -0800 Subject: [PATCH 12/14] Pack format 3 --- Unity/pack.mcmeta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Unity/pack.mcmeta b/Unity/pack.mcmeta index 83e02f4..0d8c64e 100644 --- a/Unity/pack.mcmeta +++ b/Unity/pack.mcmeta @@ -1,6 +1,6 @@ { "pack":{ - "pack_format":1, + "pack_format": 3, "description": "Adds textures for colorblind people - Unity Edition" }, "language":{ From 74ae61d79678662e1d78065cd6f97dfbf90bffc1 Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 30 Nov 2020 23:43:26 -0800 Subject: [PATCH 13/14] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2410e9f..9cc760c 100644 --- a/README.md +++ b/README.md @@ -7,10 +7,10 @@ If you think some things in a mod need to get colorblindness-friendly texture, o Currently supported mods are: * RailCraft: Limiter Track, Locomotive Track, Signal Aspects (Aspect names have been changed in colorblind mode language) - * Thermal Expansion: The machine I/O textures have been included in this pack + * Thermal Expansion: The machine I/O textures have been included in the Unity Edition of this pack (for Vanilla Edition CoFH has implemented built-in colorblind support) ###Unity -This Resource Pack comes in two versions to download, the Vanilla and Unity Edition. While the Vanilla Edition is probably the one you should choose, the Unity Edition is supposed to provide support for [CyanideX' Unity 32x32 pack](http://minecraft.curseforge.com/texture-packs/222097-unity), so choose this version if you are using the Unity Resource Pack. +This Resource Pack comes in two versions to download, the Vanilla and Unity Edition. While the Vanilla Edition is probably the one you should choose, the Unity Edition is supposed to provide support for [CyanideX' Unity 32x32 pack](https://www.curseforge.com/minecraft/texture-packs/unity), so choose this version if you are using the Unity Resource Pack. ###Forecaster-Addon The third file to download is an addon to either of the two Resource Pack versions, adding alternative textures for Railcraft Signals. If you like to have those textures a little different but still fine for colorblind people to use, try this. @@ -29,4 +29,4 @@ This pack is made for fun, and nothing else. The Colorcaecum Resource Pack is licensed under Calclavia's Educational Public License (https://github.com/Vexatos/Colorcaecum/blob/master/LICENSE.md). By using or interacting with this software in any way shape or form, you agree to the license of this software. -The Colorcaecum Resource Pack's download (Unity Edition) contains textures from CyanideX's Unity 32x32 pack, which you can find at http://minecraft.curseforge.com/texture-packs/222097-unity and https://github.com/CyanideX/Unity +The Colorcaecum Resource Pack's download (Unity Edition) contains textures from CyanideX's Unity 32x32 pack, which you can find at https://www.curseforge.com/minecraft/texture-packs/unity and https://github.com/CyanideX/Unity From 3c662026552bc40a176aca7ba6d03fa07211e879 Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 30 Nov 2020 23:59:22 -0800 Subject: [PATCH 14/14] Updated lang files (sort of) They still don't work according to my testing but I don't know what's causing it. The language is created but the changes aren't applied. --- Colorcaecum/assets/railcraft/lang/en_BV.lang | 12 ++++++------ Colorcaecum/assets/railcraft/lang/en_CB.lang | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Colorcaecum/assets/railcraft/lang/en_BV.lang b/Colorcaecum/assets/railcraft/lang/en_BV.lang index a792ff7..fba2eab 100644 --- a/Colorcaecum/assets/railcraft/lang/en_BV.lang +++ b/Colorcaecum/assets/railcraft/lang/en_BV.lang @@ -8,9 +8,9 @@ railcraft.gates.trigger.aspect.red=Aspect: Line blocked railcraft.gates.trigger.aspect.yellow.blink=Aspect: Pairing railcraft.gates.trigger.aspect.yellow=Aspect: Line in use -railcraft.gui.aspect.green.name=Line free -railcraft.gui.aspect.off.name=Off -railcraft.gui.aspect.blink.red.name=Not paired -railcraft.gui.aspect.red.name=Blocked -railcraft.gui.aspect.blink.yellow.name=Pairing -railcraft.gui.aspect.yellow.name=In use +gui.railcraft.aspect.green.name=Line free +gui.railcraft.aspect.off.name=Off +gui.railcraft.aspect.blink.red.name=Not paired +gui.railcraft.aspect.red.name=Blocked +gui.railcraft.aspect.blink.yellow.name=Pairing +gui.railcraft.aspect.yellow.name=In use diff --git a/Colorcaecum/assets/railcraft/lang/en_CB.lang b/Colorcaecum/assets/railcraft/lang/en_CB.lang index af9a0e1..5b8ae36 100644 --- a/Colorcaecum/assets/railcraft/lang/en_CB.lang +++ b/Colorcaecum/assets/railcraft/lang/en_CB.lang @@ -7,9 +7,9 @@ railcraft.gates.trigger.aspect.red=Aspect: Line blocked railcraft.gates.trigger.aspect.yellow.blink=Aspect: Pairing railcraft.gates.trigger.aspect.yellow=Aspect: Line in use -railcraft.gui.aspect.green.name=Line free -railcraft.gui.aspect.off.name=Off -railcraft.gui.aspect.blink.red.name=Not paired -railcraft.gui.aspect.red.name=Blocked -railcraft.gui.aspect.blink.yellow.name=Pairing -railcraft.gui.aspect.yellow.name=In use \ No newline at end of file +gui.railcraft.aspect.green.name=Line free +gui.railcraft.aspect.off.name=Off +gui.railcraft.aspect.blink.red.name=Not paired +gui.railcraft.aspect.red.name=Blocked +gui.railcraft.aspect.blink.yellow.name=Pairing +gui.railcraft.aspect.yellow.name=In use