Commit Graph
247 Commits
Author SHA1 Message Date
Vincent Lee d159660115 More cleaning 2019-03-13 00:01:03 -05:00
Vincent Lee 472cd80183 Move most dynamic recipes to json 2019-03-06 01:30:23 -06:00
Vincent Lee eaaa55fdb0 Merge master 2019-01-16 14:46:30 -06:00
quat b9d2d78a80 Add lexicon page for the thinking hand 2018-07-19 23:07:41 -04:00
Hubry 58346ad107 Update Thaumcraft integration (#2667)
* Pull TC6 from Curseforge's maven thing, remove API classes from repo

* Update Thaumcraft integration

* Make upgrade recipes move attached Thaumcraft item data properly
* Fix full mana inkwells pulled from creative menu not working
* Blacklist flux rifts instead of (removed) aura nodes from gravity rod
* Clean up a few TODOs around Thaumcraft integration
* Finally, assign Thaumcraft aspects to Botania items

* Add config for aspects.

Just in case of some bugs in Thaumcraft, or for modpack makers who want
to customize, so they don't have to disable everything by hand.
2018-07-12 22:58:16 -07:00
Vincent Lee ed72ff3d5f No longer crashes when loaded with TC6 beta. Note that this is just a crash-prevention fix, the actual integration still needs modernizing 2018-04-24 01:25:43 -05:00
Vincent Lee 01c81b9177 Partially-done migration of subtiles from strings->resource locations 2018-03-29 19:08:42 -05:00
Vincent Lee 99d34a7980 Flatten petalblocks 2018-03-08 13:40:31 -06:00
Vincent Lee 2d567f04cb Flatten spreaders 2018-03-07 19:49:29 -06:00
Vincent Lee 35ca7002ec Flatten crates 2018-03-07 18:32:30 -06:00
Vincent Lee 168d484621 Flatten apothecaries 2018-03-06 18:27:57 -06:00
Vincent Lee b1598d701d Flatten platforms 2018-03-06 17:38:47 -06:00
Vincent Lee 3f9993d762 Flatten pylons 2018-03-06 14:30:45 -06:00
Vincent Lee 91b9c2e0c8 Flatten pools 2018-03-06 11:17:52 -06:00
Vincent Lee d8d0d0ff13 Flatten azulejos 2018-03-06 01:03:42 -06:00
Vincent Lee 174183332f Flatten drums 2018-03-05 12:00:37 -06:00
Vincent Lee 1a10608c11 Merge branch 'master' of github.com:Vazkii/Botania into flattening_test 2018-03-04 23:52:38 -06:00
Vincent Lee c4715df02f Fix JEI integration for floating magic flowers 2018-02-08 11:58:22 -06:00
Vincent Lee abcf2a748b Flatten corporea sparks 2017-12-27 15:00:49 -06:00
Vincent Lee b70bb95c1b Flatten craft patterns, also refactor crafty crate a bit 2017-12-21 22:52:30 -06:00
Vincent Lee b37764bd30 Flatten seeds 2017-12-19 10:42:56 -06:00
Vincent Lee a0182a7bf8 Flatten viruses 2017-12-18 16:39:53 -06:00
Vincent Lee 01c9333016 Flatten dyes and petals 2017-12-18 15:32:36 -06:00
Vincent Lee 1637680750 Flatten lens 2017-12-16 16:10:06 -06:00
Vincent Lee 02fbb7f957 Merge branch 'master' into flattening_test 2017-12-16 12:45:00 -06:00
Vincent Lee 52281e047b Flatten horns 2017-12-15 21:41:58 -06:00
Vincent Lee e5aa9339df Flatten chakrams 2017-12-15 21:16:48 -06:00
Vincent Lee 1d997c7f3b Flatten Quartz 2017-12-15 20:45:19 -06:00
Vincent Lee 01611be2a9 Fix manaresource recipes in lexicon 2017-12-11 12:26:08 -06:00
Vincent Lee 68583d03d3 Flatten vial/flask 2017-12-11 12:20:15 -06:00
Vincent Lee d7ecb447c2 Cleanup in crafting recipes 2017-12-10 20:17:18 -06:00
Vincent Lee d5732131d1 Pass mod id to EventBusSubscriber. Apparently you're supposed to do this. 2017-12-10 20:11:28 -06:00
Vasco Lavos ab126ac9db Fixed crashes when viewing the Dandelifeon and Elven Mana Lenses pages. Closes #2355 2017-09-04 21:41:37 +01:00
gerhard2202 08a990300e Fixes the crash when trying to view the recipe for the Band of Aura in the Lexicon. 2017-08-28 22:06:31 -04:00
Vincent Lee 98930a924a Remove aesir ring 2017-08-15 15:18:19 -05:00
Vincent Lee a990e6a8d5 Diff spam warning: Bump forge, move wand recipes to json. Are we done? 2017-07-20 23:34:11 -05:00
Vincent Lee c3ff13bce0 More. recipes. 2017-07-20 20:53:00 -05:00
Vincent Lee 1d810fba7a More recipes. 2017-07-16 15:53:44 -05:00
Vincent Lee 63b9fa19d1 Moar recipes, fix wand recipes 2017-07-15 21:20:56 -05:00
Vincent Lee fed7394e0c Moar recipes back in lexicon 2017-07-13 20:18:08 -05:00
Vincent Lee 833324e150 Some recipes displaying in lexicon again 2017-07-09 12:18:20 -05:00
Vincent Lee 1ec96fc475 Some prep work for recipes in lexicon 2017-07-05 20:00:02 -05:00
Vincent Lee 4cc6ab2266 Fix all recipes except wand 2017-06-25 16:05:08 -05:00
Vincent Lee 3c95f951dd Misc fix other recipes, remove dumper code 2017-06-25 15:52:02 -05:00
Vincent Lee 19aec9d25b Enable/disable recipes appropriately based on GoG 2017-06-25 15:32:17 -05:00
Vincent Lee 18bf7526b2 Move most recipes to json 2017-06-25 14:42:54 -05:00
Vincent Lee c58ae21173 Fix sounds (removing BotaniaSoundEvents, query the registry directly
instead

Full optimize imports (sorry diff thrash :/)
2017-06-25 01:40:46 -05:00
Vincent Lee e0e5503fe8 Bump JEI, get things running 2017-06-25 01:18:06 -05:00
Vincent Lee 1dd68f9558 Move dynamic recipes to new registration system 2017-06-25 00:18:15 -05:00
Vincent Lee 4e9109f9bd Remove golden laurel in favour of vanilla totem 2017-01-23 11:48:41 -06:00