3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 14:44:13 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
14738 commits 306 branches 272 tags 787 MiB
Commit graph

14738 commits

This branch
This branch
All branches
Author SHA1 Message Date
ChrisTerBeke
41aa31cb2d Merge branch 'master' into feature-backup-manager 2018-05-23 11:07:02 +02:00
Jack Ha
7136b8649a CURA-5388 disable automatic_push_free / Ensure models are kept apart by default 2018-05-23 10:48:19 +02:00
fieldOfView
6b0045265c Move getting preference out of for loop 2018-05-23 10:07:17 +02:00
fieldOfView
fb8f735566 Make selecting objects on load optional and opt-in 2018-05-23 10:05:08 +02:00
Lipu Fei
92fa725ad6 Application.saveSettings() should save everything 2018-05-23 10:00:21 +02:00
Diego Prado Gesto
ba234f5c8a Remove debug prints 2018-05-23 09:38:16 +02:00
Diego Prado Gesto
b8417bcccb If the label tag exists in the xml material file, but without any string 
in it, the label.text return None and then it makes Cura crashing when
creating the models.
This is intended to fix the issue #3750
 2018-05-23 09:34:21 +02:00
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
Ian Paschal
0a395a7305 CURA-5385 Project summary should use scroll view 2018-05-22 16:29:04 +02:00
Ian Paschal
7861840886 CURA-5296 Small QML bug fix 2018-05-22 16:04:38 +02:00
Ian Paschal
d4c5be0455
Merge pull request #3845 from Ultimaker/CURA-5357_drag_n_drop_curapackage_hack_no2 
CURA-5357 Drag-n-drop for curapackages
 2018-05-22 15:20:10 +02:00
Lipu Fei
eecbe20830 Enabled drag-n-drop for curapackages 2018-05-22 15:06:27 +02:00
Ian Paschal
0b0fb4cd2f CURA-5296 Added "canDowngrade" functionality 
Shows "Downgrade" instead of "Uninstall" for bundled packages with an upgrade installed.
 2018-05-22 14:52:22 +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
Diego Prado Gesto
1262d47b15 Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-22 12:06:11 +02:00
Diego Prado Gesto
eea9b7ab46 CURA-5254 Keep track of the latest manual entry key, so it is then 
selected in the list.
 2018-05-22 12:05:33 +02:00
Ian Paschal
95a4edb8de CURA-5296 Improve button styling 2018-05-22 11:34:41 +02:00
Lipu Fei
ea421204f3 Add CURA_PACKAGES_VERSION to CMakeLists.txt 2018-05-22 11:02:12 +02:00
Lipu Fei
9f21c2bd86 Add CuraPackageVersion 2018-05-22 10:15:20 +02:00
ChrisTerBeke
efe41a536d Merge branch 'master' into feature-backup-manager 2018-05-22 09:11:31 +02:00
Mark
74a7452333
Merge pull request #3811 from ngraziano/monitor-no-heating-bed 
Correct the test to hide bed temperature when no heated bed is present.
 2018-05-19 08:24:47 +02:00
Mark
cbf34d64e1
Merge pull request #3813 from fieldOfView/fix_depth_picking_legacy_gl 
Fix support blocker on older (legacy) opengl
 2018-05-19 08:20:56 +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
fc01811792 Merge branch 'master' of github.com:Ultimaker/cura 2018-05-18 17:22:54 +02:00
Aleksei S
314f913510 Remove extra "if" statement and unused code 2018-05-18 17:21:59 +02:00
ChrisTerBeke
e7f70d68c7 Focus on IP address field when adding networked printer 2018-05-18 17:19:14 +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
ac0bb2a06b Merge branch 'master' of github.com:Ultimaker/cura 2018-05-18 10:53:13 +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
Mark
850f6f9b15 Change name to Community materials 2018-05-17 16:46:32 +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