Vincent Lee
ffbdb87749
Merge pull request #2857 from zabi94/master
...
Use available baubles API methods when checking for rings instead of custom made ones
2019-02-19 18:58:31 -06:00
Vasco Lavos
5e7a55ed58
build
2019-02-19 20:24:38 +00:00
ZaBi94
5b0521382c
Get worn ring with method provided by baubles API
...
Allows compatibility with Bring Me The Rings
2019-02-19 20:16:36 +01:00
Vincent Lee
605134a9c0
Merge pull request #2847 from quat1024/fixvineballs
...
Fix vine balls placing budded/invalid vines. Closes #2819
2019-02-13 13:36:22 -06:00
Vincent Lee
e51e437c88
Merge pull request #2849 from quat1024/petalblock
...
Fix crafting petal blocks out of mushrooms
2019-02-13 13:36:15 -06:00
Vincent Lee
8e3817b8c4
Merge pull request #2848 from quat1024/specialpumpkins
...
Some stuff involving special grasses
2019-02-12 21:48:26 -06:00
Vincent Lee
6cdde7a825
Merge pull request #2851 from Hubry/static-flowers
...
Fix static model floating flowers crashing on moving with Quark's pistons, fix pasture seed effects not showing immediately
2019-02-12 21:47:49 -06:00
Hubry
2986240b74
Fix static model flowers not showing pasture seed effects on apply
2019-02-12 20:13:28 +01:00
Hubry
9df180a6a1
Fix crash on moving static model floating flowers with Quark TE pistons
2019-02-12 20:12:27 +01:00
quat
f33a5675ad
Fix crafting petal blocks out of mushrooms
2019-02-12 02:16:08 -05:00
quat
666ed3f6ac
You can now use your mother on special grasses
2019-02-12 01:57:30 -05:00
quat
c5a874d4ea
Pumpkins and melons can grow on special grass
2019-02-12 01:34:29 -05:00
Vincent Lee
d357279ca4
Merge pull request #2845 from quat1024/nbt_fix_uwu
...
Change how NBT matching works, now it's faster and works better with nested tags
2019-02-12 00:12:37 -06:00
quat
b40a99bd9c
Fix vine balls placing budded/invalid vines. Closes #2819
2019-02-12 01:12:25 -05:00
Vincent Lee
2bd6c4be00
Merge pull request #2846 from quat1024/flipperhock
...
Flip hopperhock inventory sidedness
2019-02-12 00:11:44 -06:00
quat
16a02f59f8
Flip hopperhocks
2019-02-12 00:53:47 -05:00
quat
cd558910d9
Change how NBT matching works, now it's faster and works better with nested tags
2019-02-12 00:30:02 -05:00
Vincent Lee
f84e09eda3
Fix cloaks blocking admin-damage like /kill
2019-02-05 23:44:01 -06:00
Vincent Lee
1feadf2835
Fix #2841
2019-02-04 14:16:48 -06:00
Vasco Lavos
164fe6b45e
buildy
2019-02-04 17:57:12 +00:00
Vasco Lavos
3ffd9aed49
Update ItemItemFinder.java
2019-02-03 13:59:43 +00:00
Vasco Lavos
47ce2fd12b
Update contributors.properties
2019-02-03 12:45:51 +00:00
Vincent Lee
cae9a83ddf
Fall through when enchanter creation fails. Closes #2840
2019-02-02 16:26:56 -06:00
Vincent Lee
464fe133c7
Fix redstring spoofer not affecting vinculotus, closes #2835
2019-02-02 01:25:39 -06:00
Vincent Lee
7577ac8511
Fix #2836
2019-02-01 16:43:16 -06:00
Vincent Lee
d0f017f7c6
Merge pull request #2839 from Hubry/jei-tweaks
...
Clean up JEI plugin warnings, formatting, add wrappers for a few recipe types
2019-02-01 16:32:32 -06:00
Vincent Lee
25cfc07349
Fix mana prism automation changes not causing spreaders to recalculate, closes #2837
2019-02-01 16:28:15 -06:00
Hubry
f41de4afe4
Clean up JEI plugin warnings, add wrappers for a few recipe types
2019-02-01 22:42:57 +01:00
Hubry
cff5edcd21
Make magnet ring respect pickup delays and tweak blacklist ( #2799 )
...
* Items with pickup delay >40 ticks will be ignored
* Ignore AE2 seeds with their changed name
* Make the blacklist actually usable and not crash when added to with IMC
2019-02-01 16:44:00 +00:00
Vasco Lavos
b9e169fff1
Update contributors.properties
2019-01-29 11:58:51 +00:00
Vasco Lavos
047e572ed1
Update contributors.properties
2019-01-21 13:43:25 +00:00
Vincent Lee
922dd075d2
Merge pull request #2797 from Hubry/rotating-items-fix
...
Fix Lexica rotating item config not swapping usable items in recipes
2019-01-18 11:31:48 -06:00
Vincent Lee
2785622dfa
Merge pull request #2800 from Hubry/red-string-container
...
Give the red string container a dummy item handler when not bound
2019-01-18 11:24:26 -06:00
Vincent Lee
3e4b6a818c
Fix #2827
2019-01-16 12:00:29 -06:00
Vincent Lee
c019ba3864
Merge pull request #2826 from tcheinen/master
...
fix #2825 (manasteel and elementium shears drop apples and saplings)
2019-01-15 22:25:56 -06:00
Teddy Heinen
c1f6c1c5be
fix #2825 (manasteel and elementium shears drop apples and saplings)
2019-01-15 20:36:38 -06:00
Vasco Lavos
cc4b05f31f
Update contributors.properties
2019-01-15 22:53:23 +00:00
Vasco Lavos
024ea95c8c
Update contributors.properties
2019-01-14 21:04:29 +00:00
Vasco Lavos
7cdb5b747a
Update contributors.properties
2019-01-10 01:14:14 +00:00
Vasco Lavos
7b5daf0b64
Update contributors.properties
2019-01-09 00:01:21 +00:00
Vasco Lavos
0c0700f3e8
Update contributors.properties
2019-01-08 21:52:42 +00:00
Vincent Lee
01d1e9df4b
Fix #2822
2019-01-07 16:54:46 -06:00
Vincent Lee
f7eb9422e6
Make Diva Charm/Heisei Dream less janky, and fix diva charm particles not being visible. Closes #2820
2019-01-07 16:39:48 -06:00
Vasco Lavos
32b5658c25
Update contributors.properties
2019-01-05 20:58:30 +00:00
Vincent Lee
81970e1833
Merge pull request #2816 from trunksbomb/master
...
Update en_us.lang
2019-01-05 00:47:43 -06:00
trunksbomb
899c39c523
Remove accidental line duplication
...
Signed-off-by: trunksbomb <[email protected] >
2019-01-03 20:12:39 -05:00
Vincent Lee
27ec538ea1
Merge pull request #2818 from Hubry/gradle
...
Cleanup buildscript, add api jar, update gradle
2019-01-03 11:38:33 -06:00
Hubry
d4c6b6629c
Simplify buildscript, add api jar, update gradle
...
Gradle updated to 4.9.
Replaced the weird gradle stuff with a thing taken from Patchouli
Removed the forgecraft task with that, it wasn't used anymore anyways
Added an api jar containing api classes + source
Replacing deprecated << uses with doLast, minor styling tweaks
2019-01-03 16:29:47 +01:00
trunksbomb
174afe0c6d
Fixed some typos in en_us.lang, left "flavor text" alone for the most part
...
Signed-off-by: trunksbomb <[email protected] >
2019-01-01 22:55:58 -05:00
Vasco Lavos
5b5108c43c
Update contributors.properties
2019-01-02 03:48:20 +00:00