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
..
advancement	Clean up in world processing	2021-05-26 19:47:19 -07:00
block	Merge remote-tracking branch 'origin/mc1.16/dev' into chromatic-projector	2021-06-11 10:31:18 -07:00
collision	Housekeeping	2021-04-08 19:22:11 +02:00
command	Yeet	2021-06-19 00:29:18 -07:00
config	Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector	2021-06-19 16:11:18 -07:00
data	Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector	2021-06-22 21:13:34 -07:00
fluid	Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector	2021-06-22 21:13:34 -07:00
gui	Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector	2021-06-19 16:11:18 -07:00
item	Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector	2021-06-19 16:11:18 -07:00
mixin	Cleanup and get ready to merge	2021-06-22 21:09:32 -07:00
networking	Merge remote-tracking branch 'origin/mc1.16/dev' into chromatic-projector	2021-06-11 10:31:18 -07:00
ponder	Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector	2021-06-22 21:13:34 -07:00
render	Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector	2021-06-19 16:11:18 -07:00
renderState	Ponder prep	2021-06-18 12:45:43 +02:00
sound	Return of the buttons	2021-06-17 16:20:15 +02:00
tileEntity	Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector	2021-06-22 21:13:34 -07:00
utility	Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector	2021-06-22 21:13:34 -07:00
worldgen	Housekeeping	2021-04-08 19:22:11 +02:00
BreakProgressHook.java	Better belt breaking	2021-05-11 11:39:13 -07:00
ResourceReloadHandler.java	Return of the buttons	2021-06-17 16:20:15 +02:00