Merge branch 'master' of https://gogs.librecmc.org/libreCMC/libreCMC