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

26431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
41e662fb6a
Merge branch 'master' of https://github.com/venkatkamesh/Cura into venkatkamesh-master 2021-10-15 16:07:59 +02:00
Ghostkeeper
c6d92dc8d6
Fix combing mode override 
This needs quotes, since it's a Python expression. Otherwise it would get interpreted as a variable name which doesn't exist.

Contributes to issue CURA-8627.
 2021-10-13 17:23:09 +02:00
Ghostkeeper
f0262abbb5
Combine two property overrides in one setting, for proper JSON 
Otherwise the maximum gets ignored because the JSON results in a dict where the keys are unique. So the second one happens to get skipped then.

Contributes to issue CURA-8627.
 2021-10-13 15:46:35 +02:00
Ghostkeeper
43897b60d8
Properly use strings as values for enums in setting overrides 
This is interpreted as a Python function, so if it doesn't have those quotes it'll be interpreted as a variable name, and that variable doesn't exist.

Contributes to issue CURA-8627.
 2021-10-13 15:42:46 +02:00
Jelle Spijker
246c986d95
Merge pull request #10605 from Ultimaker/CURA-8550_lightning_infill 
CURA-8550 Added lightning infill description and sub-settings level.
 2021-10-13 12:21:29 +02:00
Konstantinos Karmas
f68d915235
Merge pull request #10509 from Ultimaker/PP-1-Improved_print_profiles 
Various print profile improvements for the UM3, S3 and S5
 2021-10-12 16:10:48 +02:00
p.kuiper
7deb31db98 Bug fixes. 
- Removed default value when value is already set.
 - Make sure UM3 and UM3 extended variants are the same
 2021-10-12 12:54:26 +02:00
p.kuiper
17ea8d0de7 Merge remote-tracking branch 'origin/PP-1-Improved_print_profiles' into PP-1-Improved_print_profiles 
# Conflicts:
#	resources/definitions/ultimaker3.def.json
#	resources/definitions/ultimaker_s3.def.json
#	resources/definitions/ultimaker_s5.def.json
 2021-10-12 09:31:20 +02:00
Remco Burema
e29edb0cc9
Added lightning infill description and sub-settings level. 
part of CURA-8550
 2021-10-12 09:17:58 +02:00
Konstantinos Karmas
9bb31dd468
Merge pull request #10589 from Ultimaker/remove_unneeded_catalog 
Remove unneeded catalog
 2021-10-12 09:10:05 +02:00
p.kuiper
fb645a2454 Merge remote-tracking branch 'origin/PP-1-Improved_print_profiles' into PP-1-Improved_print_profiles 
# Conflicts:
#	resources/definitions/ultimaker3.def.json
#	resources/definitions/ultimaker_s3.def.json
#	resources/definitions/ultimaker_s5.def.json
 2021-10-12 09:09:05 +02:00
p.kuiper
0239ce8a78 - Bug fix error due to string overrides. 
- "Minimum_value" changed to "minimum_warning_value"
- PVA (BB0.4 and BB0.8) require low support jerk settings for good adhesion
- Support roof does follow print_jer and no warning levels set
 2021-10-11 13:53:21 +02:00
p.kuiper
6c67b03a55 - Reverted the print profiles to changes agreed by the Print Profile CCB from 06-10-2021 14:00-15:00 2021-10-11 11:35:38 +02:00
Ghostkeeper
4aa10ba42f
Use initial layer line width factor from adhesion extruder 
This is a per-extruder setting. So get it from the proper extruder.
 2021-10-11 10:08:11 +02:00
Konstantinos Karmas
4759007ed8
Merge pull request #10580 from Ultimaker/CURA-8443_Add_sign_in_status_datapoint 
CURA-8443: Add is_logged_in status datapoint
 2021-10-11 10:01:52 +02:00
p.kuiper
730fb72f78 Merge branch 'master' into PP-1-Improved_print_profiles 2021-10-11 08:09:05 +02:00
Jaime van Kessel
512b0a1dbe Remove unneeded catalog 
The catalog was created over and over again even though it wasn't needed.
On my machine this took 0.25 seconds, so it does add up
 2021-10-08 18:17:18 +02:00
Remco Burema
2ed837ba71
Merge pull request #10486 from Ultimaker/use_empty_qurl_if_path_doesnt_exist 
Only return the path if the folder actually exist
 2021-10-08 14:01:01 +02:00
