summaryrefslogtreecommitdiff
path: root/status-effects.xml
diff options
context:
space:
mode:
authorLed Mitz <smoothshifter@tuta.io>2023-04-17 23:17:55 +0000
committerLed Mitz <smoothshifter@tuta.io>2023-04-17 23:17:55 +0000
commitba1d9f19ce3382b10f514d967593d16ddfc70649 (patch)
tree357949ba761a2dad0e85902461b6429bdb3cbced /status-effects.xml
parent08004c309a6d4a0b4d40aed3551a38ec0d97c143 (diff)
parent80814137e13e2254555171449f0ed5d1e03e5da5 (diff)
downloadclientdata-ba1d9f19ce3382b10f514d967593d16ddfc70649.tar.gz
clientdata-ba1d9f19ce3382b10f514d967593d16ddfc70649.tar.bz2
clientdata-ba1d9f19ce3382b10f514d967593d16ddfc70649.tar.xz
clientdata-ba1d9f19ce3382b10f514d967593d16ddfc70649.zip
Merge branch 'sc_cooldown_upmarmu' into 'master'
SC_COOLDOWN_UPMARMU See merge request legacy/clientdata!516
Diffstat (limited to 'status-effects.xml')
-rw-r--r--status-effects.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/status-effects.xml b/status-effects.xml
index cd08d2a7..a3c8c1c4 100644
--- a/status-effects.xml
+++ b/status-effects.xml
@@ -25,4 +25,5 @@
<status-effect name="spell-cooldown-ar" id="75" icon="icons/spell-cooldown-ar.xml"/>
<status-effect name="spell-cooldown-ench" id="76" icon="icons/spell-cooldown-ench.xml"/>
<status-effect name="spell-cooldown-koy" id="77" icon="icons/spell-cooldown-koy.xml"/>
+ <status-effect name="spell-cooldown-upmarmu" id="78" icon="icons/spell-cooldown-upmarmu.xml"/>
</status-effects>