Update to current Eressea code