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 |
|
PepperCode1
|
2697fc11d3
|
Inline platform-specific model builders
|
2024-12-08 12:15:52 -08:00 |
|
IThundxr
|
566df485d5
|
Embeddium compat
|
2024-12-08 11:06:48 -05:00 |
|
IThundxr
|
db9e1b753a
|
Merge remote-tracking branch 'upstream/1.20/dev' into feat/multi-loader-1.21
|
2024-12-08 10:55:55 -05:00 |
|
IThundxr
|
69d92099ab
|
fix sodium dep
|
2024-11-20 13:57:59 -05:00 |
|
IThundxr
|
eb1c56e9ac
|
Merge remote-tracking branch 'upstream/1.20/dev' into feat/multi-loader-1.21
|
2024-11-16 13:44:29 -05:00 |
|
IThundxr
|
89d87555e6
|
Merge remote-tracking branch 'upstream/1.20/dev' into feat/multi-loader-1.21
|
2024-11-13 16:30:36 -05:00 |
|
IThundxr
|
cc21fd2b3b
|
Rename subproject to neoforge
|
2024-11-13 16:28:01 -05:00 |
|