Ignore defaults.hjson values if already set (#19511)

* Ignore defaults.hjson values if already set

* Add warning when nothing is merged

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

Fix `handwired/onekey/kb2040` WS2812 pin (#19517)

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

Bump anothrNick/github-tag-action from 1.58.0 to 1.61.0 (#19519)

Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.58.0 to 1.61.0.
- [Release notes](https://github.com/anothrNick/github-tag-action/releases)
- [Commits](https://github.com/anothrNick/github-tag-action/compare/1.58.0...1.61.0)

---
updated-dependencies:
- dependency-name: anothrNick/github-tag-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

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

docs: Fix IS31FL3743A driver name (#19518)

Incorrectly documented.
See: `builddefs/common_features.mk`

Migrate submodule dirty check to CLI (#19488)

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

Fix MATRIX_COLS and MATRIX_ROWS generation for custom matrix (#19508)

The code which generated the MATRIX_COLS and MATRIX_ROWS defines from
the JSON information was checking the presence of the `matrix_pins` key,
which may not exist if a custom matrix is used.  Check the presence of
`matrix_size` instead.

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

Bump anothrNick/github-tag-action from 1.57.0 to 1.58.0 (#19509)

Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.57.0 to 1.58.0.
- [Release notes](https://github.com/anothrNick/github-tag-action/releases)
- [Commits](https://github.com/anothrNick/github-tag-action/compare/1.57.0...1.58.0)

---
updated-dependencies:
- dependency-name: anothrNick/github-tag-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

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

A comma was missing (#19507)

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

Bump anothrNick/github-tag-action from 1.56.0 to 1.57.0 (#19502)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

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

Add SapuSeven MacroPad12 (#19466)

* Add SapuSeven MacroPad12

* Update image url

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

* Remove unnecessary layers

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

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

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

feat(kprepublic/bm60hsrgb_poker): update carlosala keymap (#19426)