GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-02 16:54:23 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,033 Commits 291 Branches 260 Tags
Commit Graph

3488 Commits

Author SHA1 Message Date
Jack Ha
ac76d6ea52 Merge branch 'refactoring_machine_manager' into feature_enable_disable_extruder 2018-03-01 13:14:10 +01:00
Jack Ha
657a52a5e7 CURA-4400 add checking for enabled extruder in setting _outside_buildarea, cleaned up a bit and factored some functions out BuildVolume 2018-03-01 11:54:31 +01:00
Jack Ha
11bad271d3 CURA-4400 set extruder numbers of settings to an enabled extruder; added SettingOverrideDecorator by default in CuraSceneNode 2018-02-28 15:56:45 +01:00
Lipu Fei
3e23659c79 Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-02-28 15:29:22 +01:00
Ian Paschal
f646f11020 CURA-4890 Removed print() statement. 2018-02-28 15:16:04 +01:00
Ian Paschal
3eab99c25c CURA-4890 Empty material no longer displayed as Unknown 
"Get learned how to make Cura more better-er!"
 2018-02-28 15:06:02 +01:00
Aleksei S
77a624d3b4 In monitor view show Finished for "wait_user_action" in printjob.status 
CURA-4873
 2018-02-28 13:04:51 +01:00
Jack Ha
f28bed9b4f CURA-4400 not sending objects that are printed with a disabled extruder 2018-02-28 12:56:39 +01:00
Lipu Fei
07824c21e1 Move getMachineDefinitionIDForQualitySearch() into QualityManager.py 2018-02-28 11:48:20 +01:00
Lipu Fei
615b20aa5b Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-02-28 09:51:26 +01:00
Ian Paschal
62e7cb9a2d CURA-4972 Allow reslice after setting is removed 
The issue Andreea found was caused by the fact that the object was unsubscribed from setting validation while still having the illegal value, because the setting (and its illegal value) was removed AFTER unsubscribing. Thus the illegal value got "saved" until the next time you added that setting and set the correct value.
 2018-02-27 16:05:07 +01:00
Lipu Fei
632e0469fb Fix 3MF Reader 2018-02-27 16:01:11 +01:00
Lipu Fei
f304e7f2e7 Revert "Use userChanges instead of getTop()" 
PerObjectContainerStacks are not CuraContainerStacks, so we cannot use "userChanges"
with it.
 2018-02-27 16:01:11 +01:00
Lipu Fei
2f86687320 Fix init machine for machines loaded from project files 2018-02-27 13:49:45 +01:00
Jack Ha
22cf5abec2 Merge branch 'master' into refactoring_machine_manager 2018-02-27 10:24:56 +01:00
Lipu Fei
ccd4bb285b Use userChanges instead of getTop() 2018-02-26 19:40:31 +01:00
Lipu Fei
12c51f4066 Use setActiveMachine() in project loading 2018-02-26 17:05:55 +01:00
Ghostkeeper
b5d1e5be36
Remove 'None' default for quality_type 
It has no semantic meaning to specify that here. The behaviour of this commit should be the same since 'None' is the default value for that parameter.

Contributes to issue CURA-4966.
 2018-02-26 16:21:46 +01:00
Ian Paschal
02c78faabc
Merge pull request #3404 from Ultimaker/CURA-4972_per_object_setting_validation 
Cura 4972 per object setting validation
 2018-02-26 16:06:44 +01:00
Diego Prado Gesto
197508028a Merge branch 'master' of github.com:Ultimaker/Cura 2018-02-26 14:03:14 +01:00
Diego Prado Gesto
f5b3775b7c CURA-4966 When loading a project, check the quality in all the extruder stacks and replace with 
the global quality if they don't match.
 2018-02-26 14:01:43 +01:00
Aleksei S
6df4ad3f6d Merge branch 'master' of github.com:Ultimaker/cura 2018-02-26 11:51:56 +01:00
Aleksei S
cd0846fad2 PostProcessing plugi, script Pause at Height redo layers 
gives incorrect E-values
CURA-4670
 2018-02-26 11:49:51 +01:00
