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

..

builtinContextMenus

Do not allow projection to citadels

2016-08-28 20:00:46 -04:00

builtinGraphs

Change to use BitmapLoader class

2015-09-24 12:21:50 -04:00

builtinPreferenceViews

Merge pull request #791 from IndictionEve/OpenFittingsInNewPage

2016-11-04 12:48:23 -04:00

builtinStatsViews

Merge remote-tracking branch 'origin/master' into citadel

2016-07-16 21:45:28 -04:00

builtinViewColumns

Fix energy warfare

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

builtinViews

load fitting in selected page if ctrl-key pressed and option active

2016-10-30 01:05:22 +02:00

utils

Added Shiptype to fitting name in minimal html export

2016-05-26 15:03:34 +02:00

__init__.py

Add basic files.

2010-08-11 18:57:14 +02:00

aboutData.py

Fix database for icons (using old data), bump for release

2016-02-10 20:07:56 -05:00

additionsPane.py

Remove fleet booster context menu on fit

2016-11-20 13:54:56 -05:00

bitmapLoader.py

Bitmap Loader is now a proper class, and can be used to load images from zipfile

2015-09-24 12:18:33 -04:00

boosterView.py

More work on restrictions

2016-07-04 11:01:08 -04:00

cachingImageList.py

Change to use BitmapLoader class

2015-09-24 12:21:50 -04:00

cargoView.py

Disable fit add on pages based on context (ship vs citadel)

2016-07-04 10:30:04 -04:00

characterEditor.py

Fix issue with entity editor and wxPython 2.8

2016-06-28 23:24:01 -04:00

characterSelection.py

Migrate character editor to use new entity editor.

2016-03-29 21:19:20 -04:00

chromeTabs.py

Fix crash related to structure rigs not having meta level, and a traceback that might happen occasionally.

2016-07-05 23:23:55 -04:00

commandView.py

Remove fleet booster context menu on fit

2016-11-20 13:54:56 -05:00

contextMenu.py

Clean up

2016-05-15 12:43:24 -04:00

copySelectDialog.py

Multibuy format export feature

2016-09-14 23:38:09 +02:00

crestFittings.py

Ensure we have an active fit when exporting to crest

2016-06-23 22:44:24 -04:00

display.py

Instead of icon, use unicode refresh. Minor issues with image and GUI flickering

2015-06-06 22:42:42 -05:00

droneView.py

More work on restrictions

2016-07-04 11:01:08 -04:00

fighterView.py

Disable fit add on pages based on context (ship vs citadel)

2016-07-04 10:30:04 -04:00

fleetBrowser.py

Change to use BitmapLoader class

2015-09-24 12:21:50 -04:00

gangView.py

Bump dev, fix issue with applying fleet boosts

2016-08-28 19:35:55 -04:00

globalEvents.py

Convert pubsub to wx events

2015-11-08 12:33:56 -05:00

graph.py

More work on graphs

2010-11-12 12:01:55 +01:00

graphFrame.py

Change to use BitmapLoader class

2015-09-24 12:21:50 -04:00

implantView.py

More work on restrictions

2016-07-04 11:01:08 -04:00

itemStats.py

Implement new method for finding values

2016-10-23 10:44:59 -07:00

mainFrame.py

Multibuy format export feature

2016-09-14 23:38:09 +02:00

mainMenuBar.py

Fix my merge fail

2016-06-18 23:29:53 -04:00

marketBrowser.py

Initial GUI commit. Still need to actually handle the attribute change

2015-11-01 19:49:22 -05:00

multiSwitch.py

Improves on fit loading on startup by only calculating the last fit that is opened.

2014-05-25 02:55:28 -04:00

patternEditor.py

Fix issue with entity editor and wxPython 2.8

2016-06-28 23:24:01 -04:00

PFListPane.py

Yet another shipbrowser scrolling fix attempt

2011-06-15 10:58:46 +03:00

PFSearchBox.py

Initial GUI commit. Still need to actually handle the attribute change

2015-11-01 19:49:22 -05:00

preferenceDialog.py

Fix preferences dialog

2015-10-09 09:10:37 -07:00

preferenceView.py

Show preference pages in the order they appear in builtinPreferenceViews

2014-03-02 20:02:36 -05:00

projectedView.py

Remove fleet booster context menu on fit

2016-11-20 13:54:56 -05:00

propertyEditor.py

Add some conditionals to disable Attribute Editor for wxPython 2.8

2015-11-06 20:23:09 -05:00

pyfatogglepanel.py

Updated to new repo location and forum thread

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

pygauge.py

Remove debug prints

2016-01-09 14:48:13 -05:00

resistsEditor.py

Fix issue with entity editor and wxPython 2.8

2016-06-28 23:24:01 -04:00

setEditor.py

Fix issue with entity editor and wxPython 2.8

2016-06-28 23:24:01 -04:00

sfBrowserItem.py

See #303

2015-06-16 15:28:23 -04:00

shipBrowser.py

Merge branch 'master' into singularity

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

statsPane.py

Reduce minimum vertical size

2014-11-20 13:00:57 -05:00

statsView.py

Make a slight redesign of the builtins

2010-10-04 09:17:52 +02:00

updateDialog.py

Updated to new repo location and forum thread

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

viewColumn.py

Resolve #245 - Adding tooltips to fitting columns

2015-01-08 12:39:16 -05:00