From b9c8011b53db3ba54f0759f49b1633d228d21a5b Mon Sep 17 00:00:00 2001 From: Calinou Date: Tue, 6 Jan 2015 20:35:38 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20issue=20#2:=20=E2=80=9CCrash=20with=20mg?= =?UTF-8?q?=20mod=E2=80=9D,=20cleanup.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENSE.txt => LICENSE.md | 4 ++-- README.md | 11 +++++++++++ README.txt | 22 ---------------------- init.lua | 11 ++++++----- 4 files changed, 19 insertions(+), 29 deletions(-) rename LICENSE.txt => LICENSE.md (74%) create mode 100644 README.md delete mode 100644 README.txt diff --git a/LICENSE.txt b/LICENSE.md similarity index 74% rename from LICENSE.txt rename to LICENSE.md index 76c1791..45c5ff5 100644 --- a/LICENSE.txt +++ b/LICENSE.md @@ -1,9 +1,9 @@ zlib license ============ -Copyright (c) 2011-2014 Calinou and contributors +Copyright (c) 2011-2015 Calinou and contributors -This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. +**This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.** Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: diff --git a/README.md b/README.md new file mode 100644 index 0000000..f54dda7 --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ +More Ores +========= + +More Ores for Minetest , a free/libre infinite +world block sandbox game. + +To install, just clone this repository into your "mods" directory. + +More Ores code is licensed under the zlib license, textures are by Calinou and are licensed under CC BY-SA 3.0 Unported. + +**Forum topic:** diff --git a/README.txt b/README.txt deleted file mode 100644 index 4c15581..0000000 --- a/README.txt +++ /dev/null @@ -1,22 +0,0 @@ -Calinou's Minetest Mods -===================== - -Calinou's Mods for Minetest [http://minetest.net], a free and opensource Minecraft-like game. - -This Git repository is mostly made for servers; it allows easy updating. - -To install, just clone this repository somewhere, then copy the "calinou_mods" folder in the "mods/minetest" folder of Minetest's installation folder. - - - -Misc stuff -===================== - -All these mods' source codes, except More Ores are under the zlib/libpng license. More Ores is under the GNU GPLv3; the mods' textures are under the CC BY-SA 3.0 Unported. - -Mods' forum threads: -More Blocks: http://minetest.net/forum/viewtopic.php?id=509 -More Ores: http://minetest.net/forum/viewtopic.php?id=549 -Map Tools: http://minetest.net/forum/viewtopic.php?id=1882 -Doors+: http://minetest.net/forum/viewtopic.php?id=2059 -Stairs+: http://minetest.net/forum/viewtopic.php?id=2092 diff --git a/init.lua b/init.lua index e998f2a..0622405 100644 --- a/init.lua +++ b/init.lua @@ -3,7 +3,7 @@ ** More Ores ** By Calinou, with the help of Nore. -Copyright (c) 2011-2014 Calinou and contributors. +Copyright (c) 2011-2015 Calinou and contributors. Licensed under the zlib license. See LICENSE.txt for more information. ====================================================================== --]] @@ -19,6 +19,11 @@ local modpath = minetest.get_modpath("moreores") dofile(modpath .. "/_config.txt") +-- `mg` support: +if minetest.get_modpath("mg") then + dofile(modpath .. "/mg.lua") +end + -- Utility functions -- ================= @@ -354,10 +359,6 @@ minetest.register_node("moreores:copper_rail", { }, }) --- `mg` support: -if minetest.get_modpath("mg") then - dofile(moreores_modpath.."/mg.lua") -end if minetest.setting_getbool("log_mods") then minetest.log("action", S("[moreores] loaded."))