GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-16 06:28:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,489 Commits 290 Branches 260 Tags
Commit Graph

2489 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
5b04787106 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-23 12:04:19 +01:00
Jaime van Kessel
db628760d8 Comment in start g-code for umo now has correct value 2016-03-23 12:04:08 +01:00
fieldOfView
fd29baccd4 Fix backplate texture of UM2Ex with Olsson block 
CURA-1239
 2016-03-22 22:53:15 +01:00
Ghostkeeper
4725b1b074
Rename 'Other Wall' to 'Inner Wall' 
This is both more correct and more consistent with the descriptions.

Contributes to issue CURA-1212.
 2016-03-22 18:00:46 +01:00
fieldOfView
c37c63fa89 Add tooltip to "customised values" indicator 
CURA-909
 2016-03-22 17:24:35 +01:00
Ghostkeeper
a89e128f72
Add period after description 
This is in line with most other descriptions.

Contributes to issue CURA-1190.
 2016-03-22 17:02:42 +01:00
Ghostkeeper
a60f63c71b Add internationalisation for ChangeLog plug-in 
Some of these strings were not translated.

Contributes to issue CURA-1190.
 2016-03-22 15:38:01 +01:00
Ghostkeeper
a056ddc885
Add period at end of plug-in description 
For consistency. All other plug-ins have this (no really, now).

Contributes to issue CURA-1190.
 2016-03-22 15:10:57 +01:00
Ghostkeeper
b457af1081
Add period at end of plug-in description 
All other plug-in descriptions have that too. So for consistency.

Contributes to issue CURA-1190.
 2016-03-22 15:07:05 +01:00
Ghostkeeper
94b8ff7492
Add period at the end 
The English translation had properly a period at the end of this sentence. German must too, for consistency.

Contributes to issue CURA-1190.
 2016-03-22 15:06:13 +01:00
Ghostkeeper
b67ba04222
Fix key in metadata 
The description key was broken (typo).

Contributes to issue CURA-1190.
 2016-03-22 15:05:22 +01:00
Ghostkeeper
47e856c927
Add period at end for consistency 
Other plugin descriptions also have a period at the end.

Contributes to issue CURA-1190.
 2016-03-22 13:35:28 +01:00
Ghostkeeper
6525e4637e Fix some of the translations 
In particular, I removed some fuzziness and uncommented some outcommented translations.

Contributes to issue CURA-1190.
 2016-03-22 13:04:17 +01:00
Jaime van Kessel
8f9210af6b Socket is now re-created regardless of process state 
The previous fix for this could cause an infinate slice loop on windows. CURA-1133
 2016-03-22 11:29:16 +01:00
Jaime van Kessel
dce4fa9479 Added forced re-creation of socket 
CURA-1133
 2016-03-21 16:32:10 +01:00
fieldOfView
6b2b948623 Prevent qml errors when adding/deleting profiles 
CURA-855
 2016-03-21 16:28:58 +01:00
Jaime van Kessel
174f150ead Error now also causes terminate to be called 
CURA-1133
 2016-03-21 15:44:27 +01:00
Jaime van Kessel
1020ed5dc1 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-21 15:36:36 +01:00
Jaime van Kessel
3ecd746f21 Added even more logging 
CURA-1133
 2016-03-21 15:36:07 +01:00
Ghostkeeper
ebafaad411 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-03-21 15:33:33 +01:00
Ghostkeeper
511d0be9c3
Complete the renaming of a parameter 
This caused layer view to break down.

Probably contributes to issue CURA-1208.
 2016-03-21 15:33:04 +01:00
Tim Kuipers
ec06226907 quickfix for fan full at height 2016-03-21 14:16:37 +01:00
fieldOfView
2e5868cb82 Removed separators from profilesmodel 
Profile menu now inserts separators in QML
CURA-855
 2016-03-21 13:47:14 +01:00
Jaime van Kessel
235f324d56 Added missing enabled parameters 2016-03-21 11:12:00 +01:00
Ghostkeeper
e5a5cffe7d
Remove unnecessary parameter to JS toString 
This parameter has no effect.

Contributes to issue CURA-1110.
 2016-03-18 15:59:05 +01:00
