From 7d1ca83efab0883919708eb50ef1fba0f778792b Mon Sep 17 00:00:00 2001
From: UnRealDinnerbone <unrealdinnerbone@gmail.com>
Date: Thu, 10 Oct 2024 11:36:09 -0500
Subject: [PATCH 1/7] Icon updates

---
 .../ftbchunks/textures/minimap_info.png       | Bin 6753 -> 2758 bytes
 .../assets/ftbchunks/textures/player.png      | Bin 1307 -> 1520 bytes
 .../ftbchunks/textures/player.png.mcmeta      |   2 +-
 .../ftbchunks/textures/waypoint_death.png     | Bin 222 -> 1750 bytes
 .../ftbchunks/textures/waypoint_death_old.png | Bin 236 -> 1779 bytes
 .../ftbchunks/textures/waypoint_default.png   | Bin 1803 -> 1554 bytes
 .../textures/waypoint_default.png.mcmeta      |   2 +-
 .../textures/waypoint_default_outside.png     | Bin 1027 -> 1533 bytes
 .../waypoint_default_outside.png.mcmeta       |   2 +-
 9 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/src/main/resources/assets/ftbchunks/textures/minimap_info.png b/common/src/main/resources/assets/ftbchunks/textures/minimap_info.png
index b438f72148c092a3afe98bd2e79a3f9375722c76..8050c9507624bc84763ac886d365583909ff3f22 100644
GIT binary patch
delta 1907
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

literal 6753
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
G*#84$xt41H

