Merge branch 'master' into fishing-sounds

mods/ITEMS/mcl_beacons/init.lua

@@ -89,7 +89,7 @@ local function get_beacon_beam(glass_nodename)
 end
 
 minetest.register_node("mcl_beacons:beacon_beam", {
-	tiles = {"^[colorize:#b8bab9"},
+	tiles = {"blank.png^[noalpha^[colorize:#b8bab9"},
 	drawtype = "nodebox",
 	node_box = {
 		type = "fixed",

mods/ITEMS/mcl_core/nodes_base.lua

@@ -370,7 +370,7 @@ minetest.register_node("mcl_core:dirt_with_grass", {
 	_doc_items_hidden = false,
 	paramtype2 = "color",
 	tiles = {"mcl_core_grass_block_top.png", { name="default_dirt.png", color="white" }, { name="default_dirt.png^mcl_dirt_grass_shadow.png", color="white" }},
-	overlay_tiles = {"mcl_core_grass_block_top.png", "", {name="mcl_core_grass_block_side_overlay.png", tileable_vertical=false}},
+	overlay_tiles = {"mcl_core_grass_block_top.png", "blank.png", {name="mcl_core_grass_block_side_overlay.png", tileable_vertical=false}},
 	palette = "mcl_core_palette_grass.png",
 	palette_index = 0,
 	color = "#7CBD6B",

mods/ITEMS/mcl_core/nodes_misc.lua

@@ -71,7 +71,7 @@ minetest.register_node("mcl_core:slimeblock", {
 					neighbor_node = minetest.get_node(neighbor_pos)
 				end
 				local name = neighbor_node.name
-				if name ~= "air" and name ~= "ignore" and not mesecon.mvps_unsticky[name] then
+				if name ~= "air" and name ~= "ignore" and name ~= "mcl_honey:honey_block" and not mesecon.mvps_unsticky[name] then
 					local piston, piston_side, piston_up, piston_down = false, false, false, false
 					if name == "mesecons_pistons:piston_sticky_off" or name == "mesecons_pistons:piston_normal_off" then
 						piston, piston_side = true, true

mods/ITEMS/mcl_farming/shared_functions.lua

@@ -314,18 +314,18 @@ function mcl_farming:add_gourd(full_unconnected_stem, connected_stem_basename, s
 		  "blank.png", -- right
 		  "blank.png", -- left
 		  connected_stem_texture, -- back
-		  connected_stem_texture .. "^[transformFX90" --front
+		  connected_stem_texture .. "^[transformFX" --front
 		},
 		{ "blank.png", --top
 		  "blank.png", -- bottom
 		  "blank.png", -- right
 		  "blank.png", -- left
-		  connected_stem_texture .. "^[transformFX90", --back
+		  connected_stem_texture .. "^[transformFX", --back
 		  connected_stem_texture, -- front
 		},
 		{ "blank.png", --top
 		  "blank.png", -- bottom
-		  connected_stem_texture .. "^[transformFX90", -- right
+		  connected_stem_texture .. "^[transformFX", -- right
 		  connected_stem_texture, -- left
 		  "blank.png", --back
 		  "blank.png", -- front
@@ -333,7 +333,7 @@ function mcl_farming:add_gourd(full_unconnected_stem, connected_stem_basename, s
 		{ "blank.png", --top
 		  "blank.png", -- bottom
 		  connected_stem_texture, -- right
-		  connected_stem_texture .. "^[transformFX90", -- left
+		  connected_stem_texture .. "^[transformFX", -- left
 		  "blank.png", --back
 		  "blank.png", -- front
 		}

mods/ITEMS/mcl_honey/init.lua

@@ -116,7 +116,7 @@ minetest.register_node("mcl_honey:honey_block", {
 					neighbor_node = minetest.get_node(neighbor_pos)
 				end
 				local name = neighbor_node.name
-				if name ~= "air" and name ~= "ignore" and not mesecon.mvps_unsticky[name] then
+				if name ~= "air" and name ~= "ignore" and name ~= "mcl_core:slimeblock" and not mesecon.mvps_unsticky[name] then
 					local piston, piston_side, piston_up, piston_down = false, false, false, false
 					if name == "mesecons_pistons:piston_sticky_off" or name == "mesecons_pistons:piston_normal_off" then
 						piston, piston_side = true, true

mods/ITEMS/mcl_stairs/api.lua

@@ -213,7 +213,6 @@ function mcl_stairs.register_slab(subname, recipeitem, groups, images, descripti
 	-- Automatically generate double slab description
 	if not double_description then
 		double_description = S("Double @1", description)
-		minetest.log("warning", "[stairs] No explicit description for double slab '"..double_slab.."' added. Using auto-generated description.")
 	end
 
 	groups.slab = 1