blitzman
4f8493d1bb
Merge branch 'Ebag333-Patch_1105543'
2016-12-16 21:27:19 -05:00
blitzman
58dd629956
update db
2016-12-16 21:27:11 -05:00
blitzman
936b746954
update headers
2016-12-16 21:19:00 -05:00
blitzman
ef14bfac58
Merge branch 'Patch_1105543' of https://github.com/Ebag333/Pyfa into Ebag333-Patch_1105543
2016-12-16 21:16:07 -05:00
blitzman
291f73b661
fix for #905
2016-12-16 20:59:54 -05:00
blitzman
3d9dae0d52
fuuu
2016-12-16 20:50:36 -05:00
blitzman
017c37c4af
Fix for #892
2016-12-16 20:49:42 -05:00
blitzman
ee0c852ddb
Fix titan effects and issue in which all warefarebuffs may not get run (range too short). This should also shore up ( #897 )
2016-12-16 20:17:20 -05:00
blitzman
d63627a37b
More cleanup
2016-12-16 19:26:54 -05:00
blitzman
b1c9e70f95
Merge branch 'command-refactor'
2016-12-16 19:20:44 -05:00
blitzman
3ac2fd870f
clean up
2016-12-16 19:20:30 -05:00
Ebag333
af7272cd10
fix dual reference back to same object
2016-12-15 17:08:59 -08:00
Ebag333
d7c71f5d47
fix some, missed import references.
2016-12-15 16:17:10 -08:00
Ebag333
c858fc2859
Remove an inline import. Fix a reference that is missing.
2016-12-15 15:39:19 -08:00
Ebag333
f76f44e9f3
Fix port references, imports, and add some logging
2016-12-15 15:20:29 -08:00
Ebag333
4fb07cc1d0
Bunch of pep8 and inspection cleanup
2016-12-15 12:43:19 -08:00
Ebag333
658a87cbc0
Single line change to fix most (all??) of the problems
2016-12-15 12:10:03 -08:00
Ebag333
956fa7a8b7
Fixing some issues due to import cleanup
2016-12-14 13:06:13 -08:00
blitzman
0ebb992354
more clean up
...
(cherry picked from commit f198ff1 )
2016-12-14 12:44:42 -08:00
blitzman
37f8253836
oops
...
(cherry picked from commit 0a28fb6 )
2016-12-14 12:26:22 -08:00
blitzman
200ff5a1a4
Fix titan command effects
...
(cherry picked from commit 7875c2a )
2016-12-14 12:26:08 -08:00
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