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

release

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

sync_content

@@ -1,17 +0,0 @@
-#!/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.")