Skip to content

Commit

Permalink
Merge pull request #118 from ottercorp/6.4
Browse files Browse the repository at this point in the history
6.4 🐐-> 🦦
  • Loading branch information
wozaiha authored Sep 19, 2023
2 parents b36036f + 87906a0 commit 6fb1675
Show file tree
Hide file tree
Showing 249 changed files with 771 additions and 501 deletions.
1 change: 1 addition & 0 deletions .github/workflows/pacnag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:

jobs:
runjob:
# if: github.repository == 'goatcorp/DalamudPluginsD17'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
EXTENDED_IMAGE_LINK: ${{ secrets.EXTENDED_IMAGE_LINK }}
# PLOGON_SECRETS_PK: ${{ secrets.PLOGON_SECRETS_PK }}
# PLOGON_SECRETS_PK_PASSWORD: ${{ secrets.PLOGON_SECRETS_PK_PASSWORD }}
XLWEB_KEY: ${{ secrets.XLWEB_KEY }}
run: |
dotnet run -- \
Expand Down
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

当插件检查组检查你的插件时,他们将检查以下内容。

- 它是否符合由小组的多个成员商定的[我们的准则](https://ottercorp.github.io/faq/development#q-%E6%88%91%E5%8F%AF%E4%BB%A5%E5%9C%A8%E6%88%91%E7%9A%84%E6%8F%92%E4%BB%B6%E4%B8%AD%E5%81%9A%E4%BB%80%E4%B9%88)
- 它是否符合由小组的多个成员商定的[我们的准则](https://ottercorp.github.io/faq/development#q-%E6%88%91%E5%8F%AF%E4%BB%A5%E5%9C%A8%E6%88%91%E7%9A%84%E6%8F%92%E4%BB%B6%E4%B8%AD%E5%81%9A%E4%BB%80%E4%B9%88), as agreed upon by multiple members of the group
- 它是否具包含战斗相关功能?如果有,它们是否纯粹是信息性的,并且只显示玩家通常会知道的信息?
- 它是否通过了非正式的代码审查?
- 它是否安装得很干净?
Expand All @@ -35,6 +35,7 @@

- 你的插件必须有一个`icon.png`,在`images/`中不大于512x512,不小于64x64。
- 对于普通的ImGui窗口,如设置和实用窗口,你应该使用[Dalamud Windowing API](https://goatcorp.github.io/Dalamud/api/Dalamud.Interface.Windowing.html)。它增强了窗口的一些很好的功能,比如按顺序整合到本地UI。
- Your plugin's version/assembly version **must not** be based on a timestamp or continually increasing build number. Every time your plugin is built with a specific commit, no matter the time or date, should produce the same version.

### 提交

Expand Down Expand Up @@ -65,6 +66,10 @@

如果你想触发你的 PR 的重建,只需发表一条内容为 `@aonyxbot rebuild` 的评论。

## Secrets

If your build process requires secrets, or you want to include a secret in your plugin, use [this page](https://goatcorp.github.io/plogon-secrets/) to encrypt the secret, to be included via your manifest. It will then be made available to your plugin's MSBuild/build script via environment variables, as per the instructions on the page.

---

提交插件时,请考虑我们的 [可接受使用政策](<https://github.com/goatcorp/FFXIVQuickLauncher/wiki/Acceptable-Use-Policy-(Official-Plugin-Repository)>) 和 [服务条款](<https://github.com/goatcorp/FFXIVQuickLauncher/wiki/Terms-and-Conditions-of-Use-(XIVLauncher,-Dalamud-&-Official-Plugin-Repository)>),例如详细说明将插件上传到此存储库时您需要授予我们的权利。
Expand Down
File renamed without changes
6 changes: 6 additions & 0 deletions hold/stable/BetterMountRoulette/manifest.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[plugin]
repository = "https://github.com/CMDRNuffin/BetterMountRoulette.git"
commit = "dc29ebbb33303263af96e3347573adcd86cb7955"
version = "1.2.0.12"
owners = ["CMDRNuffin"]
changelog = """Fix: Prevent 6.4 crash"""
File renamed without changes
7 changes: 7 additions & 0 deletions hold/stable/ChatTwo/manifest.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[plugin]
repository = 'https://git.anna.lgbt/anna/ChatTwo.git'
commit = '32e7fbe5863991c1417138307fa2760da52f5262'
owners = [ 'lojewalo' ]
changelog = """\
- Update for 6.4
"""
File renamed without changes
8 changes: 8 additions & 0 deletions hold/stable/ExtraChat/manifest.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[plugin]
repository = 'https://git.anna.lgbt/anna/ExtraChat.git'
commit = '0f20595e0fab3daaeb8cd1787c29835e1fe55c14'
owners = [ 'lojewalo' ]
project_path = 'client'
changelog = '''\
- Fix context menu for 6.4
'''
File renamed without changes
8 changes: 8 additions & 0 deletions hold/stable/NoSoliciting/manifest.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[plugin]
repository = 'https://git.anna.lgbt/anna/NoSoliciting.git'
commit = 'fae0b28d661f5f8cddddc39062e1638443674ec2'
owners = [ 'lojewalo' ]
project_path = 'NoSoliciting'
changelog = """\
- API 8
"""
File renamed without changes
6 changes: 6 additions & 0 deletions hold/stable/RemotePartyFinder/manifest.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[plugin]
repository = 'https://git.anna.lgbt/anna/remote-party-finder.git'
commit = '3ab9670da14f988ee49b45f46e96ae2469f25057'
owners = [ 'lojewalo' ]
project_path = 'csharp/RemotePartyFinder'
changelog = 'API 8'
6 changes: 3 additions & 3 deletions hold/stable/TitleRoulette/manifest.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[plugin]
repository = "https://github.com/carvelli/TitleRoulette.git"
commit = "b29570b432c83ac45d0128605292910b0ed4df18"
owners = ["carvelli"]
repository = "https://github.com/mabako/TitleRoulette.git"
commit = "4878d96b14bb418b4e6d422119011c11af676f31"
owners = ["carvelli", "mabako"]
File renamed without changes
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[plugin]
repository = 'https://git.anna.lgbt/XIVChat/XIVChat.git'
commit = '214c90e01584e4c4a017f1b7631abf77d86e6922'
owners = [ 'ascclemens' ]
commit = '48ac0d2a11e1a23c899cc1163fe5fdc3413f4a18'
owners = [ 'lojewalo' ]
project_path = 'XIVChatPlugin'
changelog = """\
- API 8
- 6.4
"""
2 changes: 1 addition & 1 deletion hold/testing/DailyDuty/manifest.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[plugin]
repository = "https://github.com/MidoriKami/DailyDuty.git"
commit = "62162d4baf320c62af3daed853210cfe00a8ceb5"
commit = "d2bcad3bbb5e63f93f0ef019dbdef55451cf9ce8"
owners = ["MidoriKami"]
project_path = "DailyDuty"
Binary file added hold/testing/HotbarHelper/images/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions hold/testing/HotbarHelper/manifest.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[plugin]
repository = "https://github.com/kiwikahawai/HotbarHelper.git"
commit = "1f8a0c12e751474db31a80328c6882571a2e7bac"
owners = [
"kiwikahawai",
]
project_path = "HotbarHelper"
version = "0.0.2.3"
changelog = """\
- Fixed chat messages not respecting ignored actions (thanks Cerrelle).
- Small UI tweak and internal changes.
"""
Binary file added hold/testing/OhGeeCD/images/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions hold/testing/OhGeeCD/manifest.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[plugin]
repository = "https://github.com/kiwikahawai/OhGeeCD.git"
commit = "f9fec6d256121f9cb841ec2f5aeedb4affec5858"
owners = [
"kiwikahawai",
]
project_path = "OhGeeCD"
version = "0.0.23"
changelog = """\
**OhGeeCD (return to testing edition)**
- Back after a long hiatus, adopted from darkarchon.
- oGCD assistant providing Text To Speech, (Custom) Sound Effects and unlimited extra bars to visualize and alert you for your oGCDs.
- Mostly tweaks and updates to work with current requirements.
"""
6 changes: 6 additions & 0 deletions hold/testing/Visibility/manifest.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[plugin]
repository = "https://github.com/SheepGoMeh/VisibilityPlugin.git"
owners = [ "SheepGoMeh",]
project_path = "Visibility"
commit = "6ce84ed800400e645ed05015c0563bfbbefd5455"
changelog = "- Refactored UI code to address disappearing menu issues"
13 changes: 13 additions & 0 deletions plogon_public.gpg
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----

mDMEZGZHEhYJKwYBBAHaRw8BAQdAB6UPjIyydEABtjUkeXYnM8QGPxmvHADfuBIM
MbPcJrO0IVBsbyBQbG8gPGdvYXRzZGV2QHByb3Rvbm1haWwuY29tPoiZBBMWCgBB
FiEEnyQ3sDJRjNvBI+/Z47M+N75ODUoFAmRmRxICGwMFCQPCZwAFCwkIBwICIgIG
FQoJCAsCBBYCAwECHgcCF4AACgkQ47M+N75ODUrlSQEAuGn8W0YZJbwh1A4n7PcQ
jwCKF1hMdJPun67Z4TgBQe8A/3R9ZNaPS6IeCxhYSBjgMR2cvmOCqh13ba5ZvnB0
pmIMuDgEZGZHEhIKKwYBBAGXVQEFAQEHQCRI9Z0doJy33JjiCECNkLkDah2atfg/
pRmbC4QuvVk2AwEIB4h+BBgWCgAmFiEEnyQ3sDJRjNvBI+/Z47M+N75ODUoFAmRm
RxICGwwFCQPCZwAACgkQ47M+N75ODUrpHgD9Em3ZKhJyC4SkK6cwKj0q9R3SXfgP
yXv6CXsJgX9au0sA/iu43JddOp168/KcG2E8HCageqacy5U79BnpBVV6seoH
=Z2hh
-----END PGP PUBLIC KEY BLOCK-----
3 changes: 3 additions & 0 deletions pyckager/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ class Plugin(BaseModel):
project_path: Optional[str]
changelog: Optional[str]
version: Optional[str]
# There's an opportunity here for additional validation since the value could technically be checked against a gpg
# key, but that will also require somehow informing the validator of the location of the gpg key
secrets: Optional[dict[str, str]]

@validator('owners')
def validate_owners(cls, owners):
Expand Down
Binary file added stable/ARealmRecorded/images/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions stable/ARealmRecorded/manifest.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[plugin]
repository = "https://github.com/UnknownX7/ARealmRecorded.git"
commit = "63557dedf8ada6e9943cd191fd7d44d31f0c16cd"
owners = [ "UnknownX7" ]
changelog = '''
- Moved from testing to stable
- Shortened dates on the replay list
- Fixed an issue with packets failing to save'''
5 changes: 2 additions & 3 deletions stable/Accountant/manifest.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
[plugin]
repository = "https://github.com/Yarukon/Accountant.git"
commit = "08abac60d10e770791c98eaeb26c73dde0a13665"
repository = "https://github.com/Ottermandias/Accountant.git"
commit = "66f083d898849c3abfc2ac8dd2835af11220b19b"
owners = [
"Ottermandias",
"Yarukon"
]
project_path = "Accountant"
changelog = "Updated for Dalamud staging."
4 changes: 2 additions & 2 deletions stable/ActionTimeline/manifest.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[plugin]
repository = "https://github.com/Tischel/ActionTimeline.git"
commit = "7d575d7c72c38be72cb8cbf1b6854ba8f197a220"
commit = "85c6151f90a6a2071c58afd0f26f2c52966964c7"
owners = ["Tischel"]
project_path = "ActionTimeline"
changelog = "- Added support for Patch 6.3 and Dalamud Api8."
changelog = "- Added support for Patch 6.4."
5 changes: 2 additions & 3 deletions stable/AdventurerInNeed/manifest.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[plugin]
repository = "https://github.com/wozaiha/AdventurerInNeed.git"
commit = "813d21cd2dcea61d08e3fffb96e3931cbb61725c"
repository = "https://github.com/Caraxi/AdventurerInNeed.git"
commit = "a9ad1dc07504682160e5321b8bea505be2df3d22"
owners = [
"Caraxi",
"Bluefissure"
]
4 changes: 2 additions & 2 deletions stable/AutoMammet/manifest.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[plugin]
repository = "https://github.com/Rietty/AutoMammet.git"
commit = "cd8766a978b2b9aae236457624c05d4d06fbc6d3"
commit = "74402b9919f617d00c8c9ca4b3252d0466a408ac"
owners = ["Rietty"]
project_path = "/AutoMammet"
changelog = "Update offsets and code for patch 6.3; Added a scrollbar to save space."
changelog = "Fix user reported offset error that occured in sections I do not have access to in island data yet."
6 changes: 0 additions & 6 deletions stable/BetterMountRoulette/manifest.toml

This file was deleted.

5 changes: 1 addition & 4 deletions stable/BetterPlaytime/manifest.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
[plugin]
repository = "https://github.com/Infiziert90/BetterPlaytime.git"
commit = "a08b15fee6c7925a0e20d3f804bdb20b5e2a3c83"
commit = "9309db221d1a97ddb8fdd4fb1c1a935e1adea973"
owners = [
"Infiziert90",
"LittleNightmare",
]
project_path = "BetterPlaytime"
changelog = """
[nofranz]
"""
9 changes: 5 additions & 4 deletions stable/BetterShadows/manifest.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
[plugin]
repository = "https://github.com/Drahsid/BetterShadows.git"
commit = "d16d4ffb6e3379ef157c69c90a2da291a604ca4b"
commit = "58aab1f3939d7b27d04322f99a6b8b8f2923797c"
owners = ["Drahsid"]
project_path = ""
changelog = """1.1.4
- Version should no longer be bogus
- Performance improvements
changelog = """1.1.5
- Updated for 6.4
- Shadows resolution applies to more situations
- Fixed bug in editor where the edit override would not apply
"""

5 changes: 1 addition & 4 deletions stable/BlueMageHelper/manifest.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
[plugin]
repository = "https://github.com/Infiziert90/BlueMageHelper.git"
commit = "516ef013f1785d7cf4ea220919b12e463dfbc9a3"
commit = "dadabbd9c4820b2291d483d24eef56583b73b7b6"
owners = [
"Infiziert90",
]
project_path = "BlueMageHelper"
changelog = """
+ Check continuously for spell unlocks
"""
Binary file added stable/BozjaBuddy/images/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions stable/BozjaBuddy/manifest.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[plugin]
repository = "https://github.com/kaleidocli/BozjaBuddy.git"
commit = "de825a38b68fe7dca691bd8eafeb3f2a0e5cb6be"
owners = ["kaleidocli"]
project_path = "BozjaBuddy"
changelog = """
Bozja Buddy 1.1.5.3
- Remove shortcut [Alt] for expanding info-viewer due its inconvenience surpass its merits.
- Fixes incorrect info regarding "Parts and Parcel" FATE
- Fixes incorrect info regarding relic step "One time grind 2"
"""
6 changes: 3 additions & 3 deletions stable/BurntToast/manifest.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[plugin]
repository = 'https://git.anna.lgbt/ascclemens/BurntToast.git'
commit = 'cb77c65dcbe9c78b50dbabe38faaabcd18921adb'
owners = [ 'ascclemens' ]
repository = 'https://git.anna.lgbt/anna/BurntToast.git'
commit = '5c7c751e484d0862e8787f3d441c193c01864cfb'
owners = [ 'lojewalo' ]
changelog = 'API 8'
14 changes: 5 additions & 9 deletions stable/CharacterPanelRefined/manifest.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
[plugin]
repository = "https://github.com/zhouhuichen741/ffxiv-characterstatus-refined.git"
commit = "945924b565ea3c4e3d04c66c9a0197ddeb2d3879"
owners = [
"Kouzukii",
"zhouhuichen741",
]
repository = "https://github.com/Kouzukii/ffxiv-characterstatus-refined.git"
commit = "1513e9afb6d01c2c0d61d16bf93859abca03e0a9"
owners = ["Kouzukii"]
project_path = "CharacterPanelRefined"
changelog = """
Fixed a bug that had items being shown as Ilvl synced when they shouldn't be.
Fixed Shifu being assumed to be a 13% speed increase instead of 10% at level 70.
"""
Fixed average damage and healing values broken by patch 6.4
"""
8 changes: 6 additions & 2 deletions stable/ChatBubbles/manifest.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
[plugin]
repository = "https://github.com/Haplo064/ChatBubbles.git"
commit = "6363ac26ef0801aa535f0d63fecf34c7a4cd172e"
commit = "e958472eae0857cb898e35dd5cfb4ed5ff9a90d6"
owners = ["Haplo064", "MKhayle"]
project_path = "ChatBubbles"
changelog = "Update for 6.3, added API 8 compatibility"
changelog = """top text
### Updated for 6.4
- Added the `Display friends only` feature in options
- Added the `Display FC only` feature in options
- Added the `Display party only` feature in options"""
9 changes: 0 additions & 9 deletions stable/ChatTwo/manifest.toml

This file was deleted.

2 changes: 1 addition & 1 deletion stable/ChillFrames/manifest.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[plugin]
repository = "https://github.com/MidoriKami/ChillFrames.git"
commit = "4531f354ebe4b54aaa0c0ecd2cc7e75d40abd178"
commit = "811d4a2843fccccc247f3e132c6359e7d1b3bd4e"
owners = ["MidoriKami"]
project_path = "ChillFrames"
Binary file added stable/CollectableCalculator/images/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions stable/CollectableCalculator/manifest.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[plugin]
repository = "https://github.com/mabako/CollectableCalculator.git"
commit = "f207da229a2e6a75f729a03f98e93f8d69ac51ff"
owners = ["carvelli", "mabako"]
project_path = "CollectableCalculator"
Binary file added stable/CombatCursorContainment/images/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions stable/CombatCursorContainment/manifest.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[plugin]
repository = "https://github.com/Cytraen/CombatCursorContainment.git"
commit = "22ec9568b4396f66df81ecfc407012ebfd5d7af9"
owners = ["Cytraen"]
changelog = """
- Improve performance, mostly outside of combat.
- Add button to manually toggle cursor lock while auto-lock is disabled.
"""
Binary file added stable/CopyTranslated/images/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions stable/CopyTranslated/manifest.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[plugin]
repository = "https://github.com/kelvin124124/CopyTranslated.git"
commit = "f3c6db34a2465f4f57ba67789cd28e0f306395d3"
owners = ["kelvin124124"]
project_path = "CopyTranslated"
changelog = "Added support to marketboard. Cleaner chat log output."
Binary file added stable/CrossUp/images/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions stable/CrossUp/manifest.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[plugin]
repository = "https://github.com/ItsBexy/CrossUp.git"
commit = "9ba9a43fafe7c8154a3bdd62f5b1fa356b68be54"
owners = [
"ItsBexy",
]
changelog = """
Fixed a bug wherein some of the controls for positioning the Expanded Hold bars were faulty (whoops!)
"""
22 changes: 3 additions & 19 deletions stable/CurrencyAlert/manifest.toml
Original file line number Diff line number Diff line change
@@ -1,21 +1,5 @@
[plugin]
repository = "https://github.com/Lharz/xiv-currency-alert.git"
commit = "1f5c326dfbc56b9e63ab588706c258fc4a1e6276"
owners = ["Lharz"]
repository = "https://github.com/MidoriKami/CurrencyAlert.git"
commit = "f51155212736fb421fc7c74c3246d36cd0f42c1c"
owners = ["MidoriKami", "Lharz"]
project_path = "CurrencyAlert"
changelog = """
=== 0.5.0.1
- FR, DE and JP translations
=== 0.5.0.0
Version provided by MidoriKami
- Configuration remade and much more clean now
- More configuration options (such as minimal display, window lock, etc)
- Dynamic currency display, so further game updates shouldn't need a plugin update
- Base code for translations (soon...)
=== 0.4.0.0
- Added new Tomestones of Causality
- Added icons for currencies
- Added an option to lock the alert window
- Revamped the configuration UI a bit
- Revamped the user configurations code internally, which unfortunately resulted in an inevitable configuration reset
"""
Loading

0 comments on commit 6fb1675

Please sign in to comment.