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

849 Commits

Author SHA1 Message Date
ChrisTerBeke
a91916cc1d
Merge branch 'master' into feature-backup-manager 
* master:
  Adds release notes link in version upgrade messagebox CURA-5348
  CURA-5385 Project summary should use scroll view
  CURA-5296 Small QML bug fix
  Enabled drag-n-drop for curapackages
  CURA-5296 Added "canDowngrade" functionality
  Fix CURA_PACKAGES_VERSION
  CURA-5254 Keep track of the latest manual entry key, so it is then selected in the list.
  CURA-5296 Improve button styling
  Add CURA_PACKAGES_VERSION to CMakeLists.txt
  Add CuraPackageVersion
  Remove extra "if" statement and unused code
  Fix support blocker on older (legacy) opengl
  Correct the test to hide bed temperature when no heated bed is present.
 2018-05-22 19:03:09 +02:00
Aleksei S
36c2e80121 Adds release notes link in version upgrade messagebox 
CURA-5348
 2018-05-22 17:32:38 +02:00
ChrisTerBeke
d27ac3cf31 Merge branch 'master' into feature-backup-manager 2018-05-15 16:50:25 +02:00
Diego Prado Gesto
70ca053832 CURA-5358 Add the quality folder to the scope of the VersionUpgrade 2018-05-15 15:32:02 +02:00
ChrisTerBeke
82a1c95d98 Merge branch 'master' into feature-backup-manager 2018-05-15 12:56:19 +02:00
Ghostkeeper
0a9f389396
Search for bundled packages file in all search paths 
For this we need to rename bundled_packages to disambiguate between that and the other packages.json file for user-installed packages.

Contributes to issue CURA-5364.
 2018-05-15 11:14:17 +02:00
ChrisTerBeke
e14f57892a Merge branch 'master' into feature-backup-manager 2018-05-14 17:16:36 +02:00
Aleksei S
8718ee34c9 Merge branch 'master' of github.com:Ultimaker/cura 2018-05-14 15:04:54 +02:00
Aleksei S
d946733357 Project update after undo click 
CURA-5323
 2018-05-14 15:04:01 +02:00
Ian Paschal
dd14a8e685 CURA-5296 Better finding for packages.json 2018-05-14 14:44:40 +02:00
Ghostkeeper
757824ae93
Move deleteAll to Uranium 
Because it's used by WorkspaceFileHandler.

Contributes to issue CURA-5330.
 2018-05-14 13:52:31 +02:00
ChrisTerBeke
a7342f4619 Do not safe data after restoring backup 2018-05-11 17:13:40 +02:00
Jack Ha
6b44ec8e4a CURA-5296 undo add version upgrade to required plugins 2018-05-09 14:24:10 +02:00
Jack Ha
cf61059449 CURA-5296 added version upgrades to required plugins 2018-05-09 14:19:30 +02:00
Diego Prado Gesto
a1e6792664 Set the LocalContainerProvider as a required plugin. 2018-05-03 18:03:30 +02:00
Ian Paschal
87e1f98156
Merge pull request #3663 from Ultimaker/feature_material_marketplace 
Feature material toolbox; all changes made
 2018-05-02 12:23:13 +02:00
Diego Prado Gesto
e79324c448 Remove duplicate line 2018-05-01 15:53:16 +02:00
Lipu Fei
9a5fb47a6e Merge master into material marketplace 2018-05-01 11:56:34 +02:00
Diego Prado Gesto
d91dabb087 Merge branch 'master' of github.com:Ultimaker/Cura 2018-04-30 15:16:23 +02:00
Diego Prado Gesto
b582ac7526 CURA-5253 Initialize UI elements right after the qml files were loaded. 2018-04-30 15:09:52 +02:00
Lipu Fei
00dbf2c694 Change a logging line to an error 
CURA-5301
 2018-04-30 10:23:43 +02:00
Diego Prado Gesto
27b1e2cdd6 Fix format and add error message to log. Contributes to CURA-5301 2018-04-26 15:49:18 +02:00
Ian Paschal
679f87ebb3 CURA-5035 Don't show required plugins 
Also renamed folder of UserAgreementPlugin to UserAgreement
 2018-04-26 15:11:32 +02:00
