From 073e241ab60a5894103b0d89aa6a77ba94e89348 Mon Sep 17 00:00:00 2001 From: AntumDeluge Date: Wed, 31 Aug 2016 13:10:46 -0700 Subject: [PATCH] Move 'building_blocks' mod from 'buildings' modpack to original 'homedecor_modpack'. --- README.md | 5 +- mods/homedecor_modpack/LICENSE | 199 ++++++++++++++++++ mods/homedecor_modpack/README | 61 ++++++ .../building_blocks/depends.txt | 0 .../building_blocks/init.lua | 0 .../textures/building_blocks_Adobe.png | Bin .../textures/building_blocks_BWtile.png | Bin .../textures/building_blocks_Roofing.png | Bin .../textures/building_blocks_brobble.png | Bin .../building_blocks_brobble_spread_inv.png | Bin .../textures/building_blocks_bwtile_inv.png | Bin .../textures/building_blocks_cast_iron.png | Bin .../building_blocks_cast_iron_fireplace.png | Bin .../textures/building_blocks_grate.png | Bin .../textures/building_blocks_grate2.png | Bin .../building_blocks_gravel_spread_inv.png | Bin .../textures/building_blocks_hardwood.png | Bin .../textures/building_blocks_knife.png | Bin .../textures/building_blocks_marble.png | Bin .../textures/building_blocks_sglass.png | Bin .../textures/building_blocks_sticks.png | Bin .../textures/building_blocks_tar.png | Bin .../textures/building_blocks_tar_base.png | Bin .../building_blocks_tar_spread_inv.png | Bin .../textures/building_blocks_towel.png | Bin .../textures/building_blocks_towel_inv.png | Bin .../textures/building_blocks_wglass.png | Bin .../textures/technic_granite.png | Bin mods/homedecor_modpack/modpack.txt | 0 29 files changed, 264 insertions(+), 1 deletion(-) create mode 100644 mods/homedecor_modpack/LICENSE create mode 100644 mods/homedecor_modpack/README rename mods/{buildings => homedecor_modpack}/building_blocks/depends.txt (100%) rename mods/{buildings => homedecor_modpack}/building_blocks/init.lua (100%) rename mods/{buildings => homedecor_modpack}/building_blocks/textures/building_blocks_Adobe.png (100%) rename mods/{buildings => homedecor_modpack}/building_blocks/textures/building_blocks_BWtile.png (100%) rename mods/{buildings => homedecor_modpack}/building_blocks/textures/building_blocks_Roofing.png (100%) rename mods/{buildings => homedecor_modpack}/building_blocks/textures/building_blocks_brobble.png (100%) rename mods/{buildings => homedecor_modpack}/building_blocks/textures/building_blocks_brobble_spread_inv.png (100%) rename mods/{buildings => homedecor_modpack}/building_blocks/textures/building_blocks_bwtile_inv.png (100%) rename mods/{buildings => homedecor_modpack}/building_blocks/textures/building_blocks_cast_iron.png (100%) rename mods/{buildings => homedecor_modpack}/building_blocks/textures/building_blocks_cast_iron_fireplace.png (100%) rename mods/{buildings => homedecor_modpack}/building_blocks/textures/building_blocks_grate.png (100%) rename mods/{buildings => homedecor_modpack}/building_blocks/textures/building_blocks_grate2.png (100%) rename mods/{buildings => homedecor_modpack}/building_blocks/textures/building_blocks_gravel_spread_inv.png (100%) rename mods/{buildings => homedecor_modpack}/building_blocks/textures/building_blocks_hardwood.png (100%) rename mods/{buildings => homedecor_modpack}/building_blocks/textures/building_blocks_knife.png (100%) rename mods/{buildings => homedecor_modpack}/building_blocks/textures/building_blocks_marble.png (100%) rename mods/{buildings => homedecor_modpack}/building_blocks/textures/building_blocks_sglass.png (100%) rename mods/{buildings => homedecor_modpack}/building_blocks/textures/building_blocks_sticks.png (100%) rename mods/{buildings => homedecor_modpack}/building_blocks/textures/building_blocks_tar.png (100%) rename mods/{buildings => homedecor_modpack}/building_blocks/textures/building_blocks_tar_base.png (100%) rename mods/{buildings => homedecor_modpack}/building_blocks/textures/building_blocks_tar_spread_inv.png (100%) rename mods/{buildings => homedecor_modpack}/building_blocks/textures/building_blocks_towel.png (100%) rename mods/{buildings => homedecor_modpack}/building_blocks/textures/building_blocks_towel_inv.png (100%) rename mods/{buildings => homedecor_modpack}/building_blocks/textures/building_blocks_wglass.png (100%) rename mods/{buildings => homedecor_modpack}/building_blocks/textures/technic_granite.png (100%) create mode 100644 mods/homedecor_modpack/modpack.txt diff --git a/README.md b/README.md index e9c812f8..c3ffea80 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,6 @@ The game includes the mods from the default [minetest_game](https://github.com/m * [overrides][antum_overrides] ([MIT][lic.antum]) * [awards][] ([LGPL][lic.awards]) -- version: [2.3.0-14-92c43d1 Git][ver.awards] * buildings/ - * building_blocks ([homedecor_modpack][homedecor]) ([LGPL/WTFPL/CC-BY-SA](doc/modpacks/homedecor/LICENSE)) * chains ([homedecor_modpack][homedecor]) * [christmas][] ([MIT](mods/buildings/christmas/LICENSE.txt)) * computer ([homedecor_modpack][homedecor]) @@ -160,6 +159,9 @@ The game includes the mods from the default [minetest_game](https://github.com/m * mob_shark ([CC BY-SA][lic.amp_shark]) * mob_slime ([CC0 / CC BY / CC BY-SA / CC0][lic.amp_slime]) * mob_warthog ([CC BY / CC BY-SA][lic.amp_warthog]) +* [homedecor_modpack][homedecor] + * homedecor_modpack/ + * building_blocks ([LGPL / WTFPL / CC-BY-SA][lic.homedecor]) * [mobf_core][animals_modpack] (part of animals_modpack) -- version: 2.5.1 * mobf_core/ * barn ([CC-BY-SA][lic.mobf]) @@ -291,6 +293,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m [lic.awards]: mods/awards/LICENSE.txt [lic.character_creator]: mods/player_visuals/character_creator/LICENSE.md [lic.creeper]: mods/mobs_aggressive/creeper/LICENSE.md +[lic.homedecor]: mods/homedecor_modpack/LICENSE [lic.ilights]: mods/lighting/ilights/init.lua [lic.mobf]: doc/modpacks/mobf_core/License.txt [lic.playeranim.1]: mods/player_visuals/playeranim/LICENSE.txt diff --git a/mods/homedecor_modpack/LICENSE b/mods/homedecor_modpack/LICENSE new file mode 100644 index 00000000..0a3df5e6 --- /dev/null +++ b/mods/homedecor_modpack/LICENSE @@ -0,0 +1,199 @@ +For the Lua code: LGPL 3.0 or higher +For all models, all textures, and all sounds: CC-by-SA 3.0 or higher +For everything else: WTFPL + +Exceptions to the above: + +Fancy mesh fire model and texture by NathanS (CC-0). + +=============================================================================== + + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + 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 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. + +=============================================================================== + +This work is licensed under the Creative Commons Attribution-ShareAlike +4.0 International License. To view a copy of this license, visit +http://creativecommons.org/licenses/by-sa/4.0/ or send a letter to +Creative Commons, PO Box 1866, Mountain View, CA 94042, USA. + +=============================================================================== + + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + Version 2, December 2004 + + Copyright (C) 2004 Sam Hocevar + + Everyone is permitted to copy and distribute verbatim or modified + copies of this license document, and changing it is allowed as long + as the name is changed. + + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. You just DO WHAT THE FUCK YOU WANT TO. + diff --git a/mods/homedecor_modpack/README b/mods/homedecor_modpack/README new file mode 100644 index 00000000..4c5679f7 --- /dev/null +++ b/mods/homedecor_modpack/README @@ -0,0 +1,61 @@ +This is what I consider to be a fairly feature-filled home decor +modpack. As such, it comes in multiple parts: + +* The actual homedecor mod, which supplies a bunch of stuff found in +most homes (like flower pots, home electronics, brass and wrought-iron +tables, and a bunch of other things). + +* A "3d extras" mod, which supplies things that re-define something in +some other mod (or in the default game) so that those objects become +fully 3d (instead of a flat cube), as well as things which are directly +related. This mod, for example, provides 3d bookshelves and their empty +and half-depth "open frame" counterparts. + +* A signs library forked from the one that thexyz and PilzAdam first +made, which produces visible text on signs (and which has been extended +to put signs on fences, including the brass and wrought iron ones here +in homedecor). + +* Sdzen's building_blocks mod, which is here to supply not only a few +blocks to build with, obviously, :-) but also to supply a number of +materials to craft other things in Homedecor with. + +All items can be accessed either by crafting various other items +together, or with the usual /give commands. To get a list of the actual +node names, just go into the homedecor/ folder and run the listnodes.sh +Bash script. Note that a few of the listed nodes are kinda useless by +themselves (like the various parts of the folding doors). + +All of the images used for the recipes in the forum post tracking this +mod are included in the crafting-guide/ folder. + +Most stuff can be made from materials found through a game world. Some +stuff can only be crafted by using materials from another mod (look for +the orange highlights). Currently, this mod can use materials from +moreores, mesecons, wool, and unifieddyes if present. You can still use +the usual /give commands to get the items that depend on these mods if +you don't use them installed. + +This mod is still a work-in-progress, but should be complete enough not +to irritate anyone. :-) Namely, many items can be used as fuel but the +burn times need tuning and I need to tune the cook time and fuel usage +on the four smelted items. + +Much of the code (especially for the doors) plus the bucket were taken +from the files which come with Minetest and altered to suit. Many +thanks to Jeija for coming up with an elegant cylinder using nodeboxes; +see his 'irregular' mods). His code is used herein (you can guess where +:-) ). + +Dependencies: none (just the game's default stuff) + +Recommends: buckets, flowers, unifieddyes, junglegrass, moreores, +mesecons, wool + +Skin credits: + +Mammu by hansuke123 +http://minetest.fensta.bplaced.net/#name=Mammu + +BrightGirl by Malarif +http://minetest.fensta.bplaced.net/#name=BrightGirl diff --git a/mods/buildings/building_blocks/depends.txt b/mods/homedecor_modpack/building_blocks/depends.txt similarity index 100% rename from mods/buildings/building_blocks/depends.txt rename to mods/homedecor_modpack/building_blocks/depends.txt diff --git a/mods/buildings/building_blocks/init.lua b/mods/homedecor_modpack/building_blocks/init.lua similarity index 100% rename from mods/buildings/building_blocks/init.lua rename to mods/homedecor_modpack/building_blocks/init.lua diff --git a/mods/buildings/building_blocks/textures/building_blocks_Adobe.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_Adobe.png similarity index 100% rename from mods/buildings/building_blocks/textures/building_blocks_Adobe.png rename to mods/homedecor_modpack/building_blocks/textures/building_blocks_Adobe.png diff --git a/mods/buildings/building_blocks/textures/building_blocks_BWtile.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_BWtile.png similarity index 100% rename from mods/buildings/building_blocks/textures/building_blocks_BWtile.png rename to mods/homedecor_modpack/building_blocks/textures/building_blocks_BWtile.png diff --git a/mods/buildings/building_blocks/textures/building_blocks_Roofing.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_Roofing.png similarity index 100% rename from mods/buildings/building_blocks/textures/building_blocks_Roofing.png rename to mods/homedecor_modpack/building_blocks/textures/building_blocks_Roofing.png diff --git a/mods/buildings/building_blocks/textures/building_blocks_brobble.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_brobble.png similarity index 100% rename from mods/buildings/building_blocks/textures/building_blocks_brobble.png rename to mods/homedecor_modpack/building_blocks/textures/building_blocks_brobble.png diff --git a/mods/buildings/building_blocks/textures/building_blocks_brobble_spread_inv.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_brobble_spread_inv.png similarity index 100% rename from mods/buildings/building_blocks/textures/building_blocks_brobble_spread_inv.png rename to mods/homedecor_modpack/building_blocks/textures/building_blocks_brobble_spread_inv.png diff --git a/mods/buildings/building_blocks/textures/building_blocks_bwtile_inv.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_bwtile_inv.png similarity index 100% rename from mods/buildings/building_blocks/textures/building_blocks_bwtile_inv.png rename to mods/homedecor_modpack/building_blocks/textures/building_blocks_bwtile_inv.png diff --git a/mods/buildings/building_blocks/textures/building_blocks_cast_iron.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_cast_iron.png similarity index 100% rename from mods/buildings/building_blocks/textures/building_blocks_cast_iron.png rename to mods/homedecor_modpack/building_blocks/textures/building_blocks_cast_iron.png diff --git a/mods/buildings/building_blocks/textures/building_blocks_cast_iron_fireplace.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_cast_iron_fireplace.png similarity index 100% rename from mods/buildings/building_blocks/textures/building_blocks_cast_iron_fireplace.png rename to mods/homedecor_modpack/building_blocks/textures/building_blocks_cast_iron_fireplace.png diff --git a/mods/buildings/building_blocks/textures/building_blocks_grate.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_grate.png similarity index 100% rename from mods/buildings/building_blocks/textures/building_blocks_grate.png rename to mods/homedecor_modpack/building_blocks/textures/building_blocks_grate.png diff --git a/mods/buildings/building_blocks/textures/building_blocks_grate2.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_grate2.png similarity index 100% rename from mods/buildings/building_blocks/textures/building_blocks_grate2.png rename to mods/homedecor_modpack/building_blocks/textures/building_blocks_grate2.png diff --git a/mods/buildings/building_blocks/textures/building_blocks_gravel_spread_inv.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_gravel_spread_inv.png similarity index 100% rename from mods/buildings/building_blocks/textures/building_blocks_gravel_spread_inv.png rename to mods/homedecor_modpack/building_blocks/textures/building_blocks_gravel_spread_inv.png diff --git a/mods/buildings/building_blocks/textures/building_blocks_hardwood.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_hardwood.png similarity index 100% rename from mods/buildings/building_blocks/textures/building_blocks_hardwood.png rename to mods/homedecor_modpack/building_blocks/textures/building_blocks_hardwood.png diff --git a/mods/buildings/building_blocks/textures/building_blocks_knife.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_knife.png similarity index 100% rename from mods/buildings/building_blocks/textures/building_blocks_knife.png rename to mods/homedecor_modpack/building_blocks/textures/building_blocks_knife.png diff --git a/mods/buildings/building_blocks/textures/building_blocks_marble.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_marble.png similarity index 100% rename from mods/buildings/building_blocks/textures/building_blocks_marble.png rename to mods/homedecor_modpack/building_blocks/textures/building_blocks_marble.png diff --git a/mods/buildings/building_blocks/textures/building_blocks_sglass.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_sglass.png similarity index 100% rename from mods/buildings/building_blocks/textures/building_blocks_sglass.png rename to mods/homedecor_modpack/building_blocks/textures/building_blocks_sglass.png diff --git a/mods/buildings/building_blocks/textures/building_blocks_sticks.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_sticks.png similarity index 100% rename from mods/buildings/building_blocks/textures/building_blocks_sticks.png rename to mods/homedecor_modpack/building_blocks/textures/building_blocks_sticks.png diff --git a/mods/buildings/building_blocks/textures/building_blocks_tar.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_tar.png similarity index 100% rename from mods/buildings/building_blocks/textures/building_blocks_tar.png rename to mods/homedecor_modpack/building_blocks/textures/building_blocks_tar.png diff --git a/mods/buildings/building_blocks/textures/building_blocks_tar_base.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_tar_base.png similarity index 100% rename from mods/buildings/building_blocks/textures/building_blocks_tar_base.png rename to mods/homedecor_modpack/building_blocks/textures/building_blocks_tar_base.png diff --git a/mods/buildings/building_blocks/textures/building_blocks_tar_spread_inv.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_tar_spread_inv.png similarity index 100% rename from mods/buildings/building_blocks/textures/building_blocks_tar_spread_inv.png rename to mods/homedecor_modpack/building_blocks/textures/building_blocks_tar_spread_inv.png diff --git a/mods/buildings/building_blocks/textures/building_blocks_towel.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_towel.png similarity index 100% rename from mods/buildings/building_blocks/textures/building_blocks_towel.png rename to mods/homedecor_modpack/building_blocks/textures/building_blocks_towel.png diff --git a/mods/buildings/building_blocks/textures/building_blocks_towel_inv.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_towel_inv.png similarity index 100% rename from mods/buildings/building_blocks/textures/building_blocks_towel_inv.png rename to mods/homedecor_modpack/building_blocks/textures/building_blocks_towel_inv.png diff --git a/mods/buildings/building_blocks/textures/building_blocks_wglass.png b/mods/homedecor_modpack/building_blocks/textures/building_blocks_wglass.png similarity index 100% rename from mods/buildings/building_blocks/textures/building_blocks_wglass.png rename to mods/homedecor_modpack/building_blocks/textures/building_blocks_wglass.png diff --git a/mods/buildings/building_blocks/textures/technic_granite.png b/mods/homedecor_modpack/building_blocks/textures/technic_granite.png similarity index 100% rename from mods/buildings/building_blocks/textures/technic_granite.png rename to mods/homedecor_modpack/building_blocks/textures/technic_granite.png diff --git a/mods/homedecor_modpack/modpack.txt b/mods/homedecor_modpack/modpack.txt new file mode 100644 index 00000000..e69de29b