From a8cc8714f616815d3c31c0f84e8d9f587eeb3891 Mon Sep 17 00:00:00 2001 From: Valtos Date: Thu, 26 Sep 2024 21:52:42 +0300 Subject: [PATCH] Update License to CLA --- CLA.txt | 59 +++++++++++++++++++++++++++++++++++++++++++++++ LICENSE.TXT | 66 ++++++++++++++++++++++++++++++++++++++++++++--------- MIT.txt | 21 +++++++++++++++++ README.md | 12 ++++------ 4 files changed, 140 insertions(+), 18 deletions(-) create mode 100644 CLA.txt create mode 100644 MIT.txt diff --git a/CLA.txt b/CLA.txt new file mode 100644 index 0000000000..731b4ec102 --- /dev/null +++ b/CLA.txt @@ -0,0 +1,59 @@ +Preamble + +Upon receipt of a copy of the license object by any means, any person can use it if they +accept and agree to all the terms of this license. Violation of the license terms grants us +(the Licensor) the right to apply methods of legal and technological protection using the +DMCA and/or other legislation of the states under whose jurisdiction hosting providers +and other information intermediaries are located, providing services to violators of the +terms of this license. Acceptance of the terms of this license means a definitive conclusion +between you and FDev of a gratuitous simple non-exclusive license, hereinafter referred +to as the "Agreement". The Agreement does not include provisions regulating issues +related to the processing of personal data. + +Definitions + +Build is an object of Agreement, the result of the original author's work or a team of +authors (hereinafter referred to as the "Company"), a complex intellectual property object +– a video game that includes, but is not limited to, source, object code, tools, game assets, +specifications, UI/UX design, elements of narrative and other creative content based on +the revision and translation into Russian of the open version of Space Station 14 and the +artistic vision of the authors. The set of individual elements is a Build. Any elements other +than the original elements are objects of copyright and/or related rights created by the +creative work of the collective. + +Contribution means any original author's work of Contributors, including any +modifications or additions to the Build (any source code, object code, correction, tool, +sample, graphics, assets, specifications, manuals, documentation), which is intentionally +provided by the Licensee to the Licensor. For the purposes of this definition, +submission means any form of electronic, oral or written communication sent to Licensor +or its representatives, including, but not limited to, messages on electronic mailing lists, +source code control systems and issue tracking systems operated by or on behalf of the +Company for the purposes of discussing or improving software or project documentation +and source. Communications for which it is explicitly stated in writing as "Not a +contribution" will not be considered a contribution. When providing a Contribution to the +Build, the Contributor provides the Company with a simple, free, irrevocable, non-exclusive +license for the entire period of validity of the Contributor's rights to the Contribution provided +for by the legislation of the state-jurisdiction of the Contributor +and/or international legislation for certain forms of Contribution. + +Licensor – FDev. For licensing inquiries, please contact: admin@ss14.su + +The scope of the rights granted + +The license grants an unlimited number of persons the right to copy and make changes +solely for the purpose of improving the game and subject to the further transfer of such +changes to FDev on the terms of the Contribution, as well as for non-public hosting and +launching the Build on the Licensee's computer for the purpose of non-commercial use +for its intended purpose (providing access to Players and the Game process). This license +expressly prohibits commercial use, public hosting, as well as non-licensed use. The use +of the Build or its elements in violation of the terms of this License grants the Licensor +the right to contact the hosting provider and other persons – information intermediaries +to block hosting. The Licensee can carry out public hosting of the Build only if they receive +direct permission from the Licensor. + +A reservation about the types of licenses + +Individual elements of the Build (graphics, sounds, source code) may be distributed under +a license other than this one. Most assets are licensed under CC-BY-SA 3.0 unless +otherwise specified. Assets have their own license and copyright in the metadata file. If +the license type is not specified, such files are distributed under the terms of this license. \ No newline at end of file diff --git a/LICENSE.TXT b/LICENSE.TXT index c512fac5ab..731b4ec102 100644 --- a/LICENSE.TXT +++ b/LICENSE.TXT @@ -1,15 +1,59 @@ -Copyright (C) Frosty Dev - All Rights Reserved. +Preamble -THE CONTENTS OF THIS PROJECT ARE PROPRIETARY AND CONFIDENTIAL. -UNAUTHORIZED COPYING, TRANSFERRING OR REPRODUCTION OF THE CONTENTS OF THIS PROJECT, VIA ANY MEDIUM IS STRICTLY PROHIBITED. +Upon receipt of a copy of the license object by any means, any person can use it if they +accept and agree to all the terms of this license. Violation of the license terms grants us +(the Licensor) the right to apply methods of legal and technological protection using the +DMCA and/or other legislation of the states under whose jurisdiction hosting providers +and other information intermediaries are located, providing services to violators of the +terms of this license. Acceptance of the terms of this license means a definitive conclusion +between you and FDev of a gratuitous simple non-exclusive license, hereinafter referred +to as the "Agreement". The Agreement does not include provisions regulating issues +related to the processing of personal data. -The receipt or possession of the source code and/or any parts thereof does not convey or imply any right to use them -for any purpose other than the purpose for which they were provided to you. +Definitions -The software is provided "AS IS", without warranty of any kind, express or implied, including but not limited to -the warranties of merchantability, fitness for a particular purpose and non infringement. -In no event shall the authors or copyright holders be liable for any claim, damages or other liability, -whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software -or the use or other dealings in the software. +Build is an object of Agreement, the result of the original author's work or a team of +authors (hereinafter referred to as the "Company"), a complex intellectual property object +– a video game that includes, but is not limited to, source, object code, tools, game assets, +specifications, UI/UX design, elements of narrative and other creative content based on +the revision and translation into Russian of the open version of Space Station 14 and the +artistic vision of the authors. The set of individual elements is a Build. Any elements other +than the original elements are objects of copyright and/or related rights created by the +creative work of the collective. -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +Contribution means any original author's work of Contributors, including any +modifications or additions to the Build (any source code, object code, correction, tool, +sample, graphics, assets, specifications, manuals, documentation), which is intentionally +provided by the Licensee to the Licensor. For the purposes of this definition, +submission means any form of electronic, oral or written communication sent to Licensor +or its representatives, including, but not limited to, messages on electronic mailing lists, +source code control systems and issue tracking systems operated by or on behalf of the +Company for the purposes of discussing or improving software or project documentation +and source. Communications for which it is explicitly stated in writing as "Not a +contribution" will not be considered a contribution. When providing a Contribution to the +Build, the Contributor provides the Company with a simple, free, irrevocable, non-exclusive +license for the entire period of validity of the Contributor's rights to the Contribution provided +for by the legislation of the state-jurisdiction of the Contributor +and/or international legislation for certain forms of Contribution. + +Licensor – FDev. For licensing inquiries, please contact: admin@ss14.su + +The scope of the rights granted + +The license grants an unlimited number of persons the right to copy and make changes +solely for the purpose of improving the game and subject to the further transfer of such +changes to FDev on the terms of the Contribution, as well as for non-public hosting and +launching the Build on the Licensee's computer for the purpose of non-commercial use +for its intended purpose (providing access to Players and the Game process). This license +expressly prohibits commercial use, public hosting, as well as non-licensed use. The use +of the Build or its elements in violation of the terms of this License grants the Licensor +the right to contact the hosting provider and other persons – information intermediaries +to block hosting. The Licensee can carry out public hosting of the Build only if they receive +direct permission from the Licensor. + +A reservation about the types of licenses + +Individual elements of the Build (graphics, sounds, source code) may be distributed under +a license other than this one. Most assets are licensed under CC-BY-SA 3.0 unless +otherwise specified. Assets have their own license and copyright in the metadata file. If +the license type is not specified, such files are distributed under the terms of this license. \ No newline at end of file diff --git a/MIT.txt b/MIT.txt new file mode 100644 index 0000000000..0a719be699 --- /dev/null +++ b/MIT.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017-2024 Space Wizards Federation + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md index 7c2081d139..6435cff7ba 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ -

