Commit Graph
3345 Commits
Author SHA1 Message Date
Vincent Lee 85a7c986cf Restore lexicon first person render, mostly 2020-02-14 22:48:53 -06:00
Vincent Lee 05fe2c195c Bump patchouli and forge, fix floating flower in world render 2020-02-14 20:56:28 -06:00
Vincent Lee 9c23ff9257 Use forge's getHighlightTip for wand instead of rendering mode line ourselves 2020-02-14 20:24:02 -06:00
Vincent Lee 31de0d6dd1 Merge branch 'master' of github.com:Vazkii/Botania into 1.15 2020-01-31 13:14:42 -06:00
Vincent Lee ca8f61b8b1 Get rid of all 1.7-era 'parN' style parameter names 2020-01-31 13:08:16 -06:00
Vincent Lee ef79dc7507 Remove useless passing of 1|2 to setblockstate 2020-01-31 12:59:33 -06:00
Vincent Lee d68f34fcfe Fix red string blocks being placed backwards 2020-01-31 12:49:55 -06:00
Vincent Lee 4ea449d723 Revert vinculotus map back into a set, hack no longer needed thanks to getEffectivePos 2020-01-31 12:48:27 -06:00
Vincent Lee 144f023041 Clean up some reflection 2020-01-31 12:30:26 -06:00
Vincent Lee ea4ecf92af Remove blurmipmap hack 2020-01-31 12:08:04 -06:00
Vincent Lee 9d7e8b5c2f Update to 1.15.2 2020-01-31 12:06:11 -06:00
Hubry 4f5adbe992 Fix dispensers checking valid cocoa directions on own pos, closes #3159 2020-01-30 19:50:05 +01:00
Hubry 12e67ab394 Replace 256 wand of the forest recipe jsons with one custom recipe type
Prevents flooding JEI with tons of irrelevant recipes, and recipe book
buttons going offscreen if you look at all the variants of the wand.
Side effect is not showing the colored wands in JEI/Patchouli, but
that's fine.
2020-01-30 19:02:41 +01:00
Hubry 7cbe19271c Fix terra blade bursts ignoring players you can damage
I had this one check wrong
2020-01-30 19:02:40 +01:00
ToMe25 41d3c62eb9 Add a Recipe for Sweet Berries (#3160)
* Add a Recipe for Sweet Berries

* Add back the unused import

to prevent merging issues.
also how did this lang change sneak in here?

* rename translation to manaAlchemy28

as its no longer used by #3157

* Merge branch 'master' into ToMe25-patch-16

* Revert "Merge branch 'master' into ToMe25-patch-16" (#5)

This reverts commit 5d9c68d4bbf30261ef2f0f708e0dd21b273f912b.
2020-01-30 10:11:43 -06:00
Vincent Lee d66058f661 Merge 1.14 2020-01-29 13:36:27 -06:00
Vincent Lee faeaf7285b Return of the meme 2020-01-27 22:50:26 -06:00
ToMe25 622bbeb9fe Allow the Terrestrial Agglomeration Plane to use Shimmerrock (#3158)
* Allow the Terrestrial Agglomeration Plane to use Shimmerrock

* how did this get here?

* why didn't this get uploaded?

* change Terrestrial Agglomeration Plane livingrock tag to terra_plate_base

* Remove unneeded item tag
2020-01-27 11:36:21 -06:00
ToMe25 ea30c6aa4a Add a recipe for the Haert of the Sea (#3157)
* Add a recipe for the Haert of the Sea

Add the infused nautilus shell as a crafting item for the heart of the sea

* change the recipe for the Heart of the See to use

a Mana Pearl instead of one of the Manasteel ingots

* Remove the Infused Nautilus Shell and added an Alchemy Recipe for the Heart of the Sea.

* Change the mana cost for the heart of the sea to 20k

as blazepowder to mana suggested

* Make heart of the sea recipe gog only

* fix the lexicon entries getting in the wrong directory
2020-01-27 11:36:00 -06:00
Vincent Lee 6a46558652 Eliminate uses of java.awt.Color since using awt with lwjgl3 is apparently bad now 2020-01-23 22:32:42 -06:00
Vincent Lee 289dd6f9a8 Same for damage lens 2020-01-23 10:28:45 -06:00
Vincent Lee 947b591c9c Player-fired entropic bursts now count as player kills 2020-01-23 10:14:51 -06:00
Vincent Lee ea0201ec0e Remove botania's lang entries for vanilla colors as vanilla has them now 2020-01-23 10:04:37 -06:00
Vincent Lee 0d094a8bf6 Delay burst instantiation until we're sure we have enough mana. Closes #3133 2020-01-22 19:14:33 -06:00
Vincent Lee 830b87db40 Save and restore full state when mossifying an altar, fixes #3154 2020-01-22 19:11:50 -06:00
Vincent Lee f0718de536 Make dedicated mana blaster advancement trigger and desu option. Consistentifies desu gun advancement criteria with the desu gun appearance. Closes #3156 2020-01-22 18:57:54 -06:00
Vincent Lee a12056fbf4 Remove custom getLightValue from subtiles, should be implemented on a per-block basis now the usual vanilla way. May resolve lighting issues? (#3140) 2020-01-22 18:18:31 -06:00
Vincent Lee 42ee5d0d8d Merge 1.14 2020-01-22 17:05:28 -06:00
Vincent Lee af0217153d Fix cell blocks not respecting getEffectivePos 2020-01-22 10:12:49 -06:00
Vincent Lee a6ad70f0bc Fix red string renderer freaking because alpha is less than 0 2020-01-21 21:48:14 -06:00
Vincent Lee 1954b69e16 Fix tiny potato aux renders 2020-01-21 21:38:48 -06:00
Vincent Lee 549adb3d42 Fix gold renders 2020-01-21 11:45:25 -06:00
Vincent Lee de450cb633 Fix astrolabe shader usage and preview being offset in Z direction 2020-01-21 10:42:15 -06:00
Vincent Lee e78a1f21f3 update accessoryhelper to use matrixstack 2020-01-21 10:21:43 -06:00
Vincent Lee edf40208bf Some spring cleaning 2020-01-19 18:10:48 -06:00
Al Winfy 0fd1b5fb9c Remove Tiara's dependence on fallDistance (#3143)
Effectively allows it to work with skyrod
2020-01-19 17:16:20 -06:00
ToMe25 463eafb860 Make Ring of Dexterous Motion able to be used in.. (#3104)
..all four directions and while moving
2020-01-19 17:11:36 -06:00
Vincent Lee b94a6a6101 Extra ore weight patch 2020-01-19 16:42:10 -06:00
ToMe25 ddcb1036b3 Add some Orechid compatibility back (#3113)
* Add some Orechid compatibility back

There are some of the old OreDicts left as i didn't knew how to update them, but they can remain commented out for now.

* Delete IMCSender.java

Another upload that didn't understand it should go in the opened directory, maybe i should stop using the web interface...

* Add some Orechid compatibility back

There are some of the old OreDicts left as i didn't knew how to update them, but they can remain commented out for now.

* Remove all the ores that aren't even 1.12.2

* Update some ore weights

* Update some more Ore Weights

* Fix some small things
2020-01-19 16:32:22 -06:00
Vincent Lee bbc3892761 Orechid now filters out empty tags before trying to pick one. Fixes situations where many registered tags being empty would 'starve' out the nonempty ones 2020-01-19 16:30:44 -06:00
Vincent Lee 0e73e16e10 Fix vine and mushroom rendering 2020-01-19 16:21:42 -06:00
Vincent Lee 2577de5b60 Fix sparks not rendering and solid vines not being flammable (patches from MoriyaShiine) 2020-01-19 16:04:51 -06:00
Vincent Lee 0836cee840 Fix enchanter and terra plate renders 2020-01-19 12:06:56 -06:00
Hubry b9c1ae85bf Fix shaded mesa not launching entities, closes #3106
Also stops the expiry countdown from incrementing past -1
2020-01-19 19:02:11 +01:00
Hubry f7da8b4109 Don't draw tiara/dodge hud if hud is hidden by creative
Didn't check creative when changing this earlier
2020-01-19 18:09:34 +01:00
Hubry 09f4864738 Replace the duplicated livingrock recipe with the somehow removed cobble 2020-01-19 17:34:31 +01:00
Hubry 81391688ae Move tiara/dodge renders, use forge's gui offsetting for flight bar
Fixes #3118
2020-01-19 17:33:04 +01:00
Hubry 8fa3d9c790 Fix config typo that went unnoticed for over 5 years :wacko: 2020-01-19 00:40:20 +01:00
Hubry d5b91eefb4 Attempt at fixing #3108
Stopping sprint doesn't do much if you are holding ctrl anyways
Closes #3108
2020-01-19 00:39:22 +01:00
Hubry 3090006d5e Move fish to spawn if the cocoon is next to water, add other water mobs 2020-01-18 23:32:59 +01:00