GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-21 12:09:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,820 Commits 290 Branches 260 Tags
Commit Graph

191 Commits

Author SHA1 Message Date
Ghostkeeper
3a6534a3a4
Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master 
Conflicts:
	resources/definitions/hms434.def.json -> We both fixed the gantry height value vs. default_value problem.
 2019-05-13 15:11:32 +02:00
maukcc
abf5719f11 HMS434 updates 
Small updates for the HMS434 machine
 2019-05-13 10:01:03 +02:00
Mark Bernard
c5b903b2c2
Create anet_a6_extruder_0.def.json 
Add Anet A6 extruder to Cura printer definitions
 2019-05-02 12:11:15 -04:00
frylock34
67ccbc7677 add START and STE320 profiles 2019-04-25 15:42:59 +04:00
Lipu Fei
992040d4e6
Merge pull request #5497 from TinkerGnome/Mark2_definition 
add Mark2 definition files
 2019-04-04 08:08:46 +02:00
maukcc
7f2fcb16a8 Adding platform to HMS434 2019-03-29 14:26:42 +01:00
maukcc
afb6810bac Add HMS434 
Add HMS434 machine
 2019-03-27 10:23:59 +01:00
TinkerGnome
5bcb4e9554 add Mark2 definition files 2019-03-23 19:50:23 +01:00
pinchies
6ebc08420a Add profile for JGAurora JGMaker Magic (#5430) 
Add a basic profile for JGAurora JGMaker Magic
 2019-03-18 16:42:43 +01:00
Jaime van Kessel
31c57d0113
Merge pull request #5374 from ValentinPitre/add_tizyx_evy_dual_profile 
Add TiZYX Evy Dual Extruder 3D printer
 2019-03-13 14:12:15 +01:00
Diego Prado Gesto
c62bfc8ece Merge branch '4.0' of https://github.com/BluefireXD/Cura into BluefireXD-4.0 2019-03-08 16:48:56 +01:00
kaleidoscopeit
473e8efac0 Deltacomb 3D - Updated profile 2019-03-07 17:06:49 +01:00
ValentinPitre
ca2be26463 Add TiZYX Evy Dual Extruder 3D printer 2019-03-01 00:34:45 +01:00
Andrew Finkle
5581cd5c2c Added definition, extruder, material, and variants for Discov3ry Complete 2019-02-27 11:55:25 -05:00
Daniel Green
1d4298a27f Fixes the version setting. Adds start and end g-code 2019-02-24 17:40:46 -08:00
Daniel Green
f8bc2e7b07 Adds a printer definition for the FLSUN QQ 2019-02-23 18:21:52 -08: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
bdd4b6438e Add extruder file for Z-Bolt printers. 
Contributes to CURA-6193.
 2019-02-14 11:24:00 +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
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
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
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
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
091416168e
Update cr-x_extruder_1.def.json 2019-02-01 20:42:41 -06:00
steverc1572
ae9075b6c1
Update cr-x_extruder_0.def.json 2019-02-01 20:42:19 -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
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
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
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
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
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
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
2da71fe1f9
Add files via upload 2019-01-16 16:46:07 -06:00
Patrick G
3e925a5cc8
Was wrong file. Changed to extruder def 2019-01-09 22:32:32 +01:00
BluefireXD
75460728e2
Added Anycubic Chiron extruder definition file 2019-01-07 02:48:22 +01:00
Ghostkeeper
542a0cb2d1
Merge branch 'gMax-1.5+-Cura-3.5.1' of https://github.com/gordo3di/Cura into gordo3di-gMax-1.5+-Cura-3.5.1 
Conflicts:
	resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg -> Profile weight vs. new global property
	resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg -> Profile weight vs. new global property
	resources/quality/gmax15plus/gmax15plus_global_normal.inst.cfg -> Profile weight vs. new global property
	resources/quality/gmax15plus/gmax15plus_global_thin.inst.cfg -> Profile weight vs. new global property
 2018-12-27 16:20:37 +01:00
Artem Leshchev
6f5dfc4677 Added definitions for Wanhao Duplicator 9 2018-11-27 19:46:49 +03:00
Diego Prado Gesto
a6a364c337 Move material diameter and machine nozzle size to the extruder 
definition.

Contributes to CURA-5902.
 2018-11-27 13:12:47 +01:00
Diego Prado Gesto
0794a2c8c9 Remove not needed printer and extruder definitions. 
Contributes to CURA-5902.
 2018-11-27 13:03:36 +01:00
Diego Prado Gesto
493b37b0fe Merge branch 'add-a-u20' of git://github.com/pinchies/Cura into pinchies-add-a-u20 2018-11-27 09:44:11 +01:00
pinchies
47ed9e3f5d
deleting the old wrong file.... 2018-11-27 15:09:36 +11:00
pinchies
519e2a3399
uploaded wrong file... oops 2018-11-27 15:06:54 +11:00
Mark
39f123f8e0
Merge pull request #4670 from pinchies/add-cc-mm-2 
Add Cocoon Create ModelMaker
 2018-11-26 15:49:21 +01:00
Mark
88cedd25cf
Merge pull request #4664 from pinchies/master 
Add JGAurora Z-603S
 2018-11-26 15:47:28 +01:00