blitzmann 48f96a7a32 Merge branch 'master' into wx3 ...

Conflicts:
	config.py
	staticdata/icons/icon01_08.png
	staticdata/icons/icon02_11.png
	staticdata/icons/icon105_46.png
	staticdata/icons/icon105_47.png
	staticdata/icons/icon105_48.png
	staticdata/icons/icon105_49.png
	staticdata/icons/icon108_5.png
	staticdata/icons/icon113_64_1.png
	staticdata/icons/icon113_64_2.png
	staticdata/icons/icon113_64_3.png
	staticdata/icons/icon34_16.png
	staticdata/icons/iconMarketIcon_16px_Amarr.png
	staticdata/icons/iconMarketIcon_16px_Caldari.png
	staticdata/icons/iconMarketIcon_16px_Gallente.png
	staticdata/icons/iconMarketIcon_16px_Minmatar.png

2015-08-15 10:50:58 -04:00

..

conversions

Merge branch 'master' into wx3

2015-06-27 19:33:12 -04:00

__init__.py

Commit initial work for effect DPS / Target resists

2014-09-03 00:49:53 -04:00

attribute.py

More float fixes in service

2011-06-13 21:18:28 +04:00

character.py

Fix #109

2015-07-19 16:20:42 -04:00

damagePattern.py

We now use EFT-style import/exports for damage profiles.

2014-09-03 14:56:44 -04:00

eveapi.py

Modify eveapi to work with pyfa service, move all character API calls from EOS to Character service and use new network service

2014-08-14 11:44:50 -04:00

fit.py

Remove few debugging prints

2015-08-11 15:59:38 +03:00

fleet.py

Quick fix for issue 55

2014-03-11 23:38:01 -04:00

market.py

Remove AT13 prizes from ship list for now

2015-07-07 16:10:29 +03:00

network.py

Remove / disable debugging prints

2014-08-17 23:40:22 -04:00

port.py

Do 2 blank lines between cargo contents and the rest of the fit, and when exported with the implants - do cargo items after the implants

2015-08-08 13:36:16 +03:00

prefetch.py

Fix oversight when creating a new database

2015-07-03 14:18:11 -04:00

price.py

Being extra cautious

2015-07-09 18:18:36 -04:00

settings.py

Updates "update" prefs to reflect new changes

2014-08-17 23:27:07 -04:00

targetResists.py

Removed debugging prints

2014-09-15 18:02:49 -04:00

update.py

Update Notifications: Sort release results by published date before iterating

2014-08-28 20:34:16 -04:00