summaryrefslogtreecommitdiff
path: root/bushes_classic
diff options
context:
space:
mode:
authorVanessa Dannenberg <vanessa.e.dannenberg@gmail.com>2018-08-15 18:15:28 -0400
committerVanessa Dannenberg <vanessa.e.dannenberg@gmail.com>2018-08-15 18:15:28 -0400
commitdc0908e5fa86334226c982877e71aec8cfaf92ce (patch)
tree6fef541a45caed83f673b6411bf0888ee35dc4c4 /bushes_classic
parent1adee001dd438172cd4ff7e3c6e9ca168b0bdd58 (diff)
downloaddreambuilder_modpack-dc0908e5fa86334226c982877e71aec8cfaf92ce.tar
dreambuilder_modpack-dc0908e5fa86334226c982877e71aec8cfaf92ce.tar.gz
dreambuilder_modpack-dc0908e5fa86334226c982877e71aec8cfaf92ce.tar.bz2
dreambuilder_modpack-dc0908e5fa86334226c982877e71aec8cfaf92ce.tar.xz
dreambuilder_modpack-dc0908e5fa86334226c982877e71aec8cfaf92ce.zip
update plantlife, farming_redo, nixie tubes
add my led_marquee mod
Diffstat (limited to 'bushes_classic')
-rw-r--r--bushes_classic/cooking.lua28
1 files changed, 16 insertions, 12 deletions
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