From deeeada8b88a81df3ebce37f9b4f8e83991c61d0 Mon Sep 17 00:00:00 2001 From: Xujiayao Date: Fri, 8 Dec 2023 23:20:25 +0800 Subject: [PATCH] [skip ci] Improve license declaration Acknowledgements: @allanf181 @BRForgers --- README.md | 26 ++++++++++++++++++- README_CN.md | 26 ++++++++++++++++++- .../mcdiscordchat/utils/MarkdownParser.java | 19 +++++++++++--- 3 files changed, 66 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1a81ecb0..82be86d8 100644 --- a/README.md +++ b/README.md @@ -152,4 +152,28 @@ Languages currently available: ## Stargazers over time -[![Stargazers over time](https://starchart.cc/Xujiayao/MC-Discord-Chat.svg)](https://starchart.cc/Xujiayao/MC-Discord-Chat) \ No newline at end of file +[![Stargazers over time](https://starchart.cc/Xujiayao/MC-Discord-Chat.svg)](https://starchart.cc/Xujiayao/MC-Discord-Chat) + +## License + +This project is licensed under the [MIT license](https://github.com/Xujiayao/MC-Discord-Chat/blob/master/LICENSE). + +Exceptionally, the `src/main/java/top/xujiayao/mcdiscordchat/utils/MarkdownParser.java` file was obtained from BRForgers/DisFabric on December 31, 2020, licensed under the Mozilla Public License 2.0 (MPL-2.0). + +> More details of the `src/main/java/top/xujiayao/mcdiscordchat/utils/MarkdownParser.java` file: +> +> Author: allanf181 (Allan Fernando) +> +> Link to the original source: +> https://github.com/BRForgers/DisFabric/blob/e0c7601405ee1b3f1de3c3168bc4ddd520501565/src/main/java/br/com/brforgers/mods/disfabric/utils/MarkdownParser.java +> +> Link to the license: +> https://github.com/BRForgers/DisFabric/blob/e0c7601405ee1b3f1de3c3168bc4ddd520501565/LICENSE +> +> Note that the "Don't Be a Jerk" license used in the newly created project BRForgers/DisFabric-and-DisForge is separate from the old project BRForgers/DisFabric. +> +> - Any recent changes in the project name and license do not retroactively affect the license terms of the code obtained at a specific moment before, that is, December 31, 2020. +> - Any files obtained from BRForgers/DisFabric continue to be subject to the terms of the MPL-2.0 license only. +> +> Link to the "Don't Be a Jerk" license: +> https://github.com/BRForgers/DisFabric-and-DisForge/blob/d1468a6c9b50ba24a250ec370cf645d58dccdfd1/LICENSE.md \ No newline at end of file diff --git a/README_CN.md b/README_CN.md index 8a576279..af09bf3e 100644 --- a/README_CN.md +++ b/README_CN.md @@ -152,4 +152,28 @@ MC-Discord-Chat (MCDC), formerly known as MCDiscordChat, a practical and powerfu ## 星标历史 -[![Stargazers over time](https://starchart.cc/Xujiayao/MC-Discord-Chat.svg)](https://starchart.cc/Xujiayao/MC-Discord-Chat) \ No newline at end of file +[![Stargazers over time](https://starchart.cc/Xujiayao/MC-Discord-Chat.svg)](https://starchart.cc/Xujiayao/MC-Discord-Chat) + +## 许可证 + +本项目采用 [MIT 许可证](https://github.com/Xujiayao/MC-Discord-Chat/blob/master/LICENSE) 进行授权。 + +作为例外，`src/main/java/top/xujiayao/mcdiscordchat/utils/MarkdownParser.java` 文件于 2020 年 12 月 31 日从 BRForgers/DisFabric 获取，采用 Mozilla 公共许可证 2.0 (MPL-2.0) 进行授权。 + +> `src/main/java/top/xujiayao/mcdiscordchat/utils/MarkdownParser.java` 文件的更多详情： +> +> 作者：allanf181 (Allan Fernando) +> +> 链接到原始来源： +> https://github.com/BRForgers/DisFabric/blob/e0c7601405ee1b3f1de3c3168bc4ddd520501565/src/main/java/br/com/brforgers/mods/disfabric/utils/MarkdownParser.java +> +> 链接到许可证： +> https://github.com/BRForgers/DisFabric/blob/e0c7601405ee1b3f1de3c3168bc4ddd520501565/LICENSE +> +> 请注意，新创建的 BRForgers/DisFabric-and-DisForge 项目中使用的 "Don't Be a Jerk" 许可证与旧项目 BRForgers/DisFabric 是分开的。 +> +> - 项目名称和许可证的任何近期变更都不会追溯影响到之前特定时刻（即 2020 年 12 月 31 日）所获取的代码的许可条款。 +> - 从 BRForgers/DisFabric 获取的任何文件仍仅受 MPL-2.0 许可证条款的约束。 +> +> 链接到 "Don't Be a Jerk" 许可证： +> https://github.com/BRForgers/DisFabric-and-DisForge/blob/d1468a6c9b50ba24a250ec370cf645d58dccdfd1/LICENSE.md \ No newline at end of file diff --git a/src/main/java/top/xujiayao/mcdiscordchat/utils/MarkdownParser.java b/src/main/java/top/xujiayao/mcdiscordchat/utils/MarkdownParser.java index 31407c38..5b8b758a 100644 --- a/src/main/java/top/xujiayao/mcdiscordchat/utils/MarkdownParser.java +++ b/src/main/java/top/xujiayao/mcdiscordchat/utils/MarkdownParser.java @@ -1,8 +1,21 @@ /* -This file was obtained from BRForgers/DisFabric, licensed under the Mozilla Public License 2.0 (MPL-2.0). +This file was obtained from BRForgers/DisFabric on December 31, 2020, licensed under the Mozilla Public License 2.0 (MPL-2.0). + Author: allanf181 (Allan Fernando) -Link to the original source: https://github.com/BRForgers/DisFabric (/src/main/java/br/com/brforgers/mods/disfabric/utils/MarkdownParser.java) -Link to the license: https://raw.githubusercontent.com/BRForgers/DisFabric/master/LICENSE + +Link to the original source: +https://github.com/BRForgers/DisFabric/blob/e0c7601405ee1b3f1de3c3168bc4ddd520501565/src/main/java/br/com/brforgers/mods/disfabric/utils/MarkdownParser.java + +Link to the license: +https://github.com/BRForgers/DisFabric/blob/e0c7601405ee1b3f1de3c3168bc4ddd520501565/LICENSE + +Note that the "Don't Be a Jerk" license used in the newly created project BRForgers/DisFabric-and-DisForge is separate from the old project BRForgers/DisFabric. + +- Any recent changes in the project name and license do not retroactively affect the license terms of the code obtained at a specific moment before, that is, December 31, 2020. +- Any files obtained from BRForgers/DisFabric continue to be subject to the terms of the MPL-2.0 license only. + +Link to the "Don't Be a Jerk" license: +https://github.com/BRForgers/DisFabric-and-DisForge/blob/d1468a6c9b50ba24a250ec370cf645d58dccdfd1/LICENSE.md */ package top.xujiayao.mcdiscordchat.utils;