Commit Graph
130 Commits
Author SHA1 Message Date
Vincent Lee 4fac487589 Remove open and share commands and their corresponding vestiges from lexicon files, remove word counter 2019-10-18 14:31:29 -05:00
Vincent Lee d69389a32e Tweak recipe syncing 2019-10-18 12:42:53 -05:00
Hubry 4f97c8e861 Centralize tag handling 2019-10-08 18:52:21 +02:00
Vincent Lee 172119701c Merge branch '1.14' into patchouli 2019-09-24 16:52:33 -05:00
Vincent Lee 3c2de8453e bump forge to rb, fix fluid stuff 2019-09-13 17:48:37 -05:00
Vincent Lee e9aa92efec Finish multiblocks 2019-09-09 00:04:38 -05:00
Vincent Lee dad9192a8d Couple of multiblocks 2019-08-27 19:12:49 -05:00
Hubry bd8ce05831 Various 1.14 work (#2955)
* Fix GoG islands appearing below world height

* Fix tallgrass being used instead of grass blocks

* Hook up flower worldgen again

* Fix index bookmark deserializ., remove debug, use nondeprecated method

* Backward compat for headflowers

* Sort recipes by input item order
2019-08-21 17:30:44 -05:00
Hubry 290c69443d Make lexicon usable, search for recipes instead of hardcoding ids
Make dice of fate function again,
fix most remaining crafting recipes,
fix lexicon images
2019-08-09 23:10:11 +02:00
Vincent Lee ea84b87c0d Sync recipes on reload (untested) 2019-07-17 20:56:51 -07:00
Vincent Lee 0315863e6a Move rod of shaded mesa blacklist to entity tags 2019-07-17 19:59:06 -07:00
Vincent Lee 55a2d42a29 Make recipes reloadable using an event. Eventually they may move to jsons/files, but this will do for now 2019-07-03 21:47:42 -07:00
Vincent Lee 9d46ff7fe0 Fix some crashes and things on wrong bus, add valid blocks to TETypes 2019-07-01 21:11:51 -07:00
Vincent Lee 207a66b121 more random fixes 2019-06-25 21:04:36 -07:00
Vincent Lee d6595872be Merge branch '1.13' into 1.14 2019-06-24 19:25:02 -07:00
Hubry 05c88fd62a Make handling of curios centralized and add handling for no curios (#2913)
Minor fixes to cosmetic bauble rendering (GL stack overflows),
include the missed belt in belt curios
2019-06-24 18:45:59 -07:00
Vincent Lee 7ef12b61d8 update gradle, apply migration mappings, start fixing stuff 2019-06-08 01:07:26 -07:00
Hubry 2f3a1935cf 1.13 crafting recipe fixes (#2916)
* Fix incorrect item names, migrate data tags to flattened/nbt items

* Register fluxfield condition and shapeless mana upgrade

* Fix wrong JEI recipe catalyst, add corporea keybind JEI bookmark support
2019-06-02 12:44:22 -07:00
Vincent Lee 58ce052176 more curio stuff 2019-06-02 12:44:22 -07:00
Vincent Lee 5fbf520c1d more curios 2019-06-02 12:44:22 -07:00
Vincent Lee 3595f35e5b update forge and fix platforms, more curios 2019-06-02 12:44:22 -07:00
Vincent Lee 6ce466273c Experimental curios support 2019-06-02 12:44:22 -07:00
Vincent Lee 46546d2ecc Merge branch 'flattenall' into 1.13 2019-05-08 23:05:26 -05:00
Vincent Lee bf6dccfcd2 Beginning of work to flatten all special flowers. not compiling yet
more work. almost done.

Compiling and launching worlds

Fix models and other bugs

Cleanup ,fix flower langs and tooltips

remove old specialflower blockstate json
2019-05-08 23:04:53 -05:00
Vincent Lee ab12adaf27 Move rest of mana infusion recipes to imc 2019-04-29 22:15:05 -05:00
Vincent Lee 15c35ee8da Move mana infusion recipes to imc 2019-04-22 20:01:06 -05:00
Vincent Lee 3c71d46b82 Move a bunch of API calls to IMC, making them thread safe in the process 2019-04-06 21:27:17 -05:00
Vincent Lee b1b37b4c5a Move subtiles to a forge registry, very similar to TileEntityType 2019-04-06 19:49:37 -05:00
Vincent Lee 99469e1851 Fix a bunch of recipes 2019-04-02 12:16:56 -05:00
Vincent Lee ff975fbded Fix a bunch of todos and misc bugs 2019-04-02 01:09:21 -05:00
Vincent Lee 7c4797177d Tons of fixes to try to get things to load 2019-03-21 14:45:33 -05:00
Vincent Lee ea50b40229 More work 2019-03-17 21:25:20 -05:00
Vincent Lee 0377f68f84 Fix recipes + misc cleaning 2019-03-17 11:15:39 -05:00
Vincent Lee 776d62dcbc more cleaning 2019-03-15 00:31:21 -05:00
Vincent Lee 37c64a1688 More cleaning 2019-03-14 23:54:32 -05:00
Vincent Lee 2acde8a867 Update config to new system. Remove adaptor for now. 2019-03-13 23:58:42 -05:00
Vincent Lee d159660115 More cleaning 2019-03-13 00:01:03 -05:00
Vincent Lee 3a8be04fa7 more cleaning, fix commands and delete download command 2019-03-12 18:38:56 -05:00
Vincent Lee 42f09fad22 start trying to clean up main mod class 2019-03-06 01:41:42 -06:00
Vincent Lee 472cd80183 Move most dynamic recipes to json 2019-03-06 01:30:23 -06:00
Vincent Lee 5c3ac18670 Easy registry fixes 2019-02-02 23:27:00 -06:00
Vincent Lee e47734e534 Remove datafixers, forward compat to 1.13 is RIP anyway 2019-01-23 19:08:40 -06:00
Vincent Lee eaaa55fdb0 Merge master 2019-01-16 14:46:30 -06:00
Hubry e5d457dc3b Tweaks to Thaumcraft integration
* Move TC brew recipes to init, postinit was too late for aspects
* Add brew aspects
* Replace wood and stone stacks with their aspects, avoids livingwood having just Victus
* Reduce the amount of wildcard metadata, it is not best practice when it can be avoided
* Tweak a few aspect lists
* Remove entities that are just entity form of items
* Add missed Spectrolus aspects
2018-11-26 10:49:56 +01:00
Hubry 16bd2483f6 Fix Botania glass blocks being unchiselable with Chisels and Bits 2018-11-19 23:50:29 +01:00
Vincent Lee c70f53ceee Restore buildcraft integration (yay) 2018-09-03 15:25:25 -05:00
Hubry 8e2b09527a Update TC integration to beta 21, small tweaks to aspects (#2693)
* Formatting fixes for my previous PRs

* Bump Forge, JEI and Thaumcraft and specify some of them in mod deps

Forge to latest recommended (TC requires it)
Thaumcraft to Beta 21 (the new aspect registration)
JEI to stable 4.10.0.198 (mostly for testing purposes like Thaumic JEI)

* Move to the aspect event and tweak some item aspects
2018-08-18 14:03:25 -05: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 7fe66d4868 Blacklist bursts from interdiction torch properly 2018-04-17 11:25:48 -05:00
Vincent Lee 58fa185ef4 Merge branch 'master' into flattening_test 2018-03-29 19:09:19 -05:00