Commit Graph
6516 Commits
Author SHA1 Message Date
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
Vasco Lavos f067c5a2b2 Update contributors.properties 2020-01-14 16:21:08 +00:00
Vasco Lavos 7734609b9a Update contributors.properties 2020-01-14 01:30:13 +00: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
Vasco Lavos a4d2b151bd Update contributors.properties 2020-01-12 17:17:41 +00:00
ToMe25 d014ed627e Change some Recipes to use Tags (#3081)
Change the Terrasteel armor recipes to use the Terrasteel ingot tag instead of the item,
and change some recipes to use the Block tags from #3079
2020-01-11 18:51:24 -06:00
ToMe25 51eb16653f Add some block tags for compatibility (#3079)
* Add some block tags for compatibility

Add Terrasteel, Manasteel and Elementium Blocks to their own storage_blocks tag and the quartz variant blocks to forge:storageblocks/quartz.

* Fix using ingot tags for block tag

oops...

* Fix block tag using elven_quartz instead of elf_quartz

it may not look like it but i did test this before uploading xD
2020-01-11 18:51:05 -06: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
Hubry 06effc1c44 Bump Patchouli version for scaling fix 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
Vasco Lavos 601e27c618 Update contributors.properties 2020-01-10 20:06:26 +00: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
Hubry 0d333e3a13 Add GoG-specific Orechid lexicon entry, unlocked after the Pure Daisy 2020-01-09 22:58:51 +01:00
Vasco Lavos 18558491c6 Update contributors.properties 2020-01-09 20:44:35 +00: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 4bdace7066 build again 2020-01-06 23:41:33 -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 85526c5b01 build 2020-01-06 22:57:44 -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
Al Winfy 02367bfa08 Improve lexicon.php to handle internal links (#3110) 2020-01-06 21:58:26 -06:00
ToMe25 72a985c8c9 Add Livingwood and Dreamwood Fences and Fencegates (#3105)
* Replace Livingwood and Dreamwood Walls with Fences and Fencegates

* Redo one change that didn't get saved

idk why it didn't get saved.

* oops

Fix an copy-paste error, luckily that was the only stuff i copy-pasted :)

* Delete en_us.json

WTF how could this file get here?

* Reupload en_us.json that somehow got into the...

... base dir of the repo.

* Add Livingwood and Dreamwood walls back.
2020-01-06 13:09:31 -06:00
ToMe25 4e91268474 Fix Cacophoniem working as Shield and Snowflake Pendant working while sneaking (#3102) 2020-01-06 12:27:21 -06:00
Hubry 1535ccbba4 Workaround for mana infusion going slow, closes #3120 2020-01-06 16:26:31 +01:00
Hubry 463331cbcf Fire hoe events if shovel has no effect, look up results in their maps
Fixes #3116
2020-01-06 16:19:48 +01:00
Vincent Lee ca495d6d5c Fix brews not returning the container after finishing them, fix vials looking like flasks when partially full 2020-01-05 19:31:17 -06:00
Al Winfy 04881bccac Add a whole honking bunch of crosslinks (#3119) 2020-01-05 13:19:42 -06:00
Vincent Lee db02e4939e Make some new mobs available through the cocoon 2020-01-04 12:53:50 -06:00
Vincent Lee a5a6530b63 Implement grouping for mana infusion recipes, use it for patchouli. Clean up alchemy recipes and update some cycles to include new 1.14 stuff 2020-01-04 12:30:22 -06:00
Vincent Lee 42d66aae21 Allow any two vanilla dyes to be used to make fertilizer, to prevent a bad gog biome spawn from obstructing progress 2020-01-04 00:20:44 -06:00
Vincent Lee 08e67e605b Fix laputa shard recipes. Closes #3107 2020-01-03 22:09:49 -06:00
Vincent Lee f3ecda8bb3 Switch skyblock chunk generator to a dummied-out overworld one. This means biomes are now intact, allowing location-based mob farms. Old GoG chunks will remain as plains biomes 2020-01-03 18:37:19 -06:00
ToMe25 37b0042cdd Fix Axes being too sharp and Shovels too slow (#3103)
* Fix Axes being too sharp and Shovels to slow

Fix Axes dealing 2 more damage than they should.
Fix Shovels being slower than they should.

* Delete ItemManasteelAxe from wrong location

* Delete ItemManasteelShovel from wrong location

* reupload Manasteel Tool classes to right location
2020-01-03 15:06:18 -06:00
Vincent Lee f6ca00b770 Fix website lexicon colors (interlinks still bork) 2020-01-03 15:03:31 -06:00
Vincent Lee bc1e1e04fe Interlinks for challenges 2020-01-03 14:57:50 -06:00
Vincent Lee 9514710ffd Replace hard-colors in lang files with patchouli-recommended $(item) and $(thing) 2020-01-03 14:16:37 -06:00
Vincent Lee 2778e6e2fe Add some interlinks in basics section. Eventually I'll get to all the other ones 2020-01-03 12:59:29 -06:00