Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pull master to my fork #30

Merged
merged 1,023 commits into from
Sep 28, 2022
Merged

Pull master to my fork #30

merged 1,023 commits into from
Sep 28, 2022

Conversation

nopunin10did
Copy link
Owner

Description

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

waffle87 and others added 30 commits August 17, 2022 23:51
@waffle87
Fixup mokey/ibis80 keymaps (#18088)
9607b46
@qmk-bot
Merge remote-tracking branch 'origin/master' into develop
29f47f4
@infinityis
Add Bonsai C4 converter (#17711)
a645301
@HorrorTroll
Add support keyboard Feker IK75 (#17611)
227e552
@zvecr
Swap F4x1 default board files away from blackpill (#17522)
0fcebdc
@zvecr
Fix new-keyboard default for RP2040 bootloader (#18100)
9550cc4
@zvecr
Remove legacy bootmagic cli parsing (#18099)
3c745ca
@PancakeGoon
[Docs] Update list of "ARM-based ProMicro replacements" (#18083)
286dd6a
@qmk-bot
Merge remote-tracking branch 'origin/master' into develop
2ed2c88
@sol
[Docs] Fix typo in data driven config docs (#18095)
e6a1afb
@qmk-bot
Merge remote-tracking branch 'origin/master' into develop
5ee482b
@tzarc
Use the correct bootloader definition. (#18102)
1eac095
@yiancar
Cyberstar Custom (#18076)
8e8c0e2 
* Create Cyberstar Custom

Co-authored-by: yiancar <yiancar@gmail.com>
@qmk-bot
Merge remote-tracking branch 'origin/master' into develop
c0c875d
@zvecr
Fix duplicate keys in info.json files (#18107)
f1786cb
@qmk-bot
Merge remote-tracking branch 'origin/master' into develop
4a8bed8
@drashna
[Keyboard] Update Work Louder keyboards (#18109)
39f0fb7
@qmk-bot
Merge remote-tracking branch 'origin/master' into develop
f1ac92a
@fauxpark
Move keyboard USB IDs and strings to data driven, pass 2: handwired (#…
48792b0 
…18079)
@qmk-bot
Merge remote-tracking branch 'origin/master' into develop
eceed6c
@fauxpark
Move keyboard USB IDs and strings to data driven, pass 2: J-L (#18080)
835c971
@fauxpark
Move keyboard USB IDs and strings to data driven, pass 2: P-R (#18091)
201a914
@fauxpark
Move keyboard USB IDs and strings to data driven, pass 2: M-O (#18090)
f4dcce7
@fauxpark
Move keyboard USB IDs and strings to data driven, pass 2: S-Y (#18093)
201f1a8
@fauxpark
Merge remote-tracking branch 'upstream/master' into develop
61689ae
@AliceH66 @drashna @fauxpark
[Keyboard] Add aliceh66 pianoforte (#18081)
85831fc 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
@qmk-bot
Merge remote-tracking branch 'origin/master' into develop
880ea06
@mssdvd
[Keymap] Add Miryoku keymap for Hillside family (#18087)
c9120ea
@qmk-bot
Merge remote-tracking branch 'origin/master' into develop
a69303b
@drashna
[Keyboard] Fix compilation issues for keycapsss kimiko (#18112)
f08e08c
joe-scotto and others added 21 commits September 25, 2022 20:39
@joe-scotto @fauxpark
[Keyboard] Add Scotto9 Macropad (#18452)
fe7ee49 
Co-authored-by: Ryan <fauxpark@gmail.com>
@syntax-magic @drashna
[Keymap] Switched keys around in RIGHFN layer and updated indicator l…
04b93bd 
…ights to green (#18465)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: syntax-magic <dkim.8881@gmail.com>
@KD-MM2 @drashna @zvecr
[Keyboard] Add Handwired 87 keys (#17682)
6809f15 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
@jiaxin96 @fauxpark
[Keyboard] add eau75 (#18173)
995a007 
Co-authored-by: Ryan <fauxpark@gmail.com>
@ramonimbao @drashna @fauxpark
[Keyboard] Add GHS.JEM (#17340)
7a5a99b 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
@jiaxin96
[Keyboard] add yr6095 (#18278)
e2954cd
@BenResTech @drashna @fauxpark
[Keymap] Adding Benrestech keymap for the Crkbd (#18163)
1b9de35 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
@ajarov @drashna @fauxpark
[Keymap] Add ajarov's crkbd layout (#17479)
667831d 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
@zhiquankhor
[Keymap] Add zq keymap for w1_at (#18479)
65d0fef
@crackmonkey @drashna
[Keyboard] Add Osborne 1 handwired keyboard (#18397)
d98ec93 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@drashna @fauxpark
@tzarc @ploopyco
[Keyboard] Ploopy Thumb Trackball (#18214)
b521641 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: ploopyco <git@ploopy.co>
@noroadsleft
Keyquest Enclave-1: rename LAYOUT to LAYOUT_ortho_3x3 (#18494)
357eeaf 
* rename LAYOUT to LAYOUT_ortho_3x3

* info.json: correct maintainer value

Field is intended to reference the maintainer's GitHub username.
@noroadsleft
Keyten Aperture Community Layout support (#18495)
045170a 
* rename LAYOUT_all to LAYOUT_65_ansi_blocker_tsangan_split_bs

* enable Community Layouts support

* info.json: format whitespace

- apply four-space indent
- remove trailing whitespace

* info.json: correct maintainer value

Field is intended to reference the maintainer's GitHub username.
@Z1codia @drashna
[Keyboard] Add TKLFRLNRLMLAO (#18487)
e021fe9 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@ADPenrose
[Keyboard] Add Obi keyboard (#18489)
cad1547
@noroadsleft
Linworks FAve 84H Layout Refactor (#18496)
e198072
@noroadsleft
Linworks FAve 87H Layout Refactor (#18497)
492c34f
@noroadsleft
Mechlovin Foundation Configurator Cleanup (#18500)
7d0c133
@jiaxin96
[Keyboard] Add wave75 (#18490)
f8c8005
@ADPenrose
[Keyboard] Updated Kintsugi to support encoder mapping (#18492)
848e1ec
@ramonimbao
Update VID and PID of Abats Keyboard Club Nayeon (#18503)
63c87f5
@nopunin10did nopunin10did merged commit 1658095 into nopunin10did:master Sep 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
CI core documentation Improvements or additions to documentation keyboard keymap python translation via
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.