From 852e19601a91ea397878011668543b2ee4a02b27 Mon Sep 17 00:00:00 2001 From: Ed Date: Sun, 26 Jan 2025 15:34:52 +0300 Subject: [PATCH] license part 2 --- Legal.md | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Legal.md b/Legal.md index 7f2fb9406c..9fe8e12fad 100644 --- a/Legal.md +++ b/Legal.md @@ -1,7 +1,7 @@ # Disclaimer - The information presented here is for informational purposes only and does not constitute legal advice, nor is it a replacement for reading license text. If there is a conflict between this text and any of the attached licenses/agreements, or other agreements with CrystallEdge those agreements take precedence. -## To contribute you or your legal guardian (or employer if they have a legal right to your contributions) must agree to the [CrystallEdge Contributor Agreement](TODO) +## To contribute you or your legal guardian (or employer if they have a legal right to your contributions) must agree to the [CrystallEdge Contributor Agreement](https://github.com/crystallpunk-14/crystall-punk-14/blob/master/CLA.md) This process is automated, with a bot prompting you to agree to the CLA when you open your first PR. This may also be done by sending an email with the subject "\ CA Agreement", with a signed version of the agreement. @@ -15,7 +15,7 @@ Non-legalese summary of the terms of this agreement (This is not a replacement f - The CLA may be amended with 30 days of notice by email. *If you do not agree to the new CLA your contributions will be kept under the old version.* # Licensing/Attribution: -- Unless specified otherwise, all Source Code, inside any **\_CP14 or CP14 folders**, fall under the terms specified in LICENSE_CE.TXT *with Exhibit B enforced* and the [CrystallEdge CLA](TODO). All assets/content in those folders fall under CC-BY-SA 4.0. +- Unless specified otherwise, all Source Code, inside any **\_CP14 or CP14 folders**, fall under the terms specified in LICENSE_CE.TXT *with Exhibit B enforced* and the [CrystallEdge CLA](https://github.com/crystallpunk-14/crystall-punk-14/blob/master/CLA.md). All assets/content in those folders fall under CC-BY-SA 4.0. - Any content from SpaceWizards/SpaceStation14 without specified licensing of any code is licensed under MIT (LICENSE.TXT). Any Space Wizards content licensed under CC-BY-SA to Space Wizards Federation & Contributors. - __**You may not use CrystallEdge code/content (All right reserved). This is to make sure that CrystallEdge code is available to be improved by the community.**__ - **We are in the process of removing/replacing content that is currently not under an approved license.** diff --git a/README.md b/README.md index 27a3a14057..dc6af1e6bd 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ We welcome any support from the community in the development of the game! Join o ## Licensing/Attriibution -These are just the most important points, Please read [Legal.md](TODO) for the specifics around licensing/attribution/copyright. +These are just the most important points, Please read [Legal.md](https://github.com/crystallpunk-14/crystall-punk-14/blob/master/Legal.md) for the specifics around licensing/attribution/copyright. - Unless specified otherwise, all Source Code, inside any _CP14 or CP14 folders, fall under the terms specified in LICENSE_CE.TXT (all right reserved) with Exhibit B enforced and the CrystallEdge CLA. All assets/content in those folders falls under CC-BY-SA 4.0 unless otherwise specified. - Any content from SpaceWizards/SpaceStation14 without specified licensing of any code is licensed under MIT (LICENSE.txt). Any Space Wizards content licensed under CC-BY-SA 3.0 to Space Wizards Federation & Contributors. - You may not use CrystallEdge code in other projects without specific permission from the CrystallEdge author (TheShuEd)