Skip to content

Commit c185be7

Browse files
ywgATustcbbsywgATustcbbs
authored
Merge branch 'ReactiveDrop:master' into master
2 parents c950e8e + bf12049 commit c185be7

File tree

86 files changed

+710
-100
lines changed

Some content is hidden

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

86 files changed

+710
-100
lines changed

‎PROGRESS.md‎

Lines changed: 63 additions & 49 deletions
Large diffs are not rendered by default.

‎community/inventory_service/items_brazilian.vdf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@
276276
// we're not eligible for the fest, so this medal is an unofficial participation trophy. ouch.
277277
"[english]item_event_medal_replayabilityfest2024_flavor" "We didn't make the cut, but we still had fun."
278278
"item_event_medal_replayabilityfest2024_flavor" "Não fomos escolhidos, mas ainda assim nos divertimos."
279+
"[english]item_event_medal_pvpfest2026_name" "Steam PvP Fest 2026"
280+
"item_event_medal_pvpfest2026_name" "Steam PvP Fest 2026"
281+
"[english]item_event_medal_pvpfest2026_description" "Engaged in a skirmish during Steam PvP Fest 2026."
282+
"item_event_medal_pvpfest2026_description" "Engaged in a skirmish during Steam PvP Fest 2026."
279283

280284
"[english]item_event_medal_mapping_2023_name" "Mapping Competition Participant (2023)"
281285
"item_event_medal_mapping_2023_name" "Participante do Concurso de Mapeamento (2023)"
@@ -478,6 +482,8 @@
478482
"item_strange_device_alien_kill_streak_best" "Melhor"
479483
"[english]item_strange_device_infestations_cured_name" "Infestations Cured"
480484
"item_strange_device_infestations_cured_name" "Infestações Curadas"
485+
"[english]item_strange_device_deathmatch_kills_name" "Deathmatch Kills"
486+
"item_strange_device_deathmatch_kills_name" "Deathmatch Kills"
481487

482488
"[english]item_suit_sarge_name" "Sarge's Suit"
483489
"item_suit_sarge_name" "Traje do Sarge"

‎community/inventory_service/items_czech.vdf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@
276276
// we're not eligible for the fest, so this medal is an unofficial participation trophy. ouch.
277277
"[english]item_event_medal_replayabilityfest2024_flavor" "We didn't make the cut, but we still had fun."
278278
"item_event_medal_replayabilityfest2024_flavor" "We didn't make the cut, but we still had fun."
279+
"[english]item_event_medal_pvpfest2026_name" "Steam PvP Fest 2026"
280+
"item_event_medal_pvpfest2026_name" "Steam PvP Fest 2026"
281+
"[english]item_event_medal_pvpfest2026_description" "Engaged in a skirmish during Steam PvP Fest 2026."
282+
"item_event_medal_pvpfest2026_description" "Engaged in a skirmish during Steam PvP Fest 2026."
279283

280284
"[english]item_event_medal_mapping_2023_name" "Mapping Competition Participant (2023)"
281285
"item_event_medal_mapping_2023_name" "Mapping Competition Participant (2023)"
@@ -478,6 +482,8 @@
478482
"item_strange_device_alien_kill_streak_best" "Best"
479483
"[english]item_strange_device_infestations_cured_name" "Infestations Cured"
480484
"item_strange_device_infestations_cured_name" "Infestations Cured"
485+
"[english]item_strange_device_deathmatch_kills_name" "Deathmatch Kills"
486+
"item_strange_device_deathmatch_kills_name" "Deathmatch Kills"
481487

482488
"[english]item_suit_sarge_name" "Sarge's Suit"
483489
"item_suit_sarge_name" "Sarge's Suit"

‎community/inventory_service/items_danish.vdf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@
276276
// we're not eligible for the fest, so this medal is an unofficial participation trophy. ouch.
277277
"[english]item_event_medal_replayabilityfest2024_flavor" "We didn't make the cut, but we still had fun."
278278
"item_event_medal_replayabilityfest2024_flavor" "We didn't make the cut, but we still had fun."
279+
"[english]item_event_medal_pvpfest2026_name" "Steam PvP Fest 2026"
280+
"item_event_medal_pvpfest2026_name" "Steam PvP Fest 2026"
281+
"[english]item_event_medal_pvpfest2026_description" "Engaged in a skirmish during Steam PvP Fest 2026."
282+
"item_event_medal_pvpfest2026_description" "Engaged in a skirmish during Steam PvP Fest 2026."
279283

280284
"[english]item_event_medal_mapping_2023_name" "Mapping Competition Participant (2023)"
281285
"item_event_medal_mapping_2023_name" "Mapping Competition Participant (2023)"
@@ -478,6 +482,8 @@
478482
"item_strange_device_alien_kill_streak_best" "Best"
479483
"[english]item_strange_device_infestations_cured_name" "Infestations Cured"
480484
"item_strange_device_infestations_cured_name" "Infestations Cured"
485+
"[english]item_strange_device_deathmatch_kills_name" "Deathmatch Kills"
486+
"item_strange_device_deathmatch_kills_name" "Deathmatch Kills"
481487

