search

Thaumic-Tinkerer / ThaumicTinkerer

A Spiritual Successor to the Elemental Tinkerer mod. This time Thaumcraft flavoured.
142 stars 121 forks source link

Ichor pick blockupdate fixes #1080

Closed Midnight145 closed 9 months ago

Midnight145 commented 9 months ago

ToolHander.java now sends block updates in all cases, and ItemIchorPickAdv.java now handles an edge case where you can be standing just far enough away to break the 4.5 block raytrace check here

Sorry about the earlier pull request, I accidentally both built on and chose the wrong branches.

Midnight145 commented 9 months ago

not sure why it's trying to pull my amulet commits again, lmk if there's no way to just cherry pick the ichor pick commit and I can make sure that I didn't break anything on my end, which is likely what happened

Dream-Master commented 9 months ago

not sure if Thaumic Thinker main repo just make new 1.7.10 releases but we did. https://github.com/GTNewHorizons/ThaumicTinkerer

GaeaKat commented 9 months ago

Must admit it is hard to see the changes made with the reformatting done. which has also added conflicts to the cleaning talismen

GaeaKat commented 9 months ago

Ok I must admit, I do not like how the conflict fix adds a commit from me onto your repo, that feels like a security flaw

Midnight145 commented 9 months ago

Yeah, I don't think my original branch was up-to-date after the talisman pull request was merged, so it tried to re-pull my talisman commits. Sorry about that, I'll make sure I don't do that next time.