Merge branch 'fs_dir_per_glyph_SPE-1597' into fs_svg

# Conflicts:
#	src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp
This commit is contained in:
Filip Sykala - NTB T15p 2023-06-30 10:15:51 +02:00
commit 9ee86599d5
74 changed files with 34337 additions and 31438 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1378,7 +1378,7 @@ msgstr "Колер фону"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:52
msgid "Backspace"
msgstr "<b>Backspace</b>"
msgstr "Backspace"
#: ../src/common/fmapbase.cpp:160
msgid "Baltic (ISO-8859-13)"
@ -2741,7 +2741,7 @@ msgstr "Канец"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:55
msgid "Enter"
msgstr "<b>Enter</b>"
msgstr "Enter"
#: ../src/richtext/richtextstyledlg.cpp:934
msgid "Enter a box style name"
@ -2827,7 +2827,7 @@ msgstr "Памылка: "
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:69
msgid "Esc"
msgstr "<b>Esc</b>"
msgstr "Esc"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:70
@ -4004,7 +4004,7 @@ msgstr "Ініцыялізацыя не атрымалася ў post init, пе
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:54
msgid "Ins"
msgstr "<b>Ins</b>"
msgstr "Ins"
#. TRANSLATORS: Name of keyboard key
#: ../src/richtext/richtextsymboldlg.cpp:472 ../src/common/accelcmn.cpp:53
@ -4699,7 +4699,7 @@ msgstr "&Згарнуць"
#. TRANSLATORS: System cursor name
#: ../src/propgrid/advprops.cpp:1763
msgid "Middle Button"
msgstr "<b>Сярэдняя кнопка</b>"
msgstr "Сярэдняя кнопка"
#: ../src/richtext/richtextsizepage.cpp:409
msgid "Min height:"
@ -4933,117 +4933,117 @@ msgstr "Заўвага, 8 1/2 x 11 цалі"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:105
msgid "Num *"
msgstr "<b>Num *</b>"
msgstr "Num *"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:106
msgid "Num +"
msgstr "<b>Num +</b>"
msgstr "Num +"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:107
msgid "Num ,"
msgstr "<b>Num ,</b>"
msgstr "Num ,"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:108
msgid "Num -"
msgstr "<b>Num -</b>"
msgstr "Num -"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:109
msgid "Num ."
msgstr "<b>Num .</b>"
msgstr "Num ."
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:110
msgid "Num /"
msgstr "<b>Num /</b>"
msgstr "Num /"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:104
msgid "Num ="
msgstr "<b>Num =</b>"
msgstr "Num ="
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:101
msgid "Num Begin"
msgstr "<b>Num Begin</b>"
msgstr "Num Begin"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:103
msgid "Num Delete"
msgstr "<b>Num Delete</b>"
msgstr "Num Delete"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:95
msgid "Num Down"
msgstr "<b>Num Down</b>"
msgstr "Num Down"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:100
msgid "Num End"
msgstr "<b>Num End</b>"
msgstr "Num End"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:90
msgid "Num Enter"
msgstr "<b>Num Enter</b>"
msgstr "Num Enter"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:91
msgid "Num Home"
msgstr "<b>Num Home</b>"
msgstr "Num Home"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:102
msgid "Num Insert"
msgstr "<b>Num Insert</b>"
msgstr "Num Insert"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:86
msgid "Num Lock"
msgstr "<b>Num Lock</b>"
msgstr "Num Lock"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:97
msgid "Num Page Down"
msgstr "<b>Num Page Down</b>"
msgstr "Num Page Down"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:96
msgid "Num Page Up"
msgstr "<b>Num Page Up</b>"
msgstr "Num Page Up"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:94
msgid "Num Right"
msgstr "<b>Num Right</b>"
msgstr "Num Right"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:88
msgid "Num Space"
msgstr "<b>Num Space</b>"
msgstr "Num Space"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:89
msgid "Num Tab"
msgstr "<b>Num Tab</b>"
msgstr "Num Tab"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:93
msgid "Num Up"
msgstr "<b>Num Up</b>"
msgstr "Num Up"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:92
msgid "Num left"
msgstr "<b>Num left</b>"
msgstr "Num left"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:86
msgid "Num_lock"
msgstr "<b>Num_lock</b>"
msgstr "Num_lock"
#: ../src/richtext/richtextliststylepage.cpp:487
#: ../src/richtext/richtextbulletspage.cpp:279
@ -5317,12 +5317,12 @@ msgstr "Налады старонкі"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:58
msgid "PageDown"
msgstr "<b>PageDown</b>"
msgstr "PageDown"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:57
msgid "PageUp"
msgstr "<b>PageUp</b>"
msgstr "PageUp"
#: ../src/generic/prntdlgg.cpp:216
msgid "Pages"
@ -5372,12 +5372,12 @@ msgstr "Дазволы"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:60
msgid "PgDn"
msgstr "<b>PgDn</b>"
msgstr "PgDn"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:59
msgid "PgUp"
msgstr "<b>PgUp</b>"
msgstr "PgUp"
#: ../src/richtext/richtextbuffer.cpp:12868
msgid "Picture Properties"
@ -7448,17 +7448,17 @@ msgstr "Кірыліца Windows/DOS OEM (CP 866)"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:111
msgid "Windows_Left"
msgstr "<b>Windows_Left</b>"
msgstr "Windows_Left"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:113
msgid "Windows_Menu"
msgstr "<b>Windows_Menu</b>"
msgstr "Windows_Menu"
#. TRANSLATORS: Name of keyboard key
#: ../src/common/accelcmn.cpp:112
msgid "Windows_Right"
msgstr "<b>Windows_Right</b>"
msgstr "Windows_Right"
#: ../src/common/ffile.cpp:150
#, c-format
@ -7520,7 +7520,7 @@ msgstr "Вы не можаце дадаць новы каталог у гэту
#: ../src/propgrid/propgrid.cpp:3299
msgid "You have entered invalid value. Press ESC to cancel editing."
msgstr "Вы ўвялі недапушчальнае значэнне. Націсніце <b>Esc</b>, каб адмяніць змены."
msgstr "Вы ўвялі недапушчальнае значэнне. Націсніце Esc, каб адмяніць змены."
#: ../src/common/stockitem.cpp:209
msgid "Zoom &In"

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,2 @@
min_slic3r_version = 2.6.0
0.0.1 Initial version

