Merge branch 'master' into HEAD

Conflicts:
	doors_and_gates.lua

characters

@@ -1,283 +0,0 @@
-A
-_a_
-7
-B
-_b_
-5
-C
-_c_
-6
-D
-_d_
-6
-E
-_e_
-5
-F
-_f_
-5
-G
-_g_
-6
-H
-_h_
-6
-I
-_i_
-1
-J
-_j_
-4
-K
-_k_
-5
-L
-_l_
-4
-M
-_m_
-7
-N
-_n_
-6
-O
-_o_
-6
-P
-_p_
-5
-Q
-_q_
-7
-R
-_r_
-5
-S
-_s_
-5
-T
-_t_
-5
-U
-_u_
-6
-V
-_v_
-7
-W
-_w_
-9
-X
-_x_
-5
-Y
-_y_
-7
-Z
-_z_
-5
-a
-_a
-5
-b
-_b
-5
-c
-_c
-4
-d
-_d
-5
-e
-_e
-4
-f
-_f
-4
-g
-_g
-5
-h
-_h
-5
-i
-_i
-1
-j
-_j
-1
-k
-_k
-4
-l
-_l
-1
-m
-_m
-7
-n
-_n
-5
-o
-_o
-5
-p
-_p
-5
-q
-_q
-5
-r
-_r
-3
-s
-_s
-4
-t
-_t
-3
-u
-_u
-4
-v
-_v
-5
-w
-_w
-7
-x
-_x
-5
-y
-_y
-4
-z
-_z
-4
- 
-_sp
-2
-0
-_0
-4
-1
-_1
-2
-2
-_2
-4
-3
-_3
-4
-4
-_4
-4
-5
-_5
-4
-6
-_6
-4
-7
-_7
-4
-8
-_8
-4
-9
-_9
-4
-(
-_bl
-2
-)
-_br
-2
-{
-_cl
-3
-}
-_cr
-3
-[
-_sl
-2
-]
-_sr
-2
-'
-_ap
-1
-!
-_ex
-1
-?
-_qu
-4
-@
-_at
-5
-#
-_hs
-5
-$
-_dl
-4
-%
-_pr
-5
-^
-_ca
-3
-&
-_am
-5
-*
-_as
-3
-_
-_un
-3
-+
-_ps
-3
--
-_mn
-3
-=
-_eq
-3
-:
-_co
-1
-;
-_sm
-1
-,
-_cm
-2
-"
-_qo
-3
-/
-_dv
-5
-~
-_tl
-4
-<
-_lt
-3
->
-_gt
-3
-\
-_re
-5
-|
-_vb
-1
-.
-_dt
-1
-

crafts.lua

@@ -6,14 +6,7 @@
 -- License: GPL
 --
 
--- Boilerplate to support localized strings if intllib mod is installed.
+local S = homedecor.gettext
-local S
-if (minetest.get_modpath("intllib")) then
-    dofile(minetest.get_modpath("intllib").."/intllib.lua")
-    S = intllib.Getter(minetest.get_current_modname())
-else
-    S = function ( s ) return s end
-end
 
 -- misc stuff :D
 
