Commit Graph

6433 Commits

Author SHA1 Message Date
Ryan Holmes
2a224e8882 Merge pull request #1853 from blitzmann/CIUpdates
CI updates
2019-02-17 16:19:16 -05:00
Ryan Holmes
0a00d86c6d Merge branch 'master' into CIUpdates 2019-02-17 16:18:01 -05:00
Ryan Holmes
c3d1eaef2a Merge pull request #1851 from MaruMaruOO/master
Adds Mutadaptive Remote Armor Repairers to EFS exports.
2019-02-17 16:16:17 -05:00
Ryan Holmes
93f23b549b Merge branch 'master' into master 2019-02-17 16:16:09 -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
blitzmann
dba54e3ec8 test 2019-02-17 15:27:08 -05:00
DarkPhoenix
09421db28e Update effects after database update 2019-02-17 01:05:09 +03:00
DarkPhoenix
941edd6715 Update database 2019-02-16 22:39:08 +03:00
DarkPhoenix
fdac5309ac Modify db generation script to find same/better replacements for all items 2019-02-16 22:26:42 +03:00
DarkPhoenix
449c7d6aa2 Add two more columns to gamedata to hold info about better items 2019-02-16 14:06:23 +03: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
194ebb96a7 Add ruler between base item info and mutation stats 2019-02-13 18:18:38 +03:00
DarkPhoenix
fc04a32913 Add info about base item to mutations tab 2019-02-13 18:14:46 +03:00
DarkPhoenix
deee6fd6ab Make GTK window even bigger by default, and hide description type if there's no description for the item 2019-02-13 17:31:45 +03:00
DarkPhoenix
a4fae73a1e Make "fill with module" context menu entry disablable via preferences 2019-02-13 17:12:21 +03:00
DarkPhoenix
7bad3bc376 Show 'market group' context menu for mutated items as well 2019-02-13 17:07:06 +03:00
DarkPhoenix
7dd1c63898 Return 0 price even if price has not been fetched 2019-02-13 16:19:01 +03:00
DarkPhoenix
3ed949395e Flush prices rather than commit, it takes much less time and still satisfies our needs 2019-02-13 15:56:15 +03:00
DarkPhoenix
6ebc90b8aa Remove flush as it's part of commit according to sqlalchemy docs 2019-02-13 15:30:08 +03:00
DarkPhoenix
cbd1a34c68 Round cpu/pg like EVE does
To work around some fits where pyfa shows that items do not fit when they actually do
2019-02-13 13:14:18 +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
b0317ea560 Fix mistype 2019-02-12 19:07:59 +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
dfc0a896c4 Do not commit price right away when creating the object 2019-02-12 12:10:17 +03:00
DarkPhoenix
41b6000f6e Rename ranges to something more sensible 2019-02-12 10:17:19 +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
672fd77bec Get market instance only once 2019-02-11 16:18:43 +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
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
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