Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/4.12' into mb-testing
Browse files Browse the repository at this point in the history
  • Loading branch information
burtoogle committed Nov 10, 2021
2 parents a994e52 + 40be115 commit 6a8479f
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 316 deletions.
2 changes: 1 addition & 1 deletion resources/i18n/es_ES/fdmprinter.def.json.po
Original file line number Diff line number Diff line change
Expand Up @@ -1798,7 +1798,7 @@ msgstr "Giroide"
#: fdmprinter.def.json
msgctxt "infill_pattern option lightning"
msgid "Lightning"
msgstr "Lightning (Iluminación)"
msgstr "Iluminación"

#: fdmprinter.def.json
msgctxt "zig_zaggify_infill label"
Expand Down
Binary file modified resources/images/whats_new/0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/images/whats_new/4.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/images/whats_new/5.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
325 changes: 16 additions & 309 deletions resources/texts/change_log.txt

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions resources/texts/whats_new/0.html
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<h4>Improve first time right – with print profile optimizations</h4>
<p>As a result of countless hours of print process optimizations by our materials and software engineers – we’ve packed Ultimaker Cura 4.12 beta with quality improvements for print profiles. This increases first-time-right results by improving default top surface and horizontal print quality. Start your print and try it out!</p>
<h4>Improve first time right – with Ultimaker print profile optimizations</h4>
<p>As a result of countless hours of print process optimizations by our materials and software engineers – we’ve packed Ultimaker Cura 4.12 with quality improvements for Ultimaker print profiles. This increases first-time-right results by improving default top surface and horizontal print quality. Start your print and try it out!</p>
4 changes: 2 additions & 2 deletions resources/texts/whats_new/4.html
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<h4>Academy: Beginner’s guide to FFF</h4>
<p>Ready to dive into FFF printing but don’t know where to start? From A for “Applications” to Z for “Z-screw lubrication”, our newest free Ultimaker Academy course <a href="https://academy.ultimaker.com/lms/index.php?r=course/deeplink&course_id=244&generated_by=13028&hash=42c45e7e294dcc50f1842f470a78801943491771">Beginner’s guide to FFF</a> has you covered. Then, get extra kudos by sharing it with your colleagues and friends.</p>
<h4>Never a better time to buy Ultimaker</h4>
<p>Want to unlock all the benefits of the Ultimaker platform? For a limited time, get at least 20% off a full Ultimaker 3D printing setup to access easy remote printing, native CAD import, your own digital parts library, and more! <a href="https://ultimaker.com/anniversary-value-pack?utm_source=cura&utm_medium=software&utm_campaign=whatsnew-4-12-q4promo-cta">Click here to discover how much you could save</a> </p>
4 changes: 2 additions & 2 deletions resources/texts/whats_new/5.html
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<h4>There is a lot more...</h4>
<p>Want more information on new features, bug fixes, and more for Ultimaker Cura 4.12 beta? Read the full <a href="https://ultimaker.com/learn/enjoy-first-time-right-results-with-ultimaker-cura-4-12-beta?utm_source=cura&utm_medium=software&utm_campaign=whatsnew-4-12-releaseblog">blog post</a> here. And don't forget to give us your feedback on <a href="https://github.com/Ultimaker/Cura/issues/new/choose">GitHub</a>! </p>
<h4>Academy: Beginner’s guide to FFF</h4>
<p>Ready to dive into FFF printing but don’t know where to start? From A for “Applications” to Z for “Z-screw lubrication”, our newest free Ultimaker Academy course <a href="https://academy.ultimaker.com/lms/index.php?r=course/deeplink&course_id=244&generated_by=13028&hash=42c45e7e294dcc50f1842f470a78801943491771">Beginner’s guide to FFF</a> has you covered. Then, get extra kudos by sharing it with your colleagues and friends.</p>

0 comments on commit 6a8479f

Please sign in to comment.