Merge branch 'master' into test-3

# Conflicts: # config.py # eos/effects/warpdisruptsphere.py # service/update.py
2018-03-25 13:16:07 -04:00
parent 03212be54a 7c376c93a2
commit 3fd4d106d9
50 changed files with 242 additions and 28 deletions
--- a/config.py
+++ b/config.py
@@ -21,10 +21,10 @@ saveInRoot = False

 # Version data

-version = "2.0.0b4"
+version = "2.0.0b5"
 tag = "git"
-expansionName = "YC120.2"
-expansionVersion = "1.2"
+expansionName = "YC120.3"
+expansionVersion = "1.8"
 evemonMinVersion = "4081"

 pyfaPath = None