3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-09 14:55:08 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'remote/master' into SoftFever

Browse source 
# Conflicts:
#	src/libslic3r/Preset.cpp
This commit is contained in:
SoftFever 2022-09-09 21:54:57 +08:00
commit bb74438f7c
132 changed files with 5737 additions and 3598 deletions
Download patch file Download diff file Expand all files Collapse all files

3
resources/images/monitor_axis_home_icon.svg Normal file
View file

@ -0,0 +1,3 @@
<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M25.313 14.8577C25.8116 14.7499 25.9047 14.3886 25.5223 14.0519L15.1727 5.00017C14.7886 4.6651 14.161 4.66346 13.7769 4.99853L3.39301 14.0519C3.0089 14.387 3.10207 14.7482 3.60059 14.8561L4.84606 15.1242C5.34458 15.232 5.75156 15.7371 5.75156 16.247V24.6744C5.75156 25.1844 6.16836 25.6012 6.67831 25.6012H11.062C11.572 25.6012 11.9887 25.1844 11.9887 24.6744V20.6307C11.9887 20.1208 12.4055 19.704 12.9155 19.704H15.8723C16.3822 19.704 16.799 20.1208 16.799 20.6307V24.6744C16.799 25.1844 17.2158 25.6012 17.7258 25.6012H22.2369C22.7469 25.6012 23.1637 25.1844 23.1637 24.6744V16.247C23.1637 15.7371 23.5707 15.232 24.0692 15.1258L25.313 14.8577Z" fill="#00AE42" fill-opacity="0.2" stroke="#00AE42" stroke-width="0.718299" stroke-miterlimit="10" stroke-linecap="round"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 884 B

4
resources/images/monitor_bed_down_disable.svg Normal file
View file

@ -0,0 +1,4 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M14 1.80039C14 2.13176 13.7314 2.40039 13.4 2.40039H2.6C2.26863 2.40039 2 2.13176 2 1.80039C2 1.46902 2.26863 1.20039 2.6 1.20039H13.4C13.7314 1.20039 14 1.46902 14 1.80039Z" fill="#ACACAC"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.2422 11.0067L8.42386 14.825C8.18954 15.0594 7.80965 15.0594 7.57534 14.825L3.75696 11.0067C3.52265 10.7724 3.52265 10.3925 3.75696 10.1581C3.99128 9.92383 4.37117 9.92383 4.60549 10.1581L7.3996 12.9523V5.40078C7.3996 5.06941 7.66823 4.80078 7.9996 4.80078C8.33097 4.80078 8.5996 5.06941 8.5996 5.40078V12.9523L11.3937 10.1581C11.628 9.92383 12.0079 9.92383 12.2422 10.1581C12.4765 10.3925 12.4765 10.7724 12.2422 11.0067Z" fill="#ACACAC"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 797 B

4
resources/images/monitor_bed_up_disable.svg Normal file
View file

@ -0,0 +1,4 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M2 14.1996C2 13.8682 2.26863 13.5996 2.6 13.5996H13.4C13.7314 13.5996 14 13.8682 14 14.1996C14 14.531 13.7314 14.7996 13.4 14.7996H2.6C2.26863 14.7996 2 14.531 2 14.1996Z" fill="#ACACAC"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M3.75777 4.99333L7.57614 1.17495C7.81046 0.940639 8.19036 0.940639 8.42467 1.17495L12.243 4.99333C12.4774 5.22765 12.4774 5.60754 12.243 5.84186C12.0087 6.07617 11.6288 6.07617 11.3945 5.84186L8.60041 3.04775V10.5992C8.60041 10.9306 8.33178 11.1992 8.00041 11.1992C7.66904 11.1992 7.40041 10.9306 7.40041 10.5992V3.04775L4.6063 5.84186C4.37198 6.07617 3.99208 6.07617 3.75777 5.84186C3.52345 5.60754 3.52345 5.22765 3.75777 4.99333Z" fill="#ACACAC"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 801 B

3
resources/images/monitor_extrduer_down_disable.svg Normal file
View file

@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M13.1426 17.6231C12.7258 18.2138 11.8497 18.2138 11.4329 17.6231L4.54229 7.85815C4.05321 7.16507 4.54889 6.20863 5.39716 6.20863L19.1784 6.20864C20.0267 6.20864 20.5223 7.16507 20.0333 7.85815L13.1426 17.6231Z" fill="#ACACAC"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 340 B

3
resources/images/monitor_extruder_up_disable.svg Normal file
View file

@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M11.4329 5.21146C11.8497 4.62074 12.7258 4.62074 13.1426 5.21146L20.0333 14.9764C20.5223 15.6695 20.0267 16.6259 19.1784 16.6259H5.39715C4.54888 16.6259 4.05321 15.6695 4.54228 14.9764L11.4329 5.21146Z" fill="#ACACAC"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 332 B

6
resources/images/print_control_pause.svg
View file

@ -1,4 +1,4 @@
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="3.5" y="3.5" width="3" height="11" fill="#FF6F00"/>
<rect x="11.5" y="3.5" width="3" height="11" fill="#FF6F00"/>
<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M6.5 2.5H2.5V22.5H6.5V2.5Z" fill="#FF6F00"/>
<path d="M22.5 2.5H18.5V22.5H22.5V2.5Z" fill="#FF6F00"/>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 226 B

After

Width:  |  Height:  |  Size: 214 B

Before After
Before After

6
resources/images/print_control_pause_hover.svg
View file

@ -1,4 +1,4 @@
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="2.5" y="2.5" width="3.54545" height="13" fill="#FF6F00"/>
<rect x="11.9531" y="2.5" width="3.54545" height="13" fill="#FF6F00"/>
<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M5.9 1.5H1.5V23.5H5.9V1.5Z" fill="#FF6F00"/>
<path d="M23.5 1.5H19.1V23.5H23.5V1.5Z" fill="#FF6F00"/>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 241 B

After

Width:  |  Height:  |  Size: 214 B

Before After
Before After

4
resources/images/print_control_resume.svg
View file

@ -1,3 +1,3 @@
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M15.25 8.56699C15.5833 8.75944 15.5833 9.24056 15.25 9.43301L4.75 15.4952C4.41667 15.6876 4 15.4471 4 15.0622L4 2.93782C4 2.55292 4.41667 2.31236 4.75 2.50481L15.25 8.56699Z" fill="#00AE42"/>
<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M21.587 11.8402C22.1377 12.1335 22.1377 12.8666 21.587 13.1598L4.23913 22.3968C3.68841 22.69 3 22.3235 3 21.7371V3.26299C3 2.67651 3.68841 2.30997 4.23913 2.60321L21.587 11.8402Z" fill="#00AE42"/>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 304 B

After

Width:  |  Height:  |  Size: 309 B

Before After
Before After

11
resources/images/print_control_resume_hover.svg
View file

@ -1,10 +1,3 @@
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_7481_29762)">
<path d="M15.9687 8.56699C16.3021 8.75944 16.3021 9.24056 15.9687 9.43301L3.96875 16.3612C3.63542 16.5537 3.21875 16.3131 3.21875 15.9282L3.21875 2.07179C3.21875 1.68689 3.63542 1.44633 3.96875 1.63878L15.9687 8.56699Z" fill="#00AE42"/>
</g>
<defs>
<clipPath id="clip0_7481_29762">
<rect width="18" height="18" fill="white"/>
</clipPath>
</defs>
<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M22.5435 11.7742C23.1522 12.0968 23.1522 12.9032 22.5435 13.2258L3.36957 23.3865C2.76088 23.709 2 23.3059 2 22.6608V2.33929C2 1.69416 2.76088 1.29096 3.36957 1.61353L22.5435 11.7742Z" fill="#00AE42"/>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 488 B

After

Width:  |  Height:  |  Size: 313 B

Before After
Before After

4
resources/images/print_control_stop.svg
View file

@ -1,3 +1,3 @@
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="3.19531" y="3.19531" width="11.6099" height="11.6099" fill="#D01B1B"/>
<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M22.5 2.5H2.5V22.5H22.5V2.5Z" fill="#D01B1B"/>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 183 B

After

Width:  |  Height:  |  Size: 159 B

Before After
Before After

4
resources/images/print_control_stop_hover.svg
View file

@ -1,3 +1,3 @@
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="2.5" y="2.5" width="13" height="13" fill="#D01B1B"/>
<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M23.5 1.5H1.5V23.5H23.5V1.5Z" fill="#D01B1B"/>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 165 B

After

Width:  |  Height:  |  Size: 159 B

Before After
Before After