blitzmann b30b3fcbf1 Merge branch 'master' into test-3 ...

Conflicts:
	eos/gamedata.py
	eos/saveddata/booster.py
	eos/saveddata/character.py
	gui/builtinAdditionPanes/commandView.py
	gui/builtinContextMenus/commandFits.py
	gui/builtinMarketBrowser/itemView.py
	gui/builtinMarketBrowser/marketTree.py
	gui/builtinPreferenceViews/pyfaGeneralPreferences.py
	gui/builtinShipBrowser/categoryItem.py
	gui/builtinShipBrowser/fitItem.py
	gui/builtinShipBrowser/navigationPanel.py
	gui/builtinShipBrowser/raceSelector.py
	gui/builtinShipBrowser/shipItem.py
	gui/builtinStatsViews/priceViewFull.py
	gui/builtinViews/fittingView.py
	gui/characterEditor.py
	gui/characterSelection.py
	gui/chromeTabs.py
	gui/crestFittings.py
	gui/itemStats.py
	gui/mainFrame.py
	scripts/itemDiff.py
	service/price.py

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

..

__init__.py

remove __all__ from contect menus

2017-03-16 19:05:07 -04:00

ammoPattern.py

Finish migrate from #868. Lots of tox/formatting/inspection fixes to the files touched.

2017-02-26 09:54:58 -08:00

amount.py

Merge branch 'master' into test-3

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

boosterSideEffects.py

Don't show Side Effects menu if there are no side effects (eg: Synths)

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

cargo.py

Finish migrate from #868. Lots of tox/formatting/inspection fixes to the files touched.

2017-02-26 09:54:58 -08:00

cargoAmmo.py

Tox fix.

2017-03-25 01:02:20 -04:00

changeAffectingSkills.py

Fix some deprecated things and a bug or two

2017-07-02 23:26:44 -04:00

commandFits.py

Merge branch 'master' into test-3

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

damagePattern.py

More deprecation fixes

2017-11-13 00:18:24 -05:00

droneRemoveStack.py

Finish migrate from #868. Lots of tox/formatting/inspection fixes to the files touched.

2017-02-26 09:54:58 -08:00

droneSplit.py

py2to3 automatic conversion. Woot!

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

droneStack.py

Tox fix.

2017-03-25 01:02:20 -04:00

factorReload.py

Do some renaming of some files

2017-06-12 18:08:07 -04:00

fighterAbilities.py

More deprecation fixes

2017-11-13 00:18:24 -05:00

implantSets.py

Merge branch 'master' into test-3

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

itemRemove.py

Use unicode string to prevent non-ASCII ship names from causing error (#1317)

2017-10-21 22:04:40 -04:00

itemStats.py

More deprecated fixes, and re-enable a working stats view

2017-06-14 03:51:40 -04:00

marketJump.py

Finish migrate from #868. Lots of tox/formatting/inspection fixes to the files touched.

2017-02-26 09:54:58 -08:00

metaSwap.py

Merge branch 'master' into test-3

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

moduleAmmoPicker.py

Fix ammo picker

2017-11-05 01:54:19 -04:00

moduleGlobalAmmoPicker.py

Finish migrate from #868. Lots of tox/formatting/inspection fixes to the files touched.

2017-02-26 09:54:58 -08:00

openFit.py

Fix some back event reference due to sleepiness last night ;_;

2017-07-11 19:23:29 -04:00

priceClear.py

Remove unused function

2017-04-10 21:58:56 -04:00

priceOptions.py

Formatting

2017-05-30 15:51:48 +02:00

project.py

Finish migrate from #868. Lots of tox/formatting/inspection fixes to the files touched.

2017-02-26 09:54:58 -08:00

shipJump.py

Fix some back event reference due to sleepiness last night ;_;

2017-07-11 19:23:29 -04:00

tabbedFits.py

Fix a few more deprecation warnings

2017-11-04 18:24:18 -04:00

tacticalMode.py

More deprecation fixes

2017-11-13 00:18:24 -05:00

targetResists.py

More deprecation fixes

2017-11-13 00:18:24 -05:00

whProjector.py

More deprecation fixes

2017-11-13 00:18:24 -05:00