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

19553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Prado Gesto
c4044e731a Fix typo in a log warning message 2019-05-16 12:04:26 +02:00
Ghostkeeper
ef707e4bad
Update file headers of translation templates 
We're in Cura 4.1 now. Also, the reporting e-mail was somehow missing from all the cura.po files.

Contributes to issue CURA-6521.
 2019-05-14 14:35:58 +02:00
Ghostkeeper
f845d13514
Update translation templates per language from pot file 
This is generated with the i18n-update-po CMake target.

Contributes to issue CURA-6521.
 2019-05-14 14:31:14 +02:00
Ghostkeeper
51cc2ff701
Remove duplicate entries 
MSGMerge crashes on these. They are probably caused by the build system being a little bit naive about where it gets its strings from.
 2019-05-14 14:30:10 +02:00
Ghostkeeper
1941d5219f
Update translation templates for 4.1 
These are the new strings for Cura 4.1.

Contributes to issue CURA-6521.
 2019-05-14 14:25:01 +02:00
Lipu Fei
d1805d34be Move background to ScrollView for GcodeTextArea 2019-05-14 11:44:14 +02:00
Lipu Fei
5280ec4af5 Fix Mark2 appearing at the bottom of machine list 2019-05-14 10:38:27 +02:00
Ghostkeeper
2e93948c84
Take minimum of all build volume temperature values 
According to the Materials and Processing team here, this is better because it guarantees that the coldest of your materials won't sag.

Contributes to issue CURA-6514.
 2019-05-13 17:11:13 +02:00
Diego Prado Gesto
36ddf2f018 Do not allow the use of "weight" for third party printers 
Otherwise external contributors can manipulate the order in which they appear in the list
 2019-05-13 13:49:00 +02:00
Diego Prado Gesto
cac4b8b7f1 Remove useless comment line 2019-05-13 13:34:13 +02:00
Diego Prado Gesto
233013c946 Cache a lot of items in the list so there are no glitches 2019-05-13 13:23:10 +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
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
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
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
a17fc7842a
Merge branch '4.1' into CURA-6039_fix_raft_disabled_extruder 2019-05-08 15:21:44 +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
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
5e43e723e7 Fix activeMaterialsCompatible() 
CURA-6511

Looks like a merge conflict
 2019-05-07 14:28:13 +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
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
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
15706b7696
Fix colour of prime tower 2019-05-06 10:26:53 +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
2e90078ec7 Fix incorrect deprecation message 2019-05-03 13:19:17 +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
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
Diego Prado Gesto
be3f194aaa Use a disabled rectangle instead of an empty space in the XRay view 
To keep consistency with what happens in the prepare page when a printer doesn't have material or variants.

Contributes to CURA-6469.
 2019-05-02 16:00:17 +02:00
Diego Prado Gesto
5b9c4e402e Change the Back button to be a secondary button 
Change also some texts in the More information dialog and the font type of one of the titles in the first use flow

Contributes to CURA-6483.
 2019-05-02 15:38:19 +02:00
Lipu Fei
85822d6e73 Fix add by IP validator regex 
CURA-6483
 2019-05-02 15:30:11 +02:00
Lipu Fei
1e89ce3673 Merge remote-tracking branch 'origin/4.1' into CURA-6483_fix_add_by_ip 2019-05-02 14:06:07 +02:00
Lipu Fei
d0cc2dc8fa Remove unneeded TODO 
CURA-6495
 2019-05-02 12:47:48 +02:00
Lipu Fei
5fee82bcb7 Fix machine settings page 
CURA-6495
 2019-05-02 09:46:00 +02:00
Lipu Fei
b9d8b89113 Fix number of extruders not being updated 2019-05-02 09:03:48 +02:00
Ghostkeeper
038a5b5942
Fix background of g-code text boxes having zero size 2019-05-02 08:46:46 +02:00
Lipu Fei
1d4ab98ddc Fix binding loop 
CURA-6483
 2019-05-02 08:25:29 +02:00
Lipu Fei
71e32d94f7 Resolve merge conflicts 
CURA-6483
 2019-05-02 07:45:43 +02:00
Diego Prado Gesto
9500d2d6b8 Modify text in the Send Slice data dialog, according to the experts. 
Contributes to CURA-6434.
 2019-05-01 15:53:54 +02:00
Diego Prado Gesto
5b06efdd19 Merge branch '4.1' of github.com:Ultimaker/Cura into 4.1 2019-05-01 15:51:12 +02:00
Diego Prado Gesto
32c8bbfb3c Modify small UI things in the Add Printer dialog 2019-05-01 15:50:43 +02:00