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
..
armor	kill lua_canuse_item and itype->canuse	2017-03-04 17:27:13 +01:00
common	special cases, not callbacks, for money and horses.	2017-03-03 19:17:20 +01:00
de	Merge branch 'master' into develop	2017-03-11 07:22:49 +01:00
en	Merge branch 'master' into develop	2017-03-26 21:01:21 +02:00
fr	Test E2 items in E2 only.	2017-02-27 18:50:48 +01:00
resources	Merge branch 'master' into develop	2017-03-26 21:01:21 +02:00
spellbooks	Convert all XML files to UTF-8, to allow editing with Atom.	2015-05-11 16:55:11 -07:00
weapons	kill lua_canuse_item and itype->canuse	2017-03-04 17:27:13 +01:00
calendar.xml	fix off-by-one calendar, bug 2288	2017-03-01 08:28:15 +01:00
messages.xml	remove leftover code/data for artrewards.	2017-03-16 19:40:51 +01:00
prefixes.xml	removing the core directory (moving to res and scripts).	2014-07-28 14:27:30 +02:00
ships.xml	reqsize defaults to 1.	2016-08-06 13:53:07 +02:00
spells.xml	removing the core directory (moving to res and scripts).	2014-07-28 14:27:30 +02:00
spoils.xml	removing the core directory (moving to res and scripts).	2014-07-28 14:27:30 +02:00