168 files changed, 10346 insertions(+), 1453 deletions(-)

M keyboards/1upkeyboards/1up60hte/1up60hte.h
M keyboards/1upkeyboards/1up60hte/info.json
M keyboards/1upkeyboards/1up60hte/keymaps/default/keymap.c
M keyboards/1upkeyboards/1up60hte/keymaps/hhkb/keymap.c
M keyboards/1upkeyboards/1up60hte/keymaps/via/keymap.c
M keyboards/1upkeyboards/1up60hte/readme.md
M keyboards/1upkeyboards/1up60hte/rules.mk
M keyboards/4pplet/aekiso60/keymaps/default/keymap.c
M keyboards/4pplet/aekiso60/keymaps/via/keymap.c
M keyboards/4pplet/aekiso60/rev_a/rev_a.h
M keyboards/amj60/amj60.c
M keyboards/amj60/amj60.h
M keyboards/amj60/config.h
M keyboards/amj60/info.json
M keyboards/amj60/keymaps/default/keymap.c
D keyboards/amj60/keymaps/iso_split_rshift/build.sh
D keyboards/amj60/keymaps/iso_split_rshift/keymap.c
D keyboards/amj60/keymaps/iso_split_rshift/readme.md
D keyboards/amj60/keymaps/iso_split_rshift/rules.mk
D keyboards/amj60/keymaps/iso_split_rshift/updatemerge.sh
D keyboards/amj60/keymaps/maximized/keymap.c
M keyboards/amj60/readme.md
M keyboards/amj60/rules.mk
M keyboards/bastardkb/scylla/config.h
M keyboards/bastardkb/scylla/rules.mk
M keyboards/bastardkb/scylla/scylla.c
M keyboards/checkerboards/nop60/info.json
M keyboards/checkerboards/nop60/keymaps/7u/keymap.c
R keyboards/checkerboards/nop60/keymaps/{2x3u => default}/config.h
R keyboards/checkerboards/nop60/keymaps/{2x3u => default}/keymap.c
M keyboards/checkerboards/nop60/keymaps/via/keymap.c
M keyboards/checkerboards/nop60/nop60.h
M keyboards/ergoarrows/info.json
M keyboards/gmmk/pro/info.json
A keyboards/gmmk/pro/keymaps/iso/keymap.c
M keyboards/gmmk/pro/pro.h
M keyboards/handwired/evk/v1_3/info.json
M keyboards/handwired/marauder/config.h
A keyboards/handwired/marauder/keymaps/orvia/keymap.c
A keyboards/handwired/marauder/keymaps/orvia/rules.mk
A keyboards/handwired/marauder/keymaps/via/keymap.c
A keyboards/handwired/marauder/keymaps/via/rules.mk
M keyboards/handwired/marauder/readme.md
M keyboards/handwired/marauder/rules.mk
M keyboards/handwired/ortho5x14/info.json
M keyboards/handwired/ortho5x14/readme.md
A keyboards/handwired/symmetric70_proto/debug_config.h
A keyboards/handwired/symmetric70_proto/local_features.mk
A keyboards/handwired/symmetric70_proto/matrix_debug/gpio_extr.h
R keyboards/handwired/symmetric70_proto/{ => matrix_debug}/matrix.c
A keyboards/handwired/symmetric70_proto/matrix_debug/readme.md
A keyboards/handwired/symmetric70_proto/matrix_fast/cpp_map.h
A keyboards/handwired/symmetric70_proto/matrix_fast/gpio_extr.h
A keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c
A keyboards/handwired/symmetric70_proto/matrix_fast/matrix_config_expand.c
A keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extension_74hc15x.c
A keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extr.h
A keyboards/handwired/symmetric70_proto/matrix_fast/readme.md
A keyboards/handwired/symmetric70_proto/matrix_fast/test_config.h
A keyboards/handwired/symmetric70_proto/matrix_fast/test_config_74hc157.h
A keyboards/handwired/symmetric70_proto/matrix_fast/test_config_direct.h
A keyboards/handwired/symmetric70_proto/promicro/config.h
A keyboards/handwired/symmetric70_proto/promicro/fast/config.h
A keyboards/handwired/symmetric70_proto/promicro/fast/readme.md
A keyboards/handwired/symmetric70_proto/promicro/fast/rules.mk
A keyboards/handwired/symmetric70_proto/promicro/normal/config.h
A keyboards/handwired/symmetric70_proto/promicro/normal/readme.md
A keyboards/handwired/symmetric70_proto/promicro/normal/rules.mk
A keyboards/handwired/symmetric70_proto/promicro/readme.md
R keyboards/handwired/symmetric70_proto/{ => promicro}/rules.mk
A keyboards/handwired/symmetric70_proto/proton_c/config.h
A keyboards/handwired/symmetric70_proto/proton_c/fast/config.h
A keyboards/handwired/symmetric70_proto/proton_c/fast/readme.md
A keyboards/handwired/symmetric70_proto/proton_c/fast/rules.mk
A keyboards/handwired/symmetric70_proto/proton_c/normal/config.h
A keyboards/handwired/symmetric70_proto/proton_c/normal/readme.md
A keyboards/handwired/symmetric70_proto/proton_c/normal/rules.mk
A keyboards/handwired/symmetric70_proto/proton_c/proton_c.c
A keyboards/handwired/symmetric70_proto/proton_c/readme.md
A keyboards/handwired/symmetric70_proto/proton_c/rules.mk
M keyboards/handwired/symmetric70_proto/readme.md
M keyboards/handwired/traveller/info.json
M keyboards/handwired/traveller/keymaps/default/keymap.c
M keyboards/handwired/traveller/traveller.h
R keyboards/{handwired/symmetric70_proto => ianklug/grooveboard}/config.h
A keyboards/ianklug/grooveboard/grooveboard.c
A keyboards/ianklug/grooveboard/grooveboard.h
A keyboards/ianklug/grooveboard/info.json
A keyboards/ianklug/grooveboard/keymaps/default/keymap.c
A keyboards/ianklug/grooveboard/keymaps/default/readme.md
A keyboards/ianklug/grooveboard/keymaps/via/keymap.c
A keyboards/ianklug/grooveboard/keymaps/via/readme.md
A keyboards/ianklug/grooveboard/keymaps/via/rules.mk
A keyboards/ianklug/grooveboard/readme.md
A keyboards/ianklug/grooveboard/rules.mk
M keyboards/lucid/phantom_solder/keymaps/default/keymap.c
M keyboards/lucid/phantom_solder/keymaps/via/keymap.c
M keyboards/lucid/phantom_solder/phantom_solder.h
M keyboards/massdrop/alt/matrix.c
M keyboards/massdrop/alt/rules.mk
M keyboards/massdrop/ctrl/matrix.c
M keyboards/massdrop/ctrl/rules.mk
M keyboards/mechlovin/infinity87/rev1/rogue87/info.json
M keyboards/mechlovin/infinity87/rev1/rouge87/info.json
A keyboards/melgeek/mj6xy/config.h
A keyboards/melgeek/mj6xy/info.json
A keyboards/melgeek/mj6xy/keymaps/60_ansi/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_ansi_7u_spc_split_bs/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_3u_spc_split_bs/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_6u_spc_split_bs/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_3u_spc/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_ansi_arrow_split_bs_3u_spc/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_ansi_split_bs/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_iso/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_7u_spc_split_bs_rshift/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_7u_spc_split_rshift/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_split_bs_rshift/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_iso_1u_lshift_split_rshift/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_bs_rshift/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_iso_7u_spc_split_rshift/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_iso_arrow/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_3u_spc_split_bs/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_6u_spc_split_bs/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_3u_spc/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_bs/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_iso_arrow_split_bs_3u_spc/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_iso_split_bs/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_iso_split_bs_rshift/keymap.c
A keyboards/melgeek/mj6xy/keymaps/60_iso_split_rshift/keymap.c
A keyboards/melgeek/mj6xy/keymaps/64_ansi/keymap.c
A keyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc/keymap.c
A keyboards/melgeek/mj6xy/keymaps/64_ansi_3u_spc_split_bs/keymap.c
A keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc/keymap.c
A keyboards/melgeek/mj6xy/keymaps/64_ansi_6u_spc_split_bs/keymap.c
A keyboards/melgeek/mj6xy/keymaps/64_ansi_split_3u_spc/keymap.c
A keyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs/keymap.c
A keyboards/melgeek/mj6xy/keymaps/64_ansi_split_bs_3u_spc/keymap.c
A keyboards/melgeek/mj6xy/keymaps/64_iso/keymap.c
A keyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc/keymap.c
A keyboards/melgeek/mj6xy/keymaps/64_iso_3u_spc_split_bs/keymap.c
A keyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc/keymap.c
A keyboards/melgeek/mj6xy/keymaps/64_iso_6u_spc_split_bs/keymap.c
A keyboards/melgeek/mj6xy/keymaps/64_iso_split_3u_spc/keymap.c
A keyboards/melgeek/mj6xy/keymaps/64_iso_split_bs/keymap.c
A keyboards/melgeek/mj6xy/keymaps/64_iso_split_bs_3u_spc/keymap.c
A keyboards/melgeek/mj6xy/keymaps/default/keymap.c
A keyboards/melgeek/mj6xy/keymaps/via/keymap.c
A keyboards/melgeek/mj6xy/keymaps/via/rules.mk
A keyboards/melgeek/mj6xy/mj6xy.c
A keyboards/melgeek/mj6xy/mj6xy.h
A keyboards/melgeek/mj6xy/readme.md
A keyboards/melgeek/mj6xy/rev3/config.h
A keyboards/melgeek/mj6xy/rev3/rev3.c
A keyboards/melgeek/mj6xy/rev3/rules.mk
M keyboards/montex/config.h
A keyboards/montex/keymaps/via/keymap.c
A keyboards/montex/keymaps/via/rules.mk
M lib/python/qmk/cli/__init__.py
M requirements.txt