blitzman
0d44cbf74a
clean up path stuff
...
(cherry picked from commit d3e360b )
2016-12-14 12:24:35 -08:00
Stefan Dresselhaus
bb216aa6ed
wrong index in tuple.
...
Array looks normally so:
(RunTime, Value, etc., etc.)
("normal", -10, ..., ...)
I guess "RunTime" got added and this is an artifact as it is rarely
called.
Fixes Orca-Mining-Boost onto itself and other ships.
(cherry picked from commit 0ba88d0 )
2016-12-14 12:22:41 -08:00
Stefan Dresselhaus
eccf405ba8
fixed parameters in call when adding neuts to structures.
...
(cherry picked from commit 4f77dff )
2016-12-14 12:22:28 -08:00
blitzman
9df87f61cd
bump dev
...
(cherry picked from commit 2b3e646 )
2016-12-14 12:22:17 -08:00
blitzman
4186e19c65
bump stable
...
(cherry picked from commit e0e7478 )
2016-12-14 12:22:10 -08:00
blitzman
57edc32a4b
Clean up new tactical mode stats stuff
...
(cherry picked from commit c9bc234 )
2016-12-14 12:21:00 -08:00
blitzman
9cfa0748ac
fix for #871
...
(cherry picked from commit 70af2b0 )
2016-12-14 12:20:42 -08:00
blitzman
df859a2132
Fix for #883
...
(cherry picked from commit 753b5c5 )
2016-12-14 12:19:54 -08:00
blitzman
52257d60ac
fix a couple command effects
...
(cherry picked from commit 9bb86b4 )
2016-12-14 12:18:46 -08:00
blitzman
96ddb0bbff
Fixed a few issues with command bursts
...
(cherry picked from commit 9071960 )
2016-12-14 12:18:41 -08:00
Ebag333
b529a28715
Implement fittingMode
...
(cherry picked from commit 5eb2fef )
2016-12-14 12:18:34 -08:00
Ebag333
ea3a374ced
Add logging, because why not
...
(cherry picked from commit 9403a1f )
2016-12-14 12:17:55 -08:00
Ebag333
2eacadf08f
Don't use try for fittingView, and don't show remove item for modes.
...
(cherry picked from commit fd224d6 )
2016-12-14 12:17:13 -08:00
Ebag333
1a127bb1a6
Add ability to look at tactical mode item info.
...
(cherry picked from commit f5776a0 )
2016-12-14 12:16:51 -08:00
Ebag333
edfa130939
Fix tooltip order
...
(cherry picked from commit 61d1878 )
2016-12-14 12:15:09 -08:00
blitzman
7fbd89392a
Revert "Remove effect files that are not used by any item"
...
This reverts commit b29fa2467a .
(cherry picked from commit 4a95156 )
2016-12-14 12:14:39 -08:00
Indiction
9f4b31979c
Adding Fighter Support CREST
...
(cherry picked from commit ab5f348 )
2016-12-14 12:14:11 -08:00
blitzman
9ecfc475e3
Bump dev, fix for #874
...
(cherry picked from commit b375d3c )
2016-12-14 12:13:55 -08:00
blitzman
84dc93ac54
bump release
...
(cherry picked from commit f160aed )
2016-12-14 12:13:02 -08:00
Ebag333
7532bcda08
Clean up some stuff left over from cherry picks
2016-12-14 10:42:04 -08:00
Ebag333
08b5abc7ad
Handle unicode, utf8, and windows-1252
...
(cherry picked from commit 0d4f24a )
2016-12-14 10:38:56 -08:00
Indiction
38bf143704
Fighters for export and import functions
...
(cherry picked from commit 04c30e7 )
2016-12-14 10:24:45 -08:00
Ebag333
a440ed3b37
Drop unicode
...
(cherry picked from commit 7fe7056 )
2016-12-14 10:20:57 -08:00
Ebag333
39b7d9fdeb
Change to shorthand unicode
...
(cherry picked from commit ab32a3a )
2016-12-14 10:20:53 -08:00
Ebag333
dfa728a486
Handle Lockbreaker, Void, and Focused Void Bombs
...
(cherry picked from commit ea3e5e2 )
2016-12-14 10:20:48 -08:00
Ebag333
7bd8ca5a55
Removed actual fleet files. Cleaned up __init__.py that had references.
...
(cherry picked from commit b6c5183 )
2016-12-14 10:20:20 -08:00
Ebag333
627977ab51
Purging fleet bonuses from code base
...
(cherry picked from commit 68f4570 )
2016-12-14 10:18:19 -08:00
Ebag333
e3b592977a
Make some imports more explicit
2016-12-13 23:49:37 -08:00
Ebag333
622a734405
remove lazy import. Fix test
2016-12-13 23:35:29 -08:00
Ebag333
28404cd8bb
bajillion pep8 fixes to pass tox
2016-12-13 23:31:39 -08:00
Ebag333
be53dedb18
Large pep8 compliance to make work for Tox
2016-12-13 21:23:01 -08:00
Ebag333
b2a5a20650
Travis and CodeCov files
2016-12-13 20:37:52 -08:00
Ebag333
57f930c83e
Cherry pick commits from @a-tal
2016-12-13 20:35:03 -08:00
a-tal
b4dd65cf3e
dont use built-in function format as a var name
...
(cherry picked from commit 74dd6cf)
2016-12-13 20:19:27 -08:00
a-tal
4a9b1df9b4
pep8 fixes
...
(cherry picked from commit 5dc43b2)
2016-12-13 20:18:57 -08:00
a-tal
874bfb3305
missed a type
...
(cherry picked from commit f416c77)
2016-12-13 20:18:04 -08:00
a-tal
ab9c925c47
non-standard - use forces coding declarations
...
(cherry picked from commit 6e17d88)
2016-12-13 20:17:56 -08:00
a-tal
d3b6bc1c93
so many pep8 fixes
...
(cherry picked from commit bee125d)
2016-12-13 20:16:44 -08:00
Ebag333
510492e5e9
More refactoring, elimited another recursive import
2016-12-03 17:12:16 -08:00
Ebag333
6ef57e735e
Missed imports. Fixed now.
2016-12-03 06:21:52 -08:00
Ebag333
ea8a4c01cb
Eliminate export calling fit.py (no need)
...
Except for 1 (clipboardXML), same number of lines of code in mainFrame,
lots of code gone from fit, and no more complicated. Also spotted an
import reference that got missed.
2016-12-02 12:50:49 -08:00
Ebag333
d963327ed4
Make it run again
2016-12-02 03:13:54 -08:00
Ryan Holmes
bb96b0af1a
Merge pull request #828 from resinneublem/group-drones-for-dna-export
...
Groups drones before generating DNA
2016-12-02 01:05:37 -05:00
blitzman
34e3aa20ba
Merge branch 'Ebag333-T3CSubRemoteRepEffect'
2016-12-02 01:02:27 -05:00
blitzman
5a846c36ab
Merge branch 'T3CSubRemoteRepEffect' of https://github.com/Ebag333/Pyfa into Ebag333-T3CSubRemoteRepEffect
...
Conflicts:
eos/effects/subsystembonusamarrdefensive2remotearmorrepairamount.py
eos/effects/subsystembonuscaldaridefensive2remoteshieldtransporteramount.py
eos/effects/subsystembonusgallentedefensive2remotearmorrepairamount.py
eos/effects/subsystembonusminmatardefensive2remoteshieldtransporteramount.py
2016-12-02 01:02:17 -05:00
Ryan Holmes
7bd6344359
Merge pull request #790 from IndictionEve/miningyieldperhour
...
Mining Yield "per hour".
2016-12-02 00:52:00 -05:00
Ryan Holmes
b76e8df1bf
Merge pull request #689 from MrNukealizer/RAH-v3
...
RAH v3
2016-12-01 01:06:24 -05:00
blitzman
5a0165282f
Add reverse sorting / name column to sorting
2016-12-01 00:40:27 -05:00
blitzman
597d9f2612
Merge branch 'SortableCompare' of https://github.com/Ebag333/Pyfa into Ebag333-SortableCompare
2016-12-01 00:07:44 -05:00
blitzman
4d9c2898bf
Fix orca effects ( #866 )
2016-12-01 00:07:24 -05:00