diff --git a/README.md b/README.md index f3f6936..795f9fa 100644 --- a/README.md +++ b/README.md @@ -19,3 +19,4 @@ A. Herstellung des Lampenschirms aus Myzelmaterial B. Vorbereitung des Lampenstiels C. Herstellung des Lampenfußes aus CoRncrete D. Installation der Elektrik und Fertigstellung der Lampe + diff --git a/bom.csv b/bom.csv index 01fefd4..7f3337b 100644 --- a/bom.csv +++ b/bom.csv @@ -42,7 +42,7 @@ POS,PHASE,NAME,UNITS,DESCRIPTION,SOURCE,LINK 26,D,alternativ: Lampenfassung E27,1,Lampenfassung E27 mit Stoffkabel in schwarz,IKEA,https://www.ikea.com/de/de/p/havsris-aufhaengung-mit-schalter-textil-schwarz-10511109/ 27,D,Leuchtmittel,1,E14 LED Leuchtmittel mit 4-6 Watt in Warmweiß. Schlanke Form,Baumarkt z.B. OBI oder OBI,https://www.obi.de/e14-led/osram-led-lampe-classic-t-form-klar-e14-4w-470-lm-warmweiss/p/8471187 28,D,Klettkabelbinder,2,Klett Kabelbinder oder normale Kabelbinder,Baumarkt z.B. bei OBI,https://www.obi.de/zubehoer-fuer-computer-multimedia/schwaiger-klett-kabelbinder-rolle-doppelseitig-ltc-roll-straps-mehrfarbig/p/8368805 -29,B,Holzdübel,1,Holzdübel Ø 8mm,Baumarkt, +29,B,Holzdübel,2,Holzdübel Ø 8mm,Baumarkt, ,,,,,, ,," Lampenfuß",,,, ,,,,,, diff --git a/res/assets/media/02-k.jpg b/res/assets/media/02-k.jpg deleted file mode 100644 index 5b815bd..0000000 Binary files a/res/assets/media/02-k.jpg and /dev/null differ diff --git a/res/assets/media/03ak.jpg b/res/assets/media/03ak.jpg deleted file mode 100644 index 2dfb4e0..0000000 Binary files a/res/assets/media/03ak.jpg and /dev/null differ diff --git a/res/assets/media/04-k.jpg b/res/assets/media/04-k.jpg deleted file mode 100644 index b690bf2..0000000 Binary files a/res/assets/media/04-k.jpg and /dev/null differ diff --git a/res/assets/media/06_k.jpg b/res/assets/media/06_k.jpg deleted file mode 100644 index f856a94..0000000 Binary files a/res/assets/media/06_k.jpg and /dev/null differ diff --git a/res/assets/media/2_mitte.jpg b/res/assets/media/2_mitte.jpg deleted file mode 100644 index 42b25fd..0000000 Binary files a/res/assets/media/2_mitte.jpg and /dev/null differ diff --git a/res/assets/media/2_start_fertig.jpg b/res/assets/media/2_start_fertig.jpg deleted file mode 100644 index 1623836..0000000 Binary files a/res/assets/media/2_start_fertig.jpg and /dev/null differ diff --git a/res/assets/media/5_gefüllt.jpg b/res/assets/media/5_gefüllt.jpg deleted file mode 100644 index 6abeccc..0000000 Binary files a/res/assets/media/5_gefüllt.jpg and /dev/null differ diff --git a/res/assets/media/6_fertig.jpg b/res/assets/media/6_fertig.jpg deleted file mode 100644 index ffa9e81..0000000 Binary files a/res/assets/media/6_fertig.jpg and /dev/null differ diff --git a/res/assets/media/6_tag0.jpg b/res/assets/media/6_tag0.jpg deleted file mode 100644 index 6913942..0000000 Binary files a/res/assets/media/6_tag0.jpg and /dev/null differ diff --git a/res/assets/media/6_tag3.jpg b/res/assets/media/6_tag3.jpg deleted file mode 100644 index d33eca7..0000000 Binary files a/res/assets/media/6_tag3.jpg and /dev/null differ diff --git a/res/assets/media/6_tag7.jpg b/res/assets/media/6_tag7.jpg deleted file mode 100644 index 2375a10..0000000 Binary files a/res/assets/media/6_tag7.jpg and /dev/null differ diff --git a/res/assets/media/7_Tüte_Zu.jpg b/res/assets/media/7_Tüte_Zu.jpg deleted file mode 100644 index 5a36ded..0000000 Binary files a/res/assets/media/7_Tüte_Zu.jpg and /dev/null differ diff --git a/res/assets/media/7_Tüte_offen.jpg b/res/assets/media/7_Tüte_offen.jpg deleted file mode 100644 index 14b655a..0000000 Binary files a/res/assets/media/7_Tüte_offen.jpg and /dev/null differ diff --git a/res/assets/media/7_nachher.jpg b/res/assets/media/7_nachher.jpg deleted file mode 100644 index dd06e7e..0000000 Binary files a/res/assets/media/7_nachher.jpg and /dev/null differ diff --git a/res/assets/media/7_vorher.jpg b/res/assets/media/7_vorher.jpg deleted file mode 100644 index bbf96e2..0000000 Binary files a/res/assets/media/7_vorher.jpg and /dev/null differ diff --git a/res/assets/media/8_backofen.jpg b/res/assets/media/8_backofen.jpg deleted file mode 100644 index ceb2858..0000000 Binary files a/res/assets/media/8_backofen.jpg and /dev/null differ diff --git a/res/assets/media/A1_SAB_rbg.png b/res/assets/media/A1_SAB_rbg.png new file mode 100644 index 0000000..fd922b4 Binary files /dev/null and b/res/assets/media/A1_SAB_rbg.png differ diff --git a/res/assets/media/A2_mitte.jpg b/res/assets/media/A2_mitte.jpg new file mode 100644 index 0000000..041774e Binary files /dev/null and b/res/assets/media/A2_mitte.jpg differ diff --git a/res/assets/media/A2_start_fertig.jpg b/res/assets/media/A2_start_fertig.jpg new file mode 100644 index 0000000..1f5eded Binary files /dev/null and b/res/assets/media/A2_start_fertig.jpg differ diff --git a/res/assets/media/A5_gefüllt.jpg b/res/assets/media/A5_gefüllt.jpg new file mode 100644 index 0000000..7ab3e05 Binary files /dev/null and b/res/assets/media/A5_gefüllt.jpg differ diff --git a/res/assets/media/A6_fertig.jpg b/res/assets/media/A6_fertig.jpg new file mode 100644 index 0000000..bb32f07 Binary files /dev/null and b/res/assets/media/A6_fertig.jpg differ diff --git a/res/assets/media/A6_tag0.jpg b/res/assets/media/A6_tag0.jpg new file mode 100644 index 0000000..efe2757 Binary files /dev/null and b/res/assets/media/A6_tag0.jpg differ diff --git a/res/assets/media/A6_tag3.jpg b/res/assets/media/A6_tag3.jpg new file mode 100644 index 0000000..9b86a3f Binary files /dev/null and b/res/assets/media/A6_tag3.jpg differ diff --git a/res/assets/media/A6_tag7.jpg b/res/assets/media/A6_tag7.jpg new file mode 100644 index 0000000..ec67fbe Binary files /dev/null and b/res/assets/media/A6_tag7.jpg differ diff --git a/res/assets/media/A7_Tüte_Zu.jpg b/res/assets/media/A7_Tüte_Zu.jpg new file mode 100644 index 0000000..93ab1ee Binary files /dev/null and b/res/assets/media/A7_Tüte_Zu.jpg differ diff --git a/res/assets/media/A7_Tüte_offen.jpg b/res/assets/media/A7_Tüte_offen.jpg new file mode 100644 index 0000000..d930e38 Binary files /dev/null and b/res/assets/media/A7_Tüte_offen.jpg differ diff --git a/res/assets/media/A7_nachher.jpg b/res/assets/media/A7_nachher.jpg new file mode 100644 index 0000000..0baf2f1 Binary files /dev/null and b/res/assets/media/A7_nachher.jpg differ diff --git a/res/assets/media/A7_vorher.jpg b/res/assets/media/A7_vorher.jpg new file mode 100644 index 0000000..e005c26 Binary files /dev/null and b/res/assets/media/A7_vorher.jpg differ diff --git a/res/assets/media/A8_backofen.jpg b/res/assets/media/A8_backofen.jpg new file mode 100644 index 0000000..ff6818d Binary files /dev/null and b/res/assets/media/A8_backofen.jpg differ diff --git a/res/assets/media/B_01.jpg b/res/assets/media/B_01.jpg new file mode 100644 index 0000000..169c8fd Binary files /dev/null and b/res/assets/media/B_01.jpg differ diff --git a/res/assets/media/B_02.jpg b/res/assets/media/B_02.jpg new file mode 100644 index 0000000..87dc19e Binary files /dev/null and b/res/assets/media/B_02.jpg differ diff --git a/res/assets/media/B_03.jpg b/res/assets/media/B_03.jpg new file mode 100644 index 0000000..aae60a7 Binary files /dev/null and b/res/assets/media/B_03.jpg differ diff --git a/res/assets/media/C_CoRncrete_Mix.jpg b/res/assets/media/C_CoRncrete_Mix.jpg new file mode 100644 index 0000000..2e75862 Binary files /dev/null and b/res/assets/media/C_CoRncrete_Mix.jpg differ diff --git a/res/assets/media/C_CornCrete_variationen.jpg b/res/assets/media/C_CornCrete_variationen.jpg new file mode 100644 index 0000000..23ded80 Binary files /dev/null and b/res/assets/media/C_CornCrete_variationen.jpg differ diff --git a/res/assets/media/PXL_20230109_163447957-removebg-preview.png b/res/assets/media/C_CornCrete_variationen_rbg.png similarity index 100% rename from res/assets/media/PXL_20230109_163447957-removebg-preview.png rename to res/assets/media/C_CornCrete_variationen_rbg.png diff --git a/res/assets/media/PXL_20230109_175427735-removebg-preview.png b/res/assets/media/C_Fuß1_rbg.png similarity index 100% rename from res/assets/media/PXL_20230109_175427735-removebg-preview.png rename to res/assets/media/C_Fuß1_rbg.png diff --git a/res/assets/media/PXL_20230109_175414403-removebg-preview.png b/res/assets/media/C_Fuß2_rbg.png similarity index 100% rename from res/assets/media/PXL_20230109_175414403-removebg-preview.png rename to res/assets/media/C_Fuß2_rbg.png diff --git a/res/assets/media/C_Fuß_Form.jpg b/res/assets/media/C_Fuß_Form.jpg new file mode 100644 index 0000000..7fc5fc3 Binary files /dev/null and b/res/assets/media/C_Fuß_Form.jpg differ diff --git a/res/assets/media/C_Fuß_fertig.jpg b/res/assets/media/C_Fuß_fertig.jpg new file mode 100644 index 0000000..28a3509 Binary files /dev/null and b/res/assets/media/C_Fuß_fertig.jpg differ diff --git a/res/assets/media/C_Fuß_fertig2.jpg b/res/assets/media/C_Fuß_fertig2.jpg new file mode 100644 index 0000000..fb0ac91 Binary files /dev/null and b/res/assets/media/C_Fuß_fertig2.jpg differ diff --git a/res/assets/media/PXL_20230106_172857166-removebg-preview (1).png b/res/assets/media/C_Mix_rbg.png similarity index 100% rename from res/assets/media/PXL_20230106_172857166-removebg-preview (1).png rename to res/assets/media/C_Mix_rbg.png diff --git a/res/assets/media/D3_rbg.png b/res/assets/media/D3_rbg.png new file mode 100644 index 0000000..e46621d Binary files /dev/null and b/res/assets/media/D3_rbg.png differ diff --git a/res/assets/media/D_1.jpg b/res/assets/media/D_1.jpg new file mode 100644 index 0000000..ea46c1a Binary files /dev/null and b/res/assets/media/D_1.jpg differ diff --git a/res/assets/media/D_1_rbg.png b/res/assets/media/D_1_rbg.png new file mode 100644 index 0000000..fad9f12 Binary files /dev/null and b/res/assets/media/D_1_rbg.png differ diff --git a/res/assets/media/D_2.jpg b/res/assets/media/D_2.jpg new file mode 100644 index 0000000..9452e69 Binary files /dev/null and b/res/assets/media/D_2.jpg differ diff --git a/res/assets/media/D_2_rbg.png b/res/assets/media/D_2_rbg.png new file mode 100644 index 0000000..ebb9c1a Binary files /dev/null and b/res/assets/media/D_2_rbg.png differ diff --git a/res/assets/media/D_3.jpg b/res/assets/media/D_3.jpg new file mode 100644 index 0000000..3b7a807 Binary files /dev/null and b/res/assets/media/D_3.jpg differ diff --git a/res/assets/media/D_4.jpg b/res/assets/media/D_4.jpg new file mode 100644 index 0000000..8f06bba Binary files /dev/null and b/res/assets/media/D_4.jpg differ diff --git a/res/assets/media/D_4_rbg.png b/res/assets/media/D_4_rbg.png new file mode 100644 index 0000000..4f5eb55 Binary files /dev/null and b/res/assets/media/D_4_rbg.png differ diff --git a/res/assets/media/D_5.jpg b/res/assets/media/D_5.jpg new file mode 100644 index 0000000..bb25c76 Binary files /dev/null and b/res/assets/media/D_5.jpg differ diff --git a/res/assets/media/D_5_rbg.png b/res/assets/media/D_5_rbg.png new file mode 100644 index 0000000..7c40812 Binary files /dev/null and b/res/assets/media/D_5_rbg.png differ diff --git a/res/assets/media/F_CoRncrete_Mix.jpg b/res/assets/media/F_CoRncrete_Mix.jpg deleted file mode 100644 index 6f5475a..0000000 Binary files a/res/assets/media/F_CoRncrete_Mix.jpg and /dev/null differ diff --git a/res/assets/media/F_CornCrete_variationen.jpg b/res/assets/media/F_CornCrete_variationen.jpg deleted file mode 100644 index 5bffc6f..0000000 Binary files a/res/assets/media/F_CornCrete_variationen.jpg and /dev/null differ diff --git a/res/assets/media/F_Fuß_Form.jpg b/res/assets/media/F_Fuß_Form.jpg deleted file mode 100644 index 963e1c0..0000000 Binary files a/res/assets/media/F_Fuß_Form.jpg and /dev/null differ diff --git a/res/assets/media/F_Fuß_fertig.jpg b/res/assets/media/F_Fuß_fertig.jpg deleted file mode 100644 index 9bbd195..0000000 Binary files a/res/assets/media/F_Fuß_fertig.jpg and /dev/null differ diff --git a/res/assets/media/F_Fuß_fertig2.jpg b/res/assets/media/F_Fuß_fertig2.jpg deleted file mode 100644 index 29628d8..0000000 Binary files a/res/assets/media/F_Fuß_fertig2.jpg and /dev/null differ diff --git a/res/assets/media/IMG_0723-removebg-preview.png b/res/assets/media/IMG_0723-removebg-preview.png deleted file mode 100644 index 869f6bf..0000000 Binary files a/res/assets/media/IMG_0723-removebg-preview.png and /dev/null differ diff --git a/res/assets/media/PXL_20230106_172857166-removebg-preview.png b/res/assets/media/PXL_20230106_172857166-removebg-preview.png deleted file mode 100644 index 72018a5..0000000 Binary files a/res/assets/media/PXL_20230106_172857166-removebg-preview.png and /dev/null differ diff --git a/res/assets/media/S_01.jpg b/res/assets/media/S_01.jpg deleted file mode 100644 index 3ac4cf3..0000000 Binary files a/res/assets/media/S_01.jpg and /dev/null differ diff --git a/res/assets/media/S_02.jpg b/res/assets/media/S_02.jpg deleted file mode 100644 index 0f731e8..0000000 Binary files a/res/assets/media/S_02.jpg and /dev/null differ diff --git a/res/assets/media/S_03.jpg b/res/assets/media/S_03.jpg deleted file mode 100644 index ff736e7..0000000 Binary files a/res/assets/media/S_03.jpg and /dev/null differ diff --git a/res/assets/media/X_02-k.jpg b/res/assets/media/X_02-k.jpg new file mode 100644 index 0000000..2976bee Binary files /dev/null and b/res/assets/media/X_02-k.jpg differ diff --git a/res/assets/media/X_03ak.jpg b/res/assets/media/X_03ak.jpg new file mode 100644 index 0000000..2b68eef Binary files /dev/null and b/res/assets/media/X_03ak.jpg differ diff --git a/res/assets/media/X_06_k.jpg b/res/assets/media/X_06_k.jpg new file mode 100644 index 0000000..6ec7c1f Binary files /dev/null and b/res/assets/media/X_06_k.jpg differ diff --git a/res/assets/media/X_4-k.jpg b/res/assets/media/X_4-k.jpg new file mode 100644 index 0000000..d9102e1 Binary files /dev/null and b/res/assets/media/X_4-k.jpg differ