blitzman b4bbc82ba1 Merge branch 'master' into singularity ...

Conflicts:
	eos/db/saveddata/fit.py
	eos/effects/armoredwarfaremindlink.py
	eos/effects/elitebonuscommanddestroyerarmored1.py
	eos/effects/elitebonuscommanddestroyerinfo1.py
	eos/effects/elitebonuscommanddestroyerinfohidden1.py
	eos/effects/elitebonuscommanddestroyersiege1.py
	eos/effects/elitebonuscommanddestroyerskirmish1.py
	eos/effects/elitebonuscommandshiparmoredcs3.py
	eos/effects/elitebonuscommandshipinformationcs3.py
	eos/effects/elitebonuscommandshipinformationhiddencs3.py
	eos/effects/elitebonuscommandshipsiegecs3.py
	eos/effects/elitebonuscommandshipskirmishcs3.py
	eos/effects/miningforemanmindlink.py
	eos/effects/shipbonuscarriera4warfarelinksbonus.py
	eos/effects/shipbonuscarrierc4warfarelinksbonus.py
	eos/effects/shipbonuscarrierg4warfarelinksbonus.py
	eos/effects/shipbonuscarrierm4warfarelinksbonus.py
	eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py
	eos/effects/shipbonusforceauxiliaryc4warfarelinksbonus.py
	eos/effects/shipbonusforceauxiliaryg4warfarelinksbonus.py
	eos/effects/shipbonusforceauxiliarym4warfarelinksbonus.py
	eos/effects/shipbonussupercarriera5warfarelinksbonus.py
	eos/effects/shipbonussupercarrierc5warfarelinksbonus.py
	eos/effects/shipbonussupercarrierg5warfarelinksbonus.py
	eos/effects/shipbonussupercarrierm5warfarelinksbonus.py
	eos/effects/subsystembonusamarrdefensivearmoredwarfare.py
	eos/effects/subsystembonusamarrdefensiveinformationwarfare.py
	eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py
	eos/effects/subsystembonusamarrdefensiveskirmishwarfare.py
	eos/effects/subsystembonuscaldaridefensiveinformationwarfare.py
	eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py
	eos/effects/subsystembonuscaldaridefensivesiegewarfare.py
	eos/effects/subsystembonuscaldaridefensiveskirmishwarfare.py
	eos/effects/subsystembonusgallentedefensivearmoredwarfare.py
	eos/effects/subsystembonusgallentedefensiveinformationwarfare.py
	eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py
	eos/effects/subsystembonusgallentedefensiveskirmishwarfare.py
	eos/effects/subsystembonusminmatardefensivearmoredwarfare.py
	eos/effects/subsystembonusminmatardefensivesiegewarfare.py
	eos/effects/subsystembonusminmatardefensiveskirmishwarfare.py
	eos/saveddata/fit.py
	eos/saveddata/module.py
	gui/shipBrowser.py
	scripts/prep_data.py
	service/fit.py

2016-11-20 14:42:19 -05:00

..

conversions

Add conversion pack

2016-04-29 22:54:44 -04:00

pycrest

Change user agent of CREST calls

2015-12-03 20:50:01 -05:00

__init__.py

Get some initial scaffolding up for implant sets sourced from the resist code.

2016-03-20 02:04:55 -04:00

attribute.py

More float fixes in service

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

character.py

Merge pull request #756 from MrNukealizer/FighterFixes

2016-10-08 23:07:01 -04:00

crest.py

Remove some debugging prints

2015-11-08 12:37:31 -05:00

crudeTests.py

Fix energy warfare

2016-06-19 23:04:52 -04:00

damagePattern.py

Removed _init_ definition as it's redundant

2016-06-16 19:08:29 -07: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

Merge branch 'master' into singularity

2016-11-20 14:42:19 -05:00

fleet.py

Quick fix for issue 55

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

implantSet.py

Migrate implant set editor to new entity editor

2016-03-29 21:51:39 -04:00

market.py

Quick fix for override window crashing trying to load items that no longer exist (#706)

2016-08-26 21:52:56 -04:00

network.py

service/network: change "if" condition as suggested by @blitzmann

2016-10-09 13:14:37 +05:00

port.py

Fix of the number of charges in multibuy

2016-10-06 08:45:35 +02:00

prefetch.py

Updated po-ta-toe to po-tah-toh

2016-06-16 14:46:22 -07:00

price.py

Being extra cautious

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

server.py

Beautify pyfa's CREST login message

2016-06-23 22:16:08 -04:00

settings.py

service/settings: setProxyAuthDetails(): empty string as login means no password too

2016-10-09 13:07:13 +05:00

targetResists.py

Applied entity editor to resist editor.

2016-03-27 22:12:59 -04:00

update.py

Updated to new repo location and forum thread

2016-01-25 21:14:45 -05:00