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

23916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arjen Hiemstra
9c6c06d501 Clean up "View" configuration page 
Contributes to CURA-211
 2015-10-08 17:48:22 +02:00
Arjen Hiemstra
d77903871d Fix crash handler to not complain about debug_mode not being set 2015-10-08 15:28:38 +02:00
Hajo Nils Krabbenhöft
1e5a2ddab9 hide jumps from line view + fix solid display 2015-10-08 15:28:38 +02:00
Hajo Nils Krabbenhöft
3ed5a466a3 regenerate python protobuf reader 2015-10-08 15:28:38 +02:00
Hajo Nils Krabbenhöft
cead06e925 colors 2015-10-08 15:28:38 +02:00
Hajo Nils Krabbenhöft
5505d5dc74 introduce combind and retraction polygon types 2015-10-08 15:28:38 +02:00
Hajo Nils Krabbenhöft
8dd46be2ca add _current_layer_jumps 2015-10-08 15:28:38 +02:00
Arjen Hiemstra
3f5d609baa Set version to master 2015-10-08 12:13:35 +02:00
Arjen Hiemstra
c5ca763621 If we have no active machine, return None in getEngineCommand 
This fixes a race condition on Windows where setting the active machine
takes too long
 2015-10-08 11:54:22 +02:00
Arjen Hiemstra
a435004459 Fix crash handler to not complain about debug_mode not being set 2015-10-08 11:54:22 +02:00
Tamara Hogenhout
9258501a3a Makes that only the name of the first model is displayed in the Printjob Name textfield. 
fixes #224
 2015-10-07 14:56:28 +02:00
Tim Kuipers
152406cd44 Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-10-07 09:39:40 +02:00
Tim Kuipers
d5e646ce3d JSON: made top_layers default coincide with its inherited value when parent is set to default 2015-10-07 09:39:23 +02:00
Tim Kuipers
b88950a732 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-10-07 09:38:43 +02:00
Tim Kuipers
7af749bdb7 JSON: made top_layers default coincide with its inherited value when parent is set to default 2015-10-07 09:38:32 +02:00
Arjen Hiemstra
0dee306c7f Remove extruder_x_temperature options 2015-10-06 16:55:31 +02:00
Arjen Hiemstra
50e6455875 Send the actual machine JSON to the engine 2015-10-06 16:54:57 +02:00
Arjen Hiemstra
b23bbe02fd Send the dual extrusion file as base JSON to the engine 2015-10-06 14:54:24 +02:00
Arjen Hiemstra
0fca136fa8 Fix dual extrusion printer profile to confirm to updated JSON api 2015-10-06 14:53:32 +02:00
Arjen Hiemstra
ae3705514f Merge branch '15.10' 
* 15.10:
  Properly clear stored layer data
  Render SupportInfillType so support is rendered correctly again.
  Fix issues with crash handler and log file creation on Windows
  Bump version
  Make the UMO upgrade selection page work properly
  Update preference dialog to the changed API
  Disable crash handler if debug mode is not enabled
  Prevent crashes when centering an object
  Also disable output device selection when main save button is disabled
  Fix name of Low Quality profile
  Fix stdout/stderr output location so we do not output to UM but to cura
 2015-10-06 12:21:09 +02:00
Arjen Hiemstra
560662ac59 Properly clear stored layer data 
This fixes an issue where switching back and forth between layer view
would trigger a reload of the layer data
 2015-10-06 12:07:57 +02:00
Arjen Hiemstra
aac269f82a Render SupportInfillType so support is rendered correctly again. 
Fixes #445
 2015-10-06 12:07:57 +02:00
Arjen Hiemstra
ba86352642 Fix issues with crash handler and log file creation on Windows 2015-10-05 18:32:44 +02:00
Arjen Hiemstra
07d35a3439 Bump version 2015-10-05 16:47:45 +02:00
Arjen Hiemstra
acfd2861f1 Make the UMO upgrade selection page work properly 2015-10-05 16:47:45 +02:00
Arjen Hiemstra
03ad005462 Update preference dialog to the changed API 2015-10-05 14:40:02 +02:00
Arjen Hiemstra
03748ca19a Disable crash handler if debug mode is not enabled 2015-10-05 14:13:49 +02:00
Arjen Hiemstra
a9527920ae Prevent crashes when centering an object 
Fixes #457
 2015-10-05 13:14:42 +02:00
Arjen Hiemstra
34e37af8c9 Also disable output device selection when main save button is disabled 
CURA-209 #done
 2015-10-01 17:51:54 +02:00
