aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-11-17Merge pull request #27 from apotato321/apotato321-f7beforeIRONM00N
Apotato321 f7before
2020-11-17Add files via uploadapotato321
f7 item
2020-11-17Merge branch 'apotato321-items-1' into masterapotato321
2020-11-17Merge pull request #3 from Moulberry/masterapotato321
123123
2020-11-17Before F7 Release Itemsapotato321
2020-11-17New stuffapotato321
dsfes
2020-11-16Books | Pet FixesIRONM00N
2020-11-14Merge pull request #26 from Moulberry/masterIRONM00N
1.6
2020-11-14Update ULTIMATE_NO_PAIN_NO_GAIN;1.jsonIRONM00N
2020-11-14Books v3IRONM00N
2020-11-14Remove anvil uses | new cosmeticIRONM00N
2020-11-14Books v2IRONM00N
2020-11-14books v1IRONM00N
2020-11-14Revert "Improvements v1"IRONM00N
This reverts commit 96f68cfe834a216e2669ad06f586bee957db892a.
2020-11-14Collection RequirementsIRONM00N
2020-11-14Improvements v1IRONM00N
2020-11-141.6-verMoulberry
2020-11-14Merge pull request #301 from IRONM00N/master-patchMoulberry
A bunch of fixes and stuff
2020-11-13BooksIRONM00N
2020-11-13Revert "Merge pull request #23 from IRONM00N/master"IRONM00N
This reverts commit 0ad1878374bce4376b6a16052a8f9409431fae5e, reversing changes made to b6fd4b6bfe35a3268fd03b267bf626026920b8d7.
2020-11-13Merge pull request #23 from IRONM00N/masterIRONM00N
keep up to date
2020-11-13Manual Merge bc ConflictsIRONM00N
2020-11-13Merge pull request #22 from IRONM00N/master-patchIRONM00N
Master patch
2020-11-13Merge branch 'master' into master-patchIRONM00N
2020-11-13More fixes from jani270IRONM00N
2020-11-13Some URLs For shop itemsIRONM00N
2020-11-12Social Shop Items | Added Axes I missedIRONM00N
2020-11-11More Farming ItemsIRONM00N
2020-11-11Another Fix by Jani270IRONM00N
- Fixed Epic Wither Skeleton Pet - Fixed Megalodon Pet - Added Ferocity for Ocelot/Ghoul/Pigman/Shredder/Tiger - Fixed Tiger first Ability - Fixed Legy Bat for all other things I just added a wiki url
2020-11-08Merge pull request #292 from TymanWasTaken/masterMoulberry
Add wiki urls
2020-11-08Merge pull request #297 from RobotHanzo/patch-1Moulberry
Fixed JSON standard violations
2020-11-08Merge pull request #298 from RobotHanzo/patch-2Moulberry
Fixed duplicated keys
2020-11-08Merge pull request #299 from nopothegamer/masterMoulberry
Update petnums.json fixed monkey pets
2020-11-08Update petnums.jsonnopothegamer
2020-11-07Hopefully Updated ManuallyIRONM00N
2020-11-07Some Cosmetics and a Few Farming ItemsIRONM00N
No WIKI URLS yet for the farming items (don't exist yet)
2020-11-07jani270 - A bunch of wiki URLS and FixesIRONM00N
I take no credit for any of this, jani270 asked me to upload it for him. Changelog - Added Recipes for Pig/Spider/Skeleton/Endermite and added Wiki - Added Stats for Werewolf Armor and Soul Whip and added Wiki - Fixed Beastmaster Crest Kills and added Wiki - Added Stats for the Shark Talismans and added Wiki - Fixed Frozen Blaze Stats for all other things I just added a wiki url
2020-11-07Merge pull request #20 from Moulberry/masterIRONM00N
Update
2020-11-07Fixed duplicated keysRobotHanzo
2020-11-07Fixed JSON standard violationsRobotHanzo
This removes the trailing comma and unstable use of tab-based indenations
2020-11-05Tiger shark tooth wikiTymanWasTaken
2020-11-05Sharp shark tooth necklace wiki urlTymanWasTaken
2020-11-05Another wiki urlTymanWasTaken
2020-11-05Add wiki urlTymanWasTaken
2020-11-05Add wiki urlTymanWasTaken
2020-11-05Add wiki urlTymanWasTaken
2020-11-05Add wikiTymanWasTaken
2020-11-05Add wiki url to dull shark necklaceTymanWasTaken
2020-11-05Add blue shark tooth wiki urlTymanWasTaken
2020-11-05Add holy frag wiki url (why was it on the other frags but not this)TymanWasTaken