From 386816df66105f5a3bd7beba8a5e9b3d5022fd6c Mon Sep 17 00:00:00 2001 From: LeMagnesium Date: Sun, 14 Dec 2014 22:57:29 +0100 Subject: [PATCH] Merge "Add obsidianbrick" and farming's soil's texture --- minetestforfun_game/mods/default/crafting.lua | 8 ++++++++ minetestforfun_game/mods/default/nodes.lua | 11 +++++++++-- .../default/textures/default_obsidian_brick.png | Bin 0 -> 418 bytes mods/farming/soil.lua | 4 ++-- mods/farming/textures/farming_soil.png | Bin 713 -> 835 bytes mods/farming/textures/farming_soil_wet.png | Bin 659 -> 831 bytes mods/farming/textures/farming_soil_wet_side.png | Bin 721 -> 109 bytes 7 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 minetestforfun_game/mods/default/textures/default_obsidian_brick.png diff --git a/minetestforfun_game/mods/default/crafting.lua b/minetestforfun_game/mods/default/crafting.lua index d8f233af..e03f5cec 100644 --- a/minetestforfun_game/mods/default/crafting.lua +++ b/minetestforfun_game/mods/default/crafting.lua @@ -549,6 +549,14 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = 'default:obsidianbrick', + recipe = { + {'default:obsidian', 'default:obsidian'}, + {'default:obsidian', 'default:obsidian'} + } +}) + minetest.register_craft({ output = "default:sandstonebrick 4", recipe = { diff --git a/minetestforfun_game/mods/default/nodes.lua b/minetestforfun_game/mods/default/nodes.lua index 7fc69473..29863eb1 100644 --- a/minetestforfun_game/mods/default/nodes.lua +++ b/minetestforfun_game/mods/default/nodes.lua @@ -148,7 +148,7 @@ minetest.register_node("default:stone_with_gold", { }, sounds = default.node_sound_stone_defaults(), }) - + minetest.register_node("default:stone_with_diamond", { description = "Diamond Ore", tiles = {"default_stone.png^default_mineral_diamond.png"}, @@ -1184,7 +1184,7 @@ minetest.register_node("default:sign_wall", { end, }) -default.chest_formspec = +default.chest_formspec = "size[8,9]" .. gui_slots .. "list[current_name;main;0,0.3;8,4;]" .. @@ -1872,6 +1872,13 @@ minetest.register_node("default:obsidian_cooled", { groups = {cracky = 1, level = 2}, }) +minetest.register_node("default:obsidianbrick", { + description = "Obsidian Brick", + tiles = {"default_obsidian_brick.png"}, + sounds = default.node_sound_stone_defaults(), + groups = {cracky=1,level=2}, +}) + minetest.register_node("default:nyancat", { description = "Nyan Cat", tiles = {"default_nc_side.png", "default_nc_side.png", "default_nc_side.png", diff --git a/minetestforfun_game/mods/default/textures/default_obsidian_brick.png b/minetestforfun_game/mods/default/textures/default_obsidian_brick.png new file mode 100644 index 0000000000000000000000000000000000000000..2d938afa0bfc5d6f8aecdb98e50a2387b882a4aa GIT binary patch literal 418 zcmV;T0bTxyP)b3v?0WV2J zK~y-)rIJre!$1(lf7@(K1^b5xK}|_0J*1x@(9i9~o8ZBNcoL-tG1P-%gs~pPCai~& zHLW%+`e0#rGy7(C=czc34S?1ffTAea6E(pFGbgoGy#f0nbN75D`kJV^787 z`QZ6DZW|THu@RBRPQ73VfIQ!?@FIfVWz_YHb+op1-3Hy%wG!$016uAr@-(&6^nxKG z*Qn8GWb!=cFAx!w>m3+lO3KBDO*n4*d&Ir2jf>AW8&~!Efdi~s-t literal 0 HcmV?d00001 diff --git a/mods/farming/soil.lua b/mods/farming/soil.lua index b459273b..494be942 100755 --- a/mods/farming/soil.lua +++ b/mods/farming/soil.lua @@ -5,7 +5,7 @@ minetest.register_node("farming:soil", { description = "Soil", - tiles = {"farming_soil.png", "default_dirt.png"}, + tiles = {"default_dirt.png^farming_soil.png", "default_dirt.png"}, drop = "default:dirt", is_ground_content = true, groups = {crumbly=3, not_in_creative_inventory=1, soil=2}, @@ -17,7 +17,7 @@ minetest.register_alias("farming:desert_sand_soil", "farming:soil") minetest.register_node("farming:soil_wet", { description = "Wet Soil", - tiles = {"farming_soil_wet.png", "farming_soil_wet_side.png"}, + tiles = {"default_dirt.png^farming_soil_wet.png", "default_dirt.png^farming_soil_wet_side.png"}, drop = "default:dirt", is_ground_content = true, groups = {crumbly=3, not_in_creative_inventory=1, soil=3}, diff --git a/mods/farming/textures/farming_soil.png b/mods/farming/textures/farming_soil.png index 0be94e3c9ef086f529907a178160f139f619fdba..6a59fca5bfc840496873bc9e5d3f54f4c420265b 100755 GIT binary patch delta 813 zcmV+|1JeA-1;YlABYyw{b3#c}2nYxWd$^fuN5`W^8$>E&C|C->}W2B;$ zZG7GsdDGNIEF~m2;~9jLrdD%`Yub9rXg;^KQs{L1vs$Cqo+YxZ^Nf@l zZ;;l0A0*$M*?;ig=?+KLup5Gb;V#%nHGLL_QBym+xt!L6K0L>SnKe^kWwZo3{y1o* z`CNALXKfU?uJ9YJiO6Jtqem9eVW7NYqvGdNQ`0bw#!=m_EbEA4b2yWWckZ@O_A>in zKLVfR(Ru&W=F+4;7>iDK;2XN$cZ=ex6CVnRmpD)PwYr$WMOLoErl=!D zgJ%VwQh%VMicZnkNN=Bh`ax$fDD3S8?X5Mhf{Zzy%6R;+)*aeeOZugS&QHG{e66yb zTKCUbrqQ}}r~U<#y!QIpXScPDB_YeMNKBaqh7iupz2K&$ zbGBuo(T**)=}rWE_38^N?~O*$ac#rPM9lKT&wuxVtCa%Yl`*ECo9q2j3%@;@#VbqY z(&j?ZE-@%}Zyz+)szv>`TEEAROje&PLR+$MBb?$RZZtgymmZFAoeEA14lZcAabh@5 zYPl@dbln*C2FXsr#v5{mc00z$)L~yKxlUBcQnE~1N+jA5!rlXKJg&vJoL>v@?c;Cw6dT$+-s0&;7MKtNW7G1y>jp6ey!)04RkADTwO!**mlmK>_AMffJ zw32S@s}bxMLL5{luuk@4SjNW=Lo?>YRXfL<^a$6<62VGv9;J{2iZqL)(}FGwp&WH0 zw>Zn=up-l002+bVq76B!%XqBNaV!2g2p;Pc+~x^LmPxSCJmo3=>@iQmZJ9vUYvb>6 zBCiv<8gamJ?|%+N!ic5`2sZ`eh-9ak2lnpoSetx~*8G+5!=&baUaRz|d(d zVPxI}@626_X=HqMEICXNx-5vI--c3f4z-jAjg*AOvV>+@LdIprX+uGa&hmacm}JAz zRsw0a1%qN3k4SXk`C1g8v;z8y7dr_zUR4t~uO%@ohJWz=a0B1=SMmEz16SPw+C=)H z&7hI`XPYwKlKsNb>Jqe!4^3Ibc1pzKvKt6HJb6;B#jT=Yv=C5sek2GzI=52$c6=0e`9|AHL}r-j?iaU`hGMy|Ti8M5v+ z8$>tSIDfv#(B#%mPGBhJAB=-zB%pk2D!Y&sty~9c*?x^OO{^m z6?xucv`qglcJSx4hO15<-Lx0S>oga=0_w7puPZPS@hu$CoO~Uq7?owb*oZ;5|8hsc Ye<~lj&|Ie+Bme*a07*qoM6N<$f&qR`-v9sr diff --git a/mods/farming/textures/farming_soil_wet.png b/mods/farming/textures/farming_soil_wet.png index d5e335ef30558faafda5da5df2541be28abb7bff..7e24c70458e5b3d14080b945cf0f68cd0bbc57ec 100755 GIT binary patch delta 809 zcmV+^1J?YL1-}N6BYyw^b5ch_0Itp)=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2i^<^5-ljU`iD#a00O^BL_t(I%Y~EMZ`@Q6hre@t zTPM5rdc8?$8j>g|g%oiUAP^7~i3+I&2_#IM;Qhy{sv_%PN)Ivpoq{(J) zUa!|)U(Vqnt^~X=FEb;}j7Ia#PXM0)6Tq!~!T*~Dgn%VNhi?aSZu^$lhzk7`Pyz}V z0pfAte+GnI&v>s)E7Qz!^s8I#oA-Vl_bj;Dbaa$YQCwE4EupHE7%8oXM~OPz+3N1bvouV`30Val-$fy+ zX_7_aooANyX@5d@!NhEs+OaKBA^GFcxn5jwia(FjxYMz{UO%@i3)Zd#jK&Gg1((Z9 zO>KfMXR~Z%Us{rsrHu2cd3gVvrO+HqCmBr_@2sB>wtu&RBA#Z}a5V9xlxfhiyhCPn-35W&H1tdx)wW8!H*R@5)gD<-W;YJcAN68`CNqp_^iHo_76M& zgW4|xEg%MlzydG>e84h*)tbEpbbtzo09`kZ0TaP1z)3x%01{wgNVqP*m#`ifd~9i+ z<>CQC&wu1bsYukthGPkqzIZq!_yPj)(QE6yD4Dtk2ZQ+9Q(>S@GoPz6KRFp^u4Ai? z*GhhR*!vma+D7=CAw_ieVgHs5FW-E7dqX@OI%+wvl~L)5(Qup}?hPI|g0;0Pe(&~Q z(cX$Hb{s=D8n!`iSeZHOr*P-`i%-6vXY&KQ{y#}vW1@W-r3kd@Od|D&ZHJV9{uLGDs4%oH80G0)+j)29pJlBYy%~NklP8rrMkquGV_~3~iC|@kBxai?=Mr$a zNq9M~E5`_4-)ejT6eB{Ep)rIJ@=l4Hd`0);9FupL+)0NK=2-m?x+%Di$c*>|2_kG1 zG&rd+3Q@um$A2~xIlMW^g5ack3DY5hPCm+9zZ@peSR_%46Y9wYw2Luxi<(5Qq@k=3 zPP-QR99OwUXoRD!JW9O9el3N^EIK`1&)}nLW7pC#$Vc(AmB)FzfO*Zpw^;*U57+SP zbr)A-8$%|2KNN6T{j&`dZ`gi1T3d!&*3mOnY!_7wN`Em7%Nk~mA)8M&b9mM;Zwco0 zG`ykPZ1Jl{IZ#m{xvIk}9(OCa*sWtN8IrcPata=D;YL zhON6j?}#3>F<2C|*tb*00UP;4;Nb*_7=DdHpq8niqWU_xw&CA(i7*mzOq*G(^R#g_ ziCrfpb#!{sE_skTRW$;+to)v(drn9@f1b4PS|Iv5xjR6JcALoEE0QxXzBuqSO|6uxP-P|BS*Awhz- i`Jw?sYI~zUJ44H5hWx-s2VVizGkCiCxvX5|Ri8R4&>d5I4<3F+#YUV zE2*%(5`shLHG04CExc=4xN4YaTZ?dv7*x|-M9W&hg}nwhe-%bIw}fssAt0N;O!ncZ zjJHh-&a%Rkz}%!wxaK+$v@&sY2;ik7sPcuqEM69qXskxCyBfyFlT887+8OMvM$s@L zLe97rsaLKMhOH^MbU5!7;OSv`ceD`dx{^96ElbVzGD28RDAY76YN&`^0F#Q2Kl2_Q zj!U@f7tu_Ie=x3S=wueKZ^oEFlwA|aE{%FmV?FdsP|SL0#qjgolY{fRfxtH4ll)#T zj_!*^?9=~2DT(9ab0U5wqfGq_1{+DJX)}WZGb)`XJ34}$6cY%MLo$B^9xiGr_-0JN zpN174i&DztHK|rCYvyOk)u_z>s;c9R07vdn(zoQRFX>KCY;2nzMSsh*R(AjJO-ZBZKue|h}1z*!=S9m^V9xcOn>sUypL>c*zALLqGvDHGr9=fGGYpyHXt$l*V*0IzpV&Ye1Cxrq>r zHkSA)h6j}usIh=$^Y|jOOU~C#6Zgku^zsSLoI8q&$4Q+_eDc%efp3U`Jd?!vc~qsW ztFop&N}^v#h$3e>gpL(uFz*0AWdRj$;J4EnGiaf>GjEqDv3b{%N{AdPUbgu`4x_Rr fYt8Xrc_#h>=3{g`X*z>e00000NkvXXu0mjfQ|VUf