56 Commits

Author	SHA1	Message	Date
Kah	bcba0e5d11	Fix commit 80367c1 that failed to correctly merge the file ... Caused ForgeMultipart client to crash when trying to load a multiblock	2018-12-09 13:18:55 +00:00
Shane Freeder	af00e33389	Merge upstream	2018-11-19 23:36:27 +00:00
Shane Freeder	9c4bf9ca4a	Fix compilation ... An import statement when missing during the last upstream merge (Don't ask how I missed this, I have no idea!)	2018-11-12 21:22:32 +00:00
Shane Freeder	0d92082a73	[CI-SKIP] Protocol patch is travertine, not waterfall	2018-11-11 14:28:05 +00:00
Shane Freeder	f8e3243c7d	Merge upstream	2018-11-11 12:29:39 +00:00
Shane Freeder	c34c98efa2	Merge upstream ... Also drop "Fixup ProtocolConstants - moved upstream	2018-10-27 23:35:46 +01:00