diff --git a/LICENSE.md b/LICENSE.md index 429fcd9..b3df1b7 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -49,6 +49,7 @@ The WASM build was made possible by https://github.com/DSchroer/openscad-wasm. + [boltsparts](#boltsparts) + [openscad_attachable_text3d](#openscad_attachable_text3d) + [OpenSCAD-Snippet](#openscad-snippet) + + [Lasercut](#Lasercut) ## Manifold @@ -782,6 +783,36 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ``` +## Lasercut + +https://github.com/bmsleight/lasercut + +``` +Copyright (c) 2015, bmsleight +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +``` + ## pathbuilder https://github.com/dinther/pathbuilder diff --git a/Makefile b/Makefile index 390c2e1..d0ee91d 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ SINGLE_BRANCH_MAIN=--branch main --single-branch SINGLE_BRANCH=--branch master --single-branch SHALLOW=--depth 1 -SHELL:=/bin/bash +SHELL:=/usr/bin/env bash all: public @@ -33,7 +33,8 @@ public: \ public/libraries/pathbuilder.zip \ public/libraries/openscad_attachable_text3d.zip \ public/libraries/brailleSCAD.zip \ - public/libraries/UB.scad.zip + public/libraries/UB.scad.zip \ + public/libraries/lasercut.zip clean: rm -fR libs build @@ -211,3 +212,10 @@ libs/openscad-tray: public/libraries/openscad-tray.zip: libs/openscad-tray mkdir -p public/libraries ( cd libs/openscad-tray ; zip -r ../../public/libraries/openscad-tray.zip *.scad LICENSE ) + +libs/lasercut: + git clone --recurse https://github.com/bmsleight/lasercut.git ${SHALLOW} ${SINGLE_BRANCH} $@ +public/libraries/lasercut.zip: libs/lasercut + mkdir -p public/libraries + ( cd libs/lasercut ; zip -r ../../public/libraries/lasercut.zip *.scad LICENSE ) + diff --git a/package.json b/package.json index 5190f06..3bdb62e 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "ts-loader": "^9.4.2", "tslib": "^2.5.0", "webpack": "^5.76.3", - "webpack-cli": "^5.0.1", - "webpack-dev-server": "^4.13.1" + "webpack-cli": "^5.1.4", + "webpack-dev-server": "^4.15.2" } } diff --git a/src/fs/zip-archives.ts b/src/fs/zip-archives.ts index 4522435..51df5c9 100644 --- a/src/fs/zip-archives.ts +++ b/src/fs/zip-archives.ts @@ -171,6 +171,15 @@ export const zipArchives: ZipArchives = { }, symlinks: {'tray.scad': 'tray.scad'}, }, + 'lasercut': { + description: 'Module for OpenSCAD, allowing 3D models to be created from 2D lasercut parts.', + gitOrigin: { + branch: 'master', + repoUrl: 'https://github.com/bmsleight/lasercut', + include: [{glob: ['**/*.scad', 'LICENSE']}], + }, + symlinks: {'lasercut.scad': 'lasercut.scad'}, + }, 'YAPP_Box': { description: 'Yet Another Parametric Projectbox Box', gitOrigin: {