Merge a12855b10d into d66170c8fe

src/generated/resources/.cache/cache

@@ -582,8 +582,8 @@ bf2b0310500213ff853c748c236eb5d01f61658e assets/create/blockstates/yellow_toolbo
 5616dda664dd106d576848124fc0fc1de18d0fd3 assets/create/blockstates/yellow_valve_handle.json
 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json
 b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json
-390244ea1a4e56fb33c66490a033bd0b4870d0b8 assets/create/lang/en_ud.json
-9d2ef7ec16aec62ac33b2c0debb6b368d0fdf7f8 assets/create/lang/en_us.json
+ae9e16251579cb58f4f7f7120fc36f8c816ef8f5 assets/create/lang/en_ud.json
+f2803be2f151312307837c189a757943f1bae2f7 assets/create/lang/en_us.json
 487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json
 b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json
 3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json

src/generated/resources/assets/create/lang/en_ud.json

@@ -902,7 +902,7 @@
   "create.contraptions.clockwork.hour_first": "\u0287s\u0279\u0131\u025F pu\u0250\u0265 \u0279noH",
   "create.contraptions.clockwork.hour_first_24": "\u0287s\u0279\u0131\u025F pu\u0250\u0265 \u0279noH-\u3123\u1105",
   "create.contraptions.clockwork.minute_first": "\u0287s\u0279\u0131\u025F pu\u0250\u0265 \u01DD\u0287nu\u0131W",
-  "create.contraptions.contoller.target": "\u0287u\u01DDuod\u026Fo\u0186 p\u01DD\u0287\u01DDb\u0279\u0250\u27D8",
+  "create.contraptions.controller.target": "\u0287u\u01DDuod\u026Fo\u0186 p\u01DD\u0287\u01DDb\u0279\u0250\u27D8",
   "create.contraptions.mechanical_roller.pave_material": "\u05DF\u0250\u0131\u0279\u01DD\u0287\u0250W bu\u0131\u028C\u0250\u0500",
   "create.contraptions.movement_mode": "\u01DDpoW \u0287u\u01DD\u026F\u01DD\u028CoW",
   "create.contraptions.movement_mode.move_never_place": "p\u01DD\u028Eo\u0279\u0287s\u01DD\u15E1 \u0279o\u0265\u0254u\u2C6F u\u01DD\u0265\u028D \u028E\u05DFuo \u01DD\u0254\u0250\u05DF\u0500",
@@ -1776,7 +1776,7 @@
   "create.ponder.mechanical_arm_redstone.text_1": "\u01DD\u0287\u0250\u028C\u0131\u0287\u0254\u0250 \u0287ou \u05DF\u05DF\u0131\u028D s\u026F\u0279\u2C6F \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW '\u01DDuo\u0287sp\u01DD\u1D1A \u028Eq p\u01DD\u0279\u01DD\u028Dod u\u01DD\u0265M",
   "create.ponder.mechanical_arm_redstone.text_2": "s\u01DD\u05DF\u0254\u028E\u0254 p\u01DD\u0287\u0279\u0250\u0287s \u028Eu\u0250 \u0265s\u0131u\u0131\u025F \u05DF\u05DF\u0131\u028D \u0287\u0131 'bu\u0131ddo\u0287s \u01DD\u0279o\u025F\u01DD\u15FA",
   "create.ponder.mechanical_arm_redstone.text_3": "\u01DD\u05DF\u0254\u028E\u0254 uo\u0131\u0287\u0250\u028C\u0131\u0287\u0254\u0250 \u01DDuo \u028E\u05DF\u0287\u0254\u0250x\u01DD \u0279\u01DDbb\u0131\u0279\u0287 o\u0287 p\u01DDsn \u01DDq u\u0250\u0254 \u01DDs\u05DFnd \u01DD\u028C\u0131\u0287\u0250b\u01DDu \u0250 'sn\u0265\u27D8",
