Merge branch 'master' of https://github.com/Ultimaker/Cura

2025-11-28 21:31:15 -07:00 · 2015-07-27 14:25:42 +02:00 · 2015-07-27 14:25:42 +02:00 · 54aeca603e
commit 54aeca603e
parent 19d711fb80 5123434b25
1 changed files with 8 additions and 9 deletions
--- a/resources/settings/fdmprinter.json
+++ b/resources/settings/fdmprinter.json
@ -79,9 +79,9 @@
                ]
            ]
        },
-	"machine_head_with_fans_polygon":
-	{
-	      "default": [
+        "machine_head_with_fans_polygon":
+        {
+            "default": [
                [
                    -20,
                    10
@ -99,12 +99,11 @@
                    -10
                ]
            ]
-	},
-	"gantry_height":
-	{
-		"default":99999999999
-	},
-	
+        },
+        "gantry_height":
+        {
+            "default":99999999999
+        },
        "machine_nozzle_tip_outer_diameter": {
            "default": 1
        },