From 467e2029e220f1a90aef2c04468a6de95089c107 Mon Sep 17 00:00:00 2001
From: PilzAdam <pilzadam@minetest.net>
Date: Mon, 18 Mar 2013 15:31:50 +0100
Subject: [PATCH] Add stonebricks

---
 mods/default/README.txt                       |   5 +--
 mods/default/init.lua                         |  17 ++++++++++
 mods/default/textures/default_cobble.png      | Bin 744 -> 589 bytes
 mods/default/textures/default_mossycobble.png | Bin 988 -> 853 bytes
 mods/default/textures/default_stone_brick.png | Bin 0 -> 744 bytes
 mods/stairs/init.lua                          |  31 +++++++++++-------
 6 files changed, 39 insertions(+), 14 deletions(-)
 mode change 100755 => 100644 mods/default/textures/default_cobble.png
 mode change 100755 => 100644 mods/default/textures/default_mossycobble.png
 create mode 100755 mods/default/textures/default_stone_brick.png

diff --git a/mods/default/README.txt b/mods/default/README.txt
index 4520dda5..15bfd96b 100644
--- a/mods/default/README.txt
+++ b/mods/default/README.txt
@@ -31,7 +31,7 @@ Cisoun's WTFPL texture pack:
   default_chest_lock.png
   default_chest_side.png
   default_chest_top.png
-  default_cobble.png
+  default_stone_brick.png
   default_dirt.png
   default_grass.png
   default_grass_side.png
@@ -39,7 +39,6 @@ Cisoun's WTFPL texture pack:
   default_jungletree_top.png
   default_lava.png
   default_leaves.png
-  default_mossycobble.png
   default_sand.png
   default_sapling.png
   default_sign_wall.png
@@ -60,6 +59,8 @@ Originating from G4JC's Almost MC Texture Pack:
   default_torch.png
   default_torch_on_ceiling.png
   default_torch_on_floor.png
+  default_cobble.png
+  default_mossycobble.png
 
 VanessaE's animated torches (WTFPL):
   default_torch_animated.png
diff --git a/mods/default/init.lua b/mods/default/init.lua
index a0b1e798..e4a76b46 100644
--- a/mods/default/init.lua
+++ b/mods/default/init.lua
@@ -531,6 +531,15 @@ minetest.register_craft({
 		{'default:obsidian_shard', 'default:obsidian_shard', 'default:obsidian_shard'},
 	}
 })
+
+minetest.register_craft({
+	output = 'default:stonebrick',
+	recipe = {
+		{'default:stone', 'default:stone'},
+		{'default:stone', 'default:stone'},
+	}
+})
+
 --
 -- Crafting (tool repair)
 --
@@ -827,6 +836,14 @@ minetest.register_node("default:stone_with_mese", {
 	sounds = default.node_sound_stone_defaults(),
 })
 
