Maxicarlos08
922a592c8d
fixed migrations
2023-07-27 00:24:43 +02:00
Christof Petig
0f7daf9920
Merge branch 'qsto/potion-fixes' into 'master'
...
Potions fixes
See merge request veloren/veloren!4041
2023-07-26 21:23:08 +00:00
Michal Sroczynski
2c220e5548
Fix
2023-07-26 15:28:32 +02:00
Michal Sroczynski
ced87c08ec
Fix
2023-07-25 20:55:42 +02:00
Michal Sroczynski
d2aec43e9e
Changelog
2023-07-25 20:39:30 +02:00
Michal Sroczynski
ccd469cb0a
Potions fixes
2023-07-25 20:37:51 +02:00
Michal Sroczynski
74a0c9caa3
Revert "Potions fixes"
...
This reverts commit 1a52c4d24d
2023-07-25 20:03:56 +02:00
Michal Sroczynski
1a52c4d24d
Potions fixes
2023-07-25 17:28:21 +02: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
JimmyDdotEXE
77fb2150d9
addressed code quality issues noted by pipeline
2023-07-23 21:13:06 -04:00
JimmyDdotEXE
8fd30ea55b
left and right bumpers as layer buttons on controller
2023-07-23 21:13:05 -04:00
Marcel
90e33e96bd
Merge branch 'qsto/instruments-recipes-fix' into 'master'
...
Instruments recipes fix
See merge request veloren/veloren!4034
2023-07-23 21:45:56 +00:00
Michał
45170212c5
Instruments recipes fix
2023-07-23 21:45:54 +00:00
Marcel
530e57d10e
Merge branch 'qsto/cyclop-loot-fix' into 'master'
...
Wild cyclop loot fix
See merge request veloren/veloren!4036
2023-07-23 21:33:19 +00:00
Michał
89ce7a5c3a
Wild cyclop loot fix
2023-07-23 21:33:18 +00:00
Samuel Keiffer
9f2ece3199
Merge branch 'remove-coin-counter' into 'master'
...
Remove coin counter at the bottom of inventories.
See merge request veloren/veloren!3998
2023-07-23 17:29:23 +00:00
Isse
b4edcdee5d
Merge branch 'qsto/juicier-meats' into 'master'
...
Loot, foods and salvage tweaks
See merge request veloren/veloren!4017
2023-07-19 14:16:20 +00:00
Michał
29a1a7050b
Loot, foods and salvage tweaks
2023-07-19 14:16:20 +00:00
Marcel
9cbbf5c28b
Merge branch 'imbris/fix-3983' into 'master'
...
Revert GIT_STRATEGY: none from !3983
See merge request veloren/veloren!4033
2023-07-19 13:19:22 +00:00
Imbris
02637ff347
Revert GIT_STRATEGY: none from !3983 , it turns out that the git repo is
...
actually needed in the docker job for the docker file in the server-cli
folder... although it is only 1 file so there may be more efficient ways
to get it...
2023-07-18 21:33:02 -04:00
Marcel
7bc3596caa
Merge branch 'xMAC94x/remove_old_code' into 'master'
...
update mumble-link and remove a old path handling
See merge request veloren/veloren!4030
2023-07-17 21:39:39 +00:00
Imbris
93adeaa491
Merge branch 'imbris/minor-ci-opt' into 'master'
...
Minor CI optimization
See merge request veloren/veloren!3983
2023-07-17 10:09:44 +00:00
Marcel Märtens
31da906f84
update mumble-link and remove a old path to migrate pre-2020 voxygen saves to the new save location
...
With this change people with older version need to run a version from 2021-2022 before updating to this change and start singleplayer once.
Get rid of old rust dependencies
2023-07-17 10:50:53 +02:00
Imbris
fb99265d4a
Use common base image for gittag job
2023-07-16 20:30:56 -04:00
Imbris
f0a324e729
Minor CI optimization (don't fetch git repo in docker publishing job
...
where we don't use it)
(and cargo decided to update cfg-if version in random dependency)
2023-07-16 20:30:55 -04:00
Avi Weinstock
2c7a9d1a7a
Use SI prefixes as suffixes for shortening item quantities shown in slots, to prevent the quantity associated with large stacks from overflowing into adjacent grid cells.
2023-07-14 11:02:37 -04:00
Avi Weinstock
7f06607899
Remove coin counter at the bottom of inventories.
2023-07-14 11:02:37 -04:00
Maxicarlos08
9901ba691e
fix alignment of wanderer's hat and a typo
2023-07-14 00:59:27 +02:00
Maxicarlos08
2cbb104243
Miner helmet migrations
2023-07-13 17:18:46 +02:00
Maxicarlos08
b16b1bf51f
Fix alignments and remove unused variations
2023-07-13 17:11:07 +02:00
flo666
326d33d935
re-add helmet definitions & fix offsets, add missing helmets in image and drop manifest
2023-07-13 16:25:43 +02:00
Maxicarlos08
d057e9d4d6
remove incorret chieftain mask definitions
2023-07-13 14:19:04 +02:00
Isse
1605fdb610
Merge branch 'fix_desertcity_repairbench' into 'master'
...
fix_desertcity_repairbench
See merge request veloren/veloren!4023
2023-07-13 11:30:53 +00:00
flo
36889f671e
fix_desertcity_repairbench
2023-07-13 11:30:53 +00:00
Marcel
e48ef26952
Merge branch 'floppy_coastal_town' into 'master'
...
coastal_town
See merge request veloren/veloren!3887
2023-07-12 23:02:40 +00:00
flo
b556befe73
coastal_town
2023-07-12 23:02:40 +00:00
Igigog
02cb319624
Refactor save_thread function
2023-07-12 21:46:57 +02:00
Monty Marz
f94061dbfb
Merge branch 'dwarven_quarry' into 'master'
...
Dwarven Dungeon
See merge request veloren/veloren!3978
2023-07-09 20:03:10 +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
Marcel
b79ef70a17
Merge branch 'consumable-improvements' into 'master'
...
Small reduction of craftable consumables costs
See merge request veloren/veloren!4011
2023-07-06 12:13:14 +00:00
Marcel
ac4b277d7c
Merge branch 'loot-changes' into 'master'
...
Loot changes
See merge request veloren/veloren!4007
2023-07-06 12:11:29 +00:00
Michał
a8ce3240c2
Loot changes
2023-07-06 12:11:28 +00:00
Marcel
6d966eede2
Merge branch 'RunRobDog/Spawn-Entities-tab' into 'master'
...
RunRobDog/spawn entities tab
See merge request veloren/veloren!3877
2023-07-06 11:37:42 +00:00
Marcel
34ffad71df
Merge branch 'xMAC94x/tcp_buffer' into 'master'
...
increase the TCP Recv Buffer
See merge request veloren/veloren!4013
2023-07-06 10:45:17 +00:00
Isse
8afcf07465
Merge branch 'Fengo/sort_by_quantity' into 'master'
...
Sort items in inventory by quantity
See merge request veloren/veloren!4015
2023-07-05 19:07:17 +00:00
Hugo Famechon
a648c68233
Sort items in inventory by quantity
2023-07-05 19:07:16 +00:00
