dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity
4,594 Commits 3 Branches 5 Tags
c567ee2c08ce644dcec5dbd2eefe9483bf837df3
Commit Graph

720 Commits

Author SHA1 Message Date
blitzman
6b3d3ecd93 More import fixes for osx deprecated 2017-01-27 22:25:22 -05:00
blitzman
a210724312 Fix conversion imports for osx deprecated... :( 2017-01-27 22:06:52 -05:00
blitzman
1d69ed7584 Merge branch 'test_import' into development 
Conflicts:
	gui/builtinContextMenus/amount.py
	gui/characterEditor.py
	gui/itemStats.py
 2017-01-27 20:39:54 -05:00
blitzmann
968d633d46 Merge branch 'feature/alphaclones' into development 2017-01-26 19:53:27 -05:00
blitzmann
96c3363edc Merge branch 'master' into feature/alphaclones 
Conflicts:
	eve.db
 2017-01-26 19:39:13 -05:00
Ebag333
d0fa2510e5 Merge branch 'test_import' of https://github.com/Ebag333/Pyfa into test_import 2017-01-25 17:40:00 -08:00
Ebag333
8d57f641f7 Remove comments about conversion 2017-01-25 17:39:54 -08:00
blitzman
055957567f Fix fit import 2017-01-25 20:28:57 -05:00
Ebag333
8095b4852b Clean up another broken reference. Fix broken XML export. 2017-01-24 21:34:24 -08:00
blitzman
1b0cdeedce Fix lack of instance 2017-01-24 19:57:16 -05:00
Ebag333
992820ac42 Redirect to correct module 
Function was moved from service.Fit to service.Port
 2017-01-24 16:48:28 -08:00
blitzman
c0ecc6a329 tweaks to fix merge issues 2017-01-23 21:07:20 -05:00
blitzman
85131e6166 oh god this isn't gonna work 
Merge branch 'ebag_importchanges' into test_import

Conflicts:
	config.py
	eos/db/saveddata/queries.py
	eos/effects/chargebonuswarfarecharge.py
	eos/effects/elitebonuscommandshipinformationhiddencs3.py
	eos/effects/elitebonuslogisticremotearmorrepairoptimalfalloff1.py
	eos/effects/energydestabilizationnew.py
	eos/effects/iceharvestingdroneoperationdurationbonus.py
	eos/effects/miningforemanstrengthbonus.py
	eos/effects/modulebonuswarfarelinkarmor.py
	eos/effects/modulebonuswarfarelinkinfo.py
	eos/effects/modulebonuswarfarelinkmining.py
	eos/effects/modulebonuswarfarelinkshield.py
	eos/effects/modulebonuswarfarelinkskirmish.py
	eos/effects/moduletitaneffectgenerator.py
	eos/effects/remotehullrepair.py
	eos/effects/rolebonusremotearmorrepairoptimalfalloff.py
	eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py
	eos/effects/shipmodesmallmissiledamagepostdiv.py
	eos/effects/structureenergyneutralizerfalloff.py
	eos/effects/structuremoduleeffectstasiswebifier.py
	eos/effects/structurerigmaxtargets.py
	eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py
	eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py
	eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py
	eos/effects/techtwocommandburstbonus.py
	eos/saveddata/fighter.py
	eos/saveddata/fit.py
	eos/saveddata/module.py
	eve.db
	gui/bitmapLoader.py
	gui/builtinContextMenus/itemStats.py
	gui/builtinStatsViews/miningyieldViewFull.py
	gui/builtinViewColumns/misc.py
	gui/builtinViews/__init__.py
	gui/builtinViews/fittingView.py
	gui/contextMenu.py
	gui/graphFrame.py
	gui/itemStats.py
	gui/mainFrame.py
	gui/marketBrowser.py
	service/__init__.py
	service/character.py
	service/fit.py
	service/port.py
	service/prefetch.py
	service/pycrest/eve.py
	service/settings.py
 2017-01-23 21:06:12 -05:00
blitzman
330983d9dd Merge branch 'master' into development 
Conflicts:
	eve.db
 2017-01-22 21:10:06 -05:00
Ryan Holmes
e45027a66c Merge pull request #910 from Ebag333/UnicodePaths_v2 
Unicode Paths 2: The Reckoning
 2017-01-14 02:44:24 -05:00
blitzman
5e0567ef4d Merge branch 'master' of https://github.com/pyfa-org/Pyfa 2017-01-10 22:51:38 -05:00
blitzman
468a4644d6 Merge branch 'development' 
Conflicts:
	eos/db/saveddata/queries.py
 2017-01-10 22:42:01 -05:00
Ryan Holmes
29d0f102fd Move AT14 ships to the Limited Edition group (#935) 2017-01-05 11:38:47 -05:00
blitzman
5cbffcf3ac Handle counting number of fits per ship category more efficiently (see #819) 2017-01-03 01:32:12 -05:00
Ryan Holmes
152a708ee8 Merge pull request #920 from Ebag333/Database_Cleanup 
Database Validation and Cleanup
 2017-01-02 19:25:26 -05:00
Ebag333
f4761e099b Don't let people rename built in chars 2017-01-01 13:17:39 -08:00
Ebag333
be3696deba Add some sanity checks and validation of incoming data 2017-01-01 12:47:28 -08:00
Ebag333
f9ba95b3de Check the ness to see if it's an implant, booster, or something else. 
Log it if it's something else and don't try and import it. This prevents
a bad line from failing the entire import, and (hopefully) we know about
it.
 2016-12-27 12:32:52 -08:00
Ebag333
7ee4d1d588 Try loading item as a booster if implant fails. 2016-12-26 23:29:22 -08:00
Ebag333
cef5842344 Database validation and cleanup 2016-12-26 21:54:52 -08:00
Ebag333
bef17e53c6 Recreating wheels 2016-12-19 00:11:55 -08:00
Ebag333
d4b6099d6e Handle unicode, utf8, and windows-1252 
(cherry picked from commit 0d4f24a)
 2016-12-18 14:11:55 -08:00
blitzman
ff60538e21 Revert "Merge branch 'Ebag333-UnicodePaths' into development" 
This reverts commit 8a6ef788b3, reversing
changes made to cf91ae7627.
 2016-12-18 15:56:06 -05:00
Ebag333
af7272cd10 fix dual reference back to same object 2016-12-15 17:08:59 -08:00
Ebag333
d7c71f5d47 fix some, missed import references. 2016-12-15 16:17:10 -08:00
Ebag333
f76f44e9f3 Fix port references, imports, and add some logging 2016-12-15 15:20:29 -08:00
Ebag333
4fb07cc1d0 Bunch of pep8 and inspection cleanup 2016-12-15 12:43:19 -08:00
Ebag333
956fa7a8b7 Fixing some issues due to import cleanup 2016-12-14 13:06:13 -08:00
blitzman
0ebb992354 more clean up 
(cherry picked from commit f198ff1)
 2016-12-14 12:44:42 -08:00
Indiction
9f4b31979c Adding Fighter Support CREST 
(cherry picked from commit ab5f348)
 2016-12-14 12:14:11 -08:00
Ebag333
7532bcda08 Clean up some stuff left over from cherry picks 2016-12-14 10:42:04 -08:00
Ebag333
08b5abc7ad Handle unicode, utf8, and windows-1252 
(cherry picked from commit 0d4f24a)
 2016-12-14 10:38:56 -08:00
Indiction
38bf143704 Fighters for export and import functions 
(cherry picked from commit 04c30e7)
 2016-12-14 10:24:45 -08:00
Ebag333
627977ab51 Purging fleet bonuses from code base 
(cherry picked from commit 68f4570)
 2016-12-14 10:18:19 -08:00
Ebag333
e3b592977a Make some imports more explicit 2016-12-13 23:49:37 -08:00
Ebag333
28404cd8bb bajillion pep8 fixes to pass tox 2016-12-13 23:31:39 -08:00
Ebag333
be53dedb18 Large pep8 compliance to make work for Tox 2016-12-13 21:23:01 -08:00
Ebag333
57f930c83e Cherry pick commits from @a-tal 2016-12-13 20:35:03 -08:00
a-tal
d3b6bc1c93 so many pep8 fixes 
(cherry picked from commit bee125d)
 2016-12-13 20:16:44 -08:00
blitzman
f198ff1773 more clean up 2016-12-12 00:49:47 -05:00
blitzman
95b3f0a21c Merge branch 'Remove-Command-Boosts' of https://github.com/Ebag333/Pyfa into Ebag333-Remove-Command-Boosts 
Conflicts:
	eos/db/saveddata/fleet.py
	eos/db/saveddata/queries.py
	gui/additionsPane.py
 2016-12-12 00:41:47 -05:00
blitzman
b1bba74c5a Merge branch 'UnicodePaths' of https://github.com/Ebag333/Pyfa into Ebag333-UnicodePaths 2016-12-11 23:01:08 -05:00
blitzman
a954759012 GUI implementation of alpha clone switching 2016-12-11 22:51:48 -05:00
Ryan Holmes
828d722be8 Merge pull request #807 from IndictionEve/ImportExportFighters 
Fighters for export and import functions
 2016-12-10 02:09:45 -05:00
Indiction
ab5f3488e7 Adding Fighter Support CREST 2016-12-04 19:56:42 +01:00