3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-05 16:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3

Browse source
This commit is contained in:
Tim Kuipers 2016-09-05 14:39:11 +02:00
commit 99a44fa1d2
22 changed files with 164 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/definitions/fdmprinter.def.json
View file

@ -3310,6 +3310,8 @@
"default_value": 200,
"minimum_value_warning": "-1000",
"maximum_value_warning": "1000",
"maximum_value": "machine_width - 0.5 * prime_tower_size",
"minimum_value": "0.5 * prime_tower_size",
"settable_per_mesh": false,
"settable_per_extruder": false
},
@ -3323,6 +3325,8 @@
"default_value": 200,
"minimum_value_warning": "-1000",
"maximum_value_warning": "1000",
"maximum_value": "machine_depth - 0.5 * prime_tower_size",
"minimum_value": "0.5 * prime_tower_size",
"settable_per_mesh": false,
"settable_per_extruder": false
},