Merge branch 'wip' into testing

This commit is contained in:
Unknown
2018-01-01 13:48:33 +00:00
2 changed files with 8 additions and 1 deletions

View File

@@ -8,6 +8,12 @@ Discord: https://discord.gg/r6dC2uK
]]
--Please Only Edit Below This Line-----------------------------------------------------------
local return_err = false
local _require = require
local function require(path)
local success, err = pcall(_require,path)
if not success and return_err then error(err) end
end
-- this file will just contain all the diffrent requires
-- admin dir

View File

@@ -44,6 +44,7 @@ pcall(require,'/Addons/playerRanks')
-- this makes sure that all the little details are cleaned up
Ranking._auto_edit_ranks()
-- this loads all the addons
pcall(require,'Addons/load')
local success,err = pcall(require,'Addons/load')
if not success then error(err) end
-- this loads anything that does not use ExpCore (sourse given in the file)
pcall(require,'StandAlone/load')