Commit Graph
4820 Commits
Author SHA1 Message Date
Lizbeth Rika a48792adba Merge pull request #402 from soundlogic2236/master
Made it so dummy entities for book rendering are passed the actual world...
2014-12-01 18:56:51 +00:00
SoundLogic 1594254a57 Made it so dummy entities for book rendering are passed the actual world. 2014-12-01 12:32:46 -06:00
Lizbeth Rika 5fc9586a06 Merge pull request #399 from Yulife/master
More satured grass colour for Floating Mini Flower Islands
2014-11-30 22:14:11 +00:00
Yulife ea90c0fd53 More satured grass colour for Floating Mini Flower Islands
I find the "Alpha" type grass on the floating islands not really fitting
if I am, for example, in a forest biome. Thus, I satured the green in
the island to be a bit more dark and the result is quite pleasant :
http://imgur.com/hHskdCm

Thanks for reading

Yulife
2014-11-30 22:41:37 +01:00
Lizbeth Rika e540d54399 Merge pull request #397 from LordIllyohs/master
God damn it
2014-11-26 23:36:15 +00:00
Anthony Anderson d4cab0bab5 God damn it
Signed-off-by: Anthony Anderson <[email protected]>
2014-11-26 18:33:38 -05:00
Lizbeth Rika 9dfc214a54 Merge pull request #396 from LordIllyohs/master
Added the gradle wraopper
2014-11-26 23:20:46 +00:00
Anthony Anderson 6bf558d6ce Added the gradle wraopper
Signed-off-by: Anthony Anderson <[email protected]>
2014-11-26 18:07:11 -05:00
Lizbeth Rika de2c10130a Merge pull request #394 from ganymedes01/master
Fix #392 (apothecary consuming water bottles)
2014-11-26 15:09:51 +00:00
ganymedes01 b27800bfc4 Fix apothecary consuming water bottles + added support for IFluidContainerItem 2014-11-26 12:59:39 -02:00
Lizbeth Rika c3cc08a09a Merge pull request #393 from Skywebz/master
Create fr_FR.lang
2014-11-26 13:47:43 +00:00
Alex ee31745a66 Create fr_FR.lang
Added the basics, around 70% done.
2014-11-26 13:20:32 +01:00
Lizbeth Rika 843a95fc1c Build 138. 2014-11-24 19:57:10 +00:00
Lizbeth Rika a4098a7815 Sorry forgecraft, you're going to get a rain of builds because gradle doesn't make sense. 2014-11-24 19:54:48 +00:00
Lizbeth Rika c7ed66b5d6 Name n stuff :V 2014-11-24 19:36:21 +00:00
Lizbeth Rika d03d1f1ced Leaving this unfinished since I really don't feel like doing much more today. 2014-11-24 19:35:21 +00:00
Lizbeth Rika d0041babdd Package sorting around the place. 2014-11-24 17:42:54 +00:00
Lizbeth Rika 9b4f851fb0 FIxed dreamwood not going to the right page when shift-right clicked with the lexicon. 2014-11-23 17:12:27 +00:00
Lizbeth Rika 992223dece And removed old ones too >_> 2014-11-23 17:11:59 +00:00
Lizbeth Rika 87c52e1759 Moved a bunch of textures to "unused" dirs. 2014-11-23 17:11:32 +00:00
Lizbeth Rika 6079e56f79 The enchanter will now always properly reset the pylons' particle emitting status. 2014-11-23 16:59:18 +00:00
Lizbeth Rika 929e64679b Added a proper, registered dependency on Baubles. Closes #389 and #381 (probably) 2014-11-23 16:26:44 +00:00
Lizbeth Rika 82a0ed41f7 Fixed the Rod of the Skies and Hells not showing a mana bar. Closes #384. 2014-11-23 15:38:03 +00:00
Lizbeth Rika 60c762f28b Merge branch 'master' of https://github.com/Vazkii/Botania 2014-11-23 15:35:42 +00:00
Lizbeth Rika 9b0bc2976c Set getWorldElapsedTicks to use ClientTickHandler.ticksInGame in the ClientProxy. Closes #385. 2014-11-23 15:35:25 +00:00
Lizbeth Rika 968932ee64 Merge pull request #387 from anesin1109/patch-1
Little edit for Korean traslation
2014-11-21 16:46:07 +00:00
anesin1109 c465acbd4c Little edit for Korean traslation 2014-11-21 23:56:07 +09:00
Lizbeth Rika 509be4bece Merge pull request #386 from puyo061/patch-4
Update Korean translation
2014-11-21 11:52:05 +00:00
[MMKP]Puyo061 40514f1ec8 Update Korean translation 2014-11-21 17:52:38 +09:00
Lizbeth Rika 8899a73ff2 Let's not forget this thing. 2014-11-18 18:12:53 +00:00
Lizbeth Rika cd6a07d45a Upload deobf jar to the server through gradle. 2014-11-18 18:11:59 +00:00
Lizbeth Rika f9c694eb74 A better shadow for the jumbotron/carousel. 2014-11-18 18:09:25 +00:00
Lizbeth Rika c6ec7ac326 Footer and more modpacks. 2014-11-18 18:06:34 +00:00
Lizbeth Rika a8b0f9087a Added modpacks, removed addons. 2014-11-18 17:18:39 +00:00
Lizbeth Rika a35efa87f4 Those basic, boring, pure markup pages from the old site. FAQ and Credits. 2014-11-18 17:05:16 +00:00
Lizbeth Rika aa91469f2d Add the changelog pages. 2014-11-18 16:44:29 +00:00
Lizbeth Rika 7c1b20862b Finish up the index. 2014-11-18 16:13:34 +00:00
Lizbeth Rika 20e392826a Catgirls! 2014-11-18 16:09:12 +00:00
Lizbeth Rika 5056b540e3 Added the index page back. 2014-11-18 16:02:29 +00:00
Lizbeth Rika d1127b52de Move over the old js. 2014-11-18 15:02:59 +00:00
Lizbeth Rika 66c7695b1c Finishing up the downloads page. 2014-11-18 14:50:06 +00:00
Lizbeth Rika 34fe3ba8e5 Move changelog and versions.ini to the new web dir. 2014-11-18 13:16:52 +00:00
Lizbeth Rika 89963fdf82 Getting the website to look proper, some material design and basic work on the downloads page. 2014-11-18 13:14:04 +00:00
Lizbeth Rika 7a57067ea1 Merge pull request #378 from puyo061/patch-3
Update Korean translation
2014-11-18 12:26:53 +00:00
Lizbeth Rika 4de11949ce Basic work on bootstrap. 2014-11-18 09:51:49 +00:00
[MMKP]Puyo061 14dbe9586a Update Korean translation 2014-11-18 18:46:13 +09:00
Lizbeth Rika ee92bde1ac Using __FILE__ is more effective... 2014-11-18 09:41:32 +00:00
Lizbeth Rika f43f55de02 Basic website modularity. 2014-11-18 09:38:36 +00:00
Lizbeth Rika 28485a3969 The logo should stay :V 2014-11-18 09:33:43 +00:00
Lizbeth Rika e5a71390b4 Moved all the current website stuff over to web-legacy. Redesign time. 2014-11-18 09:33:12 +00:00