3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 06:33:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
14696 commits 305 branches 272 tags 787 MiB
Commit graph

14696 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ghostkeeper
1512a8096b
Require MaterialGroup to always have a base material 
The material group is loaded lazily whenever the base material is not yet in the dictionary.

Contributes to issue CURA-4606.
 2018-03-12 15:43:42 +01:00
Lipu Fei
c54679ba2d Gix buildplate handling in Material profile 
CURA-4606
 2018-03-12 15:25:29 +01:00
Lipu Fei
220e4a64c6 Fix VariantManager.getVariant() and simplify NozzleModel 
CURA-4606
 2018-03-12 15:25:29 +01:00
Jack Ha
c4fb15a569 CURA-4400 resolve merge conflict 2018-03-12 15:18:35 +01:00
Jack Ha
81d036d5e4 Merge branch 'master' into feature_enable_disable_extruder 2018-03-12 15:15:27 +01:00
Aleksei S
c3b659c5d4 Fix: reset icon dissapears for default values 
CURA-5059
 2018-03-12 15:15:19 +01:00
Diego Prado Gesto
da54c93fda CURA-4870 Remove commented code 2018-03-12 15:12:27 +01:00
Diego Prado Gesto
96fcfd9e2f Merge branch 'feature_sync_button' of github.com:Ultimaker/Cura into feature_sync_button 2018-03-12 15:11:11 +01:00
Diego Prado Gesto
55c3f06e73 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-12 15:10:43 +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
Ghostkeeper
bb7fccbd48
Add logging for every setting model update 
You can clearly see that some models are updated 4 times or so now.

Contributes to issue CURA-4606.
 2018-03-12 14:48:56 +01:00
Ian Paschal
a5ba4799f0 CURA-4870 Final icon changes from Luke 2018-03-12 14:48:39 +01:00
Diego Prado Gesto
cc009a94ee CURA-4870 Remove "check compatibility" message. 
Move the buildplate information to the bottom, below the extruders.
 2018-03-12 14:19:06 +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
e0e2d3362b CURA-4400 fix for change in fdmprinter: move -1 from default_value to value 2018-03-12 13:30:31 +01:00
Diego Prado Gesto
ec2201b57c CURA-4870 Move the printer type and the buildplate selector to the top 
of the sidebar and set them separate from the extruder related
selectors.
 2018-03-12 11:57:53 +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
Mark Burton
88c2e37ce4 Added wall_min_flow and wall_min_flow_retract settings. 
Wall lines whose flow is < wall_min_flow are converted into travel moves.
 2018-03-12 10:25:39 +00:00
Jack Ha
1f8be6ad3c CURA-4400 moved default extruder value to value instead of default_value because of engine 2018-03-12 11:05:55 +01:00
Jack Ha
3edc96ec8f CURA-4400 fixed wrongly converted expression 2018-03-12 10:47:23 +01:00
Diego Prado Gesto
9613103591 CURA-4870 Remove Monitor stage status icons 2018-03-12 10:45:49 +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
Ghostkeeper
d98cab48ac
Get scripts from either Resources or Preferences 
We must retain the old directory for legacy. People might still have scripts there.
 2018-03-12 09:48:03 +01:00
Ghostkeeper
a3efbc70fb
Merge branch 'fix_postprocessing_script_path' of https://github.com/fieldOfView/Cura into fieldOfView-fix_postprocessing_script_path 2018-03-12 09:42:21 +01:00
Ghostkeeper
15212d4426
Align for readability 2018-03-12 09:38:20 +01:00
Ghostkeeper
aae8a31f00
Don't display extruder count if you can't use it 
If your printer can only handle one extruder, don't display this drop-down. Don't let users get confused.
 2018-03-12 09:23:25 +01:00
Mark Burton
239961cc48 Merge remote-tracking branch 'upstream/master' into mb-retract-on-long-combs 2018-03-12 08:22:53 +00:00
Mark Burton
b732a84a6a Added retraction_combing_max_distance setting. 
When this is non-zero, combing travel moves that are longer will use retraction.
 2018-03-12 08:21:11 +00:00
Jack Ha
d70cc072e9 Merge branch 'master' into feature_enable_disable_extruder 2018-03-12 09:06:24 +01:00
Ryan
4d5ace4564 Added default material diameter to SeeMeCNC printer definitions 2018-03-11 10:27:57 -04:00
Timur Tabi
5e4e049c1f Add definition for Printrbot Simple Maker's Kit 1405 
The Printrbot Simple Maker's Kit, model 1405, was a low-cost FDM printer
without a heated bed and a 10x10cm print area.

The print area can be extended to 185x100mm with the "Printrbot Simple XL
Upgrade with Spool Rack for Maker's Kit 1405".

More information can be found at http://printrbot.com/project/simple-makers/
 2018-03-10 14:57:03 -06:00
Lipu Fei
7312ed8e3c Fix project loading for version upgrade 
CURA-5054
 2018-03-09 19:35:23 +01:00
Lipu Fei
e09325bf82 Fix project loading for version upgrade 
CURA-5054
 2018-03-09 17:16:27 +01:00
Diego Prado Gesto
85d6919ce6 Merge branch 'master' into feature_sync_button 2018-03-09 16:59:18 +01:00
fieldOfView
e62ed62bdd Remove duplicate import 2018-03-09 16:57:09 +01:00
fieldOfView
7123441db8 Fix keeping settings visible when showing all settings 2018-03-09 16:51:46 +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
Diego Prado Gesto
472ae8e044 CURA-4870 Create a custom model for the machines in order to show the 
printers grouped by local or networked.
 2018-03-09 16:35:23 +01:00
Lipu Fei
c41af83b41 Fix create quality changes for extruders 
CURA-5054
 2018-03-09 16:29:49 +01:00
Ghostkeeper
2f1657f848
Update version numbers in variants 
These didn't match on my initial search-and-replace so I missed them.

Contributes to issue CURA-5054.
 2018-03-09 16:23:38 +01:00
Ghostkeeper
cf21e7c74b
Also upgrade definition_changes and user 
Because these files share their version numbers with quality changes.

Contributes to issue CURA-5054.
 2018-03-09 16:21:42 +01:00
Ghostkeeper
d8a066c1e7
Increment instance container version number instead of just quality_changes 
Otherwise when we load that quality_changes file we'll deny it because the instance container version number is wrong.

Contributes to issue CURA-5054.
 2018-03-09 16:14:24 +01:00
Ghostkeeper
3a832d66a9
Safer check for extruder vs. global 
Because it might be an empty string.

Contributes to issue CURA-5054.
 2018-03-09 16:07:54 +01:00
Ghostkeeper
b797ac1a15
Read only position from metadata 
We now determine whether this is a global or an extruder profile based on whether the position metadata field is present, instead of whether the extruder metadata field is present.

Contributes to issue CURA-5054.
 2018-03-09 16:07:06 +01:00
Ghostkeeper
5d2e98cdd4
Translate to American English 
The spelling in AmE is with a Z.
 2018-03-09 15:55:27 +01:00
fieldOfView
4c66c935af Merge branch 'master' into feature_setting_visibility_profiles 2018-03-09 15:45:24 +01:00