3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,001 Commits 1 Branch 1 Tag 249 MiB
08529189c9
Commit Graph

733 Commits

Author SHA1 Message Date
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
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
bubnikv
210eeff160 Merge remote-tracking branch 'remotes/origin/amf_activate_existing_presets' 2018-07-16 19:52:17 +02:00
Enrico Turri
0f5ce827a1 Rotate gizmo radius changed only when moving one of multiple instances 2018-07-12 15:19:43 +02:00
Enrico Turri
3839d26e9b Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-07-12 15:17:08 +02:00
Enrico Turri
b2d9877cd5 Fixed crash on MAC when selecting system info 2018-07-12 13:34:39 +02:00
Enrico Turri
76d4b9dbb8 Attempt to fix SPE-352 2018-07-12 13:10:18 +02:00
Enrico Turri
63ab713585 Added debug output to investigate SPE-352 2018-07-12 12:15:30 +02:00
Enrico Turri
0e9ac1679f Keep fixed radius of rotate gizmo 2018-07-12 11:26:13 +02:00
Enrico Turri
b6e55a521e Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate 2018-07-12 08:42:08 +02:00
Enrico Turri
a8691bc083 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-07-12 08:32:42 +02:00
Enrico Turri
1356a9977e Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-12 08:32:18 +02:00
Lukas Matena
4c823b840f Fix of previous commit 2018-07-09 14:43:32 +02:00
Lukas Matena
bb80774e74 Infill purging - added fifth extruder into default setttings, cosmetic changes 2018-07-09 13:44:41 +02:00
YuSanka
fcc781195b Added updating of the is_external value for edited_preset after loading preset from (.ini, .gcode, .amf, .3mf etc) 2018-07-09 12:10:57 +02:00
Lukas Matena
92d36df903 Merge branch 'master' into wipe_tower_improvements 2018-07-09 09:28:26 +02:00
bubnikv
e61b25de7c Merge branch 'master' into amf_activate_existing_presets 2018-07-03 13:04:11 +02:00
YuSanka
b682fb1829 Enabled "delete preset" button after current profile saving 2018-07-03 12:19:34 +02:00
bubnikv
c7f3014d26 Fix of 
"Slic3r 1.40.1-rc fails to retain the filament list on"
https://github.com/prusa3d/Slic3r/issues/1020
 2018-07-02 20:25:37 +02:00
Vojtech Kral
617b5158bd Fix: Leak in Tab.cpp in serial port test 2018-07-02 19:00:36 +02:00
YuSanka
07b28b2a8c Bug-fixes of the OSX crashing 2018-07-02 13:51:50 +02:00
YuSanka
16e42b0226 Added tooltips for selected Preset 2018-06-29 11:29:23 +02:00
bubnikv
6b3c24359b Merge branch 'master' into amf_activate_existing_presets 2018-06-28 22:00:10 +02:00
bubnikv
26b003073b Renamed the "compatible_printers_condition" and "inherits" vectors 
to "compatible_printers_condition_cummulative" and "inherits_cummulative"
when storing to AMF/3MF/Config files.

Improved escaping of strings stored / loaded from config files.
 2018-06-28 20:13:01 +02:00
YuSanka
2cbf5b75db Final Fix of tooltips on OSX showing on the first page of a parameter tab. 2018-06-28 18:30:22 +02:00
YuSanka
9e4bea8cce Code cleaning 2018-06-28 18:14:34 +02:00
YuSanka
896d898124 Resizing panel to 1 px 2018-06-28 17:52:20 +02:00
bubnikv
c4a3e4eca7 Merge branch 'for_merging' 2018-06-28 17:43:15 +02:00
YuSanka
5f1f7dcbed Fix of tooltips on OSX showing on the first page of a parameter tab. 2018-06-28 17:34:55 +02:00
YuSanka
0171f49ad0 And last try.. 2018-06-28 17:14:45 +02:00
YuSanka
75bda8cfd8 Addition to last commit 2018-06-28 16:50:06 +02:00
YuSanka
0b1833a2af Try to fix tooltips on OSX 2018-06-28 16:01:06 +02:00
YuSanka
5605835ba9 Use silent_mode only with MK3 printer 2018-06-28 12:40:27 +02:00
bubnikv
80b430ad94 Simplified handling of the "compatible_printers_condition" and 
"inherits" configuration values.
Implemented correct setting of the "inherits" flag for the profiles
loaded from AMF/3MF/Config files.
 2018-06-27 16:57:42 +02:00
Enrico Turri
de28d4edeb Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-27 15:32:47 +02:00
Enrico Turri
3dba0be81e Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-27 15:32:31 +02:00
Vojtech Kral
6706c3b71f ConfigWizard: Mark the first variant of each printer as default in the GUI 2018-06-27 13:57:21 +02:00
Vojtech Kral
3229574a39 ConfigWizard: Fix default printer selection 2018-06-27 13:57:21 +02:00
Enrico Turri
d02c90d5d0 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-27 13:54:39 +02:00
Enrico Turri
48915a65fd Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-27 13:52:57 +02:00
Enrico Turri
06f44a9e4b Code cleanup 2018-06-27 12:49:38 +02:00
Enrico Turri
8db4fdc24c 3rd attempt to fix opengl on ubuntu 2018-06-27 12:36:49 +02:00
Enrico Turri
23d10fdadc 2nd attempt to fix opengl on ubuntu 2018-06-27 12:05:23 +02:00
Enrico Turri
5c32347449 1st attempt to fix opengl on ubuntu 2018-06-27 11:31:11 +02:00