Updating other locale files.

Fixing Mining
Mining guide done.
2026-02-20 10:43:12 +01:00 · 2012-03-03 23:45:39 -08:00 · 2012-03-03 23:44:40 -08:00 · 2012-03-04 02:41:14 -05:00 · 2012-03-03 21:42:28 -08:00 · 2012-03-03 21:36:58 -08:00
42 changed files with 750 additions and 457 deletions
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -7,6 +7,21 @@ Key:
  ! Change
  - Removal

+Version 1.3.02
+ + Added in game guides for Mining, Excavation, and Acrobatics. Simply type /skillname ? to access them
+ ! Changed Tree Feller to hand out 1/4 of normal XP for each JUNGLE LOG block it fells
+ ! Changed Tree Feller to only fell trees if you have enough durability
+ ! Changed Tree Feller to cause injury if your axe splinters from a failed Tree Feller attempt
+ ! Changed invincibility checks in EntityDamage listeners to accommodate for vanilla MC behaviour
+ ! Changed Ignition to add fire ticks rather than replacing them.
+ ! Changed Axes critical to have a max critical rate of 37.5% down from 75%
+ = Fixed bug where Taming defensive checks got called twice
+ = Fixed Shake not working correctly
+ = Fixed bug with Axes command displaying wrong Greater Impact bonus damage
+ = Fixed bug where Impact didn't apply bonus damage
+ = Fixed Impact proccing multiple times in a row
+ = Fixed bug where PVE skills didn't level
+
 Version 1.3.01
 = Fixed bug where Tree Feller had no cooldown
 = Fixed bug with activating Skull Splitter after using Tree Feller
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.gmail.nossr50.mcMMO</groupId>
    <artifactId>mcMMO</artifactId>
-    <version>1.3.01</version>
+    <version>1.3.02</version>
    <name>mcMMO</name>
    <url>https://github.com/mcMMO-Dev/mcMMO</url>
    <issueManagement>
@@ -117,7 +117,7 @@
        <dependency>
            <groupId>org.bukkit</groupId>
            <artifactId>bukkit</artifactId>
-            <version>1.1-R6-SNAPSHOT</version>
+            <version>LATEST</version>
            <type>jar</type>
            <scope>compile</scope>
        </dependency>
--- a/src/main/java/com/gmail/nossr50/Combat.java
+++ b/src/main/java/com/gmail/nossr50/Combat.java
@@ -27,6 +27,7 @@ import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.events.FakeEntityDamageByEntityEvent;
+import com.gmail.nossr50.events.FakeEntityDamageEvent;
 import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.party.Party;
 import com.gmail.nossr50.skills.Acrobatics;
