Out with the bad CRLFs
Added BlockEnderPortal for diff
Readded BlockEnderPortal changes after CRLF fiasco fix