Commit Graph
3314 Commits
Author SHA1 Message Date
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
Hubry 843fa2fd06 Add hook for hidden lexicon categories (#2867) 2019-06-02 12:40:11 -07:00
Vincent Lee 078fd054e0 Fix flugel tiara's secret code not working on linux 2019-05-15 13:03:06 -05:00
quaternary 71bc77e406 Allow break-blacklisted blocks inside the arena (#2908) 2019-05-10 17:57:10 -05: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
comp500 7416d8e25a Check for PreventRemoteMovement NBT tag (#2888) 2019-04-29 21:53:59 -05:00
MoriyaShiine 6e6dc44a5e fix armor... again (#2898) 2019-04-29 21:53:22 -05:00
quaternary 63c364b020 Less strict gg arena floor checks, some changes to accomodate for low-floor fights, QoL improvements with messed up pylons (#2899) 2019-04-29 21:52:18 -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
quaternary 94ed40a955 Fix #2893. As it turns out, I am not smart (#2894) 2019-04-21 22:24:41 -05:00
Vincent Lee b971abdeb1 Fix magnet ring working in spectator mode, fixes #2890 2019-04-16 22:53:16 -05:00
Vincent Lee 48b52a9a86 Fix more recipes 2019-04-11 23:50:32 -05:00
David Vierra fdc957c87f When matching recipe tags, also match the first items of nested lists (#2881)
Mostly useful when adding CraftTweaker recipes which have Forestry bees
as inputs, since the bee's chromosomes are in a list and the recipe
only needs to match some of the chromosomes.
2019-04-11 20:38:49 -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
Vincent Lee ace224e41e Update forge, fix spreader placement and rendering weirdness 2019-04-06 15:50:34 -05:00
Vincent Lee 7351966073 Minor model typos 2019-04-05 02:12:28 -05:00
Vincent Lee b9041f5ceb Tweak more model stuff 2019-04-05 02:02:53 -05:00
Vincent Lee a0bd6ced48 Fix lexicon and gun models, partially. lenses still look a bit weird 2019-04-05 01:43:17 -05:00
Vincent Lee 32b0f64127 Remove old fix for vanilla particle bug 2019-04-04 23:21:30 -05:00
Vincent Lee 055f03d319 Fix a bunch of recipes and models 2019-04-02 22:38:22 -05:00
Vincent Lee 99469e1851 Fix a bunch of recipes 2019-04-02 12:16:56 -05:00