Ex Nihilo Omnia

Ex Nihilo Omnia

2M Downloads

Error in TileEntityCrucible from latest merge

VaiN474 opened this issue ยท 3 comments

commented

Something happened with the TileEntityCrucible.java file in the latest merge.

commented

A quick ctrl+f of my pr indicates that the problem may have arisen from merging the pr. @Jozufozu did you use the GitHub for Windows client for the merge (if that is even possible)?

commented

Here's the diff btw and one of the affected files (just search for <<<<<<< HEAD to find the rest)

commented

Yeah, completely missed that somehow. Fixed.