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

12997 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Prado Gesto
1e1f49ad53 Merge branch 'bak' into 3.2 2018-02-05 17:27:11 +01:00
Diego Prado Gesto
0b99c43fdf Merge branch '3.2' into bak 2018-02-05 17:26:50 +01:00
Lipu Fei
4438e06416
Remove TODO 
CURA-4895
 2018-02-05 17:21:51 +01:00
Diego Prado Gesto
a85a720184 CURA-4895 Close the splash screen when the early crash dialog appears. Increase the size of 'show detailed crash report button' 2018-02-05 17:17:46 +01:00
Aleksei S
1701cbd011 Merge branch 'master' of github.com:Ultimaker/cura 2018-02-05 17:06:11 +01:00
Aleksei S
7b9bec2891 Fix: Wrong print jobs queued number 
CURA-4888
 2018-02-05 17:05:27 +01:00
Ian Paschal
e02cb78d57 CURA-4578 Manually installed plugins handled correctly 
3rd-party plugins which were manually installed were listed as uninstall-able instead of disable-able. The distinction between plugins which could be installed or disabled was previously made by whether or not it was 3rd party, but is now made by determining the install location.
 2018-02-05 16:39:45 +01:00
Jack Ha
bc2dafe863 Merge branch 'master' of github.com:Ultimaker/Cura 2018-02-05 15:29:01 +01:00
Jack Ha
be92bbfcb0 CURA-4425 improve image quality for some models combined with some viewing angles 2018-02-05 15:28:34 +01:00
Ian Paschal
e64fb9c762 Splash closed on early crash 2018-02-05 14:47:11 +01:00
Jack Ha
0e7edc3eaf CURA-4425 the thumbnail now crops correctly 2018-02-05 14:36:42 +01:00
Ian Paschal
27d250374f Removed print() statements 2018-02-05 14:34:29 +01:00
Ghostkeeper
64e7a8e61f
Merge branch '3.2' 2018-02-05 14:18:18 +01:00
Ghostkeeper
95d1d8cf34
Update headers of translation files 
The dates are corrected, attribution correct, etc.

Contributes to issue CURA-4883.
 2018-02-05 13:53:56 +01:00
Ghostkeeper
be660cc0bc
Update translations from Bothof 
These are the unchecked translations from Bothof in Cura 3.2. Other translations follow.

Contributes to issue CURA-4883.
 2018-02-05 13:32:00 +01:00
Jaime van Kessel
2dee2ce5d9 Fixed issue where optimized layer data could be empty 2018-02-05 13:16:39 +01:00
Jaime van Kessel
4a12f7709b Merge branch 'master' of github.com:Ultimaker/Cura 2018-02-05 13:02:59 +01:00
Jaime van Kessel
e01c8218fa Removed uneeded checks if a node was a SceneNode 
The "isSlicable" decorator already took care of this
 2018-02-05 13:02:30 +01:00
alekseisasin
6fe524dce8
Merge pull request #3142 from Velleman/master 
Updated definition and added the qualities
 2018-02-05 11:56:09 +01:00
Jaime van Kessel
516d7015e4 Fixed some issues caused by the multi buildplate system 2018-02-05 11:37:36 +01:00
Diego Prado Gesto
383319d631 CURA-4895 Correctly format the date for the backup file 2018-02-05 11:28:17 +01:00
Diego Prado Gesto
915bb2e450 CURA-4895 Connect timer signal just if CuraApplication has been previously created and started 2018-02-05 11:28:17 +01:00
Diego Prado Gesto
e1bca1ca5d CURA-4895 Don't run autosave settings if application has not been created or if not started 2018-02-05 11:28:17 +01:00
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
Ian Paschal
e2fb8ab762 Fixed typo 2018-02-05 09:45:22 +01:00
Unknown
5fcb80532f update cura.po for cura 3.2 2018-02-04 11:19:55 +08:00
fieldOfView
25eb1ff342 Fix the detection of multiextruder replacement patterns 
Since #3068, replacement patterns can take the form of {setting_nr, extruder_nr}. This form was not being recognised when determining if CuraEngine should prepend its own preheat sequence.
 2018-02-03 22:09:40 +01:00
Lipu Fei
a3ed385259 Use global_stack.definition.getId() to determine machine type 
CURA-4891
 2018-02-02 14:47:14 +01:00
ChrisTerBeke
8e86c49c81
Merge pull request #3176 from fieldOfView/fix_dark_sidebar 
Fix sidebar theming (for Ultimaker Dark theme)
 2018-02-02 14:31:43 +01:00
Ian Paschal
f7ef1c7aa8 Remove debug output 
Removed debug `print()` from `PluginBrowser.py`
 2018-02-02 14:02:51 +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
56382bc9b8 Merge branch 'feature_ufp_writer' 2018-02-02 11:58:33 +01:00
Diego Prado Gesto
2024d6aa12 Merge branch 'master' into feature_ufp_writer 2018-02-02 11:57:53 +01:00
Mark
ee75b9bdf5 Also accept a comma as input and convert it to a dot 
CURA-4910
 2018-02-02 10:28:37 +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
6a053a9f46 Fix material profile validator 
CURA-4871

Description and adhesion info are not mandatory info.
 2018-02-01 14:50:05 +01:00
Unknown
5688a99ece update fdmprinter.def.json.po for cura 3.2 2018-02-01 21:00:28 +08:00
Lipu Fei
caeb6c65ea Change check_preset_settings.py to UNIX EOLs 
CURA-3710
 2018-02-01 13:57:26 +01:00
Lipu Fei
367e50669d Refactor code 
CURA-3710
 2018-02-01 13:56:49 +01:00