3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
14788 commits 1 branch 1 tag 249 MiB
Commit graph

5006 commits

Author SHA1 Message Date
enricoturri1966
bcb2a4884b NotificationManager -> Separate notification update from its render to reduce the amount of scene refresh 2020-12-03 15:12:32 +01:00
Vojtech Bubnik
6fd1143b1c Fix of Unexpected Behavior @ Application Open and When GCODE is Generated #5254 
Icon not loaded from the exe on Windows.
 2020-12-03 14:14:40 +01:00
tamasmeszaros
624494eab6 Merge branch 'tm_arrange_bugfixes' 2020-12-03 14:09:55 +01:00
enricoturri1966
639ef33aab Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-12-03 13:49:20 +01:00
enricoturri1966
2a0a9af0c9 #5360 - GCode Viewer -> Added menu command to reload gcode file 2020-12-03 13:48:54 +01:00
YuSanka
6124f677ae Suppressed a check of printer_presets for the containing information about "Print Host upload", when presets ate exported from the amf/3mf 2020-12-03 13:25:23 +01:00
Vojtech Bubnik
3dd9b8c718 Further improvement error reporting with buggy custom G-code sections #1516 
1) The macro-processor sanitizes the source code line for invalid UTF-8
   characters. Ideally these invalid characters would be replaced with ?,
   they are just dropped as of now. Better than showing an empty string
   when converting to wxString though.
2) G-code export collects full error message for 1st occurence of an error
   for each custom G-code block.
3) The composite error message now displays the errors collected in 2).
4) The error window is now scaled bigger and the Slicer logo is smaller
   if the text is to be rendered with monospaced font, as the monospaced
   text will not be word wrapped.
 2020-12-03 12:50:24 +01:00
tamasmeszaros
844ea89432 Fix out of bed items after arrange. 
Disabled outline decimation for arrange and added very small (EPSILON) safety offset to bed detection boundaries.
 2020-12-03 12:00:12 +01:00
YuSanka
b251fea5fe Typo fix for b9c53adddb 2020-12-03 11:31:15 +01:00
Vojtech Bubnik
306acbdfb4 Improvement of Improve error reporting with buggy custom G-code sections #1516 
Errors in the file output templates are reported in mono-spaced font,
so that the arrow character ^ is displayed at the right column
pointing to the offending spot.
 2020-12-03 11:03:16 +01:00
YuSanka
7afef2bbb5 OSX specific: Hot fix for the c503a4e424 2020-12-03 10:40:17 +01:00
YuSanka
c503a4e424 Increased width for Infill ComboBox and EditCtrls from Manipulation panel on right panel 
+ Added updated POT-file
 2020-12-03 10:35:21 +01:00
