GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-10 16:51:50 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,486 Commits 295 Branches 268 Tags
Commit Graph

2486 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas-Karl Pietrowski
7d2b329e78 Just a stupid mistake 
.reverse() does not return anything (None)
 2016-04-21 20:23:07 +02:00
Thomas-Karl Pietrowski
3a61cf3152 Little typo 2016-04-21 19:41:10 +02:00
Thomas-Karl Pietrowski
1a52454165 This should be fine now.. 2016-04-21 19:09:15 +02:00
Thomas-Karl Pietrowski
61069e9a71 Making the fix working with a list of PATHS seperated by os.pathsep 
Needs testing but should work. (fingers crossed)
 2016-04-21 17:34:33 +02:00
Ghostkeeper
134867f833
Fix indenting tabs -> spaces 
Contributes to issue CURA-695.
 2016-04-20 17:18:10 +02:00
Tim Kuipers
4913f89b9b Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-04-20 15:25:38 +02:00
Tim Kuipers
6799a76a7c JSON fix: combing mode default enum value (CURA-694) 2016-04-20 15:25:23 +02:00
Ghostkeeper
067dda821f Merge pull request #711 from thopiekar/master-marker-for-nvidia-workaround 
[master] Adding marker for the Nvidia workaround
 2016-04-20 09:36:04 +02:00
Thomas-Karl Pietrowski
37ba88351a Adding marker for the Nvidia workaround 2016-04-19 20:24:56 +02:00
Thomas-Karl Pietrowski
286673e812 Making WORKAROUND a true marker 2016-04-19 20:18:07 +02:00
Thomas-Karl Pietrowski
98c84798c6 Making sure we got the realpath when using an absolute path 2016-04-19 20:17:20 +02:00
Thomas-Karl Pietrowski
8c0d7aea8a Merge branch 'pythonpath-fix-reworked' of https://github.com/thopiekar/Cura into pythonpath-fix-reworked 2016-04-19 19:39:04 +02:00
Thomas-Karl Pietrowski
102e13b152 Doing the check the other way round.. 2016-04-19 19:35:31 +02:00
Thomas Karl Pietrowski
e040029a41 Just a little typo 2016-04-19 19:18:05 +02:00
Thomas-Karl Pietrowski
839bc1fec8 Making PR #708 more concrete 
Now a check is made whether PYTHONPATH is set at all. So 'normal' installations will pass that section.
After that sys.path is checked whether the last element is PYTHONPATH.
If it is PYTHONPATH will be moved before entry at sys.path[1], because sys.path[0] is os.curdir. Inserting PYTHONPATH in front of it might be unsave.
 2016-04-19 19:11:14 +02:00
Thomas-Karl Pietrowski
a8e13f13ba Add missing import of 'os' 2016-04-19 18:56:58 +02:00
Thomas-Karl Pietrowski
e7e1dab53d Merge remote-tracking branch 'upstream/master' into pythonpath-fix-reworked 2016-04-19 18:54:27 +02:00
Arjen Hiemstra
c2ac0e8217 Fix resource paths after Uranium API change 
Contributes to CURA-1390
 2016-04-19 18:11:11 +02:00
Tim Kuipers
3e94c37f57 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-04-19 17:39:46 +02:00
Tim Kuipers
e7e4512fd0 JSON: fix: moved line distance computation from engine to frontend (CURA-1317) 2016-04-19 17:39:30 +02:00
Arjen Hiemstra
c329c2e12d Do not try to recreate the socket when we are shutting down anyway 
This prevents issues where closing the socket triggers socket creation
and then a deadlock occurs.

Contributes to CURA-1391
 2016-04-19 16:52:22 +02:00
Jaime van Kessel
02e02a8f98 Added way to update the head position 
CURA-1339
 2016-04-19 15:30:34 +02:00
Jaime van Kessel
d33a75906a Progress is now only emitted if it changed 
CURA-1339
 2016-04-19 12:04:22 +02:00
