merge upstream

mods/default/crafting.lua

@@ -49,6 +49,13 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = "default:pine_wood",
+	recipe = {
+		{"default:pine_bush_stem"},
+	}
+})
+
 minetest.register_craft({
 	output = 'default:stick 4',
 	recipe = {
@@ -763,14 +770,35 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = "default:emergent_jungle_sapling",
+	recipe = {
+		{"default:junglesapling", "default:junglesapling", "default:junglesapling"},
+		{"default:junglesapling", "default:junglesapling", "default:junglesapling"},
+		{"default:junglesapling", "default:junglesapling", "default:junglesapling"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:large_cactus_seedling",
+	recipe = {
+		{"", "default:cactus", ""},
+		{"default:cactus", "default:cactus", "default:cactus"},
+		{"", "default:cactus", ""},
+	}
+})
+
+
 --
 -- Crafting (tool repair)
 --
+
 minetest.register_craft({
 	type = "toolrepair",
 	additional_wear = -0.02,
 })
 
+
 --
 -- Cooking recipes
 --
@@ -849,11 +877,12 @@ minetest.register_craft({
 	cooktime = 5,
 })
 
+
 --
 -- Fuels
 --
 
--- Support use of group:tree
+-- Support use of group:tree, includes default:tree which has the same burn time
 minetest.register_craft({
 	type = "fuel",
 	recipe = "group:tree",
@@ -876,12 +905,6 @@ minetest.register_craft({
 	burntime = 26,
 })
 
-minetest.register_craft({
-	type = "fuel",
-	recipe = "default:tree",
-	burntime = 30,
-})
-
 minetest.register_craft({
 	type = "fuel",
 	recipe = "default:acacia_tree",
@@ -895,7 +918,7 @@ minetest.register_craft({
 })
 
 
--- Support use of group:wood
+-- Support use of group:wood, includes default:wood which has the same burn time
 minetest.register_craft({
 	type = "fuel",
 	recipe = "group:wood",
@@ -914,12 +937,6 @@ minetest.register_craft({
 	burntime = 6,
 })
 
-minetest.register_craft({
-	type = "fuel",
-	recipe = "default:wood",
-	burntime = 7,
-})
-
 minetest.register_craft({
 	type = "fuel",
 	recipe = "default:acacia_wood",
@@ -933,53 +950,59 @@ minetest.register_craft({
 })
 
 
--- Support use of group:sapling
+-- Support use of group:sapling, includes default:sapling which has the same burn time
 minetest.register_craft({
 	type = "fuel",
 	recipe = "group:sapling",
-	burntime = 10,
+	burntime = 5,
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "default:bush_sapling",
-	burntime = 6,
+	burntime = 3,
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "default:acacia_bush_sapling",
-	burntime = 7,
+	burntime = 4,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:pine_bush_sapling",
+	burntime = 2,
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "default:aspen_sapling",
-	burntime = 8,
+	burntime = 4,
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "default:pine_sapling",
-	burntime = 9,
-})
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "default:sapling",
-	burntime = 10,
+	burntime = 5,
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "default:acacia_sapling",
-	burntime = 11,
+	burntime = 6,
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "default:junglesapling",
-	burntime = 12,
+	burntime = 6,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:emergent_jungle_sapling",
+	burntime = 7,
 })
 
 
@@ -1014,6 +1037,37 @@ minetest.register_craft({
 })
 
 
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:fence_rail_aspen_wood",
+	burntime = 3,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:fence_rail_pine_wood",
+	burntime = 4,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:fence_rail_wood",
+	burntime = 5,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:fence_rail_acacia_wood",
+	burntime = 6,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:fence_rail_junglewood",
+	burntime = 7,
+})
+
+
 minetest.register_craft({
 	type = "fuel",
 	recipe = "default:bush_stem",
@@ -1026,16 +1080,22 @@ minetest.register_craft({
 	burntime = 8,
 })
 
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:pine_bush_stem",
+	burntime = 6,
+})
+
 minetest.register_craft({
 	type = "fuel",
 	recipe = "default:junglegrass",
-	burntime = 2,
+	burntime = 3,
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "group:leaves",
-	burntime = 1,
+	burntime = 4,
 })
 
 minetest.register_craft({
@@ -1044,10 +1104,16 @@ minetest.register_craft({
 	burntime = 15,
 })
 
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:large_cactus_seedling",
+	burntime = 5,
+})
+
 minetest.register_craft({
 	type = "fuel",
 	recipe = "default:papyrus",
-	burntime = 1,
+	burntime = 3,
 })
 
 minetest.register_craft({
@@ -1059,7 +1125,7 @@ minetest.register_craft({
 minetest.register_craft({
 	type = "fuel",
 	recipe = "default:ladder_wood",
-	burntime = 2,
+	burntime = 7,
 })
 
 minetest.register_craft({
@@ -1092,12 +1158,6 @@ minetest.register_craft({
 	burntime = 30,
 })
 
-minetest.register_craft({
-	type = "fuel",
-	recipe = "default:apple",
-	burntime = 3,
-})
-
 minetest.register_craft({
 	type = "fuel",
 	recipe = "default:coal_lump",
@@ -1122,6 +1182,18 @@ minetest.register_craft({
 	burntime = 2,
 })
 
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:fern_1",
+	burntime = 2,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "default:marram_grass_1",
+	burntime = 2,
+})
+
 minetest.register_craft({
 	type = "fuel",
 	recipe = "default:paper",