Ghostkeeper
ae5d548f02
Merge branch '4.0'
2019-02-04 16:19:14 +01:00
Ghostkeeper
7569ed9834
Another adjustment to account creation commercial text
...
The marketing team wants to make this small adjustment too.
2019-02-04 16:18:54 +01:00
Ghostkeeper
185e9cc726
Fix font size of buildplate warning
...
This was most likely copied from an old release but the font in question was deleted.
2019-02-04 15:24:59 +01:00
Ghostkeeper
61475a79cf
Fix font size of buildplate warning
...
This was most likely copied from an old release but the font in question was deleted.
2019-02-04 15:23:57 +01:00
Ghostkeeper
e7d2400199
Merge branch '4.0'
2019-02-04 13:06:32 +01:00
Ghostkeeper
7d871e5a18
Update text for pre-login screen
...
This is a new text that we got from marketing.
2019-02-04 13:06:06 +01:00
Ian Paschal
66ed42838f
Stop using depreciated API call
2019-02-04 11:53:24 +01:00
Diego Prado Gesto
e82c2b1ce6
Merge branch 'steverc1572-CR-X'
2019-02-04 09:11:07 +01:00
Diego Prado Gesto
a09ae516f3
Fix indentation and typos
2019-02-04 09:06:49 +01:00
Diego Prado Gesto
b246a84074
Merge branch 'master' into steverc1572-CR-X
2019-02-04 08:50:30 +01:00
Diego Prado Gesto
6e976f0cc3
Merge branch 'CR-X' of https://github.com/steverc1572/Cura into steverc1572-CR-X
2019-02-04 08:50:22 +01:00
Ghostkeeper
314070acbc
Merge branch 'griehsler-master'
2019-02-04 08:26:10 +01:00
Ghostkeeper
5592d4fa60
Don't make retraction distance negative
...
Apparently this got changed accidentally because of a merge in an unfortunate time.
2019-02-04 08:25:35 +01:00
Ghostkeeper
3018b1b3d4
Merge branch 'master' of https://github.com/griehsler/Cura into griehsler-master
2019-02-04 08:22:55 +01:00
steverc1572
091416168e
Update cr-x_extruder_1.def.json
2019-02-01 20:42:41 -06:00
steverc1572
ae9075b6c1
Update cr-x_extruder_0.def.json
2019-02-01 20:42:19 -06:00
steverc1572
b32e2c75ad
Update creality cr-x.def.json
...
Done the requested changes
2019-02-01 17:53:01 -06:00
Diego Prado Gesto
467b88296d
Merge branch 'CR-X' of https://github.com/steverc1572/Cura into steverc1572-CR-X
2019-02-01 17:54:35 +01:00
Diego Prado Gesto
c568759fbc
Merge pull request #4788 from fieldOfView/feature_curaversion_appname
...
Make Cura app name configurable in CuraVersion
2019-02-01 17:18:05 +01:00
Diego Prado Gesto
42ca21fc1a
Fix typo in comment
2019-02-01 16:46:09 +01:00
Lipu Fei
f7765189c8
Show Extruder 1,2,3,... in message
...
CURA-5693
2019-02-01 13:36:10 +01:00
Jaime van Kessel
39e1dbd95f
Merge branch 'CURA-6169_dark_theme_messagebox' of github.com:Ultimaker/Cura into 4.0
2019-02-01 12:06:46 +01:00
Jaime van Kessel
5600d5407c
Add default if group_name is not set.
...
Otherwise we get a crash.
CURA-6153
2019-02-01 12:02:59 +01:00
Jaime van Kessel
4aaeb8c2d5
Merge branch 'CURA-6153_wrong_name_on_disconnect' of github.com:Ultimaker/Cura into 4.0
2019-02-01 11:54:35 +01:00
Diego Prado Gesto
f7ffb3ae69
Merge pull request #4825 from Frischid/patch-2
...
Update AutoDetectBaudJob.py
2019-02-01 11:31:02 +01:00
Remco Burema
203f699d0a
Override message-box bg-color in dark theme. [CURA-6169]
2019-02-01 11:24:50 +01:00
Lipu Fei
efa26c8323
Merge remote-tracking branch 'origin/4.0'
2019-02-01 11:08:33 +01:00
Lipu Fei
3dc29a8349
UM2+ do not support olsson block upgrade
...
CURA-6133
2019-02-01 11:05:48 +01:00
Lipu Fei
60a4fb3151
Fix missing "group_name" renaming
...
CURA-6153
2019-02-01 10:23:51 +01:00
Lipu Fei
18cec8dbe8
Fix typing
...
CURA-6153
2019-02-01 10:20:16 +01:00
Remco Burema
7e11345f14
Remove checked off TODO-comment. [CURA-6153]
2019-01-31 20:30:57 +01:00
Remco Burema
435c8deded
Add 'connect_group_name' to 'group_name' rename to version-upgrade. [CURA-6153]
2019-01-31 20:25:21 +01:00
Remco Burema
954fdb20ad
Rename 'connect_group_name' to 'group_name'. [CURA-6153]
2019-01-31 20:21:42 +01:00
Jaime van Kessel
9a3d9dd2c1
Ensure that writeStarted is called when attempting to print via USB
2019-01-31 17:42:20 +01:00
Jaime van Kessel
eae8e80923
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2019-01-31 17:14:28 +01:00
Jaime van Kessel
e6f722b29c
Move additional component loader into ActionPanelWidget
2019-01-31 17:13:32 +01:00
Simon Edwards
eeb23c4ba4
Merge pull request #5255 from Ultimaker/CL-1154_monitor_empty_states
...
CL-1154 Monitor empty states
2019-01-31 16:44:25 +01:00
Remco Burema
6cd3a5fe3d
Show correct printer name in selector-header on disconnect. [CURA-6153]
2019-01-31 15:05:27 +01:00
Ian Paschal
1cd9ffefcc
Improve no connection message
...
Contributes to CL-1154
2019-01-31 14:51:58 +01:00
Jaime van Kessel
1a037bdb82
Prevent UFP writer from crashing if the base file of a material can not be found
...
Another issue found in the crash reports
2019-01-31 14:48:40 +01: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
Ian Paschal
7189daec80
Finalize monitor stage empty states
...
Contributes to CL-1154
2019-01-31 10:50:30 +01:00
Ian Paschal
389bdeb0c7
Expose configurations the same way as connectivity
...
Contributes to CL-1154
2019-01-31 10:50:14 +01:00
Ian Paschal
858e2f6b42
Add some theme dependencies
...
Contributes to CL-1154
2019-01-31 10:49:33 +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