GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-03 10:44:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,338 Commits 295 Branches 267 Tags
Commit Graph

12338 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ChrisTerBeke
98f738e3d9
Merge pull request #3149 from thetobby/master 
Small tweaks on printer profile for two printers
 2018-01-19 12:50:15 +01:00
ChrisTerBeke
fb8aa08c6a
Merge pull request #3031 from Ultimaker/feature_headless_docker 
Feature headless
 2018-01-19 10:31:20 +01:00
Torbjørn
8b00bafb8b . 2018-01-19 06:57:39 +01:00
Mark
00cf47a941 Merge branch '3.2' 2018-01-18 16:29:44 +01:00
Mark
74e9bf051c Merge branch '3.2' of github.com:Ultimaker/Cura into 3.2 2018-01-18 16:28:51 +01:00
Mark
a774012bd2 Default objectlist to collapsed CURA-4525 2018-01-18 16:28:46 +01:00
Diego Prado Gesto
2e4b4036e7 Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2 2018-01-18 15:50:06 +01:00
Diego Prado Gesto
ece63bfea8 CURA-4821 The previous cached layer data is removed when a GCode is loaded. Temporary solution for one buildplate. 2018-01-18 15:47:01 +01:00
Jack Ha
68347afc48 CURA-4033 fix init order of print information 2018-01-18 14:40:15 +01:00
Lipu Fei
322420092d Fix extruder handling in project loading 
CURA-4824

When a machine is getting overriden, it should not try to create the
ExtruderStack for the single-extrusion machine loaded from the project
file, otherwise that ExtruderStack will become an extra one.
 2018-01-18 13:49:41 +01:00
Ghostkeeper
d1d566bfc0
Merge branch '3.2' 2018-01-18 13:29:36 +01:00
Ghostkeeper
afcf35cb0e
Merge branch '3.2' of github.com:Ultimaker/Cura into 3.2 2018-01-18 13:25:16 +01:00
Ghostkeeper
dc08e7f043
Merge branch 'mb-move-wall-order-opt-setting' of https://github.com/smartavionics/Cura into smartavionics-mb-move-wall-order-opt-setting 2018-01-18 13:23:16 +01:00
Jack Ha
1796a182fa CURA-4525 fix crashing cura due to empty build plate 2018-01-18 11:54:30 +01:00
Torbjørn
53cc4efb23 last minute tweaks 
Decreased jerk and acceleration
 2018-01-18 09:42:36 +01:00
ChrisTerBeke
5e99fd6c1e Fixes for print information when running in headless mode 2018-01-18 09:05:40 +01:00
Torbjørn
66805f83fd Small tweaks for default quality 
To better match printers after some testing
 2018-01-18 08:46:27 +01:00
Lipu Fei
dd8d21fd34
Merge pull request #3147 from fieldOfView/fix_menu_errors 
Fix QML errors building the material and nozzle menus
 2018-01-18 08:41:42 +01:00
Torbjørn
9530d5a3d3 Merge branch 'master' of https://github.com/thetobby/Cura 2018-01-18 08:41:34 +01:00
fieldOfView
259b1091f6 Fix QML errors building the material and nozzle menus 
Since the network rewrite, outputdevices no longer have hotends and materials. This functionality may return, but until that time this does a better job at checking if the properties exist, preventing QML errors.
 2018-01-17 19:36:20 +01:00
ChrisTerBeke
422d047317 Merge branch 'master' into feature_headless_docker 2018-01-17 17:02:04 +01:00
ChrisTerBeke
4d0eaf6093 Merge branch 'feature_headless_docker' of https://github.com/Ultimaker/Cura into feature_headless_docker 2018-01-17 17:01:58 +01:00
Jack Ha
8a53549bce CURA-4033 split update bounds for a single node in buildvolume and also call it from readMeshFinished 2018-01-17 17:01:03 +01:00
Diego Prado Gesto
4ee36404cc Merge branch '3.2' 2018-01-17 14:35:07 +01:00
Diego Prado Gesto
5c0e2d39a3 Avoid zero thickness to be shown in layer view. 2018-01-17 11:54:22 +01:00
Diego Prado Gesto
e6169a7c61 Fix some typos 2018-01-17 11:53:31 +01:00
ChrisTerBeke
c1308de753 Merge branch '3.2' 2018-01-17 11:40:06 +01:00
Diego Prado Gesto
cc89ddf5f7 Revert "Avoid zero thickness to be shown in layer view." 
I saw that with these changes, Cura crashes when loading a GCode.
This reverts commit 8dd21892d33277bec88895393f992b612b7af526.
 2018-01-17 11:39:38 +01:00
