2d033dead8
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-07-19 08:31:59 +02:00
a22e780791
Code cleanup
2018-07-18 15:52:20 +02:00
feb7c5ca5a
Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-07-18 15:11:23 +02:00
ed65f88852
Fixed depth test when rendering the picking texture
2018-07-18 15:09:26 +02:00
325ed1ef8e
Reordered the fields on the new "Machine limits" page.
2018-07-18 15:08:55 +02:00
7f0945ad20
Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-07-18 15:07:56 +02:00
a340778454
Unified opengl textures
2018-07-18 15:07:52 +02:00
53ee26cfec
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
fd9c169627
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-07-18 14:49:19 +02:00
b56d250d04
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-07-18 14:49:09 +02:00
a3db5b5ffe
Fixed compile on Linux and Mac
2018-07-18 14:38:02 +02:00
4dd9712c17
Disable slicing when one object crosses the print volume boundary
2018-07-18 14:26:42 +02:00
18456c7e41
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
f75d2ff3a5
Fixed a previous commit.
2018-07-18 12:04:56 +02:00
d13c7811c2
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-07-18 11:58:19 +02:00
edcee40092
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
4d08f82eba
Merge branch 'master' into wipe_tower_improvements
2018-07-18 11:06:37 +02:00
077c4ed6a9
Filament following a soluble one must be wiped on the wipe tower
2018-07-18 11:05:39 +02:00
115f4d7152
Slice only objects contained into the print volume
2018-07-18 09:37:25 +02:00
b33326ffd0
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-07-18 08:29:11 +02:00
761c3fb731
Restored the "Fix STL through Netfabb" functionality, which has been
...
lost during some merge process.
2018-07-17 21:31:54 +02:00
64a3fe9e60
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
b0006402fe
Merge remote-tracking branch 'remotes/origin/feature_arrange_with_libnest2d'
2018-07-17 19:42:02 +02:00
5d758b7f73
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
02239a4a8b
Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d
2018-07-17 16:36:59 +02:00
158dee3fb2
Safety check for firstfit for larger objects than the print bed.
2018-07-17 16:35:48 +02:00
2c6a77b6ec
New objectfunction that makes a proper circle shaped pile on arrange.
2018-07-17 12:04:06 +02:00
ccb1a1a147
Changed time estimator default values
2018-07-17 10:50:15 +02:00
6aad3ef991
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-07-17 10:46:34 +02:00
69c5c18c07
Merge with master + resolved conflicts
2018-07-17 10:44:23 +02:00
93343b19e9
Simplification of
...
1.40.1-rc2 fails to save the modified AMF settings #1035
2018-07-17 10:41:17 +02:00
14f0c0a68a
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-07-17 10:39:42 +02:00
f514d3a665
Merge remote-tracking branch 'remotes/origin/ys_preset_externals_bf'
2018-07-17 09:47:49 +02:00
788a5c5068
Merge remote-tracking branch 'remotes/origin/ys_tooltips_osx'
2018-07-17 09:40:19 +02:00
1830f4059a
Merge remote-tracking branch 'remotes/origin/opengl_to_cpp'
2018-07-17 09:37:38 +02:00
682ebeb39b
Merge remote-tracking branch 'remotes/origin/wipe_tower_improvements'
2018-07-17 09:20:19 +02:00
639e0fea51
Merge with master
2018-07-17 08:54:17 +02:00
6981883075
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-07-17 08:28:26 +02:00
7a26ba2dc1
Merge remote-tracking branch 'remotes/origin/amf_activate_existing_presets'
2018-07-16 19:52:17 +02:00
0885f95603
Build fix for linux
2018-07-16 16:37:14 +02:00
6296b7b4d2
Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d
2018-07-16 16:08:28 +02:00
324b66a467
Change to firstfit selection because DJD needs further testing.
2018-07-16 16:07:29 +02:00
eb42e76457
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-07-13 14:45:51 +02:00
ddb1f7c4f8
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-07-13 14:45:42 +02:00
77ed8ac31f
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-07-13 14:45:15 +02:00
9071f7b244
Fixed update of sliders' texts into object settings dialog
2018-07-13 14:41:49 +02:00
ec1de60742
Enabled inflill/object wiping for the first layer
2018-07-13 13:16:38 +02:00
0ed83eeb3c
Respect perimeter-infill order for purging only objects
2018-07-13 11:53:50 +02:00
049d99e7e7
Generate M73 lines for silent mode only for MK3 printers
2018-07-13 11:32:50 +02:00
5d30f47786
Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d
2018-07-13 11:28:02 +02:00
