blitzmann
968d633d46
Merge branch 'feature/alphaclones' into development
2017-01-26 19:53:27 -05:00
blitzmann
96c3363edc
Merge branch 'master' into feature/alphaclones
...
Conflicts:
eve.db
2017-01-26 19:39:13 -05:00
blitzman
330983d9dd
Merge branch 'master' into development
...
Conflicts:
eve.db
2017-01-22 21:10:06 -05:00
Ryan Holmes
1bb7c4e825
Merge pull request #945 from Ebag333/Patch_1111328
...
Update database to 1111328
2017-01-17 20:39:32 -05:00
Ryan Holmes
450e1427a1
Merge pull request #948 from Ebag333/MiningYield
...
Revert back to /s for mining. Adds /hour to tooltips.
2017-01-17 20:21:15 -05:00
blitzman
5614cec19d
Merge branch 'master' of https://github.com/pyfa-org/Pyfa
2017-01-17 20:18:21 -05:00
blitzman
3f24a4b2c5
Fix for #946 - citadel rig not increasing max targets
2017-01-17 20:18:12 -05:00
Ebag333
4e9e5735dc
Revert "Add check for remote resistance"
...
This reverts commit 269565e959
2017-01-17 10:03:14 -08:00
Ebag333
b1a6189c55
Revert back to /s for mining. Adds /hour to tooltips.
2017-01-17 09:29:22 -08:00
Ebag333
269565e959
Add check for remote resistance
2017-01-17 00:28:44 -08:00
Ryan Holmes
e45027a66c
Merge pull request #910 from Ebag333/UnicodePaths_v2
...
Unicode Paths 2: The Reckoning
2017-01-14 02:44:24 -05:00
Ebag333
2d3310d8e0
Update database to 1111328
2017-01-13 15:10:36 -08:00
Ryan Holmes
77066f0389
Fix Rabisu effects ( #941 )
2017-01-11 15:06:50 -05:00
blitzman
5e0567ef4d
Merge branch 'master' of https://github.com/pyfa-org/Pyfa
2017-01-10 22:51:38 -05:00
blitzman
b49de4b0fa
Update to 1108313
2017-01-10 22:51:27 -05:00
blitzman
372495a83a
Remove vestigial appendage
2017-01-10 22:45:41 -05:00
blitzman
468a4644d6
Merge branch 'development'
...
Conflicts:
eos/db/saveddata/queries.py
2017-01-10 22:42:01 -05:00
Ryan Holmes
29d0f102fd
Move AT14 ships to the Limited Edition group ( #935 )
2017-01-05 11:38:47 -05:00
blitzman
ebc7173c50
Fix issues with unexpected module positions (see #932 )
2017-01-04 23:48:37 -05:00
blitzman
43f1ac78a6
Keep subsystem module in the same position when swapping them out (see #932 )
2017-01-04 23:17:56 -05:00
Ryan Holmes
d489fdd700
Merge pull request #913 from resinneublem/remember-user-filters-take2
...
Remembers user's meta filtering choices
2017-01-04 00:10:48 -05:00
blitzman
d6b1e4465e
Merge branch 'test/cat-has-fits'
2017-01-03 01:32:50 -05:00
blitzman
5cbffcf3ac
Handle counting number of fits per ship category more efficiently (see #819 )
2017-01-03 01:32:12 -05:00
blitzman
c91723516e
Do not calculate projected fits for command fits (see #931 )
2017-01-02 23:54:06 -05:00
Ryan Holmes
a68f45d15a
Merge pull request #927 from Ebag333/BurstProjectors
...
ECM Burst Projectors effect
2017-01-02 19:58:10 -05:00
Ryan Holmes
152a708ee8
Merge pull request #920 from Ebag333/Database_Cleanup
...
Database Validation and Cleanup
2017-01-02 19:25:26 -05:00
blitzman
a0ec13d2ed
More tweaks
2017-01-02 18:45:08 -05:00
Ebag333
3313b7421f
Move query logic into own function in queries. Tighten up flow in DB repair. Catch null values.
2017-01-02 13:41:39 -08:00
blitzman
a76ee6b2fc
more tweaks
2017-01-02 12:07:15 -05:00
Ebag333
0056b704d4
Add other projector effects. Only allow it to affect the specific attribute it's modifying.
2017-01-02 03:18:54 -08:00
Ebag333
c1ead5fe27
change method for retreiving count
2017-01-02 00:29:44 -08:00
blitzman
85a89339a7
Cleaned up database corruption stuff
2017-01-02 00:58:54 -05:00
Ryan Holmes
55f82c48bc
Merge pull request #929 from Ebag333/Character_Import_Sanitization
...
Add some sanity checks and validation of imported character data
2017-01-02 00:38:48 -05:00
Ebag333
f4761e099b
Don't let people rename built in chars
2017-01-01 13:17:39 -08:00
Ebag333
be3696deba
Add some sanity checks and validation of incoming data
2017-01-01 12:47:28 -08:00
Ebag333
cd41e9e9be
Change to use skill rather than group, and modify correct attribute
2017-01-01 03:08:38 -08:00
Resin Neublem
d6db30b7fc
We weren't setting user selection in all branches
...
I heavily refactored the button click handler to make it a little easier to understand
2016-12-28 19:54:37 -05:00
Ryan Holmes
fd066c2150
Merge branch 'Ebag333-EFTBoosterImports' into development
2016-12-28 17:46:33 -05:00
Ebag333
f9ba95b3de
Check the ness to see if it's an implant, booster, or something else.
...
Log it if it's something else and don't try and import it. This prevents
a bad line from failing the entire import, and (hopefully) we know about
it.
2016-12-27 12:32:52 -08:00
Ebag333
7ee4d1d588
Try loading item as a booster if implant fails.
2016-12-26 23:29:22 -08:00
Ebag333
cef5842344
Database validation and cleanup
2016-12-26 21:54:52 -08:00
Resin Neublem
a7b6647135
Remembers user's meta filtering choices
...
There is a lot of logic that overwrites the user's choices of meta
filtering on every search.
That's a little too clever. Especially if the user is looking for
different variations of a certain meta.
If a user wants to include the other meta buttons they can re-add them
after filtering.
Extra care has to be taken with Windows. If a button is Enabled=False AND
SetValue=True, then it looks like it's Enabled=True, but clicking it
doesn't do anything. So we handle that logic in it's own class
closes: https://github.com/pyfa-org/Pyfa/issues/818
2016-12-19 22:39:56 -05:00
Ebag333
bef17e53c6
Recreating wheels
2016-12-19 00:11:55 -08:00
Ebag333
d4b6099d6e
Handle unicode, utf8, and windows-1252
...
(cherry picked from commit 0d4f24a
2016-12-18 14:11:55 -08:00
blitzman
ff60538e21
Revert "Merge branch 'Ebag333-UnicodePaths' into development"
...
This reverts commit 8a6ef788b3cf91ae7627
2016-12-18 15:56:06 -05:00
Ryan Holmes
50c6133046
Revert "Remembers user's meta filtering choices"
2016-12-18 10:09:55 -05:00
Ryan Holmes
b7d7b80544
Merge pull request #829 from resinneublem/remember-user-filters
...
Remembers user's meta filtering choices
2016-12-18 10:07:15 -05:00
blitzman
2b9342692d
working commit
2016-12-18 09:45:26 -05:00
blitzman
a24e247f1b
Merge branch 'master' into development
...
Conflicts:
eos/effects/usemissiles.py
eos/saveddata/fit.py
2016-12-18 09:24:39 -05:00
blitzman
3396056dae
bump dev
2016-12-18 09:19:47 -05:00
