Commit graph

12854 commits

Author SHA1 Message Date
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
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
Jaime van Kessel
d4c55d635e Adhesion settings now inherit from the correct stack
CURA-2202
2016-08-29 13:30:46 +02:00
fieldOfView
7a1f7b3654 Make automatic drop to buildplate optional. 2016-08-28 16:30:22 +02:00
Jaime van Kessel
af4ea9183c Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-26 16:23:47 +02:00
fieldOfView
3b1c11bfcf Put materials into branded material submenus
CURA-2194
2016-08-26 15:43:50 +02:00
Jaime van Kessel
fcfbf78f9e Implemented importing multiple profiles from .curaprofile file
CURA-2099
2016-08-26 14:37:21 +02:00
fieldOfView
e19a7914b1 Prevent error when the active printerOutputDevice has no cameraImage 2016-08-26 13:21:32 +02:00
Jaime van Kessel
ced6cd7320 Exporting a profile now exports all profiles in a zipped container
CURA-2099
2016-08-26 12:55:31 +02:00
fieldOfView
0799a9e278 Move branded materials into a submenu
CURA-2194
2016-08-26 11:59:19 +02:00
Ghostkeeper
e9dc05c8dc Merge branch 'master' of https://github.com/innovo3d/Cura into innovo3d-master 2016-08-26 10:15:57 +02:00
Jaime van Kessel
8046e72a10 Added missing file 2016-08-26 09:35:21 +02:00
Jaime van Kessel
e6aec0c64b Use curas own visibility page instead of default by Uranium 2016-08-25 21:21:44 +02:00
Jaime van Kessel
f963ab0fde Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-25 20:46:52 +02:00
Jaime van Kessel
c7126775d5 Fix spelling mistake 2016-08-25 20:46:36 +02:00
fieldOfView
94b8e1aff0 Add UM2Ex+ profiles for Nylon, PC, CPE+ and TPU
Contributes to CURA-2138. Ideally these would not have to be copies from the UM2+ profiles. This should be picked up for CURA-1780
2016-08-25 17:07:28 +02:00
fieldOfView
1b4283257f Make Simple Mode reflect global settings (Support, Adhesion) 2016-08-25 13:41:39 +02:00
fieldOfView
983d0dd999 Merge commit 'dd647ca07c' 2016-08-25 10:55:31 +02:00
Jack Ha
77b58d8231 MaterialsPage material label is now also updated after rename. CURA-1969 2016-08-25 10:37:11 +02:00
Jack Ha
2ae998737f Added materialspage Display Name field and made it work. CURA-1969 2016-08-25 09:54:22 +02:00
innovo3d
2e5ffbfe54 Another update to Inventor Json file
Added speed support interface speed
2016-08-24 18:54:37 -05:00
innovo3d
c3ae924ae5 Updated innovo_inventor.def.json settings
Added M140 to turn off heated bed
Changed default extruder temp to 205
Changed print speed defaults
Removed infill overlap override
Removed machine preferences
2016-08-24 18:48:11 -05:00
Ghostkeeper
e460db0704
Update translation templates
These are not the final templates for the next version, but they are what we used for an inventory of the translation costs. I generated them. Might as well just commit the changes.
2016-08-24 16:25:39 +02:00
Jaime van Kessel
a904067d7a Added label property to XML profile (as per 1.2 spec)
CURA-1968
2016-08-24 15:50:12 +02:00
Jaime van Kessel
aa28ecca37 No longer possible to remove profiles that are in use
CURA-2168
2016-08-24 14:50:51 +02:00
Jaime van Kessel
17b34fb4e1 It's no longer possible to remove a material that is in use
CURA-2168
2016-08-24 14:48:20 +02:00
Jaime van Kessel
a177b61153 Renaming a profile will now also reset selection
This forces an update of the display data. Fixes CURA-2164
2016-08-24 13:56:51 +02:00
Jaime van Kessel
aac19c94a3 Removing a profile now forces a reset of selection
Fixes CURA-2169
2016-08-24 13:51:33 +02:00
Jaime van Kessel
e05bb54047 SelectContainer now uses name instead of ID
CURA-2162
2016-08-24 13:21:53 +02:00