diff --git a/data/material-containers/prusament-1kg-bottle.yaml b/data/material-containers/prusament-1kg-bottle.yaml new file mode 100644 index 0000000000..60cb6f0bdb --- /dev/null +++ b/data/material-containers/prusament-1kg-bottle.yaml @@ -0,0 +1,10 @@ +uuid: 4cb76d11-4e01-400c-b6b3-9cc73fa1d570 +slug: prusament-1kg-bottle +name: 1 kg bottle +class: SLA +brand: + slug: prusament-resin +volumetric_capacity: 950 +empty_weight: 120 +connector: + uuid: 8f548063-56b7-5bd2-a536-77c2bb8956a5 diff --git a/data/material-containers/prusament-5kg-canister.yaml b/data/material-containers/prusament-5kg-canister.yaml new file mode 100644 index 0000000000..e83baf24da --- /dev/null +++ b/data/material-containers/prusament-5kg-canister.yaml @@ -0,0 +1,10 @@ +uuid: d5a76d11-4e01-400c-b6b3-9cc73fa1d580 +slug: prusament-5kg-canister +name: 5 kg canister +class: SLA +brand: + slug: prusament-resin +volumetric_capacity: 4760 +empty_weight: 300 +connector: + uuid: 8f548063-56b7-5bd2-a536-77c2bb8956a5 diff --git a/data/materials/forward-am/forward-am-ultracur3d-rg-35-b.yaml b/data/materials/forward-am/forward-am-ultracur3d-rg-35-b.yaml index e6683cc87e..49fa1ec030 100644 --- a/data/materials/forward-am/forward-am-ultracur3d-rg-35-b.yaml +++ b/data/materials/forward-am/forward-am-ultracur3d-rg-35-b.yaml @@ -11,7 +11,7 @@ primary_color: properties: density: 1.11 cure_wavelength: 405 - viscosity_18c: 530 - viscosity_25c: 312 - viscosity_40c: 127 - viscosity_60c: 51 + viscosity_18c: 1798 + viscosity_25c: 925 + viscosity_40c: 279 + viscosity_60c: 87 diff --git a/data/materials/forward-am/forward-am-ultracur3d-st-45-b.yaml b/data/materials/forward-am/forward-am-ultracur3d-st-45-b.yaml index 9651483d90..09c4402bb9 100644 --- a/data/materials/forward-am/forward-am-ultracur3d-st-45-b.yaml +++ b/data/materials/forward-am/forward-am-ultracur3d-st-45-b.yaml @@ -10,3 +10,7 @@ primary_color: color_rgba: '#595959ff' properties: density: 1.12 + viscosity_18c: 530 + viscosity_25c: 312 + viscosity_40c: 127 + viscosity_60c: 51 diff --git a/data/materials/liqcreate/liqcreate-composite-x.yaml b/data/materials/liqcreate/liqcreate-composite-x.yaml index 309c712faf..f4cec9a173 100644 --- a/data/materials/liqcreate/liqcreate-composite-x.yaml +++ b/data/materials/liqcreate/liqcreate-composite-x.yaml @@ -10,7 +10,7 @@ primary_color: properties: density: 1.52 cure_wavelength: 405 - viscosity_18c: 313 - viscosity_25c: 196 - viscosity_40c: 86 - viscosity_60c: 39 + viscosity_18c: 1784 + viscosity_25c: 1223 + viscosity_40c: 580 + viscosity_60c: 276 diff --git a/data/materials/liqcreate/liqcreate-strong-x.yaml b/data/materials/liqcreate/liqcreate-strong-x.yaml index efca1eb2dd..02718dd10a 100644 --- a/data/materials/liqcreate/liqcreate-strong-x.yaml +++ b/data/materials/liqcreate/liqcreate-strong-x.yaml @@ -13,4 +13,4 @@ properties: viscosity_18c: 538 viscosity_25c: 278 viscosity_40c: 92 - viscosity_60c: 1 + viscosity_60c: 32 diff --git a/data/materials/prusament-resin/prusament-resin-flex80-black.yaml b/data/materials/prusament-resin/prusament-resin-flex80-black.yaml index 865ef6ccca..ad85dae8ee 100644 --- a/data/materials/prusament-resin/prusament-resin-flex80-black.yaml +++ b/data/materials/prusament-resin/prusament-resin-flex80-black.yaml @@ -11,7 +11,7 @@ properties: density: 1.0 hardness_shore_a: 80 cure_wavelength: 405 - viscosity_18c: 255 - viscosity_25c: 148 - viscosity_40c: 58 - viscosity_60c: 26 + viscosity_18c: 254 + viscosity_25c: 154 + viscosity_40c: 64 + viscosity_60c: 27 diff --git a/data/materials/prusament-resin/prusament-resin-flex80-transparent-clear.yaml b/data/materials/prusament-resin/prusament-resin-flex80-transparent-clear.yaml index 6d9688a224..d68fa631d8 100644 --- a/data/materials/prusament-resin/prusament-resin-flex80-transparent-clear.yaml +++ b/data/materials/prusament-resin/prusament-resin-flex80-transparent-clear.yaml @@ -13,7 +13,7 @@ properties: density: 1.0 hardness_shore_a: 80 cure_wavelength: 405 - viscosity_18c: 255 - viscosity_25c: 148 - viscosity_40c: 58 - viscosity_60c: 26 + viscosity_18c: 254 + viscosity_25c: 154 + viscosity_40c: 64 + viscosity_60c: 27 diff --git a/data/materials/prusament-resin/prusament-resin-flex80-white.yaml b/data/materials/prusament-resin/prusament-resin-flex80-white.yaml index 9858d16796..29ee08fd4e 100644 --- a/data/materials/prusament-resin/prusament-resin-flex80-white.yaml +++ b/data/materials/prusament-resin/prusament-resin-flex80-white.yaml @@ -11,7 +11,7 @@ properties: density: 1.0 hardness_shore_a: 80 cure_wavelength: 405 - viscosity_18c: 255 - viscosity_25c: 148 - viscosity_40c: 58 - viscosity_60c: 26 + viscosity_18c: 254 + viscosity_25c: 154 + viscosity_40c: 64 + viscosity_60c: 27 diff --git a/data/materials/prusament-resin/prusament-resin-impact65-black.yaml b/data/materials/prusament-resin/prusament-resin-impact65-black.yaml index 3aeda4bcfd..bfa4131499 100644 --- a/data/materials/prusament-resin/prusament-resin-impact65-black.yaml +++ b/data/materials/prusament-resin/prusament-resin-impact65-black.yaml @@ -13,4 +13,4 @@ properties: viscosity_18c: 404 viscosity_25c: 234 viscosity_40c: 91 - viscosity_60c: 1 + viscosity_60c: 35 diff --git a/data/materials/prusament-resin/prusament-resin-model-alabaster-white.yaml b/data/materials/prusament-resin/prusament-resin-model-alabaster-white.yaml index e1791303b3..e7b9ab3c03 100644 --- a/data/materials/prusament-resin/prusament-resin-model-alabaster-white.yaml +++ b/data/materials/prusament-resin/prusament-resin-model-alabaster-white.yaml @@ -13,4 +13,4 @@ properties: viscosity_18c: 287 viscosity_25c: 167 viscosity_40c: 66 - viscosity_60c: 1 + viscosity_60c: 26 diff --git a/data/materials/prusament-resin/prusament-resin-model-anthracite-grey.yaml b/data/materials/prusament-resin/prusament-resin-model-anthracite-grey.yaml index d2ec80121e..fdc3dd24f1 100644 --- a/data/materials/prusament-resin/prusament-resin-model-anthracite-grey.yaml +++ b/data/materials/prusament-resin/prusament-resin-model-anthracite-grey.yaml @@ -13,4 +13,4 @@ properties: viscosity_18c: 287 viscosity_25c: 167 viscosity_40c: 66 - viscosity_60c: 1 + viscosity_60c: 26 diff --git a/data/materials/prusament-resin/prusament-resin-model-brick-red.yaml b/data/materials/prusament-resin/prusament-resin-model-brick-red.yaml index 9fe25b73b6..4645ac51ad 100644 --- a/data/materials/prusament-resin/prusament-resin-model-brick-red.yaml +++ b/data/materials/prusament-resin/prusament-resin-model-brick-red.yaml @@ -12,5 +12,5 @@ properties: cure_wavelength: 405 viscosity_18c: 287 viscosity_25c: 167 - viscosity_40c: 68 - viscosity_60c: 1 + viscosity_40c: 66 + viscosity_60c: 26 diff --git a/data/materials/prusament-resin/prusament-resin-model-bright-cyan.yaml b/data/materials/prusament-resin/prusament-resin-model-bright-cyan.yaml index 3264331433..3004170104 100644 --- a/data/materials/prusament-resin/prusament-resin-model-bright-cyan.yaml +++ b/data/materials/prusament-resin/prusament-resin-model-bright-cyan.yaml @@ -13,4 +13,4 @@ properties: viscosity_18c: 287 viscosity_25c: 167 viscosity_40c: 66 - viscosity_60c: 1 + viscosity_60c: 26 diff --git a/data/materials/prusament-resin/prusament-resin-model-bright-magenta.yaml b/data/materials/prusament-resin/prusament-resin-model-bright-magenta.yaml index 36345e27d1..1ea7c8c679 100644 --- a/data/materials/prusament-resin/prusament-resin-model-bright-magenta.yaml +++ b/data/materials/prusament-resin/prusament-resin-model-bright-magenta.yaml @@ -13,4 +13,4 @@ properties: viscosity_18c: 287 viscosity_25c: 167 viscosity_40c: 66 - viscosity_60c: 1 + viscosity_60c: 26 diff --git a/data/materials/prusament-resin/prusament-resin-model-bright-yellow.yaml b/data/materials/prusament-resin/prusament-resin-model-bright-yellow.yaml index b4fea7f533..8653c6f62e 100644 --- a/data/materials/prusament-resin/prusament-resin-model-bright-yellow.yaml +++ b/data/materials/prusament-resin/prusament-resin-model-bright-yellow.yaml @@ -13,4 +13,4 @@ properties: viscosity_18c: 287 viscosity_25c: 167 viscosity_40c: 66 - viscosity_60c: 1 + viscosity_60c: 26 diff --git a/data/materials/prusament-resin/prusament-resin-model-classic-red.yaml b/data/materials/prusament-resin/prusament-resin-model-classic-red.yaml index 7f6e2a9a28..6937832dc9 100644 --- a/data/materials/prusament-resin/prusament-resin-model-classic-red.yaml +++ b/data/materials/prusament-resin/prusament-resin-model-classic-red.yaml @@ -13,4 +13,4 @@ properties: viscosity_18c: 287 viscosity_25c: 167 viscosity_40c: 66 - viscosity_60c: 1 + viscosity_60c: 26 diff --git a/data/materials/prusament-resin/prusament-resin-model-grass-green.yaml b/data/materials/prusament-resin/prusament-resin-model-grass-green.yaml index 0ad5eac13a..4bd6576d8a 100644 --- a/data/materials/prusament-resin/prusament-resin-model-grass-green.yaml +++ b/data/materials/prusament-resin/prusament-resin-model-grass-green.yaml @@ -13,4 +13,4 @@ properties: viscosity_18c: 287 viscosity_25c: 167 viscosity_40c: 66 - viscosity_60c: 1 + viscosity_60c: 26 diff --git a/data/materials/prusament-resin/prusament-resin-model-neutral-beige.yaml b/data/materials/prusament-resin/prusament-resin-model-neutral-beige.yaml index 3449f400d8..7a136d949c 100644 --- a/data/materials/prusament-resin/prusament-resin-model-neutral-beige.yaml +++ b/data/materials/prusament-resin/prusament-resin-model-neutral-beige.yaml @@ -13,4 +13,4 @@ properties: viscosity_18c: 287 viscosity_25c: 167 viscosity_40c: 66 - viscosity_60c: 1 + viscosity_60c: 26 diff --git a/data/materials/prusament-resin/prusament-resin-model-prusa-orange.yaml b/data/materials/prusament-resin/prusament-resin-model-prusa-orange.yaml index bcc039e7c5..44e9e4202a 100644 --- a/data/materials/prusament-resin/prusament-resin-model-prusa-orange.yaml +++ b/data/materials/prusament-resin/prusament-resin-model-prusa-orange.yaml @@ -13,4 +13,4 @@ properties: viscosity_18c: 287 viscosity_25c: 167 viscosity_40c: 66 - viscosity_60c: 1 + viscosity_60c: 26 diff --git a/data/materials/prusament-resin/prusament-resin-model-rich-black.yaml b/data/materials/prusament-resin/prusament-resin-model-rich-black.yaml index e8a0437b71..73208eb3a2 100644 --- a/data/materials/prusament-resin/prusament-resin-model-rich-black.yaml +++ b/data/materials/prusament-resin/prusament-resin-model-rich-black.yaml @@ -13,4 +13,4 @@ properties: viscosity_18c: 287 viscosity_25c: 167 viscosity_40c: 66 - viscosity_60c: 1 + viscosity_60c: 26 diff --git a/data/materials/prusament-resin/prusament-resin-model-sandstone.yaml b/data/materials/prusament-resin/prusament-resin-model-sandstone.yaml index 36436c41be..fde781c74b 100644 --- a/data/materials/prusament-resin/prusament-resin-model-sandstone.yaml +++ b/data/materials/prusament-resin/prusament-resin-model-sandstone.yaml @@ -13,4 +13,4 @@ properties: viscosity_18c: 287 viscosity_25c: 167 viscosity_40c: 66 - viscosity_60c: 2 + viscosity_60c: 26 diff --git a/data/materials/prusament-resin/prusament-resin-model-solid-grey.yaml b/data/materials/prusament-resin/prusament-resin-model-solid-grey.yaml index d9c0fb577f..8d91505112 100644 --- a/data/materials/prusament-resin/prusament-resin-model-solid-grey.yaml +++ b/data/materials/prusament-resin/prusament-resin-model-solid-grey.yaml @@ -13,4 +13,4 @@ properties: viscosity_18c: 287 viscosity_25c: 167 viscosity_40c: 66 - viscosity_60c: 1 + viscosity_60c: 26 diff --git a/data/materials/prusament-resin/prusament-resin-model-terra-brown.yaml b/data/materials/prusament-resin/prusament-resin-model-terra-brown.yaml index 624cdf27d0..79912628bf 100644 --- a/data/materials/prusament-resin/prusament-resin-model-terra-brown.yaml +++ b/data/materials/prusament-resin/prusament-resin-model-terra-brown.yaml @@ -13,4 +13,4 @@ properties: viscosity_18c: 287 viscosity_25c: 167 viscosity_40c: 66 - viscosity_60c: 1 + viscosity_60c: 26 diff --git a/data/materials/prusament-resin/prusament-resin-model-transparent-amber.yaml b/data/materials/prusament-resin/prusament-resin-model-transparent-amber.yaml index 7c1c9ca887..8633c13778 100644 --- a/data/materials/prusament-resin/prusament-resin-model-transparent-amber.yaml +++ b/data/materials/prusament-resin/prusament-resin-model-transparent-amber.yaml @@ -15,4 +15,4 @@ properties: viscosity_18c: 287 viscosity_25c: 167 viscosity_40c: 66 - viscosity_60c: 1 + viscosity_60c: 26 diff --git a/data/materials/prusament-resin/prusament-resin-model-transparent-clear.yaml b/data/materials/prusament-resin/prusament-resin-model-transparent-clear.yaml index e2139689aa..5e18baf71c 100644 --- a/data/materials/prusament-resin/prusament-resin-model-transparent-clear.yaml +++ b/data/materials/prusament-resin/prusament-resin-model-transparent-clear.yaml @@ -15,4 +15,4 @@ properties: viscosity_18c: 287 viscosity_25c: 167 viscosity_40c: 66 - viscosity_60c: 1 + viscosity_60c: 26 diff --git a/data/materials/prusament-resin/prusament-resin-model-transparent-green.yaml b/data/materials/prusament-resin/prusament-resin-model-transparent-green.yaml index 4944e245ee..1272ecba8a 100644 --- a/data/materials/prusament-resin/prusament-resin-model-transparent-green.yaml +++ b/data/materials/prusament-resin/prusament-resin-model-transparent-green.yaml @@ -15,4 +15,4 @@ properties: viscosity_18c: 287 viscosity_25c: 167 viscosity_40c: 66 - viscosity_60c: 1 + viscosity_60c: 26 diff --git a/data/materials/prusament-resin/prusament-resin-model-transparent-red.yaml b/data/materials/prusament-resin/prusament-resin-model-transparent-red.yaml index 1d995d2da4..1451ad7e27 100644 --- a/data/materials/prusament-resin/prusament-resin-model-transparent-red.yaml +++ b/data/materials/prusament-resin/prusament-resin-model-transparent-red.yaml @@ -15,4 +15,4 @@ properties: viscosity_18c: 287 viscosity_25c: 167 viscosity_40c: 66 - viscosity_60c: 1 + viscosity_60c: 26 diff --git a/data/materials/prusament-resin/prusament-resin-model-ultra-violet.yaml b/data/materials/prusament-resin/prusament-resin-model-ultra-violet.yaml index a01e344d7f..a57f19032a 100644 --- a/data/materials/prusament-resin/prusament-resin-model-ultra-violet.yaml +++ b/data/materials/prusament-resin/prusament-resin-model-ultra-violet.yaml @@ -13,4 +13,4 @@ properties: viscosity_18c: 287 viscosity_25c: 167 viscosity_40c: 66 - viscosity_60c: 1 + viscosity_60c: 26 diff --git a/data/wash-media/3d-basics-dpm-wash-solvent.yaml b/data/wash-media/3d-basics-dpm-wash-solvent.yaml new file mode 100644 index 0000000000..554986f2d0 --- /dev/null +++ b/data/wash-media/3d-basics-dpm-wash-solvent.yaml @@ -0,0 +1,7 @@ +slug: 3d-basics-dpm-wash-solvent +uuid: 4c47e887-013c-4f4a-8857-88f06fe8183f +brand: + slug: 3d-basics +name: 3D Basics DPM Wash Solvent +density: 10 +wash_capacity: 1000 diff --git a/data/wash-media/loctite-3d-cleaner-c.yaml b/data/wash-media/loctite-3d-cleaner-c.yaml new file mode 100644 index 0000000000..53b5d557c4 --- /dev/null +++ b/data/wash-media/loctite-3d-cleaner-c.yaml @@ -0,0 +1,7 @@ +slug: loctite-3d-cleaner-c +uuid: 53d4a8a3-d2dd-4e0b-b69e-051fcc33845b +brand: + slug: henkel +name: LOCTITE 3D Cleaner C +density: 960 +wash_capacity: 0 diff --git a/data/wash-media/prusament-resin-cleaner-dpm.yaml b/data/wash-media/prusament-resin-cleaner-dpm.yaml new file mode 100644 index 0000000000..80ab029a3a --- /dev/null +++ b/data/wash-media/prusament-resin-cleaner-dpm.yaml @@ -0,0 +1,7 @@ +slug: prusament-resin-cleaner-dpm +uuid: 44949b6e-875d-443c-89ce-8973f3a93af3 +brand: + slug: prusament-resin +name: Prusament Resin Cleaner DPM +density: 0 +wash_capacity: 0 diff --git a/data/wash-media/water.yaml b/data/wash-media/water.yaml new file mode 100644 index 0000000000..fcf40c4ef8 --- /dev/null +++ b/data/wash-media/water.yaml @@ -0,0 +1,7 @@ +slug: water +uuid: 78c9e93b-94dc-4c63-af42-4bce6304142f +brand: + slug: generic +name: Water +density: 1000 +wash_capacity: 1000