Commit Graph
3275 Commits
Author SHA1 Message Date
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 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 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 af0217153d Fix cell blocks not respecting getEffectivePos 2020-01-22 10:12:49 -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
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
Hubry 0840478c2a Replace PvP-enabled check with "can player damage other player" check
Fixes #3146
2020-01-18 22:08:51 +01:00
Hubry 11ea2ed845 Simple fix for invisible chakrams, fixes #3149 2020-01-18 18:47:04 +01:00
Hubry fe4d3157c3 Switch the initial recipe sync to a login packet
Should fix JEI not loading Botania recipes on server join. This removes
the need to run a resource reload to force JEI to pick them up
2020-01-15 01:05:39 +01:00
Hubry f65afb2aff "do it hubyr" - vazkii, 2020 2020-01-15 00:45:23 +01:00
Hubry 2195d9293a Fix #3142 2020-01-15 00:00:00 +01:00
Hubry 2dd96b87ce Fix orechid ignem JEI not working, reuse basic code for both orechids 2020-01-13 20:08:33 +01:00
Hubry 5d3ff952ea Exclude lexicon recipe from hiding input return recipes
It doesn't show up on MP servers otherwise.
2020-01-13 20:04:34 +01:00
Hubry d5001c79c8 Check direction of packets, don't overwrite recipes with sent ones in SP
Prevents lexicon upgrading after /reload losing other data on stack
2020-01-13 17:04:42 +01:00
Hubry e9166da71e Fix minor GL leak in inventory pylon renders, fixes #2850 2020-01-13 15:57:12 +01:00
Hubry 493d96e2ea Add stonecutting recipes for azulejos, closes #3139 2020-01-13 15:33:28 +01:00
Hubry e51eb07dc3 Use damage hook for mana consumption, let superclass handle axe/shovel
Fixes #3137
2020-01-13 14:55:31 +01:00
Hubry d1137b96d3 Reintroduce api version, because Vaz said so 2020-01-10 21:34:04 +01:00
Hubry cab1ce4737 Use the entity's speed in tangleberrie pushback, fixes #2085 2020-01-10 21:34:04 +01:00
stfwi f8ca7756b9 Added sideness check in SleepingHandler.trySleep(). (#3135)
* Added sideness check in SleepingHandler.trySleep().

* Spaces to tabs correction.
2020-01-10 14:28:10 -06:00
Hubry 3c1bcce64c Replace GoG seed drops with a loot table inject 2020-01-10 00:40:09 +01:00
Hubry 3dba43b122 Allow creative mana tablets and a tipped terra shatterer in JEI 2020-01-10 00:26:38 +01:00
Vincent Lee 2291ef09c8 Fix rannuncarpus including filled positions as candidates, causing it to slow down as spots get filled. Closes #3128 2020-01-08 23:34:57 -06:00
Vincent Lee ebb0aca7f4 Fix plentiful mantle rod particles being blocked by blocks in the way. Closes #3131 2020-01-08 23:23:20 -06:00
ToMe25 47af6e960e Add snow layering and particles to Snowflake Pendant (#3126)
* Add snow layering and particles to Snowflake Pendant

Make the Snowflake Pendant leave a trail of snow layers wherever you go while you aren't sneaking.
Add snowflake particles to the Snowflake Pendant.

* Add information about the snow layering to the...

...Lexica Botania.

* disable snow particles while sneaking
2020-01-08 13:58:37 -06:00
ToMe25 e9c0bfb57e Redo #3087 without the Terra Harvester itself (#3130)
* Basically redo the Add Terra Harvester PR without the Terra Harvester itself

* Fix some stuff the merging somehow messed up
2020-01-08 13:58:23 -06:00
Vincent Lee f43ca6bfd3 Fix skyblock spread command applying to the command executor not the argument 2020-01-06 23:38:04 -06:00
Vincent Lee e79bfb6d9e Fix some edge cases in the previous 2020-01-06 22:47:16 -06:00
Vincent Lee 4c2466aa7d Sync pure daisy active positions normally instead of playing clever tricks. Closes #3125 and other desyncs 2020-01-06 22:27:19 -06:00