3049 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
TheWhiteWolves	fbc2e877e0	Merge pull request #1137 from MrKunji/patch-20 ... Dem glorious chalenges!	2015-07-01 15:58:33 +01:00
Patric Alexandre	c207837722	Dem glorious chalenges!	2015-07-01 10:08:32 -03:00
TheWhiteWolves	d81c80effc	Merge pull request #1135 from puyo061/patch-19 ... Update ko_KR.lang	2015-07-01 11:42:05 +01:00
프요	f37f417517	Update ko_KR.lang	2015-07-01 19:35:10 +09:00
TheWhiteWolves	16bb4a8902	Fix mana pump voiding mana taken from a cart when the receiving pool is full	2015-06-30 22:33:37 +01:00
Lizbeth Rika	dcc55ebd83	Update contributors.properties	2015-06-30 14:54:01 +01:00
Lizbeth Rika	dc75269f91	Build 197.	2015-06-30 00:47:40 +01:00
Lizbeth Rika	efe17dbf38	Fixed a crash when clicking the Info button in the gui for a challenge. Closes #1133	2015-06-30 00:41:25 +01:00
Lizbeth Rika	286010ba94	Build 196.	2015-06-29 20:23:53 +01:00
Lizbeth Rika	49ed5a9d50	Some cleanup...	2015-06-29 20:13:45 +01:00
Lizbeth Rika	64109d9fcc	The Entropinnyum will no longer make mana if the TNT falls in water.	2015-06-29 20:08:00 +01:00
Lizbeth Rika	fd855a3053	Added the ability to conjure Leaves using the Conjuration Catalyst.	2015-06-29 20:01:25 +01:00
Lizbeth Rika	0f42db9d20	Added an info button to the challenges page.	2015-06-29 19:52:51 +01:00
Lizbeth Rika	734680bac7	Good bye lorem ipsum!	2015-06-29 19:40:35 +01:00
Lizbeth Rika	014ccf970d	Removed debug print from the Rod of the Skies.	2015-06-29 18:42:12 +01:00
Lizbeth Rika	a27e1119e8	Added multiblockPage to the API internal method handler, because I forgot last time >_>	2015-06-29 18:41:19 +01:00
Lizbeth Rika	8e26e00393	Added a challenge entry and make some of the entries in the misc section priority.	2015-06-29 18:40:02 +01:00
Lizbeth Rika	68cdcaa05b	Finish off the Challenge System, now all its missing is a description and less lorem ispum...	2015-06-29 18:23:58 +01:00
Lizbeth Rika	fab425f9be	Merge branch 'master' of https://github.com/Vazkii/Botania	2015-06-29 17:14:45 +01:00
Lizbeth Rika	e602f884f3	Starting the challenge system.	2015-06-29 17:14:34 +01:00
Lizbeth Rika	34937b43de	Update contributors.properties	2015-06-28 23:33:20 +01:00
Lizbeth Rika	20e5752a55	Build 195.	2015-06-28 23:32:27 +01:00
Lizbeth Rika	439c1a71e0	Fix what SoundLogic broke >_>	2015-06-28 23:24:24 +01:00
Lizbeth Rika	98bf5306db	Recipe/docs for the Spark Tinkerer.	2015-06-28 23:13:45 +01:00
Lizbeth Rika	3d1212bd8e	Add the Spark Tinkerer.	2015-06-28 22:57:05 +01:00
Lizbeth Rika	0a6d9a6b68	Remove todo	2015-06-28 17:26:27 +01:00
Lizbeth Rika	95ad79bd80	The Gaia Guardian now breaks whatever block its on.	2015-06-28 17:26:10 +01:00
Lizbeth Rika	e379eb4edd	Removed the need to use shift for autocomplete.	2015-06-28 17:24:22 +01:00
Lizbeth Rika	6fa7b26f84	Fixed the Rod of the Skies being abusable for infinite flight. Closes #1122	2015-06-28 17:15:31 +01:00
Lizbeth Rika	0e95b606e6	Added a config to change the height of the mana bar for people who use Dual Hotbars or other mods that change the HUD.	2015-06-28 17:07:47 +01:00
Lizbeth Rika	c58784c154	Document the shift-tab thing.	2015-06-28 17:03:44 +01:00
Lizbeth Rika	95042a4e65	Use the right blend function for the pool render so it doesn't spazz out.	2015-06-28 16:56:58 +01:00
Lizbeth Rika	16da8b588f	Merge branch 'CorporeaAutocompleteSystem' of git://github.com/soundlogic2236/Botania into soundlogic2236-CorporeaAutocompleteSystem ... Conflicts: src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java	2015-06-28 16:52:49 +01:00
Lizbeth Rika	62f083df33	Fixed the Narslimmus being able to absorb slimes that have been absorbed by other Narslimmus already. Closes #1125	2015-06-28 16:46:28 +01:00
Lizbeth Rika	80235194b6	Added a structure cost preview.	2015-06-28 16:15:53 +01:00
Lizbeth Rika	e9f99e972d	Finish up the multiblock preview system.	2015-06-28 15:41:18 +01:00
Lizbeth Rika	2247a1eace	Functional visualize button and transparent blocks.	2015-06-28 14:40:44 +01:00
Lizbeth Rika	bf1230e84b	New multiblock pages implemented. Not functional yet, I'll do that tomorrow >_>	2015-06-28 03:31:24 +01:00
Lizbeth Rika	4ef18f8ce0	Add all the botania multiblocks.	2015-06-28 01:48:41 +01:00
Lizbeth Rika	822dd99a62	Better renderBlockForMultiblock signature.	2015-06-28 01:26:41 +01:00
Lizbeth Rika	9b893e8589	Implemented proper rotation code.	2015-06-28 01:20:36 +01:00
Lizbeth Rika	1c554fcc12	More work on the multiblock render framework. Still very WIP.	2015-06-28 01:03:10 +01:00
TheWhiteWolves	d2789a2541	Make the jump action of the sashes require a mana storage device. ... Fixes the issue noted in the comments of commit efd7d84af4	2015-06-27 19:53:54 +01:00
Lizbeth Rika	6815e281eb	Multiblock framework.	2015-06-27 19:26:24 +01:00
Lizbeth Rika	f3926ff1ae	Build 194.	2015-06-24 21:06:04 +01:00
SoundLogic	176fa1f5b5	Item Autocomplete system	2015-06-24 14:46:25 -05:00
Lizbeth Rika	755a04a9ab	Excaliber's beams no longer home on bosses.	2015-06-24 20:33:32 +01:00
Lizbeth Rika	0893a0209f	Capped the amount of damage the Gaia Guardian can take from a single hit to 12 to make it not be roflstomped by op tools.	2015-06-24 20:32:44 +01:00
Lizbeth Rika	e765dce15b	The Spectrolus now produces double the amount of mana as before.	2015-06-24 20:23:08 +01:00
Lizbeth Rika	d0dfe56286	The first time you open the Lexica Botania you'll be taken to the "Welcome to Botania" entry.	2015-06-24 19:32:26 +01:00