1004
resources/profiles/LNL3D.ini Normal file

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@ -0,0 +1,64 @@
<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="300mm" height="300mm" viewBox="0 0 850.4 850.4">
<defs>
<radialGradient id="radial-gradient" cx="-460.68" cy="762.9" r="60.14" gradientTransform="translate(1017.4)" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#4db5e7"/>
<stop offset="1" stop-color="#167ab9"/>
</radialGradient>
<radialGradient id="radial-gradient-2" cx="-468.64" cy="774.88" fx="-538.9596183282939" r="70.56" gradientTransform="translate(1017.4)" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#fff"/>
<stop offset="1" stop-color="#749194"/>
</radialGradient>
</defs>
<g>
<rect width="351.5" height="850.39" style="fill: #1a1a1a"/>
<g>
<path d="M225.2,52.5V72c0,20.7-15.1,37.1-36.2,37.1S152.8,92.8,152.8,72V52.5ZM164.9,94A32.7,32.7,0,0,0,189,104.4c19.1,0,32-14.6,32-33.1V57H157V71.3C157,81.6,160.5,89.2,164.9,94Z" style="fill: #4d4d4d"/>
<path d="M162,153.3a17.3,17.3,0,0,1-10.2-15.8c0-13,7.8-16.7,20.6-16.7h28.8v4.4H171.3c-7.4,0-15.5,1.5-15.5,12.6s10.8,15.5,20.4,15.5h25v4.4H152.8v-4.4Z" style="fill: #4d4d4d"/>
<path d="M201.2,172.3v4.4H190.5c7.5,3.2,11.5,10.7,11.5,19,0,15.1-11,23.5-25.3,23.5s-24.9-9.5-24.9-23.8c0-6.8,2.7-14.2,10.5-18.7H132.8v-4.3ZM177,214.5c11.6,0,21.1-6.8,21.1-19s-9.5-19-21.1-19-21.2,6.8-21.2,19S165.4,214.5,177,214.5Z" style="fill: #4d4d4d"/>
<path d="M225.2,230.8v4.3H152.8v-4.3Z" style="fill: #4d4d4d"/>
<path d="M201.2,249.9v4.3H152.8v-4.3Zm13.4,2.2a4,4,0,0,1,4.1-3.9,4,4,0,0,1,4.1,3.9,4,4,0,0,1-4.1,4A4.1,4.1,0,0,1,214.6,252.1Z" style="fill: #4d4d4d"/>
<path d="M151.8,289.1c0-13.2,10.5-23.8,25.3-23.8S202,276,202,289.4s-7.1,17.9-8.7,19.1l-2.7-3.4c2.5-2.2,7.2-6.2,7.2-16S189.4,270,177.4,270,156,278.1,156,289.4a22.2,22.2,0,0,0,7.1,16.2l-2.7,3.1C158.2,306.8,151.8,301.8,151.8,289.1Z" style="fill: #4d4d4d"/>
<path d="M160.2,347.8a22.9,22.9,0,0,1-8.4-17.4c0-9.3,6.4-15.7,14.5-15.7s14.2,6.4,14.6,20.2l.5,13h2.8c9.3,0,13.7-5.8,13.7-14.6,0-6.4-2.9-12.7-3.9-14l3.3-1.9c2,2.6,4.7,9.5,4.7,15.5s-1.6,11.3-4.6,14.5-6.3,4.9-14.7,4.9H152.8v-4.5Zm16.9-12.3c-.4-12-5-16.1-10.9-16.1s-10.3,4.4-10.3,12.2,5.4,13.8,9.3,16.2h12.2Z" style="fill: #4d4d4d"/>
<path d="M151.8,377.6c0-4,1.4-6.9,4.1-8.7s7.8-2.2,15.8-2.2h25.1v-7.4H201v7.4h15.6v4.4H201v12.3h-4.2V371H167.6c-7,0-11.8.8-11.8,7.3a10.7,10.7,0,0,0,1.3,5.2l-3.8.6C152.3,382.8,151.8,380.6,151.8,377.6Z" style="fill: #4d4d4d"/>
<path d="M201.2,392.8v4.3H152.8v-4.3Zm13.4,2.2a4.1,4.1,0,0,1,4.1-4,4,4,0,1,1,0,8A4.1,4.1,0,0,1,214.6,395Z" style="fill: #4d4d4d"/>
<path d="M177.1,408.2c14.1,0,24.9,9.5,24.9,24.5s-10.8,24.5-24.9,24.5-25.3-9.5-25.3-24.5S162.5,408.2,177.1,408.2Zm-.1,4.7c-11.5,0-21.1,7.6-21.1,19.8s9.6,19.8,21.1,19.8,20.9-7.7,20.9-19.8S188.8,412.9,177,412.9Z" style="fill: #4d4d4d"/>
<path d="M181.9,501.3c7.7,0,16.1-2.1,16.1-12.9S188.7,473,176.7,473H152.8v-4.4h48.4v4.3h-9.4c6.1,2.3,10.2,8.9,10.2,15.8,0,13.9-8.8,17-20.2,17h-29v-4.4Z" style="fill: #4d4d4d"/>
<path d="M145.6,512.7l89.6,43.9-2,3.9-89.6-43.8C144.3,515.4,144.9,513.9,145.6,512.7Z" style="fill: #4d4d4d"/>
<path d="M217,628.2l-64.7-26.9v-1l64.5-26.6-64-6.5v-4.6l72.4,7.7v5.1l-63.3,25.7,63.3,25.6v5.2l-72.4,7.6v-4.6Z" style="fill: #4d4d4d"/>
<path d="M201.2,652.7V657H152.8v-4.3Zm13.4,2.2a4.1,4.1,0,0,1,4.1-4,4,4,0,1,1,0,8A4.1,4.1,0,0,1,214.6,654.9Z" style="fill: #4d4d4d"/>
<path d="M201.2,671.6v4.3h-8.6c6.4,2.4,9.4,7.1,9.4,12.3a30,30,0,0,1-.6,5.8l-4.6-.6a21.8,21.8,0,0,0,.7-5.8,10.9,10.9,0,0,0-4.2-8.2c-2.2-1.7-5.5-3.5-12.9-3.5H152.8v-4.3Z" style="fill: #4d4d4d"/>
<path d="M201.2,701.9v4.3h-8.6c6.4,2.4,9.4,7.2,9.4,12.4a31.4,31.4,0,0,1-.6,5.8l-4.6-.7a20.4,20.4,0,0,0,.7-5.7,10.7,10.7,0,0,0-4.2-8.2c-2.2-1.7-5.5-3.6-12.9-3.6H152.8v-4.3Z" style="fill: #4d4d4d"/>
<path d="M177.1,726.5c14.1,0,24.9,9.5,24.9,24.5s-10.8,24.6-24.9,24.6S151.8,766,151.8,751,162.5,726.5,177.1,726.5Zm-.1,4.7c-11.5,0-21.1,7.7-21.1,19.8s9.6,19.8,21.1,19.8,20.9-7.7,20.9-19.8S188.8,731.2,177,731.2Z" style="fill: #4d4d4d"/>
<path d="M201.2,786.9v4.3h-8.6c6.4,2.4,9.4,7.2,9.4,12.4a31.4,31.4,0,0,1-.6,5.8l-4.6-.7a20.4,20.4,0,0,0,.7-5.7,10.7,10.7,0,0,0-4.2-8.2c-2.2-1.7-5.5-3.6-12.9-3.6H152.8v-4.3Z" style="fill: #4d4d4d"/>
</g>
<line x1="425.2" y1="391.2" x2="425.2" y2="459.2" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 0.25px"/>
<line x1="425.2" y1="2.3" x2="425.2" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 10px"/>
<line x1="425.2" y1="850.4" x2="425.2" y2="848.1" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 10px"/>
<line x1="2.3" y1="425.2" y2="425.2" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 10px"/>
<line x1="850.4" y1="425.2" x2="848.1" y2="425.2" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 10px"/>
<line x1="459.2" y1="425.2" x2="391.2" y2="425.2" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 0.25px"/>
<line x1="425.2" y1="391.2" x2="425.2" y2="459.2" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 0.25px"/>
<path d="M702.4.1V850.3H351.1V.1H702.4m.1-.1H351V850.4H702.5V0Z" style="fill: #fff"/>
</g>
<g>
<polygon points="541.6 764.3 507.3 822.8 518.9 822.8 547.9 772.7 541.6 764.3" style="fill: url(#radial-gradient)"/>
<path d="M577,801.7V778.4h5.5v18.8h8v4.5Z" style="fill: #fff"/>
<path d="M608.5,801.7l-10.3-15.8s.1,2.8.1,5.2v10.6H593V778.4h5.9l10,15.6s-.1-2.6-.1-5.1V778.4h5.3v23.3Z" style="fill: #fff"/>
<path d="M616.8,801.7V778.4h5.4v18.8h8.1v4.5Z" style="fill: #fff"/>
<path d="M640.8,802.1a10.5,10.5,0,0,1-8.5-3.9l2.5-3.3a8.3,8.3,0,0,0,5.7,2.9c2.3,0,4.1-1.2,4.1-3.2s-1.6-3.2-3.7-3.2h-2.1v-3.8h2.1c1.8,0,3.1-.9,3.1-2.7s-1.5-2.8-3.4-2.8a9,9,0,0,0-5.6,2.3l-2-3.5a11.1,11.1,0,0,1,8-2.9c4.3,0,8.2,2.3,8.2,6.2a4.9,4.9,0,0,1-3.4,5.1h0a5.6,5.6,0,0,1,4.1,5.5C649.9,799.5,645.6,802.1,640.8,802.1Z" style="fill: #fff"/>
<path d="M659.7,801.7h-7.9V778.4h7.9c7.4,0,12.8,3.9,12.8,11.6S667.1,801.7,659.7,801.7Zm.3-18.8h-2.7v14.2H660c4.4,0,7-2.8,7-7.1S664.5,782.9,660,782.9Z" style="fill: #fff"/>
<path d="M582,821.3c2.2,0,3.8-1.1,3.8-3.2s-1.6-2.8-3.3-3.6l-2.7-1.1a4.5,4.5,0,0,1-3-4.5c0-3,2.8-4.7,5.6-4.7a6.4,6.4,0,0,1,5,2.4l-1.2,1.3a5.1,5.1,0,0,0-3.9-1.9c-2,0-3.5,1-3.5,2.8s1.3,2.6,2.5,3.1l2.5,1.1c2.2.9,4,2.2,4,4.8s-2.5,5.3-6.1,5.3a7,7,0,0,1-5.6-3.3l1.3-1.3A6.2,6.2,0,0,0,582,821.3Z" style="fill: #fff"/>
<path d="M589.8,816.6a6.5,6.5,0,0,1,13,0,6.5,6.5,0,0,1-13,0Zm11-.1a4.4,4.4,0,0,0-4.5-4.7c-2.7,0-4.4,2-4.4,4.7s1.7,4.8,4.4,4.8S600.8,819.2,600.8,816.5Z" style="fill: #fff"/>
<path d="M604.7,804.5h2v18.2h-2Z" style="fill: #fff"/>
<path d="M620.1,810.3v12.4h-1.9v-1.9c-.5,1.3-2.1,2.1-3.9,2.1-3.5,0-4.4-2.1-4.4-5.1v-7.5h2v7.4c0,2.3.7,3.6,3,3.6s3.3-2,3.3-4.1v-6.9Z" style="fill: #fff"/>
<path d="M627.1,823c-2.9,0-2.9-2.8-2.9-5v-6h-1.9v-1.6h1.9v-3.9h2v3.9h3V812h-3.1v6.4a4.3,4.3,0,0,0,.4,2.4,1.6,1.6,0,0,0,1.3.5,3.4,3.4,0,0,0,1.4-.3v1.6A4.8,4.8,0,0,1,627.1,823Z" style="fill: #fff"/>
<path d="M633.2,807.4a1.3,1.3,0,0,1-1.4-1.3,1.3,1.3,0,0,1,1.4-1.4,1.3,1.3,0,0,1,1.3,1.4A1.3,1.3,0,0,1,633.2,807.4Zm-1,2.9h1.9v12.4h-1.9Z" style="fill: #fff"/>
<path d="M636.6,816.6A6.5,6.5,0,1,1,643,823,6.2,6.2,0,0,1,636.6,816.6Zm10.9-.1a4.4,4.4,0,0,0-4.5-4.7c-2.7,0-4.4,2-4.4,4.7s1.7,4.8,4.4,4.8S647.5,819.2,647.5,816.5Z" style="fill: #fff"/>
<path d="M662.1,815.2v7.5h-1.9v-7.3c0-2.3-.8-3.6-3.1-3.6s-3.3,1.8-3.3,3.9v7h-2V810.3h2v2h.1a4,4,0,0,1,3.8-2.2C661.3,810.1,662.1,812.3,662.1,815.2Z" style="fill: #fff"/>
<path d="M668.7,821.4c1.4,0,2.7-.5,2.7-2s-2.1-2-3.1-2.3-3.5-.9-3.5-3.5,2-3.5,4-3.5a5.3,5.3,0,0,1,4,1.4l-.9,1.2a5.1,5.1,0,0,0-3.1-1.1c-1.3,0-2.2.6-2.2,1.8s1.2,1.6,2.6,2.1,4,1,4,3.7-2,3.8-4.5,3.8a5.4,5.4,0,0,1-4.6-2.2l1-1.2A4.8,4.8,0,0,0,668.7,821.4Z" style="fill: #fff"/>
<polygon points="552.5 817.9 537.9 798.7 542.7 797.1 557.3 816.3 552.5 817.9" style="fill: #99d0a0"/>
<polyline points="542.7 822.8 542.7 822.8 524.9 822.8 524.9 818.2 537.1 818.2 537.1 797.1 542.7 797.1" style="fill: #4db6e8"/>
<polygon points="549.6 775.9 546.8 780.5 563.8 801.7 570.3 801.7 549.6 775.9" style="fill: url(#radial-gradient-2)"/>
<polyline points="552.4 822.8 552.4 822.8 570.3 822.8 570.3 818.2 558.1 818.2 558.1 797.1 552.4 797.1" style="fill: #f4bf1f"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

View File