@@ -41,7 +42,7 @@ public class Combat
 {
 	public static void combatChecks(EntityDamageByEntityEvent event, mcMMO pluginx)
 	{
-		if(event.isCancelled() || event.getDamage() == 0 || event.getEntity().isDead())
+		if(event.getDamage() == 0 || event.getEntity().isDead())
 			return;
 		
 		//Declare Things
@@ -67,7 +68,7 @@ public class Combat
 				if(!pluginx.misc.bleedTracker.contains(target)) //Bleed
 					Swords.bleedCheck(attacker, target, pluginx);
 					
-				if (!(event instanceof FakeEntityDamageByEntityEvent) && PPa.getSerratedStrikesMode())
+				if (PPa.getSerratedStrikesMode())
 					Swords.applySerratedStrikes(attacker, event, pluginx);
 					
 				if(target instanceof Player)
@@ -82,10 +83,9 @@ public class Combat
 				Axes.axeCriticalCheck(attacker, event, pluginx); //Critical hit
 				
 				//Impact
-				if(event.getEntity() instanceof LivingEntity)
-				    Axes.impact(attacker, (LivingEntity)event.getEntity());
-				
-				if (!(event instanceof FakeEntityDamageByEntityEvent) && PPa.getSkullSplitterMode())
+				Axes.impact(attacker, target, event);
+					
+				if (PPa.getSkullSplitterMode())
 					Axes.applyAoeDamage(attacker, event, pluginx);
 				
 				if(target instanceof Player)
@@ -134,12 +134,9 @@ public class Combat
 		{
 			Wolf wolf = (Wolf) damager;
 			
-			if (wolf.isTamed() && Taming.ownerOnline(wolf, pluginx))
+			if (wolf.isTamed() && (wolf.getOwner() instanceof Player))
 			{
-				Player master = Taming.getOwner(wolf, pluginx);
-				if (master == null) //Can it really happen?
-					return;
-				
+				Player master = (Player) wolf.getOwner();
 				PlayerProfile PPo = Users.getProfile(master);
 				if(mcPermissions.getInstance().taming(master))
 				{
@@ -174,12 +171,12 @@ public class Combat
 		/*			 
 		 * DEFENSIVE CHECKS FOR WOLVES
 		 */
-		else if(target instanceof Wolf)
-		{
-			Wolf wolf = (Wolf) target;
-			if(wolf.isTamed() && Taming.ownerOnline(wolf, pluginx))
-				Taming.preventDamage(event, pluginx);
-		}
+		//else if(target instanceof Wolf)
+		//{
+		//	Wolf wolf = (Wolf) target;
+		//	if(wolf.isTamed() && (wolf.getOwner() instanceof Player))
+		//		Taming.preventDamage(event, pluginx);
+		//}
 	}
 	
 	public static void combatAbilityChecks(Player attacker, PlayerProfile PPa)
@@ -300,7 +297,7 @@ public class Combat
 	 */
 	public static void dealDamage(LivingEntity target, int dmg, DamageCause cause) {
 		if(LoadProperties.eventCallback) {
-			EntityDamageEvent ede = new EntityDamageEvent(target, cause, dmg);
+			EntityDamageEvent ede = (EntityDamageEvent) new FakeEntityDamageEvent(target, cause, dmg);
 			Bukkit.getPluginManager().callEvent(ede);
 			if(ede.isCancelled()) return;
 			
@@ -362,6 +359,7 @@ public class Combat
 	{
   		int xp = getXp(target, damage);
 		PPa.addXP(skillType, xp*10, attacker);
+		Skills.XpCheckSkill(skillType, attacker);
 	}
 	
 	public static int getXp(Entity entity, int damage)
--- a/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PtpCommand.java
@@ -54,4 +54,4 @@ public class PtpCommand implements CommandExecutor {

 		return true;
 	}
-}
+}
--- a/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java
@@ -10,11 +10,13 @@ import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Page;

 public class AcrobaticsCommand implements CommandExecutor {
 	@Override
 	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-		if (!(sender instanceof Player)) {
+		if (!(sender instanceof Player))
+		{
 			sender.sendMessage("This command does not support console useage.");
 			return true;
 		}
@@ -46,7 +48,9 @@ public class AcrobaticsCommand implements CommandExecutor {
 		player.sendMessage(mcLocale.getString("m.AcrobaticsRollChance", new Object[] { percentage }));
 		player.sendMessage(mcLocale.getString("m.AcrobaticsGracefulRollChance", new Object[] { gracepercentage }));
 		player.sendMessage(mcLocale.getString("m.AcrobaticsDodgeChance", new Object[] { dodgepercentage }));
-
+		
+		Page.grabGuidePageForSkill(SkillType.ACROBATICS, player, args);
+		
 		return true;
 	}
 }
--- a/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java
@@ -10,6 +10,7 @@ import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Page;

 public class ArcheryCommand implements CommandExecutor {
 	@Override
@@ -57,6 +58,8 @@ public class ArcheryCommand implements CommandExecutor {
 		player.sendMessage(mcLocale.getString("m.ArcheryDazeChance", new Object[] { percentagedaze }));
 		player.sendMessage(mcLocale.getString("m.ArcheryRetrieveChance", new Object[] { percentage }));
 		player.sendMessage(mcLocale.getString("m.ArcheryIgnitionLength", new Object[] { (ignition / 20) }));
+		
+		Page.grabGuidePageForSkill(SkillType.AXES, player, args);

 		return true;
 	}
--- a/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java
@@ -26,9 +26,9 @@ public class AxesCommand implements CommandExecutor {

 		float skillvalue = (float) PP.getSkillLevel(SkillType.AXES);
 		if (PP.getSkillLevel(SkillType.AXES) < 750)
-			percentage = String.valueOf((skillvalue / 1000) * 100);
+			percentage = String.valueOf((skillvalue / 2000) * 100);
 		else
-			percentage = "75";
+			percentage = "37.5";
 		
 		int bonusDmg = Users.getProfile(player).getSkillLevel(SkillType.AXES)/50;
 		if(bonusDmg > 4)
@@ -60,7 +60,7 @@ public class AxesCommand implements CommandExecutor {
 		
 		player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusAxes1_0"), mcLocale.getString("m.AbilBonusAxes1_1", new Object[] {bonusDmg}) }));
        player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusAxes2_0"), mcLocale.getString("m.AbilBonusAxes2_1", new Object[] {durDmg}) }));
-        player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusAxes3_0"), mcLocale.getString("m.AbilBonusAxes3_1", new Object[] {1}) }));
+        player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusAxes3_0"), mcLocale.getString("m.AbilBonusAxes3_1", new Object[] {2}) }));
        player.sendMessage(mcLocale.getString("m.AxesSkullLength", new Object[] { ticks }));

 		return true;
--- a/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java
@@ -10,6 +10,7 @@ import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Page;

 public class ExcavationCommand implements CommandExecutor {
 	@Override
@@ -29,6 +30,7 @@ public class ExcavationCommand implements CommandExecutor {
 			ticks++;
 		}

+		player.sendMessage("");
 		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.SkillExcavation") }));
 		player.sendMessage(mcLocale.getString("m.XPGain", new Object[] { mcLocale.getString("m.XPGainExcavation") }));

@@ -39,8 +41,10 @@ public class ExcavationCommand implements CommandExecutor {
 		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsExcavation1_0"), mcLocale.getString("m.EffectsExcavation1_1") }));
 		player.sendMessage(mcLocale.getString("m.EffectsTemplate", new Object[] { mcLocale.getString("m.EffectsExcavation2_0"), mcLocale.getString("m.EffectsExcavation2_1") }));
 		player.sendMessage(mcLocale.getString("m.SkillHeader", new Object[] { mcLocale.getString("m.YourStats") }));
-		player.sendMessage(mcLocale.getString("m.ExcavationGreenTerraLength", new Object[] { ticks }));
+		player.sendMessage(mcLocale.getString("m.ExcavationGigaDrillBreakerLength", new Object[] { ticks }));

+		Page.grabGuidePageForSkill(SkillType.EXCAVATION, player, args);
+		
 		return true;
 	}
 }
--- a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
@@ -11,6 +11,7 @@ import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.skills.Fishing;
+import com.gmail.nossr50.util.Page;

 public class FishingCommand implements CommandExecutor {
 	@Override
@@ -41,6 +42,8 @@ public class FishingCommand implements CommandExecutor {
 			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockFishing1") }));
 		else
 			player.sendMessage(mcLocale.getString("m.ShakeInfo", new Object[] { Fishing.getFishingLootTier(PP) }));
+		
+		Page.grabGuidePageForSkill(SkillType.FISHING, player, args);

 		return true;
 	}
--- a/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java
@@ -10,6 +10,7 @@ import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Page;

 public class HerbalismCommand implements CommandExecutor {
 	@Override
@@ -63,6 +64,8 @@ public class HerbalismCommand implements CommandExecutor {
 		player.sendMessage(mcLocale.getString("m.HerbalismGreenThumbStage", new Object[] { bonus }));
 		player.sendMessage(mcLocale.getString("m.HerbalismFoodPlus", new Object[] { bonus } ));
 		player.sendMessage(mcLocale.getString("m.HerbalismDoubleDropChance", new Object[] { percentage }));
+		
+		Page.grabGuidePageForSkill(SkillType.HERBALISM, player, args);

 		return true;
 	}
--- a/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java
@@ -10,6 +10,7 @@ import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Page;

 public class MiningCommand implements CommandExecutor {
 	@Override
@@ -123,7 +124,9 @@ public class MiningCommand implements CommandExecutor {
 			player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockMining3") }));
 		else
 			player.sendMessage(mcLocale.getString("m.MiningDemolitionsExpertDamageDecrease", new Object[] { damage }));
-
+		
+		Page.grabGuidePageForSkill(SkillType.MINING, player, args);
+		
 		return true;
 	}
 }
--- a/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java
@@ -12,6 +12,7 @@ import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.skills.Repair;
+import com.gmail.nossr50.util.Page;

 public class RepairCommand implements CommandExecutor {
 	@Override
@@ -45,7 +46,9 @@ public class RepairCommand implements CommandExecutor {
 		player.sendMessage(mcLocale.getString("m.ArcaneForgingRank", new Object[] { Repair.getArcaneForgingRank(PP.getSkillLevel(SkillType.REPAIR)) }));
 		player.sendMessage(mcLocale.getString("m.ArcaneEnchantKeepChance", new Object[] { Repair.getEnchantChance(Repair.getArcaneForgingRank(PP.getSkillLevel(SkillType.REPAIR))) }));
 		player.sendMessage(mcLocale.getString("m.ArcaneEnchantDowngradeChance", new Object[] { Repair.getDowngradeChance(Repair.getArcaneForgingRank(PP.getSkillLevel(SkillType.REPAIR))) }));
-
+		
+		Page.grabGuidePageForSkill(SkillType.REPAIR, player, args);
+		
 		return true;
 	}
 }
--- a/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java
@@ -10,6 +10,7 @@ import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Page;

 public class SwordsCommand implements CommandExecutor {
 	@Override
@@ -63,6 +64,8 @@ public class SwordsCommand implements CommandExecutor {
 		player.sendMessage(mcLocale.getString("m.SwordsTickNote"));
 		player.sendMessage(mcLocale.getString("m.SwordsBleedChance", new Object[] { percentage }));
 		player.sendMessage(mcLocale.getString("m.SwordsSSLength", new Object[] { ticks }));
+		
+		Page.grabGuidePageForSkill(SkillType.SWORDS, player, args);

 		return true;
 	}
--- a/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java
@@ -11,6 +11,7 @@ import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Page;

 public class TamingCommand implements CommandExecutor {
 	@Override
@@ -69,6 +70,8 @@ public class TamingCommand implements CommandExecutor {
 	          player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusTaming5_0"), mcLocale.getString("m.AbilBonusTaming5_1") }));
 		
 		player.sendMessage(mcLocale.getString("m.TamingGoreChance", new Object[] { percentage }));
+		
+		Page.grabGuidePageForSkill(SkillType.TAMING, player, args);

 		return true;
 	}
--- a/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java
@@ -10,6 +10,7 @@ import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Page;

 public class UnarmedCommand implements CommandExecutor {
 	@Override
@@ -66,6 +67,8 @@ public class UnarmedCommand implements CommandExecutor {
 		player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusUnarmed2_0"), mcLocale.getString("m.AbilBonusUnarmed2_1", new Object[] {bonus}) }));

 		player.sendMessage(mcLocale.getString("m.UnarmedBerserkLength", new Object[] { ticks }));
+		
+		Page.grabGuidePageForSkill(SkillType.UNARMED, player, args);

 		return true;
 	}
--- a/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java
@@ -10,6 +10,7 @@ import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.locale.mcLocale;
+import com.gmail.nossr50.util.Page;

 public class WoodcuttingCommand implements CommandExecutor {
 	@Override
@@ -51,6 +52,8 @@ public class WoodcuttingCommand implements CommandExecutor {
 		player.sendMessage(mcLocale.getString("m.WoodCuttingDoubleDropChance", new Object[] { percentage }));
 		player.sendMessage(mcLocale.getString("m.WoodCuttingTreeFellerLength", new Object[] { ticks }));
 		
+		Page.grabGuidePageForSkill(SkillType.WOODCUTTING, player, args);
+		
 		return true;
 	}
 }
--- a/src/main/java/com/gmail/nossr50/config/LoadProperties.java
+++ b/src/main/java/com/gmail/nossr50/config/LoadProperties.java
@@ -42,7 +42,8 @@ public class LoadProperties {
 			MySQLserverName, MySQLdbName, MySQLdbPass, nWood, nStone, 
 			nIron, nGold, nDiamond, locale, nString, nLeather;

-	public static int treeFellerThreshold, mjungle, mtameWolf, mfishing, xpbar_x, xpbar_y, xpicon_x, xpicon_y,
+	public static int treeFellerThreshold, mjungle, mtameWolf, mtameOcelot,
+			mfishing, xpbar_x, xpbar_y, xpicon_x, xpicon_y,
 			chimaeraId, msandstone, mbase, moak, mbirch, mspruce, mmelon,
 			mcactus, mmushroom, mflower, msugar, mpumpkin, mwheat, mgold,
 			mdiamond, miron, mredstone, mlapis, mobsidian, mnetherrack,
@@ -242,6 +243,7 @@ public class LoadProperties {
 		mmossstone = readInteger("Experience.Mining.Moss_Stone", 30);
 		
 		mtameWolf = readInteger("Experience.Taming.Animal_Taming.Wolf", 250);
+		mtameOcelot = readInteger("Experience.Taming.Animal_Taming.Wolf", 500);

 		mfishing = readInteger("Experience.Fishing.Base", 800);

--- a/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java
@@ -1047,10 +1047,7 @@ public class PlayerProfile
 					bonusModifier = 2;
 				
 				double trueBonus = bonusModifier * xp;
-				//double oldxp = xp;
 				xp+=trueBonus;
-				//double percent = (trueBonus/oldxp)*100;
-				//thisplayer.sendMessage(ChatColor.GREEN+"XP: "+oldxp+" Bonus XP: "+trueBonus+" Total: "+xp+ChatColor.GOLD+" [Master: "+leaderName+" " +" +"+(int)percent+"%]");
 			}
 			Bukkit.getPluginManager().callEvent(new McMMOPlayerXpGainEvent(Bukkit.getPlayer(playerName), skillType, xp));
 			skillsXp.put(skillType, skillsXp.get(skillType)+xp);
--- a/src/main/java/com/gmail/nossr50/events/FakeEntityDamageEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/FakeEntityDamageEvent.java
@@ -0,0 +1,10 @@
+package com.gmail.nossr50.events;
+
+import org.bukkit.entity.Entity;
+import org.bukkit.event.entity.EntityDamageEvent;
+
+public class FakeEntityDamageEvent extends EntityDamageEvent{
+    public FakeEntityDamageEvent(Entity damagee, DamageCause cause, int damage) {
+        super(damagee, cause, damage);
+    }
+}
--- a/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java
@@ -17,7 +17,9 @@
 package com.gmail.nossr50.listeners;

 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.TNTPrimed;
@@ -38,11 +40,14 @@ import org.bukkit.event.entity.FoodLevelChangeEvent;

 import com.gmail.nossr50.Combat;
 import com.gmail.nossr50.Users;
+import com.gmail.nossr50.m;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.config.LoadProperties;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.events.FakeEntityDamageByEntityEvent;
+import com.gmail.nossr50.events.FakeEntityDamageEvent;
 import com.gmail.nossr50.party.Party;
 import com.gmail.nossr50.skills.Acrobatics;
 import com.gmail.nossr50.skills.Archery;
@@ -59,88 +64,69 @@ public class mcEntityListener implements Listener
        this.plugin = plugin;
    }
    
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onEntityDamageByEntity(EntityDamageByEntityEvent event)
+    {
+        //Lets just put this here...
+        if(event instanceof FakeEntityDamageByEntityEvent)
+            return;
+        
+    	Entity defender = event.getEntity();
+		Entity attacker = event.getDamager();
+		
+		if(attacker instanceof Player && defender instanceof Player)
+		{
+			if(!defender.getWorld().getPVP())
+				return;
+			if(Party.getInstance().inSameParty((Player)defender, (Player)attacker))
+				event.setCancelled(true);
+		}
+		
+		//Make sure defender is not invincible
+		if(defender instanceof LivingEntity)
+		{
+		    LivingEntity livingDefender = (LivingEntity)defender;
+		    if(!m.isInvincible(livingDefender, event))
+		        Combat.combatChecks(event, plugin);
+		}
+    }
+    
    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
    public void onEntityDamage(EntityDamageEvent event) 
    {
+        if(event instanceof FakeEntityDamageEvent)
+            return;
+        
    	Entity entity = event.getEntity();
+    	EntityType type = entity.getType();
    	DamageCause cause = event.getCause();
    	
-    	//Check for world pvp flag
-    	if(event instanceof EntityDamageByEntityEvent)
+    	switch(type)
    	{
-    		EntityDamageByEntityEvent eventb = (EntityDamageByEntityEvent)event;
-    		if(eventb.getEntity() instanceof Player && eventb.getDamager() instanceof Player && !entity.getWorld().getPVP())
-    			return;
-    	}
-    	
-    	/*
-    	 * CHECK FOR INVULNERABILITY
-    	 */
-    	if(entity instanceof Player)
-    	{
-    		Player defender = (Player)event.getEntity();
-    		PlayerProfile PPd = Users.getProfile(defender);
-    		if(defender != null && PPd.getGodMode())
+    	case PLAYER:
+    		/*
+    		 * CHECK FOR INVULNERABILITY
+    		 */
+    		Player player = (Player) entity;
+    		PlayerProfile PP = Users.getProfile(player);
+    		if(PP.getGodMode())
    			event.setCancelled(true);
-    		if(PPd == null)
-    			Users.addUser(defender);
-    	}
-    	
-    	if(entity instanceof LivingEntity)
-    	{
-	    	{
-		    	LivingEntity entityliving = (LivingEntity)entity;
-		    	if(entityliving.getNoDamageTicks() < entityliving.getMaximumNoDamageTicks()/2.0F)
-		    	{
-			    	if(entity instanceof Wolf && ((Wolf)entity).isTamed() && Taming.getOwner(((Wolf)entity), plugin) != null)
-			    		Taming.preventDamage(event, plugin);
-			    	
-			    	if(entity instanceof Player){
-				    	Player player = (Player)entity;
-				    	/*
-				    	 * ACROBATICS
-				    	 */
-				    	if(cause == DamageCause.FALL && mcPermissions.getInstance().acrobatics(player))
-				    		Acrobatics.acrobaticsCheck(player, event);
-				    	/*
-				    	 * Demolitions Expert
-				    	 */
-		    			if(cause == DamageCause.BLOCK_EXPLOSION && mcPermissions.getInstance().blastMining(player))
-		    				BlastMining.demolitionsExpertise(Users.getProfile(player).getSkillLevel(SkillType.MINING), event);
-			    	}
-			    	
-			    	/*
-			    	 * Entity Damage by Entity checks
-			    	 */
-			    	if(event instanceof EntityDamageByEntityEvent && !event.isCancelled())
-			    	{
-			    		EntityDamageByEntityEvent eventb = (EntityDamageByEntityEvent) event;
-			    		Entity f = eventb.getDamager();
-			    		/*
-			    		 * PARTY CHECKS
-			    		 */
-			    		if(entity instanceof Player && f instanceof Player)
-			    		{
-			        		Player defender = (Player)entity;
-			        		Player attacker = (Player)f;
-			        		if(Party.getInstance().inSameParty(defender, attacker))
-			        			event.setCancelled(true);
-			    		}
-			    		Combat.combatChecks(eventb, plugin);	
-			        }
-			    	/*
-			    	 * Check to see if the defender took damage so we can apply recently hurt
-			    	 */
-			    	if(entity instanceof Player)
-			    	{
-			    		Player herpderp = (Player)entity;
-			    		if(!event.isCancelled() && event.getDamage() >= 1)
-			    		{
-			    			Users.getProfile(herpderp).setRecentlyHurt(System.currentTimeMillis());
-			    		}
-			    	}
-		    	}
-	    	}
+    		
+    		if(!m.isInvincible(player, event))
+    		{
+    			if(cause == DamageCause.FALL && mcPermissions.getInstance().acrobatics(player))
+    				Acrobatics.acrobaticsCheck(player, event);
+    			if(cause == DamageCause.BLOCK_EXPLOSION && mcPermissions.getInstance().blastMining(player))
+    				BlastMining.demolitionsExpertise(player, event);
+    			if(event.getDamage() >= 1)
+    				PP.setRecentlyHurt(System.currentTimeMillis());
+    		}
+    		break;
+    	case WOLF:
+    		Wolf wolf = (Wolf) entity;
+    		if((!m.isInvincible(wolf, event)) && wolf.isTamed() && wolf.getOwner() != null)
+    			Taming.preventDamage(event, plugin);
+    		break;
    	}
    }

@@ -190,7 +176,7 @@ public class mcEntityListener implements Listener
 			if(plugin.misc.tntTracker.containsKey(location))
 			{
 				Player player = plugin.misc.tntTracker.get(location);
-				BlastMining.biggerBombs(Users.getProfile(player).getSkillLevel(SkillType.MINING), event);
+				BlastMining.biggerBombs(player, event);
 			}
 		}		
 	}
@@ -235,15 +221,15 @@ public class mcEntityListener implements Listener
 				
 				if(newFoodLevel > currentFoodLevel)
 				{
-					int food = player.getItemInHand().getTypeId();
+					Material food = player.getItemInHand().getType();
 					int herbLevel = PP.getSkillLevel(SkillType.HERBALISM);
 					int foodChange = newFoodLevel - currentFoodLevel;
 					
 					switch(food)
 					{
-					case 297:
+					case BREAD:
 					{
-					    //BREAD (297) RESTORES 2 1/2 HUNGER
+					    //BREAD RESTORES 2 1/2 HUNGER
 					    //Restores 5 HUNGER @ 1000
 					    if(herbLevel >= 200 && herbLevel < 400)
                            foodChange = foodChange + 1;
@@ -257,9 +243,9 @@ public class mcEntityListener implements Listener
                            foodChange = foodChange + 5;
                        break;
 					}
-					case 357:
+					case COOKIE:
 					{
-					    //COOKIE (357) RESTORES 1/2 HUNGER
+					    //COOKIE RESTORES 1/2 HUNGER
 					    //RESTORES 2 HUNGER @ 1000
 					    if(herbLevel >= 200 && herbLevel < 600)
                            foodChange = foodChange + 1;
@@ -269,9 +255,9 @@ public class mcEntityListener implements Listener
                            foodChange = foodChange + 3;
                        break;
 					}
-					case 360:
+					case MELON:
 					{
-					    //MELON (360) RESTORES  1 HUNGER
+					    //MELON RESTORES  1 HUNGER
 					    //RESTORES 2 1/2 HUNGER @ 1000
                        if(herbLevel >= 200 && herbLevel < 600)
                            foodChange = foodChange + 1;
@@ -281,9 +267,9 @@ public class mcEntityListener implements Listener
                            foodChange = foodChange + 3;
                        break;  
 					}
-					case 282:
+					case MUSHROOM_SOUP:
 					{
-					    //STEW (282) RESTORES 4 HUNGER
+					    //MUSHROOM SOUP RESTORES 4 HUNGER
 					    //RESTORES 6 1/2 HUNGER @ 1000
 					    if(herbLevel >= 200 && herbLevel < 400)
                            foodChange = foodChange + 1;
@@ -317,11 +303,23 @@ public class mcEntityListener implements Listener
 	    if(mcPermissions.getInstance().taming(player))
 	    {
 	        PlayerProfile PP = Users.getProfile(player);
-	        if(event.getEntity() instanceof Wolf)
+	        EntityType type = event.getEntityType();
+	        int xp = 0;
+	        
+	        switch(type)
 	        {
-	        	PP.addXP(SkillType.TAMING, LoadProperties.mtameWolf, player);
-	        	Skills.XpCheckSkill(SkillType.TAMING, player);
+	        case WOLF:
+	        	xp = LoadProperties.mtameWolf;
+	        	break;
+	        	/*
+	        case OCELOT:
+	        	xp = LoadProperties.mtameOcelot;
+	        	break;
+	        	*/
 	        }
+	        
+	        PP.addXP(SkillType.TAMING, xp, player);
+	        Skills.XpCheckSkill(SkillType.TAMING, player);
 	    }
 	}
 }
--- a/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java
@@ -26,7 +26,6 @@ import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
-import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.entity.Wolf;
@@ -108,7 +107,7 @@ public class mcPlayerListener implements Listener
 			else if (state == State.CAUGHT_ENTITY)
 			{
 				int skillLevel = Users.getProfile(player).getSkillLevel(SkillType.FISHING);
-				if(skillLevel >= 150 && caught instanceof LivingEntity)
+				if(skillLevel >= 150)
 					Fishing.shakeMob(event);
 			}
 		}
--- a/src/main/java/com/gmail/nossr50/m.java
+++ b/src/main/java/com/gmail/nossr50/m.java
@@ -26,6 +26,7 @@ import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.*;
+import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.player.PlayerAnimationEvent;
 import org.bukkit.inventory.ItemStack;
 import com.gmail.nossr50.config.*;
@@ -60,6 +61,16 @@ public class m
 			return 0;
 	}
 	
+	public static boolean isInvincible(LivingEntity le, EntityDamageEvent event)
+	{
+	    //So apparently if you do more damage to a LivingEntity than its last damage int you bypass the invincibility
+	    //So yeah, this is for that
+	    if(le.getNoDamageTicks() > le.getMaximumNoDamageTicks() / 2.0F && event.getDamage() <= le.getLastDamage())
+	        return true;
+	    else
+	        return false;
+	}
+	
 	public static boolean isDouble(String string)
 	{
 		try 
--- a/src/main/java/com/gmail/nossr50/skills/Acrobatics.java
+++ b/src/main/java/com/gmail/nossr50/skills/Acrobatics.java
@@ -16,7 +16,6 @@
 */
 package com.gmail.nossr50.skills;

-import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
@@ -25,6 +24,7 @@ import com.gmail.nossr50.Users;
 import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.mcLocale;


 public class Acrobatics {
@@ -36,7 +36,7 @@ public class Acrobatics {
 		if(player.isSneaking())
 			acrovar = acrovar * 2;
 		
-		if(Math.random() * 1000 <= acrovar && !event.isCancelled())
+		if(Math.random() * 1000 <= acrovar)
 		{
 			int threshold = 7;
 			
@@ -51,24 +51,24 @@ public class Acrobatics {
 			/*
 			 * Check for death
 			 */
-			if(player.getHealth() - newDamage >= 1){
-				if(!event.isCancelled())
-					PP.addXP(SkillType.ACROBATICS, (event.getDamage() * 8)*10, player);
+			if(player.getHealth() - newDamage >= 1)
+			{
+				PP.addXP(SkillType.ACROBATICS, (event.getDamage() * 8)*10, player);
 				Skills.XpCheckSkill(SkillType.ACROBATICS, player);
 				event.setDamage(newDamage);
 				if(event.getDamage() <= 0)
 					event.setCancelled(true);
 				if(player.isSneaking()){
-					player.sendMessage(ChatColor.GREEN+"**GRACEFUL ROLL**");
+					player.sendMessage(mcLocale.getString("Acrobatics.GracefulRoll"));
 				} else {
-					player.sendMessage("**ROLL**");
+					player.sendMessage(mcLocale.getString("Acrobatics.Roll"));
 				}
 			}
-		} else if (!event.isCancelled()){
-			if(player.getHealth() - event.getDamage() >= 1){
-				PP.addXP(SkillType.ACROBATICS, (event.getDamage() * 12)*10, player);
-				Skills.XpCheckSkill(SkillType.ACROBATICS, player);
-			}
+		} 
+		else if(player.getHealth() - event.getDamage() >= 1)
+		{
+			PP.addXP(SkillType.ACROBATICS, (event.getDamage() * 12)*10, player);
+			Skills.XpCheckSkill(SkillType.ACROBATICS, player);
 		}
    }
 	public static void dodgeChecks(EntityDamageByEntityEvent event){
@@ -78,7 +78,7 @@ public class Acrobatics {
 		if(mcPermissions.getInstance().acrobatics(defender)){
 			if(PPd.getSkillLevel(SkillType.ACROBATICS) <= 800){
 	    		if(Math.random() * 4000 <= PPd.getSkillLevel(SkillType.ACROBATICS)){
-	    			defender.sendMessage(ChatColor.GREEN+"**DODGE**");
+	    			defender.sendMessage(mcLocale.getString("Acrobatics.Dodge"));
 	    			if(System.currentTimeMillis() >= 5000 + PPd.getRespawnATS() && defender.getHealth() >= 1){
 	    				PPd.addXP(SkillType.ACROBATICS, (event.getDamage() * 12)*1, defender);
 	    				Skills.XpCheckSkill(SkillType.ACROBATICS, defender);
@@ -89,7 +89,7 @@ public class Acrobatics {
 	    				event.setDamage(1);
 	    		}
 			} else if(Math.random() * 4000 <= 800) {
-				defender.sendMessage(ChatColor.GREEN+"**DODGE**");
+				defender.sendMessage(mcLocale.getString("Acrobatics.Dodge"));
 				if(System.currentTimeMillis() >= 5000 + PPd.getRespawnATS() && defender.getHealth() >= 1){
 					PPd.addXP(SkillType.ACROBATICS, (event.getDamage() * 12)*10, defender);
 					Skills.XpCheckSkill(SkillType.ACROBATICS, defender);
--- a/src/main/java/com/gmail/nossr50/skills/Archery.java
+++ b/src/main/java/com/gmail/nossr50/skills/Archery.java
@@ -60,14 +60,14 @@ public class Archery
 				Player defender = (Player)x;
 				if(!Party.getInstance().inSameParty(attacker, defender))
 				{
-					defender.setFireTicks(ignition);
+					defender.setFireTicks(defender.getFireTicks() + ignition);
 					attacker.sendMessage(mcLocale.getString("Combat.Ignition")); //$NON-NLS-1$
 					defender.sendMessage(mcLocale.getString("Combat.BurningArrowHit")); //$NON-NLS-1$
 				}
 			} 
 			else 
 			{
-				x.setFireTicks(ignition);
+				x.setFireTicks(x.getFireTicks() + ignition);
 				attacker.sendMessage(mcLocale.getString("Combat.Ignition")); //$NON-NLS-1$
 			}
 		}
--- a/src/main/java/com/gmail/nossr50/skills/Axes.java
+++ b/src/main/java/com/gmail/nossr50/skills/Axes.java
@@ -16,7 +16,6 @@
 */
 package com.gmail.nossr50.skills;

-import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
@@ -53,51 +52,50 @@ public class Axes {
    	
    	if(x instanceof Wolf){
    		Wolf wolf = (Wolf)x;
-    		if(Taming.getOwner(wolf, pluginx) != null)
+    		if(wolf.getOwner() instanceof Player)
    		{
-	    		if(Taming.getOwner(wolf, pluginx) == attacker)
+    			Player owner = (Player) wolf.getOwner();
+	    		if(owner == attacker)
 	    			return;
-	    		if(Party.getInstance().inSameParty(attacker, Taming.getOwner(wolf, pluginx)))
+	    		if(Party.getInstance().inSameParty(attacker, owner))
 	    			return;
    		}
    	}
    	PlayerProfile PPa = Users.getProfile(attacker);
    	if(m.isAxes(attacker.getItemInHand()) && mcPermissions.getInstance().axes(attacker)){
    		if(PPa.getSkillLevel(SkillType.AXES) >= 750){
-    			if(Math.random() * 1000 <= 750 && !x.isDead()){
+    			if(Math.random() * 2000 <= 750 && !x.isDead()){
    				if(x instanceof Player){
    					int damage = (event.getDamage() * 2) - (event.getDamage() / 2);
    					event.setDamage(damage);
    					Player player = (Player)x;
-    					player.sendMessage(ChatColor.DARK_RED + "You were CRITICALLY hit!");
+    					player.sendMessage(mcLocale.getString("Axes.HitCritically"));
    				}
    				else {
    					int damage = event.getDamage() * 2;
        				event.setDamage(damage);
        			}
-    				attacker.sendMessage(ChatColor.RED+"CRITICAL HIT!");
+    				attacker.sendMessage(mcLocale.getString("Axes.CriticalHit"));
    			}
-    		} else if(Math.random() * 1000 <= PPa.getSkillLevel(SkillType.AXES) && !x.isDead()){
+    		} else if(Math.random() * 2000 <= PPa.getSkillLevel(SkillType.AXES) && !x.isDead()){
    			if(x instanceof Player){
    				int damage = (event.getDamage() * 2) - (event.getDamage() / 2);
 					event.setDamage(damage);
    				Player player = (Player)x;
-    				player.sendMessage(ChatColor.DARK_RED + "You were CRITICALLY hit!");
+    				player.sendMessage(mcLocale.getString("Axes.HitCritically"));
    			}
    			else {
    				int damage = event.getDamage() * 2;
    				event.setDamage(damage);
    			}
-				attacker.sendMessage(ChatColor.RED+"CRITICAL HIT!");
+				attacker.sendMessage(mcLocale.getString("Axes.CriticalHit"));
    		}
    	}
    }
 	
-	public static void impact(Player attacker, LivingEntity target)
+	public static void impact(Player attacker, LivingEntity target, EntityDamageByEntityEvent event)
 	{
 	    //TODO: Finish this skill, the idea is you will greatly damage an opponents armor and when they are armor less you have a proc that will stun them and deal additional damage.
-	    boolean didImpact = false;
-	    
 	    if(target instanceof Player)
 	    {
 	        Player targetPlayer = (Player) target;
@@ -106,8 +104,6 @@ public class Axes {
 	        
 	        durDmg+=Users.getProfile(attacker).getSkillLevel(SkillType.AXES)/30; //Every 30 Skill Levels you gain 1 durability dmg
 	        
-	        System.out.println(durDmg);
-	        
 	        for(ItemStack x : targetPlayer.getInventory().getArmorContents())
 	        {
 	            if(x.getType() == Material.AIR)
@@ -119,31 +115,21 @@ public class Axes {
 	        }
 	        
 	        if(emptySlots == 4)
-	        {
-	            didImpact = applyImpact(attacker, target);
-	            if(didImpact)
-	                targetPlayer.sendMessage(mcLocale.getString("Axes.GreaterImpactOnSelf"));
-	        }
-	    } else {
+	            applyImpact(attacker, target, event);
+	    }
+	    else
 	        //Since mobs are technically unarmored this will always trigger
-	        didImpact = applyImpact(attacker, target);
-	    }
-	    
-	    if(didImpact)
-	    {
-	        attacker.sendMessage(mcLocale.getString("Axes.GreaterImpactOnEnemy"));
-	    }
+	        applyImpact(attacker, target, event);
 	}
 	
-	public static boolean applyImpact(Player attacker, LivingEntity target)
+	public static void applyImpact(Player attacker, LivingEntity target, EntityDamageByEntityEvent event)
 	{
 	    if(Math.random() * 100 > 75)
        {
-            Combat.dealDamage(target, 2, attacker);
+            event.setDamage(event.getDamage()+2);
            target.setVelocity(attacker.getLocation().getDirection().normalize().multiply(1.5D));
-            return true;
+            attacker.sendMessage(mcLocale.getString("Axes.GreaterImpactOnEnemy"));
        }
-	    return false;
 	}
 	
 	public static void applyAoeDamage(Player attacker, EntityDamageByEntityEvent event, Plugin pluginx)
@@ -167,10 +153,14 @@ public class Axes {
    			if(derp instanceof Wolf)
    			{
 					Wolf hurrDurr = (Wolf)derp;
-					if(Taming.getOwner(hurrDurr, pluginx) == attacker)
-						continue;
-					if(Party.getInstance().inSameParty(attacker, Taming.getOwner(hurrDurr, pluginx)))
-						continue;
+					if(hurrDurr.getOwner() instanceof Player)
+		    		{
+		    			Player owner = (Player) hurrDurr.getOwner();
+			    		if(owner == attacker)
+			    			return;
+			    		if(Party.getInstance().inSameParty(attacker, owner))
+			    			return;
+		    		}
 				}
    			
    			//Damage nearby LivingEntities
@@ -195,7 +185,7 @@ public class Axes {
 	    				if(targets >= 1 && derp.getWorld().getPVP())
 	    				{
 	    				    Combat.dealDamage(target, dmgAmount, attacker);
-	    					target.sendMessage(ChatColor.DARK_RED+"Struck by CLEAVE!");
+	    					target.sendMessage(mcLocale.getString("Axes.HitByCleave"));
 	    					targets--;
 	    					continue;
 	    				}
--- a/src/main/java/com/gmail/nossr50/skills/BlastMining.java
+++ b/src/main/java/com/gmail/nossr50/skills/BlastMining.java
@@ -199,8 +199,9 @@ public class BlastMining{
 	 * Increases radius of explosion by 3 at 750.
 	 * Increases radius of explosion by 4 at 1000.
 	 */
-	public static void biggerBombs(int skillLevel, ExplosionPrimeEvent event)
+	public static void biggerBombs(Player player, ExplosionPrimeEvent event)
 	{
+		int skillLevel = Users.getProfile(player).getSkillLevel(SkillType.MINING);
 		float radius = event.getRadius();
 		if(skillLevel < 250)
 			return;
@@ -223,8 +224,9 @@ public class BlastMining{
 	 * Reduces explosion damage to 1/2 of normal at 750.
 	 * Reduces explosion damage to 0 at 1000.
 	 */
-	public static void demolitionsExpertise(int skill, EntityDamageEvent event)
+	public static void demolitionsExpertise(Player player, EntityDamageEvent event)
 	{
+		int skill = Users.getProfile(player).getSkillLevel(SkillType.MINING);
 		int damage = event.getDamage();
 		if(skill < 500)
 			return;
--- a/src/main/java/com/gmail/nossr50/skills/Fishing.java
+++ b/src/main/java/com/gmail/nossr50/skills/Fishing.java
@@ -44,25 +44,15 @@ public class Fishing {
 		int lvl = PP.getSkillLevel(SkillType.FISHING);

 		if(lvl >= LoadProperties.fishingTier1 && lvl < LoadProperties.fishingTier2)
-		{
 			return 1;
-		} 
 		else if (lvl >= LoadProperties.fishingTier2 && lvl < LoadProperties.fishingTier3)
-		{
-			return 2;
-		} 
+			return 2; 
 		else if (lvl >= LoadProperties.fishingTier3 && lvl < LoadProperties.fishingTier4)
-		{
-			return 3;
-		} 
+			return 3; 
 		else if (lvl >= LoadProperties.fishingTier4 && lvl < LoadProperties.fishingTier5)
-		{
 			return 4;
-		}
 		else
-		{
 			return 5;
-		}
 	}

 	public static void getFishingResults(Player player, PlayerFishEvent event)
@@ -105,9 +95,8 @@ public class Fishing {
 			}
 		} 
 		else
-		{
 			theCatch.setItemStack(new ItemStack(Material.RAW_FISH));
-		}
+		
 		//Change durability to random value
 		theCatch.getItemStack().setDurability((short) (Math.random() * theCatch.getItemStack().getType().getMaxDurability())); //Change the damage value		
 	}
@@ -127,9 +116,8 @@ public class Fishing {
 			}
 		} 
 		else
-		{
 			theCatch.setItemStack(new ItemStack(Material.RAW_FISH));
-		}
+		
 		//Change durability to random value
 		theCatch.getItemStack().setDurability((short) (Math.random() * theCatch.getItemStack().getType().getMaxDurability())); //Change the damage value
 	}
@@ -149,9 +137,8 @@ public class Fishing {
 			}
 		} 
 		else
-		{
 			theCatch.setItemStack(new ItemStack(Material.RAW_FISH));
-		}
+		
 		//Change durability to random value
 		theCatch.getItemStack().setDurability((short) (Math.random() * theCatch.getItemStack().getType().getMaxDurability())); //Change the damage value
 	}
@@ -171,9 +158,8 @@ public class Fishing {
 			}
 		} 
 		else
-		{
 			theCatch.setItemStack(new ItemStack(Material.RAW_FISH));
-		}
+		
 		//Change durability to random value
 		theCatch.getItemStack().setDurability((short) (Math.random() * theCatch.getItemStack().getType().getMaxDurability())); //Change the damage value
 	}
@@ -193,9 +179,8 @@ public class Fishing {
 			}
 		} 
 		else
-		{
 			theCatch.setItemStack(new ItemStack(Material.RAW_FISH));
-		}
+		
 		//Change durability to random value
 		theCatch.getItemStack().setDurability((short) (Math.random() * theCatch.getItemStack().getType().getMaxDurability())); //Change the damage value
 	}
@@ -272,18 +257,85 @@ public class Fishing {
 	}
 	public static void shakeMob(PlayerFishEvent event)
 	{
-		LivingEntity le = (LivingEntity)event.getCaught();
 		
-		//Do nothing to players
-		if(le instanceof Player)
-			return;
-		
-		Combat.dealDamage(le, 1);
+		LivingEntity le = (LivingEntity) event.getCaught();
+		EntityType type = le.getType();
 		Location loc = le.getLocation();
-
-		/* Neutral Mobs */
-		if(le instanceof Sheep)
+		
+		switch(type)
 		{
+		case BLAZE:
+			m.mcDropItem(loc, new ItemStack(Material.BLAZE_ROD, 1));
+			break;
+		case CAVE_SPIDER:
+			if(Math.random() * 10 < 5)
+				m.mcDropItem(loc, new ItemStack(Material.SPIDER_EYE, 1));
+			else
+				m.mcDropItem(loc, new ItemStack(Material.STRING, 1));
+			break;
+		case CHICKEN:
+			if(Math.random() * 10 <= 7)
+			{
+				if(Math.random() * 10 < 5)
+					m.mcDropItem(loc, new ItemStack(Material.FEATHER, 1));
+				else
+					m.mcDropItem(loc, new ItemStack(Material.RAW_CHICKEN, 1));
+			}
+			else
+				m.mcDropItem(loc, new ItemStack(Material.EGG, 1));
+			break;
+		case COW:
+			if(Math.random() * 100 >= 99)
+				m.mcDropItem(loc, new ItemStack(Material.MILK_BUCKET, 1)); //rare chance to drop milk
+			else if(Math.random() * 10 < 5)
+				m.mcDropItem(loc, new ItemStack(Material.LEATHER, 1));
+			else
+				m.mcDropItem(loc, new ItemStack(Material.RAW_BEEF, 1));
+			break;
+		case CREEPER:
+			m.mcDropItem(loc, new ItemStack(Material.SULPHUR, 1));
+			break;
+		case ENDERMAN:
+			m.mcDropItem(loc, new ItemStack(Material.ENDER_PEARL, 1));
+			break;
+		case GHAST:
+			if(Math.random() * 10 < 5)
+				m.mcDropItem(loc, new ItemStack(Material.SULPHUR, 1));
+			else
+				m.mcDropItem(loc, new ItemStack(Material.GHAST_TEAR, 1));
+			break;
+		case MAGMA_CUBE:
+			m.mcDropItem(loc, new ItemStack(Material.MAGMA_CREAM, 1));
+			break;
+		case MUSHROOM_COW:
+			if(Math.random() * 100 >= 99)
+			{
+				if(Math.random() * 10 < 5)
+					m.mcDropItem(loc, new ItemStack(Material.MILK_BUCKET, 1)); //rare chance to drop milk
+				else
+					m.mcDropItem(loc, new ItemStack(Material.MUSHROOM_SOUP, 1)); //rare chance to drop soup
+			}
+			else if(Math.random() * 10 <= 7)
+			{
+				if(Math.random() * 10 < 5)
+					m.mcDropItem(loc, new ItemStack(Material.LEATHER, 1));
+				else
+					m.mcDropItem(loc, new ItemStack(Material.RAW_BEEF, 1));
+			}
+			else
+				m.mcDropItem(loc, new ItemStack(Material.RED_MUSHROOM, 3));
+				//need some way to remove MushroomCow & replace with regular cow when sheared
+			break;
+		case PIG:
+			m.mcDropItem(loc, new ItemStack(Material.PORK, 1));
+			break;
+		case PIG_ZOMBIE:
+			if(Math.random() * 10 < 5)
+				m.mcDropItem(loc, new ItemStack(Material.ROTTEN_FLESH, 1));
+			else
+				m.mcDropItem(loc, new ItemStack(Material.GOLD_NUGGET, 1));
+			break;
+		case SHEEP:
 			Sheep sheep = (Sheep)le;
 			if(!sheep.isSheared())
 			{
@@ -294,149 +346,38 @@ public class Fishing {
 				m.mcDropItem(loc, theWool);
 				sheep.setSheared(true);
 			}
-		} 
-		
-		else if(le instanceof Pig)
-		{
-			m.mcDropItem(loc, new ItemStack(Material.PORK, 1));
-		} 
-		
-		else if(le instanceof Cow)
-		{
-			if(Math.random() * 100 >= 99){
-				m.mcDropItem(loc, new ItemStack(Material.MILK_BUCKET, 1)); //rare chance to drop milk
-			}
-			else if(Math.random() * 10 < 5){
-				m.mcDropItem(loc, new ItemStack(Material.LEATHER, 1));
-			}
-			else{
-				m.mcDropItem(loc, new ItemStack(Material.RAW_BEEF, 1));
-			}
-		}
-		
-		else if(le instanceof Chicken)
-		{
-			if(Math.random() * 10 <= 7){
-				if(Math.random() * 10 < 5){
-					m.mcDropItem(loc, new ItemStack(Material.FEATHER, 1));
-				}
-				else{
-					m.mcDropItem(loc, new ItemStack(Material.RAW_CHICKEN, 1));
-				}
-			}
-			else{
-				m.mcDropItem(loc, new ItemStack(Material.EGG, 1));
-			}
-		}
-		
-		//need to implement new shearing method
-		else if(le instanceof MushroomCow)
-		{
-			if(Math.random() * 100 >= 99){
-				if(Math.random() * 10 < 5){
-					m.mcDropItem(loc, new ItemStack(Material.MILK_BUCKET, 1)); //rare chance to drop milk
-				}
-				else{
-					m.mcDropItem(loc, new ItemStack(Material.MUSHROOM_SOUP, 1)); //rare chance to drop soup
-				}
-			}
-			else if(Math.random() * 10 <= 7){
-				if(Math.random() * 10 < 5){
-					m.mcDropItem(loc, new ItemStack(Material.LEATHER, 1));
-				}
-				else{
-					m.mcDropItem(loc, new ItemStack(Material.RAW_BEEF, 1));
-				}
-			}
-			else{
-				m.mcDropItem(loc, new ItemStack(Material.RED_MUSHROOM, 3));
-				//need some way to remove MushroomCow & replace with regular cow when sheared
-			}
-		}
-		
-		else if(le instanceof Squid)
-		{
-			m.mcDropItem(loc, new ItemStack(Material.getMaterial(351), 1, (byte)0, (byte)0));
-		}
-		
-		else if(le instanceof Snowman){
-			if(Math.random() * 100 >= 99){
-				m.mcDropItem(loc, new ItemStack(Material.PUMPKIN, 1)); //rare chance to drop pumpkin
-			}
-			else{
-				m.mcDropItem(loc, new ItemStack(Material.SNOW_BALL, 5));
-			}
-		}
-		
-		/* Hostile Mobs */
-		else if(le instanceof Skeleton)
-		{
+			break;
+		case SKELETON:
 			if(Math.random() * 10 < 5)
 				m.mcDropItem(loc, new ItemStack(Material.BONE, 1));
 			else
 				m.mcDropItem(loc, new ItemStack(Material.ARROW, 3));
-		} 
-		
-		else if(le instanceof Spider)
-		{
-			if(Math.random() * 10 < 5)
-				m.mcDropItem(loc, new ItemStack(Material.SPIDER_EYE, 1));
-			else
-				m.mcDropItem(loc, new ItemStack(Material.STRING, 1));
-		} 
-		
-		else if(le instanceof Creeper)
-		{
-			m.mcDropItem(loc, new ItemStack(Material.SULPHUR, 1));
-		}
-		
-		else if(le instanceof Enderman)
-		{
-			m.mcDropItem(loc, new ItemStack(Material.ENDER_PEARL, 1));
-		}
-		
-		else if(le instanceof PigZombie)
-		{
-			if(Math.random() * 10 < 5)
-				m.mcDropItem(loc, new ItemStack(Material.ROTTEN_FLESH, 1));
-			else
-				m.mcDropItem(loc, new ItemStack(Material.GOLD_NUGGET, 1));
-		}
-		
-		else if(le instanceof Blaze)
-		{
-			m.mcDropItem(loc, new ItemStack(Material.BLAZE_ROD, 1));
-		}
-		
-		else if(le instanceof CaveSpider)
-		{
-			if(Math.random() * 10 < 5)
-				m.mcDropItem(loc, new ItemStack(Material.SPIDER_EYE, 1));
-			else
-				m.mcDropItem(loc, new ItemStack(Material.STRING, 1));
-		}
-		
-		else if(le instanceof Ghast)
-		{
-			if(Math.random() * 10 < 5)
-				m.mcDropItem(loc, new ItemStack(Material.SULPHUR, 1));
-			else
-				m.mcDropItem(loc, new ItemStack(Material.GHAST_TEAR, 1));
-		}
-		
-		else if(le instanceof MagmaCube)
-		{
-			m.mcDropItem(loc, new ItemStack(Material.MAGMA_CREAM, 1));
-		}
-		
-		else if(le instanceof Slime)
-		{
+			break;
+		case SLIME:
 			m.mcDropItem(loc, new ItemStack(Material.SLIME_BALL, 1));
+			break;
+		case SNOWMAN:
+			if(Math.random() * 100 >= 99)
+				m.mcDropItem(loc, new ItemStack(Material.PUMPKIN, 1)); //rare chance to drop pumpkin
+			else
+				m.mcDropItem(loc, new ItemStack(Material.SNOW_BALL, 5));
+			break;
+		case SPIDER:
+			if(Math.random() * 10 < 5)
+				m.mcDropItem(loc, new ItemStack(Material.SPIDER_EYE, 1));
+			else
+				m.mcDropItem(loc, new ItemStack(Material.STRING, 1));
+			break;
+		case SQUID:
+			m.mcDropItem(loc, new ItemStack(Material.INK_SACK, 1, (byte)0, (byte)0));
+			break;
+		case ZOMBIE:
+			m.mcDropItem(loc, new ItemStack(Material.ROTTEN_FLESH, 1));
+			break;
+		default:
+		    return;
 		}
 		
-		else if(le instanceof Zombie)
-		{
-			m.mcDropItem(loc, new ItemStack(Material.ROTTEN_FLESH, 1));
-		}
+		Combat.dealDamage(le, 1);
 	}
 }
--- a/src/main/java/com/gmail/nossr50/skills/Repair.java
+++ b/src/main/java/com/gmail/nossr50/skills/Repair.java
@@ -448,6 +448,7 @@ public class Repair {
 		}
 		return false;
 	}
+	
 	public static boolean isBow(ItemStack is){
 		return is.getType() == Material.BOW;
 	}
--- a/src/main/java/com/gmail/nossr50/skills/Swords.java
+++ b/src/main/java/com/gmail/nossr50/skills/Swords.java
@@ -16,7 +16,6 @@
 */
 package com.gmail.nossr50.skills;

-import org.bukkit.ChatColor;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -29,6 +28,7 @@ import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.mcPermissions;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.mcLocale;
 import com.gmail.nossr50.party.Party;

 public class Swords 
@@ -40,11 +40,12 @@ public class Swords
    	if(x instanceof Wolf)
    	{
    		Wolf wolf = (Wolf)x;
-    		if(Taming.getOwner(wolf, pluginx) != null)
+    		if(wolf.getOwner() instanceof Player)
    		{
-	    		if(Taming.getOwner(wolf, pluginx) == attacker)
+    			Player owner = (Player) wolf.getOwner();
+	    		if(owner == attacker)
 	    			return;
-	    		if(Party.getInstance().inSameParty(attacker, Taming.getOwner(wolf, pluginx)))
+	    		if(Party.getInstance().inSameParty(attacker, owner))
 	    			return;
    		}
    	}
@@ -60,7 +61,7 @@ public class Swords
 						Player target = (Player)x;
 						Users.getProfile(target).addBleedTicks(3);
 					}
-					attacker.sendMessage(ChatColor.GREEN+"**ENEMY BLEEDING**");
+					attacker.sendMessage(mcLocale.getString("Swords.EnemyBleeding"));
 				}
 			} 
 			else if (Math.random() * 1000 <= PPa.getSkillLevel(SkillType.SWORDS))
@@ -72,7 +73,7 @@ public class Swords
 					Player target = (Player)x;
 					Users.getProfile(target).addBleedTicks(2);
 				}
-				attacker.sendMessage(ChatColor.GREEN+"**ENEMY BLEEDING**");
+				attacker.sendMessage(mcLocale.getString("Swords.EnemyBleeding"));
 			}
 		}
    }
@@ -97,10 +98,14 @@ public class Swords
    			if(derp instanceof Wolf)
    			{
 					Wolf hurrDurr = (Wolf)derp;
-					if(Taming.getOwner(hurrDurr, pluginx) == attacker)
-						continue;
-					if(Party.getInstance().inSameParty(attacker, Taming.getOwner(hurrDurr, pluginx)))
-						continue;
+					if(hurrDurr.getOwner() instanceof Player)
+		    		{
+		    			Player owner = (Player) hurrDurr.getOwner();
+			    		if(owner == attacker)
+			    			return;
+			    		if(Party.getInstance().inSameParty(attacker, owner))
+			    			return;
+		    		}
 				}
    			//Damage nearby LivingEntities
    			if(derp instanceof LivingEntity && targets >= 1)
@@ -120,7 +125,7 @@ public class Swords
 	    				if(targets >= 1 && derp.getWorld().getPVP())
 	    				{
 	    					Combat.dealDamage(target, dmgAmount, attacker);
-	    					target.sendMessage(ChatColor.DARK_RED+"Struck by Serrated Strikes!");
+	    					target.sendMessage(mcLocale.getString("Swords.HitBySerratedStrikes"));
 	        				Users.getProfile(target).addBleedTicks(5);
 	    					targets--;
 	    					continue;
@@ -161,17 +166,17 @@ public class Swords
 		    			if(Math.random() * 2000 <= 600)
 		    			{
 			    			Combat.dealDamage((LivingEntity) f, event.getDamage() / 2);
-		    				defender.sendMessage(ChatColor.GREEN+"**COUNTER-ATTACKED**");
+			    			defender.sendMessage(mcLocale.getString("Swords.CounterAttacked"));
 			    			if(f instanceof Player)
-		    				((Player) f).sendMessage(ChatColor.DARK_RED+"Hit with counterattack!");
+		    				((Player) f).sendMessage(mcLocale.getString("Swords.HitByCounterAttack"));
 		    			}
 		    		}
 		    		else if (Math.random() * 2000 <= PPd.getSkillLevel(SkillType.SWORDS))
 		    		{
 			    		Combat.dealDamage((LivingEntity) f, event.getDamage() / 2);
-			    		defender.sendMessage(ChatColor.GREEN+"**COUNTER-ATTACKED**");
+			    		defender.sendMessage(mcLocale.getString("Swords.CounterAttacked"));
 		    			if(f instanceof Player)
-		    				((Player) f).sendMessage(ChatColor.DARK_RED+"Hit with counterattack!");
+		    				((Player) f).sendMessage(mcLocale.getString("Swords.HitByCounterAttack"));
 		    		}
 		   		}
 		    }
--- a/src/main/java/com/gmail/nossr50/skills/Taming.java
+++ b/src/main/java/com/gmail/nossr50/skills/Taming.java
@@ -16,14 +16,12 @@
 */
 package com.gmail.nossr50.skills;

-import org.bukkit.entity.AnimalTamer;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Wolf;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
-import org.bukkit.plugin.Plugin;

 import com.gmail.nossr50.Combat;
 import com.gmail.nossr50.Users;
@@ -99,47 +97,15 @@ public class Taming
 		}
 	}
 	
-	public static boolean ownerOnline(Wolf theWolf, Plugin pluginx)
-	{
-		for(Player x : pluginx.getServer().getOnlinePlayers())
-		{
-			if(x instanceof AnimalTamer)
-			{
-				AnimalTamer tamer = (AnimalTamer)x;
-				if(theWolf.getOwner() == tamer)
-					return true;
-			}
-		}
-		return false;
-	}
-	
-	public static Player getOwner(Entity wolf, Plugin pluginx)
-	{
-		if(wolf instanceof Wolf)
-		{
-			Wolf theWolf = (Wolf)wolf;
-			for(Player x : pluginx.getServer().getOnlinePlayers())
-			{
-				if(x instanceof AnimalTamer && x.isOnline())
-				{
-					AnimalTamer tamer = (AnimalTamer)x;
-					if(theWolf.getOwner() == tamer)
-						return x;
-				}
-			}
-			return null;
-		}
-		return null;
-	}
-	
 	public static String getOwnerName(Wolf theWolf)
 	{
 		Player owner = null;
 		
 		if (theWolf.getOwner() instanceof Player)
+		{
 			owner = (Player)theWolf.getOwner();
-		if(owner != null)
 			return owner.getName();
+		}
 		else
 			return "Offline Master";
 	}
@@ -147,26 +113,47 @@ public class Taming
 	public static void preventDamage(EntityDamageEvent event, mcMMO plugin)
 	{
 		DamageCause cause = event.getCause();
-		Entity entity = event.getEntity();
-		Wolf theWolf = (Wolf)entity;
-		Player master = getOwner(theWolf, plugin);
+		Wolf wolf = (Wolf) event.getEntity();
+		Player master = (Player) wolf.getOwner();
 		int skillLevel = Users.getProfile(master).getSkillLevel(SkillType.TAMING);
 		
-		//Environmentally Aware
-		if((cause == DamageCause.CONTACT || cause == DamageCause.LAVA || cause == DamageCause.FIRE) && skillLevel >= 100)
+		switch(cause)
 		{
-			if(event.getDamage() < theWolf.getHealth())
+		//Environmentally Aware
+		case CONTACT:
+		case LAVA:
+		case FIRE:
+			if(skillLevel >= 100)
 			{
-				entity.teleport(Taming.getOwner(theWolf, plugin).getLocation());
+				if(event.getDamage() >= wolf.getHealth())
+					return;
+				
+				wolf.teleport(master.getLocation());
 				master.sendMessage(mcLocale.getString("mcEntityListener.WolfComesBack")); //$NON-NLS-1$
-				entity.setFireTicks(0);
 			}
-		}
-		if(cause == DamageCause.FALL && skillLevel >= 100)
-			event.setCancelled(true);
-		
+			break;
+		case FALL:
+			if(skillLevel >= 100)
+				event.setCancelled(true);
+			break;
+			
 		//Thick Fur
-		if(cause == DamageCause.FIRE_TICK)
-			event.getEntity().setFireTicks(0);
+		case FIRE_TICK:
+			if(skillLevel >= 250)
+				wolf.setFireTicks(0);
+			break;
+		case ENTITY_ATTACK:
+		case PROJECTILE:
+			if(skillLevel >= 250)
+				event.setDamage(event.getDamage() / 2);
+			break;
+			
+		//Shock Proof
+		case ENTITY_EXPLOSION:
+		case BLOCK_EXPLOSION:
+			if(skillLevel >= 500)
+				event.setDamage(event.getDamage() / 6);
+			break;
+		}
 	}
 }
--- a/src/main/java/com/gmail/nossr50/skills/WoodCutting.java
+++ b/src/main/java/com/gmail/nossr50/skills/WoodCutting.java
@@ -17,6 +17,7 @@
 package com.gmail.nossr50.skills;

 import java.util.ArrayList;
+
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Block;
@@ -26,6 +27,8 @@ import org.bukkit.enchantments.Enchantment;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.player.PlayerAnimationEvent;
 import org.bukkit.Bukkit;
+
+import com.gmail.nossr50.Combat;
 import com.gmail.nossr50.Users;
 import com.gmail.nossr50.m;
 import com.gmail.nossr50.mcMMO;
@@ -63,7 +66,22 @@ public class WoodCutting
            player.sendMessage(mcLocale.getString("Skills.Woodcutting.TreeFellerThreshold"));
            return;
        }
-        int durabilityLoss = 0, xp = 0;
+        int durabilityLoss = toBeFelled.size(), xp = 0;
+        
+        //Damage the tool
+        player.getItemInHand().setDurability((short) (player.getItemInHand().getDurability()+durabilityLoss));
+        
+        //This is to prevent using wood axes everytime you tree fell
+        if((player.getItemInHand().getDurability() + durabilityLoss >= player.getItemInHand().getType().getMaxDurability()) 
+                || player.getItemInHand().getType() == Material.AIR || player.getItemInHand() == null)
+        {
+            player.sendMessage(mcLocale.getString("TreeFeller.AxeSplinters"));
+            
+            if(player.getHealth() >= 2)
+                Combat.dealDamage(player, (int)(Math.random() * (player.getHealth()-1)));
+            return;
+        }
+        
        //Prepare ItemStacks
        ItemStack item;
        ItemStack oak = new ItemStack(Material.LOG, 1, (byte)0, (byte)0);
@@ -114,7 +132,7 @@ public class WoodCutting
                                xp += LoadProperties.mbirch;
                                break;
                            case 3:
-                                xp += LoadProperties.mjungle;
+                                xp += LoadProperties.mjungle/4;
                                break;
                        }
                    }
