Merge branch 'main' into patching

src-tauri/lang/en.json

@@ -18,6 +18,7 @@
     "recover_metadata": "Emergency Metadata Recovery",
     "grasscutter_jar": "Set Grasscutter JAR",
     "toggle_encryption": "Toggle Encryption",
+    "install_certificate": "Install Proxy Certificate",
     "java_path": "Set Custom Java Path",
     "grasscutter_with_game": "Automatically launch Grasscutter with game",
     "language": "Select Language",
@@ -46,7 +47,8 @@
   "components": {
     "select_file": "Select file or folder...",
     "select_folder": "Select folder...",
-    "download": "Download"
+    "download": "Download",
+    "install": "Install"
   },
   "news": {
     "latest_commits": "Recent Commits",

src/ui/components/menu/Options.tsx

@@ -199,6 +199,12 @@ export default class Options extends React.Component<IProps, IState> {
     await meta.restoreMetadata(this.props.downloadManager)
   }
   
+  async installCert() {
+    await invoke('generate_ca_files', {
+      path: await dataDir() + 'cultivation'
+    })
+  }
+
   render() {
     return (
       <Menu closeFn={this.props.closeFn} className="Options" heading="Options">
@@ -220,18 +226,6 @@ export default class Options extends React.Component<IProps, IState> {
             </BigButton>
           </div>
         </div>
-        {
-          this.state.swag && (
-            <div className='OptionSection' id="menuOptionsContainerAkebi">
-              <div className='OptionLabel' id="menuOptionsLabelAkebi">
-                <Tr text="swag.akebi" />
-              </div>
-              <div className='OptionValue' id="menuOptionsDirAkebi">
-                <DirInput onChange={this.setAkebi} value={this.state?.akebi_path} extensions={['exe']} />
-              </div>
-            </div>
-          )
-        }
         <div className='OptionSection' id="menuOptionsContainerGCJar">
           <div className='OptionLabel' id="menuOptionsLabelGCJar">
             <Tr text="options.grasscutter_jar" />
@@ -250,6 +244,31 @@ export default class Options extends React.Component<IProps, IState> {
             </BigButton>
           </div>
         </div>
+        <div className='OptionSection' id="menuOptionsContainerInstallCert">
+          <div className='OptionLabel' id="menuOptionsLabelInstallCert">
+            <Tr text="options.install_certificate" />
+          </div>
+          <div className='OptionValue' id="menuOptionsButtonInstallCert">
+            <BigButton disabled={false} onClick={this.installCert} id="installCert">
+              <Tr text="components.install" />
+            </BigButton>
+          </div>
+        </div>
+        {
+          this.state.swag && (
+            <>
+              <Divider />
+              <div className='OptionSection' id="menuOptionsContainerAkebi">
+                <div className='OptionLabel' id="menuOptionsLabelAkebi">
+                  <Tr text="swag.akebi" />
+                </div>
+                <div className='OptionValue' id="menuOptionsDirAkebi">
+                  <DirInput onChange={this.setAkebi} value={this.state?.akebi_path} extensions={['exe']} />
+                </div>
+              </div>
+            </>
+          )
+        }
 
         <Divider />
 

src/utils/server.ts

@@ -1,4 +1,4 @@
-import { fs, invoke } from '@tauri-apps/api'
+import { invoke } from '@tauri-apps/api'
 
 export async function toggleEncryption(path: string) {
   let serverConf