Merge branch 'master' into nalc

This commit is contained in:
sys4-fr
2019-02-08 18:27:56 +01:00
10 changed files with 1204 additions and 1208 deletions

View File

@ -2,17 +2,13 @@
factions_modpath = minetest.get_modpath("factions")
dofile (factions_modpath .. "/config.lua")
dofile (factions_modpath .. "/misc_mod_data.lua")
dofile (factions_modpath .. "/hud.lua")
dofile (factions_modpath .. "/ip.lua")
dofile (factions_modpath .. "/factions.lua")
dofile (factions_modpath .. "/chatcommands.lua")
dofile (factions_modpath .. "/nodes.lua")
dofile (factions_modpath .. "/convert.lua")
factions.load()
misc_mod_data.check_file()
minetest.after(1,hudUpdateClaimInfo)
minetest.after(1,factionUpdate)
minetest.after(1, hudUpdateClaimInfo)
minetest.after(factions_config.tick_time, factionUpdate)
minetest.log("action", "[factions] loaded.")