Commit Graph
2717 Commits
Author SHA1 Message Date
Vincent Lee 68c24519b3 Merge pull request #2781 from Hubry/horses
Fix horse viruses replacing attributes and turning horses into babies
2018-11-19 20:57:31 -06:00
Hubry 16bd2483f6 Fix Botania glass blocks being unchiselable with Chisels and Bits 2018-11-19 23:50:29 +01:00
Hubry 07c50a68d2 Fix horse viruses replacing attributes and turning horses into babies 2018-11-19 23:06:03 +01:00
Vincent Lee 3bebde687e Fix #2764 2018-10-13 02:14:51 -05:00
Vincent Lee 9eae466d30 Cleanup in ToolCommons, fix a stack null in bow 2018-10-09 00:47:51 -05:00
Hubry 3f47c4866c Add JEI recipe gui support for the corporea request key
Bumps required JEI version to 4.13.1.220, which added the required hook.
2018-10-03 12:37:34 +02:00
Saurabh Totey 46713ef180 Added null-check to PlatformModel for #2684 2018-10-01 13:46:11 -06:00
Vincent Lee bd2c468ba4 Safety checks to fix #2727 2018-09-25 10:39:24 -05:00
Vincent Lee d10df52b92 Merge pull request #2745 from Hubry/jei-brews
Improve handling of brews in JEI
2018-09-17 17:11:14 -05:00
Hubry 3bf7e07546 Improve handling of brews in JEI
* Add subtype interpreters to make looking up specific brew recipes less annoying
* Add blood pendants and incense sticks to the brew recipe wrapper
* Add locking of the other ingredient, so that when an item is focused, the other ingredient does not change to the items that don't fit
  (eg. you looked up the flask of fleetfeet, the input no longer swaps between vials and flasks)
