Merge branch '1.16.x' into 1.16.1

# Conflicts:
#	src/main/java/net/minecraftforge/fml/ModList.java
#	src/main/java/net/minecraftforge/fml/client/ClientModLoader.java
This commit is contained in:
cpw committed 2020-08-30 21:44:51 -04:00
commit 16b82bb97b
25 files changed
+578 -668

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());
}
}