Skip to content

Commit 5f14dd8

Browse files
authored
Merge pull request #659 from IntelligenceModding/feat/keyboard
Keyboard
2 parents 35671f1 + 5be343f commit 5f14dd8

File tree

45 files changed

+1136
-185
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1136
-185
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
// 1.19.2 2025-01-20T07:59:27.474151 Tags for minecraft:item
1+
// 1.19.2 2025-03-15T16:18:50.46663 Tags for minecraft:item
22
de4b4f45ec18b2b1f0db1c36882981042e20ee23 data/advancedperipherals/tags/items/p2p_attunements/cable_p2p_tunnel.json
33
72eba3b11f69e16c87488f7c4ba7cfdad42c378e data/advancedperipherals/tags/items/smart_glasses.json
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// 1.19.2 2024-05-28T14:53:16.655175 AP POI Type Tags
1+
// 1.19.2 2025-03-15T16:18:50.465796 AP POI Type Tags
22
d3d6b837660a4e213f287ad9d11e12368b90cd8e data/minecraft/tags/point_of_interest_type/acquirable_job_site.json

src/generated/resources/.cache/5a761efb7472ef97566e41e81451930a004134bf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.19.2 2024-05-28T14:53:16.655476 Turtle Upgrades
1+
// 1.19.2 2025-03-15T16:18:50.466321 Turtle Upgrades
22
b8f19ae0fb5bb898facc08e3787e0f96c8211881 data/advancedperipherals/computercraft/turtle_upgrades/chatty_turtle.json
33
fe98c60e7d61139aacf2d0872873e610aac8a37b data/advancedperipherals/computercraft/turtle_upgrades/chunky_turtle.json
44
ae619da638ad89d7302d832d6c09e2c87401c539 data/advancedperipherals/computercraft/turtle_upgrades/compass_turtle.json

src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.19.2 2025-01-16T15:46:41.860623 LootTables
1+
// 1.19.2 2025-03-15T16:18:50.465594 LootTables
22
618b63c020ab64890c8a2d2506dd61cd30259a44 data/advancedperipherals/loot_tables/blocks/block_reader.json
33
0923665563d05307a7fa7d711a2d7a994a31eb6e data/advancedperipherals/loot_tables/blocks/chat_box.json
44
bf2a80256cfba0bd8c0283d493882e5816882f1f data/advancedperipherals/loot_tables/blocks/colony_integrator.json

src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.19.2 2024-05-28T14:53:16.657381 Recipes
1+
// 1.19.2 2025-03-15T16:18:50.466743 Recipes
22
045608027e4a5ea2d7dee7f402346b8e69f21675 data/advancedperipherals/advancements/recipes/advancedperipheralstab/armor/smart_glasses_netherite.json
33
db2dada2fdf42ca1bbf47f1eb075d1f9de89dfa8 data/advancedperipherals/advancements/recipes/advancedperipheralstab/block_reader.json
44
77c55e8500be4a344ca563a8bf7642257cdc7b8b data/advancedperipherals/advancements/recipes/advancedperipheralstab/chat_box.json

src/generated/resources/.cache/ae219fa7c7d3297c14e454863eac3998a4eab78c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.19.2 2025-01-25T19:46:21.23515 Pocket Computer Upgrades
1+
// 1.19.2 2025-03-15T16:18:50.46512 Pocket Computer Upgrades
22
b672635324c0df354e587efc81d0b19a581eae2f data/advancedperipherals/computercraft/pocket_upgrades/chatty_pocket.json
33
30b8f663613c7ce77048fd69631afcc11a682276 data/advancedperipherals/computercraft/pocket_upgrades/colony_pocket.json
44
661dc77bd0442bfb2a5ed80cff271071817bb22d data/advancedperipherals/computercraft/pocket_upgrades/distance_pocket.json

