blitzman
|
ba2205867e
|
Test line endings with pyfa.py (see #964)
|
2017-02-05 17:12:45 -05:00 |
|
blitzman
|
d7ec04f995
|
test change to .gitattributes to specifically tell pyfa.py to save with LF line endings
|
2017-02-05 17:08:11 -05:00 |
|
blitzman
|
91baabd1b3
|
update database
|
2017-02-05 17:00:10 -05:00 |
|
blitzman
|
c3fdabd3a2
|
Merge branch 'development'
|
2017-02-05 16:52:27 -05:00 |
|
blitzman
|
3d8c76209d
|
update database from master
|
2017-01-29 19:52:56 -05:00 |
|
blitzman
|
c2038a6cf2
|
Change from UPDATE to DELETE for null damage pattern and target resist names
|
2017-01-29 19:04:57 -05:00 |
|
blitzman
|
082ac233ad
|
Merge branch 'MissingDamageTargetProfileNames' of https://github.com/Ebag333/Pyfa into development
Conflicts:
service/prefetch.py
|
2017-01-29 15:04:56 -05:00 |
|
blitzman
|
5d46fe7e4d
|
Merge branch 'master' into development
Conflicts:
gui/builtinContextMenus/amount.py
gui/builtinStatsViews/priceViewFull.py
service/fit.py
service/prefetch.py
|
2017-01-29 15:02:22 -05:00 |
|
blitzman
|
6049c9837c
|
Remove prefetch thread (unneeded and consumes resources?)
|
2017-01-28 23:35:42 -05:00 |
|
blitzman
|
a76eef01de
|
name all ze threads
|
2017-01-28 17:46:59 -05:00 |
|
blitzman
|
b3eb4f35cd
|
Max out cargo amount to sys.maxint (#958)
|
2017-01-28 13:31:03 -05:00 |
|
blitzman
|
6b6dacf94c
|
Fix traceback when trying to cancel an amount dialog with nothing in the field
|
2017-01-28 13:30:14 -05:00 |
|
blitzman
|
f010f2fef2
|
Don't loop through all amounts of cargo and drones just to get the price. (#958)
|
2017-01-28 13:15:25 -05: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
|
2038f36254
|
Remove calls to null pattern name cleanup
|
2017-01-25 13:52:00 -08:00 |
|
Ebag333
|
b1fc07a4cf
|
Abstract out the SQL Query Execution
gives more granular error handling
|
2017-01-25 13:28:34 -08:00 |
|
Ebag333
|
a366420d65
|
Catch scenario where names are missing
|
2017-01-25 09:58:26 -08: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 |
|