James Young
a7afa58fb6
YMDK Melody96 Break-Up ( #22121 )
2023-09-24 22:39:18 -07:00
QMK Bot
df3eff5bdc
Merge remote-tracking branch 'origin/develop' into xap
2023-09-21 05:45:59 +00:00
Richard Goulter
629ac9ae68
Add KPRepublic/BM40hsrgb rev2 ( #16689 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-09-20 22:45:25 -07:00
QMK Bot
b7e6e68d05
Merge remote-tracking branch 'origin/develop' into xap
2023-09-21 02:11:36 +00:00
Duncan Sutherland
29ffe804b8
Modernize dactyl_manuform/dmote
keyboard ( #20427 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-09-20 19:10:59 -07:00
QMK Bot
eb5ea74e7b
Merge remote-tracking branch 'origin/develop' into xap
2023-09-20 13:15:08 +00:00
QMK Bot
21c396a3aa
Merge remote-tracking branch 'origin/master' into develop
2023-09-20 13:14:27 +00:00
Joel Challis
cdff9b8da7
Restrict "feature" and "animation" keys ( #21895 )
2023-09-20 14:13:51 +01:00
QMK Bot
4a7eb0dca8
Merge remote-tracking branch 'origin/develop' into xap
2023-09-15 19:37:06 +00:00
dztech
85c2b03507
[Keyboard] Rename og60 to tofu60 ( #21684 )
...
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-09-15 12:36:31 -07:00
Drashna Jael're
e69909cc53
Merge remote-tracking branch 'origin/develop' into xap
2023-09-05 00:56:56 -07:00
Joel Challis
5fab310e65
Implement data driven wear leveling ( #21906 )
...
* DD encoder map, wear leveling
* remove encoder map from DD
let's avoid the support headache
* wear leveling: specify the allowed drivers by name
Co-authored-by: Ryan <fauxpark@gmail.com>
* Add additional params
* Relocate under eeprom
* disable parsing
---------
Co-authored-by: Dimitris Mantzouranis <d3xter93@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-09-05 01:53:05 +01:00
zvecr
980699f3cf
Fix xap docs gen + clarify some broadcast messages
2023-08-29 02:37:23 +01:00
zvecr
87fd4b42f5
Tidy up broadcast in python client
2023-08-29 02:36:21 +01:00
QMK Bot
c2324ff646
Merge remote-tracking branch 'origin/develop' into xap
2023-08-27 03:00:54 +00:00
Joel Challis
95681b8ff4
Add *_MATRIX_LED_COUNT generation ( #21110 )
2023-08-27 04:00:14 +01:00
QMK Bot
e9feb19c83
Merge remote-tracking branch 'origin/develop' into xap
2023-08-26 18:32:35 +00:00
HiryKun
5cd47f5094
Add "apm32-dfu" in keyboard.jsonschema ( #21842 )
2023-08-26 19:31:59 +01:00
QMK Bot
e1ab97c7bf
Merge remote-tracking branch 'origin/develop' into xap
2023-08-24 23:47:51 +00:00
Joel Challis
a9e2f6a25a
Remove led_matrix.hue_steps
and led_matrix.sat_steps
from schema ( #21827 )
2023-08-25 00:47:12 +01:00
QMK Bot
265e734d7f
Merge remote-tracking branch 'origin/develop' into xap
2023-08-15 10:07:36 +00:00
Ryan
1c069b13b9
rgblight: driver selection cleanups ( #21558 )
2023-08-15 11:06:57 +01:00
QMK Bot
36fd583581
Merge remote-tracking branch 'origin/develop' into xap
2023-08-01 00:55:02 +00:00
Joel Challis
27ff1d4153
Remove layout aliases from keyboard_aliases.hjson ( #21658 )
2023-08-01 01:54:28 +01:00
QMK Bot
62e218ba94
Merge remote-tracking branch 'origin/develop' into xap
2023-07-29 05:16:49 +00:00
Ryan
b4a7b9253a
Bluetooth: driver naming cleanups ( #21624 )
2023-07-29 15:16:14 +10:00
QMK Bot
7e783a6c19
Merge remote-tracking branch 'origin/develop' into xap
2023-07-25 02:58:13 +00:00
Joe Scotto
ba6a49612a
[Keyboard] Delete jscotto directory ( #21157 )
2023-07-24 20:56:52 -06:00
QMK Bot
d5ebc148b1
Merge remote-tracking branch 'origin/develop' into xap
2023-07-20 20:04:01 +00:00
Duncan Sutherland
b20b360404
Rename dactyl_manuform
variant 3x5_3
( #21015 )
2023-07-20 16:03:23 -04:00
QMK Bot
8925db9e10
Merge remote-tracking branch 'origin/develop' into xap
2023-07-20 14:52:34 +00:00
fauxpark
9a4abea7c9
Merge remote-tracking branch 'upstream/master' into develop
2023-07-21 00:51:15 +10:00
Danny
c61cb72ae8
Move files to rev1 folder, add rev2 ( #21563 )
...
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2023-07-20 08:10:09 -04:00
QMK Bot
28e60c7cec
Merge remote-tracking branch 'origin/develop' into xap
2023-07-07 14:33:46 +00:00
Duncan Sutherland
43350c347d
rename and modernise dactyl_manuform/6x6_kinesis
( #21302 )
2023-07-08 00:32:26 +10:00
QMK Bot
3992b0745a
Merge remote-tracking branch 'origin/develop' into xap
2023-06-28 03:07:50 +00:00
Nick Brassel
c814be0296
STM32H723 support ( #21352 )
2023-06-28 13:07:14 +10:00
QMK Bot
c820bd4240
Merge remote-tracking branch 'origin/develop' into xap
2023-06-20 02:32:22 +00:00
jonylee@hfd
d98b60c8f6
Move kb83 keyboard ( #20761 )
...
* move hfdkb/keyboard_sw/k83 --> inland/kb83
* move hfdkb/keyboard_sw/k83 --> inland/kb83
* Update data/mappings/keyboard_aliases.hjson
* Update keyboard_aliases.hjson
* fixed the Configurator layout data
* fixed the Configurator layout data
* Revert "Update keyboard_aliases.hjson"
This reverts commit c085c54765
.
* Revert "fixed the Configurator layout data"
* Update keyboard_aliases.hjson
* Update info.json
2023-06-19 19:31:46 -07:00
QMK Bot
b6ba275609
Merge remote-tracking branch 'origin/develop' into xap
2023-06-14 12:02:21 +00:00
Ryan
9551a0a38a
Move RGBLIGHT_LED_MAP
to data driven ( #21095 )
2023-06-14 22:01:13 +10:00
QMK Bot
e7040fbd6f
Merge remote-tracking branch 'origin/develop' into xap
2023-06-02 01:46:27 +00:00
Joel Challis
aa33fb00fd
Revert "Add *_MATRIX_LED_COUNT generation/validation ( #19515 )" ( #21109 )
...
This reverts commit 25c16b3ade
.
2023-06-02 02:45:48 +01:00
QMK Bot
36fe36201e
Merge remote-tracking branch 'origin/develop' into xap
2023-06-02 01:43:31 +00:00
Joel Challis
25c16b3ade
Add *_MATRIX_LED_COUNT generation/validation ( #19515 )
...
* Add *_MATRIX_LED_COUNT parsing/validation
* Disable parsing for now
* Disable complexity check
2023-06-02 02:42:49 +01:00
QMK Bot
dfb4298210
Merge remote-tracking branch 'origin/develop' into xap
2023-05-27 13:13:19 +00:00
nuess0r
f98f8eedf0
Consolidate modelm v2 ( #14996 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-05-27 23:12:36 +10:00
QMK Bot
5e7448ade1
Merge remote-tracking branch 'origin/develop' into xap
2023-05-25 22:08:26 +00:00
Joel Challis
b2e5017e74
Move thekey
to Drop vendor folder ( #21032 )
2023-05-25 23:08:12 +01:00
zvecr
f5e8c10be8
Fix compilation on older gcc versions
2023-05-23 00:31:20 +01:00
QMK Bot
9e39e8327c
Merge remote-tracking branch 'origin/develop' into xap
2023-05-22 06:04:42 +00:00
Joel Challis
3969d7045e
Duplicate board files for blok converter ( #20629 )
...
* Duplicate board files for blok converter
* Swap converters board file too
* Update platforms/chibios/boards/QMK_BLOK/configs/board.h
2023-05-22 07:04:19 +01:00
QMK Bot
ecf42c0153
Merge remote-tracking branch 'origin/develop' into xap
2023-05-20 12:35:55 +00:00
Pascal Getreuer
3993b15f05
[Core] Add Repeat Key ("repeat last key") as a core feature. ( #19700 )
...
Co-authored-by: casuanoob <96005765+casuanoob@users.noreply.github.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
2023-05-20 22:35:06 +10:00
QMK Bot
8d7131673d
Merge remote-tracking branch 'origin/develop' into xap
2023-05-20 12:14:17 +00:00
Ryan
ab8c5013c8
BIOI G60/Morgan65: use custom Bluetooth driver ( #20897 )
2023-05-20 22:12:59 +10:00
QMK Bot
e560b8ec76
Merge remote-tracking branch 'origin/develop' into xap
2023-05-20 12:10:55 +00:00
Alabahuy
0d844a5d4b
Add sriwedari70 and move kamigakushi to new folder ( #20334 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: zacksupreme <zacksupreme@gmail.com>
2023-05-20 22:10:13 +10:00
QMK Bot
594d2f640f
Merge remote-tracking branch 'origin/develop' into xap
2023-05-15 12:28:22 +00:00
Nick Brassel
5faa23d54c
Keymap introspection for combos. ( #19670 )
2023-05-15 22:27:37 +10:00
QMK Bot
01bf5b0ff5
Merge remote-tracking branch 'origin/develop' into xap
2023-05-09 03:23:53 +00:00
Ryan
ef37fa29cd
Organise config/rules <-> info mappings ( #20723 )
2023-05-09 13:23:03 +10:00
QMK Bot
f8e36408da
Merge remote-tracking branch 'origin/develop' into xap
2023-04-12 15:36:35 +00:00
Moritz Plattner
c57902d443
[Keyboard] Add support for ISO version of Durgod Hades ( #20110 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-04-12 08:36:28 -07:00
QMK Bot
b5df4f6c7c
Merge remote-tracking branch 'origin/develop' into xap
2023-04-06 08:01:36 +00:00
Ryan
47966dc2a6
Migrate rgblight.pin
and RGB_DI_PIN
to ws2812.pin
( #20303 )
2023-04-06 18:00:54 +10:00
QMK Bot
4cd190d359
Merge remote-tracking branch 'origin/develop' into xap
2023-04-03 23:12:13 +00:00
Pascal Getreuer
ae63c0f509
[Core] Caps Word "Invert on shift" option: pressing Shift inverts the shift state. ( #20092 )
...
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-04-04 09:11:26 +10:00
QMK Bot
a814c99074
Merge remote-tracking branch 'origin/develop' into xap
2023-04-03 05:33:30 +00:00
precondition
1899793f27
Make IGNORE_MOD_TAP_INTERRUPT the default behaviour for mod-taps ( #20211 )
2023-04-03 15:32:47 +10:00
QMK Bot
17332a530c
Merge remote-tracking branch 'origin/develop' into xap
2023-04-02 03:03:59 +00:00
Joel Challis
1b8c7c39d7
Allow EEPROM_DRIVER from info.json ( #20313 )
2023-04-02 04:03:22 +01:00
QMK Bot
d256806be8
Merge remote-tracking branch 'origin/develop' into xap
2023-03-30 01:21:39 +00:00
Ryan
647c2835e6
WS2812 driver improvements ( #20262 )
2023-03-30 12:21:02 +11:00
QMK Bot
a4837db456
Merge remote-tracking branch 'origin/develop' into xap
2023-03-29 20:17:05 +00:00
Less/Rikki
68a27b8e92
[jacky_studio/piggy60] move AVR PCB under rev1 ( #20253 )
2023-03-29 14:16:20 -06:00
QMK Bot
5572a5eb99
Merge remote-tracking branch 'origin/develop' into xap
2023-03-27 19:01:46 +00:00
Joel Challis
79b0f9168e
Custom keycodes in JSON ( #19925 )
2023-03-27 20:01:07 +01:00
zvecr
13f57c6d45
Partial generation of execute helpers
2023-03-26 23:51:27 +01:00
QMK Bot
eebe2e467a
Merge remote-tracking branch 'origin/develop' into xap
2023-03-26 07:22:49 +00:00
Ryan
36ce81df59
Move WS2812_DRIVER
to data driven ( #20248 )
2023-03-26 18:22:12 +11:00
zvecr
42895141de
Decouple lighting_map from XAP
2023-03-23 00:48:52 +00:00
zvecr
7edc0bcd43
Tidy up bool implementation
2023-03-22 21:21:02 +00:00
zvecr
64c5531be6
Refactor inline_generator to template
2023-03-22 21:21:02 +00:00
QMK Bot
07142ffaa2
Merge remote-tracking branch 'origin/develop' into xap
2023-03-19 21:12:44 +00:00
Ryan
65a80f411f
Clean up APA102 config and add DD mapping ( #20159 )
2023-03-20 08:12:19 +11:00
QMK Bot
00f1613680
Merge remote-tracking branch 'origin/develop' into xap
2023-03-16 07:51:28 +00:00
Drashna Jael're
72da3ee63e
Merge remote-tracking branch 'origin/master' into develop
2023-03-16 00:50:29 -07:00
Joel Challis
7654c2a23b
Update keycodes_0.0.1_basic.hjson ( #20129 )
2023-03-16 00:37:58 +00:00
QMK Bot
438aea7041
Merge remote-tracking branch 'origin/develop' into xap
2023-03-10 20:47:51 +00:00
leah-splitkb
46bbb81dd2
Add RP2040 Community Edition alias for Liatris ( #19966 )
2023-03-10 12:47:10 -08:00
zvecr
751e72c1f9
Fix xap_client gen after render_xap_output changes
2023-03-06 19:56:38 +00:00
QMK Bot
c0740cf08a
Merge remote-tracking branch 'origin/develop' into xap
2023-03-05 23:09:02 +00:00
Joel Challis
500c4b7484
Reject VIA keys within info.json ( #20026 )
2023-03-06 10:07:47 +11:00
QMK Bot
809260d39a
Merge remote-tracking branch 'origin/develop' into xap
2023-02-25 21:38:39 +00:00
Ryan
314f6c1ddb
Move backlight config to data driven ( #19910 )
2023-02-26 08:37:57 +11:00
QMK Bot
67bb3ae46b
Merge remote-tracking branch 'origin/develop' into xap
2023-02-22 22:50:46 +00:00
Joel Challis
9f2cd9119f
Reallocate user/kb keycode ranges ( #19907 )
2023-02-23 09:50:09 +11:00
QMK Bot
5cab00593f
Merge remote-tracking branch 'origin/develop' into xap
2023-02-22 22:20:05 +00:00
Nick Brassel
7f805cc779
VIA Protocol 12 + fixes ( #19916 )
...
Co-authored-by: Wilba <wilba@wilba.tech>
Co-authored-by: zvecr <git@zvecr.com>
2023-02-23 09:19:00 +11:00
QMK Bot
f6ba9a8875
Merge remote-tracking branch 'origin/develop' into xap
2023-02-22 21:15:08 +00:00
Joel Challis
403b0addea
Align magic keycodes ( #19877 )
2023-02-23 08:14:29 +11:00
QMK Bot
ed1e550bc1
Merge remote-tracking branch 'origin/develop' into xap
2023-02-19 08:00:25 +00:00
Joel Challis
0152dd811d
Move KC_MISSION_CONTROL
/KC_LAUNCHPAD
keycodes to core ( #19884 )
2023-02-19 18:59:50 +11:00
QMK Bot
805239761e
Merge remote-tracking branch 'origin/develop' into xap
2023-02-18 15:45:15 +00:00
Joel Challis
f587a0c548
Align sequencer keycodes ( #19875 )
2023-02-18 15:44:36 +00:00
QMK Bot
5cd8627002
Merge remote-tracking branch 'origin/develop' into xap
2023-02-18 05:27:25 +00:00
pauper
7ce71625bc
[Keyboard] Brick ( #19851 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Jason Chestnut <jason@Jasons-MacBook-Pro.local>
2023-02-17 21:26:43 -08:00
QMK Bot
fbe581fe82
Merge remote-tracking branch 'origin/develop' into xap
2023-02-12 23:02:42 +00:00
Joel Challis
896d9aa98c
Add rp2040_ce and add elite-pi and helios as alias ( #19830 )
...
* add rp2040_ce and add elite-pi and helios as alias (#19628 )
* fix git mishap
* Update platforms/chibios/converters/promicro_to_rp2040_ce/_pin_defs.h
Co-authored-by: Joel Challis <git@zvecr.com>
---------
Co-authored-by: Joel Challis <git@zvecr.com>
* Tidy docs
---------
Co-authored-by: Conor Burns <mail@conor-burns.com>
2023-02-12 23:02:05 +00:00
QMK Bot
261c938fd4
Merge remote-tracking branch 'origin/develop' into xap
2023-02-12 15:56:36 +00:00
Joel Challis
d10350cd2c
Restore packing of midi note keycodes ( #19468 )
2023-02-13 02:55:51 +11:00
QMK Bot
7faa82869c
Merge remote-tracking branch 'origin/develop' into xap
2023-02-11 23:23:46 +00:00
Drashna Jaelre
fe02abc479
[Core] Tri Layer Keys ( #19795 )
...
Co-authored-by: wilba <wilba@wilba.tech>
Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-02-12 10:23:07 +11:00
QMK Bot
dad5a9ac4b
Merge remote-tracking branch 'origin/develop' into xap
2023-02-11 02:46:27 +00:00
Nick Brassel
9991894514
Generate encodermap output from keymap.json. ( #18915 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
2023-02-11 13:45:51 +11:00
QMK Bot
90ce570be6
Merge remote-tracking branch 'origin/develop' into xap
2023-02-10 21:09:37 +00:00
Joel Challis
2ffdec5dc2
Move more unicode ranges to DD ( #19755 )
2023-02-10 21:08:54 +00:00
QMK Bot
a37182dac8
Merge remote-tracking branch 'origin/develop' into xap
2023-02-09 19:28:13 +00:00
miguelelinventor
e24f9b2c0a
Add Michi MCU Converter support ( #19163 )
2023-02-09 11:27:37 -08:00
QMK Bot
40a90539ca
Merge remote-tracking branch 'origin/develop' into xap
2023-02-09 03:06:01 +00:00
Ramon Imbao
df3c9a5401
Rename ramonimbao folder to rmi_kb ( #19699 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
2023-02-08 20:05:21 -07:00
QMK Bot
c694bb7ec6
Merge remote-tracking branch 'origin/develop' into xap
2023-01-30 18:37:56 +00:00
Ryan
2d843088a2
Normalise Swap Hands keycodes ( #19720 )
2023-01-30 18:37:19 +00:00
QMK Bot
be9c13dcf9
Merge remote-tracking branch 'origin/develop' into xap
2023-01-19 00:27:37 +00:00
Joel Challis
0b25528b6b
Fix 'No LAYOUTs defined' check ( #19537 )
2023-01-19 00:27:11 +00:00
Joel Challis
0ce3f6bcfe
De-duplicate platform detection ( #19603 )
2023-01-19 00:27:00 +00:00
QMK Bot
14a138f48e
Merge remote-tracking branch 'origin/develop' into xap
2023-01-15 15:05:09 +00:00
Joel Challis
0730740add
Add mmoskal/uf2-stm32f103 bootloader support ( #19594 )
2023-01-15 15:04:32 +00:00
Nick Brassel
03c47d295e
Jinja2 cleanup.
2023-01-14 15:37:07 +11:00
QMK Bot
8de3e044b6
Merge remote-tracking branch 'origin/develop' into xap
2023-01-11 19:59:08 +00:00
Joel Challis
46c85c93f0
Revert "De-duplicate platform detection ( #19545 )" ( #19564 )
...
This reverts commit e11235ee14
.
2023-01-11 19:58:27 +00:00
QMK Bot
6347b11704
Merge remote-tracking branch 'origin/develop' into xap
2023-01-11 02:14:11 +00:00
Joel Challis
e11235ee14
De-duplicate platform detection ( #19545 )
2023-01-11 02:13:32 +00:00
QMK Bot
b3c8b8482f
Merge remote-tracking branch 'origin/develop' into xap
2023-01-09 09:23:40 +00:00
Joel Challis
a3ed1b0c8d
Relax converter within keymap schema ( #19544 )
2023-01-09 09:23:02 +00:00
QMK Bot
44eb74bb74
Merge remote-tracking branch 'origin/develop' into xap
2023-01-07 17:08:48 +00:00
QMK Bot
c172ae107e
Merge remote-tracking branch 'origin/master' into develop
2023-01-07 17:07:51 +00:00
Joel Challis
f6023a36bc
Remove invalid pin_compatible config from defaults ( #19512 )
2023-01-07 17:07:19 +00:00
QMK Bot
905b1fc71c
Merge remote-tracking branch 'origin/develop' into xap
2022-12-23 23:43:09 +00:00
Joel Challis
517f8af99e
Revert changes to keymap_steno.h ( #19412 )
2022-12-23 23:42:33 +00:00
QMK Bot
1ca4aeaeb3
Merge remote-tracking branch 'origin/develop' into xap
2022-12-21 23:35:55 +00:00
Joel Challis
e5721bbd37
Remaining DD keymap_extras migration ( #19110 )
...
* Parse headers to data
* Regen headers from data
2022-12-21 23:35:23 +00:00
QMK Bot
635413a509
Merge remote-tracking branch 'origin/develop' into xap
2022-12-13 11:20:45 +00: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
62e03baccf
Merge remote-tracking branch 'origin/develop' into xap
2022-12-12 20:51:50 +00:00
jpe230
102f22f7e9
[Core] Quantum Painter - LVGL Integration ( #18499 )
...
Co-authored-by: Nick Brassel <nick@tzarc.org>
2022-12-13 07:51:14 +11:00
QMK Bot
aadaf0e4e7
Merge remote-tracking branch 'origin/develop' into xap
2022-12-12 15:52:57 +00:00
Albert Y
cbabc8dbe6
[Core] Replace Tapping Force Hold feature with Quick Tap Term ( #17007 )
...
* Replace Tapping Force Hold feature with Quick Tap Term
* Replace keyboard level TAPPING_FORCE_HOLD with QUICK_TAP_TERM 0
* Deprecate force hold in info_config.json
* Before and after quick tap term unit tests
* Quick tap unit tests iteration
* Keymap config.h correction
* Remove TAPPING_FORCE_HOLD_PER_KEY macros that were missed
* Add two more test cases for quick tap
* Replace TAPPING_FORCE_HOLD with QUICK_TAP_TERM in configs #2
* Replace TAPPING_FORCE_HOLD_PER_KEY with QUICK_TAP_TERM_PER_KEY in configs #2
* Add function declaration for get_quick_tap_term
Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
2022-12-12 16:52:22 +01:00
Nick Brassel
ee93b00e6c
Merge remote-tracking branch 'upstream/develop' into xap
2022-12-10 13:29:35 +11:00