From b6a80621c8419baeb6fce14c293491b95d30de58 Mon Sep 17 00:00:00 2001
From: ademant <ademant@ademant.de>
Date: Fri, 8 Feb 2019 11:34:08 +0100
Subject: [PATCH] fix #2 - some ores in techic are overriden

---
 minerdream/ores.txt                               |   9 +++++----
 minerdream/textures/minerdream_diamond_nugget.png | Bin 0 -> 175 bytes
 .../textures/minerdream_diamond_poorore.png       | Bin 0 -> 201 bytes
 minerdream/textures/minerdream_iron_nugget.png    | Bin 0 -> 128 bytes
 minerdream/textures/minerdream_iron_poorore.png   | Bin 0 -> 170 bytes
 textures/minerdream_dust.png                      | Bin 148 -> 0 bytes
 textures/minerdream_potion_lesser.png             | Bin 242 -> 0 bytes
 7 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 minerdream/textures/minerdream_diamond_nugget.png
 create mode 100644 minerdream/textures/minerdream_diamond_poorore.png
 create mode 100644 minerdream/textures/minerdream_iron_nugget.png
 create mode 100644 minerdream/textures/minerdream_iron_poorore.png
 delete mode 100644 textures/minerdream_dust.png
 delete mode 100644 textures/minerdream_potion_lesser.png

diff --git a/minerdream/ores.txt b/minerdream/ores.txt
index fece785..7611145 100644
--- a/minerdream/ores.txt
+++ b/minerdream/ores.txt
@@ -23,11 +23,12 @@ silver,3,A9BEC2D0,,,moreores:mineral_silver,,1,2,1,1,3,,3,,,,,3,3,14,3,2,-31000,
 potassium,1,9b9b9bD0,,,,,1,3,1,1,,1,3,,,,,3,3,12,7,3,-31000,420,1,1,2,,,,,,1,,,,,,,
 nickel,2,A5AA8CD0,,,,,1,2,1,1,2,,2,,,,,3,3,13,7,3,-31000,-40,1,1,4,1,1,1,1,1,1,,,1,1,1,1,1
 flint,1,,,,,default,,,,,,,,,,,,,,,,,,,,,,1,1,1,1,1,,,,1,1,1,1,1
-tin,2,,,,,technic,,,,,2,,,,,,,3,3,,,,,,,,,,,,,,,,,,,,,
-gold,3,,,,,default,,,,,3,,,,,,,3,3,,,,,,,,,,,,,1,1,,,,,,,
-copper,2,,,,,default,,,,,2,,,,,,,3,3,,,,,,,,,,,,,,1,,,,,,,
+tin,2,,,,,technic,,,,,2,,3,,,,,3,3,,,,,,,,,,,,,,,,,,,,,
+gold,3,,,,,default,,,,,3,,3,,,,,3,3,,,,,,,,,,,,,1,1,,,,,,,
+copper,2,,,,,default,,,,,2,,3,,,,,3,3,,,,,,,,,,,,,,1,,,,,,,
 steel,2,,,,,default,,,,,2,,,,,,,,3,,,,,,,,,,,,,1,1,,,,,,,
-diamond,3,,,,,,,,,,3,,,,,,,,,,,,,,,,,,,,,1,1,,,,,,,
+iron,2,,,,,default,,,,,2,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,
+diamond,3,,,,,,,,,,3,,3,,,,,,,,,,,,,,,,,,,1,1,,,,,,,
 mese,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,1,,,,,,,
 stainlesssteel,2,,,,,,,,,,2,,,,,,,,,,,,,,,,,1,1,1,1,1,1,,,1,1,1,1,1
 brass,,baa52c,,,,,,,,3,,,,,,,,3,3,,,,,,,,,,,,,,,,,,,,,
