Merge branch 'mt5-locale' into 'master'

MT5 locale

See merge request VanessaE/plantlife_modpack!5

.luacheckrc

@@ -0,0 +1,14 @@
+unused_args = false
+allow_defined_top = true
+
+read_globals = {
+	"biome_lib",
+	"DIR_DELIM",
+	"minetest", "core",
+	"dump",
+	"vector", "nodeupdate",
+	"VoxelManip", "VoxelArea",
+	"PseudoRandom", "ItemStack",
+	"default",
+}
+

3dmushrooms/depends.txt

@@ -1,2 +0,0 @@
-default
-flowers

3dmushrooms/init.lua

@@ -1,10 +1,18 @@
-
 -- 3D Mushroom mod by VanessaE
---
--- License:  WTFPL for everything.
 
 mushroom = {}
 
+minetest.override_item("flowers:mushroom_fertile_brown", {
+	drawtype = "mesh",
+	mesh = "3dmushrooms.obj",
+	tiles = {"3dmushrooms_brown.png"},
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3}
+	},
+	inventory_image = "3dmushrooms_brown_inv.png"
+})
+
 minetest.override_item("flowers:mushroom_brown", {
 	drawtype = "mesh",
 	mesh = "3dmushrooms.obj",
@@ -16,6 +24,17 @@ minetest.override_item("flowers:mushroom_brown", {
 	inventory_image = "3dmushrooms_brown_inv.png"
 })
 
+minetest.override_item("flowers:mushroom_fertile_red", {
+	drawtype = "mesh",
+	mesh = "3dmushrooms.obj",
+	tiles = {"3dmushrooms_red.png"},
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3}
+	},
+	inventory_image = "3dmushrooms_red_inv.png"
+})
+
 minetest.override_item("flowers:mushroom_red", {
 	drawtype = "mesh",
 	mesh = "3dmushrooms.obj",
@@ -30,17 +49,17 @@ minetest.override_item("flowers:mushroom_red", {
 -- aliases to the default mushrooms
 
 minetest.register_alias("mushroom:brown", "flowers:mushroom_brown")
-minetest.register_alias("mushroom:brown_natural", "flowers:mushroom_brown")
+minetest.register_alias("mushroom:brown_natural", "flowers:mushroom_fertile_brown")
-minetest.register_alias("mushroom:spore_brown", "flowers:mushroom_brown")
+minetest.register_alias("mushroom:spore_brown", "flowers:mushroom_spores_brown")
-minetest.register_alias("mushroom:spore2", "flowers:mushroom_brown")
+minetest.register_alias("mushroom:spore2", "flowers:mushroom_spores_brown")
 minetest.register_alias("mushroom:brown_essence", "flowers:mushroom_brown")
 
 minetest.register_alias("mushroom:red", "flowers:mushroom_red")
-minetest.register_alias("mushroom:red_natural", "flowers:mushroom_red")
+minetest.register_alias("mushroom:red_natural", "flowers:mushroom_fertile_red")
-minetest.register_alias("mushroom:spore_red", "flowers:mushroom_red")
+minetest.register_alias("mushroom:spore_red", "flowers:mushroom_spores_red")
-minetest.register_alias("mushroom:spore1", "flowers:mushroom_red")
+minetest.register_alias("mushroom:spore1", "flowers:mushroom_spores_red")
 minetest.register_alias("mushroom:poison", "flowers:mushroom_red")
 
 minetest.register_alias("mushroom:identifier", "default:mese_crystal_fragment")
 
-minetest.log("action", "[3D Mushrooms] loaded.")
+print("[3D Mushrooms] loaded.")

3dmushrooms/mod.conf

@@ -0,0 +1,2 @@
+name = 3dmushrooms
+depends = default, flowers

LICENSE

@@ -1,336 +1,603 @@
-Sunflower model and textures by kaeza (CC-BY-SA 3.0).
+License for code: LGPL 3.0
+License for media and all other assets:  CC-by-SA 4.0
 
-For the code, Ironzorg's textures, and everything else:  WTFPL
+These licenses apply to all modules and components in this modpack,
+unless otherwise stated.
 
-For Mossmanikin's mods (Ferns, Dryplans, and the components
+###############################################################################
-from the Undergrowth modpack), and all of my own textures: 
-CC-By-SA 3.0
 
-----------
+                   GNU LESSER GENERAL PUBLIC LICENSE
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                       Version 3, 29 June 2007
-                    Version 2, December 2004
 
- Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
- Everyone is permitted to copy and distribute verbatim or modified
- copies of this license document, and changing it is allowed as long
- as the name is changed.
 
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+  This version of the GNU Lesser General Public License incorporates
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
 
-  0. You just DO WHAT THE FUCK YOU WANT TO.
+  0. Additional Definitions.
 
- This license is also known as "WTFPL"
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
 
------------
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
 
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS 
+  An "Application" is any work that makes use of an interface provided
-CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS 
+by the Library, but which is not otherwise based on the Library.
-PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE 
+Defining a subclass of a class defined by the Library is deemed a mode
-WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW 
+of using an interface provided by the Library.
-IS PROHIBITED.
 
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND 
+  A "Combined Work" is a work produced by combining or linking an
-AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS 
+Application with the Library.  The particular version of the Library
-LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS 
+with which the Combined Work was made is also called the "Linked
-YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE 
+Version".
-OF SUCH TERMS AND CONDITIONS.
 
-1. Definitions
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
 
-    "Collective Work" means a work, such as a periodical issue, 
+  The "Corresponding Application Code" for a Combined Work means the
-anthology or encyclopedia, in which the Work in its entirety in 
+object code and/or source code for the Application, including any data
-unmodified form, along with one or more other contributions, 
+and utility programs needed for reproducing the Combined Work from the
-constituting separate and independent works in themselves, are 
+Application, but excluding the System Libraries of the Combined Work.
-assembled into a collective whole. A work that constitutes a 
-Collective Work will not be considered a Derivative Work (as 
-defined below) for the purposes of this License.
-    "Creative Commons Compatible License" means a license that is 
-listed at http://creativecommons.org/compatiblelicenses that has 
-been approved by Creative Commons as being essentially equivalent 
-to this License, including, at a minimum, because that license: 
-(i) contains terms that have the same purpose, meaning and effect 
-as the License Elements of this License; and, (ii) explicitly 
-permits the relicensing of derivatives of works made available 
-under that license under this License or either a Creative Commons 
-unported license or a Creative Commons jurisdiction license with 
-the same License Elements as this License.
-    "Derivative Work" means a work based upon the Work or upon the 
-Work and other pre-existing works, such as a translation, musical 
-arrangement, dramatization, fictionalization, motion picture 
-version, sound recording, art reproduction, abridgment, 
-condensation, or any other form in which the Work may be recast, 
-transformed, or adapted, except that a work that constitutes a 
-Collective Work will not be considered a Derivative Work for the 
-purpose of this License. For the avoidance of doubt, where the 
-Work is a musical composition or sound recording, the 
-synchronization of the Work in timed-relation with a moving image 
-("synching") will be considered a Derivative Work for the purpose 
-of this License.
-    "License Elements" means the following high-level license 
-attributes as selected by Licensor and indicated in the title of 
-this License: Attribution, ShareAlike.
-    "Licensor" means the individual, individuals, entity or 
-entities that offers the Work under the terms of this License.
-    "Original Author" means the individual, individuals, entity or 
-entities who created the Work.
-    "Work" means the copyrightable work of authorship offered 
-under the terms of this License.
-    "You" means an individual or entity exercising rights under 
-this License who has not previously violated the terms of this 
-License with respect to the Work, or who has received express 
-permission from the Licensor to exercise rights under this License 
-despite a previous violation.
 
-2. Fair Use Rights. Nothing in this license is intended to reduce, 
+  1. Exception to Section 3 of the GNU GPL.
-limit, or restrict any rights arising from fair use, first sale or 
-other limitations on the exclusive rights of the copyright owner 
-under copyright law or other applicable laws.
 
-3. License Grant. Subject to the terms and conditions of this 
+  You may convey a covered work under sections 3 and 4 of this License
-License, Licensor hereby grants You a worldwide, royalty-free, 
+without being bound by section 3 of the GNU GPL.
-non-exclusive, perpetual (for the duration of the applicable 
-copyright) license to exercise the rights in the Work as stated 
-below:
 
-    to reproduce the Work, to incorporate the Work into one or 
+  2. Conveying Modified Versions.
-more Collective Works, and to reproduce the Work as incorporated 
-in the Collective Works;
-    to create and reproduce Derivative Works provided that any 
-such Derivative Work, including any translation in any medium, 
-takes reasonable steps to clearly label, demarcate or otherwise 
-identify that changes were made to the original Work. For example, 
-a translation could be marked "The original work was translated 
-from English to Spanish," or a modification could indicate "The 
-original work has been modified.";
-    to distribute copies or phonorecords of, display publicly, 
-perform publicly, and perform publicly by means of a digital audio 
-transmission the Work including as incorporated in Collective 
-Works;
-    to distribute copies or phonorecords of, display publicly, 
-perform publicly, and perform publicly by means of a digital audio 
-transmission Derivative Works.
 
-    For the avoidance of doubt, where the Work is a musical 
+  If you modify a copy of the Library, and, in your modifications, a
-composition:
+facility refers to a function or data to be supplied by an Application
-        Performance Royalties Under Blanket Licenses. Licensor 
+that uses the facility (other than as an argument passed when the
-waives the exclusive right to collect, whether individually or, in 
+facility is invoked), then you may convey a copy of the modified
-the event that Licensor is a member of a performance rights 
+version:
-society (e.g. ASCAP, BMI, SESAC), via that society, royalties for 
-the public performance or public digital performance (e.g. 
-webcast) of the Work.
-        Mechanical Rights and Statutory Royalties. Licensor waives 
-the exclusive right to collect, whether individually or via a 
-music rights agency or designated agent (e.g. Harry Fox Agency), 
-royalties for any phonorecord You create from the Work ("cover 
-version") and distribute, subject to the compulsory license 
-created by 17 USC Section 115 of the US Copyright Act (or the 
-equivalent in other jurisdictions).
-    Webcasting Rights and Statutory Royalties. For the avoidance 
-of doubt, where the Work is a sound recording, Licensor waives the 
-exclusive right to collect, whether individually or via a 
-performance-rights society (e.g. SoundExchange), royalties for the 
-public digital performance (e.g. webcast) of the Work, subject to 
-the compulsory license created by 17 USC Section 114 of the US 
-Copyright Act (or the equivalent in other jurisdictions).
 
-The above rights may be exercised in all media and formats whether 
+   a) under this License, provided that you make a good faith effort to
-now known or hereafter devised. The above rights include the right 
+   ensure that, in the event an Application does not supply the
-to make such modifications as are technically necessary to 
+   function or data, the facility still operates, and performs
-exercise the rights in other media and formats. All rights not 
+   whatever part of its purpose remains meaningful, or
-expressly granted by Licensor are hereby reserved.
 
-4. Restrictions. The license granted in Section 3 above is 
+   b) under the GNU GPL, with none of the additional permissions of
-expressly made subject to and limited by the following 
+   this License applicable to that copy.
-restrictions:
 
-    You may distribute, publicly display, publicly perform, or 
+  3. Object Code Incorporating Material from Library Header Files.
-publicly digitally perform the Work only under the terms of this 
+
-License, and You must include a copy of, or the Uniform Resource 
+  The object code form of an Application may incorporate material from
-Identifier for, this License with every copy or phonorecord of the 
+a header file that is part of the Library.  You may convey such object
-Work You distribute, publicly display, publicly perform, or 
+code under terms of your choice, provided that, if the incorporated
-publicly digitally perform. You may not offer or impose any terms 
+material is not limited to numerical parameters, data structure
-on the Work that restrict the terms of this License or the ability 
+layouts and accessors, or small macros, inline functions and templates
-of a recipient of the Work to exercise of the rights granted to 
+(ten or fewer lines in length), you do both of the following:
-that recipient under the terms of the License. You may not 
+
-sublicense the Work. You must keep intact all notices that refer 
+   a) Give prominent notice with each copy of the object code that the
-to this License and to the disclaimer of warranties. When You 
+   Library is used in it and that the Library and its use are
-distribute, publicly display, publicly perform, or publicly 
+   covered by this License.
-digitally perform the Work, You may not impose any technological 
+
-measures on the Work that restrict the ability of a recipient of 
+   b) Accompany the object code with a copy of the GNU GPL and this license
-the Work from You to exercise of the rights granted to that 
+   document.
-recipient under the terms of the License. This Section 4(a) 
+
-applies to the Work as incorporated in a Collective Work, but this 
+  4. Combined Works.
-does not require the Collective Work apart from the Work itself to 
+
-be made subject to the terms of this License. If You create a 
+  You may convey a Combined Work under terms of your choice that,
-Collective Work, upon notice from any Licensor You must, to the 
+taken together, effectively do not restrict modification of the
-extent practicable, remove from the Collective Work any credit as 
+portions of the Library contained in the Combined Work and reverse
-required by Section 4(c), as requested. If You create a Derivative 
+engineering for debugging such modifications, if you also do each of
-Work, upon notice from any Licensor You must, to the extent 
+the following:
-practicable, remove from the Derivative Work any credit as 
+
-required by Section 4(c), as requested.
+   a) Give prominent notice with each copy of the Combined Work that
-    You may distribute, publicly display, publicly perform, or 
+   the Library is used in it and that the Library and its use are
-publicly digitally perform a Derivative Work only under: (i) the 
+   covered by this License.
-terms of this License; (ii) a later version of this License with 
+
-the same License Elements as this License; (iii) either the 
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-Creative Commons (Unported) license or a Creative Commons 
+   document.
-jurisdiction license (either this or a later license version) that 
+
-contains the same License Elements as this License (e.g. 
+   c) For a Combined Work that displays copyright notices during
-Attribution-ShareAlike 3.0 (Unported)); (iv) a Creative Commons 
+   execution, include the copyright notice for the Library among
-Compatible License. If you license the Derivative Work under one 
+   these notices, as well as a reference directing the user to the
-of the licenses mentioned in (iv), you must comply with the terms 
+   copies of the GNU GPL and this license document.
-of that license. If you license the Derivative Work under the 
+
-terms of any of the licenses mentioned in (i), (ii) or (iii) (the 
+   d) Do one of the following:
-"Applicable License"), you must comply with the terms of the 
+
-Applicable License generally and with the following provisions: 
+       0) Convey the Minimal Corresponding Source under the terms of this
-(I) You must include a copy of, or the Uniform Resource Identifier 
+       License, and the Corresponding Application Code in a form
-for, the Applicable License with every copy or phonorecord of each 
+       suitable for, and under terms that permit, the user to
-Derivative Work You distribute, publicly display, publicly 
+       recombine or relink the Application with a modified version of
-perform, or publicly digitally perform; (II) You may not offer or 
+       the Linked Version to produce a modified Combined Work, in the
-impose any terms on the Derivative Works that restrict the terms 
+       manner specified by section 6 of the GNU GPL for conveying
-of the Applicable License or the ability of a recipient of the 
+       Corresponding Source.
-Work to exercise the rights granted to that recipient under the 
+
-terms of the Applicable License; (III) You must keep intact all 
+       1) Use a suitable shared library mechanism for linking with the
-notices that refer to the Applicable License and to the disclaimer 
+       Library.  A suitable mechanism is one that (a) uses at run time
-of warranties; and, (IV) when You distribute, publicly display, 
+       a copy of the Library already present on the user's computer
-publicly perform, or publicly digitally perform the Work, You may 
+       system, and (b) will operate properly with a modified version
-not impose any technological measures on the Derivative Work that 
+       of the Library that is interface-compatible with the Linked
-restrict the ability of a recipient of the Derivative Work from 
+       Version.
-You to exercise the rights granted to that recipient under the 
+
-terms of the Applicable License. This Section 4(b) applies to the 
+   e) Provide Installation Information, but only if you would otherwise
-Derivative Work as incorporated in a Collective Work, but this 
+   be required to provide such information under section 6 of the
-does not require the Collective Work apart from the Derivative 
+   GNU GPL, and only to the extent that such information is
-Work itself to be made subject to the terms of the Applicable 
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
+
+###############################################################################
+
+Attribution-ShareAlike 4.0 International
+
+=======================================================================
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
+other relationship. Creative Commons makes its licenses and related
+information available on an "as-is" basis. Creative Commons gives no
+warranties regarding its licenses, any material licensed under their
+terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the
+fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and
+conditions that creators and other rights holders may use to share
+original works of authorship and other material subject to copyright
+and certain other rights specified in the public license below. The
+following considerations are for informational purposes only, are not
+exhaustive, and do not form part of our licenses.
+
+     Considerations for licensors: Our public licenses are
+     intended for use by those authorized to give the public
+     permission to use material in ways otherwise restricted by
+     copyright and certain other rights. Our licenses are
+     irrevocable. Licensors should read and understand the terms
+     and conditions of the license they choose before applying it.
+     Licensors should also secure all rights necessary before
+     applying our licenses so that the public can reuse the
+     material as expected. Licensors should clearly mark any
+     material not subject to the license. This includes other CC-
+     licensed material, or material used under an exception or
+     limitation to copyright. More considerations for licensors:
+	wiki.creativecommons.org/Considerations_for_licensors
+
+     Considerations for the public: By using one of our public
+     licenses, a licensor grants the public permission to use the
+     licensed material under specified terms and conditions. If
+     the licensor's permission is not necessary for any reason--for
+     example, because of any applicable exception or limitation to
+     copyright--then that use is not regulated by the license. Our
+     licenses grant only permissions under copyright and certain
+     other rights that a licensor has authority to grant. Use of
+     the licensed material may still be restricted for other
+     reasons, including because others have copyright or other
+     rights in the material. A licensor may make special requests,
+     such as asking that all changes be marked or described.
+     Although not required by our licenses, you are encouraged to
+     respect those requests where reasonable. More considerations
+     for the public: 
+	wiki.creativecommons.org/Considerations_for_licensees
+
+=======================================================================
+
+Creative Commons Attribution-ShareAlike 4.0 International Public
+License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution-ShareAlike 4.0 International Public License ("Public
+License"). To the extent this Public License may be interpreted as a
+contract, You are granted the Licensed Rights in consideration of Your
+acceptance of these terms and conditions, and the Licensor grants You
+such rights in consideration of benefits the Licensor receives from
+making the Licensed Material available under these terms and
+conditions.
+
+
+Section 1 -- Definitions.
+
+  a. Adapted Material means material subject to Copyright and Similar
+     Rights that is derived from or based upon the Licensed Material
+     and in which the Licensed Material is translated, altered,
+     arranged, transformed, or otherwise modified in a manner requiring
+     permission under the Copyright and Similar Rights held by the
+     Licensor. For purposes of this Public License, where the Licensed
+     Material is a musical work, performance, or sound recording,
+     Adapted Material is always produced where the Licensed Material is
+     synched in timed relation with a moving image.
+
+  b. Adapter's License means the license You apply to Your Copyright
+     and Similar Rights in Your contributions to Adapted Material in
+     accordance with the terms and conditions of this Public License.
+
+  c. BY-SA Compatible License means a license listed at
+     creativecommons.org/compatiblelicenses, approved by Creative
+     Commons as essentially the equivalent of this Public License.
+
+  d. Copyright and Similar Rights means copyright and/or similar rights
+     closely related to copyright including, without limitation,
+     performance, broadcast, sound recording, and Sui Generis Database
+     Rights, without regard to how the rights are labeled or
+     categorized. For purposes of this Public License, the rights
+     specified in Section 2(b)(1)-(2) are not Copyright and Similar
+     Rights.
+
+  e. Effective Technological Measures means those measures that, in the
+     absence of proper authority, may not be circumvented under laws
+     fulfilling obligations under Article 11 of the WIPO Copyright
+     Treaty adopted on December 20, 1996, and/or similar international
+     agreements.
+
+  f. Exceptions and Limitations means fair use, fair dealing, and/or
+     any other exception or limitation to Copyright and Similar Rights
+     that applies to Your use of the Licensed Material.
+
+  g. License Elements means the license attributes listed in the name
+     of a Creative Commons Public License. The License Elements of this
+     Public License are Attribution and ShareAlike.
+
+  h. Licensed Material means the artistic or literary work, database,
+     or other material to which the Licensor applied this Public
      License.
-    If You distribute, publicly display, publicly perform, or 
-publicly digitally perform the Work (as defined in Section 1 
-above) or any Derivative Works (as defined in Section 1 above) or 
-Collective Works (as defined in Section 1 above), You must, unless 
-a request has been made pursuant to Section 4(a), keep intact all 
-copyright notices for the Work and provide, reasonable to the 
-medium or means You are utilizing: (i) the name of the Original 
-Author (or pseudonym, if applicable) if supplied, and/or (ii) if 
-the Original Author and/or Licensor designate another party or 
-parties (e.g. a sponsor institute, publishing entity, journal) for 
-attribution ("Attribution Parties") in Licensor's copyright 
-notice, terms of service or by other reasonable means, the name of 
-such party or parties; the title of the Work if supplied; to the 
-extent reasonably practicable, the Uniform Resource Identifier, if 
-any, that Licensor specifies to be associated with the Work, 
-unless such URI does not refer to the copyright notice or 
-licensing information for the Work; and, consistent with Section 
-3(b) in the case of a Derivative Work, a credit identifying the 
-use of the Work in the Derivative Work (e.g., "French translation 
-of the Work by Original Author," or "Screenplay based on original 
-Work by Original Author"). The credit required by this Section 
-4(c) may be implemented in any reasonable manner; provided, 
-however, that in the case of a Derivative Work or Collective Work, 
-at a minimum such credit will appear, if a credit for all 
-contributing authors of the Derivative Work or Collective Work 
-appears, then as part of these credits and in a manner at least as 
-prominent as the credits for the other contributing authors. For 
-the avoidance of doubt, You may only use the credit required by 
-this Section for the purpose of attribution in the manner set out 
-above and, by exercising Your rights under this License, You may 
-not implicitly or explicitly assert or imply any connection with, 
-sponsorship or endorsement by the Original Author, Licensor and/or 
-Attribution Parties, as appropriate, of You or Your use of the 
-Work, without the separate, express prior written permission of 
-the Original Author, Licensor and/or Attribution Parties.
 
-5. Representations, Warranties and Disclaimer
+  i. Licensed Rights means the rights granted to You subject to the
+     terms and conditions of this Public License, which are limited to
+     all Copyright and Similar Rights that apply to Your use of the
+     Licensed Material and that the Licensor has authority to license.
 
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, 
+  j. Licensor means the individual(s) or entity(ies) granting rights
-LICENSOR OFFERS THE WORK AS-IS AND ONLY TO THE EXTENT OF ANY 
+     under this Public License.
-RIGHTS HELD IN THE LICENSED WORK BY THE LICENSOR. THE LICENSOR 
-MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE 
-WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT 
-LIMITATION, WARRANTIES OF TITLE, MARKETABILITY, MERCHANTIBILITY, 
-FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE 
-OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE 
-OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT 
-ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY 
-NOT APPLY TO YOU.
 
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY 
+  k. Share means to provide material to the public by any means or
-APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY 
+     process that requires permission under the Licensed Rights, such
-LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE 
+     as reproduction, public display, public performance, distribution,
-OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE 
+     dissemination, communication, or importation, and to make material
-WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH 
+     available to the public including in ways that members of the
-DAMAGES.
+     public may access the material from a place and at a time
+     individually chosen by them.
 
-7. Termination
+  l. Sui Generis Database Rights means rights other than copyright
+     resulting from Directive 96/9/EC of the European Parliament and of
+     the Council of 11 March 1996 on the legal protection of databases,
+     as amended and/or succeeded, as well as other essentially
+     equivalent rights anywhere in the world.
 
-    This License and the rights granted hereunder will terminate 
+  m. You means the individual or entity exercising the Licensed Rights
-automatically upon any breach by You of the terms of this License. 
+     under this Public License. Your has a corresponding meaning.
-Individuals or entities who have received Derivative Works or 
-Collective Works from You under this License, however, will not 
-have their licenses terminated provided such individuals or 
-entities remain in full compliance with those licenses. Sections 
-1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-    Subject to the above terms and conditions, the license granted 
-here is perpetual (for the duration of the applicable copyright in 
-the Work). Notwithstanding the above, Licensor reserves the right 
-to release the Work under different license terms or to stop 
-distributing the Work at any time; provided, however that any such 
-election will not serve to withdraw this License (or any other 
-license that has been, or is required to be, granted under the 
-terms of this License), and this License will continue in full 
-force and effect unless terminated as stated above.
 
-8. Miscellaneous
 
-    Each time You distribute or publicly digitally perform the 
+Section 2 -- Scope.
-Work (as defined in Section 1 above) or a Collective Work (as 
-defined in Section 1 above), the Licensor offers to the recipient 
-a license to the Work on the same terms and conditions as the 
-license granted to You under this License.
-    Each time You distribute or publicly digitally perform a 
-Derivative Work, Licensor offers to the recipient a license to the 
-original Work on the same terms and conditions as the license 
-granted to You under this License.
-    If any provision of this License is invalid or unenforceable 
-under applicable law, it shall not affect the validity or 
-enforceability of the remainder of the terms of this License, and 
-without further action by the parties to this agreement, such 
-provision shall be reformed to the minimum extent necessary to 
-make such provision valid and enforceable.
-    No term or provision of this License shall be deemed waived 
-and no breach consented to unless such waiver or consent shall be 
-in writing and signed by the party to be charged with such waiver 
-or consent.
-    This License constitutes the entire agreement between the 
-parties with respect to the Work licensed here. There are no 
-understandings, agreements or representations with respect to the 
-Work not specified here. Licensor shall not be bound by any 
-additional provisions that may appear in any communication from 
-You. This License may not be modified without the mutual written 
-agreement of the Licensor and You.
 
-    Creative Commons Notice
+  a. License grant.
 
-    Creative Commons is not a party to this License, and makes no 
+       1. Subject to the terms and conditions of this Public License,
-warranty whatsoever in connection with the Work. Creative Commons 
+          the Licensor hereby grants You a worldwide, royalty-free,
-will not be liable to You or any party on any legal theory for any 
+          non-sublicensable, non-exclusive, irrevocable license to
-damages whatsoever, including without limitation any general, 
+          exercise the Licensed Rights in the Licensed Material to:
-special, incidental or consequential damages arising in connection 
+
-to this license. Notwithstanding the foregoing two (2) sentences, 
+            a. reproduce and Share the Licensed Material, in whole or
-if Creative Commons has expressly identified itself as the 
+               in part; and
-Licensor hereunder, it shall have all rights and obligations of 
+
+            b. produce, reproduce, and Share Adapted Material.
+
+       2. Exceptions and Limitations. For the avoidance of doubt, where
+          Exceptions and Limitations apply to Your use, this Public
+          License does not apply, and You do not need to comply with
+          its terms and conditions.
+
+       3. Term. The term of this Public License is specified in Section
+          6(a).
+
+       4. Media and formats; technical modifications allowed. The
+          Licensor authorizes You to exercise the Licensed Rights in
+          all media and formats whether now known or hereafter created,
+          and to make technical modifications necessary to do so. The
+          Licensor waives and/or agrees not to assert any right or
+          authority to forbid You from making technical modifications
+          necessary to exercise the Licensed Rights, including
+          technical modifications necessary to circumvent Effective
+          Technological Measures. For purposes of this Public License,
+          simply making modifications authorized by this Section 2(a)
+          (4) never produces Adapted Material.
+
+       5. Downstream recipients.
+
+            a. Offer from the Licensor -- Licensed Material. Every
+               recipient of the Licensed Material automatically
+               receives an offer from the Licensor to exercise the
+               Licensed Rights under the terms and conditions of this
+               Public License.
+
+            b. Additional offer from the Licensor -- Adapted Material.
+               Every recipient of Adapted Material from You
+               automatically receives an offer from the Licensor to
+               exercise the Licensed Rights in the Adapted Material
+               under the conditions of the Adapter's License You apply.
+
+            c. No downstream restrictions. You may not offer or impose
+               any additional or different terms or conditions on, or
+               apply any Effective Technological Measures to, the
+               Licensed Material if doing so restricts exercise of the
+               Licensed Rights by any recipient of the Licensed
+               Material.
+
+       6. No endorsement. Nothing in this Public License constitutes or
+          may be construed as permission to assert or imply that You
+          are, or that Your use of the Licensed Material is, connected
+          with, or sponsored, endorsed, or granted official status by,
+          the Licensor or others designated to receive attribution as
+          provided in Section 3(a)(1)(A)(i).
+
+  b. Other rights.
+
+       1. Moral rights, such as the right of integrity, are not
+          licensed under this Public License, nor are publicity,
+          privacy, and/or other similar personality rights; however, to
+          the extent possible, the Licensor waives and/or agrees not to
+          assert any such rights held by the Licensor to the limited
+          extent necessary to allow You to exercise the Licensed
+          Rights, but not otherwise.
+
+       2. Patent and trademark rights are not licensed under this
+          Public License.
+
+       3. To the extent possible, the Licensor waives any right to
+          collect royalties from You for the exercise of the Licensed
+          Rights, whether directly or through a collecting society
+          under any voluntary or waivable statutory or compulsory
+          licensing scheme. In all other cases the Licensor expressly
+          reserves any right to collect such royalties.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+  a. Attribution.
+
+       1. If You Share the Licensed Material (including in modified
+          form), You must:
+
+            a. retain the following if it is supplied by the Licensor
+               with the Licensed Material:
+
+                 i. identification of the creator(s) of the Licensed
+                    Material and any others designated to receive
+                    attribution, in any reasonable manner requested by
+                    the Licensor (including by pseudonym if
+                    designated);
+
+                ii. a copyright notice;
+
+               iii. a notice that refers to this Public License;
+
+                iv. a notice that refers to the disclaimer of
+                    warranties;
+
+                 v. a URI or hyperlink to the Licensed Material to the
+                    extent reasonably practicable;
+
+            b. indicate if You modified the Licensed Material and
+               retain an indication of any previous modifications; and
+
+            c. indicate the Licensed Material is licensed under this
+               Public License, and include the text of, or the URI or
+               hyperlink to, this Public License.
+
+       2. You may satisfy the conditions in Section 3(a)(1) in any
+          reasonable manner based on the medium, means, and context in
+          which You Share the Licensed Material. For example, it may be
+          reasonable to satisfy the conditions by providing a URI or
+          hyperlink to a resource that includes the required
+          information.
+
+       3. If requested by the Licensor, You must remove any of the
+          information required by Section 3(a)(1)(A) to the extent
+          reasonably practicable.
+
+  b. ShareAlike.
+
+     In addition to the conditions in Section 3(a), if You Share
+     Adapted Material You produce, the following conditions also apply.
+
+       1. The Adapter's License You apply must be a Creative Commons
+          license with the same License Elements, this version or
+          later, or a BY-SA Compatible License.
+
+       2. You must include the text of, or the URI or hyperlink to, the
+          Adapter's License You apply. You may satisfy this condition
+          in any reasonable manner based on the medium, means, and
+          context in which You Share Adapted Material.
+
+       3. You may not offer or impose any additional or different terms
+          or conditions on, or apply any Effective Technological
+          Measures to, Adapted Material that restrict exercise of the
+          rights granted under the Adapter's License You apply.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+     to extract, reuse, reproduce, and Share all or a substantial
+     portion of the contents of the database;
+
+  b. if You include all or a substantial portion of the database
+     contents in a database in which You have Sui Generis Database
+     Rights, then the database in which You have Sui Generis Database
+     Rights (but not its individual contents) is Adapted Material,
+
+     including for purposes of Section 3(b); and
+  c. You must comply with the conditions in Section 3(a) if You Share
+     all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+  c. The disclaimer of warranties and limitation of liability provided
+     above shall be interpreted in a manner that, to the extent
+     possible, most closely approximates an absolute disclaimer and
+     waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+  a. This Public License applies for the term of the Copyright and
+     Similar Rights licensed here. However, if You fail to comply with
+     this Public License, then Your rights under this Public License
+     terminate automatically.
+
+  b. Where Your right to use the Licensed Material has terminated under
+     Section 6(a), it reinstates:
+
+       1. automatically as of the date the violation is cured, provided
+          it is cured within 30 days of Your discovery of the
+          violation; or
+
+       2. upon express reinstatement by the Licensor.
+
+     For the avoidance of doubt, this Section 6(b) does not affect any
+     right the Licensor may have to seek remedies for Your violations
+     of this Public License.
+
+  c. For the avoidance of doubt, the Licensor may also offer the
+     Licensed Material under separate terms or conditions or stop
+     distributing the Licensed Material at any time; however, doing so
+     will not terminate this Public License.
+
+  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+     License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+  a. The Licensor shall not be bound by any additional or different
+     terms or conditions communicated by You unless expressly agreed.
+
+  b. Any arrangements, understandings, or agreements regarding the
+     Licensed Material not stated herein are separate from and
+     independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+  a. For the avoidance of doubt, this Public License does not, and
+     shall not be interpreted to, reduce, limit, restrict, or impose
+     conditions on any use of the Licensed Material that could lawfully
+     be made without permission under this Public License.
+
+  b. To the extent possible, if any provision of this Public License is
+     deemed unenforceable, it shall be automatically reformed to the
+     minimum extent necessary to make it enforceable. If the provision
+     cannot be reformed, it shall be severed from this Public License
+     without affecting the enforceability of the remaining terms and
+     conditions.
+
+  c. No term or condition of this Public License will be waived and no
+     failure to comply consented to unless expressly agreed to by the
      Licensor.
 
-    Except for the limited purpose of indicating to the public 
+  d. Nothing in this Public License constitutes or may be interpreted
-that the Work is licensed under the CCPL, Creative Commons does 
+     as a limitation upon, or waiver of, any privileges and immunities
-not authorize the use by either party of the trademark "Creative 
+     that apply to the Licensor or You, including from the legal
-Commons" or any related trademark or logo of Creative Commons 
+     processes of any jurisdiction or authority.
-without the prior written consent of Creative Commons. Any 
-permitted use will be in compliance with Creative Commons' 
-then-current trademark usage guidelines, as may be published on 
-its website or otherwise made available upon request from time to 
-time. For the avoidance of doubt, this trademark restriction does 
-not form part of this License.
 
-    Creative Commons may be contacted at 
-http://creativecommons.org/.
 
+=======================================================================
+
+Creative Commons is not a party to its public
+licenses. Notwithstanding, Creative Commons may elect to apply one of
+its public licenses to material it publishes and in those instances
+will be considered the “Licensor.” The text of the Creative Commons
+public licenses is dedicated to the public domain under the CC0 Public
+Domain Dedication. Except for the limited purpose of indicating that
+material is shared under a Creative Commons public license or as
+otherwise permitted by the Creative Commons policies published at
+creativecommons.org/policies, Creative Commons does not authorize the
+use of the trademark "Creative Commons" or any other trademark or logo
+of Creative Commons without its prior written consent including,
+without limitation, in connection with any unauthorized modifications
+to any of its public licenses or any other arrangements,
+understandings, or agreements concerning use of licensed material. For
+the avoidance of doubt, this paragraph does not form part of the
+public licenses.
+
+Creative Commons may be contacted at creativecommons.org.

along_shore/depends.txt

@@ -1,3 +0,0 @@
-default
-biome_lib
-flowers_plus?

along_shore/init.lua

@@ -5,5 +5,5 @@ local mname		= "along_shore"
 -----------------------------------------------------------------------------------------------
 
 -----------------------------------------------------------------------------------------------
-minetest.log("action", "[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...")
+print("[Mod] "..title.." ["..version.."] ["..mname.."] Loaded...")
 -----------------------------------------------------------------------------------------------

along_shore/mod.conf

@@ -0,0 +1,3 @@
+name = along_shore
+depends = default, biome_lib
+optional_depends = flowers_plus

bushes/depends.txt

@@ -1,4 +0,0 @@
-default
-biome_lib
-stonage?
-sumpf?

bushes/init.lua

@@ -1,14 +1,17 @@
 -- Bushes Mod by Mossmanikin, Evergreen, & Neuromancer
--- The initial code for this was taken from Mossmanikin's Grasses Mod, then heavilly modified by Neuromancer for this mod.
+-- The initial code for this was taken from Mossmanikin's Grasses Mod,
+-- then heavilly modified by Neuromancer for this mod.
 -- Mossmanikin also greatly helped with providing samples for coding.
--- bush leaf textures are cc-by-sa 3.0.  from VannessaE's moretrees mod.  (Leaf texture created by RealBadAngel or VanessaE)
+-- bush leaf textures are from VannessaE's moretrees mod.
+-- (Leaf texture created by RealBadAngel or VanessaE)
 -- Branch textures created by Neuromancer.
--- Licence for Code and Non-Bush leaf code is WTFPL.
 
+-- support for i18n
+local S = minetest.get_translator("bushes")
   abstract_bushes = {}
 
   minetest.register_node("bushes:youngtree2_bottom", {
-	description = "Young Tree 2 (bottom)",
+	description = S("Young Tree 2 (bottom)"),
  drawtype="nodebox",
  tiles = {"bushes_youngtree2trunk.png"},
 	inventory_image = "bushes_youngtree2trunk_inv.png",
@@ -33,7 +36,7 @@ for i in pairs(BushBranchCenter) do
 	local Num		= BushBranchCenter[i][1]
 	local TexNum	= BushBranchCenter[i][2]
 	minetest.register_node("bushes:bushbranches"..Num, {
-		description = "Bush Branches "..Num,
+		description = S("Bush Branches @1", Num),
 		drawtype = "nodebox",
 		tiles = {
 			"bushes_leaves_"..TexNum..".png",
@@ -70,7 +73,7 @@ for i in pairs(BushBranchSide) do
 	local Num		= BushBranchSide[i][1]
 	local TexNum	= BushBranchSide[i][2]
 	minetest.register_node("bushes:bushbranches"..Num, {
-		description = "Bush Branches "..Num,
+		description = S("Bush Branches @1", Num),
 		drawtype = "nodebox",
 		tiles = {
 --[[top]]	"bushes_leaves_"..TexNum..".png",
@@ -112,7 +115,7 @@ local BushLeafNode 			= { {1}, {2}}
 for i in pairs(BushLeafNode) do
 	local Num = BushLeafNode[i][1]
 	minetest.register_node("bushes:BushLeaves"..Num, {
-		description = "Bush Leaves "..Num,
+		description = S("Bush Leaves @1", Num),
 		drawtype = "allfaces_optional",
 		tiles = {"bushes_leaves_"..Num..".png"},
 		paramtype = "light",
@@ -181,14 +184,14 @@ abstract_bushes.grow_bush_node = function(pos,dir, leaf_type)
 
 	if minetest.get_node(right_here).name == "air"  -- instead of check_air = true,
 	or minetest.get_node(right_here).name == "default:junglegrass" then
-		minetest.set_node(right_here, {name="bushes:bushbranches"..bush_branch_type , param2=dir})
+		minetest.swap_node(right_here, {name="bushes:bushbranches"..bush_branch_type , param2=dir})
 						--minetest.chat_send_all("leaf_type: (" .. leaf_type .. ")")
-		minetest.set_node(above_right_here, {name="bushes:BushLeaves"..leaf_type})
+		minetest.swap_node(above_right_here, {name="bushes:BushLeaves"..leaf_type})
 		local chance_of_high_leaves = math.random(1,10)
 		if chance_of_high_leaves> 5 then
 			local two_above_right_here = {x=pos.x, y=pos.y+3, z=pos.z}
 							--minetest.chat_send_all("leaf_type: (" .. leaf_type .. ")")
-			minetest.set_node(two_above_right_here, {name="bushes:BushLeaves"..leaf_type})
+			minetest.swap_node(two_above_right_here, {name="bushes:BushLeaves"..leaf_type})
 		end
 	end
 end
@@ -199,8 +202,7 @@ biome_lib:register_generate_plant({
 		"default:dirt_with_grass",
 		"stoneage:grass_with_silex",
 		"sumpf:peat",
-		"sumpf:sumpf",
+		"sumpf:sumpf"
-		"default:dirt_with_dry_grass"
 	},
     max_count = 15,  --10,15
     rarity = 101 - 4,  --3,4
@@ -212,7 +214,7 @@ biome_lib:register_generate_plant({
 
  abstract_bushes.grow_youngtree2 = function(pos)
 	local height = math.random(4,5)
-	return abstract_bushes.grow_youngtree_node2(pos,height)
+	abstract_bushes.grow_youngtree_node2(pos,height)
 end
 
 abstract_bushes.grow_youngtree_node2 = function(pos, height)
@@ -228,24 +230,24 @@ abstract_bushes.grow_youngtree_node2 = function(pos, height)
 		if height == 4 then
 				local two_above_right_here_south = {x=pos.x, y=pos.y+3, z=pos.z-1}
 				local three_above_right_here_south = {x=pos.x, y=pos.y+4, z=pos.z-1}
-				minetest.set_node(right_here, {name="bushes:youngtree2_bottom"})
+				minetest.swap_node(right_here, {name="bushes:youngtree2_bottom"})
-				minetest.set_node(above_right_here, {name="bushes:youngtree2_bottom"})
+				minetest.swap_node(above_right_here, {name="bushes:youngtree2_bottom"})
-				minetest.set_node(two_above_right_here, {name="bushes:bushbranches2"  , param2=2})
+				minetest.swap_node(two_above_right_here, {name="bushes:bushbranches2"  , param2=2})
-				minetest.set_node(two_above_right_here_south, {name="bushes:bushbranches2"  , param2=0})
+				minetest.swap_node(two_above_right_here_south, {name="bushes:bushbranches2"  , param2=0})
-				minetest.set_node(three_above_right_here, {name="bushes:BushLeaves1" })
+				minetest.swap_node(three_above_right_here, {name="bushes:BushLeaves1" })
-				minetest.set_node(three_above_right_here_south, {name="bushes:BushLeaves1" })
+				minetest.swap_node(three_above_right_here_south, {name="bushes:BushLeaves1" })
 		end
 
 	end
 end
 
+
 biome_lib:register_generate_plant({
     surface = {
 		"default:dirt_with_grass",
 		"stoneage:grass_with_silex",
 		"sumpf:peat",
-		"sumpf:sumpf",
+		"sumpf:sumpf"
-		"default:dirt_with_dry_grass"
 	},
     max_count = 55,  --10,15
     rarity = 101 - 4,  --3,4

bushes/locale/bushes.fr.tr

@@ -0,0 +1,11 @@
+# textdomain: bushes
+
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# fat115 <fat115@framasoft.org>, 2017.
+#
+
+Young Tree 2 (bottom)=Arbuste 2 (bas)
+Bush Branches @1=Branches de buisson @1
+Bush Leaves @1=Feuilles de buisson @1

bushes/locale/template.txt

@@ -0,0 +1,10 @@
+# textdomain: bushes
+
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+
+Young Tree 2 (bottom)=
+Bush Branches @1=
+Bush Leaves @1=

bushes/mod.conf

@@ -0,0 +1,3 @@
+name = bushes
+depends = default, biome_lib
+optional_depends = stonage, sumpf

bushes_classic/cooking.lua

@@ -1,4 +1,5 @@
-local S = biome_lib.intllib
+-- support for i18n
+local S = minetest.get_translator("bushes_classic")
 
 -- Basket
 
@@ -12,22 +13,12 @@ minetest.register_craft({
 
 -- Sugar
 
--- Use the sugar from farming redo if available
+if not minetest.registered_items["farming:sugar"] then
-if minetest.get_modpath("farming") and farming.mod == "redo" then
-	--[[ We really have nothing to do to use farming:sugar in the recipes
-	     because they use the generic group group:food_sugar
-	     which is added to the groups list of farming:sugar by the mod "food".
-	--]]
-
-	--Temporary alias to replace existing bushes:sugar in the world
-	minetest.register_alias("bushes:sugar", "farming:sugar")
-
-else
 	minetest.register_craftitem(":bushes:sugar", {
 		description = S("Sugar"),
 		inventory_image = "bushes_sugar.png",
 		on_use = minetest.item_eat(1),
-	groups = {food_sugar=1}
+		groups = {food_sugar=1, flammable = 2}
 	})
 
 	minetest.register_craft({
@@ -36,51 +27,66 @@ minetest.register_craft({
 			{ "default:papyrus", "default:papyrus" },
 		},
 	})
+else
+	minetest.register_alias("bushes:sugar", "farming:sugar")
 end
 
-for i, berry in ipairs(bushes_classic.bushes) do
+-- override farming_plus strawberry and add food_ group
-	local desc = bushes_classic.bushes_descriptions[i]
+if minetest.get_modpath("farming_plus") then
 
+	minetest.override_item("farming_plus:strawberry_item", {
+		groups = {food_strawberry = 1, food_berry = 1, flammable = 2},
+	})
+end
+
+
+for i, berry in ipairs(bushes_classic.bushes) do
+
+	local groups = {food_berry = 1, flammable = 2}
+
+	if berry ~= "mixed_berry" then
+
+		groups["food_" .. berry] = 1
+
+		-- Berry
+		minetest.register_craftitem(":bushes:"..berry, {
+			description = bushes_classic.bushes_descriptions[i][1],
+			inventory_image = "bushes_"..berry..".png",
+			groups = groups,
+			on_use = minetest.item_eat(1),
+		})
+	end
+
+	-- Raw pie
 	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),
 	})
 
 	if berry ~= "mixed_berry" then
 
-		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",
-				on_use = minetest.item_eat(2),
-				groups = {berry=1, strawberry=1}
-			})
-			minetest.register_alias("bushes:strawberry", "farming_plus:strawberry_item")
-		else
-			minetest.register_craftitem(":bushes:"..berry, {
-				description = desc,
-				inventory_image = "bushes_"..berry..".png",
-				groups = {berry = 1, [berry] = 1},
-				on_use = minetest.item_eat(1),
-			})
-		end
 		minetest.register_craft({
 			output = "bushes:"..berry.."_pie_raw 1",
 			recipe = {
 			{ "group:food_sugar", "farming:flour", "group:food_sugar" },
-			{ "group:"..berry, "group:"..berry, "group:"..berry },
+			{ "group:food_"..berry, "group:food_"..berry, "group:food_"..berry },
+			},
+		})
+	else
+		minetest.register_craft({
+			output = "bushes:mixed_berry_pie_raw 2",
+			recipe = {
+			{ "group:food_sugar", "farming:flour", "group:food_sugar" },
+			{ "group:food_berry", "group:food_berry", "group:food_berry" },
+			{ "group:food_berry", "group:food_berry", "group:food_berry" },
 			},
 		})
 	end
 
 	-- 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),
 	})
@@ -92,10 +98,9 @@ for i, berry in ipairs(bushes_classic.bushes) do
 		cooktime = 30,
 	})
 
-	-- slice of pie
+	-- 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),
 	})
@@ -108,7 +113,6 @@ for i, berry in ipairs(bushes_classic.bushes) do
 	})
 
 	-- Basket with pies
-
 	minetest.register_craft({
 		output = "bushes:basket_"..berry.." 1",
 		recipe = {
@@ -117,14 +121,3 @@ for i, berry in ipairs(bushes_classic.bushes) do
 		},
 	})
 end
-
-minetest.register_craft({
-	output = "bushes:mixed_berry_pie_raw 2",
-	recipe = {
-	{ "group:food_sugar", "farming:flour", "group:food_sugar" },
-	{ "group:berry", "group:berry", "group:berry" },
-	{ "group:berry", "group:berry", "group:berry" },
-	},
-})
-
-

bushes_classic/depends.txt

@@ -1,3 +0,0 @@
-biome_lib
-farming?
-farming_plus?

bushes_classic/init.lua

@@ -1,12 +1,11 @@
 -- Bushes classic mod originally by unknown
 -- now maintained by VanessaE
---
--- License:  WTFPL
-
-local S = biome_lib.intllib
 
 bushes_classic = {}
 
+-- support for i18n
+local S = minetest.get_translator("bushes_classic")
+
 bushes_classic.bushes = {
   "strawberry",
 	"blackberry",
@@ -17,12 +16,12 @@ bushes_classic.bushes = {
 }
 
 bushes_classic.bushes_descriptions = {
-    "Strawberry",
+	{S("Strawberry"),  S("Raw Strawberry pie"),  S("Cooked Strawberry pie"),  S("Slice of Strawberry pie"),  S("Basket with Strawberry pies"),  S("Strawberry Bush")},
-	"Blackberry",
+	{S("Blackberry"),  S("Raw Blackberry pie"),  S("Cooked Blackberry pie"),  S("Slice of Blackberry pie"),  S("Basket with Blackberry pies"),  S("Blackberry Bush")},
-	"Blueberry",
+	{S("Blueberry"),   S("Raw Blueberry pie"),   S("Cooked Blueberry pie"),   S("Slice of Blueberry pie"),   S("Basket with Blueberry pies"),   S("Blueberry Bush")},
-	"Raspberry",
+	{S("Raspberry"),   S("Raw Raspberry pie"),   S("Cooked Raspberry pie"),   S("Slice of Raspberry pie"),   S("Basket with Raspberry pies"),   S("Raspberry Bush")},
-	"Gooseberry",
+	{S("Gooseberry"),  S("Raw Gooseberry pie"),  S("Cooked Gooseberry pie"),  S("Slice of Gooseberry pie"),  S("Basket with Gooseberry pies"),  S("Gooseberry Bush")},
-	"Mixed Berry"
+	{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 = {}
@@ -56,4 +55,4 @@ biome_lib:spawn_on_surfaces({
 
 minetest.register_alias("bushes:basket_pies", "bushes:basket_strawberry")
 
-minetest.log("action", S("[Bushes] Loaded."))
+print("[Bushes] Loaded.")

bushes_classic/locale/bushes_classic.de.tr

@@ -0,0 +1,46 @@
+# textdomain: bushes_classic
+
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Xanthin, 2017.
+#
+
+Sugar=Zucker
+Basket with Strawberry pies=Korb mit Erdbeertorten
+Cooked Strawberry pie=Erdbeertorte
+Raw Strawberry pie=Rohe Erdbeertorte
+Slice of Strawberry pie=Erdbeertortenstueck
+Strawberry=Erdbeere
+Strawberry Bush=Erdbeerbusch
+Basket with Blackberry pies=Korb mit Brombeertorten
+Blackberry=Brombeere
+Blackberry Bush=Brombeerbusch
+Cooked Blackberry pie=Brombeertorte
+Raw Blackberry pie=Rohe Brombeertorte
+Slice of Blackberry pie=Brombeertortenstueck
+Basket with Blueberry pies=Korb mit Blaubeertorten
+Blueberry=Blaubeere
+Blueberry Bush=Blaubeerbusch
+Cooked Blueberry pie=Blaubeertorte
+Raw Blueberry pie=Rohe Blaubeertorte
+Slice of Blueberry pie=Blaubeertortenstueck
+Basket with Raspberry pies=Korb mit Himbeertorten
+Cooked Raspberry pie=Himbeertorte
+Raspberry=Himbeere
+Raspberry Bush=Himbeerbusch
+Raw Raspberry pie=Rohe Himbeertorte
+Slice of Raspberry pie=Himbeertortenstueck
+Basket with Gooseberry pies=Korb mit Stachelbeertorten
+Cooked Gooseberry pie=Stachelbeertorte
+Gooseberry=Stachelbeere
+Gooseberry Bush=Stachelbeerbusch
+Raw Gooseberry pie=Rohe Stachelbeertorte
+Slice of Gooseberry pie=Stachelbeertortenstueck
+Basket with Mixed Berry pies=Korb mit Beerenmixtorten
+Cooked Mixed Berry pie=Beerenmixtorte
+Currently fruitless Bush=zur Zeit fruechteloser
+Mixed Berry=Beerenmix
+Raw Mixed Berry pie=Rohe Beerenmixtorte
+Slice of Mixed Berry pie=Beerenmixtortenstueck
+Basket=Korb

bushes_classic/locale/bushes_classic.es.tr

@@ -0,0 +1,46 @@
+# textdomain: bushes_classic
+
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Carlos Barraza <carlosbarrazaes@gmail.com>, 2017.
+#
+
+Sugar=Azúcar
+Basket with Strawberry pies=Cesta con Pasteles de Frutilla
+Cooked Strawberry pie=Pastel de Frutilla Cocido
+Raw Strawberry pie=Pastel de Frutilla Crudo
+Slice of Strawberry pie=Rebanada de Pastel de Frutilla
+Strawberry=Frutilla
+Strawberry Bush=Arbusto de Frutilla
+Basket with Blackberry pies=Cesta con Pasteles de Mora
+Blackberry=Mora
+Blackberry Bush=Arbusto de Mora
+Cooked Blackberry pie=Pastel de Mora Cocido
+Raw Blackberry pie=Pastel de Mora Crudo
+Slice of Blackberry pie=Rebanada de Pastel de Mora
+Basket with Blueberry pies=Cesta con Pasteles de Arándano
+Blueberry=Arándano
+Blueberry Bush=Arbusto de Arándano
+Cooked Blueberry pie=Pastel de Arándano Cocido
+Raw Blueberry pie=Pastel de Arándano Crudo
+Slice of Blueberry pie=Rebanada de Pastel de Arándano
+Basket with Raspberry pies=Cesta con Pasteles de Frambuesa
+Cooked Raspberry pie=Pastel de Frambuesa Cocido
+Raspberry=Frambuesa
+Raspberry Bush=Arbusto de Frambuesa
+Raw Raspberry pie=Pastel de Frambuesa Crudo
+Slice of Raspberry pie=Rebanada de Pastel de Frambuesa
+Basket with Gooseberry pies=Cesta con Pasteles de Grosella
+Cooked Gooseberry pie=Pastel de Grosella Cocido
+Gooseberry=Grosella
+Gooseberry Bush=Arbusto de Grosella
+Raw Gooseberry pie=Pastel de Grosella Crudo
+Slice of Gooseberry pie=Rebanada de Pastel de Grosella
+Basket with Mixed Berry pies=Cesta con Pasteles de Mezcla de Baya
+Cooked Mixed Berry pie=Pastel de Mezcla de Bayas Cocido
+Currently fruitless Bush=Arbusto actualmente infructuoso
+Mixed Berry=Mezcla de Baya
+Raw Mixed Berry pie=Pastel de Mezcla de Bayas Cruda
+Slice of Mixed Berry pie=Rebanada de Pastel de Mezcla de Bayas
+Basket=Cesta

bushes_classic/locale/bushes_classic.fr.tr

@@ -0,0 +1,46 @@
+# textdomain: bushes_classic
+
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# fat115 <fat115@framasoft.org>, 2017.
+#
+
+Sugar=Sucre
+Basket with Strawberry pies=Panier de tartes aux fraises
+Cooked Strawberry pie=Tarte aux fraises (cuite)
+Raw Strawberry pie=Tarte aux fraises (crue)
+Slice of Strawberry pie=Part de tarte aux fraises
+Strawberry=Fraises
+Strawberry Bush=Buisson de fraises
+Basket with Blackberry pies=Panier de tartes aux fraises
+Blackberry=Mûres
+Blackberry Bush=Buisson de mûres
+Cooked Blackberry pie=Tarte aux mûres (cuite)
+Raw Blackberry pie=Tarte aux mûres (crue)
+Slice of Blackberry pie=Part de tarte aux mûres
+Basket with Blueberry pies=Panier de tartes aux mûres
+Blueberry=Myrtilles
+Blueberry Bush=Buisson de myrtilles
+Cooked Blueberry pie=Tarte aux myrtilles (cuite)
+Raw Blueberry pie=Tarte aux myrtilles (crue)
+Slice of Blueberry pie=Part de tarte aux myrtilles
+Basket with Raspberry pies=Panier de tartes aux framboises
+Cooked Raspberry pie=Tarte aux framboises (cuite)
+Raspberry=Framboises
+Raspberry Bush=Buisson de framboises
+Raw Raspberry pie=Tarte aux framboises (crue)
+Slice of Raspberry pie=Part de tarts aux framboises
+Basket with Gooseberry pies=Panier de tartes aux groseilles
+Cooked Gooseberry pie=Tarte aux groseilles (cuite)
+Gooseberry=Groseilles
+Gooseberry Bush=Buisson de groseilles
+Raw Gooseberry pie=Tarte aux groseilles (crue)
+Slice of Gooseberry pie=Part de tarte aux groseilles
+Basket with Mixed Berry pies=Panier de tartes aux fruits rouges
+Cooked Mixed Berry pie=Tarte aux fruits rouges (cuite)
+Currently fruitless Bush=Buisson sans fruits pour l'instant
+Mixed Berry=Fruits rouges
+Raw Mixed Berry pie=Tarte aux fruits rouges (crue)
+Slice of Mixed Berry pie=Part de tarte aux fruits rouges
+Basket=Panier

bushes_classic/locale/bushes_classic.tr.tr

@@ -0,0 +1,46 @@
+# textdomain: bushes_classic
+
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# mahmutelmas06@hotmail.com, 2017.
+#
+
+Sugar=Şeker
+Basket with Strawberry pies=Çilekli pasta sepeti
+Cooked Strawberry pie=Pişmiş çilekli pasta 
+Raw Strawberry pie=Çilekli çiğ pasta
+Slice of Strawberry pie=Çilekli pasta dilimi
+Strawberry=Çilek
+Strawberry Bush=Çilek fidanı
+Basket with Blackberry pies=Böğürtlenli pasta sepeti
+Blackberry=Böğürtlen
+Blackberry Bush=Böğürtlen fidanı
+Cooked Blackberry pie=Pişmiş böğürtlenli pasta
+Raw Blackberry pie=Böğürtlenli çiğ pasta
+Slice of Blackberry pie=Böğürtlenli pasta dilimi
+Basket with Blueberry pies=Yaban mersini pastalı sepet
+Blueberry=Yaban mersini
+Blueberry Bush=Yaban mersini fidanı
+Cooked Blueberry pie=Pişmiş yaban mersinli pasta
+Raw Blueberry pie=Yaban mersinli çiğ pasta
+Slice of Blueberry pie=Yaban mersinli pasta dilimi
+Basket with Raspberry pies=Ahududulu pasta sepeti
+Cooked Raspberry pie=Pişmiş ahududulu pasta
+Raspberry=Ahududu
+Raspberry Bush=Ahududu fidanı
+Raw Raspberry pie=Ahududulu çiğ pasta
+Slice of Raspberry pie=Ahududulu pasta dilimi
+Basket with Gooseberry pies=Bektaşi üzümlü pasta sepeti
+Cooked Gooseberry pie=Pişmiş bektaşi üzümlü pasta
+Gooseberry=Bektaşi üzümü
+Gooseberry Bush=Bektaşi üzümü fidanı
+Raw Gooseberry pie=Bektaşi üzümlü çiğ pasta
+Slice of Gooseberry pie=Bektaşi üzümlü pasta dilimi
+Basket with Mixed Berry pies=Dutlu pasta sepeti
+Cooked Mixed Berry pie=Pişmiş dutlu pasta
+Currently fruitless Bush=Fidanı şu anda meyvesiz
+Mixed Berry=Dut
+Raw Mixed Berry pie=Dutlu çiğ pasta
+Slice of Mixed Berry pie=Dutlu pasta dilimi
+Basket=Sepet

bushes_classic/locale/de.txt

@@ -1,43 +0,0 @@
-# Translation by Xanthin
-
-Strawberry = Erdbeere
-Blackberry = Brombeere
-Blueberry = Blaubeere
-Raspberry = Himbeere
-Gooseberry = Stachelbeere
-Mixed Berry = Beerenmix
-Basket with Strawberry Pies = Korb mit Erdbeertorten
-Basket with Blackberry Pies = Korb mit Brombeertorten
-Basket with Blueberry Pies = Korb mit Blaubeertorten
-Basket with Raspberry Pies = Korb mit Himbeertorten
-Basket with Gooseberry Pies = Korb mit Stachelbeertorten
-Basket with Mixed Berry Pies = Korb mit Beerenmixtorten
-currently fruitless = zur Zeit fruechteloser
-Strawberry Bush = Erdbeerbusch
-Blackberry Bush = Brombeerbusch
-Blueberry Bush = Blaubeerbusch
-Raspberry Bush = Himbeerbusch
-Gooseberry Bush = Stachelbeerbusch
-Mixed Berry Bush = Beerenmixbusch
-Basket = Korb
-Sugar = Zucker
-Raw Strawberry pie = Rohe Erdbeertorte
-Raw Blackberry pie = Rohe Brombeertorte
-Raw Blueberry pie = Rohe Blaubeertorte
-Raw Raspberry pie = Rohe Himbeertorte
-Raw Gooseberry pie = Rohe Stachelbeertorte
-Raw Mixed Berry pie = Rohe Beerenmixtorte
-Cooked Strawberry pie = Erdbeertorte
-Cooked Blackberry pie = Brombeertorte
-Cooked Blueberry pie = Blaubeertorte
-Cooked Raspberry pie = Himbeertorte
-Cooked Gooseberry pie = Stachelbeertorte
-Cooked Mixed Berry pie = Beerenmixtorte
-Slice of Strawberry pie = Erdbeertortenstueck
-Slice of Blackberry pie = Brombeertortenstueck
-Slice of Blueberry pie = Blaubeertortenstueck
-Slice of Raspberry pie = Himbeertortenstueck
-Slice of Gooseberry pie = Stachelbeertortenstueck
-Slice of Mixed Berry pie = Beerenmixtortenstueck
-
-[Bushes] Loaded. = [Bushes] Geladen.

bushes_classic/locale/fr.txt

@@ -1,43 +0,0 @@
-# Template
-
-Strawberry = Fraise
-Blackberry = Mûre
-Blueberry = Myrtille
-Raspberry = Framboise
-Gooseberry = Groseille
-Mixed Berry = Mélange de baies
-Basket with Strawberry Pies = Panier de tartes aux fraises
-Basket with Blackberry Pies = Panier de tartes aux mûres
-Basket with Blueberry Pies = Panier de tartes aux myrtilles
-Basket with Raspberry Pies = Panier de tartes aux framboises
-Basket with Gooseberry Pies = Panier de tartes aux groseilles
-Basket with Mixed Berry Pies = Panier de tartes au mélange de baies
-currently fruitless = actuellement sans fruit
-Strawberry Bush = Buisson à fraise
-Blackberry Bush = Buisson à mûre
-Blueberry Bush = Buisson à myrtille
-Raspberry Bush = Buisson à framboise
-Gooseberry Bush = Buisson à groseille
-Mixed Berry Bush = Buisson de baies mélangées
-Basket = Panier
-Sugar = Sucre
-Raw Strawberry pie = Tarte crue aux fraises
-Raw Blackberry pie = Tarte crue aux mûres
-Raw Blueberry pie = Tarte crue aux myrtilles
-Raw Raspberry pie = Tarte crue aux framboises
-Raw Gooseberry pie = Tarte crue aux groseilles
-Raw Mixed Berry pie = Tarte crue au mélange de baies
-Cooked Strawberry pie = Tarte cuite aux fraises
-Cooked Blackberry pie = Tarte cuite aux mûres
-Cooked Blueberry pie = Tarte cuite aux myrtilles
-Cooked Raspberry pie = Tarte cuite aux framboises
-Cooked Gooseberry pie = Tarte cuite aux groseilles
-Cooked Mixed Berry pie = Tarte cuite au mélange de baies
-Slice of Strawberry pie = Part de tarte aux fraises
-Slice of Blackberry pie = Part de tarte aux mûres
-Slice of Blueberry pie = Part de tarte aux myrtilles
-Slice of Raspberry pie = Part de tarts aux framboises
-Slice of Gooseberry pie = Part de tarte aux groseilles
-Slice of Mixed Berry pie = Part de tarte au mélange de baies
-
-[Bushes] Loaded. = [Buissons] Chargés.

bushes_classic/locale/template.txt

@@ -1,43 +1,46 @@
-# Template
+# textdomain: bushes_classic
+
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
 
-Strawberry = 
-Blackberry = 
-Blueberry = 
-Raspberry = 
-Gooseberry = 
-Mixed Berry = 
-Basket with Strawberry Pies = 
-Basket with Blackberry Pies = 
-Basket with Blueberry Pies = 
-Basket with Raspberry Pies = 
-Basket with Gooseberry Pies = 
-Basket with Mixed Berry Pies = 
-currently fruitless = 
-Strawberry Bush = 
-Blackberry Bush = 
-Blueberry Bush = 
-Raspberry Bush = 
-Gooseberry Bush = 
-Mixed Berry Bush = 
-Basket = 
 Sugar=
-Raw Strawberry pie = 
+Basket with Strawberry pies=
-Raw Blackberry pie = 
-Raw Blueberry pie = 
-Raw Raspberry pie = 
-Raw Gooseberry pie = 
-Raw Mixed Berry pie = 
 Cooked Strawberry pie=
-Cooked Blackberry pie = 
+Raw Strawberry pie=
-Cooked Blueberry pie = 
-Cooked Raspberry pie = 
-Cooked Gooseberry pie = 
-Cooked Mixed Berry pie = 
 Slice of Strawberry pie=
+Strawberry=
+Strawberry Bush=
+Basket with Blackberry pies=
+Blackberry=
+Blackberry Bush=
+Cooked Blackberry pie=
+Raw Blackberry pie=
 Slice of Blackberry pie=
+Basket with Blueberry pies=
+Blueberry=
+Blueberry Bush=
+Cooked Blueberry pie=
+Raw Blueberry pie=
 Slice of Blueberry pie=
+Basket with Raspberry pies=
+Cooked Raspberry pie=
+Raspberry=
+Raspberry Bush=
+Raw Raspberry pie=
 Slice of Raspberry pie=
+Basket with Gooseberry pies=
+Cooked Gooseberry pie=
+Gooseberry=
+Gooseberry Bush=
+Raw Gooseberry pie=
 Slice of Gooseberry pie=
+Basket with Mixed Berry pies=
+Cooked Mixed Berry pie=
+Currently fruitless Bush=
+Mixed Berry=
+Raw Mixed Berry pie=
 Slice of Mixed Berry pie=
-
+Basket=
-[Bushes] Loaded. = 

bushes_classic/locale/tr.txt

@@ -1,44 +0,0 @@
-# Turkish translation
-#  mahmutelmas06@hotmail.com
-
-Strawberry = Çilek
-Blackberry = Böğürtlen
-Blueberry = Yaban mersini
-Raspberry = Ahududu
-Gooseberry = Bektaşi üzümü
-Mixed Berry = Dut
-Basket with Strawberry Pies = Çilekli pasta sepeti
-Basket with Blackberry Pies = Böğürtlenli pasta sepeti
-Basket with Blueberry Pies = Yaban mersini pastalı sepet
-Basket with Raspberry Pies = Ahududulu pasta sepeti
-Basket with Gooseberry Pies = Bektaşi üzümlü pasta sepeti
-Basket with Mixed Berry Pies = Dutlu pasta sepeti 
-currently fruitless = şu anda meyvesiz
-Strawberry Bush = Çilek fidanı 
-Blackberry Bush = Böğürtlen fidanı
-Blueberry Bush = Yaban mersini fidanı
-Raspberry Bush = Ahududu fidanı
-Gooseberry Bush = Bektaşi üzümü fidanı
-Mixed Berry Bush = Dut fidanı 
-Basket = Sepet 
-Sugar = Şeker
-Raw Strawberry pie = Çilekli çiğ pasta
-Raw Blackberry pie = Böğürtlenli çiğ pasta
-Raw Blueberry pie = Yaban mersinli çiğ pasta
-Raw Raspberry pie = Ahududulu çiğ pasta
-Raw Gooseberry pie = Bektaşi üzümlü çiğ pasta
-Raw Mixed Berry pie = Dutlu çiğ pasta
-Cooked Strawberry pie = Pişmiş çilekli pasta 
-Cooked Blackberry pie = Pişmiş böğürtlenli pasta
-Cooked Blueberry pie = Pişmiş yaban mersinli pasta
-Cooked Raspberry pie = Pişmiş ahududulu pasta
-Cooked Gooseberry pie = Pişmiş bektaşi üzümlü pasta
-Cooked Mixed Berry pie = Pişmiş dutlu pasta
-Slice of Strawberry pie = Çilekli pasta dilimi
-Slice of Blackberry pie = Böğürtlenli pasta dilimi
-Slice of Blueberry pie = Yaban mersinli pasta dilimi
-Slice of Raspberry pie = Ahududulu pasta dilimi
-Slice of Gooseberry pie = Bektaşi üzümlü pasta dilimi
-Slice of Mixed Berry pie = Dutlu pasta dilimi
-
-[Bushes] Loaded. = [Bushes] yüklendi.

bushes_classic/mod.conf

@@ -0,0 +1,3 @@
+name = bushes_classic
+depends = biome_lib
+optional_depends = farming, farming_plus

bushes_classic/nodes.lua

@@ -1,4 +1,5 @@
-local S = biome_lib.intllib
+-- support for i18n
+local S = minetest.get_translator("bushes_classic")
 
 plantlife_bushes = {}
 
@@ -46,7 +47,7 @@ plantlife_bushes.after_dig_node = function(pos, oldnode, oldmetadata, digger)
 	elseif groupcaps.snappy then
 
 		-- plant a new bush without fruits
-		minetest.set_node(pos, {type = "node", name = "bushes:fruitless_bush"})
+		minetest.swap_node(pos, {type = "node", name = "bushes:fruitless_bush"})
 		local meta = minetest.get_meta(pos)
 		meta:set_string('bush_type', bush_name)
 
@@ -113,7 +114,7 @@ plantlife_bushes.after_place_node = function(pos, placer, itemstack)
 		return
 	end
 
-	minetest.set_node(pos, {name = "bushes:fruitless_bush"})
+	minetest.swap_node(pos, {name = "bushes:fruitless_bush"})
 	local meta = minetest.get_meta(pos)
 	meta:set_string("bush_type", name_parts[1])
 end
@@ -136,7 +137,7 @@ minetest.register_abm({
 			local is_soil = minetest.get_item_group(dirt.name, "soil") or minetest.get_item_group(dirt.name, "potting_soil")
 
 			if is_soil and (dirt.name == "farming:soil_wet" or math.random(1,3) == 1) then
-				minetest.set_node( pos, {name = "bushes:" .. bush_name .. "_bush"})
+				minetest.swap_node( pos, {name = "bushes:" .. bush_name .. "_bush"})
 			end
 		end
 	end
@@ -146,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 = {
@@ -167,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
@@ -177,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"},
@@ -210,5 +208,3 @@ minetest.register_node(":bushes:basket_empty", {
 	paramtype2 = "facedir",
     groups = { dig_immediate = 3 },
 })
-
-