mirror of
https://github.com/2006-Scape/2006Scape.git
synced 2026-07-02 16:49:03 +00:00
[PR #533] [MERGED] Various Changes #1989
Reference in New Issue
Block a user
Delete Branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/2006-Scape/2006Scape/pull/533
Author: @Dark98
Created: 8/22/2022
Status: ✅ Merged
Merged: 8/22/2022
Merged by: @Dark98
Base:
master← Head:dev📝 Commits (4)
5ec97e0Add Shield Blocking Emote For Two NPC'se313570Fix KARAMBWAN HP Restore Amount24f6babAdd Link Command To Discord Bot0f3429bGithub Actions Update📊 Changes
6 files changed (+38 additions, -7 deletions)
View changed files
📝
.github/workflows/maven.yml(+13 -4)📝
2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcEmotes.java(+3 -2)📝
2006Scape Server/src/main/java/com/rs2/game/content/consumables/Food.java(+1 -1)📝
2006Scape Server/src/main/java/com/rs2/integrations/discord/JavaCord.java(+1 -0)📝
2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Commands.java(+2 -0)➕
2006Scape Server/src/main/java/com/rs2/integrations/discord/commands/Link.java(+18 -0)📄 Description
*Add Shield Blocking Emote For Two NPC's
*Fix KARAMBWAN HP Restore Amount
*Add Link Command To Discord Bot
*Github Actions Update
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.