From 38b411187860ca47a59f1cbe64c02173f2c1bc84 Mon Sep 17 00:00:00 2001
From: TenPlus1 <kinsellaja@yahoo.com>
Date: Sat, 4 Jun 2016 15:00:53 +0100
Subject: [PATCH] Tweaked code slightly

---
 cotton.lua |  7 ++++++
 init.lua   | 64 +++++++++++++++++++++++++-----------------------------
 2 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/cotton.lua b/cotton.lua
index b3e131b..eef6425 100644
--- a/cotton.lua
+++ b/cotton.lua
@@ -114,3 +114,10 @@ crop_def.drop = {
 	}
 }
 minetest.register_node("farming:cotton_8", table.copy(crop_def))
+
+--[[ Cotton (example, is already registered in cotton.lua)
+farming.register_plant("farming:cotton", {
+	description = "Cotton seed",
+	inventory_image = "farming_cotton_seed.png",
+	steps = 8,
+})]]
diff --git a/init.lua b/init.lua
index 8e40478..922be4a 100644
--- a/init.lua
+++ b/init.lua
@@ -1,5 +1,5 @@
 --[[
-	Minetest Farming Redo Mod 1.22 (30th May 2016)
+	Minetest Farming Redo Mod 1.22 (4th June 2016)
 	by TenPlus1
 	NEW growing routine by prestidigitator
 	auto-refill by crabman77
@@ -50,6 +50,7 @@ end
 local statistics = dofile(farming.path.."/statistics.lua")
 
 -- Intllib
+
 local S
 if minetest.get_modpath("intllib") then
 	S = intllib.Getter()
@@ -58,31 +59,6 @@ else
 end
 farming.intllib = S
 
-dofile(farming.path.."/soil.lua")
-dofile(farming.path.."/hoes.lua")
-dofile(farming.path.."/grass.lua")
-dofile(farming.path.."/wheat.lua")
-dofile(farming.path.."/cotton.lua")
-dofile(farming.path.."/carrot.lua")
-dofile(farming.path.."/potato.lua")
-dofile(farming.path.."/tomato.lua")
-dofile(farming.path.."/cucumber.lua")
-dofile(farming.path.."/corn.lua")
-dofile(farming.path.."/coffee.lua")
-dofile(farming.path.."/melon.lua")
-dofile(farming.path.."/sugar.lua")
-dofile(farming.path.."/pumpkin.lua")
-dofile(farming.path.."/cocoa.lua")
-dofile(farming.path.."/raspberry.lua")
-dofile(farming.path.."/blueberry.lua")
-dofile(farming.path.."/rhubarb.lua")
-dofile(farming.path.."/beanpole.lua")
-dofile(farming.path.."/grapes.lua")
-dofile(farming.path.."/barley.lua")
-dofile(farming.path.."/donut.lua")
-dofile(farming.path.."/mapgen.lua")
-dofile(farming.path.."/compatibility.lua") -- Farming Plus compatibility
-
 -- Utility Functions
 
 local time_speed = tonumber(minetest.setting_get("time_speed")) or 72
@@ -673,7 +649,7 @@ farming.register_plant = function(name, def)
 
 		-- Last step doesn't need growing=1 so Abm never has to check these
 		if i == def.steps then
-			g = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1}
+			g.growing = 0
 		end
 
 		local node_name = mname .. ":" .. pname .. "_" .. i
@@ -691,7 +667,7 @@ farming.register_plant = function(name, def)
 			sounds = default.node_sound_leaves_defaults(),
 		})
 
-		register_plant_node(node_name)
+--		register_plant_node(node_name)
 	end
 
 	-- Return info
@@ -699,9 +675,29 @@ farming.register_plant = function(name, def)
 	return r
 end
 
---[[ Cotton (example, is already registered in cotton.lua)
-farming.register_plant("farming:cotton", {
-	description = "Cotton2 seed",
-	inventory_image = "farming_cotton_seed.png",
-	steps = 8,
-})]]
+-- load crops
+
+dofile(farming.path.."/soil.lua")
+dofile(farming.path.."/hoes.lua")
+dofile(farming.path.."/grass.lua")
+dofile(farming.path.."/wheat.lua")
+dofile(farming.path.."/cotton.lua")
+dofile(farming.path.."/carrot.lua")
+dofile(farming.path.."/potato.lua")
+dofile(farming.path.."/tomato.lua")
+dofile(farming.path.."/cucumber.lua")
+dofile(farming.path.."/corn.lua")
+dofile(farming.path.."/coffee.lua")
+dofile(farming.path.."/melon.lua")
+dofile(farming.path.."/sugar.lua")
+dofile(farming.path.."/pumpkin.lua")
+dofile(farming.path.."/cocoa.lua")
+dofile(farming.path.."/raspberry.lua")
+dofile(farming.path.."/blueberry.lua")
+dofile(farming.path.."/rhubarb.lua")
+dofile(farming.path.."/beanpole.lua")
+dofile(farming.path.."/grapes.lua")
+dofile(farming.path.."/barley.lua")
+dofile(farming.path.."/donut.lua")
+dofile(farming.path.."/mapgen.lua")
+dofile(farming.path.."/compatibility.lua") -- Farming Plus compatibility