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
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
blitzman
366d6c8971
bump stable
2016-12-18 08:00:19 -05:00
blitzman
14bf7ddf7a
fix renders (revert back to previous ones)
2016-12-18 07:52:49 -05:00
blitzman
30cce09063
actually fix database
2016-12-18 06:27:37 -05:00
blitzman
9a50ebfc47
fix database
2016-12-18 05:51:22 -05:00
blitzman
0f05b60c20
Fix for #901
2016-12-18 05:47:56 -05:00
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
blitzman
8ab6e26def
Start refactoring the command burst effects in a way that's not complete and total shit (only slightly shit)
2016-12-13 23:55:56 -05:00
Ebag333
cd7d25e4e1
Add skill bonus
2016-12-13 14:28:43 -08:00
Ebag333
1e5e9122ae
Change gate to handle missiles with 0 values
2016-12-13 14:09:56 -08:00
Ebag333
506c7d31ca
Update DB. Add defender missile effect.
2016-12-13 13:48:58 -08:00
Ryan Holmes
54cc5abf21
Delete implants.py
...
This also shouldn't have been committed.
2016-12-13 13:49:19 -05:00
Ryan Holmes
18e913d9ba
Delete iconIDs.yaml
...
this shouldn't have been commited. whoops
2016-12-13 13:48:47 -05:00
Ryan Holmes
180de97893
Merge pull request #738 from Ebag333/Remove-Command-Boosts
...
Purging fleet bonuses from code base
2016-12-12 00:54:06 -05:00
blitzman
f198ff1773
more clean up
2016-12-12 00:49:47 -05:00
blitzman
55c13d1ad0
Merge branch 'master' into Ebag333-Remove-Command-Boosts
2016-12-12 00:43:52 -05:00
blitzman
16505b30bf
working commit
2016-12-12 00:43:42 -05:00
blitzman
95b3f0a21c
Merge branch 'Remove-Command-Boosts' of https://github.com/Ebag333/Pyfa into Ebag333-Remove-Command-Boosts
...
Conflicts:
eos/db/saveddata/fleet.py
eos/db/saveddata/queries.py
gui/additionsPane.py
2016-12-12 00:41:47 -05:00
blitzman
6adcfc52cd
Merge branch 'master' of https://github.com/pyfa-org/Pyfa
2016-12-12 00:27:41 -05:00
blitzman
0a28fb60df
oops
2016-12-12 00:27:36 -05:00
Ryan Holmes
2bab1464ee
Merge pull request #811 from Ebag333/requirements.txt
...
Requirements for Pyfa
2016-12-12 00:25:32 -05:00
blitzman
7875c2acaa
Fix titan command effects
2016-12-12 00:24:50 -05:00
blitzman
49bf40484d
Merge branch 'Ebag333-VoidBombs' into development
2016-12-11 23:27:40 -05:00
blitzman
07148f1e7f
Merge branch 'VoidBombs' of https://github.com/Ebag333/Pyfa into Ebag333-VoidBombs
...
Conflicts:
eos/effects/usemissiles.py
2016-12-11 23:27:30 -05:00
blitzman
8a6ef788b3
Merge branch 'Ebag333-UnicodePaths' into development
2016-12-11 23:06:23 -05:00
blitzman
d3e360b7c0
clean up path stuff
2016-12-11 23:03:09 -05:00
blitzman
b1bba74c5a
Merge branch 'UnicodePaths' of https://github.com/Ebag333/Pyfa into Ebag333-UnicodePaths
2016-12-11 23:01:08 -05:00
Ryan Holmes
cf91ae7627
Merge pull request #890 from Drezil/master
...
fixed parameters in call when adding neuts to structures.
2016-12-11 19:17:25 -05:00
Stefan Dresselhaus
0ba88d081a
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.
2016-12-11 21:56:17 +01:00
Stefan Dresselhaus
4f77dff6dd
fixed parameters in call when adding neuts to structures.
2016-12-11 20:25:55 +01:00
blitzman
2b3e646213
bump dev
2016-12-11 14:18:48 -05:00
blitzman
e0e7478857
bump stable
2016-12-10 19:43:34 -05:00
Ryan Holmes
828d722be8
Merge pull request #807 from IndictionEve/ImportExportFighters
...
Fighters for export and import functions
2016-12-10 02:09:45 -05:00
