search

AEModernMCPort / Applied-Energistics-3-Fork

A Minecraft Mod about Matter, Energy and using them to conquer the world..
http://ae-mod.info/
Other
37 stars 12 forks source link

Restructuring #93

Closed shartte closed 7 years ago

shartte commented 8 years ago

This PR contains the contents of the restructuring branch, but rebased against the current rendering branch.

The longer this is drawn out, the more conflicts there'll be due to the registry names changing.

Elix-x commented 8 years ago

The longer this is drawn out, the more conflicts there'll be due to the registry names changing.

Yes, but

too early. We still have some things to do in restructuring.

shartte commented 8 years ago

too early. We still have some things to do in restructuring.

I don't agree. Could you be more specific? The only remaining topic in #70 is restructuring the packages, which can be done incrementally with localized effects, since the registry names are now fixed. But as long as this branch is unmerged, content fixes on the rendering branch will lead to conflicts.

I am planning to do a content-pass over the weekend, so having this merged would help.

Elix-x commented 8 years ago

I recently synced rendering -> restructuring and intend to freeze rendering branch.

dpeter99 commented 8 years ago

@elix-x Than which branch should I use?

dpeter99 commented 8 years ago

@elix-x @shartte Than which branch should I use?

Elix-x commented 8 years ago

@dpeter99 to work on models, branch off restructuring if possible (better would be to wait till it's merged, but it won't affect assets much anyway).