mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-03-04 14:54:42 +01:00
Code Issues Projects Releases Packages Wiki Activity
Create/src
History
IThundxr 55dde7bc80
Merge branch 'refs/heads/mc1.20.1/feature-dev' into mc1.21.1/dev 
# Conflicts:
#	src/generated/resources/.cache/3055aa55530438925fbff1670d3e8dc6cc209bf3
#	src/generated/resources/.cache/c24b4d2b8d15abff51c78bd94f4403d9eae6c139
#	src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorBlockEntity.java
#	src/main/java/com/simibubi/create/content/schematics/SchematicItem.java
2025-01-10 21:43:53 -05:00
..
generated/resources Merge branch 'refs/heads/mc1.20.1/feature-dev' into mc1.21.1/dev 2025-01-10 21:43:53 -05:00
main Merge branch 'refs/heads/mc1.20.1/feature-dev' into mc1.21.1/dev 2025-01-10 21:43:53 -05:00