move z150_bh at101_bh omnikey_bh to viktus/ (#16004)

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

[Keyboard] Add Amber80 Solder & VCL65 Solder  (#15945)

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

[Keymap] Add andrewcharnley keymap for GMMK Pro (#15320)

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

[Keyboard] Add converter/a1200/mistress1200 variant (#16634)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>

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

[Keyboard] Fix resume1800 - Dynamic layer count undefined (#16877)

Preinstall python dependencies before executing `qmk`. (#16874)

Fixup AVR builds. (#16875)

* Fixup AVR builds.

* Update platforms/avr/hardware_id.c

Co-authored-by: Ryan <fauxpark@gmail.com>

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

Expose API for hardware unique ID (#16869)

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

[Keyboard] Add CrimsonKeyboards' Resume1800 (#16842)

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

[Keyboard] sandbox - fix keymaps (#16873)

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

[Keyboard] Add deskpad (#15602)

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

Fix one-shot locked modifiers (#16114)

* Fix state updates of one-shot locked modifiers

Activating additional one-shot locked modifiers removed previously enabled locked modifiers from the state.
`get_oneshot_locked_mods` returned zero when two or more one-shot locked modifiers were enabled and then one was disabled.

* Do not delete one-shot locked modifiers on a one-shot layer toggle

Non-locked one-shot modifiers are not removed so this behavior adds inconsistency.
Also the one-shot locked modifiers state was reset without unregistering any modifiers.

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

Ploopy Trackball Mini: only define DPI options as needed (#16160)