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

[converter/a1200] Changing layout macro reference info.json (#14143)

* Rename keyboards/converter/a1200/config.h to keyboards/converter/a1200/teensy2pp/config.h

* Rename keyboards/converter/a1200/rules.mk to keyboards/converter/a1200/teensy2pp/rules.mk

* Create dummy

* Add files via upload

* Delete dummy

* Update readme.md

* Update info.json

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

[Keymap] mechmaster48 keymap  for OLKB Preonic rev3 (#14137)

Move nix folder alongside vagrant (#14132)

Revert 14083 && 14144 (#14150)

* Revert "Short term bodge for firmware size bloat (#14144)"

This reverts commit a8d65473461c337fb1e168d907bfb8c3ac8fdbd0.

* Revert "Tidy up quantum.c now some of tmk_core has been merged (#14083)"

This reverts commit c4dbf4bf0118dd785802861beb247433b5b7411d.

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

[Keyboard] Update Technik ortholinear RGB matrix points (#14124)

Co-authored-by: filterpaper <filterpaper@localhost>

Fix merge artifacts (#14146)

Align some quantum sub-directories (#14134)

* Misc folder tidy

* Review comments

* Remove redundant entry

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

[Keyboard] Add yoichiro/lunakey_macro (#13849)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

Short term bodge for firmware size bloat (#14144)

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

add wait_cpuclock() macro for AVR and CPU_CLOCK macro (#12755)

Tidy up quantum.c now some of tmk_core has been merged (#14083)

[Keyboard] Add serneity65 (#13889)

fix (#14142)

[Keyboard] Fix keyprez qmk configurator (#14119)

[Keyboard] Add QEZ keyboard (#14131)