@@ -124,11 +142,7 @@ public class WoodCutting
                    x.setType(Material.AIR);
                    
                    //Drop the block
-                    m.mcDropItem(x.getLocation(), item);
-                        
-                    //Damage the tool more if the Tree is larger
-                    durabilityLoss++;
-                        
+                    m.mcDropItem(x.getLocation(), item);    
                } else if(x.getType() == Material.LEAVES) 
                {
                    Material mat = Material.SAPLING;
@@ -141,14 +155,11 @@ public class WoodCutting
                    //Remove the block
                    x.setData((byte) 0);
                    x.setType(Material.AIR);
-                        
-                    //Damage the tool more if the Tree is larger
-                    durabilityLoss++;
                }
            }
        }
        
-        PP.addXP(SkillType.WOODCUTTING, xp, player);
+        PP.addXP(SkillType.WOODCUTTING, xp, player); //Tree Feller gives nerf'd XP
        Skills.XpCheckSkill(SkillType.WOODCUTTING, player);
        
        if(LoadProperties.toolsLoseDurabilityFromAbilities)
--- a/src/main/java/com/gmail/nossr50/util/Page.java
+++ b/src/main/java/com/gmail/nossr50/util/Page.java
@@ -0,0 +1,101 @@
+package com.gmail.nossr50.util;
+
+import java.util.ArrayList;
+
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.m;
+import com.gmail.nossr50.datatypes.SkillType;
+import com.gmail.nossr50.locale.mcLocale;
+
+public class Page {
+    
+    public static int getTotalPageNumber(String address)
+    {
+        String[] addressSplit = mcLocale.getString(address).split("\n");
+        if(addressSplit.length <= 8)
+            return 1;
+        else
+            return (addressSplit.length/8)+1;
+    }
+    
+    public static ArrayList<String> grabPageContents(String header, String address, int pagenum)
+    {
+        int pageIndexStart = 0;
+        
+        //Determine what string to start at
+        if(pagenum > 1)
+        {
+            pageIndexStart = 8*(pagenum-1);
+        }
+        
+        ArrayList<String> allStrings = new ArrayList<String>();
+        String split[] = mcLocale.getString(address).split("\n");
+        
+        allStrings.add(ChatColor.GOLD+"-="+ChatColor.GREEN+header+ChatColor.GOLD+"=-"); //So stylish
+        
+        //Add targeted strings
+        
+        while(allStrings.size() < 9)
+        {
+            if(pageIndexStart+allStrings.size() > split.length)
+                allStrings.add("");
+            else
+                allStrings.add(split[pageIndexStart+allStrings.size()-1]);
+        }
+        
+        allStrings.add("Page "+pagenum+" of "+getTotalPageNumber(address));
+        return allStrings;
+    }
+    
+    public static void clearChat(Player player)
+    {
+        for(int x = 0; x < 20; x++)
+        {
+            player.sendMessage("");
+        }
+    }
+    
+    public static void grabGuidePageForSkill(SkillType skilltype, Player player, String[] args)
+    {
+        String capitalized = m.getCapitalized(skilltype.toString());
+        player.sendMessage(ChatColor.DARK_AQUA+"Guide for "+capitalized+" available type /"+skilltype.toString().toLowerCase()+" ? [Page#]");
+        if (args.length >= 1)
+        {
+            if(args[0].equals("?"))
+            {
+                
+                String address = "Guides."+capitalized;
+                
+                if(args.length > 1 && m.isInt(args[1]) && m.getInt(args[1]) <= Page.getTotalPageNumber(address))
+                {
+                    Page.clearChat(player);
+                    for(String target : Page.grabPageContents(capitalized+" Guide", address, m.getInt(args[1])))
+                    {
+                        player.sendMessage(target);
+                    }
+                } else if(args.length == 1)
+                {
+                    Page.clearChat(player);
+                    for(String target : Page.grabPageContents(capitalized+" Guide", address, 1))
+                    {
+                        player.sendMessage(target);
+                    }
+                }
+                else if(args.length > 1 && m.getInt(args[1]) > Page.getTotalPageNumber(address)) 
+                {
+                    player.sendMessage("That page doesn't exist, there are only "+Page.getTotalPageNumber(address)+" total pages");
+                }
+                else if(args.length > 1 && !m.isInt(args[1]))
+                {
+                    player.sendMessage("Not a valid page number!");
+                }
+            }
+            else
+            {
+                player.sendMessage(ChatColor.RED + "Usage is /"+skilltype.toString().toLowerCase()+" ? [page]");
+            }
+        }
+    }
+}
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -233,6 +233,7 @@ Experience:
    Taming:
        Animal_Taming:
            Wolf: 250
