merged commit  accd34abf45ce93f46df9135ad6d78a95bbb19e1 from SKCraft/Launcher
merged commit 43f38614b0ef614c584972c77113d2cf2a046602 from SKCraft/Launcher