Merge branch 'darkk_login'

Conflicts:
	src/main/NGECore.java
This commit is contained in:
darkk1138
2013-12-08 18:51:22 +01:00
9 changed files with 143 additions and 239 deletions
-1
View File
@@ -284,7 +284,6 @@ public class ObjectService implements INetworkDispatch {
System.out.println("!File Not Found:" + template.toString());
} catch (IOException e) {
System.out.println("!IO error " + template.toString());
e.printStackTrace();
}
}