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

2068 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
83e30b7cf1 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-04-04 10:30:19 +02:00
Jaime van Kessel
819c9568b1 Backend now correctly handles machine instance change 
CURA-1323
 2016-04-04 10:29:42 +02:00
Ghostkeeper
14f7299a6c Update template files 
Contributes to issue CURA-1190.
 2016-04-01 16:46:06 +02:00
Jaime van Kessel
2b8914ea46 Removed duplicate settings from machine profiles 
CURA-1166
 2016-04-01 16:39:32 +02:00
Jaime van Kessel
fdb951ffe6 Changed silly typo 
No issue number, but this *needs* to be in 2.1
Signed off by Jaime & Ruben
 2016-04-01 16:33:33 +02:00
Jaime van Kessel
ee4ec23174 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-04-01 13:58:29 +02:00
Jaime van Kessel
ca70b275d8 Revert "Changed wait for subprocess to poll" 
This reverts commit e463c93f77a8015b00ab49aa7b8f9f6433cba26b.
 2016-04-01 13:58:11 +02:00
Ghostkeeper
f4ca245271
Update translation templates 
Templates are auto-generated from source.

Contributes to issue CURA-1190.
 2016-04-01 11:47:30 +02:00
Ghostkeeper
fd75276ed8
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 
Conflicts:
	resources/machines/fdmprinter.json
 2016-03-31 18:42:03 +02:00
Ghostkeeper
2d86606b5a
Use double quotes for string 
Contributes to issue CURA-1309.
 2016-03-31 18:31:04 +02:00
Ghostkeeper
53018b49a4
Restore Extra Skin Wall Count description 
Contributes to issue CURA-1309.
 2016-03-31 18:26:20 +02:00
Ghostkeeper
b2042b84f9
Capitalise all setting labels 
Contributes to issue CURA-1309.
 2016-03-31 18:11:59 +02:00
Ghostkeeper
5387699174
American spelling 
Contributes to issue CURA-1309.
 2016-03-31 18:04:26 +02:00
Ghostkeeper
b11051b281 Improve language construction 
Contributes to issue CURA-1309.
 2016-03-31 17:56:00 +02:00
Ghostkeeper
3a7a1a4baa
Remove superfluous spaces 
Contributes to issue CURA-1309.
 2016-03-31 17:47:15 +02:00
Jaime van Kessel
f1a5de50e8 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-31 17:37:02 +02:00
Jaime van Kessel
e463c93f77 Changed wait for subprocess to poll 
The wait is a suspect in a MAC issue. CURA-1300
 2016-03-31 17:35:57 +02:00
Tim Kuipers
d237148441 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-31 16:51:26 +02:00
Tim Kuipers
29de13a661 JSON: removed setting description override (CURA-1309) 
Proposed by Jeroen and backed by Tim. The new global description precludes everything said in the override description already now
 2016-03-31 16:51:06 +02:00
Jaime van Kessel
926dc1a010 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-31 16:46:00 +02:00
Jaime van Kessel
6951b78ee0 Set magic_fuzzy_skin_thickness min value to 0.001 
CURA-1125
 2016-03-31 16:45:15 +02:00
Tim Kuipers
2290c8298d Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-31 16:15:05 +02:00
Tim Kuipers
76bd1cc78c JSON: language fixes by Jeroen (CURA-1309) 2016-03-31 16:14:48 +02:00
Jaime van Kessel
f3d600b72e Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-31 13:51:19 +02:00
Jaime van Kessel
b7a465afd6 Added round to top/bottom layer calculation 
This is because 1.12 / 0.04 = 28.000000000000004 according to python.
The math.ceil then ensured that the result was 29 (instead of expected 28)
CURA-1140
 2016-03-31 13:50:04 +02:00
Tim Kuipers
9a780b56ef Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-31 12:51:26 +02:00
Tim Kuipers
b8dee1b166 JSON: max warning value draft shield height 2016-03-31 12:51:15 +02:00
Jaime van Kessel
effcbe5842 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-31 10:39:28 +02:00
Jaime van Kessel
82eda02d37 Created a new category (experimental) & moved a number of settings there 
CURA-1267
 2016-03-31 10:38:54 +02:00
Tim Kuipers
52d064d7ab JSON: bug fix last commit (CURA-1309) 2016-03-30 19:19:44 +02:00
Tim Kuipers
92cb16cf8c JSON: Connect zigzags was visibile with zigzags disabled (CURA-1309) 2016-03-30 19:15:51 +02:00
Tim Kuipers
4c47615145 JSON+profiles: removed shell thickness as a whole (CURA-1309) 2016-03-30 19:12:41 +02:00
Tim Kuipers
c8aa770fed JSON: language fixes by Tim (CURA-1309) 2016-03-30 19:00:59 +02:00
Tim Kuipers
3b7650729a JSON: changed order of settings (CURA-1309) 
Changes made by Jeroen
 2016-03-30 18:58:57 +02:00
Tim Kuipers
4501ec98b7 JSON: reintroduced moved skin_no_small_gaps_heuristic (CURA-1309) 
Changes made by Jeroen to setting which changed order
 2016-03-30 18:56:29 +02:00
Tim Kuipers
50aa14fc16 JSON: updated settings descriptions (CURA-1309) 
Changes made by Jeroen to settings which changed order
 2016-03-30 18:56:05 +02:00
Tim Kuipers
ffe1b4bc1e JSON: updated settings descriptions (CURA-1309) 
Changes made by Jeroen to settings which didn't change order
 2016-03-30 18:55:43 +02:00
Tim Kuipers
3aced8fb64 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-29 16:58:53 +02:00
Tim Kuipers
82d3c19fe1 JSON: fix min_value for magic_fuzzy_skin_point_density (CURA-1225) 
value is based on firmware flood limit based on baudrate
 2016-03-29 16:58:44 +02:00
Jaime van Kessel
ced7484953 Misclicking tool panel no longer hides it 2016-03-29 15:43:45 +02:00
Tim Kuipers
981e3f3851 JSON: fix: max_value for call_fan_speed_min (CURA-863) 2016-03-29 10:42:13 +02:00
Tim Kuipers
5bb63c5cfb Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-29 10:34:13 +02:00
Ghostkeeper
9294b14677 Merge pull request #682 from thopiekar/2.1-i18n-cmake-fix 
CMake: Remove all slashes from language codes
 2016-03-29 10:33:14 +02:00
Tim Kuipers
3a3c7fbbc8 JSON: updated Olsson block heat zone length (CURA-1281) 2016-03-29 10:31:33 +02:00
Thomas-Karl Pietrowski
7e339ce512 CMake: Remove all slashes from language codes 
Related to: 6833363b53
 2016-03-29 10:16:50 +02:00
Jaime van Kessel
51b9ac78bd Added speed of light as max value for speed 
CURA-1252
 2016-03-25 15:18:18 +01:00
Jaime van Kessel
89162e3286 Fixed crash caused by circular dependency 2016-03-25 14:08:50 +01:00
Jaime van Kessel
637f793f48 Simplified some of the inheritance functions 2016-03-25 14:03:49 +01:00
Jaime van Kessel
918d8005bc Removing unneeded overwritten settings 2016-03-25 13:59:43 +01:00
Jaime van Kessel
99de21fba7 Setting one at a time mode now decreases size of build volume 
CURA-1245 CURA-1224
 2016-03-25 10:59:11 +01:00