From 910fe99e4480bdcc55e0d3242ddd30c81d07a5ea Mon Sep 17 00:00:00 2001 From: MaruMaruOO Date: Mon, 16 Jul 2018 08:43:41 -0400 Subject: [PATCH 1/3] Bug fix to set implantLocation when importing from clipboard --- service/port.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/service/port.py b/service/port.py index 6ab61e6d7..a0dd0a89c 100644 --- a/service/port.py +++ b/service/port.py @@ -46,7 +46,7 @@ from eos.saveddata.fighter import Fighter from eos.saveddata.module import Module, State, Slot from eos.saveddata.ship import Ship from eos.saveddata.citadel import Citadel -from eos.saveddata.fit import Fit +from eos.saveddata.fit import Fit, ImplantLocation from service.market import Market from utils.strfunctions import sequential_rep, replace_ltgt from abc import ABCMeta, abstractmethod @@ -306,6 +306,8 @@ class Port(object): fit.character = sFit.character fit.damagePattern = sFit.pattern fit.targetResists = sFit.targetResists + useCharImplants = sFit.serviceFittingOptions["useCharacterImplantsByDefault"] + fit.implantLocation = ImplantLocation.CHARACTER if useCharImplants else ImplantLocation.FIT db.save(fit) # IDs.append(fit.ID) if iportuser: # Pulse @@ -337,6 +339,8 @@ class Port(object): fit.character = sFit.character fit.damagePattern = sFit.pattern fit.targetResists = sFit.targetResists + useCharImplants = sFit.serviceFittingOptions["useCharacterImplantsByDefault"] + fit.implantLocation = ImplantLocation.CHARACTER if useCharImplants else ImplantLocation.FIT db.save(fit) return fits From 6583aa9b34596fe53f9c730b29046ffe4438982e Mon Sep 17 00:00:00 2001 From: MaruMaruOO Date: Mon, 16 Jul 2018 10:26:29 -0400 Subject: [PATCH 2/3] Have missing icons display as question mark icons --- gui/bitmap_loader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/bitmap_loader.py b/gui/bitmap_loader.py index c7ad7c548..061e05a0c 100644 --- a/gui/bitmap_loader.py +++ b/gui/bitmap_loader.py @@ -49,7 +49,7 @@ class BitmapLoader(object): @classmethod def getStaticBitmap(cls, name, parent, location): static = wx.StaticBitmap(parent) - static.SetBitmap(cls.getBitmap(name, location)) + static.SetBitmap(cls.getBitmap(name or 0, location)) return static @classmethod From df75646766a993355b55238248fe7ba7fa0083ab Mon Sep 17 00:00:00 2001 From: blitzmann Date: Tue, 17 Jul 2018 02:10:24 -0400 Subject: [PATCH 3/3] bump release --- config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.py b/config.py index 8af9d3dbf..fa073ad9d 100644 --- a/config.py +++ b/config.py @@ -24,7 +24,7 @@ saveInRoot = False # Version data -version = "2.3.0" +version = "2.3.1" tag = "Stable" expansionName = "YC120.7" expansionVersion = "1.2"