Merge branch 'main' of https://github.com/Grasscutters/GrassClipper into main

manifest.json

@@ -1,5 +1,5 @@
 {
   "applicationId": "js.grassclipper.app",
-  "version": "0.9.8",
+  "version": "0.9.9",
   "resourcesURL": "https://github.com/Grasscutters/GrassClipper/releases/latest/download/resources.neu"
 }

neutralino.config.json

@@ -1,6 +1,6 @@
 {
   "applicationId": "js.grassclipper.app",
-  "version": "0.9.8",
+  "version": "0.9.9",
   "defaultMode": "window",
   "port": 0,
   "documentRoot": "/resources/",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "grassclipper",
-  "version": "0.9.8",
+  "version": "0.9.9",
   "repository": "https://github.com/Grasscutters/GrassClipper.git",
   "author": "SpikeHD <spikegdofficial@gmail.com>",
   "license": "Apache-2.0",

resources/js/index.js

@@ -506,7 +506,7 @@ async function setGameExe() {
 }
 
 async function setGrasscutterFolder() {
-  const folder = await Neutralino.os.showOpenDialog(localeObj.grasscutterFileDialog || 'Select Grasscutter server jar file', {
+  const folder = await Neutralino.os.showOpenDialog(localeObj?.grasscutterFileDialog || 'Select Grasscutter server jar file', {
     filters: [
       { name: 'Jar files', extensions: ['jar'] }
     ]

scripts/javaver.cmd

@@ -29,7 +29,7 @@ for /f "delims=. tokens=1-3" %%v in ("%JAVAVER%") do (
 )
 
 :: Ensure java 17
-if %MAJOR% NEQ "17" (
+if "%MAJOR%" NEQ "17" (
   echo =======================================================================================
   echo !! Java version is not 17 !!
   echo Please download Java 17 or later to ensure %BRANCH% branch server launches correctly.