mirror of
https://github.com/2006-Scape/2006Scape.git
synced 2026-07-02 16:49:03 +00:00
[PR #359] [MERGED] Some fixes #447
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/359
Author: @mrextremez
Created: 1/7/2020
Status: ✅ Merged
Merged: 1/8/2020
Merged by: @dginovker
Base:
master← Head:somestuff📝 Commits (1)
7488a24Some fixes📊 Changes
22 files changed (+268 additions, -289 deletions)
View changed files
📝
2006Redone Client/bin/ClientSettings.class(+0 -0)📝
2006Redone Client/bin/Flo.class(+0 -0)📝
2006Redone Client/bin/Game.class(+0 -0)📝
2006Redone Client/bin/RSFrame.class(+0 -0)📝
2006Redone Client/src/ClientSettings.java(+1 -0)📝
2006Redone Client/src/Flo.java(+6 -0)📝
2006Redone Client/src/Game.java(+78 -96)📝
2006Redone Client/src/RSFrame.java(+1 -1)📝
2006Redone Server/src/com/rebotted/game/content/skills/cooking/CookingTutorialIsland.java(+0 -2)📝
2006Redone Server/src/com/rebotted/game/content/skills/core/Fishing.java(+0 -1)📝
2006Redone Server/src/com/rebotted/game/content/skills/core/Mining.java(+2 -5)📝
2006Redone Server/src/com/rebotted/game/content/skills/core/Woodcutting.java(+2 -2)📝
2006Redone Server/src/com/rebotted/game/content/skills/firemaking/Firemaking.java(+1 -1)📝
2006Redone Server/src/com/rebotted/game/content/skills/smithing/SmithingInterface.java(+1 -1)📝
2006Redone Server/src/com/rebotted/game/dialogues/DialogueHandler.java(+174 -156)📝
2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java(+1 -2)📝
2006Redone Server/src/com/rebotted/game/npcs/NpcActions.java(+0 -1)📝
2006Redone Server/src/com/rebotted/game/npcs/NpcHandler.java(+0 -2)📝
2006Redone Server/src/com/rebotted/game/objects/ObjectsActions.java(+0 -5)📝
2006Redone Server/src/com/rebotted/game/objects/impl/SpecialObjects.java(+1 -2)...and 2 more files
📄 Description
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.