diff --git a/config.py b/config.py index 74c95d9d1..f7e342c89 100644 --- a/config.py +++ b/config.py @@ -13,8 +13,8 @@ debug = False saveInRoot = False # Version data -version = "1.1.14" -tag = "stable" +version = "1.1.15" +tag = "git" expansionName = "Odyssey" expansionVersion = "1.0" diff --git a/eos b/eos index 971361e16..7835b0925 160000 --- a/eos +++ b/eos @@ -1 +1 @@ -Subproject commit 971361e16552c298d359998a077d160f1107a724 +Subproject commit 7835b0925854e9b790661a6fafd7e9545a9fe203 diff --git a/gui/characterEditor.py b/gui/characterEditor.py index d8af0a122..92116d67f 100644 --- a/gui/characterEditor.py +++ b/gui/characterEditor.py @@ -539,8 +539,8 @@ class APIView (wx.Panel): wx.Panel.__init__ (self, parent, id=wx.ID_ANY, pos=wx.DefaultPosition, size=wx.Size(500, 300), style=wx.TAB_TRAVERSAL) self.Parent.Parent.Bind(CHAR_CHANGED, self.charChanged) - self.apiUrlCreatePredefined = u"https://support.eveonline.com/api/Key/CreatePredefined/8" - self.apiUrlKeyList = u"https://support.eveonline.com/api/Key/Index" + self.apiUrlCreatePredefined = u"https://community.eveonline.com/support/api-key/update/" + self.apiUrlKeyList = u"https://community.eveonline.com/support/api-key/" pmainSizer = wx.BoxSizer(wx.VERTICAL) @@ -586,7 +586,7 @@ class APIView (wx.Panel): pmainSizer.Add(self.btnFetchSkills, 0, wx.ALL, 5) self.btnFetchSkills.Hide() self.btnFetchSkills.Bind(wx.EVT_BUTTON, self.fetchSkills) - self.stAPITip = wx.StaticText( self, wx.ID_ANY, u"You can create a key here (character sheet access only):", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.stAPITip = wx.StaticText( self, wx.ID_ANY, u"You can create a key here (only character sheet access is needed):", wx.DefaultPosition, wx.DefaultSize, 0 ) self.stAPITip.Wrap( -1 ) pmainSizer.Add( self.stAPITip, 0, wx.ALL, 2 ) diff --git a/staticdata b/staticdata index 4ea272a33..01a883a32 160000 --- a/staticdata +++ b/staticdata @@ -1 +1 @@ -Subproject commit 4ea272a3349e48a5bf0974382883482ca3d0faa3 +Subproject commit 01a883a323d91b9cbacf95eeff378b6cb44220da