From e52a66e92c1343d541440e30c3c1c009dc6f0b39 Mon Sep 17 00:00:00 2001 From: Anika Barop <anika@fabcity.hamburg> Date: Fri, 14 Jun 2024 13:45:19 +0000 Subject: [PATCH] Anika main patch 86991 --- src/content/labs/en/attraktor.yaml | 2 +- src/content/labs/en/curious.yaml | 2 +- src/content/labs/en/fablabstpauli.yaml | 4 ++-- src/content/labs/en/hoacircularitylab.yaml | 4 ++-- src/content/labs/en/hofalab.yaml | 4 ++-- src/content/labs/en/huehnerposten.yaml | 2 +- src/content/labs/en/lurup.yaml | 4 ++-- src/content/labs/en/openlab.yaml | 4 ++-- src/content/labs/en/welcomewerkstatt.yaml | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/content/labs/en/attraktor.yaml b/src/content/labs/en/attraktor.yaml index ebc806466..e03f1b516 100644 --- a/src/content/labs/en/attraktor.yaml +++ b/src/content/labs/en/attraktor.yaml @@ -23,6 +23,6 @@ socialMedia: - type: youtube href: https://www.youtube.com/user/AttraktorHH hours: "<h3>For members</h3><p>24 h daily</p><hr/><h3>For guests and visitors</h3><ul><li>Tuesday: 19:00 Retro-Cafe</li><li>Wednesday: 19:00 Open-Lockpicking</li><li>Thursday: 19:00 Crafting Thursday</li><li>Friday: 19:00 Free-Funk</li></ul>" -directions: "<h3>Nearest underground/subway</h3><p>S Königsstraße, Altona</p>" +directions: "<h3>Address</h3><p>Eschelsweg 4</p><p>22767 Hamburg</p><hr/><h3>Nearest underground/subway</h3><p>S Königsstraße, Altona</p>" fees: "<p>32 € per month. Pupils/students: €9 per month However, there is also an individual social tariff if someone cannot afford it.</p>" machines: "<p>Wood Workshop: CNC wood mill 100x100cm, band saw, drill press, laser cutter 120x70cm</p> <p>Metal Workshop: Metal milling machine cover FP1, metal milling machine CNC 30x30cm, precision drilling machine, welding machine, melting & tempering furnace</p> <p>Electronics Workshop: Measuring devices, laboratory power supplies, soldering stations</p> <p>Sewing Workshop: Sewing machines, computerized embroidery machine, foil plotter, T-shirt press</p> <p>For Workshops: 10 laptops, 12 soldering stations with accessories, 12 Arduino kits, 3 3D printers, projector</p>" diff --git a/src/content/labs/en/curious.yaml b/src/content/labs/en/curious.yaml index c5a4d31f0..7ecba714a 100644 --- a/src/content/labs/en/curious.yaml +++ b/src/content/labs/en/curious.yaml @@ -22,6 +22,6 @@ socialMedia: - type: linkedin href: https://www.linkedin.com/groups/8872927/ hours: "<h3>For members</h3><p>24 h daily</p><hr/><h3>For guests and visitors</h3><ul><li>Dienstag: 18:00 Uhr Open Lab Day</li></ul>" -directions: "<h3>Nearest underground/subway</h3><p>U Meßberg or U/S Hauptbahnhof</p>" +directions: "<h3>Address</h3><p>Stockmeyerstraße 41, Halle 4k</p><p>20457 Hamburg</p><hr/><h3>Nearest underground/subway</h3><p>U Meßberg or U/S Hauptbahnhof</p>" fees: "<p>Regularly €25 per month. However, there is also an individual social tariff if someone cannot afford this. You can find our membership fee regulations at the following address curious.bio/beitragsordnung.</p>" machines: "<p>Greenhouses, clean workbench, autoclave, photometer, pH meter, centrifuges, magnetic heating stirrer, precision balance, orbital shaker, infrared sterilizer, vacuum pumps, incubators, fermenters (bioreactors), PCR thermal cycler, next generation DNA sequencer (NGS), pipettes, laboratory glassware, protective clothing, hazardous substances cabinet, freezer, washbasin; microscopes, computer workstation, LoRaWAN network, 3D printer" diff --git a/src/content/labs/en/fablabstpauli.yaml b/src/content/labs/en/fablabstpauli.yaml index 4a29806c7..96203d822 100644 --- a/src/content/labs/en/fablabstpauli.yaml +++ b/src/content/labs/en/fablabstpauli.yaml @@ -21,6 +21,6 @@ socialMedia: - type: instagram href: https://www.instagram.com/FabLabFabulousSt.Pauli hours: "<h3>For members</h3><p>24 h daily - However, access must be agreed</p><hr/><h3>For guests and visitors</h3><ul><li>Thursday: 17:00 Open Lab Day</li><li>after consultation </li></ul>" -directions: "<h3>Nearest underground/subway</h3><p>U Meßberg or U/S Hauptbahnhof</p>" +directions: "<h3>Address</h3><p>Stockmeyerstraße 43, Halle 4k</p><p>Enter from the waterfront</p><p>20457 Hamburg</p><hr/><h3>Nearest underground/subway</h3><p>U Meßberg or U/S Hauptbahnhof</p>" fees: "<p>Regular: €25 per month. For those who can't afford this, there is the More is not possible tariff: €10 - €20 per month (after consultation).</p>" -machines: "<p>3D printers: Ultimaker 2, Formlabs Form 3 LFS/SLA, Leapfrog Dual Extruder FDM, DLP Printer (in conversion); XYZ Printing 3D scanner 1.0 A (portable); </p><p>Plotting - Cutting: Epilog Zing laser cutter (60 W, 60 x 30 cm work surface), Secabo C60III cutting plotter, Craft Robo cutting plotter; </p><p>Milling: 3-axis CNC milling machine (self-made, 170x120 cm work surface), Roland iModela CNC milling machine, lathe;</p> <p>Electronics: Arduinos, soldering station, reflow oven, SM rework station, analog and digital oscilloscopes, AgIC circuit board printer, circuit board etching device, oscillator and more;</p> <p>Other equipment: laminator, sewing machine, punching machine, T-shirt press and various classic tools (drill press, saws, belt sander); </p><p>Repair tools: iFixit Manta Precision Bit Set, puller, bike repair stand" \ No newline at end of file +machines: "<p>3D printers: Ultimaker 2, Formlabs Form 3 LFS/SLA, Leapfrog Dual Extruder FDM, DLP Printer (in conversion); XYZ Printing 3D scanner 1.0 A (portable); </p><p>Plotting - Cutting: Epilog Zing laser cutter (60 W, 60 x 30 cm work surface), Secabo C60III cutting plotter, Craft Robo cutting plotter; </p><p>Milling: 3-axis CNC milling machine (self-made, 170x120 cm work surface), Roland iModela CNC milling machine, lathe;</p> <p>Electronics: Arduinos, soldering station, reflow oven, SM rework station, analog and digital oscilloscopes, AgIC circuit board printer, circuit board etching device, oscillator and more;</p> <p>Other equipment: laminator, sewing machine, punching machine, T-shirt press and various classic tools (drill press, saws, belt sander); </p><p>Repair tools: iFixit Manta Precision Bit Set, puller, bike repair stand" diff --git a/src/content/labs/en/hoacircularitylab.yaml b/src/content/labs/en/hoacircularitylab.yaml index b65ec4c50..b2a961706 100644 --- a/src/content/labs/en/hoacircularitylab.yaml +++ b/src/content/labs/en/hoacircularitylab.yaml @@ -21,6 +21,6 @@ socialMedia: - type: instagram href: https://www.instagram.com/wearall.clothing hours: "<h3>For members</h3><p>24 h daily</p><hr/><h3>For guests and visitors</h3><ul><li>Wednesday: 15:00 - 18:00</li><li>Thursday: 15:00 - 18:00</li><li>Friday: 15:00 - 18:00</li></ul>" -directions: "<h3>Nearest underground/subway</h3><p>U Stephansplatz, S Dammtor, U Gänsemarkt </p>" +directions: "<h3>Address</h3><p>Colonnaden 72</p><p>20354 Hamburg</p><hr/><h3>Nearest underground/subway</h3><p>U Stephansplatz, S Dammtor, U Gänsemarkt </p>" fees: "<p>60€/ month</p>" -machines: "<p>Tailor dummies m/f,</p> <p>Industrial sewing machines: 2x high-speed sewing machines, 1x Coverlock 5 thread, 2x Overlock 4</p> <p>Thread looms: Keyboard pattern loom, counter-marsh loom,</p> <p>TC2 knitting machines: brother KH830, brother KH860 double bed, form knitter, Intarsia carriage and other accessories, passap duomatic double bed 1x HILO spinning machine (OS), 3x e-spinner from HILO</p> <p>Laser cutter: Fabulaser Mini</p> <p>Dyeing kitchen: Natural dyeing of textiles</p> <p>3D printer embroidery machine buttonhole machine various hand tools & workbench with vice, soldering station (e-textiles), tuft gun</p> " \ No newline at end of file +machines: "<p>Tailor dummies m/f,</p> <p>Industrial sewing machines: 2x high-speed sewing machines, 1x Coverlock 5 thread, 2x Overlock 4</p> <p>Thread looms: Keyboard pattern loom, counter-marsh loom,</p> <p>TC2 knitting machines: brother KH830, brother KH860 double bed, form knitter, Intarsia carriage and other accessories, passap duomatic double bed 1x HILO spinning machine (OS), 3x e-spinner from HILO</p> <p>Laser cutter: Fabulaser Mini</p> <p>Dyeing kitchen: Natural dyeing of textiles</p> <p>3D printer embroidery machine buttonhole machine various hand tools & workbench with vice, soldering station (e-textiles), tuft gun</p> " diff --git a/src/content/labs/en/hofalab.yaml b/src/content/labs/en/hofalab.yaml index 29acba6c8..0a7cf1eb2 100644 --- a/src/content/labs/en/hofalab.yaml +++ b/src/content/labs/en/hofalab.yaml @@ -16,6 +16,6 @@ tags: - Electronics - Workshops hours: "<h3>For members</h3><p>Project-related after consultation 24 h daily</p><hr/><h3>For guests and visitors</h3><ul><li>Tuesday: 18:00 Open Lab Day</li></ul>" -directions: "<h3>Nearest underground/subway</h3><p>S Wilhelmsburg</p>" +directions: "<h3>Address</h3><p>Bürgerhaus Wilhelmsburg</p><p>Mengestraße 20</p><p>21107 Hamburg</p><hr/><h3>Nearest underground/subway</h3><p>S Wilhelmsburg</p>" fees: "<p>Regularly €5 per month. In addition to this contribution, members usually donate an amount of €20/month depending on their financial situation.</p>" -machines: "<p>3D printer:</p> <p>FDM: Prusa i3 MK3S+, 2x Prusa MINI+, Creality CR-30 Beltprinter, HyperCuboid (OLSK); </p><p>SLA: Elegoo Mars 2 PRO, Elegoo Mercury-Plus Wash&Cure </p><p>Plotting - Cutting: FABULASER MINI (CO2 40W, 60 x 40cm work surface), cutting plotter, pen plotter (self-made) </p><p>Milling: 3-axis CNC milling machine Makersmill (X 290 x Y 160 x Z 50mm) </p><p>Electronics: soldering station, (clamp) multimeter, analog oscilloscope, circuit boards, Dupont/JST connector assortment with pliers, etc. </p><p>Workshop equipment: (10x) soldering irons, RPI-400, RP2040, ESP32, Calliope, Teensy 4.0, Audioshields, Adafruit Circuit Playground, RPIZ SENSE HAT, sensor kit, relay boards, potentiometers, switches, breadboards, safety goggles, cable shears, etc. More </p><p>Equipment: Spot welder, Vector Network Analyzer (VNA), compressor, various classic tools (floor drill, jigsaw, impact drill, disk sander, Flex, multi-function tool, etc.). </p><p>Repair tools: tool trolley, screw clamps, etc.</p>" \ No newline at end of file +machines: "<p>3D printer:</p> <p>FDM: Prusa i3 MK3S+, 2x Prusa MINI+, Creality CR-30 Beltprinter, HyperCuboid (OLSK); </p><p>SLA: Elegoo Mars 2 PRO, Elegoo Mercury-Plus Wash&Cure </p><p>Plotting - Cutting: FABULASER MINI (CO2 40W, 60 x 40cm work surface), cutting plotter, pen plotter (self-made) </p><p>Milling: 3-axis CNC milling machine Makersmill (X 290 x Y 160 x Z 50mm) </p><p>Electronics: soldering station, (clamp) multimeter, analog oscilloscope, circuit boards, Dupont/JST connector assortment with pliers, etc. </p><p>Workshop equipment: (10x) soldering irons, RPI-400, RP2040, ESP32, Calliope, Teensy 4.0, Audioshields, Adafruit Circuit Playground, RPIZ SENSE HAT, sensor kit, relay boards, potentiometers, switches, breadboards, safety goggles, cable shears, etc. More </p><p>Equipment: Spot welder, Vector Network Analyzer (VNA), compressor, various classic tools (floor drill, jigsaw, impact drill, disk sander, Flex, multi-function tool, etc.). </p><p>Repair tools: tool trolley, screw clamps, etc.</p>" diff --git a/src/content/labs/en/huehnerposten.yaml b/src/content/labs/en/huehnerposten.yaml index d7c658ae7..d25521f23 100644 --- a/src/content/labs/en/huehnerposten.yaml +++ b/src/content/labs/en/huehnerposten.yaml @@ -15,6 +15,6 @@ tags: - Fab Lab / Open Workshop - Workshops hours: "<h3>For members</h3><p>No membership provided.</p><hr/><h3>For guests and visitors</h3><ul><li>Friday: 12:00 - 18:00</li><li>Saturday: 11:00 - 17:00</li><li>Every 3rd Sunday of the month: 13:00 - 18:00 </li></ul>" -directions: "<h3>Nearest underground/subway</h3><p>Hauptbahnhof, U Steinstraße</p>" +directions: "<h3>Address</h3><p>Hühnerposten 1</p><p>20097 Hamburg</p><hr/><h3>Nearest underground/subway</h3><p>Hauptbahnhof, U Steinstraße</p>" fees: "<p>Use is largely free of charge.</p>" machines: "<p>3D printer: HyperCuboid (OLSK); </p><p>Plotting - Cutting: FABULASER MINI (CO2 40W, 60 x 40cm work surface), Silhouette Cameo 4 PRO cutting plotter (61 cm material width, 3 mm material thickness) </p><p>Milling: 3-axis CNC milling machine ULTIMATE Bee (X 530 x Y 760 x Z 125mm) </p><p>Electronics: soldering stations, multimeters, circuit boards, etc. </p><p>Other devices: compressor, various classic tools (floor drill, jigsaw, drill driver, Flex, multifunctional tools, etc.) </p><p>Repair tools: tool trolley, screw clamps, etc.</p>" diff --git a/src/content/labs/en/lurup.yaml b/src/content/labs/en/lurup.yaml index c45a6649a..08a16a9d6 100644 --- a/src/content/labs/en/lurup.yaml +++ b/src/content/labs/en/lurup.yaml @@ -21,6 +21,6 @@ socialMedia: - type: instagram href: https://www.instagram.com/insel_e.v_altona/ hours: "<h3>For members</h3><p>24 h daily</p><hr/><h3>For guests and visitors</h3><ul><li>Tuesday: 11:00 - 16:00</li><li>Wednesday: 11:00 - 16:00</li><li>Thursday: 11:00 - 16:00</li></ul>" -directions: "<h3>Nearest underground/subway</h3><p>Bus: Vorhornweg</p>" +directions: "<h3>Address</h3><p>Elbgaustr. 244</p><p>22547 Hamburg</><hr/><h3>Nearest underground/subway</h3><p>Bus: Vorhornweg</p>" fees: "<p>All offers are free of charge</p>" -machines: "<p>3D printers: 2x Prusa MK3, 1x Prusa Mini, 1x Creality CR6-Max, 1x Creality CR-30 Printmill, 2x Open Source Desktop 3D printers (min. 20 x 20 x 25 cm - max. 40 x 40×40 cm) </p><p>Other: Metal furnaces (up to 1300°C), injection lever press, extrusion machine, 2x granulate mills from Getecha</p>" \ No newline at end of file +machines: "<p>3D printers: 2x Prusa MK3, 1x Prusa Mini, 1x Creality CR6-Max, 1x Creality CR-30 Printmill, 2x Open Source Desktop 3D printers (min. 20 x 20 x 25 cm - max. 40 x 40×40 cm) </p><p>Other: Metal furnaces (up to 1300°C), injection lever press, extrusion machine, 2x granulate mills from Getecha</p>" diff --git a/src/content/labs/en/openlab.yaml b/src/content/labs/en/openlab.yaml index ce16e1d7f..fc717fcfb 100644 --- a/src/content/labs/en/openlab.yaml +++ b/src/content/labs/en/openlab.yaml @@ -29,11 +29,11 @@ socialMedia: - type: x href: https://www.twitter.com/openlabhamburg hours: "<h3>For members</h3><p>No membership necessary.</p><hr/><h3>For guests and visitors</h3><ul><li>Tuesday: 14:00 - 18:00</li></ul>" -directions: "<h3>Nearest underground/subway</h3><p>U Wandsbek-Markt (3 km); U Horner Rennbahn (3 km)</p>" +directions: "<h3>Address</h3><p>OpenLab Hamburg</p><p>Helmut Schmidt University</p><p>Laboratory Production Engineering</p><p>Holstenhofweg 85</p><p>22043 Hamburg</p><hr/><h3>Nearest underground/subway</h3><p>U Wandsbek-Markt (3 km); U Horner Rennbahn (3 km)</p>" fees: "<p>Use of all machines free of charge. You only need to bring your own materials.</p>" machines: "<p>3D printers: Ultimaker Extended 2+ (5x), Ultimaker 2+ (1x), Ultimaker 3 (2x), +, Prusa I3 MK3S (6x), Prusa MINI+ (4x), Prusa I3 MK2S (1x),Prusa I3 MK2.5S (1x), BigRep ONE build volume: 1005 x 1005 x 1005 mm; </p><p>Plotting - Cutting: trotec speedy 100 C 40 laser cutter (40 W, 60 x 30 cm work surface) </p><p>Milling: BZT 3-axis CNC milling machine PFE1510 PX (995x1550 mm work surface), Roland monoFab CNC milling machine SRM-20, isel ICV4030 CNC milling machine, PROXXON fine milling machine FF500 </p><p>Lathe: Proxxon PD 400 precision lathe </p><p>Electronics: soldering stations, PeakTech DC Power Supply 6060, PeakTech Professionel Digital Multimeter 3315USB and more -</p><p>Other devices: Proxxon DS 460 scroll saw, Rema ECO 150 double sander, Proxxon FET fine circular saw, floor-standing drill, Proxxon KGS 80 mitre saw, HAZET workshop trolley and more</p>" \ No newline at end of file +</p><p>Other devices: Proxxon DS 460 scroll saw, Rema ECO 150 double sander, Proxxon FET fine circular saw, floor-standing drill, Proxxon KGS 80 mitre saw, HAZET workshop trolley and more</p>" diff --git a/src/content/labs/en/welcomewerkstatt.yaml b/src/content/labs/en/welcomewerkstatt.yaml index 52b451445..4fae9aeed 100644 --- a/src/content/labs/en/welcomewerkstatt.yaml +++ b/src/content/labs/en/welcomewerkstatt.yaml @@ -21,6 +21,6 @@ socialMedia: - type: instagram href: https://www.instagram.com/welcome.werkstatt/ hours: "<h3>For members</h3><p>24 h daily</p><hr/><h3>For guests and visitors</h3><ul><li>Saturday: 14:00 - 18:00</li></ul>" -directions: "<h3>Nearest underground/subway</h3><p>S Königsstraße, Altona</p>" +directions: "<h3>Address</h3><p>Welcome Werkstatt e. V.</p><p>Bachstraße 98</p><p>22083 Hamburg</p><hr/><h3>Nearest underground/subway</h3><p>U Mundsburg, U Hamburger Straße; U Borgweg; Bus: Mozartstraße</p>" fees: "<p>Regularly €25 / month. But we also have an individual social tariff if someone can't afford it.</p>" -machines: "<p>Circular saw, band saw, cross-cut saw, lathe, thickness & jointer, stationary router, routers, small CNC router, jigsaws, plunge saws, all conceivable grinders, dowel cutters, welding equipment, angle grinders, sewing machines, 3D printers, soldering equipment</p>" \ No newline at end of file +machines: "<p>Circular saw, band saw, cross-cut saw, lathe, thickness & jointer, stationary router, routers, small CNC router, jigsaws, plunge saws, all conceivable grinders, dowel cutters, welding equipment, angle grinders, sewing machines, 3D printers, soldering equipment</p>" -- GitLab