Original PR: https://github.com/2006-Scape/2006Scape/pull/81 Author: @mrextremez Created: 10/22/2019 Status: ✅ Merged Merged: 10/22/2019 Merged by: @dginovker
Base: master ← Head: master
master
21cb59f
d294655
e8c0ecc
ee38771
50f3bbb
76 files changed (+100 additions, -201 deletions)
➕ 2006Redone Client/run.bat (+5 -0) 📝 2006Redone Server/.classpath (+3 -0) ➕ 2006Redone Server/.gitignore (+1 -0) 📝 2006Redone Server/.settings/org.eclipse.jdt.core.prefs (+3 -3) ➖ 2006Redone Server/data/logs/gave/.keep (+0 -0) ➖ 2006Redone Server/data/logs/shopbuying/.keep (+0 -0) ➖ 2006Redone Server/data/logs/trades/recieved/.keep (+0 -0) 📝 2006Redone Server/redone/Server$1.class (+0 -0) 📝 2006Redone Server/redone/Server.class (+0 -0) 📝 2006Redone Server/redone/game/content/quests/QuestAssistant$Quests.class (+0 -0) 📝 2006Redone Server/redone/game/content/quests/QuestAssistant.class (+0 -0) 📝 2006Redone Server/redone/game/players/PlayerAssistant$1$1.class (+0 -0) 📝 2006Redone Server/redone/game/players/PlayerAssistant$1.class (+0 -0) 📝 2006Redone Server/redone/game/players/PlayerAssistant$2.class (+0 -0) 📝 2006Redone Server/redone/game/players/PlayerAssistant.class (+0 -0) 📝 2006Redone Server/redone/game/shops/ShopAssistant.class (+0 -0) ➖ 2006Redone Server/redone/integrations/discord/DiscordActivity.class (+0 -0) 📝 2006Redone Server/redone/integrations/discord/JavaCord.class (+0 -0) 📝 2006Redone Server/redone/integrations/discord/commands/Commands.class (+0 -0) ➖ 2006Redone Server/redone/integrations/discord/commands/HeatMap.class (+0 -0)
2006Redone Client/run.bat
2006Redone Server/.classpath
2006Redone Server/.gitignore
2006Redone Server/.settings/org.eclipse.jdt.core.prefs
2006Redone Server/data/logs/gave/.keep
2006Redone Server/data/logs/shopbuying/.keep
2006Redone Server/data/logs/trades/recieved/.keep
2006Redone Server/redone/Server$1.class
2006Redone Server/redone/Server.class
2006Redone Server/redone/game/content/quests/QuestAssistant$Quests.class
2006Redone Server/redone/game/content/quests/QuestAssistant.class
2006Redone Server/redone/game/players/PlayerAssistant$1$1.class
2006Redone Server/redone/game/players/PlayerAssistant$1.class
2006Redone Server/redone/game/players/PlayerAssistant$2.class
2006Redone Server/redone/game/players/PlayerAssistant.class
2006Redone Server/redone/game/shops/ShopAssistant.class
2006Redone Server/redone/integrations/discord/DiscordActivity.class
2006Redone Server/redone/integrations/discord/JavaCord.class
2006Redone Server/redone/integrations/discord/commands/Commands.class
2006Redone Server/redone/integrations/discord/commands/HeatMap.class
...and 56 more files
All of my changes seem to have merged. But fletching and iron bars fix are included, and are the only new ones that need to be added.
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.
No dependencies set.
The note is not visible to the blocked user.
📋 Pull Request Information
Original PR: https://github.com/2006-Scape/2006Scape/pull/81
Author: @mrextremez
Created: 10/22/2019
Status: ✅ Merged
Merged: 10/22/2019
Merged by: @dginovker
Base:
master← Head:master📝 Commits (5)
21cb59fOnly quests that are added will display on quest tab with this.d294655Iron bars now smelted @ 50% success rate :) - mr extremeze8c0eccMerge remote-tracking branch 'upstream/master'ee38771Fletching fix50f3bbbRevert "Merge remote-tracking branch 'upstream/master'"📊 Changes
76 files changed (+100 additions, -201 deletions)
View changed files
➕
2006Redone Client/run.bat(+5 -0)📝
2006Redone Server/.classpath(+3 -0)➕
2006Redone Server/.gitignore(+1 -0)📝
2006Redone Server/.settings/org.eclipse.jdt.core.prefs(+3 -3)➖
2006Redone Server/data/logs/gave/.keep(+0 -0)➖
2006Redone Server/data/logs/shopbuying/.keep(+0 -0)➖
2006Redone Server/data/logs/trades/recieved/.keep(+0 -0)📝
2006Redone Server/redone/Server$1.class(+0 -0)📝
2006Redone Server/redone/Server.class(+0 -0)📝
2006Redone Server/redone/game/content/quests/QuestAssistant$Quests.class(+0 -0)📝
2006Redone Server/redone/game/content/quests/QuestAssistant.class(+0 -0)📝
2006Redone Server/redone/game/players/PlayerAssistant$1$1.class(+0 -0)📝
2006Redone Server/redone/game/players/PlayerAssistant$1.class(+0 -0)📝
2006Redone Server/redone/game/players/PlayerAssistant$2.class(+0 -0)📝
2006Redone Server/redone/game/players/PlayerAssistant.class(+0 -0)📝
2006Redone Server/redone/game/shops/ShopAssistant.class(+0 -0)➖
2006Redone Server/redone/integrations/discord/DiscordActivity.class(+0 -0)📝
2006Redone Server/redone/integrations/discord/JavaCord.class(+0 -0)📝
2006Redone Server/redone/integrations/discord/commands/Commands.class(+0 -0)➖
2006Redone Server/redone/integrations/discord/commands/HeatMap.class(+0 -0)...and 56 more files
📄 Description
All of my changes seem to have merged. But fletching and iron bars fix are included, and are the only new ones that need to be added.
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.