Update AIO 6.0

Bump version

.github/workflows/backend-checks.yml

@@ -32,7 +32,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [windows-latest, ubuntu-latest, macos-latest]
+        platform: [windows-latest, ubuntu-latest]
 
     steps:
       - uses: actions/checkout@v3

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cultivation",
-  "version": "1.5.1",
+  "version": "1.6.1",
   "private": true,
   "dependencies": {
     "@tauri-apps/api": "^1.0.0-rc.5",

src-tauri/Cargo.lock

@@ -959,7 +959,7 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
 
 [[package]]
 name = "cultivation"
-version = "1.5.1"
+version = "1.6.1"
 dependencies = [
  "anime-launcher-sdk",
  "anyhow",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cultivation"
-version = "1.5.1"
+version = "1.6.1"
 description = "A custom launcher for anime game."
 authors = ["KingRainbow44", "SpikeHD"]
 license = ""

src-tauri/lang/chs.json

@@ -41,7 +41,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "下载 Grasscutter 一体化",
-    "grasscutter_fullquest": "下载 5.0 一体化",
+    "grasscutter_fullquest": "下载 6.0 一体化",
     "grasscutter_stable_data": "下载 Grasscutter 稳定版数据",
     "grasscutter_latest_data": "下载 Grasscutter 开发版数据",
     "grasscutter_stable_data_update": "更新 Grasscutter 稳定版数据",

src-tauri/lang/cht.json

@@ -41,7 +41,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "下載Grasscutter多合一下載",
-    "grasscutter_fullquest": "下载 5.0 一体化",
+    "grasscutter_fullquest": "下载 6.0 一体化",
     "grasscutter_stable_data": "下載Grasscutter穩定版數據（Data）",
     "grasscutter_latest_data": "下載Grasscutter開發板數據（Data）",
     "grasscutter_stable_data_update": "更新Grasscutter穩定版數據（Data）",

src-tauri/lang/de.json

@@ -43,7 +43,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "Grasscutter All-in-One herunterladen",
-    "grasscutter_fullquest": "5.0 All-in-One herunterladen",
+    "grasscutter_fullquest": "6.0 All-in-One herunterladen",
     "grasscutter_stable_data": "Stabile Grasscutter-Daten herunterladen",
     "grasscutter_latest_data": "Neueste Grasscutter-Daten herunterladen",
     "grasscutter_stable_data_update": "Stabile Grasscutter-Daten aktualisieren",

src-tauri/lang/en.json

@@ -42,8 +42,8 @@
     "fix_res": "Fix Login Timeout"
   },
   "downloads": {
-    "grasscutter_fullbuild": "Download Grasscutter All-in-One",
-    "grasscutter_fullquest": "Download 5.0 All-in-One",
+    "grasscutter_fullbuild": "Download Grasscutter 4.0 All-in-One",
+    "grasscutter_fullquest": "Download 6.0 All-in-One",
     "grasscutter_stable_data": "Download Grasscutter Stable Data",
     "grasscutter_latest_data": "Download Grasscutter Latest Data",
     "grasscutter_stable_data_update": "Update Grasscutter Stable Data",

src-tauri/lang/es.json

@@ -41,7 +41,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "Descargar datos todo en uno de Grasscutter",
-    "grasscutter_fullquest": "Descargar datos todo en uno de 5.0",
+    "grasscutter_fullquest": "Descargar datos todo en uno de 6.0",
     "grasscutter_stable_data": "Descargar datos Estables de Grasscutter",
     "grasscutter_latest_data": "Descargar datos más Recientes de Grasscutter",
     "grasscutter_stable_data_update": "Actualizar datos estables de Grasscutter",

src-tauri/lang/fr.json

@@ -41,7 +41,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "Telecharger Grasscutter tout-en-un",
-    "grasscutter_fullquest": "Télécharger les 5.0 tout-en-un",
+    "grasscutter_fullquest": "Télécharger les 6.0 tout-en-un",
     "grasscutter_stable_data": "Télécharger les donnees de Grasscutter (version stable)",
     "grasscutter_latest_data": "Télécharger les donnees de Grasscutter (derniere version)",
     "grasscutter_stable_data_update": "Mettre à jour les données de Grasscutter (version stable)",

src-tauri/lang/id.json

@@ -40,7 +40,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "Sedang Mendownload Grasscutter Semua Dalam Satu",
-    "grasscutter_fullquest": "Unduh 5.0 semua dalam satu",
+    "grasscutter_fullquest": "Unduh 6.0 semua dalam satu",
     "grasscutter_stable_data": "Sedang Mendownload Grasscutter Versi Stabil",
     "grasscutter_latest_data": "Sedang Mendownload Grasscutter Data Terbaru",
     "grasscutter_stable_data_update": "Memperbaharui Grasscutter Data Stabil",

src-tauri/lang/it.json

@@ -41,7 +41,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "Scarica Grasscutter Tutto-in-Uno",
-    "grasscutter_fullquest": "Scarica 5.0 Tutto-in-Uno",
+    "grasscutter_fullquest": "Scarica 6.0 Tutto-in-Uno",
     "grasscutter_stable_data": "Scarica i dati di Grasscutter Stabili",
     "grasscutter_latest_data": "Scarica i dati di Grasscutter Più Recenti",
     "grasscutter_stable_data_update": "Aggiorna i dati di Grasscutter Stabili",

src-tauri/lang/ja.json

@@ -41,7 +41,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "Grasscutter All-in-Oneをダウンロード",
-    "grasscutter_fullquest": "Questing All-in-Oneをダウンロード",
+    "grasscutter_fullquest": "6.0 All-in-Oneをダウンロード",
     "grasscutter_stable_data": "Grasscutter安定版データファイルをダウンロード",
     "grasscutter_latest_data": "Grasscutter最新版データファイルをダウンロード",
     "grasscutter_stable_data_update": "Grasscutter安定版データファイルをアップデート",

src-tauri/lang/ko.json

@@ -41,7 +41,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "올인원 Grasscutter 다운로드",
-    "grasscutter_fullquest": "5.0 올인원 다운로드",
+    "grasscutter_fullquest": "6.0 올인원 다운로드",
     "grasscutter_stable_data": "안정적인 데이터 다운로드",
     "grasscutter_latest_data": "최신 데이터 다운로드",
     "grasscutter_stable_data_update": "안정적 데이터 업데이트",

src-tauri/lang/lv.json

@@ -39,7 +39,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "Lejupielādējiet Grasscutter viss vienā",
-    "grasscutter_fullquest": "Lejupielādēt 5.0 viss vienā",
+    "grasscutter_fullquest": "Lejupielādēt 6.0 viss vienā",
     "grasscutter_stable_data": "Lejupielādējiet Grasscutter stabilos datus",
     "grasscutter_latest_data": "Lejupielādējiet Grasscutter jaunākos datus",
     "grasscutter_stable_data_update": "Atjauniniet Grasscutter stabilos datus",

src-tauri/lang/nl.json

@@ -40,7 +40,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "Grasscutter Alles-in-één Downloaden",
-    "grasscutter_fullquest": "Alles-in-één 5.0 downloaden",
+    "grasscutter_fullquest": "Alles-in-één 6.0 downloaden",
     "grasscutter_stable_data": "Download Stabiele Gegevens Van Grasscutter",
     "grasscutter_latest_data": "Download De Nieuwste Gegevens Van Grasscutter",
     "grasscutter_stable_data_update": "Stabiele gegevens Van Grasscutter bijwerken",

src-tauri/lang/pl.json

@@ -43,7 +43,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "Pobierz Grasscutter (wszystko w jednym)",
-    "grasscutter_fullquest": "Pobierz 5.0 (wszystko w jednym)",
+    "grasscutter_fullquest": "Pobierz 6.0 (wszystko w jednym)",
     "grasscutter_stable_data": "Pobierz stabilne dane Grasscuttera",
     "grasscutter_latest_data": "Pobierz najnowsze dane Grasscuttera",
     "grasscutter_stable_data_update": "Zaaktualizuj stabilne dane Grasscuttera",

src-tauri/lang/pt-br.json

@@ -41,7 +41,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "Baixar o Grasscutter Tudo-em-Um",
-    "grasscutter_fullquest": "Baixar de 5.0 em um só lugar",
+    "grasscutter_fullquest": "Baixar de 6.0 em um só lugar",
     "grasscutter_stable_data": "Baixar os Dados do Grasscutter Estável",
     "grasscutter_latest_data": "Baixar os Dados do Grasscutter Mais Recente",
     "grasscutter_stable_data_update": "Atualizar os Dados do Grasscutter Estável",

src-tauri/lang/ru.json

@@ -40,7 +40,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "Скачать все в одном Grasscutter",
-    "grasscutter_fullquest": "Скачать 5.0 все в одном",
+    "grasscutter_fullquest": "Скачать 6.0 все в одном",
     "grasscutter_stable_data": "Скачать стабильные данные Grasscutter",
     "grasscutter_latest_data": "Скачать последние данные Grasscutter",
     "grasscutter_stable_data_update": "Обновить стабильные данные Grasscutter",

src-tauri/lang/vi.json

@@ -41,7 +41,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "Tải Grasscutter tất cả trong một",
-    "grasscutter_fullquest": "Tải 5.0 tất cả trong một",
+    "grasscutter_fullquest": "Tải 6.0 tất cả trong một",
     "grasscutter_stable_data": "Tải dữ liệu Grasscutter bản ổn định",
     "grasscutter_latest_data": "Tải dữ liệu Grasscutter bản mới nhất",
     "grasscutter_stable_data_update": "Cập nhật dữ liệu Grasscutter bản ổn định",

src-tauri/src/main.rs

@@ -209,6 +209,7 @@ fn main() -> Result<(), ArgsError> {
         get_theme_list,
         system_helpers::run_command,
         system_helpers::run_program,
+        system_helpers::run_program_args,
         system_helpers::run_program_relative,
         system_helpers::start_service,
         system_helpers::service_status,

src-tauri/src/patch.rs

@@ -50,79 +50,80 @@ struct WhatToUnpach {
 
 #[cfg(windows)]
 #[tauri::command]
-pub async fn patch_game(newer_game: bool, version: String) -> bool {
+pub async fn patch_game(_newer_game: bool, version: String) -> bool {
   let mut patch_path;
   // Altpatch first - Now using as hoyonet switch
-  if newer_game {
-    let alt_patch_path = PathBuf::from(system_helpers::install_location()).join("altpatch");
+  // People keep using this when they shouldn't, 99.8% of people will never need it. Just remove for now.
+  // if newer_game {
+  //   let alt_patch_path = PathBuf::from(system_helpers::install_location()).join("altpatch");
 
-    // Should handle overwriting backup with new version backup later
-    let backup_path = PathBuf::from(system_helpers::install_location())
-      .join("altpatch/original-mihoyonet.dll")
-      .to_str()
-      .unwrap()
-      .to_string();
-    let backup_exists = file_helpers::does_file_exist(&backup_path);
+  //   // Should handle overwriting backup with new version backup later
+  //   let backup_path = PathBuf::from(system_helpers::install_location())
+  //     .join("altpatch/original-mihoyonet.dll")
+  //     .to_str()
+  //     .unwrap()
+  //     .to_string();
+  //   let backup_exists = file_helpers::does_file_exist(&backup_path);
 
-    if !backup_exists {
-      let backup = file_helpers::copy_file_with_new_name(
-        get_game_rsa_path().await.unwrap()
-          + &String::from("/GenshinImpact_Data/Plugins/mihoyonet.dll"),
-        alt_patch_path.clone().to_str().unwrap().to_string(),
-        String::from("original-mihoyonet.dll"),
-      );
+  //   if !backup_exists {
+  //     let backup = file_helpers::copy_file_with_new_name(
+  //       get_game_rsa_path().await.unwrap()
+  //         + &String::from("/GenshinImpact_Data/Plugins/mihoyonet.dll"),
+  //       alt_patch_path.clone().to_str().unwrap().to_string(),
+  //       String::from("original-mihoyonet.dll"),
+  //     );
 
-      if !backup {
-        println!("Unable to backup file!");
-      }
-    }
+  //     if !backup {
+  //       println!("Unable to backup file!");
+  //     }
+  //   }
 
-    patch_path = PathBuf::from(system_helpers::install_location()).join("altpatch/mihoyonet.dll");
-    // Copy the other part of patch to game files
-    let alt_replaced = file_helpers::copy_file_with_new_name(
-      patch_path.clone().to_str().unwrap().to_string(),
-      get_game_rsa_path().await.unwrap() + &String::from("/GenshinImpact_Data/Plugins"),
-      String::from("mihoyonet.dll"),
-    );
+  //   patch_path = PathBuf::from(system_helpers::install_location()).join("altpatch/mihoyonet.dll");
+  //   // Copy the other part of patch to game files
+  //   let alt_replaced = file_helpers::copy_file_with_new_name(
+  //     patch_path.clone().to_str().unwrap().to_string(),
+  //     get_game_rsa_path().await.unwrap() + &String::from("/GenshinImpact_Data/Plugins"),
+  //     String::from("mihoyonet.dll"),
+  //   );
 
-    if !alt_replaced {
-      return false;
-    }
+  //   if !alt_replaced {
+  //     return false;
+  //   }
 
-    /***  For replacing old backup file with new one, for example when version changes
-     *    Currently replaces when it shouldn't. Will figure it out when it matters
-     *                                                                                   ***/
-    // else {
-    //   // Check if game file matches backup
-    //   let matching_alt_backup = file_helpers::are_files_identical(
-    //     &backup_path.clone(),
-    //     PathBuf::from(get_game_rsa_path().await.unwrap())
-    //       .join("/GenshinImpact_Data/Plugins/mihoyonet.dll")
-    //       .to_str()
-    //       .unwrap(),
-    //   );
+  /***  For replacing old backup file with new one, for example when version changes
+   *    Currently replaces when it shouldn't. Will figure it out when it matters
+   *                                                                                   ***/
+  // else {
+  //   // Check if game file matches backup
+  //   let matching_alt_backup = file_helpers::are_files_identical(
+  //     &backup_path.clone(),
+  //     PathBuf::from(get_game_rsa_path().await.unwrap())
+  //       .join("/GenshinImpact_Data/Plugins/mihoyonet.dll")
+  //       .to_str()
+  //       .unwrap(),
+  //   );
 
-    //   let is_alt_patched = file_helpers::are_files_identical(
-    //     PathBuf::from(system_helpers::install_location()).join("altpatch/mihoyonet.dll").to_str().unwrap(),
-    //     PathBuf::from(get_game_rsa_path().await.unwrap())
-    //       .join("/GenshinImpact_Data/Plugins/mihoyonet.dll")
-    //       .to_str()
-    //       .unwrap(),
-    //   );
+  //   let is_alt_patched = file_helpers::are_files_identical(
+  //     PathBuf::from(system_helpers::install_location()).join("altpatch/mihoyonet.dll").to_str().unwrap(),
+  //     PathBuf::from(get_game_rsa_path().await.unwrap())
+  //       .join("/GenshinImpact_Data/Plugins/mihoyonet.dll")
+  //       .to_str()
+  //       .unwrap(),
+  //   );
 
-    //   // Check if already alt patched
-    //   if !matching_alt_backup {
-    //     // Copy new backup if it is not patched
-    //     if !is_alt_patched {
-    //       file_helpers::copy_file_with_new_name(
-    //         get_game_rsa_path().await.unwrap() + &String::from("/GenshinImpact_Data/Plugins/mihoyonet.dll"),
-    //         alt_patch_path.clone().to_str().unwrap().to_string(),
-    //         String::from("original-mihoyonet.dll"),
-    //       );
-    //     }
-    //   }
-    // }
-  }
+  //   // Check if already alt patched
+  //   if !matching_alt_backup {
+  //     // Copy new backup if it is not patched
+  //     if !is_alt_patched {
+  //       file_helpers::copy_file_with_new_name(
+  //         get_game_rsa_path().await.unwrap() + &String::from("/GenshinImpact_Data/Plugins/mihoyonet.dll"),
+  //         alt_patch_path.clone().to_str().unwrap().to_string(),
+  //         String::from("original-mihoyonet.dll"),
+  //       );
+  //     }
+  //   }
+  // }
+  // }
 
   // Standard patch
   patch_path = PathBuf::from(system_helpers::install_location()).join("patch/version.dll");
@@ -152,8 +153,14 @@ pub async fn patch_game(newer_game: bool, version: String) -> bool {
     return true;
   }
 
-  // For 5.0 and up
+  // For 5.0 and up use universal
   if i_ver > 49 {
+    if i_ver < 59 {
+      patch_path = PathBuf::from(system_helpers::install_location()).join("patch/5version.dll");
+    } else {
+      // 6.0 patch not checked/tested if works for old vers, so separate
+      patch_path = PathBuf::from(system_helpers::install_location()).join("patch/6version.dll");
+    }
     let replaced50 = file_helpers::copy_file_with_new_name(
       patch_path.clone().to_str().unwrap().to_string(),
       get_game_rsa_path().await.unwrap(),

src-tauri/src/system_helpers.rs

@@ -44,6 +44,7 @@ fn strcmd(cmd: &Command) -> String {
 }
 
 #[cfg(target_os = "linux")]
+#[allow(dead_code)]
 pub trait AsRoot {
   fn as_root(&self) -> Self;
   fn as_root_gui(&self) -> Self;
@@ -64,6 +65,7 @@ impl AsRoot for Command {
 }
 
 #[cfg(target_os = "linux")]
+#[allow(dead_code)]
 trait InTerminalEmulator {
   fn in_terminal(&self) -> Self;
   fn in_terminal_noclose(&self) -> Self;
@@ -106,6 +108,18 @@ impl SpawnItsFineReally for Command {
   }
 }
 
+#[tauri::command]
+pub fn run_program_args(path: String, args: Option<String>) {
+  match open::with(
+    format!("{}", args.unwrap_or_else(|| "".into())),
+    path.clone(),
+  ) {
+    Ok(_) => (),
+    Err(e) => println!("Failed to open program ({}): {}", &path, e),
+  };
+  return;
+}
+
 #[tauri::command]
 pub fn run_program(path: String, args: Option<String>) {
   // Without unwrap_or, this can crash when UAC prompt is denied
@@ -498,7 +512,7 @@ pub fn service_status(service: String) -> bool {
     }
   };
   let status_result = my_service.query_status();
-  if let Ok(..) = status_result {
+  if status_result.is_ok() {
     let status = status_result.unwrap();
     println!("{} service status: {:?}", service, status.current_state);
     if status.current_state == Stopped {

src-tauri/src/web.rs

@@ -36,8 +36,8 @@ pub(crate) async fn valid_url(url: String) -> bool {
     .await
     .ok();
 
-  if response.is_some() {
-    return response.unwrap().status().as_str() == "200";
+  if let Some(thing) = response {
+    return thing.status().as_str() == "200";
   } else {
     false
   }

src-tauri/tauri.conf.json

@@ -7,7 +7,7 @@
   },
   "package": {
     "productName": "Cultivation",
-    "version": "1.5.1"
+    "version": "1.6.1"
   },
   "tauri": {
     "allowlist": {
@@ -67,11 +67,13 @@
     "windows": [
       {
         "fullscreen": false,
+        "transparent": true,
         "height": 730,
         "resizable": true,
         "title": "Cultivation",
         "width": 1280,
-        "decorations": false
+        "decorations": false,
+        "center": true
       }
     ]
   }

src/ui/components/ServerLaunchSection.tsx

@@ -149,7 +149,7 @@ export default class ServerLaunchSection extends React.Component<IProps, IState>
     // Connect to proxy
     if (config.toggle_grasscutter) {
       const game_exe = await getGameExecutable()
-      let newerGame = false
+      const newerGame = false
 
       const patchable = game_exe?.toLowerCase().includes('yuanshen') || game_exe?.toLowerCase().includes('genshin')
 
@@ -183,35 +183,36 @@ export default class ServerLaunchSection extends React.Component<IProps, IState>
 
         const versionString = gameVersion?.major.toString() + gameVersion?.minor.toString()
 
-        if ((gameVersion?.major == 4 && gameVersion?.minor > 5) || config.newer_game) {
-          newerGame = true
+        // Keeps being misused, remove for now.
+        // if ((gameVersion?.major == 4 && gameVersion?.minor > 5) || config.newer_game) {
+        //   newerGame = true
 
-          const path = (await invoke('install_location')) as string
+        //   const path = (await invoke('install_location')) as string
 
-          const patchstring = '\\altpatch\\'
-          const altPatch = path + patchstring
+        //   const patchstring = '\\altpatch\\'
+        //   const altPatch = path + patchstring
 
-          const ALT_PATCH =
-            'https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20231030132335_iOEfPMcbrXpiA8Ca/ScatteredFiles/GenshinImpact_Data/Plugins/mihoyonet.dll'
-          const pExists = (await invoke('dir_exists', {
-            path: altPatch,
-          })) as boolean
+        //   const ALT_PATCH =
+        //     'https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20231030132335_iOEfPMcbrXpiA8Ca/ScatteredFiles/GenshinImpact_Data/Plugins/mihoyonet.dll'
+        //   const pExists = (await invoke('dir_exists', {
+        //     path: altPatch,
+        //   })) as boolean
 
-          if (!pExists) {
-            await invoke('dir_create', {
-              path: altPatch,
-            })
-            this.props.downloadHandler.addDownload(ALT_PATCH, path + '/altpatch/mihoyonet.dll')
-            await confirm('Please wait for the download in the bottom left to disappear, then click yes')
-          }
+        //   if (!pExists) {
+        //     await invoke('dir_create', {
+        //       path: altPatch,
+        //     })
+        //     this.props.downloadHandler.addDownload(ALT_PATCH, path + '/altpatch/mihoyonet.dll')
+        //     await confirm('Please wait for the download in the bottom left to disappear, then click yes')
+        //   }
 
-          /* For custom address patch only, used in 4.5 */
-          // let httpString = 'http://'
-          // if (this.state.httpsEnabled) {
-          //   httpString = 'https://'
-          // }
-          // config.launch_args = '-server=' + httpString + this.state.ip + ':' + this.state.port
-        }
+        //   /* For custom address patch only, used in 4.5 */
+        //   // let httpString = 'http://'
+        //   // if (this.state.httpsEnabled) {
+        //   //   httpString = 'https://'
+        //   // }
+        //   // config.launch_args = '-server=' + httpString + this.state.ip + ':' + this.state.port
+        // }
 
         const patched = await patchGame(newerGame, versionString)
 
@@ -278,6 +279,13 @@ export default class ServerLaunchSection extends React.Component<IProps, IState>
         if (config.launch_args.length < 1) {
           // Run relative when there are no args
           await invoke('run_program_relative', { path: exe || config.game_install_path })
+        }
+        // Handle XXMI
+        else if (proc_name?.toLowerCase().includes('xxmi')) {
+          await invoke('run_program_args', {
+            path: exe,
+            args: config.launch_args,
+          })
         } else {
           // Run directly when there are args
           await invoke('run_program', {

src/ui/components/menu/Downloads.tsx

@@ -16,7 +16,7 @@ import { ask } from '@tauri-apps/api/dialog'
 
 const FULL_BUILD_DOWNLOAD = 'https://github.com/NotThorny/Grasscutter/releases/download/culti-aio/GrasscutterCulti.zip' // Change to link that can be updated without modifying here
 const FULL_QUEST_DOWNLOAD = 'https://github.com/NotThorny/Grasscutter/releases/download/culti-aio/GrasscutterQuests.zip'
-const FULL_50_DOWNLOAD = 'https://github.com/NotThorny/Grasscutter/releases/download/culti-aio/GrasscutterLunaGC50.zip' // https://github.com/Kei-Luna/LunaGC_5.0.0
+const FULL_50_DOWNLOAD = 'https://github.com/NotThorny/Grasscutter/releases/download/culti-aio/GrasscutterLunaGC60.zip' // https://github.com/pmagixc/LunaGC_6.0.0
 const STABLE_REPO_DOWNLOAD = 'https://github.com/Grasscutters/Grasscutter/archive/refs/heads/stable.zip'
 const DEV_REPO_DOWNLOAD = 'https://github.com/Grasscutters/Grasscutter/archive/refs/heads/development.zip'
 const UNSTABLE_DOWNLOAD = 'https://nightly.link/Grasscutters/Grasscutter/workflows/build/unstable/Grasscutter.zip'

src/ui/components/menu/ExtrasMenu.tsx

@@ -69,7 +69,10 @@ export class ExtrasMenu extends React.Component<IProps, IState> {
 
     // This injects independent of the game
     if (this.state.launch_migoto) {
-      await this.launchMigoto()
+      if (await this.launchMigoto()) {
+        // Already launched the game (ie. via XXMI)
+        return
+      }
     }
 
     // This injects independent of the game
@@ -104,7 +107,17 @@ export class ExtrasMenu extends React.Component<IProps, IState> {
 
     if (!config.migoto_path) return alert('Migoto not installed or set!')
 
+    if (config.migoto_path?.toLowerCase().includes('xxmi')) {
+      // Get game exe from game path, so we can watch it
+      const pathArr = config.migoto_path.replace(/\\/g, '/').split('/')
+      const gameExec = pathArr[pathArr.length - 1]
+
+      this.props.playGame(config.migoto_path, gameExec)
+      return true
+    }
+
     await invoke('run_program_relative', { path: config.migoto_path })
+    return false
   }
 
   async launchReshade() {

src/ui/components/menu/Options.tsx

@@ -712,7 +712,7 @@ export default class Options extends React.Component<IProps, IState> {
           </div>
         </div>
 
-        <div className="OptionSection" id="menuOptionsContainerNewerGame">
+        {/* <div className="OptionSection" id="menuOptionsContainerNewerGame">
           <div className="OptionLabel" id="menuOptionsLabelNewerGame">
             <Tr text="Patch Mihoyonet" />
           </div>
@@ -723,7 +723,7 @@ export default class Options extends React.Component<IProps, IState> {
               id="newerGame"
             />
           </div>
-        </div>
+        </div> */}
 
         <Divider />
 
@@ -823,25 +823,32 @@ export default class Options extends React.Component<IProps, IState> {
               <Tr text="components.delete" />
             </BigButton>
           </div>
+        </div>
+
+        <div className="OptionSection" id="menuOptionsContainerLaunchArgs">
           <div className="OptionLabel" id="menuOptionsLaunchArgs">
             <Tr text="options.launch_args" />
           </div>
-          <TextInput
-            id="launch_args"
-            key="launch_args"
-            placeholder={'-arg=value'}
-            onChange={this.setLaunchArgs}
-            value={this.state.launch_args}
-          />
+          <div className="OptionValue" id="menuOptionsValueLaunchArgs">
+            <TextInput
+              id="launch_args"
+              key="launch_args"
+              placeholder={'-arg=value'}
+              onChange={this.setLaunchArgs}
+              value={this.state.launch_args}
+            />
+          </div>
         </div>
 
-        <div className="OptionLabel" id="menuOptionsLabelFixRes">
-          <Tr text="options.fix_res" />
-        </div>
-        <div className="OptionValue" id="menuOptionsButtonfixRes">
-          <BigButton onClick={this.fixRes} id="fixRes">
-            <Tr text="components.fix" />
-          </BigButton>
+        <div className="OptionSection" id="menuOptionsContainerFixRes">
+          <div className="OptionLabel" id="menuOptionsLabelFixRes">
+            <Tr text="options.fix_res" />
+          </div>
+          <div className="OptionValue" id="menuOptionsButtonfixRes">
+            <BigButton onClick={this.fixRes} id="fixRes">
+              <Tr text="components.fix" />
+            </BigButton>
+          </div>
         </div>
       </Menu>
     )

src/ui/components/news/NewsSection.tsx

@@ -143,7 +143,7 @@ export default class NewsSection extends React.Component<IProps, IState> {
           <tr>
             <td>
               Work in progress area! These numbers may be outdated, so please do not use them as reference. Latest
-              version: Grasscutter 1.7.4 - Cultivation 1.5.1
+              version: Grasscutter 1.7.4 - Cultivation 1.6.1
             </td>
           </tr>
         )

src/utils/download.ts

@@ -109,25 +109,35 @@ export default class DownloadHandler {
 
   downloadingJar() {
     // Kinda hacky but it works
-    return this.downloads.some((d) => d.path.includes('grasscutter.zip') && d.status != ('finished' || 'error'))
+    return this.downloads.some(
+      (d) => d.path.includes('grasscutter.zip') && !(d.status.includes('finished') || d.status.includes('error'))
+    )
   }
 
   downloadingFullBuild() {
     // Kinda hacky but it works
-    return this.downloads.some((d) => d.path.includes('GrasscutterCulti') && d.status != ('finished' || 'error'))
+    return this.downloads.some(
+      (d) => d.path.includes('GrasscutterCulti') && !(d.status.includes('finished') || d.status.includes('error'))
+    )
   }
 
   downloadingResources() {
     // Kinda hacky but it works
-    return this.downloads.some((d) => d.path.includes('resources') && d.status != ('finished' || 'error'))
+    return this.downloads.some(
+      (d) => d.path.includes('resources') && !(d.status.includes('finished') || d.status.includes('error'))
+    )
   }
 
   downloadingRepo() {
-    return this.downloads.some((d) => d.path.includes('grasscutter_repo.zip') && d.status != ('finished' || 'error'))
+    return this.downloads.some(
+      (d) => d.path.includes('grasscutter_repo.zip') && !(d.status.includes('finished') || d.status.includes('error'))
+    )
   }
 
   downloadingMigoto() {
-    return this.downloads.some((d) => d.path.includes('3dmigoto') && d.status != ('finished' || 'error'))
+    return this.downloads.some(
+      (d) => d.path.includes('3dmigoto') && !(d.status.includes('finished') || d.status.includes('error'))
+    )
   }
 
   addDownload(url: string, path: string, onFinish?: () => void) {

src/utils/game.ts

@@ -50,20 +50,34 @@ export async function getGameDataFolder() {
 
 export async function getGameVersion() {
   const GameData = await getGameDataFolder()
+  const platform = await invoke('get_platform')
 
   if (!GameData) {
     return null
   }
 
-  const hasAsb = await invoke('dir_exists', {
+  let hasAsb = await invoke('dir_exists', {
     path: GameData + '\\StreamingAssets\\asb_settings.json',
   })
 
+  if (platform != 'windows') {
+    hasAsb = await invoke('dir_exists', {
+      path: GameData + '/StreamingAssets/asb_settings.json',
+    })
+  }
+
   if (!hasAsb) {
     // For games that cannot determine game version
-    const otherGameVer: string = await invoke('read_file', {
+    let otherGameVer: string = await invoke('read_file', {
       path: GameData + '\\StreamingAssets\\BinaryVersion.bytes',
     })
+
+    if (platform != 'windows') {
+      otherGameVer = await invoke('read_file', {
+        path: GameData + '/StreamingAssets/BinaryVersion.bytes',
+      })
+    }
+
     const versionRaw = otherGameVer.split('.')
     const version = {
       major: parseInt(versionRaw[0]),

yarn.lock

@@ -26,6 +26,14 @@
   dependencies:
     "@babel/highlight" "^7.18.6"
 
+"@babel/code-frame@^7.22.13":
+  version "7.22.13"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e"
+  integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==
+  dependencies:
+    "@babel/highlight" "^7.22.13"
+    chalk "^2.4.2"
+
 "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.18.8":
   version "7.18.8"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.8.tgz#2483f565faca607b8535590e84e7de323f27764d"
@@ -70,6 +78,16 @@
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
+"@babel/generator@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420"
+  integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==
+  dependencies:
+    "@babel/types" "^7.23.0"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
+    jsesc "^2.5.1"
+
 "@babel/helper-annotate-as-pure@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb"
@@ -135,6 +153,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
   integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
 
+"@babel/helper-environment-visitor@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
+  integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
+
 "@babel/helper-explode-assignable-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096"
@@ -150,6 +173,14 @@
     "@babel/template" "^7.18.6"
     "@babel/types" "^7.18.9"
 
+"@babel/helper-function-name@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
+  integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
+  dependencies:
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.23.0"
+
 "@babel/helper-hoist-variables@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
@@ -157,6 +188,13 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
+"@babel/helper-hoist-variables@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
+  integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
 "@babel/helper-member-expression-to-functions@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz#1531661e8375af843ad37ac692c132841e2fd815"
@@ -239,11 +277,28 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
+"@babel/helper-split-export-declaration@^7.22.6":
+  version "7.22.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
+  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-string-parser@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
+  integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
+
 "@babel/helper-validator-identifier@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076"
   integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==
 
+"@babel/helper-validator-identifier@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
+  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
+
 "@babel/helper-validator-option@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
@@ -277,11 +332,25 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
+"@babel/highlight@^7.22.13":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54"
+  integrity sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.22.20"
+    chalk "^2.4.2"
+    js-tokens "^4.0.0"
+
 "@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.18.6", "@babel/parser@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.9.tgz#f2dde0c682ccc264a9a8595efd030a5cc8fd2539"
   integrity sha512-9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg==
 
+"@babel/parser@^7.22.15", "@babel/parser@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
+  integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
@@ -1043,19 +1112,28 @@
     "@babel/parser" "^7.18.6"
     "@babel/types" "^7.18.6"
 
-"@babel/traverse@^7.13.0", "@babel/traverse@^7.18.9", "@babel/traverse@^7.7.2":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.9.tgz#deeff3e8f1bad9786874cb2feda7a2d77a904f98"
-  integrity sha512-LcPAnujXGwBgv3/WHv01pHtb2tihcyW1XuL9wd7jqh1Z8AQkTd+QVjMrMijrln0T7ED3UXLIy36P9Ao7W75rYg==
+"@babel/template@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
+  integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
   dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.18.9"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.18.9"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.18.9"
-    "@babel/types" "^7.18.9"
+    "@babel/code-frame" "^7.22.13"
+    "@babel/parser" "^7.22.15"
+    "@babel/types" "^7.22.15"
+
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.18.9", "@babel/traverse@^7.7.2":
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8"
+  integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==
+  dependencies:
+    "@babel/code-frame" "^7.22.13"
+    "@babel/generator" "^7.23.0"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/parser" "^7.23.0"
+    "@babel/types" "^7.23.0"
     debug "^4.1.0"
     globals "^11.1.0"
 
@@ -1067,6 +1145,15 @@
     "@babel/helper-validator-identifier" "^7.18.6"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb"
+  integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==
+  dependencies:
+    "@babel/helper-string-parser" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.20"
+    to-fast-properties "^2.0.0"
+
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
@@ -1446,6 +1533,11 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
   integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
 
+"@jridgewell/resolve-uri@^3.1.0":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721"
+  integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==
+
 "@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
@@ -1464,6 +1556,19 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
+"@jridgewell/sourcemap-codec@^1.4.14":
+  version "1.4.15"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
+  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
+
+"@jridgewell/trace-mapping@^0.3.17":
+  version "0.3.20"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz#72e45707cf240fa6b081d0366f8265b0cd10197f"
+  integrity sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
+
 "@jridgewell/trace-mapping@^0.3.7", "@jridgewell/trace-mapping@^0.3.9":
   version "0.3.14"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed"
@@ -2986,7 +3091,7 @@ case-sensitive-paths-webpack-plugin@^2.4.0:
   resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz#db64066c6422eed2e08cc14b986ca43796dbc6d4"
   integrity sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==
 
-chalk@^2.0.0, chalk@^2.4.1:
+chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==