Reworked the relationship between SubSkill and Locale keys

Changelog.txt

@@ -8,26 +8,41 @@ Key:
   - Removal
 
 Version 2.1.0
- + Added JSON support to Woodcutting command
+ + Added JSON integration to all Skill Commands
  + Added config setting to enable or disable classic mcMMO skill scaling
  + (Config) Added rank settings for the new Woodcutting skill
  + (Config) Added configurable parameters for the new Tree Feller
  + (Config) Added classic toggle for Tree Feller
  + (Chat) Added ability for admins to spy on party chat (off unless toggled on)
  + (Commands) Added toggle command /mcchatspy
+ + (API) Added many missing SubSkills to SubSkill class
  + (Permissions) Added permission node mcmmo.commands.mcchatspy & mcmmo.commands.mcchatspy.others
  + (Permissions) Added permission nodes for Harvest Lumber, Splinter, Nature's Bounty, and Bark Surgeon
  + (Locale) Added locale strings for new Woodcutting abilities
  + (Locale) Added locale strings for mcchatspy command
  + (Locale) Added locale strings for JSON integration
+ + (Locale) Added locale strings for Taming's Pummel SubSkill
+ + (Locale) Added locale strings for Unarmed's Block Cracker SubSkill
+ - (Locale) Removed localizations with the following codes for being almost empty: id, HR_hr, et_EE, lv, lt, no, pl_PL, pt_PT, tr_TR
  - (Config) Removed SkillShot's IncreaseLevel & IncreasePercentage (replaced by RankDamageMultiplier)
  - (Config) Removed AxeMastery's MaxBonus & MaxBonusLevel (replaced by RankDamageMultiplier)
  ! (Skills) Woodcutting's Double Drop subskill is now named Harvest Lumber
  ! (Skills) Archery's Skill Shot now uses a rank system
  ! (Skills) Axe's Axe Mastery now uses a rank system
+ ! (Config) Unarmed.IronArm in advanced.yml is now Unarmed.IronArmStyle
+ ! (Config) Unarmed.Deflect in advanced.yml is now Unarmed.ArrowDeflect
+ ! (Config) Swords.Counter in advanced.yml is now Swords.CounterAttack
+ ! (Config) Archery.Retrieve in advanced.yml is now Archery.ArrowRetrieval
+ ! (Config) Axes.CriticalHit in advanced.yml is now Axes.CriticalStrikes
  ! (Config) Archery's Skill Shot now uses RankDamageMultiplier for its damage bonus calculations
  ! (Config) Axe's Axe mastery now uses RankDamageMultiplier for its damage bonus calculations
  ! (Permissions) Replaced the old Double Drop permission node for woodcutting with a new Harvest Lumber permission node
+ ! (Permissions) Fast Food Service permission node renamed to mcmmo.ability.taming.fastfoodservice
+ ! (Permissions) Counter Attack permission node renamed to mcmmo.ability.swords.counterattack
+ ! (Permissions) Arrow Deflect permission node renamed to mcmmo.ability.unarmed.arrowdeflect
+ ! (Permissions) Iron Arm Style permission node renamed to mcmmo.ability.unarmed.ironarmstyle
+ ! (Locale) Removed redundant information from some skill names and descriptions en_US (other locales will need to be updated)
+ ! (Locale) SubSkill locale keys are now located at {ParentSkill}.SubSkill.SubSkillName
  ! (Locale) Super Abilities no longer have (ABILITY) in their Skill.Effect strings
  ! (API) mcMMO is now built against Spigot-API instead of Bukkit
  ! (API) SkillType is now PrimarySkill

src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.gmail.nossr50.datatypes.skills.SubSkill;
+import com.gmail.nossr50.util.SkillTextComponentFactory;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
@@ -99,6 +100,9 @@ public class AcrobaticsCommand extends SkillCommand {
     @Override
     protected List<TextComponent> getTextComponents(Player player) {
         List<TextComponent> textComponents = new ArrayList<>();
+
+        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.ACROBATICS);
+
         return textComponents;
     }
 }

src/main/java/com/gmail/nossr50/commands/skills/AlchemyCommand.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.gmail.nossr50.datatypes.skills.PrimarySkill;
 import com.gmail.nossr50.datatypes.skills.SubSkill;
+import com.gmail.nossr50.util.SkillTextComponentFactory;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
@@ -105,6 +106,9 @@ public class AlchemyCommand extends SkillCommand {
     @Override
     protected List<TextComponent> getTextComponents(Player player) {
         List<TextComponent> textComponents = new ArrayList<>();
+
+        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.ALCHEMY);
+
         return textComponents;
     }
 }

src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.gmail.nossr50.datatypes.skills.PrimarySkill;
 import com.gmail.nossr50.datatypes.skills.SubSkill;
+import com.gmail.nossr50.util.SkillTextComponentFactory;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
@@ -42,9 +43,9 @@ public class ArcheryCommand extends SkillCommand {
             dazeChanceLucky = dazeStrings[1];
         }
 
-        // ARCHERY_RETRIEVE
+        // ARCHERY_ARROW_RETRIEVAL
         if (canRetrieve) {
-            String[] retrieveStrings = calculateAbilityDisplayValues(skillValue, SubSkill.ARCHERY_RETRIEVE, isLucky);
+            String[] retrieveStrings = calculateAbilityDisplayValues(skillValue, SubSkill.ARCHERY_ARROW_RETRIEVAL, isLucky);
             retrieveChance = retrieveStrings[0];
             retrieveChanceLucky = retrieveStrings[1];
         }
@@ -54,7 +55,7 @@ public class ArcheryCommand extends SkillCommand {
     protected void permissionsCheck(Player player) {
         canSkillShot = Permissions.isSubSkillEnabled(player, SubSkill.ARCHERY_SKILL_SHOT);
         canDaze = Permissions.isSubSkillEnabled(player, SubSkill.ARCHERY_DAZE);
-        canRetrieve = Permissions.isSubSkillEnabled(player, SubSkill.ARCHERY_RETRIEVE);
+        canRetrieve = Permissions.isSubSkillEnabled(player, SubSkill.ARCHERY_ARROW_RETRIEVAL);
     }
 
     @Override
@@ -98,6 +99,9 @@ public class ArcheryCommand extends SkillCommand {
     @Override
     protected List<TextComponent> getTextComponents(Player player) {
         List<TextComponent> textComponents = new ArrayList<>();
+
+        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.ARCHERY);
+
         return textComponents;
     }
 }

src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java

@@ -3,10 +3,9 @@ package com.gmail.nossr50.commands.skills;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.skills.PrimarySkill;
 import com.gmail.nossr50.datatypes.skills.SubSkill;
-import com.gmail.nossr50.util.skills.RankUtils;
+import com.gmail.nossr50.util.SkillTextComponentFactory;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
@@ -48,7 +47,7 @@ public class AxesCommand extends SkillCommand {
 
         // CRITICAL HIT
         if (canCritical) {
-            String[] criticalHitStrings = calculateAbilityDisplayValues(skillValue, SubSkill.AXES_CRITICAL_HIT, isLucky);
+            String[] criticalHitStrings = calculateAbilityDisplayValues(skillValue, SubSkill.AXES_CRITICAL_STRIKES, isLucky);
             critChance = criticalHitStrings[0];
             critChanceLucky = criticalHitStrings[1];
         }
@@ -62,7 +61,7 @@ public class AxesCommand extends SkillCommand {
     @Override
     protected void permissionsCheck(Player player) {
         canSkullSplitter = Permissions.skullSplitter(player);
-        canCritical = Permissions.isSubSkillEnabled(player, SubSkill.AXES_CRITICAL_HIT);
+        canCritical = Permissions.isSubSkillEnabled(player, SubSkill.AXES_CRITICAL_STRIKES);
         canAxeMastery = Permissions.isSubSkillEnabled(player, SubSkill.AXES_AXE_MASTERY);
         canImpact = Permissions.isSubSkillEnabled(player, SubSkill.AXES_ARMOR_IMPACT);
         canGreaterImpact = Permissions.isSubSkillEnabled(player, SubSkill.AXES_GREATER_IMPACT);
@@ -125,6 +124,9 @@ public class AxesCommand extends SkillCommand {
     @Override
     protected List<TextComponent> getTextComponents(Player player) {
         List<TextComponent> textComponents = new ArrayList<>();
+
+        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.AXES);
+
         return textComponents;
     }
 }

src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java

@@ -3,6 +3,7 @@ package com.gmail.nossr50.commands.skills;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.gmail.nossr50.util.SkillTextComponentFactory;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
@@ -67,6 +68,9 @@ public class ExcavationCommand extends SkillCommand {
     @Override
     protected List<TextComponent> getTextComponents(Player player) {
         List<TextComponent> textComponents = new ArrayList<>();
+
+        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.EXCAVATION);
+
         return textComponents;
     }
 }

src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.gmail.nossr50.datatypes.skills.SubSkill;
+import com.gmail.nossr50.util.SkillTextComponentFactory;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.Location;
 import org.bukkit.entity.EntityType;
@@ -207,6 +208,9 @@ public class FishingCommand extends SkillCommand {
     @Override
     protected List<TextComponent> getTextComponents(Player player) {
         List<TextComponent> textComponents = new ArrayList<>();
+
+        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.FISHING);
+
         return textComponents;
     }
 }

src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java

@@ -5,6 +5,7 @@ import com.gmail.nossr50.datatypes.skills.SubSkill;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.herbalism.Herbalism;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.SkillTextComponentFactory;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -167,6 +168,9 @@ public class HerbalismCommand extends SkillCommand {
     @Override
     protected List<TextComponent> getTextComponents(Player player) {
         List<TextComponent> textComponents = new ArrayList<>();
+
+        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.HERBALISM);
+
         return textComponents;
     }
 }

src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.gmail.nossr50.datatypes.skills.SubSkill;
+import com.gmail.nossr50.util.SkillTextComponentFactory;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
@@ -155,6 +156,9 @@ public class MiningCommand extends SkillCommand {
     @Override
     protected List<TextComponent> getTextComponents(Player player) {
         List<TextComponent> textComponents = new ArrayList<>();
+
+        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.MINING);
+
         return textComponents;
     }
 }

src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java

@@ -11,6 +11,7 @@ import com.gmail.nossr50.skills.repair.Repair;
 import com.gmail.nossr50.skills.repair.RepairManager;
 import com.gmail.nossr50.skills.repair.repairables.Repairable;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.SkillTextComponentFactory;
 import com.gmail.nossr50.util.player.UserManager;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.Material;
@@ -160,6 +161,9 @@ public class RepairCommand extends SkillCommand {
     @Override
     protected List<TextComponent> getTextComponents(Player player) {
         List<TextComponent> textComponents = new ArrayList<>();
+
+        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.REPAIR);
+
         return textComponents;
     }
 }

src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.gmail.nossr50.datatypes.skills.PrimarySkill;
+import com.gmail.nossr50.util.SkillTextComponentFactory;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
@@ -81,6 +82,9 @@ public class SalvageCommand extends SkillCommand {
     @Override
     protected List<TextComponent> getTextComponents(Player player) {
         List<TextComponent> textComponents = new ArrayList<>();
+
+        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.SALVAGE);
+
         return textComponents;
     }
 }

src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java

@@ -71,29 +71,24 @@ public abstract class SkillCommand implements TabExecutor {
                     ScoreboardManager.enablePlayerSkillScoreboard(player, skill);
                 }
 
-                if(skill == PrimarySkill.WOODCUTTING)
-                {
-                    sendSkillCommandHeader(player, mcMMOPlayer, (int) skillValue);
-
-                    //Make JSON text components
-                    List<TextComponent> subskillTextComponents = getTextComponents(player);
+                sendSkillCommandHeader(player, mcMMOPlayer, (int) skillValue);
 
+                //Make JSON text components
+                List<TextComponent> subskillTextComponents = getTextComponents(player);
 
-                    //Subskills Header
-                    player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Effects.SubSkills")));
 
-                    //Send JSON text components
-                    for(TextComponent tc : subskillTextComponents)
-                    {
-                        player.spigot().sendMessage(new TextComponent[]{tc, new TextComponent(": TESTING")});
-                    }
+                //Subskills Header
+                player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Effects.SubSkills")));
 
-                    //Stats
-                    getStatMessages(player, isLucky, hasEndurance, skillValue);
-                } else {
-                    displayOldSkillCommand(player, mcMMOPlayer, isLucky, hasEndurance, skillValue);
+                //Send JSON text components
+                for(TextComponent tc : subskillTextComponents)
+                {
+                    player.spigot().sendMessage(new TextComponent[]{tc, new TextComponent(": TESTING")});
                 }
 
+                //Stats
+                getStatMessages(player, isLucky, hasEndurance, skillValue);
+
                 return true;
 
             default:

src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.gmail.nossr50.datatypes.skills.SubSkill;
+import com.gmail.nossr50.util.SkillTextComponentFactory;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
@@ -122,6 +123,9 @@ public class SmeltingCommand extends SkillCommand {
     @Override
     protected List<TextComponent> getTextComponents(Player player) {
         List<TextComponent> textComponents = new ArrayList<>();
+
+        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.SWORDS);
+
         return textComponents;
     }
 }

src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.gmail.nossr50.datatypes.skills.PrimarySkill;
 import com.gmail.nossr50.datatypes.skills.SubSkill;
+import com.gmail.nossr50.util.SkillTextComponentFactory;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
@@ -48,9 +49,9 @@ public class SwordsCommand extends SkillCommand {
             bleedChanceLucky = bleedStrings[1];
         }
 
-        // SWORDS_COUNTER
+        // SWORDS_COUNTER_ATTACK
         if (canCounter) {
-            String[] counterStrings = calculateAbilityDisplayValues(skillValue, SubSkill.SWORDS_COUNTER, isLucky);
+            String[] counterStrings = calculateAbilityDisplayValues(skillValue, SubSkill.SWORDS_COUNTER_ATTACK, isLucky);
             counterChance = counterStrings[0];
             counterChanceLucky = counterStrings[1];
         }
@@ -59,7 +60,7 @@ public class SwordsCommand extends SkillCommand {
     @Override
     protected void permissionsCheck(Player player) {
         canBleed = Permissions.isSubSkillEnabled(player, SubSkill.SWORDS_BLEED);
-        canCounter = Permissions.isSubSkillEnabled(player, SubSkill.SWORDS_COUNTER);
+        canCounter = Permissions.isSubSkillEnabled(player, SubSkill.SWORDS_COUNTER_ATTACK);
         canSerratedStrike = Permissions.serratedStrikes(player);
     }
 
@@ -107,6 +108,9 @@ public class SwordsCommand extends SkillCommand {
     @Override
     protected List<TextComponent> getTextComponents(Player player) {
         List<TextComponent> textComponents = new ArrayList<>();
+
+        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.SWORDS);
+
         return textComponents;
     }
 }

src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.gmail.nossr50.datatypes.skills.PrimarySkill;
 import com.gmail.nossr50.datatypes.skills.SubSkill;
+import com.gmail.nossr50.util.SkillTextComponentFactory;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
@@ -47,7 +48,7 @@ public class TamingCommand extends SkillCommand {
         canBeastLore = Permissions.isSubSkillEnabled(player, SubSkill.TAMING_BEAST_LORE);
         canCallWild = Permissions.callOfTheWild(player, EntityType.HORSE) || Permissions.callOfTheWild(player, EntityType.WOLF) || Permissions.callOfTheWild(player, EntityType.OCELOT);
         canEnvironmentallyAware = Permissions.isSubSkillEnabled(player, SubSkill.TAMING_ENVIRONMENTALLY_AWARE);
-        canFastFood = Permissions.isSubSkillEnabled(player, SubSkill.TAMING_FAST_FOOD);
+        canFastFood = Permissions.isSubSkillEnabled(player, SubSkill.TAMING_FAST_FOOD_SERVICE);
         canGore = Permissions.isSubSkillEnabled(player, SubSkill.TAMING_GORE);
         canSharpenedClaws = Permissions.isSubSkillEnabled(player, SubSkill.TAMING_SHARPENED_CLAWS);
         canShockProof = Permissions.isSubSkillEnabled(player, SubSkill.TAMING_SHOCK_PROOF);
@@ -173,6 +174,9 @@ public class TamingCommand extends SkillCommand {
     @Override
     protected List<TextComponent> getTextComponents(Player player) {
         List<TextComponent> textComponents = new ArrayList<>();
+
+        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.TAMING);
+
         return textComponents;
     }
 }

src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.gmail.nossr50.datatypes.skills.PrimarySkill;
 import com.gmail.nossr50.datatypes.skills.SubSkill;
+import com.gmail.nossr50.util.SkillTextComponentFactory;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
@@ -49,9 +50,9 @@ public class UnarmedCommand extends SkillCommand {
             disarmChanceLucky = disarmStrings[1];
         }
 
-        // UNARMED_DEFLECT
+        // UNARMED_ARROW_DEFLECT
         if (canDeflect) {
-            String[] deflectStrings = calculateAbilityDisplayValues(skillValue, SubSkill.UNARMED_DEFLECT, isLucky);
+            String[] deflectStrings = calculateAbilityDisplayValues(skillValue, SubSkill.UNARMED_ARROW_DEFLECT, isLucky);
             deflectChance = deflectStrings[0];
             deflectChanceLucky = deflectStrings[1];
         }
@@ -72,8 +73,8 @@ public class UnarmedCommand extends SkillCommand {
     @Override
     protected void permissionsCheck(Player player) {
         canBerserk = Permissions.berserk(player);
-        canIronArm = Permissions.isSubSkillEnabled(player, SubSkill.UNARMED_IRON_ARM);
-        canDeflect = Permissions.isSubSkillEnabled(player, SubSkill.UNARMED_DEFLECT);
+        canIronArm = Permissions.isSubSkillEnabled(player, SubSkill.UNARMED_IRON_ARM_STYLE);
+        canDeflect = Permissions.isSubSkillEnabled(player, SubSkill.UNARMED_ARROW_DEFLECT);
         canDisarm = Permissions.isSubSkillEnabled(player, SubSkill.UNARMED_DISARM);
         canIronGrip = Permissions.isSubSkillEnabled(player, SubSkill.UNARMED_IRON_GRIP);
         // TODO: Apparently we forgot about block cracker?
@@ -137,6 +138,9 @@ public class UnarmedCommand extends SkillCommand {
     @Override
     protected List<TextComponent> getTextComponents(Player player) {
         List<TextComponent> textComponents = new ArrayList<>();
+
+        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.UNARMED);
+
         return textComponents;
     }
 }

src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java

@@ -129,30 +129,10 @@ public class WoodcuttingCommand extends SkillCommand {
     protected List<TextComponent> getTextComponents(Player player) {
         List<TextComponent> textComponents = new ArrayList<>();
 
-        if (canTreeFell) {
-            textComponents.add(SkillTextComponentFactory.getSubSkillTextComponent(player, SubSkill.WOODCUTTING_TREE_FELLER, 0, 1));
-        }
-
-        if (canLeafBlow) {
-            textComponents.add(SkillTextComponentFactory.getSubSkillTextComponent(player, SubSkill.WOODCUTTING_LEAF_BLOWER, 2, 3));
-        }
-
-        if (canDoubleDrop) {
-            textComponents.add(SkillTextComponentFactory.getSubSkillTextComponent(player, SubSkill.WOODCUTTING_HARVEST_LUMBER, 4, 5));
-        }
-
-        if (canSplinter) {
-            textComponents.add(SkillTextComponentFactory.getSubSkillTextComponent(player, SubSkill.WOODCUTTING_SPLINTER, 6, 7));
-        }
-
-        if(canBarkSurgeon) {
-            textComponents.add(SkillTextComponentFactory.getSubSkillTextComponent(player, SubSkill.WOODCUTTING_BARK_SURGEON, 8, 9));
-        }
-
-        if(canNaturesBounty) {
-            textComponents.add(SkillTextComponentFactory.getSubSkillTextComponent(player, SubSkill.WOODCUTTING_NATURES_BOUNTY, 10, 11));
-        }
+        SkillTextComponentFactory.getSubSkillTextComponents(player, textComponents, PrimarySkill.WOODCUTTING);
 
         return textComponents;
     }
+
+
 }

src/main/java/com/gmail/nossr50/config/AdvancedConfig.java

@@ -124,27 +124,27 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
         }
 
         if (getMaxChance(SubSkill.ARCHERY_DAZE) < 1) {
-            reason.add("Skills.Acrobatics.Daze.ChanceMax should be at least 1!");
+            reason.add("Skills.Archery.Daze.ChanceMax should be at least 1!");
         }
 
         if (getMaxBonusLevel(SubSkill.ARCHERY_DAZE) < 1) {
-            reason.add("Skills.Acrobatics.Daze.MaxBonusLevel should be at least 1!");
+            reason.add("Skills.Archery.Daze.MaxBonusLevel should be at least 1!");
         }
 
         if (getDazeBonusDamage() < 0) {
-            reason.add("Skills.Acrobatics.Daze.BonusDamage should be at least 0!");
+            reason.add("Skills.Archery.Daze.BonusDamage should be at least 0!");
         }
 
-        if (getMaxChance(SubSkill.ARCHERY_RETRIEVE) < 1) {
-            reason.add("Skills.Acrobatics.Retrieve.ChanceMax should be at least 1!");
+        if (getMaxChance(SubSkill.ARCHERY_ARROW_RETRIEVAL) < 1) {
+            reason.add("Skills.Archery.Retrieve.ChanceMax should be at least 1!");
         }
 
-        if (getMaxBonusLevel(SubSkill.ARCHERY_RETRIEVE) < 1) {
-            reason.add("Skills.Acrobatics.Retrieve.MaxBonusLevel should be at least 1!");
+        if (getMaxBonusLevel(SubSkill.ARCHERY_ARROW_RETRIEVAL) < 1) {
+            reason.add("Skills.Archery.Retrieve.MaxBonusLevel should be at least 1!");
         }
 
         if (getForceMultiplier() < 0) {
-            reason.add("Skills.Acrobatics.ForceMultiplier should be at least 0!");
+            reason.add("Skills.Archery.ForceMultiplier should be at least 0!");
         }
 
         /* AXES */
@@ -153,20 +153,20 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
             reason.add("Skills.Axes.AxeMastery.RankDamageMultiplier should be at least 0!");
         }
 
-        if (getMaxChance(SubSkill.AXES_CRITICAL_HIT) < 1) {
+        if (getMaxChance(SubSkill.AXES_CRITICAL_STRIKES) < 1) {
             reason.add("Skills.Axes.CriticalHit.ChanceMax should be at least 1!");
         }
 
-        if (getMaxBonusLevel(SubSkill.AXES_CRITICAL_HIT) < 1) {
+        if (getMaxBonusLevel(SubSkill.AXES_CRITICAL_STRIKES) < 1) {
             reason.add("Skills.Axes.CriticalHit.MaxBonusLevel should be at least 1!");
         }
 
-        if (getCriticalHitPVPModifier() < 1) {
-            reason.add("Skills.Axes.CriticalHit.PVP_Modifier should be at least 1!");
+        if (getCriticalStrikesPVPModifier() < 1) {
+            reason.add("Skills.Axes.CriticalStrikes.PVP_Modifier should be at least 1!");
         }
 
-        if (getCriticalHitPVEModifier() < 1) {
-            reason.add("Skills.Axes.CriticalHit.PVE_Modifier should be at least 1!");
+        if (getCriticalStrikesPVPModifier() < 1) {
+            reason.add("Skills.Axes.CriticalStrikes.PVE_Modifier should be at least 1!");
         }
 
         if (getGreaterImpactChance() < 1) {
@@ -520,16 +520,16 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
             reason.add("Skills.Swords.Bleed.BaseTicks should be at least 1!");
         }
 
-        if (getMaxChance(SubSkill.SWORDS_COUNTER) < 1) {
-            reason.add("Skills.Swords.Counter.ChanceMax should be at least 1!");
+        if (getMaxChance(SubSkill.SWORDS_COUNTER_ATTACK) < 1) {
+            reason.add("Skills.Swords.CounterAttack.ChanceMax should be at least 1!");
         }
 
-        if (getMaxBonusLevel(SubSkill.SWORDS_COUNTER) < 1) {
-            reason.add("Skills.Swords.Counter.MaxBonusLevel should be at least 1!");
+        if (getMaxBonusLevel(SubSkill.SWORDS_COUNTER_ATTACK) < 1) {
+            reason.add("Skills.Swords.CounterAttack.MaxBonusLevel should be at least 1!");
         }
 
         if (getCounterModifier() < 1) {
-            reason.add("Skills.Swords.Counter.DamageModifier should be at least 1!");
+            reason.add("Skills.Swords.CounterAttack.DamageModifier should be at least 1!");
         }
 
         if (getSerratedStrikesModifier() < 1) {
@@ -611,12 +611,12 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
             reason.add("Skills.Unarmed.Disarm.MaxBonusLevel should be at least 1!");
         }
 
-        if (getMaxChance(SubSkill.UNARMED_DEFLECT) < 1) {
-            reason.add("Skills.Unarmed.Deflect.ChanceMax should be at least 1!");
+        if (getMaxChance(SubSkill.UNARMED_ARROW_DEFLECT) < 1) {
+            reason.add("Skills.Unarmed.ArrowDeflect.ChanceMax should be at least 1!");
         }
 
-        if (getMaxBonusLevel(SubSkill.UNARMED_DEFLECT) < 1) {
-            reason.add("Skills.Unarmed.Deflect.MaxBonusLevel should be at least 1!");
+        if (getMaxBonusLevel(SubSkill.UNARMED_ARROW_DEFLECT) < 1) {
+            reason.add("Skills.Unarmed.ArrowDeflect.MaxBonusLevel should be at least 1!");
         }
 
         if (getMaxChance(SubSkill.UNARMED_IRON_GRIP) < 1) {
@@ -628,19 +628,19 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
         }
 
         if (getIronArmMinBonus() < 0) {
-            reason.add("Skills.Unarmed.IronArm.BonusMin should be at least 0!");
+            reason.add("Skills.Unarmed.IronArmStyle.BonusMin should be at least 0!");
         }
 
         if (getIronArmMaxBonus() < 0) {
-            reason.add("Skills.Unarmed.IronArm.BonusMax should be at least 0!");
+            reason.add("Skills.Unarmed.IronArmStyle.BonusMax should be at least 0!");
         }
 
         if (getIronArmMaxBonus() < getIronArmMinBonus()) {
-            reason.add("Skills.Unarmed.IronArm.BonusMax should be greater than or equal to Skills.Unarmed.IronArm.BonusMin!");
+            reason.add("Skills.Unarmed.IronArmStyle.BonusMax should be greater than or equal to Skills.Unarmed.IronArm.BonusMin!");
         }
 
         if (getIronArmIncreaseLevel() < 1) {
-            reason.add("Skills.Unarmed.IronArm.IncreaseLevel should be at least 1!");
+            reason.add("Skills.Unarmed.IronArmStyle.IncreaseLevel should be at least 1!");
         }
 
         /* WOODCUTTING */
@@ -750,8 +750,8 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
     /* AXES */
     public double getAxeMasteryRankDamageMultiplier() { return config.getDouble("Skills.Axes.AxeMastery.RankDamageMultiplier", 1.0D); }
 
-    public double getCriticalHitPVPModifier() { return config.getDouble("Skills.Axes.CriticalHit.PVP_Modifier", 1.5D); }
-    public double getCriticalHitPVEModifier() { return config.getDouble("Skills.Axes.CriticalHit.PVE_Modifier", 2.0D); }
+    public double getCriticalStrikesPVPModifier() { return config.getDouble("Skills.Axes.CriticalStrikes.PVP_Modifier", 1.5D); }
+    public double getCriticalStrikesPVEModifier() { return config.getDouble("Skills.Axes.CriticalStrikes.PVE_Modifier", 2.0D); }
 
     public double getGreaterImpactChance() { return config.getDouble("Skills.Axes.GreaterImpact.Chance", 25.0D); }
     public double getGreaterImpactModifier() { return config.getDouble("Skills.Axes.GreaterImpact.KnockbackModifier", 1.5D); }
@@ -836,8 +836,8 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
     public int getBleedMaxTicks() { return config.getInt("Skills.Swords.Bleed.MaxTicks", 3); }
     public int getBleedBaseTicks() { return config.getInt("Skills.Swords.Bleed.BaseTicks", 2); }
 
-    public boolean getCounterRequiresBlock() { return config.getBoolean("Skills.Swords.Counter.RequiresBlock"); }
-    public double getCounterModifier() { return config.getDouble("Skills.Swords.Counter.DamageModifier", 2.0D); }
+    public boolean getCounterRequiresBlock() { return config.getBoolean("Skills.Swords.CounterAttack.RequiresBlock"); }
+    public double getCounterModifier() { return config.getDouble("Skills.Swords.CounterAttack.DamageModifier", 2.0D); }
 
     public double getSerratedStrikesModifier() { return config.getDouble("Skills.Swords.SerratedStrikes.DamageModifier", 4.0D); }
     public int getSerratedStrikesTicks() { return config.getInt("Skills.Swords.SerratedStrikes.BleedTicks", 5); }
@@ -866,9 +866,9 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
     public double getMaxHorseJumpStrength() { return config.getDouble("Skills.Taming.CallOfTheWild.MaxHorseJumpStrength", 2.0D); }
 
     /* UNARMED */
-    public double getIronArmMinBonus() { return config.getDouble("Skills.Unarmed.IronArm.BonusMin", 3.0D); }
-    public double getIronArmMaxBonus() { return config.getDouble("Skills.Unarmed.IronArm.BonusMax", 8.0D); }
-    public int getIronArmIncreaseLevel() { return config.getInt("Skills.Unarmed.IronArm.IncreaseLevel", 50); }
+    public double getIronArmMinBonus() { return config.getDouble("Skills.Unarmed.IronArmStyle.BonusMin", 3.0D); }
+    public double getIronArmMaxBonus() { return config.getDouble("Skills.Unarmed.IronArmStyle.BonusMax", 8.0D); }
+    public int getIronArmIncreaseLevel() { return config.getInt("Skills.Unarmed.IronArmStyle.IncreaseLevel", 50); }
     public boolean getDisarmProtected() { return config.getBoolean("Skills.Unarmed.Disarm.AntiTheft", false); }
 
     /* WOODCUTTING */

src/main/java/com/gmail/nossr50/datatypes/skills/PrimarySkill.java

@@ -38,18 +38,18 @@ import com.google.common.collect.ImmutableList;
 public enum PrimarySkill {
     ACROBATICS(AcrobaticsManager.class, Color.WHITE, ImmutableList.of(SubSkill.ACROBATICS_DODGE, SubSkill.ACROBATICS_GRACEFUL_ROLL, SubSkill.ACROBATICS_ROLL)),
     ALCHEMY(AlchemyManager.class, Color.FUCHSIA, ImmutableList.of(SubSkill.ALCHEMY_CATALYSIS, SubSkill.ALCHEMY_CONCOCTIONS)),
-    ARCHERY(ArcheryManager.class, Color.MAROON, ImmutableList.of(SubSkill.ARCHERY_DAZE, SubSkill.ARCHERY_RETRIEVE, SubSkill.ARCHERY_SKILL_SHOT)),
-    AXES(AxesManager.class, Color.AQUA, SuperAbility.SKULL_SPLITTER, ToolType.AXE, ImmutableList.of(SubSkill.AXES_ARMOR_IMPACT, SubSkill.AXES_AXE_MASTERY, SubSkill.AXES_CRITICAL_HIT, SubSkill.AXES_GREATER_IMPACT)),
-    EXCAVATION(ExcavationManager.class, Color.fromRGB(139, 69, 19), SuperAbility.GIGA_DRILL_BREAKER, ToolType.SHOVEL, ImmutableList.of(SubSkill.EXCAVATION_TREASURE_HUNTER)),
+    ARCHERY(ArcheryManager.class, Color.MAROON, ImmutableList.of(SubSkill.ARCHERY_DAZE, SubSkill.ARCHERY_ARROW_RETRIEVAL, SubSkill.ARCHERY_SKILL_SHOT)),
+    AXES(AxesManager.class, Color.AQUA, SuperAbility.SKULL_SPLITTER, ToolType.AXE, ImmutableList.of(SubSkill.AXES_SKULL_SPLITTER, SubSkill.AXES_ARMOR_IMPACT, SubSkill.AXES_AXE_MASTERY, SubSkill.AXES_CRITICAL_STRIKES, SubSkill.AXES_GREATER_IMPACT)),
+    EXCAVATION(ExcavationManager.class, Color.fromRGB(139, 69, 19), SuperAbility.GIGA_DRILL_BREAKER, ToolType.SHOVEL, ImmutableList.of(SubSkill.EXCAVATION_GIGA_DRILL_BREAKER, SubSkill.EXCAVATION_TREASURE_HUNTER)),
     FISHING(FishingManager.class, Color.NAVY, ImmutableList.of(SubSkill.FISHING_FISHERMANS_DIET, SubSkill.FISHING_TREASURE_HUNTER, SubSkill.FISHING_ICE_FISHING, SubSkill.FISHING_MAGIC_HUNTER, SubSkill.FISHING_MASTER_ANGLER, SubSkill.FISHING_SHAKE)),
     HERBALISM(HerbalismManager.class, Color.GREEN, SuperAbility.GREEN_TERRA, ToolType.HOE, ImmutableList.of(SubSkill.HERBALISM_FARMERS_DIET, SubSkill.HERBALISM_GREEN_THUMB, SubSkill.HERBALISM_DOUBLE_DROPS, SubSkill.HERBALISM_HYLIAN_LUCK, SubSkill.HERBALISM_SHROOM_THUMB)),
-    MINING(MiningManager.class, Color.GRAY, SuperAbility.SUPER_BREAKER, ToolType.PICKAXE, ImmutableList.of(SubSkill.MINING_DOUBLE_DROPS)),
+    MINING(MiningManager.class, Color.GRAY, SuperAbility.SUPER_BREAKER, ToolType.PICKAXE, ImmutableList.of(SubSkill.MINING_SUPER_BREAKER, SubSkill.MINING_DEMOLITIONS_EXPERTISE, SubSkill.MINING_BIGGER_BOMBS, SubSkill.MINING_BLAST_MINING, SubSkill.MINING_DOUBLE_DROPS)),
     REPAIR(RepairManager.class, Color.SILVER, ImmutableList.of(SubSkill.REPAIR_ARCANE_FORGING, SubSkill.REPAIR_REPAIR_MASTERY, SubSkill.REPAIR_SUPER_REPAIR)),
     SALVAGE(SalvageManager.class, Color.ORANGE, ImmutableList.of(SubSkill.SALVAGE_ADVANCED_SALVAGE, SubSkill.SALVAGE_ARCANE_SALVAGE)),
     SMELTING(SmeltingManager.class, Color.YELLOW, ImmutableList.of(SubSkill.SMELTING_FLUX_MINING, SubSkill.SMELTING_FUEL_EFFICIENCY, SubSkill.SMELTING_SECOND_SMELT)),
-    SWORDS(SwordsManager.class, Color.fromRGB(178, 34, 34), SuperAbility.SERRATED_STRIKES, ToolType.SWORD, ImmutableList.of(SubSkill.SWORDS_BLEED, SubSkill.SWORDS_COUNTER)),
-    TAMING(TamingManager.class, Color.PURPLE, ImmutableList.of(SubSkill.TAMING_BEAST_LORE, SubSkill.TAMING_CALL_OF_THE_WILD, SubSkill.TAMING_ENVIRONMENTALLY_AWARE, SubSkill.TAMING_FAST_FOOD, SubSkill.TAMING_GORE, SubSkill.TAMING_HOLY_HOUND, SubSkill.TAMING_SHARPENED_CLAWS, SubSkill.TAMING_SHOCK_PROOF, SubSkill.TAMING_THICK_FUR, SubSkill.TAMING_PUMMEL)),
-    UNARMED(UnarmedManager.class, Color.BLACK, SuperAbility.BERSERK, ToolType.FISTS, ImmutableList.of(SubSkill.UNARMED_BLOCK_CRACKER, SubSkill.UNARMED_DEFLECT, SubSkill.UNARMED_DISARM, SubSkill.UNARMED_IRON_ARM, SubSkill.UNARMED_IRON_GRIP)),
+    SWORDS(SwordsManager.class, Color.fromRGB(178, 34, 34), SuperAbility.SERRATED_STRIKES, ToolType.SWORD, ImmutableList.of(SubSkill.SWORDS_SERRATED_STRIKES, SubSkill.SWORDS_BLEED, SubSkill.SWORDS_COUNTER_ATTACK)),
+    TAMING(TamingManager.class, Color.PURPLE, ImmutableList.of(SubSkill.TAMING_BEAST_LORE, SubSkill.TAMING_CALL_OF_THE_WILD, SubSkill.TAMING_ENVIRONMENTALLY_AWARE, SubSkill.TAMING_FAST_FOOD_SERVICE, SubSkill.TAMING_GORE, SubSkill.TAMING_HOLY_HOUND, SubSkill.TAMING_SHARPENED_CLAWS, SubSkill.TAMING_SHOCK_PROOF, SubSkill.TAMING_THICK_FUR, SubSkill.TAMING_PUMMEL)),
+    UNARMED(UnarmedManager.class, Color.BLACK, SuperAbility.BERSERK, ToolType.FISTS, ImmutableList.of(SubSkill.UNARMED_BERSERK, SubSkill.UNARMED_BLOCK_CRACKER, SubSkill.UNARMED_ARROW_DEFLECT, SubSkill.UNARMED_DISARM, SubSkill.UNARMED_IRON_ARM_STYLE, SubSkill.UNARMED_IRON_GRIP)),
     WOODCUTTING(WoodcuttingManager.class, Color.OLIVE, SuperAbility.TREE_FELLER, ToolType.AXE, ImmutableList.of(SubSkill.WOODCUTTING_LEAF_BLOWER, SubSkill.WOODCUTTING_BARK_SURGEON, SubSkill.WOODCUTTING_SPLINTER, SubSkill.WOODCUTTING_NATURES_BOUNTY, SubSkill.WOODCUTTING_TREE_FELLER, SubSkill.WOODCUTTING_HARVEST_LUMBER));
 
     private Class<? extends SkillManager> managerClass;

src/main/java/com/gmail/nossr50/datatypes/skills/SubSkill.java

@@ -5,6 +5,7 @@ import com.gmail.nossr50.util.StringUtils;
 import static com.gmail.nossr50.datatypes.skills.SubSkillFlags.ACTIVE;
 import static com.gmail.nossr50.datatypes.skills.SubSkillFlags.SUPERABILITY;
 import static com.gmail.nossr50.datatypes.skills.SubSkillFlags.RNG;
+import static com.gmail.nossr50.datatypes.skills.SubSkillFlags.PVP;
 
 
 public enum SubSkill {
@@ -20,19 +21,20 @@ public enum SubSkill {
     ALCHEMY_CONCOCTIONS(8),
 
     /* ARCHERY */
-    ARCHERY_DAZE,
-    ARCHERY_RETRIEVE,
+    ARCHERY_DAZE(0, PVP),
+    ARCHERY_ARROW_RETRIEVAL,
     ARCHERY_SKILL_SHOT(20),
 
     /* Axes */
     AXES_ARMOR_IMPACT,
     AXES_AXE_MASTERY(4),
-    AXES_CRITICAL_HIT,
+    AXES_CRITICAL_STRIKES,
     AXES_GREATER_IMPACT,
     AXES_SKULL_SPLITTER(0, ACTIVE | SUPERABILITY),
 
     /* Excavation */
     EXCAVATION_TREASURE_HUNTER,
+    EXCAVATION_GIGA_DRILL_BREAKER(0, SUPERABILITY | ACTIVE),
 
     /* Fishing */
     FISHING_FISHERMANS_DIET,
@@ -51,6 +53,10 @@ public enum SubSkill {
 
     /* Mining */
     MINING_DOUBLE_DROPS,
+    MINING_SUPER_BREAKER(0, SUPERABILITY | ACTIVE),
+    MINING_BLAST_MINING,
+    MINING_BIGGER_BOMBS,
+    MINING_DEMOLITIONS_EXPERTISE,
 
     /* Repair */
     REPAIR_ARCANE_FORGING,
@@ -68,13 +74,14 @@ public enum SubSkill {
 
     /* Swords */
     SWORDS_BLEED,
-    SWORDS_COUNTER,
+    SWORDS_COUNTER_ATTACK,
+    SWORDS_SERRATED_STRIKES,
 
     /* Taming */
     TAMING_BEAST_LORE,
     TAMING_CALL_OF_THE_WILD,
     TAMING_ENVIRONMENTALLY_AWARE,
-    TAMING_FAST_FOOD,
+    TAMING_FAST_FOOD_SERVICE,
     TAMING_GORE,
     TAMING_HOLY_HOUND,
     TAMING_SHARPENED_CLAWS,
@@ -84,10 +91,11 @@ public enum SubSkill {
 
     /* Unarmed */
     UNARMED_BLOCK_CRACKER,
-    UNARMED_DEFLECT,
+    UNARMED_ARROW_DEFLECT,
     UNARMED_DISARM,
-    UNARMED_IRON_ARM,
+    UNARMED_IRON_ARM_STYLE,
     UNARMED_IRON_GRIP,
+    UNARMED_BERSERK(0, ACTIVE | SUPERABILITY),
 
     /* Woodcutting */
     WOODCUTTING_TREE_FELLER(5, ACTIVE | SUPERABILITY),
@@ -228,8 +236,18 @@ public enum SubSkill {
         return subStringIndex;
     }
 
-    public String getLocalKeyRoot()
+    public String getLocaleKeyRoot()
     {
-        return StringUtils.getCapitalized(getParentSkill().toString()) + ".Effect.";
+        return StringUtils.getCapitalized(getParentSkill().toString())+".SubSkill."+getConfigName(toString());
+    }
+
+    public String getLocaleName()
+    {
+        return LocaleLoader.getString(getLocaleKeyRoot()+".Name");
+    }
+
+    public String getLocaleDescription()
+    {
+        return LocaleLoader.getString(getLocaleKeyRoot()+".Description");
     }
 }

src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillFlags.java

@@ -8,4 +8,5 @@ public class SubSkillFlags {
     public static final byte ACTIVE = 0x01; //Active subskills are ones that aren't passive
     public static final byte SUPERABILITY = 0x02; //If the subskill is a super ability
     public static final byte RNG = 0x04; //If the subskill makes use of RNG
+    public static final byte PVP = 0x08; //If the subskill is PVP specific
 }

src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java

@@ -1,7 +1,6 @@
 package com.gmail.nossr50.skills.archery;
 
 import com.gmail.nossr50.datatypes.skills.SubSkill;
-import com.gmail.nossr50.util.skills.RankUtils;
 import com.gmail.nossr50.util.skills.SubSkillActivationType;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
@@ -34,7 +33,7 @@ public class ArcheryManager extends SkillManager {
     }
 
     public boolean canRetrieveArrows() {
-        return Permissions.isSubSkillEnabled(getPlayer(), SubSkill.ARCHERY_RETRIEVE);
+        return Permissions.isSubSkillEnabled(getPlayer(), SubSkill.ARCHERY_ARROW_RETRIEVAL);
     }
 
     /**
@@ -60,7 +59,7 @@ public class ArcheryManager extends SkillManager {
      * @param target The {@link LivingEntity} damaged by the arrow
      */
     public void retrieveArrows(LivingEntity target) {
-        if (SkillUtils.isActivationSuccessful(SubSkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, SubSkill.ARCHERY_RETRIEVE, getPlayer(), this.skill, getSkillLevel(), activationChance)) {
+        if (SkillUtils.isActivationSuccessful(SubSkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, SubSkill.ARCHERY_ARROW_RETRIEVAL, getPlayer(), this.skill, getSkillLevel(), activationChance)) {
             Archery.incrementTrackerValue(target);
         }
     }

src/main/java/com/gmail/nossr50/skills/axes/Axes.java

@@ -13,8 +13,8 @@ import com.gmail.nossr50.util.ItemUtils;
 public class Axes {
     public static double axeMasteryRankDamageMultiplier = AdvancedConfig.getInstance().getAxeMasteryRankDamageMultiplier();
 
-    public static double criticalHitPVPModifier   = AdvancedConfig.getInstance().getCriticalHitPVPModifier();
-    public static double criticalHitPVEModifier   = AdvancedConfig.getInstance().getCriticalHitPVEModifier();
+    public static double criticalHitPVPModifier   = AdvancedConfig.getInstance().getCriticalStrikesPVPModifier();
+    public static double criticalHitPVEModifier   = AdvancedConfig.getInstance().getCriticalStrikesPVEModifier();
 
     public static int    impactIncreaseLevel         = AdvancedConfig.getInstance().getArmorImpactIncreaseLevel();
     public static double impactChance                = AdvancedConfig.getInstance().getImpactChance();

src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java

@@ -29,7 +29,7 @@ public class AxesManager extends SkillManager {
     }
 
     public boolean canCriticalHit(LivingEntity target) {
-        return target.isValid() && Permissions.isSubSkillEnabled(getPlayer(), SubSkill.AXES_CRITICAL_HIT);
+        return target.isValid() && Permissions.isSubSkillEnabled(getPlayer(), SubSkill.AXES_CRITICAL_STRIKES);
     }
 
     public boolean canImpact(LivingEntity target) {
@@ -66,7 +66,7 @@ public class AxesManager extends SkillManager {
      * @param damage The amount of damage initially dealt by the event
      */
     public double criticalHit(LivingEntity target, double damage) {
-        if (!SkillUtils.isActivationSuccessful(SubSkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, SubSkill.AXES_CRITICAL_HIT, getPlayer(), this.skill, getSkillLevel(), activationChance)) {
+        if (!SkillUtils.isActivationSuccessful(SubSkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, SubSkill.AXES_CRITICAL_STRIKES, getPlayer(), this.skill, getSkillLevel(), activationChance)) {
             return 0;
         }
 

src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java

@@ -36,7 +36,7 @@ public class SwordsManager extends SkillManager {
     }
 
     public boolean canUseCounterAttack(Entity target) {
-        return target instanceof LivingEntity && Permissions.isSubSkillEnabled(getPlayer(), SubSkill.SWORDS_COUNTER);
+        return target instanceof LivingEntity && Permissions.isSubSkillEnabled(getPlayer(), SubSkill.SWORDS_COUNTER_ATTACK);
     }
 
     public boolean canUseSerratedStrike() {
@@ -83,7 +83,7 @@ public class SwordsManager extends SkillManager {
             return;
         }
 
-        if (SkillUtils.isActivationSuccessful(SubSkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, SubSkill.SWORDS_COUNTER, getPlayer(), this.skill, getSkillLevel(), activationChance)) {
+        if (SkillUtils.isActivationSuccessful(SubSkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, SubSkill.SWORDS_COUNTER_ATTACK, getPlayer(), this.skill, getSkillLevel(), activationChance)) {
             CombatUtils.dealDamage(attacker, damage / Swords.counterAttackModifier, getPlayer());
 
             getPlayer().sendMessage(LocaleLoader.getString("Swords.Combat.Countered"));

src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java

@@ -53,7 +53,7 @@ public class TamingManager extends SkillManager {
     }
 
     public boolean canUseFastFoodService() {
-        return getSkillLevel() >= Taming.fastFoodServiceUnlockLevel && Permissions.isSubSkillEnabled(getPlayer(), SubSkill.TAMING_FAST_FOOD);
+        return getSkillLevel() >= Taming.fastFoodServiceUnlockLevel && Permissions.isSubSkillEnabled(getPlayer(), SubSkill.TAMING_FAST_FOOD_SERVICE);
     }
 
     public boolean canUseSharpenedClaws() {
@@ -85,7 +85,7 @@ public class TamingManager extends SkillManager {
      */
     public void fastFoodService(Wolf wolf, double damage) {
         //static chance (3rd param)
-        if (!SkillUtils.isActivationSuccessful(SubSkillActivationType.RANDOM_STATIC_CHANCE, SubSkill.TAMING_FAST_FOOD, getPlayer(), this.skill, getSkillLevel(), activationChance)) {
+        if (!SkillUtils.isActivationSuccessful(SubSkillActivationType.RANDOM_STATIC_CHANCE, SubSkill.TAMING_FAST_FOOD_SERVICE, getPlayer(), this.skill, getSkillLevel(), activationChance)) {
             return;
         }
 
@@ -203,7 +203,7 @@ public class TamingManager extends SkillManager {
             Player defender = (Player) target;
 
             if (UserManager.getPlayer(defender).useChatNotifications()) {
-                defender.sendMessage("Wolf pummeled at you");
+                defender.sendMessage(LocaleLoader.getString("Taming.SubSkill.Pummel.TargetMessage"));
             }
         }
     }

src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java

@@ -34,7 +34,7 @@ public class UnarmedManager extends SkillManager {
     }
 
     public boolean canUseIronArm() {
-        return Permissions.isSubSkillEnabled(getPlayer(), SubSkill.UNARMED_IRON_ARM);
+        return Permissions.isSubSkillEnabled(getPlayer(), SubSkill.UNARMED_IRON_ARM_STYLE);
     }
 
     public boolean canUseBerserk() {
@@ -48,7 +48,7 @@ public class UnarmedManager extends SkillManager {
     public boolean canDeflect() {
         Player player = getPlayer();
 
-        return ItemUtils.isUnarmed(player.getInventory().getItemInMainHand()) && Permissions.isSubSkillEnabled(getPlayer(), SubSkill.UNARMED_DEFLECT);
+        return ItemUtils.isUnarmed(player.getInventory().getItemInMainHand()) && Permissions.isSubSkillEnabled(getPlayer(), SubSkill.UNARMED_ARROW_DEFLECT);
     }
 
     public boolean canUseBlockCracker() {
@@ -102,7 +102,7 @@ public class UnarmedManager extends SkillManager {
      * Check for arrow deflection.
      */
     public boolean deflectCheck() {
-        if (SkillUtils.isActivationSuccessful(SubSkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, SubSkill.UNARMED_DEFLECT, getPlayer(), this.skill, getSkillLevel(), activationChance)) {
+        if (SkillUtils.isActivationSuccessful(SubSkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, SubSkill.UNARMED_ARROW_DEFLECT, getPlayer(), this.skill, getSkillLevel(), activationChance)) {
             getPlayer().sendMessage(LocaleLoader.getString("Combat.ArrowDeflect"));
             return true;
         }
@@ -125,7 +125,7 @@ public class UnarmedManager extends SkillManager {
      * Handle the effects of the Iron Arm ability
      */
     public double ironArm() {
-        if (!SkillUtils.isActivationSuccessful(SubSkillActivationType.ALWAYS_FIRES, SubSkill.UNARMED_IRON_ARM, getPlayer(), null, 0, 0)) {
+        if (!SkillUtils.isActivationSuccessful(SubSkillActivationType.ALWAYS_FIRES, SubSkill.UNARMED_IRON_ARM_STYLE, getPlayer(), null, 0, 0)) {
             return 0;
         }
 

src/main/java/com/gmail/nossr50/util/SkillTextComponentFactory.java

@@ -2,6 +2,7 @@ package com.gmail.nossr50.util;
 
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.datatypes.skills.PrimarySkill;
 import com.gmail.nossr50.datatypes.skills.SubSkill;
 import com.gmail.nossr50.datatypes.skills.SubSkillFlags;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -15,6 +16,7 @@ import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
 import java.util.HashMap;
+import java.util.List;
 
 public class SkillTextComponentFactory {
     public static HashMap<SubSkill, TextComponent> subSkillTextComponents;
@@ -25,7 +27,7 @@ public class SkillTextComponentFactory {
     //This is a nested map because each JSON component for a different rank is going to be a bit different.
     public static HashMap<Integer, HashMap<SubSkill, BaseComponent[]>> hoverComponentOuterMap;
 
-    public static TextComponent getSubSkillTextComponent(Player player, SubSkill subSkill, int localeKeyName, int localeKeyDescription)
+    public static TextComponent getSubSkillTextComponent(Player player, SubSkill subSkill)
     {
         //Init our maps
         if (subSkillTextComponents == null)
@@ -39,7 +41,7 @@ public class SkillTextComponentFactory {
         PlayerProfile playerProfile = UserManager.getPlayer(player).getProfile();
 
         //Get skill name & description from our locale file
-        String skillName = LocaleLoader.getString(subSkill.getLocalKeyRoot()+localeKeyName);
+        String skillName = subSkill.getLocaleName();
 
         if(subSkillTextComponents.get(subSkill) == null)
         {
@@ -48,7 +50,7 @@ public class SkillTextComponentFactory {
             textComponent.setColor(ChatColor.DARK_AQUA);
 
             //Hover Event
-            textComponent.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, getBaseComponent(player, subSkill, localeKeyName, localeKeyDescription)));
+            textComponent.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, getBaseComponent(player, subSkill)));
 
             //Insertion
             textComponent.setInsertion(skillName);
@@ -60,7 +62,7 @@ public class SkillTextComponentFactory {
         }
     }
 
-    private static BaseComponent[] getBaseComponent(Player player, SubSkill subSkill, int localeKeyName, int localeKeyDescription)
+    private static BaseComponent[] getBaseComponent(Player player, SubSkill subSkill)
     {
         //If the player hasn't unlocked this skill yet we use a different JSON template
         if(subSkill.getNumRanks() > 0 && RankUtils.getRank(player, subSkill) == 0)
@@ -69,7 +71,7 @@ public class SkillTextComponentFactory {
             if(lockedComponentMap.get(subSkill) != null)
                 return lockedComponentMap.get(subSkill);
 
-            BaseComponent[] newComponents = getSubSkillHoverEventJSON(subSkill, player, localeKeyName, localeKeyDescription);
+            BaseComponent[] newComponents = getSubSkillHoverEventJSON(subSkill, player);
             lockedComponentMap.put(subSkill, newComponents);
             return lockedComponentMap.get(subSkill);
         }
@@ -84,7 +86,7 @@ public class SkillTextComponentFactory {
         HashMap<SubSkill, BaseComponent[]> innerMap = hoverComponentOuterMap.get(curRank);
 
         if(innerMap.get(subSkill) == null)
-            innerMap.put(subSkill, getSubSkillHoverEventJSON(subSkill, player, localeKeyName, localeKeyDescription));
+            innerMap.put(subSkill, getSubSkillHoverEventJSON(subSkill, player));
 
         return innerMap.get(subSkill);
     }
@@ -100,10 +102,10 @@ public class SkillTextComponentFactory {
         return (flag1 & subSkill.getFlags()) == flag1;
     }
 
-    private static BaseComponent[] getSubSkillHoverEventJSON(SubSkill subSkill, Player player, int localeKeyName, int localeKeyDescription)
+    private static BaseComponent[] getSubSkillHoverEventJSON(SubSkill subSkill, Player player)
     {
-        String skillName = LocaleLoader.getString(subSkill.getLocalKeyRoot()+localeKeyName);
-        String skillDescription = LocaleLoader.getString(subSkill.getLocalKeyRoot()+localeKeyDescription);
+        String skillName = subSkill.getLocaleName();
+        String skillDescription = subSkill.getLocaleDescription();
 
         /*
          * Hover Event BaseComponent color table
@@ -180,6 +182,19 @@ public class SkillTextComponentFactory {
 
         componentBuilder.append("\n");
     }
+
+    public static void getSubSkillTextComponents(Player player, List<TextComponent> textComponents, PrimarySkill parentSkill) {
+        for(SubSkill subSkill : SubSkill.values())
+        {
+            if(subSkill.getParentSkill() == parentSkill)
+            {
+                if(Permissions.isSubSkillEnabled(player, subSkill))
+                {
+                    textComponents.add(SkillTextComponentFactory.getSubSkillTextComponent(player, subSkill));
+                }
+            }
+        }
+    }
 }
 
 

src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java

@@ -271,7 +271,7 @@ public class SkillUtils {
                 return AdvancedConfig.getInstance().getImpactChance();
             case AXES_GREATER_IMPACT:
                 return AdvancedConfig.getInstance().getGreaterImpactChance();
-            case TAMING_FAST_FOOD:
+            case TAMING_FAST_FOOD_SERVICE:
                 return AdvancedConfig.getInstance().getFastFoodChance();
                 default:
                     return 100.0D;

src/main/resources/advanced.yml

@@ -111,7 +111,7 @@ Skills:
             MaxBonusLevel: 100
             BonusDamage: 4.0
 
-        Retrieve:
+        ArrowRetrieval:
             # ChanceMax: Maximum chance of retrieving arrows when on <MaxBonusLevel> or higher
             # MaxBonusLevel: Maximum bonus level for Arrow retrieval, at this level the chance of retrieving arrows from mobs is <ChanceMax>
             ChanceMax: 100.0
@@ -132,7 +132,7 @@ Skills:
                 Rank_2: 10
                 Rank_3: 15
                 Rank_4: 20
-        CriticalHit:
+        CriticalStrikes:
             # ChanceMax: Maximum chance of causing a critical hit when on <MaxBonusLevel> or higher
             # MaxBonusLevel: Level where <ChanceMax> of causing critical hits is reached
             ChanceMax: 37.50
@@ -478,7 +478,7 @@ Skills:
             MaxTicks: 3
             BaseTicks: 2
 
-        Counter:
+        CounterAttack:
             # RequiresBlock: Determines if blocking is required to trigger counter attack
             RequiresBlock: true
 
@@ -563,7 +563,7 @@ Skills:
             MaxBonusLevel: 100
             AntiTheft: false
 
-        Deflect:
+        ArrowDeflect:
             # ChanceMax: Maximum chance of deflecting arrows
             # MaxBonusLevel: Level when the maximum chance to deflect is reached
             ChanceMax: 50.0
@@ -575,7 +575,7 @@ Skills:
             ChanceMax: 100.0
             MaxBonusLevel: 100
 
-        IronArm:
+        IronArmStyle:
             # BonusMin: Minimum bonus damage for unarmed
             # BonusMax: Maximum bonus damage for unarmed
             # IncreaseLevel: Bonus damage increases every increase level

src/main/resources/locale/locale_cs_CZ.properties

@@ -1,12 +1,12 @@
 Acrobatics.Ability.Proc=[[GREEN]]**Elegantni pristani**
 Acrobatics.Combat.Proc=[[GREEN]]**Uskocil jsi**
 Acrobatics.DodgeChance=[[RED]]\u0160ance na \u00faskok: [[YELLOW]]{0}
-Acrobatics.Effect.0=Valeni
-Acrobatics.Effect.1=Redukuje nebo ru\u0161\u00ed zran\u011bn\u00ed zp\u016fsoben\u00e9 p\u00e1dem
-Acrobatics.Effect.2=\u0160\u0165astn\u00fd kotoul
-Acrobatics.Effect.3=Dvojt\u00e1 effectivita ne\u017e norm\u00e1ln\u00ed
-Acrobatics.Effect.4=\u00dahyb
-Acrobatics.Effect.5=Sn\u00ed\u017een\u00e9 zran\u011bn\u00ed o polovinu
+Acrobatics.SubSkill.Roll.Name=Valeni
+Acrobatics.SubSkill.Roll.Description=Redukuje nebo ru\u0161\u00ed zran\u011bn\u00ed zp\u016fsoben\u00e9 p\u00e1dem
+Acrobatics.SubSkill.GracefulRoll.Name=\u0160\u0165astn\u00fd kotoul
+Acrobatics.SubSkill.GracefulRoll.Description=Dvojt\u00e1 effectivita ne\u017e norm\u00e1ln\u00ed
+Acrobatics.SubSkill.Dodge.Name=\u00dahyb
+Acrobatics.SubSkill.Dodge.Description=Sn\u00ed\u017een\u00e9 zran\u011bn\u00ed o polovinu
 Acrobatics.Listener=Akrobacie:
 Acrobatics.Roll.Chance=[[RED]]\u0160ance na kotoul: [[YELLOW]]{0}
 Acrobatics.Roll.GraceChance=[[RED]]\u0160ance na \u0160\u0165astn\u00fd kotoul: [[YELLOW]]{0}
@@ -16,12 +16,12 @@ Acrobatics.Skillup=[[YELLOW]]Dovednost akrobacie byla navysena o {0}. Celkem ({1
 Archery.Combat.DazeChance=[[RED]]\u0160ance na om\u00e1men\u00ed: [[YELLOW]]{0}
 Archery.Combat.RetrieveChance=[[RED]]\u0160ance z\u00edsk\u00e1n\u00ed \u0161\u00edp\u016f zp\u011bt: [[YELLOW]]{0}
 Archery.Combat.SkillshotBonus=[[RED]]Bonusov\u00e9 zran\u011bn\u00ed p\u0159esn\u00e9 trefy: [[YELLOW]]{0}
-Archery.Effect.0=P\u0159esn\u00e1 trefa
-Archery.Effect.1=Zv\u00fd\u0161en\u00e9 po\u0161kozen\u00ed lukem
-Archery.Effect.2=Om\u00e1men\u00ed (Hr\u00e1\u010di)
-Archery.Effect.3=Dezorientuje protivn\u00edky a zp\u016fsob\u00ed {0} po\u0161kozen\u00ed.
-Archery.Effect.4=Sb\u011br \u0161\u00edp\u016f
-Archery.Effect.5=\u0160ance na navr\u00e1cen\u00ed \u0161\u00edp\u016f z mrtvol.
+Archery.SubSkill.SkillShot.Name=P\u0159esn\u00e1 trefa
+Archery.SubSkill.SkillShot.Description=Zv\u00fd\u0161en\u00e9 po\u0161kozen\u00ed lukem
+Archery.SubSkill.Daze.Name=Om\u00e1men\u00ed (Hr\u00e1\u010di)
+Archery.SubSkill.Daze.Description=Dezorientuje protivn\u00edky a zp\u016fsob\u00ed {0} po\u0161kozen\u00ed.
+Archery.SubSkill.ArrowRetrieval.Name=Sb\u011br \u0161\u00edp\u016f
+Archery.SubSkill.ArrowRetrieval.Description=\u0160ance na navr\u00e1cen\u00ed \u0161\u00edp\u016f z mrtvol.
 Archery.Listener=Lukostrelba
 Archery.SkillName=LUKOSTRELBA
 Archery.Skillup=[[YELLOW]]Dovednost lukostrelba byla navysena o {0}. Celkem ({1})
@@ -39,16 +39,16 @@ Axes.Combat.CriticalHit=[[RED]]KRITICK\u00dd Z\u00c1SAH!
 Axes.Combat.GI.Proc=[[GREEN]]**\u00daDER VELKOU SILOU**
 Axes.Combat.GI.Struck=[[RED]]**ZASAZENI S VYSSIM UCINKEM**
 Axes.Combat.SS.Length=[[RED]]Delka trvani Drtice lebek: [[YELLOW]]{0}s
-Axes.Effect.0=[[GREEN]]**Drtic lebek byl AKTIVOVAN**
-Axes.Effect.1=Ud\u011bl AoE zran\u011bn\u00ed
-Axes.Effect.2=Kriticky zasah
-Axes.Effect.3=Dvojite zraneni
-Axes.Effect.4=Mistr sekyr
-Axes.Effect.5=Pridava bonusove zraneni
-Axes.Effect.6=\u00da\u010dinek
-Axes.Effect.7=Zas\u00e1hnout s dostate\u010dnou silou pro rozdrcen\u00ed brn\u011bn\u00ed
-Axes.Effect.8=Vyssi ucinek
-Axes.Effect.9=Zpusobi bonusove zraneni neozbrojenym nepratelum.
+Axes.SubSkill.SkullSplitter.Name=[[GREEN]]**Drtic lebek byl AKTIVOVAN**
+Axes.SubSkill.SkullSplitter.Description=Ud\u011bl AoE zran\u011bn\u00ed
+Axes.SubSkill.CriticalStrikes.Name=Kriticky zasah
+Axes.SubSkill.CriticalStrikes.Description=Dvojite zraneni
+Axes.SubSkill.AxeMastery.Name=Mistr sekyr
+Axes.SubSkill.AxeMastery.Description=Pridava bonusove zraneni
+Axes.SubSkill.ArmorImpact.Name=\u00da\u010dinek
+Axes.SubSkill.ArmorImpact.Description=Zas\u00e1hnout s dostate\u010dnou silou pro rozdrcen\u00ed brn\u011bn\u00ed
+Axes.SubSkill.GreaterImpact.Name=Vyssi ucinek
+Axes.SubSkill.GreaterImpact.Description=Zpusobi bonusove zraneni neozbrojenym nepratelum.
 Axes.Listener=Sekery:
 Axes.SkillName=SEKERY
 Axes.Skills.SS.Off=[[RED]]**Drtic lebek byl deaktivovan**
@@ -59,10 +59,10 @@ Axes.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] pouzil [[RED]]Drtice lebek!
 Axes.Skillup=[[YELLOW]]Dovednost v sekerach byla navysena o {0}. Celkem ({1})
 Excavation.Ability.Lower=[[GRAY]]**Sklonil jsi svoji lopatu**
 Excavation.Ability.Ready=[[GREEN]]**PRIPRAVIL JSI SVOU LOPATU**
-Excavation.Effect.0=Giga Vrtacka (SCHOPNOST)
-Excavation.Effect.1=3x Drop Rate, 3x EXP, +Speed
-Excavation.Effect.2=Hleda\u010d poklad\u016f
-Excavation.Effect.3=Schopnost kopat poklady
+Excavation.SubSkill.GigaDrillBreaker.Name=Giga Vrtacka (SCHOPNOST)
+Excavation.SubSkill.GigaDrillBreaker.Description=3x Drop Rate, 3x EXP, +Speed
+Excavation.SubSkill.TreasureHunter.Name=Hleda\u010d poklad\u016f
+Excavation.SubSkill.TreasureHunter.Description=Schopnost kopat poklady
 Excavation.Effect.Length=[[RED]]Delka trvani Giga Drill Breaker: [[YELLOW]]{0}s
 Excavation.Listener=Kopani:
 Excavation.SkillName=KOPANI
@@ -81,18 +81,18 @@ Fishing.Ability.TH.MagicRate=[[RED]]\u0160ance na magick\u00e9ho lovce: [[YELLOW
 Fishing.Ability.Shake=[[RED]]\u0160ance na ot\u0159es: [[YELLOW]]{0}
 Fishing.Ability.IceFishing=[[RED]]Ledov\u00e9 ryba\u0159en\u00ed: B\u011b\u017ete ryba\u0159it do ledu
 Fishing.Ability.FD=[[RED]]Ryb\u00e1\u0159\u016fv apetit: [[YELLOW]]Rank {0}
-Fishing.Effect.0=Lovec pokladu (pasivni)
-Fishing.Effect.1=Fish up misc. objects
-Fishing.Effect.2=Magicky Lovec
-Fishing.Effect.3=Na\u0161el si o\u010darovanou v\u011bc
-Fishing.Effect.4=Shake (vs. Entities)
-Fishing.Effect.5=Vyklepni p\u0159edm\u011bty z p\u0159\u00ed\u0161er s prutem
-Fishing.Effect.6=Ryb\u00e1\u0159\u016fv apetit
-Fishing.Effect.7=Zlep\u0161uje dopl\u0148ov\u00e1n\u00ed hladu z naryba\u0159en\u00fdch j\u00eddel
-Fishing.Effect.8=Mistr Ryb\u00e1\u0159
-Fishing.Effect.9=Zvy\u0161uje \u0161anci zah\u00e1knut\u00ed ryby p\u0159i ryba\u0159en\u00ed
-Fishing.Effect.10=Ryba\u0159en\u00ed v ledu
-Fishing.Effect.11=Umo\u017e\u0148uje v\u00e1m ryba\u0159it v ledov\u00fdch prost\u0159ed\u00edch
+Fishing.SubSkill.TreasureHunter.Name=Lovec pokladu (pasivni)
+Fishing.SubSkill.TreasureHunter.Description=Fish up misc. objects
+Fishing.SubSkill.MagicHunter.Name=Magicky Lovec
+Fishing.SubSkill.MagicHunter.Description=Na\u0161el si o\u010darovanou v\u011bc
+Fishing.SubSkill.Shake.Name=Shake (vs. Entities)
+Fishing.SubSkill.Shake.Description=Vyklepni p\u0159edm\u011bty z p\u0159\u00ed\u0161er s prutem
+Fishing.SubSkill.FishermansDiet.Name=Ryb\u00e1\u0159\u016fv apetit
+Fishing.SubSkill.FishermansDiet.Description=Zlep\u0161uje dopl\u0148ov\u00e1n\u00ed hladu z naryba\u0159en\u00fdch j\u00eddel
+Fishing.SubSkill.MasterAngler.Name=Mistr Ryb\u00e1\u0159
+Fishing.SubSkill.MasterAngler.Description=Zvy\u0161uje \u0161anci zah\u00e1knut\u00ed ryby p\u0159i ryba\u0159en\u00ed
+Fishing.SubSkill.IceFishing.Name=Ryba\u0159en\u00ed v ledu
+Fishing.SubSkill.IceFishing.Description=Umo\u017e\u0148uje v\u00e1m ryba\u0159it v ledov\u00fdch prost\u0159ed\u00edch
 Fishing.Chance.Raining=[[BLUE]] De\u0161\u0165ov\u00fd bonus
 Fishing.Listener=Rybareni:
 Fishing.Ability.TH.MagicFound=[[GRAY]]C\u00edt\u00edte dotek magie s t\u00edmto \u00falovkem...
@@ -111,19 +111,19 @@ Herbalism.Ability.Lower=[[GRAY]]**SKLONIL JSI SVOJI MOTYKU**
 Herbalism.Ability.Ready=[[GREEN]]**PRIPRAVIL JSI SVOU MOTYKU**
 Herbalism.Ability.ShroomThumb.Chance=[[RED]]\u0160ance na dovednost Houba\u0159: [[YELLOW]]{0}
 Herbalism.Ability.ShroomThumb.Fail=[[RED]]**HOUBA\u0158 SELHAL**
-Herbalism.Effect.0=Green Terra (SCHOPNOST)
-Herbalism.Effect.1=\u0160\u00ed\u0159en\u00ed planety, 3x v\u00edce drop\u016f
-Herbalism.Effect.2=Zahradnik (Wheat)
-Herbalism.Effect.3=Automaticky sazi plodiny pri sklizeni
-Herbalism.Effect.5=Zar\u016fst cihly mechem, nebo nebo nechat vyr\u016fst tr\u00e1vu
-Herbalism.Effect.6=Farm\u00e1\u0159\u016fv apetit
-Herbalism.Effect.7=Zvysuje obnovu hladu ze sklizenych jidel
-Herbalism.Effect.8=Dvojnasobny zisk (vsechny byliny)
-Herbalism.Effect.9=Zdvojnasobi normalni zisk
-Herbalism.Effect.10=Hyliansk\u00e9 \u0161t\u011bst\u00ed
-Herbalism.Effect.11=D\u00e1v\u00e1 malou \u0161anci naj\u00edt vz\u00e1cn\u00e9 p\u0159edm\u011bty
-Herbalism.Effect.12=Houba\u0159
-Herbalism.Effect.13=Roz\u0161i\u0159te podhoub\u00ed do tr\u00e1vy a hl\u00edny
+Herbalism.SubSkill.GreenTerra.Name=Green Terra (SCHOPNOST)
+Herbalism.SubSkill.GreenTerra.Description=\u0160\u00ed\u0159en\u00ed planety, 3x v\u00edce drop\u016f
+Herbalism.SubSkill.GreenThumb.Name=Zahradnik (Wheat)
+Herbalism.SubSkill.GreenThumb.Description=Automaticky sazi plodiny pri sklizeni
+Herbalism.SubSkill.GreenThumb.Description.2=Zar\u016fst cihly mechem, nebo nebo nechat vyr\u016fst tr\u00e1vu
+Herbalism.SubSkill.FarmersDiet.Name=Farm\u00e1\u0159\u016fv apetit
+Herbalism.SubSkill.FarmersDiet.Description=Zvysuje obnovu hladu ze sklizenych jidel
+Herbalism.SubSkill.DoubleDrops.Name=Dvojnasobny zisk (vsechny byliny)
+Herbalism.SubSkill.DoubleDrops.Description=Zdvojnasobi normalni zisk
+Herbalism.SubSkill.HylianLuck.Name=Hyliansk\u00e9 \u0161t\u011bst\u00ed
+Herbalism.SubSkill.HylianLuck.Description=D\u00e1v\u00e1 malou \u0161anci naj\u00edt vz\u00e1cn\u00e9 p\u0159edm\u011bty
+Herbalism.SubSkill.ShroomThumb.Name=Houba\u0159
+Herbalism.SubSkill.ShroomThumb.Description=Roz\u0161i\u0159te podhoub\u00ed do tr\u00e1vy a hl\u00edny
 Herbalism.HylianLuck=[[GREEN]]The luck of Hyrule t\u011b doprov\u00e1z\u00ed!
 Herbalism.Listener=Bylinarstvi:
 Herbalism.SkillName=Bylinkarstvi
@@ -138,16 +138,16 @@ Mining.Ability.Locked.1=Zamknuto doku\u010f {0}+ DOVEDNOST (V\u011aT\u0160\u00cd
 Mining.Ability.Locked.2=ZAM\u010cENO DOKU\u010e{0}+ DOVEDNOST (DEMOLI\u010cN\u00cd ODBORNOST)
 Mining.Ability.Lower=[[GRAY]]**SLOZIL SI SVUJ KRUMPAC**
 Mining.Ability.Ready=[[GREEN]]**KRUMPAC PRIPRAVEN**
-Mining.Effect.0=Super Breaker (SCHOPNOST)
-Mining.Effect.1=Rychlost+, sance na trojnasobny zisk
-Mining.Effect.2=Dvojn\u00e1sobn\u00fd zisk
-Mining.Effect.3=Zdvojnasobi normalni zisk
-Mining.Effect.4=Tezeni vybuchem
-Mining.Effect.5=Bonusy za tezeni s TNT
-Mining.Effect.6=V\u011bt\u0161\u00ed bomby
-Mining.Effect.7=Navysuje vzdalenost exploze TNT
-Mining.Effect.8=Odborn\u00e1 demolice
-Mining.Effect.9=Snizuje zraneni zpusobene vybuchem TNT
+Mining.SubSkill.SuperBreaker.Name=Super Breaker (SCHOPNOST)
+Mining.SubSkill.SuperBreaker.Description=Rychlost+, sance na trojnasobny zisk
+Mining.SubSkill.DoubleDrops.Name=Dvojn\u00e1sobn\u00fd zisk
+Mining.SubSkill.DoubleDrops.Description=Zdvojnasobi normalni zisk
+Mining.SubSkill.BlastMining.Name=Tezeni vybuchem
+Mining.SubSkill.BlastMining.Description=Bonusy za tezeni s TNT
+Mining.SubSkill.BiggerBombs.Name=V\u011bt\u0161\u00ed bomby
+Mining.SubSkill.BiggerBombs.Description=Navysuje vzdalenost exploze TNT
+Mining.SubSkill.DemolitionsExpertise.Name=Odborn\u00e1 demolice
+Mining.SubSkill.DemolitionsExpertise.Description=Snizuje zraneni zpusobene vybuchem TNT
 Mining.Effect.Decrease=[[RED]]Sn\u00ed\u017een\u00ed \u0161kod Demoli\u010dn\u00edho experta: [[YELLOW]]{0}
 Mining.Effect.DropChance=[[RED]]\u0161ance na dvojn\u00e1sobn\u00fd zisk: [[YELLOW]]{0}
 Mining.Listener=Dolovani:
@@ -164,24 +164,24 @@ Mining.Blast.Radius.Increase=[[RED]]Navyseni radiusu vybuchu: [[YELLOW]]+{0}
 Mining.Blast.Rank=[[RED]]V\u00fdbu\u0161n\u00e9 t\u011b\u017een\u00ed [[YELLOW]] Rank {0}/8 [[GRAY]]({1})
 Mining.Blast.Other.On=[[GREEN]]{0}[[DARK_GREEN]] pou\u017eil [[RED]]V\u00fdbu\u0161n\u00e9 T\u011b\u017een\u00ed!
 Mining.Blast.Refresh=[[GREEN]]Dovednost [[YELLOW]]Dolovani vybuchem [[GREEN]]je nyni obnovena!
-Repair.Effect.0=Opravovani
-Repair.Effect.1=Oprava zbroje a n\u00e1stroj\u016f
-Repair.Effect.10=Oprava zlata ({0}+ SKILL)
-Repair.Effect.11=Oprava zlat\u00fdch n\u00e1stroj\u016f a brn\u011bn\u00ed
-Repair.Effect.12=Oprava \u017eeleza ({0}+ SKILL)
-Repair.Effect.13=Oprava \u017eelezn\u00fdch nastroju a brneni
-Repair.Effect.14=Oprava kamene ({0}+ SKILL)
-Repair.Effect.15=Oprava kamenn\u00fdch n\u00e1stroj\u016f
-Repair.Effect.2=Mistrovstvi v opravovani
-Repair.Effect.3=Zvysena efektivita opravy
-Repair.Effect.4=Superopravovani
-Repair.Effect.5=Dvojita efektivita
-Repair.Effect.6=Oprava diamantovych predmetu ({0}+ SKILL)
-Repair.Effect.7=Oprava diamantovych nastroju a brneni
-Repair.Effect.8=Tajemne kovani
-Repair.Effect.9=Oprava enchantovanych predmetu
-Repair.Effect.16=Sb\u00edrat({0}+ Dovednost)
-Repair.Effect.17=Sb\u00edrat N\u00e1stroje a Zbroj
+Repair.SubSkill.Repair.Name=Opravovani
+Repair.SubSkill.Repair.Description=Oprava zbroje a n\u00e1stroj\u016f
+Repair.SubSkill.GoldRepair.Name=Oprava zlata ({0}+ SKILL)
+Repair.SubSkill.GoldRepair.Description=Oprava zlat\u00fdch n\u00e1stroj\u016f a brn\u011bn\u00ed
+Repair.SubSkill.IronRepair.Name=Oprava \u017eeleza ({0}+ SKILL)
+Repair.SubSkill.IronRepair.Description=Oprava \u017eelezn\u00fdch nastroju a brneni
+Repair.SubSkill.StoneRepair.Name=Oprava kamene ({0}+ SKILL)
+Repair.SubSkill.StoneRepair.Description=Oprava kamenn\u00fdch n\u00e1stroj\u016f
+Repair.SubSkill.RepairMastery.Name=Mistrovstvi v opravovani
+Repair.SubSkill.RepairMastery.Description=Zvysena efektivita opravy
+Repair.SubSkill.SuperRepair.Name=Superopravovani
+Repair.SubSkill.SuperRepair.Description=Dvojita efektivita
+Repair.SubSkill.DiamondRepair.Name=Oprava diamantovych predmetu ({0}+ SKILL)
+Repair.SubSkill.DiamondRepair.Description=Oprava diamantovych nastroju a brneni
+Repair.SubSkill.ArcaneForging.Name=Tajemne kovani
+Repair.SubSkill.ArcaneForging.Description=Oprava enchantovanych predmetu
+Repair.SubSkill.Salvage.Name=Sb\u00edrat({0}+ Dovednost)
+Repair.SubSkill.Salvage.Description=Sb\u00edrat N\u00e1stroje a Zbroj
 Repair.Error=[[DARK_RED]]V mcMMO do\u0161lo k chyb\u011b p\u0159i oprav\u011b tohoto itemu!
 Repair.Listener.Anvil=[[DARK_RED]]Polo\u017eil si kovadlinu, na kovadlin\u011b m\u016f\u017ee\u0161 opravovat n\u00e1stroje a zbroj.
 Repair.Listener.Anvil2=[[DARK_RED]]Polozil jsi Salvage kovadlinu, pouzij ji na zachranu armoru.
@@ -222,14 +222,14 @@ Swords.Combat.Counter.Chance=[[RED]]\u0160ance na proti\u00fatok: [[YELLOW]]{0}
 Swords.Combat.Counter.Hit=[[DARK_RED]]Zasa\u017een proti\u00fatokem!
 Swords.Combat.Countered=[[GREEN]]**PROTIUTOK**
 Swords.Combat.SS.Struck=[[DARK_RED]]Zasazen Hrozivym utokem!
-Swords.Effect.0=Protiutok
-Swords.Effect.1=Sance k reflektovani obdrzeneho poskozeni pri braneni {0}
-Swords.Effect.2=Hrozivy utok (SCHOPNOST)
-Swords.Effect.3={0} Po\u0161kozen\u00ed \u00fatok do okol\u00ed, Krv\u00e1cen\u00ed+ \u00fatok do okol\u00ed
+Swords.SubSkill.CounterAttack.Name=Protiutok
+Swords.SubSkill.CounterAttack.Description=Sance k reflektovani obdrzeneho poskozeni pri braneni {0}
+Swords.SubSkill.SerratedStrikes.Name=Hrozivy utok (SCHOPNOST)
+Swords.SubSkill.SerratedStrikes.Description={0} Po\u0161kozen\u00ed \u00fatok do okol\u00ed, Krv\u00e1cen\u00ed+ \u00fatok do okol\u00ed
 Swords.Effect.4=Hrozivy utok krvaceni+
 Swords.Effect.5={0} Tikav\u00e9 Krv\u00e1cen\u00ed
-Swords.Effect.6=Krv\u00e1cen\u00ed
-Swords.Effect.7=Aplikuj krv\u00e1cejic\u00ed DoTku
+Swords.SubSkill.Bleed.Name=Krv\u00e1cen\u00ed
+Swords.SubSkill.Bleed.Description=Aplikuj krv\u00e1cejic\u00ed DoTku
 Swords.Listener=Mece:
 Swords.SkillName=MECE
 Swords.Skills.SS.Off=[[RED]]**Hroziv\u00fd \u00fatok byl deaktivov\u00e1n**
@@ -258,26 +258,26 @@ Taming.Ability.Locked.3=ZAM\u010cENO DOKUD {0}+ DOVEDNOST (NABROU\u0160EN\u00c9
 Taming.Ability.Locked.4=ZAM\u010cENO DOKU\u010e{0}+ DOVEDNOST (RYCHL\u00c9 OB\u010cERSTVEN\u00cd)
 Taming.Ability.Locked.5=UZAM\u010cENO DOKU\u010e {0}+ DOVEDNOST (Svat\u00fd Chrt)
 Taming.Combat.Chance.Gore=[[RED]]\u0160ance na nabodnut\u00ed: [[YELLOW]]{0}
-Taming.Effect.0=Tradice \u0161elem
-Taming.Effect.1=Na\u0159\u00edznut\u00ed kost\u00ed kontroluje vlky & oceloty
-Taming.Effect.10=Otresuvzdorny
-Taming.Effect.11=Po\u0161kozen\u00ed Exploz\u00ed Sn\u00ed\u017eeno
-Taming.Effect.12=Vol\u00e1n\u00ed divociny
-Taming.Effect.13=Privolej zvirata na svou stranu
-Taming.Effect.14=[[GRAY]]COTW (Ocelot): Skrc se a levym-klikem s {0} rybami v ruce
+Taming.SubSkill.BeastLore.Name=Tradice \u0161elem
+Taming.SubSkill.BeastLore.Description=Na\u0159\u00edznut\u00ed kost\u00ed kontroluje vlky & oceloty
+Taming.SubSkill.ShockProof.Name=Otresuvzdorny
+Taming.SubSkill.ShockProof.Description=Po\u0161kozen\u00ed Exploz\u00ed Sn\u00ed\u017eeno
+Taming.SubSkill.CallOfTheWild.Name=Vol\u00e1n\u00ed divociny
+Taming.SubSkill.CallOfTheWild.Description=Privolej zvirata na svou stranu
+Taming.SubSkill.CallOfTheWild.Description.2=[[GRAY]]COTW (Ocelot): Skrc se a levym-klikem s {0} rybami v ruce
 Taming.Effect.15=[[GRAY]]COTW (Ocelot): Skrc se a levym-klikem s {0} kostmi v ruce
-Taming.Effect.16=Rychl\u00e9 Ob\u010derstven\u00ed
-Taming.Effect.17=\u0160ance na vyl\u00e9\u010den\u00ed vlka p\u0159i \u00fatoku
-Taming.Effect.18=Svat\u00fd Chrt
-Taming.Effect.19=Uzdraven Magi\u00ed & Lektvarem
-Taming.Effect.2=Krveprolit\u00ed
-Taming.Effect.3=Kritick\u00fd \u00fader, kter\u00fd aplikuje krv\u00e1cen\u00ed
-Taming.Effect.4=Nabrousene drapy
-Taming.Effect.5=Bonus k zran\u011bn\u00ed
-Taming.Effect.6=Ekologicky informovane
-Taming.Effect.7=Kaktusov\u00e1/L\u00e1vov\u00e1 f\u00f3bie, Imunita proti zran\u011bn\u00ed p\u00e1dem
-Taming.Effect.8=Husta srst
-Taming.Effect.9=Sn\u00ed\u017een\u00e9 zran\u011bn\u00ed,Odolnost proti ohni
+Taming.SubSkill.FastFoodService.Name=Rychl\u00e9 Ob\u010derstven\u00ed
+Taming.SubSkill.FastFoodService.Description=\u0160ance na vyl\u00e9\u010den\u00ed vlka p\u0159i \u00fatoku
+Taming.SubSkill.HolyHound.Name=Svat\u00fd Chrt
+Taming.SubSkill.HolyHound.Description=Uzdraven Magi\u00ed & Lektvarem
+Taming.SubSkill.Gore.Name=Krveprolit\u00ed
+Taming.SubSkill.Gore.Description=Kritick\u00fd \u00fader, kter\u00fd aplikuje krv\u00e1cen\u00ed
+Taming.SubSkill.SharpenedClaws.Name=Nabrousene drapy
+Taming.SubSkill.SharpenedClaws.Description=Bonus k zran\u011bn\u00ed
+Taming.SubSkill.EnvironmentallyAware.Name=Ekologicky informovane
+Taming.SubSkill.EnvironmentallyAware.Description=Kaktusov\u00e1/L\u00e1vov\u00e1 f\u00f3bie, Imunita proti zran\u011bn\u00ed p\u00e1dem
+Taming.SubSkill.ThickFur.Name=Husta srst
+Taming.SubSkill.ThickFur.Description=Sn\u00ed\u017een\u00e9 zran\u011bn\u00ed,Odolnost proti ohni
 Taming.Listener.Wolf=[[DARK_GRAY]]Vlk vlk pribehl zpatky k tobe...
 Taming.Listener=Ochocovani:
 Taming.SkillName=OCHOCOVANI
@@ -296,16 +296,16 @@ Unarmed.Ability.IronGrip.Attacker=[[RED]] Tv\u016fj soupe\u0159 m\u00e1 \u017eel
 Unarmed.Ability.IronGrip.Defender=[[GREEN]]Tv\u016fj \u017eelezny stisk zabr\u00e1nil tomu abys byl odzbrojen!
 Unarmed.Ability.Lower=[[GRAY]]**SKL\u00c1N\u00cd\u0160 SV\u00c9 P\u011aSTI**
 Unarmed.Ability.Ready=[[GREEN]]**PRIPRAVIL JSI SVOJE PESTI**
-Unarmed.Effect.0=B\u011bsn\u011bn\u00ed (SCHOPNOST)
-Unarmed.Effect.1=+50% DMG, Nici slabsi materiali
-Unarmed.Effect.2=Odzbrojit (Hr\u00e1ce)
-Unarmed.Effect.3=Vyraz\u00ed nep\u0159\u00e1tel\u016fm p\u0159edm\u011bt kter\u00fd dr\u017e\u00ed v ruce
-Unarmed.Effect.4=Styl \u017eelezn\u00e9 pa\u017ee
-Unarmed.Effect.5=Na \u010das ti zatvrd\u00ed ruku
-Unarmed.Effect.6=Vych\u00fdlen\u00ed \u0161\u00edpu
-Unarmed.Effect.7=Odrazeni sipu
-Unarmed.Effect.8=\u017delezn\u00fd stisk
-Unarmed.Effect.9=Zabra\u0148uje va\u0161emu odzbrojen\u00ed
+Unarmed.SubSkill.Berserk.Name=B\u011bsn\u011bn\u00ed (SCHOPNOST)
+Unarmed.SubSkill.Berserk.Description=+50% DMG, Nici slabsi materiali
+Unarmed.SubSkill.Disarm.Name=Odzbrojit (Hr\u00e1ce)
+Unarmed.SubSkill.Disarm.Description=Vyraz\u00ed nep\u0159\u00e1tel\u016fm p\u0159edm\u011bt kter\u00fd dr\u017e\u00ed v ruce
+Unarmed.SubSkill.IronArmStyle.Name=Styl \u017eelezn\u00e9 pa\u017ee
+Unarmed.SubSkill.IronArmStyle.Description=Na \u010das ti zatvrd\u00ed ruku
+Unarmed.SubSkill.ArrowDeflect.Name=Vych\u00fdlen\u00ed \u0161\u00edpu
+Unarmed.SubSkill.ArrowDeflect.Description=Odrazeni sipu
+Unarmed.SubSkill.IronGrip.Name=\u017delezn\u00fd stisk
+Unarmed.SubSkill.IronGrip.Description=Zabra\u0148uje va\u0161emu odzbrojen\u00ed
 Unarmed.Listener=Neozbrojeny:
 Unarmed.SkillName=NEOZBROJENY
 Unarmed.Skills.Berserk.Off=[[RED]]**Besneni bylo deaktivovano**
@@ -319,12 +319,12 @@ Woodcutting.Ability.1=Odfoukne listi
 Woodcutting.Ability.Chance.DDrop=[[RED]]\u0160ance na dvojn\u00e1sobn\u00fd zisk: [[YELLOW]]{0}
 Woodcutting.Ability.Length=[[RED]]D\u00e9lka Tree felleru: [[YELLOW]]{0}s
 Woodcutting.Ability.Locked.0=ZAM\u010cENO DOKUD {0}+ DOVEDNOST (FOUKA\u010c LIST\u00cd)
-Woodcutting.Effect.0=Ni\u010ditel strom\u016f (ABILITA)
-Woodcutting.Effect.1=Odp\u00e1l\u00ed strom
-Woodcutting.Effect.2=Vyfoukavac
-Woodcutting.Effect.3=Odfoukne listi
-Woodcutting.Effect.4=Dvojnasobne zisky
-Woodcutting.Effect.5=Zdvojnasobi normalni zisk
+Woodcutting.SubSkill.TreeFeller.Name=Ni\u010ditel strom\u016f (ABILITA)
+Woodcutting.SubSkill.TreeFeller.Description=Odp\u00e1l\u00ed strom
+Woodcutting.SubSkill.LeafBlower.Name=Vyfoukavac
+Woodcutting.SubSkill.LeafBlower.Description=Odfoukne listi
+Woodcutting.SubSkill.HarvestLumber.Name=Dvojnasobne zisky
+Woodcutting.SubSkill.HarvestLumber.Description=Zdvojnasobi normalni zisk
 Woodcutting.Listener=D\u0159evorubectv\u00ed:
 Woodcutting.SkillName=DREVORUBECTVI
 Woodcutting.Skills.TreeFeller.Off=[[RED]]Valec stromu[[GREEN]] byl deaktivovan [[YELLOW]]{0} t

src/main/resources/locale/locale_cy.properties

@@ -1,12 +1,12 @@
 Acrobatics.Ability.Proc=[[GREEN]]**Graceful Landing**
 Acrobatics.Combat.Proc=[[GREEN]] **osgoi\'r**
 Acrobatics.DodgeChance=[[RED]]Dodge Chance: [[YELLOW]]{0}
-Acrobatics.Effect.0=Roll
-Acrobatics.Effect.1=Reduces or Negates fall damage
-Acrobatics.Effect.2=Graceful Roll
-Acrobatics.Effect.3=Twice as effective as a normal Roll
-Acrobatics.Effect.4=Dodge
-Acrobatics.Effect.5=Reduce attack damage by half
+Acrobatics.SubSkill.Roll.Name=Roll
+Acrobatics.SubSkill.Roll.Description=Reduces or Negates fall damage
+Acrobatics.SubSkill.GracefulRoll.Name=Graceful Roll
+Acrobatics.SubSkill.GracefulRoll.Description=Twice as effective as a normal Roll
+Acrobatics.SubSkill.Dodge.Name=Dodge
+Acrobatics.SubSkill.Dodge.Description=Reduce attack damage by half
 Acrobatics.Listener=Acrobateg
 Acrobatics.Roll.Chance=[[RED]]Roll Chance: [[YELLOW]]{0}
 Acrobatics.Roll.GraceChance=[[RED]]Graceful Roll Chance: [[YELLOW]]{0}
@@ -16,11 +16,11 @@ Acrobatics.Skillup=[[YELLOW]] Acrobateg sgil cynyddu {0}. Cyfanswm ({1})
 Archery.Combat.DazeChance=[[RED]]Chance to Daze: [[YELLOW]]{0}
 Archery.Combat.RetrieveChance=[[RED]]Chance to Retrieve Arrows: [[YELLOW]]{0}
 Archery.Combat.SkillshotBonus=[[RED]]Skill Shot Bonus Damage: [[YELLOW]]{0}
-Archery.Effect.0=Skill Shot
-Archery.Effect.1=Increases damage done with bows
-Archery.Effect.2=Daze (Players)
-Archery.Effect.4=Arrow Retrieval
-Archery.Effect.5=Chance to retrieve arrows from corpses
+Archery.SubSkill.SkillShot.Name=Skill Shot
+Archery.SubSkill.SkillShot.Description=Increases damage done with bows
+Archery.SubSkill.Daze.Name=Daze (Players)
+Archery.SubSkill.ArrowRetrieval.Name=Arrow Retrieval
+Archery.SubSkill.ArrowRetrieval.Description=Chance to retrieve arrows from corpses
 Archery.Listener=Archery:
 Archery.SkillName=ARCHERY
 Archery.Skillup=[[YELLOW]] sgiliau Saethyddiaeth cynyddu {0}. Cyfanswm ({1})
@@ -38,16 +38,16 @@ Axes.Combat.CriticalHit=[[RED]]CRITICAL HIT!
 Axes.Combat.GI.Proc=[[GREEN]]**STRUCK WITH GREAT FORCE**
 Axes.Combat.GI.Struck=[[RED]] ** ** BRIFO GAN EFFAITH FWYAF
 Axes.Combat.SS.Length=[[RED]]Skull Splitter Length: [[YELLOW]]{0}s
-Axes.Effect.0=Skull Splitter
-Axes.Effect.1=Deal AoE Damage
-Axes.Effect.2=Critical Strikes
-Axes.Effect.3=Double Damage
-Axes.Effect.4=Axe Mastery
-Axes.Effect.5=Adds bonus DMG
-Axes.Effect.6=Impact
-Axes.Effect.7=Strike with enough force to shatter armor
-Axes.Effect.8=Greater Impact
-Axes.Effect.9=Deal bonus damage to unarmored foes
+Axes.SubSkill.SkullSplitter.Name=Skull Splitter
+Axes.SubSkill.SkullSplitter.Description=Deal AoE Damage
+Axes.SubSkill.CriticalStrikes.Name=Critical Strikes
+Axes.SubSkill.CriticalStrikes.Description=Double Damage
+Axes.SubSkill.AxeMastery.Name=Axe Mastery
+Axes.SubSkill.AxeMastery.Description=Adds bonus DMG
+Axes.SubSkill.ArmorImpact.Name=Impact
+Axes.SubSkill.ArmorImpact.Description=Strike with enough force to shatter armor
+Axes.SubSkill.GreaterImpact.Name=Greater Impact
+Axes.SubSkill.GreaterImpact.Description=Deal bonus damage to unarmored foes
 Axes.Listener=Axes:
 Axes.SkillName=AXES
 Axes.Skills.SS.Off=[[RED]]**Skull Splitter has worn off**
@@ -58,10 +58,10 @@ Axes.Skills.SS.Other.On=[[GREEN]] {0} [[DARK_GREEN]] wedi defnyddio [[RED]] Llor
 Axes.Skillup=[[YELLOW]] sgiliau Echelau cynyddu {0}. Cyfanswm ({1})
 Excavation.Ability.Lower=[[GRAY]]**YOU LOWER YOUR SHOVEL**
 Excavation.Ability.Ready=[[GREEN]]**YOU READY YOUR SHOVEL**
-Excavation.Effect.0=Giga Drill Breaker
-Excavation.Effect.1=3x Drop Rate, 3x EXP, +Speed
-Excavation.Effect.2=Treasure Hunter
-Excavation.Effect.3=Ability to dig for treasure
+Excavation.SubSkill.GigaDrillBreaker.Name=Giga Drill Breaker
+Excavation.SubSkill.GigaDrillBreaker.Description=3x Drop Rate, 3x EXP, +Speed
+Excavation.SubSkill.TreasureHunter.Name=Treasure Hunter
+Excavation.SubSkill.TreasureHunter.Description=Ability to dig for treasure
 Excavation.Effect.Length=[[RED]]Giga Drill Breaker Length: [[YELLOW]]{0}s
 Excavation.Listener=Cloddio:
 Excavation.SkillName=CLODDIO
@@ -77,14 +77,14 @@ Fishing.Ability.Rank=[[RED]]Treasure Hunter Rank: [[YELLOW]]{0}/5
 Fishing.Ability.TH.MagicRate=[[RED]]Magic Hunter Chance: [[YELLOW]]{0}
 Fishing.Ability.Shake=[[RED]]Shake Chance: [[YELLOW]]{0}
 Fishing.Ability.FD=[[RED]]Fisherman\'\'s Diet: [[YELLOW]]Rank {0}
-Fishing.Effect.0=Treasure Hunter (Passive)
-Fishing.Effect.1=Fish up misc. objects
-Fishing.Effect.2=Magic Hunter
-Fishing.Effect.3=Find Enchanted Items
-Fishing.Effect.4=Shake (vs. Entities)
-Fishing.Effect.5=Shake items off of mobs w/ fishing pole
-Fishing.Effect.6=Fisherman\'s Diet
-Fishing.Effect.7=Improves hunger restored from fished foods
+Fishing.SubSkill.TreasureHunter.Name=Treasure Hunter (Passive)
+Fishing.SubSkill.TreasureHunter.Description=Fish up misc. objects
+Fishing.SubSkill.MagicHunter.Name=Magic Hunter
+Fishing.SubSkill.MagicHunter.Description=Find Enchanted Items
+Fishing.SubSkill.Shake.Name=Shake (vs. Entities)
+Fishing.SubSkill.Shake.Description=Shake items off of mobs w/ fishing pole
+Fishing.SubSkill.FishermansDiet.Name=Fisherman\'s Diet
+Fishing.SubSkill.FishermansDiet.Description=Improves hunger restored from fished foods
 Fishing.Chance.Raining=[[BLUE]] Rain Bonus
 Fishing.Listener=Fishing:
 Fishing.Ability.TH.MagicFound=[[GRAY]]You feel a touch of magic with this catch...
@@ -99,15 +99,15 @@ Herbalism.Ability.GTh.Stage=[[RED]]Green Thumb Stage: [[YELLOW]] Crops grow in s
 Herbalism.Ability.GTh=[[GREEN]]**GREEN THUMB**
 Herbalism.Ability.Lower=[[GRAY]]**YOU LOWER YOUR HOE**
 Herbalism.Ability.Ready=[[GREEN]]**YOU READY YOUR HOE**
-Herbalism.Effect.0=Green Terra
-Herbalism.Effect.1=Spread the Terra, 3x Drops
-Herbalism.Effect.2=Green Thumb (Wheat)
-Herbalism.Effect.3=Auto-Plants crops when harvesting
-Herbalism.Effect.5=Make bricks mossy, or make grass grow
-Herbalism.Effect.6=Farmer\'s Diet
-Herbalism.Effect.7=Improves hunger restored from farmed foods
-Herbalism.Effect.8=Double Drops (All Herbs)
-Herbalism.Effect.9=Double the normal loot
+Herbalism.SubSkill.GreenTerra.Name=Green Terra
+Herbalism.SubSkill.GreenTerra.Description=Spread the Terra, 3x Drops
+Herbalism.SubSkill.GreenThumb.Name=Green Thumb (Wheat)
+Herbalism.SubSkill.GreenThumb.Description=Auto-Plants crops when harvesting
+Herbalism.SubSkill.GreenThumb.Description.2=Make bricks mossy, or make grass grow
+Herbalism.SubSkill.FarmersDiet.Name=Farmer\'s Diet
+Herbalism.SubSkill.FarmersDiet.Description=Improves hunger restored from farmed foods
+Herbalism.SubSkill.DoubleDrops.Name=Double Drops (All Herbs)
+Herbalism.SubSkill.DoubleDrops.Description=Double the normal loot
 Herbalism.Listener=Meddygaeth lysieuol:
 Herbalism.SkillName=HERBALISM
 Herbalism.Skills.GTe.On=[[GREEN]]**GREEN TERRA ACTIVATED**
@@ -121,16 +121,16 @@ Mining.Ability.Locked.1=LOCKED UNTIL {0}+ SKILL (BIGGER BOMBS)
 Mining.Ability.Locked.2=LOCKED UNTIL {0}+ SKILL (DEMOLITIONS EXPERTISE)
 Mining.Ability.Lower=[[GRAY]]**YOU LOWER YOUR PICKAXE**
 Mining.Ability.Ready=[[GREEN]] ** CHI\'N BAROD EICH PICKAXE **
-Mining.Effect.0=Super Breaker
-Mining.Effect.1=Speed+, Triple Drop Chance
-Mining.Effect.2=Double Drops
-Mining.Effect.3=Double the normal loot
-Mining.Effect.4=Blast Mining
-Mining.Effect.5=Bonuses to mining with TNT
-Mining.Effect.6=Bigger Bombs
-Mining.Effect.7=Increases TNT explosion radius
-Mining.Effect.8=Demolitions Expertise
-Mining.Effect.9=Decreases damage from TNT explosions
+Mining.SubSkill.SuperBreaker.Name=Super Breaker
+Mining.SubSkill.SuperBreaker.Description=Speed+, Triple Drop Chance
+Mining.SubSkill.DoubleDrops.Name=Double Drops
+Mining.SubSkill.DoubleDrops.Description=Double the normal loot
+Mining.SubSkill.BlastMining.Name=Blast Mining
+Mining.SubSkill.BlastMining.Description=Bonuses to mining with TNT
+Mining.SubSkill.BiggerBombs.Name=Bigger Bombs
+Mining.SubSkill.BiggerBombs.Description=Increases TNT explosion radius
+Mining.SubSkill.DemolitionsExpertise.Name=Demolitions Expertise
+Mining.SubSkill.DemolitionsExpertise.Description=Decreases damage from TNT explosions
 Mining.Effect.Decrease=[[RED]]Demolitions Expert Damage Decrease: [[YELLOW]]{0}
 Mining.Effect.DropChance=[[RED]]Double Drop Chance: [[YELLOW]]{0}
 Mining.Listener=Mwyngloddio:
@@ -146,24 +146,24 @@ Mining.Blast.Radius.Increase=[[RED]] Chwyth Cynnydd Radiws [[YELLOW]] {0}
 Mining.Blast.Rank=[[RED]]Blast Mining: [[YELLOW]] Rank {0}/8 [[GRAY]]({1})
 Mining.Blast.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Blast Mining!
 Mining.Blast.Refresh=[[GREEN]] Eich [[YELLOW]] Mwyngloddio Chwyth [[GREEN]] gallu ei hadnewyddu!
-Repair.Effect.0=Repair
-Repair.Effect.1=Repair Tools & Armor
-Repair.Effect.10=Gold Repair ({0}+ SKILL)
-Repair.Effect.11=Repair Gold Tools & Armor
-Repair.Effect.12=Iron Repair ({0}+ SKILL)
-Repair.Effect.13=Repair Iron Tools & Armor
-Repair.Effect.14=Stone Repair ({0}+ SKILL)
-Repair.Effect.15=Repair Stone Tools
-Repair.Effect.2=Repair Mastery
-Repair.Effect.3=Increased repair amount
-Repair.Effect.4=Super Repair
-Repair.Effect.5=Double effectiveness
-Repair.Effect.6=Diamond Repair ({0}+ SKILL)
-Repair.Effect.7=Repair Diamond Tools & Armor
-Repair.Effect.8=Arcane Forging
-Repair.Effect.9=Atgyweiriwch eitemau sydd hud
-Repair.Effect.16=Salvage ({0}+ SKILL)
-Repair.Effect.17=Salvage Tools & Armor
+Repair.SubSkill.Repair.Name=Repair
+Repair.SubSkill.Repair.Description=Repair Tools & Armor
+Repair.SubSkill.GoldRepair.Name=Gold Repair ({0}+ SKILL)
+Repair.SubSkill.GoldRepair.Description=Repair Gold Tools & Armor
+Repair.SubSkill.IronRepair.Name=Iron Repair ({0}+ SKILL)
+Repair.SubSkill.IronRepair.Description=Repair Iron Tools & Armor
+Repair.SubSkill.StoneRepair.Name=Stone Repair ({0}+ SKILL)
+Repair.SubSkill.StoneRepair.Description=Repair Stone Tools
+Repair.SubSkill.RepairMastery.Name=Repair Mastery
+Repair.SubSkill.RepairMastery.Description=Increased repair amount
+Repair.SubSkill.SuperRepair.Name=Super Repair
+Repair.SubSkill.SuperRepair.Description=Double effectiveness
+Repair.SubSkill.DiamondRepair.Name=Diamond Repair ({0}+ SKILL)
+Repair.SubSkill.DiamondRepair.Description=Repair Diamond Tools & Armor
+Repair.SubSkill.ArcaneForging.Name=Arcane Forging
+Repair.SubSkill.ArcaneForging.Description=Atgyweiriwch eitemau sydd hud
+Repair.SubSkill.Salvage.Name=Salvage ({0}+ SKILL)
+Repair.SubSkill.Salvage.Description=Salvage Tools & Armor
 Repair.Error=[[DARK_RED]]mcMMO encountered an error attempting to repair this item!
 Repair.Listener.Anvil=[[DARK_RED]]You have placed an anvil, anvils can repair tools and armor.
 Repair.Listener.Anvil2=[[DARK_RED]]You have placed a Salvage anvil, use this to Salvage tools and armor.
@@ -202,11 +202,11 @@ Swords.Combat.Counter.Chance=[[RED]]Counter Attack Chance: [[YELLOW]]{0}
 Swords.Combat.Counter.Hit=[[DARK_RED]]Hit with a counter-attack!
 Swords.Combat.Countered=[[GREEN]] ** GWRTH-YMOSOD **
 Swords.Combat.SS.Struck=[[DARK_RED]] Taro gan Streiciau danheddog!
-Swords.Effect.0=Counter Attack
-Swords.Effect.2=Serrated Strikes
+Swords.SubSkill.CounterAttack.Name=Counter Attack
+Swords.SubSkill.SerratedStrikes.Name=Serrated Strikes
 Swords.Effect.4=Serrated Strikes Bleed+
-Swords.Effect.6=Bleed
-Swords.Effect.7=Apply a bleed DoT
+Swords.SubSkill.Bleed.Name=Bleed
+Swords.SubSkill.Bleed.Description=Apply a bleed DoT
 Swords.Listener=Swords:
 Swords.SkillName=SWORDS
 Swords.Skills.SS.Off=[[RED]]**Serrated Strikes has worn off**
@@ -229,24 +229,24 @@ Taming.Ability.Locked.2=LOCKED UNTIL {0}+ SKILL (SHOCK PROOF)
 Taming.Ability.Locked.3=LOCKED UNTIL {0}+ SKILL (SHARPENED CLAWS)
 Taming.Ability.Locked.4=LOCKED UNTIL {0}+ SKILL (FAST FOOD SERVICE)
 Taming.Combat.Chance.Gore=[[RED]]Gore Chance: [[YELLOW]]{0}
-Taming.Effect.0=Beast Lore
-Taming.Effect.1=Bone-whacking inspects wolves & ocelots
-Taming.Effect.10=Shock Proof
-Taming.Effect.11=Explosive Damage Reduction
-Taming.Effect.12=Call of the Wild
-Taming.Effect.13=Summon an animal to your side
-Taming.Effect.14=[[GRAY]]COTW (Ocelot): Crouch and left-click with {0} Fish in hand
+Taming.SubSkill.BeastLore.Name=Beast Lore
+Taming.SubSkill.BeastLore.Description=Bone-whacking inspects wolves & ocelots
+Taming.SubSkill.ShockProof.Name=Shock Proof
+Taming.SubSkill.ShockProof.Description=Explosive Damage Reduction
+Taming.SubSkill.CallOfTheWild.Name=Call of the Wild
+Taming.SubSkill.CallOfTheWild.Description=Summon an animal to your side
+Taming.SubSkill.CallOfTheWild.Description.2=[[GRAY]]COTW (Ocelot): Crouch and left-click with {0} Fish in hand
 Taming.Effect.15=[[GRAY]]COTW (Wolf): Crouch and left-click with {0} Bones in hand
-Taming.Effect.16=Fast Food Service
-Taming.Effect.17=Chance for wolves to heal on attack
-Taming.Effect.2=Gore
-Taming.Effect.3=Critical Strike that applies Bleed
-Taming.Effect.4=Sharpened Claws
-Taming.Effect.5=Damage Bonus
-Taming.Effect.6=Environmentally Aware
-Taming.Effect.7=Cactus/Lava Phobia, Fall DMG Immune
-Taming.Effect.8=Thick Fur
-Taming.Effect.9=DMG Reduction, Fire Resistance
+Taming.SubSkill.FastFoodService.Name=Fast Food Service
+Taming.SubSkill.FastFoodService.Description=Chance for wolves to heal on attack
+Taming.SubSkill.Gore.Name=Gore
+Taming.SubSkill.Gore.Description=Critical Strike that applies Bleed
+Taming.SubSkill.SharpenedClaws.Name=Sharpened Claws
+Taming.SubSkill.SharpenedClaws.Description=Damage Bonus
+Taming.SubSkill.EnvironmentallyAware.Name=Environmentally Aware
+Taming.SubSkill.EnvironmentallyAware.Description=Cactus/Lava Phobia, Fall DMG Immune
+Taming.SubSkill.ThickFur.Name=Thick Fur
+Taming.SubSkill.ThickFur.Description=DMG Reduction, Fire Resistance
 Taming.Listener.Wolf=[[DARK_GRAY]] Eich sgrialu i blaidd yn \u00f4l i chi ...
 Taming.Listener=Taming:
 Taming.SkillName=TAMING
@@ -263,14 +263,14 @@ Unarmed.Ability.IronGrip.Attacker=[[RED]]Your opponent has an iron grip!
 Unarmed.Ability.IronGrip.Defender=[[GREEN]]Your iron grip kept you from being disarmed!
 Unarmed.Ability.Lower=[[GRAY]]**YOU LOWER YOUR FISTS**
 Unarmed.Ability.Ready=[[GREEN]]**YOU READY YOUR FISTS**
-Unarmed.Effect.0=Berserk
-Unarmed.Effect.1=+50% DMG, Breaks weak materials
-Unarmed.Effect.2=Disarm (Players)
-Unarmed.Effect.3=Drops the foes item held in hand
-Unarmed.Effect.4=Iron Arm Style
-Unarmed.Effect.5=Hardens your arm over time
-Unarmed.Effect.6=Arrow Deflect
-Unarmed.Effect.7=Deflect arrows
+Unarmed.SubSkill.Berserk.Name=Berserk
+Unarmed.SubSkill.Berserk.Description=+50% DMG, Breaks weak materials
+Unarmed.SubSkill.Disarm.Name=Disarm (Players)
+Unarmed.SubSkill.Disarm.Description=Drops the foes item held in hand
+Unarmed.SubSkill.IronArmStyle.Name=Iron Arm Style
+Unarmed.SubSkill.IronArmStyle.Description=Hardens your arm over time
+Unarmed.SubSkill.ArrowDeflect.Name=Arrow Deflect
+Unarmed.SubSkill.ArrowDeflect.Description=Deflect arrows
 Unarmed.Listener=Dim Arfau:
 Unarmed.SkillName=UNARMED
 Unarmed.Skills.Berserk.Off=[[RED]] ** arno\\\'i hun wedi gwisgo i ffwrdd **
@@ -284,12 +284,12 @@ Woodcutting.Ability.1=Chwythu i ffwrdd yn gadael
 Woodcutting.Ability.Chance.DDrop=[[RED]]Double Drop Chance: [[YELLOW]]{0}
 Woodcutting.Ability.Length=[[RED]]Tree Feller Length: [[YELLOW]]{0}s
 Woodcutting.Ability.Locked.0=LOCKED UNTIL {0}+ SKILL (LEAF BLOWER)
-Woodcutting.Effect.0=Tree Feller
-Woodcutting.Effect.1=Make trees explode
-Woodcutting.Effect.2=Leaf Blower
-Woodcutting.Effect.3=Blow Away Leaves
-Woodcutting.Effect.4=Double Drops
-Woodcutting.Effect.5=Double the normal loot
+Woodcutting.SubSkill.TreeFeller.Name=Tree Feller
+Woodcutting.SubSkill.TreeFeller.Description=Make trees explode
+Woodcutting.SubSkill.LeafBlower.Name=Leaf Blower
+Woodcutting.SubSkill.LeafBlower.Description=Blow Away Leaves
+Woodcutting.SubSkill.HarvestLumber.Name=Double Drops
+Woodcutting.SubSkill.HarvestLumber.Description=Double the normal loot
 Woodcutting.Listener=Woodcutting:
 Woodcutting.SkillName=Torri coed
 Woodcutting.Skills.TreeFeller.Off=[[RED]]**Tree Feller has worn off**

src/main/resources/locale/locale_da.properties

@@ -1,12 +1,12 @@
 Acrobatics.Ability.Proc=[[GREEN]]**Yndefuld Landing**
 Acrobatics.Combat.Proc=[[GREEN]]**Undviget**
 Acrobatics.DodgeChance=[[RED]]Afv\u00e6rgnings Chance: [[YELLOW]]{0}
-Acrobatics.Effect.0=Rul
-Acrobatics.Effect.1=Reducerer eller omvender Fald skade
-Acrobatics.Effect.2=Yndefuldt Rul
-Acrobatics.Effect.3=Dobbelt s\u00e5 effektiv som en normal rulning
-Acrobatics.Effect.4=Afv\u00e6rg
-Acrobatics.Effect.5=Reducer angrebs skade med halvdelen
+Acrobatics.SubSkill.Roll.Name=Rul
+Acrobatics.SubSkill.Roll.Description=Reducerer eller omvender Fald skade
+Acrobatics.SubSkill.GracefulRoll.Name=Yndefuldt Rul
+Acrobatics.SubSkill.GracefulRoll.Description=Dobbelt s\u00e5 effektiv som en normal rulning
+Acrobatics.SubSkill.Dodge.Name=Afv\u00e6rg
+Acrobatics.SubSkill.Dodge.Description=Reducer angrebs skade med halvdelen
 Acrobatics.Listener=Akrobatik:
 Acrobatics.Roll.Chance=[[RED]]Rulle Chance: [[YELLOW]]{0}
 Acrobatics.Roll.GraceChance=[[RED]]Yndefuldt Rul Chance: [[YELLOW]]{0}
@@ -16,11 +16,11 @@ Acrobatics.Skillup=[[YELLOW]]Akrobatik evne for\u00f8get med {0}. Total ({1})
 Archery.Combat.DazeChance=[[RED]]Chance for at blive forvirret: [[YELLOW]]{0}
 Archery.Combat.RetrieveChance=[[RED]]Chance for at Genbruge Pile: [[YELLOW]]{0}
 Archery.Combat.SkillshotBonus=[[RED]]Skyde Evne Bonus Skade: [[YELLOW]]{0}
-Archery.Effect.0=Evne Skud
-Archery.Effect.1=For\u00f8ger skade for\u00e5rsaget med buer
-Archery.Effect.2=Lam (Spillere)
-Archery.Effect.4=Genbrug Pile
-Archery.Effect.5=Chance for at tage pile ud af lig
+Archery.SubSkill.SkillShot.Name=Evne Skud
+Archery.SubSkill.SkillShot.Description=For\u00f8ger skade for\u00e5rsaget med buer
+Archery.SubSkill.Daze.Name=Lam (Spillere)
+Archery.SubSkill.ArrowRetrieval.Name=Genbrug Pile
+Archery.SubSkill.ArrowRetrieval.Description=Chance for at tage pile ud af lig
 Archery.Listener=Bueskydning:
 Archery.SkillName=BUESKYDNING
 Archery.Skillup=[[YELLOW]]Bueskydnings evne for\u00f8get med {0}. Total ({1})
@@ -38,16 +38,16 @@ Axes.Combat.CriticalHit=[[RED]]KRITISK SLAG!
 Axes.Combat.GI.Proc=[[GREEN]]**RAMT AF STOR KRAFT**
 Axes.Combat.GI.Struck=[[RED]]**RAMT AF ST\u00d8RRE SLAG**
 Axes.Combat.SS.Length=[[RED]]Kranie Splitter L\u00e6ngde: [[YELLOW]]{0}s
-Axes.Effect.0=Kranie Splitter (Evne)
-Axes.Effect.1=For\u00e5rsag Omr\u00e5de Skade
-Axes.Effect.2=Kritiske Slag
-Axes.Effect.3=Fordoblet Skade
-Axes.Effect.4=\u00d8kse Mestring
-Axes.Effect.5=Tilf\u00f8jer bonus skade
-Axes.Effect.6=Rustnings Effekt
-Axes.Effect.7=Ram med nok kraft for at smadre rustningen
-Axes.Effect.8=St\u00f8rre Slag
-Axes.Effect.9=Giv bonus skade til ubev\u00e6bnede fjender
+Axes.SubSkill.SkullSplitter.Name=Kranie Splitter (Evne)
+Axes.SubSkill.SkullSplitter.Description=For\u00e5rsag Omr\u00e5de Skade
+Axes.SubSkill.CriticalStrikes.Name=Kritiske Slag
+Axes.SubSkill.CriticalStrikes.Description=Fordoblet Skade
+Axes.SubSkill.AxeMastery.Name=\u00d8kse Mestring
+Axes.SubSkill.AxeMastery.Description=Tilf\u00f8jer bonus skade
+Axes.SubSkill.ArmorImpact.Name=Rustnings Effekt
+Axes.SubSkill.ArmorImpact.Description=Ram med nok kraft for at smadre rustningen
+Axes.SubSkill.GreaterImpact.Name=St\u00f8rre Slag
+Axes.SubSkill.GreaterImpact.Description=Giv bonus skade til ubev\u00e6bnede fjender
 Axes.Listener=\u00d8kser:
 Axes.SkillName=\u00d8KSER
 Axes.Skills.SS.Off=[[RED]]**Berserker er aftaget**
@@ -58,10 +58,10 @@ Axes.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] har brugt [[RED]]Kranie Split
 Axes.Skillup=[[YELLOW]]\u00d8kse evner forbedret med {0}. Ialt ({1})
 Excavation.Ability.Lower=[[GRAY]]**DU S\u00c6NKER DIN SKOVL**
 Excavation.Ability.Ready=[[GREEN]]**DU G\u00d8R DIN SKOVL KLAR**
-Excavation.Effect.0=Giga Borer (EVNE)
-Excavation.Effect.1=3x Tabs ratio for blokke, 3x EXP, +Fart
-Excavation.Effect.2=Skatte J\u00e6ger
-Excavation.Effect.3=Evne til at grave efter skatte
+Excavation.SubSkill.GigaDrillBreaker.Name=Giga Borer (EVNE)
+Excavation.SubSkill.GigaDrillBreaker.Description=3x Tabs ratio for blokke, 3x EXP, +Fart
+Excavation.SubSkill.TreasureHunter.Name=Skatte J\u00e6ger
+Excavation.SubSkill.TreasureHunter.Description=Evne til at grave efter skatte
 Excavation.Effect.Length=[[RED]]Giga Borer L\u00e6ngde: [[YELLOW]]{0}s
 Excavation.Listener=Udgravning:
 Excavation.SkillName=UDVINDING
@@ -77,14 +77,14 @@ Fishing.Ability.Rank=[[RED]]Skatte J\u00e6ger Rank: [[YELLOW]]{0}/5
 Fishing.Ability.TH.MagicRate=[[RED]]Magi J\u00e6ger Chance: [[YELLOW]]{0}
 Fishing.Ability.Shake=[[RED]]Ryste Chance: [[YELLOW]]{0}
 Fishing.Ability.FD=[[RED]]Fiskers Diet: [[YELLOW]]Rank {0}
-Fishing.Effect.0=Skatte J\u00e6ger (Passiv)
-Fishing.Effect.1=Fisk diverse objekter op.
-Fishing.Effect.2=Magi J\u00e6ger
-Fishing.Effect.3=Find Fortryllede Ting.
-Fishing.Effect.4=Ryst (Mod V\u00e6sner)
-Fishing.Effect.5=Ryst ting ud af monstre med en fiskestang
-Fishing.Effect.6=Fiskers Diet
-Fishing.Effect.7=Forbedrer Sult genoprettet af Fisked mad
+Fishing.SubSkill.TreasureHunter.Name=Skatte J\u00e6ger (Passiv)
+Fishing.SubSkill.TreasureHunter.Description=Fisk diverse objekter op.
+Fishing.SubSkill.MagicHunter.Name=Magi J\u00e6ger
+Fishing.SubSkill.MagicHunter.Description=Find Fortryllede Ting.
+Fishing.SubSkill.Shake.Name=Ryst (Mod V\u00e6sner)
+Fishing.SubSkill.Shake.Description=Ryst ting ud af monstre med en fiskestang
+Fishing.SubSkill.FishermansDiet.Name=Fiskers Diet
+Fishing.SubSkill.FishermansDiet.Description=Forbedrer Sult genoprettet af Fisked mad
 Fishing.Chance.Raining=[[BLUE]] Regn Bonus
 Fishing.Listener=Fiskeri:
 Fishing.Ability.TH.MagicFound=[[GRAY]]Du f\u00f8ler et strejf a magi med denne fangst...
@@ -99,15 +99,15 @@ Herbalism.Ability.GTh.Stage=[[RED]]Gr\u00f8nne Fingre Stadie: [[YELLOW]] Planter
 Herbalism.Ability.GTh=[[GREEN]]**GR\u00d8NNE FINGRE**
 Herbalism.Ability.Lower=[[GRAY]]**DU S\u00c6NKER DIt LUGEJERN**
 Herbalism.Ability.Ready=[[GREEN]]**DU G\u00d8R DIT LUGEJERN KLAR**
-Herbalism.Effect.0=Gr\u00f8n Terra (EVNE)
-Herbalism.Effect.1=Spred Terra, 3x Tab
-Herbalism.Effect.2=Gr\u00f8nne Fingre (Hvede)
-Herbalism.Effect.3=Auto-Planter afgr\u00f8der mens du h\u00f8ster
-Herbalism.Effect.5=Lav Mursten Mossede, eller f\u00e5 gr\u00e6s til at gro
-Herbalism.Effect.6=Farmer\'s Diet
-Herbalism.Effect.7=Forbedrer Sult genoprettet af farmed mad
-Herbalism.Effect.8=Dobble tab (alle planter)
-Herbalism.Effect.9=G\u00f8r din normale udbytte dobblet s\u00e5 stort
+Herbalism.SubSkill.GreenTerra.Name=Gr\u00f8n Terra (EVNE)
+Herbalism.SubSkill.GreenTerra.Description=Spred Terra, 3x Tab
+Herbalism.SubSkill.GreenThumb.Name=Gr\u00f8nne Fingre (Hvede)
+Herbalism.SubSkill.GreenThumb.Description=Auto-Planter afgr\u00f8der mens du h\u00f8ster
+Herbalism.SubSkill.GreenThumb.Description.2=Lav Mursten Mossede, eller f\u00e5 gr\u00e6s til at gro
+Herbalism.SubSkill.FarmersDiet.Name=Farmer\'s Diet
+Herbalism.SubSkill.FarmersDiet.Description=Forbedrer Sult genoprettet af farmed mad
+Herbalism.SubSkill.DoubleDrops.Name=Dobble tab (alle planter)
+Herbalism.SubSkill.DoubleDrops.Description=G\u00f8r din normale udbytte dobblet s\u00e5 stort
 Herbalism.Listener=Urtekundskab
 Herbalism.SkillName=NATURMEDICIN
 Herbalism.Skills.GTe.On=[[GREEN]]**GR\u00d8N TERRA AKTIVERET**
@@ -121,16 +121,16 @@ Mining.Ability.Locked.1=L\u00c5ST INDTIL {0}+ EVNE (ST\u00d8RRE BOMBER)
 Mining.Ability.Locked.2=L\u00c5ST INDTIL {0}+ EVNE (NEDRIVNINGS EXPERTISE)
 Mining.Ability.Lower=[[GRAY]]**DU S\u00c6NKER DIN HAKKE**
 Mining.Ability.Ready=[[GREEN]]**DU G\u00d8R DIN HAKKE KLAR**
-Mining.Effect.0=Super \u00d8del\u00e6gger (EVNE)
-Mining.Effect.1=Fart+, 3x Tabs chance
-Mining.Effect.2=Dobble Tab
-Mining.Effect.3=Fordobble det normale udbytte
-Mining.Effect.4=Blast Mining
-Mining.Effect.5=Bonuser for at mine med TNT
-Mining.Effect.6=St\u00f8rre Bomber
-Mining.Effect.7=Forbedrer TNT explosions radius
-Mining.Effect.8=Nedrivnings Expertise
-Mining.Effect.9=Formindsker skade fra TNT explotioner
+Mining.SubSkill.SuperBreaker.Name=Super \u00d8del\u00e6gger (EVNE)
+Mining.SubSkill.SuperBreaker.Description=Fart+, 3x Tabs chance
+Mining.SubSkill.DoubleDrops.Name=Dobble Tab
+Mining.SubSkill.DoubleDrops.Description=Fordobble det normale udbytte
+Mining.SubSkill.BlastMining.Name=Blast Mining
+Mining.SubSkill.BlastMining.Description=Bonuser for at mine med TNT
+Mining.SubSkill.BiggerBombs.Name=St\u00f8rre Bomber
+Mining.SubSkill.BiggerBombs.Description=Forbedrer TNT explosions radius
+Mining.SubSkill.DemolitionsExpertise.Name=Nedrivnings Expertise
+Mining.SubSkill.DemolitionsExpertise.Description=Formindsker skade fra TNT explotioner
 Mining.Effect.Decrease=[[RED]]Nedrivingings Expert Skade neds\u00e6ttelse: [[YELLOW]]{0}
 Mining.Effect.DropChance=[[RED]]2x Tabs Chance: [[YELLOW]]{0}
 Mining.Listener=Minedrift:
@@ -146,24 +146,24 @@ Mining.Blast.Radius.Increase=[[RED]]Eksplosions Radius For\u00f8gelse: [[YELLOW]
 Mining.Blast.Rank=[[RED]]Blast Mining: [[YELLOW]] Rank {0}/8 [[GRAY]]({1})
 Mining.Blast.Other.On=[[GREEN]]{0}[[DARK_GREEN]] her brugt [[RED]]Blast Mining!
 Mining.Blast.Refresh=[[GREEN]]Din [[YELLOW]]Spring Mining [[GREEN]]evne er genindl\u00e6st!
-Repair.Effect.0=Reparer
-Repair.Effect.1=Reparer V\u00e6rkt\u00f8jer & Rustning
-Repair.Effect.10=Guld Reparer ({0}+ EVNE)
-Repair.Effect.11=Reparer Guld V\u00e6rkt\u00f8jer & Rustning
-Repair.Effect.12=Jern Reparer ({0}+ EVNE)
-Repair.Effect.13=Reparer Jern V\u00e6rkt\u00f8jer & Rustning
-Repair.Effect.14=Sten Reparer ({0}+ EVNE)
-Repair.Effect.15=Reparer Sten V\u00e6rkt\u00f8jer
-Repair.Effect.2=Reperations Beherskelse
-Repair.Effect.3=For\u00f8get reperations m\u00e6ngde
-Repair.Effect.4=Super Reparering
-Repair.Effect.5=Dobble effektivitet
-Repair.Effect.6=Diamant reperation ({0}+ SKILL)
-Repair.Effect.7=Reparer Diamant V\u00e6rkt\u00f8jer & udstyr
-Repair.Effect.8=Mystisk Smedning
-Repair.Effect.9=Reparer magiske genstande
-Repair.Effect.16=Genbrug ({0}+ EVNE)
-Repair.Effect.17=Genbrugelige V\u00e6rkt\u00f8jer og Rustninger
+Repair.SubSkill.Repair.Name=Reparer
+Repair.SubSkill.Repair.Description=Reparer V\u00e6rkt\u00f8jer & Rustning
+Repair.SubSkill.GoldRepair.Name=Guld Reparer ({0}+ EVNE)
+Repair.SubSkill.GoldRepair.Description=Reparer Guld V\u00e6rkt\u00f8jer & Rustning
+Repair.SubSkill.IronRepair.Name=Jern Reparer ({0}+ EVNE)
+Repair.SubSkill.IronRepair.Description=Reparer Jern V\u00e6rkt\u00f8jer & Rustning
+Repair.SubSkill.StoneRepair.Name=Sten Reparer ({0}+ EVNE)
+Repair.SubSkill.StoneRepair.Description=Reparer Sten V\u00e6rkt\u00f8jer
+Repair.SubSkill.RepairMastery.Name=Reperations Beherskelse
+Repair.SubSkill.RepairMastery.Description=For\u00f8get reperations m\u00e6ngde
+Repair.SubSkill.SuperRepair.Name=Super Reparering
+Repair.SubSkill.SuperRepair.Description=Dobble effektivitet
+Repair.SubSkill.DiamondRepair.Name=Diamant reperation ({0}+ SKILL)
+Repair.SubSkill.DiamondRepair.Description=Reparer Diamant V\u00e6rkt\u00f8jer & udstyr
+Repair.SubSkill.ArcaneForging.Name=Mystisk Smedning
+Repair.SubSkill.ArcaneForging.Description=Reparer magiske genstande
+Repair.SubSkill.Salvage.Name=Genbrug ({0}+ EVNE)
+Repair.SubSkill.Salvage.Description=Genbrugelige V\u00e6rkt\u00f8jer og Rustninger
 Repair.Error=[[DARK_RED]]mcMMO m\u00f8dte en fejl mens den fors\u00f8gte at reparere dette objekt!
 Repair.Listener.Anvil=[[DARK_RED]]Du har placeret en armbolt, armbolte kan reparere v\u00e6rkt\u00f8j og rustning.
 Repair.Listener.Anvil2=[[DARK_RED]]Du har placeret en Genbrugs Ambolt, Brug den til at Genbruge V\u00e6rkt\u00f8jer og Rustning (F\u00e5 materialer tilbage)
@@ -202,11 +202,11 @@ Swords.Combat.Counter.Chance=[[RED]]Modangrebs Chance: [[YELLOW]]{0}
 Swords.Combat.Counter.Hit=[[DARK_RED]]Angrib med et modangreb!
 Swords.Combat.Countered=[[GREEN]]**MODANGREBET**
 Swords.Combat.SS.Struck=[[DARK_RED]]Ramt af F\u00e6gtekunstens S\u00e5r!
-Swords.Effect.0=Modangreb
-Swords.Effect.2=F\u00e6gteKunst (Evne)
+Swords.SubSkill.CounterAttack.Name=Modangreb
+Swords.SubSkill.SerratedStrikes.Name=F\u00e6gteKunst (Evne)
 Swords.Effect.4=F\u00e6gteKunst Bl\u00f8dning+
-Swords.Effect.6=Bl\u00f8de
-Swords.Effect.7=S\u00e6t en Bl\u00f8dning med skade over tid (DoT=Skade over tid)
+Swords.SubSkill.Bleed.Name=Bl\u00f8de
+Swords.SubSkill.Bleed.Description=S\u00e6t en Bl\u00f8dning med skade over tid (DoT=Skade over tid)
 Swords.Listener=Sv\u00e6rd:
 Swords.SkillName=SV\u00c6RD
 Swords.Skills.SS.Off=[[RED]]**Fokuseret F\u00e6gtekunst er aftaget**
@@ -228,24 +228,24 @@ Taming.Ability.Locked.2=L\u00c5ST INDTIL {0}+ EVNE (SHOCK SIKKER)
 Taming.Ability.Locked.3=L\u00c5ST INDTIL {0}+ EVNE (SK\u00c6RPEDE KL\u00d8ER)
 Taming.Ability.Locked.4=L\u00c5ST INDTIL {0}+ EVNE (FAST FOOD SERVICE)
 Taming.Combat.Chance.Gore=Spidnings Chance: [[YELLOW]]{0}
-Taming.Effect.0=[[GREEN]]**TIGGENDE MONSTER**
-Taming.Effect.1=Sl\u00e5 p\u00e5 Ulve & Ocelotter med en Knogle for at incpicere dem.
-Taming.Effect.10=Shock Sikker
-Taming.Effect.11=Explosiv Skades Reduktion
-Taming.Effect.12=Kaldet fra Naturen.
-Taming.Effect.13=Lav et dyr ved din side
-Taming.Effect.14=[[GRAY]]COTW (Ocelot): Crouch og venstre-click med {0} en Fisk i h\u00e5nden
+Taming.SubSkill.BeastLore.Name=[[GREEN]]**TIGGENDE MONSTER**
+Taming.SubSkill.BeastLore.Description=Sl\u00e5 p\u00e5 Ulve & Ocelotter med en Knogle for at incpicere dem.
+Taming.SubSkill.ShockProof.Name=Shock Sikker
+Taming.SubSkill.ShockProof.Description=Explosiv Skades Reduktion
+Taming.SubSkill.CallOfTheWild.Name=Kaldet fra Naturen.
+Taming.SubSkill.CallOfTheWild.Description=Lav et dyr ved din side
+Taming.SubSkill.CallOfTheWild.Description.2=[[GRAY]]COTW (Ocelot): Crouch og venstre-click med {0} en Fisk i h\u00e5nden
 Taming.Effect.15=[[GRAY]]COTW (Wolf): Crouch og venstre-click med {0} Knogler i din h\u00e5nd.
-Taming.Effect.16=Fast Food Service
-Taming.Effect.17=Chance for Ulve liver op n\u00e5r de angriber
-Taming.Effect.2=M\u00e5l Punkt.
-Taming.Effect.3=Kritisk slag some f\u00e5r dig til at Bl\u00f8de
-Taming.Effect.4=Sk\u00e6rpet Kl\u00f8er
-Taming.Effect.5=Skade Bonus
-Taming.Effect.6=Omgivelses bevidst
-Taming.Effect.7=Kaktus/Lava Phobi, Immun mod Fald Skade
-Taming.Effect.8=Tyk Pels
-Taming.Effect.9=Skades Reduktion, Ild Modstand
+Taming.SubSkill.FastFoodService.Name=Fast Food Service
+Taming.SubSkill.FastFoodService.Description=Chance for Ulve liver op n\u00e5r de angriber
+Taming.SubSkill.Gore.Name=M\u00e5l Punkt.
+Taming.SubSkill.Gore.Description=Kritisk slag some f\u00e5r dig til at Bl\u00f8de
+Taming.SubSkill.SharpenedClaws.Name=Sk\u00e6rpet Kl\u00f8er
+Taming.SubSkill.SharpenedClaws.Description=Skade Bonus
+Taming.SubSkill.EnvironmentallyAware.Name=Omgivelses bevidst
+Taming.SubSkill.EnvironmentallyAware.Description=Kaktus/Lava Phobi, Immun mod Fald Skade
+Taming.SubSkill.ThickFur.Name=Tyk Pels
+Taming.SubSkill.ThickFur.Description=Skades Reduktion, Ild Modstand
 Taming.Listener.Wolf=[[DARK_GRAY]]Din ulv smutter tilbage til dig...
 Taming.Listener=T\u00e6mning:
 Taming.SkillName=T\u00c6MMER
@@ -262,14 +262,14 @@ Unarmed.Ability.IronGrip.Attacker=[[RED]]Din modstander har et Jerngreb!
 Unarmed.Ability.IronGrip.Defender=[[GREEN]]Dit Jerngreb lod dig modst\u00e5 afv\u00e6bning!
 Unarmed.Ability.Lower=[[GRAY]]**DU S\u00c6NKER DINE N\u00c6VER**
 Unarmed.Ability.Ready=[[GREEN]]**DU KLARG\u00d8R DIN N\u00c6VE**
-Unarmed.Effect.0=Berserker (EVNE)
-Unarmed.Effect.1=+50% skade, \u00f8del\u00e6gger svage materialer
-Unarmed.Effect.2=Afv\u00e6bn (Spiller)
-Unarmed.Effect.3=F\u00e5 objektet i din fjendes h\u00e5nd til at ryge ned p\u00e5 jorden.
-Unarmed.Effect.4=Jern Arm Stil
-Unarmed.Effect.5=Forst\u00e6rker din arm over tiden
-Unarmed.Effect.6=Pile Undvigning
-Unarmed.Effect.7=Undvig Pile
+Unarmed.SubSkill.Berserk.Name=Berserker (EVNE)
+Unarmed.SubSkill.Berserk.Description=+50% skade, \u00f8del\u00e6gger svage materialer
+Unarmed.SubSkill.Disarm.Name=Afv\u00e6bn (Spiller)
+Unarmed.SubSkill.Disarm.Description=F\u00e5 objektet i din fjendes h\u00e5nd til at ryge ned p\u00e5 jorden.
+Unarmed.SubSkill.IronArmStyle.Name=Jern Arm Stil
+Unarmed.SubSkill.IronArmStyle.Description=Forst\u00e6rker din arm over tiden
+Unarmed.SubSkill.ArrowDeflect.Name=Pile Undvigning
+Unarmed.SubSkill.ArrowDeflect.Description=Undvig Pile
 Unarmed.Listener=Ubev\u00e6bnet:
 Unarmed.SkillName=UBEV\u00c6BNET
 Unarmed.Skills.Berserk.Off=[[RED]]**Berserker er nu aftaget**
@@ -283,12 +283,12 @@ Woodcutting.Ability.1=Bl\u00e6s blade v\u00e6k
 Woodcutting.Ability.Chance.DDrop=[[RED]]2x Tabs Chance: [[YELLOW]]{0}
 Woodcutting.Ability.Length=[[RED]]Tr\u00e6 Hugger L\u00e6ngde: [[YELLOW]]{0}s
 Woodcutting.Ability.Locked.0=L\u00c5ST INDTIL {0}+ EVNE (BLAD BL\u00c6SER)
-Woodcutting.Effect.0=Tr\u00e6 Hugger (EVNE)
-Woodcutting.Effect.1=F\u00e5r tr\u00e6er til at explodere
-Woodcutting.Effect.2=Blad Bl\u00e6ser
-Woodcutting.Effect.3=Spr\u00e6ng blade v\u00e6k
-Woodcutting.Effect.4=Dobbel tab
-Woodcutting.Effect.5=Dobbel det normale udbytte
+Woodcutting.SubSkill.TreeFeller.Name=Tr\u00e6 Hugger (EVNE)
+Woodcutting.SubSkill.TreeFeller.Description=F\u00e5r tr\u00e6er til at explodere
+Woodcutting.SubSkill.LeafBlower.Name=Blad Bl\u00e6ser
+Woodcutting.SubSkill.LeafBlower.Description=Spr\u00e6ng blade v\u00e6k
+Woodcutting.SubSkill.HarvestLumber.Name=Dobbel tab
+Woodcutting.SubSkill.HarvestLumber.Description=Dobbel det normale udbytte
 Woodcutting.Listener=Tr\u00e6f\u00e6ldning:
 Woodcutting.SkillName=TR\u00c6F\u00c6LDNING
 Woodcutting.Skills.TreeFeller.Off=[[RED]]**Tr\u00e6 Hugger er nu aftaget**

src/main/resources/locale/locale_de.properties

@@ -23,7 +23,7 @@
 #-Salvage aus Repair herausgenommen
 #-Added missing Swords.Effect skills
 #-Added horses and holy hound to taming
-#-Added Unarmed.Effect.9
+#-Added Unarmed.SubSkill.IronGrip.Description
 #-Added Smelting
 #Commands.addlevels
 #Everything except parties translated to German
@@ -35,12 +35,12 @@
 Acrobatics.Ability.Proc=[[GREEN]]**Grazi\u00f6s Abgerollt**
 Acrobatics.Combat.Proc=[[GREEN]]**Ausgewichen**
 Acrobatics.DodgeChance=[[RED]]Ausweich-Chance: [[YELLOW]]{0}
-Acrobatics.Effect.0=Rolle
-Acrobatics.Effect.1=Reduziert oder negiert Fall-Schaden
-Acrobatics.Effect.2=Grazi\u00f6se Rolle
-Acrobatics.Effect.3=Doppelte Effektivit\u00e4t der Rolle
-Acrobatics.Effect.4=Ausweichen
-Acrobatics.Effect.5=Halbiert Angriffschaden
+Acrobatics.SubSkill.Roll.Name=Rolle
+Acrobatics.SubSkill.Roll.Description=Reduziert oder negiert Fall-Schaden
+Acrobatics.SubSkill.GracefulRoll.Name=Grazi\u00f6se Rolle
+Acrobatics.SubSkill.GracefulRoll.Description=Doppelte Effektivit\u00e4t der Rolle
+Acrobatics.SubSkill.Dodge.Name=Ausweichen
+Acrobatics.SubSkill.Dodge.Description=Halbiert Angriffschaden
 Acrobatics.Listener=Akrobatik:
 Acrobatics.Roll.Chance=[[RED]]Rolle-Chance: [[YELLOW]]{0}
 Acrobatics.Roll.GraceChance=[[RED]]Grazi\u00f6se Rolle-Chance: [[YELLOW]]{0}
@@ -49,10 +49,10 @@ Acrobatics.SkillName=AKROBATIK
 Acrobatics.Skillup=[[YELLOW]]Akrobatik Skill um {0} gestiegen. Gesamt ({1})
 
 #ALCHEMY
-Alchemy.Effect.0=Katalyse
-Alchemy.Effect.1=Erh\u00F6ht die Braugeschwindigkeit
-Alchemy.Effect.2=Braukunst
-Alchemy.Effect.3=Braue Tr\u00E4nke mit mehr Zutaten
+Alchemy.SubSkill.Catalysis.Name=Katalyse
+Alchemy.SubSkill.Catalysis.Description=Erh\u00F6ht die Braugeschwindigkeit
+Alchemy.SubSkill.Concoctions.Name=Braukunst
+Alchemy.SubSkill.Concoctions.Description=Braue Tr\u00E4nke mit mehr Zutaten
 Alchemy.Listener=Alchemie:
 Alchemy.Ability.Locked.0=GESPERRT bis Skill {0}+  (KATALYSE)
 Alchemy.Catalysis.Speed=[[RED]]Braugeschwindigkeit: [[YELLOW]]{0}
@@ -65,12 +65,12 @@ Alchemy.Skillup=[[YELLOW]]Alchemie Skill um {0} gestiegen. Gesamt ({1})
 Archery.Combat.DazeChance=[[RED]]Chance auf Bet\u00e4ubung: [[YELLOW]]{0}
 Archery.Combat.RetrieveChance=[[RED]]Chance auf Pfeil-R\u00fcckgewinnung: [[YELLOW]]{0}
 Archery.Combat.SkillshotBonus=[[RED]]Kunstschuss Zusatzschaden: [[YELLOW]]{0}
-Archery.Effect.0=Kunstschuss
-Archery.Effect.1=Erh\u00f6ht Schaden vom Bogen
-Archery.Effect.2=Bet\u00e4ubung (Spieler)
-Archery.Effect.3=Verwirrt Feinde und f\u00FCgt {0} Schaden zu
-Archery.Effect.4=Pfeil-R\u00fcckgewinnung
-Archery.Effect.5=Chance auf Pfeil-R\u00fcckgewinnung von Leichen
+Archery.SubSkill.SkillShot.Name=Kunstschuss
+Archery.SubSkill.SkillShot.Description=Erh\u00f6ht Schaden vom Bogen
+Archery.SubSkill.Daze.Name=Bet\u00e4ubung (Spieler)
+Archery.SubSkill.Daze.Description=Verwirrt Feinde und f\u00FCgt {0} Schaden zu
+Archery.SubSkill.ArrowRetrieval.Name=Pfeil-R\u00fcckgewinnung
+Archery.SubSkill.ArrowRetrieval.Description=Chance auf Pfeil-R\u00fcckgewinnung von Leichen
 Archery.Listener=Bogen:
 Archery.SkillName=BOGEN
 Archery.Skillup=[[YELLOW]]Bogenschie\u00DFen Fertigkeit ist um {0} gestiegen. Gesamt ({1})
@@ -91,16 +91,16 @@ Axes.Combat.GI.Proc=[[GREEN]]**AUSGESCHALTET durch GEWALT SCHLAG**
 Axes.Combat.GI.Struck=[[RED]]**Von WUCHT-SCHLAG getroffen**
 Axes.Combat.SS.Struck=[[DARK_RED]]vom Sch\u00E4delspalter getroffen!
 Axes.Combat.SS.Length=[[RED]]Sch\u00e4del-Spalter Dauer: [[YELLOW]]{0}s
-Axes.Effect.0=Sch\u00e4del-Spalter (F\u00e4higkeit)
-Axes.Effect.1=Verursacht Umgebungsschaden
-Axes.Effect.2=Kritische Treffer
-Axes.Effect.3=Doppelter Schaden
-Axes.Effect.4=Axt-Beherrschung
-Axes.Effect.5=Verursacht Bonus-Schaden
-Axes.Effect.6=Wucht
-Axes.Effect.7=Treffe mit gen\u00fcgend Gewalt zum R\u00fcstung zerschmettern
-Axes.Effect.8=Wucht-Schlag
-Axes.Effect.9=Zusatz-Schaden gegen ungepanzerte Feinde
+Axes.SubSkill.SkullSplitter.Name=Sch\u00e4del-Spalter (F\u00e4higkeit)
+Axes.SubSkill.SkullSplitter.Description=Verursacht Umgebungsschaden
+Axes.SubSkill.CriticalStrikes.Name=Kritische Treffer
+Axes.SubSkill.CriticalStrikes.Description=Doppelter Schaden
+Axes.SubSkill.AxeMastery.Name=Axt-Beherrschung
+Axes.SubSkill.AxeMastery.Description=Verursacht Bonus-Schaden
+Axes.SubSkill.ArmorImpact.Name=Wucht
+Axes.SubSkill.ArmorImpact.Description=Treffe mit gen\u00fcgend Gewalt zum R\u00fcstung zerschmettern
+Axes.SubSkill.GreaterImpact.Name=Wucht-Schlag
+Axes.SubSkill.GreaterImpact.Description=Zusatz-Schaden gegen ungepanzerte Feinde
 Axes.Listener=Axt:
 Axes.SkillName=AXT
 Axes.Skills.SS.Off=[[RED]]**Sch\u00e4del-Spalter abgenutzt**
@@ -113,10 +113,10 @@ Axes.Skillup=[[YELLOW]]Axt Skill um {0} gestiegen. Gesamt ({1})
 #EXCAVATION
 Excavation.Ability.Lower=[[GRAY]]**Du senkst deine SCHAUFEL**
 Excavation.Ability.Ready=[[GREEN]]**Deine SCHAUFEL ist bereit**
-Excavation.Effect.0=Giga Bohrhammer (F\u00e4higkeit)
-Excavation.Effect.1=3x Drop Rate, 3x EXP, +Geschwindigkeit
-Excavation.Effect.2=Schatz-J\u00e4ger
-Excavation.Effect.3=F\u00e4higkeit nach Sch\u00e4tzen zu graben
+Excavation.SubSkill.GigaDrillBreaker.Name=Giga Bohrhammer (F\u00e4higkeit)
+Excavation.SubSkill.GigaDrillBreaker.Description=3x Drop Rate, 3x EXP, +Geschwindigkeit
+Excavation.SubSkill.TreasureHunter.Name=Schatz-J\u00e4ger
+Excavation.SubSkill.TreasureHunter.Description=F\u00e4higkeit nach Sch\u00e4tzen zu graben
 Excavation.Effect.Length=[[RED]]Giga Bohrhammer Dauer: [[YELLOW]]{0}s
 Excavation.Listener=Graben:
 Excavation.SkillName=GRABEN
@@ -139,18 +139,18 @@ Fishing.Ability.TH.MagicRate=[[RED]]Zauber-J\u00e4ger Chance: [[YELLOW]]{0}
 Fishing.Ability.Shake=[[RED]]Rei\u00DFen-Chance: [[YELLOW]]{0}
 Fishing.Ability.IceFishing=[[RED]]Eisangeln: Angeln im Eis
 Fishing.Ability.FD=[[RED]]Fischer-Mahlzeit Rang: [[YELLOW]]{0}
-Fishing.Effect.0=Schatz-J\u00e4ger (Passiv)
-Fishing.Effect.1=Angle verschiedene Objekte
-Fishing.Effect.2=Zauber-J\u00e4ger
-Fishing.Effect.3=Finde verzauberte Gegenst\u00e4nde
-Fishing.Effect.4=Rei\u00DFen
-Fishing.Effect.5=Rei\u00DFe per Angel Gegenst\u00e4nde aus den Mobs
-Fishing.Effect.6=Fischer-Mahlzeit
-Fishing.Effect.7=Verbessert Effizienz von geangelter Nahrung
-Fishing.Effect.8=Profiangel
-Fishing.Effect.9=Erh\u00F6ht die Chance des Anbei\u00DFens
-Fishing.Effect.10=Eisangeln
-Fishing.Effect.11=Erm\u00F6glicht dir in Eisbiomen angeln zu gehen
+Fishing.SubSkill.TreasureHunter.Name=Schatz-J\u00e4ger (Passiv)
+Fishing.SubSkill.TreasureHunter.Description=Angle verschiedene Objekte
+Fishing.SubSkill.MagicHunter.Name=Zauber-J\u00e4ger
+Fishing.SubSkill.MagicHunter.Description=Finde verzauberte Gegenst\u00e4nde
+Fishing.SubSkill.Shake.Name=Rei\u00DFen
+Fishing.SubSkill.Shake.Description=Rei\u00DFe per Angel Gegenst\u00e4nde aus den Mobs
+Fishing.SubSkill.FishermansDiet.Name=Fischer-Mahlzeit
+Fishing.SubSkill.FishermansDiet.Description=Verbessert Effizienz von geangelter Nahrung
+Fishing.SubSkill.MasterAngler.Name=Profiangel
+Fishing.SubSkill.MasterAngler.Description=Erh\u00F6ht die Chance des Anbei\u00DFens
+Fishing.SubSkill.IceFishing.Name=Eisangeln
+Fishing.SubSkill.IceFishing.Description=Erm\u00F6glicht dir in Eisbiomen angeln zu gehen
 Fishing.Chance.Raining=[[BLUE]] Regen Bonus
 Fishing.Listener=Angeln:
 Fishing.Ability.TH.MagicFound=[[AQUA]]Dich ber\u00fchrt ein leichter Zauber bei diesem Fang...
@@ -173,19 +173,19 @@ Herbalism.Ability.Lower=[[GRAY]]**Du senkst deine HARKE**
 Herbalism.Ability.Ready=[[GREEN]]**Deine HARKE ist bereit**
 Herbalism.Ability.ShroomThumb.Chance=[[RED]]Gr\u00FCne Zehe Chance: [[YELLOW]]{0}
 Herbalism.Ability.ShroomThumb.Fail=[[RED]]**GR\u00DCNE ZEHE GESCHEITERT**
-Herbalism.Effect.0=Gr\u00fcnes Land (F\u00e4higkeit)
-Herbalism.Effect.1=Erte das Land ab, 3x Drops
-Herbalism.Effect.2=Gr\u00fcner Daumen (Weizen)
-Herbalism.Effect.3=Auto-Saat, s\u00e4ht Weizen wenn abgeerntet
-Herbalism.Effect.5=Bemoost Steinziegel , l\u00e4sst Gras wachsen
-Herbalism.Effect.6=Bauernfr\u00fchst\u00fcck
-Herbalism.Effect.7=Erh\u00f6ht Effektivit\u00e4t von geernteter Nahrung
-Herbalism.Effect.8=Doppel Drops (Alle Pflanzen)
-Herbalism.Effect.9=Verdoppelt die normale Ausbeute (Loot)
-Herbalism.Effect.10=Hylian Gl\u00fcck
-Herbalism.Effect.11=Gibt eine kleine M\u00f6glichkeit, seltene Gegenst\u00e4nde zu finden
-Herbalism.Effect.12=Pilz Zehe
-Herbalism.Effect.13=Verbreite Myzel auf Gras und Erde
+Herbalism.SubSkill.GreenTerra.Name=Gr\u00fcnes Land (F\u00e4higkeit)
+Herbalism.SubSkill.GreenTerra.Description=Erte das Land ab, 3x Drops
+Herbalism.SubSkill.GreenThumb.Name=Gr\u00fcner Daumen (Weizen)
+Herbalism.SubSkill.GreenThumb.Description=Auto-Saat, s\u00e4ht Weizen wenn abgeerntet
+Herbalism.SubSkill.GreenThumb.Description.2=Bemoost Steinziegel , l\u00e4sst Gras wachsen
+Herbalism.SubSkill.FarmersDiet.Name=Bauernfr\u00fchst\u00fcck
+Herbalism.SubSkill.FarmersDiet.Description=Erh\u00f6ht Effektivit\u00e4t von geernteter Nahrung
+Herbalism.SubSkill.DoubleDrops.Name=Doppel Drops (Alle Pflanzen)
+Herbalism.SubSkill.DoubleDrops.Description=Verdoppelt die normale Ausbeute (Loot)
+Herbalism.SubSkill.HylianLuck.Name=Hylian Gl\u00fcck
+Herbalism.SubSkill.HylianLuck.Description=Gibt eine kleine M\u00f6glichkeit, seltene Gegenst\u00e4nde zu finden
+Herbalism.SubSkill.ShroomThumb.Name=Pilz Zehe
+Herbalism.SubSkill.ShroomThumb.Description=Verbreite Myzel auf Gras und Erde
 Herbalism.HylianLuck=[[GREEN]]Heute ist das Gl\u00fcck von Hyrule mit dir!
 Herbalism.Listener=Pflanzenkunde:
 Herbalism.SkillName=PFLANZENKUNDE
@@ -203,16 +203,16 @@ Mining.Ability.Locked.1=GESPERRT bis Skill {0}+  (Sprengmeister)
 Mining.Ability.Locked.2=GESPERRT bis Skill {0}+  (Explosions-Experte)
 Mining.Ability.Lower=[[GRAY]]**Du senkst deine SPITZHACKE**
 Mining.Ability.Ready=[[GREEN]]**Deine SPITZHACKE ist bereit**
-Mining.Effect.0=Super-Brecher (F\u00e4higkeit)
-Mining.Effect.1=Abbaugeschwindigkeit+, Dreifach-Drop Chance
-Mining.Effect.2=Doppel Drops
-Mining.Effect.3=Verdoppelt die normale Ausbeute
-Mining.Effect.4=Z\u00fcndstoff
-Mining.Effect.5=Bonus beim Abbaue mit TNT
-Mining.Effect.6=Sprengmeister
-Mining.Effect.7=Erh\u00f6ht den Explosions-Radius
-Mining.Effect.8=Explosions-Experte
-Mining.Effect.9=Reduziert die Verletzung durch TNT Explosionen
+Mining.SubSkill.SuperBreaker.Name=Super-Brecher (F\u00e4higkeit)
+Mining.SubSkill.SuperBreaker.Description=Abbaugeschwindigkeit+, Dreifach-Drop Chance
+Mining.SubSkill.DoubleDrops.Name=Doppel Drops
+Mining.SubSkill.DoubleDrops.Description=Verdoppelt die normale Ausbeute
+Mining.SubSkill.BlastMining.Name=Z\u00fcndstoff
+Mining.SubSkill.BlastMining.Description=Bonus beim Abbaue mit TNT
+Mining.SubSkill.BiggerBombs.Name=Sprengmeister
+Mining.SubSkill.BiggerBombs.Description=Erh\u00f6ht den Explosions-Radius
+Mining.SubSkill.DemolitionsExpertise.Name=Explosions-Experte
+Mining.SubSkill.DemolitionsExpertise.Description=Reduziert die Verletzung durch TNT Explosionen
 Mining.Effect.Decrease=[[RED]]Explosions-Experte Schadensreduzierung: [[YELLOW]]{0}
 Mining.Effect.DropChance=[[RED]]Doppel Drop Chance: [[YELLOW]]{0}
 Mining.Listener=Bergbau:
@@ -233,22 +233,22 @@ Mining.Blast.Other.On=[[GREEN]]{0}[[DARK_GREEN]] benutzte [[RED]]Z\u00fcndstoff!
 Mining.Blast.Refresh=[[GREEN]]Dein [[YELLOW]]Z\u00fcndstoff [[GREEN]]ist wieder bereit!
 
 #REPAIR
-Repair.Effect.0=Reparatur
-Repair.Effect.1=Repariere Werkzeuge & R\u00fcstung
-Repair.Effect.10=Gold Reparatur ({0}+ SKILL)
-Repair.Effect.11=Repariere Gold-Werkzeuge & R\u00fcstung
-Repair.Effect.12=Eisen Reparatur ({0}+ SKILL)
-Repair.Effect.13=Repariere Eisen-Werkzeuge & R\u00fcstung
-Repair.Effect.14=Stein Reparatur ({0}+ SKILL)
-Repair.Effect.15=Repariere Stein-Werkzeuge
-Repair.Effect.2=Reparatur Meister
-Repair.Effect.3=Erh\u00f6ht den Reparatur-Wert
-Repair.Effect.4=Super-Reparatur
-Repair.Effect.5=Doppelte Effektivit\u00e4t
-Repair.Effect.6=Diamant Reparatur ({0}+ SKILL)
-Repair.Effect.7=Repariere Diamant-Werkzeuge & R\u00fcstung
-Repair.Effect.8=Arkanes Schmieden
-Repair.Effect.9=Repariere magische Gegenst\u00e4nde
+Repair.SubSkill.Repair.Name=Reparatur
+Repair.SubSkill.Repair.Description=Repariere Werkzeuge & R\u00fcstung
+Repair.SubSkill.GoldRepair.Name=Gold Reparatur ({0}+ SKILL)
+Repair.SubSkill.GoldRepair.Description=Repariere Gold-Werkzeuge & R\u00fcstung
+Repair.SubSkill.IronRepair.Name=Eisen Reparatur ({0}+ SKILL)
+Repair.SubSkill.IronRepair.Description=Repariere Eisen-Werkzeuge & R\u00fcstung
+Repair.SubSkill.StoneRepair.Name=Stein Reparatur ({0}+ SKILL)
+Repair.SubSkill.StoneRepair.Description=Repariere Stein-Werkzeuge
+Repair.SubSkill.RepairMastery.Name=Reparatur Meister
+Repair.SubSkill.RepairMastery.Description=Erh\u00f6ht den Reparatur-Wert
+Repair.SubSkill.SuperRepair.Name=Super-Reparatur
+Repair.SubSkill.SuperRepair.Description=Doppelte Effektivit\u00e4t
+Repair.SubSkill.DiamondRepair.Name=Diamant Reparatur ({0}+ SKILL)
+Repair.SubSkill.DiamondRepair.Description=Repariere Diamant-Werkzeuge & R\u00fcstung
+Repair.SubSkill.ArcaneForging.Name=Arkanes Schmieden
+Repair.SubSkill.ArcaneForging.Description=Repariere magische Gegenst\u00e4nde
 Repair.Error=[[DARK_RED]]mcMMO ist beim Versuch dieses Item zu reparieren auf einen Fehler gesto\u00DFen!
 Repair.Listener.Anvil=[[DARK_RED]]Du hast einen Amboss platziert, Ambosse k\u00f6nnen Waffen und R\u00fcstung reparieren.
 Repair.Listener=Reparatur:
@@ -277,10 +277,10 @@ Repair.Arcane.Rank=[[RED]]Arkanes Schmieden Rang: [[YELLOW]]{0}/{1}
 
 #SALVAGE
 Salvage.Pretty.Name=Verwerten
-Salvage.Effect.0=Fortgeschrittenes Verwerten
-Salvage.Effect.1=Verwerte besch\u00E4digte Items
-Salvage.Effect.2=Arkanes Verwerten
-Salvage.Effect.3=Extra Verzauberung aus Items
+Salvage.SubSkill.AdvancedSalvage.Name=Fortgeschrittenes Verwerten
+Salvage.SubSkill.AdvancedSalvage.Description=Verwerte besch\u00E4digte Items
+Salvage.SubSkill.ArcaneSalvaging.Name=Arkanes Verwerten
+Salvage.SubSkill.ArcaneSalvaging.Description=Extra Verzauberung aus Items
 Salvage.Ability.Locked.0=GESPERRT bis Skill {0}+ (Fortgeschrittenes Verwerten)
 Salvage.Ability.Bonus.0=Fortgeschrittenes Verwerten
 Salvage.Ability.Bonus.1=Max Ertrag {0} Item zerst\u00F6rt
@@ -311,14 +311,14 @@ Swords.Combat.Counter.Chance=[[RED]]Gegenangriff Chance: [[YELLOW]]{0}
 Swords.Combat.Counter.Hit=[[DARK_RED]]Treffer durch Gegenangriff!
 Swords.Combat.Countered=[[GREEN]]**GEGENANGRIFF**
 Swords.Combat.SS.Struck=[[DARK_RED]]Getroffen von S\u00c4GEZAHNSCHLAG!
-Swords.Effect.0=Gegenangriff
-Swords.Effect.1=Reflektiere {0} des Schadens w\u00E4hrend du blockierst
-Swords.Effect.2=S\u00e4gezahnschlag (F\u00e4higkeit)
-Swords.Effect.3={0} Fl\u00E4chenschaden, Fl\u00E4chenblutung+
+Swords.SubSkill.CounterAttack.Name=Gegenangriff
+Swords.SubSkill.CounterAttack.Description=Reflektiere {0} des Schadens w\u00E4hrend du blockierst
+Swords.SubSkill.SerratedStrikes.Name=S\u00e4gezahnschlag (F\u00e4higkeit)
+Swords.SubSkill.SerratedStrikes.Description={0} Fl\u00E4chenschaden, Fl\u00E4chenblutung+
 Swords.Effect.4=S\u00e4gezahnschlag, Blutung+
 Swords.Effect.5={0} Ticks Blutung
-Swords.Effect.6=Blutung
-Swords.Effect.7=Verursacht Blutungsschaden \u00fcber Zeit
+Swords.SubSkill.Bleed.Name=Blutung
+Swords.SubSkill.Bleed.Description=Verursacht Blutungsschaden \u00fcber Zeit
 Swords.Listener=Schwert:
 Swords.SkillName=SCHWERT
 Swords.Skills.SS.Off=[[RED]]**S\u00e4gezahnschlag abgenutzt**
@@ -349,25 +349,25 @@ Taming.Ability.Locked.3=GESPERRT bis Skill {0}+ (Gesch\u00e4rfte Krallen)
 Taming.Ability.Locked.4=GESPERRT bis Skill {0}+ (Schnell-Imbiss)
 Taming.Ability.Locked.5=GESPERRT bis Skill {0}+ (Heiliger Hund)
 Taming.Combat.Chance.Gore=[[RED]]Aufschlitzen Chance: [[YELLOW]]{0}
-Taming.Effect.0=Bestienkunde
-Taming.Effect.1=Knochenschlag inspiziert W\u00f6lfe und Ozelots
-Taming.Effect.10=Schock-Sicher
-Taming.Effect.11=Reduktion von Explosions-Schaden
-Taming.Effect.12=Ruf der Wildnis
-Taming.Effect.13=Beschw\u00f6re ein Tier an deine Seite
-Taming.Effect.14=[[GRAY]]RdW:  B\u00fccken und Linksklick mit  {0} {1} (Ozelot), {2} {3} (Wolf), {4} {5} (Pferd)
-Taming.Effect.16=Schnell-Imbiss
-Taming.Effect.17=Chance auf Heilung bei Attacke (Wolf)
-Taming.Effect.18=Heiliger Hund
-Taming.Effect.19=Heilung durch Magie und Tr\u00E4nke
-Taming.Effect.2=Aufschlitzen
-Taming.Effect.3=Kritische Treffer verursachen Blutung
-Taming.Effect.4=Gesch\u00e4rfte Krallen
-Taming.Effect.5=Schadens-Bonus
-Taming.Effect.6=Umweltbewusst
-Taming.Effect.7=Kaktus/Lava-Furcht, Immun gegen Fall-Schaden
-Taming.Effect.8=Dicker Pelz
-Taming.Effect.9=Verminderter Schaden, Feuer-Resistent
+Taming.SubSkill.BeastLore.Name=Bestienkunde
+Taming.SubSkill.BeastLore.Description=Knochenschlag inspiziert W\u00f6lfe und Ozelots
+Taming.SubSkill.ShockProof.Name=Schock-Sicher
+Taming.SubSkill.ShockProof.Description=Reduktion von Explosions-Schaden
+Taming.SubSkill.CallOfTheWild.Name=Ruf der Wildnis
+Taming.SubSkill.CallOfTheWild.Description=Beschw\u00f6re ein Tier an deine Seite
+Taming.SubSkill.CallOfTheWild.Description.2=[[GRAY]]RdW:  B\u00fccken und Linksklick mit  {0} {1} (Ozelot), {2} {3} (Wolf), {4} {5} (Pferd)
+Taming.SubSkill.FastFoodService.Name=Schnell-Imbiss
+Taming.SubSkill.FastFoodService.Description=Chance auf Heilung bei Attacke (Wolf)
+Taming.SubSkill.HolyHound.Name=Heiliger Hund
+Taming.SubSkill.HolyHound.Description=Heilung durch Magie und Tr\u00E4nke
+Taming.SubSkill.Gore.Name=Aufschlitzen
+Taming.SubSkill.Gore.Description=Kritische Treffer verursachen Blutung
+Taming.SubSkill.SharpenedClaws.Name=Gesch\u00e4rfte Krallen
+Taming.SubSkill.SharpenedClaws.Description=Schadens-Bonus
+Taming.SubSkill.EnvironmentallyAware.Name=Umweltbewusst
+Taming.SubSkill.EnvironmentallyAware.Description=Kaktus/Lava-Furcht, Immun gegen Fall-Schaden
+Taming.SubSkill.ThickFur.Name=Dicker Pelz
+Taming.SubSkill.ThickFur.Description=Verminderter Schaden, Feuer-Resistent
 Taming.Listener.Wolf=[[DARK_GRAY]]Dein Wolf hastet zu dir zur\u00fcck...
 Taming.Listener=Z\u00e4hmen:
 Taming.SkillName=Z\u00c4HMEN
@@ -391,16 +391,16 @@ Unarmed.Ability.IronGrip.Attacker=[[RED]]Dein Gegner hat einen eisernen Griff!
 Unarmed.Ability.IronGrip.Defender=[[GREEN]]Dein eiserner Griff hat dich vor Entwaffnung gesch\u00FCtzt!
 Unarmed.Ability.Lower=[[GRAY]]**Du senkst deine F\u00c4USTE**
 Unarmed.Ability.Ready=[[GREEN]]**Deine F\u00c4USTE sind bereit**
-Unarmed.Effect.0=Berserker (F\u00e4higkeit)
-Unarmed.Effect.1=+50% Schaden, Zerbricht weiche Materialien
-Unarmed.Effect.2=Entwaffnen (Spieler)
-Unarmed.Effect.3=L\u00E4sst Gegenstand aus der Hand des Feindes fallen
-Unarmed.Effect.4=Eiserner Arm
-Unarmed.Effect.5=Erh\u00f6ht kurzfristig deine Schlagkraft
-Unarmed.Effect.6=Pfeil-Ablenkung
-Unarmed.Effect.7=Lenkt Pfeile ab
-Unarmed.Effect.8=Eisen Griff
-Unarmed.Effect.9=Sch\u00FCtzt dich davor, entwaffnet zu werden
+Unarmed.SubSkill.Berserk.Name=Berserker (F\u00e4higkeit)
+Unarmed.SubSkill.Berserk.Description=+50% Schaden, Zerbricht weiche Materialien
+Unarmed.SubSkill.Disarm.Name=Entwaffnen (Spieler)
+Unarmed.SubSkill.Disarm.Description=L\u00E4sst Gegenstand aus der Hand des Feindes fallen
+Unarmed.SubSkill.IronArmStyle.Name=Eiserner Arm
+Unarmed.SubSkill.IronArmStyle.Description=Erh\u00f6ht kurzfristig deine Schlagkraft
+Unarmed.SubSkill.ArrowDeflect.Name=Pfeil-Ablenkung
+Unarmed.SubSkill.ArrowDeflect.Description=Lenkt Pfeile ab
+Unarmed.SubSkill.IronGrip.Name=Eisen Griff
+Unarmed.SubSkill.IronGrip.Description=Sch\u00FCtzt dich davor, entwaffnet zu werden
 Unarmed.Listener=Unbewaffnet:
 Unarmed.SkillName=UNBEWAFFNET
 Unarmed.Skills.Berserk.Off=[[RED]]**Berserker ausgelaufen**
@@ -416,12 +416,12 @@ Woodcutting.Ability.1=Bl\u00e4st Bl\u00e4tter davon
 Woodcutting.Ability.Chance.DDrop=[[RED]]Doppel Drop Chance: [[YELLOW]]{0}
 Woodcutting.Ability.Length=[[RED]]Baumf\u00e4ller Dauer: [[YELLOW]]{0}s
 Woodcutting.Ability.Locked.0=GESPERRT bis Skill {0}+ (Bl\u00e4ttersturm)
-Woodcutting.Effect.0=Baumf\u00e4ller (F\u00e4higkeit)
-Woodcutting.Effect.1=L\u00e4sst B\u00e4ume explodieren
-Woodcutting.Effect.2=Bl\u00e4ttersturm
-Woodcutting.Effect.3=Bl\u00e4st Bl\u00e4tter davon
-Woodcutting.Effect.4=Doppel Drops
-Woodcutting.Effect.5=Verdoppelt die Ausbeute 
+Woodcutting.SubSkill.TreeFeller.Name=Baumf\u00e4ller (F\u00e4higkeit)
+Woodcutting.SubSkill.TreeFeller.Description=L\u00e4sst B\u00e4ume explodieren
+Woodcutting.SubSkill.LeafBlower.Name=Bl\u00e4ttersturm
+Woodcutting.SubSkill.LeafBlower.Description=Bl\u00e4st Bl\u00e4tter davon
+Woodcutting.SubSkill.HarvestLumber.Name=Doppel Drops
+Woodcutting.SubSkill.HarvestLumber.Description=Verdoppelt die Ausbeute 
 Woodcutting.Listener=Holzf\u00e4ller:
 Woodcutting.SkillName=HOLZF\u00c4LLER
 Woodcutting.Skills.TreeFeller.Off=[[RED]]**Baumf\u00e4ller abgelaufen**

src/main/resources/locale/locale_en_US.properties

@@ -37,12 +37,12 @@ JSON.LevelRequirement=Level Requirement
 Acrobatics.Ability.Proc=[[GREEN]]**Graceful Landing**
 Acrobatics.Combat.Proc=[[GREEN]]**Dodged**
 Acrobatics.DodgeChance=[[RED]]Dodge Chance: [[YELLOW]]{0}
-Acrobatics.Effect.0=Roll
-Acrobatics.Effect.1=Reduces or Negates fall damage
-Acrobatics.Effect.2=Graceful Roll
-Acrobatics.Effect.3=Twice as effective as a normal Roll
-Acrobatics.Effect.4=Dodge
-Acrobatics.Effect.5=Reduce attack damage by half
+Acrobatics.SubSkill.Roll.Name=Roll
+Acrobatics.SubSkill.Roll.Description=Reduces or Negates fall damage
+Acrobatics.SubSkill.GracefulRoll.Name=Graceful Roll
+Acrobatics.SubSkill.GracefulRoll.Description=Twice as effective as a normal Roll
+Acrobatics.SubSkill.Dodge.Name=Dodge
+Acrobatics.SubSkill.Dodge.Description=Reduce attack damage by half
 Acrobatics.Listener=Acrobatics:
 Acrobatics.Roll.Chance=[[RED]]Roll Chance: [[YELLOW]]{0}
 Acrobatics.Roll.GraceChance=[[RED]]Graceful Roll Chance: [[YELLOW]]{0}
@@ -51,10 +51,10 @@ Acrobatics.SkillName=ACROBATICS
 Acrobatics.Skillup=[[YELLOW]]Acrobatics skill increased by {0}. Total ({1})
 
 #ALCHEMY
-Alchemy.Effect.0=Catalysis
-Alchemy.Effect.1=Increases potion brewing speed
-Alchemy.Effect.2=Concoctions
-Alchemy.Effect.3=Brew potions with more ingredients
+Alchemy.SubSkill.Catalysis.Name=Catalysis
+Alchemy.SubSkill.Catalysis.Description=Increases potion brewing speed
+Alchemy.SubSkill.Concoctions.Name=Concoctions
+Alchemy.SubSkill.Concoctions.Description=Brew potions with more ingredients
 Alchemy.Listener=Alchemy:
 Alchemy.Ability.Locked.0=LOCKED UNTIL {0}+ SKILL (CATALYSIS)
 Alchemy.Catalysis.Speed=[[RED]]Brewing Speed: [[YELLOW]]{0}
@@ -67,12 +67,12 @@ Alchemy.Skillup=[[YELLOW]]Alchemy skill increased by {0}. Total ({1})
 Archery.Combat.DazeChance=[[RED]]Chance to Daze: [[YELLOW]]{0}
 Archery.Combat.RetrieveChance=[[RED]]Chance to Retrieve Arrows: [[YELLOW]]{0}
 Archery.Combat.SkillshotBonus=[[RED]]Skill Shot Bonus Damage: [[YELLOW]]{0}
-Archery.Effect.0=Skill Shot
-Archery.Effect.1=Increases damage done with bows
-Archery.Effect.2=Daze (Players)
-Archery.Effect.3=Disorients foes and deals {0} DMG
-Archery.Effect.4=Arrow Retrieval
-Archery.Effect.5=Chance to retrieve arrows from corpses
+Archery.SubSkill.SkillShot.Name=Skill Shot
+Archery.SubSkill.SkillShot.Description=Increases damage done with bows
+Archery.SubSkill.Daze.Name=Daze
+Archery.SubSkill.Daze.Description=Disorients foes and deals {0} DMG
+Archery.SubSkill.ArrowRetrieval.Name=Arrow Retrieval
+Archery.SubSkill.ArrowRetrieval.Description=Chance to retrieve arrows from corpses
 Archery.Listener=Archery:
 Archery.SkillName=ARCHERY
 Archery.Skillup=[[YELLOW]]Archery skill increased by {0}. Total ({1})
@@ -93,16 +93,16 @@ Axes.Combat.GI.Proc=[[GREEN]]**STRUCK WITH GREAT FORCE**
 Axes.Combat.GI.Struck=[[RED]]**HIT BY GREATER IMPACT**
 Axes.Combat.SS.Struck=[[DARK_RED]]Struck by SKULL SPLITTER!
 Axes.Combat.SS.Length=[[RED]]Skull Splitter Length: [[YELLOW]]{0}s
-Axes.Effect.0=Skull Splitter
-Axes.Effect.1=Deal AoE Damage
-Axes.Effect.2=Critical Strikes
-Axes.Effect.3=Double Damage
-Axes.Effect.4=Axe Mastery
-Axes.Effect.5=Adds bonus DMG
-Axes.Effect.6=Armor Impact
-Axes.Effect.7=Strike with enough force to shatter armor
-Axes.Effect.8=Greater Impact
-Axes.Effect.9=Deal bonus damage to unarmored foes
+Axes.SubSkill.SkullSplitter.Name=Skull Splitter
+Axes.SubSkill.SkullSplitter.Description=Deal AoE Damage
+Axes.SubSkill.CriticalStrikes.Name=Critical Strikes
+Axes.SubSkill.CriticalStrikes.Description=Double Damage
+Axes.SubSkill.AxeMastery.Name=Axe Mastery
+Axes.SubSkill.AxeMastery.Description=Adds bonus DMG
+Axes.SubSkill.ArmorImpact.Name=Armor Impact
+Axes.SubSkill.ArmorImpact.Description=Strike with enough force to shatter armor
+Axes.SubSkill.GreaterImpact.Name=Greater Impact
+Axes.SubSkill.GreaterImpact.Description=Deal bonus damage to unarmored foes
 Axes.Listener=Axes:
 Axes.SkillName=AXES
 Axes.Skills.SS.Off=[[RED]]**Skull Splitter has worn off**
@@ -115,10 +115,10 @@ Axes.Skillup=[[YELLOW]]Axes skill increased by {0}. Total ({1})
 #EXCAVATION
 Excavation.Ability.Lower=[[GRAY]]**YOU LOWER YOUR SHOVEL**
 Excavation.Ability.Ready=[[GREEN]]**YOU READY YOUR SHOVEL**
-Excavation.Effect.0=Giga Drill Breaker
-Excavation.Effect.1=3x Drop Rate, 3x EXP, +Speed
-Excavation.Effect.2=Treasure Hunter
-Excavation.Effect.3=Ability to dig for treasure
+Excavation.SubSkill.GigaDrillBreaker.Name=Giga Drill Breaker
+Excavation.SubSkill.GigaDrillBreaker.Description=3x Drop Rate, 3x EXP, +Speed
+Excavation.SubSkill.TreasureHunter.Name=Treasure Hunter
+Excavation.SubSkill.TreasureHunter.Description=Ability to dig for treasure
 Excavation.Effect.Length=[[RED]]Giga Drill Breaker Length: [[YELLOW]]{0}s
 Excavation.Listener=Excavation:
 Excavation.SkillName=EXCAVATION
@@ -141,18 +141,18 @@ Fishing.Ability.TH.MagicRate=[[RED]]Magic Hunter Chance: [[YELLOW]]{0}
 Fishing.Ability.Shake=[[RED]]Shake Chance: [[YELLOW]]{0}
 Fishing.Ability.IceFishing=[[RED]]Ice Fishing: Go fishing in ice
 Fishing.Ability.FD=[[RED]]Fisherman''s Diet: [[YELLOW]]Rank {0}
-Fishing.Effect.0=Treasure Hunter (Passive)
-Fishing.Effect.1=Fish up misc. objects
-Fishing.Effect.2=Magic Hunter
-Fishing.Effect.3=Find Enchanted Items
-Fishing.Effect.4=Shake (vs. Entities)
-Fishing.Effect.5=Shake items off of mobs w/ fishing pole
-Fishing.Effect.6=Fisherman's Diet
-Fishing.Effect.7=Improves hunger restored from fished foods
-Fishing.Effect.8=Master Angler
-Fishing.Effect.9=Improves chance of getting a bite while fishing
-Fishing.Effect.10=Ice Fishing
-Fishing.Effect.11=Allows you to fish in icy biomes
+Fishing.SubSkill.TreasureHunter.Name=Treasure Hunter
+Fishing.SubSkill.TreasureHunter.Description=Fish up misc. objects
+Fishing.SubSkill.MagicHunter.Name=Magic Hunter
+Fishing.SubSkill.MagicHunter.Description=Find Enchanted Items
+Fishing.SubSkill.Shake.Name=Shake
+Fishing.SubSkill.Shake.Description=Shake items off of mobs w/ fishing pole
+Fishing.SubSkill.FishermansDiet.Name=Fisherman's Diet
+Fishing.SubSkill.FishermansDiet.Description=Improves hunger restored from fished foods
+Fishing.SubSkill.MasterAngler.Name=Master Angler
+Fishing.SubSkill.MasterAngler.Description=Improves chance of getting a bite while fishing
+Fishing.SubSkill.IceFishing.Name=Ice Fishing
+Fishing.SubSkill.IceFishing.Description=Allows you to fish in icy biomes
 Fishing.Chance.Raining=[[BLUE]] Rain Bonus
 Fishing.Listener=Fishing:
 Fishing.Ability.TH.MagicFound=[[GRAY]]You feel a touch of magic with this catch...
@@ -175,20 +175,20 @@ Herbalism.Ability.Lower=[[GRAY]]**YOU LOWER YOUR HOE**
 Herbalism.Ability.Ready=[[GREEN]]**YOU READY YOUR HOE**
 Herbalism.Ability.ShroomThumb.Chance=[[RED]]Shroom Thumb Chance: [[YELLOW]]{0}
 Herbalism.Ability.ShroomThumb.Fail=[[RED]]**SHROOM THUMB FAIL**
-Herbalism.Effect.0=Green Terra
-Herbalism.Effect.1=Spread the Terra, 3x Drops
-Herbalism.Effect.2=Green Thumb (Wheat)
-Herbalism.Effect.3=Auto-Plants crops when harvesting
+Herbalism.SubSkill.GreenTerra.Name=Green Terra
+Herbalism.SubSkill.GreenTerra.Description=Spread the Terra, 3x Drops
+Herbalism.SubSkill.GreenThumb.Name=Green Thumb
+Herbalism.SubSkill.GreenThumb.Description=Auto-Plants crops when harvesting
 Herbalism.Effect.4=Green Thumb (Blocks)
-Herbalism.Effect.5=Make bricks mossy, or make grass grow
-Herbalism.Effect.6=Farmer's Diet
-Herbalism.Effect.7=Improves hunger restored from farmed foods
-Herbalism.Effect.8=Double Drops (All Herbs)
-Herbalism.Effect.9=Double the normal loot
-Herbalism.Effect.10=Hylian Luck
-Herbalism.Effect.11=Gives a small chance of finding rare items
-Herbalism.Effect.12=Shroom Thumb
-Herbalism.Effect.13=Spread mycelium to dirt & grass
+Herbalism.SubSkill.GreenThumb.Description.2=Make bricks mossy, or make grass grow
+Herbalism.SubSkill.FarmersDiet.Name=Farmer's Diet
+Herbalism.SubSkill.FarmersDiet.Description=Improves hunger restored from farmed foods
+Herbalism.SubSkill.DoubleDrops.Name=Double Drops
+Herbalism.SubSkill.DoubleDrops.Description=Double the normal loot
+Herbalism.SubSkill.HylianLuck.Name=Hylian Luck
+Herbalism.SubSkill.HylianLuck.Description=Gives a small chance of finding rare items
+Herbalism.SubSkill.ShroomThumb.Name=Shroom Thumb
+Herbalism.SubSkill.ShroomThumb.Description=Spread mycelium to dirt & grass
 Herbalism.HylianLuck=[[GREEN]]The luck of Hyrule is with you today!
 Herbalism.Listener=Herbalism:
 Herbalism.SkillName=HERBALISM
@@ -206,16 +206,16 @@ Mining.Ability.Locked.1=LOCKED UNTIL {0}+ SKILL (BIGGER BOMBS)
 Mining.Ability.Locked.2=LOCKED UNTIL {0}+ SKILL (DEMOLITIONS EXPERTISE)
 Mining.Ability.Lower=[[GRAY]]**YOU LOWER YOUR PICKAXE**
 Mining.Ability.Ready=[[GREEN]]**YOU READY YOUR PICKAXE**
-Mining.Effect.0=Super Breaker
-Mining.Effect.1=Speed+, Triple Drop Chance
-Mining.Effect.2=Double Drops
-Mining.Effect.3=Double the normal loot
-Mining.Effect.4=Blast Mining
-Mining.Effect.5=Bonuses to mining with TNT
-Mining.Effect.6=Bigger Bombs
-Mining.Effect.7=Increases TNT explosion radius
-Mining.Effect.8=Demolitions Expertise
-Mining.Effect.9=Decreases damage from TNT explosions
+Mining.SubSkill.SuperBreaker.Name=Super Breaker
+Mining.SubSkill.SuperBreaker.Description=Speed+, Triple Drop Chance
+Mining.SubSkill.DoubleDrops.Name=Double Drops
+Mining.SubSkill.DoubleDrops.Description=Double the normal loot
+Mining.SubSkill.BlastMining.Name=Blast Mining
+Mining.SubSkill.BlastMining.Description=Bonuses to mining with TNT
+Mining.SubSkill.BiggerBombs.Name=Bigger Bombs
+Mining.SubSkill.BiggerBombs.Description=Increases TNT explosion radius
+Mining.SubSkill.DemolitionsExpertise.Name=Demolitions Expertise
+Mining.SubSkill.DemolitionsExpertise.Description=Decreases damage from TNT explosions
 Mining.Effect.Decrease=[[RED]]Demolitions Expert Damage Decrease: [[YELLOW]]{0}
 Mining.Effect.DropChance=[[RED]]Double Drop Chance: [[YELLOW]]{0}
 Mining.Listener=Mining:
@@ -236,22 +236,22 @@ Mining.Blast.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Blast Mining!
 Mining.Blast.Refresh=[[GREEN]]Your [[YELLOW]]Blast Mining [[GREEN]]ability is refreshed!
 
 #REPAIR
-Repair.Effect.0=Repair
-Repair.Effect.1=Repair Tools & Armor
-Repair.Effect.10=Gold Repair ({0}+ SKILL)
-Repair.Effect.11=Repair Gold Tools & Armor
-Repair.Effect.12=Iron Repair ({0}+ SKILL)
-Repair.Effect.13=Repair Iron Tools & Armor
-Repair.Effect.14=Stone Repair ({0}+ SKILL)
-Repair.Effect.15=Repair Stone Tools
-Repair.Effect.2=Repair Mastery
-Repair.Effect.3=Increased repair amount
-Repair.Effect.4=Super Repair
-Repair.Effect.5=Double effectiveness
-Repair.Effect.6=Diamond Repair ({0}+ SKILL)
-Repair.Effect.7=Repair Diamond Tools & Armor
-Repair.Effect.8=Arcane Forging
-Repair.Effect.9=Repair magic items
+Repair.SubSkill.Repair.Name=Repair
+Repair.SubSkill.Repair.Description=Repair Tools & Armor
+Repair.SubSkill.GoldRepair.Name=Gold Repair ({0}+ SKILL)
+Repair.SubSkill.GoldRepair.Description=Repair Gold Tools & Armor
+Repair.SubSkill.IronRepair.Name=Iron Repair ({0}+ SKILL)
+Repair.SubSkill.IronRepair.Description=Repair Iron Tools & Armor
+Repair.SubSkill.StoneRepair.Name=Stone Repair ({0}+ SKILL)
+Repair.SubSkill.StoneRepair.Description=Repair Stone Tools
+Repair.SubSkill.RepairMastery.Name=Repair Mastery
+Repair.SubSkill.RepairMastery.Description=Increased repair amount
+Repair.SubSkill.SuperRepair.Name=Super Repair
+Repair.SubSkill.SuperRepair.Description=Double effectiveness
+Repair.SubSkill.DiamondRepair.Name=Diamond Repair ({0}+ SKILL)
+Repair.SubSkill.DiamondRepair.Description=Repair Diamond Tools & Armor
+Repair.SubSkill.ArcaneForging.Name=Arcane Forging
+Repair.SubSkill.ArcaneForging.Description=Repair magic items
 Repair.Error=[[DARK_RED]]mcMMO encountered an error attempting to repair this item!
 Repair.Listener.Anvil=[[DARK_RED]]You have placed an anvil, anvils can repair tools and armor.
 Repair.Listener=Repair:
@@ -280,10 +280,10 @@ Repair.Arcane.Rank=[[RED]]Arcane Forging: [[YELLOW]]Rank {0}/{1}
 
 #SALVAGE
 Salvage.Pretty.Name=Salvage
-Salvage.Effect.0=Advanced Salvage
-Salvage.Effect.1=Salvage damaged items
-Salvage.Effect.2=Arcane Salvaging
-Salvage.Effect.3=Extract enchantments from items
+Salvage.SubSkill.AdvancedSalvage.Name=Advanced Salvage
+Salvage.SubSkill.AdvancedSalvage.Description=Salvage damaged items
+Salvage.SubSkill.ArcaneSalvaging.Name=Arcane Salvaging
+Salvage.SubSkill.ArcaneSalvaging.Description=Extract enchantments from items
 Salvage.Ability.Locked.0=LOCKED UNTIL {0}+ SKILL (ADVANCED SALVAGE)
 Salvage.Ability.Bonus.0=Advanced Salvage
 Salvage.Ability.Bonus.1=Max yield {0} item destroyed
@@ -317,14 +317,14 @@ Swords.Combat.Counter.Chance=[[RED]]Counter Attack Chance: [[YELLOW]]{0}
 Swords.Combat.Counter.Hit=[[DARK_RED]]Hit with a counter-attack!
 Swords.Combat.Countered=[[GREEN]]**COUNTER-ATTACKED**
 Swords.Combat.SS.Struck=[[DARK_RED]]Struck by SERRATED STRIKES!
-Swords.Effect.0=Counter Attack
-Swords.Effect.1=Reflect {0} of damage taken while blocking
-Swords.Effect.2=Serrated Strikes
-Swords.Effect.3={0} DMG AoE, Bleed+ AoE
+Swords.SubSkill.CounterAttack.Name=Counter Attack
+Swords.SubSkill.CounterAttack.Description=Reflect {0} of damage taken while blocking
+Swords.SubSkill.SerratedStrikes.Name=Serrated Strikes
+Swords.SubSkill.SerratedStrikes.Description={0} DMG AoE, Bleed+ AoE
 Swords.Effect.4=Serrated Strikes Bleed+
 Swords.Effect.5={0} Tick Bleed
-Swords.Effect.6=Bleed
-Swords.Effect.7=Apply a bleed DoT
+Swords.SubSkill.Bleed.Name=Bleed
+Swords.SubSkill.Bleed.Description=Apply a bleed DoT
 Swords.Listener=Swords:
 Swords.SkillName=SWORDS
 Swords.Skills.SS.Off=[[RED]]**Serrated Strikes has worn off**
@@ -355,25 +355,28 @@ Taming.Ability.Locked.3=LOCKED UNTIL {0}+ SKILL (SHARPENED CLAWS)
 Taming.Ability.Locked.4=LOCKED UNTIL {0}+ SKILL (FAST FOOD SERVICE)
 Taming.Ability.Locked.5=LOCKED UNTIL {0}+ SKILL (HOLY HOUND)
 Taming.Combat.Chance.Gore=[[RED]]Gore Chance: [[YELLOW]]{0}
-Taming.Effect.0=Beast Lore
-Taming.Effect.1=Bone-whacking inspects wolves & ocelots
-Taming.Effect.10=Shock Proof
-Taming.Effect.11=Explosive Damage Reduction
-Taming.Effect.12=Call of the Wild
-Taming.Effect.13=Summon an animal to your side
-Taming.Effect.14=[[GRAY]]COTW: Crouch and left-click with\n  {0} {1} (Ocelot), {2} {3} (Wolf), {4} {5} (Horse)
-Taming.Effect.16=Fast Food Service
-Taming.Effect.17=Chance for wolves to heal on attack
-Taming.Effect.18=Holy Hound
-Taming.Effect.19=Healed by Magic & Poison
-Taming.Effect.2=Gore
-Taming.Effect.3=Critical Strike that applies Bleed
-Taming.Effect.4=Sharpened Claws
-Taming.Effect.5=Damage Bonus
-Taming.Effect.6=Environmentally Aware
-Taming.Effect.7=Cactus/Lava Phobia, Fall DMG Immune
-Taming.Effect.8=Thick Fur
-Taming.Effect.9=DMG Reduction, Fire Resistance
+Taming.SubSkill.BeastLore.Name=Beast Lore
+Taming.SubSkill.BeastLore.Description=Bone-whacking inspects wolves & ocelots
+Taming.SubSkill.ShockProof.Name=Shock Proof
+Taming.SubSkill.ShockProof.Description=Explosive Damage Reduction
+Taming.SubSkill.CallOfTheWild.Name=Call of the Wild
+Taming.SubSkill.CallOfTheWild.Description=Summon an animal to your side
+Taming.SubSkill.CallOfTheWild.Description.2=[[GRAY]]COTW: Crouch and left-click with\n  {0} {1} (Ocelot), {2} {3} (Wolf), {4} {5} (Horse)
+Taming.SubSkill.FastFoodService.Name=Fast Food Service
+Taming.SubSkill.FastFoodService.Description=Chance for wolves to heal on attack
+Taming.SubSkill.HolyHound.Name=Holy Hound
+Taming.SubSkill.HolyHound.Description=Healed by Magic & Poison
+Taming.SubSkill.Gore.Name=Gore
+Taming.SubSkill.Gore.Description=Critical Strike that applies Bleed
+Taming.SubSkill.SharpenedClaws.Name=Sharpened Claws
+Taming.SubSkill.SharpenedClaws.Description=Damage Bonus
+Taming.SubSkill.EnvironmentallyAware.Name=Environmentally Aware
+Taming.SubSkill.EnvironmentallyAware.Description=Cactus/Lava Phobia, Fall DMG Immune
+Taming.SubSkill.ThickFur.Name=Thick Fur
+Taming.SubSkill.ThickFur.Description=DMG Reduction, Fire Resistance
+Taming.SubSkill.Pummel.Name=Pummel
+Taming.SubSkill.Pummel.Description=Your Wolves have a chance of knocking back foes
+Taming.SubSkill.Pummel.TargetMessage=You've been knocked back by a wolf!
 Taming.Listener.Wolf=[[DARK_GRAY]]Your wolf scurries back to you...
 Taming.Listener=Taming:
 Taming.SkillName=TAMING
@@ -397,16 +400,18 @@ Unarmed.Ability.IronGrip.Attacker=[[RED]]Your opponent has an iron grip!
 Unarmed.Ability.IronGrip.Defender=[[GREEN]]Your iron grip kept you from being disarmed!
 Unarmed.Ability.Lower=[[GRAY]]**YOU LOWER YOUR FISTS**
 Unarmed.Ability.Ready=[[GREEN]]**YOU READY YOUR FISTS**
-Unarmed.Effect.0=Berserk
-Unarmed.Effect.1=+50% DMG, Breaks weak materials
-Unarmed.Effect.2=Disarm (Players)
-Unarmed.Effect.3=Drops the foes item held in hand
-Unarmed.Effect.4=Iron Arm Style
-Unarmed.Effect.5=Hardens your arm over time
-Unarmed.Effect.6=Arrow Deflect
-Unarmed.Effect.7=Deflect arrows
-Unarmed.Effect.8=Iron Grip
-Unarmed.Effect.9=Prevents you from being disarmed
+Unarmed.SubSkill.Berserk.Name=Berserk
+Unarmed.SubSkill.Berserk.Description=+50% DMG, Breaks weak materials
+Unarmed.SubSkill.Disarm.Name=Disarm
+Unarmed.SubSkill.Disarm.Description=Drops the foes item held in hand
+Unarmed.SubSkill.IronArmStyle.Name=Iron Arm Style
+Unarmed.SubSkill.IronArmStyle.Description=Hardens your arm over time
+Unarmed.SubSkill.ArrowDeflect.Name=Arrow Deflect
+Unarmed.SubSkill.ArrowDeflect.Description=Deflect arrows
+Unarmed.SubSkill.IronGrip.Name=Iron Grip
+Unarmed.SubSkill.IronGrip.Description=Prevents you from being disarmed
+Unarmed.SubSkill.BlockCracker.Name=Block Cracker
+Unarmed.SubSkill.BlockCracker.Description=Break rock with your fists
 Unarmed.Listener=Unarmed:
 Unarmed.SkillName=UNARMED
 Unarmed.Skills.Berserk.Off=[[RED]]**Berserk has worn off**
@@ -422,18 +427,18 @@ Woodcutting.Ability.1=Blow away leaves
 Woodcutting.Ability.Chance.DDrop=[[RED]]Double Drop Chance: [[YELLOW]]{0}
 Woodcutting.Ability.Length=[[RED]]Tree Feller Length: [[YELLOW]]{0}s
 Woodcutting.Ability.Locked.0=LOCKED UNTIL {0}+ SKILL (LEAF BLOWER)
-Woodcutting.Effect.0=Tree Feller
-Woodcutting.Effect.1=Make trees explode
-Woodcutting.Effect.2=Leaf Blower
-Woodcutting.Effect.3=Blow Away Leaves
-Woodcutting.Effect.4=Harvest Lumber
-Woodcutting.Effect.5=Skillfully extract more Lumber
-Woodcutting.Effect.6=Splinter
-Woodcutting.Effect.7=Cut down trees more efficiently.
-Woodcutting.Effect.8=Bark Surgeon
-Woodcutting.Effect.9=Extract useful materials when stripping trees.
-Woodcutting.Effect.10=Nature's Bounty
-Woodcutting.Effect.11=Gather experience from nature.
+Woodcutting.SubSkill.TreeFeller.Name=Tree Feller
+Woodcutting.SubSkill.TreeFeller.Description=Make trees explode
+Woodcutting.SubSkill.LeafBlower.Name=Leaf Blower
+Woodcutting.SubSkill.LeafBlower.Description=Blow Away Leaves
+Woodcutting.SubSkill.HarvestLumber.Name=Harvest Lumber
+Woodcutting.SubSkill.HarvestLumber.Description=Skillfully extract more Lumber
+Woodcutting.SubSkill.Splinter.Name=Splinter
+Woodcutting.SubSkill.Splinter.Description=Cut down trees more efficiently.
+Woodcutting.SubSkill.BarkSurgeon.Name=Bark Surgeon
+Woodcutting.SubSkill.BarkSurgeon.Description=Extract useful materials when stripping trees.
+Woodcutting.SubSkill.NaturesBounty.Name=Nature's Bounty
+Woodcutting.SubSkill.NaturesBounty.Description=Gather experience from nature.
 Woodcutting.Listener=Woodcutting:
 Woodcutting.SkillName=WOODCUTTING
 Woodcutting.Skills.TreeFeller.Off=[[RED]]**Tree Feller has worn off**
@@ -744,7 +749,7 @@ Guides.Page.OutOfRange=That page does not exist, there are only {0} total pages.
 Guides.Usage=[[RED]] Usage is /{0} ? [page]
 
 ##Acrobatics
-Guides.Acrobatics.Section.0=[[DARK_AQUA]]About Acrobatics:\n[[YELLOW]]Acrobatics is the art of moving gracefully in mcMMO.\n[[YELLOW]]It provides combat bonuses and environment damage bonuses.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill you need to perform a dodge\n[[YELLOW]]in combat or survive falls from heights that damage you.
+Guides.Acrobatics.Section.0=[[DARK_AQUA]]About Acrobatics:\n[[YELLOW]]Acrobatics is the art of moving Gracefuly in mcMMO.\n[[YELLOW]]It provides combat bonuses and environment damage bonuses.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill you need to perform a dodge\n[[YELLOW]]in combat or survive falls from heights that damage you.
 Guides.Acrobatics.Section.1=[[DARK_AQUA]]How does Rolling work?\n[[YELLOW]]You have a passive chance when you take fall damage\n[[YELLOW]]to negate the damage done. You can hold the sneak button to\n[[YELLOW]]double your chances during the fall.\n[[YELLOW]]This triggers a Graceful Roll instead of a standard one.\n[[YELLOW]]Graceful Rolls are like regular rolls but are twice as likely to\n[[YELLOW]]occur and provide more damage safety than regular rolls.\n[[YELLOW]]Rolling chance is tied to your skill level
 Guides.Acrobatics.Section.2=[[DARK_AQUA]]How does Dodge work?\n[[YELLOW]]Dodge is a passive chance when you are\n[[YELLOW]]injured in combat to halve the damage taken.\n[[YELLOW]]It is tied to your skill level.
 
@@ -878,7 +883,7 @@ Teleport.Cancelled=[[DARK_RED]]Teleportation canceled!
 #SKILLS
 Skills.Child=[[GOLD]](CHILD SKILL)
 Skills.Disarmed=[[DARK_RED]]You have been disarmed!
-Skills.Header=[[RED]]-----[][[GREEN]]{0}[[RED]][]-----
+Skills.Header=[[RED]]-----[] [[GREEN]]{0}[[RED]] []-----
 Skills.NeedMore=[[DARK_RED]]You need more [[GRAY]]{0}
 Skills.Parents = PARENTS
 Skills.Stats=[[YELLOW]]{0}[[GREEN]]{1}[[DARK_AQUA]] XP([[GRAY]]{2}[[DARK_AQUA]]/[[GRAY]]{3}[[DARK_AQUA]])

src/main/resources/locale/locale_es.properties

@@ -1,12 +1,12 @@
 Acrobatics.Ability.Proc=[[GREEN]]**Aterrizaje Agraciado**
 Acrobatics.Combat.Proc=[[GREEN]]**Esquivado**
 Acrobatics.DodgeChance=[[RED]]Probabilidad de Esquivar: [[YELLOW]]{0}%
-Acrobatics.Effect.0=Rodada
-Acrobatics.Effect.1=Reduce o Elimina el da\u00f1o de caida
-Acrobatics.Effect.2=Rodada Majestuosa
-Acrobatics.Effect.3=El doble de efectivo que una rodada normal
-Acrobatics.Effect.4=Esquivar
-Acrobatics.Effect.5=Reduce el da\u00f1o de ataque a la mitad
+Acrobatics.SubSkill.Roll.Name=Rodada
+Acrobatics.SubSkill.Roll.Description=Reduce o Elimina el da\u00f1o de caida
+Acrobatics.SubSkill.GracefulRoll.Name=Rodada Majestuosa
+Acrobatics.SubSkill.GracefulRoll.Description=El doble de efectivo que una rodada normal
+Acrobatics.SubSkill.Dodge.Name=Esquivar
+Acrobatics.SubSkill.Dodge.Description=Reduce el da\u00f1o de ataque a la mitad
 Acrobatics.Listener=Acrobacias:
 Acrobatics.Roll.Chance=[[RED]]Probabilidad de Rodar: [[YELLOW]]{0}%
 Acrobatics.Roll.GraceChance=[[RED]]Probabilidad de Rodada Majestuosa: [[YELLOW]]{0}%
@@ -16,12 +16,12 @@ Acrobatics.Skillup=[[YELLOW]]Habilidad de Acrobacias incrementada en {0}. Total
 Archery.Combat.DazeChance=[[RED]]Probabilidad de Aturdimiento: [[YELLOW]]{0}%
 Archery.Combat.RetrieveChance=[[RED]]Probabilidad de Recuperar Flechas: [[YELLOW]]{0}
 Archery.Combat.SkillshotBonus=[[RED]]Da\u00f1o bonus por Habilidad de Tiro: [[YELLOW]]{0}
-Archery.Effect.0=Habilidad de Tiro
-Archery.Effect.1=Incrementar da\u00f1o hecho con arcos
-Archery.Effect.2=Aturdir (Jugadores)
-Archery.Effect.3=Desorienta a los enemigos y inflige {0} DMG
-Archery.Effect.4=Recuperaci\u00f3n de Flecha
-Archery.Effect.5=Probabilidad de recuperar flechas de los cadaveres
+Archery.SubSkill.SkillShot.Name=Habilidad de Tiro
+Archery.SubSkill.SkillShot.Description=Incrementar da\u00f1o hecho con arcos
+Archery.SubSkill.Daze.Name=Aturdir (Jugadores)
+Archery.SubSkill.Daze.Description=Desorienta a los enemigos y inflige {0} DMG
+Archery.SubSkill.ArrowRetrieval.Name=Recuperaci\u00f3n de Flecha
+Archery.SubSkill.ArrowRetrieval.Description=Probabilidad de recuperar flechas de los cadaveres
 Archery.Listener=Arquer\u00eda:
 Archery.SkillName=ARQUER\u00cdA
 Archery.Skillup=[[YELLOW]]Habilidad de Arquer\u00eda incrementada en {0}. Total ({1})
@@ -40,16 +40,16 @@ Axes.Combat.GI.Proc=[[GREEN]]**GOLPEADO CON GRAN FUERZA**
 Axes.Combat.GI.Struck=[[RED]]**GOLPEADO POR IMPACTO MAYOR**
 Axes.Combat.SS.Struck=[[DARK_RED]]Golpeado mediante DIVISOR DE CRANEOS!
 Axes.Combat.SS.Length=[[RED]]Duraci\u00f3n de Parte Cr\u00e1neos: [[YELLOW]]{0}seg
-Axes.Effect.0=Parte Cr\u00e1neos (HABILIDAD)
-Axes.Effect.1=Distribuir Da\u00f1o en el \u00c1rea de Cobertura
-Axes.Effect.2=Golpes Cr\u00edticos
-Axes.Effect.3=Da\u00f1o Doble
-Axes.Effect.4=Dominio del Hacha
-Axes.Effect.5=Agrega da\u00f1o bonus
-Axes.Effect.6=Impacto
-Axes.Effect.7=Golpear con fuerza como para destruir armaduras
-Axes.Effect.8=Gran Impacto
-Axes.Effect.9=Hacer da\u00f1o bonus a los enemigos sin armadura
+Axes.SubSkill.SkullSplitter.Name=Parte Cr\u00e1neos (HABILIDAD)
+Axes.SubSkill.SkullSplitter.Description=Distribuir Da\u00f1o en el \u00c1rea de Cobertura
+Axes.SubSkill.CriticalStrikes.Name=Golpes Cr\u00edticos
+Axes.SubSkill.CriticalStrikes.Description=Da\u00f1o Doble
+Axes.SubSkill.AxeMastery.Name=Dominio del Hacha
+Axes.SubSkill.AxeMastery.Description=Agrega da\u00f1o bonus
+Axes.SubSkill.ArmorImpact.Name=Impacto
+Axes.SubSkill.ArmorImpact.Description=Golpear con fuerza como para destruir armaduras
+Axes.SubSkill.GreaterImpact.Name=Gran Impacto
+Axes.SubSkill.GreaterImpact.Description=Hacer da\u00f1o bonus a los enemigos sin armadura
 Axes.Listener=Hachas:
 Axes.SkillName=HACHAS
 Axes.Skills.SS.Off=[[RED]]**Parte Cr\u00e1neos ha expirado**
@@ -60,10 +60,10 @@ Axes.Skills.SS.Other.On=[[GREEN]]\u00a1{0}[[DARK_GREEN]] us\u00f3 [[RED]]Parte C
 Axes.Skillup=[[YELLOW]]Habilidad de Hacha incrementada en {0}. Total ({1})
 Excavation.Ability.Lower=[[GRAY]]**BAJAS TU PALA**
 Excavation.Ability.Ready=[[GREEN]]**PREPARAS TU PALA**
-Excavation.Effect.0=Ultra Taladro Destructor (HABILIDAD)
-Excavation.Effect.1=Triple Drop, Tripe EXP, M\u00e1s Velocidad
-Excavation.Effect.2=Cazador de Tesoros
-Excavation.Effect.3=Habilidad para cavar por tesoros
+Excavation.SubSkill.GigaDrillBreaker.Name=Ultra Taladro Destructor (HABILIDAD)
+Excavation.SubSkill.GigaDrillBreaker.Description=Triple Drop, Tripe EXP, M\u00e1s Velocidad
+Excavation.SubSkill.TreasureHunter.Name=Cazador de Tesoros
+Excavation.SubSkill.TreasureHunter.Description=Habilidad para cavar por tesoros
 Excavation.Effect.Length=[[RED]]Duraci\u00f3n de Ultra Taladro Destructor: [[YELLOW]]{0}seg
 Excavation.Listener=Excavaci\u00f3n:
 Excavation.SkillName=EXCAVACI\u00d3N
@@ -82,18 +82,18 @@ Fishing.Ability.TH.MagicRate=[[RED]]Probabilidad de Cazador M\u00e1gico: [[YELLO
 Fishing.Ability.Shake=[[RED]]Probabilidad de esquivar: [[YELLOW]]{0}
 Fishing.Ability.IceFishing=[[RED]]Pesca de hielo: ve a pescar en el hielo
 Fishing.Ability.FD=[[RED]]Dieta del pescador: [[YELLOW]]Rank {0}
-Fishing.Effect.0=Cazador de Tesoros (Pasivo)
-Fishing.Effect.1=Pescar objetos miscel\u00e1neos
-Fishing.Effect.2=Cazador M\u00e1gico
-Fishing.Effect.3=Encuentra Objetos Encantados
-Fishing.Effect.4=Sacudir (contra Entidades)
-Fishing.Effect.5=Sacudir los items fuera de los monstruos con la ca\u00f1a de pescar
-Fishing.Effect.6=Dieta del pescador
-Fishing.Effect.7=Mejora el hambre restaurada a partir de alimentos pescados
-Fishing.Effect.8=Maestro pescador
-Fishing.Effect.9=Aumenta la probabilidad de ser mordido mientras se pesca
-Fishing.Effect.10=Pesca de hielo
-Fishing.Effect.11=Te permite pescar en biomas de hielo
+Fishing.SubSkill.TreasureHunter.Name=Cazador de Tesoros (Pasivo)
+Fishing.SubSkill.TreasureHunter.Description=Pescar objetos miscel\u00e1neos
+Fishing.SubSkill.MagicHunter.Name=Cazador M\u00e1gico
+Fishing.SubSkill.MagicHunter.Description=Encuentra Objetos Encantados
+Fishing.SubSkill.Shake.Name=Sacudir (contra Entidades)
+Fishing.SubSkill.Shake.Description=Sacudir los items fuera de los monstruos con la ca\u00f1a de pescar
+Fishing.SubSkill.FishermansDiet.Name=Dieta del pescador
+Fishing.SubSkill.FishermansDiet.Description=Mejora el hambre restaurada a partir de alimentos pescados
+Fishing.SubSkill.MasterAngler.Name=Maestro pescador
+Fishing.SubSkill.MasterAngler.Description=Aumenta la probabilidad de ser mordido mientras se pesca
+Fishing.SubSkill.IceFishing.Name=Pesca de hielo
+Fishing.SubSkill.IceFishing.Description=Te permite pescar en biomas de hielo
 Fishing.Chance.Raining=[[BLUE]] Lluvia de Bonus
 Fishing.Listener=Pescador:
 Fishing.Ability.TH.MagicFound=[[GRAY]]Sientes un toque de magia con esta pesca...
@@ -112,20 +112,20 @@ Herbalism.Ability.Lower=[[GRAY]]**BAJAS TU AZADA**
 Herbalism.Ability.Ready=[[GREEN]]**PREPARASTE TU AZADA**
 Herbalism.Ability.ShroomThumb.Chance=[[RED]]Probabilidad de Pulgar Hongo: [[YELLOW]]{0}
 Herbalism.Ability.ShroomThumb.Fail=[[RED]]**PULGAR HONGO FALLIDO**
-Herbalism.Effect.0=Tierra Verde (HABILIDAD)
-Herbalism.Effect.1=Arar la Tierra, Triple Drops
-Herbalism.Effect.2=Pulgar Verde (Trigo)
-Herbalism.Effect.3=Autoplantar semillas cuando estas cosechando
+Herbalism.SubSkill.GreenTerra.Name=Tierra Verde (HABILIDAD)
+Herbalism.SubSkill.GreenTerra.Description=Arar la Tierra, Triple Drops
+Herbalism.SubSkill.GreenThumb.Name=Pulgar Verde (Trigo)
+Herbalism.SubSkill.GreenThumb.Description=Autoplantar semillas cuando estas cosechando
 Herbalism.Effect.4=Pulgar verde (Bloques)
-Herbalism.Effect.5=Haces ladrillos mohosos o hacer crecer el pasto
-Herbalism.Effect.6=Dieta del Granjero
-Herbalism.Effect.7=Aumenta el hambre restaurada por la comida cultivada
-Herbalism.Effect.8=Doble Drops (Todas las Hierbas)
-Herbalism.Effect.9=El doble del bot\u00edn normal
-Herbalism.Effect.10=Suerte de Hylian
-Herbalism.Effect.11=Da una peque\u00f1a posibilidad de encontrar objetos raros
-Herbalism.Effect.12=Pulgar Hongo
-Herbalism.Effect.13=Esparcir micelio a tierra e hierva.
+Herbalism.SubSkill.GreenThumb.Description.2=Haces ladrillos mohosos o hacer crecer el pasto
+Herbalism.SubSkill.FarmersDiet.Name=Dieta del Granjero
+Herbalism.SubSkill.FarmersDiet.Description=Aumenta el hambre restaurada por la comida cultivada
+Herbalism.SubSkill.DoubleDrops.Name=Doble Drops (Todas las Hierbas)
+Herbalism.SubSkill.DoubleDrops.Description=El doble del bot\u00edn normal
+Herbalism.SubSkill.HylianLuck.Name=Suerte de Hylian
+Herbalism.SubSkill.HylianLuck.Description=Da una peque\u00f1a posibilidad de encontrar objetos raros
+Herbalism.SubSkill.ShroomThumb.Name=Pulgar Hongo
+Herbalism.SubSkill.ShroomThumb.Description=Esparcir micelio a tierra e hierva.
 Herbalism.HylianLuck=[[GREEN]]La suerte de Hyrule esta contigo hoy!
 Herbalism.Listener=Herbalismo:
 Herbalism.SkillName=HERBALISMO
@@ -140,16 +140,16 @@ Mining.Ability.Locked.1=Bloqueado hasta {0} + HABILIDAD (MAYORES BOMBAS)
 Mining.Ability.Locked.2=Bloqueado hasta {0} + HABILIDAD (EXPERTO EN DEMOLICIONES)
 Mining.Ability.Lower=[[GRAY]]**BAJASTE TU PICO**
 Mining.Ability.Ready=[[GREEN]]**PREPARAS TU PICO**
-Mining.Effect.0=S\u00faper Destructor (HABILIDAD)
-Mining.Effect.1=Aumento de Velocidad, Probabilidad de Triple Drop
-Mining.Effect.2=Doble Drops
-Mining.Effect.3=El doble del bot\u00edn normal
-Mining.Effect.4=Miner\u00eda Explosiva
-Mining.Effect.5=Bonuses a la miner\u00eda con TNT
-Mining.Effect.6=Mayores Bombas
-Mining.Effect.7=Incrementa el radio de la explosi\u00f3n de TNT
-Mining.Effect.8=Experto en Demoliciones
-Mining.Effect.9=Reduce el da\u00f1o de las explosiones de TNT
+Mining.SubSkill.SuperBreaker.Name=S\u00faper Destructor (HABILIDAD)
+Mining.SubSkill.SuperBreaker.Description=Aumento de Velocidad, Probabilidad de Triple Drop
+Mining.SubSkill.DoubleDrops.Name=Doble Drops
+Mining.SubSkill.DoubleDrops.Description=El doble del bot\u00edn normal
+Mining.SubSkill.BlastMining.Name=Miner\u00eda Explosiva
+Mining.SubSkill.BlastMining.Description=Bonuses a la miner\u00eda con TNT
+Mining.SubSkill.BiggerBombs.Name=Mayores Bombas
+Mining.SubSkill.BiggerBombs.Description=Incrementa el radio de la explosi\u00f3n de TNT
+Mining.SubSkill.DemolitionsExpertise.Name=Experto en Demoliciones
+Mining.SubSkill.DemolitionsExpertise.Description=Reduce el da\u00f1o de las explosiones de TNT
 Mining.Effect.Decrease=[[RED]]Da\u00f1o de Experto en Demolici\u00f3n Decrementado: [[YELLOW]]{0}
 Mining.Effect.DropChance=[[RED]]Probabilidad de Doble Drop: [[YELLOW]]{0}
 Mining.Listener=Miner\u00eda:
@@ -166,24 +166,24 @@ Mining.Blast.Radius.Increase=[[RED]]Incrementado Radio de Explosi\u00f3n: [[YELL
 Mining.Blast.Rank=[[RED]]Miner\u00eda Explosiva: [[YELLOW]] Rango {0}/8 [[GRAY]]({1})
 Mining.Blast.Other.On=[[GREEN]]\u00a1{0}[[DARK_GREEN]] us\u00f3 [[RED]]Miner\u00eda Explosiva!
 Mining.Blast.Refresh=[[GREEN]]\u00a1Tu habilidad de [[YELLOW]]Miner\u00eda Explosiva [[GREEN]]est\u00e1 refrescada!
-Repair.Effect.0=Reparaci\u00f3n
-Repair.Effect.1=Reparar Herramientas y Armaduras
-Repair.Effect.10=Reparar Oro (HABILIDAD {0}+)
-Repair.Effect.11=Reparar Herramientas y Armaduras de Oro
-Repair.Effect.12=Reparar Metal (HABILIDAD {0}+)
-Repair.Effect.13=Reparar Herramientas y Armaduras de Metal
-Repair.Effect.14=Reparar Piedra (HABILIDAD {0}+)
-Repair.Effect.15=Reparar Herramientas de Piedra
-Repair.Effect.2=Maestr\u00eda de la Reparaci\u00f3n
-Repair.Effect.3=Cantidad de reparaci\u00f3n Incrementada
-Repair.Effect.4=S\u00faper Reparaci\u00f3n
-Repair.Effect.5=Doble Efectividad
-Repair.Effect.6=Reparaci\u00f3n de Diamante ({0}+ SKILL)
-Repair.Effect.7=Reparar Herramientas y Armaduras de Diamante
-Repair.Effect.8=Forjado Arcano
-Repair.Effect.9=Reparar objetos m\u00e1gicos
-Repair.Effect.16=Rescatado ({0}+ HABILIDAD)
-Repair.Effect.17=[[DARK_RED]]Haz colocado un yunque, utiliza esto para reparar herramientas y armaduras.
+Repair.SubSkill.Repair.Name=Reparaci\u00f3n
+Repair.SubSkill.Repair.Description=Reparar Herramientas y Armaduras
+Repair.SubSkill.GoldRepair.Name=Reparar Oro (HABILIDAD {0}+)
+Repair.SubSkill.GoldRepair.Description=Reparar Herramientas y Armaduras de Oro
+Repair.SubSkill.IronRepair.Name=Reparar Metal (HABILIDAD {0}+)
+Repair.SubSkill.IronRepair.Description=Reparar Herramientas y Armaduras de Metal
+Repair.SubSkill.StoneRepair.Name=Reparar Piedra (HABILIDAD {0}+)
+Repair.SubSkill.StoneRepair.Description=Reparar Herramientas de Piedra
+Repair.SubSkill.RepairMastery.Name=Maestr\u00eda de la Reparaci\u00f3n
+Repair.SubSkill.RepairMastery.Description=Cantidad de reparaci\u00f3n Incrementada
+Repair.SubSkill.SuperRepair.Name=S\u00faper Reparaci\u00f3n
+Repair.SubSkill.SuperRepair.Description=Doble Efectividad
+Repair.SubSkill.DiamondRepair.Name=Reparaci\u00f3n de Diamante ({0}+ SKILL)
+Repair.SubSkill.DiamondRepair.Description=Reparar Herramientas y Armaduras de Diamante
+Repair.SubSkill.ArcaneForging.Name=Forjado Arcano
+Repair.SubSkill.ArcaneForging.Description=Reparar objetos m\u00e1gicos
+Repair.SubSkill.Salvage.Name=Rescatado ({0}+ HABILIDAD)
+Repair.SubSkill.Salvage.Description=[[DARK_RED]]Haz colocado un yunque, utiliza esto para reparar herramientas y armaduras.
 Repair.Error=[[DARK_RED]]mcMMO encontro un error al intentar reparar este objeto!
 Repair.Listener.Anvil=[[DARK_RED]]Has colocado un yunque y estos pueden usarse para reparar herramientas y armaduras.
 Repair.Listener.Anvil2=[[DARK_RED]]Tu colocaste un yunque de reparaci\u00f3n, utiliza esto para arreglar herramientas y armaduras.
@@ -224,14 +224,14 @@ Swords.Combat.Counter.Chance=[[RED]]Probabilidad de Contra Ataque: [[YELLOW]]{0}
 Swords.Combat.Counter.Hit=[[DARK_RED]]\u00a1Alcanzado por un contra ataque!
 Swords.Combat.Countered=[[GREEN]]**CONTRA-ATACADO**
 Swords.Combat.SS.Struck=[[DARK_RED]]\u00a1Golpeado por ATAQUE DENTADO!
-Swords.Effect.0=Contra Ataque
-Swords.Effect.1=Refleja {0} del da\u00f1o tomando mientras se bloquea
-Swords.Effect.2=Ataque Dentado (HABILIDAD)
-Swords.Effect.3={0} DMG AoE, Sangrado + AoE
+Swords.SubSkill.CounterAttack.Name=Contra Ataque
+Swords.SubSkill.CounterAttack.Description=Refleja {0} del da\u00f1o tomando mientras se bloquea
+Swords.SubSkill.SerratedStrikes.Name=Ataque Dentado (HABILIDAD)
+Swords.SubSkill.SerratedStrikes.Description={0} DMG AoE, Sangrado + AoE
 Swords.Effect.4=Ataque Dentado Sangriento+
 Swords.Effect.5={0} marca de sangrado
-Swords.Effect.6=Sangrado
-Swords.Effect.7=Aplicar sangrado que da\u00f1a con el tiempo
+Swords.SubSkill.Bleed.Name=Sangrado
+Swords.SubSkill.Bleed.Description=Aplicar sangrado que da\u00f1a con el tiempo
 Swords.Listener=Espadas:
 Swords.SkillName=ESPADAS
 Swords.Skills.SS.Off=[[RED]]**Ataque Dentado ha expirado**
@@ -260,27 +260,27 @@ Taming.Ability.Locked.3=Bloqueado hasta {0} + HABILIDAD (GARRAS AFILADAS)
 Taming.Ability.Locked.4=Bloqueado hasta {0} + HABILIDAD (SERVICIO DE COMIDA RAPIDA)
 Taming.Ability.Locked.5=Bloqueado hasta {0}+ HABILIDAD (SABUESO DIVINO)
 Taming.Combat.Chance.Gore=[[RED]]Probabilidad de Gore: [[YELLOW]]{0}
-Taming.Effect.0=Conocimiento de la Bestia
-Taming.Effect.1=Golpear con un hueso para inspeccionar los lobos y ocelotes
-Taming.Effect.10=A Prueba de Golpes
-Taming.Effect.11=Reducci\u00f3n de Da\u00f1o por Explosiones
-Taming.Effect.12=Llamado a la Naturaleza
-Taming.Effect.13=Convocar a un animal a tu lado
-Taming.Effect.14=[[GRAY]]TIP (Ocelote): Agacharse y hacer click izquierdo con {0} pescados en la mano
+Taming.SubSkill.BeastLore.Name=Conocimiento de la Bestia
+Taming.SubSkill.BeastLore.Description=Golpear con un hueso para inspeccionar los lobos y ocelotes
+Taming.SubSkill.ShockProof.Name=A Prueba de Golpes
+Taming.SubSkill.ShockProof.Description=Reducci\u00f3n de Da\u00f1o por Explosiones
+Taming.SubSkill.CallOfTheWild.Name=Llamado a la Naturaleza
+Taming.SubSkill.CallOfTheWild.Description=Convocar a un animal a tu lado
+Taming.SubSkill.CallOfTheWild.Description.2=[[GRAY]]TIP (Ocelote): Agacharse y hacer click izquierdo con {0} pescados en la mano
 Taming.Effect.15=[[GRAY]]TIP (Lobo): Agacharse y hacer click izquierdo con {0} huesos en la mano
-Taming.Effect.20=[[GRAY]] COTW (caballo): Agachate y haz clic con {0} manzanas en la mano
-Taming.Effect.16=Servicio de Comida R\u00e1pida
-Taming.Effect.17=Probabilidad de que los lobos se curen en ataque
-Taming.Effect.18=Sabueso divino
-Taming.Effect.19=Curado por magia y veneno
-Taming.Effect.2=Mordisco
-Taming.Effect.3=Golpe Cr\u00edtico que aplica Sangrado
-Taming.Effect.4=Garras Afiladas
-Taming.Effect.5=Da\u00f1o Bonus
-Taming.Effect.6=Consciente del Entorno
-Taming.Effect.7=Fobia al Cactus y a la Lava, Inmune al Da\u00f1o por Ca\u00eddas
-Taming.Effect.8=Piel Gruesa
-Taming.Effect.9=Da\u00f1o Reducido, Resistencia al Fuego
+Taming.SubSkill.Gore.Name0=[[GRAY]] COTW (caballo): Agachate y haz clic con {0} manzanas en la mano
+Taming.SubSkill.FastFoodService.Name=Servicio de Comida R\u00e1pida
+Taming.SubSkill.FastFoodService.Description=Probabilidad de que los lobos se curen en ataque
+Taming.SubSkill.HolyHound.Name=Sabueso divino
+Taming.SubSkill.HolyHound.Description=Curado por magia y veneno
+Taming.SubSkill.Gore.Name=Mordisco
+Taming.SubSkill.Gore.Description=Golpe Cr\u00edtico que aplica Sangrado
+Taming.SubSkill.SharpenedClaws.Name=Garras Afiladas
+Taming.SubSkill.SharpenedClaws.Description=Da\u00f1o Bonus
+Taming.SubSkill.EnvironmentallyAware.Name=Consciente del Entorno
+Taming.SubSkill.EnvironmentallyAware.Description=Fobia al Cactus y a la Lava, Inmune al Da\u00f1o por Ca\u00eddas
+Taming.SubSkill.ThickFur.Name=Piel Gruesa
+Taming.SubSkill.ThickFur.Description=Da\u00f1o Reducido, Resistencia al Fuego
 Taming.Listener.Wolf=[[DARK_GRAY]]T\u00fa lobo se escabulle hacia t\u00ed...
 Taming.Listener=Domador:
 Taming.SkillName=DOMADOR
@@ -300,16 +300,16 @@ Unarmed.Ability.IronGrip.Attacker=[[RED]] Tu oponente tiene agarre de hierro!
 Unarmed.Ability.IronGrip.Defender=[[GREEN]]Tu agarre de hierro te salvo de ser desarmado!
 Unarmed.Ability.Lower=[[GRAY]]**BAJAS TUS PU\u00d1OS**
 Unarmed.Ability.Ready=[[GREEN]]**LEVANTASTE LA GUARDIA**
-Unarmed.Effect.0=Enloquecido (HABILIDAD)
-Unarmed.Effect.1=+50% de Da\u00f1o, Rompe materiales d\u00e9biles
-Unarmed.Effect.2=Desarmar (Jugadores)
-Unarmed.Effect.3=Hace soltar el item que un enemigo lleva en la mano
-Unarmed.Effect.4=Estilo del Pu\u00f1o de Hierro
-Unarmed.Effect.5=Endurece su brazo con el tiempo
-Unarmed.Effect.6=Flecha Desviada
-Unarmed.Effect.7=Desviar flechas
-Unarmed.Effect.8=Agarre de hierro
-Unarmed.Effect.9=Te previene de ser desarmado
+Unarmed.SubSkill.Berserk.Name=Enloquecido (HABILIDAD)
+Unarmed.SubSkill.Berserk.Description=+50% de Da\u00f1o, Rompe materiales d\u00e9biles
+Unarmed.SubSkill.Disarm.Name=Desarmar (Jugadores)
+Unarmed.SubSkill.Disarm.Description=Hace soltar el item que un enemigo lleva en la mano
+Unarmed.SubSkill.IronArmStyle.Name=Estilo del Pu\u00f1o de Hierro
+Unarmed.SubSkill.IronArmStyle.Description=Endurece su brazo con el tiempo
+Unarmed.SubSkill.ArrowDeflect.Name=Flecha Desviada
+Unarmed.SubSkill.ArrowDeflect.Description=Desviar flechas
+Unarmed.SubSkill.IronGrip.Name=Agarre de hierro
+Unarmed.SubSkill.IronGrip.Description=Te previene de ser desarmado
 Unarmed.Listener=Desarmado:
 Unarmed.SkillName=DESARMADO
 Unarmed.Skills.Berserk.Off=[[RED]]**Enloquecido ha expirado**
@@ -323,12 +323,12 @@ Woodcutting.Ability.1=Remover hojas
 Woodcutting.Ability.Chance.DDrop=[[RED]]Probabilidad de Doble Drop: [[YELLOW]]{0}
 Woodcutting.Ability.Length=[[RED]]Duraci\u00f3n de Ca\u00edda de \u00c1rbol: [[YELLOW]]{0}seg
 Woodcutting.Ability.Locked.0=Bloqueado hasta {0} + HABILIDAD (soplador de hojas)
-Woodcutting.Effect.0=Ca\u00edda de \u00c1rbol (HABILIDAD)
-Woodcutting.Effect.1=Hace que el \u00e1rbol explote
-Woodcutting.Effect.2=Soplador de Hojas
-Woodcutting.Effect.3=Remover Hojas
-Woodcutting.Effect.4=Doble Drops
-Woodcutting.Effect.5=El doble del bot\u00edn normal
+Woodcutting.SubSkill.TreeFeller.Name=Ca\u00edda de \u00c1rbol (HABILIDAD)
+Woodcutting.SubSkill.TreeFeller.Description=Hace que el \u00e1rbol explote
+Woodcutting.SubSkill.LeafBlower.Name=Soplador de Hojas
+Woodcutting.SubSkill.LeafBlower.Description=Remover Hojas
+Woodcutting.SubSkill.HarvestLumber.Name=Doble Drops
+Woodcutting.SubSkill.HarvestLumber.Description=El doble del bot\u00edn normal
 Woodcutting.Listener=Le\u00f1ador:
 Woodcutting.SkillName=LE\u00d1ADOR
 Woodcutting.Skills.TreeFeller.Off=[[RED]]**Caida de \u00c1rbol ha expirado**

src/main/resources/locale/locale_et_EE.properties

@@ -1,30 +0,0 @@
-Acrobatics.Listener=Akrobaatika:
-Acrobatics.SkillName=AKROBAATIKA
-Acrobatics.Skillup=[[YELLOW]]Akrobaatika oskus kasvanud {0} v\u00f5rra. Kokku ({1})
-Archery.Skillup=[[YELLOW]]Vibunduse oskus kasvanud {0} v\u00f5rra. Kokku ({1})
-Mining.Ability.Lower=[[GRAY]]**TE LANGETASITE OMA KIRKA**
-Mining.Ability.Ready=[[GREEN]]**TE PANITE OMA KIRKA VALMIS**
-Mining.Listener=Kaevandamine:
-Mining.Skillup=[[YELLOW]]Kaevandamise oskus kasvanud {0} v\u00f5rra. Kokku ({1})
-Repair.Skills.AdeptDiamond=[[DARK_RED]]Te ei ole piisavalt kogenenud Teemanti parandamiseks.
-Repair.Skills.AdeptGold=[[DARK_RED]]Te ei ole piisavalt kogenenud Kulla parandamiseks.
-Repair.Skills.AdeptStone=[[DARK_RED]]Te ei ole piisavalt kogenenud Kivi parandamiseks.
-Repair.Skillup=[[YELLOW]]Parandamise oskus kasvanud {0} v\u00f5rra. Kokku ({1})
-Swords.Ability.Lower=[[GRAY]]**TE LANGETASITE OMA M\u00d5\u00d5GA**
-Swords.Ability.Ready=[[GREEN]]**TE SEADSITE OMA M\u00d5\u00d5GA VALMIS**
-Swords.Combat.Bleeding.Stopped=[[GRAY]]Veritsemine on [[GREEN]]peatunud[[GRAY]]!
-Taming.Skillup=[[YELLOW]]Taltsutamise oskus kasvanud {0} v\u00f5rra. Kokku ({1})
-Woodcutting.SkillName=PUURAIDUMINE
-Ability.Generic.Template=[[RED]]{0}: [[YELLOW]]{1}
-Commands.Disabled=[[RED]]See k\u00e4sk on keelatud.
-Commands.DoesNotExist=[[RED]]M\u00e4ngijat ei eksisteeri andmebaasis!
-Commands.Party.Kick=[[RED]]Teid visati peolt {0} v\u00e4lja!
-Commands.Party.Leave=[[RED]]Te lahkusite sellelt peolt
-Party.Teleport.Dead=[[RED]]Te ei saa teleporteerida surnud m\u00e4ngijani.
-Party.Unlocked=[[GRAY]]Pidu on lahti lukustatud
-Commands.XPGain.Excavation=Kaevamine ja varanduste leidmine
-Commands.XPGain.Mining=Kivi ja maavarade kaevandamine
-Commands.XPGain.Swords=Kollide r\u00fcndamine
-Effects.Effects=EFFEKTID
-Stats.Header.Combat=[[GOLD]]-=V\u00d5ITLUSOSKUSED=-
-Stats.Own.Stats=[[GREEN]][mcMMO] Statsika

src/main/resources/locale/locale_fi.properties

@@ -3,9 +3,9 @@ Acrobatics.Combat.Proc=[[GREEN]]**V\u00e4ist\u00f6liike**
 Acrobatics.Listener=Akrobatia:
 Acrobatics.SkillName=AKROBATIA
 Acrobatics.Skillup=[[YELLOW]]Akrobatian taito nousi {0} tasolla. Kokonaism\u00e4\u00e4r\u00e4 ({1})
-Archery.Effect.0=Taitolaukaus
-Archery.Effect.1=Parantaa jousien aiheuttamaa vahinkoa
-Archery.Effect.5=Mahdollisuus saada nuolia takaisin ruumiilta
+Archery.SubSkill.SkillShot.Name=Taitolaukaus
+Archery.SubSkill.SkillShot.Description=Parantaa jousien aiheuttamaa vahinkoa
+Archery.SubSkill.ArrowRetrieval.Description=Mahdollisuus saada nuolia takaisin ruumiilta
 Archery.Skillup=[[YELLOW]]Jousiammuntataito kehittyi {0} tasoa. Kokonaistaso: ({1})
 Axes.Ability.Lower=[[GRAY]]**LASKET KIRVEESI ALAS**
 Axes.Ability.Ready=[[GREEN]]**KOHOTAT KIRVEESI**
@@ -14,13 +14,13 @@ Axes.Combat.CriticalHit=[[RED]]KRIITTINEN OSUMA!
 Axes.Combat.GI.Proc=[[GREEN]]**OSUI SUURELLA VOIMALLA**
 Axes.Combat.GI.Struck=[[RED]]**OSUNUT SUUREMMALLA VOIMALLA**
 Axes.Combat.SS.Length=[[RED]]Kallon Halkaisun Pituus: [[YELLOW]]{0}s
-Axes.Effect.0=Kallonhalkaisija (Kyky)
-Axes.Effect.2=Kriittiset Iskut
-Axes.Effect.3=Kaksinkertainen Vahinko
-Axes.Effect.5=Lis\u00e4\u00e4 vahinkoa
-Axes.Effect.7=Ly\u00f6 panssarin rikkovalla voimalla
-Axes.Effect.8=Suurempi osumisvoima
-Axes.Effect.9=Tee enemm\u00e4n vahinkoa panssaroimattomiin vihollisiin
+Axes.SubSkill.SkullSplitter.Name=Kallonhalkaisija (Kyky)
+Axes.SubSkill.CriticalStrikes.Name=Kriittiset Iskut
+Axes.SubSkill.CriticalStrikes.Description=Kaksinkertainen Vahinko
+Axes.SubSkill.AxeMastery.Description=Lis\u00e4\u00e4 vahinkoa
+Axes.SubSkill.ArmorImpact.Description=Ly\u00f6 panssarin rikkovalla voimalla
+Axes.SubSkill.GreaterImpact.Name=Suurempi osumisvoima
+Axes.SubSkill.GreaterImpact.Description=Tee enemm\u00e4n vahinkoa panssaroimattomiin vihollisiin
 Axes.Listener=Kirveet:
 Axes.SkillName=KIRVEET
 Axes.Skills.SS.On=[[GREEN]]**Kallonhalkaisija AKTIVOITU**
@@ -29,12 +29,12 @@ Axes.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] on k\u00e4ytt\u00e4nyt [[RED]
 Axes.Skillup=[[YELLOW]]Akrobatian taito nousi {0} tasolla. Kokonaism\u00e4\u00e4r\u00e4 ({1})
 Excavation.Ability.Lower=[[GRAY]]**LASKET LAPIOSI ALAS**
 Excavation.Ability.Ready=[[GREEN]]**KOHOTAT LAPIOSI**
-Excavation.Effect.2=Aarteenmets\u00e4st\u00e4j\u00e4
+Excavation.SubSkill.TreasureHunter.Name=Aarteenmets\u00e4st\u00e4j\u00e4
 Excavation.Listener=Kaivuu:
 Excavation.SkillName=KAIVANTO
 Excavation.Skills.GigaDrillBreaker.On=[[GREEN]]**TEHO PORA HAJOITUS AKTIVOITU**
 Excavation.Skillup=[[YELLOW]]Kaivuu taito nousi  {0} tasolla. Kokonaism\u00e4\u00e4r\u00e4 ({1})
-Fishing.Effect.0=Aarteenmets\u00e4st\u00e4j\u00e4 (Passiivinen)
+Fishing.SubSkill.TreasureHunter.Name=Aarteenmets\u00e4st\u00e4j\u00e4 (Passiivinen)
 Fishing.Listener=Kalastus:
 Fishing.Ability.TH.MagicFound=[[GRAY]]You feel a touch of magic with this catch...
 Fishing.SkillName=KALASTUS
@@ -57,15 +57,15 @@ Mining.Skillup=[[YELLOW]]Louhimistaito kasvoi {0} tasolla. Kokonaism\u00e4\u00e4
 Mining.Blast.Boom=[[GRAY]]**BOOM**
 Mining.Blast.Radius.Increase=[[RED]]R\u00e4j\u00e4ytys Et\u00e4isyys Nousi: [[YELLOW]]+{0}
 Mining.Blast.Refresh=[[GREEN]]Sinun [[YELLOW] R\u00e4j\u00e4ht\u00e4v\u00e4 Kaivuu [[GREEN]]-kyky on uudelleenlatautunut!
-Repair.Effect.0=Korjaus
-Repair.Effect.2=Korjaus Mestaruus
-Repair.Effect.3=Korotettu korjaus taso
-Repair.Effect.4=Tehostettu Korjaus
-Repair.Effect.5=Kaksinkertainen tehokkuus
-Repair.Effect.6=Timantti Korjaus ({0}+ TAITO)
-Repair.Effect.7=Korjaa Timantti ty\u00f6kaluja & haarniskoita
-Repair.Effect.8=Mystinen Korjaus
-Repair.Effect.9=Korjaa lumottuja esineit\u00e4
+Repair.SubSkill.Repair.Name=Korjaus
+Repair.SubSkill.RepairMastery.Name=Korjaus Mestaruus
+Repair.SubSkill.RepairMastery.Description=Korotettu korjaus taso
+Repair.SubSkill.SuperRepair.Name=Tehostettu Korjaus
+Repair.SubSkill.SuperRepair.Description=Kaksinkertainen tehokkuus
+Repair.SubSkill.DiamondRepair.Name=Timantti Korjaus ({0}+ TAITO)
+Repair.SubSkill.DiamondRepair.Description=Korjaa Timantti ty\u00f6kaluja & haarniskoita
+Repair.SubSkill.ArcaneForging.Name=Mystinen Korjaus
+Repair.SubSkill.ArcaneForging.Description=Korjaa lumottuja esineit\u00e4
 Repair.Listener.Anvil=[[DARK_RED]]Olet asettanut alasimen paikalleen, voit korjata ty\u00f6kalusi ja haarniskasi sill\u00e4.
 Repair.Listener=Korjaus:
 Repair.SkillName=KORJAA
@@ -86,7 +86,7 @@ Swords.Combat.Bleeding.Stopped=[[GRAY]]Verenvuodatus on [[GREEN]]loppunut[[GRAY]
 Swords.Combat.Bleeding=[[GREEN]]**Vihollinen vuotaa verta**
 Swords.Combat.Countered=[[GREEN]]**VASTAISKU**
 Swords.Combat.SS.Struck=[[DARK_RED]]Sinua iskettiin SAHALAITA ISKULLA!
-Swords.Effect.0=Vastaisku
+Swords.SubSkill.CounterAttack.Name=Vastaisku
 Swords.Effect.4=Sahalaitaiset Iskut Verenvuoto+
 Swords.Listener=Miekkailu:
 Swords.Skills.SS.On=[[GREEN]]**SAHALAITAISET ISKUT AKTIVOITU**
@@ -96,13 +96,13 @@ Swords.SS.Length=[[RED]]Sahalaitaisten Iskujen kesto: [[YELLOW]]{0}s
 Taming.Ability.Bonus.1=Sudet v\u00e4ltt\u00e4v\u00e4t vaaraa
 Taming.Ability.Bonus.2=Paksu Turkki
 Taming.Ability.Bonus.6=Teroitetut Kynnet
-Taming.Effect.10=Shokin Kest\u00e4v\u00e4
-Taming.Effect.11=R\u00e4j\u00e4hdysvahingon v\u00e4hent\u00e4minen
-Taming.Effect.12=Er\u00e4maan Kutsu
-Taming.Effect.13=Kutsu el\u00e4in puolellesi
-Taming.Effect.16=Pikaruokapalvelu
-Taming.Effect.3=Kriittinen Isku joka saa aikaan Verenvuodon.
-Taming.Effect.8=Paksu Turkki
+Taming.SubSkill.ShockProof.Name=Shokin Kest\u00e4v\u00e4
+Taming.SubSkill.ShockProof.Description=R\u00e4j\u00e4hdysvahingon v\u00e4hent\u00e4minen
+Taming.SubSkill.CallOfTheWild.Name=Er\u00e4maan Kutsu
+Taming.SubSkill.CallOfTheWild.Description=Kutsu el\u00e4in puolellesi
+Taming.SubSkill.FastFoodService.Name=Pikaruokapalvelu
+Taming.SubSkill.Gore.Description=Kriittinen Isku joka saa aikaan Verenvuodon.
+Taming.SubSkill.ThickFur.Name=Paksu Turkki
 Taming.Listener.Wolf=[[DARK_GRAY]]Sutesi kipitt\u00e4\u00e4 takaisin luoksesi...
 Taming.Listener=Kesytt\u00e4minen:
 Taming.SkillName=KESYTT\u00c4MINEN
@@ -121,9 +121,9 @@ Unarmed.Skills.Berserk.Other.On=[[GREEN]]{0}[[DARK_GREEN]] on k\u00e4ytt\u00e4ny
 Woodcutting.Ability.0=Lehtipuhallin
 Woodcutting.Ability.1=Puhaltaa lehti\u00e4 pois
 Woodcutting.Ability.Length=[[RED]]Puunkaatajan kesto: [[YELLOW]]{0}s
-Woodcutting.Effect.0=Puunkaataja (KYKY)
-Woodcutting.Effect.1=Saa puut r\u00e4j\u00e4ht\u00e4m\u00e4\u00e4n
-Woodcutting.Effect.2=Lehtien Puhaltaja
+Woodcutting.SubSkill.TreeFeller.Name=Puunkaataja (KYKY)
+Woodcutting.SubSkill.TreeFeller.Description=Saa puut r\u00e4j\u00e4ht\u00e4m\u00e4\u00e4n
+Woodcutting.SubSkill.LeafBlower.Name=Lehtien Puhaltaja
 Woodcutting.Listener=Puunhakkuu:
 Woodcutting.SkillName=Puunhakkuu
 Woodcutting.Skills.TreeFeller.On=[[GREEN]]**PUUNKAATAJA AKTIVOITU**

src/main/resources/locale/locale_fr.properties

@@ -1,22 +1,22 @@
 Acrobatics.Ability.Proc=[[GREEN]]**Atterrissage gracieux**
 Acrobatics.Combat.Proc=[[GREEN]]**Esquiv\u00e9**
 Acrobatics.DodgeChance=[[RED]]Probabilit\u00e9 d\'esquive : [[YELLOW]]{0}
-Acrobatics.Effect.0=Roulade
-Acrobatics.Effect.1=R\u00e9duit ou annule les d\u00e9g\u00e2ts de chute
-Acrobatics.Effect.2=Roulade gracieuse
-Acrobatics.Effect.3=Deux fois plus efficace qu\'une roulade classique
-Acrobatics.Effect.4=Esquive
-Acrobatics.Effect.5=R\u00e9duit de moiti\u00e9 les d\u00e9g\u00e2ts re\u00e7us
+Acrobatics.SubSkill.Roll.Name=Roulade
+Acrobatics.SubSkill.Roll.Description=R\u00e9duit ou annule les d\u00e9g\u00e2ts de chute
+Acrobatics.SubSkill.GracefulRoll.Name=Roulade gracieuse
+Acrobatics.SubSkill.GracefulRoll.Description=Deux fois plus efficace qu\'une roulade classique
+Acrobatics.SubSkill.Dodge.Name=Esquive
+Acrobatics.SubSkill.Dodge.Description=R\u00e9duit de moiti\u00e9 les d\u00e9g\u00e2ts re\u00e7us
 Acrobatics.Listener=Acrobatie :
 Acrobatics.Roll.Chance=[[RED]]Probabilit\u00e9 de roulade : [[YELLOW]]{0}
 Acrobatics.Roll.GraceChance=[[RED]]Probabilit\u00e9 de roulade gracieuse : [[YELLOW]]{0}
 Acrobatics.Roll.Text=**ROULADE**
 Acrobatics.SkillName=ACROBATIE
 Acrobatics.Skillup=[[YELLOW]]Le talent Acrobatie augmente de {0}. Total ({1})
-Alchemy.Effect.0=Catalyse
-Alchemy.Effect.1=Augmente la vitesse de confection des potions
-Alchemy.Effect.2=Concoctions
-Alchemy.Effect.3=Confection des potions avec plus d\u2019ingr\u00e9dients
+Alchemy.SubSkill.Catalysis.Name=Catalyse
+Alchemy.SubSkill.Catalysis.Description=Augmente la vitesse de confection des potions
+Alchemy.SubSkill.Concoctions.Name=Concoctions
+Alchemy.SubSkill.Concoctions.Description=Confection des potions avec plus d\u2019ingr\u00e9dients
 Alchemy.Listener=Alchimie
 Alchemy.Ability.Locked.0=Bloqu\u00e9 jusqu\'\u00e0 {0}+ niveaux de talent (CATALYSE)
 Alchemy.Catalysis.Speed=[[RED]]Vitesse de confection des poitions : [[YELLOW]]{0}
@@ -27,12 +27,12 @@ Alchemy.Skillup=Le talent Alchimie augmente de {0}. Total ({1})
 Archery.Combat.DazeChance=[[RED]]Probabilit\u00e9 de d\u00e9sorienter : [[YELLOW]]{0}
 Archery.Combat.RetrieveChance=[[RED]]Probabilit\u00e9 de r\u00e9cup\u00e9rer des fl\u00e8ches : [[YELLOW]]{0}
 Archery.Combat.SkillshotBonus=[[RED]]Tir pr\u00e9cis, bonus de d\u00e9g\u00e2ts : [[YELLOW]]{0}
-Archery.Effect.0=Tir pr\u00e9cis
-Archery.Effect.1=Augmente les d\u00e9g\u00e2ts inflig\u00e9s
-Archery.Effect.2=[[RED]]Chance de d\u00e9sorienter : [[YELLOW]]{0}%
-Archery.Effect.3=D\u00e9soriente les adversaires en leur faisant {0} dommages
-Archery.Effect.4=R\u00e9cup\u00e9ration de fl\u00e8che
-Archery.Effect.5=Probabilit\u00e9 de r\u00e9cup\u00e9rer des fl\u00e8ches sur les corps
+Archery.SubSkill.SkillShot.Name=Tir pr\u00e9cis
+Archery.SubSkill.SkillShot.Description=Augmente les d\u00e9g\u00e2ts inflig\u00e9s
+Archery.SubSkill.Daze.Name=[[RED]]Chance de d\u00e9sorienter : [[YELLOW]]{0}%
+Archery.SubSkill.Daze.Description=D\u00e9soriente les adversaires en leur faisant {0} dommages
+Archery.SubSkill.ArrowRetrieval.Name=R\u00e9cup\u00e9ration de fl\u00e8che
+Archery.SubSkill.ArrowRetrieval.Description=Probabilit\u00e9 de r\u00e9cup\u00e9rer des fl\u00e8ches sur les corps
 Archery.Listener=Archerie :
 Archery.SkillName=ARCHERIE
 Archery.Skillup=[[YELLOW]]Le talent Archerie augmente de {0}. Total ({1})
@@ -51,16 +51,16 @@ Axes.Combat.GI.Proc=[[GREEN]]**FRAPP\u00c9 D\'UNE VIOLENTE INOU\u00cfE**
 Axes.Combat.GI.Struck=[[RED]]**TOUCH\u00c9 PAR UN IMPACT PUISSANT**
 Axes.Combat.SS.Struck=[[DARK_RED]]Bloqu\u00e9 par TRANCHE-CR\u00c2NE !
 Axes.Combat.SS.Length=[[RED]]Dur\u00e9e de Tranche-cr\u00e2ne : [[YELLOW]]{0}s
-Axes.Effect.0=Tranche-cr\u00e2ne (Comp\u00e9tence)
-Axes.Effect.1=Inflige des d\u00e9g\u00e2ts de zone
-Axes.Effect.2=Coup critique
-Axes.Effect.3=D\u00e9g\u00e2ts doubl\u00e9s
-Axes.Effect.4=Ma\u00eetrise des haches
-Axes.Effect.5=Ajoute des d\u00e9g\u00e2ts
-Axes.Effect.6=Impact
-Axes.Effect.7=Frappe avec suffisamment de force pour briser l\'armure
-Axes.Effect.8=Impact puissant
-Axes.Effect.9=Inflige des d\u00e9g\u00e2ts bonus aux ennemis sans armure
+Axes.SubSkill.SkullSplitter.Name=Tranche-cr\u00e2ne (Comp\u00e9tence)
+Axes.SubSkill.SkullSplitter.Description=Inflige des d\u00e9g\u00e2ts de zone
+Axes.SubSkill.CriticalStrikes.Name=Coup critique
+Axes.SubSkill.CriticalStrikes.Description=D\u00e9g\u00e2ts doubl\u00e9s
+Axes.SubSkill.AxeMastery.Name=Ma\u00eetrise des haches
+Axes.SubSkill.AxeMastery.Description=Ajoute des d\u00e9g\u00e2ts
+Axes.SubSkill.ArmorImpact.Name=Impact
+Axes.SubSkill.ArmorImpact.Description=Frappe avec suffisamment de force pour briser l\'armure
+Axes.SubSkill.GreaterImpact.Name=Impact puissant
+Axes.SubSkill.GreaterImpact.Description=Inflige des d\u00e9g\u00e2ts bonus aux ennemis sans armure
 Axes.Listener=Haches :
 Axes.SkillName=HACHES
 Axes.Skills.SS.Off=[[RED]]**Tranche-cr\u00e2ne est termin\u00e9**
@@ -75,10 +75,10 @@ Axes.Ability.Bonus.0=Ma\u00eetrise des haches
 
 Excavation.Ability.Lower=[[GRAY]]**VOUS ABAISSEZ VOTRE PELLE**
 Excavation.Ability.Ready=[[GREEN]]**VOUS LEVEZ VOTRE PELLE**
-Excavation.Effect.0=Foreur (Comp\u00e9tence)
-Excavation.Effect.1=Drops x3, XP x3, plus rapide
-Excavation.Effect.2=Chasseur de tr\u00e9sors
-Excavation.Effect.3=Capacit\u00e9 \u00e0 d\u00e9terrer des tr\u00e9sors
+Excavation.SubSkill.GigaDrillBreaker.Name=Foreur (Comp\u00e9tence)
+Excavation.SubSkill.GigaDrillBreaker.Description=Drops x3, XP x3, plus rapide
+Excavation.SubSkill.TreasureHunter.Name=Chasseur de tr\u00e9sors
+Excavation.SubSkill.TreasureHunter.Description=Capacit\u00e9 \u00e0 d\u00e9terrer des tr\u00e9sors
 Excavation.Effect.Length=[[RED]]Dur\u00e9e de Foreur : [[YELLOW]]{0}s
 Excavation.Listener=Excavation:
 Excavation.SkillName=EXCAVATION
@@ -99,18 +99,18 @@ Fishing.Ability.TH.MagicRate=[[RED]]Chasse magique: [[YELLOW]]{0}
 Fishing.Ability.Shake=[[RED]]Chance d\'esquive : [[YELLOW]]{0}
 Fishing.Ability.IceFishing=[[RED]]P\u00eache sur Glace: Allez p\u00eacher sur de la glace
 Fishing.Ability.FD=[[RED]]R\u00e9gime de p\u00e9cheur: [[YELLOW]]Classement {0}
-Fishing.Effect.0=Chasseur de tr\u00e9sors
-Fishing.Effect.1=Remonte des objets inhabituels
-Fishing.Effect.2=P\u00eache magique
-Fishing.Effect.3=Remonte des objets magiques
-Fishing.Effect.4=Secousse (sur monstres)
-Fishing.Effect.5=Fait tomber des objets des monstres avec une canne \u00e0 p\u00eache
-Fishing.Effect.6=R\u00e9gime de fermier
-Fishing.Effect.7=Am\u00e9liore la nutrition des produits de la ferme
-Fishing.Effect.8=Ma\u00eetre P\u00eacheur
-Fishing.Effect.9=Augmente les chances que \u00e7a morde lors de la p\u00eache
-Fishing.Effect.10=P\u00eache sur Glace
-Fishing.Effect.11=Vous permet de p\u00eacher dans les biomes glac\u00e9s
+Fishing.SubSkill.TreasureHunter.Name=Chasseur de tr\u00e9sors
+Fishing.SubSkill.TreasureHunter.Description=Remonte des objets inhabituels
+Fishing.SubSkill.MagicHunter.Name=P\u00eache magique
+Fishing.SubSkill.MagicHunter.Description=Remonte des objets magiques
+Fishing.SubSkill.Shake.Name=Secousse (sur monstres)
+Fishing.SubSkill.Shake.Description=Fait tomber des objets des monstres avec une canne \u00e0 p\u00eache
+Fishing.SubSkill.FishermansDiet.Name=R\u00e9gime de fermier
+Fishing.SubSkill.FishermansDiet.Description=Am\u00e9liore la nutrition des produits de la ferme
+Fishing.SubSkill.MasterAngler.Name=Ma\u00eetre P\u00eacheur
+Fishing.SubSkill.MasterAngler.Description=Augmente les chances que \u00e7a morde lors de la p\u00eache
+Fishing.SubSkill.IceFishing.Name=P\u00eache sur Glace
+Fishing.SubSkill.IceFishing.Description=Vous permet de p\u00eacher dans les biomes glac\u00e9s
 Fishing.Chance.Raining=[[BLUE]] Bonus de pluie
 Fishing.Listener=P\u00eache :
 Fishing.Ability.TH.MagicFound=[[GRAY]]Vous ressentez quelque chose de magique dans cette prise...
@@ -131,20 +131,20 @@ Herbalism.Ability.Lower=[[GRAY]]**VOUS ABAISSEZ VOTRE HOUE**
 Herbalism.Ability.Ready=[[GREEN]]**VOUS LEVEZ VOTRE HOUE**
 Herbalism.Ability.ShroomThumb.Chance=[[RED]]Doigts \u00e0 Champignons, Chance: [[YELLOW]]{0}
 Herbalism.Ability.ShroomThumb.Fail=[[RED]]**DOIGTS VERTS \u00c9CHOU\u00c9**
-Herbalism.Effect.0=Main verte (Comp\u00e9tence)
-Herbalism.Effect.1=Propage les plantes / triple drops
-Herbalism.Effect.2=Mains Vertes (Bl\u00e9)
-Herbalism.Effect.3=Plantation automatique apres recolte du champ
+Herbalism.SubSkill.GreenTerra.Name=Main verte (Comp\u00e9tence)
+Herbalism.SubSkill.GreenTerra.Description=Propage les plantes / triple drops
+Herbalism.SubSkill.GreenThumb.Name=Mains Vertes (Bl\u00e9)
+Herbalism.SubSkill.GreenThumb.Description=Plantation automatique apres recolte du champ
 Herbalism.Effect.4=Mains Vertes (Blocs)
-Herbalism.Effect.5=Faire des briques avec mousse ou faire pousser l\'herbe
-Herbalism.Effect.6=R\u00e9gime de fermier
-Herbalism.Effect.7=Am\u00e9liore la nutrition des produits de la ferme
-Herbalism.Effect.8=Double drops
-Herbalism.Effect.9=Double la quantit\u00e9 r\u00e9colt\u00e9e
-Herbalism.Effect.10=Chance d\'Hylian
-Herbalism.Effect.11=Donne une petite chance de trouver de rares objets
-Herbalism.Effect.12=Doigts \u00e0 Champignons
-Herbalism.Effect.13=Etend le mycelium sur la terre et l\'herbe
+Herbalism.SubSkill.GreenThumb.Description.2=Faire des briques avec mousse ou faire pousser l\'herbe
+Herbalism.SubSkill.FarmersDiet.Name=R\u00e9gime de fermier
+Herbalism.SubSkill.FarmersDiet.Description=Am\u00e9liore la nutrition des produits de la ferme
+Herbalism.SubSkill.DoubleDrops.Name=Double drops
+Herbalism.SubSkill.DoubleDrops.Description=Double la quantit\u00e9 r\u00e9colt\u00e9e
+Herbalism.SubSkill.HylianLuck.Name=Chance d\'Hylian
+Herbalism.SubSkill.HylianLuck.Description=Donne une petite chance de trouver de rares objets
+Herbalism.SubSkill.ShroomThumb.Name=Doigts \u00e0 Champignons
+Herbalism.SubSkill.ShroomThumb.Description=Etend le mycelium sur la terre et l\'herbe
 Herbalism.HylianLuck=[[GREEN]]la chance d\'Hyrule est avec vous aujourd\'hui !
 Herbalism.Listener=Herboristerie :
 Herbalism.SkillName=HERBORISTERIE
@@ -160,16 +160,16 @@ Mining.Ability.Locked.1=Bloqu\u00e9 jusqu\'\u00e0 {0}+ niveau(x) (Grosses Explos
 Mining.Ability.Locked.2=Bloqu\u00e9 jusqu\'\u00e0 {0}+ niveau(x) (Expert en d\u00e9molition)
 Mining.Ability.Lower=[[GRAY]]**VOUS ABAISSEZ VOTRE PIOCHE**
 Mining.Ability.Ready=[[GREEN]]**VOUS LEVEZ VOTRE PIOCHE**
-Mining.Effect.0=Broyeur (Comp\u00e9tence)
-Mining.Effect.1=Plus rapide, chance de triple drops
-Mining.Effect.2=Double drops
-Mining.Effect.3=Double la quantit\u00e9 r\u00e9colt\u00e9e
-Mining.Effect.4=Minage explosif
-Mining.Effect.5=Bonus au minage \u00e0 l\'explosif
-Mining.Effect.6=Grosses explosions
-Mining.Effect.7=Augmente le rayon d\'explosion de la TNT
-Mining.Effect.8=Expert en d\u00e9molition
-Mining.Effect.9=R\u00e9duit les d\u00e9g\u00e2ts provenant de la TNT
+Mining.SubSkill.SuperBreaker.Name=Broyeur (Comp\u00e9tence)
+Mining.SubSkill.SuperBreaker.Description=Plus rapide, chance de triple drops
+Mining.SubSkill.DoubleDrops.Name=Double drops
+Mining.SubSkill.DoubleDrops.Description=Double la quantit\u00e9 r\u00e9colt\u00e9e
+Mining.SubSkill.BlastMining.Name=Minage explosif
+Mining.SubSkill.BlastMining.Description=Bonus au minage \u00e0 l\'explosif
+Mining.SubSkill.BiggerBombs.Name=Grosses explosions
+Mining.SubSkill.BiggerBombs.Description=Augmente le rayon d\'explosion de la TNT
+Mining.SubSkill.DemolitionsExpertise.Name=Expert en d\u00e9molition
+Mining.SubSkill.DemolitionsExpertise.Description=R\u00e9duit les d\u00e9g\u00e2ts provenant de la TNT
 Mining.Effect.Decrease=[[RED]]Baisse de l\'expertise en d\u00e9molition: [[YELLOW]]{0}
 Mining.Effect.DropChance=[[RED]]Double Drop: [[YELLOW]]{0}
 Mining.Listener=Minage :
@@ -186,22 +186,22 @@ Mining.Blast.Radius.Increase=[[RED]]Rayon d\'explosion : [[YELLOW]]+{0}
 Mining.Blast.Rank=[[RED]]Minage explosif : [[YELLOW]]Rang {0}/8 [[GRAY]]({1})
 Mining.Blast.Other.On=[[GREEN]]{0}[[DARK_GREEN]] a utilis\u00e9 [[RED]]Minage explosif !
 Mining.Blast.Refresh=[[GREEN]]Votre capacit\u00e9 [[YELLOW]]Minage Explosif[[GREEN]] est pr\u00eate !
-Repair.Effect.0=R\u00e9paration
-Repair.Effect.1=R\u00e9parer Outils & Armures
-Repair.Effect.10=R\u00e9paration d\'Or ({0}+ SKILL)
-Repair.Effect.11=R\u00e9parer Outils & Armures en Or
-Repair.Effect.12=R\u00e9paration en Fer ({0}+ SKILL)
-Repair.Effect.13=R\u00e9paration Outils & Armures en Fer
-Repair.Effect.14=R\u00e9paration en Pierre ({0}+ SKILL)
-Repair.Effect.15=R\u00e9parer Outils en Pierre
-Repair.Effect.2=Ma\u00eetrise de la forge
-Repair.Effect.3=Am\u00e9liore la r\u00e9paration
-Repair.Effect.4=Superbe r\u00e9paration
-Repair.Effect.5=Double l\'efficacit\u00e9
-Repair.Effect.6=R\u00e9paration du diamant (talent {0}+)
-Repair.Effect.7=R\u00e9pare les outils et armures en diamant
-Repair.Effect.8=Forge arcanique
-Repair.Effect.9=R\u00e9pare les objets magiques
+Repair.SubSkill.Repair.Name=R\u00e9paration
+Repair.SubSkill.Repair.Description=R\u00e9parer Outils & Armures
+Repair.SubSkill.GoldRepair.Name=R\u00e9paration d\'Or ({0}+ SKILL)
+Repair.SubSkill.GoldRepair.Description=R\u00e9parer Outils & Armures en Or
+Repair.SubSkill.IronRepair.Name=R\u00e9paration en Fer ({0}+ SKILL)
+Repair.SubSkill.IronRepair.Description=R\u00e9paration Outils & Armures en Fer
+Repair.SubSkill.StoneRepair.Name=R\u00e9paration en Pierre ({0}+ SKILL)
+Repair.SubSkill.StoneRepair.Description=R\u00e9parer Outils en Pierre
+Repair.SubSkill.RepairMastery.Name=Ma\u00eetrise de la forge
+Repair.SubSkill.RepairMastery.Description=Am\u00e9liore la r\u00e9paration
+Repair.SubSkill.SuperRepair.Name=Superbe r\u00e9paration
+Repair.SubSkill.SuperRepair.Description=Double l\'efficacit\u00e9
+Repair.SubSkill.DiamondRepair.Name=R\u00e9paration du diamant (talent {0}+)
+Repair.SubSkill.DiamondRepair.Description=R\u00e9pare les outils et armures en diamant
+Repair.SubSkill.ArcaneForging.Name=Forge arcanique
+Repair.SubSkill.ArcaneForging.Description=R\u00e9pare les objets magiques
 Repair.Error=[[DARK_RED]]McMMO a rencontr\u00e9 une erreur en essayant de r\u00e9parer cet objet !
 Repair.Listener.Anvil=[[DARK_RED]]Vous venez de poser une enclume, elle peut \u00eatre utilis\u00e9e pour r\u00e9parer votre \u00e9quipement.
 Repair.Listener.Anvil2=[[DARK_RED]]Tu as plac\u00e9 une enclume sauvage, utilises la pour r\u00e9parer les outils et armures sauvages.
@@ -227,10 +227,10 @@ Repair.Arcane.Lost=[[RED]]Vous n\'\u00e9tiez pas suffisamment comp\u00e9tent pou
 Repair.Arcane.Perfect=[[GREEN]]Vous avez pr\u00e9serv\u00e9 les \u00e9nergies arcaniques de cet objet.
 Repair.Arcane.Rank=[[RED]]Forge arcanique : [[YELLOW]]Rang {0}/4
 Salvage.Pretty.Name=Recyclage
-Salvage.Effect.0=Recyclage Avanc\u00e9
-Salvage.Effect.1=Recyclage des objets endommag\u00e9s
-Salvage.Effect.2=Recyclage Arcanique
-Salvage.Effect.3=Extrait les enchantements des objets
+Salvage.SubSkill.AdvancedSalvage.Name=Recyclage Avanc\u00e9
+Salvage.SubSkill.AdvancedSalvage.Description=Recyclage des objets endommag\u00e9s
+Salvage.SubSkill.ArcaneSalvaging.Name=Recyclage Arcanique
+Salvage.SubSkill.ArcaneSalvaging.Description=Extrait les enchantements des objets
 Salvage.Ability.Locked.0=Bloqu\u00e9 jusqu\'\u00e0 {0}+ niveau(x) du talent (Recyclage Avanc\u00e9)
 Salvage.Ability.Bonus.0=Recyclage Avanc\u00e9
 Salvage.Ability.Bonus.1=Rendement maximal {0} objet(s) d\u00e9truit(s)
@@ -259,14 +259,14 @@ Swords.Combat.Counter.Chance=[[RED]]Chance de Contre Attaque: [[YELLOW]]{0}
 Swords.Combat.Counter.Hit=[[DARK_RED]]Touch\u00e9 par une contre-attaque !
 Swords.Combat.Countered=[[GREEN]]**CONTRE-ATTAQUE**
 Swords.Combat.SS.Struck=[[DARK_RED]]Frapp\u00e9 par ATTAQUE D\u00c9CHIRANTE !
-Swords.Effect.0=Contre-attaque
-Swords.Effect.1=Renvoie {0} des dommages pris en bloquant
-Swords.Effect.2=Attaque D\u00e9chirante (Capacit\u00e9)
-Swords.Effect.3={0} DMG AoE, Saignement+ AoE
+Swords.SubSkill.CounterAttack.Name=Contre-attaque
+Swords.SubSkill.CounterAttack.Description=Renvoie {0} des dommages pris en bloquant
+Swords.SubSkill.SerratedStrikes.Name=Attaque D\u00e9chirante (Capacit\u00e9)
+Swords.SubSkill.SerratedStrikes.Description={0} DMG AoE, Saignement+ AoE
 Swords.Effect.4=Saignement d\'Attaque d\u00e9chirante
 Swords.Effect.5={0} Intervale entre les saignements
-Swords.Effect.6=Saignement
-Swords.Effect.7=Applique un saignement
+Swords.SubSkill.Bleed.Name=Saignement
+Swords.SubSkill.Bleed.Description=Applique un saignement
 Swords.Listener=\u00c9p\u00e9es :
 Swords.SkillName=\u00c9P\u00c9ES
 Swords.Skills.SS.Off=[[RED]]**Votre comp\u00e9tence Attaque d\u00e9chirante est termin\u00e9e**
@@ -297,27 +297,27 @@ Taming.Ability.Locked.5=Bloqu\u00e9 jusqu\'\u00e0 {0}+ niveaux du talent (Super
 Taming.Ability.Lower=[[GRAY]]**VOS LOUPS SE METTENT EN RETRAIT**
 Taming.Ability.Ready=[[GRAY]]**VOUS PREPAREZ VOS LOUPS**
 Taming.Combat.Chance.Gore=[[RED]]Chance Gore: [[YELLOW]]{0}
-Taming.Effect.0=Connaissances des b\u00eates
-Taming.Effect.1=Bone-whacking inspects wolves & ocelots
-Taming.Effect.10=R\u00e9sistance aux chocs
-Taming.Effect.11=R\u00e9duction des d\u00e9g\u00e2ts explosifs
-Taming.Effect.12=Appel de la nature
-Taming.Effect.13=Appelle un animal \u00e0 vos c\u00f4t\u00e9s
-Taming.Effect.14=[[GRAY]]COTW: Accroupissez vous et faites un clic-gauche avec\n{0} {1} (Ocelot), {2} {3} (Loup), {4} {5} (Cheval)
-Taming.Effect.16=Fast food
-Taming.Effect.17=Probabilit\u00e9 de voler la vie en attaquant
-Taming.Effect.18=Super chien de chasse
-Taming.Effect.19=Soign\u00e9 par la Magie et le Poison
-Taming.Effect.2=Morsure
-Taming.Effect.3=Coup critique faisant saigner
-Taming.Effect.4=Griffes ac\u00e9r\u00e9es
-Taming.Effect.5=Bonus aux d\u00e9g\u00e2ts
-Taming.Effect.6=Attentif \u00e0 l\'environnement
-Taming.Effect.7=Phobie des cactus et de la lave, immunis\u00e9 aux chutes
-Taming.Effect.8=Fourrure \u00e9paisse
-Taming.Effect.9=R\u00e9duction de d\u00e9g\u00e2t, r\u00e9sistance au feu
-Taming.Effect.20=Charge (Abilit\u00e9)
-Taming.Effect.21=Ennemi cible, Rapidit\u00e9 de Loup++
+Taming.SubSkill.BeastLore.Name=Connaissances des b\u00eates
+Taming.SubSkill.BeastLore.Description=Bone-whacking inspects wolves & ocelots
+Taming.SubSkill.ShockProof.Name=R\u00e9sistance aux chocs
+Taming.SubSkill.ShockProof.Description=R\u00e9duction des d\u00e9g\u00e2ts explosifs
+Taming.SubSkill.CallOfTheWild.Name=Appel de la nature
+Taming.SubSkill.CallOfTheWild.Description=Appelle un animal \u00e0 vos c\u00f4t\u00e9s
+Taming.SubSkill.CallOfTheWild.Description.2=[[GRAY]]COTW: Accroupissez vous et faites un clic-gauche avec\n{0} {1} (Ocelot), {2} {3} (Loup), {4} {5} (Cheval)
+Taming.SubSkill.FastFoodService.Name=Fast food
+Taming.SubSkill.FastFoodService.Description=Probabilit\u00e9 de voler la vie en attaquant
+Taming.SubSkill.HolyHound.Name=Super chien de chasse
+Taming.SubSkill.HolyHound.Description=Soign\u00e9 par la Magie et le Poison
+Taming.SubSkill.Gore.Name=Morsure
+Taming.SubSkill.Gore.Description=Coup critique faisant saigner
+Taming.SubSkill.SharpenedClaws.Name=Griffes ac\u00e9r\u00e9es
+Taming.SubSkill.SharpenedClaws.Description=Bonus aux d\u00e9g\u00e2ts
+Taming.SubSkill.EnvironmentallyAware.Name=Attentif \u00e0 l\'environnement
+Taming.SubSkill.EnvironmentallyAware.Description=Phobie des cactus et de la lave, immunis\u00e9 aux chutes
+Taming.SubSkill.ThickFur.Name=Fourrure \u00e9paisse
+Taming.SubSkill.ThickFur.Description=R\u00e9duction de d\u00e9g\u00e2t, r\u00e9sistance au feu
+Taming.SubSkill.Gore.Name0=Charge (Abilit\u00e9)
+Taming.SubSkill.Gore.Name1=Ennemi cible, Rapidit\u00e9 de Loup++
 Taming.Listener.Wolf=[[DARK_GRAY]]Votre loup se pr\u00e9cipite \u00e0 vos c\u00f4t\u00e9s...
 Taming.Listener=Apprivoisement :
 Taming.SkillName=APPRIVOISEMENT
@@ -346,16 +346,16 @@ Unarmed.Ability.IronGrip.Attacker=[[RED]]Votre adversaire a une poigne de fer !
 Unarmed.Ability.IronGrip.Defender=Votre poigne de fer vous a emp\u00each\u00e9 d\'\u00eatre d\u00e9sarm\u00e9 !
 Unarmed.Ability.Lower=[[GRAY]]**VOUS ABAISSEZ VOS POINGS**
 Unarmed.Ability.Ready=[[GREEN]]**VOUS LEVEZ VOS POINGS**
-Unarmed.Effect.0=Berserk (Comp\u00e9tence)
-Unarmed.Effect.1=+50% de d\u00e9g\u00e2ts, casse les mat\u00e9riaux souples
-Unarmed.Effect.2=D\u00e9sarmement (sur joueurs)
-Unarmed.Effect.3=Fait tomber l\'arme des ennemis
-Unarmed.Effect.4=Poings de fer
-Unarmed.Effect.5=Durcit vos poings au fil du temps
-Unarmed.Effect.6=D\u00e9viation de fl\u00e8che
-Unarmed.Effect.7=D\u00e9vie les fl\u00e8ches
-Unarmed.Effect.8=Poigne de Fer
-Unarmed.Effect.9=Vous emp\u00eache d\'\u00eatre d\u00e9sarm\u00e9
+Unarmed.SubSkill.Berserk.Name=Berserk (Comp\u00e9tence)
+Unarmed.SubSkill.Berserk.Description=+50% de d\u00e9g\u00e2ts, casse les mat\u00e9riaux souples
+Unarmed.SubSkill.Disarm.Name=D\u00e9sarmement (sur joueurs)
+Unarmed.SubSkill.Disarm.Description=Fait tomber l\'arme des ennemis
+Unarmed.SubSkill.IronArmStyle.Name=Poings de fer
+Unarmed.SubSkill.IronArmStyle.Description=Durcit vos poings au fil du temps
+Unarmed.SubSkill.ArrowDeflect.Name=D\u00e9viation de fl\u00e8che
+Unarmed.SubSkill.ArrowDeflect.Description=D\u00e9vie les fl\u00e8ches
+Unarmed.SubSkill.IronGrip.Name=Poigne de Fer
+Unarmed.SubSkill.IronGrip.Description=Vous emp\u00eache d\'\u00eatre d\u00e9sarm\u00e9
 Unarmed.Listener=Poings :
 Unarmed.SkillName=POINGS
 Unarmed.Skills.Berserk.Off=[[RED]]**Votre capacit\u00e9 Furie est termin\u00e9e**
@@ -369,12 +369,12 @@ Woodcutting.Ability.1=Souffle les feuilles
 Woodcutting.Ability.Chance.DDrop=[[RED]]Double Drop: [[YELLOW]]{0}
 Woodcutting.Ability.Length=[[RED]]Dur\u00e9e d\'Abbateur : [[YELLOW]]{0}s
 Woodcutting.Ability.Locked.0=Bloqu\u00e9 jusqu\'\u00e0 {0}+ niveaux du talent (EXPLOSEUR DE FEUILLES)
-Woodcutting.Effect.0=Abatteur (Comp\u00e9tence)
-Woodcutting.Effect.1=Fait exploser les arbres
-Woodcutting.Effect.2=Soufflage
-Woodcutting.Effect.3=Souffle les feuilles
-Woodcutting.Effect.4=Double drops
-Woodcutting.Effect.5=Double la quantit\u00e9 r\u00e9colt\u00e9e
+Woodcutting.SubSkill.TreeFeller.Name=Abatteur (Comp\u00e9tence)
+Woodcutting.SubSkill.TreeFeller.Description=Fait exploser les arbres
+Woodcutting.SubSkill.LeafBlower.Name=Soufflage
+Woodcutting.SubSkill.LeafBlower.Description=Souffle les feuilles
+Woodcutting.SubSkill.HarvestLumber.Name=Double drops
+Woodcutting.SubSkill.HarvestLumber.Description=Double la quantit\u00e9 r\u00e9colt\u00e9e
 Woodcutting.Listener=B\u00fbcheronnage :
 Woodcutting.SkillName=B\u00dbCHERONNAGE
 Woodcutting.Skills.TreeFeller.Off=[[RED]]**Votre comp\u00e9tence Abatteur est termin\u00e9e**

src/main/resources/locale/locale_hr_HR.properties

@@ -1,21 +0,0 @@
-Acrobatics.Combat.Proc=[[GREEN]]**ODBIJEN**
-Acrobatics.SkillName=AKROBATIKA
-Axes.Effect.3=Dupla Steta
-Axes.SkillName=SIKIRE
-Herbalism.Listener=Herbalism:
-Mining.Ability.Ready=[[GREEN]]**TI SI PRIPREMIO SVOJ KRAMP**
-Mining.Skillup=[[YELLOW]]Mining Skil Povecan Na  {0}. Totalno ({1})
-Repair.Effect.0=Popravka
-Repair.Effect.4=Super Poravka
-Repair.SkillName=POPRAVI
-Repair.Arcane.Fail=[[RED]]Arcane Snage Su Napustile Item.
-Swords.Combat.Bleeding.Stopped=[[GRAY]]Krvarenje je [[GREEN]]prestalo[[GRAY]]!
-Ability.Generic.Template=[[RED]]{0}: [[YELLOW]]{1}
-Combat.TouchedFuzzy=[[DARK_RED]]Dodirnuo Fuzzy.Osjetio Fuzzy.
-Commands.Party.Kick=[[RED]]Ti Si Bio Izbacen Iz Partyja{0}!
-Party.Unlocked=[[GRAY]]Party je otkljucan
-Commands.XPGain.Mining=Kopanje Kamena & Rude
-Commands.XPGain.Taming=Pripitomljavanje Zivotinja, Ili Bitka w/ sa tvojim vukovima
-Commands.XPGain=[[DARK_GRAY]]XP DOBIVENO: [[WHITE]]{0}
-Effects.Effects=EFFEKTI
-Stats.Header.Combat=[[GOLD]]-=BORBENO ISKUSTVO=-

src/main/resources/locale/locale_hu_HU.properties

@@ -10,8 +10,8 @@ Axes.Ability.Bonus.0=Mesteri balta
 Axes.Ability.Lower=[[GRAY]]**LETETTED A BALT\u00c1DAT**
 Axes.Ability.Ready=[[GREEN]]**ELK\u00c9SZ\u00cdTETTED BALT\u00c1DAT**
 Axes.Combat.GI.Struck=[[RED]]**HATALMAS EREJ\u0170 \u00dcT\u00c9S**
-Axes.Effect.3=Dupla sebz\u00e9s
-Axes.Effect.4=Mesteri balta
+Axes.SubSkill.CriticalStrikes.Description=Dupla sebz\u00e9s
+Axes.SubSkill.AxeMastery.Name=Mesteri balta
 Axes.Listener=Balt\u00e1k:
 Axes.SkillName=BALT\u00c1K
 Axes.Skills.SS.On=[[GREEN]]**Koponya T\u00f6r\u0151 AKTIV\u00c1LVA**
@@ -23,7 +23,7 @@ Excavation.SkillName=\u00c1S\u00c1S
 Excavation.Skills.GigaDrillBreaker.Refresh=[[GREEN]]A TE [[YELLOW]]Giga B\u00e1ny\u00e1sz B\u00e1ny\u00e1sz Cs\u00e1k\u00e1ny [[GREEN]]k\u00e9pesseged friss\u00fclt!
 Excavation.Skills.GigaDrillBreaker.Other.On=[[GREEN]]{0}[[DARK_GREEN]] haszn\u00e1latban [[RED]]Giga B\u00e1ny\u00e1sz Cs\u00e1k\u00e1ny!
 Excavation.Skillup=[[YELLOW]]\u00c1s\u00e1s fejl\u0151d\u00f6tt {0} szinttel. \u00d6sszesen: ({1})
-Fishing.Effect.10=J\u00e9g Horg\u00e1szat
+Fishing.SubSkill.IceFishing.Name=J\u00e9g Horg\u00e1szat
 Fishing.Listener=Horg\u00e1szat:
 Fishing.SkillName=HORG\u00c1SZAT
 Herbalism.Ability.Lower=[[GRAY]]**LETETTED A KAP\u00c1DAT**
@@ -39,15 +39,15 @@ Mining.SkillName=B\u00c1NY\u00c1SZ\u00c1S
 Mining.Skills.SuperBreaker.Refresh=[[GREEN]]A [[YELLOW]] Szuper Z\u00faz\u00f3 [[GREEN]]k\u00e9pess\u00e9ged \u00fajra haszn\u00e1lhat\u00f3!
 Mining.Skillup=[[YELLOW]]B\u00e1ny\u00e1szat fejl\u0151d\u00f6tt {0} szinttel. \u00d6sszesen: ({1})
 Mining.Blast.Refresh=[[GREEN]]A [[YELLOW]]Robban\u00f3 B\u00e1ny\u00e1szat [[GREEN]]k\u00e9pess\u00e9ged \u00fajra el\u00e9rhet\u0151!
-Repair.Effect.0=Jav\u00edt\u00e1s
-Repair.Effect.1=Eszk\u00f6z\u00f6k \u00e9s felszerel\u00e9sek jav\u00edt\u00e1sa
-Repair.Effect.11= Arany eszk\u00f6z\u00f6k \u00e9s felszerel\u00e9sek jav\u00edt\u00e1sa
-Repair.Effect.13= Vas eszk\u00f6z\u00f6k \u00e9s felszerel\u00e9sek jav\u00edt\u00e1sa
-Repair.Effect.15=K\u0151 eszk\u00f6z\u00f6k jav\u00edt\u00e1sa
-Repair.Effect.2=Jav\u00edt\u00f3 mester
-Repair.Effect.4=Szuper jav\u00edt\u00e1s
-Repair.Effect.7= Gy\u00e9m\u00e1nt eszk\u00f6z\u00f6k \u00e9s felszerel\u00e9sek jav\u00edt\u00e1sa
-Repair.Effect.9=M\u00e1gikus t\u00e1rgyak megjav\u00edt\u00e1sa
+Repair.SubSkill.Repair.Name=Jav\u00edt\u00e1s
+Repair.SubSkill.Repair.Description=Eszk\u00f6z\u00f6k \u00e9s felszerel\u00e9sek jav\u00edt\u00e1sa
+Repair.SubSkill.GoldRepair.Description= Arany eszk\u00f6z\u00f6k \u00e9s felszerel\u00e9sek jav\u00edt\u00e1sa
+Repair.SubSkill.IronRepair.Description= Vas eszk\u00f6z\u00f6k \u00e9s felszerel\u00e9sek jav\u00edt\u00e1sa
+Repair.SubSkill.StoneRepair.Description=K\u0151 eszk\u00f6z\u00f6k jav\u00edt\u00e1sa
+Repair.SubSkill.RepairMastery.Name=Jav\u00edt\u00f3 mester
+Repair.SubSkill.SuperRepair.Name=Szuper jav\u00edt\u00e1s
+Repair.SubSkill.DiamondRepair.Description= Gy\u00e9m\u00e1nt eszk\u00f6z\u00f6k \u00e9s felszerel\u00e9sek jav\u00edt\u00e1sa
+Repair.SubSkill.ArcaneForging.Description=M\u00e1gikus t\u00e1rgyak megjav\u00edt\u00e1sa
 Repair.Listener=Jav\u00edt\u00e1s:
 Repair.SkillName=JAV\u00cdT\u00c1S
 Repair.Skills.AdeptDiamond=[[DARK_RED]]Nem vagy el\u00e9g k\u00e9pzett ahhoz, hogy gy\u00e9m\u00e1nt t\u00e1rgyakat jav\u00edts.
@@ -67,8 +67,8 @@ Swords.Listener=Kardok:
 Swords.SkillName=KARDOK
 Swords.Skills.SS.On=[[GREEN]]**F\u0170R\u00c9SZES CSAP\u00c1S AKTIV\u00c1LVA**
 Swords.Skillup=[[YELLOW]]Harc fejl\u0151d\u00f6tt {0} szinttel. \u00d6sszesen: ({1})
-Taming.Effect.11=Robban\u00e1si Sebz\u00e9s Ellen\u00e1ll\u00e1s
-Taming.Effect.16=Gyors Kaja Szolg\u00e1ltat\u00e1s
+Taming.SubSkill.ShockProof.Description=Robban\u00e1si Sebz\u00e9s Ellen\u00e1ll\u00e1s
+Taming.SubSkill.FastFoodService.Name=Gyors Kaja Szolg\u00e1ltat\u00e1s
 Taming.Listener.Wolf=[[DARK_GRAY]]A farkasod visszat\u00e9rt hozz\u00e1d...
 Taming.Listener=Szelid\u00edt\u00e9s:
 Taming.SkillName=SZELID\u00cdT\u00c9S

src/main/resources/locale/locale_it.properties

@@ -2,12 +2,12 @@
 Acrobatics.Ability.Proc=[[GREEN]]**Atterraggio Aggraziato**
 Acrobatics.Combat.Proc=[[GREEN]]**Schivato**
 Acrobatics.DodgeChance=[[RED]]Possibilit\u00E0 di Schivata: [[YELLOW]]{0}
-Acrobatics.Effect.0=Capriola
-Acrobatics.Effect.1=Riduce o annulla il danno da caduta
-Acrobatics.Effect.2=Capriola Aggraziata
-Acrobatics.Effect.3=Il doppio pi\u00F9 efficiente di una normale Capriola
-Acrobatics.Effect.4=Schivata
-Acrobatics.Effect.5=Riduce il danno degli attacchi della met\u00E0
+Acrobatics.SubSkill.Roll.Name=Capriola
+Acrobatics.SubSkill.Roll.Description=Riduce o annulla il danno da caduta
+Acrobatics.SubSkill.GracefulRoll.Name=Capriola Aggraziata
+Acrobatics.SubSkill.GracefulRoll.Description=Il doppio pi\u00F9 efficiente di una normale Capriola
+Acrobatics.SubSkill.Dodge.Name=Schivata
+Acrobatics.SubSkill.Dodge.Description=Riduce il danno degli attacchi della met\u00E0
 Acrobatics.Listener=Acrobatica:
 Acrobatics.Roll.Chance=[[RED]]Possibilit\u00E0 di Capriola: [[YELLOW]]{0}
 Acrobatics.Roll.GraceChance=[[RED]]Possibilit\u00E0 di Capriola Aggraziata: [[YELLOW]]{0}
@@ -16,10 +16,10 @@ Acrobatics.SkillName=ACROBATICA
 Acrobatics.Skillup=[[YELLOW]]L'abilit\u00E0 Acrobatica \u00E8 aumentata di {0}. Totale ({1})
 
 #ALCHEMY
-Alchemy.Effect.0=Catalisi
-Alchemy.Effect.1=Aumenta la velocit\u00E0 di produzione delle pozioni
-Alchemy.Effect.2=Intrugli
-Alchemy.Effect.3=Crea pozioni con pi\u00F9 ingredienti
+Alchemy.SubSkill.Catalysis.Name=Catalisi
+Alchemy.SubSkill.Catalysis.Description=Aumenta la velocit\u00E0 di produzione delle pozioni
+Alchemy.SubSkill.Concoctions.Name=Intrugli
+Alchemy.SubSkill.Concoctions.Description=Crea pozioni con pi\u00F9 ingredienti
 Alchemy.Listener=Alchimia:
 Alchemy.Ability.Locked.0=BLOCCATO FINO AD ABILIT\u00C0 {0}+ (CATALISI)
 Alchemy.Catalysis.Speed=[[RED]]Velocit\u00E0 di Preparazione: [[YELLOW]]{0}
@@ -32,12 +32,12 @@ Alchemy.Skillup=[[YELLOW]]L'abilit\u00E0 Alchimia \u00E8 aumentata di {0}. Total
 Archery.Combat.DazeChance=[[RED]]Possibilit\u00E0 di Stordire: [[YELLOW]]{0}
 Archery.Combat.RetrieveChance=[[RED]]Possibilit\u00E0 di Recuperare Frecce: [[YELLOW]]{0}
 Archery.Combat.SkillshotBonus=[[RED]]Bonus al Danno di Tiro da Maestro: [[YELLOW]]{0}
-Archery.Effect.0=Tiro da Maestro
-Archery.Effect.1=Aumenta il danno fatto con gli archi
-Archery.Effect.2=Stordire (Giocatori)
-Archery.Effect.3=Disorienta i nemici e infligge {0} Danni
-Archery.Effect.4=Recupero Frecce
-Archery.Effect.5=Probabilit\u00E0 di recuperare frecce dai cadaveri
+Archery.SubSkill.SkillShot.Name=Tiro da Maestro
+Archery.SubSkill.SkillShot.Description=Aumenta il danno fatto con gli archi
+Archery.SubSkill.Daze.Name=Stordire (Giocatori)
+Archery.SubSkill.Daze.Description=Disorienta i nemici e infligge {0} Danni
+Archery.SubSkill.ArrowRetrieval.Name=Recupero Frecce
+Archery.SubSkill.ArrowRetrieval.Description=Probabilit\u00E0 di recuperare frecce dai cadaveri
 Archery.Listener=Tiro con l'Arco:
 Archery.SkillName=Arco
 Archery.Skillup=[[YELLOW]]L'abilit\u00E0 Tiro con l'Arco \u00E8 aumentata di {0}. Totale ({1})
@@ -58,16 +58,16 @@ Axes.Combat.GI.Proc=[[GREEN]]**COLPITO CON GRANDE FORZA**
 Axes.Combat.GI.Struck=[[RED]]**COLPITO DA IMPATTO MAGGIORE**
 Axes.Combat.SS.Struck=[[DARK_RED]]Colpito da SPACCA CRANI!
 Axes.Combat.SS.Length=[[RED]]Durata di Spacca Crani: [[YELLOW]]{0}s
-Axes.Effect.0=Spacca Crani (Capacit\u00E0)
-Axes.Effect.1=Infligge Danno ad Area
-Axes.Effect.2=Colpi Critici
-Axes.Effect.3=Doppio Danno
-Axes.Effect.4=Maestria con l'Ascia
-Axes.Effect.5=Aggiunge Danni bonus
-Axes.Effect.6=Sfonda Armature
-Axes.Effect.7=Colpisci con forza sufficiente da fracassare le armature
-Axes.Effect.8=Impatto Maggiore
-Axes.Effect.9=Infligge danno bonus ai nemici senza armatura
+Axes.SubSkill.SkullSplitter.Name=Spacca Crani (Capacit\u00E0)
+Axes.SubSkill.SkullSplitter.Description=Infligge Danno ad Area
+Axes.SubSkill.CriticalStrikes.Name=Colpi Critici
+Axes.SubSkill.CriticalStrikes.Description=Doppio Danno
+Axes.SubSkill.AxeMastery.Name=Maestria con l'Ascia
+Axes.SubSkill.AxeMastery.Description=Aggiunge Danni bonus
+Axes.SubSkill.ArmorImpact.Name=Sfonda Armature
+Axes.SubSkill.ArmorImpact.Description=Colpisci con forza sufficiente da fracassare le armature
+Axes.SubSkill.GreaterImpact.Name=Impatto Maggiore
+Axes.SubSkill.GreaterImpact.Description=Infligge danno bonus ai nemici senza armatura
 Axes.Listener=Asce:
 Axes.SkillName=ASCE
 Axes.Skills.SS.Off=[[RED]]**Spacca Crani si \u00E8 esaurito**
@@ -80,10 +80,10 @@ Axes.Skillup=[[YELLOW]]L'abilit\u00E0 Asce \u00E8 aumentata di {0}. Totale ({1})
 #EXCAVATION
 Excavation.Ability.Lower=[[GRAY]]**ABBASSI LA PALA**
 Excavation.Ability.Ready=[[GREEN]]**PREPARI LA PALA**
-Excavation.Effect.0=Giga-Trivella Demolitrice (CAPACIT\u00C0)
-Excavation.Effect.1=Drop x3, XP x3, +Velocit\u00E0
-Excavation.Effect.2=Cacciatore di Tesori
-Excavation.Effect.3=Capacit\u00E0 di disseppellire tesori
+Excavation.SubSkill.GigaDrillBreaker.Name=Giga-Trivella Demolitrice (CAPACIT\u00C0)
+Excavation.SubSkill.GigaDrillBreaker.Description=Drop x3, XP x3, +Velocit\u00E0
+Excavation.SubSkill.TreasureHunter.Name=Cacciatore di Tesori
+Excavation.SubSkill.TreasureHunter.Description=Capacit\u00E0 di disseppellire tesori
 Excavation.Effect.Length=[[RED]]Durata di Giga-Trivella Demolitrice: [[YELLOW]]{0}s
 Excavation.Listener=Escavazione:
 Excavation.SkillName=ESCAVAZIONE
@@ -106,18 +106,18 @@ Fishing.Ability.TH.MagicRate=[[RED]]Possibilit\u00E0 di Cacciatore di Magia: [[Y
 Fishing.Ability.Shake=[[RED]]Probabilit\u00E0 di Scuotere: [[YELLOW]]{0}
 Fishing.Ability.IceFishing=[[RED]]Pesca sul Ghiaccio: Vai a pescare sul ghiaccio
 Fishing.Ability.FD=[[RED]]Dieta del Pescatore: [[YELLOW]]Grado {0}
-Fishing.Effect.0=Cacciatore di Tesori (Passivo)
-Fishing.Effect.1=Ripesca oggetti vari
-Fishing.Effect.2=Cacciatore di Magia
-Fishing.Effect.3=Trova Oggetti Incantati
-Fishing.Effect.4=Scuotere (contro Entit\u00E0)
-Fishing.Effect.5=Scrolla oggetti di dosso ai mob con una canna da pesca
-Fishing.Effect.6=Dieta del Pescatore
-Fishing.Effect.7=Aumenta la fame recuperata tramite cibi pescati
-Fishing.Effect.8=Pescatore Provetto
-Fishing.Effect.9=Migliora le possibilit\u00E0 di ricevere un morso mentre si pesca
-Fishing.Effect.10=Pesca sul Ghiaccio
-Fishing.Effect.11=Ti permette di pescare nei biomi ghiacciati
+Fishing.SubSkill.TreasureHunter.Name=Cacciatore di Tesori (Passivo)
+Fishing.SubSkill.TreasureHunter.Description=Ripesca oggetti vari
+Fishing.SubSkill.MagicHunter.Name=Cacciatore di Magia
+Fishing.SubSkill.MagicHunter.Description=Trova Oggetti Incantati
+Fishing.SubSkill.Shake.Name=Scuotere (contro Entit\u00E0)
+Fishing.SubSkill.Shake.Description=Scrolla oggetti di dosso ai mob con una canna da pesca
+Fishing.SubSkill.FishermansDiet.Name=Dieta del Pescatore
+Fishing.SubSkill.FishermansDiet.Description=Aumenta la fame recuperata tramite cibi pescati
+Fishing.SubSkill.MasterAngler.Name=Pescatore Provetto
+Fishing.SubSkill.MasterAngler.Description=Migliora le possibilit\u00E0 di ricevere un morso mentre si pesca
+Fishing.SubSkill.IceFishing.Name=Pesca sul Ghiaccio
+Fishing.SubSkill.IceFishing.Description=Ti permette di pescare nei biomi ghiacciati
 Fishing.Chance.Raining=[[BLUE]] Bonus Pioggia
 Fishing.Listener=Pesca:
 Fishing.Ability.TH.MagicFound=[[GRAY]]Senti un tocco di magia in questa cattura...
@@ -140,20 +140,20 @@ Herbalism.Ability.Lower=[[GRAY]]**ABBASSI LA ZAPPA**
 Herbalism.Ability.Ready=[[GREEN]]**PREPARI LA ZAPPA**
 Herbalism.Ability.ShroomThumb.Chance=[[RED]]Possibilit\u00E0 di Pollice Fungo: [[YELLOW]]{0}
 Herbalism.Ability.ShroomThumb.Fail=[[RED]]**POLLICE FUNGO FALLITO**
-Herbalism.Effect.0=Terra Verde (CAPACIT\u00C0)
-Herbalism.Effect.1=Diffonde il Verde, Drop x3
-Herbalism.Effect.2=Pollice Verde (Grano)
-Herbalism.Effect.3=Auto-Pianta il grano quando viene raccolto
+Herbalism.SubSkill.GreenTerra.Name=Terra Verde (CAPACIT\u00C0)
+Herbalism.SubSkill.GreenTerra.Description=Diffonde il Verde, Drop x3
+Herbalism.SubSkill.GreenThumb.Name=Pollice Verde (Grano)
+Herbalism.SubSkill.GreenThumb.Description=Auto-Pianta il grano quando viene raccolto
 Herbalism.Effect.4=Pollice Verde (Blocchi)
-Herbalism.Effect.5=Rende i mattoni muscosi, o fa crescere l'erba
-Herbalism.Effect.6=Dieta del Contadino
-Herbalism.Effect.7=Aumenta la fame recuperata tramite cibi coltivati
-Herbalism.Effect.8=Doppi Drop (Ogni Pianta)
-Herbalism.Effect.9=Raddoppia il normale drop
-Herbalism.Effect.10=Fortuna Hylian
-Herbalism.Effect.11=D\u00E0 una modesta possibilit\u00E0 di trovare oggetti rari
-Herbalism.Effect.12=Pollice Fungo
-Herbalism.Effect.13=Diffonde il micelio su terra & erba
+Herbalism.SubSkill.GreenThumb.Description.2=Rende i mattoni muscosi, o fa crescere l'erba
+Herbalism.SubSkill.FarmersDiet.Name=Dieta del Contadino
+Herbalism.SubSkill.FarmersDiet.Description=Aumenta la fame recuperata tramite cibi coltivati
+Herbalism.SubSkill.DoubleDrops.Name=Doppi Drop (Ogni Pianta)
+Herbalism.SubSkill.DoubleDrops.Description=Raddoppia il normale drop
+Herbalism.SubSkill.HylianLuck.Name=Fortuna Hylian
+Herbalism.SubSkill.HylianLuck.Description=D\u00E0 una modesta possibilit\u00E0 di trovare oggetti rari
+Herbalism.SubSkill.ShroomThumb.Name=Pollice Fungo
+Herbalism.SubSkill.ShroomThumb.Description=Diffonde il micelio su terra & erba
 Herbalism.HylianLuck=[[GREEN]]Oggi la fortuna di Hyrule \u00E8 con te!
 Herbalism.Listener=Erboristeria:
 Herbalism.SkillName=ERBORISTERIA
@@ -171,16 +171,16 @@ Mining.Ability.Locked.1=BLOCCATO FINO AD ABILIT\u00C0 {0} (BOMBE PI\u00D9 GRANDI
 Mining.Ability.Locked.2=BLOCCATO FINO AD ABILIT\u00C0 {0}+ (PERIZIA NELLE DEMOLIZIONI)
 Mining.Ability.Lower=[[GRAY]]**ABBASSI IL PICCONE**
 Mining.Ability.Ready=[[GREEN]]**PREPARI IL PICCONE**
-Mining.Effect.0=Super Demolitore (CAPACIT\u00C0)
-Mining.Effect.1=+ Velocit\u00E0, Possibilit\u00E0 di Triplo Drop
-Mining.Effect.2=Doppi Drop
-Mining.Effect.3=Raddoppia il normale drop
-Mining.Effect.4=Estrazione Esplosiva
-Mining.Effect.5=Bonus a estrarre minerali col TNT
-Mining.Effect.6=Bombe Pi\u00F9 Grandi
-Mining.Effect.7=Incrementa il raggio di esplosione del TNT
-Mining.Effect.8=Perizia nelle Demolizioni
-Mining.Effect.9=Riduce il danno da esplosioni di TNT
+Mining.SubSkill.SuperBreaker.Name=Super Demolitore (CAPACIT\u00C0)
+Mining.SubSkill.SuperBreaker.Description=+ Velocit\u00E0, Possibilit\u00E0 di Triplo Drop
+Mining.SubSkill.DoubleDrops.Name=Doppi Drop
+Mining.SubSkill.DoubleDrops.Description=Raddoppia il normale drop
+Mining.SubSkill.BlastMining.Name=Estrazione Esplosiva
+Mining.SubSkill.BlastMining.Description=Bonus a estrarre minerali col TNT
+Mining.SubSkill.BiggerBombs.Name=Bombe Pi\u00F9 Grandi
+Mining.SubSkill.BiggerBombs.Description=Incrementa il raggio di esplosione del TNT
+Mining.SubSkill.DemolitionsExpertise.Name=Perizia nelle Demolizioni
+Mining.SubSkill.DemolitionsExpertise.Description=Riduce il danno da esplosioni di TNT
 Mining.Effect.Decrease=[[RED]]Riduzione del Danno da Esperto di Demolizioni: [[YELLOW]]{0}
 Mining.Effect.DropChance=[[RED]]Possibilit\u00E0 di Doppio Drop: [[YELLOW]]{0}
 Mining.Listener=Estrazione:
@@ -201,22 +201,22 @@ Mining.Blast.Other.On=[[GREEN]]{0}[[DARK_GREEN]] ha usato [[RED]]Estrazione Espl
 Mining.Blast.Refresh=[[GREEN]]La tua capacit\u00E0 [[YELLOW]]Estrazione Esplosiva [[GREEN]]si \u00E8 rigenerata!
 
 #REPAIR
-Repair.Effect.0=Riparazione
-Repair.Effect.1=Ripara Attrezzi & Armature
-Repair.Effect.10=Riparazione Oro (ABILIT\u00C0 {0}+)
-Repair.Effect.11=Ripara Attrezzi & Armature d'Oro
-Repair.Effect.12=Riparazione Ferro (ABILIT\u00C0 {0}+)
-Repair.Effect.13=Ripara Attrezzi & Armature di Ferro
-Repair.Effect.14=Riparazione Pietra (ABILIT\u00C0 {0}+)
-Repair.Effect.15=Ripara Attrezzi di Pietra
-Repair.Effect.2=Maestria nella Riparazione
-Repair.Effect.3=Riparazione incrementata
-Repair.Effect.4=Super Riparazione
-Repair.Effect.5=Doppia efficacia
-Repair.Effect.6=Ripara Diamante (ABILIT\u00C0 {0}+)
-Repair.Effect.7=Ripara Attrezzi & Armature di Diamante
-Repair.Effect.8=Forgiatura Arcana
-Repair.Effect.9=Ripara oggetti magici
+Repair.SubSkill.Repair.Name=Riparazione
+Repair.SubSkill.Repair.Description=Ripara Attrezzi & Armature
+Repair.SubSkill.GoldRepair.Name=Riparazione Oro (ABILIT\u00C0 {0}+)
+Repair.SubSkill.GoldRepair.Description=Ripara Attrezzi & Armature d'Oro
+Repair.SubSkill.IronRepair.Name=Riparazione Ferro (ABILIT\u00C0 {0}+)
+Repair.SubSkill.IronRepair.Description=Ripara Attrezzi & Armature di Ferro
+Repair.SubSkill.StoneRepair.Name=Riparazione Pietra (ABILIT\u00C0 {0}+)
+Repair.SubSkill.StoneRepair.Description=Ripara Attrezzi di Pietra
+Repair.SubSkill.RepairMastery.Name=Maestria nella Riparazione
+Repair.SubSkill.RepairMastery.Description=Riparazione incrementata
+Repair.SubSkill.SuperRepair.Name=Super Riparazione
+Repair.SubSkill.SuperRepair.Description=Doppia efficacia
+Repair.SubSkill.DiamondRepair.Name=Ripara Diamante (ABILIT\u00C0 {0}+)
+Repair.SubSkill.DiamondRepair.Description=Ripara Attrezzi & Armature di Diamante
+Repair.SubSkill.ArcaneForging.Name=Forgiatura Arcana
+Repair.SubSkill.ArcaneForging.Description=Ripara oggetti magici
 Repair.Error=[[DARK_RED]]mcMMO si \u00E8 imbattuto in un errore mentre tentava di riparare questo oggetto!
 Repair.Listener.Anvil=[[DARK_RED]]Hai piazzato un'incudine; le incudini possono riparare attrezzi e armature.
 Repair.Listener=Riparazione:
@@ -245,10 +245,10 @@ Repair.Arcane.Rank=[[RED]]Forgiatura Arcana: [[YELLOW]]Grado {0}/4
 
 #SALVAGE
 Salvage.Pretty.Name=Rottamazione
-Salvage.Effect.0=Rottamazione Avanzata
-Salvage.Effect.1=Rottama oggetti danneggiati
-Salvage.Effect.2=Rottamazione Arcana
-Salvage.Effect.3=Estrai incantesimi dagli oggetti
+Salvage.SubSkill.AdvancedSalvage.Name=Rottamazione Avanzata
+Salvage.SubSkill.AdvancedSalvage.Description=Rottama oggetti danneggiati
+Salvage.SubSkill.ArcaneSalvaging.Name=Rottamazione Arcana
+Salvage.SubSkill.ArcaneSalvaging.Description=Estrai incantesimi dagli oggetti
 Salvage.Ability.Locked.0=BLOCCATO FINO AD ABILIT\u00C0 {0}+ (ROTTAMAZIONE AVANZATA)
 Salvage.Ability.Bonus.0=Rottamazione Avanzata
 Salvage.Ability.Bonus.1=Massima resa {0} oggetti distrutti
@@ -279,14 +279,14 @@ Swords.Combat.Counter.Chance=[[RED]]Possibilit\u00E0 di Contrattacco: [[YELLOW]]
 Swords.Combat.Counter.Hit=[[DARK_RED]]Colpisci con un contrattacco!
 Swords.Combat.Countered=[[GREEN]]**CONTRATTACCATO**
 Swords.Combat.SS.Struck=[[DARK_RED]]Colpito da COLPI SEGHETTATI!
-Swords.Effect.0=Contrattacco
-Swords.Effect.1=Riflette il {0} del danno sub\u00ECto mentre si blocca
-Swords.Effect.2=Colpi Seghettati (CAPACIT\u00C0)
-Swords.Effect.3={0} Danni EaA, Emorragia+ EaA
+Swords.SubSkill.CounterAttack.Name=Contrattacco
+Swords.SubSkill.CounterAttack.Description=Riflette il {0} del danno sub\u00ECto mentre si blocca
+Swords.SubSkill.SerratedStrikes.Name=Colpi Seghettati (CAPACIT\u00C0)
+Swords.SubSkill.SerratedStrikes.Description={0} Danni EaA, Emorragia+ EaA
 Swords.Effect.4=Colpi Seghettati Emorragia+
 Swords.Effect.5={0} Tick di Emorragia
-Swords.Effect.6=Emorragia
-Swords.Effect.7=Infligge danno ciclico da sanguinamento
+Swords.SubSkill.Bleed.Name=Emorragia
+Swords.SubSkill.Bleed.Description=Infligge danno ciclico da sanguinamento
 Swords.Listener=Spade:
 Swords.SkillName=SPADE
 Swords.Skills.SS.Off=[[RED]]**Colpi Seghettati si \u00E8 esaurito**
@@ -317,25 +317,25 @@ Taming.Ability.Locked.3=BLOCCATO FINO AD ABILIT\u00C0 {0}+ (ARTIGLI AFFILATI)
 Taming.Ability.Locked.4=BLOCCATO FINO AD ABILIT\u00C0 {0}+ (SERVIZIO FAST FOOD)
 Taming.Ability.Locked.5=BLOCCATO FINO AD ABILIT\u00C0 {0}+ (SEGUGIO DEL CIELO)
 Taming.Combat.Chance.Gore=[[RED]]Possibilit\u00E0 di Sbranare: [[YELLOW]]{0}
-Taming.Effect.0=Conoscenza delle Bestie
-Taming.Effect.1=Esamina lupi e ocelot picchiandoli con un osso
-Taming.Effect.10=A Prova d'Urto
-Taming.Effect.11=Riduzione del Danno da Esplosione.
-Taming.Effect.12=Richiamo della Natura
-Taming.Effect.13=Evoca un animale al tuo fianco
-Taming.Effect.14=[[GRAY]]COTW: Accovacciati e fai click destro con\n {0} {1} (Ocelot), {2} {3} (Lupo), {4} {5} (Cavallo)
-Taming.Effect.16=Servizio Fast Food
-Taming.Effect.17=Probabilit\u00E0 per i lupi di guarire quando attaccano
-Taming.Effect.18=Segugio del Cielo
-Taming.Effect.19=Guarito da Magia & Veleno
-Taming.Effect.2=Sbranare
-Taming.Effect.3=Colpo Critico che applica Emorragia
-Taming.Effect.4=Artigli Affilati
-Taming.Effect.5=Danno Bonus
-Taming.Effect.6=Sicurezza Ambientale
-Taming.Effect.7=Evita Cactus/Lava, Immune alle Cadute
-Taming.Effect.8=Pelliccia Folta
-Taming.Effect.9=Riduzione del Danno, Resistenza al Fuoco
+Taming.SubSkill.BeastLore.Name=Conoscenza delle Bestie
+Taming.SubSkill.BeastLore.Description=Esamina lupi e ocelot picchiandoli con un osso
+Taming.SubSkill.ShockProof.Name=A Prova d'Urto
+Taming.SubSkill.ShockProof.Description=Riduzione del Danno da Esplosione.
+Taming.SubSkill.CallOfTheWild.Name=Richiamo della Natura
+Taming.SubSkill.CallOfTheWild.Description=Evoca un animale al tuo fianco
+Taming.SubSkill.CallOfTheWild.Description.2=[[GRAY]]COTW: Accovacciati e fai click destro con\n {0} {1} (Ocelot), {2} {3} (Lupo), {4} {5} (Cavallo)
+Taming.SubSkill.FastFoodService.Name=Servizio Fast Food
+Taming.SubSkill.FastFoodService.Description=Probabilit\u00E0 per i lupi di guarire quando attaccano
+Taming.SubSkill.HolyHound.Name=Segugio del Cielo
+Taming.SubSkill.HolyHound.Description=Guarito da Magia & Veleno
+Taming.SubSkill.Gore.Name=Sbranare
+Taming.SubSkill.Gore.Description=Colpo Critico che applica Emorragia
+Taming.SubSkill.SharpenedClaws.Name=Artigli Affilati
+Taming.SubSkill.SharpenedClaws.Description=Danno Bonus
+Taming.SubSkill.EnvironmentallyAware.Name=Sicurezza Ambientale
+Taming.SubSkill.EnvironmentallyAware.Description=Evita Cactus/Lava, Immune alle Cadute
+Taming.SubSkill.ThickFur.Name=Pelliccia Folta
+Taming.SubSkill.ThickFur.Description=Riduzione del Danno, Resistenza al Fuoco
 Taming.Listener.Wolf=[[DARK_GRAY]]Il tuo lupo si precipita da te...
 Taming.Listener=Addomesticamento:
 Taming.SkillName=ADDOMESTICAMENTO
@@ -359,16 +359,16 @@ Unarmed.Ability.IronGrip.Attacker=[[RED]]Il tuo avversario ha una presa di ferro
 Unarmed.Ability.IronGrip.Defender=[[GREEN]]La tua presa di ferro ha evitato che venissi disarmato!
 Unarmed.Ability.Lower=[[GRAY]]**ABBASSI I PUGNI**
 Unarmed.Ability.Ready=[[GREEN]]**PREPARI I PUGNI**
-Unarmed.Effect.0=Furore (CAPACIT\u00C0)
-Unarmed.Effect.1=+50% Danni, Rompe materiali fragili
-Unarmed.Effect.2=Disarmare (Giocatori)
-Unarmed.Effect.3=Fa cadere l'oggetto tenuto in mano dal nemico
-Unarmed.Effect.4=Stile del Braccio di Ferro
-Unarmed.Effect.5=Ti indurisce il braccio col passare del tempo
-Unarmed.Effect.6=Deviazione Frecce
-Unarmed.Effect.7=Deviare frecce
-Unarmed.Effect.8=Presa di Ferro
-Unarmed.Effect.9=Ti impedisce di venire disarmato
+Unarmed.SubSkill.Berserk.Name=Furore (CAPACIT\u00C0)
+Unarmed.SubSkill.Berserk.Description=+50% Danni, Rompe materiali fragili
+Unarmed.SubSkill.Disarm.Name=Disarmare (Giocatori)
+Unarmed.SubSkill.Disarm.Description=Fa cadere l'oggetto tenuto in mano dal nemico
+Unarmed.SubSkill.IronArmStyle.Name=Stile del Braccio di Ferro
+Unarmed.SubSkill.IronArmStyle.Description=Ti indurisce il braccio col passare del tempo
+Unarmed.SubSkill.ArrowDeflect.Name=Deviazione Frecce
+Unarmed.SubSkill.ArrowDeflect.Description=Deviare frecce
+Unarmed.SubSkill.IronGrip.Name=Presa di Ferro
+Unarmed.SubSkill.IronGrip.Description=Ti impedisce di venire disarmato
 Unarmed.Listener=Lotta:
 Unarmed.SkillName=LOTTA
 Unarmed.Skills.Berserk.Off=[[RED]]**Furore si \u00E8 esaurito**
@@ -384,12 +384,12 @@ Woodcutting.Ability.1=Soffia via le foglie
 Woodcutting.Ability.Chance.DDrop=[[RED]]Possibilit\u00E0 di Doppio Drop: [[YELLOW]]{0}
 Woodcutting.Ability.Length=[[RED]]Durata di Abbatti Alberi: [[YELLOW]]{0}s
 Woodcutting.Ability.Locked.0=BLOCCATO FINO AD ABILIT\u00C0 {0}+ (SOFFIA FOGLIE)
-Woodcutting.Effect.0=Abbattitore d'Alberi (CAPACIT\u00C0)
-Woodcutting.Effect.1=Fa esplodere gli alberi
-Woodcutting.Effect.2=Soffia Foglie
-Woodcutting.Effect.3=Soffia via le foglie
-Woodcutting.Effect.4=Doppi Drop
-Woodcutting.Effect.5=Raddoppia il normale drop
+Woodcutting.SubSkill.TreeFeller.Name=Abbattitore d'Alberi (CAPACIT\u00C0)
+Woodcutting.SubSkill.TreeFeller.Description=Fa esplodere gli alberi
+Woodcutting.SubSkill.LeafBlower.Name=Soffia Foglie
+Woodcutting.SubSkill.LeafBlower.Description=Soffia via le foglie
+Woodcutting.SubSkill.HarvestLumber.Name=Doppi Drop
+Woodcutting.SubSkill.HarvestLumber.Description=Raddoppia il normale drop
 Woodcutting.Listener=Taglialegna:
 Woodcutting.SkillName=TAGLIALEGNA
 Woodcutting.Skills.TreeFeller.Off=[[RED]]**Abbattitore d'Alberi si \u00E8 esaurito**

src/main/resources/locale/locale_ja_JP.properties

@@ -5,7 +5,7 @@ Acrobatics.Skillup=[[YELLOW]]\u30de\u30a4\u30cb\u30f3\u30b0\u304c{0}\u4e0a\u6607
 Archery.Listener=\u5f13\u77e2:
 Archery.Skillup=[[YELLOW]]\u5f13\u30b9\u30ad\u30eb(Archery)\u304c{0}\u4e0a\u304c\u3063\u305f\uff01 \u30ec\u30d9\u30eb[{1}]
 Axes.Combat.SS.Length=[[RED]]\u30b9\u30fc\u30d1\u30fc\u30d6\u30ec\u30a4\u30ab\u30fc\u306e\u767a\u52d5\u6642\u9593: [[YELLOW]]{0}\u79d2
-Axes.Effect.3=\u30c0\u30d6\u30eb\u30c0\u30e1\u30fc\u30b8
+Axes.SubSkill.CriticalStrikes.Description=\u30c0\u30d6\u30eb\u30c0\u30e1\u30fc\u30b8
 Axes.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] \u306f [[RED]]\u30b9\u30ab\u30eb\u30b9\u30d7\u30ea\u30c3\u30bf\u30fc[[DARK_GREEN]]\u3092\u4f7f\u7528\u3057\u305f\uff01
 Axes.Skillup=[[YELLOW]]\u65a7\u30b9\u30ad\u30eb\u306f{0}\u306e\u5897\u52a0\u3068\u306a\u308a\u307e\u3057\u305f\u3002\u5408\u8a08\uff08{1}\uff09
 Excavation.Ability.Lower=[[GRAY]]**\u30b7\u30e3\u30d9\u30eb\u3092\u4e0b\u3052\u305f**
@@ -13,7 +13,7 @@ Excavation.Ability.Ready=[[GREEN]]**\u30b7\u30e3\u30d9\u30eb\u3092\u69cb\u3048\u
 Excavation.Listener=\u767a\u6398
 Excavation.SkillName=\u767a\u6398
 Excavation.Skillup=[[YELLOW]]\u30de\u30a4\u30cb\u30f3\u30b0\u30b9\u30ad\u30eb{0}\u306f\u5897\u3048\u305f\u3002\u5408\u8a08\uff08{1}\uff09
-Fishing.Effect.10=\u30a2\u30a4\u30b9\u30d5\u30a3\u30c3\u30b7\u30f3\u30b0
+Fishing.SubSkill.IceFishing.Name=\u30a2\u30a4\u30b9\u30d5\u30a3\u30c3\u30b7\u30f3\u30b0
 Herbalism.Listener=\u85ac\u8349\u5b66\uff1a
 Herbalism.Skills.GTe.Refresh=[[GREEN]]\u3042\u306a\u305f\u306e[[YELLOW]]\u30b0\u30ea\u30fc\u30f3\u30c6\u30e9[[GREEN]]\u30a2\u30d3\u30ea\u30c6\u30a3\u304c\u4f7f\u3048\u308b\u3088\u3046\u306b\u306a\u308a\u307e\u3057\u305f\uff01
 Herbalism.Skills.GTe.Other.Off=[[RED]]\u304d\u3053\u308a[[GREEN]]\u30b9\u30ad\u30eb\u306f\u3042\u3068[[YELLOW]]{0}\u79d2\u9593[[GREEN]]\u4f7f\u3048\u307e\u305b\u3093\u3002
@@ -25,10 +25,10 @@ Mining.Skills.SuperBreaker.Refresh=[[GREEN]]\u3042\u306a\u305f\u306e[[YELLOW]]\u
 Mining.Skillup=[[YELLOW]]\u30de\u30a4\u30cb\u30f3\u30b0\u30b9\u30ad\u30eb\u304c{0}\u4e0a\u6607\u3057\u305f\u3002\u5408\u8a08\uff08{1}\uff09
 Mining.Blast.Radius.Increase=[[RED]]\u7206\u767a\u306e\u534a\u5f84\u304c\u5897\u3048\u305f[[YELLOW]]+{0}
 Mining.Blast.Refresh=[[GREEN]]\u3042\u306a\u305f\u306e[[YELLOW]]\u30d6\u30e9\u30b9\u30c8\u30de\u30a4\u30cb\u30f3\u30b0[[GREEN]]\u30a2\u30d3\u30ea\u30c6\u30a3\u306f\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5\u3055\u308c\u307e\u3057\u305f\uff01
-Repair.Effect.0=\u4fee\u7e55
-Repair.Effect.4=\u30b9\u30fc\u30d1\u30fc\u30ea\u30da\u30a2
-Repair.Effect.7=\u30c0\u30a4\u30e4\u30e2\u30f3\u30c9\u306e\u30c4\u30fc\u30eb & \u9632\u5177\u3092\u4fee\u7e55
-Repair.Effect.9=\u9b54\u6cd5\u306e\u30a2\u30a4\u30c6\u30e0\u3092\u4fee\u5fa9
+Repair.SubSkill.Repair.Name=\u4fee\u7e55
+Repair.SubSkill.SuperRepair.Name=\u30b9\u30fc\u30d1\u30fc\u30ea\u30da\u30a2
+Repair.SubSkill.DiamondRepair.Description=\u30c0\u30a4\u30e4\u30e2\u30f3\u30c9\u306e\u30c4\u30fc\u30eb & \u9632\u5177\u3092\u4fee\u7e55
+Repair.SubSkill.ArcaneForging.Description=\u9b54\u6cd5\u306e\u30a2\u30a4\u30c6\u30e0\u3092\u4fee\u5fa9
 Repair.Listener=\u4fee\u7e55:
 Repair.SkillName=\u4fee\u7e55
 Repair.Skills.AdeptDiamond=[[DARK_RED]]\u30c0\u30a4\u30e4\u30e2\u30f3\u30c9\u30c4\u30fc\u30eb\u3092\u4fee\u5fa9\u3059\u308b\u70ba\u306e\u5341\u5206\u306a\u30b9\u30ad\u30eb\u304c\u3042\u308a\u307e\u305b\u3093\uff01
@@ -43,7 +43,7 @@ Swords.Combat.Bleeding.Stopped=[[GRAY]]\u51fa\u8840\u306f [[GREEN]]\u6b62\u307e\
 Swords.Combat.Bleeding=[[GREEN]]**\u6575\u304c\u51fa\u8840**
 Swords.Combat.Countered=[[GREEN]]**\u30ab\u30a6\u30f3\u30bf\u30fc\u30a2\u30bf\u30c3\u30af\uff01**
 Swords.Combat.SS.Struck=[[GREEN]]**\u8d77\u52d5\u3059\u308b\u30ae\u30b6\u30ae\u30b6\u306e\u30b9\u30c8\u30e9\u30a4\u30ad**
-Swords.Effect.2=[[\u7dd1]] **\u8d77\u52d5\u3059\u308b\u30ae\u30b6\u30ae\u30b6\u306e\u30b9\u30c8\u30e9\u30a4\u30ad**
+Swords.SubSkill.SerratedStrikes.Name=[[\u7dd1]] **\u8d77\u52d5\u3059\u308b\u30ae\u30b6\u30ae\u30b6\u306e\u30b9\u30c8\u30e9\u30a4\u30ad**
 Swords.Listener=Swords(\u5263\u30b9\u30ad\u30eb):
 Swords.SkillName=SWORDS(\u5263\u30b9\u30ad\u30eb)
 Swords.Skills.SS.On=[[GREEN]]**\u8d77\u52d5\u3059\u308b\u30ae\u30b6\u30ae\u30b6\u306e\u30b9\u30c8\u30e9\u30a4\u30ad**

src/main/resources/locale/locale_ko.properties

@@ -19,12 +19,12 @@
 Acrobatics.Ability.Proc=[[GREEN]]**\uC6B0\uC544\uD55C \uAD6C\uB974\uAE30**
 Acrobatics.Combat.Proc=[[GREEN]]**\uD68C\uD53C**
 Acrobatics.DodgeChance=[[RED]]\uD68C\uD53C \uD655\uB960: [[YELLOW]]{0}
-Acrobatics.Effect.0=\uAD6C\uB974\uAE30
-Acrobatics.Effect.1=\uCD94\uB77D \uB370\uBBF8\uC9C0 \uAC10\uC18C \uB610\uB294 \uBB34\uD6A8
-Acrobatics.Effect.2=\uC6B0\uC544\uD55C \uAD6C\uB974\uAE30
-Acrobatics.Effect.3=\uAD6C\uB974\uAE30 2\uBC30 \uD6A8\uACFC
-Acrobatics.Effect.4=\uD68C\uD53C
-Acrobatics.Effect.5=\uB099\uD558 \uB370\uBBF8\uC9C0 \uC808\uBC18 \uAC10\uC18C
+Acrobatics.SubSkill.Roll.Name=\uAD6C\uB974\uAE30
+Acrobatics.SubSkill.Roll.Description=\uCD94\uB77D \uB370\uBBF8\uC9C0 \uAC10\uC18C \uB610\uB294 \uBB34\uD6A8
+Acrobatics.SubSkill.GracefulRoll.Name=\uC6B0\uC544\uD55C \uAD6C\uB974\uAE30
+Acrobatics.SubSkill.GracefulRoll.Description=\uAD6C\uB974\uAE30 2\uBC30 \uD6A8\uACFC
+Acrobatics.SubSkill.Dodge.Name=\uD68C\uD53C
+Acrobatics.SubSkill.Dodge.Description=\uB099\uD558 \uB370\uBBF8\uC9C0 \uC808\uBC18 \uAC10\uC18C
 Acrobatics.Listener=\uACE1\uC608(ACROBATICS):
 Acrobatics.Roll.Chance=[[RED]]\uAD6C\uB974\uAE30 \uD655\uB960: [[YELLOW]]{0}
 Acrobatics.Roll.GraceChance=[[RED]]\uC6B0\uC544\uD55C \uAD6C\uB974\uAE30 \uD655\uB960: [[YELLOW]]{0}
@@ -33,10 +33,10 @@ Acrobatics.SkillName=\uACE1\uC608
 Acrobatics.Skillup=[[YELLOW]]\uB099\uBC95 \uAE30\uC220\uC774 {0} \uC62C\uB77C \uCD1D {1} \uB808\uBCA8\uC774 \uB418\uC5C8\uC2B5\uB2C8\uB2E4
 
 #ALCHEMY
-Alchemy.Effect.0=\uCD09\uB9E4
-Alchemy.Effect.1=\uD3EC\uC158 \uC591\uC870 \uC18D\uB3C4 \uC99D\uAC00
-Alchemy.Effect.2=\uD63C\uD569
-Alchemy.Effect.3=\uB354 \uB9CE\uC740 \uC131\uBD84\uC758 \uD3EC\uC158 \uC591\uC870
+Alchemy.SubSkill.Catalysis.Name=\uCD09\uB9E4
+Alchemy.SubSkill.Catalysis.Description=\uD3EC\uC158 \uC591\uC870 \uC18D\uB3C4 \uC99D\uAC00
+Alchemy.SubSkill.Concoctions.Name=\uD63C\uD569
+Alchemy.SubSkill.Concoctions.Description=\uB354 \uB9CE\uC740 \uC131\uBD84\uC758 \uD3EC\uC158 \uC591\uC870
 Alchemy.Listener=\uC5F0\uAE08\uC220(ALCHEMY):
 Alchemy.Ability.Locked.0={0}\uB808\uBCA8 \uB54C \uAE30\uC220\uD574\uC81C (\uCD09\uB9E4)
 Alchemy.Catalysis.Speed=[[RED]]\uC591\uC870 \uC18D\uB3C4: [[YELLOW]]{0}
@@ -49,12 +49,12 @@ Alchemy.Skillup=[[YELLOW]]\uC5F0\uAE08\uC220 \uAE30\uC220\uC774 {0} \uC62C\uB77C
 Archery.Combat.DazeChance=[[RED]]\uD604\uD639 \uD655\uB960: [[YELLOW]]{0}
 Archery.Combat.RetrieveChance=[[RED]]\uD654\uC0B4 \uD68C\uC218 \uD655\uB960: [[YELLOW]]{0}
 Archery.Combat.SkillshotBonus=[[RED]]\uC3D8\uAE30 \uC19C\uC528 \uCD94\uAC00 \uD53C\uD574 \uD655\uB960: [[YELLOW]]{0}
-Archery.Effect.0=\uC3D8\uAE30 \uC19C\uC528
-Archery.Effect.1=\uD65C \uD53C\uD574 \uC601\uAD6C \uC99D\uAC00
-Archery.Effect.2=\uD604\uD639 (\uD50C\uB808\uC774\uC5B4)
-Archery.Effect.3=\uC801\uC5D0\uAC8C \uD63C\uB780, {0} \uD53C\uD574 \uCD94\uAC00
-Archery.Effect.4=\uD654\uC0B4 \uD68C\uC218
-Archery.Effect.5=\uC2DC\uCCB4\uC5D0\uC11C \uD654\uC0B4 \uD68C\uC218 \uD655\uB960 \uC99D\uAC00
+Archery.SubSkill.SkillShot.Name=\uC3D8\uAE30 \uC19C\uC528
+Archery.SubSkill.SkillShot.Description=\uD65C \uD53C\uD574 \uC601\uAD6C \uC99D\uAC00
+Archery.SubSkill.Daze.Name=\uD604\uD639 (\uD50C\uB808\uC774\uC5B4)
+Archery.SubSkill.Daze.Description=\uC801\uC5D0\uAC8C \uD63C\uB780, {0} \uD53C\uD574 \uCD94\uAC00
+Archery.SubSkill.ArrowRetrieval.Name=\uD654\uC0B4 \uD68C\uC218
+Archery.SubSkill.ArrowRetrieval.Description=\uC2DC\uCCB4\uC5D0\uC11C \uD654\uC0B4 \uD68C\uC218 \uD655\uB960 \uC99D\uAC00
 Archery.Listener=\uAD81\uC220(ARCHERY):
 Archery.SkillName=\uAD81\uC220
 Archery.Skillup=[[YELLOW]]\uAD81\uC220 \uAE30\uC220\uC774 {0} \uC62C\uB77C \uCD1D {1} \uB808\uBCA8\uC774 \uB418\uC5C8\uC2B5\uB2C8\uB2E4
@@ -75,16 +75,16 @@ Axes.Combat.GI.Proc=[[GREEN]]**\uCD5C\uACE0\uC758 \uAC15\uD0C0\uB97C \uB54C\uB83
 Axes.Combat.GI.Struck=[[RED]]**\uC5C4\uCCAD\uB09C \uCDA9\uACA9\uC744 \uBC1B\uC558\uC2B5\uB2C8\uB2E4**
 Axes.Combat.SS.Struck=[[DARK_RED]]\uBF08 \uCABC\uAC1C\uAE30\uC5D0 \uB9DE\uC558\uC2B5\uB2C8\uB2E4!
 Axes.Combat.SS.Length=[[RED]]\uBF08 \uCABC\uAC1C\uAE30 \uC9C0\uC18D\uC2DC\uAC04: [[YELLOW]]{0}\uCD08
-Axes.Effect.0=\uBF08 \uCABC\uAC1C\uAE30 (\uB2A5\uB825)
-Axes.Effect.1=\uAD11\uC5ED \uCD94\uAC00 \uD53C\uD574
-Axes.Effect.2=\uD06C\uB9AC\uD2F0\uCEEC \uC2A4\uD2B8\uB77C\uC774\uD06C
-Axes.Effect.3=\uD53C\uD574 2\uBC30
-Axes.Effect.4=\uB3C4\uB07C \uB9C8\uC2A4\uD130\uB9AC
-Axes.Effect.5=\uCD94\uAC00 \uD2B9\uD61C \uD53C\uD574
-Axes.Effect.6=\uAC11\uC637 \uCDA9\uACA9
-Axes.Effect.7=\uAC11\uC637 \uD30C\uAD34 \uACF5\uACA9
-Axes.Effect.8=\uC5C4\uCCAD\uB09C \uCDA9\uACA9
-Axes.Effect.9=\uBE44\uBB34\uC7A5 \uCD94\uAC00 \uD53C\uD574
+Axes.SubSkill.SkullSplitter.Name=\uBF08 \uCABC\uAC1C\uAE30 (\uB2A5\uB825)
+Axes.SubSkill.SkullSplitter.Description=\uAD11\uC5ED \uCD94\uAC00 \uD53C\uD574
+Axes.SubSkill.CriticalStrikes.Name=\uD06C\uB9AC\uD2F0\uCEEC \uC2A4\uD2B8\uB77C\uC774\uD06C
+Axes.SubSkill.CriticalStrikes.Description=\uD53C\uD574 2\uBC30
+Axes.SubSkill.AxeMastery.Name=\uB3C4\uB07C \uB9C8\uC2A4\uD130\uB9AC
+Axes.SubSkill.AxeMastery.Description=\uCD94\uAC00 \uD2B9\uD61C \uD53C\uD574
+Axes.SubSkill.ArmorImpact.Name=\uAC11\uC637 \uCDA9\uACA9
+Axes.SubSkill.ArmorImpact.Description=\uAC11\uC637 \uD30C\uAD34 \uACF5\uACA9
+Axes.SubSkill.GreaterImpact.Name=\uC5C4\uCCAD\uB09C \uCDA9\uACA9
+Axes.SubSkill.GreaterImpact.Description=\uBE44\uBB34\uC7A5 \uCD94\uAC00 \uD53C\uD574
 Axes.Listener=\uBD80\uC220(AXES):
 Axes.SkillName=\uBD80\uC220
 Axes.Skills.SS.Off=[[RED]]**\uBF08 \uCABC\uAC1C\uAE30 \uBC1C\uB3D9 \uD574\uC81C**
@@ -97,10 +97,10 @@ Axes.Skillup=[[YELLOW]]\uBD80\uC220 \uAE30\uC220\uC774 {0} \uC62C\uB77C \uCD1D (
 #EXCAVATION
 Excavation.Ability.Lower=[[GRAY]]**\uC0BD \uC900\uBE44 \uD574\uC81C**
 Excavation.Ability.Ready=[[GREEN]]**\uC0BD \uC900\uBE44 \uC644\uB8CC**
-Excavation.Effect.0=\uAE30\uAC00 \uB4DC\uB9B4 \uBC84\uC11C\uCEE4 (\uB2A5\uB825)
-Excavation.Effect.1=\uB4DC\uB86D \uC18D\uB3C4 3\uBC30, \uACBD\uD5D8\uCE58 3\uBC30, \uC18D\uB3C4 \uC99D\uAC00
-Excavation.Effect.2=\uBCF4\uBB3C \uC0AC\uB0E5\uAFBC
-Excavation.Effect.3=\uBCF4\uBB3C \uBC1C\uAD74 \uB2A5\uB825
+Excavation.SubSkill.GigaDrillBreaker.Name=\uAE30\uAC00 \uB4DC\uB9B4 \uBC84\uC11C\uCEE4 (\uB2A5\uB825)
+Excavation.SubSkill.GigaDrillBreaker.Description=\uB4DC\uB86D \uC18D\uB3C4 3\uBC30, \uACBD\uD5D8\uCE58 3\uBC30, \uC18D\uB3C4 \uC99D\uAC00
+Excavation.SubSkill.TreasureHunter.Name=\uBCF4\uBB3C \uC0AC\uB0E5\uAFBC
+Excavation.SubSkill.TreasureHunter.Description=\uBCF4\uBB3C \uBC1C\uAD74 \uB2A5\uB825
 Excavation.Effect.Length=[[RED]]\uAE30\uAC00 \uB4DC\uB9B4 \uBC84\uC11C\uCEE4 \uC9C0\uC18D\uC2DC\uAC04: [[YELLOW]]{0}\uCD08
 Excavation.Listener=\uBC1C\uAD74(EXCAVATION):
 Excavation.SkillName=\uBC1C\uAD74
@@ -123,18 +123,18 @@ Fishing.Ability.TH.MagicRate=[[RED]]\uB9E4\uC9C1 \uD5CC\uD130 \uD655\uB960: [[YE
 Fishing.Ability.Shake=[[RED]]\uD754\uB4E4\uAE30 \uD655\uB960: [[YELLOW]]{0}
 Fishing.Ability.IceFishing=[[RED]]\uC5BC\uC74C \uB09A\uC2DC: \uC5BC\uC74C\uC5D0\uC11C \uB09A\uC2DC
 Fishing.Ability.FD=[[RED]]\uC5B4\uBD80\uC758 \uB2E4\uC774\uC5B4\uD2B8 \uB7AD\uD06C: [[YELLOW]]{0}\uB7AD\uD06C
-Fishing.Effect.0=\uD2B8\uB808\uC838 \uD5CC\uD130 (\uD328\uC2DC\uBE0C)
-Fishing.Effect.1=\uBB3C\uAC74(\uADF8\uC678) \uB09A\uC2DC
-Fishing.Effect.2=\uB9E4\uC9C1 \uD5CC\uD130
-Fishing.Effect.3=\uC778\uCC48\uD2B8 \uC544\uC774\uD15C \uBC1C\uACAC
-Fishing.Effect.4=\uD754\uB4E4\uAE30 (vs. \uB3C5\uB9BD\uCCB4)
-Fishing.Effect.5=\uC544\uC774\uD15C\uC744 \uBAB9\uC774\uB098 \uB09A\uC2DC\uC5D0\uC11C \uC5BB\uC74C
-Fishing.Effect.6=\uC5B4\uBD80\uC758 \uB2E4\uC774\uC5B4\uD2B8
-Fishing.Effect.7=\uC5B4\uB958 \uC74C\uC2DD \uD5C8\uAE30 \uD68C\uBCF5 \uC99D\uAC00
-Fishing.Effect.8=\uB09A\uC2DC\uAFBC \uC7A5\uC778
-Fishing.Effect.9=\uB09A\uC2DC\uC911 \uC785\uC9C8 \uD655\uB960 \uC99D\uAC00
-Fishing.Effect.10=\uC5BC\uC74C \uB09A\uC2DC
-Fishing.Effect.11=\uC5BC\uC74C\uC774 \uB36E\uD600\uC788\uB294 \uD658\uACBD\uC5D0\uC11C \uB09A\uC2DC \uAC00\uB2A5
+Fishing.SubSkill.TreasureHunter.Name=\uD2B8\uB808\uC838 \uD5CC\uD130 (\uD328\uC2DC\uBE0C)
+Fishing.SubSkill.TreasureHunter.Description=\uBB3C\uAC74(\uADF8\uC678) \uB09A\uC2DC
+Fishing.SubSkill.MagicHunter.Name=\uB9E4\uC9C1 \uD5CC\uD130
+Fishing.SubSkill.MagicHunter.Description=\uC778\uCC48\uD2B8 \uC544\uC774\uD15C \uBC1C\uACAC
+Fishing.SubSkill.Shake.Name=\uD754\uB4E4\uAE30 (vs. \uB3C5\uB9BD\uCCB4)
+Fishing.SubSkill.Shake.Description=\uC544\uC774\uD15C\uC744 \uBAB9\uC774\uB098 \uB09A\uC2DC\uC5D0\uC11C \uC5BB\uC74C
+Fishing.SubSkill.FishermansDiet.Name=\uC5B4\uBD80\uC758 \uB2E4\uC774\uC5B4\uD2B8
+Fishing.SubSkill.FishermansDiet.Description=\uC5B4\uB958 \uC74C\uC2DD \uD5C8\uAE30 \uD68C\uBCF5 \uC99D\uAC00
+Fishing.SubSkill.MasterAngler.Name=\uB09A\uC2DC\uAFBC \uC7A5\uC778
+Fishing.SubSkill.MasterAngler.Description=\uB09A\uC2DC\uC911 \uC785\uC9C8 \uD655\uB960 \uC99D\uAC00
+Fishing.SubSkill.IceFishing.Name=\uC5BC\uC74C \uB09A\uC2DC
+Fishing.SubSkill.IceFishing.Description=\uC5BC\uC74C\uC774 \uB36E\uD600\uC788\uB294 \uD658\uACBD\uC5D0\uC11C \uB09A\uC2DC \uAC00\uB2A5
 Fishing.Chance.Raining=[[BLUE]] \uBE44 \uD2B9\uD61C
 Fishing.Listener=\uB09A\uC2DC(FISHING):
 Fishing.Ability.TH.MagicFound=[[GRAY]]\uC774 \uC785\uC9C8\uC5D0\uC11C \uB9C8\uBC95\uC774 \uB290\uAEF4\uC9D1\uB2C8\uB2E4...
@@ -157,20 +157,20 @@ Herbalism.Ability.Lower=[[GRAY]]**\uD638\uBBF8 \uC900\uBE44 \uD574\uC81C**
 Herbalism.Ability.Ready=[[GREEN]]**\uD638\uBBF8 \uC900\uBE44 \uC644\uB8CC**
 Herbalism.Ability.ShroomThumb.Chance=[[RED]]\uBC84\uC12F\uC7AC\uBC30\uC790\uC758 \uC228\uACB0 \uD655\uB960: [[YELLOW]]{0}
 Herbalism.Ability.ShroomThumb.Fail=[[RED]]**\uBC84\uC12F\uC7AC\uBC30\uC790\uC758 \uC228\uACB0 \uC2E4\uD328**
-Herbalism.Effect.0=\uC7AC\uBC30\uC758 \uB300\uC9C0 (\uB2A5\uB825)
-Herbalism.Effect.1=\uB300\uC9C0 \uBFCC\uB9AC\uAE30, \uB4DC\uB86D 3\uBC30
-Herbalism.Effect.2=\uC7AC\uBC30\uC758 \uC7AC\uB2A5 (\uBC00)
-Herbalism.Effect.3=\uC218\uD655\uC2DC \uC790\uB3D9 \uC528 \uC2EC\uAE30
+Herbalism.SubSkill.GreenTerra.Name=\uC7AC\uBC30\uC758 \uB300\uC9C0 (\uB2A5\uB825)
+Herbalism.SubSkill.GreenTerra.Description=\uB300\uC9C0 \uBFCC\uB9AC\uAE30, \uB4DC\uB86D 3\uBC30
+Herbalism.SubSkill.GreenThumb.Name=\uC7AC\uBC30\uC758 \uC7AC\uB2A5 (\uBC00)
+Herbalism.SubSkill.GreenThumb.Description=\uC218\uD655\uC2DC \uC790\uB3D9 \uC528 \uC2EC\uAE30
 Herbalism.Effect.4=\uC7AC\uBC30\uC758 \uC7AC\uB2A5 (\uBE14\uB85D\uB4E4)
-Herbalism.Effect.5=\uC774\uB07C\uB080 \uBE14\uB85D \uB9CC\uB4E4\uAE30, \uC794\uB514 \uC790\uB77C\uAC8C\uD558\uAE30
-Herbalism.Effect.6=\uB18D\uBD80\uC758 \uB2E4\uC774\uC5B4\uD2B8
-Herbalism.Effect.7=\uB18D\uC791\uBB3C \uBC30\uACE0\uD488 \uD68C\uBCF5 \uD5A5\uC0C1
-Herbalism.Effect.8=2\uBC30 \uB4DC\uB86D (\uBAA8\uB4E0 \uC791\uBB3C)
-Herbalism.Effect.9=\uD56D\uC0C1 \uB4DC\uB86D 2\uBC30
-Herbalism.Effect.10=\uD558\uC77C\uB9AC\uC548\uC758 \uD589\uC6B4
-Herbalism.Effect.11=\uC801\uC740 \uD655\uB960\uB85C \uB808\uC5B4\uC544\uC774\uD15C \uC5BB\uC74C
-Herbalism.Effect.12=\uBC84\uC12F\uC7AC\uBC30\uC790\uC758 \uC228\uACB0
-Herbalism.Effect.13=\uD759 & \uC794\uB514\uC5D0 \uADE0\uC0AC\uCCB4 \uC0B4\uD3EC
+Herbalism.SubSkill.GreenThumb.Description.2=\uC774\uB07C\uB080 \uBE14\uB85D \uB9CC\uB4E4\uAE30, \uC794\uB514 \uC790\uB77C\uAC8C\uD558\uAE30
+Herbalism.SubSkill.FarmersDiet.Name=\uB18D\uBD80\uC758 \uB2E4\uC774\uC5B4\uD2B8
+Herbalism.SubSkill.FarmersDiet.Description=\uB18D\uC791\uBB3C \uBC30\uACE0\uD488 \uD68C\uBCF5 \uD5A5\uC0C1
+Herbalism.SubSkill.DoubleDrops.Name=2\uBC30 \uB4DC\uB86D (\uBAA8\uB4E0 \uC791\uBB3C)
+Herbalism.SubSkill.DoubleDrops.Description=\uD56D\uC0C1 \uB4DC\uB86D 2\uBC30
+Herbalism.SubSkill.HylianLuck.Name=\uD558\uC77C\uB9AC\uC548\uC758 \uD589\uC6B4
+Herbalism.SubSkill.HylianLuck.Description=\uC801\uC740 \uD655\uB960\uB85C \uB808\uC5B4\uC544\uC774\uD15C \uC5BB\uC74C
+Herbalism.SubSkill.ShroomThumb.Name=\uBC84\uC12F\uC7AC\uBC30\uC790\uC758 \uC228\uACB0
+Herbalism.SubSkill.ShroomThumb.Description=\uD759 & \uC794\uB514\uC5D0 \uADE0\uC0AC\uCCB4 \uC0B4\uD3EC
 Herbalism.HylianLuck=[[GREEN]]\uD558\uC774\uB784\uC758 \uD589\uC6B4\uC774 \uC624\uB298 \uB108\uC5D0\uAC8C \uB530\uB974\uB294\uAD6C\uB098!
 Herbalism.Listener=\uC57D\uCD08\uD559(HERBALISM):
 Herbalism.SkillName=\uC57D\uCD08\uD559
@@ -188,16 +188,16 @@ Mining.Ability.Locked.1={0}\uB808\uBCA8 \uB54C \uAE30\uC220 \uD574\uC81C (\uAC70
 Mining.Ability.Locked.2={0}\uB808\uBCA8 \uB54C \uAE30\uC220 \uD574\uC81C (\uC804\uBB38 \uD3ED\uD30C)
 Mining.Ability.Lower=[[GRAY]]**\uACE1\uAD2D\uC774 \uC900\uBE44 \uD574\uC81C**
 Mining.Ability.Ready=[[GREEN]]**\uACE1\uAD2D\uC774 \uC900\uBE44 \uC644\uB8CC**
-Mining.Effect.0=\uD30C\uAD34\uC790 (\uB2A5\uB825)
-Mining.Effect.1=\uC18D\uB3C4 \uD5A5\uC0C1, \uB4DC\uB86D \uD655\uB960 3\uBC30
-Mining.Effect.2=\uB4DC\uB86D 2\uBC30
-Mining.Effect.3=\uD56D\uC0C1 \uB4DC\uB86D 2\uBC30
-Mining.Effect.4=\uD3ED\uBC1C \uCC44\uAD74
-Mining.Effect.5=TNT\uB85C \uCC44\uAD74\uC2DC \uCD94\uAC00 \uAD11\uBB3C
-Mining.Effect.6=\uAC70\uB300 \uD3ED\uBC1C
-Mining.Effect.7=TNT \uD3ED\uBC1C\uAC70\uB9AC \uC99D\uAC00
-Mining.Effect.8=\uC804\uBB38 \uD3ED\uD30C
-Mining.Effect.9=TNT \uD3ED\uBC1C \uD53C\uD574 \uAC10\uC18C
+Mining.SubSkill.SuperBreaker.Name=\uD30C\uAD34\uC790 (\uB2A5\uB825)
+Mining.SubSkill.SuperBreaker.Description=\uC18D\uB3C4 \uD5A5\uC0C1, \uB4DC\uB86D \uD655\uB960 3\uBC30
+Mining.SubSkill.DoubleDrops.Name=\uB4DC\uB86D 2\uBC30
+Mining.SubSkill.DoubleDrops.Description=\uD56D\uC0C1 \uB4DC\uB86D 2\uBC30
+Mining.SubSkill.BlastMining.Name=\uD3ED\uBC1C \uCC44\uAD74
+Mining.SubSkill.BlastMining.Description=TNT\uB85C \uCC44\uAD74\uC2DC \uCD94\uAC00 \uAD11\uBB3C
+Mining.SubSkill.BiggerBombs.Name=\uAC70\uB300 \uD3ED\uBC1C
+Mining.SubSkill.BiggerBombs.Description=TNT \uD3ED\uBC1C\uAC70\uB9AC \uC99D\uAC00
+Mining.SubSkill.DemolitionsExpertise.Name=\uC804\uBB38 \uD3ED\uD30C
+Mining.SubSkill.DemolitionsExpertise.Description=TNT \uD3ED\uBC1C \uD53C\uD574 \uAC10\uC18C
 Mining.Effect.Decrease=[[RED]]\uC804\uBB38 \uD3ED\uD30C \uD53C\uD574 \uAC10\uC18C: [[YELLOW]]{0}
 Mining.Effect.DropChance=[[RED]]\uB4DC\uB86D 2\uBC30 \uD655\uB960: [[YELLOW]]{0}
 Mining.Listener=\uCC44\uAD11(MINING):
@@ -218,22 +218,22 @@ Mining.Blast.Other.On=[[GREEN]]{0}[[DARK_GREEN]]\uB2D8\uC740 [[RED]]\uD3ED\uBC1C
 Mining.Blast.Refresh=[[GREEN]]\uB2F9\uC2E0\uC758 [[YELLOW]]\uD3ED\uBC1C \uCC44\uAD74 [[GREEN]]\uAE30\uC220\uC740 \uC774\uC81C \uC0AC\uC6A9 \uAC00\uB2A5\uD569\uB2C8\uB2E4!
 
 #REPAIR
-Repair.Effect.0=\uC218\uB9AC
-Repair.Effect.1=\uB3C4\uAD6C & \uBC29\uC5B4\uAD6C \uC218\uB9AC
-Repair.Effect.10=\uAE08 \uC218\uB9AC ({0}\uB808\uBCA8 \uC774\uC0C1)
-Repair.Effect.11=\uAE08 \uB3C4\uAD6C & \uBC29\uC5B4\uAD6C \uC218\uB9AC
-Repair.Effect.12=\uCCA0 \uC218\uB9AC ({0}\uB808\uBCA8 \uC774\uC0C1)
-Repair.Effect.13=\uCCA0 \uB3C4\uAD6C & \uBC29\uC5B4\uAD6C \uC218\uB9AC
-Repair.Effect.14=\uB3CC \uC218\uB9AC ({0}\uB808\uBCA8 \uC774\uC0C1)
-Repair.Effect.15=\uB3CC \uB3C4\uAD6C \uC218\uB9AC
-Repair.Effect.2=\uC218\uB9AC \uB9C8\uC2A4\uD130\uB9AC
-Repair.Effect.3=\uC218\uB9AC \uC591 \uC99D\uAC00
-Repair.Effect.4=\uC288\uD37C \uC218\uB9AC
-Repair.Effect.5=\uD6A8\uC728 2\uBC30
-Repair.Effect.6=\uB2E4\uC774\uC544\uBAAC\uB4DC \uC218\uB9AC ({0} \uB808\uBCA8)
-Repair.Effect.7=\uB2E4\uC774\uC544\uBAAC\uB4DC \uB3C4\uAD6C & \uBC29\uC5B4\uAD6C \uC218\uB9AC
-Repair.Effect.8=\uC778\uCC48\uD2B8 \uC544\uC774\uD15C \uC218\uB9AC
-Repair.Effect.9=\uB9C8\uBC95 \uC544\uC774\uD15C \uC218\uB9AC
+Repair.SubSkill.Repair.Name=\uC218\uB9AC
+Repair.SubSkill.Repair.Description=\uB3C4\uAD6C & \uBC29\uC5B4\uAD6C \uC218\uB9AC
+Repair.SubSkill.GoldRepair.Name=\uAE08 \uC218\uB9AC ({0}\uB808\uBCA8 \uC774\uC0C1)
+Repair.SubSkill.GoldRepair.Description=\uAE08 \uB3C4\uAD6C & \uBC29\uC5B4\uAD6C \uC218\uB9AC
+Repair.SubSkill.IronRepair.Name=\uCCA0 \uC218\uB9AC ({0}\uB808\uBCA8 \uC774\uC0C1)
+Repair.SubSkill.IronRepair.Description=\uCCA0 \uB3C4\uAD6C & \uBC29\uC5B4\uAD6C \uC218\uB9AC
+Repair.SubSkill.StoneRepair.Name=\uB3CC \uC218\uB9AC ({0}\uB808\uBCA8 \uC774\uC0C1)
+Repair.SubSkill.StoneRepair.Description=\uB3CC \uB3C4\uAD6C \uC218\uB9AC
+Repair.SubSkill.RepairMastery.Name=\uC218\uB9AC \uB9C8\uC2A4\uD130\uB9AC
+Repair.SubSkill.RepairMastery.Description=\uC218\uB9AC \uC591 \uC99D\uAC00
+Repair.SubSkill.SuperRepair.Name=\uC288\uD37C \uC218\uB9AC
+Repair.SubSkill.SuperRepair.Description=\uD6A8\uC728 2\uBC30
+Repair.SubSkill.DiamondRepair.Name=\uB2E4\uC774\uC544\uBAAC\uB4DC \uC218\uB9AC ({0} \uB808\uBCA8)
+Repair.SubSkill.DiamondRepair.Description=\uB2E4\uC774\uC544\uBAAC\uB4DC \uB3C4\uAD6C & \uBC29\uC5B4\uAD6C \uC218\uB9AC
+Repair.SubSkill.ArcaneForging.Name=\uC778\uCC48\uD2B8 \uC544\uC774\uD15C \uC218\uB9AC
+Repair.SubSkill.ArcaneForging.Description=\uB9C8\uBC95 \uC544\uC774\uD15C \uC218\uB9AC
 Repair.Error=[[DARK_RED]]mcMMO\uC774 \uC544\uC774\uD15C\uC744 \uC218\uB9AC\uD558\uB824\uACE0 \uC2DC\uB3C4\uD558\uB294 \uB3D9\uC548 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4!
 Repair.Listener.Anvil=[[DARK_RED]]\uB2F9\uC2E0\uC740 \uBAA8\uB8E8\uB97C \uB193\uC558\uC2B5\uB2C8\uB2E4, \uBAA8\uB8E8\uB294 \uB3C4\uAD6C\uB4E4\uACFC \uBC29\uC5B4\uAD6C\uB97C \uC218\uB9AC\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
 Repair.Listener=\uC218\uB9AC(REPAIR):
@@ -262,10 +262,10 @@ Repair.Arcane.Rank=[[RED]]\uC778\uCC48\uD2B8 \uC218\uB9AC: [[YELLOW]]{0}/{1}\uB7
 
 #SALVAGE
 Salvage.Pretty.Name=\uD68C\uC218
-Salvage.Effect.0=\uC804\uBB38\uC801\uC778 \uD68C\uC218
-Salvage.Effect.1=\uC190\uC0C1\uB41C \uC544\uC774\uD15C \uD68C\uC218
-Salvage.Effect.2=\uC2E0\uBE44\uB85C\uC6B4 \uD68C\uC218
-Salvage.Effect.3=\uC544\uC774\uD15C\uC758 \uC778\uCC48\uD2B8 \uCD94\uCD9C
+Salvage.SubSkill.AdvancedSalvage.Name=\uC804\uBB38\uC801\uC778 \uD68C\uC218
+Salvage.SubSkill.AdvancedSalvage.Description=\uC190\uC0C1\uB41C \uC544\uC774\uD15C \uD68C\uC218
+Salvage.SubSkill.ArcaneSalvaging.Name=\uC2E0\uBE44\uB85C\uC6B4 \uD68C\uC218
+Salvage.SubSkill.ArcaneSalvaging.Description=\uC544\uC774\uD15C\uC758 \uC778\uCC48\uD2B8 \uCD94\uCD9C
 Salvage.Ability.Locked.0={0} \uB808\uBCA8 \uB54C \uAE30\uC220\uD574\uC81C (\uC804\uBB38\uC801\uC778 \uD68C\uC218)
 Salvage.Ability.Bonus.0=\uC804\uBB38\uC801\uC778 \uD68C\uC218
 Salvage.Ability.Bonus.1=\uBD80\uC154\uC9C4 \uC544\uC774\uD15C\uC758 \uCD5C\uB300 \uCD94\uCD9C\uB7C9 {0}
@@ -296,14 +296,14 @@ Swords.Combat.Counter.Chance=[[RED]]\uCE74\uC6B4\uD130 \uC5B4\uD0DD \uD655\uB960
 Swords.Combat.Counter.Hit=[[DARK_RED]]\uCE74\uC6B4\uD130 \uC5B4\uD0DD\uC5D0 \uB9DE\uC558\uC2B5\uB2C8\uB2E4!
 Swords.Combat.Countered=[[GREEN]]**\uCE74\uC6B4\uD130-\uC5B4\uD0DD**
 Swords.Combat.SS.Struck=[[DARK_RED]]\uD1B1\uB0A0 \uACF5\uACA9\uC5D0 \uB9DE\uC558\uC2B5\uB2C8\uB2E4!
-Swords.Effect.0=\uCE74\uC6B4\uD130 \uC5B4\uD0DD
-Swords.Effect.1={0} \uD53C\uD574 \uBC18\uC0AC
-Swords.Effect.2=\uD1B1\uB0A0 \uACF5\uACA9 (\uB2A5\uB825)
-Swords.Effect.3=\uD53C\uD574 {0} \uC99D\uAC00, \uCD9C\uD608 \uC99D\uAC00
+Swords.SubSkill.CounterAttack.Name=\uCE74\uC6B4\uD130 \uC5B4\uD0DD
+Swords.SubSkill.CounterAttack.Description={0} \uD53C\uD574 \uBC18\uC0AC
+Swords.SubSkill.SerratedStrikes.Name=\uD1B1\uB0A0 \uACF5\uACA9 (\uB2A5\uB825)
+Swords.SubSkill.SerratedStrikes.Description=\uD53C\uD574 {0} \uC99D\uAC00, \uCD9C\uD608 \uC99D\uAC00
 Swords.Effect.4=\uD1B1\uB0A0 \uACF5\uACA9 \uCD9C\uD608 \uC99D\uAC00
 Swords.Effect.5={0} \uD2F1 \uCD9C\uD608
-Swords.Effect.6=\uCD9C\uD608
-Swords.Effect.7=\uACFC\uB2E4 \uCD9C\uD608
+Swords.SubSkill.Bleed.Name=\uCD9C\uD608
+Swords.SubSkill.Bleed.Description=\uACFC\uB2E4 \uCD9C\uD608
 Swords.Listener=\uAC80\uC220(SWORDS):
 Swords.SkillName=\uAC80\uC220
 Swords.Skills.SS.Off=[[RED]]**\uD1B1\uB0A0 \uACF5\uACA9 \uBC1C\uB3D9 \uD574\uC81C**
@@ -334,27 +334,27 @@ Taming.Ability.Locked.3={0}\uB808\uBCA8 \uB54C \uC2A4\uD0AC\uD574\uC81C (\uB0A0\
 Taming.Ability.Locked.4={0}\uB808\uBCA8 \uB54C \uC2A4\uD0AC\uD574\uC81C (\uBE60\uB978 \uC74C\uC2DD \uC81C\uACF5)
 Taming.Ability.Locked.5={0}\uB808\uBCA8 \uB54C \uC2A4\uD0AC\uD574\uC81C (\uC2E0\uC131\uD55C \uC0AC\uB0E5\uAC1C)
 Taming.Combat.Chance.Gore=[[RED]]\uB3CC\uC9C4 \uD655\uB960: [[YELLOW]]{0}
-Taming.Effect.0=\uC9D0\uC2B9\uC758 \uD3EC\uD6A8
-Taming.Effect.1=\uBF08\uB85C \uB291\uB300/\uC624\uC140\uB86F \uAC80\uC0AC
-Taming.Effect.10=\uCDA9\uACA9 \uC99D\uBA85
-Taming.Effect.11=\uD3ED\uBC1C \uD53C\uD574 \uC808\uAC10
-Taming.Effect.12=\uC9D0\uC2B9\uC758 \uD3EC\uD6A8
-Taming.Effect.13=\uC606\uC5D0 \uB3D9\uBB3C \uC18C\uD658
-Taming.Effect.14=[[GRAY]]COTW (\uC624\uC140\uB86F): \uCB48\uADF8\uB9AC\uBA74\uC11C \uBB3C\uACE0\uAE30\uB97C \uB4E4\uACE0 {0}\uBC88 \uC88C \uD074\uB9AD
+Taming.SubSkill.BeastLore.Name=\uC9D0\uC2B9\uC758 \uD3EC\uD6A8
+Taming.SubSkill.BeastLore.Description=\uBF08\uB85C \uB291\uB300/\uC624\uC140\uB86F \uAC80\uC0AC
+Taming.SubSkill.ShockProof.Name=\uCDA9\uACA9 \uC99D\uBA85
+Taming.SubSkill.ShockProof.Description=\uD3ED\uBC1C \uD53C\uD574 \uC808\uAC10
+Taming.SubSkill.CallOfTheWild.Name=\uC9D0\uC2B9\uC758 \uD3EC\uD6A8
+Taming.SubSkill.CallOfTheWild.Description=\uC606\uC5D0 \uB3D9\uBB3C \uC18C\uD658
+Taming.SubSkill.CallOfTheWild.Description.2=[[GRAY]]COTW (\uC624\uC140\uB86F): \uCB48\uADF8\uB9AC\uBA74\uC11C \uBB3C\uACE0\uAE30\uB97C \uB4E4\uACE0 {0}\uBC88 \uC88C \uD074\uB9AD
 Taming.Effect.15=[[GRAY]]COTW (\uB291\uB300): \uCB48\uADF8\uB9AC\uBA74\uC11C \uBF08\uB97C \uB4E4\uACE0 {0}\uBC88 \uC88C \uD074\uB9AD
-Taming.Effect.20=[[GRAY]]COTW (\uB9D0): \uCB48\uADF8\uB9AC\uBA74\uC11C \uC0AC\uACFC\uB97C \uB4E4\uACE0 {0}\uBC88 \uC88C \uD074\uB9AD
-Taming.Effect.16=\uBE60\uB978 \uC74C\uC2DD \uC81C\uACF5
-Taming.Effect.17=\uACF5\uACA9\uC2DC \uCE58\uB8CC \uAE30\uD68C
-Taming.Effect.18=\uC2E0\uC131\uD55C \uC0AC\uB0E5\uAC1C
-Taming.Effect.19=\uB9C8\uBC95 & \uB3C5 \uD53C\uD574 \uCE58\uB8CC
-Taming.Effect.2=\uB3CC\uC9C4
-Taming.Effect.3=\uD06C\uB9AC\uD2F0\uCEEC \uC2A4\uD06C\uB77C\uC774\uD06C \uCD9C\uD608 \uC801\uC6A9
-Taming.Effect.4=\uB0A0\uCE74\uB85C\uC6B4 \uBC1C\uD1B1
-Taming.Effect.5=\uCD94\uAC00 \uD53C\uD574
-Taming.Effect.6=\uD658\uACBD \uC778\uC2DD
-Taming.Effect.7=\uC120\uC778\uC7A5/\uC6A9\uC554 \uACF5\uD3EC\uC99D, \uB099\uC0AC \uD53C\uD574 \uAC10\uC18C
-Taming.Effect.8=\uB450\uAEBC\uC6B4 \uD138
-Taming.Effect.9=\uD53C\uD574 \uAC10\uC18C, \uB0B4\uD654\uC131(\uBD88\uC800\uD56D\uB825)
+Taming.SubSkill.Gore.Name0=[[GRAY]]COTW (\uB9D0): \uCB48\uADF8\uB9AC\uBA74\uC11C \uC0AC\uACFC\uB97C \uB4E4\uACE0 {0}\uBC88 \uC88C \uD074\uB9AD
+Taming.SubSkill.FastFoodService.Name=\uBE60\uB978 \uC74C\uC2DD \uC81C\uACF5
+Taming.SubSkill.FastFoodService.Description=\uACF5\uACA9\uC2DC \uCE58\uB8CC \uAE30\uD68C
+Taming.SubSkill.HolyHound.Name=\uC2E0\uC131\uD55C \uC0AC\uB0E5\uAC1C
+Taming.SubSkill.HolyHound.Description=\uB9C8\uBC95 & \uB3C5 \uD53C\uD574 \uCE58\uB8CC
+Taming.SubSkill.Gore.Name=\uB3CC\uC9C4
+Taming.SubSkill.Gore.Description=\uD06C\uB9AC\uD2F0\uCEEC \uC2A4\uD06C\uB77C\uC774\uD06C \uCD9C\uD608 \uC801\uC6A9
+Taming.SubSkill.SharpenedClaws.Name=\uB0A0\uCE74\uB85C\uC6B4 \uBC1C\uD1B1
+Taming.SubSkill.SharpenedClaws.Description=\uCD94\uAC00 \uD53C\uD574
+Taming.SubSkill.EnvironmentallyAware.Name=\uD658\uACBD \uC778\uC2DD
+Taming.SubSkill.EnvironmentallyAware.Description=\uC120\uC778\uC7A5/\uC6A9\uC554 \uACF5\uD3EC\uC99D, \uB099\uC0AC \uD53C\uD574 \uAC10\uC18C
+Taming.SubSkill.ThickFur.Name=\uB450\uAEBC\uC6B4 \uD138
+Taming.SubSkill.ThickFur.Description=\uD53C\uD574 \uAC10\uC18C, \uB0B4\uD654\uC131(\uBD88\uC800\uD56D\uB825)
 Taming.Listener.Wolf=[[DARK_GRAY]]\uB291\uB300\uAC00 \uB2F9\uC2E0\uC5D0\uAC8C \uB418\uB3CC\uC544\uAC10...
 Taming.Listener=\uC870\uB828(TAMING):
 Taming.SkillName=\uC870\uB828
@@ -376,16 +376,16 @@ Unarmed.Ability.IronGrip.Attacker=[[RED]]\uC0C1\uB300\uB294 \uAC15\uCCA0 \uC8FC\
 Unarmed.Ability.IronGrip.Defender=[[GREEN]]\uAC15\uCCA0 \uC8FC\uBA39\uC758 \uBE44\uBB34\uC7A5\uC744 \uC77C\uC2DC\uC801\uC73C\uB85C \uBC29\uC5B4\uD588\uC2B5\uB2C8\uB2E4!
 Unarmed.Ability.Lower=[[GRAY]]**\uC190 \uC900\uBE44 \uD574\uC81C**
 Unarmed.Ability.Ready=[[GREEN]]**\uC190 \uC900\uBE44 \uC644\uB8CC**
-Unarmed.Effect.0=\uBC84\uC11C\uCEE4 (\uB2A5\uB825)
-Unarmed.Effect.1=+50% \uD53C\uD574, \uC57D\uD55C \uAD11\uBB3C\uB4E4\uC744 \uBD80\uC228
-Unarmed.Effect.2=\uBE44\uBB34\uC7A5 (\uD50C\uB808\uC774\uC5B4)
-Unarmed.Effect.3=\uC801\uC774 \uB4E4\uACE0\uC788\uB294 \uC544\uC774\uD15C \uB4DC\uB86D
-Unarmed.Effect.4=\uAC15\uCCA0 \uD314 \uD615\uD0DC
-Unarmed.Effect.5=\uACAC\uACE0\uD574\uC9C0\uB294 \uD314
-Unarmed.Effect.6=\uD654\uC0B4 \uD68C\uD53C
-Unarmed.Effect.7=\uD68C\uD53C \uD654\uC0B4
-Unarmed.Effect.8=\uC544\uC774\uC5B8 \uADF8\uB9BD
-Unarmed.Effect.9=\uBE44\uBB34\uC7A5 \uC0C1\uD0DC \uBC29\uC9C0
+Unarmed.SubSkill.Berserk.Name=\uBC84\uC11C\uCEE4 (\uB2A5\uB825)
+Unarmed.SubSkill.Berserk.Description=+50% \uD53C\uD574, \uC57D\uD55C \uAD11\uBB3C\uB4E4\uC744 \uBD80\uC228
+Unarmed.SubSkill.Disarm.Name=\uBE44\uBB34\uC7A5 (\uD50C\uB808\uC774\uC5B4)
+Unarmed.SubSkill.Disarm.Description=\uC801\uC774 \uB4E4\uACE0\uC788\uB294 \uC544\uC774\uD15C \uB4DC\uB86D
+Unarmed.SubSkill.IronArmStyle.Name=\uAC15\uCCA0 \uD314 \uD615\uD0DC
+Unarmed.SubSkill.IronArmStyle.Description=\uACAC\uACE0\uD574\uC9C0\uB294 \uD314
+Unarmed.SubSkill.ArrowDeflect.Name=\uD654\uC0B4 \uD68C\uD53C
+Unarmed.SubSkill.ArrowDeflect.Description=\uD68C\uD53C \uD654\uC0B4
+Unarmed.SubSkill.IronGrip.Name=\uC544\uC774\uC5B8 \uADF8\uB9BD
+Unarmed.SubSkill.IronGrip.Description=\uBE44\uBB34\uC7A5 \uC0C1\uD0DC \uBC29\uC9C0
 Unarmed.Listener=\uBE44\uBB34\uC7A5(UNARMED):
 Unarmed.SkillName=\uBE44\uBB34\uC7A5
 Unarmed.Skills.Berserk.Off=[[RED]]**\uBC84\uC11C\uCEE4 \uBC1C\uB3D9 \uD574\uC81C**
@@ -401,12 +401,12 @@ Woodcutting.Ability.1=\uB098\uBB47\uC78E \uCCAD\uC18C
 Woodcutting.Ability.Chance.DDrop=[[RED]]\uB4DC\uB86D 2\uBC30 \uD655\uB960: [[YELLOW]]{0}
 Woodcutting.Ability.Length=[[RED]]\uB098\uBB34\uAFBC \uC9C0\uC18D\uC2DC\uAC04: [[YELLOW]]{0}\uCD08
 Woodcutting.Ability.Locked.0={0}\uB808\uBCA8 \uB54C \uC2A4\uD0AC\uC774 \uD574\uC81C\uB429\uB2C8\uB2E4 (\uB098\uBB47\uC78E \uBC14\uB78C)
-Woodcutting.Effect.0=\uB098\uBB34\uAFBC (\uB2A5\uB825)
-Woodcutting.Effect.1=\uB098\uBB34 \uD3ED\uBC1C\uC2DC\uD0A4\uAE30
-Woodcutting.Effect.2=\uB098\uBB47\uC78E \uB5A8\uC5B4\uD2B8\uB9AC\uAE30
-Woodcutting.Effect.3=\uB098\uBB47\uC78E \uCCAD\uC18C
-Woodcutting.Effect.4=\uB4DC\uB86D 2\uBC30
-Woodcutting.Effect.5=\uD56D\uC0C1 \uB4DC\uB86D 2\uBC30
+Woodcutting.SubSkill.TreeFeller.Name=\uB098\uBB34\uAFBC (\uB2A5\uB825)
+Woodcutting.SubSkill.TreeFeller.Description=\uB098\uBB34 \uD3ED\uBC1C\uC2DC\uD0A4\uAE30
+Woodcutting.SubSkill.LeafBlower.Name=\uB098\uBB47\uC78E \uB5A8\uC5B4\uD2B8\uB9AC\uAE30
+Woodcutting.SubSkill.LeafBlower.Description=\uB098\uBB47\uC78E \uCCAD\uC18C
+Woodcutting.SubSkill.HarvestLumber.Name=\uB4DC\uB86D 2\uBC30
+Woodcutting.SubSkill.HarvestLumber.Description=\uD56D\uC0C1 \uB4DC\uB86D 2\uBC30
 Woodcutting.Listener=\uBC8C\uBAA9(WOODCUTTING):
 Woodcutting.SkillName=\uBC8C\uBAA9
 Woodcutting.Skills.TreeFeller.Off=[[RED]]**\uB098\uBB34\uAFBC \uBC1C\uB3D9 \uD574\uC81C**

src/main/resources/locale/locale_lt.properties

@@ -1,16 +0,0 @@
-Acrobatics.Combat.Proc=[[GREEN]]**I\u0161vengta**
-Acrobatics.SkillName=AKROBATIKA
-Acrobatics.Skillup=[[YELLOW]]Akrobatiko \u012fg\u016bdis pakilo {0}. Bendras ({1})
-Excavation.SkillName=KASIN\u0116JIMAS
-Herbalism.Listener=\u017dOLININKYST\u0116
-Mining.Ability.Ready=[[GREEN]]**TU PARUOSEI SAVO KIRTIKLI**
-Mining.Skillup=[[YELLOW]]Kasinejimo igudis pakilo {0}. Bendras ({1})
-Mining.Blast.Refresh=[[GREEN]]Tavo [[YELLOW]]Sprogimo kasimo [[GREEN]]sugeb\u0117jimas atsinaujino!
-Repair.Arcane.Fail=[[RED]]Papildomi u\u017epurimai, visam laikui paliko \u0161\u012f daigt\u0105.
-Swords.Combat.Bleeding.Stopped=[[GRAY]]Kraujavimas [[GREEN]]sustojo[[GRAY]]!
-Commands.Party.Kick=[[RED]]Tu buvai i\u0161mestas i\u0161 grup\u0117s {0}!
-Party.Unlocked=[[GRAY]]Grupe yra atrakinta
-Commands.XPGain.Mining=Kasti Akmen\u012f ir r\u016bd\u0105
-Commands.XPGain.Taming=Gyvunu prijaukinimas arba kova su savo vilkais
-Commands.XPGain=[[DARK_GRAY]]PATIRTIES GAUTA: [[WHITE]]{0}
-Stats.Header.Combat=[[GOLD]]-=KOVOS IGUDZIAI=-

src/main/resources/locale/locale_lv.properties

@@ -1,56 +0,0 @@
-Acrobatics.Combat.Proc=[[GREEN]]**TRIKS**
-Acrobatics.SkillName=AKROB\u0100TIKA
-Axes.Ability.Bonus.1=Bonus {0} boj\u0101jumi
-Axes.Combat.CritChance=[[RED]]Iesp\u0113ja kritiskajam uzbrukumam: [[YELLOW]]{0}%
-Axes.Skills.SS.On=[[GREEN]]**Galvaskausu \u0161\u0137\u0113l\u0113js AKTIVIZ\u0112TS**
-Axes.Skills.SS.Refresh=[[GREEN]]Tava [[YELLOW]]Galvaskausu \u0160\u0137\u0113l\u0101ja [[GREEN]]sp\u0113ja ir atjaunota!
-Axes.Skillup=[[YELLOW]]Cirt\u0113ja prasme palielin\u0101j\u0101s par {0}. Kopum\u0101 ({1})
-Excavation.SkillName=EKSKAV\u0100CIJA
-Fishing.Listener=Zvejo\u0161ana:
-Herbalism.Listener=D\u0101rzniec\u012bba:
-Mining.Ability.Ready=[[GREEN]]**TU SAGATAVOJI SAVU CIRTNI**
-Mining.Listener=Rak\u0161anas:
-Mining.Skillup=[[TELLOW]]Rak\u0161anas prasme palielin\u0101j\u0101s par {0}. Kopum\u0101 ({1})
-Repair.Effect.0=Salabot
-Repair.Effect.9=Salabot ma\u0123iskos priek\u0161metus
-Repair.Listener=Salabot:
-Repair.SkillName=SALABOT
-Repair.Skills.FeltEasy=[[GRAY]]Tas lik\u0101s viegli.
-Repair.Arcane.Fail=[[RED]]Mistisk\u0101 ener\u0123ija pameta lietu
-Swords.Combat.Bleeding.Stopped=[[GRAY]]Tu  [[GREEN]]beidzi[[GRAY]] asi\u0146ot!
-Swords.Combat.SS.Struck=[[DARK_RED]]Skarts no SERRATED STRIKES!
-Swords.Effect.0=Pretsitiens
-Swords.Skills.SS.Other.Off=[[RED]]Serrated Stikes[[GREEN]]sp\u0113ja beidz\u0101s sp\u0113l\u0113t\u0101jam [[YELLOW]]{0}
-Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] izmantoja [[RED]]Serrated Strikes
-Taming.Ability.Bonus.8=\u0100tro \u0112dienu Pakalpojumi
-Taming.Effect.16=\u0100tro \u0112dienu Pakalpojumi
-Unarmed.Effect.2=Atbru\u0146ot(Sp\u0113l\u0113t\u0101ju)
-Unarmed.Listener=Atbru\u0146ots:
-Unarmed.SkillName=NEAPBRU\u0145OTS
-Woodcutting.Skills.TreeFeller.Refresh=[[GREEN]]Tavas[[YELLOW]]Koka G\u0101z\u0113ja [[GREEN]]prasmes atjaunotas!
-Woodcutting.Skills.TreeFeller.Threshold=[[RED]]Tas koks ir par lielu!
-Ability.Generic.Template.Lock=[[GRAY]]{0}
-Combat.BeastLoreHealth=[[DARK_AQUA]]DZ\u012aV\u012aBA ([[GREEN]]{0}[[DARK_AQUA]]/{1})
-Combat.TouchedFuzzy=[[DARK_RED]]Piek\u0101ries pl\u016bdu\u0161am. Apdulli.
-Commands.AdminChat.Off=Tikai Adminu \u010dats [[RED]]Izsl\u0113gt
-Commands.AdminToggle=[[RED]]- Tikai administratoru \u010dats
-Commands.Disabled=[[RED]]\u0160\u012b komanda ir atsl\u0113gta
-Commands.Party.Invite.Accepted=[[GREEN]]Iel\u016bgums Apstiprin\u0101ts. Tu pievienojies PARTY\'am {0}
-Commands.NoConsole=\u0160\u012b komanda neatbalsta konsules izmanto\u0161anu.
-Commands.Party.Invite.0=[[RED]]BR\u012aDIN\u0100JUMS: [[GREEN]]Tu sa\u0146\u0113mi PARTY uzaicin\u0101jumu uz {0} no {1}
-Commands.Party.Kick=[[RED]]Tu tiki izmests no PARTY {0}!
-Commands.Party.Leave=[[RED]]Tu pameti PARTY
-Commands.Stats.Self=TAVI STATI
-mcMMO.NoPermission=[[DARK_RED]]Nepietiekama at\u013cauja.
-Party.Teleport.Target=[[GREEN]]{0} teleport\u0113j\u0101s pie tevis.
-Party.Unlocked=[[GRAY]] Party tika atv\u0113rts
-Commands.XPGain.Fishing=Mak\u0161\u0137er\u0113\u0161ana (Ej izdom\u0101!)
-Commands.XPGain.Mining=Rokot Akmeni & R\u016bdu
-Commands.XPGain.Swords=Uzbr\u016bkot briesmo\u0146iem
-Commands.XPGain.Taming=Dz\u012bvnieku pieradin\u0101\u0161ana vai prasme w/ tavi su\u0146i
-Commands.XPGain=[[DARK_GRAY]]XP GUVUMS: [[WHITE]]{0}
-Effects.Effects=EFEKTI
-Item.ChimaeraWing.Pass=**CHIMAERA SP\u0100RNI**
-Skills.Disarmed=[[DARK_RED]]Tevi ir atbru\u0146oju\u0161i!
-Stats.Header.Combat=[[GOLD]]-=KARA PRASMES=-
-Stats.Own.Stats=[[GREEN]][mcMMO] Statistika

src/main/resources/locale/locale_nl.properties

@@ -1,20 +1,20 @@
 Acrobatics.Ability.Proc=[[GREEN]]**VeiligeLanding**
 Acrobatics.Combat.Proc=[[GREEN]]**Ontweken**
 Acrobatics.DodgeChance=[[RED]]Ontwijk Kans: [[YELLOW]]{0}
-Acrobatics.Effect.0=Rollen
-Acrobatics.Effect.2=Veilige Roll
-Acrobatics.Effect.4=Ontwijken
+Acrobatics.SubSkill.Roll.Name=Rollen
+Acrobatics.SubSkill.GracefulRoll.Name=Veilige Roll
+Acrobatics.SubSkill.Dodge.Name=Ontwijken
 Acrobatics.Listener=Acrobatiek
 Acrobatics.Roll.Chance=[[RED]]Rol Kans: [[YELLOW]]{0}
 Acrobatics.Roll.GraceChance=[[RED]]Elegante Rol Kans: [[YELLOW]]{0}
 Acrobatics.Roll.Text=**Gerold**
 Acrobatics.SkillName=ACROBATIEK
 Acrobatics.Skillup=[[YELLOW]]Acrobatiek toegenomen met {0}. Totaal ({1})
-Archery.Effect.0=Ervaringsschot
-Archery.Effect.1=Neemt de schade van bogen toe
-Archery.Effect.2=Verdoven (Spelers)
-Archery.Effect.3=Verward tegenstanders en doet {0} schade
-Archery.Effect.5=Kans om pijlen te krijgen van lijken
+Archery.SubSkill.SkillShot.Name=Ervaringsschot
+Archery.SubSkill.SkillShot.Description=Neemt de schade van bogen toe
+Archery.SubSkill.Daze.Name=Verdoven (Spelers)
+Archery.SubSkill.Daze.Description=Verward tegenstanders en doet {0} schade
+Archery.SubSkill.ArrowRetrieval.Description=Kans om pijlen te krijgen van lijken
 Archery.Listener=Boogschieten:
 Archery.SkillName=BOOGSCHIETEN
 Archery.Skillup=[[YELLOW]] Boogschieten ervaring toegenomen met {0}. Totaal ({1})
@@ -28,15 +28,15 @@ Axes.Combat.CriticalHit=[[RED]]Kritische Klap
 Axes.Combat.GI.Proc=[[GREEN]] ** GESLAGEN MET GROTE KRACHT **
 Axes.Combat.GI.Struck=[[RED]]**GETROFFEN MET MEER SCHADE**
 Axes.Combat.SS.Length=[[RED]]Schedel Splijter Lengte: [[YELLOW]]{0}s
-Axes.Effect.0=Schedel Splijter
-Axes.Effect.1=Veroorzaak AoE Schade
-Axes.Effect.2=Kritieke Slag
-Axes.Effect.3=Verdubbelde Schade
-Axes.Effect.4=Bijl Meesterschap
-Axes.Effect.5=Voegt DMG bonus toe
-Axes.Effect.7=Slag met genoeg kracht om armor te verbrijzelen
-Axes.Effect.8=Grotere impact
-Axes.Effect.9=Deal bonus schade aan unarmored vijanden
+Axes.SubSkill.SkullSplitter.Name=Schedel Splijter
+Axes.SubSkill.SkullSplitter.Description=Veroorzaak AoE Schade
+Axes.SubSkill.CriticalStrikes.Name=Kritieke Slag
+Axes.SubSkill.CriticalStrikes.Description=Verdubbelde Schade
+Axes.SubSkill.AxeMastery.Name=Bijl Meesterschap
+Axes.SubSkill.AxeMastery.Description=Voegt DMG bonus toe
+Axes.SubSkill.ArmorImpact.Description=Slag met genoeg kracht om armor te verbrijzelen
+Axes.SubSkill.GreaterImpact.Name=Grotere impact
+Axes.SubSkill.GreaterImpact.Description=Deal bonus schade aan unarmored vijanden
 Axes.Listener=Bijlen
 Axes.SkillName=BIJLEN
 Axes.Skills.SS.Off=[[RED]] ** Skull Splitter is uitgewerkt **
@@ -47,10 +47,10 @@ Axes.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] heeft [[RED]]Schedel Splijter
 Axes.Skillup=[[YELLOW]]Bijl ervaring toegenomen met {0}. Totaal ({1})
 Excavation.Ability.Lower=[[GRAY]]**JE STOP JE SCHEP WEER WEG**
 Excavation.Ability.Ready=[[GREEN]]**JE HOUDT JE SCHEP GEREED**
-Excavation.Effect.0=Giga Drill Breker
-Excavation.Effect.1=3x Drop Rate, 3x EXP, +Speed
-Excavation.Effect.2=Schatten Jager
-Excavation.Effect.3=Mogelijkheid om  te graven naar schatten
+Excavation.SubSkill.GigaDrillBreaker.Name=Giga Drill Breker
+Excavation.SubSkill.GigaDrillBreaker.Description=3x Drop Rate, 3x EXP, +Speed
+Excavation.SubSkill.TreasureHunter.Name=Schatten Jager
+Excavation.SubSkill.TreasureHunter.Description=Mogelijkheid om  te graven naar schatten
 Excavation.Listener=Uitgraving:
 Excavation.SkillName=Uitgraving
 Excavation.Skills.GigaDrillBreaker.Off=[[RED]] ** Giga Drill Breeker is uitgewerkt **
@@ -62,18 +62,18 @@ Excavation.Skillup=[[YELLOW]]Uitgravings ervaring toegenomen met {0}. Totaal ({1
 Fishing.Ability.Info=[[RED]]Magische Jager: [[GRAY]] ** verbetert bij Treasure Hunter Rank **
 Fishing.Ability.Shake=[[RED]]Schud Kans: [[YELLOW]]{0}
 Fishing.Ability.IceFishing=[[RED]] Ice Vissen: Ga vissen in ijs
-Fishing.Effect.0=Schatten Jager (Passief)
-Fishing.Effect.1=Vis misc. objecten op
-Fishing.Effect.2=Magische Jager
-Fishing.Effect.3=Vind Enchanted Spullen
-Fishing.Effect.4=Schudden (vs. Wezens)
-Fishing.Effect.5=Schud items af van mobs w/ hengel
-Fishing.Effect.6=Visserman\'s dieet
-Fishing.Effect.7=Verbetert de honger hersteld vanaf geviste voedingsmiddelen
-Fishing.Effect.8=Meester Hengelaar
-Fishing.Effect.9=Verbetert de kans op het bijten tijdens het vissen
-Fishing.Effect.10=Ijs Vissen
-Fishing.Effect.11=Stelt je in staat om te vissen in de ijzige biomen
+Fishing.SubSkill.TreasureHunter.Name=Schatten Jager (Passief)
+Fishing.SubSkill.TreasureHunter.Description=Vis misc. objecten op
+Fishing.SubSkill.MagicHunter.Name=Magische Jager
+Fishing.SubSkill.MagicHunter.Description=Vind Enchanted Spullen
+Fishing.SubSkill.Shake.Name=Schudden (vs. Wezens)
+Fishing.SubSkill.Shake.Description=Schud items af van mobs w/ hengel
+Fishing.SubSkill.FishermansDiet.Name=Visserman\'s dieet
+Fishing.SubSkill.FishermansDiet.Description=Verbetert de honger hersteld vanaf geviste voedingsmiddelen
+Fishing.SubSkill.MasterAngler.Name=Meester Hengelaar
+Fishing.SubSkill.MasterAngler.Description=Verbetert de kans op het bijten tijdens het vissen
+Fishing.SubSkill.IceFishing.Name=Ijs Vissen
+Fishing.SubSkill.IceFishing.Description=Stelt je in staat om te vissen in de ijzige biomen
 Fishing.Chance.Raining=[[BLUE]] Regen Bonus
 Fishing.Listener=Vissen:
 Fishing.Ability.TH.MagicFound=[[GRAY]]Jij voelt een vleugje magie met deze vangst...
@@ -82,14 +82,14 @@ Herbalism.Ability.FD=[[RED]]Boeren Dieet: [[YELLOW]]Rank {0}
 Herbalism.Ability.GTh=[[GREEN]]**GROEN DUIMPJE**
 Herbalism.Ability.Lower=[[GRAY]]**JE STOP JE ZEIS WEER WEG**
 Herbalism.Ability.Ready=[[GREEN]]**JE HOUDT JE ZEIS GEREED**
-Herbalism.Effect.2=Groene Duim (Graan)
-Herbalism.Effect.5=Maak stenen bemost, of laat gras groeien
-Herbalism.Effect.6=Boeren dieet
-Herbalism.Effect.7=Verbetert de honger herstel van gekweekte voedingsmiddelen
-Herbalism.Effect.8=Dubbele drops (Alle Kruiden)
-Herbalism.Effect.9=Het dubbele van de normale buit
-Herbalism.Effect.10=Hylian Geluk
-Herbalism.Effect.11=Geeft een kleine kans om zeldzame voorwerpen te vinden
+Herbalism.SubSkill.GreenThumb.Name=Groene Duim (Graan)
+Herbalism.SubSkill.GreenThumb.Description.2=Maak stenen bemost, of laat gras groeien
+Herbalism.SubSkill.FarmersDiet.Name=Boeren dieet
+Herbalism.SubSkill.FarmersDiet.Description=Verbetert de honger herstel van gekweekte voedingsmiddelen
+Herbalism.SubSkill.DoubleDrops.Name=Dubbele drops (Alle Kruiden)
+Herbalism.SubSkill.DoubleDrops.Description=Het dubbele van de normale buit
+Herbalism.SubSkill.HylianLuck.Name=Hylian Geluk
+Herbalism.SubSkill.HylianLuck.Description=Geeft een kleine kans om zeldzame voorwerpen te vinden
 Herbalism.Listener=Kruidenkunde:
 Herbalism.SkillName=Kruidenkunde
 Herbalism.Skills.GTe.On=[[GREEN]]**GREEN TERRA GEACTIVEERD**
@@ -99,13 +99,13 @@ Herbalism.Skills.GTe.Other.On=[[GREEN]]{0}[[DARK_GREEN]]heeft[[RED]]Groene Aarde
 Mining.Ability.Length=[[RED]]Super BrekerLengte: [[YELLOW]]{0}s
 Mining.Ability.Lower=[[GREEN]]**JE STOP JE PIKHOUWEL WEER WEG *
 Mining.Ability.Ready=[[GREEN]]**JE HOUDT JE PIKHOUWEEL GEREED**
-Mining.Effect.2=Dubbele Drops
-Mining.Effect.3=Het dubbele van de normale buit
-Mining.Effect.4=Explosie Mining
-Mining.Effect.5=Bonussen voor het minen met TNT
-Mining.Effect.6=Grotere bommen
-Mining.Effect.7=Verhoogt TNT explosie radius
-Mining.Effect.9=Vermindert schade door TNT explosies
+Mining.SubSkill.DoubleDrops.Name=Dubbele Drops
+Mining.SubSkill.DoubleDrops.Description=Het dubbele van de normale buit
+Mining.SubSkill.BlastMining.Name=Explosie Mining
+Mining.SubSkill.BlastMining.Description=Bonussen voor het minen met TNT
+Mining.SubSkill.BiggerBombs.Name=Grotere bommen
+Mining.SubSkill.BiggerBombs.Description=Verhoogt TNT explosie radius
+Mining.SubSkill.DemolitionsExpertise.Description=Vermindert schade door TNT explosies
 Mining.Listener=Mijnbouw:
 Mining.SkillName=MIJNBOUW
 Mining.Skills.SuperBreaker.Off=[[RED]] ** Super Breaker is uitgewerkt **
@@ -117,22 +117,22 @@ Mining.Blast.Radius.Increase=[[RED]] Ontploffings Radius Verhoging: [[YELLOW]] {
 Mining.Blast.Rank=[[RED]]Explosie Mining: [[YELLOW]] Rang {0}/8 [[GRAY]]({1})
 Mining.Blast.Other.On=[[GREEN]]{0}[[DARK_GREEN]] heeft [[RED]] Blast Mining![DARK_GREEN] gebruikt
 Mining.Blast.Refresh=[[GREEN]]Je [[YELLOW]]explosie mijn [[GREEN]]kracht is hersteld!
-Repair.Effect.0=Repareren
-Repair.Effect.1=Repareer Diamanten Gereedschap & Wapenuitrusting
-Repair.Effect.10=Goud Repareren ({0}+ SKILL)
-Repair.Effect.11=Repareer Goude Gereedschap & Wapenuitrusting
-Repair.Effect.12=Ijzer Repareren ({0}+ SKILL)
-Repair.Effect.13=Repareer Ijzere Gereedschap & Wapenuitrusting
-Repair.Effect.14=Stenen Repareren ({0}+ SKILL)
-Repair.Effect.15=Repareer Stenen Gereedschap & Wapenuitrusting
-Repair.Effect.2=Reparatie Meesterschap
-Repair.Effect.3=Toegenomen reparatie aantal
-Repair.Effect.4=Super Reparatie
-Repair.Effect.5=Verdubbelde effectiefheid
-Repair.Effect.6=Diamanten Reparatie ({0}+ SKILL)
-Repair.Effect.7=Repareer Diamanten Gereedschap & Wapenuitrusting
-Repair.Effect.8=Arcane Smeden
-Repair.Effect.9=Magische voorwerpen repareren
+Repair.SubSkill.Repair.Name=Repareren
+Repair.SubSkill.Repair.Description=Repareer Diamanten Gereedschap & Wapenuitrusting
+Repair.SubSkill.GoldRepair.Name=Goud Repareren ({0}+ SKILL)
+Repair.SubSkill.GoldRepair.Description=Repareer Goude Gereedschap & Wapenuitrusting
+Repair.SubSkill.IronRepair.Name=Ijzer Repareren ({0}+ SKILL)
+Repair.SubSkill.IronRepair.Description=Repareer Ijzere Gereedschap & Wapenuitrusting
+Repair.SubSkill.StoneRepair.Name=Stenen Repareren ({0}+ SKILL)
+Repair.SubSkill.StoneRepair.Description=Repareer Stenen Gereedschap & Wapenuitrusting
+Repair.SubSkill.RepairMastery.Name=Reparatie Meesterschap
+Repair.SubSkill.RepairMastery.Description=Toegenomen reparatie aantal
+Repair.SubSkill.SuperRepair.Name=Super Reparatie
+Repair.SubSkill.SuperRepair.Description=Verdubbelde effectiefheid
+Repair.SubSkill.DiamondRepair.Name=Diamanten Reparatie ({0}+ SKILL)
+Repair.SubSkill.DiamondRepair.Description=Repareer Diamanten Gereedschap & Wapenuitrusting
+Repair.SubSkill.ArcaneForging.Name=Arcane Smeden
+Repair.SubSkill.ArcaneForging.Description=Magische voorwerpen repareren
 Repair.Listener.Anvil=[[DARK.RED]]Je hebt een aambeeld geplaatst, met een aambeeld kun je je gereedschappen en pantser mee repareren
 Repair.Listener=Repareer:
 Repair.SkillName=REPAREER
@@ -157,12 +157,12 @@ Swords.Combat.Bleeding=[[GREEN]]**VIJAND BLOED**
 Swords.Combat.Counter.Hit=[[DARK_RED]]Geraakt door een tegenaanval
 Swords.Combat.Countered=[[GREEN]]**TEGEN-AANVAL**
 Swords.Combat.SS.Struck=[[DARK_RED]]Geraakt door GEKARTELDE SLAG!
-Swords.Effect.0=Tegenaanval
-Swords.Effect.2=Gekartelde Slag (Vermogen)
-Swords.Effect.3={0} DMG AoE, Bloeden+ AoE
+Swords.SubSkill.CounterAttack.Name=Tegenaanval
+Swords.SubSkill.SerratedStrikes.Name=Gekartelde Slag (Vermogen)
+Swords.SubSkill.SerratedStrikes.Description={0} DMG AoE, Bloeden+ AoE
 Swords.Effect.4=Gekartelde Slag Bloed+
 Swords.Effect.5={0} Tick Bloeden
-Swords.Effect.6=Bloeden
+Swords.SubSkill.Bleed.Name=Bloeden
 Swords.Listener=Zwaarden:
 Swords.SkillName=ZWAARDEN
 Swords.Skills.SS.Off=[[RED]]**Serrated Strikes is uitgewerkt**
@@ -179,19 +179,19 @@ Taming.Ability.Bonus.4=Schok Proef
 Taming.Ability.Bonus.6=Geslepen Klauwen
 Taming.Ability.Bonus.7=+{0} Schade
 Taming.Ability.Bonus.8=Snel Eten Service
-Taming.Effect.10=Schokbestendig
-Taming.Effect.11=Explosieve Schade Verkleining
-Taming.Effect.12=Roep van het WIld
-Taming.Effect.13=Roep een dier aan je zijde op
-Taming.Effect.14=[[GRAY]]COTW (Ocelot): Buk en linkermuisknop met {0} Vis in je hand
+Taming.SubSkill.ShockProof.Name=Schokbestendig
+Taming.SubSkill.ShockProof.Description=Explosieve Schade Verkleining
+Taming.SubSkill.CallOfTheWild.Name=Roep van het WIld
+Taming.SubSkill.CallOfTheWild.Description=Roep een dier aan je zijde op
+Taming.SubSkill.CallOfTheWild.Description.2=[[GRAY]]COTW (Ocelot): Buk en linkermuisknop met {0} Vis in je hand
 Taming.Effect.15=[[GRAY]]COTW (Wolf): Buk en linkermuisknop met {0} Botten in je hand
-Taming.Effect.16=Fast Food Service
-Taming.Effect.17=Kans voor wolven na een aanval te regeneren
-Taming.Effect.3=Kritische Slag dat Blood toepast
-Taming.Effect.4=Geslepen Klauwen
-Taming.Effect.5=Schade Bonus
-Taming.Effect.6=Omgevings bewust
-Taming.Effect.8=Dikke Vacht
+Taming.SubSkill.FastFoodService.Name=Fast Food Service
+Taming.SubSkill.FastFoodService.Description=Kans voor wolven na een aanval te regeneren
+Taming.SubSkill.Gore.Description=Kritische Slag dat Blood toepast
+Taming.SubSkill.SharpenedClaws.Name=Geslepen Klauwen
+Taming.SubSkill.SharpenedClaws.Description=Schade Bonus
+Taming.SubSkill.EnvironmentallyAware.Name=Omgevings bewust
+Taming.SubSkill.ThickFur.Name=Dikke Vacht
 Taming.Listener.Wolf=[[DARK_GRAY]]Jouw wolf dribbelt terug naar je...
 Taming.Listener=Temmen:
 Taming.SkillName=TEMMEN
@@ -202,13 +202,13 @@ Taming.Summon.Fail.Wolf=[[RED]]Je hebt te veel wolven in de buurt om nog meer op
 Unarmed.Ability.Berserk.Length=[[RED]]Razernij Lengte: [[YELLOW]]{0}s
 Unarmed.Ability.Lower=[[GRAY]]**JE STOP JE HAND WEER WEG**
 Unarmed.Ability.Ready=[[GREEN]]**JE HOUDT JE HAND GEREED**
-Unarmed.Effect.0=Razernij (KRACHT)
-Unarmed.Effect.2=Ontwapen (spelers)
-Unarmed.Effect.5=Verhardt uw arm in de loop van de tijd
-Unarmed.Effect.6=Pijlen afweren
-Unarmed.Effect.7=Pijlen afweren
-Unarmed.Effect.8=Ijzeren Grip
-Unarmed.Effect.9=Voorkomt dat je ontwapend wordt
+Unarmed.SubSkill.Berserk.Name=Razernij (KRACHT)
+Unarmed.SubSkill.Disarm.Name=Ontwapen (spelers)
+Unarmed.SubSkill.IronArmStyle.Description=Verhardt uw arm in de loop van de tijd
+Unarmed.SubSkill.ArrowDeflect.Name=Pijlen afweren
+Unarmed.SubSkill.ArrowDeflect.Description=Pijlen afweren
+Unarmed.SubSkill.IronGrip.Name=Ijzeren Grip
+Unarmed.SubSkill.IronGrip.Description=Voorkomt dat je ontwapend wordt
 Unarmed.Listener=Ongewapend:
 Unarmed.SkillName=Ongewapend
 Unarmed.Skills.Berserk.Off=[[RED]]**Razernij is uitgewerkt**
@@ -220,12 +220,12 @@ Woodcutting.Ability.0=Bladblazer
 Woodcutting.Ability.1=Bladeren wegblazen
 Woodcutting.Ability.Length=[[RED]] Boom Feller Lengte: [[GEEL]]{0}s
 Woodcutting.Ability.Locked.0=Vergrendeld totdat {0}+ VAARDIGHEID (BLADBLAZER)
-Woodcutting.Effect.0=Tree Feller
-Woodcutting.Effect.1=Laat bomen ontploffen
-Woodcutting.Effect.2=Bladblazer
-Woodcutting.Effect.3=Blaas alle bladeren weg
-Woodcutting.Effect.4=Dubbele drops
-Woodcutting.Effect.5=Het dubbele van de normale buit
+Woodcutting.SubSkill.TreeFeller.Name=Tree Feller
+Woodcutting.SubSkill.TreeFeller.Description=Laat bomen ontploffen
+Woodcutting.SubSkill.LeafBlower.Name=Bladblazer
+Woodcutting.SubSkill.LeafBlower.Description=Blaas alle bladeren weg
+Woodcutting.SubSkill.HarvestLumber.Name=Dubbele drops
+Woodcutting.SubSkill.HarvestLumber.Description=Het dubbele van de normale buit
 Woodcutting.Listener=Houthakken:
 Woodcutting.SkillName=Houthakken
 Woodcutting.Skills.TreeFeller.Off=[[RED]] ** Boom Feller is uitgewerkt **

src/main/resources/locale/locale_no.properties

@@ -1,73 +0,0 @@
-Acrobatics.Combat.Proc=[[GREEN]]**Dukket unna**
-Acrobatics.SkillName=AKROBATIKK
-Acrobatics.Skillup=[[YELLOW]]Akrobatiske ferdigheter har blitt h\u00f8ynet med {0}. Total ({1})
-Archery.Skillup=[[YELLOW]]Bueskyting dyktighet \u00f8kt med {0}. Totalt ({1})
-Axes.Combat.GI.Struck=[[RED]]** Rammet av st\u00f8rre innvirkning **
-Axes.Skills.SS.On=[[GREEN]]**Skull Splitter AKTIVERT**
-Axes.Skills.SS.Other.Off=[[RED]]Skalle Knuser[[GREEN]] har g\u00e5tt over [[YELLOW]]{0}
-Axes.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] har brukt [[RED]]Skull Splitter!
-Excavation.SkillName=UTGRAVING
-Herbalism.Listener=Urtologi:
-Herbalism.Skills.GTe.Other.Off=[[RED]] Green Terra [[GREEN]] har slitt av for [[yellow]] {0}
-Mining.Ability.Ready=[[GREEN]]**DU GJ\u00d8R KLAR PICKAXEN DIN**
-Mining.Skills.SuperBreaker.Refresh=[[GREEN]]Din [[yellow]] Super Breaker [[GREEN]] evne er oppdatert!
-Mining.Skillup=[[YELLOW]]Mining skill har \u00f8kt med {0}. Totalt ({1})
-Mining.Blast.Refresh=[[GREEN]]Din [[YELLOW]]Blast Mining [[GREEN]]evne er oppdatert!
-Repair.Effect.0=Reparer
-Repair.Effect.2=Reparasjoner Mestring
-Repair.Effect.3=\u00d8kt reparasjon bel\u00f8p
-Repair.Effect.4=Super Reperasjon
-Repair.Effect.5=Doble effektiviteten
-Repair.Effect.6=Diamant reperasjon ({0}+ SKILL)
-Repair.Effect.7=Reparer Diamant Verkt\u00f8y & Rustning
-Repair.Effect.9=Reparer magiske gjenstander
-Repair.Listener.Anvil=[[DARK_RED]]Du har plassert en ambolt, ambolt kan reparere verkt\u00f8y og rustning.
-Repair.Listener=Reparer:
-Repair.SkillName=REPARER
-Repair.Skills.AdeptDiamond=[[DARK_RED]]Du er ikke dyktig nok til \u00e5 reparere Diamant.
-Repair.Skills.AdeptGold=[[DARK_RED]]Du er ikke dyktig nok til \u00e5 reparere Gull.
-Repair.Skills.AdeptStone=[[DARK_RED]]Du er ikke dyktig nok til \u00e5 reparere stein.
-Repair.Skillup=[[YELLOW]]ReparasjonS dyktighet \u00f8kt med {0}. Totalt ({1})
-Repair.Arcane.Chance.Success=[[GRAY]]AF Suksess Rate: [[YELLOW]]{0}%
-Repair.Arcane.Fail=[[RED]]Arcane kraften har forlatt objektet permanent
-Swords.Combat.Bleeding.Stopped=[[GRAY]]Bl\u00f8dningen har [[GREEN]]stoppet[[GRAY]]!
-Swords.Combat.Bleeding=[[GREEN]]**FIENDE BL\u00d8R**
-Swords.Combat.Countered=[[GREEN]]** Motangrep **
-Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES AKTIVERT**
-Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] har brukt [[RED]] Taggete Streik!
-Taming.Listener.Wolf=[[DARK_GRAY]]Ulven din knurrer tilbake til deg...
-Unarmed.Skills.Berserk.Off=[[RED]]** Berserk har blitt slitt av **
-Unarmed.Skills.Berserk.Other.On=[[GREEN]]{0}[[DARK_GREEN]] har brukt [[RED]]Berserk!
-Woodcutting.Ability.0=L\u00f8vbl\u00e5ser
-Woodcutting.Ability.1=Bl\u00e5s bort blader
-Woodcutting.Effect.2=L\u00f8vbl\u00e5ser
-Woodcutting.SkillName=VEDHOGST
-Woodcutting.Skills.TreeFeller.Other.Off=[[RED]]Tre Feller[[GREEN]] har slitt av for [[YELLOW]]{0}
-Ability.Generic.Template.Lock=[[GRAY]]{0}
-Ability.Generic.Template=[[RED]]{0}: [[YELLOW]]{1}
-Combat.TouchedFuzzy=[[DARK_RED]]R\u00f8rte Fuzzy. F\u00f8lte seg Dizzy.
-Commands.AdminChat.Off=Bare Admin Chat [[RED]]Av
-Commands.mmoedit=[player] <skill> <newvalue> [[RED]] - endre m\u00e5l
-Commands.Party.Accept=[[RED]]- Aksepter party invitasjon
-Commands.Party.Invite.0=[[RED]]ALARM: [[GREEN]]Du har mottatt en party invitasjon til {0} fra {1}
-Commands.Party.Kick=[[RED]]Du var sparket fra partyet! {0}!
-Commands.PowerLevel.Leaderboard=[[YELLOW]]--mcMMO[[BLUE]]Kraft Niv\u00e5[[YELLOW]]Lederbord--
-Commands.PowerLevel=[[DARK_RED]]KRAFT NIV\u00c5: [[GR\u00d8EEN]] {0}
-Party.Password.Set=[[GREEN]]Party passord sett til {0}
-Party.Unlocked=[[GRAY]]Partyet er l\u00e5st opp
-Commands.XPGain.Archery=Angriper Monstre
-Commands.XPGain.Axes=Angriper Monstre
-Commands.XPGain.Excavation=Graving og finner skatter
-Commands.XPGain.Herbalism=Innsamling av urter eller blomster
-Commands.XPGain.Mining=Mining av stein og malm
-Commands.XPGain.Swords=Angriper Monstre
-Commands.XPGain.Taming=Dyr temming, eller sl\u00e5ssing hvisk dine ulver.
-Commands.XPGain.Unarmed=Angriper Monstre
-Commands.XPGain=[[DARK_GRAY]]XP GEVINST: [[WHITE]]{0}
-XPRate.Event=[[GOLD]]mcMMO er for tiden i en XP Rate arrangement! XP rate er {0} x!
-Effects.Effects=EFFEKTER
-Skills.Disarmed=[[DARK_RED]]Du har blitt avv\u00e6pnet!
-Skills.NeedMore=[[DARK_RED]]Du trenger mer
-Skills.TooTired=[[RED]]Du er for sliten til \u00e5 bruke denne evnen igjen.
-Stats.Header.Combat=[[GOLD]]-=Kampferdigheter=-
-Stats.Header.Gathering=[[GOLD]]- = SAMLER FERDIGHETER = -

src/main/resources/locale/locale_pl.properties

@@ -1,12 +1,12 @@
 Acrobatics.Ability.Proc=[[GREEN]]**Mi\u0119kkie L\u0105dowanie**
 Acrobatics.Combat.Proc=[[GREEN]]**Unikni\u0119to**
 Acrobatics.DodgeChance=[[RED]]Szansa na Unik: [[YELLOW]]{0}
-Acrobatics.Effect.0=Przewr\u00f3t
-Acrobatics.Effect.1=Redukuje lub te\u017c ca\u0142kowicie usuwa obra\u017cenia od upadku
-Acrobatics.Effect.2=\u0141agodny Przewr\u00f3t
-Acrobatics.Effect.3=Dwukrotnie bardziej efektywne niz zwykly Przewrot
-Acrobatics.Effect.4=Unik
-Acrobatics.Effect.5=Redukuje obra\u017cenia o po\u0142owe
+Acrobatics.SubSkill.Roll.Name=Przewr\u00f3t
+Acrobatics.SubSkill.Roll.Description=Redukuje lub te\u017c ca\u0142kowicie usuwa obra\u017cenia od upadku
+Acrobatics.SubSkill.GracefulRoll.Name=\u0141agodny Przewr\u00f3t
+Acrobatics.SubSkill.GracefulRoll.Description=Dwukrotnie bardziej efektywne niz zwykly Przewrot
+Acrobatics.SubSkill.Dodge.Name=Unik
+Acrobatics.SubSkill.Dodge.Description=Redukuje obra\u017cenia o po\u0142owe
 Acrobatics.Listener=Akrobatyka:
 Acrobatics.Roll.Chance=[[RED]]Szansa na Przewr\u00f3t: [[YELLOW]]{0}
 Acrobatics.Roll.GraceChance=[[RED]]Szansa na \u0141agodny Przewr\u00f3t: [[YELLOW]]{0}
@@ -16,12 +16,12 @@ Acrobatics.Skillup=[[YELLOW]]Umiejetnosc akrobatyka wzrosla o {0}. Razem ({1})
 Archery.Combat.DazeChance=[[RED]]Szansa na Oszolomienie: [[YELLOW]]{0}
 Archery.Combat.RetrieveChance=[[RED]]Szansa na Odzyskanie Strza\u0142: [[YELLOW]]{0}
 Archery.Combat.SkillshotBonus=[[RED]]Dodatkowe Obra\u017cenia dla Umiej\u0119tno\u015bci: [[YELLOW]]{0}
-Archery.Effect.0=Umiej\u0119tno\u015b\u0107 Aktywna
-Archery.Effect.1=Zwi\u0119ksza obra\u017cenia zadane z \u0142uku
-Archery.Effect.2=Oszo\u0142omienie
-Archery.Effect.3=Oszalamia, straszy i zadaje {0} obrazen.
-Archery.Effect.4=Odzyskiwanie Strza\u0142
-Archery.Effect.5=Szansa na wyci\u0105gni\u0119cie strza\u0142 z martwego cia\u0142a
+Archery.SubSkill.SkillShot.Name=Umiej\u0119tno\u015b\u0107 Aktywna
+Archery.SubSkill.SkillShot.Description=Zwi\u0119ksza obra\u017cenia zadane z \u0142uku
+Archery.SubSkill.Daze.Name=Oszo\u0142omienie
+Archery.SubSkill.Daze.Description=Oszalamia, straszy i zadaje {0} obrazen.
+Archery.SubSkill.ArrowRetrieval.Name=Odzyskiwanie Strza\u0142
+Archery.SubSkill.ArrowRetrieval.Description=Szansa na wyci\u0105gni\u0119cie strza\u0142 z martwego cia\u0142a
 Archery.Listener=Lucznictwo
 Archery.SkillName=LUCZNICTWO
 Archery.Skillup=[[YELLOW]]Umiejetnosc lucznictwo wzrosla o {0}. Razem ({1})
@@ -39,16 +39,16 @@ Axes.Combat.CriticalHit=[[RED]]TRAFIENIE KRYTYCZNE!
 Axes.Combat.GI.Proc=[[GREEN]]**UDERZONO Z WIELK\u0104 MOC\u0104**
 Axes.Combat.GI.Struck=[[RED]]TRAFIENIE KRYTYCZNE!
 Axes.Combat.SS.Length=[[RED]]D\u0142ugo\u015bc \u0141amacza Czaszki: [[YELLOW]]{0}s
-Axes.Effect.0=\u0141amacz Czaszek
-Axes.Effect.1=Zadaje obra\u017cenia obszarowe
-Axes.Effect.2=Krytyczne Uderzenia
-Axes.Effect.3=Podwojne obrazania
-Axes.Effect.4=Mistrzostwo pos\u0142ugiwania si\u0119 siekier\u0105
-Axes.Effect.5=Dodaje bonus do obrazen
-Axes.Effect.6=Wstrz\u0105s od Zbroi
-Axes.Effect.7=Uderz z odpowiedni\u0105 si\u0142a aby przebi\u0107 zbroj\u0119
-Axes.Effect.8=Trafienie Krytyczne
-Axes.Effect.9=Zadaje dodatkowe obra\u017cenia nieopancerzonym celom
+Axes.SubSkill.SkullSplitter.Name=\u0141amacz Czaszek
+Axes.SubSkill.SkullSplitter.Description=Zadaje obra\u017cenia obszarowe
+Axes.SubSkill.CriticalStrikes.Name=Krytyczne Uderzenia
+Axes.SubSkill.CriticalStrikes.Description=Podwojne obrazania
+Axes.SubSkill.AxeMastery.Name=Mistrzostwo pos\u0142ugiwania si\u0119 siekier\u0105
+Axes.SubSkill.AxeMastery.Description=Dodaje bonus do obrazen
+Axes.SubSkill.ArmorImpact.Name=Wstrz\u0105s od Zbroi
+Axes.SubSkill.ArmorImpact.Description=Uderz z odpowiedni\u0105 si\u0142a aby przebi\u0107 zbroj\u0119
+Axes.SubSkill.GreaterImpact.Name=Trafienie Krytyczne
+Axes.SubSkill.GreaterImpact.Description=Zadaje dodatkowe obra\u017cenia nieopancerzonym celom
 Axes.Listener=Siekiery:
 Axes.SkillName=TOPORY
 Axes.Skills.SS.Off=[[RED]]**\u0141amacz Czaszek si\u0119 sko\u0144czy\u0142**
@@ -59,10 +59,10 @@ Axes.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] u\u017cy\u0142 [[RED]]\u0141a
 Axes.Skillup=[[YELLOW]]Umiej\u0119tno\u015b\u0107 \u015bcinania wzros\u0142a o {0}. Razem ({1})
 Excavation.Ability.Lower=[[GRAY]]**CHOWASZ \u0141OPAT\u0118**
 Excavation.Ability.Ready=[[GREEN]]**PRZYGOTOWUJESZ SWOJ\u0104 \u0141OPAT\u0118**
-Excavation.Effect.0=Mia\u017cdz\u0105ce Wiert\u0142o
-Excavation.Effect.1=3x Szansa na znalezienie przedmiotu, 3x mno\u017cnik zdobywania do\u015bwiadczenia, +pr\u0119dko\u015b\u0107
-Excavation.Effect.2=Lowca Skarbow
-Excavation.Effect.3=Umiej\u0119tno\u015b\u0107 wykopywania skarb\u00f3w.
+Excavation.SubSkill.GigaDrillBreaker.Name=Mia\u017cdz\u0105ce Wiert\u0142o
+Excavation.SubSkill.GigaDrillBreaker.Description=3x Szansa na znalezienie przedmiotu, 3x mno\u017cnik zdobywania do\u015bwiadczenia, +pr\u0119dko\u015b\u0107
+Excavation.SubSkill.TreasureHunter.Name=Lowca Skarbow
+Excavation.SubSkill.TreasureHunter.Description=Umiej\u0119tno\u015b\u0107 wykopywania skarb\u00f3w.
 Excavation.Effect.Length=[[RED]]D\u0142ugo\u015bc Mia\u017cdz\u0105cego Wiert\u0142a: [[YELLOW]]{0}s
 Excavation.Listener=Wykopaliska:
 Excavation.SkillName=KOPANIE
@@ -81,17 +81,17 @@ Fishing.Ability.TH.MagicRate=[[RED]]Szanse na Magicznego \u0141owc\u0119: [[YELL
 Fishing.Ability.Shake=[[RED]]Szansa na Wstrz\u0105s: [[YELLOW]]{0}
 Fishing.Ability.IceFishing=[[RED]]Lodowe lowienie ryb: Idz lowic ryby w lodzie
 Fishing.Ability.FD=[[RED]]Dieta Rybaka: [[YELLOW]]Ranga {0}
-Fishing.Effect.0=Lowca Skarbow (Pasywna)
-Fishing.Effect.1=\u0141owi\u0107 r\u00f3\u017cne obiekty
-Fishing.Effect.2=Magiczny Lowca
-Fishing.Effect.3=Znajdowanie Zakletych Przedmiotow
-Fishing.Effect.4=Potrz\u0105\u015bni\u0119cie (przeciwko jednostkom)
-Fishing.Effect.5=Okradaj potwory z przedmiot\u00f3w u\u017cywaj\u0105c w\u0119dki.
-Fishing.Effect.6=Dieta Rybaka
-Fishing.Effect.7=Zwi\u0119ksza nasycenie posi\u0142k\u00f3w (ryby)
-Fishing.Effect.9=Zwieksza szanse na zlapanie ryby na haczyk
-Fishing.Effect.10=Lodowe lowienie ryb
-Fishing.Effect.11=Pozwala na lowienie ryb w zimowych biomach
+Fishing.SubSkill.TreasureHunter.Name=Lowca Skarbow (Pasywna)
+Fishing.SubSkill.TreasureHunter.Description=\u0141owi\u0107 r\u00f3\u017cne obiekty
+Fishing.SubSkill.MagicHunter.Name=Magiczny Lowca
+Fishing.SubSkill.MagicHunter.Description=Znajdowanie Zakletych Przedmiotow
+Fishing.SubSkill.Shake.Name=Potrz\u0105\u015bni\u0119cie (przeciwko jednostkom)
+Fishing.SubSkill.Shake.Description=Okradaj potwory z przedmiot\u00f3w u\u017cywaj\u0105c w\u0119dki.
+Fishing.SubSkill.FishermansDiet.Name=Dieta Rybaka
+Fishing.SubSkill.FishermansDiet.Description=Zwi\u0119ksza nasycenie posi\u0142k\u00f3w (ryby)
+Fishing.SubSkill.MasterAngler.Description=Zwieksza szanse na zlapanie ryby na haczyk
+Fishing.SubSkill.IceFishing.Name=Lodowe lowienie ryb
+Fishing.SubSkill.IceFishing.Description=Pozwala na lowienie ryb w zimowych biomach
 Fishing.Chance.Raining=[[BLUE]] Bonus od Deszczu
 Fishing.Listener=Rybactwo
 Fishing.Ability.TH.MagicFound=[[GRAY]]Wyczuwasz w pobli\u017cu \u017ar\u00f3d\u0142o magii...
@@ -108,17 +108,17 @@ Herbalism.Ability.GTh=[[GREEN]]**ZIELONY PALEC**
 Herbalism.Ability.HylianLuck=[[RED]]Szansa na Szczescie Hylian: [[YELLOW]]{0}
 Herbalism.Ability.Lower=[[GRAY]]**CHOWASZ SWOJ\u0104 MOTYKE**
 Herbalism.Ability.Ready=[[GREEN]]**PRZYGOTOWUJESZ MOTYKE**
-Herbalism.Effect.0=Zielone \u017bycie (ZDOLNO\u015a\u0106)
-Herbalism.Effect.1=Rozprzestrzenia \u017cycie na powierzchni, 3x wi\u0119ksza szansa na zdobycie przedmiot\u00f3w
-Herbalism.Effect.2=Zielony palec (Pszenica)
-Herbalism.Effect.3=Automatycznie zasadza ro\u015bliny podczas ich zbierania
-Herbalism.Effect.5=Oplata ceg\u0142y zieleni\u0105, lub te\u017c wspomaga rozw\u00f3j trawy.
-Herbalism.Effect.6=Dieta Farmerska
-Herbalism.Effect.7=Zwi\u0119ksza nasycenie posi\u0142k\u00f3w
-Herbalism.Effect.8=Podw\u00f3jny Drop (Wszystkie Zielska)
-Herbalism.Effect.9=Podwaja ilo\u015b\u0107 zdobywanych przedmiot\u00f3w
-Herbalism.Effect.10=Szczescie Hylian
-Herbalism.Effect.11=Daje niewielka szanse na znalezienie rzadkich przedmiot\u00f3w
+Herbalism.SubSkill.GreenTerra.Name=Zielone \u017bycie (ZDOLNO\u015a\u0106)
+Herbalism.SubSkill.GreenTerra.Description=Rozprzestrzenia \u017cycie na powierzchni, 3x wi\u0119ksza szansa na zdobycie przedmiot\u00f3w
+Herbalism.SubSkill.GreenThumb.Name=Zielony palec (Pszenica)
+Herbalism.SubSkill.GreenThumb.Description=Automatycznie zasadza ro\u015bliny podczas ich zbierania
+Herbalism.SubSkill.GreenThumb.Description.2=Oplata ceg\u0142y zieleni\u0105, lub te\u017c wspomaga rozw\u00f3j trawy.
+Herbalism.SubSkill.FarmersDiet.Name=Dieta Farmerska
+Herbalism.SubSkill.FarmersDiet.Description=Zwi\u0119ksza nasycenie posi\u0142k\u00f3w
+Herbalism.SubSkill.DoubleDrops.Name=Podw\u00f3jny Drop (Wszystkie Zielska)
+Herbalism.SubSkill.DoubleDrops.Description=Podwaja ilo\u015b\u0107 zdobywanych przedmiot\u00f3w
+Herbalism.SubSkill.HylianLuck.Name=Szczescie Hylian
+Herbalism.SubSkill.HylianLuck.Description=Daje niewielka szanse na znalezienie rzadkich przedmiot\u00f3w
 Herbalism.HylianLuck=[[GREEN]]Szczescie Hyrule jest dzisiaj z Toba!
 Herbalism.Listener=Zielarstwo
 Herbalism.SkillName=ZIELARSTWO
@@ -133,16 +133,16 @@ Mining.Ability.Locked.1=ZABLOKOWANE DO POZIOMU {0}+ SKILL
 Mining.Ability.Locked.2=ZABLOKOWANE DO POZIOMU {0}+ SKILL
 Mining.Ability.Lower=[[GRAY]]**CHOWASZ SW\u00d3J KILOF**
 Mining.Ability.Ready=[[GREEN]]**PRZYGOTOWUJESZ SWOJA SIEKIERE**
-Mining.Effect.0=Super \u0141amacz (ZDOLNO\u015a\u0106)
-Mining.Effect.1=Szybko\u015b\u0107+, Szansa potr\u00f3jnego dropa
-Mining.Effect.2=Podwojny Drop
-Mining.Effect.3=Podwaja ilo\u015b\u0107 zdobywanych przedmiot\u00f3w
-Mining.Effect.4=Szybki Kopacz
-Mining.Effect.5=Bonus do wydobycia z TNT
-Mining.Effect.6=Wieksze bomby
-Mining.Effect.7=Zwieksza zasieg wybuchu TNT
-Mining.Effect.8=Mistrzostwo w pos\u0142ugiwaniu si\u0119 materia\u0142ami wybuchowymi
-Mining.Effect.9=Zmniejsza obrazenia od explozji TNT
+Mining.SubSkill.SuperBreaker.Name=Super \u0141amacz (ZDOLNO\u015a\u0106)
+Mining.SubSkill.SuperBreaker.Description=Szybko\u015b\u0107+, Szansa potr\u00f3jnego dropa
+Mining.SubSkill.DoubleDrops.Name=Podwojny Drop
+Mining.SubSkill.DoubleDrops.Description=Podwaja ilo\u015b\u0107 zdobywanych przedmiot\u00f3w
+Mining.SubSkill.BlastMining.Name=Szybki Kopacz
+Mining.SubSkill.BlastMining.Description=Bonus do wydobycia z TNT
+Mining.SubSkill.BiggerBombs.Name=Wieksze bomby
+Mining.SubSkill.BiggerBombs.Description=Zwieksza zasieg wybuchu TNT
+Mining.SubSkill.DemolitionsExpertise.Name=Mistrzostwo w pos\u0142ugiwaniu si\u0119 materia\u0142ami wybuchowymi
+Mining.SubSkill.DemolitionsExpertise.Description=Zmniejsza obrazenia od explozji TNT
 Mining.Effect.Decrease=[[RED]]Redukcja Obra\u017ce\u0144 od Materia\u0142\u00f3w Wybuchowych: [[YELLOW]]{0}
 Mining.Effect.DropChance=[[RED]]Szansa na Podw\u00f3jny Drop: [[YELLOW]]{0}
 Mining.Listener=G\u00f3rnictwo
@@ -158,24 +158,24 @@ Mining.Blast.Radius.Increase=[[RED]]Zasi\u0119g zwi\u0119kszony o: [[YELLOW]]+{0
 Mining.Blast.Rank=[[RED]]Szybki Kopacz: [[YELLOW]] Ranga {0}/8 [[GRAY]]({1})
 Mining.Blast.Other.On=[[GREEN]]{0}[[DARK_GREEN]] u\u017cy\u0142 [[RED]]Szybkiego Kopacza!
 Mining.Blast.Refresh=[[GREEN]]Twoja zdolno\u015b\u0107 [[YELLOW]]B\u0142yskawiczny Kopacz [[GREEN]]jest ju\u017c dost\u0119pna!
-Repair.Effect.0=Naprawa
-Repair.Effect.1=Naprawa Narz\u0119dzi i Pancerza
-Repair.Effect.10=Naprawa Z\u0142ota ({0}+ SKILL)
-Repair.Effect.11=Naprawa Z\u0142otych Narz\u0119dzi i Pancerza
-Repair.Effect.12=Naprawa \u017belaza ({0}+ SKILL)
-Repair.Effect.13=Naprawa \u017belaznych Narz\u0119dzi i Pancerza
-Repair.Effect.14=Naprawa Kamienia ({0}+ SKILL)
-Repair.Effect.15=Naprawa Kamiennych Narz\u0119dzi
-Repair.Effect.2=Mistrzostwo napraw
-Repair.Effect.3=Zwi\u0119kszono ilo\u015b\u0107 napraw
-Repair.Effect.4=Super Naprawa
-Repair.Effect.5=Podw\u00f3jnia efektywno\u015b\u0107
-Repair.Effect.6=Naprawa Diamentu ({0}+ SKILL)
-Repair.Effect.7=Naprawa diamentowych narzedzi i pancerza
-Repair.Effect.8=Kowalstwo Ezoteryczne
-Repair.Effect.9=Naprawa rzeczy magicznych
-Repair.Effect.16=Odzyskiwanie ({0}+ SKILL)
-Repair.Effect.17=Odzyskiwanie Narz\u0119dzi i Pancerza
+Repair.SubSkill.Repair.Name=Naprawa
+Repair.SubSkill.Repair.Description=Naprawa Narz\u0119dzi i Pancerza
+Repair.SubSkill.GoldRepair.Name=Naprawa Z\u0142ota ({0}+ SKILL)
+Repair.SubSkill.GoldRepair.Description=Naprawa Z\u0142otych Narz\u0119dzi i Pancerza
+Repair.SubSkill.IronRepair.Name=Naprawa \u017belaza ({0}+ SKILL)
+Repair.SubSkill.IronRepair.Description=Naprawa \u017belaznych Narz\u0119dzi i Pancerza
+Repair.SubSkill.StoneRepair.Name=Naprawa Kamienia ({0}+ SKILL)
+Repair.SubSkill.StoneRepair.Description=Naprawa Kamiennych Narz\u0119dzi
+Repair.SubSkill.RepairMastery.Name=Mistrzostwo napraw
+Repair.SubSkill.RepairMastery.Description=Zwi\u0119kszono ilo\u015b\u0107 napraw
+Repair.SubSkill.SuperRepair.Name=Super Naprawa
+Repair.SubSkill.SuperRepair.Description=Podw\u00f3jnia efektywno\u015b\u0107
+Repair.SubSkill.DiamondRepair.Name=Naprawa Diamentu ({0}+ SKILL)
+Repair.SubSkill.DiamondRepair.Description=Naprawa diamentowych narzedzi i pancerza
+Repair.SubSkill.ArcaneForging.Name=Kowalstwo Ezoteryczne
+Repair.SubSkill.ArcaneForging.Description=Naprawa rzeczy magicznych
+Repair.SubSkill.Salvage.Name=Odzyskiwanie ({0}+ SKILL)
+Repair.SubSkill.Salvage.Description=Odzyskiwanie Narz\u0119dzi i Pancerza
 Repair.Error=[[DARK_RED]]mcMMO napotka\u0142 problem pr\u00f3buj\u0105c naprawi\u0107 ten przedmiot!
 Repair.Listener.Anvil=[[DARK_RED]]Postawi\u0142e\u015b kowad\u0142o - kowad\u0142a s\u0142u\u017c\u0105 do naprawiania narz\u0119dzi i zbroi.
 Repair.Listener.Anvil2=[[DARK_RED]]Postawi\u0142e\u015b kowad\u0142o Odzysku, u\u017cyj go aby Odzyska\u0107 narz\u0119dzia oraz zbroj\u0119.
@@ -216,13 +216,13 @@ Swords.Combat.Counter.Chance=[[RED]]Szansa na Kontratak: [[YELLOW]]{0}
 Swords.Combat.Counter.Hit=[[DARK_RED]]Kontratak!
 Swords.Combat.Countered=[[GREEN]]**KONTR-ATAK**
 Swords.Combat.SS.Struck=[[DARK_RED]]Zosta\u0142e\u015b powalony przez  Z\u0104BKOWANY ATAK!
-Swords.Effect.0=Kontratak
-Swords.Effect.2=Z\u0105bkowany Atak (ZDOLNO\u015a\u0106)
-Swords.Effect.3={0} obrazen obszarowych, Krawienie+ obszarowo
+Swords.SubSkill.CounterAttack.Name=Kontratak
+Swords.SubSkill.SerratedStrikes.Name=Z\u0105bkowany Atak (ZDOLNO\u015a\u0106)
+Swords.SubSkill.SerratedStrikes.Description={0} obrazen obszarowych, Krawienie+ obszarowo
 Swords.Effect.4=Z\u0105bkowany Atak spowodowa\u0142 krwawienie
 Swords.Effect.5={0} Czas miedzy krawieniem
-Swords.Effect.6=Krwawienie
-Swords.Effect.7=Spowodowano krwawienie
+Swords.SubSkill.Bleed.Name=Krwawienie
+Swords.SubSkill.Bleed.Description=Spowodowano krwawienie
 Swords.Listener=Miecze
 Swords.SkillName=MIECZE
 Swords.Skills.SS.Off=[[RED]]**Z\u0105bkowany Atak si\u0119 sko\u0144czy\u0142**
@@ -249,24 +249,24 @@ Taming.Ability.Locked.2=ZABLOKOWANE DO POZIOMU {0}+ SKILL
 Taming.Ability.Locked.3=ZABLOKOWANE DO POZIOMU {0}+ SKILL
 Taming.Ability.Locked.4=ZABLOKOWANE DO POZIOMU {0}+ SKILL
 Taming.Combat.Chance.Gore=[[RED]]Szansa na Brutalno\u015b\u0107: [[YELLOW]]{0}
-Taming.Effect.0=Wiedza o zwierz\u0119tach
-Taming.Effect.1=Ko\u015b\u0107 - przyci\u0105ga uwag\u0119 wilk\u00f3w i ocelot\u00f3w
-Taming.Effect.10=Odporno\u015b\u0107 na wstrz\u0105sy
-Taming.Effect.11=Redukcja obra\u017ce\u0144 wybuchowych
-Taming.Effect.12=Wezwanie Dzikich
-Taming.Effect.13=Przywo\u0142uje zwierze po twojej stronie
-Taming.Effect.14=[[GRAY]]COTW (Ocelot): Kucnij i kliknij LPM {0} z ryb\u0105 w r\u0119ce
+Taming.SubSkill.BeastLore.Name=Wiedza o zwierz\u0119tach
+Taming.SubSkill.BeastLore.Description=Ko\u015b\u0107 - przyci\u0105ga uwag\u0119 wilk\u00f3w i ocelot\u00f3w
+Taming.SubSkill.ShockProof.Name=Odporno\u015b\u0107 na wstrz\u0105sy
+Taming.SubSkill.ShockProof.Description=Redukcja obra\u017ce\u0144 wybuchowych
+Taming.SubSkill.CallOfTheWild.Name=Wezwanie Dzikich
+Taming.SubSkill.CallOfTheWild.Description=Przywo\u0142uje zwierze po twojej stronie
+Taming.SubSkill.CallOfTheWild.Description.2=[[GRAY]]COTW (Ocelot): Kucnij i kliknij LPM {0} z ryb\u0105 w r\u0119ce
 Taming.Effect.15=[[GRAY]]COTW (Wolf): Kucnij i kliknij LPM {0} z ko\u015bci\u0105 w d\u0142oni
-Taming.Effect.16=Serwis FastFood\'u
-Taming.Effect.17=Szansa dla wilk\u00f3w na odnowienie \u017cycia przy ataku
-Taming.Effect.2=Brutalno\u015b\u0107
-Taming.Effect.3=Cios krytyczny kt\u00f3ry wywo\u0142uje krwawienie
-Taming.Effect.4=Zaostrzone Pazury
-Taming.Effect.5=Dodatkowe Obra\u017cenia
-Taming.Effect.6=Przyjazne dla \u015brodowiska
-Taming.Effect.7=Strach przed Kaktusami/Law\u0105, Odporno\u015b\u0107 obra\u017cenia ze spadania
-Taming.Effect.8=Grube Futro
-Taming.Effect.9=Redukcja Obra\u017ce\u0144, Odporno\u015b\u0107 na ogie\u0144
+Taming.SubSkill.FastFoodService.Name=Serwis FastFood\'u
+Taming.SubSkill.FastFoodService.Description=Szansa dla wilk\u00f3w na odnowienie \u017cycia przy ataku
+Taming.SubSkill.Gore.Name=Brutalno\u015b\u0107
+Taming.SubSkill.Gore.Description=Cios krytyczny kt\u00f3ry wywo\u0142uje krwawienie
+Taming.SubSkill.SharpenedClaws.Name=Zaostrzone Pazury
+Taming.SubSkill.SharpenedClaws.Description=Dodatkowe Obra\u017cenia
+Taming.SubSkill.EnvironmentallyAware.Name=Przyjazne dla \u015brodowiska
+Taming.SubSkill.EnvironmentallyAware.Description=Strach przed Kaktusami/Law\u0105, Odporno\u015b\u0107 obra\u017cenia ze spadania
+Taming.SubSkill.ThickFur.Name=Grube Futro
+Taming.SubSkill.ThickFur.Description=Redukcja Obra\u017ce\u0144, Odporno\u015b\u0107 na ogie\u0144
 Taming.Listener.Wolf=[[DARK_GRAY]]Tw\u00f3j wilk biegnie do ciebie...
 Taming.Listener=Oswajanie:
 Taming.SkillName=OSWAJANIE
@@ -284,16 +284,16 @@ Unarmed.Ability.IronGrip.Attacker=[[RED]]Tw\u00f3j przeciwnik ma \u017celazny u\
 Unarmed.Ability.IronGrip.Defender=[[GREEN]]Tw\u00f3j \u017belazny Uchwyt uchroni\u0142 ci\u0119 przed Rozbrojeniem!
 Unarmed.Ability.Lower=[[GRAY]]**OPUSZCZASZ SWOJE PI\u0118\u015aCI**
 Unarmed.Ability.Ready=[[GREEN]]**PRZYGOTOWUJESZ SWOJE PIESCI**
-Unarmed.Effect.0=Berserk (Zdolnosc)
-Unarmed.Effect.1=+50% DMG, Niszczy slabe materialy
-Unarmed.Effect.2=Rozbrojenie
-Unarmed.Effect.3=Rozbraja przeciwnika z przedmiotu trzymanego przez niego w r\u0119ku
-Unarmed.Effect.4=Styl zelaznego ramienia
-Unarmed.Effect.5=Wzmacnia twoj\u0105 d\u0142o\u0144 w czasie
-Unarmed.Effect.6=Odbicie strzaly
-Unarmed.Effect.7=Odbijanie strzal
-Unarmed.Effect.8=Zelazny Chwyt
-Unarmed.Effect.9=Zapobiega przed Twoim rozbrojeniem
+Unarmed.SubSkill.Berserk.Name=Berserk (Zdolnosc)
+Unarmed.SubSkill.Berserk.Description=+50% DMG, Niszczy slabe materialy
+Unarmed.SubSkill.Disarm.Name=Rozbrojenie
+Unarmed.SubSkill.Disarm.Description=Rozbraja przeciwnika z przedmiotu trzymanego przez niego w r\u0119ku
+Unarmed.SubSkill.IronArmStyle.Name=Styl zelaznego ramienia
+Unarmed.SubSkill.IronArmStyle.Description=Wzmacnia twoj\u0105 d\u0142o\u0144 w czasie
+Unarmed.SubSkill.ArrowDeflect.Name=Odbicie strzaly
+Unarmed.SubSkill.ArrowDeflect.Description=Odbijanie strzal
+Unarmed.SubSkill.IronGrip.Name=Zelazny Chwyt
+Unarmed.SubSkill.IronGrip.Description=Zapobiega przed Twoim rozbrojeniem
 Unarmed.Listener=NIEUZBROJONY
 Unarmed.SkillName=NIEUZBROJONY
 Unarmed.Skills.Berserk.Off=[[RED]]**Berserk si\u0119 sko\u0144czy\u0142**
@@ -307,12 +307,12 @@ Woodcutting.Ability.1=Zdmuchuje li\u015bcie
 Woodcutting.Ability.Chance.DDrop=[[RED]]Szansa na Dwukrotny Drop: [[YELLOW]]{0}
 Woodcutting.Ability.Length=[[RED]]D\u0142ugo\u015bc Powalacza Drzew: [[YELLOW]]{0}s
 Woodcutting.Ability.Locked.0=ZABLOKOWANY DO POZIOMU {0}+ SKILL
-Woodcutting.Effect.0=Powalacz Drzew
-Woodcutting.Effect.1=Sprawia, i\u017c drzewa eksploduj\u0105
-Woodcutting.Effect.2=Dmucharka do li\u015bci
-Woodcutting.Effect.3=Zdmuchuje li\u015bcie
-Woodcutting.Effect.4=Podwojny Drop
-Woodcutting.Effect.5=Podwaja ilo\u015b\u0107 zdobywanych przedmiot\u00f3w
+Woodcutting.SubSkill.TreeFeller.Name=Powalacz Drzew
+Woodcutting.SubSkill.TreeFeller.Description=Sprawia, i\u017c drzewa eksploduj\u0105
+Woodcutting.SubSkill.LeafBlower.Name=Dmucharka do li\u015bci
+Woodcutting.SubSkill.LeafBlower.Description=Zdmuchuje li\u015bcie
+Woodcutting.SubSkill.HarvestLumber.Name=Podwojny Drop
+Woodcutting.SubSkill.HarvestLumber.Description=Podwaja ilo\u015b\u0107 zdobywanych przedmiot\u00f3w
 Woodcutting.Listener=\u015aCINANIE DRZEW
 Woodcutting.SkillName=\u015aCINANIE DRZEW
 Woodcutting.Skills.TreeFeller.Off=[[RED]]**Powalacz Drzew si\u0119 sko\u0144czy\u0142**

src/main/resources/locale/locale_pl_PL.properties

@@ -1,2 +0,0 @@
-Mining.Skillup=[[YELLOW]]Umiej\u0119tno\u015b\u0107 g\u00f3rnictwa zosta\u0142a zwi\u0119kszona o {0}. Aktualny poziom: ({1})
-Repair.Arcane.Fail=[[RED]]Magia permanentnie opu\u015bci\u0142a ten przedmiot

src/main/resources/locale/locale_pt_BR.properties

@@ -1,13 +1,13 @@
 Acrobatics.Combat.Proc=[[GREEN]]**Esquivou**
-Acrobatics.Effect.0=Rolar
-Acrobatics.Effect.4=Esquivou
+Acrobatics.SubSkill.Roll.Name=Rolar
+Acrobatics.SubSkill.Dodge.Name=Esquivou
 Acrobatics.Listener=Acrobacias:
 Acrobatics.Roll.Text=**Rolou**
 Acrobatics.SkillName=Acrobacia
 Acrobatics.Skillup=[[YELLOW]]Habilidade Acrobacia aumentada em {0}. Total ({1})
-Archery.Effect.0=Tiro Habilidoso
-Archery.Effect.1=Aumenta o dano feito com arcos
-Archery.Effect.5=Chance de recuperar flechas dos corpos
+Archery.SubSkill.SkillShot.Name=Tiro Habilidoso
+Archery.SubSkill.SkillShot.Description=Aumenta o dano feito com arcos
+Archery.SubSkill.ArrowRetrieval.Description=Chance de recuperar flechas dos corpos
 Archery.Listener=Arqueiro
 Archery.SkillName=ARQUEIRO
 Archery.Skillup=[[YELLOW]]Habilidade Arqueiro aumentada em {0}. Total ({1})
@@ -15,8 +15,8 @@ Axes.Ability.Bonus.0=Machado
 Axes.Ability.Lower=[[GRAY]]**VOCE ABAIXA SEU MACHADO**
 Axes.Ability.Ready=[[GREEN]]**VOCE PREPARA SEU MACHADO**
 Axes.Combat.GI.Struck=[[RED]]**GOLPEADO POR UM GRANDE IMPACTO**
-Axes.Effect.3=Dano Duplo
-Axes.Effect.5=Adiciona dano extra
+Axes.SubSkill.CriticalStrikes.Description=Dano Duplo
+Axes.SubSkill.AxeMastery.Description=Adiciona dano extra
 Axes.Listener=Machados:
 Axes.SkillName=Machado
 Axes.Skills.SS.On=[[GREEN]]**Racha Cranio ATIVADO**
@@ -25,7 +25,7 @@ Axes.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] usou [[RED]]Racha Cranios!
 Axes.Skillup=[[YELLOW]]Habilidade em Machado aumentada em {0}. Total ({1})
 Excavation.Ability.Lower=[[GRAY]]**VOCE ABAIXA SUA PA**
 Excavation.Ability.Ready=[[GREEN]]**VOCE PREPARA SUA PA**
-Excavation.Effect.3=Habilidade de cavar tesouros
+Excavation.SubSkill.TreasureHunter.Description=Habilidade de cavar tesouros
 Excavation.Listener=Escavacao:
 Excavation.SkillName=Escava\u00e7\u00e3o
 Excavation.Skillup=[[YELLOW]]Habilidade de Escavacao aumentada em {0}. Total ({1})
@@ -50,11 +50,11 @@ Mining.Skills.SuperBreaker.Refresh=[[GREEN]]A tua [[YELLOW]]habilidade Super Par
 Mining.Skillup=[[YELLOW]]Habilidade Minerar aumentada em {0}. Total ({1})
 Mining.Blast.Boom=[[GRAY]]**BOOM**
 Mining.Blast.Refresh=[[GREEN]]A tua [[YELLOW]]habilidade de explosao [[GREEN]]esta pronta!
-Repair.Effect.0=Reparar
-Repair.Effect.4=Super Reparo
-Repair.Effect.6=Reparar Diamante ({0}+ SKILL)
-Repair.Effect.7=Reparar ferramentas e armadura de Diamante
-Repair.Effect.9=Reparar itens magicos
+Repair.SubSkill.Repair.Name=Reparar
+Repair.SubSkill.SuperRepair.Name=Super Reparo
+Repair.SubSkill.DiamondRepair.Name=Reparar Diamante ({0}+ SKILL)
+Repair.SubSkill.DiamondRepair.Description=Reparar ferramentas e armadura de Diamante
+Repair.SubSkill.ArcaneForging.Description=Reparar itens magicos
 Repair.Listener=Reparar:
 Repair.SkillName=REPARAR
 Repair.Skills.AdeptDiamond=[[DARK_RED]]Voce nao tem nivel suficiente pra reparar Diamante.
@@ -70,8 +70,8 @@ Swords.Ability.Ready=[[GREEN]]**VOCE PREPARA SUA ESPADA**
 Swords.Combat.Bleeding.Stopped=[[GRAY]]O sangramento[[GREEN]]parou[[GRAY]]!
 Swords.Combat.Bleeding=[[GREEN]]**INIMIGO A SANGRAR**
 Swords.Combat.Countered=[[GREEN]]**CONTRA-ATACADO**
-Swords.Effect.0=Contra-ataque
-Swords.Effect.6=Sangrou
+Swords.SubSkill.CounterAttack.Name=Contra-ataque
+Swords.SubSkill.Bleed.Name=Sangrou
 Swords.Listener=Espadas:
 Swords.SkillName=Espada
 Swords.Skills.SS.On=[[GREEN]]**ATAQUE DE SERRA ACTIVADO**
@@ -80,12 +80,12 @@ Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] usou [[RED]] quebra rapida!
 Swords.Skillup=[[YELLOW]]Habilidade com Espadas aumentada em {0}. Total ({1})
 Taming.Ability.Bonus.1=Lobos evitam o perigo
 Taming.Ability.Bonus.6=Garras Afiadas
-Taming.Effect.11=Reducao de dano explosivo
-Taming.Effect.12=Chamado da Selva
-Taming.Effect.13=Invoca um animal ao seu lado
-Taming.Effect.17=Chance dos lobos se curarem ao atacarem
-Taming.Effect.4=Garras Afiadas
-Taming.Effect.5=Dano Bonus
+Taming.SubSkill.ShockProof.Description=Reducao de dano explosivo
+Taming.SubSkill.CallOfTheWild.Name=Chamado da Selva
+Taming.SubSkill.CallOfTheWild.Description=Invoca um animal ao seu lado
+Taming.SubSkill.FastFoodService.Description=Chance dos lobos se curarem ao atacarem
+Taming.SubSkill.SharpenedClaws.Name=Garras Afiadas
+Taming.SubSkill.SharpenedClaws.Description=Dano Bonus
 Taming.Listener.Wolf=[[DARK_GRAY]]O seu lobo correu de volta ate voce...
 Taming.Listener=Domar
 Taming.SkillName=DOMAR
@@ -97,8 +97,8 @@ Unarmed.Skills.Berserk.Other.Off=[[RED]]Quebra rapida[[GREEN]] acabou para [[YEL
 Unarmed.Skills.Berserk.Other.On=[[GREEN]]{0}[[DARK_GREEN]] usou [[RED]]Berserk!
 Woodcutting.Ability.0=Soprador de Folhas
 Woodcutting.Ability.1=Soprar Folhas
-Woodcutting.Effect.1=Faz arvores explodirem.
-Woodcutting.Effect.4=Drops duplos
+Woodcutting.SubSkill.TreeFeller.Description=Faz arvores explodirem.
+Woodcutting.SubSkill.HarvestLumber.Name=Drops duplos
 Woodcutting.Listener=Lenhador
 Woodcutting.SkillName=Lenhador
 Woodcutting.Skills.TreeFeller.Other.Off=[[RED]]Corta Arvores[[GREEN]] acabou para o [[YELLOW]]{0}

src/main/resources/locale/locale_pt_PT.properties

@@ -1,20 +0,0 @@
-Acrobatics.Combat.Proc=[[GREEN]]**Esquivou**
-Acrobatics.SkillName=ACROBACIA
-Acrobatics.Skillup=[[YELLOW]]Habilidade de acrobacia aumentada em {0}. Total ({1})
-Excavation.SkillName=EXCAVA\u00c7AO
-Herbalism.Listener=Herbalismo:
-Mining.Ability.Ready=[[GREEN]]**PREPARAS A TUA PICARETA**
-Mining.Skillup=[[YELLOW]]Habilidade de minera\u00e7\u00e3o aumentada em {0}. Total ({1})
-Repair.Arcane.Fail=[[RED]]O objecto perdeu permanentemente os poderes Arcanos.
-Swords.Combat.Bleeding.Stopped=[[GRAY]]A hemorragia [[GREEN]]parou[[GRAY]]!
-Swords.Skills.SS.On=[[GREEN]]**ATAQUES SERRILHADOS ACTIVADO**
-Woodcutting.SkillName=LENHADOR
-Ability.Generic.Template=[[RED]]{0}: [[YELLOW]]{1}
-Commands.Invite.Accepted=[[GREEN]]Convite aceite. Tu entraste numa festa {0}
-Commands.Party.Kick=[[RED]]Foste expulso da festa {0}!
-Party.Unlocked=[[GRAY]]A festa est\u00e1 desbloqueada
-Commands.XPGain.Herbalism=Colhendo Ervas
-Commands.XPGain.Mining=Minerar Pedra & Min\u00e9rio
-Commands.XPGain.Taming=Domesticar Animal, ou combater com os teus lobos
-Commands.XPGain=[[DARK_GRAY]]GANHO DE EXPERI\u00eaNCIA: [[WHITE]]{0}
-Stats.Header.Combat=[[GOLD]]-=PROEZAS DE COMBATE=-

src/main/resources/locale/locale_ru.properties

@@ -1,12 +1,12 @@
 Acrobatics.Ability.Proc=[[GREEN]]**\u0418\u0437\u044f\u0449\u043d\u043e\u0435 \u041f\u0440\u0438\u0437\u0435\u043c\u043b\u0435\u043d\u0438\u0435 **
 Acrobatics.Combat.Proc=[[GREEN]]**\u0423\u043a\u043b\u043e\u043d\u0435\u043d\u0438\u0435**
 Acrobatics.DodgeChance=[[RED]]\u0428\u0430\u043d\u0441 \u0423\u043a\u043b\u043e\u043d\u0438\u0442\u044c\u0441\u044f: [[YELLOW]]{0} %
-Acrobatics.Effect.0=\u0421\u043a\u043e\u043b\u044c\u0436\u0435\u043d\u0438\u0435
-Acrobatics.Effect.1=\u0423\u043c\u0435\u043d\u044c\u0448\u0430\u0435\u0442 \u0438\u043b\u0438 \u0438\u0433\u043d\u043e\u0440\u0438\u0440\u0443\u0435\u0442 \u043f\u043e\u0432\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u044f \u043e\u0442 \u043f\u0430\u0434\u0435\u043d\u0438\u044f
-Acrobatics.Effect.2=\u0418\u0437\u044f\u0449\u043d\u043e\u0435 \u0421\u043a\u043e\u043b\u044c\u0436\u0435\u043d\u0438\u0435
-Acrobatics.Effect.3=\u042d\u0444\u0444\u0435\u043a\u0442\u0438\u0432\u043d\u0435\u0435 \u043e\u0431\u044b\u0447\u043d\u043e\u0433\u043e \u0441\u043a\u043e\u043b\u044c\u0436\u0435\u043d\u0438\u044f \u0432 \u0434\u0432\u0430 \u0440\u0430\u0437\u0430.
-Acrobatics.Effect.4=\u0423\u043a\u043b\u043e\u043d\u0435\u043d\u0438\u0435
-Acrobatics.Effect.5=\u0423\u043c\u0435\u043d\u044c\u0448\u0430\u0435\u0442 \u0423\u0440\u043e\u043d \u0432 \u0434\u0432\u0430 \u0440\u0430\u0437\u0430
+Acrobatics.SubSkill.Roll.Name=\u0421\u043a\u043e\u043b\u044c\u0436\u0435\u043d\u0438\u0435
+Acrobatics.SubSkill.Roll.Description=\u0423\u043c\u0435\u043d\u044c\u0448\u0430\u0435\u0442 \u0438\u043b\u0438 \u0438\u0433\u043d\u043e\u0440\u0438\u0440\u0443\u0435\u0442 \u043f\u043e\u0432\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u044f \u043e\u0442 \u043f\u0430\u0434\u0435\u043d\u0438\u044f
+Acrobatics.SubSkill.GracefulRoll.Name=\u0418\u0437\u044f\u0449\u043d\u043e\u0435 \u0421\u043a\u043e\u043b\u044c\u0436\u0435\u043d\u0438\u0435
+Acrobatics.SubSkill.GracefulRoll.Description=\u042d\u0444\u0444\u0435\u043a\u0442\u0438\u0432\u043d\u0435\u0435 \u043e\u0431\u044b\u0447\u043d\u043e\u0433\u043e \u0441\u043a\u043e\u043b\u044c\u0436\u0435\u043d\u0438\u044f \u0432 \u0434\u0432\u0430 \u0440\u0430\u0437\u0430.
+Acrobatics.SubSkill.Dodge.Name=\u0423\u043a\u043b\u043e\u043d\u0435\u043d\u0438\u0435
+Acrobatics.SubSkill.Dodge.Description=\u0423\u043c\u0435\u043d\u044c\u0448\u0430\u0435\u0442 \u0423\u0440\u043e\u043d \u0432 \u0434\u0432\u0430 \u0440\u0430\u0437\u0430
 Acrobatics.Listener=\u0410\u043a\u0440\u043e\u0431\u0430\u0442\u0438\u043a\u0430:
 Acrobatics.Roll.Chance=[[RED]]\u0428\u0430\u043d\u0441 \u0421\u043a\u043e\u043b\u044c\u0436\u0435\u043d\u0438\u044f: [[YELLOW]]{0} %
 Acrobatics.Roll.GraceChance=[[RED]]\u0428\u0430\u043d\u0441 \u0418\u0437\u044f\u0449\u043d\u043e\u0433\u043e \u0421\u043a\u043e\u043b\u044c\u0436\u0435\u043d\u0438\u044f: [[YELLOW]]{0} %
@@ -16,12 +16,12 @@ Acrobatics.Skillup=[[YELLOW]]\u0423\u0440\u043e\u0432\u0435\u043d\u044c \u043d\u
 Archery.Combat.DazeChance=[[RED]]\u0428\u0430\u043d\u0441 \u0428\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c: [[YELLOW]]{0} %
 Archery.Combat.RetrieveChance=[[RED]]\u0428\u0430\u043d\u0441 \u0418\u0437\u0432\u043b\u0435\u0447\u044c \u0421\u0442\u0440\u0435\u043b\u044b: [[YELLOW]]{0}%
 Archery.Combat.SkillshotBonus=[[RED]]\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u0423\u0440\u043e\u043d \u043f\u0440\u0438 \u0423\u043c\u0435\u043b\u043e\u043c \u0412\u044b\u0441\u0442\u0440\u0435\u043b\u0435: [[YELLOW]]{0}
-Archery.Effect.0=\u0423\u043c\u0435\u043b\u044b\u0439 \u0412\u044b\u0441\u0442\u0440\u0435\u043b
-Archery.Effect.1=\u0423\u0432\u0435\u043b\u0438\u0447\u0438\u0432\u0430\u0435\u0442 \u0443\u0440\u043e\u043d \u043d\u0430\u043d\u043e\u0441\u0438\u043c\u044b\u0439 \u043b\u0443\u043a\u043e\u043c
-Archery.Effect.2=\u0428\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 (\u0418\u0433\u0440\u043e\u043a\u043e\u0432)
-Archery.Effect.3=\u0414\u0435\u0437\u043e\u0440\u0435\u043d\u0442\u0438\u0440\u0443\u0435\u0442 \u0432\u0440\u0430\u0433\u043e\u0432 \u0438 \u043d\u0430\u043d\u043e\u0441\u0438\u0442 {0} \u0443\u0440\u043e\u043d\u0430
-Archery.Effect.4=\u0412\u043e\u0437\u0432\u0440\u0430\u0449\u0435\u043d\u0438\u0435 \u0421\u0442\u0440\u0435\u043b
-Archery.Effect.5=\u0428\u0430\u043d\u0441 \u0438\u0437\u0432\u043b\u0435\u0447\u044c \u0441\u0442\u0440\u0435\u043b\u044b \u0438\u0437 \u0442\u0440\u0443\u043f\u043e\u0432
+Archery.SubSkill.SkillShot.Name=\u0423\u043c\u0435\u043b\u044b\u0439 \u0412\u044b\u0441\u0442\u0440\u0435\u043b
+Archery.SubSkill.SkillShot.Description=\u0423\u0432\u0435\u043b\u0438\u0447\u0438\u0432\u0430\u0435\u0442 \u0443\u0440\u043e\u043d \u043d\u0430\u043d\u043e\u0441\u0438\u043c\u044b\u0439 \u043b\u0443\u043a\u043e\u043c
+Archery.SubSkill.Daze.Name=\u0428\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 (\u0418\u0433\u0440\u043e\u043a\u043e\u0432)
+Archery.SubSkill.Daze.Description=\u0414\u0435\u0437\u043e\u0440\u0435\u043d\u0442\u0438\u0440\u0443\u0435\u0442 \u0432\u0440\u0430\u0433\u043e\u0432 \u0438 \u043d\u0430\u043d\u043e\u0441\u0438\u0442 {0} \u0443\u0440\u043e\u043d\u0430
+Archery.SubSkill.ArrowRetrieval.Name=\u0412\u043e\u0437\u0432\u0440\u0430\u0449\u0435\u043d\u0438\u0435 \u0421\u0442\u0440\u0435\u043b
+Archery.SubSkill.ArrowRetrieval.Description=\u0428\u0430\u043d\u0441 \u0438\u0437\u0432\u043b\u0435\u0447\u044c \u0441\u0442\u0440\u0435\u043b\u044b \u0438\u0437 \u0442\u0440\u0443\u043f\u043e\u0432
 Archery.Listener=\u0421\u0442\u0440\u0435\u043b\u044c\u0431\u0430 \u0438\u0437 \u043b\u0443\u043a\u0430:
 Archery.SkillName=\u0421\u0422\u0420\u0415\u041b\u042c\u0411\u0410 \u0418\u0417 \u041b\u0423\u041a\u0410
 Archery.Skillup=[[YELLOW]]\u0423\u0440\u043e\u0432\u0435\u043d\u044c \u043d\u0430\u0432\u044b\u043a\u0430 \"\u0421\u0442\u0440\u0435\u043b\u044c\u0431\u0430 \u0438\u0437 \u043b\u0443\u043a\u0430\" \u0443\u0432\u0435\u043b\u0438\u0447\u0435\u043d \u043d\u0430 {0}. \u0412\u0441\u0435\u0433\u043e ({1})
@@ -40,16 +40,16 @@ Axes.Combat.GI.Proc=[[GREEN]]**\u0423\u0414\u0410\u0420 \u0421 \u041e\u0413\u042
 Axes.Combat.GI.Struck=[[RED]]**\u041f\u041e\u0420\u0410\u0416\u0415\u041d \u0412\u0415\u041b\u0418\u041a\u0418\u041c \u0423\u0414\u0410\u0420\u041e\u041c**
 Axes.Combat.SS.Struck=[[DARK_RED]]\u041f\u043e\u0440\u0430\u0436\u0435\u043d \u0420\u0410\u0421\u041a\u0410\u041b\u042b\u0412\u0410\u0422\u0415\u041b\u0415\u041c \u0427\u0415\u0420\u0415\u041f\u041e\u0412!
 Axes.Combat.SS.Length=[[RED]]\u041f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c \u0443\u043c\u0435\u043d\u0438\u044f \"\u0420\u0430\u0441\u043a\u0430\u043b\u044b\u0432\u0430\u0442\u0435\u043b\u044c \u0427\u0435\u0440\u0435\u043f\u043e\u0432\": [[YELLOW]]{0}\u0441.
-Axes.Effect.0=\u0420\u0430\u0441\u043a\u0430\u043b\u044b\u0432\u0430\u0442\u0435\u043b\u044c \u0427\u0435\u0440\u0435\u043f\u043e\u0432 (\u0423\u043c\u0435\u043d\u0438\u0435)
-Axes.Effect.1=\u041d\u0430\u043d\u043e\u0441\u0438\u0442 \u0421\u043f\u043b\u044d\u0448 \u0423\u0434\u0430\u0440
-Axes.Effect.2=\u041a\u0440\u0438\u0442\u0438\u0447\u0435\u0441\u043a\u0438\u0439 \u0423\u0434\u0430\u0440
-Axes.Effect.3=\u0414\u0432\u043e\u0439\u043d\u043e\u0439 \u0423\u0440\u043e\u043d
-Axes.Effect.4=\u041c\u0430\u0441\u0442\u0435\u0440 \u0422\u043e\u043f\u043e\u0440\u0430
-Axes.Effect.5=\u041d\u0430\u043d\u043e\u0441\u0438\u0442 \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u0443\u0440\u043e\u043d
-Axes.Effect.6=\u0411\u0440\u043e\u043d\u0435\u0431\u043e\u0439\u043d\u044b\u0439 \u0423\u0434\u0430\u0440
-Axes.Effect.7=\u0423\u0434\u0430\u0440 \u0441 \u0442\u0430\u043a\u043e\u0439 \u0441\u0438\u043b\u043e\u0439, \u0447\u0442\u043e \u0440\u0430\u0437\u0440\u0443\u0448\u0430\u0435\u0442 \u0431\u0440\u043e\u043d\u044e
-Axes.Effect.8=\u0412\u0435\u043b\u0438\u043a\u0438\u0439 \u0423\u0434\u0430\u0440
-Axes.Effect.9=\u041d\u0430\u043d\u043e\u0441\u0438\u0442 \u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u0423\u0440\u043e\u043d \u0431\u0435\u0437\u043e\u0440\u0443\u0436\u043d\u044b\u043c \u0432\u0440\u0430\u0433\u0430\u043c
+Axes.SubSkill.SkullSplitter.Name=\u0420\u0430\u0441\u043a\u0430\u043b\u044b\u0432\u0430\u0442\u0435\u043b\u044c \u0427\u0435\u0440\u0435\u043f\u043e\u0432 (\u0423\u043c\u0435\u043d\u0438\u0435)
+Axes.SubSkill.SkullSplitter.Description=\u041d\u0430\u043d\u043e\u0441\u0438\u0442 \u0421\u043f\u043b\u044d\u0448 \u0423\u0434\u0430\u0440
+Axes.SubSkill.CriticalStrikes.Name=\u041a\u0440\u0438\u0442\u0438\u0447\u0435\u0441\u043a\u0438\u0439 \u0423\u0434\u0430\u0440
+Axes.SubSkill.CriticalStrikes.Description=\u0414\u0432\u043e\u0439\u043d\u043e\u0439 \u0423\u0440\u043e\u043d
+Axes.SubSkill.AxeMastery.Name=\u041c\u0430\u0441\u0442\u0435\u0440 \u0422\u043e\u043f\u043e\u0440\u0430
+Axes.SubSkill.AxeMastery.Description=\u041d\u0430\u043d\u043e\u0441\u0438\u0442 \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u0443\u0440\u043e\u043d
+Axes.SubSkill.ArmorImpact.Name=\u0411\u0440\u043e\u043d\u0435\u0431\u043e\u0439\u043d\u044b\u0439 \u0423\u0434\u0430\u0440
+Axes.SubSkill.ArmorImpact.Description=\u0423\u0434\u0430\u0440 \u0441 \u0442\u0430\u043a\u043e\u0439 \u0441\u0438\u043b\u043e\u0439, \u0447\u0442\u043e \u0440\u0430\u0437\u0440\u0443\u0448\u0430\u0435\u0442 \u0431\u0440\u043e\u043d\u044e
+Axes.SubSkill.GreaterImpact.Name=\u0412\u0435\u043b\u0438\u043a\u0438\u0439 \u0423\u0434\u0430\u0440
+Axes.SubSkill.GreaterImpact.Description=\u041d\u0430\u043d\u043e\u0441\u0438\u0442 \u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u0423\u0440\u043e\u043d \u0431\u0435\u0437\u043e\u0440\u0443\u0436\u043d\u044b\u043c \u0432\u0440\u0430\u0433\u0430\u043c
 Axes.Listener=\u0412\u043b\u0430\u0434\u0435\u043d\u0438\u0435 \u0422\u043e\u043f\u043e\u0440\u043e\u043c:
 Axes.SkillName=\u0412\u041b\u0410\u0414\u0415\u041d\u0418\u0415 \u0422\u041e\u041f\u041e\u0420\u041e\u041c
 Axes.Skills.SS.Off=[[RED]]**\u0423\u043c\u0435\u043d\u0438\u0435 \"\u0420\u0430\u0441\u043a\u0430\u043b\u044b\u0432\u0430\u0442\u0435\u043b\u044c \u0427\u0435\u0440\u0435\u043f\u043e\u0432\" \u043f\u0440\u0435\u043a\u0440\u0430\u0442\u0438\u043b\u043e \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435**
@@ -60,10 +60,10 @@ Axes.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] \u0438\u0441\u043f\u043e\u043
 Axes.Skillup=[[YELLOW]]\u0423\u0440\u043e\u0432\u0435\u043d\u044c \u043d\u0430\u0432\u044b\u043a\u0430 \"\u0412\u043b\u0430\u0434\u0435\u043d\u0438\u0435 \u0422\u043e\u043f\u043e\u0440\u043e\u043c\" \u0443\u0432\u0435\u043b\u0438\u0447\u0435\u043d \u043d\u0430 {0}. \u0412\u0441\u0435\u0433\u043e ({1})
 Excavation.Ability.Lower=[[GREEN]]**\u041b\u041e\u041f\u0410\u0422\u0410 \u0412 \u041e\u0411\u042b\u0427\u041d\u041e\u041c \u0421\u041e\u0421\u0422\u041e\u042f\u041d\u0418\u0418**
 Excavation.Ability.Ready=[[GREEN]]**\u041b\u041e\u041f\u0410\u0422\u0410 \u0412 \u0421\u041e\u0421\u0422\u041e\u042f\u041d\u0418\u0418 \u0413\u041e\u0422\u041e\u0412\u041d\u041e\u0421\u0422\u0418**
-Excavation.Effect.0=\u041c\u0435\u0433\u0430 \u0411\u0443\u0440 (\u0423\u041c\u0415\u041d\u0418\u0415)
-Excavation.Effect.1=\u0422\u0440\u043e\u0439\u043d\u043e\u0439 \u0414\u0440\u043e\u043f, \u0422\u0440\u043e\u0439\u043d\u043e\u0439 \u041e\u043f\u044b\u0442, \u0443\u0432\u0435\u043b\u0438\u0447\u0435\u043d\u0430\u044f \u0421\u043a\u043e\u0440\u043e\u0441\u0442\u044c \u0420\u0430\u0441\u043a\u043e\u043f\u043e\u043a
-Excavation.Effect.2=\u041e\u0445\u043e\u0442\u043d\u0438\u043a \u0437\u0430 \u0421\u043e\u043a\u0440\u043e\u0432\u0438\u0449\u0430\u043c\u0438
-Excavation.Effect.3=\u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c \u0438\u0441\u043a\u0430\u0442\u044c \u0441\u043e\u043a\u0440\u043e\u0432\u0438\u0449\u0430
+Excavation.SubSkill.GigaDrillBreaker.Name=\u041c\u0435\u0433\u0430 \u0411\u0443\u0440 (\u0423\u041c\u0415\u041d\u0418\u0415)
+Excavation.SubSkill.GigaDrillBreaker.Description=\u0422\u0440\u043e\u0439\u043d\u043e\u0439 \u0414\u0440\u043e\u043f, \u0422\u0440\u043e\u0439\u043d\u043e\u0439 \u041e\u043f\u044b\u0442, \u0443\u0432\u0435\u043b\u0438\u0447\u0435\u043d\u0430\u044f \u0421\u043a\u043e\u0440\u043e\u0441\u0442\u044c \u0420\u0430\u0441\u043a\u043e\u043f\u043e\u043a
+Excavation.SubSkill.TreasureHunter.Name=\u041e\u0445\u043e\u0442\u043d\u0438\u043a \u0437\u0430 \u0421\u043e\u043a\u0440\u043e\u0432\u0438\u0449\u0430\u043c\u0438
+Excavation.SubSkill.TreasureHunter.Description=\u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c \u0438\u0441\u043a\u0430\u0442\u044c \u0441\u043e\u043a\u0440\u043e\u0432\u0438\u0449\u0430
 Excavation.Effect.Length=[[RED]]\u041f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c \u0443\u043c\u0435\u043d\u0438\u044f \"\u041c\u0435\u0433\u0430 \u0411\u0443\u0440\": [[YELLOW]]{0}\u0441.
 Excavation.Listener=\u0420\u0430\u0441\u043a\u043e\u043f\u043a\u0438:
 Excavation.SkillName=\u0420\u0430\u0441\u043a\u043e\u043f\u043a\u0430
@@ -84,18 +84,18 @@ Fishing.Ability.TH.MagicRate=[[RED]]\u0428\u0430\u043d\u0441 \u041e\u0445\u043e\
 Fishing.Ability.Shake=[[RED]]\u0428\u0430\u043d\u0441 \u0412\u0441\u0442\u0440\u044f\u0441\u043a\u0438: [[YELLOW]]{0}%
 Fishing.Ability.IceFishing=[[RED]]\u041f\u043e\u0434\u043b\u0435\u0434\u043d\u0430\u044f \u0420\u044b\u0431\u0430\u043b\u043a\u0430: \u0418\u0434\u0438\u0442\u0435 \u0440\u044b\u0431\u0430\u0447\u0438\u0442\u044c \u043d\u0430 \u043b\u0435\u0434
 Fishing.Ability.FD=[[RED]]\u0420\u044b\u0431\u0430\u0446\u043a\u0430\u044f \u0414\u0438\u0435\u0442\u0430: [[YELLOW]]\u0420\u0430\u043d\u0433 {0}
-Fishing.Effect.0=\u041e\u0445\u043e\u0442\u043d\u0438\u043a \u0437\u0430 \u0421\u043e\u043a\u0440\u043e\u0432\u0438\u0449\u0430\u043c\u0438 (\u041f\u0430\u0441\u0441\u0438\u0432\u043d\u043e\u0435)
-Fishing.Effect.1=\u041b\u043e\u0432\u043b\u044f \u0440\u0430\u0437\u043d\u044b\u0445 \u043f\u0440\u0435\u0434\u043c\u0435\u0442\u043e\u0432
-Fishing.Effect.2=\u041e\u0445\u043e\u0442\u043d\u0438\u043a \u0417\u0430 \u041c\u0430\u0433\u0438\u0435\u0439
-Fishing.Effect.3=\u041d\u0430\u0445\u043e\u0434\u043a\u0430 \u0417\u0430\u0447\u0430\u0440\u043e\u0432\u0430\u043d\u044b\u0445 \u041f\u0440\u0435\u0434\u043c\u0435\u0442\u043e\u0432
-Fishing.Effect.4=\u0412\u0441\u0442\u0440\u044f\u0441\u043a\u0430 (\u0421\u0443\u0449\u0435\u0441\u0442\u0432)
-Fishing.Effect.5=\u0412\u044b\u0442\u0440\u044f\u0445\u0438\u0432\u0430\u0439\u0442\u0435 \u0432\u0435\u0449\u0438 \u0438\u0437 \u043c\u043e\u0431\u043e\u0432 \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u0443\u0434\u043e\u0447\u043a\u0438
-Fishing.Effect.6=\u0420\u044b\u0431\u0430\u0446\u043a\u0430\u044f \u0414\u0438\u0435\u0442\u0430
-Fishing.Effect.7=\u0423\u0432\u0435\u043b\u0438\u0447\u0438\u0432\u0430\u0435\u0442 \u0443\u0442\u043e\u043b\u0435\u043d\u0438\u0435 \u0433\u043e\u043b\u043e\u0434\u0430 \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u0440\u044b\u0431\u0430\u0446\u043a\u043e\u0439 \u0435\u0434\u044b
-Fishing.Effect.8=\u041c\u0430\u0441\u0442\u0435\u0440 \u0420\u044b\u0431\u043e\u043b\u043e\u0432
-Fishing.Effect.9=\u0423\u0432\u0435\u043b\u0438\u0447\u0438\u0432\u0430\u0435\u0442 \u0448\u0430\u043d\u0441 \u043f\u043e\u043a\u043b\u0435\u0432\u043a\u0438 \u0432\u043e \u0432\u0440\u0435\u043c\u044f \u0440\u044b\u0431\u0430\u043b\u043a\u0438
-Fishing.Effect.10=\u041f\u043e\u0434\u043b\u0435\u0434\u043d\u0430\u044f \u0420\u044b\u0431\u0430\u043b\u043a\u0430
-Fishing.Effect.11=\u041f\u043e\u0437\u0432\u043e\u043b\u044f\u0435\u0442 \u0432\u0430\u043c \u0440\u044b\u0431\u0430\u0447\u0438\u0442\u044c \u0432 \u0441\u043d\u0435\u0436\u043d\u044b\u0445 \u0431\u0438\u043e\u043c\u0430\u0445
+Fishing.SubSkill.TreasureHunter.Name=\u041e\u0445\u043e\u0442\u043d\u0438\u043a \u0437\u0430 \u0421\u043e\u043a\u0440\u043e\u0432\u0438\u0449\u0430\u043c\u0438 (\u041f\u0430\u0441\u0441\u0438\u0432\u043d\u043e\u0435)
+Fishing.SubSkill.TreasureHunter.Description=\u041b\u043e\u0432\u043b\u044f \u0440\u0430\u0437\u043d\u044b\u0445 \u043f\u0440\u0435\u0434\u043c\u0435\u0442\u043e\u0432
+Fishing.SubSkill.MagicHunter.Name=\u041e\u0445\u043e\u0442\u043d\u0438\u043a \u0417\u0430 \u041c\u0430\u0433\u0438\u0435\u0439
+Fishing.SubSkill.MagicHunter.Description=\u041d\u0430\u0445\u043e\u0434\u043a\u0430 \u0417\u0430\u0447\u0430\u0440\u043e\u0432\u0430\u043d\u044b\u0445 \u041f\u0440\u0435\u0434\u043c\u0435\u0442\u043e\u0432
+Fishing.SubSkill.Shake.Name=\u0412\u0441\u0442\u0440\u044f\u0441\u043a\u0430 (\u0421\u0443\u0449\u0435\u0441\u0442\u0432)
+Fishing.SubSkill.Shake.Description=\u0412\u044b\u0442\u0440\u044f\u0445\u0438\u0432\u0430\u0439\u0442\u0435 \u0432\u0435\u0449\u0438 \u0438\u0437 \u043c\u043e\u0431\u043e\u0432 \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u0443\u0434\u043e\u0447\u043a\u0438
+Fishing.SubSkill.FishermansDiet.Name=\u0420\u044b\u0431\u0430\u0446\u043a\u0430\u044f \u0414\u0438\u0435\u0442\u0430
+Fishing.SubSkill.FishermansDiet.Description=\u0423\u0432\u0435\u043b\u0438\u0447\u0438\u0432\u0430\u0435\u0442 \u0443\u0442\u043e\u043b\u0435\u043d\u0438\u0435 \u0433\u043e\u043b\u043e\u0434\u0430 \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u0440\u044b\u0431\u0430\u0446\u043a\u043e\u0439 \u0435\u0434\u044b
+Fishing.SubSkill.MasterAngler.Name=\u041c\u0430\u0441\u0442\u0435\u0440 \u0420\u044b\u0431\u043e\u043b\u043e\u0432
+Fishing.SubSkill.MasterAngler.Description=\u0423\u0432\u0435\u043b\u0438\u0447\u0438\u0432\u0430\u0435\u0442 \u0448\u0430\u043d\u0441 \u043f\u043e\u043a\u043b\u0435\u0432\u043a\u0438 \u0432\u043e \u0432\u0440\u0435\u043c\u044f \u0440\u044b\u0431\u0430\u043b\u043a\u0438
+Fishing.SubSkill.IceFishing.Name=\u041f\u043e\u0434\u043b\u0435\u0434\u043d\u0430\u044f \u0420\u044b\u0431\u0430\u043b\u043a\u0430
+Fishing.SubSkill.IceFishing.Description=\u041f\u043e\u0437\u0432\u043e\u043b\u044f\u0435\u0442 \u0432\u0430\u043c \u0440\u044b\u0431\u0430\u0447\u0438\u0442\u044c \u0432 \u0441\u043d\u0435\u0436\u043d\u044b\u0445 \u0431\u0438\u043e\u043c\u0430\u0445
 Fishing.Chance.Raining=[[BLUE]] \u0411\u043e\u043d\u0443\u0441 \u0414\u043e\u0436\u0434\u044f
 Fishing.Listener=\u0420\u044b\u0431\u043e\u043b\u043e\u0432\u0441\u0442\u0432\u043e:
 Fishing.Ability.TH.MagicFound=[[GRAY]]You feel a touch of magic with this catch...
@@ -116,20 +116,20 @@ Herbalism.Ability.Lower=[[GREEN]]**\u041c\u041e\u0422\u042b\u0413\u0410 \u0412 \
 Herbalism.Ability.Ready=[[GREEN]]**\u041c\u041e\u0422\u042b\u0413\u0410 \u0412 \u0421\u041e\u0421\u0422\u041e\u042f\u041d\u0418\u0418 \u0413\u041e\u0422\u041e\u0412\u041d\u041e\u0421\u0422\u0418**
 Herbalism.Ability.ShroomThumb.Chance=[[RED]]\u0428\u0430\u043d\u0441 \u0413\u0440\u0438\u0431\u043d\u043e\u0433\u043e \u041f\u0440\u0438\u043a\u043e\u0441\u043d\u043e\u0432\u0435\u043d\u0438\u044f: [[YELLOW]]{0}
 Herbalism.Ability.ShroomThumb.Fail=[[RED]]**\u0413\u0420\u0418\u0411\u041d\u041e\u0415 \u041f\u0420\u0418\u041a\u041e\u0421\u041d\u041e\u0412\u0415\u041d\u0418\u0415**
-Herbalism.Effect.0=\u041e\u0437\u0435\u043b\u0435\u043d\u0435\u043d\u0438\u0435 (\u0423\u041c\u0415\u041d\u0418\u0415)
-Herbalism.Effect.1=\u0420\u0430\u0441\u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0435\u043d\u0438\u0435 \u0417\u0435\u043c\u043b\u0438, \u0422\u0440\u043e\u0439\u043d\u043e\u0439 \u0414\u0440\u043e\u043f
-Herbalism.Effect.2=\u0416\u0438\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u041f\u0440\u0438\u043a\u043e\u0441\u043d\u043e\u0432\u0435\u043d\u0438\u0435 (\u041f\u0448\u0435\u043d\u0438\u0446\u0430)
-Herbalism.Effect.3=\u0410\u0432\u0442\u043e-\u041f\u043e\u0441\u0430\u0434\u043a\u0430 \u0440\u0430\u0441\u0442\u0435\u043d\u0438\u0439 \u043f\u0440\u0438 \u0443\u0431\u043e\u0440\u043a\u0435 \u0443\u0440\u043e\u0436\u0430\u044f
+Herbalism.SubSkill.GreenTerra.Name=\u041e\u0437\u0435\u043b\u0435\u043d\u0435\u043d\u0438\u0435 (\u0423\u041c\u0415\u041d\u0418\u0415)
+Herbalism.SubSkill.GreenTerra.Description=\u0420\u0430\u0441\u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0435\u043d\u0438\u0435 \u0417\u0435\u043c\u043b\u0438, \u0422\u0440\u043e\u0439\u043d\u043e\u0439 \u0414\u0440\u043e\u043f
+Herbalism.SubSkill.GreenThumb.Name=\u0416\u0438\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u041f\u0440\u0438\u043a\u043e\u0441\u043d\u043e\u0432\u0435\u043d\u0438\u0435 (\u041f\u0448\u0435\u043d\u0438\u0446\u0430)
+Herbalism.SubSkill.GreenThumb.Description=\u0410\u0432\u0442\u043e-\u041f\u043e\u0441\u0430\u0434\u043a\u0430 \u0440\u0430\u0441\u0442\u0435\u043d\u0438\u0439 \u043f\u0440\u0438 \u0443\u0431\u043e\u0440\u043a\u0435 \u0443\u0440\u043e\u0436\u0430\u044f
 Herbalism.Effect.4=\u0416\u0438\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u041f\u0440\u0438\u043a\u043e\u0441\u043d\u043e\u0432\u0435\u043d\u0438\u0435 (\u0411\u043b\u043e\u043a\u0438)
-Herbalism.Effect.5=\u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c \u0437\u0430\u043c\u0448\u043b\u044f\u0442\u044c \u043a\u0430\u043c\u0435\u043d\u044c \u0438\u043b\u0438 \u0440\u0430\u0441\u0442\u0438\u0442\u044c \u0442\u0440\u0430\u0432\u0443
-Herbalism.Effect.6=\u0424\u0435\u0440\u043c\u0435\u0440\u0441\u043a\u0430\u044f \u0414\u0438\u0435\u0442\u0430
-Herbalism.Effect.7=\u0423\u0432\u0435\u043b\u0438\u0447\u0438\u0432\u0430\u0435\u0442 \u0443\u0442\u043e\u043b\u0435\u043d\u0438\u0435 \u0433\u043e\u043b\u043e\u0434\u0430 \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u0444\u0435\u0440\u043c\u0435\u0440\u0441\u043a\u043e\u0439 \u0435\u0434\u044b
-Herbalism.Effect.8=\u0414\u0432\u043e\u0439\u043d\u043e\u0439 \u0414\u0440\u043e\u043f (\u0412\u0441\u0435\u0445 \u0420\u0430\u0441\u0442\u0435\u043d\u0438\u0439)
-Herbalism.Effect.9=\u0423\u0434\u0432\u0430\u0438\u0432\u0430\u0435\u0442 \u043d\u043e\u0440\u043c\u0430\u043b\u044c\u043d\u044b\u0439 \u0434\u043e\u0445\u043e\u0434
-Herbalism.Effect.10=\u0425\u0430\u0439\u043b\u0438\u0430\u043d\u0441\u043a\u0430\u044f \u0423\u0434\u0430\u0447\u0430
-Herbalism.Effect.11=\u0414\u0430\u0435\u0442 \u043d\u0435\u0431\u043e\u043b\u044c\u0448\u043e\u0439 \u0448\u0430\u043d\u0441 \u043d\u0430\u0439\u0442\u0438 \u0440\u0435\u0434\u043a\u0438\u0435 \u043f\u0440\u0435\u0434\u043c\u0435\u0442\u044b
-Herbalism.Effect.12=\u0413\u0440\u0438\u0431\u043d\u043e\u0435 \u041f\u0440\u0438\u043a\u043e\u0441\u043d\u043e\u0432\u0435\u043d\u0438\u0435
-Herbalism.Effect.13=\u0420\u0430\u0441\u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0435\u043d\u0438\u0435 \u043c\u0438\u0446\u0435\u043b\u0438\u044f \u043d\u0430 \u0433\u0440\u044f\u0437\u044c \u0438 \u0442\u0440\u0430\u0432\u0443
+Herbalism.SubSkill.GreenThumb.Description.2=\u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c \u0437\u0430\u043c\u0448\u043b\u044f\u0442\u044c \u043a\u0430\u043c\u0435\u043d\u044c \u0438\u043b\u0438 \u0440\u0430\u0441\u0442\u0438\u0442\u044c \u0442\u0440\u0430\u0432\u0443
+Herbalism.SubSkill.FarmersDiet.Name=\u0424\u0435\u0440\u043c\u0435\u0440\u0441\u043a\u0430\u044f \u0414\u0438\u0435\u0442\u0430
+Herbalism.SubSkill.FarmersDiet.Description=\u0423\u0432\u0435\u043b\u0438\u0447\u0438\u0432\u0430\u0435\u0442 \u0443\u0442\u043e\u043b\u0435\u043d\u0438\u0435 \u0433\u043e\u043b\u043e\u0434\u0430 \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u0444\u0435\u0440\u043c\u0435\u0440\u0441\u043a\u043e\u0439 \u0435\u0434\u044b
+Herbalism.SubSkill.DoubleDrops.Name=\u0414\u0432\u043e\u0439\u043d\u043e\u0439 \u0414\u0440\u043e\u043f (\u0412\u0441\u0435\u0445 \u0420\u0430\u0441\u0442\u0435\u043d\u0438\u0439)
+Herbalism.SubSkill.DoubleDrops.Description=\u0423\u0434\u0432\u0430\u0438\u0432\u0430\u0435\u0442 \u043d\u043e\u0440\u043c\u0430\u043b\u044c\u043d\u044b\u0439 \u0434\u043e\u0445\u043e\u0434
+Herbalism.SubSkill.HylianLuck.Name=\u0425\u0430\u0439\u043b\u0438\u0430\u043d\u0441\u043a\u0430\u044f \u0423\u0434\u0430\u0447\u0430
+Herbalism.SubSkill.HylianLuck.Description=\u0414\u0430\u0435\u0442 \u043d\u0435\u0431\u043e\u043b\u044c\u0448\u043e\u0439 \u0448\u0430\u043d\u0441 \u043d\u0430\u0439\u0442\u0438 \u0440\u0435\u0434\u043a\u0438\u0435 \u043f\u0440\u0435\u0434\u043c\u0435\u0442\u044b
+Herbalism.SubSkill.ShroomThumb.Name=\u0413\u0440\u0438\u0431\u043d\u043e\u0435 \u041f\u0440\u0438\u043a\u043e\u0441\u043d\u043e\u0432\u0435\u043d\u0438\u0435
+Herbalism.SubSkill.ShroomThumb.Description=\u0420\u0430\u0441\u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0435\u043d\u0438\u0435 \u043c\u0438\u0446\u0435\u043b\u0438\u044f \u043d\u0430 \u0433\u0440\u044f\u0437\u044c \u0438 \u0442\u0440\u0430\u0432\u0443
 Herbalism.HylianLuck=[[GREEN]]\u0423\u0434\u0430\u0447\u0430 \u0425\u0430\u0439\u0440\u0443\u043b\u0430 \u0441\u0435\u0433\u043e\u0434\u043d\u044f \u0441 \u0442\u043e\u0431\u043e\u0439!
 Herbalism.Listener=\u0422\u0440\u0430\u0432\u043d\u0438\u0447\u0435\u0441\u0442\u0432\u043e:
 Herbalism.SkillName=\u0422\u0420\u0410\u0412\u041d\u0418\u0427\u0415\u0421\u0422\u0412\u041e
@@ -144,16 +144,16 @@ Mining.Ability.Locked.1=\u0417\u0410\u0411\u041b\u041e\u041a\u0418\u0420\u041e\u
 Mining.Ability.Locked.2=\u0417\u0410\u0411\u041b\u041e\u041a\u0418\u0420\u041e\u0412\u0410\u041d\u041e \u0414\u041e \u0414\u041e\u0421\u0422\u0418\u0416\u0415\u041d\u0418\u042f {0}+ \u0423\u0420\u041e\u0412\u041d\u042f \u041d\u0410\u0412\u042b\u041a\u0410 (\u042d\u041a\u0421\u041f\u0415\u0420\u0422 \u0412\u0417\u0420\u042b\u0412\u041e\u0412)
 Mining.Ability.Lower=[[GREEN]]**\u041a\u0418\u0420\u041a\u0410 \u0412 \u041e\u0411\u042b\u0427\u041d\u041e\u041c \u0421\u041e\u0421\u0422\u041e\u042f\u041d\u0418\u0418**
 Mining.Ability.Ready=[[GREEN]]**\u041a\u0418\u0420\u041a\u0410 \u041f\u041e\u0414\u0413\u041e\u0422\u041e\u0412\u041b\u0415\u041d\u0410**
-Mining.Effect.0=\u0421\u0443\u043f\u0435\u0440 \u0414\u0440\u043e\u0431\u0438\u043b\u043a\u0430 (\u0423\u041c\u0415\u041d\u0418\u0415)
-Mining.Effect.1=\u0428\u0430\u043d\u0441 \u0422\u0440\u043e\u0439\u043d\u043e\u0433\u043e \u0414\u0440\u043e\u043f\u0430, \u0443\u0432\u0435\u043b\u0438\u0447\u0435\u043d\u043d\u0430\u044f \u0421\u043a\u043e\u0440\u043e\u0441\u0442\u044c
-Mining.Effect.2=\u0414\u0432\u043e\u0439\u043d\u043e\u0439 \u0414\u0440\u043e\u043f
-Mining.Effect.3=\u0423\u0434\u0432\u0430\u0438\u0432\u0430\u0435\u0442 \u043d\u043e\u0440\u043c\u0430\u043b\u044c\u043d\u044b\u0439 \u0434\u043e\u0445\u043e\u0434
-Mining.Effect.4=\u041f\u043e\u0434\u0440\u044b\u0432\u043d\u0430\u044f \u0414\u043e\u0431\u044b\u0447\u0430
-Mining.Effect.5=\u0423\u0432\u0435\u043b\u0438\u0447\u0438\u0432\u0430\u0435\u0442 \u0434\u043e\u0431\u044b\u0447\u0443 \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u0414\u0438\u043d\u0430\u043c\u0438\u0442\u0430
-Mining.Effect.6=\u0411\u043e\u043b\u044c\u0448\u0438\u0435 \u0411\u043e\u043c\u0431\u044b
-Mining.Effect.7=\u0423\u0432\u0435\u043b\u0438\u0447\u0438\u0432\u0430\u0435\u0442 \u0440\u0430\u0434\u0438\u0443\u0441 \u0432\u0437\u0440\u044b\u0432\u0430 \u0414\u0438\u043d\u0430\u043c\u0438\u0442\u0430
-Mining.Effect.8=\u042d\u043a\u0441\u043f\u0435\u0440\u0442 \u0412\u0437\u0440\u044b\u0432\u043e\u0432
-Mining.Effect.9=\u0423\u043c\u0435\u043d\u044c\u0448\u0430\u0435\u0442 \u0443\u0440\u043e\u043d \u043e\u0442 \u0432\u0437\u0440\u044b\u0432\u0430 \u0414\u0438\u043d\u0430\u043c\u0438\u0442\u0430
+Mining.SubSkill.SuperBreaker.Name=\u0421\u0443\u043f\u0435\u0440 \u0414\u0440\u043e\u0431\u0438\u043b\u043a\u0430 (\u0423\u041c\u0415\u041d\u0418\u0415)
+Mining.SubSkill.SuperBreaker.Description=\u0428\u0430\u043d\u0441 \u0422\u0440\u043e\u0439\u043d\u043e\u0433\u043e \u0414\u0440\u043e\u043f\u0430, \u0443\u0432\u0435\u043b\u0438\u0447\u0435\u043d\u043d\u0430\u044f \u0421\u043a\u043e\u0440\u043e\u0441\u0442\u044c
+Mining.SubSkill.DoubleDrops.Name=\u0414\u0432\u043e\u0439\u043d\u043e\u0439 \u0414\u0440\u043e\u043f
+Mining.SubSkill.DoubleDrops.Description=\u0423\u0434\u0432\u0430\u0438\u0432\u0430\u0435\u0442 \u043d\u043e\u0440\u043c\u0430\u043b\u044c\u043d\u044b\u0439 \u0434\u043e\u0445\u043e\u0434
+Mining.SubSkill.BlastMining.Name=\u041f\u043e\u0434\u0440\u044b\u0432\u043d\u0430\u044f \u0414\u043e\u0431\u044b\u0447\u0430
+Mining.SubSkill.BlastMining.Description=\u0423\u0432\u0435\u043b\u0438\u0447\u0438\u0432\u0430\u0435\u0442 \u0434\u043e\u0431\u044b\u0447\u0443 \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u0414\u0438\u043d\u0430\u043c\u0438\u0442\u0430
+Mining.SubSkill.BiggerBombs.Name=\u0411\u043e\u043b\u044c\u0448\u0438\u0435 \u0411\u043e\u043c\u0431\u044b
+Mining.SubSkill.BiggerBombs.Description=\u0423\u0432\u0435\u043b\u0438\u0447\u0438\u0432\u0430\u0435\u0442 \u0440\u0430\u0434\u0438\u0443\u0441 \u0432\u0437\u0440\u044b\u0432\u0430 \u0414\u0438\u043d\u0430\u043c\u0438\u0442\u0430
+Mining.SubSkill.DemolitionsExpertise.Name=\u042d\u043a\u0441\u043f\u0435\u0440\u0442 \u0412\u0437\u0440\u044b\u0432\u043e\u0432
+Mining.SubSkill.DemolitionsExpertise.Description=\u0423\u043c\u0435\u043d\u044c\u0448\u0430\u0435\u0442 \u0443\u0440\u043e\u043d \u043e\u0442 \u0432\u0437\u0440\u044b\u0432\u0430 \u0414\u0438\u043d\u0430\u043c\u0438\u0442\u0430
 Mining.Effect.Decrease=[[RED]]\u0421\u043d\u0438\u0436\u0435\u043d\u0438\u0435 \u043f\u043e\u0432\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u0439 \u0434\u043b\u044f \u042d\u043a\u0441\u043f\u0435\u0440\u0442 \u0412\u0437\u0440\u044b\u0432\u043e\u0432 \u043d\u0430: [[YELLOW]]{0}
 Mining.Effect.DropChance=[[RED]]\u0428\u0430\u043d\u0441 \u0414\u0432\u043e\u0439\u043d\u043e\u0433\u043e \u0414\u0440\u043e\u043f\u0430: [[YELLOW]]{0} %
 Mining.Listener=\u0428\u0430\u0445\u0442\u0451\u0440\u0441\u0442\u0432\u043e:
@@ -170,24 +170,24 @@ Mining.Blast.Radius.Increase=[[RED]]\u0420\u0430\u0434\u0438\u0443\u0441 \u0412\
 Mining.Blast.Rank=[[RED]]\u041f\u043e\u0434\u0440\u044b\u0432\u043d\u0430\u044f \u0414\u043e\u0431\u044b\u0447\u0430: [[YELLOW]] \u0420\u0430\u043d\u0433 {0}/8 [[GRAY]]({1})
 Mining.Blast.Other.On=[[GREEN]]{0}[[DARK_GREEN]] \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043b \u0443\u043c\u0435\u043d\u0438\u0435 [[RED]]\"\u041f\u043e\u0434\u0440\u044b\u0432\u043d\u0430\u044f \u0414\u043e\u0431\u044b\u0447\u0430\"!
 Mining.Blast.Refresh=[[GREEN]]\u0412\u0430\u0448\u0435 \u0443\u043c\u0435\u043d\u0438\u0435 [[YELLOW]]\"\u041f\u043e\u0434\u0440\u044b\u0432\u043d\u0430\u044f \u0414\u043e\u0431\u044b\u0447\u0430\" [[GREEN]]\u0432\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043e!
-Repair.Effect.0=\u0420\u0435\u043c\u043e\u043d\u0442
-Repair.Effect.1=\u0420\u0435\u043c\u043e\u043d\u0442 \u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u043e\u0432 \u0438 \u0411\u0440\u043e\u043d\u0438
-Repair.Effect.10=\u0420\u0435\u043c\u043e\u043d\u0442 \u0417\u043e\u043b\u043e\u0442\u044b\u0445 \u0432\u0435\u0449\u0435\u0439 ({0}+ \u0443\u0440\u043e\u0432\u0435\u043d\u044c)
-Repair.Effect.11=\u0420\u0435\u043c\u043e\u043d\u0442 \u0417\u043e\u043b\u043e\u0442\u044b\u0445 \u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u043e\u0432 \u0438 \u0411\u0440\u043e\u043d\u0438
-Repair.Effect.12=\u0420\u0435\u043c\u043e\u043d\u0442 \u0416\u0435\u043b\u0435\u0437\u043d\u044b\u0445 \u0432\u0435\u0449\u0435\u0439 ({0}+ \u0443\u0440\u043e\u0432\u0435\u043d\u044c)
-Repair.Effect.13=\u0420\u0435\u043c\u043e\u043d\u0442 \u0416\u0435\u043b\u0435\u0437\u043d\u044b\u0445 \u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u043e\u0432 \u0438 \u0411\u0440\u043e\u043d\u0438
-Repair.Effect.14=\u0420\u0435\u043c\u043e\u043d\u0442 \u041a\u0430\u043c\u0435\u043d\u043d\u044b\u0445 \u0432\u0435\u0449\u0435\u0439 ({0}+ \u0443\u0440\u043e\u0432\u0435\u043d\u044c)
-Repair.Effect.15=\u0420\u0435\u043c\u043e\u043d\u0442 \u041a\u0430\u043c\u0435\u043d\u043d\u044b\u0445 \u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u043e\u0432
-Repair.Effect.2=\u041c\u0430\u0441\u0442\u0435\u0440 \u0420\u0435\u043c\u043e\u043d\u0442\u0430
-Repair.Effect.3=\u0423\u0432\u0435\u043b\u0438\u0447\u0438\u0432\u0430\u0435\u0442 \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u043e \u0440\u0435\u043c\u043e\u043d\u0442\u0430
-Repair.Effect.4=\u0421\u0443\u043f\u0435\u0440 \u0420\u0435\u043c\u043e\u043d\u0442
-Repair.Effect.5=\u0414\u0432\u043e\u0439\u043d\u0430\u044f \u044d\u0444\u0444\u0435\u043a\u0442\u0438\u0432\u043d\u043e\u0441\u0442\u044c
-Repair.Effect.6=\u0420\u0435\u043c\u043e\u043d\u0442 \u0410\u043b\u043c\u0430\u0437\u043d\u044b\u0445 \u0432\u0435\u0449\u0435\u0439 ({0}+ \u0443\u0440\u043e\u0432\u0435\u043d\u044c)
-Repair.Effect.7=\u0420\u0435\u043c\u043e\u043d\u0442 \u0410\u043b\u043c\u0430\u0437\u043d\u044b\u0445 \u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u043e\u0432 \u0438 \u0411\u0440\u043e\u043d\u0438
-Repair.Effect.8=\u0412\u043e\u043b\u0448\u0435\u0431\u043d\u0430\u044f \u041a\u043e\u0432\u043a\u0430
-Repair.Effect.9=\u0420\u0435\u043c\u043e\u043d\u0442 \u0432\u043e\u043b\u0448\u0435\u0431\u043d\u044b\u0445 \u0432\u0435\u0449\u0435\u0439
-Repair.Effect.16=\u0420\u0430\u0437\u0431\u043e\u0440\u043a\u0430 \u0412\u0435\u0449\u0435\u0439 ({0}+ SKILL)
-Repair.Effect.17=\u0420\u0430\u0437\u0431\u043e\u0440\u043a\u0430 \u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u043e\u0432 \u0438 \u0411\u0440\u043e\u043d\u0438
+Repair.SubSkill.Repair.Name=\u0420\u0435\u043c\u043e\u043d\u0442
+Repair.SubSkill.Repair.Description=\u0420\u0435\u043c\u043e\u043d\u0442 \u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u043e\u0432 \u0438 \u0411\u0440\u043e\u043d\u0438
+Repair.SubSkill.GoldRepair.Name=\u0420\u0435\u043c\u043e\u043d\u0442 \u0417\u043e\u043b\u043e\u0442\u044b\u0445 \u0432\u0435\u0449\u0435\u0439 ({0}+ \u0443\u0440\u043e\u0432\u0435\u043d\u044c)
+Repair.SubSkill.GoldRepair.Description=\u0420\u0435\u043c\u043e\u043d\u0442 \u0417\u043e\u043b\u043e\u0442\u044b\u0445 \u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u043e\u0432 \u0438 \u0411\u0440\u043e\u043d\u0438
+Repair.SubSkill.IronRepair.Name=\u0420\u0435\u043c\u043e\u043d\u0442 \u0416\u0435\u043b\u0435\u0437\u043d\u044b\u0445 \u0432\u0435\u0449\u0435\u0439 ({0}+ \u0443\u0440\u043e\u0432\u0435\u043d\u044c)
+Repair.SubSkill.IronRepair.Description=\u0420\u0435\u043c\u043e\u043d\u0442 \u0416\u0435\u043b\u0435\u0437\u043d\u044b\u0445 \u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u043e\u0432 \u0438 \u0411\u0440\u043e\u043d\u0438
+Repair.SubSkill.StoneRepair.Name=\u0420\u0435\u043c\u043e\u043d\u0442 \u041a\u0430\u043c\u0435\u043d\u043d\u044b\u0445 \u0432\u0435\u0449\u0435\u0439 ({0}+ \u0443\u0440\u043e\u0432\u0435\u043d\u044c)
+Repair.SubSkill.StoneRepair.Description=\u0420\u0435\u043c\u043e\u043d\u0442 \u041a\u0430\u043c\u0435\u043d\u043d\u044b\u0445 \u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u043e\u0432
+Repair.SubSkill.RepairMastery.Name=\u041c\u0430\u0441\u0442\u0435\u0440 \u0420\u0435\u043c\u043e\u043d\u0442\u0430
+Repair.SubSkill.RepairMastery.Description=\u0423\u0432\u0435\u043b\u0438\u0447\u0438\u0432\u0430\u0435\u0442 \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u043e \u0440\u0435\u043c\u043e\u043d\u0442\u0430
+Repair.SubSkill.SuperRepair.Name=\u0421\u0443\u043f\u0435\u0440 \u0420\u0435\u043c\u043e\u043d\u0442
+Repair.SubSkill.SuperRepair.Description=\u0414\u0432\u043e\u0439\u043d\u0430\u044f \u044d\u0444\u0444\u0435\u043a\u0442\u0438\u0432\u043d\u043e\u0441\u0442\u044c
+Repair.SubSkill.DiamondRepair.Name=\u0420\u0435\u043c\u043e\u043d\u0442 \u0410\u043b\u043c\u0430\u0437\u043d\u044b\u0445 \u0432\u0435\u0449\u0435\u0439 ({0}+ \u0443\u0440\u043e\u0432\u0435\u043d\u044c)
+Repair.SubSkill.DiamondRepair.Description=\u0420\u0435\u043c\u043e\u043d\u0442 \u0410\u043b\u043c\u0430\u0437\u043d\u044b\u0445 \u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u043e\u0432 \u0438 \u0411\u0440\u043e\u043d\u0438
+Repair.SubSkill.ArcaneForging.Name=\u0412\u043e\u043b\u0448\u0435\u0431\u043d\u0430\u044f \u041a\u043e\u0432\u043a\u0430
+Repair.SubSkill.ArcaneForging.Description=\u0420\u0435\u043c\u043e\u043d\u0442 \u0432\u043e\u043b\u0448\u0435\u0431\u043d\u044b\u0445 \u0432\u0435\u0449\u0435\u0439
+Repair.SubSkill.Salvage.Name=\u0420\u0430\u0437\u0431\u043e\u0440\u043a\u0430 \u0412\u0435\u0449\u0435\u0439 ({0}+ SKILL)
+Repair.SubSkill.Salvage.Description=\u0420\u0430\u0437\u0431\u043e\u0440\u043a\u0430 \u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u043e\u0432 \u0438 \u0411\u0440\u043e\u043d\u0438
 Repair.Error=[[DARK_RED]]mcMMO \u043e\u0431\u043d\u0430\u0440\u0443\u0436\u0438\u043b \u043e\u0448\u0438\u0431\u043a\u0443 \u043f\u044b\u0442\u0430\u044f\u0441\u044c \u043f\u043e\u0447\u0438\u043d\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u043f\u0440\u0435\u0434\u043c\u0435\u0442!
 Repair.Listener.Anvil=[[DARK_RED]]\u0412\u044b \u0440\u0430\u0437\u043c\u0435\u0441\u0442\u0438\u043b\u0438 \u043d\u0430\u043a\u043e\u0432\u0430\u043b\u044c\u043d\u044e \u043d\u0430 \u043a\u043e\u0442\u043e\u0440\u043e\u0439 \u043c\u043e\u0436\u0435\u0442\u0435 \u0447\u0438\u043d\u0438\u0442\u044c \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u044b \u0438 \u0431\u0440\u043e\u043d\u044e.
 Repair.Listener.Anvil2=[[DARK_RED]]\u0412\u044b \u0440\u0430\u0437\u043c\u0435\u0441\u0442\u0438\u043b\u0438 \u0420\u0430\u0437\u0431\u043e\u0440\u043e\u0447\u043d\u0443\u044e \u043d\u0430\u043a\u043e\u0432\u0430\u043b\u044c\u043d\u044e, \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u0435\u0435 \u0434\u043b\u044f \u0420\u0430\u0437\u0431\u043e\u0440\u043a\u0438 \u043e\u0440\u0443\u0436\u0438\u044f \u0438 \u0431\u0440\u043e\u043d\u0438.
@@ -228,14 +228,14 @@ Swords.Combat.Counter.Chance=[[RED]]\u0428\u0430\u043d\u0441 \u041a\u043e\u043d\
 Swords.Combat.Counter.Hit=[[DARK_RED]]\u041f\u043e\u0440\u0430\u0436\u0435\u043d \u043a\u043e\u043d\u0442\u0440\u0430\u0442\u0430\u043a\u043e\u0439!
 Swords.Combat.Countered=[[GREEN]]**\u041a\u041e\u041d\u0422\u0420\u0410\u0422\u0410\u041a\u0410**
 Swords.Combat.SS.Struck=[[DARK_RED]]\u041f\u043e\u0440\u0430\u0436\u0435\u043d \u0420\u0415\u0416\u0423\u0429\u0418\u041c \u0423\u0414\u0410\u0420\u041e\u041c!
-Swords.Effect.0=\u041a\u043e\u043d\u0442\u0440\u0430\u0442\u0430\u043a\u0430
-Swords.Effect.1=\u041e\u0442\u0440\u0430\u0436\u0435\u043d\u0438\u0435 {0} \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u043d\u043e\u0433\u043e \u0443\u0440\u043e\u043d\u0430 \u043f\u0440\u0438 \u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0438
-Swords.Effect.2=\u0420\u0435\u0436\u0443\u0449\u0438\u0439 \u0423\u0434\u0430\u0440 (\u0423\u041c\u0415\u041d\u0418\u0415)
-Swords.Effect.3={0} \u0423\u0440\u043e\u043d\u0430 \u043e\u0442 \u0421\u043f\u043b\u044d\u0448 \u0423\u0434\u0430\u0440\u0430, \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u041a\u0440\u043e\u0432\u043e\u0442\u0435\u0447\u0435\u043d\u0438\u0435
+Swords.SubSkill.CounterAttack.Name=\u041a\u043e\u043d\u0442\u0440\u0430\u0442\u0430\u043a\u0430
+Swords.SubSkill.CounterAttack.Description=\u041e\u0442\u0440\u0430\u0436\u0435\u043d\u0438\u0435 {0} \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u043d\u043e\u0433\u043e \u0443\u0440\u043e\u043d\u0430 \u043f\u0440\u0438 \u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0438
+Swords.SubSkill.SerratedStrikes.Name=\u0420\u0435\u0436\u0443\u0449\u0438\u0439 \u0423\u0434\u0430\u0440 (\u0423\u041c\u0415\u041d\u0418\u0415)
+Swords.SubSkill.SerratedStrikes.Description={0} \u0423\u0440\u043e\u043d\u0430 \u043e\u0442 \u0421\u043f\u043b\u044d\u0448 \u0423\u0434\u0430\u0440\u0430, \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u041a\u0440\u043e\u0432\u043e\u0442\u0435\u0447\u0435\u043d\u0438\u0435
 Swords.Effect.4=\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u041a\u0440\u043e\u0432\u043e\u0442\u0435\u0447\u0435\u043d\u0438\u0435 \u043f\u0440\u0438 \u0420\u0435\u0436\u0443\u0449\u0435\u043c \u0423\u0434\u0430\u0440\u0435
 Swords.Effect.5={0} \u0422\u0438\u043a\u043e\u0432 \u041a\u0440\u043e\u0432\u043e\u0442\u0435\u0447\u0435\u043d\u0438\u0435
-Swords.Effect.6=\u041a\u0440\u043e\u0432\u043e\u0442\u0435\u0447\u0435\u043d\u0438\u0435
-Swords.Effect.7=\u0417\u0430\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u0442 \u0432\u0440\u0430\u0433\u0430 \u043a\u0440\u043e\u0432\u043e\u0442\u043e\u0447\u0438\u0442\u044c
+Swords.SubSkill.Bleed.Name=\u041a\u0440\u043e\u0432\u043e\u0442\u0435\u0447\u0435\u043d\u0438\u0435
+Swords.SubSkill.Bleed.Description=\u0417\u0430\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u0442 \u0432\u0440\u0430\u0433\u0430 \u043a\u0440\u043e\u0432\u043e\u0442\u043e\u0447\u0438\u0442\u044c
 Swords.Listener=\u0412\u043b\u0430\u0434\u0435\u043d\u0438\u0435 \u043c\u0435\u0447\u0430\u043c\u0438:
 Swords.SkillName=\u0412\u041b\u0410\u0414\u0415\u041d\u0418\u0415 \u041c\u0415\u0427\u0415\u041c
 Swords.Skills.SS.Off=[[RED]]**\u0423\u043c\u0435\u043d\u0438\u0435 \"\u0420\u0435\u0436\u0443\u0449\u0438\u0439 \u0443\u0434\u0430\u0440\" \u043f\u0440\u0435\u043a\u0440\u0430\u0442\u0438\u043b\u043e \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435**
@@ -264,27 +264,27 @@ Taming.Ability.Locked.3=\u0417\u0410\u0411\u041b\u041e\u041a\u0418\u0420\u041e\u
 Taming.Ability.Locked.4=\u0417\u0410\u0411\u041b\u041e\u041a\u0418\u0420\u041e\u0412\u0410\u041d\u041e \u0414\u041e \u0414\u041e\u0421\u0422\u0418\u0416\u0415\u041d\u0418\u042f {0}+ \u0423\u0420\u041e\u0412\u041d\u042f \u041d\u0410\u0412\u042b\u041a\u0410 (\u0411\u042b\u0421\u0422\u0420\u041e\u0415 \u041f\u0418\u0422\u0410\u041d\u0418\u0415)
 Taming.Ability.Locked.5=\u0417\u0410\u0411\u041b\u041e\u041a\u0418\u0420\u041e\u0412\u0410\u041d\u041e \u0414\u041e \u0414\u041e\u0421\u0422\u0418\u0416\u0415\u041d\u0418\u042f {0}+ \u0423\u0420\u041e\u0412\u041d\u042f \u041d\u0410\u0412\u042b\u041a\u0410 (\u0421\u0412\u042f\u0422\u041e\u0419 \u041f\u0415\u0421)
 Taming.Combat.Chance.Gore=[[RED]]\u0428\u0430\u043d\u0441 \u0423\u043a\u0443\u0441\u0430: [[YELLOW]]{0}
-Taming.Effect.0=\u0417\u043d\u0430\u043d\u0438\u0435 \u0417\u0432\u0435\u0440\u0435\u0439
-Taming.Effect.1=\u0423\u0434\u0430\u0440 \u043a\u043e\u0441\u0442\u044c\u044e \u0434\u043b\u044f \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0438 \u0432\u043e\u043b\u043a\u043e\u0432 \u0438 \u043e\u0446\u0435\u043b\u043e\u0442\u043e\u0432
-Taming.Effect.10=\u041d\u0430\u0434\u0435\u0436\u043d\u0430\u044f \u0417\u0430\u0449\u0438\u0442\u0430
-Taming.Effect.11=\u0421\u043d\u0438\u0436\u0435\u043d\u0438\u0435 \u0443\u0440\u043e\u043d\u0430 \u043e\u0442 \u0432\u0437\u0440\u044b\u0432\u043e\u0432
-Taming.Effect.12=\u0417\u043e\u0432 \u041f\u0440\u0435\u0434\u043a\u043e\u0432
-Taming.Effect.13=\u041f\u0440\u0438\u0437\u044b\u0432 \u0436\u0438\u0432\u043e\u0442\u043d\u044b\u0445 \u043d\u0430 \u0441\u0432\u043e\u044e \u0441\u0442\u043e\u0440\u043e\u043d\u0443
-Taming.Effect.14=[[GRAY]]COTW (\u041e\u0446\u0435\u043b\u043e\u0442): \u041f\u0440\u0438\u0441\u044f\u0434\u044c\u0442\u0435 \u0438 \u043a\u043b\u0438\u043a\u043d\u0438\u0442\u0435 \u043b\u0435\u0432\u043e\u0439 \u043a\u043d\u043e\u043f\u043a\u043e\u0439 \u043c\u044b\u0448\u0438 \u0441 {0} \u0420\u044b\u0431\u043e\u0439 \u0432 \u0440\u0443\u043a\u0435
+Taming.SubSkill.BeastLore.Name=\u0417\u043d\u0430\u043d\u0438\u0435 \u0417\u0432\u0435\u0440\u0435\u0439
+Taming.SubSkill.BeastLore.Description=\u0423\u0434\u0430\u0440 \u043a\u043e\u0441\u0442\u044c\u044e \u0434\u043b\u044f \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0438 \u0432\u043e\u043b\u043a\u043e\u0432 \u0438 \u043e\u0446\u0435\u043b\u043e\u0442\u043e\u0432
+Taming.SubSkill.ShockProof.Name=\u041d\u0430\u0434\u0435\u0436\u043d\u0430\u044f \u0417\u0430\u0449\u0438\u0442\u0430
+Taming.SubSkill.ShockProof.Description=\u0421\u043d\u0438\u0436\u0435\u043d\u0438\u0435 \u0443\u0440\u043e\u043d\u0430 \u043e\u0442 \u0432\u0437\u0440\u044b\u0432\u043e\u0432
+Taming.SubSkill.CallOfTheWild.Name=\u0417\u043e\u0432 \u041f\u0440\u0435\u0434\u043a\u043e\u0432
+Taming.SubSkill.CallOfTheWild.Description=\u041f\u0440\u0438\u0437\u044b\u0432 \u0436\u0438\u0432\u043e\u0442\u043d\u044b\u0445 \u043d\u0430 \u0441\u0432\u043e\u044e \u0441\u0442\u043e\u0440\u043e\u043d\u0443
+Taming.SubSkill.CallOfTheWild.Description.2=[[GRAY]]COTW (\u041e\u0446\u0435\u043b\u043e\u0442): \u041f\u0440\u0438\u0441\u044f\u0434\u044c\u0442\u0435 \u0438 \u043a\u043b\u0438\u043a\u043d\u0438\u0442\u0435 \u043b\u0435\u0432\u043e\u0439 \u043a\u043d\u043e\u043f\u043a\u043e\u0439 \u043c\u044b\u0448\u0438 \u0441 {0} \u0420\u044b\u0431\u043e\u0439 \u0432 \u0440\u0443\u043a\u0435
 Taming.Effect.15=[[GRAY]]COTW (\u0412\u043e\u043b\u043a): \u041f\u0440\u0438\u0441\u044f\u0434\u044c\u0442\u0435 \u0438 \u043a\u043b\u0438\u043a\u043d\u0438\u0442\u0435 \u043b\u0435\u0432\u043e\u0439 \u043a\u043d\u043e\u043f\u043a\u043e\u0439 \u043c\u044b\u0448\u0438 \u0441 {0} \u041a\u043e\u0441\u0442\u044c\u044e \u0432 \u0440\u0443\u043a\u0435
-Taming.Effect.20=[[GRAY]]COTW (\u041b\u043e\u0448\u0430\u0434\u044c): \u041f\u0440\u0438\u0441\u044f\u0434\u044c\u0442\u0435 \u0438 \u043a\u043b\u0438\u043a\u043d\u0438\u0442\u0435 \u041b\u041a\u041c \u0441 {0} \u044f\u0431\u043b\u043e\u043a\u0430\u043c\u0438 \u0432 \u0440\u0443\u043a\u0435.
-Taming.Effect.16=\u0411\u044b\u0441\u0442\u0440\u043e\u0435 \u041f\u0438\u0442\u0430\u043d\u0438\u0435
-Taming.Effect.17=\u0423 \u0432\u043e\u043b\u043a\u043e\u0432 \u0435\u0441\u0442\u044c \u0448\u0430\u043d\u0441 \u0432\u044b\u043b\u0435\u0447\u0438\u0442\u044c\u0441\u044f \u043f\u0440\u0438 \u0430\u0442\u0430\u043a\u0435
-Taming.Effect.18=\u0421\u0432\u044f\u0442\u043e\u0439 \u041f\u0435\u0441
-Taming.Effect.19=\u0418\u0437\u043b\u0435\u0447\u0435\u043d \u0412\u043e\u043b\u0448\u0435\u0431\u0441\u0442\u0432\u043e\u043c \u0438 \u042f\u0434\u043e\u043c
-Taming.Effect.2=\u0423\u043a\u0443\u0441
-Taming.Effect.3=\u041a\u0440\u0438\u0442\u0438\u0447\u0435\u0441\u043a\u0438 \u0423\u0434\u0430\u0440, \u0438\u0437-\u0437\u0430 \u043a\u043e\u0442\u043e\u0440\u043e\u0433\u043e \u043d\u0430\u0447\u0438\u043d\u0430\u0435\u0442\u0441\u044f \u041a\u0440\u043e\u0432\u043e\u0442\u0435\u0447\u0435\u043d\u0438\u0435
-Taming.Effect.4=\u041e\u0441\u0442\u0440\u044b\u0435 \u041a\u043e\u0433\u0442\u0438
-Taming.Effect.5=\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u0423\u0440\u043e\u043d
-Taming.Effect.6=\u0417\u043d\u0430\u043d\u0438\u0435 \u041e\u043a\u0440\u0443\u0436\u0430\u044e\u0449\u0435\u0439 \u0421\u0440\u0435\u0434\u044b
-Taming.Effect.7=\u0411\u043e\u044f\u0437\u043d\u044c \u041a\u0430\u043a\u0442\u0443\u0441\u043e\u0432 \u0438 \u041b\u0430\u0432\u044b, \u0418\u043c\u0443\u043d\u0438\u0442\u0435\u0442 \u043a \u0423\u0440\u043e\u043d\u0443 \u043e\u0442 \u041f\u0430\u0434\u0435\u043d\u0438\u044f
-Taming.Effect.8=\u0413\u0443\u0441\u0442\u043e\u0439 \u041c\u0435\u0445
-Taming.Effect.9=\u0421\u043d\u0438\u0436\u0435\u043d\u0438\u0435 \u0423\u0440\u043e\u043d\u0430, \u041e\u0433\u043d\u0435\u0441\u0442\u043e\u0439\u043a\u043e\u0441\u0442\u044c
+Taming.SubSkill.Gore.Name0=[[GRAY]]COTW (\u041b\u043e\u0448\u0430\u0434\u044c): \u041f\u0440\u0438\u0441\u044f\u0434\u044c\u0442\u0435 \u0438 \u043a\u043b\u0438\u043a\u043d\u0438\u0442\u0435 \u041b\u041a\u041c \u0441 {0} \u044f\u0431\u043b\u043e\u043a\u0430\u043c\u0438 \u0432 \u0440\u0443\u043a\u0435.
+Taming.SubSkill.FastFoodService.Name=\u0411\u044b\u0441\u0442\u0440\u043e\u0435 \u041f\u0438\u0442\u0430\u043d\u0438\u0435
+Taming.SubSkill.FastFoodService.Description=\u0423 \u0432\u043e\u043b\u043a\u043e\u0432 \u0435\u0441\u0442\u044c \u0448\u0430\u043d\u0441 \u0432\u044b\u043b\u0435\u0447\u0438\u0442\u044c\u0441\u044f \u043f\u0440\u0438 \u0430\u0442\u0430\u043a\u0435
+Taming.SubSkill.HolyHound.Name=\u0421\u0432\u044f\u0442\u043e\u0439 \u041f\u0435\u0441
+Taming.SubSkill.HolyHound.Description=\u0418\u0437\u043b\u0435\u0447\u0435\u043d \u0412\u043e\u043b\u0448\u0435\u0431\u0441\u0442\u0432\u043e\u043c \u0438 \u042f\u0434\u043e\u043c
+Taming.SubSkill.Gore.Name=\u0423\u043a\u0443\u0441
+Taming.SubSkill.Gore.Description=\u041a\u0440\u0438\u0442\u0438\u0447\u0435\u0441\u043a\u0438 \u0423\u0434\u0430\u0440, \u0438\u0437-\u0437\u0430 \u043a\u043e\u0442\u043e\u0440\u043e\u0433\u043e \u043d\u0430\u0447\u0438\u043d\u0430\u0435\u0442\u0441\u044f \u041a\u0440\u043e\u0432\u043e\u0442\u0435\u0447\u0435\u043d\u0438\u0435
+Taming.SubSkill.SharpenedClaws.Name=\u041e\u0441\u0442\u0440\u044b\u0435 \u041a\u043e\u0433\u0442\u0438
+Taming.SubSkill.SharpenedClaws.Description=\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u0423\u0440\u043e\u043d
+Taming.SubSkill.EnvironmentallyAware.Name=\u0417\u043d\u0430\u043d\u0438\u0435 \u041e\u043a\u0440\u0443\u0436\u0430\u044e\u0449\u0435\u0439 \u0421\u0440\u0435\u0434\u044b
+Taming.SubSkill.EnvironmentallyAware.Description=\u0411\u043e\u044f\u0437\u043d\u044c \u041a\u0430\u043a\u0442\u0443\u0441\u043e\u0432 \u0438 \u041b\u0430\u0432\u044b, \u0418\u043c\u0443\u043d\u0438\u0442\u0435\u0442 \u043a \u0423\u0440\u043e\u043d\u0443 \u043e\u0442 \u041f\u0430\u0434\u0435\u043d\u0438\u044f
+Taming.SubSkill.ThickFur.Name=\u0413\u0443\u0441\u0442\u043e\u0439 \u041c\u0435\u0445
+Taming.SubSkill.ThickFur.Description=\u0421\u043d\u0438\u0436\u0435\u043d\u0438\u0435 \u0423\u0440\u043e\u043d\u0430, \u041e\u0433\u043d\u0435\u0441\u0442\u043e\u0439\u043a\u043e\u0441\u0442\u044c
 Taming.Listener.Wolf=[[DARK_GRAY]]\u0412\u0430\u0448 \u0432\u043e\u043b\u043a \u0445\u043e\u0447\u0435\u0442 \u0432\u0435\u0440\u043d\u0443\u0442\u0441\u044f \u043a \u0412\u0430\u043c...
 Taming.Listener=\u0423\u043a\u0440\u043e\u0449\u0435\u043d\u0438\u0435:
 Taming.SkillName=\u0423\u041a\u0420\u041e\u0429\u0415\u041d\u0418\u0415
@@ -304,16 +304,16 @@ Unarmed.Ability.IronGrip.Attacker=[[RED]]\u0423 \u0432\u0430\u0448\u0435\u0433\u
 Unarmed.Ability.IronGrip.Defender=[[GREEN]]\u0412\u0430\u0448\u0430 \u0436\u0435\u043b\u0435\u0437\u043d\u0430\u044f \u0445\u0432\u0430\u0442\u043a\u0430 \u043f\u0440\u0435\u0434\u043e\u0442\u0432\u0440\u0430\u0442\u0438\u043b\u0430 \u0440\u0430\u0437\u043e\u0440\u0443\u0436\u0435\u043d\u0438\u0435!
 Unarmed.Ability.Lower=[[GREEN]]**\u041a\u0423\u041b\u0410\u041a\u0418 \u0412 \u041e\u0411\u042b\u0427\u041d\u041e\u041c \u0421\u041e\u0421\u0422\u041e\u042f\u041d\u0418\u0418**
 Unarmed.Ability.Ready=[[GREEN]]**\u041a\u0423\u041b\u0410\u041a\u0418 \u0412 \u0421\u041e\u0421\u0422\u041e\u042f\u041d\u0418\u0418 \u0413\u041e\u0422\u041e\u0412\u041d\u041e\u0421\u0422\u0418**
-Unarmed.Effect.0=\u0411\u0435\u0440\u0441\u0435\u0440\u043a (\u0423\u041c\u0415\u041d\u0418\u0415)
-Unarmed.Effect.1=+50% \u043a \u0423\u0440\u043e\u043d\u0443, \u0420\u0430\u0437\u0440\u0443\u0448\u0435\u043d\u0438\u0435 \u043c\u044f\u0433\u043a\u0438\u0445 \u043c\u0430\u0442\u0435\u0440\u0438\u0430\u043b\u043e\u0432
-Unarmed.Effect.2=\u0420\u0430\u0437\u043e\u0440\u0443\u0436\u0435\u043d\u0438\u0435 (\u0418\u0433\u0440\u043e\u043a\u043e\u0432)
-Unarmed.Effect.3=\u0412\u044b\u0431\u0438\u0432\u0430\u0435\u0442 \u043f\u0440\u0435\u0434\u043c\u0435\u0442 \u0438\u0437 \u0440\u0443\u043a \u0432\u0440\u0430\u0433\u0430
-Unarmed.Effect.4=\u0421\u0442\u0438\u043b\u044c \"\u0416\u0435\u043b\u0435\u0437\u043d\u044b\u0439 \u041a\u0443\u043b\u0430\u043a\"
-Unarmed.Effect.5=\u0421\u043e \u0432\u0440\u0435\u043c\u0435\u043d\u0435\u043c \u0443\u043a\u0440\u0435\u043f\u043b\u044f\u0435\u0442 \u0412\u0430\u0448\u0438 \u0440\u0443\u043a\u0438
-Unarmed.Effect.6=\u041e\u0442\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u0421\u0442\u0440\u0435\u043b
-Unarmed.Effect.7=\u041e\u0442\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u0441\u0442\u0440\u0435\u043b
-Unarmed.Effect.8=\u0416\u0435\u043b\u0435\u0437\u043d\u0430\u044f \u0425\u0432\u0430\u0442\u043a\u0430
-Unarmed.Effect.9=\u041f\u0440\u0435\u043f\u044f\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u0440\u0430\u0437\u043e\u0440\u0443\u0436\u0435\u043d\u0438\u044e \u0432\u0430\u0441 \u043f\u0440\u043e\u0442\u0438\u0432\u043d\u0438\u043a\u043e\u043c
+Unarmed.SubSkill.Berserk.Name=\u0411\u0435\u0440\u0441\u0435\u0440\u043a (\u0423\u041c\u0415\u041d\u0418\u0415)
+Unarmed.SubSkill.Berserk.Description=+50% \u043a \u0423\u0440\u043e\u043d\u0443, \u0420\u0430\u0437\u0440\u0443\u0448\u0435\u043d\u0438\u0435 \u043c\u044f\u0433\u043a\u0438\u0445 \u043c\u0430\u0442\u0435\u0440\u0438\u0430\u043b\u043e\u0432
+Unarmed.SubSkill.Disarm.Name=\u0420\u0430\u0437\u043e\u0440\u0443\u0436\u0435\u043d\u0438\u0435 (\u0418\u0433\u0440\u043e\u043a\u043e\u0432)
+Unarmed.SubSkill.Disarm.Description=\u0412\u044b\u0431\u0438\u0432\u0430\u0435\u0442 \u043f\u0440\u0435\u0434\u043c\u0435\u0442 \u0438\u0437 \u0440\u0443\u043a \u0432\u0440\u0430\u0433\u0430
+Unarmed.SubSkill.IronArmStyle.Name=\u0421\u0442\u0438\u043b\u044c \"\u0416\u0435\u043b\u0435\u0437\u043d\u044b\u0439 \u041a\u0443\u043b\u0430\u043a\"
+Unarmed.SubSkill.IronArmStyle.Description=\u0421\u043e \u0432\u0440\u0435\u043c\u0435\u043d\u0435\u043c \u0443\u043a\u0440\u0435\u043f\u043b\u044f\u0435\u0442 \u0412\u0430\u0448\u0438 \u0440\u0443\u043a\u0438
+Unarmed.SubSkill.ArrowDeflect.Name=\u041e\u0442\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u0421\u0442\u0440\u0435\u043b
+Unarmed.SubSkill.ArrowDeflect.Description=\u041e\u0442\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u0441\u0442\u0440\u0435\u043b
+Unarmed.SubSkill.IronGrip.Name=\u0416\u0435\u043b\u0435\u0437\u043d\u0430\u044f \u0425\u0432\u0430\u0442\u043a\u0430
+Unarmed.SubSkill.IronGrip.Description=\u041f\u0440\u0435\u043f\u044f\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u0440\u0430\u0437\u043e\u0440\u0443\u0436\u0435\u043d\u0438\u044e \u0432\u0430\u0441 \u043f\u0440\u043e\u0442\u0438\u0432\u043d\u0438\u043a\u043e\u043c
 Unarmed.Listener=\u0411\u0435\u0437\u043e\u0440\u0443\u0436\u043d\u044b\u0439:
 Unarmed.SkillName=\u0411\u0415\u0417\u041e\u0420\u0423\u0416\u041d\u042b\u0419
 Unarmed.Skills.Berserk.Off=[[RED]]**\u0423\u043c\u0435\u043d\u0438\u0435 \"\u0411\u0435\u0440\u0441\u0435\u0440\u043a\" \u043f\u0440\u0435\u043a\u0440\u0430\u0442\u0438\u043b\u043e \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435**
@@ -327,12 +327,12 @@ Woodcutting.Ability.1=\u0421\u0434\u0443\u0432\u0430\u0439\u0442\u0435 \u043b\u0
 Woodcutting.Ability.Chance.DDrop=[[RED]]\u0428\u0430\u043d\u0441 \u0414\u0432\u043e\u0439\u043d\u043e\u0433\u043e \u0414\u0440\u043e\u043f\u0430: [[YELLOW]]{0}
 Woodcutting.Ability.Length=[[RED]]\u041f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c \u0443\u043c\u0435\u043d\u0438\u044f \"\u041b\u0435\u0441\u043e\u0440\u0443\u0431\": [[YELLOW]]{0}\u0441.
 Woodcutting.Ability.Locked.0=\u0417\u0410\u0411\u041b\u041e\u041a\u0418\u0420\u041e\u0412\u0410\u041d\u041e \u0414\u041e \u0414\u041e\u0421\u0422\u0418\u0416\u0415\u041d\u0418\u042f {0}+ \u0423\u0420\u041e\u0412\u041d\u042f \u041d\u0410\u0412\u042b\u041a\u0410 (\u0421\u0414\u0423\u0412\u0410\u0422\u0415\u041b\u042c \u041b\u0418\u0421\u0422\u042c\u0415\u0412)
-Woodcutting.Effect.0=\u041b\u0435\u0441\u043e\u0440\u0443\u0431 (\u0423\u041c\u0415\u041d\u0418\u0415)
-Woodcutting.Effect.1=\u0412\u0437\u0440\u044b\u0432\u0430\u0435\u0442 \u0434\u0435\u0440\u0435\u0432\u044c\u044f
-Woodcutting.Effect.2=\u0421\u0434\u0443\u0432\u0430\u0442\u0435\u043b\u044c \u041b\u0438\u0441\u0442\u044c\u0435\u0432
-Woodcutting.Effect.3=\u0421\u0434\u0443\u0432\u0430\u0442\u044c \u043b\u0438\u0441\u0442\u044c\u044f
-Woodcutting.Effect.4=\u0414\u0432\u043e\u0439\u043d\u043e\u0439 \u0414\u0440\u043e\u043f
-Woodcutting.Effect.5=\u0423\u0434\u0432\u0430\u0438\u0432\u0430\u0435\u0442 \u043a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u0432\u044b\u043f\u0430\u0434\u0430\u044e\u0449\u0438\u0445 \u043f\u0440\u0435\u0434\u043c\u0435\u0442\u043e\u0432.
+Woodcutting.SubSkill.TreeFeller.Name=\u041b\u0435\u0441\u043e\u0440\u0443\u0431 (\u0423\u041c\u0415\u041d\u0418\u0415)
+Woodcutting.SubSkill.TreeFeller.Description=\u0412\u0437\u0440\u044b\u0432\u0430\u0435\u0442 \u0434\u0435\u0440\u0435\u0432\u044c\u044f
+Woodcutting.SubSkill.LeafBlower.Name=\u0421\u0434\u0443\u0432\u0430\u0442\u0435\u043b\u044c \u041b\u0438\u0441\u0442\u044c\u0435\u0432
+Woodcutting.SubSkill.LeafBlower.Description=\u0421\u0434\u0443\u0432\u0430\u0442\u044c \u043b\u0438\u0441\u0442\u044c\u044f
+Woodcutting.SubSkill.HarvestLumber.Name=\u0414\u0432\u043e\u0439\u043d\u043e\u0439 \u0414\u0440\u043e\u043f
+Woodcutting.SubSkill.HarvestLumber.Description=\u0423\u0434\u0432\u0430\u0438\u0432\u0430\u0435\u0442 \u043a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u0432\u044b\u043f\u0430\u0434\u0430\u044e\u0449\u0438\u0445 \u043f\u0440\u0435\u0434\u043c\u0435\u0442\u043e\u0432.
 Woodcutting.Listener=\u041b\u0435\u0441\u043e\u0440\u0443\u0431\u0441\u0442\u0432\u043e:
 Woodcutting.SkillName=\u041b\u0415\u0421\u041e\u0420\u0423\u0411\u0421\u0422\u0412\u041e
 Woodcutting.Skills.TreeFeller.Off=[RED]]**\u0423\u043c\u0435\u043d\u0438\u0435 \"\u041b\u0435\u0441\u043e\u0440\u0443\u0431\" \u043f\u0440\u0435\u043a\u0440\u0430\u0442\u0438\u043b\u043e \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435**

src/main/resources/locale/locale_sv.properties

@@ -2,10 +2,10 @@ Acrobatics.Combat.Proc=[[GREEN]]**Duckade**
 Acrobatics.Listener=Akrobatik:
 Acrobatics.SkillName=AKROBATIK
 Acrobatics.Skillup=[[YELLOW]]Akrobatikf\u00e4rdigheten \u00f6kade med {0}. Totalt ({1})
-Archery.Effect.0=D\u00f6dsskott
-Archery.Effect.1=\u00d6kad skada med b\u00e5gar
-Archery.Effect.2=F\u00f6rvirra (Players)
-Archery.Effect.5=Chans f\u00f6r att \u00e5terta pilar fr\u00e5n kroppar
+Archery.SubSkill.SkillShot.Name=D\u00f6dsskott
+Archery.SubSkill.SkillShot.Description=\u00d6kad skada med b\u00e5gar
+Archery.SubSkill.Daze.Name=F\u00f6rvirra (Players)
+Archery.SubSkill.ArrowRetrieval.Description=Chans f\u00f6r att \u00e5terta pilar fr\u00e5n kroppar
 Archery.Listener=B\u00e5gskytte:
 Archery.Skillup=[[YELLOW]]Pilskyttef\u00e4rdigheten \u00f6kade med {0}. Totalt ({1})
 Axes.Ability.Bonus.0=Yxm\u00e4stare
@@ -13,8 +13,8 @@ Axes.Ability.Lower=[[GRAY]]**DU S\u00c4NKER FIN YXA**
 Axes.Combat.CritStruck=[[DARK_RED]]Du var KRITISKT skadad
 Axes.Combat.GI.Struck=[[RED]]**SLAGEN AV ST\u00d6RRE EFFEKT**
 Axes.Combat.SS.Length=[[RED]]Skallsplittrare l\u00e4ngd [[YELLOW]]{0}s
-Axes.Effect.3=Dubbel Skada
-Axes.Effect.5=L\u00e4gger till bonus skada
+Axes.SubSkill.CriticalStrikes.Description=Dubbel Skada
+Axes.SubSkill.AxeMastery.Description=L\u00e4gger till bonus skada
 Axes.SkillName=YXOR
 Axes.Skills.SS.On=[[GREEN]]**Skallsplittrare AKTIVERAD**
 Axes.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]Skallsplittrar [[GREEN]]f\u00f6rm\u00e5gan \u00e4r vederkvickad!
@@ -43,15 +43,15 @@ Mining.Blast.Radius.Increase=[[RED]]\u00d6KNING AV SPR\u00c4NGNINGSRADIEN: [[YEL
 Mining.Blast.Rank=[[RED]]Explosions Gruvdrift: [[YELLOW]] Grad {0}/8 [[GRAY]]({1})
 Mining.Blast.Other.On=[[GREEN]]{0}[[DARK_GREEN]] har anv\u00e4nt [[RED]]Explosions Gruvdrift
 Mining.Blast.Refresh=[[GREEN]]Din [[YELLOW]]Explosionshacknings [[GREEN]]f\u00f6rm\u00e5ga har vederkvickas!
-Repair.Effect.0=Reparera
-Repair.Effect.2=Reparationsm\u00e4stare
-Repair.Effect.3=\u00d6kad reparationsm\u00e4ngd
-Repair.Effect.4=Super reparation
-Repair.Effect.5=Dubbel effektivitet
-Repair.Effect.6=Diamant Reparation ({0}+ SKILL)
-Repair.Effect.7=Reparera Diamant-verktyg och rustning
-Repair.Effect.8=Magisk smide
-Repair.Effect.9=Reparera magiska objekt
+Repair.SubSkill.Repair.Name=Reparera
+Repair.SubSkill.RepairMastery.Name=Reparationsm\u00e4stare
+Repair.SubSkill.RepairMastery.Description=\u00d6kad reparationsm\u00e4ngd
+Repair.SubSkill.SuperRepair.Name=Super reparation
+Repair.SubSkill.SuperRepair.Description=Dubbel effektivitet
+Repair.SubSkill.DiamondRepair.Name=Diamant Reparation ({0}+ SKILL)
+Repair.SubSkill.DiamondRepair.Description=Reparera Diamant-verktyg och rustning
+Repair.SubSkill.ArcaneForging.Name=Magisk smide
+Repair.SubSkill.ArcaneForging.Description=Reparera magiska objekt
 Repair.Listener=Reparera
 Repair.SkillName=Reparera
 Repair.Skills.AdeptDiamond=[[DARK_RED]]Du \u00e4r inte skicklig nog f\u00f6r att reparera Diamant.
@@ -69,7 +69,7 @@ Swords.Combat.Bleeding=[[GREEN]]**FIENDEN BL\u00d6DER**
 Swords.Combat.Counter.Hit=[[DARK_RED]]Tr\u00e4ff med en motattack
 Swords.Combat.Countered=[[GREEN]]**MOTATTACK**
 Swords.Combat.SS.Struck=[[DARK_RED]]Tr\u00e4ffad av S\u00c5GTANDAT SLAG:
-Swords.Effect.2=Bl\u00f6dande slag
+Swords.SubSkill.SerratedStrikes.Name=Bl\u00f6dande slag
 Swords.Effect.4=S\u00e5gtandat slag bl\u00f6dning+
 Swords.Listener=Sv\u00e4rd:
 Swords.SkillName=SV\u00c4RD
@@ -78,14 +78,14 @@ Swords.Skills.SS.Refresh=[[GREEN]]Dina [[YELLOW]]Bl\u00f6dande slag [[GREEN]]har
 Swords.Skills.SS.Other.Off=[[RED]]S\u00e5gtandat slag[[GREEN]] hat avklingat h\u00e4r f\u00f6r [[YELLOW]]{0}
 Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] har anv\u00e4nt [[RED]]S\u00e5gtandat slag!
 Taming.Ability.Bonus.2=Tjock P\u00e4ls
-Taming.Effect.10=Shocks\u00e4ker
-Taming.Effect.11=Explotionsskademinskning
-Taming.Effect.12=Det vildas rop
-Taming.Effect.13=Frammana ett djur till din sida
-Taming.Effect.14=[[GRAY]]COTW (Ocelot): Huka och v\u00e4nster-klicka med {0} Fisk i handen
+Taming.SubSkill.ShockProof.Name=Shocks\u00e4ker
+Taming.SubSkill.ShockProof.Description=Explotionsskademinskning
+Taming.SubSkill.CallOfTheWild.Name=Det vildas rop
+Taming.SubSkill.CallOfTheWild.Description=Frammana ett djur till din sida
+Taming.SubSkill.CallOfTheWild.Description.2=[[GRAY]]COTW (Ocelot): Huka och v\u00e4nster-klicka med {0} Fisk i handen
 Taming.Effect.15=[[GRAY]]COTW (Wolf): Huka och v\u00e4sterklicka med {0} ett ben i handen
-Taming.Effect.16=Snabbmattj\u00e4nst.
-Taming.Effect.17=Chans f\u00f6r vargar att l\u00e4ka vid attak
+Taming.SubSkill.FastFoodService.Name=Snabbmattj\u00e4nst.
+Taming.SubSkill.FastFoodService.Description=Chans f\u00f6r vargar att l\u00e4ka vid attak
 Taming.Listener.Wolf=[[DARK_GRAY]]din varg rusar tillbaka till dig...
 Taming.Listener=T\u00e4mja:
 Taming.Skillup=[[YELLOW]]T\u00e4mjningsf\u00e4rdigheten \u00f6kade med {0}. Totalt ({1})

src/main/resources/locale/locale_th_TH.properties

@@ -1,12 +1,12 @@
 Acrobatics.Ability.Proc=[[GREEN]]**\u0e43\u0e0a\u0e49\u0e17\u0e31\u0e01\u0e29\u0e30 Graceful Landing**
 Acrobatics.Combat.Proc=[[GREEN]]**Dodged**
 Acrobatics.DodgeChance=[[RED]]Dodge \u0e42\u0e2d\u0e01\u0e32\u0e2a: [[YELLOW]]{0}
-Acrobatics.Effect.0=Roll
-Acrobatics.Effect.1=\u0e25\u0e14\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22\u0e40\u0e21\u0e37\u0e48\u0e2d\u0e15\u0e01\u0e08\u0e32\u0e01\u0e17\u0e35\u0e48\u0e2a\u0e39\u0e07
-Acrobatics.Effect.2=Graceful Roll
-Acrobatics.Effect.3=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e1b\u0e23\u0e30\u0e2a\u0e34\u0e17\u0e18\u0e34\u0e20\u0e32\u0e1e\u0e2a\u0e2d\u0e07\u0e40\u0e17\u0e48\u0e32
-Acrobatics.Effect.4=Dodge
-Acrobatics.Effect.5=\u0e25\u0e14\u0e01\u0e32\u0e23\u0e44\u0e14\u0e49\u0e23\u0e31\u0e1a\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22\u0e04\u0e23\u0e36\u0e48\u0e07\u0e2b\u0e19\u0e36\u0e48\u0e07
+Acrobatics.SubSkill.Roll.Name=Roll
+Acrobatics.SubSkill.Roll.Description=\u0e25\u0e14\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22\u0e40\u0e21\u0e37\u0e48\u0e2d\u0e15\u0e01\u0e08\u0e32\u0e01\u0e17\u0e35\u0e48\u0e2a\u0e39\u0e07
+Acrobatics.SubSkill.GracefulRoll.Name=Graceful Roll
+Acrobatics.SubSkill.GracefulRoll.Description=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e1b\u0e23\u0e30\u0e2a\u0e34\u0e17\u0e18\u0e34\u0e20\u0e32\u0e1e\u0e2a\u0e2d\u0e07\u0e40\u0e17\u0e48\u0e32
+Acrobatics.SubSkill.Dodge.Name=Dodge
+Acrobatics.SubSkill.Dodge.Description=\u0e25\u0e14\u0e01\u0e32\u0e23\u0e44\u0e14\u0e49\u0e23\u0e31\u0e1a\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22\u0e04\u0e23\u0e36\u0e48\u0e07\u0e2b\u0e19\u0e36\u0e48\u0e07
 Acrobatics.Listener=\u0e17\u0e31\u0e01\u0e29\u0e30 Acrobatics:
 Acrobatics.Roll.Chance=[[RED]]Roll \u0e42\u0e2d\u0e01\u0e32\u0e2a: [[YELLOW]]{0}
 Acrobatics.Roll.GraceChance=[[RED]]Graceful Roll \u0e42\u0e2d\u0e01\u0e32\u0e2a: [[YELLOW]]{0}
@@ -16,12 +16,12 @@ Acrobatics.Skillup=[[YELLOW]]\u0e17\u0e31\u0e01\u0e29\u0e30 Acrobatics \u0e40\u0
 Archery.Combat.DazeChance=[[RED]]Daze \u0e42\u0e2d\u0e01\u0e32\u0e2a: [[YELLOW]]{0}
 Archery.Combat.RetrieveChance=[[RED]]Retrieve Arrows \u0e42\u0e2d\u0e01\u0e32\u0e2a: [[YELLOW]]{0}
 Archery.Combat.SkillshotBonus=[[RED]]\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22\u0e14\u0e49\u0e27\u0e22\u0e18\u0e19\u0e39: [[YELLOW]]{0}
-Archery.Effect.0=Skill Shot
-Archery.Effect.1=\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22\u0e14\u0e49\u0e27\u0e22\u0e18\u0e19\u0e39\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e02\u0e36\u0e49\u0e19
-Archery.Effect.2=(Players) \u0e16\u0e39\u0e01\u0e17\u0e33\u0e43\u0e2b\u0e49\u0e21\u0e36\u0e19\u0e07\u0e07
-Archery.Effect.3=Disorients \u0e28\u0e31\u0e15\u0e23\u0e39\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22 {0}
-Archery.Effect.4=Arrow Retrieval
-Archery.Effect.5=\u0e21\u0e35\u0e42\u0e2d\u0e01\u0e32\u0e2a\u0e44\u0e14\u0e49\u0e23\u0e31\u0e1a\u0e18\u0e19\u0e39\u0e04\u0e37\u0e19\u0e2b\u0e25\u0e31\u0e07\u0e01\u0e32\u0e23\u0e2a\u0e31\u0e07\u0e2b\u0e32\u0e23
+Archery.SubSkill.SkillShot.Name=Skill Shot
+Archery.SubSkill.SkillShot.Description=\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22\u0e14\u0e49\u0e27\u0e22\u0e18\u0e19\u0e39\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e02\u0e36\u0e49\u0e19
+Archery.SubSkill.Daze.Name=(Players) \u0e16\u0e39\u0e01\u0e17\u0e33\u0e43\u0e2b\u0e49\u0e21\u0e36\u0e19\u0e07\u0e07
+Archery.SubSkill.Daze.Description=Disorients \u0e28\u0e31\u0e15\u0e23\u0e39\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22 {0}
+Archery.SubSkill.ArrowRetrieval.Name=Arrow Retrieval
+Archery.SubSkill.ArrowRetrieval.Description=\u0e21\u0e35\u0e42\u0e2d\u0e01\u0e32\u0e2a\u0e44\u0e14\u0e49\u0e23\u0e31\u0e1a\u0e18\u0e19\u0e39\u0e04\u0e37\u0e19\u0e2b\u0e25\u0e31\u0e07\u0e01\u0e32\u0e23\u0e2a\u0e31\u0e07\u0e2b\u0e32\u0e23
 Archery.Listener=\u0e17\u0e31\u0e01\u0e29\u0e30 Archery:
 Archery.SkillName=ARCHERY
 Archery.Skillup=[[YELLOW]]\u0e17\u0e31\u0e01\u0e29\u0e30 Archery \u0e40\u0e1e\u0e34\u0e48\u0e21\u0e02\u0e36\u0e49\u0e19{0}. \u0e21\u0e35\u0e17\u0e31\u0e49\u0e07\u0e2b\u0e21\u0e14 ({1})
@@ -39,16 +39,16 @@ Axes.Combat.CriticalHit=[[RED]]\u0e42\u0e08\u0e21\u0e15\u0e35 CRITICAL!
 Axes.Combat.GI.Proc=[[GREEN]]**\u0e17\u0e33\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22\u0e14\u0e49\u0e27\u0e22 GREAT FORCE**
 Axes.Combat.GI.Struck=[[RED]]**\u0e42\u0e08\u0e21\u0e15\u0e35\u0e14\u0e49\u0e27\u0e22 GREATER IMPACT**
 Axes.Combat.SS.Length=[[RED]]Skull Splitter \u0e21\u0e35\u0e23\u0e30\u0e22\u0e30\u0e40\u0e27\u0e25\u0e32: [[YELLOW]]{0}\u0e27\u0e34\u0e19\u0e32\u0e17\u0e35
-Axes.Effect.0=Skull Splitter
-Axes.Effect.1=\u0e17\u0e33\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22\u0e27\u0e07\u0e01\u0e27\u0e49\u0e32\u0e07
-Axes.Effect.2=Critical Strikes
-Axes.Effect.3=\u0e01\u0e32\u0e23\u0e42\u0e08\u0e21\u0e15\u0e35\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e02\u0e36\u0e49\u0e19
-Axes.Effect.4=\u0e17\u0e31\u0e01\u0e29\u0e30 Axe Mastery
-Axes.Effect.5=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e42\u0e1a\u0e19\u0e31\u0e2a\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22
-Axes.Effect.6=Armor Impact
-Axes.Effect.7=\u0e42\u0e08\u0e21\u0e15\u0e35\u0e40\u0e02\u0e49\u0e32\u0e40\u0e2a\u0e37\u0e49\u0e2d\u0e40\u0e01\u0e23\u0e32\u0e30\u0e17\u0e33\u0e43\u0e2b\u0e49\u0e40\u0e01\u0e23\u0e32\u0e30\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22\u0e21\u0e32\u0e01
-Axes.Effect.8=Greater Impact
-Axes.Effect.9=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22\u0e43\u0e2b\u0e49\u0e01\u0e31\u0e1a\u0e17\u0e31\u0e01\u0e29\u0e30 Unarmored
+Axes.SubSkill.SkullSplitter.Name=Skull Splitter
+Axes.SubSkill.SkullSplitter.Description=\u0e17\u0e33\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22\u0e27\u0e07\u0e01\u0e27\u0e49\u0e32\u0e07
+Axes.SubSkill.CriticalStrikes.Name=Critical Strikes
+Axes.SubSkill.CriticalStrikes.Description=\u0e01\u0e32\u0e23\u0e42\u0e08\u0e21\u0e15\u0e35\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e02\u0e36\u0e49\u0e19
+Axes.SubSkill.AxeMastery.Name=\u0e17\u0e31\u0e01\u0e29\u0e30 Axe Mastery
+Axes.SubSkill.AxeMastery.Description=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e42\u0e1a\u0e19\u0e31\u0e2a\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22
+Axes.SubSkill.ArmorImpact.Name=Armor Impact
+Axes.SubSkill.ArmorImpact.Description=\u0e42\u0e08\u0e21\u0e15\u0e35\u0e40\u0e02\u0e49\u0e32\u0e40\u0e2a\u0e37\u0e49\u0e2d\u0e40\u0e01\u0e23\u0e32\u0e30\u0e17\u0e33\u0e43\u0e2b\u0e49\u0e40\u0e01\u0e23\u0e32\u0e30\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22\u0e21\u0e32\u0e01
+Axes.SubSkill.GreaterImpact.Name=Greater Impact
+Axes.SubSkill.GreaterImpact.Description=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22\u0e43\u0e2b\u0e49\u0e01\u0e31\u0e1a\u0e17\u0e31\u0e01\u0e29\u0e30 Unarmored
 Axes.Listener=\u0e17\u0e31\u0e01\u0e29\u0e30 Axes:
 Axes.SkillName=AXES
 Axes.Skills.SS.Off=[[RED]]**\u0e17\u0e31\u0e01\u0e29\u0e30 Skull Splitter \u0e2b\u0e21\u0e14\u0e2a\u0e20\u0e32\u0e1e**
@@ -59,10 +59,10 @@ Axes.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] \u0e44\u0e14\u0e49\u0e43\u0e0
 Axes.Skillup=[[YELLOW]]\u0e17\u0e31\u0e01\u0e29\u0e30 Axes \u0e40\u0e1e\u0e34\u0e48\u0e21\u0e02\u0e36\u0e49\u0e19 {0}. \u0e21\u0e35\u0e17\u0e31\u0e49\u0e07\u0e2b\u0e21\u0e14 ({1})
 Excavation.Ability.Lower=[[GRAY]]**\u0e22\u0e01\u0e40\u0e25\u0e34\u0e01\u0e01\u0e32\u0e23\u0e43\u0e0a\u0e49\u0e17\u0e31\u0e01\u0e29\u0e30\u0e02\u0e2d\u0e07 Shovel**
 Excavation.Ability.Ready=[[GREEN]]**\u0e04\u0e38\u0e13\u0e1e\u0e23\u0e49\u0e2d\u0e21\u0e17\u0e35\u0e48\u0e08\u0e30\u0e43\u0e0a\u0e49\u0e17\u0e31\u0e01\u0e29\u0e30\u0e02\u0e2d\u0e07 Shovel**
-Excavation.Effect.0=Giga Drill Breaker
-Excavation.Effect.1=\u0e2d\u0e31\u0e15\u0e23\u0e32\u0e14\u0e23\u0e2d\u0e1b 3x , EXP 3x, +\u0e04\u0e27\u0e32\u0e21\u0e40\u0e23\u0e47\u0e27
-Excavation.Effect.2=Treasure Hunter
-Excavation.Effect.3=\u0e04\u0e27\u0e32\u0e21\u0e2a\u0e32\u0e21\u0e32\u0e23\u0e16\u0e43\u0e19\u0e01\u0e32\u0e23\u0e02\u0e38\u0e14\u0e2b\u0e32\u0e2a\u0e21\u0e1a\u0e31\u0e15\u0e34
+Excavation.SubSkill.GigaDrillBreaker.Name=Giga Drill Breaker
+Excavation.SubSkill.GigaDrillBreaker.Description=\u0e2d\u0e31\u0e15\u0e23\u0e32\u0e14\u0e23\u0e2d\u0e1b 3x , EXP 3x, +\u0e04\u0e27\u0e32\u0e21\u0e40\u0e23\u0e47\u0e27
+Excavation.SubSkill.TreasureHunter.Name=Treasure Hunter
+Excavation.SubSkill.TreasureHunter.Description=\u0e04\u0e27\u0e32\u0e21\u0e2a\u0e32\u0e21\u0e32\u0e23\u0e16\u0e43\u0e19\u0e01\u0e32\u0e23\u0e02\u0e38\u0e14\u0e2b\u0e32\u0e2a\u0e21\u0e1a\u0e31\u0e15\u0e34
 Excavation.Effect.Length=[[RED]]Giga Drill Breaker \u0e21\u0e35\u0e23\u0e30\u0e22\u0e30\u0e40\u0e27\u0e25\u0e32: [[YELLOW]]{0}\u0e27\u0e34\u0e19\u0e32\u0e17\u0e35
 Excavation.Listener=\u0e17\u0e31\u0e01\u0e29\u0e30 Excavation:
 Excavation.SkillName=EXCAVATION
@@ -81,18 +81,18 @@ Fishing.Ability.TH.MagicRate=[[RED]]Magic Hunter \u0e42\u0e2d\u0e01\u0e32\u0e2a:
 Fishing.Ability.Shake=[[RED]]Shake \u0e42\u0e2d\u0e01\u0e32\u0e2a: [[YELLOW]]{0}
 Fishing.Ability.IceFishing=[[RED]]Ice Fishing: \u0e2a\u0e32\u0e21\u0e32\u0e23\u0e16\u0e15\u0e01\u0e1b\u0e25\u0e32\u0e43\u0e19\u0e19\u0e49\u0e33\u0e41\u0e02\u0e47\u0e07\u0e44\u0e14\u0e49
 Fishing.Ability.FD=[[RED]]Fisherman\'\'s Diet \u0e23\u0e30\u0e14\u0e31\u0e1a: [[YELLOW]]{0}
-Fishing.Effect.0=Treasure Hunter (Passive)
-Fishing.Effect.1=\u0e44\u0e14\u0e49\u0e23\u0e31\u0e1a\u0e27\u0e31\u0e15\u0e16\u0e38\u0e08\u0e32\u0e01\u0e01\u0e32\u0e23\u0e15\u0e01\u0e1b\u0e25\u0e32
-Fishing.Effect.2=Magic Hunter
-Fishing.Effect.3=\u0e04\u0e49\u0e19\u0e2b\u0e32\u0e2a\u0e34\u0e48\u0e07\u0e02\u0e2d\u0e07 enchanted
-Fishing.Effect.4=Shake (vs. Entities)
-Fishing.Effect.5=\u0e40\u0e02\u0e22\u0e48\u0e32\u0e40\u0e2d\u0e32\u0e2a\u0e34\u0e48\u0e07\u0e02\u0e2d\u0e07\u0e08\u0e32\u0e01 monster w/ \u0e14\u0e49\u0e27\u0e22\u0e04\u0e31\u0e19\u0e40\u0e1a\u0e47\u0e14
-Fishing.Effect.6=Fisherman\'s Diet
-Fishing.Effect.7=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e04\u0e27\u0e32\u0e21\u0e2d\u0e34\u0e48\u0e21\u0e08\u0e32\u0e01\u0e01\u0e32\u0e23\u0e01\u0e34\u0e19\u0e1b\u0e25\u0e32
-Fishing.Effect.8=Master Angler
-Fishing.Effect.9=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e42\u0e2d\u0e01\u0e32\u0e2a\u0e44\u0e14\u0e49\u0e23\u0e31\u0e1a\u0e1b\u0e25\u0e32\u0e21\u0e32\u0e01\u0e02\u0e36\u0e49\u0e19\u0e08\u0e32\u0e01\u0e01\u0e32\u0e23\u0e15\u0e01\u0e1b\u0e25\u0e32
-Fishing.Effect.10=Ice Fishing
-Fishing.Effect.11=\u0e2d\u0e19\u0e38\u0e0d\u0e32\u0e15\u0e34\u0e43\u0e2b\u0e49\u0e15\u0e01\u0e1b\u0e25\u0e32\u0e43\u0e19\u0e19\u0e49\u0e33\u0e41\u0e02\u0e47\u0e07
+Fishing.SubSkill.TreasureHunter.Name=Treasure Hunter (Passive)
+Fishing.SubSkill.TreasureHunter.Description=\u0e44\u0e14\u0e49\u0e23\u0e31\u0e1a\u0e27\u0e31\u0e15\u0e16\u0e38\u0e08\u0e32\u0e01\u0e01\u0e32\u0e23\u0e15\u0e01\u0e1b\u0e25\u0e32
+Fishing.SubSkill.MagicHunter.Name=Magic Hunter
+Fishing.SubSkill.MagicHunter.Description=\u0e04\u0e49\u0e19\u0e2b\u0e32\u0e2a\u0e34\u0e48\u0e07\u0e02\u0e2d\u0e07 enchanted
+Fishing.SubSkill.Shake.Name=Shake (vs. Entities)
+Fishing.SubSkill.Shake.Description=\u0e40\u0e02\u0e22\u0e48\u0e32\u0e40\u0e2d\u0e32\u0e2a\u0e34\u0e48\u0e07\u0e02\u0e2d\u0e07\u0e08\u0e32\u0e01 monster w/ \u0e14\u0e49\u0e27\u0e22\u0e04\u0e31\u0e19\u0e40\u0e1a\u0e47\u0e14
+Fishing.SubSkill.FishermansDiet.Name=Fisherman\'s Diet
+Fishing.SubSkill.FishermansDiet.Description=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e04\u0e27\u0e32\u0e21\u0e2d\u0e34\u0e48\u0e21\u0e08\u0e32\u0e01\u0e01\u0e32\u0e23\u0e01\u0e34\u0e19\u0e1b\u0e25\u0e32
+Fishing.SubSkill.MasterAngler.Name=Master Angler
+Fishing.SubSkill.MasterAngler.Description=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e42\u0e2d\u0e01\u0e32\u0e2a\u0e44\u0e14\u0e49\u0e23\u0e31\u0e1a\u0e1b\u0e25\u0e32\u0e21\u0e32\u0e01\u0e02\u0e36\u0e49\u0e19\u0e08\u0e32\u0e01\u0e01\u0e32\u0e23\u0e15\u0e01\u0e1b\u0e25\u0e32
+Fishing.SubSkill.IceFishing.Name=Ice Fishing
+Fishing.SubSkill.IceFishing.Description=\u0e2d\u0e19\u0e38\u0e0d\u0e32\u0e15\u0e34\u0e43\u0e2b\u0e49\u0e15\u0e01\u0e1b\u0e25\u0e32\u0e43\u0e19\u0e19\u0e49\u0e33\u0e41\u0e02\u0e47\u0e07
 Fishing.Chance.Raining=[[BLUE]] Rain Bonus
 Fishing.Listener=\u0e17\u0e31\u0e01\u0e29\u0e30 Fishing:
 Fishing.Ability.TH.MagicFound=[[GRAY]]\u0e04\u0e38\u0e13\u0e23\u0e39\u0e49\u0e2a\u0e36\u0e01\u0e44\u0e14\u0e49\u0e16\u0e36\u0e07\u0e2a\u0e31\u0e21\u0e1c\u0e31\u0e2a\u0e02\u0e2d\u0e07\u0e40\u0e27\u0e17\u0e21\u0e19\u0e15\u0e23\u0e4c\u0e14\u0e49\u0e27\u0e22\u0e01\u0e32\u0e23\u0e08\u0e31\u0e1a\u0e2a\u0e34\u0e48\u0e07\u0e19\u0e35\u0e49 ...
@@ -111,19 +111,19 @@ Herbalism.Ability.Lower=[[GRAY]]**\u0e22\u0e01\u0e40\u0e25\u0e34\u0e01\u0e01\u0e
 Herbalism.Ability.Ready=[[GREEN]]**\u0e04\u0e38\u0e13\u0e1e\u0e23\u0e49\u0e2d\u0e21\u0e17\u0e35\u0e48\u0e08\u0e30\u0e43\u0e0a\u0e49\u0e17\u0e31\u0e01\u0e29\u0e30\u0e02\u0e2d\u0e07 Hoe**
 Herbalism.Ability.ShroomThumb.Chance=[[RED]]Shroom Thumb \u0e42\u0e2d\u0e01\u0e32\u0e2a: [[YELLOW]]{0}
 Herbalism.Ability.ShroomThumb.Fail=[[RED]]**SHROOM THUMB \u0e25\u0e49\u0e21\u0e40\u0e2b\u0e25\u0e27**
-Herbalism.Effect.0=Green Terra
-Herbalism.Effect.1=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e2d\u0e31\u0e15\u0e23\u0e32\u0e01\u0e32\u0e23\u0e14\u0e23\u0e2d\u0e1b x3
-Herbalism.Effect.2=Green Thumb (\u0e02\u0e49\u0e32\u0e27\u0e40\u0e17\u0e48\u0e32\u0e19\u0e31\u0e49\u0e19)
-Herbalism.Effect.3=\u0e1e\u0e37\u0e0a\u0e42\u0e15\u0e2d\u0e31\u0e15\u0e42\u0e19\u0e21\u0e31\u0e15\u0e34\u0e40\u0e21\u0e37\u0e48\u0e2d\u0e40\u0e01\u0e47\u0e1a\u0e40\u0e01\u0e35\u0e48\u0e22\u0e27
-Herbalism.Effect.5=\u0e17\u0e33\u0e2d\u0e34\u0e10\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e23\u0e37\u0e2d\u0e17\u0e33\u0e43\u0e2b\u0e49\u0e2b\u0e0d\u0e49\u0e32\u0e40\u0e15\u0e34\u0e1a\u0e42\u0e15
-Herbalism.Effect.6=Farmer\'s Diet
-Herbalism.Effect.7=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e04\u0e27\u0e32\u0e21\u0e2d\u0e34\u0e48\u0e21\u0e08\u0e32\u0e01\u0e01\u0e32\u0e23\u0e01\u0e34\u0e19\u0e2d\u0e32\u0e2b\u0e32\u0e23
-Herbalism.Effect.8=Drops x2 (\u0e2a\u0e21\u0e38\u0e19\u0e44\u0e1e\u0e23\u0e17\u0e31\u0e49\u0e07\u0e2b\u0e21\u0e14)
-Herbalism.Effect.9=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e2d\u0e31\u0e04\u0e23\u0e32\u0e01\u0e32\u0e23 Drops
-Herbalism.Effect.10=Hylian Luck
-Herbalism.Effect.11=\u0e43\u0e2b\u0e49\u0e21\u0e35\u0e42\u0e2d\u0e01\u0e32\u0e2a\u0e40\u0e25\u0e47\u0e01\u0e19\u0e49\u0e2d\u0e22\u0e43\u0e19\u0e01\u0e32\u0e23\u0e2b\u0e32\u0e2a\u0e34\u0e48\u0e07\u0e02\u0e2d\u0e07\u0e17\u0e35\u0e48\u0e2b\u0e32\u0e22\u0e32\u0e01
-Herbalism.Effect.12=Shroom Thumb
-Herbalism.Effect.13=\u0e01\u0e23\u0e30\u0e08\u0e32\u0e22\u0e40\u0e2a\u0e49\u0e19\u0e43\u0e22\u0e14\u0e34\u0e19\u0e41\u0e25\u0e30\u0e2b\u0e0d\u0e49\u0e32
+Herbalism.SubSkill.GreenTerra.Name=Green Terra
+Herbalism.SubSkill.GreenTerra.Description=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e2d\u0e31\u0e15\u0e23\u0e32\u0e01\u0e32\u0e23\u0e14\u0e23\u0e2d\u0e1b x3
+Herbalism.SubSkill.GreenThumb.Name=Green Thumb (\u0e02\u0e49\u0e32\u0e27\u0e40\u0e17\u0e48\u0e32\u0e19\u0e31\u0e49\u0e19)
+Herbalism.SubSkill.GreenThumb.Description=\u0e1e\u0e37\u0e0a\u0e42\u0e15\u0e2d\u0e31\u0e15\u0e42\u0e19\u0e21\u0e31\u0e15\u0e34\u0e40\u0e21\u0e37\u0e48\u0e2d\u0e40\u0e01\u0e47\u0e1a\u0e40\u0e01\u0e35\u0e48\u0e22\u0e27
+Herbalism.SubSkill.GreenThumb.Description.2=\u0e17\u0e33\u0e2d\u0e34\u0e10\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e23\u0e37\u0e2d\u0e17\u0e33\u0e43\u0e2b\u0e49\u0e2b\u0e0d\u0e49\u0e32\u0e40\u0e15\u0e34\u0e1a\u0e42\u0e15
+Herbalism.SubSkill.FarmersDiet.Name=Farmer\'s Diet
+Herbalism.SubSkill.FarmersDiet.Description=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e04\u0e27\u0e32\u0e21\u0e2d\u0e34\u0e48\u0e21\u0e08\u0e32\u0e01\u0e01\u0e32\u0e23\u0e01\u0e34\u0e19\u0e2d\u0e32\u0e2b\u0e32\u0e23
+Herbalism.SubSkill.DoubleDrops.Name=Drops x2 (\u0e2a\u0e21\u0e38\u0e19\u0e44\u0e1e\u0e23\u0e17\u0e31\u0e49\u0e07\u0e2b\u0e21\u0e14)
+Herbalism.SubSkill.DoubleDrops.Description=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e2d\u0e31\u0e04\u0e23\u0e32\u0e01\u0e32\u0e23 Drops
+Herbalism.SubSkill.HylianLuck.Name=Hylian Luck
+Herbalism.SubSkill.HylianLuck.Description=\u0e43\u0e2b\u0e49\u0e21\u0e35\u0e42\u0e2d\u0e01\u0e32\u0e2a\u0e40\u0e25\u0e47\u0e01\u0e19\u0e49\u0e2d\u0e22\u0e43\u0e19\u0e01\u0e32\u0e23\u0e2b\u0e32\u0e2a\u0e34\u0e48\u0e07\u0e02\u0e2d\u0e07\u0e17\u0e35\u0e48\u0e2b\u0e32\u0e22\u0e32\u0e01
+Herbalism.SubSkill.ShroomThumb.Name=Shroom Thumb
+Herbalism.SubSkill.ShroomThumb.Description=\u0e01\u0e23\u0e30\u0e08\u0e32\u0e22\u0e40\u0e2a\u0e49\u0e19\u0e43\u0e22\u0e14\u0e34\u0e19\u0e41\u0e25\u0e30\u0e2b\u0e0d\u0e49\u0e32
 Herbalism.HylianLuck=[[GREEN]]\u0e04\u0e38\u0e13\u0e21\u0e35\u0e42\u0e0a\u0e04\u0e43\u0e19\u0e27\u0e31\u0e19\u0e19\u0e35\u0e49!
 Herbalism.Listener=\u0e17\u0e31\u0e01\u0e29\u0e30 Herbalism:
 Herbalism.SkillName=HERBALISM
@@ -138,16 +138,16 @@ Mining.Ability.Locked.1=\u0e2a\u0e32\u0e21\u0e32\u0e23\u0e16\u0e1b\u0e25\u0e14\u
 Mining.Ability.Locked.2=\u0e2a\u0e32\u0e21\u0e32\u0e23\u0e16\u0e1b\u0e25\u0e14\u0e25\u0e47\u0e2d\u0e01\u0e44\u0e14\u0e49\u0e40\u0e21\u0e37\u0e48\u0e2d\u0e23\u0e30\u0e14\u0e31\u0e1a {0}+ (DEMOLITIONS EXPERTISE)
 Mining.Ability.Lower=[[GRAY]]**\u0e22\u0e01\u0e40\u0e25\u0e34\u0e01\u0e01\u0e32\u0e23\u0e43\u0e0a\u0e49\u0e17\u0e31\u0e01\u0e29\u0e30\u0e02\u0e2d\u0e07 Pickaxe**
 Mining.Ability.Ready=[[GREEN]]**\u0e04\u0e38\u0e13\u0e1e\u0e23\u0e49\u0e2d\u0e21\u0e17\u0e35\u0e48\u0e08\u0e30\u0e43\u0e0a\u0e49\u0e17\u0e31\u0e01\u0e29\u0e30\u0e02\u0e2d\u0e07 Pickaxe**
-Mining.Effect.0=Super Breaker
-Mining.Effect.1=+\u0e04\u0e27\u0e32\u0e21\u0e40\u0e23\u0e47\u0e27, \u0e40\u0e1e\u0e34\u0e48\u0e21\u0e42\u0e2d\u0e01\u0e32\u0e2a\u0e14\u0e23\u0e2d\u0e1b x3
-Mining.Effect.2=Drops x2
-Mining.Effect.3=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e2d\u0e31\u0e04\u0e23\u0e32\u0e01\u0e32\u0e23 Drops
-Mining.Effect.4=Blast Mining
-Mining.Effect.5=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e41\u0e23\u0e48\u0e08\u0e32\u0e01\u0e01\u0e32\u0e23\u0e43\u0e0a\u0e49 TNT
-Mining.Effect.6=Bigger Bombs
-Mining.Effect.7=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e23\u0e31\u0e28\u0e21\u0e35\u0e02\u0e2d\u0e07 TNT
-Mining.Effect.8=Demolitions Expertise
-Mining.Effect.9=\u0e25\u0e14\u0e01\u0e32\u0e23\u0e44\u0e14\u0e49\u0e23\u0e31\u0e1a\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22\u0e08\u0e32\u0e01 TNT
+Mining.SubSkill.SuperBreaker.Name=Super Breaker
+Mining.SubSkill.SuperBreaker.Description=+\u0e04\u0e27\u0e32\u0e21\u0e40\u0e23\u0e47\u0e27, \u0e40\u0e1e\u0e34\u0e48\u0e21\u0e42\u0e2d\u0e01\u0e32\u0e2a\u0e14\u0e23\u0e2d\u0e1b x3
+Mining.SubSkill.DoubleDrops.Name=Drops x2
+Mining.SubSkill.DoubleDrops.Description=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e2d\u0e31\u0e04\u0e23\u0e32\u0e01\u0e32\u0e23 Drops
+Mining.SubSkill.BlastMining.Name=Blast Mining
+Mining.SubSkill.BlastMining.Description=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e41\u0e23\u0e48\u0e08\u0e32\u0e01\u0e01\u0e32\u0e23\u0e43\u0e0a\u0e49 TNT
+Mining.SubSkill.BiggerBombs.Name=Bigger Bombs
+Mining.SubSkill.BiggerBombs.Description=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e23\u0e31\u0e28\u0e21\u0e35\u0e02\u0e2d\u0e07 TNT
+Mining.SubSkill.DemolitionsExpertise.Name=Demolitions Expertise
+Mining.SubSkill.DemolitionsExpertise.Description=\u0e25\u0e14\u0e01\u0e32\u0e23\u0e44\u0e14\u0e49\u0e23\u0e31\u0e1a\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22\u0e08\u0e32\u0e01 TNT
 Mining.Effect.Decrease=[[RED]]Demolitions \u0e25\u0e14\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22: [[YELLOW]]{0}
 Mining.Effect.DropChance=[[RED]]Double Drop \u0e42\u0e2d\u0e01\u0e32\u0e2a: [[YELLOW]]{0}
 Mining.Listener=\u0e17\u0e31\u0e01\u0e29\u0e30 Mining:
@@ -164,24 +164,24 @@ Mining.Blast.Radius.Increase=[[RED]]\u0e23\u0e31\u0e28\u0e21\u0e35\u0e02\u0e2d\u
 Mining.Blast.Rank=[[RED]]\u0e17\u0e31\u0e01\u0e29\u0e30 Blast Mining: [[YELLOW]] \u0e23\u0e30\u0e14\u0e31\u0e1a {0}/8 [[GRAY]]({1})
 Mining.Blast.Other.On=[[GREEN]]{0}[[DARK_GREEN]] \u0e44\u0e14\u0e49\u0e43\u0e0a\u0e49\u0e17\u0e31\u0e01\u0e29\u0e30 [[RED]]Blast Mining!
 Mining.Blast.Refresh=[[GREEN]]\u0e04\u0e27\u0e32\u0e21\u0e2a\u0e32\u0e21\u0e32\u0e23\u0e16\u0e17\u0e31\u0e01\u0e29\u0e30 [[YELLOW]]Blast Mining [[GREEN]]\u0e04\u0e39\u0e25\u0e14\u0e32\u0e27\u0e19\u0e4c\u0e40\u0e2a\u0e23\u0e47\u0e08\u0e41\u0e25\u0e49\u0e27!
-Repair.Effect.0=\u0e0b\u0e48\u0e2d\u0e21\u0e41\u0e0b\u0e21
-Repair.Effect.1=\u0e0b\u0e48\u0e2d\u0e21\u0e41\u0e0b\u0e21\u0e2d\u0e38\u0e1b\u0e01\u0e23\u0e13\u0e4c\u0e41\u0e25\u0e30\u0e40\u0e01\u0e23\u0e32\u0e30
-Repair.Effect.10=\u0e0b\u0e48\u0e2d\u0e21\u0e2d\u0e38\u0e1b\u0e01\u0e23\u0e13\u0e4c\u0e17\u0e2d\u0e07 (\u0e17\u0e31\u0e01\u0e29\u0e30\u0e15\u0e49\u0e2d\u0e07\u0e01\u0e32\u0e23 {0}+)
-Repair.Effect.11=\u0e0b\u0e48\u0e2d\u0e21\u0e41\u0e0b\u0e21 \u0e2d\u0e38\u0e1b\u0e01\u0e23\u0e13\u0e4c\u0e17\u0e2d\u0e07\u0e41\u0e25\u0e30\u0e40\u0e01\u0e23\u0e32\u0e30
-Repair.Effect.12=\u0e0b\u0e48\u0e2d\u0e21\u0e2d\u0e38\u0e1b\u0e01\u0e23\u0e13\u0e4c\u0e40\u0e2b\u0e25\u0e47\u0e01 (\u0e17\u0e31\u0e01\u0e29\u0e30\u0e15\u0e49\u0e2d\u0e07\u0e01\u0e32\u0e23 {0}+)
-Repair.Effect.13=\u0e0b\u0e48\u0e2d\u0e21\u0e41\u0e0b\u0e21 \u0e2d\u0e38\u0e1b\u0e01\u0e23\u0e13\u0e4c\u0e40\u0e2b\u0e25\u0e47\u0e01\u0e41\u0e25\u0e30\u0e40\u0e01\u0e23\u0e32\u0e30
-Repair.Effect.14=\u0e0b\u0e48\u0e2d\u0e21\u0e2d\u0e38\u0e1b\u0e01\u0e23\u0e13\u0e4c\u0e2b\u0e34\u0e19 (\u0e17\u0e31\u0e01\u0e29\u0e30\u0e15\u0e49\u0e2d\u0e07\u0e01\u0e32\u0e23 {0}+)
-Repair.Effect.15=\u0e0b\u0e48\u0e2d\u0e21\u0e41\u0e0b\u0e21\u0e2d\u0e38\u0e1b\u0e01\u0e23\u0e13\u0e4c\u0e2b\u0e34\u0e19
-Repair.Effect.2=\u0e17\u0e31\u0e01\u0e29\u0e30 Repair Mastery
-Repair.Effect.3=\u0e08\u0e33\u0e19\u0e27\u0e19\u0e40\u0e07\u0e34\u0e19\u0e17\u0e35\u0e48\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e02\u0e36\u0e49\u0e19\u0e43\u0e19\u0e01\u0e32\u0e23\u0e0b\u0e48\u0e2d\u0e21
-Repair.Effect.4=Super Repair
-Repair.Effect.5=\u0e1c\u0e25\u0e01\u0e32\u0e23\u0e44\u0e14\u0e49 Double
-Repair.Effect.6=\u0e17\u0e31\u0e01\u0e29\u0e30 Diamond Repair ({0}+ SKILL)
-Repair.Effect.7=\u0e0b\u0e48\u0e2d\u0e21\u0e41\u0e0b\u0e21 \u0e2d\u0e38\u0e1b\u0e01\u0e23\u0e13\u0e4c\u0e40\u0e1e\u0e0a\u0e23\u0e41\u0e25\u0e30\u0e40\u0e01\u0e23\u0e32\u0e30
-Repair.Effect.8=Arcane Forging
-Repair.Effect.9=\u0e0b\u0e48\u0e2d\u0e21\u0e2a\u0e34\u0e48\u0e07\u0e02\u0e2d\u0e07\u0e44\u0e14\u0e49\u0e23\u0e31\u0e1a\u0e01\u0e32\u0e23\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e1b\u0e23\u0e30\u0e2a\u0e34\u0e17\u0e18\u0e34\u0e20\u0e32\u0e1e\u0e02\u0e36\u0e49\u0e19
-Repair.Effect.16=\u0e17\u0e31\u0e01\u0e29\u0e30 Salvage (\u0e15\u0e49\u0e2d\u0e07\u0e01\u0e32\u0e23\u0e17\u0e31\u0e01\u0e29\u0e30 {0}+)
-Repair.Effect.17=\u0e01\u0e39\u0e2d\u0e38\u0e1b\u0e01\u0e23\u0e13\u0e4c\u0e41\u0e25\u0e30\u0e40\u0e01\u0e23\u0e32\u0e30
+Repair.SubSkill.Repair.Name=\u0e0b\u0e48\u0e2d\u0e21\u0e41\u0e0b\u0e21
+Repair.SubSkill.Repair.Description=\u0e0b\u0e48\u0e2d\u0e21\u0e41\u0e0b\u0e21\u0e2d\u0e38\u0e1b\u0e01\u0e23\u0e13\u0e4c\u0e41\u0e25\u0e30\u0e40\u0e01\u0e23\u0e32\u0e30
+Repair.SubSkill.GoldRepair.Name=\u0e0b\u0e48\u0e2d\u0e21\u0e2d\u0e38\u0e1b\u0e01\u0e23\u0e13\u0e4c\u0e17\u0e2d\u0e07 (\u0e17\u0e31\u0e01\u0e29\u0e30\u0e15\u0e49\u0e2d\u0e07\u0e01\u0e32\u0e23 {0}+)
+Repair.SubSkill.GoldRepair.Description=\u0e0b\u0e48\u0e2d\u0e21\u0e41\u0e0b\u0e21 \u0e2d\u0e38\u0e1b\u0e01\u0e23\u0e13\u0e4c\u0e17\u0e2d\u0e07\u0e41\u0e25\u0e30\u0e40\u0e01\u0e23\u0e32\u0e30
+Repair.SubSkill.IronRepair.Name=\u0e0b\u0e48\u0e2d\u0e21\u0e2d\u0e38\u0e1b\u0e01\u0e23\u0e13\u0e4c\u0e40\u0e2b\u0e25\u0e47\u0e01 (\u0e17\u0e31\u0e01\u0e29\u0e30\u0e15\u0e49\u0e2d\u0e07\u0e01\u0e32\u0e23 {0}+)
+Repair.SubSkill.IronRepair.Description=\u0e0b\u0e48\u0e2d\u0e21\u0e41\u0e0b\u0e21 \u0e2d\u0e38\u0e1b\u0e01\u0e23\u0e13\u0e4c\u0e40\u0e2b\u0e25\u0e47\u0e01\u0e41\u0e25\u0e30\u0e40\u0e01\u0e23\u0e32\u0e30
+Repair.SubSkill.StoneRepair.Name=\u0e0b\u0e48\u0e2d\u0e21\u0e2d\u0e38\u0e1b\u0e01\u0e23\u0e13\u0e4c\u0e2b\u0e34\u0e19 (\u0e17\u0e31\u0e01\u0e29\u0e30\u0e15\u0e49\u0e2d\u0e07\u0e01\u0e32\u0e23 {0}+)
+Repair.SubSkill.StoneRepair.Description=\u0e0b\u0e48\u0e2d\u0e21\u0e41\u0e0b\u0e21\u0e2d\u0e38\u0e1b\u0e01\u0e23\u0e13\u0e4c\u0e2b\u0e34\u0e19
+Repair.SubSkill.RepairMastery.Name=\u0e17\u0e31\u0e01\u0e29\u0e30 Repair Mastery
+Repair.SubSkill.RepairMastery.Description=\u0e08\u0e33\u0e19\u0e27\u0e19\u0e40\u0e07\u0e34\u0e19\u0e17\u0e35\u0e48\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e02\u0e36\u0e49\u0e19\u0e43\u0e19\u0e01\u0e32\u0e23\u0e0b\u0e48\u0e2d\u0e21
+Repair.SubSkill.SuperRepair.Name=Super Repair
+Repair.SubSkill.SuperRepair.Description=\u0e1c\u0e25\u0e01\u0e32\u0e23\u0e44\u0e14\u0e49 Double
+Repair.SubSkill.DiamondRepair.Name=\u0e17\u0e31\u0e01\u0e29\u0e30 Diamond Repair ({0}+ SKILL)
+Repair.SubSkill.DiamondRepair.Description=\u0e0b\u0e48\u0e2d\u0e21\u0e41\u0e0b\u0e21 \u0e2d\u0e38\u0e1b\u0e01\u0e23\u0e13\u0e4c\u0e40\u0e1e\u0e0a\u0e23\u0e41\u0e25\u0e30\u0e40\u0e01\u0e23\u0e32\u0e30
+Repair.SubSkill.ArcaneForging.Name=Arcane Forging
+Repair.SubSkill.ArcaneForging.Description=\u0e0b\u0e48\u0e2d\u0e21\u0e2a\u0e34\u0e48\u0e07\u0e02\u0e2d\u0e07\u0e44\u0e14\u0e49\u0e23\u0e31\u0e1a\u0e01\u0e32\u0e23\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e1b\u0e23\u0e30\u0e2a\u0e34\u0e17\u0e18\u0e34\u0e20\u0e32\u0e1e\u0e02\u0e36\u0e49\u0e19
+Repair.SubSkill.Salvage.Name=\u0e17\u0e31\u0e01\u0e29\u0e30 Salvage (\u0e15\u0e49\u0e2d\u0e07\u0e01\u0e32\u0e23\u0e17\u0e31\u0e01\u0e29\u0e30 {0}+)
+Repair.SubSkill.Salvage.Description=\u0e01\u0e39\u0e2d\u0e38\u0e1b\u0e01\u0e23\u0e13\u0e4c\u0e41\u0e25\u0e30\u0e40\u0e01\u0e23\u0e32\u0e30
 Repair.Error=[[DARK_RED]]mcMMO \u0e1e\u0e1a\u0e02\u0e49\u0e2d\u0e1c\u0e34\u0e14\u0e1e\u0e25\u0e32\u0e14\u0e1e\u0e22\u0e32\u0e22\u0e32\u0e21\u0e17\u0e35\u0e48\u0e08\u0e30\u0e0b\u0e48\u0e2d\u0e21\u0e41\u0e0b\u0e21\u0e2a\u0e34\u0e19\u0e04\u0e49\u0e32\u0e23\u0e32\u0e22\u0e01\u0e32\u0e23\u0e19\u0e35\u0e49!
 Repair.Listener.Anvil=[[DARK_RED]]\u0e04\u0e38\u0e13\u0e44\u0e14\u0e49\u0e27\u0e32\u0e07 Anvil \u0e2a\u0e32\u0e21\u0e32\u0e23\u0e16\u0e0b\u0e48\u0e2d\u0e21\u0e41\u0e0b\u0e21\u0e40\u0e04\u0e23\u0e37\u0e48\u0e2d\u0e07\u0e21\u0e37\u0e2d\u0e41\u0e25\u0e30\u0e40\u0e01\u0e23\u0e32\u0e30.
 Repair.Listener.Anvil2=[[DARK_RED]]\u0e04\u0e38\u0e13\u0e44\u0e14\u0e49\u0e27\u0e32\u0e07\u0e17\u0e31\u0e48\u0e07\u0e2a\u0e32\u0e21\u0e32\u0e23\u0e16\u0e01\u0e39\u0e49\u0e40\u0e04\u0e23\u0e37\u0e48\u0e2d\u0e07\u0e21\u0e37\u0e2d\u0e41\u0e25\u0e30\u0e40\u0e01\u0e23\u0e32\u0e30.
@@ -222,13 +222,13 @@ Swords.Combat.Counter.Chance=[[RED]]Counter Attack \u0e42\u0e2d\u0e01\u0e32\u0e2
 Swords.Combat.Counter.Hit=[[DARK_RED]]\u0e42\u0e08\u0e21\u0e15\u0e35\u0e14\u0e49\u0e27\u0e22 counter-attack!
 Swords.Combat.Countered=[[GREEN]]**\u0e43\u0e0a\u0e49\u0e17\u0e31\u0e01\u0e29\u0e30 COUNTER-ATTACKED**
 Swords.Combat.SS.Struck=[[DARK_RED]]\u0e23\u0e39\u0e49\u0e2a\u0e36\u0e01\u0e21\u0e36\u0e19\u0e07\u0e07 \u0e40\u0e1e\u0e23\u0e32\u0e30 \u0e17\u0e31\u0e01\u0e29\u0e30 SERRATED STRIKES!
-Swords.Effect.0=Counter Attack
-Swords.Effect.2=Serrated Strikes
-Swords.Effect.3={0} \u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22\u0e01\u0e23\u0e30\u0e08\u0e32\u0e22, \u0e40\u0e25\u0e37\u0e2d\u0e14\u0e44\u0e2b\u0e25+ \u0e01\u0e23\u0e30\u0e08\u0e32\u0e22
+Swords.SubSkill.CounterAttack.Name=Counter Attack
+Swords.SubSkill.SerratedStrikes.Name=Serrated Strikes
+Swords.SubSkill.SerratedStrikes.Description={0} \u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22\u0e01\u0e23\u0e30\u0e08\u0e32\u0e22, \u0e40\u0e25\u0e37\u0e2d\u0e14\u0e44\u0e2b\u0e25+ \u0e01\u0e23\u0e30\u0e08\u0e32\u0e22
 Swords.Effect.4=Serrated Strikes Bleed+
 Swords.Effect.5={0} Tick \u0e15\u0e48\u0e2d\u0e01\u0e32\u0e23\u0e40\u0e25\u0e37\u0e2d\u0e14\u0e44\u0e2b\u0e25
-Swords.Effect.6=Bleed
-Swords.Effect.7=\u0e40\u0e25\u0e37\u0e2d\u0e14\u0e44\u0e2b\u0e25\u0e2d\u0e2d\u0e01
+Swords.SubSkill.Bleed.Name=Bleed
+Swords.SubSkill.Bleed.Description=\u0e40\u0e25\u0e37\u0e2d\u0e14\u0e44\u0e2b\u0e25\u0e2d\u0e2d\u0e01
 Swords.Listener=\u0e17\u0e31\u0e01\u0e29\u0e30 Swords:
 Swords.SkillName=SWORDS
 Swords.Skills.SS.Off=[[RED]]**\u0e17\u0e31\u0e01\u0e29\u0e30 Serrated Strikes \u0e2b\u0e21\u0e14\u0e2a\u0e20\u0e32\u0e1e**
@@ -257,26 +257,26 @@ Taming.Ability.Locked.3=\u0e2a\u0e32\u0e21\u0e32\u0e23\u0e16\u0e1b\u0e25\u0e14\u
 Taming.Ability.Locked.4=\u0e2a\u0e32\u0e21\u0e32\u0e23\u0e16\u0e1b\u0e25\u0e14\u0e25\u0e47\u0e2d\u0e01\u0e44\u0e14\u0e49\u0e40\u0e21\u0e37\u0e48\u0e2d\u0e23\u0e30\u0e14\u0e31\u0e1a {0}+ (FAST FOOD SERVICE)
 Taming.Ability.Locked.5=\u0e2a\u0e32\u0e21\u0e32\u0e23\u0e16\u0e1b\u0e25\u0e14\u0e25\u0e47\u0e2d\u0e01\u0e44\u0e14\u0e49\u0e40\u0e21\u0e37\u0e48\u0e2d\u0e23\u0e30\u0e14\u0e31\u0e1a {0}+ (HOLY HOUND)
 Taming.Combat.Chance.Gore=[[RED]]Gore \u0e42\u0e2d\u0e01\u0e32\u0e2a: [[YELLOW]]{0}
-Taming.Effect.0=Beast Lore
-Taming.Effect.1=\u0e01\u0e23\u0e30\u0e14\u0e39\u0e01\u0e43\u0e0a\u0e49\u0e15\u0e23\u0e27\u0e08\u0e2b\u0e21\u0e32\u0e1b\u0e48\u0e32\u0e41\u0e25\u0e30 ocelots
-Taming.Effect.10=Shock Proof
-Taming.Effect.11=\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22\u0e08\u0e32\u0e01\u0e23\u0e30\u0e40\u0e1a\u0e34\u0e14\u0e25\u0e14\u0e25\u0e07
-Taming.Effect.12=Call of the Wild
-Taming.Effect.13=\u0e40\u0e23\u0e35\u0e22\u0e01\u0e2a\u0e31\u0e15\u0e27\u0e4c\u0e21\u0e32\u0e14\u0e49\u0e32\u0e19\u0e02\u0e49\u0e32\u0e07\u0e02\u0e2d\u0e07\u0e04\u0e38\u0e13
-Taming.Effect.14=[[GRAY]]COTW (Ocelot): \u0e21\u0e2d\u0e1a\u0e1b\u0e25\u0e32\u0e43\u0e19\u0e21\u0e37\u0e2d {0} \u0e0a\u0e34\u0e49\u0e19\u0e42\u0e14\u0e22\u0e01\u0e32\u0e23\u0e04\u0e25\u0e34\u0e01\u0e0b\u0e49\u0e32\u0e22
+Taming.SubSkill.BeastLore.Name=Beast Lore
+Taming.SubSkill.BeastLore.Description=\u0e01\u0e23\u0e30\u0e14\u0e39\u0e01\u0e43\u0e0a\u0e49\u0e15\u0e23\u0e27\u0e08\u0e2b\u0e21\u0e32\u0e1b\u0e48\u0e32\u0e41\u0e25\u0e30 ocelots
+Taming.SubSkill.ShockProof.Name=Shock Proof
+Taming.SubSkill.ShockProof.Description=\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22\u0e08\u0e32\u0e01\u0e23\u0e30\u0e40\u0e1a\u0e34\u0e14\u0e25\u0e14\u0e25\u0e07
+Taming.SubSkill.CallOfTheWild.Name=Call of the Wild
+Taming.SubSkill.CallOfTheWild.Description=\u0e40\u0e23\u0e35\u0e22\u0e01\u0e2a\u0e31\u0e15\u0e27\u0e4c\u0e21\u0e32\u0e14\u0e49\u0e32\u0e19\u0e02\u0e49\u0e32\u0e07\u0e02\u0e2d\u0e07\u0e04\u0e38\u0e13
+Taming.SubSkill.CallOfTheWild.Description.2=[[GRAY]]COTW (Ocelot): \u0e21\u0e2d\u0e1a\u0e1b\u0e25\u0e32\u0e43\u0e19\u0e21\u0e37\u0e2d {0} \u0e0a\u0e34\u0e49\u0e19\u0e42\u0e14\u0e22\u0e01\u0e32\u0e23\u0e04\u0e25\u0e34\u0e01\u0e0b\u0e49\u0e32\u0e22
 Taming.Effect.15=[[GRAY]]COTW (Wolf): \u0e21\u0e2d\u0e1a\u0e01\u0e23\u0e30\u0e14\u0e39\u0e01\u0e43\u0e19\u0e21\u0e37\u0e2d {0} \u0e0a\u0e34\u0e49\u0e19\u0e42\u0e14\u0e22\u0e04\u0e25\u0e34\u0e01\u0e0b\u0e49\u0e32\u0e22
-Taming.Effect.16=Fast Food Service
-Taming.Effect.17=\u0e42\u0e2d\u0e01\u0e32\u0e2a\u0e2a\u0e33\u0e2b\u0e23\u0e31\u0e1a\u0e2b\u0e21\u0e32\u0e1b\u0e48\u0e32\u0e17\u0e35\u0e48\u0e08\u0e30\u0e23\u0e31\u0e01\u0e29\u0e32\u0e15\u0e31\u0e27\u0e40\u0e2d\u0e07\u0e43\u0e19\u0e01\u0e32\u0e23\u0e42\u0e08\u0e21\u0e15\u0e35
-Taming.Effect.18=Holy Hound
-Taming.Effect.19=\u0e23\u0e31\u0e01\u0e29\u0e32\u0e1e\u0e34\u0e29\u0e41\u0e25\u0e30\u0e40\u0e27\u0e17\u0e21\u0e19\u0e15\u0e4c
-Taming.Effect.2=Gore
-Taming.Effect.3=\u0e42\u0e08\u0e21\u0e15\u0e35\u0e17\u0e33 Critical \u0e41\u0e25\u0e30\u0e42\u0e2d\u0e01\u0e32\u0e2a\u0e17\u0e33\u0e43\u0e2b\u0e49\u0e40\u0e25\u0e37\u0e2d\u0e14\u0e44\u0e2b\u0e25
-Taming.Effect.4=Sharpened Claws
-Taming.Effect.5=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22
-Taming.Effect.6=Environmentally Aware
-Taming.Effect.7=\u0e25\u0e14\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22\u0e08\u0e32\u0e01\u0e01\u0e23\u0e30\u0e1a\u0e2d\u0e07\u0e40\u0e1e\u0e0a\u0e23 \u0e25\u0e32\u0e27\u0e32 \u0e01\u0e32\u0e23\u0e15\u0e01\u0e08\u0e32\u0e01\u0e17\u0e35\u0e48\u0e2a\u0e39\u0e07
-Taming.Effect.8=Thick Fur
-Taming.Effect.9=\u0e25\u0e14\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22\u0e08\u0e32\u0e01\u0e44\u0e1f
+Taming.SubSkill.FastFoodService.Name=Fast Food Service
+Taming.SubSkill.FastFoodService.Description=\u0e42\u0e2d\u0e01\u0e32\u0e2a\u0e2a\u0e33\u0e2b\u0e23\u0e31\u0e1a\u0e2b\u0e21\u0e32\u0e1b\u0e48\u0e32\u0e17\u0e35\u0e48\u0e08\u0e30\u0e23\u0e31\u0e01\u0e29\u0e32\u0e15\u0e31\u0e27\u0e40\u0e2d\u0e07\u0e43\u0e19\u0e01\u0e32\u0e23\u0e42\u0e08\u0e21\u0e15\u0e35
+Taming.SubSkill.HolyHound.Name=Holy Hound
+Taming.SubSkill.HolyHound.Description=\u0e23\u0e31\u0e01\u0e29\u0e32\u0e1e\u0e34\u0e29\u0e41\u0e25\u0e30\u0e40\u0e27\u0e17\u0e21\u0e19\u0e15\u0e4c
+Taming.SubSkill.Gore.Name=Gore
+Taming.SubSkill.Gore.Description=\u0e42\u0e08\u0e21\u0e15\u0e35\u0e17\u0e33 Critical \u0e41\u0e25\u0e30\u0e42\u0e2d\u0e01\u0e32\u0e2a\u0e17\u0e33\u0e43\u0e2b\u0e49\u0e40\u0e25\u0e37\u0e2d\u0e14\u0e44\u0e2b\u0e25
+Taming.SubSkill.SharpenedClaws.Name=Sharpened Claws
+Taming.SubSkill.SharpenedClaws.Description=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22
+Taming.SubSkill.EnvironmentallyAware.Name=Environmentally Aware
+Taming.SubSkill.EnvironmentallyAware.Description=\u0e25\u0e14\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22\u0e08\u0e32\u0e01\u0e01\u0e23\u0e30\u0e1a\u0e2d\u0e07\u0e40\u0e1e\u0e0a\u0e23 \u0e25\u0e32\u0e27\u0e32 \u0e01\u0e32\u0e23\u0e15\u0e01\u0e08\u0e32\u0e01\u0e17\u0e35\u0e48\u0e2a\u0e39\u0e07
+Taming.SubSkill.ThickFur.Name=Thick Fur
+Taming.SubSkill.ThickFur.Description=\u0e25\u0e14\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22\u0e08\u0e32\u0e01\u0e44\u0e1f
 Taming.Listener.Wolf=[[DARK_GRAY]]\u0e2b\u0e21\u0e32\u0e1b\u0e48\u0e32\u0e02\u0e2d\u0e07\u0e04\u0e38\u0e13\u0e44\u0e14\u0e49\u0e01\u0e25\u0e31\u0e1a\u0e21\u0e32\u0e2b\u0e32\u0e04\u0e38\u0e13...
 Taming.Listener=\u0e17\u0e31\u0e01\u0e29\u0e30 Taming:
 Taming.SkillName=TAMING
@@ -295,16 +295,16 @@ Unarmed.Ability.IronGrip.Attacker=[[RED]]\u0e1d\u0e48\u0e32\u0e22\u0e15\u0e23\u0
 Unarmed.Ability.IronGrip.Defender=[[GREEN]]Iron grip \u0e17\u0e33\u0e43\u0e2b\u0e49\u0e04\u0e38\u0e13\u0e44\u0e21\u0e48\u0e44\u0e14\u0e49\u0e23\u0e31\u0e1a\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22!
 Unarmed.Ability.Lower=[[GRAY]]**\u0e04\u0e38\u0e13\u0e1e\u0e23\u0e49\u0e2d\u0e21\u0e17\u0e35\u0e48\u0e08\u0e30\u0e43\u0e0a\u0e49\u0e17\u0e31\u0e01\u0e29\u0e30\u0e02\u0e2d\u0e07 \u0e21\u0e37\u0e2d**
 Unarmed.Ability.Ready=[[GREEN]]**\u0e04\u0e38\u0e13\u0e1e\u0e23\u0e49\u0e2d\u0e21\u0e17\u0e35\u0e48\u0e08\u0e30\u0e43\u0e0a\u0e49\u0e17\u0e31\u0e01\u0e29\u0e30\u0e02\u0e2d\u0e07 \u0e21\u0e37\u0e2d**
-Unarmed.Effect.0=Berserk
-Unarmed.Effect.1=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e01\u0e32\u0e23\u0e17\u0e33\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22 +50%, \u0e17\u0e33\u0e25\u0e32\u0e22\u0e27\u0e31\u0e15\u0e16\u0e38\u0e17\u0e35\u0e48\u0e2d\u0e48\u0e2d\u0e19
-Unarmed.Effect.2=Disarm (Players)
-Unarmed.Effect.3=\u0e02\u0e42\u0e21\u0e22\u0e2a\u0e34\u0e48\u0e07\u0e02\u0e2d\u0e07\u0e43\u0e19\u0e21\u0e37\u0e2d\u0e02\u0e2d\u0e07\u0e1c\u0e39\u0e49\u0e40\u0e25\u0e48\u0e19
-Unarmed.Effect.4=Iron Arm Style
-Unarmed.Effect.5=\u0e41\u0e02\u0e47\u0e07\u0e15\u0e31\u0e27\u0e41\u0e02\u0e19\u0e02\u0e2d\u0e07\u0e04\u0e38\u0e13\u0e40\u0e21\u0e37\u0e48\u0e2d\u0e40\u0e27\u0e25\u0e32\u0e1c\u0e48\u0e32\u0e19\u0e44\u0e1b
-Unarmed.Effect.6=Arrow Deflect
-Unarmed.Effect.7=Deflect arrows
-Unarmed.Effect.8=Iron Grip
-Unarmed.Effect.9=\u0e1b\u0e49\u0e2d\u0e07\u0e01\u0e31\u0e19\u0e44\u0e21\u0e48\u0e43\u0e2b\u0e49\u0e04\u0e38\u0e13\u0e08\u0e32\u0e01\u0e01\u0e32\u0e23\u0e16\u0e39\u0e01\u0e1b\u0e25\u0e14
+Unarmed.SubSkill.Berserk.Name=Berserk
+Unarmed.SubSkill.Berserk.Description=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e01\u0e32\u0e23\u0e17\u0e33\u0e04\u0e27\u0e32\u0e21\u0e40\u0e2a\u0e35\u0e22\u0e2b\u0e32\u0e22 +50%, \u0e17\u0e33\u0e25\u0e32\u0e22\u0e27\u0e31\u0e15\u0e16\u0e38\u0e17\u0e35\u0e48\u0e2d\u0e48\u0e2d\u0e19
+Unarmed.SubSkill.Disarm.Name=Disarm (Players)
+Unarmed.SubSkill.Disarm.Description=\u0e02\u0e42\u0e21\u0e22\u0e2a\u0e34\u0e48\u0e07\u0e02\u0e2d\u0e07\u0e43\u0e19\u0e21\u0e37\u0e2d\u0e02\u0e2d\u0e07\u0e1c\u0e39\u0e49\u0e40\u0e25\u0e48\u0e19
+Unarmed.SubSkill.IronArmStyle.Name=Iron Arm Style
+Unarmed.SubSkill.IronArmStyle.Description=\u0e41\u0e02\u0e47\u0e07\u0e15\u0e31\u0e27\u0e41\u0e02\u0e19\u0e02\u0e2d\u0e07\u0e04\u0e38\u0e13\u0e40\u0e21\u0e37\u0e48\u0e2d\u0e40\u0e27\u0e25\u0e32\u0e1c\u0e48\u0e32\u0e19\u0e44\u0e1b
+Unarmed.SubSkill.ArrowDeflect.Name=Arrow Deflect
+Unarmed.SubSkill.ArrowDeflect.Description=Deflect arrows
+Unarmed.SubSkill.IronGrip.Name=Iron Grip
+Unarmed.SubSkill.IronGrip.Description=\u0e1b\u0e49\u0e2d\u0e07\u0e01\u0e31\u0e19\u0e44\u0e21\u0e48\u0e43\u0e2b\u0e49\u0e04\u0e38\u0e13\u0e08\u0e32\u0e01\u0e01\u0e32\u0e23\u0e16\u0e39\u0e01\u0e1b\u0e25\u0e14
 Unarmed.Listener=\u0e17\u0e31\u0e01\u0e29\u0e30 Unarmed:
 Unarmed.SkillName=UNARMED
 Unarmed.Skills.Berserk.Off=[[RED]]**\u0e17\u0e31\u0e01\u0e29\u0e30 Berserk \u0e2b\u0e21\u0e14\u0e2a\u0e20\u0e32\u0e1e**
@@ -318,12 +318,12 @@ Woodcutting.Ability.1=\u0e17\u0e33\u0e25\u0e32\u0e22\u0e43\u0e1a\u0e44\u0e21\u0e
 Woodcutting.Ability.Chance.DDrop=[[RED]]Double Drop \u0e42\u0e2d\u0e01\u0e32\u0e2a: [[YELLOW]]{0}
 Woodcutting.Ability.Length=[[RED]]Tree Feller \u0e21\u0e35\u0e23\u0e30\u0e22\u0e30\u0e40\u0e27\u0e25\u0e32: [[YELLOW]]{0}\u0e27\u0e34\u0e19\u0e32\u0e17\u0e35
 Woodcutting.Ability.Locked.0=\u0e2a\u0e32\u0e21\u0e32\u0e23\u0e16\u0e1b\u0e25\u0e14\u0e25\u0e47\u0e2d\u0e01\u0e44\u0e14\u0e49\u0e40\u0e21\u0e37\u0e48\u0e2d\u0e23\u0e30\u0e14\u0e31\u0e1a {0}+ (LEAF BLOWER)
-Woodcutting.Effect.0=Tree Feller
-Woodcutting.Effect.1=\u0e17\u0e33\u0e43\u0e2b\u0e49\u0e15\u0e49\u0e19\u0e44\u0e21\u0e49\u0e23\u0e30\u0e40\u0e1a\u0e34\u0e14
-Woodcutting.Effect.2=Leaf Blower
-Woodcutting.Effect.3=\u0e17\u0e33\u0e25\u0e32\u0e22\u0e43\u0e1a\u0e44\u0e21\u0e49\u0e2d\u0e2d\u0e01
-Woodcutting.Effect.4=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e2d\u0e31\u0e15\u0e23\u0e32\u0e01\u0e32\u0e23 Drops
-Woodcutting.Effect.5=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e2d\u0e31\u0e04\u0e23\u0e32\u0e01\u0e32\u0e23 Drops
+Woodcutting.SubSkill.TreeFeller.Name=Tree Feller
+Woodcutting.SubSkill.TreeFeller.Description=\u0e17\u0e33\u0e43\u0e2b\u0e49\u0e15\u0e49\u0e19\u0e44\u0e21\u0e49\u0e23\u0e30\u0e40\u0e1a\u0e34\u0e14
+Woodcutting.SubSkill.LeafBlower.Name=Leaf Blower
+Woodcutting.SubSkill.LeafBlower.Description=\u0e17\u0e33\u0e25\u0e32\u0e22\u0e43\u0e1a\u0e44\u0e21\u0e49\u0e2d\u0e2d\u0e01
+Woodcutting.SubSkill.HarvestLumber.Name=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e2d\u0e31\u0e15\u0e23\u0e32\u0e01\u0e32\u0e23 Drops
+Woodcutting.SubSkill.HarvestLumber.Description=\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e2d\u0e31\u0e04\u0e23\u0e32\u0e01\u0e32\u0e23 Drops
 Woodcutting.Listener=\u0e17\u0e31\u0e01\u0e29\u0e30 Woodcutting:
 Woodcutting.SkillName=WOODCUTTING
 Woodcutting.Skills.TreeFeller.Off=[[RED]]**\u0e17\u0e31\u0e01\u0e29\u0e30 Tree Feller \u0e2b\u0e21\u0e14\u0e2a\u0e20\u0e32\u0e1e**

src/main/resources/locale/locale_tr_TR.properties

@@ -1,68 +0,0 @@
-Acrobatics.Combat.Proc=[[GREEN]]**KACTI**
-Acrobatics.SkillName=AKROBATIK
-Acrobatics.Skillup=[[YELLOW]]Akrobatik yeteneklerin {0} seviye oldu . En fazla ({1})
-Archery.Listener=Ok\u00e7uluk:
-Archery.SkillName=OK\u00c7ULUK
-Archery.Skillup=[[YELLOW]]Okculuk yetenegin {0} seviye oldu . En fazla ({1})
-Axes.Ability.Ready=[[GREEN]]**BALTANI HAZIRLIYORSUN**
-Axes.Combat.GI.Struck=[RED]]**IYI BIR DARBE VURDU**
-Axes.Effect.2=Kritik Vuruslar
-Axes.SkillName=BALTALAR
-Excavation.Ability.Lower=[[GRAY]]**K\u00dcREGINI INDIRIYORSUN**
-Excavation.SkillName=KAZMA
-Fishing.SkillName=BALIK TUTMA
-Herbalism.Ability.Lower=[[GRAY]]**\u00c7APANI INDIRIYORSUN**
-Herbalism.Ability.Ready=[[GREEN]]**\u00c7APANI HAZIRLIYORSUN**
-Herbalism.Listener=Herbalism:
-Herbalism.Skillup=[[YELLOW]]Herbalizm yeteneklerin {0} seviye oldu. Toplam ({1})
-Mining.Ability.Length=[[RED]]Aninda Kirma \u00d6zelligi Uzunlugu: [[YELLOW]]{0}saniye
-Mining.Ability.Lower=[GRAY]]**KAZMANI INDIRIYORSUN**
-Mining.Ability.Ready=[[GREEN]]**KAZMAN HAZIR**
-Mining.SkillName=MADENCILIK
-Mining.Skills.SuperBreaker.Refresh=[[GREEN]]Senin [[YELLOW]]Aninda Kirma [[GREEN]\u00f6zelligin yenilendi!
-Mining.Skillup=[[YELLOW]]Madencilik yetene\u011fin {0} seviye oldu . En fazla ({1})
-Mining.Blast.Boom=[[GRAY]]**BOM**
-Mining.Blast.Refresh=[[YELLOW]]Y\u0131k\u0131c\u0131 Kazma [[GREEN]]yetenegin yenilendi!
-Repair.Effect.4=Super Tamir
-Repair.Effect.7=Elmas Zirh & Esyalari Tamir Et
-Repair.Listener=Tamir et :
-Repair.SkillName=TAMIR
-Repair.Skills.AdeptStone=[[DARK_RED]]Tas aleti tamir etmek i\u00e7in yeterli seviyede degilsin.
-Repair.Skills.StackedItems=[[DARK_RED]]Stakli esyalari tamir edemezsin.
-Repair.Arcane.Fail=[[RED]]Esyanizdaki sira disi g\u00fcc\u00fcn etkisi gecti.
-Swords.Ability.Ready=[[GREEN]]**KILICINI HAZIRLIYORSUN**
-Swords.Combat.Bleeding.Stopped=[[GRAY]]Kanama[[GREEN]]durdu[[GRAY]]!
-Swords.Combat.Bleeding=[[GREEN]]**DUSMAN KANAMAYA BASLADI**
-Swords.Skills.SS.On=[[GREEN]]**KESKIN SALDIRI AKTIF**
-Taming.Listener=Evcillestirme:
-Taming.SkillName=EVCILLESTIRME
-Unarmed.Ability.Lower=YUMRUKLARINI INDIRIYORSUN
-Unarmed.Listener=Silahsiz:
-Unarmed.SkillName=SILAHSIZ
-Unarmed.Skills.Berserk.Other.On=[[GREEN]]{0}[[DARK_GREEN]] adli oyuncu [[RED]]c\u0131lg\u0131na dondu!
-Woodcutting.Ability.0=Yaprak Ufleyici
-Woodcutting.SkillName=ODUNCULUK
-Woodcutting.Skills.TreeFeller.Threshold=[[RED]]Aga\u00e7 \u00e7ok uzun!
-Ability.Generic.Template=[[RED]]{0}: [[YELLOW]]{1}
-Combat.BeastLoreOwner=[[DARK_AQUA]]Sahip ([[RED]]{0}[[DARK_AQUA]])
-Combat.TouchedFuzzy=[[DARK_RED]]Bas\u0131n donuyor!
-Commands.AdminChat.Off=Admin Chat [[RED]]Kapal\u0131
-Commands.Party.Kick=[[RED]]Partiden at\u0131ld\u0131n {0}!
-Commands.Party.None=[[RED]]Grupta degilsin.
-Commands.PowerLevel.Leaderboard=[[YELLOW]]--mcMMO[[BLUE]] G\u00fc\u00e7 Seviyesi [[YELLOW]]En y\u00fcksekler
-Commands.PowerLevel=[[DARK_RED]G\u00fc\u00e7 Seviyesi: [[GREEN]]{0}
-Commands.Stats.Self=ISTATISTIKLERINIZ
-Commands.Stats=[[RED]]- mcMMO istatistiklerini g\u00f6r
-Party.Teleport.Target=[[GREEN]]{0} sana isinlandi.
-Party.Unlocked=[[GRAY]]Parti herkeze acik.
-Commands.XPGain.Excavation=Kazmak ve hazineler bulmak
-Commands.XPGain.Herbalism=Hasat
-Commands.XPGain.Mining=Tas veya cevher kaz!
-Commands.XPGain.Repair=Tamir ediliyor
-Commands.XPGain.Taming=Hayvan evcillestir veya kopeginle beraber savas!
-Commands.XPGain=[[DARK_GRAY]]KAZANILAN XP: [[WHITE]]{0}
-Commands.xprate.started.0=[[GOLD]] mcMMO I\u00c7IN XP EVENTI BASLADI!
-XPRate.Event=[[GOLD]]mcMMO eventlerdende xp kazandirir. XP gelme olasiligi {0}x!
-Effects.Effects=EFEKTLER
-Skills.Disarmed=[[DARK_RED]]Silahsiz kaldin.
-Stats.Header.Combat=[[GOLD]]-=SAVAS YETENEKLERI=-

src/main/resources/locale/locale_zh_CN.properties

@@ -1,22 +1,22 @@
 Acrobatics.Ability.Proc=[[GREEN]]**\u534e\u5c14\u5179\u822c\u7684\u964d\u843d**
 Acrobatics.Combat.Proc=[[GREEN]]**\u95ea\u907f**
 Acrobatics.DodgeChance=[[RED]]\u95ea\u907f\u51e0\u7387: [[YELLOW]]{0}
-Acrobatics.Effect.0=\u7ffb\u6eda
-Acrobatics.Effect.1=\u51cf\u5c11\u6216\u8005\u53d6\u6d88\u6389\u843d\u4f24\u5bb3
-Acrobatics.Effect.2=\u4f18\u96c5\u7684\u7ffb\u6eda
-Acrobatics.Effect.3=\u4e24\u500d\u7684\u7ffb\u6eda\u6548\u679c
-Acrobatics.Effect.4=\u95ea\u907f
-Acrobatics.Effect.5=\u51cf\u5c11\u4e00\u534a\u7684\u4f24\u5bb3
+Acrobatics.SubSkill.Roll.Name=\u7ffb\u6eda
+Acrobatics.SubSkill.Roll.Description=\u51cf\u5c11\u6216\u8005\u53d6\u6d88\u6389\u843d\u4f24\u5bb3
+Acrobatics.SubSkill.GracefulRoll.Name=\u4f18\u96c5\u7684\u7ffb\u6eda
+Acrobatics.SubSkill.GracefulRoll.Description=\u4e24\u500d\u7684\u7ffb\u6eda\u6548\u679c
+Acrobatics.SubSkill.Dodge.Name=\u95ea\u907f
+Acrobatics.SubSkill.Dodge.Description=\u51cf\u5c11\u4e00\u534a\u7684\u4f24\u5bb3
 Acrobatics.Listener=\u6742\u6280(Acrobatics):
 Acrobatics.Roll.Chance=[[RED]]\u7ffb\u6eda\u51e0\u7387: [[YELLOW]]{0}
 Acrobatics.Roll.GraceChance=[[RED]]\u4f18\u96c5\u7684\u7ffb\u6eda\u51e0\u7387: [[YELLOW]]{0}
 Acrobatics.Roll.Text=**\u7ffb\u6eda**
 Acrobatics.SkillName=\u6742\u6280
 Acrobatics.Skillup=[[YELLOW]]\u6742\u6280\u6280\u80fd\u4e0a\u5347\u4e86 {0}. \u603b\u7b49\u7ea7 ({1})
-Alchemy.Effect.0=\u50ac\u5316
-Alchemy.Effect.1=\u63d0\u5347\u836f\u6c34\u917f\u9020\u901f\u5ea6
-Alchemy.Effect.2=\u6df7\u5408
-Alchemy.Effect.3=\u917f\u9020\u5e26\u6709\u591a\u91cd\u539f\u6599\u7684\u836f\u6c34
+Alchemy.SubSkill.Catalysis.Name=\u50ac\u5316
+Alchemy.SubSkill.Catalysis.Description=\u63d0\u5347\u836f\u6c34\u917f\u9020\u901f\u5ea6
+Alchemy.SubSkill.Concoctions.Name=\u6df7\u5408
+Alchemy.SubSkill.Concoctions.Description=\u917f\u9020\u5e26\u6709\u591a\u91cd\u539f\u6599\u7684\u836f\u6c34
 Alchemy.Listener=\u70bc\u91d1(Alchemy):
 Alchemy.Ability.Locked.0=\u9501\u5b9a\u72b6\u6001,\u76f4\u5230 {0}+ \u6280\u80fd\uff08\u50ac\u5316\uff09
 Alchemy.Catalysis.Speed=[[RED]]\u917f\u9020\u901f\u5ea6: [[YELLOW]]{0}
@@ -27,12 +27,12 @@ Alchemy.Skillup=[[YELLOW]]\u70bc\u91d1\u6280\u80fd\u4e0a\u5347\u4e86 {0}. \u603b
 Archery.Combat.DazeChance=[[RED]]\u51fb\u6655\u51e0\u7387: [[YELLOW]]{0}
 Archery.Combat.RetrieveChance=[[RED]]\u56de\u6536\u7bad\u77e2\u7684\u51e0\u7387: [[YELLOW]]{0}
 Archery.Combat.SkillshotBonus=[[RED]]\u6280\u5de7\u5c04\u51fb\u5956\u52b1\u4f24\u5bb3: [[YELLOW]]{0}
-Archery.Effect.0=\u6280\u5de7\u5c04\u51fb
-Archery.Effect.1=\u589e\u52a0\u5f13\u7bad\u4f24\u5bb3
-Archery.Effect.2=\u51fb\u6655 (\u9650\u73a9\u5bb6\u4e4b\u95f4)
-Archery.Effect.3=\u8ff7\u60d1\u654c\u4eba\u5e76\u9020\u6210 {0} \u4f24\u5bb3
-Archery.Effect.4=\u56de\u6536\u5f13\u7bad
-Archery.Effect.5=\u6709\u51e0\u7387\u4ece\u5c38\u4f53\u4e0a\u56de\u6536\u7bad\u77e2
+Archery.SubSkill.SkillShot.Name=\u6280\u5de7\u5c04\u51fb
+Archery.SubSkill.SkillShot.Description=\u589e\u52a0\u5f13\u7bad\u4f24\u5bb3
+Archery.SubSkill.Daze.Name=\u51fb\u6655 (\u9650\u73a9\u5bb6\u4e4b\u95f4)
+Archery.SubSkill.Daze.Description=\u8ff7\u60d1\u654c\u4eba\u5e76\u9020\u6210 {0} \u4f24\u5bb3
+Archery.SubSkill.ArrowRetrieval.Name=\u56de\u6536\u5f13\u7bad
+Archery.SubSkill.ArrowRetrieval.Description=\u6709\u51e0\u7387\u4ece\u5c38\u4f53\u4e0a\u56de\u6536\u7bad\u77e2
 Archery.Listener=\u7bad\u672f(Archery):
 Archery.SkillName=\u7bad\u672f
 Archery.Skillup=[[YELLOW]]\u7bad\u672f\u6280\u80fd\u4e0a\u5347\u4e86 {0}. \u603b\u7b49\u7ea7 ({1})
@@ -51,16 +51,16 @@ Axes.Combat.GI.Proc=[[GREEN]]**\u5de8\u529b\u6253\u51fb**
 Axes.Combat.GI.Struck=[[RED]]**\u88ab\u5f3a\u70c8\u51b2\u51fb\u51fb\u4e2d**
 Axes.Combat.SS.Struck=[[DARK_RED]]\u88ab\u65a9\u9996\u8005\u6280\u80fd\u653b\u51fb!
 Axes.Combat.SS.Length=[[RED]]\u65a9\u9996\u8005\u6280\u80fd\u6301\u7eed\u65f6\u95f4: [[YELLOW]]{0}s
-Axes.Effect.0=\u65a9\u9996\u8005 (\u4e3b\u52a8\u6280\u80fd)
-Axes.Effect.1=\u9020\u6210\u8303\u56f4\u4f24\u5bb3
-Axes.Effect.2=\u81f4\u547d\u4e00\u51fb
-Axes.Effect.3=\u53cc\u500d\u4f24\u5bb3
-Axes.Effect.4=\u65a7\u5934\u7cbe\u901a
-Axes.Effect.5=\u589e\u52a0\u989d\u5916\u4f24\u5bb3
-Axes.Effect.6=\u51b2\u51fb
-Axes.Effect.7=\u7528\u8db3\u591f\u7684\u529b\u91cf\u51fb\u788e\u62a4\u7532
-Axes.Effect.8=\u5f3a\u70c8\u51b2\u51fb
-Axes.Effect.9=\u5bf9\u65e0\u62a4\u7532\u654c\u4eba\u9020\u6210\u989d\u5916\u4f24\u5bb3
+Axes.SubSkill.SkullSplitter.Name=\u65a9\u9996\u8005 (\u4e3b\u52a8\u6280\u80fd)
+Axes.SubSkill.SkullSplitter.Description=\u9020\u6210\u8303\u56f4\u4f24\u5bb3
+Axes.SubSkill.CriticalStrikes.Name=\u81f4\u547d\u4e00\u51fb
+Axes.SubSkill.CriticalStrikes.Description=\u53cc\u500d\u4f24\u5bb3
+Axes.SubSkill.AxeMastery.Name=\u65a7\u5934\u7cbe\u901a
+Axes.SubSkill.AxeMastery.Description=\u589e\u52a0\u989d\u5916\u4f24\u5bb3
+Axes.SubSkill.ArmorImpact.Name=\u51b2\u51fb
+Axes.SubSkill.ArmorImpact.Description=\u7528\u8db3\u591f\u7684\u529b\u91cf\u51fb\u788e\u62a4\u7532
+Axes.SubSkill.GreaterImpact.Name=\u5f3a\u70c8\u51b2\u51fb
+Axes.SubSkill.GreaterImpact.Description=\u5bf9\u65e0\u62a4\u7532\u654c\u4eba\u9020\u6210\u989d\u5916\u4f24\u5bb3
 Axes.Listener=\u65a7\u6280(Axes):
 Axes.SkillName=\u65a7\u6280
 Axes.Skills.SS.Off=[[RED]]**\u65a9\u9996\u8005\u6280\u80fd\u5df2\u7ed3\u675f**
@@ -71,10 +71,10 @@ Axes.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]]\u4f7f\u7528\u4e86 [[RED]]\u65
 Axes.Skillup=[[YELLOW]]\u65a7\u5934\u6280\u80fd\u589e\u52a0\u4e86 {0}. \u603b\u5171 ({1})
 Excavation.Ability.Lower=[[GRAY]]**\u4f60\u653e\u4e0b\u4e86\u4f60\u7684\u94f2\u5b50**
 Excavation.Ability.Ready=[[GREEN]]**\u4f60\u63e1\u7d27\u4e86\u4f60\u7684\u94f2\u5b50**
-Excavation.Effect.0=\u66b4\u8d70\u94bb\u5934 (\u4e3b\u52a8\u6280\u80fd)
-Excavation.Effect.1=3x \u6389\u843d\u7387, 3x \u7ecf\u9a8c\u503c, +\u901f\u5ea6
-Excavation.Effect.2=\u5b9d\u7269\u730e\u4eba
-Excavation.Effect.3=\u6316\u51fa\u5b9d\u85cf\u7684\u80fd\u529b
+Excavation.SubSkill.GigaDrillBreaker.Name=\u66b4\u8d70\u94bb\u5934 (\u4e3b\u52a8\u6280\u80fd)
+Excavation.SubSkill.GigaDrillBreaker.Description=3x \u6389\u843d\u7387, 3x \u7ecf\u9a8c\u503c, +\u901f\u5ea6
+Excavation.SubSkill.TreasureHunter.Name=\u5b9d\u7269\u730e\u4eba
+Excavation.SubSkill.TreasureHunter.Description=\u6316\u51fa\u5b9d\u85cf\u7684\u80fd\u529b
 Excavation.Effect.Length=[[RED]]\u66b4\u8d70\u94bb\u5934\u6301\u7eed\u65f6\u95f4: [[YELLOW]]{0}s
 Excavation.Listener=\u6316\u6398(Excavation):
 Excavation.SkillName=\u6316\u6398
@@ -95,18 +95,18 @@ Fishing.Ability.TH.MagicRate=[[RED]]\u9b54\u6cd5\u730e\u4eba\u51e0\u7387: [[YELL
 Fishing.Ability.Shake=[[RED]]\u9c7c\u94a9\u7a83\u53d6\u51e0\u7387: [[YELLOW]]{0}
 Fishing.Ability.IceFishing=[[RED]]\u51b0\u9493: \u5728\u51b0\u4e0a\u9493\u9c7c
 Fishing.Ability.FD=[[RED]]\u6e14\u6c11\u7684\u98df\u8c31: [[YELLOW]]\u6392\u540d {0}
-Fishing.Effect.0=\u5b9d\u7269\u730e\u4eba (\u88ab\u52a8\u6280\u80fd)
-Fishing.Effect.1=\u9493\u5230\u6742\u7269
-Fishing.Effect.2=\u9b54\u6cd5\u730e\u4eba
-Fishing.Effect.3=\u627e\u5230\u9644\u9b54\u7269\u54c1
-Fishing.Effect.4=\u6643\u52a8\u602a\u7269 (\u5bf9\u602a\u7269\u4f7f\u7528)
-Fishing.Effect.5=\u7528\u9c7c\u7aff\u628a\u602a\u7269\u8eab\u4e0a\u7684\u4e1c\u897f\u6447\u4e0b\u6765
-Fishing.Effect.6=\u6e14\u592b\u98df\u8c31
-Fishing.Effect.7=\u63d0\u9ad8\u9c7c\u7c7b\u98df\u7269\u6062\u590d\u7684\u9971\u98df\u5ea6
-Fishing.Effect.8=\u9493\u9c7c\u5927\u5e08
-Fishing.Effect.9=\u63d0\u9ad8\u9493\u9c7c\u54ac\u94a9\u51e0\u7387
-Fishing.Effect.10=\u51b0\u9493
-Fishing.Effect.11=\u5141\u8bb8\u4f60\u5728\u51b0\u51b7\u7684\u73af\u5883\u4e0b\u9493\u9c7c
+Fishing.SubSkill.TreasureHunter.Name=\u5b9d\u7269\u730e\u4eba (\u88ab\u52a8\u6280\u80fd)
+Fishing.SubSkill.TreasureHunter.Description=\u9493\u5230\u6742\u7269
+Fishing.SubSkill.MagicHunter.Name=\u9b54\u6cd5\u730e\u4eba
+Fishing.SubSkill.MagicHunter.Description=\u627e\u5230\u9644\u9b54\u7269\u54c1
+Fishing.SubSkill.Shake.Name=\u6643\u52a8\u602a\u7269 (\u5bf9\u602a\u7269\u4f7f\u7528)
+Fishing.SubSkill.Shake.Description=\u7528\u9c7c\u7aff\u628a\u602a\u7269\u8eab\u4e0a\u7684\u4e1c\u897f\u6447\u4e0b\u6765
+Fishing.SubSkill.FishermansDiet.Name=\u6e14\u592b\u98df\u8c31
+Fishing.SubSkill.FishermansDiet.Description=\u63d0\u9ad8\u9c7c\u7c7b\u98df\u7269\u6062\u590d\u7684\u9971\u98df\u5ea6
+Fishing.SubSkill.MasterAngler.Name=\u9493\u9c7c\u5927\u5e08
+Fishing.SubSkill.MasterAngler.Description=\u63d0\u9ad8\u9493\u9c7c\u54ac\u94a9\u51e0\u7387
+Fishing.SubSkill.IceFishing.Name=\u51b0\u9493
+Fishing.SubSkill.IceFishing.Description=\u5141\u8bb8\u4f60\u5728\u51b0\u51b7\u7684\u73af\u5883\u4e0b\u9493\u9c7c
 Fishing.Chance.Raining=[[BLUE]] \u5927\u91cf\u5956\u52b1
 Fishing.Listener=\u9493\u9c7c(Fishing):
 Fishing.Ability.TH.MagicFound=[[GRAY]]\u4f60\u611f\u5230\u4e00\u80a1\u9b54\u529b\u7684\u6ce2\u52a8...
@@ -127,20 +127,20 @@ Herbalism.Ability.Lower=[[GRAY]]**\u4f60\u653e\u4e0b\u4e86\u4f60\u7684\u9504\u59
 Herbalism.Ability.Ready=[[GREEN]]**\u4f60\u6311\u8d77\u4e86\u4f60\u7684\u9504\u5934**
 Herbalism.Ability.ShroomThumb.Chance=[[RED]]\u83cc\u4e1d\u5316\u51e0\u7387: [[YELLOW]]{0}
 Herbalism.Ability.ShroomThumb.Fail=[[RED]]**\u83cc\u4e1d\u5316\u5931\u8d25**
-Herbalism.Effect.0=\u571f\u795e\u5e87\u4f51 (\u4e3b\u52a8\u6280\u80fd)
-Herbalism.Effect.1=\u64ad\u6492\u5973\u795e\u7684\u6069\u60e0, \u83b7\u5f973\u500d\u6389\u7387
-Herbalism.Effect.2=\u7eff\u5316 (\u5c0f\u9ea6)
-Herbalism.Effect.3=\u6536\u83b7\u7684\u65f6\u5019\u81ea\u52a8\u79cd\u690d\u5c0f\u9ea6
+Herbalism.SubSkill.GreenTerra.Name=\u571f\u795e\u5e87\u4f51 (\u4e3b\u52a8\u6280\u80fd)
+Herbalism.SubSkill.GreenTerra.Description=\u64ad\u6492\u5973\u795e\u7684\u6069\u60e0, \u83b7\u5f973\u500d\u6389\u7387
+Herbalism.SubSkill.GreenThumb.Name=\u7eff\u5316 (\u5c0f\u9ea6)
+Herbalism.SubSkill.GreenThumb.Description=\u6536\u83b7\u7684\u65f6\u5019\u81ea\u52a8\u79cd\u690d\u5c0f\u9ea6
 Herbalism.Effect.4=\u7eff\u5316 (\u65b9\u5757)
-Herbalism.Effect.5=\u788e\u77f3/\u77f3\u5757 -> \u7528\u79cd\u5b50\u4f7f\u5b83\u4eec\u53d8\u6210\u9752\u82d4\u77f3,\u6216\u8005\u8ba9\u8349\u751f\u957f
-Herbalism.Effect.6=\u519c\u592b\u98df\u8c31
-Herbalism.Effect.7=\u98df\u7528\u519c\u4ea7\u54c1\u65f6\u989d\u5916\u56de\u590d\u9965\u997f\u5ea6
-Herbalism.Effect.8=\u53cc\u500d\u6389\u843d (\u6240\u6709\u7684\u690d\u7269)
-Herbalism.Effect.9=\u53cc\u500d\u7269\u54c1
-Herbalism.Effect.10=\u6d77\u62c9\u5c14\u7684\u795d\u798f
-Herbalism.Effect.11=\u7ed9\u4e88\u5c0f\u51e0\u7387\u627e\u5230\u7a00\u6709\u7269\u54c1\u7684\u80fd\u529b
-Herbalism.Effect.12=\u83cc\u4e1d\u5316
-Herbalism.Effect.13=\u5411\u6ce5\u571f&\u8349\u5730\u6563\u64ad\u83cc\u4e1d
+Herbalism.SubSkill.GreenThumb.Description.2=\u788e\u77f3/\u77f3\u5757 -> \u7528\u79cd\u5b50\u4f7f\u5b83\u4eec\u53d8\u6210\u9752\u82d4\u77f3,\u6216\u8005\u8ba9\u8349\u751f\u957f
+Herbalism.SubSkill.FarmersDiet.Name=\u519c\u592b\u98df\u8c31
+Herbalism.SubSkill.FarmersDiet.Description=\u98df\u7528\u519c\u4ea7\u54c1\u65f6\u989d\u5916\u56de\u590d\u9965\u997f\u5ea6
+Herbalism.SubSkill.DoubleDrops.Name=\u53cc\u500d\u6389\u843d (\u6240\u6709\u7684\u690d\u7269)
+Herbalism.SubSkill.DoubleDrops.Description=\u53cc\u500d\u7269\u54c1
+Herbalism.SubSkill.HylianLuck.Name=\u6d77\u62c9\u5c14\u7684\u795d\u798f
+Herbalism.SubSkill.HylianLuck.Description=\u7ed9\u4e88\u5c0f\u51e0\u7387\u627e\u5230\u7a00\u6709\u7269\u54c1\u7684\u80fd\u529b
+Herbalism.SubSkill.ShroomThumb.Name=\u83cc\u4e1d\u5316
+Herbalism.SubSkill.ShroomThumb.Description=\u5411\u6ce5\u571f&\u8349\u5730\u6563\u64ad\u83cc\u4e1d
 Herbalism.HylianLuck=[[GREEN]]\u613f\u6d77\u62c9\u5c14\u7684\u795d\u798f\u4e0e\u4f60\u540c\u5728!
 Herbalism.Listener=\u8349\u836f\u5b66(Herbalism):
 Herbalism.SkillName=\u8349\u836f\u5b66
@@ -156,16 +156,16 @@ Mining.Ability.Locked.1=\u9501\u5b9a\u76f4\u5230 {0}+ \u6280\u80fd (\u5927\u53f7
 Mining.Ability.Locked.2=\u9501\u5b9a\u76f4\u5230 {0}+ \u6280\u80fd (\u7206\u7834\u4e13\u5bb6)
 Mining.Ability.Lower=[[GRAY]]**\u4f60\u6536\u8d77\u4e86\u4f60\u7684\u9550\u5b50**
 Mining.Ability.Ready=[[GREEN]]**\u4f60\u62ff\u8d77\u4e86\u4f60\u7684\u77ff\u9504**
-Mining.Effect.0=\u8d85\u7ea7\u788e\u77f3\u673a (\u4e3b\u52a8\u6280\u80fd)
-Mining.Effect.1=\u901f\u5ea6+, 3\u500d\u6389\u843d\u7387
-Mining.Effect.2=\u53cc\u500d\u6389\u843d
-Mining.Effect.3=\u53cc\u500d\u7269\u54c1
-Mining.Effect.4=\u7206\u7834\u5f00\u91c7
-Mining.Effect.5=\u4f7f\u7528TNT\u70b8\u77ff\u65f6\u4f1a\u83b7\u5f97\u989d\u5916\u5956\u52b1
-Mining.Effect.6=\u5927\u53f7\u70b8\u5f39
-Mining.Effect.7=\u589e\u52a0TNT\u7206\u70b8\u8303\u56f4
-Mining.Effect.8=\u7206\u7834\u4e13\u5bb6
-Mining.Effect.9=\u51cf\u5c11\u6765\u81eaTNT\u7684\u4f24\u5bb3
+Mining.SubSkill.SuperBreaker.Name=\u8d85\u7ea7\u788e\u77f3\u673a (\u4e3b\u52a8\u6280\u80fd)
+Mining.SubSkill.SuperBreaker.Description=\u901f\u5ea6+, 3\u500d\u6389\u843d\u7387
+Mining.SubSkill.DoubleDrops.Name=\u53cc\u500d\u6389\u843d
+Mining.SubSkill.DoubleDrops.Description=\u53cc\u500d\u7269\u54c1
+Mining.SubSkill.BlastMining.Name=\u7206\u7834\u5f00\u91c7
+Mining.SubSkill.BlastMining.Description=\u4f7f\u7528TNT\u70b8\u77ff\u65f6\u4f1a\u83b7\u5f97\u989d\u5916\u5956\u52b1
+Mining.SubSkill.BiggerBombs.Name=\u5927\u53f7\u70b8\u5f39
+Mining.SubSkill.BiggerBombs.Description=\u589e\u52a0TNT\u7206\u70b8\u8303\u56f4
+Mining.SubSkill.DemolitionsExpertise.Name=\u7206\u7834\u4e13\u5bb6
+Mining.SubSkill.DemolitionsExpertise.Description=\u51cf\u5c11\u6765\u81eaTNT\u7684\u4f24\u5bb3
 Mining.Effect.Decrease=[[RED]]\u7206\u7834\u4e13\u5bb6\u4f24\u5bb3\u51cf\u5c11: [[YELLOW]]{0}
 Mining.Effect.DropChance=[[RED]]\u53cc\u500d\u6389\u843d\u51e0\u7387: [[YELLOW]]{0}
 Mining.Listener=\u6316\u77ff(Mining):
@@ -182,22 +182,22 @@ Mining.Blast.Radius.Increase=[[RED]]\u7206\u70b8\u534a\u5f84\u63d0\u5347: [[YELL
 Mining.Blast.Rank=[[RED]]\u7206\u7834\u5f00\u91c7: [[YELLOW]] \u6392\u540d {0}/8 [[GRAY]]({1})
 Mining.Blast.Other.On=Mining.Blast.Other.On=[[GREEN]]{0}[[DARK_GREEN]] \u4f7f\u7528\u4e86 [[RED]]\u7206\u7834\u5f00\u91c7!
 Mining.Blast.Refresh=[[GREEN]]\u4f60\u7684 [[YELLOW]]\u7206\u7834\u5f00\u91c7 [[GREEN]]\u6280\u80fd\u51b7\u5374\u5b8c\u6bd5!
-Repair.Effect.0=\u4fee\u7406
-Repair.Effect.1=\u4fee\u7406\u5de5\u5177\u548c\u88c5\u5907
-Repair.Effect.10=\u4fee\u7406\u9ec4\u91d1 ({0}+ SKILL)
-Repair.Effect.11=\u4fee\u7406\u9ec4\u91d1\u5de5\u5177\u548c\u88c5\u5907
-Repair.Effect.12=\u4fee\u7406\u94c1\u8d28\u7269\u54c1 ({0}+ SKILL)
-Repair.Effect.13=\u4fee\u7406\u94c1\u8d28\u5de5\u5177\u548c\u62a4\u7532
-Repair.Effect.14=\u4fee\u7406\u77f3\u5934\u7269\u54c1 ({0}+ SKILL)
-Repair.Effect.15=\u4fee\u7406\u77f3\u5934\u5de5\u5177
-Repair.Effect.2=\u4fee\u7406\u7cbe\u901a
-Repair.Effect.3=\u5df2\u589e\u52a0\u4fee\u7406\u6570\u91cf
-Repair.Effect.4=\u8d85\u7ea7\u4fee\u7406
-Repair.Effect.5=\u53cc\u500d\u6548\u679c
-Repair.Effect.6=\u94bb\u77f3\u4fee\u7406 ({0}+ SKILL)
-Repair.Effect.7=\u4fee\u7406\u94bb\u77f3\u5de5\u5177\u548c\u88c5\u5907
-Repair.Effect.8=\u79d8\u6cd5\u953b\u9020
-Repair.Effect.9=\u4fee\u7406\u9644\u9b54\u7269\u54c1
+Repair.SubSkill.Repair.Name=\u4fee\u7406
+Repair.SubSkill.Repair.Description=\u4fee\u7406\u5de5\u5177\u548c\u88c5\u5907
+Repair.SubSkill.GoldRepair.Name=\u4fee\u7406\u9ec4\u91d1 ({0}+ SKILL)
+Repair.SubSkill.GoldRepair.Description=\u4fee\u7406\u9ec4\u91d1\u5de5\u5177\u548c\u88c5\u5907
+Repair.SubSkill.IronRepair.Name=\u4fee\u7406\u94c1\u8d28\u7269\u54c1 ({0}+ SKILL)
+Repair.SubSkill.IronRepair.Description=\u4fee\u7406\u94c1\u8d28\u5de5\u5177\u548c\u62a4\u7532
+Repair.SubSkill.StoneRepair.Name=\u4fee\u7406\u77f3\u5934\u7269\u54c1 ({0}+ SKILL)
+Repair.SubSkill.StoneRepair.Description=\u4fee\u7406\u77f3\u5934\u5de5\u5177
+Repair.SubSkill.RepairMastery.Name=\u4fee\u7406\u7cbe\u901a
+Repair.SubSkill.RepairMastery.Description=\u5df2\u589e\u52a0\u4fee\u7406\u6570\u91cf
+Repair.SubSkill.SuperRepair.Name=\u8d85\u7ea7\u4fee\u7406
+Repair.SubSkill.SuperRepair.Description=\u53cc\u500d\u6548\u679c
+Repair.SubSkill.DiamondRepair.Name=\u94bb\u77f3\u4fee\u7406 ({0}+ SKILL)
+Repair.SubSkill.DiamondRepair.Description=\u4fee\u7406\u94bb\u77f3\u5de5\u5177\u548c\u88c5\u5907
+Repair.SubSkill.ArcaneForging.Name=\u79d8\u6cd5\u953b\u9020
+Repair.SubSkill.ArcaneForging.Description=\u4fee\u7406\u9644\u9b54\u7269\u54c1
 Repair.Error=[[DARK_RED]]mcMMO \u5728\u5c1d\u8bd5\u4fee\u7406\u6b64\u7269\u54c1\u65f6\u53d1\u751f\u4e86\u9519\u8bef!
 Repair.Listener.Anvil=[[DARK_RED]]\u4f60\u653e\u7f6e\u7684\u94c1\u65b9\u5757\u53ef\u4ee5\u7528\u6765\u4fee\u7406\u5de5\u5177\u548c\u9632\u5177.
 Repair.Listener=\u4fee\u7406\uff1a
@@ -222,10 +222,10 @@ Repair.Arcane.Lost=[[RED]]\u4f60\u7684\u6280\u80fd\u7b49\u7ea7\u4e0d\u8db3\u4ee5
 Repair.Arcane.Perfect=[[GREEN]]\u4f60\u6210\u529f\u5730\u4fdd\u7559\u4e86\u8fd9\u4ef6\u7269\u54c1\u7684\u9644\u9b54.
 Repair.Arcane.Rank=[[RED]]\u79d8\u6cd5\u953b\u9020: [[YELLOW]]\u7b49\u7ea7 {0}/4
 Salvage.Pretty.Name=\u5206\u89e3
-Salvage.Effect.0=\u8fdb\u9636\u5206\u89e3
-Salvage.Effect.1=\u5206\u89e3\u635f\u574f\u7684\u7269\u54c1
-Salvage.Effect.2=\u795e\u79d8\u5206\u89e3
-Salvage.Effect.3=\u4ece\u7269\u54c1\u4e2d\u62c6\u89e3\u51fa\u9644\u9b54
+Salvage.SubSkill.AdvancedSalvage.Name=\u8fdb\u9636\u5206\u89e3
+Salvage.SubSkill.AdvancedSalvage.Description=\u5206\u89e3\u635f\u574f\u7684\u7269\u54c1
+Salvage.SubSkill.ArcaneSalvaging.Name=\u795e\u79d8\u5206\u89e3
+Salvage.SubSkill.ArcaneSalvaging.Description=\u4ece\u7269\u54c1\u4e2d\u62c6\u89e3\u51fa\u9644\u9b54
 Salvage.Ability.Locked.0=\u80fd\u529b\u9501\u5b9a\u76f4\u81f3 {0}+ \u6280\u80fd\u7b49\u7ea7 (\u8fdb\u9636\u5206\u89e3)
 Salvage.Ability.Bonus.0=\u8fdb\u9636\u5206\u89e3
 Salvage.Ability.Bonus.1=\u6700\u5927\u9650\u5ea6\u56de\u6536 {0} \u635f\u574f\u7684\u7269\u54c1
@@ -255,14 +255,14 @@ Swords.Combat.Counter.Chance=[[RED]]\u53cd\u51fb\u51e0\u7387: [[YELLOW]]{0}
 Swords.Combat.Counter.Hit=[[DARK_RED]]\u4f60\u53cd\u51fb\u4e86\u5bf9\u624b!
 Swords.Combat.Countered=[[GREEN]]**\u53cd\u51fb\u4e86\u654c\u4eba**
 Swords.Combat.SS.Struck=[[DARK_RED]]\u53d1\u52a8\u5229\u5203\u7a81\u523a!
-Swords.Effect.0=\u53cd\u51fb
-Swords.Effect.1=\u683c\u6863\u65f6\u53cd\u5f39{0}\u4f24\u5bb3\u503c
-Swords.Effect.2=\u5229\u5203\u7a81\u523a (\u4e3b\u52a8\u6280\u80fd)
-Swords.Effect.3={0} \u653b\u51fb\u8303\u56f4, \u653e\u8840\u8303\u56f4
+Swords.SubSkill.CounterAttack.Name=\u53cd\u51fb
+Swords.SubSkill.CounterAttack.Description=\u683c\u6863\u65f6\u53cd\u5f39{0}\u4f24\u5bb3\u503c
+Swords.SubSkill.SerratedStrikes.Name=\u5229\u5203\u7a81\u523a (\u4e3b\u52a8\u6280\u80fd)
+Swords.SubSkill.SerratedStrikes.Description={0} \u653b\u51fb\u8303\u56f4, \u653e\u8840\u8303\u56f4
 Swords.Effect.4=\u5229\u5203\u7a81\u523a \u6d41\u8840\u4f24\u5bb3\u589e\u52a0
 Swords.Effect.5={0} \u6b21 \u6d41\u8840
-Swords.Effect.6=\u653e\u8840
-Swords.Effect.7=\u4ea7\u751f\u653e\u8840\u4f24\u5bb3
+Swords.SubSkill.Bleed.Name=\u653e\u8840
+Swords.SubSkill.Bleed.Description=\u4ea7\u751f\u653e\u8840\u4f24\u5bb3
 Swords.Listener=\u5251\u672f(Swords):
 Swords.SkillName=\u5251\u672f
 Swords.Skills.SS.Off=[[RED]]**\u5229\u5203\u7a81\u523a\u5df2\u7ecf\u7ed3\u675f\u4e86**
@@ -291,27 +291,27 @@ Taming.Ability.Locked.3=\u9501\u5b9a\u76f4\u5230 {0}+ \u6280\u80fd (\u5229\u722a
 Taming.Ability.Locked.4={0}+ \u7ea7\u540e\u89e3\u9501 (FAST FOOD SERVICE)
 Taming.Ability.Locked.5={0}+ \u7ea7\u540e\u89e3\u9501 (\u72ac\u795e\u7684\u5e87\u62a4)
 Taming.Combat.Chance.Gore=[[RED]]\u55dc\u8840\u51e0\u7387: [[YELLOW]]{0}
-Taming.Effect.0=\u9a6f\u517d\u77e5\u8bc6
-Taming.Effect.1=\u7528\u9aa8\u5934\u53f3\u952e\u5355\u51fb\u72fc\u6216\u8005\u8c79\u732b\u4ee5\u68c0\u67e5\u5b83\u4eec\u7684\u72b6\u51b5
-Taming.Effect.10=\u51b2\u51fb\u62b5\u6297
-Taming.Effect.11=\u7206\u70b8\u4f24\u5bb3\u51cf\u5c11
-Taming.Effect.12=\u91ce\u6027\u547c\u5524
-Taming.Effect.13=\u4e3a\u4f60\u53ec\u5524\u4e00\u53ea\u5ba0\u7269
-Taming.Effect.14=[[GRAY]]\u53ec\u5524 (\u8c79\u732b): \u624b\u91cc\u62ff\u7740 {0} \u6761\u9c7c,\u6309\u4f4f\u6f5c\u884c\u540c\u65f6\u5355\u51fb\u5de6\u952e\u53ec\u5524.
+Taming.SubSkill.BeastLore.Name=\u9a6f\u517d\u77e5\u8bc6
+Taming.SubSkill.BeastLore.Description=\u7528\u9aa8\u5934\u53f3\u952e\u5355\u51fb\u72fc\u6216\u8005\u8c79\u732b\u4ee5\u68c0\u67e5\u5b83\u4eec\u7684\u72b6\u51b5
+Taming.SubSkill.ShockProof.Name=\u51b2\u51fb\u62b5\u6297
+Taming.SubSkill.ShockProof.Description=\u7206\u70b8\u4f24\u5bb3\u51cf\u5c11
+Taming.SubSkill.CallOfTheWild.Name=\u91ce\u6027\u547c\u5524
+Taming.SubSkill.CallOfTheWild.Description=\u4e3a\u4f60\u53ec\u5524\u4e00\u53ea\u5ba0\u7269
+Taming.SubSkill.CallOfTheWild.Description.2=[[GRAY]]\u53ec\u5524 (\u8c79\u732b): \u624b\u91cc\u62ff\u7740 {0} \u6761\u9c7c,\u6309\u4f4f\u6f5c\u884c\u540c\u65f6\u5355\u51fb\u5de6\u952e\u53ec\u5524.
 Taming.Effect.15=[[GRAY]]\u53ec\u5524 (\u72fc): \u624b\u91cc\u62ff\u7740 {0} \u6839\u9aa8\u5934,\u6309\u4f4f\u6f5c\u884c\u540c\u65f6\u5355\u51fb\u5de6\u952e\u53ec\u5524.
-Taming.Effect.20=[[GRAY]]\u53ec\u5524 (\u9a6c): \u624b\u91cc\u62ff\u7740 {0} \u4e2a\u82f9\u679c,\u6309\u4f4f\u6f5c\u884c\u540c\u65f6\u5355\u51fb\u5de6\u952e\u53ec\u5524.
-Taming.Effect.16=\u5feb\u9910\u670d\u52a1
-Taming.Effect.17=\u4e00\u5b9a\u51e0\u7387\u4f7f\u72fc\u5728\u653b\u51fb\u65f6\u56de\u590d\u81ea\u8eab\u8840\u91cf
-Taming.Effect.18=\u72ac\u795e\u7684\u5e87\u62a4
-Taming.Effect.19=\u5df2\u88ab\u9b54\u6cd5 & \u4e2d\u6bd2\u6548\u679c\u6cbb\u6108
-Taming.Effect.2=\u55dc\u8840
-Taming.Effect.3=\u81f4\u547d\u653b\u51fb\u4f1a\u7ed9\u76ee\u6807\u653e\u8840
-Taming.Effect.4=\u5229\u722a
-Taming.Effect.5=\u4f24\u5bb3\u5956\u52b1
-Taming.Effect.6=\u73af\u5883\u611f\u77e5
-Taming.Effect.7=\u4ed9\u4eba\u638c/\u5ca9\u6d46 \u6050\u60e7\u75c7, \u514d\u75ab\u6389\u843d\u4f24\u5bb3
-Taming.Effect.8=\u539a\u5b9e\u7684\u76ae\u6bdb
-Taming.Effect.9=\u524a\u51cf\u53d7\u5230\u7684\u4f24\u5bb3, \u706b\u7130\u62b5\u6297
+Taming.SubSkill.Gore.Name0=[[GRAY]]\u53ec\u5524 (\u9a6c): \u624b\u91cc\u62ff\u7740 {0} \u4e2a\u82f9\u679c,\u6309\u4f4f\u6f5c\u884c\u540c\u65f6\u5355\u51fb\u5de6\u952e\u53ec\u5524.
+Taming.SubSkill.FastFoodService.Name=\u5feb\u9910\u670d\u52a1
+Taming.SubSkill.FastFoodService.Description=\u4e00\u5b9a\u51e0\u7387\u4f7f\u72fc\u5728\u653b\u51fb\u65f6\u56de\u590d\u81ea\u8eab\u8840\u91cf
+Taming.SubSkill.HolyHound.Name=\u72ac\u795e\u7684\u5e87\u62a4
+Taming.SubSkill.HolyHound.Description=\u5df2\u88ab\u9b54\u6cd5 & \u4e2d\u6bd2\u6548\u679c\u6cbb\u6108
+Taming.SubSkill.Gore.Name=\u55dc\u8840
+Taming.SubSkill.Gore.Description=\u81f4\u547d\u653b\u51fb\u4f1a\u7ed9\u76ee\u6807\u653e\u8840
+Taming.SubSkill.SharpenedClaws.Name=\u5229\u722a
+Taming.SubSkill.SharpenedClaws.Description=\u4f24\u5bb3\u5956\u52b1
+Taming.SubSkill.EnvironmentallyAware.Name=\u73af\u5883\u611f\u77e5
+Taming.SubSkill.EnvironmentallyAware.Description=\u4ed9\u4eba\u638c/\u5ca9\u6d46 \u6050\u60e7\u75c7, \u514d\u75ab\u6389\u843d\u4f24\u5bb3
+Taming.SubSkill.ThickFur.Name=\u539a\u5b9e\u7684\u76ae\u6bdb
+Taming.SubSkill.ThickFur.Description=\u524a\u51cf\u53d7\u5230\u7684\u4f24\u5bb3, \u706b\u7130\u62b5\u6297
 Taming.Listener.Wolf=[[DARK_GRAY]]\u4f60\u7684\u72fc\u98de\u901f\u5730\u8dd1\u56de\u4e86\u4f60\u8eab\u8fb9...
 Taming.Listener=\u9a6f\u517d(Taming):
 Taming.SkillName=\u9a6f\u517d
@@ -331,16 +331,16 @@ Unarmed.Ability.IronGrip.Attacker=[[RED]]\u4f60\u7684\u5bf9\u624b\u6709\u8d85\u5
 Unarmed.Ability.IronGrip.Defender=[[GREEN]]\u4f60\u7684\u8d85\u5f3a\u63e1\u529b\u62b5\u6321\u4f4f\u4e86\u5bf9\u65b9\u7684\u7f34\u68b0\u653b\u51fb!
 Unarmed.Ability.Lower=[[GRAY]]**\u4f60\u653e\u4e0b\u4e86\u4f60\u7684\u62f3\u5934**
 Unarmed.Ability.Ready=[[GREEN]]**\u4f60\u63e1\u7d27\u4e86\u4f60\u7684\u62f3\u5934**
-Unarmed.Effect.0=\u72c2\u66b4 (\u4e3b\u52a8\u6280\u80fd)
-Unarmed.Effect.1=+50% \u4f24\u5bb3, \u80fd\u7834\u574f\u786c\u5ea6\u4f4e\u7684\u65b9\u5757
-Unarmed.Effect.2=\u7f34\u68b0 (\u4ec5\u9650\u73a9\u5bb6)
-Unarmed.Effect.3=\u4f7f\u654c\u4eba\u624b\u4e2d\u6b66\u5668\u6389\u843d
-Unarmed.Effect.4=\u94c1\u8155\u6a21\u5f0f
-Unarmed.Effect.5=\u4f7f\u4f60\u7684\u62a4\u7532\u968f\u65f6\u95f4\u589e\u52a0\u800c\u589e\u5f3a
-Unarmed.Effect.6=\u7bad\u77e2\u504f\u5411
-Unarmed.Effect.7=\u8ba9\u7bad\u77e2\u504f\u5411
-Unarmed.Effect.8=\u8d85\u5f3a\u63e1\u529b
-Unarmed.Effect.9=\u9632\u6b62\u4f60\u88ab\u7f34\u68b0
+Unarmed.SubSkill.Berserk.Name=\u72c2\u66b4 (\u4e3b\u52a8\u6280\u80fd)
+Unarmed.SubSkill.Berserk.Description=+50% \u4f24\u5bb3, \u80fd\u7834\u574f\u786c\u5ea6\u4f4e\u7684\u65b9\u5757
+Unarmed.SubSkill.Disarm.Name=\u7f34\u68b0 (\u4ec5\u9650\u73a9\u5bb6)
+Unarmed.SubSkill.Disarm.Description=\u4f7f\u654c\u4eba\u624b\u4e2d\u6b66\u5668\u6389\u843d
+Unarmed.SubSkill.IronArmStyle.Name=\u94c1\u8155\u6a21\u5f0f
+Unarmed.SubSkill.IronArmStyle.Description=\u4f7f\u4f60\u7684\u62a4\u7532\u968f\u65f6\u95f4\u589e\u52a0\u800c\u589e\u5f3a
+Unarmed.SubSkill.ArrowDeflect.Name=\u7bad\u77e2\u504f\u5411
+Unarmed.SubSkill.ArrowDeflect.Description=\u8ba9\u7bad\u77e2\u504f\u5411
+Unarmed.SubSkill.IronGrip.Name=\u8d85\u5f3a\u63e1\u529b
+Unarmed.SubSkill.IronGrip.Description=\u9632\u6b62\u4f60\u88ab\u7f34\u68b0
 Unarmed.Listener=\u683c\u6597(Unarmed):
 Unarmed.SkillName=\u683c\u6597
 Unarmed.Skills.Berserk.Off=[[RED]]**\u72c2\u66b4\u6280\u80fd\u5df2\u7ed3\u675f**
@@ -354,12 +354,12 @@ Woodcutting.Ability.1=\u626b\u9664\u6811\u53f6
 Woodcutting.Ability.Chance.DDrop=[[RED]]\u53cc\u500d\u6389\u843d\u51e0\u7387: [[YELLOW]]{0}
 Woodcutting.Ability.Length=[[RED]]\u6811\u6728\u780d\u4f10\u8005\u6301\u7eed\u65f6\u95f4: [[YELLOW]]{0}\u79d2
 Woodcutting.Ability.Locked.0=\u9501\u5b9a\u72b6\u6001,\u76f4\u5230 {0}+ \u6280\u80fd (\u5439\u53f6\u673a)
-Woodcutting.Effect.0=\u7cbe\u9510\u4f10\u6728\u5de5(\u6280\u80fd)
-Woodcutting.Effect.1=\u7206\u53d1\u5f0f\u7684\u780d\u6811
-Woodcutting.Effect.2=\u4e71\u780d\u65e0\u53cc
-Woodcutting.Effect.3=\u626b\u9664\u6811\u53f6
-Woodcutting.Effect.4=\u53cc\u500d\u6389\u843d
-Woodcutting.Effect.5=\u53cc\u500d\u6389\u843d\u7269\u54c1
+Woodcutting.SubSkill.TreeFeller.Name=\u7cbe\u9510\u4f10\u6728\u5de5(\u6280\u80fd)
+Woodcutting.SubSkill.TreeFeller.Description=\u7206\u53d1\u5f0f\u7684\u780d\u6811
+Woodcutting.SubSkill.LeafBlower.Name=\u4e71\u780d\u65e0\u53cc
+Woodcutting.SubSkill.LeafBlower.Description=\u626b\u9664\u6811\u53f6
+Woodcutting.SubSkill.HarvestLumber.Name=\u53cc\u500d\u6389\u843d
+Woodcutting.SubSkill.HarvestLumber.Description=\u53cc\u500d\u6389\u843d\u7269\u54c1
 Woodcutting.Listener=\u4f10\u6728(Woodcutting):
 Woodcutting.SkillName=\u4f10\u6728
 Woodcutting.Skills.TreeFeller.Off=[[RED]]**\u4f10\u6728\u6280\u80fd\u5df2\u7ed3\u675f**

src/main/resources/locale/locale_zh_TW.properties

@@ -1,12 +1,12 @@
 Acrobatics.Ability.Proc=[[GREEN]]**\u5b8c\u7f8e\u8457\u9678**
 Acrobatics.Combat.Proc=[[GREEN]]**\u8ff4\u907f**
 Acrobatics.DodgeChance=[[RED]]\u8ff4\u907f\u6a5f\u7387: [[YELLOW]]{0}
-Acrobatics.Effect.0=\u7ffb\u6efe
-Acrobatics.Effect.1=\u6e1b\u5c11\u6216\u53d6\u6d88\u6389\u843d\u50b7\u5bb3
-Acrobatics.Effect.2=\u6f02\u4eae\u7ffb\u6efe
-Acrobatics.Effect.3=\u5169\u500d\u7684\u7ffb\u6efe\u6548\u679c
-Acrobatics.Effect.4=\u8ff4\u907f
-Acrobatics.Effect.5=\u6e1b\u5c11\u4e00\u534a\u7684\u50b7\u5bb3
+Acrobatics.SubSkill.Roll.Name=\u7ffb\u6efe
+Acrobatics.SubSkill.Roll.Description=\u6e1b\u5c11\u6216\u53d6\u6d88\u6389\u843d\u50b7\u5bb3
+Acrobatics.SubSkill.GracefulRoll.Name=\u6f02\u4eae\u7ffb\u6efe
+Acrobatics.SubSkill.GracefulRoll.Description=\u5169\u500d\u7684\u7ffb\u6efe\u6548\u679c
+Acrobatics.SubSkill.Dodge.Name=\u8ff4\u907f
+Acrobatics.SubSkill.Dodge.Description=\u6e1b\u5c11\u4e00\u534a\u7684\u50b7\u5bb3
 Acrobatics.Listener=\u96dc\u6280:
 Acrobatics.Roll.Chance=[[RED]]\u7ffb\u6efe\u6a5f\u7387: [[YELLOW]]{0}
 Acrobatics.Roll.GraceChance=[[RED]]\u6f02\u4eae\u7ffb\u6efe\u6a5f\u7387: [[YELLOW]]{0}
@@ -16,12 +16,12 @@ Acrobatics.Skillup=[[YELLOW]]\u96dc\u6280\u7b49\u7d1a\u4e0a\u5347\u4e86{0}\u7b49
 Archery.Combat.DazeChance=[[RED]]\u6688\u7729\u6a5f\u7387: [[YELLOW]]{0}
 Archery.Combat.RetrieveChance=[[RED]]\u56de\u6536\u7bad\u77e2\u7684\u6a5f\u7387: [[YELLOW]]{0}
 Archery.Combat.SkillshotBonus=[[RED]]\u6280\u8853\u5c04\u64ca\u734e\u52f5\u50b7\u5bb3: [[YELLOW]]{0}
-Archery.Effect.0=\u6280\u8853\u5c04\u64ca
-Archery.Effect.1=\u589e\u52a0\u5f13\u7bad\u50b7\u5bb3
-Archery.Effect.2=\u6688\u7729(\u9650\u5b9a\u73a9\u5bb6)
-Archery.Effect.3=\u8ff7\u60d1\u6575\u4eba\u4e26\u9020\u6210 {0}\u9ede\u50b7\u5bb3
-Archery.Effect.4=\u56de\u6536\u5f13\u7bad
-Archery.Effect.5=\u6709\u6a5f\u7387\u5f9e\u5c4d\u9ad4\u4e0a\u53d6\u5f97\u7bad\u77e2
+Archery.SubSkill.SkillShot.Name=\u6280\u8853\u5c04\u64ca
+Archery.SubSkill.SkillShot.Description=\u589e\u52a0\u5f13\u7bad\u50b7\u5bb3
+Archery.SubSkill.Daze.Name=\u6688\u7729(\u9650\u5b9a\u73a9\u5bb6)
+Archery.SubSkill.Daze.Description=\u8ff7\u60d1\u6575\u4eba\u4e26\u9020\u6210 {0}\u9ede\u50b7\u5bb3
+Archery.SubSkill.ArrowRetrieval.Name=\u56de\u6536\u5f13\u7bad
+Archery.SubSkill.ArrowRetrieval.Description=\u6709\u6a5f\u7387\u5f9e\u5c4d\u9ad4\u4e0a\u53d6\u5f97\u7bad\u77e2
 Archery.Listener=\u7bad\u8853:
 Archery.SkillName=\u7bad\u8853
 Archery.Skillup=[[YELLOW]]\u7bad\u8853\u6280\u80fd\u4e0a\u5347\u4e86 {0}! \u7e3d\u7b49\u7ea7 ({1})!
@@ -40,16 +40,16 @@ Axes.Combat.GI.Proc=[[GREEN]]**\u66b4\u529b\u6253\u64ca**
 Axes.Combat.GI.Struck=[[RED]]**\u88ab\u5f37\u529b\u653b\u64ca\u64ca\u4e2d**
 Axes.Combat.SS.Struck=[[DARK_RED]]\u88ab\u5288\u9871\u65ac\u64ca\u4e2d!
 Axes.Combat.SS.Length=[[RED]]\u5288\u9871\u65ac\u6301\u7e8c\u6642\u9593: [[YELLOW]]{0}s
-Axes.Effect.0=\u5288\u9871\u65ac (\u4e3b\u52d5\u6280\u80fd)
-Axes.Effect.1=\u9020\u6210\u7bc4\u570d\u50b7\u5bb3
-Axes.Effect.2=\u6703\u5fc3\u4e00\u64ca
-Axes.Effect.3=\u96d9\u500d\u50b7\u5bb3
-Axes.Effect.4=\u65a7\u982d\u7cbe\u901a
-Axes.Effect.5=\u589e\u52a0\u984d\u5916\u50b7\u5bb3
-Axes.Effect.6=\u9632\u5177\u7834\u58de\u8005
-Axes.Effect.7=\u7528\u8db3\u5920\u7684\u529b\u91cf\u4f86\u7a81\u7834\u88dd\u7532
-Axes.Effect.8=\u5f37\u529b\u653b\u64ca
-Axes.Effect.9=\u5c0d\u7121\u88dd\u7532\u6575\u4eba\u9020\u6210\u66f4\u591a\u50b7\u5bb3
+Axes.SubSkill.SkullSplitter.Name=\u5288\u9871\u65ac (\u4e3b\u52d5\u6280\u80fd)
+Axes.SubSkill.SkullSplitter.Description=\u9020\u6210\u7bc4\u570d\u50b7\u5bb3
+Axes.SubSkill.CriticalStrikes.Name=\u6703\u5fc3\u4e00\u64ca
+Axes.SubSkill.CriticalStrikes.Description=\u96d9\u500d\u50b7\u5bb3
+Axes.SubSkill.AxeMastery.Name=\u65a7\u982d\u7cbe\u901a
+Axes.SubSkill.AxeMastery.Description=\u589e\u52a0\u984d\u5916\u50b7\u5bb3
+Axes.SubSkill.ArmorImpact.Name=\u9632\u5177\u7834\u58de\u8005
+Axes.SubSkill.ArmorImpact.Description=\u7528\u8db3\u5920\u7684\u529b\u91cf\u4f86\u7a81\u7834\u88dd\u7532
+Axes.SubSkill.GreaterImpact.Name=\u5f37\u529b\u653b\u64ca
+Axes.SubSkill.GreaterImpact.Description=\u5c0d\u7121\u88dd\u7532\u6575\u4eba\u9020\u6210\u66f4\u591a\u50b7\u5bb3
 Axes.Listener=\u65a7\u6280:
 Axes.SkillName=\u65a7\u6280
 Axes.Skills.SS.Off=[[RED]]**\u5288\u9871\u65ac\u5df2\u7d50\u675f**
@@ -60,10 +60,10 @@ Axes.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]]\u4f7f\u7528\u4e86 [[RED]]\u52
 Axes.Skillup=[[YELLOW]]\u65a7\u6280\u4e0a\u5347\u4e86 {0}! \u7e3d\u7b49\u7d1a ({1})!
 Excavation.Ability.Lower=[[GRAY]]**\u4f60\u653e\u4e0b\u4e86\u4f60\u7684\u93df\u5b50**
 Excavation.Ability.Ready=[[GREEN]]**\u4f60\u63e1\u7dca\u4e86\u4f60\u7684\u93df\u5b50**
-Excavation.Effect.0=\u66b4\u8d70\u947d\u982d (\u4e3b\u52d5\u6280\u80fd)
-Excavation.Effect.1=3x \u6389\u843d\u7387, 3x \u7d93\u9a57\u503c, +\u901f\u5ea6
-Excavation.Effect.2=\u5bf6\u7269\u7375\u4eba
-Excavation.Effect.3=\u6316\u51fa\u5bf6\u85cf\u7684\u80fd\u529b
+Excavation.SubSkill.GigaDrillBreaker.Name=\u66b4\u8d70\u947d\u982d (\u4e3b\u52d5\u6280\u80fd)
+Excavation.SubSkill.GigaDrillBreaker.Description=3x \u6389\u843d\u7387, 3x \u7d93\u9a57\u503c, +\u901f\u5ea6
+Excavation.SubSkill.TreasureHunter.Name=\u5bf6\u7269\u7375\u4eba
+Excavation.SubSkill.TreasureHunter.Description=\u6316\u51fa\u5bf6\u85cf\u7684\u80fd\u529b
 Excavation.Effect.Length=[[RED]]\u66b4\u8d70\u947d\u982d\u6301\u7e8c\u6642\u9593: [[YELLOW]]{0}s
 Excavation.Listener=\u6316\u6398:
 Excavation.SkillName=\u6316\u6398
@@ -84,18 +84,18 @@ Fishing.Ability.TH.MagicRate=[[RED]]\u9b54\u6cd5\u7375\u4eba\u6a5f\u7387: [[YELL
 Fishing.Ability.Shake=[[RED]]\u6416\u6643\u6a5f\u7387: [[YELLOW]]{0}
 Fishing.Ability.IceFishing=[[RED]]\u51b0\u91e3: \u5728\u51b0\u4e0a\u91e3\u9b5a
 Fishing.Ability.FD=[[RED]]\u6f01\u4eba\u4fbf\u7576: [[YELLOW]]\u7b49\u7d1a {0}
-Fishing.Effect.0=\u5bf6\u7269\u7375\u4eba (\u88ab\u52d5\u6280\u80fd)
-Fishing.Effect.1=\u6389\u5230\u96dc\u7269
-Fishing.Effect.2=\u9b54\u6cd5\u7375\u4eba
-Fishing.Effect.3=\u627e\u5230\u9644\u9b54\u7269\u54c1
-Fishing.Effect.4=\u6416\u6643 (\u5c0d\u602a\u7269\u4f7f\u7528)
-Fishing.Effect.5=\u7528\u91e3\u7aff\u628a\u602a\u7269\u7684\u7269\u54c1\u53d6\u4e0b\u4f86
-Fishing.Effect.6=\u6f01\u4eba\u4fbf\u7576
-Fishing.Effect.7=\u98df\u7528\u9b5a\u98df\u54c1\u6642\u984d\u5916\u6062\u5fa9\u98fd\u98df\u5ea6
-Fishing.Effect.8=\u5782\u91e3\u5927\u5e2b
-Fishing.Effect.9=\u589e\u52a0\u5728\u91e3\u9b5a\u6642\u4e0a\u9264\u7684\u6a5f\u7387
-Fishing.Effect.10=\u51b0\u91e3
-Fishing.Effect.11=\u5141\u8a31\u4f60\u5728\u51b0\u5929\u96ea\u5730\u88e1\u91e3\u9b5a
+Fishing.SubSkill.TreasureHunter.Name=\u5bf6\u7269\u7375\u4eba (\u88ab\u52d5\u6280\u80fd)
+Fishing.SubSkill.TreasureHunter.Description=\u6389\u5230\u96dc\u7269
+Fishing.SubSkill.MagicHunter.Name=\u9b54\u6cd5\u7375\u4eba
+Fishing.SubSkill.MagicHunter.Description=\u627e\u5230\u9644\u9b54\u7269\u54c1
+Fishing.SubSkill.Shake.Name=\u6416\u6643 (\u5c0d\u602a\u7269\u4f7f\u7528)
+Fishing.SubSkill.Shake.Description=\u7528\u91e3\u7aff\u628a\u602a\u7269\u7684\u7269\u54c1\u53d6\u4e0b\u4f86
+Fishing.SubSkill.FishermansDiet.Name=\u6f01\u4eba\u4fbf\u7576
+Fishing.SubSkill.FishermansDiet.Description=\u98df\u7528\u9b5a\u98df\u54c1\u6642\u984d\u5916\u6062\u5fa9\u98fd\u98df\u5ea6
+Fishing.SubSkill.MasterAngler.Name=\u5782\u91e3\u5927\u5e2b
+Fishing.SubSkill.MasterAngler.Description=\u589e\u52a0\u5728\u91e3\u9b5a\u6642\u4e0a\u9264\u7684\u6a5f\u7387
+Fishing.SubSkill.IceFishing.Name=\u51b0\u91e3
+Fishing.SubSkill.IceFishing.Description=\u5141\u8a31\u4f60\u5728\u51b0\u5929\u96ea\u5730\u88e1\u91e3\u9b5a
 Fishing.Chance.Raining=[[BLUE]] \u5927\u91cf\u734e\u52f5
 Fishing.Listener=\u91e3\u9b5a:
 Fishing.Ability.TH.MagicFound=[[GRAY]]\u4f60\u611f\u53d7\u5230\u9b54\u529b\u7684\u6ce2\u52d5...
@@ -116,20 +116,20 @@ Herbalism.Ability.Lower=[[GRAY]]**\u4f60\u653e\u4e0b\u4e86\u4f60\u7684\u92e4\u98
 Herbalism.Ability.Ready=[[GREEN]]**\u4f60\u8209\u9ad8\u4e86\u4f60\u7684\u92e4\u982d**
 Herbalism.Ability.ShroomThumb.Chance=[[RED]]\u8611\u83c7\u624b\u89f8\u767c\u6a5f\u7387: [[YELLOW]]{0}
 Herbalism.Ability.ShroomThumb.Fail=[[RED]]**\u78e8\u83c7\u624b\u4f7f\u7528\u5931\u6557**
-Herbalism.Effect.0=\u7da0\u5316 (\u4e3b\u52d5\u6280\u80fd)
-Herbalism.Effect.1=\u6563\u64ad\u4e0a\u5e1d\u7684\u6069\u60e0,3\u500d\u6389\u843d\u7269
-Herbalism.Effect.2=\u7da0\u624b\u6307 (\u5c0f\u9ea5)
-Herbalism.Effect.3=\u6536\u6210\u6642\u81ea\u52d5\u7a2e\u690d\u5c0f\u9ea5
+Herbalism.SubSkill.GreenTerra.Name=\u7da0\u5316 (\u4e3b\u52d5\u6280\u80fd)
+Herbalism.SubSkill.GreenTerra.Description=\u6563\u64ad\u4e0a\u5e1d\u7684\u6069\u60e0,3\u500d\u6389\u843d\u7269
+Herbalism.SubSkill.GreenThumb.Name=\u7da0\u624b\u6307 (\u5c0f\u9ea5)
+Herbalism.SubSkill.GreenThumb.Description=\u6536\u6210\u6642\u81ea\u52d5\u7a2e\u690d\u5c0f\u9ea5
 Herbalism.Effect.4=\u7da0\u624b\u6307 (\u5927\u91cf)
-Herbalism.Effect.5=\u4f7f\u7528\u7a2e\u5b50\u8b93\u9d5d\u5375\u77f3\u8b8a\u9752\u82d4\u77f3,\u6216\u8b93\u6ce5\u571f\u8b8a\u8349\u5730
-Herbalism.Effect.6=\u8fb2\u592b\u79c1\u623f\u83dc
-Herbalism.Effect.7=\u98df\u7528\u8fb2\u98df\u54c1\u6642\u984d\u5916\u6062\u5fa9\u98fd\u98df\u5ea6
-Herbalism.Effect.8=\u96d9\u500d\u6389\u843d (\u6240\u6709\u7684\u690d\u7269)
-Herbalism.Effect.9=\u96d9\u500d\u6389\u843d\u7269\u54c1
-Herbalism.Effect.10=\u6d77\u502b\u7684\u795d\u798f
-Herbalism.Effect.11=\u4f7f\u4f60\u64c1\u6709\u5fae\u5c0f\u6a5f\u7387\u767c\u73fe\u7a00\u6709\u7269\u54c1
-Herbalism.Effect.12=\u8611\u83c7\u624b
-Herbalism.Effect.13=\u6563\u64ad\u83cc\u7d72\u9ad4\u81f3\u571f\u548c\u8349
+Herbalism.SubSkill.GreenThumb.Description.2=\u4f7f\u7528\u7a2e\u5b50\u8b93\u9d5d\u5375\u77f3\u8b8a\u9752\u82d4\u77f3,\u6216\u8b93\u6ce5\u571f\u8b8a\u8349\u5730
+Herbalism.SubSkill.FarmersDiet.Name=\u8fb2\u592b\u79c1\u623f\u83dc
+Herbalism.SubSkill.FarmersDiet.Description=\u98df\u7528\u8fb2\u98df\u54c1\u6642\u984d\u5916\u6062\u5fa9\u98fd\u98df\u5ea6
+Herbalism.SubSkill.DoubleDrops.Name=\u96d9\u500d\u6389\u843d (\u6240\u6709\u7684\u690d\u7269)
+Herbalism.SubSkill.DoubleDrops.Description=\u96d9\u500d\u6389\u843d\u7269\u54c1
+Herbalism.SubSkill.HylianLuck.Name=\u6d77\u502b\u7684\u795d\u798f
+Herbalism.SubSkill.HylianLuck.Description=\u4f7f\u4f60\u64c1\u6709\u5fae\u5c0f\u6a5f\u7387\u767c\u73fe\u7a00\u6709\u7269\u54c1
+Herbalism.SubSkill.ShroomThumb.Name=\u8611\u83c7\u624b
+Herbalism.SubSkill.ShroomThumb.Description=\u6563\u64ad\u83cc\u7d72\u9ad4\u81f3\u571f\u548c\u8349
 Herbalism.HylianLuck=[[GREEN]]\u8c50\u6536\u5973\u795e\u4eca\u65e5\u8207\u4f60\u540c\u5728!
 Herbalism.Listener=\u8349\u85e5\u5b78:
 Herbalism.SkillName=\u8349\u85e5\u5b78
@@ -144,16 +144,16 @@ Mining.Ability.Locked.1=\u9396\u5b9a\u76f4\u5230\u6280\u80fd {0}+  (\u5de8\u5927
 Mining.Ability.Locked.2=\u9396\u5b9a\u76f4\u5230\u6280\u80fd {0}+ (\u7206\u7834\u5c08\u5bb6)
 Mining.Ability.Lower=[[GRAY]]**\u4f60\u653e\u4e0b\u4e86\u4f60\u7684\u93ac\u5b50**
 Mining.Ability.Ready=[[GREEN]]**\u4f60\u63e1\u7dca\u8457\u4f60\u7684\u93ac\u5b50**
-Mining.Effect.0=\u8d85\u7d1a\u788e\u77f3\u6a5f (\u4e3b\u52d5\u6280\u80fd)
-Mining.Effect.1=\u901f\u5ea6+, 3\u500d\u6389\u843d\u7387
-Mining.Effect.2=\u96d9\u500d\u6389\u843d
-Mining.Effect.3=\u96d9\u500d\u6389\u843d\u7269\u54c1
-Mining.Effect.4=\u6316\u7926\u7206\u767c
-Mining.Effect.5=\u4f7f\u7528TNT\u6316\u7926\u6703\u7372\u5f97\u984d\u5916\u734e\u52f5
-Mining.Effect.6=\u5de8\u5927\u7206\u7834
-Mining.Effect.7=\u589e\u52a0TNT\u7206\u70b8\u7bc4\u570d
-Mining.Effect.8=\u7206\u7834\u5c08\u5bb6
-Mining.Effect.9=\u6e1b\u5c11\u4f86\u81eaTNT\u7684\u50b7\u5bb3
+Mining.SubSkill.SuperBreaker.Name=\u8d85\u7d1a\u788e\u77f3\u6a5f (\u4e3b\u52d5\u6280\u80fd)
+Mining.SubSkill.SuperBreaker.Description=\u901f\u5ea6+, 3\u500d\u6389\u843d\u7387
+Mining.SubSkill.DoubleDrops.Name=\u96d9\u500d\u6389\u843d
+Mining.SubSkill.DoubleDrops.Description=\u96d9\u500d\u6389\u843d\u7269\u54c1
+Mining.SubSkill.BlastMining.Name=\u6316\u7926\u7206\u767c
+Mining.SubSkill.BlastMining.Description=\u4f7f\u7528TNT\u6316\u7926\u6703\u7372\u5f97\u984d\u5916\u734e\u52f5
+Mining.SubSkill.BiggerBombs.Name=\u5de8\u5927\u7206\u7834
+Mining.SubSkill.BiggerBombs.Description=\u589e\u52a0TNT\u7206\u70b8\u7bc4\u570d
+Mining.SubSkill.DemolitionsExpertise.Name=\u7206\u7834\u5c08\u5bb6
+Mining.SubSkill.DemolitionsExpertise.Description=\u6e1b\u5c11\u4f86\u81eaTNT\u7684\u50b7\u5bb3
 Mining.Effect.Decrease=[[RED]]\u7206\u7834\u5c08\u5bb6\u50b7\u5bb3\u6e1b\u5c11: [[YELLOW]]{0}
 Mining.Effect.DropChance=[[RED]]\u96d9\u500d\u6389\u843d\u6a5f\u7387: [[YELLOW]]{0}
 Mining.Listener=\u6316\u7926:
@@ -170,24 +170,24 @@ Mining.Blast.Radius.Increase=[[RED]]\u7206\u70b8\u534a\u5f91\u63d0\u5347: [[YELL
 Mining.Blast.Rank=[[RED]]\u6316\u7926\u7206\u767c: [[YELLOW]] \u6392\u540d {0}/8 [[GRAY]]({1})
 Mining.Blast.Other.On=[[GREEN]]{0}[[DARK_GREEN]] \u4f7f\u7528\u4e86 [[RED]]\u6316\u7926\u7206\u767c!
 Mining.Blast.Refresh=[[GREEN]]\u4f60\u7684 [[YELLOW]]\u6316\u7926\u7206\u767c [[GREEN]]\u51b7\u537b\u6642\u9593\u5df2\u7d50\u675f!
-Repair.Effect.0=\u4fee\u7406
-Repair.Effect.1=\u4fee\u7406\u5de5\u5177\u548c\u88dd\u5099
-Repair.Effect.10=\u4fee\u7406\u9ec3\u91d1 ({0}+ SKILL)
-Repair.Effect.11=\u4fee\u7406\u91d1\u88fd\u5de5\u5177\u548c\u88dd\u5099
-Repair.Effect.12=\u4fee\u7406\u9435 ({0}+ SKILL)
-Repair.Effect.13=\u4fee\u7406\u9435\u88fd\u5de5\u5177\u548c\u88dd\u5099
-Repair.Effect.14=\u4fee\u7406\u77f3\u982d ({0}+ SKILL)
-Repair.Effect.15=\u4fee\u7406\u77f3\u88fd\u5de5\u5177
-Repair.Effect.2=\u4fee\u7406\u7cbe\u901a
-Repair.Effect.3=\u5df2\u589e\u52a0\u4fee\u7406\u6578\u91cf
-Repair.Effect.4=\u8d85\u7d1a\u4fee\u7406
-Repair.Effect.5=\u96d9\u500d\u6548\u679c
-Repair.Effect.6=\u947d\u77f3\u4fee\u7406 ({0}+ SKILL)
-Repair.Effect.7=\u4fee\u7406\u947d\u77f3\u5de5\u5177\u548c\u88dd\u5099
-Repair.Effect.8=\u79d8\u6cd5\u935b\u9020
-Repair.Effect.9=\u4fee\u7406\u9644\u9b54\u7269\u54c1
-Repair.Effect.16=\u56de\u6536 ({0}+ SKILL)
-Repair.Effect.17=\u56de\u6536\u5de5\u5177\u548c\u88dd\u7532
+Repair.SubSkill.Repair.Name=\u4fee\u7406
+Repair.SubSkill.Repair.Description=\u4fee\u7406\u5de5\u5177\u548c\u88dd\u5099
+Repair.SubSkill.GoldRepair.Name=\u4fee\u7406\u9ec3\u91d1 ({0}+ SKILL)
+Repair.SubSkill.GoldRepair.Description=\u4fee\u7406\u91d1\u88fd\u5de5\u5177\u548c\u88dd\u5099
+Repair.SubSkill.IronRepair.Name=\u4fee\u7406\u9435 ({0}+ SKILL)
+Repair.SubSkill.IronRepair.Description=\u4fee\u7406\u9435\u88fd\u5de5\u5177\u548c\u88dd\u5099
+Repair.SubSkill.StoneRepair.Name=\u4fee\u7406\u77f3\u982d ({0}+ SKILL)
+Repair.SubSkill.StoneRepair.Description=\u4fee\u7406\u77f3\u88fd\u5de5\u5177
+Repair.SubSkill.RepairMastery.Name=\u4fee\u7406\u7cbe\u901a
+Repair.SubSkill.RepairMastery.Description=\u5df2\u589e\u52a0\u4fee\u7406\u6578\u91cf
+Repair.SubSkill.SuperRepair.Name=\u8d85\u7d1a\u4fee\u7406
+Repair.SubSkill.SuperRepair.Description=\u96d9\u500d\u6548\u679c
+Repair.SubSkill.DiamondRepair.Name=\u947d\u77f3\u4fee\u7406 ({0}+ SKILL)
+Repair.SubSkill.DiamondRepair.Description=\u4fee\u7406\u947d\u77f3\u5de5\u5177\u548c\u88dd\u5099
+Repair.SubSkill.ArcaneForging.Name=\u79d8\u6cd5\u935b\u9020
+Repair.SubSkill.ArcaneForging.Description=\u4fee\u7406\u9644\u9b54\u7269\u54c1
+Repair.SubSkill.Salvage.Name=\u56de\u6536 ({0}+ SKILL)
+Repair.SubSkill.Salvage.Description=\u56de\u6536\u5de5\u5177\u548c\u88dd\u7532
 Repair.Error=[[DARK_RED]]mcMMO \u5728\u4fee\u6b63\u6642\u767c\u751f\u4e86\u932f\u8aa4!
 Repair.Listener.Anvil=[[DARK_RED]]\u4f60\u5df2\u7d93\u653e\u7f6e\u4e86\u4e00\u500b\u9435\u7827,\u4f60\u53ef\u4ee5\u5728\u9435\u7827\u4e0a\u4fee\u7406\u5de5\u5177\u548c\u88dd\u7532
 Repair.Listener.Anvil2=[[DARK_RED]]\u4f60\u653e\u7f6e\u4e86\u4e00\u500b\u56de\u6536\u53f0,\u4f7f\u7528\u5b83\u4f86\u56de\u6536\u5de5\u5177\u548c\u88dd\u7532
@@ -228,14 +228,14 @@ Swords.Combat.Counter.Chance=[[RED]]\u53cd\u64ca\u6a5f\u7387: [[YELLOW]]{0}
 Swords.Combat.Counter.Hit=[[DARK_RED]]\u4f60\u53cd\u64ca\u4e86\u5c0d\u624b!
 Swords.Combat.Countered=[[GREEN]]**\u53cd\u5c04\u4e86\u6575\u4eba\u7684\u653b\u64ca**
 Swords.Combat.SS.Struck=[[DARK_RED]]\u88ab\u5272\u88c2\u65ac\u653b\u64ca\uff01
-Swords.Effect.0=\u53cd\u64ca
-Swords.Effect.1=\u683c\u6a94\u6642\u53cd\u5f48{0}\u50b7\u5bb3\u503c
-Swords.Effect.2=\u5272\u88c2\u65ac (\u4e3b\u52d5\u6280\u80fd)
-Swords.Effect.3={0} \u50b7\u5bb3\u7bc4\u570d, \u653e\u8840\u7bc4\u570d
+Swords.SubSkill.CounterAttack.Name=\u53cd\u64ca
+Swords.SubSkill.CounterAttack.Description=\u683c\u6a94\u6642\u53cd\u5f48{0}\u50b7\u5bb3\u503c
+Swords.SubSkill.SerratedStrikes.Name=\u5272\u88c2\u65ac (\u4e3b\u52d5\u6280\u80fd)
+Swords.SubSkill.SerratedStrikes.Description={0} \u50b7\u5bb3\u7bc4\u570d, \u653e\u8840\u7bc4\u570d
 Swords.Effect.4=\u5272\u88c2\u65ac\u6d41\u8840\u50b7\u5bb3\u589e\u52a0
 Swords.Effect.5={0} \u6d41\u8840\u9031\u671f
-Swords.Effect.6=\u653e\u8840
-Swords.Effect.7=\u7522\u751f\u653e\u8840\u7684\u6301\u7e8c\u50b7\u5bb3
+Swords.SubSkill.Bleed.Name=\u653e\u8840
+Swords.SubSkill.Bleed.Description=\u7522\u751f\u653e\u8840\u7684\u6301\u7e8c\u50b7\u5bb3
 Swords.Listener=\u528d\u8853:
 Swords.SkillName=\u528d\u8853
 Swords.Skills.SS.Off=[[DARK_RED]]\u5272\u88c2\u65ac\u7d50\u675f\u4e86\uff01
@@ -264,27 +264,27 @@ Taming.Ability.Locked.3=\u9396\u5b9a\u76f4\u5230\u6280\u80fd {0}+  (\u5229\u722a
 Taming.Ability.Locked.4=\u9396\u5b9a\u76f4\u5230\u6280\u80fd {0}+  (\u5feb\u9910\u670d\u52d9)
 Taming.Ability.Locked.5=\u9396\u5b9a\u76f4\u5230\u6280\u80fd {0}+ (\u795e\u72ac)
 Taming.Combat.Chance.Gore=[[RED]]\u6d41\u8840\u6a5f\u7387: [[YELLOW]]{0}
-Taming.Effect.0=\u99b4\u7378\u4e4b\u80fd
-Taming.Effect.1=\u62ff\u8457\u9aa8\u982d\u4e26\u4f7f\u7528\u6ed1\u9f20\u53f3\u9375\u4f86\u78ba\u8a8d\u72fc\u8207\u5c71\u8c93\u7684\u72c0\u6cc1
-Taming.Effect.10=\u885d\u64ca\u683c\u64cb
-Taming.Effect.11=\u7206\u70b8\u50b7\u5bb3\u6e1b\u514d
-Taming.Effect.12=\u91ce\u6027\u547c\u558a
-Taming.Effect.13=\u70ba\u4f60\u81ea\u5df1\u53ec\u559a\u4e00\u96bb\u52d5\u7269
-Taming.Effect.14=[[GRAY]]\u53ec\u559a (\u5c71\u8c93): \u6309\u4f4fshift\u540c\u6642\u4e26\u6309\u4f4f\u5de6\u9375 \u9084\u9700\u8981\u62ff {0} \u689d\u9b5a\u5728\u624b\u88e1
+Taming.SubSkill.BeastLore.Name=\u99b4\u7378\u4e4b\u80fd
+Taming.SubSkill.BeastLore.Description=\u62ff\u8457\u9aa8\u982d\u4e26\u4f7f\u7528\u6ed1\u9f20\u53f3\u9375\u4f86\u78ba\u8a8d\u72fc\u8207\u5c71\u8c93\u7684\u72c0\u6cc1
+Taming.SubSkill.ShockProof.Name=\u885d\u64ca\u683c\u64cb
+Taming.SubSkill.ShockProof.Description=\u7206\u70b8\u50b7\u5bb3\u6e1b\u514d
+Taming.SubSkill.CallOfTheWild.Name=\u91ce\u6027\u547c\u558a
+Taming.SubSkill.CallOfTheWild.Description=\u70ba\u4f60\u81ea\u5df1\u53ec\u559a\u4e00\u96bb\u52d5\u7269
+Taming.SubSkill.CallOfTheWild.Description.2=[[GRAY]]\u53ec\u559a (\u5c71\u8c93): \u6309\u4f4fshift\u540c\u6642\u4e26\u6309\u4f4f\u5de6\u9375 \u9084\u9700\u8981\u62ff {0} \u689d\u9b5a\u5728\u624b\u88e1
 Taming.Effect.15=[[GRAY]]\u53ec\u559a (\u72fc): \u6309\u4f4fshift\u540c\u6642\u4e26\u6309\u4f4f\u5de6\u9375 \u9084\u9700\u8981\u62ff {0} \u6839\u9aa8\u982d\u5728\u624b\u88e1
-Taming.Effect.20=[[GRAY]]\u53ec\u559a (\u99ac): \u6309\u4f4fshift\u540c\u6642\u4e26\u6309\u4f4f\u5de6\u9375 \u9084\u9700\u8981\u62ff {0} \u500b\u860b\u679c\u5728\u624b\u88e1
-Taming.Effect.16=\u5feb\u9910\u670d\u52d9
-Taming.Effect.17=\u4e00\u5b9a\u6a5f\u7387\u4f7f\u72fc\u5728\u653b\u64ca\u6642\u6062\u5fa9\u8840\u91cf
-Taming.Effect.18=\u795e\u72ac
-Taming.Effect.19=\u6cd5\u8853&\u4e2d\u6bd2\u5c07\u6703\u89f8\u767c\u6cbb\u7642.
-Taming.Effect.2=\u6d41\u8840
-Taming.Effect.3=\u6703\u5fc3\u4e00\u64ca\u4f7f\u76ee\u6a19\u6d41\u8840
-Taming.Effect.4=\u5229\u722a
-Taming.Effect.5=\u50b7\u5bb3\u734e\u52f5
-Taming.Effect.6=\u5371\u6a5f\u610f\u8b58
-Taming.Effect.7=\u4ed9\u4eba\u638c/\u5ca9\u6f3f \u6050\u61fc\u75c7, \u514d\u75ab\u6389\u5165\u50b7\u5bb3
-Taming.Effect.8=\u6bdb\u76ae\u5f37\u5316
-Taming.Effect.9=\u524a\u6e1b\u706b\u7130\u50b7\u5bb3
+Taming.SubSkill.Gore.Name0=[[GRAY]]\u53ec\u559a (\u99ac): \u6309\u4f4fshift\u540c\u6642\u4e26\u6309\u4f4f\u5de6\u9375 \u9084\u9700\u8981\u62ff {0} \u500b\u860b\u679c\u5728\u624b\u88e1
+Taming.SubSkill.FastFoodService.Name=\u5feb\u9910\u670d\u52d9
+Taming.SubSkill.FastFoodService.Description=\u4e00\u5b9a\u6a5f\u7387\u4f7f\u72fc\u5728\u653b\u64ca\u6642\u6062\u5fa9\u8840\u91cf
+Taming.SubSkill.HolyHound.Name=\u795e\u72ac
+Taming.SubSkill.HolyHound.Description=\u6cd5\u8853&\u4e2d\u6bd2\u5c07\u6703\u89f8\u767c\u6cbb\u7642.
+Taming.SubSkill.Gore.Name=\u6d41\u8840
+Taming.SubSkill.Gore.Description=\u6703\u5fc3\u4e00\u64ca\u4f7f\u76ee\u6a19\u6d41\u8840
+Taming.SubSkill.SharpenedClaws.Name=\u5229\u722a
+Taming.SubSkill.SharpenedClaws.Description=\u50b7\u5bb3\u734e\u52f5
+Taming.SubSkill.EnvironmentallyAware.Name=\u5371\u6a5f\u610f\u8b58
+Taming.SubSkill.EnvironmentallyAware.Description=\u4ed9\u4eba\u638c/\u5ca9\u6f3f \u6050\u61fc\u75c7, \u514d\u75ab\u6389\u5165\u50b7\u5bb3
+Taming.SubSkill.ThickFur.Name=\u6bdb\u76ae\u5f37\u5316
+Taming.SubSkill.ThickFur.Description=\u524a\u6e1b\u706b\u7130\u50b7\u5bb3
 Taming.Listener.Wolf=[[DARK_GRAY]]\u4f60\u7684\u72fc\u8fc5\u901f\u5730\u56de\u5230\u4e86\u4f60\u7684\u8eab\u908a...
 Taming.Listener=\u99b4\u7378:
 Taming.SkillName=\u99b4\u7378
@@ -304,16 +304,16 @@ Unarmed.Ability.IronGrip.Attacker=[[RED]]\u4f60\u7684\u5c0d\u624b\u6709\u9435\u7
 Unarmed.Ability.IronGrip.Defender=[[GREEN]]\u4f60\u7684\u9435\u722a\u4f7f\u4f60\u7684\u6b66\u5668\u514d\u65bc\u88ab\u64ca\u843d!
 Unarmed.Ability.Lower=[[GRAY]]**\u4f60\u653e\u9b06\u4e86\u4f60\u7684\u62f3\u982d**
 Unarmed.Ability.Ready=[[GREEN]]**\u4f60\u7dca\u63e1\u8457\u4f60\u7684\u62f3\u982d**
-Unarmed.Effect.0=\u72c2\u66b4 (\u4e3b\u52d5\u6280\u80fd)
-Unarmed.Effect.1=+50%\u50b7\u5bb3 \u80fd\u7834\u58de\u786c\u5ea6\u4f4e\u7684\u65b9\u584a
-Unarmed.Effect.2=\u64ca\u843d\u6b66\u5668 (\u50c5\u9650\u65bc\u73a9\u5bb6)
-Unarmed.Effect.3=\u4f7f\u6575\u4eba\u624b\u4e2d\u6b66\u5668\u6389\u843d
-Unarmed.Effect.4=\u9435\u81c2\u98a8\u683c
-Unarmed.Effect.5=\u4f7f\u4f60\u7684\u88dd\u7532\u96a8\u6642\u9593\u589e\u52a0\u800c\u589e\u5f37
-Unarmed.Effect.6=\u64ca\u843d\u5f13\u7bad
-Unarmed.Effect.7=\u8b93\u5f13\u7bad\u504f\u5411
-Unarmed.Effect.8=\u9435\u722a
-Unarmed.Effect.9=\u9632\u6b62\u4f60\u7684\u6b66\u5668\u88ab\u64ca\u843d
+Unarmed.SubSkill.Berserk.Name=\u72c2\u66b4 (\u4e3b\u52d5\u6280\u80fd)
+Unarmed.SubSkill.Berserk.Description=+50%\u50b7\u5bb3 \u80fd\u7834\u58de\u786c\u5ea6\u4f4e\u7684\u65b9\u584a
+Unarmed.SubSkill.Disarm.Name=\u64ca\u843d\u6b66\u5668 (\u50c5\u9650\u65bc\u73a9\u5bb6)
+Unarmed.SubSkill.Disarm.Description=\u4f7f\u6575\u4eba\u624b\u4e2d\u6b66\u5668\u6389\u843d
+Unarmed.SubSkill.IronArmStyle.Name=\u9435\u81c2\u98a8\u683c
+Unarmed.SubSkill.IronArmStyle.Description=\u4f7f\u4f60\u7684\u88dd\u7532\u96a8\u6642\u9593\u589e\u52a0\u800c\u589e\u5f37
+Unarmed.SubSkill.ArrowDeflect.Name=\u64ca\u843d\u5f13\u7bad
+Unarmed.SubSkill.ArrowDeflect.Description=\u8b93\u5f13\u7bad\u504f\u5411
+Unarmed.SubSkill.IronGrip.Name=\u9435\u722a
+Unarmed.SubSkill.IronGrip.Description=\u9632\u6b62\u4f60\u7684\u6b66\u5668\u88ab\u64ca\u843d
 Unarmed.Listener=\u640f\u64ca:
 Unarmed.SkillName=\u640f\u64ca
 Unarmed.Skills.Berserk.Off=[[RED]]**\u72c2\u66b4\u5df2\u7ed3\u675f**
@@ -327,12 +327,12 @@ Woodcutting.Ability.1=\u6383\u9664\u8449\u5b50
 Woodcutting.Ability.Chance.DDrop=[[RED]]\u96d9\u500d\u6389\u843d\u6a5f\u7387: [[YELLOW]]{0}
 Woodcutting.Ability.Length=[[RED]]\u4f10\u6728\u5de5\u6301\u7e8c\u6642\u9593: [[YELLOW]]{0}s
 Woodcutting.Ability.Locked.0=\u9396\u5b9a\u76f4\u5230\u6280\u80fd {0}+ (\u79cb\u98a8\u6383\u843d\u8449)
-Woodcutting.Effect.0=\u4f10\u6728\u5de5(\u6280\u80fd)
-Woodcutting.Effect.1=\u7206\u767c\u780d\u6a39
-Woodcutting.Effect.2=\u79cb\u98a8\u6383\u843d\u8449
-Woodcutting.Effect.3=\u6383\u9664\u8449\u5b50
-Woodcutting.Effect.4=\u96d9\u500d\u6389\u843d
-Woodcutting.Effect.5=\u96d9\u500d\u6389\u843d\u7269\u54c1
+Woodcutting.SubSkill.TreeFeller.Name=\u4f10\u6728\u5de5(\u6280\u80fd)
+Woodcutting.SubSkill.TreeFeller.Description=\u7206\u767c\u780d\u6a39
+Woodcutting.SubSkill.LeafBlower.Name=\u79cb\u98a8\u6383\u843d\u8449
+Woodcutting.SubSkill.LeafBlower.Description=\u6383\u9664\u8449\u5b50
+Woodcutting.SubSkill.HarvestLumber.Name=\u96d9\u500d\u6389\u843d
+Woodcutting.SubSkill.HarvestLumber.Description=\u96d9\u500d\u6389\u843d\u7269\u54c1
 Woodcutting.Listener=\u4f10\u6728:
 Woodcutting.SkillName=\u4f10\u6728
 Woodcutting.Skills.TreeFeller.Off=[[RED]]**\u4f10\u6728\u5de5\u5df2\u7ed3\u675f**

src/main/resources/plugin.yml

@@ -568,11 +568,11 @@ permissions:
         description: Allows access to all Swords abilities
         children:
             mcmmo.ability.swords.bleed: true
-            mcmmo.ability.swords.counter: true
+            mcmmo.ability.swords.counterattack: true
             mcmmo.ability.swords.serratedstrikes: true
     mcmmo.ability.swords.bleed:
         description: Allows access to the Bleed ability
-    mcmmo.ability.swords.counter:
+    mcmmo.ability.swords.counterattack:
         description: Allows access to the Counter Attack ability
     mcmmo.ability.swords.serratedstrikes:
         description: Allows access to the Serrated Strikes ability
@@ -587,7 +587,7 @@ permissions:
             mcmmo.ability.taming.beastlore: true
             mcmmo.ability.taming.callofthewild.all: true
             mcmmo.ability.taming.environmentallyaware: true
-            mcmmo.ability.taming.fastfood: true
+            mcmmo.ability.taming.fastfoodservice: true
             mcmmo.ability.taming.gore: true
             mcmmo.ability.taming.holyhound: true
             mcmmo.ability.taming.sharpenedclaws: true
@@ -623,7 +623,7 @@ permissions:
         description: Allows players to summon Wolves with Call of the Wild
     mcmmo.ability.taming.environmentallyaware:
         description: Allows access to the Environmentally Aware ability
-    mcmmo.ability.taming.fastfood:
+    mcmmo.ability.taming.fastfoodservice:
         description: Allows access to the Fast Food Service ability
     mcmmo.ability.taming.gore:
         description: Allows access to the Gore ability
@@ -647,18 +647,18 @@ permissions:
         children:
             mcmmo.ability.unarmed.berserk: true
             mcmmo.ability.unarmed.blockcracker: true
-            mcmmo.ability.unarmed.ironarm: true
-            mcmmo.ability.unarmed.deflect: true
+            mcmmo.ability.unarmed.ironarmstyle: true
+            mcmmo.ability.unarmed.arrowdeflect: true
             mcmmo.ability.unarmed.disarm: true
             mcmmo.ability.unarmed.irongrip: true
     mcmmo.ability.unarmed.berserk:
         description: Allows access to the Berserker ability
     mcmmo.ability.unarmed.blockcracker:
         description: Allows access to the Block Cracker ability
-    mcmmo.ability.unarmed.ironarm:
+    mcmmo.ability.unarmed.ironarmstyle:
         description: Allows bonus damage from the Iron Arm ability
-    mcmmo.ability.unarmed.deflect:
-        description: Allows access to the Deflect ability
+    mcmmo.ability.unarmed.arrowdeflect:
+        description: Allows access to the Arrow Deflect ability
     mcmmo.ability.unarmed.disarm:
         description: Allows access to the Disarm ability
     mcmmo.ability.unarmed.irongrip: