Merge branch 'dev'

build.gradle

@@ -17,7 +17,7 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "1.6-beta"
+version = "1.6-beta2"
 group= "com.kamkeel.customnpc-plus" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "CustomNPC-Plus"
 

src/main/java/noppes/npcs/CustomNpcs.java

@@ -31,7 +31,7 @@ import noppes.npcs.scripted.NpcAPI;
 import java.io.File;
 import java.util.Set;
 
-@Mod(modid = "customnpcs", name = "CustomNpcs", version = "1.6-beta")
+@Mod(modid = "customnpcs", name = "CustomNpcs", version = "1.6-beta2")
 public class CustomNpcs {
 
     @ConfigProp(info = "Disable Chat Bubbles")