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

30517 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jspijker
81af19dc43 Use GCC10 as default for Ubuntu-20.04 2022-11-07 09:19:58 +01:00
c.lamboo
f803279a43 Merge branch '5.2' 
# Conflicts:
#	conandata.yml
 2022-11-04 14:00:40 +01:00
Remco Burema
00dbe92814 Revert "Restrict permissions, should only need to read here." 
This reverts commit 61a491f910abd2fbb69d3da02f76995ec2926c26.
 2022-11-04 12:00:39 +01:00
Remco Burema
61a491f910 Restrict permissions, should only need to read here. 2022-11-04 11:57:53 +01:00
Remco Burema
15f31a7c0c Merge branch 'main' into PR-13661 2022-11-04 11:51:26 +01:00
Remco Burema
997b6f830d Manually revert part of PR. 
It shouldn't really be nescesary, but you _can_ put any gcode flavour in relative or absolute, so we should also deal with that in the pause-at-height script.
 2022-11-04 09:12:47 +01:00
Remco Burema
b1138e12d9 Merge branch 'main' 2022-11-04 08:47:50 +01:00
j.spijker@ultimaker.com
c20410d732 build info and create in one step 2022-11-03 08:42:24 +01:00
jelle spijker
30555dbd5b Use lockfile and build_id 2022-11-03 08:14:07 +01:00
jelle spijker
ce8a7b6109 Create Artifactory build info 2022-11-03 07:50:57 +01:00
jelle spijker
b75e047348 Use ref.base_name for pr 2022-11-02 22:01:19 +01:00
MariMakes
24c12fd3eb
Added Triage status label 
An attempt to improve responsiveness on feature requests.
 2022-11-01 13:23:08 +01:00
Remco Burema
f75cb7a48b
Merge pull request #11678 from Ultimaker/brim_per_material_optimized_order 
Brim overhaul: New features and bug fixes
 2022-10-30 17:59:36 +01:00
Remco Burema
45fb71e966 Engine should know to (not) offset the nozzles w.r.t. disallowed areas. 
part of CURA-9066
 2022-10-30 17:07:21 +01:00