Diego Prado Gesto
1f5d4e90c4 Merge branch 'CURA-4968_support_eraser_on_platform' 2018-02-26 11:28:20 +01:00
Ghostkeeper
6934c3f881
Use self.putValue to write g-code 
Mostly as a test of this function. Seems to work.
 2018-02-26 09:54:42 +01:00
Ghostkeeper
a7e1910711
Add E in the priority list 
This way we're assured of the order in which these parameters occur, even though the firmware doesn't care about it. It's easier to read though.
 2018-02-26 09:54:07 +01:00
Ghostkeeper
5160373580
Add helper function to write g-code lines 
Requested during the post-processing script workshop that I was giving.
 2018-02-26 09:43:10 +01:00
Ghostkeeper
d0cc9ba8a6
Remove debugging prints 2018-02-26 09:42:29 +01:00
Ian Paschal
e3411e9edb CURA-4972 More zen. 2018-02-23 14:52:35 +01:00
Diego Prado Gesto
3c6e94ea81 CURA-4968 Add the support eraser cube to the bottom of the buildplate 
when the automatic drop models preference is OFF
 2018-02-23 13:08:15 +01:00
Aleksei S
ed7dec0cae Fix: per model settings validation 
CURA-4972
 2018-02-23 13:05:29 +01:00
Lipu Fei
f51129b103 Remove TestTools plugin 2018-02-22 21:47:06 +01:00
Lipu Fei
68b1a374e0 Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-02-22 16:53:32 +01:00
Diego Prado Gesto
94ca4fffe3 CURA-4946 In the gcode just store the default machine definition 2018-02-22 16:46:48 +01:00
Lipu Fei
881fb0c08c Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-02-22 15:14:31 +01:00
Lipu Fei
f946f62db1 WIP: Cleanup Upgrade 30 to 31 2018-02-21 20:27:33 +01:00
Aleksei S
3ed9ac1e83 Fix: Monitor icon state was not updated properly 
CURA-4977
 2018-02-21 14:54:05 +01:00
Lipu Fei
9a354efd19 Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-02-21 14:05:19 +01:00
Lipu Fei
c432d4ffbb WIP: Simplify global stack and extruder stack activation and fixes 2018-02-20 11:16:51 +01:00
Diego Prado Gesto
6af5a5d4bc CURA-4946 When storing the gcode profile, the definition must be the 
quality definition if the printer has_machine_quality. Otherwise the
fdmprinter definition must be used as a fallback. If there is no
quality_definition then the printer definition is use.
 2018-02-20 11:11:21 +01:00
Diego Prado Gesto
6a4f519238 Revert "CURA-4946 Add the quality_definition metadata entry to the gcode so when" 
This reverts commit 744313af273ed34a5796d3970c3915f68abaedc7.
 2018-02-20 09:30:05 +01:00
Lipu Fei
62c31c2f6c WIP: Remove old QualityManager 2018-02-19 22:11:47 +01:00
Lipu Fei
3fffc2c621 WIP: Cleanup old QualityManager 2018-02-19 20:50:14 +01:00
Jaime van Kessel
3cf16fd34b Removed sending of material profiles. 
It takes a godawfull long time and the machine ignores most of them anyway.
 2018-02-19 15:37:08 +01:00
Jack Ha
823ac048fa Merge branch 'master' of github.com:Ultimaker/Cura 2018-02-19 09:14:10 +01:00
Jack Ha
2c689ef03f Log markup 2018-02-19 09:14:04 +01:00
Lipu Fei
495fc8bbd7 WIP: Refactor BuildPlateModel and split MultiBuildPlateModel 2018-02-17 22:24:05 +01:00
Lipu Fei
a5afaab467 WIP: Fix material duplication and metadata update 2018-02-16 14:23:11 +01:00
Lipu Fei
f024f45cfe WIP: Rework Material management page 2018-02-16 14:23:11 +01:00
Lipu Fei
20e0f8a82a WIP: Fix material serialization 2018-02-16 14:23:11 +01:00