Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/pr/39406'
* origin/pr/39406: (125 commits) Update npc_talk_test.cpp Update player_helpers.h temporarily disable padding clang tidy check Update item_pocket.h Update tools.json fix json errors Update item_location.cpp fix merge conflict astyle disable newcharacter test temporarily and maybe fix padding error Update offal_dishes.json fix vehicle interact test move pockets member in itype to attempt to fix padding error fix comestible tests adjust item::fill_with to take itype instead of item parameter fix crafting tests disable iteminfo test fix vehicle efficiency test crash fix seg fault in reloading test Update item.cpp ...
- Loading branch information