updated several mods

biome_lib, boost cart, homedecor modpack, plantlife modpack, cottages,
currency, farming redo, gloopblocks, ilights, moreores, moretrees,
pipeworks, plasticbox, replacer, signs_lib, streets, travelnet, unified
dyes, and vines, and maybe one or two others that I didn't see in the
list. :-)

I fixed the misc_overrides component (it broke when I switched over to
farming redo a while back), and also I've added the classic peaceful_npc
mod back into the modpack, since it seems to work now.

Be sure when you run a world for the first time after this update, that
you "Configure" the world, *disable* all of Dreambuilder Modpack, then
re-enable the whole thing.  If you don't, a few mods will fail to load
due to recent changes in their dependencies.

4 files changed, 25 insertions, 44 deletions

diff --git a/bushes_classic/cooking.lua b/bushes_classic/cooking.lua
index 0e0810a..e084852 100644
--- a/bushes_classic/cooking.lua
+++ b/bushes_classic/cooking.lua
@@ -1,9 +1,5 @@
-local S
-if minetest.get_modpath("intllib") then
-	S = intllib.Getter()
-else
-	S = function(s) return s end
-end
+-- support for i18n
+local S = plantlife_i18n.gettext
 
 -- Basket
 
@@ -32,10 +28,9 @@ minetest.register_craft({
 })
 
 for i, berry in ipairs(bushes_classic.bushes) do
-	local desc = bushes_classic.bushes_descriptions[i]
 
 	minetest.register_craftitem(":bushes:"..berry.."_pie_raw", {
-		description = S("Raw "..desc.." pie"),
+		description = bushes_classic.bushes_descriptions[i][2],
 		inventory_image = "bushes_"..berry.."_pie_raw.png",
 		on_use = minetest.item_eat(4),
 	})
