Ghostkeeper
4b581d09e7
Merge branch '3.4'
2018-06-06 10:59:14 +02:00
Aleksei S
dbd286e1cc
Save as project the extruder counter starts from 1
2018-06-06 10:47:12 +02:00
Mark
c5929ce26c
Revert "The prepare button slices, so it should be a slice button"
...
This reverts commit a0263676e1
.
2018-06-05 12:00:21 +02:00
Mark
59602d8013
Revert "The prepare button slices, so it should be a slice button"
...
This reverts commit a479176c63
.
2018-06-05 11:56:41 +02:00
Lipu Fei
7f7a195627
Fix merge conflicts from 3.4
2018-06-05 09:02:52 +02:00
Lipu Fei
bbd019f9e5
Fix job name UI binding
...
CURA-5367
UI should always refer to PrintInformation for the job name.
2018-06-05 08:58:09 +02:00
Ghostkeeper
02a3067a0c
Reset infill line distance when changing density via recommended mode
...
Otherwise the change has no effect.
Contributes to issue CURA-5324.
2018-06-04 16:58:13 +02:00
Ghostkeeper
bd145c451b
Brackets on new line
...
As far as I've seen them when I scrolled through this.
Contributes to issue CURA-5324.
2018-06-04 16:49:49 +02:00
Diego Prado Gesto
36e72ae744
Merge branch '3.4' into fix_retraction_amount
2018-06-04 14:42:39 +02:00
Mark
a0263676e1
The prepare button slices, so it should be a slice button
2018-06-01 13:36:50 +02:00
Diego Prado Gesto
a4b46be2c5
CURA-5427 Force the material models to update when the machine changes and so
...
when the extruder stack changes.
- What happen was that when the extruder model needed to update, the
material model was not updated correctly and so when changing a material, the
node was incorrect.
2018-06-01 12:58:08 +02:00
Lipu Fei
bb313c45a9
Set job name to "unnamed" if user types in nothing
...
CURA-5367
2018-05-31 16:25:58 +02:00
Diego Prado Gesto
931d4716e1
CURA-5404 Retrieve the material settings' values from the variant before
...
retrieving it from the definition if there are not defined in the material.
2018-05-30 16:58:11 +02:00
Jack Ha
3395610b67
CURA-5357 fix boo boo, rename variable
2018-05-30 09:44:59 +02:00
Ian Paschal
13b3e4afa5
CURA-5357 Drag & dribble multiple packages like a plugable trickle, yo
...
Also improved interfacing with `CuraVersion.py`
2018-05-30 09:11:49 +02:00
Diego Prado Gesto
cc42d993d3
Merge pull request #3854 from fieldOfView/fix_configurationmenu_text
...
Fix configurationmenu text
2018-05-29 13:50:03 +02:00
Lipu Fei
3b0b6d300b
Only set user-specified job name when the editting is finished
...
CURA-5280
2018-05-28 17:35:22 +02:00
Lipu Fei
689b88a024
Do not change prefix for user-specified job names
...
CURA-5280
2018-05-28 09:53:49 +02:00
fieldOfView
94813d9e0d
Fix untranslatable text
2018-05-25 21:40:57 +02:00
fieldOfView
87555a38c4
Fix text rendering in the ConfigurationMenu
2018-05-25 21:40:30 +02:00
Ghostkeeper
945429195e
Move getCuraPackageManager to Uranium and initialize package manager there
2018-05-24 20:47:09 +02:00
ChrisTerBeke
25d9b875ea
Merge pull request #3593 from fieldOfView/feature_separate_stage_qml
...
Separate qml files for Prepare and Monitor stages
2018-05-24 10:37:02 +02:00
fieldOfView
fb8f735566
Make selecting objects on load optional and opt-in
2018-05-23 10:05:08 +02:00
Aleksei S
403129e2d6
Merge branch 'master' of github.com:Ultimaker/cura
2018-05-22 17:33:41 +02:00
Aleksei S
36c2e80121
Adds release notes link in version upgrade messagebox
...
CURA-5348
2018-05-22 17:32:38 +02:00
Ian Paschal
0a395a7305
CURA-5385 Project summary should use scroll view
2018-05-22 16:29:04 +02:00
Lipu Fei
eecbe20830
Enabled drag-n-drop for curapackages
2018-05-22 15:06:27 +02:00
Mark
74a7452333
Merge pull request #3811 from ngraziano/monitor-no-heating-bed
...
Correct the test to hide bed temperature when no heated bed is present.
2018-05-19 08:24:47 +02:00
ChrisTerBeke
409b905045
Only trigger settings filter on enter or after 500ms timeout
2018-05-15 15:43:02 +02:00
Nicolas Graziano
9080e75634
Correct the test to hide bed temperature when no heated bed is present.
2018-05-14 12:13:23 +02:00
Aleksei S
b1c9b04a7a
Fix: filenames cut by first dot, remove only file extension because file might have dot in name
...
CURA-5323
2018-05-02 17:17:45 +02:00
Lipu Fei
9a5fb47a6e
Merge master into material marketplace
2018-05-01 11:56:34 +02:00
Diego Prado Gesto
b582ac7526
CURA-5253 Initialize UI elements right after the qml files were loaded.
2018-04-30 15:09:52 +02:00
Lipu Fei
ec9be7a103
Merge remote-tracking branch 'origin/3.3'
2018-04-25 12:55:21 +02:00
Lipu Fei
491e0c83ba
Allow to select custom profiles based-on not supported
...
CURA-5285
2018-04-25 12:38:57 +02:00
Ghostkeeper
db0288fec4
Merge branch '3.3'
2018-04-24 10:49:30 +02:00
Diego Prado Gesto
609d51e52e
CURA-5250 Remove buildplate menu entry temporary. Add back when the
...
whole feature is back again.
2018-04-23 14:41:43 +02:00
Ghostkeeper
47101cc1ca
Merge branch 'master' of github.com:Ultimaker/Cura
2018-04-23 14:14:12 +02:00
Ghostkeeper
5648bc82e7
Merge branch '3.3'
2018-04-23 14:07:46 +02:00
Diego Prado Gesto
5333ca5aa8
Merge pull request #3666 from Ultimaker/CURA-5204_send_anonymous_data
...
Show information dialogue on what usage data is sent
2018-04-23 13:32:22 +02:00
Aldo Hoeben
5796848bfd
Merge branch 'master' into feature_separate_stage_qml
2018-04-23 10:42:57 +02:00
Diego Prado Gesto
b8a26f3187
CURA-5218 Disable the Activate and Duplicate button in the management
...
page if the selected profile is not supported
2018-04-20 17:04:51 +02:00
Ghostkeeper
ac2301a8fd
Fix code style: Brackets on new line
...
And one comma without a space after it.
Contributes to issue CURA-5204.
2018-04-20 15:36:32 +02:00
Diego Prado Gesto
576881bfeb
CURA-5204 Update the checkbox if the setting has changed in the 'More
...
information' dialog.
2018-04-20 14:12:05 +02:00
Diego Prado Gesto
122b5e36cf
CURA-5204 Revert a change since it sets the setting to false if the
...
panel is not visible.
2018-04-20 13:36:07 +02:00
Ghostkeeper
d2caeee8c1
Clarify warning for filament diameter change
...
It's the diameter of the filament, not the diameter of the material. Diameter of a material doesn't make any sense. Also corrected grammar and clarified context.
2018-04-20 13:32:14 +02:00
Diego Prado Gesto
121d1806be
Don't show the corresponding element in the general preference panel
...
if the related plugin is not enabled.
Contributes to CURA-5204
2018-04-20 11:56:59 +02:00
Diego Prado Gesto
fc1eef2b0c
Merge branch '3.3'
2018-04-20 11:43:49 +02:00
Diego Prado Gesto
4e53f219f0
Merge branch 'master' into CURA-5204_send_anonymous_data
2018-04-20 10:35:52 +02:00
Diego Prado Gesto
f003adeb1e
CURA-5250 Add color to the text so it also works fine with other themes.
2018-04-20 10:19:25 +02:00