blitzmann 6fdcce12a3 Merge branch 'icons-1621' into v2.2.0b1 ...

# Conflicts:
#	eos/db/__init__.py
#	eos/db/gamedata/__init__.py
#	eos/db/gamedata/item.py
#	eos/gamedata.py
#	eve.db

2018-06-12 21:43:28 -04:00

..

db

Merge branch 'icons-1621' into v2.2.0b1

2018-06-12 21:43:28 -04:00

effects

Penalized drone velocity rigs (#1630)

2018-06-06 00:25:45 -04:00

graph

Fix fighter DPS graph (#1521)

2018-05-27 16:29:47 -04:00

saveddata

Merge branch 'icons-1621' into v2.2.0b1

2018-06-12 21:43:28 -04:00

__init__.py

Roll up #967 and #974

2017-02-08 13:12:54 -08:00

capSim.py

Merge branch 'master' into test-3

2018-03-25 03:03:59 -04:00

config.py

* Update database (unpublish Abyssal items, for now)

2018-05-29 19:37:55 -04:00

effectHandlerHelpers.py

Implement working character associations with SSO character

2018-03-14 17:53:48 -04:00

enum.py

Convert old style classes to new

2017-02-08 23:06:39 -08:00

eqBase.py

Tox fixes

2017-02-09 00:59:22 -08:00

events.py

py2to3 automatic conversion. Woot!

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

gamedata.py

Merge branch 'icons-1621' into v2.2.0b1

2018-06-12 21:43:28 -04:00

lgpl.txt

Set files to 644 besides pyfa.py and scripts

2014-07-30 21:23:27 -04:00

modifiedAttributeDict.py

Move some functionality tot he mutator object, and clean some stuff up

2018-06-11 23:09:21 -04:00