Commit Graph
4820 Commits
Author SHA1 Message Date
Vasco Lavos 87dd4d86bc Updated the website to have a warning for the Baubles API. Also added a deploy_website target to the build script. 2014-04-27 22:51:28 +01:00
Vasco Lavos 2e0cc0bb0c Build 22. 2014-04-27 22:43:01 +01:00
Vasco Lavos da52e52d17 Pass a cleanup... 2014-04-27 22:24:46 +01:00
Vasco Lavos b67a452346 That recipe's better. 2014-04-27 22:21:49 +01:00
Vasco Lavos 28211d1257 Recipe/docs for the Golden Laurel Crown. 2014-04-27 22:19:53 +01:00
Vasco Lavos 232a9cbf1f Added the Golden Laurel Crown. 2014-04-27 21:13:47 +01:00
Vasco Lavos 8fd72f5450 Sekai wa owari wo tsugeyou to shiteru 2014-04-27 20:37:47 +01:00
Dylan4ever 4c683e8b78 I think this looks sexier. 2014-04-27 20:56:17 +02:00
Vasco Lavos 67757c8293 Added Essence of Eternal Life. 2014-04-27 19:30:45 +01:00
Vasco Lavos 17b0735375 Recipe/docs for the Pyroclast Pendant. 2014-04-27 18:53:53 +01:00
Vasco Lavos 05e10d48c0 Added the Pyroclast Pendant. 2014-04-27 18:27:52 +01:00
Vasco Lavos 9f164cb879 Added failsafe for IC2, this should fix manasteel being uncraftable with IC2 installed. 2014-04-26 23:08:34 +01:00
Vasco Lavos 282dfc1920 Tectonic Girdle recipe/docs. 2014-04-26 23:03:58 +01:00
Vasco Lavos fc7cf4f38c Added the Tectonic Gridle. 2014-04-26 19:21:39 +01:00
Vasco Lavos b086311a76 Snowflake Pendant recipe/docs. 2014-04-26 18:59:09 +01:00
Vasco Lavos 37808c87bc Getting the Snowflake Pendant working... 2014-04-26 18:00:03 +01:00
Vasco Lavos 2537b87d09 Merge branch 'master' of https://github.com/Vazkii/Botania
Conflicts:
	resources/assets/botania/textures/items/iceAmulet.png
2014-04-26 16:57:48 +01:00
Vasco Lavos 263fab9808 Starting the Ice Pendant. 2014-04-26 16:56:55 +01:00
Dylan4ever fb06764618 Some new things and an edit 2014-04-26 17:47:09 +02:00
Vasco Lavos ec49003ca5 Soujourner's Strap effect, some changes to base bauble code for it to work propperly too. 2014-04-25 22:41:51 +01:00
Vasco Lavos 87ef3d9599 Merge branch 'master' of https://github.com/Vazkii/Botania 2014-04-25 21:30:00 +01:00
Dylan4ever 59047311ac Less shiny! 2014-04-25 17:47:53 +02:00
Dylan4ever d456308c25 So shiny! 2014-04-25 17:42:37 +02:00
Dylan4ever 34d9916b6d Edit
Still doesn't look very acidic though...
2014-04-25 14:03:47 +02:00
Dylan4ever a096c4032b Fragmentation 2014-04-25 10:38:57 +02:00
Dylan4ever cf3950cccd Some stuff 2014-04-25 10:24:42 +02:00
Vasco Lavos c1cedc6c4f Starting the Soujourner's Belt, backwards this time cuz I'm witty. 2014-04-24 23:26:49 +01:00
Vasco Lavos 800f0ee901 "Introduction to Baubles" entry. 2014-04-24 23:00:42 +01:00
Vasco Lavos e505cce270 Change some lexicon text. 2014-04-24 18:38:07 +01:00
Vasco Lavos 2b2bb56f7f Recipe and Docs for the rings. 2014-04-24 18:33:30 +01:00
Vasco Lavos 8471283d46 Added Mana and Aura rings. 2014-04-24 17:04:18 +01:00
Vasco Lavos 830d67e8af Added the Band of Mana. 2014-04-24 16:18:45 +01:00
Dylan4ever 04e72b993a I may suck at names more than Egoist
Changed name and texture. Because why not. The old one didn't please me.
2014-04-24 12:22:36 +02:00
Dylan4ever 1c8563df49 Omnomnom.
The Munchdew is alive. It's a sundew, functioning as the tongue of a
munching plant with teeth. Do I need to continue?
2014-04-23 17:00:59 +02:00
Dylan4ever a9713034c3 Aloëdisiac
It will arouse mobs, probably.
2014-04-23 15:41:21 +02:00
Vasco Lavos 7dade2f240 Merge pull request #23 from Vexatos/patch-6
Update de_DE.lang
2014-04-22 20:04:24 +01:00
Vexatos 956a3b8942 Update de_DE.lang 2014-04-22 20:59:15 +02:00
Vasco Lavos 6fc1121141 Manasteel and Terrasteel tools can be repaired in the anvil. 2014-04-22 15:02:09 +01:00
Vasco Lavos f9e5b50828 Ok, that feels about right. 2014-04-22 14:54:43 +01:00
Vasco Lavos 5dc5e2c6c7 Some tweaks to the orbit of the Tiny Planet. 2014-04-22 14:52:28 +01:00
Vasco Lavos 25f5ce437d Wand of the Forest is crafted with livingwood twigs now. 2014-04-22 14:04:45 +01:00
Vasco Lavos ef7cd4d8a1 Merge pull request #22 from Vexatos/patch-4
Updated en_US.lang
2014-04-22 13:47:07 +01:00
Vasco Lavos 8695f8f5c7 No point in relying in reflection wrappers under a hard dep. 2014-04-22 11:28:31 +01:00
Vasco Lavos a67fb9b49e Merge branch 'master' of https://github.com/Vazkii/Botania 2014-04-22 11:28:11 +01:00
Vasco Lavos 4623c71ba7 ManaItemHandler now checks the baubles inventory for items. 2014-04-22 11:26:34 +01:00
Vasco Lavos 74367b63a4 Merge pull request #21 from Vexatos/patch-5
Update de_DE.lang
2014-04-22 10:49:02 +01:00
Vexatos 6fbec27b07 Update de_DE.lang 2014-04-22 09:40:03 +02:00
Vexatos 82ca0e1c29 You won't typo in German. No, you won't. 2014-04-22 09:27:56 +02:00
Vasco Lavos 5c26e26c14 Fixed the mouse down status being passed from gui to gui. 2014-04-21 22:37:56 +01:00
Vasco Lavos 838919e6e0 Fixed the tooltip text for the items in the lexica botania always being in white rather than gray. 2014-04-21 22:29:20 +01:00