1311 Commits

Author SHA1 Message Date
Tamara Hogenhout
38346dd95f Merge branch '15.06'
Conflicts:
	cura/CuraApplication.py
2015-06-10 15:18:45 +02:00
Arjen Hiemstra
5019a157a1 Bump version to .95 2015-06-09 05:22:28 -07:00
Arjen Hiemstra
fc33b34060 Save the state of collapsed/expanded categories
Fixes Asana issue 36436828173802
2015-06-09 13:38:23 +02:00
Arjen Hiemstra
56454a9c7a Add support for listing recent files
Fixes Asana issue 33694049548880
2015-06-08 17:50:29 +02:00
Arjen Hiemstra
8c12426760 Merge branch '15.06'
* 15.06:
  Add a background to the tool additional controls
  Rescale the current layer number based on the maximum layer
  Add a text field style that can be used for generic text fields
  Implemented feature described by #30
  Handle finished signal for the ReadMeshJob started from command line args
  Updated name in menu for firmware update
  Added exception handling to listen thread join
  Render a transparent ghost of the selection when things are selected.
  Fix for #29
2015-06-08 16:41:46 +02:00
Arjen Hiemstra
a53e56e282 Handle finished signal for the ReadMeshJob started from command line args
This puts the actual mesh into the scene rather than just loading it and
discarding it afterwards. Now file arguments supplied to the application
actually work.

Fixes "Open With" on Windows and the related Asana issue.
2015-06-05 13:26:51 +02:00
Arjen Hiemstra
3b03cfa949 Bump version to 15.05.93 2015-06-03 15:14:56 +02:00
Arjen Hiemstra
65781eee84 Set version to 15.05.92 2015-05-27 15:13:36 +02:00
Arjen Hiemstra
c5fd957170 Set version back to master for master branch 2015-05-27 15:12:56 +02:00
Arjen Hiemstra
f6fc819009 Fix context menu entries
Fixes Asana Issue 12
2015-05-18 17:20:02 +02:00
Arjen Hiemstra
ae71c309ac Move src to cura so we can use the same package for installed and source
Contributes to #41
Contributes to #42
2015-05-18 15:03:42 +02:00