Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
chennes authored Oct 23, 2024
2 parents 9b4f3f1 + f3ab3d9 commit 61e533c
Showing 9 changed files with 36 additions and 5 deletions.
28 changes: 26 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -9,6 +9,10 @@
[submodule "A2plus"]
path = A2plus
url = https://github.com/kbwbe/A2plus
[submodule "addFC"]
path = addFC
url = https://github.com/GS90/addFC
branch = main
[submodule "AirPlaneDesign"]
path = AirPlaneDesign
url = https://github.com/FredsFactory/FreeCAD_AirPlaneDesign
@@ -89,6 +93,10 @@
path = cadquery_module
url = https://github.com/jmwright/cadquery-freecad-module
branch = master
[submodule "CamScripts"]
path = CamScripts
url = https://github.com/spanner888/CamScripts
branch = main
[submodule "CfdOF"]
path = CfdOF
url = https://github.com/jaheyns/CfdOF
@@ -173,6 +181,10 @@
path = Fcmcua
url = https://github.com/heissgetraenk/fcmcua
branch = main
[submodule "FreeCAD-Beginner-Assistant"]
path = FreeCAD-Beginner-Assistant
url = https://github.com/alekssadowski95/FreeCAD-Beginner-Assistant
branch = main
[submodule "freecad.gears"]
path = freecad.gears
url = https://github.com/looooo/freecad.gears
@@ -181,6 +193,10 @@
path = Freecad-Built-in-themes-beta
url = https://github.com/MisterMakerNL/Freecad-Built-in-themes-beta
branch = main
[submodule "FreeCAD-Ribbon"]
path = FreeCAD-Ribbon
url = https://github.com/APEbbers/FreeCAD-Ribbon
branch = main
[submodule "FreeCAD-themes"]
path = FreeCAD-themes
url = https://github.com/FreeCAD/FreeCAD-themes
@@ -209,6 +225,14 @@
path = frame
url = https://github.com/looooo/freecad_frame
branch = master
[submodule "FrameForge"]
path = FrameForge
url = https://github.com/lukh/frameforge
branch = main
[submodule "FreeGrid"]
path = FreeGrid
url = https://github.com/instancezero/in3dca-freegrid.git
branch = main
[submodule "GDML"]
path = GDML
url = https://github.com/KeithSloan/GDML
@@ -323,8 +347,8 @@
branch = main
[submodule "Ondsel-Lens"]
path = Ondsel-Lens
url = https://github.com/ondsel-Development/ondsel-lens
branch=master
url = https://github.com/Ondsel-Development/Ondsel-Lens-Addon
branch = main
[submodule "OpenTheme"]
path = OpenTheme
url = https://github.com/obelisk79/OpenTheme
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -3,6 +3,6 @@

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: check-yaml
5 changes: 5 additions & 0 deletions ALLOWED_PYTHON_PACKAGES.txt
Original file line number Diff line number Diff line change
@@ -43,11 +43,15 @@ openpyxl
pandas
pillow
ply
protobuf
py-slvs
pycollada
pydocx
pygit2
pyg4ometry
pyjwt
PyOpenGL
pyopenxr
pyoptools
pynastran
qtrangeslider
@@ -60,6 +64,7 @@ scipy
streamdeck
trimesh
tzlocal
vedo
xlrd
xlutils
xlwt
1 change: 0 additions & 1 deletion BOLTSFC
Submodule BOLTSFC deleted from 9ca370
1 change: 1 addition & 0 deletions FrameForge
Submodule FrameForge added at 887cde
1 change: 1 addition & 0 deletions FreeCAD-Beginner-Assistant
1 change: 1 addition & 0 deletions FreeGrid
Submodule FreeGrid added at 3ea831
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -52,6 +52,7 @@ To submit your workbench to the repository
**Note the use of:** screenshots, screencasts, mentioning of Licence, Changelog etc...
7. Ensure that your Addon includes a `package.xml` [metadata file](https://wiki.freecadweb.org/Package_Metadata), and that that file includes an icon, repository url, and readme url. The readme url should be a direct link to the HTML-rendered README.md file (e.g. https://github.com/shaise/FreeCAD_SheetMetal/blob/master/README.md)
8. Submit a Pull Request to this repository adding your Addon to the `.gitmodules` file. Supported git hosts are [GitHub](https://github.com/), [Gitlab](https://about.gitlab.com/), [Framagit](https://framagit.org/public/projects), [salsa.debian.org](https://salsa.debian.org/public), and [Codeberg](https://codeberg.org/).
9. Create a new ticket, linked to the PR, following [this template](https://github.com/FreeCAD/FreeCAD-addons/issues/new?assignees=&labels=New+WB%2FAddon+%3Apackage%3A&projects=&template=add-a-new-workbench-addon-to-this-repo.md&title=%5BNew+Addon%2FWorkbench%5D)

### Translating External Workbenches

1 change: 0 additions & 1 deletion pluginloader
Submodule pluginloader deleted from f02c8e

0 comments on commit 61e533c

Please sign in to comment.