imports/architectury-api
1
0
Fork 0
mirror of https://github.com/architectury/architectury-api.git synced 2026-03-28 03:56:59 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
2c21eeeaf7e0987962b5ac7483ff8f12697b08e1
architectury-api/testmod-common
History
shedaniel 2c21eeeaf7 Merge remote-tracking branch 'architectury/1.16' into 1.17 
Signed-off-by: shedaniel <daniel@shedaniel.me>

# Conflicts:
#	common/src/main/java/me/shedaniel/architectury/event/events/EntityEvent.java
#	common/src/main/java/me/shedaniel/architectury/registry/entity/EntityRenderers.java
#	common/src/main/java/me/shedaniel/architectury/utils/Fraction.java
#	fabric/src/main/java/me/shedaniel/architectury/hooks/fabric/EntityHooksImpl.java
#	fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/MixinCollisionContext.java
#	fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/MixinEntityCollisionContext.java
#	fabric/src/main/java/me/shedaniel/architectury/registry/entity/fabric/EntityRenderersImpl.java
#	fabric/src/main/resources/architectury.mixins.json
#	gradle.properties
2021-05-03 00:58:19 +08:00
..
src/main
Merge remote-tracking branch 'architectury/1.16' into 1.17
2021-05-03 00:58:19 +08:00
build.gradle
Update to 21w06a
2021-02-11 21:45:52 +08:00