Commit graph

21148 commits

Author SHA1 Message Date
QMK Bot
6f1097225f Merge remote-tracking branch 'origin/develop' into xap 2022-05-13 16:36:10 +00:00
QMK Bot
158dc6829a Merge remote-tracking branch 'origin/master' into develop 2022-05-13 16:35:28 +00:00
HorrorTroll
3a80275fa1
[Keyboard] Fixed info.json issue, some key got wrong pos for Gas75 (#17070) 2022-05-13 09:34:47 -07:00
QMK Bot
476e64937f Merge remote-tracking branch 'origin/develop' into xap 2022-05-13 06:37:19 +00:00
QMK Bot
75a32de441 Merge remote-tracking branch 'origin/master' into develop 2022-05-13 06:36:47 +00:00
Stephon Parker
e5e7039368
[Keymap] Contra - QWERTY US basic layout; MechWild Marcuio - EN update layout (#16787)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Stephon Parker <stephonparker@Stephons-MacBook-Pro.local>
2022-05-12 23:36:12 -07:00
QMK Bot
d89203326b Merge remote-tracking branch 'origin/develop' into xap 2022-05-13 06:35:17 +00:00
QMK Bot
c4b2e9101d Merge remote-tracking branch 'origin/master' into develop 2022-05-13 06:34:42 +00:00
Josh Hinnebusch
ffe16386f0
[Keyboard] H60 updates (#16999)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-05-12 23:33:53 -07:00
QMK Bot
81b68fd7dc Merge remote-tracking branch 'origin/develop' into xap 2022-05-13 06:23:07 +00:00
QMK Bot
ff8c962d2e Merge remote-tracking branch 'origin/master' into develop 2022-05-13 06:22:36 +00:00
QMK Bot
5fe5d49cda Merge remote-tracking branch 'origin/develop' into xap 2022-05-13 06:22:25 +00:00
Andrew Kannan
fc3d3ef076
[Keyboard] Add caps and num indicators to Balance keyboard (#17075) 2022-05-12 23:22:03 -07:00
QMK Bot
478f83f711 Merge remote-tracking branch 'origin/master' into develop 2022-05-13 06:21:56 +00:00
Kyle McCreery
c199514372
[Bug] Updated Cirque Pinnacle SPI driver to read data correctly (#17074) 2022-05-12 23:21:25 -07:00
QMK Bot
72c9cb0681 Merge remote-tracking branch 'origin/develop' into xap 2022-05-12 20:12:09 +00:00
QMK Bot
e53e75f4ce Merge remote-tracking branch 'origin/master' into develop 2022-05-12 20:11:40 +00:00
James Young
58c37c0814
65_iso_split_bs Community Layout keymap bugfix (#17072)
Fix the layout macro reference in the `keymap.c` file, which caused this keymap to not be able to be compiled.
2022-05-12 21:11:02 +01:00
QMK Bot
4875711c7b Merge remote-tracking branch 'origin/develop' into xap 2022-05-12 18:25:30 +00:00
QMK Bot
6b39a38212 Merge remote-tracking branch 'origin/master' into develop 2022-05-12 18:24:53 +00:00
James Young
b26ba52bdd
[Keyboard] KBIC65 Refactor (#17066) 2022-05-12 11:24:40 -07:00
jack
59fa34a6fa
[Keyboard] Refactor mechwild/mokulua (#17068) 2022-05-12 11:24:03 -07:00
QMK Bot
a4c96e446c Merge remote-tracking branch 'origin/develop' into xap 2022-05-12 06:50:31 +00:00
QMK Bot
a8183340d0 Merge remote-tracking branch 'origin/master' into develop 2022-05-12 06:49:59 +00:00
Astrid Yu
c0ab4ed539
Allow overriding Niv inputs in shell.nix (#16602) 2022-05-12 09:49:15 +03:00
QMK Bot
236ac7cbd1 Merge remote-tracking branch 'origin/develop' into xap 2022-05-12 05:52:40 +00:00
QMK Bot
ec7801e2cb Merge remote-tracking branch 'origin/master' into develop 2022-05-12 05:52:09 +00:00
HorrorTroll
8a4ef2b3c4
[Keyboard] Move M63 RGB into maker folder (#17061) 2022-05-11 22:51:37 -07:00
QMK Bot
ea1046948d Merge remote-tracking branch 'origin/develop' into xap 2022-05-12 05:29:01 +00:00
QMK Bot
ff9aca781a Merge remote-tracking branch 'origin/master' into develop 2022-05-12 05:28:32 +00:00
jack
77aba32bc6
initial (#17067) 2022-05-12 06:27:58 +01:00
QMK Bot
cd0c15f887 Merge remote-tracking branch 'origin/develop' into xap 2022-05-12 04:50:49 +00:00
QMK Bot
56ca807f85 Merge remote-tracking branch 'origin/master' into develop 2022-05-12 04:49:18 +00:00
Kyle McCreery
d6e1de8c83
[Keyboard] Add Mokulua keyboard (#17055)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-05-11 21:49:11 -07:00
QMK Bot
6c4c64f147 Merge remote-tracking branch 'origin/develop' into xap 2022-05-12 04:49:10 +00:00
JX
4d1332b62c
[Keyboard] Cleanup zhou65 and add nz64 keyboard (#17032)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-05-11 21:48:47 -07:00
QMK Bot
a284b99876 Merge remote-tracking branch 'origin/master' into develop 2022-05-12 04:48:35 +00:00
HorrorTroll
ffa1b37634
[Keyboard] Add Black E6.5 keyboard (#16807) 2022-05-11 21:47:41 -07:00
QMK Bot
f7e436b91c Merge remote-tracking branch 'origin/develop' into xap 2022-05-12 00:10:20 +00:00
QMK Bot
b03daac76b Merge remote-tracking branch 'origin/master' into develop 2022-05-12 00:09:49 +00:00
Vino Rodrigues
7fd05afb10
[Keyboard] Revert "Fix id67 RGB Matrix (#16916)" - on IDOBAO ID67 kb (#16917)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-05-11 17:09:10 -07:00
QMK Bot
0be699dde6 Merge remote-tracking branch 'origin/develop' into xap 2022-05-11 23:55:48 +00:00
QMK Bot
12fe4c49de Merge remote-tracking branch 'origin/master' into develop 2022-05-11 23:55:09 +00:00
Vino Rodrigues
37417d531d
[Keyboard] remove handwired/reddot as per #14211 (#17033) 2022-05-11 16:54:27 -07:00
QMK Bot
bce04e6318 Merge remote-tracking branch 'origin/develop' into xap 2022-05-11 23:40:46 +00:00
QMK Bot
d3443a4e8b Merge remote-tracking branch 'origin/master' into develop 2022-05-11 23:40:13 +00:00
sauvehoo
fa6fe11c33
[Keyboard] Add ano keyboard (#16885)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-05-11 16:39:59 -07:00
TJ
767e7db0ed
[Keyboard] Littlefoot lx dev (#16771)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-05-11 16:39:35 -07:00
QMK Bot
54ce775fff Merge remote-tracking branch 'origin/develop' into xap 2022-05-11 23:38:47 +00:00
QMK Bot
da02de5413 Merge remote-tracking branch 'origin/master' into develop 2022-05-11 23:38:15 +00:00