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

This commit is contained in:
QMK Bot 2023-06-23 16:49:07 +00:00
commit 173f54cf1f

View file

@ -109,7 +109,7 @@
{"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
{"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
{"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
{"label": "Enter", "matrix": [3, 12], "x": 13.75, "y": 3.25, "w": 2.25}, {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
{"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
{"label": "\u2298", "matrix": [4, 1], "x": 1.25, "y": 4.25}, {"label": "\u2298", "matrix": [4, 1], "x": 1.25, "y": 4.25},
@ -129,12 +129,12 @@
{"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25}, {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
{"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
{"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25}, {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
{"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
{"label": "Space", "matrix": [5, 7], "x": 3.75, "y": 5.25, "w": 7}, {"label": "Space", "matrix": [5, 7], "x": 4, "y": 5.25, "w": 7},
{"label": "Alt", "matrix": [5, 11], "x": 10, "y": 5.25, "w": 1.5}, {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
{"label": "GUI", "matrix": [5, 12], "x": 11.25, "y": 5.25}, {"label": "GUI", "matrix": [5, 12], "x": 12.5, "y": 5.25},
{"label": "Ctrl", "matrix": [5, 13], "x": 12.5, "y": 5.25, "w": 1.5}, {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
{"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25}, {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
{"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25}, {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
@ -232,12 +232,12 @@
{"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25}, {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
{"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
{"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25}, {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
{"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
{"label": "Space", "matrix": [5, 7], "x": 3.75, "y": 5.25, "w": 7}, {"label": "Space", "matrix": [5, 7], "x": 4, "y": 5.25, "w": 7},
{"label": "Alt", "matrix": [5, 11], "x": 10, "y": 5.25, "w": 1.5}, {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
{"label": "GUI", "matrix": [5, 12], "x": 11.25, "y": 5.25}, {"label": "GUI", "matrix": [5, 12], "x": 12.5, "y": 5.25},
{"label": "Ctrl", "matrix": [5, 13], "x": 12.5, "y": 5.25, "w": 1.5}, {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
{"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25}, {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
{"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25}, {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
@ -441,12 +441,12 @@
{"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25}, {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
{"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
{"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25}, {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
{"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
{"label": "Space", "matrix": [5, 7], "x": 3.75, "y": 5.25, "w": 7}, {"label": "Space", "matrix": [5, 7], "x": 4, "y": 5.25, "w": 7},
{"label": "Alt", "matrix": [5, 11], "x": 10, "y": 5.25, "w": 1.5}, {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
{"label": "GUI", "matrix": [5, 12], "x": 11.25, "y": 5.25}, {"label": "GUI", "matrix": [5, 12], "x": 12.5, "y": 5.25},
{"label": "Ctrl", "matrix": [5, 13], "x": 12.5, "y": 5.25, "w": 1.5}, {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
{"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25}, {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
{"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25}, {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},
@ -547,12 +547,12 @@
{"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25}, {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25},
{"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
{"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25}, {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
{"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5},
{"label": "Space", "matrix": [5, 7], "x": 3.75, "y": 5.25, "w": 7}, {"label": "Space", "matrix": [5, 7], "x": 4, "y": 5.25, "w": 7},
{"label": "Alt", "matrix": [5, 11], "x": 10, "y": 5.25, "w": 1.5}, {"label": "Alt", "matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5},
{"label": "GUI", "matrix": [5, 12], "x": 11.25, "y": 5.25}, {"label": "GUI", "matrix": [5, 12], "x": 12.5, "y": 5.25},
{"label": "Ctrl", "matrix": [5, 13], "x": 12.5, "y": 5.25, "w": 1.5}, {"label": "Ctrl", "matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
{"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25}, {"label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25},
{"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25}, {"label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25},