e7e12c19c4
Merge pull request 'feat: forward-port Kindred Create onto FreeCAD 1.2.0-dev' ( #187 ) from kindred-on-upstream-1.2 into main
...
Deploy Docs / build-and-deploy (push) Successful in 54s
Build and Test / build (push) Has started running
Reviewed-on: #187
2026-02-14 16:33:57 +00:00
forbes
3c64298e40
merge: incorporate origin/main history for clean PR merge
...
Build and Test / build (pull_request) Has been cancelled
Merge origin/main (FreeCAD 1.0.0 + Kindred) into kindred-on-upstream-1.2
(FreeCAD 1.2.0-dev + Kindred) using 'ours' strategy. This makes origin/main
an ancestor of our branch so the PR can merge cleanly.
All Kindred files were already copied in earlier commits. The 'ours' strategy
preserves the upstream 1.2.0-dev codebase with all Kindred patches applied.
2026-02-14 10:31:10 -06:00
forbes
8e60dda810
fix: add missing Kindred test files from origin/main
2026-02-14 10:31:00 -06:00
forbes
831ad1376a
fix: resolve PR conflicts with origin/main
...
Build and Test / build (pull_request) Failing after 4m45s
- Remove .github/FUNDING.yml (upstream FreeCAD only, not Kindred)
- Sync .gitignore, .pre-commit-config.yaml, .pylintrc from origin/main
- Sync README.md, cMake/FindNETGEN.cmake from origin/main
- Sync pixi.lock, pixi.toml from origin/main
- Reset mods/ztools submodule pointer to match origin/main
2026-02-14 10:23:44 -06:00
forbes
9809ff852c
feat: .kc file format — Layer 1 (format registration)
...
Cherry-picked from feat/kc-file-format-layer1 (723a8c98d5
2026-02-13 14:10:36 -06:00
forbes
54031edede
cherry-pick: ab71902a4c
2026-02-13 14:09:53 -06:00
forbes
3238b30fd8
cherry-pick: 2b0c6774c0
2026-02-13 14:09:53 -06:00
forbes
dcb11f5817
cherry-pick: f71decca08
2026-02-13 14:09:53 -06:00
forbes
9a222823c8
cherry-pick: 1f49e3fa6d
2026-02-13 14:09:52 -06:00
forbes
54f8006e24
cherry-pick #32 : MDI pre-document tab for Silo new item ( 70118201b0)
2026-02-13 14:09:44 -06:00
forbes
30cc226bf6
cherry-pick #31 : window flickering and icon clipping fix ( bf637af4e4)
2026-02-13 14:09:34 -06:00
forbes
0925aa3753
cherry-pick #30 : native Qt start panel + kindred:// URL ( 8b2ce4b73a)
2026-02-13 14:09:28 -06:00
forbes
1699770ee8
cherry-pick: 6773ca0dfd
2026-02-13 14:09:14 -06:00
forbes
2ec07466a9
cherry-pick: 4bf74cf339
2026-02-13 14:09:13 -06:00
forbes
965601ae2a
cherry-pick #26 : UI polish — Wayland scaling, menu icon size ( cc5ba638d1)
2026-02-13 14:09:05 -06:00
forbes
fbd01f8c7d
cherry-pick: c858706d48
2026-02-13 14:08:51 -06:00
forbes
ce77bf37cc
cherry-pick #21 : use Python API for viewDefaultOrientation ( 2f594dac0a)
2026-02-13 14:08:42 -06:00
forbes
a83be25a63
cherry-pick #19 : cross-origin detection in SaveAs ( a6e84552da)
2026-02-13 14:08:30 -06:00
forbes
ae9a8414d2
cherry-pick #18 : document-origin tracking in window title ( 015df38328)
2026-02-13 14:08:22 -06:00
forbes
7c926f1d71
cherry-pick #17 : OriginManagerDialog ( db85277f26)
2026-02-13 14:08:15 -06:00
forbes
5a212160c1
cherry-pick #16 : origin commands - Commit/Pull/Push ( 679aaec6d4)
2026-02-13 14:08:12 -06:00
forbes
81b49d7dd8
cherry-pick #15 : OriginSelectorWidget ( deeb6376f7)
...
Action.cpp/.h: toolbar action integration for origin selector.
Resolved add/add: kept Phase 1 OriginSelectorWidget.cpp.
2026-02-13 14:08:05 -06:00
forbes
c26d064e3b
cherry-pick #13 : LocalFileOrigin and Std_* delegation ( 38358e431d)
2026-02-13 14:07:46 -06:00
forbes
9e031ef021
cherry-pick #12 : origin abstraction layer ( 7535a48ec4)
...
Application.cpp/ApplicationPy.cpp: register origin system.
Resolved add/add conflicts: kept Phase 1 versions of Kindred source files.
2026-02-13 14:07:36 -06:00
forbes
5456ffb34f
cherry-pick #11 : Catppuccin icon override infrastructure ( 224feda4ad)
...
BitmapFactory.cpp: load icons from kindred-icons/ dir before built-in resources.
2026-02-13 14:07:27 -06:00
forbes
1202d4c277
cherry-pick #10 : theme selector cleanup ( 434ae797a4)
2026-02-13 14:07:13 -06:00
forbes
38311e1b54
cherry-pick #8 : theme tree item padding ( b3fedfb19f)
2026-02-13 14:07:00 -06:00
forbes
6f75bc2088
cherry-pick #7 : theme alternate-background-color ( fea1280fa9)
2026-02-13 14:06:56 -06:00
forbes
0810d3daed
cherry-pick #6 : resolve unknown command/style token errors ( 8639b6fd8a)
2026-02-13 14:06:48 -06:00
forbes
af9837abf1
cherry-pick #5 : theme QSS refinements ( eb80c07f57)
...
Resolved conflicts: kept HEAD versions of QSS (has later refinements),
InitGui.py (has newer origin architecture), and silo submodule.
2026-02-13 14:06:36 -06:00
forbes
b37667d56d
cherry-pick #4 : startup theme selector fix ( e85162947b)
2026-02-13 14:06:09 -06:00
forbes
630b08ea23
cherry-pick #3 : dock task panel right, remove non-Kindred themes ( bb3f3ac6d6)
2026-02-13 14:06:01 -06:00
forbes
9be9f9420a
cherry-pick #1 : initial Kindred branding + assembly joint fix
...
Cherry-picked 316d4f4b52
2026-02-13 14:05:31 -06:00
forbes
87a0af0b0f
phase 1: copy Kindred-only files onto upstream/main (FreeCAD 1.2.0-dev)
...
Wholesale copy of all Kindred Create additions that don't conflict with
upstream FreeCAD code:
- kindred-icons/ (1444 Catppuccin Mocha SVG icon overrides)
- src/Mod/Create/ (Kindred Create workbench)
- src/Gui/ Kindred source files (FileOrigin, OriginManager,
OriginSelectorWidget, CommandOrigin, BreadcrumbToolBar, EditingContext)
- src/Gui/Icons/ (Kindred branding and silo icons)
- src/Gui/PreferencePacks/KindredCreate/
- src/Gui/Stylesheets/ (KindredCreate.qss, images_dark-light/)
- package/ (rattler-build recipe)
- docs/ (architecture, guides, specifications)
- .gitea/ (CI workflows, issue templates)
- mods/silo, mods/ztools submodules
- .gitmodules (Kindred submodule URLs)
- resources/ (kindred-create.desktop, kindred-create.xml)
- banner-logo-light.png, CONTRIBUTING.md
2026-02-13 14:03:58 -06:00
ac49040ec4
Merge pull request 'feat: .kc file format — Layer 1 (format registration)' ( #186 ) from feat/kc-file-format-layer1 into main
...
Build and Test / build (push) Has been cancelled
Sync Silo Server Docs / sync (push) Failing after 54s
Reviewed-on: #186
2026-02-13 19:42:38 +00:00
forbes
723a8c98d5
feat: .kc file format — Layer 1 (format registration)
...
Build and Test / build (pull_request) Successful in 42m37s
Register .kc as a recognized file type alongside .FCStd:
C++ changes:
- Document.cpp: checkFileName() accepts .kc extension
- Gui/Document.cpp: Save As and Save Copy dialogs include *.kc
- CommandDoc.cpp: Merge document dialog includes *.kc
- DlgProjectUtility.cpp: Project utility dialog includes *.kc
Python changes:
- FreeCADInit.py: register *.kc in import type system
- kc_format.py: DocumentObserver that preserves silo/ ZIP entries
across saves (caches before save, re-injects after save)
- InitGui.py: register kc_format observer on startup
Silo integration:
- get_cad_file_path() generates .kc paths for new files
- find_file_by_part_number() finds both .kc and .FCStd, preferring .kc
- search_local_files() lists both .kc and .FCStd files
The .kc format is a superset of .FCStd with a silo/ directory
containing Kindred platform metadata. See docs/KC_SPECIFICATION.md.
2026-02-13 13:39:42 -06:00
Loke Strøm
5d81f8ac16
Sketcher: Fix: Arc of ellipse when first and second X coordinates are the same ( #27327 )
2026-02-13 11:57:27 -06:00
Syres916
ba030237b7
[Gui] Ensure Read Only Booleans in PropertyEditor are shown using Disabled Text Color ( #27429 )
...
* Ensure read only Booleans are shown using Disabled Text color
* Make the disabled text color a more significant contrast to enabled
* Ensure correct contrasting color for Axis letters versus background color for both Light and Dark themes
2026-02-13 11:56:20 -06:00
Frank David Martínez M
f1366e8a75
Base: Remove assertion on isForceXML() ( #27491 )
...
This fixes a difference between Main code and LS3 Code ported during TNP big merge. The Issue generates a crash if FreeCAD is compiled in Debug Mode: #27489 .
2026-02-13 11:51:52 -06:00
Chris
e595cc49f2
FEM: Update netgenplugin src files to fix builds with netgen >= 6.2.2601 ( #27508 )
2026-02-13 11:50:04 -06:00
chris jones @ipatch
9289e27230
gui: preferences fixes #27379
2026-02-13 11:48:48 -06:00
Roy-043
a8757f7947
Draft: fix depency of patharray normal on view direction
...
Change normal calculation to use get_shape_normal
2026-02-13 11:47:44 -06:00
Chris Hennes
9e042ff480
PD: Improve error handling for RevolMethod::ToFirst
2026-02-13 17:48:13 +01:00
a0219a72e9
Merge pull request 'docs(silo-server): add missing pages to SUMMARY.md' ( #185 ) from docs/add-missing-silo-server-pages into main
...
Deploy Docs / build-and-deploy (push) Successful in 31s
Build and Test / build (push) Successful in 38m51s
Sync Silo Server Docs / sync (push) Successful in 22s
Reviewed-on: #185
2026-02-13 02:58:02 +00:00
forbes
8c33262153
docs(silo-server): add missing pages to SUMMARY.md
...
Build and Test / build (pull_request) Successful in 44m22s
Add frontend-spec, INSTALL, and ROADMAP to the Silo Server section
so they appear in the mdBook output.
2026-02-12 20:56:55 -06:00
a10143a661
Merge pull request 'fix(gui): forward optional visibility arg in Workbench.appendToolbar()' ( #182 ) from fix/appendToolbar-visibility into main
...
Build and Test / build (push) Has been cancelled
Reviewed-on: #182
2026-02-13 01:57:47 +00:00
9ad6ba5907
Merge pull request 'feat(prefs): dev build defaults and skip version migration' ( #181 ) from feat/dev-build-defaults into main
...
Build and Test / build (push) Successful in 43m23s
Reviewed-on: #181
2026-02-12 23:21:59 +00:00
e98a20a660
Merge branch 'main' into feat/dev-build-defaults
Build and Test / build (pull_request) Successful in 37m26s
2026-02-12 23:21:45 +00:00
11b371046b
Merge pull request 'feat: add placeholder SVGs for all missing FreeCAD icons' ( #183 ) from feat/placeholder-icons-for-missing-freecad-icons into main
...
Build and Test / build (push) Has been cancelled
Reviewed-on: #183
2026-02-12 23:20:59 +00:00
1d33007d5e
Merge branch 'main' into feat/placeholder-icons-for-missing-freecad-icons
Build and Test / build (pull_request) Successful in 39m19s
2026-02-12 23:20:47 +00:00