482488
"[english]item_suit_sarge_name" "Sarge's Suit"
483489
"item_suit_sarge_name" "Sarge's Suit"

‎community/inventory_service/items_dutch.vdf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@
276276
// we're not eligible for the fest, so this medal is an unofficial participation trophy. ouch.
277277
"[english]item_event_medal_replayabilityfest2024_flavor" "We didn't make the cut, but we still had fun."
278278
"item_event_medal_replayabilityfest2024_flavor" "We didn't make the cut, but we still had fun."
279+
"[english]item_event_medal_pvpfest2026_name" "Steam PvP Fest 2026"
280+
"item_event_medal_pvpfest2026_name" "Steam PvP Fest 2026"
281+
"[english]item_event_medal_pvpfest2026_description" "Engaged in a skirmish during Steam PvP Fest 2026."
282+
"item_event_medal_pvpfest2026_description" "Engaged in a skirmish during Steam PvP Fest 2026."
279283

280284
"[english]item_event_medal_mapping_2023_name" "Mapping Competition Participant (2023)"
281285
"item_event_medal_mapping_2023_name" "Mapping Competition Participant (2023)"
@@ -478,6 +482,8 @@
478482
"item_strange_device_alien_kill_streak_best" "Best"
479483
"[english]item_strange_device_infestations_cured_name" "Infestations Cured"
480484
"item_strange_device_infestations_cured_name" "Infestations Cured"
485+
"[english]item_strange_device_deathmatch_kills_name" "Deathmatch Kills"
486+
"item_strange_device_deathmatch_kills_name" "Deathmatch Kills"
481487

482488
"[english]item_suit_sarge_name" "Sarge's Suit"
483489
"item_suit_sarge_name" "Sarge's Suit"

‎community/inventory_service/items_english.vdf‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,8 @@
152152
"item_event_medal_replayabilityfest2024_description" "Fought the Swarm during Steam Endless Replayability Fest 2024."
153153
// we're not eligible for the fest, so this medal is an unofficial participation trophy. ouch.
154154
"item_event_medal_replayabilityfest2024_flavor" "We didn't make the cut, but we still had fun."
155+
"item_event_medal_pvpfest2026_name" "Steam PvP Fest 2026"
156+
"item_event_medal_pvpfest2026_description" "Engaged in a skirmish during Steam PvP Fest 2026."
155157

156158
"item_event_medal_mapping_2023_name" "Mapping Competition Participant (2023)"
157159
"item_event_medal_mapping_2023_description" "Submitted an entry to the first annual mapping competition: \"Boss Fight\", running from April 20th to August 1st 2023."
@@ -267,6 +269,7 @@
267269
// Alien Kill Streak: 1234 (Best: 5678)
268270
"item_strange_device_alien_kill_streak_best" "Best"
269271
"item_strange_device_infestations_cured_name" "Infestations Cured"
272+
"item_strange_device_deathmatch_kills_name" "Deathmatch Kills"
270273

271274
"item_suit_sarge_name" "Sarge's Suit"
272275
"item_suit_wildcat_name" "Wildcat's Suit"

‎community/inventory_service/items_finnish.vdf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@
276276
// we're not eligible for the fest, so this medal is an unofficial participation trophy. ouch.
277277
"[english]item_event_medal_replayabilityfest2024_flavor" "We didn't make the cut, but we still had fun."
278278
"item_event_medal_replayabilityfest2024_flavor" "We didn't make the cut, but we still had fun."
279+
"[english]item_event_medal_pvpfest2026_name" "Steam PvP Fest 2026"
280+
"item_event_medal_pvpfest2026_name" "Steam PvP Fest 2026"
281+
"[english]item_event_medal_pvpfest2026_description" "Engaged in a skirmish during Steam PvP Fest 2026."
282+
"item_event_medal_pvpfest2026_description" "Engaged in a skirmish during Steam PvP Fest 2026."
279283

280284
"[english]item_event_medal_mapping_2023_name" "Mapping Competition Participant (2023)"
281285
"item_event_medal_mapping_2023_name" "Mapping Competition Participant (2023)"
@@ -478,6 +482,8 @@
478482
"item_strange_device_alien_kill_streak_best" "Parhaat"
479483
"[english]item_strange_device_infestations_cured_name" "Infestations Cured"
480484
"item_strange_device_infestations_cured_name" "Infestations Cured"
485+
"[english]item_strange_device_deathmatch_kills_name" "Deathmatch Kills"
486+
"item_strange_device_deathmatch_kills_name" "Deathmatch Kills"
481487

482488
"[english]item_suit_sarge_name" "Sarge's Suit"
483489
"item_suit_sarge_name" "Sarge's Suit"

