Commit graph

12848 commits

Author SHA1 Message Date
Nino van Hooff
b6b6a39989 Fix QML typo
CURA-7290
2020-05-14 15:13:57 +02:00
Keleti Csaba
45f43f635d
Update geeetech_A10.def.json
Heated bed added.
2020-05-13 17:46:47 +02:00
Nino van Hooff
e6639eb8eb Do not reserve height for manual sync button
CURA-7290
2020-05-13 17:36:24 +02:00
Keleti Csaba
52fdf154a0
Update geeetech_A10.def.json
Height and dept value was mixed.
XY values also corrected.
2020-05-13 17:32:24 +02:00
Ghostkeeper
1111041a5b
Merge branch 'CURA-7433_deltacomb_move_upgrades' 2020-05-13 17:27:16 +02:00
Nino van Hooff
f78fa884c1 Only show the manual sync button after the account popup was closed
CURA-7290
2020-05-13 17:19:20 +02:00
Nino van Hooff
72657f15be Add padding to checked icon
CURA-7290
2020-05-13 16:38:42 +02:00
Nino van Hooff
6caa0360b9 Change SyncRow copy
CURA-7290
2020-05-13 16:35:39 +02:00
Nino van Hooff
97d1c3200b Remove unused aliases from SyncState.qml
CURA-7290
2020-05-13 16:14:21 +02:00
Jaime van Kessel
8aabf113d2
Catch mouse events in toolpanel
Fixes #7720
2020-05-13 10:53:03 +02:00
sm3dp
85ca395f3f sc60 extruders name 2020-05-13 13:45:59 +08:00
sm3dp
218d789cdb change sc60 extruder left name 2020-05-13 11:02:06 +08:00
Remco Burema
6bb3c03739
Appease the tests!
CURA-7433
2020-05-12 18:59:10 +02:00
Nino van Hooff
f34e05ac03
Merge pull request #7743 from Ultimaker/CURA-7427_Add_option_to_sign_in_with_different_account_while_waiting_for_printers
Cura 7427 add option to sign in with different account while waiting for printers
2020-05-12 17:39:07 +02:00
Kostas Karmas
eac4d3e463 Make login parametrized with a force_logout boolean
Instead of using a separate function to force logging out before
login, login now has a boolean parameter that instructs it to logout
before loging in again, if the user is alread logged in. It then
starts the authorization with a force browser logout first.

