GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 11:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,963 Commits 295 Branches 268 Tags
Commit Graph

3883 Commits

Author SHA1 Message Date
Ghostkeeper
23b1f9c1d6
Merge branch '2.6' 2017-05-30 15:41:29 +02:00
Ghostkeeper
f42f323d64
Update translation po files for each language 
These were generated using 'make i18n-update-po' on the 2.6 branch at commit 37fccecce7e5f81d3b5bf70ad981602c97120669. This should add all new strings to all .po files for Cura and retain any old translations that we had.

Contributes to issue CURA-3885.
 2017-05-30 15:39:02 +02:00
Ghostkeeper
21575d6998
Update translation templates 
These templates were generated using 'make extract-messages' on the 2.6 branch at commit 3be6526be3c550862451747041516a453c2a9878.

Contributes to issue CURA-3885.
 2017-05-30 15:39:02 +02:00
Tim Kuipers
a91d6478be Merge branch '2.6' 2017-05-30 15:32:49 +02:00
Tim Kuipers
14e85d7b6b refactor: move spaghetti infill options to experimental category 2017-05-30 15:22:03 +02:00
Ghostkeeper
cbe4891784
Merge branch '2.6' 2017-05-30 13:36:04 +02:00
Ghostkeeper
9132a025d6
Merge branch 'feature_CURA-3810_material_info_button' of https://github.com/LipuFei/Cura into LipuFei-feature_CURA-3810_material_info_button 2017-05-30 13:32:03 +02:00
Lipu Fei
8af1cc886f Use .definition to access DefinitionContainer in qml 
CURA-3810
 2017-05-30 12:49:12 +02:00
Lipu Fei
7be05229d8 Fix material info button tooltip position 
CURA-3810
 2017-05-30 11:47:49 +02:00
Tim Kuipers
015d1b79ab Merge pull request #1866 from moritzmair/master 
added 3Dator printer profile and printbed mesh
 2017-05-30 10:59:31 +02:00
Lipu Fei
9333ed1e35 Update copyright in comments 
CURA-3810
 2017-05-30 09:16:58 +02:00
Lipu Fei
68bd5a6e37 Use Item and anchors to set material row layout 
CURA-3810
 2017-05-30 09:16:28 +02:00
Lipu Fei
3a3d9afc24 Use "button" style for material info button 
CURA-3810
 2017-05-29 18:06:42 +02:00
Lipu Fei
c80e1b67a5 Only show material info button for multi-extrusion machines 
CURA-3810
 2017-05-29 18:00:46 +02:00
Lipu Fei
b797fcc74d Use global stack to evaluate limit_to_extruder value 
CURA-3738

Getting limit_to_extruder from definition in QML returns a
SettingFunction which hasn't been evaluated. This causes the comparison
not to be working. We change it to use the global stack to evaluate so
we can get an actual extruder number string.
 2017-05-29 15:44:57 +02:00
Ghostkeeper
b8f290d835
Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-29 15:40:24 +02:00
Ghostkeeper
8ec9337077
Merge branch 'feature_extruder_per_feature' 2017-05-29 15:40:06 +02:00
Lipu Fei
85e875257b Use "/<version>/<machineName>" as the material info URL suffix 
CURA-3810
 2017-05-29 15:23:52 +02:00
Lipu Fei
9b67fa94b4 Add material info button to show Ultimaker.com materials page 
CURA-3810

Add a new info button for materials. When a user clicks on the button,
it will open the materials information page on the Ultimaker website.
 2017-05-29 14:52:05 +02:00
Tim Kuipers
71c2a8edc6 Merge pull request #1861 from fieldOfView/feature_add_tam_series1 
Add Type A Machines series 1 2014 definition and mesh
 2017-05-29 14:24:43 +02:00
Ghostkeeper
baade194fd
Change Extra Skin Wall Count to depend on top/bottom extruder 
The feature is meant to improve the quality of the skins. Whether this is needed should depend on the material of the skin rather than on the material of the inner wall, even though the feature itself is printed with the inner wall extruder.

Contributes to issue CURA-3740.
 2017-05-29 14:10:18 +02:00
Jaime van Kessel
ca922e9e9d The monitor item is now actually used to display information on monitor page 
The UM3 now provides camera image in this way

CURA-3826
 2017-05-29 13:47:41 +02:00
Ghostkeeper
03c8e7e62b
Merge branch 'maukcc-master' 2017-05-24 16:37:10 +02:00
Lipu Fei
374b6d4e35 Merge branch '2.6' 2017-05-24 14:10:26 +02:00
Lipu Fei
64ae8bb595 Use global stack to evaluate limit_to_extruder value 
CURA-3738