Arjen Hiemstra
5c5fb647c9 Fix name of Low Quality profile 2015-10-01 17:51:19 +02:00
Arjen Hiemstra
23e36b51e6 Fix stdout/stderr output location so we do not output to UM but to cura 
Fixes #452
 2015-10-01 16:43:29 +02:00
Arjen Hiemstra
7982e79940 Merge branch '15.10' 
* 15.10: (37 commits)
  Tweak the initial camera position
  Never disable the view button
  Use selection status to disable/enable tools rather than platform activity
  JSON: bugfix: skirt_speed was the only child of speed_layer_0, which meant you couldnt tweak them separately
  Fix Windows build
  Move all contributed profiles to an "Other" manufacturer
  Bump version
  Make the Infill buttons and support checkboxes in Simple mode functional
  Fix the variants menu so the variants actually get added
  Try to add a page when the name of a wizard page is unknown
  Catch any exception that happens while trying to eject
  Set High Quality to 0.08 layer height
  Capture stdout and stderr on Windows to prevent py2exe messages
  Add missing Ulti and Low quality profiles
  JSON: bugfix/feat: wall_line_width defaults to nozzle size and wall_line_count computed properly
  When you click [Manage Printers..] it brings you to the right page
  Delay showing the Add Machine dialog until after the main window is properly shown
  Adds a smaller cross icon
  Use the job name for saving files
  Update RemovableDrive and USB output devices to use the new file_name parameter
  ...
 2015-10-01 15:47:18 +02:00
Ghostkeeper
1c5f4d82e8 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-10-01 15:43:35 +02:00
Ghostkeeper
1bda2ff220 Move PerObjectSettings from Uranium to Cura 
This tool is deemed Cura-specific, so it is moved to Cura. This prevents it from being included in other Uranium applications.
 2015-10-01 15:41:36 +02:00
Arjen Hiemstra
6a36ceca7e Revert "Drop dual_extrusion JSON for 15.10" 
This reverts commit 907f53240de573c921b0fdaaff22cad705f554ef.
 2015-10-01 15:39:56 +02:00
Arjen Hiemstra
afa44ed314 Tweak the initial camera position 
As requested by Menno
 2015-10-01 14:20:47 +02:00
Arjen Hiemstra
a63db94d06 Never disable the view button 
Fixes #443
CURA-225 #done
 2015-10-01 12:37:17 +02:00
Arjen Hiemstra
16c5aeba68 Use selection status to disable/enable tools rather than platform activity 
Fixes issues with tool activation.
 2015-10-01 12:37:17 +02:00
Arjen Hiemstra
6fd9eba2dd Add missing inventor platform 2015-10-01 12:20:00 +02:00
awhiemstra
82c3560723 Merge pull request #301 from innovo3d/patch-1 
Create innovo-inventor.json
 2015-10-01 12:18:48 +02:00
Jaime van Kessel
6128776779 Merge pull request #450 from hmflash/fix-i3-heated-bed 
Enable heated bed for i3 printer.
 2015-10-01 09:29:16 +02:00
Seth Hinze
0772d6479d Enable heated bed for i3 printer. 2015-09-30 23:28:49 -07:00
Tim Kuipers
f9be4def09 JSON: bugfix: skirt_speed was the only child of speed_layer_0, which meant you couldnt tweak them separately 2015-09-30 17:12:20 +02:00
Jaime van Kessel
cd3c3729e9 G-code loader now works somewhat, still WIP 2015-09-30 09:20:14 +02:00
Arjen Hiemstra
5adee69b75 Fix Windows build 2015-09-29 09:24:22 -07:00
Arjen Hiemstra
8ac5c8d52d Move all contributed profiles to an "Other" manufacturer 
CURA-210 #done
 2015-09-29 17:23:28 +02:00
Arjen Hiemstra
457f2945b0 Bump version 2015-09-29 16:59:26 +02:00
Arjen Hiemstra
ca60ed0aad Make the Infill buttons and support checkboxes in Simple mode functional 
CURA-182 #done
 2015-09-29 16:58:04 +02:00
Arjen Hiemstra
d2ed9bc74f Fix the variants menu so the variants actually get added 
Contributes to CURA-24
 2015-09-29 16:58:04 +02:00
Arjen Hiemstra
3b5664f250 Try to add a page when the name of a wizard page is unknown 
Contributes to CURA-91
 2015-09-29 16:58:04 +02:00