3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 22:54:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
18762 commits 306 branches 272 tags 787 MiB
Commit graph

1753 commits

Author SHA1 Message Date
Ghostkeeper
1d25f52df6
Merge branch '4.0' 2019-03-06 15:23:55 +01:00
Ghostkeeper
d72a8581bf
Merge branch 'CURA-6252_Fix_crash_single_extrusion_upgrade_and_project' into 4.0 2019-03-06 15:23:33 +01:00
Jaime van Kessel
6157cb6f91 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-04 16:00:56 +01:00
Diego Prado Gesto
3fd0561aca Update the ExtruderModel 
also when the variant container has changed.

Contributes to CURA-6227.
 2019-03-01 14:54:42 +01:00
Jaime van Kessel
91cceea6e0 Fix the situation where an upgraded single extrusion machine and loading project caused issues 
If the upgraded single extrusion machine was never activated, it would not have it's extruders set.

CURA-6252
 2019-02-28 16:17:34 +01:00
Jaime van Kessel
b165b9625f Removed unused code and fix styling for some comments 2019-02-22 15:08:51 +01:00
Jaime van Kessel
b5c270f00a Add stubs for MachineManager testing 
It also adds a first test that checks if the setActiveMachine
 2019-02-22 13:49:31 +01:00
Jaime van Kessel
dee739db8b Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-21 20:19:30 +01:00
Jaime van Kessel
b64cf1fe1c Remove unneeded signal call 2019-02-21 16:19:16 +01:00
Ghostkeeper
275989d193
Merge branch 'fix_prime_tower_brim_for_raft' 2019-02-18 15:17:48 +01:00
Ghostkeeper
d42ba9dda0
Merge branch '4.0' 
Conflicts:
	resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg -> Weights being changed while a whole slew of fixes were being done on 4.0
	resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg -> Ditto
 2019-02-15 13:58:47 +01:00
Remco Burema
f1b6e527be Rectified wrong placement of brackets causing logic change. [CURA-5864] 2019-02-14 14:55:12 +01:00
Jaime van Kessel
b09538da63 Ensure that the numberOfExtruders property gets updated after configuration sync 
CURA-6220
 2019-02-14 13:44:43 +01:00
Jaime van Kessel
a8f66a558c Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-14 10:53:01 +01:00
Remco Burema
a601e0878c Explicitly also check for Raft when checking for prime-tower=brim. [CURA-5864] 2019-02-13 15:46:39 +01:00
Simon Edwards
dc9d3ba2a3
Merge pull request #5293 from Ultimaker/CL-1165_missing_cloud_info 
CL-1165 Improve cloud connection or not checking
 2019-02-13 14:23:05 +01:00
Ian Paschal
3c2791fefe Improve cloud connection or not checking 
Contributes to CL-1165
 2019-02-12 12:12:59 +01:00
Remco Burema
c50fcf42c5 Fix crash on no output devices in list. 2019-02-12 11:39:03 +01:00
Ghostkeeper
51420c8311
Merge branch '4.0' 2019-02-08 14:23:36 +01:00
Simon Edwards
1163d8f442
Merge pull request #5271 from Ultimaker/CL-1222_cloud_flow_pop_up 
CL-1222 Cloud flow pop up
 2019-02-08 13:26:03 +01:00
Lipu Fei
d6abad3f27 Merge remote-tracking branch 'origin/master' into CURA-5864_prime_tower_brim_enable 2019-02-07 14:47:11 +01:00
Lipu Fei
e5071eac5b Fix typing 2019-02-07 14:31:40 +01:00
Lipu Fei
47d531e2c5 Fix typing 2019-02-07 14:30:10 +01:00
Lipu Fei
6e40e4a831 Remove unused things 2019-02-07 14:29:59 +01:00
Remco Burema
da6ff7c5a9 Merge branch 'master' into temp_CURA-5864 2019-02-06 16:23:30 +01:00
Ian Paschal
01ca3546aa Add activeMachineAddress to MachineManager for easy access 
Contributes to CL-1222
 2019-02-06 11:59:39 +01:00
Lipu Fei
fff6cb9ce8 Merge remote-tracking branch 'origin/4.0' 2019-02-05 09:48:10 +01:00
Lipu Fei
bac344a692 Show extruder names in disabled message 
CURA-5693
 2019-02-05 09:26:50 +01:00
