1
mirror of https://github.com/thepeacockproject/Peacock synced 2024-11-22 22:12:45 +01:00
Commit Graph

540 Commits

Author SHA1 Message Date
Reece Dunham
a22da558a1
Reworking of the config system (squashed!) 2023-11-22 18:01:01 -05:00
Reece Dunham
2d83a4c872
chore: Cherry-pick a bunch of dependency updates and test fixes from #340
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-11-22 17:49:01 -05:00
Reece Dunham
7fb174fbff
Update generated require table
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-11-21 20:34:56 -05:00
Reece Dunham
11ceba613d
Cherry-pick "lite" -> "linux" from #339
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-11-21 20:33:11 -05:00
Reece Dunham
5ef79b7d23
Use new prebuilt patcher from CI
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-11-21 20:27:01 -05:00
Reece Dunham
261a99dbd3
Bump patcher major version after .NET framework update
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-11-21 20:23:36 -05:00
Reece Dunham
3a2dbeec18
Patcher: unify Linux/Windows implementation
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-11-20 15:21:00 -05:00
dependabot[bot]
ba47d1d126
Bump microsoft/setup-msbuild from 1.1 to 1.3 in /.github/workflows (#342)
Bumps [microsoft/setup-msbuild](https://github.com/microsoft/setup-msbuild) from 1.1 to 1.3.
- [Release notes](https://github.com/microsoft/setup-msbuild/releases)
- [Changelog](https://github.com/microsoft/setup-msbuild/blob/main/building-release.md)
- [Commits](https://github.com/microsoft/setup-msbuild/compare/v1.1...v1.3)

---
updated-dependencies:
- dependency-name: microsoft/setup-msbuild
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-11-13 18:01:17 -05:00
dependabot[bot]
f26e304e39
Bump actions/checkout from 3 to 4 in /.github/workflows (#341)
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-11-13 18:01:01 -05:00
dependabot[bot]
73fc2cfc2f
Bump actions/upload-artifact from 2 to 3 in /.github/workflows (#343)
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-11-13 18:00:29 -05:00
porlium
063f6f10c4
Allow the patcher project to open and build on Visual Studio 2022 (#281) 2023-11-12 12:42:25 -05:00
AnthonyFuller
f705a1702a Add lastDeploy.json to debug profile
(cherry picked from commit 07dfa0cc0d)
2023-11-10 12:52:32 +00:00
PeacockBot
282a7c0191 [skip ci] Update locale packages 2023-11-04 19:18:19 +00:00
Nachito33
cb16d90e4d
Added Spanish translation (#338)
* Added Spanish translation

Traducido al español - 4th November of 2023

Signed-off-by: Nachito33 <149486111+nachito33@users.noreply.github.com>

* Prettier run

---------

Signed-off-by: Nachito33 <149486111+nachito33@users.noreply.github.com>
Co-authored-by: AnthonyFuller <24512050+AnthonyFuller@users.noreply.github.com>
2023-11-04 19:17:10 +00:00
Reece Dunham
1fe9f3739c
Refactor SMF support into it's own helper class (#335)
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-10-31 09:45:40 -04:00
PeacockBot
6903bb1aa8 [skip ci] Update locale packages 2023-10-28 11:54:10 +00:00
Pgeorge
904f047118
Update Russian locale (#334)
Updated Russian locales.

Signed-off-by: Pgeorge <38467521+Wuzmart@users.noreply.github.com>
2023-10-28 12:52:46 +01:00
Reece Dunham
e70442e7d7
Remove obsolete code
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-10-27 11:46:52 -04:00
Reece Dunham
7cc9f6d54a
Add discord rich presence for the drop
Signed-off-by: Reece Dunham <me@rdil.rocks>
2023-10-27 10:05:05 -04:00
AnthonyFuller
5d229fe8dd Update server ver 2023-10-27 04:53:47 +01:00
AnthonyFuller
79c7aa16e3 Move Southern Comfort to Noel sublocation 2023-10-26 22:09:15 +01:00
AnthonyFuller
4a2ad7f48d Fix Noel and Mamushi not showing as sub locations 2023-10-26 22:03:29 +01:00
AnthonyFuller
671dd46bff Fix LSS type 2023-10-26 15:52:34 +01:00
PeacockBot
105c4fc20a [skip ci] Update locale packages 2023-10-26 14:52:30 +00:00
AnthonyFuller
9eaad6cd69 Bump version to v6.5.5 2023-10-26 15:50:57 +01:00
AnthonyFuller
c729e4370e Remove legacy 47 suit from the diff
(cherry picked from commit cc5f664edb)
2023-10-26 15:50:20 +01:00
AnthonyFuller
6cc04c34d2 Add Tomorrowland challenges
(cherry picked from commit 6e3e0bbb70)
2023-10-26 15:50:07 +01:00
AnthonyFuller
2afced27fa Remove hacky workaround
(cherry picked from commit 5cfe7a6def)
2023-10-26 15:50:07 +01:00
AnthonyFuller
bf4ab0a36b Bump game version
(cherry picked from commit baae32eb86)
2023-10-26 15:50:06 +01:00
AnthonyFuller
ac8f24bd05 Add Tomorrowland entrances and stashpoints
(cherry picked from commit a423c7b48a)
2023-10-26 15:50:06 +01:00
AnthonyFuller
11a65407d4 Add Tomorrowland ID to array
(cherry picked from commit 356c2309bc)
2023-10-26 15:50:05 +01:00
AnthonyFuller
2978c2b150 Change Year to Season in Tomorrowland
(cherry picked from commit 57a25cbfe9)
2023-10-26 15:50:05 +01:00
AnthonyFuller
3c81f15155 Add Tomorrowland contract
(cherry picked from commit 938223990c)
2023-10-26 15:50:04 +01:00
AnthonyFuller
32d23070b2 Removal of mamushi shim, noel contract creation
(cherry picked from commit 036b8565b4)
2023-10-26 15:50:03 +01:00
AnthonyFuller
0b2153fe1b Update unlockables
(cherry picked from commit b65f35664f)
2023-10-26 15:50:03 +01:00
Reece Dunham
5c934b4c6d Node 18.18.2
Signed-off-by: Reece Dunham <me@rdil.rocks>

(cherry picked from commit a3236d4102)
2023-10-26 15:50:02 +01:00
AnthonyFuller
dfc6f7c9d7 Add plugin loading from SMF
(cherry picked from commit 9791fd7ce1)
2023-10-26 15:48:13 +01:00
dependabot[bot]
354f505db9
Bump actions/setup-node from 3 to 4 in /.github/workflows (#332)
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3 to 4.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-10-26 10:21:25 -04:00
AnthonyFuller
886fcefe0f Remove comment regarding pontus 2023-10-18 00:31:51 +01:00
PeacockBot
8459843607 [skip ci] Update locale packages 2023-10-17 16:32:11 +00:00
suanjiansalt
a6ba9cdb91
Update locale.json (#330)
Simplified and Traditional translation strings for new escalation. Thanks!

Signed-off-by: suanjiansalt <127009844+suanjiansalt@users.noreply.github.com>
2023-10-17 17:30:38 +01:00
PeacockBot
88a2ac23be [skip ci] Update locale packages 2023-10-17 00:23:02 +00:00
Amdr3B4st0s
bc23c4455e
Update locale.json (#329)
pt-br

Signed-off-by: Amdr3B4st0s <113254411+Amdr3B4st0s@users.noreply.github.com>
2023-10-17 01:21:43 +01:00
AnthonyFuller
6d5b492bc2 Show escalation challenges in Rocky 2023-10-16 01:38:08 +01:00
AnthonyFuller
4946b534fc Add challenge for Pontus 2023-10-16 01:28:21 +01:00
PeacockBot
6f9ff8f9f9 [skip ci] Update locale packages 2023-10-15 22:40:36 +00:00
AnthonyFuller
1b09268a7c Fix spelling of Kukri 2023-10-15 23:39:19 +01:00
AnthonyFuller
67c1c45e9e Fix pontus l3 to conform to guidelines 2023-10-15 21:36:33 +01:00
PeacockBot
167df000be [skip ci] Update locale packages 2023-10-15 20:26:24 +00:00
Anthony Fuller
72826f7bde
feat(escalation): pontus (#328)
* pontus test

Signed-off-by: Reece Dunham <me@rdil.rocks>

* Remove traditions & lee hong

These are being moved out of core to reduce bundle size, translation maintainability, and just because they weren't played that much.

Signed-off-by: Reece Dunham <me@rdil.rocks>

* pontus test

Signed-off-by: Reece Dunham <me@rdil.rocks>

* Add pontus group data

Signed-off-by: Reece Dunham <me@rdil.rocks>

* Add pontus group data

Signed-off-by: Reece Dunham <me@rdil.rocks>

* Various pontus changes

* Pontus l10n

* Add season properties to pontus

* Add id to pontus in escalation codenames

* Add escalation guidelines document

* Prettier run

---------

Signed-off-by: Reece Dunham <me@rdil.rocks>
Co-authored-by: Reece Dunham <me@rdil.rocks>
2023-10-15 21:24:52 +01:00