IThundxr 07e66bb299 Merge remote-tracking branch 'upstream/1.20/dev' into feat/multi-loader-1.21 ... # Conflicts: # common/src/lib/java/dev/engine_room/flywheel/lib/util/ShadersModHandler.java # common/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplat.java # common/src/main/java/dev/engine_room/flywheel/impl/compat/SodiumCompat.java # common/src/main/java/dev/engine_room/flywheel/impl/mixin/BlockEntityTypeMixin.java # fabric/build.gradle.kts # fabric/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplatImpl.java # fabric/src/main/java/dev/engine_room/flywheel/impl/FlwLibXplatImpl.java # fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/sodium/ChunkBuilderMeshingTaskMixin.java # fabric/src/main/java/dev/engine_room/flywheel/impl/mixin/sodium/SodiumMixinPlugin.java # fabric/src/main/resources/fabric.mod.json # forge/build.gradle.kts # forge/src/main/java/dev/engine_room/flywheel/impl/FlwImplXplatImpl.java # forge/src/main/java/dev/engine_room/flywheel/impl/FlwLibXplatImpl.java # forge/src/main/java/dev/engine_room/flywheel/impl/FlywheelForge.java # forge/src/main/resources/META-INF/neoforge.mods.toml # gradle.properties # gradle/wrapper/gradle-wrapper.properties		2024-10-29 17:38:23 -04:00
..
src	Merge remote-tracking branch 'upstream/1.20/dev' into feat/multi-loader-1.21	2024-10-29 17:38:23 -04:00
build.gradle.kts	Merge remote-tracking branch 'upstream/1.20/dev' into feat/multi-loader-1.21	2024-10-29 17:38:23 -04:00