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

7447 Commits

Author SHA1 Message Date
Nino van Hooff
98587a9008
Merge pull request #7551 from Ultimaker/doxygen_to_restructuredtext_comments 
Converted doxygen style comments to reStructuredText style
 2020-05-29 16:46:25 +02:00
Nino van Hooff
89f0970a88 Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
Nino van Hooff
1e33360c35 Fix merge mistake in ToolPathUploader 2020-05-29 14:12:47 +02:00
Nino van Hooff
58ffc9dcae Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments 
# Conflicts:
#	cura/API/__init__.py
#	cura/Settings/CuraContainerRegistry.py
#	cura/Settings/ExtruderManager.py
#	plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
#	plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py
#	plugins/UM3NetworkPrinting/src/Cloud/ToolPathUploader.py
#	plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py
 2020-05-28 17:31:24 +02:00
Jaime van Kessel
f7921394bf
Merge branch '4.6' of github.com:Ultimaker/Cura 2020-05-28 17:21:42 +02:00
Jaime van Kessel
7e53bc179f
Add beta upgrader 
CURA-7413
 2020-05-28 17:13:26 +02:00
Nino van Hooff
bb2a176e36 Convert doxygen to rst for VersionUpgrades 40+ 2020-05-28 16:21:49 +02:00
Nino van Hooff
5af9faf5e5 Convert doxygen to rst for X3DReader, XmlMaterialProfile, XRayView 2020-05-28 16:08:51 +02:00
Konstantinos Karmas
56e8827d00
Merge pull request #7831 from Ultimaker/CURA-7437_no_internet_cloud_status 
CURA-7437_no_internet_cloud_status
 2020-05-28 10:02:15 +02:00
Nino van Hooff
6035adb963 Fix return type in GCodeProfileReader 2020-05-27 14:24:28 +02:00
Nino van Hooff
ca333b4e8a Revert commented lines 
CURA-7437
 2020-05-26 16:45:17 +02:00
Nino van Hooff
e39a192b43
Merge pull request #7824 from Ultimaker/CURA-7459_persistent_marketplace_notification_on_updated_bundled_packages 
Cherry-pick changes from CURA-7245_fix_bundled_package_sync
 2020-05-26 16:31:18 +02:00
Jaime van Kessel
280d3f07a6
Merge branch 'CURA-7290_manual_account_sync' of github.com:Ultimaker/Cura 2020-05-26 11:52:14 +02:00
Jaime van Kessel
ed74198e20
Revert "Revised text from Enterprise marketplace pop-up screen" 
This reverts commit 6a334dd907eeeaf657db006a07d71618d800987f.

The commit broke the string freeze. It also hardcodes the enterprise text
for all versions of Cura (which should not be the case!)
 2020-05-26 11:19:54 +02:00
Ghostkeeper
715e5a890e
Don't crash when the file is deleted while in pre-read phase 
The pre-read takes a while since it shows a dialogue. The user has all the time to delete the file or rename it in the meanwhile.

Fixes Sentry issue CURA-SG.
 2020-05-25 17:20:39 +02:00
Nino van Hooff
75f5e6a8ce Consider all packages when calculating account discrepancies 
Not just the user-subscribed ones

CURA-7245
 2020-05-25 15:40:40 +02:00
Jelle Spijker
6a334dd907 Revised text from Enterprise marketplace pop-up screen 
Updated the qml WelcomPage with the revised text:
"Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise"
 2020-05-25 14:48:18 +02:00
Jelle Spijker
fed5598eb7 Removed logobot image from Enterprise marketplace pop-up screen 
Updated the qml WelcomPage to no longer show the logobot and removed the logobot.svg
from the resources since it is no longer used.
 2020-05-25 14:39:04 +02:00
Ghostkeeper
be9029b33e
Merge branch 'CURA-7318_Ironing_offsets_with_half_a_skin_line_width' 2020-05-25 11:48:05 +02:00
Nino van Hooff
eef347ed6c Add an cloud unavailable icon to the active printer icon 
CURA-7437
 2020-05-20 17:20:40 +02:00
Konstantinos Karmas
e22b672f12
Merge pull request #7785 from Ultimaker/CURA-7436_cloud_printer_remove_warning 
CURA-7436_cloud_printer_remove_warning
 2020-05-20 15:48:27 +02:00
Kostas Karmas
b5e971f9ec Update remove cloud printer pop-up message 
CURA-7436
 2020-05-20 15:21:57 +02:00
Kostas Karmas
503d5d2a35 Correctly upgrade the ironing_inset based on the ironing_pattern used 
Previously, the ironing_inset was changed in the profiles to reflect
the changes made in the CuraEngine. This inset though was not taking
into account the ironing_pattern (in the CuraEngine, the inset is
compensated differently depending on the pattern).

This commit fixes that in the version upgrader and the printer
definitions in order to maintain the same behavior for the old
profiles.

CURA-7318
 2020-05-20 13:56:24 +02:00
Nino van Hooff
81ec7d6582
Merge pull request #7201 from fieldOfView/feature_unify_pause_at_height 
Unify pause at height scripts
 2020-05-19 15:51:21 +02:00
