Merge branch 'master' into dev

This commit is contained in:
Faraphel 2021-06-04 14:17:25 +02:00 committed by GitHub
commit f8c1860ab0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -12,7 +12,7 @@ def check_update(self):
with open("version", "rb") as f: with open("version", "rb") as f:
locversion = json.load(f) locversion = json.load(f)
if gitversion["version"] != locversion["version"]: if gitversion["version"] > locversion["version"]:
if messagebox.askyesno(self.translate("Mise à jour disponible !"), self.translate("Une mise à jour est disponible, souhaitez-vous l'installer ?") + if messagebox.askyesno(self.translate("Mise à jour disponible !"), self.translate("Une mise à jour est disponible, souhaitez-vous l'installer ?") +
f"\n\nVersion : {locversion['version']}.{locversion['subversion']} -> {gitversion['version']}.{gitversion['subversion']}\n"+\ f"\n\nVersion : {locversion['version']}.{locversion['subversion']} -> {gitversion['version']}.{gitversion['subversion']}\n"+\
f"Changelog :\n{gitversion['changelog']}"): f"Changelog :\n{gitversion['changelog']}"):

View file

@ -1,7 +1,7 @@
{ {
"version": "0.4", "version": "0.4",
"subversion": "0", "subversion": "0",
"changelog": "", "changelog": "- Une coupe etait dupliquee\n- Les courses "(Vide)" ont ete remplace par des courses sans nom pour eviter des problemes de traductions\n- Ajout de 350 courses (total : 760 -> 1100) originaux non comptes",
"download_bin": "https://github.com/Faraphel/MKWF-Install/releases/download/0.4/MKWF.v0.4.zip", "download_bin": "https://github.com/Faraphel/MKWF-Install/releases/download/0.4/MKWF.v0.4.zip",
"updater_bin": "https://github.com/Faraphel/MKWF-Install/raw/master/Updater/Updater.zip" "updater_bin": "https://github.com/Faraphel/MKWF-Install/raw/master/Updater/Updater.zip"
} }