GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-29 11:43:17 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,751 Commits 295 Branches 268 Tags
Commit Graph

22751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Vlad Gribinchuk
5287cc3dfd Feature: "Wipe Script" 2019-02-20 16:39:50 +02: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
Jaime van Kessel
9a1d8ea5f9 Don't serialize "definition" for material profile 
CURA-5787
 2019-02-20 10:46:49 +01:00
Ian Paschal
cb8804b86a Revert "Add some kaizen changes from #5328" 
This reverts commit 09fe06b8bf463fd0805fa767bbe34087adc0c700.
 2019-02-20 10:46:15 +01:00
Ian Paschal
09fe06b8bf Add some kaizen changes from #5328 
Contributes to CL-1245
 2019-02-20 10:45:36 +01:00
Ian Paschal
a11878b199 Log warning instead of exception if no connection 
Contributes to CL-1245
 2019-02-20 10:40:23 +01:00
Ian Paschal
164e721c42
Merge pull request #5331 from Ultimaker/monitor_tab_images 
Fix the path to the pop up images in the monitor tab.
 2019-02-20 10:17:54 +01:00
Remco Burema
8e7a66d2ec
Merge pull request #5327 from Ultimaker/CURA-6140_adjust_description_skin_overlap 
Adjust description of Skin Overlap (Percentage). [CURA-6140]
 2019-02-20 09:59:17 +01:00
Remco Burema
1608adde00 Change of wording Skin Overlap (Percentage). [CURA-6140] 2019-02-20 09:57:48 +01:00
Simon Edwards
43b1c86920 Use QUrl.fromLocalFile() to create the file:// URLs for the images 2019-02-20 09:31:51 +01:00
John Hryb IV
3a979903aa
PostProcessingPlugin Script for 2-1 Dual Extruders - ColorMix 2-1 
Marlin Commands:
M163 - Set Mix Factor
M164 - Save Mix
Ability to set a mix ratio or blend at a defined layer or distance.
Based on Geeetech's Color mixing software.
 2019-02-19 23:40:36 -05:00
Wilmer Gaona
b60cfaab64
Update mendel90.def.json 
The main modification is to set absolute extrusion and machine center in the start gcode
 2019-02-19 15:32:23 -06:00
Jaime van Kessel
3f18b0b974 Increase agressiveness of short circuit logic; Just check if the node is slicable 
That should also filter out platform, buildVolume and convexHulLNodes
 2019-02-19 18:00:20 +01:00
Jaime van Kessel
b61bf3df4d Only emit signal if the properties actually changed 2019-02-19 17:46:29 +01:00
Jaime van Kessel
aef89e2bd3 Add few more cases where Camera changes caused un-needed updates 2019-02-19 17:40:44 +01:00