Merge in Builder support.

core/Registration.java

@@ -419,8 +419,7 @@ public class Registration
 		}
 		catch (Throwable e)
 		{
-			AELog.severe( "Error with Feature: " + c.getName() );
-			throw new RuntimeException( e );
+			throw new RuntimeException( "Error with Feature: " + c.getName(), e );
 		}
 	}
 

core/sync/packets/PacketMEInventoryUpdate.java

@@ -136,7 +136,7 @@ public class PacketMEInventoryUpdate extends AppEngPacket
 		is.writeToPacket( tmp );
 
 		compressFrame.flush();
-		if ( writtenBytes + tmp.readableBytes() > 30000 )
+		if ( writtenBytes + tmp.readableBytes() > 2 * 1024 * 1024 ) // 2mb!
 			throw new BufferOverflowException();
 		else
 		{