@ -0,0 +1,64 @@
<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="300mm" height="300mm" viewBox="0 0 850.4 850.4">
<defs>
<radialGradient id="radial-gradient" cx="-460.68" cy="762.9" r="60.14" gradientTransform="translate(1017.4)" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#4db5e7"/>
<stop offset="1" stop-color="#167ab9"/>
</radialGradient>
<radialGradient id="radial-gradient-2" cx="-468.64" cy="774.88" fx="-538.9596183282939" r="70.56" gradientTransform="translate(1017.4)" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#fff"/>
<stop offset="1" stop-color="#749194"/>
</radialGradient>
</defs>
<g>
<rect width="351.5" height="850.39" style="fill: #1a1a1a"/>
<g>
<path d="M225.2,52.5V72c0,20.7-15.1,37.1-36.2,37.1S152.8,92.8,152.8,72V52.5ZM164.9,94A32.7,32.7,0,0,0,189,104.4c19.1,0,32-14.6,32-33.1V57H157V71.3C157,81.6,160.5,89.2,164.9,94Z" style="fill: #4d4d4d"/>
<path d="M162,153.3a17.3,17.3,0,0,1-10.2-15.8c0-13,7.8-16.7,20.6-16.7h28.8v4.4H171.3c-7.4,0-15.5,1.5-15.5,12.6s10.8,15.5,20.4,15.5h25v4.4H152.8v-4.4Z" style="fill: #4d4d4d"/>
<path d="M201.2,172.3v4.4H190.5c7.5,3.2,11.5,10.7,11.5,19,0,15.1-11,23.5-25.3,23.5s-24.9-9.5-24.9-23.8c0-6.8,2.7-14.2,10.5-18.7H132.8v-4.3ZM177,214.5c11.6,0,21.1-6.8,21.1-19s-9.5-19-21.1-19-21.2,6.8-21.2,19S165.4,214.5,177,214.5Z" style="fill: #4d4d4d"/>
<path d="M225.2,230.8v4.3H152.8v-4.3Z" style="fill: #4d4d4d"/>
<path d="M201.2,249.9v4.3H152.8v-4.3Zm13.4,2.2a4,4,0,0,1,4.1-3.9,4,4,0,0,1,4.1,3.9,4,4,0,0,1-4.1,4A4.1,4.1,0,0,1,214.6,252.1Z" style="fill: #4d4d4d"/>
<path d="M151.8,289.1c0-13.2,10.5-23.8,25.3-23.8S202,276,202,289.4s-7.1,17.9-8.7,19.1l-2.7-3.4c2.5-2.2,7.2-6.2,7.2-16S189.4,270,177.4,270,156,278.1,156,289.4a22.2,22.2,0,0,0,7.1,16.2l-2.7,3.1C158.2,306.8,151.8,301.8,151.8,289.1Z" style="fill: #4d4d4d"/>
<path d="M160.2,347.8a22.9,22.9,0,0,1-8.4-17.4c0-9.3,6.4-15.7,14.5-15.7s14.2,6.4,14.6,20.2l.5,13h2.8c9.3,0,13.7-5.8,13.7-14.6,0-6.4-2.9-12.7-3.9-14l3.3-1.9c2,2.6,4.7,9.5,4.7,15.5s-1.6,11.3-4.6,14.5-6.3,4.9-14.7,4.9H152.8v-4.5Zm16.9-12.3c-.4-12-5-16.1-10.9-16.1s-10.3,4.4-10.3,12.2,5.4,13.8,9.3,16.2h12.2Z" style="fill: #4d4d4d"/>
<path d="M151.8,377.6c0-4,1.4-6.9,4.1-8.7s7.8-2.2,15.8-2.2h25.1v-7.4H201v7.4h15.6v4.4H201v12.3h-4.2V371H167.6c-7,0-11.8.8-11.8,7.3a10.7,10.7,0,0,0,1.3,5.2l-3.8.6C152.3,382.8,151.8,380.6,151.8,377.6Z" style="fill: #4d4d4d"/>
<path d="M201.2,392.8v4.3H152.8v-4.3Zm13.4,2.2a4.1,4.1,0,0,1,4.1-4,4,4,0,1,1,0,8A4.1,4.1,0,0,1,214.6,395Z" style="fill: #4d4d4d"/>
<path d="M177.1,408.2c14.1,0,24.9,9.5,24.9,24.5s-10.8,24.5-24.9,24.5-25.3-9.5-25.3-24.5S162.5,408.2,177.1,408.2Zm-.1,4.7c-11.5,0-21.1,7.6-21.1,19.8s9.6,19.8,21.1,19.8,20.9-7.7,20.9-19.8S188.8,412.9,177,412.9Z" style="fill: #4d4d4d"/>
<path d="M181.9,501.3c7.7,0,16.1-2.1,16.1-12.9S188.7,473,176.7,473H152.8v-4.4h48.4v4.3h-9.4c6.1,2.3,10.2,8.9,10.2,15.8,0,13.9-8.8,17-20.2,17h-29v-4.4Z" style="fill: #4d4d4d"/>
<path d="M145.6,512.7l89.6,43.9-2,3.9-89.6-43.8C144.3,515.4,144.9,513.9,145.6,512.7Z" style="fill: #4d4d4d"/>
<path d="M217,628.2l-64.7-26.9v-1l64.5-26.6-64-6.5v-4.6l72.4,7.7v5.1l-63.3,25.7,63.3,25.6v5.2l-72.4,7.6v-4.6Z" style="fill: #4d4d4d"/>
<path d="M201.2,652.7V657H152.8v-4.3Zm13.4,2.2a4.1,4.1,0,0,1,4.1-4,4,4,0,1,1,0,8A4.1,4.1,0,0,1,214.6,654.9Z" style="fill: #4d4d4d"/>
<path d="M201.2,671.6v4.3h-8.6c6.4,2.4,9.4,7.1,9.4,12.3a30,30,0,0,1-.6,5.8l-4.6-.6a21.8,21.8,0,0,0,.7-5.8,10.9,10.9,0,0,0-4.2-8.2c-2.2-1.7-5.5-3.5-12.9-3.5H152.8v-4.3Z" style="fill: #4d4d4d"/>
<path d="M201.2,701.9v4.3h-8.6c6.4,2.4,9.4,7.2,9.4,12.4a31.4,31.4,0,0,1-.6,5.8l-4.6-.7a20.4,20.4,0,0,0,.7-5.7,10.7,10.7,0,0,0-4.2-8.2c-2.2-1.7-5.5-3.6-12.9-3.6H152.8v-4.3Z" style="fill: #4d4d4d"/>
<path d="M177.1,726.5c14.1,0,24.9,9.5,24.9,24.5s-10.8,24.6-24.9,24.6S151.8,766,151.8,751,162.5,726.5,177.1,726.5Zm-.1,4.7c-11.5,0-21.1,7.7-21.1,19.8s9.6,19.8,21.1,19.8,20.9-7.7,20.9-19.8S188.8,731.2,177,731.2Z" style="fill: #4d4d4d"/>
<path d="M201.2,786.9v4.3h-8.6c6.4,2.4,9.4,7.2,9.4,12.4a31.4,31.4,0,0,1-.6,5.8l-4.6-.7a20.4,20.4,0,0,0,.7-5.7,10.7,10.7,0,0,0-4.2-8.2c-2.2-1.7-5.5-3.6-12.9-3.6H152.8v-4.3Z" style="fill: #4d4d4d"/>
</g>
<line x1="425.2" y1="391.2" x2="425.2" y2="459.2" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 0.25px"/>
<line x1="425.2" y1="2.3" x2="425.2" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 10px"/>
<line x1="425.2" y1="850.4" x2="425.2" y2="848.1" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 10px"/>
<line x1="2.3" y1="425.2" y2="425.2" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 10px"/>
<line x1="850.4" y1="425.2" x2="848.1" y2="425.2" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 10px"/>
<line x1="459.2" y1="425.2" x2="391.2" y2="425.2" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 0.25px"/>
<line x1="425.2" y1="391.2" x2="425.2" y2="459.2" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 0.25px"/>
<path d="M702.4.1V850.3H351.1V.1H702.4m.1-.1H351V850.4H702.5V0Z" style="fill: #fff"/>
</g>
<g>
<polygon points="541.6 764.3 507.3 822.8 518.9 822.8 547.9 772.7 541.6 764.3" style="fill: url(#radial-gradient)"/>
<path d="M577,801.7V778.4h5.5v18.8h8v4.5Z" style="fill: #fff"/>
<path d="M608.5,801.7l-10.3-15.8s.1,2.8.1,5.2v10.6H593V778.4h5.9l10,15.6s-.1-2.6-.1-5.1V778.4h5.3v23.3Z" style="fill: #fff"/>
<path d="M616.8,801.7V778.4h5.4v18.8h8.1v4.5Z" style="fill: #fff"/>
<path d="M640.8,802.1a10.5,10.5,0,0,1-8.5-3.9l2.5-3.3a8.3,8.3,0,0,0,5.7,2.9c2.3,0,4.1-1.2,4.1-3.2s-1.6-3.2-3.7-3.2h-2.1v-3.8h2.1c1.8,0,3.1-.9,3.1-2.7s-1.5-2.8-3.4-2.8a9,9,0,0,0-5.6,2.3l-2-3.5a11.1,11.1,0,0,1,8-2.9c4.3,0,8.2,2.3,8.2,6.2a4.9,4.9,0,0,1-3.4,5.1h0a5.6,5.6,0,0,1,4.1,5.5C649.9,799.5,645.6,802.1,640.8,802.1Z" style="fill: #fff"/>
<path d="M659.7,801.7h-7.9V778.4h7.9c7.4,0,12.8,3.9,12.8,11.6S667.1,801.7,659.7,801.7Zm.3-18.8h-2.7v14.2H660c4.4,0,7-2.8,7-7.1S664.5,782.9,660,782.9Z" style="fill: #fff"/>
<path d="M582,821.3c2.2,0,3.8-1.1,3.8-3.2s-1.6-2.8-3.3-3.6l-2.7-1.1a4.5,4.5,0,0,1-3-4.5c0-3,2.8-4.7,5.6-4.7a6.4,6.4,0,0,1,5,2.4l-1.2,1.3a5.1,5.1,0,0,0-3.9-1.9c-2,0-3.5,1-3.5,2.8s1.3,2.6,2.5,3.1l2.5,1.1c2.2.9,4,2.2,4,4.8s-2.5,5.3-6.1,5.3a7,7,0,0,1-5.6-3.3l1.3-1.3A6.2,6.2,0,0,0,582,821.3Z" style="fill: #fff"/>
<path d="M589.8,816.6a6.5,6.5,0,0,1,13,0,6.5,6.5,0,0,1-13,0Zm11-.1a4.4,4.4,0,0,0-4.5-4.7c-2.7,0-4.4,2-4.4,4.7s1.7,4.8,4.4,4.8S600.8,819.2,600.8,816.5Z" style="fill: #fff"/>
<path d="M604.7,804.5h2v18.2h-2Z" style="fill: #fff"/>
<path d="M620.1,810.3v12.4h-1.9v-1.9c-.5,1.3-2.1,2.1-3.9,2.1-3.5,0-4.4-2.1-4.4-5.1v-7.5h2v7.4c0,2.3.7,3.6,3,3.6s3.3-2,3.3-4.1v-6.9Z" style="fill: #fff"/>
<path d="M627.1,823c-2.9,0-2.9-2.8-2.9-5v-6h-1.9v-1.6h1.9v-3.9h2v3.9h3V812h-3.1v6.4a4.3,4.3,0,0,0,.4,2.4,1.6,1.6,0,0,0,1.3.5,3.4,3.4,0,0,0,1.4-.3v1.6A4.8,4.8,0,0,1,627.1,823Z" style="fill: #fff"/>
<path d="M633.2,807.4a1.3,1.3,0,0,1-1.4-1.3,1.3,1.3,0,0,1,1.4-1.4,1.3,1.3,0,0,1,1.3,1.4A1.3,1.3,0,0,1,633.2,807.4Zm-1,2.9h1.9v12.4h-1.9Z" style="fill: #fff"/>
<path d="M636.6,816.6A6.5,6.5,0,1,1,643,823,6.2,6.2,0,0,1,636.6,816.6Zm10.9-.1a4.4,4.4,0,0,0-4.5-4.7c-2.7,0-4.4,2-4.4,4.7s1.7,4.8,4.4,4.8S647.5,819.2,647.5,816.5Z" style="fill: #fff"/>
<path d="M662.1,815.2v7.5h-1.9v-7.3c0-2.3-.8-3.6-3.1-3.6s-3.3,1.8-3.3,3.9v7h-2V810.3h2v2h.1a4,4,0,0,1,3.8-2.2C661.3,810.1,662.1,812.3,662.1,815.2Z" style="fill: #fff"/>
<path d="M668.7,821.4c1.4,0,2.7-.5,2.7-2s-2.1-2-3.1-2.3-3.5-.9-3.5-3.5,2-3.5,4-3.5a5.3,5.3,0,0,1,4,1.4l-.9,1.2a5.1,5.1,0,0,0-3.1-1.1c-1.3,0-2.2.6-2.2,1.8s1.2,1.6,2.6,2.1,4,1,4,3.7-2,3.8-4.5,3.8a5.4,5.4,0,0,1-4.6-2.2l1-1.2A4.8,4.8,0,0,0,668.7,821.4Z" style="fill: #fff"/>
<polygon points="552.5 817.9 537.9 798.7 542.7 797.1 557.3 816.3 552.5 817.9" style="fill: #99d0a0"/>
<polyline points="542.7 822.8 542.7 822.8 524.9 822.8 524.9 818.2 537.1 818.2 537.1 797.1 542.7 797.1" style="fill: #4db6e8"/>
<polygon points="549.6 775.9 546.8 780.5 563.8 801.7 570.3 801.7 549.6 775.9" style="fill: url(#radial-gradient-2)"/>
<polyline points="552.4 822.8 552.4 822.8 570.3 822.8 570.3 818.2 558.1 818.2 558.1 797.1 552.4 797.1" style="fill: #f4bf1f"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

