Skip to content

Commit 4604ea5

Browse files
9and39and3
committed
WIP: temp commit for rersolving conflict
1 parent d562bb9 commit 4604ea5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+388
-187
lines changed

‎.gitattributes‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
*.vtk filter=lfs diff=lfs merge=lfs -text
2+
*.3dm filter=lfs diff=lfs merge=lfs -text
3+
*.ghx filter=lfs diff=lfs merge=lfs -text
4+
*.gh filter=lfs diff=lfs merge=lfs -text
25
*.ply filter=lfs diff=lfs merge=lfs -text
3-
4-
_build/* linguist-vendored
6+
_build/* linguist-vendored

‎doc/_static/example_files/additive_gh_logs_v1.gh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:a33e5299ef47b9fa41a879c9edf47dfefd97eeb726269ee1c8494596a5731647
3+
size 101003042

‎doc/_static/example_files/additive_gh_robotic_v1.gh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:83d7e663be50b73d55ab53320931dc39985308004605cb50b295a57b8f984bb3
3+
size 52353005

‎doc/_static/example_files/additive_gh_roof_v1.gh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:1b56dec5094bdbe5a687c6db612356339dd17770c697646b3d34712e9da8c044
3+
size 237327819

‎doc/_static/example_files/additive_rh_logs_v1.3dm‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:f417c4035f11a6e9596a0ba4efb88368b27aff5c0a274c637feaa45976d07322
3+
size 14857087

‎doc/_static/example_files/additive_rh_robotic_v1.3dm‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:44f72144401650b2031580dec565c2dea574e3d92931ef2f9572cf4842ff028f
3+
size 45227806

‎doc/_static/example_files/additive_rh_roof_v1.3dm‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:65d709eb21610bc9e4b0dfdb36317673b05a8ea3afe737e0cb8ede0f12daa1da
3+
size 354465899

‎doc/_static/example_files/subtractive_rh_v1.3dmbak‎

-91.1 MB
Binary file not shown.

‎doc/_static/tutorials/fig_additive_error.png‎

2.06 MB
Loading

‎doc/_static/tutorials/fig_additive_logs_DFAssembly.png‎

167 KB
Loading

0 commit comments

Comments
 (0)