Jozsef 33cdfb2ae9 Merge branch 'dev' into shader-pipeline ... # Conflicts: # src/main/java/com/jozufozu/flywheel/backend/ShaderSources.java		2021-06-30 12:58:21 -07:00
..
java/com/jozufozu/flywheel	Merge branch 'dev' into shader-pipeline	2021-06-30 12:58:21 -07:00
resources	Instanced entities are compatible with optifine	2021-06-24 19:37:31 -07:00