Merge remote-tracking branch 'upstream/master'

2024-06-18 22:37:29 +03:00
parent c88050b109 4c404a0163
commit 1db0a1d60d
40 changed files with 553 additions and 137 deletions
--- a/Resources/Textures/Objects/Magic/magicactions.rsi/meta.json
+++ b/Resources/Textures/Objects/Magic/magicactions.rsi/meta.json
@@ -57,6 +57,9 @@
      },
      {
          "name": "icebeam_active"
+      },
+      {
+          "name": "mindswap"
      }
  ]
 }
--- a/Resources/Textures/Objects/Magic/magicactions.rsi/mindswap.png
+++ b/Resources/Textures/Objects/Magic/magicactions.rsi/mindswap.png