Jozufozu e31575de3b Merge branch '1.18/ubershaders' into 1.18/next ... # Conflicts: # src/main/java/com/jozufozu/flywheel/api/material/Material.java # src/main/java/com/jozufozu/flywheel/api/vertex/VertexType.java # src/main/java/com/jozufozu/flywheel/backend/instancing/indirect/IndirectEngine.java # src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancingEngine.java # src/main/java/com/jozufozu/flywheel/core/material/SimpleMaterial.java # src/main/java/com/jozufozu/flywheel/core/structs/oriented/OrientedType.java # src/main/java/com/jozufozu/flywheel/core/structs/transformed/TransformedType.java # src/main/java/com/jozufozu/flywheel/core/uniform/ViewProvider.java # src/main/java/com/jozufozu/flywheel/util/FlwUtil.java		2023-03-28 16:37:57 -07:00
..
main	Merge branch '1.18/ubershaders' into 1.18/next	2023-03-28 16:37:57 -07:00