GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 01:28:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,623 Commits 294 Branches 267 Tags
Commit Graph

1912 Commits

Author SHA1 Message Date
Ghostkeeper
c4e7775034
Merge branch 'master' of https://github.com/wgaonar/Cura into wgaonar-master 2019-02-22 12:33:40 +01:00
Wilmer Gaona
57a4ac87bb
Update mendel90.def.json 
Delete the unnecessary and commented lines
 2019-02-21 11:09:51 -06:00
Ghostkeeper
2d108b3284
Merge branch 'master' of https://github.com/wgaonar/Cura into wgaonar-master 2019-02-21 16:55:36 +01:00
Ghostkeeper
650204dae7
Merge branch '4.0' 2019-02-21 09:09:19 +01:00
Remco Burema
1608adde00 Change of wording Skin Overlap (Percentage). [CURA-6140] 2019-02-20 09:57:48 +01:00
Wilmer Gaona
b60cfaab64
Update mendel90.def.json 
The main modification is to set absolute extrusion and machine center in the start gcode
 2019-02-19 15:32:23 -06:00
Remco Burema
70cd7518ed Adjust description of Skin Overlap (Percentage). [CURA-6140] 2019-02-19 10:47:21 +01:00
Ghostkeeper
275989d193
Merge branch 'fix_prime_tower_brim_for_raft' 2019-02-18 15:17:48 +01:00
Ghostkeeper
8d263e11b1
Merge branch 'mb-enable-gyroid-support' of https://github.com/smartavionics/Cura into smartavionics-mb-enable-gyroid-support 2019-02-18 11:30:49 +01:00
Jaime van Kessel
338f9c0052 Add check for platform mesh & texture 
It simply checks if the file exists
 2019-02-15 14:42:50 +01:00
Mark Burton
1ba7b35ccc Support gyroid support. 
Haven't actually tried printing gyroid support but at least now it can be evaluated.
 2019-02-15 09:19:40 +00:00
Diego Prado Gesto
b06113f807 Merge branch 'contribution' of https://github.com/ValentinPitre/Cura into ValentinPitre-contribution 2019-02-14 11:57:22 +01:00
Diego Prado Gesto
0a325426d0 Merge branch 'Z-Bolt-master' 2019-02-14 11:24:57 +01:00
Diego Prado Gesto
100be642bd Merge branch 'master' of https://github.com/Z-Bolt/Cura into Z-Bolt-master 2019-02-14 11:15:25 +01:00
Remco Burema
a601e0878c Explicitly also check for Raft when checking for prime-tower=brim. [CURA-5864] 2019-02-13 15:46:39 +01:00
ValentinPitre
2515f51e81 correction of settings 2019-02-13 14:48:02 +01:00
Jaime van Kessel
f35ad5cf83 Merge branch 'CURA-5977_test_definition_container' of github.com:Ultimaker/Cura 2019-02-13 14:02:09 +01:00
Aleksei Kvitinskii
22f7d30197 merged extruders and replace value with default_value 2019-02-12 21:13:53 +03:00
ValentinPitre
696289d348 add tizyx evy printer 2019-02-11 19:36:32 +01:00
Jaime van Kessel
ad8c269012
Merge pull request #5289 from ishchenko/patch-1 
Fix Anycubic i3 Mega has_materials
 2019-02-11 15:13:32 +01:00
Ghostkeeper
d2e1c47029
Use spaces instead of tabs 
Yeah, or remove extraneous tabs at the end of a line.
 2019-02-11 08:53:42 +01:00
Max Ishchenko
8e8bb93096
Fix #4867 2019-02-10 09:17:45 +03:00
Remco Burema
da6ff7c5a9 Merge branch 'master' into temp_CURA-5864 2019-02-06 16:23:30 +01:00
Aleksei Kvitinskii
dad8acb106 update position var type 2019-02-06 17:29:43 +03:00
Aleksei Kvitinskii
c270b94ec1 added Z-Bolt printers 2019-02-05 19:57:19 +03:00
Remco Burema
8f5a34c592
Merge pull request #5181 from drzejkopf/patch-4 
Let "retraction_combing" be overriden with "infill" as default value
 2019-02-05 11:25:17 +01:00
Lipu Fei
7964465eb5 UM2+ do not support olsson block upgrade 
CURA-6133
 2019-02-05 07:59:49 +01:00
Diego Prado Gesto
985e7b879c Use preferred quality type instead of redefining the default value of the layer height 
Contributes to CURA-6136.
 2019-02-04 19:34:38 +01:00
Diego Prado Gesto
a09ae516f3 Fix indentation and typos 2019-02-04 09:06:49 +01:00
Diego Prado Gesto
6e976f0cc3 Merge branch 'CR-X' of https://github.com/steverc1572/Cura into steverc1572-CR-X 2019-02-04 08:50:22 +01:00
steverc1572
b32e2c75ad
Update creality cr-x.def.json 
Done the requested changes
 2019-02-01 17:53:01 -06:00
Diego Prado Gesto
467b88296d Merge branch 'CR-X' of https://github.com/steverc1572/Cura into steverc1572-CR-X 2019-02-01 17:54:35 +01:00
Lipu Fei
3dc29a8349 UM2+ do not support olsson block upgrade 
CURA-6133
 2019-02-01 11:05:48 +01:00
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
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
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
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
steverc1572
4637257f03
Update creality cr-x.def.json 
Updated name to Creality3D instead of Creality
 2019-01-20 14:21:54 -06: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
steverc1572
eb1204de9a
Add files via upload 2019-01-16 16:45:08 -06:00