Merge branch 'master' into stinger

Author: PabstMirror

.github/CONTRIBUTING.md

@@ -36,7 +36,7 @@ We welcome anyone to contribute to this repository. Issues that we are actively
 
 When contributing to this repository, please first discuss the change you wish to make via issue or [Discord](https://acemod.org/discord) with the [ACE3 project maintainers](https://ace3.acemod.org/team.html) before making a change. This may not be necessary if you are contributing for something which has an existing issue in our repository already.
 
-1. Please make a pull request (PR) as early as possible. This lets use help you in the proces of developing it. When opening a work in progress pull request, use GitHub's draft feature. This will mark the PR as a work in progress and will prevent it from being merged until you mark it as ready for review.
+1. Please make a pull request (PR) as early as possible. This lets us help you in the proces of developing it. When opening a work in progress pull request, use GitHub's draft feature. This will mark the PR as a work in progress and will prevent it from being merged until you mark it as ready for review.
 2. Describe what this pull request will do and how it solves this in the description of your PR. A clear intent and description of the way the issue is resolved will help us to review the PR more efficiently.
 3. Please follow our [Development Guidelines](https://ace3.acemod.org/wiki/development/). 
 

.github/workflows/arma.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout the source code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
     - name: Validate Config
       run: python3 tools/config_style_checker.py
     - name: Validate Stringtables
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout the source code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
     - name: Setup HEMTT
       uses: arma-actions/hemtt@v1
       with:
@@ -39,7 +39,7 @@ jobs:
     - name: Rename build folder
       run: mv .hemttout/build .hemttout/@ace
     - name: Upload Artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: ace3-${{ github.sha }}-nobin
         path: .hemttout/@*

.github/workflows/documentation.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout the source code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
     - name: Install Python packages
       run: |
         pip3 install wheel
@@ -33,7 +33,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     - name: Extract Dependencies
       run: python3 tools/extract_dependencies.py --markdown
@@ -47,7 +47,7 @@ jobs:
         destination: docs/_site/
 
     - name: Upload Artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: jekyll-site
         path: docs/_site/
@@ -63,7 +63,7 @@ jobs:
 
     steps:
     - name: Download Artifacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
       with:
         name: jekyll-site
         path: _site/

.github/workflows/extensions.yml

@@ -45,7 +45,7 @@ jobs:
     runs-on: ${{ matrix.arrays.os.tag }}
     steps:
     - name: Checkout the source code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
     - name: Install stable Rust
       uses: actions-rs/toolchain@v1
       with:
@@ -57,7 +57,7 @@ jobs:
     - name: Build
       run: cargo build --verbose
     - name: Upload
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: ${{ matrix.arrays.os.target }}
         path: target/debug/ace.dll

.github/workflows/hemtt.yml

@@ -15,11 +15,11 @@ jobs:
       with:
         toolsUrl: ${{ secrets.ARMA3_TOOLS_URL }}
     - name: Checkout the source code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
     - name: Setup HEMTT
       uses: arma-actions/hemtt@v1
     - name: Checkout pull request
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       if: ${{ github.event_name == 'pull_request_target' }}
       with:
         path: pullrequest
@@ -40,7 +40,7 @@ jobs:
     - name: Rename build folder
       run: mv .hemttout/build .hemttout/@ace
     - name: Upload Artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: ace3-${{ github.sha }}
         path: .hemttout/@*

.github/workflows/pboproject.yml

@@ -12,6 +12,7 @@ texHeaders.bin
 *.swp
 *.swo
 *.biprivatekey
+*.hemttprivatekey
 Thumbs.db
 CHANGELOG.md
 sqfvm.exe

.gitignore

@@ -3,36 +3,6 @@ workshop = [
     "450814997", # CBA_A3
 ]
 
-[spe]
-extends = "default"
-dlc = [
-    "Spearhead 1944"
-]
-
-[vn]
-extends = "default"
-dlc = [
-    "S.O.G. Prairie Fire",
-]
-
-[ws]
-extends = "default"
-dlc = [
-    "Western Sahara",
-]
-
-[rf]
-extends = "default"
-dlc = [
-    "Reaction Forces"
-]
-
-[gm]
-extends = "default"
-dlc = [
-    "Global Mobilization - Cold War Germany"
-]
-
 [rhs]
 extends = "default"
 workshop = [
@@ -48,4 +18,30 @@ workshop = [
     "497660133", # CUP Weapons
     "541888371", # CUP Vehicles
     "497661914", # CUP Units
-]
+]
+
+[cfp]
+extends = "cup"
+workshop = [
+    "1369691841", # Community Factions Project
+]
+
+[wardrobe]
+extends = "default"
+mission = "Wardrobe.VR"
+workshop = [
+    "3499977893", # Advanced Developer Tools
+    "1779063631", # ZEN
+#   "751965892",  # ACRE
+#   "623475643",  # eden enhanced
+]
+
+[sogns]
+extends = "default"
+dlc = ["vn"]
+workshop = [
+    "623475643",  # 3den Enhanced
+    "3499977893", # Advanced Developer Tools
+    "3083451905", # S.O.G. Nickel Steel
+    "1779063631", # Zeus Enhanced
+]

.hemtt/launch.toml

@@ -1,6 +1,9 @@
 [config.file_type]
 options.allow_no_extension = true
 
+[config.cfgpatches_scope]
+options.ignore_prefixes = ["vn_"] # sog compat
+
 [stringtables.usage]
 options.ignore = [
     "str_ace_repair_hit",