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
|
e114aa2854
|
also add +1 when producing adamantium in mines
|
2017-03-26 20:32:09 +02:00 |
|
Enno Rehling
|
6e27adb892
|
remove pointless <resourcelimit/> wrapper from XML.
|
2017-02-26 14:00:20 +01:00 |
|
Enno Rehling
|
84c6a4b7b5
|
remove last vestiges of the rm_* material names
|
2017-02-25 21:25:55 +01:00 |
|
Enno Rehling
|
5e2903258c
|
kill old <guard/> element from XML
|
2017-02-23 14:45:19 +01:00 |
|
Enno Rehling
|
e2808eeea9
|
reqsize defaults to 1.
remove default values from xml to make it smaller and simpler.
|
2016-08-06 13:53:07 +02:00 |
|
Enno Rehling
|
a4774be652
|
Convert all XML files to UTF-8, to allow editing with Atom.
|
2015-05-11 16:55:11 -07:00 |
|
Enno Rehling
|
a485f65562
|
new config files
|
2014-04-24 09:14:29 +02:00 |
|