Merge pull request corvax-team#463 from tau27/upstream

Upstream

Author: tau27

.editorconfig

@@ -351,7 +351,7 @@ resharper_csharp_qualified_using_at_nested_scope = false
 resharper_csharp_prefer_qualified_reference = false
 resharper_csharp_allow_alias = false
 
-[*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets,props}]
+[*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets,props,slnx}]
 indent_size = 2
 
 [nuget.config]

.github/CODEOWNERS

@@ -5,12 +5,9 @@
 * @JerryImMouse
 * @Litogin
 
-# Translations
-*.ftl @Morb0 @DIMMoon1 @ficcialfaint
-
 # Maps
-/Resources/Prototypes/Maps/** @Morb0 @DIMMoon1 @Ko4ergaPunk
-/Resources/Maps/** @Morb0 @DIMMoon1 @Ko4ergaPunk
+/Resources/Prototypes/Maps/** @Morb0 @DIMMoon1 @kvant8
+/Resources/Maps/** @Morb0 @DIMMoon1 @kvant8
 /Resources/Prototypes/_WL/Maps/** @0leshe
 /Resources/Maps/_WL/** @0leshe
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -14,7 +14,7 @@
 Небольшие исправления/рефакторинг освобождаются от этого требования. -->
 
 ## Требования
-<!-- Подтвердите следующее, поставив X в скобках [X]: -->
+<!-- Подтвердите следующее, поставив X в скобках без пробелов [X]: -->
 - [ ] Я прочитал(а) и следую [Рекомендациям по оформлению Pull Request и Changelog](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
 - [ ] Я добавил(а) медиафайлы к этому PR или он не требует демонстрации в игре.
 

.github/workflows/build-docfx.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v4.1.0
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
 
     - name: Install dependencies
       run: dotnet restore

.github/workflows/build-map-renderer.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v4.1.0
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 10.0.x
 
       - name: Install dependencies
         run: dotnet restore

.github/workflows/build-test-debug.yml

@@ -36,7 +36,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v4.1.0
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
 
     - name: Install dependencies
       run: dotnet restore

.github/workflows/publish-testing.yml

@@ -20,7 +20,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
 
     - name: Get Engine Tag
       run: |

.github/workflows/publish.yml

@@ -50,7 +50,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v4.3.0
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
 
     - name: Get Engine Tag
       run: |

.github/workflows/test-packaging.yml

@@ -65,7 +65,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v4.1.0
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 10.0.x
 
       - name: Install dependencies
         run: dotnet restore

.github/workflows/update-wiki.yml

@@ -14,6 +14,7 @@ on:
       - 'Resources/Prototypes/Chemistry/**.yml'
       - 'Resources/Prototypes/Recipes/Reactions/**.yml'
       - 'RobustToolbox/'
+      - 'Resources/Locale/**.ftl'
 
 jobs:
   update-wiki:
@@ -90,3 +91,13 @@ jobs:
         api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php
         username: ${{ secrets.WIKI_BOT_USER }}
         password: ${{ secrets.WIKI_BOT_PASS }}
+
+    - name: Upload loc.json to wiki
+      uses: jtmullen/mediawiki-edit-action@v0.1.1
+      with:
+        wiki_text_file: ./bin/Content.Server/data/loc.json
+        edit_summary: Update loc.json via GitHub Actions
+        page_name: "${{ secrets.WIKI_PAGE_ROOT }}/loc.json"
+        api_url: ${{ secrets.WIKI_ROOT_URL }}/api.php
+        username: ${{ secrets.WIKI_BOT_USER }}
+        password: ${{ secrets.WIKI_BOT_PASS }}