GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 01:28:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,743 Commits 294 Branches 267 Tags
Commit Graph

4543 Commits

Author SHA1 Message Date
Ghostkeeper
ade2b565bc
Add 3.5 change log 
Contributes to issue CURA-5710.
 2018-09-17 10:30:08 +02:00
Jaime van Kessel
4c460b6fa5 Prevent crash if sdk_version is "dev" 2018-09-14 16:15:56 +02:00
Remco Burema
5c73921943 [CURA-5725] Revert "Set simulation path to 0 after updating layer" 
This reverts commit 3da6e3c4535db85a921bf5770903bd1a729946e1.
 2018-09-14 14:35:10 +02:00
Ghostkeeper
2e6401b7dc
Don't depend on the name of resource folders not changing 
If we choose to rename the resource folders, then this plug-in should still look in the old resource folders. So hard-code these resource folders in the state that they were in at version 2.5 so that we can freely change them in a modern version.
 2018-09-14 11:36:31 +02:00
Ghostkeeper
572afb052e
Remove unused import 
This import was actually causing the test to fail on my computer due to a dependency on the order of importing libArcus vs. PyQt.
 2018-09-14 11:30:25 +02:00
Lipu Fei
b39d6c7d87 Package upgrade should also check SDK version 2018-09-13 13:42:53 +02:00
Lipu Fei
efdec50614 Fix typo 2018-09-12 17:08:58 +02:00
Lipu Fei
d1301d16a9 Skip the do-not-handle URLs instead of returning 
CURA-5718

The request-url dict is not ordered so you cannot garuantee the ordering
when you use .items(). This can cause a problem that if a do-not-handle
item occurs first then nothing will be handled at all.
 2018-09-12 16:58:22 +02:00
Aleksei S
3da6e3c453 Set simulation path to 0 after updating layer 
CURA-5677
 2018-09-12 16:56:54 +02:00
Remco Burema
f9585b5fae [CURA-5708] Hide the Materials-tab in ToolBox (v3.5 only) 2018-09-12 13:38:15 +02:00
Diego Prado Gesto
e3681ddd9f Also hack the way to get the generic materials, since the tag-filtered 
calls to the api don't work yet.

Contributes to CURA-5670.
 2018-09-11 13:39:53 +02:00
Jaime van Kessel
301605c30c Added missing typing to toolbox 2018-09-11 13:20:42 +02:00
Jaime van Kessel
4f30dffaf9 Ensure that when a corrupt 3mf file is loaded, the "failed to load" message will pop up 2018-09-11 12:58:00 +02:00
Lipu Fei
1fb6441327 Fix default hardware type NOZZLE in XML material 
CURA-5716
 2018-09-11 11:20:00 +02:00
Jaime van Kessel
d9e23bf02b Fix issue caused by making metadata of containerNode private 2018-09-11 10:42:42 +02:00
Jaime van Kessel
8a6c4a9fb6 Merge branch 'CURA-5677_auto_stop_sim_on_layer_change' of github.com:Ultimaker/Cura into 3.5 2018-09-11 10:40:01 +02:00
Remco Burema
109b3fc1d2 [CURA-5677] Removed some superfluous and/or dead lines. 2018-09-11 09:08:50 +02:00
Thomas Karl Pietrowski
5139e61475 Found the dead line while reading some code 2018-09-10 09:42:47 +02:00
Ian Paschal
2bc1e4b397 Fix bug where disovery window does not appear 2018-09-10 09:27:59 +02:00
Jaime van Kessel
5c6c299b27 Cleanup extruder manager 
Few more unused functions removed & simplified.
It also fixes a few more typing issues that I encountered.
 2018-09-07 17:06:18 +02:00
Jaime van Kessel
a8fc6aabcc Switch incorrect usage of getMachineExtruders to getActiveExtruderStacks 2018-09-07 16:27:56 +02:00
Remco Burema
c8eeb737bb Automatically stop simulation when the user manually changes the layer (as opposed to the sim. itself). [CURA-5677] 2018-09-07 15:45:31 +02:00
Jaime van Kessel
c7350ff579 Merge branch 'master' of github.com:Ultimaker/Cura 2018-09-07 15:24:09 +02:00
Jaime van Kessel
4cde6c05ae Switch most usages of containerStackId to containerStack for settingPropertyProvider 
This mostly makes the code a bit more logic and also decreases the number of searches in the registry
 2018-09-07 15:23:09 +02:00
Diego Prado Gesto
a9f151670e Remove unused components. They are no longer used. 2018-09-07 14:31:53 +02:00
Ian Paschal
18e0dacda4 Organize files better 
First things first... organize!
 2018-09-07 14:11:37 +02:00
Ian Paschal
49d72f5855
Merge pull request #4301 from Ultimaker/cura_connect_UI_rework 
CL-893 CL-894 Cura connect ui rework
 2018-09-07 12:45:56 +02:00
Ghostkeeper
b0e7562579
Rename VersionUpgrade plug-in from 40 to 35 
Because the next version is going to be called 3.5, not 4.0.
 2018-09-07 10:59:45 +02:00
Lipu Fei
d6046c725a Fix Toolbox QML null object warnings 
CURA-5670
 2018-09-07 09:29:31 +02:00
Ian Paschal
4cc1b6ce02 Add typings and fix code style 2018-09-06 16:57:45 +02:00
Lipu Fei
a8a88e5ccb Remove mistake changes in CuraEngineBackend 2018-09-06 16:06:45 +02:00
Lipu Fei
c36434ebdd Fix TestShortcutKeys 2018-09-06 16:06:45 +02:00
Jaime van Kessel
53d083e232 Merge branch 'master' of github.com:Ultimaker/Cura into cura_connect_UI_rework 2018-09-06 10:50:51 +02:00
Lipu Fei
a7f421c60c
Merge pull request #4097 from Ultimaker/fix_layer_number_width 
Adjust size of layer number depending on the maximum number of layers
 2018-09-06 09:50:32 +02:00
Mark
cfcf52d7c3 Center in parent and increase width. Fits good on Mac 2018-09-05 22:05:08 +02:00
Lipu Fei
b21200c6a8 Check for None before updating model 
CURA-5670
 2018-09-05 17:16:58 +02:00
Mark
68a62f1a66 Merge branch 'master' into fix_layer_number_width 2018-09-05 14:50:12 +02:00
Jaime van Kessel
57a7c3bcd2 Decrease margin for "manage queue" label 
CL-896
 2018-09-05 14:26:11 +02:00
Jaime van Kessel
534e60d8e1 Added pausing text for pausing state 
CL-896
 2018-09-05 14:22:41 +02:00
Jaime van Kessel
8e66686d6f Change "waiting" lable to "available" 
Cl-896
 2018-09-05 14:06:18 +02:00
Jaime van Kessel
23cd46824f Ensure that printer icon has disabled color if the printer is disabled 
CL-896
 2018-09-05 13:52:41 +02:00
Jaime van Kessel
5be65688a0 Change label to action required 
In some cases it's not a configuration change that's required, so this is a more correct label

CL-896
 2018-09-05 13:48:47 +02:00
Jaime van Kessel
7096c7382b Add width to labels in printcore qml object. 
This ensures that the elide works correctly

CL-896
 2018-09-05 13:43:24 +02:00
Jaime van Kessel
cd6832544b Fix for compatible_machine_families breaking for older firmwares 
Older firmwares didn't have the compatible_machine_families field yet.

Cl-894
 2018-09-05 13:17:33 +02:00
Jaime van Kessel
882cc000ac Move to top is now disabled for the first job 
CL-896
 2018-09-05 13:15:09 +02:00
Jaime van Kessel
1b9deb2790 Add unreachable label if a printer can not be reached inside a cluster 
CL-896
 2018-09-05 10:25:20 +02:00
Jaime van Kessel
7ad2e67074 Fix margins for active print job name in printer tile for cluster 
CL-896
 2018-09-05 10:09:44 +02:00
Jaime van Kessel
a0302684d6 Add handling for cluster print jobs that are in error state 
CL-896
 2018-09-05 10:06:37 +02:00
Jaime van Kessel
be4357c635 Show different state when printer is disabled 
CL-896
 2018-09-04 13:45:16 +02:00
Jaime van Kessel
132366fa61 Revert "Add enabled state to printer, so that it can be displayed." 
This reverts commit dd778f0450219cbc2f7309eeb08bc20065bd51af.
 2018-09-04 13:42:24 +02:00