dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity
6,214 Commits 3 Branches 5 Tags
1454cd8a0dfb297550a592be812a9ea8444c8d59
Commit Graph

6214 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
blitzmann
1454cd8a0d Merge remote-tracking branch 'origin/development' into release/v2.5.0 2018-10-08 12:40:23 -04:00
Ryan Holmes
9ec54c9004 Merge pull request #1751 from pyfa-org/issue/1750 
Fix for #1750 - when sorting items in the item compare, items without…
 2018-09-26 18:17:55 -04:00
blitzmann
0749e03211 Fix for #1750 - when sorting items in the item compare, items without that attribute cause an error due to None / int comparison 2018-09-26 18:17:28 -04:00
Ryan Holmes
e03adad23a Merge pull request #1749 from pyfa-org/issue/1656 
Update DPS as factor in reload setting in preferences changes
 2018-09-25 21:14:59 -04:00
blitzmann
9b3ba8c9aa Update DPS as factor in reload setting in preferences changes 2018-09-25 21:14:37 -04:00
Ryan Holmes
85746cd681 Merge pull request #1748 from pyfa-org/issue/1447 
Fix an issue in which left up event was triggered after selecting a f…
 2018-09-25 21:04:18 -04:00
blitzmann
2e64280403 Fix an issue in which left up event was triggered after selecting a file in a file dialog (#1447) 2018-09-25 21:03:51 -04:00
Ryan Holmes
d7b81ea87d Merge pull request #1747 from pyfa-org/issue/1746 
Fix for localized fliament abyssal effect
 2018-09-25 20:31:35 -04:00
blitzmann
f4404e2649 Fix for localized fliament abyssal effect 2018-09-25 20:29:48 -04:00
DarkPhoenix
f598e8e3c2 Fix couple of price-related bugs 2018-09-19 04:51:14 +03:00
Ryan Holmes
27488a0260 Merge pull request #1738 from m-sasha/missile-ammo-picker-fix 
Fixed missile module ammo picker not showing damage type icons.
 2018-09-17 00:30:06 -04:00
Ryan Holmes
c53e7964bf Merge pull request #1741 from pyfa-org/codeCleanup 
Code cleanup
 2018-09-17 00:04:23 -04:00
Ryan Holmes
3516d6fdc5 Merge pull request #1740 from pyfa-org/issue/1730 
Add missing entosis link effect
 2018-09-17 00:01:24 -04:00
blitzmann
69af1440ae Add missing entosis link effect 2018-09-17 00:00:42 -04:00
blitzmann
31c3101d6d Remove redundant parenthesis 2018-09-16 01:11:16 -04:00
blitzmann
5850026aa9 docstring fixes 2018-09-16 01:09:55 -04:00
blitzmann
b4b8a158f5 Bunch of import optimizations 2018-09-16 00:05:36 -04:00
blitzmann
5c6303995d Replace set() with a literal 2018-09-15 23:44:32 -04:00
blitzmann
f0353a7dd7 some dict cleanup 2018-09-15 23:44:16 -04:00
blitzmann
1fb19e3b94 Merge remote-tracking branch 'origin/master' into development 2018-09-15 23:41:49 -04:00
Ryan Holmes
1788b32b83 Merge pull request #1727 from pyfa-org/commandRefactor 
Undo/Redo (refactoring into command pattern)
 2018-09-15 23:41:06 -04:00
blitzmann
621672bf34 Some tox fixes 2018-09-15 20:38:08 -04:00
blitzmann
b08406b7d6 Move the FitRenameCommand command 2018-09-15 17:46:55 -04:00
Ryan Holmes
6211d1de70 Merge pull request #1728 from pyfa-org/errorDialogFixes 
Add pyfa and eve data version to error dialog
 2018-09-15 17:30:49 -04:00
Ryan Holmes
916b11deb8 Merge pull request #1735 from m-sasha/crisp-text 
The text drawn in chrome_tabs is now crisp on Retina screens
 2018-09-12 20:50:56 -04:00
Alexander Maryanovsky
8e41a90f57 Fixed missile module ammo picker not showing damage type icons. 2018-09-12 23:54:02 +03:00
Alexander Maryanovsky
4e399f9bbb The text drawn in chrome_tabs is now crisp on Retina screens 2018-09-11 14:42:37 +03:00
blitzmann
12b11d57ba Merge remote-tracking branch 'origin/development' into commandRefactor 2018-09-03 17:28:35 -04:00
blitzmann
bea7102a3f Merge remote-tracking branch 'origin/master' into commandRefactor 2018-09-03 17:26:26 -04:00
Ryan Holmes
b77a577c06 Merge pull request #1725 from pyfa-org/issue1722 
Make sure small abyssal nos has a type name (bad eve data)
 2018-09-01 18:12:52 -04:00
blitzmann
c5aab07d65 Make sure small abyssal nos has a type name (bad eve data) 2018-09-01 18:12:16 -04:00
Ryan Holmes
362ae72183 Merge pull request #1724 from pyfa-org/abyssal_export 
Abyssal export
 2018-09-01 18:04:55 -04:00
blitzmann
6f5d0453a6 Added import of Port, which has a method that XML import uses. Importing inside the function to avoid circular import 2018-09-01 18:02:04 -04:00
blitzmann
c552f6a1d4 formatting fixes 2018-09-01 17:54:10 -04:00
Ryan Holmes
99a8b03697 Add pyfa and eve data version to error dialog 2018-09-01 03:01:42 -04:00
Ryan Holmes
9d63946aa7 Merge pull request #1715 from pyfa-org/priceFix 
Price callback fix
 2018-08-30 23:05:41 -04:00
blitzmann
6eba2b1abd Merge remote-tracking branch 'origin/master' into development 2018-08-30 21:24:10 -04:00
DarkPhoenix
b05f1573c6 Fix log messages 2018-08-30 21:41:50 +03:00
DarkPhoenix
f4311d1cef Remove object which we don't actually need 2018-08-30 21:39:28 +03:00
DarkPhoenix
8abad416bd Split multibuy into its own file as well 2018-08-30 16:23:20 +03:00
DarkPhoenix
52dbd8d9ef Fix few export/import functions 2018-08-30 16:17:56 +03:00
DarkPhoenix
4e5a70993e Split XML facilities into their own file as well 2018-08-30 16:15:23 +03:00
DarkPhoenix
dd0fbfddb9 Split ESI stuff into its own file 2018-08-30 15:57:59 +03:00
DarkPhoenix
02e35181d5 Move out DNA format into separate file 2018-08-30 15:46:29 +03:00
DarkPhoenix
302cab54fd Get rid of PortProcessing object 2018-08-30 15:23:24 +03:00
DarkPhoenix
ba157af496 Allow format to have no space between: ship name - fit name; module name - charge name; module spec - offline suffix; module spec - mutastats reference 
This fixes import of modules with charges from zkb and few other issues
 2018-08-30 14:25:40 +03:00
blitzmann
d1e6647d1f Don't show/hide options box, move options to under EFT, and simply disable them when EFT not selected 2018-08-30 00:07:37 -04:00
DarkPhoenix
0a47fba107 Move import/export facilities to their own folder 2018-08-28 19:00:39 +03:00
DarkPhoenix
3faa57f39a Remove debugging log requests 2018-08-26 11:10:14 +03:00
Ryan Holmes
75333264a7 Merge pull request #1710 from minlexx/master 
Fix parsing system proxy var containing "user:password@" part
 2018-08-25 22:22:32 -04:00