Commit Graph

15999 Commits

Author SHA1 Message Date
fef78c41cd Merge remote-tracking branch 'origin/master' into develop 2021-05-16 22:20:57 +00:00
526fbf0faf [Keyboard] Add scylla keyboard (#12720)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: bstiq <qlebastard@outlook.com>
2021-05-16 15:20:26 -07:00
de5c30a9ba Use milc.subcommand.config instead of qmk.cli.config (#12915)
* Use milc.subcommand.config instead

* pyformat

* remove the config test
2021-05-16 11:06:57 -07:00
8761e973ec Merge remote-tracking branch 'origin/master' into develop 2021-05-16 01:57:14 +00:00
a5d7e83985 [Keyboard] Added Perixx Periboard-512 Converter (#12324)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-05-15 18:56:46 -07:00
433834fb8b Merge remote-tracking branch 'origin/master' into develop 2021-05-16 00:35:33 +00:00
173aed3d0e [Keyboard] Rebound underglow settings for via (#12268) 2021-05-15 17:35:10 -07:00
86422f87c6 Merge remote-tracking branch 'origin/master' into develop 2021-05-16 00:29:33 +00:00
36ba4806b1 [Keyboard] Add merro60 (#12527)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: chalex <alejandrelee+magbogbro@gmail.com>
2021-05-15 17:29:04 -07:00
388c151de7 Merge remote-tracking branch 'origin/master' into develop 2021-05-16 00:19:04 +00:00
0876bdf1a3 [Keyboard] Add SiddersKB Majbritt Rev2 (#12598) 2021-05-15 17:18:29 -07:00
396abb0244 Merge remote-tracking branch 'origin/master' into develop 2021-05-16 00:15:19 +00:00
4c13de9b45 [Keymap] Reviung41_Ciutadellla (#12668) 2021-05-15 17:14:50 -07:00
7599cd4e50 Merge remote-tracking branch 'origin/master' into develop 2021-05-16 00:14:49 +00:00
1e5962adbf [Keyboard] Add Specskeys support (#12813)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-05-15 17:14:19 -07:00
de2294413f Merge remote-tracking branch 'origin/master' into develop 2021-05-16 00:09:46 +00:00
430cd6dbc2 [Keyboard] Added Bolsa Supply Midway60 Keyboard (#12747)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-05-15 17:09:16 -07:00
4e32465f06 Merge remote-tracking branch 'origin/master' into develop 2021-05-16 00:08:53 +00:00
7ca4608427 [Keyboard] Added Lucid KB Scarlet [Maker KB] (#12748)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-05-15 17:08:49 -07:00
3efaa5ba7c [Keyboard] Add Chevron (#12762)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-05-15 17:08:25 -07:00
08ec7618a1 Merge remote-tracking branch 'origin/master' into develop 2021-05-16 00:05:11 +00:00
60cf7ae8b7 [Keyboard] Add Rosa (#12884)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-05-15 17:04:38 -07:00
2bc35205a7 Merge remote-tracking branch 'origin/master' into develop 2021-05-15 23:52:01 +00:00
cc77710b4a [Keyboard] Add Potato65 Hotswap keyboard (#12874)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-05-15 16:51:21 -07:00
14c0f4e44b Merge remote-tracking branch 'origin/master' into develop 2021-05-15 18:52:47 +00:00
f9a395e265 [Keyboard] Add Frusta Fundamental (#12583)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-05-15 11:52:13 -07:00
d6b707403e Merge remote-tracking branch 'upstream/master' into develop 2021-05-15 13:43:46 +10:00
b057194568 [Keyboard] Add Neopad macropad (#12614) 2021-05-14 20:09:10 -07:00
83be6ba472 Fix Marauder and add readme (#12906) 2021-05-14 19:57:16 -07:00
1dca3a8e3a Merge remote-tracking branch 'origin/master' into develop 2021-05-14 22:44:36 +00:00
9107c382f3 [Keyboard] Add Marauder (#12550)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-05-14 15:44:00 -07:00
495d47b7d2 [Keyboard] split right shift iso layout for ok60 (#12890) 2021-05-14 08:47:38 -07:00
9c68e27ace TKC Portico: layout macro/Configurator touch-up (#12897) 2021-05-14 08:41:02 -07:00
02e1912371 [Keyboard] Add UM-70 (#12556)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: online <33636898+online@users.noreply.github.com>
2021-05-14 08:36:31 -07:00
75da5e9742 [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895) 2021-05-14 08:30:21 -07:00
36a2297deb Merge remote-tracking branch 'origin/master' into develop 2021-05-14 04:10:46 +00:00
1d50693e1b [Keyboard] Added FJLabs Polaris (#12746)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-05-13 21:10:09 -07:00
16014fe31c Merge remote-tracking branch 'origin/master' into develop 2021-05-14 03:54:43 +00:00
937f5fe740 [Keymap] csc027/keymap-updates (#12694) 2021-05-13 20:54:41 -07:00
cae4911ca8 [Keyboard] Add Studio Kestra Cascade PCB (#12704) 2021-05-13 20:54:10 -07:00
188bcf7636 Merge remote-tracking branch 'origin/master' into develop 2021-05-14 03:21:19 +00:00
3d6d4bd949 [Keyboard] Add Training Wheel 40 (#12542) 2021-05-13 20:20:51 -07:00
4a5f575ef4 Merge remote-tracking branch 'origin/master' into develop 2021-05-14 03:12:06 +00:00
5195f97d35 [Keyboard] Added smAllice (#12543)
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2021-05-13 20:11:36 -07:00
8bf7a1452d Merge remote-tracking branch 'origin/master' into develop 2021-05-14 03:10:57 +00:00
7262d5cc93 [Keyboard] update dactyl manuform 4x5 thumb cluster wiring(#12545) 2021-05-13 20:10:26 -07:00
2fcf761f33 Merge remote-tracking branch 'origin/master' into develop 2021-05-14 02:48:33 +00:00
ba66b63fe5 [Keyboard] Add fluxlab zplit keyboard (#12396)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-05-13 19:48:04 -07:00
70bbcdf084 Merge remote-tracking branch 'origin/master' into develop 2021-05-14 02:46:09 +00:00
eddd6aa113 [Keyboard] Fix Alix40 layout (#12398) 2021-05-13 19:45:37 -07:00