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

6192 Commits

Author SHA1 Message Date
Ghostkeeper
a0c3738a49
Add translations for deprime settings 
These need to be read for the deprime experiments in the PPA.

Contributes to issue CURA-6329.
 2019-06-04 17:07:59 +02:00
Ghostkeeper
4e361a068c
Revert "Merge pull request #5726 from Ultimaker/CL-1331_use_API_for_UM3NetworkPrinting" 
This reverts commit bec7b6546d3f7de457418a2e15f08c1e6dfa3148, reversing
changes made to 7094b222b10076af3a13f11b03dd3416eae12156.

The changes there were not accepted. Please see pull request https://github.com/Ultimaker/Cura/pull/5726 for the discussion about this.

Conflicts:
	plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py -> Just in one TODO comment.
 2019-05-23 13:40:11 +02:00
Lipu Fei
5b7b262d61 Merge remote-tracking branch 'origin/4.1' 2019-05-23 10:53:24 +02:00
Lipu Fei
50e4519298 Fix upgrade 40 to 41 2019-05-23 10:46:14 +02:00
Lipu Fei
3ca272ff72 Merge remote-tracking branch 'origin/4.1' 2019-05-22 07:44:26 +02:00
Remco Burema
083564a184
Merge pull request #5763 from Ultimaker/CL-1329_fix_monitor_progress_bar_bug 
CL-1329 fix monitor progress bar bug
 2019-05-21 17:27:53 +02:00
Ian Paschal
5a8b70ad0c Simplify can_override conditional 
Contributes to CL-1259
 2019-05-20 15:48:57 +02:00
Ian Paschal
0dc49a66f1
Merge pull request #5762 from Ultimaker/CL-1259_hide_useless_override_button 
CL-1259 hide useless override button
 2019-05-20 15:47:26 +02:00
Ian Paschal
0c9f3a1842 Update MonitorConfigOverrideDialog.qml 
Contributes to CL-1259
 2019-05-20 15:47:19 +02:00
Ian Paschal
7be3863d51 Put override logic in Python instead of QML 
Contributes to CL-1259
 2019-05-20 15:46:07 +02:00
Ian Paschal
2a80a8d0db Simplify can_override conditional 
Contributes to CL-1259
 2019-05-20 15:12:08 +02:00
Ghostkeeper
19cc267726
Merge branch '4.1' 2019-05-20 13:42:38 +02:00
Jaime van Kessel
fbc4c5fb1e
Merge pull request #5719 from Ultimaker/CURA-6497_fix_empty_material_name 
CURA-6497 Add validation for empty strings in SettingDefinition
 2019-05-20 13:40:39 +02:00
Jaime van Kessel
5ae103964a Merge branch 'CURA-6497_fix_empty_material_name' of github.com:Ultimaker/Cura into 4.1 2019-05-20 13:38:37 +02:00
Ian Paschal
3b7b554f1a Update MonitorPrintJobProgressBar.qml 
Contributes to CL-1329
 2019-05-20 12:18:55 +02:00
Ian Paschal
c9588d173f Add monitor column to theme 
Contributes to CL-1329
 2019-05-20 12:18:38 +02:00
Jaime van Kessel
26db08048b Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-20 11:03:38 +02:00
Jaime van Kessel
7d8c97dd7b ChangeAtZ no longer sets flow to -1 if no previous flow was found 
It makes a lot more sense to just asume the value is 100 than -1

Fixes #5284
 2019-05-20 11:02:40 +02:00
Ian Paschal
6dc43f9ed1 Hide override button if it can't be overridden 
Contributes to CL-1259
 2019-05-20 10:59:51 +02:00
Ian Paschal
3cf2e19692 Put override logic in Python instead of QML 
Contributes to CL-1259
 2019-05-20 10:59:34 +02:00
Jaime van Kessel
df75183eda Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-20 10:47:19 +02:00
Jaime van Kessel
5c33277d9a Correctly reset the script list on machine change 
Fixes #5747
 2019-05-20 10:46:47 +02:00
Jaime van Kessel
414e8d2b08 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-20 09:20:42 +02:00
Jaime van Kessel
cb68a1f100 Remove fixed height of installed plugin name label 
Fixes #5755
 2019-05-20 09:19:39 +02:00
