GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-01 08:14:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,614 Commits 291 Branches 260 Tags
Commit Graph

1105 Commits

Author SHA1 Message Date
ChrisTerBeke
70421e5ac5
Merge branch '4.0' into STAR-322_cloud-connection 2018-12-17 15:46:28 +01:00
Diego Prado Gesto
b5d8db6a77 Merge branch '4.0' into CURA-6011_connection_types 2018-12-17 15:44:02 +01:00
Diego Prado Gesto
e62a570210 Merge branch '4.0' into CURA-6005_cura_drive_plugin 2018-12-17 11:25:19 +01:00
Ghostkeeper
c235f339ae
Increment API version to 6 
All plug-ins now have to re-check whether they are still compatible with the current version of Cura.

Contributes to issue CURA-6019.
 2018-12-14 17:29:02 +01:00
Jaime van Kessel
226d052468 Move the machines from machinelist into their own model 
CURA-6011
 2018-12-14 17:10:58 +01:00
ChrisTerBeke
2772b3bcbd Merge branch '4.0' into STAR-322_cloud-connection 2018-12-14 16:10:20 +01:00
Lipu Fei
4252b95603 Make ConnectionType Enum type accessible to QML 
CURA-6011
 2018-12-14 11:28:21 +01:00
Lipu Fei
620790ae3d Reduce the creations of ExtrudersModels 
CURA-6015
 2018-12-13 14:12:23 +01:00
Lipu Fei
b6ea61612e Fix merge conflicts 2018-12-12 13:26:01 +01:00
Lipu Fei
2275e5c71f Refactor code to use constants in CuraConstants 
CURA-6005
 2018-12-11 12:13:46 +01:00
Diego Prado Gesto
e479772f4d Merge branch 'master' into ui_rework_4_0 2018-12-10 11:43:24 +01:00
Aleksei S
84c85439ff The trigger_early_crash did not trigger early crash for testing purposes 
CURA-5939
 2018-12-06 12:00:26 +01:00
Diego Prado Gesto
dad2031e4b Switch to the preview stage before to switch to simulation view 
... since now the list of views are in a different stage.

Contributes to CURA-5979.
 2018-11-27 16:06:37 +01:00
Ghostkeeper
266e08fdff
Merge branch 'master' into ui_rework_4_0 
Conflicts:
	plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml - The compatibility chart being added in 3.6 which was kind of hacky.
	resources/qml/SidebarHeader.qml - Removed in UI rework, edited on master.
 2018-11-13 16:23:36 +01:00
fieldOfView
e66875865f Make Cura app name configurable in CuraVersion 2018-11-13 16:08:29 +01:00
Remco Burema
5f4e3948d3 Merge branch 'master' into CURA-5840-make-plugin-sdk-use-semantic-versioning 2018-11-13 13:16:22 +01:00
Lipu Fei
75f2f40534 Make API version configuration for Application 
CURA-5840
 2018-11-08 12:04:43 +01:00
Diego Prado Gesto
2c59419dbb Merge branch 'cura4.0_header' into CURA-5829-Add-preview-stage 2018-11-06 17:01:18 +01:00
Diego Prado Gesto
2d59ca02ca Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-06 16:59:07 +01:00
Lipu Fei
ce517f1517 Merge from 3.6 2018-11-06 11:26:09 +01:00
Diego Prado Gesto
18c9e9f05a Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-06 09:23:15 +01:00
Jaime van Kessel
412e5977a6 Fix type issues 2018-11-05 11:30:02 +01:00
Lipu Fei
ff4dfcf9a6 Make Cura app display name configurable 
CURA-5842
 2018-11-01 12:15:00 +01:00
Diego Prado Gesto
a85fa6b9ad Merge branch 'cura4.0_header' into CURA-5829-Add-preview-stage 2018-11-01 09:24:05 +01:00
Diego Prado Gesto
ef0ba81564 Merge branch 'ui_rework_4_0' into cura4.0_header 2018-11-01 09:21:33 +01:00
Lipu Fei
cb24549d7d Set CuraApplication display name 
CURA-5842
 2018-11-01 08:29:54 +01:00
Jaime van Kessel
6083eda3fa Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into CURA-5829-Add-preview-stage 2018-10-31 13:45:03 +01:00
Ghostkeeper
779496f846
Don't require MirrorTool, RotateTool, ScaleTool or SimulationView 
This was changed last April without consulting the rest of the team. We're reverting it because there is really no reason why these should not be disabled.
 2018-10-31 10:37:25 +01:00