‎community/inventory_service/items_french.vdf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@
276276
// we're not eligible for the fest, so this medal is an unofficial participation trophy. ouch.
277277
"[english]item_event_medal_replayabilityfest2024_flavor" "We didn't make the cut, but we still had fun."
278278
"item_event_medal_replayabilityfest2024_flavor" "We didn't make the cut, but we still had fun."
279+
"[english]item_event_medal_pvpfest2026_name" "Steam PvP Fest 2026"
280+
"item_event_medal_pvpfest2026_name" "Steam PvP Fest 2026"
281+
"[english]item_event_medal_pvpfest2026_description" "Engaged in a skirmish during Steam PvP Fest 2026."
282+
"item_event_medal_pvpfest2026_description" "Engaged in a skirmish during Steam PvP Fest 2026."
279283

280284
"[english]item_event_medal_mapping_2023_name" "Mapping Competition Participant (2023)"
281285
"item_event_medal_mapping_2023_name" "Mapping Competition Participant (2023)"
@@ -478,6 +482,8 @@
478482
"item_strange_device_alien_kill_streak_best" "Best"
479483
"[english]item_strange_device_infestations_cured_name" "Infestations Cured"
480484
"item_strange_device_infestations_cured_name" "Infestations Cured"
485+
"[english]item_strange_device_deathmatch_kills_name" "Deathmatch Kills"
486+
"item_strange_device_deathmatch_kills_name" "Deathmatch Kills"
481487

482488
"[english]item_suit_sarge_name" "Sarge's Suit"
483489
"item_suit_sarge_name" "Sarge's Suit"

‎community/inventory_service/items_german.vdf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@
276276
// we're not eligible for the fest, so this medal is an unofficial participation trophy. ouch.
277277
"[english]item_event_medal_replayabilityfest2024_flavor" "We didn't make the cut, but we still had fun."
278278
"item_event_medal_replayabilityfest2024_flavor" "Wir haben es nicht in die Auswahl geschafft, aber wir hatten trotzdem Spaß."
279+
"[english]item_event_medal_pvpfest2026_name" "Steam PvP Fest 2026"
280+
"item_event_medal_pvpfest2026_name" "Steam PvP Fest 2026"
281+
"[english]item_event_medal_pvpfest2026_description" "Engaged in a skirmish during Steam PvP Fest 2026."
282+
"item_event_medal_pvpfest2026_description" "Wurde während des Steam PvP Fest 2026 in ein Scharmützel verwickelt."
279283

280284
"[english]item_event_medal_mapping_2023_name" "Mapping Competition Participant (2023)"
281285
"item_event_medal_mapping_2023_name" "Mapping-Wettbewerb Teilnehmer (2023)"
@@ -478,6 +482,8 @@
478482
"item_strange_device_alien_kill_streak_best" "Am besten"
479483
"[english]item_strange_device_infestations_cured_name" "Infestations Cured"
480484
"item_strange_device_infestations_cured_name" "Befallene geheilt"
485+
"[english]item_strange_device_deathmatch_kills_name" "Deathmatch Kills"
486+
"item_strange_device_deathmatch_kills_name" "Deathmatch Kills"
481487

482488
"[english]item_suit_sarge_name" "Sarge's Suit"
483489
"item_suit_sarge_name" "Sarge's Anzug"

‎community/inventory_service/items_hungarian.vdf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@
276276
// we're not eligible for the fest, so this medal is an unofficial participation trophy. ouch.
277277
"[english]item_event_medal_replayabilityfest2024_flavor" "We didn't make the cut, but we still had fun."
278278
"item_event_medal_replayabilityfest2024_flavor" "We didn't make the cut, but we still had fun."
279+
"[english]item_event_medal_pvpfest2026_name" "Steam PvP Fest 2026"
280+
"item_event_medal_pvpfest2026_name" "Steam PvP Fest 2026"
281+
"[english]item_event_medal_pvpfest2026_description" "Engaged in a skirmish during Steam PvP Fest 2026."
282+
"item_event_medal_pvpfest2026_description" "Engaged in a skirmish during Steam PvP Fest 2026."
279283

280284
"[english]item_event_medal_mapping_2023_name" "Mapping Competition Participant (2023)"
281285
"item_event_medal_mapping_2023_name" "Mapping Competition Participant (2023)"
@@ -478,6 +482,8 @@
478482
"item_strange_device_alien_kill_streak_best" "Best"
479483
"[english]item_strange_device_infestations_cured_name" "Infestations Cured"
480484
"item_strange_device_infestations_cured_name" "Infestations Cured"
485+
"[english]item_strange_device_deathmatch_kills_name" "Deathmatch Kills"
486+
"item_strange_device_deathmatch_kills_name" "Deathmatch Kills"
481487

482488
"[english]item_suit_sarge_name" "Sarge's Suit"
483489
"item_suit_sarge_name" "Sarge's Suit"

0 commit comments

Comments
 (0)