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

2024-12-12 21:00:58 +00:00 · 2023-12-23 23:46:55 +00:00 · 2023-12-23 23:46:55 +00:00 · 151dfd4163
commit 151dfd4163
parent 61f618e3ac 0b410ffd77
17 changed files with 6 additions and 0 deletions
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@ -1383,6 +1383,12 @@
    "yurei": {
        "target": "kkatano/yurei"
    },
+    "z12": {
+        "target": "zigotica/z12"
+    },
+    "z34": {
+        "target": "zigotica/z34"
+    },
    "zinc": {
        "target": "25keys/zinc"
    },
--- a/keyboards/zigotica/z12/config.h
+++ b/keyboards/zigotica/z12/config.h
--- a/keyboards/zigotica/z12/info.json
+++ b/keyboards/zigotica/z12/info.json
--- a/keyboards/zigotica/z12/keymaps/default/config.h
+++ b/keyboards/zigotica/z12/keymaps/default/config.h
--- a/keyboards/zigotica/z12/keymaps/default/keymap.c
+++ b/keyboards/zigotica/z12/keymaps/default/keymap.c
--- a/keyboards/zigotica/z12/keymaps/default/readme.md
+++ b/keyboards/zigotica/z12/keymaps/default/readme.md
--- a/keyboards/zigotica/z12/keymaps/default/rules.mk
+++ b/keyboards/zigotica/z12/keymaps/default/rules.mk
--- a/keyboards/zigotica/z12/readme.md
+++ b/keyboards/zigotica/z12/readme.md
--- a/keyboards/zigotica/z12/rules.mk
+++ b/keyboards/zigotica/z12/rules.mk
--- a/keyboards/zigotica/z34/config.h
+++ b/keyboards/zigotica/z34/config.h
--- a/keyboards/zigotica/z34/info.json
+++ b/keyboards/zigotica/z34/info.json
--- a/keyboards/zigotica/z34/keymaps/default/config.h
+++ b/keyboards/zigotica/z34/keymaps/default/config.h
--- a/keyboards/zigotica/z34/keymaps/default/keymap.c
+++ b/keyboards/zigotica/z34/keymaps/default/keymap.c
--- a/keyboards/zigotica/z34/keymaps/default/readme.md
+++ b/keyboards/zigotica/z34/keymaps/default/readme.md
--- a/keyboards/zigotica/z34/keymaps/default/rules.mk
+++ b/keyboards/zigotica/z34/keymaps/default/rules.mk
--- a/keyboards/zigotica/z34/readme.md
+++ b/keyboards/zigotica/z34/readme.md
--- a/keyboards/zigotica/z34/rules.mk
+++ b/keyboards/zigotica/z34/rules.mk