5 commits

Author	SHA1	Message	Date
Shane Freeder	9cf2e3b3dc	Update to 1.12-pre6	2017-05-31 09:04:52 +01:00
Zach Brown	ab4ae72fd5	Update to MC 1.12-pre2	2017-05-14 13:05:01 -05:00
Zach Brown	013c024ca2	Update upstream CB	2017-01-28 17:36:03 -06:00
Zach Brown	1881616f15	Alter last to force conflicts but keep contents	2016-11-26 22:02:19 -06:00
Alfie Cleveland	a36e2a4378	Optimise NetworkManager	2016-11-25 20:35:15 +00:00