From 03ba798e0cb056adc71ed55080a23d33bbea7622 Mon Sep 17 00:00:00 2001 From: TAZIKLIK <73418250+TAZIKLIK@users.noreply.github.com> Date: Sun, 11 Aug 2024 18:09:55 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BB=D1=8F=20=D0=B3=D0=B8=D1=82=D1=85?= =?UTF-8?q?=D0=B0=D0=B1=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE/bug_report.yml | 29 ++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 27 --------- .github/ISSUE_TEMPLATE/issue_report.md | 55 ------------------ .github/PULL_REQUEST_TEMPLATE.md | 69 ++++++----------------- .gitmodules | 14 ++++- Content.Server/PrivateServer | 1 + Content.Shared/PrivateShared | 1 + Resources/PrivateResources | 1 + 8 files changed, 61 insertions(+), 136 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md delete mode 100644 .github/ISSUE_TEMPLATE/issue_report.md create mode 160000 Content.Server/PrivateServer create mode 160000 Content.Shared/PrivateShared create mode 160000 Resources/PrivateResources diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml new file mode 100644 index 0000000000..7120facb42 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -0,0 +1,29 @@ +name: "Сообщить о проблеме" +description: "Если что-то работает не так, как ожидалось." +labels: ["triage"] +body: +- type: textarea + id: description + validations: + required: true + attributes: + label: "Описание" + description: "Опишите проблему как можно подробнее" + +- type: textarea + id: reproduction + attributes: + label: "Шаги воспроизведения" + description: "Если приемлемо, опишите шаги для воспроизведения проблемы" + placeholder: | + 1. Открыть интерфейс консоли + 2. Нажать кнопку "Старт" + 3. Получить ошибку... + +- type: textarea + id: screenshots + attributes: + label: "Скриншоты" + description: | + Если приемлемо, добавьте скриншоты, чтобы помочь объяснить вашу проблему + **Подсказка**: Вы можете прикрепить изображения щелкнув по области ниже, чтобы выделить её, а затем перетащив в нее файлы diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index aba549332f..0000000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,27 +0,0 @@ ---- -name: Request a Feature -about: "Template for noting future planned features. Please ask for approval in the Discord if you aren't an organization Member before posting a feature request" -title: '' -labels: '' -assignees: '' - ---- - - - -# Description - - -I want Goldfish crackers - -# Media - - -![Example Screenshot](https://example.com/thisimageisntreal.png) diff --git a/.github/ISSUE_TEMPLATE/issue_report.md b/.github/ISSUE_TEMPLATE/issue_report.md deleted file mode 100644 index ab82181197..0000000000 --- a/.github/ISSUE_TEMPLATE/issue_report.md +++ /dev/null @@ -1,55 +0,0 @@ ---- -name: Report an Issue -about: "Any general issues you have during play or with the codebase" -title: '' -labels: '' -assignees: '' - ---- - - - -# Description - - -Description - -# Reproduction - - -1. Open game -2. Game doesn't open - -# Expected behavior - - -1. Open game -2. Game opens - -# Media - - -![Example Screenshot](https://example.com/thisimageisntreal.png) - -# Additional context - - -There's a ghost in my computer diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 5d3ce070bc..74dbb54f33 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,62 +1,25 @@ - - -# Description - - - -Description. - ---- - -# TODO - - - -- [ ] Task -- [x] Completed Task - ---- - - +# VIVA LA LOST PARADISE! -

Media

 -

+![image](https://i.imgur.com/3ALofgA.png) -![Example Media Embed](https://example.com/thisimageisntreal.png) +**Описание обновления:** + -

-
---- +**Причина/Для чего** + -# Changelog +**Изменения** -:cl: -- add: Added fun :D -- tweak: Tweaked fun -- fix: Fixed fun! -- remove: Removed fun :( +**Медиа** + diff --git a/.gitmodules b/.gitmodules index 08e5dd6d0a..cc49bdf68b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,16 @@ [submodule "RobustToolbox"] path = RobustToolbox url = https://github.com/space-wizards/RobustToolbox.git - branch = master \ No newline at end of file + branch = master +[submodule "Content.Shared/PrivateShared"] + path = Content.Shared/PrivateShared + url = https://github.com/Lost-Paradise-Project/PrivateShared + branch = main +[submodule "Content.Server/PrivateServer"] + path = Content.Server/PrivateServer + url = https://github.com/Lost-Paradise-Project/PrivateServer + branch = main +[submodule "Resources/PrivateResources"] + path = Resources/PrivateResources + url = https://github.com/Lost-Paradise-Project/PrivateResources + branch = main diff --git a/Content.Server/PrivateServer b/Content.Server/PrivateServer new file mode 160000 index 0000000000..a0abfdf276 --- /dev/null +++ b/Content.Server/PrivateServer @@ -0,0 +1 @@ +Subproject commit a0abfdf276ce175a68106c5aae6e89d8d09d0740 diff --git a/Content.Shared/PrivateShared b/Content.Shared/PrivateShared new file mode 160000 index 0000000000..6c38c2fae7 --- /dev/null +++ b/Content.Shared/PrivateShared @@ -0,0 +1 @@ +Subproject commit 6c38c2fae71c5c4bfaf6574a63201fbbc5e4e3e2 diff --git a/Resources/PrivateResources b/Resources/PrivateResources new file mode 160000 index 0000000000..4fb4eb0e6f --- /dev/null +++ b/Resources/PrivateResources @@ -0,0 +1 @@ +Subproject commit 4fb4eb0e6fe0cf959ab7bf86247dc6a9d2fa0d93