juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,579 Commits 57 Branches 0 Tags
d5fbdbdec036bfd915807124fb69f44b7a7a27dd
Commit Graph

4 Commits

Author SHA1 Message Date
Ed
d5fbdbdec0 Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
#	Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
#	Content.Server/Procedural/DungeonJob/DungeonJob.OreDunGen.cs
#	Resources/Prototypes/Entities/Effects/chemistry_effects.yml
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/GameRules/meteorswarms.yml
#	Resources/Prototypes/Procedural/dungeon_configs.yml
 2025-05-27 12:21:14 +03:00
Nemanja
0d878751fa Salvage Job Board (#37549) 
* Salvage Job Board

* More development

* Small boy

* Computer yaml (partial)

* UI

* Rank unlock logic

* Job label printing

* appraisal tool integration

* Jobs

* add board to QM locker

* boom!

* command desc

* mild rewording

* ackh, mein pr ist brohken
 2025-05-18 14:02:52 +10:00
Ed
518b439c0f integrate 2025-04-30 20:50:03 +03:00
Nemanja
1540880eb2 Predict Labels (#36406) 
* Predict Labels

* nitpicks
 2025-04-10 22:19:48 -07:00