Merge branch 'version-3-0'

Conflicts:
	conf/e3/config.xml

conf/e3/config.xml

@@ -118,7 +118,7 @@
     <param name="study.speedup" value="0"/>
     <param name="world.era" value="3"/>
     <param name="rules.migrants" value="0"/>
-    <param name="rules.monsters.attack_chance" value="0.1"/>
+    <param name="rules.monsters.attack_chance" value="0.0"/>
     <param name="rules.transfermen" value="0"/>
     <param name="rules.stealth.faction" value="1"/>
     <param name="rules.stealth.anon_battle" value="0"/>

critbit

@@ -1 +1 @@
-Subproject commit 2d901a238b98b14204f9118abc5040ff4904052c
+Subproject commit 2a7af5e2347217ea4efcf7fb3f0bc9c2681d1a17

s/preview

@@ -83,10 +83,10 @@ let turn=$turn+1
 }
 
 function send() {
-echo "sending reports to $1"
 zip="$turn-$1.zip"
 zip -q -u $zip $turn-$1.?r
 email=$(grep "faction=$1:" reports.txt | cut -d: -f2 | sed 's/email=//')
+echo "sending reports to $1 / $email"
 cat /dev/null | mutt -F $ERESSEA/etc/muttrc -s "Testauswertung Spiel $GAME Partei $1" -a $zip -- $email
 }
 
@@ -153,8 +153,8 @@ case "$1" in
     sent=1
   done
   if [ $sent -eq 0 ]; then
-    if [ -e $factions ]; then
-      for faction in $(cat $factions) ; do
+    if [ -e ../$factions ]; then
+      for faction in $(cat ../$factions) ; do
         send $faction
       done
     fi

src/build.h

@@ -1,3 +1,3 @@
 #define VERSION_MAJOR 3
-#define VERSION_MINOR 0
-#define VERSION_BUILD 682
+#define VERSION_MINOR 1
+#define VERSION_BUILD 683

src/kernel/order.c

@@ -256,6 +256,11 @@ static order *create_order_i(keyword_t kwd, const char *sptr, int persistent,
     order *ord = NULL;
     int lindex;
 
+    if (keyword_disabled(kwd)) {
+        log_error("trying to create an order for disabled keyword %s.", keyword(kwd));
+        return NULL;
+    }
+    
     /* if this is just nonsense, then we skip it. */
     if (lomem) {
         switch (kwd) {