From 1762c875d5531b77c8c5ed6af680679b89e69a49 Mon Sep 17 00:00:00 2001 From: sakari Date: Wed, 8 Aug 2012 18:09:16 +0200 Subject: [PATCH] Update release number --- config.py | 4 ++-- eos | 2 +- service/market.py | 3 ++- staticdata | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/config.py b/config.py index 6b17286b7..870bb448a 100644 --- a/config.py +++ b/config.py @@ -13,10 +13,10 @@ debug = False saveInRoot = False # Version data -version = "1.1.8" +version = "1.1.9" tag = "git" expansionName = "Inferno" -expansionVersion = "1.1" +expansionVersion = "1.2" pyfaPath = None savePath = None diff --git a/eos b/eos index f43151b77..2c71f579a 160000 --- a/eos +++ b/eos @@ -1 +1 @@ -Subproject commit f43151b771fc8944f44ab008eef3c4ff6373571b +Subproject commit 2c71f579a453051c8039911fc79b74f68521caf8 diff --git a/service/market.py b/service/market.py index fe8ed04f8..8dcf2a7fc 100644 --- a/service/market.py +++ b/service/market.py @@ -249,7 +249,7 @@ class Market(): "Civilian Remote Armor Repair System": 760, # Ship Equipment > Civilian Modules "Civilian Remote Shield Transporter": 760, # Ship Equipment > Civilian Modules "Civilian Stasis Webifier": 760, # Ship Equipment > Civilian Modules - "Civilian Thermic Dissipiation Field": 760, # Ship Equipment > Civilian Modules + "Civilian Thermic Dissipation Field": 760, # Ship Equipment > Civilian Modules "Civilian Scourge Light Missile": 920, # Ammunition & Charges > Missiles > Light Missiles > Standard Light Missiles "Civilian Warp Disruptor": 760, # Ship Equipment > Civilian Modules "Genolution Core Augmentation CA-1": 618, # Implants & Boosters > Implants > Attribute Enhancers > Implant Slot 1 @@ -280,6 +280,7 @@ class Market(): "Tetrimon Data Analyzer I": 714, # Ship Equipment > Electronics and Sensor Upgrades > Scanners > Data and Composition Scanners "Whelan Machorin's Ballistic Smartlink": 1189, # Implants & Boosters > Implants > Skill Hardwiring > Implant Slot 10 > Missile Implants "Zor's Custom Navigation Hyper-Link": 1176 } # Implants & Boosters > Implants > Skill Hardwiring > Implant Slot 8 > Navigation Implants + self.ITEMS_FORCEDMARKETGROUP_R = self.__makeRevDict(self.ITEMS_FORCEDMARKETGROUP) # Misc definitions diff --git a/staticdata b/staticdata index b5d7330a9..9f77ea686 160000 --- a/staticdata +++ b/staticdata @@ -1 +1 @@ -Subproject commit b5d7330a917a37ba49ff4339db182c9c0f00d119 +Subproject commit 9f77ea68696eb6b461e8748a3c08b31d24623a9e