Commit Graph
4242 Commits
Author SHA1 Message Date
Al Winfy cbc36366de Fix all (non-deprecation) compiler warnings (#3321)
* Fix all (non-deprecation) compiler warnings

* satisfy spotless

* use a method ref over a lambda
2020-06-07 21:48:55 -05:00
Vincent Lee a01f3fed15 bat 2020-06-05 21:09:24 -05:00
youyihj 3c2a001b18 Fix several translate mistake (#3317) 2020-05-30 23:08:36 -05:00
Vincent Lee 5406c99d1a new quark feature 2020-05-28 17:30:32 -05:00
Determancer 24715c509e Update zh_cn.json (#3310)
tweaks
2020-05-23 11:43:02 -05:00
Vincent Lee 09bb48a663 Move special flowers out of vanilla #small_flowers to #flowers. Fixes #3285 endermen picking them up 2020-05-21 16:52:26 -05:00
Vincent Lee 4e839b96a7 Add tall mystical flowers to vanilla tag, fixes #3295. Regenerate data. 2020-05-21 16:21:53 -05:00
Zinkorrum bd0dfdda33 Fix mistakes in ru_ru lang file (#3293)
* Fix mistake in lang RU

Fix spelling mistake for cocoa beans in russian translation

* Fix typo in ru_ru

Fix spelling mistake for translation of Drum of the wild
2020-05-21 16:01:40 -05:00
Eutro 6a7da67f96 Add waterlogging support for Botania blocks. (#3243)
* Waterlog all the things.

* Header

* Linting and friends.

* Remove waterlogging for Manatide Bellows and Petal Apothecaries

* Blank line.
2020-05-21 16:01:18 -05:00
Determancer aa5a74c746 Update zh_cn.json (#3297)
fixed inconsistent error
2020-05-18 08:04:14 -05:00
Hubry a0aa8a2796 Remove justified lexicon config, closes #3290 2020-05-16 00:04:46 +02:00
Hubry 905591345b Missing license header, whoops 2020-05-16 00:02:43 +02:00
Hubry baee6d2a6f Use a set of blocks for pure daisy recipe sync, closes #3289
This adds a new type of pure daisy input which matches against a set of
blocks. Clients receive the full set of blocks instead of a tag name.
Bumped the network version to account for this change.
2020-05-15 22:45:48 +02:00
Eutro ff360c48aa Make Magnet Lens code better but actually worse if you're a masochist. (#3241)
* Make Magnet Lens code better but actually worse if you're a masochist.

This should preserve the peculiarities of the previous logic, while fixing the unreported bug where bursts not fired from Mana Spreaders would not magnetize block around the origin.

* It's 2020 and I still can't spell "receive".

* Wow okay my bad we like fancy curly braces here.

* Fix format violations.

* Magnet lens demagnetizes if the magnetized position is invalid.

* Re-magnetize properly, fix possible edge case
2020-05-11 09:30:44 -05:00
Hubry 8ebfd99157 Update mappings to 20200510 2020-05-10 21:39:43 +02:00
Hubry e3be3c6138 Fix headflowers not rendering for players in teams with name prefixes 2020-05-10 00:26:02 +02:00
Vincent Lee 7e48abfb21 Explain slot check 2020-05-07 11:31:26 -05:00
Vincent Lee c14d3b5a09 Stopgap for #3281 2020-05-07 11:29:22 -05:00
Vincent Lee 2746419151 Fix the crash in #3251, but not the underlying bug, which is more involved 2020-05-07 10:57:22 -05:00
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