-  "create.ponder.mechanical_bearing.header": "bu\u0131\u0279\u0250\u01DD\u15FA \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW \u01DD\u0265\u0287 bu\u0131sn s\u01DD\u0279n\u0287\u0254n\u0279\u0287S sbu\u0131\u028CoW",
+  "create.ponder.mechanical_bearing.header": "bu\u0131\u0279\u0250\u01DD\u15FA \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW \u01DD\u0265\u0287 bu\u0131sn s\u01DD\u0279n\u0287\u0254n\u0279\u0287S bu\u0131\u028CoW",
   "create.ponder.mechanical_bearing.text_1": "\u026F\u01DD\u0265\u0287 \u025Fo \u0287uo\u0279\u025F u\u0131 \u029E\u0254o\u05DFq \u01DD\u0265\u0287 o\u0287 \u0265\u0254\u0250\u0287\u0287\u0250 sbu\u0131\u0279\u0250\u01DD\u15FA \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW",
   "create.ponder.mechanical_bearing.text_2": "uo\u0131\u0287d\u0250\u0279\u0287uo\u0186 bu\u0131\u0287\u0250\u0287o\u1D1A \u0250 o\u0287u\u0131 \u0287\u0131 \u01DD\u05DFq\u026F\u01DDss\u0250 \u05DF\u05DF\u0131\u028D \u0287\u0131 '\u01DD\u0254\u0279o\u2132 \u05DF\u0250uo\u0131\u0287\u0250\u0287o\u1D1A bu\u0131\u028C\u0131\u01DD\u0254\u01DD\u0279 uod\u2229",
   "create.ponder.mechanical_crafter.header": "s\u0279\u01DD\u0287\u025F\u0250\u0279\u0186 \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW dn bu\u0131\u0287\u0287\u01DDS",

src/generated/resources/assets/create/lang/en_us.json

@@ -902,7 +902,7 @@
   "create.contraptions.clockwork.hour_first": "Hour hand first",
   "create.contraptions.clockwork.hour_first_24": "24-Hour hand first",
   "create.contraptions.clockwork.minute_first": "Minute hand first",
-  "create.contraptions.contoller.target": "Targeted Component",
+  "create.contraptions.controller.target": "Targeted Component",
   "create.contraptions.mechanical_roller.pave_material": "Paving Material",
   "create.contraptions.movement_mode": "Movement Mode",
   "create.contraptions.movement_mode.move_never_place": "Place only when Anchor Destroyed",
@@ -1776,7 +1776,7 @@
   "create.ponder.mechanical_arm_redstone.text_1": "When powered by Redstone, Mechanical Arms will not activate",
   "create.ponder.mechanical_arm_redstone.text_2": "Before stopping, it will finish any started cycles",
   "create.ponder.mechanical_arm_redstone.text_3": "Thus, a negative pulse can be used to trigger exactly one activation cycle",
-  "create.ponder.mechanical_bearing.header": "Movings Structures using the Mechanical Bearing",
+  "create.ponder.mechanical_bearing.header": "Moving Structures using the Mechanical Bearing",
   "create.ponder.mechanical_bearing.text_1": "Mechanical Bearings attach to the block in front of them",
   "create.ponder.mechanical_bearing.text_2": "Upon receiving Rotational Force, it will assemble it into a Rotating Contraption",
   "create.ponder.mechanical_crafter.header": "Setting up Mechanical Crafters",

src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsBlockEntity.java

