3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 05:53:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
18372 commits 313 branches 275 tags 718 MiB
Commit graph

7973 commits

Author SHA1 Message Date
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
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
Diego Prado Gesto
a09ae516f3 Fix indentation and typos 2019-02-04 09:06:49 +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
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
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
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
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
Remco Burema
954fdb20ad Rename 'connect_group_name' to 'group_name'. [CURA-6153] 2019-01-31 20:21:42 +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
Lipu Fei
c73747ad44 Merge remote-tracking branch 'origin/4.0' 2019-01-31 14:22:59 +01:00
Ian Paschal
858e2f6b42 Add some theme dependencies 
Contributes to CL-1154
 2019-01-31 10:49:33 +01:00
Lipu Fei
f0d9aa77c2 Make account button non-fixed-width 
CURA-6132
 2019-01-31 09:43:33 +01:00
Lipu Fei
5a196423db Merge remote-tracking branch 'origin/4.0' 2019-01-31 08:47:01 +01:00
Remco Burema
dcf9ce56e4
Merge pull request #5244 from Ultimaker/CURA-6115-improve-message-options 
Cura 6115 improve message options
 2019-01-30 17:54:47 +01:00
Lipu Fei
8dd0f8d329 Remake: show initial if no avatar 
CURA-6132
 2019-01-30 15:37:41 +01:00
Lipu Fei
de4db19234 Remake: account panel 
CURA-6132
 2019-01-30 15:37:34 +01:00
Lipu Fei
784598d4a2 Remake: sign in page 
CURA-6132
 2019-01-30 15:37:25 +01:00
Lipu Fei
6aebdade73 Remake: Change to "sign in" button 
CURA-6132
 2019-01-30 15:37:20 +01:00
Jaime van Kessel
949a687a07 Add the logo again that I accidently deleted. 
Derp
 2019-01-30 14:51:47 +01:00
Jaime van Kessel
969ed6409c Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-01-30 13:37:34 +01:00
Jaime van Kessel
9ae08b4aec Moved the old logo back again 
It looks way better, so lets hope it's here to stay!
 2019-01-30 13:36:55 +01:00
Ghostkeeper
a6688b9609
Merge branch '4.0' 2019-01-30 12:59:39 +01:00
Ghostkeeper
430be551d3
Fix link to properties of row 
This fixes a QML warning and probably fixes the visibility of these elements.
 2019-01-30 12:59:27 +01:00
Ghostkeeper
a36aa3f17b
Merge branch '4.0' 2019-01-30 12:53:18 +01:00
Jaime van Kessel
805b4dbe4c Fixed height for action message buttons 
CURA-6115
 2019-01-29 13:28:32 +01:00
Jaime van Kessel
4151050127 Setting the height of an action button now actually changes it's size 
CURA-6115
 2019-01-29 12:57:05 +01:00
Ian Paschal
d495e80959 Merge remote-tracking branch 'origin/4.0' into CL-1154_monitor_empty_states 2019-01-28 16:54:21 +01:00
Ghostkeeper
4a91425bf9
Upgrade nwa3d files to setting version 7 
This was merged into 4.0 and then into master, but when merging into master it was not upgraded to version 7.
 2019-01-28 15:31:09 +01:00
Lipu Fei
e2e856a5cd Add adhesion warning message back 
CURA-6070
 2019-01-28 14:41:57 +01:00
Lipu Fei
87bdd10dab Merge remote-tracking branch 'origin/4.0' 2019-01-28 14:03:51 +01:00
Lipu Fei
1f21eed14f Add Text.NativeRendering for Labels 
CURA-6141
 2019-01-28 09:05:43 +01:00
Lipu Fei
c6ff8149f6 Remove colon according to design 
CURA-6141
 2019-01-28 09:04:08 +01:00
Lipu Fei
71b2787d0d Use Label 
CURA-6141
 2019-01-28 08:48:02 +01:00
steverc1572
b3205ce84e
Add files via upload 2019-01-26 14:43:07 -06:00
steverc1572
7aad7ab59c
Delete cr-x.stl 2019-01-26 14:42:01 -06:00
Remco Burema
3d413ceb2c MaterialInfo: Tweak text-alignment/layout. [CURA-6141] 2019-01-26 11:43:15 +01:00