Move 'lavalamp' mod from 'furniture' modpack to original

'homedecor_modpack'.
2016-08-31 13:36:40 -07:00 · 2016-08-31 13:36:40 -07:00 · 24b34cf48c
parent 906525db46
commit 24b34cf48c
19 changed files with 1 additions and 1 deletions
--- a/README.md
+++ b/README.md
@ -19,7 +19,6 @@ The game includes the mods from the default [minetest_game](https://github.com/m
    * [christmas][] ([MIT](mods/buildings/christmas/LICENSE.txt))
    * [elevator][] ([WTFPL](mods/buildings/elevator/readme.txt))
    * [fort_spikes][] ([MIT/CC0](mods/buildings/fort_spikes/LICENSE))
-    * lavalamp ([homedecor_modpack][homedecor])
    * [moreblocks][] ([zlib](mods/buildings/moreblocks/LICENSE.md))
    * mdoors ([mydoors modpack][mydoors]) ([CC-BY / CC-BY-SA / WTFPL](mods/buildings/mdoors/README.txt) / [DWYWFPL](doc/modpacks/mydoors/licence.txt))
    * my_*_doors ([mydoors modpack][mydoors])
@ -162,6 +161,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 		* homedecor_3d_extras
 		* inbox
 		* itemframes
+		* lavalamp
 		* lrfurn
 * [mobf_core][animals_modpack] (part of animals_modpack) -- version: 2.5.1
 	* mobf_core/
--- a/mods/homedecor_modpack/lavalamp/README.txt
+++ b/mods/homedecor_modpack/lavalamp/README.txt
--- a/mods/homedecor_modpack/lavalamp/depends.txt
+++ b/mods/homedecor_modpack/lavalamp/depends.txt
--- a/mods/homedecor_modpack/lavalamp/init.lua
+++ b/mods/homedecor_modpack/lavalamp/init.lua
--- a/mods/homedecor_modpack/lavalamp/models/lavalamp.obj
+++ b/mods/homedecor_modpack/lavalamp/models/lavalamp.obj
--- a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_blue.png
+++ b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_blue.png
--- a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_green.png
+++ b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_green.png
--- a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_orange.png
+++ b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_orange.png
--- a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_red.png
+++ b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_red.png
--- a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_violet.png
+++ b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_violet.png
--- a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_yellow.png
+++ b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_anim_yellow.png
--- a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_blue_inv.png
+++ b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_blue_inv.png
--- a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_green_inv.png
+++ b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_green_inv.png
--- a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_off.png
+++ b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_off.png
--- a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_orange_inv.png
+++ b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_orange_inv.png
--- a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_red_inv.png
+++ b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_red_inv.png
--- a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_violet_inv.png
+++ b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_violet_inv.png
--- a/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_yellow_inv.png
+++ b/mods/homedecor_modpack/lavalamp/textures/lavalamp_lamp_yellow_inv.png
--- a/mods/homedecor_modpack/lavalamp/textures/lavalamp_metal.png
+++ b/mods/homedecor_modpack/lavalamp/textures/lavalamp_metal.png