blitzman
|
85131e6166
|
oh god this isn't gonna work
Merge branch 'ebag_importchanges' into test_import
Conflicts:
config.py
eos/db/saveddata/queries.py
eos/effects/chargebonuswarfarecharge.py
eos/effects/elitebonuscommandshipinformationhiddencs3.py
eos/effects/elitebonuslogisticremotearmorrepairoptimalfalloff1.py
eos/effects/energydestabilizationnew.py
eos/effects/iceharvestingdroneoperationdurationbonus.py
eos/effects/miningforemanstrengthbonus.py
eos/effects/modulebonuswarfarelinkarmor.py
eos/effects/modulebonuswarfarelinkinfo.py
eos/effects/modulebonuswarfarelinkmining.py
eos/effects/modulebonuswarfarelinkshield.py
eos/effects/modulebonuswarfarelinkskirmish.py
eos/effects/moduletitaneffectgenerator.py
eos/effects/remotehullrepair.py
eos/effects/rolebonusremotearmorrepairoptimalfalloff.py
eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py
eos/effects/shipmodesmallmissiledamagepostdiv.py
eos/effects/structureenergyneutralizerfalloff.py
eos/effects/structuremoduleeffectstasiswebifier.py
eos/effects/structurerigmaxtargets.py
eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py
eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py
eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py
eos/effects/techtwocommandburstbonus.py
eos/saveddata/fighter.py
eos/saveddata/fit.py
eos/saveddata/module.py
eve.db
gui/bitmapLoader.py
gui/builtinContextMenus/itemStats.py
gui/builtinStatsViews/miningyieldViewFull.py
gui/builtinViewColumns/misc.py
gui/builtinViews/__init__.py
gui/builtinViews/fittingView.py
gui/contextMenu.py
gui/graphFrame.py
gui/itemStats.py
gui/mainFrame.py
gui/marketBrowser.py
service/__init__.py
service/character.py
service/fit.py
service/port.py
service/prefetch.py
service/pycrest/eve.py
service/settings.py
|
2017-01-23 21:06:12 -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
|
3396056dae
|
bump dev
|
2016-12-18 09:19:47 -05:00 |
|
blitzman
|
366d6c8971
|
bump stable
|
2016-12-18 08:00:19 -05:00 |
|
Ebag333
|
4fb07cc1d0
|
Bunch of pep8 and inspection cleanup
|
2016-12-15 12:43:19 -08:00 |
|
blitzman
|
0d44cbf74a
|
clean up path stuff
(cherry picked from commit d3e360b)
|
2016-12-14 12:24:35 -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
|
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
|
08b5abc7ad
|
Handle unicode, utf8, and windows-1252
(cherry picked from commit 0d4f24a)
|
2016-12-14 10:38:56 -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
|
d3b6bc1c93
|
so many pep8 fixes
(cherry picked from commit bee125d)
|
2016-12-13 20:16:44 -08: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 |
|
blitzman
|
b375d3cb6c
|
Bump dev, fix for #874
|
2016-12-03 18:28:48 -05:00 |
|
blitzman
|
f160aede3e
|
bump release
|
2016-12-02 18:25:31 -05:00 |
|
blitzman
|
e30040c9fd
|
Bump pre-release
|
2016-11-22 20:53:57 -05:00 |
|
blitzman
|
13b452223d
|
bump dev
|
2016-10-02 22:02:50 -04:00 |
|
blitzman
|
c64838f7f5
|
Update effect headers and bump stable
|
2016-09-28 00:20:30 -04:00 |
|
blitzman
|
b5574ca535
|
bump dev
|
2016-09-25 22:04:54 -04:00 |
|
blitzman
|
d1c18d9642
|
Bump stable
|
2016-09-06 23:51:25 -04:00 |
|
blitzman
|
a074199219
|
Bump stable
|
2016-09-01 22:20:51 -04:00 |
|
blitzman
|
f98f6a120b
|
Bump dev, fix issue with applying fleet boosts
|
2016-08-28 19:35:55 -04:00 |
|
blitzman
|
6192343add
|
bump stable
|
2016-08-26 21:55:52 -04:00 |
|
blitzman
|
fef087ae46
|
jk
|
2016-08-26 21:13:03 -04:00 |
|
blitzman
|
0e15adecf2
|
Bump stable
|
2016-08-24 22:31:44 -04:00 |
|
blitzman
|
d81a51bd8c
|
bump version
|
2016-07-24 18:29:36 -04:00 |
|
blitzmann
|
3734be21d6
|
Fix icons and script and version
|
2016-07-03 20:48:20 -04:00 |
|
blitzmann
|
6e2878194c
|
Merge branch 'master' into citadel
Conflicts:
config.py
service/market.py
|
2016-07-03 01:10:26 -04:00 |
|
blitzmann
|
e7780485f1
|
Bump release
|
2016-07-03 00:41:21 -04:00 |
|
blitzmann
|
9255a9e638
|
bump dev
|
2016-07-01 23:38:06 -04:00 |
|
blitzmann
|
02736ac92d
|
Bump version
|
2016-07-01 22:07:56 -04:00 |
|
blitzmann
|
394a9540b0
|
Bump dev
|
2016-05-28 17:01:52 -04:00 |
|
blitzmann
|
9c3b50d622
|
Bump stable
|
2016-05-23 23:23:27 -04:00 |
|
blitzmann
|
30c1c00b9b
|
Bump dev
|
2016-05-18 00:01:48 -04:00 |
|
blitzmann
|
9891aecf19
|
Bump dev
|
2016-05-15 18:40:54 -04:00 |
|
blitzmann
|
1e364913cd
|
Bump version
|
2016-05-14 23:23:04 -04:00 |
|
blitzmann
|
caa10614d9
|
Bump dev, and fix flex hardeners (#601)
|
2016-05-06 20:42:46 -04:00 |
|
blitzmann
|
8823baaef4
|
Bump stable
|
2016-05-02 21:11:29 -04:00 |
|
blitzmann
|
1fe42f6a79
|
Bump dev
|
2016-04-30 22:43:12 -04:00 |
|
blitzmann
|
985107c601
|
Bump version =D
|
2016-04-30 19:56:49 -04:00 |
|
blitzmann
|
e11e368c4b
|
Bump dev version
|
2016-04-12 20:02:30 -04:00 |
|
blitzmann
|
3fa0aa9242
|
Bump dev
|
2016-03-18 23:30:40 -04:00 |
|
blitzmann
|
c42748a5dd
|
Fix #537 - cap battery causing remote cap transfers to apply incorrect values.
Bump to stable 1.20.1
|
2016-03-15 22:46:51 -04:00 |
|
blitzmann
|
91980c9f2c
|
Bump release
|
2016-03-11 00:20:26 -05:00 |
|
blitzmann
|
e53bd70c2c
|
Merge pull request #497 from SpeedProg/master
Added commandline arguments to specify window title and path for savefiles
|
2016-03-10 23:58:56 -05:00 |
|
blitzmann
|
d85f8c0744
|
bump dev
|
2016-02-14 18:10:13 -05:00 |
|
Constantin Wenger
|
cf60bbc904
|
Merge remote-tracking branch 'upstream/master'
updated from upstream
|
2016-02-11 06:53:01 +01:00 |
|