Skip to content

chore: Merge branch dev to main #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
github-actions wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −10
Draft

chore: Merge branch dev to main #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
Morphe NOTICE

https://github.com/MorpheApp/morphe-patcher

=============

This file contains Section 7 notices of the GNU General Public License v3
as they apply to Morphe code. These notices apply to all code authored by
Morphe, including any modifications of code that may have originated
outside this repository, and do not change the terms of the GPLv3 license.
For the full license text, see the LICENSE file or:
https://www.gnu.org/licenses/gpl-3.0.html
7b. Attribution Requirement
---------------------------

This NOTICE file must be preserved and retained in all distributions
of the Source Code and any Derivative Works.

7c. Project Name Restriction
----------------------------

The project name "Morphe" may not be used for derivative works.
Derivatives must adopt a completely different identity that is not related
to or similar to the name "Morphe".
The project name "Morphe" is a protected identifier. Derivative works
must adopt a completely different identity that is not related to,
confusingly similar to, or an imitation of the name "Morphe".
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,6 @@ You can find the fundamentals of Morphe Patcher and how to create patches [here]
Morphe Patches are licensed under the [GNU General Public License v3.0](LICENSE), with additional conditions under GPLv3 Section 7:

- **Name Restriction (7c):** The name **"Morphe"** may not be used for derivative works.
Derivatives must adopt a distinct identity unrelated to "Morphe."
Derivatives must adopt a distinct identity unrelated to "Morphe".

See the [LICENSE](LICENSE) file for the full GPLv3 terms and the [NOTICE](NOTICE) file for full conditions of GPLv3 Section 7
Loading