bflatastic
|
e6d4ea7c60
|
Merge PR #1223
# Conflicts:
# crates/catalog/src/lock.rs
# docs/parity-checklist.md
|
2026-10-13 12:29:10 +07:00 |
|
bflatastic
|
2f5ba5e69a
|
Merge PR #1148
# Conflicts:
# ROADMAP.md
# docs/gaps.md
# docs/gpu-pipeline.md
# docs/target-app-parity.md
|
2026-10-13 12:28:57 +07:00 |
|
bflatastic
|
a92066c47c
|
Merge PR #842
# Conflicts:
# crates/pipeline/src/spots.rs
# docs/gaps.md
# docs/parity-checklist.md
|
2026-10-13 12:28:56 +07:00 |
|
bflatastic
|
ac40fa3882
|
Merge PR #1195
# Conflicts:
# docs/gaps.md
# docs/parity-checklist.md
# docs/ui-parity.md
|
2026-10-13 12:28:52 +07:00 |
|
bflatastic
|
5f81dfcdde
|
Merge PR #1014
# Conflicts:
# crates/pipeline/src/spots.rs
# docs/gaps.md
# docs/parity-checklist.md
|
2026-10-13 12:28:48 +07:00 |
|
bflatastic
|
9b5f38039d
|
Merge PR #1002
# Conflicts:
# crates/pipeline/src/spots.rs
|
2026-10-13 12:28:46 +07:00 |
|
bflatastic
|
789eb13f8a
|
Merge PR #1056
|
2026-10-13 12:28:43 +07:00 |
|
bflatastic
|
6690034b10
|
Merge PR #1067
# Conflicts:
# crates/ui-egui/locales/de-formats.json
# crates/ui-egui/locales/de.json
# crates/ui-egui/locales/es-formats.json
# crates/ui-egui/locales/es.json
# crates/ui-egui/locales/fr-formats.json
# crates/ui-egui/locales/fr.json
# crates/ui-egui/locales/ja-formats.json
# crates/ui-egui/locales/ja.json
# crates/ui-egui/locales/pt-br-formats.json
# crates/ui-egui/locales/pt-br.json
# crates/ui-egui/locales/ru-formats.json
# crates/ui-egui/locales/ru.json
# crates/ui-egui/locales/uk-formats.json
# crates/ui-egui/locales/uk.json
# crates/ui-egui/locales/zh-hans-formats.json
# crates/ui-egui/locales/zh-hans.json
# crates/ui-egui/locales/zh-hant-formats.json
# crates/ui-egui/locales/zh-hant.json
# docs/gaps.md
|
2026-10-13 12:28:42 +07:00 |
|
bflatastic
|
c0818c9dd0
|
Merge PR #1304
|
2026-10-13 12:28:39 +07:00 |
|
bflatastic
|
cc0df6474a
|
Merge PR #1313
|
2026-10-13 12:28:38 +07:00 |
|
bflatastic
|
72cc6e7fdf
|
Merge PR #1399
|
2026-10-13 12:28:38 +07:00 |
|
bflatastic
|
d84b295e23
|
Merge PR #1124
# Conflicts:
# crates/ui-egui/locales/de-formats.json
# crates/ui-egui/locales/de.json
# crates/ui-egui/locales/es-formats.json
# crates/ui-egui/locales/es.json
# crates/ui-egui/locales/fr-formats.json
# crates/ui-egui/locales/fr.json
# crates/ui-egui/locales/ja-formats.json
# crates/ui-egui/locales/ja.json
# crates/ui-egui/locales/pt-br-formats.json
# crates/ui-egui/locales/pt-br.json
# crates/ui-egui/locales/ru-formats.json
# crates/ui-egui/locales/ru.json
# crates/ui-egui/locales/uk-formats.json
# crates/ui-egui/locales/uk.json
# crates/ui-egui/locales/zh-hans-formats.json
# crates/ui-egui/locales/zh-hans.json
# crates/ui-egui/locales/zh-hant-formats.json
# crates/ui-egui/locales/zh-hant.json
# docs/parity-checklist.md
# docs/whats-new.md
|
2026-10-13 12:28:38 +07:00 |
|
bflatastic
|
e0c1c415e5
|
Merge PR #1128
# Conflicts:
# docs/parity-checklist.md
# docs/whats-new.md
|
2026-10-13 12:28:36 +07:00 |
|
bflatastic
|
1ea573ebfd
|
Merge PR #1152
# Conflicts:
# docs/parity-checklist.md
|
2026-10-13 12:28:33 +07:00 |
|
bflatastic
|
3eb3722e2c
|
Merge PR #1147
|
2026-10-13 12:28:32 +07:00 |
|
bflatastic
|
8e04b5089a
|
Merge PR #1385
|
2026-10-13 12:28:32 +07:00 |
|
bflatastic
|
b7714cfc68
|
Merge PR #1289
|
2026-10-13 12:28:31 +07:00 |
|
bflatastic
|
5f44b7f4b3
|
Merge PR #1287
|
2026-10-13 12:28:31 +07:00 |
|
bflatastic
|
639ff976e2
|
Merge PR #1117
# Conflicts:
# docs/parity-checklist.md
# docs/whats-new.md
|
2026-10-13 12:28:31 +07:00 |
|
BFlat
|
68c924047d
|
Merge pull request #1431: integration batch 33 (85 reviewed contributor PRs)
Integration batch 33: main green again, 85 reviewed contributor PRs
|
2026-10-13 12:16:54 +07:00 |
|
bflatastic
|
2397927681
|
Merge main (batch 32a landed)
# Conflicts:
# apps/lightcraft-cli/src/main.rs
# crates/codecs/src/lib.rs
# crates/mcp/src/headless.rs
|
2026-10-13 12:09:34 +07:00 |
|
bflatastic
|
ece9bd83e4
|
Batch 32: one tracker row per id (rows two PRs both edited), parity summary refreshed
|
2026-10-13 12:05:26 +07:00 |
|
bflatastic
|
7693cbf3ae
|
Revert "Merge PR #1262": the toast as a widget takes the clicks meant for what is under it (a dialog's button)
|
2026-10-13 11:54:39 +07:00 |
|
bflatastic
|
2e877ad476
|
Batch 32: arrows over a slider nudge it (#1264), the toast area doesn't fade in (#1262), #1282's test runs on Windows
|
2026-10-13 11:42:47 +07:00 |
Brandon Thomas
|
b709180587
|
Merge pull request from storytold/claude/integrate-batch-32 (batch 32a)
Integration batch 32a: 8 reviewed contributor PRs
|
2026-10-13 00:27:00 -04:00 |
|
bflatastic
|
1d70cf6358
|
Batch 32: the import tool tests date their fixtures (undated files take the file's date, #1216)
|
2026-10-13 11:20:47 +07:00 |
|
Brandon Thomas
|
2f0931d3ca
|
Batch 32: rustfmt after merges
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
2026-10-13 00:13:49 -04:00 |
|
Brandon Thomas
|
a1035f1372
|
Merge PR #997
|
2026-10-13 00:13:41 -04:00 |
|
Brandon Thomas
|
d5b8d52e1d
|
Merge PR #1262
|
2026-10-13 00:13:41 -04:00 |
|
Brandon Thomas
|
6568a7ae16
|
Merge PR #1260
|
2026-10-13 00:13:40 -04:00 |
|
bflatastic
|
d752076339
|
Batch 32: fixes for PRs merged together (#984 leap-year lint, #1344 ColorData field, #1187 preset panel builds)
|
2026-10-13 11:11:02 +07:00 |
|
bflatastic
|
702f90bfc9
|
Batch 32: close the tests two merges added at one place; cargo fmt
|
2026-10-13 11:08:16 +07:00 |
|
bflatastic
|
fa3dfbbc4a
|
Merge PR #1238
# Conflicts:
# crates/pipeline/src/spots.rs
# crates/ui-egui/src/panels/edit.rs
# docs/parity-checklist.md
|
2026-10-13 11:06:46 +07:00 |
|
bflatastic
|
84d6849cf3
|
Merge PR #1216
# Conflicts:
# crates/engine/src/files.rs
# crates/ui-egui/locales/de-formats.json
# crates/ui-egui/locales/de.json
# crates/ui-egui/locales/es-formats.json
# crates/ui-egui/locales/es.json
# crates/ui-egui/locales/fr-formats.json
# crates/ui-egui/locales/fr.json
# crates/ui-egui/locales/ja-formats.json
# crates/ui-egui/locales/ja.json
# crates/ui-egui/locales/pt-br-formats.json
# crates/ui-egui/locales/pt-br.json
# crates/ui-egui/locales/ru-formats.json
# crates/ui-egui/locales/ru.json
# crates/ui-egui/locales/uk-formats.json
# crates/ui-egui/locales/uk.json
# crates/ui-egui/locales/zh-hans-formats.json
# crates/ui-egui/locales/zh-hans.json
# crates/ui-egui/locales/zh-hant-formats.json
# crates/ui-egui/locales/zh-hant.json
# docs/parity-checklist.md
|
2026-10-13 11:06:28 +07:00 |
|
bflatastic
|
ed1d641f22
|
Merge PR #1174
# Conflicts:
# crates/catalog/src/lock.rs
# crates/pipeline/src/spots.rs
# docs/parity-checklist.md
|
2026-10-13 11:06:26 +07:00 |
|
bflatastic
|
692ab7f7c2
|
Merge PR #1235
# Conflicts:
# docs/whats-new.md
|
2026-10-13 11:05:55 +07:00 |
|
bflatastic
|
32253d862a
|
Merge PR #1017
# Conflicts:
# crates/pipeline/src/spots.rs
# docs/gaps.md
# docs/parity-checklist.md
|
2026-10-13 11:05:54 +07:00 |
|
bflatastic
|
4e78514948
|
Merge PR #1324
# Conflicts:
# docs/gaps.md
# docs/parity-checklist.md
# docs/raw-parity.md
# docs/whats-new.md
|
2026-10-13 11:05:53 +07:00 |
|
bflatastic
|
bac147a460
|
Merge PR #1189
# Conflicts:
# docs/parity-checklist.md
|
2026-10-13 11:05:48 +07:00 |
|
bflatastic
|
2181c69162
|
Merge PR #1151
# Conflicts:
# docs/whats-new.md
|
2026-10-13 11:05:47 +07:00 |
|
bflatastic
|
963d4f327a
|
Merge PR #1114
|
2026-10-13 11:05:45 +07:00 |
|
bflatastic
|
97f8b8c87c
|
Merge PR #1024
# Conflicts:
# crates/ui-egui/locales/es.json
|
2026-10-13 11:05:45 +07:00 |
|
bflatastic
|
8df468bfc6
|
Merge PR #1246
# Conflicts:
# crates/pipeline/src/spots.rs
# docs/parity-checklist.md
|
2026-10-13 11:05:44 +07:00 |
|
bflatastic
|
8ca6a835ec
|
Merge PR #1411
# Conflicts:
# crates/ui-egui/locales/pt-br.json
# docs/whats-new.md
|
2026-10-13 11:05:35 +07:00 |
|
bflatastic
|
251397694e
|
Merge PR #1302
# Conflicts:
# crates/preview/src/tests.rs
|
2026-10-13 11:04:34 +07:00 |
|
bflatastic
|
94808da369
|
Merge PR #1250
# Conflicts:
# crates/ui-egui/src/tests_panels.rs
|
2026-10-13 11:04:33 +07:00 |
|
bflatastic
|
edfe7c6351
|
Merge PR #1242
# Conflicts:
# crates/ui-egui/src/tests_panels.rs
# docs/parity-checklist.md
|
2026-10-13 11:04:32 +07:00 |
|
bflatastic
|
95d519ae64
|
Batch 32: cargo fmt
|
2026-10-13 11:04:18 +07:00 |
|
bflatastic
|
1c473ed64c
|
Merge PR #1361
|
2026-10-13 11:03:53 +07:00 |
|
bflatastic
|
cb8aa0b017
|
Merge PR #1341
|
2026-10-13 11:03:11 +07:00 |