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

6332 commits

Author SHA1 Message Date
Lipu Fei
b59eadce1c Fix AutoSave crashing the early crash dialog 
CURA-4895
 2018-02-05 11:28:16 +01:00
Lipu Fei
547baff239 Always show crash dialog 
CURA-4895
 2018-02-05 11:27:40 +01:00
Lipu Fei
c2aa5fc2a2 Only initialise AutoSave after Application finishes its start up 
CURA-4895
 2018-02-05 11:27:38 +01:00
Lipu Fei
30b1e74881 Fixes for early crash dialog 
CURA-4895
 2018-02-05 11:26:38 +01:00
Lipu Fei
aefe24222f Add a CLI flag to test early crash 
CURA-4895
 2018-02-05 11:26:38 +01:00
Lipu Fei
6bbc18d51e Make an extra early crash dialog 
CURA-4895

An early crash dialog showing options to backup the current user data
and reset the configuration files.
 2018-02-05 11:26:37 +01:00
Lipu Fei
1d946085d3 Make crash dialog available before Application starts 
CURA-4895
 2018-02-05 11:26:34 +01:00
Ian Paschal
f627c97a92
Merge pull request #3218 from Ultimaker/CURA-3710_setting_visibility_preset 
CURA-3710 Add preset setting visibility files
 2018-02-05 09:51:52 +01:00
Lipu Fei
a3ed385259 Use global_stack.definition.getId() to determine machine type 
CURA-4891
 2018-02-02 14:47:14 +01:00
Ian Paschal
a786987d8d Fix for CURA-4891 
Use `active_machine_id` (such as "Ultimaker 3") instead of `global_stack_name` (such as "My Custom Printer Name")
 2018-02-02 14:02:06 +01:00
Diego Prado Gesto
2024d6aa12 Merge branch 'master' into feature_ufp_writer 2018-02-02 11:57:53 +01:00
Jack Ha
7856d61b5a CURA-4425 scale image to full size; still has a bug that it is shifted vertically; still need to clean code 2018-02-01 17:31:43 +01:00
Diego Prado Gesto
c432646908 CURA-4425 Avoid adding the center bounding box. Revert some previous changes. 2018-02-01 16:37:16 +01:00
Diego Prado Gesto
433176d25a CURA-4425 Cleanup and small refactor 2018-02-01 16:18:21 +01:00
Diego Prado Gesto
2770ff5848 CURA-4425 Remove debug printout 2018-02-01 15:45:17 +01:00
Diego Prado Gesto
056ae4fe68 CURA-4425 Small refactor to avoid using repeated code 2018-02-01 15:22:45 +01:00
Lipu Fei
367e50669d Refactor code 
CURA-3710
 2018-02-01 13:56:49 +01:00
Lipu Fei
25713a6e64 Merge remote-tracking branch 'origin/3.2' 2018-02-01 11:23:20 +01:00
Lipu Fei
0e5c67a38f Merge remote-tracking branch 'origin/master' into CURA-3710_setting_visibility_preset 2018-02-01 11:00:13 +01:00
Jack Ha
b4eb2e173c CURA-4425 fix multiple objects in snapshot; the AxisAlignedBox is supposed to be read-only 2018-02-01 10:49:02 +01:00
Diego Prado Gesto
701ac7f91e Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-02-01 09:05:32 +01:00
Jack Ha
c42f186812 CURA-4425 first thumbnail in UFP file; updated CuraSceneModel and PreviewPass 2018-01-31 17:08:32 +01:00
alekseisasin
e5c72cfdc5 Validate material profile 
CURA-4851
 2018-01-31 14:58:44 +01:00
Lipu Fei
3927c70625 Fix material_diameter handling in ExtruderStacks 
CURA-4898
 2018-01-31 13:32:45 +01:00
Diego Prado Gesto
81488e0bbc Merge branch '3.2' 2018-01-31 09:13:29 +01:00
Diego Prado Gesto
4cf07f5fe6 CURA-4868 Fix typo 2018-01-30 17:23:55 +01:00
Aleksei S
f065a08c82 Added visible settings 
CURA-3710
 2018-01-30 15:26:15 +01:00
Lipu Fei
759e596eb6 Fix add extruder function 
CURA-4868
 2018-01-30 12:19:16 +01:00
Lipu Fei
f1363fab73 Move newline format 
CURA-4863
 2018-01-29 16:33:52 +01:00
Lipu Fei
924f3972fd Create quality_changes for extruder stack if missing in profile importing 
CURA-4868
 2018-01-29 14:50:08 +01:00
Lipu Fei
34e6816f83 Fix container ID modification in profile importing 
CURA-4868
 2018-01-29 14:50:07 +01:00
Lipu Fei
507b967946 Minor fixes 
CURA-4868
 2018-01-29 14:50:07 +01:00
Lipu Fei
7dfc1a4aa7 Add encoding='utf-8' for text file reading 
CURA-4875

When encoding is not provided, the behaviour is system dependent and it
can break on OS X.
 2018-01-29 12:29:20 +01:00
Ghostkeeper
650ca4e5e8
Merge branch '3.2' 2018-01-29 10:25:29 +01:00
fieldOfView
ed9943c732 Merge branch 'master' into feature_preheat_extruder 
# Conflicts:
#	plugins/USBPrinting/USBPrinterOutputController.py
#	plugins/USBPrinting/USBPrinterOutputDevice.py
 2018-01-27 16:35:55 +01:00
ChrisTerBeke
bd46515382
Make custom commands functional, fix UI layout, typos 2018-01-26 22:10:44 +01:00
ChrisTerBeke
4d19428f42
Merge branch 'master' into feature_custom_gcode_commands 
* master:
  CURA-4839 Avoid creating unique names for the extruder instance containers if the strategy is upgrade existing
 2018-01-26 21:07:05 +01:00
Lipu Fei
4a9fc4b7d4 Set imported containers to bedirty so they will get saved 
CURA-4875
 2018-01-26 14:17:18 +01:00
ChrisTerBeke
01b8bd60bd
Add type hinting 2018-01-25 22:47:02 +01:00
ChrisTerBeke
80b589344f
Add custom command methods to output device and controller 2018-01-25 22:40:30 +01:00
Diego Prado Gesto
38f1ad5db9 Merge branch '3.2' 2018-01-25 17:10:17 +01:00
Diego Prado Gesto
e38cf957bb CURA-4839 Avoid creating unique names for the extruder instance 
containers if the strategy is upgrade existing
 2018-01-24 16:04:11 +01:00
Jack Ha
994969634e Merge branch '3.2' 2018-01-23 16:17:50 +01:00
Jack Ha
def86defe6 CURA-4848 Global stack now does its infinite resolve prevention on per thread basis 2018-01-23 16:17:38 +01:00
Jack Ha
cde3799702 CURA-4848 removing the debugging list because it's not a threading issue 2018-01-23 14:46:44 +01:00
Jack Ha
b0d0b75662 Merge branch '3.2' 2018-01-23 14:25:11 +01:00
Jack Ha
e3bffb0b1d Merge branch '3.2' of github.com:Ultimaker/Cura into 3.2 2018-01-23 14:24:07 +01:00
Jack Ha
07e6875199 CURA-4848 added logging for when the crash occurs 2018-01-23 14:24:00 +01:00
Lipu Fei
710e3c1629 Revert "Simplify check for _outside_buildarea" 
This reverts commit 5c8d46b5c2.
 2018-01-23 12:39:15 +01:00
Lipu Fei
f45de9654b Revert "Remove unused import" 
This reverts commit cf556ccf8f.
 2018-01-23 12:39:07 +01:00