+minetest.register_node("default:stonebrick", {
+	description = "Stone Brick",
+	tiles = {"default_stone_brick.png"},
+	is_ground_content = true,
+	groups = {cracky=3, stone=1},
+	sounds = default.node_sound_stone_defaults(),
+})
+
 minetest.register_node("default:dirt_with_grass", {
 	description = "Dirt with Grass",
 	tiles = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
diff --git a/mods/default/textures/default_cobble.png b/mods/default/textures/default_cobble.png
old mode 100755
new mode 100644
index bc79696c68bb7e7ae134065660b54a727cb515ae..d68503cbe68ebf8d8b2a2cf0ba53d3469bd034a5
GIT binary patch
delta 575
zcmV-F0>J&~1<eGI8Gix*005AYXf^-<00d`2O+f$vv5yP<VFdsH010qNS#tmY3lRVS
z3lRZ-WM7d0000McNliru+XMv)6*U^-w_gAN02y>eSaefwW^{L9a%BKeVQFr3E>1;M
zAa*k@H7+?oJh00E00Fm2L_t(IPfe2Bio!q;MCU6NjS!8yUVoyA8t)KLkmys$lV%ge
z>ne&MB7UGJHY-~XV`rwPs=7wyy6$i|tW+x9Za0ded_J%1daKo9^M1eIZnyDx{QVEA
z)9Dz7(d+eo-*6m9x`FTe5YcSgwrQHwwOUP;N+l}3kH;gF=kuAO-ELc!wcT#H-)uGq
zg8{tMxKNMB<A3>lhGB>ZsMqWCag)u{>Gbmkbd5#>WgIFh6u@e=V$Ei=9E*WeDiz1E
zSY0d@h%<0v33XPSeB3ht9&o%|E~(4qGR8QCNMWnr?^ml;xYz47?geaKuh-pf#|0Q!
znSny_BR~=07<GU{=w&d#eKD^#o6T%C;|2EneJ+=id4GUdLIGC5oy+Ay42ln#4@xXa
zx1@<_2@Nj9q0=-ixd4-p1wruj2NZZX^Z}>obei`q6bi`<RK;QuMFK!XMmii0n8rHe
zPN!4UKr(~;7sv|*6d@B<x+NJ2jUG&9G8x4*e0ZKGUU(1=z<fUEGL$3^aE?j#la#QI
z6I^oeNjQmuOxQt(KA9&;3EzmYl0E-z`gm6WB~xLEP5OvyG#X7NlNYY(bKo+_m>2*6
N002ovPDHLkV1k>X^X32m

delta 731
zcmV<10wn#-1n32j8Gi-<001BJ|6u?C00v@9M??Vs0RI60puMM)00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-mq3l|&_Gjik>0007YNkl<ZILl3v&2HO96otP_vN6dS
zY8Xc;B+)>N0zsTzS6voGm(9BG)3?aFZ_qdB&$`<#YAY*SrhfxlwdT)~3Y(J!9U*r)
zbLY%=&b{*6ukR8f0Eh^ZWdNjMU>F95lprMlLJVl#05EnzZl<$e_CroqYPJu;_3eho
z?1=yTmVGMdZ|=AYJBGaEF*{=S0NY35dhPh?WJYmwb4#A(yk9N>sH%D-Afc*iBmnyB
z543HI0M0q)^M5&ge?<X_-S(a#CF;6HYejl`lu{zZh>ZToML>iQBR&MaY+4Fc*Swfc
ziSd5)86t^MK-D!TU5B&wAOfJ3qR|?y6h+fCkP=!eKGo+0&RR^{j)F>2mL==;8d4&q
zL~(g_#p_qEkWBDCKpOoIKvR!-IBN+p0<ha|0a)MNF@OE(2Z}~1`o2f9jFb}IIZ{e|
z-Mys0b_Xi0H2_~cdq#|r@4x$&#k`~V`R$KPOpAAx^n~SO0AT<0+kU&Fs%y%sLMb)k
z0|FH9`wjFP1Q|~N9|Dcmz!Bff41fLo52npwvq!LqjCt_EQJgK8{J+})P*&9;<={Q9
zPfuwkhJP2+DZ?<}ox>P|_YP|<0L4kyAy4CR)-qo##=ufywOUaQk&BB9Ce66QtJM`E
z@GuOVbRC6vj)^e<OpGDMh__=Nr*GcSRA45P!)QNWG-oYE2$2xt;qp_(c+cu`ML9Ph
z!hAL(#z+F(W`lYD9A_=rqFbP}La9-?nV5sv*;LuTXsuaYUUGJRj<ptNEr{T(Wnv7)
z?|=M>s!Hb5mi~4_(=><(-g_j=2_X>TJw8TsUE{qc%X5y8k2ybI@(~`DM7vLnraS-u
N002ovPDHLkV1gXhOLqVO

diff --git a/mods/default/textures/default_mossycobble.png b/mods/default/textures/default_mossycobble.png
old mode 100755
new mode 100644
index ca727177b226c6c1e628536001da3a8ec9581fb9..644303bddd5fe025726eedbcbac6218f97b19396
GIT binary patch
delta 841
zcmV-P1GfC!2h|3U8Gix*005AYXf^-<00d`2O+f$vv5yP<VFdsH010qNS#tmY3lRVS
z3lRZ-WM7d0000McNliru+XMv)6*U^-w_gAN02y>eSaefwW^{L9a%BKeVQFr3E>1;M
zAa*k@H7+?oJh00E00O^BL_t(IPfb#5PugG<?jLcBl(s-iZ+}`_3KZp15EU<6R8T18
zV!29-z*t<iB}=v?8kebY8j<OAF2-%yKiqMj_I!Ag_kGVf&vTx05VaU{G&p>Rj_oZ?
zodq;aD-;SrBkFj;AN>C0eNgkSOO^kC;Ct+3!9nbCiR;YFO_(?3PN(DSbHtF-4ysTH
zg4^wOy<RsAV}HAxN5qV5tB}qDD_w<rk5SKEM7$2+7GpQ4&{aY*707RQ+bjASzba5k
z4$1r}Dv$I0sX|yRz0TX~lyDi0{!043#l+ii;5Zg)MX{KZ(s;Th`hLa{q3vU;0=DLi
zd|9$pN!u!cR!Gz!Z55X*;g&jnWi;=<i7Th`FYn*<_kRaSwOVbpT8=0w-h{CZ0|J^>
z)7j;4i$!%(JPSH|T)Mmt@1|)&CrGc?8w>_ioSxhurZ4BZ-7fs`mIrK*9-@iQX)*7$
z*WGMG+%ob|8nG-3?=bi-BYjuJAL`6maOxz$pD2Oz_|*9<(PicKY^Ix~OaZIWc#1;2
zm#X`nD1X-i-mmJj9B$ijt#`6O0y5AVC5?jihTCWu^}R;?J|o^n5V&JGQi{sc7qcMA
zS!E#_XtR|qtVJ(3lVF-~9Rz+yjt=EigkKi8rD?Lp3*!)T=ymE(eV5DSRXxeRm&2oF
z<uV3T6KPb}^<uGz;0rEkQI40E<U7@2u|UF`o_|`WzBpLHnr?Sb7!HTU{W7-8WXvoK
z8%dSYt^`dlaQ<;@GV9PArNyg^XQW~!iWu@ya}j(45H$vC)0>-{NWb3)gB5Mgu8~Y>
z2F3!CJi5Xi`#}kmto=i-ybW8IYiuLq@%ZTI=)>{Hi8U16At3@l$2ptfg4KXfkOU<T
z4?+*6i?HV^@-#Rgfs-3Z&oyGzNNHsajo?_rE#IqaRwl3IA+y-jQ?EA2w=;hMKkNh$
TdAHFJ00000NkvXXu0mjfxXgd0

delta 977
zcmV;?11|j42HXdb8Gi-<001BJ|6u?C00v@9M??Vs0RI60puMM)00009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-mq3l|&@$$i;%000ANNkl<ZILigWOH7*u0KoD8*RPMS
zudgrK(H2VEL>LorFhDaAW2W<g%c6-U9+qkJ;6=T7xACAC<9|`32NM%d#>3(xW^t1k
zHRv2raKNBtt#quVrH`-u`Y!$a{e){@f36`209;%DlFd6A-hN|>e>aLujfc^MF0Fon
zuRcq0;l*KA|2o2D334WMj@d^h5gh}Av90VcBr_?3@&Z`0RMZo6$_zJ`<E+M$$Z`m~
z%f^uF3F^%T)qhr!<Hjye&R#}z1}m{l>X`M_G%9;IdNUN%G<GpeU?9TGoR_=z_K|vH
zIIIDz1}~M?CPqnS*m)YgEKCp_v7#zB84o;1xxb8E9mC=_BM1WfJ2u?nc@P9@ibA8=
z#MEA3>;7*f4n9JB?4?f3XP%|5yUS7jkX*J(Pbkr8!++$YgGfZ8R+TUr3}m{$Qt70z
zIkF6$vXCpN=#mdwplM8pU!mTt;PmJT`xY4qoMt}(Yil(ePAA{p_=bOef52SiHR?wb
z6#g4wVAOyZ^@U=hV5Ozy$mI&mFIthkc~&>p8T5=J87*|$ZLE4He)kAfMZsh=(lx~~
zbb5&6bAQH|>=0;`-MH*Qw$@7Y8mBOc27C`C`SJTTtY#PQz6XgtH=<roO;r(WDLN-z
z#ClVRJ-_5*|9FS1FT9S+-z8Vup{Ladge)vw^3X8VSY9b`|9Fd)+bbyAAxmf9MA3?f
zFMsTd?fwZ-=K|>Mi1^6lwvk<Z4)QJLC)|t$qJJE0h49%%33|hny1VGjhv=jRdVkSN
zw%kS4_edm@0C=Ps0?|FpQkQS9=Wut%kcT(WO6N%zZ}H5;TT~4{kuRChl`3s~{sAJ<
zD0Z8T(a}++XJxh%4b;Pngu*`1pp`ubz^j+1P?Rc*kB%X9bm;EIjhI9??M|DaNR3av
z_<s=JU>TVJ>Be>JY82USN0KBSzp%&psu`ovNUoHj(^t?*7Cn;AL%CSykL?vaLq?92
zUHV!VZ-0TX`(aA@A8<OIeDLWlYGNF<m%`S+NH*0*c<22~n&Bjfh?z>Ij3V7;M0%Rk
z;U<#Ki{780o(`eOcUW7=V+$I1_Ush|K}tY&I1p{dKuoRHF$z6$g(97bjO)zb9Oa8#
zy)w;sbO28@$&H^&%s&-ka>h?G-b4eEi6s96AJS{Hb!o<B00000NkvXXu0mjfT)WPV

diff --git a/mods/default/textures/default_stone_brick.png b/mods/default/textures/default_stone_brick.png
new file mode 100755
index 0000000000000000000000000000000000000000..bc79696c68bb7e7ae134065660b54a727cb515ae
GIT binary patch
literal 744
zcmV<E0vG*>P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru+YAdA91$~e<Q4z`0(D75
zK~y-)O_I%S+eQ?Hze}<)$r)-GM=2!HK#KxFoLyI47DboMy6@As$hvRPH|Wp0+b(J=
zD_f=mTearTk_wxX1sx%GIdkXCch0@?+pq5uA^?a8l4Ss-VPF^rhLj*B0749C-2gCl
zL2jnAU-m;zR%*5n!u9Qj$Lxsz{FZ$x=x^@03p<9q<S{#9_W;{R;d<@(>SRW7b8}0c
z<-A`m0jR2aBp{)xY9s*q>kqVTivZ3!=JPpye?<X_-S(a#CF;6HYejl`lu{zZh>ZTo
zML>iQBR&MaY+4Fc*SwfciSd5)86t^MK-D!TU5B&wAOfJ3qR|?y6h+fCkP=!eKGo+0
z&RR^{j)F>2mL==;8d4&qL~(g_#p_qEkWBDCKpOoIKvR!-IBN+p0<ha|0a)MNG5zTW
zibg5=zDKf*loH-KQc8T?y`;Z(2P&;K0AD<NMvRf~zx$TOyrcN}?T<`Mi+7gvgymxZ
zVE^>ne!HWpYs#uZDK+8)0u=B24fGoX8BYKo0*%(d5#P)VfBpRrrp;lqN3e*DdGNte
zoGq99zuN&&R@EWp;61NTPiZEG7t<-jFyNiT7=!l?Yb^l9N!KAy<8jt9Uo6JJQew4Q
zQ4W!diwh>rxWcQ|6(aC344iZwg?EmLF#t@AA;yTeV;-k(-q2KFCX>TxKVLLwEky{C
z5aQwTQ^k1C>T*RnHz2}%HY3JJ0^DYUdHx({E!m=5ptM4%QMs9zgV@>Gzi6#lU0!l_
zevY*kXDx`}tYu;h#qWRoiK<HG)0X~rL(?>f2;O@n%LyS6;ype_bY0`UC(Cn=kB>P&
aU-A(il|;KwjHWyQ0000<MNUMnLSTXsCrL&C

literal 0
HcmV?d00001

diff --git a/mods/stairs/init.lua b/mods/stairs/init.lua
index 1fd8f1b2..25b06e59 100644
--- a/mods/stairs/init.lua
+++ b/mods/stairs/init.lua
@@ -227,41 +227,48 @@ end
 stairs.register_stair_and_slab("wood", "default:wood",
 		{snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3},
 		{"default_wood.png"},
-		"Wooden stair",
-		"Wooden slab",
+		"Wooden Stair",
+		"Wooden Slab",
 		default.node_sound_wood_defaults())
 
 stairs.register_stair_and_slab("stone", "default:stone",
 		{cracky=3},
 		{"default_stone.png"},
-		"Stone stair",
-		"Stone slab",
+		"Stone Stair",
+		"Stone Slab",
 		default.node_sound_stone_defaults())
 
 stairs.register_stair_and_slab("cobble", "default:cobble",
 		{cracky=3},
 		{"default_cobble.png"},
-		"Cobble stair",
-		"Cobble slab",
+		"Cobble Stair",
+		"Cobble Slab",
 		default.node_sound_stone_defaults())
 
 stairs.register_stair_and_slab("brick", "default:brick",
 		{cracky=3},
 		{"default_brick.png"},
-		"Brick stair",
-		"Brick slab",
+		"Brick Stair",
+		"Brick Slab",
 		default.node_sound_stone_defaults())
 
 stairs.register_stair_and_slab("sandstone", "default:sandstone",
 		{crumbly=2,cracky=2},
 		{"default_sandstone.png"},
-		"Sandstone stair",
-		"Sandstone slab",
+		"Sandstone Stair",
+		"Sandstone Slab",
 		default.node_sound_stone_defaults())
 
 stairs.register_stair_and_slab("junglewood", "default:junglewood",
 		{snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3},
 		{"default_junglewood.png"},
-		"Junglewood stair",
-		"Junglewood slab",
+		"Junglewood Stair",
+		"Junglewood Slab",
 		default.node_sound_wood_defaults())
+
+stairs.register_stair_and_slab("stonebrick", "default:stonebrick",
+		{cracky=3},
+		{"default_stone_brick.png"},
+		"Stone Brick Stair",
+		"Stone Brick Slab",
+		default.node_sound_stone_defaults())
-- 
GitLab