Merge branch 'master' into feature/alphaclones

Conflicts:
	eve.db
This commit is contained in:
blitzmann
2017-01-26 19:39:13 -05:00
383 changed files with 890 additions and 2072 deletions

6891
scripts/iconIDs.yaml Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@@ -9,7 +9,7 @@ import json
iconDict = {}
stream = open(r"C:\path\to\sde\fsd\iconIDs.yaml", "r")
stream = open(r"C:\Users\Ryan\Sync\Git\blitzmann\Pyfa\scripts\iconIDs.yaml", "r")
docs = yaml.load_all(stream)
for doc in docs: