3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 21:27:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
10168 commits 307 branches 270 tags 779 MiB
Commit graph

2446 commits

Author SHA1 Message Date
ChrisTerBeke
7efe3a3b9e Merge branch 'master' into feature_top_right_layer_view 2017-09-11 11:50:18 +02:00
Lipu Fei
08882a3f12 Fix LayerView text colour 
CURA-4212
 2017-09-11 11:26:22 +02:00
Lipu Fei
f4bfa499d4 Remove debugging line 
CURA-4284
 2017-09-11 11:23:33 +02:00
Lipu Fei
94a8d2dfc6 Fix LayerView text colour 
CURA-4212
 2017-09-11 11:15:56 +02:00
ChrisTerBeke
98babfade7 CURA-4284 remove debug logging 2017-09-11 11:11:45 +02:00
Lipu Fei
e26be6b14a Merge remote-tracking branch 'master' 2017-09-11 11:11:24 +02:00
Lipu Fei
96678b11ca Update LayerView slider according to new style 
CURA-4212
 2017-09-11 11:10:56 +02:00
ChrisTerBeke
5c30658012 CURA-4284 fix relationship dependencies in per object settings 2017-09-11 10:56:34 +02:00
Lipu Fei
b2eead7736 Resolve merge conflicts from master 
CURA-4212
 2017-09-11 10:32:34 +02:00
ChrisTerBeke
5bb09d73fc clean 2017-09-11 09:46:37 +02:00
ChrisTerBeke
2d8fca8ac4 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-09-11 09:14:56 +02:00
ChrisTerBeke
d802c0bd26 CURA-4284 some code cleanup while debugging 2017-09-11 09:14:50 +02:00
Ruben D
234e724fe9
Merge branch 'fix_abort_sequence' of https://github.com/fieldOfView/Cura into fieldOfView-fix_abort_sequence 2017-09-10 15:10:11 +02:00
Lipu Fei
c8a92f2c59 Move LayerView slider down 
CURA-4212
 2017-09-07 17:04:14 +02:00
Lipu Fei
750f1ce158 Make extruder icons on LayerView panel round 
CURA-4212
 2017-09-07 16:24:48 +02:00
Lipu Fei
dd62367937 Move View mode button and LayerView panel to top right 
CURA-4212
 2017-09-07 16:24:43 +02:00
Lipu Fei
40b60a2d95 Fix colour for LayView panel and per object settings panel 
CURA-4148
 2017-09-06 16:23:29 +02:00
fieldOfView
371ca36047 Remove home bed from abort sequence 
On printers that home the bed to the bottom (ie: printhead moves towards the bed), homing the bed when aborting a print could cause the printhead to crash into the aborted print.
 2017-09-06 13:21:17 +02:00
Lipu Fei
fc7207e77e Remove "Sync" button 
CURA-4211
 2017-09-06 12:17:40 +02:00
Lipu Fei
e15a96263d Update extruder button styles 
CURA-4211
 2017-09-06 12:00:53 +02:00
Jaime van Kessel
81b6675518 Improved logging for network output 2017-09-06 11:15:40 +02:00
Jaime van Kessel
295a4af22b Merge pull request #2380 from fieldOfView/fix_camera_leak 
Prevent a possible memory leak while showing a stuck camera stream
 2017-09-05 09:19:21 +02:00
Jaime van Kessel
bed74dab37 Merge branch 'master' of github.com:Ultimaker/Cura 2017-09-04 17:37:06 +02:00
Jaime van Kessel
08766ee66f Fix wrong indentation for camera view 2017-09-04 17:36:44 +02:00
Lipu Fei
f803e72c18 Use Screen.devicePixelRatio for plugin browser 
CURA-4279
 2017-09-04 17:25:30 +02:00
fieldOfView
7e60d459b4 Prevent a possible memory leak while showing a stuck camera stream 2017-09-04 15:47:44 +02:00
Lipu Fei
0358b1fcae Fix User-Agent header in PluginBrowser 2017-09-04 09:23:46 +02:00
Ruben D
3af37d5dbc
Fix token replacement in extruder start and end g-codes 
Don't perform the replacement in the global stack for these settings, but in the extruder stacks.

