From bfa53ca5b4cb9a0ef31256746612cb6289b06a49 Mon Sep 17 00:00:00 2001 From: Lorenz Date: Sat, 6 Aug 2022 11:46:08 +0200 Subject: Merge branch 'master' of C:\Users\Lorenz\IdeaProjects\SkyHanni with conflicts. --- .../at/hannibal2/skyhanni/items/abilitycooldown/ItemAbilityCooldown.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/java/at/hannibal2/skyhanni/items') diff --git a/src/main/java/at/hannibal2/skyhanni/items/abilitycooldown/ItemAbilityCooldown.kt b/src/main/java/at/hannibal2/skyhanni/items/abilitycooldown/ItemAbilityCooldown.kt index 726c3172f..90ef95d4d 100644 --- a/src/main/java/at/hannibal2/skyhanni/items/abilitycooldown/ItemAbilityCooldown.kt +++ b/src/main/java/at/hannibal2/skyhanni/items/abilitycooldown/ItemAbilityCooldown.kt @@ -167,7 +167,8 @@ class ItemAbilityCooldown { ENDSTONE_SWORD("Extreme Focus", 5, "End Stone Sword"), PIGMAN_SWORD("Burning Souls", 5, "Pigman Sword"), - SOULWARD("Soulward", 20, "Soul Esoward"); + SOULWARD("Soulward", 20, "Soul Esoward"), + ECHO("Echo", 3, "Ancestral Spade"); fun click() { lastClick = System.currentTimeMillis() -- cgit