Use env var to define DiscordRPC version (#727)

to make editing the version number easier

.github/workflows/merge-conflict-auto-label.yml

@@ -0,0 +1,19 @@
+name: Merge Conflict Auto Label
+on:
+  workflow_dispatch: # Manual run
+  push:
+    branches:
+      - main
+  schedule:
+    - cron: "10 21 * * *" # Runs at 21:10; time was chosen based on contributor activity and low GitHub Actions cron load.
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mschilde/auto-label-merge-conflicts@master
+        with:
+          CONFLICT_LABEL_NAME: "merge conflicts"
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MAX_RETRIES: 5
+          WAIT_MS: 5000

.github/workflows/release.yml

@@ -15,6 +15,7 @@ permissions:
 
 env:
   NORTHSTAR_VERSION: ${{ github.ref_name }}
+  DISCORD_RPC_VERSION: v13
 
 jobs:
   build-northstar:
@@ -34,7 +35,7 @@ jobs:
           wget "https://github.com/R2Northstar/NorthstarLauncher/releases/download/${{ env.NORTHSTAR_VERSION }}/northstar-launcher.zip"
       - name: Download DiscordRPC plugin
         run:
-          wget "https://github.com/R2Northstar/NorthstarDiscordRPC/releases/download/v10/northstar-discord-rpc.zip"
+          wget "https://github.com/R2Northstar/NorthstarDiscordRPC/releases/download/${{ env.DISCORD_RPC_VERSION }}/northstar-discord-rpc.zip"
       - name: Download compiled stubs
         run:
           wget "https://github.com/R2Northstar/NorthstarStubs/releases/download/v1/NorthstarStubs.zip"
@@ -46,7 +47,7 @@ jobs:
           path: northstar-mods
       - name: Update mod version info
         run: |
-          export MOD_VERSION=$(echo $NORTHSTAR_VERSION | tr -d 'v')
+          export MOD_VERSION=$(echo $NORTHSTAR_VERSION | tr --delete 'v')
           cat <<< $(jq ".Version = \"${MOD_VERSION}\"" northstar-mods/Northstar.Client/mod.json) > northstar-mods/Northstar.Client/mod.json
           cat <<< $(jq ".Version = \"${MOD_VERSION}\"" northstar-mods/Northstar.Custom/mod.json) > northstar-mods/Northstar.Custom/mod.json
           cat <<< $(jq ".Version = \"${MOD_VERSION}\"" northstar-mods/Northstar.CustomServers/mod.json) > northstar-mods/Northstar.CustomServers/mod.json
@@ -67,12 +68,12 @@ jobs:
 
           unzip NorthstarStubs.zip -d northstar/bin/x64_dedi
           unzip northstar-launcher.zip -d northstar
-          rsync -avr --exclude="Northstar.Coop" --exclude=".git*" northstar-mods/. northstar/R2Northstar/mods
+          rsync -avr --exclude="Northstar.Coop" --exclude=".git*" --exclude="*.md" northstar-mods/. northstar/R2Northstar/mods
       - name: Checkout Navmesh repository
         uses: actions/checkout@v4
         with:
           repository: R2Northstar/NorthstarNavs
-          ref: 'v3'
+          ref: 'v4'
           path: northstar-navs
       - name: Navmeshes setup
         run: |

README.md

@@ -29,9 +29,9 @@ The documentation is split into three repositories:
 
 ## Special Thanks
 
-Thanks to everyone that's put up with me and helped out with this project, it's been a fun passion project I've had throughout 2021 so releasing it is pretty cathartic. Specifically: 
+Thanks to everyone that's put up with me and helped out with this project, it's been a fun passion project I've had throughout 2021 so releasing it is pretty cathartic. Specifically:
 
 - Thanks to the Icepick developers for making the Icepick, I initially forked it for earlier versions of Northstar and it was a great base to experiment with stuff on before moving to the custom launcher.
-- Thanks to everyone on R5R team for giving me advice on some later parts of development.  
-- Thanks to everyone in the testing server for putting up with me and helping find bugs.  
+- Thanks to everyone on R5R team for giving me advice on some later parts of development.
+- Thanks to everyone in the testing server for putting up with me and helping find bugs.
 - Thanks to everyone else that's helped, gave advice, all that.