GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-24 06:39:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,762 Commits 286 Branches 260 Tags
Commit Graph

1038 Commits

Author SHA1 Message Date
Jaime van Kessel
efeba48ffb Move initializeSettingDefinitions and setting functions to their own function 
This means we don't have to instantiate CuraApplication in the tests anymore
 2019-02-18 09:45:30 +01:00
Jaime van Kessel
c0d75b38b7 Added test to check if a key in the profile is defined in the definition 2019-02-15 14:06:46 +01:00
Ghostkeeper
5b9fb20b9a
Remove unused imports 2019-02-12 11:48:23 +01:00
fieldOfView
056655e584 Merge branch 'master' into feature_curaversion_appname 
# Conflicts:
#	cura/CuraApplication.py
 2019-01-18 12:12:36 +01:00
Jaime van Kessel
15563a756f Merge branch '4.0' of github.com:Ultimaker/Cura 2019-01-17 13:42:58 +01:00
Jaime van Kessel
a41cc9efbe Merge branch 'CURA-6113_fix_master_version_upgrade' of github.com:Ultimaker/Cura 2019-01-17 13:12:41 +01:00
Lipu Fei
3b3baeac03 Remove hard-coded account URLs in QMLs 
CURA-6117
 2019-01-17 11:20:21 +01:00
Jaime van Kessel
24fbb1007d Merge branch '4.0' of github.com:Ultimaker/Cura 2019-01-16 17:39:43 +01:00
Lipu Fei
b2dace2d48 Fix version upgrade 
CURA-6113
 2019-01-14 11:25:02 +01:00
Diego Prado Gesto
c6da824203 Merge branch '4.0' 2019-01-14 08:56:33 +01:00
ChrisTerBeke
56f0a341bc Fix merge conflicts 2019-01-10 15:17:53 +01:00
Remco Burema
980953b00c
Merge pull request #4960 from Ultimaker/CURA-6005_cura_drive_plugin 
[4.0] CURA-6005 Added CuraDrive plugin to Cura build
 2019-01-10 14:58:00 +01:00
ChrisTerBeke
764769f4bb Merge branch '4.0' into STAR-322_cloud-connection 2019-01-10 09:48:48 +01:00
Remco Burema
8f5309c5a5
Merge pull request #5128 from Ultimaker/4.0-Add_version_upgrade 
Add version upgrade for 4.0
 2019-01-09 17:42:17 +01:00
ChrisTerBeke
a6114d39e4 Fix merge conflicts with 4.0 2019-01-08 11:49:36 +01:00
Lipu Fei
059fede06e Mkae default custom settings panel height smaller 
CURA-6054
 2019-01-07 10:53:21 +01:00
Jaime van Kessel
d21bf53230 Add version upgrade for 4.0 
Contributes to CURA-6011 and CURA-5995
 2019-01-07 10:34:22 +01:00
Lipu Fei
f7fb04d4ae Fix merge conflicts with 4.0 2019-01-03 15:25:40 +01:00
Lipu Fei
08dc035f6e Merge remote-tracking branch 'origin/4.0' 2019-01-03 08:30:27 +01:00
Ghostkeeper
96a6b7559e
Remember opened state of settings panel 
So if you restart Cura while the settings panel was open, it'll stay open when Cura is started back up.

Contributes to issue CURA-6069.
 2019-01-02 14:05:17 +01:00
Jaime van Kessel
e02fcd664c Merge branch '4.0' of github.com:Ultimaker/Cura 2018-12-31 14:34:53 +01:00
Jaime van Kessel
4be228a4e2 Fix merging & grouping 
I made a boo-boo while adding typing.
CURA-6058
 2018-12-31 13:43:47 +01:00
Jaime van Kessel
fd9b29fee2 Rename printersModel to GlobalStacksModel 
This is a better description for the model anyway.

CURA-6011
 2018-12-31 11:09:39 +01:00
Jaime van Kessel
37af42aa93 Merge branch '4.0' of github.com:Ultimaker/Cura 2018-12-31 10:28:53 +01:00
Ghostkeeper
139ab2e0bb
Increment setting_version to 6 
Because Cura 4.1 is going to have a version upgrade to change the stack files.

Contributes to issue CURA-5848.
 2018-12-27 16:39:05 +01:00
Ghostkeeper
c6f4cb4927
Make the settings panel resizable 
You can now drag the bottom side of the panel to make it bigger or smaller.

Contributes to issue CURA-6054.
 2018-12-24 15:31:47 +01:00
Jaime van Kessel
4ab79f963a Remove deprecated functions 2018-12-21 15:10:14 +01:00
Jaime van Kessel
33c97fcf4a Updated typing 2018-12-21 15:09:09 +01:00
Ghostkeeper
e51b5993d3
Don't create system tray icon in headless mode 2018-12-20 21:56:27 +01:00
Diego Prado Gesto
da69c16e09 Split the constants in to files, indicating which constants each file 
stores.

Contributes to CURA-6005.
 2018-12-18 16:14:13 +01:00
ChrisTerBeke
25caf1a087 Fix merge conflicts 2018-12-18 14:44:13 +01:00
Lipu Fei
71e71e0a4f
Merge pull request #4975 from Ultimaker/CURA-6011_connection_types 
[4.0] Every output device should define its connection type
 2018-12-18 13:23:02 +01:00
Diego Prado Gesto
3c99b69724 Merge branch '4.0' into CURA-6005_cura_drive_plugin 
Remove unused file.

Contributes to CURA-6005.
 2018-12-18 07:17:37 +01:00
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