Commit Graph
2971 Commits
Author SHA1 Message Date
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 633c3e7b4d Move jei integration out temporarily for compiling, update mods.toml 2019-07-01 20:37:48 -07:00
Vincent Lee 5304645972 Compiling 2019-07-01 20:27:37 -07:00
Vincent Lee 7cdc5c9ce0 Almost there 2019-07-01 00:31:06 -07:00
Vincent Lee 233ab271f7 another half 2019-06-30 15:49:33 -07:00
Vincent Lee 2b7a780736 block loot tables 2019-06-30 14:51:22 -07:00
Vincent Lee 27ec1e58fc Below 300 errors 2019-06-30 13:34:45 -07:00
Vincent Lee d0acd5fdb0 Another pass 2019-06-29 22:55:04 -07:00
Vincent Lee fc1dd61c53 Another pass through 2019-06-29 14:54:39 -07:00
Vincent Lee bd5b395ee8 More work, pretty close to being back to 1.13 level 2019-06-29 00:28:18 -07:00
Vincent Lee 828d952a86 Fix most of entities 2019-06-27 22:36:46 -07:00
Vincent Lee 207a66b121 more random fixes 2019-06-25 21:04:36 -07:00
Vincent Lee e7dc900634 brief pass through trinkets 2019-06-24 19:51:18 -07:00
Vincent Lee 815e4f9e92 Rerun migration maps for curio change 2019-06-24 19:27:28 -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 898e15a221 Misc fixes 2019-06-22 14:04:02 -07:00
Vincent Lee 0f8625adff Pass through subtiles 2019-06-22 00:11:23 -07:00
Vincent Lee 070093c9e5 Update forge, Replace spawn->addEntity, misc fixes in TE's 2019-06-21 23:43:52 -07:00
Vincent Lee cce2f81d15 Misc fixes around 2019-06-08 18:47:15 -07:00
Vincent Lee ee08a279a7 Fix some block methods 2019-06-08 18:08:15 -07:00
Vincent Lee c7cc76e1f3 openglhelper -> glx 2019-06-08 01:20:51 -07:00
Vincent Lee 0e3c5949a1 Remove blockfaceshape 2019-06-08 01:19:50 -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 12695ae3f4 Fix dodge ring crash, fix logo 2019-06-02 12:44:22 -07:00
Vincent Lee ed3ef437d5 brace oops 2019-06-02 12:44:22 -07:00
Vincent Lee 0c1643fe45 eliminate some hard refs to curio api 2019-06-02 12:44:22 -07:00
Vincent Lee 1d4c65a7c4 More curio work 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 bd095808b7 Fix jei plugin not loading 2019-04-23 13:37:09 -05:00
Vincent Lee c34d2c55b9 Restore JEI integration, though it doesn't seem to load right now 2019-04-23 00:21:23 -05:00
Vincent Lee 57225fda6c Dedupe prefix impls 2019-04-22 20:02:08 -05:00
Vincent Lee 9d0c65fae0 Missing files 2019-04-22 20:01:23 -05:00
Vincent Lee 15c35ee8da Move mana infusion recipes to imc 2019-04-22 20:01:06 -05:00
Vincent Lee 48b52a9a86 Fix more recipes 2019-04-11 23:50:32 -05:00
Vincent Lee aed98aaded Snipe some todos 2019-04-10 21:41:23 -05:00
Vincent Lee 704a03e131 Conver en_us lang to json, start fixing it. This'll take forever. 2019-04-07 13:41:00 -05:00
Vincent Lee c29640e558 Misc todo fixes in enchanter, tiny potato, avatar 2019-04-07 12:57:46 -05:00
Vincent Lee 5713b91177 Merge branch 'master' of github.com:Vazkii/Botania into 1.13 2019-04-07 11:58:17 -05:00
Vincent Lee f7b90dbba2 Add missing itemblocks for dreamwood variants 2019-04-07 11:47:08 -05:00
Vincent Lee 32d75b8612 Fix lens rendering on gunmodel 2019-04-06 22:01:11 -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