Jaime van Kessel
2f43339434
Merge branch 'CURA-6118_add_experimental_tag_on_stage_panel' of github.com:Ultimaker/Cura
2019-01-17 09:32:29 +01:00
steverc1572
2da71fe1f9
Add files via upload
2019-01-16 16:46:07 -06:00
steverc1572
eb1204de9a
Add files via upload
2019-01-16 16:45:08 -06:00
Jaime van Kessel
24fbb1007d
Merge branch '4.0' of github.com:Ultimaker/Cura
2019-01-16 17:39:43 +01:00
Diego Prado Gesto
c28aefac4e
Add the maximum backups message to the backups plugin
...
It didn't work after previous changes, so now it will show again when the user already has 5 backups.
Contributes to CURA-6005
2019-01-16 17:33:14 +01:00
Remco Burema
a0dd3f06e6
Add 'Experimental' tag for quality profiles in the header.
...
When an experimental quality profile is active, the stage panel does not show that it is experimental.
It is however shown on the quality drop-down menu in Custom mode.
This commit also fixes the untranslated (hardcoded) 'Experimental' string in the dropdown in Custom.
Fixes the issue reported in CURA-6118.
2019-01-16 15:50:40 +01:00
TiZYX
54cbadd09e
Update tizyx_k25_normal.inst.cfg
2019-01-16 15:28:22 +01:00
Jaime van Kessel
7c7f6a1f03
Ensure sane defaults for the ApplicationMetada when making builds
2019-01-16 15:28:16 +01:00
TiZYX
04ff27c5f3
Update tizyx_k25_normal.inst.cfg
2019-01-16 15:28:00 +01:00
ChrisTerBeke
d9a8bb0eb7
Remove empty init py in plugins dir
2019-01-16 15:18:04 +01:00
drzejkopf
d499f780c8
Let "retraction_combing" be overriden with "infill" as default value
...
"infill" option was not added to "resolve" after adding additional combing setting, so that wasn't possible to add it as override value in printer definition
2019-01-16 14:54:24 +01:00
Ian Paschal
5ed7f6f6ce
Merge pull request #4926 from Ultimaker/STAR-322_cloud-connection
...
[4.0] STAR-322: Cloud connection
2019-01-16 10:20:01 +01:00
Diego Prado Gesto
86b0ac320b
Increase the padding with the button
...
Add more padding when the draggable area is visible
2019-01-16 08:47:01 +01:00
Ghostkeeper
1b7b302f42
Fix some typos
2019-01-15 17:31:51 +01:00
Remco Burema
f057c9a7df
Prevent spurious updates to 'onPreferenceChanged's if the preference doesn't match.
2019-01-15 17:15:12 +01:00
ChrisTerBeke
a702661b5d
Decrease the API call intervals to get quicker UI updates
2019-01-15 14:17:38 +01:00
ChrisTerBeke
3d6710d5b6
Merge branch '4.0' into STAR-322_cloud-connection
2019-01-15 13:08:54 +01:00
Lipu Fei
ea0a6827ff
Merge remote-tracking branch 'origin/4.0'
2019-01-15 12:22:46 +01:00
Lipu Fei
c991741a45
Merge pull request #5167 from Ultimaker/CURA-6087-Allow-multiple-sdk-versions-for-plugins
...
Ensure that the toolbox correctly handles multiple supported SDK vers…
2019-01-15 12:20:18 +01:00
Diego Prado Gesto
26564363d7
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
2019-01-15 12:15:34 +01:00
Diego Prado Gesto
2435b97ef7
Change the style of the resize bar at the bottom of the print setup panel
...
Make it wider and more visible to the user.
Change icon.
Keep margins according to the other panels.
2019-01-15 12:12:47 +01:00
Lipu Fei
d8850f4946
Fix version upgrade 40 to 41 to set setting_version 7
...
CURA-6113
2019-01-15 11:36:10 +01:00
Jaime van Kessel
d4b47c75ab
Fix typo in multiply message
2019-01-15 11:15:37 +01:00
ChrisTerBeke
ed96d32aca
trigger re-build
2019-01-15 09:59:17 +01:00
ChrisTerBeke
b7fb969524
Fixes for review
2019-01-15 09:37:38 +01:00
ChrisTerBeke
de24c7d9c3
Revert "Remove mock changes used locally"
...
This reverts commit 7785555a94
2019-01-15 09:35:28 +01:00
Daniel Schiavini
7785555a94
Remove mock changes used locally
2019-01-15 08:21:17 +01:00
Daniel Schiavini
77c30c891f
Fix tests
2019-01-15 08:20:39 +01:00
Diego Prado Gesto
f16735a5be
Add VersionUpgrade40to41 as a bundled package
...
Otherwise it will show up as an old plugin and the uninstall button will appear in the Markeplace.
2019-01-14 17:10:52 +01:00
Diego Prado Gesto
bf20e04b0d
Merge branch '4.0'
2019-01-14 17:03:12 +01:00
Diego Prado Gesto
fa7b38243c
Add VersionUpgrade35to40 as a bundled package
...
Otherwise it will show up as an old plugin and the uninstall button will appear in the Markeplace.
2019-01-14 17:02:02 +01:00
ChrisTerBeke
f478653c37
Uncomment code that was needed for testing
2019-01-14 14:56:14 +01:00
Jaime van Kessel
090fdbf598
Merge branch '4.0' of github.com:Ultimaker/Cura
2019-01-14 14:17:40 +01:00
ChrisTerBeke
7bf319dfd1
Better fix for circular dependency
2019-01-14 14:17:36 +01:00
ChrisTerBeke
f2922e2405
Merge branch '4.0' into STAR-322_cloud-connection
2019-01-14 14:16:35 +01:00
Jaime van Kessel
b1b61fa466
Add missing return
2019-01-14 14:14:47 +01:00
Jaime van Kessel
5ae05acd2c
Merge branch 'fix_non_connect_networkprinters' of https://github.com/fieldOfView/Cura into 4.0
2019-01-14 14:12:36 +01:00
Jaime van Kessel
9d94b55596
Ensure that the toolbox correctly handles multiple supported SDK versions
...
CURA-6087
2019-01-14 13:35:10 +01:00
Lipu Fei
71036abd87
Add troubleshooting link for recommended
...
CURA-6114
2019-01-14 12:11:45 +01:00
Lipu Fei
b2dace2d48
Fix version upgrade
...
CURA-6113
2019-01-14 11:25:02 +01:00
Lipu Fei
6876935359
Merge remote-tracking branch 'origin/4.0'
2019-01-14 11:21:28 +01:00
ChrisTerBeke
cd19eec98a
Remove weird argument for timer
2019-01-14 11:06:16 +01:00
Lipu Fei
0ecd00fa1f
Merge pull request #5150 from Ultimaker/CURA-6054-2_fix_resize_panel_on_window_change
...
Fix resizable Settings-Panel for change in window size. [CURA-6054]
2019-01-14 11:01:46 +01:00
ChrisTerBeke
402097f4d0
Fix imports
2019-01-14 10:57:50 +01:00
Lipu Fei
29bb317293
Add a margin to settings panel bottom
...
CURA-6054
2019-01-14 10:55:03 +01:00
ChrisTerBeke
1e2a8aa23e
revert to prevent circular dependency
2019-01-14 10:52:50 +01:00
ChrisTerBeke
13d390a7d9
Fix imports in tests, some cleanup
2019-01-14 10:43:32 +01:00
ChrisTerBeke
81abc84741
Fix typing of CloudOutputDevice in controller
2019-01-14 10:41:10 +01:00
Diego Prado Gesto
c6da824203
Merge branch '4.0'
2019-01-14 08:56:33 +01:00
Diego Prado Gesto
dacc161745
Merge pull request #4961 from h0x91b/patch-1
...
default is 2650, not 2620, probably typo
2019-01-13 17:35:59 +01:00
