Jozufozu e43261302a Merge remote-tracking branch 'origin/1.18/next' into 1.18/next ... # Conflicts: # src/main/java/com/jozufozu/flywheel/api/material/Material.java # src/main/java/com/jozufozu/flywheel/backend/instancing/InstancedRenderDispatcher.java # src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancingEngine.java # src/main/java/com/jozufozu/flywheel/core/BasicModelSupplier.java # src/main/java/com/jozufozu/flywheel/core/crumbling/CrumblingRenderer.java # src/main/java/com/jozufozu/flywheel/vanilla/BellInstance.java # src/main/java/com/jozufozu/flywheel/vanilla/ChestInstance.java # src/main/java/com/jozufozu/flywheel/vanilla/MinecartInstance.java # src/main/java/com/jozufozu/flywheel/vanilla/ShulkerBoxInstance.java # src/main/resources/flywheel.mixins.json		2022-07-22 17:48:40 -07:00
..
java/com/jozufozu/flywheel	Merge remote-tracking branch 'origin/1.18/next' into 1.18/next	2022-07-22 17:48:40 -07:00
resources	Merge remote-tracking branch 'origin/1.18/next' into 1.18/next	2022-07-22 17:48:40 -07:00