Commit graph

155 commits

Author SHA1 Message Date
lukas c2abf1a287 Merge pull request 'Bilder für mod/anchor' (#71) from mod-anchor-images into master
Reviewed-on: felix/myzel-akustikabsorber#71
2023-01-13 16:31:59 +01:00
lukas 5f83f4c777 Merge remote-tracking branch 'origin/master' into mod-anchor-images 2023-01-13 16:30:47 +01:00
lukas 48c003c745 Anker Bilder vervollständigen 2023-01-13 16:21:37 +01:00
thies d37209d09d Merge pull request 'add bom-mounting_system' (#79) from bom-mounting_system into master
Reviewed-on: felix/myzel-akustikabsorber#79
2023-01-12 20:42:55 +01:00
thies 017657338d bom-mounting add 2023-01-12 20:41:30 +01:00
thies a45516f167 Update Bom 2023-01-12 20:17:36 +01:00
thies 422803732d Merge pull request 'add bom-mould' (#77) from Bom-mould into master
Reviewed-on: felix/myzel-akustikabsorber#77
2023-01-12 20:01:31 +01:00
thies 5f3c29f83c add bom-mould 2023-01-12 20:00:10 +01:00
thies ede05f0e04 Merge pull request 'bom anker erstellt' (#76) from Bom-anchor into master
Reviewed-on: felix/myzel-akustikabsorber#76
2023-01-12 19:08:16 +01:00
thies 45c95924e5 bom anker erstellt 2023-01-12 19:06:44 +01:00
lukas e874feda12 Beispielbild für Titel hinzufügen 2023-01-12 19:00:56 +01:00
lukas b0cbeb925d anchor_align-top und anchor_align-iso hinzufügen 2023-01-12 18:42:51 +01:00
thies 5b0bee3ba9 Merge pull request 'Bom-material_fabrication' (#73) from Bom-material_fabrication into master
Reviewed-on: felix/myzel-akustikabsorber#73
2023-01-12 18:34:31 +01:00
thies c7139b6487 Add bom material_fabrication for 12 absorber 2023-01-12 18:32:11 +01:00
lukas 072b13bd41 Anker Bilder hinzufügen 2023-01-12 18:26:20 +01:00
thies f6dc1bf83d Merge pull request 'Readme-Korrektur' (#74) from Readme-Korrektur into master
Reviewed-on: felix/myzel-akustikabsorber#74
2023-01-12 17:58:57 +01:00
thies 89b815672d grund readme korreektur 2023-01-12 17:50:29 +01:00
thies 663b2e1d04 grundordner Readme korrektur 2023-01-12 17:29:23 +01:00
thies 55fac0e573 add stl data from CAD 2023-01-12 14:00:07 +01:00
thies 5460d97cd0 Merge remote-tracking branch 'origin/finish-readme.md' 2023-01-12 13:52:29 +01:00
lukas 56cae0f2ea Ankerposition anpassen 2023-01-12 13:52:07 +01:00
thies a6f3865299 bom material_fabtrication try2 2023-01-12 13:17:21 +01:00
thies 047d6861b4 Merge branch 'Bom-material_fabrication' of code.curious.bio:felix/myzel-akustikabsorber into Bom-material_fabrication 2023-01-12 12:46:45 +01:00
thies 9b3735bab4 bom material_fabrication try 2023-01-12 12:45:23 +01:00
thies cc4633e94b „mod/material_fabrication/bom.csv“ ändern 2023-01-12 12:33:12 +01:00
thies 732d7bd35b test 2023-01-12 12:20:10 +01:00
thies ef019582e4 bom material_fabrication update 2023-01-12 12:15:45 +01:00
thies d5efc96366 Merge pull request 'add file' (#72) from mounting_system_technische_zeichnung into master
Reviewed-on: felix/myzel-akustikabsorber#72
2023-01-12 12:05:38 +01:00
thies 629c881fd2 Merge pull request 'add file' (#72) from mounting_system_technische_zeichnung into master
Reviewed-on: felix/myzel-akustikabsorber#72
2023-01-12 10:17:45 +01:00
thies d7314222b1 Merge branch 'master' into mounting_system_technische_zeichnung 2023-01-12 10:17:22 +01:00
thies f60fb1ca5f add file 2023-01-11 22:07:28 +01:00
felix cc51bde9f5 finalisiere mould readme.md 2023-01-11 21:50:17 +01:00
felix ecbba0b630 finalisiere mould readme.md 2023-01-11 21:49:28 +01:00
lukas 96c362cb60 erstes Anker Bild hinzufügen 2023-01-11 19:06:26 +01:00
lukas 360cbceab5 Merge pull request 'mod/mould Bilder' (#65) from mod/mould-images into master
Reviewed-on: felix/myzel-akustikabsorber#65
2023-01-11 16:32:20 +01:00
lukas 602897e27c mod/mould-images mit Updates aus master für merge vorbereiten 2023-01-11 16:23:22 +01:00
lukas 082ec64f8c Bilder updaten 2023-01-11 16:11:50 +01:00
felix 1175e18b39 finalisiere mounting_system readme.md 2023-01-11 15:25:34 +01:00
felix 63b2d60d45 Finalisieren material_fabrication readme.md 2023-01-11 14:07:36 +01:00
thies f6997c5804 Merge pull request 'Grund-Readme Update' (#69) from Grundordner-readme into master
Reviewed-on: felix/myzel-akustikabsorber#69
2023-01-11 13:37:16 +01:00
thies 6bb062a29a Grund-Readme Update 2023-01-11 13:35:05 +01:00
thies 88ac826730 Merge pull request 'technische-zeichnung-anker' (#68) from technische-zeichnung-anker into master
Reviewed-on: felix/myzel-akustikabsorber#68
2023-01-11 10:45:31 +01:00
thies c6e8b82fe7 technische Zeichnungen Anker change 2023-01-11 10:39:55 +01:00
lukas a642a8bbeb Zusätzliche mould_cast_prep Schritte bebildern 2023-01-11 10:34:22 +01:00
lukas a2769a4bf8 Varianten löschen, weitere Bilder hochladen 2023-01-11 10:11:01 +01:00
lukas 0d7f0c9780 Varianten und .png entfernen 2023-01-10 17:08:18 +01:00
felix 6eafdfb783 finish anchor readme 2023-01-10 16:49:29 +01:00
thies 1837a9fe4c technische Zeichnungen Anker 2023-01-10 16:26:55 +01:00
felix 0a036d64de „workshop/day_2/README.md“ ändern 2023-01-10 13:41:28 +01:00
felix 341de2524f Merge pull request 'adding workshop folder structure' (#64) from workshop-structure into master
Reviewed-on: felix/myzel-akustikabsorber#64
2023-01-10 12:43:34 +01:00