Merge remote-tracking branch 'origin/master' into develop

eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/api/EcoSkillsAPI.kt

@@ -37,6 +37,9 @@ fun OfflinePlayer.resetSkills() {
     }
 }
 
+fun OfflinePlayer.resetSkill(skill: Skill) =
+    this.skills.reset(skill)
+
 fun OfflinePlayer.getSkillXP(skill: Skill): Double =
     this.skills[skill].xp
 

eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/menus/SkillsGUI.kt

@@ -21,7 +21,7 @@ object SkillsGUI {
 
     private fun buildMenu(plugin: EcoPlugin): Menu {
         return menu(plugin.configYml.getInt("gui.rows")) {
-            title = plugin.langYml.getString("menu.title")
+            title = plugin.langYml.getFormattedString("menu.title")
 
             setMask(
                 FillerMask(

eco-core/core-plugin/src/main/resources/config.yml

@@ -325,7 +325,7 @@ skills:
       fade-out: 0.5
 
       title: "&a%skill% &6levelled up!"
-      subtitle: "&6%level_previous_numeral% &8» &6%level_numeral%"
+      subtitle: "&6%previous_level_numeral% &8» &6%level_numeral%"
     sound:
       # If a sound should be played
       enabled: true

eco-core/core-plugin/src/main/resources/skills/armory.yml

@@ -118,6 +118,10 @@ reward-messages:
 xp-gain-methods:
   - trigger: take_damage
     multiplier: 1.44
+    filters:
+      not_damage_cause:
+        - KILL
+        - SUICIDE
 
 # Conditions that must be met to gain XP. While you can add conditions to xp
 # gain methods, if you have many this can be annoying, so this is global.

gradle.properties

@@ -1,5 +1,5 @@
 #libreforge-updater
-#Tue Jun 27 10:41:57 BST 2023
+#Thu Aug 10 19:59:44 BST 2023
 kotlin.code.style=official
-libreforge-version=4.20.2
-version=3.7.2
+libreforge-version=4.28.0
+version=3.15.0