Commit graph

15 commits

Author SHA1 Message Date
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
Morbo
efa9d6561f Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/workflows/build-docfx.yml
2022-10-31 15:36:01 +03:00
0x6273
8c52dac3f3
Update setup-dotnet in gh actions (#12261) 2022-10-30 12:05:51 -07:00
Morbo
228c19c52c Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
#	Resources/Textures/Tiles/dark.png
#	Resources/Textures/Tiles/white.png
2022-10-28 17:19:32 +03:00
Moony
b03f17bda2
Update update-wiki.yml (#12189)
let ME DISPATCH THE WORKFLOW E
2022-10-25 14:52:50 -05:00
Arthur
df603cc904 Return Github wiki WIKI_PAGE_ROOT 2022-07-29 23:50:24 +03:00
Arthur
3474f82f03 Use Github secrets for wiki upload workflow 2022-07-29 20:42:29 +03:00
Arthur
19502de5f4 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-03-23 21:26:58 +03:00
Zoldorf
8a7b9b1597
Update update-wiki.yml 2022-03-22 17:28:22 -06:00
Morbo
825836d5a5
Fix GitHub action wiki url (#81) 2022-01-24 09:09:11 +03:00
Morbo
fcc4273fae
Update GitHub action wiki url (#80) 2022-01-24 07:23:57 +03:00
Sam Weaver
adddd2fac6
FIXED: Chemistry JSON dump tool and companion GitHub Action (#6222)
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2022-01-18 14:44:22 -07:00
Moony
5fd45fc82a
Revert "Chemistry JSON dump tool and companion GitHub Action (#6134)" (#6217)
This reverts commit 40e2e78e0f.
2022-01-17 16:06:19 -06:00
Sam Weaver
40e2e78e0f
Chemistry JSON dump tool and companion GitHub Action (#6134)
* fuck

* oh boy

* Sorted every chem into guide groups

* WHY ARE YOU NOT ABSTRACT

* removes the target thing in favor of simply generating everything.

* eee

* Add group for med

* Update wiki JSON generation to use System.Text.Json

* Fix error on shutdown during wiki JSON generation

* First pass at automatic wiki workflow

* Add a temporary workaround while the build is continuing to give errors

* Update workflow to reference correct API url, track dependency.

* Compile wiki actions into one job rather than two

* Update page name to reference editable page

* Add other JSON file and parameterize root page path

* A few steps closer to using `System.Text.Json` to serialize properly

* Revert System.Text.Json and return to Newtonsoft.Json.

* Revert the revert. Return to System.Text.Json.

This reverts commit a5ea98dfdcfab3f605ac4d82d3b110f099324308.

* Add and register UniversalJsonConverter class.

* Narrow triggers for update-wiki GitHub action.

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2022-01-17 13:50:02 -06:00