Commit Graph
107 Commits
Author SHA1 Message Date
Vincent Lee ca2458a061 Fix vanilla orechid recipes being missing, and make orechid resilient to no entries 2019-12-09 17:07:15 -06:00
Vincent Lee 5e478f5ff7 Fix elementium tool repair material being wrong, and fix tornado rod yeeting too hard, closes #3004 2019-11-08 22:00:55 -06:00
Vincent Lee a158215fb0 More cleanups, optimize imports 2019-10-31 10:51:48 -05:00
Vincent Lee d00349cbc7 Yeet all the lexicon and multiblock code (this temporarily kills the sextant, which will be reimplemented on top of the patchouli multiblocks 2019-10-30 23:54:03 -05: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 c4278be1ff couple todos 2019-07-01 22:09:05 -07:00
Vincent Lee 7ef12b61d8 update gradle, apply migration mappings, start fixing stuff 2019-06-08 01:07:26 -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 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 04900e560d Getting close 2019-03-17 00:35:40 -05:00
Vincent Lee 776d62dcbc more cleaning 2019-03-15 00:31:21 -05:00
Vincent Lee d159660115 More cleaning 2019-03-13 00:01:03 -05:00
Vincent Lee d6bd0c021b Oredict/tag cleanup 2019-03-12 19:28:17 -05:00
Vincent Lee 3a8be04fa7 more cleaning, fix commands and delete download command 2019-03-12 18:38:56 -05:00
Vincent Lee 13e56153a9 Merge 1.12 2019-03-01 14:03:38 -06:00
Vincent Lee e1890a7aab Fix main itemblocks 2019-02-27 02:04:40 -06:00
Vincent Lee a5625750b7 some subtile/te work 2019-02-24 18:19:47 -06:00
Vincent Lee e7d0315ce3 lots more items 2019-02-23 23:02:01 -06:00
quaternary a559131772 Gaia fixes and anticheese stuff (#2853)
* No sleeping through the fight!

* Far stricter arena check

* Some cleanups

* Change the way GG teleportation works + happier to break blocks

* Simplify teleportation logic.
  * Basically just picks a point somewhere in the arena and goes there.
  * Doesn't take collision boxes etc into consideration.
  * This fixes the "double carpet" exploit.
* GG is now super happy to break blocks.
  * Will break blocks in the path of a teleport.
  * Will break blocks around it every tick.
  * A new API method is added to add immune blocks (such as the pylons).

* Fix #2824 by always spawning traps at the arena height

* Fix regression where the gg considered players in spec mode

* Fix landmines better

* Fix block break position lol
2019-02-22 00:48:03 -06:00
Vincent Lee cb2b082ef1 Armor and some other items 2019-02-21 01:42:44 -06:00
Vincent Lee 548898275e Lots of work on tools 2019-02-21 01:04:23 -06:00
Vincent Lee 6f20d51b04 A bunch of items 2019-02-03 01:14:01 -06:00
Vincent Lee eaaa55fdb0 Merge master 2019-01-16 14:46:30 -06:00
Vincent Lee fb8ebd8ca7 Update forge/mappings/thaumcraft 2018-12-25 22:02:04 -06:00
Hubry 5841466efa Clean up and update wiki providers. (#2666)
Lowercase modids, remove providers for defunct sites and mods with
no chance to come back, use HTTPS for Gamepedia, update URLS to sites
that moved.
2018-07-03 20:17:03 -07:00
Vincent Lee 770d40c95b Finish move to ResLoc subtiles 2018-03-29 19:42:06 -05:00
Vincent Lee 01c81b9177 Partially-done migration of subtiles from strings->resource locations 2018-03-29 19:08:42 -05:00
Vincent Lee 23377aeee9 Allow pure daisy inputs to be state-sensitive. Closes #2501 2018-01-06 13:09:16 -06:00
Vincent Lee 9d78aca015 Clean up some todos 2017-07-20 23:42:45 -05:00
Vincent Lee 4091c7e4fb Fix some todos, modernize JEI, other housekeeping 2017-06-25 16:44:08 -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 5c145362d8 Lots of find replaces and random fixes 2017-06-16 07:52:59 -05:00
Vincent Lee 3c80b25277 Minor cleanups in tools 2017-02-18 23:00:50 -06:00
Vincent Lee c0811f5a78 api compiles, bump version 2017-01-04 23:45:48 -06:00
Vasco Lavos 8306a38d83 Added osmium from mekanism and black quartz from actually additions to the botania api orechid table. 2016-10-19 22:06:34 +01:00
Vasco Lavos e38556d265 Cleanup. Looks like it's been a while since this was run eh? 2016-10-02 21:29:35 +01:00
Vasco Lavos 1edbc41b12 Removed fluff. Closes #1883 2016-09-11 19:12:53 +01:00
Shadowfacts 6cde8299c4 Modify Elven Trade recipes to allow for recipes with multiple outputs 2016-08-02 16:23:40 -04:00
Vincent Lee 14f0c43850 Fix armor material registration, buff terrasteel armor slightly 2016-06-04 20:00:10 -05:00
Vincent Lee 8fb3b886a8 Get rid of all the nullable-nonnull stuff, warning huge diff 2016-05-18 21:03:12 -05:00
Vincent Lee 056f46b1f8 Update to 1.9.4 - untested waiting on baubles 2016-05-18 15:22:35 -05:00
Vincent Lee 8c3d1bde14 Tweak equip sounds, boost thundercaller's attack speed 2016-04-14 22:37:26 -05:00