Enno Rehling f2bb51b3ab Merge branch 'master' into develop ... Conflicts: res/adamantium.xml res/core/resources/laen.xml scripts/tests/common.lua scripts/tests/e2/adamantium.lua scripts/tests/e2/e2features.lua scripts/tests/e2/items.lua scripts/tests/items.lua src/bind_unit.c src/economy.test.c src/kernel/resources.c src/util/attrib.c		2017-03-26 21:01:21 +02:00
..
eressea	remove attribs from rtype (it's only in rtype->construction that we use it?)	2017-03-17 22:46:10 +01:00
tests	Merge branch 'master' into develop	2017-03-26 21:01:21 +02:00
tools	always call close() in lua when you're done with a file.	2016-09-11 19:32:54 +02:00
config.lua	minimal script to load configuration in an interactive session	2015-03-07 14:33:38 +01:00
fix1984.lua	refactor, move give_cmd into give.c	2014-11-03 08:44:26 +01:00
fixfamiliars.lua	just a script for fixing broken familiar links between releases	2015-09-15 17:43:22 +02:00
kill-planes.lua	verify data after deleting planes, do not delete plane 50 (yet)	2016-08-18 19:11:26 +02:00
map.lua	map script needs to set up the script folder.	2014-08-12 23:06:44 +02:00
newplayer.lua	control log level from command line (with -l, like -v)	2016-07-30 22:46:57 +02:00
populate.lua	require trees for new player regions	2015-07-28 10:51:14 +02:00
reports.lua	fix string concatenation operator	2014-10-16 14:33:20 +02:00
run-tests-e2.lua	no snowglobe in E3	2015-12-26 11:20:37 +01:00
run-tests-e3.lua	no snowglobe in E3	2015-12-26 11:20:37 +01:00
run-tests.lua	failed tests abort runtests and return an error code	2015-05-21 08:29:22 +02:00
run-turn.lua	fix bad read_orders call	2017-02-12 06:24:25 +01:00