Skip to content

Commit

Permalink
Merge branch 'mc1.18/dev' into mc1.19/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
simibubi committed Aug 10, 2024
2 parents 24cc53c + 842e1bb commit a486b3e
Show file tree
Hide file tree
Showing 49 changed files with 15,295 additions and 4,534 deletions.
12 changes: 12 additions & 0 deletions crowdin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,38 @@
"translation": "src/main/resources/assets/create/lang/%locale_with_underscore%.json",
"languages_mapping": {
"locale_with_underscore": {
"ar": "ar_sa",
"be": "be_by",
"bel": "bel_tr",
"bg": "bg_bg",
"cs": "cs_cz",
"cy": "cy_gb",
"da": "da_dk",
"de": "de_de",
"el": "el_gr",
"en-GB": "en_gb",
"eo": "eo_uy",
"es-CL": "es_cl",
"es-ES": "es_es",
"es-MX": "es_mx",
"et": "et_ee",
"eu": "eu_es",
"fa": "fa_ir",
"fi": "fi_fi",
"fr": "fr_fr",
"fr-CA": "fr_ca",
"hr": "hr_hr",
"hu": "hu_hu",
"hy-AM": "hy_am",
"id": "id_id",
"is": "is_is",
"it": "it_it",
"ja": "ja_jp",
"kk": "kk_kz",
"ko": "ko_kr",
"ksh": "ksh",
"lol": "lol_us",
"lzh": "lzh",
"nl": "nl_nl",
"no": "no_no",
"pl": "pl_pl",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ public void tick() {
if (activeSchematicItem != null && transformation != null)
transformation.tick();

renderers.forEach(SchematicRenderer::tick);

LocalPlayer player = mc.player;
ItemStack stack = findBlueprintInHand(player);
if (stack == null) {
Expand All @@ -115,7 +117,6 @@ public void tick() {
if (!active)
return;

renderers.forEach(SchematicRenderer::tick);
if (syncCooldown > 0)
syncCooldown--;
if (syncCooldown == 1)
Expand Down Expand Up @@ -158,7 +159,7 @@ private void setupRenderer() {
BlockPos pos;

pos = BlockPos.ZERO;

try {
schematic.placeInWorld(w, pos, pos, placementSettings, w.getRandom(), Block.UPDATE_CLIENTS);
for (BlockEntity blockEntity : w.getBlockEntities())
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/assets/create/lang/ar_sa.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1,074 changes: 1,051 additions & 23 deletions src/main/resources/assets/create/lang/be_by.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/main/resources/assets/create/lang/bel_tr.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions src/main/resources/assets/create/lang/bg_bg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
2,175 changes: 1,088 additions & 1,087 deletions src/main/resources/assets/create/lang/cs_cz.json

Large diffs are not rendered by default.

245 changes: 210 additions & 35 deletions src/main/resources/assets/create/lang/cy_gb.json

Large diffs are not rendered by default.

28 changes: 28 additions & 0 deletions src/main/resources/assets/create/lang/da_dk.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,26 @@
"advancement.create.andesite_casing.desc": "Tilføj Andesitlegering til afbarket træ for at fremstille en grundlæggende beklædning til dine maskiner",
"advancement.create.anvil_plough": "Smedartilleri",
"advancement.create.anvil_plough.desc": "Fyr en ambolt af sted med mekaniske plove",
"advancement.create.arm_blaze_burner": "Forbrænd-o-Tron",
"advancement.create.arm_blaze_burner.desc": "Instruere en robotarm til at fylde din blaze Brænder med brændstof",
"advancement.create.arm_many_targets": "Organiseringsmaskine",
"advancement.create.arm_many_targets.desc": "Programmer en Mekanisk Arm med 10 eller flere output placeringer",
"advancement.create.backtank": "Tryk to go",
"advancement.create.belt": "Tangdrev",
"advancement.create.belt.desc": "Forbind to aksler med et mekanisk bånd",
"advancement.create.belt_funnel_kiss.desc": "Få to Transportbånds-monterede Tragte til at kysse\n§7(Skjult Fremskridt)",
"advancement.create.brass": "Ægte legeringer",
"advancement.create.brass_casing": "Messingalderen",
"advancement.create.burner": "Sentient Pejs",
"advancement.create.burner.desc": "Fremskaf en Blazebrænder",
"advancement.create.cart_pickup": "Stærke arme",
"advancement.create.cart_pickup.desc": "Saml en Minevogns-himstregims op med mindst 200 blokke sat på",
"advancement.create.chained_drain.desc": "Se en genstand bevæge sig hen over en række af genstand-drænere\n§7(Skjult Fremskridt)",
"advancement.create.chocolate_bucket": "En verden af fantasi",
"advancement.create.chocolate_bucket.desc": "Få en spand med smeltet chokolade",
"advancement.create.chute": "Lodret logistik",
"advancement.create.chute.desc": "Transporter nogle genstande via skakt",
"advancement.create.clockwork_bearing": "Kvart i Ur",
"advancement.create.clockwork_bearing.desc": "Saml en struktur, der er monteret på et urværksleje",
"advancement.create.compacting": "Komprimering",
"advancement.create.compacting.desc": "Brug et Mekanisk Tryk og et Bassin til at skabe færre ting fra flere",
Expand All @@ -30,6 +38,7 @@
"advancement.create.display_link.desc": "Brug et display-bindeled til at visualisere information",
"advancement.create.diving_suit": "Klar til dybderne",
"advancement.create.diving_suit_lava": "Svømmer sammen med lavavandrerne",
"advancement.create.diving_suit_lava.desc": "Forsøg dykke i lava med dit netherit dykkerudstyr",
"advancement.create.drain": "Tørretumbler dræning",
"advancement.create.ejector_maxed": "Fjederbræt mester",
"advancement.create.ejector_maxed.desc": "Bliv affyret mere end 30 blokke af en Tung udslynger",
Expand All @@ -46,9 +55,15 @@
"advancement.create.hand_crank_000": "Træningssession",
"advancement.create.haunted_bell": "Skyggesans",
"advancement.create.haunted_bell.desc": "Ring en hjemsøgt klokke",
"advancement.create.hose_pulley": "Industrielt Spild",
"advancement.create.hose_pulley.desc": "Sænk en slange og se den dræne eller fylde et område af væske",
"advancement.create.lava_wheel_00000": "Magmahjul",
"advancement.create.linked_controller": "Fjernbetjening",
"advancement.create.long_train.desc": "Lav et tog med mindst seks vogne",
"advancement.create.long_travel.desc": "Forlad et togsæde mindst 5000 blokke væk for hvor du startede din tur",
"advancement.create.mechanical_arm": "Travle Hænder",
"advancement.create.mechanical_arm.desc": "Se din mekaniske arm transportere dens første genstand",
"advancement.create.mechanical_crafter": "Automatisk Samling",
"advancement.create.mechanical_mixer": "Bland det hele sammen",
"advancement.create.mechanical_mixer.desc": "Kombiner ingredienser i en Mekanisk Mixer",
"advancement.create.mechanical_press": "Bonk",
Expand All @@ -72,8 +87,10 @@
"advancement.create.self_deploying": "Selvkørende vogn",
"advancement.create.shifting_gears": "Skiftende Gear",
"advancement.create.shifting_gears.desc": "Tilslut et stort Tandhjul til et lille Tandhjul, så du kan ændre hastigheden på din Mekanisme",
"advancement.create.speed_controller": "Ingeniører hader dette enkle trick!",
"advancement.create.speed_controller.desc": "Finjuster din mekanisme med en hastighedsregulator",
"advancement.create.spout": "Stænk",
"advancement.create.spout.desc": "Se en væskeholdig genstand blive fyldt med en Spout",
"advancement.create.steam_engine": "Kraftcentret",
"advancement.create.steam_engine.desc": "Brug en dampmaskine til at generere moment",
"advancement.create.steam_engine_maxed": "Fuld damp",
Expand All @@ -82,18 +99,27 @@
"advancement.create.steam_whistle.desc": "Aktiver en dampfløjte",
"advancement.create.stressometer": "Belastning for nørder",
"advancement.create.stressometer.desc": "Få en præcis aflæsning ved hjælp af briller og et stressometer",
"advancement.create.stressometer_maxed": "Perfekt Stressed",
"advancement.create.stressometer_maxed.desc": "Få en aflæsning på 100% fra et stressometer§7\n(Skjult fremskridt)",
"advancement.create.sturdy_sheet.desc": "Saml en robust plade ved at raffinere pulveriseret Obsidian",
"advancement.create.super_glue": "Område af tilslutning",
"advancement.create.super_glue.desc": "Super Glue nogle blokke sammen for at danne en gruppe",
"advancement.create.track_0": "En ny sporvidde",
"advancement.create.track_0.desc": "Fremskaf nogle togskinner",
"advancement.create.track_crafting_factory": "Skinnefabrik",
"advancement.create.track_crafting_factory.desc": "Producér mere end 1000 Togspor med samme mekaniske tryk",
"advancement.create.track_signal": "Trafikstyring",
"advancement.create.track_signal.desc": "Placer et togsignal",
"advancement.create.train": "Alle ombord!",
"advancement.create.train.desc": "Saml dit første tog",
"advancement.create.train_casing_00": "Logistikalderen",
"advancement.create.train_crash": "Forfærdelig service",
"advancement.create.train_crash.desc": "Vær vidne til en togulykke som en passager§7\n(Skjult fremskridt)",
"advancement.create.train_crash_backwards": "Blind vinkel",
"advancement.create.train_roadkill.desc": "Kør en fjende over med dit tog§7\n(Skjult fremskridt)",
"advancement.create.train_whistle": "Tøf Tøf!",
"advancement.create.water_supply": "Vandpytindsamler",
"advancement.create.water_supply.desc": "Brug trækkeenden af et rør eller mekanisk pumpe til at indsamle vand",
"advancement.create.water_wheel": "Kontroller Hydraulik",
"advancement.create.water_wheel.desc": "Placer et vandhjul og brug det til at generere drejningsmoment",
"advancement.create.windmill": "En let brise",
Expand Down Expand Up @@ -184,6 +210,8 @@
"block.create.copycat_panel.tooltip.summary": "_Konverterer_ enhver _fuld blok_ til et dekorativt panel. Accepterer også _tremmer_ og _lemme_.",
"block.create.copycat_step": "Copycat Trin",
"block.create.creative_crate": "Kreativ-kasse",
"block.create.creative_crate.tooltip.condition2": "Når ved siden af Schematicannon",
"block.create.creative_crate.tooltip.summary": "Denne _Opbevaring Container_ tillader uendelig replikation af genstande.",
"block.create.creative_fluid_tank": "Kreativ-væsketank",
"block.create.creative_motor": "Kreativ-motor",
"block.create.crimsite": "Karmoisit",
Expand Down
Loading

0 comments on commit a486b3e

Please sign in to comment.