From c99575c3f16be5e2dd948981da7befe1bc5695a7 Mon Sep 17 00:00:00 2001 From: Silverteal <67404722+Silverteal@users.noreply.github.com> Date: Sat, 4 May 2024 09:22:24 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9PageDownloadClient.xaml?= =?UTF-8?q?.vb=E5=92=8CPageDownloadInstall.xaml.vb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 对4月1日版本直接判定为愚人节版 --- .../Pages/PageDownload/PageDownloadClient.xaml.vb | 8 ++++++++ .../Pages/PageDownload/PageDownloadInstall.xaml.vb | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb index 519b862..83bb44e 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb @@ -44,6 +44,14 @@ Version("type") = "special" Version.Add("lore", GetMcFoolName(Version("id"))) End Select + '所有4月1日发布的版本可视为愚人节版，但不改动版本描述 + Select Case Version("releaseDate").Value(Of Date).ToString("MM'/'dd") + Case "04/01" + If Not Version("type") == "special" Then + Type = "愚人节版" + Version("type") = "special" + End If + End Select Case "special" '已被处理的愚人节版 Type = "愚人节版" diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb index 1c6f77b..108e699 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb @@ -528,6 +528,14 @@ Version("type") = "special" Version.Add("lore", GetMcFoolName(Version("id"))) End Select + '所有4月1日发布的版本视为愚人节版，但不改动版本描述 + Select Case Version("releaseDate").Value(Of Date).ToString("MM'/'dd") + Case "04/01" + If Not Version("type") == "special" Then + Type = "愚人节版" + Version("type") = "special" + End If + End Select Case "special" '已被处理的愚人节版 Type = "愚人节版" From a95e8e8bf7f817d83c73f7331b1e131043a2605a Mon Sep 17 00:00:00 2001 From: Silverteal <67404722+Silverteal@users.noreply.github.com> Date: Sat, 1 Jun 2024 06:52:08 +0800 Subject: [PATCH 02/12] Create build-pr.yml --- .github/workflows/build-pr.yml | 49 ++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 .github/workflows/build-pr.yml diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml new file mode 100644 index 0000000..22244d2 --- /dev/null +++ b/.github/workflows/build-pr.yml @@ -0,0 +1,49 @@ +name: 构建来自 Pull Request 的 PCL + +on: + pull_request: + paths: + - 'Plain Craft Launcher 2.sln' + - 'Plain Craft Launcher 2/**' + - '.github/workflows/**' + +jobs: + + build: + + strategy: + matrix: + configuration: [Debug, Release, Snapshot, BETA, ReleaseUpdate] + + runs-on: windows-latest + + env: + Solution_Name: Plain Craft Launcher 2.sln + Wap_Project_Directory: Plain Craft Launcher 2 + Wap_Project_Path: Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj + Configuration: ${{ matrix.configuration }} + + steps: + - name: 签出仓库 + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + # setup msbuild + - name: 安装 MSBuild + uses: microsoft/setup-msbuild@v2 + + # # Restore the application to populate the obj folder with RuntimeIdentifiers + # - name: Restore the application + # run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration + + # Create the app package by building and packaging the Windows Application Packaging project + - name: 编译 PCL + run: msbuild $env:Wap_Project_Path /p:Configuration=$env:Configuration /t:Rebuild + + # Upload the MSIX package: https://github.com/marketplace/actions/upload-a-build-artifact + - name: 上传编译产物 + uses: actions/upload-artifact@v4 + with: + name: ${{ env.Configuration }} + path: ${{ env.Wap_Project_Directory }}\obj\${{ matrix.configuration }}\Plain Craft Launcher 2.exe From 73f8bdf4e1764ffae8011f1aa66256a8f55ca7ca Mon Sep 17 00:00:00 2001 From: Silverteal <67404722+Silverteal@users.noreply.github.com> Date: Sat, 1 Jun 2024 06:53:20 +0800 Subject: [PATCH 03/12] Delete .github/workflows/build-pr.yml --- .github/workflows/build-pr.yml | 49 ---------------------------------- 1 file changed, 49 deletions(-) delete mode 100644 .github/workflows/build-pr.yml diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml deleted file mode 100644 index 22244d2..0000000 --- a/.github/workflows/build-pr.yml +++ /dev/null @@ -1,49 +0,0 @@ -name: 构建来自 Pull Request 的 PCL - -on: - pull_request: - paths: - - 'Plain Craft Launcher 2.sln' - - 'Plain Craft Launcher 2/**' - - '.github/workflows/**' - -jobs: - - build: - - strategy: - matrix: - configuration: [Debug, Release, Snapshot, BETA, ReleaseUpdate] - - runs-on: windows-latest - - env: - Solution_Name: Plain Craft Launcher 2.sln - Wap_Project_Directory: Plain Craft Launcher 2 - Wap_Project_Path: Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj - Configuration: ${{ matrix.configuration }} - - steps: - - name: 签出仓库 - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - # setup msbuild - - name: 安装 MSBuild - uses: microsoft/setup-msbuild@v2 - - # # Restore the application to populate the obj folder with RuntimeIdentifiers - # - name: Restore the application - # run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration - - # Create the app package by building and packaging the Windows Application Packaging project - - name: 编译 PCL - run: msbuild $env:Wap_Project_Path /p:Configuration=$env:Configuration /t:Rebuild - - # Upload the MSIX package: https://github.com/marketplace/actions/upload-a-build-artifact - - name: 上传编译产物 - uses: actions/upload-artifact@v4 - with: - name: ${{ env.Configuration }} - path: ${{ env.Wap_Project_Directory }}\obj\${{ matrix.configuration }}\Plain Craft Launcher 2.exe From aa576e669d7281f6e0423088da7744176dda71d4 Mon Sep 17 00:00:00 2001 From: wuliaodexiaoluo Date: Thu, 4 Jul 2024 11:23:15 +0800 Subject: [PATCH 04/12] Fix Bugs --- Plain Craft Launcher 2/FormMain.xaml.vb | 6 +++--- .../Pages/PageDownload/PageDownloadClient.xaml.vb | 4 ++-- .../Pages/PageDownload/PageDownloadInstall.xaml.vb | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Plain Craft Launcher 2/FormMain.xaml.vb b/Plain Craft Launcher 2/FormMain.xaml.vb index 5ed09e6..f4e9258 100644 --- a/Plain Craft Launcher 2/FormMain.xaml.vb +++ b/Plain Craft Launcher 2/FormMain.xaml.vb @@ -319,9 +319,9 @@ Public Class FormMain FrmLaunchRight.PageState = MyPageRight.PageStates.ContentStay If IsLinkRestart Then PageChange(PageType.Link, PageSubType.LinkIoi) '模式提醒 -#If DEBUG Then - Hint("[开发者模式] PCL 正以开发者模式运行，这可能会造成严重的性能下降，请务必立即向开发者反馈此问题！", HintType.Critical) -#End If + If "Debug" = "Debug" Then + Hint("[开发者模式] PCL 正以开发者模式运行，这可能会造成严重的性能下降，请务必立即向开发者反馈此问题！", HintType.Critical) + End If If ModeDebug Then Hint("[调试模式] PCL 正以调试模式运行，这可能会导致性能下降，若无必要请不要开启！") '尽早执行的加载池 McFolderListLoader.Start(0) '为了让下载已存在文件检测可以正常运行，必须跑一次；为了让启动按钮尽快可用，需要尽早执行；为了与 PageLaunchLeft 联动，需要为 0 而不是 GetUuid diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb index 83bb44e..4464ccd 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb @@ -45,9 +45,9 @@ Version.Add("lore", GetMcFoolName(Version("id"))) End Select '所有4月1日发布的版本可视为愚人节版，但不改动版本描述 - Select Case Version("releaseDate").Value(Of Date).ToString("MM'/'dd") + Select Case Version("releaseTime").Value(Of Date).ToString("MM'/'dd") Case "04/01" - If Not Version("type") == "special" Then + If Not Version("type") = "special" Then Type = "愚人节版" Version("type") = "special" End If diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb index cdbbdc9..89dd23e 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb @@ -556,9 +556,9 @@ Version.Add("lore", GetMcFoolName(Version("id"))) End Select '所有4月1日发布的版本视为愚人节版，但不改动版本描述 - Select Case Version("releaseDate").Value(Of Date).ToString("MM'/'dd") + Select Case Version("releaseTime").Value(Of Date).ToString("MM'/'dd") Case "04/01" - If Not Version("type") == "special" Then + If Not Version("type") = "special" Then Type = "愚人节版" Version("type") = "special" End If From 2f39c57e58148bcace2e144b4a2d04839adbb4f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=A0=E8=81=8A=E7=9A=84=E5=B0=8F=E6=B4=9B?= Date: Thu, 4 Jul 2024 11:35:11 +0800 Subject: [PATCH 05/12] Update FormMain.xaml.vb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 之前改的没改回来 --- Plain Craft Launcher 2/FormMain.xaml.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Plain Craft Launcher 2/FormMain.xaml.vb b/Plain Craft Launcher 2/FormMain.xaml.vb index f4e9258..6b8bc65 100644 --- a/Plain Craft Launcher 2/FormMain.xaml.vb +++ b/Plain Craft Launcher 2/FormMain.xaml.vb @@ -319,9 +319,9 @@ Public Class FormMain FrmLaunchRight.PageState = MyPageRight.PageStates.ContentStay If IsLinkRestart Then PageChange(PageType.Link, PageSubType.LinkIoi) '模式提醒 - If "Debug" = "Debug" Then - Hint("[开发者模式] PCL 正以开发者模式运行，这可能会造成严重的性能下降，请务必立即向开发者反馈此问题！", HintType.Critical) - End If +#If Debug Then + Hint("[开发者模式] PCL 正以开发者模式运行，这可能会造成严重的性能下降，请务必立即向开发者反馈此问题！", HintType.Critical) +End If If ModeDebug Then Hint("[调试模式] PCL 正以调试模式运行，这可能会导致性能下降，若无必要请不要开启！") '尽早执行的加载池 McFolderListLoader.Start(0) '为了让下载已存在文件检测可以正常运行，必须跑一次；为了让启动按钮尽快可用，需要尽早执行；为了与 PageLaunchLeft 联动，需要为 0 而不是 GetUuid From fa7deb7500b0fd0c551c3e4bb33f4f98e62790d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=A0=E8=81=8A=E7=9A=84=E5=B0=8F=E6=B4=9B?= Date: Thu, 4 Jul 2024 11:36:00 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 为什么要大写啊 --- Plain Craft Launcher 2/FormMain.xaml.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plain Craft Launcher 2/FormMain.xaml.vb b/Plain Craft Launcher 2/FormMain.xaml.vb index 6b8bc65..f3a67b9 100644 --- a/Plain Craft Launcher 2/FormMain.xaml.vb +++ b/Plain Craft Launcher 2/FormMain.xaml.vb @@ -319,7 +319,7 @@ Public Class FormMain FrmLaunchRight.PageState = MyPageRight.PageStates.ContentStay If IsLinkRestart Then PageChange(PageType.Link, PageSubType.LinkIoi) '模式提醒 -#If Debug Then +#If DEBUG Then Hint("[开发者模式] PCL 正以开发者模式运行，这可能会造成严重的性能下降，请务必立即向开发者反馈此问题！", HintType.Critical) End If If ModeDebug Then Hint("[调试模式] PCL 正以调试模式运行，这可能会导致性能下降，若无必要请不要开启！") From 10e17d48c5c4e62c5769c2b0ed3b9cca4041fbce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=A0=E8=81=8A=E7=9A=84=E5=B0=8F=E6=B4=9B?= Date: Thu, 4 Jul 2024 11:37:12 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E8=87=B4=E5=91=BD=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 败笔也 --- Plain Craft Launcher 2/FormMain.xaml.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plain Craft Launcher 2/FormMain.xaml.vb b/Plain Craft Launcher 2/FormMain.xaml.vb index f3a67b9..5ed09e6 100644 --- a/Plain Craft Launcher 2/FormMain.xaml.vb +++ b/Plain Craft Launcher 2/FormMain.xaml.vb @@ -321,7 +321,7 @@ Public Class FormMain '模式提醒 #If DEBUG Then Hint("[开发者模式] PCL 正以开发者模式运行，这可能会造成严重的性能下降，请务必立即向开发者反馈此问题！", HintType.Critical) -End If +#End If If ModeDebug Then Hint("[调试模式] PCL 正以调试模式运行，这可能会导致性能下降，若无必要请不要开启！") '尽早执行的加载池 McFolderListLoader.Start(0) '为了让下载已存在文件检测可以正常运行，必须跑一次；为了让启动按钮尽快可用，需要尽早执行；为了与 PageLaunchLeft 联动，需要为 0 而不是 GetUuid From 6208a21b85490463d7fc457e9d52ca070b8bb9cf Mon Sep 17 00:00:00 2001 From: Ad_closeNN <1709301095@qq.com> Date: Fri, 26 Jul 2024 16:21:32 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E5=BE=BD=E6=A0=87=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E7=88=B1=E5=8F=91=E7=94=B5=20net->com?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d5b2391..2bc48bf 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ PCL 的代码绝大多数其实都是几年前学生时代的产物了……那 ## 相关内容 - [PCL 功能投票](https://github.com/Hex-Dragon/PCL2/discussions/2)：来参加投票吧，开发者会优先处理票数较高的帖子！ -- [程序下载](https://afdian.net/p/0164034c016c11ebafcb52540025c377)：下载免费的正式版 PCL。 +- [程序下载](https://afdian.com/p/0164034c016c11ebafcb52540025c377)：下载免费的正式版 PCL。 - [帮助文档库](https://github.com/LTCatt/PCL2Help)：PCL 帮助文档在 GitHub 上的存储库（是的，帮助库在另一个 Repo……）
From a4982c5ca75c87d4ba773ffd43e2ea275f3011a9 Mon Sep 17 00:00:00 2001 From: Ad_closeNN <1709301095@qq.com> Date: Fri, 26 Jul 2024 16:22:23 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E8=BF=9B=E4=B8=80=E6=AD=A5=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E5=BE=BD=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2bc48bf..8c12114 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Stars](https://img.shields.io/github/stars/Hex-Dragon/PCL2?style=flat&logo=data:image/svg%2bxml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZlcnNpb249IjEiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZD0iTTggLjI1YS43NS43NSAwIDAgMSAuNjczLjQxOGwxLjg4MiAzLjgxNSA0LjIxLjYxMmEuNzUuNzUgMCAwIDEgLjQxNiAxLjI3OWwtMy4wNDYgMi45Ny43MTkgNC4xOTJhLjc1MS43NTEgMCAwIDEtMS4wODguNzkxTDggMTIuMzQ3bC0zLjc2NiAxLjk4YS43NS43NSAwIDAgMS0xLjA4OC0uNzlsLjcyLTQuMTk0TC44MTggNi4zNzRhLjc1Ljc1IDAgMCAxIC40MTYtMS4yOGw0LjIxLS42MTFMNy4zMjcuNjY4QS43NS43NSAwIDAgMSA4IC4yNVoiIGZpbGw9IiNlYWM1NGYiLz48L3N2Zz4=&logoSize=auto&label=Stars&labelColor=666666&color=eac54f)](https://github.com/Hex-Dragon/PCL2/) [![Issues](https://img.shields.io/github/issues/Hex-Dragon/PCL2?style=flat&label=Issues&labelColor=666666&color=1a7f37)](https://github.com/Hex-Dragon/PCL2/issues) -[![爱发电](https://img.shields.io/badge/赞助-%E7%88%B1%E5%8F%91%E7%94%B5-946ce6?style=flat&labelColor=666666&logoSize=auto)](https://afdian.net/@LTCat) +[![爱发电](https://img.shields.io/badge/赞助-%E7%88%B1%E5%8F%91%E7%94%B5-946ce6?style=flat&labelColor=666666&logoSize=auto)](https://afdian.com/@LTCat)
From 9c0ae93d7d59bb6e025f61da7ff0b789c473601c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=99=E8=85=BE=E7=8C=AB=E8=B7=83?= <1043137532@qq.com> Date: Fri, 26 Jul 2024 17:02:43 +0800 Subject: [PATCH 10/12] Create FUNDING.yml --- .github/FUNDING.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..f4820c8 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +# These are supported funding model platforms + +custom: ['https://afdian.com/a/LTCat'] From c8c981fd8cd53f1092ac269eb7b2616b0901391e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=99=E8=85=BE=E7=8C=AB=E8=B7=83?= <1043137532@qq.com> Date: Sun, 28 Jul 2024 04:28:58 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E6=94=BE=E5=AE=BD=E5=88=86=E5=8F=91?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENCE | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/LICENCE b/LICENCE index 9bd5dbe..a9b88e4 100644 --- a/LICENCE +++ b/LICENCE @@ -2,23 +2,23 @@ 一、承诺与声明。 -　　开发者承诺，在您遵守本指南的情况下，不会追究您的法律责任，但最终裁量权仍由开发者保留。 +　　开发者承诺，在您遵守本指南的情况下，不会追究您的责任，但最终裁量权仍由开发者保留。 　　法律上，开发者仍保留所有权利（All Rights Reserved），且可能随时修改本指南，本指南并不是永久性保证。 二、少量使用情形。 　　如果您仅合理使用本存储库中的少量内容，或是参考实现思路，您必须： -　　（一）给出适当的署名，且提供指向本存储库的链接。 -　　（二）不得以任何方式暗示开发者为您或您的使用作担保。 +　　1、给出适当的署名，且提供指向本存储库的链接。 +　　2、不得以任何方式暗示开发者为您或您的使用作担保。 三、大量使用情形。 　　如果您基于该存储库进行衍生创作，或合理使用了本存储库中的较大量内容，您必须： -　　（一）给出适当的署名，且提供指向本存储库的链接。 -　　（二）不得以任何方式暗示开发者为您或您的使用作担保。 -　　（三）给出适当的说明，表示这是第三方内容。在 GitHub 上直接进行 Fork 是允许的。 -　　（四）使用本指南文件作为协议，不得附加额外条款。 -　　（五）不得分发编译后的可执行文件。唯一的例外是，你可以在明确禁止再次分发的前提下，在小于 100 人的 QQ 群内分发编译后的可执行文件。 +　　1、给出适当的署名，且提供指向本存储库的链接。GitHub 上的 Fork 可视为满足此条。 +　　2、不得以任何方式暗示开发者为您或您的使用作担保，且需要给出适当的说明，表示这是非官方内容。 +　　3、使用本指南文件作为协议，不得附加额外条款。 +　　4、在醒目位置说明：禁止第三方再次分发，且不能包含在整合包之中。 +　　5、其公开名称必须以 “PCL” 或 “Plain Craft Launcher” 开头，并在其后添加后缀，例如 “PCL 启动修复版”、“PCL PR Collection”。 ———————————— From 020ce330b5636d50b789a759aefa881fbfe6322a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=99=E8=85=BE=E7=8C=AB=E8=B7=83?= <1043137532@qq.com> Date: Sun, 28 Jul 2024 16:13:06 +0800 Subject: [PATCH 12/12] https://github.com/Hex-Dragon/PCL2/discussions/4361#discussioncomment-10169901 --- LICENCE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENCE b/LICENCE index a9b88e4..d06fab9 100644 --- a/LICENCE +++ b/LICENCE @@ -13,12 +13,12 @@ 三、大量使用情形。 -　　如果您基于该存储库进行衍生创作，或合理使用了本存储库中的较大量内容，您必须： +　　如果您基于该存储库创作衍生作品，或合理使用了本存储库中的较大量内容，您必须： 　　1、给出适当的署名，且提供指向本存储库的链接。GitHub 上的 Fork 可视为满足此条。 　　2、不得以任何方式暗示开发者为您或您的使用作担保，且需要给出适当的说明，表示这是非官方内容。 　　3、使用本指南文件作为协议，不得附加额外条款。 -　　4、在醒目位置说明：禁止第三方再次分发，且不能包含在整合包之中。 -　　5、其公开名称必须以 “PCL” 或 “Plain Craft Launcher” 开头，并在其后添加后缀，例如 “PCL 启动修复版”、“PCL PR Collection”。 +　　4、该衍生作品不能被允许用于再次分发，这包括制作整合包。 +　　5、该衍生作品的名称必须以 “PCL” 或 “Plain Craft Launcher” 开头，并在其后添加后缀，例如 “PCL 启动修复版”、“PCL PR Collection”。 ————————————