Ian Paschal
f2ddb2808f Add firmware check 
Contributes to CL-1222
 2019-02-04 16:02:38 +01:00
Ghostkeeper
e7d2400199
Merge branch '4.0' 2019-02-04 13:06:32 +01:00
Lipu Fei
f7765189c8 Show Extruder 1,2,3,... in message 
CURA-5693
 2019-02-01 13:36:10 +01:00
Jaime van Kessel
5600d5407c Add default if group_name is not set. 
Otherwise we get a crash.

CURA-6153
 2019-02-01 12:02:59 +01:00
Jaime van Kessel
4aaeb8c2d5 Merge branch 'CURA-6153_wrong_name_on_disconnect' of github.com:Ultimaker/Cura into 4.0 2019-02-01 11:54:35 +01:00
Lipu Fei
efa26c8323 Merge remote-tracking branch 'origin/4.0' 2019-02-01 11:08:33 +01:00
Remco Burema
954fdb20ad Rename 'connect_group_name' to 'group_name'. [CURA-6153] 2019-01-31 20:21:42 +01:00
Simon Edwards
eeb23c4ba4
Merge pull request #5255 from Ultimaker/CL-1154_monitor_empty_states 
CL-1154 Monitor empty states
 2019-01-31 16:44:25 +01:00
Remco Burema
6cd3a5fe3d Show correct printer name in selector-header on disconnect. [CURA-6153] 2019-01-31 15:05:27 +01:00
Lipu Fei
c73747ad44 Merge remote-tracking branch 'origin/4.0' 2019-01-31 14:22:59 +01:00
Jaime van Kessel
3734b980d8 When disabling an extruder due to sync, always show a message. 
Originally it would only show a message if the extruder was actually used,
but this didn't take the flow into account when you would first sync and then load a model.
In that case, the user never got a message and never got any notification that (and why) any of the extruders
got disabled.

CURA-5693
 2019-01-31 11:30:37 +01:00
Jaime van Kessel
e40b730457 Merge branch 'CURA-5693_handle_empty_variant_and_material' of github.com:Ultimaker/Cura into 4.0 2019-01-31 11:22:00 +01:00
Ian Paschal
389bdeb0c7 Expose configurations the same way as connectivity 
Contributes to CL-1154
 2019-01-31 10:50:14 +01:00
Lipu Fei
5a196423db Merge remote-tracking branch 'origin/4.0' 2019-01-31 08:47:01 +01:00
Lipu Fei
4f6d53b009 Do not disable all extruders when syncing 
CURA-5693

When syncing with a machine with no material/nozzle, do not disable all
extruders. leave the first one enabled.
 2019-01-31 08:30:41 +01:00
Jaime van Kessel
87070aefce Fixed typing issues for configuredConnectionTypes 
CURA-6159
 2019-01-30 17:17:46 +01:00
Ghostkeeper
a36aa3f17b
Merge branch '4.0' 2019-01-30 12:53:18 +01:00
Ghostkeeper
14300e745f
Use Doxygen-style comments for documentation 
According to our style. Not just single line comments without anything else.

Contributes to issue CURA-6159.
 2019-01-30 12:52:58 +01:00
Lipu Fei
b70e9c9080 Handle empty hotend and material in config syncing 
CURA-5693

 - Disable an extruder if the config states no material or nozzle for
   it.
 - Show a warning message if an used extruder gets disabled.
 2019-01-29 13:06:38 +01:00
Ghostkeeper
232498980c
Merge branch '4.0' 
Conflicts:
	cura/GlobalStacksModel.py -> CuraContainerRegistry being used in stead of ContainerRegistry, but imports were reordered.
	plugins/CuraDrive/src/DrivePluginExtension.py -> Typing being solved in two ways.
 2019-01-28 16:45:45 +01:00
Jaime van Kessel
bc8a08bb44 Add documentation to the configuredConnectionTypes 2019-01-28 14:57:24 +01:00
Jaime van Kessel
3774fdbd02 Refactored the "connection_type" metadata entry so it can support multiple types. 
After a lot of discussion and finding out what the hell was going on,
we figured out we made a pretty big derp by only setting a single connection_type
in the metadata of the machine. What it's actually doing is describing what connection types
have been configured (and not just randomly displaying whatever output device set the value last)
 2019-01-28 14:29:41 +01:00