@@ -53,7 +46,7 @@ minetest.register_craft( {
 })
 
 minetest.register_craft( {
-        output = "homedecor:roof_tile_terracotta 4",
+        output = "homedecor:roof_tile_terracotta 8",
         recipe = {
 			{ "homedecor:shingles_terracotta", "homedecor:shingles_terracotta" }
 		}
@@ -99,14 +92,15 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-        type = "shapeless",
+    type = "shapeless",
-        output = "homedecor:plastic_base 4",
+    output = "homedecor:plastic_base 4",
-        recipe = { "default:leaves",
+    recipe = {
-        	   "default:leaves",
+		"group:leaves",
-        	   "default:leaves",
+		"group:leaves",
-        	   "default:leaves",
+		"group:leaves",
-        	   "default:leaves",
+		"group:leaves",
-		   "default:leaves"
+		"group:leaves",
+		"group:leaves"
 	}
 })
 

door_models.lua

@@ -1,14 +1,7 @@
 
--- Boilerplate to support localized strings if intllib mod is installed.
+local S = homedecor.gettext
-local S
-if (minetest.get_modpath("intllib")) then
-    dofile(minetest.get_modpath("intllib").."/intllib.lua")
-    S = intllib.Getter(minetest.get_current_modname())
-else
-    S = function ( s ) return s end
-end
 
-homedecor_door_models = {
+homedecor.door_models = {
 	{
 		"closet_mahogany",
 		S("Mahogany Closet Door"),

doors_and_gates.lua

@@ -1,13 +1,6 @@
 -- Node definitions for Homedecor doors
 
--- Boilerplate to support localized strings if intllib mod is installed.
+local S = homedecor.gettext
-local S
-if (minetest.get_modpath("intllib")) then
-    dofile(minetest.get_modpath("intllib").."/intllib.lua")
-    S = intllib.Getter(minetest.get_current_modname())
-else
-    S = function ( s ) return s end
-end
 
 -- doors
 
@@ -158,9 +151,9 @@ for i in ipairs(sides) do
 	local side = sides[i]
 	local rside = rsides[i]
 
-	for j in ipairs(homedecor_door_models) do
+	for j in ipairs(homedecor.door_models) do
-		local doorname =		homedecor_door_models[j][1]
+		local doorname =		homedecor.door_models[j][1]
-		local doordesc =		homedecor_door_models[j][2]
+		local doordesc =		homedecor.door_models[j][2]
 		local nodeboxes_top = nil
 		local nodeboxes_bottom = nil
 		local texalpha = false
@@ -169,11 +162,11 @@ for i in ipairs(sides) do
 		end
 
 		if side == "left" then
-			nodeboxes_top =	homedecor_door_models[j][3]
+			nodeboxes_top =	homedecor.door_models[j][3]
-			nodeboxes_bottomtom =	homedecor_door_models[j][4]
+			nodeboxes_bottomtom =	homedecor.door_models[j][4]
 		else
-			nodeboxes_top =	homedecor_door_models[j][5]
+			nodeboxes_top =	homedecor.door_models[j][5]
-			nodeboxes_bottomtom =	homedecor_door_models[j][6]
+			nodeboxes_bottomtom =	homedecor.door_models[j][6]
 		end
 
 		local lower_top_side = "homedecor_door_"..doorname.."_tb.png"
@@ -234,9 +227,8 @@ for i in ipairs(sides) do
 				end
 			end,
 			on_rightclick = function(pos, node, clicker)
-				homedecor_flip_door({x=pos.x, y=pos.y-1, z=pos.z}, node, clicker, doorname, side)
+				homedecor.flip_door({x=pos.x, y=pos.y-1, z=pos.z}, node, clicker, doorname, side)
 			end
-
 		})
 
 		minetest.register_node("homedecor:door_"..doorname.."_bottom_"..side, {
@@ -261,11 +253,11 @@ for i in ipairs(sides) do
 				end
 			end,
 			on_place = function(itemstack, placer, pointed_thing)
-				homedecor_place_door(itemstack, placer, pointed_thing, doorname, side)
+				homedecor.place_door(itemstack, placer, pointed_thing, doorname, side)
 				return itemstack
 			end,
 			on_rightclick = function(pos, node, clicker)
-				homedecor_flip_door(pos, node, clicker, doorname, side)
+				homedecor.flip_door(pos, node, clicker, doorname, side)
 			end,
             -- both left and right doors may be used for open or closed doors
             -- so they have to have both action_on and action_off and just
@@ -279,13 +271,13 @@ for i in ipairs(sides) do
                     action_on = function(pos,node)
                         local isClosed = getClosed(pos)
                         if isClosed then
-                            homedecor_flip_door(pos,node,nil,doorname,side,isClosed)
+                            homedecor.flip_door(pos,node,nil,doorname,side,isClosed)
                         end
                     end,
                     action_off = function(pos,node)
                         local isClosed = getClosed(pos)
                         if not isClosed then
-                            homedecor_flip_door(pos,node,nil,doorname,side,isClosed)
+                            homedecor.flip_door(pos,node,nil,doorname,side,isClosed)
                         end
                     end
                 }
@@ -367,11 +359,11 @@ for i in ipairs(gates_list) do
 			fixed = gate_models_closed[i]
 		},
 		on_rightclick = function(pos, node, clicker)
-			homedecor_flip_gate(pos, node, clicker, gate, "closed")
+			homedecor.flip_gate(pos, node, clicker, gate, "closed")
 		end,
         mesecons = {
             effector = {
-                action_on = function(pos,node) homedecor_flip_gate(pos,node,player,gate, "closed") end
+                action_on = function(pos,node) homedecor.flip_gate(pos,node,player,gate, "closed") end
             }
         }
 	}
@@ -391,7 +383,7 @@ for i in ipairs(gates_list) do
 		"homedecor_gate_"..gate.."_back.png",
 		"homedecor_gate_"..gate.."_left.png",
         "homedecor_gate_"..gate.."_right.png"
-    },
+    }
     def.node_box.fixed = gate_models_open[i]
     def.drop = "homedecor:gate_"..gate.."_closed"
 	def.on_rightclick = function(pos, node, clicker)
