Commit Graph
3296 Commits
Author SHA1 Message Date
Lizbeth Rika 3fdb184669 Nobody expects the potato inquisition! 2015-08-23 23:06:30 +01:00
Lizbeth Rika e10eec7bbe Added a config option to disable the 1.9 ender blocks for if you're using Et Futurum. 2015-08-23 21:23:52 +01:00
Lizbeth Rika a2e1642520 Fix an erroneous cast. 2015-08-23 21:19:08 +01:00
Vasco Lavos e9cc759d95 Merge pull request #1301 from ganymedes01/patch-1
Update ModCraftingRecipes.java
2015-08-23 22:18:02 +02:00
ganymedes01 a8bc7a57b6 Update ModCraftingRecipes.java 2015-08-23 21:16:03 +01:00
Lizbeth Rika 0be1701353 Merge branch 'master' of https://github.com/Vazkii/Botania 2015-08-23 21:15:02 +01:00
Lizbeth Rika f9e41372ae Cacotrollium block. 2015-08-23 20:38:36 +01:00
Vasco Lavos 3527205d30 Merge pull request #1298 from Adaptivity/updaterurulang
Update ru_RU.lang
2015-08-23 16:23:46 +02:00
Vasco Lavos ca7c77198e Merge pull request #1299 from Adaptivity/oredictsupport
Ore Dictionary support for recipes
2015-08-23 16:23:22 +02:00
Anton 3e6112e62f Ore Dictionary support for recipes 2015-08-23 17:11:57 +03:00
Anton bbcb6bb743 Update ru_RU.lang 2015-08-23 17:10:24 +03:00
Vasco Lavos 255429840e Merge pull request #1293 from LethalRes/patch-1
Mana Fluxfield computes incorrectly the amount of mana stored in block
2015-08-23 16:01:26 +02:00
Vasco Lavos 1dc599fec9 Merge pull request #1296 from mojares/master
Spanish (es_ES) Translation 100% R1.7 212
2015-08-23 16:01:21 +02:00
Vasco Lavos 4f9756d150 Merge pull request #1292 from phantamanta44/master
Various small changes
2015-08-23 16:01:15 +02:00
Lizbeth Rika 35bf694c57 Build 212, delayed commit because I'm a noob. 2015-08-23 00:25:04 +01:00
mojares 7e3ae8350a Spanish (es_ES) Translation 100% R1.7 212 2015-08-23 00:12:09 +02:00
LethalRes 91556871a8 Mana Fluxfield computes incorrectly the amount of mana stored in block 2015-08-22 09:33:11 +03:00
Phanta baa5aa3b7b chmod +x gradlew and update .gitignore and move dir_forgecraft to private.properties 2015-08-22 00:15:44 -05:00
Lizbeth Rika 434fcf71cd Fixed the Rod of the Shifting Crust placing fake blocks in the client side. Closes #1290 2015-08-21 21:35:34 +01:00
Lizbeth Rika 9d9ce34bad Fixed giving another player a relic ring crashing their client. Closes #1289 2015-08-21 21:28:54 +01:00
Lizbeth Rika cc428a73cb Mana Lenses can now be made with Glass as well as Glass Panes, if you're low enough that you can't make panes that it becomes a pain. 2015-08-21 21:26:14 +01:00
Lizbeth Rika cf208fbac9 Fixed the Rod of the Depths not showing infinite cobblestone when used with the Rod of the Shifting Crust, but rather, infinite dirt. 2015-08-21 21:25:00 +01:00
Lizbeth Rika f05a08955c Big magnet! 2015-08-21 21:23:25 +01:00
Vasco Lavos 8d55cb73e3 Update contributors.properties 2015-08-21 14:23:16 +01:00
Lizbeth Rika dba10e3210 Build 211. 2015-08-21 02:39:56 +01:00
Lizbeth Rika 0dd3d4c87e Recipe/docs for the Rod of the Shifting Crust. 2015-08-21 02:26:47 +01:00
Lizbeth Rika 4eeec9bd49 Rod of the Shifting Crust and a bunch of other tweaks to go along with it. 2015-08-21 01:39:06 +01:00
Lizbeth Rika 8989a12835 More taters :D 2015-08-20 19:46:02 +01:00
Lizbeth Rika 006c34e467 Trying to infuse an item with a Diluted Mana Pool now shows a "Upgrade your Mana Pool to infuse this item" indicator. 2015-08-20 18:07:37 +01:00
Lizbeth Rika 1c030bfdd3 Added Grass conjuration recipe. 2015-08-20 17:56:35 +01:00
Lizbeth Rika d6c68b6a05 Fixed the Hovering Hourglass accepting any item through automation and not just sand and not syncing its contents properly when its inventory is changed through automation. Closes #1277 and #1285 2015-08-20 17:44:17 +01:00
Lizbeth Rika 2ea2b2bb89 Fixed the Flugel Tiara rubberbanding in multiplayer. Maybe. Closes #1282 2015-08-20 17:36:32 +01:00
Lizbeth Rika 981d759428 Fixed the Flugel Tiara's sprint delay being 1.5 seconds rather than the intended 3 seconds. 2015-08-20 17:04:08 +01:00
Lizbeth Rika 66f19f35be Fixed the Corporea Index kicking you out of the server if you try requesting an item with control codes in the name (such as brews). Closes #1276 2015-08-20 17:02:31 +01:00
Lizbeth Rika 591db477a0 Rewrote the way the conversion in the Mana Fluxfield works to prevent a dupe with EnderIO capacitors banks. Closes #1275 2015-08-20 16:45:05 +01:00
Lizbeth Rika c1dd30e562 Updated the Force Relay entry to say how to break the block properly. Closes #1272 2015-08-20 16:39:14 +01:00
Lizbeth Rika 071fa6a3e3 Fixed the Flugel Tiara using CodeChickenLib Vector3 rather than Botania Vector3, causing crashes if the item is worn without NEI loaded. 2015-08-20 16:34:59 +01:00
Lizbeth Rika 39ca617266 Fixed a crash when you /give yourself a botania flower with the wrong metadata. 2015-08-20 16:33:43 +01:00
TheWhiteWolves 6e27b47f8b Add Lexicon Entry to Exoflame and Fix Drum Entry
Fixes #1274
2015-08-19 19:04:18 +01:00
TheWhiteWolves 748b9cd3e3 Increase api version
Bad me, I forgot to do this
2015-08-19 18:44:26 +01:00
TheWhiteWolves 5502194749 Remove random m 2015-08-19 17:15:48 +01:00
TheWhiteWolves 58bacd8f98 Merge pull request #1278 from phantamanta44/patch-1
Implement a couple of Thermal Foundation ores in the Orechid
2015-08-19 17:13:40 +01:00
Evan Geng 05c58fbf86 Implement a couple of Thermal Foundation ores in the Orechid
Closes #1265.
2015-08-19 11:09:19 -05:00
TheWhiteWolves 15debf9df1 Fix compatibility with TCon HUD Render
Fixes #1273
2015-08-19 00:09:07 +01:00
Vasco Lavos 20ac14ec02 d 2015-08-18 15:11:53 +01:00
Lizbeth Rika 2dc45be0f2 Build 210. 2015-08-18 03:49:20 +01:00
Lizbeth Rika b7f6dfa1e3 Fixed the recipe for the spectral platform crashing the client if used with the Shift-? feature in NEI. Closes #1267 2015-08-18 03:36:03 +01:00
Lizbeth Rika b706fcb41d Fixed a dupe with the Resolute Ivy. Closes #1049 2015-08-18 03:34:41 +01:00
Lizbeth Rika ca918f1631 Merge branch 'master' of https://github.com/Vazkii/Botania 2015-08-18 03:18:35 +01:00
Lizbeth Rika b1a2cebbd6 New Flugel Tiara mechanics. 2015-08-18 03:17:42 +01:00