From c7531ec6cfa3df4e41c0ba08851caa67653f704e Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Thu, 21 Feb 2019 19:37:59 +0100 Subject: [PATCH] Material: cards, some fixes in generic cards --- src/Mod/Material/CMakeLists.txt | 4 ++-- .../{ABS.FCMat => ABS-Generic.FCMat} | 2 +- ...lic-Glass.FCMat => Acrylic-Glass-Generic.FCMat} | 2 +- src/Mod/Material/StandardMaterial/PLA.FCMat | 14 -------------- 4 files changed, 4 insertions(+), 18 deletions(-) rename src/Mod/Material/StandardMaterial/{ABS.FCMat => ABS-Generic.FCMat} (98%) rename src/Mod/Material/StandardMaterial/{Acrylic-Glass.FCMat => Acrylic-Glass-Generic.FCMat} (97%) delete mode 100644 src/Mod/Material/StandardMaterial/PLA.FCMat diff --git a/src/Mod/Material/CMakeLists.txt b/src/Mod/Material/CMakeLists.txt index 4945e2a60c..bf325f2803 100644 --- a/src/Mod/Material/CMakeLists.txt +++ b/src/Mod/Material/CMakeLists.txt @@ -18,14 +18,14 @@ SOURCE_GROUP("Module" FILES ${Material_SRCS}) SET (MaterialLib_Files StandardMaterial/None.FCMat - StandardMaterial/ABS.FCMat + StandardMaterial/ABS-Generic.FCMat + StandardMaterial/Acrylic-Glass-Generic.FCMat StandardMaterial/CalculiX-Steel.FCMat StandardMaterial/Concrete-Generic.FCMat StandardMaterial/Glass-Generic.FCMat StandardMaterial/PA6-Generic.FCMat StandardMaterial/PET-Generic.FCMat StandardMaterial/PLA-Generic.FCMat - StandardMaterial/PLA.FCMat StandardMaterial/PP-Generic.FCMat StandardMaterial/PTFE-Generic.FCMat StandardMaterial/PVC-Generic.FCMat diff --git a/src/Mod/Material/StandardMaterial/ABS.FCMat b/src/Mod/Material/StandardMaterial/ABS-Generic.FCMat similarity index 98% rename from src/Mod/Material/StandardMaterial/ABS.FCMat rename to src/Mod/Material/StandardMaterial/ABS-Generic.FCMat index 745c99f809..18baa0a286 100644 --- a/src/Mod/Material/StandardMaterial/ABS.FCMat +++ b/src/Mod/Material/StandardMaterial/ABS-Generic.FCMat @@ -1,4 +1,4 @@ -; ABS +; ABS-Generic ; (c) 2013 Juergen Riegel (CC-BY 3.0) ; information about the content of such cards you can find here: ; http://www.freecadweb.org/wiki/index.php?title=Material diff --git a/src/Mod/Material/StandardMaterial/Acrylic-Glass.FCMat b/src/Mod/Material/StandardMaterial/Acrylic-Glass-Generic.FCMat similarity index 97% rename from src/Mod/Material/StandardMaterial/Acrylic-Glass.FCMat rename to src/Mod/Material/StandardMaterial/Acrylic-Glass-Generic.FCMat index 9b4c8f32c6..7587682fc7 100644 --- a/src/Mod/Material/StandardMaterial/Acrylic-Glass.FCMat +++ b/src/Mod/Material/StandardMaterial/Acrylic-Glass-Generic.FCMat @@ -1,4 +1,4 @@ -; Acrylic-Glass +; Acrylic-Glass-Generic ; (c) 2016 Przemo Firszt (CC-BY 3.0) ; information about the content of such cards you can find here: ; http://www.freecadweb.org/wiki/index.php?title=Material diff --git a/src/Mod/Material/StandardMaterial/PLA.FCMat b/src/Mod/Material/StandardMaterial/PLA.FCMat deleted file mode 100644 index eaa4d3cb67..0000000000 --- a/src/Mod/Material/StandardMaterial/PLA.FCMat +++ /dev/null @@ -1,14 +0,0 @@ -; PLA -; (c) 2013 Juergen Riegel (CC-BY 3.0) -; information about the content of such cards you can find here: -; http://www.freecadweb.org/wiki/index.php?title = Material - -[FCMat] -Name = PLA -Description = Polylactic acid or polylactide (PLA, Poly) is a biodegradable thermoplastic aliphatic polyester derived from renewable resources, such as corn starch, tapioca roots, chips, starch or sugarcane. -Father = Thermoplast -ProductURL = http://en.wikipedia.org/wiki/Polylactic_acid -YoungsModulus = 3640 MPa -UltimateTensileStrength = 49.6 MPa -PoissonRatio = 0.36 -Density = 1300 kg/m^3