Skip to content

合并 upstream/main:侧栏面板 + 本地内容完整保留 - #17

Merged
habhab783124-lab merged 2 commits into
ULookup:mainfrom
habhab783124-lab:加入恶魔动画资源
May 31, 2026

Hidden character warning

The head ref may contain hidden characters: "\u52a0\u5165\u6076\u9b54\u52a8\u753b\u8d44\u6e90"
Merged

合并 upstream/main:侧栏面板 + 本地内容完整保留#17
habhab783124-lab merged 2 commits into
ULookup:mainfrom
habhab783124-lab:加入恶魔动画资源

再次合并 upstream/main:修复场景文件冲突,保留本地正确版本

9de0f73
Select commit
Loading
Failed to load commit list.
Sign in for the full log view

Annotations

1 warning
validate-structure
succeeded May 31, 2026 in 17s