Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into tridentsxbows

Changelog.txt

@@ -1,4 +1,7 @@
 Version 2.2.000
+    //TODO: Add level up milestone processing hooks
+    //TODO: Verify fishing durability change is removed
+
     Removed the mcimport command as its useless (was for mod configs)
     mcMMO-API is now the library used for mcMMO API
     Parts of the API have been migrated to mcMMO-API
@@ -100,8 +103,79 @@ Version 2.2.000
     Parties got unnecessarily complex in my absence, I have removed many party features in order to simplify parties and bring them closer to my vision. I have also added new features which should improve parties where it matters.
     About the removed party features, all the features I removed I consider poor quality features and I don't think they belong in mcMMO. Feel free to yell at me in discord if you disagree.
     I don't know what genius decided to make parties public by default, when I found out that parties had been changed to such a system I could barely contain my disgust. Parties are back to being private, you get invited by a party leader or party officer. That is the only way to join a party.
+Version 2.1.175
+
+Version 2.1.174
+    Some legacy color codes in our locale file were swapped to &-code equivalents (thanks ViaSnake)
+    Updated hu_HU locale (thanks andris155)
+    Updated ru locale (thanks imDaniX)
+    Updated fr locale (thanks Elikill58)
+    (API) Added SubSkillBlockEvent for some SubSkill events that have a block (eg: Green Thumb Block events)
+    (API) Green Thumb (Block) now fires a SubSkillBlockEvent which is cancellable
+    (API) Green Thumb (Plant) now fires SubSkillBlockEvent which is cancellable
+    (API) Shroom Thumb now fires a SubSkillBlockEvent which is cancellable
+
+    NOTE: A lot of sub-skills without random chance elements are missing events, this will be cleaned up in the near future. If you need something specific added sooner than that, post a GitHub issue for it and I'll patch it in.
+    I'm likely to separate Green Thumb into two distinct skills in an upcoming patch
+    Only Green Thumb/Shroom Thumb trigger the new SubSkillBlockEvent for now
+
+Version 2.1.173
+    The experience orbs dropped by Knock on Wood rank 2 during Tree Feller are now much less frequent but provide more XP
+    mcMMO no longer damages fishing rods or drains a player's hunger when fishing
+    Fixed a visual bug where players who had lucky perk were shown incorrect odds when using skill commands (such as /axes)
+    Updated ja_JP locale (thanks ViaSnake)
+    Fixed a bug where scoreboards were torn down inappropriately when moving to or from blacklisted worlds (thanks steve4744)
+    Updated Kyori's adventure library to 4.4.0 (used by mcMMO to handle text components)
+
+Version 2.1.172
+    Updated german locale (thanks TheBusyBiscuit)
+    Added 'mcmmo.broadcast.levelup' permission node, if a player lacks this node they will not have their level up milestones broadcast to chat, this is a default permission node
+    Power Levels are now included in level up broadcasts and they have their own settings (mirroring the existing settings for skill broadcasts)
+    Added 'General.Level_Up_Chat_Broadcasts.Broadcast_Powerlevels' to config.yml
+    Added 'General.Level_Up_Chat_Broadcasts.Broadcast_Powerlevels.Enabled' to config.yml
+    Added 'General.Level_Up_Chat_Broadcasts.Broadcast_Powerlevels.Milestone_Interval' to config.yml
+    Added 'General.Level_Up_Chat_Broadcasts.Broadcast_Powerlevels.Broadcast_Targets.Send_To_Console' to config.yml
+    Added 'General.Level_Up_Chat_Broadcasts.Broadcast_Powerlevels.Broadcast_Targets.Only_Party_Members' to config.yml
+    Added 'General.Level_Up_Chat_Broadcasts.Broadcast_Powerlevels.Broadcast_Targets.Only_Same_World' to config.yml
+    Added 'General.Level_Up_Chat_Broadcasts.Broadcast_Powerlevels.Broadcast_Targets.Distance_Restrictions.Restrict_Distance' to config.yml
+    Added 'General.Level_Up_Chat_Broadcasts.Broadcast_Powerlevels.Broadcast_Targets.Distance_Restrictions.Restricted_Radius' to config.yml
+    Added 'Broadcasts.PowerLevelUpMilestone' to locale
+    You can now disable the XP orbs from being dropped when Knock On Wood triggers during Tree Feller
+    Added 'Skills.Woodcutting.TreeFeller.Knock_On_Wood.Add_XP_Orbs_To_Drops' to advanced.yml
+    Changed Fists to not be capitalized (en_US) when lowering/readying berserk
+    SkillActivationPerkEvent can now be called in async threads (thanks electronicboy)
+    Removed a few never implemented settings from Skills.Woodcutting.TreeFeller in advanced.yml
+    Updated bStats (thanks TheBusyBiscuit)
+    Fixed some incorrect reporting to bStats (I'm so dyslexic...)
+
+    NOTES:
+    The new 'mcmmo.broadcast.levelup' node is a default node included under the 'mcmmo.defaults' node umbrella, you shouldn't have to give this to your players unless they don't have access to 'mcmmo.defaults'
+    If you don't have a permission plugin you don't need to worry, players will have this node by default in that case
+    There are situations where level up broadcasts will be skipped, for example if you go from level 0 -> 101 via addlevels or mmmoedit, and your broadcast interval is 100, it will be skipped as 101 falls out of this interval, this kind of skip only applies to command based leveling. Players gaining levels naturally should never have their broadcasts skipped. I'll fix this particular interaction in the future so that command based leveling never skips over milestone broadcasts, but for now it does.
+
 Version 2.1.171
+    Fixed a bug where arrows shot by infinite bow enchant would duplicate
+    Fixed a bug where Archery XP would calculate incorrectly
     Axes can now replant cocoa plants (thanks Lyther)
+    Players who level up at certain milestones have their level ups broadcast to the server (very configurable and optional, see notes)
+    New locale string 'Broadcasts.LevelUpMilestone'
+    Added 'General.Level_Up_Chat_Broadcasts.Enabled' to config.yml
+    Added 'General.Level_Up_Chat_Broadcasts.Milestone_Interval' to config.yml
+    Added 'General.Level_Up_Chat_Broadcasts.Broadcast_Targets.Send_To_Console' to config.yml
+    Added 'General.Level_Up_Chat_Broadcasts.Broadcast_Targets.Only_Party_Members' to config.yml
+    Added 'General.Level_Up_Chat_Broadcasts.Broadcast_Targets.Only_Same_World' to config.yml
+    Added 'General.Level_Up_Chat_Broadcasts.Broadcast_Targets.Distance_Restrictions.Restrict_Distance' to config.yml
+    Added 'General.Level_Up_Chat_Broadcasts.Broadcast_Targets.Distance_Restrictions.Restricted_Radius' to config.yml
+
+    NOTES:
+    The new broadcast system is very configurable, you could set the milestone interval to 1 if you want players to always be informed when someone levels up
+    With default settings, messages are broadcast to all players on all worlds and to the server console when a player hits a level up that is a 100 interval, for example level 100, 300, 600, 2200 would all qualify
+    You can change the settings to specify who receives these messages or turn the whole system off
+    The message is customizable via locale: https://mcmmo.org/wiki/Locale
+    There are comments in config.yml above each setting (as long as YAML doesn't move comments around chaotically...) that explain each setting
+    In case your comments are missing, here's what they look like by default: https://gist.github.com/nossr50/baf656477c75663e9e2f9284acee8d67
+
+
 Version 2.1.170
     Reverted a change that broke compatibility with the mcMMO papi ecloud thingy
 

pom.xml

@@ -110,6 +110,7 @@
                             <include>net.kyori:adventure-platform-viaversion</include>
                             <include>net.kyori:adventure-platform-facet</include>
                             <include>net.kyori:adventure-nbt</include>
+                            <include>net.kyori:adventure-key</include>
                             <include>net.kyori:examination-api</include>
                             <include>net.kyori:examination-string</include>
                             <include>net.kyori:adventure-text-serializer-legacy</include>
@@ -158,7 +159,7 @@
                         </relocation>
                         <relocation>
                             <pattern>org.bstats</pattern>
-                            <shadedPattern>com.gmail.nossr50.mcmmo.metrics.bstat</shadedPattern>
+                            <shadedPattern>com.gmail.nossr50.mcmmo.metrics.bstats</shadedPattern>
                         </relocation>
                     </relocations>
                 </configuration>
@@ -234,17 +235,27 @@
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-serializer-gson</artifactId>
-            <version>4.3.0</version>
+            <version>4.4.0</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-api</artifactId>
-            <version>4.3.0</version>
+            <version>4.4.0</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-nbt</artifactId>
-            <version>4.3.0</version>
+            <version>4.4.0</version>
+        </dependency>
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-key</artifactId>
+            <version>4.4.0</version>
+        </dependency>
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-text-serializer-gson-legacy-impl</artifactId>
+            <version>4.4.0</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
@@ -261,11 +272,6 @@
             <artifactId>adventure-platform-common</artifactId>
             <version>4.0.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>net.kyori</groupId>
-            <artifactId>adventure-text-serializer-gson-legacy-impl</artifactId>
-            <version>4.3.0</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.maven.scm</groupId>
             <artifactId>maven-scm-provider-gitexe</artifactId>
@@ -274,7 +280,7 @@
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>1.4</version>
+            <version>1.8</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

src/main/java/com/gmail/nossr50/commands/CommandManager.java

@@ -84,7 +84,7 @@ public class CommandManager {
 
     private void validatePermission(@NotNull String permissionNode, @NotNull Permissible permissible) {
         if(!permissible.hasPermission(permissionNode)) {
-            throw new ConditionFailedException("You do not have the appropriate permission to use this command.");
+            throw new ConditionFailedException(LocaleLoader.getString("mcMMO.NoPermission"));
         }
     }
 
@@ -97,7 +97,7 @@ public class CommandManager {
 
     public void validateLoadedData(@NotNull Player player) {
         if(mcMMO.getUserManager().queryPlayer(player) == null) {
-            throw new ConditionFailedException("Your mcMMO player data has not yet loaded!");
+            throw new ConditionFailedException(LocaleLoader.getString("Profile.PendingLoad"));
         }
     }
 

src/main/java/com/gmail/nossr50/commands/chat/AdminChatCommand.java

@@ -3,6 +3,7 @@ package com.gmail.nossr50.commands.chat;
 import co.aikar.commands.BaseCommand;
 import co.aikar.commands.BukkitCommandIssuer;
 import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandPermission;
 import co.aikar.commands.annotation.Conditions;
 import co.aikar.commands.annotation.Default;
 import com.gmail.nossr50.commands.CommandManager;
@@ -12,6 +13,7 @@ import com.gmail.nossr50.util.player.UserManager;
 import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.jetbrains.annotations.NotNull;
 
+@CommandPermission("mcmmo.chat.adminchat")
 @CommandAlias("ac|a|adminchat|achat") //Kept for historical reasons
 public class AdminChatCommand extends BaseCommand {
     private final @NotNull mcMMO pluginRef;

src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java

@@ -3,6 +3,7 @@ package com.gmail.nossr50.commands.chat;
 import co.aikar.commands.BaseCommand;
 import co.aikar.commands.BukkitCommandIssuer;
 import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandPermission;
 import co.aikar.commands.annotation.Conditions;
 import co.aikar.commands.annotation.Default;
 import com.gmail.nossr50.commands.CommandManager;
@@ -16,6 +17,7 @@ import com.neetgames.mcmmo.player.OnlineMMOPlayer;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
+@CommandPermission("mcmmo.chat.partychat")
 @CommandAlias("pc|p|partychat|pchat") //Kept for historical reasons
 public class PartyChatCommand extends BaseCommand {
     private final @NotNull mcMMO pluginRef;

src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java

@@ -1,10 +1,13 @@
 package com.gmail.nossr50.commands.experience;
 
+import com.gmail.nossr50.datatypes.experience.XPGainReason;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.Permissions;
 import com.neetgames.mcmmo.skill.RootSkill;
+import com.gmail.nossr50.util.player.UserManager;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -29,7 +32,13 @@ public class AddlevelsCommand extends ExperienceCommand {
             return;
         }
 
+        McMMOPlayer mmoPlayer = UserManager.getPlayer(player);
+
+        if(mmoPlayer == null) {
             EventUtils.tryLevelChangeEvent(player, rootSkill, value, xpRemoved, true, XPGainReason.COMMAND);
+        } else {
+            EventUtils.tryLevelChangeEvent(mmoPlayer, skill, value, xpRemoved, true, XPGainReason.COMMAND);
+        }
     }
 
     @Override

src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java

@@ -1,10 +1,13 @@
 package com.gmail.nossr50.commands.experience;
 
+import com.gmail.nossr50.datatypes.experience.XPGainReason;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.Permissions;
 import com.neetgames.mcmmo.skill.RootSkill;
+import com.gmail.nossr50.util.player.UserManager;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -35,9 +38,16 @@ public class MmoeditCommand extends ExperienceCommand {
             return;
         }
 
+        McMMOPlayer mmoPlayer = UserManager.getPlayer(player);
+
+        if(mmoPlayer != null) {
+            EventUtils.tryLevelEditEvent(mmoPlayer, skill, value, xpRemoved, value > skillLevel, XPGainReason.COMMAND, skillLevel);
+        } else {
             EventUtils.tryLevelEditEvent(player, rootSkill, value, xpRemoved, value > skillLevel, XPGainReason.COMMAND, skillLevel);
         }
 
+    }
+
     @Override
     protected void handlePlayerMessageAll(Player player, int value, boolean isSilent) {
         if(isSilent)

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

@@ -451,23 +451,6 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
             reason.add("Skills.Woodcutting.HarvestLumber.MaxBonusLevel should be at least 1!");
         }
 
-        /* KRAKEN */
-        if (getKrakenTriesBeforeRelease() < 1) {
-            reason.add("Kraken.Tries_Before_Release should be at least 1!");
-        }
-
-        if (getKrakenHealth() < 1) {
-            reason.add("Kraken.Health should be at least 1!");
-        }
-
-        if (getKrakenAttackInterval() < 1) {
-            reason.add("Kraken.Attack_Interval_Seconds should be at least 1!");
-        }
-
-        if (getKrakenAttackDamage() < 1) {
-            reason.add("Kraken.Attack_Damage should be at least 1!");
-        }
-
         return noErrorsInConfig(reason);
     }
 
@@ -835,19 +818,5 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
     public boolean getDisarmProtected() { return config.getBoolean("Skills.Unarmed.Disarm.AntiTheft", false); }
 
     /* WOODCUTTING */
-    /*public int getLeafBlowUnlockLevel() { return config.getInt("Skills.Woodcutting.LeafBlower.UnlockLevel", 100); }*/
+    public boolean isKnockOnWoodXPOrbEnabled() { return config.getBoolean("Skills.Woodcutting.TreeFeller.Knock_On_Wood.Add_XP_Orbs_To_Drops", true); }
-
-    /* KRAKEN STUFF */
-    public boolean getKrakenEnabled() { return config.getBoolean("Kraken.Enabled", true); }
-    public int getKrakenTriesBeforeRelease() { return config.getInt("Kraken.Tries_Before_Release", 50); }
-    public double getKrakenHealth() { return config.getDouble("Kraken.Health", 50.0D); }
-    public String getKrakenName() { return config.getString("Kraken.Name", "The Kraken"); }
-    public int getKrakenAttackInterval() { return config.getInt("Kraken.Attack_Interval_Seconds", 1); }
-    public double getKrakenAttackDamage() { return config.getDouble("Kraken.Attack_Damage", 1.0D); }
-    public boolean getKrakenGlobalEffectsEnabled() { return config.getBoolean("Kraken.Global_Effects", false); }
-    public boolean getKrakenEscapeAllowed() { return config.getBoolean("Kraken.Allow_Escaping", false); }
-    public String getServerUnleashMessage() { return config.getString("Kraken.Unleashed_Message.Server", ""); }
-    public String getPlayerUnleashMessage() { return config.getString("Kraken.Unleashed_Message.Player", ""); }
-    public String getPlayerDefeatMessage() { return config.getString("Kraken.Defeated_Message.Killed", ""); }
-    public String getPlayerEscapeMessage() { return config.getString("Kraken.Defeated_Message.Escape", ""); }
 }

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

@@ -596,4 +596,20 @@ public class Config extends AutoUpdateConfigLoader {
     public boolean playerJoinEventInfo() { return config.getBoolean("General.EventInfoOnPlayerJoin", true);}
     public boolean adminNotifications() { return config.getBoolean("General.AdminNotifications", true);}
 
+    public boolean shouldLevelUpBroadcasts() { return config.getBoolean("General.Level_Up_Chat_Broadcasts.Enabled", true); }
+    public boolean shouldLevelUpBroadcastToConsole() { return config.getBoolean("General.Level_Up_Chat_Broadcasts.Broadcast_Targets.Send_To_Console", true); }
+    public boolean isLevelUpBroadcastsPartyMembersOnly() { return config.getBoolean("General.Level_Up_Chat_Broadcasts.Broadcast_Targets.Only_Party_Members", false); }
+    public boolean isLevelUpBroadcastsSameWorldOnly() { return config.getBoolean("General.Level_Up_Chat_Broadcasts.Broadcast_Targets.Only_Same_World", false); }
+    public boolean shouldLevelUpBroadcastsRestrictDistance() { return config.getBoolean("General.Level_Up_Chat_Broadcasts.Broadcast_Targets.Distance_Restrictions.Restrict_Distance", false); }
+    public int getLevelUpBroadcastRadius() { return config.getInt("General.Level_Up_Chat_Broadcasts.Broadcast_Targets.Distance_Restrictions.Restricted_Radius", 100); }
+    public int getLevelUpBroadcastInterval() { return config.getInt("General.Level_Up_Chat_Broadcasts.Milestone_Interval", 100); }
+
+    public boolean shouldPowerLevelUpBroadcasts() { return config.getBoolean("General.Level_Up_Chat_Broadcasts.Broadcast_Powerlevels.Enabled", true); }
+    public boolean shouldPowerLevelUpBroadcastToConsole() { return config.getBoolean("General.Level_Up_Chat_Broadcasts.Broadcast_Powerlevels.Broadcast_Targets.Send_To_Console", true); }
+    public boolean isPowerLevelUpBroadcastsPartyMembersOnly() { return config.getBoolean("General.Level_Up_Chat_Broadcasts.Broadcast_Powerlevels.Broadcast_Targets.Only_Party_Members", false); }
+    public boolean isPowerLevelUpBroadcastsSameWorldOnly() { return config.getBoolean("General.Level_Up_Chat_Broadcasts.Broadcast_Powerlevels.Broadcast_Targets.Only_Same_World", false); }
+    public boolean shouldPowerLevelUpBroadcastsRestrictDistance() { return config.getBoolean("General.Level_Up_Chat_Broadcasts.Broadcast_Powerlevels.Broadcast_Targets.Distance_Restrictions.Restrict_Distance", false); }
+    public int getPowerLevelUpBroadcastRadius() { return config.getInt("General.Level_Up_Chat_Broadcasts.Broadcast_Powerlevels.Broadcast_Targets.Distance_Restrictions.Restricted_Radius", 100); }
+    public int getPowerLevelUpBroadcastInterval() { return config.getInt("General.Level_Up_Chat_Broadcasts.Broadcast_Powerlevels.Milestone_Interval", 100); }
+
 }

src/main/java/com/gmail/nossr50/datatypes/LevelUpBroadcastPredicate.java

@@ -0,0 +1,100 @@
+package com.gmail.nossr50.datatypes;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.player.UserManager;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.function.Predicate;
+
+//TODO: Allow for offline players to broadcast
+public class LevelUpBroadcastPredicate<T extends CommandSender> implements Predicate<T> {
+
+    private final @NotNull T broadcaster;
+
+    public LevelUpBroadcastPredicate(@NotNull T broadcaster) {
+        this.broadcaster = broadcaster;
+    }
+
+    @Override
+    public boolean test(@NotNull T t) {
+        Player broadcastingPlayer = (Player) broadcaster; //Always a player no need to check cast
+
+        //Broadcaster should be online
+        if(!broadcastingPlayer.isOnline()) {
+            return false;
+        }
+
+        McMMOPlayer mmoBroadcastingPlayer = UserManager.getPlayer(broadcastingPlayer);
+
+        if(mmoBroadcastingPlayer == null) {
+            //This should never be null, but just in case...
+            mcMMO.p.getLogger().severe("McMMOPlayer was null for broadcaster in LevelUpBroadcastPredicate when it should never be null!");
+            return false;
+        }
+
+        if(t instanceof Player) {
+            Player listeningPlayer = (Player) t;
+
+            //Party Member Check
+            if(Config.getInstance().isLevelUpBroadcastsPartyMembersOnly()) {
+                McMMOPlayer mmoListeningPlayer = UserManager.getPlayer(listeningPlayer);
+
+                if(mmoListeningPlayer == null) {
+                    return false; //No profile so therefor no party
+                }
+
+                Party playerWhoLeveledParty = mmoBroadcastingPlayer.getParty();
+                Party broadcastRecipientParty = mmoListeningPlayer.getParty();
+
+                if(playerWhoLeveledParty == null || broadcastRecipientParty == null) {
+                    return false; //No party on either player when being in the same party is required
+                }
+
+                if(!playerWhoLeveledParty.equals(broadcastRecipientParty)) {
+                    return false; //Not in the same party when it is required
+                }
+            }
+
+            //Same world check
+            if(isLevelUpBroadcastsSameWorldOnly()) {
+                if(!mmoBroadcastingPlayer.getPlayer().getWorld().equals(listeningPlayer.getWorld())) {
+                    return false; //Not in the same world when its required
+                }
+
+                //Distance checks
+                if(Config.getInstance().shouldLevelUpBroadcastsRestrictDistance()) {
+                    if(!Misc.isNear(mmoBroadcastingPlayer.getPlayer().getLocation(), listeningPlayer.getLocation(), Config.getInstance().getLevelUpBroadcastRadius())) {
+                        return false;
+                    }
+                }
+            }
+
+            //Visibility checks
+            if(!listeningPlayer.canSee(mmoBroadcastingPlayer.getPlayer())) {
+                return false; //Player who leveled should be invisible to this player so don't send the message
+            }
+
+            return true;
+        } else {
+            //Send out to console
+            return Config.getInstance().shouldLevelUpBroadcastToConsole();
+        }
+    }
+
+    private static boolean isLevelUpBroadcastsSameWorldOnly() {
+        return Config.getInstance().isLevelUpBroadcastsSameWorldOnly();
+    }
+
+    @Override
+    public String toString() {
+        return "LevelUpBroadcastPredicate{" +
+                "broadcaster=" + broadcaster +
+                '}';
+    }
+}

src/main/java/com/gmail/nossr50/datatypes/PowerLevelUpBroadcastPredicate.java

@@ -0,0 +1,100 @@
+package com.gmail.nossr50.datatypes;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.player.UserManager;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.function.Predicate;
+
+//TODO: Allow for offline players to broadcast
+public class PowerLevelUpBroadcastPredicate<T extends CommandSender> implements Predicate<T> {
+
+    private final @NotNull T broadcaster;
+
+    public PowerLevelUpBroadcastPredicate(@NotNull T broadcaster) {
+        this.broadcaster = broadcaster;
+    }
+
+    @Override
+    public boolean test(@NotNull T t) {
+        Player broadcastingPlayer = (Player) broadcaster; //Always a player no need to check cast
+
+        //Broadcaster should be online
+        if(!broadcastingPlayer.isOnline()) {
+            return false;
+        }
+
+        McMMOPlayer mmoBroadcastingPlayer = UserManager.getPlayer(broadcastingPlayer);
+
+        if(mmoBroadcastingPlayer == null) {
+            //This should never be null, but just in case...
+            mcMMO.p.getLogger().severe("McMMOPlayer was null for broadcaster in LevelUpBroadcastPredicate when it should never be null!");
+            return false;
+        }
+
+        if(t instanceof Player) {
+            Player listeningPlayer = (Player) t;
+
+            //Party Member Check
+            if(Config.getInstance().isPowerLevelUpBroadcastsPartyMembersOnly()) {
+                McMMOPlayer mmoListeningPlayer = UserManager.getPlayer(listeningPlayer);
+
+                if(mmoListeningPlayer == null) {
+                    return false; //No profile so therefor no party
+                }
+
+                Party playerWhoLeveledParty = mmoBroadcastingPlayer.getParty();
+                Party broadcastRecipientParty = mmoListeningPlayer.getParty();
+
+                if(playerWhoLeveledParty == null || broadcastRecipientParty == null) {
+                    return false; //No party on either player when being in the same party is required
+                }
+
+                if(!playerWhoLeveledParty.equals(broadcastRecipientParty)) {
+                    return false; //Not in the same party when it is required
+                }
+            }
+
+            //Same world check
+            if(isPowerLevelUpBroadcastsSameWorldOnly()) {
+                if(!mmoBroadcastingPlayer.getPlayer().getWorld().equals(listeningPlayer.getWorld())) {
+                    return false; //Not in the same world when its required
+                }
+
+                //Distance checks
+                if(Config.getInstance().shouldPowerLevelUpBroadcastsRestrictDistance()) {
+                    if(!Misc.isNear(mmoBroadcastingPlayer.getPlayer().getLocation(), listeningPlayer.getLocation(), Config.getInstance().getPowerLevelUpBroadcastRadius())) {
+                        return false;
+                    }
+                }
+            }
+
+            //Visibility checks
+            if(!listeningPlayer.canSee(mmoBroadcastingPlayer.getPlayer())) {
+                return false; //Player who leveled should be invisible to this player so don't send the message
+            }
+
+            return true;
+        } else {
+            //Send out to console
+            return Config.getInstance().shouldPowerLevelUpBroadcastToConsole();
+        }
+    }
+
+    private static boolean isPowerLevelUpBroadcastsSameWorldOnly() {
+        return Config.getInstance().isPowerLevelUpBroadcastsSameWorldOnly();
+    }
+
+    @Override
+    public String toString() {
+        return "PowerLevelUpBroadcastPredicate{" +
+                "broadcaster=" + broadcaster +
+                '}';
+    }
+}

src/main/java/com/gmail/nossr50/events/skills/SkillActivationPerkEvent.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.events.skills;
 
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
@@ -16,7 +17,7 @@ public class SkillActivationPerkEvent extends Event {
     private final int maxTicks;
 
     public SkillActivationPerkEvent(Player player, int ticks, int maxTicks) {
-
+        super(!Bukkit.isPrimaryThread());
         this.player = player;
         this.ticks = ticks;
         this.maxTicks = maxTicks;

src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillBlockEvent.java

@@ -0,0 +1,23 @@
+package com.gmail.nossr50.events.skills.secondaryabilities;
+
+import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+public class SubSkillBlockEvent extends SubSkillEvent {
+    private final @NotNull Block block;
+
+    public SubSkillBlockEvent(@NotNull Player player, @NotNull SubSkillType subSkillType, @NotNull Block block) {
+        super(player, subSkillType);
+        this.block = block;
+    }
+
+    /**
+     * Get the block associated with this event
+     * @return the block associated with this event
+     */
+    public @NotNull Block getBlock() {
+        return block;
+    }
+}

src/main/java/com/gmail/nossr50/listeners/EntityListener.java

@@ -142,7 +142,7 @@ public class EntityListener implements Listener {
             projectile.setMetadata(mcMMO.bowForceKey, new FixedMetadataValue(pluginRef, Math.min(event.getForce() * AdvancedConfig.getInstance().getForceMultiplier(), 1.0)));
             projectile.setMetadata(mcMMO.arrowDistanceKey, new FixedMetadataValue(pluginRef, projectile.getLocation()));
             //Cleanup metadata in 1 minute in case normal collection falls through
-            CombatUtils.cleanupArrowMetadata((Projectile) projectile);
+            CombatUtils.delayArrowMetaCleanup((Projectile) projectile);
         }
     }
 

src/main/java/com/gmail/nossr50/listeners/PlayerListener.java

@@ -67,10 +67,12 @@ public class PlayerListener implements Listener {
         /* WORLD BLACKLIST CHECK */
         if(WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld())) {
             //Remove scoreboards
+            if(Config.getInstance().getScoreboardsEnabled()) {
                 ScoreboardManager.teardownPlayer(event.getPlayer());
+            }
             return;
-        } else if(WorldBlacklist.isWorldBlacklisted(event.getFrom().getWorld())) {
+        } else if(WorldBlacklist.isWorldBlacklisted(event.getFrom().getWorld()) && Config.getInstance().getScoreboardsEnabled()) {
-            //This only fires if they are traveling to a non-blacklisted world from a blacklisted world
+            //This only fires if they are travelling to a non-blacklisted world from a blacklisted world
 
             //Setup scoreboards
             ScoreboardManager.setupPlayer(event.getPlayer());
@@ -782,7 +784,7 @@ public class PlayerListener implements Listener {
                     player.setVelocity(player.getEyeLocation().getDirection().multiply(10));
                 }
 
-                ((McMMOPlayer) (mmoPlayer)).getFishingManager().setFishingRodCastTimestamp();
+                //mcMMOPlayer.getFishingManager().setFishingRodCastTimestamp();
             }
         }
 

src/main/java/com/gmail/nossr50/mcMMO.java

@@ -259,13 +259,13 @@ public class mcMMO extends JavaPlugin {
             Metrics metrics;
 
             if(Config.getInstance().getIsMetricsEnabled()) {
-                metrics = new Metrics(this);
+                metrics = new Metrics(this, 3894);
                 metrics.addCustomChart(new Metrics.SimplePie("version", () -> getDescription().getVersion()));
 
                 if(Config.getInstance().getIsRetroMode())
-                    metrics.addCustomChart(new Metrics.SimplePie("scaling", () -> "Standard"));
+                    metrics.addCustomChart(new Metrics.SimplePie("leveling_system", () -> "Retro"));
                 else
-                    metrics.addCustomChart(new Metrics.SimplePie("scaling", () -> "Retro"));
+                    metrics.addCustomChart(new Metrics.SimplePie("leveling_system", () -> "Standard"));
             }
         }
         catch (Throwable t) {

src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java

@@ -25,8 +25,6 @@ import com.gmail.nossr50.util.random.RandomChanceUtil;
 import com.gmail.nossr50.util.skills.CombatUtils;
 import com.gmail.nossr50.util.skills.RankUtils;
 import com.gmail.nossr50.util.skills.SkillUtils;
-import com.gmail.nossr50.util.sounds.SoundManager;
-import com.gmail.nossr50.util.sounds.SoundType;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -72,36 +70,36 @@ public class FishingManager extends SkillManager {
         return mcMMO.getCompatibilityManager().getMasterAnglerCompatibilityLayer() != null && getSkillLevel() >= RankUtils.getUnlockLevel(SubSkillType.FISHING_MASTER_ANGLER) && Permissions.isSubSkillEnabled(getPlayer(), SubSkillType.FISHING_MASTER_ANGLER);
     }
 
-    public void setFishingRodCastTimestamp()
+//    public void setFishingRodCastTimestamp()
-    {
+//    {
-        long currentTime = System.currentTimeMillis();
+//        long currentTime = System.currentTimeMillis();
-        //Only track spam casting if the fishing hook is fresh
+//        //Only track spam casting if the fishing hook is fresh
-        if(currentTime > fishHookSpawnTimestamp + 1000)
+//        if(currentTime > fishHookSpawnTimestamp + 1000)
-            return;
+//            return;
-
+//
-        if(currentTime < fishingRodCastTimestamp + FISHING_ROD_CAST_CD_MILLISECONDS)
+//        if(currentTime < fishingRodCastTimestamp + FISHING_ROD_CAST_CD_MILLISECONDS)
-        {
+//        {
-            ItemStack fishingRod = getPlayer().getInventory().getItemInMainHand();
+//            ItemStack fishingRod = getPlayer().getInventory().getItemInMainHand();
-
+//
-            //Ensure correct hand item is damaged
+//            //Ensure correct hand item is damaged
-            if(fishingRod.getType() != Material.FISHING_ROD) {
+//            if(fishingRod.getType() != Material.FISHING_ROD) {
-                fishingRod = getPlayer().getInventory().getItemInOffHand();
+//                fishingRod = getPlayer().getInventory().getItemInOffHand();
-            }
+//            }
-
+//
-            getPlayer().setFoodLevel(Math.max(getPlayer().getFoodLevel() - 1, 0));
+//            getPlayer().setFoodLevel(Math.max(getPlayer().getFoodLevel() - 1, 0));
-            fishingRod.setDurability((short) (fishingRod.getDurability() + 5));
+//            fishingRod.setDurability((short) (fishingRod.getDurability() + 5));
-            getPlayer().updateInventory();
+//            getPlayer().updateInventory();
-
+//
-            if(lastWarnedExhaust + (1000) < currentTime)
+//            if(lastWarnedExhaust + (1000) < currentTime)
-            {
+//            {
-                getPlayer().sendMessage(LocaleLoader.getString("Fishing.Exhausting"));
+//                getPlayer().sendMessage(LocaleLoader.getString("Fishing.Exhausting"));
-                lastWarnedExhaust = currentTime;
+//                lastWarnedExhaust = currentTime;
-                SoundManager.sendSound(getPlayer(), getPlayer().getLocation(), SoundType.TIRED);
+//                SoundManager.sendSound(getPlayer(), getPlayer().getLocation(), SoundType.TIRED);
-            }
+//            }
-        }
+//        }
-
+//
-        fishingRodCastTimestamp = System.currentTimeMillis();
+//        fishingRodCastTimestamp = System.currentTimeMillis();
-    }
+//    }
 
     public void setFishHookReference(FishHook fishHook)
     {

src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java

@@ -752,11 +752,16 @@ public class HerbalismManager extends SkillManager {
             return false;
         }
 
+        if(EventUtils.callSubSkillBlockEvent(player, SubSkillType.HERBALISM_GREEN_THUMB, blockState.getBlock()).isCancelled()) {
+            return false;
+        } else {
             playerInventory.removeItem(seedStack);
             player.updateInventory(); // Needed until replacement available
             //Play sound
             SoundManager.sendSound(player, player.getLocation(), SoundType.ITEM_CONSUMED);
             return true;
+        }
+
 //        new HerbalismBlockUpdaterTask(blockState).runTaskLater(mcMMO.p, 0);
     }
 

src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java

@@ -1,6 +1,7 @@
 package com.gmail.nossr50.skills.woodcutting;
 
 import com.gmail.nossr50.api.ItemSpawnReason;
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
@@ -305,11 +306,13 @@ public class WoodcuttingManager extends SkillManager {
                     Misc.spawnItemsFromCollection(Misc.getBlockCenter(blockState), block.getDrops(), ItemSpawnReason.TREE_FELLER_DISPLACED_BLOCK);
 
                     if(RankUtils.hasReachedRank(2, mmoPlayer, SubSkillType.WOODCUTTING_KNOCK_ON_WOOD)) {
-                        if(RandomChanceUtil.rollDice(75, 100)) {
+                        if(AdvancedConfig.getInstance().isKnockOnWoodXPOrbEnabled()) {
-                            int randOrbCount = Math.max(1, Misc.getRandom().nextInt(20));
+                            if(RandomChanceUtil.rollDice(10, 100)) {
+                                int randOrbCount = Math.max(1, Misc.getRandom().nextInt(100));
                                 Misc.spawnExperienceOrb(blockState.getLocation(), randOrbCount);
                             }
                         }
+                    }
 
                 } else {
                     Misc.spawnItemsFromCollection(Misc.getBlockCenter(blockState), block.getDrops(), ItemSpawnReason.TREE_FELLER_DISPLACED_BLOCK, 1);

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

@@ -26,10 +26,13 @@ import com.gmail.nossr50.events.skills.fishing.McMMOPlayerFishingTreasureEvent;
 import com.gmail.nossr50.events.skills.fishing.McMMOPlayerMagicHunterEvent;
 import com.gmail.nossr50.events.skills.repair.McMMOPlayerRepairCheckEvent;
 import com.gmail.nossr50.events.skills.salvage.McMMOPlayerSalvageCheckEvent;
+import com.gmail.nossr50.events.skills.secondaryabilities.SubSkillBlockEvent;
 import com.gmail.nossr50.events.skills.secondaryabilities.SubSkillEvent;
 import com.gmail.nossr50.events.skills.unarmed.McMMOPlayerDisarmEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.player.NotificationManager;
+import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.skills.CombatUtils;
 import org.bukkit.block.Block;
 import org.bukkit.enchantments.Enchantment;
@@ -186,13 +189,28 @@ public final class EventUtils {
      * @return the event after it has been fired
      */
     @Deprecated
-    public static SubSkillEvent callSubSkillEvent(Player player, SubSkillType subSkillType) {
+    public static @NotNull SubSkillEvent callSubSkillEvent(Player player, SubSkillType subSkillType) {
         SubSkillEvent event = new SubSkillEvent(player, subSkillType);
         mcMMO.p.getServer().getPluginManager().callEvent(event);
 
         return event;
     }
 
+    /**
+     * Calls a new SubSkillBlockEvent for this SubSkill and its related block and then returns it
+     * @param player target player
+     * @param subSkillType target subskill
+     * @param block associated block
+     * @return the event after it has been fired
+     */
+    @Deprecated
+    public static @NotNull SubSkillBlockEvent callSubSkillBlockEvent(@NotNull Player player, @NotNull SubSkillType subSkillType, @NotNull Block block) {
+        SubSkillBlockEvent event = new SubSkillBlockEvent(player, subSkillType, block);
+        mcMMO.p.getServer().getPluginManager().callEvent(event);
+
+        return event;
+    }
+
     /**
      * Calls a new SubSkillEvent for this SubSkill and then returns it
      * @param player target player
@@ -229,6 +247,26 @@ public final class EventUtils {
         return isCancelled;
     }
 
+    public static boolean tryLevelChangeEvent(@NotNull McMMOPlayer mmoPlayer, PrimarySkillType skill, int levelsChanged, float xpRemoved, boolean isLevelUp, XPGainReason xpGainReason) {
+        McMMOPlayerLevelChangeEvent event = isLevelUp ? new McMMOPlayerLevelUpEvent(mmoPlayer.getPlayer(), skill, levelsChanged, xpGainReason) : new McMMOPlayerLevelDownEvent(mmoPlayer.getPlayer(), skill, levelsChanged, xpGainReason);
+        mcMMO.p.getServer().getPluginManager().callEvent(event);
+
+        boolean isCancelled = event.isCancelled();
+
+        if (isCancelled) {
+            mmoPlayer.modifySkill(skill, mmoPlayer.getSkillLevel(skill) - (isLevelUp ? levelsChanged : -levelsChanged));
+            mmoPlayer.addXp(skill, xpRemoved);
+        } else {
+            if (isLevelUp) {
+                NotificationManager.processLevelUpBroadcasting(mmoPlayer, skill, mmoPlayer.getSkillLevel(skill));
+                NotificationManager.processPowerLevelUpBroadcasting(mmoPlayer, mmoPlayer.getPowerLevel());
+
+            }
+        }
+
+        return isCancelled;
+    }
+
     public static boolean tryLevelEditEvent(Player player, PrimarySkillType skill, int levelsChanged, float xpRemoved, boolean isLevelUp, XPGainReason xpGainReason, int oldLevel) {
         McMMOPlayerLevelChangeEvent event = isLevelUp ? new McMMOPlayerLevelUpEvent(player, skill, levelsChanged - oldLevel, xpGainReason) : new McMMOPlayerLevelDownEvent(player, skill, levelsChanged, xpGainReason);
         mcMMO.p.getServer().getPluginManager().callEvent(event);
@@ -245,6 +283,25 @@ public final class EventUtils {
         return isCancelled;
     }
 
+    public static boolean tryLevelEditEvent(@NotNull McMMOPlayer mmoPlayer, PrimarySkillType skill, int levelsChanged, float xpRemoved, boolean isLevelUp, XPGainReason xpGainReason, int oldLevel) {
+        McMMOPlayerLevelChangeEvent event = isLevelUp ? new McMMOPlayerLevelUpEvent(mmoPlayer.getPlayer(), skill, levelsChanged - oldLevel, xpGainReason) : new McMMOPlayerLevelDownEvent(mmoPlayer.getPlayer(), skill, levelsChanged, xpGainReason);
+        mcMMO.p.getServer().getPluginManager().callEvent(event);
+
+        boolean isCancelled = event.isCancelled();
+
+        if (isCancelled) {
+            mmoPlayer.modifySkill(skill, mmoPlayer.getSkillLevel(skill) - (isLevelUp ? levelsChanged : -levelsChanged));
+            mmoPlayer.addXp(skill, xpRemoved);
+        } else {
+            if (isLevelUp) {
+                NotificationManager.processLevelUpBroadcasting(mmoPlayer, skill, mmoPlayer.getSkillLevel(skill));
+                NotificationManager.processPowerLevelUpBroadcasting(mmoPlayer, mmoPlayer.getPowerLevel());
+            }
+        }
+
+        return isCancelled;
+    }
+
     /**
      * Simulate a block break event.
      *

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

@@ -1,6 +1,5 @@
 package com.gmail.nossr50.util;
 
-import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.meta.OldName;
 import com.gmail.nossr50.mcMMO;
@@ -62,10 +61,6 @@ public final class MobHealthbarUtils {
         if (oldName == null) {
             oldName = "";
         }
-        else if (oldName.equalsIgnoreCase(AdvancedConfig.getInstance().getKrakenName())) {
-            return;
-        }
-
 
         boolean oldNameVisible = target.isCustomNameVisible();
         String newName = createHealthDisplay(Config.getInstance().getMobHealthbarDefault(), target, damage);

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

@@ -27,6 +27,7 @@ public final class Permissions {
      * GENERAL
      */
     public static boolean motd(Permissible permissible) { return permissible.hasPermission("mcmmo.motd"); }
+    public static boolean levelUpBroadcast(Permissible permissible) { return permissible.hasPermission("mcmmo.broadcast.levelup"); }
     public static boolean mobHealthDisplay(Permissible permissible) { return permissible.hasPermission("mcmmo.mobhealthdisplay"); }
     public static boolean updateNotifications(Permissible permissible) {return permissible.hasPermission("mcmmo.tools.updatecheck"); }
     public static boolean chimaeraWing(Permissible permissible) { return permissible.hasPermission("mcmmo.item.chimaerawing"); }

src/main/java/com/gmail/nossr50/util/compat/CompatibilityManager.java

@@ -14,6 +14,7 @@ import com.gmail.nossr50.util.nms.NMSVersion;
 import com.gmail.nossr50.util.platform.MinecraftGameVersion;
 import com.gmail.nossr50.util.text.StringUtils;
 import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
@@ -102,7 +103,6 @@ public class CompatibilityManager {
 
     private void initPersistentDataLayer() {
         if(minecraftGameVersion.getMinorVersion().asInt() >= 14 || minecraftGameVersion.getMajorVersion().asInt() >= 2) {
-
             persistentDataLayer = new SpigotPersistentDataLayer_1_14();
         } else {
 
@@ -138,11 +138,11 @@ public class CompatibilityManager {
         return isFullyCompatibleServerSoftware;
     }
 
-    public NMSVersion getNmsVersion() {
+    public @NotNull NMSVersion getNmsVersion() {
         return nmsVersion;
     }
 
-    private NMSVersion determineNMSVersion() {
+    private @NotNull NMSVersion determineNMSVersion() {
         if (minecraftGameVersion.getMajorVersion().asInt() == 1) {
             switch (minecraftGameVersion.getMinorVersion().asInt()) {
                 case 12:
@@ -160,8 +160,10 @@ public class CompatibilityManager {
                         return NMSVersion.NMS_1_16_2;
                     } else if(minecraftGameVersion.getPatchVersion().asInt() == 3) {
                         return NMSVersion.NMS_1_16_3;
-                    } else if(minecraftGameVersion.getPatchVersion().asInt() >= 4) {
+                    } else if(minecraftGameVersion.getPatchVersion().asInt() == 4) {
                         return NMSVersion.NMS_1_16_4;
+                    } else if(minecraftGameVersion.getPatchVersion().asInt() >= 5) {
+                        return NMSVersion.NMS_1_16_5;
                     }
             }
         }

src/main/java/com/gmail/nossr50/util/compat/layers/attackcooldown/DummyPlayerAttackCooldownToolLayer.java

@@ -1,42 +1,42 @@
-package com.gmail.nossr50.util.compat.layers.attackcooldown;
+//package com.gmail.nossr50.util.compat.layers.attackcooldown;
-
+//
-import com.gmail.nossr50.util.nms.NMSVersion;
+//import com.gmail.nossr50.util.nms.NMSVersion;
-import org.bukkit.entity.Player;
+//import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
+//import org.jetbrains.annotations.NotNull;
-
+//
-import java.lang.reflect.InvocationTargetException;
+//import java.lang.reflect.InvocationTargetException;
-
+//
-public class DummyPlayerAttackCooldownToolLayer extends PlayerAttackCooldownToolLayer {
+//public class DummyPlayerAttackCooldownToolLayer extends PlayerAttackCooldownToolLayer {
-    public DummyPlayerAttackCooldownToolLayer() {
+//    public DummyPlayerAttackCooldownToolLayer() {
-        super(NMSVersion.UNSUPPORTED);
+//        super(NMSVersion.UNSUPPORTED);
-    }
+//    }
-
+//
-    @Override
+//    @Override
-    public boolean initializeLayer() {
+//    public boolean initializeLayer() {
-        return noErrorsOnInitialize;
+//        return noErrorsOnInitialize;
-    }
+//    }
-
+//
-    @Override
+//    @Override
-    public float getAttackStrength(@NotNull Player player) throws InvocationTargetException, IllegalAccessException {
+//    public float getAttackStrength(@NotNull Player player) throws InvocationTargetException, IllegalAccessException {
-        return 1.0F; //Always full strength
+//        return 1.0F; //Always full strength
-    }
+//    }
-
+//
-    @Override
+//    @Override
-    public float getCooldownValue(@NotNull Player player) throws InvocationTargetException, IllegalAccessException {
+//    public float getCooldownValue(@NotNull Player player) throws InvocationTargetException, IllegalAccessException {
-        return 0F;
+//        return 0F;
-    }
+//    }
-
+//
-    @Override
+//    @Override
-    public void resetAttackStrength(@NotNull Player player) throws InvocationTargetException, IllegalAccessException {
+//    public void resetAttackStrength(@NotNull Player player) throws InvocationTargetException, IllegalAccessException {
-        //Do nothing
+//        //Do nothing
-    }
+//    }
-
+//
-    @Override
+//    @Override
-    public int getCooldownFieldValue(@NotNull Player player) throws InvocationTargetException, IllegalAccessException {
+//    public int getCooldownFieldValue(@NotNull Player player) throws InvocationTargetException, IllegalAccessException {
-        return 0;
+//        return 0;
-    }
+//    }
-
+//
-    @Override
+//    @Override
-    public void setCooldownFieldValue(@NotNull Player player, int fieldValue) throws InvocationTargetException, IllegalAccessException {
+//    public void setCooldownFieldValue(@NotNull Player player, int fieldValue) throws InvocationTargetException, IllegalAccessException {
-    }
+//    }
-}
+//}

src/main/java/com/gmail/nossr50/util/compat/layers/attackcooldown/PlayerAttackCooldownToolLayer.java

@@ -1,237 +1,238 @@
-package com.gmail.nossr50.util.compat.layers.attackcooldown;
+//package com.gmail.nossr50.util.compat.layers.attackcooldown;
-
+//
-import com.gmail.nossr50.mcMMO;
+//import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.compat.layers.AbstractNMSCompatibilityLayer;
+//import com.gmail.nossr50.util.compat.layers.AbstractNMSCompatibilityLayer;
-import com.gmail.nossr50.util.nms.NMSConstants;
+//import com.gmail.nossr50.util.nms.NMSConstants;
-import com.gmail.nossr50.util.nms.NMSVersion;
+//import com.gmail.nossr50.util.nms.NMSVersion;
-import org.bukkit.entity.Player;
+//import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
+//import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+//import org.jetbrains.annotations.Nullable;
-
+//
-import java.lang.reflect.Field;
+//import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
+//import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+//import java.lang.reflect.Method;
-
+//
-/**
+///**
- *
+// *
- * These classes are a band-aid solution for adding NMS support into 2.1.XXX
+// * These classes are a band-aid solution for adding NMS support into 2.1.XXX
- * In 2.2 we are switching to modules and that will clean things up significantly
+// * In 2.2 we are switching to modules and that will clean things up significantly
- *
+// *
- */
+// */
-public class PlayerAttackCooldownToolLayer extends AbstractNMSCompatibilityLayer implements PlayerAttackCooldownMethods {
+//public class PlayerAttackCooldownToolLayer extends AbstractNMSCompatibilityLayer implements PlayerAttackCooldownMethods {
-
+//
-    private final String cbNMSVersionPath;
+//    private final String cbNMSVersionPath;
-
+//
-    protected Class<?> craftPlayerClass;
+//    protected Class<?> craftPlayerClass;
-    protected Class<?> entityHumanClass;
+//    protected Class<?> entityHumanClass;
-    protected Class<?> entityLivingClass;
+//    protected Class<?> entityLivingClass;
-
+//
-    protected Method playerAttackCooldownMethod;
+//    protected Method playerAttackCooldownMethod;
-    protected Method playerAttackStrengthMethod;
+//    protected Method playerAttackStrengthMethod;
-    protected Method resetPlayerAttackCooldownMethod;
+//    protected Method resetPlayerAttackCooldownMethod;
-    protected Method setPlayerAttackStrengthMethod;
+//    protected Method setPlayerAttackStrengthMethod;
-    protected Method getHandleMethod;
+//    protected Method getHandleMethod;
-    protected Field attackCooldownField;
+//    protected Field attackCooldownField;
-    protected String attackStrengthFieldName;
+//    protected String attackStrengthFieldName;
-
+//
-    public PlayerAttackCooldownToolLayer(@NotNull NMSVersion nmsVersion) {
+//    public PlayerAttackCooldownToolLayer(@NotNull NMSVersion nmsVersion) {
-        super(nmsVersion);
+//        super(nmsVersion);
-        mcMMO.p.getLogger().info("Loading Compatibility Layer... (Player Attack Cooldown Exploit Prevention)");
+//        mcMMO.p.getLogger().info("Loading Compatibility Layer... (Player Attack Cooldown Exploit Prevention)");
-        if(!isCompatibleWithMinecraftVersion(nmsVersion)) {
+//        if(!isCompatibleWithMinecraftVersion(nmsVersion)) {
-            mcMMO.p.getLogger().severe("this version of mcMMO does not support NMS for this version of Minecraft, try updating mcMMO or updating Minecraft. Not all versions of Minecraft will have NMS support built into mcMMO.");
+//            mcMMO.p.getLogger().severe("this version of mcMMO does not support NMS for this version of Minecraft, try updating mcMMO or updating Minecraft. Not all versions of Minecraft will have NMS support built into mcMMO.");
-            cbNMSVersionPath = "";
+//            cbNMSVersionPath = "";
-        } else {
+//        } else {
-            if(NMSConstants.getCraftBukkitVersionPath(nmsVersion) != null) {
+//            if(NMSConstants.getCraftBukkitVersionPath(nmsVersion) != null) {
-                cbNMSVersionPath = NMSConstants.getCraftBukkitVersionPath(nmsVersion);
+//                cbNMSVersionPath = NMSConstants.getCraftBukkitVersionPath(nmsVersion);
-                noErrorsOnInitialize = initializeLayer();
+//                noErrorsOnInitialize = initializeLayer();
-
+//
-                if(noErrorsOnInitialize) {
+//                if(noErrorsOnInitialize) {
-                    mcMMO.p.getLogger().info("Successfully Loaded Compatibility Layer! (Player Attack Cooldown Exploit Prevention)");
+//                    mcMMO.p.getLogger().info("Successfully Loaded Compatibility Layer! (Player Attack Cooldown Exploit Prevention)");
-                }
+//                }
-            } else {
+//            } else {
-                mcMMO.p.getLogger().info("Failed to load - CL (Player Attack Cooldown Exploit Prevention) Could not find CB NMS path for CL");
+//                mcMMO.p.getLogger().info("Failed to load - CL (Player Attack Cooldown Exploit Prevention) Could not find CB NMS path for CL");
-                flagErrorsDuringStartup();
+//                flagErrorsDuringStartup();
-                mcMMO.p.getLogger().warning("Could not wire NMS package path for CraftBukkit!");
+//                mcMMO.p.getLogger().warning("Could not wire NMS package path for CraftBukkit!");
-                cbNMSVersionPath = "";
+//                cbNMSVersionPath = "";
-            }
+//            }
-        }
+//        }
-    }
+//    }
-
+//
-    public static boolean isCompatibleWithMinecraftVersion(@NotNull NMSVersion nmsVersion) {
+//    public static boolean isCompatibleWithMinecraftVersion(@NotNull NMSVersion nmsVersion) {
-        switch(nmsVersion) {
+//        switch(nmsVersion) {
-            case NMS_1_13_2:
+//            case NMS_1_13_2:
-            case NMS_1_14_4:
+//            case NMS_1_14_4:
-            case NMS_1_15_2:
+//            case NMS_1_15_2:
-            case NMS_1_16_4:
+//            case NMS_1_16_4:
-                return true;
+//            case NMS_1_16_5:
-            default:
+//                return true;
-                return false;
+//            default:
-        }
+//                return false;
-    }
+//        }
-
+//    }
-    /**
+//
-     * Cache all reflection methods/types/classes needed for the NMS of this CompatibilityLayer
+//    /**
-     * @param cooldownMethodName the cooldown method name
+//     * Cache all reflection methods/types/classes needed for the NMS of this CompatibilityLayer
-     * @param attackStrengthMethodName the attack strength method name
+//     * @param cooldownMethodName the cooldown method name
-     * @param resetAttackCooldownMethodName the reset attack cooldown method name
+//     * @param attackStrengthMethodName the attack strength method name
-     * @param getHandleMethodName the get handle method name
+//     * @param resetAttackCooldownMethodName the reset attack cooldown method name
-     * @return true if NMS was successfully wired
+//     * @param getHandleMethodName the get handle method name
-     */
+//     * @return true if NMS was successfully wired
-    public boolean wireNMS(@NotNull String cooldownMethodName, @NotNull String attackStrengthMethodName, @NotNull String resetAttackCooldownMethodName, @NotNull String getHandleMethodName, @NotNull String attackStrengthFieldName) {
+//     */
-        entityHumanClass = initEntityHumanClass();
+//    public boolean wireNMS(@NotNull String cooldownMethodName, @NotNull String attackStrengthMethodName, @NotNull String resetAttackCooldownMethodName, @NotNull String getHandleMethodName, @NotNull String attackStrengthFieldName) {
-
+//        entityHumanClass = initEntityHumanClass();
-        if (entityHumanClass != null) {
+//
-            entityLivingClass = entityHumanClass.getSuperclass();
+//        if (entityHumanClass != null) {
-        }
+//            entityLivingClass = entityHumanClass.getSuperclass();
-
+//        }
-        craftPlayerClass = initCraftPlayerClass();
+//
-        this.attackStrengthFieldName = attackStrengthFieldName;
+//        craftPlayerClass = initCraftPlayerClass();
-
+//        this.attackStrengthFieldName = attackStrengthFieldName;
-        try {
+//
-            this.attackCooldownField = entityLivingClass.getDeclaredField(attackStrengthFieldName);
+//        try {
-            this.attackCooldownField.setAccessible(true);
+//            this.attackCooldownField = entityLivingClass.getDeclaredField(attackStrengthFieldName);
-        } catch (NoSuchFieldException e) {
+//            this.attackCooldownField.setAccessible(true);
-            e.printStackTrace();
+//        } catch (NoSuchFieldException e) {
-        }
+//            e.printStackTrace();
-
+//        }
-        try {
+//
-            this.playerAttackCooldownMethod = entityHumanClass.getMethod(cooldownMethodName);
+//        try {
-            this.playerAttackStrengthMethod = entityHumanClass.getMethod(attackStrengthMethodName, float.class);
+//            this.playerAttackCooldownMethod = entityHumanClass.getMethod(cooldownMethodName);
-            this.resetPlayerAttackCooldownMethod = entityHumanClass.getMethod(resetAttackCooldownMethodName);
+//            this.playerAttackStrengthMethod = entityHumanClass.getMethod(attackStrengthMethodName, float.class);
-
+//            this.resetPlayerAttackCooldownMethod = entityHumanClass.getMethod(resetAttackCooldownMethodName);
-            if (craftPlayerClass != null) {
+//
-                this.getHandleMethod = craftPlayerClass.getMethod(getHandleMethodName);
+//            if (craftPlayerClass != null) {
-            } else {
+//                this.getHandleMethod = craftPlayerClass.getMethod(getHandleMethodName);
-                return false;
+//            } else {
-            }
+//                return false;
-            return true;
+//            }
-        } catch (NoSuchMethodException e) {
+//            return true;
-            flagErrorsDuringStartup();
+//        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
+//            flagErrorsDuringStartup();
-            return false;
+//            e.printStackTrace();
-        }
+//            return false;
-    }
+//        }
-
+//    }
-    /**
+//
-     * Get the cached player attack cooldown method
+//    /**
-     * @return the cached player attack cooldown method
+//     * Get the cached player attack cooldown method
-     */
+//     * @return the cached player attack cooldown method
-    private @Nullable Method getPlayerAttackCooldownMethod() {
+//     */
-        return playerAttackCooldownMethod;
+//    private @Nullable Method getPlayerAttackCooldownMethod() {
-    }
+//        return playerAttackCooldownMethod;
-
+//    }
-    /**
+//
-     * Get the cached player attack strength method
+//    /**
-     * @return the cached player attack strength method
+//     * Get the cached player attack strength method
-     */
+//     * @return the cached player attack strength method
-    private @Nullable Method getPlayerAttackStrengthMethod() {
+//     */
-        return playerAttackStrengthMethod;
+//    private @Nullable Method getPlayerAttackStrengthMethod() {
-    }
+//        return playerAttackStrengthMethod;
-
+//    }
-    /**
+//
-     * Get the cached player attack cooldown reset method
+//    /**
-     * @return the cached player attack cooldown reset method
+//     * Get the cached player attack cooldown reset method
-     */
+//     * @return the cached player attack cooldown reset method
-    private @Nullable Method getResetPlayerAttackCooldownMethod() {
+//     */
-        return resetPlayerAttackCooldownMethod;
+//    private @Nullable Method getResetPlayerAttackCooldownMethod() {
-    }
+//        return resetPlayerAttackCooldownMethod;
-
+//    }
-    /**
+//
-     * Grab the CraftPlayer class type from NMS
+//    /**
-     * @return the CraftPlayer class type from NMS
+//     * Grab the CraftPlayer class type from NMS
-     */
+//     * @return the CraftPlayer class type from NMS
-    private @Nullable Class<?> initCraftPlayerClass() {
+//     */
-        try {
+//    private @Nullable Class<?> initCraftPlayerClass() {
-            return Class.forName(NMSConstants.getCraftPlayerClassPath(cbNMSVersionPath));
+//        try {
-        } catch (ClassNotFoundException e) {
+//            return Class.forName(NMSConstants.getCraftPlayerClassPath(cbNMSVersionPath));
-            flagErrorsDuringStartup();
+//        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
+//            flagErrorsDuringStartup();
-            return null;
+//            e.printStackTrace();
-        }
+//            return null;
-    }
+//        }
-
+//    }
-    /**
+//
-     * Grab the EntityHuman class type from NMS
+//    /**
-     * @return the EntityHuman class type from NMS
+//     * Grab the EntityHuman class type from NMS
-     */
+//     * @return the EntityHuman class type from NMS
-    private @Nullable Class<?> initEntityHumanClass() {
+//     */
-        try {
+//    private @Nullable Class<?> initEntityHumanClass() {
-            return Class.forName(NMSConstants.getEntityHumanClassPath(cbNMSVersionPath));
+//        try {
-        } catch (ClassNotFoundException e) {
+//            return Class.forName(NMSConstants.getEntityHumanClassPath(cbNMSVersionPath));
-            flagErrorsDuringStartup();
+//        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
+//            flagErrorsDuringStartup();
-            return null;
+//            e.printStackTrace();
-        }
+//            return null;
-    }
+//        }
-
+//    }
-    private void flagErrorsDuringStartup() {
+//
-        noErrorsOnInitialize = false;
+//    private void flagErrorsDuringStartup() {
-    }
+//        noErrorsOnInitialize = false;
-
+//    }
-    /**
+//
-     * Grabs the attack strength for a player
+//    /**
-     * Should be noted that as of today there is no way to capture a players current attack strength in spigot when they attack an entity outside of network packet listening
+//     * Grabs the attack strength for a player
-     * @param player target player
+//     * Should be noted that as of today there is no way to capture a players current attack strength in spigot when they attack an entity outside of network packet listening
-     * @return the float value of the player's attack strength
+//     * @param player target player
-     */
+//     * @return the float value of the player's attack strength
-    @Override
+//     */
-    public float getAttackStrength(@NotNull Player player) throws InvocationTargetException, IllegalAccessException {
+//    @Override
-        Object craftPlayer = craftPlayerClass.cast(player);
+//    public float getAttackStrength(@NotNull Player player) throws InvocationTargetException, IllegalAccessException {
-        Object entityHuman = entityHumanClass.cast(getHandleMethod.invoke(craftPlayer));
+//        Object craftPlayer = craftPlayerClass.cast(player);
-
+//        Object entityHuman = entityHumanClass.cast(getHandleMethod.invoke(craftPlayer));
-        return (float) playerAttackStrengthMethod.invoke(entityHuman, 0F); //Add no adjustment ticks
+//
-    }
+//        return (float) playerAttackStrengthMethod.invoke(entityHuman, 0F); //Add no adjustment ticks
-
+//    }
-    @Override
+//
-    public float getCooldownValue(@NotNull Player player) throws InvocationTargetException, IllegalAccessException {
+//    @Override
-        Object craftPlayer = craftPlayerClass.cast(player);
+//    public float getCooldownValue(@NotNull Player player) throws InvocationTargetException, IllegalAccessException {
-        Object entityHuman = entityHumanClass.cast(getHandleMethod.invoke(craftPlayer));
+//        Object craftPlayer = craftPlayerClass.cast(player);
-
+//        Object entityHuman = entityHumanClass.cast(getHandleMethod.invoke(craftPlayer));
-        return (float) playerAttackCooldownMethod.invoke(entityHuman); //Add no adjustment ticks
+//
-    }
+//        return (float) playerAttackCooldownMethod.invoke(entityHuman); //Add no adjustment ticks
-
+//    }
-    @Override
+//
-    public void resetAttackStrength(@NotNull Player player) throws InvocationTargetException, IllegalAccessException {
+//    @Override
-        Object craftPlayer = craftPlayerClass.cast(player);
+//    public void resetAttackStrength(@NotNull Player player) throws InvocationTargetException, IllegalAccessException {
-        Object entityHuman = entityHumanClass.cast(getHandleMethod.invoke(craftPlayer));
+//        Object craftPlayer = craftPlayerClass.cast(player);
-        Object entityLiving = entityLivingClass.cast(entityHuman);
+//        Object entityHuman = entityHumanClass.cast(getHandleMethod.invoke(craftPlayer));
-
+//        Object entityLiving = entityLivingClass.cast(entityHuman);
-        resetPlayerAttackCooldownMethod.invoke(entityLiving);
+//
-    }
+//        resetPlayerAttackCooldownMethod.invoke(entityLiving);
-
+//    }
-    @Override
+//
-    public int getCooldownFieldValue(@NotNull Player player) throws InvocationTargetException, IllegalAccessException {
+//    @Override
-        Object craftPlayer = craftPlayerClass.cast(player);
+//    public int getCooldownFieldValue(@NotNull Player player) throws InvocationTargetException, IllegalAccessException {
-        Object entityHuman = entityHumanClass.cast(getHandleMethod.invoke(craftPlayer));
+//        Object craftPlayer = craftPlayerClass.cast(player);
-        Object entityLiving = entityLivingClass.cast(entityHuman);
+//        Object entityHuman = entityHumanClass.cast(getHandleMethod.invoke(craftPlayer));
-
+//        Object entityLiving = entityLivingClass.cast(entityHuman);
-        return attackCooldownField.getInt(entityLiving);
+//
-    }
+//        return attackCooldownField.getInt(entityLiving);
-
+//    }
-    @Override
+//
-    public void setCooldownFieldValue(@NotNull Player player, int fieldValue) throws InvocationTargetException, IllegalAccessException {
+//    @Override
-        Object craftPlayer = craftPlayerClass.cast(player);
+//    public void setCooldownFieldValue(@NotNull Player player, int fieldValue) throws InvocationTargetException, IllegalAccessException {
-        Object entityHuman = entityHumanClass.cast(getHandleMethod.invoke(craftPlayer));
+//        Object craftPlayer = craftPlayerClass.cast(player);
-
+//        Object entityHuman = entityHumanClass.cast(getHandleMethod.invoke(craftPlayer));
-        attackCooldownField.setInt(entityHuman, fieldValue);
+//
-    }
+//        attackCooldownField.setInt(entityHuman, fieldValue);
-
+//    }
-    @Override
+//
-    public boolean initializeLayer() {
+//    @Override
-        switch(nmsVersion) {
+//    public boolean initializeLayer() {
-            case NMS_1_12_2:
+//        switch(nmsVersion) {
-                return wireNMS("dr", "n", "ds",  "getHandle", "at");
+//            case NMS_1_12_2:
-            case NMS_1_13_2:
+//                return wireNMS("dr", "n", "ds",  "getHandle", "at");
-                return wireNMS("dG", "r", "dH", "getHandle", "at");
+//            case NMS_1_13_2:
-            case NMS_1_14_4:
+//                return wireNMS("dG", "r", "dH", "getHandle", "at");
-                return wireNMS("dY", "s", "dZ",  "getHandle", "at");
+//            case NMS_1_14_4:
-            case NMS_1_15_2:
+//                return wireNMS("dY", "s", "dZ",  "getHandle", "at");
-                return wireNMS("ex", "s", "ey",  "getHandle", "at");
+//            case NMS_1_15_2:
-            case NMS_1_16_4:
+//                return wireNMS("ex", "s", "ey",  "getHandle", "at");
-                return wireNMS("eR", "getAttackCooldown", "resetAttackCooldown",  "getHandle", "at");
+//            case NMS_1_16_4:
-            default:
+//                return wireNMS("eR", "getAttackCooldown", "resetAttackCooldown",  "getHandle", "at");
-                throw new RuntimeException("Unexpected NMS version support in PlayerAttackCooldown compatibility layer initialization!");
+//            default:
-        }
+//                throw new RuntimeException("Unexpected NMS version support in PlayerAttackCooldown compatibility layer initialization!");
-    }
+//        }
-}
+//    }
-
+//}
+//

src/main/java/com/gmail/nossr50/util/nms/NMSVersion.java

@@ -21,6 +21,7 @@ public enum NMSVersion {
     NMS_1_16_2("1.16.2"),
     NMS_1_16_3("1.16.3"),
     NMS_1_16_4("1.16.4"),
+    NMS_1_16_5("1.16.5"),
 
     //Version not known to this build of mcMMO
     UNSUPPORTED("unsupported");

src/main/java/com/gmail/nossr50/util/player/NotificationManager.java

@@ -2,6 +2,8 @@ package com.gmail.nossr50.util.player;
 
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.LevelUpBroadcastPredicate;
+import com.gmail.nossr50.datatypes.PowerLevelUpBroadcastPredicate;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.datatypes.notifications.SensitiveCommandType;
 import com.gmail.nossr50.datatypes.skills.CoreSkills;
@@ -21,6 +23,8 @@ import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.audience.MessageType;
 import net.kyori.adventure.identity.Identity;
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.event.HoverEvent;
+import net.kyori.adventure.text.format.TextColor;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Server;
@@ -29,7 +33,13 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
+import java.time.LocalDate;
+
 public class NotificationManager {
+
+    public static final String HEX_BEIGE_COLOR = "#c2a66e";
+    public static final String HEX_LIME_GREEN_COLOR = "#8ec26e";
+
     /**
      * Sends players notifications from mcMMO
      * Does so by sending out an event so other plugins can cancel it
@@ -270,4 +280,83 @@ public class NotificationManager {
         return newArray;
     }
 
+    //TODO: Remove the code duplication, am lazy atm
+    //TODO: Fix broadcasts being skipped for situations where a player skips over the milestone like with the addlevels command
+    public static void processLevelUpBroadcasting(@NotNull McMMOPlayer mmoPlayer, @NotNull PrimarySkillType primarySkillType, int level) {
+        if(level <= 0)
+            return;
+
+        //Check if broadcasting is enabled
+        if(Config.getInstance().shouldLevelUpBroadcasts()) {
+            //Permission check
+            if(!Permissions.levelUpBroadcast(mmoPlayer.getPlayer())) {
+                return;
+            }
+
+            int levelInterval = Config.getInstance().getLevelUpBroadcastInterval();
+            int remainder = level % levelInterval;
+
+            if(remainder == 0) {
+                //Grab appropriate audience
+                Audience audience = mcMMO.getAudiences().filter(getLevelUpBroadcastPredicate(mmoPlayer.getPlayer()));
+                //TODO: Make prettier
+                HoverEvent<Component> levelMilestoneHover = Component.text(mmoPlayer.getPlayer().getName())
+                        .append(Component.newline())
+                        .append(Component.text(LocalDate.now().toString()))
+                        .append(Component.newline())
+                        .append(Component.text(primarySkillType.getName()+" reached level "+level)).color(TextColor.fromHexString(HEX_BEIGE_COLOR))
+                        .asHoverEvent();
+
+                String localeMessage = LocaleLoader.getString("Broadcasts.LevelUpMilestone", mmoPlayer.getPlayer().getDisplayName(), level, primarySkillType.getName());
+                Component message = Component.text(localeMessage).hoverEvent(levelMilestoneHover);
+
+                Bukkit.getScheduler().runTaskLater(mcMMO.p, () -> audience.sendMessage(Identity.nil(), message), 0);
+            }
+        }
+    }
+
+    //TODO: Remove the code duplication, am lazy atm
+    //TODO: Fix broadcasts being skipped for situations where a player skips over the milestone like with the addlevels command
+    public static void processPowerLevelUpBroadcasting(@NotNull McMMOPlayer mmoPlayer, int powerLevel) {
+        if(powerLevel <= 0)
+            return;
+
+        //Check if broadcasting is enabled
+        if(Config.getInstance().shouldPowerLevelUpBroadcasts()) {
+            //Permission check
+            if(!Permissions.levelUpBroadcast(mmoPlayer.getPlayer())) {
+                return;
+            }
+
+            int levelInterval = Config.getInstance().getPowerLevelUpBroadcastInterval();
+            int remainder = powerLevel % levelInterval;
+
+            if(remainder == 0) {
+                //Grab appropriate audience
+                Audience audience = mcMMO.getAudiences().filter(getPowerLevelUpBroadcastPredicate(mmoPlayer.getPlayer()));
+                //TODO: Make prettier
+                HoverEvent<Component> levelMilestoneHover = Component.text(mmoPlayer.getPlayer().getName())
+                        .append(Component.newline())
+                        .append(Component.text(LocalDate.now().toString()))
+                        .append(Component.newline())
+                        .append(Component.text("Power level has reached "+powerLevel)).color(TextColor.fromHexString(HEX_BEIGE_COLOR))
+                        .asHoverEvent();
+
+                String localeMessage = LocaleLoader.getString("Broadcasts.PowerLevelUpMilestone", mmoPlayer.getPlayer().getDisplayName(), powerLevel);
+                Component message = Component.text(localeMessage).hoverEvent(levelMilestoneHover);
+
+                Bukkit.getScheduler().runTaskLater(mcMMO.p, () -> audience.sendMessage(Identity.nil(), message), 0);
+            }
+        }
+    }
+
+    //TODO: Could cache
+    public static @NotNull LevelUpBroadcastPredicate<CommandSender> getLevelUpBroadcastPredicate(@NotNull CommandSender levelUpPlayer) {
+        return new LevelUpBroadcastPredicate<>(levelUpPlayer);
+    }
+
+    public static @NotNull PowerLevelUpBroadcastPredicate<CommandSender> getPowerLevelUpBroadcastPredicate(@NotNull CommandSender levelUpPlayer) {
+        return new PowerLevelUpBroadcastPredicate<>(levelUpPlayer);
+    }
+
 }

src/main/java/com/gmail/nossr50/util/random/RandomChanceSkill.java

@@ -75,6 +75,25 @@ public class RandomChanceSkill implements RandomChanceExecution {
         this.maximumBonusLevelCap = RandomChanceUtil.getMaxBonusLevelCap(subSkillType);
     }
 
+    public RandomChanceSkill(@Nullable Player player, @NotNull SubSkillType subSkillType, boolean hasCap, boolean luckyOverride) {
+        if (hasCap)
+            this.probabilityCap = RandomChanceUtil.getMaximumProbability(subSkillType);
+        else
+            this.probabilityCap = RandomChanceUtil.LINEAR_CURVE_VAR;
+
+        final McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+        if (player != null && mcMMOPlayer != null) {
+            this.skillLevel = mcMMOPlayer.getSkillLevel(subSkillType.getParentSkill());
+        } else {
+            this.skillLevel = 0;
+        }
+
+        isLucky = luckyOverride;
+
+        this.resultModifier = 1.0D;
+        this.maximumBonusLevelCap = RandomChanceUtil.getMaxBonusLevelCap(subSkillType);
+    }
+
     public RandomChanceSkill(@Nullable Player player, @NotNull SubSkillType subSkillType, boolean hasCap, double resultModifier) {
         if (hasCap)
             this.probabilityCap = RandomChanceUtil.getMaximumProbability(subSkillType);

src/main/java/com/gmail/nossr50/util/random/RandomChanceSkillStatic.java

@@ -14,6 +14,12 @@ public class RandomChanceSkillStatic extends RandomChanceSkill {
         this.xPos = xPos;
     }
 
+    public RandomChanceSkillStatic(double xPos, @Nullable Player player, @NotNull SubSkillType subSkillType, boolean luckyOverride) {
+        super(player, subSkillType, false, luckyOverride);
+
+        this.xPos = xPos;
+    }
+
     public RandomChanceSkillStatic(double xPos, @Nullable Player player, @NotNull SubSkillType subSkillType, double resultModifier) {
         super(player, subSkillType, resultModifier);
 

src/main/java/com/gmail/nossr50/util/random/RandomChanceUtil.java

@@ -45,12 +45,12 @@ public class RandomChanceUtil {
         }
     }
 
-    public static double getActivationChance(@NotNull SkillActivationType skillActivationType, @NotNull SubSkillType subSkillType, @Nullable Player player) {
+    public static double getActivationChance(@NotNull SkillActivationType skillActivationType, @NotNull SubSkillType subSkillType, @Nullable Player player, boolean luckyOverride) {
         switch (skillActivationType) {
             case RANDOM_LINEAR_100_SCALE_WITH_CAP:
-                return getRandomChanceExecutionSuccess(player, subSkillType, true);
+                return getRandomChanceExecutionSuccess(player, subSkillType, true, luckyOverride);
             case RANDOM_STATIC_CHANCE:
-                return getRandomStaticChanceExecutionSuccess(player, subSkillType);
+                return getRandomStaticChanceExecutionSuccess(player, subSkillType, luckyOverride);
             default:
                 return 0.1337;
         }
@@ -129,6 +129,10 @@ public class RandomChanceUtil {
         return getChanceOfSuccess(randomChance.getXPos(), randomChance.getProbabilityCap(), LINEAR_CURVE_VAR);
     }
 
+    public static double getRandomChanceExecutionChance(@NotNull RandomChanceExecution randomChance, boolean luckyOverride) {
+        return getChanceOfSuccess(randomChance.getXPos(), randomChance.getProbabilityCap(), LINEAR_CURVE_VAR);
+    }
+
     public static double getRandomChanceExecutionChance(@NotNull RandomChanceStatic randomChance) {
         double chanceOfSuccess = getChanceOfSuccess(randomChance.getXPos(), randomChance.getProbabilityCap(), LINEAR_CURVE_VAR);
 
@@ -194,9 +198,14 @@ public class RandomChanceUtil {
         return calculateChanceOfSuccess(rcs);
     }
 
-    public static double getRandomStaticChanceExecutionSuccess(@Nullable Player player, @NotNull SubSkillType subSkillType) {
+    public static double getRandomChanceExecutionSuccess(@Nullable Player player, @NotNull SubSkillType subSkillType, boolean hasCap, boolean luckyOverride) {
+        RandomChanceSkill rcs = new RandomChanceSkill(player, subSkillType, hasCap, luckyOverride);
+        return calculateChanceOfSuccess(rcs);
+    }
+
+    public static double getRandomStaticChanceExecutionSuccess(@Nullable Player player, @NotNull SubSkillType subSkillType, boolean luckyOverride) {
         try {
-            return getRandomChanceExecutionChance(new RandomChanceSkillStatic(getStaticRandomChance(subSkillType), player, subSkillType));
+            return getRandomChanceExecutionChance(new RandomChanceSkillStatic(getStaticRandomChance(subSkillType), player, subSkillType, luckyOverride));
         } catch (InvalidStaticChance invalidStaticChance) {
             //Catch invalid static skills
             invalidStaticChance.printStackTrace();
@@ -259,13 +268,15 @@ public class RandomChanceUtil {
     }
 
     public static String @NotNull [] calculateAbilityDisplayValues(@NotNull SkillActivationType skillActivationType, @NotNull Player player, @NotNull SubSkillType subSkillType) {
-        double successChance = getActivationChance(skillActivationType, subSkillType, player);
+        double successChance = getActivationChance(skillActivationType, subSkillType, player, false);
+        double successChanceLucky = getActivationChance(skillActivationType, subSkillType, player, true);
+
         String[] displayValues = new String[2];
 
         boolean isLucky = Permissions.lucky(player, subSkillType.getParentSkill());
 
         displayValues[0] = percent.format(Math.min(successChance, 100.0D) / 100.0D);
-        displayValues[1] = isLucky ? percent.format(Math.min(successChance * 1.3333D, 100.0D) / 100.0D) : null;
+        displayValues[1] = isLucky ? percent.format(Math.min(successChanceLucky, 100.0D) / 100.0D) : null;
 
         return displayValues;
     }
@@ -288,16 +299,16 @@ public class RandomChanceUtil {
     }
 
     public static String @NotNull [] calculateAbilityDisplayValuesCustom(@NotNull SkillActivationType skillActivationType, @NotNull Player player, @NotNull SubSkillType subSkillType, double multiplier) {
-        double successChance = getActivationChance(skillActivationType, subSkillType, player);
+        double successChance = getActivationChance(skillActivationType, subSkillType, player, false);
+        double successChanceLucky = getActivationChance(skillActivationType, subSkillType, player, true);
+        //TODO: Most likely incorrectly displays the value for graceful roll but gonna ignore for now...
         successChance *= multiplier; //Currently only used for graceful roll
         String[] displayValues = new String[2];
 
-        //TODO: Account for lucky in this
-
         boolean isLucky = Permissions.lucky(player, subSkillType.getParentSkill());
 
         displayValues[0] = percent.format(Math.min(successChance, 100.0D) / 100.0D);
-        displayValues[1] = isLucky ? percent.format(Math.min(successChance * 1.3333D, 100.0D) / 100.0D) : null;
+        displayValues[1] = isLucky ? percent.format(Math.min(successChanceLucky, 100.0D) / 100.0D) : null;
 
         return displayValues;
     }

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

@@ -29,14 +29,12 @@ import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.attribute.AttributeInstance;
-import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.*;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.bukkit.event.entity.EntityDamageEvent.DamageModifier;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.metadata.MetadataValue;
 import org.bukkit.potion.PotionEffectType;
 import org.bukkit.projectiles.ProjectileSource;

src/main/resources/advanced.yml

@@ -582,26 +582,9 @@ Skills:
     ###
     Woodcutting:
         TreeFeller:
-            # If set to true then tree feller will not use the new system and will use its old behaviour
+            Knock_On_Wood:
-            Classic: false
+                Add_XP_Orbs_To_Drops: true
-            # This is the time in seconds to build a new charge of Tree Feller
+
-            ChargeRate: 600
-            Rank_Levels:
-                Rank_1:
-                    TreeSizeMax: 100
-                    Charges: 1
-                Rank_2:
-                    TreeSizeMax: 200
-                    Charges: 1
-                Rank_3:
-                    TreeSizeMax: 200
-                    Charges: 2
-                Rank_4:
-                    TreeSizeMax: 200
-                    Charges: 3
-                Rank_5:
-                    TreeSizeMax: 500
-                    Charges: 3
         # Double Drops
         HarvestLumber:
             # ChanceMax & MaxBonusLevel are only used for Classic, I'll make that more clear in the future.

src/main/resources/config.yml

@@ -8,6 +8,41 @@
 #  Settings for mcMMO in general
 ###
 General:
+    # When players reach certain level milestones messages will be broadcast
+    Level_Up_Chat_Broadcasts:
+        # Whether or not level up broadcasts are enabled
+        Enabled: true
+        # Whether or not you want power level milestones to be broadcast
+        Broadcast_Powerlevels:
+            Enabled: true
+            # How often to broadcast, you can change this to 1 to always broadcast a level up event, a setting of 100 will limit it to every 100 levels (for example level 100, level 200, etc)
+            Milestone_Interval: 100
+            Broadcast_Targets:
+                # Send the message to the console as well
+                Send_To_Console: true
+                # Whether or not to only send chat messages to party members
+                Only_Party_Members: false
+                # Whether or not players who recieve a level up broadcast have to be on the same world as the one who leveled up
+                Only_Same_World: false
+                # Distance restrictions
+                Distance_Restrictions:
+                    Restrict_Distance: false
+                    # When using Restrict_Distance the blow setting configures the range of the broadcast
+                    Restricted_Radius: 100
+        # How often to broadcast, you can change this to 1 to always broadcast a level up event, a setting of 100 will limit it to every 100 levels (for example level 100, level 200, etc)
+        Milestone_Interval: 100
+        Broadcast_Targets:
+            # Send the message to the console as well
+            Send_To_Console: true
+            # Whether or not to only send chat messages to party members
+            Only_Party_Members: false
+            # Whether or not players who recieve a level up broadcast have to be on the same world as the one who leveled up
+            Only_Same_World: false
+            # Distance restrictions
+            Distance_Restrictions:
+                Restrict_Distance: false
+                # When using Restrict_Distance the blow setting configures the range of the broadcast
+                Restricted_Radius: 100
         # Turning this on will scale mcMMO around 1-1000 with default scaling factor
         # Everything in your config related to skill level requirements, skill level bonuses, etc will be multiplied by 10 when this mode is on
         # This change is purely cosmetic, it retains the old feel of mcMMO where you could level up thousands of times

src/main/resources/locale/locale_cs_CZ.properties

@@ -129,7 +129,7 @@ Herbalism.SkillName=Bylinkarstvi
 Herbalism.Skills.GTe.On=&a**ZELEN\u00c1 TERRA AKTIVOV\u00c1NA**
 Herbalism.Skills.GTe.Refresh=&aSchopnost &eGreen Terra &aje obnovena!
 Herbalism.Skills.GTe.Other.Off=Green Terra&a byla deaktivovana &e{0}
-Herbalism.Skills.GTe.Other.On=&a{0}&2 pou\u017eil [[RED]Green Terra!
+Herbalism.Skills.GTe.Other.On=&a{0}&2 pou\u017eil &cGreen Terra!
 Herbalism.Skillup=&4Dovednost v bylinarstvi byla navysena o {0}. Celkem ({1}).
 Mining.Ability.Length=Trvani Super Breaker: &e{0}s
 Mining.Ability.Locked.0=Zam\u010deno doku\u010f {0}+ DOVEDNOST (T\u011a\u017dEN\u00cd V\u00ddBUCHEM)
@@ -334,7 +334,7 @@ Woodcutting.Skills.TreeFeller.Other.On=&a{0}&2 pouzil &cValece stromu!
 Woodcutting.Skills.TreeFeller.Splinter=TVOJE SEKERA SE ROZLETELA NA TISICE KOUSKU!
 Woodcutting.Skills.TreeFeller.Threshold=Tento strom je p\u0159\u00edli\u0161 velk\u00fd!
 Woodcutting.Skillup=Dovednost v dolovani byla navysena o {0}. Celkem ({1})
-Ability.Generic.Refresh=[[GREEN]**SCHOPNOSTI OBNOVENY!**
+Ability.Generic.Refresh=&a**SCHOPNOSTI OBNOVENY!**
 Ability.Generic.Template.Lock=&7{0}
 Ability.Generic.Template=&6{0}: &3{1}
 Combat.ArrowDeflect=&f**SIP VYCHYLEN**
@@ -395,7 +395,7 @@ Commands.Party.Status=&8JM\u00c9NO: &f{0} {1}
 Commands.Party.ShareMode=&8M\u00d3D SD\u00cdLEN\u00cd:
 Commands.Party.ItemShare=&7P\u0158EDM\u011aT &3({0})
 Commands.Party.ExpShare=&7EXP &3({0})
-Commands.Party.ItemShareCategories=&8Sd\u00edl\u00edm p\u0159edm\u011bty: &7[[ITALIC]]{0}
+Commands.Party.ItemShareCategories=&8Sd\u00edl\u00edm p\u0159edm\u011bty: &7&o{0}
 Commands.Party.MembersNear=&8BL\u00cdZKO TEBE&3{0}&8/&3{1}
 Commands.Party.Accept=- Potvrdit pozvanku do party
 Commands.Party.Chat.Off=Chat jenom pro partu &cVypnuty
@@ -413,7 +413,7 @@ Commands.Party.AlreadyExists=&4Parta {0} u\u017e existuje!
 Commands.Party.Kick=Byl jsi vyhozen z party {0}!
 Commands.Party.Leave=Opustil jsi party
 Commands.Party.Members.Header=-----[]&a\u010cLENOV\u00c9&c[]-----
-Commands.Party.None=[RED]]Nejsi v zadne party.
+Commands.Party.None=&cNejsi v zadne party.
 Commands.Party.Quit=- Opustil jsi svoji aktualni partu
 Commands.Party.Teleport=<hrac> &c- Teleport ke clenovi party
 Commands.Party.Toggle=- Zapnout party chat
@@ -569,7 +569,7 @@ Skills.Parents=RODI\u010cE
 Skills.Stats={0}&a{1}&3 XP(&7{2}&3/&7{3}&3)
 Skills.TooTired=Si moc unaveny na pouziti teto schopnosti znovu.
 Skills.Cancelled={0} zru\u0161eno!
-Skills.ConfirmOrCancel=[[GREEN]Stiskn\u011bte znovu prav\u00e9 tla\u010d\u00edtko pro potvrzen\u00ed &6{0}&a. Lev\u00e9 tla\u010d\u00edtko ke zru\u0161en\u00ed.
+Skills.ConfirmOrCancel=&aStiskn\u011bte znovu prav\u00e9 tla\u010d\u00edtko pro potvrzen\u00ed &6{0}&a. Lev\u00e9 tla\u010d\u00edtko ke zru\u0161en\u00ed.
 Stats.Header.Combat=&6-=BOJOVE DOVEDNOSTI=-
 Stats.Header.Gathering=&6-=SHROMAZDOVACI DOVEDNOSTI=-
 Stats.Header.Misc=Ostatni schopnosti
@@ -587,7 +587,7 @@ Perks.ActivationTime.Desc=Prodlu\u017euje pou\u017eit\u00ed schopnosti na {0} se
 Perks.ActivationTime.Bonus=&6 ({0} s perkem V\u00fddr\u017enost)
 MOTD.Donate=&3Informace o p\u0159\u00edsp\u011bvc\u00edch:
 MOTD.Hardcore.DeathStatLoss.Stats=&6[mcMMO] &3Dovednost\u00ed penalizace kv\u016fli smrti : &4{0}%
-MOTD.Hardcore.Vampirism.Stats=[GOLD]][mcMMO] &3Up\u00edrsk\u00e9 Cizen\u00ed Stat\u016f: &4{0}%
+MOTD.Hardcore.Vampirism.Stats=&6[mcMMO] &3Up\u00edrsk\u00e9 Cizen\u00ed Stat\u016f: &4{0}%
 MOTD.PerksPrefix=[mcMMO Perky]
 MOTD.Version=&6[mcMMO] - verze &3{0}
 MOTD.Website=&6[mcMMO] &a{0}&e - Web mcMMO

src/main/resources/locale/locale_cy.properties

@@ -171,7 +171,7 @@ Repair.Listener=Atgyweirio:
 Repair.SkillName=ATGYWEIRIO:
 Repair.Skills.AdeptSalvage=&4You\'re not skilled enough to Salvage items.
 Repair.Skills.AdeptDiamond=&4 Dydych chi ddim yn ddigon medrus i drwsio Diemwnt.
-Repair.Skills.AdeptGold=[[DARK RED]] Dydych chi ddim yn ddigon medrus i drwsio Aur.
+Repair.Skills.AdeptGold=&4 Dydych chi ddim yn ddigon medrus i drwsio Aur.
 Repair.Skills.AdeptIron=&4You\'re not skilled enough to repair Iron.
 Repair.Skills.AdeptStone=&4 Dydych chi ddim yn ddigon medrus i drwsio cerrig.
 Repair.Skills.Adept=You must be level &e{0}&c to repair &e{1}
@@ -442,7 +442,7 @@ Skills.Header=-----[]&a{0}&c[]-----
 Skills.NeedMore=&4 y bydd angen mwy o &7{0}
 Skills.Stats={0}&a{1}&3 XP(&7{2}&3/&7{3}&3)
 Skills.TooTired= Yr ydych yn rhy flinedig i ddefnyddio\'r gallu eto. &e({0}s)
-Stats.Header.Combat=[GOLD]] - = GWRTHSEFYLL SGILIAU = -
+Stats.Header.Combat=&6 - = GWRTHSEFYLL SGILIAU = -
 Stats.Header.Gathering=&6 -= CASGLU SGILIAU = = -
 Stats.Header.Misc=&6-=MISC SKILLS=-
 Stats.Own.Stats=&a[mcMMO] Ystadegau

src/main/resources/locale/locale_da.properties

@@ -111,7 +111,7 @@ Herbalism.SubSkill.DoubleDrops.Description=G\u00f8r din normale udbytte dobblet
 Herbalism.Listener=Urtekundskab
 Herbalism.SkillName=NATURMEDICIN
 Herbalism.Skills.GTe.On=&a**GR\u00d8N TERRA AKTIVERET**
-Herbalism.Skills.GTe.Refresh=[[GREEN]Din &eGr\u00f8nne Terra &aevne er genindl\u00e6st!
+Herbalism.Skills.GTe.Refresh=&aDin &eGr\u00f8nne Terra &aevne er genindl\u00e6st!
 Herbalism.Skills.GTe.Other.Off=Gr\u00f8n Terra&a er aftaget i &e{0}
 Herbalism.Skills.GTe.Other.On=&a{0}&2 har brugt &cGr\u00f8n Terra!
 Herbalism.Skillup=Naturens Evne forbedret med {0}. Total ({1})
@@ -460,7 +460,7 @@ Perks.ActivationTime.Desc=Forl\u00e6nger evne aktivations tid med {0} sekunder
 Perks.ActivationTime.Bonus=&6 ({0}s med Udholdenheds Frynsegode)
 MOTD.Donate=&3Donations Info:
 MOTD.Hardcore.DeathStatLoss.Stats=&6[mcMMO] &3Evne d\u00f8ds straf: &4{0}%
-MOTD.Hardcore.Vampirism.Stats=&6[mcMMO] [[DARK_AQUA]Vampyr Statistik Igle: &4{0}%
+MOTD.Hardcore.Vampirism.Stats=&6[mcMMO] &3Vampyr Statistik Igle: &4{0}%
 MOTD.PerksPrefix=[mcMMO Frynsegoder]
 MOTD.Version=&6[mcMMO] K\u00f8rer version &3{0}
 MOTD.Website=&6[mcMMO] &a{0}&e - mcMMO Hjemmeside

src/main/resources/locale/locale_de.properties

@@ -34,6 +34,7 @@ Alchemy.SubSkill.Concoctions.Name        = Gebr\u00E4u
 Alchemy.SubSkill.Concoctions.Stat = Gebr\u00E4u Rang: &a{0}&3/&a{1}
 Alchemy.SubSkill.Concoctions.Stat.Extra = Zutaten [&a{0}&3]: &a{1}
 
+Anvil.SingleItemStack = &cDu kannst nicht mehrere Items gleichzeitig zerlegen oder reparieren, versuche es erstmal mit einem einzelnen Item.
 Anvil.Unbreakable = Dieses Item ist unzerst\u00F6rbar!
 
 Archery.Listener = Bogenschie\u00DFen:
@@ -59,6 +60,7 @@ Axes.Ability.Bonus.4                      = Wuchtschlag
 Axes.Ability.Bonus.5 = Verursacht {0} Bonus Schaden gegen Gegner ohne R\u00FCstung.
 Axes.Ability.Lower = &7Du senkst deine Axt wieder.
 Axes.Ability.Ready = &3Du &6hebst&3 deine Axt...
+Axes.Ability.Ready.Extra = &3Du &6hebst&3 deine Axt. &7({0} ist f\u00FCr {1}s pausiert)
 Axes.Combat.CritStruck = &cDu wurdest &4SCHWER &cverwundet!
 Axes.Combat.CriticalHit = &4&lKRITISCHER TREFFER!
 Axes.Combat.GI.Proc = &a**Du landest einen &2GEWALTIGEN &aSchlag**
@@ -87,9 +89,21 @@ Axes.SubSkill.SkullSplitter.Description   = Verursacht einen Fl\u00E4chenschaden
 Axes.SubSkill.SkullSplitter.Name = Sch\u00E4delspalter
 Axes.SubSkill.SkullSplitter.Stat = Sch\u00E4delspalter L\u00E4nge
 
+Broadcasts.LevelUpMilestone = &6(&amcMMO&6) {0}&7 hat nun Level &a{1}&7 mit der F\u00E4higkeit &3{2}&7 erreicht!
+
+Chat.Channel.Off = &6(&amcMMO-Chat&6) &7Deine Nachrichten werden nicht l\u00E4nger automatisch an die spezifischen Kan\u00E4le versendet.
+Chat.Channel.On = &6(&amcMMO-Chat&6) &eDeine Nachrichten werden nun automatisch an den &a{0}&e Kanal gesendet.
+Chat.Identity.Console = &6* Konsole *
+Chat.Spy.Party = &6[&eSPION&6-&a{2}&6] &r{0} &b\u2192<39><32> &r{1}
+Chat.Style.Admin = &b(A) &r{0} &b\u2192<39><32> &r{1}
+Chat.Style.Party = &a(P) &r{0} &a\u2192<39><32> &r{1}
+Chat.Style.Party.Leader = &a(P) &r{0} &6\u2192<39><32> &r{1}
+
 Combat.ArrowDeflect = &a&o**Pfeil abgelenkt**
 Combat.BeastLore = &a&o**Biestkunde**
 Combat.BeastLoreHealth = &3Gesundheit (&a{0}&3/{1})
+Combat.BeastLoreHorseJumpStrength = &3Pferde-Sprungst\u00E4rke (&aMaximal {0} Bl\u00F6cke&3)
+Combat.BeastLoreHorseSpeed =&3Pferde-Laufgeschwindigkeit (&a{0} Bl\u00F6cke/s&3)
 Combat.BeastLoreOwner = &3Besitzer (&c{0}&3)
 Combat.Gore = &a&o**Aufgeschlitzt**
 Combat.StruckByGore = &a&o**du wurdest AUFGESCHLITZT**
@@ -108,8 +122,10 @@ Commands.AdminChatSpy.Toggle            = mcMMO Party Chat w\u00FCrde ver\u00E4n
 Commands.AdminToggle = &a- Schalte den Adminchat an/aus
 Commands.Chat.Console = Konsole
 Commands.Cooldowns.Header = &6--= &amcMMO F\u00E4higkeiten Cooldowns&6 =--
-Commands.Cooldowns.Row.N                = \  &c{0}&f - &6{1} Sekunden verbleiben
+Commands.Cooldowns.Row.N =   &c{0}&f - &6{1} Sekunden verbleiben
-Commands.Cooldowns.Row.Y                = \  &b{0}&f - &2Bereit!
+Commands.Cooldowns.Row.Y =   &b{0}&f - &2Bereit!
+Commands.Database.Cooldown = Du musst {0} Sekunden warten bis du diesen Befehl wieder ausf\u00FChren kannst!
+Commands.Database.CooldownMS = Du musst {0}ms warten bis du diesen Befehl wieder ausf\u00FChren kannst!
 Commands.Database.Processing = Dein vorheriger Befehl wird noch verarbeitet. Bitte warten.
 Commands.Description.Skill = Zeige detaillierte Informationen zum {0} Skill
 Commands.Description.addlevels = Gib einem Spieler Skill Level
@@ -132,10 +148,13 @@ Commands.Description.mcremove           = Entferne einen Benutzer aus der Datenb
 Commands.Description.mcscoreboard = Verwalte deine Skill \u00DCbersicht
 Commands.Description.mcstats = Zeige deine Skill Level und Erfahrung
 Commands.Description.mctop = Zeige die Skill Bestenlisten
+Commands.Description.mmocompat = Information about mcMMO and whether or not its in compatibility mode or fully functional.
+Commands.Description.mmodebug = (De)aktiviere den Debugging-Modus, welcher n\u00FCtzliche Informationen ausgibt, wenn du einen Block schl\u00E4gst
 Commands.Description.mmoedit = Editiere die Skill Level eines Spielers
 Commands.Description.mmoinfo = Lese Details \u00FCber einen Skill oder andere Funktion
 Commands.Description.mmoshowdb = Zeige den Namen der aktuellen Datenbank (zur Benutzung mit /mmoupdate)
 Commands.Description.mmoupdate = Kopiere Daten von einer alten Datenbank zur aktuell benutzen
+Commands.Description.mmoxpbar = Player settings for mcMMO XP bars
 Commands.Description.party = \u00C4ndere verschiedene Party Einstellungen
 Commands.Description.partychat = Schalte den mcMMO Party Chat an oder aus oder sende Party Nachrichten
 Commands.Description.ptp = Teleportiere zu einem Party Mitglied
@@ -168,6 +187,7 @@ Commands.MmoInfo.NoMatch                = Diese F\u00E4higkeit existiert nicht!
 Commands.MmoInfo.OldSkill = &7mcMMO skills are being converted into an improved modular skill system, unfortunately this skill has not been converted yet and lacks detailed stats. The new system will allow for faster release times for new mcMMO skills and greater flexibility with existing skills.
 Commands.MmoInfo.Stats = STATS: {0}
 Commands.MmoInfo.SubSkillHeader = &6Name:&e {0}
+Commands.Mmodebug.Toggle = Der mcMMO Debugging-Modus ist nun &6{0}&7, benutze den Befehl erneut, um dies r\u00FCckg\u00E4ngig zu machen. Wenn der Debugging-Modus aktiviert wurde kannst du Bl\u00F6cke schlagen, um n\u00FCtzliche Informationen zu erhalten. Dies ist f\u00FCr den Support sehr n\u00FCtzlich.
 Commands.ModDescription = &a- Kurze Modbeschreibung
 Commands.NegativeNumberWarn = Benutze keine negativen Zahlen!
 Commands.NoConsole = Dieser Befehl kann nicht aus der Konsole verwendet werden.
@@ -249,6 +269,7 @@ Commands.Usage.0                        = &cDie korrekte Verwendung ist /{0}
 Commands.Usage.1 = &cDie korrekte Verwendung ist /{0} {1}
 Commands.Usage.2 = &cDie korrekte Verwendung ist /{0} {1} {2}
 Commands.Usage.3 = &cDie korrekte Verwendung ist /{0} {1} {2} {3}
+Commands.Usage.3.XP = &cDie korrekte Verwendung /{0} {1} {2} {3}&7 (Du kannst auch -s an das Ende des Befehls hinzuf\u00FC"gen, damit der Spieler nicht benachrichtigt wird)
 Commands.Usage.FullClassName = Klassenname
 Commands.Usage.Level = Level
 Commands.Usage.Message = Nachricht
@@ -260,6 +281,10 @@ Commands.Usage.Rate                     = Rate
 Commands.Usage.Skill = Skill
 Commands.Usage.SubSkill = F\u00E4higkeit
 Commands.Usage.XP = Erfahrung
+Commands.XPBar.DisableAll = &6Alle mcMMO Erfahrungsleisten wurden deaktiviert, benutze /mmoxpbar reset um die Standardeinstellungen wiederherzustellen.
+Commands.XPBar.Reset = &6Die Erfahrungsleisten-Einstellungen f\u00FCr mcMMO wurden zur\u00FCckgesetzt.
+Commands.XPBar.SettingChanged = &6Die Erfahrungsleisten-Einstellungen f\u00FCr &a{0}&6 wurden gesetzt auf: &a{1}
+Commands.XPBar.Usage = Proper usage is /mmoxpbar <skillname | reset> <show | hide>
 Commands.XPGain = &8XP ZUWACHS: &f{0}
 Commands.XPGain.Acrobatics = Fallen
 Commands.XPGain.Alchemy = Tr\u00E4nke brauen
@@ -307,24 +332,27 @@ Commands.mmoedit.AllSkills.1            = &aDein Level in allen F\u00E4higkeiten
 Commands.mmoedit.Modified.1 = &aDein Level in {0} wurde auf {1} gesetzt!
 Commands.mmoedit.Modified.2 = {0} wurde bei {1} modifiziert.
 Commands.mmoshowdb = Die zurzeit verwendete Datenbank ist &a{0}
-Commands.ptp.AcceptAny.Disabled         = Party Teleport Anfragenbest\u00E4tigung &cdeaktiviert
+Commands.ptp.AcceptAny.Disabled = Party-Teleportierung - Anfragenbest\u00E4tigung &cdeaktiviert
-Commands.ptp.AcceptAny.Enabled          = Party Teleport Anfragenbest\u00E4tigung &aaktiviert
+Commands.ptp.AcceptAny.Enabled = Party-Teleportierung - Anfragenbest\u00E4tigung &aaktiviert
-Commands.ptp.Disabled                   = Party Teleport &cdeaktiviert
+Commands.ptp.Disabled = Party-Teleportierung &cdeaktiviert
-Commands.ptp.Enabled                    = Party Teleport &aaktiviert
+Commands.ptp.Enabled = Party-Teleportierung &aaktiviert
-Commands.ptp.NoRequests                 = Du hast aktuell keine Teleportanfragen.
+Commands.ptp.NoRequests = Du hast aktuell keine Teleportierungsanfragen.
 Commands.ptp.NoWorldPermissions = &c[mcMMO] Du hast nicht die n\u00F6tigen Rechte um dich in die Welt {0} zu teleportieren.
 Commands.ptp.Request1 = {0} &am\u00F6chte sich zu dir teleportieren.
 Commands.ptp.Request2 = &aUm zu teleportieren tippe&e/ptp accept&a. Die Anfrage l\u00E4uft in&c{0} &aSekunden aus.
-Commands.ptp.RequestExpired             = &cParty Teleport Anfrage ist ausgelaufen.
+Commands.ptp.RequestExpired = &cParty-Teleportierungsanfrage ist ausgelaufen.
-Commands.xplock.locked                  = &6Deine Erfahrungs Anzeige ist nun auf {0} festgesetzt!
+Commands.xplock.locked = &6Deine Erfahrungsanzeige ist nun auf {0} festgesetzt!
-Commands.xplock.unlocked                = &6Deine Erfahrungs Anzeige ist nun wieder &afreigeschaltet&6!
+Commands.xplock.unlocked = &6Deine Erfahrungsanzeige ist nun wieder &afreigeschaltet&6!
-Commands.xprate.modified                = The Erfahrungs Rate wurde auf {0} gesetzt!
+Commands.xprate.modified = Die Erfahrungsrate wurde auf {0} gesetzt!
-Commands.xprate.over                    = Das Skill Erfahrungs Raten Event ist vor\u00FCber!
+Commands.xprate.over = Das Bonuserfahrungs-Event f\u00FCr Skills ist vor\u00FCber!
 Commands.xprate.proper.0 = &cKorrekte Eingabe f\u00FCr Erfahrungs Raten Wechsel: /xprate <integer> <true/false>
 Commands.xprate.proper.1 = &cKorrekte Eingabe f\u00FCr R\u00FCcksetzung auf Standard Erfahrungs Rate: /xprate reset
 Commands.xprate.proper.2 = &cBitte entscheide mit true/false ob dies ein XP-Event ist oder nicht.
-Commands.xprate.started.0               = &6Ein Erfahungs Event f\u00FCr Skills hat begonnen!
+Commands.xprate.started.0 = &6Ein Bonuserfahrungs-Event f\u00FCr Skills hat begonnen!
-Commands.xprate.started.1               = &6Die Skill Erfahrungs Rate liegt jetzt bei {0}x!
+Commands.xprate.started.1 = &6Die Erfahrungsrate f\u00FCr Skills liegt jetzt bei {0}x!
+
+Compatibility.Layer.PartialSupport = &6Diese Version besitzt keine vollst\u00E4ndige Unterst\u00FCtzung f\u00FCr &a{0}&6, jedoch verwendet mcMMO ein System, was die fehlenden Features versucht zu emulieren.
+Compatibility.Layer.Unsupported = &6Diese Version von Minecraft ist nicht kompatibel mit &a{0}&6.
 
 Effects.Child.Overhaul = &3Unterskill Level&e {0}&3: {1}
 Effects.Child.ParentList = &a{0}&6(&3Level&e{1}&6)
@@ -345,9 +373,11 @@ Excavation.Skills.GigaDrillBreaker.Other.On      = &a{0}&2 benutzte &cGigabohrer
 Excavation.Skills.GigaDrillBreaker.Refresh = &aDein &eGigabohrer &aist wieder bereit!
 Excavation.SubSkill.Archaeology.Description = Ergrabe die Sch\u00E4tze der Unterwelt!
 Excavation.SubSkill.Archaeology.Name = Arch\u00E4ologie
+Excavation.SubSkill.Archaeology.Stat = Arch\u00E4ologie Erfahrungspunkte-Chance
+Excavation.SubSkill.Archaeology.Stat.Extra = Arch\u00E4ologie Erfahrungspunkte-Anzahl
 Excavation.SubSkill.GigaDrillBreaker.Description = Dreifache Droprate, Dreifache Erfahrung und Bonus Geschwindigkeit.
 Excavation.SubSkill.GigaDrillBreaker.Name = Gigabohrer
-Excavation.SubSkill.GigaDrillBreaker.Stat        = Gigabohrer Dauer
+Excavation.SubSkill.GigaDrillBreaker.Stat = Gigabohrer-Dauer
 
 Fishing.Ability.Info = Zauberj\u00E4ger: &7 **Verbessert sich mit Schatzj\u00E4ger Rang**
 Fishing.Ability.Locked.0 = Gesperrt bis Level {0}!
@@ -356,7 +386,7 @@ Fishing.Ability.Locked.2                    = Gesperrt bis Level {0}!
 Fishing.Ability.TH.Boom = &c&lDeine Angelschnur hat sich in einer &4&lSeemine &c&lverfangen!
 Fishing.Ability.TH.MagicFound = &bDu f\u00FChlst etwas magisches in diesem Fang...
 Fishing.Ability.TH.Poison = &7Irgendentwas stinkt hier...
-Fishing.Chance.Raining                      = &9 Regen Bonus
+Fishing.Chance.Raining = &9Regen-Bonus
 Fishing.Exhausting = &c&oUnsachgem\u00E4\u00DFe Nutzung der Angelrute f\u00FChrt zu Erm\u00FCdung und abnutzen der Rute.
 Fishing.Listener = Angeln:
 Fishing.LowResourcesTip = &7Dein Gesp\u00FChr sagt dir, dass es hier kaum noch Fische gibt. Versuche es mindestens {0} Bl\u00F6cke entfernt.
@@ -364,33 +394,36 @@ Fishing.ScarcityTip                         = &e&oDas Gebiet ist \u00FCberfischt
 Fishing.Scared = &7&oHektische Bewegungen ver\u00E4ngstigen Fische!
 Fishing.SkillName = Angeln
 Fishing.SubSkill.FishermansDiet.Description = Verbessert den N\u00E4hrwert von geangelter Nahrung
-Fishing.SubSkill.FishermansDiet.Name        = Fischers Di\u00E4t
+Fishing.SubSkill.FishermansDiet.Name = Fischers-Di\u00E4t
-Fishing.SubSkill.FishermansDiet.Stat        = Fishers Di\u00E4t:&a Rang {0}
+Fishing.SubSkill.FishermansDiet.Stat = Fishers-Di\u00E4t:&a Rang {0}
 Fishing.SubSkill.IceFishing.Description = Erm\u00F6glicht dir in Eisbiomen zu angeln
 Fishing.SubSkill.IceFishing.Name = Eisangeln
 Fishing.SubSkill.IceFishing.Stat = Eisangeln
 Fishing.SubSkill.MagicHunter.Description = Finde verzauberte Gegenst\u00E4nde
-Fishing.SubSkill.MagicHunter.Name           = Zauber J\u00E4ger
+Fishing.SubSkill.MagicHunter.Name = Zauber-J\u00E4ger
-Fishing.SubSkill.MagicHunter.Stat           = Zauber J\u00E4ger Chance
+Fishing.SubSkill.MagicHunter.Stat = Zauber-J\u00E4ger Chance
+Fishing.SubSkill.MasterAngler.Description = Fische k\u00F6nnen h\u00E4ufiger gefangen werden, mit einem Boot funktioniert es umso besser.
 Fishing.SubSkill.MasterAngler.Name = Superangel
+Fishing.SubSkill.MasterAngler.Stat = Mindestwartezeit beim Angeln reduziert um: &a-{0} seconds
+Fishing.SubSkill.MasterAngler.Stat.Extra = Maximalwartezeit beim Angeln reduziert um: &a-{0} seconds
 Fishing.SubSkill.Shake.Description = Rei\u00DFe Gegenst\u00E4nde weg von Lebewesen und Spielern mit deiner Angel
 Fishing.SubSkill.Shake.Name = Rei\u00DFen
 Fishing.SubSkill.Shake.Stat = Rei\u00DFen Chance
 Fishing.SubSkill.TreasureHunter.Description = Angle verschiedene Objekte
 Fishing.SubSkill.TreasureHunter.Name = Schatz J\u00E4ger
 Fishing.SubSkill.TreasureHunter.Stat = Schatz J\u00E4ger Rang: &a{0}&3/&a{1}
-Fishing.SubSkill.TreasureHunter.Stat.Extra  = Drop Rate: &7\u00DCblich: &e{0} &aUn\u00FCblich: &e{1}\r\n&9Selten: &e{2} &dEpisch: &e{3} &6Legend\u00E4r: &e{4} &bMythic: &e{5}
+Fishing.SubSkill.TreasureHunter.Stat.Extra = Drop Rate: &7\u00DCblich: &e{0} &aUn\u00FCblich: &e{1}\n&9Selten: &e{2} &dEpisch: &e{3} &6Legend\u00E4r: &e{4} &bMythic: &e{5}
 
 Guides.Acrobatics.Section.0 = &3\u00DCber Akrobatik:\n&eAkrobatik ist die Kunst sich anmutig fortzubewegen.\n&eFall- und Kampfschaden werden reduziert\n\n&3XP GAIN:\n&eErfahrung sammelst du indem du in K\u00E4mpfen\n&eausweichst oder St\u00FCrze aus gro\u00DFen H\u00F6hen \u00FCberlebst.
 Guides.Acrobatics.Section.1 = &3Wie funktioniert Abrollen?\n&eAb und zu rollst du beim Fallen ab und der Fallschaden wird\n&ereduziert. Wenn du den Schleichen Knopf w\u00E4hrend dem Fallen\n&eh\u00E4ltst, verdoppelt sich die Chance abzurollen.\n&eIn dem Fall rollst du anmutig ab.\n&eAnmutige Rollen sind wie normale Rollen, nur dass\n&esie \u00F6fter passieren und damit mehr Schutz vor St\u00FCrzen\n&eliefern.
 Guides.Acrobatics.Section.2 = &3Wie funktioniert Ausweichen?\n&eAusweichen ist eine passive F\u00E4higkeit\n&edie ab und zu den Schaden in K\u00E4mpfen halbiert.\n&eDie Chance auszuweichen ist abh\u00E4ngig vom \n&eAkrobatiklevel.
 Guides.Alchemy.Section.0 = &3\u00DCber Alchemie:\n&eIn Alchemie musst du Tr\u00E4nke brauen.\n&eMit h\u00F6herem Level werden die Tr\u00E4nke schneller\n&egebraut und neue Zutaten f\u00FCr zun\u00E4chst unerh\u00E4ltliche Tr\u00E4nke \n&efreigeschaltet.\n\n&3XP ZUWACHS:\n&eTr\u00E4nke brauen.
-Guides.Alchemy.Section.1     = &3Wie funktioniert Katalyse?\n&eKatalyse beschleunigt das Brauen von Tr\u00E4nken bis\n&ezu 4-facher Geschwindigkeit bei Level 1000.\n&e
+Guides.Alchemy.Section.1 = &3Wie funktioniert Katalyse?\n&eKatalyse beschleunigt das Brauen von Tr\u00E4nken bis\n&ezu 4-facher Geschwindigkeit bei Level 1000.
-Guides.Alchemy.Section.2     = &3Wie funktioniert Gebräu?\n&eGebräu erm\u00F6glich das Brauen weiterer Tr\u00E4nke mit neuen\n&eZutaten.\n&eWelche Zutaten m\u00F6glich sind, h\u00E4ngt vom Rang ab.\n&eInsgesamt gibt es 8 R\u00E4nge zum freischalten.
+Guides.Alchemy.Section.2 = &3Wie funktioniert Gebr\u00E4u?\n&eGebr\u00E4u erm\u00F6glich das Brauen weiterer Tr\u00E4nke mit neuen\n&eZutaten.\n&eWelche Zutaten m\u00F6glich sind, h\u00E4ngt vom Rang ab.\n&eInsgesamt gibt es 8 R\u00E4nge zum freischalten.
-Guides.Alchemy.Section.3     = &3Gebräu Tier 1 Zutaten:\n&eLohnenstaub, Fermentierte Spinnenaugen, Ghast Tr\u00E4nen,\n&eRedstone, Glowstonestaub, Zucker, Glitzernde Melone,\n&eGoldene Karotte, Magma Creme, Netherwarzen, Spinnenaugen, \n&eSchwarzpulver, Seerose, Kugelfisch (Vanilla Tr\u00E4nke)
+Guides.Alchemy.Section.3 = &3Gebr\u00E4u Tier 1 Zutaten:\n&eLohnenstaub, Fermentierte Spinnenaugen, Ghast Tr\u00E4nen,\n&eRedstone, Glowstonestaub, Zucker, Glitzernde Melone,\n&eGoldene Karotte, Magma Creme, Netherwarzen, Spinnenaugen, \n&eSchwarzpulver, Seerose, Kugelfisch (Vanilla Tr\u00E4nke)
-Guides.Alchemy.Section.4     = &3Gebräu Tier 2 Zutaten:\n&eKarotte (Eile)\n&eSchleimball (Langsamkeit)\n\n&3Gebräu Tier 3 Zutaten:\n&eQuarz (Absoption)\n&eRoter Pilz (Springen)
+Guides.Alchemy.Section.4 = &3Gebr\u00E4u Tier 2 Zutaten:\n&eKarotte (Eile)\n&eSchleimball (Langsamkeit)\n\n&3Gebr\u00E4u Tier 3 Zutaten:\n&eQuarz (Absoption)\n&eRoter Pilz (Springen)
-Guides.Alchemy.Section.5     = &3Gebräu Tier 4 Zutaten:\n&eApfel (Gesundheitsboost)\n&eVerrottetes Fleisch (Hunger)\n\n&3Gebräu Tier 5 Zutaten:\n&eBrauner Pilz(\u00DCbelkeit)\n&eTintensack (Blindheit)
+Guides.Alchemy.Section.5 = &3Gebr\u00E4u Tier 4 Zutaten:\n&eApfel (Gesundheitsboost)\n&eVerrottetes Fleisch (Hunger)\n\n&3Gebr\u00E4u Tier 5 Zutaten:\n&eBrauner Pilz(\u00DCbelkeit)\n&eTintensack (Blindheit)
-Guides.Alchemy.Section.6     = &3Gebräu Tier 6 Zutaten:\n&eGras (S\u00E4ttigung)\n\n&3Gebräu Tier 7 Zutaten:\n&eGiftige Kartoffel(Verwesung)\n\n&3Gebräu Tier 8 Zutaten:\n&eNormaler Goldener Apfel (Resistenz)
+Guides.Alchemy.Section.6 = &3Gebr\u00E4u Tier 6 Zutaten:\n&eGras (S\u00E4ttigung)\n\n&3Gebr\u00E4u Tier 7 Zutaten:\n&eGiftige Kartoffel (Verwesung)\n\n&3Gebr\u00E4u Tier 8 Zutaten:\n&eNormaler Goldener Apfel (Resistenz)
 Guides.Archery.Section.0 = &3\u00DCber Bogenschie\u00DFen:\n&eIn Bogenschie\u00DFen geht es um die Verwendung von Pfeil und\n&eBogen.\n\n&eEs gibt unterschiedliche Kampfboni, wie Zusatzschaden,\n&eder mit dem Level steigt und der F\u00E4higkeit Feinde im PVP\n&ezu bet\u00E4uben. Zus\u00E4tzlich kannst du einige verschossene\n&ePfeile aus den Leichen deiner Feinde wiedergewinnen.
 Guides.Archery.Section.1 = &3XP ZUWACHS:\n&eXP erh\u00E4ltst du durch das Abschie\u00DFen von Monstern und\n&eanderen Spielern.
 Guides.Archery.Section.2 = &3Wie funktioniert der Kunstschuss?\n&eKunstschuss erh\u00F6ht den Schaden deines Schusses.\n&eDer Zusatzschaden steigt mit deinem Bogen Level.\n&eIn den Standardeinstellungen steigt der Schaden um 10%\n&ealle 50 Level, mit einem Maximum von 200% extra.
@@ -416,11 +449,11 @@ Guides.Fishing.Section.4     = &3Wie funktioniert Rei\u00DFen?\n&eDiese F\u00E4h
 Guides.Fishing.Section.5 = &3Wie funktioniert die Fischer-Mahlzeit?\n&eDu wirst beim Essen von Fisch besser satt.
 Guides.Fishing.Section.6 = &3Bemerkung zum Angeln:\n&eAngeln Drops sind vollkommen anpassbar.\n&eErgebnisse unterscheiden sich deshalb von Server zu Server.
 Guides.Header = &6-=&a{0} Anleitung&6=-
-Guides.Herbalism.Section.0   = &3\u00DCber Kräuterkunde\n&eIn Kräuterkunde geht es um das Ernten.\n\n\n&3XP ZUWACHS:\n&eErnte Pflanzen.
+Guides.Herbalism.Section.0 = &3\u00DCber Kr\u00E4uterkunde\n&eIn Kr\u00E4uterkunde geht es um das Ernten.\n\n&3XP ZUWACHS:\n&eErnte Pflanzen.
 Guides.Herbalism.Section.1 = &3Kompatible Blocks\n&eWeizen, Kartoffeln, Karotten, Melonen, K\u00FCrbisse,\n&eZuckerrohr, Kakaobohnen, Blumen, Kakteen,\n&ePilze, Netherwarzen, Seerosen und Ranken.
 Guides.Herbalism.Section.2 = &3Wie funktioniert Gr\u00FCnes Land?\n&eGr\u00FCnes Land ist eine aktive F\u00E4higkeit die du aktivierst indem du\n&emit einer Harke in der Hand rechtsklickst.\n&eGr\u00FCnes Land erm\u00F6glicht einen 3-fachen Ertrag beim Ernten.\n&eAu\u00DFerdem erm\u00F6glich es Leben in zu hauchen und sie\n&emithilfe von Samen aus dem Inventar zu verwandeln.
-Guides.Herbalism.Section.3   = &3Wie funktioniert der Gr\u00FCne Daumen (Samen)?\n&eDiese passive F\u00E4higkeit pflanz automatisch beim Ernten nach.\n&eDer Erfolg h\u00E4ngt vom Kräuterkunde Level ab.
+Guides.Herbalism.Section.3 = &3Wie funktioniert der Gr\u00FCne Daumen (Samen)?\n&eDiese passive F\u00E4higkeit pflanz automatisch beim Ernten nach.\n&eDer Erfolg h\u00E4ngt vom Kr\u00E4uterkunde Level ab.
-Guides.Herbalism.Section.4   = &3Wie funktioniert der Gr\u00FCne Daumen(Blocks)?\n&eDiese aktive F\u00E4higkeit erm\u00F6glich es Bl\u00F6cke in ihre \n&e"Naturverwandte" Form zu verwandeln. Klicke dazu mit der\n&erechten Maustaste auf einen Block, w\u00E4hrend du Samen in\n&eder Hand h\u00E4ltst. \n&ePro Versuch kostet es dich einen Samen.\n&eDer Erfolg h\u00E4ngt vom Kräuterkunde Level ab.
+Guides.Herbalism.Section.4 = &3Wie funktioniert der Gr\u00FCne Daumen(Blocks)?\n&eDiese aktive F\u00E4higkeit erm\u00F6glich es Bl\u00F6cke in ihre \n&e"Naturverwandte" Form zu verwandeln. Klicke dazu mit der\n&erechten Maustaste auf einen Block, w\u00E4hrend du Samen in\n&eder Hand h\u00E4ltst. \n&ePro Versuch kostet es dich einen Samen.\n&eDer Erfolg h\u00E4ngt vom Kräuterkunde Level ab.
 Guides.Herbalism.Section.5 = &3Wie funktioniert das Bauernfr\u00FChst\u00FCck?\n&eDu wirst beim Essen von Brot, Keksen, Melonen, Pilzsuppe,\n&eKarotten und Kartoffeln satter.
 Guides.Herbalism.Section.6 = &3Wie funktioniert Hylians Gl\u00FCck?\n&eDiese passive F\u00E4higkeit gibt dir eine Chance Items zu finden\n&ewenn du bestimmte Bl\u00F6cke mit dem Schwert abbaust.
 Guides.Herbalism.Section.7 = &3Wie funktionieren Doppeldrops?\n&eDu erh\u00E4ltst beim Ernten mehr Ertrag.
@@ -444,19 +477,19 @@ Guides.Salvage.Section.3     = &3Zur Verbildlichung ein Beispiel:\n&eSagen wir v
 Guides.Salvage.Section.4 = &3Wie funktioniert Arkanes Verwerten?\n&eDiese F\u00E4higkeit erm\u00F6glicht es verzauberte B\u00FCcher beim\n&eVerwerten von verzauberten Items zu bekommen.\n&eVerzauberungen k\u00F6nnen vollkommen oder teilweise extrahiert\n&ewerden.\n&eBei einer teilweisen Extraktion wird das Verzauberungslevel\n&ereduziert.
 Guides.Smelting.Section.0 = Kommt irgendwann mal...
 Guides.Swords.Section.0 = &3\u00DCber Schwerter:\n&eDiese F\u00E4higkeit gibt Kampfboni bei Benutzung\n&edes Schwertes.\n\n&3XP ZUWACHS:\n&eVerletze Monster und Spieler mit dem Schwert.
-Guides.Swords.Section.1      = &3Wie funktioniert der S\u00E4gezahnschlag??\n&eS\u00E4gezahnschlag ist eine aktive F\u00E4higkeit die du mit Rechtsklick \n&eaktivierst.\n&eMit dieser F\u00E4higkeit kannst du Fl\u00E4chenschaden verteilen. \n&eAu\u00DFerdem blutet das Ziel f\u00FCr kurze Zeit.
+Guides.Swords.Section.1 = &3Wie funktioniert der S\u00E4gezahnschlag?\n&eS\u00E4gezahnschlag ist eine aktive F\u00E4higkeit die du mit Rechtsklick \n&eaktivierst.\n&eMit dieser F\u00E4higkeit kannst du Fl\u00E4chenschaden verteilen. \n&eAu\u00DFerdem blutet das Ziel f\u00FCr kurze Zeit.
 Guides.Swords.Section.2 = &3Wie funktioniert der Gegenangriff?\n&eGegenangriff ist eine aktive F\u00E4higkeit,\n&ebei der Angriffe von Monstern beim Blocken um bis zu 50%\n&edes erhaltenen Schadens reflektiert werden k\u00F6nnen.
 Guides.Swords.Section.3 = &3Wie funktioniert Blutung?\n&eBlutung f\u00FCgt den Gegnern alle 2 Sekunden Schaden zu. Das\n&eBluten geht solange bis die F\u00E4higkeit ausl\u00E4uft oder der\n&eGegner stirbt.\n&eDie Dauer der Blutung erh\u00F6ht sich mit dem Schwert Skill.
 Guides.Taming.Section.0 = &3\u00DCber Z\u00E4hmen:\n&eZ\u00E4hmen gibt dem Spieler diverse Kampfboni beim Kampf mit\n&egez\u00E4hmten W\u00F6lfen.\n\n&3XP ZUWACHS:\n&eUm XP zu bekommen musst du Tiere z\u00E4hmen oder mit\n&edeinen W\u00F6lfen k\u00E4mpfen.
-Guides.Taming.Section.1      = &3Wie funktioniert Ruf der Wildnis?\n&eRuf der Wildnis ist eine aktive F\u00E4higkeit die dir erlaubt\n&eeinen Wolf, einen Ozelot oder ein Pferd an deine Seite zu\n&erufen. \n&eDas tust du, indem du Linksklickst w\u00E4hrend du Knochen, Fisch\n&eoder \u00C4pfel in der Hand h\u00E4ltst.
+Guides.Taming.Section.1 = &3Wie funktioniert Ruf der Wildnis?\n&eRuf der Wildnis ist eine aktive F\u00E4higkeit die dir erlaubt\n&eeinen Wolf, einen Ozelot oder ein Pferd an deine Seite zu\n&erufen.\n&eDas tust du, indem du Linksklickst w\u00E4hrend du Knochen, Fisch\n&eoder \u00C4pfel in der Hand h\u00E4ltst.
 Guides.Taming.Section.2 = &3Wie funktioniert Bestienkunde?\n&eBestienkunde erlaubt es die Haustiere zu inspizieren\n&eHalte einen Knochen in der Hand und klick mit linker Maustaste\n&eauf das Haustier um Bestienkunde zu aktivieren.
 Guides.Taming.Section.3 = &3Wie funktioniert Aufschlitzen?\n&eAufschlitzen ist eine passive F\u00E4higkeit die beim Ziel\n&edes Wolfes Blutungen hervorrufen kann. Der Erfolg h\u00E4ngt\n&evom Z\u00E4hmen Level ab.
 Guides.Taming.Section.4 = &3Wie funktionieren gesch\u00E4rfte Klauen?\n&eGesch\u00E4rfte Klauen geben Zusatzschaden in Abh\u00E4ngigkeit\n&evom Z\u00E4hmen Level.
-Guides.Taming.Section.5      = &3Wie funktioniert Umweltbewusst?\n&eDiese passive F\u00E4higkeit erm\u00F6glich W\u00F6lfen sich zu dir zu\n&eteleportieren wenn sie in die N\u00E4he von Gefahren wie \n&eKakteen/Lava kommen. \n&eZus\u00E4tzlich sind W\u00F6lfe immun gegen Fallschaden.
+Guides.Taming.Section.5 = &3Wie funktioniert Umweltbewusst?\n&eDiese passive F\u00E4higkeit erm\u00F6glich W\u00F6lfen sich zu dir zu\n&eteleportieren wenn sie in die N\u00E4he von Gefahren wie\n&eKakteen/Lava kommen.\n&eZus\u00E4tzlich sind W\u00F6lfe immun gegen Fallschaden.
-Guides.Taming.Section.6      = &3Wie funktioniert Dicker Pelz?\n&eDiese passive F\u00E4higkeit reduziert Schaden und \n&emacht W\u00F6lfe feuerresistent.
+Guides.Taming.Section.6 = &3Wie funktioniert Dicker Pelz?\n&eDiese passive F\u00E4higkeit reduziert Schaden und\n&emacht W\u00F6lfe feuerresistent.
 Guides.Taming.Section.7 = &3Wie funktioniert Schocksicher?\n&eDiese passive F\u00E4higkeit reduziert den Schaden\n&edurch Explosionen.
-Guides.Taming.Section.8      = &3Wie funktioniert Schnell-Imbiss?\n&eDiese passive F\u00E4higkeit gibt dem Wolf eine Chance sich zu \n&eerholen wann immer er einen Gegner verletzt.
+Guides.Taming.Section.8 = &3Wie funktioniert Schnell-Imbiss?\n&eDiese passive F\u00E4higkeit gibt dem Wolf eine Chance sich zu\n&eerholen wann immer er einen Gegner verletzt.
-Guides.Unarmed.Section.0     = &3\u00DCber Unbewaffnet:\n&eMit Unbewaffnet kann der echte Mann endlich mit seinen\n&eF\u00E4usten angemessen zuschlagen. \n\n&3XP ZUWACHS:\n&eK\u00E4mpfe unbewaffnet gegen Monster und andere Spieler
+Guides.Unarmed.Section.0 = &3\u00DCber Unbewaffnet:\n&eMit Unbewaffnet kann der echte Mann endlich mit seinen\n&eF\u00E4usten angemessen zuschlagen.\n\n&3XP ZUWACHS:\n&eK\u00E4mpfe unbewaffnet gegen Monster und andere Spieler
 Guides.Unarmed.Section.1 = &3Wie funktioniert Berserker?\n&eBerserker ist eine aktive F\u00E4higkeit die mit Rechtsklick\n&eaktiviert wird.\n&eIm Berserker Modus f\u00FCgst du 50% mehr Schaden zu und\n&ekannst weiche Materiale wie Gras und Erde sofort abbauen.
 Guides.Unarmed.Section.2 = &3Wie funktioniert der Eiserne Arm?\n&eEiserner Arm erh\u00F6ht den Monstern und Spielern mit den\n&eF\u00E4usten zugef\u00FCgten Schaden.
 Guides.Unarmed.Section.3 = &3Wie funktioniert Pfeilablenkung?\n&ePfeilablenkung ist eine passive F\u00E4higkeit die ab und zu\n&ePfeile von Skeletten und angreifenden Spielern ablenkt.\n&eDiese Pfeile prallen einfach ab und fallen auf den Boden.
@@ -516,7 +549,7 @@ Herbalism.SubSkill.ShroomThumb.Description  = Verbreite Myzel auf Gras und Erde
 Herbalism.SubSkill.ShroomThumb.Name = Pilz Zehe
 Herbalism.SubSkill.ShroomThumb.Stat = Pilz Zehe Chance
 
-Holiday.Anniversary        = &9Alles gute zu mcMMO's {0} j\u00E4hrigen Geburtstag!\r\n&9In Ehren von nossr50 und all den anderen flei\u00DFigen Entwicklern, hier ist eine kleine Feuerwerk Show!
+Holiday.Anniversary = &9Alles gute zu mcMMO's {0} j\u00E4hrigen Geburtstag!\n&9In Ehren von nossr50 und all den anderen flei\u00DFigen Entwicklern, hier ist eine kleine Feuerwerk Show!
 Holiday.AprilFools.Levelup = &6{0} ist jetzt Level &a{1}&6!
 
 Inspect.Offline = &cDu hast nicht die Rechte um offline Spieler zu inspizieren!
@@ -584,6 +617,11 @@ JSON.URL.Wiki                              = Das offizielle mcMMO Wiki!
 JSON.Unarmed = Faustkampf
 JSON.Woodcutting = Holzf\u00E4llen
 
+LevelCap.PowerLevel = &6(&amcMMO&6) &eDu hast das Level-Limit von &c{0}&e erreicht. Du kannst deine F\u00E4higkeiten nun nicht mehr weiter verbessern.
+LevelCap.Skill = &6(&amcMMO&6) &eDu hast das Level-Limit von &c{0}&e f\u00FCr &6{1}&e erreicht. Du kannst diese F\u00E4higkeit von nun an nicht mehr weiter verbessern.
+
+Locale.Reloaded = &aDie Sprachdateien wurden neugeladen!
+
 MOTD.Donate = &3Spenden Info:
 MOTD.Hardcore.DeathStatLoss.Stats = &6[mcMMO] &3Skillverlust bei Tod: &4{0}%
 MOTD.Hardcore.Enabled = &6[mcMMO] &3Hardcore Modus aktiviert: &4{0}
@@ -599,6 +637,7 @@ Mining.Ability.Locked.2                          = GESPERRT bis Skill {0}+  (Exp
 Mining.Ability.Lower = &7**Du senkst deine SPITZHACKE**
 Mining.Ability.Ready = &a**Deine SPITZHACKE ist bereit**
 Mining.Blast.Boom = &7**BOOM**
+Mining.Blast.Cooldown =
 Mining.Blast.Effect = +{0} Erze {1}x Drops
 Mining.Blast.Other.On = &a{0}&2 benutzte &cZ\u00FCndstoff!
 Mining.Blast.Refresh = &aDein &eZ\u00FCndstoff &aist wieder bereit!
@@ -625,6 +664,13 @@ Mining.SubSkill.SuperBreaker.Description         = Abbaugeschwindigkeit+, Dreifa
 Mining.SubSkill.SuperBreaker.Name = Superbrecher
 Mining.SubSkill.SuperBreaker.Stat = Superbrecher L\u00E4nge
 
+Notifications.Admin.Format.Others = &6(&amcMMO &3Admin&6) &7{0}
+Notifications.Admin.Format.Self = &6(&amcMMO&6) &7{0}
+Notifications.Admin.XPRate.End.Others = {0} &7hat das Bonuserfahrungs-Event beendet
+Notifications.Admin.XPRate.End.Self = &7Du hast das Bonuserfahrungs-Event beendet.
+Notifications.Admin.XPRate.Start.Others = {0} &7hat ein Bonuserfahrungs-Event mit einem Faktor von {1}x gestartet
+Notifications.Admin.XPRate.Start.Self = &7Du hast den globalen Erfahrungsraten-Multiplikator auf &6{0}x&7 gesetzt
+
 Overhaul.Levelup = &l{0} erh\u00F6ht auf &r&a&l{2}&r&f.
 Overhaul.Name.Acrobatics = Akrobatik
 Overhaul.Name.Alchemy = Alchemie
@@ -734,7 +780,12 @@ Perks.Lucky.Name           = Gl\u00FCck
 Perks.XP.Desc = Erhalte mehr Erfahrung in bestimmen Skills.
 Perks.XP.Name = Erfahrung
 
+Profile.Loading.FailureNotice = &4[A] &cmcMMO konnte die Spielerdaten von &e{0}&c leider nicht laden. Bitte überprüfe deine Datenbankeinstellungen. &dVersuche: {1}.
+Profile.Loading.FailurePlayer = &cmcMMO hat Probleme beim Laden deiner Daten nach &a{0}&c Versuchen. &8Kontaktiere den Serveradmin bezüglich diesem Problem. mcMMO wird weiterhin versuchen, deine Daten zu laden, bis du den Server verlässt. So lange kannst du keine Skillerfahrung sammeln und diese auch nicht nutzen.
 Profile.Loading.Success = &aDein Profil wurde geladen.
+Profile.PendingLoad = &cDeine mcMMO Daten wurden noch nicht geladen.
+
+Reminder.Squelched = &7Erinnerung: Du erhälst aktuell keinerlei Benachrichtigungen von mcMMO, um dies zu ändern, nutze den /mcnotify Befehl. Dies ist eine stündliche, automatische Erinnerung.
 
 Repair.Arcane.Downgrade = Zauber-Wert des Gegenstands vermindert.
 Repair.Arcane.Fail = Der Gegenstands wurde entzaubert.
@@ -776,7 +827,6 @@ Repair.SubSkill.SuperRepair.Stat          = Chance auf Superreparatur
 
 Salvage.Ability.Bonus.0 = Fortgeschrittenes Verwerten
 Salvage.Ability.Bonus.1 = Max Ertrag {0} Item zerst\u00F6rt
-Salvage.Ability.Locked.0                         = GESPERRT bis Skill {0}+ (Fortgeschrittenes Verwerten)
 Salvage.Arcane.ExtractFull = &7Verwerten: Gesamte Verzauberung Chance
 Salvage.Arcane.ExtractPartial = &7Verwerten: Teil-Verzauberung Chance
 Salvage.Listener = Bergung:
@@ -788,13 +838,17 @@ Salvage.Skills.Adept.Level                       = Du musst Level &e{0}&c sein u
 Salvage.Skills.ArcaneFailed = Es ist dir nicht gelungen das Wissen aus diesem Item zu extrahieren.
 Salvage.Skills.ArcanePartial = Es ist dir gelungen ein bisschen Wissen zu extrahieren.
 Salvage.Skills.ArcaneSuccess = &aDu konntest alles Wissen aus diesem Item extrahieren!
+Salvage.Skills.Lottery.Normal = &6Du konntest &3{0}&6 Ressourcen durch die Verschrottung von &e{1}&6 gewinnen.
+Salvage.Skills.Lottery.Perfect = &a&lPerfekt!&r&6 Du konntest &3{1}&6 erfolgreich verschrotten und &3{0}&6 Ressourcen gewinnen.
+Salvage.Skills.Lottery.Untrained = &7Du bist noch zu ungeschickt beim Verschrotten. Du konntest lediglich &c{0}&7 Ressourcen vom &a{1}&7 zur\u00FCckgewinnen.
 Salvage.Skills.Success = &aItem verwertet!
 Salvage.Skills.TooDamaged = &4Das Item ist zu besch\u00E4digt um verwertet zu werden.
-Salvage.SubSkill.AdvancedSalvage.Description     = Verwerte besch\u00E4digte Items
-Salvage.SubSkill.AdvancedSalvage.Name            = Fortgeschrittenes Verwerten
 Salvage.SubSkill.ArcaneSalvage.Description = Extrahiere Verzauberungen aus Items.
 Salvage.SubSkill.ArcaneSalvage.Name = Magische Bergung
 Salvage.SubSkill.ArcaneSalvage.Stat = Magische Bergung: &eRank {0}/{1}
+Salvage.SubSkill.ScrapCollector.Description = Verschrotte einen Gegenstand, um Materialien zur\u00FCckzugewinnen, eine perfekte Verschrottung erfordert Gl\u00FCck und Geschick.
+Salvage.SubSkill.ScrapCollector.Name = Schrottsammler
+Salvage.SubSkill.ScrapCollector.Stat = Schrottsammler: &aVerschrotte bis zu &e{0}&a Gegenst\u00E4nde. Hierbei spielt Gl\u00FCck eine gewisse Rolle.
 Salvage.SubSkill.UnderstandingTheArt.Description = Du w\u00FChlst nicht einfach nur durch den M\u00FCll deines Nachbarn, du k\u00FCmmerst dich auch um die Umwelt! Gibt Boni zu verschiedenen Aspekten der Bergung.
 Salvage.SubSkill.UnderstandingTheArt.Name = Die Lehre der Bergung
 
@@ -811,6 +865,8 @@ Scoreboard.Misc.Overall           = &6Insgesamt
 Scoreboard.Misc.PowerLevel = &6Gesamt Level
 Scoreboard.Misc.RemainingXP = Verbliebene XP
 
+Server.ConsoleName = &e[Server]
+
 Skills.AbilityGateRequirementFail = &7Du ben\u00F6tigst &e{0}&7 weitere Level in &3{1}&7 um diese Superf\u00E4higkeit zu benutzen!
 Skills.Cancelled = {0} abgebrochen!
 Skills.Child = &6(VERWANDTER SKILL)
@@ -818,12 +874,15 @@ Skills.ChildStats                 = {0}&a{1}
 Skills.ConfirmOrCancel = &aErneuter Rechtsklick zur Best\u00E4tigung &6{0}&a. Linksklick zum abbrechen.
 Skills.Disarmed = &4Du wurdest entwaffnet!
 Skills.Header = -----[]&a{0}&c[]-----
+Skills.MaxXP = Max
 Skills.NeedMore = &4Du brauchst mehr &7{0}
 Skills.NeedMore.Extra = &4Du ben\u00F6tigst mehr &7{0}{1}!
 Skills.Overhaul.Header = &c[]=====[]&a {0} &c[]=====[]
 Skills.Parents = ELTERN
 Skills.Stats = {0}&a{1}&3 XP(&7{2}&3/&7{3}&3)
 Skills.TooTired = Du bist zu m\u00FCde um diese F\u00E4higkeit zu verwenden. &e({0}s)
+Skills.TooTired.Extra = &6{0} &eSuperf\u00E4higkeit CDs - {1}
+Skills.TooTired.Named = &7(&6{0}&e {1}s&7)
 
 Smelting.Ability.Locked.0 = GESPERRT bis {0}+ Skill (XP BOOST)
 Smelting.Ability.Locked.1 = GESPERRT bis {0}+ Skill (SCHMELZTIEGEL)
@@ -834,7 +893,7 @@ Smelting.SkillName                                = SCHMELZEN
 Smelting.SubSkill.FluxMining.Description = M\u00F6glichkeit, Erze direkt beim Abbauen zu Schmelzen
 Smelting.SubSkill.FluxMining.Name = Schmelztiegel
 Smelting.SubSkill.FluxMining.Stat = Schmelztiegel Chance
-Smelting.SubSkill.FuelEfficiency.Description      = Erh\u00F6he die Brenndauer des Brennstoffes in \u00D6fen
+Smelting.SubSkill.FuelEfficiency.Description = Erh\u00F6he die Brenndauer des Brennstoffes in Öfen
 Smelting.SubSkill.FuelEfficiency.Name = Brennstoff Effizienz
 Smelting.SubSkill.FuelEfficiency.Stat = Brennstoff Effizienz Multiplikator: &e{0}x
 Smelting.SubSkill.SecondSmelt.Description = Verdoppelt den Ertrag beim Schmelzen
@@ -928,12 +987,13 @@ Taming.SubSkill.ShockProof.Description           = Reduktion von Explosions-Scha
 Taming.SubSkill.ShockProof.Name = Schock-Sicher
 Taming.SubSkill.ThickFur.Description = Verminderter Schaden, Feuer-Resistent
 Taming.SubSkill.ThickFur.Name = Dicker Pelz
-Taming.Summon.Complete                           = &aBeschw\u00F6rung abgeschlossen
+Taming.Summon.COTW.BreedingDisallowed = &a(Ruf der Wildnis) &cBeschworene Tiere k\u00F6nnen nicht  gez\u00FCchtet werden.
-Taming.Summon.Fail.Horse                         = Du hast zu viele Pferde um dich, um weitere zu beschw\u00F6ren.
+Taming.Summon.COTW.Limit = &a(Ruf der Wildnis) &7Du kannst immer nur jeweils &c{0} &7beschworene &7{1} Tiere zugleich besitzen.
-Taming.Summon.Fail.Ocelot                        = Du hast zu viele Ozelots um dich, um weitere zu beschw\u00F6ren.
+Taming.Summon.COTW.NeedMoreItems = &a(Ruf der Wildnis) &7Du ben\u00F6tigst &e{0}&7 mehr von &3{1}
-Taming.Summon.Fail.TooMany                       = Du hast das Maximum an beschworenen Tieren erreicht  &e({0})
+Taming.Summon.COTW.Removed = &a(Ruf der Wildnis) &7Dein beschworenes &6{0}&7 Tier hat sich aus dem Staub gemacht.
-Taming.Summon.Fail.Wolf                          = Du hast zu viele W\u00F6lfe um dich, um weitere zu beschw\u00F6ren.
+Taming.Summon.COTW.Success.WithLifespan = &a(Ruf der Wildnis) &7Du hast erfolgreich ein &6{0}&7 beschworen und es wird &6{1}&7 Sekunden lang bleiben.
-Taming.Summon.Lifespan                           = (Lebenszeit: {0}s)
+Taming.Summon.COTW.Success.WithoutLifespan = &a(Ruf der Wildnis) &7Du hast ein &6{0}&7 beschworen.
+Taming.Summon.COTW.TimeExpired = &a(Ruf der Wildnis) &7Die Zeit ist um, dein &6{0}&7 muss gehen.
 Taming.Summon.Name.Format = {0}''s {1}
 
 Teleport.Cancelled = &4Teleport abgebrochen!
@@ -963,11 +1023,11 @@ Unarmed.SubSkill.BlockCracker.Name             = Schwarzgurt
 Unarmed.SubSkill.Disarm.Description = L\u00E4sst Gegenstand aus der Hand des Feindes fallen
 Unarmed.SubSkill.Disarm.Name = Entwaffnen
 Unarmed.SubSkill.Disarm.Stat = Entwaffnen Chance
-Unarmed.SubSkill.IronArmStyle.Description      = Erh\u00F6ht kurzfristig deine Schlagkraft
-Unarmed.SubSkill.IronArmStyle.Name             = Eiserner Arm
 Unarmed.SubSkill.IronGrip.Description = Sch\u00FCtzt dich davor, entwaffnet zu werden
 Unarmed.SubSkill.IronGrip.Name = Eisen Griff
 Unarmed.SubSkill.IronGrip.Stat = Eisen Griff Chance
+Unarmed.SubSkill.SteelArmStyle.Description = Verst\u00E4rkt deinen Arm mit der Zeit
+Unarmed.SubSkill.SteelArmStyle.Name = St\u00E4hlerner Arm
 Unarmed.SubSkill.UnarmedLimitBreak.Description = Durchbreche deine Grenzen!
 Unarmed.SubSkill.UnarmedLimitBreak.Name = \u00DCberwindung
 Unarmed.SubSkill.UnarmedLimitBreak.Stat = Bonus Schaden durch \u00DCberwindung
@@ -992,6 +1052,11 @@ Woodcutting.SubSkill.BarkSurgeon.Name          = Rindenchirurg
 Woodcutting.SubSkill.HarvestLumber.Description = Verdoppelt die Ausbeute 
 Woodcutting.SubSkill.HarvestLumber.Name = Doppel Drops
 Woodcutting.SubSkill.HarvestLumber.Stat = Doppeldrop Chance
+Woodcutting.SubSkill.KnockOnWood.Description = Zus\u00E4tliche Drops durch Baumf\u00E4ller
+Woodcutting.SubSkill.KnockOnWood.Loot.Normal = Standard-Loot von B\u00E4umen
+Woodcutting.SubSkill.KnockOnWood.Loot.Rank2 = Standard-Loot von B\u00E4umen und Erfahrungspunkte
+Woodcutting.SubSkill.KnockOnWood.Name = Auf Holz geklopft
+Woodcutting.SubSkill.KnockOnWood.Stat = Auf Holz geklopft
 Woodcutting.SubSkill.LeafBlower.Description = Bl\u00E4st Bl\u00E4tter davon
 Woodcutting.SubSkill.LeafBlower.Name = Bl\u00E4ttersturm
 Woodcutting.SubSkill.NaturesBounty.Description = Erhalte Erfahrung von der Natur
@@ -1016,20 +1081,16 @@ XPBar.Salvage          = Bergung Level: &6{0}
 XPBar.Smelting = Schmelzen Level: &6{0}
 XPBar.Swords = Schwertkampf Level: &6{0}
 XPBar.Taming = Z\u00E4hmen Level: &6{0}
+XPBar.Template = {0}
+XPBar.Template.EarlyGameBoost = &6Du erlernst eine neue F\u00E4higkeit...
 XPBar.Unarmed = Faustkampf Level: &6{0}
 XPBar.Woodcutting = Holzf\u00E4llen Level: &6{0}
 
-XPRate.Event = &6Es findet derzeit ein Skill Event statt! Du bekommst aktuell &c{0} &6mal so viel Erfahrung f\u00FCr deine Skills wie normal!
+XPRate.Event = &6Es findet derzeit ein Skill-Event statt! Du bekommst aktuell &c{0} &6mal so viel Erfahrung f\u00FCr deine Skills wie normal!
 
 mcMMO.Description = &3\u00DCber das &emcMMO&3 Projekt:,&6mcMMO ist ein &copen source&6 RPG mod erstellt in Februar 2011&6von &9nossr50&6. Das Ziel ist es ein qualitatives RPG Erlebnis zu liefern.,&3Tips:,&6 - &aNutze &c/mcmmo help&a um Befehle zu sehen &6,- &aNutze &c/skillname&a f\u00FCr detaillierte Skill Infos,&3Entwickler:,&6 - &anossr50 &9(Erfinder & Projektleitung),&6 - &aGJ &9(Fr\u00FChere Projektleitung),&6 - &aNuclearW &9(Entwickler),&6 - &abm01 &9(Entwickler),&6 - &aTfT_02 &9(Entwickler),&6 - &aGlitchfinder &9(Entwickler),&6 - &at00thpick1 &9(Entwickler),&6 - &alumis31 &9 (Urspr\u00FCngliche Deutsche \u00DCbersetzung),&6 - &aOverCrave &9 (Neue Deutsche \u00DCbersetzung & \u00DCberarbeitung),&3N\u00FCtzliche Links:,&6 - &ahttps://github.com/mcMMO-Dev/mcMMO/issues&6 Bug Reporting,&6 - &ahttps://discord.gg/EJGVanb &6 Offizieller Discord (Englisch)
+mcMMO.Description.FormerDevs = &3Ehemalige Entwickler: &aGJ, NuclearW, bm01, TfT_02, Glitchfinder
 mcMMO.NoInvites = &cDu hast zurzeit keine Einladungen
 mcMMO.NoPermission = &4Unzureichende Berechtigungen.
 mcMMO.NoSkillNote = &8Wenn du keinen Zugriff auf einen Skill hast wird er hier nicht angezeigt.
-Commands.Database.CooldownMS=Du musst {0}ms warten, bis du diesen Befehl wieder ausführen kannst!
+mcMMO.Template.Prefix = &6(&amcMMO&6) &7{0}
-Profile.PendingLoad=&cDeine mcMMO Daten wurden noch nicht geladen.
-Profile.Loading.FailureNotice=&4[A] &cmcMMO konnte die Spielerdaten von &e{0}&c leider nicht laden. Bitte überprüfe deine Datenbankeinstellungen. &dVersuche: {1}.
-Reminder.Squelched=&7Erinnerung: Du erhälst aktuell keinerlei Benachrichtigungen von mcMMO, um dies zu ändern, nutze den /mcnotify Befehl. Dies ist eine stündliche, automatische Erinnerung.
-Profile.Loading.FailurePlayer=&cmcMMO hat Probleme beim Laden deiner Daten nach &a{0}&c Versuchen. &8Kontaktiere den Serveradmin bezüglich diesem Problem. mcMMO wird weiterhin versuchen, deine Daten zu laden, bis du den Server verlässt. So lange kannst du keine Skillerfahrung sammeln und diese auch nicht nutzen.
-Commands.XPBar.Usage=Proper usage is /mmoxpbar <skillname | reset> <show | hide>
-Commands.Description.mmoxpbar=Player settings for mcMMO XP bars
-Commands.Description.mmocompat=Information about mcMMO and whether or not its in compatibility mode or fully functional.

src/main/resources/locale/locale_en_US.properties

@@ -151,7 +151,7 @@ Acrobatics.SubSkill.Dodge.Name=Dodge
 Acrobatics.SubSkill.Dodge.Description=Reduce attack damage by half
 Acrobatics.SubSkill.Dodge.Stat=Dodge Chance
 Acrobatics.Listener=Acrobatics:
-Acrobatics.Roll.Text=[[ITALIC]]**Rolled**
+Acrobatics.Roll.Text=&o**Rolled**
 Acrobatics.SkillName=ACROBATICS
 #ALCHEMY
 Alchemy.SubSkill.Catalysis.Name=Catalysis
@@ -190,7 +190,7 @@ Axes.Ability.Bonus.4=Greater Impact
 Axes.Ability.Bonus.5=Deal {0} Bonus DMG to unarmored foes
 Axes.Ability.Lower=&7You lower your Axe.
 Axes.Ability.Ready=&3You &6ready&3 your Axe.
-Axes.Ability.Ready.Extra=&3You &6ready&3 your Axe. [[GRAY]]({0} is on cooldown for {1}s)
+Axes.Ability.Ready.Extra=&3You &6ready&3 your Axe. &7({0} is on cooldown for {1}s)
 Axes.Combat.CritStruck=&4You were CRITICALLY hit!
 Axes.Combat.CriticalHit=CRITICAL HIT!
 Axes.Combat.GI.Proc=&a**STRUCK WITH GREAT FORCE**
@@ -503,7 +503,7 @@ Unarmed.Ability.Bonus.1=+{0} DMG Upgrade
 Unarmed.Ability.IronGrip.Attacker=Your opponent has an iron grip!
 Unarmed.Ability.IronGrip.Defender=&aYour iron grip kept you from being disarmed!
 Unarmed.Ability.Lower=&7You lower your fists.
-Unarmed.Ability.Ready=&3You &6ready&3 your Fists.
+Unarmed.Ability.Ready=&3You &6ready&3 your fists.
 Unarmed.SubSkill.Berserk.Name=Berserk
 Unarmed.SubSkill.Berserk.Description=+50% DMG, Breaks weak materials
 Unarmed.SubSkill.Berserk.Stat=Berserk Length
@@ -668,11 +668,11 @@ Commands.Offline=This command does not work for offline players.
 Commands.NotLoaded=Player profile is not loaded yet.
 Commands.Party.Status=&8NAME: &f{0} {1} &8LEVEL: &3{2}
 Commands.Party.Status.Alliance=&8ALLY: &f{0}
-Commands.Party.UnlockedFeatures=&8Unlocked Features: &7[[ITALIC]]{0}
+Commands.Party.UnlockedFeatures=&8Unlocked Features: &7&o{0}
 Commands.Party.ShareMode=&8SHARE MODE:
 Commands.Party.ItemShare=&7ITEM &3({0})
 Commands.Party.ExpShare=&7EXP &3({0})
-Commands.Party.ItemShareCategories=&8Sharing Items: &7[[ITALIC]]{0}
+Commands.Party.ItemShareCategories=&8Sharing Items: &7&o{0}
 Commands.Party.MembersNear=&8NEAR YOU &3{0}&8/&3{1}
 Commands.Party.Accept=&a- Accept party invite
 Commands.Party.Chat.Off=Party Chat only &cOff
@@ -1026,7 +1026,7 @@ Skills.Stats={0}&a{1}&3 XP(&7{2}&3/&7{3}&3)
 Skills.ChildStats={0}&a{1}
 Skills.MaxXP=Max
 Skills.TooTired=You are too tired to use that ability again. &e({0}s)
-Skills.TooTired.Named=[[GRAY]](&6{0}&e {1}s[[GRAY]])
+Skills.TooTired.Named=&7(&6{0}&e {1}s&7)
 Skills.TooTired.Extra=&6{0} &eSuper Ability CDs - {1}
 Skills.Cancelled=&6{0} &ccancelled!
 Skills.ConfirmOrCancel=&aRight-click again to confirm &6{0}&a. Left-click to cancel.
@@ -1186,3 +1186,5 @@ Chat.Identity.Console=&6* Console *
 Chat.Channel.On=&6(&amcMMO-Chat&6) &eYour chat messages will now be automatically delivered to the &a{0}&e chat channel.
 Chat.Channel.Off=&6(&amcMMO-Chat&6) &7Your chat messages will no longer be automatically delivered to specific chat channels.
 Chat.Spy.Party=&6[&eSPY&6-&a{2}&6] &r{0} &b\u2192 &r{1}
+Broadcasts.LevelUpMilestone=&6(&amcMMO&6) {0}&7 has reached level &a{1}&7 in &3{2}&7!
+Broadcasts.PowerLevelUpMilestone=&6(&amcMMO&6) {0}&7 has reached a Power level of &a{1}&7!

src/main/resources/locale/locale_es.properties

@@ -349,7 +349,7 @@ Combat.Gore=&a**MORDISCO**
 Combat.StruckByGore=**FUISTE MORDISQUEADO**
 Combat.TargetDazed=El objetivo fue &4aturdido
 Combat.TouchedFuzzy=&4Est\u00e1s confuso. Te sientes mareado.
-mcMMO.Description=&3Sobre el proyecto&emcMMO&3:,&6mcMMO es un mod RPG de[[RED]codigo abierto&6 creado en Febrero de 2011, &6por &9nossr50&6. La meta es proveer una experiencia igual a la de los RPG.,&3Consejos:,&6 - &aUsa &c/mcmmo help&a para ver los comandos,&6 - &aTeclea &c/SKILLNAME&apara ver informacion detalada de las habilidades,&3Desarrolladores:,&6 - &anossr50 &9(Founder & Project Lead),&6 - &aGJ &9(Former Project Lead),&6 - &aNuclearW &9(Developer),&6 - &abm01 &9(Developer),&6 - &aTfT_02 &9(Developer),&6 - &aGlitchfinder &9(Developer),&6 - &at00thpick1 &9(Developer),&3Useful Links:,&6 - &ahttps://github.com/mcMMO-Dev/mcMMO/issues&6 Reporte de fallos,&6 - &a#mcmmo @ irc.esper.net&6 IRC Chat,
+mcMMO.Description=&3Sobre el proyecto&emcMMO&3:,&6mcMMO es un mod RPG de&ccodigo abierto&6 creado en Febrero de 2011, &6por &9nossr50&6. La meta es proveer una experiencia igual a la de los RPG.,&3Consejos:,&6 - &aUsa &c/mcmmo help&a para ver los comandos,&6 - &aTeclea &c/SKILLNAME&apara ver informacion detalada de las habilidades,&3Desarrolladores:,&6 - &anossr50 &9(Founder & Project Lead),&6 - &aGJ &9(Former Project Lead),&6 - &aNuclearW &9(Developer),&6 - &abm01 &9(Developer),&6 - &aTfT_02 &9(Developer),&6 - &aGlitchfinder &9(Developer),&6 - &at00thpick1 &9(Developer),&3Useful Links:,&6 - &ahttps://github.com/mcMMO-Dev/mcMMO/issues&6 Reporte de fallos,&6 - &a#mcmmo @ irc.esper.net&6 IRC Chat,
 Commands.addlevels.AwardAll.1=&aFuistes recompensado con {0} niveles en todas las habilidades!
 Commands.addlevels.AwardAll.2=Todas las Skins han sido mofificadas por {0}.
 Commands.addlevels.AwardSkill.1=&aFuistes recompensado con {0} niveles en {1}!
@@ -407,7 +407,7 @@ Commands.Party.Status=&8NOMBRE: &f{0} {1}
 Commands.Party.ShareMode=&8MODO COMPARTIR:
 Commands.Party.ItemShare=&7OBJETO &3({0})
 Commands.Party.ExpShare=&7EXP &3({0})
-Commands.Party.ItemShareCategories=&8Compartiendo objetos: &7[[ITALIC]]{0}
+Commands.Party.ItemShareCategories=&8Compartiendo objetos: &7&o{0}
 Commands.Party.MembersNear=&8CERCA DE TI &3{0}&8/&3{1}
 Commands.Party.Accept=- Aceptar invitaci\u00f3n al grupo
 Commands.Party.Chat.Off=S\u00f3lo chat de grupo &cdesactivado
@@ -415,7 +415,7 @@ Commands.Party.Chat.On=S\u00f3lo chat de grupo &cactivado
 Commands.Party.Commands=&a--COMANDOS DEL GRUPO--
 Commands.Party.Invite.0=ATENCI\u00d3N: &aFuiste invitado al grupo {0} por {1}
 Commands.Party.Invite.1=Teclea &a/party accept&e para aceptar la invitacion al grupo
-Commands.Party.Invite=[RED]]- Invitacion de grupo enviada
+Commands.Party.Invite=&c- Invitacion de grupo enviada
 Commands.Party.Join=&7Unido al grupo: {0}
 Commands.Party.Create=&7Grupo creado: {0}
 Commands.Party.Rename=&7el nombre del grupo ha cambiado a: &f{0}
@@ -430,7 +430,7 @@ Commands.Party.Quit=- Abandona tu grupo actual
 Commands.Party.Teleport=<jugador> &c- Teletransportarse al miembro del grupo
 Commands.Party.Toggle=- Alternar chat de grupo
 Commands.Party.1=- Nuevo grupo creado
-Commands.Party.2=[RED]]- Unete a un grupo de jugadores
+Commands.Party.2=&c- Unete a un grupo de jugadores
 Commands.ptp.Enabled=Teletransportacion de grupo &aactivada
 Commands.ptp.Disabled=Teletransportacion de grupo &cdesactivada
 Commands.ptp.NoRequests=No tienes ninguna peticion de teletransporte ahora mismo
@@ -444,7 +444,7 @@ Commands.PowerLevel.Leaderboard=--mcMMO-- Tabla de L\u00edderes: &9Nivel de Pode
 Commands.PowerLevel.Capped=&4NIVEL DE PODER: &a{0} &4MAXIMO PODER: &e{1}
 Commands.PowerLevel=&4NIVEL DE PODER: &a{0}
 Commands.Reset.All=&aTodos los niveles de tus habilidades se resetearon correctamente
-Commands.Reset.Single=[GREEN]]Tu {0} nivel de skill se reseteo correctamente.
+Commands.Reset.Single=&aTu {0} nivel de skill se reseteo correctamente.
 Commands.Reset=Resetea el nivel de una habilidad a 0
 Commands.Skill.Invalid=\u00a1Esa no es una habilidad v\u00e1lida!
 Commands.Skill.Leaderboard=--mcMMO-- Tabla de L\u00edderes: &9{0}
@@ -604,7 +604,7 @@ Hardcore.DeathStatLoss.Name=Bonus de pena de muerte.
 Hardcore.DeathStatLoss.PlayerDeath=&6[mcMMO] &4Has perdido &9{0}&4 de la muerte.
 Hardcore.DeathStatLoss.PercentageChanged=&6[mcMMO] El porcentaje de perdida de stats fue cambiado a {0}.
 Hardcore.Vampirism.Name=Vampirismo
-Hardcore.Vampirism.Killer.Failure=[GOLD]][mcMMO] &e{0}&7 era demasiado inexperto para concederte algo de sabiduria.
+Hardcore.Vampirism.Killer.Failure=&6[mcMMO] &e{0}&7 era demasiado inexperto para concederte algo de sabiduria.
 Hardcore.Vampirism.Killer.Success=&6[mcMMO] &3Has robado &9{0}&3 niveles de &e{1}.
 Hardcore.Vampirism.Victim.Failure=&6[mcMMO] &e{0}&7 fue incapaz de robarte sabiduria!
 Hardcore.Vampirism.Victim.Success=&6[mcMMO] &e{0}&4 te ha robado &9{1}&4 niveles!

src/main/resources/locale/locale_fi.properties

@@ -52,11 +52,11 @@ Mining.Ability.Ready=&a**VALMISTAUDUT ISKEM\u00c4\u00c4N HAKULLASI**
 Mining.Listener=Louhinta:
 Mining.SkillName=LOUHINTA
 Mining.Skills.SuperBreaker.Other.Off=Tehostettu hajoitus&a kului loppuun ajaksi &e{0}
-Mining.Skills.SuperBreaker.Refresh=&aSinun [[YELLOW]Superrikkomis &a-taito on uudelleenlatautunut!
+Mining.Skills.SuperBreaker.Refresh=&aSinun &eSuperrikkomis &a-taito on uudelleenlatautunut!
 Mining.Skillup=Louhimistaito kasvoi {0} tasolla. Kokonaism\u00e4\u00e4r\u00e4 ({1})
 Mining.Blast.Boom=&7**BOOM**
 Mining.Blast.Radius.Increase=R\u00e4j\u00e4ytys Et\u00e4isyys Nousi: &e+{0}
-Mining.Blast.Refresh=&aSinun [[YELLOW] R\u00e4j\u00e4ht\u00e4v\u00e4 Kaivuu &a-kyky on uudelleenlatautunut!
+Mining.Blast.Refresh=&aSinun &e R\u00e4j\u00e4ht\u00e4v\u00e4 Kaivuu &a-kyky on uudelleenlatautunut!
 Repair.SubSkill.Repair.Name=Korjaus
 Repair.SubSkill.RepairMastery.Name=Korjaus Mestaruus
 Repair.SubSkill.RepairMastery.Description=Korotettu korjaus taso

src/main/resources/locale/locale_fr.properties

@@ -145,7 +145,7 @@ Acrobatics.SubSkill.Dodge.Name=Esquive
 Acrobatics.SubSkill.Dodge.Description=R\u00e9duit de moiti\u00e9 les d\u00e9g\u00e2ts re\u00e7us
 Acrobatics.SubSkill.Dodge.Stat=Chance d\'esquive
 Acrobatics.Listener=Acrobatie :
-Acrobatics.Roll.Text=[[ITALIC]]**Roulade**
+Acrobatics.Roll.Text=&o**Roulade**
 Acrobatics.SkillName=ACROBATIE
 #ALCHEMY
 Alchemy.SubSkill.Catalysis.Name=Catalyse
@@ -184,6 +184,7 @@ Axes.Ability.Bonus.4=Impact puissant
 Axes.Ability.Bonus.5=Inflige {0} de d\u00e9g\u00e2ts en plus aux ennemis sans armure
 Axes.Ability.Lower=&7**VOUS ABAISSEZ VOTRE HACHE**
 Axes.Ability.Ready=&a**VOUS LEVEZ VOTRE HACHE**
+Axes.Ability.Ready.Extra=&3**VOUS LEVEZ VOTRE HACHE**. &7({0} se recharge pendant {1}s)
 Axes.Combat.CritStruck=&4Vous avez re\u00e7u un coup critique !
 Axes.Combat.CriticalHit=COUP CRITIQUE !
 Axes.Combat.GI.Proc=&a**FRAPP\u00c9 D\'UNE VIOLENTE INOU\u00cfE**
@@ -251,6 +252,9 @@ Fishing.SubSkill.FishermansDiet.Name=R\u00e9gime de fermier
 Fishing.SubSkill.FishermansDiet.Description=Am\u00e9liore la nutrition des produits de la ferme
 Fishing.SubSkill.FishermansDiet.Stat=R\u00e9gime de fermier:&a Grade {0}
 Fishing.SubSkill.MasterAngler.Name=Ma\u00eetre P\u00eacheur
+Fishing.SubSkill.MasterAngler.Description=Les poissons sont p\u00each\u00e9s plus fr\u00e9quemment, fonctionne mieux lorsque l\'on p\u00eache depuis un bateau.
+Fishing.SubSkill.MasterAngler.Stat=R\u00e9duction minimum du temps de p\u00eache: &a-{0} secondes
+Fishing.SubSkill.MasterAngler.Stat.Extra=R\u00e9duction maximum du temps de p\u00eache: &a-{0} secondes
 Fishing.SubSkill.IceFishing.Name=P\u00eache sur Glace
 Fishing.SubSkill.IceFishing.Description=Vous permet de p\u00eacher dans les biomes glac\u00e9s
 Fishing.SubSkill.IceFishing.Stat=P\u00eache sur Glace
@@ -483,6 +487,7 @@ Taming.Summon.COTW.Success.WithoutLifespan=&a(Appel de la nature) &7Vous avez in
 Taming.Summon.COTW.Success.WithLifespan=&a(Appel de la nature) &7Vous avez invoqu\u00e9 un &6{0}&7 pendant &6{1}&7 secondes.
 Taming.Summon.COTW.Limit=&a(Appel de la nature) &7Vous ne pouvez avoir que &c{0} &7{1} invoqu\u00e9s en m\u00eame temps.
 Taming.Summon.COTW.TimeExpired=&a(Appel de la nature) &7Time is up, your &6{0}&7 departs.
+Taming.Summon.COTW.Removed=&a(Appel de la nature) &77Vous avez invoqu\u00e9 un &6{0}&7 qui a disparu de ce monde.
 Taming.Summon.COTW.BreedingDisallowed=&a(Appel de la nature) &cVous ne pouvez pas reproduire un animal invoqu\u00e9.
 Taming.Summon.COTW.NeedMoreItems=&a(Appel de la nature) &7Vous avez besoin de &e{0} &3{1}&7(s)
 Taming.Summon.Name.Format=&6{1} de {0}
@@ -528,6 +533,11 @@ Woodcutting.SubSkill.TreeFeller.Description=Fait exploser les arbres
 Woodcutting.SubSkill.TreeFeller.Stat=Dur\u00e9e de l\'abatteur
 Woodcutting.SubSkill.LeafBlower.Name=Soufflage
 Woodcutting.SubSkill.LeafBlower.Description=Souffle les feuilles
+Woodcutting.SubSkill.KnockOnWood.Name=Touchons du bois
+Woodcutting.SubSkill.KnockOnWood.Description=Trouve de nouveau goodies lorsque tu utilise l\'abatteur
+Woodcutting.SubSkill.KnockOnWood.Stat=Touchons du bois
+Woodcutting.SubSkill.KnockOnWood.Loot.Normal=Butin standard des arbres
+Woodcutting.SubSkill.KnockOnWood.Loot.Rank2=Butin standard des arbres et de l\'exp\u00e9rience
 Woodcutting.SubSkill.HarvestLumber.Name=Double drops
 Woodcutting.SubSkill.HarvestLumber.Description=Double la quantit\u00e9 r\u00e9colt\u00e9e
 Woodcutting.SubSkill.HarvestLumber.Stat=Double Drop Chance
@@ -579,6 +589,7 @@ Commands.Chat.Console=*Console*
 Commands.Cooldowns.Header=&6--= &aTemps d\'attente des capacit\u00e9s McMMO&6 =--
 Commands.Cooldowns.Row.N=\  &c{0}&f - &6{1} secondes restantes
 Commands.Cooldowns.Row.Y=\  &b{0}&f - &2 Pr\u00eat !
+Commands.Database.CooldownMS=Vous devez attendre {0} millisecondes avant de pouvoir utiliser cette commande de nouveau.
 Commands.Database.Cooldown=Vous devez attendre 1 seconde avant de pouvoir utiliser cette commande de nouveau.
 Commands.Database.Processing=Votre commande pr\u00e9c\u00e9dente est toujours en ex\u00e9cution. Veuillez patienter.
 Commands.Disabled=Cette commande est d\u00e9sactiv\u00e9e.
@@ -630,11 +641,11 @@ Commands.Offline=Cette commande ne fonctionne pas sur les joueurs non connect\u0
 Commands.NotLoaded=Le profil du joueur n\'est pas encore charg\u00e9.
 Commands.Party.Status=&8NOM: &f{0} {1} &8NIVEAU: &3{2}
 Commands.Party.Status.Alliance=&8ALLIANCES: &f{0}
-Commands.Party.UnlockedFeatures=&8Fonctionnalit\u00e9s D\u00e9bloqu\u00e9es: &7[[ITALIC]]{0}
+Commands.Party.UnlockedFeatures=&8Fonctionnalit\u00e9s D\u00e9bloqu\u00e9es: &7&o{0}
 Commands.Party.ShareMode=&8MODE PARTAGE :
 Commands.Party.ItemShare=&7OBJETS &3({0})
 Commands.Party.ExpShare=&7EXP &3({0})
-Commands.Party.ItemShareCategories=&8Partage d\'objets: &7[[ITALIC]]{0}
+Commands.Party.ItemShareCategories=&8Partage d\'objets: &7&o{0}
 Commands.Party.MembersNear=&8A C\u00d4T\u00c9 DE VOUS &3{0}&8/&3{1}
 Commands.Party.Accept=&a- Accepter l\'invitation de la guilde
 Commands.Party.Chat.Off=Canal guilde &cd\u00e9sactiv\u00e9
@@ -709,6 +720,7 @@ Commands.Usage.0=L\'utilisation correcte est /{0}
 Commands.Usage.1=L\'utilisation correcte est /{0} {1}
 Commands.Usage.2=L\'utilisation correcte est /{0} {1} {2}
 Commands.Usage.3=L\'utilisation correcte est /{0} {1} {2} {3}
+Commands.Usage.3.XP=&cL\'utilisation correcte est /{0} {1} {2} {3}&7 (Vous pouvez inclure -s \u00e0 la fin pour effectuer une commande sans en informer le joueur)
 Commands.Usage.FullClassName=nom de classe
 Commands.Usage.Level=niveau
 Commands.Usage.Message=message
@@ -985,6 +997,8 @@ Skills.Stats={0}&a{1}&3 XP (&7{2}&3/&7{3}&3)
 Skills.ChildStats={0}&a{1}
 Skills.MaxXP=Max
 Skills.TooTired=Vous \u00eates trop fatigu\u00e9 pour r\u00e9utiliser cette comp\u00e9tence maintenant.
+Skills.TooTired.Named=&7(&6{0}&e {1}s&7)
+Skills.TooTired.Extra=&6{0} &eSuper abilit\u00e9 - {1}
 Skills.Cancelled={0} annul\u00e9(e) !
 Skills.ConfirmOrCancel=&aFa\u00eetes de nouveau un clic droit pour confirmer &6{0}&a. Clic gauche pour annuler.
 Skills.AbilityGateRequirementFail=&7Vous devez avoir &e{0}&7 niveaux suppl\u00e9mentaires en &3{1}&7 pour utilisez cette super abilit\u00e9.
@@ -1114,3 +1128,13 @@ Commands.Description.mmocompat=Information \u00e0 propos de mcMMO, des compatibi
 Compatibility.Layer.Unsupported=&6Compatibilit\u00e9s pour &a{0}&6 n'est pas une version de Minecraft support\u00e9.
 Compatibility.Layer.PartialSupport=&6Compatibilit\u00e9s pour &a{0}&6 n'est pas une version de Minecraft support\u00e9, mais mcMMO utilise une version qui \u00e9mule certaines fonctionnalit\u00e9s manquantes.
 Commands.XPBar.DisableAll=&6 Toutes les barres d\'XP mcMMO sont d\u00e9sormais d\u00e9sactiv\u00e9s, utilisez /mmoxpbar reset pour remettre la configuration par d\u00e9faut.
+#Options pour le chat moderne
+Chat.Style.Admin=&b(A) &r{0} &b\u2192 &r{1}
+Chat.Style.Party=&a(P) &r{0} &a\u2192 &r{1}
+Chat.Style.Party.Leader=&a(P) &r{0} &6\u2192 &r{1}
+Chat.Identity.Console=&6* Console *
+Chat.Channel.On=&6(&amcMMO-Chat&6) &eVos messages dans le chat seront désormais automatiquement envoyé dans le salon &a{0}&e.
+Chat.Channel.Off=&6(&amcMMO-Chat&6) &7Vos messages dans le chat ne sont plus envoyé dans un salon spécifique.
+Chat.Spy.Party=&6[&eSPY&6-&a{2}&6] &r{0} &b\u2192 &r{1}
+Broadcasts.LevelUpMilestone=&6(&amcMMO&6) {0}&7 a atteint le niveau &a{1}&7 en &3{2}&7!
+Broadcasts.PowerLevelUpMilestone=&6(&amcMMO&6) {0}&7 a atteint le niveau de puissance pour &a{1}&7!

src/main/resources/locale/locale_hu_HU.properties

@@ -145,7 +145,7 @@ Acrobatics.SubSkill.Dodge.Name=Kit\u00E9r\u00E9s
 Acrobatics.SubSkill.Dodge.Stat=Es\u00E9ly Kit\u00E9r\u00E9sre
 Acrobatics.SubSkill.Dodge.Description=A fel\u00E9re cs\u00F6kkenti a t\u00E1mad\u00E1si sebz\u00E9st
 Acrobatics.Listener=Akrobatika:
-Acrobatics.Roll.Text=[[ITALIC]]**Gurulva**
+Acrobatics.Roll.Text=&o**Gurulva**
 Acrobatics.SkillName=AKROBATIKA
 #ALCHEMY
 Alchemy.SubSkill.Catalysis.Name=Katal\u00EDzis
@@ -182,8 +182,9 @@ Axes.Ability.Bonus.2=P\u00E1nc\u00E9l \u00DCt\u00E9s
 Axes.Ability.Bonus.3={0} B\u00F3nusz sebz\u00E9s p\u00E1nc\u00E9l ellen
 Axes.Ability.Bonus.4=Er\u0151s \u00DCt\u00E9s
 Axes.Ability.Bonus.5={0} B\u00F3nusz sebz\u00E9s felfegyverzetlen ellenfelek ellen
-Axes.Ability.Lower=&7Leengeded a balt\u00E1d
+Axes.Ability.Lower=&7Leengeded a balt\u00E1d.
-Axes.Ability.Ready=&6Felemeled&3 a balt\u00E1d
+Axes.Ability.Ready=&6Felemeled&3 a balt\u00E1d.
+Axes.Ability.Ready.Extra=&6Felemeled&3 a balt\u00E1d. [[GRAY]]({0} a v\u00E1rakoz\u00E1si id\u0151 ehhez {1}s)
 Axes.Combat.CritStruck=&4KRITIKUS sebz\u00E9st kapt\u00E1l!
 Axes.Combat.CriticalHit=KRITIKUS SEBZ\u00C9S!
 Axes.Combat.GI.Proc=&a**ER\u0150S \u00DCT\u00C9SSEL CSAPT\u00C1L**
@@ -223,7 +224,7 @@ Excavation.SubSkill.Archaeology.Stat=R\u00E9g\u00E9szet Tapasztalatpont Es\u00E9
 Excavation.SubSkill.Archaeology.Stat.Extra=R\u00E9g\u00E9szet Tapasztalatpont Mennyis\u00E9g
 Excavation.Listener=\u00C1s\u00E1s:
 Excavation.SkillName=\u00C1S\u00C1S
-Excavation.Skills.GigaDrillBreaker.Off=*Giga F\u00FAr\u00F3-T\u00F6r\u0151 v\u00E9get \u00E9rt**
+Excavation.Skills.GigaDrillBreaker.Off=**Giga F\u00FAr\u00F3-T\u00F6r\u0151 v\u00E9get \u00E9rt**
 Excavation.Skills.GigaDrillBreaker.On=&a**GIGA F\u00DAR\u00D3-T\u00D6R\u0150 AKTIV\u00C1LVA**
 Excavation.Skills.GigaDrillBreaker.Refresh=&aA &eGiga F\u00FAr\u00F3-T\u00F6r\u0151 &ak\u00E9pess\u00E9ged ism\u00E9t el\u00E9rhet\u0151!
 Excavation.Skills.GigaDrillBreaker.Other.Off=Giga F\u00FAr\u00F3-T\u00F6r\u0151&a kikapcsolva: &e{0}
@@ -240,7 +241,7 @@ Fishing.Ability.Locked.2=LEZ\u00C1RVA {0}+ K\u00C9PESS\u00C9G SZINTIG (MESTER HO
 Fishing.SubSkill.TreasureHunter.Name=Kincsvad\u00E1sz
 Fishing.SubSkill.TreasureHunter.Description=Furcsa t\u00E1rgyak kihal\u00E1sz\u00E1sa
 Fishing.SubSkill.TreasureHunter.Stat=Kincsvad\u00E1sz Szint: &a{0}&3/&a{1}
-Fishing.SubSkill.TreasureHunter.Stat.Extra=T\u00E1rgy Es\u00E9si Es\u00E9ly: &7\u00C1tlagos: &e{0} &aRendk\u00EDv\u00FCli: &e{1}\n&9Ritka: &e{2} &dEpikus: &e{3} &6Legend\u00E1s: &e{4} &bMythic: &e{5}
+Fishing.SubSkill.TreasureHunter.Stat.Extra=T\u00E1rgy Es\u00E9si Es\u00E9ly: &7\u00C1tlagos: &e{0} &aRendk\u00EDv\u00FCli: &e{1}\n&9Ritka: &e{2} &dEpikus: &e{3} &6Legend\u00E1s: &e{4} &bM\u00EDtikus: &e{5}
 Fishing.SubSkill.MagicHunter.Name=M\u00E1gikus Vad\u00E1sz
 Fishing.SubSkill.MagicHunter.Description=Elvar\u00E1zsolt T\u00E1rgyak Megtal\u00E1l\u00E1sa
 Fishing.SubSkill.MagicHunter.Stat=Es\u00E9ly M\u00E1gikus Vad\u00E1szra
@@ -251,6 +252,9 @@ Fishing.SubSkill.FishermansDiet.Name=Horg\u00E1szok Di\u00E9t\u00E1ja
 Fishing.SubSkill.FishermansDiet.Description=N\u00F6veli a kihal\u00E1szott \u00E9telek t\u00E1p\u00E9rt\u00E9k\u00E9t
 Fishing.SubSkill.FishermansDiet.Stat=Horg\u00E1szok Di\u00E9t\u00E1ja:&a Szint {0}
 Fishing.SubSkill.MasterAngler.Name=Mester Horg\u00E1sz
+Fishing.SubSkill.MasterAngler.Description=A halak gyakrabban foghat\u00F3ak, jobban m\u0171k\u00F6dik ha egy cs\u00F3nakb\u00F3l horg\u00E1szol.
+Fishing.SubSkill.MasterAngler.Stat=A horg\u00E1szat minimum v\u00E1rakoz\u00E1si idej\u00E9nek cs\u00F6kkent\u00E9se: &a-{0} m\u00E1sodperc
+Fishing.SubSkill.MasterAngler.Stat.Extra=A horg\u00E1szat maximum v\u00E1rakoz\u00E1si idej\u00E9nek cs\u00F6kkent\u00E9se: &a-{0} m\u00E1sodperc
 Fishing.SubSkill.IceFishing.Name=J\u00E9g Horg\u00E1szat
 Fishing.SubSkill.IceFishing.Description=Lehet\u0151v\u00E9 teszi sz\u00E1modra, hogy fagyos t\u00E1jakon is horg\u00E1szhass
 Fishing.SubSkill.IceFishing.Stat=J\u00E9g Horg\u00E1szat
@@ -271,7 +275,7 @@ Herbalism.SubSkill.GreenTerra.Name=Z\u00F6ld F\u00F6ld
 Herbalism.SubSkill.GreenTerra.Description=Terjeszd a F\u00F6ldet, 3x T\u00E1rgy Es\u00E9s
 Herbalism.SubSkill.GreenTerra.Stat=Z\u00F6ld H\u00FCvelyk Id\u0151tartam
 Herbalism.SubSkill.GreenThumb.Name=Z\u00F6ld H\u00FCvelyk
-Herbalism.SubSkill.GreenThumb.Description=Automatikusan el\u00FCltet egy magot betakar\u00EDt\u00E1sn\u00E1l
+Herbalism.SubSkill.GreenThumb.Description=Automatikusan el\u00FCltet egy magot kap\u00E1val t\u00F6rt\u00E9n\u0151 betakar\u00EDt\u00E1sn\u00E1l
 Herbalism.SubSkill.GreenThumb.Stat=Es\u00E9ly Z\u00F6ld H\u00FCvelykre
 Herbalism.SubSkill.GreenThumb.Stat.Extra=Z\u00F6ld H\u00FCvelyk \u00C1llapota: &a A n\u00F6v\u00E9nyek a(z) {0} \u00E1llapotban n\u0151nek.
 Herbalism.Effect.4=Z\u00F6ld H\u00FCvelyk (Blokkok)
@@ -483,8 +487,9 @@ Taming.Summon.COTW.Success.WithoutLifespan=&a(A Vadon Szava) &7Megid\u00E9zt\u00
 Taming.Summon.COTW.Success.WithLifespan=&a(A Vadon Szava) &7Megid\u00E9zt\u00E9l egy &6{0}&7 \u00E9s az id\u0151tartama &6{1}&7 m\u00E1sodperc.
 Taming.Summon.COTW.Limit=&a(A Vadon Szava) &7Egyszerre csak &c{0} &7megid\u00E9zett &7{1} h\u00E1zi\u00E1llat lehet egyid\u0151ben.
 Taming.Summon.COTW.TimeExpired=&a(A Vadon Szava) &7Az id\u0151 v\u00E9get \u00E9r, &6{0}&7 elt\u00E1vozik.
+Taming.Summon.COTW.Removed=&a(A Vadon Szava) &7A megid\u00E9zett &6{0}&7 elt\u0171nt ebb\u0151l a vil\u00E1gb\u00F3l.
 Taming.Summon.COTW.BreedingDisallowed=&a(A Vadon Szava) &cNem szapor\u00EDthatsz megid\u00E9zett \u00E1llatot.
-Taming.Summon.COTW.NeedMoreItems=&a(A Vadon Szava) &7Sz\u00FCks\u00E9g van &e{0}&7 t\u00F6bb &3{1}&7(m)
+Taming.Summon.COTW.NeedMoreItems=&a(A Vadon Szava) &7Sz\u00FCks\u00E9g van &e{0}&7 t\u00F6bb &3{1}&7(s)
 Taming.Summon.Name.Format=&6(COTW) &f{0} \u00E1llata {1}
 #UNARMED
 Unarmed.Ability.Bonus.0=Ac\u00E9l-\u00D6k\u00F6l St\u00EDlus
@@ -528,6 +533,11 @@ Woodcutting.SubSkill.TreeFeller.Description=Felrobbantja a f\u00E1kat
 Woodcutting.SubSkill.TreeFeller.Stat=Fad\u00F6nt\u00E9s Hossza
 Woodcutting.SubSkill.LeafBlower.Name=Lev\u00E9lf\u00FAj\u00F3
 Woodcutting.SubSkill.LeafBlower.Description=Elf\u00FAjja a leveleket az \u00FAtb\u00F3l
+Woodcutting.SubSkill.KnockOnWood.Name=Fa Kopogtat\u00E1s
+Woodcutting.SubSkill.KnockOnWood.Description=Keress tov\u00E1bbi finoms\u00E1gokat a Fad\u00F6nt\u00E9s haszn\u00E1latakor
+Woodcutting.SubSkill.KnockOnWood.Stat=Fa Kopogtat\u00E1s
+Woodcutting.SubSkill.KnockOnWood.Loot.Normal=Standard zs\u00E1km\u00E1ny a f\u00E1kt\u00F3l
+Woodcutting.SubSkill.KnockOnWood.Loot.Rank2=Standard zs\u00E1km\u00E1ny \u00E9s tapasztalat pontok a f\u00E1kt\u00F3l
 Woodcutting.SubSkill.HarvestLumber.Name=Dupla T\u00E1rgyak
 Woodcutting.SubSkill.HarvestLumber.Description=Dupla Zs\u00E1km\u00E1ny
 Woodcutting.SubSkill.HarvestLumber.Stat=Es\u00E9ly Dupla T\u00E1rgy-es\u00E9sre
@@ -580,6 +590,7 @@ Commands.Cooldowns.Header=&6--= &amcMMO K\u00E9pess\u00E9g V\u00E1rakoz\u00E1sok
 Commands.Cooldowns.Row.N=\  &c{0}&f - &6{1} m\u00E1sodperc maradt
 Commands.Cooldowns.Row.Y=\  &b{0}&f - &2K\u00E9szen \u00E1ll!
 Commands.Database.CooldownMS=V\u00E1rnod kell {0} ezredm\u00E1sodpercet, miel\u0151tt ism\u00E9t haszn\u00E1lod a parancsot.
+Commands.Database.Cooldown=V\u00E1rnod kell {0} m\u00E1sodpercet, miel\u0151tt ism\u00E9t haszn\u00E1lod a parancsot.
 Commands.Database.Processing=Az el\u0151z\u0151 parancs m\u00E9g feldolgoz\u00E1s alatt \u00E1ll. K\u00E9rlek v\u00E1rj.
 Commands.Disabled=Ez a parancs le van tiltva.
 Commands.DoesNotExist= &cA j\u00E1t\u00E9kos nincs az adatb\u00E1zisban!
@@ -630,11 +641,11 @@ Commands.Offline=Ez a parancs nem haszn\u00E1lhat\u00F3 offline j\u00E1t\u00E9ko
 Commands.NotLoaded=A profilod m\u00E9g nincs bet\u00F6ltve.
 Commands.Party.Status=&8N\u00C9V: &f{0} {1} &8SZINT: &3{2}
 Commands.Party.Status.Alliance=&8SZ\u00D6VETS\u00C9GES: &f{0}
-Commands.Party.UnlockedFeatures=&8Feloldott Funkci\u00F3k: &7[[ITALIC]]{0}
+Commands.Party.UnlockedFeatures=&8Feloldott Funkci\u00F3k: &7&o{0}
 Commands.Party.ShareMode=&8Osztoz\u00E1s m\u00F3d:
 Commands.Party.ItemShare=&7T\u00C1RGY &3({0})
 Commands.Party.ExpShare=&7TAPASZTALAT &3({0})
-Commands.Party.ItemShareCategories=&8T\u00E1rgyak Megoszt\u00E1sa: &7[[ITALIC]]{0}
+Commands.Party.ItemShareCategories=&8T\u00E1rgyak Megoszt\u00E1sa: &7&o{0}
 Commands.Party.MembersNear=&8A K\u00D6ZELEDBEN &3{0}&8/&3{1}
 Commands.Party.Accept=&a- Party felk\u00E9r\u00E9s elfogad\u00E1sa
 Commands.Party.Chat.Off=Csak party Chat &ckikapcsolva
@@ -830,7 +841,7 @@ Commands.xplock.locked=&6Az XP s\u00E1v most le van z\u00E1rva {0}!
 Commands.xplock.unlocked=&6Az XP s\u00E1v most &aFELOLDVA&6!
 Commands.xprate.modified=&cAz XP AR\u00C1NYA m\u00F3dosult {0}
 Commands.xprate.over=&cmcMMO XP szorz\u00F3 esem\u00E9ny V\u00C9GE!
-Commands.xprate.proper.0=&cAz XP sebess\u00E9g v\u00E1ltoztat\u00E1s\u00E1nak megfelel\u0151 haszn\u00E1lata: /xprate <eg\u00E9sz sz\u00E1m> <true / false>
+Commands.xprate.proper.0=&cAz XP sebess\u00E9g v\u00E1ltoztat\u00E1s\u00E1nak megfelel\u0151 haszn\u00E1lata: /xprate <eg\u00E9sz sz\u00E1m> <true/false>
 Commands.xprate.proper.1=&cAz XP-alap\u00E9rtelmezett \u00E9rt\u00E9k helyes vissza\u00E1ll\u00EDt\u00E1sa: /xprate reset
 Commands.xprate.proper.2=&cAdjon meg igaz vagy hamis jelz\u00E9st, hogy jelezze, hogy ez egy xp esem\u00E9ny vagy sem
 Commands.NegativeNumberWarn=Ne haszn\u00E1lj negat\u00EDv sz\u00E1mokat!
@@ -851,7 +862,7 @@ Notifications.Admin.Format.Others=&6(&amcMMO &3Admin&6) &7{0}
 Notifications.Admin.Format.Self=&6(&amcMMO&6) &7{0}
 
 # Event
-XPRate.Event= &6mcMMO XP szorz\u00F3 event! Az XP ar\u00E1nya {0}x!
+XPRate.Event=&6mcMMO XP szorz\u00F3 event! Az XP ar\u00E1nya {0}x!
 
 #GUIDES
 Guides.Available=&7A {0} seg\u00EDts\u00E9g el\u00E9rhet\u0151 - haszn\u00E1lat: /{1} ? [oldal]
@@ -894,7 +905,7 @@ Guides.Excavation.Section.5=&3Megjegyz\u00E9sek az \u00C1s\u00E1sr\u00F3l:\n&eA
 Guides.Fishing.Section.0=&3A Horg\u00E1szatr\u00F3l:\n&eEzzel a k\u00E9pess\u00E9ggel a horg\u00E1sz\u00E1s ism\u00E9t izgalmas!\n&eTal\u00E1lj rejtett kincseket, vagy r\u00E1zz le t\u00E1rgyakat a \u00E9l\u0151l\u00E9nyekr\u0151l.\n\n&3Tapasztalatszerz\u00E9s:\n&eHorg\u00E1ssz.
 Guides.Fishing.Section.1=&3Hogyan m\u0171k\u00F6dik a kincsvad\u00E1szat?\n&eEz a k\u00E9pess\u00E9g lehet\u0151v\u00E9 teszi, hogy kincset tal\u00E1lj horg\u00E1sz\u00E1s k\u00F6zben, \n&ealacsony es\u00E9llyel fejlesztett t\u00E1rgyakra.\n&eMinden lehets\u00E9ges kincs a horg\u00E1sz\u00E1sban szintt\u0151l f\u00FCggetlen\u00FCl kifoghat\u00F3\n&e Azonban a kifog\u00E1s es\u00E9lye f\u00FCgg att\u00F3l, hogy a t\u00E1rgy milyen ritkas\u00E1g\u00FA.\n&eMin\u00E9l nagyobb a horg\u00E1sz\u00E1s szinted, ann\u00E1l nagyobb es\u00E9lyed van jobb kincseket tal\u00E1lni.
 Guides.Fishing.Section.2=&3Hogyan m\u0171k\u00F6dik a j\u00E9ghorg\u00E1szat?\n&eEz a passz\u00EDv k\u00E9pess\u00E9g lehet\u0151v\u00E9 teszi, hogy befagyott tavakban horg\u00E1ssz!\n&eHaszn\u00E1ld a horg\u00E1szbotod (2x) a jeges tavon \u00E9s a k\u00E9pess\u00E9g k\u00E9sz\u00EDt egy lyukat a horg\u00E1sz\u00E1shoz.
-Guides.Fishing.Section.3=&3Hogyan m\u0171k\u00F6dik a Mester Horg\u00E1szat?\n&eEz a passz\u00EDv k\u00E9pess\u00E9g n\u00F6veli a fog\u00E1s es\u00E9ly\u00E9t horg\u00E1szat k\u00F6zben.\n&eMiut\u00E1n feloldottad ezt a k\u00E9pess\u00E9get, a kap\u00E1s es\u00E9lyed dupl\u00E1z\u00F3dik, ha cs\u00F3nakban, vagy \u00F3ce\u00E1n \u00E9ghajlaton horg\u00E1szol.
+Guides.Fishing.Section.3=&3Hogyan m\u0171k\u00F6dik a Mester Horg\u00E1szat?\n&eEz a passz\u00EDv k\u00E9pess\u00E9g n\u00F6veli a fog\u00E1s es\u00E9ly\u00E9t horg\u00E1szat k\u00F6zben.\n&eMiut\u00E1n feloldottad ezt a k\u00E9pess\u00E9get, jav\u00EDtja a halak fog\u00E1s\u00E1nak es\u00E9ly\u00E9t, ha cs\u00F3nakban horg\u00E1szol.
 Guides.Fishing.Section.4=&3Hogyan m\u0171k\u00F6dik a ler\u00E1z\u00E1s?\n&eEz az akt\u00EDv k\u00E9pess\u00E9g lehet\u0151v\u00E9 teszi, hogy t\u00E1rgyakat r\u00E1zhass le a \u00E9l\u0151l\u00E9nyekr\u0151l, ha eltal\u00E1lod \u0151ket a horg\u00E1szbotoddal. \n&eAz \u00E9l\u0151l\u00E9nyek ugyan olyan t\u00E1rgyakat dobnak, mint amit hal\u00E1lukkor.\n&eValamint lehet\u0151s\u00E9g van ezzel olyan \u00E9l\u0151l\u00E9ny fejeket is szerezni, amelyeket \u00E1ltal\u00E1ban nem lehets\u00E9ges t\u00FAl\u00E9l\u0151 m\u00F3dban.
 Guides.Fishing.Section.5=&3Hogyan m\u0171k\u00F6dik a horg\u00E1sz di\u00E9ta?\n&eEz a passz\u00EDv k\u00E9pess\u00E9g n\u00F6veli az \u00E9telcs\u00EDk visszat\u00F6lt\u00E9s\u00E9t, ha halat eszel.
 Guides.Fishing.Section.6=&3Tudnival\u00F3 a horg\u00E1szatr\u00F3l:\n&eA fogott t\u00E1rgyak list\u00E1ja teljesen \u00E1ll\u00EDthat\u00F3, teh\u00E1t szervert\u0151l f\u00FCgg.
@@ -986,6 +997,8 @@ Skills.Stats={0}&a{1}&3 XP(&7{2}&3/&7{3}&3)
 Skills.ChildStats={0}&a{1}
 Skills.MaxXP=Max
 Skills.TooTired=T\u00FAl f\u00E1radt vagy, hogy \u00FAjra haszn\u00E1lhasd ezt a k\u00E9pess\u00E9get. &e({0}s)
+Skills.TooTired.Named=[[GRAY]](&6{0}&e {1}s[[GRAY]])
+Skills.TooTired.Extra=&6{0} &eSzuperk\u00E9pess\u00E9g v\u00E1rakoz\u00E1sok - {1}
 Skills.Cancelled=&6{0} &cMegszak\u00EDtva!
 Skills.ConfirmOrCancel=&aJobb klikkelj a meger\u0151s\u00EDt\u00E9shez. &6{0}&a. Bal klikkelj a megszak\u00EDt\u00E1shoz.
 Skills.AbilityGateRequirementFail=&7M\u00E9g &e{0}&7 szint sz\u00FCks\u00E9ges a(z) &3{1}&7b\u00F3l/b\u0151l, hogy haszn\u00E1lhasd ezt a szuper k\u00E9pess\u00E9get.
@@ -1036,7 +1049,7 @@ Smelting.SubSkill.FuelEfficiency.Name=\u00DCzemanyag hat\u00E9konys\u00E1g
 Smelting.SubSkill.FuelEfficiency.Description=N\u00F6veli az \u00FCzemanyag id\u0151tartam\u00E1t olvaszt\u00E1sn\u00E1l
 Smelting.SubSkill.FuelEfficiency.Stat=\u00DCzemanyag Hat\u00E9konys\u00E1gi szorz\u00F3: &e{0}x
 Smelting.SubSkill.SecondSmelt.Name=M\u00E1sodik olvaszt\u00E1s
-SSmelting.SubSkill.SecondSmelt.Description=Megdupl\u00E1zza a kiolvasztott t\u00E1rgyak mennyis\u00E9g\u00E9t
+Smelting.SubSkill.SecondSmelt.Description=Megdupl\u00E1zza a kiolvasztott t\u00E1rgyak mennyis\u00E9g\u00E9t
 Smelting.SubSkill.SecondSmelt.Stat=Es\u00E9ly M\u00E1sodik B\u00E1ny\u00E1sz\u00E1sra
 Smelting.Effect.4=Vanilla XP N\u00F6vel\u0151
 Smelting.Effect.5=N\u00F6veli a kapott XP mennyis\u00E9g\u00E9t olvaszt\u00E1sn\u00E1l
@@ -1105,7 +1118,7 @@ Holiday.Anniversary=&9Boldog {0}. \u00C9vfordul\u00F3t!\n&9nossr50, \u00E9s az \
 #Reminder Messages
 Reminder.Squelched=&7Eml\u00E9keztet\u0151: jelenleg nem kapsz \u00E9rtes\u00EDt\u00E9seket az mcMMO-t\u00F3l. Ahhoz, hogy enged\u00E9lyezd az \u00E9rtes\u00EDt\u00E9seket, futtasd \u00FAjra a /mcnotify parancsot. Ez egy automatikus, \u00F3r\u00E1nk\u00E9nti eml\u00E9keztet\u0151.
 #Locale
-Locale.Reloaded=&aFord\u00EDt\u00E1s \u00FAjrat\u00F6ltve!
+Locale.Reloaded=&aA ford\u00EDt\u00E1s \u00FAjrat\u00F6ltve!
 #Player Leveling Stuff
 LevelCap.PowerLevel=&6(&amcMMO&6) &eEl\u00E9rted ezt a teljes\u00EDtm\u00E9nyszintet &c{0}&e. Ezen a ponton megsz\u0171nik a k\u00E9pess\u00E9gek szintje.
 LevelCap.Skill=&6(&amcMMO&6) &eEl\u00E9rted ezt a szintet &c{0}&e ebben &6{1}&e. Ezen a ponton megsz\u0171nik a k\u00E9pess\u00E9g szintje.
@@ -1123,3 +1136,5 @@ Chat.Identity.Console=&6* Konzol *
 Chat.Channel.On=&6(&amcMMO-Chat&6) &eA chat \u00FCzeneteid mostant\u00F3l automatikusan a(z) &a{0}&e chat csatorn\u00E1ra ker\u00FClnek.
 Chat.Channel.Off=&6(&amcMMO-Chat&6) &7A chat \u00FCzeneteid a tov\u00E1bbiakban nem ker\u00FClnek automatikusan a meghat\u00E1rozott chat csatorn\u00E1kra.
 Chat.Spy.Party=&6[&eSPY&6-&a{2}&6] &r{0} &b\u2192 &r{1}
+Broadcasts.LevelUpMilestone=&6(&amcMMO&6) {0}&7 el\u00E9rte a(z) &a{1}&7. [[DARK_AQUA]]{2}&7 szintet!
+Broadcasts.PowerLevelUpMilestone=&6(&amcMMO&6) {0}&7 el\u00E9rte a(z) &a{1}&7. Er\u0151szintet!

src/main/resources/locale/locale_it.properties

@@ -149,7 +149,7 @@ Acrobatics.SubSkill.Dodge.Name=Schivata
 Acrobatics.SubSkill.Dodge.Description=Riduce della met\u00E0 il danno di attacco
 Acrobatics.SubSkill.Dodge.Stat=Possibilit\u00E0 di Schivata
 Acrobatics.Listener=Acrobatica:
-Acrobatics.Roll.Text=[[ITALIC]]**Capriola Eseguita**
+Acrobatics.Roll.Text=&o**Capriola Eseguita**
 Acrobatics.SkillName=ACROBATICA
 
 #ALCHEMY
@@ -643,11 +643,11 @@ Commands.Offline=Questo comando non funziona per i giocatori offline.
 Commands.NotLoaded=Il profilo del giocatore non \u00E8 ancora caricato.
 Commands.Party.Status=&8NOME: &f{0} {1} &8LIVELLO: &3{2}
 Commands.Party.Status.Alliance=&8ALLEATO: &f{0}
-Commands.Party.UnlockedFeatures=&8Funzionalit\u00E0 Sbloccate: &7[[ITALIC]]{0}
+Commands.Party.UnlockedFeatures=&8Funzionalit\u00E0 Sbloccate: &7&o{0}
 Commands.Party.ShareMode=&8MODALIT\u00E0 SPARTIZIONE:
 Commands.Party.ItemShare=&7OGGETTI &3({0})
 Commands.Party.ExpShare=&7XP &3({0})
-Commands.Party.ItemShareCategories=&8Spartizione Oggetti: &7[[ITALIC]]{0}
+Commands.Party.ItemShareCategories=&8Spartizione Oggetti: &7&o{0}
 Commands.Party.MembersNear=&8VICINO A TE &3{0}&8/&3{1}
 Commands.Party.Accept=&a- Accetta un invito in un party
 Commands.Party.Chat.Off=Chat Party &cInattiva

src/main/resources/locale/locale_ja_JP.properties

@@ -1,3 +1,7 @@
+#I'm going to try to normalize our locale file, forgive the mess for now.
+
+#DO NOT USE COLOR CODES IN THE JSON KEYS
+#COLORS ARE DEFINED IN advanced.yml IF YOU WISH TO CHANGE THEM
 JSON.Rank=\u30e9\u30f3\u30af
 JSON.DescriptionHeader=\u8aac\u660e
 JSON.JWrapper.Header=\u8a73\u7d30
@@ -35,6 +39,7 @@ JSON.URL.Wiki=mcMMO\u516c\u5f0fwiki
 JSON.SkillUnlockMessage=&6[ mcMMO&e @&3{0} &6\u30e9\u30f3\u30af &3{1}&6 \u30a2\u30f3\u30ed\u30c3\u30af\uff01 ]
 JSON.Hover.Rank=&9&l\u30e9\u30f3\u30af&r&7-&r &e{0}
 JSON.Hover.NextRank=&7&o{0}\u30ec\u30d9\u30eb\u3067\u306e\u6b21\u306e\u30a2\u30c3\u30d7\u30b0\u30ec\u30fc\u30c9
+# for JSON.Hover.Mystery you can add {0} to insert the level required into the name, I don't like how that looks so I'm not doing that atm
 JSON.Hover.Mystery=&7???
 JSON.Hover.Mystery2=&e[&8{0}&e]&8???&r
 JSON.Hover.SkillName=&3{0}&r
@@ -43,15 +48,20 @@ JSON.Hover.MaxRankSkillName=&6{0}&r
 JSON.Hover.AtSymbolSkills=&e@
 JSON.Hover.AtSymbolURL=&e@
 
+#This is the message sent to players when an ability is activated
 JSON.Notification.SuperAbility={0}
 
+#These are the JSON Strings used for SubSkills
 JSON.Acrobatics.Roll.Interaction.Activated=\u30c6\u30b9\u30c8 &c\u53d7\u3051\u8eab\u30c6\u30b9\u30c8
 JSON.Acrobatics.SubSkill.Roll.Details.Tips=\u843d\u4e0b\u4e2d\u306b\u30b9\u30cb\u30fc\u30af\u3059\u308b\u3068\u3001\u6700\u59272\u500d\u306e\u30c0\u30e1\u30fc\u30b8\u3092\u9632\u3050\u3053\u3068\u304c\u3067\u304d\u307e\u3059\uff01
 Anvil.SingleItemStack=&c\u30b9\u30bf\u30c3\u30af\u3055\u308c\u305f\u30a2\u30a4\u30c6\u30e0\u306f\u30b5\u30eb\u30d9\u30fc\u30b8\u307e\u305f\u306f\u4fee\u5fa9\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002\u6700\u521d\u306b\u30b9\u30bf\u30c3\u30af\u3092\u5206\u5272\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 
+#DO NOT USE COLOR CODES IN THE JSON KEYS 	
+#COLORS ARE DEFINED IN advanced.yml IF YOU WISH TO CHANGE THEM
+
 mcMMO.Template.Prefix=&6(&amcMMO&6) &7{0}
 
-### BEGIN STYLING ###
+# BEGIN STYLING
 Ability.Generic.Refresh=&a**\u30a2\u30d3\u30ea\u30c6\u30a3 \u30ea\u30d5\u30ec\u30c3\u30b7\u30e5\uff01**
 Ability.Generic.Template.Lock=&7{0}
 
@@ -73,6 +83,7 @@ Overhaul.mcMMO.Header=&c[]=====[]&a mcMMO - Overhaul Era &c[]=====[]
 Overhaul.mcMMO.Url.Wrap.Prefix=&c[|
 Overhaul.mcMMO.Url.Wrap.Suffix=&c|]
 Overhaul.mcMMO.MmoInfo.Wiki=&e[&fwiki\u3067\u3053\u306e\u30b9\u30ad\u30eb\u3092\u898b\u308b&e]
+# Overhaul.Levelup can take {0} - Skill Name defined in Overhaul.Name {1} - Amount of levels gained {2} - Level in skill 
 Overhaul.Levelup=&l{0}\u304c&r&a&l{2}&r&f&l\u306b\u5897\u52a0\u3057\u307e\u3057\u305f\u3002
 Overhaul.Name.Acrobatics=\u30a2\u30af\u30ed\u30d0\u30c6\u30a3\u30c3\u30af
 Overhaul.Name.Alchemy=\u932c\u91d1\u8853
@@ -95,6 +106,8 @@ Commands.mcc.Header=&c---[]&amcMMO \u30b3\u30de\u30f3\u30c9&c[]---
 Commands.Other=&c---[]&a\u30b9\u30da\u30b7\u30e3\u30eb\u30b3\u30de\u30f3\u30c9&c[]---
 Commands.Party.Header=&c-----[]&a\u30d1\u30fc\u30c6\u30a3\u30fc&c[]-----
 Commands.Party.Features.Header=&c-----[]&a\u7279\u5fb4&c[]-----
+# XP BAR Allows for the following variables -- {0} = Skill Level, {1} Current XP, {2} XP Needed for next level, {3} Power Level, {4} Percentage of Level 	
+# Make sure you turn on Experience_Bars.ThisMayCauseLag.AlwaysUpdateTitlesWhenXPIsGained if you want the XP bar title to update every time a player gains XP! 
 XPBar.Template={0}
 XPBar.Template.EarlyGameBoost=&6\u65b0\u3057\u3044\u30b9\u30ad\u30eb\u3092\u5b66\u3093\u3067\u3044\u307e\u3059...
 XPBar.Acrobatics=\u30a2\u30af\u30ed\u30d0\u30c6\u30a3\u30c3\u30af Lv.&6{0}
@@ -112,26 +125,30 @@ XPBar.Swords=\u5263 Lv.&6{0}
 XPBar.Taming=\u8abf\u6559 Lv.&6{0}
 XPBar.Unarmed=\u7d20\u624b Lv.&6{0}
 XPBar.Woodcutting=\u6728\u3053\u308a Lv.&6{0}
+#This is just a preset template that gets used if the 'ExtraDetails' setting is turned on in experience.yml (off by default), you can ignore this template and just edit the strings above 
 XPBar.Complex.Template={0} &3 {4}&f% &3(&f{1}&3/&f{2}&3)
-### END STYLING ###
+# XP BAR Allows for the following variables -- {0} = Skill Level, {1} Current XP, {2} XP Needed for next level, {3} Power Level, {4} Percentage of Level 	
+# Make sure you turn on Experience_Bars.ThisMayCauseLag.AlwaysUpdateTitlesWhenXPIsGained if you want the XP bar title to update every time a player gains XP! 	### END STYLING ###
+# END STYLING
 
 # ACROBATICS
 Acrobatics.Ability.Proc=&a**\u512a\u96c5\u306b\u7740\u5730\u3057\u305f**
 Acrobatics.Combat.Proc=&a**\u8eb1\u3057\u305f**
-Acrobatics.SubSkill.Roll.Stats=&6\u53d7\u3051\u8eab \u78ba\u7387 &e{0}%&6 \u512a\u96c5\u306a\u53d7\u3051\u8eab \u78ba\u7387&e {1}%
+Acrobatics.SubSkill.Roll.Stats=&6\u53d7\u3051\u8eab\u306e\u78ba\u7387 &e{0}%&6 \u512a\u96c5\u306a\u53d7\u3051\u8eab\u306e\u78ba\u7387&e {1}%
-Acrobatics.SubSkill.Roll.Stat=\u53d7\u3051\u8eab \u78ba\u7387
+Acrobatics.SubSkill.Roll.Stat=\u53d7\u3051\u8eab\u306e\u78ba\u7387
-Acrobatics.SubSkill.Roll.Stat.Extra=\u512a\u96c5\u306a\u53d7\u3051\u8eab \u78ba\u7387
+Acrobatics.SubSkill.Roll.Stat.Extra=\u512a\u96c5\u306a\u53d7\u3051\u8eab\u306e\u78ba\u7387
 Acrobatics.SubSkill.Roll.Name=\u53d7\u3051\u8eab
 Acrobatics.SubSkill.Roll.Description=\u30c0\u30e1\u30fc\u30b8\u3092\u907f\u3051\u308b\u70ba\u306b\u843d\u4e0b\u6642\u306b\u53d7\u3051\u8eab\u3059\u308b\u3002
-Acrobatics.SubSkill.Roll.Chance=\u53d7\u3051\u8eab \u78ba\u7387: &e{0}
+Acrobatics.SubSkill.Roll.Chance=\u53d7\u3051\u8eab\u306e\u78ba\u7387: &e{0}
-Acrobatics.SubSkill.Roll.GraceChance=\u512a\u96c5\u306a\u53d7\u3051\u8eab \u78ba\u7387: &e{0}
+Acrobatics.SubSkill.Roll.GraceChance=\u512a\u96c5\u306a\u53d7\u3051\u8eab\u306e\u78ba\u7387: &e{0}
+Acrobatics.SubSkill.Roll.Mechanics=&7\u843d\u4e0b\u30c0\u30e1\u30fc\u30b8\u3092\u53d7\u3051\u308b\u305f\u3073\u306b\u3001\u30b9\u30ad\u30eb\u30ec\u30d9\u30eb\u306b\u5fdc\u3058\u3066\u30c0\u30e1\u30fc\u30b8\u3092\u5b8c\u5168\u306b\u9632\u3050\u53ef\u80fd\u6027\u304c\u3042\u308a\u3001\u30ec\u30d9\u30eb&e{6}%&7\u3067\u306f\u30c0\u30e1\u30fc\u30b8\u3092\u9632\u3050\u78ba\u7387\u304c&e{0}%&7\u3067\u3059\u3002\n\u30b9\u30cb\u30fc\u30af\u30dc\u30bf\u30f3\u3092\u62bc\u3059\u3053\u3068\u3067\u3001\u843d\u4e0b\u30c0\u30e1\u30fc\u30b8\u3092\u56de\u907f\u3059\u308b\u78ba\u7387\u304c2\u500d\u306b\u306a\u308a\u3001\u6700\u59272\u500d\u306e\u843d\u4e0b\u30c0\u30e1\u30fc\u30b8\u3092\u56de\u907f\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002\u30b9\u30cb\u30fc\u30af\u30dc\u30bf\u30f3\u3092\u62bc\u3059\u3068\u3001\u901a\u5e38\u306e\u53d7\u3051\u8eab\u304c\u300c\u512a\u96c5\u306a\u53d7\u3051\u8eab\u300d\u306b\u5909\u5316\u3057\u307e\u3059\u3002\u512a\u96c5\u306a\u53d7\u3051\u8eab\u306f\u6700\u5927\u3067&a{5}&7\u30c0\u30e1\u30fc\u30b8\u3092\u9632\u3050\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002
 Acrobatics.SubSkill.GracefulRoll.Name=\u512a\u96c5\u306a\u53d7\u3051\u8eab
 Acrobatics.SubSkill.GracefulRoll.Description=\u53d7\u3051\u8eab\u306e\u4e8c\u500d\u306e\u52b9\u679c\u3092\u767a\u63ee\u3059\u308b\u3002
 Acrobatics.SubSkill.Dodge.Name=\u8eb1\u3059
 Acrobatics.SubSkill.Dodge.Description=\u653b\u6483\u3067\u53d7\u3051\u308b\u30c0\u30e1\u30fc\u30b8\u3092\u534a\u6e1b\u3059\u308b\u3002
-Acrobatics.SubSkill.Dodge.Stat=\u8eb1\u3059 \u78ba\u7387
+Acrobatics.SubSkill.Dodge.Stat=\u8eb1\u3059\u78ba\u7387
 Acrobatics.Listener=\u30a2\u30af\u30ed\u30d0\u30c6\u30a3\u30c3\u30af:
-Acrobatics.Roll.Text=[[ITALIC]]**\u53d7\u3051\u8eab\u3092\u3057\u305f**
+Acrobatics.Roll.Text=&o**\u53d7\u3051\u8eab\u3092\u3057\u305f**
 Acrobatics.SkillName=\u30a2\u30af\u30ed\u30d0\u30c6\u30a3\u30c3\u30af
 
 # ALCHEMY
@@ -152,10 +169,10 @@ Archery.SubSkill.SkillShot.Description=\u5f13\u306e\u30c0\u30e1\u30fc\u30b8\u309
 Archery.SubSkill.SkillShot.Stat=\u30b9\u30ad\u30eb\u30b7\u30e7\u30c3\u30c8 \u8ffd\u52a0\u30c0\u30e1\u30fc\u30b8
 Archery.SubSkill.Daze.Name=\u5e7b\u60d1
 Archery.SubSkill.Daze.Description=\u6575\u3092\u6df7\u4e71\u3055\u305b\u3001\u8ffd\u52a0\u30c0\u30e1\u30fc\u30b8\u3092\u4e0e\u3048\u308b\u3002
-Archery.SubSkill.Daze.Stat=\u5e7b\u60d1 \u78ba\u7387
+Archery.SubSkill.Daze.Stat=\u5e7b\u60d1\u306e\u78ba\u7387
-Archery.SubSkill.ArrowRetrieval.Name=\u77e2\u306e\u56de\u53ce
+Archery.SubSkill.ArrowRetrieval.Name=\u77e2\u56de\u53ce
 Archery.SubSkill.ArrowRetrieval.Description=\u6b7b\u4f53\u304b\u3089\u77e2\u3092\u78ba\u7387\u3067\u56de\u53ce\u3059\u308b\u3002
-Archery.SubSkill.ArrowRetrieval.Stat=\u77e2\u306e\u56de\u53ce \u78ba\u7387
+Archery.SubSkill.ArrowRetrieval.Stat=\u77e2\u56de\u53ce\u306e\u78ba\u7387
 Archery.SubSkill.ArcheryLimitBreak.Name=\u9650\u754c\u7a81\u7834
 Archery.SubSkill.ArcheryLimitBreak.Description=\u9650\u754c\u3092\u7834\u308b\u3002\u30bf\u30d5\u306a\u6575\u306b\u5bfe\u3059\u308b\u30c0\u30e1\u30fc\u30b8\u304c\u5897\u52a0\u3057\u307e\u3059\u3002PvP\u3092\u5bfe\u8c61\u3068\u3057\u3001PvE\u3078\u306e\u9069\u5fdc\u306f\u30b5\u30fc\u30d0\u30fc\u306e\u8a2d\u5b9a\u6b21\u7b2c\u3067\u3059\u3002
 Archery.SubSkill.ArcheryLimitBreak.Stat=\u9650\u754c\u7a81\u7834 \u6700\u5927\u30c0\u30e1\u30fc\u30b8
@@ -163,7 +180,7 @@ Archery.Listener=\u5f13:
 Archery.SkillName=\u5f13
 
 # AXES
-Axes.Ability.Bonus.0=\u65a7 \u7df4\u5ea6
+Axes.Ability.Bonus.0=\u30a2\u30c3\u30af\u30b9\u30de\u30b9\u30bf\u30ea\u30fc
 Axes.Ability.Bonus.1=\u30dc\u30fc\u30ca\u30b9 {0} \u30c0\u30e1\u30fc\u30b8
 Axes.Ability.Bonus.2=\u30a2\u30fc\u30de\u30fc\u30a4\u30f3\u30d1\u30af\u30c8
 Axes.Ability.Bonus.3=\u9632\u5177\u306b{0}\u306e\u30dc\u30fc\u30ca\u30b9\u30c0\u30e1\u30fc\u30b8\u3092\u4e0e\u3048\u308b
@@ -171,6 +188,7 @@ Axes.Ability.Bonus.4=\u30b0\u30ea\u30fc\u30bf\u30fc\u30a4\u30f3\u30d1\u30af\u30c
 Axes.Ability.Bonus.5=\u9632\u5177\u306e\u306a\u3044\u6575\u306b{0}\u306e\u30dc\u30fc\u30ca\u30b9\u30c0\u30e1\u30fc\u30b8\u3092\u4e0e\u3048\u308b
 Axes.Ability.Lower=&7\u65a7\u3092\u4e0b\u3052\u305f\u3002
 Axes.Ability.Ready=&3\u65a7\u3092&6\u6e96\u5099&3\u3057\u305f\u3002
+Axes.Ability.Ready.Extra=&3\u65a7\u3092&6\u6e96\u5099&3\u3057\u305f\u3002 &7({0} \u304c {1} \u79d2\u306e\u30af\u30fc\u30eb\u30c0\u30a6\u30f3\u4e2d)
 Axes.Combat.CritStruck=&4\u3042\u306a\u305f\u306f\u91cd\u5927\u306a\u30c0\u30e1\u30fc\u30b8\u3092\u53d7\u3051\u307e\u3057\u305f\uff01
 Axes.Combat.CriticalHit=\u30af\u30ea\u30c6\u30a3\u30ab\u30eb\u30d2\u30c3\u30c8\uff01
 Axes.Combat.GI.Proc=&a**\u5927\u304d\u306a\u529b\u304c\u8972\u3063\u3066\u304d\u305f**
@@ -181,8 +199,8 @@ Axes.SubSkill.SkullSplitter.Description=AoE\u30c0\u30e1\u30fc\u30b8\u3092\u4e0e\
 Axes.SubSkill.SkullSplitter.Stat=\u30b9\u30ab\u30eb\u30b9\u30d7\u30ea\u30c3\u30bf\u30fc \u671f\u9593
 Axes.SubSkill.CriticalStrikes.Name=\u30af\u30ea\u30c6\u30a3\u30ab\u30eb\u30b9\u30c8\u30e9\u30a4\u30af
 Axes.SubSkill.CriticalStrikes.Description=\u30c0\u30e1\u30fc\u30b8\u4e8c\u500d
-Axes.SubSkill.CriticalStrikes.Stat=\u30af\u30ea\u30c6\u30a3\u30ab\u30eb\u30b9\u30c8\u30e9\u30a4\u30af \u78ba\u7387
+Axes.SubSkill.CriticalStrikes.Stat=\u30af\u30ea\u30c6\u30a3\u30ab\u30eb\u30b9\u30c8\u30e9\u30a4\u30af\u306e\u78ba\u7387
-Axes.SubSkill.AxeMastery.Name=\u65a7 \u7df4\u5ea6
+Axes.SubSkill.AxeMastery.Name=\u30a2\u30c3\u30af\u30b9\u30de\u30b9\u30bf\u30ea\u30fc
 Axes.SubSkill.AxeMastery.Description=\u8ffd\u52a0\u30c0\u30e1\u30fc\u30b8\u3092\u4e0e\u3048\u308b\u3002
 Axes.SubSkill.AxesLimitBreak.Name=\u65a7 \u9650\u754c\u7a81\u7834
 Axes.SubSkill.AxesLimitBreak.Description=\u9650\u754c\u3092\u7834\u308b\u3002\u30bf\u30d5\u306a\u6575\u306b\u5bfe\u3059\u308b\u30c0\u30e1\u30fc\u30b8\u304c\u5897\u52a0\u3057\u307e\u3059\u3002PvP\u3092\u5bfe\u8c61\u3068\u3057\u3001PvE\u3078\u306e\u9069\u5fdc\u306f\u30b5\u30fc\u30d0\u30fc\u306e\u8a2d\u5b9a\u6b21\u7b2c\u3067\u3059\u3002
@@ -202,9 +220,9 @@ Axes.Skills.SS.Other.On=&a{0}&2\u304c &c\u30b9\u30ab\u30eb\u30b9\u30d7\u30ea\u30
 # EXCAVATION
 Excavation.Ability.Lower=&7\u30b7\u30e3\u30d9\u30eb\u3092\u4e0b\u3052\u305f\u3002
 Excavation.Ability.Ready=&3\u30b7\u30e3\u30d9\u30eb\u3092&6\u6e96\u5099&3\u3057\u305f\u3002
-Excavation.SubSkill.GigaDrillBreaker.Name=\u30ae\u30ac\u30c9\u30ea\u30eb\u30d6\u30ec\u30fc\u30ab\u30fc
+Excavation.SubSkill.GigaDrillBreaker.Name=\u30ae\u30ac\u30c9\u30ea\u30eb\u30d6\u30ec\u30a4\u30ab\u30fc
 Excavation.SubSkill.GigaDrillBreaker.Description=3x \u30c9\u30ed\u30c3\u30d7\u7387, 3x EXP, +\u30b9\u30d4\u30fc\u30c9
-Excavation.SubSkill.GigaDrillBreaker.Stat=\u30ae\u30ac\u30c9\u30ea\u30eb\u30d6\u30ec\u30fc\u30ab\u30fc \u671f\u9593
+Excavation.SubSkill.GigaDrillBreaker.Stat=\u30ae\u30ac\u30c9\u30ea\u30eb\u30d6\u30ec\u30a4\u30ab\u30fc \u671f\u9593
 Excavation.SubSkill.Archaeology.Name=\u8003\u53e4\u5b66
 Excavation.SubSkill.Archaeology.Description=\u5b9d\u3092\u767a\u6398\u3057\u3088\u3046\uff01\u30b9\u30ad\u30eb\u30ec\u30d9\u30eb\u304c\u9ad8\u3044\u3068\u3001\u5b9d\u3092\u898b\u3064\u3051\u305f\u3068\u304d\u306b\u7d4c\u9a13\u5024\u30aa\u30fc\u30d6\u3092\u898b\u3064\u3051\u308b\u53ef\u80fd\u6027\u304c\u9ad8\u304f\u306a\u308a\u307e\u3059\u3002
 Excavation.SubSkill.Archaeology.Stat=\u8003\u53e4\u5b66 \u7d4c\u9a13\u5024\u30aa\u30fc\u30d6\u767a\u898b\u78ba\u7387
@@ -212,11 +230,11 @@ Excavation.SubSkill.Archaeology.Stat.Extra=\u8003\u53e4\u5b66 \u7d4c\u9a13\u5024
 
 Excavation.Listener=\u6398\u524a:
 Excavation.SkillName=\u6398\u524a
-Excavation.Skills.GigaDrillBreaker.Off=**\u30ae\u30ac\u30c9\u30ea\u30eb\u30d6\u30ec\u30fc\u30ab\u30fc \u3092\u6d88\u8017\u3057\u305f**
+Excavation.Skills.GigaDrillBreaker.Off=**\u30ae\u30ac\u30c9\u30ea\u30eb\u30d6\u30ec\u30a4\u30ab\u30fc \u3092\u6d88\u8017\u3057\u305f**
-Excavation.Skills.GigaDrillBreaker.On=&a**\u30ae\u30ac\u30c9\u30ea\u30eb\u30d6\u30ec\u30fc\u30ab\u30fc \u30a2\u30af\u30c6\u30a3\u30d9\u30fc\u30c8**
+Excavation.Skills.GigaDrillBreaker.On=&a**\u30ae\u30ac\u30c9\u30ea\u30eb\u30d6\u30ec\u30a4\u30ab\u30fc \u30a2\u30af\u30c6\u30a3\u30d9\u30fc\u30c8**
-Excavation.Skills.GigaDrillBreaker.Refresh=&e\u30ae\u30ac\u30c9\u30ea\u30eb\u30d6\u30ec\u30fc\u30ab\u30fc &a\u30a2\u30d3\u30ea\u30c6\u30a3\u304c\u56de\u5fa9\u3057\u307e\u3057\u305f\uff01
+Excavation.Skills.GigaDrillBreaker.Refresh=&e\u30ae\u30ac\u30c9\u30ea\u30eb\u30d6\u30ec\u30a4\u30ab\u30fc &a\u30a2\u30d3\u30ea\u30c6\u30a3\u304c\u56de\u5fa9\u3057\u307e\u3057\u305f\uff01
-Excavation.Skills.GigaDrillBreaker.Other.Off=&e{0}\u304c &f\u30ae\u30ac\u30c9\u30ea\u30eb\u30d6\u30ec\u30fc\u30ab\u30fc &a\u3092\u6d88\u8017\u3057\u305f
+Excavation.Skills.GigaDrillBreaker.Other.Off=&e{0}\u304c &f\u30ae\u30ac\u30c9\u30ea\u30eb\u30d6\u30ec\u30a4\u30ab\u30fc &a\u3092\u6d88\u8017\u3057\u305f
-Excavation.Skills.GigaDrillBreaker.Other.On=&a{0}&2\u304c &c\u30ae\u30ac\u30c9\u30ea\u30eb\u30d6\u30ec\u30fc\u30ab\u30fc &2\u3092\u4f7f\u3063\u305f\uff01
+Excavation.Skills.GigaDrillBreaker.Other.On=&a{0}&2\u304c &c\u30ae\u30ac\u30c9\u30ea\u30eb\u30d6\u30ec\u30a4\u30ab\u30fc &2\u3092\u4f7f\u3063\u305f\uff01
 
 # FISHING
 Fishing.ScarcityTip=&e&o\u3053\u306e\u5730\u57df\u306f\u9b5a\u306e\u4e71\u7372\u306b\u82e6\u3057\u3093\u3067\u3044\u307e\u3059\u3002\u3088\u308a\u591a\u304f\u306e\u9b5a\u3092\u91e3\u308b\u305f\u3081\u306b\u306f\u5225\u306e\u5834\u6240\u3067\u91e3\u308a\u3092\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\u5c11\u306a\u304f\u3068\u3082{0}\u30d6\u30ed\u30c3\u30af\u5148\u3002
@@ -225,7 +243,7 @@ Fishing.Exhausting=&c&o\u91e3\u308a\u7aff\u3092\u4e0d\u9069\u5207\u306b\u4f7f\u7
 Fishing.LowResourcesTip=&7\u3053\u306e\u5730\u57df\u306b\u3044\u308b\u9b5a\u304c\u305d\u308c\u307b\u3069\u591a\u304f\u306a\u3044\u3053\u3068\u3092\u611f\u3058\u307e\u3057\u305f\u3002\u5c11\u306a\u304f\u3068\u3082{0}\u30d6\u30ed\u30c3\u30af\u96e2\u308c\u305f\u3068\u3053\u308d\u3067\u91e3\u308a\u3092\u3057\u3066\u307f\u3066\u4e0b\u3055\u3044\u3002
 Fishing.Ability.Info=\u30de\u30b8\u30c3\u30af\u30cf\u30f3\u30bf\u30fc: &7 **\u30c8\u30ec\u30b8\u30e3\u30fc\u30cf\u30f3\u30bf\u30fc \u30e9\u30f3\u30af\u3067\u6539\u5584\u3059\u308b**
 Fishing.Ability.Locked.0=\u30ed\u30c3\u30af\u3055\u308c\u308b\u307e\u3067 {0}+ \u30b9\u30ad\u30eb (\u30b7\u30a7\u30a4\u30af)
-Fishing.Ability.Locked.1=\u30ed\u30c3\u30af\u3055\u308c\u308b\u307e\u3067 {0}+ \u30b9\u30ad\u30eb (\u7a74\u91e3\u308a)
+Fishing.Ability.Locked.1=\u30ed\u30c3\u30af\u3055\u308c\u308b\u307e\u3067 {0}+ \u30b9\u30ad\u30eb (\u30a2\u30a4\u30b9\u30d5\u30a3\u30c3\u30b7\u30f3\u30b0)
 Fishing.Ability.Locked.2=\u30ed\u30c3\u30af\u3055\u308c\u308b\u307e\u3067 {0}+ \u30b9\u30ad\u30eb (\u30de\u30b9\u30bf\u30fc\u30a2\u30f3\u30b0\u30e9\u30fc)
 Fishing.SubSkill.TreasureHunter.Name=\u30c8\u30ec\u30b8\u30e3\u30fc\u30cf\u30f3\u30bf\u30fc
 Fishing.SubSkill.TreasureHunter.Description=\u9b5a\u3084\u7269\u3092\u91e3\u308a\u4e0a\u3052\u308b\u3002
@@ -233,17 +251,20 @@ Fishing.SubSkill.TreasureHunter.Stat=\u30c8\u30ec\u30b8\u30e3\u30fc\u30cf\u30f3\
 Fishing.SubSkill.TreasureHunter.Stat.Extra=\u30c9\u30ed\u30c3\u30d7\u7387: &7\u30b3\u30e2\u30f3: &e{0} &a\u30a2\u30f3\u30b3\u30e2\u30f3: &e{1}\n&9\u30ec\u30a2: &e{2} &d\u30a8\u30d4\u30c3\u30af: &e{3} &6\u30ec\u30b8\u30a7\u30f3\u30c0\u30ea\u30fc: &e{4} &bMythic: &e{5}
 Fishing.SubSkill.MagicHunter.Name=\u30de\u30b8\u30c3\u30af\u30cf\u30f3\u30bf\u30fc
 Fishing.SubSkill.MagicHunter.Description=\u30a8\u30f3\u30c1\u30e3\u30f3\u30c8\u3055\u308c\u305f\u30a2\u30a4\u30c6\u30e0\u3092\u898b\u3064\u3051\u308b\u3002
-Fishing.SubSkill.MagicHunter.Stat=\u30de\u30b8\u30c3\u30af\u30cf\u30f3\u30bf\u30fc \u78ba\u7387
+Fishing.SubSkill.MagicHunter.Stat=\u30de\u30b8\u30c3\u30af\u30cf\u30f3\u30bf\u30fc\u306e\u78ba\u7387
 Fishing.SubSkill.Shake.Name=\u30b7\u30a7\u30a4\u30af
 Fishing.SubSkill.Shake.Description=Mob\u3084\u30d7\u30ec\u30a4\u30e4\u30fc\u304b\u3089\u91e3\u308a\u7aff\u3067\u30a2\u30a4\u30c6\u30e0\u3092\u632f\u308a\u843d\u3068\u3059\u3002
-Fishing.SubSkill.Shake.Stat=\u30b7\u30a7\u30a4\u30af \u78ba\u7387
+Fishing.SubSkill.Shake.Stat=\u30b7\u30a7\u30a4\u30af\u306e\u78ba\u7387
 Fishing.SubSkill.FishermansDiet.Name=\u6f01\u5e2b\u306e\u98df\u4e8b
 Fishing.SubSkill.FishermansDiet.Description=\u9b5a\u4ecb\u985e\u304b\u3089\u56de\u5fa9\u3059\u308b\u6e80\u8179\u5ea6\u3092\u6539\u5584\u3059\u308b\u3002
 Fishing.SubSkill.FishermansDiet.Stat=\u6f01\u5e2b\u306e\u98df\u4e8b:&a \u30e9\u30f3\u30af {0}
 Fishing.SubSkill.MasterAngler.Name=\u30de\u30b9\u30bf\u30fc\u30a2\u30f3\u30b0\u30e9\u30fc
-Fishing.SubSkill.IceFishing.Name=\u7a74\u91e3\u308a
+Fishing.SubSkill.MasterAngler.Description=\u9b5a\u304c\u3088\u304f\u91e3\u308c\u307e\u3059\u3001\u8239\u304b\u3089\u306e\u91e3\u308a\u3067\u306f\u3088\u308a\u52b9\u679c\u7684\u3067\u3059\u3002
+Fishing.SubSkill.MasterAngler.Stat=\u91e3\u308a\u306e\u6700\u4f4e\u5f85\u3061\u6642\u9593\u77ed\u7e2e: &a-{0} \u79d2
+Fishing.SubSkill.MasterAngler.Stat.Extra=\u91e3\u308a\u306e\u6700\u5927\u5f85\u3061\u6642\u9593\u77ed\u7e2e: &a-{0} \u79d2
+Fishing.SubSkill.IceFishing.Name=\u30a2\u30a4\u30b9\u30d5\u30a3\u30c3\u30b7\u30f3\u30b0
 Fishing.SubSkill.IceFishing.Description=\u5bd2\u3044\u30d0\u30a4\u30aa\u30fc\u30e0\u3067\u306e\u91e3\u308a\u304c\u3067\u304d\u308b\u3088\u3046\u306b\u306a\u308b\u3002
-Fishing.SubSkill.IceFishing.Stat=\u7a74\u91e3\u308a
+Fishing.SubSkill.IceFishing.Stat=\u30a2\u30a4\u30b9\u30d5\u30a3\u30c3\u30b7\u30f3\u30b0
 Fishing.Chance.Raining=&9 \u96e8\u30dc\u30fc\u30ca\u30b9
 Fishing.Listener=\u91e3\u308a:
 Fishing.Ability.TH.MagicFound=&7\u9b54\u6cd5\u3092\u611f\u3058\u307e\u3059\u3002
@@ -253,33 +274,33 @@ Fishing.SkillName=\u91e3\u308a
 
 # HERBALISM
 Herbalism.Ability.GTe.NeedMore=\u7dd1\u3092\u5897\u3084\u3059\u306b\u306f\u3082\u3063\u3068\u7a2e\u304c\u5fc5\u8981\u3067\u3059\u3002
-Herbalism.Ability.GTh.Fail=**\u7dd1\u8272\u306e\u89aa\u6307 \u5931\u6557**
+Herbalism.Ability.GTh.Fail=**\u30b0\u30ea\u30fc\u30f3\u30b5\u30e0 \u5931\u6557**
-Herbalism.Ability.GTh=&a**\u7dd1\u8272\u306e\u89aa\u6307**
+Herbalism.Ability.GTh=&a**\u30b0\u30ea\u30fc\u30f3\u30b5\u30e0**
 Herbalism.Ability.Lower=&7\u30af\u30ef\u3092\u4e0b\u3052\u305f\u3002
 Herbalism.Ability.Ready=&3\u30af\u30ef\u3092&6\u6e96\u5099&3\u3057\u305f\u3002
-Herbalism.Ability.ShroomThumb.Fail=**\u30ad\u30ce\u30b3\u306e\u89aa\u6307 \u5931\u6557**
+Herbalism.Ability.ShroomThumb.Fail=**\u30b7\u30e5\u30eb\u30fc\u30e0\u30b5\u30e0 \u5931\u6557**
 Herbalism.SubSkill.GreenTerra.Name=\u30b0\u30ea\u30fc\u30f3\u30c6\u30e9
 Herbalism.SubSkill.GreenTerra.Description=\u7dd1\u3092\u5e83\u3052\u308b, 3x \u30c9\u30ed\u30c3\u30d7
 Herbalism.SubSkill.GreenTerra.Stat=\u30b0\u30ea\u30fc\u30f3\u30c6\u30e9 \u671f\u9593
-Herbalism.SubSkill.GreenThumb.Name=\u7dd1\u8272\u306e\u89aa\u6307
+Herbalism.SubSkill.GreenThumb.Name=\u30b0\u30ea\u30fc\u30f3\u30b5\u30e0
 Herbalism.SubSkill.GreenThumb.Description=\u4f5c\u7269\u306e\u53ce\u7a6b\u6642\u306b\u81ea\u52d5\u3067\u690d\u3048\u66ff\u3048\u3092\u3059\u308b\u3002
-Herbalism.SubSkill.GreenThumb.Stat=\u7dd1\u8272\u306e\u89aa\u6307 \u78ba\u7387
+Herbalism.SubSkill.GreenThumb.Stat=\u30b0\u30ea\u30fc\u30f3\u30b5\u30e0\u306e\u78ba\u7387
-Herbalism.SubSkill.GreenThumb.Stat.Extra=\u7dd1\u8272\u306e\u89aa\u6307 \u30b9\u30c6\u30fc\u30b8: &a \u4f5c\u7269\u306f\u30b9\u30c6\u30fc\u30b8 {0} \u306b\u6210\u9577
+Herbalism.SubSkill.GreenThumb.Stat.Extra=\u30b0\u30ea\u30fc\u30f3\u30b5\u30e0 \u30b9\u30c6\u30fc\u30b8: &a \u4f5c\u7269\u306f\u30b9\u30c6\u30fc\u30b8 {0} \u306b\u6210\u9577
-Herbalism.Effect.4=\u7dd1\u8272\u306e\u89aa\u6307 (\u30d6\u30ed\u30c3\u30af)
+Herbalism.Effect.4=\u30b0\u30ea\u30fc\u30f3\u30b5\u30e0 (\u30d6\u30ed\u30c3\u30af)
 Herbalism.SubSkill.GreenThumb.Description.2=\u77f3\u30ec\u30f3\u30ac\u3092\u82d4\u3080\u3057\u305f\u72b6\u614b\u306b\u3059\u308b\u3002\u307e\u305f\u306f\u8349\u3092\u6210\u9577\u3055\u305b\u308b\u3002
 Herbalism.SubSkill.FarmersDiet.Name=\u8fb2\u5bb6\u306e\u98df\u4e8b
 Herbalism.SubSkill.FarmersDiet.Description=\u8fb2\u4f5c\u7269\u304b\u3089\u56de\u5fa9\u3059\u308b\u6e80\u8179\u5ea6\u3092\u6539\u5584\u3059\u308b\u3002
 Herbalism.SubSkill.FarmersDiet.Stat=\u8fb2\u5bb6\u306e\u98df\u4e8b: &a\u30e9\u30f3\u30af {0}
 Herbalism.SubSkill.DoubleDrops.Name=\u30c9\u30ed\u30c3\u30d7\u4e8c\u500d
 Herbalism.SubSkill.DoubleDrops.Description=\u30c9\u30ed\u30c3\u30d7\u304c\u4e8c\u500d\u306b\u306a\u308b\u3002
-Herbalism.SubSkill.DoubleDrops.Stat=\u30c9\u30ed\u30c3\u30d7\u4e8c\u500d \u78ba\u7387
+Herbalism.SubSkill.DoubleDrops.Stat=\u30c9\u30ed\u30c3\u30d7\u4e8c\u500d\u306e\u78ba\u7387
-Herbalism.SubSkill.HylianLuck.Name=\u30cf\u30a4\u30ea\u30a2\u306e\u904b
+Herbalism.SubSkill.HylianLuck.Name=\u30cf\u30a4\u30ea\u30a2\u30f3\u30e9\u30c3\u30af
 Herbalism.SubSkill.HylianLuck.Description=\u5e0c\u5c11\u54c1\u3092\u898b\u3064\u3051\u308b\u78ba\u7387\u304c\u4e0a\u304c\u308b\u3002
-Herbalism.SubSkill.HylianLuck.Stat=\u30cf\u30a4\u30ea\u30a2\u306e\u904b \u78ba\u7387
+Herbalism.SubSkill.HylianLuck.Stat=\u30cf\u30a4\u30ea\u30a2\u30f3\u30e9\u30c3\u30af\u306e\u78ba\u7387
-Herbalism.SubSkill.ShroomThumb.Name=\u30ad\u30ce\u30b3\u306e\u89aa\u6307
+Herbalism.SubSkill.ShroomThumb.Name=\u30b7\u30e5\u30eb\u30fc\u30e0\u30b5\u30e0
 Herbalism.SubSkill.ShroomThumb.Description=\u571f\u3084\u8349\u306b\u83cc\u7cf8\u3092\u5e83\u3052\u308b\u3002
-Herbalism.SubSkill.ShroomThumb.Stat=\u30ad\u30ce\u30b3\u306e\u89aa\u6307 \u78ba\u7387
+Herbalism.SubSkill.ShroomThumb.Stat=\u30b7\u30e5\u30eb\u30fc\u30e0\u30b5\u30e0\u306e\u78ba\u7387
-Herbalism.HylianLuck=&a\u30cf\u30a4\u30e9\u30eb\u306e\u904b\u306f\u4eca\u65e5\u306e\u3042\u306a\u305f\u306b\u3064\u3044\u3066\u3044\u307e\u3059\uff01
+Herbalism.HylianLuck=&a\u30cf\u30a4\u30ea\u30a2\u30f3\u30e9\u30c3\u30af\u306f\u4eca\u65e5\u306e\u3042\u306a\u305f\u306b\u3064\u3044\u3066\u3044\u307e\u3059\uff01
 Herbalism.Listener=\u8fb2\u696d:
 Herbalism.SkillName=\u8fb2\u696d
 Herbalism.Skills.GTe.Off=**\u30b0\u30ea\u30fc\u30f3\u30c6\u30e9 \u3092\u6d88\u8017\u3057\u305f**
@@ -294,12 +315,12 @@ Mining.Ability.Locked.1=\u30ed\u30c3\u30af\u3055\u308c\u308b\u307e\u3067 {0}+ \u
 Mining.Ability.Locked.2=\u30ed\u30c3\u30af\u3055\u308c\u308b\u307e\u3067 {0}+ \u30b9\u30ad\u30eb (\u89e3\u4f53\u5c02\u9580\u77e5\u8b58)
 Mining.Ability.Lower=&7\u30d4\u30c3\u30b1\u30eb\u3092\u4e0b\u3052\u305f\u3002
 Mining.Ability.Ready=&3\u30d4\u30c3\u30b1\u30eb\u3092&6\u6e96\u5099&3\u3057\u305f\u3002
-Mining.SubSkill.SuperBreaker.Name=\u30b9\u30fc\u30d1\u30fc\u30d6\u30ec\u30fc\u30ab\u30fc
+Mining.SubSkill.SuperBreaker.Name=\u30b9\u30fc\u30d1\u30fc\u30d6\u30ec\u30a4\u30ab\u30fc
 Mining.SubSkill.SuperBreaker.Description=\u30b9\u30d4\u30fc\u30c9+, \u30c9\u30ed\u30c3\u30d7\u7387\u4e09\u500d
-Mining.SubSkill.SuperBreaker.Stat=\u30b9\u30fc\u30d1\u30fc\u30d6\u30ec\u30fc\u30ab\u30fc\u306e\u9577\u3055
+Mining.SubSkill.SuperBreaker.Stat=\u30b9\u30fc\u30d1\u30fc\u30d6\u30ec\u30a4\u30ab\u30fc\u306e\u9577\u3055
 Mining.SubSkill.DoubleDrops.Name=\u30c9\u30ed\u30c3\u30d7\u4e8c\u500d
 Mining.SubSkill.DoubleDrops.Description=\u30c9\u30ed\u30c3\u30d7\u304c\u4e8c\u500d\u306b\u306a\u308b\u3002
-Mining.SubSkill.DoubleDrops.Stat=\u30c9\u30ed\u30c3\u30d7\u4e8c\u500d \u78ba\u7387: &e{0}
+Mining.SubSkill.DoubleDrops.Stat=\u30c9\u30ed\u30c3\u30d7\u4e8c\u500d\u306e\u78ba\u7387: &e{0}
 Mining.SubSkill.BlastMining.Name=\u30d6\u30e9\u30b9\u30c8\u30de\u30a4\u30cb\u30f3\u30b0
 Mining.SubSkill.BlastMining.Description=TNT\u306b\u3088\u308b\u63a1\u6398\u306e\u30dc\u30fc\u30ca\u30b9
 Mining.SubSkill.BlastMining.Stat=\u30d6\u30e9\u30b9\u30c8\u30de\u30a4\u30cb\u30f3\u30b0:&a \u30e9\u30f3\u30af {0}/{1} &7({2})
@@ -311,16 +332,16 @@ Mining.SubSkill.DemolitionsExpertise.Description=TNT\u306b\u3088\u308b\u30c0\u30
 Mining.SubSkill.DemolitionsExpertise.Stat=\u89e3\u4f53\u30a8\u30ad\u30b9\u30d1\u30fc\u30c8\u306e\u30c0\u30e1\u30fc\u30b8\u8efd\u6e1b
 Mining.Listener=\u63a1\u6398:
 Mining.SkillName=\u63a1\u6398
-Mining.Skills.SuperBreaker.Off=**\u30b9\u30fc\u30d1\u30fc\u30d6\u30ec\u30fc\u30ab\u30fc \u3092\u6d88\u8017\u3057\u305f**
+Mining.Skills.SuperBreaker.Off=**\u30b9\u30fc\u30d1\u30fc\u30d6\u30ec\u30a4\u30ab\u30fc \u3092\u6d88\u8017\u3057\u305f**
-Mining.Skills.SuperBreaker.On=&a**\u30b9\u30fc\u30d1\u30fc\u30d6\u30ec\u30fc\u30ab\u30fc \u30a2\u30af\u30c6\u30a3\u30d9\u30fc\u30c8**
+Mining.Skills.SuperBreaker.On=&a**\u30b9\u30fc\u30d1\u30fc\u30d6\u30ec\u30a4\u30ab\u30fc \u30a2\u30af\u30c6\u30a3\u30d9\u30fc\u30c8**
-Mining.Skills.SuperBreaker.Refresh=&e\u30b9\u30fc\u30d1\u30fc\u30d6\u30ec\u30fc\u30ab\u30fc &a\u30a2\u30d3\u30ea\u30c6\u30a3\u304c\u56de\u5fa9\u3057\u307e\u3057\u305f\uff01
+Mining.Skills.SuperBreaker.Other.Off=&e{0}\u304c &f\u30b9\u30fc\u30d1\u30fc\u30d6\u30ec\u30a4\u30ab\u30fc &a\u3092\u6d88\u8017\u3057\u305f
-Mining.Skills.SuperBreaker.Other.Off=&e{0}\u304c &f\u30b9\u30fc\u30d1\u30fc\u30d6\u30ec\u30fc\u30ab\u30fc &a\u3092\u6d88\u8017\u3057\u305f
+Mining.Skills.SuperBreaker.Other.On=&a{0}&2\u304c &c\u30b9\u30fc\u30d1\u30fc\u30d6\u30ec\u30a4\u30ab\u30fc &2\u3092\u4f7f\u3063\u305f\uff01
-Mining.Skills.SuperBreaker.Other.On=&a{0}&2\u304c &c\u30b9\u30fc\u30d1\u30fc\u30d6\u30ec\u30fc\u30ab\u30fc &2\u3092\u4f7f\u3063\u305f\uff01
+Mining.Skills.SuperBreaker.Refresh=&e\u30b9\u30fc\u30d1\u30fc\u30d6\u30ec\u30a4\u30ab\u30fc &a\u30a2\u30d3\u30ea\u30c6\u30a3\u304c\u56de\u5fa9\u3057\u307e\u3057\u305f\uff01
 
 # Blast Mining
 Mining.Blast.Boom=&7**BOOM**
 Mining.Blast.Cooldown=
-Mining.Blast.Effect=+{0} ore yield, {1}x \u30c9\u30ed\u30c3\u30d7
+Mining.Blast.Effect=\u9271\u77f3 +{0} \u306e\u53ce\u91cf, {1}x \u30c9\u30ed\u30c3\u30d7
 Mining.Blast.Other.On=&a{0}&2 \u304c &c\u30d6\u30e9\u30b9\u30c8\u30de\u30a4\u30cb\u30f3\u30b0 &2\u3092\u4f7f\u3063\u305f\uff01
 Mining.Blast.Refresh=&e\u30d6\u30e9\u30b9\u30c8\u30de\u30a4\u30cb\u30f3\u30b0[GREEN]]\u30a2\u30d3\u30ea\u30c6\u30a3\u304c\u56de\u5fa9\u3057\u307e\u3057\u305f\uff01
 
@@ -333,18 +354,18 @@ Repair.SubSkill.IronRepair.Name=\u9244 \u4fee\u7406 ({0}+ SKILL)
 Repair.SubSkill.IronRepair.Description=\u9244\u306e\u30c4\u30fc\u30eb\u3068\u9632\u5177\u3092\u4fee\u7406\u3059\u308b\u3002
 Repair.SubSkill.StoneRepair.Name=\u77f3 \u4fee\u7406 ({0}+ SKILL)
 Repair.SubSkill.StoneRepair.Description=\u77f3\u306e\u30c4\u30fc\u30eb\u3068\u9632\u5177\u3092\u4fee\u7406\u3059\u308b\u3002
-Repair.SubSkill.RepairMastery.Name=\u4fee\u7406 \u7df4\u5ea6
+Repair.SubSkill.RepairMastery.Name=\u30ea\u30da\u30a2\u30de\u30b9\u30bf\u30ea\u30fc
 Repair.SubSkill.RepairMastery.Description=\u4fee\u7406\u91cf\u306e\u5897\u52a0
-Repair.SubSkill.RepairMastery.Stat=\u4fee\u7406 \u7df4\u5ea6: &aExtra {0} durability restored
+Repair.SubSkill.RepairMastery.Stat=\u30ea\u30da\u30a2\u30de\u30b9\u30bf\u30ea\u30fc: &a\u8ffd\u52a0 {0} \u8010\u4e45\u529b\u56de\u5fa9
-Repair.SubSkill.SuperRepair.Name=\u30b9\u30fc\u30d1\u30fc\u4fee\u7406
+Repair.SubSkill.SuperRepair.Name=\u30b9\u30fc\u30d1\u30fc\u30ea\u30da\u30a2
 Repair.SubSkill.SuperRepair.Description=\u4e8c\u91cd\u306e\u52b9\u679c
-Repair.SubSkill.SuperRepair.Stat=\u30b9\u30fc\u30d1\u30fc\u4fee\u7406 \u78ba\u7387
+Repair.SubSkill.SuperRepair.Stat=\u30b9\u30fc\u30d1\u30fc\u30ea\u30da\u30a2\u306e\u78ba\u7387
 Repair.SubSkill.DiamondRepair.Name=\u30c0\u30a4\u30a2\u30e2\u30f3\u30c9 \u4fee\u7406 ({0}+ SKILL)
 Repair.SubSkill.DiamondRepair.Description=\u30c0\u30a4\u30a2\u30e2\u30f3\u30c9\u306e\u30c4\u30fc\u30eb\u3068\u9632\u5177\u3092\u4fee\u7406\u3059\u308b\u3002
-Repair.SubSkill.ArcaneForging.Name=\u96e3\u89e3\u306a\u935b\u9020
+Repair.SubSkill.ArcaneForging.Name=\u30a2\u30eb\u30ab\u30f3\u30d5\u30a9\u30fc\u30b8\u30f3\u30b0
 Repair.SubSkill.ArcaneForging.Description=\u9b54\u6cd5\u306e\u30a2\u30a4\u30c6\u30e0\u3092\u4fee\u7406\u3059\u308b\u3002
-Repair.SubSkill.ArcaneForging.Stat=\u96e3\u89e3\u306a\u935b\u9020: &e\u30e9\u30f3\u30af {0}/{1}
+Repair.SubSkill.ArcaneForging.Stat=\u30a2\u30eb\u30ab\u30f3\u30d5\u30a9\u30fc\u30b8\u30f3\u30b0: &e\u30e9\u30f3\u30af {0}/{1}
-Repair.SubSkill.ArcaneForging.Stat.Extra=&3\u96e3\u89e3\u306a\u935b\u9020 \u30aa\u30c3\u30ba:&7 \u6210\u529f &a{0}&7%, \u5931\u6557 &c{1}&7%
+Repair.SubSkill.ArcaneForging.Stat.Extra=&3\u30a2\u30eb\u30ab\u30f3\u30d5\u30a9\u30fc\u30b8\u30f3\u30b0 \u30aa\u30c3\u30ba:&7 \u6210\u529f &a{0}&7%, \u5931\u6557 &c{1}&7%
 Repair.Error=&4\u3053\u306e\u30a2\u30a4\u30c6\u30e0\u3092\u4fee\u7406\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u308b\u3068\u304d\u306bmcMMO\u3067\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
 Repair.Listener.Anvil=&4\u9244\u5e8a\u3092\u8a2d\u7f6e\u3057\u307e\u3057\u305f\u3001\u9244\u5e8a\u306f\u30c4\u30fc\u30eb\u3068\u9632\u5177\u3092\u4fee\u7406\u3067\u304d\u307e\u3059\u3002
 Repair.Listener=\u4fee\u7406:
@@ -372,13 +393,13 @@ Salvage.SubSkill.UnderstandingTheArt.Description=\u3042\u306a\u305f\u306f\u305f\
 Salvage.SubSkill.ScrapCollector.Name=\u30b9\u30af\u30e9\u30c3\u30d7\u30b3\u30ec\u30af\u30bf\u30fc
 Salvage.SubSkill.ScrapCollector.Description=\u30b5\u30eb\u30d9\u30fc\u30b8\u306b\u3088\u308b\u30a2\u30a4\u30c6\u30e0\u304b\u3089\u306e\u7d20\u6750\u56de\u53ce\u3001\u5b8c\u74a7\u306a\u30b5\u30eb\u30d9\u30fc\u30b8\u306f\u30b9\u30ad\u30eb\u3068\u904b\u306b\u4f9d\u5b58\u3057\u307e\u3059\u3002
 Salvage.SubSkill.ScrapCollector.Stat=\u30b9\u30af\u30e9\u30c3\u30d7\u30b3\u30ec\u30af\u30bf\u30fc: &a\u6700\u5927&e{0}\u500b&a\u306e\u30a2\u30a4\u30c6\u30e0\u3092\u30b5\u30eb\u30d9\u30fc\u30b8\u3002\u904b\u304c\u95a2\u4fc2\u3057\u3066\u3044\u307e\u3059\u3002
-Salvage.SubSkill.ArcaneSalvage.Name=\u96e3\u89e3\u306a\u30b5\u30eb\u30d9\u30fc\u30b8
+Salvage.SubSkill.ArcaneSalvage.Name=\u30a2\u30eb\u30ab\u30f3\u30b5\u30eb\u30d9\u30fc\u30b8
 Salvage.SubSkill.ArcaneSalvage.Description=\u30a2\u30a4\u30c6\u30e0\u304b\u3089\u30a8\u30f3\u30c1\u30e3\u30f3\u30c8\u3092\u62bd\u51fa\u3059\u308b\u3002
-Salvage.SubSkill.ArcaneSalvage.Stat=\u96e3\u89e3\u306a\u30b5\u30eb\u30d9\u30fc\u30b8: &e\u30e9\u30f3\u30af {0}/{1}
+Salvage.SubSkill.ArcaneSalvage.Stat=\u30a2\u30eb\u30ab\u30f3\u30b5\u30eb\u30d9\u30fc\u30b8: &e\u30e9\u30f3\u30af {0}/{1}
 Salvage.Ability.Bonus.0=\u30b9\u30af\u30e9\u30c3\u30d7\u30b3\u30ec\u30af\u30bf\u30fc
 Salvage.Ability.Bonus.1=&a\u6700\u5927&e{0}\u500b&a\u306e\u30a2\u30a4\u30c6\u30e0\u3092\u30b5\u30eb\u30d9\u30fc\u30b8\u3002\u904b\u304c\u95a2\u4fc2\u3057\u3066\u3044\u307e\u3059\u3002
-Salvage.Arcane.ExtractFull=&7\u30d5\u30eb\u30a8\u30f3\u30c1\u30e3\u30f3\u30c8 \u78ba\u7387 
+Salvage.Arcane.ExtractFull=&7\u30d5\u30eb\u30a8\u30f3\u30c1\u30e3\u30f3\u30c8\u306e\u78ba\u7387 
-Salvage.Arcane.ExtractPartial=&7\u90e8\u5206\u7684\u306a\u30a8\u30f3\u30c1\u30e3\u30f3\u30c8 \u78ba\u7387
+Salvage.Arcane.ExtractPartial=&7\u90e8\u5206\u7684\u306a\u30a8\u30f3\u30c1\u30e3\u30f3\u30c8\u306e\u78ba\u7387
 Salvage.Skills.Success=&a\u30a2\u30a4\u30c6\u30e0\u3092\u30b5\u30eb\u30d9\u30fc\u30b8\uff01
 Salvage.Skills.Adept.Damaged=&4\u3042\u306a\u305f\u306f\u8010\u4e45\u5024\u306e\u6e1b\u3063\u305f\u30a2\u30a4\u30c6\u30e0\u3092\u30b5\u30eb\u30d9\u30fc\u30b8\u3059\u308b\u306e\u306b\u5341\u5206\u306a\u7df4\u5ea6\u3092\u5f97\u3066\u3044\u307e\u305b\u3093\u3002
 Salvage.Skills.Adept.Level=&e{1} &c\u3092\u30b5\u30eb\u30d9\u30fc\u30b8\u3059\u308b\u305f\u3081\u306b\u306f &e{0} &c\u30ec\u30d9\u30eb\u304c\u5fc5\u8981\u3067\u3059\u3002
@@ -399,7 +420,7 @@ Anvil.Unbreakable=\u3053\u306e\u30a2\u30a4\u30c6\u30e0\u306f\u58ca\u308c\u307e\u
 # SWORDS
 Swords.Ability.Lower=&7\u5263\u3092\u4e0b\u3052\u305f\u3002
 Swords.Ability.Ready=&3\u5263\u3092&6\u6e96\u5099&3\u3057\u305f\u3002
-Swords.Combat.Rupture.Note=[[GREY]]\u6ce8\u610f\uff1a&e 0.5\u79d2\u3054\u3068\u306b1tick\u304c\u767a\u751f\u3057\u307e\u3059\u3002
+Swords.Combat.Rupture.Note=&7\u6ce8\u610f\uff1a&e 0.5\u79d2\u3054\u3068\u306b1tick\u304c\u767a\u751f\u3057\u307e\u3059\u3002
 Swords.Combat.Bleeding.Started=&4 \u3042\u306a\u305f\u306f\u51fa\u8840\u3057\u3066\u3044\u307e\u3059\uff01
 Swords.Combat.Bleeding.Stopped=&7\u51fa\u8840\u304c &a\u6b62\u307e\u308a\u307e\u3057\u305f&7\uff01
 Swords.Combat.Bleeding=&a**\u30a8\u30cd\u30df\u30fc \u51fa\u8840**
@@ -408,10 +429,10 @@ Swords.Combat.Countered=&a**\u30ab\u30a6\u30f3\u30bf\u30fc\u653b\u6483**
 Swords.Combat.SS.Struck=&4Struck by SERRATED STRIKES!
 Swords.SubSkill.CounterAttack.Name=\u30ab\u30a6\u30f3\u30bf\u30fc\u653b\u6483
 Swords.SubSkill.CounterAttack.Description=\u653b\u6483\u3055\u308c\u305f\u3068\u304d\u306b\u30c0\u30e1\u30fc\u30b8\u306e\u4e00\u90e8\u3092\u53cd\u5c04\u3059\u308b\uff01
-Swords.SubSkill.CounterAttack.Stat=\u30ab\u30a6\u30f3\u30bf\u30fc\u653b\u6483 \u78ba\u7387
+Swords.SubSkill.CounterAttack.Stat=\u30ab\u30a6\u30f3\u30bf\u30fc\u653b\u6483\u306e\u78ba\u7387
-Swords.SubSkill.SerratedStrikes.Name=\u92f8\u6b6f\u72b6\u306e\u653b\u6483
+Swords.SubSkill.SerratedStrikes.Name=\u30bb\u30ec\u30fc\u30b7\u30e7\u30f3\u30b9\u30c8\u30e9\u30a4\u30af
 Swords.SubSkill.SerratedStrikes.Description=AOE\u3067\u30c0\u30e1\u30fc\u30b8\u3092\u4e0e\u3048\u3001\u7834\u88c2\u3092\u3055\u305b\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\uff01
-Swords.SubSkill.SerratedStrikes.Stat=\u92f8\u6b6f\u72b6\u306e\u653b\u6483\u306e\u9577\u3055
+Swords.SubSkill.SerratedStrikes.Stat=\u30bb\u30ec\u30fc\u30b7\u30e7\u30f3\u30b9\u30c8\u30e9\u30a4\u30af\u306e\u9577\u3055
 Swords.SubSkill.Rupture.Name=\u7834\u88c2
 Swords.SubSkill.Rupture.Description=\u5f37\u529b\u306a\u51fa\u8840DoT\u3092\u4e0e\u3048\u308b\u3002
 Swords.SubSkill.Stab.Name=\u30b9\u30bf\u30d6
@@ -420,17 +441,17 @@ Swords.SubSkill.Stab.Stat=\u30b9\u30bf\u30d6 \u30c0\u30e1\u30fc\u30b8
 Swords.SubSkill.SwordsLimitBreak.Name=\u5263 \u9650\u754c\u7a81\u7834
 Swords.SubSkill.SwordsLimitBreak.Description=\u9650\u754c\u3092\u7834\u308b\u3002\u30bf\u30d5\u306a\u6575\u306b\u5bfe\u3059\u308b\u30c0\u30e1\u30fc\u30b8\u304c\u5897\u52a0\u3057\u307e\u3059\u3002PvP\u3092\u5bfe\u8c61\u3068\u3057\u3001PvE\u3078\u306e\u9069\u5fdc\u306f\u30b5\u30fc\u30d0\u30fc\u306e\u8a2d\u5b9a\u6b21\u7b2c\u3067\u3059\u3002
 Swords.SubSkill.SwordsLimitBreak.Stat=\u9650\u754c\u7a81\u7834 \u8ffd\u52a0\u30c0\u30e1\u30fc\u30b8
-Swords.SubSkill.Rupture.Stat=\u7834\u88c2 \u78ba\u7387
+Swords.SubSkill.Rupture.Stat=\u7834\u88c2\u306e\u78ba\u7387
 Swords.SubSkill.Rupture.Stat.Extra=\u7834\u88c2: &a{0} ticks [{1} DMG vs Player] [{2} DMG vs Mobs]
-Swords.Effect.4=\u92f8\u6b6f\u72b6\u306e\u653b\u6483\u306e\u7834\u88c2+
+Swords.Effect.4=\u30bb\u30ec\u30fc\u30b7\u30e7\u30f3\u30b9\u30c8\u30e9\u30a4\u30af\u306e\u7834\u88c2+
 Swords.Effect.5={0} Tick \u7834\u88c2
 Swords.Listener=\u5263:
 Swords.SkillName=\u5263
-Swords.Skills.SS.Off=**\u92f8\u6b6f\u72b6\u306e\u653b\u6483 \u3092\u6d88\u8017\u3057\u305f**
+Swords.Skills.SS.Off=**\u30bb\u30ec\u30fc\u30b7\u30e7\u30f3\u30b9\u30c8\u30e9\u30a4\u30af \u3092\u6d88\u8017\u3057\u305f**
-Swords.Skills.SS.On=&a**\u92f8\u6b6f\u72b6\u306e\u653b\u6483 \u30a2\u30af\u30c6\u30a3\u30d9\u30fc\u30c8**
+Swords.Skills.SS.On=&a**\u30bb\u30ec\u30fc\u30b7\u30e7\u30f3\u30b9\u30c8\u30e9\u30a4\u30af \u30a2\u30af\u30c6\u30a3\u30d9\u30fc\u30c8**
-Swords.Skills.SS.Refresh=&e\u92f8\u6b6f\u72b6\u306e\u653b\u6483 &a\u30a2\u30d3\u30ea\u30c6\u30a3\u304c\u56de\u5fa9\u3057\u307e\u3057\u305f\uff01
+Swords.Skills.SS.Refresh=&e\u30bb\u30ec\u30fc\u30b7\u30e7\u30f3\u30b9\u30c8\u30e9\u30a4\u30af &a\u30a2\u30d3\u30ea\u30c6\u30a3\u304c\u56de\u5fa9\u3057\u307e\u3057\u305f\uff01
-Swords.Skills.SS.Other.Off=&e{0}\u304c &f\u92f8\u6b6f\u72b6\u306e\u653b\u6483 &a\u3092\u6d88\u8017\u3057\u305f
+Swords.Skills.SS.Other.Off=&e{0}\u304c &f\u30bb\u30ec\u30fc\u30b7\u30e7\u30f3\u30b9\u30c8\u30e9\u30a4\u30af &a\u3092\u6d88\u8017\u3057\u305f
-Swords.Skills.SS.Other.On=&a{0}&2 \u304c &c\u92f8\u6b6f\u72b6\u306e\u653b\u6483 &2\u3092\u4f7f\u3063\u305f\uff01
+Swords.Skills.SS.Other.On=&a{0}&2 \u304c &c\u30bb\u30ec\u30fc\u30b7\u30e7\u30f3\u30b9\u30c8\u30e9\u30a4\u30af &2\u3092\u4f7f\u3063\u305f\uff01
 
 # TAMING
 Taming.Ability.Bonus.0=\u74b0\u5883\u306b\u914d\u616e
@@ -451,19 +472,19 @@ Taming.Ability.Locked.2=\u30ed\u30c3\u30af\u3055\u308c\u308b\u307e\u3067 {0}+ \u
 Taming.Ability.Locked.3=\u30ed\u30c3\u30af\u3055\u308c\u308b\u307e\u3067 {0}+ \u30b9\u30ad\u30eb (\u92ed\u3044\u722a)
 Taming.Ability.Locked.4=\u30ed\u30c3\u30af\u3055\u308c\u308b\u307e\u3067 {0}+ \u30b9\u30ad\u30eb (\u30d5\u30a1\u30fc\u30b9\u30c8\u30d5\u30fc\u30c9\u30b5\u30fc\u30d3\u30b9)
 Taming.Ability.Locked.5=\u30ed\u30c3\u30af\u3055\u308c\u308b\u307e\u3067 {0}+ \u30b9\u30ad\u30eb (\u30db\u30fc\u30ea\u30fc\u30cf\u30a6\u30f3\u30c9)
-Taming.Combat.Chance.Gore=\u30b4\u30a2 \u78ba\u7387
+Taming.Combat.Chance.Gore=\u6d41\u8840\u306e\u78ba\u7387
 Taming.SubSkill.BeastLore.Name=\u30d3\u30fc\u30b9\u30c8\u30ed\u30a2
 Taming.SubSkill.BeastLore.Description=\u72fc\u3068\u732b\u3092\u9aa8\u3067\u691c\u67fb\u3059\u308b\u3002
 Taming.SubSkill.ShockProof.Name=\u885d\u6483\u8010\u6027
 Taming.SubSkill.ShockProof.Description=\u7206\u767a\u30c0\u30e1\u30fc\u30b8\u306e\u8efd\u6e1b
-Taming.SubSkill.CallOfTheWild.Name=\u30ef\u30a4\u30eb\u30c9\u30aa\u30d6\u30b3\u30fc\u30eb
+Taming.SubSkill.CallOfTheWild.Name=\u30b3\u30fc\u30eb\u30aa\u30d6\u30b6\u30ef\u30a4\u30eb\u30c9
 Taming.SubSkill.CallOfTheWild.Description=\u52d5\u7269\u3092\u53ec\u559a\u3059\u308b\u3002
 Taming.SubSkill.CallOfTheWild.Description.2=&7COTW: \u3057\u3083\u304c\u3093\u3067\u5de6\u30af\u30ea\u30c3\u30af\n  {0} {1} (\u732b), {2} {3} (Wolf), {4} {5} (\u99ac)
 Taming.SubSkill.FastFoodService.Name=\u30d5\u30a1\u30fc\u30b9\u30c8\u30d5\u30fc\u30c9\u30b5\u30fc\u30d3\u30b9
 Taming.SubSkill.FastFoodService.Description=\u78ba\u7387\u3067\u72fc\u304c\u653b\u6483\u6642\u56de\u5fa9\u3059\u308b\u3002
 Taming.SubSkill.HolyHound.Name=\u30db\u30fc\u30ea\u30fc\u30cf\u30a6\u30f3\u30c9
 Taming.SubSkill.HolyHound.Description=\u9b54\u6cd5\u3068\u6bd2\u3067\u72fc\u3092\u56de\u5fa9\u3059\u308b\u3002
-Taming.SubSkill.Gore.Name=\u30b4\u30a2
+Taming.SubSkill.Gore.Name=\u6d41\u8840
 Taming.SubSkill.Gore.Description=\u30af\u30ea\u30c6\u30a3\u304b\u3064\u653b\u6483\u3067\u7834\u88c2\u52b9\u679c\u3092\u4e0e\u3048\u308b\u3002
 Taming.SubSkill.SharpenedClaws.Name=\u92ed\u3044\u722a
 Taming.SubSkill.SharpenedClaws.Description=\u30c0\u30e1\u30fc\u30b8\u30dc\u30fc\u30ca\u30b9
@@ -477,15 +498,16 @@ Taming.SubSkill.Pummel.TargetMessage=\u72fc\u306b\u30ce\u30c3\u30af\u30d0\u30c3\
 Taming.Listener.Wolf=&8\u72fc\u306f\u3042\u306a\u305f\u306e\u3082\u3068\u306b\u6025\u3044\u3067\u623b\u308a\u307e\u3059...
 Taming.Listener=\u8abf\u6559:
 Taming.SkillName=\u8abf\u6559
-Taming.Summon.COTW.Success.WithoutLifespan=[[GREEN]]\uff08\u91ce\u751f\u306e\u547c\u3073\u304b\u3051\uff09 [[GRAY]]\u3042\u306a\u305f\u306f[[GOLD]]{0}[[GRAY]]\u3092\u53ec\u559a\u3057\u307e\u3057\u305f[[GRAY]]
+Taming.Summon.COTW.Success.WithoutLifespan=&a(\u30b3\u30fc\u30eb\u30aa\u30d6\u30b6\u30ef\u30a4\u30eb\u30c9) &7\u3042\u306a\u305f\u306f&6{0}&7\u3092\u53ec\u559a\u3057\u307e\u3057\u305f&7
-Taming.Summon.COTW.Success.WithLifespan=[[GREEN]]\uff08\u91ce\u751f\u306e\u547c\u3073\u304b\u3051\uff09 [[GOLD]]{0}[[GRAY]]\u3092\u53ec\u559a\u3057\u307e\u3057\u305f\u304c\u3001\u6301\u7d9a\u6642\u9593\u306f[[GOLD]]{1}[[GRAY]]\u79d2\u3067\u3059\u3002
+Taming.Summon.COTW.Success.WithLifespan=&a(\u30b3\u30fc\u30eb\u30aa\u30d6\u30b6\u30ef\u30a4\u30eb\u30c9) &6{0}&7\u3092\u53ec\u559a\u3057\u307e\u3057\u305f\u304c\u3001\u6301\u7d9a\u6642\u9593\u306f&6{1}&7\u79d2\u3067\u3059\u3002
-Taming.Summon.COTW.Limit=[[GREEN]]\uff08\u91ce\u751f\u306e\u547c\u3073\u304b\u3051\uff09 [[GOLD]]{0}[[GRAY]]\u306f\u540c\u6642\u306b[[GOLD]]{1}[[GRAY]]\u5339\u3057\u304b\u53ec\u559a\u3067\u304d\u307e\u305b\u3093\u3002
+Taming.Summon.COTW.Limit=&a(\u30b3\u30fc\u30eb\u30aa\u30d6\u30b6\u30ef\u30a4\u30eb\u30c9) &6{0}&7\u306f\u540c\u6642\u306b&6{1}&7\u5339\u3057\u304b\u53ec\u559a\u3067\u304d\u307e\u305b\u3093\u3002
-Taming.Summon.COTW.TimeExpired=[[GREEN]]\uff08\u91ce\u751f\u306e\u547c\u3073\u304b\u3051\uff09 [[GRAY]]\u6642\u9593\u5207\u308c\u3067[[GOLD]]{0}[[GRAY]]\u304c\u7acb\u3061\u53bb\u308a\u307e\u3057\u305f\u3002
+Taming.Summon.COTW.TimeExpired=&a(\u30b3\u30fc\u30eb\u30aa\u30d6\u30b6\u30ef\u30a4\u30eb\u30c9) &7\u6642\u9593\u5207\u308c\u3067&6{0}&7\u304c\u7acb\u3061\u53bb\u308a\u307e\u3057\u305f\u3002
-Taming.Summon.COTW.BreedingDisallowed=[[GREEN]]\uff08\u91ce\u751f\u306e\u547c\u3073\u304b\u3051\uff09 [[RED]]\u53ec\u559a\u3055\u308c\u305f\u52d5\u7269\u3092\u7e41\u6b96\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002
+Taming.Summon.COTW.Removed=&a(\u30b3\u30fc\u30eb\u30aa\u30d6\u30b6\u30ef\u30a4\u30eb\u30c9) &7\u3042\u306a\u305f\u306e\u53ec\u559a\u3057\u305f&6{0}&7\u306f\u30ef\u30fc\u30eb\u30c9\u304b\u3089\u6d88\u3048\u307e\u3057\u305f\u3002
-Taming.Summon.COTW.NeedMoreItems=[[GREEN]]\uff08\u91ce\u751f\u306e\u547c\u3073\u304b\u3051\uff09 [[YELLOW]]{1}[[GRAY]]\u304c[[DARK_AQUA]]{0}[[GRAY]]\u500b\u5fc5\u8981\u3067\u3059\u3002
+Taming.Summon.COTW.BreedingDisallowed=&a(\u30b3\u30fc\u30eb\u30aa\u30d6\u30b6\u30ef\u30a4\u30eb\u30c9) &4\u53ec\u559a\u3055\u308c\u305f\u52d5\u7269\u3092\u7e41\u6b96\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002
-Taming.Summon.Name.Format=[[GOLD]](COTW) [[WHITE]]{0} {1}
+Taming.Summon.COTW.NeedMoreItems=&a(\u30b3\u30fc\u30eb\u30aa\u30d6\u30b6\u30ef\u30a4\u30eb\u30c9) &e{1}&7\u304c&3{0}&7\u500b\u5fc5\u8981\u3067\u3059\u3002
+Taming.Summon.Name.Format=&6(COTW) &f{0} {1}
 # UNARMED
-Unarmed.Ability.Bonus.0=\u9244\u8155\u30b9\u30bf\u30a4\u30eb
+Unarmed.Ability.Bonus.0=\u30b9\u30c1\u30fc\u30eb\u30a2\u30fc\u30e0\u30b9\u30bf\u30a4\u30eb
 Unarmed.Ability.Bonus.1=+{0} \u30c0\u30e1\u30fc\u30b8\u30a2\u30c3\u30d7\u30b0\u30ec\u30fc\u30c9
 Unarmed.Ability.IronGrip.Attacker=\u76f8\u624b\u306f\u30a2\u30a4\u30a2\u30f3\u30b0\u30ea\u30c3\u30d7\u3092\u6301\u3063\u3066\u3044\u307e\u3059\uff01
 Unarmed.Ability.IronGrip.Defender=&a\u30a2\u30a4\u30a2\u30f3\u30b0\u30ea\u30c3\u30d7\u304c\u6b66\u88c5\u89e3\u9664\u3092\u9632\u304e\u307e\u3057\u305f\uff01
@@ -496,18 +518,18 @@ Unarmed.SubSkill.Berserk.Description=+50% \u30c0\u30e1\u30fc\u30b8, \u5f31\u3044
 Unarmed.SubSkill.Berserk.Stat=\u30d0\u30fc\u30b5\u30fc\u30ab\u30fc \u9577\u3055
 Unarmed.SubSkill.Disarm.Name=\u6b66\u88c5\u89e3\u9664
 Unarmed.SubSkill.Disarm.Description=\u6575\u306e\u30a2\u30a4\u30c6\u30e0\u3092\u30c9\u30ed\u30c3\u30d7\u3055\u305b\u308b\u3002
-Unarmed.SubSkill.Disarm.Stat=\u6b66\u88c5\u89e3\u9664 \u78ba\u7387
+Unarmed.SubSkill.Disarm.Stat=\u6b66\u88c5\u89e3\u9664\u306e\u78ba\u7387
 Unarmed.SubSkill.UnarmedLimitBreak.Name=\u7d20\u624b \u9650\u754c\u7a81\u7834
 Unarmed.SubSkill.UnarmedLimitBreak.Description=\u9650\u754c\u3092\u7834\u308b\u3002\u30bf\u30d5\u306a\u6575\u306b\u5bfe\u3059\u308b\u30c0\u30e1\u30fc\u30b8\u304c\u5897\u52a0\u3057\u307e\u3059\u3002PvP\u3092\u5bfe\u8c61\u3068\u3057\u3001PvE\u3078\u306e\u9069\u5fdc\u306f\u30b5\u30fc\u30d0\u30fc\u306e\u8a2d\u5b9a\u6b21\u7b2c\u3067\u3059\u3002
 Unarmed.SubSkill.UnarmedLimitBreak.Stat=\u9650\u754c\u7a81\u7834 \u8ffd\u52a0\u30c0\u30e1\u30fc\u30b8
-Unarmed.SubSkill.IronArmStyle.Name=\u9244\u8155\u30b9\u30bf\u30a4\u30eb
+Unarmed.SubSkill.SteelArmStyle.Name=\u30b9\u30c1\u30fc\u30eb\u30a2\u30fc\u30e0\u30b9\u30bf\u30a4\u30eb
-Unarmed.SubSkill.IronArmStyle.Description=\u6642\u9593\u3092\u304b\u3051\u3066\u7d20\u624b\u3092\u56fa\u3081\u308b\u3002
+Unarmed.SubSkill.SteelArmStyle.Description=\u6642\u9593\u304c\u7d4c\u3064\u3068\u8155\u304c\u786c\u304f\u306a\u308b
-Unarmed.SubSkill.ArrowDeflect.Name=\u77e2\u3092\u305d\u3089\u3059
+Unarmed.SubSkill.ArrowDeflect.Name=\u30a2\u30ed\u30fc\u30c7\u30a3\u30d5\u30ec\u30af\u30b7\u30e7\u30f3
 Unarmed.SubSkill.ArrowDeflect.Description=\u77e2\u3092\u305d\u3089\u3059\u3002
-Unarmed.SubSkill.ArrowDeflect.Stat=\u77e2\u3092\u305d\u3089\u3059 \u78ba\u7387
+Unarmed.SubSkill.ArrowDeflect.Stat=\u77e2\u3092\u305d\u3089\u3059\u306e\u78ba\u7387
 Unarmed.SubSkill.IronGrip.Name=\u30a2\u30a4\u30a2\u30f3\u30b0\u30ea\u30c3\u30d7
 Unarmed.SubSkill.IronGrip.Description=\u6b66\u88c5\u89e3\u9664\u3055\u308c\u308b\u306e\u3092\u9632\u304e\u307e\u3059\u3002
-Unarmed.SubSkill.IronGrip.Stat=\u30a2\u30a4\u30a2\u30f3\u30b0\u30ea\u30c3\u30d7 \u78ba\u7387
+Unarmed.SubSkill.IronGrip.Stat=\u30a2\u30a4\u30a2\u30f3\u30b0\u30ea\u30c3\u30d7\u306e\u78ba\u7387
 Unarmed.SubSkill.BlockCracker.Name=\u30d6\u30ed\u30c3\u30af\u30af\u30e9\u30c3\u30ab\u30fc
 Unarmed.SubSkill.BlockCracker.Description=\u62f3\u3067\u5ca9\u3092\u7834\u58ca\u3059\u308b\u3002
 Unarmed.Listener=\u7d20\u624b:
@@ -527,9 +549,14 @@ Woodcutting.SubSkill.TreeFeller.Description=\u6728\u3092\u7206\u767a\u3055\u305b
 Woodcutting.SubSkill.TreeFeller.Stat=\u30c4\u30ea\u30fc\u30d5\u30a7\u30e9\u30fc \u9577\u3055
 Woodcutting.SubSkill.LeafBlower.Name=\u30ea\u30fc\u30d5\u30d6\u30ed\u30ef\u30fc
 Woodcutting.SubSkill.LeafBlower.Description=\u8449\u3092\u5439\u304d\u98db\u3070\u3059\u3002
+Woodcutting.SubSkill.KnockOnWood.Name=\u30ce\u30c3\u30af\u30aa\u30f3\u30a6\u30c3\u30c9
+Woodcutting.SubSkill.KnockOnWood.Description=\u30c4\u30ea\u30fc\u30fb\u30d5\u30a7\u30e9\u30fc\u3092\u4f7f\u7528\u3057\u3066\u3044\u308b\u5834\u5408\u3001\u3055\u3089\u306b\u304a\u5f97\u306a\u30b0\u30c3\u30ba\u3092\u63a2\u3059\u3053\u3068\u304c\u3067\u304d\u308b\u3002
+Woodcutting.SubSkill.KnockOnWood.Stat=\u30ce\u30c3\u30af\u30aa\u30f3\u30a6\u30c3\u30c9
+Woodcutting.SubSkill.KnockOnWood.Loot.Normal=\u6728\u304b\u3089\u306e\u6a19\u6e96\u7684\u306a\u30a2\u30a4\u30c6\u30e0
+Woodcutting.SubSkill.KnockOnWood.Loot.Rank2=\u6728\u304b\u3089\u306e\u6a19\u6e96\u7684\u306a\u30a2\u30a4\u30c6\u30e0\u3068\u7d4c\u9a13\u5024\u30aa\u30fc\u30d6
 Woodcutting.SubSkill.HarvestLumber.Name=\u53ce\u7a6b\u6750
 Woodcutting.SubSkill.HarvestLumber.Description=\u3088\u308a\u591a\u304f\u306e\u6728\u6750\u3092\u5de7\u307f\u306b\u62bd\u51fa\u3059\u308b\u3002
-Woodcutting.SubSkill.HarvestLumber.Stat=\u30c9\u30ed\u30c3\u30d7\u4e8c\u500d \u78ba\u7387
+Woodcutting.SubSkill.HarvestLumber.Stat=\u30c9\u30ed\u30c3\u30d7\u4e8c\u500d\u306e\u78ba\u7387
 Woodcutting.SubSkill.Splinter.Name=\u7834\u7247
 Woodcutting.SubSkill.Splinter.Description=\u3088\u308a\u52b9\u7387\u3088\u304f\u6728\u3092\u4f10\u63a1\u3059\u308b\u3002
 Woodcutting.SubSkill.BarkSurgeon.Name=\u6a39\u76ae\u5916\u79d1\u533b
@@ -579,6 +606,7 @@ Commands.Cooldowns.Header=&6--= &amcMMO \u30a2\u30d3\u30ea\u30c6\u30a3 \u30af\u3
 Commands.Cooldowns.Row.N=\  &c{0}&f - &6\u6b8b\u308a {1} \u79d2
 Commands.Cooldowns.Row.Y=\  &b{0}&f - &2\u6e96\u5099\u5b8c\u4e86\uff01
 Commands.Database.CooldownMS=\u3053\u306e\u30b3\u30de\u30f3\u30c9\u3092\u518d\u5ea6\u4f7f\u7528\u3059\u308b\u306b\u306f{0}\u30df\u30ea\u79d2\u5f85\u3064\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
+Commands.Database.Cooldown=\u3053\u306e\u30b3\u30de\u30f3\u30c9\u3092\u518d\u5ea6\u4f7f\u7528\u3059\u308b\u524d\u306b {0} \u79d2\u5f85\u3064\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
 Commands.Database.Processing=\u524d\u56de\u306e\u30b3\u30de\u30f3\u30c9\u304c\u307e\u3060\u51e6\u7406\u4e2d\u3067\u3059\u3002\u304a\u5f85\u3061\u4e0b\u3055\u3044\u3002
 Commands.Disabled=\u3053\u306e\u30b3\u30de\u30f3\u30c9\u306f\u7121\u52b9\u3067\u3059\u3002
 Commands.DoesNotExist= &c\u30d7\u30ec\u30a4\u30e4\u30fc\u304c\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b\u5b58\u5728\u3057\u307e\u305b\u3093\uff01
@@ -629,11 +657,11 @@ Commands.Offline=\u3053\u306e\u30b3\u30de\u30f3\u30c9\u306f\u30aa\u30d5\u30e9\u3
 Commands.NotLoaded=\u30d7\u30ec\u30a4\u30e4\u30fc\u306e\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u306f\u307e\u3060\u8aad\u307f\u8fbc\u307e\u308c\u3066\u3044\u307e\u305b\u3093\u3002
 Commands.Party.Status=&8\u540d\u524d: &f{0} {1} &8\u30ec\u30d9\u30eb: &3{2}
 Commands.Party.Status.Alliance=&8\u5473\u65b9: &f{0}
-Commands.Party.UnlockedFeatures=&8\u30ed\u30c3\u30af\u89e3\u9664\u3055\u308c\u305f\u6a5f\u80fd: &7[[ITALIC]]{0}
+Commands.Party.UnlockedFeatures=&8\u30ed\u30c3\u30af\u89e3\u9664\u3055\u308c\u305f\u6a5f\u80fd: &7&o{0}
 Commands.Party.ShareMode=&8\u5171\u6709\u30e2\u30fc\u30c9:
 Commands.Party.ItemShare=&7\u30a2\u30a4\u30c6\u30e0 &3({0})
 Commands.Party.ExpShare=&7EXP &3({0})
-Commands.Party.ItemShareCategories=&8\u30a2\u30a4\u30c6\u30e0\u5171\u6709: &7[[ITALIC]]{0}
+Commands.Party.ItemShareCategories=&8\u30a2\u30a4\u30c6\u30e0\u5171\u6709: &7&o{0}
 Commands.Party.MembersNear=&8\u3042\u306a\u305f\u306e\u8fd1\u304f\u306b &3{0}&8/&3{1}
 Commands.Party.Accept=&a- \u30d1\u30fc\u30c6\u30a3\u30fc\u62db\u5f85\u3092\u8a31\u8afe
 Commands.Party.Chat.Off=\u30d1\u30fc\u30c6\u30a3\u30fc\u30c1\u30e3\u30c3\u30c8\u304c&c\u30aa\u30d5&f\u306b\u5207\u308a\u66ff\u308f\u308a\u307e\u3057\u305f\u3002
@@ -696,6 +724,8 @@ Commands.Scoreboard.Help.2=&3/mcscoreboard&b keep &f - mcMMO\u30b9\u30b3\u30a2\u
 Commands.Scoreboard.Help.3=&3/mcscoreboard&b time [n] &f - mcMMO\u30b9\u30b3\u30a2\u30dc\u30fc\u30c9\u3092&dn&f\u79d2\u5f8c\u306b\u30af\u30ea\u30a2\u3059\u308b
 Commands.Scoreboard.Tip.Keep=&6\u30d2\u30f3\u30c8: \u30b9\u30b3\u30a2\u30dc\u30fc\u30c9\u304c\u8868\u793a\u3055\u308c\u3066\u3044\u308b\u9593\u306b&c/mcscoreboard keep&6\u3092\u4f7f\u7528\u3057\u3066\u6d88\u3048\u306a\u3044\u3088\u3046\u306b\u3059\u308b\u3002
 Commands.Scoreboard.Tip.Clear=&6\u30d2\u30f3\u30c8: &c/mcscoreboard clear&6\u3092\u4f7f\u7528\u3057\u3066\u30b9\u30b3\u30a2\u30dc\u30fc\u30c9\u3092\u6d88\u53bb\u3059\u308b\u3002
+Commands.XPBar.Reset=&6mcMMO\u306eXP Bar\u306e\u8a2d\u5b9a\u304c\u30ea\u30bb\u30c3\u30c8\u3055\u308c\u307e\u3057\u305f\u3002
+Commands.XPBar.SettingChanged=&6a{0} &6\u306eXP\u30d0\u30fc\u8a2d\u5b9a\u3092 &a{1} \u306b\u5909\u66f4\u3057\u307e\u3057\u305f\u3002
 Commands.Skill.Invalid=\u6709\u52b9\u306a\u30b9\u30ad\u30eb\u540d\u3067\u306f\u3042\u308a\u307e\u305b\u3093\uff01
 Commands.Skill.ChildSkill=\u3053\u306e\u30b3\u30de\u30f3\u30c9\u3067\u306f\u5b50\u30b9\u30ad\u30eb\u306f\u7121\u52b9\u3067\u3059\uff01
 Commands.Skill.Leaderboard=--mcMMO &9{0}&e \u30ea\u30fc\u30c0\u30fc\u30dc\u30fc\u30c9--
@@ -706,6 +736,7 @@ Commands.Usage.0=&c\u9069\u5207\u306a\u4f7f\u7528\u6cd5\u306f /{0}
 Commands.Usage.1=&c\u9069\u5207\u306a\u4f7f\u7528\u6cd5\u306f /{0} {1}
 Commands.Usage.2=&c\u9069\u5207\u306a\u4f7f\u7528\u6cd5\u306f /{0} {1} {2}
 Commands.Usage.3=&c\u9069\u5207\u306a\u4f7f\u7528\u6cd5\u306f /{0} {1} {2} {3}
+Commands.Usage.3.XP=&c\u9069\u5207\u306a\u4f7f\u7528\u6cd5\u306f /{0} {1} {2} {3} &7(\u6700\u5f8c\u306b-s\u3092\u5165\u308c\u308b\u3053\u3068\u3067\u3001\u30d7\u30ec\u30a4\u30e4\u30fc\u306b\u77e5\u3089\u305b\u305a\u306b\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059)
 Commands.Usage.FullClassName=\u30af\u30e9\u30b9\u540d
 Commands.Usage.Level=\u30ec\u30d9\u30eb
 Commands.Usage.Message=\u30e1\u30c3\u30bb\u30fc\u30b8
@@ -828,7 +859,7 @@ Commands.xprate.modified=&cXP\u30ec\u30fc\u30c8\u306f{0}\u306b\u5909\u66f4\u3055
 Commands.xprate.over=&cmcMMO XP\u30ec\u30fc\u30c8\u30a4\u30d9\u30f3\u30c8\u304c\u7d42\u308f\u308a\u307e\u3057\u305f\uff01
 Commands.xprate.proper.0=&cXP\u30ec\u30fc\u30c8\u3092\u5909\u66f4\u3059\u308b\u305f\u3081\u306e\u6b63\u3057\u3044\u65b9\u6cd5\u306f/xprate <integer> <true/false> \u3067\u3059\u3002
 Commands.xprate.proper.1=&cXP\u30ec\u30fc\u30c8\u3092\u30c7\u30d5\u30a9\u30eb\u30c8\u306b\u623b\u3059\u6b63\u3057\u3044\u65b9\u6cd5\u306f/xprate reset \u3067\u3059\u3002
-Commands.xprate.proper.2=&cXP\u30ec\u30fc\u30c8\u3092\u30c7\u30d5\u30a9\u30eb\u30c8\u306b\u623b\u3059\u6b63\u3057\u3044\u65b9\u6cd5\u306f/xprate reset \u3067\u3059\u3002
+Commands.xprate.proper.2=&cxp\u30a4\u30d9\u30f3\u30c8\u304b\u3092\u793a\u3059\u305f\u3081\u306btrue\u307e\u305f\u306ffalse\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 Commands.NegativeNumberWarn=\u8ca0\u306e\u5024\u3092\u4f7f\u308f\u306a\u3044\u3067\u304f\u3060\u3055\u3044\u3002
 Commands.Event.Start=&amcMMO&6 \u30a4\u30d9\u30f3\u30c8\uff01
 Commands.Event.Stop=&amcMMO&3 \u30a4\u30d9\u30f3\u30c8\u7d42\u4e86\uff01
@@ -857,100 +888,99 @@ Guides.Page.OutOfRange=\u305d\u306e\u30da\u30fc\u30b8\u306f\u5b58\u5728\u3057\u3
 Guides.Usage=\u4f7f\u3044\u65b9\u306f /{0} ? [\u30da\u30fc\u30b8] \u3067\u3059\u3002
 ## Acrobatics
 Guides.Acrobatics.Section.0=&3\u30a2\u30af\u30ed\u30d0\u30c6\u30a3\u30c3\u30af\u306b\u3064\u3044\u3066\uff1a\n&e\u30a2\u30af\u30ed\u30d0\u30c6\u30a3\u30c3\u30af\u306f\u3001mcMMO\u3067\u512a\u96c5\u306b\u52d5\u304f\u82b8\u8853\u3067\u3059\u3002\n&e\u30a2\u30af\u30ed\u30d0\u30c6\u30a3\u30c3\u30af\u306f\u3001mcMMO\u3067\u512a\u96c5\u306b\u52d5\u304f\u82b8\u8853\u3067\u3059\u3002\n\n&3XP\u7372\u5f97\uff1a\n&e\u3053\u306e\u30b9\u30ad\u30eb\u3067XP\u3092\u7372\u5f97\u3059\u308b\u306b\u306f\u3001\u6226\u95d8\u3067\u8eb1\u3059\u304b\\&en\u30c0\u30e1\u30fc\u30b8\u3092\u53d7\u3051\u308b\u9ad8\u3055\u304b\u3089\u843d\u4e0b\u3057\u3066\u751f\u304d\u6b8b\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
-Guides.Acrobatics.Section.1=&3\u53d7\u3051\u8eab\u306f\u3069\u306e\u3088\u3046\u306b\u6a5f\u80fd\u3057\u307e\u3059\u304b\uff1f\r\n&e\u843d\u4e0b\u30c0\u30e1\u30fc\u30b8\u3092\u53d7\u3051\u305f\u3068\u304d\u306b\u53d7\u3051\u305f\u30c0\u30e1\u30fc\u30b8\u3092\u6253\u3061\u6d88\u3059\u30c1\u30e3\u30f3\u30b9\u304c\u3042\u308a\u307e\u3059\u3002\\n&e\u843d\u4e0b\u4e2d\u306b\u30b9\u30cb\u30fc\u30af\u3059\u308b\u3053\u3068\u3067\u30c1\u30e3\u30f3\u30b9\u3092\u500d\u5897\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002
+Guides.Acrobatics.Section.1=&3\u53d7\u3051\u8eab\u306f\u3069\u306e\u3088\u3046\u306b\u6a5f\u80fd\u3057\u307e\u3059\u304b\uff1f\n&e\u843d\u4e0b\u30c0\u30e1\u30fc\u30b8\u3092\u53d7\u3051\u305f\u3068\u304d\u306b\u53d7\u3051\u305f\u30c0\u30e1\u30fc\u30b8\u3092\u6253\u3061\u6d88\u3059\u30c1\u30e3\u30f3\u30b9\u304c\u3042\u308a\u307e\u3059\u3002\n&e\u843d\u4e0b\u4e2d\u306b\u30b9\u30cb\u30fc\u30af\u3059\u308b\u3053\u3068\u3067\u78ba\u7387\u3092\u500d\u5897\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002
 Guides.Acrobatics.Section.2=&3\u8eb1\u3059\u306f\u3069\u306e\u3088\u3046\u306b\u6a5f\u80fd\u3057\u307e\u3059\u304b\uff1f\n&e\u8eb1\u3059\u306f\u78ba\u7387\u3067\u6226\u95d8\u3067\u8ca0\u50b7\u3057\u305f\u3068\u304d\u306b\\n&e\u53d7\u3051\u305f\u30c0\u30e1\u30fc\u30b8\u3092\u534a\u5206\u306b\u3057\u307e\u3059\u3002\\n&e\u30b9\u30ad\u30eb\u30ec\u30d9\u30eb\u306b\u95a2\u4fc2\u3057\u3066\u3044\u307e\u3059\u3002
 ## Alchemy
-Guides.Alchemy.Section.0=&3\u932c\u91d1\u8853\u306b\u3064\u3044\u3066\uff1a\n&e\u932c\u91d1\u8853\u306f\u30dd\u30fc\u30b7\u30e7\u30f3\u306e\u91b8\u9020\u306b\u95a2\u3059\u308b\u3082\u306e\u3067\u3059\u3002\n&e\u30dd\u30fc\u30b7\u30e7\u30f3\u306e\u91b8\u9020\u6642\u9593\u3092\u77ed\u7e2e\u3057\u3066\u3001\n&e\u65b0\u3057\u3044\u8ffd\u52a0\u3055\u308c\u305f\u30dd\u30fc\u30b7\u30e7\u30f3\u3092\u5165\u624b\u3067\u304d\u307e\u3059\u3002\n\n\n&3XP \u7372\u5f97:\n&e\u3053\u306e\u30b9\u30ad\u30eb\u3067XP\u3092\u7372\u5f97\u3059\u308b\u306b\u306f\u3001\u30dd\u30fc\u30b7\u30e7\u30f3\u3092\u91b8\u9020\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
+Guides.Alchemy.Section.1=&3\u89e6\u5a92\u306e\u52b9\u679c\u306f\uff1f\n&e\u89e6\u5a92\u306f\u91b8\u9020\u306e\u901f\u5ea6\u3092\u901f\u3081\u3001\n&e\u30ec\u30d9\u30eb1000\u3067\u6700\u59274\u500d\u306e\u901f\u5ea6\u306b\u306a\u308a\u307e\u3059\u3002\n&e\u3053\u306e\u30a2\u30d3\u30ea\u30c6\u30a3\u306f\u30c7\u30d5\u30a9\u30eb\u30c8\u3067\u306f\u30ec\u30d9\u30eb100\u3067\u30a2\u30f3\u30ed\u30c3\u30af\u3055\u308c\u308b\u3002
-Guides.Alchemy.Section.1=&3How does Catalysis work?\n&eCatalysis speeds of the brewing process, with a\n&emax speed of 4x at level 1000.\n&eThis ability is unlocked at level 100 by default.
+Guides.Alchemy.Section.2=&3\u8abf\u5408\u306e\u52b9\u679c\u306f\uff1f\n&e\u8abf\u5408\u3067\u306f\u6750\u6599\u3092\u4f7f\u3063\u3066\u3001\u3088\u308a\u591a\u304f\u306e\u30dd\u30fc\u30b7\u30e7\u30f3\u3092\u4f5c\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002\n&e\u3069\u306e\u6750\u6599\u304c\u30a2\u30f3\u30ed\u30c3\u30af\u3055\u308c\u308b\u304b\u306f\u3001\u30e9\u30f3\u30af\u306b\u3088\u3063\u3066\u6c7a\u5b9a\u3055\u308c\u307e\u3059\u3002\n&e\u89e3\u9664\u3067\u304d\u308b\u30e9\u30f3\u30af\u306f\uff18\u3064\u3067\u3059\u3002
-Guides.Alchemy.Section.2=&3How does Concoctions work?\n&eConcoctions allows brewing of more potions with custom ingredients.\n&eWhich special ingredients are unlocked is determined\n&eby your Rank. There are 8 ranks to unlock.
+Guides.Alchemy.Section.3=&3\u8abf\u5408 \u30c6\u30a3\u30a21\u306e\u6750\u6599\uff1a\n&eBlaze Powder, Fermented Spider Eye, Ghast Tear, Redstone,\n&eGlowstone Dust, Sugar, Glistering Melon, Golden Carrot,\n&eMagma Cream, Nether Wart, Spider Eye, Suplhur, Water Lily,\n&ePufferfish\n&e(Vanilla Potions)
-Guides.Alchemy.Section.3=&3Concoctions tier 1 ingredients:\n&eBlaze Powder, Fermented Spider Eye, Ghast Tear, Redstone,\n&eGlowstone Dust, Sugar, Glistering Melon, Golden Carrot,\n&eMagma Cream, Nether Wart, Spider Eye, Suplhur, Water Lily,\n&ePufferfish\n&e(Vanilla Potions)
+Guides.Alchemy.Section.4=&3\u8abf\u5408 \u30c6\u30a3\u30a22\u306e\u6750\u6599\uff1a\n&eCarrot (Potion of Haste)\n&eSlimeball (Potion of Dullness)\n\n&3Concoctions tier 3 ingredients:\n&eQuartz (Potion of Absorption)\n&eRed Mushroom (Potion of Leaping)
-Guides.Alchemy.Section.4=&3Concoctions tier 2 ingredients:\n&eCarrot (Potion of Haste)\n&eSlimeball (Potion of Dullness)\n\n&3Concoctions tier 3 ingredients:\n&eQuartz (Potion of Absorption)\n&eRed Mushroom (Potion of Leaping)
+Guides.Alchemy.Section.5=&3\u8abf\u5408 \u30c6\u30a3\u30a24\u306e\u6750\u6599\uff1a\n&eApple (Potion of Health Boost)\n&eRotten Flesh (Potion of Hunger)\n\n&3Concoctions tier 5 ingredients:\n&eBrown Mushroom (Potion of Nausea)\n&eInk Sack (Potion of Blindness)
-Guides.Alchemy.Section.5=&3Concoctions tier 4 ingredients:\n&eApple (Potion of Health Boost)\n&eRotten Flesh (Potion of Hunger)\n\n&3Concoctions tier 5 ingredients:\n&eBrown Mushroom (Potion of Nausea)\n&eInk Sack (Potion of Blindness)
+Guides.Alchemy.Section.6=&3\u8abf\u5408 \u30c6\u30a3\u30a26\u306e\u6750\u6599\uff1a\n&eFern (Potion of Saturation)\n\n&3Concoctions tier 7 ingredients:\n&ePoisonous Potato (Potion of Decay)\n\n&3Concoctions tier 8 ingredients:\n&eRegular Golden Apple (Potion of Resistance)
-Guides.Alchemy.Section.6=&3Concoctions tier 6 ingredients:\n&eFern (Potion of Saturation)\n\n&3Concoctions tier 7 ingredients:\n&ePoisonous Potato (Potion of Decay)\n\n&3Concoctions tier 8 ingredients:\n&eRegular Golden Apple (Potion of Resistance)
 ## Archery
 Guides.Archery.Section.0=&3\u5f13\u306b\u3064\u3044\u3066\uff1a\n&eArchery is about shooting with your bow and arrow.\n&eIt provides various combat bonuses, such as a damage boost\n&ethat scales with your level and the ability to daze your\n&eopponents in PvP. In addition to this, you can retrieve\n&esome of your spent arrows from the corpses of your foes.\n\n\n&3XP GAIN:\n&eTo gain XP in this skill you need to shoot mobs or\n&eother players.
-Guides.Archery.Section.1=&3How does Skill Shot work?\n&eSkill Shot provides additional damage to your shots.\n&eThe bonus damage from Skill Shot increases as you\n&elevel in Archery.\n&eWith the default settings, your archery damage increases 10%\n&eevery 50 levels, to a maximum of 200% bonus damage.
+Guides.Archery.Section.1=&3\u30b9\u30ad\u30eb\u30b7\u30e7\u30c3\u30c8\u306e\u52b9\u679c\u306f\uff1f\n&eSkill Shot provides additional damage to your shots.\n&eThe bonus damage from Skill Shot increases as you\n&elevel in Archery.\n&eWith the default settings, your archery damage increases 10%\n&eevery 50 levels, to a maximum of 200% bonus damage.
-Guides.Archery.Section.2=&3How does Daze work?\n&eYou have a passive chance to daze other players when\n&eyou shoot them. When Daze triggers it forces your opponents\n&eto look straight up for a short duration.\n&eA Daze shot also deals an additional 4 damage (2 hearts).
+Guides.Archery.Section.2=&3\u5e7b\u60d1\u306e\u52b9\u679c\u306f\uff1f\n&eYou have a passive chance to daze other players when\n&eyou shoot them. When Daze triggers it forces your opponents\n&eto look straight up for a short duration.\n&eA Daze shot also deals an additional 4 damage (2 hearts).
-Guides.Archery.Section.3=&3How does Arrow Retrieval work?\n&eYou have a passive chance to retrieve some of your arrows\n&ewhen you kill a mob with your bow.\n&eThis chance increases as you level in Archery.\n&eBy default, this ability increases by 0.1% per level, up to 100%\n&eat level 1000.
+Guides.Archery.Section.3=&3\u30a2\u30ed\u30fc\u30ea\u30c8\u30ea\u30fc\u30d6\u306e\u52b9\u679c\u306f\uff1f\n&eYou have a passive chance to retrieve some of your arrows\n&ewhen you kill a mob with your bow.\n&eThis chance increases as you level in Archery.\n&eBy default, this ability increases by 0.1% per level, up to 100%\n&eat level 1000.
 ## Axes
 Guides.Axes.Section.0=&3\u65a7\u306b\u3064\u3044\u3066\uff1a\n&eWith the Axes skill you can use your axe for much more then\n&ejust deforesting! You can hack and chop away at mobs\n&eand players to gain XP, hitting mobs with the effect of\n&eknockback and inflicting DEADLY criticals on mobs and players.\n&eYour axe also becomes a hand-held woodchipper,\n&ebreaking down the enemy's armor with ease as your level\n&eincreases.\n&3XP GAIN:\n&eTo gain XP in this skill you need hit other mobs or players\n&ewith an Axe.
-Guides.Axes.Section.1=&3How does Skull Splitter work?\n&eThis ability allows you to deal an AoE (Area of Effect) hit.\n&eThis AoE hit will deal half as much damage as you did to the\n&emain target, so it's great for clearing out large piles of mobs.
+Guides.Axes.Section.1=&3\u30b9\u30ab\u30eb\u30b9\u30d7\u30ea\u30c3\u30bf\u30fc\u306e\u52b9\u679c\u306f\uff1f\n&eThis ability allows you to deal an AoE (Area of Effect) hit.\n&eThis AoE hit will deal half as much damage as you did to the\n&emain target, so it's great for clearing out large piles of mobs.
-Guides.Axes.Section.2=&3How does Critical Strikes work?\n&eCritical Strikes is a passive ability which gives players a\n&echance to deal additional damage.\n&eWith the default settings, every 2 skill levels in Axes awards a\n&e0.1% chance to deal a Critical Strike, causing 2.0 times damage\n&eto mobs or 1.5 times damage against other players.
+Guides.Axes.Section.2=&3\u30af\u30ea\u30c6\u30a3\u30ab\u30eb\u30b9\u30c8\u30e9\u30a4\u30af\u306e\u52b9\u679c\u306f\uff1f\n&eCritical Strikes is a passive ability which gives players a\n&echance to deal additional damage.\n&eWith the default settings, every 2 skill levels in Axes awards a\n&e0.1% chance to deal a Critical Strike, causing 2.0 times damage\n&eto mobs or 1.5 times damage against other players.
-Guides.Axes.Section.3=&3How does Axe Mastery work?\n&eAxe Mastery is a passive ability that will add additional damage\n&eto your hits when using Axes.\n&eBy default, the bonus damage increases by 1 every 50 levels,\n&eup to a cap of 4 extra damage at level 200.
+Guides.Axes.Section.3=&3\u30a2\u30c3\u30af\u30b9\u30de\u30b9\u30bf\u30ea\u30fc\u306e\u52b9\u679c\u306f\uff1f\n&eAxe Mastery is a passive ability that will add additional damage\n&eto your hits when using Axes.\n&eBy default, the bonus damage increases by 1 every 50 levels,\n&eup to a cap of 4 extra damage at level 200.
-Guides.Axes.Section.4=&3How does Armor Impact work?\n&eStrike with enough force to shatter armor!\n&eArmor Impact has a passive chance to damage your\n&eopponent's armor. This damage increases as you level in Axes.
+Guides.Axes.Section.4=&3\u30a2\u30fc\u30de\u30fc\u30a4\u30f3\u30d1\u30af\u30c8\u306e\u52b9\u679c\u306f\uff1f\n&eStrike with enough force to shatter armor!\n&eArmor Impact has a passive chance to damage your\n&eopponent's armor. This damage increases as you level in Axes.
-Guides.Axes.Section.5=&3How does Greater Impact work?\n&eYou have a passive chance to achieve a greater impact when\n&ehitting mobs or players with your axe.\n&eBy default this chance is 25%. This passive ability has an\n&eextreme knockback effect, similar to the Knockback II\n&eenchantment. In addition, it deals bonus damage to the target.
+Guides.Axes.Section.5=&3\u30b0\u30ec\u30fc\u30bf\u30fc\u30a4\u30f3\u30d1\u30af\u30c8\u306e\u52b9\u679c\u306f\uff1f\n&eYou have a passive chance to achieve a greater impact when\n&ehitting mobs or players with your axe.\n&eBy default this chance is 25%. This passive ability has an\n&eextreme knockback effect, similar to the Knockback II\n&eenchantment. In addition, it deals bonus damage to the target.
 ## Excavation
 Guides.Excavation.Section.0=&3\u6398\u524a\u306b\u3064\u3044\u3066\uff1a\n&eExcavation is the act of digging up dirt to find treasures.\n&eBy excavating the land you will find treasures.\n&eThe more you do this the more treasures you can find.\n\n&3XP GAIN:\n&eTo gain XP in this skill you must dig with a shovel in hand.\n&eOnly certain materials can be dug up for treasures and XP.
-Guides.Excavation.Section.1=&3Compatible Materials:\n&eGrass, Dirt, Sand, Clay, Gravel, Mycelium, Soul Sand, Snow
+Guides.Excavation.Section.1=&3\u4e92\u63db\u6027\u306e\u3042\u308b\u30d6\u30ed\u30c3\u30af\uff1a\n&eGrass, Dirt, Sand, Clay, Gravel, Mycelium, Soul Sand, Snow
-Guides.Excavation.Section.2=&3How to use Giga Drill Breaker:\n&eWith a shovel in hand right click to ready your tool.\n&eOnce in this state you have about 4 seconds to make\n&econtact with Excavation compatible materials this will\n&eactivate Giga Drill Breaker.
+Guides.Excavation.Section.2=&3\u30ae\u30ac\u30c9\u30ea\u30eb\u30d6\u30ec\u30fc\u30ab\u30fc\u3092\u4f7f\u3046\u306b\u306f\u3069\u3046\u3059\u308c\u3070\u3044\u3044\u3067\u3059\u304b\uff1f\uff1a\n&eWith a shovel in hand right click to ready your tool.\n&eOnce in this state you have about 4 seconds to make\n&econtact with Excavation compatible materials this will\n&eactivate Giga Drill Breaker.
-Guides.Excavation.Section.3=&3What is Giga Drill Breaker?\n&eGiga Drill Breaker is an ability with a cooldown\n&etied to Excavation skill. It triples your chance\n&eof finding treasures and enables instant break\n&eon Excavation materials.
+Guides.Excavation.Section.3=&3\u30ae\u30ac\u30c9\u30ea\u30eb\u30d6\u30ec\u30fc\u30ab\u30fc\u3068\u306f\uff1f\n&eGiga Drill Breaker is an ability with a cooldown\n&etied to Excavation skill. It triples your chance\n&eof finding treasures and enables instant break\n&eon Excavation materials.
-Guides.Excavation.Section.4=&3How does Archaeology work?\n&eEvery possible treasure for Excavation has its own\n&eskill level requirement for it to drop, as a result it's\n&edifficult to say how much it is helping you.\n&eJust keep in mind that the higher your Excavation skill\n&eis, the more treasures that can be found.\n&eAnd also keep in mind that each type of Excavation\n&ecompatible material has its own unique list of treasures.\n&eIn other words you will find different treasures in Dirt\n&ethan you would in Gravel.
+Guides.Excavation.Section.4=&3\u8003\u53e4\u5b66\u306e\u52b9\u679c\u306f\uff1f\n&eEvery possible treasure for Excavation has its own\n&eskill level requirement for it to drop, as a result it's\n&edifficult to say how much it is helping you.\n&eJust keep in mind that the higher your Excavation skill\n&eis, the more treasures that can be found.\n&eAnd also keep in mind that each type of Excavation\n&ecompatible material has its own unique list of treasures.\n&eIn other words you will find different treasures in Dirt\n&ethan you would in Gravel.
-Guides.Excavation.Section.5=&3Notes about Excavation:\n&eExcavation drops are completely customizeable\n&eSo results vary server to server.
+Guides.Excavation.Section.5=&3\u6398\u524a\u306b\u3064\u3044\u3066\u306e\u6ce8\u610f\u4e8b\u9805:\n&eExcavation drops are completely customizeable\n&eSo results vary server to server.
 ## Fishing
 Guides.Fishing.Section.0=&3\u91e3\u308a\u306b\u3064\u3044\u3066\uff1a\n&eWith the Fishing skill, Fishing is exciting again!\n&eFind hidden treasures, and shake items off mobs.\n\n&3XP GAIN:\n&eCatch fish.
-Guides.Fishing.Section.1=&3How does Treasure Hunter work?\n&eThis ability allows you to find treasure from fishing \n&ewith a small chance of the items being enchanted.\n&eEvery possible treasure for Fishing has a chance\n&eto drop on any level. It depends however\n&ewhat the rarity of the item is how often it will drop.\n&eThe higher your Fishing skill is, the better\n&eyour chances are to find better treasures.
+Guides.Fishing.Section.1=&3\u30c8\u30ec\u30b8\u30e3\u30fc\u30cf\u30f3\u30bf\u30fc\u306e\u52b9\u679c\u306f\uff1f\n&eThis ability allows you to find treasure from fishing \n&ewith a small chance of the items being enchanted.\n&eEvery possible treasure for Fishing has a chance\n&eto drop on any level. It depends however\n&ewhat the rarity of the item is how often it will drop.\n&eThe higher your Fishing skill is, the better\n&eyour chances are to find better treasures.
-Guides.Fishing.Section.2=&3How does Ice Fishing work?\n&eThis passive skill allows you to fish in ice lakes!\n&eCast your fishing rod in an ice lake and the ability will\n&ecreate a small hole in the ice to fish in.
+Guides.Fishing.Section.2=&3\u30a2\u30a4\u30b9\u30d5\u30a3\u30c3\u30b7\u30f3\u30b0\u306e\u52b9\u679c\u306f\uff1f\n&eThis passive skill allows you to fish in ice lakes!\n&eCast your fishing rod in an ice lake and the ability will\n&ecreate a small hole in the ice to fish in.
-Guides.Fishing.Section.3=&3How does Master Angler work?\n&eThis passive skill increases the bite chance while fishing.\n&eWhen you've unlocked this ability, fishing while in\n&ea boat or when an ocean biome doubles the bite chance.
+Guides.Fishing.Section.3=&3\u30de\u30b9\u30bf\u30fc\u30a2\u30f3\u30b0\u30e9\u30fc\u306e\u52b9\u679c\u306f\uff1f\n&eThis passive skill increases the bite chance while fishing.\n&eWhen you've unlocked this ability, fishing while in\n&ea boat or when an ocean biome doubles the bite chance.
-Guides.Fishing.Section.4=&3How does Shake work?\n&eThis active ability allows you to shake items loose from mobs\n&eby hooking them with the fishing rod. \n&eMobs will drop items they would normally drop on death.\n&eIt is also possible to acquire mob skulls, which are normally \n&eunobtainable in survival mode.
+Guides.Fishing.Section.4=&3\u30b7\u30a7\u30a4\u30af\u306f\u3069\u306e\u3088\u3046\u306b\u52d5\u4f5c\u3057\u307e\u3059\u304b\uff1f\n&eThis active ability allows you to shake items loose from mobs\n&eby hooking them with the fishing rod. \n&eMobs will drop items they would normally drop on death.\n&eIt is also possible to acquire mob skulls, which are normally \n&eunobtainable in survival mode.
-Guides.Fishing.Section.5=&3How does Fisherman's Diet work?\n&eThis passive skill increases the amount of hunger restored \n&efrom eating fish.
+Guides.Fishing.Section.5=&3\u6f01\u5e2b\u306e\u98df\u4e8b\u306e\u52b9\u679c\u306f\uff1f\n&eThis passive skill increases the amount of hunger restored \n&efrom eating fish.
-Guides.Fishing.Section.6=&3Notes about Fishing:\n&eFishing drops are completely customizable,\n&eso results vary server to server.
+Guides.Fishing.Section.6=&3\u91e3\u308a\u306b\u95a2\u3059\u308b\u6ce8\u610f\u4e8b\u9805:\n&eFishing drops are completely customizable,\n&eso results vary server to server.
 ## Herbalism
 Guides.Herbalism.Section.0=&3\u8fb2\u696d\u306b\u3064\u3044\u3066\uff1a\n&eHerbalism is about collecting herbs and plants.\n\n\n&3XP GAIN:\n&eCollect plants and herbs.
-Guides.Herbalism.Section.1=&3Compatible Blocks\n&eWheat, Potatoes, Carrots, Melons, \n&ePumpkins, Sugar Canes, Cocoa Beans, Flowers, Cacti, Mushrooms,\n&eNether Wart, Lily Pads, and Vines.
+Guides.Herbalism.Section.1=&3\u4e92\u63db\u6027\u306e\u3042\u308b\u30d6\u30ed\u30c3\u30af\n&eWheat, Potatoes, Carrots, Melons, \n&ePumpkins, Sugar Canes, Cocoa Beans, Flowers, Cacti, Mushrooms,\n&eNether Wart, Lily Pads, and Vines.
-Guides.Herbalism.Section.2=&3How does Green Terra work?\n&eGreen Terra is an active ability, you can right-click\n&ewhile holding a hoe to activate Green Terra.\n&eGreen Terra grants players a chance to get 3x drops from\n&eharvesting plants. It also gives players the ability to\n&espread life into blocks and transform them using seeds\n&efrom your inventory.
+Guides.Herbalism.Section.2=&3\u30b0\u30ea\u30fc\u30f3\u30c6\u30e9\u306e\u52b9\u679c\u306f\uff1f\n&eGreen Terra is an active ability, you can right-click\n&ewhile holding a hoe to activate Green Terra.\n&eGreen Terra grants players a chance to get 3x drops from\n&eharvesting plants. It also gives players the ability to\n&espread life into blocks and transform them using seeds\n&efrom your inventory.
-Guides.Herbalism.Section.3=&3How does Green Thumb (Crops) work?\n&eThis passive ability will automatically replant crops when\n&eharvesting.\n&eYour chance of success depends on your Herbalism skill.
+Guides.Herbalism.Section.3=&3\u30b0\u30ea\u30fc\u30f3\u30b5\u30e0\uff08\u4f5c\u7269\uff09\u306e\u52b9\u679c\u306f\uff1f\n&eThis passive ability will automatically replant crops when\n&eharvesting.\n&eYour chance of success depends on your Herbalism skill.
-Guides.Herbalism.Section.4=&3How does Green Thumb (Cobble/Stone Brick/Dirt) work?\n&eThis active ability allows you to turn blocks into their\n&e"plant-related" counterparts. You can do this by right-clicking\n&ea block, while holding seeds. This will consume 1 seed.
+Guides.Herbalism.Section.4=&3\u30b0\u30ea\u30fc\u30f3\u30b5\u30e0\uff08\u4e38\u77f3/\u77f3\u30ec\u30f3\u30ac/\u571f\uff09\u306e\u52b9\u679c\u306f\uff1f\n&eThis active ability allows you to turn blocks into their\n&e"plant-related" counterparts. You can do this by right-clicking\n&ea block, while holding seeds. This will consume 1 seed.
-Guides.Herbalism.Section.5=&3How does Farmer's Diet work?\n&eThis passive skill increases the amount of hunger restored \n&ewhen eating Bread, Cookies, Melons, Mushroom Soup, Carrots,\n&eand Potatoes.
+Guides.Herbalism.Section.5=&3\u8fb2\u5bb6\u306e\u98df\u4e8b\u306e\u52b9\u679c\u306f\uff1f\n&eThis passive skill increases the amount of hunger restored \n&ewhen eating Bread, Cookies, Melons, Mushroom Soup, Carrots,\n&eand Potatoes.
-Guides.Herbalism.Section.6=&3How does Hylian Luck work?\n&eThis passive ability gives you a chance to find rare items\n&ewhen certain blocks are broken with a sword.
+Guides.Herbalism.Section.6=&3\u30cf\u30a4\u30ea\u30a2\u30f3\u30e9\u30c3\u30af\u306e\u52b9\u679c\u306f\uff1f\n&eThis passive ability gives you a chance to find rare items\n&ewhen certain blocks are broken with a sword.
-Guides.Herbalism.Section.7=&3How do Double Drops work?\n&eThis passive ability gives players more yield from their\n&eharvests.
+Guides.Herbalism.Section.7=&3\u30c9\u30ed\u30c3\u30d7\u4e8c\u500d\u306e\u52b9\u679c\u306f\uff1f\n&eThis passive ability gives players more yield from their\n&eharvests.
 ## Mining
 Guides.Mining.Section.0=&3\u63a1\u6398\u306b\u3064\u3044\u3066\uff1a\n&eMining consists of mining stone and ores. It provides bonuses\n&eto the amount of materials dropped while mining.\n\n&3XP GAIN:\n&eTo gain XP in this skill, you must mine with a pickaxe in hand.\n&eOnly certain blocks award XP.
-Guides.Mining.Section.1=&3Compatible Materials:\n&eStone, Coal Ore, Iron Ore, Gold Ore, Diamond Ore, Redstone Ore,\n&eLapis Ore, Obsidian, Mossy Cobblestone, Ender Stone,\n&eGlowstone, and Netherrack.
+Guides.Mining.Section.1=&3\u4e92\u63db\u6027\u306e\u3042\u308b\u30d6\u30ed\u30c3\u30af:\n&eStone, Coal Ore, Iron Ore, Gold Ore, Diamond Ore, Redstone Ore,\n&eLapis Ore, Obsidian, Mossy Cobblestone, Ender Stone,\n&eGlowstone, and Netherrack.
-Guides.Mining.Section.2=&3How to use Super Breaker:\n&eWith a pickaxe in your hand, right click to ready your tool.\n&eOnce in this state, you have about 4 seconds to make contact\n&ewith Mining compatible materials, which will activate Super\n&eBreaker.
+Guides.Mining.Section.2=&3\u30b9\u30fc\u30d1\u30fc\u30d6\u30ec\u30a4\u30ab\u30fc\u3092\u4f7f\u3046\u306b\u306f\u3069\u3046\u3059\u308c\u3070\u3044\u3044\u3067\u3059\u304b\uff1f\uff1a\n&eWith a pickaxe in your hand, right click to ready your tool.\n&eOnce in this state, you have about 4 seconds to make contact\n&ewith Mining compatible materials, which will activate Super\n&eBreaker.
-Guides.Mining.Section.3=&3What is Super Breaker?\n&eSuper Breaker is an ability with a cooldown tied to the Mining\n&eskill. It triples your chance of extra items dropping and\n&eenables instant break on Mining materials.
+Guides.Mining.Section.3=&3\u30b9\u30fc\u30d1\u30fc\u30d6\u30ec\u30a4\u30ab\u30fc\u3068\u306f\uff1f\n&eSuper Breaker is an ability with a cooldown tied to the Mining\n&eskill. It triples your chance of extra items dropping and\n&eenables instant break on Mining materials.
-Guides.Mining.Section.4=&3How to use Blast Mining:\n&eWith a pickaxe in hand,\n&ecrouch and right-click on TNT from a distance. This will cause the TNT\n&eto instantly explode.
+Guides.Mining.Section.4=&3\u30d6\u30e9\u30b9\u30c8\u30de\u30a4\u30cb\u30f3\u30b0\u3092\u4f7f\u3046\u306b\u306f\u3069\u3046\u3059\u308c\u3070\u3044\u3044\u3067\u3059\u304b\uff1f\uff1a\n&eWith a pickaxe in hand,\n&ecrouch and right-click on TNT from a distance. This will cause the TNT\n&eto instantly explode.
-Guides.Mining.Section.5=&3How does Blast Mining work?\n&eBlast Mining is an ability with a cooldown tied to the Mining\n&eskill. It gives bonuses when mining with TNT and allows you\n&eto remote detonate TNT. There are three parts to Blast Mining.\n&eThe first part is Bigger Bombs, which increases blast radius.\n&eThe second is Demolitions Expert, which decreases damage\n&efrom TNT explosions. The third part simply increases the\n&eamount of ores dropped from TNT and decreases the\n&edebris dropped.
+Guides.Mining.Section.5=&3\u30d6\u30e9\u30b9\u30c8\u30de\u30a4\u30cb\u30f3\u30b0\u306e\u52b9\u679c\u306f\uff1f\n&eBlast Mining is an ability with a cooldown tied to the Mining\n&eskill. It gives bonuses when mining with TNT and allows you\n&eto remote detonate TNT. There are three parts to Blast Mining.\n&eThe first part is Bigger Bombs, which increases blast radius.\n&eThe second is Demolitions Expert, which decreases damage\n&efrom TNT explosions. The third part simply increases the\n&eamount of ores dropped from TNT and decreases the\n&edebris dropped.
 ## Repair
 Guides.Repair.Section.0=&3\u4fee\u7406\u306b\u3064\u3044\u3066\uff1a\n&eRepair allows you to use an iron block to repair armor and\n&etools.\n\n&3XP GAIN:\n&eRepair tools or armor using the mcMMO Anvil. This is an\n&eiron block by default and should not be confused with\n&ethe Vanilla Minecraft Anvil.
-Guides.Repair.Section.1=&3How can I use Repair?\n&ePlace down a mcMMO Anvil and right-click to repair the item \n&eyou're currently holding. This consumes 1 item on every use.
+Guides.Repair.Section.1=&3\u4fee\u7406\u3092\u4f7f\u3046\u306b\u306f\u3069\u3046\u3059\u308c\u3070\u3044\u3044\u3067\u3059\u304b\uff1f\uff1a\n&ePlace down a mcMMO Anvil and right-click to repair the item \n&eyou're currently holding. This consumes 1 item on every use.
-Guides.Repair.Section.2=&3How does Repair Mastery work?\n&eRepair Mastery increases the repair amount. The extra amount\n&erepaired is influenced by your Repair skill level.
+Guides.Repair.Section.2=&3\u30ea\u30da\u30a2\u30de\u30b9\u30bf\u30ea\u30fc\u306e\u52b9\u679c\u306f\uff1f\n&eRepair Mastery increases the repair amount. The extra amount\n&erepaired is influenced by your Repair skill level.
-Guides.Repair.Section.3=&3How does Super Repair work?\n&eSuper Repair is a passive ability. When repairing an item,\n&eit grants players a chance to repair an item with\n&edouble effectiveness.
+Guides.Repair.Section.3=&3\u30b9\u30fc\u30d1\u30fc\u30ea\u30da\u30a2\u306e\u52b9\u679c\u306f\uff1f\n&eSuper Repair is a passive ability. When repairing an item,\n&eit grants players a chance to repair an item with\n&edouble effectiveness.
-Guides.Repair.Section.4=&3How does Arcane Forging work?\n&eThis passive ability allows you to repair items with a certain\n&echance of maintaining its enchantments. The enchants may be\n&ekept at their existing levels, downgraded to a lower level,\n&eor lost entirely.
+Guides.Repair.Section.4=&3\u30a2\u30eb\u30ab\u30f3\u30d5\u30a9\u30fc\u30b8\u30f3\u30b0\u306e\u52b9\u679c\u306f\uff1f\n&eThis passive ability allows you to repair items with a certain\n&echance of maintaining its enchantments. The enchants may be\n&ekept at their existing levels, downgraded to a lower level,\n&eor lost entirely.
 ## Salvage
 Guides.Salvage.Section.0=&3\u30b5\u30eb\u30d9\u30fc\u30b8\u306b\u3064\u3044\u3066\uff1a\n&eSalvage allows you to use an gold block to salvage armor and\n&etools.\n\n&3XP GAIN:\n&eSalvage is a child skill of Repair and Fishing, your Salvage\n&eskill level is based on your Fishing and Repair skill levels.
-Guides.Salvage.Section.1=&3How can I use Salvage?\n&ePlace down a mcMMO Salvage Anvil and right-click to salvage\n&ethe item you're currently holding. This will break apart the item,\n&eand give back materials used to craft the item.\n\n&eFor example, salvaging an iron pickaxe will give you iron bars.
+Guides.Salvage.Section.1=&3\u30b5\u30eb\u30d9\u30fc\u30b8\u3092\u4f7f\u3046\u306b\u306f\u3069\u3046\u3059\u308c\u3070\u3044\u3044\u3067\u3059\u304b\uff1f\uff1a\n&ePlace down a mcMMO Salvage Anvil and right-click to salvage\n&ethe item you're currently holding. This will break apart the item,\n&eand give back materials used to craft the item.\n\n&eFor example, salvaging an iron pickaxe will give you iron bars.
-Guides.Salvage.Section.2=&3How does Advanced Salvage work?\n&eWhen unlocked, this ability allows you to salvage damaged items.\n&eThe yield percentage increases as you level up. A higher yield\n&emeans that you can get more materials back.\n&eWith advanced salvage you will always get 1 material back,\n&eunless the item is too damaged. So you don't have to worry\n&eabout destroying items without getting anything in return.
+Guides.Salvage.Section.2=&3\u30a2\u30c9\u30d0\u30f3\u30b9\u30c9\u30b5\u30eb\u30d9\u30fc\u30b8\u306e\u52b9\u679c\u306f\uff1f\n&eWhen unlocked, this ability allows you to salvage damaged items.\n&eThe yield percentage increases as you level up. A higher yield\n&emeans that you can get more materials back.\n&eWith advanced salvage you will always get 1 material back,\n&eunless the item is too damaged. So you don't have to worry\n&eabout destroying items without getting anything in return.
-Guides.Salvage.Section.3=&3To illustrate how this works, here's an example:\n&eLet's say we salvage a gold pickaxe which is damaged for 20%,\n&ethis means that the maximum amount you could get is only 2\n&e(because the pick is crafted with 3 ingots - each worth\n&e33,33% durability) which is equal to 66%. If your yield\n&epercentage is below 66% you are not able to get 2 ingots.\n&eIf it is above this value you are able to gain the "full amount",\n&ewhich means that you will get 2 ingots.
+Guides.Salvage.Section.3=&3\u3053\u308c\u304c\u3069\u306e\u3088\u3046\u306b\u52d5\u4f5c\u3059\u308b\u304b\u3092\u8aac\u660e\u3059\u308b\u305f\u3081\u306b\u3001\u4ee5\u4e0b\u306b\u4f8b\u3092\u793a\u3057\u307e\u3059:\n&eLet's say we salvage a gold pickaxe which is damaged for 20%,\n&ethis means that the maximum amount you could get is only 2\n&e(because the pick is crafted with 3 ingots - each worth\n&e33,33% durability) which is equal to 66%. If your yield\n&epercentage is below 66% you are not able to get 2 ingots.\n&eIf it is above this value you are able to gain the "full amount",\n&ewhich means that you will get 2 ingots.
-Guides.Salvage.Section.4=&3How does Arcane Salvage work?\n&eThis ability allows you to get enchanted books when salvaging\n&eenchanted items. Depending on your level the chance of\n&esuccessfully extracting a full or partial enchantment varies.\n\n&eWhen an enchantment is partially extracted, the enchantment\n&ebook will have a lower level enchantment compared to what\n&eit was on the item.
+Guides.Salvage.Section.4=&3\u30a2\u30eb\u30ab\u30f3\u30b5\u30eb\u30d9\u30fc\u30b8\u306e\u52b9\u679c\u306f\uff1f\n&eThis ability allows you to get enchanted books when salvaging\n&eenchanted items. Depending on your level the chance of\n&esuccessfully extracting a full or partial enchantment varies.\n\n&eWhen an enchantment is partially extracted, the enchantment\n&ebook will have a lower level enchantment compared to what\n&eit was on the item.
 ## Smelting
 Guides.Smelting.Section.0=Coming soon...
 ## Swords
 Guides.Swords.Section.0=&3\u5263\u306b\u3064\u3044\u3066\uff1a\n&eThis skill awards combat bonuses to anyone fighting with a\n&esword.\n\n&3XP GAIN:\n&eXP is gained based on the amount of damage dealt to mobs or \n&eother players when wielding a sword.
-Guides.Swords.Section.1=&3How does Serrated Strikes work?\n&eSerrated Strikes is an active ability, you can activate it by\n&eright-clicking with a sword. This ability allows you to deal \n&ean AoE (Area of Effect) hit. This AoE will do a bonus 25%\n&edamage and will inflict a bleed effect that lasts for 5 ticks.
+Guides.Swords.Section.1=&3\u30bb\u30ec\u30fc\u30b7\u30e7\u30f3\u30b9\u30c8\u30e9\u30a4\u30af\u306e\u52b9\u679c\u306f\uff1f\n&eSerrated Strikes is an active ability, you can activate it by\n&eright-clicking with a sword. This ability allows you to deal \n&ean AoE (Area of Effect) hit. This AoE will do a bonus 25%\n&edamage and will inflict a bleed effect that lasts for 5 ticks.
-Guides.Swords.Section.2=&3How does Counter Attack work?\n&eCounter Attack is an active ability. When blocking and taking\n&ehits from mobs, you will have a chance to reflect 50% of \n&ethe damage that was taken.
+Guides.Swords.Section.2=&3\u30ab\u30a6\u30f3\u30bf\u30fc\u653b\u6483\u306e\u52b9\u679c\u306f\uff1f\n&eCounter Attack is an active ability. When blocking and taking\n&ehits from mobs, you will have a chance to reflect 50% of \n&ethe damage that was taken.
-Guides.Swords.Section.3=&3How does Rupture work?\n&eRupture causes enemies to take damage every two seconds. The \n&etarget will bleed until the effect wears off, or death, \n&ewhichever comes first.\n&eThe duration of the bleed is increased by your sword skill.
+Guides.Swords.Section.3=&3\u7834\u88c2\u306e\u52b9\u679c\u306f\uff1f\n&eRupture causes enemies to take damage every two seconds. The \n&etarget will bleed until the effect wears off, or death, \n&ewhichever comes first.\n&eThe duration of the bleed is increased by your sword skill.
 ## Taming
 Guides.Taming.Section.0=&3\u8abf\u6559\u306b\u3064\u3044\u3066\uff1a\n&eTaming will give players various combat bonuses when using\n&etamed wolves.\n\n&3XP GAIN:\n&eTo gain XP in this skill, you need to tame wolves/ocelots or\n&eget into combat with your wolves.
-Guides.Taming.Section.1=[DARK_AQUA]]How does Call of the Wild work?\n&eCall of the Wild is an active ability that will allow you to summon\n&ea wolf or an ocelot by your side. You can do this by\n&esneaking + left-clicking while holding bones or fish.
+Guides.Taming.Section.1=&3\u30b3\u30fc\u30eb\u30aa\u30d6\u30b6\u30ef\u30a4\u30eb\u30c9\u306e\u52b9\u679c\u306f\uff1f\n&eCall of the Wild is an active ability that will allow you to summon\n&ea wolf or an ocelot by your side. You can do this by\n&esneaking + left-clicking while holding bones or fish.
-Guides.Taming.Section.2=&3How does Beast Lore work?\n&eBeast Lore allows players to inspect pets and to check the\n&estats of wolves and ocelots. Left-click a wolf or ocelot to use\n&eBeast Lore.
+Guides.Taming.Section.2=&3\u30d3\u30fc\u30b9\u30c8\u30ed\u30a2\u306e\u52b9\u679c\u306f\uff1f\n&eBeast Lore allows players to inspect pets and to check the\n&estats of wolves and ocelots. Left-click a wolf or ocelot to use\n&eBeast Lore.
-Guides.Taming.Section.3=&3How does Gore work?\n&eGore is a passive ability that has a chance of inflicting a\n&ebleeding effect on your wolves' targets.
+Guides.Taming.Section.3=&3\u6d41\u8840\u306e\u52b9\u679c\u306f\uff1f\n&eGore is a passive ability that has a chance of inflicting a\n&ebleeding effect on your wolves' targets.
-Guides.Taming.Section.4=&3How does Sharpened Claws work?\n&eSharpened Claws provides a damage bonus to damage dealt\n&eby wolves. The damage bonus depends on your Taming level.
+Guides.Taming.Section.4=&3\u92ed\u3044\u722a\u306e\u52b9\u679c\u306f\uff1f\n&eSharpened Claws provides a damage bonus to damage dealt\n&eby wolves. The damage bonus depends on your Taming level.
-Guides.Taming.Section.5=&3How does Environmentally Aware work?\n&eThis passive ability will allow wolves to teleport to you when\n&ethey get near hazards, such as Cacti/Lava. It will also give\n&ewolves fall damage immunity.
+Guides.Taming.Section.5=&3\u74b0\u5883\u914d\u616e\u306e\u52b9\u679c\u306f\uff1f\n&eThis passive ability will allow wolves to teleport to you when\n&ethey get near hazards, such as Cacti/Lava. It will also give\n&ewolves fall damage immunity.
-Guides.Taming.Section.6=&3How does Thick Fur work?\n&eThis passive ability will reduce damage and make wolves\n&efire resistant.
+Guides.Taming.Section.6=&3\u539a\u3044\u6bdb\u76ae\u306e\u52b9\u679c\u306f\uff1f\n&eThis passive ability will reduce damage and make wolves\n&efire resistant.
-Guides.Taming.Section.7=&3How does Shock Proof work?\n&eThis passive ability reduces damage done to wolves\n&efrom explosions.
+Guides.Taming.Section.7=&3\u885d\u6483\u8010\u6027\u306e\u52b9\u679c\u306f\uff1f\n&eThis passive ability reduces damage done to wolves\n&efrom explosions.
-Guides.Taming.Section.8=&3How does Fast Food Service work?\n&eThis passive ability gives wolves a chance to heal whenever\n&ethey perform an attack.
+Guides.Taming.Section.8=&3\u30d5\u30a1\u30fc\u30b9\u30c8\u30d5\u30fc\u30c9\u30b5\u30fc\u30d3\u30b9\u306e\u52b9\u679c\u306f\uff1f\n&eThis passive ability gives wolves a chance to heal whenever\n&ethey perform an attack.
 ## Unarmed
 Guides.Unarmed.Section.0=&3\u7d20\u624b\u306b\u3064\u3044\u3066\uff1a\n&eUnarmed will give players various combat bonuses when using\n&eyour fists as a weapon. \n\n&3XP GAIN:\n&eXP is gained based on the amount of damage dealt to mobs \n&eor other players when unarmed.
-Guides.Unarmed.Section.1=&3How does Berserk work?\n&eBeserk is an active ability that is activated by\n&eright-clicking. While in Beserk mode, you deal 50% more\n&edamage and you can break weak materials instantly, such as\n&eDirt and Grass.
+Guides.Unarmed.Section.1=&3\u30d0\u30fc\u30b5\u30fc\u30ab\u30fc\u306e\u52b9\u679c\u306f\uff1f\n&eBeserk is an active ability that is activated by\n&eright-clicking. While in Beserk mode, you deal 50% more\n&edamage and you can break weak materials instantly, such as\n&eDirt and Grass.
-Guides.Unarmed.Section.2=&3How does Iron Arm work?\n&eIron Arm increases the damage dealt when hitting mobs or\n&eplayers with your fists.
+Guides.Unarmed.Section.2=&3\u30b9\u30c1\u30fc\u30eb\u30a2\u30fc\u30e0\u30b9\u30bf\u30a4\u30eb\u306e\u52b9\u679c\u306f\uff1f\n&eSteel Arm Style increases the damage dealt when hitting mobs or\n&eplayers with your fists.
-Guides.Unarmed.Section.3=&3How does Arrow Deflect work?\n&eArrow Deflect is a passive ability that gives you a chance\n&eto deflect arrows shot by Skeletons or other players.\n&eThe arrow will fall harmlessly to the ground.
+Guides.Unarmed.Section.3=&3\u30a2\u30ed\u30fc\u30c7\u30a3\u30d5\u30ec\u30af\u30b7\u30e7\u30f3\u306e\u52b9\u679c\u306f\uff1f\n&eArrow Deflect is a passive ability that gives you a chance\n&eto deflect arrows shot by Skeletons or other players.\n&eThe arrow will fall harmlessly to the ground.
-Guides.Unarmed.Section.4=&3How does Iron Grip work?\n&eIron Grip is a passive ability that counters disarm. As your\n&eunarmed level increases, the chance of preventing a disarm increases.
+Guides.Unarmed.Section.4=&3\u30a2\u30a4\u30a2\u30f3\u30b0\u30ea\u30c3\u30d7\u306e\u52b9\u679c\u306f\uff1f\n&eIron Grip is a passive ability that counters disarm. As your\n&eunarmed level increases, the chance of preventing a disarm increases.
-Guides.Unarmed.Section.5=&3How does Disarm work?\n&eThis passive ability allows players to disarm other players,\n&ecausing the target's equipped item to fall to the ground.
+Guides.Unarmed.Section.5=&3\u6b66\u88c5\u89e3\u9664\u306e\u52b9\u679c\u306f\uff1f\n&eThis passive ability allows players to disarm other players,\n&ecausing the target's equipped item to fall to the ground.
 ## Woodcutting
 Guides.Woodcutting.Section.0=&3\u6728\u3053\u308a\u306b\u3064\u3044\u3066\uff1a\n&eWoodcutting is all about chopping down trees.\n\n&3XP GAIN:\n&eXP is gained whenever you break log blocks.
-Guides.Woodcutting.Section.1=&3How does Tree Feller work?\n&eTree Feller is an active ability, you can right-click\n&ewhile holding an ax to activate Tree Feller. This will\n&ecause the entire tree to break instantly, dropping all\n&eof its logs at once.
+Guides.Woodcutting.Section.1=&3\u30c4\u30ea\u30fc\u30d5\u30a7\u30e9\u30fc\u306e\u52b9\u679c\u306f\uff1f\n&eTree Feller is an active ability, you can right-click\n&ewhile holding an ax to activate Tree Feller. This will\n&ecause the entire tree to break instantly, dropping all\n&eof its logs at once.
-Guides.Woodcutting.Section.2=&3How does Leaf Blower work?\n&eLeaf Blower is a passive ability that will cause leaf\n&eblocks to break instantly when hit with an axe. By default,\n&ethis ability unlocks at level 100.
+Guides.Woodcutting.Section.2=&3\u30ea\u30fc\u30d5\u30d6\u30ed\u30ef\u30fc\u306e\u52b9\u679c\u306f\uff1f\n&eLeaf Blower is a passive ability that will cause leaf\n&eblocks to break instantly when hit with an axe. By default,\n&ethis ability unlocks at level 100.
-Guides.Woodcutting.Section.3=&3How do Double Drops work?\n&eThis passive ability gives you a chance to obtain an extra\n&eblock for every log you chop.
+Guides.Woodcutting.Section.3=&3\u30c9\u30ed\u30c3\u30d7\u4e8c\u500d\u306e\u52b9\u679c\u306f\uff1f\n&eThis passive ability gives you a chance to obtain an extra\n&eblock for every log you chop.
 
 # INSPECT
 Inspect.Offline= &c\u3042\u306a\u305f\u306f\u30aa\u30d5\u30e9\u30a4\u30f3\u30d7\u30ec\u30a4\u30e4\u30fc\u3092\u8abf\u3079\u308b\u6a29\u9650\u3092\u6301\u3063\u3066\u3044\u307e\u305b\u3093\uff01
@@ -972,7 +1002,7 @@ Item.FluxPickaxe.Lore.1=&7\u9271\u77f3\u304c\u88fd\u932c\u3055\u308c\u3066\u30c9
 Item.FluxPickaxe.Lore.2=&7\u88fd\u932c\u30ec\u30d9\u30eb {0}+ \u304c\u5fc5\u8981
 
 # TELEPORTATION
-Teleport.Commencing=&6({0})[[GREY]]\u79d2\u3067\u30c6\u30ec\u30dd\u30fc\u30c8\u3092\u958b\u59cb\u3057\u3066\u307e\u3059\u3002\u3057\u3070\u3089\u304f\u304a\u5f85\u3061\u304f\u3060\u3055\u3044...
+Teleport.Commencing=&6({0})&7\u79d2\u3067\u30c6\u30ec\u30dd\u30fc\u30c8\u3092\u958b\u59cb\u3057\u3066\u307e\u3059\u3002\u3057\u3070\u3089\u304f\u304a\u5f85\u3061\u304f\u3060\u3055\u3044...
 Teleport.Cancelled=&4\u30c6\u30ec\u30dd\u30fc\u30c8\u306f\u30ad\u30e3\u30f3\u30bb\u30eb\u3055\u308c\u307e\u3057\u305f\u3002
 
 # SKILLS
@@ -986,6 +1016,8 @@ Skills.Stats={0}&a{1}&3 XP(&7{2}&3/&7{3}&3)
 Skills.ChildStats={0}&a{1}
 Skills.MaxXP=\u6700\u5927
 Skills.TooTired=\u305d\u306e\u30a2\u30d3\u30ea\u30c6\u30a3\u3092\u518d\u3073\u4f7f\u3046\u306e\u306b\u306f\u75b2\u308c\u904e\u304e\u3066\u3044\u307e\u3059\u3002 &e({0}\u79d2)
+Skills.TooTired.Named=&7(&6{0}&e {1}\u79d2&7)
+Skills.TooTired.Extra=&6{0} &e\u30b9\u30fc\u30d1\u30fc\u30a2\u30d3\u30ea\u30c6\u30a3CD - {1}
 Skills.Cancelled=&6{0} &c\u30ad\u30e3\u30f3\u30bb\u30eb\uff01
 Skills.ConfirmOrCancel=&a\u3082\u3046\u4e00\u5ea6\u53f3\u30af\u30ea\u30c3\u30af\u3057\u3066&6{0}&a\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002 \u30ad\u30e3\u30f3\u30bb\u30eb\u3059\u308b\u306b\u306f\u5de6\u30af\u30ea\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 Skills.AbilityGateRequirementFail=&7\u3053\u306e\u30a2\u30d3\u30ea\u30c6\u30a3\u3092\u4f7f\u3046\u305f\u3081\u306b\u306f&e{0}&7\u30ec\u30d9\u30eb\u306e&3{1}&7\u304c\u5fc5\u8981\u3067\u3059\u3002
@@ -1042,12 +1074,12 @@ Smelting.SubSkill.FuelEfficiency.Description=\u88fd\u932c\u6642\u306b\u7ac8\u306
 Smelting.SubSkill.FuelEfficiency.Stat=\u71c3\u6599\u52b9\u7387 \u4e57\u6570: &e{0}x
 Smelting.SubSkill.SecondSmelt.Name=\u7b2c\u4e8c\u7cbe\u932c
 Smelting.SubSkill.SecondSmelt.Description=\u88fd\u932c\u304b\u3089\u5f97\u305f\u30a2\u30a4\u30c6\u30e0\u30922\u500d\u306b\u3059\u308b\u3002
-Smelting.SubSkill.SecondSmelt.Stat=\u7b2c\u4e8c\u7cbe\u932c \u78ba\u7387
+Smelting.SubSkill.SecondSmelt.Stat=\u7b2c\u4e8c\u7cbe\u932c\u306e\u78ba\u7387
 Smelting.Effect.4=\u30d0\u30cb\u30e9XP\u30d6\u30fc\u30b9\u30c8
 Smelting.Effect.5=\u88fd\u932c\u4e2d\u306b\u5f97\u3089\u308c\u308b\u30d0\u30cb\u30e9XP\u3092\u5897\u3084\u3059\u3002
 Smelting.SubSkill.FluxMining.Name=\u30d5\u30e9\u30c3\u30af\u30b9\u30de\u30a4\u30cb\u30f3\u30b0
 Smelting.SubSkill.FluxMining.Description=\u78ba\u7387\u3067\u63a1\u6398\u3057\u305f\u9271\u7269\u304c\u751f\u7523\u3055\u308c\u307e\u3059\u3002
-Smelting.SubSkill.FluxMining.Stat=\u30d5\u30e9\u30c3\u30af\u30b9\u30de\u30a4\u30cb\u30f3\u30b0 \u78ba\u7387
+Smelting.SubSkill.FluxMining.Stat=\u30d5\u30e9\u30c3\u30af\u30b9\u30de\u30a4\u30cb\u30f3\u30b0\u306e\u78ba\u7387
 Smelting.Listener=\u7cbe\u932c:
 Smelting.SkillName=\u7cbe\u932c
 
@@ -1106,7 +1138,7 @@ Scoreboard.Misc.Ability=\u30a2\u30d3\u30ea\u30c6\u30a3
 # DATABASE RECOVERY
 Profile.PendingLoad=&cmcMMO\u30d7\u30ec\u30a4\u30e4\u30fc\u30c7\u30fc\u30bf\u306f\u307e\u3060\u8aad\u307f\u8fbc\u307e\u308c\u3066\u3044\u307e\u305b\u3093\u3002
 Profile.Loading.Success=&a\u3042\u306a\u305f\u306emcMMO\u30d7\u30ed\u30d5\u30a3\u30fc\u30eb\u304c\u8aad\u307f\u8fbc\u307e\u308c\u307e\u3057\u305f\u3002
-Profile.Loading.FailurePlayer=&cmcMMO\u306e\u30c7\u30fc\u30bf\u306e\u8aad\u307f\u8fbc\u307f\u306b\u554f\u984c\u304c\u3042\u308a\u307e\u3059\u3002&a{0}&c\u56de\u8aad\u307f\u8fbc\u307f\u3092\u8a66\u3057\u307e\u3057\u305f\u3002[[LIGHT_GRAY]] \u3053\u306e\u554f\u984c\u306b\u3064\u3044\u3066\u30b5\u30fc\u30d0\u30fc\u7ba1\u7406\u8005\u306b\u9023\u7d61\u3057\u3066\u304f\u3060\u3055\u3044\u3002mcMMO\u306f\u3042\u306a\u305f\u304c\u5207\u65ad\u3059\u308b\u307e\u3067\u30c7\u30fc\u30bf\u306e\u8aad\u307f\u8fbc\u307f\u3092\u7e70\u308a\u8fd4\u3057\u307e\u3059\u3002\u30c7\u30fc\u30bf\u304c\u8aad\u307f\u8fbc\u307e\u308c\u3066\u3044\u306a\u3044\u9593XP\u3092\u7372\u5f97\u3067\u304d\u306a\u3044\u304b\u3001\u30b9\u30ad\u30eb\u3092\u4f7f\u3046\u3053\u3068\u304c\u51fa\u6765\u307e\u305b\u3093\u3002
+Profile.Loading.FailurePlayer=&cmcMMO\u306e\u30c7\u30fc\u30bf\u306e\u8aad\u307f\u8fbc\u307f\u306b\u554f\u984c\u304c\u3042\u308a\u307e\u3059\u3002&a{0}&c\u56de\u8aad\u307f\u8fbc\u307f\u3092\u8a66\u3057\u307e\u3057\u305f\u3002&7 \u3053\u306e\u554f\u984c\u306b\u3064\u3044\u3066\u30b5\u30fc\u30d0\u30fc\u7ba1\u7406\u8005\u306b\u9023\u7d61\u3057\u3066\u304f\u3060\u3055\u3044\u3002mcMMO\u306f\u3042\u306a\u305f\u304c\u5207\u65ad\u3059\u308b\u307e\u3067\u30c7\u30fc\u30bf\u306e\u8aad\u307f\u8fbc\u307f\u3092\u7e70\u308a\u8fd4\u3057\u307e\u3059\u3002\u30c7\u30fc\u30bf\u304c\u8aad\u307f\u8fbc\u307e\u308c\u3066\u3044\u306a\u3044\u9593XP\u3092\u7372\u5f97\u3067\u304d\u306a\u3044\u304b\u3001\u30b9\u30ad\u30eb\u3092\u4f7f\u3046\u3053\u3068\u304c\u51fa\u6765\u307e\u305b\u3093\u3002
 Profile.Loading.FailureNotice=&4[A]&c mcMMO\u306f&e{0}&c\u306e\u30d7\u30ec\u30fc\u30e4\u30fc\u30c7\u30fc\u30bf\u3092\u8aad\u307f\u8fbc\u3081\u307e\u305b\u3093\u3067\u3057\u305f\u3002 &d\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u8a2d\u5b9a\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u3053\u308c\u307e\u3067\u306e\u8a66\u884c\u56de\u6570\u306f{1}\u56de\u3067\u3059\u3002
 
 # Holiday
@@ -1122,6 +1154,19 @@ Locale.Reloaded=&a\u30ed\u30b1\u30fc\u30eb \u30ea\u30ed\u30fc\u30c9\uff01
 # Player Leveling Stuff
 LevelCap.PowerLevel=&6(&amcMMO&6) &c{0}&e\u306e\u30d1\u30ef\u30fc\u30ec\u30d9\u30eb\u306e\u30ec\u30d9\u30eb\u30ad\u30e3\u30c3\u30d7\u306b\u9054\u3057\u307e\u3057\u305f\u3002\u3053\u308c\u4ee5\u964d\u30b9\u30ad\u30eb\u306e\u30ec\u30d9\u30eb\u30a2\u30c3\u30d7\u306f\u3057\u307e\u305b\u3093\u3002
 LevelCap.Skill=&6(&amcMMO&6) &6{1}&e\u306e\u30ec\u30d9\u30eb\u30ad\u30e3\u30c3\u30d7&c{0}&e\u306b\u9054\u3057\u307e\u3057\u305f\u3002\u3053\u308c\u4ee5\u964d\u30b9\u30ad\u30eb\u306e\u30ec\u30d9\u30eb\u30a2\u30c3\u30d7\u306f\u3057\u307e\u305b\u3093\u3002
-Commands.XPBar.Usage=Proper usage is /mmoxpbar <skillname | reset> <show | hide>
+Commands.XPBar.Usage=\u4f7f\u3044\u65b9\u306f /mmoxpbar <skillname | reset> <show | hide>
-Commands.Description.mmoxpbar=Player settings for mcMMO XP bars
+Commands.Description.mmoxpbar=mcMMO XP\u30d0\u30fc\u306e\u30d7\u30ec\u30a4\u30e4\u30fc\u8a2d\u5b9a
-Commands.Description.mmocompat=Information about mcMMO and whether or not its in compatibility mode or fully functional.
+Commands.Description.mmocompat=mcMMO\u306b\u3064\u3044\u3066\u306e\u60c5\u5831\u3068\u3001\u4e92\u63db\u6027\u30e2\u30fc\u30c9\u304b\u5b8c\u5168\u306b\u6a5f\u80fd\u3057\u3066\u3044\u308b\u304b\u3069\u3046\u304b\u306e\u60c5\u5831\u3002
+Compatibility.Layer.Unsupported=&a{0}&6\u306e\u4e92\u63db\u6027\u306f\u3001\u3053\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u306eMinecraft\u3067\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
+Compatibility.Layer.PartialSupport=&a{0}&6\u306e\u4e92\u63db\u6027\u306f\u3053\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u306eMinecraft\u3067\u306f\u5b8c\u5168\u306b\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u304c\u3001mcMMO\u306f\u4e0d\u8db3\u3057\u3066\u3044\u308b\u6a5f\u80fd\u306e\u4e00\u90e8\u3092\u30a8\u30df\u30e5\u30ec\u30fc\u30c8\u3059\u308b\u305f\u3081\u306b\u30bb\u30ab\u30f3\u30c0\u30ea\u30b7\u30b9\u30c6\u30e0\u3092\u5b9f\u884c\u3057\u3066\u3044\u307e\u3059\u3002
+Commands.XPBar.DisableAll=&6 \u3059\u3079\u3066\u306emcMMO XP\u30d0\u30fc\u304c\u7121\u52b9\u306b\u306a\u3063\u305f\u306e\u3067\u3001/mmoxpbar reset\u3092\u4f7f\u7528\u3057\u3066\u30c7\u30d5\u30a9\u30eb\u30c8\u8a2d\u5b9a\u3092\u5fa9\u5143\u3002
+#Modern Chat Settings
+Chat.Style.Admin=&b(A) &r{0} &b\u2192 &r{1}
+Chat.Style.Party=&a(P) &r{0} &a\u2192 &r{1}
+Chat.Style.Party.Leader=&a(P) &r{0} &6\u2192 &r{1}
+Chat.Identity.Console=&6* \u30b3\u30f3\u30bd\u30fc\u30eb *
+Chat.Channel.On=&6(&amcMMO-\u30c1\u30e3\u30c3\u30c8&6) &e\u30c1\u30e3\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u304c\u81ea\u52d5\u7684\u306b &a{0} &e\u30c1\u30e3\u30c3\u30c8\u30c1\u30e3\u30f3\u30cd\u30eb\u306b\u9001\u4fe1\u3055\u308c\u308b\u3088\u3046\u306b\u306a\u308a\u307e\u3057\u305f\u3002
+Chat.Channel.Off=&6(&amcMMO-\u30c1\u30e3\u30c3\u30c8&6) &7\u3042\u306a\u305f\u306e\u30c1\u30e3\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u306f\u3001\u7279\u5b9a\u306e\u30c1\u30e3\u30c3\u30c8\u30c1\u30e3\u30f3\u30cd\u30eb\u306b\u81ea\u52d5\u7684\u306b\u9001\u4fe1\u3055\u308c\u306a\u304f\u306a\u308a\u307e\u3059\u3002
+Chat.Spy.Party=&6[&eSPY&6-&a{2}&6] &r{0} &b\u2192 &r{1}
+Broadcasts.LevelUpMilestone=&6(&amcMMO&6) {0} &7\u304c &3{2} \u3067\u30ec\u30d9\u30eb &a{1} &7\u306b\u5230\u9054\u3057\u307e\u3057\u305f\uff01
+Broadcasts.PowerLevelUpMilestone=&6(&amcMMO&6) {0}&7 \u306e\u30d1\u30ef\u30fc\u30ec\u30d9\u30eb\u304c &a{1} &7\u306b\u5230\u9054\u3057\u307e\u3057\u305f\uff01

src/main/resources/locale/locale_ko.properties

@@ -503,11 +503,11 @@ Commands.Party.Header=-----[]&a\uD30C\uD2F0&c[]-----
 Commands.Party.Features.Header=-----[]&a\uD2B9\uC9D5&c[]-----
 Commands.Party.Status=&8\uC774\uB984: &f{0} {1} &8\uB808\uBCA8: &3{2}
 Commands.Party.Status.Alliance=&8\uB3D9\uB9F9: &f{0}
-Commands.Party.UnlockedFeatures=&8\uD574\uC81C\uB41C \uD2B9\uC9D5: &7[[ITALIC]]{0}
+Commands.Party.UnlockedFeatures=&8\uD574\uC81C\uB41C \uD2B9\uC9D5: &7&o{0}
 Commands.Party.ShareMode=&8\uACF5\uC720 \uBAA8\uB4DC:
 Commands.Party.ItemShare=&7\uC544\uC774\uD15C &3({0})
 Commands.Party.ExpShare=&7EXP &3({0})
-Commands.Party.ItemShareCategories=&8\uACF5\uC720\uC911\uC778 \uC544\uC774\uD15C: &7[[ITALIC]]{0}
+Commands.Party.ItemShareCategories=&8\uACF5\uC720\uC911\uC778 \uC544\uC774\uD15C: &7&o{0}
 Commands.Party.MembersNear=&8\uB2F9\uC2E0\uC758 \uADFC\uCC98 &3{0}&8/&3{1}
 Commands.Party.Accept=&a- \uD30C\uD2F0 \uCD08\uB300 \uD5C8\uC6A9
 Commands.Party.Chat.Off=\uD30C\uD2F0 \uCC44\uD305\uC744 &c\uB055\uB2C8\uB2E4
@@ -921,7 +921,7 @@ Smelting.Ability.FluxMining=\uC720\uB3D9 \uCC44\uAD74 \uD655\uB960: &e{0}
 Smelting.Ability.FuelEfficiency=\uC720\uB3D9 \uD6A8\uC728\uC131 \uBC30\uC728: &e{0}x
 Smelting.Ability.Locked.0={0}\uB808\uBCA8 \uB54C \uAE30\uC220\uC774 \uD574\uC81C\uB429\uB2C8\uB2E4 (\uBC14\uB2D0\uB77C XP \uBD80\uC2A4\uD2B8)
 Smelting.Ability.Locked.1={0}\uB808\uBCA8 \uB54C \uAE30\uC220\uC774 \uD574\uC81C\uB429\uB2C8\uB2E4 (\uC720\uB3D9 \uCC44\uAD74)
-Smelting.Ability.SecondSmelt=\uB450\uBC88\uC9F8 \uC7AC\uB828 \uD655\uB960: [[YELLOW]{0}
+Smelting.Ability.SecondSmelt=\uB450\uBC88\uC9F8 \uC7AC\uB828 \uD655\uB960: &e{0}
 Smelting.Ability.VanillaXPBoost=\uBC14\uB2D0\uB77C XP \uBC30\uC728: &e{0}x
 Smelting.SubSkill.FuelEfficiency.Name=\uC720\uB3D9 \uD6A8\uC728\uC131
 Smelting.SubSkill.FuelEfficiency.Description=\uD654\uB85C\uC5D0\uC11C \uC7AC\uB828\uC2DC \uC5F0\uB8CC \uC5F0\uC18C \uC2DC\uAC04 \uC99D\uAC00

src/main/resources/locale/locale_lt_LT.properties

@@ -145,7 +145,7 @@ Acrobatics.SubSkill.Dodge.Name=Dodge
 Acrobatics.SubSkill.Dodge.Description=Reduce attack damage by half
 Acrobatics.SubSkill.Dodge.Stat=Dodge Chance
 Acrobatics.Listener=Acrobatics:
-Acrobatics.Roll.Text=[[ITALIC]]**Rolled**
+Acrobatics.Roll.Text=&o**Rolled**
 Acrobatics.SkillName=ACROBATICS
 #ALCHEMY
 Alchemy.SubSkill.Catalysis.Name=Catalysis
@@ -630,11 +630,11 @@ Commands.Offline=This command does not work for offline players.
 Commands.NotLoaded=Žaidėjo profilis dar nepakrautas!
 Commands.Party.Status=&8NAME: &f{0} {1} &8LEVEL: &3{2}
 Commands.Party.Status.Alliance=&8ALLY: &f{0}
-Commands.Party.UnlockedFeatures=&8Unlocked Features: &7[[ITALIC]]{0}
+Commands.Party.UnlockedFeatures=&8Unlocked Features: &7&o{0}
 Commands.Party.ShareMode=&8SHARE MODE:
 Commands.Party.ItemShare=&7ITEM &3({0})
 Commands.Party.ExpShare=&7EXP &3({0})
-Commands.Party.ItemShareCategories=&8Sharing Items: &7[[ITALIC]]{0}
+Commands.Party.ItemShareCategories=&8Sharing Items: &7&o{0}
 Commands.Party.MembersNear=&8NEAR YOU &3{0}&8/&3{1}
 Commands.Party.Accept=&a- Accept party invite
 Commands.Party.Chat.Off=Party Chat only &cOff

src/main/resources/locale/locale_nl.properties

@@ -132,7 +132,7 @@ 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.Anvil=&4Je hebt een aambeeld geplaatst, met een aambeeld kun je je gereedschappen en pantser mee repareren
 Repair.Listener=Repareer:
 Repair.SkillName=REPAREER
 Repair.Skills.AdeptDiamond=&4Je bent nog niet sterk genoeg om diamant te repareren.
@@ -231,7 +231,7 @@ Woodcutting.Skills.TreeFeller.Off= ** Boom Feller is uitgewerkt **
 Woodcutting.Skills.TreeFeller.On=&a**BOOM FELLER GEACTIVEERD**
 Woodcutting.Skills.TreeFeller.Refresh=&aJe &eBoom Feller &akracht is hersteld!
 Woodcutting.Skills.TreeFeller.Other.Off= Boom Feller &a is uitgewerkt voor [[GEEL]]{0}
-Woodcutting.Skills.TreeFeller.Other.On=&a{0}[[DARK)GREEN]]heeft&cTree Feller&2gebruikt!
+Woodcutting.Skills.TreeFeller.Other.On=&a{0}&2heeft&cTree Feller&2gebruikt!
 Woodcutting.Skills.TreeFeller.Splinter=JOU BIJL SPLINTERT IN DUIZENDEN STUKJES!
 Woodcutting.Skills.TreeFeller.Threshold=Die boom is te groot!
 Woodcutting.Skillup=Houthakken toegenomen met {0}. Totaal ({1})

src/main/resources/locale/locale_pl.properties

@@ -491,7 +491,7 @@ Commands.XPGain.Swords=Atak potworow
 Commands.XPGain.Taming=Oswoj zwierze, lub walcz ze swoimi wilkami.
 Commands.XPGain.Unarmed=Atak potworow
 Commands.XPGain.Woodcutting=\u0052\u0105\u0062\u0061\u006e\u0069\u0065
-Commands.XPGain=[[DARK_GRAY]Zdobyte do\u015bwiadczenie: &f{0}
+Commands.XPGain=&8Zdobyte do\u015bwiadczenie: &f{0}
 Commands.xplock.locked=&6Tw\u00f3j pasek XP\'a jest zablokowany {0}!
 Commands.xplock.unlocked=&6Tw\u00f3j pasek XP\'a jest odblokowany {0}!
 Commands.xprate.modified=Modyfikator zdobywania do\u015bwiadczenia zosta\u0142 zmieniony na {0}

src/main/resources/locale/locale_pt_BR.properties

@@ -558,10 +558,10 @@ Item.ChimaeraWing.Fail=**ASAS DE QUIMERA FALHARAM!**
 Item.ChimaeraWing.Pass=**ASAS DE QUIMERA**
 Item.Injured.Wait=Voce foi ferido recentemente e deve esperar para usar isto. &e({0}s)
 
-Skills.Disarmed=[[DARK_RED]]Voce foi Desarmado!
+Skills.Disarmed=&4Voce foi Desarmado!
-Skills.NeedMore=[[DARK_RED]]Voce precisa de mais
+Skills.NeedMore=&4Voce precisa de mais
-Skills.TooTired=[[RED]]Voce esta cansado pra usar essa habilidade. [[YELLOW]]({0}s)
+Skills.TooTired=&cVoce esta cansado pra usar essa habilidade. &e({0}s)
-Skills.Cancelled=[[RED]]{0} cancelado!
+Skills.Cancelled=&c{0} cancelado!
 
 Stats.Header.Combat=&6-=SKILLS DE COMBATE=-
 Stats.Header.Gathering=&6-=SKILLS DE RECOLHA=-

src/main/resources/locale/locale_sv.properties

@@ -17,7 +17,7 @@ Axes.SubSkill.CriticalStrikes.Description=Dubbel Skada
 Axes.SubSkill.AxeMastery.Description=L\u00e4gger till bonus skada
 Axes.SkillName=YXOR
 Axes.Skills.SS.On=&a**Skallsplittrare AKTIVERAD**
-Axes.Skills.SS.Refresh=&aYour [[YELLOW]Skallsplittrar &af\u00f6rm\u00e5gan \u00e4r vederkvickad!
+Axes.Skills.SS.Refresh=&aYour &eSkallsplittrar &af\u00f6rm\u00e5gan \u00e4r vederkvickad!
 Axes.Skills.SS.Other.On=&a{0}&2 har anv\u00e4nt &cSkallsplittrare!
 Axes.Skillup=Yxf\u00e4rdigheten har \u00f6kat med {0}. Totalt ({1})
 Excavation.Ability.Ready=&a**DU H\u00d6JER DIN SPADE**
@@ -30,7 +30,7 @@ Herbalism.Ability.GTh=&a**GR\u00d6NA FINGRAR**
 Herbalism.Ability.Ready=&a**DU H\u00d6JER DIN SKYFFEL**
 Herbalism.Listener=V\u00e4xtk\u00e4nnedom:
 Herbalism.Skills.GTe.Refresh=&aDina&eGr\u00f6na fingrar  &af\u00f6rm\u00e5ga \u00e4r vederkvickad!
-Herbalism.Skills.GTe.Other.Off=[[RED]Gr\u00f6na fingrar[GREEN]] har avklingat f\u00f6r &e{0}
+Herbalism.Skills.GTe.Other.Off=&cGr\u00f6na fingrar&a har avklingat f\u00f6r &e{0}
 Herbalism.Skills.GTe.Other.On=&a{0}&2 har anv\u00e4nt &cGr\u00f6n Jord!
 Mining.Ability.Length=Superbrytarl\u00e4ngd: &e{0}s
 Mining.Ability.Lower=&7**DU S\u00c4NKER DIN HACKA**
@@ -98,7 +98,7 @@ Woodcutting.Ability.0=L\u00f6vbl\u00e5sare
 Woodcutting.Ability.1=Bl\u00e5s bort l\u00f6v
 Woodcutting.SkillName=TR\u00c4DHUGGNING
 Woodcutting.Skills.TreeFeller.Off=**Tr\u00e4df\u00e4llning har avklingat**
-Woodcutting.Skills.TreeFeller.Refresh=[[GREEN]Din &etr\u00e4df\u00e4llarkraft &ahar vederkvickats!
+Woodcutting.Skills.TreeFeller.Refresh=&aDin &etr\u00e4df\u00e4llarkraft &ahar vederkvickats!
 Woodcutting.Skills.TreeFeller.Other.Off=tr\u00e5df\u00e4llning&a har avklingat f\u00f6r &e{0}
 Woodcutting.Skills.TreeFeller.Other.On=&a{0}&2 har anv\u00e4nt &cTr\u00e4d f\u00e4llare
 Woodcutting.Skills.TreeFeller.Splinter=DIN YXA SPLITTRAS I TUSEN BITAR!

src/main/resources/locale/locale_th_TH.properties

@@ -393,7 +393,7 @@ Commands.Party.Status=&8\u0e0a\u0e37\u0e48\u0e2d: &f{0} {1}
 Commands.Party.ShareMode=&8\u0e42\u0e2b\u0e21\u0e14\u0e41\u0e1a\u0e48\u0e07\u0e1b\u0e31\u0e19:
 Commands.Party.ItemShare=&7\u0e2a\u0e34\u0e48\u0e07\u0e02\u0e2d\u0e07 &3({0})
 Commands.Party.ExpShare=&7EXP &3({0})
-Commands.Party.ItemShareCategories=&8\u0e41\u0e1a\u0e48\u0e07\u0e1b\u0e31\u0e19\u0e2a\u0e34\u0e48\u0e07\u0e02\u0e2d\u0e07: &7[[ITALIC]]{0}
+Commands.Party.ItemShareCategories=&8\u0e41\u0e1a\u0e48\u0e07\u0e1b\u0e31\u0e19\u0e2a\u0e34\u0e48\u0e07\u0e02\u0e2d\u0e07: &7&o{0}
 Commands.Party.MembersNear=&8\u0e17\u0e35\u0e48\u0e2d\u0e22\u0e39\u0e48\u0e43\u0e01\u0e25\u0e49\u0e04\u0e38\u0e13 &3{0}&8/&3{1}
 Commands.Party.Accept=- \u0e22\u0e34\u0e19\u0e22\u0e2d\u0e21\u0e04\u0e33\u0e40\u0e0a\u0e34\u0e0d
 Commands.Party.Chat.Off=Party Chat &c\u0e16\u0e39\u0e01\u0e1b\u0e34\u0e14

src/main/resources/locale/locale_zh_CN.properties

@@ -145,7 +145,7 @@ Acrobatics.SubSkill.Dodge.Name=\u95ea\u907f
 Acrobatics.SubSkill.Dodge.Description=\u51cf\u5c11\u4e00\u534a\u6240\u53d7\u653b\u51fb\u4f24\u5bb3
 Acrobatics.SubSkill.Dodge.Stat=\u95ea\u907f\u6982\u7387
 Acrobatics.Listener=\u6742\u6280(Acrobatics):
-Acrobatics.Roll.Text=[[ITALIC]]**\u95ea\u907f**
+Acrobatics.Roll.Text=&o**\u95ea\u907f**
 Acrobatics.SkillName=\u6742\u6280
 #\u70bc\u91d1
 Alchemy.SubSkill.Catalysis.Name=\u50ac\u5316
@@ -568,7 +568,7 @@ Commands.addlevels.AwardAll.2=\u4f60\u6240\u6709\u7684\u6280\u80fd\u7b49\u7ea7\u
 Commands.addlevels.AwardSkill.1=&a\u4f60\u7684 {0} \u6280\u80fd\u7b49\u7ea7\u88ab\u63d0\u5347\u4e86 {1} \u7ea7!
 Commands.addlevels.AwardSkill.2={0} \u6280\u80fd\u7b49\u7ea7\u5df2\u88ab {1} \u4fee\u6539.
 Commands.addxp.AwardAll=&a\u4f60\u6240\u6709\u7684\u6280\u80fd\u83b7\u5f97 {0} \u7ecf\u9a8c!
-Commands.addxp.AwardSkill=[[GREEN]\u4f60\u7684 {0} \u6280\u80fd\u83b7\u5f97\u4e86 {1} \u7ecf\u9a8c!
+Commands.addxp.AwardSkill=&a\u4f60\u7684 {0} \u6280\u80fd\u83b7\u5f97\u4e86 {1} \u7ecf\u9a8c!
 Commands.Ability.Off=\u80fd\u529b\u4f7f\u7528\u5207\u6362 &c\u5173\u95ed
 Commands.Ability.On=\u80fd\u529b\u4f7f\u7528\u5207\u6362 &a\u5f00\u542f
 Commands.Ability.Toggle=\u80fd\u529b\u4f7f\u7528\u5df2\u5207\u6362\u4e3a &e{0}
@@ -630,11 +630,11 @@ Commands.Offline=\u8fd9\u4e2a\u6307\u4ee4\u5bf9\u79bb\u7ebf\u73a9\u5bb6\u65e0\u6
 Commands.NotLoaded=\u73a9\u5bb6\u8d44\u6599\u5c1a\u672a\u52a0\u8f7d\u3002
 Commands.Party.Status=&8\u540d\u5b57: &f{0} {1} &8\u7b49\u7ea7: &3{2}
 Commands.Party.Status.Alliance=&8\u540c\u76df: &f{0}
-Commands.Party.UnlockedFeatures=&8\u5df2\u89e3\u9501\u529f\u80fd: &7[[ITALIC]]{0}
+Commands.Party.UnlockedFeatures=&8\u5df2\u89e3\u9501\u529f\u80fd: &7&o{0}
 Commands.Party.ShareMode=&8\u5171\u4eab\u6a21\u5f0f:
 Commands.Party.ItemShare=&7\u7269\u54c1 &3({0})
 Commands.Party.ExpShare=&7\u7ecf\u9a8c &3({0})
-Commands.Party.ItemShareCategories=&8\u7269\u54c1\u5206\u914d: &7[[ITALIC]]{0}
+Commands.Party.ItemShareCategories=&8\u7269\u54c1\u5206\u914d: &7&o{0}
 Commands.Party.MembersNear=&8\u4f60\u9644\u8fd1 &3{0}&8/&3{1}
 Commands.Party.Accept=&a- \u63a5\u53d7\u961f\u4f0d\u9080\u8bf7
 Commands.Party.Chat.Off=\u53ea\u5141\u8bb8\u961f\u4f0d\u804a\u5929 &c\u5173\u95ed
@@ -909,7 +909,7 @@ Guides.Mining.Section.0=&3\u5173\u4e8e\u6316\u77ff:\n&e\u6316\u77ff\u5305\u62ec\
 Guides.Mining.Section.1=&3\u517c\u5bb9\u6750\u6599:\n&e\u77f3\u5934,\u7164\u77ff\u77f3,\u94c1\u77ff\u77f3,\u91d1\u77ff\u77f3,\u94bb\u77f3\u77ff\u77f3,\u7ea2\u77f3\u77ff\u77f3,\n&e\u9752\u91d1\u77f3\u77ff\u77f3,\u9ed1\u66dc\u77f3,\u82d4\u77f3,\u672b\u5730\u77f3,\n&e\u8424\u77f3,\u5730\u72f1\u5ca9.
 Guides.Mining.Section.2=&3\u5982\u4f55\u4f7f\u7528\u8d85\u7ea7\u788e\u77f3\u673a:\n&e\u628a\u9550\u5b50\u62ff\u5728\u4f60\u7684\u624b\u4e0a,\u6309\u4e0b\u53f3\u952e\u6765\u51c6\u5907\u4f60\u7684\u9550\u5b50.\n&e\u4f60\u5c06\u67094\u79d2\u949f\u7684\u65f6\u95f4\u6765\u6fc0\u53d1\u4f60\u7684\u6280\u80fd.\n&e\u5f53\u4f60\u6572\u4e0b\u5bf9\u5e94\u7684\u77f3\u5934\u4ee5\u540e,\u8d85\u7ea7\u788e\u77f3\u673a\u5c06\u88ab\u6fc0\u6d3b.
 Guides.Mining.Section.3=&3\u4ec0\u4e48\u662f\u8d85\u7ea7\u788e\u77f3\u673a?\n&e\u8d85\u7ea7\u788e\u77f3\u673a\u662f\u4e00\u4e2a\u4e3b\u52a8\u6280\u80fd\n&e\u5b83\u80fd\u4f7f\u4f60\u5728\u6316\u6389\u5bf9\u5e94\u77ff\u77f3\u7684\u65f6\u5019\u589e\u52a03\u500d\u6389\u843d\u51e0\u7387\n&e\u5e76\u4e14\u5728\u6280\u80fd\u65f6\u95f4\u5185\u77ac\u95f4\u7834\u574f\u77f3\u5934\u548c\u77ff\u77f3
-Guides.Mining.Section.4=[[DARK_AQUA]\u5982\u4f55\u4f7f\u7528\u7206\u7834\u5f00\u91c7:\n&e\u628a\u96f7\u7ba1\u62ff\u5728\u624b\u4e0a,\u9ed8\u8ba4\u7684\u60c5\u51b5\u4e0b\u662f\u6253\u706b\u5668.\n&e\u5728\u4e00\u5b9a\u8ddd\u79bb\u5185\u53f3\u952e\u70b9\u51fbTNT,\u8fd9\u5c06\u4f1a\u4f7f\u5f97TNT\u5728\u77ac\u95f4\u5185\u7206\u70b8.
+Guides.Mining.Section.4=&3\u5982\u4f55\u4f7f\u7528\u7206\u7834\u5f00\u91c7:\n&e\u628a\u96f7\u7ba1\u62ff\u5728\u624b\u4e0a,\u9ed8\u8ba4\u7684\u60c5\u51b5\u4e0b\u662f\u6253\u706b\u5668.\n&e\u5728\u4e00\u5b9a\u8ddd\u79bb\u5185\u53f3\u952e\u70b9\u51fbTNT,\u8fd9\u5c06\u4f1a\u4f7f\u5f97TNT\u5728\u77ac\u95f4\u5185\u7206\u70b8.
 Guides.Mining.Section.5=&3\u4ec0\u4e48\u662f\u7206\u7834\u5f00\u91c7?\n&e\u7206\u7834\u5f00\u91c7\u662f\u4e00\u4e2a\u9700\u8981\u51b7\u5374\u65f6\u95f4\u7684\u6316\u77ff\u6280\u80fd\n&e\u5b83\u80fd\u4f7f\u4f60\u5728\u4f7f\u7528TNT\u70b8\u77ff\u65f6\u83b7\u5f97\u989d\u5916\u5956\u52b1\n&e\u7206\u7834\u5f00\u91c7\u603b\u5171\u67093\u4e2a\u529f\u80fd\n&e\u5927\u53f7\u70b8\u5f39:\u4f7f\u4f60\u7684TNT\u7206\u70b8\u8303\u56f4\u6269\u5927\n&e\u7206\u7834\u4e13\u5bb6:\u964d\u4f4e\u4f60\u53d7\u5230TNT\u7684\u7206\u70b8\u4f24\u5bb3\n&e\u7206\u7834\u5f00\u91c7:\u4f7f\u4f60\u70b9\u71c3\u7684TNT\u70b8\u4e0b\u8303\u56f4\u5185\u4e00\u5b9a\u6570\u91cf\u7684\u77ff\u77f3
 ##\u4fee\u7406
 Guides.Repair.Section.0=&3\u5173\u4e8e\u4fee\u7406:\n&e\u4fee\u7406\u53ef\u4ee5\u8ba9\u4f60\u4f7f\u7528\u94c1\u5757\u6765\u4fee\u7406\u76d4\u7532\u548c\u5de5\u5177.\n\n&3\u7ecf\u9a8c\u6765\u6e90:\n&e\u4f7f\u7528mcmmo\u7684\u94c1\u7827\u4fee\u7406\u5de5\u5177\u6216\u88c5\u5907. \n&emcmmo\u9ed8\u8ba4\u7684\u4fee\u7406\u53f0\u662f\u94c1\u5757\n&e\u4e0d\u8981\u4e0e\u7528\u7ecf\u9a8c\u4fee\u590d\u7684\u94c1\u7827\u6df7\u6dc6.

src/main/resources/locale/locale_zh_TW.properties

@@ -414,14 +414,14 @@ Commands.ModDescription=- \u8acb\u95b1\u8b80\u63d2\u4ef6\u63cf\u8ff0
 Commands.NoConsole=\u9019\u500b\u6307\u4ee4\u4e0d\u53ef\u4f7f\u7528
 Commands.Notifications.Off=\u5207\u63db\u80fd\u529b\u901a\u77e5\u70ba &c\u95dc\u9589
 Commands.Notifications.On=\u5207\u63db\u80fd\u529b\u901a\u77e5\u70ba  &a\u958b\u555f
-Commands.Offline=[RED]]\u9019\u500b\u6307\u4ee4\u4e26\u4e0d\u9069\u7528\u65bc\u96e2\u7dda\u73a9\u5bb6.
+Commands.Offline=&c\u9019\u500b\u6307\u4ee4\u4e26\u4e0d\u9069\u7528\u65bc\u96e2\u7dda\u73a9\u5bb6.
 Commands.Other=&a--\u5176\u4ed6\u6307\u4ee4--
 Commands.Party.Header=-----[]&a\u968a\u4f0d&c[]-----
 Commands.Party.Status=&8\u540d\u5b57: &f{0} {1}
 Commands.Party.ShareMode=&8\u5206\u4eab\u6a21\u5f0f:
 Commands.Party.ItemShare=&7\u7269\u54c1 &3({0})
 Commands.Party.ExpShare=&7\u7d93\u9a57\u503c &3({0})
-Commands.Party.ItemShareCategories=&8\u5171\u4eab\u7269\u54c1: &7[[ITALIC]]{0}
+Commands.Party.ItemShareCategories=&8\u5171\u4eab\u7269\u54c1: &7&o{0}
 Commands.Party.MembersNear=&8\u63a5\u8fd1\u4f60 &3{0}&8/&3{1}
 Commands.Party.Accept=- \u63a5\u53d7\u968a\u4f0d\u9080\u8acb
 Commands.Party.Chat.Off=\u968a\u4f0d\u804a\u5929\u6a21\u5f0f&c\u53d6\u6d88
@@ -438,7 +438,7 @@ Commands.Party.ToggleShareCategory=&7\u968a\u4f0d\u5171\u4eab\u7684\u7269\u54c1&
 Commands.Party.AlreadyExists=&4\u5c0d\u4f0d{0} \u5df2\u5b58\u5728!
 Commands.Party.Kick=\u4f60\u5df2\u88ab {0} \u8e22\u51fa\u968a\u4f0d!
 Commands.Party.Leave=\u4f60\u96e2\u958b\u4e86\u9019\u652f\u968a\u4f0d
-Commands.Party.Members.Header=[RED]] ----- [] [GREEN]\u6210\u54e1[RED] [] -----
+Commands.Party.Members.Header=&c ----- [] &a\u6210\u54e1&c [] -----
 Commands.Party.None=\u4f60\u4e0d\u5728\u968a\u4f0d\u4e2d.
 Commands.Party.Quit=- \u96e2\u958b\u4f60\u73fe\u5728\u7684\u968a\u4f0d
 Commands.Party.Teleport=<player> &c- \u50b3\u9001\u5230\u968a\u4f0d\u6210\u54e1\u65c1
@@ -585,9 +585,9 @@ Guides.Header=&6-=&a{0} \u6307\u5357&6=-
 Guides.Page.Invalid=\u4e0d\u5b58\u5728\u7684\u9801\u6578
 Guides.Page.OutOfRange=\u9019\u9801\u78bc\u4e0d\u5b58\u5728,\u7e3d\u5171\u53ea\u6709{0} \u9801.
 Guides.Usage=\u8acb\u8f38\u5165 /{0}
-Guides.Acrobatics.Section.0=[DARK_AQUA]]\u95dc\u65bc\u96dc\u6280:\n&e\u96dc\u6280\u53ef\u4ee5\u8b93\u4f60\u5728MMO\u88e1\u73a9\u5f97\u5f88\u512a\u96c5.\n&e\u5b83\u53ef\u4ee5\u8b93\u4f60\u5728\u6230\u9b25\u4e2d\u53ca\u74b0\u5883\u4e2d\u53d6\u5f97\u512a\u52e2.\n\n&3\u7d93\u9a57\u5982\u4f55\u7372\u53d6:\n&e\u5728\u6230\u9b25\u4e2d\u9583\u8eb2\u653b\u64ca\u6216\u5f9e\u9ad8\u8655\u589c\u843d\u5c07\n&e\u53ef\u7372\u5f97\u7d93\u9a57.
+Guides.Acrobatics.Section.0=&3\u95dc\u65bc\u96dc\u6280:\n&e\u96dc\u6280\u53ef\u4ee5\u8b93\u4f60\u5728MMO\u88e1\u73a9\u5f97\u5f88\u512a\u96c5.\n&e\u5b83\u53ef\u4ee5\u8b93\u4f60\u5728\u6230\u9b25\u4e2d\u53ca\u74b0\u5883\u4e2d\u53d6\u5f97\u512a\u52e2.\n\n&3\u7d93\u9a57\u5982\u4f55\u7372\u53d6:\n&e\u5728\u6230\u9b25\u4e2d\u9583\u8eb2\u653b\u64ca\u6216\u5f9e\u9ad8\u8655\u589c\u843d\u5c07\n&e\u53ef\u7372\u5f97\u7d93\u9a57.
 Guides.Acrobatics.Section.1=&3\u4ec0\u9ebc\u662f\u7ffb\u6efe?\n&e\u4f60\u6709\u4e00\u5b9a\u7684\u6a5f\u7387\u53ef\u4ee5\u6e1b\u514d\u5f9e\u9ad8\u8655\u589c\u843d\n&e\u7684\u50b7\u5bb3. \u4f60\u53ef\u4ee5\u6309\u4f4f\u6f5b\u884c\u9375(\u9810\u8a2dshift)\n&e\u4f86\u5f97\u5230\u96d9\u500d\u7684\u7ffb\u6efe\u6a5f\u7387.\n&e\u9019\u5c07\u89f8\u767c\u5b8c\u7f8e\u8457\u9678\u800c\u4e0d\u53ea\u662f\u55ae\u7d14\u7684\u7ffb\u6efe.\n&e\u5b8c\u7f8e\u8457\u9678\u6548\u679c\u8207\u7ffb\u6efe\u985e\u4f3c,\u4f46\u6709\u5169\u500d\n&e\u7684\u89f8\u767c\u6a5f\u7387\u4e14\u53ef\u6e1b\u514d\u66f4\u591a\u50b7\u5bb3.\n&e\u7ffb\u6efe\u6a5f\u7387\u95dc\u4fc2\u5230\u4f60\u7684\u96dc\u6280\u7b49\u7d1a.
-Guides.Acrobatics.Section.2=&3\u4ec0\u9ebc\u662f\u8ff4\u907f?\n[YELLOW]]\u8ff4\u907f\u662f\u6709\u6a5f\u7387\u6e1b \u514d\u5728\u6230\u9b25\u4e2d\n&e\u6575\u4eba\u5c0d\u4f60\u7684\u50b7\u5bb3.\n&e\u9019\u6a5f\u7387\u95dc\u4fc2\u5230\u4f60\u7684\u96dc\u6280\u7b49\u7d1a.
+Guides.Acrobatics.Section.2=&3\u4ec0\u9ebc\u662f\u8ff4\u907f?\n&e\u8ff4\u907f\u662f\u6709\u6a5f\u7387\u6e1b \u514d\u5728\u6230\u9b25\u4e2d\n&e\u6575\u4eba\u5c0d\u4f60\u7684\u50b7\u5bb3.\n&e\u9019\u6a5f\u7387\u95dc\u4fc2\u5230\u4f60\u7684\u96dc\u6280\u7b49\u7d1a.
 Guides.Archery.Section.0=&3\u7bad\u8853:\n&e\u7bad\u8853\u662f\u7528\u5f13\u5c04\u7bad\u7684\u6280\u80fd.\n&e\u7bad\u8853\u6709\u5404\u7a2e\u52a0\u4e58\u6548\u679c,\u5982\u52a0\u4e58\u653b\u64ca\n&e\u6688\u7729\u5c0d\u624b\u7b49\u6548\u679c.\n&e\u6b64\u5916\u4f60\u4e5f\u6709\u6a5f\u7387\u56de\u6536\u5df2\u7d93\u5c04\u4e2d\u6575\u4eba\u7684\u7bad\n&e \u4ee5\u4e0a\u6a5f\u7387\u95dc\u4fc2\u5230\u7b49\u7d1a.\n\n&3\u7372\u53d6\u7d93\u9a57:\n&e\u8981\u7372\u5f97\u7d93\u9a57\u5fc5\u9808\u7528\u5f13\u5c04\u4e2d\u602a\u7269\u6216\u73a9\u5bb6.
 Guides.Archery.Section.1=&3\u4ec0\u9ebc\u662f\u6280\u8853\u5c04\u64ca?\n&e\u6280\u8853\u5c04\u64ca\u5c07\u52a0\u4e58\u4f60\u7684\u5c04\u7bad\u57fa\u672c\u653b\u64ca\u529b.\n&e\u52a0\u4e58\u7684\u7a0b\u5ea6\u95dc\u4fc2\u5230\u4f60\u7684\u7bad\u8853\u7b49\u7d1a.\n&e\u9810\u8a2d\u72c0\u614b\u4e0b, \u6bcf\u534750\u7d1a\u52a0\u4e5810%\u653b\u64ca\u529b, \n&e\u6700\u9ad8\u5230200%\u52a0\u4e58.
 Guides.Archery.Section.2=&3\u4ec0\u9ebc\u662f\u6688\u7729\u6548\u679c?\n&e\u7576\u4f60\u64ca\u4e2d\u76ee\u6a19\u6642\u6709\u88ab\u52d5\u6a5f\u7387\u4f7f\u76ee\u6a19\u6688\u7729.\n&e\u6688\u7dda\u89f8\u767c\u6642\u5c07\u5f37\u5236\u4f60\u7684\u76ee\u6a19\u5446\u6eef\u4e00\u5c0f\u6bb5\u6642\u9593.\n&e\u6688\u7729\u6548\u679c\u6709\u52a0\u4e584\u9ede\u50b7\u5bb3(2\u5fc3).
@@ -619,7 +619,7 @@ Guides.Herbalism.Section.4=\u4ec0\u9ebc\u662f\u7da0\u624b\u6307(\u5375\u77f3/\u7
 Guides.Herbalism.Section.5=&3\u4ec0\u9ebc\u662f\u8fb2\u592b\u79c1\u623f\u83dc?\n&e\u9019\u662f\u4e00\u500b\u88ab\u52d5\u6280\u80fd, \u53ef\u589e\u52a0\u4e0b\u5217\u98df\u7269\u7684\u98fd\u98df\u5ea6\u56de\u5fa9 -\n&e\u9eb5\u5305, \u9905\u4e7e, \u897f\u74dc, \u8611\u83c7\u6e6f, \u80e1\u863f\u8514, \u99ac\u9234\u85af.
 Guides.Herbalism.Section.6=&3\u4ec0\u9ebc\u662f\u6d77\u502b\u7684\u795d\u798f?\n&e\u9019\u662f\u4e00\u500b\u4e3b\u52d5\u6280\u80fd,\u6709\u6a5f\u7387\u5728\u7528\u528d\u7834\u58de\u7279\u5b9a\n&e\u65b9\u584a\u6642\u7372\u5f97\u7a00\u6709\u9053\u5177.
 Guides.Herbalism.Section.7=&3\u4ec0\u9ebc\u662f\u96d9\u500d\u6389\u843d?\n&e\u9019\u662f\u4e00\u500b\u88ab\u52d5\u6280\u80fd\u4f7f\u73a9\u5bb6\u80fd\u52a0\u500d\u6536\u7372.
-Guides.Mining.Section.0=&3\u95dc\u65bc\u6316\u7926:\n&e\u6316\u7926\u7531\u63a1\u77f3\u8207\u63a1\u7926\u6240\u7d44\u6210. \u5b83\u63d0\u4f9b\u6316\u7926\u6642\n[[YELLOW]\u7684\u984d\u5916\u7926\u7269\u6389\u843d\u91cf.\n\n&3\u5982\u4f55\u7372\u53d6\u7d93\u9a57:\n&e\u8981\u589e\u9032\u6316\u7926\u6280\u80fd,\u4f60\u5fc5\u9808\u7528\u93ac\u5b50\u6316\u7926.\n&e\u53ea\u6709\u6316\u6398\u6307\u5b9a\u7926\u7269\u80fd\u589e\u52a0\u7d93\u9a57.
+Guides.Mining.Section.0=&3\u95dc\u65bc\u6316\u7926:\n&e\u6316\u7926\u7531\u63a1\u77f3\u8207\u63a1\u7926\u6240\u7d44\u6210. \u5b83\u63d0\u4f9b\u6316\u7926\u6642\n&e\u7684\u984d\u5916\u7926\u7269\u6389\u843d\u91cf.\n\n&3\u5982\u4f55\u7372\u53d6\u7d93\u9a57:\n&e\u8981\u589e\u9032\u6316\u7926\u6280\u80fd,\u4f60\u5fc5\u9808\u7528\u93ac\u5b50\u6316\u7926.\n&e\u53ea\u6709\u6316\u6398\u6307\u5b9a\u7926\u7269\u80fd\u589e\u52a0\u7d93\u9a57.
 Guides.Mining.Section.1=&3\u76f8\u5bb9\u7684\u7926\u7269:\n&e\u77f3\u982d, \u70ad\u7926\u8108, \u9435\u7926\u8108, \u91d1\u7926\u8108, \u947d\u77f3\u7926\u8108, \u7d05\u77f3\u7926\u8108,\n&e\u9752\u91d1\u77f3\u7926\u8108, \u9ed1\u66dc\u77f3, \u9752\u82d4\u77f3, \u7d42\u754c\u77f3,\n&e\u87a2\u5149\u77f3, \u9084\u6709\u5730\u7344\u77f3.
 Guides.Mining.Section.2=&3\u5982\u4f55\u4f7f\u7528\u8d85\u7d1a\u788e\u77f3\u6a5f:\n&e\u624b\u62ff\u8457\u93ac\u5b50\u9ede\u6ed1\u9f20\u53f3\u9375\u4ee5\u6e96\u5099\u597d\u958b\u555f\u6280\u80fd.\n&e\u4e00\u65e6\u958b\u555f\u6280\u80fd\u5c07\u6709\u6578\u79d2\u7684\u6642\u9593\u53ef\u4ee5\u8b93\u4f60\n&e\u5feb\u901f\u7834\u58de\u6307\u5b9a\u7926\u7269,\u53ea\u6709\u76f8\u5bb9\u7684\u7926\u7269\u53ef\u4ee5\n&e\u89f8\u767c\u6280\u80fd.
 Guides.Mining.Section.3=&3\u4ec0\u9ebc\u662f\u8d85\u7d1a\u788e\u77f3\u6a5f?\n&e\u8d85\u7d1a\u788e\u77f3\u6a5f\u662f\u4e00\u500b\u9700\u8981\u51b7\u537b\u6642\u9593\u7684\u6316\u7926\u6280\u80fd.\n&e\u5b83\u80fd\u4f7f\u4f60\u5728\u6316\u6389\u5c0d\u61c9\u7926\u77f3\u7684\u6642\u5019\u589e\u52a03\u500d\u6389\u843d\u6a5f\u7387.\n&e\u4e26\u4e14\u5728\u6280\u80fd\u6642\u9593\u5167\u77ac\u9593\u7834\u58de\u77f3\u982d\u548c\u7926\u77f3.

src/main/resources/plugin.yml

@@ -188,6 +188,25 @@ commands:
         description: Reloads locale
         permission: mcmmo.commands.reloadlocale
 permissions:
+    #mcmmo.defaults is the intended default permission, give this to your players for the intended experience
+    mcmmo.defaults:
+        default: true
+        description: mcmmo permisions that default to true
+        children:
+            mcmmo.chat.partychat: true
+            mcmmo.commands.defaults: true
+            mcmmo.motd: true
+            mcmmo.skills.all: true
+            mcmmo.chat.colors: true
+            mcmmo.broadcast.levelup: true
+    mcmmo.defaultsop:
+        default: op
+        description: mcmmo permissions that default to op
+        children:
+            mcmmo.chat.adminchat: true
+            mcmmo.commands.defaultsop: true
+            mcmmo.item.all: true
+            mcmmo.tools.all: true
     mcmmo.*:
         default: false
         description: Implies all mcmmo permissions.
@@ -204,6 +223,8 @@ permissions:
             mcmmo.defaultsop: true
             mcmmo.party.all: true
             mcmmo.perks.all: true
+    mcmmo.broadcast.levelup:
+        description: when the player reaches certain level milestones their achievement will be broadcast in chat to other plays
     mcmmo.ability.*:
         default: false
         description: Implies all mcmmo.ability permissions.
@@ -1313,23 +1334,6 @@ permissions:
         description: Allows access to the xprate reset command
     mcmmo.commands.xprate.set:
         description: Allows access to the xprate command to control xp events
-    mcmmo.defaults:
-        default: true
-        description: mcmmo permisions that default to true
-        children:
-            mcmmo.chat.partychat: true
-            mcmmo.commands.defaults: true
-            mcmmo.motd: true 
-            mcmmo.skills.all: true
-            mcmmo.chat.colors: true
-    mcmmo.defaultsop:
-        default: op
-        description: mcmmo permissions that default to op
-        children:
-            mcmmo.chat.adminchat: true
-            mcmmo.commands.defaultsop: true
-            mcmmo.item.all: true
-            mcmmo.tools.all: true
     mcmmo.item.*:
         default: true
         description: Implies all mcmmo.item permissions