3 commits

Author	SHA1	Message	Date
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
Enno Rehling	39a5b55753	bugfix? mine grants +1 to laen production. ... not certain that this is actually a bug.	2017-03-26 17:40:13 +02:00
Enno Rehling	bd40de1142	additional testing for production rules.	2017-03-26 17:38:45 +02:00