Merge remote-tracking branch 'upstream/master'

init.lua

@@ -712,3 +712,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

@@ -39,7 +39,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("raspberry_4", 3, 10, nil, "", -1, farming.raspberry)
 register_plant("rhubarb_3", 3, 15, nil, "", -1, farming.rhubarb)
 register_plant("blueberry_4", 3, 10, nil, "", -1, farming.blueberry)
@@ -70,7 +70,7 @@ if mg_name == "v6" then
 	register_plant("soy_6", 20, 50, nil, "", -1, farming.soy)
 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)