Commit Graph
327 Commits
Author SHA1 Message Date
Lizbeth Rika 941bdeed9f Add the Corporea Index. It looks cool but doesn't do anything, guess that's good progress? 2015-02-15 02:07:15 +00:00
Lizbeth Rika 885efe6a9f Make Magic Missiles die off after 2 seconds. Fixes #534. 2015-02-15 00:34:30 +00:00
Lizbeth Rika aa549dda28 Merge branch 'master' of https://github.com/Vazkii/Botania 2015-02-14 19:15:11 +00:00
Lizbeth Rika 5761616ec2 Check if the cache isn't broken somehow. 2015-02-14 19:14:57 +00:00
wiiv 67d1885d32 Zwings! 2015-02-14 17:10:18 +00:00
Lizbeth Rika ad823286f1 Actual corporea handling, requesting works fine. 2015-02-14 16:39:25 +00:00
Lizbeth Rika 3f77873875 Merge branch 'master' of https://github.com/Vazkii/Botania 2015-02-14 01:58:25 +00:00
Lizbeth Rika 9c3d58f0a5 First steps on corporea stuff. Sparks attach and index the network. 2015-02-14 01:58:11 +00:00
Alexander Stekelenburg d78cf214b8 Update nl_NL.lang 2015-02-13 16:50:27 +01:00
Lizbeth Rika 01ea000244 Implement a list of coordinates already checked on the force relay to prevent timing based dupes. Closes #549 2015-02-13 11:41:02 +00:00
Alexander Stekelenburg 2b2c0d0f4d Update nl_NL.lang 2015-02-13 11:42:47 +01:00
Liz Rika dbbcd33e76 Merge pull request #552 from hupster/hupster-patch-1
Update nl_NL.lang
2015-02-13 10:30:00 +00:00
hupster 86317671e6 Update nl_NL.lang 2015-02-13 10:28:37 +01:00
Lizbeth Rika 5d9449120c Proper rod textures. 2015-02-11 22:16:29 +00:00
Lizbeth Rika 58f7bf3932 Check if a world isRemote before spawning particles. 2015-02-11 22:16:19 +00:00
Lizbeth Rika 9911b5deb9 Merge branch 'master' of https://github.com/Vazkii/Botania 2015-02-11 21:45:46 +00:00
wiiv d89abbfab3 Mushroomness! Also Creepers be warned. 2015-02-11 19:00:57 +00:00
Lizbeth Rika 89dfc62652 Add a null check to the piston relay's coords in the warp lens. Closes #542 2015-02-11 17:36:11 +00:00
Lizbeth Rika 65942ce251 Recipe/docs for the petal blocks. 2015-02-11 17:01:53 +00:00
wiiv bdc86282d9 9/16 shrooms done. 2015-02-11 01:50:18 +00:00
wiiv 8ff3c78927 New stuffs... Indexing and flight in the end. 2015-02-11 00:56:39 +00:00
Lizbeth Rika fc6ac83e04 Petal blocks. 2015-02-10 23:56:48 +00:00
wiiv 17fc5858bb Smoother... 2015-02-10 11:21:12 +00:00
wiiv 01b8e162e7 Check this one out! 2015-02-10 01:33:18 +00:00
wiiv 5b9815a482 Something, something... 2015-02-09 22:22:09 +00:00
Milobe115 cc93c181b7 Updated french localisation
- Small corrections
- Translated NEI Integration
- Translated parts of the Configuration
- Translated "Baubles" to "Babioles" (French equivalent)
- Translated the Message from the Elven Garde ("Elfegarde" is a somewhat fancy term for "Elven Garde")
- Translated the "Manaseer Monocle" to "Monocle du Cherche-Mana" (Had to change "Manaseer" to an equivalent of "Mana-seeker", in order to have a nice translation")
- Translated some of the Brew names to fantasy names. (Had to change Night Vision from "Owlsight" to "Shadow eye", "Fleetfeet" became "Quick run", and "Magmaskin" became "Salamander skin", due to the connection between Salamanders and fire)
- Finished the Black Lotus Page
- Took out the "Alchemising with Mana" segment, as it was redundant with the "Botanical Alchemy" just below
- Translated the "Brewing Flasks" page

(If you need to contact me for whatever reason, find me on Twitter @Milobe115)
2015-02-08 21:56:43 +01:00
Lizbeth Rika 2db05b42b4 Small changes. 2015-02-08 17:20:45 +00:00
Lizbeth Rika fed341486b Recipe/docs for the Warp Lens. 2015-02-08 17:19:01 +00:00
wiiv 52d4b3132d It's it's Elven, it's made of dreamwood. 2015-02-08 16:57:59 +00:00
Lizbeth Rika c620405bf6 Added the Warp Lens. 2015-02-08 16:23:08 +00:00
Lizbeth Rika b718a13561 Merge branch 'master' of https://github.com/Vazkii/Botania 2015-02-08 14:03:57 +00:00
Lizbeth Rika affaf1cd68 Force remap potion IDs if they go out of bounds. Closes #525 2015-02-08 14:03:42 +00:00
Gwani f76bb5c85d Added glPushMatrix/glPopMatrix-pair to LightningHandler.
LightningHandler.onRenderWorldLast() modifies the model/view matrix and should therefore save and restore it. Actually, it introduces round-off errors into the model/view matrix by translating to world coordinates and back (calls to GL11.glTranslated()) which are proportional to the world coordinates' values (distant coordinates like 29 million introduce quite significant errors). Not restoring the matrix therefore makes it hard for other mods to do rendering correctly at distant coordinates.
2015-02-07 13:28:43 +01:00
Lizbeth Rika a959bad320 Sanity check in the case that a brew is null for some reason 2015-02-06 12:33:17 +00:00
Lizbeth Rika 72c97d333b Fixed Overgrowth Seeds not generating as chest loot. Closes #526 2015-02-06 12:28:37 +00:00
Lizbeth Rika 8f97146a0a Merge branch 'master' of https://github.com/Vazkii/Botania 2015-02-06 12:21:45 +00:00
Lizbeth Rika 2766734292 No more bitwise operations on the shader. Thanks AMD. 2015-02-06 12:21:28 +00:00
Yves 96c6bcc92b Update fr_FR.lang
Add-on before translation...
2015-02-06 12:13:18 +01:00
Lizbeth Rika f8b0f2155d Changed film_grain.frag from using GLSL 1.2 with GL_EXT_gpu_shader4 to GLSL 1.3. The functionality required (bitwise operators) is present in this version whereas in the present it required the extension.
Some AMD cards did nor support the extension, which led to the game freezing on the Mojang splash screen with no error thrown or clear indication as to what caused it. This issue affected versions 154 and 155.
Closes #510.
2015-02-05 16:43:41 +00:00
Lizbeth Rika 8bc835aabb Force the Mana Enchanter to only add enchantments once. Closes #198. Again. 2015-02-04 19:12:10 +00:00
Lizbeth Rika ea2e8e9a1d This should fix elementium axes crashing if they kill a player. 2015-02-04 18:53:45 +00:00
Lizbeth Rika f5e8fc83e4 Fixed the Trodden Dirt Slabs giving the wrong block when picked in creative. 2015-02-04 18:38:33 +00:00
Lizbeth Rika 9c15b3de92 Move the crafting table icon in the assembly halo hud down a bit... 2015-02-02 21:27:53 +00:00
Lizbeth Rika 366b7e1c9a Thermalily rebalance. 2015-02-02 21:27:31 +00:00
Lizbeth Rika 6626246e3d Fixed the crafty crate entry having the explanation for patterns doubled. 2015-02-02 18:53:14 +00:00
Lizbeth Rika 4f1955d383 Fixed Black Lotuses spawning on jungle temple dispensers rather than chests. 2015-02-02 18:50:48 +00:00
Lizbeth Rika 17d0fe0c38 Add a proper config for potion IDs. 2015-02-02 18:47:23 +00:00
Lizbeth Rika 684f23c354 Make the travel belts actively try to change step height rather than on equip only. Closes #516. 2015-02-02 18:35:56 +00:00
Lizbeth Rika 96e676c2c7 Change the Lexicon gui code to pull from the stack used to open the book. Closes #518 2015-02-02 18:27:00 +00:00
Lizbeth Rika 97d4fd9b3d Better check for the ring of chordata. 2015-02-02 17:57:50 +00:00