From 8a79afc88fb4deb78b037f1fbb4ca14da4e6b016 Mon Sep 17 00:00:00 2001
From: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
Date: Sat, 11 Jan 2025 08:13:12 +0300
Subject: [PATCH 1/2] Test 2 (#1090)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* ы
* ы
---
Resources/manifest.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Resources/manifest.yml b/Resources/manifest.yml
index 93e05ccd35c..b10678b5399 100644
--- a/Resources/manifest.yml
+++ b/Resources/manifest.yml
@@ -1,4 +1,4 @@
-defaultWindowTitle: Space Station 14
+defaultWindowTitle: Космическая станция 14
windowIconSet: /Textures/Logo/icon
splashLogo: /Textures/_Sunrise/Logo/logo-sunrise.png # Sunrise-Edit
From adb11ab3ce7cbfcff199bb2f6e0f081880269a8a Mon Sep 17 00:00:00 2001
From: Vigers Ray <vigersray@gmail.com>
Date: Sat, 11 Jan 2025 08:22:39 +0300
Subject: [PATCH 2/2] =?UTF-8?q?=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.github/workflows/auto-locale.yml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/auto-locale.yml b/.github/workflows/auto-locale.yml
index 479c1455c59..6a8f57638d3 100644
--- a/.github/workflows/auto-locale.yml
+++ b/.github/workflows/auto-locale.yml
@@ -4,22 +4,24 @@ on:
push:
branches:
- master
+ pull_request:
+ types:
+ - closed
permissions:
contents: write
pull-requests: read
jobs:
- update-changelog:
+ update-locale:
runs-on: ubuntu-latest
- if: github.repository == 'space-sunrise/space-station-14'
+ if: github.repository == 'space-sunrise/space-station-14' && github.event.pull_request.merged == true
steps:
- name: Checkout repository
uses: actions/checkout@v3
-
+
- name: Set up Python
- if: github.head_ref != ''
uses: actions/setup-python@v2
with:
python-version: '3.x'
@@ -42,12 +44,10 @@ jobs:
echo "Script exited with code $?"
- name: Git status before commit
- if: github.head_ref != ''
run: |
git status
- name: Commit and push changes
- if: github.head_ref != ''
run: |
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"
@@ -56,5 +56,5 @@ jobs:
echo "No changes to commit."
else
git commit -m "Update locale [skip ci]"
- git push origin HEAD:Starlight
- fi
+ git push origin HEAD:master
+ fi
\ No newline at end of file