Enrico Turri
d6c3c766aa
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk
2019-09-06 12:22:45 +02:00
Enrico Turri
bda0246b5d
Fix of #2868 -> Revert 2c9521c6d2
and partial revert of fab3634931
2019-09-06 09:44:39 +02:00
Lukas Matena
6cc29c308c
Fill.cpp: Fixed a typo
2019-09-05 16:03:44 +02:00
YuSanka
c4d90ed47a
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-05 15:31:38 +02:00
YuSanka
4263fa8dff
DoubleSlider refactoring
2019-09-05 15:31:22 +02:00
bubnikv
07798510fc
Fighting the ASCII STL import.
...
Fix of 2.1.0-rc: Loading MMU STL's results in object placement off the plater (#2868 )
It has been broken with 9abef2241d
when trying to fix "Error on importing stl" #2813
2019-09-05 14:29:34 +02:00
Enrico Turri
bdbaecb7f8
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-05 09:55:08 +02:00
Enrico Turri
9b550fbd5b
Improved time estimator post-processing
2019-09-05 09:54:44 +02:00
YuSanka
1651c8db6e
Fixed ColorPrint Legend update if Print preset was changed and model was resliced.
2019-09-05 09:13:59 +02:00
Enrico Turri
3f5511faa3
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-05 08:14:34 +02:00
bubnikv
d2ac827137
Merge branch 'dev' of https://github.com/Prusa3d/PrusaSlicer into dev
2019-09-04 16:11:28 +02:00
bubnikv
d146a0237e
WIP: Reworked the infill generator to merge areas with the same
...
properties.
Note for Vojtech:
Review src/libslic3r/Fill/Fill.cpp once again,
add test for G-code generator properties (extrusion speed, cooling?)
Fixes Modifier slice/move efficiency #1005
2019-09-04 16:11:16 +02:00
Lukas Matena
09e4ac42ba
Fixed some more warnings (mostly GLGizmoSlaSupports.cpp)
2019-09-04 16:05:32 +02:00
Lukas Matena
570bec299f
Merge branch 'master' into dev
2019-09-04 15:50:18 +02:00
Lukas Matena
326eb5e343
GUI_ObjectList.cpp: Fixed a crash when deleting instances.
...
Deleting second-but-last instance deletes the whole Instances node, we must select object node in that case.
2019-09-04 15:15:35 +02:00
tamasmeszaros
642442c977
Fix typo
2019-09-04 15:15:10 +02:00
Lukas Matena
805a5d22a1
Fixed couple of warnings in WipeTower.cpp, ToolOrdering.cpp and GCode.cpp
2019-09-04 14:56:35 +02:00
bubnikv
a48ba21f40
Updated PrusaResearch.idx
2019-09-04 14:56:34 +02:00
YuSanka
8c43b04970
Fixed debug crash in update_changed_tree_ui
...
Reproduce: For MK2.5S printer preset set flag "Support stealth mode"
2019-09-04 14:37:09 +02:00
YuSanka
229eff72d6
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-04 13:21:13 +02:00
YuSanka
aab3001b24
Added DoubleSlider::epsilon() to get a permissible error for layer height
2019-09-04 13:16:44 +02:00
bubnikv
a09bb3802b
Updated the bundled Prusa Research profiles.
...
Bumped up the version number to 2.0.0-rc.
Changed the location of profiles from PrusaSlicer-beta to PrusaSlicer
(that is the location for the released software).
2019-09-04 12:50:43 +02:00
YuSanka
200ac4c35e
Fixed layer Z rounding for ticks on DoubleSlider
2019-09-04 11:36:26 +02:00
Enrico Turri
308f601a99
Removed another bunch of compile warnings
2019-09-04 10:46:51 +02:00
Enrico Turri
6bbc97f24d
Removed a bunch of compile warnings
2019-09-04 09:47:00 +02:00
YuSanka
7211562f25
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-04 09:24:59 +02:00
YuSanka
db2319cb5c
Fixed sidebar layouts for selected "Object" and "Layers" items in ObjectList
2019-09-04 09:24:44 +02:00
YuSanka
6b95c579af
Fixed an adding of color change tick on last layer
2019-09-04 08:53:21 +02:00
bubnikv
35f51ed9a9
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2019-09-03 16:02:49 +02:00
YuSanka
5ae23a242b
Try to fix asserts from wxBitmapCombobox
2019-09-03 15:30:37 +02:00
bubnikv
3f078cd612
Updated ES, FR, IT, PL languages.
2019-09-03 13:23:36 +02:00
YuSanka
6befe7099b
Fixed couple of warnings in Field.cpp, GUI_App.cpp and OptionsGroup.cpp
2019-09-03 10:59:04 +02:00
YuSanka
f73976ec8f
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-03 10:29:29 +02:00
YuSanka
c960c2cf27
Code clean in Tab.cpp and Fixed couple of Mac-warnings in :
...
GUI.cpp
GUI_App.cpp
GUI_ObjectList.cpp
MainFrame.hpp
Plater.cpp
PresetBundle.cpp
PresetHints.cpp
Tab.cpp
Tab.hpp
wxExtensions.cpp
wxExtensions.hpp
2019-09-03 10:29:17 +02:00
Lukas Matena
fd47891793
GLGizmoSlaSupports.cpp: Snapshot label now differs for turning the gizmo on/off
...
This behaviour was broken by recent merge
2019-09-03 10:16:06 +02:00
Lukas Matena
b89d9c7aff
Merge branch 'lm_gizmomanagerrefactoring' into dev
2019-09-03 08:29:31 +02:00
YuSanka
9e73674578
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-02 16:49:41 +02:00
YuSanka
ac4730bc7e
Fix of SPE-1015 (Colorchange doesn't work correct on last and first layers)
2019-09-02 16:49:17 +02:00
Lukas Matena
66d74bc591
Merge branch 'lm_layer_height_validation' into dev
2019-09-02 16:31:59 +02:00
Lukas Matena
7d54b04699
Merge branch 'lm_wiping_dialog_colors' into dev
2019-09-02 16:31:22 +02:00
Lukas Matena
9ac6909d30
Fixed couple of warnings in GUI_ObjectList.cpp and GUI_ObjectSettings.cpp
2019-09-02 16:27:48 +02:00
Lukas Matena
942f959e87
Fixed couple of warnings
...
Turned several includes into forward declarations
Removed several sprintf calls in favor of std::to_string
2019-09-02 16:27:48 +02:00
Enrico Turri
0dfeee6caf
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-02 15:15:36 +02:00
Enrico Turri
d0513fc2da
Fixed update of application's title bar when trying to import a non compatible .3mf or .amf project
2019-09-02 15:15:28 +02:00
YuSanka
fdb51912c2
Fixed SPE-1014 (Support settings in context menu for modifier)
2019-09-02 14:44:00 +02:00
Lukas Matena
19ab746a38
Merge branch 'master' into lm_gizmomanagerrefactoring
2019-09-02 14:31:03 +02:00
Lukas Matena
d8a274c5ab
Nearly finished refactoring of GLGizmoManager
2019-09-02 14:30:15 +02:00
Lukas Matena
409a7c7734
SLA gizmo open/close should be saved on undo/redo stack
2019-09-02 14:30:15 +02:00
Lukas Matena
b6d35c9840
Started an attempt to refactor GLGizmoManager
2019-09-02 14:30:12 +02:00
YuSanka
dba5dd36f7
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-02 14:02:47 +02:00