3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 23:46:22 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
26436 commits 302 branches 270 tags 770 MiB
Commit graph

14 commits

Author SHA1 Message Date
Ghostkeeper
9ea418c0a1
Revert "Revert "Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7"" 
This reverts commit 28f4d8513d.
The original revert was to revert an accidental merge from master to 4.7. This now reverts the revert on Master, so that we still have those changes on Master.
 2020-08-20 16:35:52 +02:00
Ghostkeeper
28f4d8513d
Revert "Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7" 
This reverts commit 7f47f12bf0, reversing
changes made to dd42c87da7.
 2020-08-20 16:01:46 +02:00
Ghostkeeper
23ba40e54f
Clarify replacement key in translated text 
This is done as a reaction to translators asking what the brackets mean.
 2020-08-11 11:28:25 +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
Kostas Karmas
f677be14c2 Fix spacing 
CURA-7436
 2020-05-20 15:10:04 +02:00
Kostas Karmas
4e930b4d52 Remove unused "has_cloud_connection" variable 
CURA-7436
 2020-05-20 15:08:05 +02:00
Nino van Hooff
252b993169 Refactor removal warning message to CloudOutputDeviceManager 
CURA-7436
 2020-05-18 16:22:55 +02:00
Nino van Hooff
c61f5a162e Update remote and local printer labels in Machines page 
CURA-7436
 2020-05-18 14:49:05 +02:00
Nino van Hooff
3d19e75c82 Notify user of proper way to remove cloud printer 
CURA-7436
 2020-05-18 14:48:19 +02:00
Jelle Spijker
120541a8db
Updated comments in Models 
Converted doxygen style comments to reStructuredText style in the files
 found in Cura/cura/Model directory recursively  using the script
dox_2_rst.py (provided in the Uranium repo). Comments were manually
 checked and changed if needed.

 Note: dox_2rst.py struggles with decorated functions.
 2020-05-08 18:59:38 +02:00
Lipu Fei
71e32d94f7 Resolve merge conflicts 
CURA-6483
 2019-05-02 07:45:43 +02:00
Ghostkeeper
ab0cef95e8
Sort secondarily by printer name 
Makes it a bit easier to find printers.

Implements a suggestion from Reddit: https://www.reddit.com/r/ultimaker/comments/bj0txe/any_way_to_have_the_printers_sorted_on/
 2019-05-01 14:38:55 +02:00
Lipu Fei
d6f4ddc322 Simplify GlobalStacksModel 
CURA-6483
 2019-04-30 12:46:01 +02:00
Lipu Fei
4a171eebf6 Move models around again 
- Move machine related models to cura.Machines.Models
 - Move printer device related models to cura.PrinterOutput.Models
 - Other UI/GUI related modules in cura.UI
 2019-03-26 08:29:22 +01:00
Renamed from cura/UI/GlobalStacksModel.py (Browse further)