Merge branch 'master' into jgrpp

# Conflicts:
#	src/lang/czech.txt
#	src/lang/galician.txt
#	src/lang/german.txt
#	src/order_cmd.cpp
#	src/saveload/afterload.cpp
#	src/ship.h
#	src/vehicle.cpp
This commit is contained in:
Jonathan G Rennison
2023-01-05 23:45:34 +00:00
37 changed files with 2358 additions and 1572 deletions

View File

@@ -37,6 +37,7 @@ jobs:
- name: Name branch
run: |
git config --global --add safe.directory ${GITHUB_WORKSPACE}
name=$(echo "${{ github.event.client_payload.folder }}")
git checkout -b ${name}