GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-30 01:55:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,927 Commits 294 Branches 267 Tags
Commit Graph

18927 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Ghostkeeper
8c41a05183
Merge branch 'maukcc-master' 2019-04-01 11:09:07 +02:00
Jaime van Kessel
64523c7baf Add some extra info to the tooltip if a setting is not used due to the value of it's children 
The behavior might make sense to us, but that's probably because we know what the behavior is. The
extra info in the tooltip should make it easier to understand

Fixes #5525
 2019-04-01 10:41:35 +02:00
Lipu Fei
3f9b98bd0c Round size numbers 
CURA-6151
 2019-04-01 10:38:43 +02:00
maukcc
7f2fcb16a8 Adding platform to HMS434 2019-03-29 14:26:42 +01:00
Jaime van Kessel
83361405a4 Add test for num instances in machine manager 2019-03-29 13:34:41 +01:00
Diego Prado Gesto
0ffcfe041a Exclude HIPS and PETG for UM3 as it use to be in 4.0 2019-03-29 11:49:06 +01:00
Jaime van Kessel
ffd7a001fb Add notification icon to the installed tab of the toolbox 
CURA-6151
 2019-03-28 13:31:51 +01:00
Jaime van Kessel
6c26dd38ec Clean up code for the toolbox tab button 
Removed unused properies and made it use states for it's changing properties.
This makes it a lot easier to read and understand what it's actually doing

CURA-6151
 2019-03-28 13:24:25 +01:00
Lipu Fei
4f5aee6298 Merge remote-tracking branch 'origin/fix_long_button_text' 2019-03-28 11:11:49 +01:00
Diego Prado Gesto
742329a170 Document where the magic numbers come from 
For the maximumSize of a button.

Contributes to CURA-6412.
 2019-03-28 09:29:31 +01:00
Lipu Fei
58507303fa Duplicate qualities should have unique names 
CURA-6426
 2019-03-27 14:08:06 +01:00
Jaime van Kessel
56f3226ac1 Add the notification icon for the marketplace. 
This adds an icon to the top right of the marketplace button to indicate that there
are plugins with pending updates.

CURA-6151
 2019-03-27 13:21:56 +01:00
Jaime van Kessel
1e02a20745 Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6151-Notify-updates-from-marketplace 2019-03-27 12:56:02 +01:00
Jaime van Kessel
e3f2c06542 Remove usage of canUpdate slot 
This makes it a bit cleaner, since having it as a slot is a bit weird in the first place (and forced
all kinds of hacks to ensure it got re-evaluated)

CURA-6151
 2019-03-27 12:54:20 +01:00
Jaime van Kessel
f4f94b10d2 Move "canUpdate" logic from toolbox to PackageManager 
CURA-6151
 2019-03-27 12:48:10 +01:00
Lipu Fei
79c13ce35c
Merge pull request #5511 from Ultimaker/fix_weird_home_directories_windows 
Fix for weird home directories on Windows
 2019-03-27 11:11:57 +01:00
maukcc
afb6810bac Add HMS434 
Add HMS434 machine
 2019-03-27 10:23:59 +01:00
Remco Burema
494c290cc4
Merge pull request #5505 from Ultimaker/CURA-6089_hide_materials 
Exclude gff and cff materials for all ultimaker printers
 2019-03-27 09:56:45 +01:00
Ghostkeeper
f6dd3f922d
Merge branch 'shorter_ops_logs' 2019-03-26 15:34:26 +01:00
Ghostkeeper
ea48e6ded1
Merge branch 'master' of ssh://github.com/Ultimaker/Cura 2019-03-26 15:13:00 +01:00
Ghostkeeper
377c7f1438
Merge branch 'patch-4' of https://github.com/thopiekar/Cura into thopiekar-patch-4 2019-03-26 15:00:31 +01:00
Simon Edwards
eed810af35
Merge pull request #5479 from Ultimaker/CL-1287_improved_cloud_pop_up 
CL-1287 Improved Cloud pop-up
 2019-03-26 12:17:35 +01:00
