Attempt at merging changes from upstream

[emckee2006]

Hopefully I did this correctly. Feel free to give me some feedback...

[LexManos]

No, its done as a sub-module split so that we can do a merge where it keeps all of the history correctly as commits.
So no this is not done correctly.
However, we're not particularly worried about merging other people's work until we get the LVT processing done. Once the LVT branch is done we'll cleanup the community history, sync master and pull down incoming changes.
But LVT stuff is the most important part right now.

[emckee2006]

Sorry about that....what's the right thing to do, then?
On Sep 18, 2015 5:10 PM, "LexManos" [email protected] wrote:

No, its done as a sub-module split so that we can do a merge where it
keeps all of the history correctly as commits.
So no this is not done correctly.
However, we're not particularly worried about merging other people's work
until we get the LVT processing done. Once the LVT branch is done we'll
cleanup the community history, sync master and pull down incoming changes.
But LVT stuff is the most important part right now.

—
Reply to this email directly or view it on GitHub
MinecraftForge/FernFlower#3 (comment)
.