diff --git a/minerdream/textures/minerdream_diamond_nugget.png b/minerdream/textures/minerdream_diamond_nugget.png
new file mode 100644
index 0000000000000000000000000000000000000000..0068826525711233071341a35b4b071350cf981e
GIT binary patch
literal 175
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Wu7jMAr*|t3rr<gD{t~D`1HB8
zPw9RA&%fr|ll|}ea{oVlmHpqCh1Eh}?fu%5i~iqq=l^?tcZpn1gG=`1`iGw`{dbXO
z*iu`6bnor|!sqAwlHXYWzJ9Cb<bR*j)8DC|6n_|P{+?Yj;lfS6i#}o;TsQcy`9vFV
ZF-*E{wNJ}SMGxo#22WQ%mvv4FO#qnnN5lXC

literal 0
HcmV?d00001

diff --git a/minerdream/textures/minerdream_diamond_poorore.png b/minerdream/textures/minerdream_diamond_poorore.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6f4890e5c2711c425099a147dcc6d0776c415a1
GIT binary patch
literal 201
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Y$ZW{!3?257Q?(ycP$`Q=jq}Y
zQo)$ak*dHO7<%~G|NqVZ|Eu3@3k%8R=v-sHojJ~C*?f6{7f1g8zxaRO!t5I#{?{M=
z|9@=)i{Qzh|K(R)`Sw1X!~Df#Z3QNy3xD0E?Q7U}t9<)!Uu45uzVZHRb%AZi58poK
xFCX+sWyb1;gHCfRB0l{THjtBPI5zRQ3d5?B$!c7coW>v*dAj<!taD0e0st5(PR{@U

literal 0
HcmV?d00001

diff --git a/minerdream/textures/minerdream_iron_nugget.png b/minerdream/textures/minerdream_iron_nugget.png
new file mode 100644
index 0000000000000000000000000000000000000000..f52b6ccef923bc665878602432e7e4c506c12503
GIT binary patch
literal 128
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?bO)b%#>Z!dl$l!R2ZL6c&
zJg%KU83x9ZAirP+hi5m^fE;;G7srqa#$*L)11<;2Q*8l^s;=xDr!TT<9ew1mY9&Li
W3ghN&U&|~(8a-Y8T-G@yGywpg)FPb#

literal 0
HcmV?d00001

diff --git a/minerdream/textures/minerdream_iron_poorore.png b/minerdream/textures/minerdream_iron_poorore.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad7764881fd2ea75f0e3ebb3ba4ef583985aeb9c
GIT binary patch
literal 170
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa2=EDUO)OxT<f*bP*R!#)E;>HC
zBri8OG-UFm{wL)}qJU}`OM?7@862M7NCR>lJY5_^Di~Q028uQ)@Gu;>Eyvg<CgG;o
zDA<$mU;iD$111G21@1y-6NW_w*>Bk9ChTd5VUa)cSA=0rlY9r;1BTuAn1hWhc;bO(
OF?hQAxvX<aXaWG4Yci_<

literal 0
HcmV?d00001

diff --git a/textures/minerdream_dust.png b/textures/minerdream_dust.png
deleted file mode 100644
index bcaf46e03855fb9aaf163e68079a4dbdc025961f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 148
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6qCH(4Lp096J#&`JA%MZ<Vew8S
z*PEaIy;t2NCV1UHIeFoUOQ+uW)%FU$|NP^i`+>N{mt9WzCCSN2^=|rc<P6U)X2;V`
xF1{}P!IetNQfpHzbQDDyS^IeVXWlu$IQ4|=^m#wi*8;6!@O1TaS?83{1OUzoH`o9G

diff --git a/textures/minerdream_potion_lesser.png b/textures/minerdream_potion_lesser.png
deleted file mode 100644
index 3ef85014a7911a3adc7de19bea271d3cca274c63..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 242
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!M}SX=>;M1%TZ7EzCp+z|3cvOE
z$$_;CE*#u`|LVE9i4I!}ypHx302REIQF&`(_uf0?j)>ejVcFe+QVaM**9%Bgaq)Na
z2xV~c#jx{SnrHhTXeMJxkY6x^!?PP{Ku(0Gi(`ny<<j$!d<_abEEiTi=DP9d*x&qB
z6B(|(_;c3#_7WHSm9N}Nx5W0RFHfA)BNj9_;qIEowU-tCM15S8ueVxUuPJx`5s`y}
os*FxMj&c~ee5_P?`ueT#lwuZ*(CfSkKsy*bUHx3vIVCg!0CTQj1ONa4