3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 04:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
17030 commits 305 branches 270 tags 779 MiB
Commit graph

7343 commits

Author SHA1 Message Date
Lipu Fei
382adf57df Use 0.1 layer height as normal for Ender 3 2018-10-10 07:55:49 +02:00
Diego Prado Gesto
49e96980f1 Store the dialogs in a folder called Dialogs. 
Contributes to CURA-5784.
 2018-10-09 17:11:01 +02:00
Diego Prado Gesto
77a1b08f38 Add the callout panel to the account panel, with the two components that 
will show up when the user is logged in or when not.

Contributes to CURA-5784.
 2018-10-09 15:58:13 +02:00
Lipu Fei
1951391a23 Merge remote-tracking branch 'origin/3.5' 2018-10-09 12:04:53 +02:00
Lipu Fei
18821b6527 Add missing extruder def for Creality Ender 3 
CURA-5806
 2018-10-09 11:43:42 +02:00
Vlad Gribinchuk
eb310116aa JSON settings for "Support Interface Offset" feature 2018-10-09 10:50:34 +03:00
Diego Prado Gesto
2ffcf03f43 Create an AvatarImage component that will show the profile image of the 
user. Still WIP.
Create an AccountWidget (WIP) that shows the avatar image and the
dropdown menu to manage accounts.

Contributes to CURA-5784.
 2018-10-08 17:35:24 +02:00
Jaime van Kessel
d1a51b26f7 Simplified QML expression 2018-10-08 17:22:04 +02:00
Jaime van Kessel
5f6b267c77 Merge branch 'fix_credits' of https://github.com/fieldOfView/Cura 2018-10-08 17:07:05 +02:00
Jaime van Kessel
d98eafe041 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-10-08 17:03:25 +02:00
Ghostkeeper
314b966cc9
Improvements to translated strings 
These strings were recently found to have been confusing to the translators. Improvements are:
- Pulling the (untranslated) error message out of the message sentence. We really want the error message to be at the end so we'll force the translators to translate it as a prefix.
- Remove extra spaces at the end.
- Remove Python logic from within the i18nc call, since gettext doesn't understand that.

Contributes to issue CURA-5741.
 2018-10-08 15:03:21 +02:00
Diego Prado Gesto
41add97b13 Add Toolbox shortcut to the TopHeader and align the stage tabs to the 
center.

Contributes to CURA-5784.
 2018-10-08 14:50:13 +02:00
Diego Prado Gesto
075a9a161f Create a component for the Views selector. This component contains the 
list of the views and also the shortcuts for the camera position.

The theme colors, sizes and the styles have been updated.

Contributes to CURA-5784.
 2018-10-08 12:57:16 +02:00
Diego Prado Gesto
3acfdadd12 Organize the components in a Column. Separate the TopHeader and place it 
below the application menu, using all the width.

Contributes to CURA-5784.
 2018-10-08 11:31:53 +02:00
Diego Prado Gesto
8bdd27183f Move TopBar to the Skeleton folder. 
Clean up the Cura.qml even more by moving some components to the
ApplicationMenu, where they are called.

Contributes to CURA-5784.
 2018-10-08 10:59:46 +02:00
Diego Prado Gesto
193f113851 Clean up Cura.qml: 
- Create a Skeleton folder where the main parts of the application will
be stored.
- Separate the top menus to a different file.

Contributes to CURA-5784.
 2018-10-08 10:33:01 +02:00
Sacha Telgenhof Oude Koehorst
374b0995d3
Changed bed size to 235x235mm (including the STL Mesh). Removed all M commands (M104, M140, M190, M109) from the custom start GCode, and removed all M commands (M104, M140, M106, M107) from the custom end GCode as Cura already generates these. Decreased the height position of the extruder (from 3 to 2mm) upon purging. Increased the height position of the extruder (from 10 to 20mm) after the print has finished. 2018-10-06 19:21:22 +09:00
fieldOfView
4e083c7c29 Fix QML typo 2018-10-05 21:51:08 +02:00
fieldOfView
8e6e749d96 Merge branch 'fix_unused_icon_metadata' into feature_add_printer_layout 2018-10-05 21:42:04 +02:00
fieldOfView
2fb7d8a253 Make the Add Printer dialog less spartan 2018-10-05 21:41:35 +02:00
fieldOfView
7c68829fcd Remove unused and incorrect "icon" metadata from definitions 
The "icon" metadata is not used, and in all cases points to non-existing files anyway.
 2018-10-05 15:57:30 +02:00
