diff --git a/Cargo.lock b/Cargo.lock index 230ae51d0..ee33ab45c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2604,6 +2604,28 @@ dependencies = [ "syn 2.0.90", ] +[[package]] +name = "enumset" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07a4b049558765cef5f0c1a273c3fc57084d768b44d2f98127aef4cceb17293" +dependencies = [ + "enumset_derive", + "serde", +] + +[[package]] +name = "enumset_derive" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59c3b24c345d8c314966bdc1832f6c2635bfcce8e7cf363bd115987bba2ee242" +dependencies = [ + "darling 0.20.10", + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "env_filter" version = "0.1.3" @@ -9239,6 +9261,7 @@ name = "theseus" version = "0.9.4" dependencies = [ "ariadne", + "async-compression", "async-recursion", "async-tungstenite", "async-walkdir", @@ -9253,6 +9276,7 @@ dependencies = [ "discord-rich-presence", "dunce", "either", + "enumset", "flate2", "fs4", "futures", @@ -9300,6 +9324,7 @@ dependencies = [ "daedalus", "dashmap 6.1.0", "either", + "enumset", "native-dialog", "objc", "opener", @@ -9333,6 +9358,7 @@ dependencies = [ name = "theseus_playground" version = "0.0.0" dependencies = [ + "enumset", "theseus", "tokio", "tracing", diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue index 85d252745..5ce8a76ea 100644 --- a/apps/app-frontend/src/App.vue +++ b/apps/app-frontend/src/App.vue @@ -24,7 +24,7 @@ import { useLoading, useTheming } from '@/store/state' import ModrinthAppLogo from '@/assets/modrinth_app.svg?component' import AccountsCard from '@/components/ui/AccountsCard.vue' import InstanceCreationModal from '@/components/ui/InstanceCreationModal.vue' -import { get } from '@/helpers/settings' +import { get } from '@/helpers/settings.ts' import Breadcrumbs from '@/components/ui/Breadcrumbs.vue' import RunningAppBar from '@/components/ui/RunningAppBar.vue' import SplashScreen from '@/components/ui/SplashScreen.vue' diff --git a/apps/app-frontend/src/assets/stylesheets/global.scss b/apps/app-frontend/src/assets/stylesheets/global.scss index bd6e46425..7ab08fd57 100644 --- a/apps/app-frontend/src/assets/stylesheets/global.scss +++ b/apps/app-frontend/src/assets/stylesheets/global.scss @@ -7,7 +7,7 @@ font-style: normal; font-display: swap; font-weight: 400; - src: url('https://cdn.modrinth.com/fonts/minecraft/regular.otf') format('opentype'); + src: url('https://cdn-raw.modrinth.com/fonts/minecraft/regular.otf') format('opentype'); } @font-face { @@ -15,7 +15,7 @@ font-style: italic; font-display: swap; font-weight: 400; - src: url('https://cdn.modrinth.com/fonts/minecraft/italic.otf') format('opentype'); + src: url('https://cdn-raw.modrinth.com/fonts/minecraft/italic.otf') format('opentype'); } @font-face { @@ -23,7 +23,7 @@ font-style: normal; font-display: swap; font-weight: 600; - src: url('https://cdn.modrinth.com/fonts/minecraft/bold.otf') format('opentype'); + src: url('https://cdn-raw.modrinth.com/fonts/minecraft/bold.otf') format('opentype'); } @font-face { @@ -31,7 +31,7 @@ font-style: italic; font-display: swap; font-weight: 600; - src: url('https://cdn.modrinth.com/fonts/minecraft/bold-italic.otf') format('opentype'); + src: url('https://cdn-raw.modrinth.com/fonts/minecraft/bold-italic.otf') format('opentype'); } .font-minecraft { diff --git a/apps/app-frontend/src/components/ui/ErrorModal.vue b/apps/app-frontend/src/components/ui/ErrorModal.vue index c3beffa9f..3daac536e 100644 --- a/apps/app-frontend/src/components/ui/ErrorModal.vue +++ b/apps/app-frontend/src/components/ui/ErrorModal.vue @@ -14,7 +14,7 @@ import { ref, computed } from 'vue' import { login as login_flow, set_default_user } from '@/helpers/auth.js' import { handleError } from '@/store/notifications.js' import { handleSevereError } from '@/store/error.js' -import { cancel_directory_change } from '@/helpers/settings.js' +import { cancel_directory_change } from '@/helpers/settings.ts' import { install } from '@/helpers/profile.js' import { trackEvent } from '@/helpers/analytics' import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue' diff --git a/apps/app-frontend/src/components/ui/InstanceCreationModal.vue b/apps/app-frontend/src/components/ui/InstanceCreationModal.vue index 9d0c9b753..c09255a7c 100644 --- a/apps/app-frontend/src/components/ui/InstanceCreationModal.vue +++ b/apps/app-frontend/src/components/ui/InstanceCreationModal.vue @@ -1,5 +1,5 @@