Ghostkeeper
8a52fd2c2c
Document why these plug-ins are required 
For the SimulationView, MirrorTool, RotateTool, ScaleTool and TranslateTool I couldn't really find a reason why this is required, so I can't document it.
 2018-10-31 10:34:26 +01:00
Jaime van Kessel
3248a05819 Add PreviewStagePlugin stubs 
Since we are going to move all the views into a seperate stage, we need to add another stage to do that.

CURA-5829
 2018-10-29 11:28:08 +01:00
fieldOfView
0c1b3931db Revert "WIP: Add custom CameraView for UM camera feed" 
This reverts commit b00ea4719a268ec4b000375343bbc4082783b435.
 2018-10-29 11:18:55 +01:00
fieldOfView
484b1e5ec6 Remove CameraImageProvider and NetworkCamera 2018-10-29 11:18:53 +01:00
fieldOfView
890ddc015e Add Cura.NetworkMJPGImage widget 2018-10-29 11:17:41 +01:00
Diego Prado Gesto
5de367bcc4 Merge branch 'ui_rework_4_0' into cura4.0_header 
Conflicts:
plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml
resources/qml/Menus/ViewMenu.qml
resources/themes/cura-dark/theme.json
resources/themes/cura-light/theme.json
 2018-10-29 11:10:25 +01:00
Lipu Fei
b00ea4719a WIP: Add custom CameraView for UM camera feed 
CURA-5821
 2018-10-24 15:44:19 +02:00
Lipu Fei
cbd8c8739d Merge from master 2018-10-23 08:08:37 +02:00
Lipu Fei
afa3e62dc1
Merge pull request #4615 from Ultimaker/CURA-5814_Material_cost_now_always_shown 
CURA-5814 material cost now always shown
 2018-10-19 11:20:29 +02:00
Lipu Fei
9b94db8957 Directly use empty containers in MachineManager 
CURA-5812

Instead of looking up for the empty containers via ContainerRegistry,
import and use them directly.
 2018-10-19 09:57:57 +02:00
Lipu Fei
e5efd1e41f Move constant definition into constructor 
CURA-5812
 2018-10-19 09:57:57 +02:00
Diego Prado Gesto
54f32a1d82 Merge branch 'ui_rework_4_0' into cura4.0_header 2018-10-18 19:33:39 +02:00
Diego Prado Gesto
b670cd82c4 Merge branch 'master' into cura4.0_header 2018-10-17 16:10:45 +02:00
Jaime van Kessel
3ad113f70f Added some missing typing. 
Since i was changing some stuff here, i better leave it more typed as I found it.

CURA-5814
 2018-10-17 14:14:12 +02:00
Jaime van Kessel
45da5b9130 Added more specific overrides for get/set globalContainerStack 
This helps a lot with the type hinting in other bits of the code, since for CuraApplicaiton we know it's always going to be a GlobalStack

CURA-5814
 2018-10-17 14:07:12 +02:00
Jaime van Kessel
4c5bf3297c Merge branch 'master' of github.com:Ultimaker/Cura into CURA-5734-rework-and-unit-test-setting-visibility-preset 2018-10-17 10:49:29 +02:00
Diego Prado Gesto
193f113851 Clean up Cura.qml: 
- Create a Skeleton folder where the main parts of the application will
be stored.
- Separate the top menus to a different file.

Contributes to CURA-5784.
 2018-10-08 10:33:01 +02:00
Lipu Fei
18cb21186c Merge remote-tracking branch 'origin/master' into WIP_kill_extruder_manager 2018-10-03 15:45:18 +02:00
Jaime van Kessel
f3fdb46dba Add missing types 2018-10-03 13:33:30 +02:00
Jaime van Kessel
dabe747ec0 Merge branch 'CURA-5744-move-oauth-login' of github.com:Ultimaker/Cura 2018-10-03 13:25:09 +02:00
Jaime van Kessel
edb5de9954 Added unit test for settingvisibility presets 
CURA-5734
 2018-10-01 14:50:53 +02:00
Jaime van Kessel
fc9f05fc8b Moved SettingVisibilityPreset loading to it's own class 
Since there was so much debate regarding the unit testing of the visiblity presets, i had another look at it.
The old version was almost untestable because all functionalities were mushed together into a single class.

CURA-5734
 2018-10-01 11:32:55 +02:00