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

21859 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
8218d62e20
Add change log entry for 4.4.1 
Contributes to issue CURA-7047.
4.4.1 v4.4.1 		2019-12-23 10:52:51 +01:00
Remco Burema
894e678d84
Merge pull request #6820 from Ultimaker/CURA-7041_add_misp_material_settings 
CURA-7041_add_misp_material_settings
 2019-12-19 11:51:54 +01:00
Remco Burema
f05f4ff244
Fix typo. 
part of CURA-7041
 2019-12-19 11:38:53 +01:00
ninovanhooff
e8823d3529
Merge pull request #6821 from Ultimaker/CURA-7070_fix_quality_search 
CURA-7070 fix quality search
 2019-12-19 11:34:54 +01:00
Lipu Fei
cf82ccf2b9 Merge remote-tracking branch 'origin/4.4' into CURA-7070_fix_quality_search 2019-12-18 16:53:10 +01:00
Lipu Fei
b90bed2c7d Sync cicd.yml with master 2019-12-18 16:52:20 +01:00
Kostas Karmas
cf6540f91d Fix qualities lookup for custom materials 
Search the qualities of the custom material based on the base_file
and not based on the id.

CURA-7070
 2019-12-18 16:44:19 +01:00
Lipu Fei
6c9b8f992f Fix quality search with material base_file 
CURA-7070
 2019-12-18 15:39:17 +01:00
Lipu Fei
4b313c2dac Fix formatting 
CURA-7070
 2019-12-18 15:38:23 +01:00
Nino van Hooff
ff01b1dab9 Add 6 Material Station specific material settings. 
These settings are currently unused by cura, but passed into the PPA
output. Some considerations:
- material_ prepended to all. Even though they are not all
  material specific. The consistency is more developer-friendly imho
- defaults taken from generic_pla
- type is float for all, consistent with what I found in this file

CURA-7041
 2019-12-18 11:46:40 +01:00
Lipu Fei
46020d5541 WIP: Fix fetching Uranium 2019-12-17 12:38:44 +01:00
Lipu Fei
2048bc60f7 WIP: Update GH Actions 2019-12-17 12:30:20 +01:00
Lipu Fei
d30c63a3fb WIP: Add GH Actions 2019-12-17 11:38:52 +01:00
Lipu Fei
f9739e2af8 Fix typing 2019-12-17 11:33:39 +01:00
ninovanhooff
bd7b8f4a93
Merge pull request #6814 from Ultimaker/CURA-7048_PPA-Crash_when_using_UM2_printers 
Fix PPA crashing on single-extruder printers
 2019-12-17 11:33:17 +01:00
Kostas Karmas
50b8ff2352
Fix check that finds the extruder in a position 
CURA-7048
 2019-12-17 10:55:28 +01:00
Kostas Karmas
a1d7eefc42
Fix PPA crashing on single-extruder printers 
The machine manager was leading to a crash when trying to enable
the second extruder in single-extrusion printers, because the check
for the second extruder was not correctly implemented. This commit
fixes that issue by checking if the global stack has the specified
extruder. If it does not, then the function returns while logging the
issue.

CURA-7048
 2019-12-17 10:55:28 +01:00
Remco Burema
8cc054cecc Add missing 'material break preparation temperature'. 
part of CURA-6971

(cherry picked from commit 25f0460231fd970b73744fb3fe1c004dc68a5dc9)
 2019-12-12 14:09:46 +01:00
Nino van Hooff
cef0ae349d
Fix selecting a new material for a base file on container deletion 
CURA-7023
 2019-12-11 17:17:57 +01:00
Jaime van Kessel
b77de636d4
Prevent crashes when a variant could not be found 
This should not happen, but we've seen some cases where it would cause a crash, usually
when a previous upgrade did something a bit weird (in this specific case; a printer
with an empty variant, whereas it should have a variant).

