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

4592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ebag333
34c69cf10f Some pep8 stuff 2017-01-28 21:56:03 -08:00
Ebag333
88125634d2 Add extra info for misc column for fueled boosters 2017-01-28 21:47:58 -08:00
blitzman
a952f80ea4 min version for sqlalchemy 2017-01-28 01:29:08 -05:00
blitzman
6d34ae2960 fix 2017-01-27 23:35:19 -05:00
blitzman
d17ff000c7 Add migration for alpha clone character update 2017-01-27 23:12:08 -05:00
blitzman
6b3d3ecd93 More import fixes for osx deprecated 2017-01-27 22:25:22 -05:00
blitzman
32dc28f48d Move CREST import inside a conditional 2017-01-27 22:17:07 -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
blitzman
43e864e47b Fix issue in which -s flag was not being honored 2017-01-27 20:36:19 -05:00
blitzman
fb538027f7 Fix issues with paths and linux / os x 2017-01-27 20:30:11 -05:00
blitzman
cbf7f7d320 Merge branch 'master' into development 2017-01-27 19:39:10 -05:00
blitzmann
4111d670a7 Fix possible issue with floats coming through (see #729) 2017-01-26 23:52:18 -05:00
blitzmann
397084a9ff Disable rename and delete button for restricted character on character editor spawn (fix for #930) 2017-01-26 21:33:13 -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
a853ed9960 Remove test variable 2017-01-25 18:17:05 -08:00
Ebag333
323a7060ec Fix import 2017-01-25 17:53:04 -08: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
blitzman
5aff3f007e Fix crest export 2017-01-25 20:22:07 -05:00
blitzman
c34d86ba80 Fix XML exports 2017-01-25 20:12:30 -05:00
Ebag333
8095b4852b Clean up another broken reference. Fix broken XML export. 2017-01-24 21:34:24 -08:00
Ebag333
cc3274f245 Add comment to note special snowflakes needs 2017-01-24 18:21:09 -08:00
Ebag333
fbde9ce7bf Fix passing the fit into exportXML 2017-01-24 18:13:57 -08:00
Ebag333
130fc189ad Merge branch 'test_import' of https://github.com/Ebag333/Pyfa into test_import 2017-01-24 17:37:42 -08:00
Ebag333
a50e4fcc46 Fix issue caused by file path and import fix merges 2017-01-24 17:37:37 -08:00
Ebag333
ae96ff244e Fix crest exports 2017-01-24 17:09:48 -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
1bb7c4e825 Merge pull request #945 from Ebag333/Patch_1111328 
Update database to 1111328
 2017-01-17 20:39:32 -05:00
Ryan Holmes
450e1427a1 Merge pull request #948 from Ebag333/MiningYield 
Revert back to /s for mining. Adds /hour to tooltips.
 2017-01-17 20:21:15 -05:00
blitzman
5614cec19d Merge branch 'master' of https://github.com/pyfa-org/Pyfa 2017-01-17 20:18:21 -05:00
blitzman
3f24a4b2c5 Fix for #946 - citadel rig not increasing max targets 2017-01-17 20:18:12 -05:00
Ebag333
4e9e5735dc Revert "Add check for remote resistance" 
This reverts commit 269565e959.
 2017-01-17 10:03:14 -08:00
Ebag333
b1a6189c55 Revert back to /s for mining. Adds /hour to tooltips. 2017-01-17 09:29:22 -08:00
Ebag333
836504ee01 Expand gitattributes to cover a few more scenarios 2017-01-17 08:53:01 -08:00
Ebag333
269565e959 Add check for remote resistance 2017-01-17 00:28:44 -08: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
Ebag333
2d3310d8e0 Update database to 1111328 2017-01-13 15:10:36 -08:00
Ryan Holmes
77066f0389 Fix Rabisu effects (#941) 2017-01-11 15:06:50 -05:00
blitzman
5e0567ef4d Merge branch 'master' of https://github.com/pyfa-org/Pyfa 2017-01-10 22:51:38 -05:00
blitzman
b49de4b0fa Update to 1108313 2017-01-10 22:51:27 -05:00
blitzman
372495a83a Remove vestigial appendage 2017-01-10 22:45:41 -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