Diego Prado Gesto
8dd21892d3 Avoid zero thickness to be shown in layer view. 
Also fix some typos.
 2018-01-17 11:34:25 +01:00
Jaime van Kessel
4680996a49 Print window no longer gets an ever increasing list of print targets 
CL-720
 2018-01-17 11:32:43 +01:00
Diego Prado Gesto
26371c9c3a CURA-4815 When creating the unique name for a machine, don't look at the 
definition instance container for the id, just look at the container
stack ids.
 2018-01-17 10:57:11 +01:00
Lipu Fei
cb0ac9b0c8
Merge pull request #3137 from Ultimaker/feature_multiple_BP 
Feature: Printers with different build plates
 2018-01-17 10:55:46 +01:00
Lipu Fei
4bc488ca79 Change wording to "Aluminium" 
CURA-4461
 2018-01-17 10:50:48 +01:00
Ian Paschal
fad43be23b Fixes CURA-4789 
Emits `sceneChanged` which `PrintInformation` listens for and then resets with. Same result re: print time, but also will update anythign else which is listening for `sceneChanged`.
 2018-01-16 17:03:52 +01:00
Ian Paschal
ba1f915633 Fix for CURA-4789 
`deleteAll()` within `CuraApplication.py` now resets the print information by calling its `setToZeroPrintInformation()` method, rather than by reinstatiating the `PrintInformation` class.
 2018-01-16 16:30:10 +01:00
Jack Ha
07f0906b1c Merge branch '3.2' 2018-01-16 16:05:38 +01:00
Jack Ha
cffeff0299 CURA-4805 remove modifiable settings when loading non sliceable file (gcode) 2018-01-16 15:58:14 +01:00
Jack Ha
fc2cbb61fa Merge branch '3.2' of github.com:Ultimaker/Cura into 3.2 2018-01-16 15:37:02 +01:00
Jack Ha
54698ada7f CURA-4807 fix not choosing 'not supported' if there are valid options after changing variant; partly undoing 4abbd4b9887fc3e3d98ebf06481d2b21a9e9be0e 2018-01-16 15:36:57 +01:00
ChrisTerBeke
cbd6a996fa Remove unused Signal import 2018-01-16 15:10:46 +01:00
ChrisTerBeke
02b681a8f2 Fixes for slicing 2018-01-16 15:10:16 +01:00
Lipu Fei
b0d2ef0f72 Correct default material diameter value for single-extrusion machines 
CURA-4812
 2018-01-16 15:04:21 +01:00
Ghostkeeper
cbf9a08c6e
Merge branch '3.2' 2018-01-16 13:45:11 +01:00
Ghostkeeper
f948203a63
Fix crash when clearing build plate 
We shouldn't delete the singleton PrintInformation object. We should rather just zero out the print information. And instead of doing that explicitly in deleteAll, listen to scene changes from PrintInformation in order to keep the logic related to the print information contained within its class.

Contributes to issue CURA-4810.
 2018-01-16 13:44:49 +01:00
Lipu Fei
51b49c89f4 Switch to LayerView after GCode has been fully loaded 
CURA-4805
 2018-01-16 13:09:35 +01:00
Diego Prado Gesto
0a4c30603f Change style of Add/Remove printers link in Monitor tab 2018-01-16 13:07:27 +01:00
Diego Prado Gesto
4c29a952eb Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-01-16 11:59:06 +01:00
Diego Prado Gesto
aa8057e80c Change style of Add/Remove printers link in Monitor tab 2018-01-16 11:57:39 +01:00
Lipu Fei
8a570c4b01 Show user profiles based on Not Supported 
CURA-4807
 2018-01-16 11:57:20 +01:00
Lipu Fei
abece3c415 Add quality_type = not_supported to empty_quality_changes 
CURA-4807
 2018-01-16 11:57:20 +01:00