pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
MrDraw/src/octoprint/server/api
History
Philipp Engel 221ea637be Merge remote-tracking branch 'upstream/devel' into mrbeam 
Conflicts:
	src/octoprint/printer/__init__.py
	src/octoprint/server/__init__.py
	src/octoprint/settings.py
	src/octoprint/static/css/octoprint.css
	src/octoprint/static/js/app/main.js
	src/octoprint/static/js/i18n/de.js
	src/octoprint/static/js/i18n/fr.js
	src/octoprint/static/js/i18n/he.js
	src/octoprint/static/js/i18n/nl.js
	src/octoprint/static/js/i18n/no.js
	src/octoprint/static/js/i18n/ro.js
	src/octoprint/templates/index.jinja2
	src/octoprint/templates/settings.jinja2
	src/octoprint/translations/de/LC_MESSAGES/messages.mo
	src/octoprint/translations/de/LC_MESSAGES/messages.po
	src/octoprint/translations/fr/LC_MESSAGES/messages.mo
	src/octoprint/translations/fr/LC_MESSAGES/messages.po
	src/octoprint/translations/he/LC_MESSAGES/messages.mo
	src/octoprint/translations/he/LC_MESSAGES/messages.po
	src/octoprint/translations/messages.pot
	src/octoprint/translations/nl/LC_MESSAGES/messages.mo
	src/octoprint/translations/nl/LC_MESSAGES/messages.po
	src/octoprint/translations/no/LC_MESSAGES/messages.mo
	src/octoprint/translations/no/LC_MESSAGES/messages.po
	src/octoprint/translations/ro/LC_MESSAGES/messages.mo
	src/octoprint/translations/ro/LC_MESSAGES/messages.po
	src/octoprint/util/comm.py
2015-01-09 18:11:40 +01:00
..
__init__.py WIP First work towards printer profiles 2014-11-28 09:32:44 +01:00
connection.py "autoconnect" parameter to "connect" command is not mandatory 2014-12-11 15:37:48 +01:00
files.py Fetch estimated print time from cura slicing result, create print time statistics per printer profile, interpolate between stats and live estimation during printing for print time left 2014-12-17 17:31:30 +01:00
job.py Finalizing upload streaming support 2014-08-05 11:26:13 +02:00
log.py Finalizing upload streaming support 2014-08-05 11:26:13 +02:00
printer.py Fixed a bunch of doc issues, updated /api/printer/command to have more meaningful error messages 2014-12-31 15:47:12 +01:00
printer_profiles.py Fixed extruder offsets not being properly editable in printer profiles 2014-12-19 09:54:11 +01:00
settings.py Merge remote-tracking branch 'upstream/devel' into mrbeam 2015-01-09 18:11:40 +01:00
slicing.py Do not try to slice on local slicers when printing 2014-10-21 14:14:00 +02:00
timelapse.py Finalizing upload streaming support 2014-08-05 11:26:13 +02:00
users.py Finalizing upload streaming support 2014-08-05 11:26:13 +02:00