search

LaserWeb / deprecated-LaserWeb3

Open Source Laser Cutter / Engraver software. Supports gcode, svg, dxf, stl, png, jpg, bmp
265 stars 68 forks source link

Emblaser electron #152

Closed jmmstm closed 7 years ago

ghost commented 7 years ago

@darklylabs @jmmstm awesome, care to elaborate a little? I am on the road last two days of holiday, hard to review via mobile, but anxious to hear how it went

krolco commented 7 years ago

It looks like most of this are my commits to the emblaser-branch in the pull request. Anthony, did you intend to pull everything from that branch into Master? If not, you may need to make a smaller branch with just a few cherry-picked commits.

anthonytvamp commented 7 years ago

There are some of my commits that touches LaserWeb codes, but majority of it are wrapper and configuration. I intended to create a pull request from the emblaser-electron to the emblaser branches. You could scrap my changes in the conflicting index.html file, and I'll redo them after I pull changes from master to my branch. What is the best way to go from here?

krolco commented 7 years ago

I can try to help with this in a couple of hours. It looks your pull request just had the wrong targets. You might want a different structure to work with here -- we can discuss this later also.

copet80 commented 7 years ago

Oh let me check tonight. Which wrong targets if you can let me know in advance? On Mon., 10 Oct. 2016 at 11:59 am, Monte Krol notifications@github.com wrote:

I can try to help with this in a couple of hours. It looks your pull request just had the wrong targets. You might want a different structure to work with here -- we can discuss this later also.

— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/openhardwarecoza/LaserWeb3/pull/152#issuecomment-252525038, or mute the thread https://github.com/notifications/unsubscribe-auth/AFTww6pPsUjgiVDaZl9vVVfBOmwguWjfks5qyY3agaJpZM4KR45U .

krolco commented 7 years ago

Timezones are hard. :)

You said you wanted to create a pull request from emblaser-electron to emblaser. This pull request is emblaser-electron to master. On the pull request screen, the "left side" should say emblaser (the base branch) and the "right side" should say "emblaser-electron".

I made a pull request (#154) that had those settings and merged it, so you should be good to go now. I'm going to close this request. Thank you for your work!

cojarbi commented 7 years ago

I would gladly like to test this installer on Mac. Is it working yet? How do you create or run it?