Fixes #2331.
 2017-09-03 16:41:02 +02:00
alekseisasin
24c9dc9bee Merge branch 'feature_light_colours_icons' 
CURA-4148
 2017-09-01 19:25:29 +02:00
Jaime van Kessel
a652ddbdd8 Reset lastResponseTime when trying to connect 
CURA-3869
 2017-09-01 14:54:57 +02:00
Jaime van Kessel
be1b5cd83a Cura no longer crashes when writing to full SD drive. 
It instead tells warns the user and logs the event. CURA-3909
 2017-09-01 14:43:12 +02:00
Jaime van Kessel
ce52ae81ef Merge pull request #2354 from fieldOfView/fix_machine_settings_headpolygon 
Fix setting machine head polygon in Machine Settings
 2017-09-01 13:14:54 +02:00
Lipu Fei
ceccca8244 Reduce the width of the license window 
CURA-4222
 2017-09-01 10:18:27 +02:00
fieldOfView
3c64175948 Fix setting machine head polygon in Machine Settings 
This typo was spotted by @McAJBen. Fixes #2347
 2017-08-31 22:57:50 +02:00
alekseisasin
7c637029b6 Merge pull request #2334 from fieldOfView/feature_target_hotend_temperature 
Show target hotend temperatures
 2017-08-31 13:46:55 +02:00
Ghostkeeper
3951239513
Don't emit devices changed signal if remove wasn't successful 
The same could be done for adding but let's keep it at this for now.

Hopefully fixes #2238.
 2017-08-31 13:24:40 +02:00
alekseisasin
fa61f5c2ad Merge pull request #2340 from Ultimaker/feature_license_for_plugins 
Let user accept/decline a plugin license if present
 2017-08-31 10:26:40 +02:00
alekseisasin
088092c7bc Added min and max dialog size 
CURA-4222
 2017-08-30 17:07:43 +02:00
Ghostkeeper
831a91afff
Add test for upgrading preference file 
Contributes to issue CURA-4148.
 2017-08-30 16:08:50 +02:00
Ghostkeeper
d929359d77
Implement version upgrade 2.7 to 3.0 
The theme 'cura' was renamed to 'cura-light', so that needs to be updated in the user's preferences.

Contributes to issue CURA-4148.
 2017-08-30 16:08:50 +02:00
Jaime van Kessel
053fdd679d Don't send duplicated materials to printer 
CURA-4199
 2017-08-30 15:52:31 +02:00
Jaime van Kessel
3b2c528595 If no licence text is set, use empty string 
It doesn't really matter that much, but QT complaining about it annoyed me.
CURA-4222
 2017-08-30 15:07:58 +02:00
Jaime van Kessel
6d40882bdc Ensure that installing files works on non Windows os'es as well 
CURA-4222
 2017-08-30 15:06:08 +02:00
Lipu Fei
679c7dcfda Let user accept/decline a plugin license if present 
CURA-4222

If a downloaded plugin contains a license file, a dialog which contains
the license information will pop up. The user has to accept the license
before he/she can install the plugin.

If a plugin doesn't have a license file, after it is downloaded, it will
be installed directly just like before.
 2017-08-30 14:09:51 +02:00
fieldOfView
85b20ab16b Get UM3 target hotend temperatures 2017-08-29 11:05:36 +02:00
Lipu Fei
0eb63637d4 Merge branch 'master' into feature_dark_colours_icons 2017-08-28 16:54:36 +02:00
Ghostkeeper
a29c9307de
Merge branch '2.7' 2017-08-28 16:46:42 +02:00
Ghostkeeper
08f69d168d
Add Chinese language entry to change log 
Contributes to issue CURA-4000.
 2017-08-28 16:46:26 +02:00
Ghostkeeper
7a8956fd0e
Merge branch '2.7' 2017-08-28 16:21:40 +02:00
Jaime van Kessel
8a0f6d969e Merge branch '2.7_stack_context' of github.com:Ultimaker/Cura into 2.7 2017-08-28 16:05:59 +02:00