Merge remote-tracking branch 'origin/master' into develop

keyboards/cannonkeys/satisfaction75_hs/keyboard.json

@@ -112,9 +112,9 @@
                 {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1},
-                {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1},
-                {"matrix": [5, 9], "x": 12, "y": 5.25, "w": 1},
+                {"matrix": [5, 10], "x": 10, "y": 5.25},
+                {"matrix": [5, 11], "x": 11, "y": 5.25},
+                {"matrix": [5, 9], "x": 12, "y": 5.25},
                 {"matrix": [5, 12], "x": 13.25, "y": 5.5},
                 {"matrix": [5, 13], "x": 14.25, "y": 5.5},
                 {"matrix": [5, 14], "x": 15.25, "y": 5.5}

keyboards/whitefacemountain/ampersand/keyboard.json

@@ -64,13 +64,13 @@
                 {"label": ".", "matrix": [2, 9], "x": 9.75, "y": 2},
                 {"label": "/", "matrix": [2, 10], "x": 10.75, "y": 2},
                 {"label": "Shift", "matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.75},
-                {"label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 3, "w": 1},
-                {"label": "LAlt", "matrix": [3, 1], "x": 1.75, "y": 3, "w": 1},
-                {"label": "LGui", "matrix": [3, 2], "x": 2.75, "y": 3, "w": 1},
+                {"label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "LAlt", "matrix": [3, 1], "x": 1.75, "y": 3},
+                {"label": "LGui", "matrix": [3, 2], "x": 2.75, "y": 3},
                 {"label": "Space", "matrix": [3, 5], "x": 3.75, "y": 3, "w": 6},
-                {"label": "RGui", "matrix": [3, 8], "x": 9.75, "y": 3, "w": 1},
-                {"label": "RAlt", "matrix": [3, 9], "x": 10.75, "y": 3, "w": 1},
-                {"label": "RCtrl", "matrix": [3, 11], "x": 12.5, "y": 3, "w": 1}
+                {"label": "RGui", "matrix": [3, 8], "x": 9.75, "y": 3},
+                {"label": "RAlt", "matrix": [3, 9], "x": 10.75, "y": 3},
+                {"label": "RCtrl", "matrix": [3, 11], "x": 12.5, "y": 3}
             ]
         },
         "LAYOUT_split_bars": {
@@ -113,14 +113,14 @@
                 {"label": ".", "matrix": [2, 9], "x": 9.75, "y": 2},
                 {"label": "/", "matrix": [2, 10], "x": 10.75, "y": 2},
                 {"label": "Shift", "matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.75},
-                {"label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 3, "w": 1},
+                {"label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 3},
                 {"label": "LAlt", "matrix": [3, 1], "x": 1.75, "y": 3, "w": 1.5},
-                {"label": "LGui", "matrix": [3, 2], "x": 3.25, "y": 3, "w": 1},
+                {"label": "LGui", "matrix": [3, 2], "x": 3.25, "y": 3},
                 {"label": "Space", "matrix": [3, 3], "x": 4.25, "y": 3, "w": 2.25},
                 {"label": "Space", "matrix": [3, 7], "x": 6.5, "y": 3, "w": 2.75},
-                {"label": "RGui", "matrix": [3, 8], "x": 9.25, "y": 3, "w": 1},
+                {"label": "RGui", "matrix": [3, 8], "x": 9.25, "y": 3},
                 {"label": "RAlt", "matrix": [3, 9], "x": 10.25, "y": 3, "w": 1.5},
-                {"label": "RCtrl", "matrix": [3, 11], "x": 12.5, "y": 3, "w": 1}
+                {"label": "RCtrl", "matrix": [3, 11], "x": 12.5, "y": 3}
             ]
         }
     }

keyboards/zeix/singa/kohaku/keyboard.json

@@ -326,7 +326,7 @@
                 {"matrix": [7, 6], "x": 14, "y": 3},
                 {"matrix": [7, 7], "x": 15, "y": 3},
                 {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [9, 0], "x": 1.5, "y": 4, "w": 1},
+                {"matrix": [9, 0], "x": 1.5, "y": 4},
                 {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
                 {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
                 {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
@@ -397,7 +397,7 @@
                 {"matrix": [7, 6], "x": 14, "y": 3},
                 {"matrix": [7, 7], "x": 15, "y": 3},
                 {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [9, 0], "x": 1.5, "y": 4, "w": 1},
+                {"matrix": [9, 0], "x": 1.5, "y": 4},
                 {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
                 {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
                 {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
@@ -613,7 +613,7 @@
                 {"matrix": [7, 6], "x": 14, "y": 3},
                 {"matrix": [7, 7], "x": 15, "y": 3},
                 {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [9, 0], "x": 1.5, "y": 4, "w": 1},
+                {"matrix": [9, 0], "x": 1.5, "y": 4},
                 {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
                 {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
                 {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
@@ -685,7 +685,7 @@
                 {"matrix": [7, 6], "x": 14, "y": 3},
                 {"matrix": [7, 7], "x": 15, "y": 3},
                 {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
-                {"matrix": [9, 0], "x": 1.5, "y": 4, "w": 1},
+                {"matrix": [9, 0], "x": 1.5, "y": 4},
                 {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
                 {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
                 {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},