blitzmann 40ce7b7c0b Merge branch 'master' into test-3 ...

# Conflicts:
#	.gitignore
#	eos/saveddata/character.py
#	service/network.py
#	service/price.py

2017-12-10 22:36:15 -05:00

..

conversion.py

py2to3 automatic conversion. Woot!

2017-06-12 16:12:45 -04:00

dist.py

py2to3 automatic conversion. Woot!

2017-06-12 16:12:45 -04:00

effectUsedBy.py

Merge branch 'master' into test-3

2017-12-10 22:36:15 -05:00

findNonMarket.py

py2to3 automatic conversion. Woot!

2017-06-12 16:12:45 -04:00

iconIDs.yaml

Release/v1.33.0 (#1319)

2017-10-25 23:33:05 -04:00

icons_update.py

py2to3 automatic conversion. Woot!

2017-06-12 16:12:45 -04:00

icons.json

Release/v1.33.0 (#1319)

2017-10-25 23:33:05 -04:00

itemDiff.py

Merge branch 'master' into test-3

2017-11-23 11:19:05 -05:00

jsonToSql.py

Merge branch 'master' into test-3

2017-12-10 22:36:15 -05:00

prep_data.py

py2to3 automatic conversion. Woot!

2017-06-12 16:12:45 -04:00

pyfa-setup.iss

Update forum references (#1301)

2017-09-24 18:00:21 -04:00

renders_update.py

py2to3 automatic conversion. Woot!

2017-06-12 16:12:45 -04:00

sdeReadIcons.py

py2to3 automatic conversion. Woot!

2017-06-12 16:12:45 -04:00

t3conversions.py

Implement migration for t3c configurations

2017-07-09 00:34:12 -04:00

t3conversionSheet.csv

Implement migration for t3c configurations

2017-07-09 00:34:12 -04:00

t3conversionSheetLoose.csv

Implement migration for t3c configurations

2017-07-09 00:34:12 -04:00

upx.exe

build improvements

2017-02-08 13:18:51 -08:00