Skip to content

Commit 361700e

Browse files
Merge pull request #434 from OpenWebGAL/dev
Dev
2 parents e3506f8 + 07840b8 commit 361700e

File tree

79 files changed

+4477
-2767
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+4477
-2767
lines changed

installer.nsi

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
; 常量
99
!define NAME "WebGal_Terre"
10-
!define VERSION "4.5.10" ; 版本号变量
10+
!define VERSION "4.5.13" ; 版本号变量
1111
!define PRODUCT_VERSION "${VERSION}.0"
1212
!define COPYRIGHT "Mahiru - https://github.com/MakinoharaShoko" ; 版权信息
1313
!define ICON_PATH ".\assets\nsis.ico"
@@ -53,7 +53,9 @@ VIProductVersion "${PRODUCT_VERSION}" ; product verion(actual replace FileVersio
5353
!insertmacro MUI_PAGE_FINISH
5454

5555
; Uninstaller pages
56+
!insertmacro MUI_UNPAGE_CONFIRM
5657
!insertmacro MUI_UNPAGE_INSTFILES
58+
!insertmacro MUI_UNPAGE_FINISH
5759

5860
Section -Install
5961
SetOutPath $INSTDIR

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "webgal-terre",
3-
"version": "4.5.13",
3+
"version": "4.5.14",
44
"private": true,
55
"scripts": {
66
"dev": "concurrently \"yarn dev:terre\" \"yarn dev:origine\" \"yarn dev:start-dev-server\"",

packages/origine2/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "webgal-origine-2",
33
"private": true,
4-
"version": "4.5.13",
4+
"version": "4.5.14",
55
"license": "MPL-2.0",
66
"scripts": {
77
"dev": "lingui extract && lingui compile --typescript && vite --host",
@@ -52,6 +52,8 @@
5252
"react": "^18.0.0",
5353
"react-beautiful-dnd": "^13.1.0",
5454
"react-dom": "^18.0.0",
55+
"react-virtualized-auto-sizer": "^1.0.26",
56+
"react-window": "^1.8.11",
5557
"sass": "^1.51.0",
5658
"swr": "^2.2.4",
5759
"webgal-parser": "latest",
@@ -65,6 +67,7 @@
6567
"@types/react": "^18.0.0",
6668
"@types/react-beautiful-dnd": "^13.1.2",
6769
"@types/react-dom": "^18.0.0",
70+
"@types/react-window": "^1.8.8",
6871
"@types/vscode": "^1.88.0",
6972
"@typescript-eslint/eslint-plugin": "^5.18.0",
7073
"@typescript-eslint/parser": "^5.18.0",

packages/origine2/src/components/Assets/Assets.module.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
.controll {
22
display: flex;
33
flex-wrap: wrap;
4-
padding: 8px;
5-
gap: 4px;
64
align-items: center;
75
border-bottom: var(--border-sm);
86
}

0 commit comments

Comments
 (0)