3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-14 10:17:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
34356 commits 302 branches 270 tags 773 MiB
Commit graph

2372 commits

Author SHA1 Message Date
Jack Ha
c4fb15a569 CURA-4400 resolve merge conflict 2018-03-12 15:18:35 +01:00
Diego Prado Gesto
da54c93fda CURA-4870 Remove commented code 2018-03-12 15:12:27 +01:00
Diego Prado Gesto
809db6a4d9 CURA-5078 Remove material warning if the mismatch was the buildplate. 2018-03-12 15:09:56 +01:00
Jack Ha
d889795721 CURA-4400 correctly cope with quality changes that conflict with the current enabled extruders 2018-03-12 14:15:49 +01:00
Jack Ha
aa3cd8ba9d Solved merge conflict 2018-03-12 11:39:39 +01:00
Jack Ha
a3d6127dcb CURA-4400 removed unnecessary correctExtruderSettings 2018-03-12 11:33:54 +01:00
Lipu Fei
2c5cc17b49 Fix build plate compatibility check 
CURA-5078
 2018-03-12 10:34:18 +01:00
Jack Ha
552618fcd4 CURA-4400 added function to find model index by extruder position in SettingExtruder 2018-03-12 09:56:08 +01:00
Jack Ha
d70cc072e9 Merge branch 'master' into feature_enable_disable_extruder 2018-03-12 09:06:24 +01:00
Diego Prado Gesto
85d6919ce6 Merge branch 'master' into feature_sync_button 2018-03-09 16:59:18 +01:00
Diego Prado Gesto
87380e007c CURA-4870 Switch the hidden metadata entry also when switching printes 
so the active printer is correctly shown in the machines page.
 2018-03-09 16:44:46 +01:00
fieldOfView
711d60e8c7 Allow switching back to the "Custom" set 2018-03-09 16:44:27 +01:00
Lipu Fei
a81981a27a Better info on no profiles to import for gcode 
CIRA-4946

If a gcode is sliced with default profiles, there won't be any custom
profiles to import from that gcode. In that case, we show a info message
telling the user about this instead of showing an error message.
 2018-03-09 16:40:57 +01:00
fieldOfView
4c66c935af Merge branch 'master' into feature_setting_visibility_profiles 2018-03-09 15:45:24 +01:00
Lipu Fei
de72dd3455 Fix material update upon gcode flavour change 
CURA-5060
 2018-03-09 14:26:53 +01:00
Diego Prado Gesto
ebbb30a5be CURA-4870 Replace network key and connect group name metadata values 
when the connection changes.
 2018-03-09 13:37:15 +01:00
Diego Prado Gesto
260cad36cb CURA-4870 Add name of the group and hidden property to the network 
printers. The printer menu shows the printers grouped by group and the
hidden printers are never listed.
 2018-03-09 12:42:49 +01:00
Diego Prado Gesto
4be4d08d97 CURA-4870 Add the ability in Cura to switch between different types of 
printers. Create a new container stack if it doesn't exist with the same
network connection key.
 2018-03-09 10:47:08 +01:00
Lipu Fei
ef8cd304dc No keep/discard setting dialog in project loading 
CURA-4966
 2018-03-08 20:00:21 +01:00
Lipu Fei
6aefb2215d Fix _setQualityChangesGroup() 
CURA-4966
 2018-03-08 19:50:45 +01:00
Diego Prado Gesto
b212781a19 Merge branch 'master' into feature_sync_button 2018-03-08 16:57:21 +01:00
Jack Ha
0d61b6652c CURA-4400 merge two if statements in 1 2018-03-08 15:38:32 +01:00
Diego Prado Gesto
591d3f29ec CURA-4870 Don't crash when there is not buildplate variant for the 
current machine
 2018-03-08 15:36:12 +01:00
