GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-05 06:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,447 Commits 289 Branches 260 Tags
Commit Graph

274 Commits

Author SHA1 Message Date
Jack Ha
090b8d4f50 Solved merge conflict. 2016-08-23 10:35:20 +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
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
fieldOfView
f9d00f57ce Revert "Removed superfluous M140 command" 
This reverts commit d36780ba54f0e208e6c7ff1b4b91c4ebdc0a7dc4.
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
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
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
fieldOfView
12d59cb465 Only show "Enable Prime Tower" setting for multiextrusion printers 
CURA-2126
 2016-08-16 10:58:37 +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
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
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
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
85a58a22cb Change "Bed"/"Platform" to "Build Plate" 
UXD-76
 2016-08-10 17:57:05 +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
Tim Kuipers
63f5889eae JSON fix type (CURA-1049) 2016-08-10 17:06:51 +02:00
Ghostkeeper
15fef2452b
Limit speeds to max feedrates of the printer 
Also number of slowdown layers is no longer limited by light speed.

Contributes to issue CURA-1049.
 2016-08-10 13:52:28 +02:00
Jaime van Kessel
967591bccb Infill pattern is now viewed from right stack again 
CURA-2072
 2016-08-09 17:20:37 +02:00
Tim Kuipers
6477e588da JSON feat: override max z feedrate (CURA-1049) 2016-08-08 17:02:49 +02:00
Tim Kuipers
ca8ded6c35 JSON fix: support z dist defaults to 1 layer instead of 2 (CURA-1283) 2016-08-08 13:23:03 +02:00
Ghostkeeper
d98c122bd5
Disable extruder selection drop-downs in single-extrusion machines 
They don't function in single-extrusion machines.
 2016-08-08 12:56:45 +02:00
Tim Kuipers
c57f13b3d3 JSON fix: turn off flow equalization by default (CURA-2065) 2016-08-08 10:13:14 +02:00
Tim Kuipers
4f3b6e254e Merge branch 'mergeinfillchanges' of https://github.com/markwal/Cura into markwal-mergeinfillchanges 2016-08-08 09:37:49 +02:00
fieldOfView
fa0d8f912f Don't show UMO upgrades page for UMO+ 2016-08-05 16:02:10 +02:00
Ghostkeeper
09801db5f8
Fix support interface density and pattern global inherits stack 
These depend on values that are obtained through global_inherits_stack, so they must also have global_inherits_stack.

Contributes to issue CURA-2024.
 2016-08-05 13:48:04 +02:00
Mark Walker
a485b58051 Move equalize_flow settings ahead of acceleration 
And add "the print speed" to the description
 2016-08-04 12:18:53 -07:00
Mark Walker
1e62b43d53 Rename pressure to flow 2016-08-04 10:54:04 -07:00
Mark Walker
eddbc87ceb New settings to allow control over automatic speed 
changes when MergeInfillLines adjusts speed for even pressure when
changing extrusion widths.
 2016-08-04 10:34:53 -07:00
Ghostkeeper
93f6f5d8d3
Don't use extruderValue on settings that have no global_inherits_stack 
It's unnecessary and seems to break things.

Contributes to issue CURA-2024.
 2016-08-04 16:54:43 +02:00
Jack Ha
2402ba3d0e Bed temperature is now either a resolved value or a global value. 
Contributes to CURA-2007
 2016-08-04 14:30:48 +02:00
Ghostkeeper
f3a119f9bb
Use correct extruder's value when inheriting global_inheritance_stack settings 
This uses the new function extruderValue() which picks the value from a different extruder. Every setting that has the global_inheritance_stack property is now referenced via the extruderValue() setting in all functions.

Contributes to issue CURA-2024.
 2016-08-04 13:35:13 +02:00
Ghostkeeper
b89a9a8113
Allow freezing temperatures 
But not on Ultimaker printers, because they crash.
 2016-08-04 12:50:03 +02:00
Ghostkeeper
eeec460635 Merge branch 'feature_support_bottoms' 2016-08-03 17:40:28 +02:00
Arjen Hiemstra
78aaf4caf0 Use the new extruderValues() function to determine max_warning of layer_height 
Contributes to CURA-2009
 2016-08-02 19:42:40 +02:00
Tim Kuipers
401e302ad5 Merge branch 'master' into feature_support_bottoms 2016-08-02 12:46:44 +02:00
Tim Kuipers
dc3d22f148 JSON: disabled flow temp again (CURA-1174) 2016-08-02 11:48:47 +02:00
fieldOfView
a2fa8246b6 Disable UM2 material-related settings depending on gcode flavor... 
...instead of hardcoding them as disabled.

The fdmprinter inheritance-functions for "enabled" are combined with a check for the flavor. This way it will be easier to switch an UM2 to a functional Reprap flavor in a variant. CURA-580
 2016-08-02 09:50:42 +02:00
fieldOfView
42fc25ab09 Move sorting of DefinitionContainerModel out of qml 
Add printer dialog now has sections by a configurable metadata property. A prefered section is set to always show on top.
Add weights to the Ultimaker printer definitions to create a sensible list (newest on top).

CURA-1593
 2016-08-01 19:18:56 +02:00