Merge branch 'dev' of https://github.com/peterix/MultiMC4 into master