diff options
| author | j.spijker@ultimaker.com <jelle spijker> | 2022-06-13 09:40:48 +0300 |
|---|---|---|
| committer | Jelle Spijker <j.spijker@ultimaker.com> | 2022-06-13 16:08:00 +0300 |
| commit | 04f16bfcadfed4f9084a48898245063c3f94d389 (patch) | |
| tree | d7aaf9c2e4c34ec29889b701e47b6d043e35591f /cura | |
| parent | c04fdfef47241811d6501a3f4734f310a09cf6ff (diff) | |
Use dev as development version
Since we're no longer running from `master` branch
It is more fitting to rename it to either dev or
main. This version is only used when running from
source when the CURA_VERSION variable isn't set
while performing the `conan install`
Contributes to CURA-9365
Diffstat (limited to 'cura')
| -rw-r--r-- | cura/ApplicationMetadata.py | 2 | ||||
| -rw-r--r-- | cura/Backups/Backup.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cura/ApplicationMetadata.py b/cura/ApplicationMetadata.py index cb80c12416..981d80e4d3 100644 --- a/cura/ApplicationMetadata.py +++ b/cura/ApplicationMetadata.py @@ -6,7 +6,7 @@ # --------- DEFAULT_CURA_APP_NAME = "cura" DEFAULT_CURA_DISPLAY_NAME = "Ultimaker Cura" -DEFAULT_CURA_VERSION = "master" +DEFAULT_CURA_VERSION = "dev" DEFAULT_CURA_BUILD_TYPE = "" DEFAULT_CURA_DEBUG_MODE = False diff --git a/cura/Backups/Backup.py b/cura/Backups/Backup.py index a5fc3044ce..19655df531 100644 --- a/cura/Backups/Backup.py +++ b/cura/Backups/Backup.py @@ -136,7 +136,7 @@ class Backup: return False current_version = Version(self._application.getVersion()) - version_to_restore = Version(self.meta_data.get("cura_release", "master")) + version_to_restore = Version(self.meta_data.get("cura_release", "dev")) if current_version < version_to_restore: # Cannot restore version newer than current because settings might have changed. |