Jozufozu 4405f92639 Merge branch '1.18/dev' into 1.18/next ... # Conflicts: # .github/ISSUE_TEMPLATE/bug_report.yml # build.gradle # gradle.properties # src/main/java/com/jozufozu/flywheel/Flywheel.java # src/main/java/com/jozufozu/flywheel/backend/Backend.java # src/main/java/com/jozufozu/flywheel/backend/Loader.java # src/main/java/com/jozufozu/flywheel/backend/OptifineHandler.java # src/main/java/com/jozufozu/flywheel/backend/instancing/AbstractInstance.java # src/main/java/com/jozufozu/flywheel/backend/instancing/InstanceManager.java # src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterialGroup.java # src/main/java/com/jozufozu/flywheel/core/model/BakedModelBuilder.java # src/main/java/com/jozufozu/flywheel/core/model/Bufferable.java # src/main/java/com/jozufozu/flywheel/core/model/ModelUtil.java # src/main/java/com/jozufozu/flywheel/core/model/WorldModel.java # src/main/java/com/jozufozu/flywheel/core/model/WorldModelBuilder.java # src/main/java/com/jozufozu/flywheel/core/vertex/BlockVertexList.java # src/main/java/com/jozufozu/flywheel/core/vertex/BlockVertexListUnsafe.java # src/main/java/com/jozufozu/flywheel/core/vertex/PosTexNormalVertexListUnsafe.java # src/main/java/com/jozufozu/flywheel/mixin/FrustumMixin.java		2022-07-19 00:19:50 -07:00
..
bug_report.yml	Merge branch '1.18/dev' into 1.18/next	2022-07-19 00:19:50 -07:00