Merge branch 'v3.0' of git@github-home:webbukkit/dynmap.git into v3.0

DynmapCore/src/main/java/org/dynmap/ColorScheme.java

@@ -128,7 +128,7 @@ public class ColorScheme {
 						id = -1;
 						BiomeMap[] bm = BiomeMap.values();
 						for (int i = 0; i < bm.length; i++) {
-							if (bm[i].toString().equalsIgnoreCase(bio)) {
+							if (bm[i].getId().equalsIgnoreCase(bio)) {
 								id = i;
 								break;
 							} else if (bio.equalsIgnoreCase("BIOME_" + i)) {

DynmapCore/src/main/java/org/dynmap/common/BiomeMap.java

@@ -297,6 +297,9 @@ public class BiomeMap {
     public boolean isDefault() {
         return isDef;
     }
+    public String getId() {
+        return id;
+    }
     public String toString() {
     	return String.format("%s(%s)", id, resourcelocation);
     }