3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 15:13:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
23916 commits 307 branches 272 tags 787 MiB
Commit graph

10361 commits

Author SHA1 Message Date
Kostas Karmas
58218d76c2 Fix missing visibility in the RowLayout of the ConfigurationMenu 
This fixes the issue of the "Select configuration" label appearing on
top of the extruders in the configuration menu. This could be observed
when adding a UM2 with Olsson block.
 2020-06-16 16:35:22 +02:00
Jaime van Kessel
560c0c8657
Merge branch 'feature_add_local_printer_ux' of https://github.com/fieldOfView/Cura 2020-06-16 14:17:16 +02:00
Ghostkeeper
09f40c8f77
Upgrade to setting_version 15 
These were apparently outdated.

Contributes to issue CURA-7515.
 2020-06-16 03:51:49 +02:00
Ghostkeeper
b645d210ec
Remove unused platform texture 
This texture is unused because the OBJ file of the platform mesh has no texture coordinates.

Contributes to issue CURA-7515.
 2020-06-15 18:09:39 +02:00
Ghostkeeper
07953488ae
Fix alignment of platform mesh 
It was aligned to the bottom side of the build plate rather than the top side. This build plate is 3.2mm thick, so to prevent Z fighting I'm moving the model 3.3mm down.

Contributes to issue CURA-7515.
 2020-06-15 18:02:14 +02:00
Ghostkeeper
5794deeade
Fix slashes in TinyBoy printer names 
Somehow they turned into underscores, but clearly they are demarking different alternatives.

Contributes to issue CURA-7515.
 2020-06-15 18:02:13 +02:00
Ghostkeeper
2349d00e66
Move TinyBoy profiles into a more appropriate folder 
It's useful if they are together. The folder name is now more in line with the rest, too.
 2020-06-15 18:02:13 +02:00
Ghostkeeper
ab28590439
Clean up whitespace 
No tabs, just spaces for indentation. Remove whitespace at the end of a line.

Contributes to issue CURA-7515.
 2020-06-15 18:02:13 +02:00
fred
34bc78ef85
Updated to fit Cura 4.6 2020-06-15 18:02:12 +02:00
fred
17ee28ca55
Delete tinyboy.def.json 
fix

update

update

update

fix

fix
 2020-06-15 18:02:09 +02:00
fred
c6deb397dd
Create tinyboy.def.json 
save

update

update

update

update

fix

Update tinyboy_e16.def.json

fix

fix
 2020-06-15 18:01:59 +02:00
fred
c380dc5f25
Add TinyBoy & mago 3D Printer 
fix update error

try to fix

try to fix

fix again

Update tinyboy.def.json

Update tinyboy_ra20.obj

Update tinyboy_e10_extruder_0.def.json

update again

Update tinyboy.def.json

update
 2020-06-15 18:01:45 +02:00
fred
3d88c96b7a
Add TinyBoy profile 
Updated

Update

TinyBoy / mago

Add TinyBoy and mago 3D Printer profile
 2020-06-15 18:01:29 +02:00
Ghostkeeper
9b750a50c0
Merge branch 'mesh_processing_order' 2020-06-15 17:36:59 +02:00
Jaime van Kessel
1b6ef4c28c
Merge branch 'mb-modify-tool-panel-anchor-point' of https://github.com/smartavionics/Cura 2020-06-15 14:53:29 +02:00
Jaime van Kessel
66a183b8e2
Merge branch 'master' of https://github.com/Joyce-lujunxu/Cura 2020-06-15 14:14:13 +02:00
Ghostkeeper
09298eac93
Elide setting name if it's too long 
This keeps the text readable.

Fixes #7926.
 2020-06-15 12:24:39 +02:00
Ghostkeeper
c7929fa053
Fix theming of width/height of this dialogue 
Also allow resizing it, because why not.

Contributes to #7926.
 2020-06-15 12:22:20 +02:00
Nino van Hooff
e5a7ad2eca
Merge pull request #7904 from Ultimaker/CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message 
CURA-7454: Add "remove printers" button in removed printers from account message
 2020-06-12 17:35:09 +02:00
Ghostkeeper
abc105a727
Merge branch '4.6' 2020-06-12 12:02:08 +02:00
Ghostkeeper
bab037554c
Avoid hitting the prime blob when Z-hop is enabled 
Similar to commit be814535e9, but ported to the Ultimaker Original.
 2020-06-12 12:01:38 +02:00
Remco Burema
29e68fe407
Fix default value min_skin_width_for_expansion. 
At some point max_skin_angle_for_expansion s deafult value was updated, but the default value for its child, min_skin_width_for_expansion wasn't altered to reflect that. Fixes #7925
 2020-06-12 11:43:37 +02:00
Nino van Hooff
64064fe8d5
Merge pull request #7911 from Ultimaker/CURA-7479_ConfigurationMenu_nozzles_get_stacked_together 
CURA-7479: Change preferredWidth according to the model count in ConfigurationMenu
 2020-06-10 16:26:26 +02:00
Ghostkeeper
ae272d42b8
Align build plate correctly to build volume 
I don't know how this came to be misaligned. Maybe an oversight.

Contributes to issue CURA-7497.
 2020-06-10 14:59:11 +02:00
Ghostkeeper
c9b2f4a2d2
Merge branch 'dagoma_bicolor' of https://github.com/0r31/Cura into 0r31-dagoma_bicolor 2020-06-10 14:50:44 +02:00
Kostas Karmas
20c9be285f Remove unnecessary variable from CuraApplication 
In response to feedback comment https://github.com/Ultimaker/Cura/pull/7904#discussion_r438022415

