OccludedEntity and Shaders
Merge Conflict Fix