Jaime van Kessel
2c9f31cbde Remove unneeded signal connections 2021-10-08 13:50:21 +02:00
Jaime van Kessel
7d9c6e1449 Fix QML warning 2021-10-08 13:35:01 +02:00
Jaime van Kessel
65a35bbebc Move creaseee extruders and definitions to correct folder 2021-10-08 10:52:10 +02:00
ivovk9
e76c0d6df8
Add Creasee CS50S pro, Creasee Skywalker and Creasee Phoenix (#10533) 2021-10-08 10:50:42 +02:00
Jaime van Kessel
327d24d5e6 Fix typo 2021-10-07 13:19:34 +02:00
Konstantinos Karmas
2461f972b3
Merge pull request #10562 from Ultimaker/CURA-7851_fix_duplicating_support_blocker 
Fix duplicating / multiplicating support blockers
 2021-10-06 16:49:51 +02:00
Konstantinos Karmas
e793eac425 Push the grouped operation instead of redoing it 
CURA-7851
 2021-10-06 16:46:20 +02:00
Konstantinos Karmas
6a1f09def0 Add is_logged_in status datapoint 
CURA-8443
 2021-10-06 16:19:31 +02:00
Jaime van Kessel
4aae3d7e2e Move duplicated modifier meshes a bit after duplication 
This makes sure that they are visible / selectable after multiplication

CURA-7851
 2021-10-06 15:57:18 +02:00
Jaime van Kessel
4ce69a9eb5 Fix the message if not all duplicated objects could be placed 
CURA-7851
 2021-10-06 15:52:33 +02:00
Jaime van Kessel
fa4f567cb1 Simplify ifstatement for MultiplyObjects 
CURA-7851
 2021-10-06 15:50:12 +02:00
Jaime van Kessel
96d381a895
Apply suggestions from code review 
CURA-7851

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
 2021-10-06 15:45:07 +02:00
v27jain
89070237d9
Adding 3DI D300 (#9863) 
* Add files via upload

* Add files via upload

* Add files via upload

* Delete 3di_d220.def.json

* Delete 3di_d300.def.json

* Add files via upload

* Delete 3di_d220_extruder_0.def.json

* Delete 3di_d300_extruder_0.def.json

* Add files via upload

* Update 3di_d220.def.json

* Update 3di_d300.def.json

* Delete 3di_d300_platform.stl

* Add files via upload

* Update 3di_d300.def.json

* Delete 3di_d220.def.json

* Delete 3di_d220_platform.stl
 2021-10-05 16:38:50 +02:00
hyu7000
46261e328b
cremaker def files added (#10409) 
* test

test

* Delete 느낌표 2개.png

* Cremaker's def file

Cremaker's 3 model def files added.

* Cremaker's ext def file

Cremaker's extruder def files added.

* cremaker bed obj file

2 model size add

* change value

change to value from default value

* change value

change to value from default value

* change machine value

change to "cremaker_common" from "cremaker"

* change value

change to value from default value

* change value

change to value from default value

* change value

change to value from default value

* Update cremaker_common.def.json

* change some code for crashes to resolve
 2021-10-05 16:26:03 +02:00
Jaime van Kessel
968aceb430 Merge branch 'CURA-8254_Trigger_material_profile_sync_with_printer' of github.com:Ultimaker/Cura 2021-10-05 15:02:57 +02:00
Konstantinos Karmas
e4f6c1a440 Fix typing 
CURA-8254

Co-Authored-By: Jaime van Kessel <3922611+nallath@users.noreply.github.com>
 2021-10-05 14:53:38 +02:00
Konstantinos Karmas
587421f97a Make the installed_packages private 
CURA-8254
 2021-10-05 14:51:14 +02:00
Jelle Spijker
8466a291fd
Merge pull request #10547 from Ultimaker/CURA-8601_update_connect_to_cloud_popup 
Update connect to cloud popup
 2021-10-05 14:44:12 +02:00
Jelle Spijker
501b4c4fde
Spaces around assignment operator 
According to UM codestyle

Contributes to CURA-8601
 2021-10-05 13:54:13 +02:00
Konstantinos Karmas
cb4d5ce6e5 Update message text 
CURA-8254
 2021-10-05 13:11:52 +02:00
Jelle Spijker
52a38d4176
Merge pull request #9160 from Ultimaker/UMH-2021_ribbed_vaults_infill 
UM Hackathon 2021: Add 'Ribbed Support Vaults' infill pattern.
 2021-10-05 12:29:00 +02:00
Konstantinos Karmas
bdbac23fdf Add comment 
CURA-8254
 2021-10-05 11:43:36 +02:00
Konstantinos Karmas
8157cedfef Show the message only if there are printers that support material export 
If none of the user's printers support exporting materials to it, then the message should not be shown.

CURA-8254
 2021-10-05 11:42:00 +02:00
Konstantinos Karmas
658e54c8e5 Simplify the check for new materials 
If there is at least one material, we can already show the message without checking the rest of the installed packages.

CURA-8254
 2021-10-05 11:36:10 +02:00
Jaime van Kessel
cc92f4c1e0 Merge branch 'CURA-8602_move_skip_button_onboarding_flow' of github.com:Ultimaker/Cura 2021-10-05 11:01:55 +02:00
Jaime van Kessel
527de2b6ef Use image instead of custom message type 
CURA-8601
 2021-10-05 10:20:52 +02:00
Konstantinos Karmas
5732fc2b51 Update campaign tags 
CURA-8254
 2021-10-04 17:05:36 +02:00
Jelle Spijker
b49004a742
Reorient layout of skip, sign-in and create 
* Skip button
  - Moved to the left, such that a user won't click on it mindlessly
  - Made it a Tertiary button, so it will have predictable margins
* Sign-in button
  - Moved to the right bottom, making it the logical next option
* Create an account
  - Moved to be inline with skip and sign-in
  - Made it a secondary button as requested by UX

Contributes to CURA-8602
 2021-10-04 16:48:51 +02:00
Konstantinos Karmas
ce34e16cdd Add documentation 
CURA-8254
 2021-10-04 16:47:48 +02:00
Konstantinos Karmas
4b7f385077 Add external link to "Learn more" action 
CURA-8254
 2021-10-04 16:43:17 +02:00
Konstantinos Karmas
1f5672acca Check if new materials were installed on initialization 
When the MaterialManagementModel is initialized, it will check whether during this startup new materials were installed. If that's the case, then it will show the prompt message to sync those materials with the printers, which should initiate the sync materials flow.

CURA-8254
 2021-10-04 15:55:06 +02:00
Jaime van Kessel
44eb3201a9 Fix duplicating / multiplicating support blockers 
CURA-7851
 2021-10-04 15:52:08 +02:00