Jack Ha
138f77179d CURA-4400 fix errors when switch or adding to new machine 2018-03-08 14:31:55 +01:00
Jack Ha
f576b1f117 CURA-4400 fix crash when switching from disabled 1st extruder to single extruder machine 2018-03-08 14:28:57 +01:00
Jack Ha
a9976e93c1 CURA-4400 fix per object setting change reslicing without reevaluate is non printing mesh all the time 2018-03-08 13:57:11 +01:00
Ian Paschal
ffccdd99c0 Added status icon 2018-03-08 10:55:29 +01:00
Jack Ha
3b8d470323 Merge branch 'master' into feature_enable_disable_extruder 2018-03-08 09:35:49 +01:00
Lipu Fei
2a10c9a2d7 Move assertion in _performMerge() 
CURA-5070
 2018-03-08 09:10:45 +01:00
Diego Prado Gesto
3629c3959e CURA-4870 Match the printer type in the dropdown with one of the 
available printer types in the group
 2018-03-07 22:33:15 +01:00
ChrisTerBeke
3d42849f90
Merge pull request #3418 from Ultimaker/docker 
Docker support
 2018-03-07 11:08:42 -08:00
Diego Prado Gesto
be8fc9f3f1 CURA-4870 Manage the case when there is an empty material or variant in the printer and Cura needs to apply this configuration 2018-03-07 19:59:06 +01:00
Diego Prado Gesto
e7294e1299 CURA-4870 Correctly look for the buildplate variants using the 
machine_buildplate_type that is also sent in the gcode and is the
information that Cura gets from connect.
Create a new dict in the VariantManager that maps the
machine_buildplate_type with the right container
 2018-03-07 18:52:48 +01:00
Diego Prado Gesto
97740123fa CURA-4870 Add information about the buildplate in the printer output 
model so it can be used to show the buildplate name in the configuration
list.
 2018-03-07 13:57:13 +01:00
Diego Prado Gesto
0beee79c3a CURA-4870 Revert skipping stack checks 2018-03-07 13:17:55 +01:00
Jack Ha
ff1c378c08 CURA-4400 fix start slicing when disabled extruder is incompatible 2018-03-07 11:38:35 +01:00
Jack Ha
4568fab531 CURA-4400 fix quality profiles model to not use disabled extruder and update Not Supported or select a valid quality when enabling/disabling extruder 2018-03-07 11:27:23 +01:00
Jack Ha
bab46d7048 CURA-4400 only reevaluate non printing mesh if the setting actually matters 2018-03-06 17:19:31 +01:00
Jack Ha
32ce458516 CURA-4400 solved merge conflict 2018-03-06 17:05:39 +01:00
Diego Prado Gesto
5280d21c26 Merge branch 'master' into feature_sync_button 2018-03-06 16:10:44 +01:00
Diego Prado Gesto
f625fa8a90 CURA-4870 Add function to set the configuration from the printer back to 
Cura.
Change the hash function to compare by GUID instead of type.
Show the material name instead of type in the list.
 2018-03-06 16:08:50 +01:00
Aleksei S
6bb42da056 Removed related commits to Settins per Object validation and 
added short validation in StartScliceJob
CURA-4972
 2018-03-06 15:40:26 +01:00
Lipu Fei
fb798ab7e5 Small refactor in MachineManager and add more loggings 
CURA-4606

 - Added more info loggings
 - Changed some variant names
 - Use some shortcut variables instead of getInstance()s
 2018-03-06 15:30:39 +01:00
Jack Ha
8ebd778224 CURA-4400 force update all settings if something changed with the extruder 2018-03-06 11:48:22 +01:00
ChrisTerBeke
96b40433a9 Merge branch 'master' into docker 2018-03-06 11:19:30 +01:00
Diego Prado Gesto
13e18c9d54 Merge branch 'master' into feature_sync_button 2018-03-06 10:24:11 +01:00
Diego Prado Gesto
731a1092c5 CURA-4870 Add callback function to apply remote configuration 2018-03-06 10:18:54 +01:00
Jack Ha
00a173b1bf CURA-4400 when enabling / disabling extruder, remove user changes that are no longer enabled 2018-03-06 09:55:43 +01:00
Diego Prado Gesto
d83eb383d9 CURA-4870 Fix an error in the hash function that detects a matching when 
the extruders are inverted.
Add pretty output to the configuration model.
 2018-03-06 08:44:43 +01:00
fieldOfView
6c1aee2c47 Update copyright 2018-03-05 23:55:23 +01:00