Merge branch 'master' of github.com:Ombridride/minetest-minetestforfun-server

mods/homedecor_modpack/signs_lib/init.lua

@@ -1108,6 +1108,54 @@ minetest.register_craft( {
         },
 })
 
+minetest.register_craft( {
+        output = "signs:sign_wall_orange 4",
+        recipe = {
+			{ "dye:orange", "dye:black", "dye:orange" },
+			{ "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }
+        },
+})
+
+minetest.register_craft( {
+        output = "signs:sign_wall_orange 2",
+        recipe = {
+			{ "dye:orange", "dye:black", "dye:orange" },
+			{ "steel:sheet_metal", "steel:sheet_metal", "steel:sheet_metal" }
+        },
+})
+
+minetest.register_craft( {
+        output = "signs:sign_wall_blue 4",
+        recipe = {
+			{ "dye:blue", "dye:white", "dye:blue" },
+			{ "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }
+        },
+})
+
+minetest.register_craft( {
+        output = "signs:sign_wall_blue 2",
+        recipe = {
+			{ "dye:blue", "dye:white", "dye:blue" },
+			{ "steel:sheet_metal", "steel:sheet_metal", "steel:sheet_metal" }
+        },
+})
+
+minetest.register_craft( {
+        output = "signs:sign_wall_brown 4",
+        recipe = {
+			{ "dye:brown", "dye:white", "dye:brown" },
+			{ "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }
+        },
+})
+
+minetest.register_craft( {
+        output = "signs:sign_wall_brown 2",
+        recipe = {
+			{ "dye:brown", "dye:white", "dye:brown" },
+			{ "steel:sheet_metal", "steel:sheet_metal", "steel:sheet_metal" }
+        },
+})
+
 if minetest.setting_get("log_mods") then
 	minetest.log("action", S("signs loaded"))
 end

mods/mesecons/mesecons_hydroturbine/init.lua

@@ -6,11 +6,16 @@
 minetest.register_node("mesecons_hydroturbine:hydro_turbine_off", {
 	drawtype = "mesh",
 	mesh = "jeija_hydro_turbine.obj",
-	tiles = {"jeija_hydro_turbine_off.png"},
+	tiles = {
+		"jeija_hydro_turbine_sides_off.png",
+		"jeija_hydro_turbine_top_bottom.png",
+		"jeija_hydro_turbine_turbine_top_bottom.png",
+		"jeija_hydro_turbine_turbine_misc.png"
+	},
 	inventory_image = "jeija_hydro_turbine_inv.png",
 	wield_scale = {x=0.75, y=0.75, z=0.75},
 	groups = {dig_immediate=2},
-    	description="Water Turbine",
+	description="Water Turbine",
 	paramtype = "light",
 	selection_box = {
 		type = "fixed",
@@ -26,7 +31,12 @@ minetest.register_node("mesecons_hydroturbine:hydro_turbine_on", {
 	drawtype = "mesh",
 	mesh = "jeija_hydro_turbine.obj",
 	wield_scale = {x=0.75, y=0.75, z=0.75},
-	tiles = {"jeija_hydro_turbine_on.png"},
+	tiles = {
+		"jeija_hydro_turbine_sides_on.png",
+		"jeija_hydro_turbine_top_bottom.png",
+		"jeija_hydro_turbine_turbine_top_bottom.png",
+		"jeija_hydro_turbine_turbine_misc.png"
+	},
 	inventory_image = "jeija_hydro_turbine_inv.png",
 	drop = "mesecons_hydroturbine:hydro_turbine_off 1",
 	groups = {dig_immediate=2,not_in_creative_inventory=1},

mods/mesecons/mesecons_walllever/init.lua

@@ -24,7 +24,12 @@ mesecon.register_node("mesecons_walllever:wall_lever", {
 		minetest.sound_play("mesecons_lever", {pos=pos})
 	end
 },{
-	tiles = { "jeija_wall_lever_off.png" },
+	tiles = {
+		"jeija_wall_lever_lever_light_off.png",
+		"jeija_wall_lever_front.png",
+		"jeija_wall_lever_front_bump.png",
+		"jeija_wall_lever_back_edges.png"
+	},
 	mesh="jeija_wall_lever_off.obj",
 	mesecons = {receptor = {
 		rules = mesecon.rules.buttonlike_get,
@@ -32,7 +37,12 @@ mesecon.register_node("mesecons_walllever:wall_lever", {
 	}},
 	groups = {dig_immediate = 2, mesecon_needs_receiver = 1}
 },{
-	tiles = { "jeija_wall_lever_on.png" },
+	tiles = {
+		"jeija_wall_lever_lever_light_on.png",
+		"jeija_wall_lever_front.png",
+		"jeija_wall_lever_front_bump.png",
+		"jeija_wall_lever_back_edges.png"
+	},
 	mesh="jeija_wall_lever_on.obj",
 	mesecons = {receptor = {
 		rules = mesecon.rules.buttonlike_get,

mods/pipeworks/luaentity.lua

@@ -11,7 +11,7 @@ local function read_file()
     	local t = f:read("*all")
     	f:close()
 	if t == "" or t == nil then return {} end
-	return minetest.deserialize(t)
+	return minetest.deserialize(t) or {}
 end
 
 local function write_file(tbl)
@@ -251,6 +251,10 @@ end
 -- end
 
 function luaentity.add_entity(pos, name)
+	if not luaentity.entities then
+		minetest.after(0, luaentity.add_entity, vector.new(pos), name)
+		return
+	end
 	local index = luaentity.entities_index
 	while luaentity.entities[index] do
 		index = index + 1

mods/plantlife_modpack/dryplants/init.lua

@@ -190,7 +190,11 @@ minetest.register_abm({
 	interval = GRASS_REGROWING_TIME, --1200, -- 20 minutes: a minetest-day/night-cycle
 	chance = 100/GRASS_REGROWING_CHANCE,
 	action = function(pos)
-		minetest.set_node(pos, {name="default:dirt_with_grass"})
+		-- Only become dirt with grass if no cut grass or hay lies on top
+		local above = minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z})
+		if above.name ~= "dryplants:grass" and above.name ~= "dryplants:hay" then
+			minetest.set_node(pos, {name="default:dirt_with_grass"})
+		end
 	end,
 })
 

mods/plantlife_modpack/ferns/gianttreefern.lua

@@ -110,11 +110,17 @@ minetest.register_node("ferns:tree_fern_leaves_giant", {
 		not_in_creative_inventory=1
 	},
 	drop = {
-		max_items = 1,
+		max_items = 2,
 		items = {
+			{
+				-- occasionally, drop a second sapling instead of leaves
+				-- (extra saplings can also be obtained by replanting and
+				--  reharvesting leaves)
+				items = {"ferns:sapling_giant_tree_fern"},
+				rarity = 10,
+			},
 			{
 				items = {"ferns:sapling_giant_tree_fern"},
-				rarity = 40,
 			},
 			{
 				items = {"ferns:tree_fern_leaves_giant"},

mods/plantlife_modpack/ferns/treefern.lua

@@ -18,7 +18,11 @@ abstract_ferns.grow_tree_fern = function(pos)
 		return
 	end
 
-	local size = math.random(1, 5)
+	local size = math.random(1, 4) + math.random(1, 4)
+	if (size > 5) then
+		size = 10 - size
+	end
+	size = size + 1
 	local crown = ({ "ferns:tree_fern_leaves", "ferns:tree_fern_leaves_02" })[math.random(1, 2)]
 
 	local i = 1