SW-1262 add material setting for marker spray (mrbeam#1483)

SW-1264 hotfix v0.10.4-hotfix.1 release

Author: JFSolution

octoprint_mrbeam/__version.py

@@ -1 +1 @@
-__version__ = "0.10.4"
+__version__ = "0.10.4-hotfix.1"

octoprint_mrbeam/files/material_settings/materials.csv

@@ -1,5 +1,5 @@
 Laserhead,Material,Color,Thickness,Intensity,Speed,Passes,Compressor,Piercing time,Dithering,Comments
-You can drag the cell to fill a range with the same name,Color codes take a long time to update -->,"Use ""fill color"" tool",Engrave or (mm),light-dark (%),light-dark 0 to 1500,,level 0 to 3,(ms),yes/no,"interpolated value or #madewithmrbeam? Let us know what makes you tick
+You can drag the cell to fill a range with the same name,Color codes take a long time to update -->,"Use ""fill color"" tool",Engrave or (mm),light-dark (%),light-dark 0 to 1500,,level 0 to 3,(ms),yes/no,"interpolated value or #madewithmrbeam? Let us know what makes you tick
 "
 Mr Beam II,Anodized Aluminum,#000000,Engrave,0-100,30-1000,1,0,0,no,
 Mr Beam II,Acrylic,#ffd966,Engrave,0-100,1500-450,1,0,0,no,
@@ -174,7 +174,7 @@ Mr Beam II (not validated),,#41c500,2,100,600,1,3,0,no,calculated
 MrB II Dreamcut,,#41c500,3,100,1300,1,3,0,no,calculated
 Mr Beam II (not validated),,#e6e6e6,2,100,140,1,3,0,no,
 MrB II Dreamcut,Grey Cardboard,#cccccc,Engrave,0-50,1500-1500,1,3,0,no,
-"Dreamcut (not validated)
+"Dreamcut (not validated)
 ",,#cccccc,1,100,100,3,3,0,no,
 MrB II Dreamcut,Jersey Fabric,#434343,"0,3",100,1200,2,3,0,no,calculated
 MrB II Dreamcut,,#ff0000,"0,3",100,1400,2,3,0,no,tested
@@ -377,4 +377,5 @@ MrB II Dreamcut S,Wood Sticker,#bc955a,1,100,530,2,3,1,no,
 MrB II Dreamcut S,Solid Wood,#783f04,Engrave,0-30,1200-1600,1,3,0,no,
 MrB II Dreamcut S,Solid Wood,#783f04,3,100,300,2,3,0,no,
 MrB II Dreamcut S,Solid Wood,#bc955a,Engrave,0-35,1200-1600,1,3,0,no,
-MrB II Dreamcut S,Solid Wood,#bc955a,3,100,350,2,3,0,no,
+MrB II Dreamcut S,Solid Wood,#bc955a,3,100,350,2,3,0,no,
+MrB II Dreamcut S,Stainless Steel,#cbcccb,Engrave,100,500-300,1,0,0,no,

octoprint_mrbeam/static/img/materials/Stainless-Steel.jpg

@@ -369,6 +369,13 @@ $(function () {
                 hints: "",
                 safety_notes: "",
             },
+            "Stainless Steel": {
+                name: gettext("Stainless Steel"),
+                img: "Stainless-Steel.jpg",
+                description: "",
+                hints: gettext("Engravings on stainless steel only work with our \"mark solid\" spray. Use line distance 0,1mm for the best result."),
+                safety_notes: gettext("Do not engrave stainless steel without the application of laser marking color."),
+            },
         };
         ///// EDIT MATERIAL SETTINGS ABOVE THIS LINE ////////`
     }

octoprint_mrbeam/static/js/material_settings.js

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mr_Beam 0.1.61\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-03-31 16:25+0200\n"
-"PO-Revision-Date: 2022-03-31 16:31+0200\n"
+"POT-Creation-Date: 2022-05-05 10:33+0200\n"
+"PO-Revision-Date: 2022-05-05 10:34+0200\n"
 "Last-Translator: Andy Werner <[email protected]>\n"
 "Language-Team: \n"
 "Language: de\n"
@@ -747,6 +747,27 @@ msgstr "Edelholzsticker"
 msgid "Solid Wood"
 msgstr "Vollholz"
 
+#: octoprint_mrbeam/static/js/material_settings.js:373
+msgid "Stainless Steel"
+msgstr "Edelstahl"
+
+#: octoprint_mrbeam/static/js/material_settings.js:376
+msgid ""
+"Engravings on stainless steel only work with our \"mark solid\" spray. Use "
+"line distance 0,1mm for the best result."
+msgstr ""
+"Gravuren auf Edelstahl funktionieren nur mit unserm “Mark Solid” Laser "
+"Markierungsspray. Verwende einen Linienabstand von 0,1mm für ein optimales "
+"Ergebnis."
+
+#: octoprint_mrbeam/static/js/material_settings.js:377
+msgid ""
+"Do not engrave stainless steel without the application of laser marking "
+"color."
+msgstr ""
+"Edelstahl nicht blank gravieren, sonder immer in Verbindung mit unserem "
+"Markierugsspay."
+
 #: octoprint_mrbeam/static/js/mother_viewmodel.js:51
 msgid "Starts the laser job"
 msgstr "Startet den Laserjob"

octoprint_mrbeam/translations/de/LC_MESSAGES/messages.mo

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-03-31 16:25+0200\n"
+"POT-Creation-Date: 2022-05-05 10:33+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -633,6 +633,22 @@ msgstr ""
 msgid "Solid Wood"
 msgstr ""
 
+#: octoprint_mrbeam/static/js/material_settings.js:373
+msgid "Stainless Steel"
+msgstr ""
+
+#: octoprint_mrbeam/static/js/material_settings.js:376
+msgid ""
+"Engravings on stainless steel only work with our \"mark solid\" spray. "
+"Use line distance 0,1mm for the best result."
+msgstr ""
+
+#: octoprint_mrbeam/static/js/material_settings.js:377
+msgid ""
+"Do not engrave stainless steel without the application of laser marking "
+"color."
+msgstr ""
+
 #: octoprint_mrbeam/static/js/mother_viewmodel.js:51
 msgid "Starts the laser job"
 msgstr ""