Remco Burema
24bb1e96fa Fix unlinked brim settings behaviour. 
Some brim settings seemed to behave as if they where linked, when in fact for any extruder set to -1 the 'default extruder' was set by some hacky code that supposedly fixes a 'dissallowed area' issue, very likely also related to the skirt/brim settings. Since dissalowed area for skirt/brim will not be a thing anymore, at least in the front-end, due to CURA-9066 (the 'parent' jira ticket that was blocked by this bug); it was sinplest just to remove the hack altogether. (Otherwise we'd have to make an artificial distinction between -1 and None as it relates to 'Not Set/Used' versus 'Not Overridden', only to then force it back to -1 in situations that call for it -- like communicating to the engine.)

CURA-9553
 2022-10-30 11:09:12 +01:00
Jaime van Kessel
e8b99c8eed
Merge pull request #13680 from Ultimaker/Update-splash-screen 
Updated splashscreen
 2022-10-28 12:31:31 +02:00
Lorenzo Romagnoli
9a1eca50e4 Updated splashscreen 
Updated splash screen logo with new logo with capital M
 2022-10-28 12:02:55 +02:00
Joey de l'Arago
f8ede7527e
Merge pull request #13671 from Ultimaker/CURA-9808-update-ulti-maker-logo 
Update logo.svg
 2022-10-28 10:45:52 +02:00
Lorenzo Romagnoli
6e6b5cbbc4
Update logo.svg 2022-10-27 12:22:31 +02:00
Alex
79af58ef7e build: harden notify_on_print_profile_change.yml permissions 
Signed-off-by: Alex <aleksandrosansan@gmail.com>
 2022-10-26 16:36:55 +03:00
Jaime van Kessel
f7d854ac3a
Merge pull request #13651 from Ultimaker/PP-251_create_annealing_intent 
Create a resolve function on the "support_enable" setting
 2022-10-26 11:40:58 +02:00
Jaime van Kessel
5c18a37f60
Merge branch 'main' of github.com:Ultimaker/Cura into PP-251_create_annealing_intent 2022-10-26 11:28:58 +02:00
Remco Burema
ab51bd699e Merge branch 'main' into brim_per_material_optimized_order 2022-10-25 17:31:13 +02:00
Joey de l'Arago
a9f4b2da71
Merge pull request #12254 from Ultimaker/fix_materials_list_too_small 
Allow text to be wider if favourite button is not shown
 2022-10-21 11:16:26 +02:00
Joey de l'Arago
09c86e6b98
Merge pull request #13319 from Ladnessness/main 
Update Actions.qml
 2022-10-21 10:26:47 +02:00
Remco Burema
7f4777fdf6 Fix unit-tests. 
part of CURA-9769
 2022-10-20 11:34:44 +02:00
Remco Burema
b4405d886b Reverse sorting, newer machines on top. 
Same brand or name, but with a higher number should generally be first, so reverse sorting.

CURA-9769
 2022-10-20 10:24:01 +02:00
jelle spijker
ec9dcc43b4 Update changelog 5.2.1 5.2.1 2022-10-19 16:08:53 +02:00
jelle spijker
6860c6777c Update conandata for the 5.2.1 release 
Fix translation:
- Italian (mea culpa)
- Chinese (我们很抱歉)
 2022-10-19 15:52:29 +02:00
c.lamboo
c8a1b435a1 Add updated chinese translations 2022-10-19 15:48:48 +02:00
c.lamboo
8dbf69d2cc Revert incorrect update of translations 
Accidentally overwrote the cn with cz translations
 2022-10-19 15:48:36 +02:00
c.lamboo
15a39fc51b Update italian translations 2022-10-19 15:48:24 +02:00
Jaime van Kessel
f8b0305bae
Merge pull request #13575 from Ultimaker/PP-42_improved_initial_layer_settings 
PP-42_improved_initial_layer_settings
 2022-10-19 11:58:47 +02:00
c.lamboo
670f439fe2 update pt_br po files 5.2.0 2022-10-18 14:02:35 +02:00
c.lamboo
78ee77c361 update .mo files 2022-10-18 12:05:04 +02:00
jelle spijker
1f5336805c Add 5.3.0-alpha entry 2022-10-17 16:29:06 +02:00
Rijk van Manen
d5020425bc fix mistakes 
PP-42
 2022-10-17 15:55:03 +02:00
Rijk van Manen
c47243cdde remove specific initial layer bed temperature 
Forgot to remove an initial layer setting. PP-42
 2022-10-17 14:52:10 +02:00
Rijk van Manen
7612faea79 make initial flow settings a fraction of the initial layer flow 
PP-42
 2022-10-17 14:51:05 +02:00
Rijk van Manen
9f6a47f04a
Merge branch 'main' into PP-42_improved_initial_layer_settings 2022-10-17 13:51:20 +02:00
Jelle Spijker
35a62af035
Merge branch '5.2' 2022-10-16 18:00:57 +02:00
jelle Spijker
a18d3b909d
use new master/s-line as tip 2022-10-16 18:00:31 +02:00
c.lamboo
4a30bbaf2b Merge branch '5.2' 2022-10-14 16:39:05 +02:00
Casper Lamboo
c5ee307393
Merge pull request #13551 from Ultimaker/5.2_translations 
5.2 translations
 2022-10-14 16:17:09 +02:00
Casper Lamboo
722e659ec0
Merge pull request #13520 from sustmi/5.2_translations-cs_CZ 
Czech translations for v5.2
 2022-10-14 16:01:21 +02:00
c.lamboo
cfaa3ffe8e Update translations 2022-10-14 15:57:32 +02:00
Remco Burema
e505396fe7 More updates for the changelog for 5.2 2022-10-14 15:40:58 +02:00
Remco Burema
be3c312c32 Update changelog for 5.2 2022-10-14 15:23:17 +02:00
jelle spijker
5c284cd094 Fix nightly builds 2022-10-13 13:00:08 +02:00
Remco Burema
ce6f7c20ca Abstract printer types: Sort newer ones on top. 
Partial (manual) revert of initial implementatio of CURA-9748 -- that first commit deleted the 'reverse = True' needed to make sure (read hack) the most recent abstract printer types on top, instead of the other way around.
 2022-10-12 16:14:32 +02:00