Jozufozu 3eb15fc84d Merge branch '1.18/next' into 1.18/culling ... # Conflicts: # src/main/java/com/jozufozu/flywheel/api/struct/StructType.java # src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/GPUInstancer.java # src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/MeshPool.java # src/main/java/com/jozufozu/flywheel/core/hardcoded/ModelPart.java # src/main/java/com/jozufozu/flywheel/core/model/Mesh.java # src/main/java/com/jozufozu/flywheel/core/model/ModelUtil.java # src/main/java/com/jozufozu/flywheel/core/model/SimpleMesh.java # src/main/java/com/jozufozu/flywheel/core/structs/model/TransformedWriterUnsafe.java # src/main/java/com/jozufozu/flywheel/core/structs/oriented/OrientedType.java # src/main/java/com/jozufozu/flywheel/core/structs/transformed/TransformedStorageWriter.java # src/main/java/com/jozufozu/flywheel/core/structs/transformed/TransformedType.java # src/main/java/com/jozufozu/flywheel/core/uniform/ViewProvider.java		2022-08-14 23:29:01 -07:00
..
main	Merge branch '1.18/next' into 1.18/culling	2022-08-14 23:29:01 -07:00