Merge branch 'refs/heads/master' into instance-icons

# Conflicts: # theseus_gui/src/components/ui/Instance.vue # theseus_gui/src/pages/instance/Index.vue
modrinth · Apr 25, 2024 · 5aba138 · 5aba138
2 parents 8cb7a67 + deedf4f
commit 5aba138
Show file tree

Hide file tree

Showing 82 changed files with 2,125 additions and 5,844 deletions.
diff --git a/.github/workflows/cli-build.yml b/.github/workflows/cli-build.yml
diff --git a/.github/workflows/tauri-build.yml b/.github/workflows/tauri-build.yml
@@ -23,7 +23,7 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
         with:
           components: rustfmt, clippy
-          targets: aarch64-apple-darwin
+          targets: aarch64-apple-darwin, x86_64-apple-darwin
 
       - name: Rust setup
         if: "!startsWith(matrix.platform, 'macos')"

diff --git a/.gitignore b/.gitignore
@@ -100,6 +100,7 @@ fabric.properties
 # that are supposed to be shared within teams.
 
 .idea/*
+.vscode/*
 
 !.idea/codeStyles
 !.idea/runConfigurations

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/.vscode/tasks.json b/.vscode/tasks.json