3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 23:05:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '4.1'

Browse source
This commit is contained in:
Ghostkeeper 2019-05-13 17:11:39 +02:00
commit 03d96f3fb5
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
5 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/definitions/Mark2_for_Ultimaker2.def.json
View file

@ -13,7 +13,6 @@
"has_machine_materials": false,
"has_machine_quality": false,
"has_variant_materials": false,
"weight": 2,
"file_formats": "text/x-gcode",
"icon": "icon_ultimaker.png",
"platform": "ultimaker2_platform.obj",

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

@ -2064,7 +2064,7 @@
"unit": "°C",
"type": "float",
"default_value": 35,
"resolve": "max(extruderValues('build_volume_temperature'))",
"resolve": "min(extruderValues('build_volume_temperature'))",
"minimum_value": "-273.15",
"minimum_value_warning": "0",
"maximum_value_warning": "285",

1
resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json
View file

@ -6,7 +6,6 @@
"author": "Andrew Finkle, CTO",
"manufacturer": "Structur3d.io",
"visible": true,
"weight": 1,
"file_formats": "text/x-gcode",
"platform": "ultimaker2_platform.obj",
"platform_texture": "Ultimaker2Plusbackplate.png",