Merge remote-tracking branch 'origin/1.14.x' into 1.14.x

This commit is contained in:
cpw committed 2019-06-21 22:42:33 -04:00
commit 83a0dc2ef9
17 files changed
+116 -38

No files matched your search

@@ -943,7 +943,7 @@ public final class ModelLoader extends ModelBakery
/**
* Internal, do not use.
*/
public void onPostBakeEvent(Map<ModelResourceLocation, IBakedModel> modelRegistry)
public void onPostBakeEvent(Map<ResourceLocation, IBakedModel> modelRegistry)
{
IBakedModel missingModel = modelRegistry.get(MODEL_MISSING);
for(Map.Entry<ResourceLocation, Exception> entry : loadingExceptions.entrySet())