From 10292b7282905c176bf6b800d7c4193461ff8420 Mon Sep 17 00:00:00 2001
From: KaadmY <kaadmy@gmail.com>
Date: Thu, 18 May 2017 08:42:31 -0700
Subject: [PATCH] Change how bronze is made, fix #61

---
 mods/crafting/recipes.lua                     |   6 +++---
 mods/default/craftitems.lua                   |  14 ++++++++++++++
 .../default/textures/default_ingot_copper.png | Bin 0 -> 296 bytes
 .../default/textures/default_ingot_copper.xcf | Bin 0 -> 2117 bytes
 mods/default/textures/default_ingot_tin.png   | Bin 0 -> 461 bytes
 mods/default/textures/default_ingot_tin.xcf   | Bin 0 -> 1273 bytes
 mods/default/textures/default_lump_tin.png    | Bin 484 -> 484 bytes
 mods/default/textures/default_lump_tin.xcf    | Bin 1282 -> 1282 bytes
 8 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 mods/default/textures/default_ingot_copper.png
 create mode 100644 mods/default/textures/default_ingot_copper.xcf
 create mode 100644 mods/default/textures/default_ingot_tin.png
 create mode 100644 mods/default/textures/default_ingot_tin.xcf

diff --git a/mods/crafting/recipes.lua b/mods/crafting/recipes.lua
index 28ee7a7..c151379 100644
--- a/mods/crafting/recipes.lua
+++ b/mods/crafting/recipes.lua
@@ -100,10 +100,10 @@ crafting.register_craft(
 
 crafting.register_craft(
    {
-      output = "default:lump_bronze 2",
+      output = "default:ingot_bronze 2",
       items = {
-         "default:lump_tin 2",
-         "default:lump_copper 5",
+         "default:ingot_tin 2",
+         "default:ingot_copper 5",
       }
 })
 
diff --git a/mods/default/craftitems.lua b/mods/default/craftitems.lua
index 92c4bed..2042b21 100644
--- a/mods/default/craftitems.lua
+++ b/mods/default/craftitems.lua
@@ -110,6 +110,20 @@ minetest.register_craftitem(
       inventory_image = "default_ingot_carbon_steel.png",
 })
 
