diff --git a/extrusion/components/101_lucy/bazar/output.html b/extrusion/components/101_lucy/bazar/output.html index 77f428bfc..787dd521e 100644 --- a/extrusion/components/101_lucy/bazar/output.html +++ b/extrusion/components/101_lucy/bazar/output.html @@ -100,7 +100,7 @@ - + diff --git a/extrusion/components/101_lucy/bazar/raw.html b/extrusion/components/101_lucy/bazar/raw.html index 8ecd658a2..5e49dbca7 100644 --- a/extrusion/components/101_lucy/bazar/raw.html +++ b/extrusion/components/101_lucy/bazar/raw.html @@ -116,7 +116,7 @@ payment). - + diff --git a/extrusion/components/101_lucy/bazar/raw.html.json b/extrusion/components/101_lucy/bazar/raw.html.json new file mode 100644 index 000000000..0d42742c4 --- /dev/null +++ b/extrusion/components/101_lucy/bazar/raw.html.json @@ -0,0 +1,52 @@ +{ + "includes": [ + { + "file": "product_variables.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "body.md", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "header_notice.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "product_overview_drawings.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "product_specs.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "authors_html.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "components.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "extra_resources.md", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\product_resources.osr" + }, + { + "file": "product_resources.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "product_shipping.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "payment_terms.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "social_links.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + } + ] +} \ No newline at end of file diff --git a/extrusion/components/102_lucy-mini/bazar/output.html b/extrusion/components/102_lucy-mini/bazar/output.html index 6e5054682..e7292f51a 100644 --- a/extrusion/components/102_lucy-mini/bazar/output.html +++ b/extrusion/components/102_lucy-mini/bazar/output.html @@ -108,7 +108,7 @@ - + diff --git a/extrusion/components/102_lucy-mini/bazar/raw.html b/extrusion/components/102_lucy-mini/bazar/raw.html index 7ab7086b9..d64338e39 100644 --- a/extrusion/components/102_lucy-mini/bazar/raw.html +++ b/extrusion/components/102_lucy-mini/bazar/raw.html @@ -124,7 +124,7 @@ payment). - + diff --git a/extrusion/components/102_lucy-mini/bazar/raw.html.json b/extrusion/components/102_lucy-mini/bazar/raw.html.json new file mode 100644 index 000000000..0d42742c4 --- /dev/null +++ b/extrusion/components/102_lucy-mini/bazar/raw.html.json @@ -0,0 +1,52 @@ +{ + "includes": [ + { + "file": "product_variables.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "body.md", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "header_notice.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "product_overview_drawings.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "product_specs.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "authors_html.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "components.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "extra_resources.md", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\product_resources.osr" + }, + { + "file": "product_resources.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "product_shipping.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "payment_terms.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "social_links.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + } + ] +} \ No newline at end of file diff --git a/extrusion/components/202_FilamentHousing/bazar/output.html b/extrusion/components/202_FilamentHousing/bazar/output.html index 4603e4a46..1bc71096a 100644 --- a/extrusion/components/202_FilamentHousing/bazar/output.html +++ b/extrusion/components/202_FilamentHousing/bazar/output.html @@ -102,7 +102,7 @@ - + diff --git a/extrusion/components/202_FilamentHousing/bazar/raw.html b/extrusion/components/202_FilamentHousing/bazar/raw.html index 9e477c012..b9e04d334 100644 --- a/extrusion/components/202_FilamentHousing/bazar/raw.html +++ b/extrusion/components/202_FilamentHousing/bazar/raw.html @@ -117,7 +117,7 @@ payment). - + diff --git a/extrusion/components/202_FilamentHousing/bazar/raw.html.json b/extrusion/components/202_FilamentHousing/bazar/raw.html.json new file mode 100644 index 000000000..0d42742c4 --- /dev/null +++ b/extrusion/components/202_FilamentHousing/bazar/raw.html.json @@ -0,0 +1,52 @@ +{ + "includes": [ + { + "file": "product_variables.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "body.md", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "header_notice.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "product_overview_drawings.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "product_specs.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "authors_html.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "components.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "extra_resources.md", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\product_resources.osr" + }, + { + "file": "product_resources.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "product_shipping.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "payment_terms.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "social_links.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + } + ] +} \ No newline at end of file diff --git a/sheetpress/commons/readme.md b/sheetpress/commons/readme.md index 667116934..6130956a9 100644 --- a/sheetpress/commons/readme.md +++ b/sheetpress/commons/readme.md @@ -1,9 +1,17 @@ ## Remarks - [ ] Framework: solid bars, using HGH/HGR rails (25mm min) +- [ ] Housing + - [ ] access for extruder - [ ] Loading: 2 flexible side arms, preferably swing - to load lower, and upper zones - [ ] Cooling: should be active by default, with a ~20T jack, 2 cooling and 2 heating zones are possible - [ ] Heating: should be applied using profiles (ramping, using Modbus PIDs) | Partitions -- [ ] Mould: lower plate in AL due to warping, steel enforced frame, preferably on guides (cartridges) +- [ ] Moulds + - [ ] lower plate in AL due to warping, steel enforced frame, preferably on guides (cartridges) + - [ ] if applicable, cooling press with mountable glass plates + - [ ] hot press, preferbly using die techniques (tbf) - [ ] Electronics: burnout/overshoot/ssr-fail alarm/trip -- [ ] Fumes: fixed/stationary hood & side wings, overhang at least 40cm +- [ ] Fumes + - [ ] fixed/stationary hood & side wings, overhang at least 40cm + - [ ] integrated exhaust fan, 2x + diff --git a/sheetpress/components/sprcb-650-light/bazar/output.html b/sheetpress/components/sprcb-650-light/bazar/output.html index 7f8cba61f..2d943df20 100644 --- a/sheetpress/components/sprcb-650-light/bazar/output.html +++ b/sheetpress/components/sprcb-650-light/bazar/output.html @@ -119,7 +119,7 @@ - + diff --git a/sheetpress/components/sprcb-650-light/bazar/raw.html b/sheetpress/components/sprcb-650-light/bazar/raw.html index 8e73ca546..6e60f1619 100644 --- a/sheetpress/components/sprcb-650-light/bazar/raw.html +++ b/sheetpress/components/sprcb-650-light/bazar/raw.html @@ -133,7 +133,7 @@ payment). - + diff --git a/sheetpress/components/sprcb-650-light/bazar/raw.html.json b/sheetpress/components/sprcb-650-light/bazar/raw.html.json new file mode 100644 index 000000000..0d42742c4 --- /dev/null +++ b/sheetpress/components/sprcb-650-light/bazar/raw.html.json @@ -0,0 +1,52 @@ +{ + "includes": [ + { + "file": "product_variables.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "body.md", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "header_notice.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "product_overview_drawings.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "product_specs.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "authors_html.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "components.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "extra_resources.md", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\product_resources.osr" + }, + { + "file": "product_resources.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "product_shipping.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "payment_terms.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "social_links.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + } + ] +} \ No newline at end of file diff --git a/sheetpress/components/sprcb-650/bazar/output.html b/sheetpress/components/sprcb-650/bazar/output.html index ec1bb9aeb..e19f0c8e7 100644 --- a/sheetpress/components/sprcb-650/bazar/output.html +++ b/sheetpress/components/sprcb-650/bazar/output.html @@ -66,7 +66,7 @@ - + diff --git a/sheetpress/components/sprcb-650/bazar/raw.html b/sheetpress/components/sprcb-650/bazar/raw.html index fa956b08a..31e68ca9d 100644 --- a/sheetpress/components/sprcb-650/bazar/raw.html +++ b/sheetpress/components/sprcb-650/bazar/raw.html @@ -80,7 +80,7 @@ payment). - + diff --git a/sheetpress/components/sprcb-650/bazar/raw.html.json b/sheetpress/components/sprcb-650/bazar/raw.html.json new file mode 100644 index 000000000..0d42742c4 --- /dev/null +++ b/sheetpress/components/sprcb-650/bazar/raw.html.json @@ -0,0 +1,52 @@ +{ + "includes": [ + { + "file": "product_variables.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "body.md", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "header_notice.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "product_overview_drawings.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "product_specs.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "authors_html.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "components.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "extra_resources.md", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\product_resources.osr" + }, + { + "file": "product_resources.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "product_shipping.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "payment_terms.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "social_links.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + } + ] +} \ No newline at end of file diff --git a/shredder-ext/Obelix-XM-300/bazar/output.html b/shredder-ext/Obelix-XM-300/bazar/output.html index b07e5eb20..a8da450c5 100644 --- a/shredder-ext/Obelix-XM-300/bazar/output.html +++ b/shredder-ext/Obelix-XM-300/bazar/output.html @@ -40,7 +40,7 @@ - + diff --git a/shredder-ext/Obelix-XM-300/bazar/raw.html b/shredder-ext/Obelix-XM-300/bazar/raw.html index 0202da42e..68b64727a 100644 --- a/shredder-ext/Obelix-XM-300/bazar/raw.html +++ b/shredder-ext/Obelix-XM-300/bazar/raw.html @@ -63,7 +63,7 @@ payment). - + diff --git a/shredder-ext/Obelix-XM-300/bazar/raw.html.json b/shredder-ext/Obelix-XM-300/bazar/raw.html.json new file mode 100644 index 000000000..ab8ccc21a --- /dev/null +++ b/shredder-ext/Obelix-XM-300/bazar/raw.html.json @@ -0,0 +1,44 @@ +{ + "includes": [ + { + "file": "product_variables.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "body.md", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "header_notice.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "product_overview_drawings.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "components.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "extra_resources.md", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\product_resources.osr" + }, + { + "file": "product_resources.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "product_shipping.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "payment_terms.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "social_links.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + } + ] +} \ No newline at end of file diff --git a/shredder-ext/Obelix-XM-500/bazar/output.html b/shredder-ext/Obelix-XM-500/bazar/output.html index df6fa501e..cafd4605e 100644 --- a/shredder-ext/Obelix-XM-500/bazar/output.html +++ b/shredder-ext/Obelix-XM-500/bazar/output.html @@ -35,7 +35,7 @@ - + diff --git a/shredder-ext/Obelix-XM-500/bazar/raw.html b/shredder-ext/Obelix-XM-500/bazar/raw.html index f974f480e..185b7f67b 100644 --- a/shredder-ext/Obelix-XM-500/bazar/raw.html +++ b/shredder-ext/Obelix-XM-500/bazar/raw.html @@ -55,7 +55,7 @@ payment). - + diff --git a/shredder-ext/Obelix-XM-500/bazar/raw.html.json b/shredder-ext/Obelix-XM-500/bazar/raw.html.json new file mode 100644 index 000000000..7727074d4 --- /dev/null +++ b/shredder-ext/Obelix-XM-500/bazar/raw.html.json @@ -0,0 +1,36 @@ +{ + "includes": [ + { + "file": "product_variables.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "body.md", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "header_notice.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "product_overview_drawings.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "components.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "product_shipping.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "payment_terms.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + }, + { + "file": "social_links.osr", + "parent": "C:\\Users\\mc007\\Desktop\\osr\\products\\osr\\bazar\\root.html" + } + ] +} \ No newline at end of file