Morb0
|
7d4b894002
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# .github/CODEOWNERS
# Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
# Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
|
2023-12-16 03:05:40 +03:00 |
|
Pieter-Jan Briers
|
d0e77303dd
|
.NET 8 compatibility (#22461)
|
2023-12-15 18:19:48 +01:00 |
|
Morb0
|
34a8740819
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# .github/workflows/build-test-release.yml
# Content.Client/Humanoid/HumanoidAppearanceSystem.cs
# Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
|
2023-10-02 02:18:19 +03:00 |
|
DrSmugleaf
|
90404450d4
|
Remove windows-latest CI runs, remove unused build-test-release.yml (#20540)
|
2023-09-28 15:46:26 -07:00 |
|
Morb0
|
1b513f0c1a
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# .github/workflows/publish.yml
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Textures/Tiles/attributions.yml
|
2023-08-29 05:58:14 +03:00 |
|
DrSmugleaf
|
d1eea3f6f6
|
Update CI to use .NET 7.0.x, setup-dotnet 3.2.0, checkout 3.6.0 (#19552)
|
2023-08-25 15:33:01 -07:00 |
|
Morb0
|
1f35458078
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Mobs/Player/diona.yml
# Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/broken.png
# Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/meta.json
# Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/normal-unshaded.png
# Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/off.png
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/dark_plastic.png
# Resources/Textures/Tiles/plastic.png
# Resources/Textures/Tiles/steel_dirty.png
# Resources/Textures/Tiles/white_plastic.png
|
2023-08-05 05:10:09 +03:00 |
|
Leon Friedrich
|
5a9317027f
|
Warn on improperly disposed tests. (#18594)
|
2023-08-03 13:07:21 +10:00 |
|
Morbo
|
60dd232b44
|
Ignore IanComradeBot in workflows
|
2023-04-04 15:40:13 +03:00 |
|
Pieter-Jan Briers
|
497be5a470
|
Project files CI changes (#14466)
|
2023-03-10 11:58:57 -08:00 |
|
Moony
|
028fa395d8
|
fix bors config (#14389)
i did an oops
|
2023-03-04 23:56:55 +00:00 |
|
Moony
|
7232bf4ba4
|
Configure and enable bors (#14383)
* Update build-test-debug.yml
* Update build-test-release.yml
* Update test-packaging.yml
* Update validate_mapfiles.yml
* Update yaml-linter.yml
* Update validate-rsis.yml
* Update validate-rgas.yml
* Create bors.toml
|
2023-03-03 22:55:05 -06:00 |
|
Moony
|
202680ac56
|
Enable merge group checks for our workflows. (#14005)
* Enable merge group checks for our workflows.
* Update build-test-release.yml
* Update validate-rgas.yml
* Update validate-rsis.yml
* Update validate_mapfiles.yml
* Update yaml-linter.yml
* Update test-packaging.yml
|
2023-02-09 16:35:34 +00:00 |
|
metalgearsloth
|
0e8b8c0735
|
Don't run gh actions on draft prs (#13706)
|
2023-01-26 14:37:28 -08:00 |
|
metalgearsloth
|
033e87aa3b
|
Don't run CI For PJBot (#13188)
I have no idea what I'm doing
|
2022-12-26 17:37:57 -06:00 |
|
0x6273
|
8c52dac3f3
|
Update setup-dotnet in gh actions (#12261)
|
2022-10-30 12:05:51 -07:00 |
|
wrexbe
|
81e3b2da88
|
Make tests faster (#8737)
* Test changes
* Make finding the test tile a little smarter
|
2022-06-19 20:22:28 -07:00 |
|
DrSmugleaf
|
f98ac77179
|
More github action tests (#7301)
|
2022-05-30 19:52:27 -07:00 |
|