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

Fixup build. (#15931)

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

Remove `keyboard_folder` instances from `info.json` files (#15932)

* remove `keyboard_folder` instance from caffeinated/serpent65

* remove `keyboard_folder` instances from dumbpad

* remove `keyboard_folder` instances from mlego directory

* remove `keyboard_folder` instance from neopad/rev1

* remove `keyboard_folder` instance from spaceman/pancake/rev2

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

update the Chinese translation based on the latest English version (#14924)

Co-authored-by: peepeetee <43021794+peepeetee@users.noreply.github.com>
Co-authored-by: Joy Lee <chang.li@westberrytech.com>
Co-authored-by: LitoMore <LitoMore@users.noreply.github.com>
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>

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

[Keyboard] fix odin rgb light error (#15914)

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

Add LAYOUTS entry to rules.mk (#15900)

* Add layouts to rules.mk

* Remove excess settings.

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>

CLI: Parse USB device version BCD (#14580)

* CLI: Parse USB device version BCD

* Apply suggestions

Yet another bad `DEFAULT_FOLDER` fix. (#15904)

move yd60mq to ymdk vendor folder (#15647)

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

Revert "update keyboard_aliases.json (#15649)" (#15903)

This reverts commit b24603ab7d5b731c7a09738cbfe0bce277559a47.

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

update keyboard_aliases.json (#15649)

rename idobo to idobao/id75, move to vendor folder (#15661)

* rename idobo to idobao/id75, move to vendor folder

* add image, amend readme to id75

* add buying link

Add init function to clear previous effect (#15815)

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