Merged changes from Forstride, fixed a nullpointer from left-in acacia references with Ore Dictionary registration