Diego Prado Gesto
4e53f219f0 Merge branch 'master' into CURA-5204_send_anonymous_data 2018-04-20 10:35:52 +02:00
Lipu Fei
db5c18295b Merge remote-tracking branch 'origin/3.3' 2018-04-19 09:20:22 +02:00
Diego Prado Gesto
ee359571c0 CURA-5246 Start the timer for updating the platform activity also when 
the node that changed is a GCode, that has layer data.
 2018-04-18 16:53:33 +02:00
Lipu Fei
35e7be1d41 Use pyqtSlot to show more info dialog 
CURA-5204
 2018-04-17 16:43:41 +02:00
Lipu Fei
7b20ce856e Fix merge conflicts 2018-04-17 11:30:23 +02:00
Mark
f61efb8e20 resolve merge conflict 2018-04-17 10:39:35 +02:00
Lipu Fei
58e18ded18 Remove unneeded code 
CURA-5202
 2018-04-16 15:24:18 +02:00
Ghostkeeper
133f6f43fe
Merge branch '3.3' 2018-04-13 16:14:23 +02:00
Diego Prado Gesto
f23491377f CURA-5197 Add Cura booting time to the logs. 2018-04-12 16:52:09 +02:00
Lipu Fei
0f966115e6 WIP: Make CuraPackageManager aggregate PluginRegistry data 
CURA-4644
 2018-04-12 15:46:53 +02:00
Lipu Fei
596e0be7b6 CuraPackageManager handles packages and plugins 
CURA-4644
 2018-04-12 12:57:58 +02:00
Ian Paschal
94b15b0498 Merge branch 'CURA-4644-package-reader' into feature_material_marketplace 2018-04-11 11:08:18 +02:00
Lipu Fei
40eedbcf70 Add more info dialog 
CURA-5204
 2018-04-10 15:33:32 +02:00
Lipu Fei
56e80bb518 Merge branch '3.3' 2018-04-10 13:25:45 +02:00
Lipu Fei
4e625da168 Increase delay time for open file with double-clicking 
CURA-5203
 2018-04-10 13:23:23 +02:00
Lipu Fei
107c10b860 Merge branch '3.3' 2018-04-10 11:41:13 +02:00
Lipu Fei
95f4515e93 Make it possible to skip project file check in readLocalFile() 
CURA-5203
 2018-04-10 11:40:47 +02:00
Aleksei S
c7b6bb8188 Merge branch '3.3' 2018-04-09 12:53:53 +02:00
Lipu Fei
cadb2c62b7 Fix open file with Cura 
CURA-5203

When open a file that's associated with Cura, dialogs that need to
pop up may not work because QML is still in the middle of initialization,
so we need to wait for QML to finish before doing anything else such
as opening files.
 2018-04-06 11:55:07 +02:00
Diego Prado Gesto
8c0d58c227 CURA-5197 Add Cura booting time to the logs. 2018-04-05 15:28:44 +02:00
Lipu Fei
e36ef583b7 Minor changes and cleanup 2018-04-05 15:14:15 +02:00
Lipu Fei
6ae9694998 Add CuraPackageManager 2018-04-05 15:14:15 +02:00
Lipu Fei
19bc2b78f4 Add Version upgrade 3.3 to 3.4 
Need to distinguish between quality and quality_changes in the cura directory,
so we need to move all custom quality profiles into the quality_changes directory.
 2018-04-05 15:14:15 +02:00
Diego Prado Gesto
322fe7d61f CURA-5137 Rename Plugin Browser into Toolbox 2018-03-30 14:15:00 +02:00
Ghostkeeper
d244a37feb
Merge branch '3.3' 2018-03-29 16:57:55 +02:00
Jack Ha
2a3b25265b
CURA-5174 update camera zoom range 2018-03-29 16:57:36 +02:00
Diego Prado Gesto
a5e38bb486 CURA-5175 Add variants to the version upgrade. 
Upgrade the version number in the variants and add the hardware_type
metadata.
 2018-03-29 16:54:30 +02:00