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

884 Commits

Author SHA1 Message Date
Enrico Turri
4dd9712c17 Disable slicing when one object crosses the print volume boundary 2018-07-18 14:26:42 +02:00
tamasmeszaros
6b21e5bd3c Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-07-18 10:14:28 +02:00
Enrico Turri
69c5c18c07 Merge with master + resolved conflicts 2018-07-17 10:44:23 +02:00
bubnikv
1830f4059a Merge remote-tracking branch 'remotes/origin/opengl_to_cpp' 2018-07-17 09:37:38 +02:00
Enrico Turri
639e0fea51 Merge with master 2018-07-17 08:54:17 +02:00
bubnikv
7a26ba2dc1 Merge remote-tracking branch 'remotes/origin/amf_activate_existing_presets' 2018-07-16 19:52:17 +02:00
YuSanka
ad83b61032 First right-panel reorganization: 
* Replaced Object list from CollapsiblePane
* Sub-object are adding by context menu from list
* (sub)objects can be deleted by only one "Delete" button
* Added extruder selection to list
 2018-07-04 09:03:43 +02:00
bubnikv
fe83aa8653 Merge branch 'master' into amf_activate_existing_presets 2018-06-28 22:00:10 +02:00
tamasmeszaros
f11dd98cc4 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 
# Conflicts:
#	CMakeLists.txt
#	lib/Slic3r/GUI/MainFrame.pm
 2018-06-28 18:50:39 +02:00
tamasmeszaros
f0b44f95e2 AppController integration 2018-06-28 18:47:18 +02:00
tamasmeszaros
b839224dc4 Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-06-27 17:44:33 +02:00
tamasmeszaros
eebc20098a Refactor and extensions to png export dialog. 2018-06-27 17:43:54 +02:00
Enrico Turri
21c7f41973 Time estimate emitted to gcode at requested interval 2018-06-27 15:35: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
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
c2256b2faa 3rd attempt to fix opengl on ubuntu 2018-06-27 12:36:49 +02:00
Enrico Turri
537033462d 1st attempt to fix opengl on ubuntu 2018-06-27 11:31:11 +02:00
bubnikv
3c0e7b82ff Merge branch 'master' into amf_activate_existing_presets 2018-06-27 10:33:14 +02:00
tamasmeszaros
f2d6cf8a2a Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-06-27 09:36:05 +02:00
tamasmeszaros
4ee61008ef Comments and refactoring 2018-06-26 17:02:46 +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
Enrico Turri
5a52f0b773 Fixed panning in Layers view 2018-06-26 11:17:30 +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
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
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
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
1d81186309 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 08:26:14 +02:00
Enrico Turri
afc4bbb680 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-22 16:13:51 +02:00
Enrico Turri
13d59bca12 Forced render of 3D scene when changing tab in plater's notebook 2018-06-22 16:06:37 +02:00
Enrico Turri
ffb404d4ad Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-22 12:57:16 +02:00
Enrico Turri
7943c4afca Merge branch 'machine-limits-config' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-22 12:30:15 +02:00
YuSanka
2d1078a7d9 Fixed crash-bug when close application after language changing 2018-06-22 12:27:56 +02:00
Enrico Turri
f0e09fc4b4 Geometry info updated while using gizmos 2018-06-22 11:19:38 +02:00
YuSanka
9390348e2b Merge remote-tracking branch 'origin/master' into add_kinematics 2018-06-22 09:22:29 +02:00
Enrico Turri
e4087150eb Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-21 11:05:07 +02:00
Enrico Turri
03719d44de Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-21 11:03:38 +02:00
Vojtech Kral
88e400a0c0 Octoprint: Add a dialog for setting the filename/path 
and a "print now" option
cf. #880, #245, #55, #87
 2018-06-21 10:44:29 +02:00
Enrico Turri
8881f43162 Faster gizmos update 2018-06-21 08:37:04 +02:00
tamasmeszaros
935bd252e2 Slicing in C++ with progress indication. 2018-06-20 14:50:18 +02:00
bubnikv
39c31687df Added machine evelope configuration parameters 
(the MachineEnvelopeConfig class).
Added localization support for libslic3r through a callback
(the callback is not registered yet, so the localization does nothing).
Localized the Print::validate() error messages.
 2018-06-20 13:57:37 +02:00
Enrico Turri
f43ab3d842 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-20 08:32:27 +02:00
tamasmeszaros
e51c13841b AppController class created to take the necessary app logic into C++. 2018-06-19 17:45:21 +02:00
bubnikv
a239368348 Merge remote-tracking branch 'remotes/origin/scene_manipulators' 
Disabled the gizmos.
 2018-06-19 16:12:36 +02:00
bubnikv
c6864c29f3 Merge remote-tracking branch 'remotes/origin/opengl_to_cpp' 2018-06-19 16:08:53 +02:00
bubnikv
3e8a529200 Merge remote-tracking branch 'remotes/origin/fix_model_by_win10' 2018-06-19 10:02:49 +02:00