Commit Graph

5444 Commits

Author SHA1 Message Date
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
Lukas Matena
3099c32d08 GUI - reenabling rotation angle settings for the wipe tower (was disabled by the merge with master) 2018-02-27 08:56:11 +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
bubnikv
edb756c084 Refactored the gyroid infill. 2018-02-23 18:32:35 +01:00
Enrico Turri
d25a472267 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-02-23 16:17:47 +01:00
Enrico Turri
6765722a3a Merge branch 'master' of https://github.com/prusa3d/Slic3r into mesh_repair 2018-02-23 16:17:25 +01:00
Enrico Turri
f43d989368 Merge branch 'master' of https://github.com/prusa3d/Slic3r into gcode_preview 2018-02-23 16:16:44 +01:00
Enrico Turri
27075e479e Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io 2018-02-23 16:16:06 +01:00
bubnikv
2edb96062e Removed the Perl Preferences dialog,
fixed the CMake after the GUI merge.
2018-02-23 15:53:16 +01:00
bubnikv
69fc99edbb Merge remote-tracking branch 'remotes/origin/gui_translate_to_cpp' 2018-02-23 15:32:13 +01:00
YuSanka
1948daec53 Added Manual for Localization 2018-02-23 15:10:36 +01:00
YuSanka
d61295eb10 Added Preferences files 2018-02-23 14:55:27 +01:00
YuSanka
3e09e93037 Updated POfile for CS 2018-02-23 14:54:08 +01:00
bubnikv
68c51be130 Merge remote-tracking branch 'remotes/origin/mesh_repair' 2018-02-23 14:38:37 +01:00
bubnikv
d0df673c82 Merge remote-tracking branch 'remotes/origin/time_estimate' 2018-02-23 14:34:01 +01:00
bubnikv
8fb443522b Merge remote-tracking branch 'remotes/origin/gcode_preview' 2018-02-23 14:33:16 +01:00
YuSanka
baa5726532 All project is ready to localization.
* Macro _LC is changed to _CHB. [to put translated string into std::string correctly]
* Macro _LS is changed to L.    [to mark string to translation]
* Standard wxWidgets macro _() is used for translation now.
* Updated POfile for EN
2018-02-23 14:25:49 +01:00
Enrico Turri
ce4b5c5252 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-02-23 08:56:39 +01:00
Enrico Turri
d4f5db39fa Merge branch 'master' of https://github.com/prusa3d/Slic3r into mesh_repair 2018-02-23 08:56:16 +01:00
Enrico Turri
37fa1f296d Merge branch 'master' of https://github.com/prusa3d/Slic3r into gcode_preview 2018-02-23 08:55:54 +01:00
Enrico Turri
52c1395626 Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io 2018-02-23 08:55:39 +01:00
bubnikv
c3d7be5994 Merge remote-tracking branch 'remotes/origin/3mf_io' 2018-02-22 18:57:07 +01:00
bubnikv
acce8dbff6 A workaround of the dreaded Intel HD Graphics driver issue at least
on the laptop of @roesel.
fixes https://github.com/prusa3d/Slic3r/issues/672

The Intel HD Graphics hangs on the glFinish() call for some reason
with one particular graphics driver revision. Also the glFinish() call
was superfluous and it only may have had negative effect over the performance.

Both glFinish() and glFlush() were removed for performance reasons
where they were not needed, see
https://www.khronos.org/opengl/wiki/Common_Mistakes
2018-02-22 18:56:37 +01:00
Enrico Turri
30ca38793e Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-02-22 15:32:13 +01:00
Enrico Turri
95965b7b89 Merge branch 'master' of https://github.com/prusa3d/Slic3r into mesh_repair 2018-02-22 15:31:48 +01:00
Enrico Turri
c6c0878fa9 Merge branch 'master' of https://github.com/prusa3d/Slic3r into gcode_preview 2018-02-22 15:31:22 +01:00
Enrico Turri
7efe0234a7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io 2018-02-22 15:31:07 +01:00
Enrico Turri
52eb6f6bcf Remove .zip from file extension on import to avoid having it added again and again when exporting 2018-02-22 15:27:32 +01:00
YuSanka
cec12e203a Plater.pm is marked by L() to localization. 2018-02-22 15:13:07 +01:00
YuSanka
bc97184c63 Fixed #735 & PresetHints.cpp is marked to localization
* Macro _LC is created to put translated string into std::string correctly.
* Macro _LU8 is changed to function L_str.
* Created function from_u8
2018-02-22 14:19:41 +01:00
Lukas Matena
d17229efd5 Gyroid infill - minor correction for standard-conforming compilers 2018-02-22 12:00:24 +01:00
YuSanka
3d805a0f43 PreferencesDialog moved to C++ part 2018-02-22 11:12:29 +01:00
Lukas Matena
5f5a59328b Minor refactoring, actualized comments, etc. 2018-02-22 11:03:29 +01:00
Merill
d59bb027eb Gyroid infill type (#733)
Gyroid infill type.
2018-02-22 09:56:05 +01:00
Lukas Matena
5a02bde170 Fix of merge conflict and uninitialized variables in writer class 2018-02-22 09:28:31 +01:00