2018-09-17 13:06:46 +02:00
Vincent Lee 25d37b9c0c Merge pull request #2741 from codewarrior0/metastone-weight-lens
Allow Metamorphic Stones to be silk-dropped by a Weight Lens
2018-09-15 12:23:00 -05:00
Vincent Lee 871463ea3f Merge pull request #2739 from codewarrior0/patch-5
Prevent Fallen Kanade from healing during GG fights
2018-09-15 12:22:39 -05:00
David Vierra 41332fd106 Allow Metamorphic Stones to be silk-dropped by a Weight Lens 2018-09-14 21:50:54 -10:00
Vincent Lee f7e9b4cb99 Force relays now give visual feedback when binding them 2018-09-14 21:31:33 -05:00
David Vierra 492e101acd Prevent Fallen Kanade from healing during GG fights 2018-09-14 01:15:31 -10:00
Vincent Lee 80aea6f7be Remove more redundant stack copying from recipe matching 2018-09-09 18:23:09 -05:00
David Vierra a7e4a9e009 Fix Tiny Potato equipment not syncing to clients 2018-09-04 13:22:18 -10:00
Vincent Lee 27cb04cbbb Similar fixes to last commit, for grass horn and exchange rod 2018-09-03 20:26:20 -05:00
Vincent Lee 3154b8aa80 Fix bore lens not respecting harvest drops event. Closes #2730 2018-09-03 20:21:15 -05:00
Vincent Lee c70f53ceee Restore buildcraft integration (yay) 2018-09-03 15:25:25 -05:00
Vincent Lee 7dc0bd4670 Add some profiling for subtiles 2018-09-02 22:39:47 -05:00
Vincent Lee 8595d27f41 Eliminate lots of itemstack copying in pure daisy recipe matching. Should give enough of a lag improvement until 1.13 gets here :P 2018-09-02 22:21:21 -05:00
Vincent Lee 0b526c1b31 Fix withdrawing from brewery taking two items at a time 2018-09-02 21:33:15 -05:00
Hubry ff834dc823 Fix the portal not returning the lexicon. (#2726)
I swear I am competent.
2018-09-01 13:40:07 +01:00
Vincent Lee 651b17a9e6 Fix #2724 2018-08-29 14:04:50 -05:00
Vasco Lavos 5e3a98fa1f Merge branch 'master' of https://github.com/Vazkii/Botania 2018-08-27 22:02:02 +01:00
Vasco Lavos 06dbf2a00a Let's pretend I didn't forget 90 :^) 2018-08-27 22:01:49 +01:00
Hubry c88555a24b Fix Alfheim portal storing items not used in recipes (#2721)
* Fix #2403 (Alfheim portal storing items not used in recipes)

Possibly mitigates #2669, as recipe checks are a bit simplified to not
create stack copies posting capability events and the portal will not
check items with no uses more than once.

* Don't teleport bread, Bord.
2018-08-27 21:30:47 +01:00
David Vierra 416738e991 Resize and reorient Tiny Potatoes held as equipment by other Tiny Potatoes (#2722)
Also adjusts the placement of any blocks on the top side of the potato
such that they rest flatly on the potato's head.
2018-08-27 21:30:27 +01:00
Hubry 18ab523c91 Fix #2718 (Crafting/Manufactory Halos crashing with active Thaumatorium) (#2720) 2018-08-27 14:10:41 +01:00
codycoolwaffle 484465a418 Close #2441 (#2458)
Adjusts night vision effect times to accommodate for lag to reduce flashing skies.
2018-08-27 12:11:42 +01:00
Vasco Lavos 8e15883a60 Merge pull request #2691 from quat1024/eventsAndExtents
Add some events and make things a bit more extensible
2018-08-27 12:08:47 +01:00
Vasco Lavos a71507550a Merge pull request #2692 from quat1024/nice
Nice
2018-08-27 12:08:08 +01:00
Vasco Lavos bd6cb63300 Merge pull request #2701 from Hubry/creator-modid
Implement getCreatorModId on the flower item
2018-08-27 12:08:01 +01:00
Vasco Lavos e3c4d9895e Merge pull request #2702 from quat1024/retainerComparator2
Corporea retainers use richer signal strength depending on request size (but better)
2018-08-27 12:07:05 +01:00
Vasco Lavos e29c64dda2 Merge pull request #2713 from codewarrior0/patch-4
Add missing null check in PacketBotaniaEffect
2018-08-27 12:06:58 +01:00
Hubry 94721a0149 Add llamas and parrots to the cocoon's rare animal spawns
Llamas were added in 1.11, while parrots were added in 1.12.
Both of them are an exotic pet and so should be available from
the cocoon.
2018-08-26 23:52:13 +02:00
David Vierra 2c72e73d9e Add missing null check in PacketBotaniaEffect 2018-08-25 01:18:27 -10:00
Vincent Lee c3a7cc5c27 Fix #2710 2018-08-23 23:54:24 -05:00
Vincent Lee 99e8d6a70c Fix gg not responding to /kill 2018-08-22 12:15:13 -05:00
Vincent Lee c177cda9e2 Gaia guardian music now repeats, closes #2485 2018-08-22 12:15:13 -05:00
Vincent Lee 280ffe2f58 gg uses iextraspawndata instead of datawatcher for some fields 2018-08-22 12:15:13 -05:00
Matthijs van der Meulen 49638c0aa6 Removed Railcraft support for the Mana Pool with Minecart.
As the Railcraft API for 1.12.2 is highly unstable, and crashes with the current version of Botania installed, I removed the implementation of IMinecartItem and all corresponding methods. The Mana Pool with Minecart still functions fine with railcraft, but now it doesn't crash anymore
2018-08-21 19:27:28 +02: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
quat 57cec38136 Use fancy log2 2018-08-16 22:12:07 -04:00
quat 84967e4e2e Revert inventory wrap hook
This reverts commit a122253791.
2018-08-16 00:44:38 -04:00
quat 11d4926ed8 don't update comparator output level unless it actually changed 2018-08-16 00:40:31 -04:00
quat 81f33e8d74 Corporea retainers use richer signal strength depending on request size 2018-08-16 00:27:29 -04:00
Hubry 04cbee8ae7 Implement getCreatorModId on the flower item
Replaces the tooltip containing the creator mod's modid with an override
for the method returning it, allowing mods like JEI to show the mod
that actually added the flower and return it in mod searches, like
Forge's universal bucket already does with mod fluids.
2018-08-15 23:02:38 +02:00
quat 66aa3bf6b4 nice 2018-08-03 14:31:20 -04:00