@@ -50,7 +50,7 @@ public class ContraptionControlsBlockEntity extends SmartBlockEntity {
 	@Override
 	public void addBehaviours(List<BlockEntityBehaviour> behaviours) {
 		behaviours.add(filtering = new FilteringBehaviour(this, new ControlsSlot()));
-		filtering.setLabel(Lang.translateDirect("contraptions.contoller.target"));
+		filtering.setLabel(Lang.translateDirect("contraptions.controller.target"));
 		filtering.withPredicate(AllItemTags.CONTRAPTION_CONTROLLED::matches);
 	}
 

src/main/java/com/simibubi/create/infrastructure/ponder/scenes/BearingScenes.java

@@ -238,7 +238,7 @@ public class BearingScenes {
 	}
 
 	public static void mechanicalBearing(SceneBuilder scene, SceneBuildingUtil util) {
-		scene.title("mechanical_bearing", "Movings Structures using the Mechanical Bearing");
+		scene.title("mechanical_bearing", "Moving Structures using the Mechanical Bearing");
 		scene.configureBasePlate(1, 1, 5);
 		scene.setSceneOffsetY(-1);
 		scene.world.showSection(util.select.layer(0), Direction.UP);

src/main/resources/assets/create/lang/cs_cz.json

@@ -900,7 +900,7 @@
   "create.contraptions.clockwork.hour_first": "První hodinová ručička",
   "create.contraptions.clockwork.hour_first_24": "První 24-hodinová ručička",
   "create.contraptions.clockwork.minute_first": "První minutová ručička",
-  "create.contraptions.contoller.target": "Cílová složka",
+  "create.contraptions.controller.target": "Cílová složka",
   "create.contraptions.mechanical_roller.pave_material": "Dlažební materiál",
   "create.contraptions.movement_mode": "Režim pohybu",
   "create.contraptions.movement_mode.move_never_place": "Umístit pouze při zničení kotvy",

src/main/resources/assets/create/lang/de_de.json

@@ -900,7 +900,7 @@
   "create.contraptions.clockwork.hour_first": "Stundenzeiger zuerst",
   "create.contraptions.clockwork.hour_first_24": "24-Stunden-Zeiger zuerst",
   "create.contraptions.clockwork.minute_first": "Minutenzeiger zuerst",
-  "create.contraptions.contoller.target": "Zielkomponente",
+  "create.contraptions.controller.target": "Zielkomponente",
   "create.contraptions.mechanical_roller.pave_material": "Fundamentmaterial",
   "create.contraptions.movement_mode": "Bewegungsmodus",
   "create.contraptions.movement_mode.move_never_place": "Platziere nur wenn Anker zerstört",

src/main/resources/assets/create/lang/default/interface.json

@@ -240,7 +240,7 @@
 
 	"create.logistics.redstone_interval": "Redstone Interval",
 
-	"create.contraptions.contoller.target": "Targeted Component",
+	"create.contraptions.controller.target": "Targeted Component",
 	"create.contraptions.mechanical_roller.pave_material": "Paving Material",
 
 	"create.contraptions.chassis.radius": "Radius when Sticky",

src/main/resources/assets/create/lang/es_es.json

@@ -895,7 +895,7 @@
   "create.contraptions.clockwork.hour_first": "La manecilla de las horas primero",
   "create.contraptions.clockwork.hour_first_24": "La manecilla del día primero",
   "create.contraptions.clockwork.minute_first": "La manecilla de los minutos primero",
-  "create.contraptions.contoller.target": "Componente Seleccionado",
+  "create.contraptions.controller.target": "Componente Seleccionado",
   "create.contraptions.mechanical_roller.pave_material": "Material para Rellenar",
   "create.contraptions.movement_mode": "Modo de movimiento",
   "create.contraptions.movement_mode.move_never_place": "Colocar sólo cuando se destruye el ancla",

src/main/resources/assets/create/lang/fr_fr.json

@@ -900,7 +900,7 @@
   "create.contraptions.clockwork.hour_first": "Aiguille des heures en premier",
   "create.contraptions.clockwork.hour_first_24": "Aiguille des 24 heures en premier",
   "create.contraptions.clockwork.minute_first": "Aiguille des minutes en premier",
-  "create.contraptions.contoller.target": "Composant ciblé",
+  "create.contraptions.controller.target": "Composant ciblé",
   "create.contraptions.mechanical_roller.pave_material": "Matériau de pavage",
   "create.contraptions.movement_mode": "Mode de mouvement",
   "create.contraptions.movement_mode.move_never_place": "Ne placer que quand l'ancre est détruite",

src/main/resources/assets/create/lang/hu_hu.json

@@ -868,7 +868,7 @@
   "create.contraptions.clockwork.hour_first": "Óramutató először",
   "create.contraptions.clockwork.hour_first_24": "Napszakmutató először",
   "create.contraptions.clockwork.minute_first": "Percmutató először",
-  "create.contraptions.contoller.target": "Vezérelt alkatrész",
+  "create.contraptions.controller.target": "Vezérelt alkatrész",
   "create.contraptions.mechanical_roller.pave_material": "Burkolóanyag",
   "create.contraptions.movement_mode": "Lehelyezés",
   "create.contraptions.movement_mode.move_never_place": "Csak a rögzítés lebontásakor",

src/main/resources/assets/create/lang/it_it.json

@@ -900,7 +900,7 @@
   "create.contraptions.clockwork.hour_first": "Prima lancetta delle ore",
   "create.contraptions.clockwork.hour_first_24": "Prima lancetta delle 24 ore",
   "create.contraptions.clockwork.minute_first": "Prima lancetta dei minuti",
-  "create.contraptions.contoller.target": "Componente selezionato",
+  "create.contraptions.controller.target": "Componente selezionato",
   "create.contraptions.mechanical_roller.pave_material": "Materiale con cui pavimentare",
   "create.contraptions.movement_mode": "Modalità di movimento",
   "create.contraptions.movement_mode.move_never_place": "Posiziona solo quando distrutto",

src/main/resources/assets/create/lang/ja_jp.json

@@ -900,7 +900,7 @@
   "create.contraptions.clockwork.hour_first": "時針を最初に",
   "create.contraptions.clockwork.hour_first_24": "24時針を最初に",
   "create.contraptions.clockwork.minute_first": "分針を最初に",
-  "create.contraptions.contoller.target": "対象の機械",
+  "create.contraptions.controller.target": "対象の機械",
   "create.contraptions.mechanical_roller.pave_material": "敷き詰める素材",
   "create.contraptions.movement_mode": "移動モード",
   "create.contraptions.movement_mode.move_never_place": "アンカーが破壊されたときにのみ設置",

src/main/resources/assets/create/lang/ko_kr.json

@@ -900,7 +900,7 @@
   "create.contraptions.clockwork.hour_first": "시침 먼저",
   "create.contraptions.clockwork.hour_first_24": "시침 먼저 (24시간 단위)",
   "create.contraptions.clockwork.minute_first": "분침 먼저",
-  "create.contraptions.contoller.target": "대상 장치",
+  "create.contraptions.controller.target": "대상 장치",
   "create.contraptions.mechanical_roller.pave_material": "포장 재료",
   "create.contraptions.movement_mode": "이동 설정",
   "create.contraptions.movement_mode.move_never_place": "멈춰도 구조물을 설치하지 않음",

src/main/resources/assets/create/lang/no_no.json

@@ -900,7 +900,7 @@
   "create.contraptions.clockwork.hour_first": "Timeviseren først",
   "create.contraptions.clockwork.hour_first_24": "24-timeviser først",
   "create.contraptions.clockwork.minute_first": "Minuttviseren først",
-  "create.contraptions.contoller.target": "Valgt komponent",
+  "create.contraptions.controller.target": "Valgt komponent",
   "create.contraptions.mechanical_roller.pave_material": "Underlags-material",
   "create.contraptions.movement_mode": "Bevegelses modus",
   "create.contraptions.movement_mode.move_never_place": "Plasser bare hvis ankeret ødelegges",

src/main/resources/assets/create/lang/pl_pl.json

@@ -898,7 +898,7 @@
   "create.contraptions.clockwork.hour_first": "Najpierw wskazówka godzinowa",
   "create.contraptions.clockwork.hour_first_24": "Najpierw wskazówka 24-godzinna",
   "create.contraptions.clockwork.minute_first": "Najpierw wskazówka minutowa",
-  "create.contraptions.contoller.target": "Wybrany komponent",
+  "create.contraptions.controller.target": "Wybrany komponent",
   "create.contraptions.mechanical_roller.pave_material": "Materiał nawierzchniowy",
   "create.contraptions.movement_mode": "Tryb poruszania",
   "create.contraptions.movement_mode.move_never_place": "Stawiaj jedynie, gdy kotwica jest zniszczona",

src/main/resources/assets/create/lang/pt_br.json

@@ -900,7 +900,7 @@
   "create.contraptions.clockwork.hour_first": "Ponteiro da hora primeiro",
   "create.contraptions.clockwork.hour_first_24": "Ponteiro das 24 horas primeiro",
   "create.contraptions.clockwork.minute_first": "Ponteiro do minuto primeiro",
-  "create.contraptions.contoller.target": "Componente Selecionado",
+  "create.contraptions.controller.target": "Componente Selecionado",
   "create.contraptions.mechanical_roller.pave_material": "Material de Pavimentação",
   "create.contraptions.movement_mode": "Modo de movimento",
   "create.contraptions.movement_mode.move_never_place": "Colocar apenas caso a âncora seja destruída",

src/main/resources/assets/create/lang/pt_pt.json

@@ -843,7 +843,7 @@
   "create.contraptions.clockwork.hour_first": "Ponteiro das horas primeiro",
   "create.contraptions.clockwork.hour_first_24": "Ponteiro de 24 horas primeiro",
   "create.contraptions.clockwork.minute_first": "Ponteiro dos minutos primeiro",
-  "create.contraptions.contoller.target": "Componente alvo",
+  "create.contraptions.controller.target": "Componente alvo",
   "create.contraptions.mechanical_roller.pave_material": "Material de pavimento",
   "create.contraptions.movement_mode": "Modo de movimento",
   "create.contraptions.movement_mode.move_never_place": "Colocar apenas quando a âncora for destruída",

src/main/resources/assets/create/lang/ro_ro.json

@@ -860,7 +860,7 @@
   "create.contraptions.clockwork.hour_first": "Acul orei primul",
   "create.contraptions.clockwork.hour_first_24": "Acul de 24 de ore primul",
   "create.contraptions.clockwork.minute_first": "Acul minutului primul",
-  "create.contraptions.contoller.target": "Componentă vizată",
+  "create.contraptions.controller.target": "Componentă vizată",
   "create.contraptions.mechanical_roller.pave_material": "Material de pavaj",
   "create.contraptions.movement_mode": "Mod de Mișcare",
   "create.contraptions.movement_mode.move_never_place": "Plasează doar când Ancora e Distrusă",

src/main/resources/assets/create/lang/ru_ru.json

@@ -900,7 +900,7 @@
   "create.contraptions.clockwork.hour_first": "Сначала часовая стрелка",
   "create.contraptions.clockwork.hour_first_24": "Сначала 24-часовая стрелка",
   "create.contraptions.clockwork.minute_first": "Сначала минутная стрелка",
-  "create.contraptions.contoller.target": "Целевой компонент",
+  "create.contraptions.controller.target": "Целевой компонент",
   "create.contraptions.mechanical_roller.pave_material": "Материал укладки",
   "create.contraptions.movement_mode": "Режим движения",
   "create.contraptions.movement_mode.move_never_place": "Разобрать, если опора уничтожена",

src/main/resources/assets/create/lang/sv_se.json

@@ -897,7 +897,7 @@
   "create.contraptions.clockwork.hour_first": "Timvisaren först",
   "create.contraptions.clockwork.hour_first_24": "24-timmarsvisaren först",
   "create.contraptions.clockwork.minute_first": "Minutvisaren först",
-  "create.contraptions.contoller.target": "Målinriktat redskap",
+  "create.contraptions.controller.target": "Målinriktat redskap",
   "create.contraptions.mechanical_roller.pave_material": "Beläggningsmaterial",
   "create.contraptions.movement_mode": "Rörelseläge",
   "create.contraptions.movement_mode.move_never_place": "Placera endast när ankaren har förstörts",

src/main/resources/assets/create/lang/tr_tr.json

@@ -866,7 +866,7 @@
   "create.contraptions.clockwork.hour_first": "Önce Saat Akrebi",
   "create.contraptions.clockwork.hour_first_24": "Önce 24 Saatlik Saat Akrebi",
   "create.contraptions.clockwork.minute_first": "Önce Saat Yelkovanı",
-  "create.contraptions.contoller.target": "Hedeflenen Bileşen",
+  "create.contraptions.controller.target": "Hedeflenen Bileşen",
   "create.contraptions.mechanical_roller.pave_material": "Döşeme Malzemesi",
   "create.contraptions.movement_mode": "Hareket Modu",
   "create.contraptions.movement_mode.move_never_place": "Sadece Çapa Yok edildiğinde Yerleştir",

src/main/resources/assets/create/lang/uk_ua.json

@@ -900,7 +900,7 @@
   "create.contraptions.clockwork.hour_first": "Спочатку годинна стрілка",
   "create.contraptions.clockwork.hour_first_24": "Спочатку 24-годинна стрілка",
   "create.contraptions.clockwork.minute_first": "Спочатку хвилинна стрілка",
-  "create.contraptions.contoller.target": "Назначений прилад",
+  "create.contraptions.controller.target": "Назначений прилад",
   "create.contraptions.mechanical_roller.pave_material": "Матеріал для брукування",
   "create.contraptions.movement_mode": "Режим руху",
   "create.contraptions.movement_mode.move_never_place": "Розміщувати лише після знищення якоря",

src/main/resources/assets/create/lang/zh_cn.json

@@ -900,7 +900,7 @@
   "create.contraptions.clockwork.hour_first": "时针优先",
   "create.contraptions.clockwork.hour_first_24": "24 小时制优先",
   "create.contraptions.clockwork.minute_first": "分针优先",
-  "create.contraptions.contoller.target": "目标元件",
+  "create.contraptions.controller.target": "目标元件",
   "create.contraptions.mechanical_roller.pave_material": "铺路材料",
   "create.contraptions.movement_mode": "运动模式",
   "create.contraptions.movement_mode.move_never_place": "只有在动力方块摧毁后才将装置方块化",

src/main/resources/assets/create/lang/zh_tw.json

@@ -900,7 +900,7 @@
   "create.contraptions.clockwork.hour_first": "時針優先",
   "create.contraptions.clockwork.hour_first_24": "24小時制優先",
   "create.contraptions.clockwork.minute_first": "分針優先",
-  "create.contraptions.contoller.target": "目標元件",
+  "create.contraptions.controller.target": "目標元件",
   "create.contraptions.mechanical_roller.pave_material": "鋪路物料",
   "create.contraptions.movement_mode": "運動模式",
   "create.contraptions.movement_mode.move_never_place": "只有在機械方塊摧毀後才實體化方塊",