Автообновление SS14

diff --git a/.gitattributes b/.gitattributes
index 6292d191fabff180dd38087ed5217f8b05a13599..173dad3f65ea28c97187ab5521f7ff5374e4e532 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -62,3 +62,6 @@ Resources/Maps/**.yml merge=mapping-merge-driver
 #*.PDF   diff=astextplain
 #*.rtf   diff=astextplain
 #*.RTF   diff=astextplain
+
+build.sh merge=ours
+.github/workflow

diff --git a/RobustToolbox b/RobustToolbox
index 62b4714f1f260cf90db915776e6200c28e8018ff..db7de0a99f928840140e9f0af87ac9ebad6df130 160000 (submodule)
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 62b4714f1f260cf90db915776e6200c28e8018ff
+Subproject commit db7de0a99f928840140e9f0af87ac9ebad6df130

diff --git a/build.sh b/build.sh
index 8a00673b0630b0a8dbbca3f51d3e7d70e5fb94e9..d625af117da69e71ed4ae2665afa6a65c6c514d6 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -12,18 +12,6 @@ function updateRobustToolbox() {
        cd ..;
 };
 
-function updateCorvaxRepo() {
-       cd Corvax-SS14;
-       git pull origin master;
-       cd ..;
-};
-
-function updateMr0maksRepo() {
-       cd Mr0maks-SS14;
-       git pull origin master-ru;
-       cd ..;
-};
-
 function updateSS14() {
        git add .;
        git commit -m "Автообновление SS14";
@@ -33,11 +21,6 @@ function updateSS14() {
        git pull origin main;
        git pull fetch master;
        git commit -m "Автообновление с вендора SS14";
-       #updateCorvaxRepo;
-       #cp Corvax-SS14/Resources/Locale/ru-RU Resources/Locale -r;
-       #cp Corvax-SS14/Resources/ServerInfo/Guidebook Resources/ServerInfo -r;
-       #git add .;
-       #git commit -m "Автообновление переводов";
        git push origin main;
        git push --mirror ssh://git@github.com/MaxSMokeSkaarj/space-station-14;
 };