Commit graph

11963 commits

Author SHA1 Message Date
Jaime van Kessel
c4f5c970e5 Removed uneeded logging 2017-09-19 16:39:51 +02:00
Jaime van Kessel
e5eebd7737 Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0 2017-09-19 14:02:38 +02:00
Jaime van Kessel
e5f3d45385 When project loading needs to create a new machine, also create a new definition changes
CURA-4345
2017-09-19 14:02:01 +02:00
Ghostkeeper
8a1b5d3cda
Update translation templates again
Last minute changes...

Contributes to issue CURA-4341.
2017-09-19 13:36:56 +02:00
Ghostkeeper
d47bc710bf
Last minute string changes
Some new message that still needed to be in...

Contributes to issue CURA-4341.
2017-09-19 13:36:56 +02:00
Ghostkeeper
19222a3221
Update translation templates for 3.0
These are the files that should be translated by our translators for the 3.0 release.

Contributes to issue CURA-4341.
2017-09-19 13:36:56 +02:00
Ghostkeeper
f231c73072
Add translation texts for future features
These texts are meant to be included in the final release, but the features aren't ready yet.

Contributes to issue CURA-4341.
2017-09-19 13:36:56 +02:00
Ghostkeeper
b94bcdfa91
Remove duplicate entry
This happens because the last bits are obtained separately from plug-in JSON files that are manually tacked on the end by a script. The script doesn't check for duplicates.

Contributes to issue CURA-4341.
2017-09-19 13:36:56 +02:00
Ghostkeeper
8cfe65787f
Update translation templates for 3.0 release
These are generated by calling 'make extract-messages' and then modifying the headers a bit.

Contributes to issue CURA-4341.
2017-09-19 13:36:50 +02:00
Mark
03a159e423 Add some margin for the helper boxes, not perfect yet
CURA-4303
2017-09-19 11:36:05 +02:00
Jaime van Kessel
4e897a9a00 Re-enabled the progress circle
A fix in Uranium made it possible for a timer to function, which ensures that it no longer breaks on linux

CURA-4343
2017-09-19 11:31:28 +02:00
Mark
db072eae8e Add some margin for the helper boxes, not perfect yet
CURA-4303
2017-09-19 10:11:41 +02:00
Jaime van Kessel
d49e84830b Removed spinner as it caused the crash
We might want to consider getting the spinner back, but for the moment it's best left out

CURA-4343
2017-09-19 09:51:07 +02:00
Jaime van Kessel
d5c9ebd58a Setting message now also forces repaint
CURA-4343
2017-09-19 09:45:28 +02:00
Jaime van Kessel
276f05bedb Added flush to splash screen
This greatly reduces the issues with it CURA-4343
2017-09-19 09:45:28 +02:00
Jaime van Kessel
847cd1b293 Removed spinner as it caused the crash
We might want to consider getting the spinner back, but for the moment it's best left out

CURA-4343
2017-09-19 09:43:35 +02:00
Jaime van Kessel
e0480528a0 Setting message now also forces repaint
CURA-4343
2017-09-19 09:38:08 +02:00
Jaime van Kessel
fbeee47fdb Merge branch 'master' of github.com:Ultimaker/Cura 2017-09-19 09:32:44 +02:00
Jaime van Kessel
e1ea8df84c Added flush to splash screen
This greatly reduces the issues with it CURA-4343
2017-09-19 09:32:13 +02:00
ChrisTerBeke
3be1b8ddf9 CURA-4303 fixes after comments on 1st commit 2017-09-18 17:39:14 +02:00
ChrisTerBeke
b7671f3da7 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-09-18 17:24:05 +02:00
ChrisTerBeke
e18b24add2 CURA-4269 use z offset decorator to keep project file positions below bed 2017-09-18 17:24:00 +02:00
Ghostkeeper
0060909117
Use named arguments for i18n string
Otherwise the i18n system can't figure out which %s belongs to which parameter.

