diff --git a/content/machines/3D_printing/Prusa/Prusa MK3S.jpg b/content/machines/3D_printing/Prusa/Prusa MK3S.jpg new file mode 100644 index 0000000..cef1d78 Binary files /dev/null and b/content/machines/3D_printing/Prusa/Prusa MK3S.jpg differ diff --git a/content/machines/3D_printing/Prusa/Prusa MK3S.yml b/content/machines/3D_printing/Prusa/Prusa MK3S.yml new file mode 100644 index 0000000..d884237 --- /dev/null +++ b/content/machines/3D_printing/Prusa/Prusa MK3S.yml @@ -0,0 +1,2 @@ +name: Prusa MK3S +work_size: 250mm x 210mm x 210mm diff --git a/content/machines/3D_printing/Prusa/Prusa Mini+.jpg b/content/machines/3D_printing/Prusa/Prusa Mini+.jpg new file mode 100644 index 0000000..d6a191c Binary files /dev/null and b/content/machines/3D_printing/Prusa/Prusa Mini+.jpg differ diff --git a/content/machines/3D_printing/Prusa/Prusa Mini+.yml b/content/machines/3D_printing/Prusa/Prusa Mini+.yml new file mode 100644 index 0000000..5bfb120 --- /dev/null +++ b/content/machines/3D_printing/Prusa/Prusa Mini+.yml @@ -0,0 +1,2 @@ +name: Prusa Mini+ +work_size: 180mm x 180mm x 180mm diff --git a/content/machines/3D_printing/Prusa/Prusa XL.jpg b/content/machines/3D_printing/Prusa/Prusa XL.jpg new file mode 100644 index 0000000..6b7af07 Binary files /dev/null and b/content/machines/3D_printing/Prusa/Prusa XL.jpg differ diff --git a/content/machines/3D_printing/Prusa/Prusa XL.yml b/content/machines/3D_printing/Prusa/Prusa XL.yml new file mode 100644 index 0000000..045ffba --- /dev/null +++ b/content/machines/3D_printing/Prusa/Prusa XL.yml @@ -0,0 +1,2 @@ +name: Prusa XL +work_size: 360mm x 360mm x 360mm diff --git a/content/machines/CNC_milling/DIY/Viktoria CnC.jpg b/content/machines/CNC_milling/DIY/Viktoria CnC.jpg new file mode 100644 index 0000000..3b6df8f Binary files /dev/null and b/content/machines/CNC_milling/DIY/Viktoria CnC.jpg differ diff --git a/content/machines/CNC_milling/DIY/Viktoria CnC.yml b/content/machines/CNC_milling/DIY/Viktoria CnC.yml new file mode 100644 index 0000000..81cd51b --- /dev/null +++ b/content/machines/CNC_milling/DIY/Viktoria CnC.yml @@ -0,0 +1,2 @@ +name: Viktoria CnC +work_size: 1200mm x 1200mm x 140mm diff --git a/content/machines/CNC_milling/Sharpertools/Sharpertools Origin.jpg b/content/machines/CNC_milling/Shapertools/Shapertools Origin.jpg similarity index 100% rename from content/machines/CNC_milling/Sharpertools/Sharpertools Origin.jpg rename to content/machines/CNC_milling/Shapertools/Shapertools Origin.jpg diff --git a/content/machines/CNC_milling/Sharpertools/Sharpertools Origin.yml b/content/machines/CNC_milling/Shapertools/Shapertools Origin.yml similarity index 100% rename from content/machines/CNC_milling/Sharpertools/Sharpertools Origin.yml rename to content/machines/CNC_milling/Shapertools/Shapertools Origin.yml diff --git a/content/machines/laser/Acctek/AKJ6090.png b/content/machines/laser/Acctek/AKJ6090.png new file mode 100644 index 0000000..6d789dc Binary files /dev/null and b/content/machines/laser/Acctek/AKJ6090.png differ diff --git a/content/machines/laser/Acctek/AKJ6090.yml b/content/machines/laser/Acctek/AKJ6090.yml new file mode 100644 index 0000000..9558c07 --- /dev/null +++ b/content/machines/laser/Acctek/AKJ6090.yml @@ -0,0 +1,2 @@ +name: AKJ6090 +work_size: 600mm x 900mm diff --git a/content/machines/other/Schulze/Schulze XXL.jpeg b/content/machines/other/Schulze/Schulze XXL.jpeg new file mode 100644 index 0000000..c63f836 Binary files /dev/null and b/content/machines/other/Schulze/Schulze XXL.jpeg differ diff --git a/content/machines/other/Schulze/Schulze XXL.yml b/content/machines/other/Schulze/Schulze XXL.yml new file mode 100644 index 0000000..0435a57 --- /dev/null +++ b/content/machines/other/Schulze/Schulze XXL.yml @@ -0,0 +1,2 @@ +name: XXL T-Shirt Heat Press +work_size: 380mm x 450mm diff --git a/content/machines/vinyl_cutting/Fenta/SL 740.jpg b/content/machines/vinyl_cutting/Fenta/SL 740.jpg new file mode 100644 index 0000000..ec69494 Binary files /dev/null and b/content/machines/vinyl_cutting/Fenta/SL 740.jpg differ diff --git a/content/machines/vinyl_cutting/Fenta/SL 740.yml b/content/machines/vinyl_cutting/Fenta/SL 740.yml new file mode 100644 index 0000000..b10d3f5 --- /dev/null +++ b/content/machines/vinyl_cutting/Fenta/SL 740.yml @@ -0,0 +1,2 @@ +name: SL 740 +work_size: 740 mm diff --git a/content/spaces/fablab-sion.yml b/content/spaces/fablab-sion.yml index f028833..137c2db 100644 --- a/content/spaces/fablab-sion.yml +++ b/content/spaces/fablab-sion.yml @@ -26,4 +26,4 @@ machines: - ref: Form2 qty: 2 - CNC Inventables -- Sharpertools Origin +- Shapertools Origin diff --git a/content/spaces/quartierwerkstatt-viktoria.yml b/content/spaces/quartierwerkstatt-viktoria.yml index 4211e93..39103d5 100644 --- a/content/spaces/quartierwerkstatt-viktoria.yml +++ b/content/spaces/quartierwerkstatt-viktoria.yml @@ -1,6 +1,12 @@ -name: Quartier Werkstatt Viktoria +name: Quartierwerkstatt Viktoria description: |- - Die Freizeitwerkstätte im Berner Nordquartier + Die Freizeitwerkstätte im Berner Nordquartier. Die Quartierwerkstatt setzt sich zusammen aus dem Fablab, + mit Elektronikbereich und den unten aufgeführten Maschinen, einem grossen Holz- und Metallbereich, sowie einer + Lackierkabine. Der Holzbereich besteht unter anderem aus einer Tischreissäge, einer Hobelbank, mehreren + Bandkreissägen, einer Kapp-/Gehrungssäge, einer Drechselmaschine, einer vertikalen Plattensäge (Striebig), + sowie diversen Handmaschinen. Der Metallbereich besteht aus einem Schweiss- und Lötbereich, einer Metallkreissäge, + einer Bohr-/Fräsmaschine, einer Drehbank, sowie mehreren Handmaschinen. Mehr Informationen findest du auf unserer + Webseite. city: Bern zip: '3013' street: Gotthelfstrasse 29 @@ -12,3 +18,13 @@ founded: 2015-08-15 email: fablab@quartierwerkstatt-viktoria.ch website: https://www.quartierwerkstatt-viktoria.ch/ language: DE +machines: +- Viktoria CnC +- AKJ6090 +- Prusa XL +- Prusa MK3S +- Prusa Mini+ +- Photon +- SL 740 +- Shapertools Origin +- Schulze XXL \ No newline at end of file