upstream/Botania
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Botania.git synced 2026-11-12 16:27:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,947 Commits 12 Branches 179 Tags
60c762f28b3dfd1c19fa9434ead27f442e19237b
Commit Graph
1947 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Lizbeth Rika fba00c4f9b Build 137. 2014-11-18 09:20:16 +00:00
Lizbeth Rika ba90ef015d Fix up the gradle script again >.< 2014-11-18 09:19:09 +00:00
Lizbeth Rika 36e44e8aec Fixed the recipes for breaking back Reed and Thatch blocks giving items with metadata 1, and thus unusable. 2014-11-18 09:06:06 +00:00
Lizbeth Rika ac16ea7bf5 Fixed the Terra Shatterer not actively restoring its damage like the manasteel tools do. Closes #376. 2014-11-18 08:49:41 +00:00
Lizbeth Rika 9e29e7b89d Fixed the Red Stringed Spoofer not being in the creative tab. 2014-11-18 08:48:33 +00:00
Lizbeth Rika 81c35d8443 Fixed RedStringRenderer looking for the codechicken Vector3 rather than the botania one. On other words, Fixed the game crashing if you have a wand of the forest equipped while you have a red string block in the world and codechickencore isn't installed. 2014-11-18 08:47:43 +00:00
Lizbeth Rika e711415377 Fix up the gradle script, in the most roundabout way possible because I'm an idiot when it comes to gradle and will probably get a scolding from abrar when I get back home tomorrow but I guess that's par for the course, why couldn't I just stick with ANT anyway? That worked so much better than this weird stuff. Yes, I realize this commit message is super long but I don't care, the time you spent to read it is nothing compared to the amount of time it took me to get this damn thing to work. 2014-11-17 23:29:29 +00:00
Lizbeth Rika 95e648fa8f Build 136. 2014-11-17 22:10:45 +00:00
Lizbeth Rika 2900e006f4 Recipe/docs for the new floating flower stuffs. 2014-11-17 19:19:55 +00:00
Lizbeth Rika 5d325c7d61 Added Special Floating Flowers. 2014-11-17 18:30:49 +00:00
Lizbeth Rika d984df0567 Red String stuff recipe & docs. 2014-11-17 17:26:35 +00:00
Lizbeth Rika f2d49bd9bb 1- 2014-11-17 13:47:33 +00:00
Lizbeth Rika 4507a6312d 1+ 2014-11-17 13:47:15 +00:00
Lizbeth Rika 79cc6a002a Added the actual Red String item, I'll get the recipes and stuff later :V 2014-11-16 23:47:12 +00:00
Lizbeth Rika f99883c93c Added the Red String Comparator and Spoofer. 2014-11-16 23:23:52 +00:00
Lizbeth Rika e60717ed76 Removed the text that says that Bursts would work in the Terrasteel crafting, becaue it seems everyone gets confused and decides not to use sparks even though it clearly says it's the best way >.< 2014-11-16 22:18:16 +00:00
Lizbeth Rika 89a5f127ab I need someone to proofread the nonsense I write. 2014-11-16 22:07:47 +00:00
Lizbeth Rika 0f5a33eeb2 I can English. 2014-11-16 21:58:58 +00:00
Lizbeth Rika 561b7938c1 Remove unneeded stuff. 2014-11-16 21:58:44 +00:00
Lizbeth Rika cfdcd14565 Fixed the runic altar not saving the amount of mana it should get (and thus causing the amount of mana it has to reset to 0 when it loads back). 2014-11-16 21:57:14 +00:00
Lizbeth Rika 9004cd8e82 Add 'curse' to defaultTasks. 2014-11-16 21:12:37 +00:00
Lizbeth Rika 131698ebb2 Upload files to curseforge to please jadedcat. 2014-11-16 21:01:57 +00:00
Lizbeth Rika f71d8444e2 Added the Red String Nutrifier. 2014-11-16 20:57:24 +00:00