Zelophed 82e922032a Merge branch 'mc1.15/feedback2' into mc1.15/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/components/structureMovement/Contraption.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingContraption.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkContraption.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/StabilizedContraption.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonContraption.java # src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyContraption.java		2021-02-11 20:07:38 +01:00
..
java/com/simibubi/create	Merge branch 'mc1.15/feedback2' into mc1.15/dev	2021-02-11 20:07:38 +01:00
resources	Merge branch 'mc1.15/feedback2' into mc1.15/dev	2021-02-11 20:07:38 +01:00