fix: resolve PR conflicts with origin/main
Some checks failed
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
This commit is contained in:
forbes
2026-02-14 10:23:44 -06:00
parent 9809ff852c
commit 831ad1376a
8 changed files with 6814 additions and 7508 deletions

4
.gitignore vendored
View File

@@ -10,6 +10,7 @@
!/.pre-commit-config.yaml
!/.pylintrc
!/.github/
!/.gitea/
!/contrib/.vscode/
!*.gitattributes
!*.gitignore
@@ -70,3 +71,6 @@ files_to_translate.txt
# pixi environments
.pixi
*.egg-info
# mdBook build output
docs/book/