Vincent Lee
a84397a9fe
Fix some deprecation warnings
2018-11-25 23:19:36 -06:00
Vincent Lee
e9ba8392d0
Fix #2784
2018-11-25 23:02:33 -06:00
Vasco Lavos
ab93acfc34
Update contributors.properties
2018-11-21 20:17:58 +00:00
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
Vincent Lee
0aff10acfe
Merge pull request #2782 from Hubry/cnb-imc
...
Fix Botania glass blocks being unchiselable with Chisels and Bits
2018-11-19 20:56:27 -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
Vasco Lavos
83bbf64acb
buildy
2018-10-24 00:58:41 +01:00
Vincent Lee
642e300aa1
Merge pull request #2766 from Hubry/manifest-fix
...
Attempt to fix ATs in jar manifest, and add sources jar
2018-10-15 12:13:07 -05:00
Hubry
7d8ddb4d6f
Try to fix #2536 and add sources jar
2018-10-15 16:15:18 +02: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
Vincent Lee
c402bd01b6
Merge pull request #2755 from Hubry/jei-corporea-recipe
...
Add JEI recipe gui support for the corporea request key
2018-10-08 23:46:02 -05:00
Vincent Lee
476bed4555
Merge pull request #2758 from Zhiyu-Yang/master
...
Update zh_cn.lang
2018-10-07 22:24:35 -05:00
Zhiyu Yang
07f3f7cef5
Update zh_cn.lang
2018-10-08 00:22:43 +08: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
Vincent Lee
5442b97f18
Merge pull request #2751 from SaurabhTotey/master
...
Added null-check to PlatformModel for #2684
2018-10-01 18:12:48 -05: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
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