GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-06 20:18:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,127 Commits 290 Branches 260 Tags
Commit Graph

24127 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kostas Karmas
18f3d187d5 Remove extra newlines in printers added from account message 
Since \n are now replaced by <br>, the \n should be removed from this specific message.
Required after the changes in efaad4f6c8
 2020-06-18 14:08:35 +02:00
Kostas Karmas
364769d821 Remove only the hidden printers when removing a printers 
When printers share the same group_id, they are removed, regardless if
they are hidden or not. This was resulting in sometimes removing
multiple printers when removing a printer that was created by a project
file.
This PR fixes that by actually checking whether the printer to be
removed is hidden.

CURA-7522
 2020-06-18 13:49:50 +02:00
Nino van Hooff
c810ae97a7
Merge pull request #7919 from adripo/patch-2 
Fixed next XY return position after pause
 2020-06-18 11:27:32 +02:00
Jaime van Kessel
466ec7c42a
Remove duplicated variable 
It was holding the same data as extruders_to_disable
 2020-06-18 11:08:17 +02:00
Jaime van Kessel
207138e49c
Merge branch 'master' of github.com:Ultimaker/Cura 2020-06-18 11:04:14 +02:00
Jaime van Kessel
930d92869a
Fix syncing empty material with cloud 
For some reason the cloud gives a 0000 guid when the material is empty.
 2020-06-18 11:03:40 +02:00
Konstantinos Karmas
6634a2bff3
Merge pull request #7928 from Ultimaker/CURA-7509_plugin_versions_on_crash 
[CURA-7509] On crash report unbundled plugins + version numbers.
 2020-06-18 09:54:54 +02:00
Kostas Karmas
039823e68e Merge branch 'master' into CURA-7509_plugin_versions_on_crash 2020-06-18 09:13:28 +02:00
Kostas Karmas
8abaf69873 Update CloudOutputDevice of the machine when it is rediscovered 
Even though the metadata of the machine was updated when it was
rediscovered, the new cluster id was not updated in all its references
(such as in the _remote_clusters and in the _um_cloud_printers dicts).
This commit fixes that issue by properly updating all the entries
that depend on the machine's cluster id.

CURA-7505
 2020-06-17 16:11:18 +02:00
Jaime van Kessel
7d75060342
Merge branch 'CURA-6747_and_CURA-6989-stairs-on-the-slope' of github.com:Ultimaker/Cura 2020-06-17 16:06:35 +02:00
Jaime van Kessel
d8ac7fdf2a
Merge branch 'master' of github.com:Ultimaker/Cura 2020-06-17 16:03:39 +02:00
Nino van Hooff
5c52dcc5c4
Merge pull request #7935 from Ultimaker/CURA-7418-update-profile-window 
CURA-7418 update profile window
 2020-06-17 15:35:19 +02:00
Nino van Hooff
6a02abefcd Change copy of "Your are in sync with your account" 
to "Account synced"

Don't think the duplication I found is necessary, but I don't dare to
deduplicate it as I found some logic inconsistencies

CURA-7418
 2020-06-17 15:34:13 +02:00
Jaime van Kessel
5a77595807
Fix workspace reader not taking upgrade into account 
CURA-7517
 2020-06-17 11:15:55 +02:00
Remco Burema
7e18e796dc
Merge branch 'master' of https://github.com/Ultimaker/Cura 2020-06-17 11:03:32 +02:00
Remco Burema
9204ed4a02
Fixes #7943 / Replacing an arbitrary value with a better one. 
Not the most elegant way, but it _is_ the ultimate answer after all.
 2020-06-17 11:02:41 +02:00
Jaime van Kessel
daa6b4f28d
Add upgrade script for dagoma discoeasy 
CURA-7517
 2020-06-17 10:46:09 +02:00
Jaime van Kessel
8de981f33d
Add left padding to numeric textfield 2020-06-17 09:29:43 +02:00
Jaime van Kessel
6ec7265d8e
Merge branch 'mb-fix-machine-settings-font-valign' of https://github.com/smartavionics/Cura 2020-06-17 09:27:53 +02:00
Ghostkeeper
180e9b6612
Merge branch 'master' of github.com:Ultimaker/Cura 2020-06-16 16:37:30 +02:00
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
Ghostkeeper
5286be77a1
Merge branch 'CURA-7492_Change_how_the_connection_status_is_determined' 2020-06-16 16:11:26 +02:00
Kostas Karmas
60e38402fb Remove system palette 
The SystemPalette was not properly reflecting the text color in the
dark theme (the icon remained black). For that reason, the palette
is removed and color for the icon have been added in the themes.

CURA-7418
 2020-06-16 14:50:06 +02:00
Kostas Karmas
a9de95a1eb Fix minor visual issues 
The following issues are fixed:
 * The visibility of the placeholder rectangle, according the existence
	of the avatar image
 * The initial letter not being visible in the dark theme
 * Vertical alignment of the avatar

CURA-7418
 2020-06-16 14:41:52 +02:00
Kostas Karmas
78bd5520bd Add theme color for sync state icon 
CURA-7418
 2020-06-16 14:41:23 +02:00
Kostas Karmas
2b517a03cc Fix typo 
CURA-7418
 2020-06-16 14:39:50 +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
Kostas Karmas
87a97afd84 Add newlines at the end of files 
CURA-7418
 2020-06-16 13:35:28 +02:00
Jaime van Kessel
1a04744679
Prevent crash when starting the firmware update twice 
CURA-6Q
 2020-06-16 09:50:18 +02:00
Jaime van Kessel
ec1ed80c9f
Add initials when no avatar is set 
CURA-7418
 2020-06-16 09:17:58 +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
Kostas Karmas
37be7f5410 Merge branch 'master' into CURA-7505_Refactor_registration_of_cloud_printers 2020-06-15 15:05:08 +02:00
Kostas Karmas
3b6ac5eb8d Add host_guid to the cloud printers' metadata 
Since the host_guid is unique to the printer, it is more reliable for
identifying the cloud printers. This comes in handy when the cloud
printer is removed from the account and re-added. With the host_guid,
the printer that is added again can be properly identified as an
existing Cura cloud printer, and be linked to the original. To
achieve that, the META_CLUSTER_ID of the printer is updated with the
new one that is generated when the printer is added again to the
account.

CURA-7505
 2020-06-15 15:01:14 +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
c58ef1b531
Fix mypy issues 
CURA-7418
 2020-06-15 14:20:34 +02:00
Nino van Hooff
6071161d88 Merge remote-tracking branch 'origin/master' into CURA-7492_Change_how_the_connection_status_is_determined 2020-06-15 14:19:35 +02:00
Jaime van Kessel
66a183b8e2
Merge branch 'master' of https://github.com/Joyce-lujunxu/Cura 2020-06-15 14:14:13 +02:00
Jaime van Kessel
f6e9bc7c3c
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7418-update-profile-window 2020-06-15 14:10:20 +02:00