+minetest.register_craftitem(
+   "default:ingot_copper",
+   {
+      description = "Copper Ingot",
+      inventory_image = "default_ingot_copper.png",
+})
+
+minetest.register_craftitem(
+   "default:ingot_tin",
+   {
+      description = "Tin Ingot",
+      inventory_image = "default_ingot_tin.png",
+})
+
 minetest.register_craftitem(
    "default:ingot_bronze",
    {
diff --git a/mods/default/textures/default_ingot_copper.png b/mods/default/textures/default_ingot_copper.png
new file mode 100644
index 0000000000000000000000000000000000000000..95eef5a06750b3bc455d212ea949a1a5d62573f8
GIT binary patch
literal 296
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPts}R2?SI=i>ZJ>~BW=KSdbAE1aYF-JD%fR4Vl$uzQ
znxasiS(2gP?&%wlqL<1J6z}nLaSX9Iotz-S+S4K;Auavi{n>omYB5)SZpE{_l42ZZ
z!{rPO3=ICbo3(VhoRw(klsS9s*s=eKamfdlS?YRBet2_r{|vU*Ck!QCpIBJY&N=_=
zi&-0Yc617z{gBaODJ^N!Uga3nBft8`Gv)IV=jPd-KGC8tWiDUY7Azw+)n`hEn`h^a
fAen_zJPa8a#ASj`B~1Gy4sx)ktDnm{r-UW|lp$fI

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_ingot_copper.xcf b/mods/default/textures/default_ingot_copper.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..904dc9fe284df52964ce5aead8acff9936ee82b2
GIT binary patch
literal 2117
zcmd5+O=}xh6rJ~;<tYB3?pNrd&{-7MUN|H?=nqgArYHkm2@1xb$dWS1))+~l@lFU_
zfmS7p;)k{IMmujL0@`UE&>zSTF;Z|fujgLPSR?8}LpOc!-rRHUxibfi&XoPrGxtrQ
z<d*!CqJy;+ZK^-V76QkY*y+sgjzb&kE9@2QAF!W9HR-;FejnG(GH$z92u@Fn)dsLb
z%`bkc74wbavHPpvc;)W@>>W^Ni>3Z)zFgcZ*ZgDRpcc+fy>Wh0bnC&1f4sZ4Qz{pN
zlc47A@MW)7ewlZlJ$=UOf#P}8+QsP02S($*`_Bc9zNw$(3x2iiK98RT^86t(;`Uxw
z{f6sT3$KcGnh#2)da-eDkf#4m&6(v<`W>Pr`i_&5F~T)|NA#<1W%7kexfZ;x9=nC$
z?3`q=b`>?fCX1bpYMOZ*)wnp{ChE0By`HEy67^=H{tPwUH(rlW(DP`;f01wIkWN{P
z>exTD^0#G9{z3SAn>H&pJThq`>}1sI9hrXLXsLzy*c;hi>BtBZ>VX(cn%eZN?fnuH
zqIs)d5HmV5B#=!^*}LAzXd{hi%E7d$(bWUMunC1|egvThL`dlW)OIdakl*PMqZytf
z4Nfa;$Zf6Qz$&Y>XezyG!%;ug4@Xwo$bDw+zT0kR7Vg_!+uqNx*(-514YX-n+a@a-
zSOmBFM<TizLs$lEzTGwYLSBeK(geEt3NQ?K0_NNLiU<iknP;hj{7!cn%>v?ZvUzH2
zb+K%|`!@A9>@Li2&&}tu+3kh-Y|dtPx7mC}R3@G_S!=T|VnTSg`a5EB+eSkmJ$9eX
z8GR@Zg(oXhPot|VfT0J4@ZdhHD?~`>$vsOI<aav9Xyy@zligEWtHWjYxr5X}n1lO$
zN7*$eWz){8edIj0E6%!=&W07vrVSlS#RiCVG!$xO>C3j1r}agisP%t{P#kC2NxdUe
zScwRw-p{F+OMM{xFC#P*!$~I@ArPXIh!C*s+(+nIUW<+#PCFc-Az;|y369W^2njvC
zN0utcIYL0Q4skg7JyKh%>*e?OsS&ynH`7)kLcpSxh!C)B-ACwBUW%5a35w7SVA$db
zj?fJe5_&SvQUy6j2x!(K4kw$ZwpN$R=07z;V=<oKqqK++2w@Tt0>&4KzFriefgA`U
p$5X=*8Uu!gCpbc5A|&+Wo}~(Mju6m{$8oZIYHKxEcK=@@^cOXlrwRZ7

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_ingot_tin.png b/mods/default/textures/default_ingot_tin.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f1b314511dbf19de8e1dd3526b138935b0f8199
GIT binary patch
literal 461
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPts}R4s%(Er8zW{|~GeaUuobz*YQ}arITm}Z`qSVBa
z)D(sC%#sWRcTeAd6une-1_nk$PZ!4!i_=Rdt@me2lsInRex_mb&*XGfi5nXGdJm<w
zChg2fxRbUp!6>kV<z!#F^5)w*Z~irEo9X1a_3mSum|0M~{-t01y9tK#epKFn|NZAn
ziR2q9ML7~bbu^T;Tlc+R&U?<ke`UqnuUZ{!a#i0F9j})%UWigwN>kj-Z1Cn<!T0hL
z;nIwU^LjO^eC;yVJ`OwcHPrs0|M~uoj!xfIy${MeK5t$WS~tz2ub^P^y{7%44-{Xl
z6=8ny-uCkDdh?ZvVSCJ!lA_M?O`hq;yC%kJVazM_WnP+-qa)@|tqhzK8kkg2`F+zi
zi35hm7ECc(n|8cvhR=Nl3mc15PY!zQ*sEdne_oNnq@^`Ba@N<Ru8T(NGH5Ja)4lro
zYd!~wHnIQO+jtljH6H)-IXlyPcWdsd-UCVYH@hd)=tvtfgF@BQ)z4*}Q$iB}<14#h

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_ingot_tin.xcf b/mods/default/textures/default_ingot_tin.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..936033bb3914296f2dcce6dd7b8088871083d09e
GIT binary patch
literal 1273
zcmZ`%O=}ua6n*baOiWB@+Vo>n=q!pP3roU<{s6m>VhULa-3Z2vlc9bDH8fciikpFf
zLdhx*++^d<F3iTAf55*Jl3+8p_daK;()7W7@7#0FojK0a^=c>fS-E0Yys9H;ZAQiT
zDV3D8ZBZq&KZW3;^_*&n>J`<?2(#}6`Ezt`xb)aexlyY*^)~f_#b+OyPO0r2*<Zc(
zv7P()>423@WA$n!*U7j|?}#~aOR?Q*pI05b)u?($J8Rn&x7?^Un)bFiGEMieWbeM)
zHR}<u7fCxbdicm_tlR$wJbKnTDV4ptYwyMHBJ%t(GU76)b+2uE_42XP;`v6U(sJ5=
z1M>90)Rb8q<?j$J`71_r#`nWtG?gutzqrlDY2AD_71@^Q<l8~2WQ5ti8euxb>p8qO
zhf{NSeGYHT;U|Rox$#;d!0+P~|1;t&L@CcGv*_ei-xfLbgZsCb)Jqr^by7>b9rb!e
zJs4<EAoYE3guO~pOC7>c4sQd{J;dJUn2^B@>@zbeYBs2Vrf||5X}D5XGEl?207!))
zwP8RG8Qc>ALnajYe*;df7TG5-GTlSK9PKDEG%{FMA)tj8$nO>`V>lWl2H^-5M(MND
z^j+W2&eHo`^mADgwlDj49ne0auND0o>SgB!-ZRn7YVK9Xg!j7|F4d*%D4rk{`qYLU
zGeO~f=rf_n&*6>LBKriorhDixN4p8nGFX?3;ky@!i?BNjpPq&<<n!rS_<RBLJ82Vs
zEXTJRbRIFk9}`mFz#C=?X$@ph+N94HG+e7|snz&S1F0~kHq_*x>m&lkOepemdSkW7
zK7oSi9?UrHCOykwT`#6D93&3H0;SIh3)e&flVTZH#40X{6e_WfQfy!-kij|;DH1Hg
H7H)|@ek6(W

literal 0
HcmV?d00001

diff --git a/mods/default/textures/default_lump_tin.png b/mods/default/textures/default_lump_tin.png
index 097dd1f766c18b437979862d7d5156070ad8b362..8d03853f404d122ac6903e04a05db7d29fa6b5b7 100644
GIT binary patch
delta 360
zcmV-u0hj*d1LOmcQwS0dCkXt04~damHh)e6K@f(&^_1f9N`&<Vd;vO3TT2pRWyO{>
zG{%Ob(Adz>x#nscDlwrlxz@s0FjfLWXb2?GtOe|O+zAv+vdQjbznR(jXN56_ee8fe
z?eIUR)_NzXlu8G<zBuE&TtjPZR+q%i3c{dFZ#a!-H`R&{Kui0kUat#)MxzlmOMf~e
z;f-IAxh%pM!}G%>Vfe|%$c<oYt*7Pr?)H(vuowAirGmJ+dHrjmh4VQXEdU$P!q(Sp
z_sv!nl7Ovb@bkS{Mw>MbCoO++nwGKI?we}G-wG!CQY#h2#yN<du`1VQwa<{wNI-$D
z0g`ZhE;_+I0AWyG$_P*_7E=<&OI1$7o%gTx3Y1c!rG2wuYz2UvcOx+M7nD-Sc~^LD
zhTd?B%w++Vd*=;+$*#}jxfv$21;^PVCbI>=+TL?BsQ|y_#*K{%Vz~bR0000<MNUMn
GLSTY6p05)C

delta 360
zcmV-u0hj*d1LOmcQwR_iIs+{}>S>W%Hh)UPP!xv0Yqdja#zL+y;0ttfbagBgC%5|o
z87f_xEWr*%a5K=^rIQsp30WO{1#vQg7MIdOyIhBOW184>=nsM9knf!To^!6yT62hw
zI8ev`1;a4h3o50`32rXWx#+lrVW@w95_=s)qYm+GnXj&UT@Qd@;OTz9F93Ys&wrXF
zYja_LKO>tBgw~p;yDOsTgZH_W!A8L#{eHNABuU~d=C&Pief#p)L<2jH%pL%f(7+}(
z94ESR3Pr#;iQ})`V>DIsa8Xj8mB%<7C%V`5D#2o3+_ocj?tzi9YpR-K$l6?hLuG;@
zoZpMdC;%WDb<!~cv|6pw2=kVU@KxmPbK8MZN(2K>?^s&_AlK6jEZqgA6mmTkwpAyd
zEs@PedX(7`S$hRwvF|e3R-MIa!)fD$#cBhv^=@1BQi30pA&sr4KOjZ`0000<MNUMn
GLSTYwFQ-ue

diff --git a/mods/default/textures/default_lump_tin.xcf b/mods/default/textures/default_lump_tin.xcf
index a71d9427bb9f2b9400f8da5fb1f6d6aaa6825f16..c1cbd058062ed05fd8dea87215377ebd8554866b 100644
GIT binary patch
delta 277
zcmXYrJqp4=5QUi}1k5D_uP~5O!Nw-X5U&x~W+9beGXa}vwo74bw(~GvA^xDS>&(V(
z-uGtSJX4wKxQ4}Lv(H*)97hCvH|`eQ0Xbv9hZpQ(bjTh&a8Ufh8F-l|<c^c}o^$nq
zzoL;#*_)414Cn$&_@|Mu6x{(ovG4VnfPzn}eA^QJJJj|Z?G7m;=`aYkF<PVn2B4r=
sJ17`ro{$VBEizXhD0QGx_U2<0156<8P)k^fHbB}zp9v`Fde4{e1C#xWi~s-t

delta 277
zcmXYrJqp4=5QUi}q{t-%uP~5O!Nw-X5U&wPv#r52g7p>yQy32*EbK|VLi|Bt*O`so
zyzkAtd0o|2hZU5U^)73faU2ow-Pl{Sd*qA(A6~GH(IR{Bz(Mf~XW(U?kOxlMd(PDd
z{)$E}Wp6%4F<=NR;h#prQuF})#M4Qi2`Kou%r`C3ze8=#(QJ`2k`7L=iP0cAa6mz^
sc2MACo{)M<T4b(1Q0hRX?9In02K0fnLoHz`x(Ct@`b<DU*L%KzALf3LWB>pF