Commit Graph

5196 Commits

Author SHA1 Message Date
bubnikv
4a90ab1f6a Merge branch 'octoprint' 2018-03-06 11:39:44 +01:00
bubnikv
e26ccfc247 Fixed compilation on Windows,
removed debugging menu and debugging output.
2018-03-06 11:39:24 +01:00
Enrico Turri
9f7607c064 3mf I/O - Fixed object sinking into bed after import 2018-03-06 10:26:39 +01:00
bubnikv
51da42734a Merge remote-tracking branch 'origin/http+build' 2018-03-06 10:15:17 +01:00
YuSanka
4547755221 Update UI for visualize changes:
* Added changing of text color and inserted undo_button when some option is modified.
* Call wxSetlocale(LC_NUMERIC, "C") when do language changing.
2018-03-06 09:46:26 +01:00
Enrico Turri
aab0ffa044 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-03-06 08:37:20 +01:00
Enrico Turri
a600dbc06c Merge branch 'master' of https://github.com/prusa3d/Slic3r into mesh_repair 2018-03-06 08:36:37 +01:00
Enrico Turri
c46eaf36e3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into gcode_preview 2018-03-06 08:35:50 +01:00
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
Lukas Matena
6c223c2f84 Fixed cooling time calculation, removed unnecessary diagonal moves, fixed 'stringing' on start and end of narrower wipe tower layers 2018-03-05 16:51:31 +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
Lukas Matena
4058f00275 Added print head moves after ramming and removed one unnecessary diagonal move 2018-03-05 13:53:49 +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
Lukas Matena
5aca3045b9 (Un)loading speed and delay introduced into wipe tower generator 2018-03-05 10:45:35 +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
Lukas Matena
b3e9b82280 (Un)loading speed and time delay parameters introduced into GUI and conf. layer (not yet into wipe tower generator) 2018-03-02 15:52:16 +01:00
YuSanka
2a378f6590 Fixed problem with changing extruders color 2018-03-02 13:41:37 +01:00
Lukas Matena
e1421da5e8 Integrating cooling tube parameters into wipe tower generator 2018-03-02 13:26:16 +01:00
YuSanka
222368f7e8 Start of realization UI to visualize changes 2018-03-02 09:08:11 +01:00
Lukas Matena
d2006c8d8e Cooling tubes parameters added into GUI and configuration layer (not yet into wipe tower generator) 2018-03-01 16:15:00 +01:00
Lukas Matena
1d787a15a0 Fix for win builds 2018-03-01 09:57:51 +01:00
Lukas Matena
c76c075569 Yet another attempt to fix Win builds 2018-03-01 09:19:34 +01:00
Lukas Matena
b1b16359d9 Changes in includes in order to fix Win builds 2018-03-01 08:43:43 +01:00
Lukas Matena
9ea803b000 Attempts to fix OSX and Win builds 2018-02-28 19:53:32 +01:00
Lukas Matena
a62ad3323f First naive implementation of wipe tower settings dialog 2018-02-28 16:04:56 +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