Merge remote-tracking branch 'upstream/master' into Britarnya-Branch

Monkestation · Jan 11, 2025 · 7677cc1 · 7677cc1
2 parents 89c4acf + 3353b59
commit 7677cc1
Show file tree

Hide file tree

Showing 17 changed files with 3,915 additions and 2,939 deletions.
diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml
@@ -70,6 +70,10 @@ jobs:
           key: ${{ runner.os }}-rust-${{ hashFiles('tools/ci/ci_dependencies.sh')}}
           restore-keys: |
             ${{ runner.os }}-rust-
+      - name: Setup .NET SDK
+        uses: actions/setup-dotnet@v4.2.0
+        with:
+          dotnet-version: 9.x
       - name: Install OpenDream
         uses: robinraju/release-downloader@v1.9
         with: