Merge branch 'master' into lm_tm_hollowing

CMakeLists.txt

@@ -72,6 +72,9 @@ if (MSVC)
     # error C3859: virtual memory range for PCH exceeded; please recompile with a command line option of '-Zm90' or greater
     # Generate symbols at every build target, even for the release.
     add_compile_options(-bigobj -Zm520 /Zi)
+    # Disable STL4007: Many result_type typedefs and all argument_type, first_argument_type, and second_argument_type typedefs are deprecated in C++17.
+    #FIXME Remove this line after eigen library adapts to the new C++17 adaptor rules.
+    add_compile_options(-D_SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING)
 endif ()
 
 if (MINGW)

deps/MPFR/MPFR.cmake

@@ -21,7 +21,7 @@ else ()
     ExternalProject_Add(dep_MPFR
         URL http://ftp.vim.org/ftp/gnu/mpfr/mpfr-3.1.6.tar.bz2 https://www.mpfr.org/mpfr-3.1.6/mpfr-3.1.6.tar.bz2  # mirrors are allowed
         BUILD_IN_SOURCE ON
-        CONFIGURE_COMMAND ./configure --prefix=${DESTDIR}/usr/local --with-gmp=${DESTDIR}/usr/local --with-pic
+        CONFIGURE_COMMAND ./configure --prefix=${DESTDIR}/usr/local --enable-shared=no --enable-static=yes --with-gmp=${DESTDIR}/usr/local --with-pic
         BUILD_COMMAND make -j
         INSTALL_COMMAND make install
         DEPENDS dep_GMP

resources/icons/error_tick.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="error_tick">
+	<path fill="#808080" d="M8,1.85l5.29,3.53V7v3.62L8,14.15l-5.29-3.53V7V5.38L8,1.85 M8,1L2,5v2v4l6,4l6-4V7V5L8,1L8,1z"/>	
+	
+    <path fill="none" stroke="#ED6B21" stroke-linecap="round" stroke-width="2" d="M8 4 L8 9" />
+		
+	<circle fill="#ED6B21" cx="8" cy="12" r="1"/>	
+</g>
+</svg>

resources/localization/PrusaSlicer.pot

@@ -3622,8 +3622,7 @@ msgstr ""
 
 #: src/slic3r/GUI/Plater.cpp:2315
 msgid ""
-"You can't load SLA project if there is at least one multi-part object on the "
-"bed"
+"You cannot load SLA project with a multi-part object on the bed"
 msgstr ""
 
 #: src/slic3r/GUI/Plater.cpp:2316 src/slic3r/GUI/Tab.cpp:2915

resources/localization/pt_br/PrusaSlicer_pt_br.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-09-09 16:39+0200\n"
-"PO-Revision-Date: 2019-11-18 16:39-0300\n"
+"PO-Revision-Date: 2019-12-21 19:55-0300\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1432,7 +1432,7 @@ msgid ""
 "You will lose content of the plater."
 msgstr ""
 "Alterar a linguagem fará com que o aplicativo reinicie.\n"
-"Você irá perder conteúdo no prato."
+"Você irá perder conteúdo na bandeja."
 
 #: src/slic3r/GUI/GUI_App.cpp:877
 msgid "Do you want to proceed?"
@@ -2302,7 +2302,7 @@ msgstr "(Re)fatiar"
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:116
 msgid "Select Plater Tab"
-msgstr "Selecione a guia de prato"
+msgstr "Selecione a guia de bandeja"
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:118
 msgid "Select Print Settings Tab"
@@ -2466,7 +2466,7 @@ msgstr "Desmarcar Gizmo/limpar seleção"
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:166
 msgid "Plater Shortcuts"
-msgstr "Atalhos do prato"
+msgstr "Atalhos da bandeja"
 
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:181
 #: src/slic3r/GUI/KBShortcutsDialog.cpp:193
@@ -2546,7 +2546,7 @@ msgstr "baseado no Slic3r"
 
 #: src/slic3r/GUI/MainFrame.cpp:189
 msgid "Plater"
-msgstr "Prato"
+msgstr "Bandeja"
 
 #: src/slic3r/GUI/MainFrame.cpp:400
 msgid "&New Project"
@@ -2635,7 +2635,7 @@ msgstr "Exportar &G-code"
 
 #: src/slic3r/GUI/MainFrame.cpp:469
 msgid "Export current plate as G-code"
-msgstr "Exporte o prato atual como o G-code"
+msgstr "Exporte a bandeja atual como o G-code"
 
 #: src/slic3r/GUI/MainFrame.cpp:473 src/slic3r/GUI/MainFrame.cpp:720
 msgid "S&end G-code"
@@ -2643,31 +2643,31 @@ msgstr "E&nviar G-code"
 
 #: src/slic3r/GUI/MainFrame.cpp:473
 msgid "Send to print current plate as G-code"
-msgstr "Enviar para imprimir prato atual como G-code"
+msgstr "Enviar para imprimir a bandeja atual como G-code"
 
 #: src/slic3r/GUI/MainFrame.cpp:478
 msgid "Export plate as &STL"
-msgstr "Exportar prato como &STL"
+msgstr "Exportar bandeja como &STL"
 
 #: src/slic3r/GUI/MainFrame.cpp:478
 msgid "Export current plate as STL"
-msgstr "Exporte o prato atual como STL"
+msgstr "Exporte a bandeja atual como STL"
 
 #: src/slic3r/GUI/MainFrame.cpp:481
 msgid "Export plate as STL &including supports"
-msgstr "Exportar prato como STL &incluindo suportes"
+msgstr "Exportar bandeja como STL &incluindo suportes"
 
 #: src/slic3r/GUI/MainFrame.cpp:481
 msgid "Export current plate as STL including supports"
-msgstr "Exporte o prato atual como o STL que inclui suportes"
+msgstr "Exporte a bandeja atual como o STL que inclui suportes"
 
 #: src/slic3r/GUI/MainFrame.cpp:484
 msgid "Export plate as &AMF"
-msgstr "Exportar prato como &AMF"
+msgstr "Exportar bandeja como &AMF"
 
 #: src/slic3r/GUI/MainFrame.cpp:484
 msgid "Export current plate as AMF"
-msgstr "Exporte o prato atual como o AMF"
+msgstr "Exporte a bandeja atual como o AMF"
 
 #: src/slic3r/GUI/MainFrame.cpp:488
 msgid "Export &toolpaths as OBJ"
@@ -2804,11 +2804,11 @@ msgstr "Colar área de transferência"
 
 #: src/slic3r/GUI/MainFrame.cpp:590
 msgid "&Plater Tab"
-msgstr "&Prato"
+msgstr "&Bandeja"
 
 #: src/slic3r/GUI/MainFrame.cpp:590
 msgid "Show the plater"
-msgstr "Mostrar o prato"
+msgstr "Mostrar a bandeja"
 
 #: src/slic3r/GUI/MainFrame.cpp:597
 msgid "P&rint Settings Tab"
@@ -6198,7 +6198,7 @@ msgstr "Distância entre cópias"
 
 #: src/libslic3r/PrintConfig.cpp:352
 msgid "Distance used for the auto-arrange feature of the plater."
-msgstr "Distância usada para o recurso de organizar automaticamente o prato."
+msgstr "Distância usada para o recurso de organizar automaticamente a bandeja."
 
 #: src/libslic3r/PrintConfig.cpp:359
 msgid "Elephant foot compensation"
@@ -6395,8 +6395,8 @@ msgid ""
 msgstr ""
 "Defina isso para o raio de folga em torno de sua extrusora. Se a extrusora "
 "não estiver centralizada, escolha o maior valor para a segurança. Essa "
-"config. é usada para verificar colisões e exibir a visualização gráfica no "
-"prato."
+"config. é usada para verificar colisões e exibir a visualização gráfica na "
+"bandeja."
 
 #: src/libslic3r/PrintConfig.cpp:505
 msgid "Extruder Color"

resources/profiles/Creality.ini

@@ -18,6 +18,9 @@ config_update_url = http://files.prusa3d.com/wp-content/uploads/repository/Prusa
 name = Creality Ender-3
 variants = 0.4
 technology = FFF
+bed_model = ender3_bed.stl
+bed_texture = ender3.svg
+default_materials = Creality PLA @ENDER3; Prusament PLA @ENDER3
 
 # All presets starting with asterisk, for example *common*, are intermediate and they will
 # not make it into the user interface.

resources/profiles/PrusaResearch.ini

@@ -22,72 +22,108 @@ name = Original Prusa MINI
 variants = 0.4; 0.25; 0.6
 technology = FFF
 family = MINI
+bed_model = mini_bed.stl
+bed_texture = mini.svg
+default_materials = Prusament PLA; Prusament PETG @MINI
 
 [printer_model:MK3S]
 name = Original Prusa i3 MK3S
 variants = 0.4; 0.25; 0.6
 technology = FFF
 family = MK3
+bed_model = mk3_bed.stl
+bed_texture = mk3.svg
+default_materials = Prusament PLA; Prusament PETG
 
 [printer_model:MK3]
 name = Original Prusa i3 MK3
 variants = 0.4; 0.25; 0.6
 technology = FFF
 family = MK3
+bed_model = mk3_bed.stl
+bed_texture = mk3.svg
+default_materials = Prusament PLA; Prusament PETG
 
 [printer_model:MK3SMMU2S]
 name = Original Prusa i3 MK3S MMU2S
 variants = 0.4; 0.25; 0.6
 technology = FFF
 family = MK3
+bed_model = mk3_bed.stl
+bed_texture = mk3.svg
+default_materials = Prusament PLA @MMU2; Prusament PETG @MMU2
 
 [printer_model:MK3MMU2]
 name = Original Prusa i3 MK3 MMU2
 variants = 0.4; 0.25; 0.6
 technology = FFF
 family = MK3
+bed_model = mk3_bed.stl
+bed_texture = mk3.svg
+default_materials = Prusament PLA @MMU2; Prusament PETG @MMU2
 
 [printer_model:MK2.5S]
 name = Original Prusa i3 MK2.5S
 variants = 0.4; 0.25; 0.6
 technology = FFF
 family = MK2.5
+bed_model = mk3_bed.stl
+bed_texture = mk3.svg
+default_materials = Prusament PLA; Prusament PETG
 
 [printer_model:MK2.5]
 name = Original Prusa i3 MK2.5
 variants = 0.4; 0.25; 0.6
 technology = FFF
 family = MK2.5
+bed_model = mk3_bed.stl
+bed_texture = mk3.svg
+default_materials = Prusament PLA; Prusament PETG
 
 [printer_model:MK2.5SMMU2S]
 name = Original Prusa i3 MK2.5S MMU2S
 variants = 0.4; 0.25; 0.6
 technology = FFF
 family = MK2.5
+bed_model = mk3_bed.stl
+bed_texture = mk3.svg
+default_materials = Prusament PLA @MMU2; Prusament PETG @MMU2
 
 [printer_model:MK2.5MMU2]
 name = Original Prusa i3 MK2.5 MMU2
 variants = 0.4; 0.25; 0.6
 technology = FFF
 family = MK2.5
+bed_model = mk3_bed.stl
+bed_texture = mk3.svg
+default_materials = Prusament PLA @MMU2; Prusament PETG @MMU2
 
 [printer_model:MK2S]
 name = Original Prusa i3 MK2S
 variants = 0.4; 0.25; 0.6
 technology = FFF
 family = MK2
+bed_model = mk2_bed.stl
+bed_texture = mk2.svg
+default_materials = Prusament PLA; Prusament PETG
 
 [printer_model:MK2SMM]
 name = Original Prusa i3 MK2S MMU1
 variants = 0.4; 0.6
 technology = FFF
 family = MK2
+bed_model = mk2_bed.stl
+bed_texture = mk2.svg
+default_materials = Prusament PLA; Prusament PETG @MMU1
 
 [printer_model:SL1]
 name = Original Prusa SL1
 variants = default
 technology = SLA
 family = SL1
+bed_model = sl1_bed.stl
+bed_texture = sl1.svg
+default_materials = Prusa Transparent Tough @0.05
 
 # All presets starting with asterisk, for example *common*, are intermediate and they will
 # not make it into the user interface.