tterrag 696393ec41 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.16/dev ... # Conflicts: # src/generated/resources/.cache/cache # src/generated/resources/assets/create/lang/unfinished/de_de.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/pt_br.json # src/generated/resources/assets/create/lang/unfinished/ru_ru.json # src/generated/resources/assets/create/lang/unfinished/zh_cn.json # src/main/java/com/simibubi/create/content/contraptions/base/GeneratingKineticTileEntity.java # src/main/java/com/simibubi/create/content/contraptions/base/IRotate.java # src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java # src/main/java/com/simibubi/create/content/contraptions/relays/gauge/SpeedGaugeTileEntity.java # src/main/java/com/simibubi/create/content/contraptions/relays/gauge/StressGaugeTileEntity.java # src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteTileEntity.java # src/main/java/com/simibubi/create/foundation/item/ItemDescription.java		2020-11-28 17:24:30 -05:00
..
generated/resources	Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.16/dev	2020-11-28 17:24:30 -05:00
main	Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.16/dev	2020-11-28 17:24:30 -05:00