update gitignore

HybridDog · May 30, 2014 · 3b4c25c · 3b4c25c
1 parent 2826178
commit 3b4c25c
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,4 @@
+## Generic ignorable patterns and files
 *~
+.*.swp
+debug.txt
diff --git a/glow/textures/glow_lamp.png → glow/glow_lamp.png b/glow/textures/glow_lamp.png → glow/glow_lamp.png
diff --git 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
diff --git a/glow/textures/glow_lamp_frame_normal.png b/glow/textures/glow_lamp_frame_normal.png
diff --git a/glow/textures/glow_stone_normal.png b/glow/textures/glow_stone_normal.png