3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 12:17:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
18207 commits 306 branches 270 tags 779 MiB
Commit graph

7904 commits

Author SHA1 Message Date
Lipu Fei
173f125d3e Fix merge conflicts 2019-01-24 14:55:29 +01:00
Jaime van Kessel
aac82a0852 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-01-23 11:18:27 +01:00
Ghostkeeper
9a0a084339
Code style 2019-01-23 11:11:40 +01:00
Jaime van Kessel
fa3e4fe69a Merge branch 'CURA-6094_brim_width_crash_4_0' of github.com:Ultimaker/Cura into 4.0 2019-01-23 09:52:07 +01:00
Remco Burema
ecaa1bc110 Enable prime-tower-brim to work with all adhesion-types except 'Raft' instead of just 'None'. [CURA-5864] 2019-01-22 19:36:33 +01:00
Byeon Ho cheol
7492122a54 4904 cubicon device (#4963) 
* Add Cubicon 3D Printer device profiles.
 - 3DP-110F
 - 3DP-210F
 - 3DP-310F
Cubicon: http://www.3dcubicon.com/en/cubicon/

* Add missed profile file.

* Remove platform mesh files.
Do not necessary platform mesh in Cubicon devices.
 2019-01-22 16:44:04 +01:00
Jaime van Kessel
3d1351c2c3 Merge branch 'master' of https://github.com/jbkim/Cura 2019-01-22 16:20:53 +01:00
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
Diego Prado Gesto
5e3dedf62b Merge branch '4.0' 2019-01-20 21:25:19 +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
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
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
ChrisTerBeke
3d6710d5b6 Merge branch '4.0' into STAR-322_cloud-connection 2019-01-15 13:08:54 +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
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
Jaime van Kessel
090fdbf598 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-01-14 14:17:40 +01:00
ChrisTerBeke
f2922e2405 Merge branch '4.0' into STAR-322_cloud-connection 2019-01-14 14:16:35 +01:00