3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 15:13:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
15071 commits 307 branches 272 tags 787 MiB
Commit graph

4282 commits

Author SHA1 Message Date
Ian Paschal
2c291e02be Revert "Fixes for StartSliceJob" 
This reverts commit 9ec5770a1c.
 2018-07-06 10:54:24 +02:00
Ian Paschal
75d5828f5f
Merge branch 'master' into fix_tests_cura_engine_backend 2018-07-06 09:48:07 +02:00
Mark
183cd0182d
Merge pull request #4028 from Ultimaker/fix_style 
Fix code style
 2018-07-05 21:22:53 +02:00
Ian Paschal
b6364b2804 Fixes for X3DReader 2018-07-05 16:35:57 +02:00
Ian Paschal
3321b23925 Fixes for UM3NetworkPrinting 2018-07-05 16:31:56 +02:00
Ghostkeeper
96896088c3
Add spaces around equals operators 
As per our code style regulations.
 2018-07-05 16:27:52 +02:00
Ian Paschal
85be9cea07 Fixes for Toolbox 2018-07-05 16:06:37 +02:00
Ian Paschal
cfae634061 Fixes for SliceInfo 2018-07-05 15:54:21 +02:00
Ian Paschal
d0c68f8e94 Fixes for WindowsRemovableDrivePlugin 2018-07-05 15:46:16 +02:00
Ian Paschal
2f8debc985 Fixes for FlavorParser 2018-07-05 15:45:48 +02:00
Diego Prado Gesto
87261b2754
Merge pull request #4020 from Ultimaker/add_test_versionupgrade_version 
Add test for the version number being incremented
 2018-07-05 15:36:15 +02:00
Diego Prado Gesto
c0985bec2a Add the data to the tests. 2018-07-05 15:32:43 +02:00
Ian Paschal
9ec5770a1c Fixes for StartSliceJob 2018-07-05 15:31:08 +02:00
Ghostkeeper
7b284355fb
Revert "Fix code-style in CuraEngineBackend" 
This reverts commit 7d7a51d772. That commit broke the start-up sequence.
 2018-07-05 15:24:55 +02:00
Ian Paschal
07e92ead0b last fixes for CuraEngineBackend 2018-07-05 15:20:38 +02:00
Diego Prado Gesto
8afc49e902 Add style to a variable in X3Reader 2018-07-05 14:41:49 +02:00
Lipu Fei
b0f1a6d859 Use Label delegate to avoid overlapping texts 
CURA-5544
 2018-07-05 14:36:41 +02:00
Diego Prado Gesto
c738f306fb Fix style in some components 2018-07-05 14:35:12 +02:00
Andreea Scorojitu
87fd4c9e70 Add color to text in toolboxFooter, CURA-5544 
"You will need to restart Cura before changes in packages have effect." wasn't visible in Ultimaker darktheme, color has been added to the label, CURA-5544.
 2018-07-05 12:44:11 +02:00
Ian Paschal
6f20b9219d code style fixes 2018-07-05 11:57:13 +02:00
Ian Paschal
1aac301f75 additional code style fixes 2018-07-05 11:46:21 +02:00
Ian Paschal
50da6d5176 Fix some code-style 2018-07-05 11:36:36 +02:00
Mark
e1bc5d0f74 fix typing 2018-07-05 11:25:22 +02:00
Diego Prado Gesto
7d7a51d772 Fix code-style in CuraEngineBackend 2018-07-05 08:04:19 +02:00
Ghostkeeper
b149ef57fd
Add test for the version number being incremented 2018-07-04 17:18:01 +02:00
Ian Paschal
d4aaec7355 CURA-5537 Style improvements 2018-07-04 12:51:01 +02:00
Ian Paschal
7d30cee205 Revert "Add dummy details for when there is no selection" 
This reverts commit 2e3528d9b2.
 2018-07-04 11:36:56 +02:00
Lipu Fei
5f2cbd4440
Merge pull request #4015 from Ultimaker/CURA-5537_toolbox_style_improvements 
CURA-5537 improve styling of toolbox
 2018-07-03 16:05:51 +02:00
Lipu Fei
2e3528d9b2 Add dummy details for when there is no selection 
CURA-5521
 2018-07-03 15:58:54 +02:00
Ian Paschal
bc05839940 CURA-5537 improve styling of toolbox 2018-07-03 15:54:20 +02:00
Diego Prado Gesto
ff6bc9de4e Fix some more code-style 2018-07-03 13:09:05 +02:00
Diego Prado Gesto
7714515204 Merge branch 'master' of github.com:Ultimaker/Cura 2018-07-03 12:06:23 +02:00
Diego Prado Gesto
762a1b1bfd Fix code-style 2018-07-03 12:06:06 +02:00
Lipu Fei
293b803dd3 Fix preferences upgrade in 3.4 to 4.0 2018-07-03 10:40:57 +02:00
Diego Prado Gesto
e983a9a9e7 Merge branch 'master' of github.com:Ultimaker/Cura 2018-07-03 10:40:00 +02:00
Diego Prado Gesto
3c57068cf4 CURA-5034 Fix a typo in the method call. 2018-07-03 10:38:44 +02:00
Aleksei S
47300eabe7 Merge branch 'master' of github.com:Ultimaker/Cura 2018-07-03 10:24:17 +02:00
Aleksei S
7b63dc7b10 Changed machine and extruder_train version in VersionUpgrade 34to40 2018-07-03 10:17:42 +02:00
Mark
c0e97b9529 Merge branch '3.4' 2018-07-02 16:37:04 +02:00
Jack Ha
7058ddbb66 Corrected float/int mixups and allow catching temperature before the layers start. CURA-5491 2018-07-02 16:35:49 +02:00
Mark
c6b31b3b0c
Merge pull request #3901 from fieldOfView/fix_toolbox_flicking 
Limit flicking the Toolbox scrollviews to vertical only
 2018-07-02 16:35:45 +02:00
alekseisasin
debe142c18
Merge pull request #3914 from Ultimaker/CURA-5334_extruder_def_for_all 
CURA-5334 Add extruder definitions for all single-extrusion machines
 2018-07-02 15:56:45 +02:00
Jack Ha
a283dd1d94 Merge branch 'master' of github.com:Ultimaker/Cura 2018-07-02 15:14:14 +02:00
Jack Ha
17c4b65453 Fix pause at height that uses new latest temperature CURA-5491 2018-07-02 15:13:44 +02:00
Jack Ha
3761123513 Merge branch 'master' into CURA-5334_extruder_def_for_all 2018-07-02 14:11:24 +02:00
Ian Paschal
adc7fc58e9 Fixed method naming conflict 2018-07-02 13:53:35 +02:00
Ian Paschal
b55abee783 Code style did not rename this variable 2018-07-02 13:05:22 +02:00
Ian Paschal
8f7370db6c Merge remote-tracking branch 'origin/master' into feature_send_material_profiles 2018-07-02 12:37:56 +02:00
Diego Prado Gesto
0692192d58 Merge branch '3.4' 2018-07-02 09:10:57 +02:00
Lipu Fei
dc8d9e0f96
Merge branch 'master' into mypy_fixes 2018-06-29 13:45:55 +02:00