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

keyboards/takashicompany/endzone34/info.json

@@ -1,183 +1,48 @@
 {
-	"keyboard_name": "EndZone34",
-	"url": "https://github.com/takashicompany/endzone34",
-	"maintainer": "takashicompany",
-	"width": 12,
-	"height": 4,
-	"layouts": {
-		"LAYOUT": {
-			"layout": [
-				{
-					"label": "W",
-					"x": 1,
-					"y": 0
-				},
-				{
-					"label": "E",
-					"x": 2,
-					"y": 0
-				},
-				{
-					"label": "R",
-					"x": 3,
-					"y": 0
-				},
-				{
-					"label": "T",
-					"x": 4,
-					"y": 0
-				},
-				{
-					"label": "Y",
-					"x": 7,
-					"y": 0
-				},
-				{
-					"label": "U",
-					"x": 8,
-					"y": 0
-				},
-				{
-					"label": "I",
-					"x": 9,
-					"y": 0
-				},
-				{
-					"label": "O",
-					"x": 10,
-					"y": 0
-				},
-				{
-					"label": "Q",
-					"x": 0,
-					"y": 0.5
-				},
-				{
-					"label": "P",
-					"x": 11,
-					"y": 0.5
-				},
-				{
-					"label": "S",
-					"x": 1,
-					"y": 1
-				},
-				{
-					"label": "D",
-					"x": 2,
-					"y": 1
-				},
-				{
-					"label": "F",
-					"x": 3,
-					"y": 1
-				},
-				{
-					"label": "G",
-					"x": 4,
-					"y": 1
-				},
-				{
-					"label": "H",
-					"x": 7,
-					"y": 1
-				},
-				{
-					"label": "J",
-					"x": 8,
-					"y": 1
-				},
-				{
-					"label": "K",
-					"x": 9,
-					"y": 1
-				},
-				{
-					"label": "L",
-					"x": 10,
-					"y": 1
-				},
-				{
-					"label": "A",
-					"x": 0,
-					"y": 1.5
-				},
-				{
-					"label": "Enter",
-					"x": 11,
-					"y": 1.5
-				},
-				{
-					"label": "X",
-					"x": 1,
-					"y": 2
-				},
-				{
-					"label": "C",
-					"x": 2,
-					"y": 2
-				},
-				{
-					"label": "V",
-					"x": 3,
-					"y": 2
-				},
-				{
-					"label": "B",
-					"x": 4,
-					"y": 2
-				},
-				{
-					"label": "N",
-					"x": 7,
-					"y": 2
-				},
-				{
-					"label": "M",
-					"x": 8,
-					"y": 2
-				},
-				{
-					"label": ",",
-					"x": 9,
-					"y": 2
-				},
-				{
-					"label": ".",
-					"x": 10,
-					"y": 2
-				},
-				{
-					"label": "Z",
-					"x": 0,
-					"y": 2.5
-				},
-				{
-					"label": "Back Space",
-					"x": 11,
-					"y": 2.5
-				},
-				{
-					"label": "⇓",
-					"x": 4,
-					"y": 3
-				},
-				{
-					"label": "Tab",
-					"x": 5,
-					"y": 3
-				},
-				{
-					"label": "Space",
-					"x": 6,
-					"y": 3
-				},
-				{
-					"label": "⇑",
-					"x": 7,
-					"y": 3
-				}
-			]
-		}
-	}
-}
+    "keyboard_name": "EndZone34",
+    "url": "https://github.com/takashicompany/endzone34",
+    "maintainer": "takashicompany",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"Q", "x":0, "y":0.5},
+                {"label":"W", "x":1, "y":0},
+                {"label":"E", "x":2, "y":0},
+                {"label":"R", "x":3, "y":0},
+                {"label":"T", "x":4, "y":0},
+                {"label":"Y", "x":7, "y":0},
+                {"label":"U", "x":8, "y":0},
+                {"label":"I", "x":9, "y":0},
+                {"label":"O", "x":10, "y":0},
+                {"label":"P", "x":11, "y":0.5},
+
+                {"label":"A", "x":0, "y":1.5},
+                {"label":"S", "x":1, "y":1},
+                {"label":"D", "x":2, "y":1},
+                {"label":"F", "x":3, "y":1},
+                {"label":"G", "x":4, "y":1},
+                {"label":"H", "x":7, "y":1},
+                {"label":"J", "x":8, "y":1},
+                {"label":"K", "x":9, "y":1},
+                {"label":"L", "x":10, "y":1},
+                {"label":"Enter", "x":11, "y":1.5},
+
+                {"label":"Z", "x":0, "y":2.5},
+                {"label":"X", "x":1, "y":2},
+                {"label":"C", "x":2, "y":2},
+                {"label":"V", "x":3, "y":2},
+                {"label":"B", "x":4, "y":2},
+                {"label":"N", "x":7, "y":2},
+                {"label":"M", "x":8, "y":2},
+                {"label":", ", "x":9, "y":2},
+                {"label":".", "x":10, "y":2},
+                {"label":"Back Space", "x":11, "y":2.5},
+
+                {"label":"⇓", "x":4, "y":3},
+                {"label":"Tab", "x":5, "y":3},
+                {"label":"Space", "x":6, "y":3},
+                {"label":"⇑", "x":7, "y":3}
+            ]
+        }
+    }
+}