Merge branch 'refs/heads/beta' into more-preprocessing

hannibal002 · Nov 1, 2024 · 9bb0404 · 9bb0404
2 parents 53d3b71 + 4a89b07
commit 9bb0404
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/pull_request_template.md b/pull_request_template.md
@@ -1,6 +1,7 @@
 <!-- remove all unused parts 
 
 The title of your PR should be descriptive and concise. It should be in the format of `Type: Description`. For example, `Feature: Add new command` or `Fix: Bug in command`. If there are multiple types of changes these can be separated by a plus. For example, `Feature + Fix: Add new command and fix bug in command`.
+Commonly used labels are Improvement, Backend, Feature and Fix.
 
 ## PR Reviews
 

diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
@@ -272,6 +272,7 @@ object ChatFilter {
     private val annoyingSpamPatterns = listOf(
         "§7Your Implosion hit (.*) for §r§c(.*) §r§7damage.".toPattern(),
         "§7Your Molten Wave hit (.*) for §r§c(.*) §r§7damage.".toPattern(),
+        "§7Your Spirit Sceptre hit (.*) for §r§c(.*) §r§7damage.".toPattern(),
         "§cYou need a tool with a §r§aBreaking Power §r§cof §r§6(\\d)§r§c to mine (.*)§r§c! Speak to §r§dFragilis §r§cby the entrance to the Crystal Hollows to learn more!".toPattern(),
     )
     private val annoyingSpamMessages = listOf(