Space Station 14

+

+ Giedi Prime +

Space Station 14 это ремейк SS13, который работает на собственном движке [Robust Toolbox](https://github.com/space-wizards/RobustToolbox), написанном на C#. @@ -6,7 +8,7 @@ Space Station 14 это ремейк SS13, который работает на ## Ссылки -[Наш Discord](https://discord.station13.ru) | [Наша Вики](https://wiki.ss14.station13.ru) | [Steam](https://store.steampowered.com/app/1255460/Space_Station_14/) | [Клиент без Steam](https://spacestation14.io/about/nightlies/) | [Основной репозиторий](https://github.com/space-wizards/space-station-14) +[Наш Discord](https://discord.ss14.su) | [Наша Вики](https://wiki.ss14.su) | [Steam](https://store.steampowered.com/app/1255460/Space_Station_14/) | [Клиент без Steam](https://spacestation14.io/about/nightlies/) | [Основной репозиторий](https://github.com/space-wizards/space-station-14) ## Документация @@ -26,8 +28,4 @@ Space Station 14 это ремейк SS13, который работает на ## Лицензия -Весь код проекта принадлежит организации [Frosty Dev](https://github.com/frosty-dev/ss14-new/blob/master/LICENSE.TXT) и не подлежит разглашению. Что это означает? В случае утечки информации будет применена ст. 14.33 КоАП РФ и ст. 13.14 КоАП РФ соответственно. - -Большинство ассетов лицензированы под [CC-BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/), если не указано иное. Ассеты имеют свою лицензию и авторские права в файле метаданных. [Пример](https://github.com/space-syndicate/space-station-14/blob/master/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json). - -Обратите внимание, что некоторые ассеты лицензированы на некоммерческой основе [CC-BY-NC-SA 3.0](https://creativecommons.org/licenses/by-nc-sa/3.0/) или аналогичной некоммерческой лицензией, и их необходимо удалить, если вы хотите использовать этот проект в коммерческих целях. +Код репозитория лицензирован как под MIT - это касается кода Space Wizards Federation, так и под CLA - это касается наших изменений, определение которых дано в тексте CLA. Мы не стремимся к полному разграничению нашего кода и кода Space Wizards Federation, поэтому во избежание инцидентов рекомендуется брать их код из их репозитория.