Jaime van Kessel
c84a2213a7
Merge branch '3.5' of github.com:Ultimaker/Cura
2018-09-11 11:01:55 +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
Jaime van Kessel
e717fa2251
Fix issue caused by making metadata of containerNode private
2018-09-11 10:36:53 +02:00
Diego Prado Gesto
19eefc71da
Update SDK version for the bundled packages.
2018-09-11 09:38:23 +02:00
Diego Prado Gesto
bacae6c136
Update name of the VersionUpgrade for the version 3.5.
2018-09-11 09:38:23 +02:00
Diego Prado Gesto
1c4dddd8e2
Merge branch 'stelgenhof-master'
2018-09-11 09:20:06 +02:00
Diego Prado Gesto
ff8cbfa899
Merge branch 'master' of git://github.com/stelgenhof/Cura into stelgenhof-master
2018-09-11 09:19:18 +02:00
Remco Burema
109b3fc1d2
[CURA-5677] Removed some superfluous and/or dead lines.
2018-09-11 09:08:50 +02:00
Lipu Fei
8d3bc13aae
Merge pull request #4351 from Ultimaker/fix_style_3.5
...
Fix style in 3.5 branch
2018-09-10 17:31:40 +02:00
Diego Prado Gesto
351fe5c5bc
Fix style.
2018-09-10 17:25:06 +02:00
Jaime van Kessel
729d78e14a
Updated another set of typing
2018-09-10 16:08:31 +02:00
Jaime van Kessel
e7d9f0ce45
Added typing for various setting classes
2018-09-10 15:24:11 +02:00
Sacha Telgenhof Oude Koehorst
5ca5aacbee
Removed layer_height override as it isn't needed. Only the initial layer height needs to be overridden.
2018-09-10 21:46:26 +09:00
Lipu Fei
d8421105d4
Fix quality lookup
...
CURA-5694
For a machine, if it has extruder-specific qualities, when we look up
extruder qualities, we should NOT fall back to use the global qualities.
2018-09-10 14:39:10 +02:00
Sacha Telgenhof Oude Koehorst
42a523cb00
Add single extruder definition for Ender-3.
2018-09-10 21:32:36 +09:00
Lipu Fei
d01ec7872d
Fix quality lookup
...
CURA-5694
For a machine, if it has extruder-specific qualities, when we look up
extruder qualities, we should NOT fall back to use the global qualities.
2018-09-10 14:23:46 +02:00
Thomas Karl Pietrowski
5139e61475
Found the dead line while reading some code
2018-09-10 09:42:47 +02:00
Jaime van Kessel
67bc45e37d
Added 3MF writer as required plugin
2018-09-10 09:40:53 +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
e6d0a9cc6a
Add missing typing
2018-09-07 16:33:44 +02:00
Jaime van Kessel
a8fc6aabcc
Switch incorrect usage of getMachineExtruders to getActiveExtruderStacks
2018-09-07 16:27:56 +02:00
Jaime van Kessel
638f9fb941
Remove unused functions
2018-09-07 16:02:54 +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
20ec8828ed
Fix incorrect type hinting
...
The type hinting indicated that the property was a dict, but it could also be None.
In cases where it was None, it would cause an exception, which was also fixed (since
unpacking None will break)
2018-09-07 15:32:07 +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
244876b5f1
Merge pull request #4337 from Ultimaker/cura_connect_improvements
...
Organize files better before 3.5
2018-09-07 14:37:54 +02:00
Diego Prado Gesto
a9f151670e
Remove unused components. They are no longer used.
2018-09-07 14:31:53 +02:00
Ian Paschal
4c6d101d70
Merge pull request #4338 from Ultimaker/cleanup_um3network_plugin
...
Remove unused files in the network plugin
2018-09-07 14:18:56 +02:00
Diego Prado Gesto
d53e9f9263
Remove not used files.
...
After the refactor, these files are no longer used.
2018-09-07 14:12:19 +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
5a36bc963c
Fix shortcut conflict in French
2018-09-06 16:06:45 +02:00
Lipu Fei
29ef964ba7
Add shortcut key check script into Jenkinsfile
2018-09-06 16:06:45 +02:00
Lipu Fei
15f5e9ff01
Remove TestShortcutKeys
2018-09-06 16:06:45 +02:00
Lipu Fei
784f7cca76
Move shortcut key check into a separate script
2018-09-06 16:06: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
Aleksei S
27c112d4db
Fix duplicated shortcut keys in all languages
...
CURA-5642
2018-09-06 16:06:45 +02:00
Aleksei S
0f655553bb
Removed shortcut keys from general cura.pot
...
CURA-5642
2018-09-06 16:06:45 +02:00
Aleksei S
e853cdc04d
Removed shortcut from Reset All Model &Transformations
...
CURA-5642
2018-09-06 16:06:45 +02:00
Aleksei S
944b937036
Simplified unit test, make code clear
...
CURA-5642
2018-09-06 16:06:45 +02:00
Aleksei S
17d2316da3
Validate shortcut keys in all languages(except default)
...
CURA-5642
2018-09-06 16:06:45 +02:00
Aleksei S
3a8d023371
Addded test for checking shortcut keys
...
CURA-5642
2018-09-06 16:06:45 +02:00
Lipu Fei
0b6574e715
Rename script to check_gcode_buffer.py
...
CURA-5561
2018-09-06 15:36:13 +02:00
