Commit graph

3125 commits

Author SHA1 Message Date
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
fieldOfView
f0622cdda6 Add start & end gcode to UM2 depending on gcode flavor
CURA-580
2016-08-15 13:42:06 +02:00
Aldo Hoeben
f2d35cd57d Merge pull request #918 from Ultimaker/feature_terminology
Update UI texts to be compliant to Ultimaker dictionary
2016-08-15 11:35:19 +02:00
fieldOfView
633e37713c Update Printer manager details pane after removing a printer
CURA-2085
2016-08-15 11:32:09 +02:00
Jack Ha
5a92269a08 Testing. CURA-2007 2016-08-15 09:32:51 +02:00
Jack Ha
4ea9276682 Merge branch 'master' into cura-2007 2016-08-15 09:16:04 +02:00
Ghostkeeper
4472e0206e
Fix calls to max function
I think this was my mistake.
2016-08-12 16:56:07 +02:00
Tim Kuipers
85d97453f1
JSON feat: brim only on outer boundary polys (CURA-1413) 2016-08-12 11:18:37 +02:00
Thomas Karl Pietrowski
bfe97a1eca Using ~ only for the amount of material in grams 2016-08-11 21:10:16 +02:00
Thomas Karl Pietrowski
1ab0637d11 Adding "approximately equal" to the amount of material needed
I think it makes sense to add this character here, because the amount needed is only a approximated value, and without the end-user might expect a more accurate value.
2016-08-11 20:34:01 +02:00
Arjen Hiemstra
2969aafb6d Update profile page with the renamed functions
Contributes to CURA-2006
2016-08-11 17:51:16 +02:00
Arjen Hiemstra
6778020d56 Remove duplicated code
Contributes to CURA-2006
2016-08-11 17:47:30 +02:00
Arjen Hiemstra
e1ddb878ad Fix copyright header
Contributes to CURA-2006
2016-08-11 17:47:15 +02:00
fieldOfView
6075536497 Fix settingtextfield validator in PerObjectSettings
CURA-2115
2016-08-11 14:37:58 +02:00
fieldOfView
71a9f2dd7a Clean up conversion to string
CURA-2071
2016-08-11 11:53:55 +02:00
Ghostkeeper
8c231e2942
Allow higher speeds for diagonal wireframe moves
Since these moves are slightly diagonal in all directions, a higher speed can be achieved. Exactly how high depends on both angles, but for simplification this limit is a bit too broad, allowing speeds that the printer can't handle. The firmware should catch that case if it happens.

Contributes to issue CURA-1049.
2016-08-11 10:54:00 +02:00
Ghostkeeper
4e13c262cf
Re-add max warning value for speed_slowdown_layers
It warns if the slowdown layers span more than 1mm.

Contributes to issue CURA-1049.
2016-08-11 10:53:59 +02:00
fieldOfView
957f60eb11 Add first draft of an UMO with Dual Extrusion Kit definition
CURA-1774
2016-08-10 18:04:30 +02:00
fieldOfView
6d64d11c2e Change Simple Mode adhesion/support label to "Helper Parts"
UXD-76
2016-08-10 17:57:06 +02:00
fieldOfView
85a58a22cb Change "Bed"/"Platform" to "Build Plate"
UXD-76
2016-08-10 17:57:05 +02:00
fieldOfView
505da1a9a7 Change "Hotend temperature" to the name of the extruder
UXD-79
2016-08-10 17:55:52 +02:00
fieldOfView
2963a64fc2 Change "Bed Temperature" to "Build Plate Temperature"
UXD-80
2016-08-10 17:55:52 +02:00
fieldOfView
885acb49dc Change "Cooling Fans" to "Print Cooling"
UXD-81
2016-08-10 17:55:51 +02:00
fieldOfView
7aab8ad397 Change "object" to "model"
UXD-83
2016-08-10 17:55:51 +02:00