diff options
Diffstat (limited to 'moreblocks')
| -rw-r--r-- | moreblocks/circular_saw.lua | 2 | ||||
| -rw-r--r-- | moreblocks/config.lua | 4 | ||||
| -rw-r--r-- | moreblocks/crafting.lua | 2 | ||||
| -rw-r--r-- | moreblocks/init.lua | 10 | ||||
| -rw-r--r-- | moreblocks/stairsplus/init.lua | 2 | ||||
| -rw-r--r-- | moreblocks/stairsplus/registrations.lua | 7 |
6 files changed, 19 insertions, 8 deletions
diff --git a/moreblocks/circular_saw.lua b/moreblocks/circular_saw.lua index 7c4eb61..6c3a974 100644 --- a/moreblocks/circular_saw.lua +++ b/moreblocks/circular_saw.lua @@ -1,7 +1,7 @@ --[[ More Blocks: circular saw -Copyright (c) 2011-2017 Hugo Locurcio and contributors. +Copyright (c) 2011-2017 Hugo Locurcio, Sokomine and contributors. Licensed under the zlib license. See LICENSE.md for more information. --]] diff --git a/moreblocks/config.lua b/moreblocks/config.lua index da5cd6e..8d49c3b 100644 --- a/moreblocks/config.lua +++ b/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/moreblocks/crafting.lua b/moreblocks/crafting.lua index 88862b7..8741c53 100644 --- a/moreblocks/crafting.lua +++ b/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/moreblocks/init.lua b/moreblocks/init.lua index 5e7fc6b..c12f5e0 100644 --- a/moreblocks/init.lua +++ b/moreblocks/init.lua @@ -11,8 +11,12 @@ Licensed under the zlib license. See LICENSE.md for more information. moreblocks = {} local S -if minetest.get_modpath("intllib") then - S = intllib.Getter() +if minetest.global_exists("intllib") then + if intllib.make_gettext_pair then + S = intllib.make_gettext_pair() + else + S = intllib.Getter() + end else S = function(s) return s end end @@ -28,6 +32,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/moreblocks/stairsplus/init.lua b/moreblocks/stairsplus/init.lua index 598f21c..5cd415c 100644 --- a/moreblocks/stairsplus/init.lua +++ b/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 diff --git a/moreblocks/stairsplus/registrations.lua b/moreblocks/stairsplus/registrations.lua index 065bc9d..7c5ad50 100644 --- a/moreblocks/stairsplus/registrations.lua +++ b/moreblocks/stairsplus/registrations.lua @@ -17,6 +17,7 @@ local default_nodes = { -- Default stairs/slabs/panels/microblocks: "copperblock", "bronzeblock", "diamondblock", + "tinblock", "desert_stone", "desert_stone_block", "desert_cobble", @@ -39,6 +40,12 @@ local default_nodes = { -- Default stairs/slabs/panels/microblocks: "stonebrick", "desert_stonebrick", "sandstonebrick", + "silver_sandstone", + "silver_sandstone_brick", + "silver_sandstone_block", + "desert_sandstone", + "desert_sandstone_brick", + "desert_sandstone_block", "sandstone_block", "coral_skeleton", "farming:straw" |