Jozufozu ea4ec918a6 Merge remote-tracking branch 'origin/1.20/next' into 1.20/next ... # Conflicts: # src/main/java/com/jozufozu/flywheel/backend/compile/PipelineCompiler.java # src/main/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectBuffers.java # src/main/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectCullingGroup.java # src/main/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectDrawManager.java # src/main/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectEngine.java # src/main/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectInstancer.java # src/main/java/com/jozufozu/flywheel/backend/engine/indirect/IndirectModel.java # src/main/resources/assets/flywheel/flywheel/internal/indirect/draw.vert # src/main/resources/assets/flywheel/flywheel/internal/instancing/main.vert # src/main/resources/assets/flywheel/flywheel/internal/layout.vert		2023-12-07 12:56:10 -08:00
..
assets/flywheel/flywheel	Merge remote-tracking branch 'origin/1.20/next' into 1.20/next	2023-12-07 12:56:10 -08:00
META-INF	Port fixes and other changes	2023-11-25 14:09:30 -08:00
flywheel.mixins.json	Re-reload	2023-11-29 20:03:26 -08:00
flywheel.sodium.mixins.json	Port fixes and other changes	2023-11-25 14:09:30 -08:00
logo.png	Fix mixins sometimes not remapping	2022-07-15 09:42:14 -07:00
pack.mcmeta	Port fixes and other changes	2023-11-25 14:09:30 -08:00