Enrico Turri
c40258d9b2
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-07-19 15:09:42 +02:00
Enrico Turri
1a6fdb668f
Fixed print info
2018-07-19 13:58:25 +02:00
Enrico Turri
feb0f76279
Better fix for gizmo update when deleting objects
2018-07-19 13:43:33 +02:00
Enrico Turri
63fe2a9fb9
Warning and legend textures moved from _3DScene class to GLCanvas3D class
2018-07-19 13:18:19 +02:00
Enrico Turri
5ff26bce50
Fixed update of gizmo when deleting all objects
2018-07-19 11:39:51 +02:00
Enrico Turri
678be2b317
Fixed update of rotate gizmo when selecting objects
2018-07-19 11:24:04 +02:00
Enrico Turri
7b551171e8
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-07-19 08:31:59 +02:00
Enrico Turri
7f267987cb
Code cleanup
2018-07-18 15:52:20 +02:00
Enrico Turri
be7b786fee
Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-07-18 15:11:23 +02:00
Enrico Turri
13ced87089
Fixed depth test when rendering the picking texture
2018-07-18 15:09:26 +02:00
bubnikv
b57418f81d
Reordered the fields on the new "Machine limits" page.
2018-07-18 15:08:55 +02:00
Enrico Turri
4579b71a66
Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-07-18 15:07:56 +02:00
Enrico Turri
3fac0d92cd
Unified opengl textures
2018-07-18 15:07:52 +02:00
bubnikv
a46bdb1d81
Reworked the "Sliced info" box on the platter to only show the
...
"silent mode" print time if it is available.
2018-07-18 14:52:19 +02:00
Enrico Turri
c1dc46bb8e
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-07-18 14:49:19 +02:00
Enrico Turri
b69e23ce73
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-07-18 14:49:09 +02:00
Enrico Turri
6f18e58d13
Fixed compile on Linux and Mac
2018-07-18 14:38:02 +02:00
Enrico Turri
d805c8ac3b
Disable slicing when one object crosses the print volume boundary
2018-07-18 14:26:42 +02:00
bubnikv
f7390c7ad6
The acceleration G-codes (M204 Sxxx) emited for Marlin are now
...
clamped by the maximum acceleration when extruding.
The machine envelope values are only set at the time estimator
from the Printer parameters for the Marlin firmware.
2018-07-18 14:00:42 +02:00
bubnikv
17df029c9d
Fixed a previous commit.
2018-07-18 12:04:56 +02:00
bubnikv
b6fe90cbdc
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-07-18 11:58:19 +02:00
bubnikv
9d027a558e
Implemented clamping of the acceleration when extruding for the Marlin
...
firmware, both for the G-code export and the time estimator.
2018-07-18 11:58:02 +02:00
Lukas Matena
51b6557ada
Merge branch 'master' into wipe_tower_improvements
2018-07-18 11:06:37 +02:00
Lukas Matena
eb6936888e
Filament following a soluble one must be wiped on the wipe tower
2018-07-18 11:05:39 +02:00
Enrico Turri
d672a69554
Slice only objects contained into the print volume
2018-07-18 09:37:25 +02:00
Enrico Turri
eb95e29be6
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-07-18 08:29:11 +02:00
bubnikv
3bebe9f954
Restored the "Fix STL through Netfabb" functionality, which has been
...
lost during some merge process.
2018-07-17 21:31:54 +02:00
bubnikv
c596c05765
With the Marlin flavor, a "machine envelope limits" G-code section
...
is emitted, which breaks some of the automatic tests.
Changed the default firmware flavor to RepRap,
so that the automatic tests will run.
2018-07-17 20:37:15 +02:00
bubnikv
36c1483ec5
Merge remote-tracking branch 'remotes/origin/feature_arrange_with_libnest2d'
2018-07-17 19:42:02 +02:00
bubnikv
0660862058
For the Marlin firmware, the machine envelope G-code is emitted
...
based on the Slic3r printer profile.
Also the bundled config has been updated, so that the machine envelope
G-code values were removed and the new Slic3r printer profile values
were updated with the former G-code values.
Slic3r version has been bumped up to 1.41.0-alpha for the configuration
files to work.
2018-07-17 19:37:24 +02:00
tamasmeszaros
f54fd553fe
Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d
2018-07-17 16:36:59 +02:00
tamasmeszaros
50424e33c6
Safety check for firstfit for larger objects than the print bed.
2018-07-17 16:35:48 +02:00
tamasmeszaros
86ba75d692
New objectfunction that makes a proper circle shaped pile on arrange.
2018-07-17 12:04:06 +02:00
Enrico Turri
08529189c9
Changed time estimator default values
2018-07-17 10:50:15 +02:00
Enrico Turri
c9827bb4cf
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-07-17 10:46:34 +02:00
Enrico Turri
5c90746914
Merge with master + resolved conflicts
2018-07-17 10:44:23 +02:00
bubnikv
c34a713c8c
Simplification of
...
1.40.1-rc2 fails to save the modified AMF settings #1035
2018-07-17 10:41:17 +02:00
Enrico Turri
ba8c8e5a1f
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-07-17 10:39:42 +02:00
bubnikv
161a2bc6f8
Merge remote-tracking branch 'remotes/origin/ys_preset_externals_bf'
2018-07-17 09:47:49 +02:00
bubnikv
3339623db6
Merge remote-tracking branch 'remotes/origin/ys_tooltips_osx'
2018-07-17 09:40:19 +02:00
bubnikv
83f9813f56
Merge remote-tracking branch 'remotes/origin/opengl_to_cpp'
2018-07-17 09:37:38 +02:00
bubnikv
c7f59aca7d
Merge remote-tracking branch 'remotes/origin/wipe_tower_improvements'
2018-07-17 09:20:19 +02:00
Enrico Turri
8175c9d306
Merge with master
2018-07-17 08:54:17 +02:00
Enrico Turri
f17d67871a
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-07-17 08:28:26 +02:00
bubnikv
210eeff160
Merge remote-tracking branch 'remotes/origin/amf_activate_existing_presets'
2018-07-16 19:52:17 +02:00
tamasmeszaros
266ff2ad93
Build fix for linux
2018-07-16 16:37:14 +02:00
tamasmeszaros
67d69830e8
Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d
2018-07-16 16:08:28 +02:00
tamasmeszaros
6bcd735655
Change to firstfit selection because DJD needs further testing.
2018-07-16 16:07:29 +02:00
Enrico Turri
a80ef7201b
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-07-13 14:45:51 +02:00
Enrico Turri
7c545bc2b5
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-07-13 14:45:42 +02:00