From 3b4c25ce7226195625ebccb6ed94e28163a4d16f Mon Sep 17 00:00:00 2001 From: HybridDog Date: Fri, 30 May 2014 19:41:05 +0200 Subject: [PATCH] update gitignore --- .gitignore | 3 +++ glow/{textures => }/glow_lamp.png | Bin glow/init.lua | 10 +++++----- glow/textures/glow_lamp_frame.png | Bin 0 -> 521 bytes glow/textures/glow_lamp_frame_normal.png | Bin 0 -> 621 bytes glow/textures/glow_stone_normal.png | Bin 0 -> 1530 bytes 6 files changed, 8 insertions(+), 5 deletions(-) rename glow/{textures => }/glow_lamp.png (100%) create mode 100644 glow/textures/glow_lamp_frame.png create mode 100644 glow/textures/glow_lamp_frame_normal.png create mode 100644 glow/textures/glow_stone_normal.png diff --git a/.gitignore b/.gitignore index b25c15b..d9c069a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ +## Generic ignorable patterns and files *~ +.*.swp +debug.txt diff --git a/glow/textures/glow_lamp.png b/glow/glow_lamp.png similarity index 100% rename from glow/textures/glow_lamp.png rename to glow/glow_lamp.png diff --git a/glow/init.lua b/glow/init.lua index 3d42958..7dfdc4d 100644 --- a/glow/init.lua +++ b/glow/init.lua @@ -13,7 +13,7 @@ minetest.register_node("glow:stone", { minetest.register_node("glow:lamp", { description = "Lamp", - tile_images = {"glow_lamp.png"}, + tile_images = {"glow_stone.png^glow_lamp_frame.png"}, light_source = LIGHT_MAX, groups = {cracky=3}, sounds = default.node_sound_glass_defaults(), @@ -23,16 +23,16 @@ minetest.register_node("glow:lamp", { minetest.register_craft( { output = '"glow:stone" 2', recipe = { - { 'default:stone','default:coal_lump','default:stone' } + {'default:stone','default:coal_lump','default:stone'} }, }) minetest.register_craft( { output = '"glow:lamp" 6', recipe = { - { 'default:stick','default:glass', 'default:stick' }, - { 'default:glass','glow:stone', 'default:glass' }, - { 'default:stick','default:glass', 'default:stick' }, + {'default:stick', 'default:glass', 'default:stick'}, + {'default:glass', 'glow:stone', 'default:glass'}, + {'default:stick', 'default:glass', 'default:stick'}, }, }) diff --git a/glow/textures/glow_lamp_frame.png b/glow/textures/glow_lamp_frame.png new file mode 100644 index 0000000000000000000000000000000000000000..0f763cacf7e743ec19231a19cc7f9a48de140d97 GIT binary patch literal 521 zcmV+k0`~ohP)Px#8FWQhbVF}#ZDnqB07G(RVRU6=Aa`kWXdp*PO;A^X4i^9b0iH=jK~z}7#aG*L zgD?ZtmxC%FR+Fz;q&bU&-i_O|6mXa07xnQ zI{}L5C6!~{mTMeG0KoiTw5y&ciJqBNtjBS*l+qRWG-lNipcn#ADRuLBN~w#GAcdY} z6L<>=k?47z10nDz2~y~FCkM8IM@W$Qb`I2n*OHL9o&!AozBn=kn4ih`3tRMddlb zW><^4sN3=R7Ib@%SUX)4f!yqBQ7>^RUU0)lk+`QTH@^p3No)}{-+~)%7$vb)QAMIx z*2Db0R?b)5FiN7g7dnNnq45aWW ze1dejMmnD*K1C{bx<)#6xq;gxO%T9^00kJr(WKx?tBqD#a#vI#f#l5poEgri^!afY zx=#@FWAIyN<|pE>gDiw>iLU|#qcf7t;ofIYXEy~QaUF0kmo zkLL>Q{U!lH8+)=2>(#AF>_0yI2{!qd25cP6VEt5R|7jaWLsHOWH!3}Q1_#_Ss3XiY zSeqQy<27@@0luwn|`x@MFNSxe^lUBd{EN35g~qB2WrmOF~^5 znqfeefzOFV6KFI7bHPhVXrF?yB3ueyLgH)@UJHDR#Nit5i_p>4!N+`kc-V$@F+Ze$ zuAw*q9#;h)knq3|ZhZ>c;|M^&`|@sP7PzZBRRL!U%(Lr6AViyQL0|+}ovOL3BU0E; zUAP5oK-NWIu)dk0Y6f4QYE_h+3SwA8W~8QmIl3Efq?Y#I&R!X84eDoH~B~dG6Rd2#esy0_eRg;2C zsktY^1q^kAbANR1^cEpcwA*CI<6YVdWt}_QpF=;&di1s+Ye#X}wB0~HFQJ!k`fkKgu00000NkvXX Hu0mjf<$(#= literal 0 HcmV?d00001 diff --git a/glow/textures/glow_stone_normal.png b/glow/textures/glow_stone_normal.png new file mode 100644 index 0000000000000000000000000000000000000000..97a27d47219b780f56de80e003b19d9fa566c0e8 GIT binary patch literal 1530 zcmV;1`rw~BK8y`pGqPGsi(74(5k4db8erf{i9mt3jQx9`{O#}N7Gdx3G#2vF z`2|JaDo^ShMHo8ZBb>$QH$oqvX}~f}fE%2Fk8Qz&^B{pu5u$-Qh(iQ|K_{>k5@0%l73Y31 ztSFa#op;QzJqg(YQ|rt}C;`I883CJxt%KmufB;dcbHu@^vyxj!Bsn9(JVC3_HqOO` z<76}{EWlyNG;b1Lv@Tq@09QB$ST4p}lyong9w6Vr;{;xWEKUSeZZqV!AGO-lIFrNN zL+pVDP6JHQkyh|spp8!dQqSSKf$>(EWth7<&WF#&^UqFNV7P;9+|B}&hTr`JXavlJ z+(Glk2?ygGgwtSX6k>w0g|AH{O~!LJdWETjDb}(21B_3?d9O6Z`QxeX#?V37I({(X zyf-*2A%h2CsqK%+=%X=}KnXAo%I7c6=+3SUsMbWMJEd;}n_`5clFx<~=o`WJiuJ~@ zDBVVRb6L=Lf#Cr*CY0WYGtRQlY=?kE$ACUM(TwYt$owMY9h}W65jIasqae91j|N!Y zf_(~{-W9GnvrCbKz%VGUEzG^~wG$*p9^Mu9GuWMyiNx(c1D74-gVA5>4d)5|I|YU> z&UP^Fzk+Ur;UG-=!k8T9KzkMLDda`?#|4fhv)d(7Qj#0-lOeN`ABDL$KK8=+967ui z_lxuOvk+y3=fN2k<@4Fm1=8TOUaOm;z_qZ=!XHK$=D??C=eo=21Ds~z_+wx^XSRoi zwijGrFeROhhisIS@H#6Ku=H?p#b;oKXm4OrVH&`+29=#6R>h@6$Xx_ro{jsL%=RQ) zo)Xia3jf0Sy3gEg0-Xs#!DHR@kQ8x43aCK?$OW>3C0Gi?*aEGybiy)&OoBP&rD}MH z^<*5FI>l$98;rLf7KReJig4}=r>BK*O5D4krJj-{$R;$C)2Q$opdCO3#!`!mAyyq< z)EU(fQKAVdRi%EFXpx&r_QKKyaL~cgqw|>I_!yc0QkWXSUju2VSCSK?0&Q^wAs0yF zZGrD03Sgs<&B@7GlG7l>Pz6eE!XUp%B6Lpf;NyGc<2bV|!Vm8uXym77=lqZfU0@@Q zHBLDRoMFCJrHuw#sT7V&1}10`LRU{_V*)1FZFcgjLU{#XAFC++T#T|+LKnFjJiVX! z>x=Nq+k`wpROf{78Uzn5;q_XNP%d#cC-SUIWTVumi`aV{l;^3&ga0Dg?<;% z1cSqe(2zbA9^WsdlYa9PTVbAVejv_J=aOpFb@9-1xt~FT6^Wn45y(IEVKha!; zczrZ3KgLx&zb+0V{CQxNpYR8W|AEy!w*vZ|ej>L2j)avwmk3=etNp~KL}GYvt9jns z3+;FKi7+^EY6Q&r;RIn+esVaO5nS1Lh($ literal 0 HcmV?d00001