aboutsummaryrefslogtreecommitdiff
path: root/items
AgeCommit message (Collapse)Author
2021-01-01Take 2 Added Things and Fixed Things (#348)jani270
* Added Wiki Links and 2 Talismans * Added new Books * Added Parents for Talismans and Books, fixed 2 Talismans
2020-12-31cubism 6 (#347)SemicolumnDev
* cubism 6 * parent cubism 6
2020-12-28more p2w stuffIRONM00N
2020-12-24Take 2: Added enchantments and fixed parenting (#340)Swedengamer100
* Add files via upload * Add files via upload * Add files via upload * Delete parents.json * Rename parent.json to parents.json * Update enchants.json * Update enchants.json
2020-12-24Fixes and added Things (#341)jani270
* Added Wiki URL's, and Recipes, fixed Intimidation Artifact Parrot Moment * Added Snowglobe Skin speeed * Fixed Bat and Sheep Pet Hypixel Wiki WeirdChamp
2020-12-19Fix wiki url for l.a.s.r's eye (#337)TymanWasTaken
2020-12-18Some Stuff from JaniIRONM00N
2020-12-18Add rancher boots recipe (#333)TymanWasTaken
* Add rancher boots recipe * trailing comma go brrrrrrrr * Whoops
2020-12-14Move the file to where it goes (#328)TymanWasTaken
gg @SemicolumnDev
2020-12-14Enchanted books and other stuff (#326)SemicolumnDev
* ender slayer 7 * proj prot 6 * name change * proj prot 7 * fire prot 7 * chance 4 * syphon 4 * gingerbread house * wreath * blue elephant * chill fish he is chill * respite 1 respite more like spite im tired * respite 2 is spite 2 * fix ginger house * gingerbread house 3 hope this works * Revert "gingerbread house 3 " This reverts commit 6d32a22916dee67f1961b44c6e75b4697596812a. * Revert "fix ginger house" This reverts commit 9e38cbb6a039bba8ff414b1e1c56629822a0541b. * gingerbread house 2 the sequel this is getting messy * finally fixed i think im dumb if you couldnt tell * respite 3 * penguin minion skin * crit 7 * wrong dir * crit 7 right dir this time * titan killer 6 * titan killer 7 * cleave 6 * blast prot 6 * missing comma * rename * add missing comma * parenting * parents.json
2020-12-11Wither Armor Requirements Update + Griffin Fixes (#324)MisterCheezeCake
* Update GRIFFIN_UPGRADE_STONE_RARE.json I am an idoit and used the wrong color codes * Update GRIFFIN_UPGRADE_STONE_LEGENDARY.json I was big stupid and used the wrong formatting code so I fixed it. * Update WISE_WITHER_BOOTS.json Updated Requirements * Update TANK_WITHER_BOOTS.json Updated Reqs * Update WISE_WITHER_BOOTS.json Forgot a quote+comma * Updated Requirements * Updated Requirements * Updated Reqs * Updates Reqs * Updated Reqs * Updated Reqs * Updated Reqs
2020-12-11Change JSON Lint & fixed Turbo Books (#323)IRONM00N
* Update Turbo Book Reqs * Update main.yml
2020-12-09Griffin Upgrade Stone description updates. MisterCheezeCake
2020-12-09Guardian pet -> Enchanting pet, Experimentation table, other new items and ↵Swedengamer100
recipes/wiki links
2020-12-09Add Wedding RingsTymanWasTaken
2020-12-07Merge pull request #314 from IRONM00N/masterMoulberry
1209347812093487
2020-12-04thx janiIRONM00N
2020-11-30Merge pull request #311 from Swedengamer100/masterMoulberry
Update SWORD_OF_REVELATIONS.json
2020-11-28Update SWORD_OF_REVELATIONS.jsonSwedengamer100
2020-11-27hypixel likes moneyIRONM00N
2020-11-27Fixed broken spirit sceptre recipeRobotHanzo
2020-11-26I am speedIRONM00N
2020-11-26*enter creative name here*IRONM00N
2020-11-21Fixed duplicated keysRobotHanzo
2020-11-20Scrolls!IRONM00N
2020-11-20Learning To Count with IRONM00N pt 2IRONM00N
2020-11-19Learning How to Count With IRONM00NIRONM00N
2020-11-19New Parent SystemIRONM00N
2020-11-18Parenting for Wither ArmorsIRONM00N
2020-11-18fix prot 6IRONM00N
2020-11-18More f7IRONM00N
2020-11-17more f7IRONM00N
2020-11-17FixIRONM00N
2020-11-17Merge pull request #27 from apotato321/apotato321-f7beforeIRONM00N
Apotato321 f7before
2020-11-17Merge branch 'apotato321-items-1' into masterapotato321
2020-11-17Before F7 Release Itemsapotato321
2020-11-17New stuffapotato321
dsfes
2020-11-16Books | Pet FixesIRONM00N
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-13BooksIRONM00N
2020-11-13Revert "Merge pull request #23 from IRONM00N/master"IRONM00N
This reverts commit 0ad1878374bce4376b6a16052a8f9409431fae5e, reversing changes made to b6fd4b6bfe35a3268fd03b267bf626026920b8d7.
2020-11-13Merge branch 'master' into master-patchIRONM00N
2020-11-13More fixes from jani270IRONM00N