From 88e087650f1d332685a68aa535c2b1b142329b81 Mon Sep 17 00:00:00 2001 From: AntumDeluge Date: Sat, 13 May 2017 04:38:43 -0700 Subject: [PATCH] [moreblocks] Update to Git commit 786f9e4: https://github.com/AntumDeluge/mtmod-moreblocks/tree/786f9e4 --- README.md | 3 ++- mods/buildings/moreblocks/config.lua | 4 ++-- mods/buildings/moreblocks/crafting.lua | 2 +- mods/buildings/moreblocks/init.lua | 2 +- mods/buildings/moreblocks/stairsplus/init.lua | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index e0c58180..f978b79d 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m * [christmas][] ([MIT][lic.christmas]) -- version [d3bd872 Git][ver.christmas] *2013-01-11* ([patched][patch.christmas]) * [elevator][] ([WTFPL][lic.elevator]) * [fort_spikes][] ([MIT][lic.fort_spikes] / [CC0][lic.cc0]) -- version: [2765b56 Git][ver.fort_spikes] *2017-04-07* ([patched][patch.fort_spikes]) - * [moreblocks][] ([zlib][lic.moreblocks]) -- version: [fbfb079 Git][ver.moreblocks] *2017-03-14* + * [moreblocks][] ([zlib][lic.moreblocks]) -- version: [fbfb079 Git][ver.moreblocks] *2017-03-14* ([patched][patch.moreblocks]) * [stairsplus][] ([zlib][lic.stairsplus]) -- version: [311e1f0 Git][ver.stairsplus] *2013-05-30* * [windmill][] ([WTFPL][lic.windmill]) -- version: [47b029d Git][ver.windmill] *2014-08-21* ([patched][patch.windmill]) * [campfire][] ([GPL][lic.gpl2.0] / [CC BY-SA][lic.ccbysa] / [WTFPL][lic.campfire]) -- version: [b45acd2 Git][ver.campfire] *2016-02-18* ([patched][patch.campfire]) @@ -496,6 +496,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m [patch.mobf_core]: https://github.com/AntumDeluge/mtmp-mobf_core/tree/e6fa3b7 [patch.mobs_goblins]: https://github.com/AntumDeluge/mtmod-mobs_goblins/tree/8813304 [patch.mobs_redo]: https://github.com/AntumDeluge/mtmod-mobs_redo/tree/58e123a +[patch.moreblocks]: https://github.com/AntumDeluge/mtmod-moreblocks/tree/786f9e4 [patch.moremesecons]: https://github.com/AntumDeluge/mtmp-moremesecons/tree/caa71bc [patch.moreores]: https://github.com/AntumDeluge/mtmod-moreores/tree/2172c49 [patch.mydoors]: https://github.com/AntumDeluge/mtmp-mydoors/tree/e36c9d1 diff --git a/mods/buildings/moreblocks/config.lua b/mods/buildings/moreblocks/config.lua index da5cd6ef..8d49c3b5 100644 --- a/mods/buildings/moreblocks/config.lua +++ b/mods/buildings/moreblocks/config.lua @@ -8,7 +8,7 @@ Licensed under the zlib license. See LICENSE.md for more information. moreblocks.config = {} local function getbool_default(setting, default) - local value = minetest.setting_getbool(setting) + local value = minetest.settings:get_bool(setting) if value == nil then value = default end @@ -21,7 +21,7 @@ local function setting(settingtype, name, default) getbool_default("moreblocks." .. name, default) else moreblocks.config[name] = - minetest.setting_get("moreblocks." .. name) or default + minetest.settings:get("moreblocks." .. name) or default end end diff --git a/mods/buildings/moreblocks/crafting.lua b/mods/buildings/moreblocks/crafting.lua index 88862b75..8741c531 100644 --- a/mods/buildings/moreblocks/crafting.lua +++ b/mods/buildings/moreblocks/crafting.lua @@ -454,7 +454,7 @@ minetest.register_craft({ } }) -if minetest.setting_getbool("moreblocks.circular_saw_crafting") ~= false then -- “If nil or true then” +if minetest.settings:get_bool("moreblocks.circular_saw_crafting") ~= false then -- “If nil or true then” minetest.register_craft({ output = "moreblocks:circular_saw", recipe = { diff --git a/mods/buildings/moreblocks/init.lua b/mods/buildings/moreblocks/init.lua index 5e7fc6b4..2e7dc7ac 100644 --- a/mods/buildings/moreblocks/init.lua +++ b/mods/buildings/moreblocks/init.lua @@ -28,6 +28,6 @@ dofile(modpath .. "/redefinitions.lua") dofile(modpath .. "/crafting.lua") dofile(modpath .. "/aliases.lua") -if minetest.setting_getbool("log_mods") then +if minetest.settings:get_bool("log_mods") then minetest.log("action", S("[moreblocks] loaded.")) end diff --git a/mods/buildings/moreblocks/stairsplus/init.lua b/mods/buildings/moreblocks/stairsplus/init.lua index 598f21c9..5cd415c5 100644 --- a/mods/buildings/moreblocks/stairsplus/init.lua +++ b/mods/buildings/moreblocks/stairsplus/init.lua @@ -15,7 +15,7 @@ stairsplus.expect_infinite_stacks = false stairsplus.shapes_list = {} if not minetest.get_modpath("unified_inventory") -and minetest.setting_getbool("creative_mode") then +and minetest.settings:get_bool("creative_mode") then stairsplus.expect_infinite_stacks = true end