evgenkot
799d636833
Change names of items with the same vox descriptor
...
| old | new |
|-|-|
| object-key_rusty-0-ancient | object-key_quarry_ancient |
| object-key_rusty-0-backdoor | object-key_quarry_backdoor |
| items-keeper_goggle | object-key_quarry_keeper_goggle_left |
| items-keeper_goggle-flamekeeper_right | object-key_quarry_keeper_goggle_right |
| object-key_rusty-0-overseer | object-key_quarry_overseer |
| object-key_rusty-0-smelting | object-key_quarry_smelting |
| weapon-staff-firestaff_starter | weapon-staff-firestaff_humble_stick |
| weapon-staff-firestaff_starter_gnarled | weapon-staff-firestaff_starter |
| weapon-hammer-2hhammer_rusty-starter_hammer | weapon-hammer-2hhammer_starter |
| armor-misc-chest-worker_green-worker_orange_0 | armor-misc-chest-worker_orange_0 |
| armor-misc-chest-shirt_white-worker_orange_1 | armor-misc-chest-worker_orange_1 |
| armor-misc-chest-worker_green-worker_purple_0 | armor-misc-chest-worker_purple_0 |
| armor-misc-chest-shirt_white-worker_purple_1 | armor-misc-chest-worker_purple_1 |
| armor-misc-chest-worker_green-worker_red_0 | armor-misc-chest-worker_red_0 |
| armor-misc-chest-shirt_white-worker_red_1 | armor-misc-chest-worker_red_1 |
| armor-misc-chest-worker_green-worker_yellow_0 | armor-misc-chest-worker_yellow_0 |
| armor-misc-chest-shirt_white-worker_yellow_1 | armor-misc-chest-worker_yellow_1 |
| armor-misc-back-backpack-backpack | armor-misc-back-backpack-traveler |
| armor-tabard_admin-admin | armor-tabard-admin_tabard |
| armor-misc-back-admin-admin_back | armor-misc-back-admin_back |
| weapon-sword-frost-1-admin_sword | weapon-sword-frost-admin_sword |
| armor-velorite_battlemage-belt-cultist_belt | armor-velorite-belt |
| armor-velorite_battlemage-foot-cultist_boots | armor-velorite-boots |
| armor-velorite_battlemage-chest-cultist_chest_blue | armor-velorite-chest |
| armor-velorite_battlemage-hand-cultist_hands_blue | armor-velorite-hands |
| armor-velorite_battlemage-pants-cultist_legs_blue | armor-velorite-legs |
| armor-velorite_battlemage-shoulder-cultist_shoulder_blue | armor-velorite-shoulder |
| armor-velorite_battlemage-back-dungeon_purple | armor-velorite-back |
| weapon-bow-velorite-velorite_bow_debug | weapon-bow-velorite-debug |
| sprite-mineral-ore-coal | sprite-mineral-stone-coal |
| sprite-mineral-ore-coal-coal | sprite-mineral-ore-coal |
| sprite-crafting_ing-animal_misc-grim_eyeball | sprite-crafting_ing-animal_misc-cyclops_eyeball |
| sprite-crafting_ing-animal_misc-grim_eyeball-grim_eyeball | sprite-crafting_ing-animal_misc-grim_eyeball |
| object-potion_red-potion_big | object-potion_big |
| object-potion_red-potion_med | object-potion_med |
| object-potion_red-potion_minor | object-potion_minor |
| sprite-flowers-sunflower_1-yellow | sprite-flowers-yellow |
2024-01-21 21:21:10 +05:00
Marcel
d4f993ca1d
Merge branch 'minor-fixes' into 'master'
...
Correct/improve some en-US text.
See merge request veloren/veloren!4246
2024-01-21 10:12:20 +00:00
flo
48a79b3e78
haniwa
2024-01-20 17:45:23 +00:00
Isse
99154897b2
Merge branch 'fvasco-command' into 'master'
...
Add assets/voxygen/i18n/it/command.ftl
See merge request veloren/veloren!4124
2024-01-18 18:00:51 +00:00
Francesco Vasco
0e9630bd13
Add assets/voxygen/i18n/it/command.ftl
2024-01-18 18:00:51 +00:00
Codeberg Translate
b91d37a5ee
Update translation files
...
Updated by "Squash Git commits" hook in Weblate.
Translation: Veloren/voxygen-hud-subtitles
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-subtitles/
2024-01-17 18:56:43 +00:00
Codeberg Translate
ff73a9b3cc
Update translation files
...
Updated by "Squash Git commits" hook in Weblate.
Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-npc/
Translation: Veloren/voxygen-npc
2024-01-17 18:56:43 +00:00
Isse
4f084506c0
Merge branch 'juliancoffee/item-i18n' into 'master'
...
Add Item i18n
Closes #903
See merge request veloren/veloren!4250
2024-01-16 17:58:35 +00:00
Maxicarlos08
25c7169991
Renamed share_with_server -> send_to_server
...
requested by @juliancoffee
2024-01-16 17:21:52 +01:00
Maxicarlos08
d6371f7f9b
Server rules i18n and rules button in character screen
2024-01-15 00:03:23 +01:00
Joshua Barretto
f99bf91617
Added rules menu when connecting to server
2024-01-15 00:02:43 +01:00
juliancoffee
28b400825e
Add item localization assets
2024-01-14 21:25:15 +02:00
juliancoffee
aba8ec7558
Implement item localization
...
- Add Content::Key as proxy to Language::try_msg
- Add Content::Attr as proxy to Language::try_attr
- Extend ItemKey::TagExamples so it includes base asset id
- Implement ItemDesc::l10n using new Content variants
- Add all_items_expect() function to grab all items, because
try_all_item_defs() covers only items in asset folder.
Required assets will go in next commit
2024-01-14 21:25:15 +02:00
juliancoffee
296f70c1b2
Unify /buff_complex and /buff
...
Turns out parse_cmd_args allows omitting arguments, /buff <buff>
[misc_data] will be idential to /buff <buff> [strength] [duration]
[misc_data]
2024-01-08 20:13:17 +02:00
juliancoffee
2746a98f40
Add /buff_complex command
2024-01-08 20:13:17 +02:00
juliancoffee
5aa30b0175
Warn about complex buffs when using /buff
2024-01-08 20:13:17 +02:00
Isse
12a4c5a256
Merge branch 'the_dimasmith/update-uk' into 'master'
...
update Ukrainian translation
See merge request veloren/veloren!4215
2024-01-08 16:39:08 +00:00
Dmytro Kovalchuk
95f63e46e6
update Ukrainian translation
2024-01-08 16:39:08 +00:00
Darren Salt
7051ba5c89
Correct/improve some en-US text.
2024-01-05 11:47:27 +00:00
Pybit
f6204f9d04
Merge branch 'master' into 'More-potions'
...
# Conflicts:
# CHANGELOG.md
2024-01-04 11:48:30 +00:00
Joaquin Tornello
0ecfbce4d2
Feat: Day duration slider on map creation UI ( #1909 )
2024-01-03 22:21:53 +00:00
Isse
b60ebd4131
don't show red text when walking
2023-12-07 20:08:03 +01:00
Isse
63e500d3d8
laying and steering animation
2023-12-07 20:08:02 +01:00
Isse
5320f83462
configurable walking speed
2023-12-07 20:08:02 +01:00
HEIEnthusiast
933c897450
Renamed to potion of agility, burning potion to combustion
2023-12-05 14:15:54 -04:00
HEIEnthusiast
99b5571fd8
Renamed swiftness to retreating, changed model
2023-12-05 13:09:14 -04:00
HEIEnthusiast
5001c4a262
Added swiftness debuffs
2023-11-28 11:41:29 -04:00
HEIEnthusiast
db71625226
Merge branch 'master' of gitlab.com:veloren/dev/veloren into More-potions
2023-11-28 10:07:00 -04:00
HEIEnthusiast
568d12cdd0
Swiftness potion changes
2023-11-28 10:03:07 -04:00
Michał
14120232a0
Phoenix overhaul
2023-11-28 11:13:18 +00:00
HEIEnthusiast
783cfdc719
Merge branch 'master' into More-potions
2023-11-27 07:00:48 -04:00
HEIEnthusiast
4d87a9ab44
General potion modifications
2023-11-27 06:57:42 -04:00
HEIEnthusiast
59c3162c49
Merge branch 'master' of https://gitlab.com/veloren/dev/veloren
...
12 commits behind master fix
2023-11-27 06:32:18 -04:00
HEIEnthusiast
ac4101e70d
Changed textures, added strength pot
2023-11-27 06:25:58 -04:00
HEIEnthusiast
0bb74f9efe
Added swiftness and regeneration potions
2023-11-26 10:54:02 -04:00
Isse
5a3e6316a5
fix tethering
2023-11-23 01:01:31 +01:00
Maxicarlos08
17904d9387
crit_power -> precise_power
2023-11-14 18:07:01 -05:00
Sam
d3b3bca621
Added precision
2023-11-14 18:06:59 -05:00
Sorann753
a63debe1b7
Fixed French Translation
2023-11-09 19:41:05 +00:00
Joshua Barretto
9dd5cd24d1
Make backpacks distinct ArmorKinds, fix visual offsets of carried weapons
2023-10-13 11:57:49 +01:00
Maxicarlos08
a3be68930e
review comments
2023-10-02 23:23:42 +02:00
Maxicarlos08
9ababec625
fix UI issues & cleanup
2023-09-29 23:30:44 +02:00
Maxicarlos08
66f6b81575
singleplayer server initialization status
2023-09-29 23:30:14 +02:00
Maxicarlos08
9a3f53c32c
added status updates to loading screen
2023-09-29 23:30:14 +02:00
Laura
f4d48d2689
New Arena building and visit site for NPCs
2023-09-26 12:29:14 +00:00
Maxicarlos08
772dd660a1
testing
2023-09-20 23:29:24 +02:00
Maxicarlos08
91284565a2
addressed review comments
2023-09-20 23:29:24 +02:00
Maxicarlos08
fd42b3f767
localize commands
2023-09-20 23:29:24 +02:00
Isse
f4ca60cbb6
Map selector and generation UI
2023-09-17 17:11:19 +00:00
Francesco Vasco
d9b7f202f5
Italian: common-sprite-crate and typo
2023-09-10 11:35:30 +00:00
Marcel
19742bb930
Merge branch 'translation_fr' into 'master'
...
rename fr/quest.ftl
See merge request veloren/veloren!4096
2023-09-01 18:14:24 +00:00
Marcel
1b7d5f0915
Merge branch 'xMAC94x/fluent_stances' into 'master'
...
add back stances removed by weblate
See merge request veloren/veloren!4095
2023-08-31 16:20:43 +00:00
Marcel Märtens
c9a7e6e072
ad back stances removed by weblate, and register them in EN file, hopefully that weblate accepts them now
2023-08-31 15:51:06 +02:00
Xiretza
06111612a3
voxygen: better translation of buff-death messages
...
This removes interpolation of translated strings, which is bad practice
because it simply doesn't work in many languages.
Translation files were updated using the following fish script. Some
resulting translations are truly terrible, but they always have been -
now it's just a lot more obvious.
```
function getbuff --argument langfile buff
grep hud-outcome-$buff $langfile | cut -d= -f2- | string trim
end
set buffs burning bleeding curse crippled frozen mysterious
function replacebuffs --argument langfile entity
set slug 'hud-chat-died_of_'$entity'_buff_msg'
for buff in $buffs[-1..1]
set bstr (getbuff $langfile $buff)
or continue
sed -i -e '/'$slug'/{p; s/[^=]* = \(.*\)/ .'$buff' = \1/; s/{ \$died_of_buff }/'(string replace / '\\/' $bstr)'/}' $langfile
end
sed -i -E 's/('$slug' \=).*/\1/' $langfile
end
function dofile --argument langfile
sed -i -e s/buff_nonexistent/nonexistent_buff/ $langfile
for entity in pvp npc nonexistent
replacebuffs $langfile $entity
end
sed -i -e s/nonexistent_buff/buff_nonexistent/ $langfile
sed -i -e /hud-outcome-/d $langfile
sed -i -e '/#.*outcomes/d' $langfile
end
for langfile in assets/voxygen/i18n/*/hud/chat.ftl
echo doing $langfile
dofile $langfile
end
```
2023-08-29 17:09:48 +00:00
Sanctorum Thomas
c0f33efa98
rename quest.ftl
2023-08-29 17:40:48 +02:00
Marcel
0c2b4148fe
Merge branch 'master' into 'master'
...
add fr translations
See merge request veloren/veloren!3979
2023-08-29 10:14:49 +00:00
Thomas S
4d21fbaea5
add fr translations
2023-08-29 10:14:48 +00:00
Marcel
0383fdd626
Merge branch 'master' into 'master'
...
Translation: Update zh_Hans
See merge request veloren/veloren!3970
2023-08-29 10:14:46 +00:00
心慌慌脸红红
65b251436f
Translation: Update zh_Hans
2023-08-29 10:14:45 +00:00
Marcel
0413dfdec2
Merge branch 'vasco-welcome-aboard' into 'master'
...
Italian translation (axe abilities, buffs and others...)
See merge request veloren/veloren!3976
2023-08-29 07:32:39 +00:00
Francesco Vasco
bb4b91244e
Italian translation (axe abilities, buffs and others...)
2023-08-29 07:32:39 +00:00
Marcel
2f1597e2cb
Merge branch 'tygyh/Update-swedish-translations' into 'master'
...
Update swedish translations
See merge request veloren/veloren!4025
2023-08-29 07:28:28 +00:00
walpo
c3a993f93a
fix(i18n): fix mistranslations caused by weblate
2023-08-28 22:59:39 +02:00
Christof Petig
a09637c80d
Merge branch 'master' into 'weblate-translation'
...
# Conflicts:
# assets/voxygen/i18n/uk/buff.ftl
# assets/voxygen/i18n/uk/common.ftl
# assets/voxygen/i18n/uk/hud/settings.ftl
2023-08-28 19:43:06 +00:00
Marcel
b1ebac9c9c
Merge branch 'gaxrodi/ukrainian-translation' into 'master'
...
Update the Ukrainian translation
See merge request veloren/veloren!4083
2023-08-28 18:10:29 +00:00
Codeberg Translate
e103b078c3
Update translation files
...
Updated by "Squash Git commits" hook in Weblate.
Translation: Veloren/voxygen-hud-misc
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-misc/
2023-08-28 17:37:37 +00:00
Codeberg Translate
cdd2d00017
Update translation files
...
Updated by "Squash Git commits" hook in Weblate.
Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-group/
Translation: Veloren/voxygen-hud-group
2023-08-28 17:37:37 +00:00
Codeberg Translate
dcabc0ff6a
Update translation files
...
Updated by "Squash Git commits" hook in Weblate.
Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-group/
Translation: Veloren/voxygen-hud-group
2023-08-28 17:37:37 +00:00
Codeberg Translate
37f9ac31a9
Update translation files
...
Updated by "Squash Git commits" hook in Weblate.
Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-group/
Translation: Veloren/voxygen-hud-group
2023-08-28 17:37:37 +00:00
Codeberg Translate
da7e379398
Update translation files
...
Updated by "Squash Git commits" hook in Weblate.
Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-group/
Translation: Veloren/voxygen-hud-group
2023-08-28 17:37:37 +00:00
Codeberg Translate
1b6569ebab
Update translation files
...
Updated by "Squash Git commits" hook in Weblate.
Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-group/
Translation: Veloren/voxygen-hud-group
2023-08-28 17:37:37 +00:00
Codeberg Translate
a503c5e54d
Update translation files
...
Updated by "Squash Git commits" hook in Weblate.
Co-authored-by: Codeberg Translate <translate@codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/veloren/voxygen-hud-group/
Translation: Veloren/voxygen-hud-group
2023-08-28 17:37:37 +00:00
Joshua Barretto
6fbca74e88
Merge branch 'maxicarlos08/dungeon-avoid-cave' into 'master'
...
Cheesing fixes to old-style dungeons
See merge request veloren/veloren!4014
2023-08-19 11:12:01 +00:00
Maxicarlos08
14f433b6cd
used second sfx for teleport event
2023-08-19 11:44:58 +02:00
Gaxrodi
b7f92eb6e1
correction of mistakes #2
2023-08-18 21:10:32 +03:00
Maxicarlos08
dc1756b2df
added sfx (thanks to @flo666)
2023-08-17 22:47:35 +02:00
Gaxrodi
3e348ee33c
Update of subtitles.ftl
2023-08-17 20:51:46 +03:00
Gaxrodi
448aa70929
correction of mistakes
2023-08-17 20:26:37 +03:00
Gaxrodi
dccea51b50
translation of stay/follow
2023-08-17 19:52:17 +03:00
Isse
5a9b83aeb0
Merge branch 'evgenkot/si-prefixes-condition' into 'master'
...
Settings for Si prefixes in the interface menu
See merge request veloren/veloren!4061
2023-08-17 15:24:05 +00:00
Evgen Kot
9f213019d1
Settings for Si prefixes in the interface menu
2023-08-17 15:24:05 +00:00
Maxicarlos08
ce8be9596b
fix pets not following after making them stay and translation
2023-08-17 12:10:32 +02:00
Gaxrodi
0f9feb0a7e
tiny letter correction #2
2023-08-16 18:11:26 +03:00
Gaxrodi
9231123be6
tiny letter correction
2023-08-16 18:04:34 +03:00
tygyh
387d8b47c6
Update swedish translations
2023-08-16 15:13:51 +02:00
Maxicarlos08
92ab8dab9a
require interaction to start teleportation
2023-08-15 12:24:49 +02:00
Maxicarlos08
ac68f0af7b
addressed review comments and added hud interaction
2023-08-15 12:24:49 +02:00
Maxicarlos08
1ea0f249f5
display if pet is currently following or staying
2023-08-15 11:10:54 +02:00
TelepathicWalrus
4bdbb3ff6b
Move stay position to agent
2023-08-15 11:10:54 +02:00
TelepathicWalrus
e611d695b1
Add stay/follow option for pets
2023-08-15 11:10:52 +02:00
Gaxrodi
e54ca7e80d
ukrainian translation of all files
2023-08-14 21:54:31 +03:00
Gaxrodi
1c8d62f147
ukrainian translation of ability.ftl, trade.ftl
2023-08-12 13:17:33 +03:00
tygyh
67dcb2a778
Update swedish translations
2023-08-11 15:04:56 +02:00
Youser Nayme
5ef300c72c
Add keybinding for zooming the camera
2023-08-10 16:55:09 +00:00
flo666
607af6f227
shovel sfx & particles
2023-08-03 21:52:55 +02:00
Isse
a39923e4d6
digging shovel
2023-08-03 19:32:09 +02:00
flo
57fe2c4adb
spawn wyverns
2023-08-02 07:55:10 +00:00
DaforLynx
32f3437fb0
Combat music toggle
2023-07-30 08:10:36 +00:00
Sam
d6fcd893bf
Addressed testing feedback
2023-07-29 19:04:10 -04:00
Sam
9fa556b165
Axe AI
2023-07-29 19:04:07 -04:00
Sam
68181e9b5b
Axe skill tree
2023-07-29 19:04:06 -04:00
Sam
9b126dc502
Localization for english
2023-07-29 19:04:05 -04:00
Sam
188be17b95
Defiance
2023-07-29 19:04:03 -04:00
Sam
820f8dca94
Sunder
2023-07-29 19:04:02 -04:00
Sam
a2deac19ee
Furor
2023-07-29 19:03:59 -04:00
Sam
4a690840e4
Savage sense
2023-07-29 18:53:47 -04:00
Sam
3e8b2b283a
Triple chop
2023-07-29 18:53:44 -04:00
Sam
80ab9c26ec
Initial setup
2023-07-29 18:53:38 -04:00
Marcel
3ad6517aa1
Merge branch 'czech-translation-supply-missing-files' into 'master'
...
Czech translation - adding missing files
See merge request veloren/veloren!4018
2023-07-24 15:02:13 +00:00
Monty Marz
102945b9e7
Dungeon rework initial patch
2023-07-09 20:03:09 +00:00
Jaroslav Lichtblau
e0212f4470
Czech translation - adding missing files
2023-07-09 12:59:58 +02:00
Marcel
fd5fdd1840
Merge branch 'fix-typos-czech-translation' into 'master'
...
Typos fixed in Czech localisation
See merge request veloren/veloren!4016
2023-07-08 10:36:50 +00:00
Marcel
9b73fa0807
Merge branch 'sglorch/translation-de' into 'master'
...
sglorch/translation-de
See merge request veloren/veloren!3996
2023-07-07 15:11:16 +00:00
Stefan Glorch
4cf73b2eb4
sglorch/translation-de
2023-07-07 15:11:16 +00:00
Hugo Famechon
a648c68233
Sort items in inventory by quantity
2023-07-05 19:07:16 +00:00
Jaroslav Lichtblau
bade2a176a
Typos fixed in Czech localisation
2023-07-05 18:44:24 +02:00
Marcel
32c7994cca
Merge branch 'tygyh/Update-swedish-translations' into 'master'
...
Update swedish translations
See merge request veloren/veloren!4009
2023-07-05 13:01:08 +00:00
Samuel Keiffer
dab040baa4
Merge branch 'trade-thirdconfirm' into 'master'
...
Added additional confirmation when trading for nothing.
See merge request veloren/veloren!3997
2023-07-03 23:45:59 +00:00
Marcel
620c58fecc
Merge branch 'bd/esperanto' into 'master'
...
Esperanto translation
See merge request veloren/veloren!3432
2023-07-03 23:34:36 +00:00
Brandon Dyer
a7ff12f012
Esperanto translation
2023-07-03 23:34:35 +00:00
tygyh
0b2ad222dc
Update swedish translations
2023-07-03 21:10:37 +02:00
walpo
9c0046f790
i18n: add bulgarian (bg) translation
2023-07-02 08:50:17 +00:00
Avi Weinstock
ced6880168
Added additional confirmation when trading for nothing.
2023-06-26 10:39:30 -04:00
walpo
b919312d1b
Make i18n language identifiers comply with IETF BCP 47
2023-06-07 13:12:34 +00:00
Justin Shipsey
d90926e4a3
Merge branch 'master' into 'master'
...
updating fr_FR translations
See merge request veloren/veloren!3966
2023-06-04 09:32:10 +00:00
Isse
a884e0e058
Various rtsim related stuff
2023-06-03 22:14:18 +00:00
Thomas S
7e7017d705
adding fr_FR translations
2023-06-01 20:17:51 +02:00
Pedro H
25c3fe3657
Add all missing pt_br translations
2023-05-31 21:19:23 +00:00
Marcel
b5c4b435ff
Merge branch 'vasco-steam' into 'master'
...
Italian translation
See merge request veloren/veloren!3949
2023-05-26 15:01:05 +00:00
Marcel
5b7005f8f4
Merge branch 'tygyh/Update-swedish-translations' into 'master'
...
Update swedish translations
See merge request veloren/veloren!3929
2023-05-26 15:01:01 +00:00
Jonathan Berglin
fc4e1c8a87
Update swedish translations
2023-05-26 15:01:00 +00:00
Francesco Vasco
713533da0b
Italian translation
2023-05-24 22:45:09 +02:00
flo
a55276ea73
seachapel_rework
2023-05-24 18:13:29 +00:00
Francesco Vasco
c6ab618d2e
Italian translation
2023-05-20 11:49:07 +02:00
Marcel
d5ca004d2b
Merge branch 'vasco-adlet' into 'master'
...
Italian translation
See merge request veloren/veloren!3934
2023-05-19 09:35:30 +00:00
Tao In Way
f18297ec75
taoist/charms
2023-05-19 03:07:44 +00:00
Francesco Vasco
295e7003af
Italian translation
2023-05-16 17:50:56 +02:00
flo666
c7831a8ca9
loot_tables yeti&elder ,
...
change drum to wildskin_drum,
add map icons,
yeti attacks buff
2023-05-13 09:32:27 -04:00
flo666
7739aaff78
add more loot
2023-05-13 09:32:24 -04:00
flo666
715a0b7b20
rebase
2023-05-13 09:30:50 -04:00
Marcel
5ade37e0a5
Merge branch 'tygyh/Update-swedish-translations' into 'master'
...
Tygyh/update swedish translations
See merge request veloren/veloren!3922
2023-05-10 15:25:12 +00:00
Jonathan Berglin
448b06ca0a
Tygyh/update swedish translations
2023-05-10 15:25:12 +00:00
Isse
2bc63d22ae
Merge branch 'isse/sittable-sprites' into 'master'
...
Sprites on airships, and mountable sprites
See merge request veloren/veloren!3886
2023-05-10 13:55:51 +00:00
Francesco Vasco
9508fd05bb
Italian translation
2023-05-10 08:17:13 +02:00
Isse
b4c3868dd4
different translation key for mounting Helm
2023-05-09 19:43:10 +02:00
Isse
2928eb8d15
sit on sprites
2023-05-09 19:43:08 +02:00
Joshua Barretto
1cc221f653
Merge branch 'zesterer/rtsim-tweaks' into 'master'
...
Started adding wandering rtsim monsters
See merge request veloren/veloren!3908
2023-05-09 14:51:15 +00:00
Marcel
9ac654baa9
Merge branch 'tygyh/Update-swedish-translations' into 'master'
...
Update swedish translations
See merge request veloren/veloren!3920
2023-05-09 13:22:43 +00:00
Francesco Vasco
232d4c932e
Italian translation
2023-05-08 19:29:24 +02:00
tygyh
7f17520163
Update swedish translations
2023-05-08 17:58:45 +02:00
