Merge pull request #254 from OpenWebGAL/dev

4.5.0
OpenWebGAL · May 3, 2024 · 3311e7f · 3311e7f
2 parents 1f88648 + 35ef3a2
commit 3311e7f
Show file tree

Hide file tree

Showing 217 changed files with 19,965 additions and 6,109 deletions.
diff --git a/.github/workflows/build-terre.yml b/.github/workflows/build-terre.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'yarn'
       - name: Build
         env:
@@ -35,7 +35,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'yarn'
       - name: Build Stage 1
         run: |
@@ -117,14 +117,14 @@ jobs:
           path: release
   build-mac:
     name: Build MacOS Binary
-    runs-on: macos-latest
+    runs-on: macos-14
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'yarn'
       - name: Build
         env:
@@ -144,7 +144,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'yarn'
       - name: Build
         shell: bash
@@ -163,7 +163,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'yarn'
       - name: Build
         shell: bash

diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'yarn'
       - name: Build
         env:
@@ -37,7 +37,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'yarn'
       - name: Build Stage 1
         run: |
@@ -119,14 +119,14 @@ jobs:
           path: release
   build-mac:
     name: Build MacOS Binary
-    runs-on: macos-latest
+    runs-on: macos-14
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'yarn'
       - name: Build
         env:
@@ -146,7 +146,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'yarn'
       - name: Build
         shell: bash
@@ -165,7 +165,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'yarn'
       - name: Build
         shell: bash

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'yarn'
       - name: Build
         env:
@@ -39,7 +39,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'yarn'
       - name: Build Stage 1
         run: |
@@ -124,14 +124,14 @@ jobs:
           path: WebGAL_Terre_Linux_Arm64.zip
   build-mac:
     name: Build MacOS Binary
-    runs-on: macos-latest
+    runs-on: macos-14
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'yarn'
       - name: Build
         env:
@@ -153,7 +153,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'yarn'
       - name: Build
         shell: bash
@@ -174,7 +174,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'yarn'
       - name: Build
         shell: bash

diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,10 @@ bundle
 yarn.lock
 package-lock.json
 .DS_Store
-terre-electron
+terre-electron
+packages/origine2/src/locales/en.js
+packages/origine2/src/locales/ja.js
+packages/origine2/src/locales/zhCn.js
+packages/origine2/src/locales/en.ts
+packages/origine2/src/locales/ja.ts
+packages/origine2/src/locales/zhCn.ts
diff --git a/.vscode/settings.json b/.vscode/settings.json