IThundxr 14a6447806 Merge remote-tracking branch 'upstream/1.20/dev' into feat/multi-loader-1.21 ... # Conflicts: # common/src/lib/java/dev/engine_room/flywheel/lib/internal/FlwLibXplat.java # common/src/lib/java/dev/engine_room/flywheel/lib/model/ModelUtil.java # common/src/lib/java/dev/engine_room/flywheel/lib/model/Models.java # fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/FabricBakedModelBuilder.java # fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/FabricBlockModelBuilder.java # fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/FabricMultiBlockModelBuilder.java # fabric/src/main/java/dev/engine_room/flywheel/impl/FlwLibXplatImpl.java # forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ForgeBakedModelBuilder.java # forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ForgeBlockModelBuilder.java # forge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/ForgeMultiBlockModelBuilder.java # forge/src/main/java/dev/engine_room/flywheel/impl/FlywheelForge.java # neoforge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/BakedModelBufferer.java # neoforge/src/main/java/dev/engine_room/flywheel/impl/FlwLibXplatImpl.java		2024-12-27 11:24:29 -05:00
..
src	Merge remote-tracking branch 'upstream/1.20/dev' into feat/multi-loader-1.21	2024-12-27 11:24:29 -05:00
build.gradle.kts	Stubborn stubs	2024-11-03 15:02:26 -05:00