diff options
| author | Ghostkeeper <rubend@tutanota.com> | 2021-12-14 13:48:58 +0300 |
|---|---|---|
| committer | Ghostkeeper <rubend@tutanota.com> | 2021-12-14 13:48:58 +0300 |
| commit | 9140b71b1998d75d51ae556bbb63059de6016c9c (patch) | |
| tree | 6bc49869a84820770d325d5c0300ed9f1e42bdec /resources/definitions/creality_base.def.json | |
| parent | 64dec9ecc10eb81b68aecc4dcf586e80c03dec01 (diff) | |
| parent | 2000f8143a1392ea1d198b485ba17e84dba33594 (diff) | |
Merge branch 'libArachne_rebased'
Conflicts:
plugins/SimulationView/SimulationPass.py -> Reverted layer view optimisation in Master while some whitespace changed in Arachne.
resources/definitions -> Bunch of conflicts with profile updates.
resources/quality -> Bunch of conflicts with profile updates.
resources/texts/change_log.txt -> Removed the Arachne change log (as they are internal versions). It'll have to be re-added when we release this version as stable.
Diffstat (limited to 'resources/definitions/creality_base.def.json')
| -rw-r--r-- | resources/definitions/creality_base.def.json | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/resources/definitions/creality_base.def.json b/resources/definitions/creality_base.def.json index ff7cb23ab2..6aebd0db4e 100644 --- a/resources/definitions/creality_base.def.json +++ b/resources/definitions/creality_base.def.json @@ -183,7 +183,6 @@ "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_flow": { "value": 100 }, - "travel_compensate_overlapping_walls_0_enabled": { "value": "False" }, "z_seam_type": { "value": "'back'" }, "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, @@ -196,7 +195,6 @@ "infill_wipe_dist": { "value": 0.0 }, "wall_0_wipe_dist": { "value": 0.0 }, - "fill_perimeter_gaps": { "value": "'everywhere'" }, "fill_outline_gaps": { "value": false }, "filter_out_tiny_gaps": { "value": false }, |