Commit Graph
5869 Commits
Author SHA1 Message Date
David Vierra fdc957c87f When matching recipe tags, also match the first items of nested lists (#2881)
Mostly useful when adding CraftTweaker recipes which have Forestry bees
as inputs, since the bee's chromosomes are in a list and the recipe
only needs to match some of the chromosomes.
2019-04-11 20:38:49 -05:00
Vasco Lavos 4f6f712c67 build 2019-04-11 21:55:29 +01:00
John Hossler 62545d6b1e Update en_us.lang (#2876) 2019-04-07 12:08:52 -05:00
iPopstop 57fb8a7019 Update ru_ru.lang (#2793)
* Minor edits

[Important]: Format error(botania.armorset.*.desc) - fixed
botania.armorset.will*.desc - updated
botania.armorset.will*.shortDesc - updated
botaniamisc.requestMsg - updated
Added:
botania.nei.orechid, botania.nei.orechidIgnem

* New information

Updated(Minor edits):
# -- MANAWEAVE CLOTH
# -- ROD OF THE SHIFTING CRUST
# -- SLIME IN A BOTTLE
# -- FLORAL OBEDIENCE STICK
botania.entry.livingwoodBow
Added:
# -- HAND OF ENDER
# -- SOULSCRIBE
# -- LIFE IMBUER
# -- FLUGEL TIARA
# -- LIFE AGGREGATOR
# - BAUBLES
# -- AN INTRODUCTION TO BAUBLES
# -- TINY PLANET
# -- BAND OF MANA
# -- BAND OF AURA
# -- SOUJOURNER'S SASH
# -- TECTONIC GIRDLE
# -- SNOWFLAKE PENDANT
# -- PYROCLAST PENDANT
# -- RING OF CHORDATA
# -- RING OF THE MANTLE
# -- RING OF MAGNETIZATION
# -- RING OF FAR REACH
# -- CHARM OF THE DIVA
# -- GREAT FAIRY RING
# -- GLOBETROTTER'S SASH
# -- THE SPECTATOR
# -- CRIMSON PENDANT
# - ALFHOMANCY
# -- THE PORTAL TO ALFHEIM
# -- A MESSAGE FROM ELVEN GARDE
# -- THE RESOURCES OF ALFHEIM
# -- DECORATIVE BLOCKS
# -- DISPENSER TWEAKS
# -- GLIMMERING FLOWERS
# -- NATURAL SHEDDING
# -- AZULEJO
# -- STARFIELD CREATOR

* Settings + Ritual of Gaia

And 
# -- HEAD CREATION
# -- UNSTABLE CUBE

* Minor edit

Added:
# -- MANASEER MONOCLE
# -- BAUBLE CASE
# -- INVISIBILITY CLOAK
# -- CIRRUS AMULET
# -- NIMBUS AMULET
# -- THIRD EYE
# -- PLANESTRIDER'S SASH
# -- BENEVOLENT GODDESS' CHARM
# -- RING OF CORRECTION
# -- TRODDEN DIRT
# -- SHIMMERING MUSHROOMS
# -- PHANTOM INK
# -- STONE ALCHEMY
# -- BLAZE LIGHT
# -- PORTUGUESE PAVEMENT

* Update

* Minor fixes

Very minor fixes

* Minor update
2019-04-07 12:07:05 -05:00
Vincent Lee 2a27264b22 uhhhhhhh oops 2019-04-01 17:08:04 -05:00
Vincent Lee 49d52b4a85 Fix #2875 2019-03-27 20:16:58 -05:00
Vincent Lee 1701732aac Fix improper usage of zero-sized stacks. Closes #2878 2019-03-27 20:13:44 -05:00
Vasco Lavos 13598c3c0a Update contributors.properties 2019-03-25 17:17:53 +00:00
Vasco Lavos b570204471 Update contributors.properties 2019-03-19 20:31:15 +00:00
Vasco Lavos e27d994458 Update contributors.properties 2019-03-09 12:56:53 +00:00
Vasco Lavos 7751661252 Update contributors.properties 2019-03-09 12:13:01 +00:00
Vincent Lee 88bc2b736a Fix #2620 by syncing item ages to client 2019-03-07 22:26:14 -06:00
Vincent Lee f79c7ac302 Fix #2862 and clean up the code a bit too 2019-03-07 21:54:26 -06:00
Vasco Lavos fac41a7817 Update contributors.properties 2019-03-06 22:04:22 +00:00
Vasco Lavos 38e681c667 Update contributors.properties 2019-03-05 07:14:14 +00:00
Vasco Lavos 55722f14bd Update contributors.properties 2019-03-03 08:06:38 +00:00
Vasco Lavos 9fde29e047 Update contributors.properties 2019-02-28 20:27:05 +00:00
Vincent Lee 11c98a7ab2 Fix gaia guardians riding vehicles, a regression since 1.9. Yay. Recloses #1476 2019-02-24 19:54:39 -06:00
Hubry 010bdfcb4a Add corporea crystal cube locking (#2855)
* Add corporea crystal cube locking, modeled after hovering hourglass

* Disable rendering of some things when the lexicon is held

It looked quite bad when the lexicon info rendered behind the
block's display

* Sync the hourglass when wand of the forest is dispensed
2019-02-22 00:51:00 -06:00
quaternary a559131772 Gaia fixes and anticheese stuff (#2853)
* No sleeping through the fight!

* Far stricter arena check

* Some cleanups

* Change the way GG teleportation works + happier to break blocks

* Simplify teleportation logic.
  * Basically just picks a point somewhere in the arena and goes there.
  * Doesn't take collision boxes etc into consideration.
  * This fixes the "double carpet" exploit.
* GG is now super happy to break blocks.
  * Will break blocks in the path of a teleport.
  * Will break blocks around it every tick.
  * A new API method is added to add immune blocks (such as the pylons).

* Fix #2824 by always spawning traps at the arena height

* Fix regression where the gg considered players in spec mode

* Fix landmines better

* Fix block break position lol
2019-02-22 00:48:03 -06:00
Vincent Lee e7b5cfd02e Merge pull request #2859 from Hubry/intercepted-count
Fix corporea interceptor causing wrong count on index requests
2019-02-22 00:37:56 -06:00
Hubry c1841ff5dd Fix corporea interceptor causing wrong count on index requests
If the interceptor triggered a funnel making a request on the same
network it would've overwritten the request counts with last funnel's
2019-02-21 12:59:03 +01:00
Vincent Lee 404f18604b Fix placeholders being overwritten by crafty crate. Closes #2858 2019-02-20 23:15:15 -06:00
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