Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge conflicts #8

Merged
merged 78 commits into from
Mar 22, 2022
Merged

Merge conflicts #8

merged 78 commits into from
Mar 22, 2022

Commits on Mar 6, 2022

  1. Add comma to hi_q_shatter description

    @Faalagorn
    Faalagorn authored Mar 6, 2022
    Configuration menu
    Copy the full SHA
    4fe759c View commit details
    Browse the repository at this point in the history

  2. 38 special → .38 Special

    @Faalagorn
    Faalagorn authored Mar 6, 2022
    Configuration menu
    Copy the full SHA
    1c60631 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2022

  1. Gunstore, Liquor Store, Fix 

    Update aux_nested.json
    @Maleclypse
    Maleclypse committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    0969211 View commit details
    Browse the repository at this point in the history

  2. Zap Rattigan fixes 

    Update emit.json
    @Maleclypse
    Maleclypse committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    c810c8d View commit details
    Browse the repository at this point in the history

  3. Update XL/XS items to use extend flags

    @Drew4484
    Drew4484 committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    7a3bc80 View commit details
    Browse the repository at this point in the history

  4. Additional flags

    @Drew4484
    Drew4484 committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    89e1f34 View commit details
    Browse the repository at this point in the history

  5. Update custom_gloves.json

    @Drew4484
    Drew4484 committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    8e253fb View commit details
    Browse the repository at this point in the history

  6. Update boots.json

    @Drew4484
    Drew4484 committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    679a932 View commit details
    Browse the repository at this point in the history

  7. Update holster.json

    @Drew4484
    Drew4484 committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    abc7e46 View commit details
    Browse the repository at this point in the history

  8. Update undergarment.json

    @Drew4484
    Drew4484 committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    9d79795 View commit details
    Browse the repository at this point in the history

  9. Cutting chainlink fence will now yield wires, not steel chunks 

    Also added ability to use oxytorch and hacksaw on open chainlink fence.
    @Night-Pryanik
    Night-Pryanik committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    8bf48c5 View commit details
    Browse the repository at this point in the history

  10. Missing comma

    @Drew4484
    Drew4484 committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    5d25a51 View commit details
    Browse the repository at this point in the history

  11. Update suits_protection.json

    @Drew4484
    Drew4484 committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    a1cc364 View commit details
    Browse the repository at this point in the history

  12. Update suits_protection.json

    @Drew4484
    Drew4484 committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    a6ac112 View commit details
    Browse the repository at this point in the history

  13. Update holster.json

    @Drew4484
    Drew4484 committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    527d96c View commit details
    Browse the repository at this point in the history

  14. Add id_suffix to shadowed recipes (#56161) 

    Resolves #56161

* Un-shadowed the following recipes, allowing them to be crafted:
  * armor_scrapsuit
  * armor_tiresuit
  * chem_hmtd
  * chem_nitric_acid
  * gambeson_vest
  * gambeson_vest_xs
  * k_gambeson_vest
  * k_gambeson_vest_xs
  * lc_chainmail_arms
  * pistol_stock
  * pot_copper
  * propane_cooker
  * thread (Spinning Wheel versions)
  * tshirt
  * xl_ch_chainmail_hood
  * xl_gambeson_vest
  * xl_hc_chainmail_hood
  * xl_k_gambeson_vest
  * xl_lc_chainmail_arms
  * xl_lc_chainmail_hood
  * xl_mc_chainmail_hood
  * xl_qt_chainmail_hood
  * xs_armor_lightplate
    @remd
    remd committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    607de6c View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2022

  1. Merge pull request #56160 from Night-Pryanik/chainlink 

    Cutting chainlink fence will now yield wires, not steel chunks
    @Rivet-the-Zombie
    Rivet-the-Zombie authored Mar 18, 2022
    Configuration menu
    Copy the full SHA
    714f560 View commit details
    Browse the repository at this point in the history

  2. Add ASCII picture to missing batteries

    @Faalagorn @BrettDong
    Faalagorn authored and BrettDong committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    6006dfe View commit details
    Browse the repository at this point in the history

  3. Tacoma grammar updates. Change knife spear to simple knife spear

    @haveric
    haveric committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    b8d0af2 View commit details
    Browse the repository at this point in the history

  4. Fix missing appliance removal prompt

    @dseguin
    dseguin committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    ca694c5 View commit details
    Browse the repository at this point in the history

  5. More grammar fixes

    @haveric
    haveric committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    62e8a99 View commit details
    Browse the repository at this point in the history

  6. Mosin-Nagant 91/30 Boreal → 1891/30 Boreal 

    Update Magiclysm Mosin name to match other
    @Faalagorn
    Faalagorn authored Mar 18, 2022
    Configuration menu
    Copy the full SHA
    aeeed33 View commit details
    Browse the repository at this point in the history

  7. Convert buying logs to json

    @haveric
    haveric committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    4ef781a View commit details
    Browse the repository at this point in the history

  8. jackolantern → jack o'lantern

    @Faalagorn
    Faalagorn authored Mar 18, 2022
    Configuration menu
    Copy the full SHA
    28004e5 View commit details
    Browse the repository at this point in the history

  9. Extract inline weakpoint strings for monsters

    @dseguin
    dseguin committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    9d23333 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2022

  1. Routine i18n updates on 19 March 2022

    @BrettDong
    BrettDong committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    1c9a0f4 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #56194 from Faalagorn/patch-4 

    Mosin-Nagant 91/30 Boreal → 1891/30 Boreal
    @KorGgenT
    KorGgenT authored Mar 19, 2022
    Configuration menu
    Copy the full SHA
    1b95893 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #56197 from Faalagorn/patch-7 

    Fix jackolantern → jack o'lantern
    @Rivet-the-Zombie
    Rivet-the-Zombie authored Mar 19, 2022
    Configuration menu
    Copy the full SHA
    f2c491b View commit details
    Browse the repository at this point in the history

  4. Merge pull request #56206 from CleverRaven/i18n 

    Routine i18n updates on 19 March 2022
    @Rivet-the-Zombie
    Rivet-the-Zombie authored Mar 19, 2022
    Configuration menu
    Copy the full SHA
    f335922 View commit details
    Browse the repository at this point in the history

  5. Fix 3 typos in doc

    @Faalagorn
    Faalagorn authored Mar 19, 2022
    Configuration menu
    Copy the full SHA
    ba7fb7b View commit details
    Browse the repository at this point in the history

  6. Revert "Reuse the input_context in uilists and create queues only fro… 

    …m available hotkeys"

This reverts commit 18256de.
    @Qrox
    Qrox committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    4636d4f View commit details
    Browse the repository at this point in the history

  7. Properly fix conflicting uilist hotkeys in symbol keyboard mode

    @Qrox
    Qrox committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    fb736ff View commit details
    Browse the repository at this point in the history

  8. Add missing dot for dialog response

    @Faalagorn
    Faalagorn authored Mar 19, 2022
    Configuration menu
    Copy the full SHA
    66e978e View commit details
    Browse the repository at this point in the history

  9. Change multi-tool → multitool to match others

    @Faalagorn
    Faalagorn authored Mar 19, 2022
    Configuration menu
    Copy the full SHA
    ef4e7a1 View commit details
    Browse the repository at this point in the history

  10. fix: extra sign in exoddi base

    @casswedson
    casswedson committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    1d16d7c View commit details
    Browse the repository at this point in the history

  11. Mark Artisan gun "Crack!" appear in translation

    @Faalagorn
    Faalagorn authored Mar 19, 2022
    Configuration menu
    Copy the full SHA
    334437d View commit details
    Browse the repository at this point in the history

  12. Add context to mustard

    @Faalagorn
    Faalagorn authored Mar 19, 2022
    Configuration menu
    Copy the full SHA
    6831230 View commit details
    Browse the repository at this point in the history

  13. fix: don't validate empty summary lines

    @casswedson
    casswedson committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    bb7e903 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2022

  1. Merge pull request #56040 from Faalagorn/patch-2 

    Add ASCII picture to missing batteries
    @ZhilkinSerg
    ZhilkinSerg authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    851d472 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #56228 from Faalagorn/patch-10 

    Add context to mustard
    @ZhilkinSerg
    ZhilkinSerg authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    9eb621e View commit details
    Browse the repository at this point in the history

  3. movecost → move cost (#56225)

    @Faalagorn
    Faalagorn authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    6d104da View commit details
    Browse the repository at this point in the history

  4. Merge pull request #56213 from Faalagorn/patch-7 

    Add missing dot for dialog response
    @ZhilkinSerg
    ZhilkinSerg authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    7bc010c View commit details
    Browse the repository at this point in the history

  5. Merge pull request #56210 from Faalagorn/patch-4 

    Fix typos in doc
    @ZhilkinSerg
    ZhilkinSerg authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    bf9739b View commit details
    Browse the repository at this point in the history

  6. Remove duplicate hotkeys from debug menu (#56058) 

    Co-authored-by: Anton Burmistrov <[email protected]>
    @Faalagorn @Night-Pryanik
    Faalagorn and Night-Pryanik authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    3a0a151 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #56221 from Faalagorn/patch-9 

    Mark Artisan gun "Crack!" appear in translation
    @ZhilkinSerg
    ZhilkinSerg authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    33dd572 View commit details
    Browse the repository at this point in the history

  8. Polish playlist id expansion feature from #56045 (#56203)

    @MegasKomnenos
    MegasKomnenos authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    204aafe View commit details
    Browse the repository at this point in the history

  9. Merge pull request #56201 from dseguin/extract_mon_weakpoint 

    Translate inline weakpoint names
    @ZhilkinSerg
    ZhilkinSerg authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    8728953 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #56214 from Faalagorn/patch-8 

    Change multi-tool → multitool to match others
    @Rivet-the-Zombie
    Rivet-the-Zombie authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    4339270 View commit details
    Browse the repository at this point in the history

  11. Remove "none" plurals (#56230) 

    Co-authored-by: Jianxiang Wang (王健翔) <[email protected]>
    @Faalagorn @Qrox
    Faalagorn and Qrox authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    b012a87 View commit details
    Browse the repository at this point in the history

  12. flaming eye aggression (#56226)

    @LyleSY
    LyleSY authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    5dcb123 View commit details
    Browse the repository at this point in the history

  13. Translate game window title (#56218) 

    Co-authored-by: haveric <[email protected]>
    @Qrox @haveric
    Qrox and haveric authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    031fbf6 View commit details
    Browse the repository at this point in the history

  14. Translate "something" in monster attack messages (#56200)

    @haveric
    haveric authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    dc5ca2a View commit details
    Browse the repository at this point in the history

  15. Merge pull request #56212 from Qrox/queue 

    Properly fix conflicting `uilist` keys
    @ZhilkinSerg
    ZhilkinSerg authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    43c8dde View commit details
    Browse the repository at this point in the history

  16. Merge pull request #56192 from haveric/tacoma-buy-logs 

    Tacoma - Convert buying logs to json
    @ZhilkinSerg
    ZhilkinSerg authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    d2dd947 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #56189 from dseguin/fix_app_remove_prompt 

    Fix missing appliance removal prompt
    @ZhilkinSerg
    ZhilkinSerg authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    9da10a0 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #56188 from haveric/tacoma-grammar 

    Tacoma grammar updates. Change knife spear to simple knife spear
    @ZhilkinSerg
    ZhilkinSerg authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    27a0937 View commit details
    Browse the repository at this point in the history

  19. Merge pull request #56177 from remd/fix-shadowed-recipes-56161 

    Add id_suffix to shadowed recipes (#56161)
    @ZhilkinSerg
    ZhilkinSerg authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    4bae97b View commit details
    Browse the repository at this point in the history

  20. Merge pull request #56216 from casswedson/remove-extra-sign 

    fix: extra sign in exoddi base
    @ZhilkinSerg
    ZhilkinSerg authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    c8a5cfc View commit details
    Browse the repository at this point in the history

  21. Merge pull request #56227 from casswedson/validate-this 

    fix: don't validate empty summary descriptions
    @ZhilkinSerg
    ZhilkinSerg authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    7d6f59f View commit details
    Browse the repository at this point in the history

  22. More variants phone cases and t-shirts (#56041) 

    Co-Authored-By: TheShadowFerret <[email protected]>
    @Maleclypse @TheShadowFerret
    Maleclypse and TheShadowFerret authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    14b4f11 View commit details
    Browse the repository at this point in the history

  23. Merge pull request #55886 from Faalagorn/patch-29 

    Add comma to hi_q_shatter description
    @ZhilkinSerg
    ZhilkinSerg authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    1dc9b93 View commit details
    Browse the repository at this point in the history

  24. Merge pull request #55893 from Faalagorn/patch-32 

    38 special → .38 Special
    @ZhilkinSerg
    ZhilkinSerg authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    74d8870 View commit details
    Browse the repository at this point in the history

  25. Merge pull request #56158 from Drew4484/Extend-oversize-and-undersize… 

    …-flags

Update XL/XS items to use extend flags
    @ZhilkinSerg
    ZhilkinSerg authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    9e68d86 View commit details
    Browse the repository at this point in the history

  26. Merge pull request #56147 from Maleclypse/Fix-all-looted-places-havin… 

    …g-ammo

Gunstore, Liquor Store, Fix
    @ZhilkinSerg
    ZhilkinSerg authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    ec072f8 View commit details
    Browse the repository at this point in the history

  27. Merge pull request #56149 from Maleclypse/RatLab-fixes 

    Zap Rattigan fixes
    @ZhilkinSerg
    ZhilkinSerg authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    d856bf9 View commit details
    Browse the repository at this point in the history

  28. Hellfire Stew (#55943) 

    Co-authored-by: AtomicFox556 <[email protected]>
    @Maleclypse
    Maleclypse and AtomicFox556 authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    178dbc8 View commit details
    Browse the repository at this point in the history

  29. Consistent Marloss/Mycal casing

    @Faalagorn
    Faalagorn authored Mar 20, 2022
    Configuration menu
    Copy the full SHA
    5df7600 View commit details
    Browse the repository at this point in the history

  30. Prevent potential null pointer dereferencing in talk_effect_fun_t::se… 

    …t_spawn_monster()
    @BrettDong
    BrettDong committed Mar 20, 2022
    Configuration menu
    Copy the full SHA
    aaae9dc View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2022

  1. Fix book plurals + minor typos

    @Faalagorn
    Faalagorn authored Mar 21, 2022
    Configuration menu
    Copy the full SHA
    b59f7d8 View commit details
    Browse the repository at this point in the history

  2. Fix MARTIAL_ARTS5 description

    @ZombieZilla
    ZombieZilla authored Mar 21, 2022
    Configuration menu
    Copy the full SHA
    dcab3b1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #56273 from ZombieZilla/patch-1 

    Add Bōjutsu to mutation description
    @Rivet-the-Zombie
    Rivet-the-Zombie authored Mar 21, 2022
    Configuration menu
    Copy the full SHA
    3b9e1a3 View commit details
    Browse the repository at this point in the history

  4. Fix mechanic recipes typos

    @Faalagorn
    Faalagorn authored Mar 21, 2022
    Configuration menu
    Copy the full SHA
    6b6f9a9 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2022

  1. Merge pull request #56286 from Faalagorn/patch-2 

    Fix mechanic recipes typos
    @Rivet-the-Zombie
    Rivet-the-Zombie authored Mar 22, 2022
    Configuration menu
    Copy the full SHA
    880df58 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #56261 from BrettDong/spawn 

    Prevent potential null pointer dereferencing in talk_effect_fun_t::set_spawn_monster()
    @ZhilkinSerg
    ZhilkinSerg authored Mar 22, 2022
    Configuration menu
    Copy the full SHA
    8d98924 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #56268 from Faalagorn/books 

    Fix book plurals + minor typos
    @ZhilkinSerg
    ZhilkinSerg authored Mar 22, 2022
    Configuration menu
    Copy the full SHA
    4c34acb View commit details
    Browse the repository at this point in the history

  4. Merge pull request #56251 from Faalagorn/marloss-mycal 

    Consistent Marloss/Mycus/Mycal case
    @ZhilkinSerg
    ZhilkinSerg authored Mar 22, 2022
    Configuration menu
    Copy the full SHA
    f740204 View commit details
    Browse the repository at this point in the history

  5. Fix food plurals + minor typos (#56255) 

    Co-authored-by: haveric <[email protected]>
    @Faalagorn @haveric
    Faalagorn and haveric authored Mar 22, 2022
    Configuration menu
    Copy the full SHA
    ee6697c View commit details
    Browse the repository at this point in the history

  6. [DinoMod] hadrosaurus (#56295)

    @LyleSY
    LyleSY authored Mar 22, 2022
    Configuration menu
    Copy the full SHA
    5b2d73d View commit details
    Browse the repository at this point in the history