Merge branch 'main' into develop

gabber235 · Aug 9, 2024 · deb42e7 · deb42e7
2 parents 580d798 + f619ebd
commit deb42e7
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/.github/workflows/build-jars-on-push.yml b/.github/workflows/build-jars-on-push.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   changes:
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     outputs:
       plugin: ${{ steps.changes.outputs.plugin }}
     steps:

diff --git a/.github/workflows/build-plugin.yml b/.github/workflows/build-plugin.yml
@@ -4,7 +4,7 @@ on: [workflow_call]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
       - uses: actions/checkout@v3
       - name: Setup Java 

diff --git a/code_generator/Cargo.lock b/code_generator/Cargo.lock
diff --git a/discord_bot/Cargo.lock b/discord_bot/Cargo.lock
diff --git a/documentation/docs/develop/02-adapters/03-entries/cinematic/index.mdx b/documentation/docs/develop/02-adapters/03-entries/cinematic/index.mdx
@@ -2,7 +2,7 @@ import CodeSnippet from "@site/src/components/CodeSnippet";
 
 # CinematicEntry
 
-The `CinematicEntry` does not have any decentends, but is very customizable. When a entry is needed in a cinematic page, it needs to inherid this.
+The `CinematicEntry` does not have any decentends, but is very customizable. When a entry is needed in a cinematic page, it needs to inherit this.
 
 `CinematicEntry` works by having at least 1 list of `Segment`'s. Segments are the parts of the cinematic and may have sub-properties defined. A segment needs to have at least a `startFrame` and `endFrame` which are the integers of the frames.