Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
server/res/core
History
Enno Rehling c3ed521d4f Merge branch 'version-3-4' of https://github.com/badgerman/eressea into badgerman-version-3-4 
Conflicts:
	src/laws.c
 		2015-01-29 18:03:21 +01:00
..
armor removing the core directory (moving to res and scripts). 2014-07-28 14:27:30 +02:00
common disable silver weight for the initial rollout of version 3.4 2015-01-29 16:56:21 +01:00
de type in spell description (bug 2061). 2014-12-31 22:43:08 +01:00
en BREED/PLANT/GROW are technically the same command, merge them. 2015-01-04 15:11:49 +01:00
fr removing the core directory (moving to res and scripts). 2014-07-28 14:27:30 +02:00
resources removing the core directory (moving to res and scripts). 2014-07-28 14:27:30 +02:00
spellbooks removing the core directory (moving to res and scripts). 2014-07-28 14:27:30 +02:00
weapons removing the core directory (moving to res and scripts). 2014-07-28 14:27:30 +02:00
calendar.xml removing the core directory (moving to res and scripts). 2014-07-28 14:27:30 +02:00
messages.xml add a message to the unit that gets kicked, with tests 2015-01-13 07:43:30 +01:00
prefixes.xml removing the core directory (moving to res and scripts). 2014-07-28 14:27:30 +02:00
ships.xml removing the core directory (moving to res and scripts). 2014-07-28 14:27:30 +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
terrains.xml removing the core directory (moving to res and scripts). 2014-07-28 14:27:30 +02:00