Jaime van Kessel
d59889a4ab
Fix logo in about popup
2019-02-05 11:13:47 +01:00
Jaime van Kessel
d57d4fd277
Fix text color not being themed
2019-02-05 11:05:33 +01:00
Lipu Fei
fff6cb9ce8
Merge remote-tracking branch 'origin/4.0'
2019-02-05 09:48:10 +01:00
Lipu Fei
bac344a692
Show extruder names in disabled message
...
CURA-5693
2019-02-05 09:26:50 +01:00
Lipu Fei
7964465eb5
UM2+ do not support olsson block upgrade
...
CURA-6133
2019-02-05 07:59:49 +01:00
Diego Prado Gesto
985e7b879c
Use preferred quality type instead of redefining the default value of the layer height
...
Contributes to CURA-6136.
2019-02-04 19:34:38 +01:00
DragonJe
b32d296728
Update nwa3d_a5_normal.inst.cfg
2019-02-04 12:06:44 -06:00
DragonJe
4f035c556a
Update nwa3d_a5_fast.inst.cfg
2019-02-04 12:03:56 -06:00
DragonJe
9214988c7e
Update nwa3d_a5_best.inst.cfg
2019-02-04 11:59:36 -06:00
Ian Paschal
9c82cfd6fa
Comment out firmware check for dev purposes
...
Contributes to CL-1222
2019-02-04 16:52:01 +01:00
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
Ian Paschal
4c1131a7b4
Remove some redundant calls
...
Contributes to CL-1222
2019-02-04 16:11:48 +01:00
Ian Paschal
f2ddb2808f
Add firmware check
...
Contributes to CL-1222
2019-02-04 16:02:38 +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
a831cfa558
Configure whether preview shortcut is visible from ActionPanelWidget property
...
This way it's more dynamic: You don't need to hardcode the plug-in name in the widget to see whether or not it's visible.
Contributes to issue CURA-6086.
2019-02-04 15:19:09 +01:00
Ghostkeeper
5992e66ed6
Move action panel into each stage
...
They can then decide if it needs to be there. For instance, the monitor stage doesn't want to have this panel. Also each stage can position it where they like, and in the near future I'll make a feature to let it decide whether or not to show the preview button.
Contributes to issue CURA-6086.
2019-02-04 15:08:59 +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
Ian Paschal
2a3a1d6e35
Move cloud flow checks back to UM3OutputDevice
...
Contributes to CL-1222
2019-02-04 11:51:27 +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
Ian Paschal
1244e30500
Add cloud-flow-is-possible checking
...
Contributes to CL-1222
2019-02-01 15:50:49 +01:00
Lipu Fei
f7765189c8
Show Extruder 1,2,3,... in message
...
CURA-5693
2019-02-01 13:36:10 +01:00
Lipu Fei
44f986d661
Fix combox style for support extruder in recommended
...
CURA-6144
2019-02-01 13:31:23 +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
fieldOfView
1a01fa0fe9
Correct some reference to non-existing travel_speed setting
2019-02-01 11:00:53 +01:00
fieldOfView
80c102f9de
Add {travel_speed} as an alias to {speed_travel}...
...
...for all those people who still copy paste legacy start&end gcode snippets into Cura.
2019-02-01 10:45:32 +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
