Merge branch 'martinbudden-cf_contrast'

This commit is contained in:
Chris Palmer 2021-03-03 14:32:19 +00:00
commit 3cd5769708
4 changed files with 11 additions and 3 deletions

View File

@ -3,6 +3,14 @@
This changelog is generated by `changelog.py` using manually added semantic version tags to classify commits as breaking changes, additions or fixes. This changelog is generated by `changelog.py` using manually added semantic version tags to classify commits as breaking changes, additions or fixes.
* 2021-03-03 [31ab856](https://github.com/nophead/NopSCADlib/commit/31ab8562a783464f93812b8c7c45d403587efd0a "show commit") [C.P.](# "Chris Palmer") Updated images
* 2021-02-27 [73c436e](https://github.com/nophead/NopSCADlib/commit/73c436ee1568c21afd2919593d3f434eb47b53f2 "show commit") [M.B.](# "Martin Budden") Improved contrast of carbon fiber sheets.
* 2021-03-03 [cd925bc](https://github.com/nophead/NopSCADlib/commit/cd925bc0496b67f67aecdf82d4474e1ea922f7c0 "show commit") [C.P.](# "Chris Palmer") Added changelog link to readme.
* 2021-03-03 [4a2951e](https://github.com/nophead/NopSCADlib/commit/4a2951e22f7398f28850f459c7542a7a2d1e0c9c "show commit") [C.P.](# "Chris Palmer") Fixed `changelog.py` for when HEAD doesn't have tag.
* 2021-03-03 [a93a8f9](https://github.com/nophead/NopSCADlib/commit/a93a8f99fb8272186c99207161bc50c2cc3e057f "show commit") [C.P.](# "Chris Palmer") Added `CHANGELOG.md` for #154 * 2021-03-03 [a93a8f9](https://github.com/nophead/NopSCADlib/commit/a93a8f99fb8272186c99207161bc50c2cc3e057f "show commit") [C.P.](# "Chris Palmer") Added `CHANGELOG.md` for #154
### [v13.4.0](https://github.com/nophead/NopSCADlib/releases/tag/v13.4.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v13.3.1...v13.4.0 "diff with v13.3.1") ### [v13.4.0](https://github.com/nophead/NopSCADlib/releases/tag/v13.4.0 "show release") Additions [...](https://github.com/nophead/NopSCADlib/compare/v13.3.1...v13.4.0 "diff with v13.3.1")

Binary file not shown.

Before

Width:  |  Height:  |  Size: 884 KiB

After

Width:  |  Height:  |  Size: 884 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 67 KiB

After

Width:  |  Height:  |  Size: 73 KiB

View File

@ -47,9 +47,9 @@ AL8 = [ "AL8", "Aluminium tooling plate", 8, [0.9, 0.9, 0.9, 1 ],
Steel06 = [ "Steel06", "Sheet mild steel", 0.6,"silver" , false]; Steel06 = [ "Steel06", "Sheet mild steel", 0.6,"silver" , false];
Spring05 = [ "Spring05", "Bi-metal saw blade", 0.5,"#FBC300", false]; Spring05 = [ "Spring05", "Bi-metal saw blade", 0.5,"#FBC300", false];
Silicone3 = [ "Silicone3", "Sheet silicone", 3, [0.9, 0.9, 0.9, 0.95 ], false]; Silicone3 = [ "Silicone3", "Sheet silicone", 3, [0.9, 0.9, 0.9, 0.95 ], false];
CF1 = [ "CF1", "Sheet carbon fiber", 1, grey(30), false, 2, 2, grey(25)]; CF1 = [ "CF1", "Sheet carbon fiber", 1, grey(35), false, 2, 2, grey(20)];
CF2 = [ "CF2", "Sheet carbon fiber", 2, grey(30), false, 2, 2, grey(25)]; CF2 = [ "CF2", "Sheet carbon fiber", 2, grey(35), false, 2, 2, grey(20)];
CF3 = [ "CF3", "Sheet carbon fiber", 3, grey(30), false, 2, 2, grey(25)]; CF3 = [ "CF3", "Sheet carbon fiber", 3, grey(35), false, 2, 2, grey(20)];
sheets = [CF1, CF2, CF3, MDF6, MDF10, MDF12, MDF19, PMMA2, PMMA3, PMMA6, PMMA8, PMMA10, sheets = [CF1, CF2, CF3, MDF6, MDF10, MDF12, MDF19, PMMA2, PMMA3, PMMA6, PMMA8, PMMA10,