Enno Rehling 84a92124bd Merge branch 'feature/bug-2053-attack-monsters' of https://github.com/ennorehling/eressea into ennorehling-feature/bug-2053-attack-monsters ... Conflicts: conf/e3/config.xml		2015-09-19 13:35:53 +02:00
..
e2	fix museum terrains	2015-09-13 10:05:52 +02:00
e3	Merge branch 'feature/bug-2053-attack-monsters' of https://github.com/ennorehling/eressea into ennorehling-feature/bug-2053-attack-monsters	2015-09-19 13:35:53 +02:00
e4	remove the game section from XML config	2015-09-12 18:15:36 +02:00
eressea.ini	diable test_peasantluck, it fails on master	2015-05-24 10:31:11 +02:00
keywords.json	BREED/PLANT/GROW are technically the same command, merge them.	2015-01-04 15:11:49 +01:00
prefixes.json	Präfix Erz	2015-09-12 14:13:45 +02:00