Merge remote-tracking branch 'origin/master' into develop
Bump tj-actions/changed-files from 39 to 40 (#22338) Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 39 to 40. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/v39...v40) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Merge remote-tracking branch 'origin/master' into develop
Bump actions/upload-artifact from 3 to 4 (#22661) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Merge remote-tracking branch 'origin/master' into develop
Cradio: update default keymap (#22657) * Reduce copyright blurb * Change home row mod placing
[Keyboard] Update Keychron Q8 (#22578) * Update Q8 * Run `qmk format-json` and remove `RGB_MATRIX_LED_COUNT` * Update keyboards/keychron/q8/ansi_encoder/info.json Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/keychron/q8/iso/info.json Co-authored-by: Ryan <fauxpark@gmail.com> --------- Co-authored-by: Ryan <fauxpark@gmail.com>
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] Add El Cantor HS (#22531) * Initial upload. Initial upload. * Update readme.md * Delete keyboards/elcantorhs/keymaps/zeromist directory * Adding folder for VIA. * Update readme.md * Update readme.md * Update readme.md * Update readme.md * Update readme.md * Update keymap.c * Update info.json * Update info.json * Update info.json * Update info.json * Update keymap.c * Update keymap.c * Update keymap.c * Update config.h * Update halconf.h * Update mcuconf.h * Create keymap.c * Update info.json * Update keyboards/elcantorhs/readme.md Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * Update keyboards/elcantorhs/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * Update keyboards/elcantorhs/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * Update keyboards/elcantorhs/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * Update keyboards/elcantorhs/rules.mk Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * Update keyboards/elcantorhs/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * Update keyboards/elcantorhs/config.h Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * Update readme.md * Update keyboards/elcantorhs/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * Update config.h * Update halconf.h * Update keymap.c * Update keymap.c * Update mcuconf.h * Update keyboards/elcantorhs/readme.md Yep. Can't say better. :-) Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update readme.md * Update keyboards/elcantorhs/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> --------- Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] Add fuji75 (#22158) * adding fuji75 pcb support adding fuji75 pcb support includes solder hotswap * Update keymap.c * Update keymap.c * Update keyboards/sakura_workshop/fuji75/fuji75.c Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/sakura_workshop/fuji75/solder/readme.md Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/sakura_workshop/fuji75/hotswap/readme.md Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/sakura_workshop/fuji75/solder/readme.md Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/sakura_workshop/fuji75/info.json Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/sakura_workshop/fuji75/hotswap/readme.md Co-authored-by: Joel Challis <git@zvecr.com> * Delete keyboards/sakura_workshop/fuji75/config.h * Update keyboards/sakura_workshop/fuji75/solder/readme.md Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/sakura_workshop/fuji75/hotswap/readme.md Co-authored-by: Drashna Jaelre <drashna@live.com> * update info.json update info.json per requested by @fauxpark reran qmk format-json --------- Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
Merge remote-tracking branch 'origin/master' into develop
Remove invalid keymap from zos/65s (#22655) Default community layout is nameddefault_65_ansi_blocker so should never also be used at the keyboard level.
kikoslab/kl90: Update firmware to support encoder map (#22649)
Merge remote-tracking branch 'origin/master' into develop
Add keyboard shadow80 (#22534) Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] Add zos (#22491) Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
[Keyboard] minor Momokai Aurora bugfixes and RGB updates (#22486)
Merge remote-tracking branch 'origin/master' into develop