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
|
7c19746d84
|
adjust adamantium test to new rule.
|
2017-03-26 20:33:48 +02:00 |
|
Enno Rehling
|
dcf1c7138b
|
make region:set_resource do the right thing
also for adamantium
|
2017-03-26 14:33:14 +02:00 |
|
Enno Rehling
|
485e8f0ce4
|
Revert "add failing test for skill bonus from mine, start work"
This reverts commit ab87b1da85.
|
2017-03-23 19:28:56 +01:00 |
|
Enno Rehling
|
ab87b1da85
|
add failing test for skill bonus from mine, start work
|
2017-03-23 18:51:30 +01:00 |
|
Enno Rehling
|
68e36e9252
|
test that adamantium requires a mine
|
2017-03-23 08:29:24 +01:00 |
|
Enno Rehling
|
17145eaf10
|
make region:set_resource do the right thing
also for adamantium
|
2017-03-22 20:37:09 +01:00 |
|