3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 21:44:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
19631 commits 313 branches 275 tags 718 MiB
Commit graph

19631 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ghostkeeper
022c2678d0
Overwrite gantry height value instead of default_value 
Because fdmprinter now overwrites the value using a formula, the default_value properties are no longer used.
 2019-05-13 09:38:36 +02:00
Ghostkeeper
137619567a
Merge branch '4.1' 2019-05-13 09:32:58 +02:00
Ghostkeeper
e26e825d83
Overwrite gantry height value instead of default_value 
Because the default in fdmprinter has a formula in the value, the default_value properties wouldn't get used any more.
 2019-05-13 09:30:32 +02:00
Ghostkeeper
dbcea27405
Merge branch 'GunZi200-patch-1' 2019-05-10 13:14:55 +02:00
Ghostkeeper
3c94a2c3be
Merge branch 'patch-1' of https://github.com/GunZi200/Cura into GunZi200-patch-1 2019-05-10 13:13:07 +02:00
Guðni Már Gilbert
d5b6b80291
removed an extra comma 2019-05-10 10:07:53 +00:00
Ghostkeeper
36d25b2586
Merge branch 'patch-2' of https://github.com/GunZi200/Cura into GunZi200-patch-2 2019-05-10 11:58:11 +02:00
Ghostkeeper
f238e861b0
Merge branch 'patch-1' of https://github.com/GunZi200/Cura into GunZi200-patch-1 2019-05-10 11:53:43 +02:00
Ghostkeeper
350dd5db3c
Correct positioning of tooltip for g-code text area 2019-05-10 11:32:40 +02:00
Ghostkeeper
67a5490907
Show tooltip on top of control elements 2019-05-10 11:09:56 +02:00
Ghostkeeper
72987fd2c5
Merge branch 'joba-1-port-filter' 2019-05-10 09:46:01 +02:00
Guðni Már Gilbert
1277220aed
Adjust retraction distance and retraction speed 2019-05-09 22:06:34 +00:00
Guðni Már Gilbert
056f36f6ac
Update creality_ender3.def.json 
I suggest a change to the value of max  Z-axis Jerk to be the same as on Marlin 1.1.9 firmware used by Ender 3. Its a small change, reducing 0,4 to 0,3. Having these settings match the firmware's configuration makes a print's estimated time more accurate.
 2019-05-09 20:40:14 +00:00
Ghostkeeper
3629b955fe
Merge branch 'port-filter' of https://github.com/joba-1/Cura into joba-1-port-filter 2019-05-09 16:55:44 +02:00
Remco Burema
feb074d4b5
Merge pull request #5721 from Ultimaker/CURA-6334_add_id_to_profilesPage 
Add the ids for the menu buttons to be used in Squish.
 2019-05-09 16:52:01 +02:00
Ellecross
d5de401dfa Add the ids for the menu buttons to be used in Squish. 2019-05-09 16:38:06 +02:00
Diego Prado Gesto
f0ccb2504f
Merge pull request #5720 from Ultimaker/add_id_for_custom_profiles 
Added id to the profile page in preferences to identify custom profiles
 2019-05-09 16:27:48 +02:00
Lipu Fei
0d0825e9f3
Merge pull request #5718 from Ultimaker/corner_preference_smart 
Add option to prefer hiding seams in a smarter way
 2019-05-09 15:59:13 +02:00
Jaime van Kessel
4bc348ba49 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-09 15:11:37 +02:00
Jaime van Kessel
8f8a982be7 Merge branch '4.1' of github.com:Ultimaker/Cura into 4.1 2019-05-09 15:05:18 +02:00
Jaime van Kessel
d5d37ccf0f Check if auto slicing needs to be done slightly more frequent 
Otherwise it might get stuck in some cases if you loaded a object after loading a gcode

CURA-6422
 2019-05-09 15:04:14 +02:00
Satish
f4c00c460d Added id to the profile page in preferences to identify custom profiles 2019-05-09 14:05:04 +02:00
Diego Prado Gesto
111430c9c2 Catch scroll events and not propagate them to the main view 2019-05-09 11:37:59 +02:00
Lipu Fei
602258bb4a Fix machine name 
CURA-6510
 2019-05-09 09:45:30 +02:00
