Skip to content

Commit

Permalink
Merge branch 'v3' of https://github.com/bionanoimaging/UC2-GIT into v3
Browse files Browse the repository at this point in the history
  • Loading branch information
@b286
b286 committed Jan 12, 2021
2 parents 07c8a7f + c398e07 commit 94b8c59
Show file tree
Hide file tree
Showing 50 changed files with 451 additions and 2,122 deletions.
176 changes: 0 additions & 176 deletions APPLICATIONS/APP_Abbe_Setup/config.json
View file

Large diffs are not rendered by default.

59 changes: 0 additions & 59 deletions APPLICATIONS/APP_Double-slit_Experiment/config.json
View file

Large diffs are not rendered by default.

51 changes: 0 additions & 51 deletions APPLICATIONS/APP_INLINE_HOLOGRAM/config.json
View file

Large diffs are not rendered by default.

73 changes: 0 additions & 73 deletions APPLICATIONS/APP_Incubator_Microscope/config.json
View file

Large diffs are not rendered by default.

74 changes: 0 additions & 74 deletions APPLICATIONS/APP_Incubator_Microscope_fluorescence/config.json
View file

Large diffs are not rendered by default.

154 changes: 2 additions & 152 deletions APPLICATIONS/APP_LIGHTSHEET_Workshop/config.json
View file

Large diffs are not rendered by default.

147 changes: 0 additions & 147 deletions APPLICATIONS/APP_Mach-Zehnder_Interferometer/config.json
View file

Large diffs are not rendered by default.

105 changes: 0 additions & 105 deletions APPLICATIONS/APP_Michelson_Interferometer/config.json
View file

Large diffs are not rendered by default.

