Merge branch 'master' of github.com:ennorehling/eressea

This commit is contained in:
Enno Rehling 2020-05-01 17:03:45 +02:00
commit 8bd3cc6bad
4 changed files with 4 additions and 4 deletions

2
clibs

@ -1 +1 @@
Subproject commit abe774f70265de14ea7f5e530518ca130562a9c9
Subproject commit 484fbf23e34f6844f1c4e3f685bb6c53cadf5bfe

View File

@ -11,11 +11,11 @@ package.path = package.path .. ';' .. path .. '/?.lua;' .. path .. '/?/init.lua'
config.rules = 'e2'
lunit = require 'lunit'
require 'eressea'
require 'eressea.xmlconf'
require 'eressea.path'
require 'tests.e2'
require 'lunit'
rng.inject(0)
eressea.settings.set("rules.food.flags", "4")

View File

@ -11,11 +11,11 @@ package.path = package.path .. ';' .. path .. '/?.lua;' .. path .. '/?/init.lua'
config.rules = 'e3'
lunit = require 'lunit'
require 'eressea'
require 'eressea.path'
require 'eressea.xmlconf'
require 'tests.e3'
require 'lunit'
rng.inject(0)
eressea.settings.set("rules.alliances", "0")

View File

@ -9,9 +9,9 @@ if config.install then
end
package.path = package.path .. ';' .. path .. '/?.lua;' .. path .. '/?/init.lua'
lunit = require 'lunit'
require 'eressea'
require 'eressea.path'
require 'tests'
require 'lunit'
result = lunit.main()
return result.errors + result.failed