GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-18 09:35:56 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,788 Commits 295 Branches 268 Tags
Commit Graph

10788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
9243444c0e
Merge branch 'halfakop-2.7' into 2.7 2017-08-11 16:55:51 +02:00
Ghostkeeper
23aeb7efa8
Merge branch '2.7' of https://github.com/halfakop/Cura into halfakop-2.7 2017-08-11 16:55:29 +02:00
Ghostkeeper
0528a03363
Merge branch '2.7' 2017-08-11 16:23:58 +02:00
Ghostkeeper
5416504fcb
Update Korean translations 
These files are directly copied from the translator. They seem to be perfect though so I don't see a reason to modify them further (apart from the fact that I don't know any Korean; the format is correct though).

Contributes to issue CURA-4113.
 2017-08-11 16:19:49 +02:00
Ghostkeeper
4728f31996
Merge branch '2.7' 2017-08-11 12:38:49 +02:00
Ghostkeeper
824849a878
Make manufacturer for base fdm- definitions unknown 
They are always overwritten, but if it isn't overwritten we don't know the manufacturer for the printer.

Contributes to issue CURA-4159.
 2017-08-11 12:38:34 +02:00
Lipu Fei
3e870d2e40 Always update raft thickness and extra z clearance before rebuilding the build volume 
CURA-4154
 2017-08-11 12:27:45 +02:00
KEMIQ 3D
f3af7655d1 Update kemiq_q2_gama_pla_low.inst.cfg 
Removed extra empty files at the end of the file and changed adhesion_type
 2017-08-11 13:10:47 +03:00
KEMIQ 3D
d71afa6ef6 Update kemiq_q2_gama_pla_draft.inst.cfg 
Changed build adhesion type value
 2017-08-11 13:08:32 +03:00
KEMIQ 3D
6b88b12605 Update kemiq_q2_gama_pla_draft.inst.cfg 
Removed extra empty files at the end of the file
 2017-08-11 13:02:15 +03:00
KEMIQ 3D
7a9d3ba41e Update kemiq_q2_beta_pla_extra_fine 
Removed extra empty lines at the end of the file
 2017-08-11 12:58:44 +03:00
KEMIQ 3D
68c0b28f98 Update kemiq_q2_beta_pla_fine.inst.cfg 
Removed extra empty lines at the end of the file
 2017-08-11 12:56:51 +03:00
KEMIQ 3D
0b6024dce5 Update kemiq_q2_beta_pla_normal.inst.cfg 
Removed extra lines at the end of the file
 2017-08-11 12:28:05 +03:00
KEMIQ 3D
d796716746 Update kemiq_q2_beta_pla_low.inst.cfg 
Removed extra empty lines at the end of the file
 2017-08-11 12:24:42 +03:00
KEMIQ 3D
5f2d1de9b1 Update kemiq_q2_beta_pla_draft.inst.cfg 
Removed extra empty lines at the end of the file
 2017-08-11 12:20:13 +03:00
Ghostkeeper
76e0156076
Merge branch '2.7' 2017-08-11 11:18:15 +02:00
Ghostkeeper
b03847447f
Take manufacturer from XML profile if available 
Otherwise we fall back to the manufacturer in the machine definition. If that fails too, we fall back to Unknown (rather than an empty string).

Contributes to issue CURA-4157.
 2017-08-11 11:13:23 +02:00
Ghostkeeper
e1266ceb1f Change Ultimaker manufacturer to Ultimaker B.V. 
The material profiles are sent to UM3 with a manufacturer that's obtained from the printer definition rather than the material definition. The printer definition was 'Ultimaker' rather than 'Ultimaker B.V.' and the printer checked against this.

Contributes to issue CURA-4159.
 2017-08-11 10:24:13 +02:00
Ghostkeeper
5f057f46ea
Add Pirate language only on Talk Like a Pirate Day 
Let's see who finds this.
 2017-08-10 20:26:35 +02:00
Ghostkeeper
da27b0463e
Ignore generated Pirate language 
This one's auto-generated by 'make extract-messages'.
 2017-08-10 20:14:18 +02:00
Lipu Fei
def2e1f203 Merge branch '2.7' 2017-08-10 12:24:51 +02:00
Lipu Fei
4bac499c22 Use QualityManager._getFilteredContainersForStack() to get qualities 
CURA-4151

The quality searching code in _configureProfile() for importing quality
profiles doesn't take into account base materials. Use the function in
QualityManager to solve this problem.
 2017-08-10 12:14:43 +02:00
Aldo Hoeben
d1fe82fea7 Update README section about making definitions 
Removes the link to definition generator. The definition generator produces definitions that don't work with Cura 2.3 and newer.
Removes some incorrect instructions
Adds some instructions for multi-extrusion printers.
 2017-08-09 23:58:18 +02:00
