diff --git a/languages/en.json b/languages/en.json index 21da443..db862fe 100644 --- a/languages/en.json +++ b/languages/en.json @@ -18,12 +18,12 @@ "scriptsSectionTitle": "Scripts", "killswitchOption": "Kill Switch", "killswitchSubtitle": "Only for those very paranoid about bans. Kills the game process *and your internet* if something happens to the proxy.", - "proxyOption": "Proxy", - "proxySubtitle": "Install the proxy server via the install script", + "proxyOption": "Run Installer", + "proxySubtitle": "Install (or reinstall) the proxy server and mtools via the install script.", "updateOption": "Update", "updateSubtitle": "Auto updating is temporarily disabled. Check GitHub for the newest release.", "languageOption": "Language", - "languageSubtitle": "Select your language!", + "languageSubtitle": "Select your language", "enableServerLauncherOption": "Enable Server Launcher", "enableServerLauncherSubtitle": "Enable to server launcher tile for launching a local Grasscutter instance.", "httpsOption": "Use HTTPS", @@ -33,7 +33,7 @@ "introSen1": "Looks like this is your first time opening GrassClipper!", "introSen2": "First of all, welcome, happy to see you here! :)", - "introSen3": "Would you like to run the proxy installer?", + "introSen3": "Would you like to run the first-time installer?", "introSen4": "(required to connect to servers)", "updateBtn": "Update", diff --git a/resources/index.html b/resources/index.html index f7900c8..86db3e9 100644 --- a/resources/index.html +++ b/resources/index.html @@ -137,11 +137,11 @@
- Install Proxy Server + Run Installer
- Install the proxy server via the install script. + Install the proxy server and mtools via the install script.
diff --git a/resources/js/translation.js b/resources/js/translation.js index ceec561..8411eaf 100644 --- a/resources/js/translation.js +++ b/resources/js/translation.js @@ -75,6 +75,7 @@ async function doTranslation() { introSpan.innerHTML += localeObj.introSen3 + '
' introSpan.innerHTML += localeObj.introSen4 + '
' + // First time popup set('firstTimeInstallBtn', 'proxyInstallBtn') set('firstTimeDenyBtn', 'proxyInstallDeny') diff --git a/scripts/install.cmd b/scripts/install.cmd index 99e27c3..6e3558d 100644 --- a/scripts/install.cmd +++ b/scripts/install.cmd @@ -10,6 +10,7 @@ cd "%ORIGIN%" if not exist "%ORIGIN%/ext" mkdir "%ORIGIN%/ext" if not exist "%ORIGIN%/temp" mkdir "%ORIGIN%/temp +if not exist "%ORIGIN%/tools" mkdir "%ORIGIN%/tools" :: Begin by retrieving mitmproxy 7.0.4 powershell Invoke-WebRequest -Uri https://snapshots.mitmproxy.org/7.0.4/mitmproxy-7.0.4-windows.zip -OutFile "'%ORIGIN%/temp/mitmproxy-7.0.4-windows.zip'" @@ -44,6 +45,10 @@ echo Adding ceritifcate... echo ============================================================================================================ ) +echo Grabbing registry login tool... + +powershell Invoke-WebRequest -Uri https://github.com/SpikeHD/miHoYoTools/releases/download/v1.0.0/mtools.exe -OutFile "'%ORIGIN%/tools/mtools.exe'" + echo Done! You can now open GrassClipper.exe! pause