GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 14:39:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,318 Commits 295 Branches 268 Tags
Commit Graph

18318 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
WalshJames
45f0f1738b
Add files via upload 2019-10-22 15:07:06 +02:00
WalshJames
a5fe6c6668
Add files via upload 2019-10-22 15:04:44 +02:00
WalshJames
4c2520c302
Delete Leapfrog_Bolt_Pro_abs_natural_standard.inst.cfg 2019-10-22 15:04:04 +02:00
WalshJames
1597940dcb
Delete Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg 2019-10-22 15:03:49 +02:00
WalshJames
52d066a1ec
Delete Leapfrog_Bolt_Pro_global_standard.inst.cfg 2019-10-22 15:03:36 +02:00
WalshJames
dbbf8d138a
Delete Leapfrog_Bolt_Pro_abs_natural_standard.inst.cfg 2019-10-22 15:00:45 +02:00
WalshJames
acbb8c5368
Delete Leapfrog_Bolt_Pro_epla_natural_standard.inst.cfg 2019-10-22 15:00:21 +02:00
WalshJames
2e5c9d53b7
Delete Leapfrog_Bolt_Pro_global_standard.inst.cfg 2019-10-22 15:00:08 +02:00
WalshJames
5062272de0
added quality files Leapfrog Bolt Pro 2019-10-22 14:49:04 +02:00
WalshJames
c37131291d
added quality filey Leapfrog Bolt Pro 2019-10-22 14:47:55 +02:00
WalshJames
2aba87e9f2
Add files via upload 2019-10-22 14:46:21 +02:00
WalshJames
ca39dae948
Add files via upload 2019-10-22 14:44:58 +02:00
WalshJames
23a9c36f6d
Add files via upload 2019-10-22 14:40:11 +02:00
WalshJames
a34389ca78
Add files via upload 2019-10-22 14:36:17 +02:00
Lipu Fei
c73747ad44 Merge remote-tracking branch 'origin/4.0' 2019-01-31 14:22:59 +01:00
Jaime van Kessel
d5e34cc9c9 Prevent crash when activePrinter doesn't have a controller 
Got the crash from the automatic crash reports
 2019-01-31 12:59:29 +01:00
Jaime van Kessel
9885ce2817 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-01-31 11:32:16 +01:00
Jaime van Kessel
3734b980d8 When disabling an extruder due to sync, always show a message. 
Originally it would only show a message if the extruder was actually used,
but this didn't take the flow into account when you would first sync and then load a model.
In that case, the user never got a message and never got any notification that (and why) any of the extruders
got disabled.

CURA-5693
 2019-01-31 11:30:37 +01:00
Jaime van Kessel
e40b730457 Merge branch 'CURA-5693_handle_empty_variant_and_material' of github.com:Ultimaker/Cura into 4.0 2019-01-31 11:22:00 +01:00
Jaime van Kessel
b680e92da6
Merge pull request #5252 from Ultimaker/cloud-connection-type-stored 
[4.0] Ensure Cura stores the cloud connection type in the metadata
 2019-01-31 10:29:13 +01:00
Lipu Fei
f0d9aa77c2 Make account button non-fixed-width 
CURA-6132
 2019-01-31 09:43:33 +01:00
Lipu Fei
5a196423db Merge remote-tracking branch 'origin/4.0' 2019-01-31 08:47:01 +01:00
Lipu Fei
4f6d53b009 Do not disable all extruders when syncing 
CURA-5693

When syncing with a machine with no material/nozzle, do not disable all
extruders. leave the first one enabled.
 2019-01-31 08:30:41 +01:00
ChrisTerBeke
b884e46187
Ensure Cura stores the cloud connection type in the stack file 2019-01-30 22:02:13 +01:00
Remco Burema
dcf9ce56e4
Merge pull request #5244 from Ultimaker/CURA-6115-improve-message-options 
Cura 6115 improve message options
 2019-01-30 17:54:47 +01:00
Remco Burema
156e7a2bee
Merge pull request #5246 from Ultimaker/CURA-6132_improve_account_widget 
CURA-6132 improve account widget
 2019-01-30 17:46:32 +01:00