Lipu Fei
33aae24d6d Merge remote-tracking branch 'origin/4.1' 2019-05-17 14:41:52 +02:00
Diego Prado Gesto
4e65232364 Change the font size of settings in extruder tab 
To make it consistent with the sizes in the Printer tab.
 2019-05-17 11:58:30 +02:00
Ian Paschal
4078a23449 Fix typo 2019-05-17 10:44:53 +02:00
Ghostkeeper
abcac67cee
Improve wording of No. Layers setting 
Fixes #5741.
 2019-05-17 09:39:51 +02:00
Jaime van Kessel
314a6495c4 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-16 16:40:10 +02:00
Jaime van Kessel
ff0a18603b Remove a few more usages of deprecated functions 2019-05-16 15:20:38 +02:00
Lipu Fei
6a2980ab4f
Merge pull request #5655 from Ultimaker/shader_optimization 
Shader optimization
 2019-05-16 14:30:52 +02:00
Lipu Fei
dab0a43214 Merge remote-tracking branch 'origin/master' into shader_optimization 2019-05-16 14:22:05 +02:00
Jaime van Kessel
843bb6f5a3 Change some of the logging messages to info 
CURA-6525
 2019-05-15 17:25:31 +02:00
Simon Edwards
bec7b6546d
Merge pull request #5726 from Ultimaker/CL-1331_use_API_for_UM3NetworkPrinting 
CL-1331 Extending the Cura API for the Network Printing Plugin
 2019-05-15 11:11:49 +02:00
Ian Paschal
5774813704 Use class properties 
Contributes to CL-1331
 2019-05-15 10:09:50 +02:00
Ian Paschal
c7f6351903 Add typings 
Contributes to CL-1331
 2019-05-15 10:09:27 +02:00
ChrisTerBeke
913fac0094
Should be non-human readable string 2019-05-14 21:18:00 +02:00
ChrisTerBeke
b1920b05e9
Remove hacky code that is now not needed anymore 2019-05-14 21:13:29 +02:00
ChrisTerBeke
56c1da2580
printer_type has a default value so cannot be Optional 2019-05-14 21:01:34 +02:00
ChrisTerBeke
70c679859a
Use default value for printer type, allow printer_type field from cloud 2019-05-14 20:56:28 +02:00
Ian Paschal
f81340c14a
Merge pull request #5717 from Ultimaker/CL-1259_hide_useless_override_button 
CL-1259 Hide the Override button if it is not an option
 2019-05-14 15:30:53 +02:00
Lipu Fei
7c1d589528 Merge remote-tracking branch 'origin/4.1' into CURA-6497_fix_empty_material_name 2019-05-14 09:42:57 +02:00
Ian Paschal
c4ca133b40 Update UM3OutputDevicePlugin.py 
Contributes to CL-1331
 2019-05-13 15:39:29 +02:00
Ian Paschal
8b25816b1b Fix typo and white space 
Contributes to CL-1331
 2019-05-13 14:44:39 +02:00
Ghostkeeper
3629b955fe
Merge branch 'port-filter' of https://github.com/joba-1/Cura into joba-1-port-filter 2019-05-09 16:55:44 +02:00
Ian Paschal
d391ec4e6b Comments 
Contributes to CL-1331
 2019-05-09 16:41:01 +02:00
Ian Paschal
f7ef24819d Remove unused code 
I'm not sure why loadConfigurationFromPrinter is not used... but it's not.

Contributes to CL-1331
 2019-05-09 16:23:12 +02:00
Ian Paschal
b3276777b7 Expose machines API to QML 
Contributes to CL-1331
 2019-05-09 16:19:59 +02:00
Ian Paschal
26ab359a93 Add more endpoints to machines API 
- getCurrentMachine
- setCurrentMachineGroupName
- updateCurrentMachineConfiguration

Also shortened `global_container_stack` to `global_stack` since every stack is a container stack.

Contributes to CL-1331
 2019-05-09 16:01:44 +02:00
Jaime van Kessel
4bc348ba49 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-09 15:11:37 +02:00