Lukas Matena
92d36df903
Merge branch 'master' into wipe_tower_improvements
2018-07-09 09:28:26 +02:00
tamasmeszaros
fa7ca09e57
Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d
2018-07-04 10:22:49 +02:00
tamasmeszaros
16ec625483
Eliminating signed comp warning
2018-07-03 15:09:12 +02:00
tamasmeszaros
99f2d40b53
Remove progress indicators for individual threads.
2018-07-03 13:58:35 +02:00
bubnikv
e61b25de7c
Merge branch 'master' into amf_activate_existing_presets
2018-07-03 13:04:11 +02:00
YuSanka
b682fb1829
Enabled "delete preset" button after current profile saving
2018-07-03 12:19:34 +02:00
tamasmeszaros
9beb767830
Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d
2018-07-03 10:23:33 +02:00
tamasmeszaros
27b0926c19
Localization for app controller.
2018-07-03 10:22:55 +02:00
bubnikv
c7f3014d26
Fix of
...
"Slic3r 1.40.1-rc fails to retain the filament list on"
https://github.com/prusa3d/Slic3r/issues/1020
2018-07-02 20:25:37 +02:00
Vojtech Kral
617b5158bd
Fix: Leak in Tab.cpp in serial port test
2018-07-02 19:00:36 +02:00
YuSanka
07b28b2a8c
Bug-fixes of the OSX crashing
2018-07-02 13:51:50 +02:00
tamasmeszaros
ddb4945586
Fix crash on Linux when arranging
2018-07-02 11:22:47 +02:00
tamasmeszaros
952068f282
Autocenter finally disabled. Progress indication works.
2018-06-29 17:46:21 +02:00
YuSanka
16e42b0226
Added tooltips for selected Preset
2018-06-29 11:29:23 +02:00
bubnikv
6b3c24359b
Merge branch 'master' into amf_activate_existing_presets
2018-06-28 22:00:10 +02:00
bubnikv
26b003073b
Renamed the "compatible_printers_condition" and "inherits" vectors
...
to "compatible_printers_condition_cummulative" and "inherits_cummulative"
when storing to AMF/3MF/Config files.
Improved escaping of strings stored / loaded from config files.
2018-06-28 20:13:01 +02:00
tamasmeszaros
d3b19382fe
AppController reachable trough Plater.pm
2018-06-28 19:16:36 +02:00
tamasmeszaros
85474e5803
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
ad4d95f60c
AppController integration
2018-06-28 18:47:18 +02:00
YuSanka
2cbf5b75db
Final Fix of tooltips on OSX showing on the first page of a parameter tab.
2018-06-28 18:30:22 +02:00
YuSanka
9e4bea8cce
Code cleaning
2018-06-28 18:14:34 +02:00
YuSanka
896d898124
Resizing panel to 1 px
2018-06-28 17:52:20 +02:00
bubnikv
c4a3e4eca7
Merge branch 'for_merging'
2018-06-28 17:43:15 +02:00
YuSanka
5f1f7dcbed
Fix of tooltips on OSX showing on the first page of a parameter tab.
2018-06-28 17:34:55 +02:00
YuSanka
0171f49ad0
And last try..
2018-06-28 17:14:45 +02:00
YuSanka
75bda8cfd8
Addition to last commit
2018-06-28 16:50:06 +02:00
YuSanka
0b1833a2af
Try to fix tooltips on OSX
2018-06-28 16:01:06 +02:00
bubnikv
acd712cdbc
Merge remote-tracking branch 'remotes/origin/vk-octoprint'
2018-06-28 13:53:27 +02:00
YuSanka
5605835ba9
Use silent_mode only with MK3 printer
2018-06-28 12:40:27 +02:00
Vojtech Kral
5787c495d6
Octoprint: Improve error reporting
2018-06-27 17:00:20 +02:00
bubnikv
80b430ad94
Simplified handling of the "compatible_printers_condition" and
...
"inherits" configuration values.
Implemented correct setting of the "inherits" flag for the profiles
loaded from AMF/3MF/Config files.
2018-06-27 16:57:42 +02:00
Enrico Turri
de28d4edeb
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-27 15:32:47 +02:00
Enrico Turri
3dba0be81e
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-27 15:32:31 +02:00
Vojtech Kral
930a2f1d12
Fix: Http: Body size limit not properly initialized
2018-06-27 13:57:21 +02:00
Vojtech Kral
6706c3b71f
ConfigWizard: Mark the first variant of each printer as default in the GUI
2018-06-27 13:57:21 +02:00
Vojtech Kral
e00125d866
PresetUpdater: Fix double update detection (had_config_update)
2018-06-27 13:57:21 +02:00
Vojtech Kral
3229574a39
ConfigWizard: Fix default printer selection
2018-06-27 13:57:21 +02:00
Enrico Turri
d02c90d5d0
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-27 13:54:39 +02:00
Enrico Turri
48915a65fd
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-27 13:52:57 +02:00
Enrico Turri
06f44a9e4b
Code cleanup
2018-06-27 12:49:38 +02:00
Enrico Turri
8db4fdc24c
3rd attempt to fix opengl on ubuntu
2018-06-27 12:36:49 +02:00
Enrico Turri
23d10fdadc
2nd attempt to fix opengl on ubuntu
2018-06-27 12:05:23 +02:00
Enrico Turri
5c32347449
1st attempt to fix opengl on ubuntu
2018-06-27 11:31:11 +02:00
bubnikv
68e82a7348
Merge branch 'master' into amf_activate_existing_presets
2018-06-27 10:33:14 +02:00
Lukas Matena
fe0f0fe6af
Merge branch 'master' into wipe_tower_improvements
2018-06-27 08:56:08 +02:00
Enrico Turri
dc223066d3
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-27 08:26:55 +02:00
Enrico Turri
db95460154
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-27 08:26:33 +02:00
Lukas Matena
4dae6cbf60
Merge branch 'master' into wipe_tower_improvements
2018-06-26 12:58:04 +02:00
Enrico Turri
bd1d70d8d3
Fixed crash when slicing from Layers tab
2018-06-26 12:50:04 +02:00
bubnikv
59510c42d1
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