Commit Graph
2944 Commits
Author SHA1 Message Date
Lizbeth Rika bbf6d7e455 Added the Spectral Rail. 2015-06-09 01:18:43 +01:00
Lizbeth Rika b3182b5420 Fixed the Terra Shatterer's mana display overlapping tooltips when they would go off screen. Closes #1036 2015-06-08 23:51:35 +01:00
Lizbeth Rika 153eda8746 Merge branch 'master' of https://github.com/Vazkii/Botania 2015-06-08 23:31:00 +01:00
Lizbeth Rika a17d77e377 Changed the Spectranthemum to have a limited range and not be chainable. Use minecarts for long range yo. 2015-06-08 23:28:12 +01:00
wiiv cce089d50d Treasure... Wait, what? 2015-06-08 23:25:08 +01:00
Lizbeth Rika fda48ab6b9 Fixed the Black Hole Talisman being able to place blocks inside the player. Closes #1043 2015-06-08 23:16:30 +01:00
Lizbeth Rika a8752d321c That's backwards >_> 2015-06-08 23:08:07 +01:00
Lizbeth Rika 54cfa17511 Do a bunch of checks for isInvalid(). 2015-06-08 23:07:10 +01:00
Lizbeth Rika 6211bb967f Revert "Reverted flower binding cache handling changes from a month ago. I have no idea if this will fix anything but we might as well try."
This reverts commit a242e382b4.
2015-06-08 23:00:39 +01:00
Lizbeth Rika b8d456cc1b Fixed Corporea requests not updating inventories. Closes #1063 2015-06-08 22:56:45 +01:00
Lizbeth Rika e60dd0cf0f Fixed the yellow quartz Flugel Tiara having pink particles. Closes #1057 2015-06-08 22:55:14 +01:00
Lizbeth Rika a242e382b4 Reverted flower binding cache handling changes from a month ago. I have no idea if this will fix anything but we might as well try. 2015-06-08 22:52:49 +01:00
Lizbeth Rika 507ac6c3e3 Fix a memory leak. 2015-06-08 21:29:16 +01:00
wiiv 284614841d Can you see it now? 2015-06-04 14:12:48 +01:00
TheWhiteWolves 9aeabf8207 Merge pull request #1048 from Greenicefrost/patch-13
Update zh_CN.lang
2015-06-02 11:20:46 +01:00
Greenice 87246825f6 Update zh_CN.lang
Botania r1.6-191(2nd)
2015-06-02 16:01:08 +08:00
TheWhiteWolves 0737751fc3 Merge pull request #1047 from Greenicefrost/patch-12
Update zh_CN.lang
2015-06-02 08:56:59 +01:00
Greenice a5c17ce2c0 Update zh_CN.lang
Botania r1.6-191
2015-06-02 14:48:08 +08:00
TheWhiteWolves c8b1405125 Add a word to the Sash line 2015-06-01 12:21:58 +01:00
Lizbeth Rika e1294c706b Merge pull request #1037 from The0x539/master
Close loophole in open-source clause of license
2015-05-31 17:54:00 +01:00
The0x539 c5219aab70 Close loophole in open-source clause 2015-05-31 09:49:40 -05:00
Lizbeth Rika 89916c009a Merge pull request #1035 from NatsuArashi/patch-8
Update zh_TW.lang
2015-05-31 13:13:58 +01:00
NatsuArashi ed3e3660e4 Update zh_TW.lang 2015-05-31 18:34:35 +08:00
wiiv fc2e5b7648 Fancier Hearts! 2015-05-31 00:16:52 +01:00
Lizbeth Rika f10cdf8aec Merge pull request #1033 from puyo061/patch-16
Update ko_KR.lang
2015-05-30 23:50:27 +01:00
프요 79463ea06e Update ko_KR.lang 2015-05-31 07:48:12 +09:00
Lizbeth Rika 4ebde3d28c Update contributors.properties 2015-05-30 23:41:52 +01:00
Lizbeth Rika 13c0b093f3 Build 191 2015-05-30 23:35:51 +01:00
Lizbeth Rika 82711c44ef Added the new "Welcome to Botania" page. 2015-05-30 23:20:02 +01:00
Lizbeth Rika 1860539aee Recipe/docs for the hourglass. 2015-05-30 16:40:09 +01:00
Lizbeth Rika 4c52cd24e2 Fixed 1.8 Stones' Chiselsed Bricks not being craftable. 2015-05-30 15:59:28 +01:00
Lizbeth Rika b6fe02b0cc Merge branch 'master' of https://github.com/Vazkii/Botania 2015-05-30 15:37:18 +01:00
Lizbeth Rika fbeea5007e Finish off the Hourglass. 2015-05-30 15:37:00 +01:00
Lizbeth Rika aa22a581e0 Merge pull request #1031 from puyo061/patch-15
Update ko_KR.lang
2015-05-30 13:48:28 +01:00
프요 46f1089917 Update ko_KR.lang 2015-05-30 10:20:13 +09:00
Lizbeth Rika 40237cdb66 Hourglasses. Todo: HUD, inventory rendering, recipes and stuff. 2015-05-29 23:26:32 +01:00
Lizbeth Rika 1a27dbc876 Fixed the Terra Shatterer's rank bar displaying if the player has an item in their cursor. 2015-05-29 19:53:28 +01:00
Lizbeth Rika 956e6dcb5c Merge branch 'master' of https://github.com/Vazkii/Botania 2015-05-29 19:29:43 +01:00
Lizbeth Rika efd7d84af4 Made the Soujourner's Sash a little bit of Mana to work. 2015-05-29 19:29:33 +01:00
Lizbeth Rika c81f5f0b06 Merge pull request #1029 from Mrkwtkr/patch-4
Update zh_CN.lang
2015-05-29 19:01:22 +01:00
Mrkwtkr f6c9d8b24e Update zh_CN.lang 2015-05-30 01:57:19 +08:00
TheWhiteWolves 6e7d1463d5 Merge pull request #1021 from NatsuArashi/patch-7
Update zh_TW.lang
2015-05-29 14:20:07 +01:00
TheWhiteWolves 42a390d0ba Merge pull request #1020 from Greenicefrost/patch-7
Update zh_CN.lang
2015-05-29 14:19:37 +01:00
TheWhiteWolves f1a53c34ef Merge pull request #1005 from MrKunji/patch-18
Changed the Exoflame entry to be more precise, Closes #998
2015-05-29 14:15:09 +01:00
TheWhiteWolves 9e10596715 Fix Botania FAQ Link 2015-05-29 12:51:56 +01:00
TheWhiteWolves ca24915642 Merge pull request #1017 from TheWhiteWolves/patch-1
Add getEntry() to BlockFloatingSpecialFlower
2015-05-29 12:39:45 +01:00
wiiv 555b4828c2 Spirit Rings. 2015-05-28 23:38:27 +01:00
Lizbeth Rika 2fa9c58b25 Merge branch 'master' of https://github.com/Vazkii/Botania 2015-05-26 23:09:12 +01:00
wiiv eb9649214a Swap. 2015-05-26 22:42:13 +01:00
wiiv 0f071772c0 Call to arms with Battlegear! 2015-05-26 22:39:20 +01:00