Contributes to issue CURA-4341.
2017-09-18 17:13:01 +02:00
Ghostkeeper
3150420160
Fix i18n with replaced texts
Also added a description for the translator.

Contributes to issue CURA-4341.
2017-09-18 17:01:15 +02:00
ChrisTerBeke
b386bda2c8 more fixes for reverting 11ebdf7303 2017-09-18 15:38:31 +02:00
ChrisTerBeke
3db04c918f fixes for reverting 11ebdf7303 2017-09-18 15:37:17 +02:00
Jaime van Kessel
e5629f26de Merge branch 'master' of github.com:Ultimaker/Cura 2017-09-18 15:31:12 +02:00
Jaime van Kessel
a3b6ced5e5 Changed titles of unable to slice messages
This makes it a bit clearer what is going on and what the "source" of the message is.

CURA-4332
2017-09-18 15:30:40 +02:00
ChrisTerBeke
18dd63a710 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-09-18 15:16:19 +02:00
ChrisTerBeke
9553235b42 CURA-4303 finish infill slider, images, gradual checkbox, bindings 2017-09-18 15:15:59 +02:00
Jaime van Kessel
ec57176864 Merge pull request #2441 from pieterbos/master
Improve Prusa i3 MK2 start GCode
2017-09-18 14:51:42 +02:00
alekseisasin
245796eb08 Merge pull request #2398 from Ghostkeeper/feature_ironing_only_highest_layer
Add setting to only iron the highest layer of a mesh
2017-09-18 14:28:24 +02:00
Diego Prado Gesto
e8553e8e69 Fixed double messages and rearrange some code - CURA-4224 2017-09-18 11:47:23 +02:00
Ghostkeeper
6c2bd10a20
Remove redundant feedrate override
The default in ultimaker.def.json is also 45, so this is not necessary.
2017-09-18 11:18:50 +02:00
Ghostkeeper
050474ef9e
Merge branch 'master' of github.com:Ultimaker/Cura 2017-09-18 11:17:54 +02:00
ChrisTerBeke
e8df185261 Merge branch 'master' into WIP_feature_infill_slider 2017-09-18 11:02:30 +02:00
ChrisTerBeke
eada055199 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-09-18 10:51:35 +02:00
ChrisTerBeke
f07f7a2f12 Remove logging 2017-09-18 10:51:32 +02:00
ChrisTerBeke
4ca5987ca8 CURA-4269 added a flag to determine wether auto drop should be executed or not 2017-09-18 10:50:52 +02:00
Jaime van Kessel
299c47b024 Merge pull request #2444 from Taz8du29/patch-1
Minor formatting change in README.md
2017-09-18 10:35:34 +02:00
ChrisTerBeke
86e5a1ed97 CURA-4182 tweak slider height to fix text cut off 2017-09-18 09:39:08 +02:00
Ghostkeeper
2901b832a5
Sync setting visibility with XmlMaterialProfile
This is why we shouldn't do double-data.
2017-09-18 09:00:39 +02:00
Mark Burton
ec9441df99 Added infill_offset_x and infill_offset_y settings. 2017-09-18 07:54:43 +01:00
Taz8du29
176fef8dbe Minor formatting change in README.md 2017-09-17 17:46:11 +02:00
Pieter Bos
ff17b7c417
Improve Prusa MK2 start GCode 2017-09-17 00:04:50 +02:00
fieldOfView
3f903d2c76 Add menu item to reset the camera 2017-09-16 10:05:45 +02:00
Mark
2502038f76 Revert "CURA-4321 make sidebar a tad smaller"
This reverts commit 4aa8d38bd3.
2017-09-15 16:51:38 +02:00
Mark
74c24652e9 Revert "Tweak sidbar size so text is not cut off"
This reverts commit b39fece86a.
2017-09-15 16:50:48 +02:00
Mark
1f3fa49ceb Merge branch 'master' of github.com:Ultimaker/Cura 2017-09-15 16:48:58 +02:00
Mark
854c915502 Tweaked margins and cleanup
CURA-4182
2017-09-15 16:48:49 +02:00