mirror of
https://github.com/2006-Scape/2006Scape.git
synced 2026-07-02 16:49:03 +00:00
[PR #394] [MERGED] Update #1864
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/394
Author: @mrextremez
Created: 3/12/2020
Status: ✅ Merged
Merged: 3/12/2020
Merged by: @dginovker
Base:
master← Head:somefixes📝 Commits (1)
49f88ebUpdate📊 Changes
52 files changed (+1080 additions, -1038 deletions)
View changed files
➕
2006Redone Client/bin/.gitignore(+35 -0)📝
2006Redone Server/data/cfg/spawn-config.cfg(+12 -2)📝
2006Redone Server/data/data/itemdef.json(+2 -2)📝
2006Redone Server/src/main/java/com/rebotted/GameEngine.java(+1 -1)📝
2006Redone Server/src/main/java/com/rebotted/game/content/combat/npcs/NpcCombat.java(+3 -2)📝
2006Redone Server/src/main/java/com/rebotted/game/content/minigames/Barrows.java(+5 -4)📝
2006Redone Server/src/main/java/com/rebotted/game/content/minigames/trawler/TrawlerWaitingRoom.java(+3 -3)📝
2006Redone Server/src/main/java/com/rebotted/game/content/minigames/trawler/WaitingRoom.java(+2 -2)📝
2006Redone Server/src/main/java/com/rebotted/game/content/skills/SkillData.java(+1 -1)📝
2006Redone Server/src/main/java/com/rebotted/game/content/skills/core/Mining.java(+37 -16)📝
2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/JewelryMaking.java(+7 -15)📝
2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/Pottery.java(+11 -31)📝
2006Redone Server/src/main/java/com/rebotted/game/content/skills/crafting/Spinning.java(+1 -3)📝
2006Redone Server/src/main/java/com/rebotted/game/content/skills/firemaking/Firemaking.java(+1 -1)📝
2006Redone Server/src/main/java/com/rebotted/game/content/skills/fletching/LogCutting.java(+10 -22)📝
2006Redone Server/src/main/java/com/rebotted/game/content/skills/runecrafting/Tiaras.java(+1 -3)📝
2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/Smelting.java(+8 -3)📝
2006Redone Server/src/main/java/com/rebotted/game/content/skills/smithing/Smithing.java(+12 -15)➕
2006Redone Server/src/main/java/com/rebotted/game/content/traveling/CarpetTravel.java(+59 -0)📝
2006Redone Server/src/main/java/com/rebotted/game/dialogues/DialogueHandler.java(+117 -74)...and 32 more files
📄 Description
Closes #393
Closes [PR #252] [MERGED] Remove some incorrectly perma aggro monsters (#392)
Closes [PR #242] [MERGED] A lot of fixes (#391)
Closes [PR #240] [MERGED] Couple quick fixes (#390)
Closes [PR #235] [MERGED] More fixes (#389)
Closes [PR #231] [MERGED] Some fixes (#388)
Closes [PR #226] [MERGED] Fixup, Add new command (#385)
Closes [PR #224] [MERGED] Agility fixes (#384)
Closes [PR #213] [MERGED] Cleanup part 1 (#379)
Closes [PR #125] [MERGED] Read Comment (#334)
Closes [PR #44] [MERGED] Players Online On Website, Changed packaging a little & added Setting… (#278)
Closes [GH-ISSUE #637] bug, stuck in place outside varrock (#244)
-These were previously fixed
Also included:
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.