Skip to content

Sync upstream (feat/net8)#1335

Merged
tangge233 merged 31 commits intofeat/net8from
feat/net8-patch
Aug 10, 2025
Merged

Sync upstream (feat/net8)#1335
tangge233 merged 31 commits intofeat/net8from
feat/net8-patch

Conversation

@ruattd
Copy link
Copy Markdown
Contributor

@ruattd ruattd commented Aug 10, 2025

同步 dev 分支更改

caomei269 and others added 30 commits August 8, 2025 16:56
* fix(instance-install): 修复 (Legacy) Fabric API 的选择框下端间隔不正常

* Update PageDownloadInstall.xaml
* feat(PageVersionSetup): 自动将服务器地址替换为半角冒号

* feat(PageInstanceSetup): 替换中文冒号不弹窗提示
* fix(link): 连接到陶瓦用户的大厅时部分文本显示异常

* fix: 三元写反了

---------

Co-authored-by: 墨渊 <m56042764@163.com>
* perf(SavesInfo): 加入存档信息缓存

* imp(SavesInfo): 使版本提示不会短暂显示在屏幕上
* feat(Setup): 迁移配置系统

* refactor(Setup): 彻底挖掉旧 SetupEntry

* feat(Setup): 添加原本不经过配置模块设置的配置项,支持直接通过游戏路径获取配置项

* revert(Setup): 删掉直接通过路径访问实例设置项的方法

* refactor(Setup): 继续迁移配置系统,预计只剩下 bug 修复工作了

* refactor(Setup): 迁移至更加新的设置项 API

* chore(Setup): 添加动态生成的 SystemSystemUpdateBranch
…-patch

# Conflicts:
#	Plain Craft Launcher 2/Modules/Base/MyBitmap.vb
#	Plain Craft Launcher 2/Modules/ModLink.vb
#	Plain Craft Launcher 2/Modules/ModSecret.vb
#	Plain Craft Launcher 2/Modules/ModWebServer.vb
#	Plain Craft Launcher 2/Modules/Updates/UpdatesRandomModel.vb
#	Plain Craft Launcher 2/Modules/Updates/UpdatesWrapperModel.vb
#	Plain Craft Launcher 2/Pages/PageInstance/PageInstanceSaves/PageInstanceSavesInfo.xaml.vb
#	Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb
#	Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj
@pcl-ce-automation pcl-ce-automation bot added 🕑 等待合并 已处理完毕,正在等待代码合并入主分支 size: XXL PR 大小评估:巨型 labels Aug 10, 2025
@ruattd
Copy link
Copy Markdown
Contributor Author

ruattd commented Aug 10, 2025

cc @tangge233

@pcl-ce-automation pcl-ce-automation bot removed the size: XXL PR 大小评估:巨型 label Aug 10, 2025
@tangge233 tangge233 merged commit a2f21a8 into feat/net8 Aug 10, 2025
1 of 2 checks passed
@pcl-ce-automation pcl-ce-automation bot added 👌 完成 相关问题已修复或功能已实现,计划在下次版本更新时正式上线 size: XXL PR 大小评估:巨型 and removed 🕑 等待合并 已处理完毕,正在等待代码合并入主分支 labels Aug 10, 2025
@ruattd ruattd deleted the feat/net8-patch branch August 10, 2025 10:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size: XXL PR 大小评估:巨型 👌 完成 相关问题已修复或功能已实现,计划在下次版本更新时正式上线

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants