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

2885 Commits

Author SHA1 Message Date
Jaime van Kessel
e841896090 PrintJobs are now assigned if they are not queued 
It used to just do it if it was printing, but jobs can also be in other states such as
paused, pre_print, etc

CL-541
 2017-11-28 13:04:58 +01:00
Jaime van Kessel
9084dfd6bd It's now possible to send print jobs to cluster again 
CL-541
 2017-11-28 12:59:54 +01:00
Jaime van Kessel
cfc6a3ad48 Added some convenience functions to NetworkedPrinterOutputdevice 
This also moves the getUser from legacy to networked printer

CL-541
 2017-11-28 12:43:49 +01:00
Jaime van Kessel
83b13546fb Moved compressing of GCode to one class higher 
CL-541
 2017-11-27 17:12:36 +01:00
Jaime van Kessel
c6f2e167e2 Renamed some missed properties 
CL-541
 2017-11-27 16:02:55 +01:00
Jaime van Kessel
6f495f2d8b Cluster monitor now uses material name 
This matches better with what Cura does.

CL-541
 2017-11-27 16:00:57 +01:00
Jaime van Kessel
5d3779da26 Update cluster view components 
CL-541
 2017-11-27 15:54:44 +01:00
Jaime van Kessel
52a137a68c Ensured that sidebar has the right properties to show again 
CL-541
 2017-11-27 14:42:45 +01:00
Jaime van Kessel
7d9af8e345 Added Opencontrol panel functions 
CL-541
 2017-11-27 14:13:30 +01:00
Jaime van Kessel
cdfdaec492 ClusterUM3 now uses local material data as first source 
CL-541
 2017-11-27 14:03:53 +01:00
Jaime van Kessel
f791b53ad8 Enabled monitor items for ClusterOutputDevice again 
CL-541
 2017-11-27 13:54:34 +01:00
Jaime van Kessel
083eee2e9d Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-11-27 13:43:39 +01:00
Jaime van Kessel
0613b1e4b7 Creating components is now done with the prefab function 
CURA-4568
 2017-11-27 13:00:49 +01:00
Jaime van Kessel
f570ba046b Added rudimentary jogging controls for UM3 
This needs a bit more love; The machine is a bit stupid when it comes to
moving outside of build area.

CL-541
 2017-11-27 11:02:56 +01:00
Jaime van Kessel
00eeb835ac ManualPrinterControl uses correct functions again 
CL-541
 2017-11-27 10:22:30 +01:00
Ghostkeeper
147cbdf592
Clarify translations of 'unknown' 
For some languages, the gender matters.

Contributes to issue CURA-4601.
 2017-11-24 13:16:14 +01:00
Jaime van Kessel
57de028608 re-implemented abort & pause for legacy um3 
CL-541
 2017-11-24 11:26:30 +01:00
Diego Prado Gesto
bf1ecba641 Add the layer thickness back to the color options in Simulation View 2017-11-24 10:54:20 +01:00
Diego Prado Gesto
c8c2129b7e CURA-4552 Minor changes 2017-11-24 10:51:34 +01:00
ChrisTerBeke
46a575b84f Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-24 10:31:30 +01:00
ChrisTerBeke
7d1db1b165 Merge branch '3.1' 2017-11-24 10:31:22 +01:00
Jaime van Kessel
219e285b20 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-11-24 09:23:21 +01:00
Jaime van Kessel
c523a6ddf6 Progress is now shown for LegacyPrinter while printing 
CL-541
 2017-11-24 09:22:50 +01:00
Jaime van Kessel
4597bb09ed Added (short) description & priority to legacy output device. 
CL-541
 2017-11-23 17:08:22 +01:00
Jaime van Kessel
1c2c4d4163 Added property to indicate if output device accepts commands 
Instead of how this was previously done, it's now tied to the auth state.

CL-541
 2017-11-23 17:07:24 +01:00
Diego Prado Gesto
7bb82cf56f CURA-4605 Fix render issues when importing a GCode that has empty 
layers. Also fix gaps between raft and the model.
 2017-11-23 16:47:34 +01:00
Lipu Fei
6b3e130349 Fix edge cases with ultimaker2 and whatever other machines that may get affected 
CURA-4617
 2017-11-23 16:28:36 +01:00
Jaime van Kessel
d0c7352be6 Added missing authentication_succeeded_message attribute to constructor 
CL-541
 2017-11-23 16:16:57 +01:00
Diego Prado Gesto
f0dca021d8 Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1 2017-11-23 15:42:02 +01:00
Diego Prado Gesto
2c6b2b869e CURA-4605 Fix render issues when there are empty layers. 
Fix layer gap when raft is enabled.
 2017-11-23 15:39:22 +01:00
Lipu Fei
ef37f0d8c7 Fix project loading to reset quality if it doesn't exist 
CURA-4617
 2017-11-23 15:35:33 +01:00
Mark
49705492ce Merge branch '3.1' 2017-11-23 14:37:31 +01:00
Jaime van Kessel
f03a978781 Sending & compressing g-codes re-added to LegacyUM3 
CL-541
 2017-11-23 14:19:54 +01:00
Jack Ha
5703f954d4 CURA-4552 fix support for relative extrusion 2017-11-23 14:13:18 +01:00
Lipu Fei
033cc4fbc7 Fix quality update in project loading 
CURA-4613
 2017-11-23 14:12:41 +01:00
Jaime van Kessel
8b8d67b3a8 LegacyUM3 now handles warnings & errors again 
CL-541
 2017-11-23 13:37:59 +01:00
Lipu Fei
1db448d7d8 Use the correct quality container for global stacks loaded from project files 
CURA-4613
 2017-11-23 13:04:06 +01:00
Lipu Fei
3148027fbe Fix version upgrade for quality_changes 
CURA-4613

Explained in the code comments.
 2017-11-23 12:43:14 +01:00
Lipu Fei
18c7a5acf3 Pass optional file_name for deserialization 
CURA-4613

Some upgrades depend on the file_name, so the file_name is needed in
this case.
 2017-11-23 11:28:16 +01:00
Jack Ha
f09f73a586 Merge branch '3.1' 2017-11-23 10:49:42 +01:00
Mark
aee838c8c1 Merge branch '3.1' 2017-11-23 10:38:48 +01:00
Jaime van Kessel
96d5c7152b Added sending material profiles to LegacyUM3 
CL-541
 2017-11-23 10:31:39 +01:00
Diego Prado Gesto
b97ed4c211 CURA-4609 Minor improvements in Simulation View: 
Increase simulation speed.
Hide Layer Thickness option in color scheme.
Hide nozzle when switching layers.
Set the handles in front of the view.
Name changed back to "Layer View"
 2017-11-23 09:59:34 +01:00
Ghostkeeper
105d7a5615
Return newly added single extruder 
The workspace reader needs to use it to get the correct material.

Contributes to issue CURA-4604.
 2017-11-22 17:12:53 +01:00
Ghostkeeper
dfe29fa482
Merge branch '3.1' 2017-11-22 12:41:57 +01:00
Lipu Fei
9fab4070a6 Fix quality_changes upgrade from 2.7 to 3.1 2017-11-22 12:11:18 +01:00
Jaime van Kessel
7465a6551a Setup the authentication stuff for LegacyUM3 
CL-541
 2017-11-22 11:59:07 +01:00
Diego Prado Gesto
10ec02840e Merge branch 'feature_simulation_ux_tweaks' of https://github.com/fieldOfView/Cura into fieldOfView-feature_simulation_ux_tweaks 2017-11-22 09:55:57 +01:00
Diego Prado Gesto
72954e758c CURA-4593 Workaround to fix the rendering glitches when the last layer has no data 2017-11-21 17:15:07 +01:00
fieldOfView
863b40b900 Merge branch 'master' into feature_simulation_ux_tweaks 
# Conflicts:
#	plugins/SimulationView/SimulationView.qml
 2017-11-21 16:49:41 +01:00