Merge remote-tracking branch 'upstream/master'

compatibility.lua

@@ -15,13 +15,6 @@ minetest.override_item("default:apple", {
 		leafdecay = 3, leafdecay_drop = 1}
 })
 
-if minetest.registered_nodes["flowers:mushroom_brown"] then
-minetest.override_item("flowers:mushroom_brown", {
-	light_source = 1,
-	groups = {food_mushroom = 1, snappy = 3, attached_node = 1, flammable = 2}
-})
-end
-
 --= Aliases
 
 -- Banana

crops/melon.lua

@@ -71,22 +71,22 @@ def.tiles = {"farming_melon_7.png"}
 minetest.register_node("farming:melon_7", table.copy(def))
 
 -- stage 8 (final)
-def.drawtype = "nodebox"
-def.description = S("Melon")
-def.tiles = {
-	"farming_melon_top.png", "farming_melon_bottom.png", "farming_melon_side.png"
-}
-def.selection_box = {-.5, -.5, -.5, .5, .5, .5}
-def.walkable = true
-def.buildable_to = false
-def.paramtype2 = "facedir"
-def.groups = {
-	food_melon = 1, snappy = 2, oddly_breakable_by_hand = 1,
-	flammable = 2, plant = 1
-}
-def.drop = "farming:melon_8"
-def.on_place = minetest.rotate_node
-minetest.register_node("farming:melon_8", table.copy(def))
+minetest.register_node("farming:melon_8", {
+	description = S("Melon"),
+	tiles = {
+		"farming_melon_top.png",
+		"farming_melon_bottom.png",
+		"farming_melon_side.png"
+	},
+	groups = {
+		food_melon = 1, snappy = 2, oddly_breakable_by_hand = 1,
+		flammable = 2, plant = 1
+	},
+	drop = "farming:melon_8",
+	sounds = default.node_sound_wood_defaults(),
+	paramtype2 = "facedir",
+	on_place = minetest.rotate_node
+})
 
 -- add to registered_plants
 farming.registered_plants["farming:melon"] = {

crops/pumpkin.lua

@@ -183,7 +183,7 @@ minetest.register_node("farming:pumpkin_8", {
 	description = S("Pumpkin"),
 	tiles = {
 		"farming_pumpkin_top.png",
-		"farming_pumpkin_top.png",
+		"farming_pumpkin_bottom.png",
 		"farming_pumpkin_side.png"
 	},
 	groups = {
@@ -191,7 +191,9 @@ minetest.register_node("farming:pumpkin_8", {
 		flammable = 2, plant = 1
 	},
 	drop = "farming:pumpkin_8",
-	sounds = default.node_sound_wood_defaults()
+	sounds = default.node_sound_wood_defaults(),
+	paramtype2 = "facedir",
+	on_place = minetest.rotate_node
 })
 
 minetest.register_alias("farming:pumpkin", "farming:pumpkin_8")

crops/soy.lua

@@ -42,15 +42,26 @@ minetest.register_node("farming:soy_sauce", {
 	sounds = default.node_sound_glass_defaults()
 })
 
+-- river water availability check
+local bucket_water
+
+if minetest.get_mapgen_setting("mgname") == "valleys"
+or minetest.get_modpath("ethereal") then
+	bucket_water = "bucket:bucket_river_water"
+else
+	bucket_water = "bucket:bucket_water"
+end
+
+-- soy sauce recipe
 minetest.register_craft( {
 	output = "farming:soy_sauce",
 	recipe = {
 		{"group:food_soy", "group:food_salt", "group:food_soy"},
 		{"", "group:food_juicer", ""},
-		{"", "bucket:bucket_river_water", "vessels:glass_bottle"}
+		{"", bucket_water, "vessels:glass_bottle"}
 	},
 	replacements = {
-		{"bucket:bucket_river_water", "bucket:bucket_empty"},
+		{bucket_water, "bucket:bucket_empty"},
 		{"group:food_juicer", "farming:juicer"}
 	}
 })

hoes.lua

@@ -361,7 +361,7 @@ farming.add_to_scythe_not_drops = function(item)
 end
 
 minetest.register_tool("farming:scythe_mithril", {
-	description = S("Mithril Scythe (Right-click to harvest and replant crops)"),
+	description = S("Mithril Scythe (Use to harvest and replant crops)"),
 	inventory_image = "farming_scythe_mithril.png",
 	sound = {breaks = "default_tool_breaks"},