3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into lm_tm_hollowing

Browse source
This commit is contained in:
Lukas Matena 2020-01-06 12:41:29 +01:00
commit 0551411c48
82 changed files with 2066 additions and 462 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
resources/icons/printer_placeholder.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.9 KiB

0
resources/icons/printers/Creality_Ender3.png → resources/icons/printers/Creality_ENDER3.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 61 KiB

After

Width:  |  Height:  |  Size: 61 KiB

Before After
Before After

9
resources/icons/revert_all_.svg Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Svg Vector Icons : http://www.onlinewebfonts.com/icon -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
<metadata> Svg Vector Icons : http://www.onlinewebfonts.com/icon </metadata>
<g>
<path fill="#ED6B21" d="M59.7,265.7c0,0,89.2-138.9,230.3-213.4C431.1-22.2,605-0.7,719,71.5c114,72.3,152.4,133.2,152.4,133.2l98.2-56.5c0,0,20.3-10.2,20.3,13.5v354.5c0,0,0,31.6-23.7,20.3c-19.9-9.5-235.7-133.3-303.6-172.3c-37.3-16.8-4.5-30.4-4.5-30.4l94.8-54.7c0,0-54.1-68.3-133.2-104.5C535,130.3,455.7,125,358.6,162c-63.3,24.1-137.9,85.9-191.6,177.2L59.7,265.7L59.7,265.7z"/>
<path fill="#ED6B21" d="M940.3,734.3c0,0-89.2,138.9-230.3,213.4c-141.1,74.5-315,53.1-429-19.2c-114-72.3-152.4-133.2-152.4-133.2l-98.2,56.4c0,0-20.3,10.2-20.3-13.5V483.6c0,0,0-31.6,23.7-20.3c19.9,9.5,235.7,133.3,303.6,172.3c37.3,16.8,4.5,30.4,4.5,30.4l-94.8,54.7c0,0,54.1,68.3,133.2,104.5c84.7,44.5,164,49.8,261.1,12.8c63.3-24.1,137.9-85.9,191.6-177.2L940.3,734.3L940.3,734.3z"/></g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
resources/localization/es/PrusaSlicer.mo
View file

Binary file not shown.

2
resources/localization/es/PrusaSlicer_es.po
View file

@ -6865,7 +6865,7 @@ msgstr "Textura"
#: src/slic3r/GUI/ConfigManipulation.cpp:200
msgid "The %1% infill pattern is not supposed to work at 100%% density."
msgstr "Se supone que el patrón de relleno %1% no funciona a una densidad del 100%."
msgstr "Se supone que el patrón de relleno %1% no funciona a una densidad del 100%%."
#: src/slic3r/GUI/FirmwareDialog.cpp:530
#, possible-c-format

BIN
resources/localization/fr/PrusaSlicer.mo
View file

Binary file not shown.

2
resources/localization/fr/PrusaSlicer_fr.po
View file

@ -7013,7 +7013,7 @@ msgstr "Texture"
#: src/slic3r/GUI/ConfigManipulation.cpp:200
msgid "The %1% infill pattern is not supposed to work at 100%% density."
msgstr "Le modèle de remplissage %1% n'est pas censé fonctionner avec une densité de 100%."
msgstr "Le modèle de remplissage %1% n'est pas censé fonctionner avec une densité de 100%%."
#: src/slic3r/GUI/FirmwareDialog.cpp:530
#, c-format

BIN
resources/localization/it/PrusaSlicer.mo
View file

Binary file not shown.

2
resources/localization/it/PrusaSlicer_it.po
View file

@ -6865,7 +6865,7 @@ msgstr "Texture"
#: src/slic3r/GUI/ConfigManipulation.cpp:200
msgid "The %1% infill pattern is not supposed to work at 100%% density."
msgstr "La trama di riempimento %1% non è fatta per lavorare con densità al 100%."
msgstr "La trama di riempimento %1% non è fatta per lavorare con densità al 100%%."
#: src/slic3r/GUI/FirmwareDialog.cpp:530
#, possible-c-format

1
resources/localization/list.txt
View file

@ -50,6 +50,7 @@ src/slic3r/GUI/ExtruderSequenceDialog.cpp
src/slic3r/Utils/Duet.cpp
src/slic3r/Utils/OctoPrint.cpp
src/slic3r/Utils/FlashAir.cpp
src/slic3r/Utils/AstroBox.cpp
src/slic3r/Utils/PresetUpdater.cpp
src/slic3r/Utils/FixModelByWin10.cpp
src/libslic3r/SLA/SLAPad.cpp

BIN
resources/localization/uk/PrusaSlicer.mo
View file

Binary file not shown.

2
resources/localization/uk/PrusaSlicer_uk.po
View file

@ -3275,7 +3275,7 @@ msgstr "Шаблон наповнення "
#: src/slic3r/GUI/Tab.cpp:1309
#, no-c-format
msgid ""
" infill pattern is not supposed to work at 100% density.\n"
" infill pattern is not supposed to work at 100%% density.\n"
"\n"
"Shall I switch to rectilinear fill pattern?"
msgstr ""

BIN
resources/localization/zh_tw/PrusaSlicer.mo
View file

Binary file not shown.

2
resources/localization/zh_tw/PrusaSlicer_zh_TW.po
View file

@ -3292,7 +3292,7 @@ msgstr "這個 "
#: src/slic3r/GUI/Tab.cpp:1309
#, no-c-format
msgid ""
" infill pattern is not supposed to work at 100% density.\n"
" infill pattern is not supposed to work at 100%% density.\n"
"\n"
"Shall I switch to rectilinear fill pattern?"
msgstr ""

1
resources/profiles/PrusaResearch.idx
View file

@ -1,4 +1,5 @@
min_slic3r_version = 2.2.0-alpha0
1.1.1-alpha2 Bumped up config version, so our in house customer will get updated profiles.
1.1.0 Filament aliases, Creality profiles and other goodies for PrusaSlicer 2.2.0-alpha0
min_slic3r_version = 2.1.1-beta0
1.0.6 Added Prusa MINI profiles

2
resources/profiles/PrusaResearch.ini
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.1.0
config_version = 1.1.1-alpha2
# Where to get the updates from?
config_update_url = http://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/PrusaResearch/
changelog_url = http://files.prusa3d.com/?latest=slicer-profiles&lng=%1%