GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-04 22:14:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,916 Commits 289 Branches 260 Tags
Commit Graph

23916 Commits

This Branch
This Branch
All Branches
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
Jaime van Kessel
1a04744679
Prevent crash when starting the firmware update twice 
CURA-6Q
 2020-06-16 09:50:18 +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
Konstantinos Karmas
b4188bdc52
Merge pull request #7917 from adripo/patch-1 
Adjusted correct pause_method for FlyingBear Ghost 4S
 2020-06-15 17:23:29 +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
0f3a977a58
Consistent typing with function this is overriding 
The function in the parent class has changed its type in commit 7968fe6d56205b20be9ba47e5a19be9f5914b084. This one should also change type.
 2020-06-15 13:58:12 +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 be814535e979c28734460a697da879dbe2b41a07, 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
Kostas Karmas
6d7d7bdb95 Fix local authorization server crashing 
The thread handling the web_server was crashing. This in turn ended in
the web_server not being able to start again, thus being impossible to
login again if you logged out.
 2020-06-11 15:27:29 +02:00
adripo
8c369a79fa
Adjusted correct pause_method for FlyingBear Ghost 4S 2020-06-11 14:56:13 +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
defa3fd940 Remove lifetime of message, since it is the same as the default 
In response to feedback comment https://github.com/Ultimaker/Cura/pull/7904#discussion_r438023812

CURA-7454
 2020-06-10 13:00:55 +02:00
Kostas Karmas
ad36903cbb Convert removed_printers_message into private 
In response to feedback comment https://github.com/Ultimaker/Cura/pull/7904#discussion_r438023220

CURA-7454
 2020-06-10 12:59:39 +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
Kostas Karmas
984426fabb Merge branch 'master' into CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message 2020-06-10 12:06:41 +02:00
Nino van Hooff
e9587a82d0
Merge pull request #7880 from Ultimaker/CURA-7455_Keep_printer_configurations_when_cloud_printer_removed_from_account 
Cura 7455 Add "Keep printer configurations" button in the removed printers message
 2020-06-10 12:05:13 +02:00
Kostas Karmas
fdc555caf3 Merge branch 'master' into CURA-7455_Keep_printer_configurations_when_cloud_printer_removed_from_account 2020-06-10 11:51:50 +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
b9956f2ae2 Fix failing tests 
CURA-7454
 2020-06-09 17:51:06 +02:00
Nino van Hooff
8ea6908935
Merge pull request #7775 from sgtnoodle/fix_stretch_feed 
Fix extruder and feed rate after extruder-only moves in post stretch …
 2020-06-09 17:46:17 +02:00
Remco Burema
ac36aeb831
Merge pull request #7903 from Ultimaker/CURA-7493_prefer_online_cloud_printers 
Sort new_devices on online status first, name second
 2020-06-09 17:46:05 +02:00
Kostas Karmas
2442371c2f Hide the message if a manual check is initiated 
This has to be done in order to avoid weird actions taking place, such
as the user pressing to remove the printers while another sync is
happening.

CURA-7454
 2020-06-09 17:42:53 +02:00
Remco Burema
a38fac9e67
Fix typing. 2020-06-09 17:34:23 +02:00
Remco Burema
29442e29e4
Make printer name sorting case insensitive again. 
part of CURA-7493
 2020-06-09 17:28:02 +02:00
Jaime van Kessel
1747dea203
Merge pull request #7902 from Ultimaker/CURA-7490_authorization_server_cpu_usage 
Fix Authorization server not properly stopping after flow completes.
 2020-06-09 17:27:25 +02:00
Kostas Karmas
1c9ce25614 Change lifetime of the removed_printers_message to 30 seconds 
After 30 seconds a new sync will be initiated, which will alter the
conents of self.reported_device_ids, thus making the current message
deprecated. Therefore, it is best to have a maximum lifetime of 30
seconds.

CURA-7454
 2020-06-09 17:24:36 +02:00