blitzmann
e19d231eba
Merge branch 'master' into v2.2.0b1
...
# Conflicts:
# eve.db
2018-06-12 21:41:04 -04:00
DarkPhoenix
d48f9354ec
Update database (vedmak fitting changes) and do relevant string updates
...
Also change jsontosql script to ignore fsdtypeoverrides which is no longer dumpable by phobos
2018-06-05 20:02:00 +03:00
blitzmann
20f57146c4
Merge branch 'master' into mutaplasmids
...
# Conflicts:
# eve.db
2018-06-03 16:31:20 -04:00
blitzmann
d0777602e7
Clean up unused effect files now that the effects script works (hopefully)
2018-05-29 21:49:32 -04:00
blitzmann
618507f88c
Fix the effects used by script (no longer restricted on category / group), and fix many effects headers
2018-05-29 21:43:25 -04:00
blitzmann
ba2471e75c
Add new icons files
2018-05-29 20:15:05 -04:00
blitzmann
8ab709e590
* Update database (unpublish Abyssal items, for now)
...
* Add eve data version and datetime to about window (temp measure until we can get a better about window implemented)
2018-05-29 19:37:55 -04:00
blitzmann
d3bd52fe07
Get dynamic attributes JSON saved to the database... now for the tinkering to begin!
2018-05-25 19:18:51 -04:00
blitzmann
afd16e1afd
Add new warfareBuffID, and fix issue with going to effect file in debug
2018-05-20 14:10:37 -04:00
blitzmann
bc23417eae
Start working on Abysmal space environment effects. The values produced for the infernal weather (calm firestorm) thermic resist penalties are spot on according to my testing. :D
2018-05-20 12:53:33 -04:00
blitzmann
d84525876a
Gather abysmal environnments into database
2018-05-20 00:52:48 -04:00
blitzmann
86576581cd
Break out the phobos dump from the data compilation (dump has to work in py2, whereas compilation requires py3 due to hooking directly in with EOS classes). protip: PyCharm configurations are awesome
2018-05-13 01:17:59 -04:00
blitzmann
aa2ffaf1ea
Update installer script and create new dist script for windows. todo: find out hwo to invoke PyInstaller from python
2018-05-12 22:49:18 -04:00
blitzmann
c99afa79e1
Merge branch 'test-3'
2018-05-07 21:54:51 -04:00
blitzmann
fc35d7bb26
Add mutaplasmids to group listing for sql inclusion
2018-05-02 22:32:49 -04:00
blitzmann
0456cb2f96
Merge remote-tracking branch 'origin/master' into test-3
2018-02-16 22:26:10 -05:00
blitzmann
e16ae88ed9
Fix the item diff script not looking at all items needed
2018-02-15 20:07:06 -05:00
blitzmann
40ce7b7c0b
Merge branch 'master' into test-3
...
# Conflicts:
# .gitignore
# eos/saveddata/character.py
# service/network.py
# service/price.py
2017-12-10 22:36:15 -05:00
blitzmann
b30b3fcbf1
Merge branch 'master' into test-3
...
Conflicts:
eos/gamedata.py
eos/saveddata/booster.py
eos/saveddata/character.py
gui/builtinAdditionPanes/commandView.py
gui/builtinContextMenus/commandFits.py
gui/builtinMarketBrowser/itemView.py
gui/builtinMarketBrowser/marketTree.py
gui/builtinPreferenceViews/pyfaGeneralPreferences.py
gui/builtinShipBrowser/categoryItem.py
gui/builtinShipBrowser/fitItem.py
gui/builtinShipBrowser/navigationPanel.py
gui/builtinShipBrowser/raceSelector.py
gui/builtinShipBrowser/shipItem.py
gui/builtinStatsViews/priceViewFull.py
gui/builtinViews/fittingView.py
gui/characterEditor.py
gui/characterSelection.py
gui/chromeTabs.py
gui/crestFittings.py
gui/itemStats.py
gui/mainFrame.py
scripts/itemDiff.py
service/price.py
2017-11-23 11:19:05 -05:00
blitzmann
f0baba10df
Update effects
2017-11-22 23:04:32 -05:00
blitzmann
d45d7204d2
Merge branch 'release/v1.33.2' into development
...
Conflicts:
config.py
2017-11-22 21:51:19 -05:00
blitzmann
25df05a15d
Clean up alpha clones for December 2017 release - also runs a few sanity checks to make sure that CCP doesn't forget to include a skill in one of the races
2017-11-22 21:42:25 -05:00
blitzmann
c4f41fb5fa
Update to 1209099 and rename old komodo skill
2017-11-12 16:52:56 -05:00
Ryan Holmes
fd6e318ae3
Release/v1.33.0 ( #1319 )
...
* update database file to SISI 1202899
* Effect and group renaming
* Add civilian modules (#1308 )
* Add new effects
* update effect headers
* update database to tq - lifeblood (1203953)
* Update renders
* Update icons
* bump version
* fix tox errors
* change up tox config to ignore E722
* more tox ignores
* Try disabling tests for now. Rifter stats changed, causing breakage. This is why we need properly mocked data, not crap straight from the database.
* Try this
* more testing
* Fuck it, disable branch protection until I can evaluate the test failures and what needs to be done to get them back on the path
2017-10-25 23:33:05 -04:00
Ryan Holmes
3fb7411b9d
Issue/1305 ( #1311 )
...
* Bump dev version
* fix issue in itemDiff
* Do not apply Prop Jamming to Grapplers (#1305 )
2017-10-08 21:13:38 -04:00
Ryan Holmes
dfe3d5c82a
Update forum references ( #1301 )
2017-09-24 18:00:21 -04:00
blitzmann
be84cf1db7
formatting
2017-07-09 18:59:07 -04:00
blitzmann
de35692666
Fix a few things with affected by tab (indentation issue, overwriting modifier incorrectly)
2017-07-09 13:18:28 -04:00
blitzmann
49b2e42d8c
Fix subsystem count, requires post processing of data from CCP when building the database... this may be fixed by the time it releases, but maybe not, and I don't want to forget about it
2017-07-09 12:17:07 -04:00
blitzmann
307ccd10e8
Implement migration for t3c configurations
2017-07-09 00:34:12 -04:00
Ryan Holmes
828b18d0fd
py2to3 automatic conversion. Woot!
2017-06-12 16:12:45 -04:00
blitzmann
42e64a6223
Fix jsonToSql script and issue with character sec status setter
2017-05-08 21:24:29 -04:00
Ebag333
518f7c9e03
build improvements
...
(cherry picked from commit 4500bc1)
2017-02-08 13:18:51 -08:00
blitzman
c25a07c95b
Stuff
2017-02-07 00:32:45 -05:00
blitzmann
96c3363edc
Merge branch 'master' into feature/alphaclones
...
Conflicts:
eve.db
2017-01-26 19:39:13 -05:00
blitzman
14bf7ddf7a
fix renders (revert back to previous ones)
2016-12-18 07:52:49 -05:00
blitzman
90c1033437
add clone grades to the client extraction list
2016-12-11 20:27:27 -05:00
blitzman
b6420b9a4b
Get alpha clones in the database
2016-12-11 15:44:14 -05:00
blitzman
019b8e93b4
Remove effect files for effects that no longer exist
2016-11-27 21:33:47 -05:00
blitzman
6bd51ff0d5
Fix for missing market groups ( #842 )
2016-11-23 20:43:05 -05:00
Ebag333
5bca2d723e
Change from multi to en-us only
...
Allows this to run in 32 bit Python.
2016-11-15 10:10:19 -08:00
blitzman
ed24ef2615
Delete projected modules from citadels
2016-08-28 20:22:30 -04:00
blitzman
be6addf4d0
update dist (holy shit how long has this not been in master?)
2016-08-24 22:16:05 -04:00
blitzmann
c3983a26c5
Add structure rigs
2016-07-05 00:21:08 -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
c7573ad4c3
Update icons / fix script
2016-07-01 00:44:17 -04:00
blitzmann
06f402bb9d
Add sde icon script
2016-06-28 23:34:39 -04:00
blitzmann
10f51b41b7
Fix context menu with structure modules (no meta information), add citadel icons.
2016-05-15 19:16:51 -04:00
blitzmann
e3a3d287bf
Strip leading/trailing whitespace from strings when converting data to json ( #607 )
2016-05-11 21:07:22 -04:00
