Skip to content

Commit 43f528c

Browse files
aothmsaothms
committed
Merge remote-tracking branch 'origin/v0.6.0' into v0.7.0
# Conflicts: # src/ifcgeom/IfcGeomTree.h # src/ifcgeom_schema_agnostic/IfcGeomIterator.h # src/ifcgeom_schema_agnostic/IteratorImplementation.cpp # src/ifcgeom_schema_agnostic/IteratorImplementation.h # src/ifcparse/Ifc4x3_rc3.cpp # src/ifcparse/Ifc4x3_rc3.h # src/serializers/SvgSerializer.cpp
2 parents 83d5eff + cb95c93 commit 43f528c

File tree

299 files changed

+23604
-2847
lines changed

Some content is hidden

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

299 files changed

+23604
-2847
lines changed

‎.github/FUNDING.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# These are supported funding model platforms
22

33
github: [aothms]
4+
open_collective: opensourcebim

‎.github/workflows/ci-blenderbim-matrix.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ jobs:
5959
uses: svenstaro/upload-release-action@v2
6060
with:
6161
repo_token: ${{ secrets.GITHUB_TOKEN }}
62-
file: src/blenderbim_${{ matrix.config.short_name }}_${{ matrix.pyver }}/dist/blender28-bim-${{steps.date.outputs.date}}-${{ matrix.pyver }}-${{ matrix.config.short_name }}.zip
63-
asset_name: blender28-bim-${{steps.date.outputs.date}}-${{ matrix.pyver }}-${{ matrix.config.short_name }}.zip
62+
file: src/blenderbim_${{ matrix.config.short_name }}_${{ matrix.pyver }}/dist/blenderbim-${{steps.date.outputs.date}}-${{ matrix.pyver }}-${{ matrix.config.short_name }}.zip
63+
asset_name: blenderbim-${{steps.date.outputs.date}}-${{ matrix.pyver }}-${{ matrix.config.short_name }}.zip
6464
tag: "blenderbim-${{steps.date.outputs.date}}"
6565
overwrite: true
6666
body: "Daily developer testing build blenderbim-${{steps.date.outputs.date}}"

‎.gitignore‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,21 @@ Pipfile.lock
3131
# Vim
3232
*.swp
3333

34+
# Flask
35+
instance/*
36+
!instance/.gitignore
37+
.webassets-cache
38+
.env
39+
*.db
40+
41+
# Byte-compiled / optimized / DLL files
42+
*.py[cod]
43+
*$py.class
44+
45+
# pipenv
46+
Pipfile
47+
Pipfile.lock
48+
49+
# Database
50+
*.db
3451

‎COPYING‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GNU GENERAL PUBLIC LICENSE
22
Version 3, 29 June 2007
33

4-
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
4+
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
55
Everyone is permitted to copy and distribute verbatim copies
66
of this license document, but changing it is not allowed.
77

@@ -618,4 +618,4 @@ an absolute waiver of all civil liability in connection with the
618618
Program, unless a warranty or assumption of liability accompanies a
619619
copy of the Program in return for a fee.
620620

621-
END OF TERMS AND CONDITIONS
621+
END OF TERMS AND CONDITIONS

‎COPYING.LESSER‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GNU LESSER GENERAL PUBLIC LICENSE
22
Version 3, 29 June 2007
33

4-
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
4+
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
55
Everyone is permitted to copy and distribute verbatim copies
66
of this license document, but changing it is not allowed.
77

‎README.md‎

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,44 @@ Usage examples
217217
>>> # Writing IFC-SPF files to disk:
218218
>>> f.write("out.ifc")
219219

220-
[LGPL]: https://github.com/IfcOpenShell/IfcOpenShell/tree/master/COPYING "LGPL"
220+
Extra tools
221+
-----------
222+
223+
Also available are a series of utilities that are based on or related to IfcOpenShell.
224+
225+
Those marked with an asterisk are part of IfcOpenShell.
226+
227+
Name | License
228+
--- | ---
229+
bcf | LGPL-3.0-or-later
230+
blenderbim | GPL-3.0-or-later
231+
bsdd | LGPL-3.0-or-later
232+
ifc2ca | LGPL-3.0-or-later
233+
ifc4d | LGPL-3.0-or-later
234+
ifc5d | LGPL-3.0-or-later
235+
ifcbimtester | LGPL-3.0-or-later
236+
ifcblender | LGPL-3.0-or-later\*
237+
ifccityjson | LGPL-3.0-or-later
238+
ifcclash | LGPL-3.0-or-later
239+
ifccobie | LGPL-3.0-or-later
240+
ifcconvert | LGPL-3.0-or-later\*
241+
ifccsv | LGPL-3.0-or-later
242+
ifcdiff | LGPL-3.0-or-later
243+
ifcfm | LGPL-3.0-or-later
244+
ifcgeom | LGPL-3.0-or-later\*
245+
ifcgeom\_schema\_agnostic | LGPL-3.0-or-later\*
246+
ifcgeomserver | LGPL-3.0-or-later\*
247+
ifcjni | LGPL-3.0-or-later\*
248+
ifcmax | LGPL-3.0-or-later\*
249+
ifcopenshell-python | LGPL-3.0-or-later\*
250+
ifcparse | LGPL-3.0-or-later\*
251+
ifcpatch | LGPL-3.0-or-later
252+
ifcsverchok | GPL-3.0-or-later
253+
ifcwrap | LGPL-3.0-or-later\*
254+
qtviewer | LGPL-3.0-or-later\*
255+
serializers | LGPL-3.0-or-later\*
256+
257+
[LGPL]: https://github.com/IfcOpenShell/IfcOpenShell/tree/master/COPYING.LESSER "LGPL-3.0-or-later"
221258
[IFC]: https://technical.buildingsmart.org/standards/ifc/ "IFC"
222259
[IFC2x3 TC1]: https://standards.buildingsmart.org/IFC/RELEASE/IFC2x3/TC1/HTML/ "IFC2x3 TC1"
223260
[IFC4 Add2 TC1]: https://standards.buildingsmart.org/IFC/RELEASE/IFC4/ADD2_TC1/HTML/ "IFC4 Add2 TC1"

0 commit comments

Comments
 (0)