3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-21 21:58:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 16
28475 commits 306 branches 270 tags 786 MiB
Commit graph

12854 commits

Author SHA1 Message Date
Lipu Fei
0c15f69c44 Merge remote-tracking branch 'origin/4.1' 2019-05-17 15:01:40 +02:00
Lipu Fei
0555cbae4e Fix add machine dialog state 2019-05-17 15:01:18 +02:00
Lipu Fei
33aae24d6d Merge remote-tracking branch 'origin/4.1' 2019-05-17 14:41:52 +02:00
Lipu Fei
361636af29 Allow WizardDialog to resize 2019-05-17 14:30:18 +02:00
Lipu Fei
584a101902 Fix limit to extruder for support infill angle 
CURA-6529
 2019-05-17 14:19:39 +02:00
Diego Prado Gesto
a28ca19647 Change the font size 
To make it consistent with the size of texts in the other Welcome pages.
 2019-05-17 11:54:40 +02:00
Lipu Fei
be4e05c13f
Merge pull request #5393 from Ultimaker/feature_model_list 
Add an object list/selector
 2019-05-17 07:48:22 +02:00
Jaime van Kessel
f5e31060a6 Fixed unknown reference in qml 2019-05-16 16:44:29 +02:00
Jaime van Kessel
314a6495c4 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-16 16:40:10 +02:00
Lipu Fei
961f6403ad Change preference key to cura/show_list_of_objects 2019-05-16 15:49:08 +02:00
Jaime van Kessel
ff0a18603b Remove a few more usages of deprecated functions 2019-05-16 15:20:38 +02:00
Lipu Fei
28172c9ad2 Merge remote-tracking branch 'origin/master' into feature_model_list 2019-05-16 15:17:46 +02:00
Jaime van Kessel
3fe5c9fc6a Merge branch 'master' of github.com:Ultimaker/Cura 2019-05-16 15:08:47 +02:00
Jaime van Kessel
a0c705e900 Remove usage of some deprecated functions 2019-05-16 14:49:53 +02:00
Lipu Fei
6a2980ab4f
Merge pull request #5655 from Ultimaker/shader_optimization 
Shader optimization
 2019-05-16 14:30:52 +02:00
Jaime van Kessel
2eb8203c70 Merge branch 'master' of github.com:Ultimaker/Cura 2019-05-16 14:29:24 +02:00
Jaime van Kessel
99e6ec9509 Fix the last material qml warnings 2019-05-16 14:29:05 +02:00
Ghostkeeper
0352553193
Read resolved value for adhesion type 
We still write to the value property.
We need the resolved value because we want to read from the extruder stacks which may overwrite the adhesion type in a profile.

Contributes to issue CURA-6182.
 2019-05-16 14:28:10 +02:00
Ghostkeeper
f3ea522811
Use === to compare strings in JavaScript 2019-05-16 14:28:09 +02:00
Jaime van Kessel
bfe1275d46 Fix a number of QML warnings 2019-05-16 14:23:09 +02:00
Lipu Fei
dab0a43214 Merge remote-tracking branch 'origin/master' into shader_optimization 2019-05-16 14:22:05 +02:00
Remco Burema
d4f891d548 Brim for prime tower fix for resolve. [CURA-6492] 2019-05-16 12:39:12 +02:00
Diego Prado Gesto
2cbdc49539 Merge branch '4.1' 2019-05-16 12:13:04 +02:00
Remco Burema
19ce6aa65f Prime tower brim (unless raft) by default. [CURA-6492] 2019-05-15 13:27:33 +02:00
Ghostkeeper
7094b222b1
Remove duplicate translation entry 
Probably due to a merge conflict being resolved in a less than perfect way. Sorry.

Contributes to issue CURA-6521.
 2019-05-15 10:58:48 +02:00
Lipu Fei
1bed5c9c11 Merge remote-tracking branch 'origin/4.1' into CURA-6497_fix_empty_material_name 2019-05-15 08:40:45 +02:00
Ghostkeeper
f4dac40f8b
Merge branch '4.1' 
Conflicts:
	resources/i18n/es_ES/cura.po -> Correction to Spanish translations while we generated new templates on 4.1.
 2019-05-14 14:50:36 +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
7f8896705f Merge remote-tracking branch 'origin/4.1' 2019-05-14 10:41:12 +02:00
Lipu Fei
5280ec4af5 Fix Mark2 appearing at the bottom of machine list 2019-05-14 10:38:27 +02:00
Lipu Fei
7c1d589528 Merge remote-tracking branch 'origin/4.1' into CURA-6497_fix_empty_material_name 2019-05-14 09:42:57 +02:00
Ghostkeeper
c3efb666e8
Remove non-existent setting override 2019-05-14 09:06:26 +02:00
Ghostkeeper
03d96f3fb5
Merge branch '4.1' 2019-05-13 17:11:39 +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
Ghostkeeper
a41aee98f8
Set the value for PLA as the default for build volume temperature 
This way, most prints with 3rd party materials and 3rd party printers will be fine. Also, it requires me to change the fewest amount of profiles.

Contributes to issue CURA-6514.
 2019-05-13 16:31:33 +02:00
Ghostkeeper
60060db0d5
Reduce weight of S5 definition 
It's now the 2nd year after the introduction of the S5 so we have to reduce this weight by one.

Contributes to issue CURA-6500.
 2019-05-13 15:47:47 +02:00
Ghostkeeper
da74ef83ac
Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master 2019-05-13 15:17:23 +02:00
maukcc
9dd4fd2128 HMS434 update 2019-05-13 15:16:15 +02:00
maukcc
80efb0bac3 HMS update 2019-05-13 15:14:28 +02:00
Ghostkeeper
3a6534a3a4
Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master 
Conflicts:
	resources/definitions/hms434.def.json -> We both fixed the gantry height value vs. default_value problem.
 2019-05-13 15:11:32 +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
maukcc
abf5719f11 HMS434 updates 
Small updates for the HMS434 machine
 2019-05-13 10:01:03 +02:00
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