Commit Graph

6423 Commits

Author SHA1 Message Date
DarkPhoenix
9eea99f600 Do not export if user presses cancel 2019-02-12 13:28:18 +03:00
DarkPhoenix
d55d6c3e5e Rework the way options are stored 2019-02-12 13:14:31 +03:00
DarkPhoenix
eeef2104c2 Move option of exporting charges from general preferences to EFT and multibuy exports 2019-02-12 13:03:15 +03:00
DarkPhoenix
2098ff6da1 Merge branch 'master' into fit_export_options 2019-02-12 12:50:38 +03:00
DarkPhoenix
fb5d62304c Allow sorting by price in variations tab 2019-02-12 12:50:02 +03:00
DarkPhoenix
8baac1e207 Introduce secondary sort parameter for compare tab 2019-02-12 12:35:53 +03:00
DarkPhoenix
4324b846e0 Disable XML and DNA export 2019-02-12 12:18:42 +03:00
DarkPhoenix
143606d8f8 Merge branch 'master' into fit_export_options 2019-02-12 12:16:58 +03:00
DarkPhoenix
dfc0a896c4 Do not commit price right away when creating the object 2019-02-12 12:10:17 +03:00
DarkPhoenix
980c84b911 Add support for default export option values 2019-02-12 10:37:51 +03:00
DarkPhoenix
41b6000f6e Rename ranges to something more sensible 2019-02-12 10:17:19 +03:00
DarkPhoenix
28fc845250 Merge branch 'master' into fit_export_options 2019-02-12 09:25:24 +03:00
DarkPhoenix
193faaafe7 Make sure that gauge bar neutral value is always reachable, even if it does not correspond to base value 2019-02-12 09:24:02 +03:00
DarkPhoenix
ce9db79552 Do not redefine property 2019-02-12 08:39:03 +03:00
DarkPhoenix
672fd77bec Get market instance only once 2019-02-11 16:18:43 +03:00
DarkPhoenix
89656b04ad Do not export mutated items for multibuy 2019-02-11 14:50:44 +03:00
DarkPhoenix
0997a54324 Add option to export disable cargo export for multibuy 2019-02-11 14:44:38 +03:00
DarkPhoenix
59569d46ae Add implants & boosters option to multibuy export 2019-02-11 14:11:03 +03:00
DarkPhoenix
3bc1ce195c Change the way we store options 2019-02-11 14:04:28 +03:00
DarkPhoenix
98e6781077 Make sure order of export formats is also the same 2019-02-11 13:13:00 +03:00
DarkPhoenix
f2deb0e6c7 Make sure order of options doesn't depend on order of options in memory (which can be random as it's dict) 2019-02-11 12:57:27 +03:00
DarkPhoenix
a5efea56ab Change description of export options a little 2019-02-11 12:28:36 +03:00
Ryan Holmes
1fe35f5aab Merge pull request #1844 from MaruMaruOO/master
Merge missing changes from #1755, efs version bump and minor linting.
2019-02-07 21:36:47 -05:00
MaruMaruOO
1f50e7cb51 Merge missing changes from #1755, efs version bump and minor linting. 2019-01-29 02:17:55 -05:00
blitzmann
572d337935 Newer versions of numpy apparently aren't supported very well with pyinstaller yet. Force inclusion of module, otherwise automated build will cause graph support to fail 2019-01-20 23:40:33 -05:00
blitzmann
01f8c65304 Merge branch 'master' of https://github.com/pyfa-org/Pyfa 2019-01-10 23:37:08 -05:00
blitzmann
a1ee8b49ef Merge branch 'petosorus-fill-with-module' 2019-01-10 23:36:40 -05:00
blitzmann
0745ed50e0 * Merge branch 'fill-with-module' of git://github.com/petosorus/Pyfa into petosorus-fill-with-module
* Remove settings check

# Conflicts:
#	gui/fitCommands/__init__.py
2019-01-10 23:36:05 -05:00
Ryan Holmes
76e66a99ff Merge pull request #1821 from burnsypet/issue-1816
Remove extra (α) from clone name when renaming
2019-01-10 23:28:24 -05:00
blitzmann
dc5bd7f627 Merge branch 'master' of https://github.com/pyfa-org/Pyfa 2019-01-01 20:56:46 -05:00
blitzmann
d6825fb8b7 #1832 Add stacking penalty to Inertial Stabilizers 2019-01-01 20:56:05 -05:00
Ryan Holmes
b9ec89e9c8 Merge branch 'master' of https://github.com/pyfa-org/Pyfa into origin_master 2018-12-24 10:40:22 -05:00
Ryan Holmes
cc63e62154 Fix for #1831 - use css style string. This prevents crashing on systems that bring back a color with opacity as the system default 2018-12-24 10:39:56 -05:00
blitzmann
cc134c36e2 bump version 2018-12-19 21:07:58 -05:00
DarkPhoenix
17313bd67b Assume RRs work at 100% efficiency, even if they are projected from self 2018-12-19 23:46:30 +03: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
0480673460 Fix neurotoxin implant not affecting armor amount affected by x-instinct 2018-12-17 12:55:57 +03:00
DarkPhoenix
7ffced2151 Change layout of bosonic damage misc description 2018-12-17 00:10:06 +03: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
Ryan Holmes
ac3a7386aa Bump version 2018-12-14 19:06:04 -05:00
DarkPhoenix
3eed5bfc64 Add more racial definitions 2018-12-15 00:21:25 +03:00
DarkPhoenix
d0992ed56f Change how excessive mods are stored on import 2018-12-14 18:40:32 +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
f66da9870e Revert "Fix issue with replace method"
This reverts commit ca46984a6b.
2018-12-14 18:14:41 +03:00
DarkPhoenix
ca46984a6b Fix issue with replace method 2018-12-14 17:10:27 +03:00