GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-01 00:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,808 Commits 291 Branches 260 Tags
Commit Graph

1940 Commits

Author SHA1 Message Date
Diego Prado Gesto
0286c701fd Change setting_version to be the same as in current master 
Also change the profiles to act as global profiles and fix indentation.

Contributes to CURA-6080.
 2019-03-08 17:00:17 +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
Ghostkeeper
1d25f52df6
Merge branch '4.0' 2019-03-06 15:23:55 +01:00
Ghostkeeper
380d8ce0c2
Merge branch 'afinkle-master' 2019-03-06 14:23:15 +01:00
Lipu Fei
4979b401b3 Disable prime blob by default for CFFF 
CURA-6282
 2019-03-06 11:02:55 +01:00
Ghostkeeper
76d9503777
Replace travel_speed with speed_travel 
The setting key was renamed in version 15.6.
 2019-03-05 17:43:00 +01:00
Ghostkeeper
0fe9e660b1
Don't show Silicone for UM printers that are incompatible with it anyway 
It's still an open bug that we show materials of which all configurations are incompatible with the printer.

Contributes to issue CURA-6262.
 2019-03-05 15:36:31 +01:00
Ghostkeeper
c665a481dd
Show settings that influence draft/ooze shields if enabled 
The skirt/brim speeds currently affect the draft and ooze shields. So if the draft or ooze shield is enabled, show those settings.

Contributes to #5373.
 2019-03-05 10:45:25 +01:00
Ghostkeeper
180156da78
Correct whitespace 
Change tabs to spaces according to our style standards. And remove a bunch of unnecessary white lines to make it easier to read.
 2019-03-01 11:45:08 +01:00
Andrew Finkle
5581cd5c2c Added definition, extruder, material, and variants for Discov3ry Complete 2019-02-27 11:55:25 -05:00
Andrew Finkle
3f765a9ca2 Revert "Create structur3d_discov3ry1_complete_um2plus.json" 
This reverts commit 05e889621ecaba1eec47216fb5393fd7cfb65ed0.
 2019-02-27 10:29:58 -05:00
Andrew Finkle
05e889621e Create structur3d_discov3ry1_complete_um2plus.json 2019-02-27 10:29:28 -05:00
Ghostkeeper
b723beb435
Pre-heat to initial layer temperature instead of normal temperature 
Because that's what it's going to start printing with.
 2019-02-27 15:58:30 +01:00
Ghostkeeper
970fa69166
Merge branch 'patch-2' of https://github.com/h0x91b/Cura into h0x91b-patch-2 2019-02-27 15:55:57 +01:00
Ghostkeeper
470871a0d2
Merge branch 'master' of https://github.com/radfahrer/Cura into radfahrer-master 2019-02-27 15:31:57 +01:00
Ghostkeeper
c44a207744
Remove duplicate property 
I think this is the result of a merge conflict or something. This entry should not be dependent on the number of bottom layers so I'm keeping the first one.
 2019-02-27 10:23:46 +01:00
Daniel Green
bfa13e6146 Merge branch 'master' of github.com:radfahrer/Cura 2019-02-26 07:25:42 -08:00
Daniel Green
5219b1ff9b Removes unnecessary fields. 2019-02-26 07:21:46 -08:00
Arseniy Pavlenko
5a7be399f6
Bug: on Tevo Tornado nozzle and bed are turned off on start. 
Changed "[extruder0_temperature]" to "{material_print_temperature}", because "[extruder0_temperature]" is replaced by an empty string in actual g-code generated by Cura 3.6.
Generated g-code is turn off heating at all on mine Tornado right before cleaning nozzle which is harmful and unacceptable...

Bad g-code example:

M104 S
M109 S
M109 R
 2019-02-25 21:32:24 +03:00
Ghostkeeper
b7efc1baf0
Change tabs to spaces 
We use spaces to indent, normally.
 2019-02-25 11:19:51 +01:00
Daniel Green
1d4298a27f Fixes the version setting. Adds start and end g-code 2019-02-24 17:40:46 -08:00
Diego Prado Gesto
33a713ad92 Fix indentation and remove spaces 2019-02-24 19:01:13 +01:00
Daniel Green
f8bc2e7b07 Adds a printer definition for the FLSUN QQ 2019-02-23 18:21:52 -08:00
kerog777
4270cb065e Update to starting gcode 
Refined starting code to use proper replacement parameters and be more
compatible with firmware, which heats both nozzles to 120C as part of
the Z homing process.  So now it heats the bed, then homes, then heats
to the layer 0 print temperature.

Also upped the material flow from 87 (value used in manufacturer’s
Simplify3D profile) to 95, which works better for me.  87 seems really
low.
 2019-02-23 09:28:51 -08:00
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