Getting limit_to_extruder from definition in QML returns a
SettingFunction which hasn't been evaluated. This causes the comparison
not to be working. We change it to use the global stack to evaluate so
we can get an actual extruder number string.
 2017-05-24 10:17:13 +02:00
Tim Kuipers
eab7ce232a JSON fix: default feature extruder_nr = -1 (CURA-3740) 2017-05-23 14:01:01 +02:00
Lipu Fei
da39ab8093 Remove duplicate "enabled" for "infill_angles" 2017-05-23 13:34:50 +02:00
Moritz Mair
a714d5b370 added 3dator printer profile and mesh 2017-05-23 13:10:47 +02:00
fieldOfView
93a36a8503 Add Type A Machines series 1 2014 definition and mesh 2017-05-22 22:12:36 +02:00
Tim Kuipers
6887bcf232 JSON fix: feature extruder settings now use optional_extruder type (CURA-3740) 2017-05-22 16:57:33 +02:00
Ghostkeeper
884067d844
Merge branch 'master' into feature_extruder_per_feature 2017-05-22 16:22:32 +02:00
Ghostkeeper
2a6a968540
Merge branch 'master' into feature_extruder_per_feature 2017-05-22 16:05:57 +02:00
Jaime van Kessel
92192ff411 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-22 14:10:27 +02:00
Jaime van Kessel
5aba1731f5 Renamed useOptionalExtruder to addOptional extruder 
This is more in line with the other properties

CURA-3814
 2017-05-22 14:05:10 +02:00
Ghostkeeper
c14294d1f7
Merge branch '2.6' 
Conflicts:
cura/Settings/ExtrudersModel.py

Contributes to issue CURA-3803.
 2017-05-22 14:02:48 +02:00
Arjen Hiemstra
8e5cfd9566 Add last missing settings that should still use extruderValue 
Contributes to CURA-3738
 2017-05-22 13:57:08 +02:00
Jaime van Kessel
20cb3ea01f Added "optional_extruder" setting type 
CURA-3814
 2017-05-22 13:24:41 +02:00
Ghostkeeper
07f5b9b5bb
Set TPU skin overlap to 5% 
For the 0.8mm profiles the variants specify 5%, so we remove it from those profiles. The 0.4mm variants specify 15% so for those we need to override it.
 2017-05-19 15:57:54 +02:00
Ghostkeeper
1db6e354b5
Set travel avoid distance for TPU to 0.5mm 
With TPU the material gets dragged along a lot when moving outside of the object. We want to reduce that.
 2017-05-19 15:57:54 +02:00
Ghostkeeper
39986baa2f
Remove redundant travel avoid distance settings 
The UM3 definition sets the setting to 3mm. Nothing else sets it to another value except FDM Printer. I left the UM3 setting in and removed all travel_avoid_distance settings in the UM3 profiles.
 2017-05-19 15:57:53 +02:00
Ghostkeeper
600428a0a3
Disable Z-hop for all TPU profiles 
This gives better results, and we don't want to offer dual-extrusion options for TPU at first anyway.
 2017-05-19 15:57:53 +02:00
Jaime van Kessel
81d03a1683 Fixed order of pva profiles 
CURA-3845
 2017-05-19 14:00:40 +02:00
maukcc
0fccad875a Delete UM3 profiles 2017-05-19 10:46:34 +02:00
maukcc
e035358474 Revert "update" 
This reverts commit 8a027340c55f9fc7c6137662e5eeedde0162cb77.
 2017-05-19 10:36:15 +02:00
maukcc
5a3fc68185 update 2017-05-19 09:10:17 +02:00
Ghostkeeper
7cb8e549f4
Merge branch 'feature_mold_roof' 2017-05-18 16:47:51 +02:00
Arjen Hiemstra
7e4f983cd6 Fix support settings that need their inheritance value from different extruders 
Contributes to CURA-3738
 2017-05-18 15:34:50 +02:00
maukcc
d57701c7ef Merge branch 'master' of https://github.com/maukcc/Cura 
resources/quality/ultimaker3/um3_aa0.8_TPU_Not_Supported_Quality.inst.cfg
resources/quality/ultimaker3/um3_aa0.8_TPU_Not_Supported_Superdraft_Quality.inst.cfg
 2017-05-18 09:50:23 +02:00
maukcc
8a027340c5 update 2017-05-18 09:47:25 +02:00
Jaime van Kessel
ff2478ff51 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-17 16:25:02 +02:00