Merge branch 'master' into test-3

Browse Source

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

...

This commit is contained in:

blitzmann

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

parent 4a33365195 455fea75c0

commit b30b3fcbf1

462 changed files with 12862 additions and 2421 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

imgs/icons/118_15.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 790 B

BIN

imgs/icons/128_1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 818 B

BIN

imgs/icons/2_11.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 678 B After Width:  |  Height:  |  Size: 672 B

BIN

imgs/icons/3_11.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 648 B After Width:  |  Height:  |  Size: 647 B

BIN

imgs/icons/64_12.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 731 B After Width:  |  Height:  |  Size: 732 B

BIN

imgs/icons/refinery_boosterreactions.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 771 B

BIN

imgs/icons/refinery_chunkstabilization.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 782 B

BIN

imgs/icons/refinery_hybridreactions.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 646 B

BIN

imgs/icons/refinery_miningyield.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 757 B

BIN

imgs/icons/refinery_t2reactions.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 779 B

BIN

imgs/renders/27299.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

imgs/renders/27301.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

imgs/renders/27303.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

imgs/renders/27305.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.0 KiB

BIN

imgs/renders/35835.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

imgs/renders/35836.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

imgs/renders/44996.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

imgs/renders/45530.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

imgs/renders/45531.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.4 KiB

BIN

imgs/renders/45645.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

imgs/renders/45647.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

imgs/renders/45649.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.3 KiB