+            Ocelot: 500
    Combat:
        Multiplier:
            Animals: 1.0
--- a/src/main/resources/locale/locale_de.properties
+++ b/src/main/resources/locale/locale_de.properties
@@ -23,8 +23,6 @@ m.mccPartyTeleport=[party member name] [[YELLOW]]- Teleport zu Gruppenmitglied
 m.mccOtherCommands=[[DARK_AQUA]]_______[[YELLOW]] ANDERE BEFEHLE [[DARK_AQUA]]_______
 m.mccStats=[[YELLOW]]- zeigt deinen Status
 m.mccLeaderboards=[[YELLOW]]- Ranglisten
-m.mccMySpawn=[[YELLOW]]- Teleport zum Spawnpunkt
-m.mccClearMySpawn=[[YELLOW]]- Spawnpunkt loeschen
 m.mccToggleAbility=[[YELLOW]]- Faehigkeitsaktivierung mit rechtsklick an/aus schalten
 m.mccAdminToggle=[[YELLOW]]- Adminchat aktivieren
 m.mccInspect=[[WHITE]][playername] [[YELLOW]]- Detailierte Spielerinfos zeigen
@@ -201,7 +199,7 @@ m.EffectsExcavation1_0=[[YELLOW]]Giga Bohrer (Faehigkeit)
 m.EffectsExcavation1_1=[[AQUA]]3x Drop Rate, 3x EXP, +Tempo
 m.EffectsExcavation2_0=[[YELLOW]]Schatzjaeger
 m.EffectsExcavation2_1=[[AQUA]]Faehigkeit nach Schaetzen zu graben
-m.ExcavationGreenTerraLength=[[YELLOW]]Giga Bohrer Dauer: [[GREEN]]{0}s
+m.ExcavationGigaDrillBreakerLength=[[YELLOW]]Giga Bohrer Dauer: [[GREEN]]{0}s
 mcBlockListener.PlacedAnvil=[[DARK_AQUA]]Du hast einen Ambos platziert, du kannst hier Werkzeuge und Ruestungen reparieren.
 mcEntityListener.WolfComesBack=[[DARK_AQUA]]Dein Wolf hastet zurueck zu dir...
 mcPlayerListener.AbilitiesOff=Faehigkeiten nutzen (rechtsklick) aus
@@ -419,4 +417,27 @@ Skills.SkullSplitterPlayerOff=[[RED]]Skull Splitter[[GREEN]] has worn off for [[
 Skills.GigaDrillBreakerPlayerOff=[[RED]]Giga Drill Breaker[[GREEN]] has worn off for [[YELLOW]]{0}
 Skills.SerratedStrikesPlayerOff=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0}
 Skills.BlastMiningPlayer=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Blast Mining!
-Skills.YourBlastMining=[[GREEN]]Your [[YELLOW]]Blast Mining [[GREEN]]ability is refreshed!
+Skills.YourBlastMining=[[GREEN]]Your [[YELLOW]]Blast Mining [[GREEN]]ability is refreshed!
+TreeFeller.AxeSplinters=[[RED]]YOUR AXE SPLINTERS INTO DOZENS OF PIECES
+Acrobatics.GracefulRoll=[[GREEN]]**GRACEFUL ROLL**
+Acrobatics.Dodge=[[GREEN]]**DODGE**
+Acrobatics.Roll=**ROLL**
+Axes.HitCritically=[[DARK_RED]]You were CRITICALLY hit!
+Axes.CriticalHit=[[RED]]CRITIAL HIT!
+Axes.HitByCleave=[[DARK_RED]]Struck by CLEAVE!
+Swords.EnemyBleeding=[[GREEN]]**ENEMY BLEEDING**
+Swords.HitBySerratedStrikes=[[DARK_RED]]Struck by SERRATED STRIKES!
+Swords.CounterAttacked=[[GREEN]]**COUNTER-ATTACKED**
+Swords.HitByCounterAttack=[[DARK_RED]]Hit with a counter-attack!
+Guides.Acrobatics=[[DARK_AQUA]]About Acrobatics:\n[[YELLOW]]Acrobatics is the art of moving gracefully in mcMMO.\n[[YELLOW]]It provides combat bonuses and environment damage bonuses.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill you need to perform a dodge\n[[YELLOW]]in combat or survive falls from heights that damage you.\n\n[[DARK_AQUA]]How does Rolling work?\n[[YELLOW]]You have a passive chance when you take fall damage\n[[YELLOW]]to negate the damage done. You can hold the sneak button to\n[[YELLOW]]double your chances during the fall.\n[[YELLOW]]This triggers a Graceful Roll instead of a standard one.\n[[YELLOW]]Graceful Rolls are like regular rolls but are twice as likely to\n[[YELLOW]]occur and provide more damage safety than regular rolls.\n[[YELLOW]]Rolling chance is tied to your skill level\n[[DARK_AQUA]]How does Dodge work?\n[[YELLOW]]Dodge is a passive chance when you are\n[YELLOW]]injured in combat to halve the damage taken.\n[[YELLOW]]It is tied to your skill level.
+Guides.Archery=Guide coming soon...
+Guides.Axes=Guide coming soon...
+Guides.Excavation=[[DARK_AQUA]]About Excavation:\n[[YELLOW]]Excavation is the act of digging up dirt to find treasures.\n[[YELLOW]]By excavating the land you will find treasures.\n[[YELLOW]]The more you do this the more treasures you can find.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill you must dig with a shovel in hand.\n[[YELLOW]]Only certain materials can be dug up for treasures and XP.\n[[DARK_AQUA]]Compatible Materials:\n[[YELLOW]]Grass, Dirt, Sand, Clay, Gravel, Mycelium, Soul Sand\n\n[[DARK_AQUA]]How to use Giga Drill Breaker:\n[[YELLOW]]With a shovel in hand right click to ready your tool.\n[[YELLOW]]Once in this state you have about 4 seconds to make\n[[YELLOW]]contact with Excavation compatible materials this will\n[[YELLOW]]activate Giga Drill Breaker.\n[[DARK_AQUA]]What is Giga Drill Breaker?\n[[YELLOW]]Giga Drill Breaker is an ability with a cooldown\n[[YELLOW]]tied to Excavation skill. It triples your chance\n[[YELLOW]]of finding treasures and enables instant break\n[[YELLOW]]on Excavation materials.\n\n[[DARK_AQUA]]How does Treasure Hunter work?\n[[YELLOW]]Every possible treasure for Excavation has its own\n[[YELLOW]]skill level requirement for it to drop, as a result it's\n[[YELLOW]]difficult to say how much it is helping you.\n[[YELLOW]]Just keep in mind that the higher your Excavation skill\n[[YELLOW]]is, the more treasures that can be found.\n[[YELLOW]]And also keep in mind that each type of Excavation\n[[YELLOW]]compatible material has its own unique list of treasures.\n[[YELLOW]]In other words you will find different treasures in Dirt\n[[YELLOW]]than you would in Gravel.\n[[DARK_AQUA]]Notes about Excavation:\n[[YELLOW]]Excavation drops are completely customizeable\n[[YELLOW]]So results vary server to server.
+Guides.Fishing=Guide coming soon...
+Guides.Herbalism=Guide coming soon...
+Guides.Mining=[[DARK_AQUA]]About Mining:\n[[YELLOW]]Mining consists of mining stone and ores. It provides bonuses\n[[YELLOW]]to the amount of materials dropped while mining.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill, you must mine with a pickaxe in hand.\n[[YELLOW]]Only certain blocks award XP.\n\n[[DARK_AQUA]]Compatible Materials:\n[[YELLOW]]Stone, Coal Ore, Iron Ore, Gold Ore, Diamond Ore, Redstone Ore,\n[[YELLOW]]Lapis Ore, Obsidian, Mossy Cobblestone, Ender Stone,\n[[YELLOW]]Glowstone, and Netherrack.\n\n[[DARK_AQUA]]How to use Super Breaker:\n[[YELLOW]]With a pickaxe in your hand, right click to ready your tool.\n[[YELLOW]]Once in this state, you have about 4 seconds to make contact\n[[YELLOW]]with Mining compatible materials, which will activate Super\n[[YELLOW]]Breaker.\n\n[[DARK_AQUA]]What is Super Breaker?\n[[YELLOW]]Super Breaker is an ability with a cooldown tied to the Mining\n[[YELLOW]]skill. It triples your chance of extra items dropping and\n[[YELLOW]]enables instant break on Mining materials.\n\n[[DARK_AQUA]]How to use Blast Mining:\n[[YELLOW]]With a detonator in hand, which is a flint & steel by default,\n[[YELLOW]]right-click on TNT from a distance. This will cause the TNT\n[[YELLOW]]to instantly explode.\n\n[[DARK_AQUA]]How does Blast Mining work?\n[[YELLOW]]Blast Mining is an ability with a cooldown tied to the Mining\n[[YELLOW]]skill. It gives bonuses when mining with TNT and allows you\n[[YELLOW]]to remote detonate TNT. There are three parts to Blast Mining.\n[[YELLOW]]The first part is Bigger Bombs, which increases blast radius.\n[[YELLOW]]The second is Demolitions Expert, which decreases damage\n[[YELLOW]]from TNT explosions. The third part simply increases the\n[[YELLOW]]amount of ores dropped from TNT and decreases the\n[[YELLOW]]debris dropped.
+Guides.Repair=Guide coming soon...
+Guides.Swords=Guide coming soon...
+Guides.Taming=Guide coming soon...
+Guides.Unarmed=Guide coming soon...
+Guides.Woodcutting=Guide coming soon...
--- a/src/main/resources/locale/locale_en_us.properties
+++ b/src/main/resources/locale/locale_en_us.properties
@@ -23,8 +23,6 @@ m.mccPartyTeleport=[party member name] [[RED]]- Teleport to party member
 m.mccOtherCommands=[[GREEN]]--OTHER COMMANDS--
 m.mccStats=- View your mcMMO stats
 m.mccLeaderboards=- Leaderboards
