3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 15:13:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
4653 commits 307 branches 272 tags 787 MiB
Commit graph

2031 commits

Author SHA1 Message Date
fieldOfView
c1f3d1944b Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-07 15:51:36 +02:00
fieldOfView
1737d6bb56 Fix showing material options for 3rd party printers 
CURA-2287
 2016-09-07 15:51:08 +02:00
fieldOfView
bf394a42d5 Fix UMO-DualExtrusion prime tower location 
CURA-2283
 2016-09-07 15:26:51 +02:00
Aldo Hoeben
7edf36473d Fix merge mistake 2016-09-07 11:19:21 +02:00
Aldo Hoeben
33d9f94f5c Merge remote-tracking branch 'origin/2.3' 2016-09-07 11:14:42 +02:00
fieldOfView
a52bb1422b Suggest unique name when creating/duplicating profiles 
CURA-2161
 2016-09-06 17:46:11 +02:00
Jack Ha
9ab0cf9cb3 Merge branch '2.3' 2016-09-06 16:54:04 +02:00
fieldOfView
68ddf90d58 Make behavior of Create Profile consistent between prefs and menu 
CURA-2161
 2016-09-06 15:39:44 +02:00
fieldOfView
a40476eb62 Add distinctive titles to profile rename dialogs 
CURA-2161
 2016-09-06 15:38:27 +02:00
Ghostkeeper
c7514dfab9
Fix merge mistake 
I hadn't really figured out PyCharm's merge tool yet.
 2016-09-06 10:47:36 +02:00
Ghostkeeper
fcbf4a93f3
Merge branch '2.3' 
Conflicts:
	resources/qml/MonitorButton.qml
 2016-09-06 10:43:54 +02:00
Ghostkeeper
635f26da8e
Lower warning values for retraction speeds 
As discussed with David, the warning should really be quite a bit lower. No printers actually reach 100.

Contributes to issue CURA-2284.
 2016-09-06 10:30:28 +02:00
