From ae0ca35fdbf24deaeda040b5a3eb138c3de397a6 Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Fri, 10 Aug 2018 18:15:04 +0200
Subject: [PATCH] Fiddling with git to fix broken commit.

---
 CHANGELOG.md                                  |   4 ----
 .../textures/gui/crafting_monitor.png         | Bin 1837 -> 0 bytes
 .../textures/gui/crafting_preview.png         | Bin 1730 -> 1829 bytes
 3 files changed, 4 deletions(-)
 delete mode 100755 src/main/resources/assets/refinedstorage/textures/gui/crafting_monitor.png

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42a65ad11..9a983407f 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,9 @@
 # Refined Storage Changelog
 
-<<<<<<< HEAD
 ### 1.6.4
 - Rewrote autocrafting again (raoulvdberge)
 - Reworked the Crafting Monitor (raoulvdberge)
-- Optimized image sizes and improved image compression (samtrion)
 
-=======
->>>>>>> parent of fea420aa... Image sizes optimized (#1944)
 ### 1.6.3
 - Fixed crash with Wireless Fluid Grid (raoulvdberge)
 - Fixed Reborn Storage crafting being slower than normal (raoulvdberge)
diff --git a/src/main/resources/assets/refinedstorage/textures/gui/crafting_monitor.png b/src/main/resources/assets/refinedstorage/textures/gui/crafting_monitor.png
deleted file mode 100755
index 4c4a2379fb338ab8a51b0df48f2404fb56890cd3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1837
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd
zfKP}kP~6<yJTx@4v9YncyZhL&W4CYL{{R0!P<#}OhQP27f#Yol|AI0~NswPKFxih}
zz!3bMT@@JNoCO|{#S9F58$g)R@AO|gpdfpRr>`sfJr)Te4I{p%ZPh>_$r9IylHmNb
zlJdl&REC1Y%)Ao4ywnl}6FmbxBg2mhnNt}UnCd-U978JN-rl*`CFLm4cJbt~-uM5H
zsJ)U`f6(hOb>^~j$DJJGd!8mHEc7hf9kZ=;*Ol$D+df;Fa^z^&{{LLQ_W<vM>Z$wo
zonl?bQ2C1qSg0vfPX`uW3@E$?=>z@ErBzX{sxEPUcpY(fy4ByyUs-^PZtm6rsfB=_
z4;BN(8u*$2*o4hz@AwnQ1QGvqHy>13g21NoNFceRJ}fV(@6vNdrTQsgVTOj9@6iwz
zL&KX`F(5N<e(A3Nb7wvNvL{6UfD{gQp}G<`Pl4el^S$cjXZHTDxx_o6zW4i!nk~Xm
z`y9UMaYLC54}R`HEBkhdq{4T->fUnenbrDpOPHVdR$uvHw7(qc8-^42Qeoa<_;UA2
z$XpZVC-+j<f6P-ae!p~bUc;WueyR9p-~C{QB85@IzS(nDO-^et1)2r4_qD#mySVRC
z@5_z9$638(JCQ%zy?6hGd)6@HQ{Hca8N%=@uXwfJEXHdb3=KCK;&mBrf8BXHg#W{H
z_49EH*D^o&CAQ{L?aNbAay!EqjE=J@6z9;MI?Sjy{l1mgItSA(l{An;Jzf1=);T3K
F0RRN37G3}V

diff --git a/src/main/resources/assets/refinedstorage/textures/gui/crafting_preview.png b/src/main/resources/assets/refinedstorage/textures/gui/crafting_preview.png
index 29227bc9bcc90d5e4ff339164ae11aa95ab79c74..eda64fa1cb39ef45ed9c1113c99569640667eeca 100755
GIT binary patch
literal 1829
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(kgt&J
z5#-CjP^HGe(9pub@Czu^@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=m>B|mLR^6g%+1X!
z^z=eQLwik4=UP}aHa2#5cON@;?Dp;3|Ns97Di{T$AuwD+VE#NCCQzm-3GxdDruLBx
z7=pjEs{-Shv%n*=n1O+B3kWlAG^^493bL1Y`ns||;$Rmumsu9%04!4&BuiW)N`mv#
zO3D+9QW**oGxJLH@={9_O!N%&j0`_2WKLyZVDk2KaSW-5dwcVum$IXX>&0!0-9G>S
ze>*IcZ;>7Ax+e?Y-{L8LbAji|rp3%R`;uSZGQ8dQ_S#m}4PR~lzfI=SY3QF9tM{7S
z;r3@xp$7#MUY7w&!Uxh1o?eN)URhk2zwZn8gU|b`&R_ezzy9UFp8YZPCh@>nMFu;!
z$~ENJGTf|!3O3BC1(lZ!40TL<=I?Z8ND4h4tq{%cuuTrCKp{OIRNSJ06KlURq`bBj
zSD3$e-sZuqOY}jNbt(6Q?~?x+w(!6`;jr#D#MdAZh3jvjf%J<hhH1mu^|Q<vkIj$y
zn!TI(%<={4kKb@FC}r4`%RC`hx*_K_L&|M7h1+HfH@7jK*v9LyEtdqTZLAymuZ13F
zJFstm?=GR7<NtnH&2RWv9{1`h%Z&Sf6fcM*$n*bal8Aq@HH?wLfHBOM@z#HVFWCh(
mpR517XPC@yD80Jw@eiiChwGAM{)AiyIo{LN&t;ucLK6Vf%?m;R

literal 1730
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd
zfKP}kP~6<yJTx@4v9YncyZhL&W4CYL{{R0!P<#}OhQP27f#Yol|AI0~NswPKFxih}
zz!3bMT@@JNoCO|{#S9F5TS1sHxp2k_pdfpRr>`sfJr)Te4I{p%ZPh>_$r9IylHmNb
zlJdl&REC1Y%)Ao4ywnl}6FmbxBg2mhnNt}Um_$5X978JN-rhXubvQtx<zmF@+W+c(
z&&npeTJ^zOeCB7x9!<v`?Z<q#)!vV~-M_7N_ttGJ+wOh7Z^zfj`r+cur<?vUUYRG4
zNQMnD*MVhMgM7pG;PTk#XOHfEyf~g={{O4hW%vI7UHZHH&)Z)YJ_;h#gIFiler8B{
z&UoS+s4xV9CvUXD^aqX)b<gH8c3idTcPNu<cw++=WngePw~q<RM4~1{gUqPbb-1^9
z-sW_MB-8WC6XvojSo1^GOxV00Ni~f5<XR=erq6NQ6TYu_{zkGP;_PP*tZsp+htNAq
zfzH`;o#~0~E6Zv&g|N>yOgBO1z*JfO1{L*az#$LhocBu^uHRl6&9MLc5B3E{2qin$
zal<(d>s~`WSjDKvc%$#Wmo>w_`l74X%h)aUvCgfXU&|Q6t`IHVkdw=>X)EK2Yiv~G
cEPeZ1{8jIgtXD2y3PJAiboFyt=akR{0MB0QSO5S3