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

1965 Commits

Author SHA1 Message Date
fieldOfView
1b4283257f Make Simple Mode reflect global settings (Support, Adhesion) 2016-08-25 13:41:39 +02:00
fieldOfView
983d0dd999 Merge commit 'dd647ca07c243efe6ee24b42513285ece863035a' 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
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
Jaime van Kessel
114899dc91 Merge branch 'cura-2007' of github.com:Ultimaker/Cura 2016-08-24 12:39:33 +02:00
Jack Ha
9521a85318 Fix resolve in profile bug. Removed unnecessary imports. Removed unnecessary watch. Contributes to CURA-2007 2016-08-24 11:36:10 +02:00
fieldOfView
27b3bd829d Add converted CPE+, PC, TPU & Nylon profiles for UM2+ 
CURA-2138
 2016-08-23 23:03:17 +02:00
fieldOfView
35fedbdad6 Don't break the currentExtruderIndex binding 
CURA-2177
 2016-08-23 17:12:55 +02:00
Jack Ha
0268bf3f56 Cleanup. CURA-2007 2016-08-23 13:18:20 +02:00
Ghostkeeper
8fd3047380
Only take the active machine if not settable per extruder 
Settable per mesh should only have an effect on the per-object settings. This was misguided of me earlier.

Contributes to issue CURA-2006.
 2016-08-23 11:53:57 +02:00
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 9d0acf5b036ee4749af0034969c683e39cc547d3.
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 'ec04b414ecdc78e31f8de120c197fb48dcc3cb77' 2016-08-18 17:48:48 +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
49c885923a Update machine_identifiers 2016-08-18 17:10:45 +02:00
fieldOfView
47fde625ba Merge commit '8d00e28fb0c9198874c4d66ba5e75028c4f6c207' 
# 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