update gitignore

2014-05-30 19:41:05 +02:00 · 2014-05-30 19:41:05 +02:00 · 3b4c25ce72
commit 3b4c25ce72
parent 282617852b
6 changed files with 8 additions and 5 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,4 @@
+## Generic ignorable patterns and files
 *~
+.*.swp
+debug.txt
--- a/glow/textures/glow_lamp.png
+++ b/glow/textures/glow_lamp.png
--- 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'},
 	},
 })

--- a/glow/textures/glow_lamp_frame.png
+++ b/glow/textures/glow_lamp_frame.png
--- a/glow/textures/glow_lamp_frame_normal.png
+++ b/glow/textures/glow_lamp_frame_normal.png
--- a/glow/textures/glow_stone_normal.png
+++ b/glow/textures/glow_stone_normal.png