server

8,364 Commits 10 Branches 0 Tags 41 MiB

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	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	2c0f708d1b	WIP: remove at_guard, GUARD_TREES and GUARD_MINING TODO: fix tests TODO: write new guard coverage	2016-10-30 09:18: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	bd2809a975	removing the core directory (moving to res and scripts). it's from when open-source Eressea was limited, and we no longer need the separation. JSON configuration for ship flags.	2014-07-28 14:27:30 +02:00

Renamed from core/res/resources/laen.xml (Browse further)