View File

@ -0,0 +1,64 @@
<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="505mm" height="505mm" viewBox="0 0 1431.5 1431.5">
<defs>
<radialGradient id="radial-gradient" cx="-170.12" cy="1053.45" r="60.14" gradientTransform="translate(1223.5 -489.1) scale(1.68 1.68)" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#4db5e7"/>
<stop offset="1" stop-color="#167ab9"/>
</radialGradient>
<radialGradient id="radial-gradient-2" cx="-178.09" cy="1065.43" fx="-248.40843722592865" r="70.56" gradientTransform="translate(1223.5 -489.1) scale(1.68 1.68)" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#fff"/>
<stop offset="1" stop-color="#749194"/>
</radialGradient>
</defs>
<g>
<rect width="643.5" height="1431.5" style="fill: #1a1a1a"/>
<g>
<path d="M379,88.4v32.8c0,34.8-25.4,62.5-60.8,62.5s-60.9-27.5-60.9-62.5V88.4ZM277.6,158.3a54.9,54.9,0,0,0,40.6,17.4c32.1,0,53.8-24.5,53.8-55.7V96H264.3v24C264.3,137.3,270.2,150.2,277.6,158.3Z" style="fill: #4d4d4d"/>
<path d="M272.6,258.1c-10.2-4.4-17.1-15.2-17.1-26.7,0-21.8,13.1-28,34.8-28h48.3v7.4H288.3c-12.5,0-26.1,2.5-26.1,21.2s18.2,26.1,34.4,26.1h42v7.4H257.3v-7.4Z" style="fill: #4d4d4d"/>
<path d="M338.6,290.1v7.4l-18-.2c12.7,5.3,19.5,18,19.5,32,0,25.4-18.6,39.5-42.6,39.5s-42-15.9-42-40.1c0-11.4,4.6-23.8,17.7-31.4H223.6v-7.2ZM297.9,361c19.6,0,35.6-11.5,35.6-31.9s-16-32-35.6-32-35.7,11.5-35.7,32S278.5,361,297.9,361Z" style="fill: #4d4d4d"/>
<path d="M379,388.5v7.3H257.3v-7.3Z" style="fill: #4d4d4d"/>
<path d="M338.6,420.7V428H257.3v-7.3Zm22.6,3.7a6.9,6.9,0,0,1,6.9-6.7,6.7,6.7,0,1,1,0,13.4A6.9,6.9,0,0,1,361.2,424.4Z" style="fill: #4d4d4d"/>
<path d="M255.5,486.6c0-22.3,17.7-40.1,42.6-40.1s42,18,42,40.6-12,30.2-14.7,32.1l-4.6-5.6c4.3-3.7,12.2-10.4,12.2-27s-14.1-32.1-34.4-32.1-36,13.6-36,32.6a37.4,37.4,0,0,0,12,27.4l-4.6,5.1C266.3,516.4,255.5,508.1,255.5,486.6Z" style="fill: #4d4d4d"/>
<path d="M269.6,585.5c-4-3.4-14.1-13.4-14.1-29.3s10.8-26.5,24.4-26.5,24,10.8,24.7,34.1l.7,21.9h4.8c15.7,0,23.1-9.9,23.1-24.7,0-10.8-5-21.4-6.6-23.5l5.5-3.2c3.4,4.4,8,15.9,8,26.1,0,12-2.7,18.9-7.8,24.4s-10.6,8.3-24.7,8.3H257.3v-7.6Zm28.5-20.8c-.6-20.1-8.3-27-18.4-27s-17.3,7.4-17.3,20.4,9.2,23.3,15.7,27.4h20.5Z" style="fill: #4d4d4d"/>
<path d="M255.5,635.6c0-6.7,2.3-11.7,6.9-14.7s13.2-3.7,26.7-3.7h42.1V604.9h7.1v12.3h26.3v7.4H338.3v20.9h-7.1v-21h-49c-11.8,0-20,1.4-20,12.3a17.3,17.3,0,0,0,2.3,8.8l-6.5.9C256.4,644.4,255.5,640.7,255.5,635.6Z" style="fill: #4d4d4d"/>
<path d="M338.6,661.2v7.2H257.3v-7.2Zm22.6,3.7a6.9,6.9,0,0,1,6.9-6.7,6.7,6.7,0,1,1,0,13.4A6.9,6.9,0,0,1,361.2,664.9Z" style="fill: #4d4d4d"/>
<path d="M298.1,687.1c23.8,0,42,16.1,42,41.3s-18.2,41.3-42,41.3-42.6-16.1-42.6-41.3S273.5,687.1,298.1,687.1Zm-.2,7.9c-19.3,0-35.5,12.9-35.5,33.4s16.2,33.3,35.5,33.3,35.3-13,35.3-33.3S317.8,695,297.9,695Z" style="fill: #4d4d4d"/>
<path d="M306.2,843.9c13,0,27.1-3.6,27.1-21.7s-15.7-26-35.8-26H257.3v-7.4h81.3v7.3H322.9c10.3,3.8,17.2,14.9,17.2,26.6,0,23.3-14.9,28.6-34.1,28.6H257.3v-7.4Z" style="fill: #4d4d4d"/>
<path d="M245.1,863,396,936.9l-3.4,6.6L241.8,869.7C242.8,867.6,243.9,865.1,245.1,863Z" style="fill: #4d4d4d"/>
<path d="M365.3,1057.6l-108.9-45.4v-1.8l108.5-44.6L257.3,954.9v-7.8L379,960v8.6l-106.5,43.3,106.5,43v8.8l-121.7,12.7v-7.7Z" style="fill: #4d4d4d"/>
<path d="M338.6,1098.7v7.3H257.3v-7.3Zm22.6,3.7a6.9,6.9,0,0,1,6.9-6.7,6.7,6.7,0,1,1,0,13.4A6.9,6.9,0,0,1,361.2,1102.4Z" style="fill: #4d4d4d"/>
<path d="M338.6,1130.5v7.2H324.2c10.7,4.1,15.9,12,15.9,20.8a47,47,0,0,1-1.1,9.7l-7.8-1a34.9,34.9,0,0,0,1.3-9.7c0-7.5-5.2-12.2-7.1-13.8-3.7-2.8-9.3-6-21.7-6H257.3v-7.2Z" style="fill: #4d4d4d"/>
<path d="M338.6,1181.6v7.2H324.2c10.7,4.1,15.9,12,15.9,20.8a47,47,0,0,1-1.1,9.7l-7.8-1a33.8,33.8,0,0,0,1.3-9.7c0-7.4-5.2-12.2-7.1-13.8-3.7-2.8-9.3-6-21.7-6H257.3v-7.2Z" style="fill: #4d4d4d"/>
<path d="M298.1,1223c23.8,0,42,16,42,41.2s-18.2,41.3-42,41.3-42.6-16-42.6-41.3S273.5,1223,298.1,1223Zm-.2,7.9c-19.3,0-35.5,12.9-35.5,33.3s16.2,33.4,35.5,33.4,35.3-13.1,35.3-33.4S317.8,1230.9,297.9,1230.9Z" style="fill: #4d4d4d"/>
<path d="M338.6,1324.7v7.2H324.2c10.7,4.1,15.9,12,15.9,20.8a47,47,0,0,1-1.1,9.7l-7.8-1a33.8,33.8,0,0,0,1.3-9.7c0-7.4-5.2-12.2-7.1-13.8-3.7-2.8-9.3-6-21.7-6H257.3v-7.2Z" style="fill: #4d4d4d"/>
</g>
<line x1="715.7" y1="658.5" x2="715.7" y2="773" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 0.25px"/>
<line x1="715.7" y1="3.8" x2="715.7" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 10px"/>
<line x1="715.7" y1="1431.5" x2="715.7" y2="1427.7" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 10px"/>
<line x1="3.8" y1="715.7" y2="715.7" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 10px"/>
<line x1="1431.5" y1="715.7" x2="1427.7" y2="715.7" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 10px"/>
<line x1="773" y1="715.7" x2="658.5" y2="715.7" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 0.25px"/>
<line x1="715.7" y1="658.5" x2="715.7" y2="773" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 0.25px"/>
<path d="M1287,.1V1431.4H643.7V.1H1287m.1-.1H643.6V1431.5h643.5V0Z" style="fill: #fff"/>
</g>
<g>
<polygon points="911.7 1286.6 854 1385 873.4 1385 922.3 1300.7 911.7 1286.6" style="fill: url(#radial-gradient)"/>
<path d="M971.3,1349.5v-39.3h9.2v31.7h13.6v7.6Z" style="fill: #fff"/>
<path d="M1024.3,1349.5l-17.3-26.6s.2,4.7.2,8.9v17.7h-9v-39.3h9.9l16.8,26.4s-.2-4.4-.2-8.5v-17.9h9v39.3Z" style="fill: #fff"/>
<path d="M1038.3,1349.5v-39.3h9.1v31.7H1061v7.6Z" style="fill: #fff"/>
<path d="M1078.7,1350.1c-8.1,0-13-4.5-14.3-6.5l4.2-5.5c1.6,2,5.8,4.9,9.6,4.9s6.9-2,6.9-5.5-2.8-5.3-6.3-5.3h-3.5v-6.4h3.5c3.1,0,5.2-1.6,5.2-4.6s-2.5-4.6-5.6-4.6-6.2,1.2-9.4,3.8l-3.4-5.8c2.7-2.4,6.3-4.9,13.5-4.9s13.6,3.8,13.6,10.4-3,7.6-5.6,8.6v.2a9.3,9.3,0,0,1,6.9,9.1C1094,1345.9,1086.8,1350.1,1078.7,1350.1Z" style="fill: #fff"/>
<path d="M1110.6,1349.5h-13.3v-39.3h13.3c12.3,0,21.5,6.6,21.5,19.7S1123,1349.5,1110.6,1349.5Zm.5-31.6h-4.7v23.8h4.7c7.3,0,11.6-4.5,11.6-11.8S1118.5,1317.9,1111.1,1317.9Z" style="fill: #fff"/>
<path d="M979.7,1382.6c3.7,0,6.3-2,6.3-5.5s-2.5-4.7-5.4-6l-4.5-1.9c-3.5-1.5-5.2-3.8-5.2-7.5s4.7-7.9,9.4-7.9a10.9,10.9,0,0,1,8.5,4l-2,2.2a8.3,8.3,0,0,0-6.6-3.3c-3.3,0-5.9,1.7-5.9,4.8s2.2,4.4,4.3,5.2l4.2,1.8c3.7,1.6,6.7,3.7,6.7,8.2s-4.3,8.8-10.2,8.8-8-3.1-9.6-5.5l2.3-2.2C973.3,1379.9,976.4,1382.6,979.7,1382.6Z" style="fill: #fff"/>
<path d="M992.9,1374.6a10.9,10.9,0,1,1,21.8,0,10.9,10.9,0,0,1-21.8,0Zm18.4-.1c0-4.5-2.9-8-7.5-8s-7.5,3.5-7.5,8,2.8,8,7.5,8S1011.3,1378.9,1011.3,1374.5Z" style="fill: #fff"/>
<path d="M1017.9,1354.2h3.3v30.7h-3.3Z" style="fill: #fff"/>
<path d="M1043.8,1364v20.9h-3.2v-3.3c-.9,2.2-3.6,3.7-6.6,3.7-5.9,0-7.4-3.7-7.4-8.6V1364h3.3v12.4c0,3.9,1.3,6,5.2,6s5.5-3.2,5.5-6.8V1364Z" style="fill: #fff"/>
<path d="M1055.7,1385.4c-5,0-5-4.7-5-8.5v-10h-3.1v-2.8h3.1v-6.5h3.3v6.5h5.2v2.8H1054v10.7c0,1.7,0,3.2.7,4.1s1.1.8,2.1.8a5.7,5.7,0,0,0,2.3-.5l.2,2.7A8,8,0,0,1,1055.7,1385.4Z" style="fill: #fff"/>
<path d="M1065.8,1359.1a2.2,2.2,0,0,1-2.3-2.2,2.3,2.3,0,0,1,2.3-2.3,2.2,2.2,0,0,1,2.3,2.3A2.1,2.1,0,0,1,1065.8,1359.1Zm-1.6,4.9h3.3v20.9h-3.3Z" style="fill: #fff"/>
<path d="M1071.6,1374.6a10.9,10.9,0,1,1,21.8,0,10.9,10.9,0,0,1-21.8,0Zm18.4-.1c0-4.5-2.9-8-7.5-8s-7.5,3.5-7.5,8,2.8,8,7.5,8S1090,1378.9,1090,1374.5Z" style="fill: #fff"/>
<path d="M1114.6,1372.3v12.6h-3.3v-12.4c0-3.9-1.2-6-5.1-6s-5.6,3.1-5.6,6.7v11.7h-3.3V1364h3.3v3.4h.1c.9-2.2,3.5-3.8,6.5-3.8C1113.2,1363.6,1114.6,1367.3,1114.6,1372.3Z" style="fill: #fff"/>
<path d="M1125.7,1382.8c2.2,0,4.4-1,4.4-3.5s-3.5-3.4-5.1-3.9-6-1.5-6-5.9,3.4-5.9,6.8-5.9a9.7,9.7,0,0,1,6.8,2.5l-1.6,2a8.5,8.5,0,0,0-5.2-1.9c-2.2,0-3.7,1-3.7,3s2.1,2.8,4.4,3.5,6.7,1.8,6.7,6.3-3.3,6.4-7.6,6.4a9.4,9.4,0,0,1-7.8-3.7l1.8-2.1C1121.6,1381.9,1123.7,1382.8,1125.7,1382.8Z" style="fill: #fff"/>
<polygon points="930 1376.8 905.4 1344.5 913.6 1341.7 938.2 1374.1 930 1376.8" style="fill: #99d0a0"/>
<polyline points="913.6 1385 913.6 1385 883.5 1385 883.5 1377.3 904.1 1377.3 904.1 1341.7 913.6 1341.7" style="fill: #4db6e8"/>
<polygon points="925.1 1306 920.5 1313.8 949.1 1349.5 960.1 1349.5 925.1 1306" style="fill: url(#radial-gradient-2)"/>
<polyline points="929.9 1385 929.9 1385 960 1385 960 1377.3 939.4 1377.3 939.4 1341.7 929.9 1341.7" style="fill: #f4bf1f"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

