QMK Bot
7830982781
Merge remote-tracking branch 'origin/develop' into xap
2023-06-20 15:39:43 +00:00
QMK Bot
965cfec3f9
Merge remote-tracking branch 'origin/master' into develop
2023-06-20 15:39:02 +00:00
Roberts Kursitis
958cae3e0a
[Keyboard] Add Alisaie ( #21266 )
2023-06-20 09:38:26 -06:00
QMK Bot
d2e0fc22d8
Merge remote-tracking branch 'origin/develop' into xap
2023-06-20 15:36:39 +00:00
QMK Bot
a2e2d92652
Merge remote-tracking branch 'origin/master' into develop
2023-06-20 15:36:05 +00:00
Derek
0abe3129f1
[Keyboard] Add bigsmoothknob ( #21265 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-20 09:35:23 -06: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
6aa81dd1cf
Merge remote-tracking branch 'origin/develop' into xap
2023-06-20 01:47:02 +00:00
QMK Bot
be6f92c612
Merge remote-tracking branch 'origin/master' into develop
2023-06-20 01:46:21 +00:00
James Young
31e39a9ff4
dnworks SBL Community Layout Support and Touch-Up ( #21267 )
2023-06-19 18:45:47 -07:00
QMK Bot
6050499eb2
Merge remote-tracking branch 'origin/develop' into xap
2023-06-19 20:00:07 +00:00
jack
b749a5f720
Fixup nightly_boards/n40_o
( #21307 )
2023-06-19 13:59:35 -06:00
QMK Bot
f3a956b9f4
Merge remote-tracking branch 'origin/develop' into xap
2023-06-19 15:47:01 +00:00
jack
c4a67d3f33
Remove encoder in-matrix workaround code ( #20389 )
2023-06-19 09:46:27 -06:00
QMK Bot
85f81c4be1
Merge remote-tracking branch 'origin/develop' into xap
2023-06-19 12:11:09 +00:00
jack
74fbd5a031
Fixup dekunukem/duckypad
( #21298 )
2023-06-19 13:10:25 +01:00
QMK Bot
f63e7b5fce
Merge remote-tracking branch 'origin/develop' into xap
2023-06-19 06:06:00 +00:00
QMK Bot
a68e9f0116
Merge remote-tracking branch 'origin/master' into develop
2023-06-19 06:05:27 +00:00
James Young
abd0632b9e
Tsubasa Handwired: correct layout data ( #21295 )
2023-06-19 00:04:50 -06:00
QMK Bot
495e2f5e8d
Merge remote-tracking branch 'origin/develop' into xap
2023-06-19 05:54:17 +00:00
QMK Bot
55ed2bcc7e
Merge remote-tracking branch 'origin/master' into develop
2023-06-19 05:53:34 +00:00
James Young
a756ef6c88
HFDKB K83 Configurator Layout Fix ( #21297 )
2023-06-18 23:53:01 -06:00
QMK Bot
4b1afd2350
Merge remote-tracking branch 'origin/develop' into xap
2023-06-19 05:24:24 +00:00
QMK Bot
3c84f2b96d
Merge remote-tracking branch 'origin/master' into develop
2023-06-19 05:23:45 +00:00
mechlovin
e646ec2024
[Keyboard] Add support for Alveus MX PCB ( #21238 )
...
Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-18 23:23:11 -06:00
QMK Bot
785c3fec83
Merge remote-tracking branch 'origin/develop' into xap
2023-06-19 05:03:59 +00:00
QMK Bot
2ea02c3995
Merge remote-tracking branch 'origin/master' into develop
2023-06-19 05:03:28 +00:00
Nick Brassel
0774381f81
Swap G431 to transient EEPROM. Add G431 and G474 onekeys. ( #21282 )
2023-06-19 15:02:57 +10:00
QMK Bot
9d83d690e2
Merge remote-tracking branch 'origin/develop' into xap
2023-06-19 03:58:03 +00:00
QMK Bot
1f6aa12184
Merge remote-tracking branch 'origin/master' into develop
2023-06-19 03:57:28 +00:00
James Young
de49bcd8e8
Geistmaschine Geist Layout Refactor and Touch-Up ( #21288 )
2023-06-18 20:56:55 -07:00
QMK Bot
ef7965831a
Merge remote-tracking branch 'origin/develop' into xap
2023-06-18 22:34:19 +00:00
Ryan
1c9d0f0eec
Remove default TAPPING_TERM
from keyboard config.h ( #21284 )
2023-06-18 23:33:45 +01:00
QMK Bot
c9beff4be3
Merge remote-tracking branch 'origin/develop' into xap
2023-06-18 22:09:41 +00:00
QMK Bot
7c7cec906a
Merge remote-tracking branch 'origin/master' into develop
2023-06-18 22:09:05 +00:00
James Young
88640e47ef
[refactor] correct layout data ( #21289 )
2023-06-18 23:08:34 +01:00
QMK Bot
fbf4ec086f
Merge remote-tracking branch 'origin/develop' into xap
2023-06-18 11:39:16 +00:00
QMK Bot
54d883befa
Merge remote-tracking branch 'origin/master' into develop
2023-06-18 11:38:43 +00:00
Sergey Vlasov
b520b352f9
preonic/rev3{,_drop}: Fix layouts with 2u keys ( #21114 )
...
Apparently layouts with 2u keys were not correctly converted into the
`info.json` format (the old C layout macros used the arguments for such
keys multiple times to cover all possible 1u locations; this is not
supported in `info.json`, and the single matrix location for 2u keys was
chosen incorrectly in some cases). Fix the layout definitions to match
the real PCB wiring.
2023-06-18 14:38:09 +03:00
QMK Bot
3bce99af37
Merge remote-tracking branch 'origin/develop' into xap
2023-06-18 04:39:41 +00:00
Ryan
b1783db4ea
Move RGBLED_NUM
to data driven ( #21278 )
2023-06-18 14:39:07 +10:00
QMK Bot
887312f265
Merge remote-tracking branch 'origin/develop' into xap
2023-06-17 19:40:01 +00:00
QMK Bot
40a073b140
Merge remote-tracking branch 'origin/master' into develop
2023-06-17 19:39:03 +00:00
James Young
a2171ff4e8
Dymium65 Layout Touch-Up ( #21269 )
...
* [refactor] friendly-format info.json
* [refactor] correct layout data
2023-06-17 20:38:02 +01:00
QMK Bot
ae5352b129
Merge remote-tracking branch 'origin/develop' into xap
2023-06-17 19:37:49 +00:00
James Young
d85600fcd4
Eason Aeroboard Refactor ( #21271 )
...
* [refactor] refactor keymaps
- grid-align keycodes
- use four-space indent
- remove trailing whitespace
* [refactor] physically arrange layout macro
Arrange the layout macro and keymaps in the QMK-desired order.
Breaks compatibility with out-of-tree keymaps.
Key sequence swaps in this commit:
- `KC_GRV` <-> `KC_1`
- `KC_TAB` <-> `KC_Q`
* [refactor] rename LAYOUT to LAYOUT_split_space
* [enhancement] add LAYOUT_7u_space
* [chore] correct maintainer value
Reference the keyboard maintainer's GitHub username.
2023-06-17 20:37:28 +01:00
QMK Bot
90a98fa689
Merge remote-tracking branch 'origin/master' into develop
2023-06-17 19:37:15 +00:00
James Young
d57acc7c5c
DOIO KB38 Refactor ( #21268 )
...
* [refactor] keymap refactor
- tidy-up box drawing
- update keycode alignment for readability
- use QMK-native keycode aliases
* [refactor] correct layout data
* [docs] add image to readme
2023-06-17 20:36:43 +01:00
QMK Bot
9a8fcd96b4
Merge remote-tracking branch 'origin/develop' into xap
2023-06-16 04:05:21 +00:00
Ryan
2367d8129c
Move RGBLIGHT_SLEEP
to data driven ( #21072 )
2023-06-16 14:04:45 +10:00
QMK Bot
915f6566ac
Merge remote-tracking branch 'origin/develop' into xap
2023-06-15 20:58:56 +00:00
QMK Bot
579db6131e
Merge remote-tracking branch 'origin/master' into develop
2023-06-15 20:57:46 +00:00
QMK Bot
7b196e42bc
Merge remote-tracking branch 'origin/develop' into xap
2023-06-15 20:57:26 +00:00
James Young
94311e4dc2
Alas: ISO Layouts Fix and Matrix Diagram ( #21255 )
2023-06-15 14:57:13 -06:00
QMK Bot
dc435a0834
Merge remote-tracking branch 'origin/master' into develop
2023-06-15 20:56:50 +00:00
James Young
5263dfb88d
ButterKeebs PocketPad: correct layout data ( #21256 )
2023-06-15 14:56:07 -06:00
QMK Bot
b9b64751d7
Merge remote-tracking branch 'origin/develop' into xap
2023-06-15 12:28:11 +00:00
Ryan
e8ca83a353
Move RGBLIGHT_SPLIT
to data driven ( #21190 )
...
* Move `RGBLIGHT_SPLIT` to data driven
* Remove where `split_count` is already set
2023-06-15 13:27:26 +01:00
QMK Bot
80b5784283
Merge remote-tracking branch 'origin/develop' into xap
2023-06-15 12:20:24 +00:00
QMK Bot
c011eb1ead
Merge remote-tracking branch 'origin/master' into develop
2023-06-15 12:19:44 +00:00
James Young
9b36ec5351
DOIO KB30 Refactor ( #21250 )
...
* refactor keymaps
- remove extra blank lines
- convert tabs to spaces
- use four-space indent
- grid-align keycodes
- use QMK-native keycode aliases
* info.json: correct layout data
* add readme.md
* info.json: correct maintainer field
Updates the value to reference the maintainer's GitHub username.
2023-06-15 13:18:56 +01:00
QMK Bot
ab55749dbd
Merge remote-tracking branch 'origin/develop' into xap
2023-06-15 04:32:20 +00:00
QMK Bot
53d76042e0
Merge remote-tracking branch 'origin/master' into develop
2023-06-15 04:29:09 +00:00
QMK Bot
a28f7aa605
Merge remote-tracking branch 'origin/develop' into xap
2023-06-15 04:28:29 +00:00
Sleepdealr
66f06a175f
[Keyboard] Add Artemis Paragon ( #20910 )
...
Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-14 22:28:06 -06:00
QMK Bot
dd69649fc9
Merge remote-tracking branch 'origin/master' into develop
2023-06-15 04:26:11 +00:00
jonylee@hfd
8f980ea69f
[Keyboard] add top40 keyboard. ( #21199 )
...
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
2023-06-14 22:25:23 -06:00
QMK Bot
7c728df6fd
Merge remote-tracking branch 'origin/develop' into xap
2023-06-15 04:25:17 +00:00
QMK Bot
5c03941405
Merge remote-tracking branch 'origin/master' into develop
2023-06-15 04:24:28 +00:00
jonylee@hfd
bbba1d07f9
[Keyboard] add acr87 keyboard. ( #21200 )
2023-06-14 22:23:46 -06:00
QMK Bot
9d68f7bc3e
Merge remote-tracking branch 'origin/develop' into xap
2023-06-15 04:23:24 +00:00
QMK Bot
03c4530e8c
Merge remote-tracking branch 'origin/master' into develop
2023-06-15 04:22:24 +00:00
blindassassin111
3703d5a83b
[Keyboard] Adding OSAv2 Numpad Topre support ( #21224 )
2023-06-14 22:20:49 -06:00
QMK Bot
d1f74ee68d
Merge remote-tracking branch 'origin/develop' into xap
2023-06-15 04:09:37 +00:00
QMK Bot
8ee0cb5744
Merge remote-tracking branch 'origin/master' into develop
2023-06-15 04:08:59 +00:00
Andrew Kannan
a2c17d5518
[Keyboard] Add CannonKeys Leviatan PCB ( #21231 )
2023-06-14 22:08:16 -06:00
QMK Bot
b4531f85f6
Merge remote-tracking branch 'origin/develop' into xap
2023-06-15 04:06:54 +00:00
Duncan Sutherland
2add1fb223
[Keyboard] dactyl_manuform/6x7
pin correction ( #21240 )
2023-06-14 22:06:18 -06:00
QMK Bot
3de2f94255
Merge remote-tracking branch 'origin/develop' into xap
2023-06-15 04:02:05 +00:00
QMK Bot
f594b99f92
Merge remote-tracking branch 'origin/master' into develop
2023-06-15 04:00:51 +00:00
Gastón Jorquera
92203440cd
[Keymap] Left Control is now ESC when tapped ( #21241 )
2023-06-14 22:00:13 -06:00
QMK Bot
ed415e6cfe
Merge remote-tracking branch 'origin/develop' into xap
2023-06-15 04:00:09 +00:00
QMK Bot
ee6320c7aa
Merge remote-tracking branch 'origin/master' into develop
2023-06-15 03:59:31 +00:00
Álvaro A. Volpato
87858108b5
Modernize M75H and M75S firmwares ( #21244 )
2023-06-14 21:58:55 -06:00
QMK Bot
3ae5864ace
Merge remote-tracking branch 'origin/develop' into xap
2023-06-15 03:31:04 +00:00
QMK Bot
88d9b7ee31
Merge remote-tracking branch 'origin/master' into develop
2023-06-15 03:30:22 +00:00
dztech
baa9252db2
[Keyboard] add pluto keyboard ( #21225 )
2023-06-14 20:29:39 -07:00
QMK Bot
7c81d8e7d0
Merge remote-tracking branch 'origin/develop' into xap
2023-06-15 01:46:55 +00:00
QMK Bot
9103b63354
Merge remote-tracking branch 'origin/master' into develop
2023-06-15 01:46:17 +00:00
James Young
776e980ac1
4pplet Waffling60 Rev D ISO Layout Fix and Additions ( #21236 )
...
* correct layout data
* add matrix diagram
* rename LAYOUT to LAYOUT_all
* add LAYOUT_60_iso_tsangan_split_bs_rshift
* add LAYOUT_60_iso_tsangan_split_rshift
* add LAYOUT_60_iso_wkl_split_bs_rshift
* add LAYOUT_60_iso_wkl_split_rshift
2023-06-14 18:45:37 -07:00
QMK Bot
4c7c54aaca
Merge remote-tracking branch 'origin/develop' into xap
2023-06-14 16:28:32 +00:00
QMK Bot
6fdf4baecd
Merge remote-tracking branch 'origin/master' into develop
2023-06-14 16:27:44 +00:00
Danny
f5ee7b7ed8
Add Sinc Rev. 4 ( #21130 )
...
* Fork Rev. 3 to 4
* Update RGB LED positions
* Adjust RGB positions
* Enable more RGB modes
* Update copyrights
* Add license headers to keymaps
* Use same type of license header
Co-authored-by: Joel Challis <git@zvecr.com>
* Fix I2C pins
---------
Co-authored-by: Joel Challis <git@zvecr.com>
2023-06-14 12:26:46 -04:00
QMK Bot
6c7d518820
Merge remote-tracking branch 'origin/develop' into xap
2023-06-14 14:32:35 +00:00
James Young
7bafae64f9
FJLabs Swordfish Layout Macro Refactor ( #21234 )
...
* physically arrange layout macro
Arranges the layout macro to QMK standards (left to right, row by row).
This change breaks compatibility with out-of-tree keymaps, because the
order in which the keycode arguments must be passed is changed.
* rename `LAYOUT_alice_all` to `LAYOUT_split_bs`
* add `LAYOUT_2u_bs` macro
2023-06-14 07:31:51 -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
860438d65b
Merge remote-tracking branch 'origin/develop' into xap
2023-06-14 06:28:26 +00:00
QMK Bot
6c4286152f
Merge remote-tracking branch 'origin/master' into develop
2023-06-14 06:27:47 +00:00
jonylee@hfd
4055f2a937
[Keyboard]add 5108 Keyboard. ( #21184 )
...
Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-14 00:27:08 -06:00
QMK Bot
a9a89dd810
Merge remote-tracking branch 'origin/develop' into xap
2023-06-13 15:19:21 +00:00
QMK Bot
5fd55908c6
Merge remote-tracking branch 'origin/master' into develop
2023-06-13 15:18:40 +00:00
rhmokey
55987542e1
[Keyboard] Add mokey12x2 ( #20702 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2023-06-13 09:17:55 -06:00
QMK Bot
17289ba1b8
Merge remote-tracking branch 'origin/develop' into xap
2023-06-13 15:10:03 +00:00
QMK Bot
aefdb39393
Merge remote-tracking branch 'origin/master' into develop
2023-06-13 15:09:23 +00:00
Alabahuy
1194a6f0dd
[Keyboard] jaykeeb skyline ( #21219 )
2023-06-13 09:08:37 -06:00
QMK Bot
59493a01b9
Merge remote-tracking branch 'origin/develop' into xap
2023-06-13 15:06:49 +00:00
QMK Bot
d9bea011fa
Merge remote-tracking branch 'origin/master' into develop
2023-06-13 15:05:55 +00:00
Alberto Pavano
e8b7244bb5
[Keyboard] rainkeebs trailmix ( #20189 )
...
Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-13 09:05:03 -06:00
QMK Bot
5474d12ad8
Merge remote-tracking branch 'origin/develop' into xap
2023-06-13 06:34:26 +00:00
QMK Bot
fd2a516f03
Merge remote-tracking branch 'origin/master' into develop
2023-06-13 06:33:41 +00:00
David Hoelscher
dabbc93df4
[Keyboard] Add ErgoStrafer keyboard ( #21195 )
2023-06-12 23:32:54 -07:00
QMK Bot
95e3f854ed
Merge remote-tracking branch 'origin/develop' into xap
2023-06-13 06:20:16 +00:00
Duncan Sutherland
f4529eb42b
[Keymap] Fix scheikled
keymap for dactyl_manuform/4x6
( #21206 )
2023-06-13 00:19:38 -06:00
QMK Bot
b11f447c6c
Merge remote-tracking branch 'origin/develop' into xap
2023-06-13 06:18:34 +00:00
QMK Bot
af58f26028
Merge remote-tracking branch 'origin/master' into develop
2023-06-13 06:17:56 +00:00
Joe Scotto
ca6921b1ba
[Keyboard] Add ScottoNum macropad ( #21208 )
2023-06-13 00:17:18 -06:00
QMK Bot
bf8868c15a
Merge remote-tracking branch 'origin/develop' into xap
2023-06-12 19:09:42 +00:00
QMK Bot
94aaf38177
Merge remote-tracking branch 'origin/master' into develop
2023-06-12 19:08:59 +00:00
Joe Scotto
2d838d8ba9
[Keyboard] Add ScottoFrog macropad ( #21209 )
2023-06-12 13:08:13 -06:00
QMK Bot
7687207454
Merge remote-tracking branch 'origin/develop' into xap
2023-06-12 01:13:34 +00:00
QMK Bot
84c7aaae91
Merge remote-tracking branch 'origin/master' into develop
2023-06-12 01:12:57 +00:00
Alabahuy
53f20b197b
[Keyboard] Add orba keyboard ( #21132 )
2023-06-11 18:12:19 -07:00
QMK Bot
584dc1a856
Merge remote-tracking branch 'origin/develop' into xap
2023-06-11 08:03:04 +00:00
QMK Bot
f830b53a7a
Merge remote-tracking branch 'origin/master' into develop
2023-06-11 07:56:32 +00:00
Joe Scotto
fdb2851187
[Keyboard] Add ScottoSplit Keyboard ( #20945 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-06-11 01:56:20 -06:00
QMK Bot
332a8ad1a2
Merge remote-tracking branch 'origin/develop' into xap
2023-06-11 07:56:01 +00:00
flashquark
40c3b71569
[Keyboard] Add Flashquark Horizon Z ( #21055 )
...
Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-11 01:55:06 -06:00
QMK Bot
1fcb9a0228
Merge remote-tracking branch 'origin/master' into develop
2023-06-11 07:53:05 +00:00
Joe Scotto
33c93d3a96
[Keyboard] Add Scotto34 (PCB Edition) ( #21085 )
...
Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
2023-06-11 01:52:43 -06:00
QMK Bot
acdc9ea74f
Merge remote-tracking branch 'origin/develop' into xap
2023-06-11 07:52:32 +00:00
Joe Scotto
1914fbd951
[Keyboard] Add Scotto9 handwired macropad ( #21105 )
...
Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-06-11 01:52:24 -06:00
QMK Bot
beaf6505ed
Merge remote-tracking branch 'origin/master' into develop
2023-06-11 07:51:56 +00:00
FanXingStudio
bfdfeb6f3f
[Keyboard] Add kibou/winter ( #21161 )
2023-06-11 01:51:17 -06:00
QMK Bot
ab469db17a
Merge remote-tracking branch 'origin/develop' into xap
2023-06-11 07:49:34 +00:00
Duncan Sutherland
cf6c92426d
[Keyboard] correct and modernise dactyl_manuform/6x7
variant ( #21176 )
2023-06-11 01:48:56 -06:00
QMK Bot
0c527df562
Merge remote-tracking branch 'origin/develop' into xap
2023-06-11 06:28:36 +00:00
QMK Bot
55f226159b
Merge remote-tracking branch 'origin/master' into develop
2023-06-11 06:27:53 +00:00
blindassassin111
8cd9f07c30
[Keyboard] Adding OSAv2 Topre PCB ( #21080 )
2023-06-10 23:27:13 -07:00
QMK Bot
f4e4d197d7
Merge remote-tracking branch 'origin/develop' into xap
2023-06-10 23:34:54 +00:00
QMK Bot
c4b116875f
Merge remote-tracking branch 'origin/master' into develop
2023-06-10 23:34:17 +00:00
James Young
dd8b4dce55
Atreyu: correct layout data ( #21197 )
2023-06-10 16:33:33 -07:00
QMK Bot
e5ac5405f6
Merge remote-tracking branch 'origin/develop' into xap
2023-06-10 20:36:38 +00:00
QMK Bot
38edc481d1
Merge remote-tracking branch 'origin/master' into develop
2023-06-10 20:35:55 +00:00
Allen Choi
57b23b8d96
[Keymap] thunderbird2086 layer status with RGB lighting/matrix ( #21063 )
2023-06-10 14:35:15 -06:00
QMK Bot
595f08f8b6
Merge remote-tracking branch 'origin/develop' into xap
2023-06-10 15:03:04 +00:00
QMK Bot
ea70b361ce
Merge remote-tracking branch 'origin/master' into develop
2023-06-10 15:02:22 +00:00
Florent Linguenheld
eee9a53a80
Up keymap ( #20769 )
...
flinguenheld keymap aurora sweep
2023-06-10 16:01:44 +01:00
QMK Bot
fbfc0c3e24
Merge remote-tracking branch 'origin/develop' into xap
2023-06-10 14:59:50 +00:00
QMK Bot
0d574cd82e
Merge remote-tracking branch 'origin/master' into develop
2023-06-10 14:59:13 +00:00
Cipulot
08289fc53a
EC Alveus ( #20840 )
...
Cipulot's EC Alveus PR
2023-06-10 15:58:36 +01:00
QMK Bot
cac721630e
Merge remote-tracking branch 'origin/develop' into xap
2023-06-10 02:18:15 +00:00
QMK Bot
a9a68ff4f1
Merge remote-tracking branch 'origin/master' into develop
2023-06-10 02:17:31 +00:00
Jared
e01e3fc866
Typo Correction in planck/rev7 readme.md ( #21194 )
...
Corrected typo explaining encoder requirements.
2023-06-09 22:16:46 -04:00
QMK Bot
9e0d701a4c
Merge remote-tracking branch 'origin/develop' into xap
2023-06-09 23:50:15 +00:00
QMK Bot
b9d78e4828
Merge remote-tracking branch 'origin/master' into develop
2023-06-09 23:49:38 +00:00
Joe Scotto
a875f7f038
[Keyboard] Add ScottoGame Keyboard ( #20940 )
2023-06-09 17:48:55 -06:00
QMK Bot
ee85b4b588
Merge remote-tracking branch 'origin/develop' into xap
2023-06-09 18:35:44 +00:00
QMK Bot
c8e47bea98
Merge remote-tracking branch 'origin/master' into develop
2023-06-09 18:35:05 +00:00
Ryan
e3b80b4151
Remove some keymap-level info.jsons ( #21191 )
2023-06-09 19:34:24 +01:00
QMK Bot
161ccb9d57
Merge remote-tracking branch 'origin/develop' into xap
2023-06-09 01:47:29 +00:00
QMK Bot
4c60ebdbe0
Merge remote-tracking branch 'origin/master' into develop
2023-06-09 01:46:47 +00:00
Jack Humbert
232281946d
Adds Planck Rev 7 & Updates rev6_drop to Matrix Lite Implementation ( #21175 )
...
* adds planck/rev7
* Remove config.h include
Co-authored-by: Drashna Jaelre <drashna@live.com>
* convert planck matrices to lite implementation
---------
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-06-08 21:46:09 -04:00
QMK Bot
83a6ca4b96
Merge remote-tracking branch 'origin/develop' into xap
2023-06-08 01:48:24 +00:00
QMK Bot
9a6056d09c
Merge remote-tracking branch 'origin/master' into develop
2023-06-08 01:47:47 +00:00
NortonTech
d042b92e7a
Add NortonTech handwired keypad (NortonTechPad) ( #21148 )
2023-06-08 02:47:06 +01:00
QMK Bot
0bed04a123
Merge remote-tracking branch 'origin/develop' into xap
2023-06-08 01:04:42 +00:00
QMK Bot
cc64247ebf
Merge remote-tracking branch 'origin/master' into develop
2023-06-08 01:03:58 +00:00
biuboom-jun
f136171753
add kibou/wendy ( #21150 )
2023-06-08 02:03:17 +01:00
QMK Bot
4bb9b38912
Merge remote-tracking branch 'origin/develop' into xap
2023-06-07 23:59:27 +00:00
QMK Bot
a059d121fa
Merge remote-tracking branch 'origin/master' into develop
2023-06-07 23:57:41 +00:00
QMK Bot
f7d54a127f
Merge remote-tracking branch 'origin/develop' into xap
2023-06-07 23:57:35 +00:00
James Young
dffbe1e655
monoflex60: fix LAYOUT_60_iso_tsangan implementation ( #21158 )
2023-06-08 00:57:05 +01:00
QMK Bot
3fa92a4e7e
Merge remote-tracking branch 'origin/master' into develop
2023-06-07 23:56:53 +00:00
James Young
57c5f3e674
poker87d: correct layout data ( #21159 )
2023-06-08 00:55:49 +01:00
QMK Bot
217708f7f5
Merge remote-tracking branch 'origin/develop' into xap
2023-06-06 21:55:48 +00:00
QMK Bot
a02230f6fc
Merge remote-tracking branch 'origin/master' into develop
2023-06-06 21:55:10 +00:00
James Young
bb57aa28e5
peej/tripel: correct layout data ( #21145 )
...
Corrects the layout data for all three versions of the Peej Tripel.
2023-06-06 22:54:31 +01:00
QMK Bot
1772060e2e
Merge remote-tracking branch 'origin/develop' into xap
2023-06-06 21:47:37 +00:00
QMK Bot
ff1d7d287c
Merge remote-tracking branch 'origin/master' into develop
2023-06-06 21:46:52 +00:00
James Young
45d060805e
xelus/rs108: correct layout data ( #21146 )
2023-06-06 22:46:15 +01:00
QMK Bot
9f78e36c9b
Merge remote-tracking branch 'origin/develop' into xap
2023-06-06 07:05:19 +00:00
QMK Bot
64eb9852d2
Merge remote-tracking branch 'origin/master' into develop
2023-06-06 07:04:38 +00:00
Travis Mick
dd9712c40e
[Keyboard] Add egg58 ( #21021 )
2023-06-06 00:03:57 -07:00
QMK Bot
d821f1ef28
Merge remote-tracking branch 'origin/develop' into xap
2023-06-06 05:47:37 +00:00
QMK Bot
6c9c9489d2
Merge remote-tracking branch 'origin/master' into develop
2023-06-06 05:46:59 +00:00
Joe Scotto
97014f0722
[Keyboard] Add Scotto36 handwired keyboard ( #21104 )
...
Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
2023-06-05 23:46:21 -06:00
QMK Bot
8d26b77944
Merge remote-tracking branch 'origin/develop' into xap
2023-06-06 05:44:00 +00:00
QMK Bot
f61abde116
Merge remote-tracking branch 'origin/master' into develop
2023-06-06 05:43:14 +00:00
Joe Scotto
eaef139fc3
[Keyboard] Add Scotto40 handwired keyboard ( #21103 )
2023-06-05 23:42:27 -06:00
QMK Bot
3d2343c1d8
Merge remote-tracking branch 'origin/develop' into xap
2023-06-06 05:35:41 +00:00
QMK Bot
5b3e41c1ca
Merge remote-tracking branch 'origin/master' into develop
2023-06-06 05:35:05 +00:00
Joe Scotto
e1c4b7ce30
[Keyboard] Add ScottoStarter handwired keyboard ( #21101 )
2023-06-05 23:34:28 -06:00
QMK Bot
e7ad836f70
Merge remote-tracking branch 'origin/develop' into xap
2023-06-06 05:15:11 +00:00
QMK Bot
4c928b0680
Merge remote-tracking branch 'origin/master' into develop
2023-06-06 05:14:31 +00:00
FanXingStudio
9167e66ca7
[Keyboard] add kibou/harbour ( #21131 )
2023-06-05 23:13:47 -06:00
QMK Bot
bde0f87c7d
Merge remote-tracking branch 'origin/develop' into xap
2023-06-06 01:08:54 +00:00
Ryan
c9cf9712aa
Move RGBLED_SPLIT
to data driven ( #21113 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
2023-06-06 11:08:04 +10:00
QMK Bot
d2ae87466c
Merge remote-tracking branch 'origin/develop' into xap
2023-06-05 20:44:23 +00:00
QMK Bot
f91ca76c78
Merge remote-tracking branch 'origin/master' into develop
2023-06-05 20:43:42 +00:00
Jeayo Keh
04812e9443
[Keyboard] Add soda/mango ( #21100 )
...
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2023-06-05 14:43:02 -06:00
QMK Bot
85b1ab7835
Merge remote-tracking branch 'origin/develop' into xap
2023-06-05 20:35:39 +00:00
QMK Bot
3617cbde7a
Merge remote-tracking branch 'origin/master' into develop
2023-06-05 20:35:00 +00:00
Will Hedges
8f108d1bbc
[Keyboard] Upddate bioi/G60BLE to use bluetooth ( #21120 )
...
Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-05 14:34:22 -06:00
QMK Bot
9322963cbd
Merge remote-tracking branch 'origin/develop' into xap
2023-06-05 06:00:14 +00:00
QMK Bot
83a726c30e
Merge remote-tracking branch 'origin/master' into develop
2023-06-05 05:59:35 +00:00
Moritz Plattner
7b57c4ecf6
fixed E80 1800 layout macros ( #21125 )
2023-06-05 06:58:59 +01:00
QMK Bot
33d873957e
Merge remote-tracking branch 'origin/develop' into xap
2023-06-04 01:49:52 +00:00
QMK Bot
2d09305445
Merge remote-tracking branch 'origin/master' into develop
2023-06-04 01:49:13 +00:00
Ramiro Bou
67b9f56f22
Fix USB PIDs on Churrosoft Deck-8 ( #21126 )
2023-06-04 02:48:29 +01:00
QMK Bot
1e2b75a886
Merge remote-tracking branch 'origin/develop' into xap
2023-06-04 01:12:08 +00:00
QMK Bot
220dad26d0
Merge remote-tracking branch 'origin/master' into develop
2023-06-04 01:11:30 +00:00
mechlovin
698e31a2b0
[Keyboard] Zed65 Rev.1 - Update info.json ( #21122 )
2023-06-04 02:10:53 +01:00
QMK Bot
d99511475f
Merge remote-tracking branch 'origin/develop' into xap
2023-06-03 20:41:06 +00:00
QMK Bot
ce94daf3d8
Merge remote-tracking branch 'origin/master' into develop
2023-06-03 20:39:49 +00:00
QMK Bot
caa354fa76
Merge remote-tracking branch 'origin/develop' into xap
2023-06-03 20:39:35 +00:00
Guido Bartolucci
23a9d1ffc7
[Keyboard] Add Andean Condor ( #21118 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
2023-06-03 14:39:13 -06:00
QMK Bot
a3c58ba567
Merge remote-tracking branch 'origin/master' into develop
2023-06-03 20:38:54 +00:00
Ramiro Bou
f6bbd4d2c5
[Keyboard] Add Churrosoft Deck-8 ( #21119 )
...
Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-03 14:38:09 -06:00
QMK Bot
ec487ab958
Merge remote-tracking branch 'origin/develop' into xap
2023-06-03 07:05:03 +00:00
QMK Bot
7d676f1aa6
Merge remote-tracking branch 'origin/master' into develop
2023-06-03 07:04:21 +00:00
mechlovin
f4a608255a
[Keyboard] Add the Zed65 rev.1 PCB ( #21043 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-03 01:03:45 -06:00
QMK Bot
fd964f16fa
Merge remote-tracking branch 'origin/develop' into xap
2023-06-02 07:47:21 +00:00
QMK Bot
ef788c68f4
Merge remote-tracking branch 'origin/master' into develop
2023-06-02 07:46:36 +00:00
yiancar
ae5bcaac0d
[keyboard] Phoenix ( #21051 )
...
* Update keyboards/cablecardesigns/phoenix/
2023-06-02 08:45:54 +01:00
QMK Bot
99e52f962d
Merge remote-tracking branch 'origin/develop' into xap
2023-06-01 16:25:50 +00:00
Ryan
a4ed6ad0f5
Unicodemap keycodes rename ( #21092 )
2023-06-01 17:25:08 +01:00
QMK Bot
b3288fbd73
Merge remote-tracking branch 'origin/develop' into xap
2023-06-01 14:12:12 +00:00
QMK Bot
45c9bc4e55
Merge remote-tracking branch 'origin/master' into develop
2023-06-01 14:11:31 +00:00
DeskDaily
b110a09886
[Keyboard] Add lightweight65 keyboard ( #21034 )
...
Co-authored-by: Neil Brian Ramirez <nightlykeyboards@gmail.com>
Co-authored-by: Neil Brian Ramirez <nightlyboards@gmail.com>
2023-06-01 07:10:47 -07:00
QMK Bot
de45dc9f05
Merge remote-tracking branch 'origin/develop' into xap
2023-06-01 09:27:28 +00:00
QMK Bot
857e9b74d6
Merge remote-tracking branch 'origin/master' into develop
2023-06-01 09:26:41 +00:00
Sergi Meseguer
c805c10672
[Keymap] z12 zigotica keymap tweaks ( #20990 )
2023-06-01 02:25:49 -07:00
QMK Bot
863489e759
Merge remote-tracking branch 'origin/develop' into xap
2023-05-31 19:04:20 +00:00
QMK Bot
6156972781
Merge remote-tracking branch 'origin/master' into develop
2023-05-31 19:03:39 +00:00
kkokdae
81bc0925e9
[Keymap] Modify kkokdae keymap for keyboardio/atreus ( #21037 )
2023-05-31 12:02:58 -07:00
QMK Bot
95b86ba072
Merge remote-tracking branch 'origin/develop' into xap
2023-05-31 18:49:55 +00:00
3araht
5a26e5e790
[Keymap] transpose added to giabalanai keymaps ( #21054 )
2023-05-31 11:48:56 -07:00
QMK Bot
66f8330c76
Merge remote-tracking branch 'origin/develop' into xap
2023-05-31 18:48:42 +00:00
CoffeeIsLife
c2ddd77e0d
[Keymap] Cleanup coffeeislife87 keymap and remove features ( #21061 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Fae <faenkhauser@gmail.com>
2023-05-31 11:46:59 -07:00
QMK Bot
5ce128651c
Merge remote-tracking branch 'origin/develop' into xap
2023-05-31 18:45:25 +00:00
Drashna Jaelre
3a3e5abac9
[Keymap] Drashna Keymap updates for 0.21.0 ( #21073 )
2023-05-31 11:44:06 -07:00
QMK Bot
1d3ada3b5b
Merge remote-tracking branch 'origin/develop' into xap
2023-05-28 03:39:08 +00:00
Nick Brassel
8c9f54d70b
Encoder map: NUM_DIRECTIONS ( #21066 )
2023-05-28 13:38:24 +10: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
bcd5e98bfd
Merge remote-tracking branch 'origin/develop' into xap
2023-05-27 04:50:36 +00:00
Nick Brassel
e759230706
Fix up keebio/cepstrum
( #21062 )
2023-05-27 05:49:57 +01:00
QMK Bot
f42d4a10d9
Merge remote-tracking branch 'origin/develop' into xap
2023-05-27 02:28:26 +00:00
Ryan
363bfdbfda
Move RGBLIGHT_LIMIT_VAL
to data driven ( #20974 )
...
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-05-27 12:27:44 +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
QMK Bot
98f9bd2eab
Merge remote-tracking branch 'origin/develop' into xap
2023-05-25 15:41:48 +00:00
Drashna Jaelre
ed69d78f27
[Bug][Keyboard] Fix key display on Corne OLED ( #21044 )
2023-05-25 16:41:12 +01:00
QMK Bot
345659296e
Merge remote-tracking branch 'origin/develop' into xap
2023-05-24 18:49:12 +00:00
QMK Bot
6d93d8b56a
Merge remote-tracking branch 'origin/master' into develop
2023-05-24 18:48:31 +00:00
Danny
f9c32974ef
Add encoder map FoldKB in VIA ( #21038 )
2023-05-24 19:47:46 +01:00
QMK Bot
6c3e29062a
Merge remote-tracking branch 'origin/develop' into xap
2023-05-24 07:55:24 +00:00
QMK Bot
a12c1e0bcf
Merge remote-tracking branch 'origin/master' into develop
2023-05-24 07:54:46 +00:00
Xyverz
618d0f05f4
Removed unneeded layers from xyverz keymaps ( #21008 )
2023-05-24 08:54:06 +01:00
QMK Bot
1c80cb8d8e
Merge remote-tracking branch 'origin/develop' into xap
2023-05-22 03:41:13 +00:00
Ryan
595f7db384
Remove HHKB RN42 code ( #21007 )
2023-05-22 04:40:34 +01:00
QMK Bot
c772e5e2fd
Merge remote-tracking branch 'origin/develop' into xap
2023-05-21 15:58:25 +00:00
QMK Bot
5261ac9f0c
Merge remote-tracking branch 'origin/master' into develop
2023-05-21 15:57:48 +00:00
Ananya Kirti
08a8d35bc3
[Keyboard] Added Support for trainpad ( #20973 )
...
* Added Support for trainpad
added support for trainpad
* corrected capitalisation
corrected capitalisation
* Update keyboards/trainpad/keymaps/via/keymap.c
* Update keyboards/trainpad/info.json
* Update keyboards/trainpad/keymaps/default/keymap.c
* Update readme.md
updated readme to remove handwire, and corrected number of keys
* removed config.h, trainpad.c and trainpad.h
removed config.h, trainpad.c and trainpad.h
* updated readme
upadted readme to correct capitalisation
* Update keyboards/trainpad/info.json
* Update keyboards/trainpad/info.json
* Update keyboards/trainpad/rules.mk
* updated Readme
updated Readme
* Update keyboards/trainpad/readme.md
2023-05-21 08:57:08 -07:00
QMK Bot
107eb2527f
Merge remote-tracking branch 'origin/develop' into xap
2023-05-20 18:52:16 +00:00
Sergey Vlasov
6a7ba7a29d
rart/rart80:via: restore rules.mk after #20334 ( #21002 )
...
PR #20334 accidentally removed the `rules.mk` file from the `via` keymap
for `rart/rart80`; restore that file.
2023-05-20 19:51:26 +01:00
QMK Bot
8d7131673d
Merge remote-tracking branch 'origin/develop' into xap
2023-05-20 12:14:17 +00:00
Drashna Jaelre
b93f05dc35
[Keyboard] Fixup Crkbd default keymap ( #20962 )
2023-05-20 22:13:39 +10: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
Less/Rikki
9dec31d056
[keyboard] update ymdk/id75/rules.mk for develop ( #20592 )
2023-05-20 22:10:44 +10: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
b285156286
Merge remote-tracking branch 'origin/develop' into xap
2023-05-20 12:07:53 +00:00
Duncan Sutherland
d1395ca4d5
add additional layouts to dactyl_manuform
variants ( #20688 )
2023-05-20 22:06:53 +10:00
QMK Bot
07452b031b
Merge remote-tracking branch 'origin/develop' into xap
2023-05-20 00:23:28 +00:00
QMK Bot
4dcb46e284
Merge remote-tracking branch 'origin/master' into develop
2023-05-20 00:22:52 +00:00
Jay Greco
449240f198
scramble: Add XOSC delay for startup ( #20991 )
2023-05-20 01:22:07 +01:00
QMK Bot
14de63a121
Merge remote-tracking branch 'origin/develop' into xap
2023-05-18 16:22:26 +00:00
QMK Bot
78afa1164d
Merge remote-tracking branch 'origin/master' into develop
2023-05-18 16:21:45 +00:00
adophoxia
a4771e4fe4
[Keyboard] Add Fancytech Fancyalice66 ( #20647 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-05-18 18:21:07 +02:00
QMK Bot
2b54e67e0f
Merge remote-tracking branch 'origin/develop' into xap
2023-05-18 15:51:08 +00:00
QMK Bot
4b1a98cb82
Merge remote-tracking branch 'origin/master' into develop
2023-05-18 15:50:21 +00:00
Danny
b50abd370d
Define RGB_DI_PIN directly instead of using another define ( #20983 )
2023-05-18 16:49:35 +01:00
QMK Bot
d831a06dd2
Merge remote-tracking branch 'origin/develop' into xap
2023-05-18 10:30:22 +00:00
QMK Bot
757f5b0c68
Merge remote-tracking branch 'origin/master' into develop
2023-05-18 10:29:45 +00:00
Danny
7e6ad6d28c
Add Cepstrum Rev. 1 Keyboard ( #20721 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-05-18 06:29:06 -04:00
QMK Bot
edb6d51c4c
Merge remote-tracking branch 'origin/develop' into xap
2023-05-17 19:02:18 +00:00
QMK Bot
905da58775
Merge remote-tracking branch 'origin/master' into develop
2023-05-17 19:01:48 +00:00
James Young
ff22015ba0
AEBoards Aegis Layout Additions ( #20960 )
...
* add matrix_diagram.md
* rename LAYOUT_aegis to LAYOUT_all
* info.json: apply friendly formatting
* add LAYOUT_numpad with reference keymap
* add LAYOUT_2u_bs_275u_rshift with reference keymap
2023-05-17 12:01:39 -07:00
Vino Rodrigues
1aa52124ca
[Keyboard] Add Moondrop Dash75 ( #20890 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-05-17 12:01:08 -07:00
QMK Bot
805f9a37af
Merge remote-tracking branch 'origin/develop' into xap
2023-05-16 07:00:45 +00:00
Ryan
17de141c92
Add missing layout data for a handful of boards ( #20931 )
...
* Add missing layout data for a handful of boards
* typo
* Add missing layouts for stoutgat
* Add missing layout for j80
* Replace missing layout with alias for wraith
* Add missing layout for matrix/me
* Add missing layout for satisfaction75/prototype
* Apply suggestions from code review
* Rename wt80-a layouts
* Rename rosa layouts
* Add missing layouts for naked48
* Add missing layouts for naked60
* Add missing layouts for uma
* Remove unused and pointless `LAYOUT_stack` for buzzard
* Add missing layout for keyboardio/model01
* Add missing layout for smk65 revf
* Fix via keymap for h60
* Add missing layout for jabberwocky/v1
* Apply suggestions from code review
* Add missing layout for m3n3van
* Add missing layout for giabalanai
* Add missing layouts for treadstone48/rev1
* Add missing layouts for squiggle
* Update keyboards/marksard/treadstone48/rev1/info.json
2023-05-16 00:00:08 -07:00
QMK Bot
d70a683214
Merge remote-tracking branch 'origin/develop' into xap
2023-05-16 05:53:20 +00:00
zvecr
f1e44f5844
Merge remote-tracking branch 'origin/master' into develop
2023-05-16 06:53:18 +01:00
QMK Bot
a7cd661c9d
Merge remote-tracking branch 'origin/develop' into xap
2023-05-16 05:18:31 +00:00
James Young
631e4e50dd
ADPenrose Akemipad Layout Addition ( #20957 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_numpad with reference keymap
2023-05-15 22:17:55 -07:00
vushthestampede
feee0f5154
Update tg4x RGB LED count ( #20955 )
2023-05-15 17:02:55 +01:00
QMK Bot
6b5d493da5
Merge remote-tracking branch 'origin/develop' into xap
2023-05-15 15:57:42 +00:00