From b5a4adc2e397653a9384fe8c4f23e56fcd9b6d0c Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Sat, 11 Feb 2017 21:00:42 +0100
Subject: [PATCH] Rename mcl_core:dry_shrub to mcl_core:deadbush

---
 mods/mcl_core/mapgen.lua      | 2 +-
 mods/mcl_core/nodes.lua       | 2 +-
 mods/mcl_flowerpots/nodes.lua | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/mods/mcl_core/mapgen.lua b/mods/mcl_core/mapgen.lua
index 30a847a734..bbed3adb55 100644
--- a/mods/mcl_core/mapgen.lua
+++ b/mods/mcl_core/mapgen.lua
@@ -467,7 +467,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
 						nn = minetest.get_node({x=x,y=ground_y,z=z}).name
 						-- If sand, add dry shrub
 						if nn == "mcl_core:sand" then
-							minetest.set_node(p,{name="mcl_core:dry_shrub"})
+							minetest.set_node(p,{name="mcl_core:deadbush"})
 							
 						-- If dirt with grass, add grass
 						elseif nn == "mcl_core:dirt_with_grass" then
diff --git a/mods/mcl_core/nodes.lua b/mods/mcl_core/nodes.lua
index c9fc3e17bd..299f110666 100644
--- a/mods/mcl_core/nodes.lua
+++ b/mods/mcl_core/nodes.lua
@@ -1318,7 +1318,7 @@ minetest.register_node("mcl_core:obsidian", {
 	groups = {cracky=4,level=2,oddly_breakable_by_hand=4,building_block=1},
 })
 
-minetest.register_node("mcl_core:dry_shrub", {
+minetest.register_node("mcl_core:deadbush", {
 	description = "Dead Bush",
 	drawtype = "plantlike",
 	visual_scale = 1.0,
diff --git a/mods/mcl_flowerpots/nodes.lua b/mods/mcl_flowerpots/nodes.lua
index a46f899fdf..148d2ae8d1 100644
--- a/mods/mcl_flowerpots/nodes.lua
+++ b/mods/mcl_flowerpots/nodes.lua
@@ -12,14 +12,13 @@ local flowers = {
 	{"oxeye_daisy", "mcl_flowers:oxeye_daisy", "Oxeye Daisy Flower Pot"},
 	{"mushroom_brown", "mcl_farming:mushroom_brown", "Brown Mushroom Flower Pot"},
 	{"mushroom_red", "mcl_farming:mushroom_red", "Red Mushroom Flower Pot"},
-	{"dry_shrub", "mcl_core:dry_shrub", "Dead Bush Flower Pot"},
 	{"sapling", "mcl_core:sapling", "Oak Sapling Flower Pot"},
 	{"acaciasapling", "mcl_core:acaciasapling", "Acacia Sapling Flower Pot"},
 	{"junglesapling", "mcl_core:junglesapling", "Jungle Sapling Flower Pot"},
 	{"darksapling", "mcl_core:darksapling", "Dark Oak Sapling Flower Pot"},
 	{"sprucesapling", "mcl_core:sprucesapling", "Spruce Sapling Flower Pot"},
 	{"birchsapling", "mcl_core:birchsapling", "Birch Sapling Flower Pot"},
-	{"dry_shrub", "mcl_core:dry_shrub", "Dead Bush Flower Pot"},
+	{"deadbush", "mcl_core:deadbush", "Dead Bush Flower Pot"},
 	{"fern", "mcl_flowers:fern", "Fern Flower Pot"},
 }