Enrico Turri
8515b5e60d
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk
2019-09-06 12:22:45 +02:00
Enrico Turri
4486ae1c1b
Fix of #2868 -> Revert 2c9521c6d2 and partial revert of fab3634931
2019-09-06 09:44:39 +02:00
Lukas Matena
1bae0a6a97
Fill.cpp: Fixed a typo
2019-09-05 16:03:44 +02:00
YuSanka
89caaf3aab
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-05 15:31:38 +02:00
YuSanka
9d5e872865
DoubleSlider refactoring
2019-09-05 15:31:22 +02:00
bubnikv
18d63e34e5
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
849f72532b
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-05 09:55:08 +02:00
Enrico Turri
8c76b3888d
Improved time estimator post-processing
2019-09-05 09:54:44 +02:00
YuSanka
b83c783658
Fixed ColorPrint Legend update if Print preset was changed and model was resliced.
2019-09-05 09:13:59 +02:00
Enrico Turri
7fb0c894e1
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-05 08:14:34 +02:00
bubnikv
0e9e548701
Merge branch 'dev' of https://github.com/Prusa3d/PrusaSlicer into dev
2019-09-04 16:11:28 +02:00
bubnikv
bc412ea4aa
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
ad947cff19
Fixed some more warnings (mostly GLGizmoSlaSupports.cpp)
2019-09-04 16:05:32 +02:00
Lukas Matena
676f72359b
Merge branch 'master' into dev
2019-09-04 15:50:18 +02:00
Lukas Matena
e1783d6a00
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
5d3cf7a641
Fix typo
2019-09-04 15:15:10 +02:00
Lukas Matena
6f0b44da72
Fixed couple of warnings in WipeTower.cpp, ToolOrdering.cpp and GCode.cpp
2019-09-04 14:56:35 +02:00
bubnikv
a4e97e0867
Updated PrusaResearch.idx
2019-09-04 14:56:34 +02:00
YuSanka
a27fcf4f51
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
36a0f9415f
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-04 13:21:13 +02:00
YuSanka
4bf1a162ba
Added DoubleSlider::epsilon() to get a permissible error for layer height
2019-09-04 13:16:44 +02:00
bubnikv
4ae6bfeec0
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
b2bc12c758
Fixed layer Z rounding for ticks on DoubleSlider
2019-09-04 11:36:26 +02:00
Enrico Turri
f7f5a38764
Removed another bunch of compile warnings
2019-09-04 10:46:51 +02:00
Enrico Turri
f61fe06794
Removed a bunch of compile warnings
2019-09-04 09:47:00 +02:00
YuSanka
0b3da2ecc2
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-04 09:24:59 +02:00
YuSanka
9662417488
Fixed sidebar layouts for selected "Object" and "Layers" items in ObjectList
2019-09-04 09:24:44 +02:00
YuSanka
5f23ad1016
Fixed an adding of color change tick on last layer
2019-09-04 08:53:21 +02:00
bubnikv
5a2494a196
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2019-09-03 16:02:49 +02:00
YuSanka
871e965270
Try to fix asserts from wxBitmapCombobox
2019-09-03 15:30:37 +02:00
bubnikv
0bb3467c9d
Updated ES, FR, IT, PL languages.
2019-09-03 13:23:36 +02:00
YuSanka
0a9c1702b4
Fixed couple of warnings in Field.cpp, GUI_App.cpp and OptionsGroup.cpp
2019-09-03 10:59:04 +02:00
YuSanka
1158e11f79
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-03 10:29:29 +02:00
YuSanka
45f36ce1b7
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
ab9ff0dfd9
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
0ab836d748
Merge branch 'lm_gizmomanagerrefactoring' into dev
2019-09-03 08:29:31 +02:00
YuSanka
2592164648
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-02 16:49:41 +02:00
YuSanka
4c37b3814a
Fix of SPE-1015 (Colorchange doesn't work correct on last and first layers)
2019-09-02 16:49:17 +02:00
Lukas Matena
43f68a417a
Merge branch 'lm_layer_height_validation' into dev
2019-09-02 16:31:59 +02:00
Lukas Matena
550704d286
Merge branch 'lm_wiping_dialog_colors' into dev
2019-09-02 16:31:22 +02:00
Lukas Matena
a29b25d239
Fixed couple of warnings in GUI_ObjectList.cpp and GUI_ObjectSettings.cpp
2019-09-02 16:27:48 +02:00
Lukas Matena
3f67201fb9
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
5b37f4da9f
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-02 15:15:36 +02:00
Enrico Turri
895eec4f73
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
afc75be0e0
Fixed SPE-1014 (Support settings in context menu for modifier)
2019-09-02 14:44:00 +02:00
Lukas Matena
5a52e77414
Merge branch 'master' into lm_gizmomanagerrefactoring
2019-09-02 14:31:03 +02:00
Lukas Matena
d273fbcabe
Nearly finished refactoring of GLGizmoManager
2019-09-02 14:30:15 +02:00
Lukas Matena
d86b546410
SLA gizmo open/close should be saved on undo/redo stack
2019-09-02 14:30:15 +02:00
Lukas Matena
2a4e1fdde3
Started an attempt to refactor GLGizmoManager
2019-09-02 14:30:12 +02:00
YuSanka
116ccdfb77
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-02 14:02:47 +02:00