Commit Graph

1 Commits

Author SHA1 Message Date
modmuss50 4130e35c88 Merge #848
# Conflicts:
#	mappings/net/minecraft/world/CollisionView.mapping
#	mappings/net/minecraft/world/chunk/light/LightingProvider.mapping
2019-09-12 14:34:29 +01:00