View File

@ -0,0 +1,66 @@
<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="605mm" height="610mm" viewBox="0 0 1715 1729.1">
<defs>
<radialGradient id="radial-gradient" cx="-621.49" cy="1264.08" r="72.58" gradientTransform="translate(2311.2 -601.6) scale(1.67 1.68)" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#4db5e7"/>
<stop offset="1" stop-color="#167ab9"/>
</radialGradient>
<radialGradient id="radial-gradient-2" cx="-631.1" cy="1278.54" fx="-546.7997793489187" fy="1278.54238997403" r="85.15" gradientTransform="translate(2311.2 -601.6) scale(1.67 1.68)" gradientUnits="userSpaceOnUse">
<stop offset="0" stop-color="#fff"/>
<stop offset="1" stop-color="#749194"/>
</radialGradient>
</defs>
<g>
<g>
<rect width="793.7" height="1729.13" style="fill: #1a1a1a"/>
<g>
<path d="M454.1,106.8v39.6c0,42-30.4,75.5-72.9,75.5s-73-33.3-73-75.5V106.8ZM332.6,191.2a65.1,65.1,0,0,0,48.6,21.1c38.4,0,64.5-29.6,64.5-67.4v-29h-129v29C316.7,165.8,323.7,181.4,332.6,191.2Z" style="fill: #4d4d4d"/>
<path d="M326.6,311.7c-12.2-5.3-20.5-18.3-20.5-32.1,0-26.5,15.7-33.9,41.7-33.9h57.9v8.9H345.4c-15,0-31.2,3-31.2,25.6s21.7,31.5,41.2,31.5h50.3v9H308.2v-9Z" style="fill: #4d4d4d"/>
<path d="M405.7,350.4v9l-21.6-.3c15.3,6.4,23.3,21.8,23.3,38.6,0,30.7-22.2,47.8-51,47.8s-50.3-19.2-50.3-48.4c0-13.9,5.5-28.8,21.2-38H267.9v-8.7Zm-48.8,85.7c23.4,0,42.7-13.9,42.7-38.6s-19.3-38.6-42.7-38.6-42.7,13.9-42.7,38.6S333.6,436.1,356.9,436.1Z" style="fill: #4d4d4d"/>
<path d="M454.1,469.3V478H308.2v-8.7Z" style="fill: #4d4d4d"/>
<path d="M405.7,508.2v8.7H308.2v-8.7Zm27.1,4.5a8.2,8.2,0,0,1,8.2-8.1,8.1,8.1,0,1,1,0,16.2A8.2,8.2,0,0,1,432.8,512.7Z" style="fill: #4d4d4d"/>
<path d="M306.1,587.7c0-26.8,21.2-48.3,51-48.3s50.3,21.7,50.3,49-14.4,36.4-17.6,38.8l-5.5-6.8c5.1-4.5,14.6-12.6,14.6-32.7S382,549,357.7,549s-43.1,16.4-43.1,39.4a45.1,45.1,0,0,0,14.4,33l-5.5,6.2C319,623.8,306.1,613.8,306.1,587.7Z" style="fill: #4d4d4d"/>
<path d="M323,707.2c-4.8-4-16.9-16.2-16.9-35.3s12.9-32,29.2-32,28.7,13,29.6,41.1l.8,26.5h5.7c18.9,0,27.7-12,27.7-29.9,0-13-5.9-25.8-7.8-28.3l6.6-3.9c4,5.4,9.5,19.2,9.5,31.6,0,14.5-3.2,22.8-9.3,29.4s-12.7,10-29.6,10H308.2v-9.2Zm34.1-25.1c-.7-24.3-10-32.6-22-32.6s-20.7,8.9-20.7,24.7,11,28.1,18.8,33h24.5Z" style="fill: #4d4d4d"/>
<path d="M306.1,767.7c0-8.1,2.8-14,8.3-17.7s15.8-4.4,31.9-4.4h50.5v-15h8.5v15h31.5v8.9H405.3v25.2h-8.5V754.3H338c-14.1,0-23.8,1.7-23.8,14.9a21.7,21.7,0,0,0,2.7,10.7l-7.8,1C307.2,778.4,306.1,773.9,306.1,767.7Z" style="fill: #4d4d4d"/>
<path d="M405.7,798.7v8.7H308.2v-8.7Zm27.1,4.5a8.2,8.2,0,0,1,8.2-8.1,8.1,8.1,0,1,1,0,16.2A8.3,8.3,0,0,1,432.8,803.2Z" style="fill: #4d4d4d"/>
<path d="M357.1,830c28.5,0,50.3,19.4,50.3,49.8s-21.8,49.9-50.3,49.9-51-19.4-51-49.9S327.7,830,357.1,830Zm-.2,9.6c-23.1,0-42.5,15.5-42.5,40.2s19.4,40.3,42.5,40.3,42.2-15.8,42.2-40.3S380.8,839.6,356.9,839.6Z" style="fill: #4d4d4d"/>
<path d="M366.8,1019.3c15.6,0,32.6-4.2,32.6-26.2s-18.9-31.3-43-31.3H308.2v-9h97.5v8.8H386.9c12.2,4.7,20.5,18.1,20.5,32.2,0,28.1-17.8,34.5-40.8,34.5H308.2v-9Z" style="fill: #4d4d4d"/>
<path d="M293.7,1042.5l180.7,89.3-4,7.8-180.8-89C290.9,1048,292.2,1045,293.7,1042.5Z" style="fill: #4d4d4d"/>
<path d="M437.6,1277.4l-130.4-54.7v-2.2l130-53.9-129-13.2V1144l145.9,15.6V1170l-127.7,52.2,127.7,52v10.7l-145.9,15.3v-9.3Z" style="fill: #4d4d4d"/>
<path d="M405.7,1327.2v8.7H308.2v-8.7Zm27.1,4.4a8.3,8.3,0,0,1,8.2-8.1,8.1,8.1,0,1,1,0,16.2A8.2,8.2,0,0,1,432.8,1331.6Z" style="fill: #4d4d4d"/>
<path d="M405.7,1365.5v8.7H388.4c12.9,4.9,19,14.5,19,25.2a57.2,57.2,0,0,1-1.3,11.7l-9.3-1.3a39.1,39.1,0,0,0,1.5-11.7c0-8.9-6.1-14.7-8.5-16.6-4.4-3.4-11.2-7.3-26-7.3H308.2v-8.7Z" style="fill: #4d4d4d"/>
<path d="M405.7,1427.3v8.7H388.4c12.9,4.9,19,14.5,19,25.1a58.9,58.9,0,0,1-1.3,11.8l-9.3-1.3a39.6,39.6,0,0,0,1.5-11.7c0-9-6.1-14.7-8.5-16.7-4.4-3.4-11.2-7.2-26-7.2H308.2v-8.7Z" style="fill: #4d4d4d"/>
<path d="M357.1,1477.2c28.5,0,50.3,19.4,50.3,49.9s-21.8,49.9-50.3,49.9-51-19.4-51-49.9S327.7,1477.2,357.1,1477.2Zm-.2,9.6c-23.1,0-42.5,15.6-42.5,40.3s19.4,40.3,42.5,40.3,42.2-15.8,42.2-40.3S380.8,1486.8,356.9,1486.8Z" style="fill: #4d4d4d"/>
<path d="M405.7,1600.1v8.7H388.4c12.9,4.9,19,14.5,19,25.2a57.2,57.2,0,0,1-1.3,11.7l-9.3-1.3a39.1,39.1,0,0,0,1.5-11.7c0-8.9-6.1-14.7-8.5-16.6-4.4-3.4-11.2-7.3-26-7.3H308.2v-8.7Z" style="fill: #4d4d4d"/>
</g>
<line x1="857.5" y1="795.4" x2="857.5" y2="933.7" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 0.25px"/>
<line x1="857.5" y1="4.6" x2="857.5" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 10px"/>
<line x1="857.5" y1="1729.1" x2="857.5" y2="1724.5" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 10px"/>
<line x1="4.6" y1="864.6" y2="864.6" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 10px"/>
<line x1="1715" y1="864.6" x2="1710.4" y2="864.6" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 10px"/>
<line x1="926.1" y1="864.6" x2="788.9" y2="864.6" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 0.25px"/>
<line x1="857.5" y1="795.4" x2="857.5" y2="933.7" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 0.25px"/>
<path d="M1586.3.1V1729H792.8V.1h793.5m.1-.1H792.7V1729.1h793.7V0Z" style="fill: #fff"/>
</g>
<g>
<polygon points="1242.2 1531.1 1173.1 1650 1196.4 1650 1255 1548.1 1242.2 1531.1" style="fill: url(#radial-gradient)"/>
<path d="M1313.7,1607.1v-47.4h10.9v38.2h16.3v9.2Z" style="fill: #fff"/>
<path d="M1377.1,1607.1l-20.6-32.2s.2,5.7.2,10.8v21.4h-10.8v-47.4h11.8l20.2,31.9s-.2-5.4-.2-10.4v-21.5h10.7v47.4Z" style="fill: #fff"/>
<path d="M1393.8,1607.1v-47.4h11v38.2h16.3v9.2Z" style="fill: #fff"/>
<path d="M1442.3,1607.8c-9.7,0-15.5-5.5-17.2-7.9l5.1-6.6c1.9,2.4,6.9,6,11.5,6s8.2-2.5,8.2-6.7-3.2-6.4-7.5-6.4h-4.1v-7.8h4.1c3.7,0,6.3-1.8,6.3-5.5s-3.1-5.6-6.8-5.6-7.4,1.5-11.3,4.6l-4-7c3.2-2.9,7.6-5.9,16.2-5.9s16.3,4.7,16.3,12.6-3.6,9.1-6.7,10.4v.2a11.2,11.2,0,0,1,8.2,11C1460.6,1602.7,1452,1607.8,1442.3,1607.8Z" style="fill: #fff"/>
<path d="M1480.5,1607.1h-16v-47.4h16c14.8,0,25.7,7.9,25.7,23.7S1495.3,1607.1,1480.5,1607.1Zm.6-38.2h-5.6v28.8h5.6c8.7,0,14-5.5,14-14.3S1490,1568.9,1481.1,1568.9Z" style="fill: #fff"/>
<path d="M1323.7,1647c4.4,0,7.6-2.3,7.6-6.5s-3.1-5.8-6.5-7.3l-5.5-2.4c-4.1-1.7-6.1-4.5-6.1-9,0-6.2,5.6-9.5,11.3-9.5a13.1,13.1,0,0,1,10.1,4.8l-2.4,2.7a10,10,0,0,0-7.9-4c-4,0-7.1,2.1-7.1,5.7s2.7,5.4,5.1,6.4l5.1,2.1c4.4,2,8,4.6,8,9.9s-5.1,10.6-12.2,10.6-9.6-3.7-11.5-6.6l2.7-2.6C1316,1643.8,1319.7,1647,1323.7,1647Z" style="fill: #fff"/>
<path d="M1339.5,1637.4a13.1,13.1,0,1,1,26.1,0,12.6,12.6,0,0,1-13,13C1345.2,1650.4,1339.5,1645.1,1339.5,1637.4Zm22.1-.1c0-5.5-3.5-9.7-9-9.7s-9,4.2-9,9.7,3.4,9.6,9,9.6S1361.6,1642.6,1361.6,1637.3Z" style="fill: #fff"/>
<path d="M1369.5,1612.8h4v37.1h-4Z" style="fill: #fff"/>
<path d="M1400.5,1624.6v25.3h-3.9v-4c-1.1,2.7-4.3,4.4-7.9,4.4-7.2,0-8.9-4.4-8.9-10.4v-15.3h4v15c0,4.7,1.5,7.3,6.1,7.3s6.7-3.9,6.7-8.3v-14Z" style="fill: #fff"/>
<path d="M1414.7,1650.4c-5.9,0-5.9-5.6-5.9-10.2V1628H1405v-3.3h3.8v-7.8h4v7.8h6.1v3.3h-6.2v13c0,2.1,0,3.8.8,5a2.9,2.9,0,0,0,2.6,1,6.7,6.7,0,0,0,2.7-.6l.3,3.2A9.9,9.9,0,0,1,1414.7,1650.4Z" style="fill: #fff"/>
<path d="M1426.9,1618.7a2.6,2.6,0,0,1-2.8-2.7,2.7,2.7,0,0,1,2.8-2.8,2.8,2.8,0,1,1,0,5.5Zm-2,6h4v25.2h-4Z" style="fill: #fff"/>
<path d="M1433.8,1637.4a13.1,13.1,0,1,1,13,13A12.6,12.6,0,0,1,1433.8,1637.4Zm22-.1c0-5.5-3.4-9.7-9-9.7s-9,4.2-9,9.7,3.5,9.6,9,9.6S1455.8,1642.6,1455.8,1637.3Z" style="fill: #fff"/>
<path d="M1485.3,1634.6v15.3h-3.9v-15c0-4.7-1.5-7.3-6.2-7.3s-6.7,3.7-6.7,8.1v14.2h-3.9v-25.2h3.9v4h.2c1.1-2.6,4.2-4.5,7.8-4.5C1483.6,1624.2,1485.3,1628.6,1485.3,1634.6Z" style="fill: #fff"/>
<path d="M1498.6,1647.3c2.7,0,5.3-1.2,5.3-4.2s-4.2-4.1-6.1-4.7-7.2-1.8-7.2-7.2,4-7,8.1-7a11.5,11.5,0,0,1,8.2,2.9l-1.9,2.5a9.6,9.6,0,0,0-6.3-2.4c-2.6,0-4.5,1.3-4.5,3.6s2.6,3.4,5.4,4.4,8,2.1,8,7.5-4,7.7-9.1,7.7-7.5-1.7-9.3-4.4l2.1-2.6C1493.7,1646.2,1496.2,1647.3,1498.6,1647.3Z" style="fill: #fff"/>
<polygon points="1264.2 1640.1 1234.7 1601 1244.5 1597.7 1274 1636.8 1264.2 1640.1" style="fill: #99d0a0"/>
<polyline points="1244.5 1650 1244.5 1650 1208.5 1650 1208.5 1640.6 1233.1 1640.6 1233.1 1597.7 1244.5 1597.7" style="fill: #4db6e8"/>
<polygon points="1258.3 1554.6 1252.8 1563.9 1287.1 1607.1 1300.2 1607.1 1258.3 1554.6" style="fill: url(#radial-gradient-2)"/>
<polyline points="1264 1650 1264 1650 1300.1 1650 1300.1 1640.6 1275.4 1640.6 1275.4 1597.7 1264 1597.7" style="fill: #f4bf1f"/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 8.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

