Commit Graph
5737 Commits
Author SHA1 Message Date
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
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
Vasco Lavos ead59192e6 Update contributors.properties 2018-09-07 21:41:37 +01:00
Vincent Lee 33f0880e88 Merge pull request #2733 from codewarrior0/tiny-potato-epitaph
Fix Tiny Potato equipment not syncing to clients
2018-09-05 00:03:34 -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
Vasco Lavos a144f4fb29 build 2018-09-01 14:03:14 +01:00
Hubry ff834dc823 Fix the portal not returning the lexicon. (#2726)
I swear I am competent.
2018-09-01 13:40:07 +01:00
Vasco Lavos 9653771d5a Update contributors.properties 2018-09-01 00:43:36 +01:00
Vincent Lee 651b17a9e6 Fix #2724 2018-08-29 14:04:50 -05:00
Vasco Lavos 0df5f64210 Comment out this old system that isn't being used anymore 2018-08-27 22:30:25 +01:00
Vasco Lavos 13e3ab2aae Build 2018-08-27 22:20:34 +01: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
Vasco Lavos 5ee129b6cd Update contributors.properties 2018-08-27 14:16:35 +01:00
Hubry 18ab523c91 Fix #2718 (Crafting/Manufactory Halos crashing with active Thaumatorium) (#2720) 2018-08-27 14:10:41 +01:00
Vasco Lavos 4844c5009b Update contributors.properties 2018-08-27 14:07:02 +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
The_Fireplace 53841ec4d2 Added en_ud.lang (#2561) 2018-08-27 12:11:36 +01:00
Prosta4okua e0e8f9cf89 Update ru_ru.lang[Work in progress] (#2604)
* Update ru_ru.lang[Work in progress]

Can be closed https://github.com/Vazkii/Botania/pull/2539?

* Update ru_ru.lang

* Update ru_ru.lang

* Update ru_ru.lang

* Update ru_ru.lang

* Update ru_ru.lang

* Update ru_ru.lang

25%

* Update ru_ru.lang

* Update ru_ru.lang

* Update ru_ru.lang
2018-08-27 12:09:13 +01:00
Vasco Lavos 6f57b1bb11 Merge pull request #2679 from quat1024/reallyMakesUThink2ElectricBoogaloo
Fix positioning of the thinking hand when you put it on a tiny potato
2018-08-27 12:08:57 +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
Vasco Lavos f3155c74d2 Merge pull request #2716 from Hubry/more-cocoon-animals
Add llamas and parrots to the cocoon's rare animal spawns
2018-08-27 12:06:22 +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
Vincent Lee de905a4bd1 Merge pull request #2708 from matthijsvdmeulen/master
Removed Railcraft support for the Mana Pool with Minecart.
2018-08-21 12:46:05 -05:00
Vincent Lee ae572867af Merge pull request #2707 from Hubry/oredict
Use ore dictionary ingredients in more recipes
2018-08-21 12:45:05 -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 f6c5b10962 Use ore dictionary ingredients in more recipes 2018-08-21 19:09:49 +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