diff --git a/common/src/main/resources/assets/ftbchunks/textures/player.png b/common/src/main/resources/assets/ftbchunks/textures/player.png
index 53288f78182368999308dc7d5d3ffc3be5dc6805..14746dce399e426452a7b7d39af6c21963a4420f 100644
GIT binary patch
literal 1520
zcmbVMTZr6L7|zJFt}7jiAb6u2QZ2P>ZYMjJ92>XW&FV}w>vlV}>x=YEa%LuMk`t4&
z&FqRk_#o{=TWKv61XmCisvs0EFH!|jQ3?egwCe=~-+U-j@IicWJ(){rWwqGA$+>;!
z`|tmWx!I?-jXp5Saoo0A)tqPZ_H>MFW&g3?HxQfd3aih@99Q@v9l3Mkg$Fq<f8DJw
z&;{!mXcJ#T4rySi<A)5*aeF5_A+i@S<r}!=28Pi6<THVH9YZ)$v=l3x#%;H{65&HD
zvvqrA(bgSd@(F%#2QmU5Q^a?CFNk5s5PH0jt<z&!;Cm3dXb4lOKz_lR<EKf4d0kRP
zTTuXC)+JOzB~33q#sdXR$ciSbKvc?bq5^@&4?cm3i<~B$H=i5`V>?4=QyM~9PLf1Q
zG>JqlS=Du2R)7qE$Pi+@98lB|gLvnV!Njp0xgm8)z^9C;L6)c?Fjf0D_+dsH!~;Ju
zkI5Yr%BrNKHuZpxo#Dcz$m<DrY#Dpl#{rEQR?V<sn@|$B$-hu%*Eb1ZzO}4O#-_UX
zekLNOGsl=21BYyij_b=ImgjLymLeO^9Aj$kOsxswbc7KlQJoNP7^%6T$~-7aD&Th?
zaRY}W@uN4qz$T*D5Yn)Ts={JcR{>N?5R}Fh6)H*}Y7xh6E^i90Kux;|%96%G6x|Z+
z*sw_=A2EwvAGNR?1}%Zl{0OIsM<OPeX{YtHuq;>$Vu}JA*GxlTMoX^iK%kbJ8fX+n
zMYE9z)CnY3RA7s0v7!JpQFh8Db@<*S_EH+!;d|$QzJE4yS#2Tjwt3QuOLGEN-Izsd
zc~BCE@QZ_$=kmQYfXGhM+YszDuGkR<$L?)=pii5$F(dttaQ9&`Y0?Bmc&f#`b?bbR
znf7v8iG4%lf7;l)yP;}_aMlXaW!8k)CTn9jV7)71O)B{F<2|gwt<}t_dgbJoXVuZq
z_idl~<+!>2w0HKM{KbR$%a>M9{+565A>6&VYy8xAuRUz$%fEKl&TovZ-hc3L^x=-e
z6`gBb&4m{hx2&%g?zq1DE$-(lS6^wJyLa-D<Laq1Z?5Iues|B7^&JT)e!c5;bV2|J
zq|5hk-Is;jzQZq_!H-uDeDnQ}r?>u)-zcBI#((rz@WLBM>78HQ$L$~aVC*?>G}rE4
dJ3aF0w|D<>N&hJ+xV5w=*JftT_xB%t^=~yq<)8on

literal 1307
zcmai!`#Y3*0L8!W+r0J84AWF*DoZ<LHnX{;-CT+c#u{RFm@OfUCQl`F;VINkuS;&z
z8Y~iHOhvKl+7qHRMy15MJgp|<5+*FQZY?QHt^R`j;e5_H&vSl0DO`?=HbIvF0MK@2
zv%FRv`yzDhDj)3+YF{-d!pp@GRCMZ1t`^*J2M-4Ts>Q^WAY`@U&#-+W03bDe5oC?<
zj8->Qt}KV2q5`H01~b%5t%MOXBHW8(V*q_)xdW!fcEr|o#BL_ln}p1g$}S)CGhOf=
zi;MRQ6*u_RCOym_9q6N*UhZ?r%nDo1&FCLFb3!WVIv&lop}J$E$2_nnnqc^tM{LuS
z;G1nN_S?kyVzIbmAtvnA{Uc_dr`H#D*k>xJ>5@?V?5L0)K`7#28sU)1^=C%dZ_AWu
zkD;bt$JN|EoN+;+4RRM9E?>^R%1GZ0g`{=m!CP_N?HadQon)czhg%<JB=Y_#%b}s6
zQVx+<gYCB{ET^!j3faU=W-+D66*K7U%z{0UUC%Ubi8|~IAkZtIBZdUUV~yLq4q6C!
z5{UtF6R+sexQ*(d1%OIQlfoIeU83de5(at9YgVlG+iUfXu1+`Qr}d`w5e!kja$;s<
zIVIr$W>cVRfpjBPCCk}t2Hy<ppQ`PB9*j>?Dn0uxMZtLfCjNuL3bnA<9a81I54L`&
zx5h+OxLu#fB=Ex)cW&?k98jaK9AW$KXh4Vk6nSU$Zcvzb#ew+?4jgC#H#^Ln*TFVm
z-itd+7$6@=B}o#P49`vr5etO2Npb5nm#1h1+<{72F?I^-Nu5!hYzSi;Vj&P}AyN_s
z2*7mdfvgC)!!#S>Nk4xA7}O9P2}~p48%W{Ss#cz6+!1D%jtfQ2D@#iug$s|)72Nr2
zaxT7Sac<IXe6jjOVMo$M$la9X6UAVC-Bv5877}DTl+)(=#`o;;pLgCBHphIGm`ckA
z<0f*dump_v<;V>WJA&}_aQV6;>l(YfKK*h#NjSdc_CM_d_sPr-jUal=(kIU<rkfIX
z1;weX27grj{eJA=+3P@{|D9z>U=RbYWK=bPvVqh7ms<AX|0u@l!Kfm*^?7hAuS`_g
z!`hYDCx7vTb&Y=JBH22jv@u%iR9OVc5oPAKYf=vqqPAZJt=7iaC>K1t0WzH+qa>J3
zLeljJG#ee}xrZo!+LijzU9(ckQ%X?-Y|m}qM$QbWr2yD+YJBU5UgI*?LAk3@Bs+BJ
zcgEX&?SFoh8}vBHYS1##Oa>Pw2c+<m$@8CG%;m#gfOj$216NEI`n5Gxe=C1!o?iAU
zo*>mbK4PgKX;*t<dAhRI63ywn7B;8+jMTwo6KC4IU2D$*QR!F&UJ0adTQ^!8Q1?_#
ztUzdosYkVK9|X>xCvSNtx)vZZzi+Rtr#mQR_MR78rLBaXZtEQ=@(foRTZLuiTN#en
zEm0~jkgiZ6w>hM%F71jA<TZ!n9%zo?PSjWCw74{v?<VH)oSOfg40`!7?!qDwg~@p-
zlIcBgP?$khN>9qq&6*E4QD*cJ<BdvAeE8_*mZYuT-$Uq&9GVF|A@416PfbjQ$x`1q
zF2SLS>f{r7LmdN!+j=50+v3=x^h9sx&FTJuab{p7V{O|$3$5Zqk&tSEz5yq*mA_kX
z(-K5^MjAZsb>7HyJ*Xu}K0KdU0vkss2N`XBl1z3)4HEtz;i}M2YnFd_<0OMhpRXPo
NaCPReDjfN7{{i_}JLmua

diff --git a/common/src/main/resources/assets/ftbchunks/textures/player.png.mcmeta b/common/src/main/resources/assets/ftbchunks/textures/player.png.mcmeta
index a39ce83c..c4fe0348 100644
--- a/common/src/main/resources/assets/ftbchunks/textures/player.png.mcmeta
+++ b/common/src/main/resources/assets/ftbchunks/textures/player.png.mcmeta
@@ -1,5 +1,5 @@
 {
   "texture": {
-    "blur": true
+    "blur": false
   }
 }
\ No newline at end of file
diff --git a/common/src/main/resources/assets/ftbchunks/textures/waypoint_death.png b/common/src/main/resources/assets/ftbchunks/textures/waypoint_death.png
index df88c92e744a1129e021b765138ef91ccaec7b78..4d7949bdfdc1e2ea8cf0e2b361325ae08e04cfcb 100644
GIT binary patch
literal 1750
zcmbVNU5MON6pr<;j@?CFQK(=;T6MK1xyj6AdSm0V-5H&c&USwWc8j8WC%H2dc9I*D
zJ3BKgR4bLOMSZAUC|WHDA{JV3OCJ`ciWCH)3(BHZ#1~P)qVuq?u6i?nbY-_K4J5fq
zzH`oZ&Ufy~>m$QY_e8cvIF9Sdq?2Rpeph&IzKvbCt^AAF?G7)!Kj66D3*mXw{LbD7
zIPTW-c5aeRX7}nQaU^7sJeF#X$Iu+Nd!Xhaa~e}VkBhcz2#rra7kJw;go$_-WW6C=
zveUCZ9-ke~nX}U-w1j~t`Q0_0IdCvVe9bAlfnGC&reB?{!`HIFHz9P|5C+45{A6~7
zA0j^Hp`?f=04kq=64H<sh1%o13e=bkqOzijAfd;0>1vd39|8;KTLpbA`BXa?doqL)
zrJgR!)oN9$MkV4GWd%Yg165X4ks-vO?ow0}-C%piLlOt3Z+p}xE+2YCc~YT<z^Jxz
zaJ;TtH)z+1RZOlSPgW!l=F|jQW*6sG{Bkq6Wy-jW9qiJ8VU;e{D-lY964}6Y_w$+n
zthU)~H^#bL9H$#1ps5*_M!O*EqJv!B!}1soNX0jCYKGC=9%kd|Lq0~7_&Gw#9i>J(
zlzBBSDJtJTVY?Qo29I80fs=@0LkMLP6~HvhDXI=MUDb91MF*e-%@WHl)YpTmQC$IR
zpsZ;uMA0?DmZ=wr?;w`3?Vuu-J+~<E-8$++q)dDkn6ZmCS!A<%#tkTPO`J&@0!v!5
zZA;fIkWWC<6yr)v6)}t{A~X|F)F8z9H~{&$mG9UmiCGDy?but)K3)KtmOzl%N3jU4
z7!Xljfvg%<-c+L&vJ|yrzt6YX-a_RY_7m>7uqX7i9Wb@(?JY5mUu>_+Hs5Rm9hqT!
z8-f|?iY=l2+Fqvu*Ox)dZMB4%)2qncf(4{NtH{TLMOLkA_mjL4`vA>co%{8vw=wrM
z{dYs$+l4ht$Sq<vE@dIiMh@pnOBVV6iZ#DoF@rjAHrT>tccik1?oh@qbM3Q{``jas
z^|5h%K9d~G?RxX{+e+`3U`y(SQ+(==-0`X3G=qHg^P$)J=qd0)|CZCEn={Lie~!i8
zI{98>Yr|NA`}n(+9mkHGU4rsQs}oZvcHBSlVOkL%o?GBn|LpyuUi|&r`;I=pyjq#v
z<kj~!Zuued-PcDBkB)u6yloEpPrR|Rc=%)b$^1|8a|eIziDk|ly?1fo!B<}X?4Y#g
z<S*}!|5dtk{=lVY+_`UVzI4z2mzEaCPh2>+@X*4K?*_L=q(f&%-|1Vq-1vJ_|FZ`!
UUyO?v!#__ZHJm)NXX@4e0N1uT$N&HU

literal 222
zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sEXgD|57Yp@DXu-MbZF+?LcIVB<C2mcWRhDXf|F+H3vf5e}p
zSSV@pr8OCJ@Cq?A?%<nnKu0aiK>h9ge70lX?>qX;u#spGX)I~>ZRBuV%fPgO)4lSC
z#JalQe8zI?Ui|k-v`d+rVCKPds-5G2MF4}i^Eb7w<^~3ha|ak00!)p(x+g~I0Ig^6
MboFyt=akR{02JLqE&u=k

diff --git a/common/src/main/resources/assets/ftbchunks/textures/waypoint_death_old.png b/common/src/main/resources/assets/ftbchunks/textures/waypoint_death_old.png
index 248fafeb55a5e3367922fd1ee322fc3855471030..11da548788243a95e29229b6d636cd8cc89524bf 100644
GIT binary patch
literal 1779
zcmbVNYiJx*6dofjHZ(C(!I}yVQ{U;lH@iEROiJ8Inr)o8>~3kq2f2Ia?(UeKhclDx
zCZVKg#a3(o#267&1YiAO5tJgWCQvoB{t^6PTkMbi5FZt>QZ0zsdS_oWlC-4*GjnI=
zJLi1oeCM9omm1#I*4o)hQB+%UP)n10M|j?{mR#??a2b-@I(P6fpQ75o49}b9y4p8U
z)S3k|I}(iOj{xLY95kF9<|>v;&=l3Pwc<iFh66f>3#P3yzaL#>Xwy)co!z>iy9r!0
z2d6xonHtWbsWGG&%+_AIrviur3kQ&{SS8yB6_u&_1!Nt*<{7#Q3C2{WFAPYJ=qWnk
zc$ii=kwt<a(J_UCQ5cn#=oVTMqzEs_yeP3k3`F8UlIi-vkZ_)n2Wf4f9*jJxOfd*t
z!1LvDnJdej;}v*OQ50T~cu8Ujg7qiu09IJr-`wz^VIO&>8<>twhaO?h84py3P_5-)
zxlOmWU#}CX7+--dFLFYdQx#~SCe9uAO4Z;7;&BOE*baPx6`NSM=md^mbXIZQ{Jbmx
zsjaRzW30%<vYH|Mpnrm-Q7_1fXg@pYVm^(1XWT=$e}d559A@K!gok0^cv;6OHIzy<
zDAQ6mCrb1KJ5Aeg%Kn2_SYQnXSY<-lSWzIFWkm@HQ6NRT1Q7^A4XQhanV(z<D#@Tb
zvJ6U^#()95CfGnA?|2p@8JiX?VBWP04Bf0FNH`_OBY_D!xynM<LDKdEXd|4|RE8wY
znWg~@Bq2E_iY(6IC<{?UU~}C{jFn|Wj3GHE;F!{|*Bmq+O53nEh`l0Ua-bNiD3ZcL
zC6Z^ATs*=?V?sV|$Ppt4qYe8<J(KJ$Sh`_9;f@P?0t}iyQERfkB{KM#`l@8o)iwYS
zh3%~}DAW}jO#QXFLItibgPPlN5fi6Zk-G--oqSM+9_}lUYF)dZ_|@3^aN_FRuTQ<z
zxi9O#8{%FsEGj~~fXTSznJ^nZoGUe1`2Q<b{dUC+YQV{03zyB2N*<a+8Qa9QM@H_=
zrw{BP<NEug)|ZXH{Nb$FdQ8~({9^ImHNT{`-SPIPKiqZTsfXszS?`RleIqj4@lpDP
z&g4+~_Fb9urSqSEwy^imug5PuvEjH9J2m~)k9%H8AN}j;c;!fX#~k-!3pK_rz4r5&
zEdwpZ*9W@ZO>Kw!_kos<^!6v`hp59Zt>3LjXEsnhf1m25;%6SGE?#_f;`~8vWA5wZ
z{`I@|etfd;U-tA{Cyw1ZJ-sRZN9Szf?2NQ~;huw^pqcl%`Kj{4pY2O+|7e$vJa^xF
z-@bY7#5Z>u8RPN?OX|A0;Ouu@zn#pew=MSmbU!<|=kOP!LqYgkO7;(HhaMh%_CIdn
BNpk=I

literal 236
zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sEXgD|57Yp@DXu+h`SF+?LcIVB+>gCR+xVdKLjAB9Kz71R$4
zMivSPt6XGAYCht?kix`a(!i2txUtDH^M9SO!M^`|V(pp?j2jj$wyEJU>yK~xslb%O
zDsVt`ecf+9W4Sd9Z%)iSRKs&CW{$z!gzpU^%l7|eF=X@<dgCD=t-{81;$F)|1BNHY
b1`G`A;<R{I2~O?+I)=g1)z4*}Q$iB};!H=(

diff --git a/common/src/main/resources/assets/ftbchunks/textures/waypoint_default.png b/common/src/main/resources/assets/ftbchunks/textures/waypoint_default.png
index 561fd52293153ee75ceedfbada45cb2f555420d7..e3ee4d9ebd88fc25076ad28de2d0503466557477 100644
GIT binary patch
literal 1554
zcmbVMTWB0r7@mNwbtN%r(FbGAbRyEtI`_REI=0EqY8IWCCL0pLsAp%+%nsR^GtNx9
zn;<P#R79+xs4ar{P--pWgQX}awn#-mByABdZ`S${i%>%!h1N5B8Cr=JJ8<UQzVrR}
z|K-VvhkFxuCn$>QEsv{HWbTi~rj6u3bonYI({0}P;{iqWosLG&o2kA*in`@byD}Hf
zX^#ROI~+7{6>&|+BWQ}+v9swxeF24Z6<M~cFqb|%$<Vf;FtZs=(7Yn5+2hMTnqHo$
z=*tUw!C-biNbhI@Lg1hf(oLuC2B4`hEnYy@(J{}^El9YaFr$$`dQO|9i`YkWffHF>
z5F|QR;9wSJ<wEuWS`wr*FUY(ou|f`{^FWg6&c_gOzF~qX^`VY1vQwB^7<z!`8;u6n
zkU8vIyjUm{ctPSNi6sa&SaL(yWZhu6%b=n__iZn<u}epcu!<K$g(0f8ZE(Dp)(tv-
zA|B(L(Bnl;h-_*B4L!zri+;T&+|YScM-FnsfMCTK>(y|GgBt!9>iGIP0mQeO7Ry*y
z7srW31Yv0pF{9&<b<sg($wT}U3h<(@qtYIt=5S<<2Z}y|A@(a6*SnFL?5a#l8BUbw
z?X$LP;6{+V<^@t=h!iFY8!HMVW))EaLKaBblpq2@XhSt@*yhrDP*DJx>!BoR3>d;2
zf(;#**moeY*mj_Wc+a&MI`$(d;yU(;V4|Je(n8Zf*$qPI>Zq(L3^AIsZ3Bq8bk(fp
zW!BX5CW}y7V)N;O$Y!g#oFKzoCMU!0dll=8QE0pGjsN-nG2bS&1?xA>6IEQ46JXp9
zNVJwZB{7Yj>8$ED-AV%h^(eg+Mvvl(45o8z-?RtXw2c}fr2i4_HY~tq*nmD7wTQQF
zoKHN_o{uWAZ3zEQ8(VkRRBabdT0yjon-JN=Z49}jclo4A?OnM`A`R}FvN~GHzxvf1
zyA%6&^}l#B`NHPp@ae+`&JKJ&_DSZ<u=?88ZO7h!H+|%#?`CcvRaf^N`gxyeT{(nG
zGXn#Ns?6M9<g(|}ca(NhG&8@o$D9Arzc8|T@ri9KmxtVYHXIun+K`xh3#F3ZO4RH3
zeXu=sA~W_>eelYskNok9HT&G9`NMYN`{T1~GZ#*5OdjN|AFi(SeR<~i7e`0FZuXu!
zzkKU2Yag#&d^@r0w|DlQHG59|?k}V^J*zjS^_3&{{`FJ;0qflJ?>+hJ;GJ7!^TTti
QTcWOAE={N(jXk~pZ~S-pf&c&j

literal 1803
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

diff --git a/common/src/main/resources/assets/ftbchunks/textures/waypoint_default.png.mcmeta b/common/src/main/resources/assets/ftbchunks/textures/waypoint_default.png.mcmeta
index a39ce83c..c4fe0348 100644
--- a/common/src/main/resources/assets/ftbchunks/textures/waypoint_default.png.mcmeta
+++ b/common/src/main/resources/assets/ftbchunks/textures/waypoint_default.png.mcmeta
@@ -1,5 +1,5 @@
 {
   "texture": {
-    "blur": true
+    "blur": false
   }
 }
\ No newline at end of file
diff --git a/common/src/main/resources/assets/ftbchunks/textures/waypoint_default_outside.png b/common/src/main/resources/assets/ftbchunks/textures/waypoint_default_outside.png
index 5f3741e3bb4116861c1922a29b81accd0e392602..e4d43dd0ee236a6e7f2c2cb08efe2913d0e6a059 100644
GIT binary patch
literal 1533
zcmbVMOKjXk7<QUcHBnPVf=kE&<03@V+8*1xoAnUWgg9lF#A%vtlz>!;S$lTZWbHAw
zQ+uNxP)bn&l}CVMB2FMK2o(q*BwEBn;?PLEDjt_!5E4R41eac_GTw*PqCiD0jpy~v
z_rL$=W~LwM>%F^|VVJ&RL7$~_e=_#&q5pgSx{m17;}sqY7-s($$>@6h;Qm2|*}ZL-
z7QzK%3Yx?bkVVQ^h#ilj8D`{g>>+azhin;FZCB&AKDofLwxx0NSpyi}IIh`+Wgj13
zo-Ucoi>7LEhaX}`Vn_)b93nP$>TUpIjcf8kx=xNoj%`B1MU5Lv1hNap3_DJI%&LOK
zn*hk{uqvP&$|-8@5Gw;YBLYQ~WF8E|OdiS#+x|Ez&bKOXRzK1fMt2%l3quczViZL}
zqzJ^Xiju0TB9KK{<|%>?8g7VU-VF|P7<3$%zU_rJaoL0smB~`5aa7fo4UU)6x<T7d
z)MH|dJW&!rVp9`nnJLa&^6O3EmMP*ocCZ@;6f31zuSP-=)X2Y3r`I<LpuRPXRK||F
zI8G`e2q#WbGujT>5gn8o9u{YDK$d(HPn@J`9!RY5;JA-bNc<8Z^-iQ_Ix4erR*+=&
zfqC1tNE8g+@B-^7#2S}`jh6t8SxJ&1$U!-G5J(V!7Ste?U1{tDm4=}LZi3RJu~3L^
z3ARjFA-;pC#kPa0SoGW~$EJRS<D^b}Dwt}gG_^1cSagFBxh5{^8b^&5Y}<nQYz|r3
zoWvuL#r$wKgLzfXAYPHns*=y-GM1X@yw{1jl!UhP-uj>KkNP&PEmXg4o}}WEoPY&8
zpwViyOX4_ws=cb)Y%>iYGL!VyI5UYWwz&4OecK*r(MB~)N&h3<Em%M*VT61<R;Av$
zbv}tydoiiRmLcLlZEW7%P_-R6Z3W3PZ9;UDwlVC|-sRIK_3UKdqqM=jSJcN!`Ey^s
zs`c)Y`p;bW2H#;0T|K>8dFhQST`Ozr7r&j1`N^LK<1^o{U)(Gox({7Lk+jl1^yigJ
zry5iGT=DJc)xpuZV{_+6-Xi;+zPxs=@)`Q@`A-XA?b5)DU!ChFCqDo6=NF=$fwO0K
zy@q>6kKJ|j$d<-zemp8{pWb(V{@$sL%NtL=Jhgp&4;gso{a=3ndiM|7-p9ZDtv{}V
u()zn6#IF4M<_GSB1E=o4y0NN!)P3jH$d9l5@#av{po<gJ`a2IlvGO-@i|~H{

literal 1027
zcmV+e1pNDnP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGizW@LZzX3P}QzQTY1DHufK~#8N?V8O?
z8$lSxC&|UAq^CkP7=$9$AOt*!_29vK4_dTH5B?23_uPXb1O>s1#~ym99|ZAFC<H_b
zq7?~hF(KNkk_hVbeP-X0C8V)C`Pj5OKbW02ld$jeK0CA7>_%8D7K_DVu~;k?OArZh
z-*lqU=xZtE8w%qU4dmS|6bfZZrP4RN(QKM(Ku1SMg1Yxq_&X{pg)!<?)6jdWRYGIm
z>2qHw{9G=Ve>$U$r)dUI@t>&sKrM=b!{M-MJv}`lkw}QXzCIC;I}_mi{QR+9US6s(
z7bR+GGU221vi*rr@$1xNXJ@DE?(UXjV`Fl4byZ$nUD1K9O|e*%OG`^Kl}btM!`0TY
zZzn~YLhC$ELJJU#!Y3yu<?ik-m*$=A?QJ<eKJGT5fE=8zy`ZB#0+A$8#$qu!KR+*T
zZ*RF2bFhz@nHjeUm{}v7wrz-!usalwBfqk;!txu(;^Ly)ggfMPQnvvlC<|dIzMd)n
z6j%~4nN7%YdVe7yYr6P!I?YnO^YHM%QEe6$7ThMRu?&A80TU1cL349+EU`ZR#)yh@
z!UW4{JyiHIM09m^$^HF(mRCP8p_UPQdwc3Dmd#&gIW6ZI3AliW+1Xi^);OLrVS0L6
zFNF(eaU^*s%)MtQ@muQRxXPQFnsNqP2pPbUz_kaov=&ObgQGt@JS?xTulcw%mRhp_
zIg`nxJ`e1$EYBFv03wOa=;)}RbATFfLmD|UNB?N5wlCyFZvKqYVuFzY^p*FVx_-n1
z0|V%MVQ_GeBhk;AJY!_Q{r&w*^l+c1p&Ijpp`oG2S)w(0#mE4flCL-vbPnLCIp_kb
zf!um|xHWmf^c?U48zk@T?NtMQpzkLDGOBe;;D5r@fFd@So`pg|4fsJmk6VZiG#h_$
z=m{eOsPG>gii3j#j+%pB<JCZJeU5Nz@`8~8kw_$m9^wuU57n3-9334!8l*LO#mE4<
z3d3|eLws^_g3cF?kB>PLXROIH^_&FNq0eTs;^yW?4Y<)$vmW%(t+p@ZL~j0!@ieT*
zfUnr(aygO7WYj<-sZ~7K+S(GQr>FeN(PDzJ0p)TTN%Ii8xw+{KwvdgD4UR;fwX~j~
z-w?64!~h8h?oCk*2?_3PaVFRgMnKRXjVY-3;65C6@lQP-um5`W50K!0;tvu{GXRhY
x!TpO&CA4<i@=sD0i^XEGSS%Kc#S%b-_ziU?oyxAWYb5{x002ovPDHLkV1lH;(=Y%4

diff --git a/common/src/main/resources/assets/ftbchunks/textures/waypoint_default_outside.png.mcmeta b/common/src/main/resources/assets/ftbchunks/textures/waypoint_default_outside.png.mcmeta
index a39ce83c..c4fe0348 100644
--- a/common/src/main/resources/assets/ftbchunks/textures/waypoint_default_outside.png.mcmeta
+++ b/common/src/main/resources/assets/ftbchunks/textures/waypoint_default_outside.png.mcmeta
@@ -1,5 +1,5 @@
 {
   "texture": {
-    "blur": true
+    "blur": false
   }
 }
\ No newline at end of file

From 0b06e7cafacc6d9cec6c13bdb5db1559e4d23363 Mon Sep 17 00:00:00 2001
From: UnRealDinnerbone <unrealdinnerbone@gmail.com>
Date: Mon, 14 Oct 2024 11:49:01 -0500
Subject: [PATCH 2/7] More icon updates, and fix gui fixes

---
 .../client/gui/ChunkScreenPanel.java          | 16 ++++++-
 .../client/gui/MinimapInfoSortScreen.java     |  5 +-
 .../ftbchunks/client/gui/PointerIcon.java     |  3 +-
 .../client/gui/ToggleVisibilityButton.java    | 47 -------------------
 .../client/gui/WaypointEditorScreen.java      |  9 ++--
 5 files changed, 24 insertions(+), 56 deletions(-)
 delete mode 100644 common/src/main/java/dev/ftb/mods/ftbchunks/client/gui/ToggleVisibilityButton.java

diff --git a/common/src/main/java/dev/ftb/mods/ftbchunks/client/gui/ChunkScreenPanel.java b/common/src/main/java/dev/ftb/mods/ftbchunks/client/gui/ChunkScreenPanel.java
index 5f47e1fb..e128508f 100644
--- a/common/src/main/java/dev/ftb/mods/ftbchunks/client/gui/ChunkScreenPanel.java
+++ b/common/src/main/java/dev/ftb/mods/ftbchunks/client/gui/ChunkScreenPanel.java
@@ -20,7 +20,11 @@
 import dev.ftb.mods.ftblibrary.icon.ImageIcon;
 import dev.ftb.mods.ftblibrary.math.MathUtils;
 import dev.ftb.mods.ftblibrary.math.XZ;
-import dev.ftb.mods.ftblibrary.ui.*;
+import dev.ftb.mods.ftblibrary.ui.Button;
+import dev.ftb.mods.ftblibrary.ui.GuiHelper;
+import dev.ftb.mods.ftblibrary.ui.Panel;
+import dev.ftb.mods.ftblibrary.ui.ScreenWrapper;
+import dev.ftb.mods.ftblibrary.ui.Theme;
 import dev.ftb.mods.ftblibrary.ui.input.Key;
 import dev.ftb.mods.ftblibrary.ui.input.MouseButton;
 import dev.ftb.mods.ftblibrary.util.TimeUtils;
@@ -38,7 +42,15 @@
 import net.minecraft.world.level.ChunkPos;
 import org.lwjgl.glfw.GLFW;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.EnumMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 import static dev.ftb.mods.ftbchunks.net.RequestChunkChangePacket.ChunkChangeOp;
diff --git a/common/src/main/java/dev/ftb/mods/ftbchunks/client/gui/MinimapInfoSortScreen.java b/common/src/main/java/dev/ftb/mods/ftbchunks/client/gui/MinimapInfoSortScreen.java
index 463d2462..24c29df5 100644
--- a/common/src/main/java/dev/ftb/mods/ftbchunks/client/gui/MinimapInfoSortScreen.java
+++ b/common/src/main/java/dev/ftb/mods/ftbchunks/client/gui/MinimapInfoSortScreen.java
@@ -14,6 +14,7 @@
 import dev.ftb.mods.ftblibrary.ui.SimpleButton;
 import dev.ftb.mods.ftblibrary.ui.TextField;
 import dev.ftb.mods.ftblibrary.ui.Theme;
+import dev.ftb.mods.ftblibrary.ui.ToggleableButton;
 import dev.ftb.mods.ftblibrary.ui.misc.AbstractThreePanelScreen;
 import dev.ftb.mods.ftblibrary.util.TooltipList;
 import dev.ftb.mods.ftblibrary.util.client.ClientTextComponentUtils;
@@ -122,7 +123,7 @@ public class InfoEntry extends Panel {
 
         public InfoEntry(MinimapInfoComponent infoComponent, Panel panel) {
             super(panel);
-            hideButton = ToggleVisibilityButton.create(this, !isComponentDisabled(infoComponent), (enabled) -> setComponentEnabled(infoComponent, enabled));
+            hideButton = new ToggleableButton(this, !isComponentDisabled(infoComponent), Icons.VISIBILITY_SHOW, Icons.VISIBILITY_HIDE, (widget, newState) -> setComponentEnabled(infoComponent, newState));
             down = new SortScreenButton(InfoEntry.this, Component.translatable("ftbchunks.gui.move_up"), Icons.UP, (widget, button) -> move(false, isShiftKeyDown()));
             up = new SortScreenButton(InfoEntry.this, Component.translatable("ftbchunks.gui.move_down"), Icons.DOWN, (widget, button) -> move(true, isShiftKeyDown()));
             configButton = new SimpleButton(InfoEntry.this, Component.translatable("gui.settings"), Icons.SETTINGS, (widget, button) -> {
@@ -169,7 +170,7 @@ public void addWidgets() {
         public void alignWidgets() {
             down.setPosAndSize(6, height / 6 + 1, 6, 8);
             up.setPosAndSize(6, height / 6 + 11, 6, 8);
-            hideButton.setPosAndSize(width - 18, height / 6, 12, 12);
+            hideButton.setPosAndSize(width - 18, height / 6 + 2, 12, 12);
             field.setPosAndSize(16, 8, width - 37, height);
             field.setPosAndSize(16, 8, width - 37, height);
             if(!infoComponent.getConfigComponents().isEmpty()) {
diff --git a/common/src/main/java/dev/ftb/mods/ftbchunks/client/gui/PointerIcon.java b/common/src/main/java/dev/ftb/mods/ftbchunks/client/gui/PointerIcon.java
index cd562e07..350773d5 100644
--- a/common/src/main/java/dev/ftb/mods/ftbchunks/client/gui/PointerIcon.java
+++ b/common/src/main/java/dev/ftb/mods/ftbchunks/client/gui/PointerIcon.java
@@ -38,7 +38,8 @@ public void draw(MapType mapType, GuiGraphics graphics, int x, int y, int w, int
         Player player = Minecraft.getInstance().player;
         graphics.pose().pushPose();
         graphics.pose().translate(x + w / 2f, y + h / 2f, 0F);
-        graphics.pose().scale(2f, 2f, 2f);
+        float scale = mapType == MapType.LARGE_MAP ? 2.5F : 2F;
+        graphics.pose().scale(scale, scale, scale);
         graphics.pose().mulPose(Axis.ZP.rotationDegrees(player.getYRot() + 180F));
         POINTER.draw(graphics, - w / 2, -h / 2, w, h);
         graphics.pose().popPose();
diff --git a/common/src/main/java/dev/ftb/mods/ftbchunks/client/gui/ToggleVisibilityButton.java b/common/src/main/java/dev/ftb/mods/ftbchunks/client/gui/ToggleVisibilityButton.java
deleted file mode 100644
index 7a3e9571..00000000
--- a/common/src/main/java/dev/ftb/mods/ftbchunks/client/gui/ToggleVisibilityButton.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package dev.ftb.mods.ftbchunks.client.gui;
-
-import dev.ftb.mods.ftblibrary.icon.Icons;
-import dev.ftb.mods.ftblibrary.ui.Panel;
-import dev.ftb.mods.ftblibrary.ui.SimpleButton;
-import dev.ftb.mods.ftblibrary.ui.Theme;
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.network.chat.Component;
-
-import java.util.function.Consumer;
-
-public class ToggleVisibilityButton extends SimpleButton {
-
-    private static final Component TOGGLE_ON = Component.translatable("ftbchunks.gui.toggle_visibility_on");
-    private static final Component TOGGLE_OFF = Component.translatable("ftbchunks.gui.toggle_visibility_off");
-
-    private boolean visible;
-
-    private ToggleVisibilityButton(Panel panel, boolean defaultState, Callback c) {
-        super(panel, Component.empty(), defaultState ? Icons.ACCEPT : Icons.REMOVE_GRAY, c);
-        visible = defaultState;
-    }
-
-    public static ToggleVisibilityButton create(Panel panel, boolean defaultState, Consumer<Boolean> newState) {
-        return new ToggleVisibilityButton(panel, defaultState, (widget, button) -> {
-            ToggleVisibilityButton visibilityButton = (ToggleVisibilityButton) widget;
-            visibilityButton.visible = !visibilityButton.visible;
-            widget.setIcon(visibilityButton.visible ? Icons.ACCEPT : Icons.REMOVE_GRAY);
-            newState.accept(visibilityButton.visible);
-        });
-    }
-
-    public boolean isVisible() {
-        return visible;
-    }
-
-    @Override
-    public Component getTitle() {
-        return visible ? TOGGLE_ON : TOGGLE_OFF;
-    }
-
-
-    @Override
-    public void drawIcon(GuiGraphics graphics, Theme theme, int x, int y, int w, int h) {
-        super.drawIcon(graphics, theme, x, y, width, height);
-    }
-}
diff --git a/common/src/main/java/dev/ftb/mods/ftbchunks/client/gui/WaypointEditorScreen.java b/common/src/main/java/dev/ftb/mods/ftbchunks/client/gui/WaypointEditorScreen.java
index a4dfd2b3..e279ce8b 100644
--- a/common/src/main/java/dev/ftb/mods/ftbchunks/client/gui/WaypointEditorScreen.java
+++ b/common/src/main/java/dev/ftb/mods/ftbchunks/client/gui/WaypointEditorScreen.java
@@ -18,6 +18,7 @@
 import dev.ftb.mods.ftblibrary.ui.SimpleButton;
 import dev.ftb.mods.ftblibrary.ui.TextField;
 import dev.ftb.mods.ftblibrary.ui.Theme;
+import dev.ftb.mods.ftblibrary.ui.ToggleableButton;
 import dev.ftb.mods.ftblibrary.ui.input.Key;
 import dev.ftb.mods.ftblibrary.ui.input.MouseButton;
 import dev.ftb.mods.ftblibrary.ui.misc.AbstractButtonListScreen;
@@ -88,7 +89,7 @@ private void computeWaypointTextWidth() {
 
     private void toggleAll(boolean collapsed) {
         boolean allOpen = this.collapsed.values().stream().noneMatch(b -> b);
-        //Don't try and re-render if everything is already open
+        // Don't try and re-render if everything is already open
         if (allOpen && !collapsed) {
             return;
         }
@@ -246,7 +247,7 @@ public RowPanel(Panel panel, WaypointImpl wp) {
 
         @Override
         public void addWidgets() {
-            add(hideButton = ToggleVisibilityButton.create(this, !wp.isHidden(), hidden -> wp.setHidden(!hidden)));
+            add(hideButton = new ToggleableButton(this, !wp.isHidden(), (widget, newState) -> wp.setHidden(!newState)));
 
             add(nameField = new TextField(this).setTrim().setColor(Color4I.rgb(wp.getColor())).addFlags(Theme.SHADOW));
 
@@ -280,8 +281,8 @@ public void setWidth(int newWidth) {
 
                 int yOff = (this.height - getTheme().getFontHeight()) / 2 + 1;
 
-                hideButton.setPosAndSize(farRight - 8 - 16, 1, 12, 12);
-                deleteButton.setPosAndSize(farRight - 8, 1, 12, 12);
+                hideButton.setPosAndSize(farRight - 8 - 16, 3, 12, 12);
+                deleteButton.setPosAndSize(farRight - 8, 3, 12, 12);
 
                 distField.setPos(hideButton.getPosX() - 5 - distField.width, yOff);
 

From 54cc9d77ed6668f79185966de00369532c3770d5 Mon Sep 17 00:00:00 2001
From: Des Herriott <des.herriott@gmail.com>
Date: Sun, 3 Nov 2024 17:49:38 +0000
Subject: [PATCH 3/7] fix: do a shutdown() on MapManager before any startUp()

Necessary if player is switching servers, e.g. with Velocity proxy or similar

https://github.com/FTBTeam/FTB-Mods-Issues/issues/1377
---
 .../java/dev/ftb/mods/ftbchunks/client/map/MapManager.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/common/src/main/java/dev/ftb/mods/ftbchunks/client/map/MapManager.java b/common/src/main/java/dev/ftb/mods/ftbchunks/client/map/MapManager.java
index c7d54620..89a32ee5 100644
--- a/common/src/main/java/dev/ftb/mods/ftbchunks/client/map/MapManager.java
+++ b/common/src/main/java/dev/ftb/mods/ftbchunks/client/map/MapManager.java
@@ -131,6 +131,10 @@ public static Optional<MapManager> getInstance() {
 	}
 
 	public static void startUp(UUID serverId) {
+		// Ensure if existing manager instance is cleaned up first
+		// Necessary if player is switching servers, e.g. with Velocity proxy or similar
+		shutdown();
+
 		Path dir = Platform.getGameFolder().resolve("local/ftbchunks/data/" + serverId);
 		if (Files.notExists(dir)) {
 			try {

From 6b7083709764e04da7b3cfd6199a11680f94c0fa Mon Sep 17 00:00:00 2001
From: Des Herriott <des.herriott@gmail.com>
Date: Mon, 4 Nov 2024 08:37:09 +0000
Subject: [PATCH 4/7] fix: move admin button on chunk claim screen up a pixel

It's a little taller than most icons, this aligns it better
---
 .../java/dev/ftb/mods/ftbchunks/client/gui/ChunkScreen.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/src/main/java/dev/ftb/mods/ftbchunks/client/gui/ChunkScreen.java b/common/src/main/java/dev/ftb/mods/ftbchunks/client/gui/ChunkScreen.java
index 156c4933..d5222957 100644
--- a/common/src/main/java/dev/ftb/mods/ftbchunks/client/gui/ChunkScreen.java
+++ b/common/src/main/java/dev/ftb/mods/ftbchunks/client/gui/ChunkScreen.java
@@ -173,7 +173,7 @@ public void addWidgets() {
         @Override
         public void alignWidgets() {
             removeAllClaims.setPosAndSize(2, 2, 12, 12);
-            adminButton.setPosAndSize(18, 2, 12, 12);
+            adminButton.setPosAndSize(18, 1, 12, 12);
 
             closeButton.setPosAndSize(width - 16, 2, 12, 12);
             mouseReferenceButton.setPosAndSize(width - 32, 2, 12, 12);

From 09a6466ea4e50f342a8d814f60f0c39de67bfeb3 Mon Sep 17 00:00:00 2001
From: Des Herriott <des.herriott@gmail.com>
Date: Mon, 4 Nov 2024 10:10:39 +0000
Subject: [PATCH 5/7] build: version -> 2101.1.3, changelog updated

---
 CHANGELOG.md      | 8 ++++++++
 gradle.properties | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca699bda..6a6aa170 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2101.1.3]
+
+### Changed
+* Overhauled and cleaned up many icon textures
+
+### Fixed
+* Do some extra client-side map init checks which should resolve some issues with clients switching server, using technologies like Velocity proxy
+
 ## [2101.1.2]
 
 ### Added
diff --git a/gradle.properties b/gradle.properties
index 635ad193..0776511f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ readable_name=FTB Chunks
 maven_group=dev.ftb.mods
 mod_author=FTB Team
 
-mod_version=2101.1.2
+mod_version=2101.1.3
 minecraft_version=1.21.1
 
 # Deps

From fc9a834d34e05a162cd8f1e8e2aecb99c36e1938 Mon Sep 17 00:00:00 2001
From: Des Herriott <des.herriott@gmail.com>
Date: Mon, 4 Nov 2024 15:24:21 +0000
Subject: [PATCH 6/7] build: depend on ftb library 2101.1.5

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 0776511f..d2c4b700 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,7 +21,7 @@ fabric_api_version=0.102.1+1.21.1
 fabric_api_version_range=>=0.100.1+1.21
 architectury_api_version=13.0.6
 
-ftb_library_version=2101.1.4
+ftb_library_version=2101.1.5
 ftb_teams_version=2101.1.0
 
 curseforge_id_forge=314906

From 6f65a2fbea6e73e7d0cb9487af02c798113e62b5 Mon Sep 17 00:00:00 2001
From: UnRealDinnerbone <unrealdinnerbone@gmail.com>
Date: Mon, 4 Nov 2024 14:00:26 -0600
Subject: [PATCH 7/7] Update block colors

---
 .../main/java/dev/ftb/mods/ftbchunks/ColorMapLoader.java  | 1 +
 .../assets/minecraft/ftbchunks_block_colors.json          | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/common/src/main/java/dev/ftb/mods/ftbchunks/ColorMapLoader.java b/common/src/main/java/dev/ftb/mods/ftbchunks/ColorMapLoader.java
index 5d47d184..73fa144a 100644
--- a/common/src/main/java/dev/ftb/mods/ftbchunks/ColorMapLoader.java
+++ b/common/src/main/java/dev/ftb/mods/ftbchunks/ColorMapLoader.java
@@ -66,6 +66,7 @@ protected void apply(JsonObject object, ResourceManager resourceManager, Profile
 						|| block instanceof FireBlock
 						|| block instanceof ButtonBlock
 						|| block instanceof TorchBlock && !(block instanceof RedstoneTorchBlock)
+						|| block instanceof StainedGlassPaneBlock
 				) {
 					BLOCK_ID_TO_COLOR_MAP.put(id, BlockColors.IGNORED);
 				} else if (block instanceof GrassBlock) {
diff --git a/common/src/main/resources/assets/minecraft/ftbchunks_block_colors.json b/common/src/main/resources/assets/minecraft/ftbchunks_block_colors.json
index c3dc70e3..7c65422e 100644
--- a/common/src/main/resources/assets/minecraft/ftbchunks_block_colors.json
+++ b/common/src/main/resources/assets/minecraft/ftbchunks_block_colors.json
@@ -65,5 +65,11 @@
 	"lily_pad": "#208030",
 	"dead_bush": "#A89061",
 	"glass": "#CCE5E4",
-	"cherry_leaves": "#b390a4"
+	"cherry_leaves": "#b390a4",
+	"glass_pane": "ignored",
+	"comparator": "ignored",
+	"repeater": "ignored",
+	"end_rod": "ignored",
+	"chain": "ignored",
+	"lever": "ignored"
 }
\ No newline at end of file