Jozufozu 3dd74fe4b2 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/api/Material.java # src/main/java/com/jozufozu/flywheel/backend/gl/GlStateTracker.java # src/main/java/com/jozufozu/flywheel/backend/gl/buffer/MappedBuffer.java # src/main/java/com/jozufozu/flywheel/backend/instancing/InstanceManager.java # src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterial.java # src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchedMaterialGroup.java # src/main/java/com/jozufozu/flywheel/backend/instancing/batching/BatchingEngine.java # src/main/java/com/jozufozu/flywheel/backend/instancing/batching/CPUInstancer.java # src/main/java/com/jozufozu/flywheel/backend/instancing/entity/EntityInstanceManager.java # src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/ElementBuffer.java # src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/GPUInstancer.java # src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedMaterial.java # src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedMaterialGroup.java # src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancingEngine.java # src/main/java/com/jozufozu/flywheel/backend/model/ArrayModelRenderer.java # src/main/java/com/jozufozu/flywheel/backend/model/FallbackAllocator.java # src/main/java/com/jozufozu/flywheel/backend/model/IndexedModel.java # src/main/java/com/jozufozu/flywheel/backend/model/ModelPool.java # src/main/java/com/jozufozu/flywheel/backend/model/VBOModel.java # src/main/java/com/jozufozu/flywheel/core/QuadConverter.java # src/main/java/com/jozufozu/flywheel/core/crumbling/CrumblingGroup.java # src/main/java/com/jozufozu/flywheel/core/crumbling/CrumblingRenderer.java # src/main/java/com/jozufozu/flywheel/core/hardcoded/ModelPart.java # src/main/java/com/jozufozu/flywheel/core/model/BlockModel.java # src/main/java/com/jozufozu/flywheel/core/model/Model.java # src/main/java/com/jozufozu/flywheel/core/model/WorldModelBuilder.java # src/main/java/com/jozufozu/flywheel/core/vertex/AbstractVertexList.java # src/main/java/com/jozufozu/flywheel/core/vertex/BlockVertexList.java # src/main/java/com/jozufozu/flywheel/event/ForgeEvents.java # src/main/java/com/jozufozu/flywheel/mixin/ClientMainMixin.java # src/main/java/com/jozufozu/flywheel/mixin/LevelRendererMixin.java # src/main/resources/flywheel.mixins.json		2023-03-28 13:22:53 -07:00
..
ISSUE_TEMPLATE	Merge branch '1.18/dev' into 1.18/next	2023-03-28 13:22:53 -07:00
FUNDING.yml