@@ -422,7 +414,7 @@ local function get_nodedef_field(nodename, fieldname)
 	return minetest.registered_nodes[nodename][fieldname]
 end
 
-function homedecor_place_door(itemstack, placer, pointed_thing, name, side)
+function homedecor.place_door(itemstack, placer, pointed_thing, name, side)
 
 	local pointed = pointed_thing.under
 	local pnode = minetest.get_node(pointed)
@@ -445,10 +437,10 @@ function homedecor_place_door(itemstack, placer, pointed_thing, name, side)
 		local node_bottom = minetest.get_node(pos1)
 		local node_top = minetest.get_node(pos2)
 
-		if not homedecor_node_is_owned(pos1, placer)
+		if not homedecor:node_is_owned(pos1, placer) 
-		    and not homedecor_node_is_owned(pos2, placer) then
+		    and not homedecor:node_is_owned(pos2, placer) then
 
-			if not get_nodedef_field(node_bottom.name, "buildable_to")
+			if not get_nodedef_field(node_bottom.name, "buildable_to") 
 			    or not get_nodedef_field(node_top.name, "buildable_to") then
 				minetest.chat_send_player( placer:get_player_name(), S('Not enough space above that spot to place a door!') )
 			else
@@ -456,7 +448,7 @@ function homedecor_place_door(itemstack, placer, pointed_thing, name, side)
                 local def = { name = "homedecor:door_"..name.."_bottom_"..side, param2=fdir}
                 addDoorNode(pos1, def, true)
 				minetest.add_node(pos2, { name = "homedecor:door_"..name.."_top_"..side, param2=fdir})
-				if not homedecor_expect_infinite_stacks then
+				if not homedecor.expect_infinite_stacks then
 					itemstack:take_item()
 					return itemstack
 				end
@@ -471,7 +463,7 @@ end
 -- that is to say open "right" doors become left door nodes, and open left doors right door nodes.
 -- also adjusting param2 so the node is at 90 degrees.
 
-function homedecor_flip_door(pos, node, player, name, side, isClosed)
+function homedecor.flip_door(pos, node, player, name, side, isClosed)
     if isClosed == nil then
         isClosed = getClosed(pos)
     end

electronics.lua

@@ -1,13 +1,6 @@
 -- Various home electronics
 
--- Boilerplate to support localized strings if intllib mod is installed.
+local S = homedecor.gettext
-local S
-if (minetest.get_modpath("intllib")) then
-    dofile(minetest.get_modpath("intllib").."/intllib.lua")
-    S = intllib.Getter(minetest.get_current_modname())
-else
-    S = function ( s ) return s end
-end
 
 minetest.register_node('homedecor:speaker', {
 	description = S("Large Stereo Speaker"),