Fork Sync: Update from parent repository #42
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
These are a handful of false-positive warnings in idl_parser.cpp all of which have the same essential root cause: the analyzer cannot follow the ECHECK logic where an error return from some function causes an early return from the calling function. Thus it assumes some value can be left null or uninitialized when in fact it cannot.
We were using std::filesystem::file_time_type when we should have been using fs::file_time_type. These types are the same on some platforms, but not on others.
make Bulging Reservoir decrease your thirst, not increase
'vehicle' class cleanup
* does the stuff, renames and eddits discs. * changes the name of the devil dog to the zombie marine. * Adds tweaks to the bestial stalker suggested on discord, as well as an army variant which normal zombie soldiers can evolve into which lacks naval gear in its drops.
'vehicle' class cleanup 2
* Create parking_garage4x4.json Update parking_garage4x4.json * Parking Garage stuff fixes Update parking_garage4x4.json Update overmap_terrain_transportation.json * Fixes * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Apply suggestions from code review * Update data/json/mapgen/parking_garage4x4.json Update parking_garage4x4.json Co-Authored-By: mqrause <[email protected]> * Update parking_garage4x4.json * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update parking_garage4x4.json Update parking_garage4x4.json Update parking_garage4x4.json * Update parking_garage4x4.json * Update parking_garage4x4.json * Apply suggestions from code review Co-authored-by: Bence <[email protected]> * rename rename --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: mqrause <[email protected]> Co-authored-by: Bence <[email protected]>
* Update monster_drops.json * Update monster_drops.json * Update monster_drops.json
Modified "deconstruct" to return more "straw_pile" items, per Issue #64227 - "Straw Beds Give Just 5% of its Straw on Deconstruction"
* Fixed pocket contents displaying each item seperately * remove use of auto * fixed comment * Swap to using display_stacked_with instead of string matching * Removed unused include
* Add two travel-related overmap keybinds for a better UX Add two new keybinds GO_TO_DESTINATION and CENTER_ON_DESTINATION that allow the player to: - Move the cursor to the current travel destination. - Go to the current travel destination without the cursor needing to be on it. I was getting annoyed about constantly having to open the overmap and pan over to my destination over and over again when traveling somewhere to resume traveling after enemies showed up * Use the keyboard_any input_method instead of keyboard_char and keyboard_code because it's unnecessary when setting keybinds for lower case letters Co-authored-by: Jianxiang Wang (王健翔) <[email protected]> --------- Co-authored-by: Jianxiang Wang (王健翔) <[email protected]>
Co-authored-by: Maleclypse <[email protected]> Co-authored-by: anothersimulacrum <[email protected]>
Aftershock - Make atomic coffeepot great again!
…1896) * Makeshift tree spile * Add wild rice plant and seeds * Add wild rice to normal rice recipes * Add Frybread and Indian Taco * Add succotash * Moccasin changes * More moccasin changes * 3 Sisters stew, hazelnut cake and Pemmican * Copying over Gourd changes (not functional yet) * Insert unique ȣ character (does that work?) * Update data/json/recipes/recipe_others.json for reviewdog Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Spelling fixes * Add Sioux Chef * Add butternuts and corresponding trees * Butternut harvest * Bottle gourd additions * Dispersing some bottle gourd seeds * Native settler innawood profession * Update data/json/items/comestibles/raw_veggy.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/comestibles/seed.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/recipe_food.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/recipe_food.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/recipe_food.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/recipe_food.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/recipe_food.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/recipe_food.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/recipe_food.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/recipe_food.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/recipe_food.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/book/cooking.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Dict update * Linting recipe_food.json * Several fixes * Tree spile changes (?) * Json formatting (bot suggestion) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Small fixes and reverts * Removing (postponing) makeshift tree spile * Calorie and density adjustments * Recipe rebalances (for tests) * butternut spoilage (MNG-cataclysm) Co-authored-by: MNG-cataclysm <[email protected]> * ndn_taco calories redone * three sisters calorie redone * Even more calorie shenanigans * last taco tweaks * redo last tweaks * almost done * Add missing info to recipe * tweaking calories... * Update data/json/items/containers.json * Update data/json/recipes/recipe_food.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/recipe_food.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/recipes/recipe_food.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: merrygin <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: MNG-cataclysm <[email protected]> Co-authored-by: Dillon Matchett <[email protected]>
Fix `zinc_metal` stats (and cascade effects)
Co-authored-by: anothersimulacrum <[email protected]>
Routine i18n updates on 18 March 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.