Jaime van Kessel
87070aefce Fixed typing issues for configuredConnectionTypes 
CURA-6159
 2019-01-30 17:17:46 +01:00
Lipu Fei
8dd0f8d329 Remake: show initial if no avatar 
CURA-6132
 2019-01-30 15:37:41 +01:00
Lipu Fei
de4db19234 Remake: account panel 
CURA-6132
 2019-01-30 15:37:34 +01:00
Lipu Fei
784598d4a2 Remake: sign in page 
CURA-6132
 2019-01-30 15:37:25 +01:00
Lipu Fei
6aebdade73 Remake: Change to "sign in" button 
CURA-6132
 2019-01-30 15:37:20 +01:00
Jaime van Kessel
949a687a07 Add the logo again that I accidently deleted. 
Derp
 2019-01-30 14:51:47 +01:00
Jaime van Kessel
969ed6409c Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-01-30 13:37:34 +01:00
Jaime van Kessel
9ae08b4aec Moved the old logo back again 
It looks way better, so lets hope it's here to stay!
 2019-01-30 13:36:55 +01:00
Ghostkeeper
a6688b9609
Merge branch '4.0' 2019-01-30 12:59:39 +01:00
Ghostkeeper
430be551d3
Fix link to properties of row 
This fixes a QML warning and probably fixes the visibility of these elements.
 2019-01-30 12:59:27 +01:00
Ghostkeeper
a36aa3f17b
Merge branch '4.0' 2019-01-30 12:53:18 +01:00
Ghostkeeper
14300e745f
Use Doxygen-style comments for documentation 
According to our style. Not just single line comments without anything else.

Contributes to issue CURA-6159.
 2019-01-30 12:52:58 +01:00
Remco Burema
dbec607d36
Merge pull request #5234 from Ultimaker/CURA-6070_add_adhesion_warning 
CURA-6070 Add adhesion warning message back
 2019-01-29 16:12:53 +01:00
Jaime van Kessel
805b4dbe4c Fixed height for action message buttons 
CURA-6115
 2019-01-29 13:28:32 +01:00
Lipu Fei
b70e9c9080 Handle empty hotend and material in config syncing 
CURA-5693

 - Disable an extruder if the config states no material or nozzle for
   it.
 - Show a warning message if an used extruder gets disabled.
 2019-01-29 13:06:38 +01:00
Jaime van Kessel
4151050127 Setting the height of an action button now actually changes it's size 
CURA-6115
 2019-01-29 12:57:05 +01:00
Ghostkeeper
232498980c
Merge branch '4.0' 
Conflicts:
	cura/GlobalStacksModel.py -> CuraContainerRegistry being used in stead of ContainerRegistry, but imports were reordered.
	plugins/CuraDrive/src/DrivePluginExtension.py -> Typing being solved in two ways.
 2019-01-28 16:45:45 +01:00
Ghostkeeper
9d8cf5ddde
Apply division by zero prevention to the denominator 
Rather than the numerator, which could not cause a division by zero exception.
 2019-01-28 16:40:45 +01:00
Ghostkeeper
25b18dee7a
Fix type errors 
Nothing really changed but it should be more type-safe now for the messages it creates and the build plate temperature.
 2019-01-28 16:14:01 +01:00
Ghostkeeper
371585a0ba
Fix error if layer number ends up out of range 
It normally doesn't go out of range, but some defensive coding just in case it does. And to fix a typing error of course.
 2019-01-28 15:54:34 +01:00
Ian Paschal
3dcb6b9c37
Merge pull request #5235 from Ultimaker/fix_configured_connection_types 
Fix configured connection types
 2019-01-28 15:46:39 +01:00
Ghostkeeper
4a91425bf9
Upgrade nwa3d files to setting version 7 
This was merged into 4.0 and then into master, but when merging into master it was not upgraded to version 7.
 2019-01-28 15:31:09 +01:00
Jaime van Kessel
bc8a08bb44 Add documentation to the configuredConnectionTypes 2019-01-28 14:57:24 +01:00
Jaime van Kessel
f723cdc8a3 Fix typing issues 2019-01-28 14:47:03 +01:00