diff options
| author | Ghostkeeper <rubend@tutanota.com> | 2020-05-08 10:10:02 +0300 |
|---|---|---|
| committer | Ghostkeeper <rubend@tutanota.com> | 2020-05-08 10:10:02 +0300 |
| commit | b02354b209e7f5c597fad28008f9784a7885e14f (patch) | |
| tree | edc084c3c1b44760c8f35840f78e65ac483374f3 /resources/quality/key3d | |
| parent | 23cdf871c1f6b1bb49311d295370314f2669fc14 (diff) | |
| parent | 69f23eca9409e65435dbb01e76f8d68d092b490e (diff) | |
Merge branch '4.6'
Conflicts:
plugins/VersionUpgrade/VersionUpgrade460to462/VersionUpgrade460to462.py -> On master we removed the getCfgVersion function, while we moved the entire plug-in to a different folder in 4.6.
resources/definitions/skriware_2.def.json -> On master we merged a PR that changes more or less all settings, while on 4.6 we doubled the maximum deviation.
Diffstat (limited to 'resources/quality/key3d')
| -rw-r--r-- | resources/quality/key3d/key3d_tyro_best.inst.cfg | 2 | ||||
| -rw-r--r-- | resources/quality/key3d/key3d_tyro_fast.inst.cfg | 2 | ||||
| -rw-r--r-- | resources/quality/key3d/key3d_tyro_normal.inst.cfg | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/resources/quality/key3d/key3d_tyro_best.inst.cfg b/resources/quality/key3d/key3d_tyro_best.inst.cfg index a4981e739c..7e6f1ec787 100644 --- a/resources/quality/key3d/key3d_tyro_best.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_best.inst.cfg @@ -4,7 +4,7 @@ name = Best Quality definition = key3d_tyro [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = best weight = 1 diff --git a/resources/quality/key3d/key3d_tyro_fast.inst.cfg b/resources/quality/key3d/key3d_tyro_fast.inst.cfg index 0e5fd6c709..da6988556d 100644 --- a/resources/quality/key3d/key3d_tyro_fast.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast Quality definition = key3d_tyro [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/key3d/key3d_tyro_normal.inst.cfg b/resources/quality/key3d/key3d_tyro_normal.inst.cfg index 8f4a44678e..777f4ff693 100644 --- a/resources/quality/key3d/key3d_tyro_normal.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal Quality definition = key3d_tyro [metadata] -setting_version = 13 +setting_version = 14 type = quality quality_type = normal weight = 0 |