juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
8c477a67c1f2a867dfd33f1dec17c73c4dcf3e45
crystall-punk-14/Resources/Prototypes/Traits
History
Ed bd011bf418 Merge remote-tracking branch 'upstream/master' into ed-05-07-2024-upstream 
# Conflicts:
#	Content.IntegrationTests/Tests/Round/JobTest.cs
#	Resources/Prototypes/Traits/speech.yml
2024-07-04 18:14:21 +03:00
..
categories.yml
Skills system (#247)
2024-06-15 16:55:04 +03:00
disabilities.yml
Skills system (#247)
2024-06-15 16:55:04 +03:00
speech.yml
Merge remote-tracking branch 'upstream/master' into ed-05-07-2024-upstream
2024-07-04 18:14:21 +03:00