From ad185604123bfce4084cce904d1f6ba150bab86a Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 14 Jan 2015 12:27:47 +0300 Subject: [PATCH 1/3] Update gpl.txt Fix license text http://www.gnu.org/licenses/gpl-3.0.txt --- gpl.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gpl.txt b/gpl.txt index 5737cfa27..94a9ed024 100644 --- a/gpl.txt +++ b/gpl.txt @@ -549,14 +549,14 @@ to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. - 13. Use with the GNU General Public License. + 13. Use with the GNU Affero General Public License. Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single +under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, -but the special requirements of the GNU General Public License, +but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. From 629f6e60a4c94a1b3202c1d6f1e85aec512d72b8 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Thu, 26 Mar 2015 15:35:05 +0300 Subject: [PATCH 2/3] Mark as development --- config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.py b/config.py index f71cadee7..8f275d251 100644 --- a/config.py +++ b/config.py @@ -13,8 +13,8 @@ debug = False saveInRoot = False # Version data -version = "1.10.0" -tag = "Stable" +version = "1.10.1" +tag = "git" expansionName = "Scylla" expansionVersion = "1.0" evemonMinVersion = "4081" From 04b3a687fc13370da32d24e8ad489798058baa4e Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Thu, 26 Mar 2015 15:42:32 +0300 Subject: [PATCH 3/3] Add new yacht to LIS category and add its render --- service/market.py | 4 +++- staticdata/icons/ships/34590.png | Bin 0 -> 2264 bytes 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 staticdata/icons/ships/34590.png diff --git a/service/market.py b/service/market.py index 5685501ad..541e8cd8d 100644 --- a/service/market.py +++ b/service/market.py @@ -193,7 +193,9 @@ class Market(): "InterBus Shuttle": self.les_grp, "Leopard": self.les_grp, # 2013 new year gift "Whiptail": self.les_grp, # AT12 prize - "Chameleon": self.les_grp } # AT12 prize + "Chameleon": self.les_grp, # AT12 prize + "Victorieux Luxury Yacht": self.les_grp # Worlds Collide prize \o/ chinese getting owned + } self.ITEMS_FORCEGROUP_R = self.__makeRevDict(self.ITEMS_FORCEGROUP) self.les_grp.addItems = list(self.getItem(itmn) for itmn in self.ITEMS_FORCEGROUP_R[self.les_grp]) diff --git a/staticdata/icons/ships/34590.png b/staticdata/icons/ships/34590.png new file mode 100644 index 0000000000000000000000000000000000000000..a42c9df37804d532a9dc32c8a0eccef83fa65825 GIT binary patch literal 2264 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 mIX}8L1}PiF@w9ebEdLK5X6XETh@V9O0000