server/res/eressea
Enno Rehling 2aafb841a5 Merge branch 'master' into develop
Conflicts:
	res/core/messages.xml
	scripts/eressea/e3/init.lua
	scripts/eressea/xmas.lua
	scripts/eressea/xmasitems.lua
	src/buildno.h
	src/laws.c
2015-12-26 14:46:20 +01:00
..
spellbooks
artrewards.xml
buildings.xml
equipment.xml
familiars.xml
items.xml putting all of the pieces together for the snow globe, with final use implementation still TBD 2015-12-22 18:46:42 +01:00
races.xml Merge pull request from ennorehling/braineaters 2015-12-10 22:12:38 +01:00
spellinfo.xml
spells.xml issue , fix writing spell description for break_curse 2015-12-06 16:45:31 +01:00
strings.xml suppress misc warnings in the log file by reorganizing E3 strings and tuning down log levels 2015-12-18 15:13:15 +01:00