Since any change that the user will make will ensure that the variant is no longer empty (eg;
any selection of a variant will mean it's no longer empty) and that there is no way back,
it should be pretty safe to ignore the situation as it will resolve itself eventually

CURA-6992
 2019-12-05 14:19:18 +01:00
Jaime van Kessel
cd7f0e8a76
Fix case where a global profile would be recognised as a extruder profile 
CURA-6991
 2019-12-05 14:17:55 +01:00
Jaime van Kessel
95cffb6710
Fix machine duplication when switching configuration 2019-12-05 14:06:52 +01:00
Remco Burema
df1e0abd93
Merge branch '4.4' of https://github.com/Ultimaker/Cura into 4.4 4.4.0 2019-11-19 14:23:10 +01:00
Remco Burema
f1f0290458
Re-enable the Polish language. 
part of CURA-6957
 2019-11-19 14:22:53 +01:00
Ellecross
2d35343538 Merge branch '4.4' of https://github.com/Ultimaker/Cura into 4.4 2019-11-19 13:17:37 +01:00
Ellecross
d425764da8 Added contributors to PRs 2019-11-19 13:17:33 +01:00
Remco Burema
9e32f715bb
Merge branch 'translations_4.4' into 4.4 2019-11-19 12:08:38 +01:00
Remco Burema
1c4998a204
Merge pull request #6668 from Patola/4.4 
Updated pt_BR strings for Cura 4.4.
 2019-11-19 11:59:36 +01:00
Remco Burema
dfe468ef68
Added translations from out Brazilian volunteer. 
part of CURA-6957
 2019-11-19 11:58:39 +01:00
Remco Burema
5cae2fd098
Merge branch '4.4' into translations_4.4 2019-11-19 11:54:08 +01:00
Ellecross
b74ee97048 Update change_log.txt to have 4.4 changes 2019-11-19 11:49:30 +01:00
Remco Burema
4ebec11fc7
Added 16 missing strings from lionbridge. 
part of CURA-6957
 2019-11-19 11:40:11 +01:00
Jaime van Kessel
377a21071b
Remove color from discard dialog text, since it uses system style 
Originally a lot of text would not be readable when in dark theme
because the text would be light, but the background would always be
white.
 2019-11-18 11:33:36 +01:00
Cláudio 'Patola' Sampaio
39756b4e27 Updated pt_BR strings for 4.4 2019-11-16 13:16:11 -03:00
Cláudio 'Patola' Sampaio
ec4831f0d0 Updated pt_BR strings for 4.4 2019-11-16 13:15:14 -03:00
Cláudio 'Patola' Sampaio
bce574c10b Updated pt_BR strings for 4.4 2019-11-16 13:14:07 -03:00
Cláudio 'Patola' Sampaio
5894292935 Updated pt_BR strings for 4.4 2019-11-16 13:09:49 -03:00
Remco Burema
3f90566edc
Added Polish translation by one of our volunteer translators. 
part of CURA-6957
 2019-11-15 17:04:53 +01:00
Remco Burema
22fe13890e
Make sure translations are loaded before init. Intents. 
part of CURA-6957
 2019-11-14 18:26:46 +01:00
Remco Burema
ed63a9037d
Add raw Lionbridge translations. 
part of CURA-6957
 2019-11-14 16:47:08 +01:00
Remco Burema
300990ad89
Add Traditional Chinese from one of our volunteer translators. 
part of CURA-6957
 2019-11-14 16:44:08 +01:00
Lipu Fei
c08e7df277 Fix typing 
CURA-6976
 2019-11-13 11:10:12 +01:00
Nino van Hooff
fe27193c98 Add dict key check for a crash found in IntentManager 
CURA-6976
 2019-11-13 11:01:03 +01:00
Lipu Fei
77c194464e Fix tests 2019-11-12 14:33:54 +01:00
Lipu Fei
8228c6a743 Make sure position is not None 
CURA-6974
 2019-11-12 14:22:21 +01:00
Jaime van Kessel
17b8e9930c
Add handling for case where variant could not be found 
CURA-6975
 2019-11-12 13:28:12 +01:00
Jaime van Kessel
e2414ed5c9
Also log the exception when the connection failed to connect 2019-11-11 15:58:39 +01:00
Jaime van Kessel
d93f6f25d2
Prevent "sticky" tooltips 
When quickly moving the mouse in and out, the timer would
still be running, so the tooltip would become active once the mouse
moved out of the area.
 2019-11-11 10:47:53 +01:00
Remco Burema
00f505374b
Merge pull request #6637 from Ultimaker/CURA-6917_unlink_duplicated_material_44 
Cura 6917 unlink duplicated material
 2019-11-07 17:23:28 +01:00
Remco Burema
3636eed964
Instead of selecting first, return only uniques. 
part of CURA-6917
 2019-11-07 17:19:18 +01:00