Jaime van Kessel
fcf3caba5a
Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3
2016-10-28 10:46:37 +02:00
Jaime van Kessel
74d8148e0c
The right stack is now used for limit to extruder setting property provider for single extrusion machine
...
This was mostly an issue when switching between printers, where some ids were set to undefined. CURA-2835
2016-10-28 10:44:57 +02:00
Ghostkeeper
717248bd78
Limit number of special characters
...
There is also a more advanced attempt that allows more, but I've commented it out because it doesn't quite work yet. Special characters now always count for 12.
Contributes to issue CURA-2652.
2016-10-27 21:55:58 +02:00
Jaime van Kessel
1aa71d6171
Profiles model is now a singleton, to prevent the agressive garbage collecting to break stuff
...
CURA-2826
2016-10-27 14:26:43 +02:00
Jaime van Kessel
4a5d7cbc73
Bindings of inheritance icon now correctly update when switching between machines
...
CURA-2752
2016-10-27 13:08:10 +02:00
Jaime van Kessel
b381186331
Set um2+ height to same as um2
2016-10-27 13:02:38 +02:00
Ghostkeeper
07e7521792
Fix spelling mistake
...
This is not a bijvoeglijk naamwoord, so it must not get an E at the end.
Contributes to issue CURA-2751.
2016-10-26 13:41:23 +02:00
Ghostkeeper
53a4e5e6c0
Remove infill_overlap_mm from Nylon profiles
...
This is the result of this week's profile updates from our material tests.
2016-10-26 11:15:14 +02:00
Simon Edwards
cc33b3be22
Change for the "Advanced" tab to "Custom".
...
CURA-2751 Change settings label "Simple" to "Recommended"
2016-10-26 10:43:00 +02:00
Ghostkeeper
861837ef41
Make generic quality profiles global
...
This way they will also be put in the global profile.
Contributes to issue CURA-2723.
2016-10-26 09:43:11 +02:00
Arjen Hiemstra
30e14478af
Replace quality profiles with optimised versions of Ruben's script
...
With the global quality profiles merged this now works properly.
CURA-2645
2016-10-25 15:40:52 +02:00
Arjen Hiemstra
b0d6d7034a
Ensure we re-evaluate the inheritance icon binding when it changes
...
Contributes to CURA-2752
2016-10-25 13:11:04 +02:00
fieldOfView
29b357894d
Fix homing UM2/UM2+ when printing with RepRap flavor
2016-10-25 11:57:15 +02:00
Arjen Hiemstra
bef3666a88
Still show the inherit button even when the revert is visible
...
It was not a bug like I assumed
Contributes to CURA-2752
2016-10-25 11:40:05 +02:00
Arjen Hiemstra
8ce81fec9f
Expand logic for showing the inherit button in SettingItem
...
Hide it if the revert button is visible and make the overrides check
limit_to_extruder in addition to the active stack.
Contributes to CURA-2752
2016-10-24 17:10:26 +02:00
Arjen Hiemstra
588f49fa5f
Add global profiles for UM3 so this can be tested without dependencies
...
Contributes to CURA-2652
2016-10-24 11:19:49 +02:00
Tim Kuipers
2bff94ba9f
Revert "JSON feat: carve_multiple_volumes (CURA-2712)"
...
This reverts commit 8ee22738bc
.
2016-10-21 16:20:39 +02:00
Tim Kuipers
8ee22738bc
JSON feat: carve_multiple_volumes (CURA-2712)
2016-10-21 16:07:03 +02:00
Ghostkeeper
19678c1126
Display layer height after profile name in drop-down
...
There is no styling in this drop-down, as it is provided by the OS. Just a dash and the layer height will do.
Contributes to issue CURA-2737.
2016-10-21 14:00:43 +02:00
Ghostkeeper
afd3dd6eec
Make separate theme colour for detail text
...
I would use the normal font colour with a lower alpha value here, but it seems that rendering text with transparency doesn't work in Qt.
Contributes to issue CURA-2737.
2016-10-21 13:06:49 +02:00
Ghostkeeper
57b0275384
Show layer height in profile selection menu
...
It's shown in the 'inactive' font colour, which isn't entirely semantically correct but has the behaviour we want regardless of how the theme changes in the future.
Contributes to issue CURA-2723.
2016-10-20 17:16:06 +02:00
Ghostkeeper
de45d25f0b
Update material profiles for ABS
...
This is a weekly update from Tom.
2016-10-20 14:01:30 +02:00
Simon Edwards
d228f6ce9f
CURA-2751 Change settings label "Simple" to "Recommended"
2016-10-20 12:51:19 +02:00
Ghostkeeper
aa9516451d
Merge branch '2.3.1' into 2.3
2016-10-20 11:04:28 +02:00
Ghostkeeper
35430a5e9e
Add missing Ultimaker 3 platform mesh
...
Forgot to commit that one.
Contributes to issue CURA-2737.
2016-10-19 14:53:09 +02:00
Ghostkeeper
1eab172f7c
Remove duplicate materials from Cura
...
These should get installed from the fdm_materials repository now, so it shouldn't be complaining about any missing files... Let's see what the build server thinks of that.
Contributes to issue CURA-2737.
2016-10-19 14:50:41 +02:00
Ghostkeeper
06ff2a9da6
Publish Ultimaker 3 definitions and profiles
...
The Ultimaker 3 is now released, so we can make this data public. These are the Ultimaker 3 definition files (with their physical properties as Cura requires them, such as build volume) as well as its extruders, print cores, quality profiles and build plate mesh. And also for the Ultimaker 3 Extended. Modifications to the material profiles will be published in the fdm_materials repository.
Contributes to issue CURA-2737.
2016-10-19 13:35:00 +02:00
Ghostkeeper
d79a3add40
Update warning for material change on printer again
...
It's been changed 7 times since the last update in Cura. I hope that our new UX makes up his mind.
Contributes to issue CURA-2634.
2016-10-19 13:15:52 +02:00
Ghostkeeper
6b7ecfb4e0
Update warning for material change on printer
...
When the material changed on the printer, this dialogue is shown. It needed to have new text.
Contributes to issue CURA-2634.
2016-10-19 13:15:52 +02:00
Ghostkeeper
2dda58a951
Update terminology of PrintCore to print core
...
Contributes to issue CURA-2632.
2016-10-19 13:15:52 +02:00
Ghostkeeper
f277b24290
Fix typo in English translation
...
Can't fix the actual typo in code due to the string freeze though.
Contributes to issue CURA-570.
2016-10-19 13:15:52 +02:00
Ghostkeeper
6434948bfd
Make Dutch translation consistent
...
Capitalisation issues abound. Also a few translations itself.
Contributes to issue CURA-570.
2016-10-19 13:15:52 +02:00
Ghostkeeper
cea0d5165f
Missed a capital letter
...
As did the translation bureau...
Contributes to issue CURA-570.
2016-10-19 13:15:52 +02:00
Ghostkeeper
10347011f7
Improve Dutch translation
...
Many consistency issues, mainly with capital letters.
Contributes to issue CURA-570.
2016-10-19 13:15:52 +02:00
Ghostkeeper
9cb3fb8990
Fix inconsistencies in Dutch translation
...
Only the Cura translation was checked so far...
Contributes to issue CURA-570.
2016-10-19 13:15:52 +02:00
Ghostkeeper
af5216490e
Remove duplicate strings
...
These were giving problems when you generate the .mo files.
Contributes to issue CURA-570.
2016-10-19 13:15:52 +02:00
Ghostkeeper
cc92d22e51
Add translation for UM3NetworkPrinting plug-in
...
These translations have not yet been checked. I'll get to that now.
Contributes to issue CURA-570.
2016-10-19 13:15:52 +02:00
Tim Kuipers
c7c3d24974
fix: adhesion_extruder_nr moved category also for default visibility (CURA-2707)
2016-10-19 13:14:22 +02:00
Tim Kuipers
8cebaedd0c
JSOn refactor: moved support extruder settings to support catgegory (CURA-2707)
2016-10-19 13:14:06 +02:00
Tim Kuipers
9780895812
JSON fix: retraction_hop_after_extruder_switch only visible for dual extrusion (CURA-2727)
2016-10-19 13:05:10 +02:00
Tim Kuipers
aad3da85e9
JSON refactor: move retraction_hop_after_extruder_switch to Travel category (CURA-2727)
2016-10-19 12:59:28 +02:00
Simon Edwards
9e6f340943
Move z hop settings to Travel category
...
CURA-2727
2016-10-18 15:49:03 +02:00
fieldOfView
d3e3c0c659
Fix translation of machines page and some other references to Uranium
...
CURA-570
2016-10-18 15:34:52 +02:00
Jack Ha
9195961806
Fixed translation of 4 words in profilespage. remains of CURA-570
2016-10-18 15:05:18 +02:00
Jaime van Kessel
3afd813e5e
Profiles page is now correctly updated when single extrusion machine is used
2016-10-15 19:23:07 +02:00
Jaime van Kessel
d12219cab8
Right profile is now checked again in dropdown
...
CURA-2690
2016-10-15 17:10:26 +02:00
Jaime van Kessel
ff24def63c
Use globalProfileId to check if we need to show changed settings
...
CURA-2690
2016-10-15 17:05:55 +02:00
fieldOfView
a8ebdc8e39
Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3
2016-10-13 21:23:11 +02:00
fieldOfView
a291131aca
Fix qml warning when no printer is connected
2016-10-13 21:18:17 +02:00
Ghostkeeper
7d53b955c1
Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3
2016-10-13 20:56:35 +02:00