JozsefA 64c55c1205 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector ... # Conflicts: # README.md # src/generated/resources/.cache/cache # src/generated/resources/assets/create/lang/unfinished/de_de.json # src/generated/resources/assets/create/lang/unfinished/es_es.json # src/generated/resources/assets/create/lang/unfinished/es_mx.json # src/generated/resources/assets/create/lang/unfinished/fr_fr.json # src/generated/resources/assets/create/lang/unfinished/it_it.json # src/generated/resources/assets/create/lang/unfinished/ja_jp.json # src/generated/resources/assets/create/lang/unfinished/ko_kr.json # src/generated/resources/assets/create/lang/unfinished/nl_nl.json # src/generated/resources/assets/create/lang/unfinished/pl_pl.json # src/generated/resources/assets/create/lang/unfinished/pt_br.json # src/generated/resources/assets/create/lang/unfinished/ru_ru.json # src/generated/resources/assets/create/lang/unfinished/zh_cn.json # src/generated/resources/assets/create/lang/unfinished/zh_tw.json # src/main/java/com/simibubi/create/foundation/fluid/FluidRenderer.java		2021-06-22 21:13:34 -07:00
..
compat/jei	Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector	2021-06-19 16:11:18 -07:00
content	Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector	2021-06-22 21:13:34 -07:00
events	Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector	2021-06-19 16:11:18 -07:00
foundation	Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector	2021-06-22 21:13:34 -07:00
AllBlockPartials.java	Merge remote-tracking branch 'origin/mc1.16/dev' into chromatic-projector	2021-06-11 10:31:18 -07:00
AllBlocks.java	Cleanup and get ready to merge	2021-06-22 21:09:32 -07:00
AllColorHandlers.java	Merge remote-tracking branch 'origin/mc1.16/dev' into chromatic-projector	2021-06-11 10:31:18 -07:00
AllContainerTypes.java	GUI cleanup and fixes	2021-06-12 21:16:16 -07:00
AllEntityTypes.java	Yeet	2021-06-19 00:29:18 -07:00
AllFluids.java	Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector	2021-05-25 12:23:55 -07:00
AllItems.java	Merge remote-tracking branch 'origin/mc1.16/dev' into chromatic-projector	2021-06-11 10:31:18 -07:00
AllKeys.java	Init Cleanup	2021-05-22 18:00:10 -07:00
AllMovementBehaviours.java	Init Cleanup	2021-05-22 18:00:10 -07: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	SoundScapes, Part IV	2021-05-31 20:48:22 +02:00
AllSpecialTextures.java	Init Cleanup	2021-05-22 18:00:10 -07:00
AllSpriteShifts.java	Fix registry crash induced by AbnormalsCore 3.2.0	2021-06-15 00:57:29 -04:00
AllStitchedTextures.java	Instanced entities are lit	2021-06-09 00:26:54 -07:00
AllTags.java	Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector	2021-06-19 16:11:18 -07:00
AllTileEntities.java	Cleanup and get ready to merge	2021-06-22 21:09:32 -07:00
Create.java	Merge remote-tracking branch 'origin/mc1.16/dev' into chromatic-projector	2021-06-11 10:31:18 -07:00
CreateClient.java	Yeet	2021-06-19 00:29:18 -07:00