From ea4333b802b0d2db0e48202992c6a4258d2019d2 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Thu, 8 Sep 2016 11:51:33 +0200
Subject: [PATCH 1/2] No longer disable Nylon by default

It prints fine on most printers. Just allow people to select it. (And other secret reasons.)
---
 resources/materials/generic_nylon.xml.fdm_material | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/materials/generic_nylon.xml.fdm_material b/resources/materials/generic_nylon.xml.fdm_material
index d37adf906a..02b2d5414b 100644
--- a/resources/materials/generic_nylon.xml.fdm_material
+++ b/resources/materials/generic_nylon.xml.fdm_material
@@ -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>

From bb92c0d7fae58f5173333de8f7312b540b3ffdad Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Thu, 8 Sep 2016 11:56:11 +0200
Subject: [PATCH 2/2] Fix units for density and diameter

---
 resources/qml/Preferences/MaterialView.qml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/qml/Preferences/MaterialView.qml b/resources/qml/Preferences/MaterialView.qml
index 3041115ad2..6115671563 100644
--- a/resources/qml/Preferences/MaterialView.qml
+++ b/resources/qml/Preferences/MaterialView.qml
@@ -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;