From a2ccdf7cf087f06d9af73ce96dc96e2bb98fa651 Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Fri, 26 Apr 2013 07:24:13 -0400
Subject: [PATCH] removed cotton plant spawning abm since it is in the flora
 group and is being spawned automatically by the default flowers code.

took all other plants out of flora group so they don't get spawned by that
code.
---
 flowers_plus/init.lua | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/flowers_plus/init.lua b/flowers_plus/init.lua
index 4d2d4c7..685002b 100644
--- a/flowers_plus/init.lua
+++ b/flowers_plus/init.lua
@@ -41,7 +41,7 @@ minetest.register_node(":flowers:waterlily", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	walkable = false,
-	groups = { snappy = 3,flammable=2,flower=1, flora=1 },
+	groups = { snappy = 3,flammable=2,flower=1 },
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
 		type = "fixed",
@@ -62,7 +62,7 @@ minetest.register_node(":flowers:waterlily_225", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	walkable = false,
-	groups = { snappy = 3,flammable=2,flower=1, flora=1, not_in_creative_inventory=1 },
+	groups = { snappy = 3,flammable=2,flower=1, not_in_creative_inventory=1 },
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
 		type = "fixed",
@@ -84,7 +84,7 @@ minetest.register_node(":flowers:waterlily_45", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	walkable = false,
-	groups = { snappy = 3,flammable=2,flower=1, flora=1, not_in_creative_inventory=1 },
+	groups = { snappy = 3,flammable=2,flower=1, not_in_creative_inventory=1 },
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
 		type = "fixed",
@@ -106,7 +106,7 @@ minetest.register_node(":flowers:waterlily_675", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	walkable = false,
-	groups = { snappy = 3,flammable=2,flower=1, flora=1, not_in_creative_inventory=1 },
+	groups = { snappy = 3,flammable=2,flower=1, not_in_creative_inventory=1 },
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
 		type = "fixed",
@@ -130,7 +130,7 @@ minetest.register_node(":flowers:seaweed", {
 	paramtype = "light",
 	paramtype2 = "wallmounted",
 	walkable = false,
-	groups = { snappy = 3,flammable=2,flower=1, flora=1 },
+	groups = { snappy = 3,flammable=2,flower=1 },
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
 		type = "fixed",
@@ -199,17 +199,6 @@ end
 
 -- spawn ABM registrations
 
-plantslib:spawn_on_surfaces({
-	spawn_delay = SPAWN_DELAY,
-	spawn_plants = { "flowers:cotton_plant"},
-	avoid_radius = 7,
-	spawn_chance = SPAWN_CHANCE,
-	spawn_surfaces = {"default:dirt_with_grass"},
-	avoid_nodes = {"group:flower", "group:flora", "group:poisonivy"},
-	seed_diff = flowers_seed_diff,
-	light_min = 9
-})
-
 plantslib:spawn_on_surfaces({
 	spawn_delay = SPAWN_DELAY/2,
 	spawn_plants = {