From dc0908e5fa86334226c982877e71aec8cfaf92ce Mon Sep 17 00:00:00 2001
From: Vanessa Dannenberg <vanessa.e.dannenberg@gmail.com>
Date: Wed, 15 Aug 2018 18:15:28 -0400
Subject: update plantlife, farming_redo, nixie tubes add my led_marquee mod

---
 bushes_classic/cooking.lua | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'bushes_classic')

diff --git a/bushes_classic/cooking.lua b/bushes_classic/cooking.lua
index 9e32c25..6ad7e58 100644
--- a/bushes_classic/cooking.lua
+++ b/bushes_classic/cooking.lua
@@ -13,19 +13,23 @@ minetest.register_craft({
 
 -- Sugar
 
-minetest.register_craftitem(":bushes:sugar", {
-	description = S("Sugar"),
-	inventory_image = "bushes_sugar.png",
-	on_use = minetest.item_eat(1),
-	groups = {food_sugar=1, flammable = 2}
-})
+if not minetest.registered_items["farming:sugar"] then
+	minetest.register_craftitem(":bushes:sugar", {
+		description = S("Sugar"),
+		inventory_image = "bushes_sugar.png",
+		on_use = minetest.item_eat(1),
+		groups = {food_sugar=1, flammable = 2}
+	})
 
-minetest.register_craft({
-	output = "bushes:sugar 1",
-	recipe = {
-		{ "default:papyrus", "default:papyrus" },
-	},
-})
+	minetest.register_craft({
+		output = "bushes:sugar 1",
+		recipe = {
+			{ "default:papyrus", "default:papyrus" },
+		},
+	})
+else
+	minetest.register_alias("bushes:sugar", "farming:sugar")
+end
 
 -- override farming_plus strawberry and add food_ group
 if minetest.get_modpath("farming_plus") then
-- 
cgit v1.2.3