Nino van Hooff
e7af27ff80
Add type hint to plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2020-05-19 14:14:59 +02:00
Ghostkeeper
98fed95725
Adjust the default values for ironing_inset so that the slice result remains the same 
The slicer has been adjusted to give this setting a more logical function: It should be an inset of the outer edge of ironing as it appears in layer view where the lines are made thinner according to their flow.
As a result all of the slices with ironing have changed. This adjusts the setting value so that the actual slice output will not change, just the appearance of the setting.

Contributes to issue CURA-7318.
 2020-05-18 18:19:57 +02:00
Nino van Hooff
252b993169 Refactor removal warning message to CloudOutputDeviceManager 
CURA-7436
 2020-05-18 16:22:55 +02:00
Jaime van Kessel
8f22e62675
Fix typing issues 
CURA-7290
 2020-05-18 13:47:03 +02:00
Ghostkeeper
2125b7130f
Use extruderList rather than extruders 
Extruders has been deprecated.
This also allows us to use integers for a while longer (until it needs to be serialised to a message with the .join() function).

Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
 2020-05-15 16:18:05 +02:00
Ghostkeeper
696d2ffa1d
Use extruderList rather than deprecated extruders 
I looked into changing that position into an integer and perhaps the dictionary into a list, but this dictionary is passed around throughout all of the functions so that would be quite a refactor.

Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
 2020-05-15 16:11:27 +02:00
Nino van Hooff
5eb5ffd916 Convert doxygen to rst for UM3NetworkPrinting 2020-05-15 15:05:38 +02:00
Nino van Hooff
de82406782 Convert doxygen to rst for UltimakerMachineActions, USBPrinting 2020-05-15 14:00:44 +02:00
Nino van Hooff
d96359f208 Convert doxygen to rst for Toolbox, TrimeshReader 2020-05-15 13:53:10 +02:00
Nino van Hooff
c6e6c76962 Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments 
# Conflicts:
#	cura/API/Account.py
#	plugins/SimulationView/SimulationView.py
 2020-05-15 13:38:37 +02:00
Nino van Hooff
58e43c0a07 Convert doxygen to rst for SentryLogger, SimulationView, SliceInfo, 
SolidView
 2020-05-15 13:34:58 +02:00
Ghostkeeper
783b26e521
While searching, search through all settings rather than just visible 
This makes it consistent with the searching of the normal settings list. It also makes it easier to find certain things like the Cutting Mesh or something.
 2020-05-15 13:11:28 +02:00
Nino van Hooff
9acf8b6122 Revert "Add a sync timeout to CloudOutputDeviceManager" 
Stopgap solution is not necessary anymore after CloudOutputDeviceManager
after implementing timeouts on the http-level.

This reverts commit 15f813a4
 2020-05-15 11:32:49 +02:00
Nino van Hooff
f3c66c3189 Refactor CloudApiClient (and ToolpathUploader) to use HttpRequestManager 
Has the benefit of a more unified Http request management + timeouts

CURA-7290
 2020-05-15 11:28:17 +02:00
Ghostkeeper
5a8d411c35
Fix upgrading quality-changes profiles per extruder 
These have a slightly different syntax apparently.
I thought I tested this before. But apparently not well enough.

Contributes to issue CURA-7433.
 2020-05-14 16:44:48 +02:00
Nino van Hooff
15f813a4ff Add a sync timeout to CloudOutputDeviceManager 
Fixes an issue where printer syncing breaks when switching networks etc.

CURA-7290
 2020-05-14 15:47:45 +02:00
Nino van Hooff
a3f968188f Add timeout to CloudPackageChecker request 
Prevents it from getting stuck in the SYNCING state

CURA-7290
 2020-05-14 15:14:51 +02:00
fieldOfView
321693d410 Add upgrade script to update instances of removed scripts to unified script 2020-05-14 11:38:30 +02:00
fieldOfView
172e6a0759 Merge branch 'master' into feature_unify_pause_at_height 
# Conflicts:
#	plugins/PostProcessingPlugin/scripts/BQ_PauseAtHeight.py
 2020-05-14 08:45:38 +02:00
Ghostkeeper
1111041a5b
Merge branch 'CURA-7433_deltacomb_move_upgrades' 2020-05-13 17:27:16 +02:00
Ghostkeeper
984836c1af
Code style: Spaces around binary operators 
Contributes to issue CURA-7433.
 2020-05-13 17:25:09 +02:00
Remco Burema
3af8c20ccf
Deltacomb upgrade: Fix deepcopy not working for ConfigParser. 
No idea why it worked on ghostkeepers' system. It isn't supposed to: https://bugs.python.org/issue16058
CURA-7433
 2020-05-12 18:42:06 +02:00
Remco Burema
44900fad5a
Deltacomb upgrade: Fix leftover issues from last master-merge. 
CURA-7433
 2020-05-12 18:39:27 +02:00
Remco Burema
ac429d496a
Merge https://github.com/kaleidoscopeit/Cura into kaleidoscopeit-master 2020-05-12 16:41:05 +02:00
Nino van Hooff
fbc0be30ec Fix typing issue in CloudPackageChecker 
CURA-7290
 2020-05-12 15:40:53 +02:00
Nino van Hooff
b40b8e8489 Merge remote-tracking branch 'origin/master' into CURA-7290_manual_account_sync 
# Conflicts:
#	cura/API/Account.py
 2020-05-12 14:59:01 +02:00