-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
<!-- ЭТО ШАБЛОН ВАШЕГО PULL REQUEST. Текст между стрелками - это комментарии - они не будут видны в PR. --> **Проверки** <!-- Выполнение всех следующих действий, если это приемлемо для вида изменений сильно ускорит разбор вашего PR --> - [x] PR полностью завершён и мне не нужна помощь чтобы его закончить. - [x] Я внимательно просмотрел все свои изменения и багов в них не нашёл. - [x] Я запускал локальный сервер со своими изменениями и всё протестировал. - [x] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует. **Изменения** :cl: - tweak: Подтянул коммиты Корвухов, 02.08.24.
- Loading branch information
Showing
17 changed files
with
23,508 additions
and
23,662 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,6 +23,25 @@ jobs: | |
- uses: actions/[email protected] | ||
with: | ||
submodules: 'recursive' | ||
|
||
# Corvax-Secrets-Start | ||
- name: Setup secrets | ||
env: | ||
SSH_KEY: ${{ secrets.SECRETS_PRIVATE_KEY }} | ||
if: ${{ env.SSH_KEY != '' }} | ||
run: | | ||
mkdir ~/.ssh | ||
echo "${{ secrets.SECRETS_PRIVATE_KEY }}" > ~/.ssh/id_rsa | ||
chmod 600 ~/.ssh/id_rsa | ||
echo "HOST *" > ~/.ssh/config | ||
echo "StrictHostKeyChecking no" >> ~/.ssh/config | ||
git clone [email protected]:corvax-nexus/secrets.git Secrets | ||
cp -R Secrets/Resources/Prototypes Resources/Prototypes/CorvaxSecrets | ||
cp -R Secrets/Resources/ServerPrototypes Resources/Prototypes/CorvaxSecretsServer | ||
cp -R Secrets/Resources/Locale Resources/Locale/ru-RU/corvax-secrets | ||
cp -R Secrets/Resources/Textures Resources/Textures/CorvaxSecrets | ||
# Corvax-Secrets-End | ||
|
||
- name: Setup .NET Core | ||
uses: actions/[email protected] | ||
with: | ||
|
36 changes: 18 additions & 18 deletions
36
Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/tiles.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,36 +1,36 @@ | ||
ent-FloorTileItemWoodParquet = tiles-wood-parquet | ||
ent-FloorTileItemWoodParquet = деревянный паркет | ||
.desc = { ent-FloorTileItemBase.desc } | ||
ent-FloorTileItemWoodBlack = tiles-wood-black | ||
ent-FloorTileItemWoodBlack = деревянный чёрный пол | ||
.desc = { ent-FloorTileItemBase.desc } | ||
ent-FloorTileItemWoodDark = tiles-wood-dark | ||
ent-FloorTileItemWoodDark = деревянный тёмный пол | ||
.desc = { ent-FloorTileItemBase.desc } | ||
ent-FloorTileItemWoodLight = tiles-wood-light | ||
ent-FloorTileItemWoodLight = деревянный светлый пол | ||
.desc = { ent-FloorTileItemBase.desc } | ||
ent-FloorTileItemWoodRed = tiles-wood-red | ||
ent-FloorTileItemWoodRed = деревянный красный пол | ||
.desc = { ent-FloorTileItemBase.desc } | ||
ent-FloorTileItemWoodLargeBlack = large black wood floor | ||
ent-FloorTileItemWoodLargeBlack = большой деревянный чёрный пол | ||
.desc = { ent-FloorTileItemBase.desc } | ||
ent-FloorTileItemWoodLargeDark = large dark wood floor | ||
ent-FloorTileItemWoodLargeDark = большой деревянный тёмный пол | ||
.desc = { ent-FloorTileItemBase.desc } | ||
ent-FloorTileItemWoodLargeLight = large light wood floor | ||
ent-FloorTileItemWoodLargeLight = большой деревянный светлый пол | ||
.desc = { ent-FloorTileItemBase.desc } | ||
ent-FloorTileItemWoodLargeRed = large red wood floor | ||
ent-FloorTileItemWoodLargeRed = большой деревянный красный пол | ||
.desc = { ent-FloorTileItemBase.desc } | ||
ent-FloorTileItemWoodParquetBlack = parquet black wood floor | ||
ent-FloorTileItemWoodParquetBlack = чёрный деревянный паркет | ||
.desc = { ent-FloorTileItemBase.desc } | ||
ent-FloorTileItemWoodParquetDark = parquet dark wood floor | ||
ent-FloorTileItemWoodParquetDark = тёмный деревянный паркет | ||
.desc = { ent-FloorTileItemBase.desc } | ||
ent-FloorTileItemWoodParquetLight = parquet light wood floor | ||
ent-FloorTileItemWoodParquetLight = светлый деревянный паркет | ||
.desc = { ent-FloorTileItemBase.desc } | ||
ent-FloorTileItemWoodParquetRed = parquet red wood floor | ||
ent-FloorTileItemWoodParquetRed = красный деревянный паркет | ||
.desc = { ent-FloorTileItemBase.desc } | ||
ent-FloorTileItemWoodChess = chess wood floor | ||
ent-FloorTileItemWoodChess = деревянный шахматный пол | ||
.desc = { ent-FloorTileItemBase.desc } | ||
ent-FloorTileItemWoodChessBlack = chess black wood floor | ||
ent-FloorTileItemWoodChessBlack = чёрный деревянный шахматный пол | ||
.desc = { ent-FloorTileItemBase.desc } | ||
ent-FloorTileItemWoodChessDark = chess dark wood floor | ||
ent-FloorTileItemWoodChessDark = тёмный деревянный шахматный пол | ||
.desc = { ent-FloorTileItemBase.desc } | ||
ent-FloorTileItemWoodChessLight = chess light wood floor | ||
ent-FloorTileItemWoodChessLight = светлый деревянный шахматный пол | ||
.desc = { ent-FloorTileItemBase.desc } | ||
ent-FloorTileItemWoodChessRed = chess red wood floor | ||
ent-FloorTileItemWoodChessRed = красный деревянный шахматный пол | ||
.desc = { ent-FloorTileItemBase.desc } |
Oops, something went wrong.