Commit Graph
3768 Commits
Author SHA1 Message Date
Vasco Lavos 8bf062cc19 Fixed Resolute Ivy not working. Closes #1657 2015-12-16 18:44:23 +00:00
Jonathan Smith 81b7ac4be4 Merge pull request #1653 from howtonotwin/chordatafix
Fix #1588: chordata ring stops player from drowning with no mana.
2015-12-13 21:10:15 +00:00
Jonathan Smith f2a86347f9 Merge pull request #1656 from AlterAkima/patch-1
Update en_US.lang, closes #1654
2015-12-13 21:07:42 +00:00
Patric Alexandre c91e418752 Update en_US.lang
https://github.com/Vazkii/Botania/issues/1654
2015-12-13 16:26:52 -02:00
Rasheeq 1ca6fd6b96 Fix #1588: chordata ring stops player from drowning with no mana. 2015-12-13 06:51:39 -05:00
Vasco Lavos 010ff46f72 Build 243. 2015-12-13 02:01:54 +00:00
Vasco Lavos be251a9680 Mana Pools are now dyed by right clicking Floral Powder, and not dropping it, so you don't dye your pool while making Mana Powder. Closes #1644 2015-12-13 01:45:46 +00:00
Vasco Lavos b3e4e43146 Fixed a CME with red string interceptors. Closes #1640 2015-12-13 01:35:55 +00:00
Vasco Lavos 5f272ad837 Merge branch 'master' of https://github.com/Vazkii/Botania 2015-12-13 01:18:04 +00:00
Vasco Lavos 88ec0dec28 Added NEI Lexica Botania integration 2015-12-13 01:17:56 +00:00
Jonathan Smith 991724ea15 Merge pull request #1642 from yrsegal/master
Fix Corporea Funnel attempting to put an item into another one
2015-12-11 09:19:05 +00:00
yrsegal ded7a326d5 Fix Corporea Funnel attempting to put an item into another one
Closes #1622
2015-12-10 20:36:32 -05:00
Jonathan Smith 4faa0d4202 Merge pull request #1641 from yrsegal/master
Fix compatability problems with Et Futurum/JourneyMap/Chisel
2015-12-11 00:48:36 +00:00
yrsegal 03c2608036 Make the Gaia Guardian accept Et Futurum/Chisel Beacons
closes #1632
2015-12-10 19:16:04 -05:00
yrsegal a1669bbb9d Make BlockModDoubleFlower respond to alternate icon check
closes #1637
2015-12-10 19:15:36 -05:00
Jonathan Smith 75b9a61094 Merge pull request #1639 from webrsb/master
Update zh_TW.lang
2015-12-10 16:39:14 +00:00
unknown 3da7778107 Update zh_TW.lang
Base on zh_CN.lang. Thanks for @sfmiyuki.
2015-12-11 00:07:26 +08:00
Jonathan Smith 6e4a597090 Merge pull request #1638 from sfmiyuki/patch-2
Update zh_CN.lang
2015-12-10 14:25:29 +00:00
sfmiyuki 0e847aeeef Update zh_CN.lang
There is sth bug and I corrected it
2015-12-10 22:17:56 +08:00
Vasco Lavos 3edde413df A bunch of website changes~ 2015-12-09 22:48:06 +00:00
Vasco Lavos a55ceb34f5 Build 242 2015-12-08 18:29:01 +00:00
Vasco Lavos af5a4fa194 Merge branch 'master' of https://github.com/Vazkii/Botania 2015-12-08 18:19:01 +00:00
Vasco Lavos d3ef44974d Fixed the Terra Shatterer not working when the player has full Terrasteel Armor and their first available Mana Tablet isn't full and is in a hotbar slot before the Terra Shatterer. Closes #1626 2015-12-08 18:18:50 +00:00
Jonathan Smith 1473827602 Merge pull request #1630 from sfmiyuki/patch-1
Update zh_CN.lang
2015-12-08 08:39:23 +00:00
sfmiyuki 8b74b24748 Update zh_CN.lang
Mrkwtkr is busying on his acadamic exam so I replace him to update ...temporarily
2015-12-08 15:42:13 +08:00
Vasco Lavos 56748b62bb Build 241 2015-12-07 14:43:09 +00:00
Vasco Lavos 3d7cdaba7e Yay, debug! 2015-12-07 14:40:07 +00:00
Vasco Lavos 3b6ebcae1e Implemented a recursion limiter to the magnet ring's blacklist API for pesky items that intercept getItemDamage(). 2015-12-07 14:37:21 +00:00
Vasco Lavos f5ef8ed2ed Fixed the Config Adaptor trying to modify correct values and spamming you about it in the chat. 2015-12-07 14:32:56 +00:00
Vasco Lavos c02956b524 Build 240 2015-12-06 23:10:31 +00:00
Vasco Lavos 8ecf116e72 Fixed the Mana Pool achievement 2015-12-06 22:52:00 +00:00
Vasco Lavos 90b379b6e0 Build 239 2015-12-06 14:44:46 +00:00
Vasco Lavos 81f635ae8d Fixed the Rune of Air recipe not being adapted fully to the new pattern. Closes #1618 2015-12-06 14:40:13 +00:00
Vasco Lavos afc846b369 Fixed using a Rod of the Unstable Reservoir with a Livingwood Avatar crashing the game if it kills a named mob while CoFHCore's "alert named mob kills" config is enabled. Closes #1617 2015-12-06 14:29:24 +00:00
Vasco Lavos 14bf6c90fd Merge branch 'master' of https://github.com/Vazkii/Botania 2015-12-06 14:26:10 +00:00
Vasco Lavos 9ff67ffd7d Fixed a crash when right clicking a spark with an empty hand. Closes #1621 2015-12-06 14:23:56 +00:00
Vasco Lavos d026920573 Fixed patreon flowers not rendering on players properly unless there's a named tiny potato around. (for real) 2015-12-06 14:22:01 +00:00
Vasco Lavos 17ad63087a Update contributors.properties 2015-12-06 00:19:10 +00:00
Vasco Lavos 27c5181565 Build 238, Botania r1.8 2015-12-05 21:24:13 +00:00
Vasco Lavos c904244bcc Lotsa cleanup 2015-12-05 21:10:07 +00:00
Vasco Lavos 4610f1e617 Rewrote the "Welcome to Botania" entry. 2015-12-05 21:04:50 +00:00
Vasco Lavos ccb1fa8651 Merge pull request #1616 from AlterAkima/patch-2
The rewrite update
2015-12-05 20:14:22 +00:00
Patric Alexandre bcd1615d24 Update pt_BR.lang 2015-12-05 16:43:24 -03:00
Vasco Lavos 2dc664eade Terrasteel armor tweaks, new effects and recipes 2015-12-05 18:56:11 +00:00
Vasco Lavos 1b25357616 Fixed the Manaseer Monocle's range viewing functionality rendering as a gray square when used alongside other mods that use GL_LIGHTING, like Neat. 2015-12-05 18:18:54 +00:00
Vasco Lavos b4fe47928c Fixed Mana Pools not updating their comparator output properly when mana is being taken from them. Closes #1614 2015-12-05 18:14:27 +00:00
Vasco Lavos a83f93916d Runic Altar HUD 2015-12-05 18:09:36 +00:00
Vasco Lavos a6d532cacc Petal Apothecary HUD. 2015-12-05 17:48:45 +00:00
Vasco Lavos 47a5f6d2f8 Documented properly the fact that buried petals can be used to grow tall flowers. 2015-12-05 16:14:04 +00:00
Vasco Lavos dfdef117d5 Remove adaptative config debug 2015-12-05 16:00:54 +00:00