GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-02 16:54:23 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,469 Commits 291 Branches 260 Tags
Commit Graph

19469 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Edwards
f933f2f271
Merge pull request #5478 from Ultimaker/CL-1267_selective_cloud_flow_metadata 
CL-1267 Don't hide Cloud flow message for wrong printer
 2019-04-03 17:09:57 +02:00
Jaime van Kessel
75386c0b7e Change the font of the customMachineSettings window 
CURA-6057
 2019-04-03 17:08:07 +02:00
Jaime van Kessel
cf68fb9cae Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura into WIP_onboarding 2019-04-03 17:04:16 +02:00
Jaime van Kessel
362036e064 Fix small display issue where a line was drawn between the tabs 
CURA-6057
 2019-04-03 17:03:39 +02:00
Ghostkeeper
b9efeb47ed
Don't open add printer wizard on first launch 
Oops.

Contributes to issue CURA-6057.
 2019-04-03 15:56:54 +02:00
Ghostkeeper
2ccc30b824
Only show add machine dialogue if your stack got corrupt, not whole onboarding 
We don't need to accept the EULA again or whatever. Just add the printer that got lost.

Contributes to issue CURA-6057.
 2019-04-03 15:52:07 +02:00
Lipu Fei
1207533046 Fix local printer selection update 
CURA-6057
 2019-04-03 15:14:06 +02:00
Jaime van Kessel
cf04ee98ef Fix being able to add a local machine that is not the first in the list 
CURA-6057
 2019-04-03 15:04:59 +02:00
Remco Burema
6242433d8e
Merge pull request #5356 from DesktopMetal/feature_wipe_script 
Feature: "Wipe Script"
 2019-04-03 14:42:18 +02:00
Vlad Gribinchuk
a56e088ee0 Put all of wiping settings to expert.cfg file to allow also browsing them 2019-04-03 13:46:37 +03:00
Vlad Gribinchuk
6e955f780b Change description of clean_between_layers to make the relation this setting to retract_at_layer_change more clear for user 2019-04-03 13:45:19 +03:00
Lipu Fei
ffce5b8d58 FixassociateActiveMachineWithPrinterDevice() 
CURA-6057
 2019-04-03 12:10:09 +02:00
Ghostkeeper
ae9395aebb
Merge branch 'master' into WIP_onboarding 2019-04-03 11:53:40 +02:00
Ghostkeeper
df32f3e263
Move Cura.ProgressBar to Uranium 
It is not specific to 3D printing.

Contributes to issue CURA-6057.
 2019-04-03 11:51:57 +02:00
Ghostkeeper
745d9e6116
Also catch middle mouse button in overlay 
Just catch all buttons. There's an entry for that in QML.

Contributes to issue CURA-6057.
 2019-04-03 11:03:55 +02:00
Lipu Fei
fe21d67b88 Fix CI on hal9000 2019-04-03 08:51:16 +00:00
Ghostkeeper
453a785bee
Fix typo 
Contributes to issue CURA-6057.
 2019-04-03 10:42:07 +02:00
Lipu Fei
d57b2640d9 Output Uranium branch in use 2019-04-03 08:26:37 +00:00
Lipu Fei
dd19d7d1a9 Fix typing 2019-04-03 08:25:17 +00:00
Lipu Fei
31e20e78b6 Use GitLab CI 2019-04-03 07:49:26 +00:00
Lipu Fei
8da1f8fa7d Exclude support blockers in used extruders 
CURA-6440
 2019-04-02 14:16:57 +02:00
Jaime van Kessel
5e66564c00 Ensure that configurationTypes doesn't crash if a None is in the list 
Fixes #5551
 2019-04-02 12:05:08 +02:00
Jaime van Kessel
8a62cd7610 Merge branch 'master' of github.com:Ultimaker/Cura 2019-04-02 11:46:54 +02:00
Jaime van Kessel
efe8f19109 Return the value for default extruder if the requested one could not be found 
This fixes #5535
 2019-04-02 11:46:12 +02:00
Ghostkeeper
168c4e17c6
Reduce support horizontal expansion to 0 
We have a long-standing issue in CuraEngine that support can be thinner than one line width and is then not generated, but if there is later some extra room it still gets supported in lower layers. This results in unnecessary support.