Youness Alaoui
df8207747a Force PYTHONPATH to be in the top of the sys.path list. 
This fixes https://github.com/Ultimaker/Cura/issues/704
 2016-04-18 14:42:29 -04:00
fieldOfView
919e2f55e9 Replace "notice" icon with an icon that is less jarring and differs more in shape with the "reset" icon 
Contributes to CURA-1176
 2016-04-18 17:39:28 +02:00
Tim Kuipers
083c6dc630 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-04-18 16:49:12 +02:00
Tim Kuipers
1ffcb8419a JSON: Enable Combing ==> Combing Mode (CURA-694) 2016-04-18 16:49:02 +02:00
Jaime van Kessel
232e447a74 Added bq firmware (which caused merge issue) 2016-04-18 15:48:20 +02:00
Jaime van Kessel
6abeac5c44 Added comment about us violating the API 
CURA-1339
 2016-04-18 15:26:24 +02:00
Jaime van Kessel
71b4c983d0 Merge pull request #700 from thopiekar/master-bq_hephestos2-firmware 
USBPrinting: Adding entry for BQ Hephestos 2 firmware
 2016-04-18 15:21:49 +02:00
Jaime van Kessel
2c489ed054 Connection state signal is now connected before connect is called 
CURA-1339
 2016-04-18 15:05:21 +02:00
Jaime van Kessel
8a47903374 Changed namespace of usbprintermanager (QML) to Cura from UM 
CURA-1339
 2016-04-18 15:03:13 +02:00
Jaime van Kessel
a59c113887 Added busy & error state to ConnectionState 
CURA-1339
 2016-04-18 14:47:51 +02:00
Jaime van Kessel
fb52d39936 Changed enum values to lowerCamelCase 
CURA-1339
 2016-04-18 14:43:04 +02:00
Jaime van Kessel
96e821cc3d PrinterOutputDevice now uses safer super().__init 
CURA-1339
 2016-04-18 13:27:36 +02:00
Jaime van Kessel
0939262ffe Removed stray debug code 
CURA-1339
 2016-04-18 11:47:23 +02:00
Jaime van Kessel
b31106a666 Added missing (renamed) file 
CURA-1339
 2016-04-18 11:45:14 +02:00
Jaime van Kessel
6ad926b9b8 connect & close are now pure virtual 
CURA-1339
 2016-04-18 11:38:57 +02:00
Jaime van Kessel
0015d9d027 Documented signals 
CURA-1339
 2016-04-18 11:37:08 +02:00
Jaime van Kessel
94d3309a35 Removed duplicate bedTemperature declaration 
CURA-1339
 2016-04-18 11:33:43 +02:00
Jaime van Kessel
8a94739de0 Raft line widths now inherit from line_width 
CURA-695
 2016-04-15 16:08:23 +02:00
Jaime van Kessel
ef9be8a2d8 Merge branch '2.1' of https://github.com/Ultimaker/Cura 2016-04-15 14:56:24 +02:00
Jaime van Kessel
d606d6dfe4 Merge pull request #701 from THeijmans/2.1 
UM2+ profile improvements
 2016-04-15 14:43:06 +02:00
Tom Heijmans
7ce5c6c6bc Fixed inheritance issues 2016-04-15 14:36:13 +02:00
Tom Heijmans
00305f1c53 Updated inheritance functions for um2+ 2016-04-15 13:35:25 +02:00
Tom Heijmans
3776d3c6d2 Updated material & UM2+ profiles 2016-04-15 13:33:30 +02:00
Thomas-Karl Pietrowski
efb5c668fe USBPrinting: Adding entry for BQ Hephestos 2 firmware 2016-04-14 17:13:29 +02:00
Jaime van Kessel
c2b1753d25 Updated documentation 
CURA-1339
 2016-04-14 15:59:10 +02:00
Jaime van Kessel
6f7b80299e Added warning logging 
CURA-1339
 2016-04-14 15:46:16 +02:00
Jaime van Kessel
6b7fb894f8 Added moveHead to usb printing 
And ensured that wizard page uses correct version again

CURA-1339
 2016-04-14 14:21:22 +02:00