Merge remote-tracking branch 'upstream/master'

2024-06-13 09:07:23 +03:00
parent 77234ff343 caa6531da4
commit 56784ca0dc
87 changed files with 1794 additions and 416 deletions
--- a/Resources/Textures/Objects/Magic/magicactions.rsi/icebeam_active.png
+++ b/Resources/Textures/Objects/Magic/magicactions.rsi/icebeam_active.png
--- a/Resources/Textures/Objects/Magic/magicactions.rsi/meta.json
+++ b/Resources/Textures/Objects/Magic/magicactions.rsi/meta.json
@@ -54,6 +54,9 @@
      },
      {
          "name": "teleport"
+      },
+      {
+          "name": "icebeam_active"
      }
  ]
 }