3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 02:37:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
16749 commits 302 branches 270 tags 773 MiB
Commit graph

16749 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ian Paschal
e89bd91960 CURA-5280 Preserve manually entered project name 
Heeeehhhhh? Why didn't this line get staged with the file?
 2018-05-23 16:31:22 +02:00
Ian Paschal
d14f4ac678 CURA-5280 Preserve manually entered project name 
Manual override of job name should also set the base name so that when the printer prefix is updated, it the prefix can be added to the manually added name, not the old base name.

This was a bit tricky because if you enter a job name, is that the job name or the base name? My answer is that it's both, and if you update your printer for the job, it will append a new prefix.

If this is not the desired behavior, and in fact once a custom name is set nothing can change it, then line 78 should be removed.
 2018-05-23 16:28:35 +02:00
Jack Ha
827cb33b6e CURA-5370 Update copyright and comments 2018-05-23 16:04:18 +02:00
Lipu Fei
de455a9a64 Use gcode.gz as extension for GzWriter 
CURA-5343

We have the custom save file dialog on OS X now so there is no need to
use .gz to bypass the extension problem on the native dialog.
 2018-05-23 15:48:30 +02:00
Jack Ha
a3ac20172b CURA-5370 The minimum offset between objects in the Arranger is now determined by the brim/skirt/... setting 2018-05-23 12:54:18 +02:00
Diego Prado Gesto
39768e29cc CURA-5164 First add the resources and then initialize the package 
manager.
 2018-05-23 12:12:58 +02:00
Diego Prado Gesto
b7fe43e68c Merge branch 'master' into WIP_improve_initialization 2018-05-23 11:36:12 +02:00
Lipu Fei
44b046e401
Merge pull request #3786 from Ultimaker/feature-backup-manager 
Backup Manager and API
 2018-05-23 11:28:43 +02:00
Ian Paschal
775ec91762
Merge pull request #3848 from fieldOfView/feature_select_after_loading 
Select models after loading
 2018-05-23 11:26:07 +02:00
Lipu Fei
cfd1b7b813 Fix AutoSave conflicts with BackupManager 
- Move AutoSave out of the plugins. It's a built-in module now.
 - Add enable/disable saving data on CuraApplication.
 - Avoid saving data in backup restore
 2018-05-23 11:25:47 +02:00
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