-
Notifications
You must be signed in to change notification settings - Fork 831
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Re-license some external patches under the MPL2
The author has requested that their changes continue to be distributed under a copyleft license. After discussion, we agreed that MPL2 is the best option for allowing Sodium to continue using the patches, and for ensuring that others must distribute their changes if the patches are modified.
- Loading branch information
1 parent
f2e075f
commit 12ec2f1
Showing
6 changed files
with
434 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
Third-Party License Notice | ||
======================================= | ||
|
||
This project contains source code based upon, or includes source code from, the following third-party | ||
projects. | ||
|
||
The complete text for each software license can be found in the directory "thirdparty/licenses". | ||
|
||
* lodborg's interval tree library for Java | ||
* Copyright (c) 2016 lodborg | ||
* License: MIT | ||
* Original Source | ||
* https://github.com/lodborg/interval-tree/tree/v1.0.0 | ||
* Files: | ||
* common/src/main/java/net/caffeinemc/mods/sodium/client/util/interval_tree | ||
|
||
* coderbot's mip-map generator patches for Minecraft | ||
* Copyright (c) 2021 Coderbot | ||
* License: Mozilla Public License (MPL2) | ||
* Original Source: | ||
* https://github.com/IrisShaders/Iris/tree/41095ac23ea0add664afd1b85c414d1f1ed94066/src/main/java/net/coderbot/iris/mixin/bettermipmaps | ||
* Files: | ||
* common/src/main/java/net/caffeinemc/mods/sodium/mixin/features/textures/mipmaps | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
MIT License | ||
|
||
Copyright (c) [year] [fullname] | ||
|
||
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. |
Oops, something went wrong.
12ec2f1
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can probably remove the MIT License header from the interval tree code that I included. I added the license header myself to mark the files in lieu of a repo-wide list of files with differing licenses. However, there's also no harm in keeping those headers.