Commit Graph
4223 Commits
Author SHA1 Message Date
Vincent Lee 14a78541fa Reformat 2020-05-07 10:33:55 -05:00
Vincent Lee 33ab18bef9 Only wrap shader render layers if shaders are enabled. May fix #3284. Also fix gaia head facing the wrong way in item form. 2020-05-07 10:33:26 -05:00
Vincent Lee f745a18901 Minor lexicon tweaks 2020-05-06 11:43:21 -05:00
Hubry 360553b42c Fix duplicate collision not preventing lens collisions, closes #3282 2020-05-06 15:31:35 +02:00
Vincent Lee 3535020bbc namespace-qualify all category and template references in the lexicon 2020-04-30 11:47:38 -05:00
Vincent Lee 17f993668f Remove all remaining deps on patchouli internals 2020-04-29 16:32:43 -05:00
Partonetrain e503591a8b Fix #3232 and missing recipe in Lexica (#3268)
* pool.json Cobweb recipe

* Fix #3232

This simple fix took me longer to figure out than I'm willing to admit.
2020-04-29 14:54:52 -05:00
Hubry 1ac787807f Fix rune of winter recipe, closes #3270 2020-04-29 17:53:23 +02:00
Vincent Lee 5d26ea4486 Remove more uses of patchouli internals 2020-04-28 17:17:16 -05:00
Hubry b22d4ddf68 Delete accidentally committed temp files
Willie says they are Krita temp files, and they misbehave on my system
2020-04-27 17:28:13 +02:00
Hubry 52c27fcc51 Allow ender air to be picked up from mid-air clicks, closes #3265
If dragon breath is found nearby, the ender air handling is skipped.
2020-04-27 17:14:09 +02:00
Vincent Lee b79be96bf0 Reformat 2020-04-26 12:38:35 -05:00
Vincent Lee 3787c789b1 Refine open/crafty crate canEject check so that it specifically checks if an item can fit where it wants to spawn it, instead of excluding anything that has a hitbox. 'Fixes' #3212 2020-04-26 12:36:46 -05:00
Vincent Lee 3d98e8121f Fix #3254. Due to how the fallback buffer works, holding onto the buffer returned by getBuffer is dangerous, because the current layer could change and the GL state not properly reset. 2020-04-26 12:13:57 -05:00
Vincent Lee bd021962cf Make botania glass blocks match vanilla glass blocks in not allowing fluid drip and not showing flowing texture. Closes #3264 2020-04-26 11:59:54 -05:00
cech12 f170e319f7 apothecary more compatible with other fluid containers (#3257)
* let apothecary be more compatible with other fluid containers
- filling with lava works like filling water
- emptying apothecary with fluid containers also possible now

* fix for filled fluid containers

* second fix for filled fluid containers
- filled containers can now also be filled with fluid inside apothecary
2020-04-23 12:16:29 -05:00
cech12 bf41f5cc38 support mod shears with "forge:shears" tag & add manasteel and elementium shears to loot tables of double flowers (#3258) 2020-04-21 09:18:41 -05:00
Vincent Lee 18c83d6505 Bifrost blocks now color beacons 2020-04-19 19:52:07 -05:00
Vincent Lee 2c72183f77 Reduce some accesses to Patchouli internals 2020-04-19 19:31:23 -05:00
Hubry c564648a52 Fix pink wither AI tweaks not being done on world reload 2020-04-18 22:21:03 +02:00
Hubry 66388ac52d Replace forge nbt ingredient with ours, tweak base laputa shard recipe
The problem with the Forge NBT ingredient is that it strictly matches
the stack tags. If you rename an item, or add other data, it won't work.
This replacement works with any additional tags added onto the item,
and optionally can match stacks without any data at all.
The last part is used mostly as an upgrade option for people who crafted
laputa shards and got one without NBT - new ones will gain the proper
data anyways.

Closes #3234
2020-04-15 22:59:43 +02:00
Hubry 2592415358 Fix creative mode laputa shards going too high in level 2020-04-15 22:52:48 +02:00
Hubry 43c0608063 Shaded mesa rod: fix toss on use, switch toss trigger, prevent punch dmg
Closes #3242
2020-04-15 19:53:14 +02:00
Eutro 945920a233 Fix some tooltips. (#3250)
* Restore Rainbow to Terra Shatterer tooltip.

```AbstractGui.fill``` expects an alpha value, and ```MathHelper.hsvToRGB``` does not take well to hue values above 1.

* Restore Tablet and Band tooltip colours.

* Bring forth the rank text.
2020-04-15 11:16:29 -05:00
Hubry 92a5666abf Fix incorrect corporea spark range in lexicon, closes #3249 2020-04-15 15:06:27 +02:00
Hubry aac32336e4 Save last burst collision position and only collide on the first call
Closes #3121
2020-04-15 15:05:36 +02:00
Hubry 179879bacb Add GoG-specific cocoon entry 2020-04-15 14:54:05 +02:00
Liang 05b337240b Update zh_cn.json (#3245)
* Update zh_cn.json

* readd comment
2020-04-13 22:34:29 -05:00
Vincent Lee 5378f730fe Another small cleanup 2020-04-12 23:04:47 -05:00
Vincent Lee 39fd0ed3b8 Small cleanup 2020-04-12 15:18:34 -05:00
Vincent Lee d356f07bf3 Reformat, write the changelog 2020-04-05 17:29:36 -05:00
Vincent Lee d87c8d4eb6 Bump patchouli again 2020-04-05 17:22:09 -05:00
Vincent Lee f91deeca58 update mods.toml versions 2020-04-05 15:55:41 -05:00
Vincent Lee 637857a84e Fix some more broken recipes 2020-04-05 15:29:28 -05:00
Vincent Lee 236d99ae60 Bump patchouli and fix a bug 2020-04-05 15:12:32 -05:00
Vincent Lee d47348209a interface-ify recipe classes 2020-04-05 14:05:09 -05:00
Hubry 44079ea64d Properly turn black to alpha in banner/shield textures 2020-04-05 19:51:42 +02:00
Vincent Lee 3ddde7141f Revert banner/shield textures 2020-04-05 12:21:53 -05:00
Vincent Lee a9dace4706 Warn on all missing recipes in patchouli components 2020-04-05 12:03:00 -05:00
Vincent Lee 72bcd9f42b Delete registerRecipeEvent 2020-04-05 11:59:33 -05:00
Vincent Lee f9e960a907 Make head recipe stateless, and use inventory-sensitive output method for all rune altar/apothecary recipes 2020-04-05 11:59:33 -05:00
Hubry dc8b74f657 Add recipe id tooltip to JEI recipes 2020-04-05 18:43:09 +02:00
Hubry 7f8429462a Fix lexicon brewing and elven trade recipes 2020-04-05 17:47:44 +02:00
Vincent Lee 101fbb2a1c Fix a field->getter i missed last commit 2020-04-05 00:53:13 -05:00
Vincent Lee 38cb6bf279 Reformat 2020-04-05 00:33:14 -05:00
Vincent Lee 2eb14c45eb Merge 1.14, and clean up some unused AT entries. 2020-04-05 00:32:21 -05:00
Vincent Lee 37f60f05a5 Fix #3225 hopefully. My workspace is broken so I can't test 2020-04-04 18:46:09 -05:00
Vincent Lee 43337b723d recieve 2020-04-04 12:52:35 -05:00
Vincent Lee 0f2c8d61b6 Fix #3228 (finally) 2020-04-04 12:48:52 -05:00
Vincent Lee f8d7a2ad11 Fix mutated island being yeeted 2020-04-04 12:18:52 -05:00