Merge remote-tracking branch 'origin/main'

# Conflicts:
#	scripts/package-native.sh
#	scripts/stage-build.sh

scripts/stage-build.sh

@@ -12,6 +12,13 @@ game_commit="${3,,}"
 repository_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)"
 destination_dir="${repository_dir}/dist"
 licenses_dir="${destination_dir}/licenses"
+packaging_commit="$(git -C "${repository_dir}" rev-parse HEAD)"
+
+if ! git -C "${repository_dir}" diff --quiet \
+	|| ! git -C "${repository_dir}" diff --cached --quiet; then
+	echo "Commit dedicated packaging changes before staging a release." >&2
+	exit 1
+fi
 
 if [[ ! "${game_version}" =~ ^[A-Za-z0-9][A-Za-z0-9._-]*$ ]]; then
 	echo "GAME_VERSION must contain only letters, numbers, dots, underscores, or hyphens." >&2
@@ -21,6 +28,10 @@ if [[ ! "${game_commit}" =~ ^[0-9a-f]{40}$ ]]; then
 	echo "GAME_COMMIT must be the full 40-character Git commit." >&2
 	exit 2
 fi
+if [[ ! "${packaging_commit}" =~ ^[0-9a-f]{40}$ ]]; then
+	echo "Could not resolve the dedicated packaging Git commit." >&2
+	exit 2
+fi
 
 for filename in NETfishingServer.x86_64 NETfishingServer.pck; do
 	if [[ ! -f "${source_dir}/${filename}" ]]; then
@@ -53,9 +64,10 @@ pck_sha256="$(sha256sum NETfishingServer.pck | awk '{print $1}')"
 apply_umask="$(umask)"
 umask 022
 printf '%s\n' \
-	"manifest_version=1" \
+	"manifest_version=2" \
 	"game_version=${game_version}" \
 	"game_commit=${game_commit}" \
+	"packaging_commit=${packaging_commit}" \
 	"export_preset=Linux Dedicated Server" \
 	"platform=linux-x86_64" \
 	"executable_sha256=${executable_sha256}" \
@@ -71,6 +83,7 @@ Exact game source revision: ${game_commit}
 
 Packaging source:
 https://forge.makearmy.io/woofmeow/netfishing-dedicated-server
+Exact packaging source revision: ${packaging_commit}
 EOF
 umask "${apply_umask}"
 sha256sum \