Ruslan Popov
d349854bdd Update russian translation. 2017-08-09 19:28:25 +03:00
Lipu Fei
0a76e5c38f Merge branch '2.7' 2017-08-09 16:59:56 +02:00
Lipu Fei
a49c956cfa Temporary work around for "not overriden" limit to extruder features 
CURA-4145

When features with limit to extruder set to "not overriden" and its
value is retrieved with "extruderValue()", because the extruder number
is "-1", extruderValue() falls back to the global stack. As a result,
values can be incorrect. This workaround using the variants temporarily
solves the problem for outer and inner wall line widths.
 2017-08-09 16:57:21 +02:00
Lipu Fei
1aba451149 Fix value for outer wall_line_width 
CURA-4145
 2017-08-09 13:52:05 +02:00
Lipu Fei
66b26bafd4 Show quality name in project loading summary 
CURA-4142

In case the quality changes container is not there, show the quality
name of the quality profile.
 2017-08-09 13:27:00 +02:00
Lipu Fei
98b72fb971 Merge branch '2.7' 2017-08-09 13:16:43 +02:00
Lipu Fei
ccabbd8ca0 Mark definition changes container found instead of conflict 
CURA-4143

Reverts 65554b60e19507635c79048dc73862e6b25ec0ec
 2017-08-09 13:12:06 +02:00
Lipu Fei
65554b60e1 Mark definition_changes conflict if it is not found 
CURA-4143
 2017-08-09 13:06:18 +02:00
krios-fabteam
8829f64991 updated resources settings version 2017-08-09 10:21:56 +02:00
Lipu Fei
6fd3963e8f Fix material searching in isContainerUsed() 
CURA-4129

Searching for used materials should also take into account the material
container ID.
 2017-08-09 09:47:36 +02:00
Ghostkeeper
c0d96a1d79
Remove heat/cool speeds that are equal to default 
The default value for both of these settings in fdmprinter is 2.
 2017-08-09 09:46:22 +02:00
Lipu Fei
e414621250 Fix code style 2017-08-09 09:27:42 +02:00
Lipu Fei
ab3d8349b6 Also skip empty containers when getting layer height for a quality profile 
CURA-4133

On some machines such as UM2, there is no material. Getting the layer
height in this case will result back to the global stack itself, which
is the layer height of the current setting. This is a problem for
"Normal" (or "Fine") quality because it uses the machine's default layer
height.
 2017-08-09 09:24:04 +02:00
Lipu Fei
7d3ad43c90 Merge pull request #2177 from Ultimaker/raft_smoothing 
JSOn feat: raft smoothing setting (CURA-3854)
 2017-08-09 08:40:34 +02:00
Lipu Fei
63ea940680 Add minimum_value 0 for raft_smoothing 
CURA-3854
 2017-08-09 08:39:10 +02:00
Lipu Fei
33bf758081 Merge pull request #2127 from ChrisRiddell/cr_fix_ironing_settings 
Keep Ironing settings together while in experimental
 2017-08-08 16:54:37 +02:00
Lipu Fei
050caf49b2 Merge branch '2.7' 2017-08-08 16:44:58 +02:00
Lipu Fei
f75871567f Merge branch 'master' into cr_fix_ironing_settings 2017-08-08 16:43:48 +02:00
Lipu Fei
8c6abc85fc Rename variable in for loop 
CURA-4129
 2017-08-08 16:32:40 +02:00
Lipu Fei
bb1475d1fd Search for instance containers with type material 
CURA-4129
 2017-08-08 16:32:02 +02:00
Ghostkeeper
b9cdeb68d6
Don't crash when there is no global quality container 
We fill the stack with an empty container rather than with None in that case.

Contributes to issue CURA-3301.
 2017-08-08 14:40:02 +02:00
Ghostkeeper
fe406f530c
Never fill None for quality changes profile 
We want it to be the empty profile instead. This gets passed on all the way to _replaceQualityOrQualityChangesInStack where the metadata is requested.

Contributes to issue CURA-3301.
 2017-08-08 13:51:40 +02:00
fieldOfView
0630559472 Fix setting variant of non-active extruder through menu 2017-08-08 11:41:15 +02:00
Ghostkeeper
a75387ff3e
Only use Z-hop setting for the used extruders 
Otherwise the unused extruders still influence the build volume.
 2017-08-08 11:40:19 +02:00
Ghostkeeper
919bc6767c
Disable top surface line directions if there is no top surface 2017-08-08 11:40:19 +02:00
fieldOfView
8d72ba5fe7 Fix setting material of non-active extruder through menu 2017-08-08 11:32:34 +02:00
fieldOfView
975e7f04b4 Remove unused incorrect code 
The property is called activeMaterialIds, but it returns the stack ids. The code is superceeded by allActiveMaterialIds.
 2017-08-08 11:27:45 +02:00