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

Add ScottoInvader Keyboard (#20941)

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

Add Scotto34 Keyboard (#20943)

Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

Add ScottoErgo Keyboard (#20944)

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

rgblight: driver selection cleanups (#21558)

Update usb information for dactyl_cc (#21612)

OLED: driver naming cleanups (#21710)

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

Fix `keyboard` field for some JSON keymaps (#21752)

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

[Keyboard] Update USB settings for dactyl_maximus (#21666)

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

[Keyboard] Update usb.* of `dactyl_lightcycle` (#21462)

haptic: further naming cleanups (#21682)

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

Add VIA layout for Dactyl Manuform 5x6 (#21649)

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

Fix layout offsets for a handful of boards (#21636)

Bluetooth: driver naming cleanups (#21624)

[Keyboard] Add STM32f3 Discovery onekey (#21625)

[Keyboard] Delete jscotto directory (#21157)