From 4aab7d0dbd782cf6741bdbba94440faf0c5c2e61 Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Sat, 12 Aug 2017 20:37:50 -0400 Subject: 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. --- bushes_classic/nodes.lua | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'bushes_classic/nodes.lua') 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 }, }) - - -- cgit v1.2.3