From 4388e57bb5bddd78560897f4f4ac17ad3dff86fa Mon Sep 17 00:00:00 2001 From: daid Date: Mon, 9 May 2016 16:50:39 +0200 Subject: [PATCH 01/11] Initial commit --- generic_abs.xml.fdm_material | 86 +++++++++++++++++++++ generic_cpe.xml.fdm_material | 85 +++++++++++++++++++++ generic_pla.xml.fdm_material | 143 +++++++++++++++++++++++++++++++++++ 3 files changed, 314 insertions(+) create mode 100644 generic_abs.xml.fdm_material create mode 100644 generic_cpe.xml.fdm_material create mode 100644 generic_pla.xml.fdm_material diff --git a/generic_abs.xml.fdm_material b/generic_abs.xml.fdm_material new file mode 100644 index 0000000000..8e09b7200e --- /dev/null +++ b/generic_abs.xml.fdm_material @@ -0,0 +1,86 @@ + + + + + + Ultimaker + ABS + Generic + + 8520c33e-da56-441b-8d6f-16034a9d19d5 + 0 + #612978 + http://ultimaker.com/we/have/no/instruction/link/yet + + Ultimaker B.V. + Ultimaker Support + support@ultimaker.com + +31 345 712001 +
+ Watermolenweg 2 + Geldermalsen + Gelderland + 4191 PN + The Netherlands +
+ + + Ultimaker B.V. + Support + support@ultimaker.com + +31 345 712001 +
+ Watermolenweg 2 + Geldermalsen + Gelderland + 4191 PN + The Netherlands +
+ + 87 10400 31116 0 + 87 10400 31117 0 + http://... + http://... + + + + + 250 + 130 + 260 + 90 + 100 + + + + + + 150 + + + + + + + + + 150 + + 80 + + + 100 + + + + + + diff --git a/generic_cpe.xml.fdm_material b/generic_cpe.xml.fdm_material new file mode 100644 index 0000000000..22fdc406d3 --- /dev/null +++ b/generic_cpe.xml.fdm_material @@ -0,0 +1,85 @@ + + + + + + Ultimaker + CPE + Generic + + 27c708e9-4148-4457-b01e-2051487a4095 + 0 + #612978 + http://ultimaker.com/we/have/no/instruction/link/yet + + Ultimaker B.V. + Ultimaker Support + support@ultimaker.com + +31 345 712001 +
+ Watermolenweg 2 + Geldermalsen + Gelderland + 4191 PN + The Netherlands +
+ + + Ultimaker B.V. + Support + support@ultimaker.com + +31 345 712001 +
+ Watermolenweg 2 + Geldermalsen + Gelderland + 4191 PN + The Netherlands +
+ + 87 10400 31120 0 + 87 10400 31121 0 + http://... + http://... + + + + + 250 + 175 + 260 + 75 + + + + + + 150 + + + + + + + + + 150 + + 80 + + + 100 + + + + + + diff --git a/generic_pla.xml.fdm_material b/generic_pla.xml.fdm_material new file mode 100644 index 0000000000..5875dba631 --- /dev/null +++ b/generic_pla.xml.fdm_material @@ -0,0 +1,143 @@ + + + + + + Ultimaker + PLA + Generic + + 6976d020-18d1-4d46-9f3e-411189a1e230 + 0 + #612978 + http://ultimaker.com/we/have/no/instruction/link/yet + + Ultimaker B.V. + Ultimaker Support + support@ultimaker.com + +31 345 712001 +
+ Watermolenweg 2 + Geldermalsen + Gelderland + 4191 PN + The Netherlands +
+ + + Ultimaker B.V. + Support + support@ultimaker.com + +31 345 712001 +
+ Watermolenweg 2 + Geldermalsen + Gelderland + 4191 PN + The Netherlands +
+ + 87 10400 31114 0 + 87 10400 31115 0 + http://... + http://... + + + + + + + + + + + + + + + + + + + + 210 + 175 + 350 + 60 + 55 + 90 + 45 + 10 + 20 + 100 + 4.5 + + + + + + + + + + 150 + + + + + + 80 + + + 100 + + + 140 + + + + + 210 + 60 + 100 + + + + + 150 + + + + + + + + + 150 + + 80 + + + 100 + + + + + + From ad5f5dbc257607901838079f847540e0e2015c00 Mon Sep 17 00:00:00 2001 From: daid Date: Tue, 17 May 2016 09:52:03 +0200 Subject: [PATCH 02/11] Change files to actually match spec. --- generic_abs.xml.fdm_material | 85 +++------------------ generic_cpe.xml.fdm_material | 84 +++------------------ generic_pla.xml.fdm_material | 138 +++++------------------------------ 3 files changed, 42 insertions(+), 265 deletions(-) diff --git a/generic_abs.xml.fdm_material b/generic_abs.xml.fdm_material index 8e09b7200e..1a820cec74 100644 --- a/generic_abs.xml.fdm_material +++ b/generic_abs.xml.fdm_material @@ -1,86 +1,23 @@ - + - Ultimaker + Generic ABS Generic - 8520c33e-da56-441b-8d6f-16034a9d19d5 + 60636bb4-518f-42e7-8237-fe77b194ebe0 0 - #612978 - http://ultimaker.com/we/have/no/instruction/link/yet - - Ultimaker B.V. - Ultimaker Support - support@ultimaker.com - +31 345 712001 -
- Watermolenweg 2 - Geldermalsen - Gelderland - 4191 PN - The Netherlands -
- - - Ultimaker B.V. - Support - support@ultimaker.com - +31 345 712001 -
- Watermolenweg 2 - Geldermalsen - Gelderland - 4191 PN - The Netherlands -
- - 87 10400 31116 0 - 87 10400 31117 0 - http://... - http://... + #FFFFFF - - - - 250 - 130 - 260 - 90 - 100 - - - - - - 150 - - - - - - - - - 150 - - 80 - - - 100 - - - - + + 250 + 100 + 200 + + diff --git a/generic_cpe.xml.fdm_material b/generic_cpe.xml.fdm_material index 22fdc406d3..9dd6bc61f8 100644 --- a/generic_cpe.xml.fdm_material +++ b/generic_cpe.xml.fdm_material @@ -1,85 +1,23 @@ - + - Ultimaker + Generic CPE Generic - 27c708e9-4148-4457-b01e-2051487a4095 + 12f41353-1a33-415e-8b4f-a775a6c70cc6 0 - #612978 - http://ultimaker.com/we/have/no/instruction/link/yet - - Ultimaker B.V. - Ultimaker Support - support@ultimaker.com - +31 345 712001 -
- Watermolenweg 2 - Geldermalsen - Gelderland - 4191 PN - The Netherlands -
- - - Ultimaker B.V. - Support - support@ultimaker.com - +31 345 712001 -
- Watermolenweg 2 - Geldermalsen - Gelderland - 4191 PN - The Netherlands -
- - 87 10400 31120 0 - 87 10400 31121 0 - http://... - http://... + #FFFFFF - - - - 250 - 175 - 260 - 75 - - - - - - 150 - - - - - - - - - 150 - - 80 - - - 100 - - - - + + 250 + 60 + 175 + + diff --git a/generic_pla.xml.fdm_material b/generic_pla.xml.fdm_material index 5875dba631..c27adff43c 100644 --- a/generic_pla.xml.fdm_material +++ b/generic_pla.xml.fdm_material @@ -1,143 +1,45 @@ - + - Ultimaker + Generic PLA Generic - 6976d020-18d1-4d46-9f3e-411189a1e230 + 506c9f0d-e3aa-4bd4-b2d2-23e2425b1aa9 0 - #612978 - http://ultimaker.com/we/have/no/instruction/link/yet - - Ultimaker B.V. - Ultimaker Support - support@ultimaker.com - +31 345 712001 -
- Watermolenweg 2 - Geldermalsen - Gelderland - 4191 PN - The Netherlands -
- - - Ultimaker B.V. - Support - support@ultimaker.com - +31 345 712001 -
- Watermolenweg 2 - Geldermalsen - Gelderland - 4191 PN - The Netherlands -
- - 87 10400 31114 0 - 87 10400 31115 0 - http://... - http://... + #FFFFFF + + - - - - - - - - - - - - - - - - - - 210 - 175 - 350 - 60 - 55 - 90 - 45 - 10 - 20 - 100 - 4.5 - - - - + 210 + 60 + 175 - - - - 150 - - - - - - 80 - - - 100 - - - 140 - - - - - 210 - 60 - 100 - - - - - 150 - + + + + 150 + - - 150 + + 150 - 80 + 80 - 100 + 100 - - - + From da726dd3e70f3bf0172a926a88ee3c413752934e Mon Sep 17 00:00:00 2001 From: daid Date: Thu, 30 Jun 2016 13:05:23 +0200 Subject: [PATCH 03/11] Update generic_abs.xml.fdm_material EM-601 --- generic_abs.xml.fdm_material | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generic_abs.xml.fdm_material b/generic_abs.xml.fdm_material index 1a820cec74..2c62c725fe 100644 --- a/generic_abs.xml.fdm_material +++ b/generic_abs.xml.fdm_material @@ -16,8 +16,8 @@ Generic ABS profile. Serves as an example file, data in this file is not correct - 250 - 100 + 240 + 80 200 From 53d71e302eb559b25bf1b5b6cca917b9ddb02588 Mon Sep 17 00:00:00 2001 From: daid Date: Thu, 30 Jun 2016 13:05:47 +0200 Subject: [PATCH 04/11] Update generic_cpe.xml.fdm_material EM-601 --- generic_cpe.xml.fdm_material | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generic_cpe.xml.fdm_material b/generic_cpe.xml.fdm_material index 9dd6bc61f8..a1ae81cfd7 100644 --- a/generic_cpe.xml.fdm_material +++ b/generic_cpe.xml.fdm_material @@ -17,7 +17,7 @@ Generic CPE profile. Serves as an example file, data in this file is not correct 250 - 60 + 70 175 From f08b25b7eaf79bd1bbc2d0faed3b68d771bce5fe Mon Sep 17 00:00:00 2001 From: daid Date: Thu, 30 Jun 2016 13:06:28 +0200 Subject: [PATCH 05/11] Update generic_pla.xml.fdm_material EM-601 --- generic_pla.xml.fdm_material | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generic_pla.xml.fdm_material b/generic_pla.xml.fdm_material index c27adff43c..d30a855018 100644 --- a/generic_pla.xml.fdm_material +++ b/generic_pla.xml.fdm_material @@ -16,7 +16,7 @@ Generic PLA profile. Serves as an example file, data in this file is not correct - 210 + 200 60 175 From 387c7369b4e0edd5e98480974224c9ce869601a8 Mon Sep 17 00:00:00 2001 From: Marco Teunissen van Manen Date: Thu, 18 Aug 2016 13:07:17 +0200 Subject: [PATCH 06/11] Update generic_abs.xml.fdm_material Adding properties (density/diameter) --- generic_abs.xml.fdm_material | 2 ++ 1 file changed, 2 insertions(+) diff --git a/generic_abs.xml.fdm_material b/generic_abs.xml.fdm_material index 2c62c725fe..95e9dadf5b 100644 --- a/generic_abs.xml.fdm_material +++ b/generic_abs.xml.fdm_material @@ -14,6 +14,8 @@ Generic ABS profile. Serves as an example file, data in this file is not correct #FFFFFF + 1.3 + 2.85 240 From d9d6d1849a8db6db8e8c2fc76e470188e7eacd70 Mon Sep 17 00:00:00 2001 From: Marco Teunissen van Manen Date: Thu, 18 Aug 2016 13:07:52 +0200 Subject: [PATCH 07/11] Update generic_cpe.xml.fdm_material Added properties (density, diameter) --- generic_cpe.xml.fdm_material | 2 ++ 1 file changed, 2 insertions(+) diff --git a/generic_cpe.xml.fdm_material b/generic_cpe.xml.fdm_material index a1ae81cfd7..4af8f1276a 100644 --- a/generic_cpe.xml.fdm_material +++ b/generic_cpe.xml.fdm_material @@ -14,6 +14,8 @@ Generic CPE profile. Serves as an example file, data in this file is not correct #FFFFFF + 1.3 + 2.85 250 From eb8cedb1c62b9ca19646a98c11c4a70ea60bc9e1 Mon Sep 17 00:00:00 2001 From: Marco Teunissen van Manen Date: Thu, 18 Aug 2016 13:08:21 +0200 Subject: [PATCH 08/11] Update generic_pla.xml.fdm_material Added properties (density, diameter) --- generic_pla.xml.fdm_material | 2 ++ 1 file changed, 2 insertions(+) diff --git a/generic_pla.xml.fdm_material b/generic_pla.xml.fdm_material index d30a855018..7f70fc7170 100644 --- a/generic_pla.xml.fdm_material +++ b/generic_pla.xml.fdm_material @@ -14,6 +14,8 @@ Generic PLA profile. Serves as an example file, data in this file is not correct #FFFFFF + 1.3 + 2.85 200 From 727f53b3d18e257849c88ac4f6f12706cceb8c7e Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 18 Aug 2016 13:36:39 +0200 Subject: [PATCH 09/11] Update densities with data from materials team --- generic_abs.xml.fdm_material | 2 +- generic_cpe.xml.fdm_material | 2 +- generic_pla.xml.fdm_material | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/generic_abs.xml.fdm_material b/generic_abs.xml.fdm_material index 95e9dadf5b..91f0841453 100644 --- a/generic_abs.xml.fdm_material +++ b/generic_abs.xml.fdm_material @@ -14,7 +14,7 @@ Generic ABS profile. Serves as an example file, data in this file is not correct #FFFFFF - 1.3 + 1.10 2.85 diff --git a/generic_cpe.xml.fdm_material b/generic_cpe.xml.fdm_material index 4af8f1276a..c55e3e881c 100644 --- a/generic_cpe.xml.fdm_material +++ b/generic_cpe.xml.fdm_material @@ -14,7 +14,7 @@ Generic CPE profile. Serves as an example file, data in this file is not correct #FFFFFF - 1.3 + 1.27 2.85 diff --git a/generic_pla.xml.fdm_material b/generic_pla.xml.fdm_material index 7f70fc7170..0febcc395f 100644 --- a/generic_pla.xml.fdm_material +++ b/generic_pla.xml.fdm_material @@ -14,8 +14,8 @@ Generic PLA profile. Serves as an example file, data in this file is not correct #FFFFFF - 1.3 - 2.85 + 1.24 + 2.85 200 From 74fec5c3ec7887f7e4db6da9c747ad089acca566 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 18 Aug 2016 13:50:46 +0200 Subject: [PATCH 10/11] Merge data with Cura repo --- generic_abs.xml.fdm_material | 12 +++++++++++- generic_cpe.xml.fdm_material | 12 +++++++++++- generic_pla.xml.fdm_material | 12 +++++++++++- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/generic_abs.xml.fdm_material b/generic_abs.xml.fdm_material index 91f0841453..f34c32b179 100644 --- a/generic_abs.xml.fdm_material +++ b/generic_abs.xml.fdm_material @@ -11,7 +11,7 @@ Generic ABS profile. Serves as an example file, data in this file is not correct 60636bb4-518f-42e7-8237-fe77b194ebe0 0 - #FFFFFF + #8cb219 1.10 @@ -21,5 +21,15 @@ Generic ABS profile. Serves as an example file, data in this file is not correct 240 80 200 + + + + + + + + + + diff --git a/generic_cpe.xml.fdm_material b/generic_cpe.xml.fdm_material index c55e3e881c..9c76170e90 100644 --- a/generic_cpe.xml.fdm_material +++ b/generic_cpe.xml.fdm_material @@ -11,7 +11,7 @@ Generic CPE profile. Serves as an example file, data in this file is not correct 12f41353-1a33-415e-8b4f-a775a6c70cc6 0 - #FFFFFF + #159499 1.27 @@ -21,5 +21,15 @@ Generic CPE profile. Serves as an example file, data in this file is not correct 250 70 175 + + + + + + + + + + diff --git a/generic_pla.xml.fdm_material b/generic_pla.xml.fdm_material index 0febcc395f..1150d8f6a0 100644 --- a/generic_pla.xml.fdm_material +++ b/generic_pla.xml.fdm_material @@ -11,7 +11,7 @@ Generic PLA profile. Serves as an example file, data in this file is not correct 506c9f0d-e3aa-4bd4-b2d2-23e2425b1aa9 0 - #FFFFFF + #ffc924 1.24 @@ -22,6 +22,16 @@ Generic PLA profile. Serves as an example file, data in this file is not correct 60 175 + + + + + + + + + + From 8d00e28fb0c9198874c4d66ba5e75028c4f6c207 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 18 Aug 2016 16:40:36 +0200 Subject: [PATCH 11/11] Update versions, per the specification --- generic_abs.xml.fdm_material | 2 +- generic_cpe.xml.fdm_material | 2 +- generic_pla.xml.fdm_material | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/generic_abs.xml.fdm_material b/generic_abs.xml.fdm_material index f34c32b179..b2c81d1a0a 100644 --- a/generic_abs.xml.fdm_material +++ b/generic_abs.xml.fdm_material @@ -10,7 +10,7 @@ Generic ABS profile. Serves as an example file, data in this file is not correct Generic 60636bb4-518f-42e7-8237-fe77b194ebe0 - 0 + 1 #8cb219 diff --git a/generic_cpe.xml.fdm_material b/generic_cpe.xml.fdm_material index 9c76170e90..7cf7e6f836 100644 --- a/generic_cpe.xml.fdm_material +++ b/generic_cpe.xml.fdm_material @@ -10,7 +10,7 @@ Generic CPE profile. Serves as an example file, data in this file is not correct Generic 12f41353-1a33-415e-8b4f-a775a6c70cc6 - 0 + 1 #159499 diff --git a/generic_pla.xml.fdm_material b/generic_pla.xml.fdm_material index 1150d8f6a0..8c212e6aab 100644 --- a/generic_pla.xml.fdm_material +++ b/generic_pla.xml.fdm_material @@ -10,7 +10,7 @@ Generic PLA profile. Serves as an example file, data in this file is not correct Generic 506c9f0d-e3aa-4bd4-b2d2-23e2425b1aa9 - 0 + 1 #ffc924