Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Conflicts:
	src/main/NGECore.java

src/resources/common/Cooldown.java

@@ -21,9 +21,7 @@
  ******************************************************************************/
 package resources.common;
 
-import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
 
 public class Cooldown {
 	private long startTimestamp;

src/resources/common/IDAttribute.java

@@ -21,8 +21,6 @@
  ******************************************************************************/
 package resources.common;
 
-import java.math.BigInteger;
-
 public class IDAttribute {
 
 	private float floatValue;

src/resources/common/ObjControllerOpcodes.java

@@ -42,5 +42,6 @@ public class ObjControllerOpcodes {
 	public static final int STOP_NPC_CONVERSATION = 0xDE000000;
 	public static final int NPC_CONVERSATION_OPTIONS = 0xE0000000;
 	public static final int SET_PROFESSION_TEMPLATE = 0x5C040000;
-
+	public static final int RESOURCE_EMPTY_HOPPER = 0xED000000;
+	
 }

src/resources/common/ThreadMonitor.java

@@ -187,7 +187,8 @@ public class ThreadMonitor {
 	    return true;
 	  }
 
-	  private void parseMBeanInfo() throws IOException {
+	  @SuppressWarnings("unused")
+	private void parseMBeanInfo() throws IOException {
 	    try {
 	      MBeanOperationInfo[] mopis = server.getMBeanInfo(objname).getOperations();