Merge origin/master to refactor-translation branch (resolving conflicts)

This commit is contained in:
codexp
2018-06-23 15:37:13 +02:00
4 changed files with 107 additions and 48 deletions

View File

@ -1,4 +1,4 @@
-- Unified Inventory for Minetest 0.4.8+
-- Unified Inventory for Minetest >= 0.4.16
local modpath = minetest.get_modpath(minetest.get_current_modname())
local worldpath = minetest.get_worldpath()
@ -37,10 +37,10 @@ unified_inventory = {
gettext = S,
-- "Lite" mode
lite_mode = minetest.setting_getbool("unified_inventory_lite"),
lite_mode = minetest.settings:get_bool("unified_inventory_lite"),
-- Trash enabled
trash_enabled = (minetest.setting_getbool("unified_inventory_trash") ~= false),
trash_enabled = (minetest.settings:get_bool("unified_inventory_trash") ~= false),
pagecols = 8,
pagerows = 10,
@ -73,7 +73,7 @@ dofile(modpath.."/internal.lua")
dofile(modpath.."/callbacks.lua")
dofile(modpath.."/register.lua")
if minetest.setting_getbool("unified_inventory_bags") ~= false then
if minetest.settings:get_bool("unified_inventory_bags") ~= false then
dofile(modpath.."/bags.lua")
end