Merge branch '5.6' into Update_Method

Ultimaker · Nov 3, 2023 · 34ee25a · 34ee25a
2 parents f9dcb89 + e16127c
commit 34ee25a
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json
@@ -1,11 +1,11 @@
 {
     "version": 2,
-    "name": "Makerbot Method Base Profile",
+    "name": "UltiMaker Method Base Profile",
     "inherits": "ultimaker",
     "metadata":
     {
         "visible": false,
-        "author": "Ultimaker",
+        "author": "UltiMaker",
         "manufacturer": "Ultimaker B.V.",
         "file_formats": "application/x-makerbot",
         "platform": "ultimaker_method_platform.stl",

diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json
@@ -1,11 +1,11 @@
 {
     "version": 2,
-    "name": "MakerBot Method X",
+    "name": "UltiMaker Method X",
     "inherits": "ultimaker_method_base",
     "metadata":
     {
         "visible": true,
-        "author": "Ultimaker",
+        "author": "UltiMaker",
         "manufacturer": "Ultimaker B.V.",
         "file_formats": "application/x-makerbot",
         "platform": "ultimaker_method_platform.stl",

diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json
@@ -1,11 +1,11 @@
 {
     "version": 2,
-    "name": "MakerBot Method XL",
+    "name": "UltiMaker Method XL",
     "inherits": "ultimaker_methodx",
     "metadata":
     {
         "visible": true,
-        "author": "Ultimaker",
+        "author": "UltiMaker",
         "manufacturer": "Ultimaker B.V.",
         "file_formats": "application/x-makerbot",
         "platform": "ultimaker_method_xl_platform.stl",

diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json
@@ -1,11 +1,11 @@
 {
     "version": 2,
-    "name": "Ultimaker S3",
+    "name": "UltiMaker S3",
     "inherits": "ultimaker",
     "metadata":
     {
         "visible": true,
-        "author": "Ultimaker",
+        "author": "UltiMaker",
         "manufacturer": "Ultimaker B.V.",
         "file_formats": "application/x-ufp;text/x-gcode",
         "platform": "ultimaker_s3_platform.obj",

diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json
@@ -1,11 +1,11 @@
 {
     "version": 2,
-    "name": "Ultimaker S5",
+    "name": "UltiMaker S5",
     "inherits": "ultimaker",
     "metadata":
     {
         "visible": true,
-        "author": "Ultimaker",
+        "author": "UltiMaker",
         "manufacturer": "Ultimaker B.V.",
         "file_formats": "application/x-ufp;text/x-gcode",
         "platform": "ultimaker_s5_platform.obj",

diff --git a/resources/definitions/ultimaker_s7.def.json b/resources/definitions/ultimaker_s7.def.json
@@ -1,11 +1,11 @@
 {
     "version": 2,
-    "name": "Ultimaker S7",
+    "name": "UltiMaker S7",
     "inherits": "ultimaker_s5",
     "metadata":
     {
         "visible": true,
-        "author": "Ultimaker",
+        "author": "UltiMaker",
         "manufacturer": "Ultimaker B.V.",
         "file_formats": "application/x-ufp;text/x-gcode",
         "platform": "ultimaker_s7_platform.obj",