-m.mccMySpawn=- Teleports to myspawn
-m.mccClearMySpawn=- Clears your MySpawn
 m.mccToggleAbility=- Toggle ability activation with right click
 m.mccAdminToggle=- Toggle admin chat
 m.mccInspect=[playername] [[RED]]- View detailed player info
@@ -203,7 +201,7 @@ m.EffectsExcavation1_0=Giga Drill Breaker (ABILITY)
 m.EffectsExcavation1_1=3x Drop Rate, 3x EXP, +Speed
 m.EffectsExcavation2_0=Treasure Hunter
 m.EffectsExcavation2_1=Ability to dig for treasure
-m.ExcavationGreenTerraLength=[[RED]]Giga Drill Breaker Length: [[YELLOW]]{0}s
+m.ExcavationGigaDrillBreakerLength=[[RED]]Giga Drill Breaker Length: [[YELLOW]]{0}s
 mcBlockListener.PlacedAnvil=[[DARK_RED]]You have placed an anvil, anvils can repair tools and armor.
 mcEntityListener.WolfComesBack=[[DARK_GRAY]]Your wolf scurries back to you...
 mcPlayerListener.AbilitiesOff=Ability use toggled off
@@ -414,4 +412,27 @@ Skills.SkullSplitterPlayerOff=[[RED]]Skull Splitter[[GREEN]] has worn off for [[
 Skills.GigaDrillBreakerPlayerOff=[[RED]]Giga Drill Breaker[[GREEN]] has worn off for [[YELLOW]]{0}
 Skills.SerratedStrikesPlayerOff=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0}
 Skills.BlastMiningPlayer=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Blast Mining!
-Skills.YourBlastMining=[[GREEN]]Your [[YELLOW]]Blast Mining [[GREEN]]ability is refreshed!
+Skills.YourBlastMining=[[GREEN]]Your [[YELLOW]]Blast Mining [[GREEN]]ability is refreshed!
+TreeFeller.AxeSplinters=[[RED]]YOUR AXE SPLINTERS INTO DOZENS OF PIECES
+Acrobatics.GracefulRoll=[[GREEN]]**GRACEFUL ROLL**
+Acrobatics.Dodge=[[GREEN]]**DODGE**
+Acrobatics.Roll=**ROLL**
+Axes.HitCritically=[[DARK_RED]]You were CRITICALLY hit!
+Axes.CriticalHit=[[RED]]CRITIAL HIT!
+Axes.HitByCleave=[[DARK_RED]]Struck by CLEAVE!
+Swords.EnemyBleeding=[[GREEN]]**ENEMY BLEEDING**
+Swords.HitBySerratedStrikes=[[DARK_RED]]Struck by SERRATED STRIKES!
+Swords.CounterAttacked=[[GREEN]]**COUNTER-ATTACKED**
+Swords.HitByCounterAttack=[[DARK_RED]]Hit with a counter-attack!
+Guides.Acrobatics=[[DARK_AQUA]]About Acrobatics:\n[[YELLOW]]Acrobatics is the art of moving gracefully in mcMMO.\n[[YELLOW]]It provides combat bonuses and environment damage bonuses.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill you need to perform a dodge\n[[YELLOW]]in combat or survive falls from heights that damage you.\n\n[[DARK_AQUA]]How does Rolling work?\n[[YELLOW]]You have a passive chance when you take fall damage\n[[YELLOW]]to negate the damage done. You can hold the sneak button to\n[[YELLOW]]double your chances during the fall.\n[[YELLOW]]This triggers a Graceful Roll instead of a standard one.\n[[YELLOW]]Graceful Rolls are like regular rolls but are twice as likely to\n[[YELLOW]]occur and provide more damage safety than regular rolls.\n[[YELLOW]]Rolling chance is tied to your skill level\n[[DARK_AQUA]]How does Dodge work?\n[[YELLOW]]Dodge is a passive chance when you are\n[YELLOW]]injured in combat to halve the damage taken.\n[[YELLOW]]It is tied to your skill level.
+Guides.Archery=Guide coming soon...
+Guides.Axes=Guide coming soon...
+Guides.Excavation=[[DARK_AQUA]]About Excavation:\n[[YELLOW]]Excavation is the act of digging up dirt to find treasures.\n[[YELLOW]]By excavating the land you will find treasures.\n[[YELLOW]]The more you do this the more treasures you can find.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill you must dig with a shovel in hand.\n[[YELLOW]]Only certain materials can be dug up for treasures and XP.\n[[DARK_AQUA]]Compatible Materials:\n[[YELLOW]]Grass, Dirt, Sand, Clay, Gravel, Mycelium, Soul Sand\n\n[[DARK_AQUA]]How to use Giga Drill Breaker:\n[[YELLOW]]With a shovel in hand right click to ready your tool.\n[[YELLOW]]Once in this state you have about 4 seconds to make\n[[YELLOW]]contact with Excavation compatible materials this will\n[[YELLOW]]activate Giga Drill Breaker.\n[[DARK_AQUA]]What is Giga Drill Breaker?\n[[YELLOW]]Giga Drill Breaker is an ability with a cooldown\n[[YELLOW]]tied to Excavation skill. It triples your chance\n[[YELLOW]]of finding treasures and enables instant break\n[[YELLOW]]on Excavation materials.\n\n[[DARK_AQUA]]How does Treasure Hunter work?\n[[YELLOW]]Every possible treasure for Excavation has its own\n[[YELLOW]]skill level requirement for it to drop, as a result it's\n[[YELLOW]]difficult to say how much it is helping you.\n[[YELLOW]]Just keep in mind that the higher your Excavation skill\n[[YELLOW]]is, the more treasures that can be found.\n[[YELLOW]]And also keep in mind that each type of Excavation\n[[YELLOW]]compatible material has its own unique list of treasures.\n[[YELLOW]]In other words you will find different treasures in Dirt\n[[YELLOW]]than you would in Gravel.\n[[DARK_AQUA]]Notes about Excavation:\n[[YELLOW]]Excavation drops are completely customizeable\n[[YELLOW]]So results vary server to server.
+Guides.Fishing=Guide coming soon...
+Guides.Herbalism=Guide coming soon...
+Guides.Mining=[[DARK_AQUA]]About Mining:\n[[YELLOW]]Mining consists of mining stone and ores. It provides bonuses\n[[YELLOW]]to the amount of materials dropped while mining.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill, you must mine with a pickaxe in hand.\n[[YELLOW]]Only certain blocks award XP.\n\n[[DARK_AQUA]]Compatible Materials:\n[[YELLOW]]Stone, Coal Ore, Iron Ore, Gold Ore, Diamond Ore, Redstone Ore,\n[[YELLOW]]Lapis Ore, Obsidian, Mossy Cobblestone, Ender Stone,\n[[YELLOW]]Glowstone, and Netherrack.\n\n[[DARK_AQUA]]How to use Super Breaker:\n[[YELLOW]]With a pickaxe in your hand, right click to ready your tool.\n[[YELLOW]]Once in this state, you have about 4 seconds to make contact\n[[YELLOW]]with Mining compatible materials, which will activate Super\n[[YELLOW]]Breaker.\n\n[[DARK_AQUA]]What is Super Breaker?\n[[YELLOW]]Super Breaker is an ability with a cooldown tied to the Mining\n[[YELLOW]]skill. It triples your chance of extra items dropping and\n[[YELLOW]]enables instant break on Mining materials.\n\n[[DARK_AQUA]]How to use Blast Mining:\n[[YELLOW]]With a detonator in hand, which is a flint & steel by default,\n[[YELLOW]]right-click on TNT from a distance. This will cause the TNT\n[[YELLOW]]to instantly explode.\n\n[[DARK_AQUA]]How does Blast Mining work?\n[[YELLOW]]Blast Mining is an ability with a cooldown tied to the Mining\n[[YELLOW]]skill. It gives bonuses when mining with TNT and allows you\n[[YELLOW]]to remote detonate TNT. There are three parts to Blast Mining.\n[[YELLOW]]The first part is Bigger Bombs, which increases blast radius.\n[[YELLOW]]The second is Demolitions Expert, which decreases damage\n[[YELLOW]]from TNT explosions. The third part simply increases the\n[[YELLOW]]amount of ores dropped from TNT and decreases the\n[[YELLOW]]debris dropped.
+Guides.Repair=Guide coming soon...
+Guides.Swords=Guide coming soon...
+Guides.Taming=Guide coming soon...
+Guides.Unarmed=Guide coming soon...
+Guides.Woodcutting=Guide coming soon...
--- a/src/main/resources/locale/locale_es_es.properties
+++ b/src/main/resources/locale/locale_es_es.properties
@@ -23,8 +23,6 @@ m.mccPartyTeleport=[party member name] [[RED]]- Teletransportate a un miembro de
 m.mccOtherCommands=[[GREEN]]--OTROS COMANDOS--
 m.mccStats=- Mira tus estadisticas de McMMO
 m.mccLeaderboards=- Ranking de lideres
-m.mccMySpawn=- Teletransportate a tu lugar de nacimiento
-m.mccClearMySpawn=- Limpia tu lugar de nacimiento
 m.mccToggleAbility=- Activa/Desactiva la activacion de la habilidad con el click derecho
 m.mccAdminToggle=- Activa/Desactiva el chat de admins
 m.mccInspect=[playername] [[RED]]- Mira informacion detallada del jugador
@@ -201,7 +199,7 @@ m.EffectsExcavation1_0=Ultra perforador (HABILIDAD)
 m.EffectsExcavation1_1=Triple beneficio, Triple EXP, + Velocidad
 m.EffectsExcavation2_0=Cazatesoros
 m.EffectsExcavation2_1=Habilidad para excavar y obtener tesoros
-m.ExcavationGreenTerraLength=[[RED]]Duracion de Ultra perforador: [[YELLOW]]{0}s
+m.ExcavationGigaDrillBreakerLength=[[RED]]Duracion de Ultra perforador: [[YELLOW]]{0}s
 mcBlockListener.PlacedAnvil=[[DARK_RED]]Has establecido un yunque, Los yunques pueden reparar herramientas y armadura.
 mcEntityListener.WolfComesBack=[[DARK_GRAY]]El lobo se escabuye hacia ti...
 mcPlayerListener.AbilitiesOff=Uso de habilidad desactivada
@@ -412,4 +410,27 @@ Skills.SkullSplitterPlayerOff=[[RED]]Skull Splitter[[GREEN]] has worn off for [[
 Skills.GigaDrillBreakerPlayerOff=[[RED]]Giga Drill Breaker[[GREEN]] has worn off for [[YELLOW]]{0}
 Skills.SerratedStrikesPlayerOff=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0}
 Skills.BlastMiningPlayer=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Blast Mining!
-Skills.YourBlastMining=[[GREEN]]Your [[YELLOW]]Blast Mining [[GREEN]]ability is refreshed!
+Skills.YourBlastMining=[[GREEN]]Your [[YELLOW]]Blast Mining [[GREEN]]ability is refreshed!
+TreeFeller.AxeSplinters=[[RED]]YOUR AXE SPLINTERS INTO DOZENS OF PIECES
+Acrobatics.GracefulRoll=[[GREEN]]**GRACEFUL ROLL**
+Acrobatics.Dodge=[[GREEN]]**DODGE**
+Acrobatics.Roll=**ROLL**
+Axes.HitCritically=[[DARK_RED]]You were CRITICALLY hit!
+Axes.CriticalHit=[[RED]]CRITIAL HIT!
+Axes.HitByCleave=[[DARK_RED]]Struck by CLEAVE!
+Swords.EnemyBleeding=[[GREEN]]**ENEMY BLEEDING**
+Swords.HitBySerratedStrikes=[[DARK_RED]]Struck by SERRATED STRIKES!
+Swords.CounterAttacked=[[GREEN]]**COUNTER-ATTACKED**
+Swords.HitByCounterAttack=[[DARK_RED]]Hit with a counter-attack!
+Guides.Acrobatics=[[DARK_AQUA]]About Acrobatics:\n[[YELLOW]]Acrobatics is the art of moving gracefully in mcMMO.\n[[YELLOW]]It provides combat bonuses and environment damage bonuses.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill you need to perform a dodge\n[[YELLOW]]in combat or survive falls from heights that damage you.\n\n[[DARK_AQUA]]How does Rolling work?\n[[YELLOW]]You have a passive chance when you take fall damage\n[[YELLOW]]to negate the damage done. You can hold the sneak button to\n[[YELLOW]]double your chances during the fall.\n[[YELLOW]]This triggers a Graceful Roll instead of a standard one.\n[[YELLOW]]Graceful Rolls are like regular rolls but are twice as likely to\n[[YELLOW]]occur and provide more damage safety than regular rolls.\n[[YELLOW]]Rolling chance is tied to your skill level\n[[DARK_AQUA]]How does Dodge work?\n[[YELLOW]]Dodge is a passive chance when you are\n[YELLOW]]injured in combat to halve the damage taken.\n[[YELLOW]]It is tied to your skill level.
+Guides.Archery=Guide coming soon...
+Guides.Axes=Guide coming soon...
+Guides.Excavation=[[DARK_AQUA]]About Excavation:\n[[YELLOW]]Excavation is the act of digging up dirt to find treasures.\n[[YELLOW]]By excavating the land you will find treasures.\n[[YELLOW]]The more you do this the more treasures you can find.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill you must dig with a shovel in hand.\n[[YELLOW]]Only certain materials can be dug up for treasures and XP.\n[[DARK_AQUA]]Compatible Materials:\n[[YELLOW]]Grass, Dirt, Sand, Clay, Gravel, Mycelium, Soul Sand\n\n[[DARK_AQUA]]How to use Giga Drill Breaker:\n[[YELLOW]]With a shovel in hand right click to ready your tool.\n[[YELLOW]]Once in this state you have about 4 seconds to make\n[[YELLOW]]contact with Excavation compatible materials this will\n[[YELLOW]]activate Giga Drill Breaker.\n[[DARK_AQUA]]What is Giga Drill Breaker?\n[[YELLOW]]Giga Drill Breaker is an ability with a cooldown\n[[YELLOW]]tied to Excavation skill. It triples your chance\n[[YELLOW]]of finding treasures and enables instant break\n[[YELLOW]]on Excavation materials.\n\n[[DARK_AQUA]]How does Treasure Hunter work?\n[[YELLOW]]Every possible treasure for Excavation has its own\n[[YELLOW]]skill level requirement for it to drop, as a result it's\n[[YELLOW]]difficult to say how much it is helping you.\n[[YELLOW]]Just keep in mind that the higher your Excavation skill\n[[YELLOW]]is, the more treasures that can be found.\n[[YELLOW]]And also keep in mind that each type of Excavation\n[[YELLOW]]compatible material has its own unique list of treasures.\n[[YELLOW]]In other words you will find different treasures in Dirt\n[[YELLOW]]than you would in Gravel.\n[[DARK_AQUA]]Notes about Excavation:\n[[YELLOW]]Excavation drops are completely customizeable\n[[YELLOW]]So results vary server to server.
+Guides.Fishing=Guide coming soon...
+Guides.Herbalism=Guide coming soon...
+Guides.Mining=[[DARK_AQUA]]About Mining:\n[[YELLOW]]Mining consists of mining stone and ores. It provides bonuses\n[[YELLOW]]to the amount of materials dropped while mining.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill, you must mine with a pickaxe in hand.\n[[YELLOW]]Only certain blocks award XP.\n\n[[DARK_AQUA]]Compatible Materials:\n[[YELLOW]]Stone, Coal Ore, Iron Ore, Gold Ore, Diamond Ore, Redstone Ore,\n[[YELLOW]]Lapis Ore, Obsidian, Mossy Cobblestone, Ender Stone,\n[[YELLOW]]Glowstone, and Netherrack.\n\n[[DARK_AQUA]]How to use Super Breaker:\n[[YELLOW]]With a pickaxe in your hand, right click to ready your tool.\n[[YELLOW]]Once in this state, you have about 4 seconds to make contact\n[[YELLOW]]with Mining compatible materials, which will activate Super\n[[YELLOW]]Breaker.\n\n[[DARK_AQUA]]What is Super Breaker?\n[[YELLOW]]Super Breaker is an ability with a cooldown tied to the Mining\n[[YELLOW]]skill. It triples your chance of extra items dropping and\n[[YELLOW]]enables instant break on Mining materials.\n\n[[DARK_AQUA]]How to use Blast Mining:\n[[YELLOW]]With a detonator in hand, which is a flint & steel by default,\n[[YELLOW]]right-click on TNT from a distance. This will cause the TNT\n[[YELLOW]]to instantly explode.\n\n[[DARK_AQUA]]How does Blast Mining work?\n[[YELLOW]]Blast Mining is an ability with a cooldown tied to the Mining\n[[YELLOW]]skill. It gives bonuses when mining with TNT and allows you\n[[YELLOW]]to remote detonate TNT. There are three parts to Blast Mining.\n[[YELLOW]]The first part is Bigger Bombs, which increases blast radius.\n[[YELLOW]]The second is Demolitions Expert, which decreases damage\n[[YELLOW]]from TNT explosions. The third part simply increases the\n[[YELLOW]]amount of ores dropped from TNT and decreases the\n[[YELLOW]]debris dropped.
+Guides.Repair=Guide coming soon...
+Guides.Swords=Guide coming soon...
+Guides.Taming=Guide coming soon...
+Guides.Unarmed=Guide coming soon...
+Guides.Woodcutting=Guide coming soon...
--- a/src/main/resources/locale/locale_fi.properties
+++ b/src/main/resources/locale/locale_fi.properties
@@ -23,8 +23,6 @@ m.mccPartyTeleport=[party member name] [[RED]]- Siirry ryhm
 m.mccOtherCommands=[[GREEN]]--MUUT KOMENNOT--
 m.mccStats=- Näytä mcMMO tilastosi
 m.mccLeaderboards=- Tulostaulukko
-m.mccMySpawn=- Siirtää sinut myspawniin
-m.mccClearMySpawn=- Tyhjää myspawnisi
 m.mccToggleAbility=- Laita taitojen aktivointi oikealla näppäimellä päälle/pois
 m.mccAdminToggle=- Laita admin juttelu päälle/pois
 m.mccInspect=[playername] [[RED]]- Näytä yksityiskohtaiset tiedot pelaajasta
@@ -201,7 +199,7 @@ m.EffectsExcavation1_0=Giga Drill Breaker (TAITO)
 m.EffectsExcavation1_1=3x saaliin määrä, 3x kokemuspisteiden määrä, +Nopeus
 m.EffectsExcavation2_0=Aarteenmetsästäjä
 m.EffectsExcavation2_1=Taito jonka avulla voit kaivaa aarteita
-m.ExcavationGreenTerraLength=[[RED]]Giga Drill Breaker kesto: [[YELLOW]]{0}s
+m.ExcavationGigaDrillBreakerLength=[[RED]]Giga Drill Breaker kesto: [[YELLOW]]{0}s
 mcBlockListener.PlacedAnvil=[[DARK_RED]]Olet asettanut alasimen maahan, sillä voit korjata työkaluja ja haarniskoja.
 mcEntityListener.WolfComesBack=[[DARK_GRAY]]Sutesi kipittää takaisin luoksesi...
 mcPlayerListener.AbilitiesOff=Taitojen käyttö pois päältä
