Merge branch 'master' into nalc-1.2

README.md

@@ -13,7 +13,7 @@ This mod works by adding your new plant to the {growing=1} group and numbering t
 
 ### Changelog:
 
-- 1.42 - Soil needs water to be present within 3 blocks horizontally and 2 below to make wet soil, Jack 'o Lanterns now check protection.
+- 1.42 - Soil needs water to be present within 3 blocks horizontally and 1 below to make wet soil, Jack 'o Lanterns now check protection.
 - 1.41 - Each crop has it's own spawn rate (can be changed in farming.conf)
 - 1.40 - Added Mithril Scythe to quick harvest and replant crops on right-click.  Added Hoe's for MoreOres with Toolrank support.
 - 1.39 - Added Rice, Rye and Oats thanks to Ademants Grains mod.  Added Jaffa Cake and multigrain bread.

farming.conf_example

@@ -30,7 +30,6 @@ farming.pineapple = 0.001
 farming.peas = 0.001
 farming.beetroot = 0.001
 farming.grains = true -- true or false only
-farming.rarety = 0.002
 
 -- default rarety of crops on map (higher number = more crops)
 farming.rarety = 0.002

init.lua

@@ -269,7 +269,7 @@ end
 
 minetest.after(0, function()
 
-	for _, node_def in ipairs(minetest.registered_nodes) do
+	for _, node_def in pairs(minetest.registered_nodes) do
 		register_plant_node(node_def)
 	end
 end)

soil.lua

@@ -54,9 +54,9 @@ minetest.register_abm({
 		-- check if there is water nearby and change soil accordingly
 --		if minetest.find_node_near(pos, 3, {"group:water"}) then
 
-		-- check if water is within 3 nodes horizontally and 2 below
+		-- check if water is within 3 nodes horizontally and 1 below
 		if #minetest.find_nodes_in_area(
-				{x = pos.x + 3, y = pos.y + 2, z = pos.z + 3},
+				{x = pos.x + 3, y = pos.y - 1, z = pos.z + 3},
 				{x = pos.x - 3, y = pos.y    , z = pos.z - 3},
 				{"group:water"}) > 0 then