Commit graph

627 commits

Author SHA1 Message Date
Remco Burema
ac429d496a
Merge https://github.com/kaleidoscopeit/Cura into kaleidoscopeit-master 2020-05-12 16:41:05 +02:00
maukcc
1afd8cd754 HMS434 update 2020-05-12 15:44:22 +02:00
maukcc
70fa227274 HMS434 update 2020-05-12 13:32:55 +02:00
Psych0meter
9976889e5e
Leapfrog Creatr HS / XL Integration (#7723)
Add the leapfrog creatr HS and leapfrog creatr XL
2020-05-12 11:13:51 +02:00
maukcc
598a32eb1e HMS434 update
set pid depending on nozzle temp
set chamberfans according to temp
2020-05-12 10:34:29 +02:00
Ghostkeeper
98a5321b2b
Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master
Conflicts:
	resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg -> Setting version was updated at the same time.
	resources/quality/hms434/pla/hms434_0.4_pla_normal.inst.cfg -> Deleted while we updated setting version.
	resources/quality/hms434/pla/hms434_0.8_pla_coarse.inst.cfg -> Deleted while we updated setting version.
	resources/quality/hms434/pla/hms434_0.8_pla_normal.inst.cfg -> Deleted while we updated setting version.
2020-05-11 14:03:54 +02:00
sm3dp
f7c2f92f82 remove some useless property and change platform mesh name 2020-05-11 18:12:03 +08:00
Ghostkeeper
c9a9579d8b
Merge branch 'master' of https://github.com/64bittuning/Cura into 64bittuning-master 2020-05-11 09:16:01 +02:00
Peter Felecan
5f08fbd83a Addition of the I3 Metal Motion printer by eMotionTech and the afferent extruder. 2020-05-08 17:11:28 +02:00
Ghostkeeper
1aec5d3452
Merge branch 'anycubic_mega_zero' of https://github.com/kad/Cura into kad-anycubic_mega_zero 2020-05-07 13:55:43 +02:00
sm3dp
c2c0f0b902 Added Lotmaxx sc60 profile 2020-05-05 16:00:42 +08:00
Evg33
ffc97c3d5b UNI 3D Start/stop codes tuning. 2020-05-03 19:12:19 +03:00
Alexander D. Kanevskiy
d62e7be193 Adding profile for Anycubic Mega Zero
Dimensions: 220x220x250
Nozzle: 0.4
Print speed: 20-100 (40 for normal quality)
2020-05-02 21:49:48 +03:00
konskarm
98eda12f60
Merge pull request #7418 from Evg33/UNI_3D_profiles
Adding profiles for UNI 3D Series printers
2020-04-29 17:24:24 +02:00
Evg33
436d36ae90 UNI3D: fix startup code and machine_extruder_count=2 2020-04-29 18:10:43 +03:00
maukcc
4f0165e0bd HMS434 update 2020-04-29 13:35:24 +02:00
64bittuning
5123623b50 Create tronxy_base_extruder_0.def.json 2020-04-28 23:21:44 -04:00
Evg33
b87444f571 UNI3D setting_version 13 2020-04-28 16:26:25 +03:00
Evg33
61cfcf6b08 UNI3D extruders 2020-04-28 15:43:54 +03:00
Ghostkeeper
68e8261c21
Squashed commit of the following:
commit 96187e21580e10ba3006895c0a0613cb1fa66c4d
Author: Ghostkeeper <rubend@tutanota.com>
Date:   Tue Apr 28 11:52:29 2020 +0200

    Update setting_version of recently merged profiles

    None of these had any settings that needed to be deleted or updated. I'm updating them so that they load properly in Cura 4.7.

    Contributes to issue CURA-7403.

commit 80bea3caa14139c189fc10c6874867d104df2fd7
Merge: 174b58374 037eb9a89
Author: Ghostkeeper <rubend@tutanota.com>
Date:   Tue Apr 28 11:41:31 2020 +0200

    Merge branch 'master' of https://github.com/curso007/Cura into curso007-master

commit 037eb9a898
Merge: 109b5cf8e 772fd650a
Author: Cataldo URSO <curso007@users.noreply.github.com>
Date:   Fri Apr 24 19:36:01 2020 +0200

    Merge pull request #2 from Ultimaker/master

    Resync with Ultimaker

commit 109b5cf8e3
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Fri Apr 24 15:34:31 2020 +0200

    Spacing much consistent after editor reconfiguration.

commit cdea1a7d59
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Fri Apr 24 15:28:18 2020 +0200

    Spacing much consistent after editor reconfiguration.

commit bc8422d4ee
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Fri Apr 24 00:14:38 2020 +0200

    plateform image renamed.

commit e0d95c1255
Merge: a069ed5f9 b1e95d7a8
Author: Cataldo URSO <curso007@users.noreply.github.com>
Date:   Fri Apr 24 00:03:57 2020 +0200

    Merge pull request #1 from Ultimaker/master

    Resync with ultimaker

commit a069ed5f94
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Thu Apr 23 23:15:36 2020 +0200

    Reducing size of meshes and image(s)

commit 256d4a5576
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Wed Apr 22 21:03:02 2020 +0200

    Try to fix errors comming from the CI

commit ec4cbe6809
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Wed Apr 22 20:44:30 2020 +0200

    STL size reduced as much I could.

commit 8a6468943a
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Wed Apr 22 18:17:13 2020 +0200

    Adding Anycubic Predator printer

commit e4491b30bd
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Tue Apr 21 18:51:29 2020 +0200

    Adding the mesh for the FLSUN QQ-S thanks to Eddy Emck
2020-04-28 11:55:15 +02:00
konskarm
cf604c0f20
Merge pull request #7497 from maukcc/master
HMS434 update
2020-04-21 16:50:22 +02:00
maukcc
59f105c1b9 HMS434 update
wipe codes changed
2020-04-20 15:50:11 +02:00
gandzia44
e2d85e4b0f fixed my mistake in changing definition name 2020-04-18 21:39:57 +02:00
gandzia44
097c6805bd changed version of variants and names of files 2020-04-18 20:50:33 +02:00
Ghostkeeper
309d3fc56f
Merge branch 'master' of https://github.com/kaleidoscopeit/Cura into kaleidoscopeit-master
Conflicts:
	resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_Draft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_Fast_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_Normal_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_petg_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg: Modified by Ultimaker to update version number, but deleted by Kaleidoscopeit.
	resources/variants/deltacomb/deltacomb_dc20_fbe025.inst.cfg: Modified by Ultimaker to update version number, and author added by Kaleidoscopeit.
	resources/variants/deltacomb/deltacomb_dc20_fbe040.inst.cfg: Modified by Ultimaker to update version number, and author added by Kaleidoscopeit.
	resources/variants/deltacomb/deltacomb_dc20_fbe060.inst.cfg: Modified by Ultimaker to update version number, and author added by Kaleidoscopeit.
2020-04-07 23:40:10 +02:00
Evg33
d3da609746 UNI3D Extruders 2020-04-05 19:00:51 +03:00
Evg33
293be8fdb9 UNI 3D Series printers 2020-04-05 18:44:34 +03:00
konskarm
95cefbe895
Merge pull request #7368 from maukcc/master
HMS434 update
2020-03-30 15:53:09 +02:00
maukcc
b92d0a83ac HMS434 update 2020-03-29 14:21:57 +02:00
Deltacomb
f61051e4e7 New Machines Fixes (3) 2020-03-26 10:28:05 +01:00
Deltacomb
f81889a3bc New Machines Fixes (2) 2020-03-26 10:04:33 +01:00
Deltacomb
9012dd7c52 Fixed IDs in extruders 2020-03-26 00:53:09 +01:00
Deltacomb
16bd9f4f1d New Deltacomb Models and updates 2020-03-26 00:28:31 +01:00
Nino van Hooff
fefdef6781
Merge pull request #7136 from hussainsail2002/master
Adding Fabx Pro Machine
2020-03-24 16:54:14 +01:00
Ghostkeeper
44b61d370f
Merge branch 'master' of github.com:Ultimaker/Cura 2020-03-19 14:48:45 +01:00
Ghostkeeper
df0a3143d2
Merge branch 'master' of https://github.com/Magicfirm/Cura into Magicfirm-master 2020-03-19 14:43:47 +01:00
konskarm
7d2391c4ed
Merge pull request #7101 from yyh1002/master
Add DXU machine profile
2020-03-18 16:12:50 +01:00
konskarm
39f41e8e74
Merge pull request #7112 from mehmetsutas/master
Update Rigid3D Printer Profiles
2020-03-17 16:37:58 +01:00
ODUCCEU
1ccf73d11e Add Flying Bear Ghost 4S Printer 2020-03-08 18:37:48 +03:00
Ghostkeeper
c4b060ca48
Merge branch 'dagoma_discoultimate' of https://github.com/0r31/Cura into 0r31-dagoma_discoultimate 2020-03-02 13:38:53 +01:00
Hussain Bhavnagarwala
8f70bb934e
Update fabxpro_extruder_0.def.json 2020-02-26 16:56:03 +05:30
Ghostkeeper
dba35dc664
Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master 2020-02-25 14:34:36 +01:00
Ghostkeeper
43e373af02
Merge branch 'master' of https://github.com/FN5969/Cura into FN5969-master 2020-02-24 17:00:12 +01:00
yyh1002
b49a1e35f8 DXU profile 2020-02-19 22:45:26 +11:00
Hussain Bhavnagarwala
4878052cc1
Add files via upload
FabX pro extruder file
2020-02-19 13:51:31 +05:30
Mehmet Sutas
d1158a7a96 Fix extruder config 2020-02-18 15:35:54 +03:00
jos@mauk.cc
a53b1fc1d9 HMS434 update
support settings
toolchange settings
2020-02-17 15:28:38 +01:00
Mehmet Sutas
0237904292 CI Fix 2020-02-17 01:18:14 +03:00
yyh1002
050ab50062 DXU defenition 2020-02-15 18:46:51 +11:00
Ghostkeeper
1bb9371d08
Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master 2020-02-10 16:40:17 +01:00