3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 20:28:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
12148 commits 306 branches 270 tags 779 MiB
Commit graph

12148 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
alekseisasin
a82fc6f361 Merge branch 'master' of github.com:Ultimaker/cura 2017-09-15 16:39:19 +02:00
alekseisasin
37869a8b14 Removed unused code. Shifted the last print quality number a bit to the left 
CURA-4182
 2017-09-15 16:36:00 +02:00
Diego Prado Gesto
aa6c34a8fd Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-09-15 16:06:16 +02:00
Diego Prado Gesto
255eb2f377 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-09-15 16:05:28 +02:00
Diego Prado Gesto
f139bbe3f1 Fixed some missed references to the previous variables - CURA-4232 2017-09-15 16:05:24 +02:00
Ghostkeeper
e8691d29a7
Install CuraVersion.py also to site-packages on non-Debian 
Similar to the rest of Cura.

Contributes to issue CURA-3368.
 2017-09-15 16:05:22 +02:00
Ghostkeeper
fa266969eb
Don't install to /cura subdirectory of site-packages 
That's already done by the directory name itself.

Contributes to issue CURA-3368.
 2017-09-15 16:05:22 +02:00
Ghostkeeper
6484df3e60
Install to correct site-packages on non-Debian computers 
Because dist-packages is a Debian thing only.

Contributes to issue CURA-3368.
 2017-09-15 16:05:22 +02:00
Mark
b39fece86a Tweak sidbar size so text is not cut off 
CURA-4321
 2017-09-15 15:53:20 +02:00
alekseisasin
cdde6da792 Merge branch 'master' of github.com:Ultimaker/cura 2017-09-15 13:28:29 +02:00
alekseisasin
83e5c5c053 Removed unused tags from cura-light theme.json 
CURA-4321
 2017-09-15 13:27:09 +02:00
Ghostkeeper
e092b908a0
Add message content for WriteRequestFailedErrors 
The content of the exception is directly put inside a message, so we should give the exception a message.
 2017-09-15 11:06:32 +02:00
Diego Prado Gesto
0e1b9d8c5d Changed the way in which print times are shown in Sidebar - CURA-4232 2017-09-15 10:46:01 +02:00
Ghostkeeper
6083989777
Merge branch 'master' of github.com:Ultimaker/Cura 2017-09-15 09:32:15 +02:00
alekseisasin
aa0ade2e74 Merge branch 'master' of github.com:Ultimaker/cura 2017-09-14 18:05:28 +02:00