Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/upstream_merge_09092024' into up…
Browse files Browse the repository at this point in the history
…stream_merge_09092024
  • Loading branch information
Peptide90 committed Sep 18, 2024
2 parents 2ef07ae + b9b89a7 commit b28f00f
Show file tree
Hide file tree
Showing 126 changed files with 486,233 additions and 235,620 deletions.
11 changes: 10 additions & 1 deletion Resources/Locale/en-US/_Nuclear14/construction.ftl
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
construction-category-medical = Medical
lathe-category-ammo-box = Ammo box
lathe-category-ammo-magazines = Magazines
lathe-category-armor = Armor
lathe-category-containers = Containers
lathe-category-chemistry = Chemistry
lathe-category-cleaning = Cleaning
lathe-category-kitchen = Kitchen
lathe-category-misc = Misc
lathe-category-misc = Misc
lathe-category-shields = Shields
lathe-category-weapons-melee = Melee
lathe-category-weapons-pistols = Pistols
lathe-category-weapons-rifles = Rifles
lathe-category-weapons-smgs = Smgs
11 changes: 8 additions & 3 deletions Resources/Locale/en-US/_Nuclear14/reagents.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -273,14 +273,19 @@ reagent-name-antiseptic = Antiseptic
reagent-desc-antiseptic = A cleaning solution made from Abraxo Cleaner and some Rubbing Alcohol.
# Ores, Metals, Materials
materials-gunpowder = gunpowder
materials-lead = lead
materials-aluminum = aluminum
materials-sulfur = sulfur
materials-antchitin = chitin
materials-charcoal = charcoal
materials-exoskeleton = exoskeleton
materials-gunpowder = gunpowder
materials-leather = leather
materials-lead = lead
materials-raw-lead = raw lead
materials-raw-leather = raw leather
materials-raw-aluminum = raw aluminum
materials-raw-sulfur = raw sulfur
materials-sulfur = sulfur
reagent-name-gunpowder = gunpowder
reagent-desc-gunpowder = Small pellet gunpowder. Now just add lead.
reagent-name-fertilizer = fertilizer
Expand Down
Loading

0 comments on commit b28f00f

Please sign in to comment.