diff --git a/config.py b/config.py index 937d8ca05..8b0f4b9ae 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" 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. 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 000000000..a42c9df37 Binary files /dev/null and b/staticdata/icons/ships/34590.png differ