forked from CleverRaven/Cataclysm-DDA
-
Couldn't load subscription status.
- Fork 0
c #14
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.
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
Open
faefux
wants to merge
10,000
commits into
faefux:pants-descs
Choose a base branch
from
CleverRaven:master
base: pants-descs
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
c #14
Conversation
This file contains hidden or 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
Fix description counts on ammo boxes
Fix gas grenades
Build tilesets in CI for releases
* Leather Journal * Create Uncraft file in innawoods * Create uncraft folder and leather uncraft recipes * Delete data/mods/innawood/Uncraft * Delete data/mods/innawood/uncraft directory * uncraft innawoods journal * Update misc.json * normal leather decraft * fix leather uncraft vanilla * fix journal uncraft inna * innawood>nutrition * fix linting header * audit journal weight * leather journal weight adjustment * remove leather innawoods recipe * remove innawoods journal item * override innawoods journal * remove innawood journal uncraft * reduce uncraft time Co-authored-by: Karol1223 <[email protected]> * migrate innawood journal to vanilla * remove 0.I migration * add 0.j migration * create item migration innawoods * add migration to innawood mod * remove mod migration from vanilla * readd innawood leather journal * rename * remove innawood journal --------- Co-authored-by: Karol1223 <[email protected]>
* crystalized sugar can be eaten * add comestible type * update category * category only
* initial commit * adjust nightsand spawnrate down to take other spawn points into account * add a description to lube * uncopy-from the itemgroups * add funny * fix uncrafts * fix uncrafts? * merge toys together
Routine i18n updates on 25 October 2025
Don't count mounted vehicle's fuel as carrying vehicle's
Add clang tidy rule for unicode replacement character
* Update zed_amphibian.json * Update dictionary.txt Add 'bioelectric' to dictionary
Fix missing tilesets in releases
…ing and remove vampiric traits on purge (#83444)
* initial commit * glue is NO_SALVAGE
Fix .460 S&W description
Weekly Changelog 2025-10-20 to 2025-10-27
Update string extractor, part 3
* Initial commit * Add damaging a target that is already on fire * Fix field increasing * Add learning infrastructure * Text edit * Documentation * Profession adjustments
Co-authored-by: mqrause <[email protected]>
* fix oatmeal have oatmeal spawn in one box * add armguard hard add armguard hard to wardrobes with same probability as leg guard hard * appease json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
None yet
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.
Summary
Category "Brief description"
Purpose of change
Describe the solution
Describe alternatives you've considered
Testing
Additional context