diff --git a/LICENSE.txt b/LICENSE.txt index 9ff213b..9868e14 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,19 +1,44 @@ -Copyright (c) 2017 Jake Gustafson - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file + + +License of source code +---------------------- + +Copyright 2017 expertmm +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +Licenses of media (textures) +---------------------------- + +Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) +Copyright (C) 2015-2016 expertmm + +You are free to: +Share — copy and redistribute the material in any medium or format. +Adapt — remix, transform, and build upon the material for any purpose, even commercially. +The licensor cannot revoke these freedoms as long as you follow the license terms. + +Under the following terms: + +Attribution — You must give appropriate credit, provide a link to the license, and +indicate if changes were made. You may do so in any reasonable manner, but not in any way +that suggests the licensor endorses you or your use. + +ShareAlike — If you remix, transform, or build upon the material, you must distribute +your contributions under the same license as the original. + +No additional restrictions — You may not apply legal terms or technological measures that +legally restrict others from doing anything the license permits. + +Notices: + +You do not have to comply with the license for elements of the material in the public +domain or where your use is permitted by an applicable exception or limitation. +No warranties are given. The license may not give you all of the permissions necessary +for your intended use. For example, other rights such as publicity, privacy, or moral +rights may limit how you use the material. + +For more details: +http://creativecommons.org/licenses/by-sa/3.0/ diff --git a/README.md b/README.md index 98f8732..422dbc8 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This collection of scripts includes some scripts to help install and manage your EnlivenMinetest project assists you in setting up ENLIVEN subgame and provides scripts to run it on minetestserver as current user (must be sudoer). DISCLAIMERS: -* Please see included LICENSE.txt (MIT license normally) +* Please see included LICENSE.txt (MIT license normally). The license in the file is the fallback license for everything included where license is not otherwise specified. * The original EnlivenMinetest project is found at https://github.com/expertmm/EnlivenMinetest * Any script code related to redis has not been successfully tested. * Make sure you convert your world to leveldb and place it in your server's worlds folder $HOME/.minetest/worlds/, as this set of scripts hasn't been tested with any other database nor worlds folder location, and nightly backup scripts cater to leveldb. @@ -37,6 +37,7 @@ Otherwise just install everything EXCEPT cme_to_spawners & tsm_pyramids_to_spawn ## Changes: +* (2017-02-06) Added installation of trmp_minetest_game to the installer script, since treasurer requires one or more trms in order to work (tested and working now on tsm_railcorridors) * (2017-02-06) Added optional trm_compassgps so that treasure could include a compass or map from the compassgps mod * (2017-02-06) Added optional mods for migrating from cme and from tsm_pyramids to spawners (should allow mods that depend on cme to be installed, and use mobs instead, though no mods in ENLIVEN are known to require cme currently) diff --git a/etc/Mods,WIP/cme_to_spawners/README.txt b/etc/Mods,WIP/cme_to_spawners/README.txt index 8815adf..72919db 100644 --- a/etc/Mods,WIP/cme_to_spawners/README.txt +++ b/etc/Mods,WIP/cme_to_spawners/README.txt @@ -1,7 +1,6 @@ Minetest Game mod: cme_to_spawners ========================= -See license.txt for license information. -This mod provides a transition from cme (Creatures Mob Engine) so you can use "spawners" mod instead, which uses mobs redo monsters (and a new spawners:mummy). +This mod provides a transition from cme (Creatures Mob Engine) so you can use "spawners" mod instead, which uses mobs_monsters [mobs redo monsters] and a new spawners:mummy. Authors of source code ---------------------- diff --git a/etc/Mods,WIP/cme_to_spawners/depends.txt b/etc/Mods,WIP/cme_to_spawners/depends.txt index ff9e84e..00da52c 100644 --- a/etc/Mods,WIP/cme_to_spawners/depends.txt +++ b/etc/Mods,WIP/cme_to_spawners/depends.txt @@ -1,5 +1,6 @@ default -spawners +farming mobs mobs_monster -farming \ No newline at end of file +mobs_animal +spawners diff --git a/etc/Mods,WIP/cme_to_spawners/init.lua b/etc/Mods,WIP/cme_to_spawners/init.lua index f0e044e..0e566d4 100644 --- a/etc/Mods,WIP/cme_to_spawners/init.lua +++ b/etc/Mods,WIP/cme_to_spawners/init.lua @@ -1,3 +1,8 @@ +-- Copyright 2017 expertmm +-- Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +-- The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + -- minetest.register_alias(name, convert_to) -- "This means that if the engine finds nodes with the name name in the world the node with the name convert_to is used instead. " -- diff --git a/etc/Mods,WIP/cme_to_spawners/license.txt b/etc/Mods,WIP/cme_to_spawners/license.txt deleted file mode 100644 index a5156ae..0000000 --- a/etc/Mods,WIP/cme_to_spawners/license.txt +++ /dev/null @@ -1,51 +0,0 @@ -License of source code ----------------------- - -GNU Lesser General Public License, version 2.1 -Copyright (C) 2011-2016 Kahrl -Copyright (C) 2011-2016 celeron55, Perttu Ahola -Copyright (C) 2011-2016 Various Minetest developers and contributors - -This program 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 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: -https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html - - -Licenses of media (textures) ----------------------------- - -Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) -Copyright (C) 2015-2016 ElementW - -You are free to: -Share — copy and redistribute the material in any medium or format. -Adapt — remix, transform, and build upon the material for any purpose, even commercially. -The licensor cannot revoke these freedoms as long as you follow the license terms. - -Under the following terms: - -Attribution — You must give appropriate credit, provide a link to the license, and -indicate if changes were made. You may do so in any reasonable manner, but not in any way -that suggests the licensor endorses you or your use. - -ShareAlike — If you remix, transform, or build upon the material, you must distribute -your contributions under the same license as the original. - -No additional restrictions — You may not apply legal terms or technological measures that -legally restrict others from doing anything the license permits. - -Notices: - -You do not have to comply with the license for elements of the material in the public -domain or where your use is permitted by an applicable exception or limitation. -No warranties are given. The license may not give you all of the permissions necessary -for your intended use. For example, other rights such as publicity, privacy, or moral -rights may limit how you use the material. - -For more details: -http://creativecommons.org/licenses/by-sa/3.0/ diff --git a/etc/Mods,WIP/trm_compassgps/init.lua b/etc/Mods,WIP/trm_compassgps/init.lua index 8a2cc27..c7f0f6c 100644 --- a/etc/Mods,WIP/trm_compassgps/init.lua +++ b/etc/Mods,WIP/trm_compassgps/init.lua @@ -1,2 +1,7 @@ +-- Copyright 2017 expertmm +-- Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +-- The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + treasurer.register_treasure("compassgps:0",0.02,3,1,nil,"tool") treasurer.register_treasure("compassgps:cpgpsmap",0.02,3,1,nil,"tool") diff --git a/etc/Mods,WIP/tsm_pyramids_to_spawners/README.txt b/etc/Mods,WIP/tsm_pyramids_to_spawners/README.txt index 41c4128..faa30d0 100644 --- a/etc/Mods,WIP/tsm_pyramids_to_spawners/README.txt +++ b/etc/Mods,WIP/tsm_pyramids_to_spawners/README.txt @@ -1,8 +1,6 @@ Minetest Game mod: tsm_pyramids_to_pyramids -========================= -See license.txt for license information. -actually requires either spawners or pyramids. -This mod provides a transition from tsm_pyramids so you can use "spawners" mod instead, which uses the pyramids namespace but replaces the pyramids mod. +=========================================== +This mod provides a transition from tsm_pyramids so you can use "spawners" mod instead, which also uses the pyramids namespace but replaces the pyramids mod. Authors of source code ---------------------- diff --git a/etc/Mods,WIP/tsm_pyramids_to_spawners/depends.txt b/etc/Mods,WIP/tsm_pyramids_to_spawners/depends.txt index 3a7daa1..06b2e13 100644 --- a/etc/Mods,WIP/tsm_pyramids_to_spawners/depends.txt +++ b/etc/Mods,WIP/tsm_pyramids_to_spawners/depends.txt @@ -1,2 +1,2 @@ default - +spawners diff --git a/etc/Mods,WIP/tsm_pyramids_to_spawners/init.lua b/etc/Mods,WIP/tsm_pyramids_to_spawners/init.lua index 7ec4799..9c04981 100644 --- a/etc/Mods,WIP/tsm_pyramids_to_spawners/init.lua +++ b/etc/Mods,WIP/tsm_pyramids_to_spawners/init.lua @@ -1,3 +1,8 @@ +-- Copyright 2017 expertmm +-- Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +-- The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + -- minetest.register_alias("name", "convert_to") -- "This means that if the engine finds nodes with the name name in the world the node with the name convert_to is used instead." -- from https://dev.minetest.net/minetest.register_alias @@ -22,7 +27,7 @@ -- minetest.register_alias("pyramids:trap", "tsm_pyramids:trap") -- minetest.register_alias("pyramids:trap_2", "tsm_pyramids:trap_2") --- BELOW is copied from spawners but pyramids is changed to tsm_pyramids +-- BELOW uses the backwards compatibility from spawners but pyramids is changed to tsm_pyramids -- -- backwards compatibility -- diff --git a/etc/Mods,WIP/tsm_pyramids_to_spawners/license.txt b/etc/Mods,WIP/tsm_pyramids_to_spawners/license.txt deleted file mode 100644 index a5156ae..0000000 --- a/etc/Mods,WIP/tsm_pyramids_to_spawners/license.txt +++ /dev/null @@ -1,51 +0,0 @@ -License of source code ----------------------- - -GNU Lesser General Public License, version 2.1 -Copyright (C) 2011-2016 Kahrl -Copyright (C) 2011-2016 celeron55, Perttu Ahola -Copyright (C) 2011-2016 Various Minetest developers and contributors - -This program 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 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: -https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html - - -Licenses of media (textures) ----------------------------- - -Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) -Copyright (C) 2015-2016 ElementW - -You are free to: -Share — copy and redistribute the material in any medium or format. -Adapt — remix, transform, and build upon the material for any purpose, even commercially. -The licensor cannot revoke these freedoms as long as you follow the license terms. - -Under the following terms: - -Attribution — You must give appropriate credit, provide a link to the license, and -indicate if changes were made. You may do so in any reasonable manner, but not in any way -that suggests the licensor endorses you or your use. - -ShareAlike — If you remix, transform, or build upon the material, you must distribute -your contributions under the same license as the original. - -No additional restrictions — You may not apply legal terms or technological measures that -legally restrict others from doing anything the license permits. - -Notices: - -You do not have to comply with the license for elements of the material in the public -domain or where your use is permitted by an applicable exception or limitation. -No warranties are given. The license may not give you all of the permissions necessary -for your intended use. For example, other rights such as publicity, privacy, or moral -rights may limit how you use the material. - -For more details: -http://creativecommons.org/licenses/by-sa/3.0/ diff --git a/etc/change_world_name_manually_first/backup-mts-world b/etc/change_world_name_manually_first/backup-mts-world index e0ce66b..d505e98 100644 --- a/etc/change_world_name_manually_first/backup-mts-world +++ b/etc/change_world_name_manually_first/backup-mts-world @@ -1,4 +1,8 @@ #!/bin/sh +# Copyright 2017 expertmm +# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. date_string=`date +%Y-%m-%d` MT_WORLDS_PATH=$HOME/.minetest/worlds diff --git a/etc/change_world_name_manually_first/game-install-ENLIVEN b/etc/change_world_name_manually_first/game-install-ENLIVEN index 29a5fa3..91c82e8 100644 --- a/etc/change_world_name_manually_first/game-install-ENLIVEN +++ b/etc/change_world_name_manually_first/game-install-ENLIVEN @@ -1,4 +1,8 @@ #!/bin/sh +# Copyright 2017 expertmm +# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #First make sure all folders in $HOME/.minetest are created (I am not sure whether this is required!): # minetestserver diff --git a/etc/network/Logon/minetest_userscript_localENLIVEN_server_only.vbs b/etc/network/Logon/minetest_userscript_localENLIVEN_server_only.vbs index fd22a3d..1815578 100644 --- a/etc/network/Logon/minetest_userscript_localENLIVEN_server_only.vbs +++ b/etc/network/Logon/minetest_userscript_localENLIVEN_server_only.vbs @@ -1,3 +1,8 @@ +' Copyright 2017 expertmm +' Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +' The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +' THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + On Error Resume Next Set objFSO = CreateObject("Scripting.FileSystemObject")