View File

@ -1,4 +1,5 @@
min_slic3r_version = 2.6.0-beta2
1.9.1 Added new Prusament Resin material profiles.
1.9.0 Bumped up configuration version.
1.9.0-beta3 Updated start g-code for MK4 (modified purge line and nozzle cleaning).
1.9.0-beta2 Added profiles for Original Prusa MK4 Input Shaper (Alpha).
@ -19,6 +20,7 @@ min_slic3r_version = 2.6.0-alpha1
1.6.0-alpha1 Updated FW version notification. Decreased min layer time for PLA.
1.6.0-alpha0 Default top fill set to monotonic lines. Updated infill/perimeter overlap values. Updated output filename format. Enabled dynamic overhang speeds.
min_slic3r_version = 2.5.2-rc0
1.7.7 Added new Prusament Resin material profiles.
1.7.6 Updated start g-code for MK4 (modified purge line and nozzle cleaning).
1.7.5 Updated cooling settings for some ASA filaments to increase interlayer adhesion (XL/MK4). Updated LA values (XL/MK4).
1.7.4 Updated start g-code script for MK4/XL (fixed pre-print temperature for PA filaments).

View File

@ -5,7 +5,7 @@
name = Prusa Research
# Configuration version of this file. Config file will only be installed, if the config_version differs.
# This means, the server may force the PrusaSlicer configuration to be downgraded.
config_version = 1.9.0
config_version = 1.9.1
# Where to get the updates from?
config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/PrusaResearch/
changelog_url = https://files.prusa3d.com/?latest=slicer-profiles&lng=%1%
@ -11745,6 +11745,30 @@ material_type = Tough
material_vendor = Prusa Polymers
material_colour = #ECDE05
[sla_material:Prusament Resin BioBased60 Obsidian Black @0.025]
inherits = *common 0.025*
exposure_time = 10
initial_exposure_time = 35
material_type = Tough
material_vendor = Prusa Polymers
material_colour = #232323
[sla_material:Prusament Resin BioBased60 Sapphire Blue @0.025]
inherits = *common 0.025*
exposure_time = 7.7
initial_exposure_time = 35
material_type = Tough
material_vendor = Prusa Polymers
material_colour = #2196F3
[sla_material:Prusament Resin BioBased60 Ivory White @0.025]
inherits = *common 0.025*
exposure_time = 7.5
initial_exposure_time = 35
material_type = Tough
material_vendor = Prusa Polymers
material_colour = #E3D99F
[sla_material:Prusament Resin Flex80 Transparent Clear @0.025]
inherits = *common 0.025*
exposure_time = 10
@ -12774,6 +12798,30 @@ material_type = Tough
material_vendor = Prusa Polymers
material_colour = #ECDE05
[sla_material:Prusament Resin BioBased60 Obsidian Black @0.05]
inherits = *common 0.05*
exposure_time = 12
initial_exposure_time = 35
material_type = Tough
material_vendor = Prusa Polymers
material_colour = #232323
[sla_material:Prusament Resin BioBased60 Sapphire Blue @0.05]
inherits = *common 0.05*
exposure_time = 8
initial_exposure_time = 35
material_type = Tough
material_vendor = Prusa Polymers
material_colour = #2196F3
[sla_material:Prusament Resin BioBased60 Ivory White @0.05]
inherits = *common 0.05*
exposure_time = 9.5
initial_exposure_time = 35
material_type = Tough
material_vendor = Prusa Polymers
material_colour = #E3D99F
[sla_material:Prusament Resin Flex80 Transparent Clear @0.05]
inherits = *common 0.05*
exposure_time = 15
@ -13234,6 +13282,30 @@ material_type = Tough
material_vendor = Prusa Polymers
material_colour = #ECDE05
[sla_material:Prusament Resin BioBased60 Obsidian Black @0.1]
inherits = *common 0.1*
exposure_time = 16
initial_exposure_time = 35
material_type = Tough
material_vendor = Prusa Polymers
material_colour = #232323
[sla_material:Prusament Resin BioBased60 Sapphire Blue @0.1]
inherits = *common 0.1*
exposure_time = 9
initial_exposure_time = 35
material_type = Tough
material_vendor = Prusa Polymers
material_colour = #2196F3
[sla_material:Prusament Resin BioBased60 Ivory White @0.1]
inherits = *common 0.1*
exposure_time = 12
initial_exposure_time = 45
material_type = Tough
material_vendor = Prusa Polymers
material_colour = #E3D99F
[sla_material:Prusament Resin Flex80 Transparent Clear @0.1]
inherits = *common 0.1*
exposure_time = 20
@ -13515,6 +13587,30 @@ material_vendor = Prusa Polymers
material_colour = #ECDE05
material_print_speed = slow
[sla_material:Prusament Resin BioBased60 Obsidian Black @0.025 SL1S]
inherits = *0.025_sl1s*
exposure_time = 4.5
initial_exposure_time = 25
material_type = Tough
material_vendor = Prusa Polymers
material_colour = #232323
[sla_material:Prusament Resin BioBased60 Sapphire Blue @0.025 SL1S]
inherits = *0.025_sl1s*
exposure_time = 2.8
initial_exposure_time = 25
material_type = Tough
material_vendor = Prusa Polymers
material_colour = #2196F3
[sla_material:Prusament Resin BioBased60 Ivory White @0.025 SL1S]
inherits = *0.025_sl1s*
exposure_time = 3
initial_exposure_time = 50
material_type = Tough
material_vendor = Prusa Polymers
material_colour = #E3D99F
[sla_material:Prusament Resin Flex80 Transparent Clear @0.025 SL1S]
inherits = *0.025_sl1s*
exposure_time = 4
@ -14009,6 +14105,30 @@ material_vendor = Prusa Polymers
material_colour = #ECDE05
material_print_speed = slow
[sla_material:Prusament Resin BioBased60 Obsidian Black @0.05 SL1S]
inherits = *0.05_sl1s*
exposure_time = 6
initial_exposure_time = 25
material_type = Tough
material_vendor = Prusa Polymers
material_colour = #232323
[sla_material:Prusament Resin BioBased60 Sapphire Blue @0.05 SL1S]
inherits = *0.05_sl1s*
exposure_time = 3
initial_exposure_time = 25
material_type = Tough
material_vendor = Prusa Polymers
material_colour = #2196F3
[sla_material:Prusament Resin BioBased60 Ivory White @0.05 SL1S]
inherits = *0.05_sl1s*
exposure_time = 3.5
initial_exposure_time = 50
material_type = Tough
material_vendor = Prusa Polymers
material_colour = #E3D99F
[sla_material:Prusament Resin Flex80 Transparent Clear @0.05 SL1S]
inherits = *0.05_sl1s*
exposure_time = 5
@ -14831,6 +14951,30 @@ material_vendor = Prusa Polymers
material_colour = #ECDE05
material_print_speed = slow
[sla_material:Prusament Resin BioBased60 Obsidian Black @0.1 SL1S]
inherits = *0.1_sl1s*
exposure_time = 7.5
initial_exposure_time = 25
material_type = Tough
material_vendor = Prusa Polymers
material_colour = #232323
[sla_material:Prusament Resin BioBased60 Sapphire Blue @0.1 SL1S]
inherits = *0.1_sl1s*
exposure_time = 4
initial_exposure_time = 25
material_type = Tough
material_vendor = Prusa Polymers
material_colour = #2196F3
[sla_material:Prusament Resin BioBased60 Ivory White @0.1 SL1S]
inherits = *0.1_sl1s*
exposure_time = 4.5
initial_exposure_time = 50
material_type = Tough
material_vendor = Prusa Polymers
material_colour = #E3D99F
[sla_material:Prusament Resin Flex80 Transparent Clear @0.1 SL1S]
inherits = *0.1_sl1s*
exposure_time = 6