Lipu Fei
153c9a5277 Merge remote-tracking branch 'origin/4.1' 2019-05-09 09:40:41 +02:00
Lipu Fei
ecdf024da8
Merge pull request #5715 from Ultimaker/CURA-6039_fix_raft_disabled_extruder 
Fix prime tower enabled with disabled extruder(s). [CURA-6039]
 2019-05-09 09:39:00 +02:00
Ghostkeeper
97203c2dc1
Add option to prefer hiding in a smarter way 
This option prefers hiding, but if no good hiding spot is available it'll expose the seam on the sharpest outer corner.

Contributes to issue CURA-6489.
 2019-05-08 17:09:55 +02:00
Ghostkeeper
a17fc7842a
Merge branch '4.1' into CURA-6039_fix_raft_disabled_extruder 2019-05-08 15:21:44 +02:00
Ghostkeeper
28b04728f1
A grammar mistake that multiple people seem to be making 
See PR#5695.
 2019-05-08 14:21:57 +02:00
Ghostkeeper
f1bc1a6a29
Merge branch 'patch-1' of https://github.com/kant/Cura into kant-patch-1 2019-05-08 14:20:24 +02:00
Ghostkeeper
a685ddbd3e
Merge branch '4.1' 2019-05-08 14:19:15 +02:00
Lipu Fei
ebbc950ac1
Add build volume temperature 
CURA-6156
 2019-05-08 14:07:49 +02:00
Remco Burema
db581d4825 Fix prime tower enabled with disabled extruder(s). [CURA-6039] 2019-05-08 13:48:30 +02:00
Ghostkeeper
2c676a3643
Merge branch '4.1' 2019-05-08 10:24:39 +02:00
Ghostkeeper
5b8d2243f7
Change time/material 'specification' into 'estimation' 
Because that's what it is and how you should use it.
 2019-05-08 10:24:21 +02:00
Lipu Fei
0023f5a45d Merge remote-tracking branch 'origin/4.1' 2019-05-07 14:32:03 +02:00
Lipu Fei
5e43e723e7 Fix activeMaterialsCompatible() 
CURA-6511

Looks like a merge conflict
 2019-05-07 14:28:13 +02:00
Ghostkeeper
dfeb71992a
Remove custom text property in materials brand section 
It was duplicating the sectionName property.

Contributes to issue CURA-6302.
 2019-05-07 14:27:39 +02:00
Satish
3b4e253e98 Added ids to materials for squish tests 
-Added a text property to MaterialsBrandSection
-Added ids to materials menu buttons
 2019-05-07 12:37:42 +02:00
Diego Prado Gesto
5fffa200f7 Make the "Not supported" profile label translatable 
Contributes to CURA-6502.
 2019-05-07 12:04:19 +02:00
Diego Prado Gesto
6708d9da64 Merge branch '4.1' 2019-05-07 11:49:45 +02:00
Diego Prado Gesto
1093a2d65f Merge branch '4.1' of github.com:Ultimaker/Cura into 4.1 2019-05-06 14:34:40 +02:00
Diego Prado Gesto
11e86512cb Include the prime tower to the time calculations 
Contributes to CURA-6509.
 2019-05-06 14:33:24 +02:00
Lipu Fei
b09c6a4f12 Elide long website URLs 
CURA-6504
 2019-05-06 13:56:20 +02:00
Lipu Fei
afeb9b90ec Increase width of toolbox header tab 
CURA-6503
 2019-05-06 13:42:42 +02:00
Lipu Fei
53d595f698 Use loader for machine actions in dialog 
CURA-6495
 2019-05-06 13:06:23 +02:00
Ghostkeeper
fca21834dd
Merge branch '4.1' 2019-05-06 11:47:41 +02:00
Ghostkeeper
c9e7f3a245
Fix finding layer numbers 
That seems to have been unreliable. Luckily the original g-code is already broken up in layers, so searching it is completely unnecessary.

Hopefully resolves issue #5630.
 2019-05-06 11:47:13 +02:00
Jaime van Kessel
8ecf024334 Merge branch '4.1' of github.com:Ultimaker/Cura into 4.1 2019-05-06 11:41:58 +02:00
Jaime van Kessel
eb690a459f Fix boundingbox calculation of grouped groups 
Previously this would cause a crash because the bounding box of the outermost
group would not take the bounding boxes of it's children's children into acocunt.

CURA-6501
 2019-05-06 11:40:47 +02:00