1.8 Update

Working 1.8 except for online mode is a bit broken