Commit Graph

1188 Commits

Author SHA1 Message Date
Ryan Holmes
0a00d86c6d Merge branch 'master' into CIUpdates 2019-02-17 16:18:01 -05:00
Ryan Holmes
b3d0554df6 Merge remote-tracking branch 'origin/master' into blitzmann_CIUpdates
# Conflicts:
#	dist_assets/mac/pyfa.spec
2019-02-17 15:52:57 -05:00
MaruMaruOO
b60b190b81 Merge branch 'master' of https://github.com/pyfa-org/Pyfa 2019-02-14 01:24:07 -05:00
MaruMaruOO
3cb8313669 Add Mutadaptive Remote Armor Repairers to EFS export. 2019-02-14 01:23:59 -05:00
DarkPhoenix
436113dedc Set price object status on successful fetches 2019-02-13 18:51:44 +03:00
DarkPhoenix
a4fae73a1e Make "fill with module" context menu entry disablable via preferences 2019-02-13 17:12:21 +03:00
DarkPhoenix
e0c389a643 Do not show (!) for fetches which will always fail (e.g. abyssal mods). Also restore commit as it was a threat synchornization mechanism 2019-02-13 13:07:54 +03:00
DarkPhoenix
591dcffa43 Do not try to fetch price for items which contain no market group according to CCP data 2019-02-13 00:54:56 +03:00
DarkPhoenix
672fd77bec Get market instance only once 2019-02-11 16:18:43 +03:00
Ryan Holmes
07b8f5b914 update appveyor and travis configs 2019-02-02 19:06:36 -05:00
MaruMaruOO
1f50e7cb51 Merge missing changes from #1755, efs version bump and minor linting. 2019-01-29 02:17:55 -05:00
Ryan Holmes
b831dfbc7f Merge branch 'master' of https://github.com/pyfa-org/Pyfa into origin_master 2018-12-19 10:17:59 -05:00
Ryan Holmes
b739b791d4 fix esi endpoint 2018-12-19 10:17:50 -05:00
DarkPhoenix
3297ef8975 Return size conversion
I'm dumb and thought it's heavy->heavy and large->large
2018-12-15 22:03:13 +03:00
DarkPhoenix
acba971e70 Aggregate and sort items during multibuy export 2018-12-15 12:56:27 +03:00
DarkPhoenix
dd8169adb4 Add couple additional definitions 2018-12-15 11:12:29 +03:00
DarkPhoenix
857a625ae2 Remove some "replacements" 2018-12-15 11:02:17 +03:00
DarkPhoenix
3eed5bfc64 Add more racial definitions 2018-12-15 00:21:25 +03:00
DarkPhoenix
af37ec21e9 Fix EFT import bug another way 2018-12-14 18:32:45 +03:00
DarkPhoenix
51ef3ec758 Revert "Make sure that modules are put onto their proper place during EFT import, not to the end"
This reverts commit fe063cf19a.
2018-12-14 18:14:50 +03:00
DarkPhoenix
fe063cf19a Make sure that modules are put onto their proper place during EFT import, not to the end 2018-12-14 16:56:51 +03:00
DarkPhoenix
6819dc87a6 Fix PDS jargon entries 2018-12-14 12:50:37 +03:00
DarkPhoenix
6f8fca7525 Implement spoolup parameters fetcher and rely on it for misc column stats 2018-12-14 08:15:05 +03:00
DarkPhoenix
ba12d97c1d Support spoolup options in EFS export as well 2018-12-13 14:49:06 +03:00
DarkPhoenix
10572c7dbd Expose spoolup time to caller 2018-12-12 10:31:20 +03:00
DarkPhoenix
5fdae11bb1 Expose damage output composition to UI 2018-12-11 19:13:31 +03:00
DarkPhoenix
30ff2e0dae Add jargon entry for ex-energy transfers 2018-12-11 17:42:54 +03:00
DarkPhoenix
4f0f8fcdfc Rework internal interfaces to be able to specify spoolup in more flexible manner and carry output dps types 2018-12-11 17:39:03 +03:00
Ryan Holmes
8b6d32fe3b Merge remote-tracking branch 'origin/master' into spoolup_support 2018-11-27 23:59:22 -05:00
DarkPhoenix
3907c8c29a Change how compiled regex is used 2018-11-20 19:19:14 +03:00
DarkPhoenix
59d9d47a56 Do some work on mutated module commands to support new parsing format 2018-11-20 13:38:38 +03:00
DarkPhoenix
c619efa68e Change the way DNA import is handled 2018-11-20 13:03:27 +03:00
DarkPhoenix
05e895e7b7 Move out mutated module parsing from EFT to separate module 2018-11-20 12:51:49 +03:00
Ryan Holmes
58daf2a543 work on getting abyssal modules imported via clipboard 2018-11-20 00:49:04 -05:00
DarkPhoenix
0294684bb8 Implement import of separate mutated items 2018-11-19 17:47:48 +03:00
DarkPhoenix
fa9b3be41c Move fetch function to shared 2018-11-19 16:57:19 +03:00
DarkPhoenix
74bf3fbc8b Move mutation export to another module 2018-11-19 15:31:13 +03:00
DarkPhoenix
b0895611d6 Move tiamat/hydra out of normal groups 2018-11-17 14:48:25 +03:00
DarkPhoenix
f39ba27a13 Add backend support for damage stats separation (prespool and postspool) 2018-11-02 13:30:38 +03:00
blitzmann
881b92a6ea Convert implant location change to a command 2018-10-28 21:59:14 -04:00
Tron
05ce8fbf1c Fixed flake8 complaints. 2018-10-15 05:44:22 -05:00
blitzmann
d46a2d61bb fix issue with pyinstaller not finding correct modules 2018-10-11 22:02:36 -04:00
blitzmann
749adb9ec8 update efsport 2018-10-11 21:16:12 -04:00
blitzmann
5cab8b1070 Merge remote-tracking branch 'origin/master' into release/v2.5.0-1
# Conflicts:
#	service/efsPort.py
2018-10-11 21:15:15 -04:00
blitzmann
bc5a43bfb3 tox fixes 2018-10-11 21:08:26 -04:00
blitzmann
1276016a98 Reintroduce the check states functionality to the AddModule and ChangeState commands 2018-10-09 18:19:29 -04:00
MaruMaruOO
3e249ec155 Minor lint and EFS export maxRange bug fix. 2018-09-28 23:36:18 -04:00
MaruMaruOO
edfbf71958 EFS export version bump 2018-09-27 03:06:00 -04:00
MaruMaruOO
4876ff7035 Merge branch 'master' into efs_port 2018-09-27 02:52:49 -04:00
MaruMaruOO
d5034c9e0d Add HIC points to EFS export. 2018-09-27 02:50:28 -04:00