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
Jaime van Kessel
4f569194ec
Add extra typing
2019-11-08 17:36:50 +01:00
Jaime van Kessel
463822f10f
Fix some typing issues
2019-11-08 16:50:23 +01:00
Jaime van Kessel
b8f76d7bfb
Use QtApplication instead of Application
...
In live code it doesn't cause problems, but the static checker found it
2019-11-08 14:13:19 +01:00
Jaime van Kessel
e2a387b246
Add own getInstance for curaApplicaiton
...
This makes the typing a bit smarter
2019-11-08 13:59:38 +01:00
Jaime van Kessel
9940bc8551
Merge branch 'master' of github.com:Ultimaker/Cura
2019-11-08 13:38:58 +01:00
Jaime van Kessel
00078fd659
Remove a bunch of unused imports
2019-11-08 13:38:42 +01:00
Lipu Fei
832b4f28dc
Fix merge conflicts with 4.4
2019-11-07 13:56:20 +01:00
ninovanhooff
d503f9df25
Merge pull request #6635 from Ultimaker/CURA-6854_align_layer_label_top_bottom
...
Fix window resize bug in LayerSlider concerning handle position
2019-11-07 13:04:01 +01:00
Nino van Hooff
ba6cf8eae5
Fix window resize bug in LayerSlider concerning handle position
...
Upper handle position would not be updated on resize
CURA-6854
2019-11-07 12:46:45 +01:00
Remco Burema
16b90d00b7
Merge pull request #6615 from Ultimaker/CS-476_improve_packages_api_speed
...
Packages API speed improvements
2019-11-07 11:31:24 +01:00
ChrisTerBeke
7dc38cd55d
Merge branch '4.4' into CS-476_improve_packages_api_speed
2019-11-07 10:31:37 +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
d346dd4090
Fix TestDefinitionContainer
2019-11-06 15:43:43 +01:00
Lipu Fei
33f876d749
Fix leapfrog bolt pro definition files
2019-11-06 15:43:22 +01:00
Lipu Fei
179d2c924d
Fix typing
2019-11-06 12:59:51 +01:00
Jaime van Kessel
c22281ad9c
Merge branch '4.4' of github.com:Ultimaker/Cura
2019-11-05 15:00:14 +01:00
Jaime van Kessel
04304c1515
Correctly sort the intents in QualityManagementModel
...
CURA-6956
2019-11-05 14:59:44 +01:00
Jaime van Kessel
ff8d8735de
Make the intents in QualityManagementModel also translated
...
CURA-6956
2019-11-05 14:57:44 +01:00
Jaime van Kessel
674d8d387b
Move translations for intent to it's own file
...
CURA-6956
2019-11-05 14:52:12 +01:00
Jaime van Kessel
cb7552a926
Merge branch 'CURA-6854_align_layer_label_top_bottom' of github.com:Ultimaker/Cura
2019-11-05 13:23:34 +01:00
Jaime van Kessel
870db0641b
Ensure that machines with 1.75mm filament select the right preferred material
...
CURA-6950
2019-11-05 13:11:49 +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
8baa009f1f
Use IsEnterpriseVersion in Toolbox
...
CURA-6569
2019-11-05 10:53:52 +01:00
Lipu Fei
b843210fd3
Add machine name to the machine settings dialog
2019-11-05 10:48:18 +01:00
Lipu Fei
792c365e9e
Remove hardcoded essentials
...
CURA-6569
2019-11-05 10:40:33 +01:00
Lipu Fei
2f41cf4218
Merge pull request #6623 from Ultimaker/CURA-6569_toolbox_qml_refactor
...
Organize Toolbox (marketplace) qml files according to type
2019-11-05 10:38:42 +01:00
Lipu Fei
689562e61b
Add IsEnterpriseVersion flag
...
CURA-6569
2019-11-05 09:59:35 +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
Nino van Hooff
ed7134ded8
Organize Toolbox (marketplace) qml files according to type
...
CURA-6569
2019-11-04 17:35:24 +01:00
Jaime van Kessel
9d9d82dc24
Make logging when using a fallback for preferred material more explicit
...
CURA-6950
2019-11-04 16:58:57 +01:00
Ghostkeeper
f48a5ec028
Fix zigzag initial layer pattern for Skriware 2
2019-11-04 16:43:54 +01:00
Ghostkeeper
b34c0e8eb7
Don't check A: and B: drives for USB sticks
...
Fixes #2438 .
2019-11-04 16:35:49 +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
Nino van Hooff
7af5f132e0
Only show toolbox/marketplace welcome screen for Essentials builds
...
CURA-6569
2019-11-04 16:15:00 +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
Jaime van Kessel
2e3c3c7bd0
Change the engineering intent tooltip (again)
...
Let's hope that this is the final one...
CURA-6890
2019-11-04 16:07:15 +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
