From 189721271310ccd7a9d1bea7c05a08fa999cea05 Mon Sep 17 00:00:00 2001
From: Cade Ayres <ca469@kent.ac.uk>
Date: Wed, 6 Nov 2024 22:37:17 +0000
Subject: [PATCH 01/95] Updated Hero component to remove dependency on class
 name. Replaced usages with v2.

---
 src/components/Hero.vue                       | 31 ---------
 src/components/all.ts                         |  2 +-
 .../config-components/ConfigEditLayout.vue    |  4 +-
 .../ConfigSelectionLayout.vue                 |  2 +-
 src/components/mixins/SplashMixin.vue         |  2 +-
 .../settings-components/SettingsView.vue      |  2 +-
 src/components/v2/Hero.vue                    | 66 +++++++++++++++++--
 src/css/app.scss                              |  2 +
 src/css/v2/_initial.scss                      |  8 +++
 src/css/v2/main.scss                          |  3 +
 src/pages/DownloadMonitor.vue                 |  2 +-
 src/pages/GameSelectionScreen.vue             |  4 +-
 src/pages/Help.vue                            |  2 +-
 src/pages/LinuxNativeGameSetup.vue            |  2 +-
 src/pages/Profiles.vue                        |  2 +-
 .../components/template.hero.vue.spec.ts      |  2 +-
 16 files changed, 85 insertions(+), 51 deletions(-)
 delete mode 100644 src/components/Hero.vue
 create mode 100644 src/css/v2/_initial.scss
 create mode 100644 src/css/v2/main.scss

diff --git a/src/components/Hero.vue b/src/components/Hero.vue
deleted file mode 100644
index 2928512aa..000000000
--- a/src/components/Hero.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<template>
-    <section :class="['hero', heroType]" ref="section">
-        <div class="hero-body non-selectable">
-            <div class="container">
-                <h1 class="title" ref="title">
-                    {{title}}
-                </h1>
-                <h2 class="subtitle" ref="subtitle">
-                    {{subtitle}}
-                </h2>
-            </div>
-        </div>
-    </section>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-import { Component, Prop } from 'vue-property-decorator'
-
-@Component
-export default class Hero extends Vue {
-    @Prop({default: ''})
-    heroType: string | undefined;
-
-    @Prop({default: ''})
-    title: string | undefined;
-
-    @Prop({default: ''})
-    subtitle: string | undefined;
-}
-</script>
diff --git a/src/components/all.ts b/src/components/all.ts
index bfbe6bbc0..c7ee9e7cf 100644
--- a/src/components/all.ts
+++ b/src/components/all.ts
@@ -1,4 +1,4 @@
-import Hero from './Hero.vue';
+import Hero from './v2/Hero.vue';
 import Progress from './Progress.vue';
 import ExpandableCard from './ExpandableCard.vue';
 import Modal from './Modal.vue';
diff --git a/src/components/config-components/ConfigEditLayout.vue b/src/components/config-components/ConfigEditLayout.vue
index 1d367b617..8e5613f3a 100644
--- a/src/components/config-components/ConfigEditLayout.vue
+++ b/src/components/config-components/ConfigEditLayout.vue
@@ -3,7 +3,7 @@
         <Hero
             :title="configFile.getName()"
             subtitle="Editing config file"
-            hero-type="is-info"
+            hero-type="primary"
         />
         <br/>
         <div class="sticky-top sticky-top--buttons margin-right">
@@ -73,7 +73,7 @@ import { Component, Prop, Vue } from 'vue-property-decorator';
 import ConfigLine from '../../model/file/ConfigLine';
 import FsProvider from '../../providers/generic/file/FsProvider';
 import ConfigFile from '../../model/file/ConfigFile';
-import Hero from '../Hero.vue';
+import { Hero } from '../all';
 import QuillEditor from '../QuillEditor.vue';
 import BepInExConfigUtils from '../../utils/BepInExConfigUtils';
 
diff --git a/src/components/config-components/ConfigSelectionLayout.vue b/src/components/config-components/ConfigSelectionLayout.vue
index 334e5a58a..47268004b 100644
--- a/src/components/config-components/ConfigSelectionLayout.vue
+++ b/src/components/config-components/ConfigSelectionLayout.vue
@@ -3,7 +3,7 @@
         <Hero
             title="Config editor"
             subtitle="Select a configuration file to edit"
-            hero-type="is-info"
+            hero-type="primary"
         />
         <div class="notification is-warning is-square">
             <div class="container">
diff --git a/src/components/mixins/SplashMixin.vue b/src/components/mixins/SplashMixin.vue
index 6d7ef24a0..bad81f5c2 100644
--- a/src/components/mixins/SplashMixin.vue
+++ b/src/components/mixins/SplashMixin.vue
@@ -10,7 +10,7 @@ import type { PackageListChunks, PackageListIndex } from '../../store/modules/Ts
 @Component
 export default class SplashMixin extends Vue {
     heroTitle = '';
-    heroType: string = 'is-info';
+    heroType: string = 'primary';
     isOffline = false;
     loadingText = '';
     requests: RequestItem[] = [];
diff --git a/src/components/settings-components/SettingsView.vue b/src/components/settings-components/SettingsView.vue
index 34e1f5d38..29174c394 100644
--- a/src/components/settings-components/SettingsView.vue
+++ b/src/components/settings-components/SettingsView.vue
@@ -2,7 +2,7 @@
     <div>
         <Hero title='Settings'
               :subtitle='`Advanced options for ${appName}: ` + managerVersionNumber.toString()'
-              heroType='is-info'/>
+              heroType='primary'/>
         <div class="margin-right">
             <div class="sticky-top sticky-top--opaque sticky-top--no-shadow sticky-top--no-padding">
                 <div class='border-at-bottom'>
diff --git a/src/components/v2/Hero.vue b/src/components/v2/Hero.vue
index ea82efcb7..fca6490da 100644
--- a/src/components/v2/Hero.vue
+++ b/src/components/v2/Hero.vue
@@ -1,12 +1,14 @@
 <template>
-    <section :class="['hero', heroType]" ref="section">
+    <section :class="['component__hero', heroTypeClass]" ref="section">
         <div class="hero-body non-selectable">
             <div class="container">
-                <h1 class="title" ref="title">
-                    {{title}}
-                </h1>
-                <h2 class="subtitle" ref="subtitle">
-                    {{subtitle}}
+                <div>
+                    <h1 class="hero__title" ref="title">
+                        {{ title }}
+                    </h1>
+                </div>
+                <h2 class="hero__subtitle" ref="subtitle">
+                    {{ subtitle }}
                 </h2>
             </div>
         </div>
@@ -14,11 +16,61 @@
 </template>
 
 <script lang="ts" setup>
+import { computed } from 'vue';
+
 interface HeroProps {
     title: string;
     subtitle: string;
-    heroType?: string;
+    heroType?: 'primary' | 'warning' | 'danger';
 }
 
 const heroProps = defineProps<HeroProps>();
+
+const heroTypeClass = computed(() => {
+    if (heroProps.heroType == undefined) {
+        return '';
+    }
+    switch (heroProps.heroType) {
+        case 'primary':
+            return 'component__hero--primary';
+        case 'warning':
+            return 'component__hero--warning';
+        case 'danger':
+            return 'component__hero--danger';
+    }
+});
 </script>
+
+<style lang="scss" scoped>
+.component__hero {
+
+    &--primary {
+        background-color: var(--r2-primary-color);
+        color: var(--r2-primary-text-color);
+    }
+
+    &--warning {
+        background-color: var(--r2-warning-color);
+        color: var(--r2-warning-text-color);
+    }
+
+    .hero__title {
+        // Display as inline due to current CSS imports margins taking precedence.
+        // This is solved by being wrapped in a div.
+        display: inline;
+        user-select: none;
+        font-size: 2rem;
+        font-weight: 600;
+        line-height: 1.125;
+        word-break: break-word;
+        margin-block-end: 0.83em;
+    }
+
+    .hero__subtitle {
+        line-height: 1.5;
+        font-size: 1.25rem;
+        display: block;
+    }
+}
+
+</style>
diff --git a/src/css/app.scss b/src/css/app.scss
index 75c039a40..84b2b9676 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -1,4 +1,6 @@
 @charset "utf-8";
+@use "v2/main";
+@use "v2/initial";
 @import "quasar.css";
 @import "fontawesome-free-5.11.2/css/all.min.css";
 
diff --git a/src/css/v2/_initial.scss b/src/css/v2/_initial.scss
new file mode 100644
index 000000000..6739154a3
--- /dev/null
+++ b/src/css/v2/_initial.scss
@@ -0,0 +1,8 @@
+:root {
+    --r2-primary-color: #3f8ecf;
+    --r2-primary-text-color: white;
+
+    --r2-warning-color: #ffe08a;
+    --r2-warning-text-color: #222;
+    //--r2-danger-color:
+}
diff --git a/src/css/v2/main.scss b/src/css/v2/main.scss
new file mode 100644
index 000000000..57b854809
--- /dev/null
+++ b/src/css/v2/main.scss
@@ -0,0 +1,3 @@
+body {
+    font-family: BlinkMacSystemFont, -apple-system, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
+}
diff --git a/src/pages/DownloadMonitor.vue b/src/pages/DownloadMonitor.vue
index e2cb2b9b4..2503e4161 100644
--- a/src/pages/DownloadMonitor.vue
+++ b/src/pages/DownloadMonitor.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <Hero title="Downloads" subtitle="Monitor progress of downloads" hero-type="is-info"/>
+        <Hero title="Downloads" subtitle="Monitor progress of downloads" hero-type="primary"/>
         <template v-if="activeDownloads.length === 0">
             <div class='text-center top'>
                 <div class="margin-right">
diff --git a/src/pages/GameSelectionScreen.vue b/src/pages/GameSelectionScreen.vue
index 7263af503..139df65da 100644
--- a/src/pages/GameSelectionScreen.vue
+++ b/src/pages/GameSelectionScreen.vue
@@ -25,7 +25,7 @@
                     ? 'Which game are you managing your mods for?'
                     : 'Which dedicated server are you managing your mods for?'
             "
-            :heroType="activeTab === 'Game' ? 'is-info' : 'is-warning'"
+            :heroType="activeTab === 'Game' ? 'primary' : 'warning'"
         />
         <div class="notification is-warning is-square" v-if="runningMigration">
             <div class="container">
@@ -164,7 +164,7 @@
 import { Component, Vue } from 'vue-property-decorator';
 import Game from '../model/game/Game';
 import GameManager from '../model/game/GameManager';
-import Hero from '../components/v2/Hero.vue';
+import { Hero } from '../components/all';
 import * as ManagerUtils from '../utils/ManagerUtils';
 import ManagerSettings from '../r2mm/manager/ManagerSettings';
 import { StorePlatform } from '../model/game/StorePlatform';
diff --git a/src/pages/Help.vue b/src/pages/Help.vue
index c53cc10b1..a21eb9b11 100644
--- a/src/pages/Help.vue
+++ b/src/pages/Help.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <Hero title="Help" subtitle="Common problems and their potential solutions" hero-type="is-info"/>
+        <Hero title="Help" subtitle="Common problems and their potential solutions" hero-type="primary"/>
         <div
             class="tabs sticky-top sticky-top--opaque sticky-top--no-shadow sticky-top--no-padding has-background-">
             <ul>
diff --git a/src/pages/LinuxNativeGameSetup.vue b/src/pages/LinuxNativeGameSetup.vue
index 57429a147..3eceb95d4 100644
--- a/src/pages/LinuxNativeGameSetup.vue
+++ b/src/pages/LinuxNativeGameSetup.vue
@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<hero :title="`Getting started on ${platformName}`" subtitle="Let's configure the game properly" heroType="is-warning" />
+		<hero :title="`Getting started on ${platformName}`" subtitle="Let's configure the game properly" heroType="warning" />
 		<br/>
 		<div class="container">
 			To be able to launch {{ activeGame }} on Linux, you must first setup your Steam launch options correctly.<br/>
diff --git a/src/pages/Profiles.vue b/src/pages/Profiles.vue
index db4bf0bf6..2ca5de184 100644
--- a/src/pages/Profiles.vue
+++ b/src/pages/Profiles.vue
@@ -8,7 +8,7 @@
     <hero
       title="Profile selection"
       subtitle="Profiles help to organise mods easily"
-      heroType="is-info"
+      heroType="primary"
     />
     <div class="columns">
       <div class="column is-full">
diff --git a/test/jest/__tests__/templates/components/template.hero.vue.spec.ts b/test/jest/__tests__/templates/components/template.hero.vue.spec.ts
index 2a0e2e27e..19b00642c 100644
--- a/test/jest/__tests__/templates/components/template.hero.vue.spec.ts
+++ b/test/jest/__tests__/templates/components/template.hero.vue.spec.ts
@@ -1,6 +1,6 @@
 import TestSetup from '../../test-setup';
 import { shallowMount } from '@vue/test-utils';
-import Hero from '../../../../../src/components/Hero.vue';
+import { Hero } from '../../../../../src/components/all';
 
 type MountOptions = {
     propsData: {

From 4f7dc85a4a7707261ebc27c24902157560bf4b76 Mon Sep 17 00:00:00 2001
From: Cade Ayres <ca469@kent.ac.uk>
Date: Wed, 6 Nov 2024 22:51:25 +0000
Subject: [PATCH 02/95] Removed "danger" from allowed types. Subtitle text
 color is different from title. Renamed CSS bg color var.

---
 src/components/v2/Hero.vue | 35 +++++++++++++++++++++--------------
 src/css/v2/_initial.scss   |  7 ++++---
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/components/v2/Hero.vue b/src/components/v2/Hero.vue
index fca6490da..bf8fd1216 100644
--- a/src/components/v2/Hero.vue
+++ b/src/components/v2/Hero.vue
@@ -21,7 +21,7 @@ import { computed } from 'vue';
 interface HeroProps {
     title: string;
     subtitle: string;
-    heroType?: 'primary' | 'warning' | 'danger';
+    heroType?: 'primary' | 'warning';
 }
 
 const heroProps = defineProps<HeroProps>();
@@ -35,8 +35,6 @@ const heroTypeClass = computed(() => {
             return 'component__hero--primary';
         case 'warning':
             return 'component__hero--warning';
-        case 'danger':
-            return 'component__hero--danger';
     }
 });
 </script>
@@ -44,16 +42,6 @@ const heroTypeClass = computed(() => {
 <style lang="scss" scoped>
 .component__hero {
 
-    &--primary {
-        background-color: var(--r2-primary-color);
-        color: var(--r2-primary-text-color);
-    }
-
-    &--warning {
-        background-color: var(--r2-warning-color);
-        color: var(--r2-warning-text-color);
-    }
-
     .hero__title {
         // Display as inline due to current CSS imports margins taking precedence.
         // This is solved by being wrapped in a div.
@@ -67,9 +55,28 @@ const heroTypeClass = computed(() => {
     }
 
     .hero__subtitle {
+        display: block;
         line-height: 1.5;
         font-size: 1.25rem;
-        display: block;
+    }
+
+    &--primary {
+        background-color: var(--r2-primary-background-color);
+        color: var(--r2-primary-text-color);
+
+        .hero__subtitle {
+            color: var(--r2-primary-subtitle-text-color);
+        }
+
+    }
+
+    &--warning {
+        background-color: var(--r2-warning-background-color);
+        color: var(--r2-warning-text-color);
+
+        .hero__subtitle {
+            color: var(--r2-warning-subtitle-text-color);
+        }
     }
 }
 
diff --git a/src/css/v2/_initial.scss b/src/css/v2/_initial.scss
index 6739154a3..f96d0e37f 100644
--- a/src/css/v2/_initial.scss
+++ b/src/css/v2/_initial.scss
@@ -1,8 +1,9 @@
 :root {
-    --r2-primary-color: #3f8ecf;
+    --r2-primary-background-color: #3f8ecf;
     --r2-primary-text-color: white;
+    --r2-primary-subtitle-text-color: #ffffe6;
 
-    --r2-warning-color: #ffe08a;
+    --r2-warning-background-color: #ffe08a;
     --r2-warning-text-color: #222;
-    //--r2-danger-color:
+    --r2-warning-subtitle-text-color: #272727;
 }

From 67fa1c710d2eb953f66a9fef979b1b98597fab9b Mon Sep 17 00:00:00 2001
From: Cade Ayres <ca469@kent.ac.uk>
Date: Fri, 8 Nov 2024 17:45:43 +0000
Subject: [PATCH 03/95] Removed dependency on bulma hero-body and container
 classes. Renamed classes and vars to be less r2mm specific.

---
 src/components/v2/Hero.vue | 57 +++++++++++++++++++++-----------------
 src/css/v2/_initial.scss   | 12 ++++----
 2 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/src/components/v2/Hero.vue b/src/components/v2/Hero.vue
index bf8fd1216..fb6e22ee5 100644
--- a/src/components/v2/Hero.vue
+++ b/src/components/v2/Hero.vue
@@ -1,16 +1,12 @@
 <template>
-    <section :class="['component__hero', heroTypeClass]" ref="section">
-        <div class="hero-body non-selectable">
-            <div class="container">
-                <div>
-                    <h1 class="hero__title" ref="title">
-                        {{ title }}
-                    </h1>
-                </div>
-                <h2 class="hero__subtitle" ref="subtitle">
-                    {{ subtitle }}
-                </h2>
-            </div>
+    <section :class="['c-hero', heroTypeClass]" ref="section">
+        <div class="c-hero__container">
+            <h1 class="c-hero__title" ref="title">
+                {{ title }}
+            </h1>
+            <h2 class="c-hero__subtitle" ref="subtitle">
+                {{ subtitle }}
+            </h2>
         </div>
     </section>
 </template>
@@ -32,50 +28,59 @@ const heroTypeClass = computed(() => {
     }
     switch (heroProps.heroType) {
         case 'primary':
-            return 'component__hero--primary';
+            return 'c-hero--primary';
         case 'warning':
-            return 'component__hero--warning';
+            return 'c-hero--warning';
     }
 });
 </script>
 
 <style lang="scss" scoped>
-.component__hero {
+.c-hero {
 
-    .hero__title {
+    $root: &;
+    padding: 3rem;
+
+    &__container {
+        max-width: 1344px;
+        margin: 0 auto;
+    }
+
+    &__title {
         // Display as inline due to current CSS imports margins taking precedence.
         // This is solved by being wrapped in a div.
-        display: inline;
+        display: block;
         user-select: none;
         font-size: 2rem;
         font-weight: 600;
         line-height: 1.125;
         word-break: break-word;
         margin-block-end: 0.83em;
+        margin-bottom: 0;
     }
 
-    .hero__subtitle {
+    &__subtitle {
         display: block;
         line-height: 1.5;
         font-size: 1.25rem;
     }
 
     &--primary {
-        background-color: var(--r2-primary-background-color);
-        color: var(--r2-primary-text-color);
+        background-color: var(--v2-primary-background-color);
+        color: var(--v2-primary-text-color);
 
-        .hero__subtitle {
-            color: var(--r2-primary-subtitle-text-color);
+        #{$root}__subtitle {
+            color: var(--v2-primary-subtitle-text-color);
         }
 
     }
 
     &--warning {
-        background-color: var(--r2-warning-background-color);
-        color: var(--r2-warning-text-color);
+        background-color: var(--v2-warning-background-color);
+        color: var(--v2-warning-text-color);
 
-        .hero__subtitle {
-            color: var(--r2-warning-subtitle-text-color);
+        #{$root}__subtitle {
+            color: var(--v2-warning-subtitle-text-color);
         }
     }
 }
diff --git a/src/css/v2/_initial.scss b/src/css/v2/_initial.scss
index f96d0e37f..e4d35fb40 100644
--- a/src/css/v2/_initial.scss
+++ b/src/css/v2/_initial.scss
@@ -1,9 +1,9 @@
 :root {
-    --r2-primary-background-color: #3f8ecf;
-    --r2-primary-text-color: white;
-    --r2-primary-subtitle-text-color: #ffffe6;
+    --v2-primary-background-color: #3f8ecf;
+    --v2-primary-text-color: white;
+    --v2-primary-subtitle-text-color: #ffffe6;
 
-    --r2-warning-background-color: #ffe08a;
-    --r2-warning-text-color: #222;
-    --r2-warning-subtitle-text-color: #272727;
+    --v2-warning-background-color: #ffe08a;
+    --v2-warning-text-color: #222;
+    --v2-warning-subtitle-text-color: #272727;
 }

From 37681d5f75c48194486d2252b8cc8a31544b58ac Mon Sep 17 00:00:00 2001
From: Cade Ayres <ca469@kent.ac.uk>
Date: Sat, 9 Nov 2024 22:16:05 +0000
Subject: [PATCH 04/95] WIP: Updated tests.

- TODO: Fix 'Has correct class' test
---
 src/components/v2/Hero.vue                    |  6 ++-
 .../components/template.hero.vue.spec.ts      | 42 ++++++++++---------
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/components/v2/Hero.vue b/src/components/v2/Hero.vue
index fb6e22ee5..05b66ecfb 100644
--- a/src/components/v2/Hero.vue
+++ b/src/components/v2/Hero.vue
@@ -17,10 +17,12 @@ import { computed } from 'vue';
 interface HeroProps {
     title: string;
     subtitle: string;
-    heroType?: 'primary' | 'warning';
+    heroType: 'primary' | 'warning';
 }
 
-const heroProps = defineProps<HeroProps>();
+const heroProps = withDefaults(defineProps<HeroProps>(), {
+  heroType: 'primary'
+});
 
 const heroTypeClass = computed(() => {
     if (heroProps.heroType == undefined) {
diff --git a/test/jest/__tests__/templates/components/template.hero.vue.spec.ts b/test/jest/__tests__/templates/components/template.hero.vue.spec.ts
index 19b00642c..ea19e67a8 100644
--- a/test/jest/__tests__/templates/components/template.hero.vue.spec.ts
+++ b/test/jest/__tests__/templates/components/template.hero.vue.spec.ts
@@ -1,5 +1,5 @@
 import TestSetup from '../../test-setup';
-import { shallowMount } from '@vue/test-utils';
+import { mount, shallowMount } from '@vue/test-utils';
 import { Hero } from '../../../../../src/components/all';
 
 type MountOptions = {
@@ -10,38 +10,40 @@ type MountOptions = {
     }
 };
 
-describe("Hero component", () => {
+describe('Hero component', () => {
 
 
-    let mountOptions: MountOptions;
+    const mountOptions = {
+        props: ['title', 'heroType', 'subtitle'],
+        propsData: {
+            title: 'Some title',
+            heroType: 'warning',
+            subtitle: 'Some subtitle'
+        }
+    };
 
     beforeEach(() => {
         TestSetup.stubSetUp();
-        mountOptions = {
-            propsData: {
-                title: "Some title",
-                heroType: "Hero Type",
-                subtitle: "Some subtitle"
-            }
-        }
     });
 
-    it("Has title text", () => {
-        const mount = shallowMount(Hero, mountOptions);
-        const found = mount.findComponent({ ref: "title"});
-        expect(found.text()).toBe(mountOptions.propsData.title);
+    it('Has title text', () => {
+        const m = shallowMount(Hero, mountOptions);
+        const found = m.findComponent({ ref: 'title' });
+        expect(found.text()).toBe(mountOptions.propsData!.title);
     });
 
-    it("Has subtitle text", () => {
+    it('Has subtitle text', () => {
         const mount = shallowMount(Hero, mountOptions);
-        const found = mount.findComponent({ ref: "subtitle"});
+        const found = mount.findComponent({ ref: 'subtitle' });
         expect(found.text()).toBe(mountOptions.propsData.subtitle);
     });
 
-    it("Has correct class", () => {
-        const mount = shallowMount(Hero, mountOptions);
-        const found = mount.findComponent({ ref: "section"});
-        expect(found.classes().join(" ")).toBe(`hero ${mountOptions.propsData.heroType}`);
+    it('Has correct class', () => {
+        const m = mount(Hero, mountOptions);
+        const found = m.findComponent({ ref: 'section' });
+        expect(found.classes().join(' ')).toBe(`c-hero`);
+        console.log("vm:", found.vm);
+        // expect().toBe(`c-hero--${mountOptions.propsData.heroType}`)
     });
 
 });

From 50102f768bbcc24cc7fd1ab6bf499266745cf5e7 Mon Sep 17 00:00:00 2001
From: Cade Ayres <ca469@kent.ac.uk>
Date: Wed, 11 Dec 2024 21:03:56 +0000
Subject: [PATCH 05/95] Added "Other" selection option for Bomb Rush Cyberfunk

---
 src/model/game/GameManager.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/model/game/GameManager.ts b/src/model/game/GameManager.ts
index 59ea93301..bab773cdc 100644
--- a/src/model/game/GameManager.ts
+++ b/src/model/game/GameManager.ts
@@ -494,7 +494,8 @@ export default class GameManager {
             "https://thunderstore.io/c/bomb-rush-cyberfunk/api/v1/package-listing-index/", EXCLUSIONS,
             [
                 new StorePlatformMetadata(StorePlatform.STEAM, "1353230"),
-                new StorePlatformMetadata(StorePlatform.XBOX_GAME_PASS, "TeamReptile.BombRushCyberfunk")
+                new StorePlatformMetadata(StorePlatform.XBOX_GAME_PASS, "TeamReptile.BombRushCyberfunk"),
+                new StorePlatformMetadata(StorePlatform.OTHER)
             ], "BombRushCyberfunk.jpg", GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["brc"]),
 
         new Game(

From d634bbc7a3b8c825dd1a0a5cf61cac07f691b0b3 Mon Sep 17 00:00:00 2001
From: Cade Ayres <ca469@kent.ac.uk>
Date: Wed, 11 Dec 2024 21:38:13 +0000
Subject: [PATCH 06/95] Removed useless hero test

---
 jest.config.js                                |  145 ++-
 package.json                                  |    7 +-
 .../components/template.hero.vue.spec.ts      |   49 -
 test/jest/__tests__/test-setup.ts             |    1 -
 yarn.lock                                     | 1157 +++++++++++++----
 5 files changed, 978 insertions(+), 381 deletions(-)
 delete mode 100644 test/jest/__tests__/templates/components/template.hero.vue.spec.ts

diff --git a/jest.config.js b/jest.config.js
index 30a87c33e..54c9b0155 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -2,76 +2,81 @@ const esModules = ['quasar/lang', 'lodash-es'].join('|');
 
 /* eslint-env node */
 module.exports = {
-  globals: {
-    __DEV__: true,
-    // TODO: Remove if resolved natively https://github.com/vuejs/vue-jest/issues/175
-    'vue-jest': {
-      pug: { doctype: 'html' },
+    globals: {
+        __DEV__: true,
+        // TODO: Remove if resolved natively https://github.com/vuejs/vue-jest/issues/175
+        'vue-jest': {
+            pug: { doctype: 'html' }
+        }
     },
-  },
-  setupFilesAfterEnv: ['<rootDir>/test/jest/jest.setup.ts'],
-  // noStackTrace: true,
-  // bail: true,
-  // cache: false,
-  // verbose: true,
-  // watch: true,
-  collectCoverage: false,
-  coverageDirectory: '<rootDir>/test/jest/coverage',
-  collectCoverageFrom: [
-    '<rootDir>/src/**/*.vue',
-    '<rootDir>/src/**/*.js',
-    '<rootDir>/src/**/*.ts',
-    '<rootDir>/src/**/*.jsx',
-    '<rootDir>/src/**/*.tsx',
-  ],
-  coveragePathIgnorePatterns: ['/node_modules/', '.d.ts$'],
-  coverageThreshold: {
-    global: {
-      //  branches: 50,
-      //  functions: 50,
-      //  lines: 50,
-      //  statements: 50
+    testEnvironmentOptions: {
+        url: 'http://localhost/',
     },
-  },
-  testMatch: [
-    // Matches tests in any subfolder of 'src' or into 'test/jest/__tests__'
-    // Matches all files with extension 'js', 'jsx', 'ts' and 'tsx'
-    '<rootDir>/test/jest/__tests__/**/*.(spec|test).+(ts|js)?(x)',
-    '<rootDir>/src/**/*.jest.(spec|test).+(ts|js)?(x)',
-  ],
-  // Extension-less imports of components are resolved to .ts files by TS,
-  //  grating correct type-checking in test files.
-  // Being 'vue' the first moduleFileExtension option, the very same imports
-  //  will be resolved to .vue files by Jest, if both .vue and .ts files are
-  //  in the same folder.
-  // This guarantee a great dev experience both for testing and type-checking.
-  // See https://github.com/vuejs/vue-jest/issues/188#issuecomment-620750728
-  moduleFileExtensions: ['vue', 'js', 'jsx', 'json', 'ts', 'tsx'],
-  moduleNameMapper: {
-    '^quasar$': 'quasar/dist/quasar.common.js',
-    '^~/(.*)$': '<rootDir>/$1',
-    '^src/(.*)$': '<rootDir>/src/$1',
-    '^app/(.*)$': '<rootDir>/$1',
-    '^components/(.*)$': '<rootDir>/src/components/$1',
-    '^layouts/(.*)$': '<rootDir>/src/layouts/$1',
-    '^pages/(.*)$': '<rootDir>/src/pages/$1',
-    '^assets/(.*)$': '<rootDir>/src/assets/$1',
-    '^boot/(.*)$': '<rootDir>/src/boot/$1',
-    '.*css$': '<rootDir>/test/jest/__tests__/__stub_module_files__/style.js',
-  },
-  transform: {
-    // See https://jestjs.io/docs/en/configuration.html#transformignorepatterns-array-string
-    [`^(${esModules}).+\\.js$`]: 'babel-jest',
-    '^.+\\.(ts|js|html)$': 'ts-jest',
-    '^.+\\.(ts|js)$': 'babel-jest',
-    // vue-jest uses find-babel-file, which searches by this order:
-    //  (async) .babelrc, .babelrc.js, package.json, babel.config.js
-    //  (sync) .babelrc, .babelrc.js, babel.config.js, package.json
-    // https://github.com/tleunen/find-babel-config/issues/33
-    '.*\\.vue$': 'vue-jest',
-    '.+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$':
-      'jest-transform-stub',
-  },
-  transformIgnorePatterns: [`node_modules/(?!(${esModules}))`],
-  snapshotSerializers: ['<rootDir>/node_modules/jest-serializer-vue'],
+    testEnvironment: 'jsdom',
+    testURL: 'http://localhost/',
+    setupFilesAfterEnv: ['<rootDir>/test/jest/jest.setup.ts'],
+    // noStackTrace: true,
+    // bail: true,
+    // cache: false,
+    // verbose: true,
+    // watch: true,
+    collectCoverage: false,
+    coverageDirectory: '<rootDir>/test/jest/coverage',
+    collectCoverageFrom: [
+        '<rootDir>/src/**/*.vue',
+        '<rootDir>/src/**/*.js',
+        '<rootDir>/src/**/*.ts',
+        '<rootDir>/src/**/*.jsx',
+        '<rootDir>/src/**/*.tsx'
+    ],
+    coveragePathIgnorePatterns: ['/node_modules/', '.d.ts$'],
+    coverageThreshold: {
+        global: {
+            //  branches: 50,
+            //  functions: 50,
+            //  lines: 50,
+            //  statements: 50
+        }
+    },
+    testMatch: [
+        // Matches tests in any subfolder of 'src' or into 'test/jest/__tests__'
+        // Matches all files with extension 'js', 'jsx', 'ts' and 'tsx'
+        '<rootDir>/test/jest/__tests__/**/*.(spec|test).+(ts|js)?(x)',
+        '<rootDir>/src/**/*.jest.(spec|test).+(ts|js)?(x)'
+    ],
+    // Extension-less imports of components are resolved to .ts files by TS,
+    //  grating correct type-checking in test files.
+    // Being 'vue' the first moduleFileExtension option, the very same imports
+    //  will be resolved to .vue files by Jest, if both .vue and .ts files are
+    //  in the same folder.
+    // This guarantee a great dev experience both for testing and type-checking.
+    // See https://github.com/vuejs/vue-jest/issues/188#issuecomment-620750728
+    moduleFileExtensions: ['vue', 'js', 'jsx', 'json', 'ts', 'tsx'],
+    moduleNameMapper: {
+        '^quasar$': 'quasar/dist/quasar.common.js',
+        '^~/(.*)$': '<rootDir>/$1',
+        '^src/(.*)$': '<rootDir>/src/$1',
+        '^app/(.*)$': '<rootDir>/$1',
+        '^components/(.*)$': '<rootDir>/src/components/$1',
+        '^layouts/(.*)$': '<rootDir>/src/layouts/$1',
+        '^pages/(.*)$': '<rootDir>/src/pages/$1',
+        '^assets/(.*)$': '<rootDir>/src/assets/$1',
+        '^boot/(.*)$': '<rootDir>/src/boot/$1',
+        '.*css$': '<rootDir>/test/jest/__tests__/__stub_module_files__/style.js'
+    },
+    transform: {
+        // See https://jestjs.io/docs/en/configuration.html#transformignorepatterns-array-string
+        [`^(${esModules}).+\\.js$`]: 'babel-jest',
+        '^.+\\.(ts|js|html)$': 'ts-jest',
+        '^.+\\.(ts|js)$': 'babel-jest',
+        // vue-jest uses find-babel-file, which searches by this order:
+        //  (async) .babelrc, .babelrc.js, package.json, babel.config.js
+        //  (sync) .babelrc, .babelrc.js, babel.config.js, package.json
+        // https://github.com/tleunen/find-babel-config/issues/33
+        '.*\\.vue$': 'vue-jest',
+        '.+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$':
+            'jest-transform-stub'
+    },
+    transformIgnorePatterns: [`node_modules/(?!(${esModules}))`],
+    snapshotSerializers: ['<rootDir>/node_modules/jest-serializer-vue']
 };
diff --git a/package.json b/package.json
index 25257af8c..45f418064 100644
--- a/package.json
+++ b/package.json
@@ -74,6 +74,7 @@
         "@types/async-lock": "^1.1.2",
         "@types/chai": "^4.2.11",
         "@types/fs-extra": "^8.0.1",
+        "@types/jsdom": "^21.1.7",
         "@types/lodash.debounce": "^4.0.7",
         "@types/node": "^12.12.12",
         "@types/quill": "^2.0.3",
@@ -83,7 +84,7 @@
         "@typescript-eslint/eslint-plugin": "^1.12.0",
         "@typescript-eslint/parser": "^1.12.0",
         "@vue/eslint-config-airbnb": "^4.0.0",
-        "@vue/test-utils": "^1.2.1",
+        "@vue/test-utils": "^1.3.6",
         "babel-core": "^7.0.0-beta.3",
         "babel-eslint": "^10.0.1",
         "babel-jest": "^27.0.2",
@@ -100,13 +101,15 @@
         "eslint-plugin-jest": "^24.1.0",
         "eslint-plugin-vue": "^5.0.0",
         "identity-obj-proxy": "^3.0.0",
+        "jest": "^27.5.1",
+        "jsdom": "^25.0.1",
         "majestic": "^1.2.24",
         "minimist": "^1.2.2",
-        "mocha": "^8.0.1",
         "mock-require": "^3.0.3",
         "sass": "^1.70.0",
         "sass-loader": "^10.2.1",
         "sinon": "^11.1.1",
+        "ts-jest": "^29.2.5",
         "ts-node": "^8.10.2",
         "typescript": "^4.5.5",
         "vue": "2.7.16",
diff --git a/test/jest/__tests__/templates/components/template.hero.vue.spec.ts b/test/jest/__tests__/templates/components/template.hero.vue.spec.ts
deleted file mode 100644
index ea19e67a8..000000000
--- a/test/jest/__tests__/templates/components/template.hero.vue.spec.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import TestSetup from '../../test-setup';
-import { mount, shallowMount } from '@vue/test-utils';
-import { Hero } from '../../../../../src/components/all';
-
-type MountOptions = {
-    propsData: {
-        title: string,
-        heroType: string,
-        subtitle: string
-    }
-};
-
-describe('Hero component', () => {
-
-
-    const mountOptions = {
-        props: ['title', 'heroType', 'subtitle'],
-        propsData: {
-            title: 'Some title',
-            heroType: 'warning',
-            subtitle: 'Some subtitle'
-        }
-    };
-
-    beforeEach(() => {
-        TestSetup.stubSetUp();
-    });
-
-    it('Has title text', () => {
-        const m = shallowMount(Hero, mountOptions);
-        const found = m.findComponent({ ref: 'title' });
-        expect(found.text()).toBe(mountOptions.propsData!.title);
-    });
-
-    it('Has subtitle text', () => {
-        const mount = shallowMount(Hero, mountOptions);
-        const found = mount.findComponent({ ref: 'subtitle' });
-        expect(found.text()).toBe(mountOptions.propsData.subtitle);
-    });
-
-    it('Has correct class', () => {
-        const m = mount(Hero, mountOptions);
-        const found = m.findComponent({ ref: 'section' });
-        expect(found.classes().join(' ')).toBe(`c-hero`);
-        console.log("vm:", found.vm);
-        // expect().toBe(`c-hero--${mountOptions.propsData.heroType}`)
-    });
-
-});
diff --git a/test/jest/__tests__/test-setup.ts b/test/jest/__tests__/test-setup.ts
index 398bc8a05..64bbcc0ad 100644
--- a/test/jest/__tests__/test-setup.ts
+++ b/test/jest/__tests__/test-setup.ts
@@ -1,4 +1,3 @@
-import 'mocha';
 import PathResolver from '../../../src/r2mm/manager/PathResolver';
 import FsProvider from '../../../src/providers/generic/file/FsProvider';
 import Profile from '../../../src/model/Profile';
diff --git a/yarn.lock b/yarn.lock
index 8999f52b8..061e2dd8e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15,7 +15,7 @@
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.24"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.25.9", "@babel/code-frame@^7.26.0", "@babel/code-frame@^7.8.3":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.25.9", "@babel/code-frame@^7.26.0", "@babel/code-frame@^7.26.2", "@babel/code-frame@^7.8.3":
   version "7.26.2"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85"
   integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==
@@ -29,7 +29,7 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.26.2.tgz#278b6b13664557de95b8f35b90d96785850bb56e"
   integrity sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==
 
-"@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.4.0", "@babel/core@^7.7.5", "@babel/core@^7.9.0":
+"@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.4.0", "@babel/core@^7.7.2", "@babel/core@^7.7.5", "@babel/core@^7.8.0", "@babel/core@^7.9.0":
   version "7.26.0"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.26.0.tgz#d78b6023cc8f3114ccf049eb219613f74a747b40"
   integrity sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==
@@ -61,6 +61,17 @@
     "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^3.0.2"
 
+"@babel/generator@^7.26.3", "@babel/generator@^7.7.2":
+  version "7.26.3"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.26.3.tgz#ab8d4360544a425c90c248df7059881f4b2ce019"
+  integrity sha512-6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==
+  dependencies:
+    "@babel/parser" "^7.26.3"
+    "@babel/types" "^7.26.3"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
+    jsesc "^3.0.2"
+
 "@babel/helper-annotate-as-pure@^7.25.9":
   version "7.25.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz#d8eac4d2dc0d7b6e11fa6e535332e0d3184f06b4"
@@ -230,6 +241,13 @@
   dependencies:
     "@babel/types" "^7.26.0"
 
+"@babel/parser@^7.26.3":
+  version "7.26.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.3.tgz#8c51c5db6ddf08134af1ddbacf16aaab48bac234"
+  integrity sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==
+  dependencies:
+    "@babel/types" "^7.26.3"
+
 "@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.25.9":
   version "7.25.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz#cc2e53ebf0a0340777fff5ed521943e253b4d8fe"
@@ -470,7 +488,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-typescript@^7.25.9":
+"@babel/plugin-syntax-typescript@^7.25.9", "@babel/plugin-syntax-typescript@^7.7.2":
   version "7.25.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz#67dda2b74da43727cf21d46cf9afef23f4365399"
   integrity sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==
@@ -1021,6 +1039,19 @@
     debug "^4.3.1"
     globals "^11.1.0"
 
+"@babel/traverse@^7.7.2":
+  version "7.26.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.26.4.tgz#ac3a2a84b908dde6d463c3bfa2c5fdc1653574bd"
+  integrity sha512-fH+b7Y4p3yqvApJALCPJcwb0/XaOSgtK4pzV6WVjPR5GLFQBRI7pfoX2V2iM48NXvX07NUxxm1Vw98YjqTcU5w==
+  dependencies:
+    "@babel/code-frame" "^7.26.2"
+    "@babel/generator" "^7.26.3"
+    "@babel/parser" "^7.26.3"
+    "@babel/template" "^7.25.9"
+    "@babel/types" "^7.26.3"
+    debug "^4.3.1"
+    globals "^11.1.0"
+
 "@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
   version "7.26.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.0.tgz#deabd08d6b753bc8e0f198f8709fb575e31774ff"
@@ -1029,6 +1060,14 @@
     "@babel/helper-string-parser" "^7.25.9"
     "@babel/helper-validator-identifier" "^7.25.9"
 
+"@babel/types@^7.26.3":
+  version "7.26.3"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.3.tgz#37e79830f04c2b5687acc77db97fbc75fb81f3c0"
+  integrity sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==
+  dependencies:
+    "@babel/helper-string-parser" "^7.25.9"
+    "@babel/helper-validator-identifier" "^7.25.9"
+
 "@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"
@@ -1186,6 +1225,18 @@
     jest-util "^26.6.2"
     slash "^3.0.0"
 
+"@jest/console@^27.5.1":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.5.1.tgz#260fe7239602fe5130a94f1aa386eff54b014bba"
+  integrity sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==
+  dependencies:
+    "@jest/types" "^27.5.1"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    jest-message-util "^27.5.1"
+    jest-util "^27.5.1"
+    slash "^3.0.0"
+
 "@jest/core@^26.6.3":
   version "26.6.3"
   resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.6.3.tgz#7639fcb3833d748a4656ada54bde193051e45fad"
@@ -1220,6 +1271,40 @@
     slash "^3.0.0"
     strip-ansi "^6.0.0"
 
+"@jest/core@^27.5.1":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.5.1.tgz#267ac5f704e09dc52de2922cbf3af9edcd64b626"
+  integrity sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==
+  dependencies:
+    "@jest/console" "^27.5.1"
+    "@jest/reporters" "^27.5.1"
+    "@jest/test-result" "^27.5.1"
+    "@jest/transform" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    "@types/node" "*"
+    ansi-escapes "^4.2.1"
+    chalk "^4.0.0"
+    emittery "^0.8.1"
+    exit "^0.1.2"
+    graceful-fs "^4.2.9"
+    jest-changed-files "^27.5.1"
+    jest-config "^27.5.1"
+    jest-haste-map "^27.5.1"
+    jest-message-util "^27.5.1"
+    jest-regex-util "^27.5.1"
+    jest-resolve "^27.5.1"
+    jest-resolve-dependencies "^27.5.1"
+    jest-runner "^27.5.1"
+    jest-runtime "^27.5.1"
+    jest-snapshot "^27.5.1"
+    jest-util "^27.5.1"
+    jest-validate "^27.5.1"
+    jest-watcher "^27.5.1"
+    micromatch "^4.0.4"
+    rimraf "^3.0.0"
+    slash "^3.0.0"
+    strip-ansi "^6.0.0"
+
 "@jest/environment@^26.6.2":
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.6.2.tgz#ba364cc72e221e79cc8f0a99555bf5d7577cf92c"
@@ -1230,6 +1315,16 @@
     "@types/node" "*"
     jest-mock "^26.6.2"
 
+"@jest/environment@^27.5.1":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.5.1.tgz#d7425820511fe7158abbecc010140c3fd3be9c74"
+  integrity sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==
+  dependencies:
+    "@jest/fake-timers" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    "@types/node" "*"
+    jest-mock "^27.5.1"
+
 "@jest/fake-timers@^26.6.2":
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.2.tgz#459c329bcf70cee4af4d7e3f3e67848123535aad"
@@ -1242,6 +1337,18 @@
     jest-mock "^26.6.2"
     jest-util "^26.6.2"
 
+"@jest/fake-timers@^27.5.1":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.5.1.tgz#76979745ce0579c8a94a4678af7a748eda8ada74"
+  integrity sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==
+  dependencies:
+    "@jest/types" "^27.5.1"
+    "@sinonjs/fake-timers" "^8.0.1"
+    "@types/node" "*"
+    jest-message-util "^27.5.1"
+    jest-mock "^27.5.1"
+    jest-util "^27.5.1"
+
 "@jest/globals@^26.6.2":
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.6.2.tgz#5b613b78a1aa2655ae908eba638cc96a20df720a"
@@ -1251,6 +1358,15 @@
     "@jest/types" "^26.6.2"
     expect "^26.6.2"
 
+"@jest/globals@^27.5.1":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.5.1.tgz#7ac06ce57ab966566c7963431cef458434601b2b"
+  integrity sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==
+  dependencies:
+    "@jest/environment" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    expect "^27.5.1"
+
 "@jest/reporters@^26.6.2":
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.6.2.tgz#1f518b99637a5f18307bd3ecf9275f6882a667f6"
@@ -1283,6 +1399,44 @@
   optionalDependencies:
     node-notifier "^8.0.0"
 
+"@jest/reporters@^27.5.1":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.5.1.tgz#ceda7be96170b03c923c37987b64015812ffec04"
+  integrity sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==
+  dependencies:
+    "@bcoe/v8-coverage" "^0.2.3"
+    "@jest/console" "^27.5.1"
+    "@jest/test-result" "^27.5.1"
+    "@jest/transform" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    collect-v8-coverage "^1.0.0"
+    exit "^0.1.2"
+    glob "^7.1.2"
+    graceful-fs "^4.2.9"
+    istanbul-lib-coverage "^3.0.0"
+    istanbul-lib-instrument "^5.1.0"
+    istanbul-lib-report "^3.0.0"
+    istanbul-lib-source-maps "^4.0.0"
+    istanbul-reports "^3.1.3"
+    jest-haste-map "^27.5.1"
+    jest-resolve "^27.5.1"
+    jest-util "^27.5.1"
+    jest-worker "^27.5.1"
+    slash "^3.0.0"
+    source-map "^0.6.0"
+    string-length "^4.0.1"
+    terminal-link "^2.0.0"
+    v8-to-istanbul "^8.1.0"
+
+"@jest/schemas@^29.6.3":
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03"
+  integrity sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==
+  dependencies:
+    "@sinclair/typebox" "^0.27.8"
+
 "@jest/source-map@^26.6.2":
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.6.2.tgz#29af5e1e2e324cafccc936f218309f54ab69d535"
@@ -1292,6 +1446,15 @@
     graceful-fs "^4.2.4"
     source-map "^0.6.0"
 
+"@jest/source-map@^27.5.1":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.5.1.tgz#6608391e465add4205eae073b55e7f279e04e8cf"
+  integrity sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==
+  dependencies:
+    callsites "^3.0.0"
+    graceful-fs "^4.2.9"
+    source-map "^0.6.0"
+
 "@jest/test-result@^26.6.2":
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.6.2.tgz#55da58b62df134576cc95476efa5f7949e3f5f18"
@@ -1302,6 +1465,16 @@
     "@types/istanbul-lib-coverage" "^2.0.0"
     collect-v8-coverage "^1.0.0"
 
+"@jest/test-result@^27.5.1":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.5.1.tgz#56a6585fa80f7cdab72b8c5fc2e871d03832f5bb"
+  integrity sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==
+  dependencies:
+    "@jest/console" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    collect-v8-coverage "^1.0.0"
+
 "@jest/test-sequencer@^26.6.3":
   version "26.6.3"
   resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz#98e8a45100863886d074205e8ffdc5a7eb582b17"
@@ -1313,6 +1486,16 @@
     jest-runner "^26.6.3"
     jest-runtime "^26.6.3"
 
+"@jest/test-sequencer@^27.5.1":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz#4057e0e9cea4439e544c6353c6affe58d095745b"
+  integrity sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==
+  dependencies:
+    "@jest/test-result" "^27.5.1"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^27.5.1"
+    jest-runtime "^27.5.1"
+
 "@jest/transform@^26.6.2":
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.6.2.tgz#5ac57c5fa1ad17b2aae83e73e45813894dcf2e4b"
@@ -1377,6 +1560,18 @@
     "@types/yargs" "^16.0.0"
     chalk "^4.0.0"
 
+"@jest/types@^29.6.3":
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.6.3.tgz#1131f8cf634e7e84c5e77bab12f052af585fba59"
+  integrity sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==
+  dependencies:
+    "@jest/schemas" "^29.6.3"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
+    "@types/yargs" "^17.0.8"
+    chalk "^4.0.0"
+
 "@jridgewell/gen-mapping@^0.3.5":
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36"
@@ -1746,6 +1941,11 @@
   resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
   integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
 
+"@sinclair/typebox@^0.27.8":
+  version "0.27.8"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e"
+  integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==
+
 "@sindresorhus/is@^0.14.0":
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
@@ -1791,6 +1991,13 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
+"@sinonjs/fake-timers@^8.0.1":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz#3fdc2b6cb58935b21bfb8d1625eb1300484316e7"
+  integrity sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==
+  dependencies:
+    "@sinonjs/commons" "^1.7.0"
+
 "@sinonjs/samsam@^6.0.2":
   version "6.1.3"
   resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-6.1.3.tgz#4e30bcd4700336363302a7d72cbec9b9ab87b104"
@@ -2057,6 +2264,15 @@
     jest-diff "^26.0.0"
     pretty-format "^26.0.0"
 
+"@types/jsdom@^21.1.7":
+  version "21.1.7"
+  resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-21.1.7.tgz#9edcb09e0b07ce876e7833922d3274149c898cfa"
+  integrity sha512-yOriVnggzrnQ3a9OKOCxaVuSug3w3/SbOj5i7VwXWZEyUNl3bLF9V3MfxGbZKuwqJOQyRfqXyROBB1CoZLFWzA==
+  dependencies:
+    "@types/node" "*"
+    "@types/tough-cookie" "*"
+    parse5 "^7.0.0"
+
 "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
@@ -2143,7 +2359,7 @@
     "@types/node" "*"
     xmlbuilder ">=11.0.1"
 
-"@types/prettier@^2.0.0":
+"@types/prettier@^2.0.0", "@types/prettier@^2.1.5":
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.3.tgz#3e51a17e291d01d17d3fc61422015a933af7a08f"
   integrity sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==
@@ -2245,6 +2461,11 @@
     "@types/webpack" "^4"
     terser "^4.6.13"
 
+"@types/tough-cookie@*":
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.5.tgz#cb6e2a691b70cb177c6e3ae9c1d2e8b2ea8cd304"
+  integrity sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==
+
 "@types/uglify-js@*":
   version "3.17.5"
   resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.17.5.tgz#905ce03a3cbbf2e31cbefcbc68d15497ee2e17df"
@@ -2329,6 +2550,13 @@
   dependencies:
     "@types/yargs-parser" "*"
 
+"@types/yargs@^17.0.8":
+  version "17.0.33"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.33.tgz#8c32303da83eec050a84b3c7ae7b9f922d13e32d"
+  integrity sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==
+  dependencies:
+    "@types/yargs-parser" "*"
+
 "@types/yauzl@^2.9.1":
   version "2.10.3"
   resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.3.tgz#e9b2808b4f109504a03cda958259876f61017999"
@@ -2420,11 +2648,6 @@
     "@typescript-eslint/types" "4.33.0"
     eslint-visitor-keys "^2.0.0"
 
-"@ungap/promise-all-settled@1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
-  integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
-
 "@vue/compiler-sfc@2.7.16":
   version "2.7.16"
   resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz#ff81711a0fac9c68683d8bb00b63f857de77dc83"
@@ -2461,7 +2684,7 @@
     eslint-import-resolver-webpack "^0.11.1"
     eslint-plugin-import "^2.17.3"
 
-"@vue/test-utils@^1.2.0", "@vue/test-utils@^1.2.1":
+"@vue/test-utils@^1.2.0", "@vue/test-utils@^1.3.6":
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.3.6.tgz#6656bd8fa44dd088b4ad80ff1ee28abe7e5ddf87"
   integrity sha512-udMmmF1ts3zwxUJEIAj5ziioR900reDrt6C9H3XpWPsLBx2lpHKoA4BTdd9HNIYbkGltWw+JjWJ+5O6QBwiyEw==
@@ -2705,6 +2928,11 @@ agent-base@6:
   dependencies:
     debug "4"
 
+agent-base@^7.1.0, agent-base@^7.1.2:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.3.tgz#29435eb821bc4194633a5b89e5bc4703bafc25a1"
+  integrity sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==
+
 aggregate-error@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
@@ -2748,11 +2976,6 @@ alphanum-sort@^1.0.0:
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
   integrity sha512-0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ==
 
-ansi-colors@4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
-  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
-
 ansi-colors@^3.0.0:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
@@ -2814,6 +3037,11 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
+ansi-styles@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
+  integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
+
 ansi-styles@^6.1.0:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
@@ -2827,7 +3055,7 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-anymatch@^3.0.0, anymatch@^3.0.3, anymatch@~3.1.1, anymatch@~3.1.2:
+anymatch@^3.0.0, anymatch@^3.0.3, anymatch@~3.1.2:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
   integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
@@ -3252,7 +3480,7 @@ babel-jest@^26.6.3:
     graceful-fs "^4.2.4"
     slash "^3.0.0"
 
-babel-jest@^27.0.2:
+babel-jest@^27.0.2, babel-jest@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.5.1.tgz#a1bf8d61928edfefd21da27eb86a695bfd691444"
   integrity sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==
@@ -3663,11 +3891,6 @@ browser-process-hrtime@^1.0.0:
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
-browser-stdout@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
-  integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
-
 browserify-aes@^1.0.4, browserify-aes@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
@@ -3741,7 +3964,7 @@ browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.20.2, browserslist@^4
     node-releases "^2.0.18"
     update-browserslist-db "^1.1.1"
 
-bs-logger@0.x:
+bs-logger@0.x, bs-logger@^0.2.6:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
   integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==
@@ -4050,7 +4273,7 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-camelcase@^6.0.0:
+camelcase@^6.0.0, camelcase@^6.2.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
@@ -4150,21 +4373,6 @@ check-error@^1.0.3:
   dependencies:
     get-func-name "^2.0.2"
 
-chokidar@3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
-  integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
-  dependencies:
-    anymatch "~3.1.1"
-    braces "~3.0.2"
-    glob-parent "~5.1.0"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.5.0"
-  optionalDependencies:
-    fsevents "~2.3.1"
-
 "chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.1, chokidar@^3.4.2, chokidar@^3.5.3:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
@@ -4249,6 +4457,11 @@ cjs-module-lexer@^0.6.0:
   resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz#4186fcca0eae175970aee870b9fe2d6cf8d5655f"
   integrity sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==
 
+cjs-module-lexer@^1.0.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.4.1.tgz#707413784dbb3a72aa11c2f2b042a0bef4004170"
+  integrity sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==
+
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
@@ -5013,6 +5226,13 @@ cssstyle@^2.3.0:
   dependencies:
     cssom "~0.3.6"
 
+cssstyle@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-4.1.0.tgz#161faee382af1bafadb6d3867a92a19bcb4aea70"
+  integrity sha512-h66W1URKpBS5YMI/V8PyXvTMFT8SupJ1IzoIV8IeBC/ji8WVmrO8dGlTi+2dh6whmdk6BiKJLD/ZBkhWbcg6nA==
+  dependencies:
+    rrweb-cssom "^0.7.1"
+
 csstype@^3.1.0:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
@@ -5037,6 +5257,14 @@ data-urls@^2.0.0:
     whatwg-mimetype "^2.3.0"
     whatwg-url "^8.0.0"
 
+data-urls@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-5.0.0.tgz#2f76906bce1824429ffecb6920f45a0b30f00dde"
+  integrity sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==
+  dependencies:
+    whatwg-mimetype "^4.0.0"
+    whatwg-url "^14.0.0"
+
 data-view-buffer@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.1.tgz#8ea6326efec17a2e42620696e671d7d5a8bc66b2"
@@ -5103,13 +5331,6 @@ debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.4:
   dependencies:
     ms "^2.1.3"
 
-debug@4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
-  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
-  dependencies:
-    ms "2.1.2"
-
 debug@^3.1.0, debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
@@ -5129,12 +5350,7 @@ decamelize@^1.2.0:
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
 
-decamelize@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837"
-  integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==
-
-decimal.js@^10.2.1:
+decimal.js@^10.2.1, decimal.js@^10.4.3:
   version "10.4.3"
   resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23"
   integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==
@@ -5158,6 +5374,11 @@ decompress-response@^6.0.0:
   dependencies:
     mimic-response "^3.1.0"
 
+dedent@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
+  integrity sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==
+
 deep-eql@^4.1.3:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-4.1.4.tgz#d0d3912865911bb8fac5afb4e3acfa6a28dc72b7"
@@ -5330,10 +5551,10 @@ diff-sequences@^26.6.2:
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1"
   integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==
 
-diff@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
-  integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
+diff-sequences@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.5.1.tgz#eaecc0d327fd68c8d9672a1e64ab8dccb2ef5327"
+  integrity sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==
 
 diff@^4.0.1:
   version "4.0.2"
@@ -5583,7 +5804,7 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-ejs@^3.1.7, ejs@^3.1.8:
+ejs@^3.1.10, ejs@^3.1.7, ejs@^3.1.8:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b"
   integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==
@@ -5762,6 +5983,11 @@ emittery@^0.7.1:
   resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.2.tgz#25595908e13af0f5674ab419396e2fb394cdfa82"
   integrity sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==
 
+emittery@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.8.1.tgz#bb23cc86d03b30aa75a7f734819dee2e1ba70860"
+  integrity sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==
+
 emoji-regex@^7.0.1:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
@@ -5822,6 +6048,11 @@ entities@^2.0.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
   integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
 
+entities@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
+  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
+
 env-paths@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
@@ -5969,11 +6200,6 @@ escape-html@^1.0.1, escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
 
-escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
-  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
-
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
@@ -5984,6 +6210,11 @@ escape-string-regexp@^2.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
   integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
+escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
 escodegen@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.1.0.tgz#ba93bbb7a43986d29d6041f99f5262da773e2e17"
@@ -6360,6 +6591,16 @@ expect@^26.6.2:
     jest-message-util "^26.6.2"
     jest-regex-util "^26.0.0"
 
+expect@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-27.5.1.tgz#83ce59f1e5bdf5f9d2b94b61d2050db48f3fef74"
+  integrity sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==
+  dependencies:
+    "@jest/types" "^27.5.1"
+    jest-get-type "^27.5.1"
+    jest-matcher-utils "^27.5.1"
+    jest-message-util "^27.5.1"
+
 express@4.17.3:
   version "4.17.3"
   resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1"
@@ -6536,7 +6777,7 @@ fast-glob@^3.2.4, fast-glob@^3.2.9:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
-fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0:
+fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
@@ -6711,14 +6952,6 @@ find-root@^1.1.0:
   resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
   integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==
 
-find-up@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
-  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
-  dependencies:
-    locate-path "^6.0.0"
-    path-exists "^4.0.0"
-
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
@@ -6766,11 +6999,6 @@ flat-cache@^2.0.1:
     rimraf "2.6.3"
     write "1.0.3"
 
-flat@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
-  integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
-
 flatted@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
@@ -6992,7 +7220,7 @@ fsevents@^1.2.7:
     bindings "^1.5.0"
     nan "^2.12.1"
 
-fsevents@^2.1.2, fsevents@^2.3.2, fsevents@~2.3.1, fsevents@~2.3.2:
+fsevents@^2.1.2, fsevents@^2.3.2, fsevents@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
   integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
@@ -7133,7 +7361,7 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-parent@^5.0.0, glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@~5.1.0, glob-parent@~5.1.2:
+glob-parent@^5.0.0, glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
@@ -7147,18 +7375,6 @@ glob-parent@^6.0.2:
   dependencies:
     is-glob "^4.0.3"
 
-glob@7.1.6:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@^10.3.10, glob@^10.3.3:
   version "10.4.5"
   resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956"
@@ -7299,11 +7515,6 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
 
-growl@1.10.5:
-  version "1.10.5"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
-  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
-
 growly@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
@@ -7450,7 +7661,7 @@ hasown@^2.0.0, hasown@^2.0.1, hasown@^2.0.2:
   dependencies:
     function-bind "^1.1.2"
 
-he@1.2.0, he@^1.2.0:
+he@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
@@ -7518,6 +7729,13 @@ html-encoding-sniffer@^2.0.1:
   dependencies:
     whatwg-encoding "^1.0.5"
 
+html-encoding-sniffer@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz#696df529a7cfd82446369dc5193e590a3735b448"
+  integrity sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==
+  dependencies:
+    whatwg-encoding "^3.1.1"
+
 html-entities@^1.3.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz#cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc"
@@ -7644,6 +7862,14 @@ http-proxy-agent@^5.0.0:
     agent-base "6"
     debug "4"
 
+http-proxy-agent@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e"
+  integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==
+  dependencies:
+    agent-base "^7.1.0"
+    debug "^4.3.4"
+
 http-proxy-middleware@0.19.1:
   version "0.19.1"
   resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
@@ -7695,6 +7921,14 @@ https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1:
     agent-base "6"
     debug "4"
 
+https-proxy-agent@^7.0.5:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz#da8dfeac7da130b05c2ba4b59c9b6cd66611a6b9"
+  integrity sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==
+  dependencies:
+    agent-base "^7.1.2"
+    debug "4"
+
 human-signals@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
@@ -7725,7 +7959,7 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@^0.6.2:
+iconv-lite@0.6.3, iconv-lite@^0.6.2:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
   integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
@@ -8189,11 +8423,6 @@ is-plain-obj@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
   integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==
 
-is-plain-obj@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
-  integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
-
 is-plain-obj@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7"
@@ -8360,7 +8589,7 @@ istanbul-lib-instrument@^4.0.3:
     istanbul-lib-coverage "^3.0.0"
     semver "^6.3.0"
 
-istanbul-lib-instrument@^5.0.4:
+istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d"
   integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==
@@ -8389,7 +8618,7 @@ istanbul-lib-source-maps@^4.0.0:
     istanbul-lib-coverage "^3.0.0"
     source-map "^0.6.1"
 
-istanbul-reports@^3.0.2:
+istanbul-reports@^3.0.2, istanbul-reports@^3.1.3:
   version "3.1.7"
   resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.7.tgz#daed12b9e1dca518e15c056e1e537e741280fa0b"
   integrity sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==
@@ -8430,6 +8659,40 @@ jest-changed-files@^26.6.2:
     execa "^4.0.0"
     throat "^5.0.0"
 
+jest-changed-files@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.5.1.tgz#a348aed00ec9bf671cc58a66fcbe7c3dfd6a68f5"
+  integrity sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==
+  dependencies:
+    "@jest/types" "^27.5.1"
+    execa "^5.0.0"
+    throat "^6.0.1"
+
+jest-circus@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.5.1.tgz#37a5a4459b7bf4406e53d637b49d22c65d125ecc"
+  integrity sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==
+  dependencies:
+    "@jest/environment" "^27.5.1"
+    "@jest/test-result" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    co "^4.6.0"
+    dedent "^0.7.0"
+    expect "^27.5.1"
+    is-generator-fn "^2.0.0"
+    jest-each "^27.5.1"
+    jest-matcher-utils "^27.5.1"
+    jest-message-util "^27.5.1"
+    jest-runtime "^27.5.1"
+    jest-snapshot "^27.5.1"
+    jest-util "^27.5.1"
+    pretty-format "^27.5.1"
+    slash "^3.0.0"
+    stack-utils "^2.0.3"
+    throat "^6.0.1"
+
 jest-cli@^26.6.3:
   version "26.6.3"
   resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.6.3.tgz#43117cfef24bc4cd691a174a8796a532e135e92a"
@@ -8449,6 +8712,24 @@ jest-cli@^26.6.3:
     prompts "^2.0.1"
     yargs "^15.4.1"
 
+jest-cli@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.5.1.tgz#278794a6e6458ea8029547e6c6cbf673bd30b145"
+  integrity sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==
+  dependencies:
+    "@jest/core" "^27.5.1"
+    "@jest/test-result" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    chalk "^4.0.0"
+    exit "^0.1.2"
+    graceful-fs "^4.2.9"
+    import-local "^3.0.2"
+    jest-config "^27.5.1"
+    jest-util "^27.5.1"
+    jest-validate "^27.5.1"
+    prompts "^2.0.1"
+    yargs "^16.2.0"
+
 jest-config@^26.6.3:
   version "26.6.3"
   resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.6.3.tgz#64f41444eef9eb03dc51d5c53b75c8c71f645349"
@@ -8473,6 +8754,36 @@ jest-config@^26.6.3:
     micromatch "^4.0.2"
     pretty-format "^26.6.2"
 
+jest-config@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.5.1.tgz#5c387de33dca3f99ad6357ddeccd91bf3a0e4a41"
+  integrity sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==
+  dependencies:
+    "@babel/core" "^7.8.0"
+    "@jest/test-sequencer" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    babel-jest "^27.5.1"
+    chalk "^4.0.0"
+    ci-info "^3.2.0"
+    deepmerge "^4.2.2"
+    glob "^7.1.1"
+    graceful-fs "^4.2.9"
+    jest-circus "^27.5.1"
+    jest-environment-jsdom "^27.5.1"
+    jest-environment-node "^27.5.1"
+    jest-get-type "^27.5.1"
+    jest-jasmine2 "^27.5.1"
+    jest-regex-util "^27.5.1"
+    jest-resolve "^27.5.1"
+    jest-runner "^27.5.1"
+    jest-util "^27.5.1"
+    jest-validate "^27.5.1"
+    micromatch "^4.0.4"
+    parse-json "^5.2.0"
+    pretty-format "^27.5.1"
+    slash "^3.0.0"
+    strip-json-comments "^3.1.1"
+
 jest-diff@^26.0.0, jest-diff@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394"
@@ -8483,6 +8794,16 @@ jest-diff@^26.0.0, jest-diff@^26.6.2:
     jest-get-type "^26.3.0"
     pretty-format "^26.6.2"
 
+jest-diff@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.5.1.tgz#a07f5011ac9e6643cf8a95a462b7b1ecf6680def"
+  integrity sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==
+  dependencies:
+    chalk "^4.0.0"
+    diff-sequences "^27.5.1"
+    jest-get-type "^27.5.1"
+    pretty-format "^27.5.1"
+
 jest-docblock@^26.0.0:
   version "26.0.0"
   resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz#3e2fa20899fc928cb13bd0ff68bd3711a36889b5"
@@ -8490,6 +8811,13 @@ jest-docblock@^26.0.0:
   dependencies:
     detect-newline "^3.0.0"
 
+jest-docblock@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.5.1.tgz#14092f364a42c6108d42c33c8cf30e058e25f6c0"
+  integrity sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==
+  dependencies:
+    detect-newline "^3.0.0"
+
 jest-each@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.6.2.tgz#02526438a77a67401c8a6382dfe5999952c167cb"
@@ -8501,6 +8829,17 @@ jest-each@^26.6.2:
     jest-util "^26.6.2"
     pretty-format "^26.6.2"
 
+jest-each@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.5.1.tgz#5bc87016f45ed9507fed6e4702a5b468a5b2c44e"
+  integrity sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==
+  dependencies:
+    "@jest/types" "^27.5.1"
+    chalk "^4.0.0"
+    jest-get-type "^27.5.1"
+    jest-util "^27.5.1"
+    pretty-format "^27.5.1"
+
 jest-environment-jsdom@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz#78d09fe9cf019a357009b9b7e1f101d23bd1da3e"
@@ -8514,6 +8853,19 @@ jest-environment-jsdom@^26.6.2:
     jest-util "^26.6.2"
     jsdom "^16.4.0"
 
+jest-environment-jsdom@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz#ea9ccd1fc610209655a77898f86b2b559516a546"
+  integrity sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==
+  dependencies:
+    "@jest/environment" "^27.5.1"
+    "@jest/fake-timers" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    "@types/node" "*"
+    jest-mock "^27.5.1"
+    jest-util "^27.5.1"
+    jsdom "^16.6.0"
+
 jest-environment-node@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.6.2.tgz#824e4c7fb4944646356f11ac75b229b0035f2b0c"
@@ -8526,11 +8878,28 @@ jest-environment-node@^26.6.2:
     jest-mock "^26.6.2"
     jest-util "^26.6.2"
 
+jest-environment-node@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.5.1.tgz#dedc2cfe52fab6b8f5714b4808aefa85357a365e"
+  integrity sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==
+  dependencies:
+    "@jest/environment" "^27.5.1"
+    "@jest/fake-timers" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    "@types/node" "*"
+    jest-mock "^27.5.1"
+    jest-util "^27.5.1"
+
 jest-get-type@^26.3.0:
   version "26.3.0"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0"
   integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==
 
+jest-get-type@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.5.1.tgz#3cd613c507b0f7ace013df407a1c1cd578bcb4f1"
+  integrity sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==
+
 jest-haste-map@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.6.2.tgz#dd7e60fe7dc0e9f911a23d79c5ff7fb5c2cafeaa"
@@ -8596,6 +8965,29 @@ jest-jasmine2@^26.6.3:
     pretty-format "^26.6.2"
     throat "^5.0.0"
 
+jest-jasmine2@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz#a037b0034ef49a9f3d71c4375a796f3b230d1ac4"
+  integrity sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==
+  dependencies:
+    "@jest/environment" "^27.5.1"
+    "@jest/source-map" "^27.5.1"
+    "@jest/test-result" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    co "^4.6.0"
+    expect "^27.5.1"
+    is-generator-fn "^2.0.0"
+    jest-each "^27.5.1"
+    jest-matcher-utils "^27.5.1"
+    jest-message-util "^27.5.1"
+    jest-runtime "^27.5.1"
+    jest-snapshot "^27.5.1"
+    jest-util "^27.5.1"
+    pretty-format "^27.5.1"
+    throat "^6.0.1"
+
 jest-leak-detector@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz#7717cf118b92238f2eba65054c8a0c9c653a91af"
@@ -8604,6 +8996,14 @@ jest-leak-detector@^26.6.2:
     jest-get-type "^26.3.0"
     pretty-format "^26.6.2"
 
+jest-leak-detector@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz#6ec9d54c3579dd6e3e66d70e3498adf80fde3fb8"
+  integrity sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==
+  dependencies:
+    jest-get-type "^27.5.1"
+    pretty-format "^27.5.1"
+
 jest-matcher-utils@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz#8e6fd6e863c8b2d31ac6472eeb237bc595e53e7a"
@@ -8614,6 +9014,16 @@ jest-matcher-utils@^26.6.2:
     jest-get-type "^26.3.0"
     pretty-format "^26.6.2"
 
+jest-matcher-utils@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz#9c0cdbda8245bc22d2331729d1091308b40cf8ab"
+  integrity sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==
+  dependencies:
+    chalk "^4.0.0"
+    jest-diff "^27.5.1"
+    jest-get-type "^27.5.1"
+    pretty-format "^27.5.1"
+
 jest-message-util@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.2.tgz#58173744ad6fc0506b5d21150b9be56ef001ca07"
@@ -8629,6 +9039,21 @@ jest-message-util@^26.6.2:
     slash "^3.0.0"
     stack-utils "^2.0.2"
 
+jest-message-util@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.5.1.tgz#bdda72806da10d9ed6425e12afff38cd1458b6cf"
+  integrity sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@jest/types" "^27.5.1"
+    "@types/stack-utils" "^2.0.0"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.9"
+    micromatch "^4.0.4"
+    pretty-format "^27.5.1"
+    slash "^3.0.0"
+    stack-utils "^2.0.3"
+
 jest-mock@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.2.tgz#d6cb712b041ed47fe0d9b6fc3474bc6543feb302"
@@ -8637,6 +9062,14 @@ jest-mock@^26.6.2:
     "@jest/types" "^26.6.2"
     "@types/node" "*"
 
+jest-mock@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.5.1.tgz#19948336d49ef4d9c52021d34ac7b5f36ff967d6"
+  integrity sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==
+  dependencies:
+    "@jest/types" "^27.5.1"
+    "@types/node" "*"
+
 jest-pnp-resolver@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e"
@@ -8661,6 +9094,15 @@ jest-resolve-dependencies@^26.6.3:
     jest-regex-util "^26.0.0"
     jest-snapshot "^26.6.2"
 
+jest-resolve-dependencies@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz#d811ecc8305e731cc86dd79741ee98fed06f1da8"
+  integrity sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==
+  dependencies:
+    "@jest/types" "^27.5.1"
+    jest-regex-util "^27.5.1"
+    jest-snapshot "^27.5.1"
+
 jest-resolve@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.6.2.tgz#a3ab1517217f469b504f1b56603c5bb541fbb507"
@@ -8675,6 +9117,22 @@ jest-resolve@^26.6.2:
     resolve "^1.18.1"
     slash "^3.0.0"
 
+jest-resolve@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.5.1.tgz#a2f1c5a0796ec18fe9eb1536ac3814c23617b384"
+  integrity sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==
+  dependencies:
+    "@jest/types" "^27.5.1"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^27.5.1"
+    jest-pnp-resolver "^1.2.2"
+    jest-util "^27.5.1"
+    jest-validate "^27.5.1"
+    resolve "^1.20.0"
+    resolve.exports "^1.1.0"
+    slash "^3.0.0"
+
 jest-runner@^26.6.3:
   version "26.6.3"
   resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.6.3.tgz#2d1fed3d46e10f233fd1dbd3bfaa3fe8924be159"
@@ -8701,6 +9159,33 @@ jest-runner@^26.6.3:
     source-map-support "^0.5.6"
     throat "^5.0.0"
 
+jest-runner@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.5.1.tgz#071b27c1fa30d90540805c5645a0ec167c7b62e5"
+  integrity sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==
+  dependencies:
+    "@jest/console" "^27.5.1"
+    "@jest/environment" "^27.5.1"
+    "@jest/test-result" "^27.5.1"
+    "@jest/transform" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    emittery "^0.8.1"
+    graceful-fs "^4.2.9"
+    jest-docblock "^27.5.1"
+    jest-environment-jsdom "^27.5.1"
+    jest-environment-node "^27.5.1"
+    jest-haste-map "^27.5.1"
+    jest-leak-detector "^27.5.1"
+    jest-message-util "^27.5.1"
+    jest-resolve "^27.5.1"
+    jest-runtime "^27.5.1"
+    jest-util "^27.5.1"
+    jest-worker "^27.5.1"
+    source-map-support "^0.5.6"
+    throat "^6.0.1"
+
 jest-runtime@^26.6.3:
   version "26.6.3"
   resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.6.3.tgz#4f64efbcfac398331b74b4b3c82d27d401b8fa2b"
@@ -8734,6 +9219,34 @@ jest-runtime@^26.6.3:
     strip-bom "^4.0.0"
     yargs "^15.4.1"
 
+jest-runtime@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.5.1.tgz#4896003d7a334f7e8e4a53ba93fb9bcd3db0a1af"
+  integrity sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==
+  dependencies:
+    "@jest/environment" "^27.5.1"
+    "@jest/fake-timers" "^27.5.1"
+    "@jest/globals" "^27.5.1"
+    "@jest/source-map" "^27.5.1"
+    "@jest/test-result" "^27.5.1"
+    "@jest/transform" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    chalk "^4.0.0"
+    cjs-module-lexer "^1.0.0"
+    collect-v8-coverage "^1.0.0"
+    execa "^5.0.0"
+    glob "^7.1.3"
+    graceful-fs "^4.2.9"
+    jest-haste-map "^27.5.1"
+    jest-message-util "^27.5.1"
+    jest-mock "^27.5.1"
+    jest-regex-util "^27.5.1"
+    jest-resolve "^27.5.1"
+    jest-snapshot "^27.5.1"
+    jest-util "^27.5.1"
+    slash "^3.0.0"
+    strip-bom "^4.0.0"
+
 jest-serializer-vue@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/jest-serializer-vue/-/jest-serializer-vue-2.0.2.tgz#b238ef286357ec6b480421bd47145050987d59b3"
@@ -8779,6 +9292,34 @@ jest-snapshot@^26.6.2:
     pretty-format "^26.6.2"
     semver "^7.3.2"
 
+jest-snapshot@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.5.1.tgz#b668d50d23d38054a51b42c4039cab59ae6eb6a1"
+  integrity sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==
+  dependencies:
+    "@babel/core" "^7.7.2"
+    "@babel/generator" "^7.7.2"
+    "@babel/plugin-syntax-typescript" "^7.7.2"
+    "@babel/traverse" "^7.7.2"
+    "@babel/types" "^7.0.0"
+    "@jest/transform" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    "@types/babel__traverse" "^7.0.4"
+    "@types/prettier" "^2.1.5"
+    babel-preset-current-node-syntax "^1.0.0"
+    chalk "^4.0.0"
+    expect "^27.5.1"
+    graceful-fs "^4.2.9"
+    jest-diff "^27.5.1"
+    jest-get-type "^27.5.1"
+    jest-haste-map "^27.5.1"
+    jest-matcher-utils "^27.5.1"
+    jest-message-util "^27.5.1"
+    jest-util "^27.5.1"
+    natural-compare "^1.4.0"
+    pretty-format "^27.5.1"
+    semver "^7.3.2"
+
 jest-transform-stub@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/jest-transform-stub/-/jest-transform-stub-2.0.0.tgz#19018b0851f7568972147a5d60074b55f0225a7d"
@@ -8808,6 +9349,18 @@ jest-util@^27.5.1:
     graceful-fs "^4.2.9"
     picomatch "^2.2.3"
 
+jest-util@^29.0.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.7.0.tgz#23c2b62bfb22be82b44de98055802ff3710fc0bc"
+  integrity sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    ci-info "^3.2.0"
+    graceful-fs "^4.2.9"
+    picomatch "^2.2.3"
+
 jest-validate@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.6.2.tgz#23d380971587150467342911c3d7b4ac57ab20ec"
@@ -8820,6 +9373,18 @@ jest-validate@^26.6.2:
     leven "^3.1.0"
     pretty-format "^26.6.2"
 
+jest-validate@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.5.1.tgz#9197d54dc0bdb52260b8db40b46ae668e04df067"
+  integrity sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==
+  dependencies:
+    "@jest/types" "^27.5.1"
+    camelcase "^6.2.0"
+    chalk "^4.0.0"
+    jest-get-type "^27.5.1"
+    leven "^3.1.0"
+    pretty-format "^27.5.1"
+
 jest-watcher@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.6.2.tgz#a5b683b8f9d68dbcb1d7dae32172d2cca0592975"
@@ -8833,6 +9398,19 @@ jest-watcher@^26.6.2:
     jest-util "^26.6.2"
     string-length "^4.0.1"
 
+jest-watcher@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.5.1.tgz#71bd85fb9bde3a2c2ec4dc353437971c43c642a2"
+  integrity sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==
+  dependencies:
+    "@jest/test-result" "^27.5.1"
+    "@jest/types" "^27.5.1"
+    "@types/node" "*"
+    ansi-escapes "^4.2.1"
+    chalk "^4.0.0"
+    jest-util "^27.5.1"
+    string-length "^4.0.1"
+
 jest-worker@^26.3.0, jest-worker@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
@@ -8860,6 +9438,15 @@ jest@^26.6.3:
     import-local "^3.0.2"
     jest-cli "^26.6.3"
 
+jest@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-27.5.1.tgz#dadf33ba70a779be7a6fc33015843b51494f63fc"
+  integrity sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==
+  dependencies:
+    "@jest/core" "^27.5.1"
+    import-local "^3.0.2"
+    jest-cli "^27.5.1"
+
 js-beautify@^1.6.12, js-beautify@^1.6.14:
   version "1.15.1"
   resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.15.1.tgz#4695afb508c324e1084ee0b952a102023fc65b64"
@@ -8898,13 +9485,6 @@ js-tokens@^3.0.2:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
   integrity sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==
 
-js-yaml@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f"
-  integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==
-  dependencies:
-    argparse "^2.0.1"
-
 js-yaml@^3.13.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
@@ -8920,7 +9500,7 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-jsdom@^16.4.0:
+jsdom@^16.4.0, jsdom@^16.6.0:
   version "16.7.0"
   resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710"
   integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==
@@ -8953,6 +9533,33 @@ jsdom@^16.4.0:
     ws "^7.4.6"
     xml-name-validator "^3.0.0"
 
+jsdom@^25.0.1:
+  version "25.0.1"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-25.0.1.tgz#536ec685c288fc8a5773a65f82d8b44badcc73ef"
+  integrity sha512-8i7LzZj7BF8uplX+ZyOlIz86V6TAsSs+np6m1kpW9u0JWi4z/1t+FzcK1aek+ybTnAC4KhBL4uXCNT0wcUIeCw==
+  dependencies:
+    cssstyle "^4.1.0"
+    data-urls "^5.0.0"
+    decimal.js "^10.4.3"
+    form-data "^4.0.0"
+    html-encoding-sniffer "^4.0.0"
+    http-proxy-agent "^7.0.2"
+    https-proxy-agent "^7.0.5"
+    is-potential-custom-element-name "^1.0.1"
+    nwsapi "^2.2.12"
+    parse5 "^7.1.2"
+    rrweb-cssom "^0.7.1"
+    saxes "^6.0.0"
+    symbol-tree "^3.2.4"
+    tough-cookie "^5.0.0"
+    w3c-xmlserializer "^5.0.0"
+    webidl-conversions "^7.0.0"
+    whatwg-encoding "^3.1.1"
+    whatwg-mimetype "^4.0.0"
+    whatwg-url "^14.0.0"
+    ws "^8.18.0"
+    xml-name-validator "^5.0.0"
+
 jsesc@^3.0.2, jsesc@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.0.2.tgz#bb8b09a6597ba426425f2e4a07245c3d00b9343e"
@@ -9243,13 +9850,6 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
-locate-path@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
-  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
-  dependencies:
-    p-locate "^5.0.0"
-
 lodash._reinterpolate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
@@ -9345,13 +9945,6 @@ lodash@4.x, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14,
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-log-symbols@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920"
-  integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==
-  dependencies:
-    chalk "^4.0.0"
-
 log-update@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1"
@@ -9461,7 +10054,7 @@ make-dir@^4.0.0:
   dependencies:
     semver "^7.5.3"
 
-make-error@1.x, make-error@^1.1.1:
+make-error@1.x, make-error@^1.1.1, make-error@^1.3.6:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
@@ -9673,13 +10266,6 @@ minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==
 
-minimatch@3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
 minimatch@9.0.1:
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.1.tgz#8a555f541cf976c622daf078bb28f29fb927c253"
@@ -9800,37 +10386,6 @@ mkdirp@1.x, mkdirp@^1.0.3, mkdirp@^1.0.4, mkdirp@~1.0.4:
   dependencies:
     minimist "^1.2.6"
 
-mocha@^8.0.1:
-  version "8.4.0"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-8.4.0.tgz#677be88bf15980a3cae03a73e10a0fc3997f0cff"
-  integrity sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ==
-  dependencies:
-    "@ungap/promise-all-settled" "1.1.2"
-    ansi-colors "4.1.1"
-    browser-stdout "1.3.1"
-    chokidar "3.5.1"
-    debug "4.3.1"
-    diff "5.0.0"
-    escape-string-regexp "4.0.0"
-    find-up "5.0.0"
-    glob "7.1.6"
-    growl "1.10.5"
-    he "1.2.0"
-    js-yaml "4.0.0"
-    log-symbols "4.0.0"
-    minimatch "3.0.4"
-    ms "2.1.3"
-    nanoid "3.1.20"
-    serialize-javascript "5.0.1"
-    strip-json-comments "3.1.1"
-    supports-color "8.1.1"
-    which "2.0.2"
-    wide-align "1.1.3"
-    workerpool "6.1.0"
-    yargs "16.2.0"
-    yargs-parser "20.2.4"
-    yargs-unparser "2.0.0"
-
 mock-require@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/mock-require/-/mock-require-3.0.3.tgz#ccd544d9eae81dd576b3f219f69ec867318a1946"
@@ -9866,11 +10421,6 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
 
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
 ms@2.1.3, ms@^2.1.1, ms@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
@@ -9899,11 +10449,6 @@ nan@^2.12.1:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.22.0.tgz#31bc433fc33213c97bad36404bb68063de604de3"
   integrity sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==
 
-nanoid@3.1.20:
-  version "3.1.20"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788"
-  integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==
-
 nanoid@^3.3.7:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
@@ -10180,6 +10725,11 @@ nwsapi@^2.2.0:
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.13.tgz#e56b4e98960e7a040e5474536587e599c4ff4655"
   integrity sha512-cTGB9ptp9dY9A5VbMSe7fQBcl/tt22Vcqdq8+eN93rblOuE0aCFu4aZ2vMwct/2t+lFnosm8RkQW1I0Omb1UtQ==
 
+nwsapi@^2.2.12:
+  version "2.2.16"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.16.tgz#177760bba02c351df1d2644e220c31dfec8cdb43"
+  integrity sha512-F1I/bimDpj3ncaNDhfyMWuFqmQDBwDB0Fogc2qpL3BWvkQteFD/8BzWuIRl83rq0DXfm8SGt/HFhLXZyljTXcQ==
+
 object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -10463,13 +11013,6 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
-p-locate@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
-  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
-  dependencies:
-    p-limit "^3.0.2"
-
 p-map@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
@@ -10579,7 +11122,7 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
-parse-json@^5.0.0:
+parse-json@^5.0.0, parse-json@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
   integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
@@ -10594,6 +11137,13 @@ parse5@6.0.1:
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
   integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
+parse5@^7.0.0, parse5@^7.1.2:
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.2.1.tgz#8928f55915e6125f430cc44309765bf17556a33a"
+  integrity sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==
+  dependencies:
+    entities "^4.5.0"
+
 parseurl@~1.3.2, parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
@@ -11232,6 +11782,15 @@ pretty-format@^26.0.0, pretty-format@^26.6.2:
     ansi-styles "^4.0.0"
     react-is "^17.0.1"
 
+pretty-format@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e"
+  integrity sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==
+  dependencies:
+    ansi-regex "^5.0.1"
+    ansi-styles "^5.0.0"
+    react-is "^17.0.1"
+
 pretty@2.0.0, pretty@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pretty/-/pretty-2.0.0.tgz#adbc7960b7bbfe289a557dc5f737619a220d06a5"
@@ -11354,7 +11913,7 @@ punycode@^1.2.4, punycode@^1.4.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
   integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
 
-punycode@^2.1.0, punycode@^2.1.1:
+punycode@^2.1.0, punycode@^2.1.1, punycode@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
   integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
@@ -11597,13 +12156,6 @@ readdirp@^4.0.1:
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-4.0.2.tgz#388fccb8b75665da3abffe2d8f8ed59fe74c230a"
   integrity sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==
 
-readdirp@~3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
-  integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
-  dependencies:
-    picomatch "^2.2.1"
-
 readdirp@~3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
@@ -11787,7 +12339,12 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==
 
-resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.18.1, resolve@^1.22.0, resolve@^1.22.4:
+resolve.exports@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.1.tgz#05cfd5b3edf641571fd46fa608b610dda9ead999"
+  integrity sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==
+
+resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.18.1, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.4:
   version "1.22.8"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
   integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
@@ -11884,6 +12441,11 @@ roarr@^2.15.3:
     semver-compare "^1.0.0"
     sprintf-js "^1.1.2"
 
+rrweb-cssom@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.7.1.tgz#c73451a484b86dd7cfb1e0b2898df4b703183e4b"
+  integrity sha512-TrEMa7JGdVm0UThDJSx7ddw5nVm3UJS9o9CCIZ72B1vSyEZoziDqBYP3XIoi/12lKrJR8rE3jeFHMok2F/Mnsg==
+
 rsvp@^4.8.4:
   version "4.8.5"
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
@@ -12051,6 +12613,13 @@ saxes@^5.0.1:
   dependencies:
     xmlchars "^2.2.0"
 
+saxes@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5"
+  integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==
+  dependencies:
+    xmlchars "^2.2.0"
+
 schema-utils@2.7.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"
@@ -12121,7 +12690,7 @@ semver@7.3.5:
   dependencies:
     lru-cache "^6.0.0"
 
-semver@7.x, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.8, semver@^7.5.3:
+semver@7.x, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.8, semver@^7.5.3, semver@^7.6.3:
   version "7.6.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
   integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
@@ -12176,13 +12745,6 @@ serialize-error@^7.0.1:
   dependencies:
     type-fest "^0.13.1"
 
-serialize-javascript@5.0.1, serialize-javascript@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4"
-  integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==
-  dependencies:
-    randombytes "^2.1.0"
-
 serialize-javascript@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.1.0.tgz#8bf3a9170712664ef2561b44b691eafe399214ea"
@@ -12197,6 +12759,13 @@ serialize-javascript@^4.0.0:
   dependencies:
     randombytes "^2.1.0"
 
+serialize-javascript@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4"
+  integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==
+  dependencies:
+    randombytes "^2.1.0"
+
 serialize-javascript@^6.0.0:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2"
@@ -12634,7 +13203,7 @@ stable@^0.1.8:
   resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
   integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
 
-stack-utils@^2.0.2:
+stack-utils@^2.0.2, stack-utils@^2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
   integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==
@@ -12723,7 +13292,7 @@ string-length@^4.0.1:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-"string-width@^1.0.2 || 2", string-width@^2.0.0:
+string-width@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -12853,16 +13422,16 @@ strip-final-newline@^2.0.0:
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
-strip-json-comments@3.1.1, strip-json-comments@^3.0.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
-  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
-
 strip-json-comments@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==
 
+strip-json-comments@^3.0.1, strip-json-comments@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
+
 stylehacks@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5"
@@ -12902,13 +13471,6 @@ sumchecker@^3.0.1:
   dependencies:
     debug "^4.1.0"
 
-supports-color@8.1.1, supports-color@^8.0.0, supports-color@^8.1.0:
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
-  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
-  dependencies:
-    has-flag "^4.0.0"
-
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
@@ -12935,6 +13497,13 @@ supports-color@^7.0.0, supports-color@^7.1.0, supports-color@^7.2.0:
   dependencies:
     has-flag "^4.0.0"
 
+supports-color@^8.0.0, supports-color@^8.1.0:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
+  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
+  dependencies:
+    has-flag "^4.0.0"
+
 supports-hyperlinks@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624"
@@ -13110,6 +13679,11 @@ throat@^5.0.0:
   resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
   integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==
 
+throat@^6.0.1:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.2.tgz#51a3fbb5e11ae72e2cf74861ed5c8020f89f29fe"
+  integrity sha512-WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ==
+
 through2@^2.0.0:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
@@ -13140,6 +13714,18 @@ timsort@^0.3.0:
   resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
   integrity sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==
 
+tldts-core@^6.1.66:
+  version "6.1.66"
+  resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-6.1.66.tgz#78f823137876f80bf8986028e8839473c2d114af"
+  integrity sha512-s07jJruSwndD2X8bVjwioPfqpIc1pDTzszPe9pL1Skbh4bjytL85KNQ3tolqLbCvpQHawIsGfFi9dgerWjqW4g==
+
+tldts@^6.1.32:
+  version "6.1.66"
+  resolved "https://registry.yarnpkg.com/tldts/-/tldts-6.1.66.tgz#34cb048acf51964c8f66139284a4c863d8150bb2"
+  integrity sha512-l3ciXsYFel/jSRfESbyKYud1nOw7WfhrBEF9I3UiarYk/qEaOOwu3qXNECHw4fHGHGTEOuhf/VdKgoDX5M/dhQ==
+  dependencies:
+    tldts-core "^6.1.66"
+
 tmp-promise@^1.0.5:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-1.1.0.tgz#bb924d239029157b9bc1d506a6aa341f8b13e64c"
@@ -13246,6 +13832,13 @@ tough-cookie@^4.0.0:
     universalify "^0.2.0"
     url-parse "^1.5.3"
 
+tough-cookie@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-5.0.0.tgz#6b6518e2b5c070cf742d872ee0f4f92d69eac1af"
+  integrity sha512-FRKsF7cz96xIIeMZ82ehjC3xW2E+O2+v11udrDYewUbszngYhsGa8z6YUMMzO9QJZzzyd0nGGXnML/TReX6W8Q==
+  dependencies:
+    tldts "^6.1.32"
+
 tr46@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
@@ -13253,6 +13846,13 @@ tr46@^2.1.0:
   dependencies:
     punycode "^2.1.1"
 
+tr46@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-5.0.0.tgz#3b46d583613ec7283020d79019f1335723801cec"
+  integrity sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==
+  dependencies:
+    punycode "^2.3.1"
+
 tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
@@ -13296,6 +13896,21 @@ ts-jest@^26.5.4:
     semver "7.x"
     yargs-parser "20.x"
 
+ts-jest@^29.2.5:
+  version "29.2.5"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.2.5.tgz#591a3c108e1f5ebd013d3152142cb5472b399d63"
+  integrity sha512-KD8zB2aAZrcKIdGk4OwpJggeLcH1FgrICqDSROWqlnJXGCXK4Mn6FcdK2B6670Xr73lHMG1kHw8R87A0ecZ+vA==
+  dependencies:
+    bs-logger "^0.2.6"
+    ejs "^3.1.10"
+    fast-json-stable-stringify "^2.1.0"
+    jest-util "^29.0.0"
+    json5 "^2.2.3"
+    lodash.memoize "^4.1.2"
+    make-error "^1.3.6"
+    semver "^7.6.3"
+    yargs-parser "^21.1.1"
+
 ts-loader@8.0.17:
   version "8.0.17"
   resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.17.tgz#98f2ccff9130074f4079fd89b946b4c637b1f2fc"
@@ -13769,6 +14384,15 @@ v8-to-istanbul@^7.0.0:
     convert-source-map "^1.6.0"
     source-map "^0.7.3"
 
+v8-to-istanbul@^8.1.0:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz#77b752fd3975e31bbcef938f85e9bd1c7a8d60ed"
+  integrity sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^2.0.1"
+    convert-source-map "^1.6.0"
+    source-map "^0.7.3"
+
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
@@ -13944,6 +14568,13 @@ w3c-xmlserializer@^2.0.0:
   dependencies:
     xml-name-validator "^3.0.0"
 
+w3c-xmlserializer@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz#f925ba26855158594d907313cedd1476c5967f6c"
+  integrity sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==
+  dependencies:
+    xml-name-validator "^5.0.0"
+
 walker@^1.0.7, walker@~1.0.5:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
@@ -13996,6 +14627,11 @@ webidl-conversions@^6.1.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
   integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
 
+webidl-conversions@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a"
+  integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
+
 webpack-bundle-analyzer@^4.5.0:
   version "4.10.2"
   resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.2.tgz#633af2862c213730be3dbdf40456db171b60d5bd"
@@ -14150,11 +14786,31 @@ whatwg-encoding@^1.0.5:
   dependencies:
     iconv-lite "0.4.24"
 
+whatwg-encoding@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz#d0f4ef769905d426e1688f3e34381a99b60b76e5"
+  integrity sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==
+  dependencies:
+    iconv-lite "0.6.3"
+
 whatwg-mimetype@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
   integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
 
+whatwg-mimetype@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz#bc1bf94a985dc50388d54a9258ac405c3ca2fc0a"
+  integrity sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==
+
+whatwg-url@^14.0.0:
+  version "14.1.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-14.1.0.tgz#fffebec86cc8e6c2a657e50dc606207b870f0ab3"
+  integrity sha512-jlf/foYIKywAt3x/XWKZ/3rz8OSJPiWktjmk891alJUEjiVxKX9LEO92qH3hv4aJ0mN3MWPvGMCy8jQi95xK4w==
+  dependencies:
+    tr46 "^5.0.0"
+    webidl-conversions "^7.0.0"
+
 whatwg-url@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
@@ -14204,13 +14860,6 @@ which-typed-array@^1.1.14, which-typed-array@^1.1.15:
     gopd "^1.0.1"
     has-tostringtag "^1.0.2"
 
-which@2.0.2, which@^2.0.1, which@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
 which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
@@ -14218,12 +14867,12 @@ which@^1.2.9:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
+which@^2.0.1, which@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
   dependencies:
-    string-width "^1.0.2 || 2"
+    isexe "^2.0.0"
 
 word-wrap@~1.2.3:
   version "1.2.5"
@@ -14237,11 +14886,6 @@ worker-farm@^1.7.0:
   dependencies:
     errno "~0.1.7"
 
-workerpool@6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.0.tgz#a8e038b4c94569596852de7a8ea4228eefdeb37b"
-  integrity sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg==
-
 "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
@@ -14334,11 +14978,21 @@ ws@^7.3.1, ws@^7.4.6:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
   integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
 
+ws@^8.18.0:
+  version "8.18.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc"
+  integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==
+
 xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
   integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
 
+xml-name-validator@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-5.0.0.tgz#82be9b957f7afdacf961e5980f1bf227c0bf7673"
+  integrity sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==
+
 xmlbuilder@>=11.0.1, xmlbuilder@^15.1.1:
   version "15.1.1"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5"
@@ -14394,11 +15048,6 @@ yaml@^1.7.2:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
-yargs-parser@20.2.4:
-  version "20.2.4"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
-  integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
-
 yargs-parser@20.x, yargs-parser@^20.2.2:
   version "20.2.9"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
@@ -14433,29 +15082,6 @@ yargs-parser@^21.1.1:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
-yargs-unparser@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb"
-  integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==
-  dependencies:
-    camelcase "^6.0.0"
-    decamelize "^4.0.0"
-    flat "^5.0.2"
-    is-plain-obj "^2.1.0"
-
-yargs@16.2.0, yargs@^16.2.0:
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
-  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
-  dependencies:
-    cliui "^7.0.2"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.0"
-    y18n "^5.0.5"
-    yargs-parser "^20.2.2"
-
 yargs@^13.3.2:
   version "13.3.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
@@ -14489,6 +15115,19 @@ yargs@^15.4.1:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
+yargs@^16.2.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
 yargs@^17.6.2:
   version "17.7.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"

From 9fc45c41fa2c961d0aaa0c9be3c1814287ad0408 Mon Sep 17 00:00:00 2001
From: Cade Ayres <ca469@kent.ac.uk>
Date: Wed, 11 Dec 2024 21:43:59 +0000
Subject: [PATCH 07/95] Updated node build version

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e1c595352..2361648a3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,7 +27,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           # The talk on the street says this might be a good version for building.
-          node-version: 19.2.0
+          node-version: 20.11.0
           cache: yarn
 
       - name: Install Yarn dependencies

From c051030a71623f1e6e2798332c86e662ff1bccbc Mon Sep 17 00:00:00 2001
From: Cade Ayres <ca469@kent.ac.uk>
Date: Wed, 11 Dec 2024 21:48:38 +0000
Subject: [PATCH 08/95] Updated node version to 20.11.0 on test workflow

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6cfbc6194..a2d1cdb90 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -27,7 +27,7 @@ jobs:
               uses: actions/setup-node@v3
               with:
                   # The talk on the street says this might be a good version for building.
-                  node-version: 19.2.0
+                  node-version: 20.11.0
                   cache: yarn
 
             - name: Install Yarn dependencies

From d34acbb15fb1c92f2735572667738ca512ee709c Mon Sep 17 00:00:00 2001
From: Cade Ayres <ca469@kent.ac.uk>
Date: Wed, 11 Dec 2024 22:05:52 +0000
Subject: [PATCH 09/95] Update DevEnvSetup.md

---
 DevEnvSetup.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DevEnvSetup.md b/DevEnvSetup.md
index 36f086d78..23ed9fa7a 100644
--- a/DevEnvSetup.md
+++ b/DevEnvSetup.md
@@ -6,8 +6,8 @@
 2. Install NVM (Node Version Manager)
 3. Open Git Bash as admin
 4. Go into repo root folder
-5. Run `nvm install 14`
-6. Run `nvm use 14.X.X` with "X" replaced with the version NVM installed. e.g. `nvm use 14.21.1`
+5. Run `nvm install 20`
+6. Run `nvm use 20.X.X` with "X" replaced with the version NVM installed. e.g. `nvm use 20.21.1`
 7. Run `npm install --global yarn`
 8. Exit Git Bash
 9. Open PowerShell as Admin

From f593cc7e1c696d97a4065f8516a2cc93103398ae Mon Sep 17 00:00:00 2001
From: Cade Ayres <ca469@kent.ac.uk>
Date: Wed, 11 Dec 2024 22:06:40 +0000
Subject: [PATCH 10/95] Update BUILDING.md

---
 BUILDING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BUILDING.md b/BUILDING.md
index d6a2dbab2..c601ff9a7 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -1,9 +1,9 @@
 # Setting Up
 ### Prerequisites
-- Node.js (>=18.0.0)
+- Node.js (>=20.0.0)
 - Yarn
 - Quasar CLI (Install using `yarn global add @quasar/cli`)
-- Python2 (EOL for 4 years. Goodluck!)
+- Python 2
 
 #### Linux Build
 - rpm builder

From a2762664edd1c23947b3763e2e9dd9c782a66eec Mon Sep 17 00:00:00 2001
From: Cade Ayres <ca469@kent.ac.uk>
Date: Wed, 11 Dec 2024 22:11:11 +0000
Subject: [PATCH 11/95] Fixed hero subtitle colour

---
 src/css/v2/_initial.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/css/v2/_initial.scss b/src/css/v2/_initial.scss
index e4d35fb40..9a8689141 100644
--- a/src/css/v2/_initial.scss
+++ b/src/css/v2/_initial.scss
@@ -1,7 +1,7 @@
 :root {
     --v2-primary-background-color: #3f8ecf;
     --v2-primary-text-color: white;
-    --v2-primary-subtitle-text-color: #ffffe6;
+    --v2-primary-subtitle-text-color: #e4f4fa;
 
     --v2-warning-background-color: #ffe08a;
     --v2-warning-text-color: #222;

From 10af1db1dc5cd3b1976b9748e5e8aa2bed08001a Mon Sep 17 00:00:00 2001
From: Vili Manninen <104134747+VilppeRiskidev@users.noreply.github.com>
Date: Fri, 13 Dec 2024 09:18:15 +0200
Subject: [PATCH 12/95] More immutable profile (#1579)

* Use ImmutableProfile in ConflictManagementProvider
* Use ImmutableProfile in LocalModInstallerProvider
---
 .../importing/LocalFileImportModal.vue        |  8 +++++---
 src/components/views/DownloadModModal.vue     |  4 ++--
 .../installing/ConflictManagementProvider.ts  |  6 +++---
 .../installing/LocalModInstallerProvider.ts   |  8 ++++----
 .../ConflictManagementProviderImpl.ts         |  8 ++++----
 src/r2mm/installing/LocalModInstaller.ts      | 20 +++++++++----------
 src/store/modules/ProfileModule.ts            |  2 +-
 .../__tests__/impl/MelonLoader/state.spec.ts  |  2 +-
 8 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/src/components/importing/LocalFileImportModal.vue b/src/components/importing/LocalFileImportModal.vue
index ca56ca90a..b35027c98 100644
--- a/src/components/importing/LocalFileImportModal.vue
+++ b/src/components/importing/LocalFileImportModal.vue
@@ -72,7 +72,7 @@ import VersionNumber from '../../model/VersionNumber';
 import ZipProvider from '../../providers/generic/zip/ZipProvider';
 import ManifestV2 from '../../model/ManifestV2';
 import R2Error from '../../model/errors/R2Error';
-import Profile from '../../model/Profile';
+import { ImmutableProfile } from '../../model/Profile';
 import ProfileModList from '../../r2mm/mods/ProfileModList';
 import LocalModInstallerProvider from '../../providers/ror2/installing/LocalModInstallerProvider';
 import ModalCard from '../ModalCard.vue';
@@ -279,7 +279,9 @@ export default class LocalFileImportModal extends Vue {
             return;
         }
 
-        const profile: Profile|null = this.$store.state.profile.activeProfile;
+        const profile: ImmutableProfile|null = this.$store.state.profile.activeProfile
+            ? this.$store.state.profile.activeProfile.asImmutableProfile()
+            : null;
 
         if (profile === null) {
             this.validationMessage = "Profile is not selected";
@@ -297,7 +299,7 @@ export default class LocalFileImportModal extends Vue {
                 this.$store.commit("error/handleError", R2Error.fromThrownValue(error));
                 return;
             }
-            const updatedModListResult = await ProfileModList.getModList(profile.asImmutableProfile());
+            const updatedModListResult = await ProfileModList.getModList(profile);
             if (updatedModListResult instanceof R2Error) {
                 this.$store.commit("error/handleError", updatedModListResult);
                 return;
diff --git a/src/components/views/DownloadModModal.vue b/src/components/views/DownloadModModal.vue
index 36ce1078a..eb998f9b1 100644
--- a/src/components/views/DownloadModModal.vue
+++ b/src/components/views/DownloadModModal.vue
@@ -140,7 +140,7 @@ let assignId = 0;
                             }
                             const modList = await ProfileModList.getModList(profile.asImmutableProfile());
                             if (!(modList instanceof R2Error)) {
-                                const err = await ConflictManagementProvider.instance.resolveConflicts(modList, profile);
+                                const err = await ConflictManagementProvider.instance.resolveConflicts(modList, profile.asImmutableProfile());
                                 if (err instanceof R2Error) {
                                     return reject(err);
                                 }
@@ -245,7 +245,7 @@ let assignId = 0;
                     const modList = await installModsToProfile(downloadedMods, profile);
                     await this.$store.dispatch('profile/updateModList', modList);
 
-                    const err = await ConflictManagementProvider.instance.resolveConflicts(modList, this.profile);
+                    const err = await ConflictManagementProvider.instance.resolveConflicts(modList, this.profile.asImmutableProfile());
                     if (err instanceof R2Error) {
                         throw err;
                     }
diff --git a/src/providers/generic/installing/ConflictManagementProvider.ts b/src/providers/generic/installing/ConflictManagementProvider.ts
index f8a3df327..42a5a42be 100644
--- a/src/providers/generic/installing/ConflictManagementProvider.ts
+++ b/src/providers/generic/installing/ConflictManagementProvider.ts
@@ -1,7 +1,7 @@
 import ProviderUtils from '../../generic/ProviderUtils';
 import ManifestV2 from '../../../model/ManifestV2';
 import R2Error from '../../../model/errors/R2Error';
-import Profile, { ImmutableProfile } from '../../../model/Profile';
+import { ImmutableProfile } from '../../../model/Profile';
 
 export default abstract class ConflictManagementProvider {
 
@@ -18,11 +18,11 @@ export default abstract class ConflictManagementProvider {
         return ConflictManagementProvider.provider();
     }
 
-    public abstract resolveConflicts(mods: ManifestV2[], profile: Profile): Promise<R2Error | void>;
+    public abstract resolveConflicts(mods: ManifestV2[], profile: ImmutableProfile): Promise<R2Error | void>;
 
     public abstract overrideInstalledState(mod: ManifestV2, profile: ImmutableProfile): Promise<R2Error | void>;
 
-    public abstract isFileActive(mod: ManifestV2, profile: Profile|ImmutableProfile, file: string): Promise<boolean>;
+    public abstract isFileActive(mod: ManifestV2, profile: ImmutableProfile, file: string): Promise<boolean>;
 
 }
 
diff --git a/src/providers/ror2/installing/LocalModInstallerProvider.ts b/src/providers/ror2/installing/LocalModInstallerProvider.ts
index 90e16e22c..415aacec2 100644
--- a/src/providers/ror2/installing/LocalModInstallerProvider.ts
+++ b/src/providers/ror2/installing/LocalModInstallerProvider.ts
@@ -1,6 +1,6 @@
 import ProviderUtils from '../../generic/ProviderUtils';
 import R2Error from '../../../model/errors/R2Error';
-import Profile from '../../../model/Profile';
+import { ImmutableProfile } from '../../../model/Profile';
 import ManifestV2 from '../../../model/ManifestV2';
 
 export default abstract class LocalModInstallerProvider {
@@ -25,8 +25,8 @@ export default abstract class LocalModInstallerProvider {
      * @param zipFile   Path to the zip file.
      * @param callback  Callback to report if the extraction was successful.
      */
-    public abstract extractToCache(profile: Profile, zipFile: string, callback: (success: boolean, error: R2Error | null) => void): Promise<R2Error | void>;
-    public abstract extractToCacheWithManifestData(profile: Profile, zipFile: string, manifest: ManifestV2, callback: (success: boolean, error: R2Error | null) => void): Promise<void>;
-    public abstract placeFileInCache(profile: Profile, file: string, manifest: ManifestV2, callback: (success: boolean, error: R2Error | null) => void): Promise<void>;
+    public abstract extractToCache(profile: ImmutableProfile, zipFile: string, callback: (success: boolean, error: R2Error | null) => void): Promise<R2Error | void>;
+    public abstract extractToCacheWithManifestData(profile: ImmutableProfile, zipFile: string, manifest: ManifestV2, callback: (success: boolean, error: R2Error | null) => void): Promise<void>;
+    public abstract placeFileInCache(profile: ImmutableProfile, file: string, manifest: ManifestV2, callback: (success: boolean, error: R2Error | null) => void): Promise<void>;
 
 }
diff --git a/src/r2mm/installing/ConflictManagementProviderImpl.ts b/src/r2mm/installing/ConflictManagementProviderImpl.ts
index 489d5aa20..8d5d35a65 100644
--- a/src/r2mm/installing/ConflictManagementProviderImpl.ts
+++ b/src/r2mm/installing/ConflictManagementProviderImpl.ts
@@ -6,7 +6,7 @@ import * as path from 'path';
 import yaml from 'yaml';
 import ModFileTracker from '../../model/installing/ModFileTracker';
 import StateTracker from '../../model/installing/StateTracker';
-import Profile, { ImmutableProfile } from '../../model/Profile';
+import { ImmutableProfile } from '../../model/Profile';
 import FileUtils from '../../utils/FileUtils';
 
 export default class ConflictManagementProviderImpl extends ConflictManagementProvider {
@@ -39,7 +39,7 @@ export default class ConflictManagementProviderImpl extends ConflictManagementPr
     }
 
     // TODO: Iterate through mods array and look for anything out of place.
-    async resolveConflicts(mods: ManifestV2[], profile: Profile): Promise<R2Error | void> {
+    async resolveConflicts(mods: ManifestV2[], profile: ImmutableProfile): Promise<R2Error | void> {
         const overallState = new Map<string, string>();
         const modStates = new Map<string, ModFileTracker>();
         const modNameToManifestV2 = new Map<string, ManifestV2>();
@@ -98,7 +98,7 @@ export default class ConflictManagementProviderImpl extends ConflictManagementPr
         } as StateTracker));
     }
 
-    public async isFileActive(mod: ManifestV2, profile: Profile|ImmutableProfile, file: string) {
+    public async isFileActive(mod: ManifestV2, profile: ImmutableProfile, file: string) {
         const state = await this.getTotalState(profile);
         for (const [stateFile, stateMod] of state.currentState) {
             if (stateFile === file) {
@@ -108,7 +108,7 @@ export default class ConflictManagementProviderImpl extends ConflictManagementPr
         return false;
     }
 
-    private async getTotalState(profile: Profile|ImmutableProfile): Promise<StateTracker> {
+    private async getTotalState(profile: ImmutableProfile): Promise<StateTracker> {
         const totalStateFilePath = profile.joinToProfilePath("_state", "installation_state.yml");
         let totalState: StateTracker = {
             currentState: []
diff --git a/src/r2mm/installing/LocalModInstaller.ts b/src/r2mm/installing/LocalModInstaller.ts
index 9f04755df..23b3935ba 100644
--- a/src/r2mm/installing/LocalModInstaller.ts
+++ b/src/r2mm/installing/LocalModInstaller.ts
@@ -8,12 +8,12 @@ import PathResolver from '../manager/PathResolver';
 import ProfileModList from '../mods/ProfileModList';
 import LocalModInstallerProvider from '../../providers/ror2/installing/LocalModInstallerProvider';
 import ZipProvider from '../../providers/generic/zip/ZipProvider';
-import Profile from '../../model/Profile';
+import { ImmutableProfile } from '../../model/Profile';
 import FileUtils from '../../utils/FileUtils';
 
 export default class LocalModInstaller extends LocalModInstallerProvider {
 
-    public async extractToCache(profile: Profile, zipFile: string, callback: (success: boolean, error: R2Error | null) => void) {
+    public async extractToCache(profile: ImmutableProfile, zipFile: string, callback: (success: boolean, error: R2Error | null) => void) {
         const result: Buffer | null = await ZipProvider.instance.readFile(zipFile,'manifest.json');
         if (result !== null) {
             const fileContents = result.toString();
@@ -43,7 +43,7 @@ export default class LocalModInstaller extends LocalModInstallerProvider {
         }
     }
 
-    public async extractToCacheWithManifestData(profile: Profile, zipFile: string, manifest: ManifestV2, callback: (success: boolean, error: R2Error | null) => void) {
+    public async extractToCacheWithManifestData(profile: ImmutableProfile, zipFile: string, manifest: ManifestV2, callback: (success: boolean, error: R2Error | null) => void) {
         const cacheDirectory: string = path.join(PathResolver.MOD_ROOT, 'cache');
         await this.initialiseCacheDirectory(manifest);
         await ZipExtract.extractOnly(
@@ -60,13 +60,13 @@ export default class LocalModInstaller extends LocalModInstallerProvider {
                         }
                     }
                     await FsProvider.instance.writeFile(path.join(cacheDirectory, manifest.getName(), manifest.getVersionNumber().toString(), "mm_v2_manifest.json"), JSON.stringify(manifest));
-                    await ProfileInstallerProvider.instance.uninstallMod(manifest, profile.asImmutableProfile());
-                    const profileInstallResult = await ProfileInstallerProvider.instance.installMod(manifest, profile.asImmutableProfile());
+                    await ProfileInstallerProvider.instance.uninstallMod(manifest, profile);
+                    const profileInstallResult = await ProfileInstallerProvider.instance.installMod(manifest, profile);
                     if (profileInstallResult instanceof R2Error) {
                         callback(false, profileInstallResult);
                         return Promise.resolve();
                     }
-                    const modListInstallResult = await ProfileModList.addMod(manifest, profile.asImmutableProfile());
+                    const modListInstallResult = await ProfileModList.addMod(manifest, profile);
                     if (modListInstallResult instanceof R2Error) {
                         callback(false, modListInstallResult);
                         return Promise.resolve();
@@ -78,7 +78,7 @@ export default class LocalModInstaller extends LocalModInstallerProvider {
         );
     }
 
-    public async placeFileInCache(profile: Profile, file: string, manifest: ManifestV2, callback: (success: boolean, error: (R2Error | null)) => void) {
+    public async placeFileInCache(profile: ImmutableProfile, file: string, manifest: ManifestV2, callback: (success: boolean, error: (R2Error | null)) => void) {
         try {
             const cacheDirectory: string = path.join(PathResolver.MOD_ROOT, 'cache');
             await this.initialiseCacheDirectory(manifest);
@@ -86,13 +86,13 @@ export default class LocalModInstaller extends LocalModInstallerProvider {
             const fileSafe = file.split("\\").join("/");
             await FsProvider.instance.copyFile(fileSafe, path.join(modCacheDirectory, path.basename(fileSafe)));
             await FsProvider.instance.writeFile(path.join(modCacheDirectory, "mm_v2_manifest.json"), JSON.stringify(manifest));
-            await ProfileInstallerProvider.instance.uninstallMod(manifest, profile.asImmutableProfile());
-            const profileInstallResult = await ProfileInstallerProvider.instance.installMod(manifest, profile.asImmutableProfile());
+            await ProfileInstallerProvider.instance.uninstallMod(manifest, profile);
+            const profileInstallResult = await ProfileInstallerProvider.instance.installMod(manifest, profile);
             if (profileInstallResult instanceof R2Error) {
                 callback(false, profileInstallResult);
                 return Promise.resolve();
             }
-            const modListInstallResult = await ProfileModList.addMod(manifest, profile.asImmutableProfile());
+            const modListInstallResult = await ProfileModList.addMod(manifest, profile);
             if (modListInstallResult instanceof R2Error) {
                 callback(false, modListInstallResult);
                 return Promise.resolve();
diff --git a/src/store/modules/ProfileModule.ts b/src/store/modules/ProfileModule.ts
index 421956621..cf87335ad 100644
--- a/src/store/modules/ProfileModule.ts
+++ b/src/store/modules/ProfileModule.ts
@@ -322,7 +322,7 @@ export default {
             {},
             params: {
                 mods: ManifestV2[] | undefined,
-                profile: Profile,
+                profile: ImmutableProfile,
             }
         ) {
             const {mods, profile} = params;
diff --git a/test/jest/__tests__/impl/MelonLoader/state.spec.ts b/test/jest/__tests__/impl/MelonLoader/state.spec.ts
index 5f09d2136..106bcc63d 100644
--- a/test/jest/__tests__/impl/MelonLoader/state.spec.ts
+++ b/test/jest/__tests__/impl/MelonLoader/state.spec.ts
@@ -238,7 +238,7 @@ let processConflictManagement = async (modA: ManifestV2, modFileTrackerA: ModFil
     // No need to create state directory. Ensure no extra stubbing needed.
     fsStub.exists.withArgs(profile.joinToProfilePath("_state")).returns(Promise.resolve(true));
 
-    await conflictManagement.resolveConflicts([modA, modB], profile);
+    await conflictManagement.resolveConflicts([modA, modB], profile.asImmutableProfile());
 
     return yaml.parse(fsStub.writeFile.args[0][1] as unknown as string) as StateTracker;
 }

From 8e874020225d984a213f041c51a4b1a5c041562f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Fri, 13 Dec 2024 09:00:44 +0200
Subject: [PATCH 13/95] Use fallback image if mod icon isn't found on disk

Fallback is needed e.g. when mods are removed from cache while still
used in profiles, or when plain .dll files are imported locally.
---
 src/r2mm/mods/ProfileModList.ts | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/r2mm/mods/ProfileModList.ts b/src/r2mm/mods/ProfileModList.ts
index e630cd4c8..79b7392b6 100644
--- a/src/r2mm/mods/ProfileModList.ts
+++ b/src/r2mm/mods/ProfileModList.ts
@@ -22,6 +22,8 @@ import ZipBuilder from '../../providers/generic/zip/ZipBuilder';
 import InteractionProvider from '../../providers/ror2/system/InteractionProvider';
 import { ProfileApiClient } from '../profiles/ProfilesClient';
 
+const FALLBACK_ICON = require("../../../public/unknown.png");
+
 export default class ProfileModList {
 
     public static SUPPORTED_CONFIG_FILE_EXTENSIONS = [".cfg", ".txt", ".json", ".yml", ".yaml", ".ini"];
@@ -280,15 +282,18 @@ export default class ProfileModList {
     }
 
     public static async setIconPath(mod: ManifestV2, profile: ImmutableProfile): Promise<void> {
-        let iconPath = path.resolve(profile.getProfilePath(), "BepInEx", "plugins", mod.getName(), "icon.png");
+        const paths = [
+            path.resolve(profile.getProfilePath(), "BepInEx", "plugins", mod.getName(), "icon.png"),
+            path.join(PathResolver.MOD_ROOT, "cache", mod.getName(), mod.getVersionNumber().toString(), "icon.png"),
+        ]
 
-        // BepInEx is not a plugin, and so the only place where we can get its icon is from the cache.
-        // Also non-BepInEx games, e.g. ReturnOfModding games, read the icons from cache. This could
-        // be fixed using a different path though.
-        if (!(await FsProvider.instance.exists(iconPath))) {
-            iconPath = path.join(PathResolver.MOD_ROOT, "cache", mod.getName(), mod.getVersionNumber().toString(), "icon.png");
+        for (const iconPath of paths) {
+            if (await FsProvider.instance.exists(iconPath)) {
+                mod.setIcon(iconPath);
+                return;
+            }
         }
 
-        mod.setIcon(iconPath);
+        mod.setIcon(FALLBACK_ICON);
     }
 }

From 0c9d999c63ce404fee36ea62f52c59915036082d Mon Sep 17 00:00:00 2001
From: VilppeRiskidev <vili.manninen@riskidev.fi>
Date: Mon, 16 Dec 2024 14:54:28 +0200
Subject: [PATCH 14/95] Add game: Subterror

---
 src/assets/images/game_selection/Subterror.png  | Bin 0 -> 60806 bytes
 src/model/game/GameManager.ts                   |   6 ++++++
 .../InstallationRuleApplicator.ts               |   1 +
 .../ModLoaderVariantRecord.ts                   |   1 +
 4 files changed, 8 insertions(+)
 create mode 100644 src/assets/images/game_selection/Subterror.png

diff --git a/src/assets/images/game_selection/Subterror.png b/src/assets/images/game_selection/Subterror.png
new file mode 100644
index 0000000000000000000000000000000000000000..d710addcc65f2030b80f981020331244cad06d5a
GIT binary patch
literal 60806
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
UF~YuC#sB~S07*qoM6N<$f?qT*s{jB1

literal 0
HcmV?d00001

diff --git a/src/model/game/GameManager.ts b/src/model/game/GameManager.ts
index bab773cdc..5e0ff2f4c 100644
--- a/src/model/game/GameManager.ts
+++ b/src/model/game/GameManager.ts
@@ -843,6 +843,12 @@ export default class GameManager {
             "https://thunderstore.io/c/peaks-of-yore/api/v1/package-listing-index/", EXCLUSIONS,
             [new StorePlatformMetadata(StorePlatform.STEAM, "2236070")], "PeaksOfYore.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["poy"]),
+
+        new Game("Subterror", "Subterror", "Subterror",
+            "Subterror", ["Subterror.exe"], "Subterror_Data",
+            "https://thunderstore.io/c/subterror/api/v1/package-listing-index/", EXCLUSIONS,
+            [new StorePlatformMetadata(StorePlatform.STEAM, "2846060")], "Subterror.png",
+            GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["st"]),
     ];
 
     static get activeGame(): Game {
diff --git a/src/r2mm/installing/default_installation_rules/InstallationRuleApplicator.ts b/src/r2mm/installing/default_installation_rules/InstallationRuleApplicator.ts
index 5b1a89199..14b3c649d 100644
--- a/src/r2mm/installing/default_installation_rules/InstallationRuleApplicator.ts
+++ b/src/r2mm/installing/default_installation_rules/InstallationRuleApplicator.ts
@@ -156,6 +156,7 @@ export default class InstallationRuleApplicator {
             buildBepInExRules("STRAFTAT"),
             buildBepInExRules("ATLYSS"),
             buildBepInExRules("PeaksOfYore"),
+            buildBepInExRules("Subterror"),
         ]
     }
 }
diff --git a/src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts b/src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts
index ce36c90d0..769318913 100644
--- a/src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts
+++ b/src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts
@@ -210,6 +210,7 @@ const VARIANTS = {
     STRAFTAT: MODLOADER_PACKAGES,
     ATLYSS: MODLOADER_PACKAGES,
     PeaksOfYore: MODLOADER_PACKAGES,
+    Subterror: MODLOADER_PACKAGES,
 };
 // Exported separately from the definition in order to preserve the key names in the type definition.
 // Otherwise this would become [key: string] and we couldn't use the game names for type hinting elsewhere.

From 023f752820bc0311461b657b8b931c9f9f3dea70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Thu, 5 Dec 2024 14:33:18 +0200
Subject: [PATCH 15/95] Remove ununsed LocalModInstaller method

As far as I can tell this was the original way of importing local mods,
but it hasn't been in use for a while.
---
 .../installing/LocalModInstallerProvider.ts   |  1 -
 src/r2mm/installing/LocalModInstaller.ts      | 22 -------------------
 2 files changed, 23 deletions(-)

diff --git a/src/providers/ror2/installing/LocalModInstallerProvider.ts b/src/providers/ror2/installing/LocalModInstallerProvider.ts
index 415aacec2..5084c37fa 100644
--- a/src/providers/ror2/installing/LocalModInstallerProvider.ts
+++ b/src/providers/ror2/installing/LocalModInstallerProvider.ts
@@ -25,7 +25,6 @@ export default abstract class LocalModInstallerProvider {
      * @param zipFile   Path to the zip file.
      * @param callback  Callback to report if the extraction was successful.
      */
-    public abstract extractToCache(profile: ImmutableProfile, zipFile: string, callback: (success: boolean, error: R2Error | null) => void): Promise<R2Error | void>;
     public abstract extractToCacheWithManifestData(profile: ImmutableProfile, zipFile: string, manifest: ManifestV2, callback: (success: boolean, error: R2Error | null) => void): Promise<void>;
     public abstract placeFileInCache(profile: ImmutableProfile, file: string, manifest: ManifestV2, callback: (success: boolean, error: R2Error | null) => void): Promise<void>;
 
diff --git a/src/r2mm/installing/LocalModInstaller.ts b/src/r2mm/installing/LocalModInstaller.ts
index 23b3935ba..59815ad7d 100644
--- a/src/r2mm/installing/LocalModInstaller.ts
+++ b/src/r2mm/installing/LocalModInstaller.ts
@@ -7,33 +7,11 @@ import FsProvider from '../../providers/generic/file/FsProvider';
 import PathResolver from '../manager/PathResolver';
 import ProfileModList from '../mods/ProfileModList';
 import LocalModInstallerProvider from '../../providers/ror2/installing/LocalModInstallerProvider';
-import ZipProvider from '../../providers/generic/zip/ZipProvider';
 import { ImmutableProfile } from '../../model/Profile';
 import FileUtils from '../../utils/FileUtils';
 
 export default class LocalModInstaller extends LocalModInstallerProvider {
 
-    public async extractToCache(profile: ImmutableProfile, zipFile: string, callback: (success: boolean, error: R2Error | null) => void) {
-        const result: Buffer | null = await ZipProvider.instance.readFile(zipFile,'manifest.json');
-        if (result !== null) {
-            const fileContents = result.toString();
-            try {
-                const parsed = JSON.parse(fileContents.trim());
-                const mod: R2Error | ManifestV2 = new ManifestV2().makeSafe(parsed);
-                if (mod instanceof R2Error) {
-                    return mod;
-                }
-                return await this.extractToCacheWithManifestData(profile, zipFile, mod, callback);
-            } catch(e) {
-                const err: Error = e as Error;
-                return new R2Error('Failed to convert manifest to JSON', err.message, null);
-            }
-        } else {
-            return new R2Error('No manifest provided', 'No file found in zip with name "manifest.json". Contact the mod author, or create your own.', null);
-        }
-        return Promise.resolve();
-    }
-
     private async initialiseCacheDirectory(manifest: ManifestV2) {
         const cacheDirectory: string = path.join(PathResolver.MOD_ROOT, 'cache');
         if (await FsProvider.instance.exists(path.join(cacheDirectory, manifest.getName(), manifest.getVersionNumber().toString()))) {

From a45ff0317cf3153710ac198e49df4c8a0d5be99c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Thu, 5 Dec 2024 14:36:56 +0200
Subject: [PATCH 16/95] Reduce places where mm_v2_manifest.json is written to
 disk

Also document the intent of the file so it doesn't look like obsolete
legacy code and get accidentally removed.
---
 src/r2mm/installing/LocalModInstaller.ts | 36 ++++++++++++++++++------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/r2mm/installing/LocalModInstaller.ts b/src/r2mm/installing/LocalModInstaller.ts
index 59815ad7d..c01607b57 100644
--- a/src/r2mm/installing/LocalModInstaller.ts
+++ b/src/r2mm/installing/LocalModInstaller.ts
@@ -21,6 +21,27 @@ export default class LocalModInstaller extends LocalModInstallerProvider {
         }
     }
 
+    /**
+     * Store custom file into cache to indicate the mod is installed locally.
+     * When the mod is installed, the file also gets copied to profile, which can
+     * be used in troubleshooting, telling us that the version of the mod isn't
+     * necessarily the same that's available via Thunderstore API.
+     */
+    private async writeManifestToCache(manifest: ManifestV2) {
+        const cacheDirectory: string = path.join(PathResolver.MOD_ROOT, 'cache', manifest.getName(), manifest.getVersionNumber().toString());
+        const manifestPath: string = path.join(cacheDirectory, 'mm_v2_manifest.json');
+
+        if (await FsProvider.instance.exists(manifestPath)) {
+            try {
+                await FsProvider.instance.unlink(manifestPath);
+            } catch (e) {
+                throw R2Error.fromThrownValue(e, 'Failed to unlink manifest from cache');
+            }
+        }
+
+        await FsProvider.instance.writeFile(manifestPath, JSON.stringify(manifest));
+    }
+
     public async extractToCacheWithManifestData(profile: ImmutableProfile, zipFile: string, manifest: ManifestV2, callback: (success: boolean, error: R2Error | null) => void) {
         const cacheDirectory: string = path.join(PathResolver.MOD_ROOT, 'cache');
         await this.initialiseCacheDirectory(manifest);
@@ -29,15 +50,12 @@ export default class LocalModInstaller extends LocalModInstallerProvider {
             path.join(cacheDirectory, manifest.getName(), manifest.getVersionNumber().toString()),
             async success => {
                 if (success) {
-                    if (await FsProvider.instance.exists(path.join(cacheDirectory, manifest.getName(), manifest.getVersionNumber().toString(), "mm_v2_manifest.json"))) {
-                        try {
-                            await FsProvider.instance.unlink(path.join(cacheDirectory, manifest.getName(), manifest.getVersionNumber().toString(), "mm_v2_manifest.json"));
-                        } catch (e) {
-                            const err: Error = e as Error;
-                            callback(false, new R2Error("Failed to unlink manifest from cache", err.message, null));
-                        }
+                    try {
+                        await this.writeManifestToCache(manifest);
+                    } catch (e) {
+                        callback(false, R2Error.fromThrownValue(e));
+                        return Promise.resolve();
                     }
-                    await FsProvider.instance.writeFile(path.join(cacheDirectory, manifest.getName(), manifest.getVersionNumber().toString(), "mm_v2_manifest.json"), JSON.stringify(manifest));
                     await ProfileInstallerProvider.instance.uninstallMod(manifest, profile);
                     const profileInstallResult = await ProfileInstallerProvider.instance.installMod(manifest, profile);
                     if (profileInstallResult instanceof R2Error) {
@@ -63,7 +81,7 @@ export default class LocalModInstaller extends LocalModInstallerProvider {
             const modCacheDirectory = path.join(cacheDirectory, manifest.getName(), manifest.getVersionNumber().toString());
             const fileSafe = file.split("\\").join("/");
             await FsProvider.instance.copyFile(fileSafe, path.join(modCacheDirectory, path.basename(fileSafe)));
-            await FsProvider.instance.writeFile(path.join(modCacheDirectory, "mm_v2_manifest.json"), JSON.stringify(manifest));
+            await this.writeManifestToCache(manifest);
             await ProfileInstallerProvider.instance.uninstallMod(manifest, profile);
             const profileInstallResult = await ProfileInstallerProvider.instance.installMod(manifest, profile);
             if (profileInstallResult instanceof R2Error) {

From 16e713d0ba8424846f307f8723f2d37351a7475b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Thu, 5 Dec 2024 14:51:39 +0200
Subject: [PATCH 17/95] Reduce places where LocalModInstaller defines the cache
 path

---
 src/r2mm/installing/LocalModInstaller.ts | 29 +++++++++++-------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/r2mm/installing/LocalModInstaller.ts b/src/r2mm/installing/LocalModInstaller.ts
index c01607b57..5f735dac0 100644
--- a/src/r2mm/installing/LocalModInstaller.ts
+++ b/src/r2mm/installing/LocalModInstaller.ts
@@ -12,13 +12,14 @@ import FileUtils from '../../utils/FileUtils';
 
 export default class LocalModInstaller extends LocalModInstallerProvider {
 
-    private async initialiseCacheDirectory(manifest: ManifestV2) {
-        const cacheDirectory: string = path.join(PathResolver.MOD_ROOT, 'cache');
-        if (await FsProvider.instance.exists(path.join(cacheDirectory, manifest.getName(), manifest.getVersionNumber().toString()))) {
-            await FileUtils.emptyDirectory(path.join(cacheDirectory, manifest.getName(), manifest.getVersionNumber().toString()));
+    private async initialiseCacheDirectory(manifest: ManifestV2): Promise<string> {
+        const cacheDirectory = path.join(PathResolver.MOD_ROOT, 'cache', manifest.getName(), manifest.getVersionNumber().toString());
+        if (await FsProvider.instance.exists(cacheDirectory)) {
+            await FileUtils.emptyDirectory(cacheDirectory);
         } else {
-            await FileUtils.ensureDirectory(path.join(cacheDirectory, manifest.getName(), manifest.getVersionNumber().toString()));
+            await FileUtils.ensureDirectory(cacheDirectory);
         }
+        return cacheDirectory;
     }
 
     /**
@@ -27,8 +28,7 @@ export default class LocalModInstaller extends LocalModInstallerProvider {
      * be used in troubleshooting, telling us that the version of the mod isn't
      * necessarily the same that's available via Thunderstore API.
      */
-    private async writeManifestToCache(manifest: ManifestV2) {
-        const cacheDirectory: string = path.join(PathResolver.MOD_ROOT, 'cache', manifest.getName(), manifest.getVersionNumber().toString());
+    private async writeManifestToCache(cacheDirectory: string, manifest: ManifestV2) {
         const manifestPath: string = path.join(cacheDirectory, 'mm_v2_manifest.json');
 
         if (await FsProvider.instance.exists(manifestPath)) {
@@ -43,15 +43,14 @@ export default class LocalModInstaller extends LocalModInstallerProvider {
     }
 
     public async extractToCacheWithManifestData(profile: ImmutableProfile, zipFile: string, manifest: ManifestV2, callback: (success: boolean, error: R2Error | null) => void) {
-        const cacheDirectory: string = path.join(PathResolver.MOD_ROOT, 'cache');
-        await this.initialiseCacheDirectory(manifest);
+        const cacheDirectory: string = await this.initialiseCacheDirectory(manifest);
         await ZipExtract.extractOnly(
             zipFile,
-            path.join(cacheDirectory, manifest.getName(), manifest.getVersionNumber().toString()),
+            cacheDirectory,
             async success => {
                 if (success) {
                     try {
-                        await this.writeManifestToCache(manifest);
+                        await this.writeManifestToCache(cacheDirectory, manifest);
                     } catch (e) {
                         callback(false, R2Error.fromThrownValue(e));
                         return Promise.resolve();
@@ -76,12 +75,10 @@ export default class LocalModInstaller extends LocalModInstallerProvider {
 
     public async placeFileInCache(profile: ImmutableProfile, file: string, manifest: ManifestV2, callback: (success: boolean, error: (R2Error | null)) => void) {
         try {
-            const cacheDirectory: string = path.join(PathResolver.MOD_ROOT, 'cache');
-            await this.initialiseCacheDirectory(manifest);
-            const modCacheDirectory = path.join(cacheDirectory, manifest.getName(), manifest.getVersionNumber().toString());
+            const cacheDirectory: string = await this.initialiseCacheDirectory(manifest);
             const fileSafe = file.split("\\").join("/");
-            await FsProvider.instance.copyFile(fileSafe, path.join(modCacheDirectory, path.basename(fileSafe)));
-            await this.writeManifestToCache(manifest);
+            await FsProvider.instance.copyFile(fileSafe, path.join(cacheDirectory, path.basename(fileSafe)));
+            await this.writeManifestToCache(cacheDirectory, manifest);
             await ProfileInstallerProvider.instance.uninstallMod(manifest, profile);
             const profileInstallResult = await ProfileInstallerProvider.instance.installMod(manifest, profile);
             if (profileInstallResult instanceof R2Error) {

From 975fc5478d21b68eadb3502f892831e32f0c9dcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Mon, 9 Dec 2024 08:31:09 +0200
Subject: [PATCH 18/95] Remove callback from ZipExtract.extractOnly

Callback added unnecessary complexity, as throwing the the error
works as well.
---
 src/r2mm/installing/LocalModInstaller.ts | 55 +++++++++--------
 src/r2mm/installing/ZipExtract.ts        | 79 ++++++++++--------------
 2 files changed, 60 insertions(+), 74 deletions(-)

diff --git a/src/r2mm/installing/LocalModInstaller.ts b/src/r2mm/installing/LocalModInstaller.ts
index 5f735dac0..7d4682715 100644
--- a/src/r2mm/installing/LocalModInstaller.ts
+++ b/src/r2mm/installing/LocalModInstaller.ts
@@ -44,33 +44,34 @@ export default class LocalModInstaller extends LocalModInstallerProvider {
 
     public async extractToCacheWithManifestData(profile: ImmutableProfile, zipFile: string, manifest: ManifestV2, callback: (success: boolean, error: R2Error | null) => void) {
         const cacheDirectory: string = await this.initialiseCacheDirectory(manifest);
-        await ZipExtract.extractOnly(
-            zipFile,
-            cacheDirectory,
-            async success => {
-                if (success) {
-                    try {
-                        await this.writeManifestToCache(cacheDirectory, manifest);
-                    } catch (e) {
-                        callback(false, R2Error.fromThrownValue(e));
-                        return Promise.resolve();
-                    }
-                    await ProfileInstallerProvider.instance.uninstallMod(manifest, profile);
-                    const profileInstallResult = await ProfileInstallerProvider.instance.installMod(manifest, profile);
-                    if (profileInstallResult instanceof R2Error) {
-                        callback(false, profileInstallResult);
-                        return Promise.resolve();
-                    }
-                    const modListInstallResult = await ProfileModList.addMod(manifest, profile);
-                    if (modListInstallResult instanceof R2Error) {
-                        callback(false, modListInstallResult);
-                        return Promise.resolve();
-                    }
-                    callback(true, null);
-                    return Promise.resolve();
-                }
-            }
-        );
+
+        try {
+            await ZipExtract.extractOnly(zipFile, cacheDirectory);
+        } catch (e) {
+            callback(false, R2Error.fromThrownValue(e, `Extracting ${zipFile} failed`));
+            return Promise.resolve();
+        }
+
+        try {
+            await this.writeManifestToCache(cacheDirectory, manifest);
+        } catch (e) {
+            callback(false, R2Error.fromThrownValue(e));
+            return Promise.resolve();
+        }
+
+        await ProfileInstallerProvider.instance.uninstallMod(manifest, profile);
+        const profileInstallResult = await ProfileInstallerProvider.instance.installMod(manifest, profile);
+        if (profileInstallResult instanceof R2Error) {
+            callback(false, profileInstallResult);
+            return Promise.resolve();
+        }
+        const modListInstallResult = await ProfileModList.addMod(manifest, profile);
+        if (modListInstallResult instanceof R2Error) {
+            callback(false, modListInstallResult);
+            return Promise.resolve();
+        }
+        callback(true, null);
+        return Promise.resolve();
     }
 
     public async placeFileInCache(profile: ImmutableProfile, file: string, manifest: ManifestV2, callback: (success: boolean, error: (R2Error | null)) => void) {
diff --git a/src/r2mm/installing/ZipExtract.ts b/src/r2mm/installing/ZipExtract.ts
index cfb735ec4..f32f6e16d 100644
--- a/src/r2mm/installing/ZipExtract.ts
+++ b/src/r2mm/installing/ZipExtract.ts
@@ -9,61 +9,46 @@ export default class ZipExtract {
 
     public static async extractAndDelete(zipFolder: string, filename: string, outputFolderName: string, callback: (success: boolean, error?: R2Error) => void): Promise<void> {
         const fs = FsProvider.instance;
-        return await this.extractOnly(path.join(zipFolder, filename), path.join(zipFolder, outputFolderName), async (result, err?) => {
-            if (result) {
-                try {
-                    await fs.unlink(path.join(zipFolder, filename));
-                    callback(result);
-                } catch (e) {
-                    const err: Error = e as Error;
-                    callback(result, new FileWriteError(
-                        'Failed to delete file',
-                        err.message,
-                        null
-                    ));
-                }
-            } else {
-                try {
-                    // Clear from cache as failed.
-                    await FileUtils.emptyDirectory(path.join(zipFolder, outputFolderName));
-                    await fs.rmdir(path.join(zipFolder, outputFolderName));
-                    await fs.unlink(path.join(zipFolder, filename));
-                    if (err !== undefined) {
-                        if (err instanceof R2Error) {
-                            callback(result, err);
-                        } else {
-                            throw err;
-                        }
-                    }
-                } catch (e) {
-                    // Cleanup might also fail e.g. for too long file paths on TSMM.
-                    // Show the original error instead of the one caused by the cleanup,
-                    // as the former is probably more informative for debugging.
-                    if (err) {
-                        callback(false, FileWriteError.fromThrownValue(err));
-                        return;
-                    }
+        const source = path.join(zipFolder, filename);
+        const destination = path.join(zipFolder, outputFolderName);
 
-                    callback(result, new FileWriteError(
-                        'Failed to extract zip',
-                        (e as Error).message,
-                        'Try to re-download the mod. If the issue persists, ask for help in the Thunderstore modding discord.'
-                    ));
-                }
+        try {
+            await this.extractOnly(source, destination);
+        } catch (originalError) {
+            try {
+                await FileUtils.emptyDirectory(destination);
+                await fs.rmdir(destination);
+                await fs.unlink(source);
+            } catch (cleanupError) {
+                // Cleanup might also fail e.g. for too long file paths on TSMM.
+                // Show the original error instead of the one caused by the cleanup,
+                // as the former is probably more informative for debugging.
+            } finally {
+                callback(false, FileWriteError.fromThrownValue(
+                    originalError instanceof R2Error ? originalError.message : `${originalError}`,
+                    `Failed to extract ${source}`,
+                    'Try to re-download the mod. If the issue persists, ask for help in the Thunderstore modding discord.'
+                ));
+                return;
             }
-        });
+        }
+
+        try {
+            await fs.unlink(source);
+        } catch (e) {
+            callback(false, FileWriteError.fromThrownValue(e, `Failed to delete ${source} after extraction`));
+            return;
+        }
+
+        callback(true);
     }
 
-    public static async extractOnly(zip: string, outputFolder: string, callback: (success: boolean, error?: Error) => void): Promise<void> {
+    public static async extractOnly(zip: string, outputFolder: string): Promise<void> {
         try {
             await ZipProvider.instance.extractAllTo(zip, outputFolder);
-            callback(true);
         } catch (e) {
             console.log("extractOnly failed:", e);
-            callback(false, new R2Error("Extraction failed", (e as Error).message, null));
+            throw R2Error.fromThrownValue(e, `Extracting ${zip} failed`);
         }
     }
-
-
-
 }

From f8147e73f351101ec2c61cb85e50b16cfe359694 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Thu, 12 Dec 2024 13:43:00 +0200
Subject: [PATCH 19/95] Remove callbacks from LocalModInstallerProvider methods

---
 .../importing/LocalFileImportModal.vue        | 32 +++++-----
 .../installing/LocalModInstallerProvider.ts   |  5 +-
 src/r2mm/installing/LocalModInstaller.ts      | 60 ++++++-------------
 3 files changed, 34 insertions(+), 63 deletions(-)

diff --git a/src/components/importing/LocalFileImportModal.vue b/src/components/importing/LocalFileImportModal.vue
index b35027c98..0482e3254 100644
--- a/src/components/importing/LocalFileImportModal.vue
+++ b/src/components/importing/LocalFileImportModal.vue
@@ -244,7 +244,7 @@ export default class LocalFileImportModal extends Vue {
         this.$emit("close-modal");
     }
 
-    private importFile() {
+    private async importFile() {
         if (this.fileToImport === null) {
             return;
         }
@@ -294,27 +294,25 @@ export default class LocalFileImportModal extends Vue {
         this.resultingManifest.setDescription(this.modDescription.trim());
         this.resultingManifest.setAuthorName(this.modAuthor.trim());
 
-        const installCallback = (async (success: boolean, error: any | null) => {
-            if (!success && error !== null) {
-                this.$store.commit("error/handleError", R2Error.fromThrownValue(error));
-                return;
-            }
-            const updatedModListResult = await ProfileModList.getModList(profile);
-            if (updatedModListResult instanceof R2Error) {
-                this.$store.commit("error/handleError", updatedModListResult);
-                return;
+        try {
+            if (this.fileToImport.endsWith(".zip")) {
+                await LocalModInstallerProvider.instance.extractToCacheWithManifestData(profile, this.fileToImport, this.resultingManifest);
+            } else {
+                await LocalModInstallerProvider.instance.placeFileInCache(profile, this.fileToImport, this.resultingManifest);
             }
-            await this.$store.dispatch("profile/updateModList", updatedModListResult);
-            this.emitClose();
-        });
+        } catch (e) {
+            this.$store.commit("error/handleError", R2Error.fromThrownValue(e));
+            return;
+        }
 
-        if (this.fileToImport.endsWith(".zip")) {
-            LocalModInstallerProvider.instance.extractToCacheWithManifestData(profile, this.fileToImport, this.resultingManifest, installCallback);
+        const updatedModListResult = await ProfileModList.getModList(profile);
+        if (updatedModListResult instanceof R2Error) {
+            this.$store.commit("error/handleError", updatedModListResult);
         } else {
-            LocalModInstallerProvider.instance.placeFileInCache(profile, this.fileToImport, this.resultingManifest, installCallback);
+            await this.$store.dispatch("profile/updateModList", updatedModListResult);
+            this.emitClose();
         }
     }
-
 }
 
 interface ImportFieldAttributes {
diff --git a/src/providers/ror2/installing/LocalModInstallerProvider.ts b/src/providers/ror2/installing/LocalModInstallerProvider.ts
index 5084c37fa..4c6f60b0c 100644
--- a/src/providers/ror2/installing/LocalModInstallerProvider.ts
+++ b/src/providers/ror2/installing/LocalModInstallerProvider.ts
@@ -1,5 +1,4 @@
 import ProviderUtils from '../../generic/ProviderUtils';
-import R2Error from '../../../model/errors/R2Error';
 import { ImmutableProfile } from '../../../model/Profile';
 import ManifestV2 from '../../../model/ManifestV2';
 
@@ -25,7 +24,7 @@ export default abstract class LocalModInstallerProvider {
      * @param zipFile   Path to the zip file.
      * @param callback  Callback to report if the extraction was successful.
      */
-    public abstract extractToCacheWithManifestData(profile: ImmutableProfile, zipFile: string, manifest: ManifestV2, callback: (success: boolean, error: R2Error | null) => void): Promise<void>;
-    public abstract placeFileInCache(profile: ImmutableProfile, file: string, manifest: ManifestV2, callback: (success: boolean, error: R2Error | null) => void): Promise<void>;
+    public abstract extractToCacheWithManifestData(profile: ImmutableProfile, zipFile: string, manifest: ManifestV2): Promise<void>;
+    public abstract placeFileInCache(profile: ImmutableProfile, file: string, manifest: ManifestV2): Promise<void>;
 
 }
diff --git a/src/r2mm/installing/LocalModInstaller.ts b/src/r2mm/installing/LocalModInstaller.ts
index 7d4682715..124a314ba 100644
--- a/src/r2mm/installing/LocalModInstaller.ts
+++ b/src/r2mm/installing/LocalModInstaller.ts
@@ -42,59 +42,33 @@ export default class LocalModInstaller extends LocalModInstallerProvider {
         await FsProvider.instance.writeFile(manifestPath, JSON.stringify(manifest));
     }
 
-    public async extractToCacheWithManifestData(profile: ImmutableProfile, zipFile: string, manifest: ManifestV2, callback: (success: boolean, error: R2Error | null) => void) {
+    public async extractToCacheWithManifestData(profile: ImmutableProfile, zipFile: string, manifest: ManifestV2) {
         const cacheDirectory: string = await this.initialiseCacheDirectory(manifest);
-
-        try {
-            await ZipExtract.extractOnly(zipFile, cacheDirectory);
-        } catch (e) {
-            callback(false, R2Error.fromThrownValue(e, `Extracting ${zipFile} failed`));
-            return Promise.resolve();
-        }
-
-        try {
-            await this.writeManifestToCache(cacheDirectory, manifest);
-        } catch (e) {
-            callback(false, R2Error.fromThrownValue(e));
-            return Promise.resolve();
-        }
-
+        await ZipExtract.extractOnly(zipFile, cacheDirectory);
+        await this.writeManifestToCache(cacheDirectory, manifest);
         await ProfileInstallerProvider.instance.uninstallMod(manifest, profile);
-        const profileInstallResult = await ProfileInstallerProvider.instance.installMod(manifest, profile);
-        if (profileInstallResult instanceof R2Error) {
-            callback(false, profileInstallResult);
-            return Promise.resolve();
-        }
-        const modListInstallResult = await ProfileModList.addMod(manifest, profile);
-        if (modListInstallResult instanceof R2Error) {
-            callback(false, modListInstallResult);
-            return Promise.resolve();
-        }
-        callback(true, null);
-        return Promise.resolve();
+        throwForR2Error(await ProfileInstallerProvider.instance.installMod(manifest, profile));
+        throwForR2Error(await ProfileModList.addMod(manifest, profile));
     }
 
-    public async placeFileInCache(profile: ImmutableProfile, file: string, manifest: ManifestV2, callback: (success: boolean, error: (R2Error | null)) => void) {
+    public async placeFileInCache(profile: ImmutableProfile, file: string, manifest: ManifestV2) {
         try {
             const cacheDirectory: string = await this.initialiseCacheDirectory(manifest);
             const fileSafe = file.split("\\").join("/");
             await FsProvider.instance.copyFile(fileSafe, path.join(cacheDirectory, path.basename(fileSafe)));
             await this.writeManifestToCache(cacheDirectory, manifest);
-            await ProfileInstallerProvider.instance.uninstallMod(manifest, profile);
-            const profileInstallResult = await ProfileInstallerProvider.instance.installMod(manifest, profile);
-            if (profileInstallResult instanceof R2Error) {
-                callback(false, profileInstallResult);
-                return Promise.resolve();
-            }
-            const modListInstallResult = await ProfileModList.addMod(manifest, profile);
-            if (modListInstallResult instanceof R2Error) {
-                callback(false, modListInstallResult);
-                return Promise.resolve();
-            }
-            callback(true, null);
-            return Promise.resolve();
         } catch (e) {
-            callback(false, new R2Error("Error moving file to cache", (e as Error).message, null));
+            throw R2Error.fromThrownValue(e, "Error moving file to cache");
         }
+
+        await ProfileInstallerProvider.instance.uninstallMod(manifest, profile);
+        throwForR2Error(await ProfileInstallerProvider.instance.installMod(manifest, profile));
+        throwForR2Error(await ProfileModList.addMod(manifest, profile));
+    }
+}
+
+function throwForR2Error(maybeError: unknown) {
+    if (maybeError instanceof R2Error) {
+        throw maybeError;
     }
 }

From 9057fa905fbc049c8f0ea0543a02b2a38bd8f306 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Thu, 12 Dec 2024 13:47:45 +0200
Subject: [PATCH 20/95] DRY throwForR2Error

---
 src/model/errors/R2Error.ts              | 9 +++++++++
 src/r2mm/installing/LocalModInstaller.ts | 8 +-------
 src/utils/ProfileUtils.ts                | 8 +-------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/model/errors/R2Error.ts b/src/model/errors/R2Error.ts
index 8d8a734f6..fafaf3626 100644
--- a/src/model/errors/R2Error.ts
+++ b/src/model/errors/R2Error.ts
@@ -27,3 +27,12 @@ export default class R2Error extends Error {
         }
     }
 }
+
+/**
+ * Throws the given value if it's an instance of R2Error.
+ */
+export function throwForR2Error(maybeError: unknown) {
+    if (maybeError instanceof R2Error) {
+        throw maybeError;
+    }
+}
diff --git a/src/r2mm/installing/LocalModInstaller.ts b/src/r2mm/installing/LocalModInstaller.ts
index 124a314ba..ad3f09d08 100644
--- a/src/r2mm/installing/LocalModInstaller.ts
+++ b/src/r2mm/installing/LocalModInstaller.ts
@@ -1,4 +1,4 @@
-import R2Error from '../../model/errors/R2Error';
+import R2Error, { throwForR2Error } from '../../model/errors/R2Error';
 import ManifestV2 from '../../model/ManifestV2';
 import ProfileInstallerProvider from '../../providers/ror2/installing/ProfileInstallerProvider';
 import ZipExtract from './ZipExtract';
@@ -66,9 +66,3 @@ export default class LocalModInstaller extends LocalModInstallerProvider {
         throwForR2Error(await ProfileModList.addMod(manifest, profile));
     }
 }
-
-function throwForR2Error(maybeError: unknown) {
-    if (maybeError instanceof R2Error) {
-        throw maybeError;
-    }
-}
diff --git a/src/utils/ProfileUtils.ts b/src/utils/ProfileUtils.ts
index 7700227c1..cff401479 100644
--- a/src/utils/ProfileUtils.ts
+++ b/src/utils/ProfileUtils.ts
@@ -3,7 +3,7 @@ import path from "path";
 import * as yaml from "yaml";
 
 import FileUtils from "./FileUtils";
-import R2Error from "../model/errors/R2Error";
+import R2Error, { throwForR2Error } from "../model/errors/R2Error";
 import ExportFormat from "../model/exports/ExportFormat";
 import ExportMod from "../model/exports/ExportMod";
 import Game from "../model/game/Game";
@@ -219,9 +219,3 @@ export async function readProfileFile(file: string): Promise<string> {
     }
     return read;
 }
-
-function throwForR2Error(maybeError: unknown) {
-    if (maybeError instanceof R2Error) {
-        throw maybeError;
-    }
-}

From e786684e4f623780e5985ed2a32300d8e3d93609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Fri, 20 Dec 2024 14:54:03 +0200
Subject: [PATCH 21/95] Remove outdated help text

---
 src/components/settings-components/SettingsView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/settings-components/SettingsView.vue b/src/components/settings-components/SettingsView.vue
index 7e776ec2b..48137cdf7 100644
--- a/src/components/settings-components/SettingsView.vue
+++ b/src/components/settings-components/SettingsView.vue
@@ -331,7 +331,7 @@ import CdnProvider from '../../providers/generic/connection/CdnProvider';
             new SettingsRow(
               'Other',
               'Change game',
-              'Change the current game (restarts the manager)',
+              'Change the current game',
               async () => "",
                 'fa-gamepad',
                 async () => {

From c24188a9f3b776f90a698ad00252554359fc6685 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Thu, 31 Oct 2024 14:02:44 +0200
Subject: [PATCH 22/95] Reduce time spent on the splash screen

Users may want to get to the manager screen quickly so they can just
launch the game with existing mods. Having to wait for the latest mod
list update can be frustrating.

Splash screen now only checks the API for a fresh list if no local
cache is found at all. Handling different error scenarios is also
omitted, and user is moved to profile selection screen even if no mod
list can be loaded. Error screen offering a chance to retry loading
the mod list is dropped. The idea is that the background update or a
manually triggered mod list update will handle the mod list eventually.

Note that the changes only affect the splash screen. Background updates
still work the same way they did before.

In the future the splash screen can be hastened even further e.g. by
handling the loading of the exclusion list in the background and
reducing the timeouts/retry attempts of the API calls.
---
 src/components/mixins/SplashMixin.vue | 111 ++++++++++++--------------
 src/pages/Splash.vue                  |  17 ----
 src/store/modules/TsModsModule.ts     |   5 ++
 3 files changed, 58 insertions(+), 75 deletions(-)

diff --git a/src/components/mixins/SplashMixin.vue b/src/components/mixins/SplashMixin.vue
index bad81f5c2..4b047b957 100644
--- a/src/components/mixins/SplashMixin.vue
+++ b/src/components/mixins/SplashMixin.vue
@@ -2,7 +2,6 @@
 import Vue from 'vue';
 import Component from 'vue-class-component';
 
-import R2Error from '../../model/errors/R2Error';
 import RequestItem from '../../model/requests/RequestItem';
 import type { PackageListChunks, PackageListIndex } from '../../store/modules/TsModsModule';
 
@@ -11,7 +10,6 @@ import type { PackageListChunks, PackageListIndex } from '../../store/modules/Ts
 export default class SplashMixin extends Vue {
     heroTitle = '';
     heroType: string = 'primary';
-    isOffline = false;
     loadingText = '';
     requests: RequestItem[] = [];
 
@@ -54,32 +52,49 @@ export default class SplashMixin extends Vue {
         await this._getThunderstoreMods();
     }
 
-    // Get the list of Thunderstore mods from API or local cache.
+    // Get the list of Thunderstore mods from local cache or API.
     async _getThunderstoreMods() {
-        const packageListIndex = await this.fetchPackageListIndex();
-        const packageListChunks = await this.fetchPackageListChunksIfUpdated(packageListIndex);
-        this.getRequestItem('ThunderstoreDownload').setProgress(100);
-        await this.writeModsToPersistentCacheIfUpdated(packageListIndex, packageListChunks);
-        const isModListLoaded = await this.readModsToVuex();
-
-        // To proceed, the loading of the mod list should result in a non-empty list.
-        // Empty list is allowed if that's actually what the API returned.
-        // API wasn't queried at all if we already had the latest index chunk.
-        const modListHasMods = this.$store.state.tsMods.mods.length;
-        const apiReturnedEmptyList = packageListChunks && packageListChunks[0].length === 0;
-        const apiWasNotQueried = packageListIndex && packageListIndex.isLatest;
-        if (isModListLoaded && (modListHasMods || apiReturnedEmptyList || apiWasNotQueried)) {
-            await this.moveToNextScreen();
-        } else {
-            this.heroTitle = 'Failed to get the list of online mods';
-            this.loadingText = 'You may still use the manager offline, but some features might be unavailable.';
-            this.isOffline = true;
+        const hasPriorCache = await this.doesGameHaveLocalCache();
+        let hasUpdatedCache = false;
+
+        if (!hasPriorCache) {
+            const packageListIndex = await this.fetchPackageListIndex();
+            const packageListChunks = await this.fetchPackageListChunksIfUpdated(packageListIndex);
+            this.getRequestItem('ThunderstoreDownload').setProgress(100);
+            hasUpdatedCache = await this.writeModsToPersistentCacheIfUpdated(packageListIndex, packageListChunks);
         }
+
+        if (hasPriorCache || hasUpdatedCache) {
+            await this.triggerStoreModListUpdate();
+        }
+
+        await this.moveToNextScreen();
+    }
+
+    /***
+     * Query IndexedDB for an existing version of package list.
+     */
+    async doesGameHaveLocalCache(): Promise<boolean> {
+        this.loadingText = 'Checking for mod list in local cache';
+        let hasCache = false;
+
+        try {
+            hasCache = await this.$store.dispatch('tsMods/gameHasCachedModList');
+        } catch (e) {
+            console.error('SplashMixin failed to check mod list in local cache', e);
+        }
+
+        if (hasCache) {
+            this.getRequestItem('ThunderstoreDownload').setProgress(100);
+            this.getRequestItem('CacheOperations').setProgress(50);
+            this.loadingText = 'Processing the mod list from cache';
+        }
+
+        return hasCache;
     }
 
     /***
      * Query Thunderstore API for the URLs pointing to parts of the package list.
-     * Fails silently to fallback reading the old values from the IndexedDB cache.
      */
     async fetchPackageListIndex(): Promise<PackageListIndex|undefined> {
         this.loadingText = 'Checking for mod list updates from Thunderstore';
@@ -94,12 +109,10 @@ export default class SplashMixin extends Vue {
 
     /***
      * Load the package list in chunks pointed out by the packageListIndex.
-     * This step is skipped if we can't or don't need to load the chunks.
-     * Fails silently to fallback reading the old values from the IndexedDB cache.
      */
     async fetchPackageListChunksIfUpdated(packageListIndex?: PackageListIndex): Promise<PackageListChunks|undefined> {
-        // Skip loading chunks if loading index failed, or if we already have the latest data.
-        if (!packageListIndex || packageListIndex.isLatest) {
+        // Skip loading chunks if loading index failed.
+        if (!packageListIndex) {
             return undefined;
         }
 
@@ -121,10 +134,12 @@ export default class SplashMixin extends Vue {
 
     /***
      * Update a fresh package list to the IndexedDB cache.
-     * Done only if there was a fresh list to load and it was loaded successfully.
-     * Fails silently to fallback reading the old values from the IndexedDB cache.
+     * Done only if a fresh list was loaded successfully from the API.
      */
-    async writeModsToPersistentCacheIfUpdated(packageListIndex?: PackageListIndex, packageListChunks?: PackageListChunks) {
+    async writeModsToPersistentCacheIfUpdated(
+        packageListIndex?: PackageListIndex,
+        packageListChunks?: PackageListChunks
+    ): Promise<boolean> {
         if (packageListIndex && packageListChunks) {
             this.loadingText = 'Storing the mod list into local cache';
 
@@ -133,52 +148,32 @@ export default class SplashMixin extends Vue {
                     'tsMods/updatePersistentCache',
                     {indexHash: packageListIndex.hash, chunks: packageListChunks}
                 );
+
+                this.loadingText = 'Processing the mod list';
+                this.getRequestItem('CacheOperations').setProgress(50);
+                return true;
             } catch (e) {
                 console.error('SplashMixin failed to cache mod list locally.', e);
             }
-
-            this.loadingText = 'Processing the mod list';
-        } else {
-            this.loadingText = 'Processing the mod list from cache';
         }
 
-        this.getRequestItem('CacheOperations').setProgress(50);
+        return false;
     }
 
     /***
-     * Read mod list from the IndexedDB cache to Vuex so it's kept in memory.
-     * Always read from the IndexedDB since we don't know if the mod list was
-     * queried from the API successfully or not. This also handles the type
-     * casting, since mod manager expects the data to be formatted into objects.
-     *
-     * Failure at this point is no longer silently ignored, instead an error
-     * modal is shown.
-     *
-     * Return value is used to tell whether Vuex might contain an empty list
-     * after calling this because there was an error, or because the package
-     * list is actually empty.
+     * Triggers Vuex store to read and parse the mod list from the
+     * IndexedDB cache and to store it in memory.
      */
-    async readModsToVuex(): Promise<boolean> {
-        let isModListLoaded = false;
-
+    async triggerStoreModListUpdate(): Promise<void> {
         try {
             await this.$store.dispatch('tsMods/updateMods');
-            isModListLoaded = true;
         } catch (e) {
-            this.$store.commit(
-                'error/handleError',
-                R2Error.fromThrownValue(e, `${this.loadingText} failed`)
-            );
+            console.error('Updating the store mod list by SplashMixin failed.', e);
         } finally {
             this.getRequestItem('CacheOperations').setProgress(100);
-            return isModListLoaded;
         }
     }
 
-    async continueOffline() {
-        await this.moveToNextScreen();
-    }
-
     async moveToNextScreen() {
         this.$router.push({name: 'profiles'});
     }
diff --git a/src/pages/Splash.vue b/src/pages/Splash.vue
index 093d4f48e..cd3c839f5 100644
--- a/src/pages/Splash.vue
+++ b/src/pages/Splash.vue
@@ -5,7 +5,6 @@
             <p>Game updates may break mods. If a new update has been released, please be patient.</p>
         </div>
         <progress-bar
-            v-if="!isOffline"
             :max='requests.length * 100'
             :value='reduceRequests().getProgress() > 0 ? reduceRequests().getProgress() : undefined'
             :className='[reduceRequests().getProgress() > 0 ? "is-info" : ""]' />
@@ -25,16 +24,6 @@
                 </aside>
             </div>
             <div class='column is-three-quarters'>
-                <div class='container'>
-                    <br />
-                    <nav class='level' v-if='isOffline'>
-                        <div class='level-item'>
-                            <a class='button is-info margin-right margin-right--half-width' @click='continueOffline()'>Continue offline</a>
-                            <a class='button' @click='retryConnection()'>Try to reconnect</a>
-                        </div>
-                        <br /><br />
-                    </nav>
-                </div>
                 <div>
                     <article class='media'>
                         <div class='media-content'>
@@ -197,12 +186,6 @@ export default class Splash extends mixins(SplashMixin) {
         this.$router.push({name: 'profiles'});
     }
 
-    retryConnection() {
-        this.resetRequestProgresses();
-        this.isOffline = false;
-        this.checkForUpdates();
-    }
-
     private async ensureWrapperInGameFolder() {
         const wrapperName = process.platform === 'darwin' ? 'macos_proxy' : 'linux_wrapper.sh';
         const activeGame: Game = this.$store.state.activeGame;
diff --git a/src/store/modules/TsModsModule.ts b/src/store/modules/TsModsModule.ts
index 5e2293d06..76110f2b6 100644
--- a/src/store/modules/TsModsModule.ts
+++ b/src/store/modules/TsModsModule.ts
@@ -212,6 +212,11 @@ export const TsModsModule = {
             return chunks;
         },
 
+        async gameHasCachedModList({rootState}): Promise<boolean> {
+            const updated = await PackageDb.getLastPackageListUpdateTime(rootState.activeGame.internalFolderName);
+            return updated !== undefined;
+        },
+
         async prewarmCache({getters, rootGetters}) {
             const profileMods: ManifestV2[] = rootGetters['profile/modList'];
             profileMods.forEach(getters['cachedMod']);

From ebd0ced850e37c5921bb88c8b53d16c7f0db5540 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Thu, 14 Nov 2024 11:14:08 +0200
Subject: [PATCH 23/95] Add ModListUpdateBanner

The banner will show on top of an empty online mod list, explaining
that the list is empty because splash screen failed to load it. A
one-click option for trying to update the mod list is offered.

This change is adjustment to the fact that the splash screen no longer
stops on errors and user is more likely to reach the manager view with
no mod list loaded into Vuex.
---
 src/components/ModListUpdateBanner.vue | 73 ++++++++++++++++++++++++++
 src/components/views/OnlineModView.vue |  3 ++
 2 files changed, 76 insertions(+)
 create mode 100644 src/components/ModListUpdateBanner.vue

diff --git a/src/components/ModListUpdateBanner.vue b/src/components/ModListUpdateBanner.vue
new file mode 100644
index 000000000..81a60dbe0
--- /dev/null
+++ b/src/components/ModListUpdateBanner.vue
@@ -0,0 +1,73 @@
+<script lang="ts">
+import { mixins } from 'vue-class-component';
+import { Component, Watch } from 'vue-property-decorator';
+
+import UtilityMixin from './mixins/UtilityMixin.vue';
+
+@Component({})
+export default class ModListUpdateBanner extends mixins(UtilityMixin) {
+    updateError = '';
+
+    get isModListLoaded(): boolean {
+        return this.$store.state.tsMods.modsLastUpdated !== undefined;
+    }
+
+    get isUpdateInProgress(): boolean {
+        return this.$store.state.tsMods.isBackgroundUpdateInProgress;
+    }
+
+    @Watch('isUpdateInProgress')
+    onLoadingProgressChange(newVal: boolean, oldVal: boolean) {
+        // React to background update as well as the manual update from the banner.
+        if (!oldVal && newVal) {
+            this.updateError = '';
+        }
+    }
+
+    async updateModList() {
+        if (this.isUpdateInProgress) {
+            return;
+        }
+
+        this.$store.commit('tsMods/startBackgroundUpdate');
+        this.updateError = '';
+
+        try {
+            // Invalidate hash to force a refresh. Otherwise a scenario where
+            // the latest index hash is already present in IndexedDB but loading
+            // the package list into Vuex store has failed would cause the banner
+            // to just disappear when refreshThunderstoreModList skips the actual
+            // update but updates the timestamp of the hash.
+            await this.$store.dispatch('tsMods/updateIndexHash', 'invalidated');
+            await this.refreshThunderstoreModList();
+        } catch (e) {
+            this.updateError = `${e}`;
+        } finally {
+            this.$store.commit('tsMods/finishBackgroundUpdate');
+        }
+    }
+}
+</script>
+
+<template>
+    <div v-if="!isModListLoaded" id="mod-list-update-banner" class="margin-bottom">
+        <div class="notification is-warning margin-right">
+            <span v-if="isUpdateInProgress">
+                Updating mod list from Thunderstore...
+            </span>
+            <span v-else-if="updateError">
+                Error updating the mod list: {{ updateError }}<br />
+                The manager will keep trying to update the mod list in the background.
+            </span>
+            <span v-else>
+                An error occurred when updating the mod list from Thunderstore.
+                Would you like to
+                <a @click="updateModList">try again now</a>?
+            </span>
+        </div>
+    </div>
+</template>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/src/components/views/OnlineModView.vue b/src/components/views/OnlineModView.vue
index ec0ce555a..cba936a23 100644
--- a/src/components/views/OnlineModView.vue
+++ b/src/components/views/OnlineModView.vue
@@ -43,6 +43,7 @@
                 </div>
             </div>
         </div>
+        <ModListUpdateBanner />
         <OnlineModList
             :local-mod-list="localModList"
             :paged-mod-list="pagedThunderstoreModList"
@@ -78,10 +79,12 @@ import OnlineModListProvider from '../../providers/components/loaders/OnlineModL
 import SearchUtils from '../../utils/SearchUtils';
 import PaginationButtons from "../navigation/PaginationButtons.vue";
 import { DeferredInput } from "../all";
+import ModListUpdateBanner from "../ModListUpdateBanner.vue";
 
 @Component({
     components: {
         DeferredInput,
+        ModListUpdateBanner,
         OnlineModList: OnlineModListProvider.provider,
         PaginationButtons,
     }

From 01d278c5978becb6a0707b7bf45dbf0610f1a085 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Thu, 14 Nov 2024 14:56:05 +0200
Subject: [PATCH 24/95] Update package exclusion list in Splash screen only if
 it's needed

Exclusions are only needed to filter the package list read from API
before it's stored into IndexedDB. If the package list update is
skipped to get the user quickly into profile select view, we might
as well defer the update of exclusion list to when it's actually
needed.
---
 src/components/mixins/SplashMixin.vue | 37 +++++++++++++++++----------
 src/pages/Splash.vue                  |  1 -
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/components/mixins/SplashMixin.vue b/src/components/mixins/SplashMixin.vue
index 4b047b957..7cf596e8e 100644
--- a/src/components/mixins/SplashMixin.vue
+++ b/src/components/mixins/SplashMixin.vue
@@ -33,20 +33,6 @@ export default class SplashMixin extends Vue {
         this.requests.forEach((request) => request.setProgress(0));
     }
 
-    // Get the list of game-specific packages to exclude.
-    async getExclusions() {
-        this.loadingText = 'Connecting to GitHub repository';
-
-        const showProgress = (progress: number) => {
-            this.loadingText = 'Downloading exclusions';
-            this.getRequestItem('ExclusionsList').setProgress(progress);
-        };
-
-        await this.$store.dispatch('tsMods/updateExclusions', showProgress);
-
-        this.getRequestItem('ExclusionsList').setProgress(100);
-    }
-
     // Wrapper to allow TSMM to inject telemetry gathering.
     async getThunderstoreMods() {
         await this._getThunderstoreMods();
@@ -61,9 +47,13 @@ export default class SplashMixin extends Vue {
             const packageListIndex = await this.fetchPackageListIndex();
             const packageListChunks = await this.fetchPackageListChunksIfUpdated(packageListIndex);
             this.getRequestItem('ThunderstoreDownload').setProgress(100);
+            await this.updateExclusionsIfNeeded(packageListIndex, packageListChunks);
             hasUpdatedCache = await this.writeModsToPersistentCacheIfUpdated(packageListIndex, packageListChunks);
         }
 
+        this.getRequestItem('ThunderstoreDownload').setProgress(100);
+        this.getRequestItem('ExclusionsList').setProgress(100);
+
         if (hasPriorCache || hasUpdatedCache) {
             await this.triggerStoreModListUpdate();
         }
@@ -132,6 +122,25 @@ export default class SplashMixin extends Vue {
         }
     }
 
+    /***
+     * Update community specific mod exclusion list into Vuex.
+     * This is needed only if we are about to update the package list into IndedexDB.
+     */
+    async updateExclusionsIfNeeded(
+        packageListIndex?: PackageListIndex,
+        packageListChunks?: PackageListChunks
+    ) {
+        if (packageListIndex && packageListChunks) {
+            const showProgress = (progress: number) => {
+                this.loadingText = 'Updating mod exclusion list';
+                this.getRequestItem('ExclusionsList').setProgress(progress);
+            };
+            await this.$store.dispatch('tsMods/updateExclusions', showProgress);
+        }
+
+        this.getRequestItem('ExclusionsList').setProgress(100);
+    }
+
     /***
      * Update a fresh package list to the IndexedDB cache.
      * Done only if a fresh list was loaded successfully from the API.
diff --git a/src/pages/Splash.vue b/src/pages/Splash.vue
index cd3c839f5..d26ba572c 100644
--- a/src/pages/Splash.vue
+++ b/src/pages/Splash.vue
@@ -158,7 +158,6 @@ export default class Splash extends mixins(SplashMixin) {
         this.loadingText = 'Preparing';
         ipcRenderer.once('update-done', async () => {
             this.getRequestItem('UpdateCheck').setProgress(100);
-            await this.getExclusions();
             await this.getThunderstoreMods();
         });
         ipcRenderer.send('update-app');

From ff560ffa7c2b2174a856be0356325acd8f55d96b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Thu, 14 Nov 2024 14:59:07 +0200
Subject: [PATCH 25/95] Fix an issue with exclusion list not getting updated
 when needed

When updating the persistent cache, a sanity check ensured the
exclusion list loaded before trying to use it. However, as an empty
array was used as the default value (and the value used when the store
was reset), the sanity check never triggered.

It's unlikely this has caused issues before, as the exclusion list
should've always been updated before updating the persistent cache.
This however changed when Splash screen was changed to skip unnecessary
steps to get the user to profile selection screen faster.
---
 src/store/modules/TsModsModule.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/store/modules/TsModsModule.ts b/src/store/modules/TsModsModule.ts
index 76110f2b6..754e0bb47 100644
--- a/src/store/modules/TsModsModule.ts
+++ b/src/store/modules/TsModsModule.ts
@@ -53,7 +53,7 @@ export const TsModsModule = {
         connectionError: '',
         deprecated: new Map<string, boolean>(),
         /*** Packages available through API that should be ignored by the manager */
-        exclusions: [],
+        exclusions: undefined,
         /*** Mod list is automatically and periodically updated in the background */
         isBackgroundUpdateInProgress: false,
         /*** All mods available through API for the current active game */
@@ -121,7 +121,7 @@ export const TsModsModule = {
             state.cache = new Map<string, CachedMod>();
             state.connectionError = '';
             state.deprecated = new Map<string, boolean>();
-            state.exclusions = [];
+            state.exclusions = undefined;
             state.mods = [];
             state.modsLastUpdated = undefined;
         },
@@ -248,6 +248,8 @@ export const TsModsModule = {
             {dispatch, rootState, state},
             {chunks, indexHash}: {chunks: PackageListChunks, indexHash: string}
         ) {
+            // Splash screen skipped this if there was no need to update the
+            // package list. It may be needed later by e.g. the background update.
             if (state.exclusions === undefined) {
                 await dispatch('updateExclusions');
             }

From 5247708aead4fe66cb7aac90c2be765d99c16843 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Mon, 25 Nov 2024 15:49:27 +0200
Subject: [PATCH 26/95] Rename method and attributes to make their usage
 clearer

---
 src/App.vue                            |  2 +-
 src/components/mixins/UtilityMixin.vue | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index b7f47824c..f8ce1919f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -61,7 +61,7 @@ export default class App extends mixins(UtilityMixin) {
         // Load settings using the default game before the actual game is selected.
         const settings: ManagerSettings = await this.$store.dispatch('resetActiveGame');
 
-        this.hookThunderstoreModListRefresh();
+        this.hookBackgroundUpdateThunderstoreModList();
         await this.checkCdnConnection();
 
         InstallationRuleApplicator.apply();
diff --git a/src/components/mixins/UtilityMixin.vue b/src/components/mixins/UtilityMixin.vue
index 32f2fd657..f4d023a6a 100644
--- a/src/components/mixins/UtilityMixin.vue
+++ b/src/components/mixins/UtilityMixin.vue
@@ -9,10 +9,10 @@ import { PackageListIndex } from '../../store/modules/TsModsModule';
 @Component
 export default class UtilityMixin extends Vue {
     readonly REFRESH_INTERVAL = 5 * 60 * 1000;
-    private tsRefreshFailed = false;
+    private tsBackgroundRefreshFailed = false;
 
-    hookThunderstoreModListRefresh() {
-        setInterval(this.tryRefreshThunderstoreModList, this.REFRESH_INTERVAL);
+    hookBackgroundUpdateThunderstoreModList() {
+        setInterval(this.backgroundRefreshThunderstoreModList, this.REFRESH_INTERVAL);
     }
 
     // Wrapper to allow TSMM to inject telemetry gathering.
@@ -42,12 +42,14 @@ export default class UtilityMixin extends Vue {
     }
 
     /**
+     * Periodically refresh the Thunderstore mod list in the background.
+     *
      * Thunderstore's Sentry gets regular errors about this failing with
      * HTTP status code 0. The assumption is that it's caused by users
      * closing the window while update is in progress. Ignore the first
      * failure to see how this affects the number of reported errors.
      */
-    private async tryRefreshThunderstoreModList() {
+    private async backgroundRefreshThunderstoreModList() {
         // Don't do background update on index route since the game
         // isn't really chosen yet, nor in the splash screen since it
         // proactively updates the package list.
@@ -65,18 +67,18 @@ export default class UtilityMixin extends Vue {
             this.$store.commit("tsMods/startBackgroundUpdate");
             await this.refreshThunderstoreModList();
         } catch (e) {
-            if (this.tsRefreshFailed) {
+            if (this.tsBackgroundRefreshFailed) {
                 console.error("Two consecutive background refresh attempts failed");
                 throw e;
             }
 
-            this.tsRefreshFailed = true;
+            this.tsBackgroundRefreshFailed = true;
             return;
         } finally {
             this.$store.commit("tsMods/finishBackgroundUpdate");
         }
 
-        this.tsRefreshFailed = false;
+        this.tsBackgroundRefreshFailed = false;
     }
 
     /**

From 906f97372057cb891b4a2bc08e183b1192b7b118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Mon, 25 Nov 2024 15:59:56 +0200
Subject: [PATCH 27/95] Rename Vuex store attributes and methods

The "background" update originally referred to the periodic updates,
i.e. not the update that happens on splash screen and shows the
progress to user. The Vuex state is now shared between the background
updates and user triggered manual updates that show a lightweight
status reporting, so the naming was bit misleading.
---
 src/components/ModListUpdateBanner.vue             |  6 +++---
 src/components/mixins/UtilityMixin.vue             |  6 +++---
 .../settings-components/SettingsView.vue           |  8 ++++----
 src/store/modules/TsModsModule.ts                  | 14 +++++++-------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/components/ModListUpdateBanner.vue b/src/components/ModListUpdateBanner.vue
index 81a60dbe0..fbee4b654 100644
--- a/src/components/ModListUpdateBanner.vue
+++ b/src/components/ModListUpdateBanner.vue
@@ -13,7 +13,7 @@ export default class ModListUpdateBanner extends mixins(UtilityMixin) {
     }
 
     get isUpdateInProgress(): boolean {
-        return this.$store.state.tsMods.isBackgroundUpdateInProgress;
+        return this.$store.state.tsMods.isThunderstoreModListUpdateInProgress;
     }
 
     @Watch('isUpdateInProgress')
@@ -29,7 +29,7 @@ export default class ModListUpdateBanner extends mixins(UtilityMixin) {
             return;
         }
 
-        this.$store.commit('tsMods/startBackgroundUpdate');
+        this.$store.commit('tsMods/startThunderstoreModListUpdate');
         this.updateError = '';
 
         try {
@@ -43,7 +43,7 @@ export default class ModListUpdateBanner extends mixins(UtilityMixin) {
         } catch (e) {
             this.updateError = `${e}`;
         } finally {
-            this.$store.commit('tsMods/finishBackgroundUpdate');
+            this.$store.commit('tsMods/finishThunderstoreModListUpdate');
         }
     }
 }
diff --git a/src/components/mixins/UtilityMixin.vue b/src/components/mixins/UtilityMixin.vue
index f4d023a6a..00bac8e53 100644
--- a/src/components/mixins/UtilityMixin.vue
+++ b/src/components/mixins/UtilityMixin.vue
@@ -59,12 +59,12 @@ export default class UtilityMixin extends Vue {
             return;
         }
 
-        if (this.$store.state.tsMods.isBackgroundUpdateInProgress) {
+        if (this.$store.state.tsMods.isThunderstoreModListUpdateInProgress) {
             return;
         }
 
         try {
-            this.$store.commit("tsMods/startBackgroundUpdate");
+            this.$store.commit("tsMods/startThunderstoreModListUpdate");
             await this.refreshThunderstoreModList();
         } catch (e) {
             if (this.tsBackgroundRefreshFailed) {
@@ -75,7 +75,7 @@ export default class UtilityMixin extends Vue {
             this.tsBackgroundRefreshFailed = true;
             return;
         } finally {
-            this.$store.commit("tsMods/finishBackgroundUpdate");
+            this.$store.commit("tsMods/finishThunderstoreModListUpdate");
         }
 
         this.tsBackgroundRefreshFailed = false;
diff --git a/src/components/settings-components/SettingsView.vue b/src/components/settings-components/SettingsView.vue
index 7e776ec2b..48ad9f642 100644
--- a/src/components/settings-components/SettingsView.vue
+++ b/src/components/settings-components/SettingsView.vue
@@ -299,7 +299,7 @@ import CdnProvider from '../../providers/generic/connection/CdnProvider';
                 'Refresh online mod list',
                 'Check for any new mod releases.',
                 async () => {
-                        if (this.$store.state.tsMods.isBackgroundUpdateInProgress) {
+                        if (this.$store.state.tsMods.isThunderstoreModListUpdateInProgress) {
                             return "Checking for new releases";
                         }
                         if (this.$store.state.tsMods.connectionError.length > 0) {
@@ -312,11 +312,11 @@ import CdnProvider from '../../providers/generic/connection/CdnProvider';
                     },
                 'fa-exchange-alt',
                 async () => {
-                    if (this.$store.state.tsMods.isBackgroundUpdateInProgress) {
+                    if (this.$store.state.tsMods.isThunderstoreModListUpdateInProgress) {
                         return;
                     }
 
-                    this.$store.commit("tsMods/startBackgroundUpdate");
+                    this.$store.commit("tsMods/startThunderstoreModListUpdate");
                     this.$store.commit("tsMods/setConnectionError", "");
 
                     try {
@@ -324,7 +324,7 @@ import CdnProvider from '../../providers/generic/connection/CdnProvider';
                     } catch (e) {
                         this.$store.commit("tsMods/setConnectionError", e);
                     } finally {
-                        this.$store.commit("tsMods/finishBackgroundUpdate");
+                        this.$store.commit("tsMods/finishThunderstoreModListUpdate");
                     }
                 }
             ),
diff --git a/src/store/modules/TsModsModule.ts b/src/store/modules/TsModsModule.ts
index 754e0bb47..1b0c6321c 100644
--- a/src/store/modules/TsModsModule.ts
+++ b/src/store/modules/TsModsModule.ts
@@ -22,7 +22,7 @@ interface State {
     connectionError: string;
     deprecated: Map<string, boolean>;
     exclusions?: string[];
-    isBackgroundUpdateInProgress: boolean;
+    isThunderstoreModListUpdateInProgress: boolean;
     mods: ThunderstoreMod[];
     modsLastUpdated?: Date;
 }
@@ -54,8 +54,8 @@ export const TsModsModule = {
         deprecated: new Map<string, boolean>(),
         /*** Packages available through API that should be ignored by the manager */
         exclusions: undefined,
-        /*** Mod list is automatically and periodically updated in the background */
-        isBackgroundUpdateInProgress: false,
+        /*** Mod list is updated from the API automatically and by user action */
+        isThunderstoreModListUpdateInProgress: false,
         /*** All mods available through API for the current active game */
         mods: [],
         /*** When was the mod list last refreshed from the API? */
@@ -128,8 +128,8 @@ export const TsModsModule = {
         clearModCache(state) {
             state.cache.clear();
         },
-        finishBackgroundUpdate(state) {
-            state.isBackgroundUpdateInProgress = false;
+        finishThunderstoreModListUpdate(state) {
+            state.isThunderstoreModListUpdateInProgress = false;
         },
         setConnectionError(state, error: string|unknown) {
             if (typeof error === 'string') {
@@ -148,8 +148,8 @@ export const TsModsModule = {
         setExclusions(state, payload: string[]) {
             state.exclusions = payload;
         },
-        startBackgroundUpdate(state) {
-            state.isBackgroundUpdateInProgress = true;
+        startThunderstoreModListUpdate(state) {
+            state.isThunderstoreModListUpdateInProgress = true;
         },
         updateDeprecated(state, allMods: ThunderstoreMod[]) {
             state.deprecated = Deprecations.getDeprecatedPackageMap(allMods);

From 66a1da7071ecd24c0080bfd576d905994e512ec5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Mon, 25 Nov 2024 16:10:28 +0200
Subject: [PATCH 28/95] Rename ambiguous "connectionError"

---
 .../settings-components/SettingsView.vue      |  8 +++---
 src/store/modules/TsModsModule.ts             | 26 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/components/settings-components/SettingsView.vue b/src/components/settings-components/SettingsView.vue
index 48ad9f642..14ecb7856 100644
--- a/src/components/settings-components/SettingsView.vue
+++ b/src/components/settings-components/SettingsView.vue
@@ -302,8 +302,8 @@ import CdnProvider from '../../providers/generic/connection/CdnProvider';
                         if (this.$store.state.tsMods.isThunderstoreModListUpdateInProgress) {
                             return "Checking for new releases";
                         }
-                        if (this.$store.state.tsMods.connectionError.length > 0) {
-                            return "Error getting new mods: " + this.$store.state.tsMods.connectionError;
+                        if (this.$store.state.tsMods.thunderstoreModListUpdateError.length > 0) {
+                            return "Error getting new mods: " + this.$store.state.tsMods.thunderstoreModListUpdateError;
                         }
                         if (this.$store.state.tsMods.modsLastUpdated !== undefined) {
                             return "Cache date: " + moment(this.$store.state.tsMods.modsLastUpdated).format("MMMM Do YYYY, h:mm:ss a");
@@ -317,12 +317,12 @@ import CdnProvider from '../../providers/generic/connection/CdnProvider';
                     }
 
                     this.$store.commit("tsMods/startThunderstoreModListUpdate");
-                    this.$store.commit("tsMods/setConnectionError", "");
+                    this.$store.commit("tsMods/setThunderstoreModListUpdateError", "");
 
                     try {
                         await this.refreshThunderstoreModList();
                     } catch (e) {
-                        this.$store.commit("tsMods/setConnectionError", e);
+                        this.$store.commit("tsMods/setThunderstoreModListUpdateError", e);
                     } finally {
                         this.$store.commit("tsMods/finishThunderstoreModListUpdate");
                     }
diff --git a/src/store/modules/TsModsModule.ts b/src/store/modules/TsModsModule.ts
index 1b0c6321c..0d6710b12 100644
--- a/src/store/modules/TsModsModule.ts
+++ b/src/store/modules/TsModsModule.ts
@@ -19,12 +19,12 @@ export interface CachedMod {
 
 interface State {
     cache: Map<string, CachedMod>;
-    connectionError: string;
     deprecated: Map<string, boolean>;
     exclusions?: string[];
     isThunderstoreModListUpdateInProgress: boolean;
     mods: ThunderstoreMod[];
     modsLastUpdated?: Date;
+    thunderstoreModListUpdateError: string;
 }
 
 type ProgressCallback = (progress: number) => void;
@@ -49,8 +49,6 @@ export const TsModsModule = {
 
     state: (): State => ({
         cache: new Map<string, CachedMod>(),
-        /*** Error shown on UI after manual mod list refresh fails */
-        connectionError: '',
         deprecated: new Map<string, boolean>(),
         /*** Packages available through API that should be ignored by the manager */
         exclusions: undefined,
@@ -59,7 +57,9 @@ export const TsModsModule = {
         /*** All mods available through API for the current active game */
         mods: [],
         /*** When was the mod list last refreshed from the API? */
-        modsLastUpdated: undefined
+        modsLastUpdated: undefined,
+        /*** Error shown on UI after manual mod list refresh fails */
+        thunderstoreModListUpdateError: ''
     }),
 
     getters: <GetterTree<State, RootState>>{
@@ -119,11 +119,11 @@ export const TsModsModule = {
     mutations: <MutationTree<State>>{
         reset(state: State) {
             state.cache = new Map<string, CachedMod>();
-            state.connectionError = '';
             state.deprecated = new Map<string, boolean>();
             state.exclusions = undefined;
             state.mods = [];
             state.modsLastUpdated = undefined;
+            state.thunderstoreModListUpdateError = '';
         },
         clearModCache(state) {
             state.cache.clear();
@@ -131,14 +131,6 @@ export const TsModsModule = {
         finishThunderstoreModListUpdate(state) {
             state.isThunderstoreModListUpdateInProgress = false;
         },
-        setConnectionError(state, error: string|unknown) {
-            if (typeof error === 'string') {
-                state.connectionError = error;
-            } else {
-                const msg = error instanceof Error ? error.message : "Unknown error";
-                state.connectionError = msg;
-            }
-        },
         setMods(state, payload: ThunderstoreMod[]) {
             state.mods = payload;
         },
@@ -148,6 +140,14 @@ export const TsModsModule = {
         setExclusions(state, payload: string[]) {
             state.exclusions = payload;
         },
+        setThunderstoreModListUpdateError(state, error: string|unknown) {
+            if (typeof error === 'string') {
+                state.thunderstoreModListUpdateError = error;
+            } else {
+                const msg = error instanceof Error ? error.message : "Unknown error";
+                state.thunderstoreModListUpdateError = msg;
+            }
+        },
         startThunderstoreModListUpdate(state) {
             state.isThunderstoreModListUpdateInProgress = true;
         },

From f02ae6d3bba286370e1b38e7cc4946a34043eedf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Tue, 26 Nov 2024 16:14:18 +0200
Subject: [PATCH 29/95] Move refreshThunderstoreModList to Vuex

As the number of callsites increases, it makes more sense to have the
method for downloading the latest mod list, storing it into IndexedDB
and loading packages to Vuex inside Vuex, so each component doesn't
need to extend the UtilityMixin just to access it.

For TSMM this also allows injecting telemetry gathering to the method
inside Vuex, and not needing to due it awkwardly in App.vue.
---
 src/components/ModListUpdateBanner.vue        | 11 +++----
 src/components/mixins/UtilityMixin.vue        | 29 +------------------
 .../settings-components/SettingsView.vue      |  9 +++---
 src/store/modules/TsModsModule.ts             | 21 ++++++++++++++
 4 files changed, 30 insertions(+), 40 deletions(-)

diff --git a/src/components/ModListUpdateBanner.vue b/src/components/ModListUpdateBanner.vue
index fbee4b654..f7df23346 100644
--- a/src/components/ModListUpdateBanner.vue
+++ b/src/components/ModListUpdateBanner.vue
@@ -1,11 +1,8 @@
 <script lang="ts">
-import { mixins } from 'vue-class-component';
-import { Component, Watch } from 'vue-property-decorator';
-
-import UtilityMixin from './mixins/UtilityMixin.vue';
+import { Component, Vue, Watch } from 'vue-property-decorator';
 
 @Component({})
-export default class ModListUpdateBanner extends mixins(UtilityMixin) {
+export default class ModListUpdateBanner extends Vue {
     updateError = '';
 
     get isModListLoaded(): boolean {
@@ -36,10 +33,10 @@ export default class ModListUpdateBanner extends mixins(UtilityMixin) {
             // Invalidate hash to force a refresh. Otherwise a scenario where
             // the latest index hash is already present in IndexedDB but loading
             // the package list into Vuex store has failed would cause the banner
-            // to just disappear when refreshThunderstoreModList skips the actual
+            // to just disappear when fetchAndProcessPackageList skips the actual
             // update but updates the timestamp of the hash.
             await this.$store.dispatch('tsMods/updateIndexHash', 'invalidated');
-            await this.refreshThunderstoreModList();
+            await this.$store.dispatch('tsMods/fetchAndProcessPackageList');
         } catch (e) {
             this.updateError = `${e}`;
         } finally {
diff --git a/src/components/mixins/UtilityMixin.vue b/src/components/mixins/UtilityMixin.vue
index 00bac8e53..cb8b82a47 100644
--- a/src/components/mixins/UtilityMixin.vue
+++ b/src/components/mixins/UtilityMixin.vue
@@ -4,7 +4,6 @@ import Component from 'vue-class-component';
 
 import R2Error from '../../model/errors/R2Error';
 import CdnProvider from '../../providers/generic/connection/CdnProvider';
-import { PackageListIndex } from '../../store/modules/TsModsModule';
 
 @Component
 export default class UtilityMixin extends Vue {
@@ -15,32 +14,6 @@ export default class UtilityMixin extends Vue {
         setInterval(this.backgroundRefreshThunderstoreModList, this.REFRESH_INTERVAL);
     }
 
-    // Wrapper to allow TSMM to inject telemetry gathering.
-    async refreshThunderstoreModList() {
-        await this._refreshThunderstoreModList();
-    }
-
-    async _refreshThunderstoreModList() {
-        const packageListIndex: PackageListIndex = await this.$store.dispatch("tsMods/fetchPackageListIndex");
-
-        if (packageListIndex.isLatest) {
-            await this.$store.dispatch("tsMods/updateModsLastUpdated");
-            return;
-        }
-
-        const packageListChunks = await this.$store.dispatch(
-            "tsMods/fetchPackageListChunks",
-            {chunkUrls: packageListIndex.content},
-        );
-        await this.$store.dispatch(
-            "tsMods/updatePersistentCache",
-            {chunks: packageListChunks, indexHash: packageListIndex.hash},
-        );
-        await this.$store.dispatch("tsMods/updateMods");
-        await this.$store.dispatch("profile/tryLoadModListFromDisk");
-        await this.$store.dispatch("tsMods/prewarmCache");
-    }
-
     /**
      * Periodically refresh the Thunderstore mod list in the background.
      *
@@ -65,7 +38,7 @@ export default class UtilityMixin extends Vue {
 
         try {
             this.$store.commit("tsMods/startThunderstoreModListUpdate");
-            await this.refreshThunderstoreModList();
+            await this.$store.dispatch('tsMods/fetchAndProcessPackageList');
         } catch (e) {
             if (this.tsBackgroundRefreshFailed) {
                 console.error("Two consecutive background refresh attempts failed");
diff --git a/src/components/settings-components/SettingsView.vue b/src/components/settings-components/SettingsView.vue
index 14ecb7856..933906238 100644
--- a/src/components/settings-components/SettingsView.vue
+++ b/src/components/settings-components/SettingsView.vue
@@ -45,8 +45,8 @@
 
 <script lang="ts">
 
-import { Watch } from 'vue-property-decorator';
-import Component, { mixins } from 'vue-class-component';
+import { Vue, Watch } from 'vue-property-decorator';
+import Component from 'vue-class-component';
 import SettingsItem from './SettingsItem.vue';
 import SettingsRow from '../../model/settings/SettingsRow';
 import ManagerSettings from '../../r2mm/manager/ManagerSettings';
@@ -62,7 +62,6 @@ import ManifestV2 from '../../model/ManifestV2';
 import Game from '../../model/game/Game';
 import { StorePlatform } from '../../model/game/StorePlatform';
 import moment from 'moment';
-import UtilityMixin from '../mixins/UtilityMixin.vue';
 import CdnProvider from '../../providers/generic/connection/CdnProvider';
 
 @Component({
@@ -71,7 +70,7 @@ import CdnProvider from '../../providers/generic/connection/CdnProvider';
             Hero
         }
     })
-    export default class SettingsView extends mixins(UtilityMixin) {
+    export default class SettingsView extends Vue {
 
         private activeTab: string = 'All';
         private tabs = ['All', 'Profile', 'Locations', 'Debugging', 'Modpacks', 'Other'];
@@ -320,7 +319,7 @@ import CdnProvider from '../../providers/generic/connection/CdnProvider';
                     this.$store.commit("tsMods/setThunderstoreModListUpdateError", "");
 
                     try {
-                        await this.refreshThunderstoreModList();
+                        await this.$store.dispatch("tsMods/fetchAndProcessPackageList");
                     } catch (e) {
                         this.$store.commit("tsMods/setThunderstoreModListUpdateError", e);
                     } finally {
diff --git a/src/store/modules/TsModsModule.ts b/src/store/modules/TsModsModule.ts
index 0d6710b12..aa5f84cec 100644
--- a/src/store/modules/TsModsModule.ts
+++ b/src/store/modules/TsModsModule.ts
@@ -157,6 +157,27 @@ export const TsModsModule = {
     },
 
     actions: <ActionTree<State, RootState>>{
+        async fetchAndProcessPackageList({dispatch}) {
+            const packageListIndex: PackageListIndex = await dispatch('fetchPackageListIndex');
+
+            if (packageListIndex.isLatest) {
+                await dispatch('updateModsLastUpdated');
+                return;
+            }
+
+            const packageListChunks = await dispatch(
+                'fetchPackageListChunks',
+                {chunkUrls: packageListIndex.content},
+            );
+            await dispatch(
+                'updatePersistentCache',
+                {chunks: packageListChunks, indexHash: packageListIndex.hash},
+            );
+            await dispatch('updateMods');
+            await dispatch('profile/tryLoadModListFromDisk', null, {root: true});
+            await dispatch('prewarmCache');
+        },
+
         async fetchPackageListIndex({dispatch, rootState}): Promise<PackageListIndex> {
             const indexUrl = CdnProvider.addCdnQueryParameter(rootState.activeGame.thunderstoreUrl);
             const index = await retry(() => fetchAndProcessBlobFile(indexUrl), 5, 2000);

From 77b2db8fa68936af887f03e730982e020ce1f7f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Wed, 27 Nov 2024 08:44:09 +0200
Subject: [PATCH 30/95] Change how online mod list update process works

If new mod list was downloaded and stored to IndexDB successfully, but
loading the mods to Vuex failed, user would end up in situation where
the mod list is empty but it wouldn't be updated until a new version
was available in the API. To prevent this, we now always attempt to
load the mod list in to Vuex if the the mod list stored there is empty.
---
 src/store/modules/TsModsModule.ts | 50 +++++++++++++++++--------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/store/modules/TsModsModule.ts b/src/store/modules/TsModsModule.ts
index aa5f84cec..9bb1ccc66 100644
--- a/src/store/modules/TsModsModule.ts
+++ b/src/store/modules/TsModsModule.ts
@@ -157,28 +157,40 @@ export const TsModsModule = {
     },
 
     actions: <ActionTree<State, RootState>>{
-        async fetchAndProcessPackageList({dispatch}) {
+        async fetchAndProcessPackageList({dispatch, state}) {
             const packageListIndex: PackageListIndex = await dispatch('fetchPackageListIndex');
 
+            // If the package list is up to date, only update the timestamp. Otherwise,
+            // fetch the new one and store it into IndexedDB.
             if (packageListIndex.isLatest) {
-                await dispatch('updateModsLastUpdated');
-                return;
+                await dispatch('updateIndexHash', packageListIndex.hash);
+            } else {
+                const packageListChunks = await dispatch(
+                    'fetchPackageListChunks',
+                    {chunkUrls: packageListIndex.content},
+                );
+                await dispatch(
+                    'updatePersistentCache',
+                    {chunks: packageListChunks, indexHash: packageListIndex.hash},
+                );
             }
 
-            const packageListChunks = await dispatch(
-                'fetchPackageListChunks',
-                {chunkUrls: packageListIndex.content},
-            );
-            await dispatch(
-                'updatePersistentCache',
-                {chunks: packageListChunks, indexHash: packageListIndex.hash},
-            );
-            await dispatch('updateMods');
-            await dispatch('profile/tryLoadModListFromDisk', null, {root: true});
-            await dispatch('prewarmCache');
+            // If the package list was up to date and the mod list is already loaded to
+            // Vuex, just update the timestamp. Otherwise, load the list from IndexedDB
+            // to Vuex. This needs to be done even if the index hasn't updated when the
+            // mod list in Vuex is empty, as this indicates an error state and otherwise
+            // the user would be stuck with empty list until a new index hash is
+            // available via the API.
+            if (packageListIndex.isLatest && state.mods.length > 0) {
+                await dispatch('updateModsLastUpdated');
+            } else {
+                await dispatch('updateMods');
+                await dispatch('profile/tryLoadModListFromDisk', null, {root: true});
+                await dispatch('prewarmCache');
+            }
         },
 
-        async fetchPackageListIndex({dispatch, rootState}): Promise<PackageListIndex> {
+        async fetchPackageListIndex({rootState}): Promise<PackageListIndex> {
             const indexUrl = CdnProvider.addCdnQueryParameter(rootState.activeGame.thunderstoreUrl);
             const index = await retry(() => fetchAndProcessBlobFile(indexUrl), 5, 2000);
 
@@ -191,14 +203,6 @@ export const TsModsModule = {
 
             const community = rootState.activeGame.internalFolderName;
             const isLatest = await PackageDb.isLatestPackageListIndex(community, index.hash);
-
-            // Normally the hash would be updated after the mod list is successfully
-            // fetched and written to IndexedDB, but if the list hasn't changed,
-            // those step are skipped, so update the "last seen" timestamp now.
-            if (isLatest) {
-                await dispatch('updateIndexHash', index.hash);
-            }
-
             return {...index, isLatest};
         },
 

From bc97cde532c0ae9c50a280dfbe4e164fe3cc745d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Wed, 18 Dec 2024 17:23:09 +0200
Subject: [PATCH 31/95] Unify mod list update related functionality from Vue
 components to Vuex

The Vuex method now handles preventing multiple simultaneous update
calls.

It also provides a simple status message for the update process to be
shown in the UI when the update process is triggered by the user.
---
 src/components/ModListUpdateBanner.vue        |  37 ++-----
 src/components/mixins/UtilityMixin.vue        |  13 +--
 .../settings-components/SettingsView.vue      |  21 +---
 src/store/modules/TsModsModule.ts             | 102 ++++++++++++------
 4 files changed, 84 insertions(+), 89 deletions(-)

diff --git a/src/components/ModListUpdateBanner.vue b/src/components/ModListUpdateBanner.vue
index f7df23346..d8ff19116 100644
--- a/src/components/ModListUpdateBanner.vue
+++ b/src/components/ModListUpdateBanner.vue
@@ -1,10 +1,8 @@
 <script lang="ts">
-import { Component, Vue, Watch } from 'vue-property-decorator';
+import { Component, Vue } from 'vue-property-decorator';
 
 @Component({})
 export default class ModListUpdateBanner extends Vue {
-    updateError = '';
-
     get isModListLoaded(): boolean {
         return this.$store.state.tsMods.modsLastUpdated !== undefined;
     }
@@ -13,35 +11,12 @@ export default class ModListUpdateBanner extends Vue {
         return this.$store.state.tsMods.isThunderstoreModListUpdateInProgress;
     }
 
-    @Watch('isUpdateInProgress')
-    onLoadingProgressChange(newVal: boolean, oldVal: boolean) {
-        // React to background update as well as the manual update from the banner.
-        if (!oldVal && newVal) {
-            this.updateError = '';
-        }
+    get updateError(): string {
+        return this.$store.state.tsMods.thunderstoreModListUpdateError;
     }
 
     async updateModList() {
-        if (this.isUpdateInProgress) {
-            return;
-        }
-
-        this.$store.commit('tsMods/startThunderstoreModListUpdate');
-        this.updateError = '';
-
-        try {
-            // Invalidate hash to force a refresh. Otherwise a scenario where
-            // the latest index hash is already present in IndexedDB but loading
-            // the package list into Vuex store has failed would cause the banner
-            // to just disappear when fetchAndProcessPackageList skips the actual
-            // update but updates the timestamp of the hash.
-            await this.$store.dispatch('tsMods/updateIndexHash', 'invalidated');
-            await this.$store.dispatch('tsMods/fetchAndProcessPackageList');
-        } catch (e) {
-            this.updateError = `${e}`;
-        } finally {
-            this.$store.commit('tsMods/finishThunderstoreModListUpdate');
-        }
+        await this.$store.dispatch('tsMods/fetchAndProcessPackageList');
     }
 }
 </script>
@@ -50,10 +25,10 @@ export default class ModListUpdateBanner extends Vue {
     <div v-if="!isModListLoaded" id="mod-list-update-banner" class="margin-bottom">
         <div class="notification is-warning margin-right">
             <span v-if="isUpdateInProgress">
-                Updating mod list from Thunderstore...
+                {{ $store.state.tsMods.thunderstoreModListUpdateStatus }}
             </span>
             <span v-else-if="updateError">
-                Error updating the mod list: {{ updateError }}<br />
+                Error updating the mod list: {{ updateError }}.<br />
                 The manager will keep trying to update the mod list in the background.
             </span>
             <span v-else>
diff --git a/src/components/mixins/UtilityMixin.vue b/src/components/mixins/UtilityMixin.vue
index cb8b82a47..f20bd7168 100644
--- a/src/components/mixins/UtilityMixin.vue
+++ b/src/components/mixins/UtilityMixin.vue
@@ -32,23 +32,16 @@ export default class UtilityMixin extends Vue {
             return;
         }
 
-        if (this.$store.state.tsMods.isThunderstoreModListUpdateInProgress) {
-            return;
-        }
+        await this.$store.dispatch("tsMods/fetchAndProcessPackageList");
 
-        try {
-            this.$store.commit("tsMods/startThunderstoreModListUpdate");
-            await this.$store.dispatch('tsMods/fetchAndProcessPackageList');
-        } catch (e) {
+        if (this.$store.state.tsMods.thunderstoreModListUpdateError.length > 0) {
             if (this.tsBackgroundRefreshFailed) {
                 console.error("Two consecutive background refresh attempts failed");
-                throw e;
+                throw new Error(this.$store.state.tsMods.thunderstoreModListUpdateError);
             }
 
             this.tsBackgroundRefreshFailed = true;
             return;
-        } finally {
-            this.$store.commit("tsMods/finishThunderstoreModListUpdate");
         }
 
         this.tsBackgroundRefreshFailed = false;
diff --git a/src/components/settings-components/SettingsView.vue b/src/components/settings-components/SettingsView.vue
index 933906238..b34b17215 100644
--- a/src/components/settings-components/SettingsView.vue
+++ b/src/components/settings-components/SettingsView.vue
@@ -299,10 +299,10 @@ import CdnProvider from '../../providers/generic/connection/CdnProvider';
                 'Check for any new mod releases.',
                 async () => {
                         if (this.$store.state.tsMods.isThunderstoreModListUpdateInProgress) {
-                            return "Checking for new releases";
+                            return this.$store.state.tsMods.thunderstoreModListUpdateStatus || "Updating...";
                         }
                         if (this.$store.state.tsMods.thunderstoreModListUpdateError.length > 0) {
-                            return "Error getting new mods: " + this.$store.state.tsMods.thunderstoreModListUpdateError;
+                            return "Error updating the mod list: " + this.$store.state.tsMods.thunderstoreModListUpdateError;
                         }
                         if (this.$store.state.tsMods.modsLastUpdated !== undefined) {
                             return "Cache date: " + moment(this.$store.state.tsMods.modsLastUpdated).format("MMMM Do YYYY, h:mm:ss a");
@@ -310,22 +310,7 @@ import CdnProvider from '../../providers/generic/connection/CdnProvider';
                         return "No API information available";
                     },
                 'fa-exchange-alt',
-                async () => {
-                    if (this.$store.state.tsMods.isThunderstoreModListUpdateInProgress) {
-                        return;
-                    }
-
-                    this.$store.commit("tsMods/startThunderstoreModListUpdate");
-                    this.$store.commit("tsMods/setThunderstoreModListUpdateError", "");
-
-                    try {
-                        await this.$store.dispatch("tsMods/fetchAndProcessPackageList");
-                    } catch (e) {
-                        this.$store.commit("tsMods/setThunderstoreModListUpdateError", e);
-                    } finally {
-                        this.$store.commit("tsMods/finishThunderstoreModListUpdate");
-                    }
-                }
+                async () => await this.$store.dispatch("tsMods/fetchAndProcessPackageList")
             ),
             new SettingsRow(
               'Other',
diff --git a/src/store/modules/TsModsModule.ts b/src/store/modules/TsModsModule.ts
index 9bb1ccc66..1e6a948af 100644
--- a/src/store/modules/TsModsModule.ts
+++ b/src/store/modules/TsModsModule.ts
@@ -25,6 +25,7 @@ interface State {
     mods: ThunderstoreMod[];
     modsLastUpdated?: Date;
     thunderstoreModListUpdateError: string;
+    thunderstoreModListUpdateStatus: string;
 }
 
 type ProgressCallback = (progress: number) => void;
@@ -58,8 +59,10 @@ export const TsModsModule = {
         mods: [],
         /*** When was the mod list last refreshed from the API? */
         modsLastUpdated: undefined,
-        /*** Error shown on UI after manual mod list refresh fails */
-        thunderstoreModListUpdateError: ''
+        /*** Error shown on UI after mod list refresh fails */
+        thunderstoreModListUpdateError: '',
+        /*** Status shown on UI during mod list refresh */
+        thunderstoreModListUpdateStatus: ''
     }),
 
     getters: <GetterTree<State, RootState>>{
@@ -124,12 +127,14 @@ export const TsModsModule = {
             state.mods = [];
             state.modsLastUpdated = undefined;
             state.thunderstoreModListUpdateError = '';
+            state.thunderstoreModListUpdateStatus = '';
         },
         clearModCache(state) {
             state.cache.clear();
         },
         finishThunderstoreModListUpdate(state) {
             state.isThunderstoreModListUpdateInProgress = false;
+            state.thunderstoreModListUpdateStatus = '';
         },
         setMods(state, payload: ThunderstoreMod[]) {
             state.mods = payload;
@@ -148,8 +153,12 @@ export const TsModsModule = {
                 state.thunderstoreModListUpdateError = msg;
             }
         },
+        setThunderstoreModListUpdateStatus(state, status: string) {
+            state.thunderstoreModListUpdateStatus = status;
+        },
         startThunderstoreModListUpdate(state) {
             state.isThunderstoreModListUpdateInProgress = true;
+            state.thunderstoreModListUpdateError = '';
         },
         updateDeprecated(state, allMods: ThunderstoreMod[]) {
             state.deprecated = Deprecations.getDeprecatedPackageMap(allMods);
@@ -157,36 +166,69 @@ export const TsModsModule = {
     },
 
     actions: <ActionTree<State, RootState>>{
-        async fetchAndProcessPackageList({dispatch, state}) {
-            const packageListIndex: PackageListIndex = await dispatch('fetchPackageListIndex');
-
-            // If the package list is up to date, only update the timestamp. Otherwise,
-            // fetch the new one and store it into IndexedDB.
-            if (packageListIndex.isLatest) {
-                await dispatch('updateIndexHash', packageListIndex.hash);
-            } else {
-                const packageListChunks = await dispatch(
-                    'fetchPackageListChunks',
-                    {chunkUrls: packageListIndex.content},
-                );
-                await dispatch(
-                    'updatePersistentCache',
-                    {chunks: packageListChunks, indexHash: packageListIndex.hash},
-                );
+        /**
+         * Complete update process of the mod list, to be used after
+         * passing the splash screen.
+         */
+        async fetchAndProcessPackageList({commit, dispatch, state}): Promise<void> {
+            if (state.isThunderstoreModListUpdateInProgress) {
+                return;
             }
 
-            // If the package list was up to date and the mod list is already loaded to
-            // Vuex, just update the timestamp. Otherwise, load the list from IndexedDB
-            // to Vuex. This needs to be done even if the index hasn't updated when the
-            // mod list in Vuex is empty, as this indicates an error state and otherwise
-            // the user would be stuck with empty list until a new index hash is
-            // available via the API.
-            if (packageListIndex.isLatest && state.mods.length > 0) {
-                await dispatch('updateModsLastUpdated');
-            } else {
-                await dispatch('updateMods');
-                await dispatch('profile/tryLoadModListFromDisk', null, {root: true});
-                await dispatch('prewarmCache');
+            commit('startThunderstoreModListUpdate');
+
+            try {
+                commit('setThunderstoreModListUpdateStatus', 'Checking for mod list updates from Thunderstore...');
+                let packageListIndex: PackageListIndex;
+
+                try {
+                    packageListIndex = await dispatch('fetchPackageListIndex');
+                } catch {
+                    throw new Error('Failed to check for updates from Thunderstore');
+                }
+
+                // If the package list is up to date, only update the timestamp. Otherwise,
+                // fetch the new one and store it into IndexedDB.
+                if (packageListIndex.isLatest) {
+                    await dispatch('updateIndexHash', packageListIndex.hash);
+                } else {
+                    const packageListChunks = await dispatch(
+                        'fetchPackageListChunks',
+                        {
+                            chunkUrls: packageListIndex.content,
+                            progressCallback: (progress: number) => commit(
+                                'setThunderstoreModListUpdateStatus',
+                                `Loading latest mod list from Thunderstore: ${progress}%`
+                            ),
+                        },
+                    );
+
+                    commit('setThunderstoreModListUpdateStatus', 'Storing the mod list into local cache...');
+                    await dispatch(
+                        'updatePersistentCache',
+                        {chunks: packageListChunks, indexHash: packageListIndex.hash},
+                    );
+                }
+
+                // If the package list was up to date and the mod list is already loaded to
+                // Vuex, just update the timestamp. Otherwise, load the list from IndexedDB
+                // to Vuex. This needs to be done even if the index hasn't updated when the
+                // mod list in Vuex is empty, as this indicates an error state and otherwise
+                // the user would be stuck with empty list until a new index hash is
+                // available via the API.
+                if (packageListIndex.isLatest && state.mods.length > 0) {
+                    await dispatch('updateModsLastUpdated');
+                } else {
+                    commit('setThunderstoreModListUpdateStatus', 'Processing the mod list...');
+                    await dispatch('updateMods');
+                    commit('setThunderstoreModListUpdateStatus', 'Almost done...');
+                    await dispatch('profile/tryLoadModListFromDisk', null, {root: true});
+                    await dispatch('prewarmCache');
+                }
+            } catch (e) {
+                commit('setThunderstoreModListUpdateError', e);
+            } finally {
+                commit('finishThunderstoreModListUpdate');
             }
         },
 

From fd2b4e3ddc547a26f66a2eb34b9533a7a78229f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Mon, 18 Nov 2024 11:19:34 +0200
Subject: [PATCH 32/95] Move profile selection further up the profile import
 flow

We want to access the preview step ASAP as this is where user is likely
to encounter problems with outdated or not loaded mod list.
---
 .../profiles-modals/ImportProfileModal.vue    | 73 +++++++++----------
 1 file changed, 35 insertions(+), 38 deletions(-)

diff --git a/src/components/profiles-modals/ImportProfileModal.vue b/src/components/profiles-modals/ImportProfileModal.vue
index 628aa2366..07555425e 100644
--- a/src/components/profiles-modals/ImportProfileModal.vue
+++ b/src/components/profiles-modals/ImportProfileModal.vue
@@ -27,15 +27,15 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
     private profileImportFilePath: string | null = null;
     private profileImportContent: ExportFormat | null = null;
     private activeStep:
-        'IMPORT_UPDATE_SELECTION'
-        | 'FILE_CODE_SELECTION'
-        | 'IMPORT_CODE'
+        'FILE_CODE_SELECTION'
         | 'IMPORT_FILE'
-        | 'ADDING_PROFILE'
+        | 'IMPORT_CODE'
         | 'REVIEW_IMPORT'
         | 'NO_PACKAGES_IN_IMPORT'
+        | 'IMPORT_UPDATE_SELECTION'
+        | 'ADDING_PROFILE'
         | 'PROFILE_IS_BEING_IMPORTED'
-    = 'IMPORT_UPDATE_SELECTION';
+    = 'FILE_CODE_SELECTION';
 
     get appName(): string {
         return ManagerInformation.APP_NAME;
@@ -46,7 +46,7 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
     }
 
     closeModal() {
-        this.activeStep = 'IMPORT_UPDATE_SELECTION';
+        this.activeStep = 'FILE_CODE_SELECTION';
         this.targetProfileName = '';
         this.importUpdateSelection = 'CREATE';
         this.importViaCodeInProgress = false;
@@ -65,17 +65,6 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
             .filter(mod => !!mod)
     }
 
-    // Fired when user selects whether to import a new profile or update existing one.
-    onCreateOrUpdateSelect(mode: 'CREATE' | 'UPDATE') {
-        this.importUpdateSelection = mode;
-
-        if (mode === 'UPDATE') {
-            this.targetProfileName = this.activeProfileName;
-        }
-
-        this.activeStep = 'FILE_CODE_SELECTION';
-    }
-
     // Fired when user selects to import either from file or code.
     async onFileOrCodeSelect(mode: 'FILE' | 'CODE') {
         if (mode === 'FILE') {
@@ -152,8 +141,16 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
             return;
         }
 
-        if (this.importUpdateSelection === 'CREATE') {
-            this.targetProfileName = profileContent.getProfileName();
+        this.targetProfileName = profileContent.getProfileName();
+        this.activeStep = 'IMPORT_UPDATE_SELECTION';
+    }
+
+    // Fired when user selects whether to import a new profile or update existing one.
+    onCreateOrUpdateSelect(mode: 'CREATE' | 'UPDATE') {
+        this.importUpdateSelection = mode;
+
+        if (mode === 'UPDATE') {
+            this.targetProfileName = this.activeProfileName;
         }
 
         this.activeStep = 'ADDING_PROFILE';
@@ -228,25 +225,7 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
 </script>
 
 <template>
-    <ModalCard v-if="activeStep === 'IMPORT_UPDATE_SELECTION'" key="IMPORT_UPDATE_SELECTION" :is-active="isOpen" @close-modal="closeModal">
-        <template v-slot:header>
-            <h2 class="modal-title">Are you going to be updating an existing profile or creating a new one?</h2>
-        </template>
-        <template v-slot:footer>
-            <button id="modal-import-new-profile"
-                    class="button is-info"
-                    @click="onCreateOrUpdateSelect('CREATE')">
-                Import new profile
-            </button>
-            <button id="modal-update-existing-profile"
-                    class="button is-primary"
-                    @click="onCreateOrUpdateSelect('UPDATE')">
-                Update existing profile
-            </button>
-        </template>
-    </ModalCard>
-
-    <ModalCard v-else-if="activeStep === 'FILE_CODE_SELECTION'" key="FILE_CODE_SELECTION" :is-active="isOpen" @close-modal="closeModal">
+    <ModalCard v-if="activeStep === 'FILE_CODE_SELECTION'" key="FILE_CODE_SELECTION" :is-active="isOpen" @close-modal="closeModal">
         <template v-slot:header>
             <h2 class="modal-title" v-if="importUpdateSelection === 'CREATE'">How are you importing a profile?</h2>
             <h2 class="modal-title" v-if="importUpdateSelection === 'UPDATE'">How are you updating your profile?</h2>
@@ -347,6 +326,24 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
         </template>
     </ModalCard>
 
+    <ModalCard v-else-if="activeStep === 'IMPORT_UPDATE_SELECTION'" key="IMPORT_UPDATE_SELECTION" :is-active="isOpen" @close-modal="closeModal">
+        <template v-slot:header>
+            <h2 class="modal-title">Are you going to be updating an existing profile or creating a new one?</h2>
+        </template>
+        <template v-slot:footer>
+            <button id="modal-import-new-profile"
+                    class="button is-info"
+                    @click="onCreateOrUpdateSelect('CREATE')">
+                Import new profile
+            </button>
+            <button id="modal-update-existing-profile"
+                    class="button is-primary"
+                    @click="onCreateOrUpdateSelect('UPDATE')">
+                Update existing profile
+            </button>
+        </template>
+    </ModalCard>
+
     <ModalCard v-else-if="activeStep === 'ADDING_PROFILE'" key="ADDING_PROFILE" :is-active="isOpen" @close-modal="closeModal">
         <template v-slot:header>
             <h2 v-if="importUpdateSelection === 'CREATE'" class="modal-title">Import a profile</h2>

From 66d7166ae2e8a06f009c44cb8a55e593285e45c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Mon, 25 Nov 2024 11:47:43 +0200
Subject: [PATCH 33/95] Extend the argument types accepted by Vuex methods

Some call sites of the Vuex methods pass objects of wrong but
compatible type to the methods. TypeScript doesn't pick up on this as
the type support for the old Vuex version is non-existent. Extend the
argument types so some later changes to methods don't break when the
ExportMod object is passed.
---
 src/store/modules/TsModsModule.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/store/modules/TsModsModule.ts b/src/store/modules/TsModsModule.ts
index 1e6a948af..e92550d15 100644
--- a/src/store/modules/TsModsModule.ts
+++ b/src/store/modules/TsModsModule.ts
@@ -1,6 +1,7 @@
 import { ActionTree, GetterTree, MutationTree } from 'vuex';
 
 import { State as RootState } from '../index';
+import ExportMod from '../../model/exports/ExportMod';
 import ManifestV2 from '../../model/ManifestV2';
 import ThunderstoreMod from '../../model/ThunderstoreMod';
 import VersionNumber from '../../model/VersionNumber';
@@ -72,7 +73,7 @@ export const TsModsModule = {
          *  time this happens slows down the LocalModList, cache the
          *  data in a Map.
          */
-        cachedMod: (state) => (mod: ManifestV2): CachedMod => {
+        cachedMod: (state) => (mod: ExportMod|ManifestV2): CachedMod => {
             const cacheKey = `${mod.getName()}-${mod.getVersionNumber()}`;
 
             if (state.cache.get(cacheKey) === undefined) {
@@ -110,7 +111,7 @@ export const TsModsModule = {
         },
 
         /*** Return ThunderstoreMod representation of a ManifestV2 */
-        tsMod: (_state, getters) => (mod: ManifestV2): ThunderstoreMod | undefined => {
+        tsMod: (_state, getters) => (mod: ExportMod|ManifestV2): ThunderstoreMod | undefined => {
             return getters.cachedMod(mod).tsMod;
         },
 

From 0e492c39d5e23e0cecf0af199d3d880c1a88324f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Mon, 25 Nov 2024 11:54:16 +0200
Subject: [PATCH 34/95] Combine preview modals when importing a profile

The modal now shows a list of the known mods which can be installed, as
well as a list of the names of the unknown mods. If there's no known
mods, the import button is disabled. Option to cancel the import is
always shown, in case user wants to cancel after seeing the contents of
the profile.

The main reason for combining the modals is to make it easier to
provide an option for updating the mod list without leaving the modal.
This became important after the recent changes, as the splash screen no
longer guarantees that the mod list is loaded into Vuex.
---
 .../profiles-modals/ImportProfileModal.vue    | 86 +++++++++++--------
 1 file changed, 52 insertions(+), 34 deletions(-)

diff --git a/src/components/profiles-modals/ImportProfileModal.vue b/src/components/profiles-modals/ImportProfileModal.vue
index 07555425e..edcfedb9d 100644
--- a/src/components/profiles-modals/ImportProfileModal.vue
+++ b/src/components/profiles-modals/ImportProfileModal.vue
@@ -6,6 +6,7 @@ import ManagerInformation from "../../_managerinf/ManagerInformation";
 import R2Error from "../../model/errors/R2Error";
 import ExportFormat from "../../model/exports/ExportFormat";
 import ExportMod from "../../model/exports/ExportMod";
+import ThunderstoreMod from "../../model/ThunderstoreMod";
 import ThunderstoreDownloaderProvider from "../../providers/ror2/downloading/ThunderstoreDownloaderProvider";
 import InteractionProvider from "../../providers/ror2/system/InteractionProvider";
 import { ProfileImportExport } from "../../r2mm/mods/ProfileImportExport";
@@ -31,7 +32,6 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
         | 'IMPORT_FILE'
         | 'IMPORT_CODE'
         | 'REVIEW_IMPORT'
-        | 'NO_PACKAGES_IN_IMPORT'
         | 'IMPORT_UPDATE_SELECTION'
         | 'ADDING_PROFILE'
         | 'PROFILE_IS_BEING_IMPORTED'
@@ -56,13 +56,22 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
         this.$store.commit('closeImportProfileModal');
     }
 
-    get profileToOnlineMods() {
-        if (!this.profileImportContent) {
-            return [];
+    get profileMods(): {known: ThunderstoreMod[], unknown: string[]} {
+        const profileMods = this.profileImportContent ? this.profileImportContent.getMods() : [];
+        const known: ThunderstoreMod[] = [];
+        const unknown: string[] = [];
+
+        for (const mod of profileMods) {
+            const tsMod = this.$store.getters['tsMods/tsMod'](mod);
+            if (tsMod) {
+                known.push(tsMod);
+            } else {
+                unknown.push(mod.getName());
+            }
         }
-        return this.profileImportContent.getMods()
-            .map(mod => this.$store.getters['tsMods/tsMod'](mod))
-            .filter(mod => !!mod)
+
+        unknown.sort();
+        return {known, unknown};
     }
 
     // Fired when user selects to import either from file or code.
@@ -126,8 +135,7 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
             return;
         }
 
-        this.activeStep = this.profileToOnlineMods.length ? 'REVIEW_IMPORT' : 'NO_PACKAGES_IN_IMPORT';
-        return;
+        this.activeStep = 'REVIEW_IMPORT';
     }
 
     // Fired when user has accepted the mods to be imported in the review phase.
@@ -296,33 +304,43 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
             <h2 class="modal-title">Packages to be installed</h2>
         </template>
         <template v-slot:body>
-            <OnlineModList :paged-mod-list="profileToOnlineMods" :read-only="true" />
-        </template>
-        <template v-slot:footer>
-            <button
-                id="modal-review-confirmed"
-                class="button is-info"
-                @click="onProfileReviewConfirmed();">
-                Import
-            </button>
-        </template>
-    </ModalCard>
-
-    <ModalCard v-else-if="activeStep === 'NO_PACKAGES_IN_IMPORT'" key="NO_PACKAGES_IN_IMPORT" :is-active="isOpen" @close-modal="closeModal">
-        <template v-slot:header>
-            <h2 class="modal-title">There was a problem importing the profile</h2>
-        </template>
-        <template v-slot:body>
-            <p>None of the packages inside the export were found on Thunderstore.</p>
-            <p>There is nothing to import.</p>
+            <OnlineModList :paged-mod-list="profileMods.known" :read-only="true" />
+            <div v-if="!profileMods.known.length || profileMods.unknown.length" class="notification is-warning margin-top">
+                <p v-if="!profileMods.known.length">
+                    None of the packages in the profile were found on Thunderstore:
+                </p>
+                <p v-else>
+                    Some of the packages in the profile were not found on Thunderstore:
+                </p>
+
+                <p class="margin-top">{{ profileMods.unknown.join(", ") }}</p>
+
+                <p v-if="profileMods.known.length" class="margin-top">
+                    These packages will not be installed.
+                </p>
+                <p v-else class="margin-top">
+                    Ensure the profile is intended for the currently selected game.
+                </p>
+            </div>
         </template>
         <template v-slot:footer>
-            <button
-                id="modal-no-mods-to-import"
-                class="button is-info"
-                @click="closeModal">
-                Close
-            </button>
+            <div class="container is-flex is-justify-content-space-between">
+                <button
+                    id="modal-no-mods-to-import"
+                    class="button is-danger"
+                    @click="closeModal"
+                >
+                    Cancel import
+                </button>
+                <button
+                    id="modal-review-confirmed"
+                    class="button is-info"
+                    :disabled="!profileMods.known.length"
+                    @click="onProfileReviewConfirmed"
+                >
+                    Import
+                </button>
+            </div>
         </template>
     </ModalCard>
 

From b8a5f502492f3f42f670b75fb5cf27e5ca79e3c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Fri, 20 Dec 2024 14:24:52 +0200
Subject: [PATCH 35/95] Allow triggering online mod list update in profile
 import modal

SplashScreen no longer guarantees the online mod list has been loaded
into the memory, or the list might be fetched from IndexedDB and be
outdated. Profile import can't install mods that are not found in the
memory. To remedy the issue, allow users to trigger mod list update
directly from the profile import modal.
---
 .../profiles-modals/ImportProfileModal.vue    | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/components/profiles-modals/ImportProfileModal.vue b/src/components/profiles-modals/ImportProfileModal.vue
index edcfedb9d..2b6042a5f 100644
--- a/src/components/profiles-modals/ImportProfileModal.vue
+++ b/src/components/profiles-modals/ImportProfileModal.vue
@@ -10,6 +10,7 @@ import ThunderstoreMod from "../../model/ThunderstoreMod";
 import ThunderstoreDownloaderProvider from "../../providers/ror2/downloading/ThunderstoreDownloaderProvider";
 import InteractionProvider from "../../providers/ror2/system/InteractionProvider";
 import { ProfileImportExport } from "../../r2mm/mods/ProfileImportExport";
+import { valueToReadableDate } from "../../utils/DateUtils";
 import * as ProfileUtils from "../../utils/ProfileUtils";
 import { ModalCard } from "../all";
 import ProfilesMixin from "../mixins/ProfilesMixin.vue";
@@ -20,6 +21,7 @@ import OnlineModList from "../views/OnlineModList.vue";
     components: { OnlineModList, ModalCard}
 })
 export default class ImportProfileModal extends mixins(ProfilesMixin) {
+    valueToReadableDate = valueToReadableDate;
     private importUpdateSelection: 'CREATE' | 'UPDATE' = 'CREATE';
     private importPhaseDescription: string = 'Downloading mods: 0%';
     private importViaCodeInProgress: boolean = false;
@@ -321,6 +323,29 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
                 <p v-else class="margin-top">
                     Ensure the profile is intended for the currently selected game.
                 </p>
+
+                <p class="margin-top">
+                    Updating the mod list from Thunderstore might solve this issue.
+
+                    <span v-if="$store.state.tsMods.modsLastUpdated">
+                        The mod list was last updated on {{ valueToReadableDate($store.state.tsMods.modsLastUpdated) }}.
+                    </span>
+
+                    <br />
+
+                    <span v-if="$store.state.tsMods.isThunderstoreModListUpdateInProgress">
+                        {{ $store.state.tsMods.thunderstoreModListUpdateStatus }}
+                    </span>
+                    <span v-else-if="$store.state.tsMods.thunderstoreModListUpdateError">
+                        Error updating the mod list:
+                        {{ $store.state.tsMods.thunderstoreModListUpdateError }}.
+                        <a @click="$store.dispatch('tsMods/fetchAndProcessPackageList')">Retry</a>?
+                    </span>
+                    <span v-else>
+                        Would you like to
+                        <a @click="$store.dispatch('tsMods/fetchAndProcessPackageList')">update now</a>?
+                    </span>
+                </p>
             </div>
         </template>
         <template v-slot:footer>

From 7b6d3e7a0b117a8e8ed77e51064c71e1fd1604cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Tue, 31 Dec 2024 10:15:29 +0200
Subject: [PATCH 36/95] Change when and how the mod exclusion list is loaded

- Load the exclusion list on app startup. This reduces the time spent
  on the Splash view, while still avoiding dealing with the loading of
  the exclusion list during mod list updates.
  - The downside to this approach is that the user can no longer force
    refresh by changing the game. If deemed necessary, we can later
    change the process to be triggered when user enters the game
    selection screen
  - It's also worth noting the default game's (ROR2) exclusion list is
    always used, as the list is loaded before the game is selected. In
    practice this doesn't matter as all games use the same list anyway.
    The intention is to drop support for game specific exclusions lists
  - As the list is same for all games, it's not (currently) reset when
    user returns to game selection screen
- The old implementation read the exclusion list from online (with long
  timeouts and multiple retries) and used the bundled list as a
  fallback. New implementation reads the list from the file first to
  ensure we have some values ASAP, and then tries to load updates on
  the background
- As the loading is now always done on the background, progress
  indicators were no longer needed
- As getPacakges had been deprecated earlier, there was no longer a
  reason to keep ConnectionProvider around after the changes
---
 src/App.vue                                   |   5 +-
 src/components/mixins/SplashMixin.vue         |  21 ----
 src/pages/Splash.vue                          |   1 -
 .../generic/connection/ConnectionProvider.ts  |  28 -----
 src/r2mm/connection/ConnectionProviderImpl.ts | 116 ------------------
 src/store/modules/TsModsModule.ts             |  47 ++++---
 src/utils/HttpUtils.ts                        |   3 +-
 7 files changed, 32 insertions(+), 189 deletions(-)
 delete mode 100644 src/providers/generic/connection/ConnectionProvider.ts
 delete mode 100644 src/r2mm/connection/ConnectionProviderImpl.ts

diff --git a/src/App.vue b/src/App.vue
index f8ce1919f..1043cc617 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -44,8 +44,6 @@ import ProfileInstallerProvider from './providers/ror2/installing/ProfileInstall
 import InstallationRules from './r2mm/installing/InstallationRules';
 import InstallationRuleApplicator from './r2mm/installing/default_installation_rules/InstallationRuleApplicator';
 import GenericProfileInstaller from './r2mm/installing/profile_installers/GenericProfileInstaller';
-import ConnectionProviderImpl from './r2mm/connection/ConnectionProviderImpl';
-import ConnectionProvider from './providers/generic/connection/ConnectionProvider';
 import UtilityMixin from './components/mixins/UtilityMixin.vue';
 import ErrorModal from './components/modals/ErrorModal.vue';
 
@@ -102,11 +100,10 @@ export default class App extends mixins(UtilityMixin) {
         });
 
         this.$store.commit('updateModLoaderPackageNames');
+        this.$store.dispatch('tsMods/updateExclusions');
     }
 
     beforeCreate() {
-
-        ConnectionProvider.provide(() => new ConnectionProviderImpl());
         FsProvider.provide(() => new NodeFs());
 
         ProfileProvider.provide(() => new ProfileImpl());
diff --git a/src/components/mixins/SplashMixin.vue b/src/components/mixins/SplashMixin.vue
index 7cf596e8e..dca87b239 100644
--- a/src/components/mixins/SplashMixin.vue
+++ b/src/components/mixins/SplashMixin.vue
@@ -47,12 +47,10 @@ export default class SplashMixin extends Vue {
             const packageListIndex = await this.fetchPackageListIndex();
             const packageListChunks = await this.fetchPackageListChunksIfUpdated(packageListIndex);
             this.getRequestItem('ThunderstoreDownload').setProgress(100);
-            await this.updateExclusionsIfNeeded(packageListIndex, packageListChunks);
             hasUpdatedCache = await this.writeModsToPersistentCacheIfUpdated(packageListIndex, packageListChunks);
         }
 
         this.getRequestItem('ThunderstoreDownload').setProgress(100);
-        this.getRequestItem('ExclusionsList').setProgress(100);
 
         if (hasPriorCache || hasUpdatedCache) {
             await this.triggerStoreModListUpdate();
@@ -122,25 +120,6 @@ export default class SplashMixin extends Vue {
         }
     }
 
-    /***
-     * Update community specific mod exclusion list into Vuex.
-     * This is needed only if we are about to update the package list into IndedexDB.
-     */
-    async updateExclusionsIfNeeded(
-        packageListIndex?: PackageListIndex,
-        packageListChunks?: PackageListChunks
-    ) {
-        if (packageListIndex && packageListChunks) {
-            const showProgress = (progress: number) => {
-                this.loadingText = 'Updating mod exclusion list';
-                this.getRequestItem('ExclusionsList').setProgress(progress);
-            };
-            await this.$store.dispatch('tsMods/updateExclusions', showProgress);
-        }
-
-        this.getRequestItem('ExclusionsList').setProgress(100);
-    }
-
     /***
      * Update a fresh package list to the IndexedDB cache.
      * Done only if a fresh list was loaded successfully from the API.
diff --git a/src/pages/Splash.vue b/src/pages/Splash.vue
index d26ba572c..b0a8ecfe8 100644
--- a/src/pages/Splash.vue
+++ b/src/pages/Splash.vue
@@ -149,7 +149,6 @@ export default class Splash extends mixins(SplashMixin) {
     requests = [
         new RequestItem('UpdateCheck', 0),
         new RequestItem('ThunderstoreDownload', 0),
-        new RequestItem('ExclusionsList', 0),
         new RequestItem('CacheOperations', 0)
     ];
 
diff --git a/src/providers/generic/connection/ConnectionProvider.ts b/src/providers/generic/connection/ConnectionProvider.ts
deleted file mode 100644
index 83c9af041..000000000
--- a/src/providers/generic/connection/ConnectionProvider.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import ApiResponse from '../../../model/api/ApiResponse';
-import Game from '../../../model/game/Game';
-import ProviderUtils from '../ProviderUtils';
-
-export type DownloadProgressed = (percentDownloaded: number) => void;
-
-export default abstract class ConnectionProvider {
-
-    private static provider: () => ConnectionProvider;
-    static provide(provided: () => ConnectionProvider): void {
-        this.provider = provided;
-    }
-
-    public static get instance(): ConnectionProvider {
-        if (ConnectionProvider.provider === undefined) {
-            ProviderUtils.throwNotProvidedError("ConnectionProvider");
-        }
-        return ConnectionProvider.provider();
-    }
-
-    public abstract getExclusions(downloadProgressed?: DownloadProgressed, retries?: number): Promise<string[]>;
-    public abstract getPackages(
-        game: Game,
-        downloadProgressed?: DownloadProgressed,
-        retries?: number
-    ): Promise<ApiResponse>;
-
-}
diff --git a/src/r2mm/connection/ConnectionProviderImpl.ts b/src/r2mm/connection/ConnectionProviderImpl.ts
deleted file mode 100644
index 961419e26..000000000
--- a/src/r2mm/connection/ConnectionProviderImpl.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import axios from 'axios';
-
-import ApiResponse, { isApiResonse } from '../../model/api/ApiResponse';
-import Game from '../../model/game/Game';
-import GameManager from '../../model/game/GameManager';
-import ConnectionProvider, { DownloadProgressed } from '../../providers/generic/connection/ConnectionProvider';
-import LoggerProvider, { LogSeverity } from '../../providers/ror2/logging/LoggerProvider';
-import { sleep } from '../../utils/Common';
-import { makeLongRunningGetRequest } from '../../utils/HttpUtils';
-
-export default class ConnectionProviderImpl extends ConnectionProvider {
-
-    private cleanExclusions(exclusions: string|string[]) {
-        const exclusions_ = Array.isArray(exclusions) ? exclusions : exclusions.split("\n");
-        return exclusions_.map((e) => e.trim()).filter(Boolean);
-    }
-
-    private getExclusionsFromInternalFile() {
-        const exclusionList: {exclusions: string[]} = require("../../../modExclusions.json");
-        return this.cleanExclusions(exclusionList.exclusions);
-    }
-
-    private async getExclusionsFromRemote(downloadProgressed?: DownloadProgressed) {
-        const response = await axios.get(GameManager.activeGame.exclusionsUrl, {
-            onDownloadProgress: progress => {
-                if (downloadProgressed !== undefined) {
-                    downloadProgressed((progress.loaded / progress.total) * 100);
-                }
-            },
-            timeout: 20000
-        });
-
-        if (response.data === undefined) {
-            throw new Error("Exclusion response was undefined.");
-        }
-
-        return this.cleanExclusions(response.data as string);
-    }
-
-    // Deprecated since ConnectionProviderImpl.getPackages is deprecated.
-    private async getPackagesFromRemote(game: Game, downloadProgressed?: DownloadProgressed) {
-        const response = await makeLongRunningGetRequest(
-            game.thunderstoreUrl,
-            {downloadProgressed}
-        )
-
-        if (isApiResonse(response)) {
-            return response as ApiResponse;
-        }
-
-        LoggerProvider.instance.Log(
-            LogSeverity.ACTION_STOPPED,
-            `Response data from API was invalid: ${JSON.stringify(response)}`
-        );
-
-        throw new Error("Package response was invalid.");
-    }
-
-    /**
-     * Return a list of packages that might be returned by Thunderstore
-     * API but which should not be treated as valid mods by the manager.
-     *
-     * E.g. the mod manager itself is usually listed under a community
-     * for easy access, but attempting to install it as a mod makes no
-     * sense.
-     */
-    public async getExclusions(downloadProgressed?: DownloadProgressed, retries = 4): Promise<string[]> {
-        if (retries < 0) {
-            throw new Error("Parameter `retries` can't be a negative number");
-        }
-
-        const error = `Error while fetching exclusions (${retries} attempts left):`;
-
-        if (retries === 0) {
-            try {
-                return await this.getExclusionsFromRemote(downloadProgressed);
-            } catch (e) {
-                console.error(error, e);
-                console.log("Reading exclusions from local file");
-                return this.getExclusionsFromInternalFile();
-            }
-        }
-
-        try {
-            return await this.getExclusionsFromRemote(downloadProgressed);
-        } catch (e) {
-            console.error(error, e);
-            await sleep(1000);
-            return this.getExclusions(downloadProgressed, retries - 1);
-        }
-    }
-
-    /**
-     * Deprecated: use TsModsModule.fetchPackageListChunks instead.
-     * Return packages for given game from Thunderstore API
-     */
-    public async getPackages(game: Game, downloadProgressed?: DownloadProgressed, retries = 0): Promise<ApiResponse> {
-        if (retries < 0) {
-            throw new Error("Parameter `retries` can't be a negative number");
-        }
-
-        try {
-            return await this.getPackagesFromRemote(game, downloadProgressed);
-        } catch (e) {
-            console.error(`Error while fetching packages (${retries} attempts left):`, e);
-
-            if (retries > 0) {
-                await sleep(1000);
-                return this.getPackages(game, downloadProgressed, retries - 1);
-            } else {
-                throw e;
-            }
-        }
-    }
-
-}
diff --git a/src/store/modules/TsModsModule.ts b/src/store/modules/TsModsModule.ts
index e92550d15..33f5ed171 100644
--- a/src/store/modules/TsModsModule.ts
+++ b/src/store/modules/TsModsModule.ts
@@ -6,12 +6,11 @@ import ManifestV2 from '../../model/ManifestV2';
 import ThunderstoreMod from '../../model/ThunderstoreMod';
 import VersionNumber from '../../model/VersionNumber';
 import CdnProvider from '../../providers/generic/connection/CdnProvider';
-import ConnectionProvider from '../../providers/generic/connection/ConnectionProvider';
 import * as PackageDb from '../../r2mm/manager/PackageDexieStore';
 import { isEmptyArray, isStringArray } from '../../utils/ArrayUtils';
 import { retry } from '../../utils/Common';
 import { Deprecations } from '../../utils/Deprecations';
-import { fetchAndProcessBlobFile } from '../../utils/HttpUtils';
+import { fetchAndProcessBlobFile, getAxiosWithTimeouts } from '../../utils/HttpUtils';
 
 export interface CachedMod {
     tsMod: ThunderstoreMod | undefined;
@@ -124,7 +123,6 @@ export const TsModsModule = {
         reset(state: State) {
             state.cache = new Map<string, CachedMod>();
             state.deprecated = new Map<string, boolean>();
-            state.exclusions = undefined;
             state.mods = [];
             state.modsLastUpdated = undefined;
             state.thunderstoreModListUpdateError = '';
@@ -143,8 +141,9 @@ export const TsModsModule = {
         setModsLastUpdated(state, payload: Date|undefined) {
             state.modsLastUpdated = payload;
         },
-        setExclusions(state, payload: string[]) {
-            state.exclusions = payload;
+        setExclusions(state, payload: string|string[]) {
+            const exclusions_ = Array.isArray(payload) ? payload : payload.split('\n');
+            state.exclusions = exclusions_.map((e) => e.trim()).filter(Boolean);
         },
         setThunderstoreModListUpdateError(state, error: string|unknown) {
             if (typeof error === 'string') {
@@ -290,12 +289,32 @@ export const TsModsModule = {
             profileMods.forEach(getters['cachedMod']);
         },
 
-        async updateExclusions(
-            {commit},
-            progressCallback?: ProgressCallback
-        ) {
-            const exclusions = await ConnectionProvider.instance.getExclusions(progressCallback);
-            commit('setExclusions', exclusions);
+        async updateExclusions({commit, rootState}) {
+            // Read exclusion list from a bundled file to have some values available ASAP.
+            const exclusionList: {exclusions: string[]} = require('../../../modExclusions.json');
+            commit('setExclusions', exclusionList.exclusions);
+
+            const attempts = 5;
+            const interval = 1000;
+            const timeout = 20000;
+
+            // Check for exclusion list updates from online.
+            try {
+                const axios = getAxiosWithTimeouts(timeout, timeout);
+                const response = await retry(
+                    () => axios.get(rootState.activeGame.exclusionsUrl),
+                    attempts,
+                    interval
+                );
+
+                if (typeof response.data === 'string') {
+                    commit('setExclusions', response.data);
+                } else {
+                    throw new Error(`Received invalid exclusion list response from API: ${response.data}`);
+                }
+            } catch (e) {
+                console.error(e);
+            }
         },
 
         async updateMods({commit, dispatch, rootState}) {
@@ -316,12 +335,6 @@ export const TsModsModule = {
             {dispatch, rootState, state},
             {chunks, indexHash}: {chunks: PackageListChunks, indexHash: string}
         ) {
-            // Splash screen skipped this if there was no need to update the
-            // package list. It may be needed later by e.g. the background update.
-            if (state.exclusions === undefined) {
-                await dispatch('updateExclusions');
-            }
-
             const filtered = chunks.map((chunk) => chunk.filter(
                 (pkg) => !state.exclusions!.includes(pkg.full_name)
             ));
diff --git a/src/utils/HttpUtils.ts b/src/utils/HttpUtils.ts
index 7f6f5d4ef..83aa1d305 100644
--- a/src/utils/HttpUtils.ts
+++ b/src/utils/HttpUtils.ts
@@ -1,6 +1,5 @@
 import axios, { AxiosRequestConfig } from "axios";
 
-import { DownloadProgressed } from "../providers/generic/connection/ConnectionProvider";
 import { decompressArrayBuffer } from "./GzipUtils";
 
 const newAbortSignal = (timeoutMs: number) => {
@@ -35,7 +34,7 @@ interface LongRunningRequestOptions {
     /** Values passed as is to Axios constructor */
     axiosConfig?: AxiosRequestConfig;
     /** Custom function to be called when progress is made. */
-    downloadProgressed?: DownloadProgressed;
+    downloadProgressed?: (percentDownloaded: number) => void;
     /**
      * Time (in ms) the request has to trigger the first download
      * progress event. This can be used to timeout early if a connection

From 2b76ee9969f3c87d386c3a9e11e5454f2bd2ee1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Tue, 31 Dec 2024 10:53:25 +0200
Subject: [PATCH 37/95] Drop support for game specific exclusion lists

While the feature has been available, there hasn't been need to diverge
from the "global" exclusion list. It wouldn't make much sense either,
as the packages themselves are global, and the visibility in manager
are handled by game specific package listings.
---
 docs/Adding a game.md             |   2 -
 src/model/game/Game.ts            |   8 +-
 src/model/game/GameManager.ts     | 264 +++++++++++++++---------------
 src/store/modules/TsModsModule.ts |  10 +-
 4 files changed, 136 insertions(+), 148 deletions(-)

diff --git a/docs/Adding a game.md b/docs/Adding a game.md
index f4bf17927..86d8a5320 100644
--- a/docs/Adding a game.md	
+++ b/docs/Adding a game.md	
@@ -37,8 +37,6 @@
     - Required for Unreal games relying on unreal-shimloader.
   - **TsUrl**
     - The Thunderstore API endpoint for the listing.
-  - **ExclusionsUrl**
-    - The URL used to load package exclusions. Generally just kept the same. No real reason to change until it becomes a large file as extra overhead to maintain.
   - **Platforms**
     - Array of `StorePlatformMetadata` for the different supported storefronts. Identifier is not required, however is expected for Steam and EGS (more potentially in future).
   - **GameImage**
diff --git a/src/model/game/Game.ts b/src/model/game/Game.ts
index 674a58fa9..4e1d23ae5 100644
--- a/src/model/game/Game.ts
+++ b/src/model/game/Game.ts
@@ -14,7 +14,6 @@ export default class Game {
     private readonly _exeName: string[];
     private readonly _dataFolderName: string;
     private readonly _thunderstoreUrl: string;
-    private readonly _exclusionsUrl: string;
     private readonly _storePlatformMetadata: StorePlatformMetadata[];
     private readonly _gameImage: string;
     private readonly _displayMode: GameSelectionDisplayMode;
@@ -27,7 +26,7 @@ export default class Game {
 
     constructor(displayName: string, internalFolderName: GAME_NAME, settingsIdentifier: string,
                 steamFolderName: string, exeName: string[], dataFolderName: string,
-                tsUrl: string, exclusionsUrl: string, platforms: StorePlatformMetadata[], gameImage: string,
+                tsUrl: string, platforms: StorePlatformMetadata[], gameImage: string,
                 displayMode: GameSelectionDisplayMode, instanceType: GameInstanceType, packageLoader: PackageLoader, additionalSearchStrings?: string[]) {
 
         this._displayName = displayName;
@@ -37,7 +36,6 @@ export default class Game {
         this._exeName = exeName;
         this._dataFolderName = dataFolderName;
         this._thunderstoreUrl = tsUrl;
-        this._exclusionsUrl = exclusionsUrl;
         this._storePlatformMetadata = platforms;
         this._activePlatform = platforms[0];
         this._gameImage = gameImage;
@@ -75,10 +73,6 @@ export default class Game {
         return this._thunderstoreUrl;
     }
 
-    get exclusionsUrl(): string {
-        return this._exclusionsUrl;
-    }
-
     get storePlatformMetadata(): StorePlatformMetadata[] {
         return this._storePlatformMetadata;
     }
diff --git a/src/model/game/GameManager.ts b/src/model/game/GameManager.ts
index 5e0ff2f4c..05a8e4ca2 100644
--- a/src/model/game/GameManager.ts
+++ b/src/model/game/GameManager.ts
@@ -9,8 +9,6 @@ import FileUtils from '../../utils/FileUtils';
 import * as path from 'path';
 
 
-const EXCLUSIONS = 'https://raw.githubusercontent.com/ebkr/r2modmanPlus/master/modExclusions.md';
-
 export default class GameManager {
 
     private static _activeGame: Game;
@@ -18,7 +16,7 @@ export default class GameManager {
     private static _gameList = [
         new Game('Risk of Rain 2', 'RiskOfRain2', 'RiskOfRain2',
             'Risk of Rain 2', ['Risk of Rain 2.exe'], 'Risk of Rain 2_Data',
-            'https://thunderstore.io/c/riskofrain2/api/v1/package-listing-index/', EXCLUSIONS,
+            'https://thunderstore.io/c/riskofrain2/api/v1/package-listing-index/',
             [
                 new StorePlatformMetadata(StorePlatform.STEAM, "632360"),
                 new StorePlatformMetadata(StorePlatform.EPIC_GAMES_STORE, "4b3dcc5723454a47a9112d8fe8fd5f5c"),
@@ -27,19 +25,19 @@ export default class GameManager {
 
         new Game('Thunderstore Dev', 'ThunderstoreDev', 'ThunderstoreBeta',
             'Risk of Rain 2', ['Risk of Rain 2.exe'], 'Risk of Rain 2_Data',
-            'https://thunderstore.dev/c/riskofrain2/api/v1/package-listing-index/', EXCLUSIONS,
+            'https://thunderstore.dev/c/riskofrain2/api/v1/package-listing-index/',
             [new StorePlatformMetadata(StorePlatform.STEAM, "632360")], "ThunderstoreBeta.jpg",
             GameSelectionDisplayMode.HIDDEN, GameInstanceType.GAME, PackageLoader.BEPINEX, ["TS Dev"]),
 
         new Game('Risk of Rain 2 Dedicated Server', 'RiskOfRain2', 'RiskOfRain2Server',
             'Risk of Rain 2 Dedicated Server', ['Risk of Rain 2.exe'], 'Risk of Rain 2_Data',
-            'https://thunderstore.io/c/riskofrain2/api/v1/package-listing-index/', EXCLUSIONS,
+            'https://thunderstore.io/c/riskofrain2/api/v1/package-listing-index/',
             [new StorePlatformMetadata(StorePlatform.STEAM, "1180760")], "RiskOfRain2.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.SERVER, PackageLoader.BEPINEX, ["ROR2"]),
 
         new Game('Dyson Sphere Program', 'DysonSphereProgram', 'DysonSphereProgram',
             'Dyson Sphere Program', ['DSPGAME.exe'], 'DSPGAME_Data',
-            'https://thunderstore.io/c/dyson-sphere-program/api/v1/package-listing-index/', EXCLUSIONS,
+            'https://thunderstore.io/c/dyson-sphere-program/api/v1/package-listing-index/',
             [
                 new StorePlatformMetadata(StorePlatform.STEAM, "1366540"),
                 new StorePlatformMetadata(StorePlatform.XBOX_GAME_PASS, "GameraGame.DysonSphereProgram")
@@ -47,7 +45,7 @@ export default class GameManager {
 
         new Game('Valheim', 'Valheim', 'Valheim',
             'Valheim', ['valheim.exe', 'valheim.x86_64'], 'valheim_Data',
-            'https://thunderstore.io/c/valheim/api/v1/package-listing-index/', EXCLUSIONS,
+            'https://thunderstore.io/c/valheim/api/v1/package-listing-index/',
             [
                 new StorePlatformMetadata(StorePlatform.STEAM, "892970"),
                 new StorePlatformMetadata(StorePlatform.XBOX_GAME_PASS, "CoffeeStainStudios.Valheim")
@@ -55,20 +53,20 @@ export default class GameManager {
 
         new Game('Valheim Dedicated Server', 'Valheim', 'ValheimServer',
             'Valheim dedicated server', ['valheim_server.exe', 'valheim_server.x86_64'], 'valheim_server_Data',
-            'https://thunderstore.io/c/valheim/api/v1/package-listing-index/', EXCLUSIONS,
+            'https://thunderstore.io/c/valheim/api/v1/package-listing-index/',
             [
                 new StorePlatformMetadata(StorePlatform.STEAM, "896660")
             ], "Valheim.jpg", GameSelectionDisplayMode.VISIBLE, GameInstanceType.SERVER, PackageLoader.BEPINEX),
 
         new Game('GTFO', 'GTFO', 'GTFO',
             'GTFO', ['GTFO.exe'], 'GTFO_Data',
-            'https://thunderstore.io/c/gtfo/api/v1/package-listing-index/', EXCLUSIONS,
+            'https://thunderstore.io/c/gtfo/api/v1/package-listing-index/',
             [new StorePlatformMetadata(StorePlatform.STEAM, "493520")], "GTFO.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX),
 
         new Game('Outward', 'Outward', 'Outward',
             'Outward', ['Outward.exe'], 'Outward_Data',
-            'https://thunderstore.io/c/outward/api/v1/package-listing-index/', EXCLUSIONS,
+            'https://thunderstore.io/c/outward/api/v1/package-listing-index/',
             [
                 new StorePlatformMetadata(StorePlatform.STEAM, "794260"),
                 new StorePlatformMetadata(StorePlatform.EPIC_GAMES_STORE, "Viola"),
@@ -77,7 +75,7 @@ export default class GameManager {
 
         new Game('Outward Definitive', 'OutwardDe', 'OutwardDe',
             'Outward/Outward_Defed', ['Outward Definitive Edition.exe'], 'Outward Definitive Edition_Data',
-            'https://thunderstore.io/c/outward/api/v1/package-listing-index/', EXCLUSIONS,
+            'https://thunderstore.io/c/outward/api/v1/package-listing-index/',
             [
                 new StorePlatformMetadata(StorePlatform.STEAM, "1758860"),
                 new StorePlatformMetadata(StorePlatform.EPIC_GAMES_STORE, "f07a51af8ac845ea96f792fb485e04a3"),
@@ -86,55 +84,55 @@ export default class GameManager {
 
         new Game('TaleSpire', 'TaleSpire', 'TaleSpire',
             'TaleSpire', ['TaleSpire.exe'], 'TaleSpire_Data',
-            'https://thunderstore.io/c/talespire/api/v1/package-listing-index/', EXCLUSIONS,
+            'https://thunderstore.io/c/talespire/api/v1/package-listing-index/',
             [new StorePlatformMetadata(StorePlatform.STEAM, "720620")], "TaleSpire.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["TS"]),
 
         new Game("H3VR", "H3VR", "H3VR",
             "H3VR", ["h3vr.exe"], "h3vr_Data",
-            "https://thunderstore.io/c/h3vr/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/h3vr/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "450540")], "H3VR.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["Hot Dogs, Horseshoes & Hand Grenades", "Hot Dogs, Horseshoes and Hand Grenades"]),
 
         new Game("ROUNDS", "ROUNDS", "ROUNDS",
             "ROUNDS", ["Rounds.exe"], "Rounds_Data",
-            "https://thunderstore.io/c/rounds/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/rounds/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1557740")], "ROUNDS.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX),
 
         new Game("Mechanica", "Mechanica", "Mechanica",
             "Mechanica", ["Mechanica.exe"], "Mechanica_Data",
-            "https://thunderstore.io/c/mechanica/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/mechanica/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1226990")], "Mechanica.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX),
 
         new Game("Muck", "Muck", "Muck",
             "Muck", ["Muck.exe", "Muck.x86_64"], "Muck_Data",
-            "https://thunderstore.io/c/muck/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/muck/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1625450")], "Muck.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX),
 
         new Game("BONEWORKS", "BONEWORKS", "BONEWORKS",
             path.join("BONEWORKS", "BONEWORKS"), ["BONEWORKS.exe", "Boneworks_Oculus_Windows64.exe"], "BONEWORKS_Data",
-            "https://thunderstore.io/c/boneworks/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/boneworks/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "823500"), new StorePlatformMetadata(StorePlatform.OCULUS_STORE)], "BONEWORKS.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.MELON_LOADER, ["BW"]),
 
         new Game("Lethal League Blaze", "LethalLeagueBlaze", "LethalLeagueBlaze",
             "LLBlaze", ["LLBlaze.exe", "LLBlaze.x86_64", "LLBlaze.x86", "LLBlaze.app"], "LLBlaze_Data",
-            "https://thunderstore.io/c/lethal-league-blaze/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/lethal-league-blaze/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "553310")], "LethalLeagueBlaze.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["LLB"]),
 
         new Game("Timberborn", "Timberborn", "Timberborn",
             "Timberborn", ["Timberborn.exe"], "Timberborn_Data",
-            "https://thunderstore.io/c/timberborn/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/timberborn/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1062090"), new StorePlatformMetadata(StorePlatform.EPIC_GAMES_STORE, "972a4ca2631e43b4ba7bc3b7586ad8c4"), new StorePlatformMetadata(StorePlatform.OTHER)], "Timberborn.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["TB"]),
 
         new Game("TABS", "TABS", "TotallyAccurateBattleSimulator",
             "Totally Accurate Battle Simulator", ["TotallyAccurateBattleSimulator.exe"], "TotallyAccurateBattleSimulator_Data",
-            "https://thunderstore.io/c/totally-accurate-battle-simulator/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/totally-accurate-battle-simulator/api/v1/package-listing-index/",
             [
                 new StorePlatformMetadata(StorePlatform.STEAM, "508440"),
                 new StorePlatformMetadata(StorePlatform.EPIC_GAMES_STORE, "Driftfish"),
@@ -144,25 +142,25 @@ export default class GameManager {
 
         new Game("Nickelodeon All‑Star Brawl", "NASB", "NASB",
             "Nickelodeon All-Star Brawl", ["Nickelodeon All-Star Brawl.exe"], "Nickelodeon All-Star Brawl_Data",
-            "https://thunderstore.io/c/nasb/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/nasb/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1414850")], "NASB.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["Nickelodeon All-Star Brawl", "NASB"]),
 
         new Game("Inscryption", "Inscryption", "Inscryption",
             "Inscryption", ["Inscryption.exe"], "Inscryption_Data",
-            "https://thunderstore.io/c/inscryption/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/inscryption/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1092790"), new StorePlatformMetadata(StorePlatform.OTHER)], "Inscryption.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX),
 
         new Game("Starsand", "Starsand", "Starsand",
             "Starsand", ["Starsand.exe"], "Starsand_Data",
-            "https://thunderstore.io/c/starsand/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/starsand/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1380220"), new StorePlatformMetadata(StorePlatform.EPIC_GAMES_STORE, "a774278c0813447c96a76b053cbf73ff")], "Starsand.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX),
 
         new Game('Cats are Liquid - A Better Place', 'CatsAreLiquidABP', 'CatsAreLiquidABP',
             'Cats are Liquid - A Better Place', ['CaL-ABP-Windows.exe', "CaL-ABP-Linux.x86_64", 'CaL-ABP-macOS.app'], 'CaL-ABP-Windows_Data',
-            'https://thunderstore.io/c/cats-are-liquid/api/v1/package-listing-index/', EXCLUSIONS,
+            'https://thunderstore.io/c/cats-are-liquid/api/v1/package-listing-index/',
             [
                 new StorePlatformMetadata(StorePlatform.STEAM, "1188080"),
                 new StorePlatformMetadata(StorePlatform.OTHER)
@@ -172,45 +170,45 @@ export default class GameManager {
 
         new Game('Potion Craft', 'PotionCraft', 'PotionCraft',
             'Potion Craft', ['Potion Craft.exe'], 'Potion Craft_Data',
-            'https://thunderstore.io/c/potion-craft/api/v1/package-listing-index/', EXCLUSIONS,
+            'https://thunderstore.io/c/potion-craft/api/v1/package-listing-index/',
             [new StorePlatformMetadata(StorePlatform.STEAM, "1210320")], 'PotionCraft.jpg',
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX,
             ['pc']),
 
         new Game('Nearly Dead', 'NearlyDead', 'NearlyDead',
             'Nearly Dead', ['Nearly Dead.exe'], 'Nearly Dead_Data',
-            'https://thunderstore.io/c/nearly-dead/api/v1/package-listing-index/', EXCLUSIONS,
+            'https://thunderstore.io/c/nearly-dead/api/v1/package-listing-index/',
             [new StorePlatformMetadata(StorePlatform.STEAM, "1268900")], 'NearlyDead.png',
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX,
             ['nd']),
 
         new Game('AGAINST', 'AGAINST', 'AGAINST',
             'AGAINST_steam', ['AGAINST.exe'], "AGAINST_Data",
-            'https://thunderstore.io/c/against/api/v1/package-listing-index/', EXCLUSIONS,
+            'https://thunderstore.io/c/against/api/v1/package-listing-index/',
             [new StorePlatformMetadata(StorePlatform.STEAM, "1584840")], "AGAINST.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, []),
 
         new Game('Rogue Tower', 'RogueTower', 'RogueTower',
             'Rogue Tower', ['Rogue Tower.exe'], "Rogue Tower_Data",
-            'https://thunderstore.io/c/rogue-tower/api/v1/package-listing-index/', EXCLUSIONS,
+            'https://thunderstore.io/c/rogue-tower/api/v1/package-listing-index/',
             [new StorePlatformMetadata(StorePlatform.STEAM, "1843760")], "RogueTower.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ['rt']),
 
         new Game('House of the Dying Sun', 'HOTDS', 'HOTDS',
             'DyingSun', ['dyingsun.exe'], 'dyingsun_Data',
-            'https://thunderstore.io/c/hotds/api/v1/package-listing-index/', EXCLUSIONS,
+            'https://thunderstore.io/c/hotds/api/v1/package-listing-index/',
             [new StorePlatformMetadata(StorePlatform.STEAM, '283160')], "HOTDS.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ['hotds']),
 
         new Game('For The King', 'ForTheKing', 'ForTheKing',
             'For The King', ['FTK.exe'], 'FTK_Data',
-            'https://thunderstore.io/c/for-the-king/api/v1/package-listing-index/', EXCLUSIONS,
+            'https://thunderstore.io/c/for-the-king/api/v1/package-listing-index/',
             [new StorePlatformMetadata(StorePlatform.STEAM, "527230"), new StorePlatformMetadata(StorePlatform.EPIC_GAMES_STORE, "Discus")], "ForTheKing.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["ftk"]),
 
         new Game('Subnautica', 'Subnautica', 'Subnautica',
             'Subnautica', ['Subnautica.exe'], 'Subnautica_Data',
-            'https://thunderstore.io/c/subnautica/api/v1/package-listing-index/', EXCLUSIONS,
+            'https://thunderstore.io/c/subnautica/api/v1/package-listing-index/',
             [
                 new StorePlatformMetadata(StorePlatform.STEAM, "264710"),
                 new StorePlatformMetadata(StorePlatform.EPIC_GAMES_STORE, "Jaguar"),
@@ -219,7 +217,7 @@ export default class GameManager {
 
         new Game('Subnautica: Below Zero', 'SubnauticaBZ', 'SubnauticaBZ',
             'SubnauticaZero', ['SubnauticaZero.exe'], 'SubnauticaZero_Data',
-            'https://thunderstore.io/c/subnautica-below-zero/api/v1/package-listing-index/', EXCLUSIONS,
+            'https://thunderstore.io/c/subnautica-below-zero/api/v1/package-listing-index/',
             [
                 new StorePlatformMetadata(StorePlatform.STEAM, '848450'),
                 new StorePlatformMetadata(StorePlatform.XBOX_GAME_PASS, "UnknownWorldsEntertainmen.SubnauticaBelowZero"),
@@ -227,37 +225,37 @@ export default class GameManager {
 
         new Game("Core Keeper", "CoreKeeper", "CoreKeeper",
             "Core Keeper", ["CoreKeeper.exe"], "CoreKeeper_Data",
-            'https://thunderstore.io/c/core-keeper/api/v1/package-listing-index/', EXCLUSIONS,
+            'https://thunderstore.io/c/core-keeper/api/v1/package-listing-index/',
             [new StorePlatformMetadata(StorePlatform.STEAM, "1621690")], "CoreKeeper.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["ck"]),
 
         new Game("Titanfall 2", "Titanfall2", "Titanfall2",
             "Titanfall2", ["NorthstarLauncher.exe", "Titanfall2.exe"], "",
-            'https://thunderstore.io/c/northstar/api/v1/package-listing-index/', EXCLUSIONS,
+            'https://thunderstore.io/c/northstar/api/v1/package-listing-index/',
             [new StorePlatformMetadata(StorePlatform.STEAM_DIRECT, "1237970"), new StorePlatformMetadata(StorePlatform.ORIGIN, "")], "Titanfall2.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.NORTHSTAR, ["northstar", "ns", "tf2", "tf|2"]),
 
         new Game("Peglin", "Peglin", "Peglin",
             "Peglin", ["Peglin.exe"], "Peglin_Data",
-            "https://thunderstore.io/c/peglin/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/peglin/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1296610"), new StorePlatformMetadata(StorePlatform.OTHER)], "Peglin.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, []),
 
         new Game("V Rising", "VRising", "VRising",
             "VRising", ["VRising.exe"], "VRising_Data",
-            "https://thunderstore.io/c/v-rising/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/v-rising/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1604030")], "VRising.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["vrising"]),
 
         new Game("Hard Bullet", "HardBullet", "HardBullet",
             "Hard Bullet", ["Hard Bullet.exe"], "Hard Bullet_Data",
-            "https://thunderstore.io/c/hard-bullet/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/hard-bullet/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1294760")], "HardBullet.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.MELON_LOADER, ["hb"]),
 
         new Game("20 Minutes Till Dawn", "20MinutesTillDawn", "20MinutesTillDawn",
             "20MinuteTillDawn", ["MinutesTillDawn.exe"], "MinutesTillDawn_Data",
-            "https://thunderstore.io/c/20-minutes-till-dawn/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/20-minutes-till-dawn/api/v1/package-listing-index/",
             [
                 new StorePlatformMetadata(StorePlatform.STEAM, "1966900"),
                 new StorePlatformMetadata(StorePlatform.EPIC_GAMES_STORE, "4656facc740742a39e265b026e13d075")
@@ -266,49 +264,49 @@ export default class GameManager {
 
         new Game("Green Hell VR", "GreenHellVR", "GreenHellVR",
             "Green Hell VR", ["GHVR.exe"], "GHVR_Data",
-            "https://thunderstore.io/c/green-hell-vr/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/green-hell-vr/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1782330"), new StorePlatformMetadata(StorePlatform.OCULUS_STORE)], "GreenHellVR.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["ghvr"]),
 
         new Game("VTOL VR", "VTOL_VR", "VTOL_VR",
             "VTOL VR", ["VTOLVR.exe"], "VTOLVR_Data",
-            "https://thunderstore.io/c/vtol-vr/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/vtol-vr/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "667970")], "VtolVR.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, []),
 
         new Game("Backpack Hero", "BackpackHero", "BackpackHero",
             "Backpack Hero", ["Backpack Hero.exe", "linux.x86_64"], "Backpack Hero_Data",
-            "https://thunderstore.io/c/backpack-hero/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/backpack-hero/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1970580")], "BackpackHero.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.MELON_LOADER, ["bh", "farlands"]),
 
         new Game("Stacklands", "Stacklands", "Stacklands",
             "Stacklands", ["Stacklands.exe"], "Stacklands_Data",
-            "https://thunderstore.io/c/stacklands/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/stacklands/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1948280")], "Stacklands.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, []),
 
         new Game("Enter the Gungeon", "ETG", "EnterTheGungeon",
             "Enter the Gungeon", ["EtG.exe"], "EtG_Data",
-            "https://thunderstore.io/c/enter-the-gungeon/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/enter-the-gungeon/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "311690"), new StorePlatformMetadata(StorePlatform.EPIC_GAMES_STORE, "Garlic"), new StorePlatformMetadata(StorePlatform.OTHER)], "EnterTheGungeon.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["etg"]),
 
         new Game("Ravenfield", "Ravenfield", "Ravenfield",
             "Ravenfield", ["ravenfield.exe"], "ravenfield_Data",
-            "https://thunderstore.io/c/ravenfield/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/ravenfield/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "636480")], "Ravenfield.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["rf"]),
 
         new Game("Aloft", "Aloft", "Aloft",
             "Aloft Demo", ["Aloft.exe"], "Aloft_Data",
-            "https://thunderstore.io/c/aloft/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/aloft/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2051980")], "Aloft.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, []),
 
         new Game("Cult of the Lamb", "COTL", "COTL",
             "Cult of the Lamb", ["Cult Of The Lamb.exe"], "Cult Of The Lamb_Data",
-            "https://thunderstore.io/c/cult-of-the-lamb/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/cult-of-the-lamb/api/v1/package-listing-index/",
             [
                 new StorePlatformMetadata(StorePlatform.STEAM, "1313140"),
                 new StorePlatformMetadata(StorePlatform.OTHER)
@@ -316,182 +314,182 @@ export default class GameManager {
 
         new Game("Chrono Ark", "ChronoArk", "ChronoArk",
             path.join("Chrono Ark", "x64", "Master"), ["ChronoArk.exe"], "ChronoArk_Data",
-            "https://thunderstore.io/c/chrono-ark/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/chrono-ark/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1188930")], "ChronoArk.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, []),
 
         new Game("BONELAB", "BONELAB", "BONELAB",
             "BONELAB", ["BONELAB_Steam_Windows64.exe", "BONELAB_Oculus_Windows64.exe"], "BONELAB_Steam_Windows64",
-            "https://thunderstore.io/c/bonelab/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/bonelab/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1592190"), new StorePlatformMetadata(StorePlatform.OCULUS_STORE)], "BONELAB.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.MELON_LOADER, ["BL"]),
 
         new Game("Trombone Champ", "TromboneChamp", "TromboneChamp",
             "TromboneChamp", ["TromboneChamp.exe"], "TromboneChamp_Data",
-            "https://thunderstore.io/c/trombone-champ/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/trombone-champ/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1059990")], "TromboneChamp.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["tc"]),
 
         new Game("Rogue : Genesia", "RogueGenesia", "RogueGenesia",
             "Rogue Genesia", ["Rogue Genesia.exe"], "Rogue Genesia_Data",
-            "https://thunderstore.io/c/rogue-genesia/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/rogue-genesia/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2067920")], "RogueGenesia.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["rg"]),
 
         new Game("Across the Obelisk", "AcrossTheObelisk", "AcrossTheObelisk",
             "Across the Obelisk", ["AcrossTheObelisk.exe"], "AcrossTheObelisk_Data",
-            "https://thunderstore.io/c/across-the-obelisk/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/across-the-obelisk/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1385380")], "AcrossTheObelisk.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["ato", "ao"]),
 
         new Game("ULTRAKILL", "ULTRAKILL", "ULTRAKILL",
             "ULTRAKILL", ["ULTRAKILL.exe"], "ULTRAKILL_Data",
-            "https://thunderstore.io/c/ultrakill/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/ultrakill/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1229490")], "ULTRAKILL.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["uk"]),
 
         new Game("Ultimate Chicken Horse", "UltimateChickenHorse", "UltimateChickenHorse",
             "Ultimate Chicken Horse", ["UltimateChickenHorse.exe"], "UltimateChickenHorse_Data",
-            "https://thunderstore.io/c/ultimate-chicken-horse/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/ultimate-chicken-horse/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "386940")], "ultimate-chicken-horse.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["uch"]),
 
         new Game("Atrio: The Dark Wild", "AtrioTheDarkWild", "AtrioTheDarkWild",
             "Atrio The Dark Wild", ["Atrio.exe"], "Atrio_Data",
-            "https://thunderstore.io/c/atrio-the-dark-wild/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/atrio-the-dark-wild/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1125390")], "atrio-the-dark-wild.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["adw"]),
 
         new Game("Brotato", "Brotato", "Brotato",
             "Brotato", ["Brotato.exe"], "",
-            "https://thunderstore.io/c/brotato/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/brotato/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1942280")], "brotato.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.GODOT_ML, []),
 
         new Game("Ancient Dungeon VR", "AncientDungeonVR", "AncientDungeonVR",
             "Ancient Dungeon VR", ["Ancient_Dungeon.exe"], "Ancient_Dungeon_Data",
-            "https://thunderstore.io/c/ancient-dungeon-vr/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/ancient-dungeon-vr/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1125240"), new StorePlatformMetadata(StorePlatform.OCULUS_STORE)], "ancient-dungeon-vr.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.ANCIENT_DUNGEON_VR, ["adv"]),
 
         new Game("RUMBLE", "RUMBLE", "RUMBLE",
             "RUMBLE", ["RUMBLE.exe"], "RUMBLE_Data",
-            "https://thunderstore.io/c/rumble/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/rumble/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "890550")], "RUMBLE.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.MELON_LOADER, []),
 
         new Game("Dome Keeper", "DomeKeeper", "DomeKeeper",
             "Dome Keeper", ["domekeeper.exe"], "",
-            "https://thunderstore.io/c/dome-keeper/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/dome-keeper/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1637320")], "dome-keeper.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.GODOT_ML, ["dk"]),
 
         new Game("Skul: The Hero Slayer", "SkulTheHeroSlayer", "SkulTheHeroSlayer",
             "Skul", ["Skul.exe"], "Skul_Data",
-            "https://thunderstore.io/c/skul-the-hero-slayer/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/skul-the-hero-slayer/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1147560")], "skul-the-hero-slayer.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, []),
 
         new Game("Sons Of The Forest", "SonsOfTheForest", "SonsOfTheForest",
             "Sons Of The Forest", ["SonsOfTheForest.exe"], "SonsOfTheForest_Data",
-            "https://thunderstore.io/c/sons-of-the-forest/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/sons-of-the-forest/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1326470")], "sons-of-the-forest.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["sotf"]),
 
         new Game("The Ouroboros King", "TheOuroborosKing", "TheOuroborosKing",
             "The Ouroboros King", ["The Ouroboros King.exe"], "The Ouroboros King_Data",
-            "https://thunderstore.io/c/the-ouroboros-king/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/the-ouroboros-king/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2096510")], "the-ouroboros-king.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["tok"]),
 
         new Game("Wrestling Empire", "WrestlingEmpire", "WrestlingEmpire",
             "Wrestling Empire", ["Wrestling Empire.exe"], "Wrestling Empire_Data",
-            "https://thunderstore.io/c/wrestling-empire/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/wrestling-empire/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1620340")], "wrestling-empire.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["we"]),
 
         new Game("Receiver 2", "Receiver2", "Receiver2",
             "Receiver 2", ["Receiver2.exe"], "Receiver2_Data",
-            "https://thunderstore.io/c/receiver-2/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/receiver-2/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1129310")], "receiver-2.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["rec2"]),
 
         new Game("The Planet Crafter", "ThePlanetCrafter", "ThePlanetCrafter",
             "The Planet Crafter", ["Planet Crafter.exe"], "ThePlanetCrafter_Data",
-            "https://thunderstore.io/c/the-planet-crafter/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/the-planet-crafter/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1284190")], "the-planet-crafter.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["tpc"]),
 
         new Game("Patch Quest", "PatchQuest", "PatchQuest",
             "Patch Quest", ["Patch Quest.exe"], "PatchQuest_Data",
-            "https://thunderstore.io/c/patch-quest/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/patch-quest/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1347970")], "patch-quest.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.MELON_LOADER, ["pq"]),
 
         new Game("Shadows Over Loathing", "ShadowsOverLoathing", "ShadowsOverLoathing",
             path.join("Shadows Over Loathing", "Shadows Over Loathing"), ["Shadows Over Loathing.exe"], "ShadowsOverLoathing_Data",
-            "https://thunderstore.io/c/shadows-over-loathing/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/shadows-over-loathing/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1939160")], "shadows-over-loathing.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["sol"]),
 
         new Game("West of Loathing", "WestofLoathing", "WestofLoathing",
             "West of Loathing", ["West of Loathing.exe"], "WestofLoathing_Data",
-            "https://thunderstore.io/c/west-of-loathing/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/west-of-loathing/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "597220")], "west-of-loathing.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["wol"]),
 
         new Game("Sun Haven", "SunHaven", "SunHaven",
             "Sun Haven", ["Sun Haven.exe"], "SunHaven_Data",
-            "https://thunderstore.io/c/sun-haven/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/sun-haven/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1432860")], "sun-haven.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["sh"]),
 
         new Game("Wildfrost", "Wildfrost", "Wildfrost",
             "Wildfrost", ["Wildfrost.exe"], "Wildfrost_Data",
-            "https://thunderstore.io/c/wildfrost/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/wildfrost/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1811990")], "wildfrost.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["wfrst"]),
 
         new Game("Shadows of Doubt", "ShadowsofDoubt", "ShadowsofDoubt",
             "Shadows of Doubt", ["Shadows of Doubt.exe"], "ShadowsofDoubt_Data",
-            "https://thunderstore.io/c/shadows-of-doubt/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/shadows-of-doubt/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "986130")], "shadows-of-doubt.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["sod"]),
 
         new Game("Garfield Kart - Furious Racing", "GarfieldKartFuriousRacing", "GarfieldKartFuriousRacing",
             "Garfield Kart - Furious Racing", ["Garfield Kart Furious Racing.exe"], "GarfieldKartFuriousRacing_Data",
-            "https://thunderstore.io/c/garfield-kart-furious-racing/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/garfield-kart-furious-racing/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1085510")], "garfield-kart-furious-racing.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["gkfr"]),
 
         new Game("Techtonica", "Techtonica", "Techtonica",
             "Techtonica", ["Techtonica.exe"], "Techtonica_Data",
-            "https://thunderstore.io/c/techtonica/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/techtonica/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1457320")], "techtonica.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["tt"]),
 
         new Game("Thronefall", "Thronefall", "Thronefall",
             "Thronefall", ["Thronefall.exe"], "Thronefall_Data",
-            "https://thunderstore.io/c/thronefall/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/thronefall/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2239150")], "thronefall.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["tf"]),
 
         new Game("We Love Katamari REROLL+ Royal Reverie", "WeLoveKatamariRerollRoyalReverie", "WeLoveKatamariRerollRoyalReverie",
             "WLKRR", ["WLKRR.exe"], "WeLoveKatamariRerollRoyalReverie_Data",
-            "https://thunderstore.io/c/we-love-katamari-reroll-royal-reverie/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/we-love-katamari-reroll-royal-reverie/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1730700")], "WLKRR.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["wlkrr"]),
 
         new Game("Wizard of Legend", "WizardOfLegend", "WizardOfLegend",
             "Wizard of Legend", ["WizardOfLegend.exe"], "WizardOfLegend_Data",
-            "https://thunderstore.io/c/wizard-of-legend/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/wizard-of-legend/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "445980")], "WizardOfLegend.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["wol"]),
 
         new Game(
             "Bomb Rush Cyberfunk", "BombRushCyberfunk", "BombRushCyberfunk",
             "BombRushCyberfunk", ["Bomb Rush Cyberfunk.exe"], "Bomb Rush Cyberfunk_Data",
-            "https://thunderstore.io/c/bomb-rush-cyberfunk/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/bomb-rush-cyberfunk/api/v1/package-listing-index/",
             [
                 new StorePlatformMetadata(StorePlatform.STEAM, "1353230"),
                 new StorePlatformMetadata(StorePlatform.XBOX_GAME_PASS, "TeamReptile.BombRushCyberfunk"),
@@ -501,197 +499,197 @@ export default class GameManager {
         new Game(
             "TouhouLostBranchOfLegend", "TouhouLostBranchOfLegend", "TouhouLostBranchOfLegend",
             "LBoL", ["LBoL.exe"], "LBoL_Data",
-            "https://thunderstore.io/c/touhou-lost-branch-of-legend/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/touhou-lost-branch-of-legend/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1140150")], "TouhouLostBranchOfLegend.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["lbol"]),
 
          new Game("Wizard With A Gun", "WizardWithAGun", "WizardWithAGun",
             "Wizard With A Gun", ['wizardwithagun.exe'], "wizardwithagun_Data",
-            "https://thunderstore.io/c/wizard-with-a-gun/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/wizard-with-a-gun/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1150530")], "WizardWithAGun.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["wizgun"]),
 
         new Game("Sunkenland", "Sunkenland", "Sunkenland",
             "Sunkenland", ["Sunkenland.exe"], "Sunkenland_Data",
-            "https://thunderstore.io/c/sunkenland/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/sunkenland/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2080690")], "Sunkenland.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, []),
 
         new Game("Atomicrops", "Atomicrops", "Atomicrops",
             "Atomicrops", ["Atomicrops.exe"], "Atomicrops_Data",
-            "https://thunderstore.io/c/atomicrops/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/atomicrops/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "757320")], "Atomicrops.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["ac"]),
 
         new Game("Erenshor", "Erenshor", "Erenshor",
             "Erenshor", ["Erenshor.exe"], "Erenshor_Data",
-            "https://thunderstore.io/c/erenshor/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/erenshor/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2382520")], "Erenshor.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, []),
 
         new Game("Last Train Outta' Wormtown", "LastTrainOuttaWormtown", "LastTrainOuttaWormtown",
             "Last Train Outta' Wormtown", ["Last Train Out Of WormTown.exe"], "Last Train Out Of WormTown_Data",
-            "https://thunderstore.io/c/last-train-outta-wormtown/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/last-train-outta-wormtown/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2318480")], "LastTrainOuttaWormtown.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["ltow"]),
 
         new Game("DREDGE", "Dredge", "Dredge",
             "DREDGE", ["DREDGE.exe"], "DREDGE_Data",
-            "https://thunderstore.io/c/dredge/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/dredge/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1562430")], "Dredge.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, []),
 
         new Game("Cities: Skylines II", "CitiesSkylines2", "CitiesSkylines2",
             "Cities Skylines II", ["Cities2.exe"], "CitiesSkylines2_Data",
-            "https://thunderstore.io/c/cities-skylines-ii/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/cities-skylines-ii/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "949230"), new StorePlatformMetadata(StorePlatform.XBOX_GAME_PASS, "ParadoxInteractive.CitiesSkylinesII-PCEdition")], "CitiesSkylines2.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["cs2"]),
 
         new Game("Lethal Company", "LethalCompany", "LethalCompany",
             "Lethal Company", ["Lethal Company.exe"], "Lethal Company_Data",
-            "https://thunderstore.io/c/lethal-company/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/lethal-company/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1966720")], "LethalCompany.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["lc"]),
 
         new Game("Meeple Station", "MeepleStation", "MeepleStation",
             "Meeple Station", ["Meeple Station.exe"], "MeepleStation_Data",
-            "https://thunderstore.io/c/meeple-station/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/meeple-station/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "900010")], "MeepleStation.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["ms"]),
 
         new Game("Void Crew", "VoidCrew", "VoidCrew",
             "Void Crew", ["Void Crew.exe"], "VoidCrew_Data",
-            "https://thunderstore.io/c/void-crew/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/void-crew/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1063420")], "VoidCrew.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["vc"]),
 
         new Game("Sailwind", "Sailwind", "Sailwind",
             "Sailwind", ["Sailwind.exe"], "Sailwind_Data",
-            "https://thunderstore.io/c/sailwind/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/sailwind/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1764530")], "Sailwind.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, []),
 
         new Game(
             "Voices of the Void", "VotV", "VotV",
             "", ["VotV.exe"], "VotV",
-            "https://thunderstore.io/c/voices-of-the-void/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/voices-of-the-void/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.OTHER)], "VotV.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.SHIMLOADER, ["votv"]),
 
         new Game(
             "Palworld", "Palworld", "Palworld",
             "Palworld", ["Palworld.exe"], "Pal",
-            "https://thunderstore.io/c/palworld/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/palworld/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1623730")], "Palworld.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.SHIMLOADER, ["palworld"]),
 
         new Game("Plasma", "Plasma", "Plasma",
             "Plasma", ["Plasma.exe"], "Plasma_Data",
-            "https://thunderstore.io/c/plasma/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/plasma/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1409160")], "Plasma.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, []),
 
             new Game("Content Warning", "ContentWarning", "ContentWarning",
             "Content Warning", ["Content Warning.exe"], "Content Warning_Data",
-            "https://thunderstore.io/c/content-warning/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/content-warning/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2881650")], "ContentWarning.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["cw"]),
 
         new Game("Balatro", "Balatro", "Balatro",
             "Balatro", ["Balatro.exe"], "Balatro_Data",
-            "https://thunderstore.io/c/balatro/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/balatro/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2379780")], "Balatro.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.LOVELY, []),
 
         new Game(
             "Bopl Battle", "BoplBattle", "BoplBattle",
             "Bopl Battle", ["BoplBattle.exe"], "BoplBattle_Data",
-            "https://thunderstore.io/c/bopl-battle/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/bopl-battle/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1686940")], "BoplBattle.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["bb"]),
 
         new Game("Vertigo 2", "Vertigo2", "Vertigo2",
             "Vertigo 2", ["vertigo2.exe"], "vertigo2_Data",
-            "https://thunderstore.io/c/vertigo-2/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/vertigo-2/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "843390")], "Vertigo2.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, []),
 
         new Game("Against the Storm", "AgainstTheStorm", "AgainstTheStorm",
             "Against the Storm", ["Against the Storm.exe"], "Against the Storm_Data",
-            "https://thunderstore.io/c/against-the-storm/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/against-the-storm/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1336490")], "AgainstTheStorm.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["ats"]),
 
         new Game("Lycans", "Lycans", "Lycans",
             "Lycans", ["Lycans.exe"], "Lycans_Data",
-            "https://thunderstore.io/c/lycans/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/lycans/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2596100")], "Lycans.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, []),
 
         new Game("Castle Story", "CastleStory", "CastleStory",
             "Castle Story", ["Castle Story.exe"], "Castle Story_Data",
-            "https://thunderstore.io/c/castle-story/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/castle-story/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM_DIRECT, "227860")], "CastleStory.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["cs"]),
 
         new Game(
             "Panicore", "Panicore", "Panicore",
             "Panicore", ["Panicore.exe"], "Panicore",
-            "https://thunderstore.io/c/panicore/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/panicore/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2695940")], "Panicore.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.SHIMLOADER, ["panicore"]),
 
         new Game("Risk of Rain Returns", "RiskofRainReturns", "RiskofRainReturns",
             "Risk of Rain Returns", ["Risk of Rain Returns.exe"], "",
-            "https://thunderstore.io/c/risk-of-rain-returns/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/risk-of-rain-returns/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1337520")], "RiskOfRainReturns.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.RETURN_OF_MODDING, ["rorr"]),
 
         new Game("Magicraft", "Magicraft", "Magicraft",
             "Magicraft", ["Magicraft.exe"], "Magicraft_Data",
-            "https://thunderstore.io/c/magicraft/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/magicraft/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2103140")], "Magicraft.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, []),
 
         new Game("Another Crab's Treasure", "AnotherCrabsTreasure", "AnotherCrabsTreasure",
             "AnotherCrabsTreasure", ["AnotherCrabsTreasure.exe"], "AnotherCrabsTreasure_Data",
-            "https://thunderstore.io/c/another-crabs-treasure/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/another-crabs-treasure/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1887840")], "AnotherCrabsTreasure.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["act"]),
 
         new Game("Gladio Mori", "GladioMori", "GladioMori",
             "Gladio Mori", ["Gladio Mori.exe"], "Gladio Mori_Data",
-            "https://thunderstore.io/c/gladio-mori/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/gladio-mori/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2689120")], "GladioMori.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["gm"]),
 
         new Game("Slipstream: Rogue Space", "SlipstreamRogueSpace", "SlipstreamRogueSpace",
             "Slipstream Rogue Space", ["Slipstream_Win.exe"], "Slipstream_Win_Data",
-            "https://thunderstore.io/c/slipstream-rogue-space/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/slipstream-rogue-space/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2765860")], "SlipstreamRogueSpace.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["srs"]),
 
         new Game("Back to the Dawn", "BacktotheDawn", "BacktotheDawn",
             "MetalHeadGames", ["Back To The Dawn.exe"], "Back To The Dawn_Data",
-            "https://thunderstore.io/c/back-to-the-dawn/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/back-to-the-dawn/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1735700")], "BackToTheDawn.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["bttd"]),
 
         new Game("Below the Stone", "BelowTheStone", "BelowTheStone",
             "Below The Stone", ["Below The Stone.exe"], "Below The Stone_Data",
-            "https://thunderstore.io/c/below-the-stone/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/below-the-stone/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1170230")], "BelowTheStone.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["bts"]),
 
         new Game("Gloomwood", "Gloomwood", "Gloomwood",
             "Gloomwood", ["Gloomwood.exe"], "Gloomwood_Data",
-            "https://thunderstore.io/c/gloomwood/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/gloomwood/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1150760")], "Gloomwood.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["gw"]),
 
         new Game("Among Us", "AmongUs", "AmongUs",
             "Among Us", ["Among Us.exe"], "Among Us_Data",
-            "https://thunderstore.io/c/among-us/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/among-us/api/v1/package-listing-index/",
             [
                 new StorePlatformMetadata(StorePlatform.STEAM, "945360"),
                 new StorePlatformMetadata(StorePlatform.EPIC_GAMES_STORE, "among-us"),
@@ -702,151 +700,151 @@ export default class GameManager {
 
         new Game("Betrayal Beach", "BetrayalBeach", "BetrayalBeach",
             "Betrayal Beach", ["Betrayal Beach.exe"], "Betrayal Beach_Data",
-            "https://thunderstore.io/c/betrayal-beach/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/betrayal-beach/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2643810")], "BetrayalBeach.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, [""]),
 
         new Game("Arcus Chroma", "ArcusChroma", "ArcusChroma",
             "Arcus Chroma", ["Arcus Chroma.exe"], "Arcus Chroma_Data",
-            "https://thunderstore.io/c/arcus-chroma/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/arcus-chroma/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1447350")], "ArcusChroma.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, [""]),
 
         new Game("Deep Rock Galactic: Survivor", "DeepRockGalacticSurvivor", "DeepRockGalacticSurvivor",
             "Deep Rock Survivor", ["DRG Survivor.exe"], "DRG Survivor_Data",
-            "https://thunderstore.io/c/deep-rock-galactic-survivor/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/deep-rock-galactic-survivor/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2321470")], "DeepRockGalacticSurvivor.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, [""]),
 
         new Game("Ale & Tale Tavern", "AleAndTaleTavern", "AleAndTaleTavern",
             "Ale & Tale Tavern", ["Ale and Tale Tavern.exe"], "Ale and Tale Tavern_Data",
-            "https://thunderstore.io/c/ale-and-tale-tavern/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/ale-and-tale-tavern/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2683150")], "AleAndTaleTavern.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, [""]),
 
         new Game("Screw Drivers", "ScrewDrivers", "ScrewDrivers",
             "Screw Drivers", ["Screw Drivers.exe"], "Screw Drivers_Data",
-            "https://thunderstore.io/c/screw-drivers/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/screw-drivers/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1279510")], "ScrewDrivers.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, [""]),
 
         new Game("Nine Sols", "NineSols", "NineSols",
             "Nine Sols", ["NineSols.exe"], "Nine Sols_Data",
-            "https://thunderstore.io/c/nine-sols/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/nine-sols/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1809540")], "NineSols.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, [""]),
 
         new Game("Goodbye Volcano High", "GoodbyeVolcanoHigh", "GoodbyeVolcanoHigh",
             "Goodbye Volcano High", ["Goodbye Volcano High.exe"], "Goodbye Volcano High_Data",
-            "https://thunderstore.io/c/goodbye-volcano-high/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/goodbye-volcano-high/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1310330")], "GoodbyeVolcanoHigh.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, [""]),
 
         new Game("Supermarket Together", "SupermarketTogether", "SupermarketTogether",
             "Supermarket Together", ["Supermarket Together.exe"], "Supermarket Together_Data",
-            "https://thunderstore.io/c/supermarket-together/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/supermarket-together/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2709570")], "SupermarketTogether.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, [""]),
 
         new Game("Hades II", "HadesII", "HadesII",
             path.join("Hades II", "Ship"), ["Hades2.exe"], "",
-            "https://thunderstore.io/c/hades-ii/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/hades-ii/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1145350")], "Hades2.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.RETURN_OF_MODDING, ["h2"]),
 
         new Game("Shapez 2", "Shapez2", "Shapez2",
             "shapez 2", ["shapez 2.exe"], "shapez 2_Data",
-            "https://thunderstore.io/c/shapez-2/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/shapez-2/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2162800")], "Shapez2.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, [""]),
 
         new Game("Paquerette Down the Bunburrows", "PaqueretteDownTheBunburrows", "PaqueretteDownTheBunburrows",
             "Paquerette Down the Bunburrows", ["Paquerette Down the Bunburrows.exe"], "Paquerette Down the Bunburrows_Data",
-            "https://thunderstore.io/c/paquerette-down-the-bunburrows/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/paquerette-down-the-bunburrows/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1628610")], "PaqueretteDownTheBunburrows.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, [""]),
 
         new Game("Hard Time III", "HardTime3", "HardTime3",
             "Hard Time III", ["Hard Time III.exe"], "Hard Time III_Data",
-            "https://thunderstore.io/c/hard-time-3/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/hard-time-3/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "3009850")], "HardTime3.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, [""]),
 
         new Game("Tank Team", "TankTeam", "TankTeam",
             "Tank Team", ["Tank Team.exe"], "Tank Team_Data",
-            "https://thunderstore.io/c/tank-team/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/tank-team/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2587450")], "TankTeam.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, [""]),
 
         new Game("Distance", "Distance", "Distance",
             "Distance", ["Distance.exe"], "Distance_Data",
-            "https://thunderstore.io/c/distance/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/distance/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "233610")], "Distance.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, [""]),
 
         new Game("Five Nights at Freddy's: Into the Pit", "FiveNightsAtFreddysIntoThePit", "FiveNightsAtFreddysIntoThePit",
             "Five Nights at Freddy's Into the Pit", ["Five Nights at Freddy's Into the Pit.exe"], "Five Nights at Freddy's Into the Pit_Data",
-            "https://thunderstore.io/c/five-nights-at-freddys-into-the-pit/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/five-nights-at-freddys-into-the-pit/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2638370")], "FiveNightsAtFreddysIntoThePit.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, [""]),
 
         new Game("GoreBox", "GoreBox", "GoreBox",
             "GoreBox", ["GoreBox.exe"], "GoreBox_Data",
-            "https://thunderstore.io/c/gorebox/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/gorebox/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2027330")], "GoreBox.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, [""]),
 
         new Game("TCG Card Shop Simulator", "TCGCardShopSimulator", "TCG Card Shop Simulator",
             "TCG Card Shop Simulator", ["Card Shop Simulator.exe"], "Card Shop Simulator_Data",
-            "https://thunderstore.io/c/tcg-card-shop-simulator/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/tcg-card-shop-simulator/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "3070070")], "TCGCardShopSimulator.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, [""]),
 
         new Game("Old Market Simulator", "OldMarketSimulator", "Old Market Simulator",
             "Old Market Simulator", ["Old Market Simulator.exe"], "Old Market Simulator_Data",
-            "https://thunderstore.io/c/old-market-simulator/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/old-market-simulator/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2878420")], "OldMarketSimulator.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, [""]),
 
         new Game("Subterranauts", "Subterranauts", "Subterranauts",
             "Subterranauts", ["Subterranauts.exe"], "Subterranauts_Data",
-            "https://thunderstore.io/c/subterranauts/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/subterranauts/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "3075800")], "Subterranauts.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, [""]),
 
         new Game("SULFUR", "SULFUR", "SULFUR",
             "Sulfur", ["Sulfur.exe"], "Sulfur_Data",
-            "https://thunderstore.io/c/sulfur/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/sulfur/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2124120")], "SULFUR.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, [""]),
 
         new Game("WEBFISHING", "WEBFISHING", "WEBFISHING",
             "WEBFISHING", ["webfishing.exe"], "",
-            "https://thunderstore.io/c/webfishing/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/webfishing/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "3146520")], "WEBFISHING.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.GDWEAVE, [""]),
 
         new Game("STRAFTAT", "STRAFTAT", "STRAFTAT",
             "STRAFTAT", ["STRAFTAT.exe"], "STRAFTAT_Data",
-            "https://thunderstore.io/c/straftat/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/straftat/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2386720")], "STRAFTAT.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, [""]),
 
         new Game("ATLYSS", "ATLYSS", "ATLYSS",
             "ATLYSS", ["ATLYSS.exe"], "ATLYSS_Data",
-            "https://thunderstore.io/c/atlyss/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/atlyss/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2768430")], "ATLYSS.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, [""]),
 
         new Game("Peaks of Yore", "PeaksOfYore", "Peaks of Yore",
             "Peaks of Yore", ["Peaks of Yore.exe"], "Peaks of Yore_Data",
-            "https://thunderstore.io/c/peaks-of-yore/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/peaks-of-yore/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2236070")], "PeaksOfYore.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["poy"]),
 
         new Game("Subterror", "Subterror", "Subterror",
             "Subterror", ["Subterror.exe"], "Subterror_Data",
-            "https://thunderstore.io/c/subterror/api/v1/package-listing-index/", EXCLUSIONS,
+            "https://thunderstore.io/c/subterror/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2846060")], "Subterror.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["st"]),
     ];
diff --git a/src/store/modules/TsModsModule.ts b/src/store/modules/TsModsModule.ts
index 33f5ed171..9286efdab 100644
--- a/src/store/modules/TsModsModule.ts
+++ b/src/store/modules/TsModsModule.ts
@@ -39,6 +39,8 @@ function isPackageListChunk(value: unknown): value is PackageListChunk {
     );
 }
 
+const EXCLUSIONS = 'https://raw.githubusercontent.com/ebkr/r2modmanPlus/master/modExclusions.md';
+
 /**
  * For dealing with mods listed in communities, i.e. available through
  * the Thunderstore API. Mods received from the API are stored in
@@ -289,7 +291,7 @@ export const TsModsModule = {
             profileMods.forEach(getters['cachedMod']);
         },
 
-        async updateExclusions({commit, rootState}) {
+        async updateExclusions({commit}) {
             // Read exclusion list from a bundled file to have some values available ASAP.
             const exclusionList: {exclusions: string[]} = require('../../../modExclusions.json');
             commit('setExclusions', exclusionList.exclusions);
@@ -301,11 +303,7 @@ export const TsModsModule = {
             // Check for exclusion list updates from online.
             try {
                 const axios = getAxiosWithTimeouts(timeout, timeout);
-                const response = await retry(
-                    () => axios.get(rootState.activeGame.exclusionsUrl),
-                    attempts,
-                    interval
-                );
+                const response = await retry(() => axios.get(EXCLUSIONS), attempts, interval);
 
                 if (typeof response.data === 'string') {
                     commit('setExclusions', response.data);

From 1d208af3e7647e1df347946acca0289b387ffbe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Thu, 2 Jan 2025 14:57:18 +0200
Subject: [PATCH 38/95] Change default exclusion list from undefined to empty
 array

After the recent changes that made the exclusion list global instead of
game specific, and changed it to be loaded on app startup, using
undefined as the default is no longer needed and only makes the typing
awkward.
---
 src/store/modules/TsModsModule.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/store/modules/TsModsModule.ts b/src/store/modules/TsModsModule.ts
index 9286efdab..62715b212 100644
--- a/src/store/modules/TsModsModule.ts
+++ b/src/store/modules/TsModsModule.ts
@@ -20,7 +20,7 @@ export interface CachedMod {
 interface State {
     cache: Map<string, CachedMod>;
     deprecated: Map<string, boolean>;
-    exclusions?: string[];
+    exclusions: string[];
     isThunderstoreModListUpdateInProgress: boolean;
     mods: ThunderstoreMod[];
     modsLastUpdated?: Date;
@@ -54,7 +54,7 @@ export const TsModsModule = {
         cache: new Map<string, CachedMod>(),
         deprecated: new Map<string, boolean>(),
         /*** Packages available through API that should be ignored by the manager */
-        exclusions: undefined,
+        exclusions: [],
         /*** Mod list is updated from the API automatically and by user action */
         isThunderstoreModListUpdateInProgress: false,
         /*** All mods available through API for the current active game */
@@ -334,7 +334,7 @@ export const TsModsModule = {
             {chunks, indexHash}: {chunks: PackageListChunks, indexHash: string}
         ) {
             const filtered = chunks.map((chunk) => chunk.filter(
-                (pkg) => !state.exclusions!.includes(pkg.full_name)
+                (pkg) => !state.exclusions.includes(pkg.full_name)
             ));
             const community = rootState.activeGame.internalFolderName;
             await PackageDb.updateFromApiResponse(community, filtered);

From 92778800628cfe8579b364e1246eba8fc88ad1f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Fri, 3 Jan 2025 10:58:57 +0200
Subject: [PATCH 39/95] Make package list processing more serial

- Old implementation first downloaded all chunks and only then stored
  them into IndexedDB. The new implementation downloads a chunk and
  stores it before downloading the next chunk. This will hopefully
  reduce memory usage and IndexedDB related errors.
- Packages are upserted into IndexedDB and failures are silently
  ignored. This means the package list may be in inconsistent state
  where some of the packages are updated based on most recent API
  response while others aren't.
- Packages no longer present in the API response are removed from
  IndexedDB only if all chunks were processed succesfully.
- Since the state consistency is no longer guaranteed, we can't depend
  on the order of packages in the API response as the default ordering.
  Instead, packages are ordered when loaded from IndexedDB using the
  same rules the API currently uses to sort the packages.
  - Consuquently the default_order field could be dropped from the DB.
- As the progress indicator steps on splash screen didn't make sense
  anymore after the changes, there are now three steps: checking for
  updates, downloading & storing the chunks, and loading the mods into
  Vuex. First of these steps is quicker than the others for larger
  communities, which skews the overall progress, but the percentage
  wasn't really bound to remaining time earlier either.
---
 src/components/mixins/SplashMixin.vue |  81 ++++++++++----------
 src/model/ThunderstoreMod.ts          |  16 ++++
 src/pages/Splash.vue                  |   5 +-
 src/r2mm/manager/PackageDexieStore.ts |  68 ++++++-----------
 src/store/modules/TsModsModule.ts     | 102 ++++++++++++++------------
 src/utils/HttpUtils.ts                |   3 +-
 6 files changed, 135 insertions(+), 140 deletions(-)

diff --git a/src/components/mixins/SplashMixin.vue b/src/components/mixins/SplashMixin.vue
index dca87b239..3363edaf9 100644
--- a/src/components/mixins/SplashMixin.vue
+++ b/src/components/mixins/SplashMixin.vue
@@ -3,7 +3,7 @@ import Vue from 'vue';
 import Component from 'vue-class-component';
 
 import RequestItem from '../../model/requests/RequestItem';
-import type { PackageListChunks, PackageListIndex } from '../../store/modules/TsModsModule';
+import type { PackageListIndex } from '../../store/modules/TsModsModule';
 
 
 @Component
@@ -41,21 +41,14 @@ export default class SplashMixin extends Vue {
     // Get the list of Thunderstore mods from local cache or API.
     async _getThunderstoreMods() {
         const hasPriorCache = await this.doesGameHaveLocalCache();
-        let hasUpdatedCache = false;
 
         if (!hasPriorCache) {
             const packageListIndex = await this.fetchPackageListIndex();
-            const packageListChunks = await this.fetchPackageListChunksIfUpdated(packageListIndex);
-            this.getRequestItem('ThunderstoreDownload').setProgress(100);
-            hasUpdatedCache = await this.writeModsToPersistentCacheIfUpdated(packageListIndex, packageListChunks);
-        }
-
-        this.getRequestItem('ThunderstoreDownload').setProgress(100);
-
-        if (hasPriorCache || hasUpdatedCache) {
-            await this.triggerStoreModListUpdate();
+            const areAllChunksProcessedSuccessfully = await this.fetchPackageListChunksIfUpdated(packageListIndex);
+            await this.pruneRemovedMods(packageListIndex, areAllChunksProcessedSuccessfully);
         }
 
+        await this.triggerStoreModListUpdate();
         await this.moveToNextScreen();
     }
 
@@ -73,9 +66,8 @@ export default class SplashMixin extends Vue {
         }
 
         if (hasCache) {
-            this.getRequestItem('ThunderstoreDownload').setProgress(100);
-            this.getRequestItem('CacheOperations').setProgress(50);
-            this.loadingText = 'Processing the mod list from cache';
+            this.getRequestItem('PackageListIndex').setProgress(100);
+            this.getRequestItem('PackageListChunks').setProgress(100);
         }
 
         return hasCache;
@@ -92,60 +84,61 @@ export default class SplashMixin extends Vue {
         } catch (e) {
             console.error('SplashMixin failed to fetch mod list index from API.', e);
             return undefined;
+        } finally {
+            this.getRequestItem('PackageListIndex').setProgress(100);
         }
     }
 
     /***
-     * Load the package list in chunks pointed out by the packageListIndex.
+     * Load the package list chunks pointed out by the packageListIndex.
+     * Chunks are stored in IndexedDB for persistent caching
      */
-    async fetchPackageListChunksIfUpdated(packageListIndex?: PackageListIndex): Promise<PackageListChunks|undefined> {
+    async fetchPackageListChunksIfUpdated(packageListIndex?: PackageListIndex): Promise<boolean> {
         // Skip loading chunks if loading index failed.
         if (!packageListIndex) {
-            return undefined;
+            return false;
         }
 
+        this.loadingText = 'Loading latest mod list from Thunderstore';
+
         const progressCallback = (progress: number) => {
-            this.loadingText = 'Loading latest mod list from Thunderstore';
-            this.getRequestItem('ThunderstoreDownload').setProgress(progress);
+            this.getRequestItem('PackageListChunks').setProgress(progress);
         };
 
         try {
             return await this.$store.dispatch(
                 'tsMods/fetchPackageListChunks',
-                {chunkUrls: packageListIndex.content, progressCallback}
+                {packageListIndex, progressCallback}
             );
         } catch (e) {
             console.error('SplashMixin failed to fetch mod list from API.', e);
-            return undefined;
+            return false;
+        } finally {
+            progressCallback(100);
         }
     }
 
     /***
-     * Update a fresh package list to the IndexedDB cache.
-     * Done only if a fresh list was loaded successfully from the API.
+     * Delete mods no longer returned by the Thunderstore API from the IndexedDB cache.
      */
-    async writeModsToPersistentCacheIfUpdated(
+    async pruneRemovedMods(
         packageListIndex?: PackageListIndex,
-        packageListChunks?: PackageListChunks
-    ): Promise<boolean> {
-        if (packageListIndex && packageListChunks) {
-            this.loadingText = 'Storing the mod list into local cache';
-
-            try {
-                await this.$store.dispatch(
-                    'tsMods/updatePersistentCache',
-                    {indexHash: packageListIndex.hash, chunks: packageListChunks}
-                );
-
-                this.loadingText = 'Processing the mod list';
-                this.getRequestItem('CacheOperations').setProgress(50);
-                return true;
-            } catch (e) {
-                console.error('SplashMixin failed to cache mod list locally.', e);
-            }
+        areAllChunksProcessedSuccessfully?: boolean
+    ): Promise<void> {
+        // Deletion depends on all mods in the persistent cache having a fresh
+        // timestamp, which isn't the case if one or more chunks failed to be
+        // downloaded or processed.
+        if (!packageListIndex || !areAllChunksProcessedSuccessfully) {
+            return;
         }
 
-        return false;
+        this.loadingText = 'Pruning removed mods from local cache';
+
+        try {
+            await this.$store.dispatch('tsMods/pruneRemovedMods', packageListIndex.dateFetched);
+        } catch (e) {
+            console.error('SplashMixin failed to delete outdated mods from local cache.', e);
+        }
     }
 
     /***
@@ -153,12 +146,14 @@ export default class SplashMixin extends Vue {
      * IndexedDB cache and to store it in memory.
      */
     async triggerStoreModListUpdate(): Promise<void> {
+        this.loadingText = 'Processing the mod list';
+
         try {
             await this.$store.dispatch('tsMods/updateMods');
         } catch (e) {
             console.error('Updating the store mod list by SplashMixin failed.', e);
         } finally {
-            this.getRequestItem('CacheOperations').setProgress(100);
+            this.getRequestItem('Vuex').setProgress(100);
         }
     }
 
diff --git a/src/model/ThunderstoreMod.ts b/src/model/ThunderstoreMod.ts
index c2939cea4..164216e84 100644
--- a/src/model/ThunderstoreMod.ts
+++ b/src/model/ThunderstoreMod.ts
@@ -14,6 +14,22 @@ export default class ThunderstoreMod extends ThunderstoreVersion {
     private donationLink: string | undefined;
     private latestVersion: string = '';
 
+    // Imitate the order where mods are returned from Thunderstore package listing API.
+    public static defaultOrderComparer(a: ThunderstoreMod, b: ThunderstoreMod): number {
+        // Pinned mods first.
+        if (a.isPinned() !== b.isPinned()) {
+            return a.isPinned() ? -1 : 1;
+        }
+
+        // Deprecated mods last.
+        if (a.isDeprecated() !== b.isDeprecated()) {
+            return a.isDeprecated() ? 1 : -1;
+        }
+
+        // Sort mods with same boolean flags by update date.
+        return a.getDateUpdated() >= b.getDateUpdated() ? -1 : 1;
+    }
+
     public static parseFromThunderstoreData(data: any): ThunderstoreMod {
         const mod = new ThunderstoreMod();
         mod.setName(data.name);
diff --git a/src/pages/Splash.vue b/src/pages/Splash.vue
index b0a8ecfe8..8a36260c2 100644
--- a/src/pages/Splash.vue
+++ b/src/pages/Splash.vue
@@ -148,8 +148,9 @@ export default class Splash extends mixins(SplashMixin) {
 
     requests = [
         new RequestItem('UpdateCheck', 0),
-        new RequestItem('ThunderstoreDownload', 0),
-        new RequestItem('CacheOperations', 0)
+        new RequestItem('PackageListIndex', 0),
+        new RequestItem('PackageListChunks', 0),
+        new RequestItem('Vuex', 0)
     ];
 
     // Ensure that r2modman isn't outdated.
diff --git a/src/r2mm/manager/PackageDexieStore.ts b/src/r2mm/manager/PackageDexieStore.ts
index 8c5266217..216209ff5 100644
--- a/src/r2mm/manager/PackageDexieStore.ts
+++ b/src/r2mm/manager/PackageDexieStore.ts
@@ -41,7 +41,6 @@ interface DexiePackage {
     // Extra fields not included in the API response
     community: string;
     date_fetched: Date; // When the entry was fetched from the API
-    default_order: number; // Entry's index when received from the API
 }
 
 // For keeping track of seen package list index files so we can
@@ -70,53 +69,10 @@ class PackageDexieStore extends Dexie {
 
 const db = new PackageDexieStore();
 
-// TODO: user type guards to validate (part of) the data before operations?
-export async function updateFromApiResponse(community: string, packageChunks: any[][]) {
-    let default_order = 0;
-    const extra = {community, date_fetched: new Date()};
-    const newPackageChunks: DexiePackage[][] = packageChunks.map((chunk) =>
-        chunk.map((pkg) => ({
-            ...pkg,
-            ...extra,
-            default_order: default_order++
-        }))
-    );
-
-    // Since we need to do these operations in a single transaction we can't
-    // process the chunks one by one as they are downloaded.
-    await db.transaction(
-        'rw',
-        db.packages,
-        async () => {
-            // UPSERT with fresh data from API.
-            // Fetching ids for community's packages and deleting them all using
-            // .bulkDelete would be a bit faster on small package lists due to
-            // .bulkAdd (INSERT) being faster than .bulkPut (UPSERT). It starts
-            // to lose its advantage when the package list grows since fetching
-            // the ids and calling .bulkDelete gets slower. We should optimize
-            // for big lists since the small ones are fast enough anyway, and
-            // this approach also works better with the plans to use pagination
-            // when fetching the package list in the future.
-            await Promise.all(
-                newPackageChunks.map((chunk) => db.packages.bulkPut(chunk))
-            );
-
-            // Find packages that were no longer returned by the API and delete them.
-            // .bulkDelete is faster than calling .delete() on the Collection
-            // directly. Using the odd looking .where(compoundIndex).between(values)
-            // is faster than .where(community).and(filterByDateFetched).
-            const oldIds = await db.packages
-                .where('[community+date_fetched]')
-                .between([community, 0], [community, extra.date_fetched])
-                .primaryKeys();
-            await db.packages.bulkDelete(oldIds);
-        }
-    );
-}
-
 export async function getPackagesAsThunderstoreMods(community: string) {
-    const packages = await db.packages.where({community}).sortBy('default_order');
-    return packages.map(ThunderstoreMod.parseFromThunderstoreData);
+    const packages = await db.packages.where({community}).toArray();
+    return packages.map(ThunderstoreMod.parseFromThunderstoreData)
+                   .sort(ThunderstoreMod.defaultOrderComparer);
 }
 
 export async function getPackagesByNames(community: string, packageNames: string[]) {
@@ -191,6 +147,24 @@ export async function isLatestPackageListIndex(community: string, hash: string)
     );
 }
 
+export async function pruneRemovedMods(community: string, cutoff: Date) {
+    // Find packages that were no longer returned by the API and delete them.
+    // .bulkDelete is faster than calling .delete() on the Collection
+    // directly. Using the odd looking .where(compoundIndex).between(values)
+    // is faster than .where(community).and(filterByDateFetched).
+    const oldIds = await db.packages
+        .where('[community+date_fetched]')
+        .between([community, 0], [community, cutoff])
+        .primaryKeys();
+    await db.packages.bulkDelete(oldIds);
+}
+
+export async function upsertPackageListChunk(community: string, packageChunk: any[]) {
+    const extra = {community, date_fetched: new Date()};
+    const newPackages: DexiePackage[] = packageChunk.map((pkg) => ({...pkg, ...extra}));
+    await db.packages.bulkPut(newPackages);
+}
+
 export async function setLatestPackageListIndex(community: string, hash: string) {
     await db.indexHashes.put({community, hash, date_updated: new Date()});
 }
diff --git a/src/store/modules/TsModsModule.ts b/src/store/modules/TsModsModule.ts
index 62715b212..305ef1cc0 100644
--- a/src/store/modules/TsModsModule.ts
+++ b/src/store/modules/TsModsModule.ts
@@ -30,8 +30,12 @@ interface State {
 
 type ProgressCallback = (progress: number) => void;
 type PackageListChunk = {full_name: string}[];
-export type PackageListChunks = PackageListChunk[];
-export type PackageListIndex = {content: string[], hash: string, isLatest: boolean};
+export type PackageListIndex = {
+    content: string[],
+    dateFetched: Date,
+    hash: string,
+    isLatest: boolean
+};
 
 function isPackageListChunk(value: unknown): value is PackageListChunk {
     return Array.isArray(value) && (
@@ -169,7 +173,7 @@ export const TsModsModule = {
 
     actions: <ActionTree<State, RootState>>{
         /**
-         * Complete update process of the mod list, to be used after
+         * Full update process of the mod list, to be used after
          * passing the splash screen.
          */
         async fetchAndProcessPackageList({commit, dispatch, state}): Promise<void> {
@@ -194,10 +198,10 @@ export const TsModsModule = {
                 if (packageListIndex.isLatest) {
                     await dispatch('updateIndexHash', packageListIndex.hash);
                 } else {
-                    const packageListChunks = await dispatch(
+                    const areAllChunksProcessedSuccessfully = await dispatch(
                         'fetchPackageListChunks',
                         {
-                            chunkUrls: packageListIndex.content,
+                            packageListIndex,
                             progressCallback: (progress: number) => commit(
                                 'setThunderstoreModListUpdateStatus',
                                 `Loading latest mod list from Thunderstore: ${progress}%`
@@ -205,11 +209,10 @@ export const TsModsModule = {
                         },
                     );
 
-                    commit('setThunderstoreModListUpdateStatus', 'Storing the mod list into local cache...');
-                    await dispatch(
-                        'updatePersistentCache',
-                        {chunks: packageListChunks, indexHash: packageListIndex.hash},
-                    );
+                    if (areAllChunksProcessedSuccessfully) {
+                        commit('setThunderstoreModListUpdateStatus', 'Pruning removed mods from local cache...');
+                        await dispatch('pruneRemovedMods', packageListIndex.dateFetched);
+                    }
                 }
 
                 // If the package list was up to date and the mod list is already loaded to
@@ -251,34 +254,47 @@ export const TsModsModule = {
         },
 
         async fetchPackageListChunks(
-            {},
-            {chunkUrls, progressCallback}: {chunkUrls: string[], progressCallback?: ProgressCallback},
-        ): Promise<PackageListChunks> {
-            // Count index as a chunk for progress bar purposes.
-            const chunkCount = chunkUrls.length + 1;
-            let completed = 1;
-            const updateProgress = () => progressCallback && progressCallback((completed / chunkCount) * 100);
-            updateProgress();
-
-            // Download chunks serially to avoid slow connections timing
-            // out due to concurrent requests competing for the bandwidth.
-            const chunks = [];
-            for (const [i, chunkUrl] of chunkUrls.entries()) {
-                const url = CdnProvider.replaceCdnHost(chunkUrl);
-                const {content: chunk} = await retry(() => fetchAndProcessBlobFile(url));
-
-                if (chunkUrls.length > 1 && isEmptyArray(chunk)) {
-                    throw new Error(`Chunk #${i} in multichunk response was empty`);
-                } else if (!isPackageListChunk(chunk)) {
-                    throw new Error(`Chunk #${i} was invalid format`);
+            {dispatch},
+            {packageListIndex, progressCallback}: {packageListIndex: PackageListIndex, progressCallback?: ProgressCallback},
+        ): Promise<boolean> {
+            const chunkCount = packageListIndex.content.length;
+            let completed = 0;
+            let successes = 0;
+            const updateProgress = () => progressCallback && progressCallback(Math.floor((completed / chunkCount) * 100));
+
+            for (const chunkUrl of packageListIndex.content) {
+                try {
+                    await dispatch('fetchPackageListChunk', chunkUrl);
+                    successes++;
+                } catch (e) {
+                    console.error('Processing package list chunk failed.', e);
+                } finally {
+                    completed++;
+                    updateProgress();
                 }
+            }
 
-                chunks.push(chunk);
-                completed++;
-                updateProgress();
+            // Only store the index hash if all chunks were processed successfully.
+            // Otherwise user wouldn't be able to attempt a retry until the index
+            // hash is updated in the API.
+            if (successes === chunkCount) {
+                await dispatch('updateIndexHash', packageListIndex.hash);
             }
 
-            return chunks;
+            return successes === chunkCount;
+        },
+
+        async fetchPackageListChunk({rootState, state}, chunkUrl: string): Promise<void> {
+            const url = CdnProvider.replaceCdnHost(chunkUrl);
+            const {content: chunk} = await retry(() => fetchAndProcessBlobFile(url));
+
+            if (!isPackageListChunk(chunk)) {
+                throw new Error(`Received invalid chunk from URL "${url}"`);
+            }
+
+            const filtered = chunk.filter((pkg) => !state.exclusions.includes(pkg.full_name));
+            const community = rootState.activeGame.internalFolderName;
+            await PackageDb.upsertPackageListChunk(community, filtered);
         },
 
         async gameHasCachedModList({rootState}): Promise<boolean> {
@@ -291,6 +307,11 @@ export const TsModsModule = {
             profileMods.forEach(getters['cachedMod']);
         },
 
+        async pruneRemovedMods({rootState}, cutoff: Date) {
+            const community = rootState.activeGame.internalFolderName;
+            await PackageDb.pruneRemovedMods(community, cutoff);
+        },
+
         async updateExclusions({commit}) {
             // Read exclusion list from a bundled file to have some values available ASAP.
             const exclusionList: {exclusions: string[]} = require('../../../modExclusions.json');
@@ -328,19 +349,6 @@ export const TsModsModule = {
             commit('setModsLastUpdated', updated);
         },
 
-        /*** Save a mod list received from the Thunderstore API to IndexedDB */
-        async updatePersistentCache(
-            {dispatch, rootState, state},
-            {chunks, indexHash}: {chunks: PackageListChunks, indexHash: string}
-        ) {
-            const filtered = chunks.map((chunk) => chunk.filter(
-                (pkg) => !state.exclusions.includes(pkg.full_name)
-            ));
-            const community = rootState.activeGame.internalFolderName;
-            await PackageDb.updateFromApiResponse(community, filtered);
-            await dispatch('updateIndexHash', indexHash);
-        },
-
         async updateIndexHash({rootState}, indexHash: string) {
             const community = rootState.activeGame.internalFolderName;
             await PackageDb.setLatestPackageListIndex(community, indexHash);
diff --git a/src/utils/HttpUtils.ts b/src/utils/HttpUtils.ts
index 83aa1d305..07b69feb3 100644
--- a/src/utils/HttpUtils.ts
+++ b/src/utils/HttpUtils.ts
@@ -109,12 +109,13 @@ export const makeLongRunningGetRequest = async (
  * all users and can be cached heavily on CDN level.
  */
 export const fetchAndProcessBlobFile = async (url: string) => {
+    const dateFetched = new Date();
     const response = await makeLongRunningGetRequest(url, {axiosConfig: {responseType: 'arraybuffer'}});
     const buffer = Buffer.from(response.data);
     const hash = await getSha256Hash(buffer);
     const jsonString = await decompressArrayBuffer(buffer);
     const content = JSON.parse(jsonString);
-    return {content, hash};
+    return {content, hash, dateFetched};
 }
 
 async function getSha256Hash(arrayBuffer: ArrayBuffer): Promise<string> {

From 5e0b74bb64b1d0196a7469abda20f49e028101b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Fri, 3 Jan 2025 16:00:46 +0200
Subject: [PATCH 40/95] Unify action naming TsModsModule

- Use "fetch" when data is loaded from Thunderstore API
- Use "cache" when data is saved into IndexedDB
- Use "update" when the data in internal store state is changed
- Use "sync" for the full process that does all of the above
---
 src/components/ModListUpdateBanner.vue        |  2 +-
 src/components/mixins/SplashMixin.vue         |  4 ++--
 src/components/mixins/UtilityMixin.vue        |  2 +-
 .../profiles-modals/ImportProfileModal.vue    |  4 ++--
 .../settings-components/SettingsView.vue      |  2 +-
 src/store/modules/TsModsModule.ts             | 20 +++++++++----------
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/components/ModListUpdateBanner.vue b/src/components/ModListUpdateBanner.vue
index d8ff19116..e323d2c36 100644
--- a/src/components/ModListUpdateBanner.vue
+++ b/src/components/ModListUpdateBanner.vue
@@ -16,7 +16,7 @@ export default class ModListUpdateBanner extends Vue {
     }
 
     async updateModList() {
-        await this.$store.dispatch('tsMods/fetchAndProcessPackageList');
+        await this.$store.dispatch('tsMods/syncPackageList');
     }
 }
 </script>
diff --git a/src/components/mixins/SplashMixin.vue b/src/components/mixins/SplashMixin.vue
index 3363edaf9..691343418 100644
--- a/src/components/mixins/SplashMixin.vue
+++ b/src/components/mixins/SplashMixin.vue
@@ -107,7 +107,7 @@ export default class SplashMixin extends Vue {
 
         try {
             return await this.$store.dispatch(
-                'tsMods/fetchPackageListChunks',
+                'tsMods/fetchAndCachePackageListChunks',
                 {packageListIndex, progressCallback}
             );
         } catch (e) {
@@ -135,7 +135,7 @@ export default class SplashMixin extends Vue {
         this.loadingText = 'Pruning removed mods from local cache';
 
         try {
-            await this.$store.dispatch('tsMods/pruneRemovedMods', packageListIndex.dateFetched);
+            await this.$store.dispatch('tsMods/pruneRemovedModsFromCache', packageListIndex.dateFetched);
         } catch (e) {
             console.error('SplashMixin failed to delete outdated mods from local cache.', e);
         }
diff --git a/src/components/mixins/UtilityMixin.vue b/src/components/mixins/UtilityMixin.vue
index f20bd7168..7cf32759c 100644
--- a/src/components/mixins/UtilityMixin.vue
+++ b/src/components/mixins/UtilityMixin.vue
@@ -32,7 +32,7 @@ export default class UtilityMixin extends Vue {
             return;
         }
 
-        await this.$store.dispatch("tsMods/fetchAndProcessPackageList");
+        await this.$store.dispatch("tsMods/syncPackageList");
 
         if (this.$store.state.tsMods.thunderstoreModListUpdateError.length > 0) {
             if (this.tsBackgroundRefreshFailed) {
diff --git a/src/components/profiles-modals/ImportProfileModal.vue b/src/components/profiles-modals/ImportProfileModal.vue
index 2b6042a5f..be76aadd1 100644
--- a/src/components/profiles-modals/ImportProfileModal.vue
+++ b/src/components/profiles-modals/ImportProfileModal.vue
@@ -339,11 +339,11 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
                     <span v-else-if="$store.state.tsMods.thunderstoreModListUpdateError">
                         Error updating the mod list:
                         {{ $store.state.tsMods.thunderstoreModListUpdateError }}.
-                        <a @click="$store.dispatch('tsMods/fetchAndProcessPackageList')">Retry</a>?
+                        <a @click="$store.dispatch('tsMods/syncPackageList')">Retry</a>?
                     </span>
                     <span v-else>
                         Would you like to
-                        <a @click="$store.dispatch('tsMods/fetchAndProcessPackageList')">update now</a>?
+                        <a @click="$store.dispatch('tsMods/syncPackageList')">update now</a>?
                     </span>
                 </p>
             </div>
diff --git a/src/components/settings-components/SettingsView.vue b/src/components/settings-components/SettingsView.vue
index b34b17215..c04cb52aa 100644
--- a/src/components/settings-components/SettingsView.vue
+++ b/src/components/settings-components/SettingsView.vue
@@ -310,7 +310,7 @@ import CdnProvider from '../../providers/generic/connection/CdnProvider';
                         return "No API information available";
                     },
                 'fa-exchange-alt',
-                async () => await this.$store.dispatch("tsMods/fetchAndProcessPackageList")
+                async () => await this.$store.dispatch("tsMods/syncPackageList")
             ),
             new SettingsRow(
               'Other',
diff --git a/src/store/modules/TsModsModule.ts b/src/store/modules/TsModsModule.ts
index 305ef1cc0..e3ac2bdac 100644
--- a/src/store/modules/TsModsModule.ts
+++ b/src/store/modules/TsModsModule.ts
@@ -176,7 +176,7 @@ export const TsModsModule = {
          * Full update process of the mod list, to be used after
          * passing the splash screen.
          */
-        async fetchAndProcessPackageList({commit, dispatch, state}): Promise<void> {
+        async syncPackageList({commit, dispatch, state}): Promise<void> {
             if (state.isThunderstoreModListUpdateInProgress) {
                 return;
             }
@@ -196,10 +196,10 @@ export const TsModsModule = {
                 // If the package list is up to date, only update the timestamp. Otherwise,
                 // fetch the new one and store it into IndexedDB.
                 if (packageListIndex.isLatest) {
-                    await dispatch('updateIndexHash', packageListIndex.hash);
+                    await dispatch('cacheIndexHash', packageListIndex.hash);
                 } else {
                     const areAllChunksProcessedSuccessfully = await dispatch(
-                        'fetchPackageListChunks',
+                        'fetchAndCachePackageListChunks',
                         {
                             packageListIndex,
                             progressCallback: (progress: number) => commit(
@@ -211,7 +211,7 @@ export const TsModsModule = {
 
                     if (areAllChunksProcessedSuccessfully) {
                         commit('setThunderstoreModListUpdateStatus', 'Pruning removed mods from local cache...');
-                        await dispatch('pruneRemovedMods', packageListIndex.dateFetched);
+                        await dispatch('pruneRemovedModsFromCache', packageListIndex.dateFetched);
                     }
                 }
 
@@ -253,7 +253,7 @@ export const TsModsModule = {
             return {...index, isLatest};
         },
 
-        async fetchPackageListChunks(
+        async fetchAndCachePackageListChunks(
             {dispatch},
             {packageListIndex, progressCallback}: {packageListIndex: PackageListIndex, progressCallback?: ProgressCallback},
         ): Promise<boolean> {
@@ -264,7 +264,7 @@ export const TsModsModule = {
 
             for (const chunkUrl of packageListIndex.content) {
                 try {
-                    await dispatch('fetchPackageListChunk', chunkUrl);
+                    await dispatch('fetchAndCachePackageListChunk', chunkUrl);
                     successes++;
                 } catch (e) {
                     console.error('Processing package list chunk failed.', e);
@@ -278,13 +278,13 @@ export const TsModsModule = {
             // Otherwise user wouldn't be able to attempt a retry until the index
             // hash is updated in the API.
             if (successes === chunkCount) {
-                await dispatch('updateIndexHash', packageListIndex.hash);
+                await dispatch('cacheIndexHash', packageListIndex.hash);
             }
 
             return successes === chunkCount;
         },
 
-        async fetchPackageListChunk({rootState, state}, chunkUrl: string): Promise<void> {
+        async fetchAndCachePackageListChunk({rootState, state}, chunkUrl: string): Promise<void> {
             const url = CdnProvider.replaceCdnHost(chunkUrl);
             const {content: chunk} = await retry(() => fetchAndProcessBlobFile(url));
 
@@ -307,7 +307,7 @@ export const TsModsModule = {
             profileMods.forEach(getters['cachedMod']);
         },
 
-        async pruneRemovedMods({rootState}, cutoff: Date) {
+        async pruneRemovedModsFromCache({rootState}, cutoff: Date) {
             const community = rootState.activeGame.internalFolderName;
             await PackageDb.pruneRemovedMods(community, cutoff);
         },
@@ -349,7 +349,7 @@ export const TsModsModule = {
             commit('setModsLastUpdated', updated);
         },
 
-        async updateIndexHash({rootState}, indexHash: string) {
+        async cacheIndexHash({rootState}, indexHash: string) {
             const community = rootState.activeGame.internalFolderName;
             await PackageDb.setLatestPackageListIndex(community, indexHash);
         },

From 13561f4124921862b72380bb3b7e916d2db1c0e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Wed, 8 Jan 2025 11:40:53 +0200
Subject: [PATCH 41/95] Store package list update errors as Error rather than
 string

Code review feedback suggested storing errors as Error objects and
displaying them in modals when possible.

- UtilityMixin: the background update process just throws the error
  as-is, since failing silently is the still the appropriate action
- ImportProfileModal: show the error message as inline text, as we
  don't want to open the error modal while already in a modal
- ModListUpdateBanner: Allow user to view the error details in a modal
- SettingsView: show the error as inline text since returning markup
  from SettingsRow method doesn't really work
---
 src/components/ModListUpdateBanner.vue          | 15 +++++++++++++--
 src/components/mixins/UtilityMixin.vue          |  4 ++--
 .../profiles-modals/ImportProfileModal.vue      |  2 +-
 .../settings-components/SettingsView.vue        |  4 ++--
 src/store/modules/TsModsModule.ts               | 17 ++++++-----------
 5 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/components/ModListUpdateBanner.vue b/src/components/ModListUpdateBanner.vue
index e323d2c36..eb65cdf31 100644
--- a/src/components/ModListUpdateBanner.vue
+++ b/src/components/ModListUpdateBanner.vue
@@ -1,6 +1,8 @@
 <script lang="ts">
 import { Component, Vue } from 'vue-property-decorator';
 
+import R2Error from '../model/errors/R2Error';
+
 @Component({})
 export default class ModListUpdateBanner extends Vue {
     get isModListLoaded(): boolean {
@@ -11,13 +13,20 @@ export default class ModListUpdateBanner extends Vue {
         return this.$store.state.tsMods.isThunderstoreModListUpdateInProgress;
     }
 
-    get updateError(): string {
+    get updateError(): Error|undefined {
         return this.$store.state.tsMods.thunderstoreModListUpdateError;
     }
 
     async updateModList() {
         await this.$store.dispatch('tsMods/syncPackageList');
     }
+
+    openErrorModal() {
+        this.$store.commit('error/handleError', R2Error.fromThrownValue(
+            this.updateError,
+            'Error updating the mod list from Thunderstore',
+        ));
+    }
 }
 </script>
 
@@ -28,7 +37,9 @@ export default class ModListUpdateBanner extends Vue {
                 {{ $store.state.tsMods.thunderstoreModListUpdateStatus }}
             </span>
             <span v-else-if="updateError">
-                Error updating the mod list: {{ updateError }}.<br />
+                Error updating the mod list.
+                <a @click="openErrorModal">View error details</a>.
+                <br />
                 The manager will keep trying to update the mod list in the background.
             </span>
             <span v-else>
diff --git a/src/components/mixins/UtilityMixin.vue b/src/components/mixins/UtilityMixin.vue
index 7cf32759c..4494541b9 100644
--- a/src/components/mixins/UtilityMixin.vue
+++ b/src/components/mixins/UtilityMixin.vue
@@ -34,10 +34,10 @@ export default class UtilityMixin extends Vue {
 
         await this.$store.dispatch("tsMods/syncPackageList");
 
-        if (this.$store.state.tsMods.thunderstoreModListUpdateError.length > 0) {
+        if (this.$store.state.tsMods.thunderstoreModListUpdateError) {
             if (this.tsBackgroundRefreshFailed) {
                 console.error("Two consecutive background refresh attempts failed");
-                throw new Error(this.$store.state.tsMods.thunderstoreModListUpdateError);
+                throw this.$store.state.tsMods.thunderstoreModListUpdateError;
             }
 
             this.tsBackgroundRefreshFailed = true;
diff --git a/src/components/profiles-modals/ImportProfileModal.vue b/src/components/profiles-modals/ImportProfileModal.vue
index be76aadd1..af8c2ce45 100644
--- a/src/components/profiles-modals/ImportProfileModal.vue
+++ b/src/components/profiles-modals/ImportProfileModal.vue
@@ -338,7 +338,7 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
                     </span>
                     <span v-else-if="$store.state.tsMods.thunderstoreModListUpdateError">
                         Error updating the mod list:
-                        {{ $store.state.tsMods.thunderstoreModListUpdateError }}.
+                        {{ $store.state.tsMods.thunderstoreModListUpdateError.message }}.
                         <a @click="$store.dispatch('tsMods/syncPackageList')">Retry</a>?
                     </span>
                     <span v-else>
diff --git a/src/components/settings-components/SettingsView.vue b/src/components/settings-components/SettingsView.vue
index c04cb52aa..be50a4328 100644
--- a/src/components/settings-components/SettingsView.vue
+++ b/src/components/settings-components/SettingsView.vue
@@ -301,8 +301,8 @@ import CdnProvider from '../../providers/generic/connection/CdnProvider';
                         if (this.$store.state.tsMods.isThunderstoreModListUpdateInProgress) {
                             return this.$store.state.tsMods.thunderstoreModListUpdateStatus || "Updating...";
                         }
-                        if (this.$store.state.tsMods.thunderstoreModListUpdateError.length > 0) {
-                            return "Error updating the mod list: " + this.$store.state.tsMods.thunderstoreModListUpdateError;
+                        if (this.$store.state.tsMods.thunderstoreModListUpdateError) {
+                            return `Error updating the mod list: ${this.$store.state.tsMods.thunderstoreModListUpdateError.message}`;
                         }
                         if (this.$store.state.tsMods.modsLastUpdated !== undefined) {
                             return "Cache date: " + moment(this.$store.state.tsMods.modsLastUpdated).format("MMMM Do YYYY, h:mm:ss a");
diff --git a/src/store/modules/TsModsModule.ts b/src/store/modules/TsModsModule.ts
index e3ac2bdac..d6e2f0c1a 100644
--- a/src/store/modules/TsModsModule.ts
+++ b/src/store/modules/TsModsModule.ts
@@ -24,7 +24,7 @@ interface State {
     isThunderstoreModListUpdateInProgress: boolean;
     mods: ThunderstoreMod[];
     modsLastUpdated?: Date;
-    thunderstoreModListUpdateError: string;
+    thunderstoreModListUpdateError: Error|undefined;
     thunderstoreModListUpdateStatus: string;
 }
 
@@ -66,7 +66,7 @@ export const TsModsModule = {
         /*** When was the mod list last refreshed from the API? */
         modsLastUpdated: undefined,
         /*** Error shown on UI after mod list refresh fails */
-        thunderstoreModListUpdateError: '',
+        thunderstoreModListUpdateError: undefined,
         /*** Status shown on UI during mod list refresh */
         thunderstoreModListUpdateStatus: ''
     }),
@@ -131,7 +131,7 @@ export const TsModsModule = {
             state.deprecated = new Map<string, boolean>();
             state.mods = [];
             state.modsLastUpdated = undefined;
-            state.thunderstoreModListUpdateError = '';
+            state.thunderstoreModListUpdateError = undefined;
             state.thunderstoreModListUpdateStatus = '';
         },
         clearModCache(state) {
@@ -151,20 +151,15 @@ export const TsModsModule = {
             const exclusions_ = Array.isArray(payload) ? payload : payload.split('\n');
             state.exclusions = exclusions_.map((e) => e.trim()).filter(Boolean);
         },
-        setThunderstoreModListUpdateError(state, error: string|unknown) {
-            if (typeof error === 'string') {
-                state.thunderstoreModListUpdateError = error;
-            } else {
-                const msg = error instanceof Error ? error.message : "Unknown error";
-                state.thunderstoreModListUpdateError = msg;
-            }
+        setThunderstoreModListUpdateError(state, error: Error) {
+            state.thunderstoreModListUpdateError = error instanceof Error ? error : new Error(error);
         },
         setThunderstoreModListUpdateStatus(state, status: string) {
             state.thunderstoreModListUpdateStatus = status;
         },
         startThunderstoreModListUpdate(state) {
             state.isThunderstoreModListUpdateInProgress = true;
-            state.thunderstoreModListUpdateError = '';
+            state.thunderstoreModListUpdateError = undefined;
         },
         updateDeprecated(state, allMods: ThunderstoreMod[]) {
             state.deprecated = Deprecations.getDeprecatedPackageMap(allMods);

From 5db43906c1a89b778fa7d330d306d243541c5e63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Wed, 8 Jan 2025 13:23:32 +0200
Subject: [PATCH 42/95] Gather optional arguments of retry() helper to an
 object

This improves readability on call sites and allows passing arguments
without having to explicitly define all prior arguments that use the
default values.
---
 src/r2mm/mods/ProfileImportExport.ts | 22 ++++++++++++----------
 src/store/modules/TsModsModule.ts    |  5 +++--
 src/utils/Common.ts                  | 19 ++++++++++++++-----
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/r2mm/mods/ProfileImportExport.ts b/src/r2mm/mods/ProfileImportExport.ts
index 785fc55a3..218bb870b 100644
--- a/src/r2mm/mods/ProfileImportExport.ts
+++ b/src/r2mm/mods/ProfileImportExport.ts
@@ -56,16 +56,18 @@ async function downloadProfileCode(profileCode: string): Promise<string> {
         let is404: boolean = false;
         const response: AxiosResponse<string> = await retry(
             () => ProfileApiClient.getProfile(profileCode),
-            5,
-            1000,
-            () => { return !is404 },
-            (e: unknown) => {
-                console.error(e);
-                if (R2Error.fromThrownValue(e).message.startsWith("404")) {
-                    is404 = true;
-                }
-            },
-            true
+            {
+                attempts: 5,
+                interval: 1000,
+                canRetry: () => { return !is404 },
+                onError: (e: unknown) => {
+                    console.error(e);
+                    if (R2Error.fromThrownValue(e).message.startsWith("404")) {
+                        is404 = true;
+                    }
+                },
+                throwLastErrorAsIs: true
+            }
         );
         return saveDownloadedProfile(response.data);
     } catch (e: unknown) {
diff --git a/src/store/modules/TsModsModule.ts b/src/store/modules/TsModsModule.ts
index d6e2f0c1a..64ab5bc40 100644
--- a/src/store/modules/TsModsModule.ts
+++ b/src/store/modules/TsModsModule.ts
@@ -234,7 +234,8 @@ export const TsModsModule = {
 
         async fetchPackageListIndex({rootState}): Promise<PackageListIndex> {
             const indexUrl = CdnProvider.addCdnQueryParameter(rootState.activeGame.thunderstoreUrl);
-            const index = await retry(() => fetchAndProcessBlobFile(indexUrl), 5, 2000);
+            const options = {attempts: 5, interval: 2000};
+            const index = await retry(() => fetchAndProcessBlobFile(indexUrl), options);
 
             if (!isStringArray(index.content)) {
                 throw new Error('Received invalid chunk index from API');
@@ -319,7 +320,7 @@ export const TsModsModule = {
             // Check for exclusion list updates from online.
             try {
                 const axios = getAxiosWithTimeouts(timeout, timeout);
-                const response = await retry(() => axios.get(EXCLUSIONS), attempts, interval);
+                const response = await retry(() => axios.get(EXCLUSIONS), {attempts, interval});
 
                 if (typeof response.data === 'string') {
                     commit('setExclusions', response.data);
diff --git a/src/utils/Common.ts b/src/utils/Common.ts
index c84efc619..9e0332c58 100644
--- a/src/utils/Common.ts
+++ b/src/utils/Common.ts
@@ -28,12 +28,21 @@ export const getPropertyFromPath = (object: Mappable, path: string | string[]):
 
 export async function retry<T>(
     fn: () => Promise<T>,
-    attempts: number = 3,
-    interval: number = 5000,
-    canRetry: () => boolean = () => true,
-    onError: (e: Error | unknown) => void = console.error,
-    throwLastErrorAsIs: boolean = false
+    options?: {
+        attempts?: number,
+        interval?: number,
+        canRetry?: () => boolean,
+        onError?: (e: Error | unknown) => void,
+        throwLastErrorAsIs?: boolean
+    }
 ): Promise<T> {
+    const opts = options || {};
+    const attempts = opts.attempts || 3;
+    const interval = opts.interval || 5000;
+    const canRetry = opts.canRetry || (() => true);
+    const onError = opts.onError || console.error;
+    const throwLastErrorAsIs = opts.throwLastErrorAsIs || false;
+
     for (let currentAttempt = 1; currentAttempt <= attempts; currentAttempt++) {
         if (!canRetry()) {
             throw new Error("Retry interrupted");

From 4ed6906c6b642994044a7ecab5bfb4ebd7b3963d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Wed, 8 Jan 2025 13:30:57 +0200
Subject: [PATCH 43/95] Don't let retry() hide the original error when updating
 package list

---
 src/store/modules/TsModsModule.ts | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/store/modules/TsModsModule.ts b/src/store/modules/TsModsModule.ts
index 64ab5bc40..3a2978e22 100644
--- a/src/store/modules/TsModsModule.ts
+++ b/src/store/modules/TsModsModule.ts
@@ -180,13 +180,7 @@ export const TsModsModule = {
 
             try {
                 commit('setThunderstoreModListUpdateStatus', 'Checking for mod list updates from Thunderstore...');
-                let packageListIndex: PackageListIndex;
-
-                try {
-                    packageListIndex = await dispatch('fetchPackageListIndex');
-                } catch {
-                    throw new Error('Failed to check for updates from Thunderstore');
-                }
+                const packageListIndex = await dispatch('fetchPackageListIndex');
 
                 // If the package list is up to date, only update the timestamp. Otherwise,
                 // fetch the new one and store it into IndexedDB.
@@ -234,7 +228,7 @@ export const TsModsModule = {
 
         async fetchPackageListIndex({rootState}): Promise<PackageListIndex> {
             const indexUrl = CdnProvider.addCdnQueryParameter(rootState.activeGame.thunderstoreUrl);
-            const options = {attempts: 5, interval: 2000};
+            const options = {attempts: 5, interval: 2000, throwLastErrorAsIs: true};
             const index = await retry(() => fetchAndProcessBlobFile(indexUrl), options);
 
             if (!isStringArray(index.content)) {
@@ -282,7 +276,8 @@ export const TsModsModule = {
 
         async fetchAndCachePackageListChunk({rootState, state}, chunkUrl: string): Promise<void> {
             const url = CdnProvider.replaceCdnHost(chunkUrl);
-            const {content: chunk} = await retry(() => fetchAndProcessBlobFile(url));
+            const options = {throwLastErrorAsIs: true};
+            const {content: chunk} = await retry(() => fetchAndProcessBlobFile(url), options);
 
             if (!isPackageListChunk(chunk)) {
                 throw new Error(`Received invalid chunk from URL "${url}"`);
@@ -313,14 +308,13 @@ export const TsModsModule = {
             const exclusionList: {exclusions: string[]} = require('../../../modExclusions.json');
             commit('setExclusions', exclusionList.exclusions);
 
-            const attempts = 5;
-            const interval = 1000;
             const timeout = 20000;
+            const options = {attempts: 5, interval: 1000, throwLastErrorAsIs: true};
 
             // Check for exclusion list updates from online.
             try {
                 const axios = getAxiosWithTimeouts(timeout, timeout);
-                const response = await retry(() => axios.get(EXCLUSIONS), {attempts, interval});
+                const response = await retry(() => axios.get(EXCLUSIONS), options);
 
                 if (typeof response.data === 'string') {
                     commit('setExclusions', response.data);

From 4faf49fa72f265b8305a4799d9132add6ed721f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Wed, 8 Jan 2025 15:47:31 +0200
Subject: [PATCH 44/95] Fix downloading a dependency for an already installed
 mod

The implementation tried to read the mod list from a store location
that hasn't existed in a while.
---
 src/components/views/LocalModList/LocalModCard.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/views/LocalModList/LocalModCard.vue b/src/components/views/LocalModList/LocalModCard.vue
index f2b149d8c..63a2b2a84 100644
--- a/src/components/views/LocalModList/LocalModCard.vue
+++ b/src/components/views/LocalModList/LocalModCard.vue
@@ -5,9 +5,11 @@ import DonateButton from '../../buttons/DonateButton.vue';
 import R2Error from '../../../model/errors/R2Error';
 import ManifestV2 from '../../../model/ManifestV2';
 import ThunderstoreMod from '../../../model/ThunderstoreMod';
+import VersionNumber from '../../../model/VersionNumber';
 import { LogSeverity } from '../../../providers/ror2/logging/LoggerProvider';
 import Dependants from '../../../r2mm/mods/Dependants';
 import { valueToReadableDate } from '../../../utils/DateUtils';
+import { splitToNameAndVersion } from '../../../utils/DependencyUtils';
 
 @Component({
     components: {
@@ -161,9 +163,11 @@ export default class LocalModCard extends Vue {
     }
 
     downloadDependency(dependencyString: string) {
-        const packages: ThunderstoreMod[] = this.$store.state.thunderstoreModList;
-        const lowerCaseName = dependencyStringToModName(dependencyString).toLowerCase();
-        const dependency = packages.find((m) => m.getFullName().toLowerCase() === lowerCaseName);
+        const [name, version] = splitToNameAndVersion(dependencyString);
+        const partialManifest = new ManifestV2();
+        partialManifest.setName(name);
+        partialManifest.setVersionNumber(new VersionNumber(version));
+        const dependency = this.$store.getters['tsMods/tsMod'](partialManifest);
 
         if (dependency === undefined) {
             const error = new R2Error(

From 55d059a12228c6cc168439292582ca4502b55c16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Fri, 10 Jan 2025 10:00:06 +0200
Subject: [PATCH 45/95] Turn off autocomplete for text inputs

TSMM updates to use Chrome v131, which causes awkward autocomplete
popups to be shown for text inputs. This seemed to affect only inputs
with ids, but not all of them. To avoid regressions if ids would be
added later, they were added now, paired with the autocomplete="off"
attribute. As an additional benefit, this makes it easier to interpret
errors TSMM logs into Sentry.
---
 .../config-components/ConfigEditLayout.vue    |  8 ++++-
 .../ConfigSelectionLayout.vue                 | 11 +++++--
 .../importing/LocalFileImportModal.vue        | 30 +++++++++++++++++--
 .../profiles-modals/CreateProfileModal.vue    |  3 +-
 .../profiles-modals/ImportProfileModal.vue    | 17 ++++++++---
 .../profiles-modals/RenameProfileModal.vue    |  4 ++-
 .../views/LocalModList/SearchAndSort.vue      |  5 ++--
 src/components/views/OnlineModView.vue        |  5 ++--
 src/pages/GameSelectionScreen.vue             | 18 +++++++++--
 src/pages/Manager.vue                         |  8 ++++-
 10 files changed, 90 insertions(+), 19 deletions(-)

diff --git a/src/components/config-components/ConfigEditLayout.vue b/src/components/config-components/ConfigEditLayout.vue
index 8e5613f3a..58eb6a1b6 100644
--- a/src/components/config-components/ConfigEditLayout.vue
+++ b/src/components/config-components/ConfigEditLayout.vue
@@ -54,7 +54,13 @@
                                     </option>
                                 </select>
                             </template>
-                            <input class="input" v-model="line.value" v-else/>
+                            <input
+                                v-else
+                                v-model="line.value"
+                                :id="`${key.toString().replace(/\s+/g, '-')}-${variable.toString().replace(/\s+/g, '-')}`"
+                                class="input"
+                                autocomplete="off"
+                            />
                         </div>
                     </div>
                 </div>
diff --git a/src/components/config-components/ConfigSelectionLayout.vue b/src/components/config-components/ConfigSelectionLayout.vue
index 47268004b..902b136bb 100644
--- a/src/components/config-components/ConfigSelectionLayout.vue
+++ b/src/components/config-components/ConfigSelectionLayout.vue
@@ -16,8 +16,15 @@
             <div class='no-padding-left card-header-title'>
 
                 <div class="input-group input-group--flex margin-right">
-                    <label for="local-search" class="non-selectable">Search</label>
-                    <input id="local-search" v-model='filterText' class="input margin-right" type="text" placeholder="Search for config files"/>
+                    <label for="config-search" class="non-selectable">Search</label>
+                    <input
+                        v-model="filterText"
+                        id="config-search"
+                        class="input margin-right"
+                        type="text"
+                        placeholder="Search for config files"
+                        autocomplete="off"
+                    />
                 </div>
 
                 <div class="input-group margin-right">
diff --git a/src/components/importing/LocalFileImportModal.vue b/src/components/importing/LocalFileImportModal.vue
index b35027c98..303557fd1 100644
--- a/src/components/importing/LocalFileImportModal.vue
+++ b/src/components/importing/LocalFileImportModal.vue
@@ -27,17 +27,41 @@
                 </div>
                 <div class="input-group input-group--flex margin-right">
                     <label for="mod-name" class="non-selectable">Mod name</label>
-                    <input id="mod-name" ref="mod-name" class="input margin-right" type="text" v-model="modName" placeholder="Enter the name of the mod"/>
+                    <input
+                        v-model="modName"
+                        id="mod-name"
+                        class="input margin-right"
+                        ref="mod-name"
+                        type="text"
+                        placeholder="Enter the name of the mod"
+                        autocomplete="off"
+                    />
                 </div>
                 <br/>
                 <div class="input-group input-group--flex margin-right">
                     <label for="mod-author" class="non-selectable">Author</label>
-                    <input id="mod-author" ref="mod-author" class="input margin-right" type="text" v-model="modAuthor" placeholder="Enter the author name"/>
+                    <input
+                        v-model="modAuthor"
+                        id="mod-author"
+                        class="input margin-right"
+                        ref="mod-author"
+                        type="text"
+                        placeholder="Enter the author name"
+                        autocomplete="off"
+                    />
                 </div>
                 <br/>
                 <div class="input-group input-group--flex margin-right">
                     <label for="mod-author" class="non-selectable">Description (optional)</label>
-                    <input id="mod-description" ref="mod-description" class="input margin-right" type="text" v-model="modDescription" placeholder="Enter a description"/>
+                    <input
+                        v-model="modDescription"
+                        id="mod-description"
+                        class="input margin-right"
+                        ref="mod-description"
+                        type="text"
+                        placeholder="Enter a description"
+                        autocomplete="off"
+                    />
                 </div>
                 <hr/>
                 <h3 class="title is-6">Version</h3>
diff --git a/src/components/profiles-modals/CreateProfileModal.vue b/src/components/profiles-modals/CreateProfileModal.vue
index 488c6191f..8f481c1ad 100644
--- a/src/components/profiles-modals/CreateProfileModal.vue
+++ b/src/components/profiles-modals/CreateProfileModal.vue
@@ -54,11 +54,12 @@ export default class CreateProfileModal extends ProfilesMixin {
             <p>This profile will store its own mods independently from other profiles.</p>
             <br/>
             <input
-                class="input"
                 v-model="newProfileName"
                 @keyup.enter="!doesProfileExist(newProfileName) && createProfile()"
                 id="create-profile-modal-new-profile-name"
+                class="input"
                 ref="nameInput"
+                autocomplete="off"
             />
             <br/><br/>
             <span class="tag is-dark" v-if="newProfileName === '' || makeProfileNameSafe(newProfileName) === ''">
diff --git a/src/components/profiles-modals/ImportProfileModal.vue b/src/components/profiles-modals/ImportProfileModal.vue
index 628aa2366..913472ba8 100644
--- a/src/components/profiles-modals/ImportProfileModal.vue
+++ b/src/components/profiles-modals/ImportProfileModal.vue
@@ -276,11 +276,13 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
         </template>
         <template v-slot:body>
             <input
-                type="text"
-                class="input"
                 v-model="profileImportCode"
-                ref="profileCodeInput"
                 @keyup.enter="isProfileCodeValid(profileImportCode) && onProfileCodeEntered()"
+                id="import-profile-modal-profile-code"
+                class="input"
+                type="text"
+                ref="profileCodeInput"
+                autocomplete="off"
             />
             <br />
             <br />
@@ -354,7 +356,14 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
         <template v-slot:body v-if="importUpdateSelection === 'CREATE'">
             <p>This profile will store its own mods independently from other profiles.</p>
             <br/>
-            <input class="input" v-model="targetProfileName" ref="profileNameInput" />
+            <input
+                v-model="targetProfileName"
+                id="import-profile-modal-new-profile-name"
+                class="input"
+                type="text"
+                ref="profileNameInput"
+                autocomplete="off"
+            />
             <br/><br/>
             <span class="tag is-dark" v-if="makeProfileNameSafe(targetProfileName) === ''">
                 Profile name required
diff --git a/src/components/profiles-modals/RenameProfileModal.vue b/src/components/profiles-modals/RenameProfileModal.vue
index d6ee54b3c..3a5a88e92 100644
--- a/src/components/profiles-modals/RenameProfileModal.vue
+++ b/src/components/profiles-modals/RenameProfileModal.vue
@@ -73,10 +73,12 @@ export default class RenameProfileModal extends ProfilesMixin {
             <p>This profile will store its own mods independently from other profiles.</p>
 
             <input
-                class="input"
                 v-model="newProfileName"
                 @keyup.enter="!doesProfileExist(newProfileName) && performRename()"
+                id="rename-profile-modal-new-profile-name"
+                class="input"
                 ref="nameInput"
+                autocomplete="off"
             />
 
             <span class="tag is-dark" v-if="newProfileName === '' || makeProfileNameSafe(newProfileName) === ''">
diff --git a/src/components/views/LocalModList/SearchAndSort.vue b/src/components/views/LocalModList/SearchAndSort.vue
index 5ab4aa72c..97076bdd6 100644
--- a/src/components/views/LocalModList/SearchAndSort.vue
+++ b/src/components/views/LocalModList/SearchAndSort.vue
@@ -67,13 +67,14 @@ export default class SearchAndSort extends Vue {
             <div class="no-padding-left card-header-title">
 
                 <div class="input-group input-group--flex margin-right">
-                    <label for="local-search" class="non-selectable">Search</label>
+                    <label for="installed-search" class="non-selectable">Search</label>
                     <DeferredInput
                         v-model="search"
-                        id="local-search"
+                        id="installed-search"
                         class="input margin-right"
                         type="text"
                         placeholder="Search for an installed mod"
+                        autocomplete="off"
                     />
                 </div>
 
diff --git a/src/components/views/OnlineModView.vue b/src/components/views/OnlineModView.vue
index ec0ce555a..32099f097 100644
--- a/src/components/views/OnlineModView.vue
+++ b/src/components/views/OnlineModView.vue
@@ -4,13 +4,14 @@
             <div class="is-shadowless is-square">
                 <div class="no-padding-left card-header-title">
                     <div class="input-group input-group--flex margin-right">
-                        <label for="thunderstore-search-filter">Search</label>
+                        <label for="online-search">Search</label>
                         <DeferredInput
                             v-model="thunderstoreSearchFilter"
-                            id="thunderstore-search-filter"
+                            id="online-search"
                             class="input"
                             type="text"
                             placeholder="Search for a mod"
+                            autocomplete="off"
                         />
                     </div>
                     <div class="input-group margin-right">
diff --git a/src/pages/GameSelectionScreen.vue b/src/pages/GameSelectionScreen.vue
index 139df65da..b70381969 100644
--- a/src/pages/GameSelectionScreen.vue
+++ b/src/pages/GameSelectionScreen.vue
@@ -41,7 +41,14 @@
                             <div class="level-item">
                                 <div class="card-header-title">
                                     <div class="input-group input-group--flex margin-right">
-                                        <input id="local-search" v-model='filterText' class="input margin-right" type="text" placeholder="Search for a game"/>
+                                        <input
+                                            v-model="filterText"
+                                            id="game-selection-list-search"
+                                            class="input margin-right"
+                                            type="text"
+                                            placeholder="Search for a game"
+                                            autocomplete="off"
+                                        />
                                     </div>
                                 </div>
                             </div>
@@ -62,7 +69,14 @@
                             <div class="level-item">
                                 <div class="card-header-title">
                                     <div class="input-group input-group--flex margin-right">
-                                        <input id="local-search" v-model='filterText' class="input margin-right" type="text" placeholder="Search for a game"/>
+                                        <input
+                                            v-model="filterText"
+                                            id="game-selection-cards-search"
+                                            class="input margin-right"
+                                            type="text"
+                                            placeholder="Search for a game"
+                                            autocomplete="off"
+                                        />
                                     </div>
                                 </div>
                             </div>
diff --git a/src/pages/Manager.vue b/src/pages/Manager.vue
index 459999cd7..49f92263a 100644
--- a/src/pages/Manager.vue
+++ b/src/pages/Manager.vue
@@ -107,7 +107,13 @@
 						entering custom launch parameters.</strong>
 				</p>
 				<br/>
-				<input class='input' v-model='launchParametersModel' placeholder='Enter parameters'/>
+				<input
+					v-model='launchParametersModel'
+					id='launch-parameters-modal-input'
+					class='input'
+					placeholder='Enter parameters'
+					autocomplete='off'
+				/>
 			</template>
 			<template v-slot:footer>
 				<button class='button is-info' @click='updateLaunchParameters()'>

From 97aa6a0fcad095fa2a767aed003b65a950828fcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Fri, 10 Jan 2025 11:27:05 +0200
Subject: [PATCH 46/95] Fix management of installation state tracking file

When uninstalling, disabling, or enabling a mod,
ConflictManagementProvider received only the affected mods as an
argument while it expects to receive all the mods currently present in
the profile.
---
 src/store/modules/ProfileModule.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/store/modules/ProfileModule.ts b/src/store/modules/ProfileModule.ts
index cf87335ad..b65f62999 100644
--- a/src/store/modules/ProfileModule.ts
+++ b/src/store/modules/ProfileModule.ts
@@ -231,8 +231,7 @@ export default {
                 }
             }
 
-            // IDK but sounds important.
-            await dispatch('resolveConflicts', params);
+            await dispatch('resolveConflicts', {mods: lastSuccessfulUpdate, profile});
         },
 
         async enableModsOnActiveProfile(
@@ -286,7 +285,7 @@ export default {
                 }
             }
 
-            await dispatch('resolveConflicts', params);
+            await dispatch('resolveConflicts', {mods: lastSuccessfulUpdate, profile});
         },
 
         // Return ThunderstoreCombos pointing to the latest available version.
@@ -425,7 +424,7 @@ export default {
                 }
             }
 
-            await dispatch('resolveConflicts', params);
+            await dispatch('resolveConflicts', {mods: lastSuccessfulUpdate, profile});
         },
 
         async updateActiveProfile({commit, rootGetters}, profileName: string) {

From 4fbf0284ef4309f2957424a184a49d0b59a7f3a2 Mon Sep 17 00:00:00 2001
From: Vili Manninen <vili.manninen@riskidev.fi>
Date: Tue, 7 Jan 2025 16:05:16 +0200
Subject: [PATCH 47/95] Add game I Am Your Beast

---
 .../images/game_selection/IAmYourBeast.webp     | Bin 0 -> 24682 bytes
 src/model/game/GameManager.ts                   |   6 ++++++
 .../InstallationRuleApplicator.ts               |   1 +
 .../ModLoaderVariantRecord.ts                   |   1 +
 4 files changed, 8 insertions(+)
 create mode 100644 src/assets/images/game_selection/IAmYourBeast.webp

diff --git a/src/assets/images/game_selection/IAmYourBeast.webp b/src/assets/images/game_selection/IAmYourBeast.webp
new file mode 100644
index 0000000000000000000000000000000000000000..0eae38a2c83f72d49f3b1a87f31ee4bde8b785a3
GIT binary patch
literal 24682
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
R000000000000000008~TIS~K=

literal 0
HcmV?d00001

diff --git a/src/model/game/GameManager.ts b/src/model/game/GameManager.ts
index 05a8e4ca2..b7a02a1e1 100644
--- a/src/model/game/GameManager.ts
+++ b/src/model/game/GameManager.ts
@@ -847,6 +847,12 @@ export default class GameManager {
             "https://thunderstore.io/c/subterror/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2846060")], "Subterror.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["st"]),
+
+        new Game("I Am Your Beast", "IAmYourBeast", "I Am Your Beast",
+            "I Am Your Beast", ["I Am Your Beast.exe"], "I Am Your Beast_Data",
+            "https://thunderstore.io/c/i-am-your-beast/api/v1/package-listing-index/",
+            [new StorePlatformMetadata(StorePlatform.STEAM, "1876590")], "IAmYourBeast.webp",
+            GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["iayb"]),
     ];
 
     static get activeGame(): Game {
diff --git a/src/r2mm/installing/default_installation_rules/InstallationRuleApplicator.ts b/src/r2mm/installing/default_installation_rules/InstallationRuleApplicator.ts
index 14b3c649d..3f264725a 100644
--- a/src/r2mm/installing/default_installation_rules/InstallationRuleApplicator.ts
+++ b/src/r2mm/installing/default_installation_rules/InstallationRuleApplicator.ts
@@ -157,6 +157,7 @@ export default class InstallationRuleApplicator {
             buildBepInExRules("ATLYSS"),
             buildBepInExRules("PeaksOfYore"),
             buildBepInExRules("Subterror"),
+            buildBepInExRules("IAmYourBeast"),
         ]
     }
 }
diff --git a/src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts b/src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts
index 769318913..97ff01f4a 100644
--- a/src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts
+++ b/src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts
@@ -211,6 +211,7 @@ const VARIANTS = {
     ATLYSS: MODLOADER_PACKAGES,
     PeaksOfYore: MODLOADER_PACKAGES,
     Subterror: MODLOADER_PACKAGES,
+    IAmYourBeast: MODLOADER_PACKAGES,
 };
 // Exported separately from the definition in order to preserve the key names in the type definition.
 // Otherwise this would become [key: string] and we couldn't use the game names for type hinting elsewhere.

From 88d70d4e3d126fc86bc3952150bf1393f1ac9de5 Mon Sep 17 00:00:00 2001
From: Vili Manninen <vili.manninen@riskidev.fi>
Date: Tue, 7 Jan 2025 15:57:19 +0200
Subject: [PATCH 48/95] Add game MiSide

---
 src/assets/images/game_selection/MiSide.webp    | Bin 0 -> 18394 bytes
 src/model/game/GameManager.ts                   |   6 ++++++
 .../InstallationRuleApplicator.ts               |   1 +
 .../ModLoaderVariantRecord.ts                   |   1 +
 4 files changed, 8 insertions(+)
 create mode 100644 src/assets/images/game_selection/MiSide.webp

diff --git a/src/assets/images/game_selection/MiSide.webp b/src/assets/images/game_selection/MiSide.webp
new file mode 100644
index 0000000000000000000000000000000000000000..f17f583349acd3a2afdf6804bffa33228ee02d16
GIT binary patch
literal 18394
zcmV(vK<d9zNk&G}M*sj<MM6+kP&il$0000G0001I0RZ0t06|PpNNNNC009rs|A+|C
zy7o_v+x%uUvS($*9m@>O8JQ{<HxBcxLP|<<QpUB*%uM6WCP#5;9p<cE3a1QrvQL@$
zmiemv0t|Cbzknn9FCZv5&<^~+Px#-2|4sPcg#S$-);yaLps-XbKrkSl0sy-1zhZ>^
zqcb2z-rGxo0?HkL=mhux04RM1kSYL3_tJkPm2AkZu>klbemxL;3Ph9w*sB4|+6n+`
zEbRiom0Rn3l6^%0+yVol6M&+!0C)<376j1yiX{&Kn2RV5d>26|R#*fsr6@oBF_4Y`
z3`*Al>OWjL;p#6U;7bTmSy2{ES=gmByp%APqU{lsXW(yF(?4CKLUBULRTWfjttRBv
zd4=F+2>ou!;<BO>)FKAg(|abNunieOB%MaOA=PA>QD=a|qWd1QO|CGhWuh5!`i0#@
zZ1vq5$&jP>TF`N038}6A+vT2Df2_(en&mB&>KevBJ(D6m19cQauR6Zc;8Jm}j|#zG
zjmuKUmv*xLLDGv1MJBMJUtMW%IlqPg4gu91S)2LR@+CvM({G2vT=2cZ;1V_KRWQ!|
z_IHm~)Q>0O%Al<8((vNm<s3z7a6Mfo7>hG4BtD0zY&B3k#ixAJld+~~Zp*{qVt954
z)6St-i?Po2)p|-(V52V2giTxrx@>SIb`_HcA6EHtmq)}KLi|_=UZwjw8HzVTCXEJH
z|C8Q0M@~fLEc8o&40qH>I(acsOD56auEz~7KC)I~l;v>3z~H4r{3k5t%V<o1&I{ms
zd!@mpe(NBrNEMm{)abaQgO$P$<6MR0LKn`-8(bi$v%1<`+&bq~v^TZOpZh{kl(2qa
z3qru)(pPRK7;OhCM)X0tEeHD1Fp%0zxo+Lo8J8Md++SKkzaVWlz5?VoQ>z5;-6V{V
z=4}xs(+#eybgFPl$%$oNMrmseaQimIH;-LipgFk7+Xk0jr0qAY#V;p?PeYz=gecb8
z8gm%%rUNZ3gDb0!szv9#T0C8hesnF(Nds49uta93uwt^>;1asW0`H+9w{qwbVel);
zr;v8RNaVBpkinHMlG&B2n`odv$UUu9Oez6Hnf^KtG3N%Cc=NphZ_HoEul3NUj?ESD
z<ncm`+bdq%+WZhx&lp??1Cq1@BVQ^pteQftrH6`dTRA09QjPNru2<Jx4`Qh-NLnkt
zjHKezLXr8BFuXwcN9}tIE@HP7L?T(Ku9pd!f4a&!E`xlVgEUJQM`W$Rg}uea;Jc-N
z$uE*3V+ncL^ue}#+5~+G$JNB-LhO5WOC`dq%QPx>=z_&a)FlD$Qp&{{1{cG&I_<0;
zXlc@pB)LX`&lme(r*1~}OMx?b4K9gUOITkuXz6SZ<j~i32&1MhHC^D%+W>l}!KK+v
z3_3ZceNb0PDD`x4I0)3MDhE#OJJ-xIxCo{<+@#20$k^2suPvow^Squ7PhaW`>bn`D
zjKP&AbAaIw9i%0SRS~b$XFQH%YcC!eQygXIzg+-UP&gn$LjVBKL;;-vDrf=V0Y05X
zol2-GrXwkntB9}@iA~B_LA=8j|4X>eHTH+>|H}GxT_4eZb@QL#k81hH^sk-I_<pT_
zrvI__3jLGw-t}+hFV0i`zpa1q-lIR%`kuWBdS5@g|LW=h|Nok4=RJ%5Z`WCbKZM-T
z+mGy?B9F_orw6~#^XK@__g=ufK(q?}mHvO$L;jyLKeT#{^uY9bJmH=K*8UN!0s_B*
zqg6OIfSn8tdu_`kd;0&-q0<lfg1)o*G`U_-tLl;{==)woS|4Or1GrmeS}t2qE~(|F
zc~oS1=21941?N`ckxb@(mqxTV%{&;cPx4t}o=sh58M6F<AJ;C@llVq{2o*A`(E<H`
z=u~}V8f|1FWSWUrHNorxuLh%Cnu%7B6Py0HbM|xF<wW~XMu)DR+t=IaokSUehNvVP
zda*XB4xsXecVHm&Bt{?78t9nQXx2es6x6et8U>nH?L9sRI-#oqN|DHw6eoybxUnP;
z7gDHs%>T=-SMU`rJEg98ljEC|RP9*Oo%gU)eN>G3GVpp5t|qGmiO4C%k)ke+s|2T|
zq8{|iPai^7S@b8t7R$xvlTHG?<9Yh3nbp{)){iv=xW;;$vhkS+i#JIc78TK|5d{gy
zDV(A=3z%?Nj42sANV|H6=d`dRDDfqYb}K|QX4tXN##Mox;kTHrzi<67FD<yW50ii+
zXPEaK^Xo)Ul{g`NdGI>#lLN|lg?L2{s&`sRk7xu?21t+MvC5$!oC;qoO&Jn5mOFSF
z#N%owEhS~{T&ec_m449MHr&pb3H+}x44@b!-Ix2z`zB93`e}Lhx8+yo!Rv+EUk57?
z=LZF^6_+A?^&(ETXcss@lfNwSM_pp4y)1bz4*Ryp@}M52g@SFU#Jk#9;*See!zhv%
z;MGMTT?;mvOVr-xVMNt{${ADdTff%*DgmRE4SZRfhI`W}Jw(3ltd<2u1Ip=g0}G)&
zZk_$aiP*Ou0*sD5hfkMg6(mDU!aSk8_k|Kn=5efEA-cyJcgH$vRF4dlZVm<!?Y~LZ
zo{zjSJ`q1*?vDiPBmeZA|C6enA>KEC_!S09xz|y)!0r&pgSYb`xdU-C&y?Htd`sRm
zvTKrHdz}ec!7Pawc*8trDzJwJ$9dCb+Pxo+0g@V+R4r0y6Wxr@?R$mXVtH#1kMv^I
zY5X`N0F&xB!oy%*7v{LuaF_oEV!-<Wsg$}W*P**d4!g*Epq+G45@=CgwVY%I94OWA
zf1uzY1Lq^TZm8sEn=n!2@PHGx(yh5&(2Jb-3Abd41kBPD1LUvFl7C<K=rh@!z5E!Z
zcbRK>)ro~<#n?plBp{l&QAYkm>p9aNfSMT5MPA1yieFlF@fTv(<MAv9!_x{V^bgOo
z$arKC-Z+G8!H4MIu=F<K^b>PRhV|Q`r?k0Ut9^2?ziRe=$TR1O8_><)Z8Gc~#m|De
znS5+7uQTFCgdT=YZI0R#UCo7_nzI{a*$Sm#_UR?;hyl&-X_UT!PkznW{_orj#d>&}
zA$rH7o+xPAyRZvI_N?U69tOv}H@y*@fvn$d(84JXAye_9f4ag3Hp9q5r4w%9yDJRu
zo;r`0Ovt9Q5y}4z(#cGAsh=FR3$#V6(X_!;?z{1`<@c${Dln~W{H^k;wN$=M6a}_t
zuUXrm*+}&Ecj>Jr4p4Y7jzUVs1UQ(lo&~zrbdz*_FaP15E}mNZy&;(M;ALp7#G;*`
zVz17?A)ab$D9lXGFt_^mZqWE=u;pHzdKtx5v3j)eKsQDiRWjD)X~PTyYtqtWFgxFY
zvW9uCC(NGCd!_gyiQSHfVG4Mpl=lq}P-l{_IWdHTfmpzvEgKL$`3Q4?TD%f?lsC}`
zG+aTjc{zOGsG$74apQCwEbT>t`|OlXT1GXCb%%qv=RpCQ#^qFSX1@h-P4iWvNrtO$
zD{3}(#p&9wnp3q*Ag&7`;N(#DH&;^WfrYw30oy*@z+(qfN2~hqdaQPmm!dz@ssdI+
znG##}j|1@xGJhBjVUPNc|J2p}{SA%M7Q@cL_O%8l2xwQGcsa-k)6>yXrn%<88<4>F
z4D2P2JdCIT?dk{rjLT67W~8zK6ZB&y^l&uBVrzWzZc>nx&Hbl|y>4!wZXkhm$*=AA
zi}Ubv+vyYrAd27pxjDb)!#w`Zb8D0UdaZZZP6@_^PNFp1irJp@nuSi4-(XC&?AEV+
zf0~Z7&-npxBPC$VKxbC3c28dfFa%1v6*@6pg*ofc8<bj~0A>F>(ekVB3|kXEHTgl0
z5dAXMk?ymJGc_4}SBi76^?&Fd+|g9uX`0KD*fm-V8DTQO6k|Aew)-jexIth_r|6ny
zsbw8&(7gw9NLp2qx1S}iJY)8z9uy!rzH{#EeG)sTGcm>o?4ABr`l!|DBkn5_B|p%H
z!$XwbkYx2L&XsFa>PqmizBrHHcOv47ftEIJ!d}ayG!|%c!YR-6`=cl=YtA2y+<m-A
zvQP+|`f-e&15E?BUo?E}7@4PY9Id#KyQNBD<8&<C5fe)WX`%bRJ_8s(3al8x2hY-M
zuT#VN49>r^vH!L4KSGn-RG44a<7gXZlSNC}8+i*5KS{z7wNk|PG1oojDEo>46){&7
z+KB|yP3$&lpnV-(`@jt;T2XzQKte6*L~gkH8oeSoaPiAGlh`vpn+$YlNNfu#9^J8V
zqMZ#8X`u^^5>J8NjTXY=Uls;8sl+}8t_r|ET<Zq6P&O0K=ool75T#L^&Uuh5d~wTY
z#!7?O5OJfu^xL>x%HuGJ^8X-9R@1&-;j(}N>EsYd$<&`Wqv|B@6pH%X(#7mD`;m>_
z0COQWp2ESAtqLMK9Y%%9w4qhkbZ*M+OaGBIc(Iw}%3YW2%fr>ER(7nC6YdyraEv2!
z2x{qA#^hh#y1o7oxPCA!j689{Z3iU*y@7d1W7(?SSwqIO@Y%dF4-eA$D2vAVCAf*s
z?adHAVmhAR`#Mqtw1n0JM=s?2rb3fvLE}6^%AyPiZq1tc#m&Skfe;(Qy>UAcp7yLG
z5a{k1@RAe`&VT}r2B8mj{UL35{Eg=7la$iN22M)mKae7VIP`!JlPUSgEc~^nWZeRt
zHvCJ8#{&yJ?*7_~`o!eL$3O$LBk8-u@yF{h23v?69D4+--ZRccMC^L(IdFa6aW7|P
zVy^^I)m+sZWZ>|^{SEuKWZ<N!l`cAjNu8J-D?oB<VQiaH{`>1l=FJ0-THgd4^AhTH
zXwnxU=k86Sb*br+{j7j*Y@<<zlrW)oh6JLBE1NM4YPTKmkH=_;Qg|w%U;+)Z`v5G@
z9643##x&&0y@9;HnYH}<oM{Ix&C&~Bs5bgu-{odVAf%d!dz0VR-o`|oq`{moe6<aR
zeTfm0Hj2-`2Va*vz1h>jk~ZnN(kMi=0K>BH2k7<xp;7hHc)DGS8<}e0B>({a@UQL^
zoB(@$*_+d{6QwGssl|){>M#0}+N&OwNWo=7uMl-n0nowVt(lw2-NM6$m%8QCNFk<8
z$64WYP`BBKjmj_Txf$bY!)&+35e<UJBk8a125u3QG@BVh*TG}#DJNq<Op0!5CnLZo
z7$TS$-Fx+tiONHh!md=TSpD8PU)le#NTsg-#s?5kj_@j|8#=gacV(+nqb@fM?~B18
zaukG*0kPq4)(pY>1s;szvaTDSnyKOX0Pr~G<p%hyg*GiX?HRb2gM$wU`?1KO25n-X
zB}Cg#V$xVM<)(krhk1gmRrbjxL;hA<VOK8aJCS8$-5B(i!{CDpLQx7Jxbm%jYiQVp
zWBo5%Z9oWTXOe-B%!x$b)lEenj-IJMg0nU|T!9=F=AD_`wRfV{Pmt|`2aFHghGv5c
z`HQ>pip<0vOJ%YW<0H>k`e`a+r_3ksvk0)1-flUr%EKb^$M8C_ue3ii-n}efoCpC0
z*6ZrSbW<`K(%mOcA$7UFmcd9+h5!q6MoS;Yx$=-Bu_0VR$vUnDThKxDu3-iAY4QM%
zat%Zkb<H^_-VMjylftNg%vNta6+z_IqY$;ETow8n-9Wqa5`Qe31i7z+uEEGbg{IG2
zZFK2xrIpp{f)2WEpaeVZ4=FmBFn|$!m)DBdgD{DXoJ*LmC&uuM4fl;!RQ3K*D=F|a
zX-DEWh5u`>GPZ3P;u}xDf^r!qZ%1{X&T-5h|I*LOMmvP>6a1*33BtSPMH)wGfg?OL
z-Ay%2w4toY=%8h&vO}wMMhTbHRU;>pf2IkhvFt4rgplc3DOhq_if24lcXXyZ#JXK=
zyIv3J&_k^6{#)b%LW&A-$~LE=li!l5x@OIb9K9lDq8=UuCK*oc*rESSD;41m0uy3*
zrq6&W98u5nV5;*jI^LtxsI_oF>?dEA&0iG;eiSA5=^)bc-ohrue1og5jJ6qHAr3E%
zuP2~ec8X76peq=WznEI}1g7=rzM1Z6Qc@|-gh8*;>laH`J^m?#HFfJ@UBHj~J&&A(
z+?KGeMa2r~BW+!L<C?UsM6V4}sG@z>9Qsl<QDRa(+zasQ`3b>Fr;GeI{26>_p|W46
z+OhtmN`s&%lt7dzr3aBj{mZ<+YH{h}yiKrf4HHExn0w0@v`j1yq*s}DBWlbc%LnK%
zwfpYD&6nrq33%240kI-zQ%6~8Ch^C%iL+x!UxX|*7yF6ME`HRkUBfHo3?7lai&=O3
zV`>o7mX0Y@DvX>?`c6st2^*vRx>O6^!@-3v@LOB}0`mt`U|_Y@3s=T9&B^2ZiCeDw
z)cOKt{VV(@W&u<XXau??><^;Gf}FN01`LBDPvlv9k)#&6fs5X+w>aF^k?f7@e4e1}
z7!u<=kIf~<5H}kcXD={=3{_U5Z;}d#6nU@h40f~D44Tf{o*wN)<=+!;8trFHnAY$F
zXL)qfWHR_9KC5f6cKWVT=lq`7lxijXc3zw)+(23I842pch1*kw`XI{1QDtl%liNQ=
zmbm}*`?_{Mp8kZQxl6jDvABDQ^eBPBRYvuZMLKE&VZxlT+u&ClS7~_g=`YPR;F@+y
zb|$I8`m}US*}IP0*LZe%WY>8Y!BF#sLT=_eM1C{80((Z(??^@o-ALs3azBRuW#h_W
z90)Q*eoRI9q0i_B_+#eKlXY-9`fFE=FUmCVo>Rbiw4ly|X;a?%xT5%D(0$dm3&{4v
z*c=zC)}Dj+g*Cn;G6g@iMI2#s09{@GB7|`#hWry@@_sercMGJYj2cC)lkf2a#8r`W
z>^JEJDYsB5=6ZJF-eC&zavUbha@_D4cv|iliSHV4nGI&eE!e#u&U!Fuyw+oeQSXF7
z_QU=>$&HbHqThHMSrj#?g(++3m*^QvJ}t>U&(~v-2W1cJp$T*jDDz5>yks8wn+Guv
z{O3r+d(0BczK2tI5K+N~8bZ?>S`Yon9MinaaJ%(xZ3qw%c}v*eE9et9pdQi+k5Y^R
zxHyBeQzAXC&_8GdZA`mT$lACEW$h|FNxOp!A^YT}yE(o`h}sl<<->kgx-3Sc;SSO%
z-sQgvK5GLiAnn6r-XWsNY*eLPC*~h@mtv`7!-QyiTly2ckVu`Xa_)Z39{eJ7L>Bv&
zWJIA%wunDj>c0urkQEUC<RvA=K+@8fTDaA49_XS$e;UvE>?>REPu%{>0UQtZQWuvP
zOX;g~D~60+nRK*21indp{x3*NDE$ksXpM#qt%um)%v**_X?R~7|3T3KSD$^;9NVw}
zt9*!NsZ&)a%z!#E#+In--E$j<aBLy_Ju7g9Rxv1wk4D1|<5af>NUxp^0!wa*K-FkR
z0Fr`(Ofem|05CM+Sz8T&Ds$c+utar%(hhxKXD86Tf!>cG*2brn`0Vi~T%h2cNc%7B
zAl_-<fs1yz$v68mw;S9|40R@)<ocf?S|-VeCixl@Znsnet-eJFngf(#tOZyHOg$FT
zx*2BTFHMAu=gvk4n_Y;83CX!o7?;nvuMo|^i?1|yO}PpmKSaBAH#$NtG5@@VIJ%jE
z$vU?J2<Xx%X)EG(Q7FZu0nr*Ujs~zLWlRf}3MT>K9)h6hm&dfRKjf=vpBu%@HmMea
z^9Q*G3170Fc;ZltB@?vMWS|xHbx?;lZI&&0e3kLSL*P#AXxKw1AvihLHCaP>e-^mU
z7@HeFoEel%Qu|)$4vQHd&u5q%-P9S^BJoWj;XfO=w~WZkqn4hfu)XG@DB0`THa+F3
z-ykkT5?A*J!rBD!B6n_Vg5&f`!17q1&UWz(6t*TM^%GC5-G+tCfj;e$p=<zZtCvVo
z4(2h9*kiKd%q1>vp!Ou&{ZkEz4Nyf=q|*8t<6tL10p19Y@J(ytR48Cwxj=!Qp_bqz
z=K0g);M6CRM>=K^hG=F`isy5}-}N+w(XDAp^W>V;JB(z=9=l`CNSg~*$b-iu)5=g?
zY=wR4eT?j;UA^gg*nlB(Edv&M_m?nb&C|QM1$-}Vy^THYe!CRcKVJO%<1sU}`IZ5g
zu@*Uf_-^djA4Vr`^%PEsP^ua;56#s+vexf5mM5sRGBC}rzsEOu>0AWu1wyK1lO@?Y
zM{b}kOI<N&<%uXwnt8dYph`GN%h7y+6Jp0CFc3bcGOoz1HM$HzQ{xXhS!W2|&<T`g
z;D0e-!*>I);Ny<gDM95_8Dx9Qke@E(W9j+MkE{Me>{7^0Ibu<SxBo6HRs#V%&Dm>%
zkDrqBH6wL&Q<sUZh@cvI_uLm{N?@YK=H>`{q6gzlKt$#vzplX?Yw6;XHg<t?ncAFr
zEhe%I01ZnP<CJBJ%231SsAebuKPS7gv|4(97OU*+Nwr!)%|@FSB*2Z+YFcTL;+>(G
zrZiiuU#}IEgRl^V9@dS8hkYdg(XtN(ahwsKuQKx<czo06n58g_P$bvxlXzOu3KB~l
zdJJIJuOk9kJp8HfkQJr95`QE{bOGN1KYvP++5?s+n2OnXHiU)<MP9%j8_)|CzKXQq
zP5D@z{W}wK6mGBcjt=MFGCaNm3Z)i?IJvn6#<?7P4dU5Z?!85`2l6x3BgHVVACVYY
z!Ic&$`80WQesS@&9n^I0Qdt=)(SNm?IYO1t;Jp!%SVdK4j1{`HLDN?8^!RXSi&G@^
zZTt)6YNEj+l&3m%XbV(L<v^7AY@*|l(2hA5BgE(M00xDCZ0jt`j*%FIoxaK_VEm-i
zdJxemJW<DIpP8VYm$RmFJ>IWS#N;x?JMApqgbyZzt{1V9M36{M5nm>vV;6>qZ6sj;
z^p`^;2$a69;y#ixx~naM6JD}S;T>WYc$DSbh$`pAAPWi~HV^-(5HAbA`MyAk3T+DQ
z%PoD6@~fjF2G=mn7q?WoE(|iKsHU4pM*1I-b4@*VQj|K`9TQ+zX12Qoed(Jq-;2(r
zHVU5j&g%{1;lmf)m;sX(p=<Sv^*xw;wpCZe<5H2-39R;}LA#^Od57-m*8KDT9_`f?
z0rHMK@_?VR!sN>7`)VXRK-BJN0l2n%KmjbB;g3~!Mv&+8)_yxXeCBc&MiJv?U}uH&
zDmWLBoT9|N_7Oj7!){I8_?AiHPu#m-NMRJJb^c<>SO+pZRpCPpG^?Z_v~%XJT19(Q
zxJrFe|IOCB<~E`Q@+mp1dg`nMr0M+>fiSalDyj<^$d`E%m!we+>CfZ^`sl~^$ahSL
zAfaP&yc)5ZOZF2d3Mg!X4%1SOtYVetF|C)xnCafqV0Q{rtS(n8Ucv4`*BRtxRTmBR
z)*{dRd}ak8W>65JB&QJ6ld*%)lGet`o(~|WH_zFDqizPohrn63{Tt~@VkWpU{Nk)s
zKK(N(h^b^prJw<F@VEJ<9_1l8Zr!=A+HS95fAnQ8g11~s&7U+j!>=zn)&~<SF@S+7
zr%~czIsh;<r###JHM;fBG0%9kvzzRupnvI~x&)ryL{13JhIU7dAp$dbMgeJ$V~2|1
zjyfJF6Gw}IO9kAgBOEM=bT=ZiNIPYmNH>fda|=h6>@=wvM3vd5V{}(z+2m|DdOZh=
z9;f8egt2{TYUw>49@7A?747WXy6J$iDfT^(hMjO0b<+1)H#06s`6+5Ng~RyIe8}-m
z?R07?*8sNf_G`XR&9)8i5<F!sDA1;~XE62>N&~GmQVXp`3)JO}1g79=M%d|{wuoRD
z6`tEHMKbPOJ3f!D33=S-^55v+VWKgig4VkXp2Od-M@+3!DC*rN7;JL2U#iuz|Fth?
z%SdsazY4v-y;}-pddV==vl7G(w!%wL@gOOeo)0FC)7$^9t}rZ7XmQEjmwo!HoK};X
z9iO9;I5>H98msSK!XghM5=`pPt9(1%5fyI(qazV-0cLPD-|z@bBoMl%{D-L6ii{tw
z2#n0H2Qg@okmxGsvG4+lpQ)8>{gucUuplizrkH<wFN(im@pyPjQ8fr5BzF7h*`4XB
zQ*i$oi~Lyk4Lt;^clmd^ON<&cRB@G65Da%Mar82Y;c>2x?py%ch#-7QLF@<(yZA9|
zQ9PB==OG710v#1lGC3f^W8-mj<EAS0C5g1AUw0Zq^UfVes-_+O>qKB)N>dH+mM#or
zW9p)?!Bx9SLR?E<tTPzCyR|ofU})?}&VJs35?Ih9ZD_xMR#3e#9qXtmHTVZSmDN81
zjEanqgZv?!$?8C<I`hUT&mij*Q7VcSEftp6DmUU<i#D5dz?dI}@gUw<Xju|&a&(5R
zmW?SJtOWv)y_r!sEJAG6QOngT`i-zZ9-(Bx{nUNT9tGceCS|Ayb;xWqn##m_f{`a}
zUpl<K;O4y5E)u^`$aQBSP3=Vr=r;k@Ic+`bb5WAx5W7lg?4ya;pG3vr@1;vPwVv$s
zlU}jtZUJPuTMspS?*y=7*a!dUVNs}t*?pw^=T%x@PS4$vZg*i%|6>+otA4cC{V&&Q
z{YiaFeucPAV@+!ubI%N2aG{!TR&8l06Swt*o+J!XWtte!*8QS%=WY(297vOIOZE9&
zU%Mv@l5TdIGaPDPfpR~48*QcK6IVEY#upQ`sy>e!nIAazEyq^a?bKS3Yjf+l^dx@p
zbAe0owy!kFR*bAkKuYGl<`km1-_9i~ZDZ4KMpuqD9h`lE^H8E-;yV4fIf6J=%Cf^Y
zv1mZ)%@+zq18cbs>eqCHyO<hH^^>-KD4>vtI51;Ub*BDCDhzy#^enZKA49KJF+AY;
zy_aYG{X1a;Rcy1dw`caTiXWOOlFkf8Ikn6w_OS7cig=RR+$BhR6bIL>MVkPYxoAeI
z-cz1&7%08{(uyiwkhU2?eqKfVZj0h?i1>WG3g0R^o32Wy6*n8D0`Mw7es)?XFVY6J
z={Pv9c|Gvi>2PWMQ8^b5$Woj7pQHyB6VU7cmMBuA0w1093glrhbEUXI1qy%SY)vOO
z5T`<$WM4HJo99l(3Eocbn<XzARSw16`svFZTvWM>W%6FLJ0FmNx9u#df*=%S{P9|H
z<HL%dL(I6}x>D^(V>=rsJ<Okx^YH474lCRYr}KimWh9OGAJQn;Vjv9UoAnW7F--QM
zl@#Jg8+n`E?{~DTvAVq{?Jz;*0vEHdOTA}yvQqN!1jxd)%d!jgnHn+$`+B2|J4Ts!
zDsJP#@RDL^E6Wk9^U)?A_cX3t9B#BU`yWT}7Gzze><X0sW^1#igNe+=9E)&YbJi{5
zG(tSc4Oa*!&p~Ma=0<Lz3%rgnoa>>o<(Tb;)_8pxDH{$NjY<)%b-TIPVySEx&q^y{
zFI$XNEYfK`7AN4?F(vR$h=8~|MF!L)(l`)4^nF{~=qc@BCW<jn>Dp{~`Be@RzQq5p
zE>ogy;Z3!O5O|o$&CHKqC&;7cY5r5SkfHJ@1@R&U-!$K{PJ7VS=zZ(yWQEXkqQx{X
zI=K=zJ(y82`T}k?63U1DP-CqZE9d#G(}gkEVzMg?Cw?^x;K!wMu}4g*f^3pouCz~y
zi>z(ZQqS6*AHd5A>e~ZD20VF0oRj=5Hw7V18dz%u*<;kregu7P@nUYi#mkM>RnElY
z%Fg!T87KtEv9;@N8NgZ)8reuTMIq_91$v{!EAyJ7YzEZ0lQ)My$FQ;ZWR8Zkt*500
zfA}D%lMkF$f9Ad^|KMmLn2zZ4HFVFjGSvPY<0N;^z+yr182Zztg_e~{d77&P{)TrZ
zftpY$q98TbiB*Ii$maw_IxZV^=aWqEncsX&<-n4MYrY4pOe}i`E0cp0GbvMqtk@<$
z7-hMna+@bCY*U;b&5yCRZ#LQ9ZH!xMhySU`YEakQ8X^*fYu%iQMq{2lj%PGgKjV^F
zI?FxpE>!tX|NZf)HX{`KnCS68>*p@eSAl<0NhQj}^Zv;KlGZ?(+&3EY&+Y2&l)~i!
z_2AEQ(=)x>RWRhJsKO=x5?@+?l&mZq9<(T1u=c=Vi_G=icek7RH)7wfL2U5{Ov2eQ
zBG>xgV%O)@TI%aV6UDNJJ!G&Ul_lZfZr2yLt2#|oe6B8>#QKBh-r2_qdRR{(yT+{(
z=>7c-wO159E#w*8EM{@oB&c<IMTbvbI~V)*%Q6H_RgR-mPhnXn8Ko|uNxU>kT}_l8
z$a7aU?VkW>6oJZo>p(1D2iQv&w2E^ntB26-zJ|hyk*#RWa{@y7;9Ur@M=W*^_J?~l
zXJ=M&5@ukb9e8t`AF-}wz(_rA&2o;XpguqXH?i`E{5+nW#&emI=FW&ZC@iA%Tpdxb
z!2+Lww|NI@6Z;JbBDV2*!6Bfyn|HPTU{I3j{*F}q1qm1;Zz+A6<5W`o<M2_WOIRmm
zvN)1RML738Qz7AM*dDr{Sd+a|&D5rSHSFyWMk*&JR8zbFlDdZHxG^q#3jLkgh|&5;
z+0v-1n%6Y_9XDz&7@hF$56d0<0GwEpwH<U^7x;uZ1UCsBIDl!}>KzEDjZ~SCG#a5l
zMHglYl=AHLX}p@u(V+l8&LwB}D)N?FY1f)AyGmHW-mz4?&6(tHg8mi+7lYzqT;`)=
zl<x-<y?qw1X9^w3sPf*_#>=yEITizT&dl3LW#r}EalzatB)rbXtyeJ$%(}8>rnCqA
zEdxTu66x6)KMwGT1IHjh@9l|0lHlNA$#=MUcBu6J#62!R+@()cq$-c2G`Tf&!@)55
z>Hp|<%eIOs?2%5iH^+`ExycvdLcP3y&cTgV^d!{7{JG(K^DI3JaNnYlkU{7>vT#+x
zb_<2ZZeq^x94RlJ<linrhDct%NzXzM<kDR9lIeE^3tH~IGmYxfcqM9@u*j-a5Lc>n
zNQ;ZfZ^vu_HGIW~(;$ONkARJ^uU<fWN}Uba{f8c~#tQ7GI@OhfA>#A?Gn?8s;8#ty
zgk`K_C%H+=1l8rk3@8KcqyDjmpgMW~Ee1`mclymeal3u-xVarL*j|G`;T^g>d$mEx
z$5h5!YbUI9!N#iDZT<O_8n~FSJX?5U{`%oQMDpMn;I$%rSXQ-|E|^$UEv)7DMmPX+
z);>J<Qg>uIIQL>s)8e=bJ&zJR=sZRnPQ{&1{M$H6*;|xKe(*we2Z5!g!p)b$*`iay
zlUrO)L3AUPP@u)(R%!%}q##fdP!e-StBp_DL?edOn2h<gB(pY`tWwc&NXVa#kTeuX
zlaZ+9NnM;+x2s{Xqb8<jPgb!eIj+79EB^SNZk4nZeXJ&qC#DD2suSWnE(yEWL42a}
zPqzGZ1<pjezpo2#xlA}?kP~ZEcm%G!xe&mi;yJJ*^{L#@tRr<l{0~J<{_B~aNz7mx
zcv6`7og~|rsm`><cAPf*XSM$~Lb^4Zd*Nn0E!n6K-0$HGVzJ!p;D5z+21!4KY<EUV
zMj|)P+w|A0FnNq?-X*Tt2g8W~FlNBTjWWFYa2Hv@FpoMk+(L$=3Z0WyX(ZZ#G}=rC
zCXZ$7b+alOe35G-D=m*bVZWLH8uH=QCioPiTY<Q~KJT;>>#rnV0It85ermkCi*6JD
zE_H2EOu86|#wz1ramfPcIngOe!Zn~mE1D+d9OEEZGW<@sB{b$#?Bp|?$Ud`=H)wgc
znqWMQSr^nPqlp(nEL{p^nqW@Wf$TNvS{f+JW()*)3ZTdmhetG$A}JrRuHVv3?!6*>
zpPD+l4{b#25(n}7iG1V?KaD~hum=Rd2)0c>(o^rbJN#|sgHbW1@I#-E2aO`EaJC+4
zu;VHR!99{9FB}(=#y%Z@6cM?+Pu60a`y1#GOH&?nXTrj^)hZ(AEL_hACt*JjN$DFP
zIMOJlF@tu}^Qjw_H4UE&7IBJN$*XtB`7j^mYbBy8^-S^j(Dd%@31nSX^y;qHq}gNh
z|Gih!1q-ZcY(AKE+Pq5vykw2pm~m9An$d^Et)Lv{e`4@<o>ia@CKdif7rF(OYiTiT
zlB{`VzE$KYN6~kCirEzrOBYp9<AwQ8@{c1?<U&TzCV9KfsFldVQDTABCFY0Fm^~f4
zs&X;_PiM|k3f!sC0tf5ns)S6%AW(QN^A!-fyWz2jdgOBP0&)XQV2`<9zZL36-v4Ld
zs&2s%?BFH`f`IpxVbr@x%fta^ef8rAVI+^+RpPQk#R&AW0eHK*tw=Z>GgL)62VZ4L
z>7Js-Duk?}Z=QGb!EI83>|4Xfjr_v4B}uHEd~Sij8vFoqIxi=dm;bN(5HgyySUfGn
z<XSR)e{j-b_A)lFLCdas%+g%ah<by|tIfC)-_J=RDXBfT6PAwBtC33~aZ#2kmKsNo
zkU4uWkzwo@^S=NzzrRo9L!>3XKe$jJ<H5U4x(135r;v9O!!9ED2$?<6a2NoJiX51{
z=P|T=!wo+$lsd#VWgPvap*DaCX#w+&%d?bDu6*`OQ(?u9;IM_UV{&Q|;`XHSWBxld
z!vb`axqAxw5SIypHl3u7iZ-0p#Xx7HH=w?MH{Wn`mc`(_FqrF+TC=bhWu)g>WfZ2@
z6q=N}@LxbnmalxXb>Vq4Pf^oU!fRtK;;%PsClj5wlaG)#lE6Djm8=l0|5!TFM70x^
z9^mWl;*)?pJ#x01W$3~BiV!njrl3rfKE>4JIe(%6H4S)j!AiL7anqX;0+WjE5!bp!
z(V2hq+O~2nqhO5_>1}S?G!d$jNB=XZ@^;CF^Fo{p)}Usb>*xP6?+xN<u*E(gtGBjy
zdn4kwdD*#4eeB`A)`fjlS52~Ap;_!Ma{|rn?!FTUselml9t?9b%GvMLYIK<CvZEs@
zSTTg`AF31ehCBv9;m%p=b4?5jv6W#+a&&m(`zz9KtQ-dIGC!f$aKj9?VwR>I;B45n
zc-IIG<Lq`QxNp&U1T1Pt#)kP6Juh+QpS+{&A8Uq0I;Xk#Q^X;5TZ#kZj;iE+_?b)!
z9sN_<xyAh6RFZol-3hsNQKMQV9~yp9zs1ZoX!;!-JXlh`0PXy?b<DPTt&<t|a*&wd
zgS=V)7I116(4A$zMfm)DHL!h9Zvn1RfAKc<Ak(ZE<4%$J&WXCu{I!rF`}zXHu4Qt;
z`p*dpZ+&@#<3HD8yZz|gry`u6KOP|I!4%@~?D_E}F%N0vW0OgKikir6KN9R`#ws_2
zW8<jsYSQpK%3gpITeSMVaC|3Qn65b?<P;jg7ad@Qvx+K@WzS%LNh`sGC;r2ndg9HL
zxDHg^vLRcxQ;e14&28Gjb`glQW;o4mCF<=FfRcqUqQi{55K$5ZToTq#5-T*DiU;y<
zv>;yuMbVMxmB4z9B$QeV?!^BkJZ#D&WDGG~f$xE;sFsslr#5>D7xybV#@XM3kUx-s
z%v{R!c+jQ&mIAKv(pHgB{qx56TzT3MH5rmhtQ9T94nb<V2Z)HF-w!mH|E07LUmxy&
zb`e)7)m98c#-=GEA7x{ldPp`{S^@MZylg$a>5Q(mnWLFb;L)hZ*JAkR3-a<zz()YL
za`5BVj+hMXj+y-rqszVqBTK-qqsPu;rkJy4U%Dp7K27N3jR7#KEKxUcKV{}{$ZDFh
zg-@fYA>uYo^%?(I|KI+lis{v8Z0N&J9p(m;^hvDQF>2f{yLrbO4v>%gLK6W2htL11
z9;i@R!(C`e=M#F^HaF9Z<Mapnw0rjyoAg8pcPko|(}1Pl{nGgruPd1YuQO#4WX?pF
zZnXLdX4U?x(FQdH&$aW6aVXfWp(~xkzSvLmIV5E+O<uU%qWt+(ZU<q@Jfq2G<-b*P
zexto6>5MzQ%LFxltdWhIn^<^;)Woe#V-+-0OcYF$r-ri2AK=dw@|l{+@g_{FXm3L6
zP|VpS74i{Fn~=|OQ!gEgCTJAoBk32E6qn&rw44sKMjnvn*z#2Y!`S~eSL5zpC4z+P
zfDqNL#Gn)=k|==`vgL<X;JT$;kh6i(a>3t^e^T!CP|`FY^8<f3@;~7-C>>-tSET2V
zzRNIFwKk(MKlpz=Iidc!dv91uoZl42))57T-~B}i)rUYd4@F35w~1qi7zbfn(n0}%
z$ER*p>#)2;1UO##2`$ugMT<^jZwIpMp(+u#XQDO;r}95I!dP$fqA6ed6^-Xl<?tXH
zq|x+^TQbS`Kh0QE?&kw*8;v2SiKs7cKaZ*n(AZLNJ${mc2h^Gzg;KRkrL-jL-)}}g
z4LZ|_WSCpDxKl@ac~JJ+if%>+?6oXyzGLob2-Tv{Rr>x8sU4Af2Z6T0?3UBpJD5z*
zKjbCHl;ci#jwIxW!B@x3Bg)z}Z3AGXR`YSN$H~%XN;8T3y8Cp}M+1?aBv8h>gW$g(
zCf<l4IM!KG)+`<prag*jt~r4U^(X%>W;Ua^)I{E!%l)U?)5x619c7d9Pg}(b>e4Q)
zZV{Fupe));5p8WF?7Ld*H3l_Y+cNVAa+V}G=Fwj`Supk%l*h46g!&JZG=NRc1jI(h
z%r(oiZ~?vu20YrD2z3MhfExvIk!~bmJ`5f{^ULEHgtK!r(Y)N1tgEmgJFC+VMvB%O
zY>T<B<f%9IoM%u+0j_hOUQbZ13;yC1f4MqW)afhq>Y)s%i<|ohUaqVCRo6w9#PT(A
zxkrG|yy`AJ!e3ROmEMwiK<Lmm$N%P8QsLfqz&lEFW4b@q0QN4O%^Fy(qMy39&K})t
zp?hojgB$2c;reEVM&*i4=O#KBO^WNbrzZnGmFr6h0?ktZT&6ZgOn8PSJkt_iGi9kR
zN=326>)e>ByhGb0s=Zq;t`Qzv0A|x_{9%#Is3j-pZ5BJ<kxUr;JnXjXbgYBaxscF_
z5)Ig>6?rEy`ng&U=OFW1kXO4B*w!V{1LubsY|P_5fEfM4)%b5;Y1%cw{BOsebvosA
zT&FIzeyh?-$0Ws4o*LSNbNlbR&&keSe5BV!ImqDpkxAMu<+lf|;QMuDMW@Ecf8gb^
zR9HXYM1z{5{K)oAs262dsV38%(_w31Sr3F^n#5z~U){3+zT+1x{jHf3a-jM>j1L|Y
zZ5NeTf)S54thrz3ZLM_Oc`Ud?;k&g~G?5NmwZ<XDx>GZ)ldi#YEMou3Ld<4CpHt0P
z`~Y2WdDU;D=ha^IK`1&&I0LzpGjfdafn8YL><l(XnZYZ%R)`t6P!@3_4%&DFJ-?h?
z+TXbQ9N-A9^gm~X+8AQT!jS6KEiRx*#nj*2W%NMkYYhRwPm=GN;PjjDQYo!TTX%~E
zd4Qv^oU~Z8p*(bn>g~bA-9dM+b?gEm4ge-pFr<dT-Rm;jV)A>6z@tsIgDgBMpk)3k
znO6b_TWbpmdGnJA*b3jlmiV==DQ$}+@f&0%076=4EFydmFuEK_HWjyvOuL1g_DF<p
zLn-k?2gC!AJe$vK`qp!m6`C)BETD=!>+CLZxzFeLI(qRMFg!egA0Gl-n=u~3(i=7s
z0nsuaH!&dJ&A_p{k!bAi1`-^xqqmugcaEMLBx@RuUe=TSar_l;4NCc1%*9!1+^`Kq
zJLUAN3t<}89If-y+&o2~0P-$5H%yuOH%nQ@PKRcGHM*atm~tEH|HXQ5K+C1AhK6<g
zOKaxrca}cyUT%_ZSumdii06&%5PbJqh>)+rk`Q25ci<C$Sv}7K)<>#O&*OZgnU2|^
z&dsi)BRW?2&UeI$Z386j6dt1|kBI-YMf|}Y;kJEyy6X0~etcwo>IU{32wQGvl15`D
zwklN+h$%pwVPKi<ZRlimGrTK>kK<xt3h~$u9BD|31xFjz**NAuuG{$skOj<-i92`W
zmj!N)qhgI5X9Zx=3F?cd?w~T6So)5-Nur0e@Biy#FLF|;i({Sm#@ZowWaWiW(4-GR
zTfSMn5wp*p%{{kM0ik*x?hXzt`pezV*QJX)eI3|0y#3m8oFXB@$IF{C1bK0Uye+e1
zlm?kJIb3;8ZlayfL;@98=T0OV{0^$wOiOoYxp&iH-D8AInAl|V?&wb!(l^s}0D|8=
zKog-XgM!)-o`O3T9;=7Jd};ie(S>&`WV9<FA#k245k<g>ks+r~iMW7ity)w9&Ti#S
z@o9CvmjIqrZU#*vp4}poCdRyBIH86A(VipG2meN(_IbeUmkEYi)h!oi#F0cC04?+R
zL3J(ps1`$g7Zd6+^1R8mzNFPlawsdwy+yUR`ogd7tI2nzR9Sb)O}?6YlM~0;R}K>I
zEqC$U+p)g}Dp07tQQ`wAO3E#^+PzJ48gC*zY!M7+pi>ffOr2(%e;gR?0UGBJY(f-m
zc|~`ws91)#P0=<9AK?%(v))g?w!B{{r76Uh5!tXwaLDZtjh+hq50^AE&4JY=p}k-7
zB$s(uEH9sR-x<T{TanMWA!SB-tsGjCLv`q7?w`x1v~e!b13M#4M%u^UG_;VJ!$6nO
z#HarcS3TQ_W5hf;$Gv**mRrZ8q)as}pOx#*R~|$2G!H3Zq;CB#_6Dp|J%!k1Z*M-+
z3Gs}^^V(?PyGY9cIOB2))i2v0x+-7l?9_BeMs)_B7!UNd&B|pm(Zp08=l2D}+d_zq
z2Lg67Q`fD>A=t%DCJ-+-HZiO2D~aBwfpDiqD+!jm|LrYpYohjG-*pXzDiEtM$G`0N
z2@_`V`AjDTnM{WZBDAYzbIyI6In<S|O(;wHR9zS++=;nF|69);O`QAs%EUv5RWghZ
z(N-()TYNs3aG5{_h`0J`3~=e;DcA^6BvTP1d)s*h+iGrbB$MqsI^XhtsW3u};6bUG
zUU*m8p%w`@!2I_9Y3~S{rFFZwLYyrNJ{1*EmRj*dVVhwBjQdbjrG#EfWJhG`wRN;&
zP%8@5*!$?cU+`N2rh5IFVCeMPR0sF#F@RE2Z~i0Eugb*1d^(3LeKR)oJ+vCBQHwb3
z?1ve_TLCs68w~Wg7bkDzB#(k1_~2@Uj{UqwKw}zZz&9zU`W#Eurwzc0#=)M&1!~cs
za;E6018SkQaQ@X$^Mqf5a!2AyqFyMm?16B_Oh>>57KxQU&xHxU+5*6JvoDW#dEIQ4
z5)CHAJDn0y6u|(?{hf<plk$*RlLHgC{QQyst0l(L4<HpZEB{0GjsT`m*<&UoyfN{~
z%?-8`2^}YRMoh6AS5d|UH+ah~z(#4bd&sYAL3Lz#4<TMBtOj%PKRmUA*0A7i5Rto@
zEj{R)k^gBJMn)}o=<;m>Cg;+170<2|`BGulNRZ&1-1qw%w^eR46ZUTSB`76sJIh1A
zS74*AnR(%3C*K1Dl7ov*nnR0W^gja|LV@rqUO{)O#y{7K;&!e;Z$uAdz+08u269nb
zaRFJudmOxvgc8TW@PmTpPCi54cQx$Imql@0rYPFqCVGBm$!zLoT*08qkr97aCAB04
z@z>iHQ7@XNodX+D`kfQ^1W_mwJEkH}F|QdWWwP*?cLx6md>-C#fjI{{TUg?OOcV*>
zw-G)Y(2}3Gz}tU4^v+44{>N#}(=FJ-Oul1w)InXC%NA*ebMX|zJZRYRrzsPe300hJ
z&}>3!pAEwl?N`L<3*+&X^74vnvQ3)L<-Pn_FxP<oN6s24xFki=KWVDLjqFI)qhWyV
zCBATxz!LK~^zkf`85P4L9;oOe{?w`H11)aCE#cegn@qJOO=TnLhtI#xWkI7O*Rv7)
ztNuYHYlc6qyUB5W{hkO2j4BVYa($PUW$wo=5#vXSO=%ur0q#~QNY^ZE)2rCTru|=g
z^#Pd08-BpHW3;qB@`x`;GhjfAY~PGa_83<-<sNGG7naEyJ7qI{U7PxEJD&CaQEA9l
zQ@;->bV}k_DX|fH84AJa-vuv@cf(>BsS)izUR(`qeS*-0foL$8P&LsT+|8*|kiSWt
zZeyb(27+7g=MzpK=7dPP(XL@JvumYfC#ZKJ3Gr;Q4Cp&d@nv(|2f(f_%G?g8d=25#
ze{ViYdk;yj=7%4zo$dMjZA@U3?<|)(ZO9!=d342VRLVV0BD;cgmN_5wy6o|QBHjaz
z#$3oMr?%`8J3B9?i>6*_AcLna{Iwp8Gm9aO>gOH0urB&;t%*RDWGjBPZMuS&ZHkok
z+%x-!9<KxIdkT+fuSFpVMS#(9X=((B+mROe2oA!2tLelU5>+npI_^2HsaS(z6W(k9
z*8(;<{lr9FkkK~DuwQC4p*VoZ*U>)aLgXKm_Xx4o#gzANcjhbX)HPJ6Wmn;Ox+F(+
z`sj)RjPCM16fh>vm@yXww^~om37%lQ-M%o>I!{;Nb5VC=gYJWiI0<v6YqdsD?3_*v
zhFBN$&-|vh@4t~F<0=~K?9yMJmKdC+1%@ag-m6naAkT*e^oP`|MT(s+yuc&Ce2~2D
zMm1R`(0k*a;j%x#*Bk7-xNjR<7b`KT<Oaa?K;%pU@6O^yrdf3Ns>9Kzri8suUPCCn
zBoHnG;VbO`oiO*2$_k${d1TIT(1t~S`9C>BOkAD3>ADEQ?I?Pl=+tHPc>L&+Q=sku
z;bH+tpt<Qz@eJYZ@?|q}SB@Co0ef0SK!25sU*1@f8ZYk_7n(04xG;~EXf%8e*}4cx
zY^t=&$TG4LYE<)bUnljf65X;`$K>K^F_`LKy!4Ucp`Dj!Ve%|7cQ(c&Md}n`*nS)3
zK*y|_I{)4iFgo~BB~a4Gh04~xu4@`-3iz+t(au5iNXmTkRI;2|5xKRd9*cR5AA{nA
z5T$<cw=6|;Co-N)42O$0r({Ck$NyW5Q^V>t#&tw~PH6-;Ho730yUL9DBK>9zFNl;2
zm3BX7AkhJ2(Ig)3;={0cNv?O{Z-H6UF`T+1wana8N~CSV#hnURyBO7G?e%v(mVV%0
z1@17Ln6=2-_6^*3&=0!#mKuXs4)p0hucOB16dZMPXU!@-*R3`sdchwIUdcP+#!9aO
z6-mY?aI#x#r7@U$4>Dt-{blH`)}AGTgpQhECFE6+69PR7EfZ?Y0#h5td)!YroR#C>
zHAGcWU{M(J3}UR6`?LtjS8ZUgG=8kr@Oa0((=>X-35^gF8B9us_WI*Dd3D4abCg60
zKSQp94x#%#4GV?Z@#yuCz<j*cVOz~>Fb59p_~QSnG+mZFr;<CE!zmkvTT%l~T)N_9
zoChcTg(9V2aEe~Zb4xeioC*z95t!#c@%Y@m$YHO`w{aWXiKuLq*%<Zx-rbHR5lwIO
zz!K1uVJL)JiiF8rDPoySG2W`NYAkbWEO%jdaR1LP<&fgP@=PDq<7N4yLLr$i76H=R
zi)DfSp=-qIu}|`pP<W<Yq#WP>rj-dhTS?#79bHs?o-R=uX|9V4_BqQp7{w5x3AtzB
zD)JBvX)w;3y)Bat#1nY%z2p>!<bgy{A1-}TjVYiJsnLQaXU#YF9l4dop|NwLtoPkW
z_{yexFyxcpO!FE4d(nw|O)36-y%T0C$!ZIOYTxB4AwxOpD7-k8;>n+Mx#&@sD6K>d
zra|}L;c-X!m&Avw^wrgqM>X?EWU$lrxgf&cvwG$6=|BANB`rUf%EzoB7up>Pg++U)
z;-47vyKGKKj0<7=>pfMaF|_iyLQ|_<XzJTPto^egH(@(LTFjQ~sur~&LfbAr(H037
z2F$r`)bO^A=8_R(Uxh|EU}|%?@h54;5E(tRDdFXE{--Gq#powV;ITFRWM1i;c(r0t
zE*QtFYsy+mkqR633GdT?XrVA9+GN_$)zSTrGoXF&0Y|W;HU=^Qm!ZPw%}23I)tDH3
z!4>BlwSTNMQCEz}7G6J>obm;G{Idf<dG8$P&(SdJNiS1?<~Y7uQR9a)Y?jh6)CJkv
zbY_V3U1C{@xN2C8Lq(5F*57CDFGl83nG1PWgAq5z0mTP8_^d=mry1y4z~r1f)ZR>p
z9!TuO#E-@Iu9ye>lfS^(mdFf2U9FsM(dpZ(#Ug)y%F(RLslGhUbl4^~Ov+ne((7vs
zgb8<Fe8**di1vc((bT0Qc}^+FgHtUILX_L6AK2!N5MJUm6P6%n&<mM(c_GNQxy$EC
z=12i>jA%+OelkNg*9DL>=~EA5wk?#PYjFB-tZ^#`F1bb%XzwIe`t4Yz+Ls#j-_<EX
zPj$%38y$dW?k`MwPF&mA)0pK9ztDcChm~#r7l49+?>g@@|E;vOQ?Mwas_Tb}<t_QT
zpPZ^Wpn0c&wu0|foR6k~C%3HHyoGz6RD_&wb`m2@(z){EEh55k_8~|q6}MplAzQW1
zp5rGb*9NrYZiI7?W1i<~?A#_*YUp!diY6{!iX$X@Z1O`JTp2t#R<sVy>)4*aeB)0J
zV<v=TnL@$I;;7<*jdVrpAw=mo59k_bK<-M|A7~gKyDoR>REh?%aYVK&<UjMg(U8+)
zkPNQ=L$Qx<*oBJ;T3yk106+)2z2%h|8od*yTK|CGA-pImd*ZXc92rTl*Rd?6$!b1K
z*Wf0llSq2%9x?jsJN9#n(Dg32%Mn-STKcyB5q)ovV&lj^>48%CJN6rK<^B&N$lYvq
zL>pR{<q7NR5;Dc~KE_G=vDQ$Ry$?^e7&ZJ%@ikB+OWZ3nYD|iZ$UODr%%x-~47ef*
zZdWHkzZ$`uuze-gMV1~98sgqGM7aix6>#5wvT^`c;eF4rLF+MC%X+srn|2MF@7`^$
z(BeS^RJ6#1`m1ovFs45T$GdGUtTQIlVbhw>uKg*L!NhkiXaK0E#A_i`7+z&L#%5t!
zz@}p{zk#)ac3?T^j3S3Q&a@pNvRzBN4l@D}kjfXqRG(7H&d(F)<)b&S#hOW<3gJQ0
zFn%YlxN33s-1Q@c(+zHjegE1IUsa?~&7*CsLIOh{SP@@s!6ry0XgHk<l?4R?JMQ`x
zT%|yyEPmhH*gZp1vZ4li?zz?C>jh%^acS(wVDwvKV5sH@8BHg9+P7mNS-`0Ng#4%N
z=m)0($$+?Sc^O3z3v;lag<2yad0PRXJi*;@#fDA8X?3*GE!%Ygp!?E!LHH(ywf(|*
z410D96F$NRj)z&@EA`e`sRdGGPf-t`SBEQ~TI9^}Kq@f>tUJKfh^NW_2^~l`<)Py=
zY8!!|U!2IhEL3^vkF@xf4Wj&;<34%Pz=Km_tC@bN`wy0>-KQ2JO*LhmpsaLIg2L88
zoD)@(0YO0(>?srD$Y@9NHd;IRXY`lyXpR6xJX}E&5k=a5B}GJ+048pQbzGg;u^TpH
zKwFNC?fbNw5jcVGMQKZFVKDy*AA<<-Y#8OeL3g_{(=JSU+eCZr8^qY7tZn*D!jHd}
z=&MF{;@G%_!e`WH`oDTe0&|7_Inhavi&W6aqt7{wwB7<AlKK*|wOfZ3^#3yakwoFv
zzZd(2g&esv%}CQUwnLEZ0^IS9@996w?k{w#9qqpI5*>-N?;iXawR;vUFxel}3EeK%
zqY;Oz@~smUn6QZxr06yhR6lb~piVn-vjd?%tM4t&xfiUQk3WZH?edwum9eRtC9qSy
zpRVaxhMbJ6s)LB!N1lgx&)>4KCRY}q9o)N<kqZ7KbcPjUeqQ|kWQen62~z($A%^u7
z+o(%f*Ya6Bgn2nMf-~O-L8hW=OUuLeEiDDsVE!3Pi7XqOYA&je!P}qzJPxaLp&ct^
zl)j)1Qk^j(K(f9L+{na)KIky|R5v}s%3Ln_Og)pWSh<4y_)U?sKomu$xi@_C-2`!@
zzPB-u0x@6?h7}S}mJc#sn?qr1&C>m{cPFUgpjLN(DUcJ{3sYmazZBAj3^!3Sg%)te
ziEs-ekvp77)vfeVo}r%u>sd|@CPc-^f_$Bngf}@a0{t*}c<n>ICmAva3{kIWhGim#
z{;1IGHn<mRd|n8_chU}oNTg0s2prHL>Il+L0o>szV8O7HD8amTb$NXxUO}RxBHTpk
zH+Z@G<B7ex@t#T|7Ix$if-a3}%VsZ>aZSO@sE$|Q4puP=4?ZjJ_c7UcdEa_Pve^S3
zhJ;>3E1Z|{ZL#0X19`<g-qL(O`nlpot=X-1O2;A|b!=*yiIS#qP+yW0)O4WYwj|+t
z8&?C2q3_9hTF*hXZ0T#bSiE550{5-btQjq7m9zaycI#7a0qc118wQ8@8do~JCq`Tf
zV6qF_60=f~oww+5;W{_i*azt4Z^mQ}rmuX90#B_@%sbZ;#(t^>9c{gr<cs&)g6rb;
zCyLfRD0xeuV~W8=0<+N3iB2cqWZQ;04SpUk!yf~IZ8Ra-pV7incd&Kv6_7~cP6|i@
zdfG<K&+d&nbn<0)&sX8c1}g6yU%<hovJ7iG(c!w(^*@B|b;V7)ss;nD!?;nUJ1ed9
zJiok_T627tq&LHI$B4SWW))<EiP(=E;-29y=K|(x3q>p{LLxLM(AJxqiM7wpwED&I
zN=RCur?Z|G6r$bIk|OJq>*VoVU|T~0stP-hkQ#tZNxpg!%i6#Q20_6VZ!Lt<HWDn$
zdd`pl00000000000$38H#Y~Mx#m;CN-5(eM`fI?6MbX!|000000000000000001ug
B*dG7@

literal 0
HcmV?d00001

diff --git a/src/model/game/GameManager.ts b/src/model/game/GameManager.ts
index b7a02a1e1..cad2de918 100644
--- a/src/model/game/GameManager.ts
+++ b/src/model/game/GameManager.ts
@@ -853,6 +853,12 @@ export default class GameManager {
             "https://thunderstore.io/c/i-am-your-beast/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1876590")], "IAmYourBeast.webp",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["iayb"]),
+
+        new Game("MiSide", "MiSide", "MiSide",
+            "MiSide", ["MiSide.exe"], "MiSideFull_Data",
+            "https://thunderstore.io/c/miside/api/v1/package-listing-index/",
+            [new StorePlatformMetadata(StorePlatform.STEAM, "2527500")], "MiSide.webp",
+            GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, [""]),
     ];
 
     static get activeGame(): Game {
diff --git a/src/r2mm/installing/default_installation_rules/InstallationRuleApplicator.ts b/src/r2mm/installing/default_installation_rules/InstallationRuleApplicator.ts
index 3f264725a..92ef6c44c 100644
--- a/src/r2mm/installing/default_installation_rules/InstallationRuleApplicator.ts
+++ b/src/r2mm/installing/default_installation_rules/InstallationRuleApplicator.ts
@@ -158,6 +158,7 @@ export default class InstallationRuleApplicator {
             buildBepInExRules("PeaksOfYore"),
             buildBepInExRules("Subterror"),
             buildBepInExRules("IAmYourBeast"),
+            buildBepInExRules("MiSide"),
         ]
     }
 }
diff --git a/src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts b/src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts
index 97ff01f4a..3a7dca490 100644
--- a/src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts
+++ b/src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts
@@ -212,6 +212,7 @@ const VARIANTS = {
     PeaksOfYore: MODLOADER_PACKAGES,
     Subterror: MODLOADER_PACKAGES,
     IAmYourBeast: MODLOADER_PACKAGES,
+    MiSide: MODLOADER_PACKAGES,
 };
 // Exported separately from the definition in order to preserve the key names in the type definition.
 // Otherwise this would become [key: string] and we couldn't use the game names for type hinting elsewhere.

From b35f7fcfc6a0a7e0cbd07b9ad6463dc45eb8c9bb Mon Sep 17 00:00:00 2001
From: Vili Manninen <vili.manninen@riskidev.fi>
Date: Thu, 12 Dec 2024 23:50:02 +0200
Subject: [PATCH 49/95] Move mod version downloading logic and state management
 to Vuex state

---
 src/components/views/DownloadModModal.vue | 99 +++++++++++++++--------
 src/pages/DownloadMonitor.vue             |  5 +-
 src/pages/Manager.vue                     |  2 +-
 src/store/index.ts                        |  2 +
 src/store/modules/DownloadModule.ts       | 44 ++++++++++
 5 files changed, 114 insertions(+), 38 deletions(-)
 create mode 100644 src/store/modules/DownloadModule.ts

diff --git a/src/components/views/DownloadModModal.vue b/src/components/views/DownloadModModal.vue
index eb998f9b1..373fdc5e4 100644
--- a/src/components/views/DownloadModModal.vue
+++ b/src/components/views/DownloadModModal.vue
@@ -1,14 +1,14 @@
 <template>
     <div>
-        <div id='downloadProgressModal' :class="['modal', {'is-active':downloadingMod}]" v-if="downloadObject !== null">
+        <div id='downloadProgressModal' :class="['modal', {'is-active':downloadingMod}]" v-if="$store.state.download.downloadObject !== null">
             <div class="modal-background" @click="downloadingMod = false;"></div>
             <div class='modal-content'>
                 <div class='notification is-info'>
-                    <h3 class='title'>Downloading {{downloadObject.modName}}</h3>
-                    <p>{{Math.floor(downloadObject.progress)}}% complete</p>
+                    <h3 class='title'>Downloading {{$store.state.download.downloadObject.modName}}</h3>
+                    <p>{{Math.floor($store.state.download.downloadObject.progress)}}% complete</p>
                     <Progress
                         :max='100'
-                        :value='downloadObject.progress'
+                        :value='$store.state.download.downloadObject.progress'
                         :className="['is-dark']"
                     />
                 </div>
@@ -43,6 +43,7 @@
 
 import { mixins } from "vue-class-component";
 import { Component } from 'vue-property-decorator';
+import { Store } from "vuex";
 import ThunderstoreMod from '../../model/ThunderstoreMod';
 import ManifestV2 from '../../model/ManifestV2';
 import ThunderstoreVersion from '../../model/ThunderstoreVersion';
@@ -68,8 +69,6 @@ interface DownloadProgress {
     failed: boolean;
 }
 
-let assignId = 0;
-
     @Component({
         components: {
             DownloadModVersionSelectModal,
@@ -79,11 +78,8 @@ let assignId = 0;
     })
     export default class DownloadModModal extends mixins(DownloadMixin) {
 
-        downloadObject: DownloadProgress | null = null;
         downloadingMod: boolean = false;
 
-        static allVersions: [number, DownloadProgress][] = [];
-
         get ignoreCache(): boolean {
             const settings = this.$store.getters['settings'];
             return settings.getContext().global.ignoreCache;
@@ -92,12 +88,16 @@ let assignId = 0;
         public static async downloadSpecific(
             profile: Profile,
             combo: ThunderstoreCombo,
-            ignoreCache: boolean
+            ignoreCache: boolean,
+            store: Store<any>
         ): Promise<void> {
             return new Promise((resolve, reject) => {
                 const tsMod = combo.getMod();
                 const tsVersion = combo.getVersion();
-                const currentAssignId = assignId++;
+
+                store.commit('download/increaseAssignId');
+                const currentAssignId = store.state.download.assignId;
+
                 const progressObject = {
                     progress: 0,
                     initialMods: [`${tsMod.getName()} (${tsVersion.getVersionNumber().toString()})`],
@@ -105,15 +105,19 @@ let assignId = 0;
                     assignId: currentAssignId,
                     failed: false,
                 };
-                DownloadModModal.allVersions.push([currentAssignId, progressObject]);
+
+                store.commit('download/pushDownloadObjectToAllVersions', progressObject);
                 setTimeout(() => {
                     ThunderstoreDownloaderProvider.instance.download(profile.asImmutableProfile(), tsMod, tsVersion, ignoreCache, (progress: number, modName: string, status: number, err: R2Error | null) => {
-                        const assignIndex = DownloadModModal.allVersions.findIndex(([number, val]) => number === currentAssignId);
+                        const assignIndex = store.state.download.allVersions.findIndex(([number, val]: [number, DownloadProgress]) => number === currentAssignId);
                         if (status === StatusEnum.FAILURE) {
                             if (err !== null) {
-                                const existing = DownloadModModal.allVersions[assignIndex]
+                                const existing = store.state.download.allVersions[assignIndex]
                                 existing[1].failed = true;
-                                DownloadModModal.allVersions[assignIndex] = [currentAssignId, existing[1]];
+                                store.commit('download/updateDownloadObject', {
+                                    assignId: assignIndex,
+                                    downloadObject: [currentAssignId, existing[1]]
+                                });
                                 DownloadModModal.addSolutionsToError(err);
                                 return reject(err);
                             }
@@ -125,7 +129,10 @@ let assignId = 0;
                                 assignId: currentAssignId,
                                 failed: false,
                             }
-                            DownloadModModal.allVersions[assignIndex] = [currentAssignId, obj];
+                            store.commit('download/updateDownloadObject', {
+                                assignId: assignIndex,
+                                downloadObject: [currentAssignId, obj]
+                            });
                         }
                     }, async (downloadedMods: ThunderstoreCombo[]) => {
                         ProfileModList.requestLock(async () => {
@@ -155,7 +162,10 @@ let assignId = 0;
         async downloadLatest() {
             this.closeModal();
             const modsWithUpdates: ThunderstoreCombo[] = await this.$store.dispatch('profile/getCombosWithUpdates');
-            const currentAssignId = assignId++;
+
+            this.$store.commit('download/increaseAssignId');
+            const currentAssignId = this.$store.state.download.assignId;
+
             const progressObject = {
                 progress: 0,
                 initialMods: modsWithUpdates.map(value => `${value.getMod().getName()} (${value.getVersion().toString()})`),
@@ -163,17 +173,23 @@ let assignId = 0;
                 assignId: currentAssignId,
                 failed: false,
             };
-            this.downloadObject = progressObject;
-            DownloadModModal.allVersions.push([currentAssignId, this.downloadObject]);
+            this.$store.commit('download/setDownloadObject', progressObject);
+            this.$store.commit('download/pushDownloadObjectToAllVersions', {
+                assignId: currentAssignId,
+                downloadObject: progressObject
+            });
             this.downloadingMod = true;
             ThunderstoreDownloaderProvider.instance.downloadLatestOfAll(modsWithUpdates, this.ignoreCache, (progress: number, modName: string, status: number, err: R2Error | null) => {
-                const assignIndex = DownloadModModal.allVersions.findIndex(([number, val]) => number === currentAssignId);
+                const assignIndex = this.$store.state.download.allVersions.findIndex(([number, val]: [number, DownloadProgress]) => number === currentAssignId);
                 if (status === StatusEnum.FAILURE) {
                     if (err !== null) {
                         this.downloadingMod = false;
-                        const existing = DownloadModModal.allVersions[assignIndex]
+                        const existing = this.$store.state.download.allVersions[assignIndex];
                         existing[1].failed = true;
-                        this.$set(DownloadModModal.allVersions, assignIndex, [currentAssignId, existing[1]]);
+                        this.$store.commit('download/updateDownloadObject', {
+                            assignId: assignIndex,
+                            downloadObject: [currentAssignId, existing[1]]
+                        });
                         DownloadModModal.addSolutionsToError(err);
                         this.$store.commit('error/handleError', err);
                         return;
@@ -186,17 +202,23 @@ let assignId = 0;
                         assignId: currentAssignId,
                         failed: false,
                     }
-                    if (this.downloadObject!.assignId === currentAssignId) {
-                        this.downloadObject = Object.assign({}, obj);
+                    if (this.$store.state.download.downloadObject!.assignId === currentAssignId) {
+                        this.$store.commit('download/setDownloadObject', obj);
                     }
-                    this.$set(DownloadModModal.allVersions, assignIndex, [currentAssignId, obj]);
+                    this.$store.commit('download/updateDownloadObject', {
+                        assignId: assignIndex,
+                        downloadObject: [currentAssignId, obj]
+                    });
                 }
             }, this.downloadCompletedCallback);
         }
 
         downloadHandler(tsMod: ThunderstoreMod, tsVersion: ThunderstoreVersion) {
             this.closeModal();
-            const currentAssignId = assignId++;
+
+            this.$store.commit('download/increaseAssignId');
+            const currentAssignId = this.$store.state.download.assignId;
+
             const progressObject = {
                 progress: 0,
                 initialMods: [`${tsMod.getName()} (${tsVersion.getVersionNumber().toString()})`],
@@ -204,18 +226,24 @@ let assignId = 0;
                 assignId: currentAssignId,
                 failed: false,
             };
-            this.downloadObject = progressObject;
-            DownloadModModal.allVersions.push([currentAssignId, this.downloadObject]);
+            this.$store.commit('download/setDownloadObject', progressObject);
+            this.$store.commit('download/pushDownloadObjectToAllVersions', {
+                assignId: currentAssignId,
+                downloadObject: this.$store.state.download.downloadObject
+            });
             this.downloadingMod = true;
             setTimeout(() => {
                 ThunderstoreDownloaderProvider.instance.download(this.profile.asImmutableProfile(), tsMod, tsVersion, this.ignoreCache, (progress: number, modName: string, status: number, err: R2Error | null) => {
-                    const assignIndex = DownloadModModal.allVersions.findIndex(([number, val]) => number === currentAssignId);
+                    const assignIndex = this.$store.state.download.allVersions.findIndex(([number, val]: [number, DownloadProgress]) => number === currentAssignId);
                     if (status === StatusEnum.FAILURE) {
                         if (err !== null) {
                             this.downloadingMod = false;
-                            const existing = DownloadModModal.allVersions[assignIndex]
+                            const existing = this.$store.state.download.allVersions[assignIndex];
                             existing[1].failed = true;
-                            this.$set(DownloadModModal.allVersions, assignIndex, [currentAssignId, existing[1]]);
+                            this.$store.commit('download/updateDownloadObject', {
+                                assignId: assignIndex,
+                                downloadObject: [currentAssignId, existing[1]]
+                            });
                             DownloadModModal.addSolutionsToError(err);
                             this.$store.commit('error/handleError', err);
                             return;
@@ -228,10 +256,13 @@ let assignId = 0;
                             assignId: currentAssignId,
                             failed: false,
                         }
-                        if (this.downloadObject!.assignId === currentAssignId) {
-                            this.downloadObject = Object.assign({}, obj);
+                        if (this.$store.state.download.downloadObject!.assignId === currentAssignId) {
+                            this.$store.commit('download/setDownloadObject', obj);
                         }
-                        this.$set(DownloadModModal.allVersions, assignIndex, [currentAssignId, obj]);
+                        this.$store.commit('download/updateDownloadObject', {
+                            assignId: assignIndex,
+                            downloadObject: [currentAssignId, obj]
+                        });
                     }
                 }, this.downloadCompletedCallback);
             }, 1);
diff --git a/src/pages/DownloadMonitor.vue b/src/pages/DownloadMonitor.vue
index 2503e4161..9752b17fd 100644
--- a/src/pages/DownloadMonitor.vue
+++ b/src/pages/DownloadMonitor.vue
@@ -44,7 +44,6 @@
 
 import { Component, Vue } from 'vue-property-decorator';
 import { Hero } from '../components/all';
-import DownloadModModal from '../components/views/DownloadModModal.vue';
 import Progress from '../components/Progress.vue';
 import Timeout = NodeJS.Timeout;
 
@@ -59,9 +58,9 @@ export default class DownloadMonitor extends Vue {
     private activeDownloads: [number, any][] = [];
 
     created() {
-        this.activeDownloads = [...DownloadModModal.allVersions].reverse();
+        this.activeDownloads = [...this.$store.state.download.allVersions].reverse();
         this.refreshInterval = setInterval(() => {
-            this.activeDownloads = [...DownloadModModal.allVersions].reverse();
+            this.activeDownloads = [...this.$store.state.download.allVersions].reverse();
         }, 100);
     }
 
diff --git a/src/pages/Manager.vue b/src/pages/Manager.vue
index 49f92263a..b3638808e 100644
--- a/src/pages/Manager.vue
+++ b/src/pages/Manager.vue
@@ -635,7 +635,7 @@ import ModalCard from '../components/ModalCard.vue';
                     });
                     return;
                 }
-                DownloadModModal.downloadSpecific(this.profile, combo, ignoreCache)
+                DownloadModModal.downloadSpecific(this.profile, combo, ignoreCache, this.$store)
                     .then(async value => {
                         const modList = await ProfileModList.getModList(this.profile.asImmutableProfile());
                         if (!(modList instanceof R2Error)) {
diff --git a/src/store/index.ts b/src/store/index.ts
index adb94f05e..2bc5f2962 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -2,6 +2,7 @@ import Vue from 'vue';
 import Vuex, { ActionContext } from 'vuex';
 
 import ErrorModule from './modules/ErrorModule';
+import { DownloadModule } from './modules/DownloadModule';
 import ModalsModule from './modules/ModalsModule';
 import ModFilterModule from './modules/ModFilterModule';
 import ProfileModule from './modules/ProfileModule';
@@ -123,6 +124,7 @@ export const store = {
     },
     modules: {
         error: ErrorModule,
+        download: DownloadModule,
         modals: ModalsModule,
         modFilters: ModFilterModule,
         profile: ProfileModule,
diff --git a/src/store/modules/DownloadModule.ts b/src/store/modules/DownloadModule.ts
new file mode 100644
index 000000000..276912add
--- /dev/null
+++ b/src/store/modules/DownloadModule.ts
@@ -0,0 +1,44 @@
+import Vue from "vue";
+
+export interface DownloadProgress {
+    assignId: number;
+    initialMods: string[];
+    modName: string;
+    progress: number;
+    failed: boolean;
+}
+
+
+interface State {
+    allVersions: [number, DownloadProgress][],
+    assignId: number,
+    downloadObject: DownloadProgress | null,
+}
+
+/**
+ * State for mod downloads.
+ */
+export const DownloadModule = {
+    namespaced: true,
+
+    state: (): State => ({
+        allVersions: [],
+        assignId: 0,
+        downloadObject: null, // TODO: Check if the last element of allVersions can be used instead of this
+    }),
+
+    mutations: {
+        setDownloadObject(state: State, downloadObject: DownloadProgress) {
+            state.downloadObject = Object.assign({}, downloadObject);
+        },
+        pushDownloadObjectToAllVersions(state: State, params: { assignId: number, downloadObject: DownloadProgress }) {
+            state.allVersions.push([params.assignId, params.downloadObject]);
+        },
+        updateDownloadObject(state: State, params: { assignId: number, downloadObject: DownloadProgress }) {
+            Vue.set(state.allVersions, params.assignId, params.downloadObject);
+        },
+        increaseAssignId(state: State) {
+            state.assignId++;
+        }
+    },
+}

From c8175d2888370e0ee954c491327a69fef9c7ba24 Mon Sep 17 00:00:00 2001
From: Vili Manninen <vili.manninen@riskidev.fi>
Date: Fri, 13 Dec 2024 14:11:48 +0200
Subject: [PATCH 50/95] Minor fixes, mostly object type stuff

---
 src/components/views/DownloadModModal.vue | 18 +++++++++++-------
 src/store/modules/DownloadModule.ts       | 12 ++++++------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/components/views/DownloadModModal.vue b/src/components/views/DownloadModModal.vue
index 373fdc5e4..e2d2d4b99 100644
--- a/src/components/views/DownloadModModal.vue
+++ b/src/components/views/DownloadModModal.vue
@@ -106,7 +106,11 @@ interface DownloadProgress {
                     failed: false,
                 };
 
-                store.commit('download/pushDownloadObjectToAllVersions', progressObject);
+                store.commit('download/pushDownloadObjectToAllVersions', {
+                    assignId: currentAssignId,
+                    downloadObject: progressObject
+                });
+
                 setTimeout(() => {
                     ThunderstoreDownloaderProvider.instance.download(profile.asImmutableProfile(), tsMod, tsVersion, ignoreCache, (progress: number, modName: string, status: number, err: R2Error | null) => {
                         const assignIndex = store.state.download.allVersions.findIndex(([number, val]: [number, DownloadProgress]) => number === currentAssignId);
@@ -116,7 +120,7 @@ interface DownloadProgress {
                                 existing[1].failed = true;
                                 store.commit('download/updateDownloadObject', {
                                     assignId: assignIndex,
-                                    downloadObject: [currentAssignId, existing[1]]
+                                    downloadVersion: [currentAssignId, existing[1]]
                                 });
                                 DownloadModModal.addSolutionsToError(err);
                                 return reject(err);
@@ -131,7 +135,7 @@ interface DownloadProgress {
                             }
                             store.commit('download/updateDownloadObject', {
                                 assignId: assignIndex,
-                                downloadObject: [currentAssignId, obj]
+                                downloadVersion: [currentAssignId, obj]
                             });
                         }
                     }, async (downloadedMods: ThunderstoreCombo[]) => {
@@ -188,7 +192,7 @@ interface DownloadProgress {
                         existing[1].failed = true;
                         this.$store.commit('download/updateDownloadObject', {
                             assignId: assignIndex,
-                            downloadObject: [currentAssignId, existing[1]]
+                            downloadVersion: [currentAssignId, existing[1]]
                         });
                         DownloadModModal.addSolutionsToError(err);
                         this.$store.commit('error/handleError', err);
@@ -207,7 +211,7 @@ interface DownloadProgress {
                     }
                     this.$store.commit('download/updateDownloadObject', {
                         assignId: assignIndex,
-                        downloadObject: [currentAssignId, obj]
+                        downloadVersion: [currentAssignId, obj]
                     });
                 }
             }, this.downloadCompletedCallback);
@@ -242,7 +246,7 @@ interface DownloadProgress {
                             existing[1].failed = true;
                             this.$store.commit('download/updateDownloadObject', {
                                 assignId: assignIndex,
-                                downloadObject: [currentAssignId, existing[1]]
+                                downloadVersion: [currentAssignId, existing[1]]
                             });
                             DownloadModModal.addSolutionsToError(err);
                             this.$store.commit('error/handleError', err);
@@ -261,7 +265,7 @@ interface DownloadProgress {
                         }
                         this.$store.commit('download/updateDownloadObject', {
                             assignId: assignIndex,
-                            downloadObject: [currentAssignId, obj]
+                            downloadVersion: [currentAssignId, obj]
                         });
                     }
                 }, this.downloadCompletedCallback);
diff --git a/src/store/modules/DownloadModule.ts b/src/store/modules/DownloadModule.ts
index 276912add..21d4c5c9f 100644
--- a/src/store/modules/DownloadModule.ts
+++ b/src/store/modules/DownloadModule.ts
@@ -1,5 +1,3 @@
-import Vue from "vue";
-
 export interface DownloadProgress {
     assignId: number;
     initialMods: string[];
@@ -29,13 +27,15 @@ export const DownloadModule = {
 
     mutations: {
         setDownloadObject(state: State, downloadObject: DownloadProgress) {
-            state.downloadObject = Object.assign({}, downloadObject);
+            state.downloadObject = {...downloadObject};
         },
         pushDownloadObjectToAllVersions(state: State, params: { assignId: number, downloadObject: DownloadProgress }) {
-            state.allVersions.push([params.assignId, params.downloadObject]);
+            state.allVersions = [...state.allVersions, [params.assignId, params.downloadObject]];
         },
-        updateDownloadObject(state: State, params: { assignId: number, downloadObject: DownloadProgress }) {
-            Vue.set(state.allVersions, params.assignId, params.downloadObject);
+        updateDownloadObject(state: State, params: { assignId: number, downloadVersion: [number, DownloadProgress]}) {
+            const newVersions = [...state.allVersions];
+            newVersions[params.assignId] = params.downloadVersion;
+            state.allVersions = newVersions;
         },
         increaseAssignId(state: State) {
             state.assignId++;

From 9503e7282231a147d05f3fc2d300a3212413319c Mon Sep 17 00:00:00 2001
From: Vili Manninen <vili.manninen@riskidev.fi>
Date: Fri, 13 Dec 2024 14:16:31 +0200
Subject: [PATCH 51/95] Add a getter activeDownloadCount

---
 src/store/modules/DownloadModule.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/store/modules/DownloadModule.ts b/src/store/modules/DownloadModule.ts
index 21d4c5c9f..2d9a4742b 100644
--- a/src/store/modules/DownloadModule.ts
+++ b/src/store/modules/DownloadModule.ts
@@ -1,3 +1,6 @@
+import { GetterTree } from "vuex";
+import { State as RootState } from "../../store";
+
 export interface DownloadProgress {
     assignId: number;
     initialMods: string[];
@@ -25,6 +28,15 @@ export const DownloadModule = {
         downloadObject: null, // TODO: Check if the last element of allVersions can be used instead of this
     }),
 
+    getters: <GetterTree<State, RootState>>{
+        activeDownloadCount(state) {
+            const active = state.allVersions.filter(
+                dl => !dl[1].failed && dl[1].progress < 100
+            );
+            return active.length;
+        },
+    },
+
     mutations: {
         setDownloadObject(state: State, downloadObject: DownloadProgress) {
             state.downloadObject = {...downloadObject};

From 17556bcf5c950267382cf7a685e30df9f9496079 Mon Sep 17 00:00:00 2001
From: VilppeRiskidev <vili.manninen@riskidev.fi>
Date: Tue, 17 Dec 2024 14:28:35 +0200
Subject: [PATCH 52/95] Move downloadCompletedCallback functions main business
 logic to ProfileUtils

---
 src/components/views/DownloadModModal.vue | 25 +++++++----------------
 src/utils/ProfileUtils.ts                 | 18 ++++++++++++++++
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/components/views/DownloadModModal.vue b/src/components/views/DownloadModModal.vue
index e2d2d4b99..6b12f0ead 100644
--- a/src/components/views/DownloadModModal.vue
+++ b/src/components/views/DownloadModModal.vue
@@ -57,7 +57,7 @@ import Profile from '../../model/Profile';
 import { Progress } from '../all';
 import ConflictManagementProvider from '../../providers/generic/installing/ConflictManagementProvider';
 import ModalCard from '../ModalCard.vue';
-import { installModsToProfile } from '../../utils/ProfileUtils';
+import { installModsAndResolveConflicts } from '../../utils/ProfileUtils';
 import DownloadMixin from "../mixins/DownloadMixin.vue";
 import DownloadModVersionSelectModal from "../../components/views/DownloadModVersionSelectModal.vue";
 
@@ -273,23 +273,12 @@ interface DownloadProgress {
         }
 
         async downloadCompletedCallback(downloadedMods: ThunderstoreCombo[]) {
-            ProfileModList.requestLock(async () => {
-                const profile = this.profile.asImmutableProfile();
-
-                try {
-                    const modList = await installModsToProfile(downloadedMods, profile);
-                    await this.$store.dispatch('profile/updateModList', modList);
-
-                    const err = await ConflictManagementProvider.instance.resolveConflicts(modList, this.profile.asImmutableProfile());
-                    if (err instanceof R2Error) {
-                        throw err;
-                    }
-                } catch (e) {
-                    this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
-                } finally {
-                    this.downloadingMod = false;
-                }
-            });
+            try {
+                await installModsAndResolveConflicts(downloadedMods, this.profile.asImmutableProfile(), this.$store);
+            } catch (e) {
+                this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
+            }
+            this.downloadingMod = false;
         }
 
         static async installModAfterDownload(profile: Profile, mod: ThunderstoreMod, version: ThunderstoreVersion): Promise<R2Error | void> {
diff --git a/src/utils/ProfileUtils.ts b/src/utils/ProfileUtils.ts
index 7700227c1..d02f7f1ac 100644
--- a/src/utils/ProfileUtils.ts
+++ b/src/utils/ProfileUtils.ts
@@ -16,6 +16,8 @@ import ZipProvider from "../providers/generic/zip/ZipProvider";
 import ProfileInstallerProvider from "../providers/ror2/installing/ProfileInstallerProvider";
 import * as PackageDb from '../r2mm/manager/PackageDexieStore';
 import ProfileModList from "../r2mm/mods/ProfileModList";
+import ConflictManagementProvider from "../providers/generic/installing/ConflictManagementProvider";
+import {Store} from "vuex";
 
 export async function exportModsToCombos(exportMods: ExportMod[], game: Game): Promise<ThunderstoreCombo[]> {
     const dependencyStrings = exportMods.map((m) => m.getDependencyString());
@@ -56,6 +58,22 @@ async function extractConfigsToImportedProfile(
     }
 }
 
+export async function installModsAndResolveConflicts(
+    downloadedMods: ThunderstoreCombo[],
+    profile: ImmutableProfile,
+    store: Store<any>
+): Promise<void> {
+    await ProfileModList.requestLock(async () => {
+        try {
+            const modList: ManifestV2[] = await installModsToProfile(downloadedMods, profile);
+            await store.dispatch('profile/updateModList', modList);
+            throwForR2Error(await ConflictManagementProvider.instance.resolveConflicts(modList, profile));
+        } catch (e: any) {
+            throw e;
+        }
+    });
+}
+
 /**
  * Install mods to target profile and sync the changes to mods.yml file
  * This is more performant than calling ProfileModList.addMod() on a

From 54224fdabe86f0b8f25160de8c9ffa96e89d2229 Mon Sep 17 00:00:00 2001
From: VilppeRiskidev <vili.manninen@riskidev.fi>
Date: Tue, 17 Dec 2024 14:38:01 +0200
Subject: [PATCH 53/95] Move downloadCompletedCallback to DownloadMixin to make
 it easier to split DownloadModModal component

---
 src/components/mixins/DownloadMixin.vue   | 13 ++++++++++++-
 src/components/views/DownloadModModal.vue | 20 ++++++++------------
 src/utils/ProfileUtils.ts                 |  2 +-
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/components/mixins/DownloadMixin.vue b/src/components/mixins/DownloadMixin.vue
index 65a020929..04b7b187d 100644
--- a/src/components/mixins/DownloadMixin.vue
+++ b/src/components/mixins/DownloadMixin.vue
@@ -2,9 +2,12 @@
 import Vue from 'vue';
 import Component from 'vue-class-component';
 
-import ThunderstoreMod from "../../model/ThunderstoreMod";
+import R2Error from "../../model/errors/R2Error";
 import Game from "../../model/game/Game";
 import Profile from "../../model/Profile";
+import ThunderstoreCombo from "../../model/ThunderstoreCombo";
+import ThunderstoreMod from "../../model/ThunderstoreMod";
+import { installModsAndResolveConflicts } from "../../utils/ProfileUtils";
 
 
 @Component
@@ -29,5 +32,13 @@ export default class DownloadMixin extends Vue {
     get profile(): Profile {
         return this.$store.getters['profile/activeProfile'];
     }
+
+    async downloadCompletedCallback(downloadedMods: ThunderstoreCombo[]): Promise<void> {
+        try {
+            await installModsAndResolveConflicts(downloadedMods, this.profile.asImmutableProfile(), this.$store);
+        } catch (e) {
+            this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
+        }
+    }
 }
 </script>
diff --git a/src/components/views/DownloadModModal.vue b/src/components/views/DownloadModModal.vue
index 6b12f0ead..b1bf5a2c0 100644
--- a/src/components/views/DownloadModModal.vue
+++ b/src/components/views/DownloadModModal.vue
@@ -57,7 +57,6 @@ import Profile from '../../model/Profile';
 import { Progress } from '../all';
 import ConflictManagementProvider from '../../providers/generic/installing/ConflictManagementProvider';
 import ModalCard from '../ModalCard.vue';
-import { installModsAndResolveConflicts } from '../../utils/ProfileUtils';
 import DownloadMixin from "../mixins/DownloadMixin.vue";
 import DownloadModVersionSelectModal from "../../components/views/DownloadModVersionSelectModal.vue";
 
@@ -214,7 +213,10 @@ interface DownloadProgress {
                         downloadVersion: [currentAssignId, obj]
                     });
                 }
-            }, this.downloadCompletedCallback);
+            }, (downloadedMods) => {
+                this.downloadCompletedCallback(downloadedMods);
+                this.downloadingMod = false;
+            });
         }
 
         downloadHandler(tsMod: ThunderstoreMod, tsVersion: ThunderstoreVersion) {
@@ -268,19 +270,13 @@ interface DownloadProgress {
                             downloadVersion: [currentAssignId, obj]
                         });
                     }
-                }, this.downloadCompletedCallback);
+                }, (downloadedMods) => {
+                    this.downloadCompletedCallback(downloadedMods);
+                    this.downloadingMod = false;
+                });
             }, 1);
         }
 
-        async downloadCompletedCallback(downloadedMods: ThunderstoreCombo[]) {
-            try {
-                await installModsAndResolveConflicts(downloadedMods, this.profile.asImmutableProfile(), this.$store);
-            } catch (e) {
-                this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
-            }
-            this.downloadingMod = false;
-        }
-
         static async installModAfterDownload(profile: Profile, mod: ThunderstoreMod, version: ThunderstoreVersion): Promise<R2Error | void> {
             return new Promise(async (resolve, reject) => {
                 const manifestMod: ManifestV2 = new ManifestV2().fromThunderstoreMod(mod, version);
diff --git a/src/utils/ProfileUtils.ts b/src/utils/ProfileUtils.ts
index d02f7f1ac..72e4eb77e 100644
--- a/src/utils/ProfileUtils.ts
+++ b/src/utils/ProfileUtils.ts
@@ -12,11 +12,11 @@ import Profile, { ImmutableProfile } from "../model/Profile";
 import ThunderstoreCombo from "../model/ThunderstoreCombo";
 import VersionNumber from "../model/VersionNumber";
 import FsProvider from "../providers/generic/file/FsProvider";
+import ConflictManagementProvider from "../providers/generic/installing/ConflictManagementProvider";
 import ZipProvider from "../providers/generic/zip/ZipProvider";
 import ProfileInstallerProvider from "../providers/ror2/installing/ProfileInstallerProvider";
 import * as PackageDb from '../r2mm/manager/PackageDexieStore';
 import ProfileModList from "../r2mm/mods/ProfileModList";
-import ConflictManagementProvider from "../providers/generic/installing/ConflictManagementProvider";
 import {Store} from "vuex";
 
 export async function exportModsToCombos(exportMods: ExportMod[], game: Game): Promise<ThunderstoreCombo[]> {

From bd954c4563b29dfec5457fce63f72bbdca8695f1 Mon Sep 17 00:00:00 2001
From: VilppeRiskidev <vili.manninen@riskidev.fi>
Date: Wed, 18 Dec 2024 14:35:33 +0200
Subject: [PATCH 54/95] Optimize imports

---
 src/components/views/DownloadModModal.vue | 21 +++++++++++----------
 src/utils/ProfileUtils.ts                 |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/components/views/DownloadModModal.vue b/src/components/views/DownloadModModal.vue
index b1bf5a2c0..414b17de7 100644
--- a/src/components/views/DownloadModModal.vue
+++ b/src/components/views/DownloadModModal.vue
@@ -44,21 +44,22 @@
 import { mixins } from "vue-class-component";
 import { Component } from 'vue-property-decorator';
 import { Store } from "vuex";
-import ThunderstoreMod from '../../model/ThunderstoreMod';
+
+import { Progress } from '../all';
+import ModalCard from '../ModalCard.vue';
+import DownloadModVersionSelectModal from "../../components/views/DownloadModVersionSelectModal.vue";
+import DownloadMixin from "../mixins/DownloadMixin.vue";
+import StatusEnum from '../../model/enums/StatusEnum';
+import R2Error from '../../model/errors/R2Error';
 import ManifestV2 from '../../model/ManifestV2';
+import Profile from '../../model/Profile';
+import ThunderstoreMod from '../../model/ThunderstoreMod';
 import ThunderstoreVersion from '../../model/ThunderstoreVersion';
-import ThunderstoreDownloaderProvider from '../../providers/ror2/downloading/ThunderstoreDownloaderProvider';
-import R2Error from '../../model/errors/R2Error';
-import StatusEnum from '../../model/enums/StatusEnum';
 import ThunderstoreCombo from '../../model/ThunderstoreCombo';
+import ConflictManagementProvider from '../../providers/generic/installing/ConflictManagementProvider';
 import ProfileInstallerProvider from '../../providers/ror2/installing/ProfileInstallerProvider';
+import ThunderstoreDownloaderProvider from '../../providers/ror2/downloading/ThunderstoreDownloaderProvider';
 import ProfileModList from '../../r2mm/mods/ProfileModList';
-import Profile from '../../model/Profile';
-import { Progress } from '../all';
-import ConflictManagementProvider from '../../providers/generic/installing/ConflictManagementProvider';
-import ModalCard from '../ModalCard.vue';
-import DownloadMixin from "../mixins/DownloadMixin.vue";
-import DownloadModVersionSelectModal from "../../components/views/DownloadModVersionSelectModal.vue";
 
 interface DownloadProgress {
     assignId: number;
diff --git a/src/utils/ProfileUtils.ts b/src/utils/ProfileUtils.ts
index 72e4eb77e..7e09c8404 100644
--- a/src/utils/ProfileUtils.ts
+++ b/src/utils/ProfileUtils.ts
@@ -1,6 +1,7 @@
 import path from "path";
 
 import * as yaml from "yaml";
+import { Store } from "vuex";
 
 import FileUtils from "./FileUtils";
 import R2Error from "../model/errors/R2Error";
@@ -17,7 +18,6 @@ import ZipProvider from "../providers/generic/zip/ZipProvider";
 import ProfileInstallerProvider from "../providers/ror2/installing/ProfileInstallerProvider";
 import * as PackageDb from '../r2mm/manager/PackageDexieStore';
 import ProfileModList from "../r2mm/mods/ProfileModList";
-import {Store} from "vuex";
 
 export async function exportModsToCombos(exportMods: ExportMod[], game: Game): Promise<ThunderstoreCombo[]> {
     const dependencyStrings = exportMods.map((m) => m.getDependencyString());

From 61c3b3fa34edfc8d11368c8323a75f087d47fcc7 Mon Sep 17 00:00:00 2001
From: Vili Manninen <vili.manninen@riskidev.fi>
Date: Thu, 19 Dec 2024 14:02:53 +0200
Subject: [PATCH 55/95] Remove unnecessary try/catch wrapping

---
 src/utils/ProfileUtils.ts | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/utils/ProfileUtils.ts b/src/utils/ProfileUtils.ts
index 7e09c8404..b538f1b81 100644
--- a/src/utils/ProfileUtils.ts
+++ b/src/utils/ProfileUtils.ts
@@ -64,13 +64,9 @@ export async function installModsAndResolveConflicts(
     store: Store<any>
 ): Promise<void> {
     await ProfileModList.requestLock(async () => {
-        try {
-            const modList: ManifestV2[] = await installModsToProfile(downloadedMods, profile);
-            await store.dispatch('profile/updateModList', modList);
-            throwForR2Error(await ConflictManagementProvider.instance.resolveConflicts(modList, profile));
-        } catch (e: any) {
-            throw e;
-        }
+        const modList: ManifestV2[] = await installModsToProfile(downloadedMods, profile);
+        await store.dispatch('profile/updateModList', modList);
+        throwForR2Error(await ConflictManagementProvider.instance.resolveConflicts(modList, profile));
     });
 }
 

From 8529adb7f777697c2f75236e0bd9f10e2eb44445 Mon Sep 17 00:00:00 2001
From: VilppeRiskidev <vili.manninen@riskidev.fi>
Date: Wed, 18 Dec 2024 17:35:40 +0200
Subject: [PATCH 56/95] Clean up the downloadn state management Vuex store and
 it's usages

- Remove assignId field
- Remove downloadObject field
- Rename some fields and functions to be more descriptive
- assignId is no longer passed unnecessarily when calling vuex store
  functions
---
 src/components/views/DownloadModModal.vue | 101 +++++++---------------
 src/pages/DownloadMonitor.vue             |  12 +--
 src/store/modules/DownloadModule.ts       |  45 +++++-----
 3 files changed, 65 insertions(+), 93 deletions(-)

diff --git a/src/components/views/DownloadModModal.vue b/src/components/views/DownloadModModal.vue
index 414b17de7..7e01aa53d 100644
--- a/src/components/views/DownloadModModal.vue
+++ b/src/components/views/DownloadModModal.vue
@@ -1,14 +1,14 @@
 <template>
     <div>
-        <div id='downloadProgressModal' :class="['modal', {'is-active':downloadingMod}]" v-if="$store.state.download.downloadObject !== null">
+        <div id='downloadProgressModal' :class="['modal', {'is-active':downloadingMod}]" v-if="$store.getters['download/currentDownload'] !== null">
             <div class="modal-background" @click="downloadingMod = false;"></div>
             <div class='modal-content'>
                 <div class='notification is-info'>
-                    <h3 class='title'>Downloading {{$store.state.download.downloadObject.modName}}</h3>
-                    <p>{{Math.floor($store.state.download.downloadObject.progress)}}% complete</p>
+                    <h3 class='title'>Downloading {{$store.getters['download/currentDownload'].modName}}</h3>
+                    <p>{{Math.floor($store.getters['download/currentDownload'].progress)}}% complete</p>
                     <Progress
                         :max='100'
-                        :value='$store.state.download.downloadObject.progress'
+                        :value="$store.getters['download/currentDownload'].progress"
                         :className="['is-dark']"
                     />
                 </div>
@@ -60,14 +60,7 @@ import ConflictManagementProvider from '../../providers/generic/installing/Confl
 import ProfileInstallerProvider from '../../providers/ror2/installing/ProfileInstallerProvider';
 import ThunderstoreDownloaderProvider from '../../providers/ror2/downloading/ThunderstoreDownloaderProvider';
 import ProfileModList from '../../r2mm/mods/ProfileModList';
-
-interface DownloadProgress {
-    assignId: number;
-    initialMods: string[];
-    modName: string;
-    progress: number;
-    failed: boolean;
-}
+import { DownloadProgress } from "../../store/modules/DownloadModule";
 
     @Component({
         components: {
@@ -95,8 +88,9 @@ interface DownloadProgress {
                 const tsMod = combo.getMod();
                 const tsVersion = combo.getVersion();
 
-                store.commit('download/increaseAssignId');
-                const currentAssignId = store.state.download.assignId;
+                const currentAssignId = store.getters["download/currentDownload"]
+                    ? store.getters["download/currentDownload"].assignId + 1
+                    : 0;
 
                 const progressObject = {
                     progress: 0,
@@ -106,22 +100,17 @@ interface DownloadProgress {
                     failed: false,
                 };
 
-                store.commit('download/pushDownloadObjectToAllVersions', {
-                    assignId: currentAssignId,
-                    downloadObject: progressObject
-                });
+                store.commit('download/addDownload', progressObject);
 
                 setTimeout(() => {
                     ThunderstoreDownloaderProvider.instance.download(profile.asImmutableProfile(), tsMod, tsVersion, ignoreCache, (progress: number, modName: string, status: number, err: R2Error | null) => {
-                        const assignIndex = store.state.download.allVersions.findIndex(([number, val]: [number, DownloadProgress]) => number === currentAssignId);
                         if (status === StatusEnum.FAILURE) {
                             if (err !== null) {
-                                const existing = store.state.download.allVersions[assignIndex]
-                                existing[1].failed = true;
-                                store.commit('download/updateDownloadObject', {
-                                    assignId: assignIndex,
-                                    downloadVersion: [currentAssignId, existing[1]]
+                                const existing = store.state.download.allDownloads.find((dlObj: DownloadProgress) => {
+                                    return dlObj.assignId === currentAssignId;
                                 });
+                                existing.failed = true;
+                                store.commit('download/updateDownload', existing);
                                 DownloadModModal.addSolutionsToError(err);
                                 return reject(err);
                             }
@@ -133,10 +122,7 @@ interface DownloadProgress {
                                 assignId: currentAssignId,
                                 failed: false,
                             }
-                            store.commit('download/updateDownloadObject', {
-                                assignId: assignIndex,
-                                downloadVersion: [currentAssignId, obj]
-                            });
+                            store.commit('download/updateDownload', obj);
                         }
                     }, async (downloadedMods: ThunderstoreCombo[]) => {
                         ProfileModList.requestLock(async () => {
@@ -167,8 +153,9 @@ interface DownloadProgress {
             this.closeModal();
             const modsWithUpdates: ThunderstoreCombo[] = await this.$store.dispatch('profile/getCombosWithUpdates');
 
-            this.$store.commit('download/increaseAssignId');
-            const currentAssignId = this.$store.state.download.assignId;
+            const currentAssignId = this.$store.getters["download/currentDownload"]
+                ? this.$store.getters["download/currentDownload"].assignId + 1
+                : 0;
 
             const progressObject = {
                 progress: 0,
@@ -177,23 +164,17 @@ interface DownloadProgress {
                 assignId: currentAssignId,
                 failed: false,
             };
-            this.$store.commit('download/setDownloadObject', progressObject);
-            this.$store.commit('download/pushDownloadObjectToAllVersions', {
-                assignId: currentAssignId,
-                downloadObject: progressObject
-            });
+            this.$store.commit('download/addDownload', progressObject);
             this.downloadingMod = true;
             ThunderstoreDownloaderProvider.instance.downloadLatestOfAll(modsWithUpdates, this.ignoreCache, (progress: number, modName: string, status: number, err: R2Error | null) => {
-                const assignIndex = this.$store.state.download.allVersions.findIndex(([number, val]: [number, DownloadProgress]) => number === currentAssignId);
                 if (status === StatusEnum.FAILURE) {
                     if (err !== null) {
                         this.downloadingMod = false;
-                        const existing = this.$store.state.download.allVersions[assignIndex];
-                        existing[1].failed = true;
-                        this.$store.commit('download/updateDownloadObject', {
-                            assignId: assignIndex,
-                            downloadVersion: [currentAssignId, existing[1]]
+                        const existing = this.$store.state.download.allDownloads.find((dlObj: DownloadProgress) => {
+                            return dlObj.assignId === currentAssignId;
                         });
+                        existing.failed = true;
+                        this.$store.commit('download/updateDownload', existing);
                         DownloadModModal.addSolutionsToError(err);
                         this.$store.commit('error/handleError', err);
                         return;
@@ -206,13 +187,7 @@ interface DownloadProgress {
                         assignId: currentAssignId,
                         failed: false,
                     }
-                    if (this.$store.state.download.downloadObject!.assignId === currentAssignId) {
-                        this.$store.commit('download/setDownloadObject', obj);
-                    }
-                    this.$store.commit('download/updateDownloadObject', {
-                        assignId: assignIndex,
-                        downloadVersion: [currentAssignId, obj]
-                    });
+                    this.$store.commit('download/updateDownload', obj);
                 }
             }, (downloadedMods) => {
                 this.downloadCompletedCallback(downloadedMods);
@@ -223,8 +198,9 @@ interface DownloadProgress {
         downloadHandler(tsMod: ThunderstoreMod, tsVersion: ThunderstoreVersion) {
             this.closeModal();
 
-            this.$store.commit('download/increaseAssignId');
-            const currentAssignId = this.$store.state.download.assignId;
+            const currentAssignId = this.$store.getters["download/currentDownload"]
+                ? this.$store.getters["download/currentDownload"].assignId + 1
+                : 0;
 
             const progressObject = {
                 progress: 0,
@@ -233,24 +209,19 @@ interface DownloadProgress {
                 assignId: currentAssignId,
                 failed: false,
             };
-            this.$store.commit('download/setDownloadObject', progressObject);
-            this.$store.commit('download/pushDownloadObjectToAllVersions', {
-                assignId: currentAssignId,
-                downloadObject: this.$store.state.download.downloadObject
-            });
+            this.$store.commit('download/addDownload', progressObject);
+
             this.downloadingMod = true;
             setTimeout(() => {
                 ThunderstoreDownloaderProvider.instance.download(this.profile.asImmutableProfile(), tsMod, tsVersion, this.ignoreCache, (progress: number, modName: string, status: number, err: R2Error | null) => {
-                    const assignIndex = this.$store.state.download.allVersions.findIndex(([number, val]: [number, DownloadProgress]) => number === currentAssignId);
                     if (status === StatusEnum.FAILURE) {
                         if (err !== null) {
                             this.downloadingMod = false;
-                            const existing = this.$store.state.download.allVersions[assignIndex];
-                            existing[1].failed = true;
-                            this.$store.commit('download/updateDownloadObject', {
-                                assignId: assignIndex,
-                                downloadVersion: [currentAssignId, existing[1]]
+                            const existing = this.$store.state.download.allDownloads.find((dlObj: DownloadProgress) => {
+                                return dlObj.assignId === currentAssignId;
                             });
+                            existing.failed = true;
+                            this.$store.commit('download/updateDownload', existing);
                             DownloadModModal.addSolutionsToError(err);
                             this.$store.commit('error/handleError', err);
                             return;
@@ -263,13 +234,7 @@ interface DownloadProgress {
                             assignId: currentAssignId,
                             failed: false,
                         }
-                        if (this.$store.state.download.downloadObject!.assignId === currentAssignId) {
-                            this.$store.commit('download/setDownloadObject', obj);
-                        }
-                        this.$store.commit('download/updateDownloadObject', {
-                            assignId: assignIndex,
-                            downloadVersion: [currentAssignId, obj]
-                        });
+                        this.$store.commit('download/updateDownload', obj);
                     }
                 }, (downloadedMods) => {
                     this.downloadCompletedCallback(downloadedMods);
diff --git a/src/pages/DownloadMonitor.vue b/src/pages/DownloadMonitor.vue
index 9752b17fd..40200f608 100644
--- a/src/pages/DownloadMonitor.vue
+++ b/src/pages/DownloadMonitor.vue
@@ -13,7 +13,7 @@
             </div>
         </template>
         <template v-else>
-            <div v-for="([assignId, downloadObject], index) of activeDownloads" :key="`download-progress-${index}`">
+            <div v-for="(downloadObject, index) of activeDownloads" :key="`download-progress-${index}`">
                 <div>
                     <div class="container margin-right">
                         <div class="border-at-bottom pad pad--sides">
@@ -42,10 +42,12 @@
 
 <script lang="ts">
 
+import Timeout = NodeJS.Timeout;
 import { Component, Vue } from 'vue-property-decorator';
+
 import { Hero } from '../components/all';
 import Progress from '../components/Progress.vue';
-import Timeout = NodeJS.Timeout;
+import { DownloadProgress } from "../store/modules/DownloadModule";
 
 @Component({
     components: {
@@ -55,12 +57,12 @@ import Timeout = NodeJS.Timeout;
 })
 export default class DownloadMonitor extends Vue {
     private refreshInterval!: Timeout;
-    private activeDownloads: [number, any][] = [];
+    private activeDownloads: DownloadProgress[] = [];
 
     created() {
-        this.activeDownloads = [...this.$store.state.download.allVersions].reverse();
+        this.activeDownloads = [...this.$store.state.download.allDownloads].reverse();
         this.refreshInterval = setInterval(() => {
-            this.activeDownloads = [...this.$store.state.download.allVersions].reverse();
+            this.activeDownloads = [...this.$store.state.download.allDownloads].reverse();
         }, 100);
     }
 
diff --git a/src/store/modules/DownloadModule.ts b/src/store/modules/DownloadModule.ts
index 2d9a4742b..386cd9e2b 100644
--- a/src/store/modules/DownloadModule.ts
+++ b/src/store/modules/DownloadModule.ts
@@ -1,5 +1,7 @@
 import { GetterTree } from "vuex";
+
 import { State as RootState } from "../../store";
+import R2Error from "../../model/errors/R2Error";
 
 export interface DownloadProgress {
     assignId: number;
@@ -11,9 +13,7 @@ export interface DownloadProgress {
 
 
 interface State {
-    allVersions: [number, DownloadProgress][],
-    assignId: number,
-    downloadObject: DownloadProgress | null,
+    allDownloads: DownloadProgress[],
 }
 
 /**
@@ -23,34 +23,39 @@ export const DownloadModule = {
     namespaced: true,
 
     state: (): State => ({
-        allVersions: [],
-        assignId: 0,
-        downloadObject: null, // TODO: Check if the last element of allVersions can be used instead of this
+        allDownloads: [],
     }),
 
     getters: <GetterTree<State, RootState>>{
         activeDownloadCount(state) {
-            const active = state.allVersions.filter(
-                dl => !dl[1].failed && dl[1].progress < 100
+            const active = state.allDownloads.filter(
+                dl => !dl.failed && dl.progress < 100
             );
             return active.length;
         },
+        currentDownload(state) {
+            return state.allDownloads[state.allDownloads.length-1] || null;
+        },
     },
 
     mutations: {
-        setDownloadObject(state: State, downloadObject: DownloadProgress) {
-            state.downloadObject = {...downloadObject};
-        },
-        pushDownloadObjectToAllVersions(state: State, params: { assignId: number, downloadObject: DownloadProgress }) {
-            state.allVersions = [...state.allVersions, [params.assignId, params.downloadObject]];
+        addDownload(state: State, downloadObject: DownloadProgress) {
+            state.allDownloads = [...state.allDownloads, downloadObject];
         },
-        updateDownloadObject(state: State, params: { assignId: number, downloadVersion: [number, DownloadProgress]}) {
-            const newVersions = [...state.allVersions];
-            newVersions[params.assignId] = params.downloadVersion;
-            state.allVersions = newVersions;
+        updateDownload(state: State, downloadObject: DownloadProgress) {
+            const newVersions = [...state.allDownloads];
+            const index = newVersions.findIndex((oldDownloadObject: DownloadProgress) => {
+                return oldDownloadObject.assignId === downloadObject.assignId;
+            });
+            if (index === -1) {
+                throw new R2Error(
+                    'Failed to update download status.',
+                    'Download status object with a specified index was not found, which means that there\'s a mismatch between the download statuses in memory and what\'s being iterated over.',
+                    'Try initiating the download again or restarting the app.'
+                );
+            }
+            newVersions[index] = downloadObject;
+            state.allDownloads = newVersions;
         },
-        increaseAssignId(state: State) {
-            state.assignId++;
-        }
     },
 }

From 1d713e5a9233a29903936b139e39beb6b230e25a Mon Sep 17 00:00:00 2001
From: Vili Manninen <vili.manninen@riskidev.fi>
Date: Thu, 2 Jan 2025 16:24:10 +0200
Subject: [PATCH 57/95] Move more of the logic to Vuex and thus simplify the UI
 component side of DownloadModModal

---
 src/components/views/DownloadModModal.vue | 150 ++++++++--------------
 src/store/modules/DownloadModule.ts       |  42 ++++--
 2 files changed, 83 insertions(+), 109 deletions(-)

diff --git a/src/components/views/DownloadModModal.vue b/src/components/views/DownloadModModal.vue
index 7e01aa53d..1efe089f8 100644
--- a/src/components/views/DownloadModModal.vue
+++ b/src/components/views/DownloadModModal.vue
@@ -60,7 +60,6 @@ import ConflictManagementProvider from '../../providers/generic/installing/Confl
 import ProfileInstallerProvider from '../../providers/ror2/installing/ProfileInstallerProvider';
 import ThunderstoreDownloaderProvider from '../../providers/ror2/downloading/ThunderstoreDownloaderProvider';
 import ProfileModList from '../../r2mm/mods/ProfileModList';
-import { DownloadProgress } from "../../store/modules/DownloadModule";
 
     @Component({
         components: {
@@ -84,45 +83,31 @@ import { DownloadProgress } from "../../store/modules/DownloadModule";
             ignoreCache: boolean,
             store: Store<any>
         ): Promise<void> {
-            return new Promise((resolve, reject) => {
+            return new Promise(async (resolve, reject) => {
                 const tsMod = combo.getMod();
                 const tsVersion = combo.getVersion();
 
-                const currentAssignId = store.getters["download/currentDownload"]
-                    ? store.getters["download/currentDownload"].assignId + 1
-                    : 0;
-
-                const progressObject = {
-                    progress: 0,
-                    initialMods: [`${tsMod.getName()} (${tsVersion.getVersionNumber().toString()})`],
-                    modName: '',
-                    assignId: currentAssignId,
-                    failed: false,
-                };
-
-                store.commit('download/addDownload', progressObject);
+                const assignId = await store.dispatch(
+                    'download/addDownload',
+                    [`${tsMod.getName()} (${tsVersion.getVersionNumber().toString()})`]
+                );
 
                 setTimeout(() => {
                     ThunderstoreDownloaderProvider.instance.download(profile.asImmutableProfile(), tsMod, tsVersion, ignoreCache, (progress: number, modName: string, status: number, err: R2Error | null) => {
-                        if (status === StatusEnum.FAILURE) {
-                            if (err !== null) {
-                                const existing = store.state.download.allDownloads.find((dlObj: DownloadProgress) => {
-                                    return dlObj.assignId === currentAssignId;
-                                });
-                                existing.failed = true;
-                                store.commit('download/updateDownload', existing);
-                                DownloadModModal.addSolutionsToError(err);
-                                return reject(err);
+                        try {
+                            if (status === StatusEnum.FAILURE) {
+                                store.commit('download/updateDownload', {assignId, failed: true});
+                                if (err !== null) {
+                                    DownloadModModal.addSolutionsToError(err);
+                                    return reject(err);
+                                }
+                            } else if (status === StatusEnum.PENDING) {
+                                store.commit('download/updateDownload', {assignId, progress, modName});
                             }
-                        } else if (status === StatusEnum.PENDING) {
-                            const obj = {
-                                progress: progress,
-                                initialMods: [`${tsMod.getName()} (${tsVersion.getVersionNumber().toString()})`],
-                                modName: modName,
-                                assignId: currentAssignId,
-                                failed: false,
+                        } catch (e) {
+                            if (e instanceof R2Error) {
+                                store.commit('error/handleError', e);
                             }
-                            store.commit('download/updateDownload', obj);
                         }
                     }, async (downloadedMods: ThunderstoreCombo[]) => {
                         ProfileModList.requestLock(async () => {
@@ -153,91 +138,64 @@ import { DownloadProgress } from "../../store/modules/DownloadModule";
             this.closeModal();
             const modsWithUpdates: ThunderstoreCombo[] = await this.$store.dispatch('profile/getCombosWithUpdates');
 
-            const currentAssignId = this.$store.getters["download/currentDownload"]
-                ? this.$store.getters["download/currentDownload"].assignId + 1
-                : 0;
+            const assignId = await this.$store.dispatch(
+                'download/addDownload',
+                modsWithUpdates.map(value => `${value.getMod().getName()} (${value.getVersion().toString()})`)
+            );
 
-            const progressObject = {
-                progress: 0,
-                initialMods: modsWithUpdates.map(value => `${value.getMod().getName()} (${value.getVersion().toString()})`),
-                modName: '',
-                assignId: currentAssignId,
-                failed: false,
-            };
-            this.$store.commit('download/addDownload', progressObject);
             this.downloadingMod = true;
             ThunderstoreDownloaderProvider.instance.downloadLatestOfAll(modsWithUpdates, this.ignoreCache, (progress: number, modName: string, status: number, err: R2Error | null) => {
-                if (status === StatusEnum.FAILURE) {
-                    if (err !== null) {
+                try {
+                    if (status === StatusEnum.FAILURE) {
                         this.downloadingMod = false;
-                        const existing = this.$store.state.download.allDownloads.find((dlObj: DownloadProgress) => {
-                            return dlObj.assignId === currentAssignId;
-                        });
-                        existing.failed = true;
-                        this.$store.commit('download/updateDownload', existing);
-                        DownloadModModal.addSolutionsToError(err);
-                        this.$store.commit('error/handleError', err);
-                        return;
+                        this.$store.commit('download/updateDownload', {assignId, failed: true});
+                        if (err !== null) {
+                            DownloadModModal.addSolutionsToError(err);
+                            this.$store.commit('error/handleError', err);
+                        }
+                    } else if (status === StatusEnum.PENDING) {
+                        this.$store.commit('download/updateDownload', {assignId, progress, modName});
                     }
-                } else if (status === StatusEnum.PENDING) {
-                    const obj = {
-                        progress: progress,
-                        modName: modName,
-                        initialMods: modsWithUpdates.map(value => `${value.getMod().getName()} (${value.getVersion().getVersionNumber().toString()})`),
-                        assignId: currentAssignId,
-                        failed: false,
+                } catch (e) {
+                    if (e instanceof R2Error) {
+                        this.$store.commit('error/handleError', e);
                     }
-                    this.$store.commit('download/updateDownload', obj);
                 }
-            }, (downloadedMods) => {
-                this.downloadCompletedCallback(downloadedMods);
+            }, async (downloadedMods) => {
+                await this.downloadCompletedCallback(downloadedMods);
                 this.downloadingMod = false;
             });
         }
 
-        downloadHandler(tsMod: ThunderstoreMod, tsVersion: ThunderstoreVersion) {
+        async downloadHandler(tsMod: ThunderstoreMod, tsVersion: ThunderstoreVersion) {
             this.closeModal();
 
-            const currentAssignId = this.$store.getters["download/currentDownload"]
-                ? this.$store.getters["download/currentDownload"].assignId + 1
-                : 0;
-
-            const progressObject = {
-                progress: 0,
-                initialMods: [`${tsMod.getName()} (${tsVersion.getVersionNumber().toString()})`],
-                modName: '',
-                assignId: currentAssignId,
-                failed: false,
-            };
-            this.$store.commit('download/addDownload', progressObject);
+            const assignId = await this.$store.dispatch(
+                'download/addDownload',
+                [`${tsMod.getName()} (${tsVersion.getVersionNumber().toString()})`]
+            );
 
             this.downloadingMod = true;
             setTimeout(() => {
                 ThunderstoreDownloaderProvider.instance.download(this.profile.asImmutableProfile(), tsMod, tsVersion, this.ignoreCache, (progress: number, modName: string, status: number, err: R2Error | null) => {
-                    if (status === StatusEnum.FAILURE) {
-                        if (err !== null) {
+                    try {
+                        if (status === StatusEnum.FAILURE) {
                             this.downloadingMod = false;
-                            const existing = this.$store.state.download.allDownloads.find((dlObj: DownloadProgress) => {
-                                return dlObj.assignId === currentAssignId;
-                            });
-                            existing.failed = true;
-                            this.$store.commit('download/updateDownload', existing);
-                            DownloadModModal.addSolutionsToError(err);
-                            this.$store.commit('error/handleError', err);
-                            return;
+                            this.$store.commit('download/updateDownload', {assignId, failed: true});
+                            if (err !== null) {
+                                DownloadModModal.addSolutionsToError(err);
+                                this.$store.commit('error/handleError', err);
+                            }
+                        } else if (status === StatusEnum.PENDING) {
+                            this.$store.commit('download/updateDownload', {assignId, progress, modName});
                         }
-                    } else if (status === StatusEnum.PENDING) {
-                        const obj = {
-                            progress: progress,
-                            initialMods: [`${tsMod.getName()} (${tsVersion.getVersionNumber().toString()})`],
-                            modName: modName,
-                            assignId: currentAssignId,
-                            failed: false,
+                    } catch (e) {
+                        if (e instanceof R2Error) {
+                            this.$store.commit('error/handleError', e);
                         }
-                        this.$store.commit('download/updateDownload', obj);
                     }
-                }, (downloadedMods) => {
-                    this.downloadCompletedCallback(downloadedMods);
+                }, async (downloadedMods) => {
+                    await this.downloadCompletedCallback(downloadedMods);
                     this.downloadingMod = false;
                 });
             }, 1);
diff --git a/src/store/modules/DownloadModule.ts b/src/store/modules/DownloadModule.ts
index 386cd9e2b..23851aae2 100644
--- a/src/store/modules/DownloadModule.ts
+++ b/src/store/modules/DownloadModule.ts
@@ -1,4 +1,4 @@
-import { GetterTree } from "vuex";
+import { ActionTree, GetterTree } from "vuex";
 
 import { State as RootState } from "../../store";
 import R2Error from "../../model/errors/R2Error";
@@ -11,6 +11,12 @@ export interface DownloadProgress {
     failed: boolean;
 }
 
+interface UpdateObject {
+    assignId: number;
+    progress?: number;
+    modName?: string;
+    failed?: boolean;
+}
 
 interface State {
     allDownloads: DownloadProgress[],
@@ -26,6 +32,21 @@ export const DownloadModule = {
         allDownloads: [],
     }),
 
+    actions: <ActionTree<State, RootState>>{
+        addDownload({state}, initialMods: string[]): number {
+            const assignId = state.allDownloads.length;
+            const downloadObject: DownloadProgress = {
+                assignId,
+                initialMods,
+                modName: '',
+                progress: 0,
+                failed: false,
+            };
+            state.allDownloads = [...state.allDownloads, downloadObject];
+            return assignId;
+        },
+    },
+
     getters: <GetterTree<State, RootState>>{
         activeDownloadCount(state) {
             const active = state.allDownloads.filter(
@@ -39,23 +60,18 @@ export const DownloadModule = {
     },
 
     mutations: {
-        addDownload(state: State, downloadObject: DownloadProgress) {
-            state.allDownloads = [...state.allDownloads, downloadObject];
-        },
-        updateDownload(state: State, downloadObject: DownloadProgress) {
-            const newVersions = [...state.allDownloads];
-            const index = newVersions.findIndex((oldDownloadObject: DownloadProgress) => {
-                return oldDownloadObject.assignId === downloadObject.assignId;
-            });
-            if (index === -1) {
+        updateDownload(state: State, update: UpdateObject) {
+            const newDownloads = [...state.allDownloads];
+            if (newDownloads[update.assignId].assignId !== update.assignId) {
                 throw new R2Error(
                     'Failed to update download status.',
-                    'Download status object with a specified index was not found, which means that there\'s a mismatch between the download statuses in memory and what\'s being iterated over.',
+                    `DownloadProgress with id of ${update.assignId} didn't have the correct assignId.`,
                     'Try initiating the download again or restarting the app.'
                 );
+            } else {
+                newDownloads[update.assignId] = {...newDownloads[update.assignId], ...update};
+                state.allDownloads = newDownloads;
             }
-            newVersions[index] = downloadObject;
-            state.allDownloads = newVersions;
         },
     },
 }

From 6f5be37230488821c2da2bf9bce95eaae476438b Mon Sep 17 00:00:00 2001
From: Vili Manninen <vili.manninen@riskidev.fi>
Date: Tue, 7 Jan 2025 14:39:29 +0200
Subject: [PATCH 58/95] Improve error handling logic and do some cleanup

---
 src/components/views/DownloadModModal.vue | 16 +++++-----------
 src/store/modules/DownloadModule.ts       |  5 ++---
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/components/views/DownloadModModal.vue b/src/components/views/DownloadModModal.vue
index 1efe089f8..a21261fda 100644
--- a/src/components/views/DownloadModModal.vue
+++ b/src/components/views/DownloadModModal.vue
@@ -105,9 +105,7 @@ import ProfileModList from '../../r2mm/mods/ProfileModList';
                                 store.commit('download/updateDownload', {assignId, progress, modName});
                             }
                         } catch (e) {
-                            if (e instanceof R2Error) {
-                                store.commit('error/handleError', e);
-                            }
+                            return reject(e);
                         }
                     }, async (downloadedMods: ThunderstoreCombo[]) => {
                         ProfileModList.requestLock(async () => {
@@ -151,15 +149,13 @@ import ProfileModList from '../../r2mm/mods/ProfileModList';
                         this.$store.commit('download/updateDownload', {assignId, failed: true});
                         if (err !== null) {
                             DownloadModModal.addSolutionsToError(err);
-                            this.$store.commit('error/handleError', err);
+                            throw err;
                         }
                     } else if (status === StatusEnum.PENDING) {
                         this.$store.commit('download/updateDownload', {assignId, progress, modName});
                     }
                 } catch (e) {
-                    if (e instanceof R2Error) {
-                        this.$store.commit('error/handleError', e);
-                    }
+                    this.$store.commit('error/handleError', e);
                 }
             }, async (downloadedMods) => {
                 await this.downloadCompletedCallback(downloadedMods);
@@ -184,15 +180,13 @@ import ProfileModList from '../../r2mm/mods/ProfileModList';
                             this.$store.commit('download/updateDownload', {assignId, failed: true});
                             if (err !== null) {
                                 DownloadModModal.addSolutionsToError(err);
-                                this.$store.commit('error/handleError', err);
+                                throw err;
                             }
                         } else if (status === StatusEnum.PENDING) {
                             this.$store.commit('download/updateDownload', {assignId, progress, modName});
                         }
                     } catch (e) {
-                        if (e instanceof R2Error) {
-                            this.$store.commit('error/handleError', e);
-                        }
+                        this.$store.commit('error/handleError', e);
                     }
                 }, async (downloadedMods) => {
                     await this.downloadCompletedCallback(downloadedMods);
diff --git a/src/store/modules/DownloadModule.ts b/src/store/modules/DownloadModule.ts
index 23851aae2..31cab3a51 100644
--- a/src/store/modules/DownloadModule.ts
+++ b/src/store/modules/DownloadModule.ts
@@ -68,10 +68,9 @@ export const DownloadModule = {
                     `DownloadProgress with id of ${update.assignId} didn't have the correct assignId.`,
                     'Try initiating the download again or restarting the app.'
                 );
-            } else {
-                newDownloads[update.assignId] = {...newDownloads[update.assignId], ...update};
-                state.allDownloads = newDownloads;
             }
+            newDownloads[update.assignId] = {...newDownloads[update.assignId], ...update};
+            state.allDownloads = newDownloads;
         },
     },
 }

From e2ff723103348508f0ad893bff904e13034b64bf Mon Sep 17 00:00:00 2001
From: Vili Manninen <vili.manninen@riskidev.fi>
Date: Tue, 7 Jan 2025 15:40:06 +0200
Subject: [PATCH 59/95] Fix a bug where error handling would be stopping
 downloads

---
 src/components/views/DownloadModModal.vue |  4 ++--
 src/store/modules/DownloadModule.ts       | 23 ++++++++++++++++++++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/components/views/DownloadModModal.vue b/src/components/views/DownloadModModal.vue
index a21261fda..2ff178f36 100644
--- a/src/components/views/DownloadModModal.vue
+++ b/src/components/views/DownloadModModal.vue
@@ -155,7 +155,7 @@ import ProfileModList from '../../r2mm/mods/ProfileModList';
                         this.$store.commit('download/updateDownload', {assignId, progress, modName});
                     }
                 } catch (e) {
-                    this.$store.commit('error/handleError', e);
+                    this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
                 }
             }, async (downloadedMods) => {
                 await this.downloadCompletedCallback(downloadedMods);
@@ -186,7 +186,7 @@ import ProfileModList from '../../r2mm/mods/ProfileModList';
                             this.$store.commit('download/updateDownload', {assignId, progress, modName});
                         }
                     } catch (e) {
-                        this.$store.commit('error/handleError', e);
+                        this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
                     }
                 }, async (downloadedMods) => {
                     await this.downloadCompletedCallback(downloadedMods);
diff --git a/src/store/modules/DownloadModule.ts b/src/store/modules/DownloadModule.ts
index 31cab3a51..01214c9c0 100644
--- a/src/store/modules/DownloadModule.ts
+++ b/src/store/modules/DownloadModule.ts
@@ -62,13 +62,30 @@ export const DownloadModule = {
     mutations: {
         updateDownload(state: State, update: UpdateObject) {
             const newDownloads = [...state.allDownloads];
-            if (newDownloads[update.assignId].assignId !== update.assignId) {
-                throw new R2Error(
+            const index = newDownloads.findIndex((old: DownloadProgress) => {
+                return old.assignId === update.assignId;
+            });
+
+            if (index === -1) {
+                // The DownloadProgress by the ID from the update wasn't found at all.
+                const err = new R2Error(
                     'Failed to update download status.',
-                    `DownloadProgress with id of ${update.assignId} didn't have the correct assignId.`,
+                    `DownloadProgress with assign id of ${update.assignId} wasn't found.`,
                     'Try initiating the download again or restarting the app.'
                 );
+                // Only throw if the download failed, otherwise just console.log() it.
+                if (update.failed) {
+                    throw err;
+                }
+                console.warn(err);
+                return;
+            }
+
+            if (index !== update.assignId) {
+                // Just as a bonus, log if the DownloadProgress by the ID was located at the corresponding index of the array.
+                console.log(`There was a mismatch between download update\'s assign ID (${update.assignId}) and the index it was found at (${index}).`);
             }
+
             newDownloads[update.assignId] = {...newDownloads[update.assignId], ...update};
             state.allDownloads = newDownloads;
         },

From a47e86bc6f9508a5f316c4da99a6592ba855754d Mon Sep 17 00:00:00 2001
From: VilppeRiskidev <vili.manninen@riskidev.fi>
Date: Wed, 8 Jan 2025 14:15:26 +0200
Subject: [PATCH 60/95] Clean up the download state management Vuex store and
 it's usages

---
 src/store/modules/DownloadModule.ts | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/store/modules/DownloadModule.ts b/src/store/modules/DownloadModule.ts
index 01214c9c0..8541af05e 100644
--- a/src/store/modules/DownloadModule.ts
+++ b/src/store/modules/DownloadModule.ts
@@ -68,25 +68,15 @@ export const DownloadModule = {
 
             if (index === -1) {
                 // The DownloadProgress by the ID from the update wasn't found at all.
-                const err = new R2Error(
-                    'Failed to update download status.',
-                    `DownloadProgress with assign id of ${update.assignId} wasn't found.`,
-                    'Try initiating the download again or restarting the app.'
-                );
-                // Only throw if the download failed, otherwise just console.log() it.
-                if (update.failed) {
-                    throw err;
-                }
-                console.warn(err);
+                console.warn(`Couldn\'t find DownloadProgress object with assignId ${update.assignId}.`);
                 return;
             }
 
             if (index !== update.assignId) {
-                // Just as a bonus, log if the DownloadProgress by the ID was located at the corresponding index of the array.
                 console.log(`There was a mismatch between download update\'s assign ID (${update.assignId}) and the index it was found at (${index}).`);
             }
 
-            newDownloads[update.assignId] = {...newDownloads[update.assignId], ...update};
+            newDownloads[index] = {...newDownloads[index], ...update};
             state.allDownloads = newDownloads;
         },
     },

From dd07a4943ba20d39338e5150665ec25a6f3883b2 Mon Sep 17 00:00:00 2001
From: VilppeRiskidev <vili.manninen@riskidev.fi>
Date: Wed, 8 Jan 2025 15:02:42 +0200
Subject: [PATCH 61/95] Separate UpdateAllInstalledModsModal to its own
 component

---
 src/components/mixins/DownloadMixin.vue       | 25 ++++++
 src/components/views/DownloadModModal.vue     | 83 ++-----------------
 .../views/UpdateAllInstalledModsModal.vue     | 73 ++++++++++++++++
 3 files changed, 103 insertions(+), 78 deletions(-)
 create mode 100644 src/components/views/UpdateAllInstalledModsModal.vue

diff --git a/src/components/mixins/DownloadMixin.vue b/src/components/mixins/DownloadMixin.vue
index 04b7b187d..d9efbb1bf 100644
--- a/src/components/mixins/DownloadMixin.vue
+++ b/src/components/mixins/DownloadMixin.vue
@@ -13,6 +13,8 @@ import { installModsAndResolveConflicts } from "../../utils/ProfileUtils";
 @Component
 export default class DownloadMixin extends Vue {
 
+    downloadingMod: boolean = false;
+
     get activeGame(): Game {
         return this.$store.state.activeGame;
     }
@@ -25,6 +27,11 @@ export default class DownloadMixin extends Vue {
         return this.$store.state.modals.isDownloadModModalOpen;
     }
 
+    get ignoreCache(): boolean {
+        const settings = this.$store.getters['settings'];
+        return settings.getContext().global.ignoreCache;
+    }
+
     get thunderstoreMod(): ThunderstoreMod | null {
         return this.$store.state.modals.downloadModModalMod;
     }
@@ -40,5 +47,23 @@ export default class DownloadMixin extends Vue {
             this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
         }
     }
+
+    static addSolutionsToError(err: R2Error): void {
+        // Sanity check typing.
+        if (!(err instanceof R2Error)) {
+            return;
+        }
+
+        if (
+            err.name.includes("Failed to download mod") ||
+            err.name.includes("System.Net.WebException")
+        ) {
+            err.solution = "Try toggling the preferred Thunderstore CDN in the settings";
+        }
+
+        if (err.message.includes("System.IO.PathTooLongException")) {
+            err.solution = 'Using "Change data folder" option in the settings to select a shorter path might solve the issue';
+        }
+    }
 }
 </script>
diff --git a/src/components/views/DownloadModModal.vue b/src/components/views/DownloadModModal.vue
index 2ff178f36..a4313e336 100644
--- a/src/components/views/DownloadModModal.vue
+++ b/src/components/views/DownloadModModal.vue
@@ -16,26 +16,7 @@
             <button class="modal-close is-large" aria-label="close" @click="downloadingMod = false;"></button>
         </div>
         <DownloadModVersionSelectModal @download-mod="downloadHandler" />
-        <ModalCard :is-active="isOpen" :can-close="true" v-if="thunderstoreMod === null" @close-modal="closeModal()">
-            <template v-slot:header>
-                <h2 class='modal-title'>Update all installed mods</h2>
-            </template>
-            <template v-slot:body>
-                <p>All installed mods will be updated to their latest versions.</p>
-                <p>Any missing dependencies will be installed.</p>
-                <p>The following mods will be downloaded and installed:</p>
-                <br/>
-                <ul class="list">
-                    <li class="list-item" v-for='(mod, index) in $store.getters["profile/modsWithUpdates"]'
-                        :key='`to-update-${index}-${mod.getFullName()}`'>
-                        {{mod.getName()}} will be updated to: {{mod.getLatestVersion()}}
-                    </li>
-                </ul>
-            </template>
-            <template v-slot:footer>
-                <button class="button is-info" @click="downloadLatest()">Update all</button>
-            </template>
-        </ModalCard>
+        <UpdateAllInstalledModsModal />
     </div>
 </template>
 
@@ -48,6 +29,7 @@ import { Store } from "vuex";
 import { Progress } from '../all';
 import ModalCard from '../ModalCard.vue';
 import DownloadModVersionSelectModal from "../../components/views/DownloadModVersionSelectModal.vue";
+import UpdateAllInstalledModsModal from "../../components/views/UpdateAllInstalledModsModal.vue";
 import DownloadMixin from "../mixins/DownloadMixin.vue";
 import StatusEnum from '../../model/enums/StatusEnum';
 import R2Error from '../../model/errors/R2Error';
@@ -64,19 +46,13 @@ import ProfileModList from '../../r2mm/mods/ProfileModList';
     @Component({
         components: {
             DownloadModVersionSelectModal,
+            UpdateAllInstalledModsModal,
             ModalCard,
             Progress
         }
     })
     export default class DownloadModModal extends mixins(DownloadMixin) {
 
-        downloadingMod: boolean = false;
-
-        get ignoreCache(): boolean {
-            const settings = this.$store.getters['settings'];
-            return settings.getContext().global.ignoreCache;
-        }
-
         public static async downloadSpecific(
             profile: Profile,
             combo: ThunderstoreCombo,
@@ -98,7 +74,7 @@ import ProfileModList from '../../r2mm/mods/ProfileModList';
                             if (status === StatusEnum.FAILURE) {
                                 store.commit('download/updateDownload', {assignId, failed: true});
                                 if (err !== null) {
-                                    DownloadModModal.addSolutionsToError(err);
+                                    DownloadMixin.addSolutionsToError(err);
                                     return reject(err);
                                 }
                             } else if (status === StatusEnum.PENDING) {
@@ -132,37 +108,6 @@ import ProfileModList from '../../r2mm/mods/ProfileModList';
             });
         }
 
-        async downloadLatest() {
-            this.closeModal();
-            const modsWithUpdates: ThunderstoreCombo[] = await this.$store.dispatch('profile/getCombosWithUpdates');
-
-            const assignId = await this.$store.dispatch(
-                'download/addDownload',
-                modsWithUpdates.map(value => `${value.getMod().getName()} (${value.getVersion().toString()})`)
-            );
-
-            this.downloadingMod = true;
-            ThunderstoreDownloaderProvider.instance.downloadLatestOfAll(modsWithUpdates, this.ignoreCache, (progress: number, modName: string, status: number, err: R2Error | null) => {
-                try {
-                    if (status === StatusEnum.FAILURE) {
-                        this.downloadingMod = false;
-                        this.$store.commit('download/updateDownload', {assignId, failed: true});
-                        if (err !== null) {
-                            DownloadModModal.addSolutionsToError(err);
-                            throw err;
-                        }
-                    } else if (status === StatusEnum.PENDING) {
-                        this.$store.commit('download/updateDownload', {assignId, progress, modName});
-                    }
-                } catch (e) {
-                    this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
-                }
-            }, async (downloadedMods) => {
-                await this.downloadCompletedCallback(downloadedMods);
-                this.downloadingMod = false;
-            });
-        }
-
         async downloadHandler(tsMod: ThunderstoreMod, tsVersion: ThunderstoreVersion) {
             this.closeModal();
 
@@ -179,7 +124,7 @@ import ProfileModList from '../../r2mm/mods/ProfileModList';
                             this.downloadingMod = false;
                             this.$store.commit('download/updateDownload', {assignId, failed: true});
                             if (err !== null) {
-                                DownloadModModal.addSolutionsToError(err);
+                                DownloadMixin.addSolutionsToError(err);
                                 throw err;
                             }
                         } else if (status === StatusEnum.PENDING) {
@@ -237,24 +182,6 @@ import ProfileModList from '../../r2mm/mods/ProfileModList';
                 return resolve();
             });
         }
-
-        static addSolutionsToError(err: R2Error): void {
-            // Sanity check typing.
-            if (!(err instanceof R2Error)) {
-                return;
-            }
-
-            if (
-                err.name.includes("Failed to download mod") ||
-                err.name.includes("System.Net.WebException")
-            ) {
-                err.solution = "Try toggling the preferred Thunderstore CDN in the settings";
-            }
-
-            if (err.message.includes("System.IO.PathTooLongException")) {
-                err.solution = 'Using "Change data folder" option in the settings to select a shorter path might solve the issue';
-            }
-        }
     }
 
 </script>
diff --git a/src/components/views/UpdateAllInstalledModsModal.vue b/src/components/views/UpdateAllInstalledModsModal.vue
new file mode 100644
index 000000000..d510f58f6
--- /dev/null
+++ b/src/components/views/UpdateAllInstalledModsModal.vue
@@ -0,0 +1,73 @@
+<template>
+    <ModalCard :is-active="isOpen" :can-close="true" v-if="thunderstoreMod === null" @close-modal="closeModal()">
+        <template v-slot:header>
+            <h2 class='modal-title'>Update all installed mods</h2>
+        </template>
+        <template v-slot:body>
+            <p>All installed mods will be updated to their latest versions.</p>
+            <p>Any missing dependencies will be installed.</p>
+            <p>The following mods will be downloaded and installed:</p>
+            <br/>
+            <ul class="list">
+                <li class="list-item" v-for='(mod, index) in $store.getters["profile/modsWithUpdates"]'
+                    :key='`to-update-${index}-${mod.getFullName()}`'>
+                    {{mod.getName()}} will be updated to: {{mod.getLatestVersion()}}
+                </li>
+            </ul>
+        </template>
+        <template v-slot:footer>
+            <button class="button is-info" @click="downloadLatest()">Update all</button>
+        </template>
+    </ModalCard>
+</template>
+
+<script lang="ts">
+import { mixins } from "vue-class-component";
+import { Component } from "vue-property-decorator";
+
+import ModalCard from "../ModalCard.vue";
+import DownloadMixin from "../mixins/DownloadMixin.vue";
+import DownloadModVersionSelectModal from "../views/DownloadModVersionSelectModal.vue";
+import ThunderstoreCombo from "../../model/ThunderstoreCombo";
+import StatusEnum from "../../model/enums/StatusEnum";
+import R2Error from "../../model/errors/R2Error";
+import ThunderstoreDownloaderProvider from "../../providers/ror2/downloading/ThunderstoreDownloaderProvider";
+
+@Component({
+    components: {DownloadModVersionSelectModal, ModalCard}
+})
+export default class UpdateAllInstalledModsModal extends mixins(DownloadMixin)  {
+
+
+    async downloadLatest() {
+        this.closeModal();
+        const modsWithUpdates: ThunderstoreCombo[] = await this.$store.dispatch('profile/getCombosWithUpdates');
+
+        const assignId = await this.$store.dispatch(
+            'download/addDownload',
+            modsWithUpdates.map(value => `${value.getMod().getName()} (${value.getVersion().toString()})`)
+        );
+
+        this.downloadingMod = true;
+        ThunderstoreDownloaderProvider.instance.downloadLatestOfAll(modsWithUpdates, this.ignoreCache, (progress: number, modName: string, status: number, err: R2Error | null) => {
+            try {
+                if (status === StatusEnum.FAILURE) {
+                    this.downloadingMod = false;
+                    this.$store.commit('download/updateDownload', {assignId, failed: true});
+                    if (err !== null) {
+                        DownloadMixin.addSolutionsToError(err);
+                        throw err;
+                    }
+                } else if (status === StatusEnum.PENDING) {
+                    this.$store.commit('download/updateDownload', {assignId, progress, modName});
+                }
+            } catch (e) {
+                this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
+            }
+        }, async (downloadedMods) => {
+            await this.downloadCompletedCallback(downloadedMods);
+            this.downloadingMod = false;
+        });
+    }
+}
+</script>

From 20c436641fa65e588f7cd2af676a9be64bb8dda2 Mon Sep 17 00:00:00 2001
From: VilppeRiskidev <vili.manninen@riskidev.fi>
Date: Wed, 8 Jan 2025 15:24:27 +0200
Subject: [PATCH 62/95] Move download progress modal open state management to
 vuex store

---
 src/components/mixins/DownloadMixin.vue              |  2 --
 src/components/views/DownloadModModal.vue            | 12 ++++++------
 src/components/views/UpdateAllInstalledModsModal.vue | 10 +++++-----
 src/store/modules/DownloadModule.ts                  |  5 +++++
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/components/mixins/DownloadMixin.vue b/src/components/mixins/DownloadMixin.vue
index d9efbb1bf..a4e5b721e 100644
--- a/src/components/mixins/DownloadMixin.vue
+++ b/src/components/mixins/DownloadMixin.vue
@@ -13,8 +13,6 @@ import { installModsAndResolveConflicts } from "../../utils/ProfileUtils";
 @Component
 export default class DownloadMixin extends Vue {
 
-    downloadingMod: boolean = false;
-
     get activeGame(): Game {
         return this.$store.state.activeGame;
     }
diff --git a/src/components/views/DownloadModModal.vue b/src/components/views/DownloadModModal.vue
index a4313e336..7b17d809d 100644
--- a/src/components/views/DownloadModModal.vue
+++ b/src/components/views/DownloadModModal.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
-        <div id='downloadProgressModal' :class="['modal', {'is-active':downloadingMod}]" v-if="$store.getters['download/currentDownload'] !== null">
-            <div class="modal-background" @click="downloadingMod = false;"></div>
+        <div id='downloadProgressModal' :class="['modal', {'is-active':$store.state.download.isModProgressModalOpen}]" v-if="$store.getters['download/currentDownload'] !== null">
+            <div class="modal-background" @click="$store.commit('download/setIsModProgressModalOpen', false);"></div>
             <div class='modal-content'>
                 <div class='notification is-info'>
                     <h3 class='title'>Downloading {{$store.getters['download/currentDownload'].modName}}</h3>
@@ -13,7 +13,7 @@
                     />
                 </div>
             </div>
-            <button class="modal-close is-large" aria-label="close" @click="downloadingMod = false;"></button>
+            <button class="modal-close is-large" aria-label="close" @click="$store.commit('download/setIsModProgressModalOpen', false);"></button>
         </div>
         <DownloadModVersionSelectModal @download-mod="downloadHandler" />
         <UpdateAllInstalledModsModal />
@@ -116,12 +116,12 @@ import ProfileModList from '../../r2mm/mods/ProfileModList';
                 [`${tsMod.getName()} (${tsVersion.getVersionNumber().toString()})`]
             );
 
-            this.downloadingMod = true;
+            this.$store.commit('download/setIsModProgressModalOpen', true);
             setTimeout(() => {
                 ThunderstoreDownloaderProvider.instance.download(this.profile.asImmutableProfile(), tsMod, tsVersion, this.ignoreCache, (progress: number, modName: string, status: number, err: R2Error | null) => {
                     try {
                         if (status === StatusEnum.FAILURE) {
-                            this.downloadingMod = false;
+                            this.$store.commit('download/setIsModProgressModalOpen', false);
                             this.$store.commit('download/updateDownload', {assignId, failed: true});
                             if (err !== null) {
                                 DownloadMixin.addSolutionsToError(err);
@@ -135,7 +135,7 @@ import ProfileModList from '../../r2mm/mods/ProfileModList';
                     }
                 }, async (downloadedMods) => {
                     await this.downloadCompletedCallback(downloadedMods);
-                    this.downloadingMod = false;
+                    this.$store.commit('download/setIsModProgressModalOpen', false);
                 });
             }, 1);
         }
diff --git a/src/components/views/UpdateAllInstalledModsModal.vue b/src/components/views/UpdateAllInstalledModsModal.vue
index d510f58f6..506b87655 100644
--- a/src/components/views/UpdateAllInstalledModsModal.vue
+++ b/src/components/views/UpdateAllInstalledModsModal.vue
@@ -16,7 +16,7 @@
             </ul>
         </template>
         <template v-slot:footer>
-            <button class="button is-info" @click="downloadLatest()">Update all</button>
+            <button class="button is-info" @click="updateAllToLatestVersion()">Update all</button>
         </template>
     </ModalCard>
 </template>
@@ -39,7 +39,7 @@ import ThunderstoreDownloaderProvider from "../../providers/ror2/downloading/Thu
 export default class UpdateAllInstalledModsModal extends mixins(DownloadMixin)  {
 
 
-    async downloadLatest() {
+    async updateAllToLatestVersion() {
         this.closeModal();
         const modsWithUpdates: ThunderstoreCombo[] = await this.$store.dispatch('profile/getCombosWithUpdates');
 
@@ -48,11 +48,11 @@ export default class UpdateAllInstalledModsModal extends mixins(DownloadMixin)
             modsWithUpdates.map(value => `${value.getMod().getName()} (${value.getVersion().toString()})`)
         );
 
-        this.downloadingMod = true;
+        this.$store.commit('download/setIsModProgressModalOpen', true);
         ThunderstoreDownloaderProvider.instance.downloadLatestOfAll(modsWithUpdates, this.ignoreCache, (progress: number, modName: string, status: number, err: R2Error | null) => {
             try {
                 if (status === StatusEnum.FAILURE) {
-                    this.downloadingMod = false;
+                    this.$store.commit('download/setIsModProgressModalOpen', false);
                     this.$store.commit('download/updateDownload', {assignId, failed: true});
                     if (err !== null) {
                         DownloadMixin.addSolutionsToError(err);
@@ -66,7 +66,7 @@ export default class UpdateAllInstalledModsModal extends mixins(DownloadMixin)
             }
         }, async (downloadedMods) => {
             await this.downloadCompletedCallback(downloadedMods);
-            this.downloadingMod = false;
+            this.$store.commit('download/setIsModProgressModalOpen', false);
         });
     }
 }
diff --git a/src/store/modules/DownloadModule.ts b/src/store/modules/DownloadModule.ts
index 8541af05e..f6a9f12c5 100644
--- a/src/store/modules/DownloadModule.ts
+++ b/src/store/modules/DownloadModule.ts
@@ -20,6 +20,7 @@ interface UpdateObject {
 
 interface State {
     allDownloads: DownloadProgress[],
+    isModProgressModalOpen: boolean,
 }
 
 /**
@@ -30,6 +31,7 @@ export const DownloadModule = {
 
     state: (): State => ({
         allDownloads: [],
+        isModProgressModalOpen: false,
     }),
 
     actions: <ActionTree<State, RootState>>{
@@ -79,5 +81,8 @@ export const DownloadModule = {
             newDownloads[index] = {...newDownloads[index], ...update};
             state.allDownloads = newDownloads;
         },
+        setIsModProgressModalOpen(state: State, isModProgressModalOpen: boolean) {
+            state.isModProgressModalOpen = isModProgressModalOpen;
+        }
     },
 }

From 0157450425dce2e71dd33d70822d5147adbd63a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Mon, 23 Dec 2024 11:18:12 +0200
Subject: [PATCH 63/95] Add setting for resetting online mod list stored in
 IndexedDB

This debug option can be used if the mod list stored in IndexedDB is
corrupted, preventing it from being loaded into Vuex. Otherwise user
would have to wait for a new version of the mod list to be available on
Thunderstore API and hoping the update fixes the issue.
---
 .../settings-components/SettingsView.vue      |  8 ++++++
 src/r2mm/manager/PackageDexieStore.ts         | 20 ++++++++++++++
 src/store/modules/TsModsModule.ts             | 26 +++++++++++++++++++
 3 files changed, 54 insertions(+)

diff --git a/src/components/settings-components/SettingsView.vue b/src/components/settings-components/SettingsView.vue
index be50a4328..df0d6115f 100644
--- a/src/components/settings-components/SettingsView.vue
+++ b/src/components/settings-components/SettingsView.vue
@@ -185,6 +185,14 @@ import CdnProvider from '../../providers/generic/connection/CdnProvider';
                 'fa-trash',
                 () => this.emitInvoke('CleanCache')
             ),
+            new SettingsRow(
+                'Debugging',
+                'Clean online mod list',
+                'Deletes local copy of mod list, forcing the next refresh to fetch a new one.',
+                async () => this.$store.dispatch('tsMods/getActiveGameCacheStatus'),
+                'fa-trash',
+                () => this.$store.dispatch('tsMods/resetActiveGameCache')
+            ),
             new SettingsRow(
                 'Debugging',
                 'Toggle preferred Thunderstore CDN',
diff --git a/src/r2mm/manager/PackageDexieStore.ts b/src/r2mm/manager/PackageDexieStore.ts
index 216209ff5..c870a267e 100644
--- a/src/r2mm/manager/PackageDexieStore.ts
+++ b/src/r2mm/manager/PackageDexieStore.ts
@@ -141,6 +141,18 @@ export async function getVersionAsThunderstoreVersion(community: string, package
     return ThunderstoreVersion.parseFromThunderstoreData(version);
 }
 
+export async function hasEntries(community: string): Promise<boolean> {
+    if (await db.indexHashes.where({community}).count()) {
+        return true;
+    }
+
+    if (await db.packages.where({community}).count()) {
+        return true;
+    }
+
+    return false;
+}
+
 export async function isLatestPackageListIndex(community: string, hash: string) {
     return Boolean(
         await db.indexHashes.where({community, hash}).count()
@@ -159,6 +171,14 @@ export async function pruneRemovedMods(community: string, cutoff: Date) {
     await db.packages.bulkDelete(oldIds);
 }
 
+export async function resetCommunity(community: string) {
+    await db.transaction('rw', db.packages, db.indexHashes, async () => {
+        const packageIds = await db.packages.where({community}).primaryKeys();
+        await db.packages.bulkDelete(packageIds);
+        await db.indexHashes.where({community}).delete();
+    });
+}
+
 export async function upsertPackageListChunk(community: string, packageChunk: any[]) {
     const extra = {community, date_fetched: new Date()};
     const newPackages: DexiePackage[] = packageChunk.map((pkg) => ({...pkg, ...extra}));
diff --git a/src/store/modules/TsModsModule.ts b/src/store/modules/TsModsModule.ts
index 3a2978e22..9318512e7 100644
--- a/src/store/modules/TsModsModule.ts
+++ b/src/store/modules/TsModsModule.ts
@@ -293,6 +293,16 @@ export const TsModsModule = {
             return updated !== undefined;
         },
 
+        async getActiveGameCacheStatus({state, rootState}) {
+            if (state.isThunderstoreModListUpdateInProgress) {
+                return "Online mod list is currently updating, please wait for the operation to complete";
+            }
+
+            return (await PackageDb.hasEntries(rootState.activeGame.internalFolderName))
+                ? `${rootState.activeGame.displayName} has a local copy of online mod list`
+                : `${rootState.activeGame.displayName} has no local copy stored`;
+        },
+
         async prewarmCache({getters, rootGetters}) {
             const profileMods: ManifestV2[] = rootGetters['profile/modList'];
             profileMods.forEach(getters['cachedMod']);
@@ -303,6 +313,22 @@ export const TsModsModule = {
             await PackageDb.pruneRemovedMods(community, cutoff);
         },
 
+        async resetActiveGameCache({commit, rootState, state}) {
+            if (state.isThunderstoreModListUpdateInProgress) {
+                return;
+            }
+
+            commit('startThunderstoreModListUpdate');
+            const community = rootState.activeGame.internalFolderName;
+
+            try {
+                commit('setThunderstoreModListUpdateStatus', 'Resetting mod list cache...');
+                await PackageDb.resetCommunity(community);
+            } finally {
+                commit('finishThunderstoreModListUpdate');
+            }
+        },
+
         async updateExclusions({commit}) {
             // Read exclusion list from a bundled file to have some values available ASAP.
             const exclusionList: {exclusions: string[]} = require('../../../modExclusions.json');

From e62b2e6b761860be7811b1e1169df53c0a9c52af Mon Sep 17 00:00:00 2001
From: VilppeRiskidev <vili.manninen@riskidev.fi>
Date: Fri, 10 Jan 2025 14:09:13 +0200
Subject: [PATCH 64/95] Simplify DownloadMonitor by getting rid of timeout and
 instead calling the Vuex store directly in the template

---
 src/pages/DownloadMonitor.vue       | 20 ++------------------
 src/store/modules/DownloadModule.ts |  5 ++++-
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/pages/DownloadMonitor.vue b/src/pages/DownloadMonitor.vue
index 40200f608..c30f336fa 100644
--- a/src/pages/DownloadMonitor.vue
+++ b/src/pages/DownloadMonitor.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <Hero title="Downloads" subtitle="Monitor progress of downloads" hero-type="primary"/>
-        <template v-if="activeDownloads.length === 0">
+        <template v-if="$store.state.download.allDownloads.length === 0">
             <div class='text-center top'>
                 <div class="margin-right">
                     <br/>
@@ -13,7 +13,7 @@
             </div>
         </template>
         <template v-else>
-            <div v-for="(downloadObject, index) of activeDownloads" :key="`download-progress-${index}`">
+            <div v-for="(downloadObject, index) of $store.getters['download/newestFirst']" :key="`download-progress-${index}`">
                 <div>
                     <div class="container margin-right">
                         <div class="border-at-bottom pad pad--sides">
@@ -42,12 +42,10 @@
 
 <script lang="ts">
 
-import Timeout = NodeJS.Timeout;
 import { Component, Vue } from 'vue-property-decorator';
 
 import { Hero } from '../components/all';
 import Progress from '../components/Progress.vue';
-import { DownloadProgress } from "../store/modules/DownloadModule";
 
 @Component({
     components: {
@@ -56,20 +54,6 @@ import { DownloadProgress } from "../store/modules/DownloadModule";
     }
 })
 export default class DownloadMonitor extends Vue {
-    private refreshInterval!: Timeout;
-    private activeDownloads: DownloadProgress[] = [];
-
-    created() {
-        this.activeDownloads = [...this.$store.state.download.allDownloads].reverse();
-        this.refreshInterval = setInterval(() => {
-            this.activeDownloads = [...this.$store.state.download.allDownloads].reverse();
-        }, 100);
-    }
-
-    destroyed() {
-        clearInterval(this.refreshInterval);
-    }
-
 }
 
 </script>
diff --git a/src/store/modules/DownloadModule.ts b/src/store/modules/DownloadModule.ts
index f6a9f12c5..2fa0bb09a 100644
--- a/src/store/modules/DownloadModule.ts
+++ b/src/store/modules/DownloadModule.ts
@@ -3,7 +3,7 @@ import { ActionTree, GetterTree } from "vuex";
 import { State as RootState } from "../../store";
 import R2Error from "../../model/errors/R2Error";
 
-export interface DownloadProgress {
+interface DownloadProgress {
     assignId: number;
     initialMods: string[];
     modName: string;
@@ -59,6 +59,9 @@ export const DownloadModule = {
         currentDownload(state) {
             return state.allDownloads[state.allDownloads.length-1] || null;
         },
+        newestFirst(state) {
+            return Array.from(state.allDownloads).reverse();
+        },
     },
 
     mutations: {

From fa651658954f8fa7fd87d948510b8930892256c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Wed, 15 Jan 2025 09:29:12 +0200
Subject: [PATCH 65/95] Fix version number stringification when updating all
 installed mods

---
 src/components/views/UpdateAllInstalledModsModal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/UpdateAllInstalledModsModal.vue b/src/components/views/UpdateAllInstalledModsModal.vue
index 506b87655..d65cbc368 100644
--- a/src/components/views/UpdateAllInstalledModsModal.vue
+++ b/src/components/views/UpdateAllInstalledModsModal.vue
@@ -45,7 +45,7 @@ export default class UpdateAllInstalledModsModal extends mixins(DownloadMixin)
 
         const assignId = await this.$store.dispatch(
             'download/addDownload',
-            modsWithUpdates.map(value => `${value.getMod().getName()} (${value.getVersion().toString()})`)
+            modsWithUpdates.map(value => `${value.getMod().getName()} (${value.getVersion().getVersionNumber().toString()})`)
         );
 
         this.$store.commit('download/setIsModProgressModalOpen', true);

From e211c04fd9495417eebf3b12d7711a1f58212577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Thu, 16 Jan 2025 10:46:45 +0200
Subject: [PATCH 66/95] Reset cache update date shown on UI when the cache is
 purged

---
 src/store/modules/TsModsModule.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/store/modules/TsModsModule.ts b/src/store/modules/TsModsModule.ts
index 9318512e7..42018c5ea 100644
--- a/src/store/modules/TsModsModule.ts
+++ b/src/store/modules/TsModsModule.ts
@@ -324,6 +324,7 @@ export const TsModsModule = {
             try {
                 commit('setThunderstoreModListUpdateStatus', 'Resetting mod list cache...');
                 await PackageDb.resetCommunity(community);
+                commit('setModsLastUpdated', undefined);
             } finally {
                 commit('finishThunderstoreModListUpdate');
             }

From b44ae70321d85f1363371e7a4390441249eea67c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Thu, 16 Jan 2025 11:51:38 +0200
Subject: [PATCH 67/95] Cache whether the active game has a package list in
 IndexedDB

SettingRow items update their value for on one second interval. While
reading the status from IndexedDB isn't a noticeable performance hit
(at least on my PC), it becomes an issue if checking the status throws
an error. In those cases TSMM's Sentry gets bombarded with an error
every second users stays on the settings screen.

Cache invalidation obviously makes the implementation more complex. The
cache can still show incorrect values if user manually deletes the
entries from IndexedDB via dev tools but that's acceptable.
---
 src/store/modules/TsModsModule.ts | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/store/modules/TsModsModule.ts b/src/store/modules/TsModsModule.ts
index 42018c5ea..d0315cf61 100644
--- a/src/store/modules/TsModsModule.ts
+++ b/src/store/modules/TsModsModule.ts
@@ -18,6 +18,7 @@ export interface CachedMod {
 }
 
 interface State {
+    activeGameCacheStatus: string|undefined;
     cache: Map<string, CachedMod>;
     deprecated: Map<string, boolean>;
     exclusions: string[];
@@ -55,6 +56,8 @@ export const TsModsModule = {
     namespaced: true,
 
     state: (): State => ({
+        /*** Does the active game have a mod list stored in IndexedDB? */
+        activeGameCacheStatus: undefined,
         cache: new Map<string, CachedMod>(),
         deprecated: new Map<string, boolean>(),
         /*** Packages available through API that should be ignored by the manager */
@@ -127,6 +130,7 @@ export const TsModsModule = {
 
     mutations: <MutationTree<State>>{
         reset(state: State) {
+            state.activeGameCacheStatus = undefined;
             state.cache = new Map<string, CachedMod>();
             state.deprecated = new Map<string, boolean>();
             state.mods = [];
@@ -141,6 +145,9 @@ export const TsModsModule = {
             state.isThunderstoreModListUpdateInProgress = false;
             state.thunderstoreModListUpdateStatus = '';
         },
+        setActiveGameCacheStatus(state, status: string|undefined) {
+            state.activeGameCacheStatus = status;
+        },
         setMods(state, payload: ThunderstoreMod[]) {
             state.mods = payload;
         },
@@ -222,6 +229,7 @@ export const TsModsModule = {
             } catch (e) {
                 commit('setThunderstoreModListUpdateError', e);
             } finally {
+                commit('setActiveGameCacheStatus', undefined);
                 commit('finishThunderstoreModListUpdate');
             }
         },
@@ -293,14 +301,28 @@ export const TsModsModule = {
             return updated !== undefined;
         },
 
-        async getActiveGameCacheStatus({state, rootState}) {
+        async getActiveGameCacheStatus({commit, state, rootState}): Promise<string> {
             if (state.isThunderstoreModListUpdateInProgress) {
                 return "Online mod list is currently updating, please wait for the operation to complete";
             }
 
-            return (await PackageDb.hasEntries(rootState.activeGame.internalFolderName))
-                ? `${rootState.activeGame.displayName} has a local copy of online mod list`
-                : `${rootState.activeGame.displayName} has no local copy stored`;
+            // Only check the status once, as this is used in the settings
+            // where the value is polled on one second intervals.
+            if (state.activeGameCacheStatus === undefined) {
+                let status = '';
+                try {
+                    status = (await PackageDb.hasEntries(rootState.activeGame.internalFolderName))
+                        ? `${rootState.activeGame.displayName} has a local copy of online mod list`
+                        : `${rootState.activeGame.displayName} has no local copy stored`;
+                } catch (e) {
+                    console.error(e);
+                    status = 'Error occurred while checking mod list status';
+                }
+
+                commit('setActiveGameCacheStatus', status);
+            }
+
+            return state.activeGameCacheStatus || 'Unknown status';
         },
 
         async prewarmCache({getters, rootGetters}) {
@@ -326,6 +348,7 @@ export const TsModsModule = {
                 await PackageDb.resetCommunity(community);
                 commit('setModsLastUpdated', undefined);
             } finally {
+                commit('setActiveGameCacheStatus', undefined);
                 commit('finishThunderstoreModListUpdate');
             }
         },

From 13dde43c24d08769a7042f452540141f661b0a70 Mon Sep 17 00:00:00 2001
From: VilppeRiskidev <vili.manninen@riskidev.fi>
Date: Thu, 16 Jan 2025 14:13:04 +0200
Subject: [PATCH 68/95] Fix MiSide Game definition by correcting the exe name

---
 src/model/game/GameManager.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/model/game/GameManager.ts b/src/model/game/GameManager.ts
index cad2de918..384a28c59 100644
--- a/src/model/game/GameManager.ts
+++ b/src/model/game/GameManager.ts
@@ -855,7 +855,7 @@ export default class GameManager {
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["iayb"]),
 
         new Game("MiSide", "MiSide", "MiSide",
-            "MiSide", ["MiSide.exe"], "MiSideFull_Data",
+            "MiSide", ["MiSideFull.exe"], "MiSideFull_Data",
             "https://thunderstore.io/c/miside/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2527500")], "MiSide.webp",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, [""]),

From 1c6db46cfbd8939fd32822c9c534b3def416e943 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Fri, 17 Jan 2025 11:58:49 +0200
Subject: [PATCH 69/95] Lock both source and destination files when copying or
 renaming files

This seems to resolve a race condition issue where a disabled mod was
imported as a part of a profile. Before the fix, renaming the file with
".old" extension when disabling the mod after copying it into profile
caused an EBUSY error.
---
 src/providers/generic/file/NodeFs.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/providers/generic/file/NodeFs.ts b/src/providers/generic/file/NodeFs.ts
index e5c3499f4..991ee55c0 100644
--- a/src/providers/generic/file/NodeFs.ts
+++ b/src/providers/generic/file/NodeFs.ts
@@ -93,7 +93,7 @@ export default class NodeFs extends FsProvider {
 
     async rename(path: string, newPath: string): Promise<void> {
         return new Promise((resolve, reject) => {
-            NodeFs.lock.acquire(path, async () => {
+            NodeFs.lock.acquire([path, newPath], async () => {
                 try {
                     await fs.promises.rename(path, newPath);
                     resolve();
@@ -110,7 +110,7 @@ export default class NodeFs extends FsProvider {
 
     async copyFile(from: string, to: string): Promise<void> {
         return new Promise((resolve, reject) => {
-            NodeFs.lock.acquire(from, async () => {
+            NodeFs.lock.acquire([from, to], async () => {
                 try {
                     await fs.promises.copyFile(from, to);
                     resolve();

From eaefc7d608dbfd0bd2775bcdf13a1fbaf0f6178c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Mon, 20 Jan 2025 16:35:54 +0200
Subject: [PATCH 70/95] Implement some of the code review comments for PR #1598

- Explicitly check array lengths in conditional statements in template
- Add computed property for unknownProfileModNames
- Remove cancel button as they really aren't used elsewhere in the app
---
 .../profiles-modals/ImportProfileModal.vue    | 37 ++++++++-----------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/components/profiles-modals/ImportProfileModal.vue b/src/components/profiles-modals/ImportProfileModal.vue
index a8fa78cfa..a896f9c5a 100644
--- a/src/components/profiles-modals/ImportProfileModal.vue
+++ b/src/components/profiles-modals/ImportProfileModal.vue
@@ -76,6 +76,10 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
         return {known, unknown};
     }
 
+    get unknownProfileModNames(): string {
+        return this.profileMods.unknown.join(', ');
+    }
+
     // Fired when user selects to import either from file or code.
     async onFileOrCodeSelect(mode: 'FILE' | 'CODE') {
         if (mode === 'FILE') {
@@ -309,17 +313,17 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
         </template>
         <template v-slot:body>
             <OnlineModList :paged-mod-list="profileMods.known" :read-only="true" />
-            <div v-if="!profileMods.known.length || profileMods.unknown.length" class="notification is-warning margin-top">
-                <p v-if="!profileMods.known.length">
+            <div v-if="profileMods.known.length === 0 || profileMods.unknown.length > 0" class="notification is-warning margin-top">
+                <p v-if="profileMods.known.length === 0">
                     None of the packages in the profile were found on Thunderstore:
                 </p>
                 <p v-else>
                     Some of the packages in the profile were not found on Thunderstore:
                 </p>
 
-                <p class="margin-top">{{ profileMods.unknown.join(", ") }}</p>
+                <p class="margin-top">{{ unknownProfileModNames }}</p>
 
-                <p v-if="profileMods.known.length" class="margin-top">
+                <p v-if="profileMods.known.length > 0" class="margin-top">
                     These packages will not be installed.
                 </p>
                 <p v-else class="margin-top">
@@ -351,23 +355,14 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
             </div>
         </template>
         <template v-slot:footer>
-            <div class="container is-flex is-justify-content-space-between">
-                <button
-                    id="modal-no-mods-to-import"
-                    class="button is-danger"
-                    @click="closeModal"
-                >
-                    Cancel import
-                </button>
-                <button
-                    id="modal-review-confirmed"
-                    class="button is-info"
-                    :disabled="!profileMods.known.length"
-                    @click="onProfileReviewConfirmed"
-                >
-                    Import
-                </button>
-            </div>
+            <button
+                id="modal-review-confirmed"
+                class="button is-info"
+                :disabled="profileMods.known.length === 0"
+                @click="onProfileReviewConfirmed"
+            >
+                Import
+            </button>
         </template>
     </ModalCard>
 

From cbbf040de24dfdb1ad277c9751c3ee4f339bfcf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Wed, 22 Jan 2025 16:21:22 +0200
Subject: [PATCH 71/95] Improve "enter profile code" phase of profile import
 modal

- Remove the somewhat unnecessary "You haven't entered a code" and "You
  may import the profile" badges that mostly just look awkward
- Show "Invalid code" badge only if a profile code has been entered
- Remove the big red button when a valid profile code hasn't been
  entered. This looked like an error state before user has entered the
  code. Just disabling the Continue button if the code is invalid seems
  sufficient
- Combine the two remaining buttons into one
- Prevent submitting the form when the download is already in progress,
  both via button and key press
- Move isProfileCodeValid helper to modal components as that's the only
  place where it's used. Remove the unnecessary argument to make the
  method a computed value
---
 src/components/mixins/ProfilesMixin.vue       |  6 ----
 .../profiles-modals/ImportProfileModal.vue    | 33 ++++++++-----------
 2 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/src/components/mixins/ProfilesMixin.vue b/src/components/mixins/ProfilesMixin.vue
index 470b86963..f17f86364 100644
--- a/src/components/mixins/ProfilesMixin.vue
+++ b/src/components/mixins/ProfilesMixin.vue
@@ -4,8 +4,6 @@ import Component from 'vue-class-component';
 
 import sanitize from "sanitize-filename";
 
-const VALID_PROFILE_CODE_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-
 @Component
 export default class ProfilesMixin extends Vue {
 
@@ -35,9 +33,5 @@ export default class ProfilesMixin extends Vue {
         return sanitize(nameToSanitize);
     }
 
-    isProfileCodeValid(profileImportCode: string): boolean {
-        return VALID_PROFILE_CODE_REGEX.test(profileImportCode);
-    }
-
 }
 </script>
diff --git a/src/components/profiles-modals/ImportProfileModal.vue b/src/components/profiles-modals/ImportProfileModal.vue
index a896f9c5a..70ef23421 100644
--- a/src/components/profiles-modals/ImportProfileModal.vue
+++ b/src/components/profiles-modals/ImportProfileModal.vue
@@ -16,6 +16,7 @@ import { ModalCard } from "../all";
 import ProfilesMixin from "../mixins/ProfilesMixin.vue";
 import OnlineModList from "../views/OnlineModList.vue";
 
+const VALID_PROFILE_CODE_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 
 @Component({
     components: { OnlineModList, ModalCard}
@@ -80,6 +81,10 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
         return this.profileMods.unknown.join(', ');
     }
 
+    get isProfileCodeValid(): boolean {
+        return VALID_PROFILE_CODE_REGEX.test(this.profileImportCode);
+    }
+
     // Fired when user selects to import either from file or code.
     async onFileOrCodeSelect(mode: 'FILE' | 'CODE') {
         if (mode === 'FILE') {
@@ -270,39 +275,27 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
         <template v-slot:body>
             <input
                 v-model="profileImportCode"
-                @keyup.enter="isProfileCodeValid(profileImportCode) && onProfileCodeEntered()"
+                @keyup.enter="isProfileCodeValid && !importViaCodeInProgress && onProfileCodeEntered()"
                 id="import-profile-modal-profile-code"
                 class="input"
                 type="text"
                 ref="profileCodeInput"
+                placeholder="Enter the profile code"
                 autocomplete="off"
             />
             <br />
             <br />
-            <span class="tag is-dark" v-if="profileImportCode === ''">You haven't entered a code</span>
-            <span class="tag is-danger" v-else-if="!isProfileCodeValid(profileImportCode)">Invalid code, check for typos</span>
-            <span class="tag is-success" v-else>You may import the profile</span>
+            <span class="tag is-danger" v-if="profileImportCode !== '' && !isProfileCodeValid">
+                Invalid code, check for typos
+            </span>
         </template>
         <template v-slot:footer>
             <button
-                id="modal-import-profile-from-code-invalid"
-                class="button is-danger"
-                v-if="!isProfileCodeValid(profileImportCode)">
-                Fix issues before importing
-            </button>
-            <button
-                disabled
-                id="modal-import-profile-from-code-loading"
-                class="button is-disabled"
-                v-else-if="importViaCodeInProgress">
-                Loading...
-            </button>
-            <button
+                :disabled="!isProfileCodeValid || importViaCodeInProgress"
                 id="modal-import-profile-from-code"
                 class="button is-info"
-                @click="onProfileCodeEntered();"
-                v-else>
-                Continue
+                @click="onProfileCodeEntered();">
+                {{importViaCodeInProgress ? 'Loading...' : 'Continue'}}
             </button>
         </template>
     </ModalCard>

From 6b86dd6fb492ba9d43681d249fc946aefc373a4b Mon Sep 17 00:00:00 2001
From: Cade Ayres <ca469@kent.ac.uk>
Date: Mon, 27 Jan 2025 16:59:43 +0000
Subject: [PATCH 72/95] Remove invalid manifest locations from list before
 attempting to search for valid installation directories

---
 src/r2mm/manager/win32/GameDirectoryResolver.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/r2mm/manager/win32/GameDirectoryResolver.ts b/src/r2mm/manager/win32/GameDirectoryResolver.ts
index f84b100ad..414ebef08 100644
--- a/src/r2mm/manager/win32/GameDirectoryResolver.ts
+++ b/src/r2mm/manager/win32/GameDirectoryResolver.ts
@@ -120,6 +120,15 @@ export default class GameDirectoryResolverImpl extends GameDirectoryResolverProv
                 null
             )
         }
+
+        // Filter to only locations that exist on the drive
+        for (const location of locations) {
+            if (!await fs.exists(location)) {
+                var index = locations.indexOf(location);
+                locations.splice(index, 1);
+            }
+        }
+
         // Look through given directories for ${appManifest}
         let manifestLocation: string | null = null;
         try {

From 1d33c889de2fcd6ffa07ca28665b32fcc6858ba6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Tue, 28 Jan 2025 13:50:24 +0200
Subject: [PATCH 73/95] Add option for copying troubleshooting information to
 clipboard

This allows users to share relevant information when asking for support
e.g. on Discord.
---
 .../settings-components/SettingsView.vue      |  8 +++++++
 src/pages/Manager.vue                         |  8 +++++++
 src/r2mm/manager/PackageDexieStore.ts         |  4 ++++
 src/store/modules/ProfileModule.ts            | 23 +++++++++++++++++++
 src/store/modules/TsModsModule.ts             |  4 ++++
 5 files changed, 47 insertions(+)

diff --git a/src/components/settings-components/SettingsView.vue b/src/components/settings-components/SettingsView.vue
index 2f3455735..5ade507ba 100644
--- a/src/components/settings-components/SettingsView.vue
+++ b/src/components/settings-components/SettingsView.vue
@@ -157,6 +157,14 @@ import CdnProvider from '../../providers/generic/connection/CdnProvider';
                 'fa-clipboard',
                 () => this.emitInvoke('CopyLogToClipboard')
             ),
+            new SettingsRow(
+                'Debugging',
+                'Copy troubleshooting information to clipboard',
+                'Copy settings and other information to the clipboard, with Discord formatting.',
+                async () => 'Share this information when requesting support on Discord.',
+                'fa-clipboard',
+                () => this.emitInvoke('CopyTroubleshootingInfoToClipboard')
+            ),
             new SettingsRow(
                 'Debugging',
                 'Toggle download cache',
diff --git a/src/pages/Manager.vue b/src/pages/Manager.vue
index b3638808e..652f4e3e0 100644
--- a/src/pages/Manager.vue
+++ b/src/pages/Manager.vue
@@ -513,6 +513,11 @@ import ModalCard from '../components/ModalCard.vue';
             }
 		}
 
+        async copyTroubleshootingInfoToClipboard() {
+            const content = await this.$store.dispatch('profile/generateTroubleshootingString');
+            InteractionProvider.instance.copyToClipboard('```' + content + '```');
+        }
+
         async changeDataFolder() {
             try {
                 const folder = await DataFolderProvider.instance.showSelectionDialog();
@@ -551,6 +556,9 @@ import ModalCard from '../components/ModalCard.vue';
                 case "CopyLogToClipboard":
                     this.copyLogToClipboard();
                     break;
+                case "CopyTroubleshootingInfoToClipboard":
+                    this.copyTroubleshootingInfoToClipboard();
+                    break;
                 case "ToggleDownloadCache":
                     this.toggleIgnoreCache();
                     break;
diff --git a/src/r2mm/manager/PackageDexieStore.ts b/src/r2mm/manager/PackageDexieStore.ts
index c870a267e..04c2ce085 100644
--- a/src/r2mm/manager/PackageDexieStore.ts
+++ b/src/r2mm/manager/PackageDexieStore.ts
@@ -88,6 +88,10 @@ export async function getPackageVersionNumbers(community: string, packageName: s
     return pkg.versions.map((v) => v.version_number);
 }
 
+export async function getPackageCount(community: string) {
+    return await db.packages.where({community}).count();
+}
+
 /**
  * @param game Game (community) which package listings should be used in the lookup.
  * @param dependencies Lookup targets as Thunderstore dependency strings.
diff --git a/src/store/modules/ProfileModule.ts b/src/store/modules/ProfileModule.ts
index b65f62999..0115278d9 100644
--- a/src/store/modules/ProfileModule.ts
+++ b/src/store/modules/ProfileModule.ts
@@ -2,6 +2,7 @@ import { ActionTree, GetterTree } from 'vuex';
 
 import { CachedMod } from './TsModsModule';
 import { State as RootState } from '../index';
+import ManagerInformation from '../../_managerinf/ManagerInformation';
 import R2Error from '../../model/errors/R2Error';
 import ManifestV2 from '../../model/ManifestV2';
 import Profile, { ImmutableProfile } from "../../model/Profile";
@@ -11,6 +12,7 @@ import { SortNaming } from '../../model/real_enums/sort/SortNaming';
 import ThunderstoreCombo from '../../model/ThunderstoreCombo';
 import ThunderstoreMod from '../../model/ThunderstoreMod';
 import ConflictManagementProvider from '../../providers/generic/installing/ConflictManagementProvider';
+import GameDirectoryResolverProvider from '../../providers/ror2/game/GameDirectoryResolverProvider';
 import ProfileInstallerProvider from '../../providers/ror2/installing/ProfileInstallerProvider';
 import ManagerSettings from '../../r2mm/manager/ManagerSettings';
 import * as PackageDb from '../../r2mm/manager/PackageDexieStore';
@@ -297,6 +299,27 @@ export default {
             return await PackageDb.getCombosByDependencyStrings(game, outdated, useLatestVersion);
         },
 
+        async generateTroubleshootingString({dispatch, getters, rootGetters, rootState}): Promise<string> {
+            const steamDirectory = await GameDirectoryResolverProvider.instance.getSteamDirectory();
+            const steamPath = steamDirectory instanceof R2Error ? '-' : steamDirectory;
+            const gameDirectory = await GameDirectoryResolverProvider.instance.getDirectory(rootState.activeGame);
+            const gamePath = gameDirectory instanceof R2Error ? '-' : gameDirectory;
+            const packageCacheDate = await PackageDb.getLastPackageListUpdateTime(rootState.activeGame.internalFolderName);
+            const packageCacheSize = await PackageDb.getPackageCount(rootState.activeGame.internalFolderName);
+            const packageVuexState: string = await dispatch('tsMods/generateTroubleshootingString', null, {root: true});
+
+            const content = `
+                App: ${ManagerInformation.APP_NAME} v${ManagerInformation.VERSION}
+                Game: ${rootState.activeGame.displayName} (${rootState.activeGame.activePlatform.storePlatform})
+                Steam path: ${steamPath}
+                Game path: ${gamePath}
+                Profile path: ${getters.activeProfile.getProfilePath()}
+                Custom launch arguments: ${rootGetters.settings.getContext().gameSpecific.launchParameters || '-'}
+                Mod list in cache: ${packageCacheSize} mods, hash updated ${packageCacheDate || 'never'}
+                Mod list in memory: ${packageVuexState}
+            `;
+            return content.replace(/(\n)\s+/g, '$1');  // Remove indentation but keep newlines
+        },
 
         async loadLastSelectedProfile({commit, rootGetters}): Promise<string> {
             const profileName = rootGetters['settings'].getContext().gameSpecific.lastSelectedProfile;
diff --git a/src/store/modules/TsModsModule.ts b/src/store/modules/TsModsModule.ts
index d0315cf61..5a98518d0 100644
--- a/src/store/modules/TsModsModule.ts
+++ b/src/store/modules/TsModsModule.ts
@@ -301,6 +301,10 @@ export const TsModsModule = {
             return updated !== undefined;
         },
 
+        async generateTroubleshootingString({state}): Promise<string> {
+            return `${state.mods.length} mods, updated ${state.modsLastUpdated || 'never'}`;
+        },
+
         async getActiveGameCacheStatus({commit, state, rootState}): Promise<string> {
             if (state.isThunderstoreModListUpdateInProgress) {
                 return "Online mod list is currently updating, please wait for the operation to complete";

From 9e730e33db0041fb689775ebf535e44064b0fb42 Mon Sep 17 00:00:00 2001
From: Vili Manninen <vili.manninen@riskidev.fi>
Date: Tue, 14 Jan 2025 19:35:35 +0200
Subject: [PATCH 74/95] Separate the version determination function from the
 download function

---
 .../BetterThunderstoreDownloader.ts           | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/r2mm/downloading/BetterThunderstoreDownloader.ts b/src/r2mm/downloading/BetterThunderstoreDownloader.ts
index 5bbb51516..c67484ca5 100644
--- a/src/r2mm/downloading/BetterThunderstoreDownloader.ts
+++ b/src/r2mm/downloading/BetterThunderstoreDownloader.ts
@@ -1,3 +1,4 @@
+import ManifestV2 from "src/model/ManifestV2";
 import ThunderstoreVersion from '../../model/ThunderstoreVersion';
 import ThunderstoreMod from '../../model/ThunderstoreMod';
 import StatusEnum from '../../model/enums/StatusEnum';
@@ -86,35 +87,23 @@ export default class BetterThunderstoreDownloader extends ThunderstoreDownloader
                            ignoreCache: boolean,
                            callback: (progress: number, modName: string, status: number, err: R2Error | null) => void,
                            completedCallback: (modList: ThunderstoreCombo[]) => void) {
+
+        const modList = await ProfileModList.getModList(profile);
+        if (modList instanceof R2Error) {
+            return callback(0, mod.getName(), StatusEnum.FAILURE, modList);
+        }
+
         let dependencies: ThunderstoreCombo[] = [];
         await this.buildDependencySet(modVersion, dependencies, DependencySetBuilderMode.USE_EXACT_VERSION);
         this.sortDependencyOrder(dependencies);
         const combo = new ThunderstoreCombo();
         combo.setMod(mod);
         combo.setVersion(modVersion);
-        let downloadCount = 0;
-
-        const modList = await ProfileModList.getModList(profile);
-        if (modList instanceof R2Error) {
-            return callback(0, mod.getName(), StatusEnum.FAILURE, modList);
-        }
 
+        dependencies = await this.determineDependencyVersions(dependencies, combo, modVersion, modList);
         let downloadableDependencySize = this.calculateInitialDownloadSize(dependencies);
 
-        // Determine if modpack
-        // If modpack, use specified dependencies as retrieved above
-        // If not, get latest version of dependencies.
-        let isModpack = combo.getMod().getCategories().find(value => value === "Modpacks") !== undefined;
-        if (!isModpack) {
-            // If not modpack, get latest
-            dependencies = [];
-            await this.buildDependencySet(modVersion, dependencies, DependencySetBuilderMode.USE_LATEST_VERSION);
-            this.sortDependencyOrder(dependencies);
-            // #270: Remove already-installed dependencies to prevent updating.
-            dependencies = dependencies.filter(dep => modList.find(installed => installed.getName() === dep.getMod().getFullName()) === undefined);
-            downloadableDependencySize = this.calculateInitialDownloadSize(dependencies);
-        }
-
+        let downloadCount = 0;
         await this.downloadAndSave(combo, ignoreCache, async (progress: number, status: number, err: R2Error | null) => {
             if (status === StatusEnum.FAILURE) {
                 callback(0, mod.getName(), status, err);
@@ -148,6 +137,19 @@ export default class BetterThunderstoreDownloader extends ThunderstoreDownloader
         })
     }
 
+    // If combo is a modpack, use the modpack's dependency versions. If it isn't, get the latest versions.
+    public async determineDependencyVersions(dependencies: ThunderstoreCombo[], combo: ThunderstoreCombo, modVersion: ThunderstoreVersion, modList: ManifestV2[]) {
+        let isModpack = combo.getMod().getCategories().find(value => value === "Modpacks") !== undefined;
+        if (isModpack) {
+            return dependencies;
+        }
+        dependencies = [];
+        await this.buildDependencySet(modVersion, dependencies, DependencySetBuilderMode.USE_LATEST_VERSION);
+        this.sortDependencyOrder(dependencies);
+        // #270: Remove already-installed dependencies to prevent updating.
+        return dependencies.filter(dep => modList.find(installed => installed.getName() === dep.getMod().getFullName()) === undefined);
+    }
+
     public async downloadImportedMods(
         modList: ThunderstoreCombo[],
         ignoreCache: boolean,

From 9ca4173ad1a9a2a6e85f930bfc838809d6e63616 Mon Sep 17 00:00:00 2001
From: Vili Manninen <vili.manninen@riskidev.fi>
Date: Tue, 14 Jan 2025 21:00:15 +0200
Subject: [PATCH 75/95] Simplify download logic by omitting callback

---
 src/components/mixins/DownloadMixin.vue       |   4 +
 src/components/views/DownloadModModal.vue     | 142 +++++++++++-------
 .../views/DownloadModVersionSelectModal.vue   |   1 -
 .../views/UpdateAllInstalledModsModal.vue     |   6 +-
 .../ThunderstoreDownloaderProvider.ts         |  21 ++-
 .../BetterThunderstoreDownloader.ts           |  97 ++++++------
 6 files changed, 150 insertions(+), 121 deletions(-)

diff --git a/src/components/mixins/DownloadMixin.vue b/src/components/mixins/DownloadMixin.vue
index a4e5b721e..784c41a9d 100644
--- a/src/components/mixins/DownloadMixin.vue
+++ b/src/components/mixins/DownloadMixin.vue
@@ -21,6 +21,10 @@ export default class DownloadMixin extends Vue {
         this.$store.commit("closeDownloadModModal");
     }
 
+    setIsModProgressModalOpen(open: boolean): void {
+        this.$store.commit('download/setIsModProgressModalOpen', open);
+    }
+
     get isOpen(): boolean {
         return this.$store.state.modals.isDownloadModModalOpen;
     }
diff --git a/src/components/views/DownloadModModal.vue b/src/components/views/DownloadModModal.vue
index 7b17d809d..be61a8c54 100644
--- a/src/components/views/DownloadModModal.vue
+++ b/src/components/views/DownloadModModal.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <div id='downloadProgressModal' :class="['modal', {'is-active':$store.state.download.isModProgressModalOpen}]" v-if="$store.getters['download/currentDownload'] !== null">
-            <div class="modal-background" @click="$store.commit('download/setIsModProgressModalOpen', false);"></div>
+            <div class="modal-background" @click="setIsModProgressModalOpen(false);"></div>
             <div class='modal-content'>
                 <div class='notification is-info'>
                     <h3 class='title'>Downloading {{$store.getters['download/currentDownload'].modName}}</h3>
@@ -13,7 +13,7 @@
                     />
                 </div>
             </div>
-            <button class="modal-close is-large" aria-label="close" @click="$store.commit('download/setIsModProgressModalOpen', false);"></button>
+            <button class="modal-close is-large" aria-label="close" @click="setIsModProgressModalOpen(false);"></button>
         </div>
         <DownloadModVersionSelectModal @download-mod="downloadHandler" />
         <UpdateAllInstalledModsModal />
@@ -60,54 +60,65 @@ import ProfileModList from '../../r2mm/mods/ProfileModList';
             store: Store<any>
         ): Promise<void> {
             return new Promise(async (resolve, reject) => {
-                const tsMod = combo.getMod();
-                const tsVersion = combo.getVersion();
 
                 const assignId = await store.dispatch(
                     'download/addDownload',
-                    [`${tsMod.getName()} (${tsVersion.getVersionNumber().toString()})`]
+                    [`${combo.getMod().getName()} (${combo.getVersion().getVersionNumber().toString()})`]
                 );
 
-                setTimeout(() => {
-                    ThunderstoreDownloaderProvider.instance.download(profile.asImmutableProfile(), tsMod, tsVersion, ignoreCache, (progress: number, modName: string, status: number, err: R2Error | null) => {
-                        try {
-                            if (status === StatusEnum.FAILURE) {
-                                store.commit('download/updateDownload', {assignId, failed: true});
-                                if (err !== null) {
-                                    DownloadMixin.addSolutionsToError(err);
-                                    return reject(err);
-                                }
-                            } else if (status === StatusEnum.PENDING) {
-                                store.commit('download/updateDownload', {assignId, progress, modName});
-                            }
-                        } catch (e) {
-                            return reject(e);
-                        }
-                    }, async (downloadedMods: ThunderstoreCombo[]) => {
-                        ProfileModList.requestLock(async () => {
-                            for (const combo of downloadedMods) {
+                setTimeout(async () => {
+                    let downloadedMods: ThunderstoreCombo[] = [];
+                    try {
+                        downloadedMods = await ThunderstoreDownloaderProvider.instance.download(
+                            profile.asImmutableProfile(),
+                            combo,
+                            ignoreCache,
+                            (progress: number, modName: string, status: number, err: R2Error | null) => {
                                 try {
-                                    await DownloadModModal.installModAfterDownload(profile, combo.getMod(), combo.getVersion());
+                                    DownloadModModal.downloadProgressCallback(store, assignId, progress, modName, status, err);
                                 } catch (e) {
-                                    return reject(
-                                        R2Error.fromThrownValue(e, `Failed to install mod [${combo.getMod().getFullName()}]`)
-                                    );
+                                    reject(e);
                                 }
                             }
-                            const modList = await ProfileModList.getModList(profile.asImmutableProfile());
-                            if (!(modList instanceof R2Error)) {
-                                const err = await ConflictManagementProvider.instance.resolveConflicts(modList, profile.asImmutableProfile());
-                                if (err instanceof R2Error) {
-                                    return reject(err);
-                                }
+                        );
+                    } catch (e) {
+                        return reject(e);
+                    }
+                    await ProfileModList.requestLock(async () => {
+                        for (const combo of downloadedMods) {
+                            try {
+                                await DownloadModModal.installModAfterDownload(profile, combo.getMod(), combo.getVersion());
+                            } catch (e) {
+                                return reject(
+                                    R2Error.fromThrownValue(e, `Failed to install mod [${combo.getMod().getFullName()}]`)
+                                );
                             }
-                            return resolve();
-                        });
+                        }
+                        const modList = await ProfileModList.getModList(profile.asImmutableProfile());
+                        if (!(modList instanceof R2Error)) {
+                            const err = await ConflictManagementProvider.instance.resolveConflicts(modList, profile.asImmutableProfile());
+                            if (err instanceof R2Error) {
+                                return reject(err);
+                            }
+                        }
+                        return resolve();
                     });
                 }, 1);
             });
         }
 
+        static downloadProgressCallback(store: Store<any>, assignId: number, progress: number, modName: string, status: number, err: R2Error | null) {
+            if (status === StatusEnum.FAILURE) {
+                store.commit('download/updateDownload', {assignId, failed: true});
+                if (err !== null) {
+                    DownloadMixin.addSolutionsToError(err);
+                    throw err;
+                }
+            } else if (status === StatusEnum.PENDING) {
+                store.commit('download/updateDownload', {assignId, progress, modName});
+            }
+        }
+
         async downloadHandler(tsMod: ThunderstoreMod, tsVersion: ThunderstoreVersion) {
             this.closeModal();
 
@@ -116,30 +127,49 @@ import ProfileModList from '../../r2mm/mods/ProfileModList';
                 [`${tsMod.getName()} (${tsVersion.getVersionNumber().toString()})`]
             );
 
-            this.$store.commit('download/setIsModProgressModalOpen', true);
-            setTimeout(() => {
-                ThunderstoreDownloaderProvider.instance.download(this.profile.asImmutableProfile(), tsMod, tsVersion, this.ignoreCache, (progress: number, modName: string, status: number, err: R2Error | null) => {
-                    try {
-                        if (status === StatusEnum.FAILURE) {
-                            this.$store.commit('download/setIsModProgressModalOpen', false);
-                            this.$store.commit('download/updateDownload', {assignId, failed: true});
-                            if (err !== null) {
-                                DownloadMixin.addSolutionsToError(err);
-                                throw err;
-                            }
-                        } else if (status === StatusEnum.PENDING) {
-                            this.$store.commit('download/updateDownload', {assignId, progress, modName});
-                        }
-                    } catch (e) {
-                        this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
-                    }
-                }, async (downloadedMods) => {
-                    await this.downloadCompletedCallback(downloadedMods);
-                    this.$store.commit('download/setIsModProgressModalOpen', false);
-                });
+            this.setIsModProgressModalOpen(true);
+
+            const tsCombo = new ThunderstoreCombo();
+            tsCombo.setMod(tsMod);
+            tsCombo.setVersion(tsVersion);
+
+            setTimeout(async () => {
+                let downloadedMods: ThunderstoreCombo[] = [];
+                try {
+                    downloadedMods = await ThunderstoreDownloaderProvider.instance.download(
+                        this.profile.asImmutableProfile(),
+                        tsCombo,
+                        this.ignoreCache,
+                        (progress, modName, status, err) => { this.downloadProgressCallback(assignId, progress, modName, status, err); }
+                    );
+                } catch (e) {
+                    this.setIsModProgressModalOpen(false);
+                    this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
+                    return;
+                }
+                await this.downloadCompletedCallback(downloadedMods);
+                this.setIsModProgressModalOpen(false);
             }, 1);
+
         }
 
+        downloadProgressCallback(assignId: number, progress: number, modName: string, status: number, err: R2Error | null) {
+            try {
+                if (status === StatusEnum.FAILURE) {
+                    this.setIsModProgressModalOpen(false);
+                    this.$store.commit('download/updateDownload', {assignId, failed: true});
+                    if (err !== null) {
+                        DownloadMixin.addSolutionsToError(err);
+                        throw err;
+                    }
+                } else if (status === StatusEnum.PENDING) {
+                    this.$store.commit('download/updateDownload', {assignId, progress, modName});
+                }
+            } catch (e) {
+                this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
+            }
+        };
+
         static async installModAfterDownload(profile: Profile, mod: ThunderstoreMod, version: ThunderstoreVersion): Promise<R2Error | void> {
             return new Promise(async (resolve, reject) => {
                 const manifestMod: ManifestV2 = new ManifestV2().fromThunderstoreMod(mod, version);
diff --git a/src/components/views/DownloadModVersionSelectModal.vue b/src/components/views/DownloadModVersionSelectModal.vue
index 35b8e5120..a6cd82542 100644
--- a/src/components/views/DownloadModVersionSelectModal.vue
+++ b/src/components/views/DownloadModVersionSelectModal.vue
@@ -60,7 +60,6 @@ import ModalCard from "../ModalCard.vue";
 import DownloadMixin from "../../components/mixins/DownloadMixin.vue";
 import R2Error from "../../model/errors/R2Error";
 import ManifestV2 from "../../model/ManifestV2";
-import ThunderstoreMod from "../../model/ThunderstoreMod";
 import ThunderstoreVersion from "../../model/ThunderstoreVersion";
 import { MOD_LOADER_VARIANTS } from "../../r2mm/installing/profile_installers/ModLoaderVariantRecord";
 import * as PackageDb from "../../r2mm/manager/PackageDexieStore";
diff --git a/src/components/views/UpdateAllInstalledModsModal.vue b/src/components/views/UpdateAllInstalledModsModal.vue
index d65cbc368..a1c8ddd70 100644
--- a/src/components/views/UpdateAllInstalledModsModal.vue
+++ b/src/components/views/UpdateAllInstalledModsModal.vue
@@ -48,11 +48,11 @@ export default class UpdateAllInstalledModsModal extends mixins(DownloadMixin)
             modsWithUpdates.map(value => `${value.getMod().getName()} (${value.getVersion().getVersionNumber().toString()})`)
         );
 
-        this.$store.commit('download/setIsModProgressModalOpen', true);
+        this.setIsModProgressModalOpen(true);
         ThunderstoreDownloaderProvider.instance.downloadLatestOfAll(modsWithUpdates, this.ignoreCache, (progress: number, modName: string, status: number, err: R2Error | null) => {
             try {
                 if (status === StatusEnum.FAILURE) {
-                    this.$store.commit('download/setIsModProgressModalOpen', false);
+                    this.setIsModProgressModalOpen(false);
                     this.$store.commit('download/updateDownload', {assignId, failed: true});
                     if (err !== null) {
                         DownloadMixin.addSolutionsToError(err);
@@ -66,7 +66,7 @@ export default class UpdateAllInstalledModsModal extends mixins(DownloadMixin)
             }
         }, async (downloadedMods) => {
             await this.downloadCompletedCallback(downloadedMods);
-            this.$store.commit('download/setIsModProgressModalOpen', false);
+            this.setIsModProgressModalOpen(false);
         });
     }
 }
diff --git a/src/providers/ror2/downloading/ThunderstoreDownloaderProvider.ts b/src/providers/ror2/downloading/ThunderstoreDownloaderProvider.ts
index 1b44a060c..45f0f8bd7 100644
--- a/src/providers/ror2/downloading/ThunderstoreDownloaderProvider.ts
+++ b/src/providers/ror2/downloading/ThunderstoreDownloaderProvider.ts
@@ -1,6 +1,5 @@
 import ProviderUtils from '../../generic/ProviderUtils';
 import ThunderstoreVersion from '../../../model/ThunderstoreVersion';
-import ThunderstoreMod from '../../../model/ThunderstoreMod';
 import ThunderstoreCombo from '../../../model/ThunderstoreCombo';
 import R2Error from '../../../model/errors/R2Error';
 import { ImmutableProfile } from '../../../model/Profile';
@@ -49,17 +48,17 @@ export default abstract class ThunderstoreDownloaderProvider {
     /**
      * A top-level method to download the latest version of a mod including its dependencies.
      *
-     * @param profile           The profile the mod is downloaded for (needed to prevent dependencies from updating existing mods).
-     * @param mod               The mod to be downloaded.
-     * @param modVersion        The version of the mod to download.
-     * @param ignoreCache       Download mod even if it already exists in the cache.
-     * @param callback          Callback to show the current state of the downloads.
-     * @param completedCallback Callback to perform final actions against. Only called if {@param callback} has not returned a failed status.
+     * @param profile                   The profile the mod is downloaded for (needed to prevent dependencies from updating existing mods).
+     * @param combo                     The combo to be downloaded.
+     * @param ignoreCache               Download mod even if it already exists in the cache.
+     * @param totalProgressCallback     Callback to show the combined state of all the downloads.
      */
-    public abstract download(profile: ImmutableProfile, mod: ThunderstoreMod, modVersion: ThunderstoreVersion,
-                    ignoreCache: boolean,
-                    callback: (progress: number, modName: string, status: number, err: R2Error | null) => void,
-                    completedCallback: (modList: ThunderstoreCombo[]) => void): void;
+    public abstract download(
+        profile: ImmutableProfile,
+        combo: ThunderstoreCombo,
+        ignoreCache: boolean,
+        totalProgressCallback: (progress: number, modName: string, status: number, err: R2Error | null) => void
+    ): Promise<ThunderstoreCombo[]>;
 
     /**
      * A top-level method to download exact versions of exported mods.
diff --git a/src/r2mm/downloading/BetterThunderstoreDownloader.ts b/src/r2mm/downloading/BetterThunderstoreDownloader.ts
index c67484ca5..ebf0230ff 100644
--- a/src/r2mm/downloading/BetterThunderstoreDownloader.ts
+++ b/src/r2mm/downloading/BetterThunderstoreDownloader.ts
@@ -1,8 +1,7 @@
-import ManifestV2 from "src/model/ManifestV2";
 import ThunderstoreVersion from '../../model/ThunderstoreVersion';
-import ThunderstoreMod from '../../model/ThunderstoreMod';
 import StatusEnum from '../../model/enums/StatusEnum';
 import axios, { AxiosResponse } from 'axios';
+import ManifestV2 from "../../model/ManifestV2";
 import ThunderstoreCombo from '../../model/ThunderstoreCombo';
 import ZipExtract from '../installing/ZipExtract';
 import R2Error from '../../model/errors/R2Error';
@@ -83,71 +82,69 @@ export default class BetterThunderstoreDownloader extends ThunderstoreDownloader
         });
     }
 
-    public async download(profile: ImmutableProfile, mod: ThunderstoreMod, modVersion: ThunderstoreVersion,
-                           ignoreCache: boolean,
-                           callback: (progress: number, modName: string, status: number, err: R2Error | null) => void,
-                           completedCallback: (modList: ThunderstoreCombo[]) => void) {
+    public async download(
+        profile: ImmutableProfile,
+        combo: ThunderstoreCombo,
+        ignoreCache: boolean,
+        totalProgressCallback: (progress: number, modName: string, status: number, err: R2Error | null) => void
+    ): Promise<ThunderstoreCombo[]> {
 
         const modList = await ProfileModList.getModList(profile);
         if (modList instanceof R2Error) {
-            return callback(0, mod.getName(), StatusEnum.FAILURE, modList);
+            totalProgressCallback(0, combo.getMod().getName(), StatusEnum.FAILURE, modList);
+            throw modList;
         }
 
-        let dependencies: ThunderstoreCombo[] = [];
-        await this.buildDependencySet(modVersion, dependencies, DependencySetBuilderMode.USE_EXACT_VERSION);
-        this.sortDependencyOrder(dependencies);
-        const combo = new ThunderstoreCombo();
-        combo.setMod(mod);
-        combo.setVersion(modVersion);
-
-        dependencies = await this.determineDependencyVersions(dependencies, combo, modVersion, modList);
-        let downloadableDependencySize = this.calculateInitialDownloadSize(dependencies);
+        const dependencies = await this.getDependenciesWithCorrectVersions(combo, modList);
+        const allModsToDownload = [...dependencies, combo];
 
         let downloadCount = 0;
-        await this.downloadAndSave(combo, ignoreCache, async (progress: number, status: number, err: R2Error | null) => {
+        const singleModProgressCallback = (progress: number, status: number, err: R2Error | null) => {
             if (status === StatusEnum.FAILURE) {
-                callback(0, mod.getName(), status, err);
-            } else if (status === StatusEnum.PENDING) {
-                callback(this.generateProgressPercentage(progress, downloadCount, downloadableDependencySize + 1), mod.getName(), status, err);
+                throw err;
+            }
+
+            let totalProgress: number;
+            if (status === StatusEnum.PENDING) {
+                totalProgress = this.generateProgressPercentage(progress, downloadCount, allModsToDownload.length);
             } else if (status === StatusEnum.SUCCESS) {
+                totalProgress = this.generateProgressPercentage(100, downloadCount, allModsToDownload.length);
                 downloadCount += 1;
-                // If no dependencies, end here.
-                if (dependencies.length === 0) {
-                    callback(100, mod.getName(), StatusEnum.PENDING, err);
-                    completedCallback([combo]);
-                    return;
-                }
+            } else {
+                console.error(`Ignore unknown status code "${status}"`);
+                return;
+            }
+            totalProgressCallback(totalProgress, combo.getMod().getName(), status, err);
+        }
 
-                // If dependencies, queue and download.
-                await this.queueDownloadDependencies(dependencies.entries(), ignoreCache, (progress: number, modName: string, status: number, err: R2Error | null) => {
-                    if (status === StatusEnum.FAILURE) {
-                        callback(0, modName, status, err);
-                    } else if (status === StatusEnum.PENDING) {
-                        callback(this.generateProgressPercentage(progress, downloadCount, downloadableDependencySize + 1), modName, status, err);
-                    } else if (status === StatusEnum.SUCCESS) {
-                        callback(this.generateProgressPercentage(progress, downloadCount, downloadableDependencySize + 1), modName, StatusEnum.PENDING, err);
-                        downloadCount += 1;
-                        if (downloadCount >= dependencies.length + 1) {
-                            callback(100, modName, StatusEnum.PENDING, err);
-                            completedCallback([...dependencies, combo]);
-                        }
-                    }
-                });
+        for (const combo of allModsToDownload) {
+            if (!ignoreCache && await this.isVersionAlreadyDownloaded(combo)) {
+                totalProgressCallback(100, combo.getMod().getName(), StatusEnum.SUCCESS, null);
+                continue;
             }
-        })
+
+            try {
+                const response = await this._downloadCombo(combo, singleModProgressCallback);
+                await this._saveDownloadResponse(response, combo, singleModProgressCallback);
+            } catch(e) {
+                throw R2Error.fromThrownValue(e, `Failed to download mod ${combo.getVersion().getFullName()}`);
+            }
+        }
+        return allModsToDownload;
     }
 
     // If combo is a modpack, use the modpack's dependency versions. If it isn't, get the latest versions.
-    public async determineDependencyVersions(dependencies: ThunderstoreCombo[], combo: ThunderstoreCombo, modVersion: ThunderstoreVersion, modList: ManifestV2[]) {
-        let isModpack = combo.getMod().getCategories().find(value => value === "Modpacks") !== undefined;
-        if (isModpack) {
-            return dependencies;
-        }
-        dependencies = [];
-        await this.buildDependencySet(modVersion, dependencies, DependencySetBuilderMode.USE_LATEST_VERSION);
+    private async getDependenciesWithCorrectVersions(combo: ThunderstoreCombo, modList: ManifestV2[]) {
+        const dependencies: ThunderstoreCombo[] = [];
+        const isModpack = combo.getMod().getCategories().some(value => value === "Modpacks");
+        const versionMode = isModpack ? DependencySetBuilderMode.USE_EXACT_VERSION : DependencySetBuilderMode.USE_LATEST_VERSION;
+
+        await this.buildDependencySet(combo.getVersion(), dependencies, versionMode);
         this.sortDependencyOrder(dependencies);
         // #270: Remove already-installed dependencies to prevent updating.
-        return dependencies.filter(dep => modList.find(installed => installed.getName() === dep.getMod().getFullName()) === undefined);
+        return dependencies.filter((dep) => {
+            return !(modList.some(installed => installed.getName() === dep.getMod().getFullName()));
+        });
     }
 
     public async downloadImportedMods(

From 2d0cc9151ca4305140605a4d75f2f00155e7e13d Mon Sep 17 00:00:00 2001
From: Vili Manninen <vili.manninen@riskidev.fi>
Date: Tue, 14 Jan 2025 21:00:15 +0200
Subject: [PATCH 76/95] Simplify download logic by omitting callback

---
 src/components/views/DownloadModModal.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/DownloadModModal.vue b/src/components/views/DownloadModModal.vue
index be61a8c54..8d6e33a9d 100644
--- a/src/components/views/DownloadModModal.vue
+++ b/src/components/views/DownloadModModal.vue
@@ -144,6 +144,7 @@ import ProfileModList from '../../r2mm/mods/ProfileModList';
                     );
                 } catch (e) {
                     this.setIsModProgressModalOpen(false);
+                    this.$store.commit('download/updateDownload', { assignId: assignId, failed: true });
                     this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
                     return;
                 }

From 09fd3bf125aa0dbf507aed7beafc4b82b98e2528 Mon Sep 17 00:00:00 2001
From: VilppeRiskidev <vili.manninen@riskidev.fi>
Date: Thu, 23 Jan 2025 16:59:15 +0200
Subject: [PATCH 77/95] Move download progress callbacks to DownloadMixin

---
 src/components/mixins/DownloadMixin.vue   | 31 +++++++++++++++++++++
 src/components/views/DownloadModModal.vue | 33 +----------------------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/components/mixins/DownloadMixin.vue b/src/components/mixins/DownloadMixin.vue
index 784c41a9d..76c971a69 100644
--- a/src/components/mixins/DownloadMixin.vue
+++ b/src/components/mixins/DownloadMixin.vue
@@ -2,12 +2,14 @@
 import Vue from 'vue';
 import Component from 'vue-class-component';
 
+import StatusEnum from "../../model/enums/StatusEnum";
 import R2Error from "../../model/errors/R2Error";
 import Game from "../../model/game/Game";
 import Profile from "../../model/Profile";
 import ThunderstoreCombo from "../../model/ThunderstoreCombo";
 import ThunderstoreMod from "../../model/ThunderstoreMod";
 import { installModsAndResolveConflicts } from "../../utils/ProfileUtils";
+import { Store } from "vuex";
 
 
 @Component
@@ -50,6 +52,35 @@ export default class DownloadMixin extends Vue {
         }
     }
 
+    downloadProgressCallback(assignId: number, progress: number, modName: string, status: number, err: R2Error | null) {
+        try {
+            if (status === StatusEnum.FAILURE) {
+                this.setIsModProgressModalOpen(false);
+                this.$store.commit('download/updateDownload', {assignId, failed: true});
+                if (err !== null) {
+                    DownloadMixin.addSolutionsToError(err);
+                    throw err;
+                }
+            } else if (status === StatusEnum.PENDING) {
+                this.$store.commit('download/updateDownload', {assignId, progress, modName});
+            }
+        } catch (e) {
+            this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
+        }
+    };
+
+    static downloadProgressCallback(store: Store<any>, assignId: number, progress: number, modName: string, status: number, err: R2Error | null) {
+        if (status === StatusEnum.FAILURE) {
+            store.commit('download/updateDownload', {assignId, failed: true});
+            if (err !== null) {
+                DownloadMixin.addSolutionsToError(err);
+                throw err;
+            }
+        } else if (status === StatusEnum.PENDING) {
+            store.commit('download/updateDownload', {assignId, progress, modName});
+        }
+    }
+
     static addSolutionsToError(err: R2Error): void {
         // Sanity check typing.
         if (!(err instanceof R2Error)) {
diff --git a/src/components/views/DownloadModModal.vue b/src/components/views/DownloadModModal.vue
index 8d6e33a9d..73f27577f 100644
--- a/src/components/views/DownloadModModal.vue
+++ b/src/components/views/DownloadModModal.vue
@@ -31,7 +31,6 @@ import ModalCard from '../ModalCard.vue';
 import DownloadModVersionSelectModal from "../../components/views/DownloadModVersionSelectModal.vue";
 import UpdateAllInstalledModsModal from "../../components/views/UpdateAllInstalledModsModal.vue";
 import DownloadMixin from "../mixins/DownloadMixin.vue";
-import StatusEnum from '../../model/enums/StatusEnum';
 import R2Error from '../../model/errors/R2Error';
 import ManifestV2 from '../../model/ManifestV2';
 import Profile from '../../model/Profile';
@@ -75,7 +74,7 @@ import ProfileModList from '../../r2mm/mods/ProfileModList';
                             ignoreCache,
                             (progress: number, modName: string, status: number, err: R2Error | null) => {
                                 try {
-                                    DownloadModModal.downloadProgressCallback(store, assignId, progress, modName, status, err);
+                                    DownloadMixin.downloadProgressCallback(store, assignId, progress, modName, status, err);
                                 } catch (e) {
                                     reject(e);
                                 }
@@ -107,18 +106,6 @@ import ProfileModList from '../../r2mm/mods/ProfileModList';
             });
         }
 
-        static downloadProgressCallback(store: Store<any>, assignId: number, progress: number, modName: string, status: number, err: R2Error | null) {
-            if (status === StatusEnum.FAILURE) {
-                store.commit('download/updateDownload', {assignId, failed: true});
-                if (err !== null) {
-                    DownloadMixin.addSolutionsToError(err);
-                    throw err;
-                }
-            } else if (status === StatusEnum.PENDING) {
-                store.commit('download/updateDownload', {assignId, progress, modName});
-            }
-        }
-
         async downloadHandler(tsMod: ThunderstoreMod, tsVersion: ThunderstoreVersion) {
             this.closeModal();
 
@@ -151,26 +138,8 @@ import ProfileModList from '../../r2mm/mods/ProfileModList';
                 await this.downloadCompletedCallback(downloadedMods);
                 this.setIsModProgressModalOpen(false);
             }, 1);
-
         }
 
-        downloadProgressCallback(assignId: number, progress: number, modName: string, status: number, err: R2Error | null) {
-            try {
-                if (status === StatusEnum.FAILURE) {
-                    this.setIsModProgressModalOpen(false);
-                    this.$store.commit('download/updateDownload', {assignId, failed: true});
-                    if (err !== null) {
-                        DownloadMixin.addSolutionsToError(err);
-                        throw err;
-                    }
-                } else if (status === StatusEnum.PENDING) {
-                    this.$store.commit('download/updateDownload', {assignId, progress, modName});
-                }
-            } catch (e) {
-                this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
-            }
-        };
-
         static async installModAfterDownload(profile: Profile, mod: ThunderstoreMod, version: ThunderstoreVersion): Promise<R2Error | void> {
             return new Promise(async (resolve, reject) => {
                 const manifestMod: ManifestV2 = new ManifestV2().fromThunderstoreMod(mod, version);

From 7680c4b9865a740bad55ceb2112d953662231815 Mon Sep 17 00:00:00 2001
From: VilppeRiskidev <vili.manninen@riskidev.fi>
Date: Mon, 27 Jan 2025 13:56:25 +0200
Subject: [PATCH 78/95] Show failed download status unambiguously in
 DownloadMonitor

---
 src/pages/DownloadMonitor.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/DownloadMonitor.vue b/src/pages/DownloadMonitor.vue
index c30f336fa..491eb8889 100644
--- a/src/pages/DownloadMonitor.vue
+++ b/src/pages/DownloadMonitor.vue
@@ -19,8 +19,9 @@
                         <div class="border-at-bottom pad pad--sides">
                             <div class="card is-shadowless">
                                 <p><strong>{{ downloadObject.initialMods.join(", ") }}</strong></p>
-                                <p v-if="downloadObject.progress < 100">Downloading: {{ downloadObject.modName }}</p>
-                                <p>{{Math.min(Math.floor(downloadObject.progress), 100)}}% complete</p>
+                                <p v-if="downloadObject.failed">Downloading failed</p>
+                                <p v-if="downloadObject.progress < 100 && !downloadObject.failed">Downloading: {{ downloadObject.modName }}</p>
+                                <p v-if="!downloadObject.failed">{{Math.min(Math.floor(downloadObject.progress), 100)}}% complete</p>
                                 <Progress v-if="!downloadObject.failed"
                                     :max='100'
                                     :value='downloadObject.progress'

From fb6ad5dd146149e1d4ca4f44b122fa20bd0606fa Mon Sep 17 00:00:00 2001
From: VilppeRiskidev <vili.manninen@riskidev.fi>
Date: Thu, 23 Jan 2025 14:44:53 +0200
Subject: [PATCH 79/95] Rename progress to downloadProgress

---
 src/components/mixins/DownloadMixin.vue   |  8 ++++----
 src/components/views/DownloadModModal.vue | 10 +++++-----
 src/store/modules/DownloadModule.ts       |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/mixins/DownloadMixin.vue b/src/components/mixins/DownloadMixin.vue
index 76c971a69..2b2c7ca18 100644
--- a/src/components/mixins/DownloadMixin.vue
+++ b/src/components/mixins/DownloadMixin.vue
@@ -52,7 +52,7 @@ export default class DownloadMixin extends Vue {
         }
     }
 
-    downloadProgressCallback(assignId: number, progress: number, modName: string, status: number, err: R2Error | null) {
+    downloadProgressCallback(assignId: number, downloadProgress: number, modName: string, status: number, err: R2Error | null) {
         try {
             if (status === StatusEnum.FAILURE) {
                 this.setIsModProgressModalOpen(false);
@@ -62,14 +62,14 @@ export default class DownloadMixin extends Vue {
                     throw err;
                 }
             } else if (status === StatusEnum.PENDING) {
-                this.$store.commit('download/updateDownload', {assignId, progress, modName});
+                this.$store.commit('download/updateDownload', {assignId, downloadProgress, modName});
             }
         } catch (e) {
             this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
         }
     };
 
-    static downloadProgressCallback(store: Store<any>, assignId: number, progress: number, modName: string, status: number, err: R2Error | null) {
+    static downloadProgressCallback(store: Store<any>, assignId: number, downloadProgress: number, modName: string, status: number, err: R2Error | null) {
         if (status === StatusEnum.FAILURE) {
             store.commit('download/updateDownload', {assignId, failed: true});
             if (err !== null) {
@@ -77,7 +77,7 @@ export default class DownloadMixin extends Vue {
                 throw err;
             }
         } else if (status === StatusEnum.PENDING) {
-            store.commit('download/updateDownload', {assignId, progress, modName});
+            store.commit('download/updateDownload', {assignId, downloadProgress, modName});
         }
     }
 
diff --git a/src/components/views/DownloadModModal.vue b/src/components/views/DownloadModModal.vue
index 73f27577f..d1a28100b 100644
--- a/src/components/views/DownloadModModal.vue
+++ b/src/components/views/DownloadModModal.vue
@@ -5,10 +5,10 @@
             <div class='modal-content'>
                 <div class='notification is-info'>
                     <h3 class='title'>Downloading {{$store.getters['download/currentDownload'].modName}}</h3>
-                    <p>{{Math.floor($store.getters['download/currentDownload'].progress)}}% complete</p>
+                    <p>{{Math.floor($store.getters['download/currentDownload'].downloadProgress)}}% complete</p>
                     <Progress
                         :max='100'
-                        :value="$store.getters['download/currentDownload'].progress"
+                        :value="$store.getters['download/currentDownload'].downloadProgress"
                         :className="['is-dark']"
                     />
                 </div>
@@ -72,9 +72,9 @@ import ProfileModList from '../../r2mm/mods/ProfileModList';
                             profile.asImmutableProfile(),
                             combo,
                             ignoreCache,
-                            (progress: number, modName: string, status: number, err: R2Error | null) => {
+                            (downloadProgress: number, modName: string, status: number, err: R2Error | null) => {
                                 try {
-                                    DownloadMixin.downloadProgressCallback(store, assignId, progress, modName, status, err);
+                                    DownloadMixin.downloadProgressCallback(store, assignId, downloadProgress, modName, status, err);
                                 } catch (e) {
                                     reject(e);
                                 }
@@ -127,7 +127,7 @@ import ProfileModList from '../../r2mm/mods/ProfileModList';
                         this.profile.asImmutableProfile(),
                         tsCombo,
                         this.ignoreCache,
-                        (progress, modName, status, err) => { this.downloadProgressCallback(assignId, progress, modName, status, err); }
+                        (downloadProgress, modName, status, err) => { this.downloadProgressCallback(assignId, downloadProgress, modName, status, err); }
                     );
                 } catch (e) {
                     this.setIsModProgressModalOpen(false);
diff --git a/src/store/modules/DownloadModule.ts b/src/store/modules/DownloadModule.ts
index 2fa0bb09a..acc78f744 100644
--- a/src/store/modules/DownloadModule.ts
+++ b/src/store/modules/DownloadModule.ts
@@ -7,7 +7,7 @@ interface DownloadProgress {
     assignId: number;
     initialMods: string[];
     modName: string;
-    progress: number;
+    downloadProgress: number;
     failed: boolean;
 }
 
@@ -41,7 +41,7 @@ export const DownloadModule = {
                 assignId,
                 initialMods,
                 modName: '',
-                progress: 0,
+                downloadProgress: 0,
                 failed: false,
             };
             state.allDownloads = [...state.allDownloads, downloadObject];
@@ -52,7 +52,7 @@ export const DownloadModule = {
     getters: <GetterTree<State, RootState>>{
         activeDownloadCount(state) {
             const active = state.allDownloads.filter(
-                dl => !dl.failed && dl.progress < 100
+                dl => !dl.failed && dl.downloadProgress < 100
             );
             return active.length;
         },

From 1c37df568df83228f3a1e7fd6bc081244e430550 Mon Sep 17 00:00:00 2001
From: VilppeRiskidev <vili.manninen@riskidev.fi>
Date: Thu, 23 Jan 2025 15:59:51 +0200
Subject: [PATCH 80/95] Add installationProgress to the Vuex store, update the
 value when installing and display it on the UI

---
 src/components/mixins/DownloadMixin.vue       |  4 ++--
 .../profiles-modals/ImportProfileModal.vue    | 12 ++++++----
 src/components/views/DownloadModModal.vue     | 13 ++++++++---
 .../views/UpdateAllInstalledModsModal.vue     |  2 +-
 src/store/modules/DownloadModule.ts           |  4 +++-
 src/utils/ProfileUtils.ts                     | 23 ++++++++++++-------
 6 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/src/components/mixins/DownloadMixin.vue b/src/components/mixins/DownloadMixin.vue
index 2b2c7ca18..f4e5d3331 100644
--- a/src/components/mixins/DownloadMixin.vue
+++ b/src/components/mixins/DownloadMixin.vue
@@ -44,9 +44,9 @@ export default class DownloadMixin extends Vue {
         return this.$store.getters['profile/activeProfile'];
     }
 
-    async downloadCompletedCallback(downloadedMods: ThunderstoreCombo[]): Promise<void> {
+    async downloadCompletedCallback(downloadedMods: ThunderstoreCombo[], assignId: number): Promise<void> {
         try {
-            await installModsAndResolveConflicts(downloadedMods, this.profile.asImmutableProfile(), this.$store);
+            await installModsAndResolveConflicts(downloadedMods, this.profile.asImmutableProfile(), this.$store, assignId);
         } catch (e) {
             this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
         }
diff --git a/src/components/profiles-modals/ImportProfileModal.vue b/src/components/profiles-modals/ImportProfileModal.vue
index 70ef23421..063b43c11 100644
--- a/src/components/profiles-modals/ImportProfileModal.vue
+++ b/src/components/profiles-modals/ImportProfileModal.vue
@@ -212,9 +212,7 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
     async importProfile(targetProfileName: string, mods: ExportMod[], zipPath: string) {
         this.activeStep = 'PROFILE_IS_BEING_IMPORTED';
         this.importPhaseDescription = 'Downloading mods: 0%';
-        const progressCallback = (progress: number|string) => typeof progress === "number"
-            ? this.importPhaseDescription = `Downloading mods: ${Math.floor(progress)}%`
-            : this.importPhaseDescription = progress;
+        const progressCallback = (progressText: string) => this.importPhaseDescription = progressText;
         const game = this.$store.state.activeGame;
         const settings = this.$store.getters['settings'];
         const ignoreCache = settings.getContext().global.ignoreCache;
@@ -222,8 +220,12 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
 
         try {
             const comboList = await ProfileUtils.exportModsToCombos(mods, game);
-            await ThunderstoreDownloaderProvider.instance.downloadImportedMods(comboList, ignoreCache, progressCallback);
-            await ProfileUtils.populateImportedProfile(comboList, mods, targetProfileName, isUpdate, zipPath, progressCallback);
+            await ThunderstoreDownloaderProvider.instance.downloadImportedMods(comboList, ignoreCache, (progress) => {
+                progressCallback(`Downloading mods: ${Math.floor(progress)}%`)
+            });
+            await ProfileUtils.populateImportedProfile(comboList, mods, targetProfileName, isUpdate, zipPath, (progress) => {
+                progressCallback(`Copying mods to profile: ${progress}%`)
+            });
         } catch (e) {
             await this.$store.dispatch('profiles/ensureProfileExists');
             this.closeModal();
diff --git a/src/components/views/DownloadModModal.vue b/src/components/views/DownloadModModal.vue
index d1a28100b..7812c16a3 100644
--- a/src/components/views/DownloadModModal.vue
+++ b/src/components/views/DownloadModModal.vue
@@ -4,13 +4,20 @@
             <div class="modal-background" @click="setIsModProgressModalOpen(false);"></div>
             <div class='modal-content'>
                 <div class='notification is-info'>
-                    <h3 class='title'>Downloading {{$store.getters['download/currentDownload'].modName}}</h3>
-                    <p>{{Math.floor($store.getters['download/currentDownload'].downloadProgress)}}% complete</p>
+                    <h3 class='title'>Downloading and installing {{$store.getters['download/currentDownload'].modName}}</h3>
+                    <p>Downloading: {{Math.floor($store.getters['download/currentDownload'].downloadProgress)}}% complete</p>
                     <Progress
                         :max='100'
                         :value="$store.getters['download/currentDownload'].downloadProgress"
                         :className="['is-dark']"
                     />
+                    <p v-if="$store.getters['download/currentDownload'].installationProgress">Installation: {{$store.getters['download/currentDownload'].installationProgress}}% complete</p>
+                    <p v-else>Installation: waiting for download to finish</p>
+                    <Progress
+                        :max='100'
+                        :value="$store.getters['download/currentDownload'].installationProgress"
+                        :className="['is-dark']"
+                    />
                 </div>
             </div>
             <button class="modal-close is-large" aria-label="close" @click="setIsModProgressModalOpen(false);"></button>
@@ -135,7 +142,7 @@ import ProfileModList from '../../r2mm/mods/ProfileModList';
                     this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
                     return;
                 }
-                await this.downloadCompletedCallback(downloadedMods);
+                await this.downloadCompletedCallback(downloadedMods, assignId);
                 this.setIsModProgressModalOpen(false);
             }, 1);
         }
diff --git a/src/components/views/UpdateAllInstalledModsModal.vue b/src/components/views/UpdateAllInstalledModsModal.vue
index a1c8ddd70..1a4528779 100644
--- a/src/components/views/UpdateAllInstalledModsModal.vue
+++ b/src/components/views/UpdateAllInstalledModsModal.vue
@@ -65,7 +65,7 @@ export default class UpdateAllInstalledModsModal extends mixins(DownloadMixin)
                 this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
             }
         }, async (downloadedMods) => {
-            await this.downloadCompletedCallback(downloadedMods);
+            await this.downloadCompletedCallback(downloadedMods, assignId);
             this.setIsModProgressModalOpen(false);
         });
     }
diff --git a/src/store/modules/DownloadModule.ts b/src/store/modules/DownloadModule.ts
index acc78f744..6325402b4 100644
--- a/src/store/modules/DownloadModule.ts
+++ b/src/store/modules/DownloadModule.ts
@@ -8,6 +8,7 @@ interface DownloadProgress {
     initialMods: string[];
     modName: string;
     downloadProgress: number;
+    installationProgress: number;
     failed: boolean;
 }
 
@@ -42,6 +43,7 @@ export const DownloadModule = {
                 initialMods,
                 modName: '',
                 downloadProgress: 0,
+                installationProgress: 0,
                 failed: false,
             };
             state.allDownloads = [...state.allDownloads, downloadObject];
@@ -52,7 +54,7 @@ export const DownloadModule = {
     getters: <GetterTree<State, RootState>>{
         activeDownloadCount(state) {
             const active = state.allDownloads.filter(
-                dl => !dl.failed && dl.downloadProgress < 100
+                dl => !dl.failed && dl.downloadProgress < 100 && dl.installationProgress < 100
             );
             return active.length;
         },
diff --git a/src/utils/ProfileUtils.ts b/src/utils/ProfileUtils.ts
index 164d5eb40..2447cb47c 100644
--- a/src/utils/ProfileUtils.ts
+++ b/src/utils/ProfileUtils.ts
@@ -37,7 +37,7 @@ export async function exportModsToCombos(exportMods: ExportMod[], game: Game): P
 async function extractConfigsToImportedProfile(
     file: string,
     profileName: string,
-    progressCallback: (status: string) => void
+    progressCallback: (status: number) => void
 ) {
     const zipEntries = await ZipProvider.instance.getEntries(file);
     const excludedFiles = ["export.r2x", "mods.yml"];
@@ -54,17 +54,20 @@ async function extractConfigsToImportedProfile(
         }
 
         const progress = Math.floor(((index + 1) / zipEntries.length) * 100);
-        progressCallback(`Copying configs to profile: ${progress}%`);
+        progressCallback(progress);
     }
 }
 
 export async function installModsAndResolveConflicts(
     downloadedMods: ThunderstoreCombo[],
     profile: ImmutableProfile,
-    store: Store<any>
+    store: Store<any>,
+    assignId: number
 ): Promise<void> {
     await ProfileModList.requestLock(async () => {
-        const modList: ManifestV2[] = await installModsToProfile(downloadedMods, profile);
+        const modList: ManifestV2[] = await installModsToProfile(downloadedMods, profile, undefined, (installationProgress) => {
+            store.commit('download/updateDownload', {assignId, installationProgress});
+        });
         await store.dispatch('profile/updateModList', modList);
         throwForR2Error(await ConflictManagementProvider.instance.resolveConflicts(modList, profile));
     });
@@ -79,7 +82,7 @@ export async function installModsToProfile(
     comboList: ThunderstoreCombo[],
     profile: ImmutableProfile,
     disabledModsOverride?: string[],
-    progressCallback?: (status: string) => void
+    progressCallback?: (status: number) => void
 ): Promise<ManifestV2[]> {
     const profileMods = await ProfileModList.getModList(profile);
     if (profileMods instanceof R2Error) {
@@ -120,7 +123,7 @@ export async function installModsToProfile(
 
             if (typeof progressCallback === "function") {
                 const progress = Math.floor(((index + 1) / comboList.length) * 100);
-                progressCallback(`Copying mods to profile: ${progress}%`);
+                progressCallback(progress);
             }
         }
     } catch (e) {
@@ -200,8 +203,12 @@ export async function populateImportedProfile(
 
     try {
         const disabledMods = exportModList.filter((m) => !m.isEnabled()).map((m) => m.getName());
-        await installModsToProfile(comboList, profile, disabledMods, progressCallback);
-        await extractConfigsToImportedProfile(zipPath, profile.getProfileName(), progressCallback);
+        await installModsToProfile(comboList, profile, disabledMods, (progress) => {
+            progressCallback(`Copying mods to profile: ${progress}%`);
+        });
+        await extractConfigsToImportedProfile(zipPath, profile.getProfileName(), (progress) => {
+            progressCallback(`Copying configs to profile: ${progress}%`);
+        });
     } catch (e) {
         await FileUtils.recursiveRemoveDirectoryIfExists(profile.getProfilePath());
         throw e;

From a7b06bd20618b9508a21f88d2762926f8cfd1c7f Mon Sep 17 00:00:00 2001
From: VilppeRiskidev <vili.manninen@riskidev.fi>
Date: Thu, 23 Jan 2025 16:18:52 +0200
Subject: [PATCH 81/95] Show installation progress in the DownloadMonitor
 correclty

---
 src/pages/DownloadMonitor.vue | 46 +++++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/pages/DownloadMonitor.vue b/src/pages/DownloadMonitor.vue
index 491eb8889..52c9ffdf5 100644
--- a/src/pages/DownloadMonitor.vue
+++ b/src/pages/DownloadMonitor.vue
@@ -19,19 +19,39 @@
                         <div class="border-at-bottom pad pad--sides">
                             <div class="card is-shadowless">
                                 <p><strong>{{ downloadObject.initialMods.join(", ") }}</strong></p>
-                                <p v-if="downloadObject.failed">Downloading failed</p>
-                                <p v-if="downloadObject.progress < 100 && !downloadObject.failed">Downloading: {{ downloadObject.modName }}</p>
-                                <p v-if="!downloadObject.failed">{{Math.min(Math.floor(downloadObject.progress), 100)}}% complete</p>
-                                <Progress v-if="!downloadObject.failed"
-                                    :max='100'
-                                    :value='downloadObject.progress'
-                                    :className="['is-info']"
-                                />
-                                <Progress v-else-if="downloadObject.failed"
-                                    :max='100'
-                                    :value='100'
-                                    :className="['is-danger']"
-                                />
+
+                                <div v-if="!downloadObject.failed && downloadObject.downloadProgress < 100">
+                                    <p>Downloading: {{ downloadObject.modName }}</p>
+                                    <p>{{Math.min(Math.floor(downloadObject.downloadProgress), 100)}}% complete</p>
+                                    <Progress
+                                        :max='100'
+                                        :value='downloadObject.downloadProgress'
+                                        :className="['is-info']"
+                                    />
+                                </div>
+
+                                <div v-else-if="!downloadObject.failed && downloadObject.installationProgress < 100">
+                                    <p v-if="downloadObject.installationProgress < 100">Installing: {{ downloadObject.modName }}</p>
+                                    <p>{{Math.min(Math.floor(downloadObject.installationProgress), 100)}}% complete</p>
+                                    <Progress
+                                        :max='100'
+                                        :value='downloadObject.installationProgress'
+                                        :className="['is-info']"
+                                    />
+                                </div>
+
+                                <div v-else-if="downloadObject.failed">
+                                    <p>{{downloadObject.failed ? "Download failed" : `${Math.min(Math.floor(downloadObject.installationProgress), 100)}% complete`}}</p>
+                                    <Progress
+                                        :max='100'
+                                        :value='100'
+                                        :className="['is-danger']"
+                                    />
+                                </div>
+
+                                <div v-else>
+                                    <p>Status unknown</p>
+                                </div>
                             </div>
                         </div>
                     </div>

From bc47bc5fad530444b0abcff4ff5b15d78908269d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Wed, 29 Jan 2025 12:27:18 +0200
Subject: [PATCH 82/95] Obfuscate Windows usernames from troubleshooting info

---
 src/store/modules/ProfileModule.ts            |  7 +-
 src/utils/FileUtils.ts                        |  9 +++
 .../utils/utils.FileUtils.ts.spec.ts          | 69 +++++++++++++++++++
 3 files changed, 82 insertions(+), 3 deletions(-)
 create mode 100644 test/jest/__tests__/utils/utils.FileUtils.ts.spec.ts

diff --git a/src/store/modules/ProfileModule.ts b/src/store/modules/ProfileModule.ts
index 0115278d9..cbb9cb16c 100644
--- a/src/store/modules/ProfileModule.ts
+++ b/src/store/modules/ProfileModule.ts
@@ -18,6 +18,7 @@ import ManagerSettings from '../../r2mm/manager/ManagerSettings';
 import * as PackageDb from '../../r2mm/manager/PackageDexieStore';
 import ModListSort from '../../r2mm/mods/ModListSort';
 import ProfileModList from '../../r2mm/mods/ProfileModList';
+import FileUtils from '../../utils/FileUtils';
 import SearchUtils from '../../utils/SearchUtils';
 
 interface State {
@@ -301,9 +302,9 @@ export default {
 
         async generateTroubleshootingString({dispatch, getters, rootGetters, rootState}): Promise<string> {
             const steamDirectory = await GameDirectoryResolverProvider.instance.getSteamDirectory();
-            const steamPath = steamDirectory instanceof R2Error ? '-' : steamDirectory;
+            const steamPath = steamDirectory instanceof R2Error ? '-' : FileUtils.hideWindowsUsername(steamDirectory);
             const gameDirectory = await GameDirectoryResolverProvider.instance.getDirectory(rootState.activeGame);
-            const gamePath = gameDirectory instanceof R2Error ? '-' : gameDirectory;
+            const gamePath = gameDirectory instanceof R2Error ? '-' : FileUtils.hideWindowsUsername(gameDirectory);
             const packageCacheDate = await PackageDb.getLastPackageListUpdateTime(rootState.activeGame.internalFolderName);
             const packageCacheSize = await PackageDb.getPackageCount(rootState.activeGame.internalFolderName);
             const packageVuexState: string = await dispatch('tsMods/generateTroubleshootingString', null, {root: true});
@@ -313,7 +314,7 @@ export default {
                 Game: ${rootState.activeGame.displayName} (${rootState.activeGame.activePlatform.storePlatform})
                 Steam path: ${steamPath}
                 Game path: ${gamePath}
-                Profile path: ${getters.activeProfile.getProfilePath()}
+                Profile path: ${FileUtils.hideWindowsUsername(getters.activeProfile.getProfilePath())}
                 Custom launch arguments: ${rootGetters.settings.getContext().gameSpecific.launchParameters || '-'}
                 Mod list in cache: ${packageCacheSize} mods, hash updated ${packageCacheDate || 'never'}
                 Mod list in memory: ${packageVuexState}
diff --git a/src/utils/FileUtils.ts b/src/utils/FileUtils.ts
index 2be531fdd..3c1d0ee80 100644
--- a/src/utils/FileUtils.ts
+++ b/src/utils/FileUtils.ts
@@ -31,6 +31,15 @@ export default class FileUtils {
         return Promise.resolve();
     }
 
+    // Obfuscates the Windows username if it's part of the path.
+    public static hideWindowsUsername(dir: string) {
+        const separator = dir.includes('/') ? '/' : '\\';
+        return dir.replace(
+            /([A-Za-z]:)[\\\/]Users[\\\/][^\\\/]+[\\\/]/,
+            `$1${separator}Users${separator}***${separator}`
+        );
+    }
+
     public static humanReadableSize(bytes: number) {
         // NumberFormat renders GBs as BBs ("billion bytes") when using "byte" unit type.
         if (bytes > 999999999 && bytes < 1000000000000) {
diff --git a/test/jest/__tests__/utils/utils.FileUtils.ts.spec.ts b/test/jest/__tests__/utils/utils.FileUtils.ts.spec.ts
new file mode 100644
index 000000000..21c389a94
--- /dev/null
+++ b/test/jest/__tests__/utils/utils.FileUtils.ts.spec.ts
@@ -0,0 +1,69 @@
+import FileUtils from "../../../../src/utils/FileUtils";
+
+describe("FileUtils.hideWindowsUsername", () => {
+    it("Doesn't change slashes", () => {
+        expect(
+            FileUtils.hideWindowsUsername('C:\\Users\\Alice\\appData')
+        ).toStrictEqual('C:\\Users\\***\\appData');
+
+        expect(
+            FileUtils.hideWindowsUsername('C:/Users/Bob/appData')
+        ).toStrictEqual('C:/Users/***/appData');
+    });
+
+    it("Doesn't change drive letters", () => {
+        expect(
+            FileUtils.hideWindowsUsername('C:\\Users\\Charlie\\appData')
+        ).toStrictEqual('C:\\Users\\***\\appData');
+
+        expect(
+            FileUtils.hideWindowsUsername('x:\\Users\\David\\appData')
+        ).toStrictEqual('x:\\Users\\***\\appData');
+    });
+
+    it("Doesn't change the rest of the path", () => {
+        expect(
+            FileUtils.hideWindowsUsername('C:\\Users\\Eve\\')
+        ).toStrictEqual('C:\\Users\\***\\');
+
+        expect(
+            FileUtils.hideWindowsUsername('C:\\Users\\Frank\\Desktop')
+        ).toStrictEqual('C:\\Users\\***\\Desktop');
+
+        expect(
+            FileUtils.hideWindowsUsername('C:\\Users\\Grace\\Desktop\\')
+        ).toStrictEqual('C:\\Users\\***\\Desktop\\');
+
+        expect(
+            FileUtils.hideWindowsUsername('C:\\Users\\Heidi\\Desktop\\file.txt')
+        ).toStrictEqual('C:\\Users\\***\\Desktop\\file.txt');
+    });
+
+    it("Doesn't affect other paths", () => {
+        expect(
+            FileUtils.hideWindowsUsername('C:\\LUsers\\Ivan\\')
+        ).toStrictEqual('C:\\LUsers\\Ivan\\');
+
+        expect(
+            FileUtils.hideWindowsUsername('C:\\temp\\Users\\Judy\\')
+        ).toStrictEqual('C:\\temp\\Users\\Judy\\');
+    });
+
+    it("Isn't tricked by odd usernames", () => {
+        expect(
+            FileUtils.hideWindowsUsername('C:\\Users\\123\\')
+        ).toStrictEqual('C:\\Users\\***\\');
+
+        expect(
+            FileUtils.hideWindowsUsername('C:\\Users\\@admin\\')
+        ).toStrictEqual('C:\\Users\\***\\');
+
+        expect(
+            FileUtils.hideWindowsUsername('C:\\Users\\_\\')
+        ).toStrictEqual('C:\\Users\\***\\');
+
+        expect(
+            FileUtils.hideWindowsUsername('C:\\Users\\***\\')
+        ).toStrictEqual('C:\\Users\\***\\');
+    });
+});

From c359b2848d7838844196c97df95eacde8dbe1cfd Mon Sep 17 00:00:00 2001
From: VilppeRiskidev <vili.manninen@riskidev.fi>
Date: Tue, 28 Jan 2025 14:54:40 +0200
Subject: [PATCH 83/95] Further improve installation progress tracking

---
 src/components/mixins/DownloadMixin.vue       | 60 +++++++++++--------
 .../profiles-modals/ImportProfileModal.vue    | 12 ++--
 src/components/views/DownloadModModal.vue     |  8 +--
 .../views/UpdateAllInstalledModsModal.vue     |  2 +-
 src/pages/DownloadMonitor.vue                 | 43 ++++++++-----
 .../BetterThunderstoreDownloader.ts           | 12 ++--
 src/store/modules/DownloadModule.ts           |  6 +-
 src/utils/ProfileUtils.ts                     | 36 +++--------
 8 files changed, 95 insertions(+), 84 deletions(-)

diff --git a/src/components/mixins/DownloadMixin.vue b/src/components/mixins/DownloadMixin.vue
index f4e5d3331..e0fa2cd0a 100644
--- a/src/components/mixins/DownloadMixin.vue
+++ b/src/components/mixins/DownloadMixin.vue
@@ -1,15 +1,18 @@
 <script lang='ts'>
 import Vue from 'vue';
 import Component from 'vue-class-component';
+import { Store } from "vuex";
 
 import StatusEnum from "../../model/enums/StatusEnum";
-import R2Error from "../../model/errors/R2Error";
+import R2Error, { throwForR2Error } from "../../model/errors/R2Error";
 import Game from "../../model/game/Game";
-import Profile from "../../model/Profile";
+import ManifestV2 from "../../model/ManifestV2";
+import Profile, { ImmutableProfile } from "../../model/Profile";
 import ThunderstoreCombo from "../../model/ThunderstoreCombo";
 import ThunderstoreMod from "../../model/ThunderstoreMod";
-import { installModsAndResolveConflicts } from "../../utils/ProfileUtils";
-import { Store } from "vuex";
+import ConflictManagementProvider from "../../providers/generic/installing/ConflictManagementProvider";
+import ProfileModList from "../../r2mm/mods/ProfileModList";
+import { installModsToProfile } from "../../utils/ProfileUtils";
 
 
 @Component
@@ -46,41 +49,50 @@ export default class DownloadMixin extends Vue {
 
     async downloadCompletedCallback(downloadedMods: ThunderstoreCombo[], assignId: number): Promise<void> {
         try {
-            await installModsAndResolveConflicts(downloadedMods, this.profile.asImmutableProfile(), this.$store, assignId);
+            await this.installModsAndResolveConflicts(downloadedMods, this.profile.asImmutableProfile(), assignId);
         } catch (e) {
+            this.$store.commit('download/updateDownload', {assignId, failed: true});
             this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
         }
     }
 
-    downloadProgressCallback(assignId: number, downloadProgress: number, modName: string, status: number, err: R2Error | null) {
-        try {
-            if (status === StatusEnum.FAILURE) {
-                this.setIsModProgressModalOpen(false);
-                this.$store.commit('download/updateDownload', {assignId, failed: true});
-                if (err !== null) {
-                    DownloadMixin.addSolutionsToError(err);
-                    throw err;
-                }
-            } else if (status === StatusEnum.PENDING) {
-                this.$store.commit('download/updateDownload', {assignId, downloadProgress, modName});
-            }
-        } catch (e) {
-            this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
-        }
-    };
-
-    static downloadProgressCallback(store: Store<any>, assignId: number, downloadProgress: number, modName: string, status: number, err: R2Error | null) {
+    static downloadProgressCallback(
+        store: Store<any>,
+        assignId: number,
+        downloadProgress: number,
+        modName: string,
+        status: number,
+        err: R2Error | null,
+        closeModProgressModal?: () => void,
+    ) {
         if (status === StatusEnum.FAILURE) {
+            if (closeModProgressModal !== undefined) {
+                closeModProgressModal();
+            }
             store.commit('download/updateDownload', {assignId, failed: true});
             if (err !== null) {
                 DownloadMixin.addSolutionsToError(err);
                 throw err;
             }
-        } else if (status === StatusEnum.PENDING) {
+        } else if (status === StatusEnum.PENDING || status === StatusEnum.SUCCESS) {
             store.commit('download/updateDownload', {assignId, downloadProgress, modName});
         }
     }
 
+    async installModsAndResolveConflicts(
+        downloadedMods: ThunderstoreCombo[],
+        profile: ImmutableProfile,
+        assignId: number
+    ): Promise<void> {
+        await ProfileModList.requestLock(async () => {
+            const modList: ManifestV2[] = await installModsToProfile(downloadedMods, profile, undefined,(status, progress) => {
+                this.$store.commit('download/updateDownload', {assignId, installProgress: progress});
+            });
+            await this.$store.dispatch('profile/updateModList', modList);
+            throwForR2Error(await ConflictManagementProvider.instance.resolveConflicts(modList, profile));
+        });
+    }
+
     static addSolutionsToError(err: R2Error): void {
         // Sanity check typing.
         if (!(err instanceof R2Error)) {
diff --git a/src/components/profiles-modals/ImportProfileModal.vue b/src/components/profiles-modals/ImportProfileModal.vue
index 063b43c11..70ef23421 100644
--- a/src/components/profiles-modals/ImportProfileModal.vue
+++ b/src/components/profiles-modals/ImportProfileModal.vue
@@ -212,7 +212,9 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
     async importProfile(targetProfileName: string, mods: ExportMod[], zipPath: string) {
         this.activeStep = 'PROFILE_IS_BEING_IMPORTED';
         this.importPhaseDescription = 'Downloading mods: 0%';
-        const progressCallback = (progressText: string) => this.importPhaseDescription = progressText;
+        const progressCallback = (progress: number|string) => typeof progress === "number"
+            ? this.importPhaseDescription = `Downloading mods: ${Math.floor(progress)}%`
+            : this.importPhaseDescription = progress;
         const game = this.$store.state.activeGame;
         const settings = this.$store.getters['settings'];
         const ignoreCache = settings.getContext().global.ignoreCache;
@@ -220,12 +222,8 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
 
         try {
             const comboList = await ProfileUtils.exportModsToCombos(mods, game);
-            await ThunderstoreDownloaderProvider.instance.downloadImportedMods(comboList, ignoreCache, (progress) => {
-                progressCallback(`Downloading mods: ${Math.floor(progress)}%`)
-            });
-            await ProfileUtils.populateImportedProfile(comboList, mods, targetProfileName, isUpdate, zipPath, (progress) => {
-                progressCallback(`Copying mods to profile: ${progress}%`)
-            });
+            await ThunderstoreDownloaderProvider.instance.downloadImportedMods(comboList, ignoreCache, progressCallback);
+            await ProfileUtils.populateImportedProfile(comboList, mods, targetProfileName, isUpdate, zipPath, progressCallback);
         } catch (e) {
             await this.$store.dispatch('profiles/ensureProfileExists');
             this.closeModal();
diff --git a/src/components/views/DownloadModModal.vue b/src/components/views/DownloadModModal.vue
index 7812c16a3..631c70e53 100644
--- a/src/components/views/DownloadModModal.vue
+++ b/src/components/views/DownloadModModal.vue
@@ -11,11 +11,11 @@
                         :value="$store.getters['download/currentDownload'].downloadProgress"
                         :className="['is-dark']"
                     />
-                    <p v-if="$store.getters['download/currentDownload'].installationProgress">Installation: {{$store.getters['download/currentDownload'].installationProgress}}% complete</p>
-                    <p v-else>Installation: waiting for download to finish</p>
+                    <p v-if="$store.getters['download/currentDownload'].installProgress">Installing: {{$store.getters['download/currentDownload'].installProgress}}% complete</p>
+                    <p v-else>Installing: waiting for download to finish</p>
                     <Progress
                         :max='100'
-                        :value="$store.getters['download/currentDownload'].installationProgress"
+                        :value="$store.getters['download/currentDownload'].installProgress"
                         :className="['is-dark']"
                     />
                 </div>
@@ -134,7 +134,7 @@ import ProfileModList from '../../r2mm/mods/ProfileModList';
                         this.profile.asImmutableProfile(),
                         tsCombo,
                         this.ignoreCache,
-                        (downloadProgress, modName, status, err) => { this.downloadProgressCallback(assignId, downloadProgress, modName, status, err); }
+                        (downloadProgress, modName, status, err) => { DownloadMixin.downloadProgressCallback(this.$store, assignId, downloadProgress, modName, status, err, () => this.setIsModProgressModalOpen(false)); }
                     );
                 } catch (e) {
                     this.setIsModProgressModalOpen(false);
diff --git a/src/components/views/UpdateAllInstalledModsModal.vue b/src/components/views/UpdateAllInstalledModsModal.vue
index 1a4528779..f4aacfb74 100644
--- a/src/components/views/UpdateAllInstalledModsModal.vue
+++ b/src/components/views/UpdateAllInstalledModsModal.vue
@@ -59,7 +59,7 @@ export default class UpdateAllInstalledModsModal extends mixins(DownloadMixin)
                         throw err;
                     }
                 } else if (status === StatusEnum.PENDING) {
-                    this.$store.commit('download/updateDownload', {assignId, progress, modName});
+                    this.$store.commit('download/updateDownload', {assignId, downloadProgress: progress, modName});
                 }
             } catch (e) {
                 this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
diff --git a/src/pages/DownloadMonitor.vue b/src/pages/DownloadMonitor.vue
index 52c9ffdf5..6cdb27094 100644
--- a/src/pages/DownloadMonitor.vue
+++ b/src/pages/DownloadMonitor.vue
@@ -20,28 +20,43 @@
                             <div class="card is-shadowless">
                                 <p><strong>{{ downloadObject.initialMods.join(", ") }}</strong></p>
 
-                                <div v-if="!downloadObject.failed && downloadObject.downloadProgress < 100">
-                                    <p>Downloading: {{ downloadObject.modName }}</p>
-                                    <p>{{Math.min(Math.floor(downloadObject.downloadProgress), 100)}}% complete</p>
+                                <div v-if="downloadObject.failed">
+                                    <p>Download failed</p>
                                     <Progress
                                         :max='100'
-                                        :value='downloadObject.downloadProgress'
-                                        :className="['is-info']"
+                                        :value='100'
+                                        :className="['is-danger']"
                                     />
                                 </div>
 
-                                <div v-else-if="!downloadObject.failed && downloadObject.installationProgress < 100">
-                                    <p v-if="downloadObject.installationProgress < 100">Installing: {{ downloadObject.modName }}</p>
-                                    <p>{{Math.min(Math.floor(downloadObject.installationProgress), 100)}}% complete</p>
-                                    <Progress
-                                        :max='100'
-                                        :value='downloadObject.installationProgress'
-                                        :className="['is-info']"
-                                    />
+                                <div v-else class="row">
+
+                                    <div class="col">
+                                        <p v-if="downloadObject.downloadProgress < 100">Downloading: {{ downloadObject.modName }}</p>
+                                        <p v-else>Downloading:</p>
+                                        <p>{{Math.min(Math.floor(downloadObject.downloadProgress), 100)}}% complete</p>
+                                        <Progress
+                                            :max='100'
+                                            :value='downloadObject.downloadProgress'
+                                            :className="['is-info']"
+                                        />
+                                    </div>
+
+                                    <div v-if="downloadObject.installProgress < 100" class="col">
+                                        <p>Installing:</p>
+                                        <p v-if="downloadObject.downloadProgress < 100">Installing: waiting for download to finish</p>
+                                        <p v-else>{{Math.min(Math.floor(downloadObject.installProgress), 100)}}% complete</p>
+                                        <Progress
+                                            :max='100'
+                                            :value='downloadObject.installProgress'
+                                            :className="['is-info']"
+                                        />
+                                    </div>
+
                                 </div>
 
                                 <div v-else-if="downloadObject.failed">
-                                    <p>{{downloadObject.failed ? "Download failed" : `${Math.min(Math.floor(downloadObject.installationProgress), 100)}% complete`}}</p>
+                                    <p>{{downloadObject.failed ? "Download failed" : `${Math.min(Math.floor(downloadObject.installProgress), 100)}% complete`}}</p>
                                     <Progress
                                         :max='100'
                                         :value='100'
diff --git a/src/r2mm/downloading/BetterThunderstoreDownloader.ts b/src/r2mm/downloading/BetterThunderstoreDownloader.ts
index ebf0230ff..f4a79cc95 100644
--- a/src/r2mm/downloading/BetterThunderstoreDownloader.ts
+++ b/src/r2mm/downloading/BetterThunderstoreDownloader.ts
@@ -99,7 +99,7 @@ export default class BetterThunderstoreDownloader extends ThunderstoreDownloader
         const allModsToDownload = [...dependencies, combo];
 
         let downloadCount = 0;
-        const singleModProgressCallback = (progress: number, status: number, err: R2Error | null) => {
+        const singleModProgressCallback = (modName: string, progress: number, status: number, err: R2Error | null) => {
             if (status === StatusEnum.FAILURE) {
                 throw err;
             }
@@ -114,7 +114,7 @@ export default class BetterThunderstoreDownloader extends ThunderstoreDownloader
                 console.error(`Ignore unknown status code "${status}"`);
                 return;
             }
-            totalProgressCallback(totalProgress, combo.getMod().getName(), status, err);
+            totalProgressCallback(totalProgress, modName, status, err);
         }
 
         for (const combo of allModsToDownload) {
@@ -124,8 +124,12 @@ export default class BetterThunderstoreDownloader extends ThunderstoreDownloader
             }
 
             try {
-                const response = await this._downloadCombo(combo, singleModProgressCallback);
-                await this._saveDownloadResponse(response, combo, singleModProgressCallback);
+                const response = await this._downloadCombo(combo, (progress, status, err) => {
+                    singleModProgressCallback(combo.getMod().getName(), progress, status, err)
+                });
+                await this._saveDownloadResponse(response, combo, (progress, status, err) => {
+                    singleModProgressCallback(combo.getMod().getName(), progress, status, err)
+                });
             } catch(e) {
                 throw R2Error.fromThrownValue(e, `Failed to download mod ${combo.getVersion().getFullName()}`);
             }
diff --git a/src/store/modules/DownloadModule.ts b/src/store/modules/DownloadModule.ts
index 6325402b4..6ef4e0da2 100644
--- a/src/store/modules/DownloadModule.ts
+++ b/src/store/modules/DownloadModule.ts
@@ -8,7 +8,7 @@ interface DownloadProgress {
     initialMods: string[];
     modName: string;
     downloadProgress: number;
-    installationProgress: number;
+    installProgress: number;
     failed: boolean;
 }
 
@@ -43,7 +43,7 @@ export const DownloadModule = {
                 initialMods,
                 modName: '',
                 downloadProgress: 0,
-                installationProgress: 0,
+                installProgress: 0,
                 failed: false,
             };
             state.allDownloads = [...state.allDownloads, downloadObject];
@@ -54,7 +54,7 @@ export const DownloadModule = {
     getters: <GetterTree<State, RootState>>{
         activeDownloadCount(state) {
             const active = state.allDownloads.filter(
-                dl => !dl.failed && dl.downloadProgress < 100 && dl.installationProgress < 100
+                dl => !dl.failed && dl.downloadProgress < 100 && dl.installProgress < 100
             );
             return active.length;
         },
diff --git a/src/utils/ProfileUtils.ts b/src/utils/ProfileUtils.ts
index 2447cb47c..e20f696e1 100644
--- a/src/utils/ProfileUtils.ts
+++ b/src/utils/ProfileUtils.ts
@@ -1,7 +1,6 @@
 import path from "path";
 
 import * as yaml from "yaml";
-import { Store } from "vuex";
 
 import FileUtils from "./FileUtils";
 import R2Error, { throwForR2Error } from "../model/errors/R2Error";
@@ -13,7 +12,6 @@ import Profile, { ImmutableProfile } from "../model/Profile";
 import ThunderstoreCombo from "../model/ThunderstoreCombo";
 import VersionNumber from "../model/VersionNumber";
 import FsProvider from "../providers/generic/file/FsProvider";
-import ConflictManagementProvider from "../providers/generic/installing/ConflictManagementProvider";
 import ZipProvider from "../providers/generic/zip/ZipProvider";
 import ProfileInstallerProvider from "../providers/ror2/installing/ProfileInstallerProvider";
 import * as PackageDb from '../r2mm/manager/PackageDexieStore';
@@ -37,7 +35,7 @@ export async function exportModsToCombos(exportMods: ExportMod[], game: Game): P
 async function extractConfigsToImportedProfile(
     file: string,
     profileName: string,
-    progressCallback: (status: number) => void
+    progressCallback: (status: string) => void
 ) {
     const zipEntries = await ZipProvider.instance.getEntries(file);
     const excludedFiles = ["export.r2x", "mods.yml"];
@@ -54,25 +52,10 @@ async function extractConfigsToImportedProfile(
         }
 
         const progress = Math.floor(((index + 1) / zipEntries.length) * 100);
-        progressCallback(progress);
+        progressCallback(`Copying configs to profile: ${progress}%`);
     }
 }
 
-export async function installModsAndResolveConflicts(
-    downloadedMods: ThunderstoreCombo[],
-    profile: ImmutableProfile,
-    store: Store<any>,
-    assignId: number
-): Promise<void> {
-    await ProfileModList.requestLock(async () => {
-        const modList: ManifestV2[] = await installModsToProfile(downloadedMods, profile, undefined, (installationProgress) => {
-            store.commit('download/updateDownload', {assignId, installationProgress});
-        });
-        await store.dispatch('profile/updateModList', modList);
-        throwForR2Error(await ConflictManagementProvider.instance.resolveConflicts(modList, profile));
-    });
-}
-
 /**
  * Install mods to target profile and sync the changes to mods.yml file
  * This is more performant than calling ProfileModList.addMod() on a
@@ -82,7 +65,7 @@ export async function installModsToProfile(
     comboList: ThunderstoreCombo[],
     profile: ImmutableProfile,
     disabledModsOverride?: string[],
-    progressCallback?: (status: number) => void
+    progressCallback?: (status: string, progress?: number) => void
 ): Promise<ManifestV2[]> {
     const profileMods = await ProfileModList.getModList(profile);
     if (profileMods instanceof R2Error) {
@@ -123,7 +106,7 @@ export async function installModsToProfile(
 
             if (typeof progressCallback === "function") {
                 const progress = Math.floor(((index + 1) / comboList.length) * 100);
-                progressCallback(progress);
+                progressCallback(`Copying mods to profile: ${progress}%`, progress);
             }
         }
     } catch (e) {
@@ -137,6 +120,9 @@ export async function installModsToProfile(
     }
 
     throwForR2Error(await ProfileModList.saveModList(profile, profileMods));
+    if (typeof progressCallback === "function") {
+        progressCallback("Copying mods to profile: 100%", 100);
+    }
     return profileMods;
 }
 
@@ -203,12 +189,8 @@ export async function populateImportedProfile(
 
     try {
         const disabledMods = exportModList.filter((m) => !m.isEnabled()).map((m) => m.getName());
-        await installModsToProfile(comboList, profile, disabledMods, (progress) => {
-            progressCallback(`Copying mods to profile: ${progress}%`);
-        });
-        await extractConfigsToImportedProfile(zipPath, profile.getProfileName(), (progress) => {
-            progressCallback(`Copying configs to profile: ${progress}%`);
-        });
+        await installModsToProfile(comboList, profile, disabledMods, progressCallback);
+        await extractConfigsToImportedProfile(zipPath, profile.getProfileName(), progressCallback);
     } catch (e) {
         await FileUtils.recursiveRemoveDirectoryIfExists(profile.getProfilePath());
         throw e;

From d03f65a2d5ec969374704defb79c18de421f08b0 Mon Sep 17 00:00:00 2001
From: Vili Manninen <vili.manninen@riskidev.fi>
Date: Mon, 3 Feb 2025 17:51:25 +0200
Subject: [PATCH 84/95] Fix issues with mod download/install progress tracking

---
 src/components/mixins/DownloadMixin.vue       |  6 +--
 src/components/views/DownloadModModal.vue     | 14 ++++++-
 .../views/UpdateAllInstalledModsModal.vue     |  4 +-
 src/pages/DownloadMonitor.vue                 | 38 +++++++++----------
 .../BetterThunderstoreDownloader.ts           | 29 +++++++-------
 src/store/modules/DownloadModule.ts           |  4 +-
 src/utils/ProfileUtils.ts                     | 11 +++---
 7 files changed, 56 insertions(+), 50 deletions(-)

diff --git a/src/components/mixins/DownloadMixin.vue b/src/components/mixins/DownloadMixin.vue
index e0fa2cd0a..df9b681cc 100644
--- a/src/components/mixins/DownloadMixin.vue
+++ b/src/components/mixins/DownloadMixin.vue
@@ -75,7 +75,7 @@ export default class DownloadMixin extends Vue {
                 throw err;
             }
         } else if (status === StatusEnum.PENDING || status === StatusEnum.SUCCESS) {
-            store.commit('download/updateDownload', {assignId, downloadProgress, modName});
+            store.commit('download/updateDownload', {assignId, modName, downloadProgress});
         }
     }
 
@@ -85,8 +85,8 @@ export default class DownloadMixin extends Vue {
         assignId: number
     ): Promise<void> {
         await ProfileModList.requestLock(async () => {
-            const modList: ManifestV2[] = await installModsToProfile(downloadedMods, profile, undefined,(status, progress) => {
-                this.$store.commit('download/updateDownload', {assignId, installProgress: progress});
+            const modList: ManifestV2[] = await installModsToProfile(downloadedMods, profile, undefined,(status, modName, installProgress) => {
+                this.$store.commit('download/updateDownload', {assignId, modName, installProgress});
             });
             await this.$store.dispatch('profile/updateModList', modList);
             throwForR2Error(await ConflictManagementProvider.instance.resolveConflicts(modList, profile));
diff --git a/src/components/views/DownloadModModal.vue b/src/components/views/DownloadModModal.vue
index 631c70e53..76d18b171 100644
--- a/src/components/views/DownloadModModal.vue
+++ b/src/components/views/DownloadModModal.vue
@@ -134,11 +134,21 @@ import ProfileModList from '../../r2mm/mods/ProfileModList';
                         this.profile.asImmutableProfile(),
                         tsCombo,
                         this.ignoreCache,
-                        (downloadProgress, modName, status, err) => { DownloadMixin.downloadProgressCallback(this.$store, assignId, downloadProgress, modName, status, err, () => this.setIsModProgressModalOpen(false)); }
+                        (downloadProgress, modName, status, err) => {
+                            DownloadMixin.downloadProgressCallback(
+                                this.$store,
+                                assignId,
+                                downloadProgress,
+                                modName,
+                                status,
+                                err,
+                                () => this.setIsModProgressModalOpen(false)
+                            );
+                        }
                     );
                 } catch (e) {
                     this.setIsModProgressModalOpen(false);
-                    this.$store.commit('download/updateDownload', { assignId: assignId, failed: true });
+                    this.$store.commit('download/updateDownload', { assignId, failed: true });
                     this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
                     return;
                 }
diff --git a/src/components/views/UpdateAllInstalledModsModal.vue b/src/components/views/UpdateAllInstalledModsModal.vue
index f4aacfb74..67a8f8d00 100644
--- a/src/components/views/UpdateAllInstalledModsModal.vue
+++ b/src/components/views/UpdateAllInstalledModsModal.vue
@@ -49,7 +49,7 @@ export default class UpdateAllInstalledModsModal extends mixins(DownloadMixin)
         );
 
         this.setIsModProgressModalOpen(true);
-        ThunderstoreDownloaderProvider.instance.downloadLatestOfAll(modsWithUpdates, this.ignoreCache, (progress: number, modName: string, status: number, err: R2Error | null) => {
+        ThunderstoreDownloaderProvider.instance.downloadLatestOfAll(modsWithUpdates, this.ignoreCache, (downloadProgress: number, modName: string, status: number, err: R2Error | null) => {
             try {
                 if (status === StatusEnum.FAILURE) {
                     this.setIsModProgressModalOpen(false);
@@ -59,7 +59,7 @@ export default class UpdateAllInstalledModsModal extends mixins(DownloadMixin)
                         throw err;
                     }
                 } else if (status === StatusEnum.PENDING) {
-                    this.$store.commit('download/updateDownload', {assignId, downloadProgress: progress, modName});
+                    this.$store.commit('download/updateDownload', {assignId, modName, downloadProgress});
                 }
             } catch (e) {
                 this.$store.commit('error/handleError', R2Error.fromThrownValue(e));
diff --git a/src/pages/DownloadMonitor.vue b/src/pages/DownloadMonitor.vue
index 6cdb27094..7fb9ac6d1 100644
--- a/src/pages/DownloadMonitor.vue
+++ b/src/pages/DownloadMonitor.vue
@@ -43,30 +43,26 @@
                                     </div>
 
                                     <div v-if="downloadObject.installProgress < 100" class="col">
-                                        <p>Installing:</p>
-                                        <p v-if="downloadObject.downloadProgress < 100">Installing: waiting for download to finish</p>
-                                        <p v-else>{{Math.min(Math.floor(downloadObject.installProgress), 100)}}% complete</p>
-                                        <Progress
-                                            :max='100'
-                                            :value='downloadObject.installProgress'
-                                            :className="['is-info']"
-                                        />
+                                        <div v-if="downloadObject.downloadProgress < 100">
+                                            <p>Installing:</p>
+                                            <p v-if="downloadObject.downloadProgress < 100">Waiting for download to finish</p>
+                                            <Progress
+                                                :max='100'
+                                                :className="['is-info']"
+                                            />
+                                        </div>
+                                        <div v-else>
+                                            <p>Installing: {{ downloadObject.modName }}</p>
+                                            <p>{{Math.min(Math.floor(downloadObject.installProgress), 100)}}% complete</p>
+                                            <Progress
+                                                :max='100'
+                                                :value='downloadObject.installProgress'
+                                                :className="['is-info']"
+                                            />
+                                        </div>
                                     </div>
 
                                 </div>
-
-                                <div v-else-if="downloadObject.failed">
-                                    <p>{{downloadObject.failed ? "Download failed" : `${Math.min(Math.floor(downloadObject.installProgress), 100)}% complete`}}</p>
-                                    <Progress
-                                        :max='100'
-                                        :value='100'
-                                        :className="['is-danger']"
-                                    />
-                                </div>
-
-                                <div v-else>
-                                    <p>Status unknown</p>
-                                </div>
                             </div>
                         </div>
                     </div>
diff --git a/src/r2mm/downloading/BetterThunderstoreDownloader.ts b/src/r2mm/downloading/BetterThunderstoreDownloader.ts
index f4a79cc95..51d1b4422 100644
--- a/src/r2mm/downloading/BetterThunderstoreDownloader.ts
+++ b/src/r2mm/downloading/BetterThunderstoreDownloader.ts
@@ -98,40 +98,39 @@ export default class BetterThunderstoreDownloader extends ThunderstoreDownloader
         const dependencies = await this.getDependenciesWithCorrectVersions(combo, modList);
         const allModsToDownload = [...dependencies, combo];
 
+        let modInProgressName = combo.getMod().getName();
         let downloadCount = 0;
-        const singleModProgressCallback = (modName: string, progress: number, status: number, err: R2Error | null) => {
+        const singleModProgressCallback = (downloadProgress: number, status: number, err: R2Error | null) => {
             if (status === StatusEnum.FAILURE) {
                 throw err;
             }
 
-            let totalProgress: number;
+            let totalDownloadProgress: number;
             if (status === StatusEnum.PENDING) {
-                totalProgress = this.generateProgressPercentage(progress, downloadCount, allModsToDownload.length);
+                totalDownloadProgress = this.generateProgressPercentage(downloadProgress, downloadCount, allModsToDownload.length);
             } else if (status === StatusEnum.SUCCESS) {
-                totalProgress = this.generateProgressPercentage(100, downloadCount, allModsToDownload.length);
+                totalDownloadProgress = this.generateProgressPercentage(100, downloadCount, allModsToDownload.length);
                 downloadCount += 1;
             } else {
                 console.error(`Ignore unknown status code "${status}"`);
                 return;
             }
-            totalProgressCallback(totalProgress, modName, status, err);
+            totalProgressCallback(Math.round(totalDownloadProgress), modInProgressName, status, err);
         }
 
-        for (const combo of allModsToDownload) {
-            if (!ignoreCache && await this.isVersionAlreadyDownloaded(combo)) {
-                totalProgressCallback(100, combo.getMod().getName(), StatusEnum.SUCCESS, null);
+        for (const comboInProgress of allModsToDownload) {
+            modInProgressName = comboInProgress.getMod().getName();
+
+            if (!ignoreCache && await this.isVersionAlreadyDownloaded(comboInProgress)) {
+                totalProgressCallback(100, modInProgressName, StatusEnum.SUCCESS, null);
                 continue;
             }
 
             try {
-                const response = await this._downloadCombo(combo, (progress, status, err) => {
-                    singleModProgressCallback(combo.getMod().getName(), progress, status, err)
-                });
-                await this._saveDownloadResponse(response, combo, (progress, status, err) => {
-                    singleModProgressCallback(combo.getMod().getName(), progress, status, err)
-                });
+                const response = await this._downloadCombo(comboInProgress, singleModProgressCallback);
+                await this._saveDownloadResponse(response, comboInProgress, singleModProgressCallback);
             } catch(e) {
-                throw R2Error.fromThrownValue(e, `Failed to download mod ${combo.getVersion().getFullName()}`);
+                throw R2Error.fromThrownValue(e, `Failed to download mod ${comboInProgress.getVersion().getFullName()}`);
             }
         }
         return allModsToDownload;
diff --git a/src/store/modules/DownloadModule.ts b/src/store/modules/DownloadModule.ts
index 6ef4e0da2..3f2d567f1 100644
--- a/src/store/modules/DownloadModule.ts
+++ b/src/store/modules/DownloadModule.ts
@@ -1,7 +1,6 @@
 import { ActionTree, GetterTree } from "vuex";
 
 import { State as RootState } from "../../store";
-import R2Error from "../../model/errors/R2Error";
 
 interface DownloadProgress {
     assignId: number;
@@ -14,7 +13,8 @@ interface DownloadProgress {
 
 interface UpdateObject {
     assignId: number;
-    progress?: number;
+    downloadProgress?: number;
+    installProgress?: number;
     modName?: string;
     failed?: boolean;
 }
diff --git a/src/utils/ProfileUtils.ts b/src/utils/ProfileUtils.ts
index e20f696e1..232d553dc 100644
--- a/src/utils/ProfileUtils.ts
+++ b/src/utils/ProfileUtils.ts
@@ -65,7 +65,7 @@ export async function installModsToProfile(
     comboList: ThunderstoreCombo[],
     profile: ImmutableProfile,
     disabledModsOverride?: string[],
-    progressCallback?: (status: string, progress?: number) => void
+    progressCallback?: (status: string, modName?: string, progress?: number) => void
 ): Promise<ManifestV2[]> {
     const profileMods = await ProfileModList.getModList(profile);
     if (profileMods instanceof R2Error) {
@@ -75,10 +75,12 @@ export async function installModsToProfile(
     const installedVersions = profileMods.map((m) => m.getDependencyString());
     const disabledMods = disabledModsOverride || profileMods.filter((m) => !m.isEnabled()).map((m) => m.getName());
     let currentMod;
-
+    let modName = 'Unknown';
     try {
         for (const [index, comboMod] of comboList.entries()) {
             currentMod = comboMod;
+            modName = currentMod.getMod().getFullName();
+
             const manifestMod = new ManifestV2().fromThunderstoreMod(comboMod.getMod(), comboMod.getVersion());
 
             if (installedVersions.includes(manifestMod.getDependencyString())) {
@@ -106,12 +108,11 @@ export async function installModsToProfile(
 
             if (typeof progressCallback === "function") {
                 const progress = Math.floor(((index + 1) / comboList.length) * 100);
-                progressCallback(`Copying mods to profile: ${progress}%`, progress);
+                progressCallback(`Copying mods to profile: ${progress}%`, modName, progress);
             }
         }
     } catch (e) {
         const originalError = R2Error.fromThrownValue(e);
-        const modName = currentMod ? currentMod.getMod().getFullName() : 'Unknown';
         throw new R2Error(
             `Failed to install mod [${modName}] to profile`,
             'All mods/dependencies might not be installed properly. Please try again.',
@@ -121,7 +122,7 @@ export async function installModsToProfile(
 
     throwForR2Error(await ProfileModList.saveModList(profile, profileMods));
     if (typeof progressCallback === "function") {
-        progressCallback("Copying mods to profile: 100%", 100);
+        progressCallback("Copying mods to profile: 100%", modName, 100);
     }
     return profileMods;
 }

From fe891c2cc959c21fe7062da6ff61c2175fcd7637 Mon Sep 17 00:00:00 2001
From: "753.network" <PrimaryInfinity@gmail.com>
Date: Wed, 29 Jan 2025 13:58:31 -0500
Subject: [PATCH 85/95] Update ModLoaderVariantRecord.ts

Added BepInExPack_AmongUs to MODLOADER_PACKAGES
---
 src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts b/src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts
index 3a7dca490..4b5d1c62d 100644
--- a/src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts
+++ b/src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts
@@ -71,6 +71,7 @@ export const MODLOADER_PACKAGES = [
     new ModLoaderPackageMapping("ReturnOfModding-ReturnOfModding", "ReturnOfModdingPack", PackageLoader.RETURN_OF_MODDING),
     new ModLoaderPackageMapping("Hell2Modding-Hell2Modding", "ReturnOfModdingPack", PackageLoader.RETURN_OF_MODDING),
     new ModLoaderPackageMapping("NotNet-GDWeave", "", PackageLoader.GDWEAVE),
+    new ModLoaderPackageMapping("BepInEx-BepInExPack_AmongUs", "BepInExPack_AmongUs", PackageLoader.BEPINEX),
 ];
 
 const DEFAULT_MELONLOADER_MAPPING = [new ModLoaderPackageMapping("LavaGang-MelonLoader", "", PackageLoader.MELON_LOADER)];

From 813eb24ca7714c7ba14a40194f54a2310ef62d35 Mon Sep 17 00:00:00 2001
From: Cade Ayres <ca469@kent.ac.uk>
Date: Sat, 15 Feb 2025 22:17:57 +0000
Subject: [PATCH 86/95] Check that the manifest directory exists before
 attempting to read the directory

---
 .../manager/win32/GameDirectoryResolver.ts    | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/r2mm/manager/win32/GameDirectoryResolver.ts b/src/r2mm/manager/win32/GameDirectoryResolver.ts
index 414ebef08..856ccd52c 100644
--- a/src/r2mm/manager/win32/GameDirectoryResolver.ts
+++ b/src/r2mm/manager/win32/GameDirectoryResolver.ts
@@ -121,25 +121,19 @@ export default class GameDirectoryResolverImpl extends GameDirectoryResolverProv
             )
         }
 
-        // Filter to only locations that exist on the drive
-        for (const location of locations) {
-            if (!await fs.exists(location)) {
-                var index = locations.indexOf(location);
-                locations.splice(index, 1);
-            }
-        }
-
         // Look through given directories for ${appManifest}
         let manifestLocation: string | null = null;
         try {
             for (const location of locations) {
-                (await fs.readdir(location))
-                    .forEach((file: string) => {
-                        if (file.toLowerCase() === `appmanifest_${game.activePlatform.storeIdentifier}.acf`) {
-                            manifestLocation = location;
-                        }
-                    });
-            }
+                if (await fs.exists(location)) {
+                    (await fs.readdir(location))
+                        .forEach((file: string) => {
+                            if (file.toLowerCase() === `appmanifest_${game.activePlatform.storeIdentifier}.acf`) {
+                                manifestLocation = location;
+                            }
+                        });
+                    }
+                }
         } catch(e) {
             if (e instanceof R2Error) {
                 return e;

From b27d10a936e773ad4dc35f31c431fec1ca021595 Mon Sep 17 00:00:00 2001
From: "753.network" <PrimaryInfinity@gmail.com>
Date: Sat, 15 Feb 2025 23:11:01 -0500
Subject: [PATCH 87/95] Update GameManager.ts

Fix Aloft Steam App ID
---
 src/model/game/GameManager.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/model/game/GameManager.ts b/src/model/game/GameManager.ts
index 384a28c59..a0430ee10 100644
--- a/src/model/game/GameManager.ts
+++ b/src/model/game/GameManager.ts
@@ -301,7 +301,7 @@ export default class GameManager {
         new Game("Aloft", "Aloft", "Aloft",
             "Aloft Demo", ["Aloft.exe"], "Aloft_Data",
             "https://thunderstore.io/c/aloft/api/v1/package-listing-index/",
-            [new StorePlatformMetadata(StorePlatform.STEAM, "2051980")], "Aloft.png",
+            [new StorePlatformMetadata(StorePlatform.STEAM, "1660080")], "Aloft.png",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, []),
 
         new Game("Cult of the Lamb", "COTL", "COTL",

From 3fac4a895ea697cd5bf74c7b7e43d997ccaa65cc Mon Sep 17 00:00:00 2001
From: "753.network" <PrimaryInfinity@gmail.com>
Date: Sat, 15 Feb 2025 23:11:54 -0500
Subject: [PATCH 88/95] Update games.json

Fix Aloft Steam App ID
---
 src/assets/data/games.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/data/games.json b/src/assets/data/games.json
index f6dce2b34..c256de9e0 100644
--- a/src/assets/data/games.json
+++ b/src/assets/data/games.json
@@ -203,7 +203,7 @@
       "distributions": [
         {
           "platform": "steam",
-          "identifier": "2051980"
+          "identifier": "1660080"
         }
       ],
       "r2modman": {

From b73c3fe9b251cc3b8eb0749d4eb9d48fea66e9cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Mon, 9 Dec 2024 15:41:28 +0200
Subject: [PATCH 89/95] Add RecursiveMelonLoaderInstaller

MelonLoader has added support for recursive loading. This means mods,
plugins and userLibs can all be placed in the same folder inside the
profile folder instead of needing to copy each type to a specific
subfolder. This in turn means we can namespace each installed mod into
its own subfolder, which makes uninstalling the mods straightforward
and removes the need to track installation state on a separate file.

The mod author still needs to place plugins and userLibs to specific
folders in their Thunderstore packages though.

In the profile, package's UserData folder (if any) gets copied to
profile/UserData/[packageName] and everything else gets copied to
profile/Mods/[packageName]. MelonLoader handles the rest.

This will require MelonLoader v0.7.0 or newer to work.
---
 .../RecursiveMelonLoaderInstaller.ts          | 138 ++++++++++++++++++
 src/installers/registry.ts                    |   3 +
 src/model/installing/PackageLoader.ts         |   3 +
 .../PlatformInterceptorImpl.ts                |   1 +
 .../ModLoaderVariantRecord.ts                 |  11 +-
 .../instructions/GameInstructions.ts          |   1 +
 6 files changed, 152 insertions(+), 5 deletions(-)
 create mode 100644 src/installers/RecursiveMelonLoaderInstaller.ts

diff --git a/src/installers/RecursiveMelonLoaderInstaller.ts b/src/installers/RecursiveMelonLoaderInstaller.ts
new file mode 100644
index 000000000..4ab90f2ba
--- /dev/null
+++ b/src/installers/RecursiveMelonLoaderInstaller.ts
@@ -0,0 +1,138 @@
+import path from 'path';
+
+import {
+    disableModByRenamingFiles,
+    enableModByRenamingFiles,
+    InstallArgs,
+    PackageInstaller
+} from './PackageInstaller';
+import FileWriteError from '../model/errors/FileWriteError';
+import R2Error from '../model/errors/R2Error';
+import VersionNumber from '../model/VersionNumber';
+import FsProvider from '../providers/generic/file/FsProvider';
+import FileUtils from '../utils/FileUtils';
+
+/**
+ * Handles (un)installation of MelonLoader v0.7.0 and above.
+ */
+export class RecursiveMelonLoaderInstaller implements PackageInstaller {
+    private static readonly TRACKED = ['MelonLoader', 'version.dll'];
+
+    async install(args: InstallArgs): Promise<void> {
+        const { mod, packagePath, profile } = args;
+
+        // The RecursiveMelonLoaderPluginInstaller places mod files into subfolders in
+        // the profile folder. This is only supported on MelonLoader v0.7.0 and above.
+        // Therefore a game that uses RecursiveMelonLoaderPluginInstaller should always
+        // also use RecursiveMelonLoaderInstaller, which checks the mod loader version
+        // before installing.
+        if (!mod.getVersionNumber().isEqualOrNewerThan(new VersionNumber('0.7.0'))) {
+            throw new R2Error(
+                'MelonLoader v0.7.0 or above is required',
+                `Choose a newer MelonLoader version to install. If newer versions
+                 are not available, this is likely a bug in the mod manager.`
+            );
+        }
+
+        try {
+            for (const fileOrFolder of RecursiveMelonLoaderInstaller.TRACKED) {
+                const cachePath = path.join(packagePath, fileOrFolder);
+                const profilePath = profile.joinToProfilePath(fileOrFolder);
+                await FileUtils.copyFileOrFolder(cachePath, profilePath);
+            }
+        } catch (e) {
+            throw FileWriteError.fromThrownValue(e, 'Failed to install MelonLoader');
+        }
+    }
+
+    async uninstall(args: InstallArgs): Promise<void> {
+        try {
+            for (const fileOrFolder of RecursiveMelonLoaderInstaller.TRACKED) {
+                const fullPath = args.profile.joinToProfilePath(fileOrFolder);
+
+                if (!(await FsProvider.instance.exists(fullPath))) {
+                    continue;
+                }
+
+                if ((await FsProvider.instance.stat(fullPath)).isDirectory()) {
+                    await FileUtils.recursiveRemoveDirectoryIfExists(fullPath);
+                } else {
+                    await FsProvider.instance.unlink(fullPath);
+                }
+            }
+        } catch (e) {
+            throw FileWriteError.fromThrownValue(e, 'Failed to uninstall MelonLoader', 'Is the game still running?');
+        }
+    }
+}
+
+/**
+ * Handles mod operations in a RecursiveMelonLoaderInstaller compatible way.
+ */
+export class RecursiveMelonLoaderPluginInstaller implements PackageInstaller {
+    private getModsPath(args: InstallArgs): string {
+        return args.profile.joinToProfilePath('Mods', args.mod.getName());
+    }
+
+    private getUserDataPath(args: InstallArgs): string {
+        return args.profile.joinToProfilePath('UserData', args.mod.getName());
+    }
+
+    private throwActionError(e: unknown, action: string): void {
+        const name = `Failed to ${action} mod`;
+        const solution = 'Is the game still running?';
+        throw FileWriteError.fromThrownValue(e, name, solution);
+    }
+
+    /**
+     * Copy UserData as-is to UserData/<PackageName>/ and everything else
+     * to Mods/<PackageName>/
+     */
+    async install(args: InstallArgs): Promise<void> {
+        const files = await FsProvider.instance.readdir(args.packagePath);
+        const modsPath = this.getModsPath(args);
+        await FileUtils.ensureDirectory(modsPath);
+
+        try {
+            for (const item of files) {
+                const sourceFull = path.join(args.packagePath, item);
+
+                if (item === 'UserData') {
+                    const userDataPath = this.getUserDataPath(args);
+                    await FileUtils.ensureDirectory(userDataPath);
+                    await FileUtils.copyFileOrFolder(sourceFull, userDataPath);
+                } else {
+                    const targetPath = path.join(modsPath, item);
+                    await FileUtils.copyFileOrFolder(sourceFull, targetPath);
+                }
+            }
+        } catch (e) {
+            this.throwActionError(e, 'install');
+        }
+    }
+
+    async uninstall(args: InstallArgs): Promise<void> {
+        try {
+            FileUtils.recursiveRemoveDirectoryIfExists(this.getModsPath(args));
+            FileUtils.recursiveRemoveDirectoryIfExists(this.getUserDataPath(args));
+        } catch (e) {
+            this.throwActionError(e, 'uninstall');
+        }
+    }
+
+    async disable(args: InstallArgs): Promise<void> {
+        try {
+            await disableModByRenamingFiles(this.getModsPath(args));
+        } catch (e) {
+            this.throwActionError(e, 'disable');
+        }
+    }
+
+    async enable(args: InstallArgs): Promise<void> {
+        try {
+            await enableModByRenamingFiles(this.getModsPath(args));
+        } catch (e) {
+            this.throwActionError(e, 'enable');
+        }
+    }
+}
diff --git a/src/installers/registry.ts b/src/installers/registry.ts
index e0c3dc816..92da9f1b6 100644
--- a/src/installers/registry.ts
+++ b/src/installers/registry.ts
@@ -7,6 +7,7 @@ import { LovelyInstaller, LovelyPluginInstaller } from './LovelyInstaller';
 import { NorthstarInstaller } from './NorthstarInstaller';
 import { ReturnOfModdingInstaller, ReturnOfModdingPluginInstaller } from './ReturnOfModdingInstaller';
 import { GDWeaveInstaller, GDWeavePluginInstaller } from './GDWeaveInstaller';
+import { RecursiveMelonLoaderInstaller, RecursiveMelonLoaderPluginInstaller } from './RecursiveMelonLoaderInstaller';
 
 const _PackageInstallers = {
     // "legacy": new InstallRuleInstaller(),  // TODO: Enable
@@ -22,6 +23,8 @@ const _PackageInstallers = {
     "returnofmodding-plugin": new ReturnOfModdingPluginInstaller(),
     "gdweave": new GDWeaveInstaller(),
     "gdweave-plugin": new GDWeavePluginInstaller(),
+    "recursive-melonloader": new RecursiveMelonLoaderInstaller(),
+    "recursive-melonloader-plugin": new RecursiveMelonLoaderPluginInstaller(),
 }
 
 export type PackageInstallerId = keyof typeof _PackageInstallers;
diff --git a/src/model/installing/PackageLoader.ts b/src/model/installing/PackageLoader.ts
index f984f3d5f..818d65210 100644
--- a/src/model/installing/PackageLoader.ts
+++ b/src/model/installing/PackageLoader.ts
@@ -10,6 +10,7 @@ export enum PackageLoader {
     LOVELY,
     RETURN_OF_MODDING,
     GDWEAVE,
+    RECURSIVE_MELON_LOADER,
 }
 
 export function GetInstallerIdForLoader(loader: PackageLoader): PackageInstallerId | null {
@@ -24,6 +25,7 @@ export function GetInstallerIdForLoader(loader: PackageLoader): PackageInstaller
         case PackageLoader.LOVELY: return "lovely";
         case PackageLoader.RETURN_OF_MODDING: return "returnofmodding";
         case PackageLoader.GDWEAVE: return "gdweave";
+        case PackageLoader.RECURSIVE_MELON_LOADER: return "recursive-melonloader";
         case PackageLoader.ANCIENT_DUNGEON_VR: return null;
     }
 }
@@ -34,6 +36,7 @@ export function GetInstallerIdForPlugin(loader: PackageLoader): PackageInstaller
         case PackageLoader.LOVELY: return "lovely-plugin";
         case PackageLoader.RETURN_OF_MODDING: return "returnofmodding-plugin";
         case PackageLoader.GDWEAVE: return "gdweave-plugin";
+        case PackageLoader.RECURSIVE_MELON_LOADER: return "recursive-melonloader-plugin";
     }
 
     return null;
diff --git a/src/providers/generic/game/platform_interceptor/PlatformInterceptorImpl.ts b/src/providers/generic/game/platform_interceptor/PlatformInterceptorImpl.ts
index 5ecfc5483..729dd4ee2 100644
--- a/src/providers/generic/game/platform_interceptor/PlatformInterceptorImpl.ts
+++ b/src/providers/generic/game/platform_interceptor/PlatformInterceptorImpl.ts
@@ -67,6 +67,7 @@ function buildRunners(runners: PlatformRunnersType): LoaderRunnersType {
         [PackageLoader.LOVELY]: runners,
         [PackageLoader.RETURN_OF_MODDING]: runners,
         [PackageLoader.GDWEAVE]: runners,
+        [PackageLoader.RECURSIVE_MELON_LOADER]: runners,
     }
 }
 
diff --git a/src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts b/src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts
index 4b5d1c62d..e59c8bcc0 100644
--- a/src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts
+++ b/src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts
@@ -74,7 +74,8 @@ export const MODLOADER_PACKAGES = [
     new ModLoaderPackageMapping("BepInEx-BepInExPack_AmongUs", "BepInExPack_AmongUs", PackageLoader.BEPINEX),
 ];
 
-const DEFAULT_MELONLOADER_MAPPING = [new ModLoaderPackageMapping("LavaGang-MelonLoader", "", PackageLoader.MELON_LOADER)];
+const LEGACY_MELONLOADER_MAPPING = [new ModLoaderPackageMapping("LavaGang-MelonLoader", "", PackageLoader.MELON_LOADER)];
+const RECURSIVE_MELONLOADER_MAPPING = [new ModLoaderPackageMapping("LavaGang-MelonLoader", "", PackageLoader.RECURSIVE_MELON_LOADER)];
 
 /**
  * While this object is a bit silly given that all the keys are pointing to the
@@ -115,11 +116,11 @@ const VARIANTS = {
     Titanfall2: MODLOADER_PACKAGES,
     Peglin: MODLOADER_PACKAGES,
     VRising: MODLOADER_PACKAGES,
-    HardBullet: DEFAULT_MELONLOADER_MAPPING,
+    HardBullet: LEGACY_MELONLOADER_MAPPING,
     GreenHellVR: MODLOADER_PACKAGES,
     "20MinutesTillDawn": MODLOADER_PACKAGES,
     VTOL_VR: MODLOADER_PACKAGES,
-    BackpackHero: DEFAULT_MELONLOADER_MAPPING,
+    BackpackHero: LEGACY_MELONLOADER_MAPPING,
     Stacklands: MODLOADER_PACKAGES,
     ETG: MODLOADER_PACKAGES,
     Ravenfield: MODLOADER_PACKAGES,
@@ -135,7 +136,7 @@ const VARIANTS = {
     AtrioTheDarkWild: MODLOADER_PACKAGES,
     AncientDungeonVR: MODLOADER_PACKAGES,
     Brotato: MODLOADER_PACKAGES,
-    RUMBLE: DEFAULT_MELONLOADER_MAPPING,
+    RUMBLE: LEGACY_MELONLOADER_MAPPING,
     DomeKeeper: MODLOADER_PACKAGES,
     SkulTheHeroSlayer: MODLOADER_PACKAGES,
     SonsOfTheForest: MODLOADER_PACKAGES,
@@ -143,7 +144,7 @@ const VARIANTS = {
     WrestlingEmpire: MODLOADER_PACKAGES,
     Receiver2: MODLOADER_PACKAGES,
     ThePlanetCrafter: MODLOADER_PACKAGES,
-    PatchQuest: DEFAULT_MELONLOADER_MAPPING,
+    PatchQuest: LEGACY_MELONLOADER_MAPPING,
     ShadowsOverLoathing: MODLOADER_PACKAGES,
     WestofLoathing: MODLOADER_PACKAGES,
     SunHaven: MODLOADER_PACKAGES,
diff --git a/src/r2mm/launching/instructions/GameInstructions.ts b/src/r2mm/launching/instructions/GameInstructions.ts
index db3561b1d..a5197341a 100644
--- a/src/r2mm/launching/instructions/GameInstructions.ts
+++ b/src/r2mm/launching/instructions/GameInstructions.ts
@@ -23,6 +23,7 @@ export default class GameInstructions {
     public static LOADER_INSTRUCTIONS: Map<PackageLoader, GameInstructionGenerator> = new Map([
         [PackageLoader.BEPINEX, new BepInExGameInstructions()],
         [PackageLoader.MELON_LOADER, new MelonLoaderGameInstructions()],
+        [PackageLoader.RECURSIVE_MELON_LOADER, new MelonLoaderGameInstructions()],
         [PackageLoader.NORTHSTAR, new NorthstarGameInstructions()],
         [PackageLoader.GODOT_ML, new GodotMLGameInstructions()],
         [PackageLoader.ANCIENT_DUNGEON_VR, new AncientVRGameInstructions()],

From 260adfe595270354c01750e6e347b511e3148585 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Tue, 18 Feb 2025 11:11:13 +0200
Subject: [PATCH 90/95] Rename method

New name hopefully makes it clearer this is a custom manifest file, not
to be confused with the common manifest.json file required by
Thunderstore ecosystem.
---
 src/r2mm/installing/LocalModInstaller.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/r2mm/installing/LocalModInstaller.ts b/src/r2mm/installing/LocalModInstaller.ts
index ad3f09d08..a0aeeb2e8 100644
--- a/src/r2mm/installing/LocalModInstaller.ts
+++ b/src/r2mm/installing/LocalModInstaller.ts
@@ -28,7 +28,7 @@ export default class LocalModInstaller extends LocalModInstallerProvider {
      * be used in troubleshooting, telling us that the version of the mod isn't
      * necessarily the same that's available via Thunderstore API.
      */
-    private async writeManifestToCache(cacheDirectory: string, manifest: ManifestV2) {
+    private async writeCustomManifestToCache(cacheDirectory: string, manifest: ManifestV2) {
         const manifestPath: string = path.join(cacheDirectory, 'mm_v2_manifest.json');
 
         if (await FsProvider.instance.exists(manifestPath)) {
@@ -45,7 +45,7 @@ export default class LocalModInstaller extends LocalModInstallerProvider {
     public async extractToCacheWithManifestData(profile: ImmutableProfile, zipFile: string, manifest: ManifestV2) {
         const cacheDirectory: string = await this.initialiseCacheDirectory(manifest);
         await ZipExtract.extractOnly(zipFile, cacheDirectory);
-        await this.writeManifestToCache(cacheDirectory, manifest);
+        await this.writeCustomManifestToCache(cacheDirectory, manifest);
         await ProfileInstallerProvider.instance.uninstallMod(manifest, profile);
         throwForR2Error(await ProfileInstallerProvider.instance.installMod(manifest, profile));
         throwForR2Error(await ProfileModList.addMod(manifest, profile));
@@ -56,7 +56,7 @@ export default class LocalModInstaller extends LocalModInstallerProvider {
             const cacheDirectory: string = await this.initialiseCacheDirectory(manifest);
             const fileSafe = file.split("\\").join("/");
             await FsProvider.instance.copyFile(fileSafe, path.join(cacheDirectory, path.basename(fileSafe)));
-            await this.writeManifestToCache(cacheDirectory, manifest);
+            await this.writeCustomManifestToCache(cacheDirectory, manifest);
         } catch (e) {
             throw R2Error.fromThrownValue(e, "Error moving file to cache");
         }

From b14c21eb2256674a7b7334b2c21dbe2f57d4ad45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Mon, 9 Dec 2024 16:03:54 +0200
Subject: [PATCH 91/95] Add support for Dale & Dawson Stationery Supplies

---
 .../images/game_selection/DaleAndDawson.png     | Bin 0 -> 37349 bytes
 src/model/game/GameManager.ts                   |   6 ++++++
 .../ModLoaderVariantRecord.ts                   |   1 +
 3 files changed, 7 insertions(+)
 create mode 100644 src/assets/images/game_selection/DaleAndDawson.png

diff --git a/src/assets/images/game_selection/DaleAndDawson.png b/src/assets/images/game_selection/DaleAndDawson.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed02047aae5cf4b2dbf8ee3eec2ef8573d5f4750
GIT binary patch
literal 37349
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

literal 0
HcmV?d00001

diff --git a/src/model/game/GameManager.ts b/src/model/game/GameManager.ts
index a0430ee10..2f6286447 100644
--- a/src/model/game/GameManager.ts
+++ b/src/model/game/GameManager.ts
@@ -859,6 +859,12 @@ export default class GameManager {
             "https://thunderstore.io/c/miside/api/v1/package-listing-index/",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2527500")], "MiSide.webp",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, [""]),
+
+        new Game("Dale & Dawson Stationery Supplies", "DaleAndDawson", "DaleAndDawson",
+            "Dale&Dawson", ["DDSS.exe"], "DDSS_Data",
+            "https://thunderstore.io/c/dale-dawson-stationery-supplies/api/v1/package-listing-index/",
+            [new StorePlatformMetadata(StorePlatform.STEAM, "2920570")], "DaleAndDawson.png",
+            GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.RECURSIVE_MELON_LOADER, [""]),
     ];
 
     static get activeGame(): Game {
diff --git a/src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts b/src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts
index e59c8bcc0..9d763f14a 100644
--- a/src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts
+++ b/src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts
@@ -215,6 +215,7 @@ const VARIANTS = {
     Subterror: MODLOADER_PACKAGES,
     IAmYourBeast: MODLOADER_PACKAGES,
     MiSide: MODLOADER_PACKAGES,
+    DaleAndDawson: RECURSIVE_MELONLOADER_MAPPING,
 };
 // Exported separately from the definition in order to preserve the key names in the type definition.
 // Otherwise this would become [key: string] and we couldn't use the game names for type hinting elsewhere.

From bb1b9fb31194ddee9a9dbacbf0ca33a38f0bee11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antti=20M=C3=A4ki?= <antti@anttimaki.com>
Date: Tue, 18 Feb 2025 11:57:35 +0200
Subject: [PATCH 92/95] Ensure manifest.json is present in all locally imported
 mods

Create a manifest.json file into cache folder if one wasn't provided by
the uploaded zip, or if a .dll file was uploaded. For consistency we
want all installed mods to have this file regardless of the
installation method.

Locally installed mods will still have the separate mm_v2_manifest.json
file so they can be told apart from the files downloaded from
Thunderstore.
---
 src/r2mm/installing/LocalModInstaller.ts | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/r2mm/installing/LocalModInstaller.ts b/src/r2mm/installing/LocalModInstaller.ts
index a0aeeb2e8..8805cf6ac 100644
--- a/src/r2mm/installing/LocalModInstaller.ts
+++ b/src/r2mm/installing/LocalModInstaller.ts
@@ -42,9 +42,32 @@ export default class LocalModInstaller extends LocalModInstallerProvider {
         await FsProvider.instance.writeFile(manifestPath, JSON.stringify(manifest));
     }
 
+    /**
+     * Write Thunderstore compatible manifest.json to cache if one wasn't provided
+     * with the upload. This is done to have consistency between all installed
+     * mods, regardless of how they were installed. Having the manifest present
+     * allows e.g. other mods to sniff out what other mods are installed.
+     */
+    private async writeManifestToCache(cacheDirectory: string, manifest: ManifestV2) {
+        const manifestPath: string = path.join(cacheDirectory, 'manifest.json');
+
+        if (!(await FsProvider.instance.exists(manifestPath))) {
+            const content = {
+                'name': manifest.getDisplayName(),  // getName() returns "author-modname" here
+                'description': manifest.getDescription(),
+                'version_number': manifest.getVersionNumber().toString(),
+                'dependencies': manifest.getDependencies(),
+                'website_url': ''
+            };
+
+            await FsProvider.instance.writeFile(manifestPath, JSON.stringify(content, null, 4));
+        }
+    }
+
     public async extractToCacheWithManifestData(profile: ImmutableProfile, zipFile: string, manifest: ManifestV2) {
         const cacheDirectory: string = await this.initialiseCacheDirectory(manifest);
         await ZipExtract.extractOnly(zipFile, cacheDirectory);
+        await this.writeManifestToCache(cacheDirectory, manifest);
         await this.writeCustomManifestToCache(cacheDirectory, manifest);
         await ProfileInstallerProvider.instance.uninstallMod(manifest, profile);
         throwForR2Error(await ProfileInstallerProvider.instance.installMod(manifest, profile));
@@ -56,6 +79,7 @@ export default class LocalModInstaller extends LocalModInstallerProvider {
             const cacheDirectory: string = await this.initialiseCacheDirectory(manifest);
             const fileSafe = file.split("\\").join("/");
             await FsProvider.instance.copyFile(fileSafe, path.join(cacheDirectory, path.basename(fileSafe)));
+            await this.writeManifestToCache(cacheDirectory, manifest);
             await this.writeCustomManifestToCache(cacheDirectory, manifest);
         } catch (e) {
             throw R2Error.fromThrownValue(e, "Error moving file to cache");

From a36232257f02c7e878c85f634f3195fe0586993c Mon Sep 17 00:00:00 2001
From: Vili Manninen <vili.manninen@riskidev.fi>
Date: Mon, 3 Feb 2025 18:20:43 +0200
Subject: [PATCH 93/95] Fix getModList errors being silently ignored

---
 src/components/views/DownloadModModal.vue     | 33 ++++++++++----
 src/pages/DownloadMonitor.vue                 | 44 +++++++++++--------
 .../BetterThunderstoreDownloader.ts           |  5 ++-
 src/utils/ProfileUtils.ts                     |  5 +--
 4 files changed, 56 insertions(+), 31 deletions(-)

diff --git a/src/components/views/DownloadModModal.vue b/src/components/views/DownloadModModal.vue
index 76d18b171..84d2b8b8e 100644
--- a/src/components/views/DownloadModModal.vue
+++ b/src/components/views/DownloadModModal.vue
@@ -1,18 +1,34 @@
 <template>
     <div>
-        <div id='downloadProgressModal' :class="['modal', {'is-active':$store.state.download.isModProgressModalOpen}]" v-if="$store.getters['download/currentDownload'] !== null">
+        <div
+            id='downloadProgressModal'
+            :class="['modal', {'is-active':$store.state.download.isModProgressModalOpen}]"
+            v-if="$store.getters['download/currentDownload'] !== null"
+        >
             <div class="modal-background" @click="setIsModProgressModalOpen(false);"></div>
             <div class='modal-content'>
                 <div class='notification is-info'>
-                    <h3 class='title'>Downloading and installing {{$store.getters['download/currentDownload'].modName}}</h3>
+
+                    <h3 v-if="$store.getters['download/currentDownload'].downloadProgress < 100" class='title'>
+                        Downloading {{$store.getters['download/currentDownload'].modName}}
+                    </h3>
+                    <h3 v-else class='title'>
+                        Installing {{$store.getters['download/currentDownload'].modName}}
+                    </h3>
+
                     <p>Downloading: {{Math.floor($store.getters['download/currentDownload'].downloadProgress)}}% complete</p>
+
                     <Progress
                         :max='100'
                         :value="$store.getters['download/currentDownload'].downloadProgress"
                         :className="['is-dark']"
                     />
-                    <p v-if="$store.getters['download/currentDownload'].installProgress">Installing: {{$store.getters['download/currentDownload'].installProgress}}% complete</p>
+
+                    <p v-if="$store.getters['download/currentDownload'].installProgress">
+                        Installing: {{Math.floor($store.getters['download/currentDownload'].installProgress)}}% complete
+                    </p>
                     <p v-else>Installing: waiting for download to finish</p>
+
                     <Progress
                         :max='100'
                         :value="$store.getters['download/currentDownload'].installProgress"
@@ -101,11 +117,12 @@ import ProfileModList from '../../r2mm/mods/ProfileModList';
                             }
                         }
                         const modList = await ProfileModList.getModList(profile.asImmutableProfile());
-                        if (!(modList instanceof R2Error)) {
-                            const err = await ConflictManagementProvider.instance.resolveConflicts(modList, profile.asImmutableProfile());
-                            if (err instanceof R2Error) {
-                                return reject(err);
-                            }
+                        if (modList instanceof R2Error) {
+                            return reject(modList);
+                        }
+                        const err = await ConflictManagementProvider.instance.resolveConflicts(modList, profile.asImmutableProfile());
+                        if (err instanceof R2Error) {
+                            return reject(err);
                         }
                         return resolve();
                     });
diff --git a/src/pages/DownloadMonitor.vue b/src/pages/DownloadMonitor.vue
index 7fb9ac6d1..fd257188a 100644
--- a/src/pages/DownloadMonitor.vue
+++ b/src/pages/DownloadMonitor.vue
@@ -29,6 +29,15 @@
                                     />
                                 </div>
 
+                                <div v-else-if="downloadObject.downloadProgress === 100 && downloadObject.installProgress === 100">
+                                    <p>Download complete</p>
+                                    <Progress
+                                        :max='100'
+                                        :value='100'
+                                        :className="['is-success']"
+                                    />
+                                </div>
+
                                 <div v-else class="row">
 
                                     <div class="col">
@@ -42,24 +51,23 @@
                                         />
                                     </div>
 
-                                    <div v-if="downloadObject.installProgress < 100" class="col">
-                                        <div v-if="downloadObject.downloadProgress < 100">
-                                            <p>Installing:</p>
-                                            <p v-if="downloadObject.downloadProgress < 100">Waiting for download to finish</p>
-                                            <Progress
-                                                :max='100'
-                                                :className="['is-info']"
-                                            />
-                                        </div>
-                                        <div v-else>
-                                            <p>Installing: {{ downloadObject.modName }}</p>
-                                            <p>{{Math.min(Math.floor(downloadObject.installProgress), 100)}}% complete</p>
-                                            <Progress
-                                                :max='100'
-                                                :value='downloadObject.installProgress'
-                                                :className="['is-info']"
-                                            />
-                                        </div>
+                                    <div v-if="downloadObject.downloadProgress < 100" class="col">
+                                        <p>Installing:</p>
+                                        <p>Waiting for download to finish</p>
+                                        <Progress
+                                            :max='100'
+                                            :value='0'
+                                            :className="['is-info']"
+                                        />
+                                    </div>
+                                    <div v-else class="col">
+                                        <p>Installing: {{ downloadObject.modName }}</p>
+                                        <p>{{Math.min(Math.floor(downloadObject.installProgress), 100)}}% complete</p>
+                                        <Progress
+                                            :max='100'
+                                            :value='downloadObject.installProgress'
+                                            :className="['is-info']"
+                                        />
                                     </div>
 
                                 </div>
diff --git a/src/r2mm/downloading/BetterThunderstoreDownloader.ts b/src/r2mm/downloading/BetterThunderstoreDownloader.ts
index 51d1b4422..45f1ddfb1 100644
--- a/src/r2mm/downloading/BetterThunderstoreDownloader.ts
+++ b/src/r2mm/downloading/BetterThunderstoreDownloader.ts
@@ -96,10 +96,11 @@ export default class BetterThunderstoreDownloader extends ThunderstoreDownloader
         }
 
         const dependencies = await this.getDependenciesWithCorrectVersions(combo, modList);
-        const allModsToDownload = [...dependencies, combo];
+        const allModsToDownload = [combo, ...dependencies];
 
         let modInProgressName = combo.getMod().getName();
         let downloadCount = 0;
+        // Mark the mod 80% processed when the download completes, save the remaining 20% for extracting.
         const singleModProgressCallback = (downloadProgress: number, status: number, err: R2Error | null) => {
             if (status === StatusEnum.FAILURE) {
                 throw err;
@@ -107,7 +108,7 @@ export default class BetterThunderstoreDownloader extends ThunderstoreDownloader
 
             let totalDownloadProgress: number;
             if (status === StatusEnum.PENDING) {
-                totalDownloadProgress = this.generateProgressPercentage(downloadProgress, downloadCount, allModsToDownload.length);
+                totalDownloadProgress = this.generateProgressPercentage(downloadProgress * 0.8, downloadCount, allModsToDownload.length);
             } else if (status === StatusEnum.SUCCESS) {
                 totalDownloadProgress = this.generateProgressPercentage(100, downloadCount, allModsToDownload.length);
                 downloadCount += 1;
diff --git a/src/utils/ProfileUtils.ts b/src/utils/ProfileUtils.ts
index 232d553dc..3e6e34633 100644
--- a/src/utils/ProfileUtils.ts
+++ b/src/utils/ProfileUtils.ts
@@ -74,12 +74,11 @@ export async function installModsToProfile(
 
     const installedVersions = profileMods.map((m) => m.getDependencyString());
     const disabledMods = disabledModsOverride || profileMods.filter((m) => !m.isEnabled()).map((m) => m.getName());
-    let currentMod;
     let modName = 'Unknown';
+
     try {
         for (const [index, comboMod] of comboList.entries()) {
-            currentMod = comboMod;
-            modName = currentMod.getMod().getFullName();
+            modName = comboMod.getMod().getName();
 
             const manifestMod = new ManifestV2().fromThunderstoreMod(comboMod.getMod(), comboMod.getVersion());
 

From 38b4211cf1da096797181160073596f3d6462049 Mon Sep 17 00:00:00 2001
From: VilppeRiskidev <vili.manninen@riskidev.fi>
Date: Mon, 24 Feb 2025 18:26:15 +0200
Subject: [PATCH 94/95] Fix a bug in activeDownloadCount which caused mods in
 installation step to not be counted

---
 src/store/modules/DownloadModule.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/store/modules/DownloadModule.ts b/src/store/modules/DownloadModule.ts
index 3f2d567f1..f38741f4b 100644
--- a/src/store/modules/DownloadModule.ts
+++ b/src/store/modules/DownloadModule.ts
@@ -54,7 +54,9 @@ export const DownloadModule = {
     getters: <GetterTree<State, RootState>>{
         activeDownloadCount(state) {
             const active = state.allDownloads.filter(
-                dl => !dl.failed && dl.downloadProgress < 100 && dl.installProgress < 100
+                dl =>
+                    !dl.failed &&
+                    !(dl.downloadProgress >= 100 && dl.installProgress >= 100)
             );
             return active.length;
         },

From b36ed0ad00e5558eea1165f11a43d122cfe4b22c Mon Sep 17 00:00:00 2001
From: Cade Ayres <ca469@kent.ac.uk>
Date: Wed, 26 Feb 2025 12:37:11 +0000
Subject: [PATCH 95/95] Updated CHANGELOG and versions

---
 CHANGELOG.md                          | 14 ++++++++++++++
 package.json                          |  2 +-
 src/_managerinf/ManagerInformation.ts |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 987243df2..cfb171ab7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+### 3.1.56
+#### Games added
+- Subterror
+- MiSide
+- Dale & Dawson
+- I Am Your Beast
+- Bomb Rush Cyberfunk
+  - Added "Other" option
+- Aloft
+  - Correct AppID is used to launch on Steam
+
+#### Notable changes
+- Faster access to the profile selection screen
+
 ### 3.1.55
 #### Games added
 - ATLYSS
diff --git a/package.json b/package.json
index 82449f534..5a1ecd247 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "r2modman",
-    "version": "3.1.55",
+    "version": "3.1.56",
     "description": "A simple and easy to use mod manager for many games using Thunderstore.",
     "productName": "r2modman",
     "author": "ebkr",
diff --git a/src/_managerinf/ManagerInformation.ts b/src/_managerinf/ManagerInformation.ts
index d00857806..61a49b7e7 100644
--- a/src/_managerinf/ManagerInformation.ts
+++ b/src/_managerinf/ManagerInformation.ts
@@ -1,7 +1,7 @@
 import VersionNumber from '../model/VersionNumber';
 
 export default class ManagerInformation {
-    public static VERSION: VersionNumber = new VersionNumber('3.1.55');
+    public static VERSION: VersionNumber = new VersionNumber('3.1.56');
     public static IS_PORTABLE: boolean = false;
     public static APP_NAME: string = "r2modman";
 }