Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/craftmenu-localization' into cra…
Browse files Browse the repository at this point in the history 
…ftmenu-localization

# Conflicts:
#	Resources/Prototypes/Recipes/Crafting/smokeables.yml
  • Loading branch information
@Ertanic
Ertanic committed Sep 20, 2024
2 parents 10ce5c0 + c71c2eb commit 9aaffd4
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 9aaffd4

Please sign in to comment.