GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-21 10:03:56 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,028 Commits 295 Branches 268 Tags
Commit Graph

22028 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
8710bb77a7
Use MaterialManagementModel to rename materials 
It's the replacement for the deprecation.

Contributes to issue CURA-6600.
 2019-09-17 17:57:32 +02:00
Ghostkeeper
9392a3553c
Use implementation from MaterialManagementModel 
The material manager is deprecated now.

Contributes to issue CURA-6600.
 2019-09-17 17:54:26 +02:00
Ghostkeeper
0eb3c5c0d6
Refer material manager functions through to material management model 
That's where the materials are duplicated now. So we only maintain one implementation of that.

Contributes to issue CURA-6600.
 2019-09-17 17:50:38 +02:00
Ghostkeeper
963f5e6dd7
Use getApproximateMaterialDiameter rather than getCompatibleMaterialDiameter 
Should we deprecate getCompatibleMaterialDiameter? I don't think the un-rounded diameter should ever be used for compatibility checks.

Contributes to issue CURA-6600.
 2019-09-17 17:03:05 +02:00
Ghostkeeper
80e79f6e7e
Remove TODO 
Was done in previous commit, but I already pushed so no more --amend now.

Contributes to issue CURA-6600.
 2019-09-17 16:58:12 +02:00
Ghostkeeper
fc679758ef
Optimise getting intent categories 
It's in the container tree, so there's no need for separate queries to the container registry.

Contributes to issue CURA-6600.
 2019-09-17 16:57:16 +02:00
Ghostkeeper
3712f9c1f8
Correct parameter name 
It's the base file, not the ID.

Contributes to issue CURA-6600.
 2019-09-17 16:56:00 +02:00
maukcc
b5ba673ffb HMS434 quality updates 2 2019-09-17 16:51:35 +02:00
maukcc
b652035696 HMS434 quality updates 2019-09-17 16:48:34 +02:00
Ghostkeeper
5f4051ab5c
Use getApproximateMaterialDiameter instead of rounded getCompatibleMaterialDiameter 
There was a function to round it for us already.

Contributes to issue CURA-6600.
 2019-09-17 16:41:32 +02:00
Ghostkeeper
37d54071f0
Don't use material manager any more to sync with printers 
Or to change material from a base file ID.

Contributes to issue CURA-6600.
 2019-09-17 16:35:39 +02:00
Ghostkeeper
5f2e2d5320
Use correct material diameter, rather than always 3 
This function shouldn't be called any more anyway, though.

Contributes to issue CURA-6600.
 2019-09-17 15:58:10 +02:00
Ghostkeeper
614c2970ea
Use getApproximateMaterialDiameter instead of rounded getCompatibleMaterialDiameter 
So we don't need to round it again.
Also convert both to float to be robust against the ambiguous serialisation of floats getting in the way (e.g. '3' vs. '3.0'). Python does that sometimes.

Contributes to issue CURA-6600.
 2019-09-17 15:50:38 +02:00
Diego Prado Gesto
0b9052b068 Clean up and code style fixing 
Contributes to CURA-6683.
 2019-09-17 15:12:46 +02:00
Diego Prado Gesto
4dd6c5b03a Merge branch 'master' into CURA--6683_icons_per_object_settings 2019-09-17 14:16:51 +02:00
Diego Prado Gesto
b9ed619c9a Reuse the Cura ToolTip while showing long object item 
It will only show the tooltip when the text is longer than the elided text.

Contributes to CURA-6666.
 2019-09-17 13:52:37 +02:00
Ghostkeeper
fd452e74b3
Merge branch 'mb-fix-small-feature-blurb-spello' of https://github.com/smartavionics/Cura into smartavionics-mb-fix-small-feature-blurb-spello 2019-09-17 13:15:57 +02:00
Ghostkeeper
d0b7a52ef5
Remove unused definition ID field 2019-09-17 13:10:25 +02:00
Ghostkeeper
b34895703b
Merge branch '4.3' 2019-09-17 13:08:49 +02:00
Ghostkeeper
cd4f6ff3f4
Add tooltip to object list 
Contributes to issue CURA-6666.
 2019-09-17 10:42:36 +02:00
Diego Prado Gesto
f2fa8fd1f5
Merge pull request #6362 from radfahrer/master 
Correction for build volume.
 2019-09-17 10:37:43 +02:00
Diego Prado Gesto
5a95788493 Use the setting's default value when the global variant instance container is empty 
Otherwise it will never show as a matching configuration in the configuration list.
 2019-09-17 09:52:44 +02:00
Ghostkeeper
e4c3ab33f8
Fix message saying all is good if it isn't 2019-09-17 09:37:18 +02:00
Ghostkeeper
e4edd5732f
Fix success code in MyPy script 
The 'return' variable was used for two things, shadowing each other. Because of that, it would fill the variable with a subprocess.run result which would evaluate to True so it would always say that the test failed.
 2019-09-17 09:35:12 +02:00
Ghostkeeper
eaf649023a
Fix setting default material after g-code flavour changes has_materials 
Don't use the material manager here any more.

Contributes to issue CURA-6600.
 2019-09-17 09:23:33 +02:00
