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
..
assets	Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector	2021-05-23 14:11:40 -07:00
data	The great second purge of Tools	2021-05-01 13:19:01 +02:00
META-INF	Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector	2021-05-23 14:11:40 -07:00
ponder	A final thought	2021-03-28 18:57:50 +02:00
create.mixins.json	Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector	2021-05-23 14:11:40 -07:00
pack.mcmeta	Port new changes	2021-02-06 22:03:48 +01:00