CWH157 needs to replace the current version in area515

area515 / Photonic3D

Control software for resin 3D printers

http://photonic3d.com

GNU General Public License v3.0

133 stars 112 forks source link

CWH157 needs to replace the current version in area515 #75

Closed WesGilster closed 9 years ago

ergobot commented 9 years ago

merge pr - conflicts in host/resources/index.html, server/Main.java, and .classpath. Took all from Main.java - one line difference Took all from .classpath, for additional tests and etc added Didn't take index.html, pull request contains previous version of this GUI.

WesGilster commented 9 years ago

Cool. Yeah, don't take the index.html but notice there was a server side change on the file upload service. It's now called uploadPrintableFile.