GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 02:55:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jaime van Kessel 2016-09-08 12:50:19 +02:00
commit 73c5c34b99
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/materials/generic_nylon.xml.fdm_material
View File

@ -18,7 +18,6 @@ Generic Nylon profile. Serves as an example file, data in this file is not corre
<diameter>2.85</diameter>
</properties>
<settings>
<setting key="hardware compatible">no</setting><!-- This material is not supported on most printers due to high temperatures -->
<setting key="print temperature">250</setting>
<setting key="heated bed temperature">60</setting>
<setting key="standby temperature">175</setting>

4
resources/qml/Preferences/MaterialView.qml
View File

@ -115,7 +115,7 @@ TabView
width: base.secondColumnWidth;
value: properties.density;
decimals: 2
suffix: "g/cm"
suffix: "g/cm³"
stepSize: 0.01
readOnly: !base.editingEnabled;
@ -128,7 +128,7 @@ TabView
width: base.secondColumnWidth;
value: properties.diameter;
decimals: 2
suffix: "mm³"
suffix: "mm"
stepSize: 0.01
readOnly: !base.editingEnabled;