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

2725 Commits

Author SHA1 Message Date
grk3010
b8d74c8b4d Update smoothie_dual.def.json 
Complete printer definition including "Machine_always_write_active_tool" setting.
 2020-05-11 16:12:49 -04:00
Ghostkeeper
bf8b01efe3
Fix preferred quality type 
This quality type is the only one available.
 2020-05-11 14:10:08 +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
d4e8d1eba9 change polygon properties 2020-05-11 19:10:30 +08:00
sm3dp
f7c2f92f82 remove some useless property and change platform mesh name 2020-05-11 18:12:03 +08:00
Ghostkeeper
a2946b057a
Merge branch 'master' of github.com:Ultimaker/Cura 2020-05-11 11:41:30 +02:00
Ghostkeeper
0bb65c86ec
Fix default quality level 
Standard doesn't exist for this printer. It's 'normal'. I'm guessing this was a leftover from when this was copied from the Creality printers.
 2020-05-11 11:40:14 +02:00
Ghostkeeper
a0f4305420
Remove warnings that will never be visible 
This was copied from the error state, where it does matter, but the warning state is not shown if the setting is not enabled.

Contributes to issue CURA-7384.
 2020-05-11 11:02:37 +02:00
Ghostkeeper
c79123e6fa
Use spaces to indent 2020-05-11 09:51:20 +02: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
8f9408a76f
Apply version upgrade maximum deviation change to built-in profiles 
For some this is not exactly restored as their original since this setting is limited to micron precision as well.

Contributes to issue CURA-7420.
 2020-05-08 11:15:55 +02:00
Ghostkeeper
9d178f26a7
Increment setting version to 15 
Once more into the fray.

Contributes to issue CURA-7420.
 2020-05-08 09:43:02 +02:00
Ghostkeeper
b02354b209
Merge branch '4.6' 
Conflicts:
	plugins/VersionUpgrade/VersionUpgrade460to462/VersionUpgrade460to462.py -> On master we removed the getCfgVersion function, while we moved the entire plug-in to a different folder in 4.6.
	resources/definitions/skriware_2.def.json -> On master we merged a PR that changes more or less all settings, while on 4.6 we doubled the maximum deviation.
 2020-05-08 09:10:02 +02:00
Ghostkeeper
47bf094c52
Fix internal conflicts within the Anycubic Mega Zero printer 
This definition specified that the maximum E speed is 25mm/s but then said that the retraction speed is 30mm/s. I've changed the maximum E speed to 30mm/s then because apparently that's what the definition author was testing with.
This definition specified that the maximum Z speed is 5mm/s but the default Z hop speed is 10mm/s. I've set the Z hop speed to 5mm/s because it was not initially overridden by the definition author, but apparently 5mm/s is the limit.

Contributes to issue CURA-7431.
 2020-05-07 16:50:04 +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
grk3010
731455c12b Create smoothie_dual.def.json 2020-05-06 23:23:42 -04:00
grk3010
cbe87a39a8 Add "Always Write Active Tool" machine setting. 
Required for dual extruder printing with Smoothieware firmware.
 2020-05-06 22:44:39 -04:00
maukcc
157c2d562e HMS434 update 
added generic pla to the material list
 2020-05-06 15:56:00 +02:00
konskarm
a2737ea47d
Merge pull request #7663 from Evg33/UNI_3D_codes 
UNI 3D tuning.
 2020-05-06 09:49:35 +02:00
sm3dp
c2c0f0b902 Added Lotmaxx sc60 profile 2020-05-05 16:00:42 +08:00
Evg33
d28a88f90c UNI 3D bugfix layer_0 temperatures 2020-05-04 14:42:14 +03:00
Kostas Karmas
f25547d394 Double the meshfix_maximum_deviation 
CURA-7421
 2020-05-04 13:19:35 +02:00
Kostas Karmas
9bf0255046 Up the setting version to 14 in all the resourses 
CURA-7421
 2020-05-04 13:13:07 +02:00
Evgeny Z
82717845bf
UNI 3D startup code 2020-05-03 22:39:28 +03:00
Evg33
ffc97c3d5b UNI 3D Start/stop codes tuning. 2020-05-03 19:12:19 +03:00
Gerard Rubio
bba0a96576
Fixed bed dimensions 2020-05-03 11:54:45 +02: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
64bittuning
2ab2a204a8 Update tronxy_x.def.json 2020-05-01 10:33:24 -04:00
64bittuning
5a0eda9cfe fixed indentation 2020-05-01 10:22:37 -04:00
Mark Burton
690eb4c04a Make Infill Line Directions visible for cubicsubdiv infill pattern. 2020-05-01 08:55:21 +01:00
64bittuning
b96383770b Update tronxy_x.def.json 
Fixed error in speed_travel_layer_0. calculation was incorrect.
 2020-04-30 14:33:19 -04:00
64bittuning
12ccd8298c Machine profile update 
Updated and condensed machine profiles. Edited formatting to make more sense and be consistent across all files. I3 printers present print to the front, CoreXY move to 0. Speeds are set per machine based orr factory firmware, which should provide more accurate "Estimated time" values "out of the box".
 2020-04-30 14:18:14 -04:00
64bittuning
d08d8a26ed Update tronxy_x.def.json 
replacing incorrectly uploaded file that was used during troubleshooting
 2020-04-30 11:30:40 -04:00
Jaime van Kessel
b7081f9c68
Merge branch 'master' of github.com:Ultimaker/Cura into 3mf_platform_meshes 2020-04-30 13:47:28 +02: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
64bittuning
fe90632a38 Update tronxy_d01.def.json 2020-04-28 23:37:25 -04:00
64bittuning
66b05f5f50 Update tronxy_d01.def.json 
repaired old inherit
 2020-04-28 23:35:52 -04:00
64bittuning
1eaa384676 Tronxy Definition files 
Reposting the original set of def files from #7553. More to follow.
 2020-04-28 23:06:26 -04:00
Evg33
b87444f571 UNI3D setting_version 13 2020-04-28 16:26:25 +03:00
Evg33
6b51f62411 UNI3D platforms 2020-04-28 16:09:10 +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
Ghostkeeper
f4f990708f
Remove old 'category' metadata 
Most of it was incorrect and very inconsistent too. These are not used by our code any more.
 2020-04-28 09:27:31 +02:00
Remco Burema
b1e95d7a80
The Pro has a smaller build-volume apparently. 2020-04-23 20:34:25 +02:00
Ghostkeeper
a0dc78cb39
Merge branch 'master' of https://github.com/dpodhola/Cura into dpodhola-master 2020-04-22 19:04:53 +02:00
maukcc
f66cf6f4d0 HMS434 update 
material exclusion
 2020-04-22 13:46:52 +02:00
Ghostkeeper
888937d03b
Use initial layer bed/print temperatures 
These are more likely what the user wants the printer to start up to.

Fixes #7505.
 2020-04-22 11:39:10 +02:00
konskarm
cf604c0f20
Merge pull request #7497 from maukcc/master 
HMS434 update
 2020-04-21 16:50:22 +02:00