larsbrubaker
1800734347
Starting to get AMF in as a file type
...
Unified all the open dialogs to use a common file type list
Made application settings hold the file lists
Made the extruder count a member of ActiveSliceSettings
Made an extruderOffsets mapping
2014-09-26 17:52:54 -07:00
larsbrubaker
e75dc94e0d
Fixed a bug when closing the 3D view while it is still loading or processing.
...
Working on adding material settings to 3D view.
2014-09-26 15:04:04 -07:00
larsbrubaker
1b767a6abc
Moved Localizations into agg
...
working to add ability to compile to 64 bit.
2014-09-26 12:33:16 -07:00
larsbrubaker
3d75fe91eb
Merge remote-tracking branch 'origin/development' into development
2014-09-26 12:01:33 -07:00
larsbrubaker
bbbac004f7
Merge branch '1.1.3' into development
2014-09-26 12:01:22 -07:00
larsbrubaker
db6439d593
Allow integer rotation..
2014-09-26 10:57:11 -07:00
Kevin Pope
0c557998c5
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-09-26 10:47:21 -07:00
Kevin Pope
64c155f6a1
Make setup method public.
2014-09-26 10:46:49 -07:00
larsbrubaker
b306be1dd5
Merge branch '1.1.3' into development
2014-09-25 16:20:12 -07:00
larsbrubaker
fe88e63c5e
Put zOffset into MatterSlice and implemented the UI for it.
...
Put Robo z offset at 1 for the R1
Turned off 2Point leveling
Turned off auto run print leveling
2014-09-25 11:39:39 -07:00
larsbrubaker
f1272a91e1
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-09-25 11:01:39 -07:00
larsbrubaker
f39787fa8f
Putting in more multi extruder support
...
Reorganizing the slice settings layouts
2014-09-25 11:01:15 -07:00
Kevin Pope
2faec9d1c0
Work on print history widget.
2014-09-24 19:14:31 -07:00
Kevin Pope
4e4f257737
Updating preview window controls.
2014-09-24 11:15:38 -07:00
larsbrubaker
4e10293225
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-09-24 11:07:31 -07:00
larsbrubaker
c04e4c81dd
Working on multi extruder ui support
2014-09-24 11:07:08 -07:00
Kevin Pope
a6d109fdfd
Add display mode selector to config page. Fixed location of update notification.
2014-09-23 19:23:54 -07:00
Kevin Pope
49838951ab
Updated options menus.
2014-09-23 19:23:17 -07:00
Kevin Pope
a4ef3f729c
Made display mode driven by theme setting.
2014-09-23 18:02:07 -07:00
Kevin Pope
bda5ac173e
More work on configuration page.
2014-09-23 16:11:06 -07:00
Kevin Pope
5663289ef7
Make application controller a generic object. Fix title of auto-leveling warning window.
2014-09-22 14:16:40 -07:00
Kevin Pope
bdef196434
Changed main application to MVC. UI rework (Configuration Page esp. in progress).
2014-09-19 19:17:12 -07:00
Kevin Pope
e02655f847
Make controls more consistent looking.
2014-09-18 17:06:45 -07:00
Kevin Pope
73b6c8298b
Added custom themed slider, added double slider.
2014-09-17 19:18:46 -07:00
larsbrubaker
c9b9d9e602
Only MatterSlice works on Android
2014-09-11 17:47:57 -07:00
larsbrubaker
4399441684
Renamed a variable.
2014-09-11 17:16:12 -07:00
larsbrubaker
390bc4451b
another translation.
2014-09-11 09:55:15 -07:00
larsbrubaker
25bd699517
Made many parts of MC know how to scale if the font resolution (scaling) is changed.
2014-09-10 21:24:14 -07:00
larsbrubaker
f8f6a20dc4
More outside of the timed lock.
2014-09-10 12:11:27 -07:00
larsbrubaker
54f406a031
Make sure we can handle blank lines in Slice settings files (they have been added manually)
...
Put in wipe tower and wipe shield (more work on dual extrusion)
2014-09-10 10:01:13 -07:00
larsbrubaker
749bcd06c4
Made the oem image always get added to the bed.
2014-09-09 15:17:49 -07:00
larsbrubaker
351db8c852
Merge remote-tracking branch 'Greg/development' into 1.1.3
2014-09-09 11:07:07 -07:00
larsbrubaker
b54e4d4a67
sleep outside of the lock
2014-09-09 11:06:23 -07:00
gregory-diaz
01f69dacb6
Changed printer name from Infinity to INF3D-SPE in the correct static data folder
2014-09-09 10:18:00 -07:00
gregory-diaz
519f96ebdd
Merge remote-tracking branch 'upstream/development' into development
2014-09-09 10:03:55 -07:00
gregory-diaz
b49a398214
Changed Revolution 3D model name in static data from 'Infinity' to INF3D-SPE
2014-09-09 10:02:19 -07:00
larsbrubaker
2b17d630b2
Make the window state that it uses gl.
2014-09-08 15:52:46 -07:00
larsbrubaker
6706421456
Merge branch '1.1.3' into development
2014-09-08 15:33:09 -07:00
kevinepope
9f365c51f5
Changed folder name, added base settings for r3dp
2014-09-05 17:05:52 -07:00
larsbrubaker
15cc3dd35c
Merge branch '1.1.3' into development
2014-09-05 16:15:08 -07:00
larsbrubaker
2ac4bed04e
Merge commit ' 905794eaa6' into 1.1.3
2014-09-05 16:14:04 -07:00
gregory-diaz
dd0a63dd77
Merge remote-tracking branch 'upstream/development' into development
2014-09-05 15:26:33 -07:00
gregory-diaz
905794eaa6
Added new material and quality presets for Revolution 3d
2014-09-05 15:25:59 -07:00
larsbrubaker
6c4951e198
Merge remote-tracking branch 'origin/1.1.3' into development
2014-09-05 13:11:30 -07:00
Kevin Pope
f668c132e3
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-09-05 13:06:20 -07:00
Kevin Pope
5354d3976c
Fix slice engine ui handling.
2014-09-05 13:04:41 -07:00
Kevin Pope
0b8e4fc092
Fix whitelisted makes.
2014-09-03 17:32:38 -07:00
larsbrubaker
b65412a2c0
Put all the agg-sharp stuff in a folder
2014-09-03 14:18:01 -07:00
larsbrubaker
4d96053446
added support for @pause and M226 (user requested pause)
2014-09-03 10:43:23 -07:00
gregory-diaz
c907b98560
Changing default watermark image back to the MatterControl logo(set the wrong one in previous commit).
2014-09-02 16:39:10 -07:00
