3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 04:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
16749 commits 305 branches 270 tags 779 MiB
Commit graph

16749 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jack Ha
8af82cc3f4 CURA-4400 prevent disabling last enabled extruder 2018-03-15 15:54:44 +01:00
Jack Ha
2c364f4699 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-15 15:44:38 +01:00
Jack Ha
4b060f297f CURA-4400 grey out disabled extruder in context menu 2018-03-15 15:44:27 +01:00
Lipu Fei
08f43f6b2e Fix profile ordering in profile importing 
CURA-5054
 2018-03-15 15:27:47 +01:00
Diego Prado Gesto
b44f32ad1d Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-15 15:14:40 +01:00
Diego Prado Gesto
dcb68bb33e CURA-4870 Move the checkCorrectGroupName to the machine manager, where 
it must belong to.
 2018-03-15 15:13:35 +01:00
fieldOfView
b9bf78d36c Remove group when "parent" is the only node in the group 2018-03-15 15:05:56 +01:00
Jack Ha
1dba5629f7 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-15 15:00:22 +01:00
Jack Ha
05cd937df3 CURA-4400 optional_extruders cannot be set to disabled extruders anymore 2018-03-15 15:00:13 +01:00
fieldOfView
c3c096aaa0 Select the picked node so the group does not get drawn 2018-03-15 14:57:11 +01:00
Lipu Fei
98b325c9d5 Fix material serialization crash 2018-03-15 14:54:37 +01:00
Diego Prado Gesto
1e9a1f2668 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-15 14:48:43 +01:00
Diego Prado Gesto
cbe929242e CURA-4870 Update the names of the groups in the container stacks when 
there is temporary name after upgrading from 3.2
 2018-03-15 14:44:01 +01:00
Lipu Fei
8e39849aad Refactor setting visibility preset 
CURA-5088
 2018-03-15 14:41:34 +01:00
Lipu Fei
83175b00c2 Change SettingVisibilityPresetsModel to non-singleton 
CURA-5088
 2018-03-15 14:41:34 +01:00
Lipu Fei
1f2602a2f4 Move SettingVisibilityPresetsModel to Machines.Models 
CURA-5088
 2018-03-15 14:41:34 +01:00
Jack Ha
50f9548da0 CURA-4557 setting up plugin 2018-03-15 14:33:31 +01:00
Aleksei S
097c97b6f8 Fix: Refresh list of available printers in network 
after clicking refresh button.
 2018-03-15 14:33:27 +01:00
fieldOfView
a0c44192da Add support eraser meshes to group so it does not drop 2018-03-15 14:27:33 +01:00
fieldOfView
c25711797e Click support eraser mesh to remove it from the scene 2018-03-15 12:46:22 +01:00
fieldOfView
584f98cb07 Fix code style 2018-03-15 11:27:48 +01:00
fieldOfView
2686090494 Merge branch 'master' into feature_preheat_extruder 2018-03-15 11:23:10 +01:00
fieldOfView
dbabf3bda9 Merge branch 'master' into feature_preheat_extruder 
# Conflicts:
#	cura/PrinterOutput/ExtruderOutputModel.py
#	cura/PrinterOutput/PrinterOutputModel.py
 2018-03-15 11:21:37 +01:00
Jack Ha
d0609e97e4 CURA-4557 added material_shrinkage_ratio_percentage setting 2018-03-15 11:19:14 +01:00
fieldOfView
11be8f158f Merge branch 'master' into feature_support_eraser_ux 2018-03-15 11:10:49 +01:00
Diego Prado Gesto
c21b19a910 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-15 11:04:10 +01:00
fieldOfView
dee70f35f4 Fix setting visibility when searching 2018-03-15 11:03:27 +01:00
Diego Prado Gesto
15ff4045bf CURA-4870 When removing a network connected printer, also remove all the 
other machines that were (possibly) created in the background so that
there is no orphan containers.
 2018-03-15 11:02:29 +01:00
fieldOfView
4a1f0a21ad Merge branch 'master' into fix_per_meshgroup_settings 2018-03-15 10:46:58 +01:00
Lipu Fei
496c8f2f79 Cleanup MachineManagementModel 2018-03-15 10:44:02 +01:00
fieldOfView
8fe2077413 Merge branch 'master' into fix_per_meshgroup_settings 2018-03-15 10:40:18 +01:00
Diego Prado Gesto
50bf61d823 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-15 10:34:09 +01:00
Diego Prado Gesto
0155a20994 CURA-4870 Fix visibility in the status icon 2018-03-15 10:33:06 +01:00
jack
f3f4be5334
Merge pull request #3496 from fieldOfView/fix_textfield_select 
Only select all text when tabbing to fields, not when clicking a field
 2018-03-15 10:28:47 +01:00
Lipu Fei
a477b8cdc2 Fix malyan m180 definitions 
CURA-4696
 2018-03-15 09:58:02 +01:00
Jack Ha
8dd065e3f5 Merge branch 'master' into extra_machine_settings 2018-03-15 09:36:30 +01:00
fieldOfView
e4a416258b Fix code-style and type hinting 2018-03-15 09:03:50 +01:00
Diego Prado Gesto
1cf832653c CURA-4870 Make the configuration selector only available for network 
printers.
Show the connection icon also for printers connected via USB or
Octoprint.
 2018-03-14 17:00:39 +01:00
Diego Prado Gesto
7c875c154f Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-14 16:56:52 +01:00
Diego Prado Gesto
e6c5bd28b2 CURA-4870 Use the visible property instead of a Qt5.10 existing 'opened' 
property.
This is needed to avoid a crashing for those that are using 5.10 running from
source.
 2018-03-14 16:53:51 +01:00
Diego Prado Gesto
2fdd51fc23 CURA-4870 Bind the network information with the output devices changed 
signal.
 2018-03-14 16:47:01 +01:00
Jack Ha
6909c9263a CURA-4400 fix setting extruder number on a group printed with mixed extruders 2018-03-14 16:32:53 +01:00
Jack Ha
98b0559c9a Merge branch 'master' into speedup 2018-03-14 16:14:14 +01:00
Jack Ha
e3dd7a449d CURA-5090 speedups by using qtimers on updating mostly visual elements 2018-03-14 16:09:59 +01:00
Diego Prado Gesto
a0736d61df Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-14 15:17:21 +01:00
Diego Prado Gesto
61ce0c3154 CURA-4870 Make the configuration pop-up open and close with one click. 
Before it was the case in which sometimes the user needs two clicks for
that.
Also collapse the dropdown when the configuration is applied.
 2018-03-14 15:15:43 +01:00
Jaime van Kessel
0d23ea2194 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-14 14:45:20 +01:00
Jaime van Kessel
ad3c5466d1 Added bunch of typing to clusteroutput device 2018-03-14 14:45:01 +01:00
Lipu Fei
241611546e Fix quality details view 
CURA-5054
 2018-03-14 14:41:44 +01:00
Jaime van Kessel
962c5f3260 Added bit of defensive coding to cluster output device 2018-03-14 14:39:06 +01:00