Anvilcraft/Create
1
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-17 17:13:41 +01:00
Code Issues Projects Releases Packages Wiki Activity
Create/src/main/java/com/simibubi/create
History
JozsefA 341a385628 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector 
# Conflicts:
#	src/generated/resources/assets/create/lang/en_us.json
#	src/main/java/com/simibubi/create/AllBlocks.java
#	src/main/java/com/simibubi/create/AllTileEntities.java
#	src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntity.java
#	src/main/java/com/simibubi/create/foundation/gui/AllIcons.java
#	src/main/java/com/simibubi/create/foundation/networking/AllPackets.java
#	src/main/resources/assets/create/textures/gui/icons.png
#	src/main/resources/create.mixins.json
2021-05-23 14:11:40 -07:00
..
compat/jei Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector 2021-05-23 14:11:40 -07:00
content Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector 2021-05-23 14:11:40 -07:00
events Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector 2021-05-23 14:11:40 -07:00
foundation Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector 2021-05-23 14:11:40 -07:00
AllBlockPartials.java Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector 2021-05-23 14:11:40 -07:00
AllBlocks.java Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector 2021-05-23 14:11:40 -07:00
AllColorHandlers.java Housekeeping 2021-04-08 19:22:11 +02:00
AllContainerTypes.java Basic projector gui 2021-04-22 16:02:16 -07:00
AllEntityTypes.java Housekeeping 2021-04-08 19:22:11 +02:00
AllFluids.java Merge branch 'mc1.15/dev' into mc1.16/dev 2021-01-04 14:15:53 +01:00
AllItems.java Subcreatica, Part II 2021-05-04 18:04:00 +02:00
AllKeys.java Housekeeping 2021-04-08 19:22:11 +02:00
AllMovementBehaviours.java Housekeeping 2021-04-08 19:22:11 +02:00
AllParticleTypes.java Spinny vortex 2020-11-06 19:45:38 +01:00
AllRecipeTypes.java Deploying items on items 2021-05-06 16:40:33 +02:00
AllShapes.java Subcreatica 2021-05-04 03:50:17 +02:00
AllSoundEvents.java Deploying items on items 2021-05-06 16:40:33 +02:00
AllSpecialTextures.java Housekeeping 2021-04-08 19:22:11 +02:00
AllSpriteShifts.java Housekeeping 2021-04-08 19:22:11 +02:00
AllTags.java Fix beds on contraptions 2021-05-18 18:50:54 -07:00
AllTileEntities.java Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector 2021-05-23 14:11:40 -07:00
Create.java Subcreatica, Part II 2021-05-04 18:04:00 +02:00
CreateClient.java Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector 2021-05-23 14:11:40 -07:00