Jozufozu 7adc132a0a Merge branch '1.20.1/dev' into 1.21.1/dev ... # Conflicts: # common/src/api/java/dev/engine_room/flywheel/api/Flywheel.java # common/src/main/java/dev/engine_room/flywheel/impl/event/RenderContextImpl.java # common/src/main/java/dev/engine_room/flywheel/impl/mixin/LevelRendererMixin.java # fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/MeshEmitter.java # fabric/src/main/java/dev/engine_room/flywheel/impl/FabricFlwConfig.java # forge/src/main/java/dev/engine_room/flywheel/impl/FlywheelForge.java # neoforge/src/main/java/dev/engine_room/flywheel/impl/NeoForgeFlwConfig.java		2025-02-26 22:16:19 -08:00
..
src	Merge branch '1.20.1/dev' into 1.21.1/dev	2025-02-26 22:16:19 -08:00
build.gradle.kts	Merge branch '1.20.1/dev' into 1.21.1/dev	2025-01-21 17:26:30 -06:00
gradle.properties	Minor clean up and fixes	2024-05-17 08:43:56 -07:00