Merge branch '1.16.1' into 1.16.x

# Conflicts:
#	patches/minecraft/net/minecraft/client/Minecraft.java.patch
#	patches/minecraft/net/minecraft/item/crafting/Ingredient.java.patch
#	src/main/java/net/minecraftforge/fml/client/ClientModLoader.java
#	src/main/java/net/minecraftforge/registries/GameData.java
This commit is contained in:
cpw committed 2020-08-31 21:15:56 -04:00
commit bfeec0c7bd
38 files changed
+803 -814

No files matched your search

@@ -36,6 +36,6 @@ public class StencilEnableTest {
private void clientSetup(FMLClientSetupEvent event) {
if (ENABLED)
DeferredWorkQueue.runLater(() -> Minecraft.getInstance().getFramebuffer().enableStencil());
event.enqueueWork(() -> Minecraft.getInstance().getFramebuffer().enableStencil());
}
}