Commit graph

8170 commits

Author SHA1 Message Date
Jaime van Kessel
0942bebaf8 Move troubleshoot link to help menu 2019-01-22 16:19:29 +01:00
Remco Burema
eda7ec492e 'Prime-tower brim' setting only visible when adhesion is set to 'None'. Also fix spelling. [CURA-5864] 2019-01-22 13:32:38 +01:00
Jinbuhm Kim
18cea54780 Fix material menu issue 2019-01-22 21:22:28 +09:00
Jinbuhm Kim
d1d344d739 change the extruder name & file name 2019-01-22 20:56:44 +09:00
Lipu Fei
9bc748ffa1 Fix scrolling with configurations
CURA-6125
2019-01-22 11:48:41 +01:00
Jinbuhm Kim
db17116b37 Fix Json error 2019-01-22 11:56:18 +09:00
Remco Burema
ccfa6ebb92 Set proper maximum values for brim width and line-count. [CURA-6094] 2019-01-21 17:47:01 +01:00
Ian Paschal
bc9831abd1 Add color theming to monitor tab
Contributes to CL-1212
2019-01-21 17:10:41 +01:00
Ian Paschal
406ef20802 Revert "Add theme colors"
This reverts commit 2e5eb61144.
2019-01-21 14:05:24 +01:00
Ian Paschal
2e5eb61144 Add theme colors
Contributes to CL-1212
2019-01-21 13:07:16 +01:00
steverc1572
d91d3713f3
Add files via upload
Reduced file size to under 1MB as requested
2019-01-20 18:31:34 -06:00
steverc1572
ad9b367b2a
Delete cr-x.stl 2019-01-20 18:30:25 -06:00
Diego Prado Gesto
5e3dedf62b Merge branch '4.0' 2019-01-20 21:25:19 +01:00
steverc1572
92222ab3a3
Update cr-x_extruder_1.def.json 2019-01-20 14:23:42 -06:00
steverc1572
17c236fe53
Update cr-x_extruder_0.def.json 2019-01-20 14:22:56 -06:00
steverc1572
4637257f03
Update creality cr-x.def.json
Updated name to Creality3D instead of Creality
2019-01-20 14:21:54 -06:00
steverc1572
ff005eb01f
Add files via upload 2019-01-18 15:47:26 -06:00
Patrick G
2de93fe79b
Added new firmeware definition
Added latest anycubic chiron firmeware and created a pull request on https://github.com/Ultimaker/cura-binary-data/pulls
FileName: MarlinChiron.hex
2019-01-18 13:29:14 +01:00
Patrick G
592dbfd52c
Removed firmware definition + code refactoring
- removed firmware definition because it only exists in my local cura 
- refactored code
2019-01-18 12:24:24 +01:00
Jaime van Kessel
a51289d7ce Merge branch 'not_activate_when_no_materials' of github.com:Ultimaker/Cura 2019-01-18 11:19:28 +01:00
Jaime van Kessel
490d933923
Merge pull request #4895 from matshch/wanhao_d9
Added definitions for Wanhao Duplicator 9
2019-01-18 11:11:39 +01:00
Jaime van Kessel
cbcbbb8516
Merge pull request #5093 from pinchies/add-a-u20
fix start gcode on alfawise u20
2019-01-18 11:03:32 +01:00
Nicolas NSSM
057c30f86e Create alfawise_u30.def.json (#5083)
* Create alfawise_u30.def.json

I basically took the base from https://github.com/Ultimaker/Cura/blob/master/resources/definitions/alfawise_u20.def.json and compiled it with the old Cura ini given by Alfawise on the SD card.
I don't know anything about Cura config so double check it real good!

* Update alfawise_u30.def.json

* Create alfawise_u30_extruder_0.def.json

* Update alfawise_u30.def.json

* Update alfawise_u30.def.json

* Update alfawise_u30.def.json

* Update alfawise_u30.def.json

Turn off the fan at the end of a print
2019-01-18 10:40:59 +01:00
Jaime van Kessel
bff1796f91
Merge pull request #5003 from DanTup/patch-1
Add Monoprice Ultimate based on Wanhao D6
2019-01-18 09:59:03 +01:00
DragonJe
0b69d655db Adding NWA3D A5 printer (#5118)
* Add files via upload

* Add files via upload

* Create nwa3d_a5_normal.inst.cfg

* Add files via upload

* Add files via upload

* Delete nwa3d_a5.def.json

* Create nwa3d_a5.def.json

* Delete nwa3d_backplate.png

* Update resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>

* Update resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>

* Update resources/definitions/nwa3d_a5.def.json

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>

* Update resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>

* Update resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>

* Update resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>

* Update resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>

* Update resources/definitions/nwa3d_a5.def.json

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>

* Update resources/definitions/nwa3d_a5.def.json

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>

* Update resources/definitions/nwa3d_a5.def.json

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>

* Update resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>

* Update resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>

* Update resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>

* Update resources/definitions/nwa3d_a5.def.json

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>

* Update resources/extruders/nwa3d_a5_extruder_0.def.json

Co-Authored-By: DragonJe <41123088+DragonJe@users.noreply.github.com>
2019-01-17 17:39:00 +01:00
Jaime van Kessel
56fa30b88a Merge branch 'master' of github.com:Ultimaker/Cura 2019-01-17 17:29:38 +01:00
Jaime van Kessel
8abeab9202 Merge branch 'patch-1' of https://github.com/TiZYX/Cura 2019-01-17 17:29:26 +01:00
Ghostkeeper
4cb7ee5fc7
Give tabs a height
It is used in the profile assistant. I don't know if it should be used, but it is.

Contributes to issue CURA-6086.
2019-01-17 17:23:21 +01:00
Remco Burema
e7ba543fec
Merge pull request #5172 from Ultimaker/resize_bar_ui_changes
Change the style of the resize bar
2019-01-17 16:59:18 +01:00
Ghostkeeper
a01063b7d8
Merge branch '4.0' 2019-01-17 16:32:18 +01:00
Ghostkeeper
13c1a70677
Fix margin
The theme entry didn't exist.

Discovered during work on CURA-6086, but for the rest unrelated.
2019-01-17 16:31:50 +01:00
Remco Burema
98ce0caaef
Merge pull request #5158 from Ultimaker/marketplace_use_busy_indicator
Remove loading gif
2019-01-17 16:17:00 +01:00
Jaime van Kessel
94cf61ca18 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-01-17 14:28:35 +01:00
Jaime van Kessel
aff2ffc67a Merge branch 'preference_qml_early_out' of github.com:Ultimaker/Cura into 4.0 2019-01-17 14:23:06 +01:00
Jaime van Kessel
12a120f044 Slightly modify the variant label to match more with the monitor tab
CURA-6100
2019-01-17 14:21:11 +01:00
Jaime van Kessel
0ce0228f76 Merge branch 'feature_configuration_menu_variant' of https://github.com/fieldOfView/Cura into 4.0 2019-01-17 14:03:43 +01:00
Jaime van Kessel
15563a756f Merge branch '4.0' of github.com:Ultimaker/Cura 2019-01-17 13:42:58 +01:00
Jaime van Kessel
a41cc9efbe Merge branch 'CURA-6113_fix_master_version_upgrade' of github.com:Ultimaker/Cura 2019-01-17 13:12:41 +01:00
Lipu Fei
2aa985c6de Update all profiles to setting_version 7
CURA-6113
2019-01-17 11:49:26 +01:00
Lipu Fei
3b3baeac03 Remove hard-coded account URLs in QMLs
CURA-6117
2019-01-17 11:20:21 +01:00
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
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
TiZYX
04ff27c5f3
Update tizyx_k25_normal.inst.cfg 2019-01-16 15:28:00 +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
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
Remco Burema
f057c9a7df Prevent spurious updates to 'onPreferenceChanged's if the preference doesn't match. 2019-01-15 17:15:12 +01:00