That issue in itself is a bit hairy to fix. But it does point out to another weirdness: PLA support has a horizontal offset of 0.2mm. This was introduced when the Support Horizontal Expansion setting was made as the default, but it was never really investigated. I asked Ultimaker's process engineers and we agreed that the setting could be set to 0 except for PVA.

Contributes to issue CURA-6438.
 2019-04-02 11:42:26 +02:00
Jaime van Kessel
b415657492 Merge branch 'master' of github.com:Ultimaker/Cura 2019-04-02 11:09:55 +02:00
Jaime van Kessel
8ae0c695bd Add total cost to the output overview. 
This fixes #5529
 2019-04-02 11:09:12 +02:00
TinkerGnome
adac1ed645 remove post processing script 2019-04-01 20:22:47 +02:00
Ghostkeeper
467a9f179d
Code style: Spaces around binary operators 
Contributes to issue CURA-6057.
 2019-04-01 17:30:43 +02:00
Jaime van Kessel
8b28dfb5e2 Removed unused style 2019-04-01 16:30:31 +02:00
Jaime van Kessel
dc66bdacc6 Simplify the main_window_header_tab style 2019-04-01 16:27:46 +02:00
Ian Paschal
6f3cd38682
Merge pull request #5388 from Ultimaker/CL-1266_cloud_association_for_manual_ips 
[WIP] CL-1266 Cloud association for manual IPs
 2019-04-01 15:55:47 +02:00
Simon Edwards
8700cbe4e8 Mypy fix 
CL-1266
 2019-04-01 15:22:38 +02:00
Jaime van Kessel
5105b67a8c Remove unused entries from the theme 2019-04-01 15:18:49 +02:00
Simon Edwards
19c6fceb0c Delay using getPluginPath() until after start up time 
CL-1266
 2019-04-01 14:30:20 +02:00
Jaime van Kessel
52589ffcad Fix incorrect margin 
CURA-6057
 2019-04-01 14:29:11 +02:00
Jaime van Kessel
8b7389c4c0 Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura into WIP_onboarding 2019-04-01 14:10:37 +02:00
Jaime van Kessel
7a3cd81e3f Fix font size for the titles in the welcome flow 
CURA-6057
 2019-04-01 14:10:09 +02:00
Lipu Fei
69293a0545 Fix typing 2019-04-01 13:52:07 +02:00
Jaime van Kessel
1b8b5415f7 Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura into WIP_onboarding 2019-04-01 13:46:00 +02:00
Jaime van Kessel
74903fe3e5 Cleaned up the QML 
This moves all the "default" margins of the welcome pages into a single point (the WizardPanel)
in order to prevent having to re-define it every time.
I've also fixed some incorrect margins that we had

CURA-6057
 2019-04-01 13:44:27 +02:00
Lipu Fei
0c43b4a180 Merge remote-tracking branch 'origin/master' into WIP_onboarding 2019-04-01 13:33:41 +02:00
Lipu Fei
395dc269b0 Fix hms434 definition file 2019-04-01 13:33:25 +02:00
Lipu Fei
9575c6b3b3 Fix merge conflicts 2019-04-01 13:28:42 +02:00
Lipu Fei
b28e98f288
Merge pull request #5521 from Ultimaker/CURA-6151-Notify-updates-from-marketplace 
Notify updates from marketplace
 2019-04-01 13:19:37 +02:00
Ghostkeeper
add6c0b489
Default the gantry height to be equal to the printer height 
You can't fit any objects higher than that anyway.

Fixes #5528.
 2019-04-01 13:04:38 +02:00
Jaime van Kessel
1d6d3d729d Once the user logged in in the cloudContent page ensure that it moves to the next. 
This fixes the weird situation that when logging in, the screen was still visible
and the user could still press the create / sign in button.

CURA-6057
 2019-04-01 13:04:29 +02:00
Ian Paschal
feec1ffb56 Improve signals 
Contributes to CL-1267
 2019-04-01 12:17:01 +02:00
Lipu Fei
9ae8d2f88c Use NotificationIcon and simplify code 
CURA-6151
 2019-04-01 11:52:35 +02:00
Lipu Fei
15f9844b85 Make reusable NotificationIcon 
CURA-6151
 2019-04-01 11:51:31 +02:00