All done except the conduit GUI packets.
Should all compile now except the excluded NEI related stuff.