Merge branch 'develop'

Epicguru · Feb 26, 2023 · 4251ab9 · 4251ab9
2 parents 746e989 + c6dd7d6
commit 4251ab9
Show file tree

Hide file tree

Showing 257 changed files with 165,777 additions and 5,805 deletions.
diff --git a/.github/workflows/BuildModCheck.yml b/.github/workflows/BuildModCheck.yml
@@ -35,8 +35,5 @@ jobs:
       with:
         dotnet-version: 6.x.x
 
-    - name: Build Mod 1.3
-      run: dotnet build ${{ env.SLN_PATH }} --configuration v1.3
-
     - name: Build Mod 1.4
       run: dotnet build ${{ env.SLN_PATH }} --configuration v1.4
diff --git a/.github/workflows/GenerateReleaseZip.yml b/.github/workflows/GenerateReleaseZip.yml
@@ -66,6 +66,7 @@ jobs:
           Bundles/
           WeaponTweakData/
           Defs/
+          Patches/
           Languages/
           Patch_AlienRaces/
           Patch_FacialAnimation/
@@ -107,6 +108,7 @@ jobs:
         mkdir -p ${{ env.MOD_PATH }}/Bundles/
         mkdir -p ${{ env.MOD_PATH }}/WeaponTweakData/
         mkdir -p ${{ env.MOD_PATH }}/Defs/
+        mkdir -p ${{ env.MOD_PATH }}/Patches/
         mkdir -p ${{ env.MOD_PATH }}/Languages/
         mkdir -p ${{ env.MOD_PATH }}/Patch_AlienRaces/
         mkdir -p ${{ env.MOD_PATH }}/Patch_FacialAnimation/

diff --git a/About/Preview.png b/About/Preview.png
diff --git a/Animations/Duel_FriendlyEnd.anim b/Animations/Duel_FriendlyEnd.anim