aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-07Fixed duplicated keysRobotHanzo
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
2020-10-31Re-fix broken lapis minion sub-IDsRobotHanzo
The fix previously got broken by #293 because of their outdated branch and didn't noticed my the merger when merging, thus this change resubmitted
2020-10-31Merge pull request #293 from IRONM00N/masterMoulberry
Halloween Items Etc.
2020-10-30more halloweenIRONM00N
2020-10-30New StuffIRONM00N
2020-10-30Chnaged FilesIRONM00N
2020-10-30Halloween Stuff?IRONM00N
2020-10-30Merge pull request #17 from Moulberry/masterIRONM00N
pr
2020-10-30Manually Add New Comits bc I can't use GithubIRONM00N
2020-10-30Merge pull request #16 from Moulberry/masterIRONM00N
Pr
2020-10-26Merge pull request #291 from RobotHanzo/patch-1Moulberry
Fix broken sub-ids for lapis minion (LAPIS_GENERATOR_1)
2020-10-25Fix broken sub-ids for lapis minion (LAPIS_GENERATOR_1)RobotHanzo
2020-10-25Merge pull request #290 from apotato321/masterMoulberry
Added More Enchant Books
2020-10-24Enchant Booksapotato321
2020-10-22Merge pull request #289 from apotato321/masterMoulberry
Scorpius Unqiue Enchants.
2020-10-21Merge pull request #2 from apotato321/apotato321-items-1apotato321
Add files via upload
2020-10-21Add files via uploadapotato321
2020-10-22added enchants constants 2 electric boogalooMoulberry
2020-10-22added enchants constantsMoulberry
2020-10-21Merge pull request #1 from apotato321/apotato321-items-1apotato321
Add files via upload
2020-10-21Add files via uploadapotato321
2020-10-21Merge pull request #288 from IRONM00N/masterMoulberry
1.9.8 Update Part 1
2020-10-201.9.8 Update Part 1IRONM00N
2020-10-20Revert "1.9.8 Part 1"IRONM00N
This reverts commit 5a52213b3062b3be6efe7a32ef7d9765bc8d1a91.
2020-10-201.9.8 Part 1IRONM00N
No Dark Auction Stuff yet
2020-10-20Merge pull request #15 from Moulberry/masterIRONM00N
update
2020-10-19Merge pull request #287 from IRONM00N/masterMoulberry
Builder Items
2020-10-18Merge pull request #14 from Moulberry/masterIRONM00N
Update
2020-10-18Added Builder DecorationsIRONM00N
2020-10-19Merge pull request #286 from IRONM00N/masterMoulberry
Fix Flying Fish AGAIN
2020-10-18Fix Flying Fish AGAINIRONM00N
generated by cgit (git 2.46.0) at 2024-12-04 10:15:14 +0000