Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
TeamSpen210 committed Oct 1, 2024
2 parents 5134ae6 + fa65188 commit b5c52ac
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
python -m pip install -r requirements.txt
- name: Download FFmpeg
if: ${{ matrix.ffmpeg-repo }}
uses: robinraju/release-downloader@v1.7
uses: robinraju/release-downloader@v1.11
with:
repository: ${{ matrix.ffmpeg-repo }}
latest: true
Expand Down
6 changes: 5 additions & 1 deletion help_urls.dmx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"discord_bee2" "string" "https://discord.gg/hnGFJrz"
"store_portal2" "string" "https://store.steampowered.com/app/620/Portal_2/"

"addon_music_changer" "string" "https://beemmc.boards.net/"
"aerond_music_creator" "string" "https://github.com/BEEmod/BEE2-items/wiki/BEEmod-Music-Package-Creator-(BMPC)/"

"wiki_bee2" "string" "https://github.com/BEEmod/BEE2-items/wiki/"
"wiki_peti" "string" "https://developer.valvesoftware.com/wiki/Category:Portal_2_Puzzle_Maker"
Expand All @@ -20,4 +20,8 @@
"issues_app" "string" "https://github.com/BEEmod/BEE2.4/issues/new/choose"
"issues_items" "string" "https://github.com/BEEmod/BEE2-items/issues/new/choose"
"issues_music" "string" "https://github.com/BEEmod/BEE2-music/issues/new/choose"

// Old keys, to support earlier versions.
"music_changer" "string" "https://github.com/BEEmod/BEE2-items/wiki/BEEmod-Music-Package-Creator-(BMPC)/"
"repo_bee2" "string" "https://github.com/BEEmod/BEE2.4/"
}

0 comments on commit b5c52ac

Please sign in to comment.