From 88888760f5b1043497e01f51521a9c1793d24add Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Sat, 11 Feb 2017 20:57:56 +0100
Subject: [PATCH] Rename mcl_core:grass to mcl_core:tallgrass

---
 mods/mcl_core/mapgen.lua    |  4 ++--
 mods/mcl_core/nodes.lua     |  2 +-
 mods/mcl_dye/init.lua       | 10 +++++-----
 mods/mcl_flowers/mapgen.lua |  4 ++--
 mods/mobs_mc/cow.lua        |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/mods/mcl_core/mapgen.lua b/mods/mcl_core/mapgen.lua
index 55dcdc53..30a847a7 100644
--- a/mods/mcl_core/mapgen.lua
+++ b/mods/mcl_core/mapgen.lua
@@ -24,7 +24,7 @@ minetest.register_alias("mapgen_clay", "mcl_core:clay")
 minetest.register_alias("mapgen_lava_source", "mcl_core:lava_source")
 minetest.register_alias("mapgen_cobble", "mcl_core:cobble")
 minetest.register_alias("mapgen_mossycobble", "mcl_core:mossycobble")
-minetest.register_alias("mapgen_junglegrass", "mcl_core:grass")
+minetest.register_alias("mapgen_junglegrass", "mcl_core:tallgrass")
 minetest.register_alias("mapgen_stone_with_coal", "mcl_core:stone_with_coal")
 minetest.register_alias("mapgen_stone_with_iron", "mcl_core:stone_with_iron")
 minetest.register_alias("mapgen_desert_sand", "mcl_core:sand")
@@ -471,7 +471,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
 							
 						-- If dirt with grass, add grass
 						elseif nn == "mcl_core:dirt_with_grass" then
-							minetest.set_node(p,{name="mcl_core:grass"})
+							minetest.set_node(p,{name="mcl_core:tallgrass"})
 							if math.random(0,12000) == 1 then 
 								-- TODO: Re-enable random_struct
 								--random_struct.call_struct(p,1)
diff --git a/mods/mcl_core/nodes.lua b/mods/mcl_core/nodes.lua
index 8e1c7ae9..c9fc3e17 100644
--- a/mods/mcl_core/nodes.lua
+++ b/mods/mcl_core/nodes.lua
@@ -1349,7 +1349,7 @@ minetest.register_node("mcl_core:dry_shrub", {
 	},
 })
 
-minetest.register_node("mcl_core:grass", {
+minetest.register_node("mcl_core:tallgrass", {
 	description = "Tall Grass",
 	drawtype = "plantlike",
 	tiles = {"default_tallgrass.png"},
diff --git a/mods/mcl_dye/init.lua b/mods/mcl_dye/init.lua
index 55572788..313933fc 100644
--- a/mods/mcl_dye/init.lua
+++ b/mods/mcl_dye/init.lua
@@ -101,11 +101,11 @@ end
 local apply_bone_meal = function(pointed_thing)
 	local plant_tab = {
 		"air",
-		"mcl_core:grass",
-		"mcl_core:grass",
-		"mcl_core:grass",
-		"mcl_core:grass",
-		"mcl_core:grass",
+		"mcl_core:tallgrass",
+		"mcl_core:tallgrass",
+		"mcl_core:tallgrass",
+		"mcl_core:tallgrass",
+		"mcl_core:tallgrass",
 		"mcl_flowers:dandelion",
 		"mcl_flowers:blue_orchid",
 		"mcl_flowers:oxeye_daisy",
diff --git a/mods/mcl_flowers/mapgen.lua b/mods/mcl_flowers/mapgen.lua
index 6231ea70..55a926cc 100644
--- a/mods/mcl_flowers/mapgen.lua
+++ b/mods/mcl_flowers/mapgen.lua
@@ -55,7 +55,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
 						if nn == "mcl_core:dirt_with_grass" then
 							--local flower_choice = pr:next(1, 11)
 							local flower_choice = math.random(0, 10)
-							local flower = "mcl_core:grass"
+							local flower = "mcl_core:tallgrass"
 							if flower_choice == 1 then
 								flower = "mcl_flowers:dandelion"
 								minetest.set_node(p, {name=flower})
@@ -90,7 +90,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
 								flower = "mcl_flowers:blue_orchid"
 								minetest.set_node(p, {name=flower})
 							else
-								flower = "mcl_core:grass"
+								flower = "mcl_core:tallgrass"
 								minetest.set_node(p, {name=flower})
 							end
 							
diff --git a/mods/mobs_mc/cow.lua b/mods/mobs_mc/cow.lua
index ede5dc86..8a71cbda 100644
--- a/mods/mobs_mc/cow.lua
+++ b/mods/mobs_mc/cow.lua
@@ -75,10 +75,10 @@ mobs:register_mob("mobs_mc:cow", {
 	end,
 	]]
 	--from mobs_animals
-	follow = "farming:wheat",
+	follow = "mcl_farming:wheat_harvested",
 	view_range = 7,
 	replace_rate = 10,
-	replace_what = {"mcl_core:grass_3", "mcl_core:grass_4", "mcl_core:grass_5", "farming:wheat_8"},
+	replace_what = {"mcl_core:tallgrass",},
 	replace_with = "air",
 	fear_height = 2,
 	on_rightclick = function(self, clicker)