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

@ -303,6 +303,6 @@ end
function unified_inventory.is_creative(playername)
return minetest.check_player_privs(playername, {creative=true})
or minetest.setting_getbool("creative_mode")
or minetest.settings:get_bool("creative_mode")
end