IThundxr 5e642245b7 Merge remote-tracking branch 'refs/remotes/upstream/1.20/dev' into feat/multi-loader-1.21 ... # Conflicts: # common/src/lib/java/dev/engine_room/flywheel/lib/material/Materials.java # common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/MeshHelper.java # common/src/lib/java/dev/engine_room/flywheel/lib/visual/component/ShadowComponent.java # common/src/main/java/dev/engine_room/flywheel/impl/mixin/LevelRendererMixin.java # common/src/main/java/dev/engine_room/flywheel/impl/mixin/visualmanage/SectionCompilerMixin.java # forge/src/api/java/dev/engine_room/flywheel/api/event/BeginFrameEvent.java # forge/src/api/java/dev/engine_room/flywheel/api/event/RenderStageEvent.java # forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/PartialModelEventHandler.java # forge/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplatImpl.java # forge/src/main/java/dev/engine_room/flywheel/impl/mixin/sodium/ChunkBuilderMeshingTaskMixin.java		2024-07-27 21:59:46 -04:00
..
src	Merge remote-tracking branch 'refs/remotes/upstream/1.20/dev' into feat/multi-loader-1.21	2024-07-27 21:59:46 -04:00
build.gradle.kts	Use better method for telling loom to remap api artifacts	2024-05-17 08:43:56 -07:00
gradle.properties