3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-05 16:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
15890 commits 344 branches 300 tags 764 MiB
Commit graph

4240 commits

Author SHA1 Message Date
fieldOfView
f67261488f Select models after loading 
Fixes #356
 2018-05-22 22:24:57 +02:00
ChrisTerBeke
2c896010c7
Merge branch 'feature-backup-manager' of https://github.com/Ultimaker/Cura into feature-backup-manager 
* 'feature-backup-manager' of https://github.com/Ultimaker/Cura:
  Save settings before moving config file on Linux
 2018-05-22 19:03:14 +02:00
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
ChrisTerBeke
2bbcb2dd7d Save settings before moving config file on Linux 2018-05-22 17:45:30 +02:00
Aleksei S
403129e2d6 Merge branch 'master' of github.com:Ultimaker/cura 2018-05-22 17:33:41 +02:00
Aleksei S
36c2e80121 Adds release notes link in version upgrade messagebox 
CURA-5348
 2018-05-22 17:32:38 +02:00
Jack Ha
f5bed242ed CURA-5370 Small refactor for Arranger: make x and y consistent (numpy arrays start with y first in general), faster, cleanup, more unit tests, take actual build plate size in Arranger instances 2018-05-22 17:13:35 +02:00
ChrisTerBeke
dd581b59e4 Merge branch 'master' into feature-backup-manager 2018-05-22 17:05:40 +02:00
Lipu Fei
eecbe20830 Enabled drag-n-drop for curapackages 2018-05-22 15:06:27 +02:00
ChrisTerBeke
c2ff2a3832 Merge branch 'master' into feature-backup-manager 2018-05-22 14:52:12 +02:00
Lipu Fei
fea37b52be Fix CURA_PACKAGES_VERSION 2018-05-22 12:07:44 +02:00
Lipu Fei
9f21c2bd86 Add CuraPackageVersion 2018-05-22 10:15:20 +02:00
ChrisTerBeke
5b5a8f77b7 Rename Api to API 2018-05-18 17:29:01 +02:00
ChrisTerBeke
2fab1aef33 Rename Api to API 2018-05-18 17:28:54 +02:00
ChrisTerBeke
15ef3d1d10 Merge branch 'master' into feature-backup-manager 2018-05-18 17:27:05 +02:00
Aleksei S
36dbc70813 Remove unnecessary code for taking snapshot for UFP file 
CURA-5373
 2018-05-18 14:01:31 +02:00
Aleksei S
1f149b2821 Do not show not printed models on snapshot for UFP files 
CURA-5373
 2018-05-18 10:50:54 +02:00
ChrisTerBeke
a20de3581a Add info message when failed because of version mismatch 2018-05-18 10:08:00 +02:00
ChrisTerBeke
a0d3dae920 Do not allow restore different version 2018-05-18 10:07:20 +02:00
ChrisTerBeke
7b3f334678 Fix ignored files for Windows 2018-05-17 15:07:28 +02:00
Diego Prado Gesto
8eea60bada CURA-5358 Fix typos 2018-05-17 14:28:10 +02:00
Diego Prado Gesto
aa07de45ed Start fixing restore on Windows 2018-05-17 12:13:01 +02:00
ChrisTerBeke
9410f93dbf Remove unused import 2018-05-17 10:16:13 +02:00
ChrisTerBeke
8b0346e11b For now just ignore locked files on windows 2018-05-17 10:15:11 +02:00
ChrisTerBeke
f00459e4cc revert 2018-05-17 09:32:18 +02:00
ChrisTerBeke
fb40ea13cc Try onerror 2018-05-17 09:25:03 +02:00
ChrisTerBeke
eb436a8b0e Ignore permission error on Windows when trying to remove log file 2018-05-17 09:13:55 +02:00
ChrisTerBeke
21889130b4
Code cleanup 2018-05-16 19:25:19 +02:00
ChrisTerBeke
82207e2f6a
Merge branch 'master' into feature-backup-manager 
* master:
  Do not load material when no GUID is present instead of crashing Cura
 2018-05-16 19:19:18 +02:00
ChrisTerBeke
c13b77d8a1
Do not load material when no GUID is present instead of crashing Cura 2018-05-16 19:18:09 +02:00
ChrisTerBeke
da94a5afb1 Merge branch 'master' into feature-backup-manager 2018-05-16 17:55:56 +02:00
Diego Prado Gesto
1bec6d7aa5 CURA-5164 Fix types 2018-05-16 17:26:56 +02:00
Diego Prado Gesto
e38b31c0eb Merge branch 'master' into WIP_improve_initialization 2018-05-16 16:57:51 +02:00
Ian Paschal
1d8a405e86 CURA-5357 Search for license files 
The old code had the problem that by definition it skipped the `files/` folder and any other dir which of course is where the licenses are.

Now, so long as the license is always just called `LICENSE` (which is the convention in open source software), it can be located anywhere.
 2018-05-16 15:16:16 +02:00
ChrisTerBeke
c866009df2 Merge branch 'master' into feature-backup-manager 2018-05-16 13:16:37 +02:00
Diego Prado Gesto
67ce55049b CURA-5164 Fix a bug when open the discard or keep dialog. It was using 
a non-existing variable.
 2018-05-16 10:26:13 +02:00
Ghostkeeper
eab150d7ee
Only look for user package management path in storage dirs 
If we happen to find it in the installation (or some other place we can't write to) then it's going to crash. So don't do that.

Contributes to issue CURA-5364.
 2018-05-16 09:29:03 +02:00
ChrisTerBeke
d27ac3cf31 Merge branch 'master' into feature-backup-manager 2018-05-15 16:50:25 +02:00
Diego Prado Gesto
ed6b63b41b Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-15 16:47:42 +02:00
Diego Prado Gesto
bc965bacfc CURA-5358 Not use the prefix for installing packages and so no need to 
rename directories for the packaged files
 2018-05-15 16:46:07 +02:00
Jack Ha
9281c23555 Fix uninstallable user package which was also bundled; make update package somewhat better by not trying to uninstall builtin package 2018-05-15 16:23:54 +02:00
Diego Prado Gesto
5345bc2867 CURA-5358 Fill the dictionaries also if it's a custom material. But 
making difference between those materials that depend on a built-in
material and those that don't depend on others.
 2018-05-15 16:08:19 +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
Aleksei S
50dabdbac8 Merge branch 'bugfix-toolbox-update' 2018-05-15 11:51:45 +02:00
Jack Ha
ed1ba41aa6 Undo setting wrong name in PrintInformation. CURA-5323 2018-05-15 11:42:17 +02:00
Ghostkeeper
0aa1aaf11b
Fix loading packages.json when file doesn't exist yet 
Contributes to issue CURA-5364.
 2018-05-15 11:23:26 +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
95c9062913 Merge branch 'master' into feature-backup-manager 2018-05-15 11:05:07 +02:00
Jack Ha
49c4f66d95 Ugly fix for uninstalling installed packages, but not uninstalling bundled packages. 2018-05-15 10:50:33 +02:00