Fixed conflicts after merge with master

Browse source

...

This commit is contained in:

enricoturri1966 2021-10-14 10:48:46 +02:00

parent 29340c1560 2f9ce6bedb

commit 7be17d89e6

39 changed files with 651 additions and 255 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

resources/shapes/M3_hex_nut.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 6.8 KiB

BIN

resources/shapes/M3_hex_nut.stl Normal file

View file

Binary file not shown.

BIN

resources/shapes/M3x10_screw.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 13 KiB

BIN

resources/shapes/M3x10_screw.stl Normal file

View file

Binary file not shown.

BIN

resources/shapes/cone.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 8.8 KiB

BIN

resources/shapes/cone.stl Normal file

View file

Binary file not shown.

BIN

resources/shapes/helper_disk.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4.3 KiB

BIN

resources/shapes/helper_disk.stl Normal file

View file

Binary file not shown.

BIN

resources/shapes/torus.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 18 KiB

BIN

resources/shapes/torus.stl Normal file

View file

Binary file not shown.