37 changes: 0 additions & 37 deletions APPLICATIONS/APP_SIMPLE-Projector/config.json
View file
@@ -1,7 +1,6 @@
{
"name": "APP_SIMPLE-Projector",
"description": "This SIMPLE experiment shown the image formation done by a single lens. ",
"githublink": "https://github.com/bionanoimaging/UC2-GIT/tree/master/APPLICATIONS/APP_SIMPLE-Projector",
"image": "https://github.com/bionanoimaging/UC2-GIT/blob/master/APPLICATIONS/APP_SIMPLE-Projector/IMAGES/UC2_Setups_12_Projector.png?raw=true",
"price": 0,
"type": "application",
Expand All @@ -10,7 +9,6 @@
{
"name": "ASSEMBLY_Baseplate",
"description": "",
"githublink": "https://github.com/bionanoimaging/UC2-GIT/tree/v3/CAD/ASSEMBLY_Baseplate",
"image": "",
"price": "",
"fixedOptions": {},
Expand All @@ -19,7 +17,6 @@
{
"name": "10_Base_puzzle_IM",
"description": "",
"githublink": "",
"image": "",
"price": 0.0,
"is_printable": false,
Expand All @@ -28,7 +25,6 @@
{
"name": "10_Base_puzzle_v3",
"description": "",
"githublink": "https://github.com/bionanoimaging/UC2-GIT/blob/v3/CAD/RAW/STL/UC2_v3_10_Base_puzzle_v3.stl",
"image": "",
"price": 0.3,
"is_printable": true,
Expand All @@ -37,7 +33,6 @@
{
"name": "Ballmagnets",
"description": "",
"githublink": "https://www.magnetmax.de/Neodym-Kugelmagnete/Magnetkugel-Kugelmagnet-O-5-0-mm-Neodym-vernickelt-N40-haelt-400-g::158.html",
"image": "",
"price": 0.47,
"is_printable": false,
Expand All @@ -48,7 +43,6 @@
{
"name": "ASSEMBLY_Baseplate",
"description": "",
"githublink": "https://github.com/bionanoimaging/UC2-GIT/tree/v3/CAD/ASSEMBLY_Baseplate",
"image": "",
"price": "",
"fixedOptions": {},
Expand All @@ -57,7 +51,6 @@
{
"name": "10_Base_puzzle_IM",
"description": "",
"githublink": "",
"image": "",
"price": 0.0,
"is_printable": false,
Expand All @@ -66,7 +59,6 @@
{
"name": "10_Base_puzzle_v3",
"description": "",
"githublink": "https://github.com/bionanoimaging/UC2-GIT/blob/v3/CAD/RAW/STL/UC2_v3_10_Base_puzzle_v3.stl",
"image": "",
"price": 0.3,
"is_printable": true,
Expand All @@ -75,7 +67,6 @@
{
"name": "Ballmagnets",
"description": "",
"githublink": "https://www.magnetmax.de/Neodym-Kugelmagnete/Magnetkugel-Kugelmagnet-O-5-0-mm-Neodym-vernickelt-N40-haelt-400-g::158.html",
"image": "",
"price": 0.47,
"is_printable": false,
Expand All @@ -86,7 +77,6 @@
{
"name": "ASSEMBLY_Baseplate",
"description": "",
"githublink": "https://github.com/bionanoimaging/UC2-GIT/tree/v3/CAD/ASSEMBLY_Baseplate",
"image": "",
"price": "",
"fixedOptions": {},
Expand All @@ -95,7 +85,6 @@
{
"name": "10_Base_puzzle_IM",
"description": "",
"githublink": "",
"image": "",
"price": 0.0,
"is_printable": false,
Expand All @@ -104,7 +93,6 @@
{
"name": "10_Base_puzzle_v3",
"description": "",
"githublink": "https://github.com/bionanoimaging/UC2-GIT/blob/v3/CAD/RAW/STL/UC2_v3_10_Base_puzzle_v3.stl",
"image": "",
"price": 0.3,
"is_printable": true,
Expand All @@ -113,7 +101,6 @@
{
"name": "Ballmagnets",
"description": "",
"githublink": "https://www.magnetmax.de/Neodym-Kugelmagnete/Magnetkugel-Kugelmagnet-O-5-0-mm-Neodym-vernickelt-N40-haelt-400-g::158.html",
"image": "",
"price": 0.47,
"is_printable": false,
Expand All @@ -124,7 +111,6 @@
{
"name": "ASSEMBLY_CUBE_Flashlight",
"description": "",
"githublink": "https://github.com/bionanoimaging/UC2-GIT/tree/v3/CAD/ASSEMBLY_CUBE_Flashlight",
"image": "",
"price": 7.2,
"fixedOptions": {},
Expand All @@ -133,7 +119,6 @@
{
"name": "10_Cube_1x1_IM",
"description": "",
"githublink": "",
"image": "",
"price": 0.0,
"is_printable": false,
Expand All @@ -142,7 +127,6 @@
{
"name": "10_Cube_1x1_v3",
"description": "",
"githublink": "https://github.com/bionanoimaging/UC2-GIT/blob/v3/CAD/RAW/STL/UC2_v3_10_Cube_1x1_v3_78.stl",
"image": "",
"price": 0.4,
"is_printable": true,
Expand All @@ -151,7 +135,6 @@
{
"name": "10_Lid_1x1_v3",
"description": "",
"githublink": "https://github.com/bionanoimaging/UC2-GIT/blob/v3/CAD/RAW/STL/UC2_v3_10_Lid_1x1_v3_80.stl",
"image": "",
"price": 0.2,
"is_printable": true,
Expand All @@ -160,7 +143,6 @@
{
"name": "Screws M3x12",
"description": "",
"githublink": "https://eshop.wuerth.de/Zylinderschraube-mit-Innensechskant-SHR-ZYL-ISO4762-88-IS25-A2K-M3X12/00843%20%2012.sku/de/DE/EUR/",
"image": "",
"price": 0.2,
"is_printable": false,
Expand All @@ -169,7 +151,6 @@
{
"name": "Screws (set) M5\u00d78",
"description": "",
"githublink": "https://eshop.wuerth.de/Produktkategorien/ISO-4026-Stahl-45H-verzinkt/14013511052004.cyid/1401.cgid/de/DE/EUR/?CatalogCategoryRef=14013511052004%40WuerthGroup-Wuerth-1401&SelectedFilterAttribut=%255B%257B%2522name%2522%253A%2522AT_ThreadTypeXNominalDiameter%2522%252C%2522value%2522%253A%255B%2522M5%2522%255D%252C%2522title%2522%253A%2522Gewindeart%2520x%2520Nenndurchmesser%2522%257D%252C%257B%2522name%2522%253A%2522AT_Length%2522%252C%2522value%2522%253A%255B%25228%2520mm%2522%255D%252C%2522title%2522%253A%2522L%25C3%25A4nge%2522%257D%255D",
"image": "",
"price": 0.1,
"is_printable": false,
Expand All @@ -178,7 +159,6 @@
{
"name": "20_Cube_Insert_Holder-okular+flashlight_v3",
"description": "",
"githublink": "https://github.com/bionanoimaging/UC2-GIT/blob/v3/CAD/RAW/STL/UC2_v3_20_Cube_Insert_Holder-okular%2Bflashlight_v3_14.stl",
"image": "",
"price": 0.2,
"is_printable": true,
Expand All @@ -187,7 +167,6 @@
{
"name": "Flashlight",
"description": "",
"githublink": "https://www.pollin.de/p/led-taschenlampe-alu-5-w-cree-led-864151",
"image": "",
"price": 7.0,
"is_printable": false,
Expand All @@ -198,7 +177,6 @@
{
"name": "ASSEMBLY_CUBE_Lens_small",
"description": "",
"githublink": "https://github.com/bionanoimaging/UC2-GIT/tree/v3/CAD/ASSEMBLY_CUBE_Lens_small",
"image": "",
"price": 0.3,
"fixedOptions": {},
Expand All @@ -207,7 +185,6 @@
{
"name": "10_Cube_1x1_IM",
"description": "",
"githublink": "",
"image": "",
"price": 0.0,
"is_printable": false,
Expand All @@ -216,7 +193,6 @@
{
"name": "10_Cube_1x1_v3",
"description": "",
"githublink": "https://github.com/bionanoimaging/UC2-GIT/blob/v3/CAD/RAW/STL/UC2_v3_10_Cube_1x1_v3_78.stl",
"image": "",
"price": 0.4,
"is_printable": true,
Expand All @@ -225,7 +201,6 @@
{
"name": "10_Lid_1x1_v3",
"description": "",
"githublink": "https://github.com/bionanoimaging/UC2-GIT/blob/v3/CAD/RAW/STL/UC2_v3_10_Lid_1x1_v3_80.stl",
"image": "",
"price": 0.2,
"is_printable": true,
Expand All @@ -234,7 +209,6 @@
{
"name": "Screws M3x12",
"description": "",
"githublink": "https://eshop.wuerth.de/Zylinderschraube-mit-Innensechskant-SHR-ZYL-ISO4762-88-IS25-A2K-M3X12/00843%20%2012.sku/de/DE/EUR/",
"image": "",
"price": 0.2,
"is_printable": false,
Expand All @@ -243,7 +217,6 @@
{
"name": "Screws (set) M5\u00d78",
"description": "",
"githublink": "https://eshop.wuerth.de/Produktkategorien/ISO-4026-Stahl-45H-verzinkt/14013511052004.cyid/1401.cgid/de/DE/EUR/?CatalogCategoryRef=14013511052004%40WuerthGroup-Wuerth-1401&SelectedFilterAttribut=%255B%257B%2522name%2522%253A%2522AT_ThreadTypeXNominalDiameter%2522%252C%2522value%2522%253A%255B%2522M5%2522%255D%252C%2522title%2522%253A%2522Gewindeart%2520x%2520Nenndurchmesser%2522%257D%252C%257B%2522name%2522%253A%2522AT_Length%2522%252C%2522value%2522%253A%255B%25228%2520mm%2522%255D%252C%2522title%2522%253A%2522L%25C3%25A4nge%2522%257D%255D",
"image": "",
"price": 0.1,
"is_printable": false,
Expand All @@ -252,7 +225,6 @@
{
"name": "20_Insert_Lens_holder_v3",
"description": "",
"githublink": "https://www.thingiverse.com/thing:4377691",
"image": "",
"price": 0.3,
"is_printable": true,
Expand All @@ -261,7 +233,6 @@
{
"name": "Lens: diameter 9-42 mm",
"description": "",
"githublink": "",
"image": "",
"price": 0.0,
"is_printable": false,
Expand All @@ -272,7 +243,6 @@
{
"name": "ASSEMBLY_CUBE_Sample_Holder",
"description": "",
"githublink": "https://github.com/bionanoimaging/UC2-GIT/tree/v3/CAD/ASSEMBLY_CUBE_Sample_Holder",
"image": "",
"price": 0.3,
"fixedOptions": {},
Expand All @@ -281,7 +251,6 @@
{
"name": "10_Cube_1x1_IM",
"description": "",
"githublink": "",
"image": "",
"price": 0.0,
"is_printable": false,
Expand All @@ -290,7 +259,6 @@
{
"name": "10_Cube_1x1_v3",
"description": "",
"githublink": "https://github.com/bionanoimaging/UC2-GIT/blob/v3/CAD/RAW/STL/UC2_v3_10_Cube_1x1_v3_78.stl",
"image": "",
"price": 0.4,
"is_printable": true,
Expand All @@ -299,7 +267,6 @@
{
"name": "10_Lid_1x1_v3",
"description": "",
"githublink": "https://github.com/bionanoimaging/UC2-GIT/blob/v3/CAD/RAW/STL/UC2_v3_10_Lid_1x1_v3_80.stl",
"image": "",
"price": 0.2,
"is_printable": true,
Expand All @@ -308,7 +275,6 @@
{
"name": "Screws M3x12",
"description": "",
"githublink": "https://eshop.wuerth.de/Zylinderschraube-mit-Innensechskant-SHR-ZYL-ISO4762-88-IS25-A2K-M3X12/00843%20%2012.sku/de/DE/EUR/",
"image": "",
"price": 0.2,
"is_printable": false,
Expand All @@ -317,7 +283,6 @@
{
"name": "Screws (set) M5\u00d78",
"description": "",
"githublink": "https://eshop.wuerth.de/Produktkategorien/ISO-4026-Stahl-45H-verzinkt/14013511052004.cyid/1401.cgid/de/DE/EUR/?CatalogCategoryRef=14013511052004%40WuerthGroup-Wuerth-1401&SelectedFilterAttribut=%255B%257B%2522name%2522%253A%2522AT_ThreadTypeXNominalDiameter%2522%252C%2522value%2522%253A%255B%2522M5%2522%255D%252C%2522title%2522%253A%2522Gewindeart%2520x%2520Nenndurchmesser%2522%257D%252C%257B%2522name%2522%253A%2522AT_Length%2522%252C%2522value%2522%253A%255B%25228%2520mm%2522%255D%252C%2522title%2522%253A%2522L%25C3%25A4nge%2522%257D%255D",
"image": "",
"price": 0.1,
"is_printable": false,
Expand All @@ -326,7 +291,6 @@
{
"name": "20_Cube_insert_Sample_holder_v3",
"description": "",
"githublink": "https://github.com/bionanoimaging/UC2-GIT/blob/v3/CAD/RAW/STL/UC2_v3_20_Cube_insert_Sample_holder_v3_37.stl",
"image": "",
"price": 0.3,
"is_printable": true,
Expand All @@ -335,7 +299,6 @@
{
"name": "20_Cube_Insert_Sample_clamp_v3",
"description": "",
"githublink": "https://github.com/bionanoimaging/UC2-GIT/blob/v3/CAD/RAW/STL/UC2_v3_20_Cube_Insert_Sample_clamp_34.stl",
"image": "",
"price": 0.0,
"is_printable": true,
Expand Down

0 comments on commit 94b8c59

Please sign in to comment.