Actually commit conflict resolution.

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

[jacky_studio/piggy60] move AVR PCB under rev1 (#20253)

[Keyboard] Add KeyDeck8 (#20107)

Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>

[Keyboard] Add Steezy60 Rev B (#19688)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
Co-authored-by: yiancar <yiancar@gmail.com>
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>
Co-authored-by: Jue Liu <youturn@Jues-MacBook-Pro.local>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Shandon Anderson <shandon@shandon.codes>
Co-authored-by: jack <0x6A73@pm.me>
Co-authored-by: jason <jrucker2004@gmail.com>
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>

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

[Keyboard] Add Plaque80 (#20240)

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

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

[Keyboard] Add alhenkb macropad (#20123)

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

Minify content published to API (#20285)

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

Add ability for `qmk mass-compile` to build specified targets (#20294)

Fixup CI build for `nack`. (#20292)

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

Fixup CI command failures. (#20291)

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

Add step summary output to CI builds, with failure logs. (#20288)

Move ortho & numpad layouts to data driven (#20183)

Co-authored-by: Nick Brassel <nick@tzarc.org>

Fix some invalid layout macros (#20256)