From 581e260a5fcf22e4153e406a173f2a236180e76d Mon Sep 17 00:00:00 2001 From: Saumya Jain Date: Tue, 2 Apr 2024 10:49:11 +0200 Subject: [PATCH 1/5] version change to next release --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 74ee1fa65..c2971e276 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1 +1 @@ -version: "5.7.0-beta.1" +version: "5.8.0-alpha.0" From a7ab7baba977649562f8b5e6d227e3921f72e076 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Mon, 8 Apr 2024 21:35:30 +0200 Subject: [PATCH 2/5] ASA and PA12-CF were missing Method X and Method XL specific settings. --- ultimaker_asa_175.xml.fdm_material | 58 ++++++++++++++++++++++- ultimaker_nylon12-cf_175.xml.fdm_material | 45 +++++++++++++++++- 2 files changed, 101 insertions(+), 2 deletions(-) diff --git a/ultimaker_asa_175.xml.fdm_material b/ultimaker_asa_175.xml.fdm_material index 8b34b476e..74e13a2f1 100644 --- a/ultimaker_asa_175.xml.fdm_material +++ b/ultimaker_asa_175.xml.fdm_material @@ -8,7 +8,7 @@ f79bc612-21eb-482e-ad6c-87d75bdde066 asa - 4 + 5 #f1ece1 ASA combines the qualities of ABS with the added benefit of UV resistance and additional moisture resistance making it ideal for equipment exposed to sunlight and rain over long periods of time – such as products for the agriculture, transportation, and power and utility industries. No glue needed @@ -27,6 +27,62 @@ 0 yes + + + 255 + 190 + 93 + 95 + 100.44 + 100.6 + + + no + + + yes + + + no + + + no + + + yes + + + yes + + + + + 255 + 190 + 85 + 95 + 100.44 + 100.6 + + + no + + + yes + + + no + + + no + + + yes + + + yes + + diff --git a/ultimaker_nylon12-cf_175.xml.fdm_material b/ultimaker_nylon12-cf_175.xml.fdm_material index cb50c627c..55f82679e 100644 --- a/ultimaker_nylon12-cf_175.xml.fdm_material +++ b/ultimaker_nylon12-cf_175.xml.fdm_material @@ -8,7 +8,7 @@ 3c6f2877-71cc-4760-84e6-4b89ab243e3b nylon12-cf - 4 + 5 #0e0e10 Nylon is strong, abrasion-resistant, durable and engineered for low moisture sensitivity. Use glue. @@ -29,6 +29,49 @@ 100.44 100.6 + + + 93 + + no + + + no + + + no + + + no + + + yes + + + yes + + + + + + no + + + no + + + no + + + no + + + yes + + + yes + + From e2156624f4c1b3b5b3aa6726df44838020e4f3ad Mon Sep 17 00:00:00 2001 From: Frederic Meeuwissen <13856291+Frederic98@users.noreply.github.com> Date: Mon, 15 Apr 2024 11:08:35 +0200 Subject: [PATCH 3/5] Auto formatted XML files --- generic_abs.xml.fdm_material | 21 ++++++------- generic_asa_175.xml.fdm_material | 1 - generic_bam.xml.fdm_material | 13 ++++---- generic_cffcpe.xml.fdm_material | 9 +++--- generic_cffpa.xml.fdm_material | 9 +++--- generic_cpe.xml.fdm_material | 21 ++++++------- generic_cpe_plus.xml.fdm_material | 21 ++++++------- generic_gffcpe.xml.fdm_material | 8 ++--- generic_gffpa.xml.fdm_material | 9 +++--- generic_hips.xml.fdm_material | 2 +- generic_nylon.xml.fdm_material | 21 ++++++------- generic_nylon_175.xml.fdm_material | 1 - generic_pc.xml.fdm_material | 21 ++++++------- generic_petcf.xml.fdm_material | 9 +++--- generic_petg.xml.fdm_material | 15 +++++---- generic_petg_175.xml.fdm_material | 1 - generic_pla.xml.fdm_material | 31 +++++++++---------- generic_pla_175.xml.fdm_material | 5 ++- generic_pp.xml.fdm_material | 21 ++++++------- generic_pva.xml.fdm_material | 23 +++++++------- generic_pva_175.xml.fdm_material | 1 - generic_tough_pla.xml.fdm_material | 15 +++++---- generic_tpu.xml.fdm_material | 21 ++++++------- ultimaker_abs.xml.fdm_material | 21 ++++++------- ultimaker_abs_black.xml.fdm_material | 21 ++++++------- ultimaker_abs_blue.xml.fdm_material | 21 ++++++------- ultimaker_abs_green.xml.fdm_material | 21 ++++++------- ultimaker_abs_grey.xml.fdm_material | 21 ++++++------- ultimaker_abs_orange.xml.fdm_material | 21 ++++++------- ultimaker_abs_pearl-gold.xml.fdm_material | 21 ++++++------- ultimaker_abs_red.xml.fdm_material | 21 ++++++------- ...maker_abs_silver-metallic.xml.fdm_material | 21 ++++++------- ultimaker_abs_white.xml.fdm_material | 21 ++++++------- ultimaker_abs_yellow.xml.fdm_material | 21 ++++++------- ultimaker_abscf_175.xml.fdm_material | 4 +-- ultimaker_absr_175.xml.fdm_material | 5 +-- ultimaker_asa_175.xml.fdm_material | 5 +-- ultimaker_bam.xml.fdm_material | 13 ++++---- ultimaker_cpe.xml.fdm_material | 21 ++++++------- ultimaker_cpe_black.xml.fdm_material | 21 ++++++------- ultimaker_cpe_blue.xml.fdm_material | 21 ++++++------- ultimaker_cpe_dark-grey.xml.fdm_material | 21 ++++++------- ultimaker_cpe_green.xml.fdm_material | 21 ++++++------- ultimaker_cpe_light-grey.xml.fdm_material | 21 ++++++------- ultimaker_cpe_plus.xml.fdm_material | 21 ++++++------- ultimaker_cpe_plus_black.xml.fdm_material | 21 ++++++------- ...aker_cpe_plus_transparent.xml.fdm_material | 21 ++++++------- ultimaker_cpe_plus_white.xml.fdm_material | 21 ++++++------- ultimaker_cpe_red.xml.fdm_material | 21 ++++++------- ultimaker_cpe_transparent.xml.fdm_material | 21 ++++++------- ultimaker_cpe_white.xml.fdm_material | 21 ++++++------- ultimaker_cpe_yellow.xml.fdm_material | 21 ++++++------- ultimaker_nylon.xml.fdm_material | 21 ++++++------- ultimaker_nylon12-cf_175.xml.fdm_material | 7 +++-- ultimaker_nylon_black.xml.fdm_material | 21 ++++++------- ultimaker_nylon_transparent.xml.fdm_material | 21 ++++++------- ultimaker_pc.xml.fdm_material | 22 ++++++------- ultimaker_pc_black.xml.fdm_material | 22 ++++++------- ultimaker_pc_transparent.xml.fdm_material | 22 ++++++------- ultimaker_pc_white.xml.fdm_material | 22 ++++++------- ultimaker_petcf.xml.fdm_material | 9 +++--- ultimaker_petcf_black.xml.fdm_material | 9 +++--- ultimaker_petcf_blue.xml.fdm_material | 9 +++--- ultimaker_petcf_gray.xml.fdm_material | 9 +++--- ultimaker_petg.xml.fdm_material | 15 +++++---- ultimaker_petg_black.xml.fdm_material | 15 +++++---- ultimaker_petg_blue.xml.fdm_material | 15 +++++---- ...ker_petg_blue_translucent.xml.fdm_material | 15 +++++---- ultimaker_petg_green.xml.fdm_material | 15 +++++---- ...er_petg_green_translucent.xml.fdm_material | 15 +++++---- ultimaker_petg_grey.xml.fdm_material | 15 +++++---- ultimaker_petg_orange.xml.fdm_material | 15 +++++---- ultimaker_petg_red.xml.fdm_material | 15 +++++---- ...aker_petg_red_translucent.xml.fdm_material | 15 +++++---- ultimaker_petg_silver.xml.fdm_material | 15 +++++---- ultimaker_petg_transparent.xml.fdm_material | 15 +++++---- ultimaker_petg_white.xml.fdm_material | 15 +++++---- ultimaker_petg_yellow.xml.fdm_material | 15 +++++---- ...r_petg_yellow_fluorescent.xml.fdm_material | 15 +++++---- ultimaker_pla.xml.fdm_material | 31 +++++++++---------- ultimaker_pla_black.xml.fdm_material | 31 +++++++++---------- ultimaker_pla_blue.xml.fdm_material | 31 +++++++++---------- ultimaker_pla_green.xml.fdm_material | 31 +++++++++---------- ultimaker_pla_magenta.xml.fdm_material | 31 +++++++++---------- ultimaker_pla_orange.xml.fdm_material | 31 +++++++++---------- ultimaker_pla_pearl-white.xml.fdm_material | 31 +++++++++---------- ultimaker_pla_red.xml.fdm_material | 31 +++++++++---------- ...maker_pla_silver-metallic.xml.fdm_material | 31 +++++++++---------- ultimaker_pla_transparent.xml.fdm_material | 31 +++++++++---------- ultimaker_pla_white.xml.fdm_material | 31 +++++++++---------- ultimaker_pla_yellow.xml.fdm_material | 31 +++++++++---------- ultimaker_pp_transparent.xml.fdm_material | 21 ++++++------- ultimaker_pva.xml.fdm_material | 24 +++++++------- ultimaker_rapidrinse_175.xml.fdm_material | 4 +-- ultimaker_sr30_175.xml.fdm_material | 4 +-- ultimaker_tough_pla.xml.fdm_material | 15 +++++---- ultimaker_tough_pla_black.xml.fdm_material | 15 +++++---- ultimaker_tough_pla_blue.xml.fdm_material | 15 +++++---- ultimaker_tough_pla_gray.xml.fdm_material | 15 +++++---- ultimaker_tough_pla_green.xml.fdm_material | 15 +++++---- ultimaker_tough_pla_red.xml.fdm_material | 15 +++++---- ultimaker_tough_pla_white.xml.fdm_material | 15 +++++---- ultimaker_tough_pla_yellow.xml.fdm_material | 15 +++++---- ultimaker_tpu.xml.fdm_material | 21 ++++++------- ultimaker_tpu_black.xml.fdm_material | 21 ++++++------- ultimaker_tpu_blue.xml.fdm_material | 21 ++++++------- ultimaker_tpu_red.xml.fdm_material | 21 ++++++------- ultimaker_tpu_white.xml.fdm_material | 21 ++++++------- 108 files changed, 909 insertions(+), 1011 deletions(-) diff --git a/generic_abs.xml.fdm_material b/generic_abs.xml.fdm_material index b58b3ee48..44dc83f91 100644 --- a/generic_abs.xml.fdm_material +++ b/generic_abs.xml.fdm_material @@ -55,13 +55,13 @@ Generic ABS profile. The data in this file may not be correct for your specific 0 - + 230 - - + + 230 @@ -71,8 +71,8 @@ Generic ABS profile. The data in this file may not be correct for your specific - - + + yes 5 @@ -90,7 +90,7 @@ Generic ABS profile. The data in this file may not be correct for your specific - + 85 yes @@ -109,7 +109,7 @@ Generic ABS profile. The data in this file may not be correct for your specific - + 85 yes @@ -126,8 +126,8 @@ Generic ABS profile. The data in this file may not be correct for your specific - - + + 85 yes @@ -143,6 +143,5 @@ Generic ABS profile. The data in this file may not be correct for your specific - - \ No newline at end of file + diff --git a/generic_asa_175.xml.fdm_material b/generic_asa_175.xml.fdm_material index 6709bfe98..a5e2f5cc2 100644 --- a/generic_asa_175.xml.fdm_material +++ b/generic_asa_175.xml.fdm_material @@ -28,6 +28,5 @@ Generic ASA 1.75mm profile. The data in this file may not be correct for your sp 0 yes - diff --git a/generic_bam.xml.fdm_material b/generic_bam.xml.fdm_material index fa850488e..4c50009ba 100644 --- a/generic_bam.xml.fdm_material +++ b/generic_bam.xml.fdm_material @@ -55,8 +55,8 @@ Generic break away support material profile. The data in this file may not be co true - - + + 100 yes @@ -65,7 +65,7 @@ Generic break away support material profile. The data in this file may not be co - + 100 yes @@ -74,8 +74,8 @@ Generic break away support material profile. The data in this file may not be co - - + + 100 @@ -84,6 +84,5 @@ Generic break away support material profile. The data in this file may not be co - - \ No newline at end of file + diff --git a/generic_cffcpe.xml.fdm_material b/generic_cffcpe.xml.fdm_material index 32127d459..ad188445e 100644 --- a/generic_cffcpe.xml.fdm_material +++ b/generic_cffcpe.xml.fdm_material @@ -53,7 +53,7 @@ This is the baseline profile for Carbon Fiber Filled Copolyesters for the Print 0 - + no @@ -82,8 +82,8 @@ This is the baseline profile for Carbon Fiber Filled Copolyesters for the Print - - + + no @@ -112,6 +112,5 @@ This is the baseline profile for Carbon Fiber Filled Copolyesters for the Print - - \ No newline at end of file + diff --git a/generic_cffpa.xml.fdm_material b/generic_cffpa.xml.fdm_material index 528c2c439..1b514ef80 100644 --- a/generic_cffpa.xml.fdm_material +++ b/generic_cffpa.xml.fdm_material @@ -53,7 +53,7 @@ This is the baseline profile for Carbon Fiber Filled Polyamides for the Print Pr 0 - + no @@ -82,8 +82,8 @@ This is the baseline profile for Carbon Fiber Filled Polyamides for the Print Pr - - + + no @@ -112,6 +112,5 @@ This is the baseline profile for Carbon Fiber Filled Polyamides for the Print Pr - - \ No newline at end of file + diff --git a/generic_cpe.xml.fdm_material b/generic_cpe.xml.fdm_material index 2b78d43cc..7622713bb 100644 --- a/generic_cpe.xml.fdm_material +++ b/generic_cpe.xml.fdm_material @@ -53,13 +53,13 @@ Generic CPE profile. The data in this file may not be correct for your specific 0 - + 240 - - + + 240 @@ -69,8 +69,8 @@ Generic CPE profile. The data in this file may not be correct for your specific - - + + 85 all @@ -87,7 +87,7 @@ Generic CPE profile. The data in this file may not be correct for your specific - + 85 yes @@ -106,7 +106,7 @@ Generic CPE profile. The data in this file may not be correct for your specific - + 85 yes @@ -123,8 +123,8 @@ Generic CPE profile. The data in this file may not be correct for your specific - - + + 85 @@ -145,6 +145,5 @@ Generic CPE profile. The data in this file may not be correct for your specific - - \ No newline at end of file + diff --git a/generic_cpe_plus.xml.fdm_material b/generic_cpe_plus.xml.fdm_material index 8ad966197..e65e68a66 100644 --- a/generic_cpe_plus.xml.fdm_material +++ b/generic_cpe_plus.xml.fdm_material @@ -54,13 +54,13 @@ Generic CPE+ profile. The data in this file may not be correct for your specific 0 - + 260 - - + + 260 yes @@ -70,8 +70,8 @@ Generic CPE+ profile. The data in this file may not be correct for your specific - - + + all @@ -87,7 +87,7 @@ Generic CPE+ profile. The data in this file may not be correct for your specific - + 260 yes @@ -99,7 +99,7 @@ Generic CPE+ profile. The data in this file may not be correct for your specific - + 110 @@ -115,8 +115,8 @@ Generic CPE+ profile. The data in this file may not be correct for your specific - - + + 110 @@ -133,6 +133,5 @@ Generic CPE+ profile. The data in this file may not be correct for your specific - - \ No newline at end of file + diff --git a/generic_gffcpe.xml.fdm_material b/generic_gffcpe.xml.fdm_material index e987c1d1d..0e9a72bf9 100644 --- a/generic_gffcpe.xml.fdm_material +++ b/generic_gffcpe.xml.fdm_material @@ -53,7 +53,7 @@ This is the baseline profile for Glass Fiber Filled Copolyesters for the Print P 0 - + no @@ -82,8 +82,8 @@ This is the baseline profile for Glass Fiber Filled Copolyesters for the Print P - - + + no @@ -113,4 +113,4 @@ This is the baseline profile for Glass Fiber Filled Copolyesters for the Print P - \ No newline at end of file + diff --git a/generic_gffpa.xml.fdm_material b/generic_gffpa.xml.fdm_material index c21396d04..2bed54004 100644 --- a/generic_gffpa.xml.fdm_material +++ b/generic_gffpa.xml.fdm_material @@ -53,7 +53,7 @@ This is the baseline profile for Glass Fiber Filled Polyamides for the Print Pro 0 - + no @@ -82,8 +82,8 @@ This is the baseline profile for Glass Fiber Filled Polyamides for the Print Pro - - + + no @@ -112,6 +112,5 @@ This is the baseline profile for Glass Fiber Filled Polyamides for the Print Pro - - \ No newline at end of file + diff --git a/generic_hips.xml.fdm_material b/generic_hips.xml.fdm_material index d96033de4..f030fcc36 100644 --- a/generic_hips.xml.fdm_material +++ b/generic_hips.xml.fdm_material @@ -50,4 +50,4 @@ Generic HIPS profile. The data in this file may not be correct for your specific true - \ No newline at end of file + diff --git a/generic_nylon.xml.fdm_material b/generic_nylon.xml.fdm_material index ef06f8c63..7aba02722 100644 --- a/generic_nylon.xml.fdm_material +++ b/generic_nylon.xml.fdm_material @@ -56,13 +56,13 @@ Generic Nylon profile. The data in this file may not be correct for your specifi 0 - + 245 - - + + 245 @@ -72,8 +72,8 @@ Generic Nylon profile. The data in this file may not be correct for your specifi - - + + 40 40 @@ -91,7 +91,7 @@ Generic Nylon profile. The data in this file may not be correct for your specifi - + yes 240 @@ -111,7 +111,7 @@ Generic Nylon profile. The data in this file may not be correct for your specifi - + 40 40 @@ -131,8 +131,8 @@ Generic Nylon profile. The data in this file may not be correct for your specifi - - + + 40 40 @@ -154,6 +154,5 @@ Generic Nylon profile. The data in this file may not be correct for your specifi - - \ No newline at end of file + diff --git a/generic_nylon_175.xml.fdm_material b/generic_nylon_175.xml.fdm_material index ed17a628a..bb53fc9b7 100644 --- a/generic_nylon_175.xml.fdm_material +++ b/generic_nylon_175.xml.fdm_material @@ -52,6 +52,5 @@ Generic Nylon 1.75mm profile. The data in this file may not be correct for your - diff --git a/generic_pc.xml.fdm_material b/generic_pc.xml.fdm_material index 1616b367f..cae513a7a 100644 --- a/generic_pc.xml.fdm_material +++ b/generic_pc.xml.fdm_material @@ -55,13 +55,13 @@ Generic PC profile. The data in this file may not be correct for your specific m 0 - + 270 - - + + 270 yes @@ -72,8 +72,8 @@ Generic PC profile. The data in this file may not be correct for your specific m - - + + yes @@ -92,7 +92,7 @@ Generic PC profile. The data in this file may not be correct for your specific m - + 260 yes @@ -102,7 +102,7 @@ Generic PC profile. The data in this file may not be correct for your specific m - + 110 @@ -121,8 +121,8 @@ Generic PC profile. The data in this file may not be correct for your specific m - - + + 110 @@ -163,6 +163,5 @@ Generic PC profile. The data in this file may not be correct for your specific m - - \ No newline at end of file + diff --git a/generic_petcf.xml.fdm_material b/generic_petcf.xml.fdm_material index 2bd6ebdb5..984f7ad2d 100644 --- a/generic_petcf.xml.fdm_material +++ b/generic_petcf.xml.fdm_material @@ -58,7 +58,7 @@ Generic PET-CF profile. The data in this file may not be correct for your specif 0 - + no @@ -84,8 +84,8 @@ Generic PET-CF profile. The data in this file may not be correct for your specif - - + + no @@ -111,6 +111,5 @@ Generic PET-CF profile. The data in this file may not be correct for your specif - - \ No newline at end of file + diff --git a/generic_petg.xml.fdm_material b/generic_petg.xml.fdm_material index bdb098443..1e3093d4b 100644 --- a/generic_petg.xml.fdm_material +++ b/generic_petg.xml.fdm_material @@ -53,7 +53,7 @@ Generic PETG profile. The data in this file may not be correct for your specific 0 - + 85 yes @@ -72,8 +72,8 @@ Generic PETG profile. The data in this file may not be correct for your specific - - + + 85 yes @@ -89,7 +89,7 @@ Generic PETG profile. The data in this file may not be correct for your specific - + 100.5 100.1 @@ -110,8 +110,8 @@ Generic PETG profile. The data in this file may not be correct for your specific - - + + 100.5 100.1 @@ -135,6 +135,5 @@ Generic PETG profile. The data in this file may not be correct for your specific - - \ No newline at end of file + diff --git a/generic_petg_175.xml.fdm_material b/generic_petg_175.xml.fdm_material index 4ecf6f44e..f2d2921a6 100644 --- a/generic_petg_175.xml.fdm_material +++ b/generic_petg_175.xml.fdm_material @@ -82,6 +82,5 @@ Generic PETG 1.75mm profile. The data in this file may not be correct for your s 80 - diff --git a/generic_pla.xml.fdm_material b/generic_pla.xml.fdm_material index 4bd6468d6..c4150e5ba 100644 --- a/generic_pla.xml.fdm_material +++ b/generic_pla.xml.fdm_material @@ -54,8 +54,8 @@ Generic PLA profile. The data in this file may not be correct for your specific 0 - - + + @@ -64,22 +64,22 @@ Generic PLA profile. The data in this file may not be correct for your specific - - - + + + - - + + - + - - + + 100 yes @@ -96,7 +96,7 @@ Generic PLA profile. The data in this file may not be correct for your specific - + yes 195 @@ -114,7 +114,7 @@ Generic PLA profile. The data in this file may not be correct for your specific - + 100 100.2 100.1 @@ -143,8 +143,8 @@ Generic PLA profile. The data in this file may not be correct for your specific - - + + 100 100.2 @@ -174,6 +174,5 @@ Generic PLA profile. The data in this file may not be correct for your specific - - \ No newline at end of file + diff --git a/generic_pla_175.xml.fdm_material b/generic_pla_175.xml.fdm_material index d2490e0b6..18a36f0e9 100644 --- a/generic_pla_175.xml.fdm_material +++ b/generic_pla_175.xml.fdm_material @@ -124,19 +124,18 @@ Generic PLA 1.75mm profile. The data in this file may not be correct for your sp - + 200 200 50 - + 210 55 - diff --git a/generic_pp.xml.fdm_material b/generic_pp.xml.fdm_material index f5cb22206..1406642dc 100644 --- a/generic_pp.xml.fdm_material +++ b/generic_pp.xml.fdm_material @@ -56,13 +56,13 @@ Generic Polypropylene profile. Serves as an example file, data in this file is n 0 - + 220 - - + + 220 8 @@ -73,8 +73,8 @@ Generic Polypropylene profile. Serves as an example file, data in this file is n - - + + yes @@ -95,7 +95,7 @@ Generic Polypropylene profile. Serves as an example file, data in this file is n - + yes 8 25 @@ -113,7 +113,7 @@ Generic Polypropylene profile. Serves as an example file, data in this file is n - + 85 @@ -134,8 +134,8 @@ Generic Polypropylene profile. Serves as an example file, data in this file is n - - + + 85 @@ -156,6 +156,5 @@ Generic Polypropylene profile. Serves as an example file, data in this file is n - - \ No newline at end of file + diff --git a/generic_pva.xml.fdm_material b/generic_pva.xml.fdm_material index 00013094e..f3ccd8bed 100644 --- a/generic_pva.xml.fdm_material +++ b/generic_pva.xml.fdm_material @@ -56,17 +56,17 @@ Generic PVA profile. The data in this file may not be correct for your specific true - - - - - + + + + + no - - + + no @@ -85,7 +85,7 @@ Generic PVA profile. The data in this file may not be correct for your specific - + no @@ -113,8 +113,8 @@ Generic PVA profile. The data in this file may not be correct for your specific - - + + no @@ -163,6 +163,5 @@ Generic PVA profile. The data in this file may not be correct for your specific - - \ No newline at end of file + diff --git a/generic_pva_175.xml.fdm_material b/generic_pva_175.xml.fdm_material index a4ab11121..d8b3fca7f 100644 --- a/generic_pva_175.xml.fdm_material +++ b/generic_pva_175.xml.fdm_material @@ -50,6 +50,5 @@ Generic PVA 1.75mm profile. The data in this file may not be correct for your sp - diff --git a/generic_tough_pla.xml.fdm_material b/generic_tough_pla.xml.fdm_material index 351fe0f7a..89f404667 100644 --- a/generic_tough_pla.xml.fdm_material +++ b/generic_tough_pla.xml.fdm_material @@ -54,8 +54,8 @@ Generic Tough PLA profile. The data in this file may not be correct for your spe 0 - - + + 100 @@ -73,7 +73,7 @@ Generic Tough PLA profile. The data in this file may not be correct for your spe - + 210 @@ -91,7 +91,7 @@ Generic Tough PLA profile. The data in this file may not be correct for your spe - + 100 100.3 100.1 @@ -110,8 +110,8 @@ Generic Tough PLA profile. The data in this file may not be correct for your spe - - + + 100 100.3 @@ -130,6 +130,5 @@ Generic Tough PLA profile. The data in this file may not be correct for your spe - - \ No newline at end of file + diff --git a/generic_tpu.xml.fdm_material b/generic_tpu.xml.fdm_material index b22c91614..505197684 100644 --- a/generic_tpu.xml.fdm_material +++ b/generic_tpu.xml.fdm_material @@ -54,13 +54,13 @@ Generic TPU 95A profile. The data in this file may not be correct for your speci 0 - + 228 - - + + 228 yes @@ -73,8 +73,8 @@ Generic TPU 95A profile. The data in this file may not be correct for your speci - - + + yes @@ -90,7 +90,7 @@ Generic TPU 95A profile. The data in this file may not be correct for your speci - + yes 235 10 @@ -108,7 +108,7 @@ Generic TPU 95A profile. The data in this file may not be correct for your speci - + yes @@ -123,8 +123,8 @@ Generic TPU 95A profile. The data in this file may not be correct for your speci - - + + yes @@ -140,6 +140,5 @@ Generic TPU 95A profile. The data in this file may not be correct for your speci - - \ No newline at end of file + diff --git a/ultimaker_abs.xml.fdm_material b/ultimaker_abs.xml.fdm_material index f08e6cfb0..c97a3ee74 100644 --- a/ultimaker_abs.xml.fdm_material +++ b/ultimaker_abs.xml.fdm_material @@ -56,13 +56,13 @@ 0 - + 230 - - + + 230 @@ -72,8 +72,8 @@ - - + + yes 5 @@ -91,7 +91,7 @@ - + 85 yes @@ -110,7 +110,7 @@ - + 85 yes @@ -127,8 +127,8 @@ - - + + 85 yes @@ -144,6 +144,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_abs_black.xml.fdm_material b/ultimaker_abs_black.xml.fdm_material index 433cb8dd4..0bfb9947c 100644 --- a/ultimaker_abs_black.xml.fdm_material +++ b/ultimaker_abs_black.xml.fdm_material @@ -54,13 +54,13 @@ 0 - + 230 - - + + 230 @@ -70,8 +70,8 @@ - - + + yes 5 @@ -89,7 +89,7 @@ - + 85 yes @@ -108,7 +108,7 @@ - + 85 yes @@ -125,8 +125,8 @@ - - + + 85 yes @@ -142,6 +142,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_abs_blue.xml.fdm_material b/ultimaker_abs_blue.xml.fdm_material index e578935f8..b60475023 100644 --- a/ultimaker_abs_blue.xml.fdm_material +++ b/ultimaker_abs_blue.xml.fdm_material @@ -54,13 +54,13 @@ 0 - + 230 - - + + 230 @@ -70,8 +70,8 @@ - - + + yes 5 @@ -89,7 +89,7 @@ - + 85 yes @@ -108,7 +108,7 @@ - + 85 yes @@ -125,8 +125,8 @@ - - + + 85 yes @@ -142,6 +142,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_abs_green.xml.fdm_material b/ultimaker_abs_green.xml.fdm_material index a3d59ef6f..d7e7b21ba 100644 --- a/ultimaker_abs_green.xml.fdm_material +++ b/ultimaker_abs_green.xml.fdm_material @@ -54,13 +54,13 @@ 0 - + 230 - - + + 230 @@ -70,8 +70,8 @@ - - + + yes 5 @@ -89,7 +89,7 @@ - + 85 yes @@ -108,7 +108,7 @@ - + 85 yes @@ -125,8 +125,8 @@ - - + + 85 yes @@ -142,6 +142,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_abs_grey.xml.fdm_material b/ultimaker_abs_grey.xml.fdm_material index 8e41103b0..5e42d68f7 100644 --- a/ultimaker_abs_grey.xml.fdm_material +++ b/ultimaker_abs_grey.xml.fdm_material @@ -54,13 +54,13 @@ 0 - + 230 - - + + 230 @@ -70,8 +70,8 @@ - - + + yes 5 @@ -89,7 +89,7 @@ - + 85 yes @@ -108,7 +108,7 @@ - + 85 yes @@ -125,8 +125,8 @@ - - + + 85 yes @@ -142,6 +142,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_abs_orange.xml.fdm_material b/ultimaker_abs_orange.xml.fdm_material index 698f4aa6d..75141c70f 100644 --- a/ultimaker_abs_orange.xml.fdm_material +++ b/ultimaker_abs_orange.xml.fdm_material @@ -54,13 +54,13 @@ 0 - + 230 - - + + 230 @@ -70,8 +70,8 @@ - - + + yes 5 @@ -89,7 +89,7 @@ - + 85 yes @@ -108,7 +108,7 @@ - + 85 yes @@ -125,8 +125,8 @@ - - + + 85 yes @@ -142,6 +142,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_abs_pearl-gold.xml.fdm_material b/ultimaker_abs_pearl-gold.xml.fdm_material index 785e6896b..e3ee23fdf 100644 --- a/ultimaker_abs_pearl-gold.xml.fdm_material +++ b/ultimaker_abs_pearl-gold.xml.fdm_material @@ -54,13 +54,13 @@ 0 - + 230 - - + + 230 @@ -70,8 +70,8 @@ - - + + yes 5 @@ -89,7 +89,7 @@ - + 85 yes @@ -108,7 +108,7 @@ - + 85 yes @@ -125,8 +125,8 @@ - - + + 85 yes @@ -142,6 +142,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_abs_red.xml.fdm_material b/ultimaker_abs_red.xml.fdm_material index 239eb78ea..148b0d56e 100644 --- a/ultimaker_abs_red.xml.fdm_material +++ b/ultimaker_abs_red.xml.fdm_material @@ -54,13 +54,13 @@ 0 - + 230 - - + + 230 @@ -70,8 +70,8 @@ - - + + yes 5 @@ -89,7 +89,7 @@ - + 85 yes @@ -108,7 +108,7 @@ - + 85 yes @@ -125,8 +125,8 @@ - - + + 85 yes @@ -142,6 +142,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_abs_silver-metallic.xml.fdm_material b/ultimaker_abs_silver-metallic.xml.fdm_material index c454d990a..88b4ea0b3 100644 --- a/ultimaker_abs_silver-metallic.xml.fdm_material +++ b/ultimaker_abs_silver-metallic.xml.fdm_material @@ -54,13 +54,13 @@ 0 - + 230 - - + + 230 @@ -70,8 +70,8 @@ - - + + yes 5 @@ -89,7 +89,7 @@ - + 85 yes @@ -108,7 +108,7 @@ - + 85 yes @@ -125,8 +125,8 @@ - - + + 85 yes @@ -142,6 +142,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_abs_white.xml.fdm_material b/ultimaker_abs_white.xml.fdm_material index f67bcca23..9f3d5bb64 100644 --- a/ultimaker_abs_white.xml.fdm_material +++ b/ultimaker_abs_white.xml.fdm_material @@ -54,13 +54,13 @@ 0 - + 230 - - + + 230 @@ -70,8 +70,8 @@ - - + + yes 5 @@ -89,7 +89,7 @@ - + 85 yes @@ -108,7 +108,7 @@ - + 85 yes @@ -125,8 +125,8 @@ - - + + 85 yes @@ -142,6 +142,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_abs_yellow.xml.fdm_material b/ultimaker_abs_yellow.xml.fdm_material index ba4c018c5..1567e45f9 100644 --- a/ultimaker_abs_yellow.xml.fdm_material +++ b/ultimaker_abs_yellow.xml.fdm_material @@ -54,13 +54,13 @@ 0 - + 230 - - + + 230 @@ -70,8 +70,8 @@ - - + + yes 5 @@ -89,7 +89,7 @@ - + 85 yes @@ -108,7 +108,7 @@ - + 85 yes @@ -125,8 +125,8 @@ - - + + 85 yes @@ -142,6 +142,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_abscf_175.xml.fdm_material b/ultimaker_abscf_175.xml.fdm_material index 4ddc3e565..0f6cf307e 100644 --- a/ultimaker_abscf_175.xml.fdm_material +++ b/ultimaker_abscf_175.xml.fdm_material @@ -30,7 +30,7 @@ 100.68 - + no @@ -52,7 +52,7 @@ - + 85 95 diff --git a/ultimaker_absr_175.xml.fdm_material b/ultimaker_absr_175.xml.fdm_material index 448d78903..22d6e9c8b 100644 --- a/ultimaker_absr_175.xml.fdm_material +++ b/ultimaker_absr_175.xml.fdm_material @@ -30,7 +30,7 @@ 100.59 - + no @@ -50,8 +50,9 @@ yes + - + 85 95 diff --git a/ultimaker_asa_175.xml.fdm_material b/ultimaker_asa_175.xml.fdm_material index 74e13a2f1..d7041e8ad 100644 --- a/ultimaker_asa_175.xml.fdm_material +++ b/ultimaker_asa_175.xml.fdm_material @@ -28,7 +28,7 @@ yes - + 255 190 93 @@ -55,8 +55,9 @@ yes + - + 255 190 85 diff --git a/ultimaker_bam.xml.fdm_material b/ultimaker_bam.xml.fdm_material index 0a4e0a9d0..6c1b04ffc 100644 --- a/ultimaker_bam.xml.fdm_material +++ b/ultimaker_bam.xml.fdm_material @@ -54,8 +54,8 @@ true - - + + 100 yes @@ -64,7 +64,7 @@ - + 100 yes @@ -73,8 +73,8 @@ - - + + 100 @@ -83,6 +83,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_cpe.xml.fdm_material b/ultimaker_cpe.xml.fdm_material index f937ed3d2..633f2df7a 100644 --- a/ultimaker_cpe.xml.fdm_material +++ b/ultimaker_cpe.xml.fdm_material @@ -54,13 +54,13 @@ 0 - + 240 - - + + 240 @@ -70,8 +70,8 @@ - - + + 85 all @@ -88,7 +88,7 @@ - + 85 yes @@ -107,7 +107,7 @@ - + 85 yes @@ -124,8 +124,8 @@ - - + + 85 @@ -146,6 +146,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_cpe_black.xml.fdm_material b/ultimaker_cpe_black.xml.fdm_material index ac533fbf7..bcae96bda 100644 --- a/ultimaker_cpe_black.xml.fdm_material +++ b/ultimaker_cpe_black.xml.fdm_material @@ -52,13 +52,13 @@ 0 - + 240 - - + + 240 @@ -68,8 +68,8 @@ - - + + 85 all @@ -86,7 +86,7 @@ - + 85 yes @@ -105,7 +105,7 @@ - + 85 yes @@ -122,8 +122,8 @@ - - + + 85 @@ -144,6 +144,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_cpe_blue.xml.fdm_material b/ultimaker_cpe_blue.xml.fdm_material index 791b1cffa..1f16541a4 100644 --- a/ultimaker_cpe_blue.xml.fdm_material +++ b/ultimaker_cpe_blue.xml.fdm_material @@ -52,13 +52,13 @@ 0 - + 240 - - + + 240 @@ -68,8 +68,8 @@ - - + + 85 all @@ -86,7 +86,7 @@ - + 85 yes @@ -105,7 +105,7 @@ - + 85 yes @@ -122,8 +122,8 @@ - - + + 85 @@ -144,6 +144,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_cpe_dark-grey.xml.fdm_material b/ultimaker_cpe_dark-grey.xml.fdm_material index 38937bdc6..a53c4283e 100644 --- a/ultimaker_cpe_dark-grey.xml.fdm_material +++ b/ultimaker_cpe_dark-grey.xml.fdm_material @@ -52,13 +52,13 @@ 0 - + 240 - - + + 240 @@ -68,8 +68,8 @@ - - + + 85 all @@ -86,7 +86,7 @@ - + 85 yes @@ -105,7 +105,7 @@ - + 85 yes @@ -122,8 +122,8 @@ - - + + 85 @@ -144,6 +144,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_cpe_green.xml.fdm_material b/ultimaker_cpe_green.xml.fdm_material index 70b6579c7..d07680247 100644 --- a/ultimaker_cpe_green.xml.fdm_material +++ b/ultimaker_cpe_green.xml.fdm_material @@ -52,13 +52,13 @@ 0 - + 240 - - + + 240 @@ -68,8 +68,8 @@ - - + + 85 all @@ -86,7 +86,7 @@ - + 85 yes @@ -105,7 +105,7 @@ - + 85 yes @@ -122,8 +122,8 @@ - - + + 85 @@ -144,6 +144,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_cpe_light-grey.xml.fdm_material b/ultimaker_cpe_light-grey.xml.fdm_material index c12a405f8..8243a8526 100644 --- a/ultimaker_cpe_light-grey.xml.fdm_material +++ b/ultimaker_cpe_light-grey.xml.fdm_material @@ -52,13 +52,13 @@ 0 - + 240 - - + + 240 @@ -68,8 +68,8 @@ - - + + 85 all @@ -86,7 +86,7 @@ - + 85 yes @@ -105,7 +105,7 @@ - + 85 yes @@ -122,8 +122,8 @@ - - + + 85 @@ -144,6 +144,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_cpe_plus.xml.fdm_material b/ultimaker_cpe_plus.xml.fdm_material index 65fe47a3b..e1b0ea6e3 100644 --- a/ultimaker_cpe_plus.xml.fdm_material +++ b/ultimaker_cpe_plus.xml.fdm_material @@ -55,13 +55,13 @@ 0 - + 260 - - + + 260 yes @@ -71,8 +71,8 @@ - - + + all @@ -88,7 +88,7 @@ - + 260 yes @@ -100,7 +100,7 @@ - + 110 @@ -116,8 +116,8 @@ - - + + 110 @@ -134,6 +134,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_cpe_plus_black.xml.fdm_material b/ultimaker_cpe_plus_black.xml.fdm_material index 0d48da696..30cc5541d 100644 --- a/ultimaker_cpe_plus_black.xml.fdm_material +++ b/ultimaker_cpe_plus_black.xml.fdm_material @@ -53,13 +53,13 @@ 0 - + 260 - - + + 260 yes @@ -69,8 +69,8 @@ - - + + all @@ -86,7 +86,7 @@ - + 260 yes @@ -98,7 +98,7 @@ - + 110 @@ -114,8 +114,8 @@ - - + + 110 @@ -132,6 +132,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_cpe_plus_transparent.xml.fdm_material b/ultimaker_cpe_plus_transparent.xml.fdm_material index cd7c792ca..e91185d79 100644 --- a/ultimaker_cpe_plus_transparent.xml.fdm_material +++ b/ultimaker_cpe_plus_transparent.xml.fdm_material @@ -53,13 +53,13 @@ 0 - + 260 - - + + 260 yes @@ -69,8 +69,8 @@ - - + + all @@ -86,7 +86,7 @@ - + 260 yes @@ -98,7 +98,7 @@ - + 110 @@ -114,8 +114,8 @@ - - + + 110 @@ -132,6 +132,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_cpe_plus_white.xml.fdm_material b/ultimaker_cpe_plus_white.xml.fdm_material index bedae50cf..3656e70e1 100644 --- a/ultimaker_cpe_plus_white.xml.fdm_material +++ b/ultimaker_cpe_plus_white.xml.fdm_material @@ -53,13 +53,13 @@ 0 - + 260 - - + + 260 yes @@ -69,8 +69,8 @@ - - + + all @@ -86,7 +86,7 @@ - + 260 yes @@ -98,7 +98,7 @@ - + 110 @@ -114,8 +114,8 @@ - - + + 110 @@ -132,6 +132,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_cpe_red.xml.fdm_material b/ultimaker_cpe_red.xml.fdm_material index bf46d83d6..2f7de50b0 100644 --- a/ultimaker_cpe_red.xml.fdm_material +++ b/ultimaker_cpe_red.xml.fdm_material @@ -52,13 +52,13 @@ 0 - + 240 - - + + 240 @@ -68,8 +68,8 @@ - - + + 85 all @@ -86,7 +86,7 @@ - + 85 yes @@ -105,7 +105,7 @@ - + 85 yes @@ -122,8 +122,8 @@ - - + + 85 @@ -144,6 +144,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_cpe_transparent.xml.fdm_material b/ultimaker_cpe_transparent.xml.fdm_material index f6a11953d..65efa968f 100644 --- a/ultimaker_cpe_transparent.xml.fdm_material +++ b/ultimaker_cpe_transparent.xml.fdm_material @@ -52,13 +52,13 @@ 0 - + 240 - - + + 240 @@ -68,8 +68,8 @@ - - + + 85 all @@ -86,7 +86,7 @@ - + 85 yes @@ -105,7 +105,7 @@ - + 85 yes @@ -122,8 +122,8 @@ - - + + 85 @@ -144,6 +144,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_cpe_white.xml.fdm_material b/ultimaker_cpe_white.xml.fdm_material index d87cb868f..13f8711b4 100644 --- a/ultimaker_cpe_white.xml.fdm_material +++ b/ultimaker_cpe_white.xml.fdm_material @@ -52,13 +52,13 @@ 0 - + 240 - - + + 240 @@ -68,8 +68,8 @@ - - + + 85 all @@ -86,7 +86,7 @@ - + 85 yes @@ -105,7 +105,7 @@ - + 85 yes @@ -122,8 +122,8 @@ - - + + 85 @@ -144,6 +144,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_cpe_yellow.xml.fdm_material b/ultimaker_cpe_yellow.xml.fdm_material index be41ac7d5..d7d5bc7f1 100644 --- a/ultimaker_cpe_yellow.xml.fdm_material +++ b/ultimaker_cpe_yellow.xml.fdm_material @@ -52,13 +52,13 @@ 0 - + 240 - - + + 240 @@ -68,8 +68,8 @@ - - + + 85 all @@ -86,7 +86,7 @@ - + 85 yes @@ -105,7 +105,7 @@ - + 85 yes @@ -122,8 +122,8 @@ - - + + 85 @@ -144,6 +144,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_nylon.xml.fdm_material b/ultimaker_nylon.xml.fdm_material index 3caa9a1e1..391489ae6 100644 --- a/ultimaker_nylon.xml.fdm_material +++ b/ultimaker_nylon.xml.fdm_material @@ -57,13 +57,13 @@ 0 - + 245 - - + + 245 @@ -73,8 +73,8 @@ - - + + 40 40 @@ -92,7 +92,7 @@ - + yes 240 @@ -112,7 +112,7 @@ - + 40 40 @@ -132,8 +132,8 @@ - - + + 40 40 @@ -155,6 +155,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_nylon12-cf_175.xml.fdm_material b/ultimaker_nylon12-cf_175.xml.fdm_material index 55f82679e..09a213d03 100644 --- a/ultimaker_nylon12-cf_175.xml.fdm_material +++ b/ultimaker_nylon12-cf_175.xml.fdm_material @@ -30,7 +30,7 @@ 100.6 - + 93 no @@ -51,8 +51,9 @@ yes + - + no @@ -72,6 +73,6 @@ yes - + diff --git a/ultimaker_nylon_black.xml.fdm_material b/ultimaker_nylon_black.xml.fdm_material index 891bd38af..52d4df192 100644 --- a/ultimaker_nylon_black.xml.fdm_material +++ b/ultimaker_nylon_black.xml.fdm_material @@ -55,13 +55,13 @@ 0 - + 245 - - + + 245 @@ -71,8 +71,8 @@ - - + + 40 40 @@ -90,7 +90,7 @@ - + yes 240 @@ -110,7 +110,7 @@ - + 40 40 @@ -130,8 +130,8 @@ - - + + 40 40 @@ -153,6 +153,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_nylon_transparent.xml.fdm_material b/ultimaker_nylon_transparent.xml.fdm_material index 2683abd9b..7e011e22d 100644 --- a/ultimaker_nylon_transparent.xml.fdm_material +++ b/ultimaker_nylon_transparent.xml.fdm_material @@ -55,13 +55,13 @@ 0 - + 245 - - + + 245 @@ -71,8 +71,8 @@ - - + + 40 40 @@ -90,7 +90,7 @@ - + yes 240 @@ -110,7 +110,7 @@ - + 40 40 @@ -130,8 +130,8 @@ - - + + 40 40 @@ -153,6 +153,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_pc.xml.fdm_material b/ultimaker_pc.xml.fdm_material index 150e1d9fb..730972b8f 100644 --- a/ultimaker_pc.xml.fdm_material +++ b/ultimaker_pc.xml.fdm_material @@ -56,13 +56,13 @@ 0 - + 270 - - + + 270 yes @@ -73,8 +73,8 @@ - - + + yes @@ -93,7 +93,7 @@ - + 260 yes @@ -103,7 +103,7 @@ - + 110 @@ -122,8 +122,8 @@ - - + + 110 @@ -143,7 +143,5 @@ - - - \ No newline at end of file + diff --git a/ultimaker_pc_black.xml.fdm_material b/ultimaker_pc_black.xml.fdm_material index ad14648a7..96d6e5a66 100644 --- a/ultimaker_pc_black.xml.fdm_material +++ b/ultimaker_pc_black.xml.fdm_material @@ -54,13 +54,13 @@ 0 - + 270 - - + + 270 yes @@ -71,8 +71,8 @@ - - + + yes @@ -91,7 +91,7 @@ - + 260 yes @@ -101,7 +101,7 @@ - + 110 @@ -120,8 +120,8 @@ - - + + 110 @@ -141,7 +141,5 @@ - - - \ No newline at end of file + diff --git a/ultimaker_pc_transparent.xml.fdm_material b/ultimaker_pc_transparent.xml.fdm_material index b22c34b69..244c985d8 100644 --- a/ultimaker_pc_transparent.xml.fdm_material +++ b/ultimaker_pc_transparent.xml.fdm_material @@ -54,13 +54,13 @@ 0 - + 270 - - + + 270 yes @@ -71,8 +71,8 @@ - - + + yes @@ -91,7 +91,7 @@ - + 260 yes @@ -101,7 +101,7 @@ - + 110 @@ -120,8 +120,8 @@ - - + + 110 @@ -141,7 +141,5 @@ - - - \ No newline at end of file + diff --git a/ultimaker_pc_white.xml.fdm_material b/ultimaker_pc_white.xml.fdm_material index 811e1963c..4afb33975 100644 --- a/ultimaker_pc_white.xml.fdm_material +++ b/ultimaker_pc_white.xml.fdm_material @@ -54,13 +54,13 @@ 0 - + 270 - - + + 270 yes @@ -71,8 +71,8 @@ - - + + yes @@ -91,7 +91,7 @@ - + 260 yes @@ -101,7 +101,7 @@ - + 110 @@ -120,8 +120,8 @@ - - + + 110 @@ -141,7 +141,5 @@ - - - \ No newline at end of file + diff --git a/ultimaker_petcf.xml.fdm_material b/ultimaker_petcf.xml.fdm_material index 5aad54db9..240604162 100644 --- a/ultimaker_petcf.xml.fdm_material +++ b/ultimaker_petcf.xml.fdm_material @@ -59,7 +59,7 @@ 0 - + no @@ -85,8 +85,8 @@ - - + + no @@ -112,6 +112,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_petcf_black.xml.fdm_material b/ultimaker_petcf_black.xml.fdm_material index 7bcc2ca74..045a67dad 100644 --- a/ultimaker_petcf_black.xml.fdm_material +++ b/ultimaker_petcf_black.xml.fdm_material @@ -57,7 +57,7 @@ 0 - + no @@ -83,8 +83,8 @@ - - + + no @@ -110,6 +110,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_petcf_blue.xml.fdm_material b/ultimaker_petcf_blue.xml.fdm_material index d87e71f82..050f1417a 100644 --- a/ultimaker_petcf_blue.xml.fdm_material +++ b/ultimaker_petcf_blue.xml.fdm_material @@ -57,7 +57,7 @@ 0 - + no @@ -83,8 +83,8 @@ - - + + no @@ -110,6 +110,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_petcf_gray.xml.fdm_material b/ultimaker_petcf_gray.xml.fdm_material index 32354e2b8..2a1a38369 100644 --- a/ultimaker_petcf_gray.xml.fdm_material +++ b/ultimaker_petcf_gray.xml.fdm_material @@ -57,7 +57,7 @@ 0 - + no @@ -83,8 +83,8 @@ - - + + no @@ -110,6 +110,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_petg.xml.fdm_material b/ultimaker_petg.xml.fdm_material index c6ded1973..702b3d47a 100644 --- a/ultimaker_petg.xml.fdm_material +++ b/ultimaker_petg.xml.fdm_material @@ -54,7 +54,7 @@ 0 - + 85 yes @@ -73,8 +73,8 @@ - - + + 85 yes @@ -90,7 +90,7 @@ - + 100.5 100.1 @@ -111,8 +111,8 @@ - - + + 100.5 100.1 @@ -136,6 +136,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_petg_black.xml.fdm_material b/ultimaker_petg_black.xml.fdm_material index 949b0c5ee..fa2c5ed9e 100644 --- a/ultimaker_petg_black.xml.fdm_material +++ b/ultimaker_petg_black.xml.fdm_material @@ -52,7 +52,7 @@ 0 - + 85 yes @@ -71,8 +71,8 @@ - - + + 85 yes @@ -88,7 +88,7 @@ - + 100.5 100.1 @@ -109,8 +109,8 @@ - - + + 100.5 100.1 @@ -134,6 +134,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_petg_blue.xml.fdm_material b/ultimaker_petg_blue.xml.fdm_material index af3f8d97d..efb90c2c8 100644 --- a/ultimaker_petg_blue.xml.fdm_material +++ b/ultimaker_petg_blue.xml.fdm_material @@ -52,7 +52,7 @@ 0 - + 85 yes @@ -71,8 +71,8 @@ - - + + 85 yes @@ -88,7 +88,7 @@ - + 100.5 100.1 @@ -109,8 +109,8 @@ - - + + 100.5 100.1 @@ -134,6 +134,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_petg_blue_translucent.xml.fdm_material b/ultimaker_petg_blue_translucent.xml.fdm_material index 53ac3b823..55f3b6428 100644 --- a/ultimaker_petg_blue_translucent.xml.fdm_material +++ b/ultimaker_petg_blue_translucent.xml.fdm_material @@ -52,7 +52,7 @@ 0 - + 85 yes @@ -71,8 +71,8 @@ - - + + 85 yes @@ -88,7 +88,7 @@ - + 100.5 100.1 @@ -109,8 +109,8 @@ - - + + 100.5 100.1 @@ -134,6 +134,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_petg_green.xml.fdm_material b/ultimaker_petg_green.xml.fdm_material index 28bb04999..832c9bc29 100644 --- a/ultimaker_petg_green.xml.fdm_material +++ b/ultimaker_petg_green.xml.fdm_material @@ -52,7 +52,7 @@ 0 - + 85 yes @@ -71,8 +71,8 @@ - - + + 85 yes @@ -88,7 +88,7 @@ - + 100.5 100.1 @@ -109,8 +109,8 @@ - - + + 100.5 100.1 @@ -134,6 +134,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_petg_green_translucent.xml.fdm_material b/ultimaker_petg_green_translucent.xml.fdm_material index 00222696c..fecbf7e98 100644 --- a/ultimaker_petg_green_translucent.xml.fdm_material +++ b/ultimaker_petg_green_translucent.xml.fdm_material @@ -52,7 +52,7 @@ 0 - + 85 yes @@ -71,8 +71,8 @@ - - + + 85 yes @@ -88,7 +88,7 @@ - + 100.5 100.1 @@ -109,8 +109,8 @@ - - + + 100.5 100.1 @@ -134,6 +134,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_petg_grey.xml.fdm_material b/ultimaker_petg_grey.xml.fdm_material index 72ea459f2..ccee9045a 100644 --- a/ultimaker_petg_grey.xml.fdm_material +++ b/ultimaker_petg_grey.xml.fdm_material @@ -52,7 +52,7 @@ 0 - + 85 yes @@ -71,8 +71,8 @@ - - + + 85 yes @@ -88,7 +88,7 @@ - + 100.5 100.1 @@ -109,8 +109,8 @@ - - + + 100.5 100.1 @@ -134,6 +134,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_petg_orange.xml.fdm_material b/ultimaker_petg_orange.xml.fdm_material index 2468d8c95..7c36f2703 100644 --- a/ultimaker_petg_orange.xml.fdm_material +++ b/ultimaker_petg_orange.xml.fdm_material @@ -52,7 +52,7 @@ 0 - + 85 yes @@ -71,8 +71,8 @@ - - + + 85 yes @@ -88,7 +88,7 @@ - + 100.5 100.1 @@ -109,8 +109,8 @@ - - + + 100.5 100.1 @@ -134,6 +134,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_petg_red.xml.fdm_material b/ultimaker_petg_red.xml.fdm_material index eec7e26f1..81f7ec245 100644 --- a/ultimaker_petg_red.xml.fdm_material +++ b/ultimaker_petg_red.xml.fdm_material @@ -52,7 +52,7 @@ 0 - + 85 yes @@ -71,8 +71,8 @@ - - + + 85 yes @@ -88,7 +88,7 @@ - + 100.5 100.1 @@ -109,8 +109,8 @@ - - + + 100.5 100.1 @@ -134,6 +134,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_petg_red_translucent.xml.fdm_material b/ultimaker_petg_red_translucent.xml.fdm_material index 454a084ee..c145f5777 100644 --- a/ultimaker_petg_red_translucent.xml.fdm_material +++ b/ultimaker_petg_red_translucent.xml.fdm_material @@ -52,7 +52,7 @@ 0 - + 85 yes @@ -71,8 +71,8 @@ - - + + 85 yes @@ -88,7 +88,7 @@ - + 100.5 100.1 @@ -109,8 +109,8 @@ - - + + 100.5 100.1 @@ -134,6 +134,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_petg_silver.xml.fdm_material b/ultimaker_petg_silver.xml.fdm_material index debb12610..60a3dc57c 100644 --- a/ultimaker_petg_silver.xml.fdm_material +++ b/ultimaker_petg_silver.xml.fdm_material @@ -52,7 +52,7 @@ 0 - + 85 yes @@ -71,8 +71,8 @@ - - + + 85 yes @@ -88,7 +88,7 @@ - + 100.5 100.1 @@ -109,8 +109,8 @@ - - + + 100.5 100.1 @@ -134,6 +134,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_petg_transparent.xml.fdm_material b/ultimaker_petg_transparent.xml.fdm_material index 3aa382b13..f76425c1b 100644 --- a/ultimaker_petg_transparent.xml.fdm_material +++ b/ultimaker_petg_transparent.xml.fdm_material @@ -52,7 +52,7 @@ 0 - + 85 yes @@ -71,8 +71,8 @@ - - + + 85 yes @@ -88,7 +88,7 @@ - + 100.5 100.1 @@ -109,8 +109,8 @@ - - + + 100.5 100.1 @@ -134,6 +134,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_petg_white.xml.fdm_material b/ultimaker_petg_white.xml.fdm_material index a9dcc1e43..d7536ce80 100644 --- a/ultimaker_petg_white.xml.fdm_material +++ b/ultimaker_petg_white.xml.fdm_material @@ -52,7 +52,7 @@ 0 - + 85 yes @@ -71,8 +71,8 @@ - - + + 85 yes @@ -88,7 +88,7 @@ - + 100.5 100.1 @@ -109,8 +109,8 @@ - - + + 100.5 100.1 @@ -134,6 +134,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_petg_yellow.xml.fdm_material b/ultimaker_petg_yellow.xml.fdm_material index ead32d016..f88b2865a 100644 --- a/ultimaker_petg_yellow.xml.fdm_material +++ b/ultimaker_petg_yellow.xml.fdm_material @@ -52,7 +52,7 @@ 0 - + 85 yes @@ -71,8 +71,8 @@ - - + + 85 yes @@ -88,7 +88,7 @@ - + 100.5 100.1 @@ -109,8 +109,8 @@ - - + + 100.5 100.1 @@ -134,6 +134,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_petg_yellow_fluorescent.xml.fdm_material b/ultimaker_petg_yellow_fluorescent.xml.fdm_material index 6de7e28d6..a0ec1e5d7 100644 --- a/ultimaker_petg_yellow_fluorescent.xml.fdm_material +++ b/ultimaker_petg_yellow_fluorescent.xml.fdm_material @@ -52,7 +52,7 @@ 0 - + 85 yes @@ -71,8 +71,8 @@ - - + + 85 yes @@ -88,7 +88,7 @@ - + 100.5 100.1 @@ -109,8 +109,8 @@ - - + + 100.5 100.1 @@ -134,6 +134,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_pla.xml.fdm_material b/ultimaker_pla.xml.fdm_material index 9f7cd1b22..d1a7d8c78 100644 --- a/ultimaker_pla.xml.fdm_material +++ b/ultimaker_pla.xml.fdm_material @@ -55,8 +55,8 @@ 0 - - + + @@ -65,22 +65,22 @@ - - - + + + - - + + - + - - + + 100 yes @@ -97,7 +97,7 @@ - + yes 195 @@ -115,7 +115,7 @@ - + 100 100.2 100.1 @@ -144,8 +144,8 @@ - - + + 100 100.2 @@ -175,6 +175,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_pla_black.xml.fdm_material b/ultimaker_pla_black.xml.fdm_material index 4d1104021..f6b0f82a6 100644 --- a/ultimaker_pla_black.xml.fdm_material +++ b/ultimaker_pla_black.xml.fdm_material @@ -53,8 +53,8 @@ 0 - - + + @@ -63,22 +63,22 @@ - - - + + + - - + + - + - - + + 100 yes @@ -95,7 +95,7 @@ - + yes 195 @@ -113,7 +113,7 @@ - + 100 100.2 100.1 @@ -142,8 +142,8 @@ - - + + 100 100.2 @@ -173,6 +173,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_pla_blue.xml.fdm_material b/ultimaker_pla_blue.xml.fdm_material index aa74ac82f..851f21c26 100644 --- a/ultimaker_pla_blue.xml.fdm_material +++ b/ultimaker_pla_blue.xml.fdm_material @@ -53,8 +53,8 @@ 0 - - + + @@ -63,22 +63,22 @@ - - - + + + - - + + - + - - + + 100 yes @@ -95,7 +95,7 @@ - + yes 195 @@ -113,7 +113,7 @@ - + 100 100.2 100.1 @@ -142,8 +142,8 @@ - - + + 100 100.2 @@ -173,6 +173,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_pla_green.xml.fdm_material b/ultimaker_pla_green.xml.fdm_material index ca2c62373..05223c622 100644 --- a/ultimaker_pla_green.xml.fdm_material +++ b/ultimaker_pla_green.xml.fdm_material @@ -53,8 +53,8 @@ 0 - - + + @@ -63,22 +63,22 @@ - - - + + + - - + + - + - - + + 100 yes @@ -95,7 +95,7 @@ - + yes 195 @@ -113,7 +113,7 @@ - + 100 100.2 100.1 @@ -142,8 +142,8 @@ - - + + 100 100.2 @@ -173,6 +173,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_pla_magenta.xml.fdm_material b/ultimaker_pla_magenta.xml.fdm_material index 0878c3b35..466ceae0e 100644 --- a/ultimaker_pla_magenta.xml.fdm_material +++ b/ultimaker_pla_magenta.xml.fdm_material @@ -53,8 +53,8 @@ 0 - - + + @@ -63,22 +63,22 @@ - - - + + + - - + + - + - - + + 100 yes @@ -95,7 +95,7 @@ - + yes 195 @@ -113,7 +113,7 @@ - + 100 100.2 100.1 @@ -142,8 +142,8 @@ - - + + 100 100.2 @@ -173,6 +173,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_pla_orange.xml.fdm_material b/ultimaker_pla_orange.xml.fdm_material index 6c5d6aa0a..f45aa071e 100644 --- a/ultimaker_pla_orange.xml.fdm_material +++ b/ultimaker_pla_orange.xml.fdm_material @@ -53,8 +53,8 @@ 0 - - + + @@ -63,22 +63,22 @@ - - - + + + - - + + - + - - + + 100 yes @@ -95,7 +95,7 @@ - + yes 195 @@ -113,7 +113,7 @@ - + 100 100.2 100.1 @@ -142,8 +142,8 @@ - - + + 100 100.2 @@ -173,6 +173,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_pla_pearl-white.xml.fdm_material b/ultimaker_pla_pearl-white.xml.fdm_material index 812c4c7b8..ae5cbbf30 100644 --- a/ultimaker_pla_pearl-white.xml.fdm_material +++ b/ultimaker_pla_pearl-white.xml.fdm_material @@ -53,8 +53,8 @@ 0 - - + + @@ -63,22 +63,22 @@ - - - + + + - - + + - + - - + + 100 yes @@ -95,7 +95,7 @@ - + yes 195 @@ -113,7 +113,7 @@ - + 100 100.2 100.1 @@ -142,8 +142,8 @@ - - + + 100 100.2 @@ -173,6 +173,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_pla_red.xml.fdm_material b/ultimaker_pla_red.xml.fdm_material index fcebeee84..3ac040bb8 100644 --- a/ultimaker_pla_red.xml.fdm_material +++ b/ultimaker_pla_red.xml.fdm_material @@ -53,8 +53,8 @@ 0 - - + + @@ -63,22 +63,22 @@ - - - + + + - - + + - + - - + + 100 yes @@ -95,7 +95,7 @@ - + yes 195 @@ -113,7 +113,7 @@ - + 100 100.2 100.1 @@ -142,8 +142,8 @@ - - + + 100 100.2 @@ -173,6 +173,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_pla_silver-metallic.xml.fdm_material b/ultimaker_pla_silver-metallic.xml.fdm_material index 929e952fd..4dc9aecd5 100644 --- a/ultimaker_pla_silver-metallic.xml.fdm_material +++ b/ultimaker_pla_silver-metallic.xml.fdm_material @@ -53,8 +53,8 @@ 0 - - + + @@ -63,22 +63,22 @@ - - - + + + - - + + - + - - + + 100 yes @@ -95,7 +95,7 @@ - + yes 195 @@ -113,7 +113,7 @@ - + 100 100.2 100.1 @@ -142,8 +142,8 @@ - - + + 100 100.2 @@ -173,6 +173,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_pla_transparent.xml.fdm_material b/ultimaker_pla_transparent.xml.fdm_material index e769847bd..41b8313ae 100644 --- a/ultimaker_pla_transparent.xml.fdm_material +++ b/ultimaker_pla_transparent.xml.fdm_material @@ -53,8 +53,8 @@ 0 - - + + @@ -63,22 +63,22 @@ - - - + + + - - + + - + - - + + 100 yes @@ -95,7 +95,7 @@ - + yes 195 @@ -113,7 +113,7 @@ - + 100 100.2 100.1 @@ -142,8 +142,8 @@ - - + + 100 100.2 @@ -173,6 +173,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_pla_white.xml.fdm_material b/ultimaker_pla_white.xml.fdm_material index c4a076626..af26d169c 100644 --- a/ultimaker_pla_white.xml.fdm_material +++ b/ultimaker_pla_white.xml.fdm_material @@ -53,8 +53,8 @@ 0 - - + + @@ -63,22 +63,22 @@ - - - + + + - - + + - + - - + + 100 yes @@ -95,7 +95,7 @@ - + yes 195 @@ -113,7 +113,7 @@ - + 100 100.2 100.1 @@ -142,8 +142,8 @@ - - + + 100 100.2 @@ -173,6 +173,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_pla_yellow.xml.fdm_material b/ultimaker_pla_yellow.xml.fdm_material index 5c04b17d4..3625ced01 100644 --- a/ultimaker_pla_yellow.xml.fdm_material +++ b/ultimaker_pla_yellow.xml.fdm_material @@ -53,8 +53,8 @@ 0 - - + + @@ -63,22 +63,22 @@ - - - + + + - - + + - + - - + + 100 yes @@ -95,7 +95,7 @@ - + yes 195 @@ -113,7 +113,7 @@ - + 100 100.2 100.1 @@ -142,8 +142,8 @@ - - + + 100 100.2 @@ -173,6 +173,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_pp_transparent.xml.fdm_material b/ultimaker_pp_transparent.xml.fdm_material index 5b27d834c..e27846c8e 100644 --- a/ultimaker_pp_transparent.xml.fdm_material +++ b/ultimaker_pp_transparent.xml.fdm_material @@ -55,13 +55,13 @@ 0 - + 220 - - + + 220 8 @@ -72,8 +72,8 @@ - - + + yes @@ -94,7 +94,7 @@ - + yes 8 25 @@ -112,7 +112,7 @@ - + 85 @@ -133,8 +133,8 @@ - - + + 85 @@ -155,6 +155,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_pva.xml.fdm_material b/ultimaker_pva.xml.fdm_material index 612194788..f3488b6f2 100644 --- a/ultimaker_pva.xml.fdm_material +++ b/ultimaker_pva.xml.fdm_material @@ -82,17 +82,17 @@ true - - - - - + + + + + no - - + + no @@ -111,7 +111,7 @@ - + no @@ -139,8 +139,8 @@ - - + + no @@ -168,7 +168,5 @@ - - - \ No newline at end of file + diff --git a/ultimaker_rapidrinse_175.xml.fdm_material b/ultimaker_rapidrinse_175.xml.fdm_material index c473b19e4..4d24428dc 100644 --- a/ultimaker_rapidrinse_175.xml.fdm_material +++ b/ultimaker_rapidrinse_175.xml.fdm_material @@ -34,8 +34,8 @@ True - - + + no diff --git a/ultimaker_sr30_175.xml.fdm_material b/ultimaker_sr30_175.xml.fdm_material index dbb12e579..6c523c6b7 100644 --- a/ultimaker_sr30_175.xml.fdm_material +++ b/ultimaker_sr30_175.xml.fdm_material @@ -34,8 +34,8 @@ True - - + + no diff --git a/ultimaker_tough_pla.xml.fdm_material b/ultimaker_tough_pla.xml.fdm_material index 6d22398d2..d6644a903 100644 --- a/ultimaker_tough_pla.xml.fdm_material +++ b/ultimaker_tough_pla.xml.fdm_material @@ -55,8 +55,8 @@ 0 - - + + 100 @@ -74,7 +74,7 @@ - + 210 @@ -92,7 +92,7 @@ - + 100 100.3 100.1 @@ -111,8 +111,8 @@ - - + + 100 100.3 @@ -131,6 +131,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_tough_pla_black.xml.fdm_material b/ultimaker_tough_pla_black.xml.fdm_material index b68f6a98b..b2a69f708 100644 --- a/ultimaker_tough_pla_black.xml.fdm_material +++ b/ultimaker_tough_pla_black.xml.fdm_material @@ -53,8 +53,8 @@ 0 - - + + 100 @@ -72,7 +72,7 @@ - + 210 @@ -90,7 +90,7 @@ - + 100 100.3 100.1 @@ -109,8 +109,8 @@ - - + + 100 100.3 @@ -129,6 +129,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_tough_pla_blue.xml.fdm_material b/ultimaker_tough_pla_blue.xml.fdm_material index f123a1666..456aee33e 100644 --- a/ultimaker_tough_pla_blue.xml.fdm_material +++ b/ultimaker_tough_pla_blue.xml.fdm_material @@ -53,8 +53,8 @@ 0 - - + + 100 @@ -72,7 +72,7 @@ - + 210 @@ -90,7 +90,7 @@ - + 100 100.3 100.1 @@ -109,8 +109,8 @@ - - + + 100 100.3 @@ -129,6 +129,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_tough_pla_gray.xml.fdm_material b/ultimaker_tough_pla_gray.xml.fdm_material index 6ba05e71d..561e8fcca 100644 --- a/ultimaker_tough_pla_gray.xml.fdm_material +++ b/ultimaker_tough_pla_gray.xml.fdm_material @@ -53,8 +53,8 @@ 0 - - + + 100 @@ -72,7 +72,7 @@ - + 210 @@ -90,7 +90,7 @@ - + 100 100.3 100.1 @@ -109,8 +109,8 @@ - - + + 100 100.3 @@ -129,6 +129,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_tough_pla_green.xml.fdm_material b/ultimaker_tough_pla_green.xml.fdm_material index df38bd05e..3b9eafbe1 100644 --- a/ultimaker_tough_pla_green.xml.fdm_material +++ b/ultimaker_tough_pla_green.xml.fdm_material @@ -53,8 +53,8 @@ 0 - - + + 100 @@ -72,7 +72,7 @@ - + 210 @@ -90,7 +90,7 @@ - + 100 100.3 100.1 @@ -109,8 +109,8 @@ - - + + 100 100.3 @@ -129,6 +129,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_tough_pla_red.xml.fdm_material b/ultimaker_tough_pla_red.xml.fdm_material index 1f6815024..e096e702a 100644 --- a/ultimaker_tough_pla_red.xml.fdm_material +++ b/ultimaker_tough_pla_red.xml.fdm_material @@ -53,8 +53,8 @@ 0 - - + + 100 @@ -72,7 +72,7 @@ - + 210 @@ -90,7 +90,7 @@ - + 100 100.3 100.1 @@ -109,8 +109,8 @@ - - + + 100 100.3 @@ -129,6 +129,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_tough_pla_white.xml.fdm_material b/ultimaker_tough_pla_white.xml.fdm_material index 97d312680..72a11ceee 100644 --- a/ultimaker_tough_pla_white.xml.fdm_material +++ b/ultimaker_tough_pla_white.xml.fdm_material @@ -53,8 +53,8 @@ 0 - - + + 100 @@ -72,7 +72,7 @@ - + 210 @@ -90,7 +90,7 @@ - + 100 100.3 100.1 @@ -109,8 +109,8 @@ - - + + 100 100.3 @@ -129,6 +129,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_tough_pla_yellow.xml.fdm_material b/ultimaker_tough_pla_yellow.xml.fdm_material index 46f0fb3db..b5bae6df9 100644 --- a/ultimaker_tough_pla_yellow.xml.fdm_material +++ b/ultimaker_tough_pla_yellow.xml.fdm_material @@ -53,8 +53,8 @@ 0 - - + + 100 @@ -72,7 +72,7 @@ - + 210 @@ -90,7 +90,7 @@ - + 100 100.3 100.1 @@ -109,8 +109,8 @@ - - + + 100 100.3 @@ -129,6 +129,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_tpu.xml.fdm_material b/ultimaker_tpu.xml.fdm_material index 3530d44f3..c094f0b43 100644 --- a/ultimaker_tpu.xml.fdm_material +++ b/ultimaker_tpu.xml.fdm_material @@ -55,13 +55,13 @@ 0 - + 228 - - + + 228 yes @@ -74,8 +74,8 @@ - - + + yes @@ -91,7 +91,7 @@ - + yes 235 10 @@ -109,7 +109,7 @@ - + yes @@ -124,8 +124,8 @@ - - + + yes @@ -141,6 +141,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_tpu_black.xml.fdm_material b/ultimaker_tpu_black.xml.fdm_material index f2fcc2ac4..d131594ef 100644 --- a/ultimaker_tpu_black.xml.fdm_material +++ b/ultimaker_tpu_black.xml.fdm_material @@ -53,13 +53,13 @@ 0 - + 228 - - + + 228 yes @@ -72,8 +72,8 @@ - - + + yes @@ -89,7 +89,7 @@ - + yes 235 10 @@ -107,7 +107,7 @@ - + yes @@ -122,8 +122,8 @@ - - + + yes @@ -139,6 +139,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_tpu_blue.xml.fdm_material b/ultimaker_tpu_blue.xml.fdm_material index 8567bcac2..5e2a6abdc 100644 --- a/ultimaker_tpu_blue.xml.fdm_material +++ b/ultimaker_tpu_blue.xml.fdm_material @@ -53,13 +53,13 @@ 0 - + 228 - - + + 228 yes @@ -72,8 +72,8 @@ - - + + yes @@ -89,7 +89,7 @@ - + yes 235 10 @@ -107,7 +107,7 @@ - + yes @@ -122,8 +122,8 @@ - - + + yes @@ -139,6 +139,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_tpu_red.xml.fdm_material b/ultimaker_tpu_red.xml.fdm_material index b879d68d9..15d771c37 100644 --- a/ultimaker_tpu_red.xml.fdm_material +++ b/ultimaker_tpu_red.xml.fdm_material @@ -53,13 +53,13 @@ 0 - + 228 - - + + 228 yes @@ -72,8 +72,8 @@ - - + + yes @@ -89,7 +89,7 @@ - + yes 235 10 @@ -107,7 +107,7 @@ - + yes @@ -122,8 +122,8 @@ - - + + yes @@ -139,6 +139,5 @@ - - \ No newline at end of file + diff --git a/ultimaker_tpu_white.xml.fdm_material b/ultimaker_tpu_white.xml.fdm_material index 2a375229b..a9690f033 100644 --- a/ultimaker_tpu_white.xml.fdm_material +++ b/ultimaker_tpu_white.xml.fdm_material @@ -53,13 +53,13 @@ 0 - + 228 - - + + 228 yes @@ -72,8 +72,8 @@ - - + + yes @@ -89,7 +89,7 @@ - + yes 235 10 @@ -107,7 +107,7 @@ - + yes @@ -122,8 +122,8 @@ - - + + yes @@ -139,6 +139,5 @@ - - \ No newline at end of file + From 6f8aa89f0fea10dfe48859d9af568411da54a1fb Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Mon, 22 Apr 2024 09:58:18 +0200 Subject: [PATCH 4/5] Material profile for the Factor 4 PP-470 --- generic_abs.xml.fdm_material | 39 ++++++++- generic_bam.xml.fdm_material | 18 +++- generic_cffcpe.xml.fdm_material | 32 ++++++- generic_cffpa.xml.fdm_material | 33 ++++++- generic_cffpps.xml.fdm_material | 85 ++++++++++++++++++ generic_cpe.xml.fdm_material | 37 +++++++- generic_cpe_plus.xml.fdm_material | 30 ++++++- generic_gffcpe.xml.fdm_material | 31 ++++++- generic_gffpa.xml.fdm_material | 31 ++++++- generic_nylon.xml.fdm_material | 36 +++++++- generic_pc.xml.fdm_material | 33 ++++++- generic_petcf.xml.fdm_material | 45 +++++++++- generic_petg.xml.fdm_material | 34 +++++++- generic_pla.xml.fdm_material | 37 +++++++- generic_pp.xml.fdm_material | 39 ++++++++- generic_pva.xml.fdm_material | 41 ++++++++- generic_tough_pla.xml.fdm_material | 36 +++++++- generic_tpu.xml.fdm_material | 33 ++++++- ultimaker_abs.xml.fdm_material | 39 ++++++++- ultimaker_abs_black.xml.fdm_material | 39 ++++++++- ultimaker_abs_blue.xml.fdm_material | 39 ++++++++- ultimaker_abs_green.xml.fdm_material | 39 ++++++++- ultimaker_abs_grey.xml.fdm_material | 39 ++++++++- ultimaker_abs_orange.xml.fdm_material | 39 ++++++++- ultimaker_abs_pearl-gold.xml.fdm_material | 39 ++++++++- ultimaker_abs_red.xml.fdm_material | 39 ++++++++- ...maker_abs_silver-metallic.xml.fdm_material | 39 ++++++++- ultimaker_abs_white.xml.fdm_material | 39 ++++++++- ultimaker_abs_yellow.xml.fdm_material | 39 ++++++++- ultimaker_bam.xml.fdm_material | 18 +++- ultimaker_cpe.xml.fdm_material | 37 +++++++- ultimaker_cpe_black.xml.fdm_material | 37 +++++++- ultimaker_cpe_blue.xml.fdm_material | 37 +++++++- ultimaker_cpe_dark-grey.xml.fdm_material | 37 +++++++- ultimaker_cpe_green.xml.fdm_material | 37 +++++++- ultimaker_cpe_light-grey.xml.fdm_material | 37 +++++++- ultimaker_cpe_plus.xml.fdm_material | 30 ++++++- ultimaker_cpe_plus_black.xml.fdm_material | 30 ++++++- ...aker_cpe_plus_transparent.xml.fdm_material | 30 ++++++- ultimaker_cpe_plus_white.xml.fdm_material | 30 ++++++- ultimaker_cpe_red.xml.fdm_material | 37 +++++++- ultimaker_cpe_transparent.xml.fdm_material | 37 +++++++- ultimaker_cpe_white.xml.fdm_material | 37 +++++++- ultimaker_cpe_yellow.xml.fdm_material | 37 +++++++- ultimaker_nylon.xml.fdm_material | 36 +++++++- ultimaker_nylon_black.xml.fdm_material | 36 +++++++- ultimaker_nylon_transparent.xml.fdm_material | 36 +++++++- ultimaker_pc.xml.fdm_material | 33 ++++++- ultimaker_pc_black.xml.fdm_material | 33 ++++++- ultimaker_pc_transparent.xml.fdm_material | 33 ++++++- ultimaker_pc_white.xml.fdm_material | 33 ++++++- ultimaker_petcf.xml.fdm_material | 45 +++++++++- ultimaker_petcf_black.xml.fdm_material | 45 +++++++++- ultimaker_petcf_blue.xml.fdm_material | 45 +++++++++- ultimaker_petcf_gray.xml.fdm_material | 45 +++++++++- ultimaker_petg.xml.fdm_material | 34 +++++++- ultimaker_petg_black.xml.fdm_material | 34 +++++++- ultimaker_petg_blue.xml.fdm_material | 34 +++++++- ...ker_petg_blue_translucent.xml.fdm_material | 34 +++++++- ultimaker_petg_green.xml.fdm_material | 34 +++++++- ...er_petg_green_translucent.xml.fdm_material | 34 +++++++- ultimaker_petg_grey.xml.fdm_material | 34 +++++++- ultimaker_petg_orange.xml.fdm_material | 34 +++++++- ultimaker_petg_red.xml.fdm_material | 34 +++++++- ...aker_petg_red_translucent.xml.fdm_material | 34 +++++++- ultimaker_petg_silver.xml.fdm_material | 34 +++++++- ultimaker_petg_transparent.xml.fdm_material | 34 +++++++- ultimaker_petg_white.xml.fdm_material | 34 +++++++- ultimaker_petg_yellow.xml.fdm_material | 34 +++++++- ...r_petg_yellow_fluorescent.xml.fdm_material | 34 +++++++- ultimaker_pla.xml.fdm_material | 37 +++++++- ultimaker_pla_black.xml.fdm_material | 37 +++++++- ultimaker_pla_blue.xml.fdm_material | 37 +++++++- ultimaker_pla_green.xml.fdm_material | 37 +++++++- ultimaker_pla_magenta.xml.fdm_material | 37 +++++++- ultimaker_pla_orange.xml.fdm_material | 37 +++++++- ultimaker_pla_pearl-white.xml.fdm_material | 37 +++++++- ultimaker_pla_red.xml.fdm_material | 37 +++++++- ...maker_pla_silver-metallic.xml.fdm_material | 37 +++++++- ultimaker_pla_transparent.xml.fdm_material | 37 +++++++- ultimaker_pla_white.xml.fdm_material | 37 +++++++- ultimaker_pla_yellow.xml.fdm_material | 37 +++++++- ultimaker_pp_transparent.xml.fdm_material | 39 ++++++++- ...ppscf_metallic-anthracite.xml.fdm_material | 86 +++++++++++++++++++ ultimaker_pva.xml.fdm_material | 41 ++++++++- ultimaker_tough_pla.xml.fdm_material | 36 +++++++- ultimaker_tough_pla_black.xml.fdm_material | 36 +++++++- ultimaker_tough_pla_blue.xml.fdm_material | 36 +++++++- ultimaker_tough_pla_gray.xml.fdm_material | 36 +++++++- ultimaker_tough_pla_green.xml.fdm_material | 36 +++++++- ultimaker_tough_pla_red.xml.fdm_material | 36 +++++++- ultimaker_tough_pla_white.xml.fdm_material | 36 +++++++- ultimaker_tough_pla_yellow.xml.fdm_material | 36 +++++++- ultimaker_tpu.xml.fdm_material | 33 ++++++- ultimaker_tpu_black.xml.fdm_material | 33 ++++++- ultimaker_tpu_blue.xml.fdm_material | 33 ++++++- ultimaker_tpu_red.xml.fdm_material | 33 ++++++- ultimaker_tpu_white.xml.fdm_material | 33 ++++++- 98 files changed, 3504 insertions(+), 96 deletions(-) create mode 100644 generic_cffpps.xml.fdm_material create mode 100644 ultimaker_ppscf_metallic-anthracite.xml.fdm_material diff --git a/generic_abs.xml.fdm_material b/generic_abs.xml.fdm_material index 44dc83f91..152641c5e 100644 --- a/generic_abs.xml.fdm_material +++ b/generic_abs.xml.fdm_material @@ -10,7 +10,7 @@ Generic ABS profile. The data in this file may not be correct for your specific Generic 60636bb4-518f-42e7-8237-fe77b194ebe0 - 36 + 37 #8cb219 Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC. Use glue, to avoid chipping of the glass. @@ -143,5 +143,42 @@ Generic ABS profile. The data in this file may not be correct for your specific + + + 240 + 85 + 50 + 20 + 100 + -2 + -10 + 1 + 100.3 + + yes + 225 + + + yes + 250 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/generic_bam.xml.fdm_material b/generic_bam.xml.fdm_material index 4c50009ba..ba9f7f307 100644 --- a/generic_bam.xml.fdm_material +++ b/generic_bam.xml.fdm_material @@ -10,7 +10,7 @@ Generic break away support material profile. The data in this file may not be co Generic 7e6207c4-22ff-441a-b261-ff89f166d6a0 - 32 + 33 #F1ECE1 Breakaway Material. Breakaway is a matching support material for PLA, ABS, CPE, CPE+, and Nylon Use the same temperatures and adhesion method as your build material(s). @@ -84,5 +84,21 @@ Generic break away support material profile. The data in this file may not be co + + + 40 + 100 + 40 + -10 + -10 + 1 + 5 + + yes + 230 + 3 + + + diff --git a/generic_cffcpe.xml.fdm_material b/generic_cffcpe.xml.fdm_material index ad188445e..dadc7bb81 100644 --- a/generic_cffcpe.xml.fdm_material +++ b/generic_cffcpe.xml.fdm_material @@ -10,7 +10,7 @@ This is the baseline profile for Carbon Fiber Filled Copolyesters for the Print Generic f8e496d6-7599-4015-9fac-c7ce53f6633c - 21 + 22 #212F3D This is the baseline profile for Carbon Fiber Filled Copolyesters for the Print Profile Assistant. This profile can also be used for other base materials (ABS, PP, etc) Use glue. @@ -112,5 +112,35 @@ This is the baseline profile for Carbon Fiber Filled Copolyesters for the Print + + + 45 + 1 + -6 + 1 + 1.5 + + no + + + no + + + no + + + no + + + no + + + yes + + + yes + + + diff --git a/generic_cffpa.xml.fdm_material b/generic_cffpa.xml.fdm_material index 1b514ef80..d039b5842 100644 --- a/generic_cffpa.xml.fdm_material +++ b/generic_cffpa.xml.fdm_material @@ -10,7 +10,7 @@ This is the baseline profile for Carbon Fiber Filled Polyamides for the Print Pr Generic bd66b243-9d50-4e12-bfc3-51c874fca16a - 21 + 22 #212F3D This is the baseline profile for Carbon Fiber Filled Polyamides for the Print Profile Assistant. Use glue. @@ -112,5 +112,36 @@ This is the baseline profile for Carbon Fiber Filled Polyamides for the Print Pr + + + + 50 + 1 + -6 + 1 + 1.5 + + no + + + no + + + no + + + no + + + no + + + yes + + + yes + + + diff --git a/generic_cffpps.xml.fdm_material b/generic_cffpps.xml.fdm_material new file mode 100644 index 000000000..7515e61e8 --- /dev/null +++ b/generic_cffpps.xml.fdm_material @@ -0,0 +1,85 @@ + + + + + + Generic + PPS CF + Generic + + 6b0a5f1a-a43c-483c-b02e-9c9915233143 + 10 + #212F3D + This is the baseline profile for Carbon Fiber Filled PPS for the Print Profile Assistant. This profile can also be used for other base materials (ABS, PP, etc) + No glue needed + + + 1.51 + 2.85 + + + -8 + 25 + 0 + 2 + 320 + -50 + 25 + 280 + 25 + 4 + 7200 + 0.94 + + + 320 + 220 + 80 + 50 + 20 + 40 + 0 + 70 + true + + + 1.0 + 0.8 + 0 + + + + + -6 + 1 + 1.5 + + no + + + no + + + no + + + no + + + no + + + no + + + no + + + yes + + + + + diff --git a/generic_cpe.xml.fdm_material b/generic_cpe.xml.fdm_material index 7622713bb..2a9e1613a 100644 --- a/generic_cpe.xml.fdm_material +++ b/generic_cpe.xml.fdm_material @@ -10,7 +10,7 @@ Generic CPE profile. The data in this file may not be correct for your specific Generic 12f41353-1a33-415e-8b4f-a775a6c70cc6 - 38 + 39 #159499 Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC. Use glue. @@ -145,5 +145,40 @@ Generic CPE profile. The data in this file may not be correct for your specific + + + 240 + 50 + 50 + 85 + -18 + -18 + 1 + 100.2 + + yes + + + yes + 250 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/generic_cpe_plus.xml.fdm_material b/generic_cpe_plus.xml.fdm_material index e65e68a66..df80c265d 100644 --- a/generic_cpe_plus.xml.fdm_material +++ b/generic_cpe_plus.xml.fdm_material @@ -10,7 +10,7 @@ Generic CPE+ profile. The data in this file may not be correct for your specific Generic e2409626-b5a0-4025-b73e-b58070219259 - 38 + 39 #3633F2 Chemically resistant and tough. CPE+ is chemically inert, tough, dimensionally stable and handles temperatures up to 100ºC. Use glue for small prints. An adhesion sheet is recommended for larger prints. @@ -133,5 +133,33 @@ Generic CPE+ profile. The data in this file may not be correct for your specific + + + 110 + 65 + 0 + 1.5 + -4 + -12 + 1 + 100.4 + + yes + 3 + + + yes + + + no + + + no + + + no + + + diff --git a/generic_gffcpe.xml.fdm_material b/generic_gffcpe.xml.fdm_material index 0e9a72bf9..afe93bb60 100644 --- a/generic_gffcpe.xml.fdm_material +++ b/generic_gffcpe.xml.fdm_material @@ -10,7 +10,7 @@ This is the baseline profile for Glass Fiber Filled Copolyesters for the Print P Generic d4b786bb-e5d2-481b-b3ab-0be976d36af8 - 23 + 24 #D5D8DC This is the baseline profile for Glass Fiber Filled Copolyesters for the Print Profile Assistant. This profile can also be used for other base materials (ABS, PP, etc) Use glue. @@ -112,5 +112,34 @@ This is the baseline profile for Glass Fiber Filled Copolyesters for the Print P + + + 40 + 1 + -6 + 1 + + no + + + no + + + no + + + no + + + no + + + yes + + + yes + + + diff --git a/generic_gffpa.xml.fdm_material b/generic_gffpa.xml.fdm_material index 2bed54004..460d916b7 100644 --- a/generic_gffpa.xml.fdm_material +++ b/generic_gffpa.xml.fdm_material @@ -10,7 +10,7 @@ This is the baseline profile for Glass Fiber Filled Polyamides for the Print Pro Generic 837cf11b-6b1e-48dc-94dc-4a2b4888648e - 23 + 24 #D5D8DC This is the baseline profile for Glass Fiber Filled Polyamides for the Print Profile Assistant. Use glue. @@ -112,5 +112,34 @@ This is the baseline profile for Glass Fiber Filled Polyamides for the Print Pro + + + 1 + -6 + 1 + 40 + + no + + + no + + + no + + + no + + + no + + + yes + + + yes + + + diff --git a/generic_nylon.xml.fdm_material b/generic_nylon.xml.fdm_material index 7aba02722..3fb224e1f 100644 --- a/generic_nylon.xml.fdm_material +++ b/generic_nylon.xml.fdm_material @@ -10,7 +10,7 @@ Generic Nylon profile. The data in this file may not be correct for your specifi Generic 28fb4162-db74-49e1-9008-d05f1e8bef5c - 32 + 33 #3DF266 Nylon is strong, abrasion-resistant, durable and engineered for low moisture sensitivity. Use glue. @@ -154,5 +154,39 @@ Generic Nylon profile. The data in this file may not be correct for your specifi + + + 245 + 40 + 30 + 75 + 1.5 + -6 + 1 + 100.4 + + yes + + + yes + 250 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/generic_pc.xml.fdm_material b/generic_pc.xml.fdm_material index cae513a7a..cb94629a2 100644 --- a/generic_pc.xml.fdm_material +++ b/generic_pc.xml.fdm_material @@ -10,7 +10,7 @@ Generic PC profile. The data in this file may not be correct for your specific m Generic 98c05714-bf4e-4455-ba27-57d74fe331e4 - 35 + 36 #F29030 Strong, tough and temperature resistant. PC offers a great print quality, heat resistance up to 110ºC, mechanical strength and toughness. Use glue for small prints. An adhesion sheet is recommended for larger prints. Set your print speed to a low value (10mm/sec) to get better layer bonding. @@ -142,6 +142,37 @@ Generic PC profile. The data in this file may not be correct for your specific m + + + 110 + 65 + 0 + 100 + -5 + -14 + 1 + 100.4 + + yes + 280 + + + yes + + + no + + + no + + + no + + + no + + + 0.0 diff --git a/generic_petcf.xml.fdm_material b/generic_petcf.xml.fdm_material index 984f7ad2d..d9e8008c8 100644 --- a/generic_petcf.xml.fdm_material +++ b/generic_petcf.xml.fdm_material @@ -10,7 +10,7 @@ Generic PET-CF profile. The data in this file may not be correct for your specif Generic 64d44410-be10-428c-8891-f0ae47ea1734 - 23 + 24 #888888 Generic PET CF profile. The data in this file may not be correct for your specific machine. Print on bare glass. @@ -111,5 +111,48 @@ Generic PET-CF profile. The data in this file may not be correct for your specif + + + 50 + 20 + -14 + -14 + 280 + 1 + 204.16 + 51.04 + 40 + 100 + 6 + + no + + + no + + + no + + + no + + + no + + + yes + 3 + 280 + + + yes + 280 + + + yes + 280 + + + diff --git a/generic_petg.xml.fdm_material b/generic_petg.xml.fdm_material index 1e3093d4b..a53c50dfd 100644 --- a/generic_petg.xml.fdm_material +++ b/generic_petg.xml.fdm_material @@ -10,7 +10,7 @@ Generic PETG profile. The data in this file may not be correct for your specific Generic 1cbfaeb3-1906-4b26-b2e7-6f777a8c197a - 24 + 25 #ff5086 Generic PETG profile. The data in this file may not be correct for your specific machine. Use glue. @@ -135,5 +135,37 @@ Generic PETG profile. The data in this file may not be correct for your specific + + + 50 + 50 + 85 + 1 + 100.2 + + yes + + + yes + 250 + 3 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/generic_pla.xml.fdm_material b/generic_pla.xml.fdm_material index c4150e5ba..74745ccec 100644 --- a/generic_pla.xml.fdm_material +++ b/generic_pla.xml.fdm_material @@ -10,7 +10,7 @@ Generic PLA profile. The data in this file may not be correct for your specific Generic 506c9f0d-e3aa-4bd4-b2d2-23e2425b1aa9 - 35 + 36 #ffc924 Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality. Print on bare glass. Use tape for cold build plates. @@ -174,5 +174,40 @@ Generic PLA profile. The data in this file may not be correct for your specific + + + 55 + 30 + 100 + -2 + -14 + 1 + 100.16 + + yes + + + yes + 200 + + + yes + 10 + + + yes + + + yes + 10 + + + no + + + no + + + diff --git a/generic_pp.xml.fdm_material b/generic_pp.xml.fdm_material index 1406642dc..1b51816bc 100644 --- a/generic_pp.xml.fdm_material +++ b/generic_pp.xml.fdm_material @@ -10,7 +10,7 @@ Generic Polypropylene profile. Serves as an example file, data in this file is n Generic aa22e9c7-421f-4745-afc2-81851694394a - 42 + 43 #85f9de Fatigue and chemical resistant. Polypropylene offers excellent temperature, chemical and fatigue resistance. Its toughness and low friction make it a perfect choice for prototyping and creating durable end-use models. Adhesion sheets are required. @@ -156,5 +156,42 @@ Generic Polypropylene profile. Serves as an example file, data in this file is n + + + 220 + 40 + 85 + 20 + 2 + -14 + -14 + 1 + 100.7 + + + yes + + + yes + 225 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/generic_pva.xml.fdm_material b/generic_pva.xml.fdm_material index f3ccd8bed..9ae909875 100644 --- a/generic_pva.xml.fdm_material +++ b/generic_pva.xml.fdm_material @@ -10,7 +10,7 @@ Generic PVA profile. The data in this file may not be correct for your specific Generic 86a89ceb-4159-47f6-ab97-e9953803d70f - 34 + 35 #a32bcc Water soluble support material. PVA is a matching support material for PLA, CPE and Nylon. Use the same temperatures and adhesion method as your build material(s). @@ -142,6 +142,45 @@ Generic PVA profile. The data in this file may not be correct for your specific + + + 220 + 40 + 50 + 40 + 1 + 5 + 0.2 + + + no + + + no + + + no + + + yes + + + yes + + + no + + + no + + + no + + + no + + + 0.0 diff --git a/generic_tough_pla.xml.fdm_material b/generic_tough_pla.xml.fdm_material index 89f404667..fbbf817a8 100644 --- a/generic_tough_pla.xml.fdm_material +++ b/generic_tough_pla.xml.fdm_material @@ -10,7 +10,7 @@ Generic Tough PLA profile. The data in this file may not be correct for your spe Generic 9d5d2d7c-4e77-441c-85a0-e9eefd4aa68c - 30 + 31 #ffc9f0 Technical PLA material with toughness similar to ABS. Ideal for reliably printing functional prototypes and tooling at larger sizes, Tough PLA offers the same safe and easy use as regular PLA. Print on bare glass. Use tape for cold build plates. @@ -130,5 +130,39 @@ Generic Tough PLA profile. The data in this file may not be correct for your spe + + + 55 + 30 + 100 + -2 + -12 + 1 + 100.14 + + yes + + + yes + 205 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/generic_tpu.xml.fdm_material b/generic_tpu.xml.fdm_material index 505197684..1d3ad8920 100644 --- a/generic_tpu.xml.fdm_material +++ b/generic_tpu.xml.fdm_material @@ -10,7 +10,7 @@ Generic TPU 95A profile. The data in this file may not be correct for your speci Generic 1d52b2be-a3a2-41de-a8b1-3bcdb5618695 - 35 + 36 #B22744 Wear and tear resistant. TPU features a Shore-A hardness of 95 and an elongation of up to 580% at break. Suitable for applications that require slight flexibility, wear and tear, and chemical resistance. Use glue. @@ -140,5 +140,36 @@ Generic TPU 95A profile. The data in this file may not be correct for your speci + + + 40 + 30 + 50 + 2 + -50 + 1 + 100.3 + + + yes + 3 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_abs.xml.fdm_material b/ultimaker_abs.xml.fdm_material index c97a3ee74..d9adfaf55 100644 --- a/ultimaker_abs.xml.fdm_material +++ b/ultimaker_abs.xml.fdm_material @@ -8,7 +8,7 @@ 94209c78-8d4d-4866-8a60-5e1f7adb0c36 - 8 + 9 #8cb219 Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC. Use glue, to avoid chipping of the glass. @@ -144,5 +144,42 @@ + + + 240 + 85 + 50 + 20 + 100 + -2 + -10 + 1 + 100.3 + + yes + 225 + + + yes + 250 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_abs_black.xml.fdm_material b/ultimaker_abs_black.xml.fdm_material index 0bfb9947c..03756bdad 100644 --- a/ultimaker_abs_black.xml.fdm_material +++ b/ultimaker_abs_black.xml.fdm_material @@ -7,7 +7,7 @@ Black 2f9d2279-9b0e-4765-bf9b-d1e1e13f3c49 - 40 + 41 #2a292a Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC. Use glue, to avoid chipping of the glass. @@ -142,5 +142,42 @@ + + + 240 + 85 + 50 + 20 + 100 + -2 + -10 + 1 + 100.3 + + yes + 225 + + + yes + 250 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_abs_blue.xml.fdm_material b/ultimaker_abs_blue.xml.fdm_material index b60475023..09874e9be 100644 --- a/ultimaker_abs_blue.xml.fdm_material +++ b/ultimaker_abs_blue.xml.fdm_material @@ -7,7 +7,7 @@ Blue 7c9575a6-c8d6-40ec-b3dd-18d7956bfaae - 40 + 41 #00387b Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC. Use glue, to avoid chipping of the glass. @@ -142,5 +142,42 @@ + + + 240 + 85 + 50 + 20 + 100 + -2 + -10 + 1 + 100.3 + + yes + 225 + + + yes + 250 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_abs_green.xml.fdm_material b/ultimaker_abs_green.xml.fdm_material index d7e7b21ba..e3b0c7a78 100644 --- a/ultimaker_abs_green.xml.fdm_material +++ b/ultimaker_abs_green.xml.fdm_material @@ -7,7 +7,7 @@ Green 3400c0d1-a4e3-47de-a444-7b704f287171 - 40 + 41 #61993b Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC. Use glue, to avoid chipping of the glass. @@ -142,5 +142,42 @@ + + + 240 + 85 + 50 + 20 + 100 + -2 + -10 + 1 + 100.3 + + yes + 225 + + + yes + 250 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_abs_grey.xml.fdm_material b/ultimaker_abs_grey.xml.fdm_material index 5e42d68f7..2424951f7 100644 --- a/ultimaker_abs_grey.xml.fdm_material +++ b/ultimaker_abs_grey.xml.fdm_material @@ -7,7 +7,7 @@ Gray 8b75b775-d3f2-4d0f-8fb2-2a3dd53cf673 - 41 + 42 #52595d Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC. Use glue, to avoid chipping of the glass. @@ -142,5 +142,42 @@ + + + 240 + 85 + 50 + 20 + 100 + -2 + -10 + 1 + 100.3 + + yes + 225 + + + yes + 250 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_abs_orange.xml.fdm_material b/ultimaker_abs_orange.xml.fdm_material index 75141c70f..9b0a96c44 100644 --- a/ultimaker_abs_orange.xml.fdm_material +++ b/ultimaker_abs_orange.xml.fdm_material @@ -7,7 +7,7 @@ Orange 0b4ca6ef-eac8-4b23-b3ca-5f21af00e54f - 40 + 41 #ed6b21 Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC. Use glue, to avoid chipping of the glass. @@ -142,5 +142,42 @@ + + + 240 + 85 + 50 + 20 + 100 + -2 + -10 + 1 + 100.3 + + yes + 225 + + + yes + 250 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_abs_pearl-gold.xml.fdm_material b/ultimaker_abs_pearl-gold.xml.fdm_material index e3ee23fdf..791d035f5 100644 --- a/ultimaker_abs_pearl-gold.xml.fdm_material +++ b/ultimaker_abs_pearl-gold.xml.fdm_material @@ -7,7 +7,7 @@ Pearl Gold 7cbdb9ca-081a-456f-a6ba-f73e4e9cb856 - 40 + 41 #80643f Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC. Use glue, to avoid chipping of the glass. @@ -142,5 +142,42 @@ + + + 240 + 85 + 50 + 20 + 100 + -2 + -10 + 1 + 100.3 + + yes + 225 + + + yes + 250 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_abs_red.xml.fdm_material b/ultimaker_abs_red.xml.fdm_material index 148b0d56e..a7d4c7c39 100644 --- a/ultimaker_abs_red.xml.fdm_material +++ b/ultimaker_abs_red.xml.fdm_material @@ -7,7 +7,7 @@ Red 5df7afa6-48bd-4c19-b314-839fe9f08f1f - 40 + 41 #bb1e10 Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC. Use glue, to avoid chipping of the glass. @@ -142,5 +142,42 @@ + + + 240 + 85 + 50 + 20 + 100 + -2 + -10 + 1 + 100.3 + + yes + 225 + + + yes + 250 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_abs_silver-metallic.xml.fdm_material b/ultimaker_abs_silver-metallic.xml.fdm_material index 88b4ea0b3..d07bc07e6 100644 --- a/ultimaker_abs_silver-metallic.xml.fdm_material +++ b/ultimaker_abs_silver-metallic.xml.fdm_material @@ -7,7 +7,7 @@ Silver 763c926e-a5f7-4ba0-927d-b4e038ea2735 - 41 + 42 #a1a1a0 Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC. Use glue, to avoid chipping of the glass. @@ -142,5 +142,42 @@ + + + 240 + 85 + 50 + 20 + 100 + -2 + -10 + 1 + 100.3 + + yes + 225 + + + yes + 250 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_abs_white.xml.fdm_material b/ultimaker_abs_white.xml.fdm_material index 9f3d5bb64..8bfd8a9e0 100644 --- a/ultimaker_abs_white.xml.fdm_material +++ b/ultimaker_abs_white.xml.fdm_material @@ -7,7 +7,7 @@ White 5253a75a-27dc-4043-910f-753ae11bc417 - 43 + 44 #ecece7 Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC. Use glue, to avoid chipping of the glass. @@ -142,5 +142,42 @@ + + + 240 + 85 + 50 + 20 + 100 + -2 + -10 + 1 + 100.3 + + yes + 225 + + + yes + 250 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_abs_yellow.xml.fdm_material b/ultimaker_abs_yellow.xml.fdm_material index 1567e45f9..c073c6cb0 100644 --- a/ultimaker_abs_yellow.xml.fdm_material +++ b/ultimaker_abs_yellow.xml.fdm_material @@ -7,7 +7,7 @@ Yellow e873341d-d9b8-45f9-9a6f-5609e1bcff68 - 40 + 41 #f7b500 Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC. Use glue, to avoid chipping of the glass. @@ -142,5 +142,42 @@ + + + 240 + 85 + 50 + 20 + 100 + -2 + -10 + 1 + 100.3 + + yes + 225 + + + yes + 250 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_bam.xml.fdm_material b/ultimaker_bam.xml.fdm_material index 6c1b04ffc..aa720794e 100644 --- a/ultimaker_bam.xml.fdm_material +++ b/ultimaker_bam.xml.fdm_material @@ -7,7 +7,7 @@ White 7e6207c4-22ff-441a-b261-ff89f166d5f9 - 37 + 38 #F1ECE1 Breakaway Material. Breakaway is a matching support material for PLA, ABS, CPE, CPE+, and Nylon Use the same temperatures and adhesion method as your build material(s). @@ -83,5 +83,21 @@ + + + 40 + 100 + 40 + -10 + -10 + 1 + 5 + + yes + 230 + 3 + + + diff --git a/ultimaker_cpe.xml.fdm_material b/ultimaker_cpe.xml.fdm_material index 633f2df7a..c0cd9538d 100644 --- a/ultimaker_cpe.xml.fdm_material +++ b/ultimaker_cpe.xml.fdm_material @@ -8,7 +8,7 @@ 3cf87e76-dae0-42cb-ae86-3d39918af2ad - 7 + 8 #159499 Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC. Use glue. @@ -146,5 +146,40 @@ + + + 240 + 50 + 50 + 85 + -18 + -18 + 1 + 100.2 + + yes + + + yes + 250 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_cpe_black.xml.fdm_material b/ultimaker_cpe_black.xml.fdm_material index bcae96bda..64a7d5678 100644 --- a/ultimaker_cpe_black.xml.fdm_material +++ b/ultimaker_cpe_black.xml.fdm_material @@ -7,7 +7,7 @@ Black a8955dc3-9d7e-404d-8c03-0fd6fee7f22d - 42 + 43 #2a292a Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC. Use glue. @@ -144,5 +144,40 @@ + + + 240 + 50 + 50 + 85 + -18 + -18 + 1 + 100.2 + + yes + + + yes + 250 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_cpe_blue.xml.fdm_material b/ultimaker_cpe_blue.xml.fdm_material index 1f16541a4..0633429da 100644 --- a/ultimaker_cpe_blue.xml.fdm_material +++ b/ultimaker_cpe_blue.xml.fdm_material @@ -7,7 +7,7 @@ Blue 4d816290-ce2e-40e0-8dc8-3f702243131e - 42 + 43 #00a3e0 Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC. Use glue. @@ -144,5 +144,40 @@ + + + 240 + 50 + 50 + 85 + -18 + -18 + 1 + 100.2 + + yes + + + yes + 250 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_cpe_dark-grey.xml.fdm_material b/ultimaker_cpe_dark-grey.xml.fdm_material index a53c4283e..9ea470e2f 100644 --- a/ultimaker_cpe_dark-grey.xml.fdm_material +++ b/ultimaker_cpe_dark-grey.xml.fdm_material @@ -7,7 +7,7 @@ Dark Gray 10961c00-3caf-48e9-a598-fa805ada1e8d - 43 + 44 #4f5250 Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC. Use glue. @@ -144,5 +144,40 @@ + + + 240 + 50 + 50 + 85 + -18 + -18 + 1 + 100.2 + + yes + + + yes + 250 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_cpe_green.xml.fdm_material b/ultimaker_cpe_green.xml.fdm_material index d07680247..89f3a5d5d 100644 --- a/ultimaker_cpe_green.xml.fdm_material +++ b/ultimaker_cpe_green.xml.fdm_material @@ -7,7 +7,7 @@ Green 7ff6d2c8-d626-48cd-8012-7725fa537cc9 - 42 + 43 #78be20 Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC. Use glue. @@ -144,5 +144,40 @@ + + + 240 + 50 + 50 + 85 + -18 + -18 + 1 + 100.2 + + yes + + + yes + 250 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_cpe_light-grey.xml.fdm_material b/ultimaker_cpe_light-grey.xml.fdm_material index 8243a8526..9ee57c567 100644 --- a/ultimaker_cpe_light-grey.xml.fdm_material +++ b/ultimaker_cpe_light-grey.xml.fdm_material @@ -7,7 +7,7 @@ Light Gray 173a7bae-5e14-470e-817e-08609c61e12b - 43 + 44 #c5c7c4 Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC. Use glue. @@ -144,5 +144,40 @@ + + + 240 + 50 + 50 + 85 + -18 + -18 + 1 + 100.2 + + yes + + + yes + 250 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_cpe_plus.xml.fdm_material b/ultimaker_cpe_plus.xml.fdm_material index e1b0ea6e3..4952cc914 100644 --- a/ultimaker_cpe_plus.xml.fdm_material +++ b/ultimaker_cpe_plus.xml.fdm_material @@ -8,7 +8,7 @@ 4034cfaa-a512-4645-a07d-89a2dd4db91d - 6 + 7 #3633F2 Chemically resistant and tough. CPE+ is chemically inert, tough, dimensionally stable and handles temperatures up to 100ºC. Use glue for small prints. An adhesion sheet is recommended for larger prints. @@ -134,5 +134,33 @@ + + + 110 + 65 + 0 + 1.5 + -4 + -12 + 1 + 100.4 + + yes + 3 + + + yes + + + no + + + no + + + no + + + diff --git a/ultimaker_cpe_plus_black.xml.fdm_material b/ultimaker_cpe_plus_black.xml.fdm_material index 30cc5541d..b7e243f6a 100644 --- a/ultimaker_cpe_plus_black.xml.fdm_material +++ b/ultimaker_cpe_plus_black.xml.fdm_material @@ -7,7 +7,7 @@ Black 1aca047a-42df-497c-abfb-0e9cb85ead52 - 43 + 44 #0e0e10 Chemically resistant and tough. CPE+ is chemically inert, tough, dimensionally stable and handles temperatures up to 100ºC. Use glue for small prints. An adhesion sheet is recommended for larger prints. @@ -132,5 +132,33 @@ + + + 110 + 65 + 0 + 1.5 + -4 + -12 + 1 + 100.4 + + yes + 3 + + + yes + + + no + + + no + + + no + + + diff --git a/ultimaker_cpe_plus_transparent.xml.fdm_material b/ultimaker_cpe_plus_transparent.xml.fdm_material index e91185d79..c15b142d3 100644 --- a/ultimaker_cpe_plus_transparent.xml.fdm_material +++ b/ultimaker_cpe_plus_transparent.xml.fdm_material @@ -7,7 +7,7 @@ Transparent a9c340fe-255f-4914-87f5-ec4fcb0c11ef - 43 + 44 #d0d0d0 Chemically resistant and tough. CPE+ is chemically inert, tough, dimensionally stable and handles temperatures up to 100ºC. Use glue for small prints. An adhesion sheet is recommended for larger prints. @@ -132,5 +132,33 @@ + + + 110 + 65 + 0 + 1.5 + -4 + -12 + 1 + 100.4 + + yes + 3 + + + yes + + + no + + + no + + + no + + + diff --git a/ultimaker_cpe_plus_white.xml.fdm_material b/ultimaker_cpe_plus_white.xml.fdm_material index 3656e70e1..9865fe876 100644 --- a/ultimaker_cpe_plus_white.xml.fdm_material +++ b/ultimaker_cpe_plus_white.xml.fdm_material @@ -7,7 +7,7 @@ White 6df69b13-2d96-4a69-a297-aedba667e710 - 43 + 44 #f1ece1 Chemically resistant and tough. CPE+ is chemically inert, tough, dimensionally stable and handles temperatures up to 100ºC. Use glue for small prints. An adhesion sheet is recommended for larger prints. @@ -132,5 +132,33 @@ + + + 110 + 65 + 0 + 1.5 + -4 + -12 + 1 + 100.4 + + yes + 3 + + + yes + + + no + + + no + + + no + + + diff --git a/ultimaker_cpe_red.xml.fdm_material b/ultimaker_cpe_red.xml.fdm_material index 2f7de50b0..292592e0c 100644 --- a/ultimaker_cpe_red.xml.fdm_material +++ b/ultimaker_cpe_red.xml.fdm_material @@ -7,7 +7,7 @@ Red 00181d6c-7024-479a-8eb7-8a2e38a2619a - 42 + 43 #c8102e Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC. Use glue. @@ -144,5 +144,40 @@ + + + 240 + 50 + 50 + 85 + -18 + -18 + 1 + 100.2 + + yes + + + yes + 250 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_cpe_transparent.xml.fdm_material b/ultimaker_cpe_transparent.xml.fdm_material index 65efa968f..f6233bbc8 100644 --- a/ultimaker_cpe_transparent.xml.fdm_material +++ b/ultimaker_cpe_transparent.xml.fdm_material @@ -7,7 +7,7 @@ Transparent bd0d9eb3-a920-4632-84e8-dcd6086746c5 - 42 + 43 #d0d0d0 Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC. Use glue. @@ -144,5 +144,40 @@ + + + 240 + 50 + 50 + 85 + -18 + -18 + 1 + 100.2 + + yes + + + yes + 250 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_cpe_white.xml.fdm_material b/ultimaker_cpe_white.xml.fdm_material index 13f8711b4..6017a0b7d 100644 --- a/ultimaker_cpe_white.xml.fdm_material +++ b/ultimaker_cpe_white.xml.fdm_material @@ -7,7 +7,7 @@ White 881c888e-24fb-4a64-a4ac-d5c95b096cd7 - 42 + 43 #f1ece1 Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC. Use glue. @@ -144,5 +144,40 @@ + + + 240 + 50 + 50 + 85 + -18 + -18 + 1 + 100.2 + + yes + + + yes + 250 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_cpe_yellow.xml.fdm_material b/ultimaker_cpe_yellow.xml.fdm_material index d7d5bc7f1..f64027819 100644 --- a/ultimaker_cpe_yellow.xml.fdm_material +++ b/ultimaker_cpe_yellow.xml.fdm_material @@ -7,7 +7,7 @@ Yellow b9176a2a-7a0f-4821-9f29-76d882a88682 - 42 + 43 #f6b600 Chemically resistant and tough. CPE is chemically inert, tough, dimensionally stable and handles temperatures up to 70ºC. Use glue. @@ -144,5 +144,40 @@ + + + 240 + 50 + 50 + 85 + -18 + -18 + 1 + 100.2 + + yes + + + yes + 250 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_nylon.xml.fdm_material b/ultimaker_nylon.xml.fdm_material index 391489ae6..278cc1165 100644 --- a/ultimaker_nylon.xml.fdm_material +++ b/ultimaker_nylon.xml.fdm_material @@ -8,7 +8,7 @@ c6714ed4-9734-4266-b4e1-d90b8b0c2434 - 7 + 8 #3DF266 Nylon is strong, abrasion-resistant, durable and engineered for low moisture sensitivity. Use glue. @@ -155,5 +155,39 @@ + + + 245 + 40 + 30 + 75 + 1.5 + -6 + 1 + 100.4 + + yes + + + yes + 250 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_nylon_black.xml.fdm_material b/ultimaker_nylon_black.xml.fdm_material index 52d4df192..9e88a9360 100644 --- a/ultimaker_nylon_black.xml.fdm_material +++ b/ultimaker_nylon_black.xml.fdm_material @@ -7,7 +7,7 @@ Black c64c2dbe-5691-4363-a7d9-66b2dc12837f - 36 + 37 #27292b Nylon is strong, abrasion-resistant, durable and engineered for low moisture sensitivity. Use glue. @@ -153,5 +153,39 @@ + + + 245 + 40 + 30 + 75 + 1.5 + -6 + 1 + 100.4 + + yes + + + yes + 250 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_nylon_transparent.xml.fdm_material b/ultimaker_nylon_transparent.xml.fdm_material index 7e011e22d..561461ebc 100644 --- a/ultimaker_nylon_transparent.xml.fdm_material +++ b/ultimaker_nylon_transparent.xml.fdm_material @@ -7,7 +7,7 @@ Transparent e256615d-a04e-4f53-b311-114b90560af9 - 36 + 37 #d0d0d0 Nylon is strong, abrasion-resistant, durable and engineered for low moisture sensitivity. Use glue. @@ -153,5 +153,39 @@ + + + 245 + 40 + 30 + 75 + 1.5 + -6 + 1 + 100.4 + + yes + + + yes + 250 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_pc.xml.fdm_material b/ultimaker_pc.xml.fdm_material index 730972b8f..5d6381339 100644 --- a/ultimaker_pc.xml.fdm_material +++ b/ultimaker_pc.xml.fdm_material @@ -8,7 +8,7 @@ 59675b16-d902-4cb3-a780-a539cae0b04d - 7 + 8 #F29030 Strong, tough and temperature resistant. PC offers a great print quality, heat resistance up to 110ºC, mechanical strength and toughness. Use glue for small prints. An adhesion sheet is recommended for larger prints. Set your print speed to a low value (10mm/sec) to get better layer bonding. @@ -143,5 +143,36 @@ + + + 110 + 65 + 0 + 100 + -5 + -14 + 1 + 100.4 + + yes + 280 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_pc_black.xml.fdm_material b/ultimaker_pc_black.xml.fdm_material index 96d6e5a66..37cf31bdb 100644 --- a/ultimaker_pc_black.xml.fdm_material +++ b/ultimaker_pc_black.xml.fdm_material @@ -7,7 +7,7 @@ Black e92b1f0b-a069-4969-86b4-30127cfb6f7b - 39 + 40 #0e0e10 Strong, tough and temperature resistant. PC offers a great print quality, heat resistance up to 110ºC, mechanical strength and toughness. Use glue for small prints. An adhesion sheet is recommended for larger prints. Set your print speed to a low value (10mm/sec) to get better layer bonding. @@ -141,5 +141,36 @@ + + + 110 + 65 + 0 + 100 + -5 + -14 + 1 + 100.4 + + yes + 280 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_pc_transparent.xml.fdm_material b/ultimaker_pc_transparent.xml.fdm_material index 244c985d8..47fcf27c9 100644 --- a/ultimaker_pc_transparent.xml.fdm_material +++ b/ultimaker_pc_transparent.xml.fdm_material @@ -7,7 +7,7 @@ Transparent 8a38a3e9-ecf7-4a7d-a6a9-e7ac35102968 - 39 + 40 #d0d0d0 Strong, tough and temperature resistant. PC offers a great print quality, heat resistance up to 110ºC, mechanical strength and toughness. Use glue for small prints. An adhesion sheet is recommended for larger prints. Set your print speed to a low value (10mm/sec) to get better layer bonding. @@ -141,5 +141,36 @@ + + + 110 + 65 + 0 + 100 + -5 + -14 + 1 + 100.4 + + yes + 280 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_pc_white.xml.fdm_material b/ultimaker_pc_white.xml.fdm_material index 4afb33975..61d210666 100644 --- a/ultimaker_pc_white.xml.fdm_material +++ b/ultimaker_pc_white.xml.fdm_material @@ -7,7 +7,7 @@ White 5e786b05-a620-4a87-92d0-f02becc1ff98 - 39 + 40 #ecece7 Strong, tough and temperature resistant. PC offers a great print quality, heat resistance up to 110ºC, mechanical strength and toughness. Use glue for small prints. An adhesion sheet is recommended for larger prints. Set your print speed to a low value (10mm/sec) to get better layer bonding. @@ -141,5 +141,36 @@ + + + 110 + 65 + 0 + 100 + -5 + -14 + 1 + 100.4 + + yes + 280 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_petcf.xml.fdm_material b/ultimaker_petcf.xml.fdm_material index 240604162..12c7b0080 100644 --- a/ultimaker_petcf.xml.fdm_material +++ b/ultimaker_petcf.xml.fdm_material @@ -8,7 +8,7 @@ f0245d40-3657-4615-b9ab-19fc043944ca - 6 + 7 #888888 Ultimaker PET-CF. Print on bare glass. @@ -112,5 +112,48 @@ + + + 50 + 20 + -14 + -14 + 280 + 1 + 204.16 + 51.04 + 40 + 100 + 6 + + no + + + no + + + no + + + no + + + no + + + yes + 3 + 280 + + + yes + 280 + + + yes + 280 + + + diff --git a/ultimaker_petcf_black.xml.fdm_material b/ultimaker_petcf_black.xml.fdm_material index 045a67dad..f8f5ff667 100644 --- a/ultimaker_petcf_black.xml.fdm_material +++ b/ultimaker_petcf_black.xml.fdm_material @@ -7,7 +7,7 @@ Black a6f8d4f1-7205-40cc-b9e5-3bad20bc8011 - 20 + 21 #1e1e1e Ultimaker PET-CF. Print on bare glass. @@ -110,5 +110,48 @@ + + + 50 + 20 + -14 + -14 + 280 + 1 + 204.16 + 51.04 + 40 + 100 + 6 + + no + + + no + + + no + + + no + + + no + + + yes + 3 + 280 + + + yes + 280 + + + yes + 280 + + + diff --git a/ultimaker_petcf_blue.xml.fdm_material b/ultimaker_petcf_blue.xml.fdm_material index 050f1417a..6e7823e63 100644 --- a/ultimaker_petcf_blue.xml.fdm_material +++ b/ultimaker_petcf_blue.xml.fdm_material @@ -7,7 +7,7 @@ Blue 81555f45-354b-42e0-bc0d-e0357cb56dd4 - 20 + 21 #025669 Ultimaker PET-CF. Print on bare glass. @@ -110,5 +110,48 @@ + + + 50 + 20 + -14 + -14 + 280 + 1 + 204.16 + 51.04 + 40 + 100 + 6 + + no + + + no + + + no + + + no + + + no + + + yes + 3 + 280 + + + yes + 280 + + + yes + 280 + + + diff --git a/ultimaker_petcf_gray.xml.fdm_material b/ultimaker_petcf_gray.xml.fdm_material index 2a1a38369..61dd92fa4 100644 --- a/ultimaker_petcf_gray.xml.fdm_material +++ b/ultimaker_petcf_gray.xml.fdm_material @@ -7,7 +7,7 @@ Gray 98896281-3972-4dc5-8d6d-76ed417b10ea - 20 + 21 #8d948d Ultimaker PET-CF. Print on bare glass. @@ -110,5 +110,48 @@ + + + 50 + 20 + -14 + -14 + 280 + 1 + 204.16 + 51.04 + 40 + 100 + 6 + + no + + + no + + + no + + + no + + + no + + + yes + 3 + 280 + + + yes + 280 + + + yes + 280 + + + diff --git a/ultimaker_petg.xml.fdm_material b/ultimaker_petg.xml.fdm_material index 702b3d47a..09dfeb28c 100644 --- a/ultimaker_petg.xml.fdm_material +++ b/ultimaker_petg.xml.fdm_material @@ -8,7 +8,7 @@ 91bd2402-1766-4cb0-9b21-6435e5095395 - 7 + 8 #ff5086 Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use. Use glue. @@ -136,5 +136,37 @@ + + + 50 + 50 + 85 + 1 + 100.2 + + yes + + + yes + 250 + 3 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_petg_black.xml.fdm_material b/ultimaker_petg_black.xml.fdm_material index fa2c5ed9e..44446b212 100644 --- a/ultimaker_petg_black.xml.fdm_material +++ b/ultimaker_petg_black.xml.fdm_material @@ -7,7 +7,7 @@ Black 5f9f3de0-045b-48d9-84ec-19db92be7603 - 42 + 43 #2a292a Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use. Use glue. @@ -134,5 +134,37 @@ + + + 50 + 50 + 85 + 1 + 100.2 + + yes + + + yes + 250 + 3 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_petg_blue.xml.fdm_material b/ultimaker_petg_blue.xml.fdm_material index efb90c2c8..6ba39c1da 100644 --- a/ultimaker_petg_blue.xml.fdm_material +++ b/ultimaker_petg_blue.xml.fdm_material @@ -7,7 +7,7 @@ Blue 2257ab94-fb27-42e6-865c-05aa6717504b - 42 + 43 #005387 Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use. Use glue. @@ -134,5 +134,37 @@ + + + 50 + 50 + 85 + 1 + 100.2 + + yes + + + yes + 250 + 3 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_petg_blue_translucent.xml.fdm_material b/ultimaker_petg_blue_translucent.xml.fdm_material index 55f3b6428..4f07629b7 100644 --- a/ultimaker_petg_blue_translucent.xml.fdm_material +++ b/ultimaker_petg_blue_translucent.xml.fdm_material @@ -7,7 +7,7 @@ Blue Translucent e0af2080-29fc-4b18-a5c0-42ca112f507f - 42 + 43 #0033A0 Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use. Use glue. @@ -134,5 +134,37 @@ + + + 50 + 50 + 85 + 1 + 100.2 + + yes + + + yes + 250 + 3 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_petg_green.xml.fdm_material b/ultimaker_petg_green.xml.fdm_material index 832c9bc29..c1645fa74 100644 --- a/ultimaker_petg_green.xml.fdm_material +++ b/ultimaker_petg_green.xml.fdm_material @@ -7,7 +7,7 @@ Green c8e4a85e-b256-4468-8516-0aa98c69c7d7 - 42 + 43 #008351 Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use. Use glue. @@ -134,5 +134,37 @@ + + + 50 + 50 + 85 + 1 + 100.2 + + yes + + + yes + 250 + 3 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_petg_green_translucent.xml.fdm_material b/ultimaker_petg_green_translucent.xml.fdm_material index fecbf7e98..08c16991b 100644 --- a/ultimaker_petg_green_translucent.xml.fdm_material +++ b/ultimaker_petg_green_translucent.xml.fdm_material @@ -7,7 +7,7 @@ Green Translucent 1f3c3be1-2e60-4343-b35d-cb383958d992 - 42 + 43 #006341 Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use. Use glue. @@ -134,5 +134,37 @@ + + + 50 + 50 + 85 + 1 + 100.2 + + yes + + + yes + 250 + 3 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_petg_grey.xml.fdm_material b/ultimaker_petg_grey.xml.fdm_material index ccee9045a..21ad5033b 100644 --- a/ultimaker_petg_grey.xml.fdm_material +++ b/ultimaker_petg_grey.xml.fdm_material @@ -7,7 +7,7 @@ Gray c8394116-30ba-4112-b4d9-8b2394278cb3 - 43 + 44 #575d5e Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use. Use glue. @@ -134,5 +134,37 @@ + + + 50 + 50 + 85 + 1 + 100.2 + + yes + + + yes + 250 + 3 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_petg_orange.xml.fdm_material b/ultimaker_petg_orange.xml.fdm_material index 7c36f2703..955fc71b0 100644 --- a/ultimaker_petg_orange.xml.fdm_material +++ b/ultimaker_petg_orange.xml.fdm_material @@ -7,7 +7,7 @@ Orange a02a3978-eb33-47ca-b32b-d08b92b58638 - 42 + 43 #FC4C02 Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use. Use glue. @@ -134,5 +134,37 @@ + + + 50 + 50 + 85 + 1 + 100.2 + + yes + + + yes + 250 + 3 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_petg_red.xml.fdm_material b/ultimaker_petg_red.xml.fdm_material index 81f7ec245..4913cb9bc 100644 --- a/ultimaker_petg_red.xml.fdm_material +++ b/ultimaker_petg_red.xml.fdm_material @@ -7,7 +7,7 @@ Red 9680dff6-7aa5-400b-982c-40a0de06a718 - 42 + 43 #bb1e10 Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use. Use glue. @@ -134,5 +134,37 @@ + + + 50 + 50 + 85 + 1 + 100.2 + + yes + + + yes + 250 + 3 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_petg_red_translucent.xml.fdm_material b/ultimaker_petg_red_translucent.xml.fdm_material index c145f5777..1df3cb570 100644 --- a/ultimaker_petg_red_translucent.xml.fdm_material +++ b/ultimaker_petg_red_translucent.xml.fdm_material @@ -7,7 +7,7 @@ Red Translucent c8639119-5cae-4f56-9bcf-3bb00e8225fd - 42 + 43 #93272C Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use. Use glue. @@ -134,5 +134,37 @@ + + + 50 + 50 + 85 + 1 + 100.2 + + yes + + + yes + 250 + 3 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_petg_silver.xml.fdm_material b/ultimaker_petg_silver.xml.fdm_material index 60a3dc57c..7bcd1e3e4 100644 --- a/ultimaker_petg_silver.xml.fdm_material +++ b/ultimaker_petg_silver.xml.fdm_material @@ -7,7 +7,7 @@ Silver 40a273c6-0e15-4db5-a278-8eb0b4a9e293 - 42 + 43 #a1a1a0 Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use. Use glue. @@ -134,5 +134,37 @@ + + + 50 + 50 + 85 + 1 + 100.2 + + yes + + + yes + 250 + 3 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_petg_transparent.xml.fdm_material b/ultimaker_petg_transparent.xml.fdm_material index f76425c1b..3d8ee8c9a 100644 --- a/ultimaker_petg_transparent.xml.fdm_material +++ b/ultimaker_petg_transparent.xml.fdm_material @@ -7,7 +7,7 @@ Transparent 7418eca4-e2c4-45b1-a022-37180861fd39 - 42 + 43 #d0d0d0 Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use. Use glue. @@ -134,5 +134,37 @@ + + + 50 + 50 + 85 + 1 + 100.2 + + yes + + + yes + 250 + 3 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_petg_white.xml.fdm_material b/ultimaker_petg_white.xml.fdm_material index d7536ce80..1e35547a3 100644 --- a/ultimaker_petg_white.xml.fdm_material +++ b/ultimaker_petg_white.xml.fdm_material @@ -7,7 +7,7 @@ White 61eb5c6c-0110-49de-9756-13b8c7cc2ff1 - 42 + 43 #ecece7 Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use. Use glue. @@ -134,5 +134,37 @@ + + + 50 + 50 + 85 + 1 + 100.2 + + yes + + + yes + 250 + 3 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_petg_yellow.xml.fdm_material b/ultimaker_petg_yellow.xml.fdm_material index f88b2865a..21468611b 100644 --- a/ultimaker_petg_yellow.xml.fdm_material +++ b/ultimaker_petg_yellow.xml.fdm_material @@ -7,7 +7,7 @@ Yellow 218379df-4a67-4668-b5f8-2a14c92bce96 - 42 + 43 #f1dd38 Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use. Use glue. @@ -134,5 +134,37 @@ + + + 50 + 50 + 85 + 1 + 100.2 + + yes + + + yes + 250 + 3 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_petg_yellow_fluorescent.xml.fdm_material b/ultimaker_petg_yellow_fluorescent.xml.fdm_material index a0ec1e5d7..76a75e981 100644 --- a/ultimaker_petg_yellow_fluorescent.xml.fdm_material +++ b/ultimaker_petg_yellow_fluorescent.xml.fdm_material @@ -7,7 +7,7 @@ Yellow Fluorescent d67a3ccb-6b51-4013-bdac-4c59e952aaf4 - 42 + 43 #B1D600 Ultimaker PETG is easily printable and a good all-round material. For anyone needing parts that require more chemical and heat resistance than PLA, this is an excellent material to use. Use glue. @@ -134,5 +134,37 @@ + + + 50 + 50 + 85 + 1 + 100.2 + + yes + + + yes + 250 + 3 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_pla.xml.fdm_material b/ultimaker_pla.xml.fdm_material index d1a7d8c78..c884a030e 100644 --- a/ultimaker_pla.xml.fdm_material +++ b/ultimaker_pla.xml.fdm_material @@ -8,7 +8,7 @@ 5b890432-a9f1-45e4-aad7-a73995600276 - 6 + 7 #ffc924 Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality. Print on bare glass. Use tape for cold build plates. @@ -175,5 +175,40 @@ + + + 55 + 30 + 100 + -2 + -14 + 1 + 100.16 + + yes + + + yes + 200 + + + yes + 10 + + + yes + + + yes + 10 + + + no + + + no + + + diff --git a/ultimaker_pla_black.xml.fdm_material b/ultimaker_pla_black.xml.fdm_material index f6b0f82a6..c8c8298ce 100644 --- a/ultimaker_pla_black.xml.fdm_material +++ b/ultimaker_pla_black.xml.fdm_material @@ -7,7 +7,7 @@ Black 3ee70a86-77d8-4b87-8005-e4a1bc57d2ce - 38 + 39 #0e0e10 Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality. Print on bare glass. Use tape for cold build plates. @@ -173,5 +173,40 @@ + + + 55 + 30 + 100 + -2 + -14 + 1 + 100.16 + + yes + + + yes + 200 + + + yes + 10 + + + yes + + + yes + 10 + + + no + + + no + + + diff --git a/ultimaker_pla_blue.xml.fdm_material b/ultimaker_pla_blue.xml.fdm_material index 851f21c26..76ec1d987 100644 --- a/ultimaker_pla_blue.xml.fdm_material +++ b/ultimaker_pla_blue.xml.fdm_material @@ -7,7 +7,7 @@ Blue 44a029e6-e31b-4c9e-a12f-9282e29a92ff - 41 + 42 #00387b Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality. Print on bare glass. Use tape for cold build plates. @@ -173,5 +173,40 @@ + + + 55 + 30 + 100 + -2 + -14 + 1 + 100.16 + + yes + + + yes + 200 + + + yes + 10 + + + yes + + + yes + 10 + + + no + + + no + + + diff --git a/ultimaker_pla_green.xml.fdm_material b/ultimaker_pla_green.xml.fdm_material index 05223c622..5305b6ff8 100644 --- a/ultimaker_pla_green.xml.fdm_material +++ b/ultimaker_pla_green.xml.fdm_material @@ -7,7 +7,7 @@ Green 2433b8fb-dcd6-4e36-9cd5-9f4ee551c04c - 41 + 42 #61993b Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality. Print on bare glass. Use tape for cold build plates. @@ -173,5 +173,40 @@ + + + 55 + 30 + 100 + -2 + -14 + 1 + 100.16 + + yes + + + yes + 200 + + + yes + 10 + + + yes + + + yes + 10 + + + no + + + no + + + diff --git a/ultimaker_pla_magenta.xml.fdm_material b/ultimaker_pla_magenta.xml.fdm_material index 466ceae0e..84d557e0d 100644 --- a/ultimaker_pla_magenta.xml.fdm_material +++ b/ultimaker_pla_magenta.xml.fdm_material @@ -7,7 +7,7 @@ Magenta fe3982c8-58f4-4d86-9ac0-9ff7a3ab9cbc - 41 + 42 #bc4077 Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality. Print on bare glass. Use tape for cold build plates. @@ -173,5 +173,40 @@ + + + 55 + 30 + 100 + -2 + -14 + 1 + 100.16 + + yes + + + yes + 200 + + + yes + 10 + + + yes + + + yes + 10 + + + no + + + no + + + diff --git a/ultimaker_pla_orange.xml.fdm_material b/ultimaker_pla_orange.xml.fdm_material index f45aa071e..c8e732fa9 100644 --- a/ultimaker_pla_orange.xml.fdm_material +++ b/ultimaker_pla_orange.xml.fdm_material @@ -7,7 +7,7 @@ Orange d9549dba-b9df-45b9-80a5-f7140a9a2f34 - 41 + 42 #ed6b21 Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality. Print on bare glass. Use tape for cold build plates. @@ -173,5 +173,40 @@ + + + 55 + 30 + 100 + -2 + -14 + 1 + 100.16 + + yes + + + yes + 200 + + + yes + 10 + + + yes + + + yes + 10 + + + no + + + no + + + diff --git a/ultimaker_pla_pearl-white.xml.fdm_material b/ultimaker_pla_pearl-white.xml.fdm_material index ae5cbbf30..37f980b04 100644 --- a/ultimaker_pla_pearl-white.xml.fdm_material +++ b/ultimaker_pla_pearl-white.xml.fdm_material @@ -7,7 +7,7 @@ Pearl-White d9fc79db-82c3-41b5-8c99-33b3747b8fb3 - 41 + 42 #e3d9c6 Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality. Print on bare glass. Use tape for cold build plates. @@ -173,5 +173,40 @@ + + + 55 + 30 + 100 + -2 + -14 + 1 + 100.16 + + yes + + + yes + 200 + + + yes + 10 + + + yes + + + yes + 10 + + + no + + + no + + + diff --git a/ultimaker_pla_red.xml.fdm_material b/ultimaker_pla_red.xml.fdm_material index 3ac040bb8..68fb65674 100644 --- a/ultimaker_pla_red.xml.fdm_material +++ b/ultimaker_pla_red.xml.fdm_material @@ -7,7 +7,7 @@ Red 9cfe5bf1-bdc5-4beb-871a-52c70777842d - 41 + 42 #bb1e10 Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality. Print on bare glass. Use tape for cold build plates. @@ -173,5 +173,40 @@ + + + 55 + 30 + 100 + -2 + -14 + 1 + 100.16 + + yes + + + yes + 200 + + + yes + 10 + + + yes + + + yes + 10 + + + no + + + no + + + diff --git a/ultimaker_pla_silver-metallic.xml.fdm_material b/ultimaker_pla_silver-metallic.xml.fdm_material index 4dc9aecd5..0ecfedad4 100644 --- a/ultimaker_pla_silver-metallic.xml.fdm_material +++ b/ultimaker_pla_silver-metallic.xml.fdm_material @@ -7,7 +7,7 @@ Silver Metallic 0e01be8c-e425-4fb1-b4a3-b79f255f1db9 - 41 + 42 #a1a1a0 Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality. Print on bare glass. Use tape for cold build plates. @@ -173,5 +173,40 @@ + + + 55 + 30 + 100 + -2 + -14 + 1 + 100.16 + + yes + + + yes + 200 + + + yes + 10 + + + yes + + + yes + 10 + + + no + + + no + + + diff --git a/ultimaker_pla_transparent.xml.fdm_material b/ultimaker_pla_transparent.xml.fdm_material index 41b8313ae..cf205dddf 100644 --- a/ultimaker_pla_transparent.xml.fdm_material +++ b/ultimaker_pla_transparent.xml.fdm_material @@ -7,7 +7,7 @@ Transparent 532e8b3d-5fd4-4149-b936-53ada9bd6b85 - 41 + 42 #d0d0d0 Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality. Print on bare glass. Use tape for cold build plates. @@ -173,5 +173,40 @@ + + + 55 + 30 + 100 + -2 + -14 + 1 + 100.16 + + yes + + + yes + 200 + + + yes + 10 + + + yes + + + yes + 10 + + + no + + + no + + + diff --git a/ultimaker_pla_white.xml.fdm_material b/ultimaker_pla_white.xml.fdm_material index af26d169c..aa0ac7bd1 100644 --- a/ultimaker_pla_white.xml.fdm_material +++ b/ultimaker_pla_white.xml.fdm_material @@ -7,7 +7,7 @@ White e509f649-9fe6-4b14-ac45-d441438cb4ef - 41 + 42 #f1ece1 Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality. Print on bare glass. Use tape for cold build plates. @@ -173,5 +173,40 @@ + + + 55 + 30 + 100 + -2 + -14 + 1 + 100.16 + + yes + + + yes + 200 + + + yes + 10 + + + yes + + + yes + 10 + + + no + + + no + + + diff --git a/ultimaker_pla_yellow.xml.fdm_material b/ultimaker_pla_yellow.xml.fdm_material index 3625ced01..cb42965a9 100644 --- a/ultimaker_pla_yellow.xml.fdm_material +++ b/ultimaker_pla_yellow.xml.fdm_material @@ -7,7 +7,7 @@ Yellow 9c1959d0-f597-46ec-9131-34020c7a54fc - 41 + 42 #f9a800 Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality. Print on bare glass. Use tape for cold build plates. @@ -173,5 +173,40 @@ + + + 55 + 30 + 100 + -2 + -14 + 1 + 100.16 + + yes + + + yes + 200 + + + yes + 10 + + + yes + + + yes + 10 + + + no + + + no + + + diff --git a/ultimaker_pp_transparent.xml.fdm_material b/ultimaker_pp_transparent.xml.fdm_material index e27846c8e..fdc1f84e3 100644 --- a/ultimaker_pp_transparent.xml.fdm_material +++ b/ultimaker_pp_transparent.xml.fdm_material @@ -7,7 +7,7 @@ Natural c7005925-2a41-4280-8cdd-4029e3fe5253 - 47 + 48 #d0d0d0 Fatigue and chemical resistant. Polypropylene offers excellent temperature, chemical and fatigue resistance. Its toughness and low friction make it a perfect choice for prototyping and creating durable end-use models. Adhesion sheets are required. @@ -155,5 +155,42 @@ + + + 220 + 40 + 85 + 20 + 2 + -14 + -14 + 1 + 100.7 + + + yes + + + yes + 225 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_ppscf_metallic-anthracite.xml.fdm_material b/ultimaker_ppscf_metallic-anthracite.xml.fdm_material new file mode 100644 index 000000000..6053cb52a --- /dev/null +++ b/ultimaker_ppscf_metallic-anthracite.xml.fdm_material @@ -0,0 +1,86 @@ + + + + + Ultimaker + PPS CF + Metallic Anthracite + + d86bf59a-9d10-4a25-99b6-2844e0bc1bfb + 2 + #383E42 + High performance carbon fiber reinforced PPS filament. Flame retardant, high chemical and heat resistance and high strength for functional 3D prints in manufacturing. + No glue needed + https://support.ultimaker.com/s/article/How-to-print-with-UltiMaker-PPS-CF + True + False + + + 1.51 + 2.85 + 750 + + + -8 + 25 + 0 + 2 + 320 + -50 + 25 + 280 + 25 + 4 + 7200 + 0.94 + + + 320 + 220 + 80 + 50 + 20 + 40 + 0 + 70 + true + + + 1.0 + 0.8 + 0 + + + + + -6 + 1 + 1.5 + + no + + + no + + + no + + + no + + + no + + + no + + + no + + + yes + + + + + diff --git a/ultimaker_pva.xml.fdm_material b/ultimaker_pva.xml.fdm_material index f3488b6f2..bb527f3a4 100644 --- a/ultimaker_pva.xml.fdm_material +++ b/ultimaker_pva.xml.fdm_material @@ -7,7 +7,7 @@ Natural fe15ed8a-33c3-4f57-a2a7-b4b78a38c3cb - 39 + 40 #f5f2d1 Water soluble support material. PVA is a matching support material for PLA, CPE and Nylon. Use the same temperatures and adhesion method as your build material(s). @@ -168,5 +168,44 @@ + + + 220 + 40 + 50 + 40 + 1 + 5 + 0.2 + + + no + + + no + + + no + + + yes + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_tough_pla.xml.fdm_material b/ultimaker_tough_pla.xml.fdm_material index d6644a903..30ff1dee7 100644 --- a/ultimaker_tough_pla.xml.fdm_material +++ b/ultimaker_tough_pla.xml.fdm_material @@ -8,7 +8,7 @@ 2c31d5ae-a75c-4be6-83bf-377341fc6d24 - 7 + 8 #ffc9f0 Technical PLA material with toughness similar to ABS. Ideal for reliably printing functional prototypes and tooling at larger sizes, Tough PLA offers the same safe and easy use as regular PLA. Print on bare glass. Use tape for cold build plates. @@ -131,5 +131,39 @@ + + + 55 + 30 + 100 + -2 + -12 + 1 + 100.14 + + yes + + + yes + 205 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_tough_pla_black.xml.fdm_material b/ultimaker_tough_pla_black.xml.fdm_material index b2a69f708..3b1661377 100644 --- a/ultimaker_tough_pla_black.xml.fdm_material +++ b/ultimaker_tough_pla_black.xml.fdm_material @@ -7,7 +7,7 @@ Black 03f24266-0291-43c2-a6da-5211892a2699 - 34 + 35 #2a292a Technical PLA material with toughness similar to ABS. Ideal for reliably printing functional prototypes and tooling at larger sizes, Tough PLA offers the same safe and easy use as regular PLA. Print on bare glass. Use tape for cold build plates. @@ -129,5 +129,39 @@ + + + 55 + 30 + 100 + -2 + -12 + 1 + 100.14 + + yes + + + yes + 205 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_tough_pla_blue.xml.fdm_material b/ultimaker_tough_pla_blue.xml.fdm_material index 456aee33e..4c36aec6f 100644 --- a/ultimaker_tough_pla_blue.xml.fdm_material +++ b/ultimaker_tough_pla_blue.xml.fdm_material @@ -7,7 +7,7 @@ Blue 4b049931-6ee9-408c-8588-ddd4673467d1 - 13 + 14 #1B5583 Technical PLA material with toughness similar to ABS. Ideal for reliably printing functional prototypes and tooling at larger sizes, Tough PLA offers the same safe and easy use as regular PLA. Print on bare glass. Use tape for cold build plates. @@ -129,5 +129,39 @@ + + + 55 + 30 + 100 + -2 + -12 + 1 + 100.14 + + yes + + + yes + 205 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_tough_pla_gray.xml.fdm_material b/ultimaker_tough_pla_gray.xml.fdm_material index 561e8fcca..45abedfe7 100644 --- a/ultimaker_tough_pla_gray.xml.fdm_material +++ b/ultimaker_tough_pla_gray.xml.fdm_material @@ -7,7 +7,7 @@ Gray 6660eb2e-aa40-49ad-ac9b-ada979f3de9b - 13 + 14 #78858B Technical PLA material with toughness similar to ABS. Ideal for reliably printing functional prototypes and tooling at larger sizes, Tough PLA offers the same safe and easy use as regular PLA. Print on bare glass. Use tape for cold build plates. @@ -129,5 +129,39 @@ + + + 55 + 30 + 100 + -2 + -12 + 1 + 100.14 + + yes + + + yes + 205 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_tough_pla_green.xml.fdm_material b/ultimaker_tough_pla_green.xml.fdm_material index 3b9eafbe1..62b5afce3 100644 --- a/ultimaker_tough_pla_green.xml.fdm_material +++ b/ultimaker_tough_pla_green.xml.fdm_material @@ -7,7 +7,7 @@ Green 6d71f4ad-29ab-4b50-8f65-22d99af294dd - 34 + 35 #00a95c Technical PLA material with toughness similar to ABS. Ideal for reliably printing functional prototypes and tooling at larger sizes, Tough PLA offers the same safe and easy use as regular PLA. Print on bare glass. Use tape for cold build plates. @@ -129,5 +129,39 @@ + + + 55 + 30 + 100 + -2 + -12 + 1 + 100.14 + + yes + + + yes + 205 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_tough_pla_red.xml.fdm_material b/ultimaker_tough_pla_red.xml.fdm_material index e096e702a..4d85141d1 100644 --- a/ultimaker_tough_pla_red.xml.fdm_material +++ b/ultimaker_tough_pla_red.xml.fdm_material @@ -7,7 +7,7 @@ Red 2db25566-9a91-4145-84a5-46c90ed22bdf - 34 + 35 #de4343 Technical PLA material with toughness similar to ABS. Ideal for reliably printing functional prototypes and tooling at larger sizes, Tough PLA offers the same safe and easy use as regular PLA. Print on bare glass. Use tape for cold build plates. @@ -129,5 +129,39 @@ + + + 55 + 30 + 100 + -2 + -12 + 1 + 100.14 + + yes + + + yes + 205 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_tough_pla_white.xml.fdm_material b/ultimaker_tough_pla_white.xml.fdm_material index 72a11ceee..c920af0a1 100644 --- a/ultimaker_tough_pla_white.xml.fdm_material +++ b/ultimaker_tough_pla_white.xml.fdm_material @@ -7,7 +7,7 @@ White 851427a0-0c9a-4d7c-a9a8-5cc92f84af1f - 34 + 35 #ecece7 Technical PLA material with toughness similar to ABS. Ideal for reliably printing functional prototypes and tooling at larger sizes, Tough PLA offers the same safe and easy use as regular PLA. Print on bare glass. Use tape for cold build plates. @@ -129,5 +129,39 @@ + + + 55 + 30 + 100 + -2 + -12 + 1 + 100.14 + + yes + + + yes + 205 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_tough_pla_yellow.xml.fdm_material b/ultimaker_tough_pla_yellow.xml.fdm_material index b5bae6df9..dd7d24d86 100644 --- a/ultimaker_tough_pla_yellow.xml.fdm_material +++ b/ultimaker_tough_pla_yellow.xml.fdm_material @@ -7,7 +7,7 @@ Yellow bfdb0787-032d-4cf5-9975-964132bd641c - 13 + 14 #F8F32B Technical PLA material with toughness similar to ABS. Ideal for reliably printing functional prototypes and tooling at larger sizes, Tough PLA offers the same safe and easy use as regular PLA. Print on bare glass. Use tape for cold build plates. @@ -129,5 +129,39 @@ + + + 55 + 30 + 100 + -2 + -12 + 1 + 100.14 + + yes + + + yes + 205 + + + yes + 10 + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_tpu.xml.fdm_material b/ultimaker_tpu.xml.fdm_material index c094f0b43..fb146397e 100644 --- a/ultimaker_tpu.xml.fdm_material +++ b/ultimaker_tpu.xml.fdm_material @@ -8,7 +8,7 @@ bddeb098-9e1f-4d0b-be9f-e99f6f8277d8 - 7 + 8 #B22744 Wear and tear resistant. TPU features a Shore-A hardness of 95 and an elongation of up to 580% at break. Suitable for applications that require slight flexibility, wear and tear, and chemical resistance. Use glue. @@ -141,5 +141,36 @@ + + + 40 + 30 + 50 + 2 + -50 + 1 + 100.3 + + + yes + 3 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_tpu_black.xml.fdm_material b/ultimaker_tpu_black.xml.fdm_material index d131594ef..ac8a8f238 100644 --- a/ultimaker_tpu_black.xml.fdm_material +++ b/ultimaker_tpu_black.xml.fdm_material @@ -7,7 +7,7 @@ Black eff40bcf-588d-420d-a3bc-a5ffd8c7f4b3 - 39 + 40 #0e0e10 Wear and tear resistant. TPU features a Shore-A hardness of 95 and an elongation of up to 580% at break. Suitable for applications that require slight flexibility, wear and tear, and chemical resistance. Use glue. @@ -139,5 +139,36 @@ + + + 40 + 30 + 50 + 2 + -50 + 1 + 100.3 + + + yes + 3 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_tpu_blue.xml.fdm_material b/ultimaker_tpu_blue.xml.fdm_material index 5e2a6abdc..0429f53af 100644 --- a/ultimaker_tpu_blue.xml.fdm_material +++ b/ultimaker_tpu_blue.xml.fdm_material @@ -7,7 +7,7 @@ Blue 5f4a826c-7bfe-460f-8650-a9178b180d34 - 39 + 40 #00387b Wear and tear resistant. TPU features a Shore-A hardness of 95 and an elongation of up to 580% at break. Suitable for applications that require slight flexibility, wear and tear, and chemical resistance. Use glue. @@ -139,5 +139,36 @@ + + + 40 + 30 + 50 + 2 + -50 + 1 + 100.3 + + + yes + 3 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_tpu_red.xml.fdm_material b/ultimaker_tpu_red.xml.fdm_material index 15d771c37..566e69d8f 100644 --- a/ultimaker_tpu_red.xml.fdm_material +++ b/ultimaker_tpu_red.xml.fdm_material @@ -7,7 +7,7 @@ Red 07a4547f-d21f-41a0-8eee-bc92125221b3 - 39 + 40 #a63437 Wear and tear resistant. TPU features a Shore-A hardness of 95 and an elongation of up to 580% at break. Suitable for applications that require slight flexibility, wear and tear, and chemical resistance. Use glue. @@ -139,5 +139,36 @@ + + + 40 + 30 + 50 + 2 + -50 + 1 + 100.3 + + + yes + 3 + + + yes + + + no + + + no + + + no + + + no + + + diff --git a/ultimaker_tpu_white.xml.fdm_material b/ultimaker_tpu_white.xml.fdm_material index a9690f033..26fc0ae9a 100644 --- a/ultimaker_tpu_white.xml.fdm_material +++ b/ultimaker_tpu_white.xml.fdm_material @@ -7,7 +7,7 @@ White 6a2573e6-c8ee-4c66-8029-3ebb3d5adc5b - 39 + 40 #f1ece1 Wear and tear resistant. TPU features a Shore-A hardness of 95 and an elongation of up to 580% at break. Suitable for applications that require slight flexibility, wear and tear, and chemical resistance. Use glue. @@ -139,5 +139,36 @@ + + + 40 + 30 + 50 + 2 + -50 + 1 + 100.3 + + + yes + 3 + + + yes + + + no + + + no + + + no + + + no + + + From ea2c833b01c2f241ff345f5e3eca8695a929dba5 Mon Sep 17 00:00:00 2001 From: Casper Lamboo Date: Mon, 22 Apr 2024 10:51:53 +0200 Subject: [PATCH 5/5] Fix version number --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index c2971e276..efc6947f1 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1 +1 @@ -version: "5.8.0-alpha.0" +version: "5.7.1-beta.1"