From 82fade57555db598645e1cba9a5f73f8ec611a82 Mon Sep 17 00:00:00 2001 From: Mike Ammerlaan Date: Wed, 23 Nov 2022 11:02:59 -0800 Subject: [PATCH] v1.19.60.20-preview --- behavior_pack/entities/husk.json | 5 +- behavior_pack/entities/player.json | 1 + behavior_pack/entities/villager.json | 19 +- behavior_pack/entities/villager_v2.json | 19 +- behavior_pack/entities/wandering_trader.json | 19 +- behavior_pack/manifest.json | 2 +- documentation/Addons.html | 352 +++++---- documentation/Animations.html | 2 +- documentation/Biomes.html | 2 +- documentation/Blocks.html | 4 +- documentation/Entities.html | 469 ++++++++++- documentation/Entity Events.html | 2 +- documentation/Entity Timeline Events.html | 2 +- documentation/Features.html | 2 +- documentation/Fogs.html | 2 +- documentation/Index.html | 2 +- documentation/Item.html | 4 +- documentation/Molang.html | 6 +- documentation/Particles.html | 2 +- documentation/Recipes.html | 2 +- documentation/Schemas.html | 2 +- documentation/Texture Sets.html | 2 +- documentation/Volumes.html | 4 +- resource_pack/entity/ender_dragon.entity.json | 267 +------ resource_pack/entity/iron_golem.entity.json | 13 +- resource_pack/entity/polar_bear.entity.json | 33 +- resource_pack/entity/snow_golem.entity.json | 22 +- resource_pack/entity/wither.entity.json | 44 +- resource_pack/manifest.json | 2 +- resource_pack/particles/mobspell_ambient.json | 68 ++ resource_pack/texts/bg_BG.lang | 13 +- resource_pack/texts/cs_CZ.lang | 13 +- resource_pack/texts/da_DK.lang | 13 +- resource_pack/texts/de_DE.lang | 13 +- resource_pack/texts/el_GR.lang | 13 +- resource_pack/texts/en_GB.lang | 13 +- resource_pack/texts/en_US.lang | 20 +- resource_pack/texts/es_ES.lang | 13 +- resource_pack/texts/es_MX.lang | 15 +- resource_pack/texts/fi_FI.lang | 13 +- resource_pack/texts/fr_CA.lang | 13 +- resource_pack/texts/fr_FR.lang | 13 +- resource_pack/texts/hu_HU.lang | 13 +- resource_pack/texts/id_ID.lang | 13 +- resource_pack/texts/it_IT.lang | 13 +- resource_pack/texts/ja_JP.lang | 13 +- resource_pack/texts/ko_KR.lang | 13 +- resource_pack/texts/nb_NO.lang | 13 +- resource_pack/texts/nl_NL.lang | 13 +- resource_pack/texts/pl_PL.lang | 13 +- resource_pack/texts/pt_BR.lang | 13 +- resource_pack/texts/pt_PT.lang | 13 +- resource_pack/texts/ru_RU.lang | 13 +- resource_pack/texts/sk_SK.lang | 13 +- resource_pack/texts/sv_SE.lang | 13 +- resource_pack/texts/tr_TR.lang | 13 +- resource_pack/texts/uk_UA.lang | 13 +- resource_pack/texts/zh_CN.lang | 13 +- resource_pack/texts/zh_TW.lang | 13 +- .../textures/ui/emote_wheel_updated_base.png | Bin 755 -> 796 bytes .../ui/emote_wheel_updated_select_0.png | Bin 772 -> 765 bytes .../ui/emote_wheel_updated_select_1.png | Bin 773 -> 771 bytes .../ui/emote_wheel_updated_select_2.png | Bin 769 -> 771 bytes .../ui/emote_wheel_updated_select_3.png | Bin 776 -> 771 bytes .../textures/ui/interact_pressed.png | Bin 2959 -> 273 bytes .../ui/stack_progress_bar_down_arrow.png | Bin 851 -> 281 bytes .../ui/stack_progress_bar_left_side_arrow.png | Bin 846 -> 273 bytes .../stack_progress_bar_right_side_arrow.png | Bin 857 -> 279 bytes .../ui/stack_progress_bar_up_arrow.png | Bin 840 -> 245 bytes resource_pack/ui/_ui_defs.json | 1 - resource_pack/ui/chat_screen.json | 2 +- .../ui/chat_settings_menu_screen.json | 9 + resource_pack/ui/gathering_info_screen.json | 13 +- resource_pack/ui/hud_screen.json | 11 + resource_pack/ui/online_safety_screen.json | 80 +- .../ui/persona_cast_character_screen.json | 732 +++++++++++++++--- resource_pack/ui/persona_common.json | 83 +- resource_pack/ui/play_screen.json | 33 +- resource_pack/ui/profile_screen.json | 12 +- resource_pack/ui/settings_screen.json | 3 +- .../settings_sections/controls_section.json | 32 +- .../ui/settings_sections/general_section.json | 15 +- .../ui/settings_sections/world_section.json | 145 ++-- resource_pack/ui/sidebar_navigation.json | 46 +- resource_pack/ui/store_common.json | 226 +++--- resource_pack/ui/ui_common.json | 89 ++- resource_pack/ui/ui_template_dialogs.json | 8 +- version.json | 3 +- 88 files changed, 2153 insertions(+), 1151 deletions(-) create mode 100644 resource_pack/particles/mobspell_ambient.json diff --git a/behavior_pack/entities/husk.json b/behavior_pack/entities/husk.json index bf3a2f683..86bd9a620 100644 --- a/behavior_pack/entities/husk.json +++ b/behavior_pack/entities/husk.json @@ -69,7 +69,7 @@ }, "minecraft:is_baby": {}, "minecraft:scale": { - "value": 0.53125 + "value": 0.5 }, "minecraft:movement": { "value": 0.35 @@ -98,9 +98,6 @@ "speed_multiplier": 1.25, "target_dist": 0.0, "track_target": true - }, - "minecraft:scale": { - "value": 1.0625 } }, diff --git a/behavior_pack/entities/player.json b/behavior_pack/entities/player.json index 2dbc5e0f9..7569ecb18 100644 --- a/behavior_pack/entities/player.json +++ b/behavior_pack/entities/player.json @@ -117,6 +117,7 @@ "allow_name_tag_renaming": false }, "minecraft:physics": { + "push_towards_closest_space": true }, "minecraft:pushable": { "is_pushable": false, diff --git a/behavior_pack/entities/villager.json b/behavior_pack/entities/villager.json index 46b4664c9..e44fa2c7d 100644 --- a/behavior_pack/entities/villager.json +++ b/behavior_pack/entities/villager.json @@ -1,5 +1,5 @@ { - "format_version": "1.19.50", + "format_version": "1.19.60", "minecraft:entity": { "description": { "identifier": "minecraft:villager", @@ -437,7 +437,22 @@ "priority": 0 }, "minecraft:behavior.trade_with_player": { - "priority": 1 + "priority": 1, + "filters": { + "all_of": [ + { + "all_of": [ + { "test": "in_water", "value": false } + ] + }, + { + "any_of": [ + { "test": "on_ground", "value": true }, + { "test": "is_sleeping", "value": true } + ] + } + ] + } }, "minecraft:behavior.look_at_trading_player": { "priority": 2 diff --git a/behavior_pack/entities/villager_v2.json b/behavior_pack/entities/villager_v2.json index b186bd188..24531a2c2 100644 --- a/behavior_pack/entities/villager_v2.json +++ b/behavior_pack/entities/villager_v2.json @@ -1,5 +1,5 @@ { - "format_version": "1.19.50", + "format_version": "1.19.60", "minecraft:entity": { "description": { "identifier": "minecraft:villager_v2", @@ -1564,7 +1564,22 @@ "speed_multiplier": 0.6 }, "minecraft:behavior.trade_with_player": { - "priority": 2 + "priority": 2, + "filters": { + "all_of": [ + { + "all_of": [ + { "test": "in_water", "value": false } + ] + }, + { + "any_of": [ + { "test": "on_ground", "value": true }, + { "test": "is_sleeping", "value": true } + ] + } + ] + } }, "minecraft:behavior.avoid_mob_type": { "priority": 4, diff --git a/behavior_pack/entities/wandering_trader.json b/behavior_pack/entities/wandering_trader.json index 54d79ea24..a8a4c17d9 100644 --- a/behavior_pack/entities/wandering_trader.json +++ b/behavior_pack/entities/wandering_trader.json @@ -1,5 +1,5 @@ { - "format_version": "1.16.0", + "format_version": "1.19.60", "minecraft:entity": { "description": { "identifier": "minecraft:wandering_trader", @@ -154,7 +154,22 @@ ] }, "minecraft:behavior.trade_with_player": { - "priority": 1 + "priority": 1, + "filters": { + "all_of": [ + { + "all_of": [ + { "test": "in_water", "value": false } + ] + }, + { + "any_of": [ + { "test": "on_ground", "value": true }, + { "test": "is_sleeping", "value": true } + ] + } + ] + } }, "minecraft:behavior.trade_interest": { "priority": 3, diff --git a/behavior_pack/manifest.json b/behavior_pack/manifest.json index 3ff2d1a16..5a9a50dfc 100644 --- a/behavior_pack/manifest.json +++ b/behavior_pack/manifest.json @@ -5,7 +5,7 @@ "name": "Vanilla Behavior Pack", "uuid": "ee649bcf-256c-4013-9068-6a802b89d756", "version": [ 0, 0, 1 ], - "min_engine_version": [ 1, 19, 50 ] + "min_engine_version": [ 1, 19, 60 ] }, "modules": [ { diff --git a/documentation/Addons.html b/documentation/Addons.html index 9798cf143..313b19bf7 100644 --- a/documentation/Addons.html +++ b/documentation/Addons.html @@ -1,4 +1,4 @@ -

ADDONS DOCUMENTATION
Version: 1.19.50.25

+

ADDONS DOCUMENTATION
Version: 1.19.60.20

This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.
Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.

Index

@@ -735,6 +735,9 @@

Blocks

+ + + @@ -2658,6 +2661,9 @@

Blocks

+ + + @@ -3864,12 +3870,12 @@

Items

- + - + @@ -3889,7 +3895,7 @@

Items

- + @@ -3929,7 +3935,7 @@

Items

- + @@ -3949,7 +3955,7 @@

Items

- + @@ -3974,7 +3980,7 @@

Items

- + @@ -4014,7 +4020,7 @@

Items

- + @@ -4023,13 +4029,18 @@

Items

+ + + + + - + @@ -4089,7 +4100,7 @@

Items

- + @@ -4099,7 +4110,7 @@

Items

- + @@ -4129,12 +4140,12 @@

Items

- + - + @@ -4229,12 +4240,12 @@

Items

- + - + @@ -4254,7 +4265,7 @@

Items

- + @@ -4344,7 +4355,7 @@

Items

- + @@ -4374,7 +4385,7 @@

Items

- + @@ -4409,7 +4420,7 @@

Items

- + @@ -4509,17 +4520,17 @@

Items

- + - + - + @@ -4544,7 +4555,7 @@

Items

- + @@ -4594,7 +4605,7 @@

Items

- + @@ -4644,7 +4655,7 @@

Items

- + @@ -4689,7 +4700,7 @@

Items

- + @@ -4809,12 +4820,12 @@

Items

- + - + @@ -4829,7 +4840,7 @@

Items

- + @@ -4864,7 +4875,7 @@

Items

- + @@ -4894,7 +4905,7 @@

Items

- + @@ -4969,7 +4980,7 @@

Items

- + @@ -4984,7 +4995,7 @@

Items

- + @@ -5039,7 +5050,7 @@

Items

- + @@ -5074,7 +5085,7 @@

Items

- + @@ -5129,12 +5140,12 @@

Items

- + - + @@ -5154,7 +5165,7 @@

Items

- + @@ -5199,7 +5210,7 @@

Items

- + @@ -5344,7 +5355,7 @@

Items

- + @@ -5389,7 +5400,7 @@

Items

- + @@ -5444,7 +5455,7 @@

Items

- + @@ -5479,12 +5490,12 @@

Items

- + - + @@ -6094,12 +6105,12 @@

Items

- + - + @@ -6114,12 +6125,12 @@

Items

- + - + @@ -6144,7 +6155,7 @@

Items

- + @@ -6178,6 +6189,11 @@

Items

+ + + + + @@ -6204,7 +6220,7 @@

Items

- + @@ -6259,7 +6275,7 @@

Items

- + @@ -6274,17 +6290,17 @@

Items

- + - + - + @@ -6309,12 +6325,12 @@

Items

- + - + @@ -6339,7 +6355,7 @@

Items

- + @@ -6349,7 +6365,7 @@

Items

- + @@ -6399,17 +6415,17 @@

Items

- + - + - + @@ -6424,7 +6440,7 @@

Items

- + @@ -6444,7 +6460,7 @@

Items

- + @@ -6509,7 +6525,7 @@

Items

- + @@ -6649,7 +6665,7 @@

Items

- + @@ -6669,12 +6685,12 @@

Items

- + - + @@ -6684,12 +6700,12 @@

Items

- + - + @@ -6709,7 +6725,7 @@

Items

- + @@ -6768,6 +6784,11 @@

Items

+ + + + + @@ -6779,7 +6800,7 @@

Items

- + @@ -6794,7 +6815,7 @@

Items

- + @@ -6989,12 +7010,12 @@

Items

- + - + @@ -7014,7 +7035,7 @@

Items

- + @@ -7089,7 +7110,7 @@

Items

- + @@ -7114,7 +7135,7 @@

Items

- + @@ -7214,7 +7235,7 @@

Items

- + @@ -7264,7 +7285,7 @@

Items

- + @@ -7319,7 +7340,7 @@

Items

- + @@ -7329,12 +7350,12 @@

Items

- + - + @@ -7389,7 +7410,7 @@

Items

- + @@ -7424,7 +7445,7 @@

Items

- + @@ -7469,7 +7490,7 @@

Items

- + @@ -7559,82 +7580,82 @@

Items

- + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -7644,12 +7665,12 @@

Items

- + - + @@ -7674,12 +7695,12 @@

Items

- + - + @@ -7694,12 +7715,12 @@

Items

- + - + @@ -7709,52 +7730,52 @@

Items

- + - + - + - + - + - + - + - + - + - + @@ -7789,7 +7810,7 @@

Items

- + @@ -7909,7 +7930,7 @@

Items

- + @@ -7924,7 +7945,7 @@

Items

- + @@ -8104,7 +8125,7 @@

Items

- + @@ -8164,12 +8185,12 @@

Items

- + - + @@ -8244,7 +8265,7 @@

Items

- + @@ -8274,12 +8295,12 @@

Items

- + - + @@ -8299,7 +8320,7 @@

Items

- + @@ -8309,7 +8330,7 @@

Items

- + @@ -8319,7 +8340,7 @@

Items

- + @@ -8329,7 +8350,7 @@

Items

- + @@ -8339,7 +8360,7 @@

Items

- + @@ -8529,7 +8550,7 @@

Items

- + @@ -8574,7 +8595,7 @@

Items

- + @@ -8604,12 +8625,12 @@

Items

- - + + - + @@ -8678,6 +8699,11 @@

Items

+ + + + + @@ -8689,7 +8715,7 @@

Items

- + @@ -8719,12 +8745,12 @@

Items

- + - + @@ -8739,7 +8765,7 @@

Items

- + @@ -8764,12 +8790,12 @@

Items

- + - + @@ -8789,7 +8815,7 @@

Items

- + @@ -8814,7 +8840,7 @@

Items

- + @@ -8968,6 +8994,11 @@

Items

+ + + + + @@ -9044,7 +9075,7 @@

Items

- + @@ -9059,12 +9090,12 @@

Items

- + - + @@ -9089,7 +9120,7 @@

Items

- + @@ -9099,12 +9130,12 @@

Items

- + - + @@ -9119,7 +9150,7 @@

Items

- + @@ -9159,7 +9190,7 @@

Items

- + @@ -9244,7 +9275,7 @@

Items

- + @@ -9254,7 +9285,7 @@

Items

- + @@ -9279,7 +9310,7 @@

Items

- + @@ -9314,7 +9345,7 @@

Items

- + @@ -9548,6 +9579,11 @@

Items

+ + + + + @@ -9609,12 +9645,12 @@

Items

- + - + diff --git a/documentation/Animations.html b/documentation/Animations.html index bb27069a3..6cf71e4cc 100644 --- a/documentation/Animations.html +++ b/documentation/Animations.html @@ -1,4 +1,4 @@ -

ANIMATIONS DOCUMENTATION
Version: 1.19.50.25

+

ANIMATIONS DOCUMENTATION
Version: 1.19.60.20

This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.
Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.

Index

minecraft:bamboo
minecraft:bamboo_block
minecraft:bamboo_button
minecraft:stripped_acacia_log
minecraft:stripped_bamboo_block
minecraft:stripped_birch_log
acacia_chest_boat646650
acacia_door556560
acacia_sign579583
allay_spawn_egg632636
amethyst_shard625629
armor_stand552556
balloon599603
bamboo_block-527
bamboo_button -511
bamboo_chest_raft649653
bamboo_raft639643
bamboo_sign638642
banner567571
banner_pattern656660
birch_chest_boat643647
birch_door554558
birch_sign577581
bleach597601
boat654658
bordure_indented_banner_pattern586590
camel_spawn_egg634638
camera594598
campfire589593
carrot_on_a_stick517521
chain620624
chest_boat650654
chorus_fruit558562
command_block_minecart563567
comparator522526
compound595599
cooked_mutton551555
copper_ingot504508
creeper_banner_pattern582586
crimson_door617621
crimson_sign615619
crossbow575579
dark_oak_chest_boat647651
dark_oak_door557561
dark_oak_sign580584
debug_stick591595
diamond_horse_armor533537
disc_fragment_5641645
dragon_breath560564
dye655659
echo_shard652656
elytra564568
emerald512516
empty_map515519
enchanted_book521525
end_crystal658662
ender_dragon_spawn_egg505
ender_eye 433
experience_bottle508512
field_masoned_banner_pattern585589
fire_charge509513
firework_rocket519523
firework_star520524
flower_banner_pattern581585
flower_pot514518
frame513517
frog_spawn_egg629633
globe_banner_pattern588592
glow_frame624628
glow_ink_sac503507
glow_stick602606
goat_horn628632
golden_horse_armor532536
heart_of_the_sea571575
honey_bottle593597
honeycomb592596
hopper527531
hopper_minecart526530
ice_bomb596600
iron_golem_spawn_egg503
iron_helmet 343
iron_horse_armor531535
iron_nugget569573
jungle_chest_boat644648
jungle_door555559
jungle_sign578582
lead547551
leather_horse_armor530534
lingering_potion562566
lodestone_compass603607
mangrove_boat637641
mangrove_chest_boat648652
mangrove_door635639
mangrove_sign636640
medicine600604
mojang_banner_pattern584588
music_disc_11544548
music_disc_13534538
music_disc_5640644
music_disc_blocks536540
music_disc_cat535539
music_disc_chirp537541
music_disc_far538542
music_disc_mall539543
music_disc_mellohi540544
music_disc_otherside627631
music_disc_pigstep621625
music_disc_stal541545
music_disc_strad542546
music_disc_wait545549
music_disc_ward543547
mutton550554
name_tag548552
nautilus_shell570574
nether_sprouts622626
nether_star518522
netherbrick523527
netherite_axe608612
netherite_boots613617
netherite_chestplate611615
netherite_helmet610614
netherite_hoe609613
netherite_ingot604608
netherite_leggings612616
netherite_pickaxe607611
netherite_scrap614618
netherite_shovel606610
netherite_sword605609
oak_chest_boat642646
phantom_membrane574578
piglin_banner_pattern587591
popped_chorus_fruit559563
prismarine_crystals549553
prismarine_shard565569
quartz524528
rabbit_foot528532
rabbit_hide529533
rapid_fertilizer598602
raw_copper507511
raw_gold506510
raw_iron505509
recovery_compass651655
scute572576
shulker_shell566570
skull5160 = Skeleton

1 = Wither

2 = Zombie

3 = Steve

4 = Creeper

5 = Dragon
5200 = Skeleton

1 = Wither

2 = Zombie

3 = Steve

4 = Creeper

5 = Dragon
6 = Piglin
skull_banner_pattern583587
snow_golem_spawn_egg504
snow_layer 78
soul_campfire623627
sparkler601605
spawn_egg657661
splash_potion561565
spruce_chest_boat645649
spruce_door553557
spruce_sign576580
spyglass626630
stripped_bamboo_block-528
stripped_birch_log -6
suspicious_stew590594
tadpole_bucket631635
tadpole_spawn_egg630634
tnt_minecart525529
totem_of_undying568572
trader_llama_spawn_egg653657
trident546550
turtle_helmet573577
warden_spawn_egg633637
warped_door618622
warped_fungus_on_a_stick619623
warped_sign616620
wither_spawn_egg506
wolf_spawn_egg 439
writable_book510514
written_book511515
diff --git a/documentation/Biomes.html b/documentation/Biomes.html index 18b15a5f5..5de3d5203 100644 --- a/documentation/Biomes.html +++ b/documentation/Biomes.html @@ -1,4 +1,4 @@ -

BIOMES DOCUMENTATION
Version: 1.19.50.25

+

BIOMES DOCUMENTATION
Version: 1.19.60.20

This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.
Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.

Index

diff --git a/documentation/Blocks.html b/documentation/Blocks.html index c64ab272d..89260318f 100644 --- a/documentation/Blocks.html +++ b/documentation/Blocks.html @@ -1,4 +1,4 @@ -

BLOCKS DOCUMENTATION
Version: 1.19.50.25

+

BLOCKS DOCUMENTATION
Version: 1.19.60.20

This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.
Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.

Index

@@ -396,7 +396,7 @@

Block Definition Properties

Code Example

Example

+Short (using Defaults)..

+Back to top

+ +

bool_property

Returns true when the bool actor property matches the value provided.

@@ -8701,6 +8813,114 @@

Examples


Back to top

+

on_fire

+ +Tests if the subject is on fire.

+ +
+ + + + + + + + + + + + + + + + + + + +
Name Type Default Description
operatorStringequals(Optional) The comparison to apply with 'value'.
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Options Description
!=Test for inequality.
<Test for less-than the value.
<=Test for less-than or equal to the value.
<>Test for inequality.
=Test for equality.
==Test for equality.
>Test for greater-than the value.
>=Test for greater-than or equal to the value.
equalsTest for equality.
notTest for inequality.
+
subjectStringself(Optional) The subject of this filter test.
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Options Description
blockThe block involved with the interaction.
damagerThe damaging actor involved with the interaction.
otherThe other member of an interaction, not the caller.
parentThe caller's current parent.
playerThe player involved with the interaction.
selfThe entity or object calling the test
targetThe caller's current target.
+
valueBooleantrue(Optional) true or false.
+

Examples

+Full..

+Short (using Defaults)..

+Back to top

+

on_ground

Returns true when the subject entity is on ground.

@@ -8809,6 +9029,114 @@

Examples


Back to top

+

on_hot_block

+ +Tests if the subject is on a hot block.

+ + + + + + + + + + + + + + + + + + + + + +
Name Type Default Description
operatorStringequals(Optional) The comparison to apply with 'value'.
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Options Description
!=Test for inequality.
<Test for less-than the value.
<=Test for less-than or equal to the value.
<>Test for inequality.
=Test for equality.
==Test for equality.
>Test for greater-than the value.
>=Test for greater-than or equal to the value.
equalsTest for equality.
notTest for inequality.
+
subjectStringself(Optional) The subject of this filter test.
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Options Description
blockThe block involved with the interaction.
damagerThe damaging actor involved with the interaction.
otherThe other member of an interaction, not the caller.
parentThe caller's current parent.
playerThe player involved with the interaction.
selfThe entity or object calling the test
targetThe caller's current target.
+
valueBooleantrue(Optional) true or false.
+

Examples

+Full..

+Short (using Defaults)..

+Back to top

+

on_ladder

Returns true when the subject entity is on a ladder.

@@ -9241,6 +9569,114 @@

Examples


Back to top

+

target_distance

+ +Tests the distance between the calling entity and its target.

+ + + + + + + + + + + + + + + + + + + + + +
Name Type Default Description
operatorStringequals(Optional) The comparison to apply with 'value'.
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Options Description
!=Test for inequality.
<Test for less-than the value.
<=Test for less-than or equal to the value.
<>Test for inequality.
=Test for equality.
==Test for equality.
>Test for greater-than the value.
>=Test for greater-than or equal to the value.
equalsTest for equality.
notTest for inequality.
+
subjectStringself(Optional) The subject of this filter test.
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Options Description
blockThe block involved with the interaction.
damagerThe damaging actor involved with the interaction.
otherThe other member of an interaction, not the caller.
parentThe caller's current parent.
playerThe player involved with the interaction.
selfThe entity or object calling the test
targetThe caller's current target.
+
valueDecimal(Required) A floating point value.
+

Examples

+Full..

+Short (using Defaults)..

+Back to top

+

trusts

Returns true if the subject is trusted by entity.

@@ -15655,7 +16091,24 @@

minecraft:behavior.trade_interest<

minecraft:behavior.trade_with_player

-Allows the player to trade with this mob.
Back to top

+Allows the player to trade with this mob. When the goal starts, it will stop the mob's navigation.

+ + + + + + + + + + + + + + + +
Name Type Default Value Description
filtersMinecraft FilterConditions that need to be met for the behavior to start.
max_distance_from_playerDecimal8.00The max distance that the mob can be from the player before exiting the goal.
+Back to top

minecraft:behavior.vex_copy_owner_target

@@ -19431,6 +19884,12 @@

minecraft:physics

true Whether or not the entity is affected by gravity.
+ +push_towards_closest_space +Boolean +false +Whether or not the entity should be pushed towards the nearest open area when stuck inside a block.
+ Back to top

@@ -20622,7 +21081,7 @@

minecraft:trusting

minecraft:variable_max_auto_step

-Entities with this component will have a maximum auto step height that is different depending on wether they are on a block that prevents jumping. Incompatible with "runtime_identifier": "minecraft:horse".

+Entities with this component will have a maximum auto step height that is different depending on whether they are on a block that prevents jumping. Incompatible with "runtime_identifier": "minecraft:horse".

@@ -21430,7 +21889,7 @@

- + diff --git a/documentation/Entity Events.html b/documentation/Entity Events.html index 62e75fa50..ef92989e1 100644 --- a/documentation/Entity Events.html +++ b/documentation/Entity Events.html @@ -1,4 +1,4 @@ -

ENTITY EVENTS DOCUMENTATION
Version: 1.19.50.25

+

ENTITY EVENTS DOCUMENTATION
Version: 1.19.60.20

This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.
Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.

Index

Name Type Default Value Description
minecraft:behavior.trade_with_player-2048563493
13082946109325010651
minecraft:behavior.vex_copy_owner_target
diff --git a/documentation/Entity Timeline Events.html b/documentation/Entity Timeline Events.html index 3de5b43e2..542ca6292 100644 --- a/documentation/Entity Timeline Events.html +++ b/documentation/Entity Timeline Events.html @@ -1,4 +1,4 @@ -

ENTITY TIMELINE EVENTS DOCUMENTATION
Version: 1.19.50.25

+

ENTITY TIMELINE EVENTS DOCUMENTATION
Version: 1.19.60.20

This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.
Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.

Index

diff --git a/documentation/Features.html b/documentation/Features.html index 60b4e4fbf..ec8bee93a 100644 --- a/documentation/Features.html +++ b/documentation/Features.html @@ -1,4 +1,4 @@ -

FEATURES DOCUMENTATION
Version: 1.19.50.25

+

FEATURES DOCUMENTATION
Version: 1.19.60.20

This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.
Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.

Index

diff --git a/documentation/Fogs.html b/documentation/Fogs.html index 60e196bc2..b21f2c8af 100644 --- a/documentation/Fogs.html +++ b/documentation/Fogs.html @@ -1,4 +1,4 @@ -

FOGS DOCUMENTATION
Version: 1.19.50.25

+

FOGS DOCUMENTATION
Version: 1.19.60.20

This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.
Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.

Index

diff --git a/documentation/Index.html b/documentation/Index.html index 99e70556f..82c52f4fa 100644 --- a/documentation/Index.html +++ b/documentation/Index.html @@ -1,4 +1,4 @@ -DOCUMENTATION

DOCUMENTATION
Version: 1.19.50.25 +DOCUMENTATION

DOCUMENTATION
Version: 1.19.60.20 This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.
Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.
  1. Addons diff --git a/documentation/Item.html b/documentation/Item.html index fc60e4fd0..e4f02c1b9 100644 --- a/documentation/Item.html +++ b/documentation/Item.html @@ -1,4 +1,4 @@ -

    ITEM DOCUMENTATION
    Version: 1.19.50.25

    +

    ITEM DOCUMENTATION
    Version: 1.19.60.20

    This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.
    Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.

    Index

@@ -260,7 +260,7 @@

duration

sound_event

-Sound event type: 13, cat, blocks, chirp, far, mall, mellohi, stal, strad, ward, 11, wait, pigstep, otherside, 5.
Accepted values: "death.to.zombie", "jump.prevent", "item.use.on", "hit", "step", "break", "swim", "mob.player.hurt_drown", "step.baby", "fly", "horn_call4", "jump", "place", "heavy.step", "gallop", "fall", "hurt", "fizz", "ambient.screamer", "hurt.baby", "hurt.in.water", "death", "flap", "death.baby", "death.in.water", "ambient", "ambient.baby", "ambient.in.water", "ignite", "ambient.tame", "thunder", "random.anvil_use", "ambient.pollinate", "breathe", "mad", "boost", "bow", "squish.big", "squish.small", "fall.big", "fall.small", "splash", "drink", "shear", "block.end_portal_frame.fill", "drink.honey", "drink.milk", "pick_berries.cave_vines", "born", "eat", "reappeared", "takeoff", "shake", "plop", "land", "saddle", "armor", "item_taken", "mob.armor_stand.place", "add.chest", "record.5", "throw", "attack", "block.frog_spawn.hatch", "attack.nodamage", "attack.strong", "listening_angry", "warn", "sonic_charge", "milk", "bundle.remove_one", "explode", "fire", "fuse", "block.frog_spawn.break", "stare", "spawn", "bundle.drop_contents", "shoot", "break.block", "launch", "blast", "horn_call2", "large.blast", "twinkle", "step_sand", "remedy", "unfect", "copper.wax.off", "convert_to_drowned", "horn_call6", "levelup", "bow.hit", "bullet.hit", "extinguish.fire", "fence_gate.close", "item.fizz", "chest.open", "button.click_on", "chest.closed", "shulkerbox.open", "shulkerbox.closed", "enderchest.open", "enderchest.closed", "power.on", "power.off", "attach", "detach", "deny", "tripod", "pop", "drop.slot", "note", "thorns", "piston.in", "piston.out", "portal", "water", "lava.pop", "lava", "celebrate", "beacon.activate", "beacon.ambient", "block.smithing_table.use", "beacon.deactivate", "beacon.power", "pre_ram.screamer", "conduit.activate", "conduit.ambient", "block.click.fail", "conduit.attack", "conduit.deactivate", "glow_squid.ink_squirt", "conduit.short", "bubble.pop", "bubble.up", "tilt_up.big_dripleaf", "bubble.upinside", "power.on.sculk_sensor", "bubble.down", "bubble.downinside", "burp", "bucket.fill.water", "bucket.empty.water", "bucket.fill.lava", "bucket.empty.lava", "bucket.fill.fish", "drip.water.pointed_dripstone", "bucket.empty.fish", "armor.equip_chain", "armor.equip_diamond", "armor.equip_elytra", "armor.equip_generic", "armor.equip_gold", "armor.equip_iron", "armor.equip_leather", "armor.equip_netherite", "record.13", "record.cat", "record.blocks", "record.chirp", "record.far", "record.mall", "record.mellohi", "record.stal", "record.strad", "record.ward", "record.11", "record.wait", "cast.spell", "record.pigstep", "record.otherside", "flop", "elderguardian.curse", "teleport", "shulker.open", "trapdoor.close", "shulker.close", "mob.warning", "mob.warning.baby", "haggle", "pressure_plate.click_on", "haggle.yes", "haggle.no", "haggle.idle", "disappeared", "chorusgrow", "door.close", "chorusdeath", "glass", "potion.brewed", "prepare.attack", "roar", "prepare.summon", "prepare.wololo", "ambient.warped_forest.loop", "fang", "charge", "particle.soul_escape.quiet", "camera.take_picture", "block.bell.hit", "leashknot.break", "leashknot.place", "growl", "block.composter.fill_success", "whine", "pant", "block.sweet_berry_bush.hurt", "purr", "purreow", "item.book.put", "death.min.volume", "death.mid.volume", "block.composter.empty", "imitate.blaze", "imitate.cave_spider", "ui.stonecutter.take_result", "imitate.creeper", "imitate.elder_guardian", "block.barrel.open", "imitate.ender_dragon", "imitate.enderman", "imitate.evocation_illager", "ambient.in.raid", "imitate.ghast", "imitate.husk", "convert_mooshroom", "imitate.illusion_illager", "imitate.magma_cube", "block.smoker.smoke", "imitate.polar_bear", "imitate.shulker", "raid.horn", "imitate.silverfish", "imitate.skeleton", "imitate.slime", "imitate.spider", "block.beehive.work", "imitate.stray", "imitate.vex", "imitate.vindication_illager", "imitate.witch", "imitate.wither", "imitate.wither_skeleton", "block.beehive.enter", "imitate.wolf", "imitate.zombie", "tempt", "imitate.zombie_pigman", "imitate.zombie_villager", "block.end_portal.spawn", "bottle.dragonbreath", "balloonpop", "sparkler.active", "item.trident.hit", "respawn_anchor.basalt_deltas.mood", "item.trident.hit_ground", "respawn_anchor.charge", "item.trident.return", "item.trident.riptide_1", "angry", "item.trident.riptide_2", "item.trident.riptide_3", "retreat", "item.trident.throw", "item.trident.thunder", "smithing_table.use", "block.fletching_table.use", "elemconstruct.open", "respawn_anchor.set_spawn", "icebomb.hit", "ambient.soulsand_valley.mood", "lt.reaction.icebomb", "lt.reaction.bleach", "lt.reaction.epaste", "lt.reaction.epaste2", "heartbeat", "lt.reaction.fertilizer", "lt.reaction.fireball", "ambient.crimson_forest.loop", "lt.reaction.mgsalt", "lt.reaction.miscfire", "cauldron_drip.water.pointed_dripstone", "lt.reaction.fire", "lt.reaction.miscexplosion", "ambient.basalt_deltas.additions", "lt.reaction.miscmystical", "lt.reaction.miscmystical2", "ambient.nether_wastes.loop", "lt.reaction.product", "sparkler.use", "bucket.fill.powder_snow", "glowstick.use", "block.turtle_egg.break", "sleep", "block.turtle_egg.crack", "block.turtle_egg.hatch", "block.turtle_egg.attack", "swoop", "presneeze", "ambient.candle", "sneeze", "tongue", "scared", "ambient.aggressive", "irongolem.repair", "ambient.worried", "cant_breed", "block.scaffolding.climb", "jump_to_block", "block.bamboo_sapling.place", "block.sculk_shrieker.shriek", "crossbow.loading.start", "crossbow.loading.middle", "cake.add_candle", "crossbow.loading.end", "crossbow.shoot", "agitated", "crossbow.quick_charge.start", "crossbow.quick_charge.middle", "charge.sculk", "crossbow.quick_charge.end", "nearby_closer", "item.shield.block", "admire", "portal.travel", "block.grindstone.use", "block.campfire.crackle", "block.sweet_berry_bush.pick", "block.stonecutter.use", "block.cartography_table.use", "block.composter.fill", "block.composter.ready", "stun", "block.barrel.close", "ui.cartography_table.take_result", "ui.loom.take_result", "block.blastfurnace.fire_crackle", "block.loom.use", "screech", "block.furnace.lit", "milk_suspiciously", "block.beehive.exit", "block.beehive.shear", "block.beehive.drip", "ambient.cave", "converted_to_zombified", "step_lava", "panic", "particle.soul_escape.loud", "respawn_anchor.deplete", "respawn_anchor.ambient", "ambient.crimson_forest.mood", "ambient.warped_forest.mood", "ambient.nether_wastes.mood", "ambient.crimson_forest.additions", "ambient.warped_forest.additions", "ambient.soulsand_valley.additions", "ambient.nether_wastes.additions", "ambient.soulsand_valley.loop", "ambient.basalt_deltas.loop", "lodestone_compass.link_compass_to_lodestone", "power.off.sculk_sensor", "default", "ram_impact.screamer", "lay_egg", "lay_spawn", "bucket.empty.powder_snow", "cauldron_drip.lava.pointed_dripstone", "tilt_down.big_dripleaf", "drip.lava.pointed_dripstone", "copper.wax.on", "scrape", "item.spyglass.use", "item.spyglass.stop_using", "chime.amethyst_block", "mob.player.hurt_on_fire", "mob.player.hurt_freeze", "hurt.screamer", "death.screamer", "milk.screamer", "pre_ram", "ram_impact", "squid.ink_squirt", "convert_to_stray", "extinguish.candle", "block.click", "block.sculk_catalyst.bloom", "nearby_close", "nearby_closest", "listening", "item_given", "item_thrown", "irongolem.crack", "horn_break", "horn_call0", "horn_call1", "horn_call3", "horn_call5", "horn_call7", "imitate.warden", "sonic_boom", "convert_to_frog", "block.sculk.spread", "block.sculk_sensor.place", "block.sculk_shrieker.place", "block.enchanting_table.use", "bundle.insert", "dash_ready", "pressure_plate.click_off", "button.click_off", "door.open", "trapdoor.open", "fence_gate.open", "undefined"
Back to top

+Sound event type: 13, cat, blocks, chirp, far, mall, mellohi, stal, strad, ward, 11, wait, pigstep, otherside, 5.
Accepted values: "death.to.zombie", "jump.prevent", "item.use.on", "hit", "step", "break", "swim", "mob.player.hurt_drown", "step.baby", "fly", "horn_call4", "jump", "place", "heavy.step", "gallop", "fall", "hurt", "fizz", "ambient.screamer", "hurt.baby", "hurt.in.water", "death", "flap", "death.baby", "death.in.water", "ambient", "ambient.baby", "ambient.in.water", "ignite", "ambient.tame", "thunder", "random.anvil_use", "ambient.pollinate", "breathe", "mad", "boost", "bow", "squish.big", "squish.small", "fall.big", "fall.small", "splash", "drink", "shear", "block.end_portal_frame.fill", "drink.honey", "drink.milk", "pick_berries.cave_vines", "born", "eat", "reappeared", "takeoff", "shake", "plop", "land", "saddle", "armor", "item_taken", "mob.armor_stand.place", "add.chest", "record.5", "throw", "attack", "block.frog_spawn.hatch", "attack.nodamage", "attack.strong", "listening_angry", "warn", "sonic_charge", "milk", "bundle.remove_one", "explode", "fire", "fuse", "block.frog_spawn.break", "stare", "spawn", "bundle.drop_contents", "shoot", "break.block", "launch", "blast", "horn_call2", "large.blast", "twinkle", "step_sand", "remedy", "unfect", "copper.wax.off", "convert_to_drowned", "horn_call6", "levelup", "bow.hit", "bullet.hit", "extinguish.fire", "fence_gate.close", "item.fizz", "chest.open", "button.click_on", "chest.closed", "shulkerbox.open", "pickup_enchanted", "shulkerbox.closed", "enderchest.open", "enderchest.closed", "power.on", "power.off", "attach", "pickup", "detach", "deny", "tripod", "pop", "drop.slot", "note", "thorns", "piston.in", "piston.out", "portal", "water", "lava.pop", "lava", "celebrate", "beacon.activate", "beacon.ambient", "block.smithing_table.use", "beacon.deactivate", "beacon.power", "pre_ram.screamer", "conduit.activate", "conduit.ambient", "block.click.fail", "conduit.attack", "conduit.deactivate", "glow_squid.ink_squirt", "conduit.short", "bubble.pop", "bubble.up", "tilt_up.big_dripleaf", "bubble.upinside", "power.on.sculk_sensor", "bubble.down", "bubble.downinside", "burp", "bucket.fill.water", "bucket.empty.water", "bucket.fill.lava", "bucket.empty.lava", "bucket.fill.fish", "drip.water.pointed_dripstone", "bucket.empty.fish", "armor.equip_chain", "armor.equip_diamond", "armor.equip_elytra", "armor.equip_generic", "armor.equip_gold", "armor.equip_iron", "armor.equip_leather", "armor.equip_netherite", "record.13", "record.cat", "record.blocks", "record.chirp", "record.far", "record.mall", "record.mellohi", "record.stal", "record.strad", "record.ward", "record.11", "record.wait", "cast.spell", "record.pigstep", "record.otherside", "flop", "elderguardian.curse", "teleport", "shulker.open", "trapdoor.close", "shulker.close", "mob.warning", "mob.warning.baby", "haggle", "pressure_plate.click_on", "haggle.yes", "haggle.no", "haggle.idle", "disappeared", "chorusgrow", "door.close", "chorusdeath", "glass", "potion.brewed", "prepare.attack", "roar", "prepare.summon", "prepare.wololo", "ambient.warped_forest.loop", "fang", "charge", "particle.soul_escape.quiet", "camera.take_picture", "block.bell.hit", "leashknot.break", "leashknot.place", "growl", "block.composter.fill_success", "whine", "pant", "block.sweet_berry_bush.hurt", "purr", "purreow", "item.book.put", "death.min.volume", "death.mid.volume", "block.composter.empty", "imitate.blaze", "imitate.cave_spider", "ui.stonecutter.take_result", "imitate.creeper", "imitate.elder_guardian", "block.barrel.open", "imitate.ender_dragon", "imitate.enderman", "imitate.evocation_illager", "ambient.in.raid", "imitate.ghast", "imitate.husk", "convert_mooshroom", "imitate.illusion_illager", "imitate.magma_cube", "block.smoker.smoke", "imitate.polar_bear", "imitate.shulker", "raid.horn", "imitate.silverfish", "imitate.skeleton", "imitate.slime", "imitate.spider", "block.beehive.work", "imitate.stray", "imitate.vex", "imitate.vindication_illager", "imitate.witch", "imitate.wither", "imitate.wither_skeleton", "block.beehive.enter", "imitate.wolf", "imitate.zombie", "tempt", "imitate.zombie_pigman", "imitate.zombie_villager", "block.end_portal.spawn", "bottle.dragonbreath", "balloonpop", "sparkler.active", "item.trident.hit", "respawn_anchor.basalt_deltas.mood", "item.trident.hit_ground", "respawn_anchor.charge", "item.trident.return", "item.trident.riptide_1", "angry", "item.trident.riptide_2", "item.trident.riptide_3", "retreat", "item.trident.throw", "item.trident.thunder", "smithing_table.use", "block.fletching_table.use", "elemconstruct.open", "respawn_anchor.set_spawn", "icebomb.hit", "ambient.soulsand_valley.mood", "lt.reaction.icebomb", "lt.reaction.bleach", "lt.reaction.epaste", "lt.reaction.epaste2", "heartbeat", "lt.reaction.fertilizer", "lt.reaction.fireball", "ambient.crimson_forest.loop", "lt.reaction.mgsalt", "lt.reaction.miscfire", "cauldron_drip.water.pointed_dripstone", "lt.reaction.fire", "lt.reaction.miscexplosion", "ambient.basalt_deltas.additions", "lt.reaction.miscmystical", "lt.reaction.miscmystical2", "ambient.nether_wastes.loop", "lt.reaction.product", "sparkler.use", "bucket.fill.powder_snow", "glowstick.use", "block.turtle_egg.break", "sleep", "block.turtle_egg.crack", "block.turtle_egg.hatch", "block.turtle_egg.attack", "swoop", "presneeze", "ambient.candle", "sneeze", "tongue", "scared", "ambient.aggressive", "irongolem.repair", "ambient.worried", "cant_breed", "block.scaffolding.climb", "jump_to_block", "block.bamboo_sapling.place", "block.sculk_shrieker.shriek", "crossbow.loading.start", "crossbow.loading.middle", "cake.add_candle", "crossbow.loading.end", "crossbow.shoot", "agitated", "crossbow.quick_charge.start", "crossbow.quick_charge.middle", "charge.sculk", "crossbow.quick_charge.end", "nearby_closer", "item.shield.block", "admire", "portal.travel", "block.grindstone.use", "block.campfire.crackle", "block.sweet_berry_bush.pick", "block.stonecutter.use", "block.cartography_table.use", "block.composter.fill", "block.composter.ready", "stun", "block.barrel.close", "ui.cartography_table.take_result", "ui.loom.take_result", "block.blastfurnace.fire_crackle", "block.loom.use", "screech", "block.furnace.lit", "milk_suspiciously", "block.beehive.exit", "block.beehive.shear", "block.beehive.drip", "ambient.cave", "converted_to_zombified", "step_lava", "panic", "particle.soul_escape.loud", "respawn_anchor.deplete", "respawn_anchor.ambient", "ambient.crimson_forest.mood", "ambient.warped_forest.mood", "ambient.nether_wastes.mood", "ambient.crimson_forest.additions", "ambient.warped_forest.additions", "ambient.soulsand_valley.additions", "ambient.nether_wastes.additions", "ambient.soulsand_valley.loop", "ambient.basalt_deltas.loop", "lodestone_compass.link_compass_to_lodestone", "power.off.sculk_sensor", "default", "ram_impact.screamer", "lay_egg", "lay_spawn", "bucket.empty.powder_snow", "cauldron_drip.lava.pointed_dripstone", "tilt_down.big_dripleaf", "drip.lava.pointed_dripstone", "copper.wax.on", "scrape", "item.spyglass.use", "item.spyglass.stop_using", "chime.amethyst_block", "mob.player.hurt_on_fire", "mob.player.hurt_freeze", "hurt.screamer", "death.screamer", "milk.screamer", "pre_ram", "ram_impact", "squid.ink_squirt", "convert_to_stray", "extinguish.candle", "block.click", "block.sculk_catalyst.bloom", "nearby_close", "nearby_closest", "listening", "item_given", "item_thrown", "irongolem.crack", "horn_break", "horn_call0", "horn_call1", "horn_call3", "horn_call5", "horn_call7", "imitate.warden", "sonic_boom", "convert_to_frog", "block.sculk.spread", "block.sculk_sensor.place", "block.sculk_shrieker.place", "block.enchanting_table.use", "bundle.insert", "dash_ready", "pressure_plate.click_off", "button.click_off", "door.open", "trapdoor.open", "fence_gate.open", "insert", "insert_enchanted", "undefined"
Back to top

diff --git a/documentation/Molang.html b/documentation/Molang.html index 4c6450165..8e0bb07a9 100644 --- a/documentation/Molang.html +++ b/documentation/Molang.html @@ -1,4 +1,4 @@ -

MOLANG DOCUMENTATION
Version: 1.19.50.25

+

MOLANG DOCUMENTATION
Version: 1.19.60.20

This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.
Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.

Index

@@ -1327,6 +1327,10 @@

+ + + + diff --git a/documentation/Particles.html b/documentation/Particles.html index e91fbb4cb..46a0f6300 100644 --- a/documentation/Particles.html +++ b/documentation/Particles.html @@ -1,4 +1,4 @@ -

PARTICLES DOCUMENTATION
Version: 1.19.50.25

+

PARTICLES DOCUMENTATION
Version: 1.19.60.20

This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.
Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.

Index

Returns 1.0 if the entity is lingering, else it returns 0.0.
query.is_local_playerTakes no arguments. Returns 1.0 if the entity is the local player for the current game window, else it returns 0.0. In splitscreen returns 0.0 for the other local players for other views. Always returns 0.0 if used in a behavior pack.
query.is_moving Returns 1.0 if the entity is moving, else it returns 0.0.
diff --git a/documentation/Recipes.html b/documentation/Recipes.html index 20ee527fa..c1c538df8 100644 --- a/documentation/Recipes.html +++ b/documentation/Recipes.html @@ -1,4 +1,4 @@ -

RECIPES DOCUMENTATION
Version: 1.19.50.25

+

RECIPES DOCUMENTATION
Version: 1.19.60.20

This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.
Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.

Index

diff --git a/documentation/Schemas.html b/documentation/Schemas.html index fde7d8ead..d96398d5e 100644 --- a/documentation/Schemas.html +++ b/documentation/Schemas.html @@ -1,4 +1,4 @@ -

SCHEMAS DOCUMENTATION
Version: 1.19.50.25

+

SCHEMAS DOCUMENTATION
Version: 1.19.60.20

This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.
Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.

Index

diff --git a/documentation/Texture Sets.html b/documentation/Texture Sets.html index 49f469773..9630c04a4 100644 --- a/documentation/Texture Sets.html +++ b/documentation/Texture Sets.html @@ -1,4 +1,4 @@ -

TEXTURE SETS DOCUMENTATION
Version: 1.19.50.25

+

TEXTURE SETS DOCUMENTATION
Version: 1.19.60.20

This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.
Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.

Index

diff --git a/documentation/Volumes.html b/documentation/Volumes.html index bc79d2a51..d0e9a7024 100644 --- a/documentation/Volumes.html +++ b/documentation/Volumes.html @@ -1,4 +1,4 @@ -

VOLUMES DOCUMENTATION
Version: 1.19.50.25

+

VOLUMES DOCUMENTATION
Version: 1.19.60.20

This is documentation for a preview release of Minecraft. New features, components, and capabilities in this release are not final and might change without notice before the final release.
Be sure to check the documentation once the release is out of preview if your add-on isn't working properly. Resource and Behavior Packs created for the preview are not guaranteed to work on the final release.

Index

@@ -104,7 +104,7 @@

Volume Definition Properties

- +
format_version String Specifies the version of the game this entity was made in. Minimum supported version is 1.17.0. Current supported version is 1.19.50.
Specifies the version of the game this entity was made in. Minimum supported version is 1.17.0. Current supported version is 1.19.60.

Example

diff --git a/resource_pack/entity/ender_dragon.entity.json b/resource_pack/entity/ender_dragon.entity.json index 3d4ea44f4..f351a74db 100644 --- a/resource_pack/entity/ender_dragon.entity.json +++ b/resource_pack/entity/ender_dragon.entity.json @@ -3,269 +3,10 @@ "minecraft:client_entity": { "description": { "identifier": "minecraft:ender_dragon", - "materials": { - "default": "ender_dragon", - "beam_material": "entity_beam", - "death_material": "entity_beam_additive", - "dissolve_0": "entity_dissolve_layer0.skinning", - "dissolve_1": "entity_dissolve_layer1.skinning" - }, - "textures": { - "default": "textures/entity/dragon/dragon", - "exploding": "textures/entity/dragon/dragon_exploding", - "beam": "textures/entity/endercrystal/endercrystal_beam" - }, - "geometry": { - "default": "geometry.dragon" - }, - "scripts": { - "pre_animation": [ - "variable.flap_time = query.wing_flap_position * 360.0;", - "variable.base_rotation = Math.sin(variable.flap_time - 57.3) + 57.3;", - "variable.rotation_factor = (variable.base_rotation * variable.base_rotation + variable.base_rotation * 114.6) * 2.87;", - "variable.base_rotation_translate = Math.sin(variable.flap_time - 57.3) + 1.0;", - "variable.rotation_factor_translate = (variable.base_rotation_translate * variable.base_rotation_translate + variable.base_rotation_translate * 2.0) * 0.05;", - "variable.pre_rotation_raw = Math.mod(v.historical_frame_5.rot_y - v.historical_frame_10.rot_y + 180.0, 360.0);", - "variable.pre_rotation = variable.pre_rotation_raw < 0.0 ? variable.pre_rotation_raw + 180.0 : variable.pre_rotation_raw - 180.0;", - "variable.piece_rotation_raw = Math.mod(v.historical_frame_5.rot_y + (variable.pre_rotation / 2.0) + 180.0, 360.0);", - "variable.piece_rotation = variable.piece_rotation_raw < 0.0 ? variable.piece_rotation_raw + 180.0 : variable.piece_rotation_raw - 180.0;", - "variable.rotationScale = 1.5;", - "variable.death_effect_duration = 200.0;", - "variable.death_alpha = (1.0 - (query.death_ticks + query.frame_alpha) / variable.death_effect_duration) * 2.0 + 0.3;", - - "variable.pitch = -(math.min_angle(v.historical_frame_5.pos_y - v.historical_frame_10.pos_y)) * 10.0;", - "variable.roll = math.min_angle(v.historical_frame_5.rot_y - v.historical_frame_10.rot_y) * variable.rotationScale;", - "variable.clamped_pitch = math.clamp(variable.pitch, -30, 30);", - "variable.clamped_roll = math.clamp(variable.roll, -45, 45);", - - "variable.neck_distance = 10.0;", - "variable.neck_1_rotation_x = Math.cos(variable.flap_time) * 8.6 + (query.is_sitting ? 0.0 : (v.historical_frame_5.pos_y - v.historical_frame_6.pos_y)) * variable.rotationScale * 5.0;", - "variable.neck_1_rotation_y_raw = Math.mod((v.historical_frame_5.rot_y - v.historical_frame_6.rot_y) + 180.0, 360.0);", - "variable.neck_1_rotation_y = (variable.neck_1_rotation_y_raw < 0.0 ? (variable.neck_1_rotation_y_raw + 180.0) : (variable.neck_1_rotation_y_raw - 180.0)) * variable.rotationScale;", - "variable.neck_1_rotation_z_raw = Math.mod((v.historical_frame_5.rot_y - variable.piece_rotation) + 180.0, 360.0);", - "variable.neck_1_rotation_z = -(variable.neck_1_rotation_z_raw < 0.0 ? (variable.neck_1_rotation_z_raw + 180.0) : (variable.neck_1_rotation_z_raw - 180.0)) * variable.rotationScale;", - - "variable.neck_1_position_x = 0.0;", - "variable.neck_1_position_y = -20.0;", - "variable.neck_1_position_z = -12.0;", - - "variable.neck_2_rotation_x = Math.cos(25.79 + variable.flap_time) * 8.6 + (query.is_sitting ? 1.0 : (v.historical_frame_4.pos_y - v.historical_frame_6.pos_y)) * variable.rotationScale * 5.0;", - "variable.neck_2_rotation_y_raw = Math.mod((v.historical_frame_4.rot_y - v.historical_frame_6.rot_y) + 180.0, 360.0);", - "variable.neck_2_rotation_y = (variable.neck_2_rotation_y_raw < 0.0 ? (variable.neck_2_rotation_y_raw + 180.0) : (variable.neck_2_rotation_y_raw - 180.0)) * variable.rotationScale;", - "variable.neck_2_rotation_z_raw = Math.mod((v.historical_frame_4.rot_y - variable.piece_rotation) + 180.0, 360.0);", - "variable.neck_2_rotation_z = -(variable.neck_2_rotation_z_raw < 0.0 ? (variable.neck_2_rotation_z_raw + 180.0) : (variable.neck_2_rotation_z_raw - 180.0)) * variable.rotationScale;", - - "variable.neck_2_position_x = variable.neck_1_position_x - Math.sin(variable.neck_1_rotation_y) * Math.cos(variable.neck_1_rotation_x) * variable.neck_distance;", - "variable.neck_2_position_y = variable.neck_1_position_y - Math.sin(variable.neck_1_rotation_x) * variable.neck_distance;", - "variable.neck_2_position_z = variable.neck_1_position_z - Math.cos(variable.neck_1_rotation_y) * Math.cos(variable.neck_1_rotation_x) * variable.neck_distance;", - - "variable.neck_3_rotation_x = Math.cos(51.57 + variable.flap_time) * 8.6 + (query.is_sitting ? 2.0 : (v.historical_frame_3.pos_y - v.historical_frame_6.pos_y)) * variable.rotationScale * 5.0;", - "variable.neck_3_rotation_y_raw = Math.mod((v.historical_frame_3.rot_y - v.historical_frame_6.rot_y + 180.0), 360.0);", - "variable.neck_3_rotation_y = (variable.neck_3_rotation_y_raw < 0.0 ? (variable.neck_3_rotation_y_raw + 180.0) : (variable.neck_3_rotation_y_raw - 180.0)) * variable.rotationScale;", - "variable.neck_3_rotation_z_raw = Math.mod((v.historical_frame_3.rot_y - variable.piece_rotation) + 180.0, 360.0);", - "variable.neck_3_rotation_z = -(variable.neck_3_rotation_z_raw < 0.0 ? (variable.neck_3_rotation_z_raw + 180.0) : (variable.neck_3_rotation_z_raw - 180.0)) * variable.rotationScale;", - - "variable.neck_3_position_x = variable.neck_2_position_x - Math.sin(variable.neck_2_rotation_y) * Math.cos(variable.neck_2_rotation_x) * variable.neck_distance;", - "variable.neck_3_position_y = variable.neck_2_position_y - Math.sin(variable.neck_2_rotation_x) * variable.neck_distance;", - "variable.neck_3_position_z = variable.neck_2_position_z - Math.cos(variable.neck_2_rotation_y) * Math.cos(variable.neck_2_rotation_x) * variable.neck_distance;", - - "variable.neck_4_rotation_x = Math.cos(77.36 + variable.flap_time) * 8.6 + (query.is_sitting ? 3.0 : (v.historical_frame_2.pos_y - v.historical_frame_6.pos_y)) * variable.rotationScale * 5.0;", - "variable.neck_4_rotation_y_raw = Math.mod((v.historical_frame_2.rot_y - v.historical_frame_6.rot_y + 180.0), 360.0);", - "variable.neck_4_rotation_y = (variable.neck_4_rotation_y_raw < 0.0 ? (variable.neck_4_rotation_y_raw + 180.0) : (variable.neck_4_rotation_y_raw - 180.0)) * variable.rotationScale;", - "variable.neck_4_rotation_z_raw = Math.mod((v.historical_frame_2.rot_y - variable.piece_rotation) + 180.0, 360.0);", - "variable.neck_4_rotation_z = -(variable.neck_4_rotation_z_raw < 0.0 ? (variable.neck_4_rotation_z_raw + 180.0) : (variable.neck_4_rotation_z_raw - 180.0)) * variable.rotationScale;", - - "variable.neck_4_position_x = variable.neck_3_position_x - Math.sin(variable.neck_3_rotation_y) * Math.cos(variable.neck_3_rotation_x) * variable.neck_distance;", - "variable.neck_4_position_y = variable.neck_3_position_y - Math.sin(variable.neck_3_rotation_x) * variable.neck_distance;", - "variable.neck_4_position_z = variable.neck_3_position_z - Math.cos(variable.neck_3_rotation_y) * Math.cos(variable.neck_3_rotation_x) * variable.neck_distance;", - - "variable.neck_5_rotation_x = Math.cos(103.14 + variable.flap_time) * 8.6 + (query.is_sitting ? 4.0 : (v.historical_frame_1.pos_y - v.historical_frame_6.pos_y)) * variable.rotationScale * 5.0;", - "variable.neck_5_rotation_y_raw = Math.mod((v.historical_frame_1.rot_y - v.historical_frame_6.rot_y) + 180.0, 360.0);", - "variable.neck_5_rotation_y = (variable.neck_5_rotation_y_raw < 0.0 ? (variable.neck_5_rotation_y_raw + 180.0) : (variable.neck_5_rotation_y_raw - 180.0)) * variable.rotationScale;", - "variable.neck_5_rotation_z_raw = Math.mod((v.historical_frame_1.rot_y - variable.piece_rotation) + 180.0, 360.0);", - "variable.neck_5_rotation_z = -(variable.neck_5_rotation_z_raw < 0.0 ? (variable.neck_5_rotation_z_raw + 180.0) : (variable.neck_5_rotation_z_raw - 180.0)) * variable.rotationScale;", - - "variable.neck_5_position_x = variable.neck_4_position_x - Math.sin(variable.neck_4_rotation_y) * Math.cos(variable.neck_4_rotation_x) * variable.neck_distance;", - "variable.neck_5_position_y = variable.neck_4_position_y - Math.sin(variable.neck_4_rotation_x) * variable.neck_distance;", - "variable.neck_5_position_z = variable.neck_4_position_z - Math.cos(variable.neck_4_rotation_y) * Math.cos(variable.neck_4_rotation_x) * variable.neck_distance;", - - "variable.head_rotation_x_raw = Math.mod((query.is_sitting ? 6.0 : 0.0) + 180.0, 360.0);", - "variable.head_rotation_x = (variable.head_rotation_x_raw < 0.0 ? (variable.head_rotation_x_raw + 180.0) : (variable.head_rotation_x_raw - 180.0)) * variable.rotationScale * 5.0;", - "variable.head_rotation_y_raw = Math.mod((v.historical_frame_0.rot_y - v.historical_frame_6.rot_y) + 180.0, 360.0);", - "variable.head_rotation_y = (variable.head_rotation_y_raw < 0.0 ? (variable.head_rotation_y_raw + 180.0) : (variable.head_rotation_y_raw - 180.0));", - "variable.head_rotation_z_raw = Math.mod((v.historical_frame_0.rot_y - variable.piece_rotation) + 180.0, 360.0);", - "variable.head_rotation_z = -(variable.head_rotation_z_raw < 0.0 ? (variable.head_rotation_z_raw + 180.0) : (variable.head_rotation_z_raw - 180.0));", - - "variable.head_position_x = variable.neck_5_position_x - Math.sin(variable.neck_5_rotation_y) * Math.cos(variable.neck_5_rotation_x) * variable.neck_distance;", - "variable.head_position_y = variable.neck_5_position_y - Math.sin(variable.neck_5_rotation_x) * variable.neck_distance;", - "variable.head_position_z = variable.neck_5_position_z - Math.cos(variable.neck_5_rotation_y) * Math.cos(variable.neck_5_rotation_x) * variable.neck_distance;", - - "variable.tail_distance = 10.0;", - "variable.tail_rotation_y = 180.0;", - "variable.tail_rotation_x = Math.sin(variable.flap_time) * 2.86;", - - "variable.tail_1_rotation_x = variable.tail_rotation_x + (v.historical_frame_12.pos_y - v.historical_frame_11.pos_y) * variable.rotationScale * 5.0;", - "variable.tail_1_rotation_y_raw = Math.mod((v.historical_frame_12.rot_y - v.historical_frame_11.rot_y) + 180.0, 360.0);", - "variable.tail_1_rotation_y = (variable.tail_1_rotation_y_raw < 0.0 ? (variable.tail_1_rotation_y_raw + 180.0) : (variable.tail_1_rotation_y_raw - 180.0)) * variable.rotationScale + variable.tail_rotation_y;", - "variable.tail_1_rotation_z_raw = Math.mod((v.historical_frame_12.rot_y - variable.piece_rotation) + 180.0, 360.0);", - "variable.tail_1_rotation_z = -(variable.tail_1_rotation_z_raw < 0.0 ? (variable.tail_1_rotation_z_raw + 180.0) : (variable.tail_1_rotation_z_raw - 180.0)) * variable.rotationScale;", - - "variable.tail_1_position_x = 0.0;", - "variable.tail_1_position_y = -10.0;", - "variable.tail_1_position_z = 60.0;", - - "variable.tail_rotation_x = variable.tail_rotation_x + Math.sin(25.78 + variable.flap_time) * 2.86;", - - "variable.tail_2_rotation_x = variable.tail_rotation_x + (v.historical_frame_13.pos_y - v.historical_frame_11.pos_y) * variable.rotationScale * 5.0;", - "variable.tail_2_rotation_y_raw = Math.mod((v.historical_frame_13.rot_y - v.historical_frame_11.rot_y) + 180.0, 360.0);", - "variable.tail_2_rotation_y = (variable.tail_2_rotation_y_raw < 0.0 ? (variable.tail_2_rotation_y_raw + 180.0) : (variable.tail_2_rotation_y_raw - 180.0)) * variable.rotationScale + variable.tail_rotation_y;", - "variable.tail_2_rotation_z_raw = Math.mod((v.historical_frame_13.rot_y - variable.piece_rotation) + 180.0, 360.0);", - "variable.tail_2_rotation_z = -(variable.tail_2_rotation_z_raw < 0.0 ? (variable.tail_2_rotation_z_raw + 180.0) : (variable.tail_2_rotation_z_raw - 180.0)) * variable.rotationScale;", - - "variable.tail_2_position_x = variable.tail_1_position_x - Math.sin(variable.tail_1_rotation_y) * Math.cos(variable.tail_1_rotation_x) * 10.0;", - "variable.tail_2_position_y = variable.tail_1_position_y - Math.sin(variable.tail_1_rotation_x) * variable.tail_distance;", - "variable.tail_2_position_z = variable.tail_1_position_z - Math.cos(variable.tail_1_rotation_y) * Math.cos(variable.tail_1_rotation_x) * 10.0;", - - "variable.tail_rotation_x = variable.tail_rotation_x + Math.sin(51.56 + variable.flap_time) * 2.86;", - - "variable.tail_3_rotation_x = variable.tail_rotation_x + (v.historical_frame_14.pos_y - v.historical_frame_11.pos_y) * variable.rotationScale * 5.0;", - "variable.tail_3_rotation_y_raw = Math.mod((v.historical_frame_14.rot_y - v.historical_frame_11.rot_y) + 180.0, 360.0);", - "variable.tail_3_rotation_y = (variable.tail_3_rotation_y_raw < 0.0 ? (variable.tail_3_rotation_y_raw + 180.0) : (variable.tail_3_rotation_y_raw - 180.0)) * variable.rotationScale + variable.tail_rotation_y;", - "variable.tail_3_rotation_z_raw = Math.mod((v.historical_frame_14.rot_y - variable.piece_rotation) + 180.0, 360.0);", - "variable.tail_3_rotation_z = -(variable.tail_3_rotation_z_raw < 0.0 ? (variable.tail_3_rotation_z_raw + 180.0) : (variable.tail_3_rotation_z_raw - 180.0)) * variable.rotationScale;", - - "variable.tail_3_position_x = variable.tail_2_position_x - Math.sin(variable.tail_2_rotation_y) * Math.cos(variable.tail_2_rotation_x) * 10.0;", - "variable.tail_3_position_y = variable.tail_2_position_y - Math.sin(variable.tail_2_rotation_x) * variable.tail_distance;", - "variable.tail_3_position_z = variable.tail_2_position_z - Math.cos(variable.tail_2_rotation_y) * Math.cos(variable.tail_2_rotation_x) * 10.0;", - - "variable.tail_rotation_x = variable.tail_rotation_x + Math.sin(77.35 + variable.flap_time) * 2.86;", - - "variable.tail_4_rotation_x = variable.tail_rotation_x + (v.historical_frame_15.pos_y - v.historical_frame_11.pos_y) * variable.rotationScale * 5.0;", - "variable.tail_4_rotation_y_raw = Math.mod((v.historical_frame_15.rot_y - v.historical_frame_11.rot_y) + 180.0, 360.0);", - "variable.tail_4_rotation_y = (variable.tail_4_rotation_y_raw < 0.0 ? (variable.tail_4_rotation_y_raw + 180.0) : (variable.tail_4_rotation_y_raw - 180.0)) * variable.rotationScale + variable.tail_rotation_y;", - "variable.tail_4_rotation_z_raw = Math.mod((v.historical_frame_15.rot_y - variable.piece_rotation) + 180.0, 360.0);", - "variable.tail_4_rotation_z = -(variable.tail_4_rotation_z_raw < 0.0 ? (variable.tail_4_rotation_z_raw + 180.0) : (variable.tail_4_rotation_z_raw - 180.0)) * variable.rotationScale;", - - "variable.tail_4_position_x = variable.tail_3_position_x - Math.sin(variable.tail_3_rotation_y) * Math.cos(variable.tail_3_rotation_x) * 10.0;", - "variable.tail_4_position_y = variable.tail_3_position_y - Math.sin(variable.tail_3_rotation_x) * variable.tail_distance;", - "variable.tail_4_position_z = variable.tail_3_position_z - Math.cos(variable.tail_3_rotation_y) * Math.cos(variable.tail_3_rotation_x) * 10.0;", - - "variable.tail_rotation_x = variable.tail_rotation_x + Math.sin(103.13 + variable.flap_time) * 2.86;", - - "variable.tail_5_rotation_x = variable.tail_rotation_x + (v.historical_frame_16.pos_y - v.historical_frame_11.pos_y) * variable.rotationScale * 5.0;", - "variable.tail_5_rotation_y_raw = Math.mod((v.historical_frame_16.rot_y - v.historical_frame_11.rot_y) + 180.0, 360.0);", - "variable.tail_5_rotation_y = (variable.tail_5_rotation_y_raw < 0.0 ? (variable.tail_5_rotation_y_raw + 180.0) : (variable.tail_5_rotation_y_raw - 180.0)) * variable.rotationScale + variable.tail_rotation_y;", - "variable.tail_5_rotation_z_raw = Math.mod((v.historical_frame_16.rot_y - variable.piece_rotation) + 180.0, 360.0);", - "variable.tail_5_rotation_z = -(variable.tail_5_rotation_z_raw < 0.0 ? (variable.tail_5_rotation_z_raw + 180.0) : (variable.tail_5_rotation_z_raw - 180.0)) * variable.rotationScale;", - - "variable.tail_5_position_x = variable.tail_4_position_x - Math.sin(variable.tail_4_rotation_y) * Math.cos(variable.tail_4_rotation_x) * 10.0;", - "variable.tail_5_position_y = variable.tail_4_position_y - Math.sin(variable.tail_4_rotation_x) * variable.tail_distance;", - "variable.tail_5_position_z = variable.tail_4_position_z - Math.cos(variable.tail_4_rotation_y) * Math.cos(variable.tail_4_rotation_x) * 10.0;", - - "variable.tail_rotation_x = variable.tail_rotation_x + Math.sin(128.92 + variable.flap_time) * 2.86;", - - "variable.tail_6_rotation_x = variable.tail_rotation_x + (v.historical_frame_17.pos_y - v.historical_frame_11.pos_y) * variable.rotationScale * 5.0;", - "variable.tail_6_rotation_y_raw = Math.mod((v.historical_frame_17.rot_y - v.historical_frame_11.rot_y) + 180.0, 360.0);", - "variable.tail_6_rotation_y = (variable.tail_6_rotation_y_raw < 0.0 ? (variable.tail_6_rotation_y_raw + 180.0) : (variable.tail_6_rotation_y_raw - 180.0)) * variable.rotationScale + variable.tail_rotation_y;", - "variable.tail_6_rotation_z_raw = Math.mod((v.historical_frame_17.rot_y - variable.piece_rotation) + 180.0, 360.0);", - "variable.tail_6_rotation_z = -(variable.tail_6_rotation_z_raw < 0.0 ? (variable.tail_6_rotation_z_raw + 180.0) : (variable.tail_6_rotation_z_raw - 180.0)) * variable.rotationScale;", - - "variable.tail_6_position_x = variable.tail_5_position_x - Math.sin(variable.tail_5_rotation_y) * Math.cos(variable.tail_5_rotation_x) * 10.0;", - "variable.tail_6_position_y = variable.tail_5_position_y - Math.sin(variable.tail_5_rotation_x) * variable.tail_distance;", - "variable.tail_6_position_z = variable.tail_5_position_z - Math.cos(variable.tail_5_rotation_y) * Math.cos(variable.tail_5_rotation_x) * 10.0;", - - "variable.tail_rotation_x = variable.tail_rotation_x + Math.sin(154.70 + variable.flap_time) * 2.86;", - - "variable.tail_7_rotation_x = variable.tail_rotation_x + (v.historical_frame_18.pos_y - v.historical_frame_11.pos_y) * variable.rotationScale * 5.0;", - "variable.tail_7_rotation_y_raw = Math.mod((v.historical_frame_18.rot_y - v.historical_frame_11.rot_y) + 180.0, 360.0);", - "variable.tail_7_rotation_y = (variable.tail_7_rotation_y_raw < 0.0 ? (variable.tail_7_rotation_y_raw + 180.0) : (variable.tail_7_rotation_y_raw - 180.0)) * variable.rotationScale + variable.tail_rotation_y;", - "variable.tail_7_rotation_z_raw = Math.mod((v.historical_frame_18.rot_y - variable.piece_rotation) + 180.0, 360.0);", - "variable.tail_7_rotation_z = -(variable.tail_7_rotation_z_raw < 0.0 ? (variable.tail_7_rotation_z_raw + 180.0) : (variable.tail_7_rotation_z_raw - 180.0)) * variable.rotationScale;", - - "variable.tail_7_position_x = variable.tail_6_position_x - Math.sin(variable.tail_6_rotation_y) * Math.cos(variable.tail_6_rotation_x) * 10.0;", - "variable.tail_7_position_y = variable.tail_6_position_y - Math.sin(variable.tail_6_rotation_x) * variable.tail_distance;", - "variable.tail_7_position_z = variable.tail_6_position_z - Math.cos(variable.tail_6_rotation_y) * Math.cos(variable.tail_6_rotation_x) * 10.0;", - - "variable.tail_rotation_x = variable.tail_rotation_x + Math.sin(180.48 + variable.flap_time) * 2.86;", - - "variable.tail_8_rotation_x = variable.tail_rotation_x + (v.historical_frame_19.pos_y - v.historical_frame_11.pos_y) * variable.rotationScale * 5.0;", - "variable.tail_8_rotation_y_raw = Math.mod((v.historical_frame_19.rot_y - v.historical_frame_11.rot_y) + 180.0, 360.0);", - "variable.tail_8_rotation_y = (variable.tail_8_rotation_y_raw < 0.0 ? (variable.tail_8_rotation_y_raw + 180.0) : (variable.tail_8_rotation_y_raw - 180.0)) * variable.rotationScale + variable.tail_rotation_y;", - "variable.tail_8_rotation_z_raw = Math.mod((v.historical_frame_19.rot_y - variable.piece_rotation) + 180.0, 360.0);", - "variable.tail_8_rotation_z = -(variable.tail_8_rotation_z_raw < 0.0 ? (variable.tail_8_rotation_z_raw + 180.0) : (variable.tail_8_rotation_z_raw - 180.0)) * variable.rotationScale;", - - "variable.tail_8_position_x = variable.tail_7_position_x - Math.sin(variable.tail_7_rotation_y) * Math.cos(variable.tail_7_rotation_x) * 10.0;", - "variable.tail_8_position_y = variable.tail_7_position_y - Math.sin(variable.tail_7_rotation_x) * variable.tail_distance;", - "variable.tail_8_position_z = variable.tail_7_position_z - Math.cos(variable.tail_7_rotation_y) * Math.cos(variable.tail_7_rotation_x) * 10.0;", - - "variable.tail_rotation_x = variable.tail_rotation_x + Math.sin(206.26 + variable.flap_time) * 2.86;", - - "variable.tail_9_rotation_x = variable.tail_rotation_x + (v.historical_frame_20.pos_y - v.historical_frame_11.pos_y) * variable.rotationScale * 5.0;", - "variable.tail_9_rotation_y_raw = Math.mod((v.historical_frame_20.rot_y - v.historical_frame_11.rot_y) + 180.0, 360.0);", - "variable.tail_9_rotation_y = (variable.tail_9_rotation_y_raw < 0.0 ? (variable.tail_9_rotation_y_raw + 180.0) : (variable.tail_9_rotation_y_raw - 180.0)) * variable.rotationScale + variable.tail_rotation_y;", - "variable.tail_9_rotation_z_raw = Math.mod((v.historical_frame_20.rot_y - variable.piece_rotation) + 180.0, 360.0);", - "variable.tail_9_rotation_z = -(variable.tail_9_rotation_z_raw < 0.0 ? (variable.tail_9_rotation_z_raw + 180.0) : (variable.tail_9_rotation_z_raw - 180.0)) * variable.rotationScale;", - - "variable.tail_9_position_x = variable.tail_8_position_x - Math.sin(variable.tail_8_rotation_y) * Math.cos(variable.tail_8_rotation_x) * 10.0;", - "variable.tail_9_position_y = variable.tail_8_position_y - Math.sin(variable.tail_8_rotation_x) * variable.tail_distance;", - "variable.tail_9_position_z = variable.tail_8_position_z - Math.cos(variable.tail_8_rotation_y) * Math.cos(variable.tail_8_rotation_x) * 10.0;", - - "variable.tail_rotation_x = variable.tail_rotation_x + Math.sin(232.05 + variable.flap_time) * 2.86;", - - "variable.tail_10_rotation_x = variable.tail_rotation_x + (v.historical_frame_21.pos_y - v.historical_frame_11.pos_y) * variable.rotationScale * 5.0;", - "variable.tail_10_rotation_y_raw = Math.mod((v.historical_frame_21.rot_y - v.historical_frame_11.rot_y) + 180.0, 360.0);", - "variable.tail_10_rotation_y = (variable.tail_10_rotation_y_raw < 0.0 ? (variable.tail_10_rotation_y_raw + 180.0) : (variable.tail_10_rotation_y_raw - 180.0)) * variable.rotationScale + variable.tail_rotation_y;", - "variable.tail_10_rotation_z_raw = Math.mod((v.historical_frame_21.rot_y - variable.piece_rotation) + 180.0, 360.0);", - "variable.tail_10_rotation_z = -(variable.tail_10_rotation_z_raw < 0.0 ? (variable.tail_10_rotation_z_raw + 180.0) : (variable.tail_10_rotation_z_raw - 180.0)) * variable.rotationScale;", - - "variable.tail_10_position_x = variable.tail_9_position_x - Math.sin(variable.tail_9_rotation_y) * Math.cos(variable.tail_9_rotation_x) * 10.0;", - "variable.tail_10_position_y = variable.tail_9_position_y - Math.sin(variable.tail_9_rotation_x) * variable.tail_distance;", - "variable.tail_10_position_z = variable.tail_9_position_z - Math.cos(variable.tail_9_rotation_y) * Math.cos(variable.tail_9_rotation_x) * 10.0;", - - "variable.tail_rotation_x = variable.tail_rotation_x + Math.sin(257.83 + variable.flap_time) * 2.86;", - - "variable.tail_11_rotation_x = variable.tail_rotation_x + (v.historical_frame_22.pos_y - v.historical_frame_11.pos_y) * variable.rotationScale * 5.0;", - "variable.tail_11_rotation_y_raw = Math.mod((v.historical_frame_22.rot_y - v.historical_frame_11.rot_y) + 180.0, 360.0);", - "variable.tail_11_rotation_y = (variable.tail_11_rotation_y_raw < 0.0 ? (variable.tail_11_rotation_y_raw + 180.0) : (variable.tail_11_rotation_y_raw - 180.0)) * variable.rotationScale + variable.tail_rotation_y;", - "variable.tail_11_rotation_z_raw = Math.mod((v.historical_frame_22.rot_y - variable.piece_rotation) + 180.0, 360.0);", - "variable.tail_11_rotation_z = -(variable.tail_11_rotation_z_raw < 0.0 ? (variable.tail_11_rotation_z_raw + 180.0) : (variable.tail_11_rotation_z_raw - 180.0)) * variable.rotationScale;", - - "variable.tail_11_position_x = variable.tail_10_position_x - Math.sin(variable.tail_10_rotation_y) * Math.cos(variable.tail_10_rotation_x) * 10.0;", - "variable.tail_11_position_y = variable.tail_10_position_y - Math.sin(variable.tail_10_rotation_x) * variable.tail_distance;", - "variable.tail_11_position_z = variable.tail_10_position_z - Math.cos(variable.tail_10_rotation_y) * Math.cos(variable.tail_10_rotation_x) * 10.0;", - - "variable.tail_rotation_x = variable.tail_rotation_x + Math.sin(283.61 + variable.flap_time) * 2.86;", - - "variable.tail_12_rotation_x = variable.tail_rotation_x + (v.historical_frame_23.pos_y - v.historical_frame_11.pos_y) * variable.rotationScale * 5.0;", - "variable.tail_12_rotation_y_raw = Math.mod((v.historical_frame_23.rot_y - v.historical_frame_11.rot_y) + 180.0, 360.0);", - "variable.tail_12_rotation_y = (variable.tail_12_rotation_y_raw < 0.0 ? (variable.tail_12_rotation_y_raw + 180.0) : (variable.tail_12_rotation_y_raw - 180.0)) * variable.rotationScale + variable.tail_rotation_y;", - "variable.tail_12_rotation_z_raw = Math.mod((v.historical_frame_23.rot_y - variable.piece_rotation) + 180.0, 360.0);", - "variable.tail_12_rotation_z = -(variable.tail_12_rotation_z_raw < 0.0 ? (variable.tail_12_rotation_z_raw + 180.0) : (variable.tail_12_rotation_z_raw - 180.0)) * variable.rotationScale;", - - "variable.tail_12_position_x = variable.tail_11_position_x - Math.sin(variable.tail_11_rotation_y) * Math.cos(variable.tail_11_rotation_x) * 10.0;", - "variable.tail_12_position_y = variable.tail_11_position_y - Math.sin(variable.tail_11_rotation_x) * variable.tail_distance;", - "variable.tail_12_position_z = variable.tail_11_position_z - Math.cos(variable.tail_11_rotation_y) * Math.cos(variable.tail_11_rotation_x) * 10.0;" - ], - "animate": [ - "setup", - "jaw_movement", - "neck_head_movement", - "wings_limbs_movement", - "tail_movement" - ] - }, - "animations": { - "setup": "animation.ender_dragon.setup", - "jaw_movement": "animation.ender_dragon.jaw_movement", - "neck_head_movement": "animation.ender_dragon.neck_head_movement", - "wings_limbs_movement": "animation.ender_dragon.wings_limbs_movement", - "tail_movement": "animation.ender_dragon.tail_movement" - }, - "render_controllers": [ - { "controller.render.ender_dragon_death_pre_pass": "query.death_ticks > 1.0" }, - { "controller.render.ender_dragon_death_main_pass": "query.death_ticks > 1.0" }, - { "controller.render.ender_dragon_default": "query.death_ticks <= 1.0" } - ] + "spawn_egg": { + "base_color": "#1c1c1c", + "overlay_color": "#e079fa" + } } } } \ No newline at end of file diff --git a/resource_pack/entity/iron_golem.entity.json b/resource_pack/entity/iron_golem.entity.json index 130f037cf..78a797151 100644 --- a/resource_pack/entity/iron_golem.entity.json +++ b/resource_pack/entity/iron_golem.entity.json @@ -3,13 +3,10 @@ "minecraft:client_entity": { "description": { "identifier": "minecraft:iron_golem", - "textures": { - "cracked_high": "textures/entity/iron_golem/cracked_high", - "cracked_med": "textures/entity/iron_golem/cracked_medium", - "cracked_low": "textures/entity/iron_golem/cracked_low", - "cracked_none": "textures/entity/iron_golem/cracked_none" - }, - "render_controllers": [ "controller.render.iron_golem", "controller.render.iron_golem_cracks" ] + "spawn_egg": { + "base_color": "#dbcdc2", + "overlay_color": "#74a332" + } } } -} +} \ No newline at end of file diff --git a/resource_pack/entity/polar_bear.entity.json b/resource_pack/entity/polar_bear.entity.json index 98146aa77..c0805326f 100644 --- a/resource_pack/entity/polar_bear.entity.json +++ b/resource_pack/entity/polar_bear.entity.json @@ -3,38 +3,9 @@ "minecraft:client_entity": { "description": { "identifier": "minecraft:polar_bear", - "materials": { - "default": "polar_bear" - }, - "textures": { - "default": "textures/entity/polarbear" - }, - "geometry": { - "default": "geometry.polarbear" - }, - "animations": { - "walk": "animation.quadruped.walk", - "move": "animation.polarbear.move", - "look_at_target": "animation.common.look_at_target", - "baby_transform": "animation.polarbear.baby_transform" - }, - "scripts": { - "scale": "1.2" - }, - "animation_controllers": [ - { - "move": "controller.animation.polarbear.move" - }, - { - "baby": "controller.animation.polarbear.baby" - } - ], - "render_controllers": [ - "controller.render.polarbear" - ], "spawn_egg": { - "texture": "spawn_egg", - "texture_index": 37 + "base_color": "#eeeede", + "overlay_color": "#d5d6cd" } } } diff --git a/resource_pack/entity/snow_golem.entity.json b/resource_pack/entity/snow_golem.entity.json index 1d3966b65..1cecf53dc 100644 --- a/resource_pack/entity/snow_golem.entity.json +++ b/resource_pack/entity/snow_golem.entity.json @@ -4,24 +4,10 @@ "description": { "identifier": "minecraft:snow_golem", "min_engine_version": "1.8.0", - "materials": { - "default": "snow_golem", - "head": "snow_golem_pumpkin" - }, - "textures": { - "default": "textures/entity/snow_golem" - }, - "geometry": { - "default": "geometry.snowgolem.v1.8" - }, - "animations": { - "move": "animation.snowgolem.move.v1.8", - "look_at_target": "animation.common.look_at_target" - }, - "animation_controllers": [ - { "move": "controller.animation.snowgolem.move.v1.8" } - ], - "render_controllers": [ "controller.render.snowgolem" ] + "spawn_egg": { + "base_color": "#d9f2f2", + "overlay_color": "#81a4a4" + } } } } \ No newline at end of file diff --git a/resource_pack/entity/wither.entity.json b/resource_pack/entity/wither.entity.json index b6a1e1395..a2699b3d3 100644 --- a/resource_pack/entity/wither.entity.json +++ b/resource_pack/entity/wither.entity.json @@ -4,46 +4,10 @@ "description": { "identifier": "minecraft:wither", "min_engine_version": "1.8.0", - "materials": { - "default": "wither_boss", - "armor": "wither_boss_armor" - }, - "textures": { - "default": "textures/entity/wither_boss/wither", - "armor_white": "textures/entity/wither_boss/wither_armor_white", - "armor_blue": "textures/entity/wither_boss/wither_armor_blue", - "invulnerable": "textures/entity/wither_boss/wither_invulnerable" - }, - "geometry": { - "default": "geometry.witherBoss", - "armor": "geometry.witherBoss.armor.v1.8" - }, - "scripts": { - "pre_animation": [ - "variable.base_scale = 2;", - "variable.swell_clamped = Math.clamp(query.swell_amount, 0.0, 1.0);", - "variable.wobble = 1.0 + Math.sin(query.swell_amount * 5730) * query.swell_amount * 0.01;", - "variable.swell_adjustment = Math.pow(variable.swell_clamped, 4);", - "variable.scale_xz = (1.0 + variable.swell_adjustment * 0.4) * variable.wobble;", - "variable.scale_y = (1.0 + variable.swell_adjustment * 0.1) / variable.wobble;", - "variable.body_base_rotation = Math.cos(query.life_time * 114.6);", - "variable.upper_body_rotation = (0.065 + 0.05 * variable.body_base_rotation) * 180 + query.target_x_rotation;", - "variable.is_invulnerable = query.invulnerable_ticks > 0.0;", - "variable.display_normal_skin = (query.invulnerable_ticks <= 0) || ((query.invulnerable_ticks <= 80) && (Math.mod(query.invulnerable_ticks / 5, 2) == 1));" - ], - "scalex": "variable.scale_xz * variable.base_scale", - "scaley": "variable.scale_y * variable.base_scale", - "scalez": "variable.scale_xz * variable.base_scale" - }, - "animations": { - "scale": "animation.wither_boss.scale", - "move": "animation.wither_boss.move", - "look_at_target": "animation.wither_boss.look_at_target" - }, - "animation_controllers": [ - { "move": "controller.animation.wither_boss.move" } - ], - "render_controllers": [ "controller.render.wither_boss", "controller.render.wither_boss_armor_white", "controller.render.wither_boss_armor_blue" ] + "spawn_egg": { + "base_color": "#141414", + "overlay_color": "#4d72a0" + } } } } \ No newline at end of file diff --git a/resource_pack/manifest.json b/resource_pack/manifest.json index d9ef30281..d972e0a48 100644 --- a/resource_pack/manifest.json +++ b/resource_pack/manifest.json @@ -5,7 +5,7 @@ "name": "Vanilla Resource Pack", "uuid": "66c6e9a8-3093-462a-9c36-dbb052165822", "version": [0, 0, 1], - "min_engine_version": [ 1, 19, 50 ] + "min_engine_version": [ 1, 19, 60 ] }, "modules": [ { diff --git a/resource_pack/particles/mobspell_ambient.json b/resource_pack/particles/mobspell_ambient.json new file mode 100644 index 000000000..ff645bbab --- /dev/null +++ b/resource_pack/particles/mobspell_ambient.json @@ -0,0 +1,68 @@ +{ + "format_version": "1.10.0", + "particle_effect": { + "description": { + "identifier": "minecraft:mobspell_ambient", + "basic_render_parameters": { + "material": "particles_blend", + "texture": "textures/particle/particles" + } + }, + "components": { + "minecraft:emitter_rate_instant": { + "num_particles": 1 + }, + + "minecraft:emitter_lifetime_once": {}, + + "minecraft:emitter_shape_custom": { + "direction": [ "Math.random(-0.25, 0.25)", "Math.random(0, 1)", "Math.random(-0.25, 0.25)" ] + }, + + "minecraft:particle_initial_speed": "(Math.random(0, 1) + Math.random(0, 1) + 1) * 0.55", + + "minecraft:particle_lifetime_expression": { + "max_lifetime": "Math.random(0.85, 1.35)" + }, + + "minecraft:particle_motion_dynamic": { + "linear_acceleration": [ + "(variable.particle_random_1 * 2 - 1)*0.5 - (variable.particle_age * 0.4) * 2.5", + "1 + (0.08 * variable.particle_age) - (variable.particle_age * 0.4) * 1.5", + "(variable.particle_random_2 * 2 - 1)*0.5 - (variable.particle_age * 0.4) * 2.5" + ] + }, + + "minecraft:particle_motion_collision": { + "enabled": 1, + "collision_drag": 1.0, + "coefficient_of_restitution": 1.0, + "collision_radius": 0.5 + }, + + "minecraft:particle_appearance_billboard": { + "size": [ 0.125, 0.125 ], + "facing_camera_mode": "lookat_xyz", + + "uv": { + "texture_width": 128, + "texture_height": 128, + + "flipbook": { + "base_UV": [ 64, 64 ], + "size_UV": [ 8, 8 ], + "step_UV": [ -8, 0 ], + "frames_per_second": 10, + "max_frame": 8, + "stretch_to_lifetime": true, + "loop": false + } + } + }, + "minecraft:particle_appearance_tinting": { + "color": [ "variable.color.r", "variable.color.g", "variable.color.b", "0.4" ] + }, + "minecraft:particle_appearance_lighting": {} + } + } +} diff --git a/resource_pack/texts/bg_BG.lang b/resource_pack/texts/bg_BG.lang index 5c4346f25..5c5bf5be5 100644 --- a/resource_pack/texts/bg_BG.lang +++ b/resource_pack/texts/bg_BG.lang @@ -4916,6 +4916,7 @@ item.spawn_egg.entity.cat.name=Извикване на котка # item.spawn_egg.entity.chicken.name=Извикване на кокошка # item.spawn_egg.entity.cow.name=Извикване на крава # item.spawn_egg.entity.cod.name=Извикване на треска # +item.spawn_egg.entity.ender_dragon.name=Извикване на пагубен дракон # item.spawn_egg.entity.goat.name=Извикване на коза # item.spawn_egg.entity.pufferfish.name=Извикване на риба балон # item.spawn_egg.entity.salmon.name=Извикване на сьомга # @@ -4981,6 +4982,7 @@ item.spawn_egg.entity.piglin.name=Извикване на пиглин # item.spawn_egg.entity.fox.name=Извикване на лисица # item.spawn_egg.entity.unknown.name=Извикване # item.spawn_egg.entity.wandering_trader.name=Извикване на странстващ търговец # +item.spawn_egg.entity.wither.name=Извикване на Чезнещия # item.spawn_egg.entity.zoglin.name=Извикване на зоглин # item.trident.name=Тризъбец # item.mushroom_stew.name=Гъбена яхния # @@ -5323,9 +5325,7 @@ key.streamPauseUnpause=Пауза/възобновяване на поточно key.streamStartStop=Стартиране/спиране на поточното предаване # key.streamToggleMic=Натискане за говор/заглушаване # key.togglePerspective=Превключване на перспективата # -key.toggleControlHUD=Превключване на подсказванията # -key.toggleControlHUD.open=Показване на контролите # -key.toggleControlHUD.close=Скриване на контролите # +key.toggleControlTips=Съвети за контрол # key.use=Използване на предмет/поставяне на блок # key.flyDownSlow=Бавно летене надолу # key.flyUpSlow=Бавно летене нагоре # @@ -6015,7 +6015,8 @@ options.creatorTitle=Настройки на създател # options.vr_classic_box_selection=Очертаване на избора # options.hidegamepadcursor=Скриване на курсора на контролера # options.hidegui=Скриване на GUI # -options.hideKeyboardTooltips=Скриване на подсказвания за клавиатура и мишка # +options.showKeyboardPrompts=Показване на подкани за клавиатура и мишка # +options.showLearningPrompts=Показване на подкани за учене # options.hidetooltips=Скриване на поясненията за контролера # options.splitscreenHUDsize=Размер на HUD при разделен екран # options.ingamePlayerNames=Имена на играчи в игра # @@ -7257,8 +7258,6 @@ sign.edit=Редактиране на съобщението на табелат skin.New=Нови # -skin.Standard.Alex=Алекс # -skin.Standard.Steve=Стийв # skin.Standard.Custom=По избор # skin.Standard.CustomSlim=По избор # skin.Standard.Dummy=По избор # @@ -9783,8 +9782,6 @@ onlinePlay.editor.message=По време на онлайн редакцията onlinePlay.doNotShowAgain=Не показвай отново този екран # onlinePlay.proceed=Продължаване # onlinePlay.Back=Назад # -onlinePlay.untrustedIp.title=Неизвестен външен сървър # -onlinePlay.untrustedIp.message=Трябва да се свързвате само със сървъри, за които знаете, че са сигурни! Все още ли искате да се присъедините? # dr.color.button_name=Цвят # dr.color.amber_dark=Кехлибарено – тъмно # dr.color.amber_dark_soft=Кехлибарено – тъмно меко # diff --git a/resource_pack/texts/cs_CZ.lang b/resource_pack/texts/cs_CZ.lang index 77b335e57..5e7e9eecc 100644 --- a/resource_pack/texts/cs_CZ.lang +++ b/resource_pack/texts/cs_CZ.lang @@ -4916,6 +4916,7 @@ item.spawn_egg.entity.cat.name=Vejce s kočkou # item.spawn_egg.entity.chicken.name=Vejce se slepicí # item.spawn_egg.entity.cow.name=Vejce s krávou # item.spawn_egg.entity.cod.name=Vejce s treskou # +item.spawn_egg.entity.ender_dragon.name=Vejce s drakem z enderu # item.spawn_egg.entity.goat.name=Vejce s kozou # item.spawn_egg.entity.pufferfish.name=Vejce s rybou fugu # item.spawn_egg.entity.salmon.name=Vejce s lososem # @@ -4981,6 +4982,7 @@ item.spawn_egg.entity.piglin.name=Vejce s piglinem # item.spawn_egg.entity.fox.name=Vejce s liškou # item.spawn_egg.entity.unknown.name=Vejce s nestvůrou # item.spawn_egg.entity.wandering_trader.name=Vejce s potulným obchodníkem # +item.spawn_egg.entity.wither.name=Vytvořte pakostnici. # item.spawn_egg.entity.zoglin.name=Vejce se zoglinem # item.trident.name=Trojzubec # item.mushroom_stew.name=Houbový guláš # @@ -5323,9 +5325,7 @@ key.streamPauseUnpause=Pozastavení / zrušení pozastavení streamu # key.streamStartStop=Spuštění/zastavení streamu # key.streamToggleMic=Funkce Push to talk / ztlumení # key.togglePerspective=Přepnutí perspektivy # -key.toggleControlHUD=Přepnout rady # -key.toggleControlHUD.open=Zobrazit ovládání # -key.toggleControlHUD.close=Skrýt ovládání # +key.toggleControlTips=Tipy pro ovládání # key.use=Použití předmětu / umístění bloku # key.flyDownSlow=Pomalý let dolů # key.flyUpSlow=Pomalý let nahoru # @@ -6015,7 +6015,8 @@ options.creatorTitle=Nastavení tvůrce # options.vr_classic_box_selection=Označit výběr # options.hidegamepadcursor=Skrýt kurzor ovladače # options.hidegui=Skrýt grafické rozhraní # -options.hideKeyboardTooltips=Skrýt tipy pro klávesnici a myš # +options.showKeyboardPrompts=Zobrazovat výzvy pro klávesnici a myš # +options.showLearningPrompts=Zobrazovat výukové výzvy # options.hidetooltips=Skrýt tipy pro ovladač # options.splitscreenHUDsize=Velikost HUD při rozdělené obrazovce # options.ingamePlayerNames=Jména hráčů ve hře # @@ -7257,8 +7258,6 @@ sign.edit=Upravit text cedule # skin.New=Nový # -skin.Standard.Alex=Alex # -skin.Standard.Steve=Steve # skin.Standard.Custom=Vlastní # skin.Standard.CustomSlim=Vlastní # skin.Standard.Dummy=Vlastní # @@ -9783,8 +9782,6 @@ onlinePlay.editor.message=Během online úprav se můžete setkat s chatovými z onlinePlay.doNotShowAgain=Tuto obrazovku znovu nezobrazovat # onlinePlay.proceed=Pokračovat # onlinePlay.Back=Zpět # -onlinePlay.untrustedIp.title=Neznámý externí server # -onlinePlay.untrustedIp.message=Měli byste se připojovat pouze k důvěryhodným serverům! Chcete se ještě připojit? # dr.color.button_name=Barva # dr.color.amber_dark=Oranžová – tmavá # dr.color.amber_dark_soft=Jantarová - tmavě jemná # diff --git a/resource_pack/texts/da_DK.lang b/resource_pack/texts/da_DK.lang index dcba2ab61..268d95a8e 100644 --- a/resource_pack/texts/da_DK.lang +++ b/resource_pack/texts/da_DK.lang @@ -4916,6 +4916,7 @@ item.spawn_egg.entity.cat.name=Spawn kat # item.spawn_egg.entity.chicken.name=Spawn kylling # item.spawn_egg.entity.cow.name=Spawn ko # item.spawn_egg.entity.cod.name=Spawn torsk # +item.spawn_egg.entity.ender_dragon.name=Spawn ender-drage # item.spawn_egg.entity.goat.name=Spawn ged # item.spawn_egg.entity.pufferfish.name=Spawn kuglefisk # item.spawn_egg.entity.salmon.name=Spawn laks # @@ -4981,6 +4982,7 @@ item.spawn_egg.entity.piglin.name=Spawn piglin # item.spawn_egg.entity.fox.name=Spawn ræv # item.spawn_egg.entity.unknown.name=Spawn # item.spawn_egg.entity.wandering_trader.name=Spawn handelsrejsende # +item.spawn_egg.entity.wither.name=Spawn wither # item.spawn_egg.entity.zoglin.name=Spawn zoglin # item.trident.name=Trefork # item.mushroom_stew.name=Svampestuvning # @@ -5323,9 +5325,7 @@ key.streamPauseUnpause=Sæt stream på pause/fortsæt stream # key.streamStartStop=Start/stop stream # key.streamToggleMic=Tryk for at tale/slå lyd fra # key.togglePerspective=Skift synsvinkel # -key.toggleControlHUD=Slå tips til og fra # -key.toggleControlHUD.open=Vis styring # -key.toggleControlHUD.close=Skjul styring # +key.toggleControlTips=Control Tips # key.use=Brug genstand/placer blok # key.flyDownSlow=Flyv langsomt nedad # key.flyUpSlow=Flyv langsomt opad # @@ -6015,7 +6015,8 @@ options.creatorTitle=Indstillinger for udviklere # options.vr_classic_box_selection=Markér valg # options.hidegamepadcursor=Skjul controllermarkøren # options.hidegui=Skjul GUI # -options.hideKeyboardTooltips=Skjul tastatur- og musetips # +options.showKeyboardPrompts=Show Keyboard and Mouse Prompts # +options.showLearningPrompts=Show Learning Prompts # options.hidetooltips=Skjul controllertips # options.splitscreenHUDsize=Størrelse på delt HUD-skærm # options.ingamePlayerNames=Spillernavne i spillet # @@ -7257,8 +7258,6 @@ sign.edit=Rediger besked på skilt # skin.New=Nyt # -skin.Standard.Alex=Alex # -skin.Standard.Steve=Steve # skin.Standard.Custom=Tilpasset # skin.Standard.CustomSlim=Tilpasset # skin.Standard.Dummy=Tilpasset # @@ -9783,8 +9782,6 @@ onlinePlay.editor.message=Mens du redigerer online, vil du kunne se chatbeskeder onlinePlay.doNotShowAgain=Vis ikke igen # onlinePlay.proceed=Fortsæt # onlinePlay.Back=Tilbage # -onlinePlay.untrustedIp.title=Ukendt ekstern server # -onlinePlay.untrustedIp.message=Du bør kun oprette forbindelse til servere, du har tillid til. Ønsker du stadig at være med? # dr.color.button_name=Farve # dr.color.amber_dark=Rav - mørk # dr.color.amber_dark_soft=Rav - mørk blød # diff --git a/resource_pack/texts/de_DE.lang b/resource_pack/texts/de_DE.lang index 881c0e4fe..870f16ba0 100644 --- a/resource_pack/texts/de_DE.lang +++ b/resource_pack/texts/de_DE.lang @@ -4916,6 +4916,7 @@ item.spawn_egg.entity.cat.name=Katze spawnen # item.spawn_egg.entity.chicken.name=Huhn spawnen # item.spawn_egg.entity.cow.name=Kuh spawnen # item.spawn_egg.entity.cod.name=Kabeljau spawnen # +item.spawn_egg.entity.ender_dragon.name=Enderdrachen spawnen # item.spawn_egg.entity.goat.name=Ziege spawnen # item.spawn_egg.entity.pufferfish.name=Kugelfisch spawnen # item.spawn_egg.entity.salmon.name=Lachs spawnen # @@ -4981,6 +4982,7 @@ item.spawn_egg.entity.piglin.name=Piglin spawnen # item.spawn_egg.entity.fox.name=Fuchs spawnen # item.spawn_egg.entity.unknown.name=Spawnen # item.spawn_egg.entity.wandering_trader.name=Wandernden Händler spawnen # +item.spawn_egg.entity.wither.name=Wither spawnen # item.spawn_egg.entity.zoglin.name=Zoglin spawnen # item.trident.name=Dreizack # item.mushroom_stew.name=Pilzsuppe # @@ -5323,9 +5325,7 @@ key.streamPauseUnpause=Stream pausieren/fortsetzen # key.streamStartStop=Stream starten/beenden # key.streamToggleMic=Push-to-talk / Stummschalten # key.togglePerspective=Perspekt. wechseln # -key.toggleControlHUD=Tipps umschalten # -key.toggleControlHUD.open=Steuerung anzeigen # -key.toggleControlHUD.close=Steuerung verbergen # +key.toggleControlTips=Tipps zur Steuerung # key.use=Benutzen/Platzier. # key.flyDownSlow=Langs. runterflieg. # key.flyUpSlow=Langs. hochfliegen # @@ -6015,7 +6015,8 @@ options.creatorTitle=Ersteller-Einstellungen # options.vr_classic_box_selection=Rahmenauswahl # options.hidegamepadcursor=Controller-Cursor ausblenden # options.hidegui=GUI ausblenden # -options.hideKeyboardTooltips=Tastatur- und Maushinweise ausblenden # +options.showKeyboardPrompts=Tastatur- und Maushinweise anzeigen # +options.showLearningPrompts=Lernanzeigen anzeigen # options.hidetooltips=Controller-Tooltips ausblenden # options.splitscreenHUDsize=HUD-Größe bei Bildschirmauft. # options.ingamePlayerNames=Spielernamen im Spiel # @@ -7257,8 +7258,6 @@ sign.edit=Beschriftung eingeben # skin.New=Neu # -skin.Standard.Alex=Alex # -skin.Standard.Steve=Steve # skin.Standard.Custom=Benutzerdefiniert # skin.Standard.CustomSlim=Benutzerdefiniert # skin.Standard.Dummy=Benutzerdefiniert # @@ -9783,8 +9782,6 @@ onlinePlay.editor.message=Beim Online-Spiel können Textnachrichten oder andere onlinePlay.doNotShowAgain=Dies nicht wieder anzeigen. # onlinePlay.proceed=Weiter # onlinePlay.Back=Zurück # -onlinePlay.untrustedIp.title=Unbekannter externer Server # -onlinePlay.untrustedIp.message=Du solltest dich nur mit Servern verbinden, denen du vertraust! Möchtest du trotzdem beitreten? # dr.color.button_name=Farbe # dr.color.amber_dark=Bernstein – Dunkel # dr.color.amber_dark_soft=Bernstein – Dunkel Zart # diff --git a/resource_pack/texts/el_GR.lang b/resource_pack/texts/el_GR.lang index dccd0b07f..a4580e092 100644 --- a/resource_pack/texts/el_GR.lang +++ b/resource_pack/texts/el_GR.lang @@ -4916,6 +4916,7 @@ item.spawn_egg.entity.cat.name=Γένεση γάτας # item.spawn_egg.entity.chicken.name=Γένεση κοτόπουλου # item.spawn_egg.entity.cow.name=Γένεση αγελάδας # item.spawn_egg.entity.cod.name=Γένεση μπακαλιάρου # +item.spawn_egg.entity.ender_dragon.name=Γένεση Δράκου Τελειωτή # item.spawn_egg.entity.goat.name=Γένεση κατσίκας # item.spawn_egg.entity.pufferfish.name=Γένεση μπαλονόψαρου # item.spawn_egg.entity.salmon.name=Γένεση σολομού # @@ -4981,6 +4982,7 @@ item.spawn_egg.entity.piglin.name=Γένεση Πίγκλιν # item.spawn_egg.entity.fox.name=Γένεση Αλεπούς # item.spawn_egg.entity.unknown.name=Γένεση # item.spawn_egg.entity.wandering_trader.name=Γένεση γυρολόγου # +item.spawn_egg.entity.wither.name=Γένεση Μαρασμού # item.spawn_egg.entity.zoglin.name=Γένεση Ζόγκλιν # item.trident.name=Τρίαινα # item.mushroom_stew.name=Μανιτάρια στιφάδο # @@ -5323,9 +5325,7 @@ key.streamPauseUnpause=Παύση/Κατάργηση παύσης ροής # key.streamStartStop=Έναρξη/Διακοπή ροής # key.streamToggleMic=Πάτημα για Ομιλία/Σίγαση # key.togglePerspective=Εναλλαγή οπτικής γωνίας # -key.toggleControlHUD=Εναλλαγή υποδείξεων # -key.toggleControlHUD.open=Εμφάνιση χειρισμού # -key.toggleControlHUD.close=Απόκρυψη χειρισμού # +key.toggleControlTips=Συμβουλές ελέγχου # key.use=Χρήση αντικειμένου/Τοποθέτηση κύβου # key.flyDownSlow=Πέταγμα προς τα κάτω σιγά # key.flyUpSlow=Πέταγμα προς τα επάνω σιγά # @@ -6015,7 +6015,8 @@ options.creatorTitle=Ρυθμίσεις δημιουργού # options.vr_classic_box_selection=Επιλογή περιγράμματος # options.hidegamepadcursor=Απόκρυψη κέρσορα χειριστηρίου # options.hidegui=Απόκρυψη GUI # -options.hideKeyboardTooltips=Απόκρυψη υποδείξεων πληκτρολογίου και ποντικιού # +options.showKeyboardPrompts=Εμφάνιση προτροπών πληκτρολογίου και ποντικιού # +options.showLearningPrompts=Εμφάνιση προτροπών εκμάθησης # options.hidetooltips=Απόκρυψη υποδείξεων χειριστηρίου # options.splitscreenHUDsize=Μέγεθος HUD σε διαιρεμένη οθόνη # options.ingamePlayerNames=Ονόματα παικτών εντός παιχνιδιού # @@ -7257,8 +7258,6 @@ sign.edit=Επεξεργασία μηνύματος επιγραφής # skin.New=Νέα # -skin.Standard.Alex=Alex # -skin.Standard.Steve=Steve # skin.Standard.Custom=Προσαρμογή # skin.Standard.CustomSlim=Προσαρμογή # skin.Standard.Dummy=Προσαρμοσμένη # @@ -9783,8 +9782,6 @@ onlinePlay.editor.message=Κατά τη διάρκεια της επεξεργα onlinePlay.doNotShowAgain=Να μην εμφανιστεί αυτή η οθόνη ξανά # onlinePlay.proceed=Συνέχεια # onlinePlay.Back=Πίσω # -onlinePlay.untrustedIp.title=Άγνωστος εξωτερικός διακομιστής # -onlinePlay.untrustedIp.message=Θα πρέπει να συνδέεσαι μόνο σε διακομιστές που εμπιστεύεσαι! Εξακολουθείς να επιθυμείς να συμμετάσχεις; # dr.color.button_name=Χρώμα # dr.color.amber_dark=Κεχριμπάρι - Σκούρο # dr.color.amber_dark_soft=Κεχριμπάρι - Σκούρο απαλό # diff --git a/resource_pack/texts/en_GB.lang b/resource_pack/texts/en_GB.lang index f43cf6cff..1b25919c4 100644 --- a/resource_pack/texts/en_GB.lang +++ b/resource_pack/texts/en_GB.lang @@ -4916,6 +4916,7 @@ item.spawn_egg.entity.cat.name=Spawn Cat # item.spawn_egg.entity.chicken.name=Spawn Chicken # item.spawn_egg.entity.cow.name=Spawn Cow # item.spawn_egg.entity.cod.name=Spawn Cod # +item.spawn_egg.entity.ender_dragon.name=Spawn Ender Dragon # item.spawn_egg.entity.goat.name=Spawn Goat # item.spawn_egg.entity.pufferfish.name=Spawn Pufferfish # item.spawn_egg.entity.salmon.name=Spawn Salmon # @@ -4981,6 +4982,7 @@ item.spawn_egg.entity.piglin.name=Spawn Piglin # item.spawn_egg.entity.fox.name=Spawn Fox # item.spawn_egg.entity.unknown.name=Spawn # item.spawn_egg.entity.wandering_trader.name=Spawn Wandering Trader # +item.spawn_egg.entity.wither.name=Spawn Wither # item.spawn_egg.entity.zoglin.name=Spawn Zoglin # item.trident.name=Trident # item.mushroom_stew.name=Mushroom Stew # @@ -5323,9 +5325,7 @@ key.streamPauseUnpause=Pause/Unpause Stream # key.streamStartStop=Start/Stop Stream # key.streamToggleMic=Push To Talk/Mute # key.togglePerspective=Toggle Perspective # -key.toggleControlHUD=Toggle Hints # -key.toggleControlHUD.open=Show Controls # -key.toggleControlHUD.close=Hide Controls # +key.toggleControlTips=Control Tips # key.use=Use Item/Place Block # key.flyDownSlow=Fly Down Slow # key.flyUpSlow=Fly Up Slow # @@ -6015,7 +6015,8 @@ options.creatorTitle=Creator Settings # options.vr_classic_box_selection=Outline Selection # options.hidegamepadcursor=Hide Controller Cursor # options.hidegui=Hide GUI # -options.hideKeyboardTooltips=Hide Keyboard and Mouse Hints # +options.showKeyboardPrompts=Show Keyboard and Mouse Prompts # +options.showLearningPrompts=Show Learning Prompts # options.hidetooltips=Hide Controller Hints # options.splitscreenHUDsize=Splitscreen HUD Size # options.ingamePlayerNames=In-game Player Names # @@ -7257,8 +7258,6 @@ sign.edit=Edit sign message # skin.New=New # -skin.Standard.Alex=Alex # -skin.Standard.Steve=Steve # skin.Standard.Custom=Custom # skin.Standard.CustomSlim=Custom # skin.Standard.Dummy=Custom # @@ -9783,8 +9782,6 @@ onlinePlay.editor.message=During online editing, you may be exposed to chat mess onlinePlay.doNotShowAgain=Do not show this screen again # onlinePlay.proceed=Proceed # onlinePlay.Back=Back # -onlinePlay.untrustedIp.title=Unknown External Server # -onlinePlay.untrustedIp.message=You should only connect to servers you trust! Do you still wish to join? # dr.color.button_name=Colour # dr.color.amber_dark=Amber – Dark # dr.color.amber_dark_soft=Amber – Dark Soft # diff --git a/resource_pack/texts/en_US.lang b/resource_pack/texts/en_US.lang index 6fd5ca6ba..00d3c961d 100644 --- a/resource_pack/texts/en_US.lang +++ b/resource_pack/texts/en_US.lang @@ -513,6 +513,7 @@ chat.settings.lineSpacingNumber=x%s chat.settings.mentions=My Mentions chat.settings.mentionsColor=My Mentions Color chat.settings.muteAll=Mute All Chat +chat.settings.muteEmotes=Mute Emote Chat chat.settings.unmuteAll=Unmute All Chat chat.settings.tts=Text To Speech For Chat chat.stream.emote=(%s) * %s %s @@ -1803,6 +1804,9 @@ createWorldScreen.gameMode.spectator=Spectator createWorldScreen.gameMode.serverDefault=Default createWorldScreen.header.delete=World Permanence createWorldScreen.header.editLocal=Edit your World +createWorldScreen.header.general.project=Project +createWorldScreen.header.general.exportSettings=Export Settings +createWorldScreen.header.general.exportSettings.description=§7Some functionality may be overridden during Editing session, but are fully respected when exported createWorldScreen.header.local=Create a World createWorldScreen.header.realms=Create a Realms Server createWorldScreen.header.realmsReset=Reset your Realm? @@ -2560,6 +2564,7 @@ disconnectionScreen.editor.mismatchEditorWorld=This world is in Editor Mode. It disconnectionScreen.editor.mismatchEditorToVanilla=The server is not in Editor Mode. Failed to connect. disconnectionScreen.editor.mismatchVanillaToEditor=The server is in Editor Mode. Failed to connect. disconnectionScreen.clientsideGenerationDesync=Server and Client have different values set for feature toggle 'Client Side Generation' +disconnectionScreen.editor.cannotUseRayTracing=Ray Tracing enabled resource packs are not yet compatible with Editor projects. storageSpaceWarningScreen.frontend=You are almost out of data storage space! Minecraft has restricted access to this feature until you clear up additional storage space. storageSpaceWarningScreen.lowduringgameplay=Your device is almost out of the space that Minecraft can use to save worlds and settings on this device. Why not delete some old stuff you don't need so that you can keep saving new stuff? @@ -4916,6 +4921,7 @@ item.spawn_egg.entity.cat.name=Spawn Cat item.spawn_egg.entity.chicken.name=Spawn Chicken item.spawn_egg.entity.cow.name=Spawn Cow item.spawn_egg.entity.cod.name=Spawn Cod +item.spawn_egg.entity.ender_dragon.name=Spawn Ender Dragon item.spawn_egg.entity.goat.name=Spawn Goat item.spawn_egg.entity.pufferfish.name=Spawn Pufferfish item.spawn_egg.entity.salmon.name=Spawn Salmon @@ -4981,6 +4987,7 @@ item.spawn_egg.entity.piglin.name=Spawn Piglin item.spawn_egg.entity.fox.name=Spawn Fox item.spawn_egg.entity.unknown.name=Spawn item.spawn_egg.entity.wandering_trader.name=Spawn Wandering Trader +item.spawn_egg.entity.wither.name=Spawn Wither item.spawn_egg.entity.zoglin.name=Spawn Zoglin item.trident.name=Trident item.mushroom_stew.name=Mushroom Stew @@ -5323,9 +5330,7 @@ key.streamPauseUnpause=Pause/Unpause Stream key.streamStartStop=Start/Stop Stream key.streamToggleMic=Push To Talk/Mute key.togglePerspective=Toggle Perspective -key.toggleControlHUD=Toggle Hints -key.toggleControlHUD.open=Show Controls -key.toggleControlHUD.close=Hide Controls +key.toggleControlTips=Control Tips key.use=Use Item/Place Block key.flyDownSlow=Fly Down Slow key.flyUpSlow=Fly Up Slow @@ -6015,7 +6020,8 @@ options.creatorTitle=Creator Settings options.vr_classic_box_selection=Outline Selection options.hidegamepadcursor=Hide Controller Cursor options.hidegui=Hide GUI -options.hideKeyboardTooltips=Hide Keyboard and Mouse Hints +options.showKeyboardPrompts=Show Keyboard and Mouse Prompts +options.showLearningPrompts=Show Learning Prompts options.hidetooltips=Hide Controller Hints options.splitscreenHUDsize=Splitscreen HUD Size options.ingamePlayerNames=In-game Player Names @@ -7257,8 +7263,6 @@ sign.edit=Edit sign message skin.New=New -skin.Standard.Alex=Alex -skin.Standard.Steve=Steve skin.Standard.Custom=Custom skin.Standard.CustomSlim=Custom skin.Standard.Dummy=Custom @@ -9283,6 +9287,7 @@ manifestvalidation.unkown.packdescription=Unknown Pack Description manifestvalidation.unkown.packid=Unknown Pack ID manifestvalidation.unkown.packversion=Unknown Pack Version manifestvalidation.noname=Missing Name +manifestvalidation.editor.cannotLoadToVanillaWorld=Editor extension packs can only be used on Editor projects. Your world will still load, however we recommend deactivating or deleting the extension packs. ## UI pack warnings and errors uiPackError.invalidChildNames=%s: Child controls must have unique names: %sIn the future this will be an error and this file won't load. @@ -9308,6 +9313,7 @@ content.import.failed.subtitle=See output log for more details content.import.failed.subtitle_duplicate=Duplicate pack detected content.import.failed.subtitle_malformed_zip=Not a valid zip archive content.import.failed.subtitle_premiumcontent=Content in this world is not supported by Minecraft: Education Edition. +content.import.failed.incompatible=Unsupported file format content.import.failed.title_premiumcontent=Content Not Supported content.import.succeeded=Successfully imported '%s' content.import.succeeded_with_warnings=Successfully imported '%s' with warnings @@ -9783,6 +9789,8 @@ onlinePlay.editor.message=During online editing you may be exposed to chat messa onlinePlay.doNotShowAgain=Do not show this screen again onlinePlay.proceed=Proceed onlinePlay.Back=Back +onlinePlay.untrustedIp.title=Unknown External Server +onlinePlay.untrustedIp.message=You should only connect to servers you trust! Do you still wish to join? dr.color.button_name=Color dr.color.amber_dark=Amber - Dark dr.color.amber_dark_soft=Amber - Dark Soft diff --git a/resource_pack/texts/es_ES.lang b/resource_pack/texts/es_ES.lang index 1e8c1af33..5e58863ae 100644 --- a/resource_pack/texts/es_ES.lang +++ b/resource_pack/texts/es_ES.lang @@ -4916,6 +4916,7 @@ item.spawn_egg.entity.cat.name=Generador de gato # item.spawn_egg.entity.chicken.name=Generador de gallina # item.spawn_egg.entity.cow.name=Generador de vaca # item.spawn_egg.entity.cod.name=Generador de bacalao # +item.spawn_egg.entity.ender_dragon.name=Generar dragona de Ender # item.spawn_egg.entity.goat.name=Generador de cabra # item.spawn_egg.entity.pufferfish.name=Generador de pez globo # item.spawn_egg.entity.salmon.name=Generador de salmón # @@ -4981,6 +4982,7 @@ item.spawn_egg.entity.piglin.name=Generador de piglin # item.spawn_egg.entity.fox.name=Generador de zorro # item.spawn_egg.entity.unknown.name=Generar # item.spawn_egg.entity.wandering_trader.name=Generador de vendedor errante # +item.spawn_egg.entity.wither.name=Generar Wither # item.spawn_egg.entity.zoglin.name=Generador de zoglin # item.trident.name=Tridente # item.mushroom_stew.name=Estofado de champiñones # @@ -5323,9 +5325,7 @@ key.streamPauseUnpause=Pausar/reanudar retransmisión # key.streamStartStop=Iniciar/detener retransmisión # key.streamToggleMic=Activar/desactivar micrófono # key.togglePerspective=Cambiar perspectiva # -key.toggleControlHUD=Mostrar u ocultar sugerencias # -key.toggleControlHUD.open=Mostrar controles # -key.toggleControlHUD.close=Ocultar controles # +key.toggleControlTips=Consejos de controles # key.use=Usar objeto/Colocar bloque # key.flyDownSlow=Volar abajo despacio # key.flyUpSlow=Volar arriba despacio # @@ -6015,7 +6015,8 @@ options.creatorTitle=Ajustes del creador # options.vr_classic_box_selection=Selección de contorno de bloques # options.hidegamepadcursor=Ocultar cursor del mando # options.hidegui=Ocultar interfaz de juego # -options.hideKeyboardTooltips=Ocultar consejos de teclado y ratón # +options.showKeyboardPrompts=Mostrar indicaciones del teclado y del ratón # +options.showLearningPrompts=Mostrar indicaciones de aprendizaje # options.hidetooltips=Ocultar sugerencias de mando # options.splitscreenHUDsize=Tamaño de información de pantalla con pantalla dividida # options.ingamePlayerNames=Nombres de jugadores en el juego # @@ -7257,8 +7258,6 @@ sign.edit=Editar mensaje de señal # skin.New=Nuevo # -skin.Standard.Alex=Alex # -skin.Standard.Steve=Steve # skin.Standard.Custom=Personalizar # skin.Standard.CustomSlim=Personalizado # skin.Standard.Dummy=Personalizado # @@ -9783,8 +9782,6 @@ onlinePlay.editor.message=Mientras editas en línea, te expones a mensajes de ch onlinePlay.doNotShowAgain=No volver a mostrar esta pantalla # onlinePlay.proceed=Continuar # onlinePlay.Back=Atrás # -onlinePlay.untrustedIp.title=Servidor externo desconocido # -onlinePlay.untrustedIp.message=¡Conéctate solo a servidores en los que confíes! ¿Seguro que quieres unirte? # dr.color.button_name=Color # dr.color.amber_dark=Ámbar - Oscuro # dr.color.amber_dark_soft=Ámbar - Oscuro suave # diff --git a/resource_pack/texts/es_MX.lang b/resource_pack/texts/es_MX.lang index c472dde37..3a0831496 100644 --- a/resource_pack/texts/es_MX.lang +++ b/resource_pack/texts/es_MX.lang @@ -2382,7 +2382,7 @@ death.attack.magic=%1$s murió a causa de la magia. # death.attack.magma=%1$s descubrió que el piso era lava # death.attack.magma.player=%1$s caminó por zona peligrosa por culpa de %2$s # death.attack.mob=%2$s asesinó a %1$s. # -death.attack.mob.item=%1$s ha asesinado a %2$s con %3$s # +death.attack.mob.item=%2$s asesinó a %1$s con %3$s. # death.attack.onFire=%1$s se quemó hasta morir. # death.attack.onFire.player=%1$s acabó cual tostada chamuscada mientras luchaba contra %2$s. # death.attack.outOfWorld=%1$s se cayó del mundo. # @@ -4916,6 +4916,7 @@ item.spawn_egg.entity.cat.name=Generador de gato # item.spawn_egg.entity.chicken.name=Generador de gallina # item.spawn_egg.entity.cow.name=Generador de vacas # item.spawn_egg.entity.cod.name=Generador de bacalao # +item.spawn_egg.entity.ender_dragon.name=Generar dragona de Ender # item.spawn_egg.entity.goat.name=Generador de cabra # item.spawn_egg.entity.pufferfish.name=Generador de pez globo # item.spawn_egg.entity.salmon.name=Generador de salmón # @@ -4981,6 +4982,7 @@ item.spawn_egg.entity.piglin.name=Generador de piglin # item.spawn_egg.entity.fox.name=Generador de zorro # item.spawn_egg.entity.unknown.name=Generador # item.spawn_egg.entity.wandering_trader.name=Generador de comerciante errante # +item.spawn_egg.entity.wither.name=Generar Wither # item.spawn_egg.entity.zoglin.name=Generador de zoglin # item.trident.name=Tridente # item.mushroom_stew.name=Sopa de hongos # @@ -5323,9 +5325,7 @@ key.streamPauseUnpause=Pausar/Reanudar transmisión # key.streamStartStop=Iniciar/Detener transmisión # key.streamToggleMic=Activar/Desactivar micrófono # key.togglePerspective=Cambiar de cámara # -key.toggleControlHUD=Activar/Desactivar pistas # -key.toggleControlHUD.open=Mostrar controles # -key.toggleControlHUD.close=Ocultar controles # +key.toggleControlTips=Consejos sobre los controles # key.use=Usar/Colocar objeto # key.flyDownSlow=Bajar despacio # key.flyUpSlow=Subir despacio # @@ -6015,7 +6015,8 @@ options.creatorTitle=Configuración del creador # options.vr_classic_box_selection=Selección de contorno # options.hidegamepadcursor=Ocultar el cursor del control # options.hidegui=Ocultar interfaz de juego # -options.hideKeyboardTooltips=Ocultar sugerencias del teclado y el mouse # +options.showKeyboardPrompts=Mostrar indicaciones del teclado y el mouse # +options.showLearningPrompts=Mostrar indicaciones de aprendizaje # options.hidetooltips=Ocultar descripciones emergentes de controles # options.splitscreenHUDsize=Tamaño del HUD en pantalla dividida # options.ingamePlayerNames=Nombres de los jugadores durante el juego # @@ -7257,8 +7258,6 @@ sign.edit=Editar mensaje del letrero # skin.New=Nuevo # -skin.Standard.Alex=Alex # -skin.Standard.Steve=Steve # skin.Standard.Custom=Personalizado # skin.Standard.CustomSlim=Personalizado # skin.Standard.Dummy=Personalizado # @@ -9783,8 +9782,6 @@ onlinePlay.editor.message=Durante la edición en línea, es posible que veas men onlinePlay.doNotShowAgain=No volver a mostrar esta pantalla # onlinePlay.proceed=Continuar # onlinePlay.Back=Atrás # -onlinePlay.untrustedIp.title=Servidor externo desconocido # -onlinePlay.untrustedIp.message=¡Conéctate solo a servidores en los que confíes! ¿Seguro que quieres unirte? # dr.color.button_name=Color # dr.color.amber_dark=Ámbar - Oscuro # dr.color.amber_dark_soft=Ámbar - Oscuro suave # diff --git a/resource_pack/texts/fi_FI.lang b/resource_pack/texts/fi_FI.lang index 434a730b1..bcd38ba79 100644 --- a/resource_pack/texts/fi_FI.lang +++ b/resource_pack/texts/fi_FI.lang @@ -4916,6 +4916,7 @@ item.spawn_egg.entity.cat.name=Luo kissa # item.spawn_egg.entity.chicken.name=Luo kana # item.spawn_egg.entity.cow.name=Luo lehmä # item.spawn_egg.entity.cod.name=Luo turska # +item.spawn_egg.entity.ender_dragon.name=Luo Äärilisko # item.spawn_egg.entity.goat.name=Luo vuohi # item.spawn_egg.entity.pufferfish.name=Luo pallokala # item.spawn_egg.entity.salmon.name=Luo lohi # @@ -4981,6 +4982,7 @@ item.spawn_egg.entity.piglin.name=Luo piglin # item.spawn_egg.entity.fox.name=Luo kettu # item.spawn_egg.entity.unknown.name=Luo # item.spawn_egg.entity.wandering_trader.name=Luo kuljeskeleva kauppias # +item.spawn_egg.entity.wither.name=Luo näivettäjä # item.spawn_egg.entity.zoglin.name=Luo zoglin # item.trident.name=Atrain # item.mushroom_stew.name=Sienimuhennos # @@ -5323,9 +5325,7 @@ key.streamPauseUnpause=Pysäytä suoratoisto / jatka suoratoistoa # key.streamStartStop=Aloita/lopeta suoratoisto # key.streamToggleMic=Paina valitaksesi puhe/äänetön # key.togglePerspective=Valitse perspektiivi # -key.toggleControlHUD=Vihjeiden käyttövalinta # -key.toggleControlHUD.open=Näytä ohjaus # -key.toggleControlHUD.close=Piilota ohjaus # +key.toggleControlTips=Ohjausvinkit # key.use=Käytä esinettä/aseta kuutio # key.flyDownSlow=Lennä hitaasti alas # key.flyUpSlow=Lennä hitaasti ylös # @@ -6015,7 +6015,8 @@ options.creatorTitle=Sisällöntuottajan asetukset # options.vr_classic_box_selection=Ääriviivan valinta # options.hidegamepadcursor=Piilota ohjaimen osoitin # options.hidegui=Piilota graafinen käyttöliittymä # -options.hideKeyboardTooltips=Piilota näppäimistöä ja hiirtä koskevat vihjeet # +options.showKeyboardPrompts=Näytä näppäimistöä ja hiirtä koskevat kehotteet # +options.showLearningPrompts=Näytä oppimiskehotteet # options.hidetooltips=Piilota ohjaimen vinkit # options.splitscreenHUDsize=Jaetun ruudun heijastusnäytön koko # options.ingamePlayerNames=Pelaajanimet pelissä # @@ -7257,8 +7258,6 @@ sign.edit=Muuta kyltin viestiä # skin.New=Uusi # -skin.Standard.Alex=Alex # -skin.Standard.Steve=Steve # skin.Standard.Custom=Muokattu # skin.Standard.CustomSlim=Muokattu # skin.Standard.Dummy=Räätälöity # @@ -9783,8 +9782,6 @@ onlinePlay.editor.message=Verkossa editoinnin aikana voit altistua luokittelemat onlinePlay.doNotShowAgain=Älä näytä tätä ruutua uudelleen # onlinePlay.proceed=Jatka # onlinePlay.Back=Peruuta # -onlinePlay.untrustedIp.title=Tuntematon ulkoinen palvelin # -onlinePlay.untrustedIp.message=Sinun tulisi muodostaa yhteys vain sellaisiin palvelimiin, joihin luotat! Haluatko vielä liittyä? # dr.color.button_name=Väri # dr.color.amber_dark=Meripihka - tumma # dr.color.amber_dark_soft=Meripihka - tumma pehmeä # diff --git a/resource_pack/texts/fr_CA.lang b/resource_pack/texts/fr_CA.lang index 52297b825..d6b58178c 100644 --- a/resource_pack/texts/fr_CA.lang +++ b/resource_pack/texts/fr_CA.lang @@ -4916,6 +4916,7 @@ item.spawn_egg.entity.cat.name=Faire apparaître un chat # item.spawn_egg.entity.chicken.name=Faire apparaître un poulet # item.spawn_egg.entity.cow.name=Faire apparaître une vache # item.spawn_egg.entity.cod.name=Faire apparaître une morue # +item.spawn_egg.entity.ender_dragon.name=Faire apparaître un dragon Ender # item.spawn_egg.entity.goat.name=Faire apparaître une chèvre # item.spawn_egg.entity.pufferfish.name=Faire apparaître un poisson-globe # item.spawn_egg.entity.salmon.name=Faire apparaître un saumon # @@ -4981,6 +4982,7 @@ item.spawn_egg.entity.piglin.name=Faire apparaître un piglin # item.spawn_egg.entity.fox.name=Faire apparaître un renard # item.spawn_egg.entity.unknown.name=Spawner # item.spawn_egg.entity.wandering_trader.name=Faire apparaître un commerçant ambulant # +item.spawn_egg.entity.wither.name=Faire apparaître un Wither # item.spawn_egg.entity.zoglin.name=Faire apparaître un zoglin # item.trident.name=Trident # item.mushroom_stew.name=Ragoût de champignons # @@ -5323,9 +5325,7 @@ key.streamPauseUnpause=Suspendre/reprendre la diffusion # key.streamStartStop=Démarrer/arrêter la diffusion # key.streamToggleMic=Allumer/couper le microphone # key.togglePerspective=Changer de perspective # -key.toggleControlHUD=Activer les indices # -key.toggleControlHUD.open=Afficher les contrôles # -key.toggleControlHUD.close=Masquer les contrôles # +key.toggleControlTips=Astuces de contrôle # key.use=Utiliser un objet/placer un bloc # key.flyDownSlow=Voler doucement vers le bas # key.flyUpSlow=Voler doucement vers le haut # @@ -6015,7 +6015,8 @@ options.creatorTitle=Paramètres de créateur # options.vr_classic_box_selection=Créer un aperçu de la sélection # options.hidegamepadcursor=Cacher le curseur de la manette # options.hidegui=Cacher l'interface # -options.hideKeyboardTooltips=Cacher les astuces du clavier et de la souris # +options.showKeyboardPrompts=Afficher les commandes du clavier et de la souris # +options.showLearningPrompts=Afficher les messages d’aide # options.hidetooltips=Trucs cachés de la manette # options.splitscreenHUDsize=Taille de l'interface en écran partagé # options.ingamePlayerNames=Noms des joueurs en jeu # @@ -7257,8 +7258,6 @@ sign.edit=Inscrivez le message de la pancarte # skin.New=Nouveau # -skin.Standard.Alex=Alex # -skin.Standard.Steve=Steve # skin.Standard.Custom=Personnalisée # skin.Standard.CustomSlim=Personnalisée # skin.Standard.Dummy=Personnalisée # @@ -9783,8 +9782,6 @@ onlinePlay.editor.message=Durant l'édition en ligne, vous pouvez être exposé onlinePlay.doNotShowAgain=Ne plus afficher cet écran # onlinePlay.proceed=Procéder # onlinePlay.Back=Retour # -onlinePlay.untrustedIp.title=Serveur externe inconnu # -onlinePlay.untrustedIp.message=Vous ne devriez vous connecter qu’à des serveurs de confiance. Souhaitez-vous rejoindre ce serveur? # dr.color.button_name=Couleur # dr.color.amber_dark=Ambre - Sombre # dr.color.amber_dark_soft=Ambre - Sombre doux # diff --git a/resource_pack/texts/fr_FR.lang b/resource_pack/texts/fr_FR.lang index 644d4d1dc..ebdd2f199 100644 --- a/resource_pack/texts/fr_FR.lang +++ b/resource_pack/texts/fr_FR.lang @@ -4916,6 +4916,7 @@ item.spawn_egg.entity.cat.name=Œuf de chat # item.spawn_egg.entity.chicken.name=Œuf de poulet # item.spawn_egg.entity.cow.name=Œuf de vache # item.spawn_egg.entity.cod.name=Œuf de morue # +item.spawn_egg.entity.ender_dragon.name=Œuf de dragon de l'Ender # item.spawn_egg.entity.goat.name=Œuf de chèvre # item.spawn_egg.entity.pufferfish.name=Œuf de poisson-globe # item.spawn_egg.entity.salmon.name=Œuf de saumon # @@ -4981,6 +4982,7 @@ item.spawn_egg.entity.piglin.name=Œuf de piglin # item.spawn_egg.entity.fox.name=Œuf de renard # item.spawn_egg.entity.unknown.name=Œuf # item.spawn_egg.entity.wandering_trader.name=Œuf de marchand voyageur # +item.spawn_egg.entity.wither.name=Œuf de wither # item.spawn_egg.entity.zoglin.name=Œuf de zoglin # item.trident.name=Trident # item.mushroom_stew.name=Ragoût de champignons # @@ -5323,9 +5325,7 @@ key.streamPauseUnpause=Suspendre/reprendre la diffusion # key.streamStartStop=Démarrer/arrêter la diffusion # key.streamToggleMic=Allumer/couper le microphone # key.togglePerspective=Changer de point de vue # -key.toggleControlHUD=Afficher/masquer les conseils # -key.toggleControlHUD.open=Afficher les commandes # -key.toggleControlHUD.close=Masquer les commandes # +key.toggleControlTips=Astuces de contrôle # key.use=Utiliser un objet/placer un bloc # key.flyDownSlow=Voler doucement vers le bas # key.flyUpSlow=Voler doucement vers le haut # @@ -6015,7 +6015,8 @@ options.creatorTitle=Paramètres du créateur # options.vr_classic_box_selection=Sélection de plan # options.hidegamepadcursor=Masquer le curseur de la manette # options.hidegui=Masquer l'interface graphique # -options.hideKeyboardTooltips=Masquer les indices de clavier et de souris # +options.showKeyboardPrompts=Afficher les commandes du clavier et de la souris # +options.showLearningPrompts=Afficher les messages d'aide # options.hidetooltips=Masquer les infobulles de la manette # options.splitscreenHUDsize=Taille de l'ATH sur l'écran partagé # options.ingamePlayerNames=Noms des joueurs en jeu # @@ -7257,8 +7258,6 @@ sign.edit=Modifier le message # skin.New=Nouveau # -skin.Standard.Alex=Alex # -skin.Standard.Steve=Steve # skin.Standard.Custom=Personnalisé # skin.Standard.CustomSlim=Personnalisé # skin.Standard.Dummy=Perso. # @@ -9783,8 +9782,6 @@ onlinePlay.editor.message=Pendant l'édition en ligne, vous pouvez être exposé onlinePlay.doNotShowAgain=Ne plus afficher cet écran # onlinePlay.proceed=Procéder # onlinePlay.Back=Retour # -onlinePlay.untrustedIp.title=Serveur externe inconnu # -onlinePlay.untrustedIp.message=Vous ne devriez vous connecter qu’à des serveurs de confiance ! Souhaitez-vous toujours nous rejoindre ? # dr.color.button_name=Couleur # dr.color.amber_dark=Ambre - Sombre # dr.color.amber_dark_soft=Ambre - Sombre doux # diff --git a/resource_pack/texts/hu_HU.lang b/resource_pack/texts/hu_HU.lang index 18d92d0f3..8b218b979 100644 --- a/resource_pack/texts/hu_HU.lang +++ b/resource_pack/texts/hu_HU.lang @@ -4916,6 +4916,7 @@ item.spawn_egg.entity.cat.name=Macska idézése # item.spawn_egg.entity.chicken.name=Csirke idézése # item.spawn_egg.entity.cow.name=Tehén idézése # item.spawn_egg.entity.cod.name=Tőkehal idézése # +item.spawn_egg.entity.ender_dragon.name=Végzetsárkány idézése # item.spawn_egg.entity.goat.name=Kecske idézése # item.spawn_egg.entity.pufferfish.name=Gömbhal idézése # item.spawn_egg.entity.salmon.name=Lazac idézése # @@ -4981,6 +4982,7 @@ item.spawn_egg.entity.piglin.name=Piglin idézése # item.spawn_egg.entity.fox.name=Róka idézése # item.spawn_egg.entity.unknown.name=Idézés # item.spawn_egg.entity.wandering_trader.name=Vándorkereskedő idézése # +item.spawn_egg.entity.wither.name=Sorvasztó idézése # item.spawn_egg.entity.zoglin.name=Zoglin idézése # item.trident.name=Szigony # item.mushroom_stew.name=Gombaragu # @@ -5323,9 +5325,7 @@ key.streamPauseUnpause=Adatfolyam szüneteltetése/folytatása # key.streamStartStop=Adatfolyam elindítása/leállítása # key.streamToggleMic=Beszéd/némítás nyomva tartva # key.togglePerspective=Nézőpont váltása # -key.toggleControlHUD=Tippek ki- és bekapcsolása # -key.toggleControlHUD.open=Vezérlés megjelenítése # -key.toggleControlHUD.close=Vezérlés elrejtése # +key.toggleControlTips=Vezérlési tippek # key.use=Tárgy használata/blokk elhelyezése # key.flyDownSlow=Lassú repülés lefelé # key.flyUpSlow=Lassú repülés felfelé # @@ -6015,7 +6015,8 @@ options.creatorTitle=Alkotói beállítások # options.vr_classic_box_selection=Körvonal kijelölése # options.hidegamepadcursor=Kontroller kurzor elrejtése # options.hidegui=Kezelőfelület elrejtése # -options.hideKeyboardTooltips=Billentyűzet és egér tippek elrejtése # +options.showKeyboardPrompts=Billentyűzet- és egérutasítások megjelenítése # +options.showLearningPrompts=Tanulási üzenetek megjelenítése # options.hidetooltips=Kontroller-elemleírások elrejtése # options.splitscreenHUDsize=HUD mérete osztott képernyőn # options.ingamePlayerNames=Játékon belüli játékosnevek # @@ -7257,8 +7258,6 @@ sign.edit=Tábla üzenetének szerkesztése # skin.New=Új # -skin.Standard.Alex=Alex # -skin.Standard.Steve=Steve # skin.Standard.Custom=Egyéni # skin.Standard.CustomSlim=Egyéni # skin.Standard.Dummy=Egyéni # @@ -9783,8 +9782,6 @@ onlinePlay.editor.message=Az online szerkesztés során találkozhatsz olyan cse onlinePlay.doNotShowAgain=Képernyő végleges elrejtése # onlinePlay.proceed=Tovább # onlinePlay.Back=Vissza # -onlinePlay.untrustedIp.title=Ismeretlen külső kiszolgáló # -onlinePlay.untrustedIp.message=Csak olyan kiszolgálókhoz csatlakozz, amelyekben megbízol! Még mindig szeretnél csatlakozni? # dr.color.button_name=Szín # dr.color.amber_dark=Borostyánsárga – sötét # dr.color.amber_dark_soft=Borostyánsárga – sötét lágy # diff --git a/resource_pack/texts/id_ID.lang b/resource_pack/texts/id_ID.lang index d98554b4c..79167dc6a 100644 --- a/resource_pack/texts/id_ID.lang +++ b/resource_pack/texts/id_ID.lang @@ -4916,6 +4916,7 @@ item.spawn_egg.entity.cat.name=Munculkan Kucing # item.spawn_egg.entity.chicken.name=Munculkan Ayam # item.spawn_egg.entity.cow.name=Munculkan Sapi # item.spawn_egg.entity.cod.name=Telur Kod # +item.spawn_egg.entity.ender_dragon.name=Munculkan Naga Ender # item.spawn_egg.entity.goat.name=Munculkan Kambing # item.spawn_egg.entity.pufferfish.name=Telur Buntal # item.spawn_egg.entity.salmon.name=Telur Salmon # @@ -4981,6 +4982,7 @@ item.spawn_egg.entity.piglin.name=Munculkan Piglin # item.spawn_egg.entity.fox.name=Munculkan Rubah # item.spawn_egg.entity.unknown.name=Munculkan # item.spawn_egg.entity.wandering_trader.name=Munculkan Pedagang Keliling # +item.spawn_egg.entity.wither.name=Munculkan Wither # item.spawn_egg.entity.zoglin.name=Munculkan Zoglin # item.trident.name=Trisula # item.mushroom_stew.name=Semur Jamur # @@ -5323,9 +5325,7 @@ key.streamPauseUnpause=Jeda/Lanjutkan Stream # key.streamStartStop=Mulai/Hentikan Stream # key.streamToggleMic=Tekan untuk Bicara/Bisukan # key.togglePerspective=Alihkan Perspektif # -key.toggleControlHUD=Lihat/Tutup Petunjuk # -key.toggleControlHUD.open=Tampilkan Kontrol # -key.toggleControlHUD.close=Sembunyikan Kontrol # +key.toggleControlTips=Tips Kontrol # key.use=Gunakan Item/Tempatkan Blok # key.flyDownSlow=Turun Perlahan # key.flyUpSlow=Terbang Perlahan # @@ -6015,7 +6015,8 @@ options.creatorTitle=Pengaturan Kreator # options.vr_classic_box_selection=Pilihan Garis Luar # options.hidegamepadcursor=Sembunyikan Kursor Pengontrol # options.hidegui=Sembunyikan GUI # -options.hideKeyboardTooltips=Sembunyikan Keyboard dan Petunjuk Mouse # +options.showKeyboardPrompts=Perlihatkan Petunjuk Keyboard dan Mouse # +options.showLearningPrompts=Perlihatkan Petunjuk Pembelajaran # options.hidetooltips=Sembunyikan Petunjuk Pengontrol # options.splitscreenHUDsize=Ukuran HUD Splitscreen # options.ingamePlayerNames=Nama Pemain dalam Permainan # @@ -7257,8 +7258,6 @@ sign.edit=Edit pesan tanda # skin.New=Baru # -skin.Standard.Alex=Alex # -skin.Standard.Steve=Steve # skin.Standard.Custom=Kustom # skin.Standard.CustomSlim=Kustom # skin.Standard.Dummy=Kustom # @@ -9783,8 +9782,6 @@ onlinePlay.editor.message=Saat bermain online, kamu mungkin menerima pesan obrol onlinePlay.doNotShowAgain=Jangan tampilkan layar ini lagi # onlinePlay.proceed=Lanjutkan # onlinePlay.Back=Kembali # -onlinePlay.untrustedIp.title=Server Eksternal Tidak Diketahui # -onlinePlay.untrustedIp.message=Kamu sebaiknya hanya terhubung ke server yang kamu percayai! Masih ingin bergabung? # dr.color.button_name=Warna # dr.color.amber_dark=Amber - Gelap # dr.color.amber_dark_soft=Kuning Sawo - Gelap Lembut # diff --git a/resource_pack/texts/it_IT.lang b/resource_pack/texts/it_IT.lang index 0fbc762aa..3da2d98d7 100644 --- a/resource_pack/texts/it_IT.lang +++ b/resource_pack/texts/it_IT.lang @@ -4916,6 +4916,7 @@ item.spawn_egg.entity.cat.name=Uovo di gatto # item.spawn_egg.entity.chicken.name=Uovo di pollo # item.spawn_egg.entity.cow.name=Uovo di mucca # item.spawn_egg.entity.cod.name=Uovo di merluzzo # +item.spawn_egg.entity.ender_dragon.name=Uovo di Enderdrago # item.spawn_egg.entity.goat.name=Uovo di capra # item.spawn_egg.entity.pufferfish.name=Uovo di pesce palla # item.spawn_egg.entity.salmon.name=Uovo di salmone # @@ -4981,6 +4982,7 @@ item.spawn_egg.entity.piglin.name=Uovo di piglin # item.spawn_egg.entity.fox.name=Uovo di volpe # item.spawn_egg.entity.unknown.name=Uovo # item.spawn_egg.entity.wandering_trader.name=Uovo di mercante errante # +item.spawn_egg.entity.wither.name=Uovo di Wither # item.spawn_egg.entity.zoglin.name=Uovo di zoglin # item.trident.name=Tridente # item.mushroom_stew.name=Zuppa di funghi # @@ -5323,9 +5325,7 @@ key.streamPauseUnpause=Sospendi/riprendi la trasmissione # key.streamStartStop=Avvia/arresta la trasmissione # key.streamToggleMic=Attiva/disattiva il microfono # key.togglePerspective=Cambia la modalità di visuale # -key.toggleControlHUD=Attiva/disattiva suggerimenti # -key.toggleControlHUD.open=Mostra controlli # -key.toggleControlHUD.close=Nascondi controlli # +key.toggleControlTips=Descrizioni controllo # key.use=Usa oggetto/posiziona blocco # key.flyDownSlow=Vola giù piano # key.flyUpSlow=Vola su piano # @@ -6015,7 +6015,8 @@ options.creatorTitle=Impostazioni creatore # options.vr_classic_box_selection=Selezione struttura # options.hidegamepadcursor=Nascondi cursore del controller # options.hidegui=Nascondi interfaccia grafica # -options.hideKeyboardTooltips=Nascondi i suggerimenti per tastiera e mouse # +options.showKeyboardPrompts=Mostra scorciatoie per tastiera e mouse # +options.showLearningPrompts=Mostra avvisi di apprendimento # options.hidetooltips=Nascondi suggerimenti controller # options.splitscreenHUDsize=Dimensione interfaccia schermo diviso # options.ingamePlayerNames=Nomi giocatori nel gioco # @@ -7257,8 +7258,6 @@ sign.edit=Scrivi il messaggio del cartello # skin.New=Nuovo # -skin.Standard.Alex=Alex # -skin.Standard.Steve=Steve # skin.Standard.Custom=Personalizzato # skin.Standard.CustomSlim=Personalizzato # skin.Standard.Dummy=Personalizzato # @@ -9783,8 +9782,6 @@ onlinePlay.editor.message=Durante l'editing online potresti essere esposto a mes onlinePlay.doNotShowAgain=Non visualizzare più questa schermata # onlinePlay.proceed=Procedi # onlinePlay.Back=Indietro # -onlinePlay.untrustedIp.title=Server esterno sconosciuto # -onlinePlay.untrustedIp.message=Connettiti solo a server di cui ti fidi! Vuoi unirti comunque? # dr.color.button_name=Colore # dr.color.amber_dark=Ambra - Scuro # dr.color.amber_dark_soft=Ambra - Tenue scuro # diff --git a/resource_pack/texts/ja_JP.lang b/resource_pack/texts/ja_JP.lang index 2c2e78bfb..091aa24ea 100644 --- a/resource_pack/texts/ja_JP.lang +++ b/resource_pack/texts/ja_JP.lang @@ -4916,6 +4916,7 @@ item.spawn_egg.entity.cat.name=ネコをスポーンさせる # item.spawn_egg.entity.chicken.name=ニワトリをスポーンさせる # item.spawn_egg.entity.cow.name=牛をスポーンさせる # item.spawn_egg.entity.cod.name=タラをスポーンさせる # +item.spawn_egg.entity.ender_dragon.name=エンダー ドラゴンを出現させる # item.spawn_egg.entity.goat.name=ヤギをスポーンさせる # item.spawn_egg.entity.pufferfish.name=フグをスポーンさせる # item.spawn_egg.entity.salmon.name=鮭をスポーンさせる # @@ -4981,6 +4982,7 @@ item.spawn_egg.entity.piglin.name=ピグリンをスポーンさせる # item.spawn_egg.entity.fox.name=キツネをスポーンさせる # item.spawn_egg.entity.unknown.name=スポーン # item.spawn_egg.entity.wandering_trader.name=行商人をスポーンさせる # +item.spawn_egg.entity.wither.name=ウィザーをスポーンさせる # item.spawn_egg.entity.zoglin.name=ゾグリンをスポーンさせる # item.trident.name=トライデント # item.mushroom_stew.name=きのこシチュー # @@ -5323,9 +5325,7 @@ key.streamPauseUnpause=ストリーミング 一時停止/再開 # key.streamStartStop=ストリーミング 開始/停止 # key.streamToggleMic=押してトーク/ミュート # key.togglePerspective=視点の切り替え # -key.toggleControlHUD=ヒントを切り替える # -key.toggleControlHUD.open=操作方法を表示する # -key.toggleControlHUD.close=操作方法を非表示にする # +key.toggleControlTips=操作のヒント # key.use=アイテムを使用/ブロックを置く # key.flyDownSlow=ゆっくり下降 # key.flyUpSlow=ゆっくり上昇 # @@ -6015,7 +6015,8 @@ options.creatorTitle=クリエイター設定 # options.vr_classic_box_selection=選択範囲をハイライト # options.hidegamepadcursor=コントローラー カーソルを非表示 # options.hidegui=GUI を隠す # -options.hideKeyboardTooltips=キーボードとマウスのヒントを非表示 # +options.showKeyboardPrompts=キーボードとマウスのプロンプトを表示 # +options.showLearningPrompts=学習のプロンプトを表示 # options.hidetooltips=コントローラーのヒントの非表示 # options.splitscreenHUDsize=画面分割時の HUD のサイズ # options.ingamePlayerNames=ゲーム内プレイヤーの名前の表示 # @@ -7257,8 +7258,6 @@ sign.edit=看板のメッセージを編集 # skin.New=New # -skin.Standard.Alex=アレックス # -skin.Standard.Steve=スティーブ # skin.Standard.Custom=カスタム # skin.Standard.CustomSlim=カスタム # skin.Standard.Dummy=カスタム # @@ -9783,8 +9782,6 @@ onlinePlay.editor.message=オンライン編集中はチャット メッセー onlinePlay.doNotShowAgain=この画面を再度表示しない # onlinePlay.proceed=続行 # onlinePlay.Back=戻る # -onlinePlay.untrustedIp.title=不明な外部サーバー # -onlinePlay.untrustedIp.message=信頼できるサーバーにのみ接続してください!まだ参加を希望しますか? # dr.color.button_name=色 # dr.color.amber_dark=琥珀色 - 濃い # dr.color.amber_dark_soft=琥珀色 - ダーク ソフト # diff --git a/resource_pack/texts/ko_KR.lang b/resource_pack/texts/ko_KR.lang index 35026ebf8..fbcf3c880 100644 --- a/resource_pack/texts/ko_KR.lang +++ b/resource_pack/texts/ko_KR.lang @@ -4916,6 +4916,7 @@ item.spawn_egg.entity.cat.name=고양이 생성 # item.spawn_egg.entity.chicken.name=닭 생성 # item.spawn_egg.entity.cow.name=소 생성 # item.spawn_egg.entity.cod.name=대구 생성 # +item.spawn_egg.entity.ender_dragon.name=엔더 드래곤 생성 # item.spawn_egg.entity.goat.name=염소 생성 # item.spawn_egg.entity.pufferfish.name=복어 생성 # item.spawn_egg.entity.salmon.name=연어 생성 # @@ -4981,6 +4982,7 @@ item.spawn_egg.entity.piglin.name=피글린 생성 # item.spawn_egg.entity.fox.name=여우 생성 # item.spawn_egg.entity.unknown.name=생성 # item.spawn_egg.entity.wandering_trader.name=떠돌이 상인 생성 # +item.spawn_egg.entity.wither.name=위더 생성 # item.spawn_egg.entity.zoglin.name=조글린 생성 # item.trident.name=삼지창 # item.mushroom_stew.name=버섯 스튜 # @@ -5323,9 +5325,7 @@ key.streamPauseUnpause=스트림 일시 중지/일시 중지 해제 # key.streamStartStop=스트리밍 시작하기/멈추기 # key.streamToggleMic=눌러서 말하기/음소거하기 # key.togglePerspective=시야 전환 # -key.toggleControlHUD=힌트 토글 # -key.toggleControlHUD.open=컨트롤 표시 # -key.toggleControlHUD.close=컨트롤 숨기기 # +key.toggleControlTips=컨트롤 팁 # key.use=아이템 사용/블록 놓기 # key.flyDownSlow=저속 저공 비행 # key.flyUpSlow=저속 고공 비행 # @@ -6015,7 +6015,8 @@ options.creatorTitle=제작자 설정 # options.vr_classic_box_selection=외곽선 선택 # options.hidegamepadcursor=컨트롤러 커서 숨기기 # options.hidegui=GUI 숨기기 # -options.hideKeyboardTooltips=키보드 및 마우스 힌트 숨기기 # +options.showKeyboardPrompts=키보드 및 마우스 프롬프트 표시 # +options.showLearningPrompts=학습 프롬프트 표시 # options.hidetooltips=컨트롤러 툴팁 숨기기 # options.splitscreenHUDsize=분할 화면 HUD 크기 # options.ingamePlayerNames=게임 내 플레이어 이름 # @@ -7257,8 +7258,6 @@ sign.edit=사인 메시지 변경 # skin.New=신규 # -skin.Standard.Alex=알렉스 # -skin.Standard.Steve=스티브 # skin.Standard.Custom=사용자 지정 # skin.Standard.CustomSlim=사용자 지정 # skin.Standard.Dummy=사용자 지정 # @@ -9783,8 +9782,6 @@ onlinePlay.editor.message=온라인 편집 중에는 평가되지 않은 채팅 onlinePlay.doNotShowAgain=이 화면을 다시 보지 않겠습니다. # onlinePlay.proceed=진행 # onlinePlay.Back=뒤로 # -onlinePlay.untrustedIp.title=알 수 없는 외부 서버 # -onlinePlay.untrustedIp.message=신뢰할 수 있는 서버에만 연결해야 합니다! 그래도 연결하고 싶으신가요? # dr.color.button_name=색 # dr.color.amber_dark=앰버 - 어두움 # dr.color.amber_dark_soft=앰버 - 어두운 부드러움 # diff --git a/resource_pack/texts/nb_NO.lang b/resource_pack/texts/nb_NO.lang index da976ff3e..f0159eaff 100644 --- a/resource_pack/texts/nb_NO.lang +++ b/resource_pack/texts/nb_NO.lang @@ -4916,6 +4916,7 @@ item.spawn_egg.entity.cat.name=Generer katt # item.spawn_egg.entity.chicken.name=Generer høne # item.spawn_egg.entity.cow.name=Generer ku # item.spawn_egg.entity.cod.name=Generer torsk # +item.spawn_egg.entity.ender_dragon.name=Generer enderdrage # item.spawn_egg.entity.goat.name=Generer geit # item.spawn_egg.entity.pufferfish.name=Generer kulefisk # item.spawn_egg.entity.salmon.name=Generer laks # @@ -4981,6 +4982,7 @@ item.spawn_egg.entity.piglin.name=Generer piglin # item.spawn_egg.entity.fox.name=Generer rev # item.spawn_egg.entity.unknown.name=Generer # item.spawn_egg.entity.wandering_trader.name=Generer handelsreisende # +item.spawn_egg.entity.wither.name=Generer Wither # item.spawn_egg.entity.zoglin.name=Generer zoglin # item.trident.name=Trefork # item.mushroom_stew.name=Soppstuing # @@ -5323,9 +5325,7 @@ key.streamPauseUnpause=Pause/fortsett strømmen # key.streamStartStop=Start/stopp strømmen # key.streamToggleMic=Trykk for å snakke / slå av lyden # key.togglePerspective=Endre perspektiv # -key.toggleControlHUD=Vis/skjul hint # -key.toggleControlHUD.open=Vis kontroller # -key.toggleControlHUD.close=Skjul kontroller # +key.toggleControlTips=Kontrolltips # key.use=Bruk gjenstand / plasser blokk # key.flyDownSlow=Fly langsomt nedover # key.flyUpSlow=Fly langsomt oppover # @@ -6015,7 +6015,8 @@ options.creatorTitle=Innstillinger for utvikler # options.vr_classic_box_selection=Valg av omriss # options.hidegamepadcursor=Skjul kontrollermarkøren # options.hidegui=Skjul det grafiske brukergrensesnittet # -options.hideKeyboardTooltips=Skjul tastatur- og musetips # +options.showKeyboardPrompts=Vis tastatur- og museinstruksjoner # +options.showLearningPrompts=Vis instruksjonene for læring # options.hidetooltips=Skjul kontrollertips # options.splitscreenHUDsize=HUD-størrelse på delt skjerm # options.ingamePlayerNames=Spillernavn i spillet # @@ -7257,8 +7258,6 @@ sign.edit=Rediger melding på skilt # skin.New=Nytt # -skin.Standard.Alex=Alex # -skin.Standard.Steve=Steve # skin.Standard.Custom=Tilpasset # skin.Standard.CustomSlim=Egendefinert # skin.Standard.Dummy=Egendefinert # @@ -9783,8 +9782,6 @@ onlinePlay.editor.message=Under redigering på nett kan du bli utsatt for chatme onlinePlay.doNotShowAgain=Ikke vis denne skjermen igjen # onlinePlay.proceed=Fortsett # onlinePlay.Back=Tilbake # -onlinePlay.untrustedIp.title=Ukjent ekstern server # -onlinePlay.untrustedIp.message=Du bør bare koble til servere du stoler på! Ønsker du fortsatt å bli med? # dr.color.button_name=Farge # dr.color.amber_dark=Ravfarget – mørk # dr.color.amber_dark_soft=Ravfarget – Mørk myk # diff --git a/resource_pack/texts/nl_NL.lang b/resource_pack/texts/nl_NL.lang index e59812614..69fa5fe36 100644 --- a/resource_pack/texts/nl_NL.lang +++ b/resource_pack/texts/nl_NL.lang @@ -4916,6 +4916,7 @@ item.spawn_egg.entity.cat.name=Spawn kat # item.spawn_egg.entity.chicken.name=Spawn kip # item.spawn_egg.entity.cow.name=Spawn koe # item.spawn_egg.entity.cod.name=Spawn kabeljauw # +item.spawn_egg.entity.ender_dragon.name=Spawn Enderdraak # item.spawn_egg.entity.goat.name=Spawn geit # item.spawn_egg.entity.pufferfish.name=Spawn kogelvis # item.spawn_egg.entity.salmon.name=Spawn zalm # @@ -4981,6 +4982,7 @@ item.spawn_egg.entity.piglin.name=Spawn Piglin # item.spawn_egg.entity.fox.name=Spawn vos # item.spawn_egg.entity.unknown.name=Spawnen # item.spawn_egg.entity.wandering_trader.name=Spawn Zwervende handelaar # +item.spawn_egg.entity.wither.name=Wither spawnen # item.spawn_egg.entity.zoglin.name=Spawn zombiezwijnling # item.trident.name=Drietand # item.mushroom_stew.name=Paddenstoelenstoofschotel # @@ -5323,9 +5325,7 @@ key.streamPauseUnpause=Stream pauzeren/hervatten # key.streamStartStop=Stream starten/stoppen # key.streamToggleMic=Druk om te praten/dempen # key.togglePerspective=Schakelen tussen perspectief # -key.toggleControlHUD=Tips in- en uitschakelen # -key.toggleControlHUD.open=Besturing tonen # -key.toggleControlHUD.close=Besturing verbergen # +key.toggleControlTips=Controletips # key.use=Voorwerp gebruiken/blok plaatsen # key.flyDownSlow=Vlieg langzaam omlaag # key.flyUpSlow=Vlieg langzaam omhoog # @@ -6015,7 +6015,8 @@ options.creatorTitle=Makerinstellingen # options.vr_classic_box_selection=Selectie markeren # options.hidegamepadcursor=Controllercursor verbergen # options.hidegui=GUI verbergen # -options.hideKeyboardTooltips=Toetsenbord- en muistips verbergen # +options.showKeyboardPrompts=Toetsenbord- en muisberichten weergeven # +options.showLearningPrompts=Leerberichten weergeven # options.hidetooltips=Controllerhints verbergen # options.splitscreenHUDsize=Grootte scherminfo bij gesplitst scherm # options.ingamePlayerNames=Namen van spelers in het spel # @@ -7257,8 +7258,6 @@ sign.edit=Bordbericht bewerken # skin.New=Nieuw # -skin.Standard.Alex=Alex # -skin.Standard.Steve=Steve # skin.Standard.Custom=Aangepast # skin.Standard.CustomSlim=Aangepast # skin.Standard.Dummy=Aangepast # @@ -9783,8 +9782,6 @@ onlinePlay.editor.message=Tijdens online bewerking word je mogelijk blootgesteld onlinePlay.doNotShowAgain=Dit scherm niet meer weergeven # onlinePlay.proceed=Doorgaan # onlinePlay.Back=Terug # -onlinePlay.untrustedIp.title=Onbekende externe server # -onlinePlay.untrustedIp.message=Maak alleen verbinding met servers die je vertrouwt! Wil je toch deelnemen? # dr.color.button_name=Kleur # dr.color.amber_dark=Amber - donker # dr.color.amber_dark_soft=Amber - donker zacht # diff --git a/resource_pack/texts/pl_PL.lang b/resource_pack/texts/pl_PL.lang index ec2302b7e..fc93e4573 100644 --- a/resource_pack/texts/pl_PL.lang +++ b/resource_pack/texts/pl_PL.lang @@ -4916,6 +4916,7 @@ item.spawn_egg.entity.cat.name=Zespawnuj kota # item.spawn_egg.entity.chicken.name=Zespawnuj kurę # item.spawn_egg.entity.cow.name=Zespawnuj krowę # item.spawn_egg.entity.cod.name=Zespawnuj dorsza # +item.spawn_egg.entity.ender_dragon.name=Zespawnuj smoka Kresu # item.spawn_egg.entity.goat.name=Zespawnuj kozę # item.spawn_egg.entity.pufferfish.name=Zespawnuj rozdymkę # item.spawn_egg.entity.salmon.name=Zespawnuj łososia # @@ -4981,6 +4982,7 @@ item.spawn_egg.entity.piglin.name=Jajo odrodzeń piglina # item.spawn_egg.entity.fox.name=Zespawnuj lisa # item.spawn_egg.entity.unknown.name=Zespawnuj # item.spawn_egg.entity.wandering_trader.name=Zespawnuj kupca wędrownego # +item.spawn_egg.entity.wither.name=Zespawnuj withera # item.spawn_egg.entity.zoglin.name=Zespawnuj zoglina # item.trident.name=Trójząb # item.mushroom_stew.name=Potrawka grzybowa # @@ -5323,9 +5325,7 @@ key.streamPauseUnpause=Wstrzymaj / wznów stream # key.streamStartStop=Rozpocznij / zatrzymaj stream # key.streamToggleMic=Naciśnij, żeby mówić / wyciszyć # key.togglePerspective=Przełącz widok # -key.toggleControlHUD=Przełącz wyświetlanie wskazówek # -key.toggleControlHUD.open=Pokaż sterowanie # -key.toggleControlHUD.close=Ukryj sterowanie # +key.toggleControlTips=Wskazówki dotyczące sterowania # key.use=Użyj przedmiotu / umieść blok # key.flyDownSlow=Leć powoli w dół # key.flyUpSlow=Leć powoli w górę # @@ -6015,7 +6015,8 @@ options.creatorTitle=Ustawienia twórcy # options.vr_classic_box_selection=Wybór konturu # options.hidegamepadcursor=Ukryj kursor kontrolera # options.hidegui=Ukryj interfejs # -options.hideKeyboardTooltips=Ukryj wskazówki dotyczące klawiatury i myszy # +options.showKeyboardPrompts=Ukryj podpowiedzi dotyczące klawiatury i myszy # +options.showLearningPrompts=Pokaż podpowiedzi edukacyjne # options.hidetooltips=Ukryj podpowiedzi kontrolera # options.splitscreenHUDsize=Rozmiar interfejsu HUD na ekranie dzielonym # options.ingamePlayerNames=Nazwy graczy w grze # @@ -7257,8 +7258,6 @@ sign.edit=Edytuj treść znaku # skin.New=Nowa # -skin.Standard.Alex=Alex # -skin.Standard.Steve=Steve # skin.Standard.Custom=Własna # skin.Standard.CustomSlim=Niestandardowa # skin.Standard.Dummy=Niestandardowa # @@ -9783,8 +9782,6 @@ onlinePlay.editor.message=Na czacie podczas edycji online możesz natknąć się onlinePlay.doNotShowAgain=Nie pokazuj więcej tego ekranu # onlinePlay.proceed=Kontynuuj # onlinePlay.Back=Wróć # -onlinePlay.untrustedIp.title=Nieznany serwer zewnętrzny # -onlinePlay.untrustedIp.message=Łącz się tylko z serwerami, którym ufasz! Czy nadal chcesz dołączyć? # dr.color.button_name=Kolor # dr.color.amber_dark=Bursztynowy – ciemny # dr.color.amber_dark_soft=Bursztynowy - ciemny miękki # diff --git a/resource_pack/texts/pt_BR.lang b/resource_pack/texts/pt_BR.lang index abb415e3b..a13e34ade 100644 --- a/resource_pack/texts/pt_BR.lang +++ b/resource_pack/texts/pt_BR.lang @@ -4916,6 +4916,7 @@ item.spawn_egg.entity.cat.name=Invocar Gato # item.spawn_egg.entity.chicken.name=Invocar Galinha # item.spawn_egg.entity.cow.name=Invocar Vaca # item.spawn_egg.entity.cod.name=Invocar bacalhau # +item.spawn_egg.entity.ender_dragon.name=Invocar Dragão Ender # item.spawn_egg.entity.goat.name=Invocar Cabra # item.spawn_egg.entity.pufferfish.name=Invocar baiacu # item.spawn_egg.entity.salmon.name=Invocar salmão # @@ -4981,6 +4982,7 @@ item.spawn_egg.entity.piglin.name=Invocar Piglin # item.spawn_egg.entity.fox.name=Invocar Raposa # item.spawn_egg.entity.unknown.name=Invocar # item.spawn_egg.entity.wandering_trader.name=Invocar o Comerciante Nômade # +item.spawn_egg.entity.wither.name=Invocar Wither # item.spawn_egg.entity.zoglin.name=Invocar Zoglin # item.trident.name=Tridente # item.mushroom_stew.name=Ensopado de Cogumelos # @@ -5323,9 +5325,7 @@ key.streamPauseUnpause=Pausar/Retomar Transmissão # key.streamStartStop=Iniciar/Parar transmissão # key.streamToggleMic=Pressione para falar/silenciar # key.togglePerspective=Mudar Perspectiva # -key.toggleControlHUD=Alternar dicas # -key.toggleControlHUD.open=Mostrar controles # -key.toggleControlHUD.close=Ocultar controles # +key.toggleControlTips=Dicas de Controle # key.use=Usar Item/Pôr Bloco # key.flyDownSlow=Voo lento p/ baixo # key.flyUpSlow=Voo lento p/ cima # @@ -6015,7 +6015,8 @@ options.creatorTitle=Configurações do Criador # options.vr_classic_box_selection=Seleção de Espaço # options.hidegamepadcursor=Ocultar o Cursor do Controlador # options.hidegui=Ocultar GUI # -options.hideKeyboardTooltips=Esconder dicas de teclado e mouse # +options.showKeyboardPrompts=Mostrar Controles de Teclado e Mouse # +options.showLearningPrompts=Mostrar Janelas de Aprendizagem # options.hidetooltips=Esconder Dicas de Controles # options.splitscreenHUDsize=Tamanho de Divisão de Tela do HUD # options.ingamePlayerNames=Nomes dos Jogadores no Jogo # @@ -7257,8 +7258,6 @@ sign.edit=Editar mensagem da placa # skin.New=Novo # -skin.Standard.Alex=Alex # -skin.Standard.Steve=Steve # skin.Standard.Custom=Personalizar # skin.Standard.CustomSlim=Personalizar # skin.Standard.Dummy=Personalizar # @@ -9783,8 +9782,6 @@ onlinePlay.editor.message=Durante a edição online, você pode ser exposto a me onlinePlay.doNotShowAgain=Não mostre esta tela novamente # onlinePlay.proceed=Continuar # onlinePlay.Back=Voltar # -onlinePlay.untrustedIp.title=Servidor Externo Desconhecido # -onlinePlay.untrustedIp.message=Você só deve conectar-se aos servidores em que confia! Deseja entrar mesmo assim? # dr.color.button_name=Cor # dr.color.amber_dark=Âmbar - Escuro # dr.color.amber_dark_soft=Âmbar - Escuro Suave # diff --git a/resource_pack/texts/pt_PT.lang b/resource_pack/texts/pt_PT.lang index 66f133818..9d451db10 100644 --- a/resource_pack/texts/pt_PT.lang +++ b/resource_pack/texts/pt_PT.lang @@ -4916,6 +4916,7 @@ item.spawn_egg.entity.cat.name=Gerar Gato # item.spawn_egg.entity.chicken.name=Gerar Galinha # item.spawn_egg.entity.cow.name=Gerar Vaca # item.spawn_egg.entity.cod.name=Gerar Bacalhau # +item.spawn_egg.entity.ender_dragon.name=Gerar Dragão de Ender # item.spawn_egg.entity.goat.name=Gerar Cabra # item.spawn_egg.entity.pufferfish.name=Gerar Peixe Balão # item.spawn_egg.entity.salmon.name=Gerar Salmão # @@ -4981,6 +4982,7 @@ item.spawn_egg.entity.piglin.name=Gerar Piglin # item.spawn_egg.entity.fox.name=Gerar Raposa # item.spawn_egg.entity.unknown.name=Gerar # item.spawn_egg.entity.wandering_trader.name=Gerar Feirante # +item.spawn_egg.entity.wither.name=Gerar Wither # item.spawn_egg.entity.zoglin.name=Gerar Hoglin Morto-Vivo # item.trident.name=Tridente # item.mushroom_stew.name=Guisado de Cogumelos # @@ -5323,9 +5325,7 @@ key.streamPauseUnpause=Pausar/Retomar Transmissão # key.streamStartStop=Iniciar/Parar Transmissão # key.streamToggleMic=Premir Para Falar/Emudecer # key.togglePerspective=Mudar Câmara # -key.toggleControlHUD=Alternar Sugestões # -key.toggleControlHUD.open=Mostrar Controlos # -key.toggleControlHUD.close=Ocultar controlos # +key.toggleControlTips=Dicas de Controlo # key.use=Usar Item/Colocar Bloco # key.flyDownSlow=Voo Lento p/ Baixo # key.flyUpSlow=Voo Lento p/ Cima # @@ -6015,7 +6015,8 @@ options.creatorTitle=Definições de Criador # options.vr_classic_box_selection=Seleção do Destaque # options.hidegamepadcursor=Ocultar Cursor do Comando # options.hidegui=Ocultar GUI # -options.hideKeyboardTooltips=Ocultar Sugestões de Teclado e Rato # +options.showKeyboardPrompts=Mostrar Instruções do Teclado e do Rato # +options.showLearningPrompts=Mostrar Instruções de Aprendizagem # options.hidetooltips=Ocultar Sugestões de Comando # options.splitscreenHUDsize=Dimensão do HUD do ecrã dividido # options.ingamePlayerNames=Nomes de Jogador no jogo # @@ -7257,8 +7258,6 @@ sign.edit=Editar mensagem da tabuleta # skin.New=Novo # -skin.Standard.Alex=Alex # -skin.Standard.Steve=Steve # skin.Standard.Custom=Personalizada # skin.Standard.CustomSlim=Personalizado # skin.Standard.Dummy=Personalizado # @@ -9783,8 +9782,6 @@ onlinePlay.editor.message=Durante a edição online podes ser exposto a mensagen onlinePlay.doNotShowAgain=Não mostrar este ecrã novamente # onlinePlay.proceed=Proceder # onlinePlay.Back=Anterior # -onlinePlay.untrustedIp.title=Servidor Externo Desconhecido # -onlinePlay.untrustedIp.message=Só deves entrar em servidores de confiança! Ainda queres entrar? # dr.color.button_name=Cor # dr.color.amber_dark=Âmbar - Escuro # dr.color.amber_dark_soft=Âmbar - Escuro Suave # diff --git a/resource_pack/texts/ru_RU.lang b/resource_pack/texts/ru_RU.lang index e452ea47c..18b6b7945 100644 --- a/resource_pack/texts/ru_RU.lang +++ b/resource_pack/texts/ru_RU.lang @@ -4916,6 +4916,7 @@ item.spawn_egg.entity.cat.name=Создать кота # item.spawn_egg.entity.chicken.name=Создать курицу # item.spawn_egg.entity.cow.name=Создать корову # item.spawn_egg.entity.cod.name=Создать треску # +item.spawn_egg.entity.ender_dragon.name=Создать дракона Края # item.spawn_egg.entity.goat.name=Создать козу # item.spawn_egg.entity.pufferfish.name=Создать рыбу фугу # item.spawn_egg.entity.salmon.name=Создать лосося # @@ -4981,6 +4982,7 @@ item.spawn_egg.entity.piglin.name=Создать пиглина # item.spawn_egg.entity.fox.name=Создать лису # item.spawn_egg.entity.unknown.name=Создать существо # item.spawn_egg.entity.wandering_trader.name=Создать бродячего торговца # +item.spawn_egg.entity.wither.name=Создать иссушителя # item.spawn_egg.entity.zoglin.name=Создать зоглина # item.trident.name=Трезубец # item.mushroom_stew.name=Тушеные грибы # @@ -5323,9 +5325,7 @@ key.streamPauseUnpause=Пауза/возобновление трансляци key.streamStartStop=Запуск/остановка трансляции # key.streamToggleMic=Включить/выключить микрофон # key.togglePerspective=Изменить перспективу # -key.toggleControlHUD=Переключить подсказки # -key.toggleControlHUD.open=Показать элементы управления # -key.toggleControlHUD.close=Скрыть элементы управления # +key.toggleControlTips=Советы по управлению # key.use=Использовать/поставить # key.flyDownSlow=Опускаться медленно # key.flyUpSlow=Взлетать медленно # @@ -6015,7 +6015,8 @@ options.creatorTitle=Настройки создателя # options.vr_classic_box_selection=Выбор контура # options.hidegamepadcursor=Скрыть курсор контроллера # options.hidegui=Скрыть ГПИ # -options.hideKeyboardTooltips=Скрыть советы по использованию клавиатуры и мыши # +options.showKeyboardPrompts=Показать подсказки по использованию клавиатуры и мыши # +options.showLearningPrompts=Показать подсказки по обучению # options.hidetooltips=Скрыть подсказки для контроллера # options.splitscreenHUDsize=Размер индикаторов (разделение экрана) # options.ingamePlayerNames=Имена игроков в игре # @@ -7257,8 +7258,6 @@ sign.edit=Изменить текст на табличке # skin.New=Новый мир # -skin.Standard.Alex=Алекс # -skin.Standard.Steve=Стив # skin.Standard.Custom=Пользовательский # skin.Standard.CustomSlim=Пользовательский # skin.Standard.Dummy=Пользовательский # @@ -9783,8 +9782,6 @@ onlinePlay.editor.message=Во время редактирования онла onlinePlay.doNotShowAgain=Больше не показывать этот экран # onlinePlay.proceed=Продолжить # onlinePlay.Back=Назад # -onlinePlay.untrustedIp.title=Неизвестный внешний сервер # -onlinePlay.untrustedIp.message=Подключайтесь только к серверам, которым вы доверяете! Все еще хотите присоединиться? # dr.color.button_name=Цвет # dr.color.amber_dark=Темно-янтарный # dr.color.amber_dark_soft=Мягкий темно-янтарный # diff --git a/resource_pack/texts/sk_SK.lang b/resource_pack/texts/sk_SK.lang index e65a60207..05fb761da 100644 --- a/resource_pack/texts/sk_SK.lang +++ b/resource_pack/texts/sk_SK.lang @@ -4916,6 +4916,7 @@ item.spawn_egg.entity.cat.name=Narodenie mačky # item.spawn_egg.entity.chicken.name=Narodenie sliepky # item.spawn_egg.entity.cow.name=Narodenie kravy # item.spawn_egg.entity.cod.name=Narodenie tresky # +item.spawn_egg.entity.ender_dragon.name=Narodenie draka z konca sveta # item.spawn_egg.entity.goat.name=Narodenie kozy # item.spawn_egg.entity.pufferfish.name=Narodenie štvorzubca # item.spawn_egg.entity.salmon.name=Narodenie lososa # @@ -4981,6 +4982,7 @@ item.spawn_egg.entity.piglin.name=Narodenie piglina # item.spawn_egg.entity.fox.name=Narodenie líšky # item.spawn_egg.entity.unknown.name=Narodenie # item.spawn_egg.entity.wandering_trader.name=Narodenie potulného obchodníka # +item.spawn_egg.entity.wither.name=Narodenie withera # item.spawn_egg.entity.zoglin.name=Narodenie zoglina # item.trident.name=Trojzubec # item.mushroom_stew.name=Hubová polievka # @@ -5323,9 +5325,7 @@ key.streamPauseUnpause=Pozastaviť/obnoviť prúd údajov # key.streamStartStop=Spustiť/zastaviť prúd údajov # key.streamToggleMic=Stlačením hovorte/stlmte # key.togglePerspective=Prepnúť pohľad # -key.toggleControlHUD=Prepnúť rady # -key.toggleControlHUD.open=Zobraziť ovládacie prvky # -key.toggleControlHUD.close=Skryť ovládacie prvky # +key.toggleControlTips=Tipy na ovládanie # key.use=Použiť predmet/položiť blok # key.flyDownSlow=Letieť nadol pomaly # key.flyUpSlow=Letieť nahor pomaly # @@ -6015,7 +6015,8 @@ options.creatorTitle=Nastavenia autora # options.vr_classic_box_selection=Výber obrysu # options.hidegamepadcursor=Skryť kurzor ovládača # options.hidegui=Skryť grafické používateľské rozhranie # -options.hideKeyboardTooltips=Skryť tipy pre klávesnicu a myš # +options.showKeyboardPrompts=Zobraziť výzvy pre klávesnicu a myš # +options.showLearningPrompts=Zobraziť výzvy na učenie # options.hidetooltips=Skryť popisy ovládača # options.splitscreenHUDsize=Veľkosť priehľadového displeja počas rozdelenej obrazovky # options.ingamePlayerNames=Mená hráčov v hre # @@ -7257,8 +7258,6 @@ sign.edit=Upraviť správu na značke # skin.New=Nové # -skin.Standard.Alex=Alex # -skin.Standard.Steve=Steve # skin.Standard.Custom=Vlastné # skin.Standard.CustomSlim=Vlastný # skin.Standard.Dummy=Vlastný # @@ -9783,8 +9782,6 @@ onlinePlay.editor.message=Počas editovania online môžete byť vystavení chat onlinePlay.doNotShowAgain=Nabudúce túto obrazovku nezobrazovať # onlinePlay.proceed=Pokračovať # onlinePlay.Back=Naspäť # -onlinePlay.untrustedIp.title=Neznámy externý server # -onlinePlay.untrustedIp.message=Mali by ste sa pripájať iba k serverom, ktorým dôverujete! Chcete sa aj tak pripojiť? # dr.color.button_name=Farba # dr.color.amber_dark=Jantárová – tmavá # dr.color.amber_dark_soft=Jantárová – Tmavá jemná # diff --git a/resource_pack/texts/sv_SE.lang b/resource_pack/texts/sv_SE.lang index 42ec05112..e0564ee37 100644 --- a/resource_pack/texts/sv_SE.lang +++ b/resource_pack/texts/sv_SE.lang @@ -4916,6 +4916,7 @@ item.spawn_egg.entity.cat.name=Spawna katt # item.spawn_egg.entity.chicken.name=Spawna höna # item.spawn_egg.entity.cow.name=Spawna ko # item.spawn_egg.entity.cod.name=Spawna torsk # +item.spawn_egg.entity.ender_dragon.name=Spawna enderdrake # item.spawn_egg.entity.goat.name=Spawna get # item.spawn_egg.entity.pufferfish.name=Spawna blåsfisk # item.spawn_egg.entity.salmon.name=Spawna lax # @@ -4981,6 +4982,7 @@ item.spawn_egg.entity.piglin.name=Spawna Piglin # item.spawn_egg.entity.fox.name=Spawna räv # item.spawn_egg.entity.unknown.name=Spawnplats # item.spawn_egg.entity.wandering_trader.name=Spawna handelsresande # +item.spawn_egg.entity.wither.name=Spawna wither # item.spawn_egg.entity.zoglin.name=Spawna zoggare # item.trident.name=Treudd # item.mushroom_stew.name=Svampstuvning # @@ -5323,9 +5325,7 @@ key.streamPauseUnpause=Pausa/återuppta stream # key.streamStartStop=Starta/stoppa stream # key.streamToggleMic=Tryck för att prata/stäng av ljud # key.togglePerspective=Växla perspektiv # -key.toggleControlHUD=Växla tips # -key.toggleControlHUD.open=Visa kontroller # -key.toggleControlHUD.close=Dölj kontroller # +key.toggleControlTips=Kontrolltips # key.use=Använd föremål/placera block # key.flyDownSlow=Flyg nedåt långsamt # key.flyUpSlow=Flyg uppåt långsamt # @@ -6015,7 +6015,8 @@ options.creatorTitle=Inställningar för innehållsskapare # options.vr_classic_box_selection=Markera val # options.hidegamepadcursor=Dölj handkontrollens markör # options.hidegui=Dölj gränssnitt # -options.hideKeyboardTooltips=Dölj tangentbords- och mustips # +options.showKeyboardPrompts=Visa hjälpmeddelanden för tangentbord och mus # +options.showLearningPrompts=Visa hjälpmeddelanden # options.hidetooltips=Dölj handkontrollstips # options.splitscreenHUDsize=Gränssnittstorlek med delad skärm # options.ingamePlayerNames=Spelarnamn i spelet # @@ -7257,8 +7258,6 @@ sign.edit=Redigera skyltens meddelande # skin.New=Ny # -skin.Standard.Alex=Alex # -skin.Standard.Steve=Steve # skin.Standard.Custom=Anpassat # skin.Standard.CustomSlim=Anpassat # skin.Standard.Dummy=Anpassat # @@ -9783,8 +9782,6 @@ onlinePlay.editor.message=När du redigerar online kan du stöta på chattmeddel onlinePlay.doNotShowAgain=Visa inte det här igen # onlinePlay.proceed=Fortsätt # onlinePlay.Back=Tillbaka # -onlinePlay.untrustedIp.title=Okänd extern server # -onlinePlay.untrustedIp.message=Du bör endast ansluta till servrar du litar på! Vill du fortfarande ansluta? # dr.color.button_name=Färg # dr.color.amber_dark=Bärnsten – mörk # dr.color.amber_dark_soft=Bärnsten – mörk mjuk # diff --git a/resource_pack/texts/tr_TR.lang b/resource_pack/texts/tr_TR.lang index 9861fd847..bf54d2808 100644 --- a/resource_pack/texts/tr_TR.lang +++ b/resource_pack/texts/tr_TR.lang @@ -4916,6 +4916,7 @@ item.spawn_egg.entity.cat.name=Çağır: Kedi # item.spawn_egg.entity.chicken.name=Çağır: Tavuk # item.spawn_egg.entity.cow.name=Çağır: İnek # item.spawn_egg.entity.cod.name=Çağır: Morina # +item.spawn_egg.entity.ender_dragon.name=Çağır: Ender Ejderhası # item.spawn_egg.entity.goat.name=Çağır: Keçi # item.spawn_egg.entity.pufferfish.name=Çağır: Kirpi Balığı # item.spawn_egg.entity.salmon.name=Çağır: Somon # @@ -4981,6 +4982,7 @@ item.spawn_egg.entity.piglin.name=Çağır: Piglin # item.spawn_egg.entity.fox.name=Çağır: Tilki # item.spawn_egg.entity.unknown.name=Çağır # item.spawn_egg.entity.wandering_trader.name=Çağır: Gezgin Tüccar # +item.spawn_egg.entity.wither.name=Wither Çağır # item.spawn_egg.entity.zoglin.name=Çağır: Zoglin # item.trident.name=Üç Uçlu Mızrak # item.mushroom_stew.name=Mantar Yemeği # @@ -5323,9 +5325,7 @@ key.streamPauseUnpause=Akışı Duraklat/Yeniden Yürüt # key.streamStartStop=Akışı Başlat/Durdur # key.streamToggleMic=Konuşmak/Sessize Almak için Dokun # key.togglePerspective=Perspektife Geç # -key.toggleControlHUD=İpuçlarını Aç/Kapat # -key.toggleControlHUD.open=Kontrolleri Göster # -key.toggleControlHUD.close=Kontrolleri Gizle # +key.toggleControlTips=Kontrol İpuçları # key.use=Eşya Kullan/Blok Yerleştir # key.flyDownSlow=Yavaşça Aşağı Doğru Uç # key.flyUpSlow=Yavaşça Yukarı Doğru Uç # @@ -6015,7 +6015,8 @@ options.creatorTitle=İçerik Üretici Ayarları # options.vr_classic_box_selection=Taslak Seçimi # options.hidegamepadcursor=Kumanda İmlecini Gizle # options.hidegui=GUI'yı gizle # -options.hideKeyboardTooltips=Klavye ve Fare İpuçlarını Gizle # +options.showKeyboardPrompts=Klavye ve Fare İstemlerini Göster # +options.showLearningPrompts=Öğrenme İstemlerini Göster # options.hidetooltips=Kumanda İpuçlarını Gizle # options.splitscreenHUDsize=Bölünmüş Ekran Baş Üstü Ekranı Boyutu # options.ingamePlayerNames=Oyun İçi Oyuncu Adları # @@ -7257,8 +7258,6 @@ sign.edit=Tabela mesajını düzenle # skin.New=Yeni # -skin.Standard.Alex=Alex # -skin.Standard.Steve=Steve # skin.Standard.Custom=Özel # skin.Standard.CustomSlim=Özel # skin.Standard.Dummy=Özel # @@ -9783,8 +9782,6 @@ onlinePlay.editor.message=Çevrimiçi oyun sırasında her yaşa uygun olmayabil onlinePlay.doNotShowAgain=Bu ekranı bir daha gösterme # onlinePlay.proceed=Devam # onlinePlay.Back=Geri # -onlinePlay.untrustedIp.title=Bilinmeyen Harici Sunucu # -onlinePlay.untrustedIp.message=Yalnızca güvendiğiniz sunuculara bağlanmalısınız! Yine de katılmak istiyor musunuz? # dr.color.button_name=Renk # dr.color.amber_dark=Kehribar - Koyu # dr.color.amber_dark_soft=Kehribar - Koyu Yumuşak # diff --git a/resource_pack/texts/uk_UA.lang b/resource_pack/texts/uk_UA.lang index acd05980d..49191722a 100644 --- a/resource_pack/texts/uk_UA.lang +++ b/resource_pack/texts/uk_UA.lang @@ -4916,6 +4916,7 @@ item.spawn_egg.entity.cat.name=Яйце призову кота # item.spawn_egg.entity.chicken.name=Яйце призову курки # item.spawn_egg.entity.cow.name=Яйце призову корови # item.spawn_egg.entity.cod.name=Призвати тріску # +item.spawn_egg.entity.ender_dragon.name=Призвати дракона Ендеру # item.spawn_egg.entity.goat.name=Яйце призову кози # item.spawn_egg.entity.pufferfish.name=Призвати скелезуба # item.spawn_egg.entity.salmon.name=Призвати лосося # @@ -4981,6 +4982,7 @@ item.spawn_egg.entity.piglin.name=Призвати піґліна # item.spawn_egg.entity.fox.name=Яйце призову лисиці # item.spawn_egg.entity.unknown.name=Яйце призову # item.spawn_egg.entity.wandering_trader.name=Призвати мандрівного крамаря # +item.spawn_egg.entity.wither.name=Призвати Візера # item.spawn_egg.entity.zoglin.name=Яйце призову зоґліна # item.trident.name=Тризуб # item.mushroom_stew.name=Грибна підлива # @@ -5323,9 +5325,7 @@ key.streamPauseUnpause=Призупинити/Відновити стрім # key.streamStartStop=Запустити/Зупинити стрім # key.streamToggleMic=Натисніть і говоріть/Без звуку # key.togglePerspective=Переключити перспективу # -key.toggleControlHUD=Переключити підказки # -key.toggleControlHUD.open=Показати елементи керування # -key.toggleControlHUD.close=Приховати елементи керування # +key.toggleControlTips=Поради щодо керування # key.use=Використати предмет/Розмістити блок # key.flyDownSlow=Повільно летіти вниз # key.flyUpSlow=Повільно летіти вгору # @@ -6015,7 +6015,8 @@ options.creatorTitle=Параметри творця # options.vr_classic_box_selection=Контурний вибір # options.hidegamepadcursor=Приховати курсор контролера # options.hidegui=Приховати інтерфейс # -options.hideKeyboardTooltips=Приховати поради з використання клавіатури й миші # +options.showKeyboardPrompts=Показувати підказки з використання клавіатури й миші # +options.showLearningPrompts=Показувати навчальні підказки # options.hidetooltips=Приховати підказки контролера # options.splitscreenHUDsize=Розмір HUD за розділеного екрана # options.ingamePlayerNames=Імена гравців у грі # @@ -7257,8 +7258,6 @@ sign.edit=Змінити повідомлення для підпису # skin.New=Нові # -skin.Standard.Alex=Алекс # -skin.Standard.Steve=Стів # skin.Standard.Custom=Власний # skin.Standard.CustomSlim=Власний # skin.Standard.Dummy=Власний # @@ -9783,8 +9782,6 @@ onlinePlay.editor.message=Під час гри онлайн ви можете з onlinePlay.doNotShowAgain=Більше не показувати цей екран # onlinePlay.proceed=Продовжити # onlinePlay.Back=Назад # -onlinePlay.untrustedIp.title=Невідомий зовнішній сервер # -onlinePlay.untrustedIp.message=Ви повинні підключатися лише до серверів, яким довіряєте! Ви все ще хочете приєднатися? # dr.color.button_name=Колір # dr.color.amber_dark=Янтарний — темний # dr.color.amber_dark_soft=Янтарний – темний м’який # diff --git a/resource_pack/texts/zh_CN.lang b/resource_pack/texts/zh_CN.lang index 73afee4aa..baae70574 100644 --- a/resource_pack/texts/zh_CN.lang +++ b/resource_pack/texts/zh_CN.lang @@ -4916,6 +4916,7 @@ item.spawn_egg.entity.cat.name=生成猫 # item.spawn_egg.entity.chicken.name=生成鸡 # item.spawn_egg.entity.cow.name=生成牛 # item.spawn_egg.entity.cod.name=生成鳕鱼 # +item.spawn_egg.entity.ender_dragon.name=生成末影龙 # item.spawn_egg.entity.goat.name=生成山羊 # item.spawn_egg.entity.pufferfish.name=生成河豚 # item.spawn_egg.entity.salmon.name=生成鲑鱼 # @@ -4981,6 +4982,7 @@ item.spawn_egg.entity.piglin.name=生成猪灵 # item.spawn_egg.entity.fox.name=生成狐狸 # item.spawn_egg.entity.unknown.name=生成 # item.spawn_egg.entity.wandering_trader.name=生成流浪商人 # +item.spawn_egg.entity.wither.name=生成凋灵 # item.spawn_egg.entity.zoglin.name=生成僵尸疣猪兽 # item.trident.name=三叉戟 # item.mushroom_stew.name=蘑菇煲 # @@ -5323,9 +5325,7 @@ key.streamPauseUnpause=暂停/取消暂停直播 # key.streamStartStop=开始/停止直播 # key.streamToggleMic=点击来开启麦克风/静音 # key.togglePerspective=切换视角 # -key.toggleControlHUD=切换提示 # -key.toggleControlHUD.open=显示控件 # -key.toggleControlHUD.close=隐藏控件 # +key.toggleControlTips=控制提示 # key.use=使用物品/放置方块 # key.flyDownSlow=缓慢下降 # key.flyUpSlow=缓慢飞起 # @@ -6015,7 +6015,8 @@ options.creatorTitle=创建者设置 # options.vr_classic_box_selection=轮廓选择 # options.hidegamepadcursor=隐藏控制器光标 # options.hidegui=隐藏GUI # -options.hideKeyboardTooltips=隐藏键盘和鼠标提示 # +options.showKeyboardPrompts=显示键盘和鼠标提示 # +options.showLearningPrompts=显示学习提示 # options.hidetooltips=隐藏控制器提示 # options.splitscreenHUDsize=分屏 HUD 大小 # options.ingamePlayerNames=游戏内玩家昵称 # @@ -7257,8 +7258,6 @@ sign.edit=修改告示牌信息 # skin.New=新 # -skin.Standard.Alex=艾莉克斯 # -skin.Standard.Steve=史蒂夫 # skin.Standard.Custom=自定义 # skin.Standard.CustomSlim=自定义 # skin.Standard.Dummy=自定义 # @@ -9783,8 +9782,6 @@ onlinePlay.editor.message=在线编辑期间可能会含有聊天消息或其他 onlinePlay.doNotShowAgain=不再显示此窗口 # onlinePlay.proceed=继续 # onlinePlay.Back=返回 # -onlinePlay.untrustedIp.title=未知的外部服务器 # -onlinePlay.untrustedIp.message=您应该只连接到信任的服务器！仍想加入吗？ # dr.color.button_name=颜色 # dr.color.amber_dark=琥珀色 - 深 # dr.color.amber_dark_soft=琥珀色 - 深色柔和 # diff --git a/resource_pack/texts/zh_TW.lang b/resource_pack/texts/zh_TW.lang index eaecaef5c..e3b6c42f3 100644 --- a/resource_pack/texts/zh_TW.lang +++ b/resource_pack/texts/zh_TW.lang @@ -4916,6 +4916,7 @@ item.spawn_egg.entity.cat.name=生成貓 # item.spawn_egg.entity.chicken.name=生成雞 # item.spawn_egg.entity.cow.name=生成乳牛 # item.spawn_egg.entity.cod.name=生成鱈魚 # +item.spawn_egg.entity.ender_dragon.name=生成終界龍 # item.spawn_egg.entity.goat.name=生成山羊 # item.spawn_egg.entity.pufferfish.name=生成河豚 # item.spawn_egg.entity.salmon.name=生成鮭魚 # @@ -4981,6 +4982,7 @@ item.spawn_egg.entity.piglin.name=生成豬布林 # item.spawn_egg.entity.fox.name=生成狐狸 # item.spawn_egg.entity.unknown.name=生成 # item.spawn_egg.entity.wandering_trader.name=生成流浪商人 # +item.spawn_egg.entity.wither.name=生成凋靈怪 # item.spawn_egg.entity.zoglin.name=生成殭屍疣豬獸 # item.trident.name=三叉戟 # item.mushroom_stew.name=燉蘑菇 # @@ -5323,9 +5325,7 @@ key.streamPauseUnpause=暫停/繼續串流 # key.streamStartStop=啟動/停止串流 # key.streamToggleMic=按下以說話/靜音 # key.togglePerspective=切換視角 # -key.toggleControlHUD=切換提示 # -key.toggleControlHUD.open=顯示控制項 # -key.toggleControlHUD.close=隱藏控制項 # +key.toggleControlTips=控制提示 # key.use=使用物品/放置方塊 # key.flyDownSlow=緩慢向下飛 # key.flyUpSlow=緩慢向上飛 # @@ -6015,7 +6015,8 @@ options.creatorTitle=創作者設定 # options.vr_classic_box_selection=外框選擇 # options.hidegamepadcursor=隱藏控制器游標 # options.hidegui=隱藏 GUI # -options.hideKeyboardTooltips=隱藏鍵盤和滑鼠提示 # +options.showKeyboardPrompts=顯示鍵盤和滑鼠提示 # +options.showLearningPrompts=顯示學習提示 # options.hidetooltips=隱藏控制器提示 # options.splitscreenHUDsize=分割畫面 HUD 大小 # options.ingamePlayerNames=玩家遊戲名稱 # @@ -7257,8 +7258,6 @@ sign.edit=編輯牌子文字 # skin.New=新 # -skin.Standard.Alex=愛莉克斯 # -skin.Standard.Steve=史提夫 # skin.Standard.Custom=自訂 # skin.Standard.CustomSlim=自訂 # skin.Standard.Dummy=自訂 # @@ -9783,8 +9782,6 @@ onlinePlay.editor.message=在線上遊玩期間，您可能會接觸到聊天訊 onlinePlay.doNotShowAgain=不再顯示此畫面 # onlinePlay.proceed=進行 # onlinePlay.Back=返回 # -onlinePlay.untrustedIp.title=未知的外部伺服器 # -onlinePlay.untrustedIp.message=你應該只連線到你信任的伺服器！還是想加入嗎？ # dr.color.button_name=顏色 # dr.color.amber_dark=琥珀色 - 深色 # dr.color.amber_dark_soft=琥珀色 - 深色柔和 # diff --git a/resource_pack/textures/ui/emote_wheel_updated_base.png b/resource_pack/textures/ui/emote_wheel_updated_base.png index 28cc5ba9c6e1c085f00d0bc84477028314cf9df3..7c472a0f7c63151db2b30828192e2a1db0d47b60 100644 GIT binary patch literal 796 zcmeAS@N?(olHy`uVBq!ia0vp^{UFT21|$zBcT5ISoCO|{#S9GG!XV7ZFl&wk0|V1J zPZ!6KiaBrZ9?ZS%AmVz_zHzpPaR{?!Q$pgBZV%=XW6kEs8(b`k(zen1%?RFk7U@h#}< zKJ^b9H9t&^JNf_q>wkBS7s_na@!oxN$+^kS;j-cR>$c^t-uS*cG&ELkdKu%}-}gQ- z8ZTh{F_wU$U->>U* z&tJ{3x82`A4V>TgeAR2em*L;nzdssYN_+1DgVev0 z`OnN-=lOase&hYM_VLVRnI&_oe`!S>|D2d}`FVdQ&MBb@067P5_y7O^ literal 755 zcmeAS@N?(olHy`uVBq!ia0vp^4M5z_!3HFaGA_#jDaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheoCO|{#S9GG!XV7ZFl&wk0|Qfsr;B4qMcmuF7kv*q2ryinp_ieS*PxUn z{%i?{lt)*i(V4Y7odp99tV^3$a_HpsrzS-w&R5;~{x{^{^0+ul~_@8wuHac=98@Ppp}wKbRHC>^xNqx$13H{b4Oe^EoBLH+rVGALsW)wOH#l1XPf1H3g2e_ zO*k&`?ZW%8pGRdE9O_!XDk=Hx?QQ@6>&y)6bU)Tok#pwqf5w-`H*7D~{dhuxj;;^f z_}6Ib^1^MZ=eGGUDE^N4y)cNOewllE-04j+(d#zUy|;aS%RheVwxb8ne6HILOsEW= Lu6{1-oD!M<7@;BO diff --git a/resource_pack/textures/ui/emote_wheel_updated_select_0.png b/resource_pack/textures/ui/emote_wheel_updated_select_0.png index 5fb30923a40e390d1513e130f00de3bed7136c33..9966f5e503170335b9ca230d3a70079a8cc637bb 100644 GIT binary patch literal 765 zcmeAS@N?(olHy`uVBq!ia0vp^{UFT21|$zBcT5ISoCO|{#S9GG!XV7ZFl&wk0|V1~ zPZ!6KiaBrZ9?ZQRAmDoOXXC_JE)U}n=9P*H5fU$zE-~Eo;qqWSb0{pK;<@_aGaS!D z3>4P0W?(smm1l(O6v8ld9{9P zYHdP8Z*QAhduaEW&oLmT?CV|I{<7@qu2{9|)${B2>GMDE-9KmdK)J^9H^VO>e#4If z!n7tfUM&5(?DM0uSDzNGd~9(m&%dYk{_TA&eck5a*FR3`Tb3zxdXo+R^pYCR_0y8i z*{YbFFTVYJpU&xx>t6rZUUm7c>Yksc|JGiT-2Nl(>i3=fhJD*7d+xXUJL^vWX8s=z zy7PC(M;|%j>|;ZF;?2TWmHrP>gCETMr~1Es{qJJ=AX#wY~{}vTN<->=dEpP zkL`OO8d|zD<`(Og_tmGxKUC?hy#4BIHveUl(9o?hb9S%$TUyPSzx|Mv-S1V?-`kWg zdio~ddcmqcw;r)QQdE;mqB(J`&ThfqHy0#IW!{=4uUb`UbJ?V~uh{?lqEZ|EW7~3b hnP2@{865gmJf*F!|J&j_dBF6{;OXk;vd$@?2>>FIQM>>E literal 772 zcmeAS@N?(olHy`uVBq!ia0vp^4M5z_!3HFaGA_#jDaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheoCO|{#S9GG!XV7ZFl&wk0|V1cPZ!6KinzCT5BeT<5O4^TzQ}U+hZ>J?KUVeFH{&dYH zTo0=DZVNY@d;a;lw;Sg_udLSJBjwPxRp+!-U-DYhH&*XH*8L9*-(`K^Y0=AF&yTPF zR;F?K_3y{~ju)-d{3l|w<$aS8g9USgF|COmB8!tY`*7XoJv<>TBqyF-X8Y?4i~PCn zU+sJ-d1d3b%O-zWCZzKGHq)@$Q8e#i^4;^r^Pbz?mH4*FPHBD4^Pko18T(`Nzj~Xb z_UpIX*5&21g?{@r<)zJE5r%Yz0ya7jE0?vVON!psbH07PxH|5DiSI(?6Glz7;r!;! zx(z{Zz9mVtT@bud>t=tWmZ$payReT}tsUAz|A(kbXUA{*`~SR9=F*B3pHO+};ve=3 zeT0;k7s$z`#1gH7#HY?B7R&8AO z`sVW^w~hygZq2=YQ@!Sd&G}FebK|<~+x`pMJD$Hfev`fC!1m4jKg8|k)-u#~w$G^O zpgD2l#jdK$l^>ryE82ObP$qY~`mufQbK{+kADun>c7>-q&_Ah>aqZq#`&!IT8$Op4 zn)Q6=+v50XPb03E{)ycC@|)1TzfbJpOa~AKpEc@8bV`TKj)#p^Urk=}UQLD?dNE;CuY) z?Af`uv)=rU3k{uqdTFe~?|s{A81tV`+O_uHp06gp!J(n2kM6vED}KB9hdS*wk2kO1 z_3zwgg{X73rM$~e#Yf+9v^jFb*@x!Dt@G?9^Q)zjuM}>%-LrDlvyVQPO{~t@+IC(0 n7}J}3`xe`kuffY#y)wVbSQlV+c*Y@Ms%G$X^>bP0l+XkK$}4$> literal 773 zcmeAS@N?(olHy`uVBq!ia0vp^4M5z_!3HFaGA_#jDaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheoCO|{#S9GG!XV7ZFl&wk0|V16PZ!6KinzCT5BeT<5OBCCv6ORGr@oA) zQkndgM@u-?$xKRGz^Sr1yKJ#Wz=58B^_RGgFHimY^gyc3n%BEdKd9Qf?8b|S1roPX zxmGe+%s>A&*ys4;!t38GbWU%&%e|g$LSn4m^wL?&qOxz4?mvF~uY2svc?`=hudJ)N zpT`!=RPnZ2=lQHhs~@cVD>8-gfF#2lniESUL}#Z4RhaiB&kEe=EL(7AopZOH=APBU zhmBVxzkOc$k5}Qe#5Xeyt1U(I9s&h+>YSdC$5S0Se`5Hy&wFecH}xdy@7p%paq3>X z``>NA{Uc)&vkBFLBfyph(n*tToui>u=g*qmRee8Q+{@9Os1 z2gMvT%YGa5CBNW!Ww%&9NB(f!*5#o!UpXfvUR}Q`CHd{?ZU6trDyncJjM_ zd>r=I_RY!e3P1KEo(_Qzj^L$IqPO*&cT1SHPsp;OXk;vd$@?2>`}dGo}Cl diff --git a/resource_pack/textures/ui/emote_wheel_updated_select_2.png b/resource_pack/textures/ui/emote_wheel_updated_select_2.png index e023236598da14a82296537b552110f74d9555d7..81b2c13e6e5ee022e1db55c55f938162bbae3a15 100644 GIT binary patch literal 771 zcmeAS@N?(olHy`uVBq!ia0vp^{UFT21|$zBcT5ISoCO|{#S9GG!XV7ZFl&wk0|V1m zPZ!6KiaBrZ9`wDFAkupAySs)pmxu8@wjk$}od&a&E;VGTu`XdqKj_nP!zD&(rny!6 z(Wax5{~9*&mdhLujJ375-)>tsYgyqpUiq&D-x%e;e)&@Jjq|kb%2l_vy?rBmFLmDYRUl@>^{sE!FT@@x{`&b1^Sy_^Z?ga4k3VPEuN3e`|f-#Fg{Li+A`bsm5pV|<-)Je(r#~)`n@ka^y<^1Oz{i* z-s{F6c)fE;-fHvpwmz3bLa!DTzT5Wg`dijLce!5wc(Z!l{?B(><>Tw;*B-LAxwr3y zl;70-+kP;76cFY&q&bmoFaIH{?8Qg<`@b}M4PRN@$~_hm`nh6Rrj+dSdGB0bSFAg> kEjO3>)vuMopS(S}kd)Z8< zRSbI5y?={bepzC*#g^~%rZ?XYt!7M#c)cs{vdPt`!|U!>@3~)pW$HW50=xOIk8l5* zW}we`%MaidH!%KrS{TE@>d?R^TTIlirv%VVo%SbF2{VT-Ea1vh8-b`lWwPGY%kpAdCtt2A@s|}Z?Vf5{`vIx?OB$2Yx|tUyYFqE c-Qv6d+U)4TXZN$t1CuR-r>mdKI;Vst0E74r(CV|FV@_|92{pY|YWsUm z#P5n#tG4A@|85DN`Ftmsd95_}H|H14M>~I2eq&r;Q2&kb{ln8Y*)L45=;&;pL35&a z-D>l>;`w=c)4gSnUo5Lmdh`3yPA@U>y&N&^Y37b4kG(6l$rQg+Tv$2p zw%zyC$iC9pZD$>%D%--p)D|1I(ON4e3<yYA^rd1fm=Ke^z0{Oau4 zxwo_4{EiC^oql?0ti$hp+iMulKcBQ~?LC`vbKl_5(9=hE-o6#TUHn6l_L|3=*YEmw z_Os`fIkK;${HEqd?`foYlz^js>wNwUdutOnS@+#%XROMSJ8$B<`0<^~=@+f$t=^a$ ieY;^--K&t$zl_`&bpbDL3FiP)HG`+CpUXO@geCyHk%Q6z literal 776 zcmeAS@N?(olHy`uVBq!ia0vp^4M5z_!3HFaGA_#jDaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheoCO|{#S9GG!XV7ZFl&wk0|V1sPZ!6KinzCT5BeT<5OBCCagpWh5%E3| z!QK2(g+VOge4d6ESSH^02#9;CN`CATs%#5s+DVoXidY7Ehj=Oo9W>q$F?R7Jq zRx#*J_pTSc{IbOAi!I;jOoo6i$^G(olw_F0c!1_aOjqE>NVV4dV}(A(T4gJk`+k>ZTvTt(e|6*o z&#Q>vmGkPEP8hZA%(N$Vgj_zfxu@&x^o6<4Z|>7inD_jGV2b3y zeJk5%J8~}&xgFQ@Si-7l*ZCLhyL%JY|GKQT?-$F74X>g@H*Nfudi(!>y@_F6>w8wd zx_<1pFrb$FWR7gwRmF)?DAP|N#8paiZ25|z1a)N7*pcUMvxa%&`===QB z1NKVMgVc*wr7)ZmrxpgqBn1GB&p78OYrJSl5pmIqx8fKh&u*S!t>xLWYFe>yCiULa zI3j;H5o_{eaR`CNT^i1W{3qqYtLI3uPm%QaZHEQv@~+2cT=h8T$8~#3u}x?v)?jS~ vKu!U_ delta 2953 zcmV;43wHF80*@DvB!2{FK}|sb0I`n?{9y$E018QILqkw=Qb$4{Nkv08F*!CiEix`K z002mdol|#MllK-r-}hw?RzleDv6pOt03su-2*?mwq7ae*VT2G8K*fcK3RV;q5u8X> z#DdidNS%n{peVR!L5hf4i&b1W?jPKzwS9W;?d|*5`@H9z=YRapdCw1k5fUbm=Avo< zIZ}l@I@lkNPe{bcy?_E0NZAR{$W90N^4L=L-RlQUJ&HumpsYY5E(E}?0f1SyGDiY{y#)Yv zj#!WnKwtoXnL;eg03bL507D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@ z^6=o|A>zVpu|i=NDG+7}=onn6low3K2mk;?pn)o|K?e-M6o0J14xGUqyucR%VFpA%3?#rj5JCpz zfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9;1XPc>u?taU>Kgl7`%oF1VP9M6Ja4b zh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZqynizYLQ(?Bl0bB6giDtK>Co|$RIL` z{C|qPM=_LvvQY!n0(C&Ss2>`N#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG| z(J>BYjM-sajE6;FiC7vY#};GdST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%G zM_5c)L#QR}BeW8_2v-S%gfYS=B9o|3w0|Xf68Xe5gFH?u96Mr;y znkCJf7DLOVEu+=YnrUZg_h>Kabh-)MgC0ef(3jF{=m+WN>4Wrl3=M`2gU3i>C>d)R zdl{z~w;3;)Or{0Xmzl^^FxN60nP->}m~T~BD)uUT6_Lskl{%GHm421ys#H~TRX^2v zstZ)BRS&CPR(+;MRkKjzsR`5;tAEw09aX!jHm=T6cT$f~&rx5azF+-<`eO~UhJ{9; zhDf7SW4Fc`jUg7sGG*~tLe_Ft1M4hnm`!3^via;xb_M$zb}xHOQ$usAW~^qBW}W77 z%>fR^vEcAI*_=wwAhIR?(H}Q3Gzd13 z8Ei2)WAMz7W9Vy`X}HnwgyE!jf{!>Pon!|7LN8)u<&o%1yprc02^5|?(D7gKGgil=U$ddrpN8t%H%wbS*Zo4cFb zt=VnV-ON43eXILTE}I+4UBf-^LGTx1&sx}1}_Xg6+#RN4Ot&@lW)Km@*DYM zGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnWh=1TmY>2oYX&IRp`F#{A zDl)1r>QS^)ba8a|EY_^#S^HjiOPpx423?lIEROmG(H@JAFg?XogQlb;dIZ zPf{y+kr|S?BlAsGMAqJ{&)IR=Ejg5&l$@hd4QZCNE7vf$D7Q~$D=U)?Nn}(WA6du22pZOfRS_cv~1-c(_QtNPk+?Gv8+Z>iHuJf);$ekg!m= zu(Q~>cv!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1`^^VQ7&C1OKHDNXF zTgC{M|V%fo{xK_dk6MK@9S!GZ+~puufM;t32jm~jUGrkaOInTZ`zyf zns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3?NO>#LI=^+SEu(FqJ)ynt=!~PC z9bO$rzPJB=?=jt*-L?N>ambo5Q@ zJJIjcfBI^`)pOVQ*DhV3dA;w(>>IakCfyvkCA#(acJ}QTcM9%I++BK)c(44v+WqPW z`VZ=VwEnSWz-{38V8CF{!&wjS4he^z{(qGJ(}&^GN6bgnBSs^QkDVVM8x0!0@?_4F z;is~v6VJ+iR{weHbF1gy{o?ye&shA}@C*5i&%dsDsq=F0tEsO#$0Nrdyv}(&@uvK( z&f9(OxbM2($Gsn!DEvVFQ1j9HW5=h^Pxn6OeE$3|_k{ENEk`)d0000WV@Og>0Dk~_ zCIA3{ga82g0001h=l}q9FaQARU;qF*m;eA5aGbhPJOBUy32;bRa{vGf6951U69E94 zoEQKA0I*3!K~y-6)s?{w!ypVrAE?8yLZlAD1RTq*&Z6)up z&IjI^S5u7fIJh*agtp@F?^3kB-BXtC7q|L&82qiy2i}|tHF0q-00000NkvXXu0mjfxe0Wv literal 851 zcmV-Z1FZasP)001-y1^@s64LCD+0004nX+uL$Nkc;* zaB^>EX>4Tx04R}tkv&MmKp2MKriwpQL@XjAn4vmZ5EXHhDi*;)X)CnqU~=gnG-*gu zTpR`0f`dPcRR9ommw-UeSdCntd3Nn5oB-iz#@HuY36Tei!Ch-gSSD9wlosz$X&VG2O6;H;898 zEuHf|agY@xh4`F!+@K2*KXP4m`HgelVS#4`jZ|WuI7lq!TUc&kRxniJY2uKgYLqXe zT~;`6aaKze*0?8sVIZrmB)Lv&7*Q-ChB!pXsGx`vEQD#-NHLM1^N5Fk$nnR?C6lWN zMveuPp+a)};D7MDw`Oi?(oG6Pfc6*L{ul*1c7b};w!e>UyM6-rpMfi_=`YuS*-z4| zO)Yc;^lk$e*G)~{11@)f!6#iZBuDbo5^_1<{fxdT1N7el-D_^&8s|8D08-Sey{D4^000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2j&SD78wPHYPwhe00B=)L_t(|+U?viOT$1I2H=Yb z6``e3!7;NqC^-552PZ)X@gH?oBdoGFAiqJ%<xDpP(^0;j zj`Fohbe9=Hx8T*Yi<{3^%ksc<+A%ORU|-}%Cvlh8m2WTRssYh}X|4I%&NW&SYCr%; zZ4Edb<#XesQ7y}fH6Xon*!B&l$7eBw5GLni)8o@D%)2z92BaSixZQk3QJ5Z^#$B3F z1JaKMT&-4%y7?^r_@?k(GlW7jf#m(iPe2xaB9}Spg*;wd>3l4KrM}3Z&x$w0}i`m)hAI};Sx001-y1^@s64LCD+0004nX+uL$Nkc;* zaB^>EX>4Tx04R}tkv&MmKp2MKriwpQL@XjAn4vmZ5EXHhDi*;)X)CnqU~=gnG-*gu zTpR`0f`dPcRR9ommw-UeSdCntd3Nn5oB-iz#@HuY36Tei!Ch-gSSD9wlosz$X&VG2O6;H;898 zEuHf|agY@xh4`F!+@K2*KXP4m`HgelVS#4`jZ|WuI7lq!TUc&kRxniJY2uKgYLqXe zT~;`6aaKze*0?8sVIZrmB)Lv&7*Q-ChB!pXsGx`vEQD#-NHLM1^N5Fk$nnR?C6lWN zMveuPp+a)};D7MDw`Oi?(oG6Pfc6*L{ul*1c7b};w!e>UyM6-rpMfi_=`YuS*-z4| zO)Yc;^lk$e*G)~{11@)f!6#iZBuDbo5^_1<{fxdT1N7el-D_^&8s|8D08-Sey{D4^000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2j&SD78)JDD{;*L00Bx#L_t(|+U?vuPXaLZGa% zJ>NeW%@(=1xvb>nD+wP<-a$gQ%Z|Xo?{cjacn}WIwL^4C?L%$;CMWah=|c> zWc2toFS_0CM(4&AkY*HcebW6U@~v2INMLRL`n~ym|9EpIgywKRAeC@GAOHXW006*G YUnoLOe8{0~)&Kwi07*qoM6N<$g5m&i4gdfE diff --git a/resource_pack/textures/ui/stack_progress_bar_right_side_arrow.png b/resource_pack/textures/ui/stack_progress_bar_right_side_arrow.png index 633fa275d4ac2405998106c25dbd3ca871bfb9bb..7646280a371b10e2a024cb3330e5d0da639d86d3 100644 GIT binary patch literal 279 zcmV+y0qFjTP)GNxo6B5NQ&g7U^mjD}2pT<%^<+a7m+#{?bi3*Y4p z-Fxtpx^DmwLI@`9FunrSY-y;&QJ{4)r literal 857 zcmV-f1E&0mP)001-y1^@s64LCD+0004nX+uL$Nkc;* zaB^>EX>4Tx04R}tkv&MmKp2MKriwpQL@XjAn4vmZ5EXHhDi*;)X)CnqU~=gnG-*gu zTpR`0f`dPcRR9ommw-UeSdCntd3Nn5oB-iz#@HuY36Tei!Ch-gSSD9wlosz$X&VG2O6;H;898 zEuHf|agY@xh4`F!+@K2*KXP4m`HgelVS#4`jZ|WuI7lq!TUc&kRxniJY2uKgYLqXe zT~;`6aaKze*0?8sVIZrmB)Lv&7*Q-ChB!pXsGx`vEQD#-NHLM1^N5Fk$nnR?C6lWN zMveuPp+a)};D7MDw`Oi?(oG6Pfc6*L{ul*1c7b};w!e>UyM6-rpMfi_=`YuS*-z4| zO)Yc;^lk$e*G)~{11@)f!6#iZBuDbo5^_1<{fxdT1N7el-D_^&8s|8D08-Sey{D4^000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2j&SD78@!ajpc&?00C7=L_t(|+U?x2Pr^VH2jEvQ z!5AS_O&pnxgC4#t_q(KfQk!ns%l1``pe&3)fQnp}t1$B(;ky$ApR0002k zp<>g4<3ahRd^GBLHQHocPwD7X0yfEaeS0-jJ{k{qkF!mZPy*781eAR2A_*lRtvcA& zjh^qHR5K$NH&Ks~iJV_A| zDW#-5?3zUg|04m-_h|bk*c^}jH{eq8C5?zVAbB-lJ+FH8ywZqBKr(JXNr(g_zg6)1 zh3fsah=>>uO8XI>(%MeS&E1lojV|bZ`DifY#1^~z=rby jS>}8|000000DyHLqSRER(q0o700000NkvXXu0mjfMMrX( diff --git a/resource_pack/textures/ui/stack_progress_bar_up_arrow.png b/resource_pack/textures/ui/stack_progress_bar_up_arrow.png index f841c3bde70e6efe60023d87a34e308111dcd510..d060d1bfd466cf58cd49bfd806a1c52eae8a3a4a 100644 GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^0YEIp!3HE1F5O-Zq&N#aB8wRqxP?KOkzv*x383I| zPZ!6KjC*fySaLNO2(%_zy9)GhU)$;Vu3m=!!HI^0000q2nGNE01Y@ZcmMzag=s@W zP)S2WAaHVTW@&6?001bFeUUv#!$25@-=>N`R75NyBAB5%Sr8R*lqwd%LTM|s>R@u| zA2ex5Qd}Gb*MfsTi&X~~XI&j!1wrr!#L>w~(M3x9E-AEsi1Ci&9^U)jm%Hx(p;lt5 z*){>Fnq?%S5iy-v6+2$hg#ns<7?GH%$C8UFc#f}o`1pPo=2_l#e~um{Ycjwm63;Q+ zu!uK^XErUJ^FDEq6(oiDoOs-z3lcwaU3U46bKYTrX9kT_VxBliEaqESZedn1RN`sk zkfLgoFQi?6Ryc2QR!bGuxF>&MAgiq;xlU^sQ7j>bI7G;(pokJIglX4EF_ED2h=+g3 z@yE#}ldA|ujs=vVLUR1zfAG7vW^QWIO$tPS_7~g!7zH|ZfqK=pzmILZeggQPfh(=) zFV}$CPtvPREp!C*ZUYzBO-y{D6r zAsBxLbV*G`2j&SD791*3%yUEl00BfvL_t(|+U?vSPs30Y2GCndGD6t00tvF3ARs~U z{{@N!1VPUrX~PUN6hmP{jnV<#J4a2d6?b31yd|$M0ssI2001^9>w4jIR6H9Wt$I;S zx?HzobPTEi+vdBtIv*P!t=sFnd6y>CfDC`50W}|+XhIFhpW5x~Mh`dlrkRk_%d=kY zqX8LA10HBTzW(k%Z9)ymFd8t+vdp;Xn+8Mx5kL??1P}xe0R#a=06_o|KoCF#5PG%t zZkVQN=IG7e>g$8b9 zP`>@1$I{vaXj;dFeK1`E$0KW%=v%-kj5G?CDT#y+F`Cuy{Ig4tO3!0 zTcX%IY}WZ+_3~t{8W0V*-D|=uB32sFnok2lT20vDA2Lhc0O$!u?$Wx#yZ`_I07*qo IM6N<$f=R|>VE_OC diff --git a/resource_pack/ui/_ui_defs.json b/resource_pack/ui/_ui_defs.json index 0346448f3..fbb89d6b1 100644 --- a/resource_pack/ui/_ui_defs.json +++ b/resource_pack/ui/_ui_defs.json @@ -171,7 +171,6 @@ "ui/third_party_store_screen.json", "ui/toast_screen.json", "ui/token_faq_screen.json", - "ui/editor_mode_screen.json", "ui/trial_upsell_screen.json", "ui/ugc_viewer_screen.json", "ui/ui_art_assets_common.json", diff --git a/resource_pack/ui/chat_screen.json b/resource_pack/ui/chat_screen.json index c37a131e8..ef005c4d4 100644 --- a/resource_pack/ui/chat_screen.json +++ b/resource_pack/ui/chat_screen.json @@ -284,7 +284,7 @@ "from_button_id": "button.menu_select", "to_button_id": "$text_edit_box_selected_to_button_id", "handle_select": true, - "handle_deselect": true, + "handle_deselect": false, "mapping_type": "pressed" }, { diff --git a/resource_pack/ui/chat_settings_menu_screen.json b/resource_pack/ui/chat_settings_menu_screen.json index d3d478640..885ab4475 100644 --- a/resource_pack/ui/chat_settings_menu_screen.json +++ b/resource_pack/ui/chat_settings_menu_screen.json @@ -27,6 +27,14 @@ "$focus_override_up": "reset_button_focus_id" }, + "mute_emote_chat_toggle@settings_common.option_toggle": { + "$one_line_layout": true, + "$option_label": "chat.settings.muteEmotes", + + "$option_binding_name": "#toggle_emote_chat", + "$toggle_name": "toggle_emote_chat" + }, + "chat_tts_toggle@settings_common.option_toggle": { "$one_line_layout": true, "$option_label": "chat.settings.tts", @@ -394,6 +402,7 @@ "size": [ "100%", "100%c" ], "controls": [ { "mute_all_toggle@chat_settings.mute_all_toggle": {} }, + { "mute_emote_chat_toggle@chat_settings.mute_emote_chat_toggle": {} }, { "chat_tts_toggle@chat_settings.chat_tts_toggle": {} }, diff --git a/resource_pack/ui/gathering_info_screen.json b/resource_pack/ui/gathering_info_screen.json index 7e630f3a1..7987e9df6 100644 --- a/resource_pack/ui/gathering_info_screen.json +++ b/resource_pack/ui/gathering_info_screen.json @@ -138,7 +138,7 @@ "controls": [ { "scroll@common.scrolling_panel": { - "$scrolling_content": "gathering_info.right_panel_content", + "$scrolling_content": "gathering_info.tts_wrapper", "$scrolling_content_anchor_from": "top_middle", "$scrolling_content_anchor_to": "top_middle", "$show_background": false @@ -150,9 +150,18 @@ ] }, + "tts_wrapper@common.non_interact_focus_border_button": { + "size": [ "100% - 24px", "100%c" ], + "$hover_focus_border_control": "common.empty_panel", + "$pressed_focus_border_control": "common.empty_panel", + "$content_inside": "gathering_info.right_panel_content", + "$border_size": [ "100%", "100%c"], + "tts_inherit_siblings": true + }, + "right_panel_content": { "type": "stack_panel", - "size": [ "100% - 24px", "100%c" ], + "size": [ "100%", "100%c" ], "orientation": "vertical", "use_child_anchors": true, "controls": [ diff --git a/resource_pack/ui/hud_screen.json b/resource_pack/ui/hud_screen.json index 98f76bd0f..10c44356d 100644 --- a/resource_pack/ui/hud_screen.json +++ b/resource_pack/ui/hud_screen.json @@ -379,6 +379,12 @@ "layer": 5 }, + "editor_gizmo_renderer": { + "type": "custom", + "renderer": "editor_gizmo_renderer", + "layer": 1 + }, + "cursor_renderer": { "type": "custom", "size": [ 16, 16 ], @@ -2755,6 +2761,11 @@ } }, { "vignette_rend@vignette_renderer": {} }, + { + "editor_gizmo_rend@editor_gizmo_renderer": { + "ignored": "(not $is_editor_mode_enabled)" + } + }, { "curor_rend@cursor_renderer": {} }, { "game_tip@game_tip.game_tip_panel": { diff --git a/resource_pack/ui/online_safety_screen.json b/resource_pack/ui/online_safety_screen.json index 4db0b5d07..e7bb0bf99 100644 --- a/resource_pack/ui/online_safety_screen.json +++ b/resource_pack/ui/online_safety_screen.json @@ -28,6 +28,15 @@ ], "text": "$safety_description_text" }, + + "ip_safety_description": { + "type": "label", + "size": [ "100%-4px", "default" ], + "color": "$body_text_color", + "$safety_description_text|default": "onlinePlay.untrustedIp.message", + + "text": "$safety_description_text" + }, "online_safety_label_panel@common.scrolling_panel": { "$scrolling_pane_size": [ "100% - 1px", "100% - 3px" ], @@ -40,6 +49,18 @@ "anchor_to": "top_middle", "$always_handle_scrolling": true }, + + "ip_safety_label_panel@common.scrolling_panel": { + "$scrolling_pane_size": [ "100% - 1px", "100% - 3px" ], + "$scrolling_pane_offset": [ 2, 2 ], + "$scrolling_content": "online_safety.ip_safety_description", + "$scroll_size": [ 5, "100% - 4px" ], + "$show_background": false, + "layer": 1, + "anchor_from": "top_middle", + "anchor_to": "top_middle", + "$always_handle_scrolling": true + }, "do_not_show_checkbox@common.checkbox": { "size": [ "100%", 30 ], @@ -124,6 +145,23 @@ "$middle_button_panel": "online_safety.online_safety_proceed_button", "$bottom_button_panel": "online_safety.online_safety_back_button" }, + + "ip_safety_dialog@common_dialogs.main_panel_three_buttons": { + "size": [ 300, 200 ], + "$fill_alpha": 1, + + "layer": 101, + "$text_name": "onlinePlay.untrustedIp.title", + "$description_text": "onlinePlay.untrustedIp.message", + + "$button_size": [ "100%", 30 ], + + "$show_close_button": false, + "$child_control": "online_safety.ip_safety_label_panel", + "$top_button_panel": "online_safety.do_not_show_checkbox", + "$middle_button_panel": "online_safety.online_safety_proceed_button", + "$bottom_button_panel": "online_safety.online_safety_back_button" + }, //-------------------------------------------------------------------------------- @@ -183,5 +221,45 @@ { "online_safety_dialog@online_safety.online_safety_dialog": {} }, { "gamepad_helpers@online_safety.gamepad_helpers": {} } ] + }, + "ip_safety_screen@common.base_screen": { + "force_render_below": false, + "should_be_skipped_during_automation": true, + "$screen_animations": [ + "@common.screen_exit_animation_push_fade", + "@common.screen_exit_animation_pop_fade" + ], + + "button_mappings": [ + { + "from_button_id": "button.menu_cancel", + "to_button_id": "button.menu_exit", + "mapping_type": "global" + } + ], + + "$screen_content": "online_safety.ip_safety_screen_content" + }, + + "ip_safety_screen_content": { + "type": "panel", + "variables": [ + { + "requires": "$desktop_screen", + "$button_state_default_base": "common.button_state_default", + "$button_state_hover_base": "common.button_state_hover", + "$button_state_pressed_base": "common.button_state_pressed" + }, + { + "requires": "$pocket_screen", + "$button_state_default_base": "common-classic.button_state_default", + "$button_state_hover_base": "common-classic.button_state_hover", + "$button_state_pressed_base": "common-classic.button_state_pressed" + } + ], + "controls": [ + { "ip_safety_dialog@online_safety.ip_safety_dialog": {} }, + { "gamepad_helpers@online_safety.gamepad_helpers": {} } + ] } - } +} diff --git a/resource_pack/ui/persona_cast_character_screen.json b/resource_pack/ui/persona_cast_character_screen.json index c70272951..9993ac5c0 100644 --- a/resource_pack/ui/persona_cast_character_screen.json +++ b/resource_pack/ui/persona_cast_character_screen.json @@ -1,21 +1,87 @@ { "namespace": "persona_cast_character_screen", - "popup_dialog__cast_character_preview@persona_cast_character_screen.popup_dialog__cast_character_select": { - "$character_cast_prompt_title": "menu.character_cast.preview_title", - "$close_button_to_button_id": "button.close_entry_prompt_dialog", - "$bottom_button_controls": [ + "cast_modal_bottom_bar": { + "type": "stack_panel", + "orientation": "horizontal", + "size": [ "95%", 32 ], + "offset": [ 0, -6 ], + "layer": 50, + "anchor_from": "bottom_middle", + "anchor_to": "bottom_middle", + + "$cast_modal_bottom_bar_controls|default": [], + "controls": "$cast_modal_bottom_bar_controls" + }, + + "cast_common_dialog_background@common_dialogs.dialog_background_hollow_2": { + "size": [ "100%", "100%" ], + + "$inner_contents|default": "persona_cast_character_screen.cast_character_select_main", + "$inner_contents_size|default": [ "100% - 16px", "100% - 65px" ], + "$inner_contents_offset|default": [ 0, -9.5 ], + + "controls": [ + { "top_bar@persona_cast_character_screen.common_cast_modal_top_bar": {} }, + { + "popup_inner_contents@$inner_contents": { + "size": "$inner_contents_size", + "offset": "$inner_contents_offset" + } + }, + { "cast_modal_bottom_bar@persona_cast_character_screen.cast_modal_bottom_bar": {} } + ] + }, + + "cast_modal_panel": { + "type": "input_panel", + + "$show_close_button": true, + + "controls": [ + { "cast_preview_modal_content@persona_cast_character_screen.cast_common_dialog_background": {} } + ], + "button_mappings": [ + { + "from_button_id": "button.menu_select", + "to_button_id": "button.menu_select", + "mapping_type": "pressed" + }, { - "close_button@common_buttons.light_text_button": { + "from_button_id": "button.menu_ok", + "to_button_id": "button.menu_ok", + "mapping_type": "focused" + } + ] + }, + + "popup_dialog__cast_character_select@persona_cast_character_screen.common_dcast_popup_framework": { + "$cast_modal_bottom_bar_controls": [ + { + "select_button@common_buttons.light_text_button": { "size": [ "100%", "100%" ], - "$pressed_button_name": "button.close_entry_prompt_dialog", - "$button_text": "gui.close" + "$pressed_button_name": "button.cast_select", + "$button_text": "gui.select", + "$focus_override_down": "FOCUS_OVERRIDE_STOP", + "$focus_override_left": "FOCUS_OVERRIDE_STOP", + "$focus_override_right": "FOCUS_OVERRIDE_STOP", + "bindings": [ + { + "binding_name": "#cast_enabled_select", + "binding_name_override": "#enabled" + } + ] } } + ], + + "controls": [ + { "background@persona_cast_character_screen.common_background_blocker": {} }, + { "popup_background@persona_cast_character_screen.cast_modal_panel": { "size": [ "57%", "90%" ] } } ] }, - "popup_dialog__cast_character_select@popup_dialog.popup_dialog": { + "common_dcast_popup_framework@popup_dialog.popup_dialog": { "size": [ "100%", "100%" ], "layer": 500, "$section_content_size": [ "100%", "100% - 16px" ], @@ -60,108 +126,31 @@ "mapping_type": "global", "scope": "view" } - ], - "controls": [ - { - "background@profile.modal_window_input_blocker": { - "controls": [ - { - "modal_background_button": { - "type": "button", - "size": [ "100%", "100%" ], - "button_mappings": [ - { - "from_button_id": "button.menu_select", - "to_button_id": "$close_button_to_button_id", - "mapping_type": "pressed" - }, - { - "from_button_id": "button.menu_ok", - "to_button_id": "$close_button_to_button_id", - "mapping_type": "focused" - } - ] - } - } - ] - } - }, - { - "popup_background@persona_cast_character_screen.popup_cast_character_select_bg": { - "anchor_from": "center", - "anchor_to": "center", - "$show_close_button": true, - "size": [ "57%", "88%" ] - } - } ] }, - "popup_cast_character_select_bg@common_dialogs.dialog_background_hollow_2": { - "size": [ "100%", "50%" ], - "$section_content_size": [ "100%", "100% - 16px" ], - + "common_cast_modal_top_bar": { + "type": "panel", + "anchor_from": "top_left", + "anchor_to": "top_left", + "size": [ "100%", "100%c" ], + "layer": 2, + "$close_button_offset": [ 0, 0 ], + "$use_compact_close_button": false, "$character_cast_prompt_title|default": "menu.character_cast.select_title", - "controls": [ { - "top_bar": { - "type": "panel", - "anchor_from": "top_left", - "anchor_to": "top_left", - "size": [ "100%", "100%c" ], + "title_panel": { + "type": "label", + "text": "$character_cast_prompt_title", "layer": 2, - "$close_button_offset": [ 0, 0 ], - "$use_compact_close_button": false, - "controls": [ - { - "title_panel": { - "type": "label", - "text": "$character_cast_prompt_title", - "layer": 2, - "offset": [ 0, 8 ], - "color": "$profile_create_character_selected_color", - "anchor_from": "top_middle", - "anchor_to": "top_middle" - } - }, - { "close_button_holder@common_dialogs.common_close_button_holder": {} } - ] + "offset": [ 0, 8 ], + "color": "$profile_create_character_selected_color", + "anchor_from": "top_middle", + "anchor_to": "top_middle" } }, - { - "popup_inner_contents@persona_cast_character_screen.cast_character_select_main": {} - }, - { - "popup_bottom_bar": { - "type": "panel", - "size": [ "95%", 32 ], - "offset": [ 0, -6 ], - "layer": 50, - "anchor_from": "bottom_middle", - "anchor_to": "bottom_middle", - - "$bottom_button_controls|default": [ - { - "select_button@common_buttons.light_text_button": { - "size": [ "100%", "100%" ], - "$pressed_button_name": "button.cast_select", - "$button_text": "gui.select", - "$focus_override_down": "FOCUS_OVERRIDE_STOP", - "$focus_override_left": "FOCUS_OVERRIDE_STOP", - "$focus_override_right": "FOCUS_OVERRIDE_STOP", - "bindings": [ - { - "binding_name": "#cast_enabled_select", - "binding_name_override": "#enabled" - } - ] - } - } - ], - "controls": "$bottom_button_controls" - } - } + { "close_button_holder@common_dialogs.common_close_button_holder": {} } ] }, @@ -173,12 +162,12 @@ "offset": [ 0, -9.5 ], "controls": [ { - "background_image": { + "modal_inner_background": { "type": "image", "size": [ "100%", "100%" ], "texture": "textures/ui/White", "color": "black", - "alpha": 0.8 + "alpha": 1.0 } }, { @@ -207,17 +196,16 @@ "focus_navigation_mode_right": "stop", "focus_navigation_mode_up": "stop", - "$scroll_size": [ 5, "100% - 4px" ], - "$scrolling_content": "persona_cast_character_screen.cast_grid_with_buttons", - "$comment_panel_size": [ "40% - 1px", "100%c" ], - "$scroll_view_port_size|default": [ "100% - 2px", "100%" ], - "$scroll_view_port_size_touch|default": [ "100% - 2px", "100%" ] + "$scroll_size": [ 2, "100% - 4px" ], + "$scrolling_content": "persona_cast_character_screen.cast_grid_panel", + "$scroll_view_port_size": [ "100%", "100%" ], + "$scroll_view_port_size_touch": [ "100%", "100%" ] }, "cast_grid_with_buttons": { "type": "stack_panel", "orientation": "vertical", - "size": [ "100%-1px", "100%c" ], + "size": [ "100% - 4px", "100%c" ], "controls": [ { "top_spacing": { @@ -233,7 +221,6 @@ "grid_dimension_binding": "#cast_character_options_dimensions", "collection_name": "cast_character_options", "$cast_single_character_collection_name": "cast_character_options", - "bindings": [ { "binding_type": "global", @@ -251,6 +238,15 @@ ] }, + "cast_grid_panel": { + "type": "panel", + "size": [ "100%", "100%" ], + "min_size": [ "100%", "100%c" ], + "controls": [ + { "cast_grid@persona_cast_character_screen.cast_grid_with_buttons": {} } + ] + }, + "cast_single_character_button_panel": { "type": "panel", "size": [ "33%", "100%x" ], @@ -463,5 +459,521 @@ "button_up_right_of_first_refusal": true } ] + }, + + "common_background_blocker@profile.modal_window_input_blocker": { + "controls": [ + { + "modal_background_button": { + "type": "button", + "size": [ "100%", "100%" ], + "button_mappings": [ + { + "from_button_id": "button.menu_select", + "to_button_id": "$close_button_to_button_id", + "mapping_type": "pressed" + }, + { + "from_button_id": "button.menu_ok", + "to_button_id": "$close_button_to_button_id", + "mapping_type": "focused" + } + ] + } + } + ] + }, + + "common_preview_page_framework@persona_cast_character_screen.common_dcast_popup_framework": { + "$close_button_to_button_id": "button.close_entry_prompt_dialog", + + "$cast_modal_bottom_bar_controls": [ + { + "left_bottom_button@common_buttons.light_text_button": { + "size": [ "fill", "100%" ], + "$pressed_button_name": "button.cast_left_select", + "$left_button_text|default": "", + "$button_text": "$left_button_text", + "$focus_override_down": "FOCUS_OVERRIDE_STOP", + "$focus_override_left": "FOCUS_OVERRIDE_STOP", + "bindings": [ + { + "binding_name": "#cast_enabled_select", + "binding_name_override": "#enabled" + } + ] + } + }, + { + "padding": { + "type": "panel", + "size": [ 4, "100%" ] + } + }, + { + "right_bottom_button@common_buttons.light_text_button": { + "size": [ "fill", "100%" ], + "$pressed_button_name": "button.cast_right_select", + "$right_button_text|default": "", + "$button_text": "$right_button_text", + "$focus_override_down": "FOCUS_OVERRIDE_STOP", + "$focus_override_right": "FOCUS_OVERRIDE_STOP", + "bindings": [ + { + "binding_name": "#cast_enabled_select", + "binding_name_override": "#enabled" + } + ] + } + } + ], + + "controls": [ + { "background@persona_cast_character_screen.common_background_blocker": {} }, + { "cast_preview_modal@persona_cast_character_screen.cast_modal_panel": { "size": [ "71.40625%", "90%" ] } } + ], + + "button_mappings": [ + { + "from_button_id": "button.menu_cancel", + "to_button_id": "$close_button_to_button_id", + "mapping_type": "global" + }, + { + "from_button_id": "button.menu_ok", + "to_button_id": "button.menu_ok", + "mapping_type": "focused" + }, + { + "from_button_id": "button.menu_select", + "to_button_id": "button.menu_select", + "mapping_type": "pressed" + }, + { + "from_button_id": "button.menu_left", + "to_button_id": "button.menu_left", + "mapping_type": "global", + "scope": "view" + }, + { + "from_button_id": "button.menu_right", + "to_button_id": "button.menu_right", + "mapping_type": "global", + "scope": "view" + }, + { + "from_button_id": "button.menu_up", + "to_button_id": "button.menu_up", + "mapping_type": "global", + "scope": "view" + }, + { + "from_button_id": "button.menu_down", + "to_button_id": "button.menu_down", + "mapping_type": "global", + "scope": "view" + } + ] + }, + + "cast_preview_page_one@persona_cast_character_screen.common_preview_page_framework": { + "$character_cast_prompt_title": "menu.character_cast.ftue_title", + "$left_button_text": "dr.button.ok", + "$right_button_text": "menu.character_cast.see_how_to_select_one", + "$inner_contents": "persona_cast_character_screen.cast_preview_page_one_inner_section" + }, + + "cast_preview_page_two@persona_cast_character_screen.common_preview_page_framework": { + "$character_cast_prompt_title": "menu.character_cast.ftue_title", + "$left_button_text": "gui.back", + "$right_button_text": "menu.character_cast.go_to_dressing_room", + "$inner_contents": "persona_cast_character_screen.cast_preview_page_two_inner_section" + }, + + "cast_preview_page_one_inner_section": { + "type": "panel", + + "$next_page_button_event": "button.cast_subpage_right", + "$prev_page_button_event": "button.cast_subpage_left", + + "controls": [ + { + "modal_inner_background": { + "type": "image", + "size": [ "100%", "100%" ], + "texture": "textures/ui/White", + "color": "black", + "alpha": 1.0 + } + }, + { + "cast_content": { + "type": "input_panel", + "size": [ "100%", "100%" ], + "controls": [ + { + "cast_image_cycler@common.image_cycler": { + "size": [ "80%", "100%" ], + "images": [ + { + "texture_path": "textures/ui/default_cast/ftue/00_dcast_lineup.png" + }, + { + "texture_path": "textures/ui/default_cast/ftue/01_dcast_lineup_zuri.png" + }, + { + "texture_path": "textures/ui/default_cast/ftue/02_dcast_lineup_noor.png" + }, + { + "texture_path": "textures/ui/default_cast/ftue/03_dcast_lineup_kai.png" + }, + { + "texture_path": "textures/ui/default_cast/ftue/04_dcast_lineup_ari.png" + }, + { + "texture_path": "textures/ui/default_cast/ftue/05_dcast_lineup_steve.png" + }, + { + "texture_path": "textures/ui/default_cast/ftue/06_dcast_lineup_alex.png" + }, + { + "texture_path": "textures/ui/default_cast/ftue/07_dcast_lineup_efe.png" + }, + { + "texture_path": "textures/ui/default_cast/ftue/08_dcast_lineup_makena.png" + }, + { + "texture_path": "textures/ui/default_cast/ftue/09_dcast_lineup_sunny.png" + } + ] + } + }, + { + "cast_vertical_panel": { + "type": "stack_panel", + "orientation": "vertical", + "size": [ "100%", "34%" ], + "anchor_from": "bottom_left", + "anchor_to": "bottom_left", + "controls": [ + { + "controls_label_panel": { + "type": "panel", + "size": [ "100%", "100%c" ], + "controls": [ + { + "text_cycler@common.text_cycler": { + "size": [ "100% - 4px", "default" ], + "layer": 2, + "offset": [ 0, 8 ], + "text_alignment": "center", + "target_cycler_to_compare": "cast_image_cycler", + "text_labels": [ + "menu.character_cast.ftue_page1", + "skin.Standard.Zuri", + "skin.Standard.Noor", + "skin.Standard.Kai", + "skin.Standard.Ari", + "skin.Standard.Steve", + "skin.Standard.Alex", + "skin.Standard.Efe", + "skin.Standard.Makena", + "skin.Standard.Sunny" + ] + } + } + ] + } + }, + { + "buffer_panel": { + "type": "panel", + "size": [ "100%", 6 ] + } + }, + { "controls_shoulder_button_display_panel@persona_cast_character_screen.ftue_subpage_indicator_panel": {} } + ] + } + } + ] + } + } + ] + }, + + "chevron_image_panel": { + "type": "panel", + "size": [ "100%", "100%" ], + "controls": [ + { "chevron_image@common.chevron_image": { "color": "$text_color" } } + ] + }, + + "chevron_button@common_buttons.light_content_button": { + "consume_event": false, + "$button_content": "persona_cast_character_screen.chevron_image_panel", + + "$use_right_chevron|default": false, + "$chevron_visible_source_control|default": "gamepad_helper_left_bumper", + "$chevron_image_name|default": "textures/ui/chevron_left", + "variables": [ + { + "requires": "$use_right_chevron", + "$chevron_visible_source_control": "gamepad_helper_right_bumper", + "$chevron_image_name": "textures/ui/chevron_right" + } + ], + + "button_mappings": [ + { + "from_button_id": "button.menu_select", + "to_button_id": "$pressed_button_name", + "mapping_type": "pressed", + "scope": "global" + }, + { + "from_button_id": "button.menu_ok", + "to_button_id": "$pressed_button_name", + "mapping_type": "focused", + "scope": "global" + } + ], + + "bindings": [ + { + "binding_type": "view", + "source_control_name": "$chevron_visible_source_control", + "source_property_name": "(not #visible)", + "target_property_name": "#visible", + "resolve_sibling_scope": true + } + ] + }, + + "shift_page_panel": { + "type": "panel", + "size": [ 30, "100%" ], + "$focus_wrap_enabled": false, + "controls": [ + { + "centering_panel": { + "type": "panel", + "size": [ "100%", 25 ], + "controls": "$shift_page_controls" + } + } + ] + }, + + "shift_page_left_panel@persona_cast_character_screen.shift_page_panel": { + "$pressed_button_name": "button.cast_subpage_left", + + "$focus_id": "shift_page_left_button", + "$focus_override_right": "shift_page_right_button", + "$focus_override_up": "FOCUS_OVERRIDE_STOP", + + "$shift_page_controls": [ + { "gamepad_helper_left_bumper@common.gamepad_helper_left_bumper": {} }, + { "left_chevron_button@persona_cast_character_screen.chevron_button": {} } + ] + }, + + "shift_page_right_panel@persona_cast_character_screen.shift_page_panel": { + "$pressed_button_name": "button.cast_subpage_right", + "$use_right_chevron": true, + + "$focus_id": "shift_page_right_button", + "$focus_override_left": "shift_page_left_button", + "$focus_override_up": "FOCUS_OVERRIDE_STOP", + + "$shift_page_controls": [ + { "gamepad_helper_right_bumper@common.gamepad_helper_right_bumper": {} }, + { "right_chevron_button@persona_cast_character_screen.chevron_button": {} } + ] + }, + + "horizontal_8px_padding": { + "type": "panel", + "size": [ 8, "100%" ] + }, + + "horizontal_20px_padding": { + "type": "panel", + "size": [ 20, "100%" ] + }, + + "ftue_subpage_indicator_panel": { + "type": "panel", + "size": [ "100%", "fill" ], + "controls": [ + { + "controls_shoulder_button_display": { + "type": "stack_panel", + "orientation": "horizontal", + "size": [ "100%", "100%" ], + "controls": [ + { "left_padding@persona_cast_character_screen.horizontal_20px_padding": {} }, + { "left_shoulder_button_panel@persona_cast_character_screen.shift_page_left_panel": {} }, + { "left_shoulder_button_padding@persona_cast_character_screen.horizontal_8px_padding": {} }, + { + "page_indicator_grid": { + "type": "grid_page_indicator", + "size": [ "fill", "100%" ], + "grid_item_template": "persona_cast_character_screen.individaul_cast_page_indicator", + "grid_item_when_current": "panel_when_current_page", + "grid_item_when_not_current": "panel_when_not_current_page", + "collection_name": "cast_page_indicator", + "cycler_manager_size_control_target": "cast_image_cycler" + } + }, + { "right_shoulder_button_padding@persona_cast_character_screen.horizontal_8px_padding": {} }, + { "right_shoulder_button_panel@persona_cast_character_screen.shift_page_right_panel": {} }, + { "right_padding@persona_cast_character_screen.horizontal_20px_padding": {} } + ] + } + } + ] + }, + + "individaul_cast_page_indicator": { + "type": "panel", + "size": [ "fill", "100%" ], + "alpha": 0.8, + "controls": [ + { + "panel_when_current_page": { + "type": "panel", + "size": [ "100%", "100%" ], + "controls": [ + { + "panel_with_padding": { + "type": "panel", + "size": [ 6, 6 ], + "controls": [ + { + "cast_dot": { + "type": "image", + "size": [ 4, 4 ], + "texture": "textures/ui/White", + "color": "white" + } + } + ] + } + } + ] + } + }, + { + "panel_when_not_current_page": { + "type": "panel", + "size": [ "100%", "100%" ], + "controls": [ + { + "panel_with_padding": { + "type": "panel", + "size": [ 6, 6 ], + "controls": [ + { + "cast_dot": { + "type": "image", + "size": [ 4, 4 ], + "texture": "textures/ui/White", + "alpha": 0.5 + } + } + ] + } + } + ] + } + } + ] + }, + + "how_to_section": { + "type": "stack_panel", + "orientation": "vertical", + "size": [ "48.5%", "100%" ], + + "controls": [ + { + "how_to_image": { + "type": "image", + "size": [ "100%", "75%" ], + "texture": "$how_to_image", + "keep_ratio": false + } + }, + { + "how_to_label_section": { + "type": "panel", + "size": [ "100%", "fill" ], + "controls": [ + { + "how_to_label": { + "type": "label", + "size": [ "100% - 4px", "default" ], + "max_size": [ "100% - 4px", "100% - 4px" ], + "layer": 2, + "font_size": "$instruction_text_size", + "color": "$generic_button_text_color", + "text": "$how_to_text" + } + } + ] + } + } + ] + }, + + "cast_preview_page_two_inner_section": { + "type": "image", + "size": [ "100%", "100%" ], + "texture": "textures/ui/white_background", + "fill": true, + "color": "black", + + "$instruction_text_size": "normal", + + "controls": [ + { + "how_to_section_stack": { + "type": "stack_panel", + "orientation": "horizontal", + "size": [ "100%", "100%" ], + "controls": [ + { + "how_to_section_left@persona_cast_character_screen.how_to_section": { + "$how_to_image": "textures/ui/default_cast/ftue/how_to_left_image", + "$how_to_text": "menu.character_cast.ftue_page2_left" + } + }, + { + "divider_panel": { + "type": "panel", + "size": [ "fill", "100% + 2px" ], + "controls": [ + { + "divider": { + "type": "image", + "offset": [ 0, -1 ], + "layer": 3, + "texture": "textures/ui/default_cast/ftue/how_to_page_divider" + } + } + ] + } + }, + { + "how_to_section_right@persona_cast_character_screen.how_to_section": { + "$how_to_image": "textures/ui/default_cast/ftue/how_to_right_image", + "$how_to_text": "menu.character_cast.ftue_page2_right" + } + } + ] + } + } + ] } } diff --git a/resource_pack/ui/persona_common.json b/resource_pack/ui/persona_common.json index 504ed1b93..a566c7ae5 100644 --- a/resource_pack/ui/persona_common.json +++ b/resource_pack/ui/persona_common.json @@ -381,7 +381,7 @@ { "keyboard_2@common.keyboard_helper_keys": { "size": "$keyboard_helper_size", - "offset": [ "50% + 10px", 0 ], + "offset": [ "50% + 20px", 0 ], "$keyboard_character": "keyboard.keyName.2", "$text_color": "$generic_button_text_color" } @@ -398,7 +398,7 @@ { "keyboard_4@common.keyboard_helper_keys": { "size": "$keyboard_helper_size", - "offset": [ "-50% - 10px", 0 ], + "offset": [ "-50% - 20px", 0 ], "$keyboard_character": "keyboard.keyName.4", "$text_color": "$generic_button_text_color" } @@ -430,7 +430,7 @@ }, { "gamepad_b@common.gamepad_helper_b": { - "offset": [ "50% + 9px", 0 ] + "offset": [ "50% + 19px", 0 ] } }, { @@ -440,7 +440,7 @@ }, { "gamepad_x@common.gamepad_helper_x": { - "offset": [ "-50% - 9px", 0 ] + "offset": [ "-50% - 19px", 0 ] } } ] @@ -515,6 +515,12 @@ "$slice_count|default": 1, "$inner_radius|default": 0.0, "$outer_radius|default": 1.0, + + "$gamepad_bottom_button_name|default": "('button.select_' + $gamepad_bottom_emote_name)", + "$gamepad_top_button_name|default": "('button.select_' + $gamepad_top_emote_name)", + "$gamepad_left_button_name|default": "('button.select_' + $gamepad_left_emote_name)", + "$gamepad_right_button_name|default": "('button.select_' + $gamepad_right_emote_name)", + "$select_button_name|default": "", "$hover_button_name|default": "", "$analog_button_name|default": "", @@ -558,11 +564,6 @@ "to_button_id": "$select_button_name", "mapping_type": "pressed" }, - { - "from_button_id": "button.menu_ok", - "to_button_id": "$select_button_name", - "mapping_type": "focused" - }, { "from_button_id": "$analog_button_name", "to_button_id": "$analog_button_name", @@ -574,43 +575,43 @@ }, { "from_button_id": "button.controller_secondary_select", - "to_button_id": "button.select_emote_slot_0", + "to_button_id": "$gamepad_top_button_name", "mapping_type": "global" }, { "from_button_id": "button.menu_cancel", - "to_button_id": "button.select_emote_slot_1", + "to_button_id": "$gamepad_right_button_name", "input_mode_condition": "gamepad_and_not_gaze", "mapping_type": "pressed" }, { "from_button_id": "button.menu_ok", - "to_button_id": "button.select_emote_slot_2", + "to_button_id": "$gamepad_bottom_button_name", "mapping_type": "global" }, { "from_button_id": "button.menu_clear", - "to_button_id": "button.select_emote_slot_3", + "to_button_id": "$gamepad_left_button_name", "mapping_type": "global" }, { "from_button_id": "button.slot1", - "to_button_id": "button.select_emote_slot_0", + "to_button_id": "$gamepad_top_button_name", "mapping_type": "global" }, { "from_button_id": "button.slot2", - "to_button_id": "button.select_emote_slot_1", + "to_button_id": "$gamepad_right_button_name", "mapping_type": "global" }, { "from_button_id": "button.slot3", - "to_button_id": "button.select_emote_slot_2", + "to_button_id": "$gamepad_bottom_button_name", "mapping_type": "global" }, { "from_button_id": "button.slot4", - "to_button_id": "button.select_emote_slot_3", + "to_button_id": "$gamepad_left_button_name", "mapping_type": "global" } ], @@ -633,6 +634,8 @@ "$hover_button_name": "button.emote_hovered", "$analog_button_name": "button.emote_hovered_via_analog", + "size": ["110%", "110%"], + "$button_focus_precedence": 10, "focus_identifier": "emote_wheel", "focus_change_left": "FOCUS_OVERRIDE_STOP", @@ -648,19 +651,19 @@ { "emote_slot_0_content@persona_common.emote_wheel_slot_content": { "$emote_slot_index": 0, - "$emote_slot_name": "emote_slot_0", + "$emote_slot_name": "$gamepad_top_emote_name", "$wheel_state_texture": "textures/ui/emote_wheel_updated_select_0", - "$emote_image_offset": [ 0, "-33.57%" ], - "$emote_touch_label_offset": [ 0, "-50%y - 50% - 3px" ], + "$emote_image_offset": [ 0, "-30%" ], + "$emote_touch_label_offset": [ 0, "-50% - 3px" ], "$emote_touch_label_alignment": "center" } }, { "emote_slot_1_content@persona_common.emote_wheel_slot_content": { "$emote_slot_index": 1, - "$emote_slot_name": "emote_slot_1", + "$emote_slot_name": "$gamepad_right_emote_name", "$wheel_state_texture": "textures/ui/emote_wheel_updated_select_1", - "$emote_image_offset": [ "32.8125%", 0 ], + "$emote_image_offset": [ "33%", 0 ], "$emote_touch_label_offset": [ "50%x + 50% + 3px", 0 ], "$emote_touch_label_alignment": "left" } @@ -668,35 +671,51 @@ { "emote_slot_2_content@persona_common.emote_wheel_slot_content": { "$emote_slot_index": 2, - "$emote_slot_name": "emote_slot_2", + "$emote_slot_name": "$gamepad_bottom_emote_name", "$wheel_state_texture": "textures/ui/emote_wheel_updated_select_2", - "$emote_image_offset": [ 0, "33.57%" ], - "$emote_touch_label_offset": [ 0, "50%y + 50% + 3px" ], + "$emote_image_offset": [ 0, "30%" ], + "$emote_touch_label_offset": [ 0, "50% + 3px" ], "$emote_touch_label_alignment": "center" } }, { "emote_slot_3_content@persona_common.emote_wheel_slot_content": { "$emote_slot_index": 3, - "$emote_slot_name": "emote_slot_3", + "$emote_slot_name": "$gamepad_left_emote_name", "$wheel_state_texture": "textures/ui/emote_wheel_updated_select_3", - "$emote_image_offset": [ "-32.8125%", 0 ], + "$emote_image_offset": [ "-33%", 0 ], "$emote_touch_label_offset": [ "-50%x - 50% - 3px", 0 ], "$emote_touch_label_alignment": "right" } } ], "state_controls": [ - "default_state", - "emote_slot_0", - "emote_slot_1", - "emote_slot_2", - "emote_slot_3" + { + "control_name": "default_state" + }, + { + "control_name": "$gamepad_top_emote_name" + }, + { + "control_name": "$gamepad_right_emote_name" + }, + { + "control_name": "$gamepad_bottom_emote_name" + }, + { + "control_name": "$gamepad_left_emote_name" + } ] }, "emote_wheel_panel@common_dialogs.main_panel": { "size": [ "100%y", "100%" ], + + "$gamepad_top_emote_name": "emote_slot_0", + "$gamepad_right_emote_name": "emote_slot_1", + "$gamepad_bottom_emote_name": "emote_slot_2", + "$gamepad_left_emote_name": "emote_slot_3", + "controls": [ { "emote_name@persona_common.emote_label": { diff --git a/resource_pack/ui/play_screen.json b/resource_pack/ui/play_screen.json index 3cd525700..55ec9d9cc 100644 --- a/resource_pack/ui/play_screen.json +++ b/resource_pack/ui/play_screen.json @@ -4153,6 +4153,7 @@ }, { "join_by_code_button@play.join_by_code_button": { + "ignored": "$is_editor_mode_enabled", "size": [ "fill", 30 ] } }, @@ -5523,6 +5524,7 @@ }, { "joinable_realms_panel": { + "ignored": "$is_editor_mode_enabled", "type": "stack_panel", "size": [ "100%", "100%c" ], "$tts_section_header": "playscreen.joinableRealms", @@ -7505,40 +7507,12 @@ "focus_change_right": "FOCUS_OVERRIDE_STOP" }, - "editor_tab_navigation_panel_layout@play.common_tab_navigation_panel_layout": { - "controls": [ - { - "world_navigation_tab@play.world_navigation_tab": { - "size": [ "33%", "100%" ] - } - }, - { - "server_navigation_tab@play.server_navigation_tab": { - "size": [ "33%", "100%" ] - } - } - ] - }, - "editor_server_content_panel": { "type": "stack_panel", "orientation": "vertical", "size": [ "100%", "100%c" ], "$focus_id": "left_panel", "controls": [ - { - "lan_servers_panel@play.lan_servers_scroll_content": {} - }, - { - "servers_divider@common.horizontal_divider": { - "bindings": [ - { - "binding_name": "#lan_grid_visible", - "binding_name_override": "#visible" - } - ] - } - }, { "more_servers_panel@play.manually_added_servers_scrolling_content": {} } @@ -7549,12 +7523,13 @@ "$server_scroll_panel_content": "play.editor_server_content_panel", "controls": [ { "worlds_tab_content@play.worlds_tab_content_panel": {} }, + { "friends_tab_content@play.friends_tab_content_panel": {} }, { "server_tab_content_panel@play.server_tab_content_panel": {} } ] }, "editor_play_screen_panel@play.play_screen_panel": { - "$navigation_tab": "play.editor_tab_navigation_panel_layout", + "$navigation_tab": "play.default_tab_navigation_panel_layout", "$tab_content_panel": "play.editor_tab_content_panel_layout" } } diff --git a/resource_pack/ui/profile_screen.json b/resource_pack/ui/profile_screen.json index 646b41633..94cf2d463 100644 --- a/resource_pack/ui/profile_screen.json +++ b/resource_pack/ui/profile_screen.json @@ -782,7 +782,6 @@ "edit_appearance_button@common_buttons.light_text_button": { "size": [ 132, 22 ], - "layer": "$always_show_layer", "$pressed_button_name": "button.edit_appearance_preset", "$button_font_scale_factor": 1.0, "$new_ui_label_offset": [ 0, 3 ], @@ -1430,8 +1429,10 @@ "popup_frame@common.dialog_background_hollow_2": { "$ignore_close_button|default": false, - "$close_button_visible_binding_name": "(not #is_using_gamepad)", + "$show_close_button": true, + "$close_button_offset": [ -2, 2 ], "$close_button_visible_binding_type": "global", + "controls": [ { "title_label@profile.differences_popup_title": {} }, { "close_button@common.close_button": { "ignored": "$ignore_close_button" } }, @@ -1909,7 +1910,8 @@ "delete_persona": "@profile.popup_dialog__delete_persona", "create_persona": "@profile.popup_dialog__create_persona", "cast_character_select_popup": "@persona_cast_character_screen.popup_dialog__cast_character_select", - "cast_character_preview": "@persona_cast_character_screen.popup_dialog__cast_character_preview" + "cast_character_preview_page_one": "@persona_cast_character_screen.cast_preview_page_one", + "cast_character_preview_page_two": "@persona_cast_character_screen.cast_preview_page_two" } } } @@ -1927,6 +1929,10 @@ "profile_screen@common.base_screen": { "$safezone_screen_matrix_layer": 20, "$ignore_inventory_button": true, + "$show_close_button": true, + "$close_button_visible_binding_type": "global", + "$close_button_offset": [ -2, 2 ], + "button_mappings": [ { "from_button_id": "button.menu_cancel", // controller_B diff --git a/resource_pack/ui/settings_screen.json b/resource_pack/ui/settings_screen.json index f6dde44ea..d3675f413 100644 --- a/resource_pack/ui/settings_screen.json +++ b/resource_pack/ui/settings_screen.json @@ -219,6 +219,7 @@ }, { "view_subscriptions_button@general_section.view_subscriptions_button": { + "ignored": "$is_editor_mode_enabled", "$toggle_group_forced_index": "$view_subscriptions_forced_index", "$tts_section_header": "$general_section_header", "bindings": [ @@ -397,7 +398,7 @@ { "video_section@general_section.video_section": { "visible": false } }, { "view_subscriptions_section@general_section.view_subscriptions_section": { - "ignored": "$education_edition", + "ignored": "($education_edition or $is_editor_mode_enabled)", "visible": false } }, diff --git a/resource_pack/ui/settings_sections/controls_section.json b/resource_pack/ui/settings_sections/controls_section.json index 349b7a416..1d36368be 100644 --- a/resource_pack/ui/settings_sections/controls_section.json +++ b/resource_pack/ui/settings_sections/controls_section.json @@ -392,12 +392,22 @@ } }, { - "option_toggle_hide_keyboard_tooltips@settings_common.option_toggle": { + "option_toggle_show_keyboard_prompts@settings_common.option_toggle": { "ignored": "(not $education_edition)", - "$option_label": "options.hideKeyboardTooltips", - "$option_binding_name": "#hide_keyboard_tooltips", + "$option_label": "options.showKeyboardPrompts", + "$option_binding_name": "#show_keyboard_prompts", "$option_enabled_binding_name": "#hint_toggles_enabled", - "$toggle_name": "hide_keyboard_tooltips", + "$toggle_name": "show_keyboard_prompts", + "$focus_override_right": "FOCUS_OVERRIDE_STOP" + } + }, + { + "option_toggle_show_learning_prompts@settings_common.option_toggle": { + "ignored": "(not $education_edition)", + "$option_label": "options.showLearningPrompts", + "$option_binding_name": "#show_learning_prompts", + "$option_enabled_binding_name": "#hint_toggles_enabled", + "$toggle_name": "show_learning_prompts", "$focus_override_right": "FOCUS_OVERRIDE_STOP" } }, @@ -1147,6 +1157,20 @@ ] } }, + { + "option_creative_delayed_block_breaking@settings_common.option_toggle": { + "$option_label": "options.creativeDelayedBlockBreaking", + "$option_binding_name": "#creative_delayed_block_breaking", + "$option_enabled_binding_name": "#creative_delayed_block_breaking_enabled", + "$toggle_name": "creative_delayed_block_breaking", + "bindings": [ + { + "binding_name": "(not #crosshair_action_button_on)", + "binding_name_override": "#visible" + } + ] + } + }, { "option_slider_thumbstick_opacity@settings_common.option_slider": { "$option_label": "#thumbstick_opacity_slider_label", diff --git a/resource_pack/ui/settings_sections/general_section.json b/resource_pack/ui/settings_sections/general_section.json index 9f633fecb..26851a015 100644 --- a/resource_pack/ui/settings_sections/general_section.json +++ b/resource_pack/ui/settings_sections/general_section.json @@ -6041,7 +6041,7 @@ } }, { - // Should be close to Feature Toggle options (right after option_toggle_0_0) + // Should be close to Feature Toggle options (right after option_toggle_0_0) "option_slider_side_by_side_comparison_rate@settings_common.option_slider": { "$option_label": "#dev_side_by_side_comparison_rate_slider_label", "$slider_name": "dev_side_by_side_comparison_rate", @@ -6162,6 +6162,7 @@ }, { "option_dropdown_identity_mode@settings_common.option_dropdown": { + "ignored": "((not $education_edition) or $is_android)", "$option_label": "options.dev_identityMode", "$dropdown_content": "general_section.dev_identityMode_content", "$option_enabled_binding_name": "#dev_identity_mode_dropdown_enabled", @@ -6680,6 +6681,12 @@ "$button_text": "Reset Online Safety Dialog Option" } }, + { + "reset_ip_safety_option@settings_common.action_button": { + "$pressed_button_name": "button.dev_reset_ip_safety_option", + "$button_text": "Reset IP Safety Dialog Option" + } + }, { "reset_cloud_upload_option@settings_common.action_button": { "$pressed_button_name": "button.dev_reset_cloud_upload_option", @@ -7170,6 +7177,12 @@ "$button_text": "Open Ore UI Test Screens" } }, + { + "open_ore_ui_perf@settings_common.action_button": { + "$pressed_button_name": "button.open_ore_ui_perf", + "$button_text": "Open Ore UI Performance Screens" + } + }, { "open_ore_ui_test_modal@settings_common.action_button": { "$pressed_button_name": "button.open_ore_ui_test_modal", diff --git a/resource_pack/ui/settings_sections/world_section.json b/resource_pack/ui/settings_sections/world_section.json index f71945026..32b363204 100644 --- a/resource_pack/ui/settings_sections/world_section.json +++ b/resource_pack/ui/settings_sections/world_section.json @@ -457,69 +457,6 @@ } ], "controls": [ - { - // 2021-11-25 v-raskal, adding this button and dividier for the duration - // of the Ore UI Create New World screen opt-in beta testing. Once the - // beta phase is over this button and divider should be removed - "new_ui_switch_button_options_panel": { - "type": "stack_panel", - "ignored": "$education_edition", - "orientation": "vertical", - "size": [ "100%", "100%c + 4px" ], - "bindings": [ - { - "binding_name": "#show_new_cnw_beta_opt_in", - "binding_name_override": "#visible" - } - ], - "controls": [ - { - "option_info_label@settings_common.option_group_label": { - "$text": "options.newUiCreateNewWorld.title" - } - }, - { - "option_text_label@settings_common.option_group_label": { - "$text": "options.newUiCreateNewWorld.info" - } - }, - { - "unlock_template_options_button@settings_common.action_button": { - "size": [ "100%", 30 ], - "$button_text": "options.newUiCreateNewWorld.initiate", - "$pressed_button_name": "switch_to_new_ui_create_new_world", - "$focus_override_right": "FOCUS_OVERRIDE_STOP" - } - } - ] - } - }, - { - "dividerNewUiSwitchButton": { - "type": "panel", - "size": [ "100%", "100%c + 14px" ], - "bindings": [ - { - "binding_name": "#show_new_cnw_beta_opt_in", - "binding_name_override": "#visible" - } - ], - "controls": [ - { - "section_divider": { - "type": "image", - "size": [ "100% - 30px", 1 ], - "anchor_from": "center", - "anchor_to": "center", - "layer": 3, - "texture": "textures/ui/list_item_divider_line_light" - } - } - ] - } - }, - - { "unlock_template_options_panel": { "type": "stack_panel", @@ -588,6 +525,44 @@ "$allow_data_binding": false } }, + + // Project tag header when in Editor + { + "project_section_divider_1": { + "ignored": "(not $is_editor_mode_enabled)", + "type": "image", + "size": [ "100%", 1 ], + "anchor_from": "center", + "anchor_to": "center", + "layer": 3, + "texture": "textures/ui/list_item_divider_line_light" + } + }, + { + "project_header_label@settings_common.option_group_label": { + "ignored": "(not $is_editor_mode_enabled)", + "$text": "createWorldScreen.header.general.project" + } + }, + { + "project_section_divider_2": { + "ignored": "(not $is_editor_mode_enabled)", + "type": "image", + "size": [ "100%", 1 ], + "anchor_from": "center", + "anchor_to": "center", + "layer": 3, + "texture": "textures/ui/list_item_divider_line_light" + } + }, + { + "project_spacer": { + "ignored": "(not $is_editor_mode_enabled)", + "type": "panel", + "size": [ 0, 6 ] + } + }, + { // for world edit/show (databound) // edit is 'enabled', show is 'not enabled' @@ -601,6 +576,50 @@ "$tts_override_control_value": " " } }, + + // Export Settings tag header when in Editor + { + "export_settings_section_divider_1": { + "ignored": "(not $is_editor_mode_enabled)", + "type": "image", + "size": [ "100%", 1 ], + "anchor_from": "center", + "anchor_to": "center", + "layer": 3, + "texture": "textures/ui/list_item_divider_line_light" + } + }, + { + "export_settings_header_label@settings_common.option_group_label": { + "ignored": "(not $is_editor_mode_enabled)", + "$text": "createWorldScreen.header.general.exportSettings" + } + }, + { + "export_settings_header_description@settings_common.option_group_label": { + "ignored": "(not $is_editor_mode_enabled)", + "$text": "createWorldScreen.header.general.exportSettings.description" + } + }, + { + "export_settings_section_divider_2": { + "ignored": "(not $is_editor_mode_enabled)", + "type": "image", + "size": [ "100%", 1 ], + "anchor_from": "center", + "anchor_to": "center", + "layer": 3, + "texture": "textures/ui/list_item_divider_line_light" + } + }, + { + "export_settings_spacer": { + "ignored": "(not $is_editor_mode_enabled)", + "type": "panel", + "size": [ 0, 6 ] + } + }, + { "option_dropdown_0@settings_common.option_dropdown_no_scroll": { "$option_label": "createWorldScreen.gameMode.default", diff --git a/resource_pack/ui/sidebar_navigation.json b/resource_pack/ui/sidebar_navigation.json index 21ecfde00..c856ff7d5 100644 --- a/resource_pack/ui/sidebar_navigation.json +++ b/resource_pack/ui/sidebar_navigation.json @@ -363,6 +363,8 @@ "binding_name_override": "#texture" } ], + "$focus_override_right": "expand_option", + "$ignore_close_verbose_button_mapping": true, "$enable_hover_event_mapping": true, "$toggle_hover_event_mapping": "button.dropdown_nav_toggle_on_hover" }, @@ -501,12 +503,13 @@ "sidebar_option_factory_panel": { "type": "input_panel", - "size": ["100%", "100%c"], + "size": [ "100%", "100%c" ], "controls": [ { "sidebar_option_factory@sidebar_navigation.sidebar_option_factory": {} } ], "$ignore_exit_button_mapping|default": false, + "$ignore_close_verbose_button_mapping|default": false, "button_mappings": [ { "ignored": "$ignore_exit_button_mapping", @@ -514,6 +517,13 @@ "to_button_id": "button.exit_verbose_state", "mapping_type": "global", "consume_event": false + }, + { + "ignored": "$ignore_close_verbose_button_mapping", + "from_button_id": "button.menu_right", + "to_button_id": "button.exit_verbose_state", + "mapping_type": "global", + "consume_event": false } ], "bindings": [ @@ -657,7 +667,6 @@ "orientation": "vertical", "size": [ "100%", "100%" ], "controls": [ - { "verbose_view_toggle@sidebar_navigation.verbose_view_toggle": {} }, { "sidebar_option_factory@sidebar_navigation.sidebar_option_factory_scroll_panel": {} }, { "verbose_sidebar_screen_Nav@sidebar_navigation.sidebar_screen_nav_option_factory_panel": {} } ] @@ -671,15 +680,30 @@ "fill": true }, - "sidebar_section": { + "verbose_view_stack_panel": { "type": "stack_panel", - "orientation": "horizontal", - "size": [ "100%", "100%" ], - + "orientation": "vertical", + "$sidebar_section_control|default": "sidebar_navigation.root_section", + "controls": [ + { + "verbose_view_toggle@sidebar_navigation.verbose_view_toggle": { + "size": [ "100%", 23 ] + } + }, + { + "$sidebar_section_name@$sidebar_section_control": { + "size": [ "100%", "100%" ] + } + } + ] + }, + "sidebar_section": { + "orientation": "horizontal", + "size": [ "100%", "100%" ], + "type": "stack_panel", "$ignore_sidebar_section_left_edge|default": true, - "controls": [ { "left_edge_bar@sidebar_navigation.edge_bar": { @@ -690,9 +714,7 @@ } }, { - "$sidebar_section_name@$sidebar_section_control": { - "size": [ "fill", "100%" ] - } + "verbose_view_stack_panel@sidebar_navigation.verbose_view_stack_panel": { "size": [ "fill", "100%" ] } }, { "right_edge_bar@sidebar_navigation.edge_bar": { @@ -739,7 +761,8 @@ }, "simple_root_section": { - "type": "panel", + "type": "stack_panel", + "orientation": "vertical", "size": "$sidebar_view_size", "$ignore_exit_button_mapping": true, @@ -752,6 +775,7 @@ } ], "controls": [ + { "verbose_view_toggle@sidebar_navigation.verbose_view_toggle": {} }, { "root_section@sidebar_navigation.root_section": { "size": [ "100%", "100%" ] diff --git a/resource_pack/ui/store_common.json b/resource_pack/ui/store_common.json index 7f7d0ab4a..056277e5f 100644 --- a/resource_pack/ui/store_common.json +++ b/resource_pack/ui/store_common.json @@ -361,69 +361,43 @@ "icon_overlay_panel": { "type": "panel", - "size": [ "100% - 2px", "56.25%x" ], + "size": [ "100%", "56.25%x" ], "anchor_from": "top_right", "anchor_to": "top_right", "controls": [ { - "top_left_icon_overlay_factory@common_store.icon_overlay_factory_panel": { - "offset": [ -2, 0 ], - "$anchor_point": "top_left" - } - }, - { - "top_right_factory_panel": { - "type": "stack_panel", - "size": [ "100%c", "100%" ], - "orientation": "horizontal", - "anchor_from": "top_right", - "anchor_to": "top_right", - "offset": [ 2, 0 ], - "controls": [ - { - // new and update icons will always be on the top_right anchor, as desgined. - "new_top_right_icon@common_store.status_icon_panel": { - "$update_icon_offset": [ 0, -5 ], - "$status_icon_factory_collection_details": "$store_factory_collection_details", - "$status_icon_factory_collection_prefix": "$store_factory_collection_prefix", - "$status_icon_factory_collection_name": "$store_factory_collection_name" - } - }, - { - "top_right_icon_overlay_factory@common_store.icon_overlay_factory_panel": { - "$anchor_point": "top_right" - } - } - ] - } - }, - { - "bottom_left_icon_overlay_factory@common_store.icon_overlay_factory_panel": { - "offset": [ -2, 2 ], - "$anchor_point": "bottom_left" - } - }, - { - "bottom_right_icon_overlay_factory@common_store.icon_overlay_factory_panel": { - "offset": [ 2, 2 ], - "$anchor_point": "bottom_right" - } + "icon_overlay_position_factory@common_store.icon_overlay_position_factory": {} } ] }, - "icon_overlay_factory_panel": { - "type": "panel", - "size": [ "100%c", 21 ], - "anchor_from": "$anchor_point", - "anchor_to": "$anchor_point", - "$anchor_point|default": "top_right", - "$icon_overlay_collection": "($anchor_point + '_icon_overlay_collection')", - "controls": [ - { - "icon_overlay_factory@common_store.icon_overlay_section_factory": {} - } - ], + "icon_overlay_position_factory": { + "type": "collection_panel", + "size": [ "100%", "100%" ], + "collection_name": "icon_overlay_position_factory", + "factory": { + "name": "icon_overlay_position_factory", + "control_ids": { + "top_left_icon_factory": "@common_store.top_right_icon_factory", + "top_middle_icon_factory": "@common_store.top_middle_icon_factory", + "top_right_icon_factory": "@common_store.top_right_icon_factory", + "left_middle_icon_factory": "@common_store.left_middle_icon_factory", + "center_icon_factory": "@common_store.center_icon_factory", + "right_middle_icon_factory": "@common_store.right_middle_icon_factory", + "bottom_left_icon_factory": "@common_store.bottom_left_icon_factory", + "bottom_middle_icon_factory": "@common_store.bottom_middle_icon_factory", + "bottom_right_icon_factory": "@common_store.bottom_right_icon_factory" + }, + "factory_variables": [ + "$store_factory_collection_details", + "$store_factory_collection_name", + "$store_factory_collection_prefix", + "$offer_binding_type", + "$offer_collection_name", + "$offer_collection_details", + "$offer_collection_prefix" + ] + }, "bindings": [ { "binding_type": "$store_factory_collection_details", @@ -433,35 +407,69 @@ { "binding_type": "$offer_binding_type", "binding_collection_name": "$offer_collection_name", - "binding_name": "('#' + $icon_overlay_collection + '_visible')", - "binding_name_override": "#visible" + "binding_name": "#icon_overlay_position_collection", + "binding_name_override": "#collection_length" } ] }, - "icon_overlay_section_factory": { + "top_left_icon_factory@common_store.icon_factory": { + "$anchor_point": "top_left" + }, + + "top_middle_icon_factory@common_store.icon_factory": { + "$anchor_point": "top_middle" + }, + + "top_right_icon_factory@common_store.icon_factory": { + "$anchor_point": "top_right" + }, + + "left_middle_icon_factory@common_store.icon_factory": { + "$anchor_point": "left_middle" + }, + + "center_icon_factory@common_store.icon_factory": { + "$anchor_point": "center" + }, + + "right_middle_icon_factory@common_store.icon_factory": { + "$anchor_point": "right_middle" + }, + + "bottom_left_icon_factory@common_store.icon_factory": { + "$anchor_point": "bottom_left" + }, + + "bottom_middle_icon_factory@common_store.icon_factory": { + "$anchor_point": "bottom_middle" + }, + + "bottom_right_icon_factory@common_store.icon_factory": { + "$anchor_point": "bottom_right" + }, + + "icon_factory": { "type": "stack_panel", "size": [ "100%c", 21 ], "orientation": "horizontal", + "$anchor_point|default": "top_right", "anchor_from": "$anchor_point", "anchor_to": "$anchor_point", - // factory variables "$icon_overlay_binding_type": "collection", - "$icon_overlay_collection_name|default": "$icon_overlay_collection", - "$icon_overlay_collection_prefix|default": "$anchor_point", - + "$icon_overlay_collection_name": "($anchor_point + '_icon_overlay_collection')", "collection_name": "$icon_overlay_collection_name", - "$icon_overlay_section_name|default": "($icon_overlay_collection_name + '_factory')", "factory": { - "name": "$icon_overlay_section_name", + "name": "$icon_overlay_collection_name", "control_ids": { - "icon_overlay_image_panel": "@common_store.icon_overlay_image_panel" + "icon_overlay_image_panel": "@common_store.icon_overlay_image_panel", + "new_offer_icon_panel": "@common_store.new_offer_icon_panel", + "update_offer_icon_panel": "@common_store.update_offer_icon_panel" }, "factory_variables": [ "$icon_overlay_collection_name", - "$icon_overlay_collection_prefix", "$icon_overlay_binding_type", "$store_factory_collection_details", "$store_factory_collection_name", @@ -470,7 +478,6 @@ "$offer_collection_name", "$offer_collection_details", "$offer_collection_prefix", - "$icon_overlay_collection", "$anchor_point" ] }, @@ -483,12 +490,67 @@ { "binding_type": "$offer_binding_type", "binding_collection_name": "$offer_collection_name", - "binding_name": "('#' + $icon_overlay_collection)", + "binding_name": "('#' + $icon_overlay_collection_name)", "binding_name_override": "#collection_length" } ] }, + "new_offer_icon_panel": { + "type": "panel", + "layer": 15, + "anchor_from": "top_right", + "anchor_to": "top_right", + "size": [ 21, 21 ], + "controls": [ + { + "new_icon@common_store.status_new_offer_icon": { + "bindings": [ + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" + }, + { + "binding_type": "$offer_binding_type", + "binding_collection_name": "$offer_collection_name", + "binding_name": "#new_offer_icon_visible", + "binding_name_override": "#visible" + } + ] + } + } + ] + }, + + "update_offer_icon_panel": { + "type": "panel", + "layer": 15, + "anchor_from": "top_right", + "anchor_to": "top_right", + "size": [ 21, 21 ], + "controls": [ + { + "update_icon@common_store.update_balloon_icon": { + "$update_icon_offset": [ 0, -5 ], + "bindings": [ + { + "binding_type": "$store_factory_collection_details", + "binding_collection_name": "$store_factory_collection_name", + "binding_collection_prefix": "$store_factory_collection_prefix" + }, + { + "binding_type": "$offer_binding_type", + "binding_collection_name": "$offer_collection_name", + "binding_name": "#update_icon_visible", + "binding_name_override": "#visible" + } + ] + } + } + ] + }, + "icon_overlay_image_panel": { "type": "panel", "size": [ "100%c", "100%" ], @@ -583,7 +645,7 @@ "binding_name_override": "#font_type" } ] - } + } }, { "padding_2@common_store.icon_overlay_sdl_padding": {} @@ -4893,32 +4955,6 @@ ] }, - "store_row_image": { - "type": "image", - "layer": 3, - "visible": false, - "size": [ 194, 80 ], - "bindings": [ - { - "binding_name": "#image_is_ready", - "binding_name_override": "#visible" - }, - { - "binding_name": "#store_row_image_texture_name", - "binding_name_override": "#texture" - }, - { - "binding_name": "#store_row_image_texture_filepath", - "binding_name_override": "#texture_file_system" - }, - { - "binding_type": "$store_factory_collection_details", - "binding_collection_name": "$store_factory_collection_name", - "binding_collection_prefix": "$store_factory_collection_prefix" - } - ] - }, - "banner_button@common_buttons.new_ui_width_fitting_button_panel": { "size": [ "100%c", 16 ], "$button_type_panel": "common_buttons.width_fitting_button_content_panel", diff --git a/resource_pack/ui/ui_common.json b/resource_pack/ui/ui_common.json index 4b3d4bf39..d9dcf8642 100644 --- a/resource_pack/ui/ui_common.json +++ b/resource_pack/ui/ui_common.json @@ -1501,7 +1501,7 @@ "from_button_id": "button.menu_select", "to_button_id": "$text_edit_box_selected_to_button_id", "handle_select": true, - "handle_deselect": true, + "handle_deselect": false, "mapping_type": "pressed" }, { @@ -1926,7 +1926,7 @@ "from_button_id": "button.menu_select", "to_button_id": "$text_edit_box_selected_to_button_id", "handle_select": true, - "handle_deselect": true, + "handle_deselect": false, "mapping_type": "pressed" }, { @@ -1975,7 +1975,7 @@ "from_button_id": "button.menu_select", "to_button_id": "$text_edit_box_selected_to_button_id", "handle_select": true, - "handle_deselect": true, + "handle_deselect": false, "mapping_type": "pressed" }, { @@ -3306,6 +3306,20 @@ "controls": [ { "hover_text@common.hover_text": { + "layer": 29, + "$hover_text_binding_name|default": "#hover_text", + "bindings": [ + { + "binding_name": "$hover_text_binding_name", + "binding_name_override": "#hover_text", + "binding_type": "collection", + "binding_collection_name": "$item_collection_name" + } + ] + } + }, + { + "bundle_tooltip@common.bundle_tooltip": { "layer": 29, "$hover_text_binding_name|default": "#hover_text", "bindings": [ @@ -3350,7 +3364,7 @@ "type": "panel", "controls": [ { - "hover_text@common.hover_text": { + "bundle_tooltip@common.bundle_tooltip": { "alpha": "@common.bundle_popup_text_fade_out", "layer": 29, "$hover_text_binding_name|default": "#hover_text", @@ -3404,6 +3418,13 @@ "allow_clipping": false }, + "bundle_tooltip": { + "type": "custom", + "renderer": "bundle_renderer", + "layer": 5, + "allow_clipping": false + }, + "screen_background": { "type": "image", "texture": "textures/ui/screen_background", @@ -4193,6 +4214,7 @@ "$view_port_size_touch|default": [ "100%", "100%" ], "$scroll_bar_contained_touch|default": true, "$scroll_size_touch|default": [ 4, "100%" ], + "$wider_scroll_area|default": false, // The images used for the background, scroll track, and scroll box (for // mouse and for touch) can be overridden by specifying @@ -4210,7 +4232,17 @@ { "scroll_touch@common.scrolling_panel_base": { "ignored": "(not $touch)", - "size": "$scrolling_pane_size_touch", + "variables": [ + { + "requires": "$wider_scroll_area", + "$pane_size_touch": "$scrolling_pane_size_touch" + }, + { + "requires": "(not $wider_scroll_area)", + "$pane_size_touch": "$scrolling_pane_size" + } + ], + "size": "$pane_size_touch", "offset": "$scrolling_pane_offset", "$scroll_bar_contained": "$scroll_bar_contained_touch", "$use_touch_mode": true, @@ -4850,7 +4882,8 @@ "$scroll_view_port_size_touch": [ "100% - 18px", "100% - 2px" ], "$scroll_view_port_offset": [ 1, 1 ], "$scroll_view_port_offset_touch": [ 0, 1 ], - "$scroll_box_size": [ 4, "100%"], + "$scroll_box_size": [ 4, "100%" ], + "$wider_scroll_area": true, "$scroll_bar_right_padding_size": [ 0, 0 ], "$scroll_background_image_control": "common.container_scroll_background_image", @@ -6789,6 +6822,50 @@ } } ] + }, + + "common_cycler": { + "$next_page_button_event|default": "button.cast_subpage_right", + "$prev_page_button_event|default": "button.cast_subpage_left", + "next_sub_page_button_name": "$next_page_button_event", + "prev_sub_page_button_name": "$prev_page_button_event", + + "button_mappings": [ + { + "from_button_id": "$prev_page_button_event", + "to_button_id": "$prev_page_button_event", + "mapping_type": "global", + "scope": "view" + }, + { + "from_button_id": "$next_page_button_event", + "to_button_id": "$next_page_button_event", + "mapping_type": "global", + "scope": "view" + }, + { + "from_button_id": "button.menu_tab_left", + "to_button_id": "$prev_page_button_event", + "mapping_type": "global", + "scope": "view" + }, + { + "from_button_id": "button.menu_tab_right", + "to_button_id": "$next_page_button_event", + "mapping_type": "global", + "scope": "view" + } + ] + }, + + "image_cycler@common.common_cycler": { + "type": "image_cycler", + "images": "$image_cycler_images" + }, + + "text_cycler@common.common_cycler": { + "type": "label_cycler", + "text_labels": "$text_cycler_labels" } } diff --git a/resource_pack/ui/ui_template_dialogs.json b/resource_pack/ui/ui_template_dialogs.json index 55ac1cd9d..a4e49988f 100644 --- a/resource_pack/ui/ui_template_dialogs.json +++ b/resource_pack/ui/ui_template_dialogs.json @@ -424,13 +424,8 @@ "anchor_from": "top_right", "anchor_to": "top_right", "size": [ "100%c", "100%c" ], + "$close_button_offset|default": [ 0, 0 ], "offset": "$close_button_offset", - "bindings": [ - { - "binding_name": "(not #is_using_gamepad)", - "binding_name_override": "#visible" - } - ], "controls": [ { "close@common.close_button": { @@ -440,6 +435,7 @@ }, { "compact_close@common.compact_close_button": { + "ignored": "(not $use_compact_close_button)", "layer": 2, "visible": "$use_compact_close_button" } diff --git a/version.json b/version.json index 804a87778..c1b585cb2 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,6 @@ { - "latest": { "version": "1.19.50.25", "date": "16-11-2022", "type": "preview" }, + "latest": { "version": "1.19.60.20", "date": "23-11-2022", "type": "preview" }, + "1.19.60.20": { "version": "1.19.60.20", "date": "23-11-2022", "type": "preview" }, "1.19.50.25": { "version": "1.19.50.25", "date": "16-11-2022", "type": "preview" }, "1.19.50.24": { "version": "1.19.50.24", "date": "09-11-2022", "type": "preview" }, "1.19.50.23": { "version": "1.19.50.23", "date": "03-11-2022", "type": "preview" },