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

12848 commits

Author SHA1 Message Date
Ghostkeeper
9581257df5
Don't bind provider when setting is per mesh 
This causes settings which are settable per mesh but not per extruder to be configurable per extruder even though they have a linked icon.

Contributes to issue CURA-2006.
 2016-08-23 11:53:57 +02:00
Jack Ha
090b8d4f50 Solved merge conflict. 2016-08-23 10:35:20 +02:00
fieldOfView
0f998c6e2e Fix qml warnings 
CURA-2006
 2016-08-22 19:25:42 +02:00
fieldOfView
62e815a3d8 Fix qml warning 
CURA-2006
 2016-08-22 19:16:59 +02:00
fieldOfView
b9af9dce1f Tweak profile overview layout 
CURA-2006
 2016-08-22 19:00:49 +02:00
fieldOfView
3671d241d5 Show color + material in menus and Materials page 
CURA-2108
 2016-08-22 17:34:33 +02:00
fieldOfView
cb6353ba2a Fix machine_has_heated_bed default 2016-08-22 17:16:08 +02:00
fieldOfView
5bf19f9ff2 Fix preferred material for cases when there more than 1 "pla" materials 2016-08-22 17:12:39 +02:00
fieldOfView
320cddb073 Don't show "nozzle" on Materials page when there are no variants 2016-08-22 16:41:21 +02:00
fieldOfView
c32700b7b4 Fix "Set as Active Extruder" menu item 2016-08-22 16:30:34 +02:00
fieldOfView
900f953298 Make sure extruder menus are only shown if there the machine extruders 2016-08-22 16:15:59 +02:00
Ghostkeeper
bb90c593b9 Merge branch 'feature_quality_changes' 2016-08-22 15:13:27 +02:00
Ghostkeeper
f296b77d2c
Fix check for presence of global_inherits_stack 
My mistake.

Contributes to issue CURA-2006.
 2016-08-22 14:17:47 +02:00
Ghostkeeper
42399e82fb
) 
Contributes to issue CURA-2006.
 2016-08-22 11:36:33 +02:00
Ghostkeeper
1c1bfbe114
Fix providing of global_inherits_stack settings 
I've rewritten this part and documented what each case catches. There is a base case which is not required any more since we removed the global tab, but I left it in for defense.

Contributes to issue CURA-2006.
 2016-08-22 11:34:17 +02:00
fieldOfView
1003066ce1 Show qualities for the material associated with the currently selected quality 
CURA-2095
 2016-08-22 11:31:31 +02:00
fieldOfView
7efde6b164 Prevent qml warning when no printer is connected 2016-08-20 23:42:51 +02:00
fieldOfView
2f3f57c43d Code-style 2016-08-20 23:40:43 +02:00
fieldOfView
a1c3b8f3a8 Update start- & and gcode and change extruder names 
CURA-1774
 2016-08-20 17:20:51 +02:00
fieldOfView
9f34e06cb6 Add prime tower and extruder switch position 
CURA-1774
 2016-08-20 14:31:18 +02:00
Ghostkeeper
eaa7d716f5 Revert "Properly send global settings to the global stack" 
This reverts commit 9d0acf5b03.
It was not so proper after all.

Contributes to issue CURA-2006.
 2016-08-19 15:48:35 +02:00
Jaime van Kessel
286949dad1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-19 09:36:56 +02:00
fieldOfView
7affff53ba Merge commit 'ec04b414ec' 2016-08-18 17:48:48 +02:00
fieldOfView
f9d00f57ce Revert "Removed superfluous M140 command" 
This reverts commit d36780ba54.
One was M104, the other was M140. I am not dyslecitc, my mother had me tested.
 2016-08-18 17:39:22 +02:00
fieldOfView
49c885923a Update machine_identifiers 2016-08-18 17:10:45 +02:00
fieldOfView
47fde625ba Merge commit '8d00e28fb0' 
# Conflicts:
#	resources/materials/generic_abs.xml.fdm_material
#	resources/materials/generic_cpe.xml.fdm_material
#	resources/materials/generic_pla.xml.fdm_material
 2016-08-18 16:42:59 +02:00
fieldOfView
2ff4e70c17 Merge changes from fdm_materials repo 2016-08-18 15:35:53 +02:00
fieldOfView
37e9382ce8 Remove unused "machine_preferences" section 2016-08-18 13:27:45 +02:00
fieldOfView
d36780ba54 Removed superfluous M140 command 2016-08-18 13:20:55 +02:00
fieldOfView
6e422e611c Change Simple Mode "print brim" to print a brim or raft 
CURA-2135
 2016-08-18 13:11:14 +02:00
Jaime van Kessel
eae2e0da90 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-18 12:44:53 +02:00
fieldOfView
ad001c71be Simplify use of ExtrudersModel 2016-08-18 12:30:13 +02:00
fieldOfView
4d7474b412 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-18 11:53:25 +02:00
fieldOfView
9b0e5f5a8d Simplify checking if a plugin exists 2016-08-18 11:53:10 +02:00
Jaime van Kessel
37e4b9e940 Duplicating a container no longer forces unique GUID 
CURA-1969
 2016-08-18 10:55:51 +02:00
innovo3d
a8109f6267 Update def.json and STL file 
Updated JSON file:
- changed machine center is zero to true
- added turn heated bed off to end g code
- changed top/bottom thickness from 0.3 to 1.2mm
- added machine preferences as I did in 2.1 (is this still used?)

Updated STL file.  The last file was 13mb! this one is 810kb!
 2016-08-17 16:38:22 -05:00
Jaime van Kessel
e0ef1c3e9d Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-17 12:33:30 +02:00
Jaime van Kessel
f1f9f93fa4 Re-enabled prime position 
CURA-2130
 2016-08-17 12:33:00 +02:00
Jaime van Kessel
6b4e0740a3 Merge pull request #924 from Ultimaker/feature_machinesettings 
Machine Settings plugin
 2016-08-17 09:34:11 +02:00
Jack Ha
07f2b2be95 More quality_types for more material/qualities. CURA-2006 2016-08-16 15:41:52 +02:00
Jack Ha
8c0837d75d Merge master. CURA-2006 2016-08-16 15:08:25 +02:00
Jack Ha
a27f2e8794 Added quality_type properties to printers. 2016-08-16 13:19:03 +02:00
fieldOfView
105541ed07 Hide "0%" progress while in pre_print state 
CURA-1963
 2016-08-16 11:19:50 +02:00
fieldOfView
12d59cb465 Only show "Enable Prime Tower" setting for multiextrusion printers 
CURA-2126
 2016-08-16 10:58:37 +02:00
fieldOfView
8c63216fdf Get how we name variants from the machine definition 
CURA-2116
 2016-08-16 10:18:57 +02:00
fieldOfView
c60ddbecfb Make sure a machine is always selected on the Printers page 
CURA-2085
 2016-08-15 18:07:00 +02:00
fieldOfView
fcfcfa37fb Tweak monitor items for long jobnames 
CURA-2125
 2016-08-15 17:09:29 +02:00
fieldOfView
6220976f03 Add a custom machine definition 
CURA-580
 2016-08-15 16:15:31 +02:00
fieldOfView
f2a44bec8d Add missing material_bed_temp_prepend 2016-08-15 15:55:45 +02:00
fieldOfView
b7b0faf44a Fix sorting of settings on Profile manager page 
CURA-2123
 2016-08-15 15:17:59 +02:00