Diego Prado Gesto
b0cf5f25c6
Merge branch '4.0'
2019-02-07 17:36:44 +01:00
Jaime van Kessel
e869829f10
Updated the icon so it also works in the dark theme
2019-02-07 15:17:07 +01:00
Lipu Fei
40ca03fb5d
Merge pull request #5040 from Ultimaker/CURA-5864_prime_tower_brim_enable
...
Cura 5864 prime tower brim enable
2019-02-07 15:09:58 +01:00
Lipu Fei
d6abad3f27
Merge remote-tracking branch 'origin/master' into CURA-5864_prime_tower_brim_enable
2019-02-07 14:47:11 +01:00
Lipu Fei
e5071eac5b
Fix typing
2019-02-07 14:31:40 +01:00
Lipu Fei
47d531e2c5
Fix typing
2019-02-07 14:30:10 +01:00
Lipu Fei
6e40e4a831
Remove unused things
2019-02-07 14:29:59 +01:00
Remco Burema
da6ff7c5a9
Merge branch 'master' into temp_CURA-5864
2019-02-06 16:23:30 +01:00
Remco Burema
3a94745667
Make sliders reappear in simulation-view. [CURA-6183]
2019-02-06 16:01:01 +01:00
Jaime van Kessel
575f323ea1
Merge branch '4.0' of github.com:Ultimaker/Cura
2019-02-06 13:07:09 +01:00
Jaime van Kessel
8d7b623879
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2019-02-06 12:37:50 +01:00
Jaime van Kessel
c7c57c167c
Fix call to non-existing function
2019-02-06 12:37:30 +01:00
Ian Paschal
58d998af68
Add theme entry for message image
...
Contributes to CL-1222
2019-02-06 11:58:22 +01:00
Remco Burema
0a860c7011
Dissalow overlap of skirt/brim (model vs. prime-towrer) in case of prime-tower brim. [CURA-5864]
2019-02-05 18:15:23 +01:00
Jaime van Kessel
f2fbb4e989
Merge branch 'CURA-6174_fix_time_estimates_dark_theme' of github.com:Ultimaker/Cura into 4.0
2019-02-05 13:38:44 +01:00
Jaime van Kessel
91f90e7d40
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2019-02-05 13:32:14 +01:00
Jaime van Kessel
b6f5dd8f94
Fix display of long names in sync configuration menu
2019-02-05 13:31:50 +01:00
Remco Burema
5c54cb740a
Fix dark-theme material-estimates-panel (and layout-issues). [CURA-6174]
2019-02-05 13:24:28 +01:00
Lipu Fei
4ea6e5d0df
Merge remote-tracking branch 'origin/4.0'
2019-02-05 11:40:50 +01:00
Remco Burema
8f5a34c592
Merge pull request #5181 from drzejkopf/patch-4
...
Let "retraction_combing" be overriden with "infill" as default value
2019-02-05 11:25:17 +01:00
Lipu Fei
cfdadbaffb
Merge pull request #5270 from Ultimaker/action_panel_per_stage
...
Let each stage create its own action panel
2019-02-05 11:16:00 +01:00
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
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
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
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
