Lipu Fei
|
a6203f462d
|
Add build_type into crash reports and stats
CURA-6981
|
2019-11-15 15:00:46 +01:00 |
|
Jaime van Kessel
|
08ca213127
|
Add extra update for Combobox
|
2019-11-15 11:35:06 +01:00 |
|
Jaime van Kessel
|
33bfebb275
|
Merge branch 'master' of github.com:Ultimaker/Cura
|
2019-11-14 11:21:01 +01:00 |
|
Jaime van Kessel
|
c65ccf29b0
|
Merge branch 'mb-shared-heater' of https://github.com/smartavionics/Cura
|
2019-11-14 11:06:12 +01:00 |
|
Remco Burema
|
6127c99b64
|
Added a public key so the 'enterprise' build will start.
(sort of) part of CURA-6856
|
2019-11-13 17:14:46 +01:00 |
|
Lipu Fei
|
ebea5fbd14
|
Merge 4.4
|
2019-11-13 11:22:15 +01:00 |
|
Lipu Fei
|
c08e7df277
|
Fix typing
CURA-6976
|
2019-11-13 11:10:12 +01:00 |
|
Nino van Hooff
|
fe27193c98
|
Add dict key check for a crash found in IntentManager
CURA-6976
|
2019-11-13 11:01:03 +01:00 |
|
Nino van Hooff
|
eb4eddd49e
|
Add dict key check for a crash found in IntentManager
CURA-6976
|
2019-11-12 15:39:44 +01:00 |
|
Nino van Hooff
|
c31c1dd6fb
|
Refactor: simplify SimulationSliderLabel font metrics
|
2019-11-12 14:56:56 +01:00 |
|
Nino van Hooff
|
504eacce66
|
Merge remote-tracking branch 'origin/master'
|
2019-11-12 14:55:12 +01:00 |
|
Nino van Hooff
|
27b4e9a063
|
Refactor: simplify SimulationSliderLabel width
|
2019-11-12 14:55:00 +01:00 |
|
Nino van Hooff
|
f4b9c0fdd4
|
Fix SimulationSliderLabel width
|
2019-11-12 14:52:11 +01:00 |
|
Nino van Hooff
|
ae245ed0e5
|
Cleanup: remove warnings for non-existing margins
|
2019-11-12 14:51:48 +01:00 |
|
Lipu Fei
|
d70a6e81b1
|
Merge 4.4
|
2019-11-12 14:39:30 +01:00 |
|
Lipu Fei
|
77c194464e
|
Fix tests
|
2019-11-12 14:33:54 +01:00 |
|
Lipu Fei
|
8228c6a743
|
Make sure position is not None
CURA-6974
|
2019-11-12 14:22:21 +01:00 |
|
Jaime van Kessel
|
17b8e9930c
|
Add handling for case where variant could not be found
CURA-6975
|
2019-11-12 13:28:12 +01:00 |
|
Jaime van Kessel
|
3da53a3a89
|
Merge branch 'CURA-6856_signed_plugins_and_packages' of github.com:Ultimaker/Cura
|
2019-11-12 10:48:43 +01:00 |
|
Jaime van Kessel
|
2195dbaad0
|
Make backup window modal
It could get hidden on osx quite easily, which is confusing as hell
|
2019-11-12 10:31:45 +01:00 |
|
Remco Burema
|
c3d1ab0931
|
Small refactor: Rename in UM.
part of CURA-6856
|
2019-11-12 08:40:50 +01:00 |
|
Jaime van Kessel
|
7e3905059d
|
Let the simulation slider label scale on actual font size
CURA-6854
|
2019-11-11 16:10:26 +01:00 |
|
Jaime van Kessel
|
4613b62120
|
Merge branch '4.4' of github.com:Ultimaker/Cura
|
2019-11-11 16:01:19 +01:00 |
|
Jaime van Kessel
|
e2414ed5c9
|
Also log the exception when the connection failed to connect
|
2019-11-11 15:58:39 +01:00 |
|
Jaime van Kessel
|
4335acb19f
|
Fix text jitter for the layer slider
CURA-6854
|
2019-11-11 14:27:31 +01:00 |
|
Jaime van Kessel
|
3e50cf5253
|
Fix issues with makeblock definition
|
2019-11-11 13:43:04 +01:00 |
|
Lipu Fei
|
2fb8375714
|
Merge pull request #6591 from pkz0313/master
Hopefully Adding the Makeblock 3d Printer files to the latest version
|
2019-11-11 10:55:46 +01:00 |
|
Jaime van Kessel
|
d93f6f25d2
|
Prevent "sticky" tooltips
When quickly moving the mouse in and out, the timer would
still be running, so the tooltip would become active once the mouse
moved out of the area.
|
2019-11-11 10:47:53 +01:00 |
|
Lipu Fei
|
534b432e7e
|
Fix another is None check for typing
|
2019-11-11 09:08:13 +01:00 |
|
Lipu Fei
|
7495d7900f
|
Fix is None check for typing
|
2019-11-11 09:03:21 +01:00 |
|
Lipu Fei
|
896b73f8b3
|
Fix typing
|
2019-11-11 08:57:34 +01:00 |
|
Lipu Fei
|
adaea90d50
|
Fix typing
|
2019-11-11 08:48:04 +01:00 |
|
Lipu Fei
|
d13683f4db
|
Merge remote-tracking branch 'origin/4.4'
|
2019-11-11 08:13:53 +01:00 |
|
Jaime van Kessel
|
4f569194ec
|
Add extra typing
|
2019-11-08 17:36:50 +01:00 |
|
Jaime van Kessel
|
463822f10f
|
Fix some typing issues
|
2019-11-08 16:50:23 +01:00 |
|
Jaime van Kessel
|
b8f76d7bfb
|
Use QtApplication instead of Application
In live code it doesn't cause problems, but the static checker found it
|
2019-11-08 14:13:19 +01:00 |
|
Jaime van Kessel
|
e2a387b246
|
Add own getInstance for curaApplicaiton
This makes the typing a bit smarter
|
2019-11-08 13:59:38 +01:00 |
|
Jaime van Kessel
|
9940bc8551
|
Merge branch 'master' of github.com:Ultimaker/Cura
|
2019-11-08 13:38:58 +01:00 |
|
Jaime van Kessel
|
00078fd659
|
Remove a bunch of unused imports
|
2019-11-08 13:38:42 +01:00 |
|
Kaz
|
a5aa4c75ba
|
update gantry_height
|
2019-11-08 14:11:34 +08:00 |
|
Remco Burema
|
00f505374b
|
Merge pull request #6637 from Ultimaker/CURA-6917_unlink_duplicated_material_44
Cura 6917 unlink duplicated material
|
2019-11-07 17:23:28 +01:00 |
|
Remco Burema
|
3636eed964
|
Instead of selecting first, return only uniques.
part of CURA-6917
|
2019-11-07 17:19:18 +01:00 |
|
Nino van Hooff
|
6e79f489e2
|
When multiple linked materials are found, only display the first
CURA-6917
|
2019-11-07 15:51:22 +01:00 |
|
Nino van Hooff
|
0b450ef9f4
|
Fix linked materials not being found due to key casing
CURA-6917
|
2019-11-07 15:51:22 +01:00 |
|
Remco Burema
|
19d334f35c
|
Fix typing imports.
|
2019-11-07 14:31:38 +01:00 |
|
Lipu Fei
|
832b4f28dc
|
Fix merge conflicts with 4.4
|
2019-11-07 13:56:20 +01:00 |
|
ninovanhooff
|
d503f9df25
|
Merge pull request #6635 from Ultimaker/CURA-6854_align_layer_label_top_bottom
Fix window resize bug in LayerSlider concerning handle position
|
2019-11-07 13:04:01 +01:00 |
|
Nino van Hooff
|
ba6cf8eae5
|
Fix window resize bug in LayerSlider concerning handle position
Upper handle position would not be updated on resize
CURA-6854
|
2019-11-07 12:46:45 +01:00 |
|
Remco Burema
|
16b90d00b7
|
Merge pull request #6615 from Ultimaker/CS-476_improve_packages_api_speed
Packages API speed improvements
v4.4-beta
|
2019-11-07 11:31:24 +01:00 |
|
ChrisTerBeke
|
7dc38cd55d
|
Merge branch '4.4' into CS-476_improve_packages_api_speed
|
2019-11-07 10:31:37 +01:00 |
|