GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 14:59:03 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,251 Commits 295 Branches 268 Tags
Commit Graph

16251 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
937c2dfa8c Merge branch 'WIP_kill_extruder_manager' of github.com:Ultimaker/Cura 2018-10-09 11:05:21 +02: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
Jaime van Kessel
9e5b72c5b6 Merge branch 'fix_unnecessary_imports' of https://github.com/fieldOfView/Cura 2018-10-08 16:41:29 +02:00
Jaime van Kessel
d24437e60c
Merge pull request #4520 from Ultimaker/CURA-5793_fix_setting_value_templates 
[3.5] CURA-5793 fix setting value templates
 2018-10-08 16:04:51 +02:00
Lipu Fei
5ba60de209 Send extruder settings ordered by extruder position 
CURA-5799
 2018-10-08 16:01:51 +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
Lipu Fei
3965218501 Fix value templating for gcode 
CURA-5793

Fix GcodeStartEndFormatter to take the correct default_extruder_nr
instead of always using -1.
 2018-10-08 14:42:22 +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
alekseisasin
c947e4f432
Merge pull request #4485 from Ultimaker/CURA-5768_layer_view_skip_empty_layers 
Don't skip empty first layers in the layer view
 2018-10-08 11:56:35 +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
fieldOfView
94164c5865 Add Charon, Shapely, Trimesh and NetworkX to credits 2018-10-05 15:29:52 +02:00
Lipu Fei
88c19aa11d
Merge pull request #4478 from Ultimaker/CURA-5775_fix_crash_on_save_to_3mf 
[CURA-5775] Fix crash on save to 3MF
 2018-10-05 12:08:21 +02:00
Diego Prado Gesto
fc7c3390be Merge branch 'master' into CURA-5768_layer_view_skip_empty_layers 2018-10-05 10:52:23 +02:00
Diego Prado Gesto
866110d70c Take into account that can be empty layers below the model when the 
setting Remove empty layers is disabled.

The empty layers are skipped if they are at the bottom. Also keeps the
models printed with raft showing correclty.

Contributes to CURA-5768.
 2018-10-04 18:03:01 +02:00
Diego Prado Gesto
6abd43f690 Add Polish to the list of available languages. Forgotten by mistake. 2018-10-04 17:37:28 +02:00
Remco Burema
110d2daa81 [CURA-5775] The snaphot-creation of the UFP-writer should only be called when writing to UFP-files. 2018-10-04 15:54:22 +02:00
fieldOfView
04bca109ba Fix update/upgrade consistency 2018-10-04 12:48:35 +02:00
fieldOfView
5b2dc804ca Fix a crash when adding a printer part of a cluster 2018-10-04 12:43:42 +02:00
fieldOfView
28dc32adab Fix typing in GenericOutputController 2018-10-04 11:47:51 +02:00
Aleksei S
436860f841 Don't show prime tower shadow if only one extruder is enabled 
CURA-5740
 2018-10-04 11:36:02 +02:00
fieldOfView
2c3b723070 Merge branch 'master' into feature_firmware_updater 2018-10-04 10:37:22 +02:00
fieldOfView
477862d779 Fix code style and unused imports 2018-10-03 23:07:37 +02:00
fieldOfView
9ac744b9ba Remove unnecessary import and declaration of i18n in plugins 2018-10-03 22:00:24 +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
fieldOfView
61ffdf23d7 Fix MYPY/typing errors 2018-10-03 20:24:32 +02:00
Lipu Fei
d91d0fab10 Fix SimulationView: missing import 2018-10-03 17:27:21 +02:00
Diego Prado Gesto
4ca63f84b8 Add missing quote. 
Contributes to CURA-5741.
 2018-10-03 16:57:26 +02:00
Lipu Fei
7d7de32dbd Add ExtruderStack to GlobalStack in single extrusion machine fix 2018-10-03 16:53:07 +02:00
Jaime van Kessel
37eedb0256 Merge branch 'master' of github.com:Ultimaker/Cura 2018-10-03 16:37:34 +02:00
Jaime van Kessel
adf8285d20 Typing fixes 
Since I was stupid enough to touch it, I was also forced to boyscout the code.
 2018-10-03 16:36:58 +02:00
Diego Prado Gesto
a4e02a6eae Revert "Update date format" 
This reverts commit 959f698b038a189238c59eff69035a446382d74a.
 2018-10-03 16:27:30 +02:00
Diego Prado Gesto
e3721fe539 Revert "Format date strings to ISO YYYY/MM/DD in Toolbox" 
This reverts commit 254106bb264699174a8edcfc20e50e22c455ef32.
 2018-10-03 16:27:13 +02:00
Jaime van Kessel
2e529452dd Moved the actual adding of containers by script to initialize 
This ensures that when loading scripts (and checking they are valid) we don't start adding unneeded containers
 2018-10-03 15:58:16 +02:00
Lipu Fei
18cb21186c Merge remote-tracking branch 'origin/master' into WIP_kill_extruder_manager 2018-10-03 15:45:18 +02:00
Lipu Fei
254106bb26 Format date strings to ISO YYYY/MM/DD in Toolbox 
CURA-5762
 2018-10-03 15:39:25 +02:00
alekseisasin
742f135733
Merge pull request #4268 from smartavionics/mb-extruder-cooling-fan-number-gui 
Added extruder setting field for cooling fan number.
 2018-10-03 15:17:35 +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
fieldOfView
cf3d7df8a6 Fix showing progress 2018-10-03 13:59:46 +02:00
Jaime van Kessel
f3fdb46dba Add missing types 2018-10-03 13:33:30 +02:00
Jaime van Kessel
9986e38dca Merge branch 'master' of github.com:Ultimaker/Cura 2018-10-03 13:25:19 +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
Aleksei S
7a87783237 Merge branch 'master' of github.com:Ultimaker/Cura 2018-10-03 13:24:20 +02:00