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
..
cart.xml	reqsize defaults to 1.	2016-08-06 13:53:07 +02:00
horse.xml	special cases, not callbacks, for money and horses.	2017-03-03 19:17:20 +01:00
hp.xml	remove rtype->uget funpointer, and lua callbacks.	2017-03-04 20:59:43 +01:00
iron.xml	remove pointless <resourcelimit/> wrapper from XML.	2017-02-26 14:00:20 +01:00
laen.xml	Merge branch 'master' into develop	2017-03-26 21:01:21 +02:00
log.xml	remove pointless <resourcelimit/> wrapper from XML.	2017-02-26 14:00:20 +01:00
mallorn.xml	remove pointless <resourcelimit/> wrapper from XML.	2017-02-26 14:00:20 +01:00
mallornseed.xml	fix missing limit-flags.	2017-02-26 13:47:22 +01:00
peasant.xml	remove rtype->uget funpointer, and lua callbacks.	2017-03-04 20:59:43 +01:00
seed.xml	fix missing limit-flags.	2017-02-26 13:47:22 +01:00
stone.xml	remove pointless <resourcelimit/> wrapper from XML.	2017-02-26 14:00:20 +01:00