Merge remote-tracking branch 'upstream/master'

init.lua

@@ -708,3 +708,5 @@ dofile(farming.path .. "/food.lua")
 dofile(farming.path .. "/mapgen.lua")
 dofile(farming.path .. "/compatibility.lua") -- Farming Plus compatibility
 dofile(farming.path .. "/lucky_block.lua")
+
+minetest.log("action", "[farming] loaded.")

mapgen.lua

@@ -34,7 +34,7 @@ end
 -- add crops to mapgen
 register_plant("potato_3", 15, 40, nil, "", -1, farming.potato)
 register_plant("tomato_7", 5, 20, nil, "", -1, farming.tomato)
-register_plant("corn_7", 12, 22, nil, "", -1, farming.corn)
+register_plant("corn_7", 12, 22, nil, "", -1, nil)
 register_plant("coffee_5", 20, 45, {"default:dirt_with_dry_grass",
 	"default:dirt_with_rainforest_litter",
 	"default:dry_dirt_with_dry_grass"}, "", -1, farming.coffee)
@@ -66,7 +66,7 @@ if minetest.get_mapgen_setting("mg_name") == "v6" then
 	register_plant("pumpkin_8", 1, 20, nil, "group:water", 1, farming.pumpkin)
 else
 	-- v7 maps have a beach so plants growing near water is limited to 6 high
-	register_plant("carrot_8", 1, 15, nil, "", -1, farming.carrot)
+	register_plant("carrot_8", 1, 15, nil, "", -1, nil)
 	register_plant("cucumber_4", 1, 10, nil, "", -1, farming.cucumber)
 	register_plant("melon_8", 1, 6, {"default:dirt_with_dry_grass",
 		"default:dirt_with_rainforest_litter"}, "", -1, farming.melon)