Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

Bukkit-Patches/0008-Add-Particle-API.patch

@@ -1,4 +1,4 @@
-From 0d3d7850cc74fecc1cddc555e26103f2d44c7b01 Mon Sep 17 00:00:00 2001
+From d62993211f88621e18c42f081425815346e4495e Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:57:09 +1000
 Subject: [PATCH] Add Particle API
@@ -327,10 +327,10 @@ index 9bf2c41..6cf3ff0 100644
       * Represents various map environment types that a world may be
       */
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 21f348b..a2ac7a6 100644
+index e851b98..c6bb787 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1033,6 +1033,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1050,6 +1050,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }
@@ -360,5 +360,5 @@ index 08aa71d..5217aec 100644
      }
  }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0