@@ -401,4 +399,27 @@ Skills.SkullSplitterPlayerOff=[[RED]]Skull Splitter[[GREEN]] has worn off for [[
 Skills.GigaDrillBreakerPlayerOff=[[RED]]Giga Drill Breaker[[GREEN]] has worn off for [[YELLOW]]{0}
 Skills.SerratedStrikesPlayerOff=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0}
 Skills.BlastMiningPlayer=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Blast Mining!
-Skills.YourBlastMining=[[GREEN]]Your [[YELLOW]]Blast Mining [[GREEN]]ability is refreshed!
+Skills.YourBlastMining=[[GREEN]]Your [[YELLOW]]Blast Mining [[GREEN]]ability is refreshed!
+TreeFeller.AxeSplinters=[[RED]]YOUR AXE SPLINTERS INTO DOZENS OF PIECES
+Acrobatics.GracefulRoll=[[GREEN]]**GRACEFUL ROLL**
+Acrobatics.Dodge=[[GREEN]]**DODGE**
+Acrobatics.Roll=**ROLL**
+Axes.HitCritically=[[DARK_RED]]You were CRITICALLY hit!
+Axes.CriticalHit=[[RED]]CRITIAL HIT!
+Axes.HitByCleave=[[DARK_RED]]Struck by CLEAVE!
+Swords.EnemyBleeding=[[GREEN]]**ENEMY BLEEDING**
+Swords.HitBySerratedStrikes=[[DARK_RED]]Struck by SERRATED STRIKES!
+Swords.CounterAttacked=[[GREEN]]**COUNTER-ATTACKED**
+Swords.HitByCounterAttack=[[DARK_RED]]Hit with a counter-attack!
+Guides.Acrobatics=[[DARK_AQUA]]About Acrobatics:\n[[YELLOW]]Acrobatics is the art of moving gracefully in mcMMO.\n[[YELLOW]]It provides combat bonuses and environment damage bonuses.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill you need to perform a dodge\n[[YELLOW]]in combat or survive falls from heights that damage you.\n\n[[DARK_AQUA]]How does Rolling work?\n[[YELLOW]]You have a passive chance when you take fall damage\n[[YELLOW]]to negate the damage done. You can hold the sneak button to\n[[YELLOW]]double your chances during the fall.\n[[YELLOW]]This triggers a Graceful Roll instead of a standard one.\n[[YELLOW]]Graceful Rolls are like regular rolls but are twice as likely to\n[[YELLOW]]occur and provide more damage safety than regular rolls.\n[[YELLOW]]Rolling chance is tied to your skill level\n[[DARK_AQUA]]How does Dodge work?\n[[YELLOW]]Dodge is a passive chance when you are\n[YELLOW]]injured in combat to halve the damage taken.\n[[YELLOW]]It is tied to your skill level.
+Guides.Archery=Guide coming soon...
+Guides.Axes=Guide coming soon...
+Guides.Excavation=[[DARK_AQUA]]About Excavation:\n[[YELLOW]]Excavation is the act of digging up dirt to find treasures.\n[[YELLOW]]By excavating the land you will find treasures.\n[[YELLOW]]The more you do this the more treasures you can find.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill you must dig with a shovel in hand.\n[[YELLOW]]Only certain materials can be dug up for treasures and XP.\n[[DARK_AQUA]]Compatible Materials:\n[[YELLOW]]Grass, Dirt, Sand, Clay, Gravel, Mycelium, Soul Sand\n\n[[DARK_AQUA]]How to use Giga Drill Breaker:\n[[YELLOW]]With a shovel in hand right click to ready your tool.\n[[YELLOW]]Once in this state you have about 4 seconds to make\n[[YELLOW]]contact with Excavation compatible materials this will\n[[YELLOW]]activate Giga Drill Breaker.\n[[DARK_AQUA]]What is Giga Drill Breaker?\n[[YELLOW]]Giga Drill Breaker is an ability with a cooldown\n[[YELLOW]]tied to Excavation skill. It triples your chance\n[[YELLOW]]of finding treasures and enables instant break\n[[YELLOW]]on Excavation materials.\n\n[[DARK_AQUA]]How does Treasure Hunter work?\n[[YELLOW]]Every possible treasure for Excavation has its own\n[[YELLOW]]skill level requirement for it to drop, as a result it's\n[[YELLOW]]difficult to say how much it is helping you.\n[[YELLOW]]Just keep in mind that the higher your Excavation skill\n[[YELLOW]]is, the more treasures that can be found.\n[[YELLOW]]And also keep in mind that each type of Excavation\n[[YELLOW]]compatible material has its own unique list of treasures.\n[[YELLOW]]In other words you will find different treasures in Dirt\n[[YELLOW]]than you would in Gravel.\n[[DARK_AQUA]]Notes about Excavation:\n[[YELLOW]]Excavation drops are completely customizeable\n[[YELLOW]]So results vary server to server.
+Guides.Fishing=Guide coming soon...
+Guides.Herbalism=Guide coming soon...
+Guides.Mining=[[DARK_AQUA]]About Mining:\n[[YELLOW]]Mining consists of mining stone and ores. It provides bonuses\n[[YELLOW]]to the amount of materials dropped while mining.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill, you must mine with a pickaxe in hand.\n[[YELLOW]]Only certain blocks award XP.\n\n[[DARK_AQUA]]Compatible Materials:\n[[YELLOW]]Stone, Coal Ore, Iron Ore, Gold Ore, Diamond Ore, Redstone Ore,\n[[YELLOW]]Lapis Ore, Obsidian, Mossy Cobblestone, Ender Stone,\n[[YELLOW]]Glowstone, and Netherrack.\n\n[[DARK_AQUA]]How to use Super Breaker:\n[[YELLOW]]With a pickaxe in your hand, right click to ready your tool.\n[[YELLOW]]Once in this state, you have about 4 seconds to make contact\n[[YELLOW]]with Mining compatible materials, which will activate Super\n[[YELLOW]]Breaker.\n\n[[DARK_AQUA]]What is Super Breaker?\n[[YELLOW]]Super Breaker is an ability with a cooldown tied to the Mining\n[[YELLOW]]skill. It triples your chance of extra items dropping and\n[[YELLOW]]enables instant break on Mining materials.\n\n[[DARK_AQUA]]How to use Blast Mining:\n[[YELLOW]]With a detonator in hand, which is a flint & steel by default,\n[[YELLOW]]right-click on TNT from a distance. This will cause the TNT\n[[YELLOW]]to instantly explode.\n\n[[DARK_AQUA]]How does Blast Mining work?\n[[YELLOW]]Blast Mining is an ability with a cooldown tied to the Mining\n[[YELLOW]]skill. It gives bonuses when mining with TNT and allows you\n[[YELLOW]]to remote detonate TNT. There are three parts to Blast Mining.\n[[YELLOW]]The first part is Bigger Bombs, which increases blast radius.\n[[YELLOW]]The second is Demolitions Expert, which decreases damage\n[[YELLOW]]from TNT explosions. The third part simply increases the\n[[YELLOW]]amount of ores dropped from TNT and decreases the\n[[YELLOW]]debris dropped.
+Guides.Repair=Guide coming soon...
+Guides.Swords=Guide coming soon...
+Guides.Taming=Guide coming soon...
+Guides.Unarmed=Guide coming soon...
+Guides.Woodcutting=Guide coming soon...
--- a/src/main/resources/locale/locale_fr.properties
+++ b/src/main/resources/locale/locale_fr.properties
@@ -23,8 +23,6 @@ m.mccPartyTeleport=[party member name] [[RED]]- Vous t
 m.mccOtherCommands=[[GREEN]]--AUTRES COMMANDES--
 m.mccStats=- Voir vos statistiques
 m.mccLeaderboards=- Classements
-m.mccMySpawn=- Vous téléporte à votre spawn
-m.mccClearMySpawn=- Éfface votre point de spawn
 m.mccToggleAbility=- Active les capacités spéciales avec clic droit
 m.mccAdminToggle=- Active le chat admin
 m.mccInspect=[playername] [[RED]]- Voir les infos détaillées du joueur
