fix mergeconflict

bushes_classic/cooking.lua

@@ -3,11 +3,27 @@ local S = biome_lib.intllib
 -- Basket
 
 minetest.register_craft({
-    output = "bushes:basket_empty",
-    recipe = {
-	{ "default:stick", "default:stick", "default:stick" },
-	{ "", "default:stick", "" },
-    },
+	output = "bushes:basket_empty",
+	recipe = {
+		{ "default:stick", "default:stick", "default:stick" },
+		{ "", "default:stick", "" },
+	},
+})
+
+-- Sugar
+
+minetest.register_craftitem(":bushes:sugar", {
+	description = S("Sugar"),
+	inventory_image = "bushes_sugar.png",
+	on_use = minetest.item_eat(1),
+	groups = {food_sugar=1}
+})
+
+minetest.register_craft({
+	output = "bushes:sugar 1",
+	recipe = {
+		{ "default:papyrus", "default:papyrus" },
+	},
 })
 
 for i, berry in ipairs(bushes_classic.bushes) do
@@ -21,10 +37,12 @@ for i, berry in ipairs(bushes_classic.bushes) do
 
 	if berry ~= "mixed_berry" then
 
+		-- Special case for strawberries, blueberries and raspberries
+		-- when farming_plus or farming redo is in use. Use items
+		-- from these mods, but redefine there so they has the right
+		-- groups and does't look so ugly!
+
 		if berry == "strawberry" and minetest.registered_nodes["farming_plus:strawberry"] then
-			-- Special case for strawberries, when farming_plus is in use. Use
-			-- the item from that mod, but redefine it so it has the right
-			-- groups and does't look so ugly!
 			minetest.register_craftitem(":farming_plus:strawberry_item", {
 				description = S("Strawberry"),
 				inventory_image = "bushes_"..berry..".png",
@@ -32,6 +50,25 @@ for i, berry in ipairs(bushes_classic.bushes) do
 				groups = {berry=1, strawberry=1}
 			})
 			minetest.register_alias("bushes:strawberry", "farming_plus:strawberry_item")
+
+		elseif berry == "blueberry" and minetest.registered_items["farming:blueberries"] then
+			minetest.register_craftitem(":farming:blueberries", {
+				description = S("Blueberry"),
+				inventory_image = "bushes_"..berry..".png",
+				on_use = minetest.item_eat(1),
+				groups = {berry=1, blueberry=1}
+			})
+			minetest.register_alias("bushes:blueberry", "farming:blueberries")
+
+		elseif berry == "raspberry" and minetest.registered_items["farming:raspberries"] then
+			minetest.register_craftitem(":farming:raspberries", {
+				description = S("Raspberry"),
+				inventory_image = "bushes_"..berry..".png",
+				on_use = minetest.item_eat(1),
+				groups = {berry=1, raspberry=1}
+			})
+			minetest.register_alias("bushes:raspberry", "farming:raspberries")
+
 		else
 			minetest.register_craftitem(":bushes:"..berry, {
 				description = desc,
@@ -40,6 +77,7 @@ for i, berry in ipairs(bushes_classic.bushes) do
 				on_use = minetest.item_eat(1),
 			})
 		end
+
 		minetest.register_craft({
 			output = "bushes:"..berry.."_pie_raw 1",
 			recipe = {

vines/functions.lua

@@ -32,7 +32,7 @@ vines.register_vine = function( name, defs, biome )
     sunlight_propagates = true,
     paramtype = "light",
     paramtype2 = "wallmounted",
-    buildable_to = true,
+    buildable_to = false,
     tiles = { vine_image_end },
     drawtype = drawtype,
     inventory_image = vine_image_end,
@@ -70,7 +70,7 @@ vines.register_vine = function( name, defs, biome )
     sunlight_propagates = true,
     paramtype = "light",
     paramtype2 = "wallmounted",
-    buildable_to = true,
+    buildable_to = false,
     tiles = { vine_image_middle },
     wield_image = vine_image_middle,
     drawtype = drawtype,
@@ -82,8 +82,10 @@ vines.register_vine = function( name, defs, biome )
       local node = minetest.get_node( pos )
       local bottom = {x=pos.x, y=pos.y-1, z=pos.z}
       local bottom_node = minetest.get_node( bottom )
-      if minetest.get_item_group( bottom_node.name, "vines") then
-        minetest.remove_node( bottom )
+      if minetest.get_item_group( bottom_node.name, "vines") > 0 then
+        -- Calling `remove_node` directly would cause
+        -- a stack overflow for really long vines.
+        minetest.after( 0, minetest.remove_node, bottom )
       end
     end,
     after_dig_node = function( pos, node, oldmetadata, user )