3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
19820 commits 340 branches 299 tags 734 MiB
Commit graph

8758 commits

Author SHA1 Message Date
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
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
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
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
Satish
f4c00c460d Added id to the profile page in preferences to identify custom profiles 2019-05-09 14:05:04 +02:00
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