summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVanessa Dannenberg <vanessa.e.dannenberg@gmail.com>2018-11-23 10:39:11 -0500
committerVanessa Dannenberg <vanessa.e.dannenberg@gmail.com>2018-11-23 10:39:11 -0500
commit2d8ff9f889450fb5c36016276997544aae98a350 (patch)
tree636ddf5e6a9b444a60d7cab82e93ccffb037355d
parent646d696c62a6b408100e65164b5cd71a4793ab9b (diff)
downloaddreambuilder_modpack-2d8ff9f889450fb5c36016276997544aae98a350.tar
dreambuilder_modpack-2d8ff9f889450fb5c36016276997544aae98a350.tar.gz
dreambuilder_modpack-2d8ff9f889450fb5c36016276997544aae98a350.tar.bz2
dreambuilder_modpack-2d8ff9f889450fb5c36016276997544aae98a350.tar.xz
dreambuilder_modpack-2d8ff9f889450fb5c36016276997544aae98a350.zip
update digistuff, farming-redo, homedecor, hotbar, roads,
pipeworks, prefab_redo, rgblightstone, signs_lib, street_signs, technic, unifieddyes, and worldedit
-rw-r--r--digistuff/init.lua8
-rw-r--r--farming/crops/carrot.lua18
-rw-r--r--farming/textures/farming_carrot_juice.pngbin0 -> 167 bytes
-rw-r--r--homedecor/depends.txt2
-rw-r--r--hotbar/LICENSE600
-rw-r--r--hotbar/init.lua36
-rw-r--r--infrastructure/advanced_automatic_warning_device.lua2
-rw-r--r--pipeworks/autocrafter.lua2
-rw-r--r--pipeworks/lua_tube.lua24
-rw-r--r--pipeworks/signal_tubes.lua5
-rw-r--r--prefab_redo/depends.txt1
-rw-r--r--rgblightstone/init.lua10
-rw-r--r--signs_lib/init.lua20
-rw-r--r--street_signs/api.lua20
-rw-r--r--technic/machines/HV/quarry.lua12
-rw-r--r--unifieddyes/init.lua6
-rw-r--r--worldedit_commands/init.lua5
17 files changed, 734 insertions, 37 deletions
diff --git a/digistuff/init.lua b/digistuff/init.lua
index 2b1a52e..33b5936 100644
--- a/digistuff/init.lua
+++ b/digistuff/init.lua
@@ -992,12 +992,13 @@ if minetest.get_modpath("mesecons_noteblock") then
end
for i=0,14,1 do
- local mult = 255 - ((14-i)*16)
+ local mult = 255 - ((14-i)*12)
minetest.register_node("digistuff:light_"..i, {
drop = "digistuff:light_0",
description = "Digilines Dimmable Light"..(i > 0 and " (on state - you hacker you!)" or ""),
tiles = {"digistuff_light.png"},
paramtype = "light",
+ paramtype2 = "facedir",
drawtype = "nodebox",
node_box = {
type = "fixed",
@@ -1033,7 +1034,12 @@ for i=0,14,1 do
{x = 0,y = 0,z = -1},
{x = 0,y = 1,z = 0},
{x = 0,y = -1,z = 0},
+ {x = 2,y = 0,z = 0},
+ {x = -2,y = 0,z = 0},
+ {x = 0,y = 0,z = 2},
+ {x = 0,y = 0,z = -2},
{x = 0,y = 2,z = 0},
+ {x = 0,y = -2,z = 0},
}
},
effector = {
diff --git a/farming/crops/carrot.lua b/farming/crops/carrot.lua
index b9cf535..b4baa8d 100644
--- a/farming/crops/carrot.lua
+++ b/farming/crops/carrot.lua
@@ -17,6 +17,24 @@ minetest.register_craftitem("farming:carrot", {
on_use = minetest.item_eat(4),
})
+-- carrot juice
+minetest.register_craftitem("farming:carrot_juice", {
+ description = S("Carrot Juice"),
+ inventory_image = "farming_carrot_juice.png",
+ on_use = minetest.item_eat(4, "vessels:drinking_glass"),
+})
+
+minetest.register_craft({
+ output = "farming:carrot_juice",
+ type = "shapeless",
+ recipe = {
+ "vessels:drinking_glass", "group:food_carrot", "farming:juicer"
+ },
+ replacements = {
+ {"group:food_juicer", "farming:juicer"},
+ },
+})
+
-- golden carrot
minetest.register_craftitem("farming:carrot_gold", {
description = S("Golden Carrot"),
diff --git a/farming/textures/farming_carrot_juice.png b/farming/textures/farming_carrot_juice.png
new file mode 100644
index 0000000..5a03245
--- /dev/null
+++ b/farming/textures/farming_carrot_juice.png
Binary files differ
diff --git a/homedecor/depends.txt b/homedecor/depends.txt
index 2a3d340..ec57479 100644
--- a/homedecor/depends.txt
+++ b/homedecor/depends.txt
@@ -3,7 +3,7 @@ basic_materials
unifieddyes
homedecor_i18n
creative
-currency
+currency?
building_blocks?
signs_lib?
moreblocks?
diff --git a/hotbar/LICENSE b/hotbar/LICENSE
new file mode 100644
index 0000000..c5885ae
--- /dev/null
+++ b/hotbar/LICENSE
@@ -0,0 +1,600 @@
+License for code: LGPL 3.0
+License for media and all other assets: CC-by-SA 4.0
+
+###############################################################################
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+ This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+ 0. Additional Definitions.
+
+ As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+ "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+ An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+ A "Combined Work" is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+ The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+ The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+ 1. Exception to Section 3 of the GNU GPL.
+
+ You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+ 2. Conveying Modified Versions.
+
+ If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+ a) under this License, provided that you make a good faith effort to
+ ensure that, in the event an Application does not supply the
+ function or data, the facility still operates, and performs
+ whatever part of its purpose remains meaningful, or
+
+ b) under the GNU GPL, with none of the additional permissions of
+ this License applicable to that copy.
+
+ 3. Object Code Incorporating Material from Library Header Files.
+
+ The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+ a) Give prominent notice with each copy of the object code that the
+ Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the object code with a copy of the GNU GPL and this license
+ document.
+
+ 4. Combined Works.
+
+ You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+ a) Give prominent notice with each copy of the Combined Work that
+ the Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
+ document.
+
+ c) For a Combined Work that displays copyright notices during
+ execution, include the copyright notice for the Library among
+ these notices, as well as a reference directing the user to the
+ copies of the GNU GPL and this license document.
+
+ d) Do one of the following:
+
+ 0) Convey the Minimal Corresponding Source under the terms of this
+ License, and the Corresponding Application Code in a form
+ suitable for, and under terms that permit, the user to
+ recombine or relink the Application with a modified version of
+ the Linked Version to produce a modified Combined Work, in the
+ manner specified by section 6 of the GNU GPL for conveying
+ Corresponding Source.
+
+ 1) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (a) uses at run time
+ a copy of the Library already present on the user's computer
+ system, and (b) will operate properly with a modified version
+ of the Library that is interface-compatible with the Linked
+ Version.
+
+ e) Provide Installation Information, but only if you would otherwise
+ be required to provide such information under section 6 of the
+ GNU GPL, and only to the extent that such information is
+ necessary to install and execute a modified version of the
+ Combined Work produced by recombining or relinking the
+ Application with a modified version of the Linked Version. (If
+ you use option 4d0, the Installation Information must accompany
+ the Minimal Corresponding Source and Corresponding Application
+ Code. If you use option 4d1, you must provide the Installation
+ Information in the manner specified by section 6 of the GNU GPL
+ for conveying Corresponding Source.)
+
+ 5. Combined Libraries.
+
+ You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+ a) Accompany the combined library with a copy of the same work based
+ on the Library, uncombined with any other library facilities,
+ conveyed under the terms of this License.
+
+ b) Give prominent notice with the combined library that part of it
+ is a work based on the Library, and explaining where to find the
+ accompanying uncombined form of the same work.
+
+ 6. Revised Versions of the GNU Lesser General Public License.
+
+ The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+ If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
+
+###############################################################################
+
+Attribution-ShareAlike 4.0 International
+
+=======================================================================
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
+other relationship. Creative Commons makes its licenses and related
+information available on an "as-is" basis. Creative Commons gives no
+warranties regarding its licenses, any material licensed under their
+terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the
+fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and
+conditions that creators and other rights holders may use to share
+original works of authorship and other material subject to copyright
+and certain other rights specified in the public license below. The
+following considerations are for informational purposes only, are not
+exhaustive, and do not form part of our licenses.
+
+ Considerations for licensors: Our public licenses are
+ intended for use by those authorized to give the public
+ permission to use material in ways otherwise restricted by
+ copyright and certain other rights. Our licenses are
+ irrevocable. Licensors should read and understand the terms
+ and conditions of the license they choose before applying it.
+ Licensors should also secure all rights necessary before
+ applying our licenses so that the public can reuse the
+ material as expected. Licensors should clearly mark any
+ material not subject to the license. This includes other CC-
+ licensed material, or material used under an exception or
+ limitation to copyright. More considerations for licensors:
+ wiki.creativecommons.org/Considerations_for_licensors
+
+ Considerations for the public: By using one of our public
+ licenses, a licensor grants the public permission to use the
+ licensed material under specified terms and conditions. If
+ the licensor's permission is not necessary for any reason--for
+ example, because of any applicable exception or limitation to
+ copyright--then that use is not regulated by the license. Our
+ licenses grant only permissions under copyright and certain
+ other rights that a licensor has authority to grant. Use of
+ the licensed material may still be restricted for other
+ reasons, including because others have copyright or other
+ rights in the material. A licensor may make special requests,
+ such as asking that all changes be marked or described.
+ Although not required by our licenses, you are encouraged to
+ respect those requests where reasonable. More considerations
+ for the public:
+ wiki.creativecommons.org/Considerations_for_licensees
+
+=======================================================================
+
+Creative Commons Attribution-ShareAlike 4.0 International Public
+License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution-ShareAlike 4.0 International Public License ("Public
+License"). To the extent this Public License may be interpreted as a
+contract, You are granted the Licensed Rights in consideration of Your
+acceptance of these terms and conditions, and the Licensor grants You
+such rights in consideration of benefits the Licensor receives from
+making the Licensed Material available under these terms and
+conditions.
+
+
+Section 1 -- Definitions.
+
+ a. Adapted Material means material subject to Copyright and Similar
+ Rights that is derived from or based upon the Licensed Material
+ and in which the Licensed Material is translated, altered,
+ arranged, transformed, or otherwise modified in a manner requiring
+ permission under the Copyright and Similar Rights held by the
+ Licensor. For purposes of this Public License, where the Licensed
+ Material is a musical work, performance, or sound recording,
+ Adapted Material is always produced where the Licensed Material is
+ synched in timed relation with a moving image.
+
+ b. Adapter's License means the license You apply to Your Copyright
+ and Similar Rights in Your contributions to Adapted Material in
+ accordance with the terms and conditions of this Public License.
+
+ c. BY-SA Compatible License means a license listed at
+ creativecommons.org/compatiblelicenses, approved by Creative
+ Commons as essentially the equivalent of this Public License.
+
+ d. Copyright and Similar Rights means copyright and/or similar rights
+ closely related to copyright including, without limitation,
+ performance, broadcast, sound recording, and Sui Generis Database
+ Rights, without regard to how the rights are labeled or
+ categorized. For purposes of this Public License, the rights
+ specified in Section 2(b)(1)-(2) are not Copyright and Similar
+ Rights.
+
+ e. Effective Technological Measures means those measures that, in the
+ absence of proper authority, may not be circumvented under laws
+ fulfilling obligations under Article 11 of the WIPO Copyright
+ Treaty adopted on December 20, 1996, and/or similar international
+ agreements.
+
+ f. Exceptions and Limitations means fair use, fair dealing, and/or
+ any other exception or limitation to Copyright and Similar Rights
+ that applies to Your use of the Licensed Material.
+
+ g. License Elements means the license attributes listed in the name
+ of a Creative Commons Public License. The License Elements of this
+ Public License are Attribution and ShareAlike.
+
+ h. Licensed Material means the artistic or literary work, database,
+ or other material to which the Licensor applied this Public
+ License.
+
+ i. Licensed Rights means the rights granted to You subject to the
+ terms and conditions of this Public License, which are limited to
+ all Copyright and Similar Rights that apply to Your use of the
+ Licensed Material and that the Licensor has authority to license.
+
+ j. Licensor means the individual(s) or entity(ies) granting rights
+ under this Public License.
+
+ k. Share means to provide material to the public by any means or
+ process that requires permission under the Licensed Rights, such
+ as reproduction, public display, public performance, distribution,
+ dissemination, communication, or importation, and to make material
+ available to the public including in ways that members of the
+ public may access the material from a place and at a time
+ individually chosen by them.
+
+ l. Sui Generis Database Rights means rights other than copyright
+ resulting from Directive 96/9/EC of the European Parliament and of
+ the Council of 11 March 1996 on the legal protection of databases,
+ as amended and/or succeeded, as well as other essentially
+ equivalent rights anywhere in the world.
+
+ m. You means the individual or entity exercising the Licensed Rights
+ under this Public License. Your has a corresponding meaning.
+
+
+Section 2 -- Scope.
+
+ a. License grant.
+
+ 1. Subject to the terms and conditions of this Public License,
+ the Licensor hereby grants You a worldwide, royalty-free,
+ non-sublicensable, non-exclusive, irrevocable license to
+ exercise the Licensed Rights in the Licensed Material to:
+
+ a. reproduce and Share the Licensed Material, in whole or
+ in part; and
+
+ b. produce, reproduce, and Share Adapted Material.
+
+ 2. Exceptions and Limitations. For the avoidance of doubt, where
+ Exceptions and Limitations apply to Your use, this Public
+ License does not apply, and You do not need to comply with
+ its terms and conditions.
+
+ 3. Term. The term of this Public License is specified in Section
+ 6(a).
+
+ 4. Media and formats; technical modifications allowed. The
+ Licensor authorizes You to exercise the Licensed Rights in
+ all media and formats whether now known or hereafter created,
+ and to make technical modifications necessary to do so. The
+ Licensor waives and/or agrees not to assert any right or
+ authority to forbid You from making technical modifications
+ necessary to exercise the Licensed Rights, including
+ technical modifications necessary to circumvent Effective
+ Technological Measures. For purposes of this Public License,
+ simply making modifications authorized by this Section 2(a)
+ (4) never produces Adapted Material.
+
+ 5. Downstream recipients.
+
+ a. Offer from the Licensor -- Licensed Material. Every
+ recipient of the Licensed Material automatically
+ receives an offer from the Licensor to exercise the
+ Licensed Rights under the terms and conditions of this
+ Public License.
+
+ b. Additional offer from the Licensor -- Adapted Material.
+ Every recipient of Adapted Material from You
+ automatically receives an offer from the Licensor to
+ exercise the Licensed Rights in the Adapted Material
+ under the conditions of the Adapter's License You apply.
+
+ c. No downstream restrictions. You may not offer or impose
+ any additional or different terms or conditions on, or
+ apply any Effective Technological Measures to, the
+ Licensed Material if doing so restricts exercise of the
+ Licensed Rights by any recipient of the Licensed
+ Material.
+
+ 6. No endorsement. Nothing in this Public License constitutes or
+ may be construed as permission to assert or imply that You
+ are, or that Your use of the Licensed Material is, connected
+ with, or sponsored, endorsed, or granted official status by,
+ the Licensor or others designated to receive attribution as
+ provided in Section 3(a)(1)(A)(i).
+
+ b. Other rights.
+
+ 1. Moral rights, such as the right of integrity, are not
+ licensed under this Public License, nor are publicity,
+ privacy, and/or other similar personality rights; however, to
+ the extent possible, the Licensor waives and/or agrees not to
+ assert any such rights held by the Licensor to the limited
+ extent necessary to allow You to exercise the Licensed
+ Rights, but not otherwise.
+
+ 2. Patent and trademark rights are not licensed under this
+ Public License.
+
+ 3. To the extent possible, the Licensor waives any right to
+ collect royalties from You for the exercise of the Licensed
+ Rights, whether directly or through a collecting society
+ under any voluntary or waivable statutory or compulsory
+ licensing scheme. In all other cases the Licensor expressly
+ reserves any right to collect such royalties.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+ a. Attribution.
+
+ 1. If You Share the Licensed Material (including in modified
+ form), You must:
+
+ a. retain the following if it is supplied by the Licensor
+ with the Licensed Material:
+
+ i. identification of the creator(s) of the Licensed
+ Material and any others designated to receive
+ attribution, in any reasonable manner requested by
+ the Licensor (including by pseudonym if
+ designated);
+
+ ii. a copyright notice;
+
+ iii. a notice that refers to this Public License;
+
+ iv. a notice that refers to the disclaimer of
+ warranties;
+
+ v. a URI or hyperlink to the Licensed Material to the
+ extent reasonably practicable;
+
+ b. indicate if You modified the Licensed Material and
+ retain an indication of any previous modifications; and
+
+ c. indicate the Licensed Material is licensed under this
+ Public License, and include the text of, or the URI or
+ hyperlink to, this Public License.
+
+ 2. You may satisfy the conditions in Section 3(a)(1) in any
+ reasonable manner based on the medium, means, and context in
+ which You Share the Licensed Material. For example, it may be
+ reasonable to satisfy the conditions by providing a URI or
+ hyperlink to a resource that includes the required
+ information.
+
+ 3. If requested by the Licensor, You must remove any of the
+ information required by Section 3(a)(1)(A) to the extent
+ reasonably practicable.
+
+ b. ShareAlike.
+
+ In addition to the conditions in Section 3(a), if You Share
+ Adapted Material You produce, the following conditions also apply.
+
+ 1. The Adapter's License You apply must be a Creative Commons
+ license with the same License Elements, this version or
+ later, or a BY-SA Compatible License.
+
+ 2. You must include the text of, or the URI or hyperlink to, the
+ Adapter's License You apply. You may satisfy this condition
+ in any reasonable manner based on the medium, means, and
+ context in which You Share Adapted Material.
+
+ 3. You may not offer or impose any additional or different terms
+ or conditions on, or apply any Effective Technological
+ Measures to, Adapted Material that restrict exercise of the
+ rights granted under the Adapter's License You apply.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+ a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+ to extract, reuse, reproduce, and Share all or a substantial
+ portion of the contents of the database;
+
+ b. if You include all or a substantial portion of the database
+ contents in a database in which You have Sui Generis Database
+ Rights, then the database in which You have Sui Generis Database
+ Rights (but not its individual contents) is Adapted Material,
+
+ including for purposes of Section 3(b); and
+ c. You must comply with the conditions in Section 3(a) if You Share
+ all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+ a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+ EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+ AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+ ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+ IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+ WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+ ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+ KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+ ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+ b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+ TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+ NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+ INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+ COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+ USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+ ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+ DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+ IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+ c. The disclaimer of warranties and limitation of liability provided
+ above shall be interpreted in a manner that, to the extent
+ possible, most closely approximates an absolute disclaimer and
+ waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+ a. This Public License applies for the term of the Copyright and
+ Similar Rights licensed here. However, if You fail to comply with
+ this Public License, then Your rights under this Public License
+ terminate automatically.
+
+ b. Where Your right to use the Licensed Material has terminated under
+ Section 6(a), it reinstates:
+
+ 1. automatically as of the date the violation is cured, provided
+ it is cured within 30 days of Your discovery of the
+ violation; or
+
+ 2. upon express reinstatement by the Licensor.
+
+ For the avoidance of doubt, this Section 6(b) does not affect any
+ right the Licensor may have to seek remedies for Your violations
+ of this Public License.
+
+ c. For the avoidance of doubt, the Licensor may also offer the
+ Licensed Material under separate terms or conditions or stop
+ distributing the Licensed Material at any time; however, doing so
+ will not terminate this Public License.
+
+ d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+ License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+ a. The Licensor shall not be bound by any additional or different
+ terms or conditions communicated by You unless expressly agreed.
+
+ b. Any arrangements, understandings, or agreements regarding the
+ Licensed Material not stated herein are separate from and
+ independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+ a. For the avoidance of doubt, this Public License does not, and
+ shall not be interpreted to, reduce, limit, restrict, or impose
+ conditions on any use of the Licensed Material that could lawfully
+ be made without permission under this Public License.
+
+ b. To the extent possible, if any provision of this Public License is
+ deemed unenforceable, it shall be automatically reformed to the
+ minimum extent necessary to make it enforceable. If the provision
+ cannot be reformed, it shall be severed from this Public License
+ without affecting the enforceability of the remaining terms and
+ conditions.
+
+ c. No term or condition of this Public License will be waived and no
+ failure to comply consented to unless expressly agreed to by the
+ Licensor.
+
+ d. Nothing in this Public License constitutes or may be interpreted
+ as a limitation upon, or waiver of, any privileges and immunities
+ that apply to the Licensor or You, including from the legal
+ processes of any jurisdiction or authority.
+
+
+=======================================================================
+
+Creative Commons is not a party to its public
+licenses. Notwithstanding, Creative Commons may elect to apply one of
+its public licenses to material it publishes and in those instances
+will be considered the “Licensor.” The text of the Creative Commons
+public licenses is dedicated to the public domain under the CC0 Public
+Domain Dedication. Except for the limited purpose of indicating that
+material is shared under a Creative Commons public license or as
+otherwise permitted by the Creative Commons policies published at
+creativecommons.org/policies, Creative Commons does not authorize the
+use of the trademark "Creative Commons" or any other trademark or logo
+of Creative Commons without its prior written consent including,
+without limitation, in connection with any unauthorized modifications
+to any of its public licenses or any other arrangements,
+understandings, or agreements concerning use of licensed material. For
+the avoidance of doubt, this paragraph does not form part of the
+public licenses.
+
+Creative Commons may be contacted at creativecommons.org.
diff --git a/hotbar/init.lua b/hotbar/init.lua
index f57ccc4..71b48f4 100644
--- a/hotbar/init.lua
+++ b/hotbar/init.lua
@@ -1,5 +1,31 @@
+local hotbar_size_default = minetest.setting_get("hotbar_size") or 16
-local hotbar_size = minetest.setting_get("hotbar_size") or 16
+local player_hotbar_settings = {}
+
+local function load_hotbar_settings()
+ local f = io.open(minetest.get_worldpath()..DIR_DELIM.."hotbar_settings","r")
+ if not f then return end
+ local d = f:read("*all")
+ f:close()
+ player_hotbar_settings = minetest.deserialize(d)
+end
+
+local function save_hotbar_settings()
+ local f = io.open(minetest.get_worldpath()..DIR_DELIM.."hotbar_settings","w")
+ if not f then
+ minetest.log("error","Failed to save hotbar settings")
+ return
+ end
+ local d = minetest.serialize(player_hotbar_settings)
+ f:write(d)
+ f:close()
+end
+
+local function get_hotbar_setting(name)
+ return tonumber(player_hotbar_settings[name]) or hotbar_size_default
+end
+
+load_hotbar_settings()
local function resize_hotbar(size)
if size == 8 then return "gui_hb_bg.png" end
@@ -8,11 +34,12 @@ local function resize_hotbar(size)
end
minetest.register_on_joinplayer(function(player)
+ local hotbar_size = get_hotbar_setting(player:get_player_name())
player:hud_set_hotbar_itemcount(hotbar_size)
- minetest.after(0.5,function()
+ minetest.after(0.5,function(hotbar_size)
player:hud_set_hotbar_selected_image("gui_hotbar_selected.png")
player:hud_set_hotbar_image(resize_hotbar(hotbar_size))
- end)
+ end,hotbar_size)
end)
minetest.register_chatcommand("hotbar", {
@@ -20,10 +47,11 @@ minetest.register_chatcommand("hotbar", {
description = "Sets the size of your hotbar",
func = function(name, slots)
if slots ~= "8" and slots ~= "23" then slots = "16" end
+ player_hotbar_settings[name] = slots
local player = minetest.get_player_by_name(name)
player:hud_set_hotbar_itemcount(tonumber(slots))
minetest.chat_send_player(name, "[_] Hotbar size set to " .. tonumber(slots) .. ".")
player:hud_set_hotbar_image(resize_hotbar(tonumber(slots)))
+ save_hotbar_settings()
end,
})
-
diff --git a/infrastructure/advanced_automatic_warning_device.lua b/infrastructure/advanced_automatic_warning_device.lua
index 574fc0d..f6fc08d 100644
--- a/infrastructure/advanced_automatic_warning_device.lua
+++ b/infrastructure/advanced_automatic_warning_device.lua
@@ -83,7 +83,7 @@ minetest.register_node("infrastructure:automatic_warning_device_top", {
"infrastructure_automatic_warning_device_top_side.png",
"infrastructure_automatic_warning_device_top.png"
},
- on_destruct = stop_bell,
+ on_destruct = infrastructure.stop_bell,
drawtype = "nodebox",
paramtype = "light",
paramtype2 = "facedir",
diff --git a/pipeworks/autocrafter.lua b/pipeworks/autocrafter.lua
index 5d554c1..ebde77c 100644
--- a/pipeworks/autocrafter.lua
+++ b/pipeworks/autocrafter.lua
@@ -407,7 +407,7 @@ minetest.register_craft( {
output = "pipeworks:autocrafter 2",
recipe = {
{ "default:steel_ingot", "default:mese_crystal", "default:steel_ingot" },
- { "basic_materials:plastic_sheeting", "default:steel_ingot", "basic_materials:plastic_sheeting" },
+ { "basic_materials:plastic_sheet", "default:steel_ingot", "basic_materials:plastic_sheet" },
{ "default:steel_ingot", "default:mese_crystal", "default:steel_ingot" }
},
})
diff --git a/pipeworks/lua_tube.lua b/pipeworks/lua_tube.lua
index 8cc4468..941ef92 100644
--- a/pipeworks/lua_tube.lua
+++ b/pipeworks/lua_tube.lua
@@ -37,6 +37,23 @@ local rules = {
white = {x = 0, y = 0, z = 1, name = "white"},
}
+local digiline_rules_luatube = {
+ {x=0, y=0, z=-1},
+ {x=1, y=0, z=0},
+ {x=-1, y=0, z=0},
+ {x=0, y=0, z=1},
+ {x=1, y=1, z=0},
+ {x=1, y=-1, z=0},
+ {x=-1, y=1, z=0},
+ {x=-1, y=-1, z=0},
+ {x=0, y=1, z=1},
+ {x=0, y=-1, z=1},
+ {x=0, y=1, z=-1},
+ {x=0, y=-1, z=-1},
+ -- vertical connectivity
+ {x=0, y=1, z=0},
+ {x=0, y=-1, z=0},
+}
------------------
-- Action stuff --
@@ -303,7 +320,7 @@ local function get_digiline_send(pos)
end
minetest.after(0, function()
- digilines.receptor_send(pos, digiline.rules.default, channel, msg)
+ digilines.receptor_send(pos, digiline_rules_luatube, channel, msg)
end)
return true
end
@@ -540,7 +557,10 @@ local digiline = {
action = function(pos, node, channel, msg)
run(pos, {type = "digiline", channel = channel, msg = msg})
end
- }
+ },
+ wire = {
+ rules = pipeworks.digilines_rules
+ },
}
local function on_receive_fields(pos, form_name, fields, sender)
if not fields.program then
diff --git a/pipeworks/signal_tubes.lua b/pipeworks/signal_tubes.lua
index 7048ebb..1d8daae 100644
--- a/pipeworks/signal_tubes.lua
+++ b/pipeworks/signal_tubes.lua
@@ -102,7 +102,10 @@ if digiline_enabled and pipeworks.enable_digiline_detector_tube then
receptor = {},
effector = {
action = function(pos,node,channel,msg) end
- }
+ },
+ wire = {
+ rules = pipeworks.digilines_rules
+ },
},
},
})
diff --git a/prefab_redo/depends.txt b/prefab_redo/depends.txt
index c3bc48f..b8def00 100644
--- a/prefab_redo/depends.txt
+++ b/prefab_redo/depends.txt
@@ -1,5 +1,4 @@
default
doors
-concrete
basic_materials
moreblocks
diff --git a/rgblightstone/init.lua b/rgblightstone/init.lua
index a26f7ab..812ca2b 100644
--- a/rgblightstone/init.lua
+++ b/rgblightstone/init.lua
@@ -72,6 +72,16 @@ minetest.register_node("rgblightstone:rgblightstone", {
end,
light_source = 0,
digiline = {
+ wire = {
+ rules = {
+ {x = 1,y = 0,z = 0},
+ {x = -1,y = 0,z = 0},
+ {x = 0,y = 0,z = 1},
+ {x = 0,y = 0,z = -1},
+ {x = 0,y = 1,z = 0},
+ {x = 0,y = -1,z = 0},
+ },
+ },
receptor = {},
effector = {
action = function(pos, node, channel, msg)
diff --git a/signs_lib/init.lua b/signs_lib/init.lua
index 8e0d047..82a0f1b 100644
--- a/signs_lib/init.lua
+++ b/signs_lib/init.lua
@@ -26,6 +26,9 @@ signs_lib.gettext = S
-- text encoding
dofile(signs_lib.path .. "/encoding.lua");
+-- Initialize character texture cache
+local ctexcache = {}
+
local wall_dir_change = {
[0] = 4,
@@ -362,14 +365,19 @@ end
-- make char texture file name
-- if texture file does not exist use fallback texture instead
local function char_tex(font_name, ch)
- local c = ch:byte()
- local exists, tex = file_exists(CHAR_PATH:format(font_name, c))
- if exists and c ~= 14 then
- tex = CHAR_FILE:format(font_name, c)
+ if ctexcache[font_name..ch] then
+ return ctexcache[font_name..ch], true
else
- tex = CHAR_FILE:format(font_name, 0x0)
+ local c = ch:byte()
+ local exists, tex = file_exists(CHAR_PATH:format(font_name, c))
+ if exists and c ~= 14 then
+ tex = CHAR_FILE:format(font_name, c)
+ else
+ tex = CHAR_FILE:format(font_name, 0x0)
+ end
+ ctexcache[font_name..ch] = tex
+ return tex, exists
end
- return tex, exists
end
local function make_line_texture(line, lineno, pos)
diff --git a/street_signs/api.lua b/street_signs/api.lua
index 3887572..1a1d51e 100644
--- a/street_signs/api.lua
+++ b/street_signs/api.lua
@@ -27,6 +27,9 @@ local wall_dir_change = {
3,
}
+-- Initialize character texture cache
+local ctexcache = {}
+
street_signs.wallmounted_rotate = function(pos, node, user, mode)
if mode ~= screwdriver.ROTATE_FACE then return false end
minetest.swap_node(pos, { name = node.name, param2 = wall_dir_change[node.param2 % 6] })
@@ -191,14 +194,19 @@ end
-- make char texture file name
-- if texture file does not exist use fallback texture instead
local function char_tex(font_name, ch)
- local c = ch:byte()
- local exists, tex = file_exists(CHAR_PATH:format(font_name, c))
- if exists and c ~= 14 then
- tex = CHAR_FILE:format(font_name, c)
+ if ctexcache[font_name..ch] then
+ return ctexcache[font_name..ch], true
else
- tex = CHAR_FILE:format(font_name, 0x0)
+ local c = ch:byte()
+ local exists, tex = file_exists(CHAR_PATH:format(font_name, c))
+ if exists and c ~= 14 then
+ tex = CHAR_FILE:format(font_name, c)
+ else
+ tex = CHAR_FILE:format(font_name, 0x0)
+ end
+ ctexcache[font_name..ch] = tex
+ return tex, exists
end
- return tex, exists
end
local function make_line_texture(line, lineno, pos, line_width, line_height, cwidth_tab, font_size, colorbgw)
diff --git a/technic/machines/HV/quarry.lua b/technic/machines/HV/quarry.lua
index b7cc501..0a45559 100644
--- a/technic/machines/HV/quarry.lua
+++ b/technic/machines/HV/quarry.lua
@@ -146,15 +146,9 @@ local function quarry_run(pos, node)
dignode = technic.get_or_load_node(digpos) or minetest.get_node(digpos)
local dignodedef = minetest.registered_nodes[dignode.name] or {diggable=false}
-- doors mod among other thing does NOT like a nil digger...
- local fakedigger = {
- get_player_name = function()
- return "!technic_quarry_fake_digger"
- end,
- is_player = function() return false end,
- get_wielded_item = function()
- return ItemStack("air")
- end,
- }
+ local fakedigger = pipeworks.create_fake_player({
+ name = owner
+ })
if not dignodedef.diggable or (dignodedef.can_dig and not dignodedef.can_dig(digpos, fakedigger)) then
can_dig = false
end
diff --git a/unifieddyes/init.lua b/unifieddyes/init.lua
index 27be3f1..9edd87f 100644
--- a/unifieddyes/init.lua
+++ b/unifieddyes/init.lua
@@ -1102,9 +1102,9 @@ minetest.register_tool("unifieddyes:airbrush", {
minetest.register_craft( {
output = "unifieddyes:airbrush",
recipe = {
- { "default:gold_ingot", "", "bucket:bucket_empty" },
- { "", "default:steel_ingot", "" },
- { "", "", "default:steel_ingot" }
+ { "basic_materials:brass_ingot", "", "basic_materials:plastic_sheet" },
+ { "", "default:steel_ingot", "" },
+ { "", "", "default:steel_ingot" }
},
})
diff --git a/worldedit_commands/init.lua b/worldedit_commands/init.lua
index 131c49b..763e895 100644
--- a/worldedit_commands/init.lua
+++ b/worldedit_commands/init.lua
@@ -905,9 +905,12 @@ minetest.register_chatcommand("/stretch", {
stretchx, stretchy, stretchz = tonumber(stretchx), tonumber(stretchy), tonumber(stretchz)
if stretchx == 0 or stretchy == 0 or stretchz == 0 then
worldedit.player_notify(name, "invalid scaling factors: " .. param)
+ return nil
end
local count = check_region(name, param)
- if count then return tonumber(stretchx) * tonumber(stretchy) * tonumber(stretchz) * count end
+ if count then
+ return stretchx * stretchy * stretchz * count
+ end
return nil
end),
})