Merge branch 'main' into release

# Conflicts:
#	.gitea/workflows/deploy.yml

commit

@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+if [ $# -eq 0 ]; then
+  echo "Usage: $0 <commit message>"
+  exit 1
+fi
+
+git add -A
+git commit -m "$*"
+git push origin main

prep

@@ -44,11 +44,15 @@ def main():
     print()
 
     log_info("Step 3/4: Rsyncing LocalMods + config to server...")
+    subprocess.run([
+        "rsync", "-avz", "--delete",
+        "-e", RSYNC_SSH,
+        LOCALMODS_DIR + "/", "baro@barotrauma:/opt/barotrauma/LocalMods/"
+    ], check=True)
     subprocess.run([
         "rsync", "-avz",
         "-e", RSYNC_SSH,
-        LOCALMODS_DIR + "/", CONFIG_PATH,
-        "baro@barotrauma:/opt/barotrauma/"
+        CONFIG_PATH, "baro@barotrauma:/opt/barotrauma/config_player.xml"
     ], check=True)
     log_ok("Synced to server")
     print()

release

@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+
+git checkout release
+git merge main
+git push origin release
+git checkout main

sync_content

@@ -0,0 +1,17 @@
+#!/usr/bin/env python3
+"""Rsync Content/ from Steam to server with progress."""
+
+import subprocess
+import sys
+
+SRC = "/mnt/nvme/B/SteamLibrary/steamapps/common/Barotrauma/Content/"
+DST = "root@barotrauma:/opt/barotrauma/Content/"
+SSH = "ssh -p 22"
+
+print("Syncing Content/ to server...")
+subprocess.run([
+    "rsync", "-avz", "--delete", "--info=progress2",
+    "-e", SSH,
+    SRC, DST
+], check=True)
+print("Done.")