Merge remote-tracking branch 'refs/remotes/origin/master' into 1.1

mods/decoblocks/nodes.lua

@@ -800,7 +800,7 @@ minetest.register_node("decoblocks:bone_pillar", {
 
 minetest.register_node("decoblocks:framed_glass", {
 	description = "Glass With Wooden Frame",
-	drawtype = "glasslike",
+	drawtype = "glasslike_framed_optional",
 	tiles = {"decoblocks_framed_glass.png", "decoblocks_framed_glass_detail.png"},
 	paramtype = "light",
 	sunlight_propagates = true,

mods/farming/melon.lua

@@ -165,7 +165,14 @@ minetest.register_node("farming:melon_block", {
 })
 
 minetest.register_craft({
-	output = "default:melon_5 1",
+	output = "farming:melon 9",
+	recipe = {
+		{"farming:melon_block"},
+	}
+})
+
+minetest.register_craft({
+	output = "farming:melon_block",
 	recipe = {
 		{"farming:melon", "farming:melon", "farming:melon"},
 		{"farming:melon", "farming:melon", "farming:melon"},

mods/farming/pumpkin.lua

@@ -165,7 +165,7 @@ minetest.register_node("farming:pumpkin_block", {
 })
 
 minetest.register_craft({
-	output = "default:pumpkin_5 1",
+	output = "farming:pumpkin_block",
 	recipe = {
 		{"farming:pumpkin", "farming:pumpkin", "farming:pumpkin"},
 		{"farming:pumpkin", "farming:pumpkin", "farming:pumpkin"},
@@ -173,6 +173,14 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = "farming:pumpkin 9",
+	recipe = {
+		{"farming:pumpkin_block"},
+
+	}
+})
+
 minetest.register_node("farming:pumpkin_6", {
 	tiles = {
 	"farming_pumpkin_6_top.png",
@@ -339,7 +347,7 @@ minetest.register_node("farming:cut_pumpkin_5", {
 	},
 	drop = {
 		items = {
-			{items = {'farming:pumpkin'}, rarity = 1},
+			{items = {'farming:pumpkin_block'}, rarity = 1},
 		}
 	},
 	groups = {snappy=3, flammable=2, plant=1, attached_node=1, not_in_creative_inventory=1},

mods/mapgen/crafts.lua

@@ -66,16 +66,16 @@ minetest.register_craft( {
 })
 
 minetest.register_craft( {
-	output = "mapgen:coconut",
+	output = "fruit:coconut",
 	recipe = {
-		{ "mapgen:palm_leaves_coconut",},
+		{ "fruit:palm_leaves_coconut",},
 	}
 })
 
 minetest.register_craft( {
-	output = "mapgen:coconut_open 2",
+	output = "fruit:coconut_open 2",
 	recipe = {
-		{ "mapgen:coconut",},
+		{ "fruit:coconut",},
 	}
 })
 

mods/mapgen/nodes.lua

@@ -824,8 +824,9 @@ minetest.register_node("mapgen:bamboo", {
 
 minetest.register_node("mapgen:bamboo_leaves", {
 	description = "Bamboo Leaves",
-	drawtype = "allfaces",
+	drawtype = "allfaces_optional",
 	tiles = {"mapgen_bamboo_leaves.png"},
+	waving = 1,
 	paramtype = "light",
 	is_ground_content = false,
 	sunlight_propagates = false,