Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CURA-11291 Turn on prime tower even when support is disabled #268

Merged
merged 4 commits into from
Nov 10, 2023
Merged

CURA-11291 Turn on prime tower even when support is disabled #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dcc03b2
Update conanfile.py
jellespijker Oct 31, 2023
7ff6a61
- Renamed Makerbot to UltiMaker in material profiles for the Methods
pkuiper-ultimaker Nov 6, 2023
53cd093
Merge pull request #267 from Ultimaker/Makerbot-profiles-update
casperlamboo Nov 6, 2023
071b380
Turn on prime tower even if the support is disabled
pkuiper-ultimaker Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class FDM_MaterialsConan(ConanFile):

def set_version(self):
if not self.version:
self.version = "5.5.0-beta.2"
self.version = "5.6.0-beta.1"

def export_sources(self):
copy(self, "*.fdm_material", self.recipe_folder, self.export_sources_folder)
Expand Down
6 changes: 3 additions & 3 deletions ultimaker_abscf_175.xml.fdm_material
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<color>Generic</color>
</name>
<GUID>495a0ce5-9daf-4a16-b7b2-06856d82394d</GUID>
<version>3</version>
<version>4</version>
<color_code>#0e0e10</color_code>
<description>The performance of carbon fiber with the reliability of ABS</description>
<adhesion_info>No glue needed</adhesion_info>
Expand All @@ -26,7 +26,7 @@
<setting key="build volume temperature">107</setting>

<machine>
<machine_identifier manufacturer="Ultimaker B.V." product="Makerbot Method X"/>
<machine_identifier manufacturer="Ultimaker B.V." product="UltiMaker Method X"/>
<hotend id="1A">
<setting key="hardware compatible">no</setting>
</hotend>
Expand All @@ -47,7 +47,7 @@
</hotend>
</machine>
<machine>
<machine_identifier manufacturer="Ultimaker B.V." product="Makerbot Method XL"/>
<machine_identifier manufacturer="Ultimaker B.V." product="UltiMaker Method XL"/>
<setting key="build volume temperature">85</setting>
<setting key="heated bed temperature">95</setting>
<hotend id="1A">
Expand Down
6 changes: 3 additions & 3 deletions ultimaker_absr_175.xml.fdm_material
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<color>Generic</color>
</name>
<GUID>88c8919c-6a09-471a-b7b6-e801263d862d</GUID>
<version>3</version>
<version>4</version>
<color_code>#8cb219</color_code>
<description>Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC.</description>
<adhesion_info>No glue needed</adhesion_info>
Expand All @@ -26,7 +26,7 @@
<setting key="build volume temperature">107</setting>

<machine>
<machine_identifier manufacturer="Ultimaker B.V." product="Makerbot Method X"/>
<machine_identifier manufacturer="Ultimaker B.V." product="UltiMaker Method X"/>
<hotend id="1A">
<setting key="hardware compatible">no</setting>
</hotend>
Expand All @@ -47,7 +47,7 @@
</hotend>
</machine>
<machine>
<machine_identifier manufacturer="Ultimaker B.V." product="Makerbot Method XL"/>
<machine_identifier manufacturer="Ultimaker B.V." product="UltiMaker Method XL"/>
<setting key="build volume temperature">85</setting>
<setting key="heated bed temperature">95</setting>
<hotend id="1A">
Expand Down
8 changes: 4 additions & 4 deletions ultimaker_rapidrinse_175.xml.fdm_material
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<color>Generic</color>
</name>
<GUID>a140ef8f-4f26-4e73-abe0-cfc29d6d1024</GUID>
<version>3</version>
<version>5</version>
<color_code>#f5f2d1</color_code>
<description>Water soluble support material for ABS-R.</description>
<adhesion_info>Use the same temperatures and adhesion method as your build material(s).</adhesion_info>
Expand All @@ -28,12 +28,12 @@

<!-- Define as soluble support material -->
<cura:setting key="material_is_support_material">True</cura:setting>
<cura:setting key="prime_tower_enable">=extruder_nr==support_extruder_nr and support_enable</cura:setting>
<cura:setting key="prime_tower_enable">=extruder_nr==support_extruder_nr</cura:setting>
<cura:setting key="support_conical_enabled">True</cura:setting>

<machine>
<machine_identifier manufacturer="Ultimaker B.V." product="Makerbot Method X"/>
<machine_identifier manufacturer="Ultimaker B.V." product="Makerbot Method XL"/>
<machine_identifier manufacturer="Ultimaker B.V." product="UltiMaker Method X"/>
<machine_identifier manufacturer="Ultimaker B.V." product="UltiMaker Method XL"/>
<hotend id="1A">
<setting key="hardware compatible">no</setting>
</hotend>
Expand Down
Loading