aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-11-18Merge pull request #302 from apotato321/apotato321-f7beforeMoulberry
items before f7 release
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-141.6-verMoulberry
2020-11-14Merge pull request #301 from IRONM00N/master-patchMoulberry
A bunch of fixes and stuff
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-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
2020-11-05Merge pull request #295 from IRONM00N/masterMoulberry
Stuff I missed
2020-11-04Cakes, Spooky Fishing and CosmeticsIRONM00N
2020-11-04Merge pull request #296 from TomEngMaster/masterMoulberry
Diamond armor rarity fix
2020-11-03Diamond armor fixTomEngMaster
Fixed diamond armor being common rarity
2020-11-03Merge pull request #2 from Moulberry/masterTomEngMaster
Update
2020-11-03Revert "Diamond tools fix"TomEngMaster
This reverts commit f574e07b7e08d966dcae218073f8b0b9fce82c3d.
2020-11-03Diamond tools fixTomEngMaster
Fix diamond tools being common instead of uncommon
2020-10-31Revert "Merge branch 'All-Enchanted-Books' into master"IRONM00N
This reverts commit af3047d7c1b206f08d7db6698208f13b62b5856a, reversing changes made to 7188fdf8bc58cc0c2ffeceb43af646c211186314.
2020-10-31Merge branch 'All-Enchanted-Books' into masterIRONM00N
2020-10-31Merge pull request #18 from Moulberry/masterIRONM00N
update fork
2020-10-31Stuff I MissedIRONM00N
Still Need to add WIKI URLS to previous comit
2020-11-011.5 verMoulberry
2020-11-01test2Moulberry
2020-11-01testMoulberry
2020-11-01disable old neuahMoulberry
2020-10-31Merge pull request #294 from RobotHanzo/patch-1Moulberry
Re-fix broken lapis minion sub-IDs
generated by cgit (git 2.46.0) at 2024-12-03 22:12:38 +0000