Ghostkeeper
977beb8dbb
Re-build container tree if has_materials changes during runtime 
A bit of a hack and it'll be very slow. But it should work. Right now this crashes though because it still calls the Material Manager.

Contributes to issue CURA-6600.
 2019-09-17 08:55:29 +02:00
DragonJe
679e555a34
Create key3d_tyro_best.inst.cfg 2019-09-16 17:57:29 -05:00
DragonJe
065d6b7f6a
Create key3d_tyro_fast.inst.cfg 2019-09-16 17:56:20 -05:00
DragonJe
7774da4178
Create key3d_tyro_normal.inst.cfg 2019-09-16 17:55:43 -05:00
DragonJe
3c24e9fa18
Create key3d_tyro_extruder_0.def.json 2019-09-16 17:54:04 -05:00
DragonJe
00676e3878
Create key3d_tyro.def.json 2019-09-16 17:53:13 -05:00
SAMSECTOR
bd1e370fe6
Create Original_Prusa_i3_MK3S_MK3_extruder_0.def 
This is the latest extruder definition for Prusa i3 MK3/MK3s .
reference :
https://manual.prusa3d.com/Guide/How+to+import+profiles+to+Cura+4.x+(Windows+&+macOS)/1421#_ga=2.78043415.205833688.1568467545-859345073.1567270611
 2019-09-16 22:31:16 +03:00
SAMSECTOR
e946eb1b5c
Creat Original_Prusa_i3_MK3S_MK3.def.json 
This is the latest definition for Prusa i3 MK3/MK3s made by Prusa Research with minor modification to fit in Prusa folder under "add printer"
reference :
https://manual.prusa3d.com/Guide/How+to+import+profiles+to+Cura+4.x+(Windows+&+macOS)/1421#_ga=2.78043415.205833688.1568467545-859345073.1567270611
 2019-09-16 22:29:58 +03:00
F-Fischer
3606ac8bd6 Hellbot printers definitions added 2019-09-16 16:23:35 -03:00
Diego Prado Gesto
b4d4a0e291 Add the Trimesh Reader to the list of bundled plugins 2019-09-16 16:49:12 +02:00
Diego Prado Gesto
0085660153 Use non-abbreviated names in the configurations list 2019-09-16 15:59:21 +02:00
Nino van Hooff
5efc0e7f27 Mypy: do not stop after finding issues in a module 2019-09-16 15:41:04 +02:00
Ghostkeeper
5617784b48
Implement version upgrade for UM2 with Olsson 
Contributes to issue CURA-6775.
 2019-09-16 15:38:01 +02:00
Diego Prado Gesto
021a04c427 Show the printer types list when we show the label every time or when only show the label for the active printer. 2019-09-16 15:29:34 +02:00
Ghostkeeper
8d21f75c40
Merge branch 'feature_intent_container_tree' into feature_intent_upgrade 2019-09-16 15:20:41 +02:00
Ghostkeeper
9b341cf604
Remove UM2 upgrade selection machine action 
Instead of choosing the Olsson block with this wizard, choose it by choosing the correct definition to start with.

Contributes to issue CURA-6775.
 2019-09-16 15:19:47 +02:00
Ghostkeeper
bda7a6ce0a
Shorten name of UM2E with Olsson 
This is necessary because on some file systems (e.g. encryptfs) the length of these file names is limited and that would crash Cura.

Contributes to issue CURA-6775.
 2019-09-16 15:15:17 +02:00
Ghostkeeper
3b5716a64a
Add definition for Ultimaker 2 Extended with Olsson Block 
Only the name is now too long by default. I have to shorten it.

Contributes to issue CURA-6775.
 2019-09-16 15:07:04 +02:00
Ellecross
28310e03f2 Revert "Only show printerTypes for active machine" 
This reverts commit 2395567f1eb505a814f3b305e5a59138dfe8c144.
 2019-09-16 15:05:09 +02:00
Nino van Hooff
dbb9e55bc8 Fix MyPy warning in PerObjectSettingsTool 
CURA-6683
 2019-09-16 15:05:02 +02:00
Ghostkeeper
c6a57a0ab7
Give Ultimaker 2 with Olsson the quality definition of the Ultimaker 2 
This way, the user's profiles should remain intact after the upgrade.

Contributes to issue CURA-6775.
 2019-09-16 15:00:05 +02:00
Ghostkeeper
3c9d191a6e
Add separate definition for Ultimaker 2 with Olsson block 
This is necessary because our ContainerTree class can only create one tree per definition. This tree is not created separately for every added printer and as such the tree can't be different for every added printer.
However the Ultimaker 2 Olsson block upgrade allows selecting extra variants for the UM2. This changes the available variants in the container tree, so this would be impossible.

By making it a separate definition, it now gets a separate tree. However this does mean that we need to do a version upgrade for this as well.

Contributes to issue CURA-6775.
 2019-09-16 14:57:45 +02:00
Jaime van Kessel
6ff59bf5ab
Fix some more issues with the custom FF printer 2019-09-16 11:48:10 +02:00
Jaime van Kessel
e964035653
Fix adding custom FFF printer 2019-09-16 11:40:32 +02:00
Jaime van Kessel
c0db1a17be
Fix the false positive failure in the unit test 2019-09-16 11:40:08 +02:00