Commit Graph

5109 Commits

Author SHA1 Message Date
Enrico Turri
7320a87183 Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io 2018-03-06 08:35:28 +01:00
Vojtech Kral
ca0f6131a1 WIP: Bonjour: TXT + improvements 2018-03-05 18:33:15 +01:00
Vojtech Kral
fc05eb898d WIP: Bonjour 2018-03-05 18:33:15 +01:00
Vojtech Kral
7cfc5204c8 WIP: OctoPrint 2018-03-05 18:33:15 +01:00
Vojtech Kral
79ee7c9a36 Fix #608 Credit: Dylan "smellyfis" Thies 2018-03-05 18:32:09 +01:00
bubnikv
b897209e0d Removed -DCURL_STATIC on OSX,
added dynamic linking of OpenSSL on Linux, even if libcurl is linked
statically.
2018-03-05 18:02:47 +01:00
Vojtech Kral
f67d70941e Doc: Add dependency build scripts and building how-tos 2018-03-05 18:02:36 +01:00
Vojtech Kral
751e86cd4d libcurl linking and cmake usage improvements 2018-03-05 16:31:24 +01:00
Vojtech Kral
14929e9d15 Http client via libcurl 2018-03-05 15:52:17 +01:00
bubnikv
3c64eb9215 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-03-05 15:31:32 +01:00
bubnikv
5ea584280c Merge remote-tracking branch 'remotes/origin/gui_improvements' 2018-03-05 12:12:40 +01:00
Enrico Turri
5f3ee74e0e Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-03-05 11:54:52 +01:00
Enrico Turri
f43b2760ab Merge branch 'master' of https://github.com/prusa3d/Slic3r into mesh_repair 2018-03-05 11:53:59 +01:00
Enrico Turri
3d19982d41 Merge branch 'master' of https://github.com/prusa3d/Slic3r into gcode_preview 2018-03-05 11:53:26 +01:00
Enrico Turri
352d5d0baa Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io 2018-03-05 11:53:15 +01:00
bubnikv
91b5853aa3 Merge remote-tracking branch 'remotes/origin/gui_change_extruders_color' 2018-03-05 11:47:13 +01:00
Enrico Turri
802579ad20 Fixed crash while exporting to .amf and .gcode files (#753) - (improves previous fix: d4f1ed0036) 2018-03-05 10:53:18 +01:00
Enrico Turri
6049e0c42c Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-03-05 08:42:55 +01:00
Enrico Turri
df06b4b6b2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into mesh_repair 2018-03-05 08:42:32 +01:00
Enrico Turri
b2de3dd241 Merge branch 'master' of https://github.com/prusa3d/Slic3r into gcode_preview 2018-03-05 08:41:56 +01:00
Enrico Turri
f0ec8c0967 Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io 2018-03-05 08:41:45 +01:00
YuSanka
f750abb9db Refactor load_config() function 2018-03-04 15:21:01 +01:00
bubnikv
ed7c02d578 Disabled the CMake BOOST debugging. 2018-03-02 23:11:57 +01:00
bubnikv
15dbeff0c9 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-03-02 18:15:15 +01:00
bubnikv
777bcf5865 Enabled Boost_DEBUG in CMake to get some debug info when something
goes wrong.
2018-03-02 18:14:19 +01:00
YuSanka
2a378f6590 Fixed problem with changing extruders color 2018-03-02 13:41:37 +01:00
YuSanka
222368f7e8 Start of realization UI to visualize changes 2018-03-02 09:08:11 +01:00
YuSanka
541b51c524 Merge dictionaries from the upstream Slic3r. Update existing dictionaries according to new Slic3rPE.pot 2018-02-28 15:44:45 +01:00
YuSanka
751c97c503 Localize the Plater tab
* Marking and translation of Plater tab are complited
* GUI.pm is marked to l10n
* Fix small bug with Extruder adding at Printer Settings tab
2018-02-28 15:41:35 +01:00
Enrico Turri
0e896e48e4 3mf I/O - Added import and export of modifiers 2018-02-28 12:11:41 +01:00
Enrico Turri
6ec1b61cbc Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-02-28 11:46:16 +01:00
Enrico Turri
4e0d104afd Merge branch 'master' of https://github.com/prusa3d/Slic3r into mesh_repair 2018-02-28 11:45:53 +01:00
Enrico Turri
d5959922f3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into gcode_preview 2018-02-28 11:45:34 +01:00
Enrico Turri
8cd42966d6 Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io 2018-02-28 11:45:23 +01:00
Enrico Turri
0ec68eb35b Fix for issue #661 (ExPolygons generation) 2018-02-28 11:41:04 +01:00
Enrico Turri
ecac4ab175 3mf I/O - Added import and export of object's and volume's name 2018-02-27 15:46:54 +01:00
Enrico Turri
2a2bdaa0e0 3mf I/O - Added import and export of object's and volume's config data 2018-02-27 10:49:51 +01:00
YuSanka
0596660dda Fix bug with not displaying flags for incompatible presets 2018-02-27 09:51:14 +01:00
Enrico Turri
8bb1f93b8d Merge branch 'master' of https://github.com/prusa3d/Slic3r into gcode_preview 2018-02-27 08:33:50 +01:00
YuSanka
7047f4365a Update localization:
* 2D.pm, 3DPreview.pm, PreviewData.cpp are marked by L()
* use translating function in 3DScene.cpp
2018-02-26 16:23:44 +01:00
Enrico Turri
14d19356f3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io 2018-02-26 16:19:36 +01:00
YuSanka
e05493bd90 Fixed wrong printing of recommended_thin_wall_thickness_description_line 2018-02-26 13:57:36 +01:00
YuSanka
f3f78ebc5a Fix #742 2018-02-26 09:57:08 +01:00
Enrico Turri
14359e5025 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-02-26 08:32:27 +01:00
Enrico Turri
eb2d689971 Merge branch 'master' of https://github.com/prusa3d/Slic3r into mesh_repair 2018-02-26 08:32:04 +01:00
Enrico Turri
8f8d7d3d95 Merge branch 'master' of https://github.com/prusa3d/Slic3r into gcode_preview 2018-02-26 08:31:36 +01:00
Enrico Turri
69b0caa38f Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io 2018-02-26 08:31:24 +01:00
YuSanka
bcc68ca450 Added Slic3rPE.pot and list.txt to localization. 2018-02-26 08:31:07 +01:00
YuSanka
4c90e2bbc6 Rename localization guide to emphasize markdown format 2018-02-25 22:45:31 +01:00
YuSanka
b5d96e4ed6 Update localization guide 2018-02-25 22:41:28 +01:00