GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-02 16:54:23 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,127 Commits 291 Branches 260 Tags
Commit Graph

349 Commits

Author SHA1 Message Date
Nino van Hooff
b70e6b0172
Merge pull request #7969 from maukcc/master 
HMS434 update
 2020-06-29 11:48:55 +02:00
Ghostkeeper
201b6b6f89
Merge branch 'master' of https://github.com/beamup3d/Cura into beamup3d-master 2020-06-26 16:55:27 +02:00
fred
c6deb397dd
Create tinyboy.def.json 
save

update

update

update

update

fix

Update tinyboy_e16.def.json

fix

fix
 2020-06-15 18:01:59 +02:00
fred
c380dc5f25
Add TinyBoy & mago 3D Printer 
fix update error

try to fix

try to fix

fix again

Update tinyboy.def.json

Update tinyboy_ra20.obj

Update tinyboy_e10_extruder_0.def.json

update again

Update tinyboy.def.json

update
 2020-06-15 18:01:45 +02:00
fred
3d88c96b7a
Add TinyBoy profile 
Updated

Update

TinyBoy / mago

Add TinyBoy and mago 3D Printer profile
 2020-06-15 18:01:29 +02:00
Jaime van Kessel
66a183b8e2
Merge branch 'master' of https://github.com/Joyce-lujunxu/Cura 2020-06-15 14:14:13 +02:00
BeamUp 3D
d165842141
Add beamup_l_extruder_0.def.json 2020-06-13 13:41:39 +03:00
orel
36f70e43c2 Extruders gcodes sequences were inverted... 2020-06-10 11:43:44 +02:00
Joyce-lujunxu
5da5dc0047
Add files via upload 2020-06-09 19:05:30 +08:00
Orel
b0edcc1c18 Merge remote-tracking branch 'upstream/master' into dagoma_bicolor 2020-06-02 18:27:30 +02:00
Konstantinos Karmas
856221f0b6
Merge pull request #7030 from gandzia44/master 
ATMAT machines profiles
 2020-06-02 16:25:55 +02:00
maukcc
043ed2af81 HMS434 update 
Let host know we changed tools at beginning of print
 2020-05-29 10:09:04 +02:00
Orel
38fce5aa0e Remove useless newlines 2020-05-27 19:13:05 +02:00
Konstantinos Karmas
e0734ff130
Merge pull request #7681 from sm3dp/add-lotmaxx-sc60-printers 
Added Lotmaxx sc60 profile
 2020-05-26 16:42:30 +02:00
orel
fc7f1bb0ee Merge remote-tracking branch 'upstream/master' into dagoma_bicolor 2020-05-26 10:47:01 +02:00
Jaime van Kessel
7adcce08eb
Merge branch 'eMotionTech_I3MetalMotion' of https://github.com/pfelecan/Cura 2020-05-25 14:08:55 +02:00
Konstantinos Karmas
1ec3c562ff
Merge pull request #7769 from paalex/master 
add 2nd extruder to Tevo Tarantula and Tevo Tarantula Pro printers
 2020-05-20 15:06:04 +02:00
orel
863d5460bc Separate mono/dual extruders Dagoma printers profiles 2020-05-20 11:41:49 +02:00
Ghostkeeper
7b87538890
Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master 2020-05-18 13:42:57 +02:00
paalex
1fb67f903c add 2nd extruder to Tevo Tarantula printers 2020-05-15 20:25:27 -04:00
maukcc
80a886f582 HMS434 upgrade 
Added host chamber fan support
 2020-05-15 09:24:17 +02:00
sm3dp
218d789cdb change sc60 extruder left name 2020-05-13 11:02:06 +08:00
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 037eb9a898e8625497a0f44e31746155c8523662
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 109b5cf8e3311283f60ffb73dc165974cf619faa
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Fri Apr 24 15:34:31 2020 +0200

    Spacing much consistent after editor reconfiguration.

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

    Spacing much consistent after editor reconfiguration.

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

    plateform image renamed.

commit e0d95c12558f7da8dcbc1aab966e92a1d67bdebb
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 a069ed5f946b0a9d9830d8ba39c89e7cbe1ffdb2
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Thu Apr 23 23:15:36 2020 +0200

    Reducing size of meshes and image(s)

commit 256d4a5576802ea9c116b4901a79ae17b96ade99
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 ec4cbe6809ba80f84a065a2d875f591110c751ff
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Wed Apr 22 20:44:30 2020 +0200

    STL size reduced as much I could.

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

    Adding Anycubic Predator printer

commit e4491b30bdc9e9642737d6851c8f7571be368798
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