Updated homedecor

- Updated homedecor to add interaction between its wardrobe and 3d_armor
 - Added homedecor's LICENSE

mods/fishing/functions.lua

@@ -119,7 +119,7 @@ function fishing_setting.func.get_loot()
 		end
 	end
 	return ""
-end 
+end
 
 
 

mods/fishing/prizes.lua

@@ -22,7 +22,7 @@ local stuff = {
 	{"seaplants",				"kelpgreen",				0,					"a Green Kelp.",				26,			5},
 	{"3d_armor",				"boots_steel",				"random",			"some very old Boots.",			31,			2},
 	{"3d_armor",				"leggings_gold",			"random",			"some very old Leggings.",		33,			5},
-	{"3d_armor",				"chestplate_bronze",		"random",			"a very old ChestPlate.",		38,			5}, 	
+	{"3d_armor",				"chestplate_bronze",		"random",			"a very old ChestPlate.",		38,			5},
 	{"fishing",					"pole_wood",				"randomtools",		"an old Fishing Pole.",			43,			10},
 	{"3d_armor",				"boots_wood",				"random",			"some very old Boots.",			53,			5},
 	{"maptools",				"gold_coin",				0,					"a Gold Coin.",					58,			1},

mods/hbhunger/hunger.lua

@@ -132,7 +132,7 @@ if minetest.get_modpath("fishing") ~= nil then
 	overwrite("fishing:shark_cooked", 6)
 	overwrite("fishing:pike", 2)
 	overwrite("fishing:pike_cooked", 6)
-	
+
 	overwrite("fishing:clownfish_raw", 2) --new fishing
 	overwrite("fishing:bluewhite_raw", 2) --new fishing
 	overwrite("fishing:shark_raw", 2)  --new fishing

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. <http://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.
+
+===============================================================================
+
+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 <sam@hocevar.net>
+
+ 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.
+

mods/homedecor_modpack/homedecor/depends.txt

@@ -9,3 +9,4 @@ intllib?
 bucket?
 beds?
 flowers?
+3d_armor?

mods/homedecor_modpack/homedecor/misc-nodes.lua

@@ -97,17 +97,18 @@ for i in ipairs(flowers_list) do
 
 	homedecor.register("potted_"..flower, {
 		description = S("Potted flower ("..flowerdesc..")"),
-		mesh = "homedecor_flowerpot_small.obj",
+		mesh = "homedecor_potted_plant.obj",
 		tiles = {
-			"flowers_"..flower..".png",
-			"homedecor_potted.png"
+			"homedecor_flower_pot_terracotta.png",
+			"default_dirt.png^[colorize:#000000:175",
+			"flowers_"..flower..".png"
 		},
 		walkable = false,
 		groups = {snappy = 3},
 		sounds = default.node_sound_glass_defaults(),
 		selection_box = {
 			type = "fixed",
-			fixed = { -0.2, -0.5, -0.2, 0.2, 0.4, 0.2 }
+			fixed = { -0.2, -0.5, -0.2, 0.2, 0.3, 0.2 }
 		}
 	})
 

mods/homedecor_modpack/homedecor/wardrobe.lua

@@ -75,7 +75,7 @@ homedecor.register("wardrobe", {
 				break
 			elseif fields["fe"..skins[i]] then
 				if armor_mod then
-					armor.textures[playerName].skin = "fe"..skins[i]..".png"
+					armor.textures[playerName].skin = "homedecor_clothes_fe"..skins[i]..".png"
 					armor:update_player_visuals(sender)
 					break
 				end