From 65c502fe0f0136502cca1a655f863a8aa85a3457 Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Wed, 20 Aug 2014 15:01:41 -0400
Subject: [PATCH] fixed Z-fighting between ceiling fan blades and block above
 moved it to climate control where it belongs

---
 homedecor/climate-control.lua | 29 +++++++++++++++++++++++++++++
 homedecor/lighting.lua        | 26 --------------------------
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/homedecor/climate-control.lua b/homedecor/climate-control.lua
index 4afeb19..03f1f02 100644
--- a/homedecor/climate-control.lua
+++ b/homedecor/climate-control.lua
@@ -115,6 +115,35 @@ minetest.register_node("homedecor:desk_fan", {
 	end,
 })
 
+-- ceiling fan
+
+minetest.register_node('homedecor:ceiling_fan', {
+	description = S("Ceiling Fan"),
+	drawtype = "nodebox",
+	tiles = {
+		{	name="homedecor_ceiling_fan_top.png",
+			animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=0.5} },
+		{	name="homedecor_ceiling_fan_bottom.png",
+			animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=0.5} },
+		'homedecor_ceiling_fan_sides.png',
+	},
+	inventory_image = "homedecor_ceiling_fan_inv.png",
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{ -0.5, 0.495, -0.5, 0.5, 0.495, 0.5 },
+			{ -0.0625, 0.375, -0.0625, 0.0625, 0.5, 0.0625 }
+		}
+	},
+	sunlight_propagates = false,
+	paramtype = "light",
+	paramtype2 = "facedir",
+	walkable = true,
+	groups = { snappy = 3 },
+	light_source = LIGHT_MAX-1,
+	sounds = default.node_sound_wood_defaults(),
+})
+
 -- heating devices
 
 minetest.register_node('homedecor:space_heater', {
diff --git a/homedecor/lighting.lua b/homedecor/lighting.lua
index 4edd279..9d03e50 100644
--- a/homedecor/lighting.lua
+++ b/homedecor/lighting.lua
@@ -356,29 +356,3 @@ minetest.register_node('homedecor:lattice_lantern_small', {
 	on_place = minetest.rotate_node
 })
 
-minetest.register_node('homedecor:ceiling_fan', {
-	description = S("Ceiling Fan"),
-	drawtype = "nodebox",
-	tiles = {
-		{	name="homedecor_ceiling_fan_top.png",
-			animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=0.5} },
-		{	name="homedecor_ceiling_fan_bottom.png",
-			animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=0.5} },
-		'homedecor_ceiling_fan_sides.png',
-	},
-	inventory_image = "homedecor_ceiling_fan_inv.png",
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{ -0.5, 0.5, -0.5, 0.5, 0.5, 0.5 },
-			{ -0.0625, 0.375, -0.0625, 0.0625, 0.5, 0.0625 }
-		}
-	},
-	sunlight_propagates = false,
-	paramtype = "light",
-	paramtype2 = "facedir",
-	walkable = true,
-	groups = { snappy = 3 },
-	light_source = LIGHT_MAX-1,
-	sounds = default.node_sound_wood_defaults(),
-})