CURA-7427
2020-05-12 16:54:41 +02:00
Remco Burema
ac429d496a
Merge https://github.com/kaleidoscopeit/Cura into kaleidoscopeit-master 2020-05-12 16:41:05 +02:00
Peter Felecan
77b3476aae Removed old "category" attribute 2020-05-12 15:53:21 +02:00
maukcc
1afd8cd754 HMS434 update 2020-05-12 15:44:22 +02:00
Nino van Hooff
b40b8e8489 Merge remote-tracking branch 'origin/master' into CURA-7290_manual_account_sync
# Conflicts:
#	cura/API/Account.py
2020-05-12 14:59:01 +02:00
maukcc
70fa227274 HMS434 update 2020-05-12 13:32:55 +02:00
Kostas Karmas
f6ebac6e34 Merge branch 'master' into CURA-7427_Add_option_to_sign_in_with_different_account_while_waiting_for_printers 2020-05-12 13:10:41 +02:00
Kostas Karmas
e3e767f4b9 Simplify the link in AddNetworkOrLocalPrinterContent
CURA-7427
2020-05-12 12:23:42 +02:00
Psych0meter
9976889e5e
Leapfrog Creatr HS / XL Integration (#7723)
Add the leapfrog creatr HS and leapfrog creatr XL
2020-05-12 11:13:51 +02:00
Jaime van Kessel
d5194cbec6
Merge branch 'mb-fix-es-overhang-shader' of https://github.com/smartavionics/Cura 2020-05-12 11:02:21 +02:00
maukcc
598a32eb1e HMS434 update
set pid depending on nozzle temp
set chamberfans according to temp
2020-05-12 10:34:29 +02:00
Kaleidoscopeit
dcd125ed7c Update setting versions to 15 + cutting edge improvements to Deltacomb profiles 2020-05-12 01:03:36 +02:00
grk3010
17c4bf7d6a Update to settings version 15 2020-05-11 16:28:41 -04:00
grk3010
b8d74c8b4d Update smoothie_dual.def.json
Complete printer definition including "Machine_always_write_active_tool" setting.
2020-05-11 16:12:49 -04:00
grk3010
ab6d15141e Add Quality Definitions for Smoothie based printers 2020-05-11 16:11:57 -04:00
grk3010
b7097eed05 Add Hotend Definitions
Add Variant definitions for Slice Engineering Mosquito Magnum Hotends
2020-05-11 16:09:47 -04:00
Kostas Karmas
b717755f20 Add "Sign in with another account" button in AddCloudPrintersView
There are cases where Cura and the browser fall out of sync when it
comes to accounts. In such cases, you may be logged in cura with an
account that has no cloud printers and in the browser with an account
that has printers. So when you press the "Add cloud printer" button,
you are redirected to mycloud and you see cloud printers that are not
detected by Cura (because Cura is in a different acconut). In such
cases, the user can now press the "Sign in with a different account"
link in the "Waiting for cloud response" page, which will log him/her
out in Cura AND in the browser, and then reinitiate the whole
authorization flow, to make sure the accounts are in sync.

CURA-7427
2020-05-11 17:47:09 +02:00
Ghostkeeper
bf8b01efe3
Fix preferred quality type
This quality type is the only one available.
2020-05-11 14:10:08 +02:00
Ghostkeeper
98a5321b2b
Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master
Conflicts:
	resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg -> Setting version was updated at the same time.
	resources/quality/hms434/pla/hms434_0.4_pla_normal.inst.cfg -> Deleted while we updated setting version.
	resources/quality/hms434/pla/hms434_0.8_pla_coarse.inst.cfg -> Deleted while we updated setting version.
	resources/quality/hms434/pla/hms434_0.8_pla_normal.inst.cfg -> Deleted while we updated setting version.
2020-05-11 14:03:54 +02:00
sm3dp
d4e8d1eba9 change polygon properties 2020-05-11 19:10:30 +08:00
sm3dp
f7c2f92f82 remove some useless property and change platform mesh name 2020-05-11 18:12:03 +08:00
Ghostkeeper
40056c9a04
Update to setting_version 15
Due to a merge conflict that Git couldn't detect, these are immediately outdated. Let's update them to 15.

Since I knew this would be coming, I didn't change the maximum deviation last time, so now I also don't need to change it back.

Contributes to issue CURA-7384.
2020-05-11 11:43:37 +02:00
Ghostkeeper
a2946b057a
Merge branch 'master' of github.com:Ultimaker/Cura 2020-05-11 11:41:30 +02:00
Ghostkeeper
0bb65c86ec
Fix default quality level
Standard doesn't exist for this printer. It's 'normal'. I'm guessing this was a leftover from when this was copied from the Creality printers.
2020-05-11 11:40:14 +02:00
Ghostkeeper
7210dd308c
Rename Tronxy quality profiles to something more specific to Tronxy
To Cura the folder doesn't matter. It only reads the filenames and uses those as unique IDs. So for these filenames we'd like to have an ID that is more speciic to this printer to prevent people from crashing.
I'm guessing that the author here already encountered that problem. He copied the files from Creality which has the same problem. However Creality profiles are already published and will be much harder to change the names since they would need to be changed in a version upgrade.

Contributes to issue CURA-7384.
2020-05-11 11:39:26 +02:00
Ghostkeeper
a0f4305420
Remove warnings that will never be visible
This was copied from the error state, where it does matter, but the warning state is not shown if the setting is not enabled.

Contributes to issue CURA-7384.
2020-05-11 11:02:37 +02:00
Ghostkeeper
156925d48e
Update to setting_version 14
This is necessary before merging since these profiles would otherwise still need to be updated during runtime.

Contributes to issue CURA-7384.
2020-05-11 10:51:44 +02:00
Ghostkeeper
c79123e6fa
Use spaces to indent 2020-05-11 09:51:20 +02:00
Ghostkeeper
c9a9579d8b
Merge branch 'master' of https://github.com/64bittuning/Cura into 64bittuning-master 2020-05-11 09:16:01 +02:00
Peter Felecan
5f08fbd83a Addition of the I3 Metal Motion printer by eMotionTech and the afferent extruder. 2020-05-08 17:11:28 +02:00
Ghostkeeper
e16dac0708
Update profile that was outdated since Cura 4.0
Contributes to issue CURA-7420.
2020-05-08 11:34:10 +02:00
Ghostkeeper
8f9408a76f
Apply version upgrade maximum deviation change to built-in profiles
For some this is not exactly restored as their original since this setting is limited to micron precision as well.

Contributes to issue CURA-7420.
2020-05-08 11:15:55 +02:00
Ghostkeeper
3527c16716
Upgrade containers that were forgotten to upgrade from setting_version 13
This is why it was upgrading them as if from the profile importer...

Contributes to issue CURA-7420.
2020-05-08 11:13:15 +02:00
Nino van Hooff
1ae050bbc5 Expose Account.SyncState as an Enum to QML
Provides a single source of truth

CURA-7290
2020-05-08 11:09:48 +02:00
Ghostkeeper
9d178f26a7
Increment setting version to 15
Once more into the fray.

Contributes to issue CURA-7420.
2020-05-08 09:43:02 +02:00
Ghostkeeper
b02354b209
Merge branch '4.6'
Conflicts:
	plugins/VersionUpgrade/VersionUpgrade460to462/VersionUpgrade460to462.py -> On master we removed the getCfgVersion function, while we moved the entire plug-in to a different folder in 4.6.
	resources/definitions/skriware_2.def.json -> On master we merged a PR that changes more or less all settings, while on 4.6 we doubled the maximum deviation.
2020-05-08 09:10:02 +02:00