Jaime van Kessel
4613b62120
Merge branch '4.4' of github.com:Ultimaker/Cura
2019-11-11 16:01:19 +01:00
Nino van Hooff
254dde5b05
REmove duplicate key machine_head_with_fans_polygon
2019-11-11 15:02:49 +01:00
Jaime van Kessel
3e50cf5253
Fix issues with makeblock definition
2019-11-11 13:43:04 +01:00
Lipu Fei
2fb8375714
Merge pull request #6591 from pkz0313/master
...
Hopefully Adding the Makeblock 3d Printer files to the latest version
2019-11-11 10:55:46 +01:00
Jaime van Kessel
d93f6f25d2
Prevent "sticky" tooltips
...
When quickly moving the mouse in and out, the timer would
still be running, so the tooltip would become active once the mouse
moved out of the area.
2019-11-11 10:47:53 +01:00
Lipu Fei
d13683f4db
Merge remote-tracking branch 'origin/4.4'
2019-11-11 08:13:53 +01:00
baddogg1231
f3e597d684
Update creality_ender3.def.json
2019-11-09 21:36:13 -05:00
baddogg1231
78e7aa2d21
Added Ender 3 Prime Line to Start G-code
...
Added the popular prime line for the Ender 3 as the default starting g-code and added a modification that works around the Cura 4.3.0 update that moves the print head to Z0 before starting the print, which moves the printhead down into the filament.
2019-11-09 21:33:04 -05:00
Kaz
a5aa4c75ba
update gantry_height
2019-11-08 14:11:34 +08:00
Remco Burema
00f505374b
Merge pull request #6637 from Ultimaker/CURA-6917_unlink_duplicated_material_44
...
Cura 6917 unlink duplicated material
2019-11-07 17:23:28 +01:00
Remco Burema
3636eed964
Instead of selecting first, return only uniques.
...
part of CURA-6917
2019-11-07 17:19:18 +01:00
Nino van Hooff
6e79f489e2
When multiple linked materials are found, only display the first
...
CURA-6917
2019-11-07 15:51:22 +01:00
Lipu Fei
3f93dde6b0
Merge remote-tracking branch 'origin/4.4'
2019-11-07 09:50:02 +01:00
Remco Burema
da92c36afb
Don't show tooltip immediately.
2019-11-06 17:22:58 +01:00
Lipu Fei
33f876d749
Fix leapfrog bolt pro definition files
2019-11-06 15:43:22 +01:00
Remco Burema
0d72563dd3
Update i18n headers.
...
part of CURA-6957
2019-11-05 13:34:44 +01:00
Ghostkeeper
3ed53a99f6
Update missing translations from new translation template
...
Contributes to issue CURA-6957.
2019-11-05 13:32:11 +01:00
Remco Burema
b4974dc794
Update translation files with the template.
...
part of CURA-6957
2019-11-05 13:22:58 +01:00
Ghostkeeper
d87d38ceed
Update translation template files for 4.4
...
Contributes to issue CURA-6957.
2019-11-05 13:18:34 +01:00
Lipu Fei
0ad5ce19da
Fix leapfrog profiles
...
CURA-6951
2019-11-05 12:49:27 +01:00
Lipu Fei
2e4e19594f
Merge pull request #6608 from Leapfrog3DPrinters/master
...
Leapfrog Bolt Pro machine profile
2019-11-05 12:48:39 +01:00
Lipu Fei
af909b25a2
Merge pull request #6624 from Ultimaker/CURA-6569_mandatory_marketplace_login
...
WIP: CURA-6569_mandatory_marketplace_login
2019-11-05 11:04:14 +01:00
Lipu Fei
eeed98746d
Merge remote-tracking branch 'origin/4.4'
2019-11-05 09:49:14 +01:00
Jaime van Kessel
366dd4bd00
Swap the splashscreen image
...
RIP Ultibot :(
CURA-6656
2019-11-05 09:33:50 +01:00
Ghostkeeper
f48a5ec028
Fix zigzag initial layer pattern for Skriware 2
2019-11-04 16:43:54 +01:00
Vincent Riemens
c30ec406cf
Add files via upload
2019-11-04 16:28:55 +01:00
Vincent Riemens
0b76f221b4
Delete leapfrog_bolt_pro.def.json
2019-11-04 16:28:35 +01:00
Ghostkeeper
74d52bbd1c
Fix complaints from CI system about settings that don't work
...
There's one that needed to be a 'value' to properly overwrite it. The rest are all about settings that were equal to the defaults anyway so I've removed those.
Contributes to issue CURA-6949.
2019-11-04 16:18:46 +01:00
Jaime van Kessel
f1b9ac1c21
Fix aspect ratio of logo in about window
...
CURA-6934
2019-11-04 16:15:40 +01:00
Ghostkeeper
726cf3b7a4
Fix typo in the R
...
Contributes to issue CURA-6934.
2019-11-04 16:10:52 +01:00
Ghostkeeper
fcd712cf82
Make logo larger
...
Seems to be more towards what the rest of the products show.
Contributes to issue CURA-6934.
2019-11-04 16:10:52 +01:00
Ghostkeeper
3e13156741
Replace logo in the top left corner
...
This aligns it with the other Ultimaker products. Sorry, overruled by higher up. Corporate things.
Contributes to issue CURA-6934.
2019-11-04 16:10:52 +01:00
Ghostkeeper
2ea7270825
Merge branch 'master' of https://github.com/skriDude/Cura into skriDude-master
2019-11-04 16:05:44 +01:00
skriDude
89b95b8998
Changed "values" to strings
2019-11-04 15:59:31 +01:00
Nino van Hooff
3d352b3585
Show welcome page in marketplace window when not logged in
...
TODO: marketplace logo
CURA-6569
2019-11-04 15:44:04 +01:00
skriDude
b54c24e9a1
Changed selected parameters "default_value" to "value"
2019-11-04 12:34:08 +01:00
Nino van Hooff
248f4fc21c
Draw the NoIntentIcon over the intent description hover area.
...
This fixes a bug where the NoIntent tooltip was hidden by the intent
description
CURA-6936
(cherry picked from commit 315b93a152
2019-11-04 11:13:48 +01:00
Jaime van Kessel
41d1ef5f93
Switch to prepare stage when starting a new project
...
Fixes #6596
2019-11-04 10:44:10 +01:00
Vincent Riemens
bc9f91a8a6
Add files via upload
2019-11-04 10:41:12 +01:00
Vincent Riemens
3368757897
Delete Leapfrog_Bolt_Pro_pva_grey_standard.inst.cfg
2019-11-04 10:40:53 +01:00
Vincent Riemens
dbdd73790b
Add files via upload
2019-11-04 10:39:15 +01:00
Vincent Riemens
ee41335919
Delete leapfrog_bolt_pro.def.json
2019-11-04 10:38:37 +01:00
Ghostkeeper
d25ca84c6c
Make small feature max length a child setting of small hole max size
...
The small hole max size is not used in CuraEngine. It may not be a leaf setting then. Instead, Small Feature Max Length is used which is directly dependent on Small Hole Max Size. They are simply different units of the same thing. This is how we should structure these settings then.
2019-11-03 02:20:18 +01:00
Ghostkeeper
0c846d76a1
Correct setting name and description of wipe Z hop
...
This hop is executed regardless of whether or not the wipe is retracted.
2019-11-03 01:41:51 +01:00
Ghostkeeper
e2b8a44e2d
Better defaults for retraction and z hop during wipe
...
Let's use the normal retraction and z hop settings to be safe. Should work fine.
2019-11-03 01:18:35 +01:00
Ghostkeeper
0b6938e9aa
Specify that this setting is about wiping
2019-11-03 01:14:38 +01:00
Vincent Riemens
90bb56d864
Add files via upload
2019-11-01 16:39:36 +01:00
Ghostkeeper
d145945b25
Fix mistakes in extruder-definition inter-referencing
2019-11-01 15:02:14 +01:00
Nino van Hooff
23843b0944
Merge remote-tracking branch 'origin/master'
2019-11-01 13:55:05 +01:00
Nino van Hooff
315b93a152
Draw the NoIntentIcon over the intent description hover area.
...
This fixes a bug where the NoIntent tooltip was hidden by the intent
description
CURA-6936
2019-11-01 13:54:52 +01:00