src/generated/resources/.cache/b8526e444ae7356037f3a813274f6835d1f3dd16

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.19.2 2024-05-28T14:53:16.658228 Block States: advancedperipherals
1+
// 1.19.2 2025-03-15T16:18:50.466039 Block States: advancedperipherals
22
5e28ce1be9a6996d982641e5df1fa7162090b8cc assets/advancedperipherals/blockstates/block_reader.json
33
f42bdde60f84fdb312f7cf3b2be461d9c11ebdc8 assets/advancedperipherals/blockstates/chat_box.json
44
1227aa092fcf1327547ace6ccc9db230e45891b0 assets/advancedperipherals/blockstates/colony_integrator.json
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// 1.19.2 2025-01-25T19:46:21.234203 Languages: en_us
2-
e858500d72e9279f0fe0e8b2d03f94469c8d1f65 assets/advancedperipherals/lang/en_us.json
1+
// 1.19.2 2025-03-15T16:18:50.465918 Languages: en_us
2+
fe52123263b91f49093d74278e8709484e4dfe59 assets/advancedperipherals/lang/en_us.json
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.19.2 2025-01-16T15:46:41.859383 Block tags
1+
// 1.19.2 2025-03-15T16:18:50.466493 Block tags
22
e1f71dcb4f9e7e36e29b0ad09d6520dc3adfa4a6 data/forge/tags/blocks/needs_wood_tool.json
33
03322cd493601129eaad6ba7c2a6d808023dfac1 data/minecraft/tags/blocks/mineable/pickaxe.json
44
277fe59db076a3eab3c97080531ad345f8ca5f3d data/minecraft/tags/blocks/needs_iron_tool.json

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
"item.advancedperipherals.end_automata_core": "End Automata Core",
4141
"item.advancedperipherals.hotkey_module": "Hotkey Module",
4242
"item.advancedperipherals.husbandry_automata_core": "Husbandry Automata Core",
43+
"item.advancedperipherals.keyboard": "Wireless Keyboard",
4344
"item.advancedperipherals.memory_card": "Memory Card",
4445
"item.advancedperipherals.nightvision_module": "Night Vision Module",
4546
"item.advancedperipherals.overlay_module": "Overlay Module",
@@ -49,6 +50,8 @@
4950
"item.advancedperipherals.smart_glasses": "Smart Glasses",
5051
"item.advancedperipherals.smart_glasses_interface": "Smart Glasses Interface",
5152
"item.advancedperipherals.smart_glasses_netherite": "Netherite reinforced Smart Glasses",
53+
"item.advancedperipherals.tooltip.binding.bound_to": "&7Bound to &b%s&7.",
54+
"item.advancedperipherals.tooltip.binding.bound_to_glasses": "&7Bound to Glasses with id &b%s&7.",
5255
"item.advancedperipherals.tooltip.block_reader": "&7Reads nbt data of blocks to interact with blocks which do not have computer support.",
5356
"item.advancedperipherals.tooltip.chat_box": "&7Interacts with the ingame chat, can read and write messages.",
5457
"item.advancedperipherals.tooltip.chunk_controller": "&7A crafting ingredient for the Chunky Turtle.",
@@ -63,7 +66,6 @@
6366
"item.advancedperipherals.tooltip.inventory_manager": "&7This block is able to send or receive specific items from a player inventory.",
6467
"item.advancedperipherals.tooltip.me_bridge": "&7The ME Bridge interacts with Applied Energistics to manage your items.",
6568
"item.advancedperipherals.tooltip.memory_card": "&7Can save the rights of a player to use it in an inventory manager.",
66-
"item.advancedperipherals.tooltip.memory_card.bound": "&7Bound to &b%s&7.",
6769
"item.advancedperipherals.tooltip.nbt_storage": "&7Acts like a storage disk. Can store nbt based data.",
6870
"item.advancedperipherals.tooltip.overpowered_end_automata_core": "&7Improved version of the end automata core, that provides some overpowered uses! Be careful, the upgrade is very fragile.",
6971
"item.advancedperipherals.tooltip.overpowered_husbandry_automata_core": "&7Improved version of the husbandry automata core, that provides some overpowered uses! Be careful, the upgrade is very fragile.",
@@ -84,9 +86,13 @@
8486
"pocket.advancedperipherals.environment_pocket": "Environment",
8587
"pocket.advancedperipherals.geoscanner_pocket": "Geo",
8688
"pocket.advancedperipherals.player_pocket": "Player Detector",
87-
"text.advancedperipherals.added_player": "Added you to the memory card",
8889
"text.advancedperipherals.automata_core.feed_by_player": "You're trying to feed an entity to a soul, but your own body refuses to do this. Maybe something more mechanical can do this?",
89-
"text.advancedperipherals.removed_player": "Cleared the memory card",
90+
"text.advancedperipherals.bind_keyboard": "Bounded the keyboard to %s",
91+
"text.advancedperipherals.bind_memorycard": "Bounded the memory card to you",
92+
"text.advancedperipherals.cleared_keyboard": "Cleared the keyboard",
93+
"text.advancedperipherals.cleared_memorycard": "Cleared the memory card",
94+
"text.advancedperipherals.keyboard.close": "Press ESC to close the Keyboard Screen",
95+
"text.advancedperipherals.keyboard_notbound": "The keyboard it not bound",
9096
"text.advancedperipherals.saddle_turtle.dismount_hint": "Controlling %1$s. Press %2$s and %3$s to dismount.",
9197
"text.advancedperipherals.smart_glasses.modules": "Modules",
9298
"text.advancedperipherals.smart_glasses.peripherals": "Peripherals",

0 commit comments

Comments
 (0)