dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 17 Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files

13
service/conversions/skinnedShips.py
View File

@@ -9,5 +9,16 @@ See GH issue #67 on why this is needed
CONVERSIONS = {
"Miasmos Amastris Edition": "Miasmos Quafe Ultra Edition",
"Miasmos Quafe Ultramarine Edition": "Miasmos Quafe Ultra Edition",
"Rattlesnake Victory Edition": "Rattlesnake"
"Rattlesnake Victory Edition": "Rattlesnake",
"Aliastra Catalyst": "Catalyst",
"Inner Zone Shipping Catalyst": "Catalyst",
"Intaki Syndicate Catalyst": "Catalyst",
"InterBus Catalyst": "Catalyst",
"Quafe Catalyst": "Catalyst",
"Inner Zone Shipping Imicus": "Imicus",
"Nefantar Thrasher": "Thrasher",
"Sarum Magnate": "Magnate",
"Tash-Murkon Magnate": "Magnate",
"Sukuuvestaa Heron": "Heron",
"Vherokior Probe": "Probe",
}