search

ForestryMC / MagicBees

Repository for the MagicBees Minecraft mod - a Forestry addon.
Do What The F*ck You Want To Public License
20 stars 18 forks source link

port to Minecraft 1.12.1 #31

Closed asiekierka closed 7 years ago

asiekierka commented 7 years ago

The effect jar seems to lack a model, but the rest seems to work fine!

mezz commented 7 years ago

Can you target the new 1.12 branch? https://github.com/ForestryMC/MagicBees/tree/1.12

asiekierka commented 7 years ago

@mezz Isn't it easier for you to redirect it via Git commands? If not, sure

mezz commented 7 years ago

I didn't try because I'm pretty sure it will conflict with the changes on that branch.

Elec332 commented 7 years ago

I have quite a few unsynced changes on 1.12 that I cant push because I have no internet here, Ill be home by monday, and try to merge it then.

Sorry, but I didnt know that this port existed

Op 17 aug. 2017 08:28 schreef "mezz" notifications@github.com:

I didn't try because I'm pretty sure it will conflict with the changes on that branch.

— You are receiving this because you were assigned.

Reply to this email directly, view it on GitHub https://github.com/ForestryMC/MagicBees/pull/31#issuecomment-322980836, or mute the thread https://github.com/notifications/unsubscribe-auth/AF1SaD1N5EFoXVsSGW6vLRO4aDghsvjJks5sY92ogaJpZM4O2m4g .

Elec332 commented 7 years ago

There are too many conflicts unfortunately, but I think almost everything in your pull has now been implemented. Please correct me if im wrong ;)

Im sorry I couldn't merge your pull.

asiekierka commented 7 years ago

It's alright, don't worry!

Also, the pull was really a straight port.