Commit Graph
4761 Commits
Author SHA1 Message Date
Vincent Lee 5d666cd891 Some 1.8.8 tessellator changes 2015-12-21 13:53:31 -06:00
Vincent Lee ffe7b4ccc8 API looks to be good again 2015-12-21 13:01:33 -06:00
Vincent Lee c480a3303a Remove unneeded casts since 1.8.8 restores generics 2015-12-21 12:53:59 -06:00
Vincent Lee dbb549ba2a Merge upstream release 245 2015-12-21 12:47:58 -06:00
Vincent Lee b8a1a9cd5d Some 1.8.8 fixes before merging upstream 2015-12-21 12:24:28 -06:00
Vasco Lavos 27ae04ee2c Build 245 2015-12-19 19:31:59 +00:00
wiiv 214e3b37ad Santa's little tweaks. 2015-12-19 19:28:36 +00:00
wiiv 0085c18258 Merge branch 'master' of https://github.com/Vazkii/Botania 2015-12-19 19:18:50 +00:00
wiiv 5bba479d6a The planets in the sky! 2015-12-19 19:18:37 +00:00
Vasco Lavos deb6fa792a YEAH, CHRISTMAS 2015-12-19 19:11:53 +00:00
Vasco Lavos 8b40d7420c Fixed a bunch of stuff in the mod not rendering properly if something disables the OpenGL Lighting capability (See: NEI, Neat). Also using glPushAttrib now 2015-12-19 18:48:38 +00:00
Vasco Lavos 351d78bbc9 Fixed Luminizers that have been bound to another Luminizer that has then been removed taking you to the place where the removed one was. 2015-12-19 18:38:52 +00:00
Vasco Lavos 8f480bda6b Increased the drop rate of Melon and Pumpkin seeds on Garden of Glass. Again. 2015-12-19 18:27:11 +00:00
Vasco Lavos 501e50f983 I can't live with myself if this stays like that 2015-12-19 18:26:06 +00:00
Vasco Lavos a069aed288 And complete the skybox stuffs 2015-12-19 18:22:31 +00:00
Vasco Lavos ff87b30174 Removed your best friend 2015-12-19 18:10:28 +00:00
Vasco Lavos 0e918f5449 Added configs to move the Flugel Tiara's flight bar as apparently I'm not the only person that thought it was cute to put a bar there. 2015-12-19 18:08:33 +00:00
Vasco Lavos 0b28e37d24 Change Christmas period. 2015-12-19 03:38:14 +00:00
Vasco Lavos a6d61206d9 Rainbow! 2015-12-19 03:05:28 +00:00
Vasco Lavos 8840d2718f More skybox work... 2015-12-18 23:13:32 +00:00
wiiv ea08199e1f ...to town. 2015-12-18 18:20:18 +00:00
Vasco Lavos 50d1a8fc1c Merge branch 'master' of https://github.com/Vazkii/Botania 2015-12-18 04:56:03 +00:00
Vasco Lavos ac5a0815fa Skybox effect. VERY WIP 2015-12-18 04:54:56 +00:00
Vasco Lavos 1b32fc827d no 2015-12-16 21:25:57 +00:00
Vasco Lavos dd4d25f1d0 Build 244 2015-12-16 21:25:00 +00:00
Vasco Lavos fab5e0350e Added a "Preventing Decay" entry to the Miscellaneous section. Something seems a bit off with it though. 2015-12-16 21:10:55 +00:00
Vasco Lavos e5d2500374 muh polish 2015-12-16 20:18:05 +00:00
Vasco Lavos 46d3ffc902 Hopperhocks now make poof effects 2015-12-16 19:00:48 +00:00
Vasco Lavos ab1d938abe Added a fallback for LexiconRecipeMappings.stackToString(). Closes #1659 2015-12-16 18:51:15 +00:00
Vasco Lavos 8bf062cc19 Fixed Resolute Ivy not working. Closes #1657 2015-12-16 18:44:23 +00:00
Vincent Lee 5211ed9149 Merge upstream and probably introduce a zillion errors 2015-12-14 16:38:07 -06:00
Vincent Lee 6b03424e2c Commit before merging upstream 2015-12-14 12:46:31 -06:00
Jonathan Smith 81b7ac4be4 Merge pull request #1653 from howtonotwin/chordatafix
Fix #1588: chordata ring stops player from drowning with no mana.
2015-12-13 21:10:15 +00:00
Jonathan Smith f2a86347f9 Merge pull request #1656 from AlterAkima/patch-1
Update en_US.lang, closes #1654
2015-12-13 21:07:42 +00:00
Patric Alexandre c91e418752 Update en_US.lang
https://github.com/Vazkii/Botania/issues/1654
2015-12-13 16:26:52 -02:00
Rasheeq 1ca6fd6b96 Fix #1588: chordata ring stops player from drowning with no mana. 2015-12-13 06:51:39 -05:00
Vasco Lavos 010ff46f72 Build 243. 2015-12-13 02:01:54 +00:00
Vasco Lavos be251a9680 Mana Pools are now dyed by right clicking Floral Powder, and not dropping it, so you don't dye your pool while making Mana Powder. Closes #1644 2015-12-13 01:45:46 +00:00
Vasco Lavos b3e4e43146 Fixed a CME with red string interceptors. Closes #1640 2015-12-13 01:35:55 +00:00
Vasco Lavos 5f272ad837 Merge branch 'master' of https://github.com/Vazkii/Botania 2015-12-13 01:18:04 +00:00
Vasco Lavos 88ec0dec28 Added NEI Lexica Botania integration 2015-12-13 01:17:56 +00:00
Jonathan Smith 991724ea15 Merge pull request #1642 from yrsegal/master
Fix Corporea Funnel attempting to put an item into another one
2015-12-11 09:19:05 +00:00
yrsegal ded7a326d5 Fix Corporea Funnel attempting to put an item into another one
Closes #1622
2015-12-10 20:36:32 -05:00
Jonathan Smith 4faa0d4202 Merge pull request #1641 from yrsegal/master
Fix compatability problems with Et Futurum/JourneyMap/Chisel
2015-12-11 00:48:36 +00:00
yrsegal 03c2608036 Make the Gaia Guardian accept Et Futurum/Chisel Beacons
closes #1632
2015-12-10 19:16:04 -05:00
yrsegal a1669bbb9d Make BlockModDoubleFlower respond to alternate icon check
closes #1637
2015-12-10 19:15:36 -05:00
Jonathan Smith 75b9a61094 Merge pull request #1639 from webrsb/master
Update zh_TW.lang
2015-12-10 16:39:14 +00:00
unknown 3da7778107 Update zh_TW.lang
Base on zh_CN.lang. Thanks for @sfmiyuki.
2015-12-11 00:07:26 +08:00
Jonathan Smith 6e4a597090 Merge pull request #1638 from sfmiyuki/patch-2
Update zh_CN.lang
2015-12-10 14:25:29 +00:00
sfmiyuki 0e847aeeef Update zh_CN.lang
There is sth bug and I corrected it
2015-12-10 22:17:56 +08:00