CURA-7454
 2020-06-10 12:50:03 +02:00
orel
ddc8785755 Add 3mf meshes for mono extruder disco printers 2020-06-10 12:39:02 +02:00
Nino van Hooff
feeeb972f7
Merge pull request #7873 from Ultimaker/CURA-7438_Show_cloud_connection_not_available_printer_removed_from_account 
CURA-7438 Handle the case when a cloud printer is removed from the account
 2020-06-10 11:46:10 +02:00
orel
36f70e43c2 Extruders gcodes sequences were inverted... 2020-06-10 11:43:44 +02:00
orel
7c6104b812 Merge remote-tracking branch 'upstream/master' into dagoma_bicolor 2020-06-10 11:42:48 +02:00
Kostas Karmas
df2c20f647 Convert back Row to RowLayout 
RowLayout is better for resizable interfaces

CURA-7479
 2020-06-10 11:37:51 +02:00
Kostas Karmas
62047d585f Convert RowLayout into Row in ConfigurationMenu 
CURA-7479
 2020-06-10 11:23:17 +02:00
Kostas Karmas
5c898b8c57 Allow the machine manager to set an empty active machine 
Gracefully handle the case where the machine manager is requested to
delete the last machine in Cura. In this case, instead of deleting
everything of this machine and still keep it as an active machine,
the machine manager will set the active machine to None.

The QML files which depend on the active machine were changed to
properly handle themselves when there is no active machine.

CURA-7454
 2020-06-09 15:33:22 +02:00
Kostas Karmas
669dcc62dd Add extra "AddPrinterPagesModel" without the cancel button 
This commit adds an additional AddPrinterPagesModel in Cura that does
not have the "Cancel" button in the "Add Printer" page. To achieve
that, the AddPrinterPagesModel is modified so that its initialize
function decides whether or not it will add the cancel button.

If Cura ends up in a state without an active machine, the AddPrinters
dialog will open up using the showAddPrintersUncancellableDialog signal
and display the new "Uncancellable" (is this a word?)
AddPrinterPagesModel, so that the dialog cannot be dismissed.

If Cura is closed at that point, the next time it is initiated, if the
user is logged in and there is no ActiveMachine, then instead of
displaying the entire WelcomePages wizard, it will show the
uncancellable AddPrinterPagesModel, forcing the user to add a printer.

CURA-7454
 2020-06-09 15:20:15 +02:00
Kostas Karmas
8e1ed6cd29 Merge branch 'master' into CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message 2020-06-09 15:03:23 +02:00
Joyce-lujunxu
5da5dc0047
Add files via upload 2020-06-09 19:05:30 +08:00
Joyce-lujunxu
72f84ff489
Add files via upload 2020-06-09 19:04:51 +08:00
Ghostkeeper
d9c768e0d3
Merge branch 'CURA-7480_Remove_flicabkle_config_panel' 2020-06-08 14:26:21 +02:00
Kostas Karmas
7ba400254d Merge branch 'CURA-7455_Keep_printer_configurations_when_cloud_printer_removed_from_account' into CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message 2020-06-08 09:22:39 +02:00
Kostas Karmas
3073d7c349 Fix height binding loop QmlWarning in ConfigurationListView 
Done during Turbo Testing and Tooling
 2020-06-05 15:54:53 +02:00
Ghostkeeper
9404fe0fb9
Fix getting contentWidth in variable width mode 
Undefined seems to work fine as well though.

Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
 2020-06-05 15:18:10 +02:00
Kostas Karmas
ec62cd5671 Fix "Unable to assing null to double" QmlWarning 2020-06-05 14:20:52 +02:00
Kostas Karmas
306f58f96e Fix contentWidth reference error in ActionButton 2020-06-05 14:13:36 +02:00
Ghostkeeper
7ec681a04d
Merge branch 'feature_support_meshes_present' of https://github.com/fieldOfView/Cura into fieldOfView-feature_support_meshes_present 2020-06-05 13:20:31 +02:00
fieldOfView
33eaebe397 Change wording 2020-06-05 11:42:11 +02:00
Kostas Karmas
9e891c201b Merge branch 'master' into CURA-7438_Show_cloud_connection_not_available_printer_removed_from_account 2020-06-04 15:25:43 +02:00
Kostas Karmas
4bebaaaddb Display an appropriate tooltip when device is removed from the account 
The tooltip is updated to reflect the case where a cloud printer is
removed from the users account.

CURA-7438
 2020-06-04 15:08:27 +02:00
Kostas Karmas
65dd0250b3 Change property connectionStatusMessage into a get function 
This way the tooltip text can be re-evaluated every time we hover over
the instead of only once when the active machine is updated. With this
change, the text will be updated properly when there is a change.

CURA-7438
 2020-06-04 14:22:14 +02:00
Jaime van Kessel
c095cb1f22
Converted the listview into a RowLayout 
I have no idea why i thought a listview was needed for this when
this was made. The data shouldn't be flicable, so it makes way more sense to
use a row layout

CURA-7480
 2020-06-04 14:06:03 +02:00
Ghostkeeper
1d6c722505
Indent using spaces, not a mix of tabs and spaces 
Contributes to issue CURA-7450.
 2020-06-04 13:14:56 +02:00