Merge 15c9a9b10c into 10e0f9f0de

Merge main to beta

.github/workflows/optimize-assets.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          fetch-depth: 0  # 获取完整历史以便进行比较
+          fetch-depth: 0
       
       - name: Setup Node.js
         uses: actions/setup-node@v3
@@ -18,19 +18,26 @@ jobs:
           node-version: '18'
           cache: 'npm'
       
-      # 添加 FFmpeg 缓存
+      # 优化 FFmpeg 缓存
       - name: Cache FFmpeg
         id: cache-ffmpeg
         uses: actions/cache@v3
         with:
-          path: /usr/bin/ffmpeg
-          key: ${{ runner.os }}-ffmpeg
+          path: ~/ffmpeg
+          key: ${{ runner.os }}-ffmpeg-static-6.1
       
       - name: Install FFmpeg
         if: steps.cache-ffmpeg.outputs.cache-hit != 'true'
         run: |
-          sudo apt-get update
-          sudo apt-get install -y ffmpeg
+          mkdir -p ~/ffmpeg
+          wget -q https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz
+          tar xf ffmpeg-release-amd64-static.tar.xz
+          mv ffmpeg-*-amd64-static/ffmpeg ~/ffmpeg/
+          mv ffmpeg-*-amd64-static/ffprobe ~/ffmpeg/
+          rm -rf ffmpeg-*-amd64-static*
+      
+      - name: Add FFmpeg to PATH
+        run: echo "$HOME/ffmpeg" >> $GITHUB_PATH
       
       # 添加 node_modules 缓存
       - name: Cache node_modules
@@ -45,13 +52,16 @@ jobs:
       - name: Install dependencies
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: |
-          npm install sharp
+          npm install sharp glob
       
       - name: Optimize Images
         run: node scripts/optimize-images.js
       
       - name: Optimize Audio
         run: node scripts/optimize-audio.js
+        
+      - name: Optimize JSON
+        run: node scripts/optimize-json.js
       
       - name: Check for changes
         id: check_changes
@@ -69,4 +79,4 @@ jobs:
           git config --local user.name "github-actions[bot]"
           git add -A
           git commit -m "Automatically optimize assets"
-          git push
+          git push

CREDITS.md

@@ -372,63 +372,67 @@ In addition to the lists below, please check [the PokéRogue wiki](https://wiki.
 - Lily
 - PigeonBar
 
-## Past Contributors
-- Fontbane
-- sodaMelon
-- schmidtc1
-- shayebeadling
+## Other Code Contributors
+- Admiral-Billy
+- allen925
+- arColm
+- Arxalc
+- AsdarDevelops
+- bennybroseph
+- Brain Frog
+- Corrade
+- Dakurei
 - DustinLin
-- lucfd
-- madibye
+- ElizaAlex
 - EmberCM
-- Mewtwo2387
+- EmoUsedHM01
+- EvasiveAce
+- Fontbane
+- francktrouillez
+- FredeX
+- geeilhan
+- Greenlamp
+- happinyz
 - hayuna
-- sirzento
-- ReneGV
-- mattrossdev
-- zacharied
-- NxKarim
-- td76099
-- Xiaphear
+- InfernoVulpix
 - j-diefenbach
 - jaimefd
-- EvasiveAce
-- EmoUsedHM01
-- francktrouillez
 - JakubHanko
-- FredeX
-- PigeonBar
-- prime-dialga
-- rnicar245
-- rationality6
-- Neverblade
-- Corrade
-- Admiral-Billy
-- okimin
-- Arxalc
-- PrabbyDD
 - JonStudders
 - karl-police
-- prateau
-- meepen
-- arColm
-- allen925
-- InfernoVulpix
-- snoozbuster
-- zaccie
-- happinyz
-- PyGaVS
+- lucfd
+- Lugiadrien
+- madibye
+- mattrossdev
 - mcmontag
-- ElizaAlex
-- AsdarDevelops
-- Vassiat
-- RedstonewolfX
-- Sam/Flashfyre (initial developer, started PokéRogue)
-- Greenlamp
-- bennybroseph
+- meepen
+- Mewtwo2387
+- muscode
+- Neverblade
+- NxKarim
+- okimin
 - OrangeRed
-- Dakurei
-- Brain Frog
+- PigeonBar
+- PrabbyDD
+- prateau
+- prime-dialga
+- PyGaVS
+- rationality6
+- RedstonewolfX
+- ReneGV
+- rnicar245
+- Sam aka Flashfyre (initial developer, started PokéRogue)
+- schmidtc1
+- shayebeadling
+- sirzento
+- snoozbuster
+- sodaMelon
+- td76099
+- Vassiat
+- Xiaphear
+- zaccie
+- zacharied
+- Zé Ricardo
 
 
 # 🌎 Translation
@@ -615,6 +619,6 @@ In addition to the lists below, please check [the PokéRogue wiki](https://wiki.
 - roi
 
 ## External Tools
-- Ydarissep (RogueDex)
+- Ydarissep (creator of the now defunct "Yda's Dex")
 - Admiral-Billy (Offline App - Desktop)
 - Red aka StonedModder (iOS App)

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "pokemon-rogue-battle",
-	"version": "1.3.0",
+	"version": "1.4.1",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "pokemon-rogue-battle",
-			"version": "1.3.0",
+			"version": "1.4.1",
 			"hasInstallScript": true,
 			"dependencies": {
 				"@material/material-color-utilities": "^0.2.7",

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "pokemon-rogue-battle",
 	"private": true,
-	"version": "1.3.0",
+	"version": "1.4.1",
 	"type": "module",
 	"scripts": {
 		"start": "vite",