Ghostkeeper
6909f88ce6
Increase default limit on feed rate 
There is no real limit by default now. Only light speed (and the limit on the input element's length). The feed rate limit should be set by a machine definition. If there is no limit set, let there be no limit to what the user can input.

Contributes to issue CURA-2284.
 2016-09-06 10:30:27 +02:00
fieldOfView
b735d46e90 Show sidebar tooltips above messagestack 2016-09-05 20:35:20 +02:00
fieldOfView
b7605aecc2 Update wording 
The options listed under "Experimental" aren't all modes.
 2016-09-05 16:51:13 +02:00
Jaime van Kessel
122d117ef6 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-05 15:51:49 +02:00
Jaime van Kessel
de8785da37 All machines that suport USB connection now get the upgrade firmware action for free! 
CURA-955
 2016-09-05 15:48:31 +02:00
fieldOfView
938a2fc691 Update wording 
CURA-2157
 2016-09-05 15:38:56 +02:00
Thomas Karl Pietrowski
df519ed00a CURA-2157: Adding an confirmation dialog 
Tested while starting two prints and aborting them. The buttons for
"Yes" and "No" are translated by Qt5.
 2016-09-05 15:36:28 +02:00
Aldo Hoeben
56f81043ec Merge pull request #966 from thopiekar/master-CURA-2157 
CURA-2157: Adding an confirmation dialog
 2016-09-05 15:33:17 +02:00
Tim Kuipers
99a44fa1d2 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-05 14:39:11 +02:00
Tim Kuipers
c268fcd8c6 fix: wire printing height depends on nozzle head dist (CURA-1555) 2016-09-05 14:38:24 +02:00
Jaime van Kessel
3227507297 An empty quality container will now give a "not supported" warning 
CURA-2236
 2016-09-05 13:31:36 +02:00
Thomas Karl Pietrowski
48fd46d049 CURA-2157: Adding an confirmation dialog 
Tested while starting two prints and aborting them. The buttons for
"Yes" and "No" are translated by Qt5.
 2016-09-03 13:16:15 +02:00
Jaime van Kessel
405d3d920a Prime tower can no longer be printed outside build volume 
Note that it doesn't take disallowed area's into account
CURA-2234
 2016-09-02 13:31:29 +02:00
Jaime van Kessel
1a78aee46c fix typo 2016-09-02 11:37:54 +02:00
Jaime van Kessel
266f46ed55 Rename dialog shows again when creating new profile from current settings 
CURA-2220
 2016-09-02 11:37:06 +02:00
Jaime van Kessel
e5aa7ff18a Rename dialog shows again when creating new profile from current settings 
CURA-2220
 2016-09-02 11:30:50 +02:00
Jaime van Kessel
6c6ced4048 Undo changes made for debugging 2016-09-02 10:10:54 +02:00
fieldOfView
7961104a0c Disable material/variant combinations we have no profile for 
CURA-2236
 2016-09-01 15:39:24 +02:00
Simon Edwards
a2f478f2ad Fix for "Creating two profiles causes the names to become messed up" 
CURA-2220
 2016-09-01 13:49:29 +02:00
Jaime van Kessel
9d6c60ec60 Setting state is now set to calculated after setting the value 
This ensures that the setting of the value does not overide the state

CURA-2221
 2016-09-01 13:00:54 +02:00
Barry Stump
d8c7b325f0 update Printrbot Simple definition 
* Add platform mesh
* Default nozzle size is 0.4mm
* Updated start gcode to correct bed origin after auto-level
 2016-09-01 11:33:23 +02:00
Jaime van Kessel
34324586c2 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-01 11:26:34 +02:00
Jaime van Kessel
bef410b4a3 Machines are now flattened before merging them 
This ensures that machines are overwritten correctly

CURA-2108
 2016-09-01 11:26:13 +02:00
Jack Ha
e9d9597caa Commented out duplicate and import, on OS X 'visible' does not work 2016-09-01 11:22:38 +02:00
Jaime van Kessel
6ff258d7e0 Single extrusion machines now show correct values for profiles in tab 
CURA-2214
 2016-08-31 14:52:41 +02:00
Jack Ha
57f13869e6 For the beta release, removed duplicate and import material. 2016-08-31 12:47:21 +02:00
fieldOfView
25fb4d0b27 Show generic materials by display name instead of by material 2016-08-30 18:39:02 +02:00
fieldOfView
42010e34d2 Show material by its displayname instead of its color 2016-08-30 18:30:45 +02:00
fieldOfView
cb7a3de757 Code style 2016-08-30 16:02:08 +02:00
fieldOfView
ac7c1a92a5 Show "Create" only when there are user changes, "Duplicate" otherwise 
CURA-2220
 2016-08-30 15:58:16 +02:00
fieldOfView
b004c53c6d Fix upadting list of materials when switching printers 
CURA-2209
 2016-08-30 14:42:43 +02:00
fieldOfView
7aa44bdd9e Remove commented out code 2016-08-30 13:38:08 +02:00
fieldOfView
00250acb10 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-29 16:35:32 +02:00
fieldOfView
6c16d82736 Add material type as a column in the Material manager 
...and a color swatch for good measure.
 2016-08-29 16:35:10 +02:00
Jaime van Kessel
70af60c5fb Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-29 16:18:46 +02:00
Jaime van Kessel
9a753680e7 Setting pane now uses correct profiles to display setting values 
CURA-2185
 2016-08-29 16:18:15 +02:00
fieldOfView
8db0646266 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-29 15:35:31 +02:00
fieldOfView
71a77c1fb7 Decrease number of instances of InstanceContainerModel 
Updates to InstanceContainerModel are becoming expensive because there are so many instances of that model. The MaterialMenu used three, and the MaterialMenu is instantiated three times for a dual extrusion printer.

CURA-2193
 2016-08-29 15:35:14 +02:00