Merge branch 'sfinv' of github.com:rubenwardy/unified_inventory

This commit is contained in:
Vanessa Ezekowitz 2016-11-27 03:52:34 -05:00
commit e0ddd94aa3
2 changed files with 7 additions and 1 deletions

View File

@ -1,5 +1,6 @@
default
creative?
sfinv?
intllib?
datastorage?
farming?

View File

@ -65,6 +65,12 @@ if creative then
end
end
-- Disable sfinv inventory
local sfinv = rawget(_G, "sfinv")
if sfinv then
sfinv.enabled = false
end
dofile(modpath.."/group.lua")
dofile(modpath.."/api.lua")
dofile(modpath.."/internal.lua")
@ -77,4 +83,3 @@ dofile(modpath.."/item_names.lua")
if minetest.get_modpath("datastorage") then
dofile(modpath.."/waypoints.lua")
end