fieldOfView
94164c5865 Add Charon, Shapely, Trimesh and NetworkX to credits 2018-10-05 15:29:52 +02:00
Sacha Telgenhof Oude Koehorst
8eca0c574a
Altered the mesh bed so the Ender-3 logo is more noticeable. 2018-10-05 13:25:15 +09:00
Diego Prado Gesto
6abd43f690 Add Polish to the list of available languages. Forgotten by mistake. 2018-10-04 17:37:28 +02:00
fieldOfView
2c3b723070 Merge branch 'master' into feature_firmware_updater 2018-10-04 10:37:22 +02:00
Jason Scurtu
4d4f8d7358
Disable has_machine_quality for now.. 
Needs more adjustment
 2018-10-04 09:44:24 +02:00
Jason Scurtu
0f46e7d694
Add Anycubic 4Max profile 2018-10-03 22:09:13 +02:00
fieldOfView
c2558f91dd Remove UpgradeFirmware as supported machine action... 
because the plugin adds itself as a supported action
 2018-10-03 21:00:23 +02:00
fieldOfView
b7542a8ef8 Move Firmware Updater into a plugin of its own 2018-10-03 20:55:51 +02:00
Diego Prado Gesto
4ca63f84b8 Add missing quote. 
Contributes to CURA-5741.
 2018-10-03 16:57:26 +02:00
Ian Paschal
3ef6359930 Merge remote-tracking branch 'origin' into clean_print_job_info_block 2018-10-03 16:07:34 +02:00
alekseisasin
5cd4d741c9
Merge pull request #4267 from smartavionics/mb-extruder-cooling-fan-number 
Add machine_extruder_cooling_fan_number setting to specify print cooling fan for each extruder.
 2018-10-03 15:17:02 +02:00
fieldOfView
c4919d65f4 Merge branch 'master' into feature_firmware_updater 2018-10-03 14:02:24 +02:00
Jaime van Kessel
dabe747ec0 Merge branch 'CURA-5744-move-oauth-login' of github.com:Ultimaker/Cura 2018-10-03 13:25:09 +02:00
Lipu Fei
b97f4ea30c Merge remote-tracking branch 'origin/3.5' 2018-10-03 11:49:38 +02:00
Lipu Fei
c3e7e426ff Fix getDefaultVariantNode for UM2 
CURA-5790

UM2 has optional variant which depends on whether Olsson Block is
enabled. getDefaultVariantNode() should take that into account.
 2018-10-03 11:24:27 +02:00
Aleksei S
0edcd316d3 Merge branch 'master' of github.com:Ultimaker/Cura 2018-10-03 10:33:06 +02:00
Aleksei S
51e7b6c388 Change font style for active material in preferences 
CURA-5747
 2018-10-03 10:30:48 +02:00
fieldOfView
718ac0a307 Create firmware update progress window from QML 2018-10-03 09:17:51 +02:00
Ian Paschal
9caeddf824 Merge branch 'master' of https://github.com/Ultimaker/Cura into clean_print_job_info_block 2018-10-03 09:08:26 +02:00
Diego Prado Gesto
c0c66649b8 Merge branch '3.5' 2018-10-02 20:27:18 +02:00
Diego Prado Gesto
afccd38a5d Add preposition to be consistent with other strings. 
Contributes to CURA-5741.
 2018-10-02 17:48:25 +02:00
Diego Prado Gesto
04c72c0875 Merge branch '3.5' of git://github.com/Patola/Cura into Patola-3.5 2018-10-02 17:26:14 +02:00
fieldOfView
b4e186ce78 Disable close button while updating firmware 2018-10-02 17:14:22 +02:00
Diego Prado Gesto
a99241d20b Add missing quote. 
Contributes to CURA-5741.
 2018-10-02 15:53:06 +02:00
fieldOfView
91ee691c80 Merge branch 'master' into feature_firmware_updater 2018-10-02 15:10:44 +02:00
Jaime van Kessel
9970f0e752 Merge branch 'fix_polygon_connector_setting' of https://github.com/BagelOrb/Cura 2018-10-02 13:12:21 +02:00
Cláudio 'Patola' Sampaio
e457b2e67c Merge branch '3.5' of https://github.com/Ultimaker/Cura into 3.5 
Updated to push to upstream
 2018-10-02 07:01:39 -03:00
Cláudio 'Patola' Sampaio
6d17144766 Updated strings to Cura 3.5 2018-10-02 07:00:14 -03:00
alekseisasin
84c667265d
Merge pull request #4200 from BagelOrb/top_bottom_settings_enabled_function 
JSON fix: only enable skin settings when there is skin
 2018-10-02 11:21:15 +02:00