Update from Tekkit branch