Commits · master · André / veloren

Browse files

Oct 10, 2022
- Merge branch 'zesterer/citadel' into 'master' · 536bb9b7
  Isse authored Oct 10, 2022
  536bb9b7
- Merge branch 'james/recipes' into 'master' · 51b67992
  Samuel Keiffer authored Oct 10, 2022
  51b67992
- Add unit test to validate recipe keys · 99d547c7
  James Melkonian authored Oct 09, 2022
  
  99d547c7
Oct 09, 2022
- fmt · 2ba5b338
  Isse authored Oct 10, 2022
  
  2ba5b338
- fix warnings · c8a08b47
  Isse authored Oct 09, 2022
  
  c8a08b47
- sync · 0a6ac5f5
  Joshua Barretto authored Jun 23, 2022 and Isse committed Oct 09, 2022
  
  0a6ac5f5
- Added redwoods · 68df88a7
  Joshua Barretto authored Mar 02, 2022 and Isse committed Oct 09, 2022
  
  68df88a7
- Added dead trees · 1392a866
  Joshua Barretto authored Mar 02, 2022 and Isse committed Oct 09, 2022
  
  1392a866
- Began work on citadel · 0b5d043d
  Joshua Barretto authored Mar 02, 2022 and Isse committed Oct 09, 2022
  
  0b5d043d
- Merge branch 'steel_pick_desc' into 'master' · 160cbbf4
  Marcel authored Oct 09, 2022
  View commits for tag nightly nightly
  160cbbf4
- Removes blue vein reference from Steel Pickaxe description · 0d090bb9
  Julio Cezar Silva authored Oct 09, 2022 and Marcel committed Oct 09, 2022
  
  0d090bb9
Oct 07, 2022
- Merge branch 'kilpkonn/fix_agent_target_unset_in_trade' into 'master' · dbc7ac97
  Joshua Barretto authored Oct 07, 2022
  dbc7ac97
- Fix npcs untargeting trade partner while in trade · fcd74479
  Tavo Annus authored Oct 06, 2022
  
  fcd74479
Oct 05, 2022
- Merge branch 'tygyh/Swedish-translations' into 'master' · d4f5a18b
  Marcel authored Oct 05, 2022
  View commits for tag weekly weekly
  d4f5a18b
- Update swedish translation · fcc096c5
  tygyh authored Oct 05, 2022
  
  fcc096c5
- Merge branch 'kitswas/worldgen-spawn-fixes' into 'master' · 68440943
  Marcel authored Oct 05, 2022
  68440943
Oct 04, 2022
- Merge branch 'update_simplified_chinese' into 'master' · f07c0b67
  Marcel authored Oct 04, 2022
  f07c0b67
- Upgrade Simplified Chinese Translation · 85b34505
  WanCheng Ye authored Oct 04, 2022 and Marcel committed Oct 04, 2022
  
  85b34505
- Merge branch 'galaipa/update-eu' into 'master' · b9c24994
  Marcel authored Oct 04, 2022
  b9c24994
- Translate missing Basque strings · 4c4a1bf8
  Bingen Galartza authored Oct 04, 2022 and Marcel committed Oct 04, 2022
  
  4c4a1bf8
- Merge branch 'Nether190/update-pt_BR' into 'master' · 4b0033ff
  Marcel authored Oct 04, 2022
  4b0033ff
- Nether190/update-pt_BR · 60c3d80d
  Valter Sanches authored Oct 04, 2022 and Marcel committed Oct 04, 2022
  
  60c3d80d
- Merge branch 'fix_Latin-American_translation' into 'master' · f584a3f0
  Marcel authored Oct 04, 2022
  f584a3f0
Oct 02, 2022
- Merge branch 'ztianyang/lantern' into 'master' · e5dfc626
  Marcel authored Oct 02, 2022
  e5dfc626
- Crafting recipe for black lantern · 99bedde1
  Tianyang Zhang authored Oct 02, 2022 and Marcel committed Oct 02, 2022
  
  99bedde1
- Merge branch 'meyerhenning/fix_german_translation' into 'master' · e61c2eac
  Marcel authored Oct 02, 2022
  e61c2eac
- Complete German Translation · 8581d3da
  Henning Meyer authored Oct 02, 2022 and Marcel committed Oct 02, 2022
  
  8581d3da
- correction in the translation Spanish Latin American · b716284e
  Juan Pablo Lagos authored Oct 02, 2022
  
  b716284e
Oct 01, 2022
- Merge branch 'meyerhenning/fix_german_translation' into 'master' · 477098de
  Marcel authored Oct 01, 2022
  477098de
- German Translation Edits · fee11cc4
  Henning Meyer authored Oct 01, 2022 and Marcel committed Oct 01, 2022
  
  fee11cc4
- Merge branch 'juliancoffee/fix-i18n' into 'master' · 3d8cd6fb
  Marcel authored Oct 01, 2022
  3d8cd6fb
- Merge branch 'trade-pets-food' into 'master' · 95edd377
  Marcel authored Oct 01, 2022
  95edd377
- Follow-up from i18n-helpers MR · 9dc07a38
  Illia Denysenko authored Sep 30, 2022
  
  9dc07a38
Sep 30, 2022
- Make the trading AI for pets only accept food. · e6576f0c
  Avi Weinstock authored Sep 26, 2022
  
  e6576f0c
- Fix 18-slot pets (they now properly get inventories based on their body type,... · ff781198
  Avi Weinstock authored Sep 22, 2022
  ff781198
- Address comments for MR 3633. · 60f5383f
  Avi Weinstock authored Sep 22, 2022
  
  60f5383f
- Allow pets to be traded with. · c62bc0dd
  Avi Weinstock authored Sep 21, 2022
  
  c62bc0dd
Sep 29, 2022
- Merge branch 'master' into 'master' · dd552378
  Marcel authored Sep 29, 2022
  dd552378
- UA localization update · 34e75a17
  fanix472 authored Sep 29, 2022 and Marcel committed Sep 29, 2022
  
  34e75a17
- Merge branch 'xMAC94x/chat_cleanup' into 'master' · abbcc45f
  Marcel authored Sep 29, 2022
  abbcc45f