search

intelligent-agent / redeem

Firmware for Replicape
http://wiki.thing-printer.com/index.php?title=Redeem
GNU General Public License v3.0
36 stars 44 forks source link

Update master to match RC as the code is now up to date. #199

Closed goeland86 closed 5 years ago

goeland86 commented 5 years ago

Essentially merging RC onto master, to bring the code up to date. Also includes updates to the README.md to update instructions that are completely outdated otherwise.

Wackerbarth commented 5 years ago

This PR has merge errors which introduce invalid lines in the source code.

The meaningful changes that you are proposing need to be rebased on the current RC branch and all earlier references omitted. Doing so will eliminate over 600 commits from the proposed PR.

goeland86 commented 5 years ago

@Wackerbarth erm, ok - will try to address that tonight. I may need your assistance on Slack to do it right though.