Daniel Green
|
bfa13e6146
|
Merge branch 'master' of github.com:radfahrer/Cura
|
2019-02-26 07:25:42 -08:00 |
|
Daniel Green
|
5219b1ff9b
|
Removes unnecessary fields.
|
2019-02-26 07:21:46 -08:00 |
|
Ghostkeeper
|
b7efc1baf0
|
Change tabs to spaces
We use spaces to indent, normally.
|
2019-02-25 11:19:51 +01:00 |
|
Daniel Green
|
1d4298a27f
|
Fixes the version setting. Adds start and end g-code
|
2019-02-24 17:40:46 -08:00 |
|
Daniel Green
|
f8bc2e7b07
|
Adds a printer definition for the FLSUN QQ
|
2019-02-23 18:21:52 -08:00 |
|
Jaime van Kessel
|
b165b9625f
|
Removed unused code and fix styling for some comments
|
2019-02-22 15:08:51 +01:00 |
|
Jaime van Kessel
|
3494055de7
|
Add some debug prints to the test that ocasionally fails on the CI
|
2019-02-22 15:01:53 +01:00 |
|
Jaime van Kessel
|
5f4907da5c
|
Added tests for NetworkedPrinterOutputDevice
|
2019-02-22 14:57:22 +01:00 |
|
Jaime van Kessel
|
905787b9b3
|
Merge branch 'master' of github.com:Ultimaker/Cura
|
2019-02-22 13:50:16 +01:00 |
|
Jaime van Kessel
|
b5c270f00a
|
Add stubs for MachineManager testing
It also adds a first test that checks if the setActiveMachine
|
2019-02-22 13:49:31 +01:00 |
|
Lipu Fei
|
4d3211e651
|
Merge remote-tracking branch 'origin/4.0'
|
2019-02-22 13:38:29 +01:00 |
|
Lipu Fei
|
2694ef98e0
|
Merge pull request #5338 from Ultimaker/CURA-6232_config_menu_tab_fix
Fix tab-bar of config.-menu always on idex 0 on reshow. [CURA-6232]
4.0-beta
|
2019-02-22 13:37:10 +01:00 |
|
Diego Prado Gesto
|
271573d0ae
|
Fix typo... again
|
2019-02-22 13:19:04 +01:00 |
|
Diego Prado Gesto
|
4d030572ba
|
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
|
2019-02-22 13:18:36 +01:00 |
|
Diego Prado Gesto
|
5d8eb3e6e5
|
Fix typo
|
2019-02-22 13:18:20 +01:00 |
|
Ghostkeeper
|
ac18d88d22
|
Merge branch 'wgaonar-master'
|
2019-02-22 12:55:14 +01:00 |
|
Ghostkeeper
|
c4e7775034
|
Merge branch 'master' of https://github.com/wgaonar/Cura into wgaonar-master
|
2019-02-22 12:33:40 +01:00 |
|
Jaime van Kessel
|
dd59b9167b
|
Merge branch '4.0' of github.com:Ultimaker/Cura
|
2019-02-22 11:37:58 +01:00 |
|
Jaime van Kessel
|
ee1830e777
|
Make the duration test first zero the times before sending print duration message.
|
2019-02-22 11:33:23 +01:00 |
|
Jaime van Kessel
|
69d3813f98
|
No longer disable viewMenu when user loaded presliced g-code
|
2019-02-22 11:19:16 +01:00 |
|
Jaime van Kessel
|
198ea3c74f
|
Ensure the model checker doesn't update a gazillion times on multiply
CURA-6237
|
2019-02-21 21:09:49 +01:00 |
|
Jaime van Kessel
|
7221b23457
|
Add a property to temporarily disable the material models from updating.
This allows the QMl to stop the updating when it's not even visible
|
2019-02-21 20:50:44 +01:00 |
|
Jaime van Kessel
|
41f2a0e222
|
Add a property to temporarily disable the material models from updating.
This allows the QMl to stop the updating when it's not even visible
|
2019-02-21 20:47:38 +01:00 |
|
Jaime van Kessel
|
7754b8a447
|
Only instantiate setting menus when it's visible
This saves a bit of time on booting and prevents unneeded updates (
because it doesn't matter if a setting changes if no-one is watching!)
|
2019-02-21 20:20:01 +01:00 |
|
Jaime van Kessel
|
dee739db8b
|
Merge branch '4.0' of github.com:Ultimaker/Cura
|
2019-02-21 20:19:30 +01:00 |
|
Jaime van Kessel
|
8409d7d645
|
Remove another unneeded catalog
|
2019-02-21 18:42:06 +01:00 |
|
Jaime van Kessel
|
fc11286c6c
|
Also ensure that the QualtiyProfilesModel is on a changeTimer on create
|
2019-02-21 18:38:51 +01:00 |
|
Jaime van Kessel
|
5118953373
|
Put a change timer on the globalStacks model
This decreases the time that a first thing is shown on the main screen (as the creation
of the global stack model doesn't block the UI anymore)
|
2019-02-21 18:30:23 +01:00 |
|
Wilmer Gaona
|
57a4ac87bb
|
Update mendel90.def.json
Delete the unnecessary and commented lines
|
2019-02-21 11:09:51 -06:00 |
|
Jaime van Kessel
|
48ed9b6e20
|
Remove usage of plugin model
|
2019-02-21 17:16:59 +01:00 |
|
Ghostkeeper
|
2d108b3284
|
Merge branch 'master' of https://github.com/wgaonar/Cura into wgaonar-master
|
2019-02-21 16:55:36 +01:00 |
|
Jaime van Kessel
|
d9c4edf093
|
Prevent a few expensive conversions from happening in the QML
|
2019-02-21 16:36:14 +01:00 |
|
Jaime van Kessel
|
b64cf1fe1c
|
Remove unneeded signal call
|
2019-02-21 16:19:16 +01:00 |
|
Jaime van Kessel
|
1b36a8e12c
|
Fix some more bindings for SettingItem
|
2019-02-21 16:17:25 +01:00 |
|
Jaime van Kessel
|
27370dd45d
|
Improve the bindings for the material menu
This way the evaluation is significantly faster.
|
2019-02-21 15:26:25 +01:00 |
|
Jaime van Kessel
|
b2df5c3445
|
Remove the numSettingsVisible property from the workspace dialog
This slows down the booting of Cura and it's probably not something people care about.
|
2019-02-21 15:08:41 +01:00 |
|
Jaime van Kessel
|
c2d783bf7a
|
Removed unused plugins model
|
2019-02-21 15:05:40 +01:00 |
|
Jaime van Kessel
|
956b917cd6
|
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
|
2019-02-21 14:50:01 +01:00 |
|
Jaime van Kessel
|
b07086dee4
|
Remove catalog creation from setting item
This pretty much doubles the speed by which setting items are created.
|
2019-02-21 14:49:25 +01:00 |
|
Ghostkeeper
|
650204dae7
|
Merge branch '4.0'
|
2019-02-21 09:09:19 +01:00 |
|
Remco Burema
|
ab25bcaf2f
|
Tiny fix tranlation typo Spanish (X -> Y).
|
2019-02-21 08:54:05 +01:00 |
|
Ghostkeeper
|
3040fde9eb
|
Merge branch '4.0'
Conflicts:
cura/OAuth2/AuthorizationService.py -> Code style change vs. fixing logging in while no internet connection.
|
2019-02-21 08:25:21 +01:00 |
|
Simon Edwards
|
bcfbeba824
|
Merge pull request #5339 from Ultimaker/fix_cloud_connection_detection
Use new property names for cloud connection detection
|
2019-02-20 15:22:52 +01:00 |
|
Ian Paschal
|
10f0a5663d
|
Update MonitorMain.qml
|
2019-02-20 14:32:19 +01:00 |
|
Ian Paschal
|
a5761cb56b
|
Use new property names for cloud connection detection
|
2019-02-20 14:08:13 +01:00 |
|
Simon Edwards
|
163a231365
|
Merge pull request #5336 from Ultimaker/CL-1245_change_exception_logging_when_no_connection
CL-1245 Change exception logging when no connection
|
2019-02-20 13:30:40 +01:00 |
|
Remco Burema
|
b4e4b7125d
|
Fix tab-bar of config.-menu always on idex 0 on reshow. [CURA-6232]
|
2019-02-20 13:27:05 +01:00 |
|
Simon Edwards
|
60547b4265
|
Merge pull request #5329 from Ultimaker/CL-1247_improve_cloud_disabled_states
CL-1247 Improve cloud disabled states
|
2019-02-20 13:17:11 +01:00 |
|
Remco Burema
|
f81ad58836
|
Merge branch 'ppa_contribute_compatible_format' into 4.0
|
2019-02-20 11:29:24 +01:00 |
|
Remco Burema
|
7fca9dae04
|
Merge branch '4.0' into ppa_contribute_compatible_format
|
2019-02-20 11:26:13 +01:00 |
|