Ryan Holmes
|
5c38ab4228
|
Merge pull request #1688 from MaruMaruOO/efs_port
Adds copy to clipboard for Eve Fleet Simulator
|
2018-08-21 20:43:13 -05:00 |
|
Ryan Holmes
|
299243c446
|
Merge pull request #1689 from MaruMaruOO/issue/1683
Update market.service to reflect new booster market groups.
|
2018-08-21 20:34:48 -05:00 |
|
Ryan Holmes
|
970c3a5473
|
Merge branch 'master' into efs_port
|
2018-08-21 20:21:16 -05:00 |
|
Ryan Holmes
|
bc63eaa876
|
Merge pull request #1704 from feyyd/bug/1692
Bug/1692
|
2018-08-21 20:14:44 -05:00 |
|
P
|
b4e765abfa
|
add None checks in deleteFit to prevent exceptions
|
2018-08-20 21:41:50 -07:00 |
|
P
|
6c12e1c5fc
|
fix bug issue 1690 as well
|
2018-08-15 22:23:35 -07:00 |
|
P
|
083b618b71
|
1695 fixes + tox test fixes
|
2018-08-15 20:38:05 -07:00 |
|
MaruMaruOO
|
1f09494df5
|
Merge branch 'master' into efs_port
|
2018-07-27 00:32:23 -04:00 |
|
MaruMaruOO
|
d9827b445f
|
Add versioning data to EFS export
|
2018-07-27 08:03:21 -04:00 |
|
MaruMaruOO
|
46e58ecba7
|
Add module typeIDs to data exported by efsPort
|
2018-07-27 06:51:53 -04:00 |
|
MaruMaruOO
|
c1405fa675
|
More getter swapping for efsPort
|
2018-07-26 17:39:32 -04:00 |
|
MaruMaruOO
|
b7900b0b25
|
Change more efsPort syntax to use getters
|
2018-07-26 17:27:03 -04:00 |
|
MaruMaruOO
|
bef8fbbc3a
|
Used getModifiedItemAttr in efsPort to replace itemModifiedAttributes for consistancy
|
2018-07-26 14:24:55 -04:00 |
|
MaruMaruOO
|
4fc630d44e
|
Minor efsPort linting
|
2018-07-26 12:02:04 -04:00 |
|
MaruMaruOO
|
582a3893d1
|
Removed unneeded initalization from efsPort
|
2018-07-26 11:48:34 -04:00 |
|
MaruMaruOO
|
03e325cdcb
|
Change efsPort.getOutgoingProjectionData to corectly use mod.item.group.name
|
2018-07-26 11:23:39 -04:00 |
|
MaruMaruOO
|
38726675e1
|
Added disintegrator stats
|
2018-07-23 20:28:53 -04:00 |
|
MaruMaruOO
|
fe0266e517
|
Added mitigation for outdated forced groupMarketIDs
|
2018-07-19 05:40:18 -04:00 |
|
MaruMaruOO
|
0a8bb79e47
|
Update market.service to reflect new booster market groups
|
2018-07-19 13:16:59 -04:00 |
|
MaruMaruOO
|
c054a2d80d
|
Trivial lint
|
2018-07-17 23:09:39 -04:00 |
|
MaruMaruOO
|
2f7a3e0287
|
Have imported fits always use implants if present
|
2018-07-17 22:35:09 -04:00 |
|
MaruMaruOO
|
6be77646fc
|
Linting for consistancy
|
2018-07-17 22:32:30 -04:00 |
|
MaruMaruOO
|
ebac100e38
|
Adjusted EFS to clipboard tooltip
|
2018-07-17 04:22:40 -04:00 |
|
MaruMaruOO
|
fe43c2ee2e
|
Merge branch 'master' into efs_port
|
2018-07-17 03:06:34 -04:00 |
|
MaruMaruOO
|
b1f1db1bee
|
Change service.efsPort to a class structure for consistancy.
|
2018-07-17 02:54:01 -04:00 |
|
MaruMaruOO
|
910fe99e44
|
Bug fix to set implantLocation when importing from clipboard
|
2018-07-16 08:43:41 -04:00 |
|
MaruMaruOO
|
4be78db738
|
Added additional data to efs exports moduleNames and moved it to service.efsPort
|
2018-07-16 06:25:56 -04:00 |
|
MaruMaruOO
|
897763e8d5
|
Merge branch 'master' into py3EFFS
|
2018-07-16 04:01:08 -04:00 |
|
blitzmann
|
b57bede510
|
tox fixes
|
2018-07-15 02:51:53 -04:00 |
|
MaruMaruOO
|
7a4c7a8f9f
|
Removed excess diagnostic information
|
2018-07-11 10:28:39 -04:00 |
|
Maru Maru
|
1699b8ceee
|
Add ability to use character implants by default
|
2018-07-11 05:35:19 -04:00 |
|
Maru Maru
|
c0e9878982
|
Merge branch 'master' into py3EFFS
|
2018-07-11 02:23:01 -04:00 |
|
Maru Maru
|
7a078f433a
|
draft of misc patches for main branch
|
2018-07-11 12:05:57 -04:00 |
|
Ryan Holmes
|
8383a645da
|
Merge pull request #1652 from WatchMeCalculate/Issue-1621
Address Issue where evemon xml was not being imported
|
2018-07-09 22:16:07 -04:00 |
|
blitzmann
|
39f7ecdf5c
|
Merge branch 'mutaplasmids'
# Conflicts:
# eve.db
|
2018-06-21 00:22:57 -04:00 |
|
WatchMeCalculate
|
99f14746e4
|
Removed return and re-added apiUpdateCharSheet function
|
2018-06-19 00:16:32 -07:00 |
|
blitzmann
|
8f16fc5c1e
|
Merge branch 'master' into mutaplasmids
# Conflicts:
# eve.db
|
2018-06-17 12:52:49 -04:00 |
|
blitzmann
|
d4dba99363
|
Properly handle projecting an abyssal module (we now copy modules instead of using the same item ID)
|
2018-06-17 00:04:34 -04:00 |
|
blitzmann
|
5c566bae73
|
Introduce special cases for cargo swapping when dealing with abyssal modules (#1649)
|
2018-06-16 21:50:18 -04:00 |
|
blitzmann
|
ed94294584
|
Finish implementing the translated values for the Mutators
|
2018-06-15 01:31:51 -04:00 |
|
blitzmann
|
6fdcce12a3
|
Merge branch 'icons-1621' into v2.2.0b1
# Conflicts:
# eos/db/__init__.py
# eos/db/gamedata/__init__.py
# eos/db/gamedata/item.py
# eos/gamedata.py
# eve.db
|
2018-06-12 21:43:28 -04:00 |
|
blitzmann
|
e19d231eba
|
Merge branch 'master' into v2.2.0b1
# Conflicts:
# eve.db
|
2018-06-12 21:41:04 -04:00 |
|
blitzmann
|
bceaa0d1d5
|
Get mutations to save
|
2018-06-11 23:44:34 -04:00 |
|
blitzmann
|
3670f3289c
|
Convert a module to an abyssal with a mutaplasmid - saving to and loading from database confirmed.
|
2018-06-03 19:50:50 -04:00 |
|
blitzmann
|
19cf3c2036
|
Update various GUI things to show new location for ship icon
|
2018-06-02 14:54:59 -04:00 |
|
WatchMeCalculate
|
87660246b6
|
When re-enabling restrictions only delete incompatible modules
Hardpoints past limit will show up highlighted red.
|
2018-06-01 02:19:14 -07:00 |
|
blitzmann
|
5388ba7a70
|
Remove need for Icon class, references to it's DB relationship, and remove from DB. Also, add the files. All the files.
|
2018-05-31 21:13:12 -04:00 |
|
blitzmann
|
e8efa22a95
|
Merge branch 'singularity'
|
2018-05-30 19:49:40 -04:00 |
|
blitzmann
|
7a18224800
|
pep8
|
2018-05-30 19:34:14 -04:00 |
|
Filip Sufitchi
|
6fc532a6a2
|
Tweak jargon defaults for more entries based on personal experience
|
2018-05-30 15:31:12 -04:00 |
|