diff --git a/COPYING.txt b/COPYING.txt
deleted file mode 100644
index 68beccd..0000000
--- a/COPYING.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-The TechPack Modpack for Minetest is
-
-Copyright (C) 2017-2018 Joachim Stolberg
-
-License of source code
-----------------------
-
-This program is free software; you can redistribute and/or
-modify it under the terms of the GNU Lesser General Public License version 2.1 or later
-published by the Free Software Foundation.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this library; if not, write to the
-Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-Boston, MA 02110-1301, USA.
-
-
-License of media (textures, sounds and documentation)
------------------------------------------------------
-
-All textures, sounds and documentation files are licensed under the
-Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
-http://creativecommons.org/licenses/by-sa/3.0/
diff --git a/LICENSE.txt b/LICENSE.txt
index 4362b49..2beb9e1 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,502 +1,662 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
+ GNU AFFERO GENERAL PUBLIC LICENSE
+ Version 3, 19 November 2007
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 2007 Free Software Foundation, Inc.
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
Preamble
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
+ The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
+ Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
+ A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate. Many developers of free software are heartened and
+encouraged by the resulting cooperation. However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
+ The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community. It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server. Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
+ An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals. This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+modification follow.
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
+ TERMS AND CONDITIONS
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
+ 0. Definitions.
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
+ "This License" refers to version 3 of the GNU Affero General Public License.
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
- a) The modified work must itself be a software library.
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
+ 1. Source Code.
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
+ The Corresponding Source for a work in source code form is that
+same work.
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
+ 2. Basic Permissions.
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
+ 4. Conveying Verbatim Copies.
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
+ 5. Conveying Modified Source Versions.
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. 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 not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
+ 6. Conveying Non-Source Forms.
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
+ 13. Remote Network Interaction; Use with the GNU General Public License.
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
+ Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software. This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
+ 14. Revised Versions of this License.
- 13. The Free Software Foundation may publish revised and/or new
-versions of the 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.
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero 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
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
- NO WARRANTY
+ If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
+ How to Apply These Terms to Your New Programs
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
-
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
Copyright (C)
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This library is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
Also add information on how to contact you by electronic and paper mail.
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
+ If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source. For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code. There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+.
- , 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/README.md b/README.md
index 73369bf..c208d7b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# TechPack V2.03
+# TechPack V2.04
TechPack, a Mining, Crafting, & Farming Modpack for Minetest.
@@ -115,7 +115,7 @@ The value 200 (default) results in a lifetime for standard machines of about 200
### License
Copyright (C) 2017-2020 Joachim Stolberg
-Code: Licensed under the GNU LGPL version 2.1 or later. See LICENSE.txt
+Code: Licensed under the GNU AGPL version 3 or later. See LICENSE.txt
Textures: CC BY-SA 3.0
@@ -151,6 +151,7 @@ tubelib_addons1 optional: unified_inventory
- 2019-01-27 V2.01 * SaferLua Controller Terminal added
- 2019-01-28 V2.02 * Logic Not added, output reduction on Harvester, Fermenter, and Gravel Sieve
- 2019-04-23 V2.03 * Piston/WorldEdit/replacer detection added, farming and grinder recipes added
+- 2020-11-20 V2.04 * Switch to AGPL v3, adapt to minetest 5.3, add translation support, fix minor bugs
## New in v2 (from players point of view)
diff --git a/gravelsieve/init.lua b/gravelsieve/init.lua
index b1ac9ac..b9c0261 100644
--- a/gravelsieve/init.lua
+++ b/gravelsieve/init.lua
@@ -7,11 +7,11 @@
Derived from the work of celeron55, Perttu Ahola (furnace)
Pipeworks support added by FiftySix
- Copyright (C) 2017-2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
Copyright (C) 2011-2016 celeron55, Perttu Ahola
Copyright (C) 2011-2016 Various Minetest developers and contributors
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
History:
diff --git a/i18n.py b/i18n.py
new file mode 100644
index 0000000..93938d4
--- /dev/null
+++ b/i18n.py
@@ -0,0 +1,450 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# Script to generate the template file and update the translation files.
+# Copy the script into the mod or modpack root folder and run it there.
+#
+# Copyright (C) 2019 Joachim Stolberg, 2020 FaceDeer, 2020 Louis Royer
+# LGPLv2.1+
+#
+# See https://github.com/minetest-tools/update_translations for
+# potential future updates to this script.
+
+from __future__ import print_function
+import os, fnmatch, re, shutil, errno
+from sys import argv as _argv
+from sys import stderr as _stderr
+
+# Running params
+params = {"recursive": False,
+ "help": False,
+ "mods": False,
+ "verbose": False,
+ "folders": [],
+ "no-old-file": False
+}
+# Available CLI options
+options = {"recursive": ['--recursive', '-r'],
+ "help": ['--help', '-h'],
+ "mods": ['--installed-mods'],
+ "verbose": ['--verbose', '-v'],
+ "no-old-file": ['--no-old-file']
+}
+
+# Strings longer than this will have extra space added between
+# them in the translation files to make it easier to distinguish their
+# beginnings and endings at a glance
+doublespace_threshold = 60
+
+def set_params_folders(tab: list):
+ '''Initialize params["folders"] from CLI arguments.'''
+ # Discarding argument 0 (tool name)
+ for param in tab[1:]:
+ stop_param = False
+ for option in options:
+ if param in options[option]:
+ stop_param = True
+ break
+ if not stop_param:
+ params["folders"].append(os.path.abspath(param))
+
+def set_params(tab: list):
+ '''Initialize params from CLI arguments.'''
+ for option in options:
+ for option_name in options[option]:
+ if option_name in tab:
+ params[option] = True
+ break
+
+def print_help(name):
+ '''Prints some help message.'''
+ print(f'''SYNOPSIS
+ {name} [OPTIONS] [PATHS...]
+DESCRIPTION
+ {', '.join(options["help"])}
+ prints this help message
+ {', '.join(options["recursive"])}
+ run on all subfolders of paths given
+ {', '.join(options["mods"])}
+ run on locally installed modules
+ {', '.join(options["no-old-file"])}
+ do not create *.old files
+ {', '.join(options["verbose"])}
+ add output information
+''')
+
+
+def main():
+ '''Main function'''
+ set_params(_argv)
+ set_params_folders(_argv)
+ if params["help"]:
+ print_help(_argv[0])
+ elif params["recursive"] and params["mods"]:
+ print("Option --installed-mods is incompatible with --recursive")
+ else:
+ # Add recursivity message
+ print("Running ", end='')
+ if params["recursive"]:
+ print("recursively ", end='')
+ # Running
+ if params["mods"]:
+ print(f"on all locally installed modules in {os.path.abspath('~/.minetest/mods/')}")
+ run_all_subfolders("~/.minetest/mods")
+ elif len(params["folders"]) >= 2:
+ print("on folder list:", params["folders"])
+ for f in params["folders"]:
+ if params["recursive"]:
+ run_all_subfolders(f)
+ else:
+ update_folder(f)
+ elif len(params["folders"]) == 1:
+ print("on folder", params["folders"][0])
+ if params["recursive"]:
+ run_all_subfolders(params["folders"][0])
+ else:
+ update_folder(params["folders"][0])
+ else:
+ print("on folder", os.path.abspath("./"))
+ if params["recursive"]:
+ run_all_subfolders(os.path.abspath("./"))
+ else:
+ update_folder(os.path.abspath("./"))
+
+#group 2 will be the string, groups 1 and 3 will be the delimiters (" or ')
+#See https://stackoverflow.com/questions/46967465/regex-match-text-in-either-single-or-double-quote
+pattern_lua_s = re.compile(r'[\.=^\t,{\(\s]N?S\(\s*(["\'])((?:\\\1|(?:(?!\1)).)*)(\1)[\s,\)]', re.DOTALL)
+pattern_lua_fs = re.compile(r'[\.=^\t,{\(\s]N?FS\(\s*(["\'])((?:\\\1|(?:(?!\1)).)*)(\1)[\s,\)]', re.DOTALL)
+pattern_lua_bracketed_s = re.compile(r'[\.=^\t,{\(\s]N?S\(\s*\[\[(.*?)\]\][\s,\)]', re.DOTALL)
+pattern_lua_bracketed_fs = re.compile(r'[\.=^\t,{\(\s]N?FS\(\s*\[\[(.*?)\]\][\s,\)]', re.DOTALL)
+
+# Handles "concatenation" .. " of strings"
+pattern_concat = re.compile(r'["\'][\s]*\.\.[\s]*["\']', re.DOTALL)
+
+pattern_tr = re.compile(r'(.*?[^@])=(.*)')
+pattern_name = re.compile(r'^name[ ]*=[ ]*([^ \n]*)')
+pattern_tr_filename = re.compile(r'\.tr$')
+pattern_po_language_code = re.compile(r'(.*)\.po$')
+
+#attempt to read the mod's name from the mod.conf file. Returns None on failure
+def get_modname(folder):
+ try:
+ with open(os.path.join(folder, "mod.conf"), "r", encoding='utf-8') as mod_conf:
+ for line in mod_conf:
+ match = pattern_name.match(line)
+ if match:
+ return match.group(1)
+ except FileNotFoundError:
+ pass
+ return None
+
+#If there are already .tr files in /locale, returns a list of their names
+def get_existing_tr_files(folder):
+ out = []
+ for root, dirs, files in os.walk(os.path.join(folder, 'locale/')):
+ for name in files:
+ if pattern_tr_filename.search(name):
+ out.append(name)
+ return out
+
+# A series of search and replaces that massage a .po file's contents into
+# a .tr file's equivalent
+def process_po_file(text):
+ # The first three items are for unused matches
+ text = re.sub(r'#~ msgid "', "", text)
+ text = re.sub(r'"\n#~ msgstr ""\n"', "=", text)
+ text = re.sub(r'"\n#~ msgstr "', "=", text)
+ # comment lines
+ text = re.sub(r'#.*\n', "", text)
+ # converting msg pairs into "=" pairs
+ text = re.sub(r'msgid "', "", text)
+ text = re.sub(r'"\nmsgstr ""\n"', "=", text)
+ text = re.sub(r'"\nmsgstr "', "=", text)
+ # various line breaks and escape codes
+ text = re.sub(r'"\n"', "", text)
+ text = re.sub(r'"\n', "\n", text)
+ text = re.sub(r'\\"', '"', text)
+ text = re.sub(r'\\n', '@n', text)
+ # remove header text
+ text = re.sub(r'=Project-Id-Version:.*\n', "", text)
+ # remove double-spaced lines
+ text = re.sub(r'\n\n', '\n', text)
+ return text
+
+# Go through existing .po files and, if a .tr file for that language
+# *doesn't* exist, convert it and create it.
+# The .tr file that results will subsequently be reprocessed so
+# any "no longer used" strings will be preserved.
+# Note that "fuzzy" tags will be lost in this process.
+def process_po_files(folder, modname):
+ for root, dirs, files in os.walk(os.path.join(folder, 'locale/')):
+ for name in files:
+ code_match = pattern_po_language_code.match(name)
+ if code_match == None:
+ continue
+ language_code = code_match.group(1)
+ tr_name = modname + "." + language_code + ".tr"
+ tr_file = os.path.join(root, tr_name)
+ if os.path.exists(tr_file):
+ if params["verbose"]:
+ print(f"{tr_name} already exists, ignoring {name}")
+ continue
+ fname = os.path.join(root, name)
+ with open(fname, "r", encoding='utf-8') as po_file:
+ if params["verbose"]:
+ print(f"Importing translations from {name}")
+ text = process_po_file(po_file.read())
+ with open(tr_file, "wt", encoding='utf-8') as tr_out:
+ tr_out.write(text)
+
+# from https://stackoverflow.com/questions/600268/mkdir-p-functionality-in-python/600612#600612
+# Creates a directory if it doesn't exist, silently does
+# nothing if it already exists
+def mkdir_p(path):
+ try:
+ os.makedirs(path)
+ except OSError as exc: # Python >2.5
+ if exc.errno == errno.EEXIST and os.path.isdir(path):
+ pass
+ else: raise
+
+# Converts the template dictionary to a text to be written as a file
+# dKeyStrings is a dictionary of localized string to source file sets
+# dOld is a dictionary of existing translations and comments from
+# the previous version of this text
+def strings_to_text(dkeyStrings, dOld, mod_name, header_comments):
+ lOut = [f"# textdomain: {mod_name}\n"]
+ if header_comments is not None:
+ lOut.append(header_comments)
+
+ dGroupedBySource = {}
+
+ for key in dkeyStrings:
+ sourceList = list(dkeyStrings[key])
+ sourceList.sort()
+ sourceString = "\n".join(sourceList)
+ listForSource = dGroupedBySource.get(sourceString, [])
+ listForSource.append(key)
+ dGroupedBySource[sourceString] = listForSource
+
+ lSourceKeys = list(dGroupedBySource.keys())
+ lSourceKeys.sort()
+ for source in lSourceKeys:
+ localizedStrings = dGroupedBySource[source]
+ localizedStrings.sort()
+ lOut.append("")
+ lOut.append(source)
+ lOut.append("")
+ for localizedString in localizedStrings:
+ val = dOld.get(localizedString, {})
+ translation = val.get("translation", "")
+ comment = val.get("comment")
+ if len(localizedString) > doublespace_threshold and not lOut[-1] == "":
+ lOut.append("")
+ if comment != None:
+ lOut.append(comment)
+ lOut.append(f"{localizedString}={translation}")
+ if len(localizedString) > doublespace_threshold:
+ lOut.append("")
+
+
+ unusedExist = False
+ for key in dOld:
+ if key not in dkeyStrings:
+ val = dOld[key]
+ translation = val.get("translation")
+ comment = val.get("comment")
+ # only keep an unused translation if there was translated
+ # text or a comment associated with it
+ if translation != None and (translation != "" or comment):
+ if not unusedExist:
+ unusedExist = True
+ lOut.append("\n\n##### not used anymore #####\n")
+ if len(key) > doublespace_threshold and not lOut[-1] == "":
+ lOut.append("")
+ if comment != None:
+ lOut.append(comment)
+ lOut.append(f"{key}={translation}")
+ if len(key) > doublespace_threshold:
+ lOut.append("")
+ return "\n".join(lOut) + '\n'
+
+# Writes a template.txt file
+# dkeyStrings is the dictionary returned by generate_template
+def write_template(templ_file, dkeyStrings, mod_name):
+ # read existing template file to preserve comments
+ existing_template = import_tr_file(templ_file)
+
+ text = strings_to_text(dkeyStrings, existing_template[0], mod_name, existing_template[2])
+ mkdir_p(os.path.dirname(templ_file))
+ with open(templ_file, "wt", encoding='utf-8') as template_file:
+ template_file.write(text)
+
+
+# Gets all translatable strings from a lua file
+def read_lua_file_strings(lua_file):
+ lOut = []
+ with open(lua_file, encoding='utf-8') as text_file:
+ text = text_file.read()
+ #TODO remove comments here
+
+ text = re.sub(pattern_concat, "", text)
+
+ strings = []
+ for s in pattern_lua_s.findall(text):
+ strings.append(s[1])
+ for s in pattern_lua_bracketed_s.findall(text):
+ strings.append(s)
+ for s in pattern_lua_fs.findall(text):
+ strings.append(s[1])
+ for s in pattern_lua_bracketed_fs.findall(text):
+ strings.append(s)
+
+ for s in strings:
+ s = re.sub(r'"\.\.\s+"', "", s)
+ s = re.sub("@[^@=0-9]", "@@", s)
+ s = s.replace('\\"', '"')
+ s = s.replace("\\'", "'")
+ s = s.replace("\n", "@n")
+ s = s.replace("\\n", "@n")
+ s = s.replace("=", "@=")
+ lOut.append(s)
+ return lOut
+
+# Gets strings from an existing translation file
+# returns both a dictionary of translations
+# and the full original source text so that the new text
+# can be compared to it for changes.
+# Returns also header comments in the third return value.
+def import_tr_file(tr_file):
+ dOut = {}
+ text = None
+ header_comment = None
+ if os.path.exists(tr_file):
+ with open(tr_file, "r", encoding='utf-8') as existing_file :
+ # save the full text to allow for comparison
+ # of the old version with the new output
+ text = existing_file.read()
+ existing_file.seek(0)
+ # a running record of the current comment block
+ # we're inside, to allow preceeding multi-line comments
+ # to be retained for a translation line
+ latest_comment_block = None
+ for line in existing_file.readlines():
+ line = line.rstrip('\n')
+ if line[:3] == "###":
+ if header_comment is None:
+ # Save header comments
+ header_comment = latest_comment_block
+ # Stip textdomain line
+ tmp_h_c = ""
+ for l in header_comment.split('\n'):
+ if not l.startswith("# textdomain:"):
+ tmp_h_c += l + '\n'
+ header_comment = tmp_h_c
+
+ # Reset comment block if we hit a header
+ latest_comment_block = None
+ continue
+ if line[:1] == "#":
+ # Save the comment we're inside
+ if not latest_comment_block:
+ latest_comment_block = line
+ else:
+ latest_comment_block = latest_comment_block + "\n" + line
+ continue
+ match = pattern_tr.match(line)
+ if match:
+ # this line is a translated line
+ outval = {}
+ outval["translation"] = match.group(2)
+ if latest_comment_block:
+ # if there was a comment, record that.
+ outval["comment"] = latest_comment_block
+ latest_comment_block = None
+ dOut[match.group(1)] = outval
+ return (dOut, text, header_comment)
+
+# Walks all lua files in the mod folder, collects translatable strings,
+# and writes it to a template.txt file
+# Returns a dictionary of localized strings to source file sets
+# that can be used with the strings_to_text function.
+def generate_template(folder, mod_name):
+ dOut = {}
+ for root, dirs, files in os.walk(folder):
+ for name in files:
+ if fnmatch.fnmatch(name, "*.lua"):
+ fname = os.path.join(root, name)
+ found = read_lua_file_strings(fname)
+ if params["verbose"]:
+ print(f"{fname}: {str(len(found))} translatable strings")
+
+ for s in found:
+ sources = dOut.get(s, set())
+ sources.add(f"### {os.path.basename(fname)} ###")
+ dOut[s] = sources
+
+ if len(dOut) == 0:
+ return None
+ templ_file = os.path.join(folder, "locale/template.txt")
+ write_template(templ_file, dOut, mod_name)
+ return dOut
+
+# Updates an existing .tr file, copying the old one to a ".old" file
+# if any changes have happened
+# dNew is the data used to generate the template, it has all the
+# currently-existing localized strings
+def update_tr_file(dNew, mod_name, tr_file):
+ if params["verbose"]:
+ print(f"updating {tr_file}")
+
+ tr_import = import_tr_file(tr_file)
+ dOld = tr_import[0]
+ textOld = tr_import[1]
+
+ textNew = strings_to_text(dNew, dOld, mod_name, tr_import[2])
+
+ if textOld and textOld != textNew:
+ print(f"{tr_file} has changed.")
+ if not params["no-old-file"]:
+ shutil.copyfile(tr_file, f"{tr_file}.old")
+
+ with open(tr_file, "w", encoding='utf-8') as new_tr_file:
+ new_tr_file.write(textNew)
+
+# Updates translation files for the mod in the given folder
+def update_mod(folder):
+ print(folder)
+ modname = get_modname(folder)
+ if modname is not None:
+ process_po_files(folder, modname)
+ print(f"Updating translations for {modname}")
+ data = generate_template(folder, modname)
+ if data == None:
+ print(f"No translatable strings found in {modname}")
+ else:
+ for tr_file in get_existing_tr_files(folder):
+ update_tr_file(data, modname, os.path.join(folder, "locale/", tr_file))
+ else:
+ print(f"\033[31mUnable to find modname in folder {folder}.\033[0m", file=_stderr)
+ #exit(1)
+
+# Determines if the folder being pointed to is a mod or a mod pack
+# and then runs update_mod accordingly
+def update_folder(folder):
+ is_modpack = os.path.exists(os.path.join(folder, "modpack.txt")) or os.path.exists(os.path.join(folder, "modpack.conf"))
+ if is_modpack:
+ subfolders = [f.path for f in os.scandir(folder) if f.is_dir()]
+ for subfolder in subfolders:
+ update_mod(subfolder + "/")
+ else:
+ update_mod(folder)
+ print("Done.")
+
+def run_all_subfolders(folder):
+ for modfolder in [f.path for f in os.scandir(folder) if f.is_dir()]:
+ update_folder(modfolder + "/")
+
+
+main()
+
diff --git a/safer_lua/data_struct.lua b/safer_lua/data_struct.lua
index 03bbe82..258c4ef 100644
--- a/safer_lua/data_struct.lua
+++ b/safer_lua/data_struct.lua
@@ -3,9 +3,9 @@
SaferLua [safer_lua]
====================
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
data_struct.lua:
diff --git a/safer_lua/environ.lua b/safer_lua/environ.lua
index fe16baf..ad43915 100644
--- a/safer_lua/environ.lua
+++ b/safer_lua/environ.lua
@@ -3,9 +3,9 @@
SaferLua [safer_lua]
====================
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
environ.lua:
diff --git a/safer_lua/init.lua b/safer_lua/init.lua
index f5e75aa..21eed08 100644
--- a/safer_lua/init.lua
+++ b/safer_lua/init.lua
@@ -3,9 +3,9 @@
SaferLua [safer_lua]
====================
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
environ.lua:
diff --git a/safer_lua/scanner.lua b/safer_lua/scanner.lua
index 54817e2..fdd39aa 100644
--- a/safer_lua/scanner.lua
+++ b/safer_lua/scanner.lua
@@ -3,9 +3,9 @@
SaferLua [safer_lua]
====================
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
scanner.lua:
diff --git a/sl_controller/battery.lua b/sl_controller/battery.lua
index c9def62..1109dc8 100644
--- a/sl_controller/battery.lua
+++ b/sl_controller/battery.lua
@@ -3,9 +3,9 @@
sl_controller
=============
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
battery.lua:
diff --git a/sl_controller/commands.lua b/sl_controller/commands.lua
index ca159b5..637fc52 100644
--- a/sl_controller/commands.lua
+++ b/sl_controller/commands.lua
@@ -3,9 +3,9 @@
sl_controller
=============
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
commands.lua:
diff --git a/sl_controller/controller.lua b/sl_controller/controller.lua
index 8c30f7a..2ee0bac 100644
--- a/sl_controller/controller.lua
+++ b/sl_controller/controller.lua
@@ -3,9 +3,9 @@
sl_controller
=============
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
controller.lua:
diff --git a/sl_controller/init.lua b/sl_controller/init.lua
index af29b97..75cf8cc 100644
--- a/sl_controller/init.lua
+++ b/sl_controller/init.lua
@@ -3,9 +3,9 @@
sl_controller
=============
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
]]--
diff --git a/sl_controller/server.lua b/sl_controller/server.lua
index 01178a9..9089af5 100644
--- a/sl_controller/server.lua
+++ b/sl_controller/server.lua
@@ -3,9 +3,9 @@
sl_controller
=============
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
server.lua:
diff --git a/sl_controller/terminal.lua b/sl_controller/terminal.lua
index 552fb67..7c9a485 100644
--- a/sl_controller/terminal.lua
+++ b/sl_controller/terminal.lua
@@ -3,9 +3,9 @@
sl_controller
=============
- Copyright (C) 2018-2019 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
terminal.lua:
diff --git a/smartline/button.lua b/smartline/button.lua
index f3aba5c..f8f837a 100644
--- a/smartline/button.lua
+++ b/smartline/button.lua
@@ -3,9 +3,9 @@
SmartLine
=========
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
button.lua:
@@ -17,7 +17,7 @@
local S = smartline.S
local function switch_on(pos, node)
- if tubelib.data_not_corrupted(pos) then
+ if tubelib.data_not_corrupted(pos, true) then
node.name = "smartline:button_active"
minetest.swap_node(pos, node)
minetest.sound_play("button", {
@@ -42,7 +42,7 @@ local function switch_on(pos, node)
end
local function switch_off(pos)
- if tubelib.data_not_corrupted(pos) then
+ if tubelib.data_not_corrupted(pos, true) then
local node = minetest.get_node(pos)
node.name = "smartline:button"
minetest.swap_node(pos, node)
diff --git a/smartline/collector.lua b/smartline/collector.lua
index 2632a92..754018d 100644
--- a/smartline/collector.lua
+++ b/smartline/collector.lua
@@ -3,9 +3,9 @@
SmartLine
=========
- Copyright (C) 2018-2019 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
collector.lua:
diff --git a/smartline/commands.lua b/smartline/commands.lua
index 4c054bb..8f57754 100644
--- a/smartline/commands.lua
+++ b/smartline/commands.lua
@@ -3,9 +3,9 @@
SmartLine
=========
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
command.lua:
diff --git a/smartline/controller.lua b/smartline/controller.lua
index 1d4b6da..0e0513d 100644
--- a/smartline/controller.lua
+++ b/smartline/controller.lua
@@ -3,9 +3,9 @@
SmartLine
=========
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
controller.lua:
diff --git a/smartline/display.lua b/smartline/display.lua
index f3b3414..8f5b14e 100644
--- a/smartline/display.lua
+++ b/smartline/display.lua
@@ -3,9 +3,9 @@
SmartLine
=========
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
display.lua:
diff --git a/smartline/icta/action.lua b/smartline/icta/action.lua
index 7bcfc9a..6e68bca 100644
--- a/smartline/icta/action.lua
+++ b/smartline/icta/action.lua
@@ -5,9 +5,9 @@
Part of the SmartLine mod
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
action.lua
diff --git a/smartline/icta/balancer.lua b/smartline/icta/balancer.lua
index 34fe5a7..639abef 100644
--- a/smartline/icta/balancer.lua
+++ b/smartline/icta/balancer.lua
@@ -5,9 +5,9 @@
Part of the SmartLine mod
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
balancer.lua
diff --git a/smartline/icta/battery.lua b/smartline/icta/battery.lua
index cca063c..f50c1fd 100644
--- a/smartline/icta/battery.lua
+++ b/smartline/icta/battery.lua
@@ -3,9 +3,9 @@
ICTA Controller
===============
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
battery.lua
diff --git a/smartline/icta/commands.lua b/smartline/icta/commands.lua
index 16119ce..1fb682f 100644
--- a/smartline/icta/commands.lua
+++ b/smartline/icta/commands.lua
@@ -5,9 +5,9 @@
Part of the SmartLine mod
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
command.lua:
diff --git a/smartline/icta/condition.lua b/smartline/icta/condition.lua
index 4a2c92d..5185710 100644
--- a/smartline/icta/condition.lua
+++ b/smartline/icta/condition.lua
@@ -5,9 +5,9 @@
Part of the SmartLine mod
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
condition.lua
diff --git a/smartline/icta/controller.lua b/smartline/icta/controller.lua
index 661553f..44c4825 100644
--- a/smartline/icta/controller.lua
+++ b/smartline/icta/controller.lua
@@ -5,9 +5,9 @@
Part of the SmartLine mod
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
controller.lua
diff --git a/smartline/icta/edit.lua b/smartline/icta/edit.lua
index 3e04ccb..290bce6 100644
--- a/smartline/icta/edit.lua
+++ b/smartline/icta/edit.lua
@@ -3,9 +3,9 @@
ICTA Controller
===============
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
edit.lua
diff --git a/smartline/icta/formspec.lua b/smartline/icta/formspec.lua
index 19f019c..b25d13a 100644
--- a/smartline/icta/formspec.lua
+++ b/smartline/icta/formspec.lua
@@ -5,9 +5,9 @@
Part of the SmartLine mod
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
formspec.lua:
diff --git a/smartline/icta/stopwatch.lua b/smartline/icta/stopwatch.lua
index 67d18fd..93b1f5a 100644
--- a/smartline/icta/stopwatch.lua
+++ b/smartline/icta/stopwatch.lua
@@ -5,9 +5,9 @@
Part of the SmartLine mod
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
stopwatch.lua
diff --git a/smartline/icta/submenu.lua b/smartline/icta/submenu.lua
index bb547ea..0719042 100644
--- a/smartline/icta/submenu.lua
+++ b/smartline/icta/submenu.lua
@@ -5,9 +5,9 @@
Part of the SmartLine mod
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
submenu.lua
diff --git a/smartline/init.lua b/smartline/init.lua
index 4de570a..3c13f13 100644
--- a/smartline/init.lua
+++ b/smartline/init.lua
@@ -3,9 +3,9 @@
SmartLine
=========
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
]]--
diff --git a/smartline/playerdetector.lua b/smartline/playerdetector.lua
index ae8be6e..6f646c3 100644
--- a/smartline/playerdetector.lua
+++ b/smartline/playerdetector.lua
@@ -3,9 +3,9 @@
SmartLine
=========
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
playerdetector.lua:
diff --git a/smartline/repeater.lua b/smartline/repeater.lua
index 4c2818c..0556f5e 100644
--- a/smartline/repeater.lua
+++ b/smartline/repeater.lua
@@ -3,9 +3,9 @@
SmartLine
=========
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
repeater.lua:
diff --git a/smartline/sequencer.lua b/smartline/sequencer.lua
index 1aa79e5..d9e7aa3 100644
--- a/smartline/sequencer.lua
+++ b/smartline/sequencer.lua
@@ -3,9 +3,9 @@
SmartLine
=========
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
sequencer.lua:
diff --git a/smartline/signaltower.lua b/smartline/signaltower.lua
index cda4e5c..b254978 100644
--- a/smartline/signaltower.lua
+++ b/smartline/signaltower.lua
@@ -3,9 +3,9 @@
SmartLine
=========
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
signaltower.lua:
diff --git a/smartline/timer.lua b/smartline/timer.lua
index 48feca4..63e5d59 100644
--- a/smartline/timer.lua
+++ b/smartline/timer.lua
@@ -3,9 +3,9 @@
SmartLine
=========
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
timer.lua:
diff --git a/techpack_stairway/init.lua b/techpack_stairway/init.lua
index 3f8a15e..b0bac50 100644
--- a/techpack_stairway/init.lua
+++ b/techpack_stairway/init.lua
@@ -5,7 +5,7 @@
Copyright (C) 2019-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
init.lua
diff --git a/techpack_warehouse/box_copper.lua b/techpack_warehouse/box_copper.lua
index 7dba623..0f9d8b6 100644
--- a/techpack_warehouse/box_copper.lua
+++ b/techpack_warehouse/box_copper.lua
@@ -3,9 +3,9 @@
TechPack Warehouse
==================
- Copyright (C) 2019 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
box_copper.lua
diff --git a/techpack_warehouse/box_gold.lua b/techpack_warehouse/box_gold.lua
index 515cf0c..46c0c5f 100644
--- a/techpack_warehouse/box_gold.lua
+++ b/techpack_warehouse/box_gold.lua
@@ -3,9 +3,9 @@
TechPack Warehouse
==================
- Copyright (C) 2019 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
box_gold.lua
diff --git a/techpack_warehouse/box_steel.lua b/techpack_warehouse/box_steel.lua
index 4a0de45..765f066 100644
--- a/techpack_warehouse/box_steel.lua
+++ b/techpack_warehouse/box_steel.lua
@@ -3,9 +3,9 @@
TechPack Warehouse
==================
- Copyright (C) 2019 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
box_steel.lua
diff --git a/techpack_warehouse/common.lua b/techpack_warehouse/common.lua
index b769b17..cfe0753 100644
--- a/techpack_warehouse/common.lua
+++ b/techpack_warehouse/common.lua
@@ -3,9 +3,9 @@
TechPack Warehouse
==================
- Copyright (C) 2019 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
common.lua
diff --git a/techpack_warehouse/init.lua b/techpack_warehouse/init.lua
index 7ba6152..f20cf12 100644
--- a/techpack_warehouse/init.lua
+++ b/techpack_warehouse/init.lua
@@ -3,9 +3,9 @@
TechPack Warehouse
==================
- Copyright (C) 2019 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
init.lua
diff --git a/tubelib/basalt.lua b/tubelib/basalt.lua
index 3761d20..9d596b6 100644
--- a/tubelib/basalt.lua
+++ b/tubelib/basalt.lua
@@ -3,9 +3,9 @@
Tube Library
============
- Copyright (C) 2019 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
basalt.lua:
diff --git a/tubelib/blackhole.lua b/tubelib/blackhole.lua
index dfd7f7a..7742265 100644
--- a/tubelib/blackhole.lua
+++ b/tubelib/blackhole.lua
@@ -3,9 +3,9 @@
Tube Library
============
- Copyright (C) 2017-2019 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
blackhole.lua:
diff --git a/tubelib/button.lua b/tubelib/button.lua
index 1f9f856..551e225 100644
--- a/tubelib/button.lua
+++ b/tubelib/button.lua
@@ -3,9 +3,9 @@
Tube Library
============
- Copyright (C) 2017-2019 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
button.lua:
@@ -18,7 +18,7 @@
local S = tubelib.S
local function switch_on(pos, node)
- if tubelib.data_not_corrupted(pos) then
+ if tubelib.data_not_corrupted(pos, true) then
node.name = "tubelib:button_active"
minetest.swap_node(pos, node)
minetest.sound_play("button", {
@@ -43,7 +43,7 @@ local function switch_on(pos, node)
end
local function switch_off(pos)
- if tubelib.data_not_corrupted(pos) then
+ if tubelib.data_not_corrupted(pos, true) then
local node = minetest.get_node(pos)
node.name = "tubelib:button"
minetest.swap_node(pos, node)
diff --git a/tubelib/command.lua b/tubelib/command.lua
index 1ecc0c0..4942897 100644
--- a/tubelib/command.lua
+++ b/tubelib/command.lua
@@ -3,9 +3,9 @@
Tube Library
============
- Copyright (C) 2017-2019 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
command.lua:
@@ -607,9 +607,11 @@ function tubelib.temporary_remove_node(pos, number, name, add_data)
add_data.name = name
TemporaryRemovedNodes[key] = add_data
else
- local data = table.copy(TemporaryRemovedNodes[key] or {})
- TemporaryRemovedNodes[key] = nil
- return data
+ if TemporaryRemovedNodes[key] then
+ local data = table.copy(TemporaryRemovedNodes[key])
+ TemporaryRemovedNodes[key] = nil
+ return data
+ end
end
end
diff --git a/tubelib/defect.lua b/tubelib/defect.lua
index 8fcb4e9..178bf78 100644
--- a/tubelib/defect.lua
+++ b/tubelib/defect.lua
@@ -25,7 +25,7 @@ local function already_reported(pos)
end
-function tubelib.data_not_corrupted(pos)
+function tubelib.data_not_corrupted(pos, has_no_info)
if minetest.pos_to_string(pos) ~= minetest.get_meta(pos):get_string("my_pos") then
-- node number corrupt?
local meta = minetest.get_meta(pos)
@@ -45,6 +45,13 @@ function tubelib.data_not_corrupted(pos)
report(pos)
end
end
+
+ -- button like odes
+ if has_no_info then
+ minetest.get_meta(pos):get_string("my_pos", minetest.pos_to_string(pos))
+ return true
+ end
+
-- node moved?
local info = tubelib.get_node_info(number)
if not info or not vector.equals(info.pos, pos) then
diff --git a/tubelib/distributor.lua b/tubelib/distributor.lua
index 4e6604d..e06f0f8 100644
--- a/tubelib/distributor.lua
+++ b/tubelib/distributor.lua
@@ -3,9 +3,9 @@
Tube Library
============
- Copyright (C) 2017-2019 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
distributor.lua:
diff --git a/tubelib/forceload.lua b/tubelib/forceload.lua
index b388b73..da63948 100644
--- a/tubelib/forceload.lua
+++ b/tubelib/forceload.lua
@@ -3,9 +3,9 @@
Tube Library
============
- Copyright (C) 2017-2019 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
forceload.lua:
diff --git a/tubelib/init.lua b/tubelib/init.lua
index 20b6dd6..b12fc8b 100644
--- a/tubelib/init.lua
+++ b/tubelib/init.lua
@@ -3,9 +3,9 @@
Tube Library
============
- Copyright (C) 2017-2019 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
History:
diff --git a/tubelib/lamp.lua b/tubelib/lamp.lua
index 3cb6700..acd2106 100644
--- a/tubelib/lamp.lua
+++ b/tubelib/lamp.lua
@@ -3,9 +3,9 @@
Tube Library
============
- Copyright (C) 2017 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
lamp.lua:
diff --git a/tubelib/legacy_nodes.lua b/tubelib/legacy_nodes.lua
index 8b814a0..865f560 100644
--- a/tubelib/legacy_nodes.lua
+++ b/tubelib/legacy_nodes.lua
@@ -3,9 +3,9 @@
Tube Library
============
- Copyright (C) 2017 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
legacy_nodes.lua:
diff --git a/tubelib/mark.lua b/tubelib/mark.lua
index 73328db..5d758ed 100644
--- a/tubelib/mark.lua
+++ b/tubelib/mark.lua
@@ -3,10 +3,10 @@
Tube Library
============
- Copyright (C) 2019 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
Code derived from wordedit (sfan5, Anthony Zhang (Uberi/Temperest), and Brett O'Donnell (cornernote))
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
mark.lua:
diff --git a/tubelib/node_states.lua b/tubelib/node_states.lua
index 573ff6c..14b58d8 100644
--- a/tubelib/node_states.lua
+++ b/tubelib/node_states.lua
@@ -3,9 +3,9 @@
Tube Library
============
- Copyright (C) 2017-2019 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
node_states.lua:
diff --git a/tubelib/pusher.lua b/tubelib/pusher.lua
index f00dda1..54f7350 100644
--- a/tubelib/pusher.lua
+++ b/tubelib/pusher.lua
@@ -3,9 +3,9 @@
Tube Library
============
- Copyright (C) 2017 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
pusher.lua:
diff --git a/tubelib/repairkit.lua b/tubelib/repairkit.lua
index f9b435f..f0bcee3 100644
--- a/tubelib/repairkit.lua
+++ b/tubelib/repairkit.lua
@@ -3,9 +3,9 @@
Tube Library
============
- Copyright (C) 2017-2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
repairkit.lua:
diff --git a/tubelib/states.lua b/tubelib/states.lua
index 3710d63..8c6f634 100644
--- a/tubelib/states.lua
+++ b/tubelib/states.lua
@@ -3,9 +3,9 @@
Tube Library
============
- Copyright (C) 2017 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
states.lua:
diff --git a/tubelib/tubes.lua b/tubelib/tubes.lua
index 76dabd2..d467fde 100644
--- a/tubelib/tubes.lua
+++ b/tubelib/tubes.lua
@@ -3,9 +3,9 @@
Tubes based on tubelib2
=======================
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
tubes.lua: Node registration and API functions to move items via tubes
diff --git a/tubelib_addons1/autocrafter.lua b/tubelib_addons1/autocrafter.lua
index edfc23e..4aa0cbc 100644
--- a/tubelib_addons1/autocrafter.lua
+++ b/tubelib_addons1/autocrafter.lua
@@ -3,9 +3,9 @@
Tubelib Addons
==============
- Copyright (C) 2017-2019 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
The autocrafter is derived from pipeworks:
diff --git a/tubelib_addons1/chest.lua b/tubelib_addons1/chest.lua
index 07ab67f..363eae3 100644
--- a/tubelib_addons1/chest.lua
+++ b/tubelib_addons1/chest.lua
@@ -3,9 +3,9 @@
Tubelib Addons 1
================
- Copyright (C) 2017-2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
chest.lua
diff --git a/tubelib_addons1/detector.lua b/tubelib_addons1/detector.lua
index f2e75a8..aae81b5 100644
--- a/tubelib_addons1/detector.lua
+++ b/tubelib_addons1/detector.lua
@@ -3,9 +3,9 @@
Tubelib Addons 1
================
- Copyright (C) 2017-2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
detector.lua:
diff --git a/tubelib_addons1/fermenter.lua b/tubelib_addons1/fermenter.lua
index 8ea58a8..05236f7 100644
--- a/tubelib_addons1/fermenter.lua
+++ b/tubelib_addons1/fermenter.lua
@@ -3,9 +3,9 @@
Tubelib Addons 1
================
- Copyright (C) 2017-2019 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
fermenter.lua
diff --git a/tubelib_addons1/funnel.lua b/tubelib_addons1/funnel.lua
index eadc5e4..0f21c3d 100644
--- a/tubelib_addons1/funnel.lua
+++ b/tubelib_addons1/funnel.lua
@@ -3,9 +3,9 @@
Tubelib Addons 1
================
- Copyright (C) 2017-2019 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
funnel.lua
diff --git a/tubelib_addons1/grinder.lua b/tubelib_addons1/grinder.lua
index 7ac764b..10af7b6 100644
--- a/tubelib_addons1/grinder.lua
+++ b/tubelib_addons1/grinder.lua
@@ -3,9 +3,9 @@
Tubelib Addons 1
================
- Copyright (C) 2017-2019 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
grinder.lua
diff --git a/tubelib_addons1/harvester.lua b/tubelib_addons1/harvester.lua
index 189f3a1..a585234 100644
--- a/tubelib_addons1/harvester.lua
+++ b/tubelib_addons1/harvester.lua
@@ -3,9 +3,9 @@
Tubelib Addons 1
================
- Copyright (C) 2017-2019 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
harvester.lua
diff --git a/tubelib_addons1/init.lua b/tubelib_addons1/init.lua
index 29e6c70..f95bf4e 100644
--- a/tubelib_addons1/init.lua
+++ b/tubelib_addons1/init.lua
@@ -3,9 +3,9 @@
Tubelib Addons 1
================
- Copyright (C) 2017,2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
]]--
diff --git a/tubelib_addons1/liquidsampler.lua b/tubelib_addons1/liquidsampler.lua
index 88ce5b3..dfea956 100644
--- a/tubelib_addons1/liquidsampler.lua
+++ b/tubelib_addons1/liquidsampler.lua
@@ -3,9 +3,9 @@
Tubelib Addons 1
================
- Copyright (C) 2017-2019 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
liquidsampler.lua
diff --git a/tubelib_addons1/locale/tubelib_addons1.de.tr b/tubelib_addons1/locale/tubelib_addons1.de.tr
new file mode 100644
index 0000000..14ec190
--- /dev/null
+++ b/tubelib_addons1/locale/tubelib_addons1.de.tr
@@ -0,0 +1,75 @@
+# textdomain: tubelib_addons1
+
+
+
+### autocrafter.lua ###
+
+Tubelib Autocrafter=Tubelib Autocrafter
+
+### chest.lua ###
+
+Tubelib Protected Chest=Tubelib geschützte Kiste
+connected with=verbunden mit
+
+### detector.lua ###
+
+Insert destination node number(s)=Geben Sie die Zielknotennummer(n) ein.
+Save=Speichern
+Tubelib Detector=Tubelib Detektor
+Tubelib Detector, connected=Tubelib Detektor, verbunden
+Tubelib Detector, unconfigured=Tubelib Detektor, nicht konfiguriert
+
+### fermenter.lua ###
+
+Bio Gas=Biogas
+Fermenter=Fermenter
+Fermenter will not fit there=Fermenter wird dort nicht passen
+Reformer=Reformer
+Tubelib Fermenter=Tubelib Fermenter
+Tubelib Fermenter Top=Tubelib Fermenter Oberteil
+Tubelib Fermenter defect=Tubelib Fermenter defekt
+
+### funnel.lua ###
+
+Tubelib Funnel=Tubelib Trichter
+
+### grinder.lua ###
+
+Grinding=Mahlen
+Tubelib Grinder=Tubelib Mühle
+
+### harvester.lua ###
+
+: running (=: läuft (
+Area radius=Flächenradius
+Tubelib Harvester=Tubelib Ernter
+Tubelib Harvester Base=Tubelib Ernter Basis
+
+### harvester.lua ###
+### quarry.lua ###
+
+Run endless=endlos laufen
+
+### liquidsampler.lua ###
+
+Liquid Sampler=Flüssigkeitsaufnehmer
+
+### pusher_fast.lua ###
+
+Fast Pusher=Schneller Schieber
+
+### quarry.lua ###
+
+Digging depth=Grabetiefe
+Start level=Startebene
+Tubelib Quarry=Tubelib Steinbrecher
+[Tubelib Quarry] Area is protected!=[Tubelib Steinbrecher] Gebiet ist geschützt!
+running=läuft
+
+### reformer.lua ###
+
+Bio Fuel=Biotreibstoff
+Reformer will not fit there=Reformer wird dort nicht passen
+Tubelib Reformer=Tubelib Reformer
+Tubelib Reformer Top=Tubelib Reformer Oberteil
+Tubelib Reformer defect=Tubelib Reformer defekt
diff --git a/tubelib_addons1/nodes.lua b/tubelib_addons1/nodes.lua
index b376887..910c484 100644
--- a/tubelib_addons1/nodes.lua
+++ b/tubelib_addons1/nodes.lua
@@ -3,9 +3,9 @@
Tubelib Addons 1
================
- Copyright (C) 2017,2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
]]--
@@ -66,6 +66,7 @@ fn("default:jungleleaves")
fn("default:bush_leaves")
fn("default:acacia_bush_leaves")
+fn("default:blueberry_bush_leaves")
fn("default:cactus", "default:cactus", "default:cactus")
fn("default:papyrus", "default:papyrus", "default:papyrus")
@@ -75,6 +76,7 @@ fn("default:apple")
if farming.mod ~= "redo" then
dn("farming:wheat_8", "farming:wheat", "farming:wheat_1")
dn("farming:cotton_8", "farming:cotton", "farming:cotton_1")
+ dn("farming:blueberry_bush_leaves_with_berries", "default:blueberries", "farming:blueberry_bush_leaves")
end
-------------------------------------------------------------------------------
@@ -115,7 +117,7 @@ end
-- Ethereal Farming
-------------------------------------------------------------------------------
fn("ethereal:strawberry_8", "ethereal:strawberry 2", "ethereal:strawberry 1")
-fn("ethereal:onion_5", "ethereal:wild_onion_plant 2", "ethereal:onion_1")
+fn("ethereal:onion_5", "ethereal:wild_onion_plant 2", "ethereal:onion_1")
fn("ethereal:willow_trunk", "ethereal:willow_trunk", "ethereal:willow_sapling")
@@ -160,24 +162,28 @@ gn("default:ice")
gn("default:snowblock")
gn("default:snow")
gn("default:obsidian")
-
+gn("default:mese")
gn("stairs:stair_cobble")
gn("stairs:stair_mossycobble")
gn("stairs:stair_desert_cobble")
+gn("default:permafrost")
+gn("default:permafrost_with_moss")
+gn("default:permafrost_with_stones")
+
gn("default:stone", "default:cobble")
gn("default:desert_stone", "default:desert_cobble")
gn("default:sandstone", "default:sandstone")
gn("default:desert_sandstone", "default:desert_sandstone")
+gn("default:silver_sandstone", "default:silver_sandstone")
gn("default:clay", "default:clay_lump")
+
gn("default:stone_with_coal", "default:coal_lump")
gn("default:stone_with_iron", "default:iron_lump")
gn("default:stone_with_copper", "default:copper_lump")
gn("default:stone_with_gold", "default:gold_lump")
gn("default:stone_with_tin", "default:tin_lump")
-
gn("default:stone_with_mese", "default:mese_crystal")
-
gn("default:stone_with_diamond", "default:diamond")
gn("default:dirt_with_grass", "default:dirt")
@@ -186,6 +192,13 @@ gn("default:dirt_with_dry_grass", "default:dirt")
gn("default:dirt_with_snow", "default:dirt")
gn("default:dirt_with_rainforest_litter", "default:dirt")
gn("default:dirt_with_grass", "default:dirt")
+gn("default:dirt_with_coniferous_litter", "default:dirt")
+gn("default:dry_dirt", "default:dry_dirt")
+gn("default:dry_dirt_with_dry_grass", "default:dry_dirt")
+
+gn("default:dirt_with_coniferous_litter")
+gn("default:dirt_with_coniferous_litter")
+gn("default:dirt_with_coniferous_litter")
gn("default:coral_skeleton", "default:coral_skeleton")
gn("default:coral_orange", "default:coral_skeleton")
diff --git a/tubelib_addons1/pusher_fast.lua b/tubelib_addons1/pusher_fast.lua
index 7ce2512..8ee9b2c 100644
--- a/tubelib_addons1/pusher_fast.lua
+++ b/tubelib_addons1/pusher_fast.lua
@@ -3,9 +3,9 @@
Tubelib Addons 1
================
- Copyright (C) 2017-2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
pusher_fast.lua:
diff --git a/tubelib_addons1/quarry.lua b/tubelib_addons1/quarry.lua
index 63a3a6f..ea7ac9c 100644
--- a/tubelib_addons1/quarry.lua
+++ b/tubelib_addons1/quarry.lua
@@ -3,9 +3,9 @@
Tubelib Addons 1
================
- Copyright (C) 2017-2019 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
quarry.lua
diff --git a/tubelib_addons1/reformer.lua b/tubelib_addons1/reformer.lua
index 131364a..3803251 100644
--- a/tubelib_addons1/reformer.lua
+++ b/tubelib_addons1/reformer.lua
@@ -3,9 +3,9 @@
Tubelib Addons 1
================
- Copyright (C) 2017-2019 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
reformer.lua
diff --git a/tubelib_addons2/accesscontrol.lua b/tubelib_addons2/accesscontrol.lua
index 8fa10b9..b7d206d 100644
--- a/tubelib_addons2/accesscontrol.lua
+++ b/tubelib_addons2/accesscontrol.lua
@@ -3,9 +3,9 @@
Tubelib Addons 2
================
- Copyright (C) 2017 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
accesscontrol.lua:
diff --git a/tubelib_addons2/ceilinglamp.lua b/tubelib_addons2/ceilinglamp.lua
index d4688da..2e3bd29 100644
--- a/tubelib_addons2/ceilinglamp.lua
+++ b/tubelib_addons2/ceilinglamp.lua
@@ -3,9 +3,9 @@
Tubelib Addons 2
================
- Copyright (C) 2017-2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
ceilinglamp.lua:
diff --git a/tubelib_addons2/colorlamp.lua b/tubelib_addons2/colorlamp.lua
index 20952a4..fc2fa34 100644
--- a/tubelib_addons2/colorlamp.lua
+++ b/tubelib_addons2/colorlamp.lua
@@ -3,9 +3,9 @@
Tubelib Addons 2
================
- Copyright (C) 2017-2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
colorlamp.lua:
diff --git a/tubelib_addons2/colorlamp_ud.lua b/tubelib_addons2/colorlamp_ud.lua
index a57146d..34bcdab 100644
--- a/tubelib_addons2/colorlamp_ud.lua
+++ b/tubelib_addons2/colorlamp_ud.lua
@@ -3,9 +3,9 @@
Tubelib Addons 2
================
- Copyright (C) 2017-2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
colorlamp_ud.lua which requires the mod unifieddyes:
diff --git a/tubelib_addons2/doorblock.lua b/tubelib_addons2/doorblock.lua
index a1f4770..ae66413 100644
--- a/tubelib_addons2/doorblock.lua
+++ b/tubelib_addons2/doorblock.lua
@@ -3,9 +3,9 @@
Tubelib Addons 2
================
- Copyright (C) 2017 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
doorblock.lua:
diff --git a/tubelib_addons2/gateblock.lua b/tubelib_addons2/gateblock.lua
index 5cd4090..eb4c3e8 100644
--- a/tubelib_addons2/gateblock.lua
+++ b/tubelib_addons2/gateblock.lua
@@ -3,9 +3,9 @@
Tubelib Addons 2
================
- Copyright (C) 2017 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
gateblock.lua:
@@ -37,7 +37,6 @@ local tPgns = {"default_wood.png", "default_aspen_wood.png", "default_junglewood
"default_copper_block.png", "default_steel_block.png", "default_tin_block.png", "default_coral_skeleton.png",
"default_glass.png", "default_obsidian_glass.png", "default_ice.png", "tubelib_addon2_gate.png"}
-local not_in_inventory=nil
for idx,pgn in ipairs(tPgns) do
minetest.register_node("tubelib_addons2:gateblock"..idx, {
description = S("Tubelib Gate Block"),
@@ -76,13 +75,11 @@ for idx,pgn in ipairs(tPgns) do
paramtype2 = "facedir",
sunlight_propagates = true,
sounds = default.node_sound_stone_defaults(),
- groups = {cracky=2, choppy=2, crumbly=2, not_in_creative_inventory=not_in_inventory},
+ groups = {cracky=2, choppy=2, crumbly=2, not_in_creative_inventory = idx == NUM_TEXTURES and 0 or 1},
is_ground_content = false,
drop = "tubelib_addons2:gateblock1",
})
- not_in_inventory = 1
-
tubelib.register_node("tubelib_addons2:gateblock"..idx, {}, {
on_recv_message = function(pos, topic, payload)
local node = minetest.get_node(pos)
diff --git a/tubelib_addons2/industriallamp.lua b/tubelib_addons2/industriallamp.lua
index 7f602b3..777151b 100644
--- a/tubelib_addons2/industriallamp.lua
+++ b/tubelib_addons2/industriallamp.lua
@@ -3,9 +3,9 @@
Tubelib Addons 2
================
- Copyright (C) 2017-2019 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
industriallamp.lua:
diff --git a/tubelib_addons2/init.lua b/tubelib_addons2/init.lua
index 6d089da..94bdd5a 100644
--- a/tubelib_addons2/init.lua
+++ b/tubelib_addons2/init.lua
@@ -3,9 +3,9 @@
Tubelib Addons 2
================
- Copyright (C) 2017,2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
]]--
@@ -29,7 +29,7 @@ dofile(minetest.get_modpath("tubelib_addons2") .. "/ceilinglamp.lua")
dofile(minetest.get_modpath("tubelib_addons2") .. "/invisiblelamp.lua")
dofile(minetest.get_modpath("tubelib_addons2") .. "/industriallamp.lua")
-if minetest.get_modpath("mesecons") and minetest.mesecon then
+if minetest.get_modpath("mesecons") and mesecon then
dofile(minetest.get_modpath("tubelib_addons2") .. "/mesecons_converter.lua")
end
if minetest.get_modpath("unifieddyes") and unifieddyes then
diff --git a/tubelib_addons2/invisiblelamp.lua b/tubelib_addons2/invisiblelamp.lua
index 5034e13..7d2721e 100644
--- a/tubelib_addons2/invisiblelamp.lua
+++ b/tubelib_addons2/invisiblelamp.lua
@@ -3,9 +3,9 @@
Tubelib Addons 2
================
- Copyright (C) 2017-2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
invisiblelamp.lua:
diff --git a/tubelib_addons2/locale/template.txt b/tubelib_addons2/locale/template.txt
index 1eecfc2..1228f9a 100644
--- a/tubelib_addons2/locale/template.txt
+++ b/tubelib_addons2/locale/template.txt
@@ -1,7 +1,6 @@
# textdomain: tubelib_addons2
-
### accesscontrol.lua ###
Access code (4 digits):=
diff --git a/tubelib_addons2/logic_not.lua b/tubelib_addons2/logic_not.lua
index 9f1ef9c..bcb69a0 100644
--- a/tubelib_addons2/logic_not.lua
+++ b/tubelib_addons2/logic_not.lua
@@ -3,9 +3,9 @@
Tubelib Addons 2
================
- Copyright (C) 2017 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
logic_not.lua:
diff --git a/tubelib_addons2/mesecons_converter.lua b/tubelib_addons2/mesecons_converter.lua
index 2ffcb35..eacf449 100644
--- a/tubelib_addons2/mesecons_converter.lua
+++ b/tubelib_addons2/mesecons_converter.lua
@@ -3,9 +3,9 @@
Tubelib Addons 2
================
- Copyright (C) 2017 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
mesecons_converter.lua:
diff --git a/tubelib_addons2/programmer.lua b/tubelib_addons2/programmer.lua
index 59f48f0..8e0aecc 100644
--- a/tubelib_addons2/programmer.lua
+++ b/tubelib_addons2/programmer.lua
@@ -3,9 +3,9 @@
Tubelib Addons 2
================
- Copyright (C) 2017 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
programmer.lua:
diff --git a/tubelib_addons2/repeater.lua b/tubelib_addons2/repeater.lua
index d89769a..a423180 100644
--- a/tubelib_addons2/repeater.lua
+++ b/tubelib_addons2/repeater.lua
@@ -3,9 +3,9 @@
Tubelib Addons 2
================
- Copyright (C) 2017 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
repeater.lua:
diff --git a/tubelib_addons2/sequencer.lua b/tubelib_addons2/sequencer.lua
index cff9778..6cdf8e3 100644
--- a/tubelib_addons2/sequencer.lua
+++ b/tubelib_addons2/sequencer.lua
@@ -3,9 +3,9 @@
Tubelib Addons 2
================
- Copyright (C) 2017 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
sequencer.lua:
diff --git a/tubelib_addons2/streetlamp.lua b/tubelib_addons2/streetlamp.lua
index a429988..7d5bc3f 100644
--- a/tubelib_addons2/streetlamp.lua
+++ b/tubelib_addons2/streetlamp.lua
@@ -3,9 +3,9 @@
Tubelib Addons 2
================
- Copyright (C) 2017-2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
streetlamp.lua:
diff --git a/tubelib_addons2/timer.lua b/tubelib_addons2/timer.lua
index e624b34..fd21d50 100644
--- a/tubelib_addons2/timer.lua
+++ b/tubelib_addons2/timer.lua
@@ -3,9 +3,9 @@
Tubelib Addons 2
================
- Copyright (C) 2017 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
timer.lua:
diff --git a/tubelib_addons3/chest.lua b/tubelib_addons3/chest.lua
index 60363e5..8d075fc 100644
--- a/tubelib_addons3/chest.lua
+++ b/tubelib_addons3/chest.lua
@@ -3,9 +3,9 @@
Tubelib Addons 3
================
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
chest.lua
diff --git a/tubelib_addons3/distributor.lua b/tubelib_addons3/distributor.lua
index 8b77ab2..41d55d9 100644
--- a/tubelib_addons3/distributor.lua
+++ b/tubelib_addons3/distributor.lua
@@ -3,9 +3,9 @@
Tubelib Addons 3
================
- Copyright (C) 2018-2019 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
distributor.lua:
diff --git a/tubelib_addons3/funnel.lua b/tubelib_addons3/funnel.lua
index dd9f78c..f60b541 100644
--- a/tubelib_addons3/funnel.lua
+++ b/tubelib_addons3/funnel.lua
@@ -3,9 +3,9 @@
Tubelib Addons 3
================
- Copyright (C) 2019 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
funnel.lua
diff --git a/tubelib_addons3/init.lua b/tubelib_addons3/init.lua
index 576704a..dd2beca 100644
--- a/tubelib_addons3/init.lua
+++ b/tubelib_addons3/init.lua
@@ -3,9 +3,9 @@
Tubelib Addons 3
================
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
]]--
diff --git a/tubelib_addons3/locale/tubelib_addons3.de.tr b/tubelib_addons3/locale/tubelib_addons3.de.tr
new file mode 100644
index 0000000..8395bc5
--- /dev/null
+++ b/tubelib_addons3/locale/tubelib_addons3.de.tr
@@ -0,0 +1,30 @@
+# textdomain: tubelib_addons3
+
+
+
+### chest.lua ###
+
+HighPerf Chest=HighPerf Kiste
+connected with=verbunden mit
+
+### distributor.lua ###
+
+HighPerf Distributor=HighPerf Verteiler
+
+### funnel.lua ###
+
+HighPerf Funnel=HighPerf Trichter
+
+### pusher.lua ###
+
+HighPerf Pusher=HighPerf Schieber
+
+### pushing_chest.lua ###
+
+HighPerf Pushing Chest=HighPerf Shiebende Kiste
+
+### teleporter.lua ###
+
+Enter channel string=Geben Sie die Kanalbezeichner ein
+Save=Speichern
+Tubelib Teleporter=Tubelib Teleporter
diff --git a/tubelib_addons3/pusher.lua b/tubelib_addons3/pusher.lua
index a747776..254d50b 100644
--- a/tubelib_addons3/pusher.lua
+++ b/tubelib_addons3/pusher.lua
@@ -3,9 +3,9 @@
Tubelib Addons 3
================
- Copyright (C) 2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
pusher.lua
diff --git a/tubelib_addons3/pushing_chest.lua b/tubelib_addons3/pushing_chest.lua
index 6dee4ea..e72a6bd 100644
--- a/tubelib_addons3/pushing_chest.lua
+++ b/tubelib_addons3/pushing_chest.lua
@@ -3,9 +3,9 @@
Tubelib Addons 3
================
- Copyright (C) 2017-2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
pushing_chest.lua
diff --git a/tubelib_addons3/teleporter.lua b/tubelib_addons3/teleporter.lua
index 999fb37..b8d3072 100644
--- a/tubelib_addons3/teleporter.lua
+++ b/tubelib_addons3/teleporter.lua
@@ -3,9 +3,9 @@
Tubelib Addons 3
================
- Copyright (C) 2017-2018 Joachim Stolberg
+ Copyright (C) 2017-2020 Joachim Stolberg
- LGPLv2.1+
+ AGPL v3
See LICENSE.txt for more information
teleporter.lua