GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 11:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,923 Commits 295 Branches 268 Tags
Commit Graph

19923 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lipu Fei
2054413952 Add handling for ValidatorState.Invalid 
CURA-6497

ValidatorState.Invalid is set if a string setting has allow_empty =
False and its value is empty.
 2019-05-09 12:07:16 +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
9e5e57e6c5 Merge branch 'master' into feature_model_list 2019-05-07 11:57:31 +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
Ghostkeeper
1736a02d28
Merge branch '4.1' 2019-05-06 10:27:14 +02:00
Ghostkeeper
15706b7696
Fix colour of prime tower 2019-05-06 10:26:53 +02:00
Darío Hereñú
282e6975ee
Syntax issue on string 564 
* added a blank space on string 808
* syntax issue on string 1859
* syntax issue on string 2075
* syntax issue on string 3301
* Proposed translation of string 5964: "Solidworks: asistente de exportación"
* syntax issue on string 6133
* Proposed translation of string 7347: "Un relleno denso (50%) dará al modelo una resistencia por encima de la media"
 2019-05-04 23:44:02 -03:00
Jaime van Kessel
979b29400a Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-03 14:12:07 +02:00
Jaime van Kessel
e363f1af94 Remove hardcoded references to Ultimaker machines in QML 
We shouldn't hardocode machines in QML in any case. It also created issues
for other monitor / connection flows.
 2019-05-03 14:10:21 +02:00
Jaime van Kessel
c786770a44 Remove usage of deprecated functions 2019-05-03 13:52:45 +02:00
Jaime van Kessel
c3a373e2a2 Remove usages of deprecated activeMachineName 2019-05-03 13:38:06 +02:00
Jaime van Kessel
5a25f8e050 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-03 13:19:34 +02:00
Jaime van Kessel
2e90078ec7 Fix incorrect deprecation message 2019-05-03 13:19:17 +02:00
Jaime van Kessel
08b79a93be Merge branch 'master' of github.com:Ultimaker/Cura 2019-05-03 13:17:27 +02:00
Jaime van Kessel
d42f446d70 Remove usages of deprecated function 2019-05-03 13:17:10 +02:00
Ghostkeeper
4910bc006b
Move platform mesh a bit down 
This way it's outside of the build volume.

Contributes to issue CURA-6505.
 2019-05-03 10:58:48 +02:00
Ghostkeeper
9463a288d8
Merge branch 'master' of https://github.com/markbernard/Cura into markbernard-master 2019-05-03 10:53:06 +02:00
Lipu Fei
2601e485da Merge remote-tracking branch 'origin/4.1' 2019-05-03 10:47:16 +02:00
Jaime van Kessel
23e5a6090c Merge branch 'CURA-6492_change_prime_tower_resolve' of github.com:Ultimaker/Cura into 4.1 2019-05-03 10:40:31 +02:00
Satish
18630fa2f1 Added several ids to be used in integration tests: 
-Marketplace, printer pref, add/manage printer from main mnu, print settings
 2019-05-03 09:35:17 +02:00
Jaime van Kessel
6bbdfbb31d Merge branch 'CURA-6483_fix_add_by_ip' of github.com:Ultimaker/Cura into 4.1 2019-05-03 09:25:30 +02:00
Lipu Fei
f89ba25faa enable prime tower when adhesion is none or skirt 
CURA-6492
 2019-05-03 09:21:54 +02:00
Lipu Fei
7d4c821551 Prevent auto selecting an invalid printer 
CURA-6483
 2019-05-03 08:49:39 +02:00
Mark Bernard
7a010ead56
Add files via upload 
Add Anet A6 platform to Cura printer definitions
 2019-05-02 12:12:31 -04:00