Commit Graph

14256 Commits

Author SHA1 Message Date
James Young
5e5b19cf94
Keychron S1 ANSI Layout Touch-Up (#19556) 2023-01-10 15:09:09 +00:00
QMK Bot
6b81ba1d4c Merge remote-tracking branch 'origin/master' into develop 2023-01-10 09:06:09 +00:00
squarecut
aba67829e9
[Keymap] Kbdfans Tiger 80 keymap & Planck keymap (#19428)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Abhishek Malavalli <abhishek.malavalli@fphcare.co.nz>
2023-01-10 01:05:31 -08:00
QMK Bot
64dea51094 Merge remote-tracking branch 'origin/master' into develop 2023-01-10 06:39:27 +00:00
Filip Paryż
4d83583410
[Keymap] Updated Freoduo keymap (#19351) 2023-01-09 22:38:54 -08:00
Ryan
56555c61e1
Migrate LAYOUTS to data driven (#19541)
* Migrate `LAYOUTS` to data driven, 0-9

* Migrate `LAYOUTS` to data driven, A

* Migrate `LAYOUTS` to data driven, B

* Migrate `LAYOUTS` to data driven, C

* Migrate `LAYOUTS` to data driven, D

* Migrate `LAYOUTS` to data driven, E

* Migrate `LAYOUTS` to data driven, F

* Migrate `LAYOUTS` to data driven, G

* Migrate `LAYOUTS` to data driven, H

* Migrate `LAYOUTS` to data driven, handwired

* Migrate `LAYOUTS` to data driven, I

* Migrate `LAYOUTS` to data driven, J

* Migrate `LAYOUTS` to data driven, K

* Migrate `LAYOUTS` to data driven, L

* Migrate `LAYOUTS` to data driven, M

* Migrate `LAYOUTS` to data driven, N

* Migrate `LAYOUTS` to data driven, O

* Migrate `LAYOUTS` to data driven, P

* Migrate `LAYOUTS` to data driven, Q

* Migrate `LAYOUTS` to data driven, R

* Migrate `LAYOUTS` to data driven, S

* Migrate `LAYOUTS` to data driven, T

* Migrate `LAYOUTS` to data driven, U

* Migrate `LAYOUTS` to data driven, V

* Migrate `LAYOUTS` to data driven, W

* Migrate `LAYOUTS` to data driven, X

* Migrate `LAYOUTS` to data driven, Y

* Migrate `LAYOUTS` to data driven, Z
2023-01-10 02:48:20 +00:00
QMK Bot
59ae682dc9 Merge remote-tracking branch 'origin/master' into develop 2023-01-10 00:49:04 +00:00
Dennis Kruyt
caca029e12
[Keyboard] add YMDK40 AIR40 (#19276)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-01-09 16:48:11 -08:00
QMK Bot
2dd4359181 Merge remote-tracking branch 'origin/master' into develop 2023-01-09 23:50:53 +00:00
Manna Harbour
0becd33c4d
[keyboard] Enable community layout support (#19499) 2023-01-09 23:50:18 +00:00
QMK Bot
14fabfd893 Merge remote-tracking branch 'origin/master' into develop 2023-01-09 21:34:03 +00:00
Nick Brassel
01de98428c
[Keychron Q5] Build failures: recursive function call. (#19553) 2023-01-10 08:33:28 +11:00
QMK Bot
cf55032485 Merge remote-tracking branch 'origin/master' into develop 2023-01-08 15:27:43 +00:00
Joel Challis
1c024bfa91
Add some missing layout data (#19539) 2023-01-08 15:26:37 +00:00
Joel Challis
974a1eaf2a
Ignore defaults.hjson values if already set (#19511)
* Ignore defaults.hjson values if already set

* Add warning when nothing is merged
2023-01-07 17:05:53 +00:00
QMK Bot
403c7eeb5c Merge remote-tracking branch 'origin/master' into develop 2023-01-07 17:03:18 +00:00
Joel Challis
c5e3275299
Fix handwired/onekey/kb2040 WS2812 pin (#19517) 2023-01-07 17:02:40 +00:00
QMK Bot
8b141020b2 Merge remote-tracking branch 'origin/master' into develop 2023-01-04 06:18:53 +00:00
SapuSeven
6a02eb2874
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>
2023-01-04 06:18:16 +00:00
QMK Bot
b6b9b25525 Merge remote-tracking branch 'origin/master' into develop 2023-01-04 05:21:35 +00:00
Carlo
be024a1d43
feat(kprepublic/bm60hsrgb_poker): update carlosala keymap (#19426) 2023-01-04 05:21:32 +00:00
Paul James
04dcf81d1e
[Keyboard] Stop LED1 from flashing on layer change (#19427) 2023-01-04 05:21:03 +00:00
QMK Bot
44800f119d Merge remote-tracking branch 'origin/master' into develop 2023-01-02 22:52:06 +00:00
Jesus Climent
5962ebaba1
Fix github URL for the atreyu maintainer. (#19476) 2023-01-03 09:51:32 +11:00
QMK Bot
b497d58d6d Merge remote-tracking branch 'origin/master' into develop 2023-01-02 22:13:00 +00:00
Joel Challis
975d64cc2b
adpenrose/akemipad fixes (#19477) 2023-01-03 09:12:25 +11:00
QMK Bot
17085ec49d Merge remote-tracking branch 'origin/master' into develop 2023-01-01 16:06:35 +00:00
Byron Clark
867e4fc11c
[Keyboard] Add community layout support to Piantor (#19455) 2023-01-01 08:05:57 -08:00
QMK Bot
03ec3db651 Merge remote-tracking branch 'origin/master' into develop 2023-01-01 00:57:59 +00:00
Drashna Jaelre
9b8f18699f
Partially revert #18940 for Ploopy Thumb Trackball (#18943) 2023-01-01 11:57:36 +11:00
Drashna Jaelre
b4d5c22ed4
Keyboard/fix work louder micro (#18968) 2023-01-01 11:57:15 +11:00
Drashna Jaelre
ac561b9473
[Bug] Prevent dynamic keymaps from processing layers that don't exist (#19225) 2023-01-01 11:55:14 +11:00
Joel Challis
d0ebafaea6
Align definition of unicode_map (#19452) 2023-01-01 11:54:12 +11:00
QMK Bot
c6bc439eb2 Merge remote-tracking branch 'origin/master' into develop 2023-01-01 00:42:58 +00:00
TommyZ
c7c44de32f
[Keyboard] Add Quarkeys Z60, reorganized keyboard file directory (#19404)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-01-01 11:41:58 +11:00
QMK Bot
22b3d76f9b Merge remote-tracking branch 'origin/master' into develop 2023-01-01 00:40:34 +00:00
DOIO2022
53100496c3
Add KB30 keyboard (#19395)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-01-01 11:40:01 +11:00
QMK Bot
06b12a98c7 Merge remote-tracking branch 'origin/master' into develop 2023-01-01 00:39:31 +00:00
Jesus Climent
20bafb9313
Atreyu rev2 (#19443) 2023-01-01 11:38:44 +11:00
jack
829c7e0931
Fixup horrortroll/handwired_k552 (#19447) 2022-12-31 21:15:16 +00:00
HorrorTroll
724aa3a4b2
Refactor entire Handwired K552 keyboard (#18066) 2022-12-30 12:04:01 +11:00
QMK Bot
87cace28a6 Merge remote-tracking branch 'origin/master' into develop 2022-12-30 01:02:09 +00:00
Yizhen Liu
590c889537
[keyboard]Add Graystudio Space65 R3 (#18909)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-12-30 12:01:32 +11:00
QMK Bot
7cccba8a3b Merge remote-tracking branch 'origin/master' into develop 2022-12-30 01:00:29 +00:00
HorrorTroll
5fa2aab41e
Added support keyboard Pila87 / XM87 PRO (#18919) 2022-12-30 11:59:55 +11:00
QMK Bot
62d101b886 Merge remote-tracking branch 'origin/master' into develop 2022-12-30 00:53:52 +00:00
Evgenii Vilkov
ced8142847
[Keyboard] Add Pica40 (#19220)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-12-30 11:53:31 +11:00
QMK Bot
91bfc2ba3f Merge remote-tracking branch 'origin/master' into develop 2022-12-30 00:52:37 +00:00
Wolf Van Herreweghe
a7ff2b8d54
Typ65+ Add code to auto turn off LEDs when the PC goes to sleep (#19365)
Co-authored-by: Wolf <contact@vwolf.be>
2022-12-30 11:51:12 +11:00
QMK Bot
d4096db271 Merge remote-tracking branch 'origin/master' into develop 2022-12-30 00:51:12 +00:00
jasonj2232
6b50b1be9b
[Keyboard] Added support for a new keyboard - Ishi 80 Mk0 (#19195) 2022-12-30 11:50:16 +11:00
dztech
e08debb62f
Fix odinmini layout macro (#19429) 2022-12-30 11:48:26 +11:00
QMK Bot
cd1d1d80bb Merge remote-tracking branch 'origin/master' into develop 2022-12-30 00:48:13 +00:00
Ryan
801d2ff940
Remove useless line continuations (#19399) 2022-12-30 11:48:05 +11:00
yonatanzunger
6bd76c97be
A fancy keymap for the wt65_xt. (#19375) 2022-12-30 11:47:40 +11:00
QMK Bot
2b61cc739f Merge remote-tracking branch 'origin/master' into develop 2022-12-30 00:45:52 +00:00
alaviss
444760efcb
ploopyco/trackball_mini: always update encoder (#18561) 2022-12-30 11:45:10 +11:00
QMK Bot
69a9577558 Merge remote-tracking branch 'origin/master' into develop 2022-12-30 00:44:58 +00:00
x123
ab667a8b64
add x123 keymap for splitkb/aurora/corne (#19407) 2022-12-30 11:44:21 +11:00
QMK Bot
40fddcb1e5 Merge remote-tracking branch 'origin/master' into develop 2022-12-27 20:29:52 +00:00
gachiham
4c32e060e8
[Keyboard] Add XR63GL keyboard (#19380) 2022-12-27 12:29:19 -08:00
QMK Bot
3b80638ac3 Merge remote-tracking branch 'origin/master' into develop 2022-12-27 20:15:16 +00:00
DeskDaily
202a708ba7
[Keyboard] Add Mk65 (#19346)
Co-authored-by: Neil Brian Ramirez <nightlykeyboards@gmail.com>
Co-authored-by: Neil Brian Ramirez <nightlyboards@gmail.com>
2022-12-27 12:14:56 -08:00
Isaac Lyons
fd9c809fc3
[Keymap] Add snowskeleton preonic layout (#19357)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-12-27 12:14:42 -08:00
QMK Bot
d81c54109a Merge remote-tracking branch 'origin/master' into develop 2022-12-27 20:09:35 +00:00
Arturo Avila
3de3f885de
[Keyboard] Add AkemiPad (#18790)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-12-27 12:09:01 -08:00
QMK Bot
3232f52efb Merge remote-tracking branch 'origin/master' into develop 2022-12-27 19:39:29 +00:00
leah-splitkb
95e97fa839
[Keyboard] Fix Aurora Lily58 default encoder behaviour (#19424) 2022-12-27 11:38:53 -08:00
QMK Bot
d988c1c082 Merge remote-tracking branch 'origin/master' into develop 2022-12-23 09:09:11 +00:00
DeskDaily
99b69dc80e
[Keyboard] Corrected a GPIO pin on config.h on the jisoo pcb (#19396)
Co-authored-by: Neil Brian Ramirez <nightlykeyboards@gmail.com>
Co-authored-by: Neil Brian Ramirez <nightlyboards@gmail.com>
2022-12-23 01:08:37 -08:00
QMK Bot
89b72017a0 Merge remote-tracking branch 'origin/master' into develop 2022-12-21 10:04:25 +00:00
ebastler
b8a9de206d
Add Anvil Native keyboard (#19333)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-12-21 21:03:50 +11:00
Filip Paryż
ae94be98ed
New keymap for ID75 - paryz (#19350) 2022-12-21 03:48:17 +11:00
QMK Bot
d95a51fb17 Merge remote-tracking branch 'origin/master' into develop 2022-12-20 06:45:05 +00:00
lalalademaxiya1
8560280afe
Add Keychron S1 (#19378) 2022-12-20 17:44:23 +11:00
QMK Bot
174263445f Merge remote-tracking branch 'origin/master' into develop 2022-12-19 10:00:37 +00:00
4pplet
8d43f20624
Adding Duck Viper/Eagle V2/V3 Replacement PCB Rev B (#18584)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: 4pplet <4pplet@protonmail.com>
Co-authored-by: 4pplet <stefan.ess@gmail.com>
2022-12-19 20:59:48 +11:00
QMK Bot
3944eda299 Merge remote-tracking branch 'origin/master' into develop 2022-12-19 09:57:45 +00:00
lalalademaxiya1
90bd710b69
Add Keychron V7 (#19360) 2022-12-19 20:55:30 +11:00
QMK Bot
995aad1123 Merge remote-tracking branch 'origin/master' into develop 2022-12-19 09:55:02 +00:00
lalalademaxiya1
007a8c8b35
Add Keychron V8 (#19361) 2022-12-19 20:54:05 +11:00
QMK Bot
ff8d514262 Merge remote-tracking branch 'origin/master' into develop 2022-12-19 09:52:40 +00:00
Manna Harbour
5922751b17
[Keyboard] Add converter/xmk (#18433) 2022-12-19 20:52:03 +11:00
QMK Bot
0b079424c8 Merge remote-tracking branch 'origin/master' into develop 2022-12-19 09:48:45 +00:00
lalalademaxiya1
d27d6f0485
Add Keychron Q7 (#19308)
Co-authored-by: jack <0x6a73@protonmail.com>
2022-12-19 20:48:30 +11:00
lalalademaxiya1
90c4a8785e
Add Keychron Q60 (#19309)
Co-authored-by: jack <0x6a73@protonmail.com>
2022-12-19 20:46:56 +11:00
QMK Bot
5d3fccf006 Merge remote-tracking branch 'origin/master' into develop 2022-12-19 09:46:29 +00:00
lalalademaxiya1
4c28f93520
Add Keychron Q65 (#19310)
Co-authored-by: jack <0x6a73@protonmail.com>
2022-12-19 20:45:57 +11:00
QMK Bot
e8d6c62934 Merge remote-tracking branch 'origin/master' into develop 2022-12-19 09:45:26 +00:00
lalalademaxiya1
e0ff1189ce
Add Keychron V1 (#19315) 2022-12-19 20:44:47 +11:00
QMK Bot
830bdd9a85 Merge remote-tracking branch 'origin/master' into develop 2022-12-19 09:42:33 +00:00
lalalademaxiya1
de64c61d17
Add Keychron V2 (#19316) 2022-12-19 20:42:00 +11:00
QMK Bot
bef4d9965d Merge remote-tracking branch 'origin/master' into develop 2022-12-19 09:40:13 +00:00
lalalademaxiya1
a3392fdd1e
Add Keychron V3 (#19317) 2022-12-19 20:39:36 +11:00
QMK Bot
f46018457f Merge remote-tracking branch 'origin/master' into develop 2022-12-19 09:07:33 +00:00
lalalademaxiya1
0ab4f53691
Add Keychron V4 (#19319) 2022-12-19 20:06:51 +11:00
QMK Bot
f249789a8f Merge remote-tracking branch 'origin/master' into develop 2022-12-19 08:54:27 +00:00
lalalademaxiya1
4a0027d493
Add Keychron V5 (#19320) 2022-12-19 19:53:51 +11:00
QMK Bot
cf1c50987a Merge remote-tracking branch 'origin/master' into develop 2022-12-19 08:43:20 +00:00
lalalademaxiya1
359caf1432
Add Keychron Q9 (#19318) 2022-12-19 19:42:45 +11:00
QMK Bot
05a2f0453a Merge remote-tracking branch 'origin/master' into develop 2022-12-19 08:10:10 +00:00
Salicylic-acid3
6a80b7266a
[Keyboard] Add Guide68 (#19264)
Co-authored-by: jack <0x6a73@protonmail.com>
2022-12-19 19:09:35 +11:00
QMK Bot
7526b2a621 Merge remote-tracking branch 'origin/master' into develop 2022-12-19 07:29:10 +00:00
jack
8655b100b1
keebio/quefrency — add missing LAYOUT_all's to info.json (#19373) 2022-12-18 23:28:30 -08:00
QMK Bot
dd9d3d6c8e Merge remote-tracking branch 'origin/master' into develop 2022-12-18 22:34:09 +00:00
zvecr
2e9ebf0756 Correct 19355 2022-12-18 22:33:08 +00:00
QMK Bot
54f441ca9f Merge remote-tracking branch 'origin/master' into develop 2022-12-18 22:32:35 +00:00
dztech
f1cf00ab70
change d45lite keyboard name to d45v2 (#19355) 2022-12-18 22:31:34 +00:00
Peter Park
7aa2d791f6
[Keyboard] The Uni change folder location (#19326)
Co-authored-by: Peter Park <peter@Peters-MacBook-Air.local>
2022-12-17 19:26:02 -08:00
QMK Bot
9c08c7d4b6 Merge remote-tracking branch 'origin/master' into develop 2022-12-18 03:21:34 +00:00
Nostril
f3041c5500
[Keyboard] Add Synth Labs 060 keyboard (#19363)
Co-authored-by: jack <0x6a73@protonmail.com>
2022-12-17 19:21:02 -08:00
QMK Bot
2e126faf92 Merge remote-tracking branch 'origin/master' into develop 2022-12-17 19:56:39 +00:00
jack
a73014fa27
[Keyboard] tkc/portico75 — Fix layers & move to encoder map (#19359) 2022-12-17 11:55:12 -08:00
QMK Bot
233ae20d33 Merge remote-tracking branch 'origin/master' into develop 2022-12-15 19:36:22 +00:00
James Young
f21443d6a2
DZTECH OG60 Touch-Up (#19343) 2022-12-15 11:35:28 -08:00
QMK Bot
0072f5bb1b Merge remote-tracking branch 'origin/master' into develop 2022-12-15 19:26:01 +00:00
Basil Sh
293a9fb342
[Keymap] Fix miryoku layout for draculad (#19338) 2022-12-15 11:25:17 -08:00
QMK Bot
1d3b27eb34 Merge remote-tracking branch 'origin/master' into develop 2022-12-15 09:03:23 +00:00
ebastler
d7225eafbe
[Keymap] Add E80-1800 keymap with bongocat OLED animation (#19334) 2022-12-15 01:02:49 -08:00
QMK Bot
9e29fe16e6 Merge remote-tracking branch 'origin/master' into develop 2022-12-15 06:40:57 +00:00
James Young
8e50f1c5f5
DZTECH Endless80 Touch-Up (#19339) 2022-12-14 22:40:17 -08:00
Nick Brassel
64715084b2
Fixup build failures. (#19332) 2022-12-15 09:56:30 +11:00
QMK Bot
309b4dc2b7 Merge remote-tracking branch 'origin/master' into develop 2022-12-14 20:56:53 +00:00
QMK Bot
51360f3d54
Format code according to conventions (#19330) 2022-12-14 20:56:19 +00:00
QMK Bot
1bf60eb6fc Merge remote-tracking branch 'origin/master' into develop 2022-12-14 20:51:55 +00:00
Zykrah
5c817bffe9
[Keyboard] Add Slime88 (#19054)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-12-14 12:51:02 -08:00
QMK Bot
6550b67005 Merge remote-tracking branch 'origin/master' into develop 2022-12-14 20:49:23 +00:00
Zykrah
35f460643a
[Keyboard] Tinny50 RGB Edition (#19285)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-12-14 12:48:45 -08:00
QMK Bot
66af985a62 Merge remote-tracking branch 'origin/master' into develop 2022-12-14 20:41:09 +00:00
BentoBoxStudio
5373376020
[Keyboard] Add cosmo65 (#19181) 2022-12-14 12:40:38 -08:00
Ryan
1978007fae
Tap Dance: remove qk_ prefix (#19313) 2022-12-14 12:40:25 -08:00
QMK Bot
2f15cde2d1 Merge remote-tracking branch 'origin/master' into develop 2022-12-14 15:51:31 +00:00
mfkiiyd
1130834513
add ubest/vn 68 keyboard (#19263)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: water <mfkiiyd@163.com>
2022-12-15 02:50:56 +11:00
QMK Bot
2b2d1d43d8 Merge remote-tracking branch 'origin/master' into develop 2022-12-14 15:50:29 +00:00
dztech
4c5e0606fe
add tofu_jr keyboard (#18960)
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-12-15 02:49:49 +11:00
Joel Challis
1124bbc1db
Remove deprecated led_set_kb (#19273)
* Remove led_set_kb maintaining existing led_set_user behaviour

* Also call led_set_user
2022-12-14 11:14:10 +00:00
QMK Bot
0fcf481cdd Merge remote-tracking branch 'origin/master' into develop 2022-12-14 02:49:39 +00:00
jack
fecfb176b4
Add encoder map to boardsource/lulu, and some other dd migrations (#19281) 2022-12-14 13:49:06 +11:00
Ryan
e2117564c5
Leader: remove qk_ prefix (#19304) 2022-12-14 13:46:01 +11:00
QMK Bot
49b81a9c2b Merge remote-tracking branch 'origin/master' into develop 2022-12-14 02:44:46 +00:00
James Young
582f879d6f
Mode SixtyFive HA Layout Refactor (#19312) 2022-12-14 13:43:40 +11:00
precondition
515dd18c28
Remove IGNORE_MOD_TAP_INTERRUPT_PER_KEY in favour of HOLD_ON_OTHER_KEY_PRESS_PER_KEY (#15741) 2022-12-13 22:20:07 +11:00
QMK Bot
ca13734f91 Merge remote-tracking branch 'origin/master' into develop 2022-12-13 09:24:13 +00:00
Zykrah
411ed54b0a
[Keyboard] Add Fuyu (#19055)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-12-13 01:23:37 -08:00
QMK Bot
3cb0888afa Merge remote-tracking branch 'origin/master' into develop 2022-12-13 09:15:33 +00:00
Leo Deng
70b9cec3f2
[Keyboard] add deng/thirty keyboard (#19228)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Leo DENG <leo.deng@nio.com>
2022-12-13 01:14:29 -08:00
Drashna Jaelre
222f685b90
[Keyboard] Fix DZTECH Tofu II v1 i2c config (#19306) 2022-12-13 15:59:32 +11:00
QMK Bot
408bb469bb Merge remote-tracking branch 'origin/master' into develop 2022-12-13 02:50:58 +00:00
Danny
e25672baef
[Keyboard] Add Convolution Rev. 1 PCB (#19283)
Co-authored-by: Joel Challis <git@zvecr.com>
2022-12-12 18:50:23 -08:00
QMK Bot
e0e22176bb Merge remote-tracking branch 'origin/master' into develop 2022-12-13 02:38:55 +00:00