Mark Burton
0aae887166
Add entry for prime tower type to _isInfillOrSkinTypeMap.
2019-08-01 20:34:39 +01:00
Ghostkeeper
b3912fb930
Merge branch '4.2'
2019-07-31 10:43:17 +02:00
Jaime van Kessel
4b956953a6
Fix incorect error checking
...
We don't need to check the global stack for errors, as the correct values are already checked by looking at the extruder stacks
2019-07-31 10:24:31 +02:00
ChrisTerBeke
56f58c741a
Merge branch 'master' into CS-234_network_plugin_code_quality
2019-07-30 13:10:19 +02:00
Jaime van Kessel
67dbb97958
Fix incorrect cast import
2019-07-30 11:45:27 +02:00
ChrisTerBeke
1aa70748af
Consistent naming, some bug fixes
2019-07-29 17:24:10 +02:00
ChrisTerBeke
ddd282eef3
Remove absolute plugin imports, some fixes
2019-07-29 16:11:01 +02:00
Jaime van Kessel
e0c2611a0a
Merge branch '4.2' of github.com:Ultimaker/Cura
2019-07-26 12:47:13 +02:00
Jaime van Kessel
a3dad0fa09
Fix issue with deprecation and pyqtSlot
2019-07-26 10:55:55 +02:00
Lipu Fei
9f18ceda51
Merge remote-tracking branch 'origin/master' into add_42_43_version_upgrader
2019-07-25 14:56:27 +02:00
Ghostkeeper
be4e754984
Remove cache of material manager
...
It doesn't make the code much simpler because the cache is also not a local variable.
Contributes to issue CURA-6679.
2019-07-24 16:04:40 +02:00
Jaime van Kessel
87666eb6a1
Merge branch 'master' of github.com:Ultimaker/Cura
2019-07-23 13:42:29 +02:00
Jaime van Kessel
d8ddcba091
Fix typing ignore for breath frist iterator
2019-07-23 13:40:40 +02:00
Ghostkeeper
f69eb05636
Merge branch '4.2'
2019-07-23 13:33:58 +02:00
Ghostkeeper
5f74ed080f
Increment SDK version to 6.2
2019-07-23 13:32:48 +02:00
Jaime van Kessel
827ccd5a13
Fix mypy issues caused by scenenode iterator being correctly typed
2019-07-23 13:19:42 +02:00
Jaime van Kessel
9ceb9ce18b
Fix typing issues
...
They were caused by upgrading to a higher mypy version, which found more mistakes
2019-07-23 12:58:46 +02:00
Jaime van Kessel
e56e355e79
Added upgrader for 4.3
2019-07-23 11:15:13 +02:00
Jaime van Kessel
822181f214
Merge branch '4.2' of github.com:Ultimaker/Cura
2019-07-22 16:15:01 +02:00
Jaime van Kessel
c3166703b4
Also connect the objectsModel to the selectionChanged signal
2019-07-22 10:27:19 +02:00
Lipu Fei
4b8a216771
Fix typing
2019-07-22 09:34:00 +02:00
Jaime van Kessel
28184ad999
Add some simple tests to CuraSceneNode
2019-07-19 16:53:37 +02:00
Jaime van Kessel
6bb9e6097a
Rename "collideWithArea" to "collideWithAreas"
...
This better reflects what it does (eg; it is checking for multiple colissions, not just one)
2019-07-19 16:23:57 +02:00
Jaime van Kessel
1c93dffc22
Added deprecation warning to getExtruderName
2019-07-19 13:36:53 +02:00
Jaime van Kessel
a436d5e0bf
Added missing cast to getMachine
2019-07-19 12:43:17 +02:00
Jaime van Kessel
272ef40669
Merge branch '4.2' of github.com:Ultimaker/Cura
2019-07-19 09:31:51 +02:00
Jaime van Kessel
a82dcb6f52
Fix crash when attempting to set build plate for selection
2019-07-19 09:23:42 +02:00
Lipu Fei
a6790e7bb2
Merge pull request #6011 from Ultimaker/CURA-6651_add_peripheral_data_slot
...
Add data slot for peripherals
2019-07-18 12:39:56 +02:00
Lipu Fei
6a843866a0
Fix code style
...
CURA-6651
2019-07-18 11:57:07 +02:00
Ghostkeeper
f334fa8578
Spelling of log entries and code style
2019-07-18 11:49:18 +02:00
Jaime van Kessel
f402235406
Fix shadowed use of builtin type
...
CURA-6651
2019-07-16 10:27:50 +02:00
Ghostkeeper
fed275024a
Add slot to store peripherals
...
You can get the list of names of peripherals this way.
Contributes to issue CURA-6651.
2019-07-15 17:29:30 +02:00
Ghostkeeper
7927169da1
Add peripheral class
...
It has a non-human-readable type for the plug-ins to use and a human-readable name which can be requested with the peripherals() property.
Contributes to issue CURA-6651.
2019-07-15 17:27:23 +02:00
Remco Burema
fea8262656
Listen to 'material-changed' since it doesn't update immediately.
...
part of CURA-6590
2019-07-03 16:14:08 +02:00
Lipu Fei
b463b0c35b
Fix CuraVerison.py configuration
2019-07-02 14:19:56 +02:00
Lipu Fei
43baca1545
Hardcode Cura SDK version with each release
2019-07-02 13:33:18 +02:00
Ghostkeeper
a4093aa6fd
Merge branch 'type_fix_build_volume'
2019-07-02 10:37:22 +02:00
Remco Burema
f5b0cae554
Prime-brim calculation needs adhesion extruder, not just any.
2019-07-02 07:46:21 +02:00
Ghostkeeper
ea93490c45
Fix crash when loading multi-extrusion print
...
Because getProperty needs a property to get.
2019-07-01 14:56:03 +02:00
Jaime van Kessel
a7d419f497
Fix deprecation decorator breaking the getExtruder function
2019-07-01 11:18:54 +02:00
Ghostkeeper
17e86a28b7
Guard against broken import
2019-07-01 10:58:08 +02:00
Ghostkeeper
f86cf06b88
Add typing
2019-07-01 10:57:08 +02:00
Jaime van Kessel
6136f5a2f2
Further simplify the build volume code
2019-06-28 15:22:58 +02:00
Jaime van Kessel
691d106719
Remove old unused code
2019-06-28 15:09:08 +02:00
Jaime van Kessel
f329d7aed9
Made typing hint a bit more specific
2019-06-28 15:08:46 +02:00
Jaime van Kessel
2133fc78e0
Remove unused code
2019-06-28 15:01:09 +02:00
Jaime van Kessel
efc6ef2905
Add missing typing
2019-06-28 13:44:47 +02:00
Ghostkeeper
7fbdccffdb
Add typing
2019-06-18 12:00:22 +02:00
Lipu Fei
1d85e60a6b
Merge remote-tracking branch 'origin/master' into CURA-6460_remove_square_tower
2019-06-17 13:11:07 +02:00
Ghostkeeper
02b0242807
Fix translatability of caution message
...
Never put the formatting within the i18nc call. Always put the formatted string inside, but the formatting call outside of the function, like this:
catalog.i18nc('@info', 'I am {age} years old.').format(age = my_age)
Otherwise, when looking up the translation for the string, it's going to try to look up the translation for the formatted string (with the age already filled in). It won't be able to find that because this sentence was not translated for all possible ages of a human.
In this case I can make it even easier on the translator because the list must always follow after the text.
2019-06-14 11:00:52 +02:00
