Commit Graph
803 Commits
Author SHA1 Message Date
Lizbeth Rika 6283aea2b9 Recipe/docs for Incense. 2015-05-15 18:48:48 +01:00
Lizbeth Rika 4582ef720d Get the Incense Plate working and doing stuff. 2015-05-15 18:11:57 +01:00
Lizbeth Rika fb044a5777 Baubles no longer call onEquipped when equipped through right click, the functionality is instead delegated to onEquippedOrLoadedIntoWorld. Fixes the Ring of Odin/Ring of the Aesir allowing for infinite health. Closes #971 2015-05-15 16:03:51 +01:00
Lizbeth Rika 2c41e88628 Added Incense Sticks. Now to make them do stuffs... 2015-05-15 15:54:11 +01:00
Dylan4ever cb160985b9 This is really intense... Incense... Sorry if I'm talking y'all in-senseless with all these bad puns. 2015-05-15 15:58:33 +02:00
Dylan4ever b670efa4dc This thing sucks... mana. Approve or I'll go back to the copy-pasting... I mean drawing table. 2015-05-15 15:47:20 +02:00
Dylan4ever e8260e130c The Axe Effect 2015-05-15 15:40:09 +02:00
Lizbeth Rika 41c3ad33ad The Red Stringed Relay can now connect to double tall flowers. 2015-05-15 14:23:26 +01:00
Lizbeth Rika 30bc2e8fd4 Added a bunch of null checks to the NEI integration to try to fix the weird crash that's been going around. Closes #961, for now, I guess. 2015-05-15 14:10:09 +01:00
Lizbeth Rika cf30dae374 Merge branch 'master' of https://github.com/Vazkii/Botania 2015-05-15 14:01:49 +01:00
Lizbeth Rika 4ba87831db Fixed Excaliber only homing on players when it should home on anything but players. Also made it only home on mobs. Closes #958 2015-05-15 13:17:57 +01:00
Lizbeth Rika 63a95063e8 Merge pull request #972 from MrKunji/patch-14
Update pt_BR.lang
2015-05-15 13:15:51 +01:00
Lizbeth Rika f92eb3df3b Right clicking a Petal Apothecary or Runic Altar with an empty hand after a recipe is completed places the components of that recipe from your inventory into the block again for another crafting. 2015-05-15 13:14:47 +01:00
Patric Alexandre ce72caf833 Update pt_BR.lang
'Next week: Lexica pages about Generating and Functional Flowers, stay tuned!'
2015-05-15 09:07:10 -03:00
Lizbeth Rika 62107c26ec git gud diyo 2015-05-15 11:43:26 +01:00
Dylan4ever a02d2b4f18 Update en_US.lang
Another little thingy I found.
2015-05-15 11:28:11 +02:00
mDiyo d409e7cee4 Armor respects unblockable damage types
This fixes #966
2015-05-14 12:01:07 -08:00
Dylan4ever 706262eff8 Update en_US.lang
Something minor I noticed, I literally had to change one letter.
2015-05-13 19:00:31 +02:00
프요 6d74aadcd5 Update ko_KR.lang 2015-05-13 20:42:19 +09:00
Lizbeth Rika 3491c7d003 Beams from Excaliber no longer home on players. 2015-05-12 18:27:11 +01:00
Lizbeth Rika 0f6eb9486c Added the Stone of Temperance. 2015-05-12 18:26:07 +01:00
Lizbeth Rika 30ab404d26 Dropping the Ring of the Aesir reverts it into its base components. 2015-05-12 17:51:45 +01:00
Lizbeth Rika a8f63d376c Added double and petite flower alternate textures by Futureazoo. 2015-05-12 17:35:54 +01:00
Lizbeth Rika 680c547f1e Made the Dice of Fate be biased towards positive results. 2015-05-12 17:24:28 +01:00
Lizbeth Rika 38eb24e830 Fixed the Ring of Loki and Ring of the Aesir displaying the source bounding box when in the inventory and not equipped. 2015-05-12 17:16:14 +01:00
Lizbeth Rika 29d888bc45 The Crafty Crate now automatically ejects its contents if full and no matching recipe is found. Closes #953. 2015-05-12 16:59:44 +01:00
Lizbeth Rika 5a697264a1 Fixed the Drum of the Gathering working on the client side. Closes #926 2015-05-12 16:55:36 +01:00
Lizbeth Rika 17df65717b Actually make them not connect >.< 2015-05-12 16:49:35 +01:00
Lizbeth Rika d51dea59b2 Red Stringed Spoofers can't connect to botania special flowers any more. Closes #934. 2015-05-12 16:45:31 +01:00
Lizbeth Rika a59d13ff06 Made the Gaia Guardian only remove ambient potion effects. Closes #925 2015-05-12 16:38:50 +01:00
Lizbeth Rika 1d377b8889 Fixed crash when corporea funnels or interceptors have empty item frames. Closes #897 2015-05-12 16:18:55 +01:00
Lizbeth Rika 559d51c529 PR fixes. 2015-05-12 15:42:19 +01:00
Lizbeth Rika c4173e1595 Merge pull request #945 from Mrkwtkr/patch-4
Update zh_CN.lang
2015-05-12 14:58:17 +01:00
Lizbeth Rika 2060ba2a26 Merge pull request #943 from Lazersmoke/patch-1
Copy/Paste from previous pull for Helm Crafting
2015-05-12 14:58:11 +01:00
Lizbeth Rika 630535e43e Merge pull request #938 from tterrag1098/patch-2
Use the stack sensitive unloc name in seed matcher
2015-05-12 14:57:23 +01:00
Lizbeth Rika addef9f0c9 Merge pull request #937 from Lazersmoke/patch-3
Fix Thor ring giving SS achievement when using S pick
2015-05-12 14:57:16 +01:00
Lizbeth Rika aafbf19e14 Merge pull request #933 from NatsuArashi/patch-5
Update zh_TW.lang
2015-05-12 14:57:09 +01:00
Lizbeth Rika cdc9cfebc4 Merge pull request #929 from Lazersmoke/patch-5
Fix using wrong y coord variable
2015-05-12 14:55:02 +01:00
Dylan4ever 4ac13bd418 Fuck yeah, I'm back. I didn't actually change anything though. Kek. 2015-05-11 19:34:09 +02:00
Mrkwtkr d907fa225f Update zh_CN.lang
Translated the relics of the aesir, the shattering and some achievements.
2015-05-11 12:27:40 +08:00
Sam Quinn 9958cafd9e Copy/paste from previous
see previous pull request
2015-05-10 20:36:56 -05:00
Sam Quinn 1ef947c6d9 Fix using wrong y coord variable 2015-05-10 20:30:10 -05:00
tterrag1098 c4beac7172 Use the stack sensitive unloc name in seed matcher
Fixes KitchenCraft seeds not working with the apothecary
2015-05-10 02:20:57 -04:00
NatsuArashi fc7b071bc6 Update zh_TW.lang
Well... Fixed alot
2015-05-10 00:34:28 +08:00
Sam Quinn 38099b7c44 Fix using wrong y coord variable
totally my mistake :(
2015-05-08 18:38:53 -05:00
Mrkwtkr 1e0a51ef99 Update zh_CN.lang
Finally :P
2015-05-08 12:50:16 +08:00
Lizbeth Rika 03dc9301c3 Merge pull request #892 from MrKunji/patch-13
Update en_US.lang
2015-05-07 18:51:58 +01:00
Sam Quinn 57339110b3 Fix Thor ring give SS achievement when using S pick 2015-05-06 15:37:11 -05:00
Lizbeth Rika f1f6083a5f Merge pull request #906 from Reyls/patch-1
Update de_DE.lang
2015-05-06 12:21:42 +01:00
NatsuArashi acdd7726ce Update zh_TW.lang 2015-05-06 19:19:16 +08:00