View File

@ -312,7 +312,7 @@ namespace Slic3r {
std::string gcode_out;
std::string line;
Vec2f pos = tcr.start_pos;
Vec2f transformed_pos = pos;
Vec2f transformed_pos = Eigen::Rotation2Df(angle) * pos + translation;
Vec2f old_pos(-1000.1f, -1000.1f);
while (gcode_str) {

View File

@ -3605,14 +3605,16 @@ void GCodeProcessor::post_process()
auto rev_it = m_lines.rbegin() + rev_it_dist;
auto start_rev_it = rev_it;
std::string curr_cmd = GCodeReader::GCodeLine::extract_cmd(rev_it->line);
// backtrace into the cache to find the place where to insert the line
while (rev_it != m_lines.rend() && rev_it->time > time_threshold_i && GCodeReader::GCodeLine::extract_cmd(rev_it->line) != cmd) {
while (rev_it != m_lines.rend() && rev_it->time > time_threshold_i && curr_cmd != cmd && curr_cmd != "G28" && curr_cmd != "G29") {
rev_it->line = line_replacer(rev_it->line);
++rev_it;
curr_cmd = GCodeReader::GCodeLine::extract_cmd(rev_it->line);
}
// we met the previous evenience of cmd. stop inserting lines
if (rev_it != m_lines.rend() && GCodeReader::GCodeLine::extract_cmd(rev_it->line) == cmd)
// we met the previous evenience of cmd, or a G28/G29 command. stop inserting lines
if (rev_it != m_lines.rend() && (curr_cmd == cmd || curr_cmd == "G28" || curr_cmd == "G29"))
break;
// insert the line for the current step

View File

@ -656,12 +656,22 @@ void Layer::make_perimeters()
layer_region_ids.push_back(region_id);
for (LayerRegionPtrs::const_iterator it = layerm + 1; it != m_regions.end(); ++it)
if (! (*it)->slices().empty()) {
LayerRegion* other_layerm = *it;
const PrintRegionConfig &other_config = other_layerm->region().config();
if (config.perimeter_extruder == other_config.perimeter_extruder
LayerRegion *other_layerm = *it;
const PrintRegionConfig &other_config = other_layerm->region().config();
bool dynamic_overhang_speed_compatibility = config.enable_dynamic_overhang_speeds ==
other_config.enable_dynamic_overhang_speeds;
if (dynamic_overhang_speed_compatibility && config.enable_dynamic_overhang_speeds) {
dynamic_overhang_speed_compatibility = config.overhang_speed_0 == other_config.overhang_speed_0 &&
config.overhang_speed_1 == other_config.overhang_speed_1 &&
config.overhang_speed_2 == other_config.overhang_speed_2 &&
config.overhang_speed_3 == other_config.overhang_speed_3;
}
if (config.perimeter_extruder == other_config.perimeter_extruder
&& config.perimeters == other_config.perimeters
&& config.perimeter_speed == other_config.perimeter_speed
&& config.external_perimeter_speed == other_config.external_perimeter_speed
&& dynamic_overhang_speed_compatibility
&& (config.gap_fill_enabled ? config.gap_fill_speed.value : 0.) ==
(other_config.gap_fill_enabled ? other_config.gap_fill_speed.value : 0.)
&& config.overhangs == other_config.overhangs

View File

@ -3971,7 +3971,7 @@ void GCodeViewer::render_legend(float& legend_height)
const auto custom_it = std::find(m_roles.begin(), m_roles.end(), GCodeExtrusionRole::Custom);
if (custom_it != m_roles.end()) {
const bool custom_visible = is_visible(GCodeExtrusionRole::Custom);
const wxString btn_text = custom_visible ? _u8L("Hide Custom G-code") : _u8L("Show Custom G-code");
const wxString btn_text = custom_visible ? _L("Hide Custom G-code") : _L("Show Custom G-code");
ImGui::Separator();
if (imgui.button(btn_text, ImVec2(-1.0f, 0.0f), true)) {
m_extrusions.role_visibility_flags = custom_visible ? m_extrusions.role_visibility_flags & ~(1 << int(GCodeExtrusionRole::Custom)) :

View File

@ -7502,8 +7502,9 @@ void GLCanvas3D::_set_warning_notification(EWarning warning, bool state)
std::string objName2 = conflict_result->_objName2;
double height = conflict_result->_height;
int layer = conflict_result->layer;
text = (boost::format(_u8L("Conflicts of gcode paths have been found at layer %d, z = %.2lf mm. Please separate the conflicted objects farther (%s <-> %s).")) % layer %
height % objName1 % objName2).str();
// TRN %3% is name of Object1, %4% is name of Object2
text = format(_u8L("Conflicts in G-code paths have been detected at layer %1%, z=%2$.2f mm. Please reposition the conflicting objects (%3% <-> %4%) further apart."),
layer, height, objName1, objName2);
error = ErrorType::SLICING_ERROR;
break;
}

View File

@ -605,6 +605,7 @@ wxString sla_wildcards(const char *formatid)
if (entry) {
FileWildcards wc;
std::string tr_title = I18N::translate_utf8(entry->desc);
// TRN %s = type of file
tr_title = GUI::format(_u8L("%s files"), tr_title);
wc.title = tr_title;

View File

@ -1815,7 +1815,7 @@ void GLGizmoEmboss::draw_font_list()
}
if (!m_face_names->has_truncated_names)
init_truncated_names(*m_face_names, m_gui_cfg->face_name_max_width);
init_truncated_names(*m_face_names, m_gui_cfg->input_width);
if (m_face_names->texture_id == 0)
init_font_name_texture();

View File

@ -175,8 +175,7 @@ void GLGizmosManager::reset_all_states()
const EType current = get_current_type();
if (current != Undefined)
// close any open gizmo
if (!open_gizmo(current))
return;
open_gizmo(current);
activate_gizmo(Undefined);
m_hover = Undefined;

View File

@ -166,14 +166,7 @@ static void update_arrangepoly_slaprint(arrangement::ArrangePolygon &ret,
auto omesh = po.get_mesh_to_print();
auto &smesh = po.support_mesh();
Vec3d rotation = inst.get_rotation();
rotation.z() = 0.;
Transform3f trafo_instance =
Geometry::assemble_transform(inst.get_offset().z() * Vec3d::UnitZ(),
rotation,
inst.get_scaling_factor(),
inst.get_mirror()).cast<float>();
Transform3f trafo_instance = inst.get_matrix().cast<float>();
trafo_instance = trafo_instance * po.trafo().cast<float>().inverse();
Polygons polys;
@ -182,8 +175,6 @@ static void update_arrangepoly_slaprint(arrangement::ArrangePolygon &ret,
if (omesh) {
polys.emplace_back(its_convex_hull_2d_above(*omesh, trafo_instance, zlvl));
ret.poly.contour = polys.back();
ret.poly.holes = {};
}
polys.emplace_back(its_convex_hull_2d_above(smesh.its, trafo_instance, zlvl));
@ -236,7 +227,8 @@ coord_t get_skirt_offset(const Plater* plater) {
void ArrangeJob::prepare()
{
m_selection_only ? prepare_selected() : prepare_all();
m_selection_only ? prepare_selected() :
prepare_all();
coord_t min_offset = 0;
for (auto &ap : m_selected) {
@ -443,7 +435,6 @@ void assign_logical_beds(std::vector<arrangement::ArrangePolygon> &items,
const arrangement::ArrangeBed &bed,
double stride)
{
// The strides have to be removed from the fixed items. For the
// arrangeable (selected) items bed_idx is ignored and the
// translation is irrelevant.

View File

@ -2108,9 +2108,9 @@ void NotificationManager::push_slicing_error_notification(const std::string& tex
push_notification_data({ NotificationType::SlicingError, NotificationLevel::ErrorNotificationLevel, 0, _u8L("ERROR:") + "\n" + text }, 0);
set_slicing_progress_hidden();
}
void NotificationManager::push_slicing_warning_notification(const std::string& text, bool gray, ObjectID oid, int warning_step)
void NotificationManager::push_slicing_warning_notification(const std::string& text, bool gray, ObjectID oid, int warning_step, const std::string& hypertext, std::function<bool(wxEvtHandler*)> callback)
{
NotificationData data { NotificationType::SlicingWarning, NotificationLevel::WarningNotificationLevel, 0, _u8L("WARNING:") + "\n" + text };
NotificationData data { NotificationType::SlicingWarning, NotificationLevel::WarningNotificationLevel, 0, _u8L("WARNING:") + "\n" + text , hypertext, callback};
auto notification = std::make_unique<NotificationManager::ObjectIDNotification>(data, m_id_provider, m_evt_handler);
notification->object_id = oid;

View File

@ -172,7 +172,7 @@ public:
// Creates Slicing Error notification with a custom text and no fade out.
void push_slicing_error_notification(const std::string& text);
// Creates Slicing Warning notification with a custom text and no fade out.
void push_slicing_warning_notification(const std::string& text, bool gray, ObjectID oid, int warning_step);
void push_slicing_warning_notification(const std::string& text, bool gray, ObjectID oid, int warning_step, const std::string& hypertext = "", std::function<bool(wxEvtHandler*)> callback = std::function<bool(wxEvtHandler*)>());
// marks slicing errors as gray
void set_all_slicing_errors_gray(bool g);
// marks slicing warings as gray

View File

@ -3462,7 +3462,7 @@ bool Plater::priv::restart_background_process(unsigned int state)
void Plater::priv::export_gcode(fs::path output_path, bool output_path_on_removable_media, PrintHostJob upload_job)
{
wxCHECK_RET(!(output_path.empty() && upload_job.empty()), "export_gcode: output_path and upload_job empty");
if (model.objects.empty())
return;
@ -4114,11 +4114,42 @@ void Plater::priv::on_slicing_update(SlicingStatusEvent &evt)
// Avoid a race condition
return;
}
// this->statusbar()->set_progress(evt.status.percent);
// this->statusbar()->set_status_text(_(evt.status.text) + wxString::FromUTF8("…"));
notification_manager->set_slicing_progress_percentage(evt.status.text, (float)evt.status.percent / 100.0f);
}
// Check template filaments and add warning
// This is more convinient to do here than in slicing backend, so it happens on "Slicing complete".
if (evt.status.percent >= 100 && this->printer_technology == ptFFF) {
size_t templ_cnt = 0;
const auto& preset_bundle = wxGetApp().preset_bundle;
std::string names;
for (const auto& extruder_filaments : preset_bundle->extruders_filaments) {
const Preset* preset = extruder_filaments.get_selected_preset();
if (preset && preset->vendor && preset->vendor->templates_profile) {
names += "\n" + preset->name;
templ_cnt++;
}
}
if (templ_cnt > 0) {
const std::string message_notif = GUI::format("%1%\n%2%\n\n%3%\n\n%4% "
, _L_PLURAL("You are using template filament preset.", "You are using template filament presets.", templ_cnt)
, names
, _u8L("Please note that template presets are not customized for specific printer and should only be used as a starting point for creating your own user presets.")
,_u8L("More info at"));
// warning dialog proccessing cuts text at first '/n' - pass the text without new lines (and without filament names).
const std::string message_dial = GUI::format("%1% %2% %3%"
, _L_PLURAL("You are using template filament preset.", "You are using template filament presets.", templ_cnt)
, _u8L("Please note that template presets are not customized for specific printer and should only be used as a starting point for creating your own user presets.")
, "<a href=https://help.prusa3d.com/article/template-filaments_467599>https://help.prusa3d.com/</a>"
);
BOOST_LOG_TRIVIAL(warning) << message_notif;
notification_manager->push_slicing_warning_notification(message_notif, false, 0, 0, "https://help.prusa3d.com/",
[](wxEvtHandler* evnthndlr) { wxGetApp().open_browser_with_warning_dialog("https://help.prusa3d.com/article/template-filaments_467599"); return false; }
);
add_warning({ PrintStateBase::WarningLevel::CRITICAL, true, message_dial, 0}, 0);
}
}
if (evt.status.flags & (PrintBase::SlicingStatus::RELOAD_SCENE | PrintBase::SlicingStatus::RELOAD_SLA_SUPPORT_POINTS)) {
switch (this->printer_technology) {
case ptFFF:
@ -4254,9 +4285,9 @@ bool Plater::priv::warnings_dialog()
else
text += it.first.message;
}
//text += "\n\nDo you still wish to export?";
//wxMessageDialog msg_wingow(this->q, from_u8(text), wxString(SLIC3R_APP_NAME " ") + _L("generated warnings"), wxOK);
MessageDialog msg_wingow(this->q, from_u8(text), wxString(SLIC3R_APP_NAME " ") + _L("generated warnings"), wxOK);
//MessageDialog msg_wingow(this->q, from_u8(text), wxString(SLIC3R_APP_NAME " ") + _L("generated warnings"), wxOK);
// Changed to InfoDialog so it can show hyperlinks
InfoDialog msg_wingow(this->q, format_wxstr("%1% %2%", SLIC3R_APP_NAME, _L("generated warnings")), from_u8(text), true);
const auto res = msg_wingow.ShowModal();
return res == wxID_OK;
@ -6679,7 +6710,7 @@ bool Plater::export_3mf(const boost::filesystem::path& output_path)
else {
// Failure
// p->statusbar()->set_status_text(format_wxstr(_L("Error exporting 3MF file %s"), path));
const wxString what = GUI::format_wxstr(_L("%1%: %2%"),_L("Unable to save file") , path_u8);
const wxString what = GUI::format_wxstr("%1%: %2%", _L("Unable to save file") , path_u8);
show_error(this, what);
}
return ret;

View File

@ -644,13 +644,7 @@ PlaterPresetComboBox::PlaterPresetComboBox(wxWindow *parent, Preset::Type preset
edit_btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent)
{
// In a case of a physical printer, for its editing open PhysicalPrinterDialog
if (m_type == Preset::TYPE_PRINTER
#ifdef __linux__
// To edit extruder color from the sidebar
|| m_type == Preset::TYPE_FILAMENT
#endif //__linux__
)
if (m_type == Preset::TYPE_PRINTER || m_type == Preset::TYPE_FILAMENT)
show_edit_menu();
else
switch_to_tab();
@ -784,15 +778,18 @@ void PlaterPresetComboBox::show_edit_menu()
append_menu_item(menu, wxID_ANY, _L("Edit preset"), "",
[this](wxCommandEvent&) { this->switch_to_tab(); }, "cog", menu, []() { return true; }, wxGetApp().plater());
#ifdef __linux__
// To edit extruder color from the sidebar
if (m_type == Preset::TYPE_FILAMENT) {
#ifdef __linux__
// To edit extruder color from the sidebar
append_menu_item(menu, wxID_ANY, _L("Change extruder color"), "",
[this](wxCommandEvent&) { this->change_extruder_color(); }, "funnel", menu, []() { return true; }, wxGetApp().plater());
#endif //__linux__
append_menu_item(menu, wxID_ANY, _L("Show/Hide template presets"), "",
[this](wxCommandEvent&) { wxGetApp().open_preferences("no_templates", "General"); }, "spool", menu, []() { return true; }, wxGetApp().plater());
wxGetApp().plater()->PopupMenu(menu);
return;
}
#endif //__linux__
if (this->is_selected_physical_printer()) {
append_menu_item(menu, wxID_ANY, _L("Edit physical printer"), "",

View File

@ -465,10 +465,19 @@ void Tab::OnActivate()
if (m_presets_choice->IsShown())
Refresh(); // Just refresh page, if m_presets_choice is already shown
else {
// on first OnActivate call show top sizer
// From the tab creation whole top sizer is hidden to correct update of preset combobox's size
// (see https://github.com/prusa3d/PrusaSlicer/issues/10746)
// On first OnActivate call show top sizer
m_top_hsizer->ShowItems(true);
// Size and layouts of all items are correct now,
// but ALL items of top sizer are visible.
// So, update visibility of each item according to the ui settings
update_btns_enabling();
m_btn_hide_incompatible_presets->Show(m_show_btn_incompatible_presets && m_type != Slic3r::Preset::TYPE_PRINTER);
if (TabFilament* tab = dynamic_cast<TabFilament*>(this))
tab->update_extruder_combobox();
Layout();
}
}

View File

@ -3,7 +3,7 @@
set(SLIC3R_APP_NAME "PrusaSlicer")
set(SLIC3R_APP_KEY "PrusaSlicer")
set(SLIC3R_VERSION "2.6.0-rc1")
set(SLIC3R_VERSION "2.6.0")
set(SLIC3R_BUILD_ID "PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN")
set(SLIC3R_RC_VERSION "2,6,0,0")
set(SLIC3R_RC_VERSION_DOTS "2.6.0.0")