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
..
default	Player Feedback, Part II	2021-02-11 17:47:55 +01:00
de_de.json	Integrate recent changes to de_de.json	2021-02-05 18:11:18 +01:00
es_mx.json	en_mx.json	2021-02-05 18:42:08 +01:00
fr_fr.json	Update fr_fr.json	2021-02-06 17:34:37 +01:00
it_it.json	it_it.json	2021-02-05 20:02:39 +01:00
ja_jp.json	ja_jp.json	2021-02-05 19:14:06 +01:00
ko_kr.json	Nevermine the past fix. This is the right one	2020-12-25 18:11:54 +09:00
Localization Readme.txt	Update Localization Readme.txt	2021-02-05 17:48:41 +01:00
nl_nl.json	Populang hotfix	2020-07-02 17:39:31 +02:00
pt_br.json	Stone variant recipes	2020-05-31 19:17:00 +02:00
ru_ru.json	ru_ru.json	2021-02-05 20:31:49 +01:00
zh_cn.json	change some details	2021-01-30 12:24:16 +08:00
zh_tw.json	Add files via upload	2021-02-04 21:41:48 +09:00