@@ -49,7 +44,7 @@ for i, berry in ipairs(bushes_classic.bushes) do
 
 		if berry == "strawberry" and minetest.registered_nodes["farming_plus:strawberry"] then
 			minetest.register_craftitem(":farming_plus:strawberry_item", {
-				description = S("Strawberry"),
+				description = bushes_classic.bushes_descriptions[i][1],
 				inventory_image = "bushes_"..berry..".png",
 				on_use = minetest.item_eat(2),
 				groups = {berry=1, strawberry=1}
@@ -58,7 +53,7 @@ for i, berry in ipairs(bushes_classic.bushes) do
 
 		elseif berry == "blueberry" and minetest.registered_items["farming:blueberries"] then
 			minetest.register_craftitem(":farming:blueberries", {
-				description = S("Blueberry"),
+				description = bushes_classic.bushes_descriptions[i][1],
 				inventory_image = "bushes_"..berry..".png",
 				on_use = minetest.item_eat(1),
 				groups = {berry=1, blueberry=1}
@@ -67,7 +62,7 @@ for i, berry in ipairs(bushes_classic.bushes) do
 
 		elseif berry == "raspberry" and minetest.registered_items["farming:raspberries"] then
 			minetest.register_craftitem(":farming:raspberries", {
-				description = S("Raspberry"),
+				description = bushes_classic.bushes_descriptions[i][1],
 				inventory_image = "bushes_"..berry..".png",
 				on_use = minetest.item_eat(1),
 				groups = {berry=1, raspberry=1}
@@ -76,7 +71,7 @@ for i, berry in ipairs(bushes_classic.bushes) do
 
 		else
 			minetest.register_craftitem(":bushes:"..berry, {
-				description = S(desc),
+				description = bushes_classic.bushes_descriptions[i][1],
 				inventory_image = "bushes_"..berry..".png",
 				groups = {berry = 1, [berry] = 1},
 				on_use = minetest.item_eat(1),
@@ -95,7 +90,7 @@ for i, berry in ipairs(bushes_classic.bushes) do
 	-- Cooked pie
 
 	minetest.register_craftitem(":bushes:"..berry.."_pie_cooked", {
-		description = S("Cooked "..desc.." pie"),
+		description = bushes_classic.bushes_descriptions[i][3],
 		inventory_image = "bushes_"..berry.."_pie_cooked.png",
 		on_use = minetest.item_eat(6),
 	})
@@ -110,7 +105,7 @@ for i, berry in ipairs(bushes_classic.bushes) do
 	-- slice of pie
 
 	minetest.register_craftitem(":bushes:"..berry.."_pie_slice", {
-		description = S("Slice of "..desc.." pie"),
+		description = bushes_classic.bushes_descriptions[i][4],
 		inventory_image = "bushes_"..berry.."_pie_slice.png",
 		on_use = minetest.item_eat(1),
 	})
@@ -141,5 +136,3 @@ minetest.register_craft({
 	{ "group:berry", "group:berry", "group:berry" },
 	},
 })
-
-
diff --git a/bushes_classic/depends.txt b/bushes_classic/depends.txt
index 16347c6..12276f6 100644
--- a/bushes_classic/depends.txt
+++ b/bushes_classic/depends.txt
@@ -1,3 +1,4 @@
 biome_lib
+plantlife_i18n
 farming?
 farming_plus?
diff --git a/bushes_classic/init.lua b/bushes_classic/init.lua
index 17a86a6..77db475 100644
--- a/bushes_classic/init.lua
+++ b/bushes_classic/init.lua
@@ -3,17 +3,13 @@
 --
 -- License:  WTFPL
 
-local S
-if minetest.get_modpath("intllib") then
-	S = intllib.Getter()
-else
-	S = function(s) return s end
-end
-
 bushes_classic = {}
 
+-- support for i18n
+local S = plantlife_i18n.gettext
+
 bushes_classic.bushes = {
-    "strawberry",
+  "strawberry",
 	"blackberry",
 	"blueberry",
 	"raspberry",
@@ -22,12 +18,12 @@ bushes_classic.bushes = {
 }
 
 bushes_classic.bushes_descriptions = {
-	"Strawberry",
-	"Blackberry",
-	"Blueberry",
-	"Raspberry",
-	"Gooseberry",
-	"Mixed Berry"
+	{S("Strawberry"),  S("Raw Strawberry pie"),  S("Cooked Strawberry pie"),  S("Slice of Strawberry pie"),  S("Basket with Strawberry pies"),  S("Strawberry Bush")},
+	{S("Blackberry"),  S("Raw Blackberry pie"),  S("Cooked Blackberry pie"),  S("Slice of Blackberry pie"),  S("Basket with Blackberry pies"),  S("Blackberry Bush")},
+	{S("Blueberry"),   S("Raw Blueberry pie"),   S("Cooked Blueberry pie"),   S("Slice of Blueberry pie"),   S("Basket with Blueberry pies"),   S("Blueberry Bush")},
+	{S("Raspberry"),   S("Raw Raspberry pie"),   S("Cooked Raspberry pie"),   S("Slice of Raspberry pie"),   S("Basket with Raspberry pies"),   S("Raspberry Bush")},
+	{S("Gooseberry"),  S("Raw Gooseberry pie"),  S("Cooked Gooseberry pie"),  S("Slice of Gooseberry pie"),  S("Basket with Gooseberry pies"),  S("Gooseberry Bush")},
+	{S("Mixed Berry"), S("Raw Mixed Berry pie"), S("Cooked Mixed Berry pie"), S("Slice of Mixed Berry pie"), S("Basket with Mixed Berry pies"), S("Currently fruitless Bush")}
 }
 
 bushes_classic.spawn_list = {}
diff --git a/bushes_classic/nodes.lua b/bushes_classic/nodes.lua
index e45c7e7..bf15596 100644
--- a/bushes_classic/nodes.lua
+++ b/bushes_classic/nodes.lua
@@ -1,9 +1,5 @@
-local S
-if minetest.get_modpath("intllib") then
-	S = intllib.Getter()
-else
-	S = function(s) return s end
-end
+-- support for i18n
+local S = plantlife_i18n.gettext
 
 plantlife_bushes = {}
 
@@ -16,7 +12,7 @@ plantlife_bushes.after_dig_node = function(pos, oldnode, oldmetadata, digger)
 	-- find out which bush type we are dealing with
 	local bush_name   = ""
 	local can_harvest = false
-	
+
 	if oldnode.name == "bushes:fruitless_bush" then
 		-- this bush has not grown fruits yet (but will eventually)
 		bush_name = oldmetadata.fields.bush_type
@@ -151,10 +147,8 @@ minetest.register_abm({
 
 for i, bush_name in ipairs(bushes_classic.bushes) do
 
-	local desc = bushes_classic.bushes_descriptions[i]
-
 	minetest.register_node(":bushes:basket_"..bush_name, {
-		description = S("Basket with "..desc.." Pies"),
+		description = bushes_classic.bushes_descriptions[i][5],
 		drawtype = "mesh",
 		mesh = "bushes_basket_full.obj",
 		tiles = {
@@ -172,7 +166,6 @@ for i, bush_name in ipairs(bushes_classic.bushes) do
 	local groups = {snappy = 3, bush = 1, flammable = 2, attached_node=1}
 	if bush_name == "mixed_berry" then
 		bush_name = "fruitless";
-		desc      = S("currently fruitless");
 		texture_top = "bushes_fruitless_bush_top.png"
 		texture_bottom = "bushes_fruitless_bush_bottom.png"
 		groups.not_in_creative_inventory = 1
@@ -182,7 +175,7 @@ for i, bush_name in ipairs(bushes_classic.bushes) do
 	end
 
 	minetest.register_node(":bushes:" .. bush_name .. "_bush", {
-		description = S(desc.." Bush"),
+		description = bushes_classic.bushes_descriptions[i][6],
 		drawtype = "mesh",
 		mesh = "bushes_bush.obj",
 		tiles = {"bushes_bush_"..bush_name..".png"},
@@ -215,5 +208,3 @@ minetest.register_node(":bushes:basket_empty", {
 	paramtype2 = "facedir",
     groups = { dig_immediate = 3 },
 })
-
-