mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-02-22 01:55:33 +01:00
Code Issues Projects Releases Packages Wiki Activity
Create/src
History
PepperBell ffd4c75572 Merge remote-tracking branch 'upstream/mc1.16/dev' into 
mc1.16/model-cleanup

Conflicts:
	src/main/java/com/simibubi/create/content/curiosities/tools/DeforesterItemRenderer.java
	src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItemRenderer.java
2021-05-01 15:46:50 -07:00
..
generated/resources The great second purge of Tools 2021-05-01 13:19:01 +02:00
main Merge remote-tracking branch 'upstream/mc1.16/dev' into 2021-05-01 15:46:50 -07:00