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

13712 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
0cafaae000 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-06-27 08:26:45 +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
bubnikv
f4ee973ab7 When running on Windows, Perl $^X returns slic3r.exe or slic3r-console.exe 
Do some magic to get the perl interpreter path.
 2018-06-26 15:29:23 +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
c5b1bbab99 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-06-26 12:20:34 +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
Enrico Turri
f1a0aa2ca1 Fixed bed update when changing selected printer 2018-06-26 12:19:19 +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
YuSanka
f37b831c51 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-06-26 11:18:55 +02:00
YuSanka
d9088b7ad7 Updated POT-file 2018-06-26 11:17:40 +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
16593f4a98 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-06-26 11:15:46 +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
Enrico Turri
cc8d23eb82 Fixed conflicts after merge with master branch 2018-06-25 15:26:37 +02:00
Enrico Turri
025058948e Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-06-25 15:25:12 +02:00
Enrico Turri
dd392198f8 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-25 15:24:58 +02:00
Enrico Turri
fab492e951 Fix of interaction between opengl contexts and main page notebook 2018-06-25 15:17:13 +02:00
YuSanka
1e946f3952 Fixed #994. 
Print double-type values according to "full" value instead of 2 digits after point
 2018-06-25 13:32:28 +02:00
tamasmeszaros
996791ca7c Merge remote-tracking branch 'origin/master' into feature_slice_to_png 
# Conflicts:
#	lib/Slic3r/GUI/MainFrame.pm
 2018-06-25 13:24:37 +02:00
Enrico Turri
fd0d89111c Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-06-25 13:22:02 +02:00
Enrico Turri
046d1056a6 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-25 13:21:52 +02:00
Tamás Mészáros
0ee31bc3d1 Separating wx and the app controller. 2018-06-25 12:40:01 +02:00
YuSanka
9175163078 Fixed crashing-bug after language changing (detected under Debug) 2018-06-25 12:27:42 +02:00
YuSanka
6a66d81e76 Fixed bug #995 2018-06-25 11:40:40 +02:00
Enrico Turri
4c6cf7e970 Fixed conflict after merge with master 2018-06-25 10:49:30 +02:00
Enrico Turri
b4959d27f5 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 08:51:47 +02:00
Enrico Turri
9519e008b3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-06-25 08:51:38 +02:00
Enrico Turri
df781d0c00 Fix of #999 2018-06-25 08:48:36 +02:00
Enrico Turri
69c42a877b Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 08:27:09 +02:00
Enrico Turri
1d81186309 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 08:26:14 +02:00