Vojtech Bubnik
597a158a6e Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2020-12-03 07:30:26 +01:00
Vojtech Bubnik
4412ba0f92 Fixes Spelling Error in Unsaved changes dialog (#5363) 2020-12-03 07:30:06 +01:00
tamasmeszaros
4e9254ec5a Follow up fix for bed filling 
fixes: 2813db8906
 2020-12-02 18:08:30 +01:00
tamasmeszaros
2813db8906 Fix for bed filling with some existing items out of bed. 2020-12-02 17:52:40 +01:00
tamasmeszaros
4e90df1ea5 Fix status indication glitch for bed filling 2020-12-02 17:50:12 +01:00
tamasmeszaros
4f7f08d0de Further improvement on arrange settings handling 2020-12-02 14:04:39 +01:00
david kocik
ae926bd1ed error_code in boost::filesystem::space to ensure the drive exists. Fix of #5354 2020-12-02 12:12:24 +01:00
YuSanka
b9c53adddb Linux specific, dark mode: Fixed a black text on a black background for the view mode buttons. 2020-12-02 11:58:08 +01:00
Vojtech Bubnik
89ff8eef10 Preview class refactoring: Moved initialization of member variables 
to header.
 2020-12-02 11:38:10 +01:00
tamasmeszaros
8df4d6a170 Add separate arrangement distance control for SLA mode 2020-12-02 10:28:13 +01:00
YuSanka
9d34d350a5 Localization: Update POT 
+ Fixed translation for the "Extruder n" category on the Printer Settings Tab
 + Fixed a crash, when scrolling inside Search imGui with some localization (e.t. Russion)
 2020-12-01 16:44:53 +01:00
Lukáš Hejl
f25e5c0ec6 Merge remote-tracking branch 'origin/master' into lh_avoid_crossing_perimeters 2020-12-01 14:31:22 +01:00
tamasmeszaros
8027f6608a Fix arrange distance with enabled sequential printing 
fixes #5258
 2020-12-01 14:08:07 +01:00
David Kocik
d47e6bfd5c Stop showing Exporting finished notification after exporting error. 2020-12-01 13:04:19 +01:00
David Kocik
994b69f19b cleanup 2020-12-01 12:06:10 +01:00
David Kocik
247f3a7dbe Set boost to use utf8 for system messages (in cmake). Fix of #5180. 2020-12-01 12:06:10 +01:00
enricoturri1966
42a00a32df Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_animations 2020-12-01 10:43:32 +01:00
enricoturri1966
24a8f832bc Fixed activation of shortcut dialog with '?' key 2020-12-01 10:43:04 +01:00
enricoturri1966
e842077cc6 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_animations 2020-12-01 10:18:00 +01:00
enricoturri1966
430648471a Follow-up of 6ae1a10614 - Fixed typo 2020-12-01 10:17:35 +01:00
enricoturri1966
67d42c7053 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_animations 2020-12-01 08:45:50 +01:00
enricoturri1966
dc736f7855 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-12-01 08:33:20 +01:00
enricoturri1966
6ae1a10614 #5333 - Reworked navigation of preview's sliders using the keyboard 2020-12-01 08:33:06 +01:00
tamasmeszaros
f04db7b595 Fix Arrange dialog distance input field usability 2020-11-30 15:57:53 +01:00
YuSanka
7e33047804 UnsavedChangesDialog: Linux specific: Made a first column wider 
+ Field: Made def_width() wider
 2020-11-30 13:48:22 +01:00
enricoturri1966
8cc46a450b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_animations 2020-11-30 13:46:03 +01:00
enricoturri1966
0d4123192f Removed GLCanvas3D from parameters of NotificationManager methods 2020-11-30 13:45:17 +01:00
Pascal de Bruijn
3a3e9271b1 Field.cpp: wider def_width_wider 
This fixes truncated ComboBox present on some systems
 2020-11-30 04:25:13 -08:00
Vojtech Bubnik
2e73a75951 Linux specific fix for switching languages: PrusaSlicer 2.3 forces 
en_GB locale when switching to English from the user interface,
while often Linux users have just en_US locales configured.

With this commit the user will have to select English (U.S.) or
English (U.K.). Usually English (U.S.) will work.

Vojtech is scared to touch the code for the other platforms (Windows and Mac)
as the language switching has been reworked multiple times and it is quite
fragile.
 2020-11-30 11:57:16 +01:00
tamasmeszaros
982e6eb55b Don't apply result if fill bed was canceled. 2020-11-30 09:38:22 +01:00
Vojtěch Bubník
031eca533e
Merge pull request #5159 from mloidl/repetier_fix 
Possible segmentation fault in physical printer dialog when Host is set to "Repetier"
 2020-11-30 09:36:57 +01:00
Lukáš Hejl
87879034f6 Merge remote-tracking branch 'origin/master' into lh_avoid_crossing_perimeters 
# Conflicts:
#	src/libslic3r/MotionPlanner.cpp
#	src/libslic3r/libslic3r.h
 2020-11-29 17:27:23 +01:00
Lukas Matena
3f999acef8 Added a missing include (gcc 8.4) 2020-11-28 20:51:57 +01:00
Vojtech Bubnik
30d7ef2cf9 Bumped up version number to beta1. 
Changed the location of PrusaSlicer profiles from PrusaSlicer-alpha
to PrusaSlicer-beta.
 2020-11-28 11:14:53 +01:00
Vojtech Bubnik
3dd6d7e878 Escaping of ampersands in label texts (otherwise the ampersand is 
processed as a hotkey prefix and not displayed at all).
Solves visualization of the new profile names containing ampersands
(Original Prusa Mini & Mini+)
Also the text was not correcly converted from UTF8.
 2020-11-28 11:13:46 +01:00
David Kocik
6beb493255 Logging level at LoadFromOtherInstanceEvent 2020-11-28 10:56:42 +01:00
YuSanka
7ab1fcaa5c Fixed update after editing for "infill_ancor" and "infill_ancor_max" parameters. 
* Update value only if it is changed
* Show info dialog (suggestion to change mm to %) only when parameter value is bigger than 100
 2020-11-28 01:18:58 +01:00
YuSanka
b71c001845 Fixed suppress scrolling for preset comboboxes and some comboboxes on right panel on all platforms 2020-11-27 14:58:51 -08:00
David Kocik
a650801b80 call correct load_files at MacOpenFiles 2020-11-27 12:54:37 +01:00
enricoturri1966
184e4f77cd Bring PrusaSlicer to top when drag and dropping a project file on its executable 2020-11-27 09:35:32 +01:00
tamasmeszaros
dfbf4cbab2 Fix bed filling with more existing instances than needed 2020-11-26 15:11:54 +01:00
YuSanka
7f22ce63f6 Refactoring: 
1. Use C++ style cast instead of C style
2. Deleted unused code from Search
 2020-11-26 14:34:54 +01:00
enricoturri1966
d9be78d4cb Fixed bug introduced with 4d483f323f 2020-11-26 13:37:08 +01:00
enricoturri1966
10fb75edf0 Enabled tech ENABLE_CTRL_M_ON_WINDOWS -> Added customizable support for legacy CTRL+M settings dialog on Windows in preference dialog 2020-11-26 11:00:24 +01:00
enricoturri1966
e2b4de455b Customizable association of .3mf, .stl and .gcode files on Windows 2020-11-26 10:09:34 +01:00
enricoturri1966
7da1622e76 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-11-26 08:43:22 +01:00
enricoturri1966
4d483f323f GCode Viewer -> Show extimated layer time on the vertical slider for gcode produced by PrusaSlicer 2.3.0, Cura, Simplify3D, CraftWare, ideaMaker 2020-11-26 08:43:04 +01:00
YuSanka
9bb0848d27 PhysicalPrinterDialog: Fixed editing of the SLA physical printers 
Bug repro:
1. Create sla physical printer.
2. Close dialog.
3. Open dialog to edit printer -> in preset combobox is selected fff printer preset
 2020-11-25 22:48:12 +01:00
YuSanka
32c60b070e Hot fix for 9305535039 2020-11-25 21:18:51 +01:00
YuSanka
275bc52fdf Suppress scroll for SLA support and pad settings on the right panel 2020-11-25 20:13:26 +01:00
YuSanka
9305535039 OSX and Linux specific: Fixed preset selection 2020-11-25 20:13:26 +01:00
enricoturri1966
f0aa4de20a Fixed conflicts after merge with master 2020-11-25 12:42:26 +01:00
enricoturri1966
abf5a58336 Preference dialog centered on the application 2020-11-25 12:40:05 +01:00
David Kocik
3d78ae9271 Instance check on windows: concider whole window name when searching for another instance 2020-11-25 12:28:10 +01:00
YuSanka
77f845b0be Added a possibility to suppress scrolling for some ComboBoxes 2020-11-24 18:44:13 +01:00
tamasmeszaros
0bfbe18a3c Merge branch 'tm_arrange_perf_improve' 2020-11-24 16:20:17 +01:00
Vojtech Bubnik
62bdc192d8 Fix of [2.3.0-alpha4] Crash - several models cause crash when slicing #5208 
Fixed some issues in internal anchors of the Adaptive Cubic infill.
The ugly and dangerous implicit casting operators in Line, MultiPoint,
Polyline and Polygon were made explicit.
 2020-11-24 16:01:08 +01:00
tamasmeszaros
d34beab557 Add "slow" hint to rotations for arrangement 2020-11-24 15:36:39 +01:00
YuSanka
10c41290fd DoubleSlider: Fixed ruler for the short objects 2020-11-24 15:14:04 +01:00
YuSanka
250bd689f2 Fix for #5231. Suppress scrolling for the PresetComboBoxes when they aren't dropped. 2020-11-24 15:14:04 +01:00
tamasmeszaros
30693e29e4 Stop bed filling if enough instances are generated 2020-11-24 14:41:36 +01:00
enricoturri1966
9d71597e05 Fixed conflicts after merge with master 2020-11-24 13:37:52 +01:00
enricoturri1966
44fe3b8a00 Tech ENABLE_DRAG_AND_DROP_FIX -> Apply dialog implemented with 808c43cb4b also to drag and drop of project files into application executable 2020-11-24 13:35:43 +01:00
enricoturri1966
1ce8cddbda Do not show anything in vertical slider if estimated times are missing 2020-11-24 12:00:46 +01:00
enricoturri1966
b2ab5db69b ENABLE_GCODE_VIEWER set as default in: 
DoubleSlider hpp/cpp
 2020-11-24 11:53:52 +01:00
enricoturri1966
709404ce3e Fixed crash in texture compression 2020-11-24 11:09:05 +01:00
YuSanka
b2951cb43e Added "Remember my choice" checkbox to the message dialog after first clicking on parameter label in Settings tabs 2020-11-24 10:04:00 +01:00
enricoturri1966
4736408a46 Fixed localization on preview's legend button 2020-11-24 09:23:33 +01:00
tamasmeszaros
0fc1929076 Merge branch 'tm_arrange_wipe_tower_fix' 2020-11-23 17:52:20 +01:00
enricoturri1966
92953acc57 #5236 - Fixed color not correctly shown after slice 
The bug was introduced with 148f4fe766 which is now replaced by this commit
 2020-11-23 17:15:22 +01:00
David Kocik
95d65f9f30 Documentation for NotificationManager 2020-11-23 16:42:03 +01:00
tamasmeszaros
f1acde8024 Fix broken wipe tower arrangement 
fixes #5207
fixes #5216
 2020-11-23 16:05:24 +01:00
enricoturri1966
1d0b947fa8 ENABLE_GCODE_VIEWER set as default in: 
GCodeViewer hpp/cpp
 2020-11-23 14:30:31 +01:00
enricoturri1966
6b732e5a26 Merge remote-tracking branch 'origin/et_wipe_moves' 2020-11-23 13:48:03 +01:00
enricoturri1966
26befd5fa3 #5234 - Disabled pop-up menu on the wipe tower 2020-11-23 13:45:12 +01:00
enricoturri1966
f68cf49f3d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_wipe_moves 2020-11-23 10:11:04 +01:00
YuSanka
2e0e63fed8 Tooltips for the parameters labels on Settings tabs are back 2020-11-21 18:16:34 +01:00
Vojtech Bubnik
641d27eef4 Fixed missing include 2020-11-21 16:05:58 +01:00
Vojtech Bubnik
25ca1fcf77 Some minor refactoring / polishing. 2020-11-21 13:16:03 +01:00
Vojtech Bubnik
288dbfd0d8 fixed typo in comment & formatting 2020-11-21 11:43:54 +01:00
enricoturri1966
ce7b843de7 GCode Viewer - Fixed filament label in legend 2020-11-21 11:30:14 +01:00
Vojtech Bubnik
ddc9e26f19 Follow-up to 80e8b5e985 
Removed the legacy PreviewData.cpp,hpp
 2020-11-21 11:02:20 +01:00
enricoturri1966
0e6acbc0e2 Preview - Visualization of wipe mones 2020-11-21 10:36:10 +01:00
YuSanka
b7abe7dfa9 Added "Suppress to open hyperlink in browser" parameter in Preferences 2020-11-20 18:46:34 +01:00
tamasmeszaros
93aaf660cf Fixes for arrange menu 
Fixed issues:
- Imgui window is aligned with the arrange toolbar button
- Reset and Arrange buttons added onto the window
- Window closes after clicking the canvas or hitting ESC
- Tooltip extended with instructions for using the arrange menu

Remaining issues:
- Imgui arrange button closes the menu after clicked
- Menu is not in "exclusive or" relationship with other imgui windows.
 2020-11-20 17:52:53 +01:00
YuSanka
9f30ea535a Windows specific: Fixed layout of fields inside the OG_CustomCtrl 2020-11-20 17:27:44 +01:00
YuSanka
bca000a739 Font of the DoubleSliders is changes to default (#5121) 2020-11-20 17:27:44 +01:00
YuSanka
5330b34d0a Added "Filament -> Spool weight" parameter 2020-11-20 14:31:11 +01:00
Vojtech Bubnik
d5e6b17d70 Merge branch 'master' of https://github.com/Prusa3D/PrusaSlicer 2020-11-20 13:40:40 +01:00
tamasmeszaros
20995c7b7a Merge branch 'tm_fill_with_instances' 2020-11-20 13:05:05 +01:00
Enrico Turri
cf42e9fc6e Fixed typo 2020-11-20 12:01:59 +01:00
tamasmeszaros
adf81af6de Prototype feature: fill plater with instances of selected object 
#fixes #1350
 2020-11-20 09:58:52 +01:00
tamasmeszaros
bc3696bd42 Save and load arrange settings to app_config 2020-11-20 09:57:52 +01:00
tamasmeszaros
d5bdaceff2 Right mouse reaction to arrange button 
Working arrange settings popup
 2020-11-20 09:57:52 +01:00
David Kocik
a0239a7509 close export finished notification after eject atempt 2020-11-20 09:43:16 +01:00
YuSanka
5144feb319 Estimated printing time per layer for SLAPrint 
Split the time if it's needed
 2020-11-19 21:41:51 +01:00
David Kocik
5f97b2512b Merge remote-tracking branch 'aegean-odyssey/ao_profile_resources_patch' into master 2020-11-19 19:02:32 +01:00
David Kocik
c6e9b48db5 eject debug log 2020-11-19 15:57:38 +01:00
enricoturri1966
a1905d9b9e ENABLE_GCODE_VIEWER set as default in: 
MainFrame hpp/cpp

Plater hpp/cpp
 2020-11-19 14:59:46 +01:00
enricoturri1966
ef9cea76c2 ENABLE_GCODE_VIEWER set as default in: 
GLCanvas3D hpp/cpp

GUI_Preview hpp/cpp
 2020-11-19 12:29:19 +01:00
YuSanka
4cc3e939da Localization: Update for the CZ, DE, ES, FR, IT and PL languages 2020-11-18 17:25:05 +01:00
YuSanka
03b336145f Updated UI for the "infill_anchor" parameter 2020-11-18 17:00:08 +01:00
enricoturri1966
df19697d8e Fixed Shift+A to arrange selection 2020-11-18 15:14:49 +01:00
enricoturri1966
72f9cc07e8 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-11-18 14:10:39 +01:00
enricoturri1966
d0c87eb7ca Added missing include 2020-11-18 14:10:02 +01:00
YuSanka
feffb66085 Ruler for DoubleSlider: Added estimated print time 2020-11-18 05:02:51 -08:00
YuSanka
cb844a4034 DoubleSlider's ruler is implemented in respect to the use with sequential printing of objects 2020-11-18 05:02:51 -08:00
YuSanka
6e748f2e4a Implemented ruler for the vertical DoubleSlider 2020-11-18 05:02:51 -08:00
enricoturri1966
badb85650e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-11-18 13:42:54 +01:00
enricoturri1966
24b425cf57 Follow-up of 808c43cb4b -> Fixed drag and drop of non-project files 2020-11-18 13:42:17 +01:00
enricoturri1966
0ed3262645 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-11-18 13:05:04 +01:00
enricoturri1966
87e1875822 ENABLE_GCODE_VIEWER set as default in: 
SysInfoDialog.cpp

Selection hpp/cpp

Preferences.cpp

GUI_Utils.hpp

KBShortcutsDialog.cpp
 2020-11-18 13:04:34 +01:00
YuSanka
5be9d42519 Localization, new POT 2020-11-18 12:30:00 +01:00
YuSanka
a9f6e6da9d Changed layout of the "Machine limits" settings tab 2020-11-18 12:08:09 +01:00
enricoturri1966
faff112ea8 ENABLE_GCODE_VIEWER set as default in: 
3DScene hpp/cpp

AboutDialog.cpp

BackgroundSlicingProcess hpp/cpp

BitmapCache.cpp

ConfigWizard_private.hpp

GUI_App hpp/cpp

GUI_Init.cpp
 2020-11-18 10:44:03 +01:00
David Kocik
16dd7c74f1 boost canonical fix at instance check. Hopefully a fix of #4973 2020-11-17 15:03:34 +01:00
David Kocik
1e12b99338 fix of segfault on startup at SplashScreen::SetText 2020-11-17 14:43:52 +01:00
enricoturri1966
a20ce2f484 ENABLE_GCODE_VIEWER set as default in 3DBed.hpp/.cpp 2020-11-16 17:29:21 +01:00
enricoturri1966
afddcf71db Preview - Paint in grey toolpaths belonging to layers containing pause prints or custom gcodes 2020-11-16 15:01:13 +01:00
Lukáš Hejl
20916e2362 Disable filed with max detour length when avoid crossing perimeters is disabled 2020-11-16 14:22:32 +01:00
Lukáš Hejl
c828a5d6e9 Added the possibility to set the maximum length of the detour 2020-11-16 14:22:32 +01:00
Vojtech Bubnik
e77fc43159 Merge remote-tracking branch 'remotes/origin/master' into lh_adaptive_infill_hooks 2020-11-16 10:54:19 +01:00
Vojtech Bubnik
4280fdb5f2 Reworked connection of infill lines to perimeter lines. 
Added a new "infill_anchor" parameter.
 2020-11-16 10:54:00 +01:00
enricoturri1966
e04c6a4d17 Fixed screen-size for point markers used to visualize retraction/unretractions and other options in preview 2020-11-16 10:29:54 +01:00
enricoturri1966
9b3ff9b1cf Zoom max limit increased from 100 to 250 2020-11-16 08:48:44 +01:00
enricoturri1966
808c43cb4b Added dialog to choose import action when dragging and dropping a project file 2020-11-16 08:39:25 +01:00
Martin Loidl
c5391d3354 fixed possible segmentation in physical printer dialog 
* When pressing "Refresh Printers" in Physical Printer Dialog slicer
  crashed because of a wrong cast
 2020-11-14 21:46:54 +01:00
enricoturri1966
0688a76c73 Code cleanup 2020-11-13 11:50:52 +01:00
enricoturri1966
e78e3ad80b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_sequential 2020-11-13 10:46:41 +01:00
YuSanka
172c1bbab7 Fix the typo in 932dfb4fca 
The resize of the Spincontrol was wrong placed in the code
 2020-11-12 21:43:21 +01:00
YuSanka
d962d431c0 Localization: 
* added missed phrases
* fixed some phrases
* updated POT-file and PO/MO-files for the CZ-translation
 2020-11-12 21:35:39 +01:00
enricoturri1966
9e4cb893f7 Sequential print visualization using vertical slider in preview -> Added travel moves 2020-11-12 16:29:44 +01:00
YuSanka
932dfb4fca GTK3 specific : Fix of #5053 2020-11-12 15:33:24 +01:00
YuSanka
353536ab86 Physical printers dialog: Update Test button in respect to the inputted printhost 2020-11-12 15:24:47 +01:00
YuSanka
4eded76136 Custom controls : The width for full_width fields is updated according to the custom control width 
(thanks to the @supermerill for the mention on it, 6acf6bdf21)

+ Deleted redundant background color, as mentioned in the #5062
 2020-11-12 10:13:16 +01:00
enricoturri1966
80e8b5e985 Removed the legacy PreviewData.cpp,hpp 2020-11-11 16:38:51 +01:00
enricoturri1966
4ad42d6171 WIP - Sequential print visualization using vertical slider in preview (missing travel moves) 2020-11-11 16:22:09 +01:00
David Kocik
0a4ce079e8 escape_ampersand function and changed order of printer names and pictures in config wizard 2020-11-11 16:08:27 +01:00