@@ -201,7 +199,7 @@ m.EffectsExcavation1_0=Super broyeur (capacit
 m.EffectsExcavation1_1=3x Butin, 3x XP, +Vitesse
 m.EffectsExcavation2_0=Chercheur de trésors
 m.EffectsExcavation2_1=Capacité de trouver un trésor
-m.ExcavationGreenTerraLength=[[RED]]Durée de la capacité spéciale : [[YELLOW]]{0}s
+m.ExcavationGigaDrillBreakerLength=[[RED]]Durée de la capacité spéciale : [[YELLOW]]{0}s
 mcBlockListener.PlacedAnvil=[[DARK_RED]]Vous avez placé une enclume, Les enclumes peuvent réparer les outils et l'armure.
 mcEntityListener.WolfComesBack=[[DARK_GRAY]]Votre loup revient vers vous...
 mcPlayerListener.AbilitiesOff=Capacité spéciale désactivée
@@ -412,4 +410,27 @@ Skills.SkullSplitterPlayerOff=[[RED]]Skull Splitter[[GREEN]] has worn off for [[
 Skills.GigaDrillBreakerPlayerOff=[[RED]]Giga Drill Breaker[[GREEN]] has worn off for [[YELLOW]]{0}
 Skills.SerratedStrikesPlayerOff=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0}
 Skills.BlastMiningPlayer=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Blast Mining!
-Skills.YourBlastMining=[[GREEN]]Your [[YELLOW]]Blast Mining [[GREEN]]ability is refreshed!
+Skills.YourBlastMining=[[GREEN]]Your [[YELLOW]]Blast Mining [[GREEN]]ability is refreshed!
+TreeFeller.AxeSplinters=[[RED]]YOUR AXE SPLINTERS INTO DOZENS OF PIECES
+Acrobatics.GracefulRoll=[[GREEN]]**GRACEFUL ROLL**
+Acrobatics.Dodge=[[GREEN]]**DODGE**
+Acrobatics.Roll=**ROLL**
+Axes.HitCritically=[[DARK_RED]]You were CRITICALLY hit!
+Axes.CriticalHit=[[RED]]CRITIAL HIT!
+Axes.HitByCleave=[[DARK_RED]]Struck by CLEAVE!
+Swords.EnemyBleeding=[[GREEN]]**ENEMY BLEEDING**
+Swords.HitBySerratedStrikes=[[DARK_RED]]Struck by SERRATED STRIKES!
+Swords.CounterAttacked=[[GREEN]]**COUNTER-ATTACKED**
+Swords.HitByCounterAttack=[[DARK_RED]]Hit with a counter-attack!
+Guides.Acrobatics=[[DARK_AQUA]]About Acrobatics:\n[[YELLOW]]Acrobatics is the art of moving gracefully in mcMMO.\n[[YELLOW]]It provides combat bonuses and environment damage bonuses.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill you need to perform a dodge\n[[YELLOW]]in combat or survive falls from heights that damage you.\n\n[[DARK_AQUA]]How does Rolling work?\n[[YELLOW]]You have a passive chance when you take fall damage\n[[YELLOW]]to negate the damage done. You can hold the sneak button to\n[[YELLOW]]double your chances during the fall.\n[[YELLOW]]This triggers a Graceful Roll instead of a standard one.\n[[YELLOW]]Graceful Rolls are like regular rolls but are twice as likely to\n[[YELLOW]]occur and provide more damage safety than regular rolls.\n[[YELLOW]]Rolling chance is tied to your skill level\n[[DARK_AQUA]]How does Dodge work?\n[[YELLOW]]Dodge is a passive chance when you are\n[YELLOW]]injured in combat to halve the damage taken.\n[[YELLOW]]It is tied to your skill level.
+Guides.Archery=Guide coming soon...
+Guides.Axes=Guide coming soon...
+Guides.Excavation=[[DARK_AQUA]]About Excavation:\n[[YELLOW]]Excavation is the act of digging up dirt to find treasures.\n[[YELLOW]]By excavating the land you will find treasures.\n[[YELLOW]]The more you do this the more treasures you can find.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill you must dig with a shovel in hand.\n[[YELLOW]]Only certain materials can be dug up for treasures and XP.\n[[DARK_AQUA]]Compatible Materials:\n[[YELLOW]]Grass, Dirt, Sand, Clay, Gravel, Mycelium, Soul Sand\n\n[[DARK_AQUA]]How to use Giga Drill Breaker:\n[[YELLOW]]With a shovel in hand right click to ready your tool.\n[[YELLOW]]Once in this state you have about 4 seconds to make\n[[YELLOW]]contact with Excavation compatible materials this will\n[[YELLOW]]activate Giga Drill Breaker.\n[[DARK_AQUA]]What is Giga Drill Breaker?\n[[YELLOW]]Giga Drill Breaker is an ability with a cooldown\n[[YELLOW]]tied to Excavation skill. It triples your chance\n[[YELLOW]]of finding treasures and enables instant break\n[[YELLOW]]on Excavation materials.\n\n[[DARK_AQUA]]How does Treasure Hunter work?\n[[YELLOW]]Every possible treasure for Excavation has its own\n[[YELLOW]]skill level requirement for it to drop, as a result it's\n[[YELLOW]]difficult to say how much it is helping you.\n[[YELLOW]]Just keep in mind that the higher your Excavation skill\n[[YELLOW]]is, the more treasures that can be found.\n[[YELLOW]]And also keep in mind that each type of Excavation\n[[YELLOW]]compatible material has its own unique list of treasures.\n[[YELLOW]]In other words you will find different treasures in Dirt\n[[YELLOW]]than you would in Gravel.\n[[DARK_AQUA]]Notes about Excavation:\n[[YELLOW]]Excavation drops are completely customizeable\n[[YELLOW]]So results vary server to server.
+Guides.Fishing=Guide coming soon...
+Guides.Herbalism=Guide coming soon...
+Guides.Mining=[[DARK_AQUA]]About Mining:\n[[YELLOW]]Mining consists of mining stone and ores. It provides bonuses\n[[YELLOW]]to the amount of materials dropped while mining.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill, you must mine with a pickaxe in hand.\n[[YELLOW]]Only certain blocks award XP.\n\n[[DARK_AQUA]]Compatible Materials:\n[[YELLOW]]Stone, Coal Ore, Iron Ore, Gold Ore, Diamond Ore, Redstone Ore,\n[[YELLOW]]Lapis Ore, Obsidian, Mossy Cobblestone, Ender Stone,\n[[YELLOW]]Glowstone, and Netherrack.\n\n[[DARK_AQUA]]How to use Super Breaker:\n[[YELLOW]]With a pickaxe in your hand, right click to ready your tool.\n[[YELLOW]]Once in this state, you have about 4 seconds to make contact\n[[YELLOW]]with Mining compatible materials, which will activate Super\n[[YELLOW]]Breaker.\n\n[[DARK_AQUA]]What is Super Breaker?\n[[YELLOW]]Super Breaker is an ability with a cooldown tied to the Mining\n[[YELLOW]]skill. It triples your chance of extra items dropping and\n[[YELLOW]]enables instant break on Mining materials.\n\n[[DARK_AQUA]]How to use Blast Mining:\n[[YELLOW]]With a detonator in hand, which is a flint & steel by default,\n[[YELLOW]]right-click on TNT from a distance. This will cause the TNT\n[[YELLOW]]to instantly explode.\n\n[[DARK_AQUA]]How does Blast Mining work?\n[[YELLOW]]Blast Mining is an ability with a cooldown tied to the Mining\n[[YELLOW]]skill. It gives bonuses when mining with TNT and allows you\n[[YELLOW]]to remote detonate TNT. There are three parts to Blast Mining.\n[[YELLOW]]The first part is Bigger Bombs, which increases blast radius.\n[[YELLOW]]The second is Demolitions Expert, which decreases damage\n[[YELLOW]]from TNT explosions. The third part simply increases the\n[[YELLOW]]amount of ores dropped from TNT and decreases the\n[[YELLOW]]debris dropped.
+Guides.Repair=Guide coming soon...
+Guides.Swords=Guide coming soon...
+Guides.Taming=Guide coming soon...
+Guides.Unarmed=Guide coming soon...
+Guides.Woodcutting=Guide coming soon...
--- a/src/main/resources/locale/locale_nl.properties
+++ b/src/main/resources/locale/locale_nl.properties
@@ -29,8 +29,6 @@ m.mccPartyTeleport=[party member name] [[RED]]- Teleporteer naar je party medeli
 m.mccOtherCommands=[[GREEN]]--ANDERE COMMANDOS--
 m.mccStats=- Laat je levels zien
 m.mccLeaderboards=- Topscores
-m.mccMySpawn=- Teleporteer naar MySpawn
-m.mccClearMySpawn=- Verwijder je MySpawn
 m.mccToggleAbility=- Doe ability activatie aan/uit
 m.mccAdminToggle=- Doe admin chat aan/uit
 m.mccInspect=[playername] [[RED]]- Laat informatie zien over speler
@@ -207,7 +205,7 @@ m.EffectsExcavation1_0=Giga Drilboor (ABILITY)
 m.EffectsExcavation1_1=3x drop, 3x XP, hogere snelheid
 m.EffectsExcavation2_0=Schatzoeker
 m.EffectsExcavation2_1=Mogelijkheid om schatten te zoeken
-m.ExcavationGreenTerraLength=[[RED]]Giga Drilboor lengte: [[YELLOW]]{0}s
+m.ExcavationGigaDrillBreakerLength=[[RED]]Giga Drilboor lengte: [[YELLOW]]{0}s
 mcBlockListener.PlacedAnvil=[[DARK_RED]]Je hebt een aambeeld geplaatst. Hierop kun je tools en armor repareren.
 mcEntityListener.WolfComesBack=[[DARK_GRAY]]Je wolf dribbelt terug naar je...
 mcPlayerListener.AbilitiesOff=Ability activatie is uit
@@ -418,4 +416,27 @@ Skills.SkullSplitterPlayerOff=[[RED]]Skull Splitter[[GREEN]] has worn off for [[
 Skills.GigaDrillBreakerPlayerOff=[[RED]]Giga Drill Breaker[[GREEN]] has worn off for [[YELLOW]]{0}
 Skills.SerratedStrikesPlayerOff=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0}
 Skills.BlastMiningPlayer=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Blast Mining!
-Skills.YourBlastMining=[[GREEN]]Your [[YELLOW]]Blast Mining [[GREEN]]ability is refreshed!
+Skills.YourBlastMining=[[GREEN]]Your [[YELLOW]]Blast Mining [[GREEN]]ability is refreshed!
+TreeFeller.AxeSplinters=[[RED]]YOUR AXE SPLINTERS INTO DOZENS OF PIECES
+Acrobatics.GracefulRoll=[[GREEN]]**GRACEFUL ROLL**
+Acrobatics.Dodge=[[GREEN]]**DODGE**
+Acrobatics.Roll=**ROLL**
+Axes.HitCritically=[[DARK_RED]]You were CRITICALLY hit!
+Axes.CriticalHit=[[RED]]CRITIAL HIT!
+Axes.HitByCleave=[[DARK_RED]]Struck by CLEAVE!
+Swords.EnemyBleeding=[[GREEN]]**ENEMY BLEEDING**
+Swords.HitBySerratedStrikes=[[DARK_RED]]Struck by SERRATED STRIKES!
+Swords.CounterAttacked=[[GREEN]]**COUNTER-ATTACKED**
+Swords.HitByCounterAttack=[[DARK_RED]]Hit with a counter-attack!
+Guides.Acrobatics=[[DARK_AQUA]]About Acrobatics:\n[[YELLOW]]Acrobatics is the art of moving gracefully in mcMMO.\n[[YELLOW]]It provides combat bonuses and environment damage bonuses.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill you need to perform a dodge\n[[YELLOW]]in combat or survive falls from heights that damage you.\n\n[[DARK_AQUA]]How does Rolling work?\n[[YELLOW]]You have a passive chance when you take fall damage\n[[YELLOW]]to negate the damage done. You can hold the sneak button to\n[[YELLOW]]double your chances during the fall.\n[[YELLOW]]This triggers a Graceful Roll instead of a standard one.\n[[YELLOW]]Graceful Rolls are like regular rolls but are twice as likely to\n[[YELLOW]]occur and provide more damage safety than regular rolls.\n[[YELLOW]]Rolling chance is tied to your skill level\n[[DARK_AQUA]]How does Dodge work?\n[[YELLOW]]Dodge is a passive chance when you are\n[YELLOW]]injured in combat to halve the damage taken.\n[[YELLOW]]It is tied to your skill level.
+Guides.Archery=Guide coming soon...
+Guides.Axes=Guide coming soon...
+Guides.Excavation=[[DARK_AQUA]]About Excavation:\n[[YELLOW]]Excavation is the act of digging up dirt to find treasures.\n[[YELLOW]]By excavating the land you will find treasures.\n[[YELLOW]]The more you do this the more treasures you can find.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill you must dig with a shovel in hand.\n[[YELLOW]]Only certain materials can be dug up for treasures and XP.\n[[DARK_AQUA]]Compatible Materials:\n[[YELLOW]]Grass, Dirt, Sand, Clay, Gravel, Mycelium, Soul Sand\n\n[[DARK_AQUA]]How to use Giga Drill Breaker:\n[[YELLOW]]With a shovel in hand right click to ready your tool.\n[[YELLOW]]Once in this state you have about 4 seconds to make\n[[YELLOW]]contact with Excavation compatible materials this will\n[[YELLOW]]activate Giga Drill Breaker.\n[[DARK_AQUA]]What is Giga Drill Breaker?\n[[YELLOW]]Giga Drill Breaker is an ability with a cooldown\n[[YELLOW]]tied to Excavation skill. It triples your chance\n[[YELLOW]]of finding treasures and enables instant break\n[[YELLOW]]on Excavation materials.\n\n[[DARK_AQUA]]How does Treasure Hunter work?\n[[YELLOW]]Every possible treasure for Excavation has its own\n[[YELLOW]]skill level requirement for it to drop, as a result it's\n[[YELLOW]]difficult to say how much it is helping you.\n[[YELLOW]]Just keep in mind that the higher your Excavation skill\n[[YELLOW]]is, the more treasures that can be found.\n[[YELLOW]]And also keep in mind that each type of Excavation\n[[YELLOW]]compatible material has its own unique list of treasures.\n[[YELLOW]]In other words you will find different treasures in Dirt\n[[YELLOW]]than you would in Gravel.\n[[DARK_AQUA]]Notes about Excavation:\n[[YELLOW]]Excavation drops are completely customizeable\n[[YELLOW]]So results vary server to server.
+Guides.Fishing=Guide coming soon...
+Guides.Herbalism=Guide coming soon...
+Guides.Mining=[[DARK_AQUA]]About Mining:\n[[YELLOW]]Mining consists of mining stone and ores. It provides bonuses\n[[YELLOW]]to the amount of materials dropped while mining.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill, you must mine with a pickaxe in hand.\n[[YELLOW]]Only certain blocks award XP.\n\n[[DARK_AQUA]]Compatible Materials:\n[[YELLOW]]Stone, Coal Ore, Iron Ore, Gold Ore, Diamond Ore, Redstone Ore,\n[[YELLOW]]Lapis Ore, Obsidian, Mossy Cobblestone, Ender Stone,\n[[YELLOW]]Glowstone, and Netherrack.\n\n[[DARK_AQUA]]How to use Super Breaker:\n[[YELLOW]]With a pickaxe in your hand, right click to ready your tool.\n[[YELLOW]]Once in this state, you have about 4 seconds to make contact\n[[YELLOW]]with Mining compatible materials, which will activate Super\n[[YELLOW]]Breaker.\n\n[[DARK_AQUA]]What is Super Breaker?\n[[YELLOW]]Super Breaker is an ability with a cooldown tied to the Mining\n[[YELLOW]]skill. It triples your chance of extra items dropping and\n[[YELLOW]]enables instant break on Mining materials.\n\n[[DARK_AQUA]]How to use Blast Mining:\n[[YELLOW]]With a detonator in hand, which is a flint & steel by default,\n[[YELLOW]]right-click on TNT from a distance. This will cause the TNT\n[[YELLOW]]to instantly explode.\n\n[[DARK_AQUA]]How does Blast Mining work?\n[[YELLOW]]Blast Mining is an ability with a cooldown tied to the Mining\n[[YELLOW]]skill. It gives bonuses when mining with TNT and allows you\n[[YELLOW]]to remote detonate TNT. There are three parts to Blast Mining.\n[[YELLOW]]The first part is Bigger Bombs, which increases blast radius.\n[[YELLOW]]The second is Demolitions Expert, which decreases damage\n[[YELLOW]]from TNT explosions. The third part simply increases the\n[[YELLOW]]amount of ores dropped from TNT and decreases the\n[[YELLOW]]debris dropped.
+Guides.Repair=Guide coming soon...
+Guides.Swords=Guide coming soon...
+Guides.Taming=Guide coming soon...
+Guides.Unarmed=Guide coming soon...
+Guides.Woodcutting=Guide coming soon...
--- a/src/main/resources/locale/locale_pl.properties
+++ b/src/main/resources/locale/locale_pl.properties
@@ -23,8 +23,6 @@ m.mccPartyTeleport=[imie czlonka druzyny] [[RED]]- Teleportuje cie do czlonka dr
 m.mccOtherCommands=[[GREEN]]--INNE KOMENDY--
 m.mccStats=- Pokazuje twoje statystyki.
 m.mccLeaderboards=- Pokazuje najlepszych graczy.
-m.mccMySpawn=- Teleportuje do twojego spawna.
-m.mccClearMySpawn=- Kasuje twoj spawn i zmienia na domyslny.
 m.mccToggleAbility=- Wlacza specjalna umiejetnosc prawym przyciskiem myszy.
 m.mccAdminToggle=- Wlacza chat adminow.
 m.mccInspect=[nazwa gracza] [[RED]]- Zobacz szczegolowe informacje o graczu.
@@ -201,7 +199,7 @@ m.EffectsExcavation1_0=Super Szybka Saperka (UMIEJETNOSC)
 m.EffectsExcavation1_1=Zwiekszona szybkosc kopania i trzykrotnie wiekszy urobek i zdobyte doswiadczenie.
 m.EffectsExcavation2_0=Lowca Skarbow
 m.EffectsExcavation2_1=Umiejetnosc znajdywania skarbow
-m.ExcavationGreenTerraLength=[[RED]]Czas trwania Super Szybkiej Saperki: [[YELLOW]]{0} sekund.
+m.ExcavationGigaDrillBreakerLength=[[RED]]Czas trwania Super Szybkiej Saperki: [[YELLOW]]{0} sekund.
 mcBlockListener.PlacedAnvil=[[DARK_RED]]Polozyles kowadlo, ktore pozwala na naprawe przedmiotow.
 mcEntityListener.WolfComesBack=[[DARK_GRAY]]Twoj wilk przybiega z powrotem.
 mcPlayerListener.AbilitiesOff=Uzywanie umiejetnosci wylaczone
@@ -412,4 +410,27 @@ Skills.SkullSplitterPlayerOff=[[RED]]Skull Splitter[[GREEN]] has worn off for [[
 Skills.GigaDrillBreakerPlayerOff=[[RED]]Giga Drill Breaker[[GREEN]] has worn off for [[YELLOW]]{0}
 Skills.SerratedStrikesPlayerOff=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0}
 Skills.BlastMiningPlayer=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Blast Mining!
-Skills.YourBlastMining=[[GREEN]]Your [[YELLOW]]Blast Mining [[GREEN]]ability is refreshed!
+Skills.YourBlastMining=[[GREEN]]Your [[YELLOW]]Blast Mining [[GREEN]]ability is refreshed!
+TreeFeller.AxeSplinters=[[RED]]YOUR AXE SPLINTERS INTO DOZENS OF PIECES
+Acrobatics.GracefulRoll=[[GREEN]]**GRACEFUL ROLL**
+Acrobatics.Dodge=[[GREEN]]**DODGE**
+Acrobatics.Roll=**ROLL**
+Axes.HitCritically=[[DARK_RED]]You were CRITICALLY hit!
+Axes.CriticalHit=[[RED]]CRITIAL HIT!
+Axes.HitByCleave=[[DARK_RED]]Struck by CLEAVE!
+Swords.EnemyBleeding=[[GREEN]]**ENEMY BLEEDING**
+Swords.HitBySerratedStrikes=[[DARK_RED]]Struck by SERRATED STRIKES!
+Swords.CounterAttacked=[[GREEN]]**COUNTER-ATTACKED**
+Swords.HitByCounterAttack=[[DARK_RED]]Hit with a counter-attack!
+Guides.Acrobatics=[[DARK_AQUA]]About Acrobatics:\n[[YELLOW]]Acrobatics is the art of moving gracefully in mcMMO.\n[[YELLOW]]It provides combat bonuses and environment damage bonuses.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill you need to perform a dodge\n[[YELLOW]]in combat or survive falls from heights that damage you.\n\n[[DARK_AQUA]]How does Rolling work?\n[[YELLOW]]You have a passive chance when you take fall damage\n[[YELLOW]]to negate the damage done. You can hold the sneak button to\n[[YELLOW]]double your chances during the fall.\n[[YELLOW]]This triggers a Graceful Roll instead of a standard one.\n[[YELLOW]]Graceful Rolls are like regular rolls but are twice as likely to\n[[YELLOW]]occur and provide more damage safety than regular rolls.\n[[YELLOW]]Rolling chance is tied to your skill level\n[[DARK_AQUA]]How does Dodge work?\n[[YELLOW]]Dodge is a passive chance when you are\n[YELLOW]]injured in combat to halve the damage taken.\n[[YELLOW]]It is tied to your skill level.
+Guides.Archery=Guide coming soon...
+Guides.Axes=Guide coming soon...
+Guides.Excavation=[[DARK_AQUA]]About Excavation:\n[[YELLOW]]Excavation is the act of digging up dirt to find treasures.\n[[YELLOW]]By excavating the land you will find treasures.\n[[YELLOW]]The more you do this the more treasures you can find.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill you must dig with a shovel in hand.\n[[YELLOW]]Only certain materials can be dug up for treasures and XP.\n[[DARK_AQUA]]Compatible Materials:\n[[YELLOW]]Grass, Dirt, Sand, Clay, Gravel, Mycelium, Soul Sand\n\n[[DARK_AQUA]]How to use Giga Drill Breaker:\n[[YELLOW]]With a shovel in hand right click to ready your tool.\n[[YELLOW]]Once in this state you have about 4 seconds to make\n[[YELLOW]]contact with Excavation compatible materials this will\n[[YELLOW]]activate Giga Drill Breaker.\n[[DARK_AQUA]]What is Giga Drill Breaker?\n[[YELLOW]]Giga Drill Breaker is an ability with a cooldown\n[[YELLOW]]tied to Excavation skill. It triples your chance\n[[YELLOW]]of finding treasures and enables instant break\n[[YELLOW]]on Excavation materials.\n\n[[DARK_AQUA]]How does Treasure Hunter work?\n[[YELLOW]]Every possible treasure for Excavation has its own\n[[YELLOW]]skill level requirement for it to drop, as a result it's\n[[YELLOW]]difficult to say how much it is helping you.\n[[YELLOW]]Just keep in mind that the higher your Excavation skill\n[[YELLOW]]is, the more treasures that can be found.\n[[YELLOW]]And also keep in mind that each type of Excavation\n[[YELLOW]]compatible material has its own unique list of treasures.\n[[YELLOW]]In other words you will find different treasures in Dirt\n[[YELLOW]]than you would in Gravel.\n[[DARK_AQUA]]Notes about Excavation:\n[[YELLOW]]Excavation drops are completely customizeable\n[[YELLOW]]So results vary server to server.
+Guides.Fishing=Guide coming soon...
+Guides.Herbalism=Guide coming soon...
+Guides.Mining=[[DARK_AQUA]]About Mining:\n[[YELLOW]]Mining consists of mining stone and ores. It provides bonuses\n[[YELLOW]]to the amount of materials dropped while mining.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill, you must mine with a pickaxe in hand.\n[[YELLOW]]Only certain blocks award XP.\n\n[[DARK_AQUA]]Compatible Materials:\n[[YELLOW]]Stone, Coal Ore, Iron Ore, Gold Ore, Diamond Ore, Redstone Ore,\n[[YELLOW]]Lapis Ore, Obsidian, Mossy Cobblestone, Ender Stone,\n[[YELLOW]]Glowstone, and Netherrack.\n\n[[DARK_AQUA]]How to use Super Breaker:\n[[YELLOW]]With a pickaxe in your hand, right click to ready your tool.\n[[YELLOW]]Once in this state, you have about 4 seconds to make contact\n[[YELLOW]]with Mining compatible materials, which will activate Super\n[[YELLOW]]Breaker.\n\n[[DARK_AQUA]]What is Super Breaker?\n[[YELLOW]]Super Breaker is an ability with a cooldown tied to the Mining\n[[YELLOW]]skill. It triples your chance of extra items dropping and\n[[YELLOW]]enables instant break on Mining materials.\n\n[[DARK_AQUA]]How to use Blast Mining:\n[[YELLOW]]With a detonator in hand, which is a flint & steel by default,\n[[YELLOW]]right-click on TNT from a distance. This will cause the TNT\n[[YELLOW]]to instantly explode.\n\n[[DARK_AQUA]]How does Blast Mining work?\n[[YELLOW]]Blast Mining is an ability with a cooldown tied to the Mining\n[[YELLOW]]skill. It gives bonuses when mining with TNT and allows you\n[[YELLOW]]to remote detonate TNT. There are three parts to Blast Mining.\n[[YELLOW]]The first part is Bigger Bombs, which increases blast radius.\n[[YELLOW]]The second is Demolitions Expert, which decreases damage\n[[YELLOW]]from TNT explosions. The third part simply increases the\n[[YELLOW]]amount of ores dropped from TNT and decreases the\n[[YELLOW]]debris dropped.
+Guides.Repair=Guide coming soon...
+Guides.Swords=Guide coming soon...
+Guides.Taming=Guide coming soon...
+Guides.Unarmed=Guide coming soon...
+Guides.Woodcutting=Guide coming soon...
--- a/src/main/resources/locale/locale_pt_br.properties
+++ b/src/main/resources/locale/locale_pt_br.properties
@@ -23,8 +23,6 @@ m.mccPartyTeleport=[party member name] [[RED]]- Teleportar para um membro de equ
 m.mccOtherCommands=[[GREEN]]--OUTROS COMANDOS--
 m.mccStats=- Ver seus status
 m.mccLeaderboards=- Classificaçao
-m.mccMySpawn=- Teleportar para o spawn
-m.mccClearMySpawn=- Remove o Ponto de Spawn
 m.mccToggleAbility=- Ativa habilidades especiais com botao direito
 m.mccAdminToggle=- Ativa o chat dos admin
 m.mccInspect=[playername] [[RED]]- Ver informaçoes do jogador
@@ -207,7 +205,7 @@ m.EffectsExcavation1_0=Super Broca (HABILIDADE ESPECIAL)
 m.EffectsExcavation1_1=Drop x3, EXP x3, mais velocidade
 m.EffectsExcavation2_0=Caçad/or de Tesouros
 m.EffectsExcavation2_1=Encontra itens raros enquanto cava
-m.ExcavationGreenTerraLength=[[RED]]Duraçao da Super Broca: [[YELLOW]]{0}s
+m.ExcavationGigaDrillBreakerLength=[[RED]]Duraçao da Super Broca: [[YELLOW]]{0}s
 mcBlockListener.PlacedAnvil=[[DARK_RED]] Você colocou uma bigorna, a bigorna pode reparar ferramentas e armaduras.
 mcEntityListener.WolfComesBack=[[DARK_GRAY]]Seu lobo voltou para você...
 mcPlayerListener.AbilitiesOff=Habilidade especial desabilitada
@@ -419,4 +417,27 @@ Skills.SkullSplitterPlayerOff=[[RED]]Skull Splitter[[GREEN]] has worn off for [[
 Skills.GigaDrillBreakerPlayerOff=[[RED]]Giga Drill Breaker[[GREEN]] has worn off for [[YELLOW]]{0}
 Skills.SerratedStrikesPlayerOff=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0}
 Skills.BlastMiningPlayer=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Blast Mining!
-Skills.YourBlastMining=[[GREEN]]Your [[YELLOW]]Blast Mining [[GREEN]]ability is refreshed!
+Skills.YourBlastMining=[[GREEN]]Your [[YELLOW]]Blast Mining [[GREEN]]ability is refreshed!
+TreeFeller.AxeSplinters=[[RED]]YOUR AXE SPLINTERS INTO DOZENS OF PIECES
+Acrobatics.GracefulRoll=[[GREEN]]**GRACEFUL ROLL**
+Acrobatics.Dodge=[[GREEN]]**DODGE**
+Acrobatics.Roll=**ROLL**
+Axes.HitCritically=[[DARK_RED]]You were CRITICALLY hit!
+Axes.CriticalHit=[[RED]]CRITIAL HIT!
+Axes.HitByCleave=[[DARK_RED]]Struck by CLEAVE!
+Swords.EnemyBleeding=[[GREEN]]**ENEMY BLEEDING**
+Swords.HitBySerratedStrikes=[[DARK_RED]]Struck by SERRATED STRIKES!
+Swords.CounterAttacked=[[GREEN]]**COUNTER-ATTACKED**
+Swords.HitByCounterAttack=[[DARK_RED]]Hit with a counter-attack!
+Guides.Acrobatics=[[DARK_AQUA]]About Acrobatics:\n[[YELLOW]]Acrobatics is the art of moving gracefully in mcMMO.\n[[YELLOW]]It provides combat bonuses and environment damage bonuses.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill you need to perform a dodge\n[[YELLOW]]in combat or survive falls from heights that damage you.\n\n[[DARK_AQUA]]How does Rolling work?\n[[YELLOW]]You have a passive chance when you take fall damage\n[[YELLOW]]to negate the damage done. You can hold the sneak button to\n[[YELLOW]]double your chances during the fall.\n[[YELLOW]]This triggers a Graceful Roll instead of a standard one.\n[[YELLOW]]Graceful Rolls are like regular rolls but are twice as likely to\n[[YELLOW]]occur and provide more damage safety than regular rolls.\n[[YELLOW]]Rolling chance is tied to your skill level\n[[DARK_AQUA]]How does Dodge work?\n[[YELLOW]]Dodge is a passive chance when you are\n[YELLOW]]injured in combat to halve the damage taken.\n[[YELLOW]]It is tied to your skill level.
+Guides.Archery=Guide coming soon...
+Guides.Axes=Guide coming soon...
+Guides.Excavation=[[DARK_AQUA]]About Excavation:\n[[YELLOW]]Excavation is the act of digging up dirt to find treasures.\n[[YELLOW]]By excavating the land you will find treasures.\n[[YELLOW]]The more you do this the more treasures you can find.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill you must dig with a shovel in hand.\n[[YELLOW]]Only certain materials can be dug up for treasures and XP.\n[[DARK_AQUA]]Compatible Materials:\n[[YELLOW]]Grass, Dirt, Sand, Clay, Gravel, Mycelium, Soul Sand\n\n[[DARK_AQUA]]How to use Giga Drill Breaker:\n[[YELLOW]]With a shovel in hand right click to ready your tool.\n[[YELLOW]]Once in this state you have about 4 seconds to make\n[[YELLOW]]contact with Excavation compatible materials this will\n[[YELLOW]]activate Giga Drill Breaker.\n[[DARK_AQUA]]What is Giga Drill Breaker?\n[[YELLOW]]Giga Drill Breaker is an ability with a cooldown\n[[YELLOW]]tied to Excavation skill. It triples your chance\n[[YELLOW]]of finding treasures and enables instant break\n[[YELLOW]]on Excavation materials.\n\n[[DARK_AQUA]]How does Treasure Hunter work?\n[[YELLOW]]Every possible treasure for Excavation has its own\n[[YELLOW]]skill level requirement for it to drop, as a result it's\n[[YELLOW]]difficult to say how much it is helping you.\n[[YELLOW]]Just keep in mind that the higher your Excavation skill\n[[YELLOW]]is, the more treasures that can be found.\n[[YELLOW]]And also keep in mind that each type of Excavation\n[[YELLOW]]compatible material has its own unique list of treasures.\n[[YELLOW]]In other words you will find different treasures in Dirt\n[[YELLOW]]than you would in Gravel.\n[[DARK_AQUA]]Notes about Excavation:\n[[YELLOW]]Excavation drops are completely customizeable\n[[YELLOW]]So results vary server to server.
+Guides.Fishing=Guide coming soon...
+Guides.Herbalism=Guide coming soon...
+Guides.Mining=[[DARK_AQUA]]About Mining:\n[[YELLOW]]Mining consists of mining stone and ores. It provides bonuses\n[[YELLOW]]to the amount of materials dropped while mining.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill, you must mine with a pickaxe in hand.\n[[YELLOW]]Only certain blocks award XP.\n\n[[DARK_AQUA]]Compatible Materials:\n[[YELLOW]]Stone, Coal Ore, Iron Ore, Gold Ore, Diamond Ore, Redstone Ore,\n[[YELLOW]]Lapis Ore, Obsidian, Mossy Cobblestone, Ender Stone,\n[[YELLOW]]Glowstone, and Netherrack.\n\n[[DARK_AQUA]]How to use Super Breaker:\n[[YELLOW]]With a pickaxe in your hand, right click to ready your tool.\n[[YELLOW]]Once in this state, you have about 4 seconds to make contact\n[[YELLOW]]with Mining compatible materials, which will activate Super\n[[YELLOW]]Breaker.\n\n[[DARK_AQUA]]What is Super Breaker?\n[[YELLOW]]Super Breaker is an ability with a cooldown tied to the Mining\n[[YELLOW]]skill. It triples your chance of extra items dropping and\n[[YELLOW]]enables instant break on Mining materials.\n\n[[DARK_AQUA]]How to use Blast Mining:\n[[YELLOW]]With a detonator in hand, which is a flint & steel by default,\n[[YELLOW]]right-click on TNT from a distance. This will cause the TNT\n[[YELLOW]]to instantly explode.\n\n[[DARK_AQUA]]How does Blast Mining work?\n[[YELLOW]]Blast Mining is an ability with a cooldown tied to the Mining\n[[YELLOW]]skill. It gives bonuses when mining with TNT and allows you\n[[YELLOW]]to remote detonate TNT. There are three parts to Blast Mining.\n[[YELLOW]]The first part is Bigger Bombs, which increases blast radius.\n[[YELLOW]]The second is Demolitions Expert, which decreases damage\n[[YELLOW]]from TNT explosions. The third part simply increases the\n[[YELLOW]]amount of ores dropped from TNT and decreases the\n[[YELLOW]]debris dropped.
+Guides.Repair=Guide coming soon...
+Guides.Swords=Guide coming soon...
+Guides.Taming=Guide coming soon...
+Guides.Unarmed=Guide coming soon...
+Guides.Woodcutting=Guide coming soon...
--- a/src/main/resources/locale/locale_ru.properties
+++ b/src/main/resources/locale/locale_ru.properties
@@ -24,8 +24,6 @@ m.mccPartyTeleport=[party member name] [[RED]]-
 m.mccOtherCommands=[[GREEN]]--Другие команды--
 m.mccStats=- Посмотреть ваши McMMo характеристики
 m.mccLeaderboards=- Доска Лидеров
-m.mccMySpawn=- Телепортирует к вашей кровати
-m.mccClearMySpawn=- Убирает вашу кровать
 m.mccToggleAbility=- Активировать возможность правым кликом мыши
 m.mccAdminToggle=- Включить админский чат
 m.mccInspect=[playername] [[RED]]- Посмотреть детальную информацию
@@ -202,7 +200,7 @@ m.EffectsExcavation1_0=
 m.EffectsExcavation1_1=3-ой дроп, 3-ой опыт, Увеличение скорости
 m.EffectsExcavation2_0=Охотник за сокровищами
 m.EffectsExcavation2_1=Способность копать сокровища
-m.ExcavationGreenTerraLength=[[RED]]Продолжительность "Мега дрели": [[YELLOW]]{0}s
+m.ExcavationGigaDrillBreakerLength=[[RED]]Продолжительность "Мега дрели": [[YELLOW]]{0}s
 mcBlockListener.PlacedAnvil=[[DARK_RED]]Вы разместили наковальни и теперь можете чинить вещи.
 mcEntityListener.WolfComesBack=[[DARK_GRAY]]Ваш волк хочет вернуться к вам
 mcPlayerListener.AbilitiesOff=Использование способностей выключено
@@ -404,4 +402,27 @@ Skills.SkullSplitterPlayerOff=[[RED]]Skull Splitter[[GREEN]] has worn off for [[
 Skills.GigaDrillBreakerPlayerOff=[[RED]]Giga Drill Breaker[[GREEN]] has worn off for [[YELLOW]]{0}
 Skills.SerratedStrikesPlayerOff=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0}
 Skills.BlastMiningPlayer=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Blast Mining!
-Skills.YourBlastMining=[[GREEN]]Your [[YELLOW]]Blast Mining [[GREEN]]ability is refreshed!
+Skills.YourBlastMining=[[GREEN]]Your [[YELLOW]]Blast Mining [[GREEN]]ability is refreshed!
+TreeFeller.AxeSplinters=[[RED]]YOUR AXE SPLINTERS INTO DOZENS OF PIECES
+Acrobatics.GracefulRoll=[[GREEN]]**GRACEFUL ROLL**
+Acrobatics.Dodge=[[GREEN]]**DODGE**
+Acrobatics.Roll=**ROLL**
+Axes.HitCritically=[[DARK_RED]]You were CRITICALLY hit!
+Axes.CriticalHit=[[RED]]CRITIAL HIT!
+Axes.HitByCleave=[[DARK_RED]]Struck by CLEAVE!
+Swords.EnemyBleeding=[[GREEN]]**ENEMY BLEEDING**
+Swords.HitBySerratedStrikes=[[DARK_RED]]Struck by SERRATED STRIKES!
+Swords.CounterAttacked=[[GREEN]]**COUNTER-ATTACKED**
+Swords.HitByCounterAttack=[[DARK_RED]]Hit with a counter-attack!
+Guides.Acrobatics=[[DARK_AQUA]]About Acrobatics:\n[[YELLOW]]Acrobatics is the art of moving gracefully in mcMMO.\n[[YELLOW]]It provides combat bonuses and environment damage bonuses.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill you need to perform a dodge\n[[YELLOW]]in combat or survive falls from heights that damage you.\n\n[[DARK_AQUA]]How does Rolling work?\n[[YELLOW]]You have a passive chance when you take fall damage\n[[YELLOW]]to negate the damage done. You can hold the sneak button to\n[[YELLOW]]double your chances during the fall.\n[[YELLOW]]This triggers a Graceful Roll instead of a standard one.\n[[YELLOW]]Graceful Rolls are like regular rolls but are twice as likely to\n[[YELLOW]]occur and provide more damage safety than regular rolls.\n[[YELLOW]]Rolling chance is tied to your skill level\n[[DARK_AQUA]]How does Dodge work?\n[[YELLOW]]Dodge is a passive chance when you are\n[YELLOW]]injured in combat to halve the damage taken.\n[[YELLOW]]It is tied to your skill level.
+Guides.Archery=Guide coming soon...
+Guides.Axes=Guide coming soon...
+Guides.Excavation=[[DARK_AQUA]]About Excavation:\n[[YELLOW]]Excavation is the act of digging up dirt to find treasures.\n[[YELLOW]]By excavating the land you will find treasures.\n[[YELLOW]]The more you do this the more treasures you can find.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill you must dig with a shovel in hand.\n[[YELLOW]]Only certain materials can be dug up for treasures and XP.\n[[DARK_AQUA]]Compatible Materials:\n[[YELLOW]]Grass, Dirt, Sand, Clay, Gravel, Mycelium, Soul Sand\n\n[[DARK_AQUA]]How to use Giga Drill Breaker:\n[[YELLOW]]With a shovel in hand right click to ready your tool.\n[[YELLOW]]Once in this state you have about 4 seconds to make\n[[YELLOW]]contact with Excavation compatible materials this will\n[[YELLOW]]activate Giga Drill Breaker.\n[[DARK_AQUA]]What is Giga Drill Breaker?\n[[YELLOW]]Giga Drill Breaker is an ability with a cooldown\n[[YELLOW]]tied to Excavation skill. It triples your chance\n[[YELLOW]]of finding treasures and enables instant break\n[[YELLOW]]on Excavation materials.\n\n[[DARK_AQUA]]How does Treasure Hunter work?\n[[YELLOW]]Every possible treasure for Excavation has its own\n[[YELLOW]]skill level requirement for it to drop, as a result it's\n[[YELLOW]]difficult to say how much it is helping you.\n[[YELLOW]]Just keep in mind that the higher your Excavation skill\n[[YELLOW]]is, the more treasures that can be found.\n[[YELLOW]]And also keep in mind that each type of Excavation\n[[YELLOW]]compatible material has its own unique list of treasures.\n[[YELLOW]]In other words you will find different treasures in Dirt\n[[YELLOW]]than you would in Gravel.\n[[DARK_AQUA]]Notes about Excavation:\n[[YELLOW]]Excavation drops are completely customizeable\n[[YELLOW]]So results vary server to server.
+Guides.Fishing=Guide coming soon...
+Guides.Herbalism=Guide coming soon...
+Guides.Mining=[[DARK_AQUA]]About Mining:\n[[YELLOW]]Mining consists of mining stone and ores. It provides bonuses\n[[YELLOW]]to the amount of materials dropped while mining.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill, you must mine with a pickaxe in hand.\n[[YELLOW]]Only certain blocks award XP.\n\n[[DARK_AQUA]]Compatible Materials:\n[[YELLOW]]Stone, Coal Ore, Iron Ore, Gold Ore, Diamond Ore, Redstone Ore,\n[[YELLOW]]Lapis Ore, Obsidian, Mossy Cobblestone, Ender Stone,\n[[YELLOW]]Glowstone, and Netherrack.\n\n[[DARK_AQUA]]How to use Super Breaker:\n[[YELLOW]]With a pickaxe in your hand, right click to ready your tool.\n[[YELLOW]]Once in this state, you have about 4 seconds to make contact\n[[YELLOW]]with Mining compatible materials, which will activate Super\n[[YELLOW]]Breaker.\n\n[[DARK_AQUA]]What is Super Breaker?\n[[YELLOW]]Super Breaker is an ability with a cooldown tied to the Mining\n[[YELLOW]]skill. It triples your chance of extra items dropping and\n[[YELLOW]]enables instant break on Mining materials.\n\n[[DARK_AQUA]]How to use Blast Mining:\n[[YELLOW]]With a detonator in hand, which is a flint & steel by default,\n[[YELLOW]]right-click on TNT from a distance. This will cause the TNT\n[[YELLOW]]to instantly explode.\n\n[[DARK_AQUA]]How does Blast Mining work?\n[[YELLOW]]Blast Mining is an ability with a cooldown tied to the Mining\n[[YELLOW]]skill. It gives bonuses when mining with TNT and allows you\n[[YELLOW]]to remote detonate TNT. There are three parts to Blast Mining.\n[[YELLOW]]The first part is Bigger Bombs, which increases blast radius.\n[[YELLOW]]The second is Demolitions Expert, which decreases damage\n[[YELLOW]]from TNT explosions. The third part simply increases the\n[[YELLOW]]amount of ores dropped from TNT and decreases the\n[[YELLOW]]debris dropped.
+Guides.Repair=Guide coming soon...
+Guides.Swords=Guide coming soon...
+Guides.Taming=Guide coming soon...
+Guides.Unarmed=Guide coming soon...
+Guides.Woodcutting=Guide coming soon...
Author	SHA1	Message	Date
nossr50	16451550b5	Updating other locale files.	2012-03-03 23:45:39 -08:00
nossr50	c2dc28c2bd	Fixing Mining	2012-03-03 23:44:40 -08:00
GJ	c48ac9f596	Mining guide done. We probably need to clean all these up a bit more later...	2012-03-04 02:41:14 -05:00
nossr50	dfba78a4cb	Tweaked changelog	2012-03-03 21:42:28 -08:00
nossr50	a9eed7c31c	Replaced unwritten guides with coming soon msg.	2012-03-03 21:36:58 -08:00
nossr50	a9a7719096	Another linebreak for Acrobatics.	2012-03-03 15:24:54 -08:00
nossr50	5038fbadb0	Acrobatics done.	2012-03-03 15:21:39 -08:00
nossr50	a85ca2c984	All thats left is to fill in the locale with information	2012-03-03 13:29:39 -08:00
nossr50	e6e7f10a05	Inform players when they type /skillname that there is a guide	2012-03-03 13:05:52 -08:00
nossr50	212f6ee773	Now you don't need to specify a page number.	2012-03-03 13:04:12 -08:00
nossr50	53d38cc54c	Changed some wording for Excavation ?	2012-03-03 13:02:11 -08:00
nossr50	a53c8d5c64	Completed Excavation ?	2012-03-03 12:58:16 -08:00
nossr50	94a02c9a2e	Manual merging commence... Merge branch 'master' of github.com:mcMMO-Dev/mcMMO Conflicts: src/main/resources/locale/locale_en_us.properties	2012-03-03 12:45:57 -08:00
nossr50	07699fa651	Excavation ? WIP	2012-03-03 12:43:50 -08:00
GJ	0aaf02f208	LOCALE ALL THE THINGS!	2012-03-03 14:48:40 -05:00
GJ	0dd9bc1cda	Cleaned out more traces of old event system.	2012-03-03 14:13:33 -05:00
nossr50	ccfce843be	Updated changelog. for loops > while loops	2012-03-03 10:39:18 -08:00
GJ	cb3bc755a6	Remove MySpawn info from locale files.	2012-03-03 13:35:01 -05:00
GJ	719081a77e	Removed some unneeded imports.	2012-03-03 13:30:08 -05:00
nossr50	d1c4efa30d	Finalized page system. Moved grabbing pages to Page.java.	2012-03-03 10:24:47 -08:00
nossr50	12fbaa4361	Wip of Skill Help pages, code is ugly but it works.	2012-03-03 09:54:16 -08:00
nossr50	abcd586daa	Merge pull request #190 from bm01/master Taming prevent damage fix	2012-03-03 07:08:16 -08:00
bm01	2f0a3eaadd	Taming prevent damage fix	2012-03-03 15:15:30 +01:00
GJ	1814d52680	Starting work on skill help pages. (Excavation)	2012-03-03 01:22:52 -05:00
nossr50	d3ed6bb139	break; break; break;	2012-03-02 17:34:15 -08:00
GJ	8eaa58040e	Fixed ShakeMob ability not working.	2012-03-02 20:04:15 -05:00
nossr50	04e2a212d1	Silly git	2012-03-02 16:55:54 -08:00
nossr50	fe7ca65f22	dealDamage() will now send fake EntityDamageEvent which mcMMO will ignore	2012-03-02 16:53:35 -08:00
nossr50	89ab87b6dd	Fixed Greater Impact not dealing damage, nerf'd Axes critical chance.	2012-03-02 16:46:38 -08:00
nossr50	e933fbe1bd	Removing debug message	2012-03-02 16:36:31 -08:00
nossr50	cb9a9282dd	Moving the FakeEntityDamageByEntity event to the top of the listener	2012-03-02 16:34:35 -08:00
nossr50	14f1a91eeb	Fixed PVE experience gains not leveling up skills	2012-03-02 16:24:28 -08:00
nossr50	1756031eda	Changed pom ver # to 1.3.02 removed ocelots from Taming xp gain	2012-03-02 15:58:40 -08:00
nossr50	bccb321ce1	Fixing isInvincible() thanks bm01!	2012-03-02 15:52:33 -08:00
nossr50	920f091a85	Merge branch 'master' of github.com:mcMMO-Dev/mcMMO	2012-03-02 15:39:14 -08:00
nossr50	c1103a52f0	Too many exploits, need to finalize this as a bugfix 1.3.02	2012-03-02 15:38:50 -08:00
nossr50	4f128ebbef	Merge pull request #189 from bm01/master Impact fix	2012-03-02 15:22:19 -08:00
bm01	3f5b2bdcee	Impact fix	2012-03-02 23:22:41 +01:00
nossr50	288e82fbc3	Setup locale for Axe Splintering message	2012-03-02 12:39:18 -08:00
nossr50	feb073d159	Damage from failed Tree Feller is now random (but never kills)	2012-03-02 12:35:12 -08:00
nossr50	505df87014	Finalized durability stuff in tree feller. XP nerf only for jungle now.	2012-03-02 12:31:53 -08:00
nossr50	f6221c1c34	More tweaks to durability stuff in tree feller	2012-03-02 12:19:57 -08:00
nossr50	0a97c1dc62	Updating Tree Feller to use .getMaxDurability() API calls	2012-03-02 11:31:30 -08:00
nossr50	05cea84dcc	Can only seem to make the axe splinter some of the time..	2012-03-02 11:22:29 -08:00
nossr50	1ac544511c	Added updateInventory() to Tree Feller	2012-03-02 11:07:20 -08:00
nossr50	292f14bf87	Updated changelog about tree feller	2012-03-02 11:02:55 -08:00
nossr50	ef17ea6231	Merge branch 'master' of github.com:mcMMO-Dev/mcMMO	2012-03-02 11:02:05 -08:00
nossr50	75c49497ac	Nerf tree feller XP. You need durability to use tree feller now.	2012-03-02 11:01:09 -08:00
GJ	f9b9dddbc8	Updates to Taming	2012-03-02 13:55:53 -05:00
GJ	5a8b9fc344	Changes to Blast Mining method calls.	2012-03-02 13:55:53 -05:00
nossr50	e9dae0d633	Changelog update	2012-03-02 10:30:10 -08:00
nossr50	1c866a52e5	Reworking our invincibility checks to accomodate for vanilla mc behaviour	2012-03-02 10:18:23 -08:00
nossr50	2f5edb6329	Removing redundancy	2012-03-02 09:40:04 -08:00
nossr50	30e5410906	Adding break; to switch in onEntityDamage	2012-03-02 09:37:55 -08:00
nossr50	4f2a0b8260	Updating onEntityDamageByEntity event listener	2012-03-02 09:35:52 -08:00
GJ	882a457484	Listen to EntityDamageByEntity subevents	2012-03-02 12:19:53 -05:00
GJ	ed5531d44b	Cleanup EntityListener.java	2012-03-02 12:13:35 -05:00
GJ	b2989a8bab	Added Ocelots to Taming XP tables.	2012-03-02 10:43:08 -05:00
GJ	c032a27d63	Changed Ignition to add fire ticks rather than replace them. (Thanks bm01!)	2012-03-02 10:11:54 -05:00
GJ	353ceefd4e	Changed POM to use latest build.	2012-03-02 10:04:20 -05:00