Marcel
|
160cbbf449
|
Merge branch 'steel_pick_desc' into 'master'
Removes blue vein reference from Steel Pickaxe description
See merge request veloren/veloren!3491
|
2022-10-09 19:50:31 +00:00 |
|
Julio Cezar Silva
|
0d090bb93e
|
Removes blue vein reference from Steel Pickaxe description
|
2022-10-09 19:50:30 +00:00 |
|
Joshua Barretto
|
dbc7ac9710
|
Merge branch 'kilpkonn/fix_agent_target_unset_in_trade' into 'master'
Fix npcs untargeting trade partner while in trade
Closes #1725
See merge request veloren/veloren!3649
|
2022-10-07 15:06:40 +00:00 |
|
Tavo Annus
|
fcd7447991
|
Fix npcs untargeting trade partner while in trade
|
2022-10-07 15:17:49 +03:00 |
|
Marcel
|
d4f5a18bd0
|
Merge branch 'tygyh/Swedish-translations' into 'master'
Update swedish translation
See merge request veloren/veloren!3648
|
2022-10-05 09:12:16 +00:00 |
|
tygyh
|
fcc096c599
|
Update swedish translation
|
2022-10-05 09:48:18 +02:00 |
|
Marcel
|
6844094389
|
Merge branch 'kitswas/worldgen-spawn-fixes' into 'master'
Spawn fix(es)
See merge request veloren/veloren!3579
|
2022-10-05 07:07:43 +00:00 |
|
Marcel
|
f07c0b67ee
|
Merge branch 'update_simplified_chinese' into 'master'
Upgrade Simplified Chinese Translation
See merge request veloren/veloren!3641
|
2022-10-04 22:59:41 +00:00 |
|
WanCheng Ye
|
85b345054e
|
Upgrade Simplified Chinese Translation
|
2022-10-04 22:59:41 +00:00 |
|
Marcel
|
b9c249940c
|
Merge branch 'galaipa/update-eu' into 'master'
Translate missing Basque strings
See merge request veloren/veloren!3647
|
2022-10-04 22:25:23 +00:00 |
|
Bingen Galartza
|
4c4a1bf80b
|
Translate missing Basque strings
|
2022-10-04 22:25:23 +00:00 |
|
Marcel
|
4b0033ff91
|
Merge branch 'Nether190/update-pt_BR' into 'master'
Nether190/update-pt_BR
See merge request veloren/veloren!3632
|
2022-10-04 22:10:11 +00:00 |
|
Valter Sanches
|
60c3d80d57
|
Nether190/update-pt_BR
|
2022-10-04 22:10:11 +00:00 |
|
Marcel
|
f584a3f0f6
|
Merge branch 'fix_Latin-American_translation' into 'master'
correction in the translation Spanish Latin American
See merge request veloren/veloren!3646
|
2022-10-04 21:50:03 +00:00 |
|
Marcel
|
e5dfc6261c
|
Merge branch 'ztianyang/lantern' into 'master'
Crafting recipe for black lantern
See merge request veloren/veloren!3590
|
2022-10-02 17:46:38 +00:00 |
|
Tianyang Zhang
|
99bedde100
|
Crafting recipe for black lantern
|
2022-10-02 17:46:36 +00:00 |
|
Marcel
|
e61c2eac84
|
Merge branch 'meyerhenning/fix_german_translation' into 'master'
Complete German Translation
See merge request veloren/veloren!3645
|
2022-10-02 17:45:26 +00:00 |
|
Henning Meyer
|
8581d3da38
|
Complete German Translation
|
2022-10-02 17:45:26 +00:00 |
|
Juan Pablo Lagos
|
b716284ef2
|
correction in the translation Spanish Latin American
|
2022-10-02 17:09:55 +09:00 |
|
Marcel
|
477098de16
|
Merge branch 'meyerhenning/fix_german_translation' into 'master'
German Translation Edits
See merge request veloren/veloren!3644
|
2022-10-01 16:53:27 +00:00 |
|
Henning Meyer
|
fee11cc438
|
German Translation Edits
|
2022-10-01 16:53:27 +00:00 |
|
Marcel
|
3d8cd6fb04
|
Merge branch 'juliancoffee/fix-i18n' into 'master'
Follow-up from i18n-helpers MR
See merge request veloren/veloren!3643
|
2022-10-01 16:01:23 +00:00 |
|
Marcel
|
95edd377f1
|
Merge branch 'trade-pets-food' into 'master'
Allow pets to be traded with.
See merge request veloren/veloren!3633
|
2022-10-01 16:01:21 +00:00 |
|
juliancoffee
|
9dc07a38db
|
Follow-up from i18n-helpers MR
|
2022-10-01 18:35:36 +03:00 |
|
Avi Weinstock
|
e6576f0cf3
|
Make the trading AI for pets only accept food.
|
2022-09-30 15:11:03 -04:00 |
|
Avi Weinstock
|
ff781198d3
|
Fix 18-slot pets (they now properly get inventories based on their body type, which is usually 1-slot).
Also fixes a related issue where pets lose their natural weapons/armour.
|
2022-09-30 14:51:49 -04:00 |
|
Avi Weinstock
|
60f5383f8b
|
Address comments for MR 3633.
|
2022-09-30 14:51:49 -04:00 |
|
Avi Weinstock
|
c62bc0dd0d
|
Allow pets to be traded with.
|
2022-09-30 14:51:49 -04:00 |
|
Marcel
|
dd5523785c
|
Merge branch 'master' into 'master'
UA localization update
See merge request veloren/veloren!3640
|
2022-09-29 18:00:41 +00:00 |
|
fanix472
|
34e75a1796
|
UA localization update
|
2022-09-29 18:00:40 +00:00 |
|
Marcel
|
abbcc45fe6
|
Merge branch 'xMAC94x/chat_cleanup' into 'master'
xmac94x/chat cleanup
See merge request veloren/veloren!3617
|
2022-09-29 17:41:29 +00:00 |
|
Marcel Märtens
|
0fe0192a2d
|
get rid of string replacements in template strings
|
2022-09-29 17:33:53 +02:00 |
|
Marcel Märtens
|
81cdcfc1a0
|
move voxygen/i18n to client/i18n to indicate that it can be used by more frontends if they want to make use of our helpers
|
2022-09-27 14:09:20 +02:00 |
|
Marcel Märtens
|
7f46bc5b78
|
switch name to i18n-helpers
|
2022-09-27 13:46:13 +02:00 |
|
Marcel Märtens
|
ba260e8419
|
translate MOD and YOU messages
|
2022-09-27 13:46:12 +02:00 |
|
Marcel Märtens
|
cc3fcfce8c
|
initial approach of utelising chat-i18n crate by chat-cli bot
|
2022-09-27 13:46:12 +02:00 |
|
Marcel Märtens
|
a0ef3be9ac
|
remove hardcoded localisation from client
|
2022-09-27 13:46:12 +02:00 |
|
Marcel
|
46cd112928
|
Merge branch 'xMAC94x/reenabled_coverage' into 'master'
reenable coverage
See merge request veloren/veloren!3642
|
2022-09-26 13:34:56 +00:00 |
|
Marcel Märtens
|
b6f6de62b5
|
reenable coverage
|
2022-09-26 08:36:17 +02:00 |
|
Marcel
|
17c940e0f8
|
Merge branch 'xMAC94x/update_toolchain' into 'master'
update toolchain to `2022-09-23`
See merge request veloren/veloren!3615
|
2022-09-25 19:44:58 +00:00 |
|
Marcel Märtens
|
f3ed41a566
|
switch to new CACHE_IMAGE_TAG
|
2022-09-25 20:42:45 +02:00 |
|
Marcel
|
a1d0d0283f
|
Merge branch 'Welvex/update-es_LA' into 'master'
Update the Spanish LA translation.
See merge request veloren/veloren!3635
|
2022-09-25 17:07:31 +00:00 |
|
Welvex
|
10e4b94599
|
Update the Spanish LA translation.
|
2022-09-25 17:07:31 +00:00 |
|
Marcel
|
3962d0b822
|
Merge branch 'xMAC94x/enum_iter_removal' into 'master'
remove enum_iterator with strum, fixes #1723
Closes #1723
See merge request veloren/veloren!3638
|
2022-09-25 15:07:43 +00:00 |
|
Marcel Märtens
|
1e1ee5031f
|
remove enum_iterator with strum, fixes #1723
|
2022-09-25 16:09:46 +02:00 |
|
Marcel Märtens
|
cf6a764aa4
|
update toolchain to 2022-09-23
|
2022-09-25 15:58:32 +02:00 |
|
Marcel Märtens
|
c2b453f6f1
|
update toolchain to 2022-09-08
This reverts commit 6c9deee491.
This reverts commit a32b269252.
|
2022-09-24 00:04:40 +02:00 |
|
Marcel
|
3490600ca0
|
Merge branch 'xMAC94x/update-deps2' into 'master'
update_deps_2 - now with more expirmental stuff
See merge request veloren/veloren!3634
|
2022-09-23 21:44:50 +00:00 |
|
Joshua Barretto
|
963d5a84b5
|
Merge branch 'zesterer/mini-fixes' into 'master'
Improved water shaders
See merge request veloren/veloren!3636
|
2022-09-23 00:32:52 +00:00 |
|
Joshua Barretto
|
0b0fde5254
|
Faster wave shader
|
2022-09-23 00:08:23 +01:00 |
|