aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-24Band-Aid type of fix for hyphenated enchantments (#338)Erymanthus[#5074] | (u/)RayDeeUx
also added two new enchantment pool pairs (triplestrike/firststrike and giantkiller/titankiller) i tested this on my own and for some reason it works even though it might not match the name of the enchantment in-game in terms of hyphenation... welp. whatever gets the job done, i guess? — erymanthus | u/raydeeux
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-19Pet & Hoe's Parenting + Bug Fixes (#335)jani270
* Added Parents for Pets and Hoe's * Fixed Legy Bat and Epic Bee * Update parents
2020-12-18Fixed Common, Uncommon and Rare Sheep Pet (#334)jani270
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-17Add sc7k to talisman upgrades (#332)TymanWasTaken
2020-12-16parent syphon & respite (#329)SemicolumnDev
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-11Turbo Books Part 1 (#325)IRONM00N
* Create main.yml * Delete main.yml * Create blank.yml * Update blank.yml * Update Turbo Book Reqs * Delete blank.yml * Update main.yml
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-11reenable neuahBuildTools
2020-12-10Validate JSON (#322)IRONM00N
* maybe * test invalid json * Delete validate.yml * Create main.yml * Update main.yml * Update main.yml * Update main.yml * >:c * maybe * yeet that output * Update main.yml * Update disable.json * optimize? * one more test * thing * Remove dupe lint * fix tested file Co-authored-by: TymanWasTaken <32660892+TymanWasTaken@users.noreply.github.com>
2020-12-11Merge branch 'master' of https://github.com/Moulberry/NotEnoughUpdates-REPOBuildTools
2020-12-11fix invalid enchants jsonBuildTools
2020-12-10fix missing comma (#321)TymanWasTaken
2020-12-10disable neuahBuildTools
2020-12-10Merge branch 'master' into masterIRONM00N
2020-12-10rancher boots (#320)IRONM00N
2020-12-10rancher bootsIRONM00N
2020-12-10update enchants.json SemicolumnDev
syntax error, my bad.
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-09Merge pull request #318 from SemicolumnDev/masterIRONM00N
New enchantments.
2020-12-09new enchantsSemicolumnDev
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-29Merge pull request #310 from RobotHanzo/patch-1Moulberry
Fixed broken spirit sceptre recipe
2020-11-28Update SWORD_OF_REVELATIONS.jsonSwedengamer100
2020-11-27hypixel likes moneyIRONM00N
2020-11-27Fixed broken spirit sceptre recipeRobotHanzo
2020-11-27Merge pull request #309 from IRONM00N/masterMoulberry
I am speed
2020-11-26I am speedIRONM00N
2020-11-27Merge pull request #308 from IRONM00N/masterMoulberry
*Insert Creative Name Here*
2020-11-26*enter creative name here*IRONM00N
2020-11-261.7.1Moulberry
2020-11-22Merge pull request #33 from Moulberry/masterIRONM00N
update
2020-11-231.7 verMoulberry
2020-11-22Merge pull request #306 from RobotHanzo/patch-3Moulberry
Fixed duplicated keys
2020-11-22Merge pull request #307 from TomEngMaster/masterMoulberry
Talismans fix
2020-11-22Fix talisman chainsTomEngMaster
Fixed talisman chains (hoofs, bat person, candy relic, wither relic)
2020-11-22Merge pull request #3 from Moulberry/masterTomEngMaster
Update from original repo
2020-11-21Fixed duplicated keysRobotHanzo
2020-11-21Merge pull request #305 from IRONM00N/masterMoulberry
Making ImperiaL happy