Merge https://github.com/0ADMods/Aristeia

Signed-off-by: lionkanzen <lion.kanzen@gmail.com>