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
..
ISSUE_TEMPLATE	Instance Refactor I	2023-04-04 12:36:54 -07:00
workflows	Merge remote-tracking branch 'upstream/1.20/dev' into feat/multi-loader-1.21	2024-12-08 10:55:55 -05:00
FUNDING.yml	Create FUNDING.yml	2022-01-25 10:13:24 -08:00
logo.png	Lookin good	2024-12-24 17:22:32 -08:00