Jaime van Kessel
bb220ed952 Removing min warning from support_tower_diameter 
The min warning caused an infinite recursion when support was
enabled / disabled

CURA-1156
 2016-03-18 15:52:56 +01:00
Jaime van Kessel
43d13096a1 Added decodeURIComponent to mesh names 
Fixes CURA-1110
 2016-03-18 14:56:35 +01:00
Jaime van Kessel
834e2148d2 Major cleanup for profiles 
This removes a bunch of settings that override default values from machine defaults (or inheritance)
 2016-03-18 14:18:19 +01:00
Jaime van Kessel
46bf7e440e Added more logging & removed duplicate slicing canceled signals 
CURA-1133
 2016-03-18 12:00:10 +01:00
Ghostkeeper
0c92329e54 Merge pull request #669 from thopiekar/patch-1 
Adding link for PySerial
 2016-03-18 11:09:19 +01:00
fieldOfView
1583018e75 Clean up theme: tweak colors, remove unused styles 
Contributes to CURA-1143
 2016-03-17 21:09:18 +01:00
fieldOfView
a78e1a62d4 Fix ctypes imports in WindowsRemovableDrivePlugin 
See 9684ca80d7912daed1db2cf0bdebf75fe204562f
 2016-03-17 20:34:18 +01:00
Thomas Karl Pietrowski
1403458d79 Adding link for PySerial 2016-03-17 18:32:43 +01:00
fieldOfView
6017d9176d Remove exception logging in USBPrinterManager because it caused an error every 5 seconds. 
CURA-1198
 2016-03-17 16:59:41 +01:00
fieldOfView
476ab9226d Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-17 16:29:37 +01:00
fieldOfView
745bc8051a Fix generic material profiles 
Makes sure that the generic PLA material profile has all the same settings as the ABS and CPE settings, so a printer that uses the non-printer-specific material profiles can switch back to the proper settings for PLA when they are merged into the current settings.

CURA-1188
 2016-03-17 16:29:19 +01:00
Jaime van Kessel
eeb2c0454a Build volume now uses linecount for disallowed areas 
CURA-1152
 2016-03-17 15:51:36 +01:00
Ghostkeeper
de9a66e1f4 Merge branch '2.1' 
Conflicts:
	plugins/RemovableDriveOutputDevice/OSXRemovableDrivePlugin.py
	plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py
	plugins/USBPrinting/PrinterConnection.py
	resources/machines/fdmprinter.json
	resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
 2016-03-17 15:24:00 +01:00
Jaime van Kessel
479c6c3319 Added extra relative move to prevent nozzle scraping 
CURA-1102
 2016-03-17 14:57:44 +01:00
Jaime van Kessel
2df91d8e0b Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-17 14:44:37 +01:00
Jaime van Kessel
89256b5423 Added explicit home bed before rest of bed leveling 
CURA-1102
 2016-03-17 14:44:09 +01:00
Ghostkeeper
4507560e30
Codestyle: Whitespace around operators 
A space on both sides around binary operators. A space after the comma.

Contributes to issue CURA-1102.
 2016-03-17 11:53:11 +01:00
Ghostkeeper
14f5d236b2 Merge pull request #666 from thopiekar/master-code-fixes 
Fixing small issues in the code (#2)
 2016-03-17 11:30:22 +01:00
Jaime van Kessel
aafb981245 Setting empty jobname is now possible again 
I hope this fixes CURA-707, but it can only be tested through means of a build.
 2016-03-17 10:18:46 +01:00
Jaime van Kessel
90293a4a5c Removed stray broken code 
CURA-1102
 2016-03-16 16:33:36 +01:00
Jaime van Kessel
9a6615213c Bed should no longer be damaged when leveling 
CURA-1102
 2016-03-16 15:18:11 +01:00
Thomas Karl Pietrowski
f93f0330ea Removing wrong marking about @UnusedVariable 2016-03-16 14:51:31 +01:00
Tim Kuipers
762f964221 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-16 09:55:28 +01:00
Tim Kuipers
b7065628a3 JSON: temporarily made temp graph and cooldown speed modifier disabled (CURA-1157) 2016-03-16 09:55:19 +01:00
fieldOfView
f904d3aa74 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-15 18:05:57 +01:00