Ghostkeeper
a4924d2695
Fix for weird home directories on Windows 
The expanduser function will expand to a combination of HOMEDRIVE and HOMEPATH which might not be the same as APPDATA if your configuration is very weird (e.g. you've changed your APPDATA location).

Contributes to CURA-6418.
 2019-03-26 12:04:46 +01:00
Ghostkeeper
07ea8221c1
Merge branch 'thopiekar-patch-1' 2019-03-26 10:42:58 +01:00
Ghostkeeper
ff99c4e45f
Don't include group nodes in AABB 
In fact, don't include any node that would just have a position rather than actual data.
The rest of the code is robust anyway against there being no AABB.

Contributes to issue CURA-6416.
 2019-03-26 10:00:10 +01:00
Ghostkeeper
f3d75fa1ef
Merge branch 'lithophane_defaults' of https://github.com/BagelOrb/Cura into BagelOrb-lithophane_defaults 2019-03-26 09:33:10 +01:00
Satish
85a7d814d8 Added id to machine selector for integration tests 2019-03-25 14:34:00 +01:00
Diego Prado Gesto
14b409a895 Exclude gff and cff materials for all ultimaker printers except UMS5 
Contributes to CURA-6089.
 2019-03-25 12:59:05 +01:00
Diego Prado Gesto
7958f99152 Update the list of check urls for UM3 Extended 2019-03-25 11:59:28 +01:00
Thomas Karl Pietrowski
8b0e1e9f5d
PrintSetupSelector: "G code" -> "G-code" 
Noticed that "g-code" is written at some places with and without a hyphen.
Since it think it should be written with, I'm correcting it at this point.
 2019-03-22 19:42:01 +01:00
Diego Prado Gesto
ac5428a2e4 Merge branch 'master' of github.com:Ultimaker/Cura 2019-03-22 18:03:32 +01:00
Diego Prado Gesto
74ffee7810 Fix typo in a previous commit 2019-03-22 18:03:01 +01:00
Diego Prado Gesto
a793a06b60 Add a maximumWidth to the ActionButton 
In case the text is too long, it can exceed the limits of the container. This is an optional flag that will work only in case it's set up.

Contributes to CURA-6412.
 2019-03-22 17:10:42 +01:00
Ian Paschal
fc650865d6 Improved cloud pop-up 
Contributes to CL-1287
 2019-03-22 15:24:12 +01:00
Remco Burema
794d13969a Shorter log messages for operations. 2019-03-22 12:06:04 +01:00
Jaime van Kessel
86f4fd65c3 Add a property that lists all ID's that have an update available 
CURA-6151
 2019-03-22 11:56:53 +01:00
Tim Kuipers
32d79451cc fix color inversion and make variable naming descriptive 2019-03-22 11:42:31 +01:00
Tim Kuipers
bdf102ea64 make description of color invert explanatory, rather than purely descriptive. 2019-03-22 11:30:58 +01:00
Jaime van Kessel
fd015c0381 Detach the data request and the showing of the dialog from eachother. 
This way we can fetch the data without having to show the marketplace.
CURA-6151
 2019-03-22 11:30:22 +01:00
Tim Kuipers
709321fc0c Change image import options for standard lithophanes 2019-03-22 11:22:30 +01:00
Jaime van Kessel
9a5b7e7925 Set min value for adaptive_layer_height_variation_step 
This is to prevent using 0, since that crashes the engine
 2019-03-22 10:44:47 +01:00
MaukCC
c314352940
Merge pull request #10 from Ultimaker/master 
update
 2019-03-22 09:42:06 +01:00
Ghostkeeper
294b61937a
Re-enable Polish 2019-03-21 21:14:11 +01:00
Diego Prado Gesto
6611ab7d17 Merge branch 'master' of github.com:Ultimaker/Cura 2019-03-21 16:10:09 +01:00
Diego Prado Gesto
6ad6115327 Modify the firmware checker url to use the new file location 2019-03-21 16:07:26 +01:00
Ghostkeeper
20a4d89847
Merge branch 'drzejkopf-patch-5' 2019-03-21 14:43:37 +01:00