P
b4e765abfa
add None checks in deleteFit to prevent exceptions
2018-08-20 21:41:50 -07:00
MaruMaruOO
2f7a3e0287
Have imported fits always use implants if present
2018-07-17 22:35:09 -04:00
MaruMaruOO
910fe99e44
Bug fix to set implantLocation when importing from clipboard
2018-07-16 08:43:41 -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
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
blitzmann
b097818f1b
Do not allow import of unpublished items (temporary measure to prevent abyssal items)
2018-05-29 21:01:55 -04:00
blitzmann
a706da8adc
Remove some of the redundant jargon keywords
2018-05-27 12:12:20 -04:00
Ryan Holmes
829fd12163
Merge pull request #1575 from ftsartek/patch-1
...
Jargon defaults updated for significantly more options
2018-05-27 12:08:55 -04:00
blitzmann
e95cbdd19b
Re-work the wormhole (now call Environmental) context menu
2018-05-23 00:38:30 -04:00
blitzmann
eaae51f8d8
Add status messages back to ESI fitting export ( #1502 )
2018-05-21 23:37:15 -04:00
blitzmann
2f9d2e2a60
Force command processors not to show ( #1562 )
2018-05-21 23:15:41 -04:00
blitzmann
a8c57bbdeb
Merge branch 'singularity' into abysmal_weather
2018-05-20 15:57:17 -04:00
blitzmann
e7c826b71c
Merge branch 'master' into singularity
2018-05-20 15:56:12 -04:00
blitzmann
2cac214f46
tox
2018-05-20 15:55:26 -04:00
blitzmann
7ac4b52d20
Do all localization effects
2018-05-20 15:05:41 -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
891c20eea7
Merge branch 'master' into singularity
2018-05-20 00:22:24 -04:00
Ryan Holmes
a59949a57a
Merge pull request #1578 from minlexx/esi_proxy
...
Use proxies from Pyfa's "Network settings" for ESI requests
2018-05-19 17:07:57 -04:00
blitzmann
caf31517ca
Fix attempt for #1560
2018-05-18 01:18:46 -04:00
ftsartek
5aa14de0c4
Update defaults.yaml
...
extra update to include two more american/british english translations
2018-05-17 14:49:00 +12:00
Alexey Min
63074a2b85
Reduce code duplication:
...
Network settings class now provides its own method to get proxy settings dict in requests format.
This method can be used both in network service and esi access, reducing code duplication.
2018-05-15 22:13:04 +03:00
Alexey Minnekhanov
bec746b76f
Use proxies from Pyfa's "Network settings" for ESI requests
2018-05-15 12:48:18 +03:00
blitzmann
eeb700c75d
Get back into tox's good graces
2018-05-15 01:41:32 -04:00
blitzmann
deecfb31dc
Merge tag 'v2.0.1' into singularity (bring sisi code up to date with pyfa 2 / py3 / wx4)
...
# Conflicts:
# eos/effects/techtwocommandburstbonus.py
2018-05-15 01:17:51 -04:00
ftsartek
f52d091f9a
Updated for significantly more options
2018-05-15 10:05:42 +12:00
blitzmann
a2877f6b5f
Merge branch 'master' of https://github.com/pyfa-org/Pyfa
2018-05-14 01:03:06 -04:00
Ryan Holmes
acf6b3dffd
Merge pull request #1549 from flashspys/patch-1
...
Add Drone Damage Amplifier to defaults
2018-05-14 00:39:44 -04:00
blitzmann
b6a1c4b308
Add support for using own client details (messy code, but it works!)
2018-05-14 00:37:26 -04:00
blitzmann
e29ab817af
Add the client details back to the preferences page
2018-05-13 13:27:49 -04:00
blitzmann
5cc6b6c69c
Move over all esi stuff to it's own class, which the esi service extends from. Also fix an issue in the EVE fittings browser where deleting a fit didn't actually remove it from the list of fits (due to that list being populated by the return data of ESI, which can be cached). More clean up.
2018-05-12 13:57:14 -04:00
blitzmann
0365f71c00
Move over ESI functionality to be completely separate from esipy
2018-05-12 12:25:34 -04:00
blitzmann
4d666907c9
Start breaking out esipy, first up: getting for login
2018-05-11 23:24:30 -04:00
