viewit/OrcaSlicer-KX
5
1
Fork 1
Code Issues Pull Requests Actions 4 Packages Projects Releases 4 Wiki Activity
8,743 Commits 6 Branches 4 Tags
cb79a35e352b596bcd1facbd38de7f94de84df4c
Commit Graph

3275 Commits

Author SHA1 Message Date
tamasmeszaros
eebc20098a Refactor and extensions to png export dialog. 2018-06-27 17:43:54 +02:00
Vojtech Kral
a9a33ed384 Octoprint: Improve error reporting 2018-06-27 17:00:20 +02:00
bubnikv
41586b7276 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
Lukas Matena
ed09a832ec Fixed a crash when complete_objects was turned on 2018-06-27 15:49:02 +02:00
Enrico Turri
21c7f41973 Time estimate emitted to gcode at requested interval 2018-06-27 15:35:47 +02:00
Enrico Turri
b2cc9ba7b2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-27 15:32:47 +02:00
Enrico Turri
e5bfb60652 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-27 15:32:31 +02:00
Lukas Matena
9e0dab510d Infill wiping turned off by default and in some automatic tests 2018-06-27 15:07:37 +02:00
Lukas Matena
7d520db9c1 Correct extruder is used for dontcare extrusions 2018-06-27 14:08:46 +02:00
Vojtech Kral
59bca108d3 Fix: Http: Body size limit not properly initialized 2018-06-27 13:57:21 +02:00
Vojtech Kral
80b8be31f7 ConfigWizard: Mark the first variant of each printer as default in the GUI 2018-06-27 13:57:21 +02:00
Vojtech Kral
c7b2c5359f PresetUpdater: Fix double update detection (had_config_update) 2018-06-27 13:57:21 +02:00
Vojtech Kral
aee0fd089b ConfigWizard: Fix default printer selection 2018-06-27 13:57:21 +02:00
Enrico Turri
073ab56d0c Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-27 13:54:39 +02:00
Chow Loong Jin
8afaa3ee26 Fix format-security violation with croak 
Missed one in https://github.com/prusa3d/slic3r/pull/802.
 2018-06-27 13:54:07 +02:00
Enrico Turri
7b49a0b9cd Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-27 13:52:57 +02:00
Enrico Turri
5bd0f6ab2b Code cleanup 2018-06-27 12:49:38 +02:00
Enrico Turri
c2256b2faa 3rd attempt to fix opengl on ubuntu 2018-06-27 12:36:49 +02:00
Enrico Turri
1a5593ff10 2nd attempt to fix opengl on ubuntu 2018-06-27 12:05:23 +02:00
Enrico Turri
537033462d 1st attempt to fix opengl on ubuntu 2018-06-27 11:31:11 +02:00
tamasmeszaros
c44faab3e2 PngExportDialog fix on Windows 2018-06-27 11:21:14 +02:00
tamasmeszaros
288a191a76 PngExportDialog size fix on Linux 2018-06-27 11:13:40 +02:00
bubnikv
3c0e7b82ff Merge branch 'master' into amf_activate_existing_presets 2018-06-27 10:33:14 +02:00
tamasmeszaros
a0b8ede704 Patch from Lubomír Bláha applied. Polished comments and PngExportDialog. 2018-06-27 10:28:44 +02:00
tamasmeszaros
f2d6cf8a2a Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-06-27 09:36:05 +02:00
Lukas Matena
641bfc48bc Merge branch 'master' into wipe_tower_improvements 2018-06-27 08:56:08 +02:00
Enrico Turri
3d452f07e7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-27 08:26:55 +02:00
Enrico Turri
fcd09ad9e5 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-27 08:26:33 +02:00
tamasmeszaros
4ee61008ef Comments and refactoring 2018-06-26 17:02:46 +02:00
tamasmeszaros
b180650da7 File saving to new file fixed. 2018-06-26 16:08:58 +02:00
tamasmeszaros
e4e2fc7814 Export dialog ready 2018-06-26 15:53:43 +02:00
Lukas Matena
254dbc5206 'Dontcare' extrusions now don't force a toolchange + code reorganization 2018-06-26 14:12:25 +02:00
YuSanka
bad87a3965 Fixed post-merge bugs 2018-06-26 13:34:25 +02:00
bubnikv
2e4ec6a72c Fixed integration tests. 2018-06-26 13:22:24 +02:00
Lukas Matena
4eed42a723 Merge branch 'master' into wipe_tower_improvements 2018-06-26 12:58:04 +02:00
Enrico Turri
5b32d61a69 Fixed crash when slicing from Layers tab 2018-06-26 12:50:04 +02:00
Enrico Turri
bb7c7dac61 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-26 12:20:41 +02:00
Enrico Turri
010e2ecc62 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-26 12:20:23 +02:00
bubnikv
48e2828c6c When loading an archive (AMF/3MF/Config), the original name 
of the profile is show in braces next to the file name.
 2018-06-26 11:31:01 +02:00
Enrico Turri
5a52f0b773 Fixed panning in Layers view 2018-06-26 11:17:30 +02:00
Enrico Turri
3eb6c29c24 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-26 11:16:00 +02:00
Enrico Turri
02f913df23 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-26 11:15:33 +02:00
bubnikv
d157831afb Storing and recovering the "compatible_printers_condition" 
and "inherits" fields from / to the AMF/3MF/Config files.
The "compatible_printers_condition" are collected over all active profiles
(one print, possibly multiple filament, and one printer profile)
into a single vector.
 2018-06-26 10:50:50 +02:00
YuSanka
57e83dcbc8 Fixed #998 
Added detection of gtk2/gtk3 GUI libraries required by Alien::wxWidgets.
Added gtk2/gtk3 include paths, so we may call gtk2/3 API directly if needed for some workaround.
 2018-06-26 10:37:36 +02:00
YuSanka
369e9496cc Merge remote-tracking branch 'origin/master' into new_main_page_ui 2018-06-26 09:26:27 +02:00
tamasmeszaros
c6d8856ec5 Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-06-25 17:14:29 +02:00
tamasmeszaros
07da934398 Merge branch 'feature_slice_to_png' of github.com:prusa3d/Slic3r into feature_slice_to_png 
# Conflicts:
#	xs/src/slic3r/AppController.cpp
#	xs/src/slic3r/AppController.hpp
 2018-06-25 17:13:36 +02:00
Enrico Turri
351a36b2c1 Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 16:09:27 +02:00
YuSanka
a46993d9a3 Correct updating of "Machine limits" and "Single extruder MM setup" pages 2018-06-25 16:03:43 +02:00
Enrico Turri
90eb01702b Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 15:27:06 +02:00